diff options
Diffstat (limited to 'pkgs/applications')
2920 files changed, 96062 insertions, 134789 deletions
diff --git a/pkgs/applications/accessibility/contrast/default.nix b/pkgs/applications/accessibility/contrast/default.nix deleted file mode 100644 index cc8e21b924563..0000000000000 --- a/pkgs/applications/accessibility/contrast/default.nix +++ /dev/null @@ -1,69 +0,0 @@ -{ stdenv -, lib -, fetchFromGitLab -, cairo -, cargo -, desktop-file-utils -, gettext -, glib -, gtk4 -, libadwaita -, meson -, ninja -, pango -, pkg-config -, rustPlatform -, rustc -, wrapGAppsHook4 -}: - -stdenv.mkDerivation rec { - pname = "contrast"; - version = "0.0.10"; - - src = fetchFromGitLab { - domain = "gitlab.gnome.org"; - group = "World"; - owner = "design"; - repo = "contrast"; - rev = version; - hash = "sha256-Y0CynBvnCOBesONpxUicR7PgMJgmM0ZQX/uOwIppj7w="; - }; - - cargoDeps = rustPlatform.fetchCargoTarball { - inherit src; - name = "${pname}-${version}"; - hash = "sha256-BdwY2YDJyDApGgE0Whz3xRU/0gRbkwbKUvPbWEObXE8="; - }; - - nativeBuildInputs = [ - desktop-file-utils - gettext - meson - ninja - pkg-config - cargo - rustPlatform.cargoSetupHook - rustc - wrapGAppsHook4 - ]; - - buildInputs = [ - cairo - glib - gtk4 - libadwaita - pango - ]; - - meta = with lib; { - description = "Checks whether the contrast between two colors meet the WCAG requirements"; - homepage = "https://gitlab.gnome.org/World/design/contrast"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ ]; - platforms = platforms.unix; - # never built on aarch64-darwin, x86_64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin; - mainProgram = "contrast"; - }; -} diff --git a/pkgs/applications/accessibility/dasher/default.nix b/pkgs/applications/accessibility/dasher/default.nix index 6e602dc35c331..13dee55628a5c 100644 --- a/pkgs/applications/accessibility/dasher/default.nix +++ b/pkgs/applications/accessibility/dasher/default.nix @@ -15,7 +15,7 @@ , libxslt , libxml2 , speechSupport ? true -, speechd +, speechd-minimal }: stdenv.mkDerivation { @@ -56,7 +56,7 @@ stdenv.mkDerivation { # at-spi2 needs dbus to be recognized by pkg-config at-spi2-core dbus - ] ++ lib.optional speechSupport speechd; + ] ++ lib.optional speechSupport speechd-minimal; enableParallelBuilding = true; diff --git a/pkgs/applications/accessibility/squeekboard/default.nix b/pkgs/applications/accessibility/squeekboard/default.nix index 37468e4775976..edcc1938c8543 100644 --- a/pkgs/applications/accessibility/squeekboard/default.nix +++ b/pkgs/applications/accessibility/squeekboard/default.nix @@ -5,12 +5,12 @@ , meson , ninja , pkg-config -, gnome , gnome-desktop , glib , gtk3 , wayland , wayland-protocols +, wayland-scanner , libbsd , libxml2 , libxkbcommon @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { pname = "squeekboard"; - version = "1.38.0"; + version = "1.41.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; @@ -31,13 +31,13 @@ stdenv.mkDerivation rec { owner = "Phosh"; repo = pname; rev = "v${version}"; - hash = "sha256-ZVSnLH2wLPcOHkU2pO0BgIdGmULMNiacIYMRmhN+bZ8="; + hash = "sha256-WHGdA0cEB1nu7vJ+pwjdl8aZzccJ232vsbSGmZohFVo="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-tcn1tRuRlHVTYvc8T/ePfCEPNjih6B9lo/hdX+WwitQ="; + hash = "sha256-CRKaH8cA/EhXQna3zCU0Z06zkB9qu6QxPJ4No3NFcs0="; }; nativeBuildInputs = [ @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { ninja pkg-config glib - wayland + wayland-scanner wrapGAppsHook3 rustPlatform.cargoSetupHook cargo diff --git a/pkgs/applications/audio/a2jmidid/default.nix b/pkgs/applications/audio/a2jmidid/default.nix index 517db11c2865f..c82e0012d2bc5 100644 --- a/pkgs/applications/audio/a2jmidid/default.nix +++ b/pkgs/applications/audio/a2jmidid/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { description = "Daemon for exposing legacy ALSA sequencer applications in JACK MIDI system"; homepage = "https://a2jmidid.ladish.org/"; license = licenses.gpl2Only; - maintainers = [ maintainers.goibhniu ]; + maintainers = [ ]; platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" ]; }; } diff --git a/pkgs/applications/audio/amarok/default.nix b/pkgs/applications/audio/amarok/default.nix index 38cee35313fd6..69ae6a41c78ad 100644 --- a/pkgs/applications/audio/amarok/default.nix +++ b/pkgs/applications/audio/amarok/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "amarok"; - version = "3.0.1"; + version = "3.1.0"; src = fetchurl { url = "mirror://kde/stable/amarok/${finalAttrs.version}/amarok-${finalAttrs.version}.tar.xz"; - sha256 = "sha256-S+zyrp3cvoYRA+ZCFDaireIvU4yxw2ANTmZ/cb6ljys="; + sha256 = "sha256-yXuZZ/qPFbjp9N+2YYTKxqfsncZloQW8UWjY5yD+Fus="; }; outputs = [ "out" "doc" ]; diff --git a/pkgs/applications/audio/amberol/default.nix b/pkgs/applications/audio/amberol/default.nix deleted file mode 100644 index 8ec6c3e6b1ab7..0000000000000 --- a/pkgs/applications/audio/amberol/default.nix +++ /dev/null @@ -1,79 +0,0 @@ -{ lib -, stdenv -, fetchFromGitLab -, rustPlatform -, cargo -, desktop-file-utils -, appstream-glib -, meson -, ninja -, pkg-config -, reuse -, rustc -, m4 -, wrapGAppsHook4 -, glib -, gtk4 -, gst_all_1 -, libadwaita -, dbus -}: - -stdenv.mkDerivation rec { - pname = "amberol"; - version = "0.10.3"; - - src = fetchFromGitLab { - domain = "gitlab.gnome.org"; - owner = "World"; - repo = pname; - rev = version; - hash = "sha256-nAoUO0bGToNGD2W8qJmTegrETOJDdM04hI1jjiYkZXI="; - }; - - cargoDeps = rustPlatform.fetchCargoTarball { - inherit src; - name = "${pname}-${version}"; - hash = "sha256-4ZoliqQ665KPDFl+1eBCE+1fZgr+FA7vesPstoRs0RU="; - }; - - postPatch = '' - patchShebangs build-aux - ''; - - nativeBuildInputs = [ - appstream-glib - desktop-file-utils - meson - ninja - pkg-config - reuse - m4 - wrapGAppsHook4 - rustPlatform.cargoSetupHook - cargo - rustc - ]; - - buildInputs = [ - glib - gtk4 - libadwaita - gst_all_1.gstreamer - gst_all_1.gst-plugins-base - gst_all_1.gst-plugins-good - gst_all_1.gst-plugins-bad - gst_all_1.gst-plugins-ugly - gst_all_1.gst-libav - dbus - ]; - - meta = with lib; { - homepage = "https://gitlab.gnome.org/World/amberol"; - description = "Small and simple sound and music player"; - maintainers = with maintainers; [ linsui ]; - license = licenses.gpl3Plus; - platforms = platforms.linux; - mainProgram = "amberol"; - }; -} diff --git a/pkgs/applications/audio/ams-lv2/default.nix b/pkgs/applications/audio/ams-lv2/default.nix index bf0e3275ca6bb..6195a5a4b46e4 100644 --- a/pkgs/applications/audio/ams-lv2/default.nix +++ b/pkgs/applications/audio/ams-lv2/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { description = "LV2 port of the internal modules found in Alsa Modular Synth"; homepage = "https://github.com/blablack/ams-lv2"; license = licenses.gpl3; - maintainers = [ maintainers.goibhniu ]; + maintainers = [ ]; platforms = platforms.linux; # Build uses `-msse` and `-mfpmath=sse` badPlatforms = [ "aarch64-linux" ]; diff --git a/pkgs/applications/audio/ardour/7.nix b/pkgs/applications/audio/ardour/7.nix index 86a50ef0606e2..d0554a21af185 100644 --- a/pkgs/applications/audio/ardour/7.nix +++ b/pkgs/applications/audio/ardour/7.nix @@ -3,6 +3,7 @@ , fetchgit , fetchzip , fetchpatch +, fetchpatch2 , alsa-lib , aubio , boost @@ -86,6 +87,12 @@ stdenv.mkDerivation rec { url = "https://github.com/Ardour/ardour/commit/e995daa37529715214c6c4a2587e4134aaaba02f.patch"; hash = "sha256-EpXOIIObOwwcNgNma0E3nvaBad3930sagDjBpa+78WI="; }) + + # Work around itstools bug #9648 + (fetchpatch2 { + url = "https://github.com/Ardour/ardour/commit/338cd09a4aa1b36b8095dfc14ab534395f9a4a92.patch?full_index=1"; + hash = "sha256-AvV4aLdkfrxPkE4NX2ETSagq4GjEC+sHCEqdcYvL+CY="; + }) ]; # Ardour's wscript requires git revision and date to be available. @@ -207,6 +214,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; mainProgram = "ardour7"; platforms = platforms.linux; - maintainers = with maintainers; [ goibhniu magnetophon mitchmindtree ]; + maintainers = with maintainers; [ magnetophon mitchmindtree ]; }; } diff --git a/pkgs/applications/audio/ardour/default-plugin-search-paths.patch b/pkgs/applications/audio/ardour/default-plugin-search-paths.patch index 8cd3118b95733..68d67ce8b9bcb 100644 --- a/pkgs/applications/audio/ardour/default-plugin-search-paths.patch +++ b/pkgs/applications/audio/ardour/default-plugin-search-paths.patch @@ -21,7 +21,7 @@ index a572ed55dd..3dd6c2fda6 100644 lxvst_path = "/usr/local/lib64/lxvst:/usr/local/lib/lxvst:/usr/lib64/lxvst:/usr/lib/lxvst:" "/usr/local/lib64/linux_vst:/usr/local/lib/linux_vst:/usr/lib64/linux_vst:/usr/lib/linux_vst:" - "/usr/lib/vst:/usr/local/lib/vst"; -+ "/usr/lib/vst:/usr/local/lib/vst:" ++ "/usr/lib/vst:/usr/local/lib/vst:$HOME/.nix-profile/lib/vst:" + "$HOME/.lxvst:$HOME/.nix-profile/lib/lxvst:/run/current-system/sw/lib/lxvst:/etc/profiles/per-user/$USER/lib/lxvst"; } diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix index 9aaff5539268f..bb969408bac1a 100644 --- a/pkgs/applications/audio/ardour/default.nix +++ b/pkgs/applications/audio/ardour/default.nix @@ -214,6 +214,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; mainProgram = "ardour8"; platforms = platforms.linux; - maintainers = with maintainers; [ goibhniu magnetophon mitchmindtree ]; + maintainers = with maintainers; [ magnetophon mitchmindtree ]; }; } diff --git a/pkgs/applications/audio/ario/default.nix b/pkgs/applications/audio/ario/default.nix index f34ff19ea04ce..2231031d04816 100644 --- a/pkgs/applications/audio/ario/default.nix +++ b/pkgs/applications/audio/ario/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { taglib ]; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' for file in $out/lib/ario/plugins/*.dylib; do ln -s $file $out/lib/ario/plugins/$(basename $file .dylib).so done diff --git a/pkgs/applications/audio/ashuffle/default.nix b/pkgs/applications/audio/ashuffle/default.nix index 475ecd26e706a..45daafa88d791 100644 --- a/pkgs/applications/audio/ashuffle/default.nix +++ b/pkgs/applications/audio/ashuffle/default.nix @@ -12,20 +12,20 @@ stdenv.mkDerivation rec { pname = "ashuffle"; - version = "3.14.7"; + version = "3.14.8"; src = fetchFromGitHub { owner = "joshkunz"; repo = "ashuffle"; rev = "v${version}"; - hash = "sha256-id55Ss/7PLBPn55RikAlqr3VkNzgm8NiL/ruFGAmH30="; + hash = "sha256-XnibLlwUspI2aveWfMg/TOe59vK6Z2WEnF7gafUmx6E="; fetchSubmodules = true; }; dontUseCmakeConfigure = true; nativeBuildInputs = [ cmake pkg-config meson ninja ]; buildInputs = [ libmpdclient yaml-cpp ] - ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation ]; mesonFlags = [ "-Dunsupported_use_system_yamlcpp=true" ]; diff --git a/pkgs/applications/audio/aucatctl/default.nix b/pkgs/applications/audio/aucatctl/default.nix index dce352a866885..051a1494fd9f5 100644 --- a/pkgs/applications/audio/aucatctl/default.nix +++ b/pkgs/applications/audio/aucatctl/default.nix @@ -5,12 +5,12 @@ stdenv.mkDerivation (finalAttrs: { version = "0.1"; src = fetchurl { - url = "http://www.sndio.org/${finalAttrs.pname}-${finalAttrs.version}.tar.gz"; + url = "http://www.sndio.org/aucatctl-${finalAttrs.version}.tar.gz"; sha256 = "524f2fae47db785234f166551520d9605b9a27551ca438bd807e3509ce246cf0"; }; buildInputs = [ sndio ] - ++ lib.optional (!stdenv.isDarwin && !stdenv.hostPlatform.isBSD) + ++ lib.optional (!stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isBSD) libbsd; outputs = [ "out" "man" ]; @@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: { preBuild = '' makeFlagsArray+=("PREFIX=$out") '' + lib.optionalString - (!stdenv.isDarwin && !stdenv.hostPlatform.isBSD) '' + (!stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isBSD) '' makeFlagsArray+=(LDADD="-lsndio -lbsd") # Fix warning about implicit declaration of function 'strlcpy' diff --git a/pkgs/applications/audio/audacious/default.nix b/pkgs/applications/audio/audacious/default.nix index beca5afc721da..00764831c2dec 100644 --- a/pkgs/applications/audio/audacious/default.nix +++ b/pkgs/applications/audio/audacious/default.nix @@ -1,26 +1,28 @@ { lib , stdenv , audacious-plugins -, fetchurl -, gettext +, fetchFromGitHub , meson , ninja , pkg-config , qtbase +, qtsvg +, qtwayland , wrapQtAppsHook }: stdenv.mkDerivation rec { pname = "audacious"; - version = "4.3.1"; + version = "4.4.1"; - src = fetchurl { - url = "http://distfiles.audacious-media-player.org/audacious-${version}.tar.bz2"; - sha256 = "sha256-heniaEFQW1HjQu5yotBfGb74lPVnoCnrs/Pgwa20IEI="; + src = fetchFromGitHub { + owner = "audacious-media-player"; + repo = "audacious"; + rev = "${pname}-${version}"; + hash = "sha256-Bz/OI38+IFTHlBH3p2NTzSj8YD/7Xd4JeWpHgCSpMXw="; }; nativeBuildInputs = [ - gettext meson ninja pkg-config @@ -29,6 +31,8 @@ stdenv.mkDerivation rec { buildInputs = [ qtbase + qtsvg + qtwayland ]; mesonFlags = [ @@ -41,12 +45,14 @@ stdenv.mkDerivation rec { ln -s ${audacious-plugins}/share/audacious/Skins $out/share/audacious/ ''; - meta = with lib; { + meta = { description = "Lightweight and versatile audio player"; - homepage = "https://audacious-media-player.org/"; - maintainers = with maintainers; [ eelco ramkromberg ttuegel thiagokokada ]; - platforms = with platforms; linux; - license = with licenses; [ + homepage = "https://audacious-media-player.org"; + downloadPage = "https://github.com/audacious-media-player/audacious"; + mainProgram = "audacious"; + maintainers = with lib.maintainers; [ ramkromberg ttuegel thiagokokada ]; + platforms = lib.platforms.linux; + license = with lib.licenses; [ bsd2 bsd3 #https://github.com/audacious-media-player/audacious/blob/master/COPYING gpl2 diff --git a/pkgs/applications/audio/audacious/plugins.nix b/pkgs/applications/audio/audacious/plugins.nix index 2d048bc358fe7..429d0bce74c3b 100644 --- a/pkgs/applications/audio/audacious/plugins.nix +++ b/pkgs/applications/audio/audacious/plugins.nix @@ -1,5 +1,5 @@ { stdenv -, fetchurl +, fetchFromGitHub , alsa-lib , audacious , curl @@ -8,7 +8,6 @@ , flac , fluidsynth , gdk-pixbuf -, gettext , lame , libbs2b , libcddb @@ -39,7 +38,7 @@ , pipewire , qtbase , qtmultimedia -, qtx11extras +, qtwayland , soxr , vgmstream , wavpack @@ -47,17 +46,18 @@ stdenv.mkDerivation rec { pname = "audacious-plugins"; - version = "4.3.1"; + version = "4.4.1"; - src = fetchurl { - url = "http://distfiles.audacious-media-player.org/audacious-plugins-${version}.tar.bz2"; - sha256 = "sha256-Leom469YOi1oTfJAsnsrKTK81lPfTbUAqF9P5dX9yKY="; + src = fetchFromGitHub { + owner = "audacious-media-player"; + repo = "audacious-plugins"; + rev = "${pname}-${version}"; + hash = "sha256-F2kcGc6VCaBsL5Zx7qtZjPvqzaxmR87Q9LTFEU+nqmo="; }; patches = [ ./0001-Set-plugindir-to-PREFIX-lib-audacious.patch ]; nativeBuildInputs = [ - gettext meson ninja pkg-config @@ -98,7 +98,7 @@ stdenv.mkDerivation rec { pipewire qtbase qtmultimedia - qtx11extras + qtwayland soxr wavpack libopenmpt @@ -116,5 +116,6 @@ stdenv.mkDerivation rec { meta = audacious.meta // { description = "Plugins for Audacious music player"; + downloadPage = "https://github.com/audacious-media-player/audacious-plugins"; }; } diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index 802fccf29cc18..85ceb93f48fe1 100644 --- a/pkgs/applications/audio/audacity/default.nix +++ b/pkgs/applications/audio/audacity/default.nix @@ -30,7 +30,7 @@ , libid3tag , libopus , libuuid -, ffmpeg_6 +, ffmpeg_7 , soundtouch , pcre , portaudio # given up fighting their portaudio.patch? @@ -62,23 +62,23 @@ stdenv.mkDerivation rec { pname = "audacity"; - version = "3.5.1"; + version = "3.6.4"; src = fetchFromGitHub { owner = "audacity"; repo = "audacity"; rev = "Audacity-${version}"; - hash = "sha256-wQ+K31TvDTVwDyVQ5nWgcneZ1cFxztmsbSXrDs33Uoc="; + hash = "sha256-72k79UFxhk8JUCnMzbU9lZ0Ua3Ui41EkhPGSnGkf9mE="; }; postPatch = '' mkdir src/private substituteInPlace scripts/build/macOS/fix_bundle.py \ --replace "path.startswith('/usr/lib/')" "path.startswith('${builtins.storeDir}')" - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace libraries/lib-files/FileNames.cpp \ --replace /usr/include/linux/magic.h ${linuxHeaders}/include/linux/magic.h - '' + lib.optionalString (stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "11.0") '' + '' + lib.optionalString (stdenv.hostPlatform.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "11.0") '' sed -z -i "s/NSAppearanceName.*systemAppearance//" src/AudacityApp.mm ''; @@ -89,13 +89,13 @@ stdenv.mkDerivation rec { python3 makeWrapper wrapGAppsHook3 - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ linuxHeaders ]; buildInputs = [ expat - ffmpeg_6 + ffmpeg_7 file flac gtk3 @@ -125,7 +125,7 @@ stdenv.mkDerivation rec { portaudio wavpack wxGTK32 - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib # for portaudio at-spi2-core dbus @@ -138,7 +138,7 @@ stdenv.mkDerivation rec { libsepol libuuid util-linux - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit CoreAudioKit # for portaudio libpng @@ -176,13 +176,13 @@ stdenv.mkDerivation rec { # Replace audacity's wrapper, to: # - put it in the right place, it shouldn't be in "$out/audacity" # - Add the ffmpeg dynamic dependency - postFixup = lib.optionalString stdenv.isLinux '' + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' wrapProgram "$out/bin/audacity" \ "''${gappsWrapperArgs[@]}" \ - --prefix LD_LIBRARY_PATH : "$out/lib/audacity":${lib.makeLibraryPath [ ffmpeg_6 ]} \ + --prefix LD_LIBRARY_PATH : "$out/lib/audacity":${lib.makeLibraryPath [ ffmpeg_7 ]} \ --suffix AUDACITY_MODULES_PATH : "$out/lib/audacity/modules" \ --suffix AUDACITY_PATH : "$out/share/audacity" - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/{Applications,bin} mv $out/Audacity.app $out/Applications/ makeWrapper $out/Applications/Audacity.app/Contents/MacOS/Audacity $out/bin/audacity diff --git a/pkgs/applications/audio/aumix/default.nix b/pkgs/applications/audio/aumix/default.nix deleted file mode 100644 index 6127cb7e69291..0000000000000 --- a/pkgs/applications/audio/aumix/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ lib -, stdenv -, fetchurl -, fetchpatch -, gettext -, ncurses -, gtkGUI ? false -, pkg-config -, gtk2 -}: - -stdenv.mkDerivation rec { - pname = "aumix"; - version = "2.9.1"; - - src = fetchurl { - url = "http://www.jpj.net/~trevor/aumix/releases/aumix-${version}.tar.bz2"; - sha256 = "0a8fwyxnc5qdxff8sl2sfsbnvgh6pkij4yafiln0fxgg6bal7knj"; - }; - - patches = [ - # Pull Gentoo fix for -fno-common toolchains. Upstream does not - # seem to have the contacts - (fetchpatch { - name = "fno-common.patch"; - url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-sound/aumix/files/aumix-2.9.1-fno-common.patch?id=496c9ec7355f06f6d1d19be780a6981503e6df1f"; - sha256 = "0qwylhx1hawsmx1pc7ykrjq9phksc73dq9rss6ggq15n3ggnc95y"; - }) - ]; - - nativeBuildInputs = lib.optionals gtkGUI [ pkg-config ]; - - buildInputs = [ gettext ncurses ] - ++ lib.optionals gtkGUI [ gtk2 ]; - - configureFlags = lib.optionals (!gtkGUI) ["--without-gtk"]; - - meta = with lib; { - description = "Audio mixer for X and the console"; - longDescription = '' - Aumix adjusts an audio mixer from X, the console, a terminal, - the command line or a script. - ''; - homepage = "http://www.jpj.net/~trevor/aumix.html"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/audio/bchoppr/default.nix b/pkgs/applications/audio/bchoppr/default.nix index fc31d09b2dabf..b841764f79618 100644 --- a/pkgs/applications/audio/bchoppr/default.nix +++ b/pkgs/applications/audio/bchoppr/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "sjaehn"; repo = pname; rev = version; - sha256 = "sha256-/aLoLUpWu66VKd9lwjli+FZZctblrZUPSEsdYH85HwQ="; + hash = "sha256-/aLoLUpWu66VKd9lwjli+FZZctblrZUPSEsdYH85HwQ="; fetchSubmodules = true; }; 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/bitwig-studio/bitwig-studio5.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix index 92ee1de47e7c7..841570a619190 100644 --- a/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix +++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix @@ -19,7 +19,9 @@ , pango , pipewire , pulseaudio +, vulkan-loader , wrapGAppsHook3 +, xcb-imdkit , xdg-utils , xorg , zlib @@ -27,11 +29,11 @@ stdenv.mkDerivation rec { pname = "bitwig-studio"; - version = "5.1.9"; + version = "5.2.4"; src = fetchurl { url = "https://www.bitwig.com/dl/Bitwig%20Studio/${version}/installer_linux/"; - hash = "sha256-J5kLqXCMnGb0ZMhES6PQIPjN51ptlBGj4Fy8qSzJ6Qg="; + hash = "sha256-/JEJthaFSdad5Hj5sdBQLLyDdp2Rp4ZAlhIA+RgwXRw="; }; nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook3 ]; @@ -66,6 +68,8 @@ stdenv.mkDerivation rec { pipewire pulseaudio stdenv.cc.cc.lib + vulkan-loader + xcb-imdkit xcbutil xcbutilwm zlib @@ -78,6 +82,11 @@ stdenv.mkDerivation rec { cp -r opt/bitwig-studio $out/libexec ln -s $out/libexec/bitwig-studio $out/bin/bitwig-studio cp -r usr/share $out/share + + # Bitwig includes a copy of libxcb-imdkit. + # Removing it will force it to use our version. + rm $out/libexec/lib/bitwig-studio/libxcb-imdkit.so.1 + substitute usr/share/applications/com.bitwig.BitwigStudio.desktop \ $out/share/applications/com.bitwig.BitwigStudio.desktop \ --replace /usr/bin/bitwig-studio $out/bin/bitwig-studio diff --git a/pkgs/applications/audio/bristol/default.nix b/pkgs/applications/audio/bristol/default.nix index 96f99e54ffc75..94754a3b1cc51 100644 --- a/pkgs/applications/audio/bristol/default.nix +++ b/pkgs/applications/audio/bristol/default.nix @@ -55,6 +55,6 @@ stdenv.mkDerivation rec { homepage = "https://bristol.sourceforge.net"; license = licenses.gpl3; platforms = [ "x86_64-linux" "i686-linux" ]; - maintainers = [ maintainers.goibhniu ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/audio/buzztrax/default.nix b/pkgs/applications/audio/buzztrax/default.nix index 38bb5d68e69b9..30961d5b320ab 100644 --- a/pkgs/applications/audio/buzztrax/default.nix +++ b/pkgs/applications/audio/buzztrax/default.nix @@ -62,7 +62,9 @@ stdenv.mkDerivation { ]; # 'g_memdup' is deprecated: Use 'g_memdup2' instead - env.NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; + env.NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations" + # Suppress incompatible function pointer error in clang due to libxml2 2.12 const changes + + lib.optionalString stdenv.cc.isClang " -Wno-error=incompatible-function-pointer-types"; meta = with lib; { description = "Buzztrax is a modular music composer for Linux"; diff --git a/pkgs/applications/audio/calf/default.nix b/pkgs/applications/audio/calf/default.nix index 2fa5bdae14587..d4da3a2d86911 100644 --- a/pkgs/applications/audio/calf/default.nix +++ b/pkgs/applications/audio/calf/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { homepage = "https://calf-studio-gear.org"; description = "Set of high quality open source audio plugins for musicians"; license = licenses.lgpl2; - maintainers = [ maintainers.goibhniu ]; + maintainers = [ ]; platforms = platforms.linux; mainProgram = "calfjackhost"; }; diff --git a/pkgs/applications/audio/callaudiod/default.nix b/pkgs/applications/audio/callaudiod/default.nix index 2a64a18326c16..51dc15f4ec545 100644 --- a/pkgs/applications/audio/callaudiod/default.nix +++ b/pkgs/applications/audio/callaudiod/default.nix @@ -11,14 +11,14 @@ stdenv.mkDerivation rec { pname = "callaudiod"; - version = "0.1.9"; + version = "0.1.10"; src = fetchFromGitLab { domain = "gitlab.com"; owner = "mobian1"; repo = pname; rev = version; - sha256 = "sha256-OuWn1DA+4LmN1KwouiqW3kn6CMg8jhm0FiyAgMSi1GI="; + hash = "sha256-gc66XrrFyhF1TvrDECBfGQc+MiDtqZPxdCn0S/43XQU="; }; strictDeps = true; diff --git a/pkgs/applications/audio/cardinal/default.nix b/pkgs/applications/audio/cardinal/default.nix index 654d22233a3b4..74c7708a05880 100644 --- a/pkgs/applications/audio/cardinal/default.nix +++ b/pkgs/applications/audio/cardinal/default.nix @@ -26,11 +26,11 @@ stdenv.mkDerivation rec { pname = "cardinal"; - version = "24.05"; + version = "24.09"; src = fetchurl { url = "https://github.com/DISTRHO/Cardinal/releases/download/${version}/cardinal+deps-${version}.tar.xz"; - hash = "sha256-ZUJI5utUtST+idlL7WKBIs850EpK98cnmO47g8/iZcI="; + hash = "sha256-vJxKtZ0rVjf0RJfTNRxpzps1F2k0hHuiPnd1OwpULhQ="; }; prePatch = '' @@ -89,6 +89,6 @@ stdenv.mkDerivation rec { mainProgram = "Cardinal"; platforms = lib.platforms.all; # never built on aarch64-darwin, x86_64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/applications/audio/carla/default.nix b/pkgs/applications/audio/carla/default.nix index b13ffdeb24c1d..68016e4a16bee 100644 --- a/pkgs/applications/audio/carla/default.nix +++ b/pkgs/applications/audio/carla/default.nix @@ -26,13 +26,13 @@ assert withQt -> wrapQtAppsHook != null; stdenv.mkDerivation (finalAttrs: { pname = "carla"; - version = "2.5.8"; + version = "2.5.9"; src = fetchFromGitHub { owner = "falkTX"; - repo = finalAttrs.pname; + repo = "carla"; rev = "v${finalAttrs.version}"; - hash = "sha256-H15T/z/IRfgWdqToTzq2eJ7q3n9Kj44IZXsd4uaipuU="; + hash = "sha256-FM/6TtNhDml1V9C5VisjLcZ3CzXsuwCZrsoz4yP3kI8="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/cd-discid/default.nix b/pkgs/applications/audio/cd-discid/default.nix index e13a64e4bd839..a30ebc8fbe394 100644 --- a/pkgs/applications/audio/cd-discid/default.nix +++ b/pkgs/applications/audio/cd-discid/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=$(out)" "INSTALL=install" ]; buildInputs = [] - ++ lib.optional stdenv.isDarwin IOKit; + ++ lib.optional stdenv.hostPlatform.isDarwin IOKit; meta = with lib; { homepage = "http://linukz.org/cd-discid.shtml"; diff --git a/pkgs/applications/audio/cdparanoia/default.nix b/pkgs/applications/audio/cdparanoia/default.nix index 4c861a177846d..bdeb8eec896d7 100644 --- a/pkgs/applications/audio/cdparanoia/default.nix +++ b/pkgs/applications/audio/cdparanoia/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1pv4zrajm46za0f6lv162iqffih57a8ly4pc69f7y0gfyigb8p80"; }; - patches = lib.optionals stdenv.isDarwin [ + patches = lib.optionals stdenv.hostPlatform.isDarwin [ (fetchpatch { url = "https://trac.macports.org/export/70964/trunk/dports/audio/cdparanoia/files/osx_interface.patch"; sha256 = "0hq3lvfr0h1m3p0r33jij0s1aspiqlpy533rwv19zrfllb39qvr8"; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { autoreconfHook ]; - propagatedBuildInputs = lib.optionals stdenv.isDarwin [ + propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Carbon IOKit ]; diff --git a/pkgs/applications/audio/chuck/default.nix b/pkgs/applications/audio/chuck/default.nix index 6b975b3c6b957..db42e60730eab 100644 --- a/pkgs/applications/audio/chuck/default.nix +++ b/pkgs/applications/audio/chuck/default.nix @@ -12,16 +12,16 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ flex bison which ] - ++ lib.optionals stdenv.isDarwin [ DarwinTools xcbuild ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ DarwinTools xcbuild ]; buildInputs = [ libsndfile ] - ++ lib.optional (!stdenv.isDarwin) alsa-lib - ++ lib.optionals stdenv.isDarwin [ AppKit Carbon CoreAudio CoreMIDI CoreServices Kernel MultitouchSupport ]; + ++ lib.optional (!stdenv.hostPlatform.isDarwin) alsa-lib + ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit Carbon CoreAudio CoreMIDI CoreServices Kernel MultitouchSupport ]; patches = [ ./darwin-limits.patch ]; makeFlags = [ "-C src" "DESTDIR=$(out)/bin" ]; - buildFlags = [ (if stdenv.isDarwin then "mac" else "linux-alsa") ]; + buildFlags = [ (if stdenv.hostPlatform.isDarwin then "mac" else "linux-alsa") ]; meta = with lib; { description = "Programming language for real-time sound synthesis and music creation"; diff --git a/pkgs/applications/audio/cider/default.nix b/pkgs/applications/audio/cider/default.nix index 21dd14ddc7ce5..48289d6d37d39 100644 --- a/pkgs/applications/audio/cider/default.nix +++ b/pkgs/applications/audio/cider/default.nix @@ -9,10 +9,11 @@ appimageTools.wrapType2 rec { sha256 = "sha256-NwoV1eeAN0u9VXWpu5mANXhmgqe8u3h7BlsREP1f/pI="; }; + nativeBuildInputs = [ makeWrapper ]; + extraInstallCommands = let contents = appimageTools.extract { inherit pname version src; }; in '' - source "${makeWrapper}/nix-support/setup-hook" wrapProgram $out/bin/${pname} \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix index 75394a4afcfdc..c0f7c3cbc82a8 100644 --- a/pkgs/applications/audio/clementine/default.nix +++ b/pkgs/applications/audio/clementine/default.nix @@ -47,15 +47,16 @@ let withMTP = config.clementine.mtp or true; withCD = config.clementine.cd or true; withCloud = config.clementine.cloud or true; -in mkDerivation { +in +mkDerivation { pname = "clementine"; - version = "unstable-2022-04-11"; + version = "1.4.rc2-unstable-2024-05-12"; src = fetchFromGitHub { owner = "clementine-player"; repo = "Clementine"; - rev = "250024e117fbe5fae7c62b9c8e655d66412a6ed7"; - sha256 = "06fcbs3wig3mh711iypyj49qm5246f7qhvgvv8brqfrd8cqyh6qf"; + rev = "7607ddcb96e79d373c4b60d9de21f3315719c7d8"; + sha256 = "sha256-yOG/Je6N8YEsu5AOtxOFgDl3iqb97assYMZYMSwQqqk="; }; nativeBuildInputs = [ @@ -117,6 +118,7 @@ in mkDerivation { ''; cmakeFlags = [ + "-DFORCE_GIT_REVISION=1.3.1" "-DUSE_SYSTEM_PROJECTM=ON" "-DSPOTIFY_BLOB=OFF" ]; diff --git a/pkgs/applications/audio/cmus/default.nix b/pkgs/applications/audio/cmus/default.nix index db32f8548517b..bef7d46a53e41 100644 --- a/pkgs/applications/audio/cmus/default.nix +++ b/pkgs/applications/audio/cmus/default.nix @@ -1,15 +1,15 @@ { config, lib, stdenv, fetchFromGitHub, ncurses, pkg-config , libiconv, CoreAudio, AudioUnit, VideoToolbox -, alsaSupport ? stdenv.isLinux, alsa-lib ? null +, alsaSupport ? stdenv.hostPlatform.isLinux, alsa-lib ? null # simple fallback for everyone else -, aoSupport ? !stdenv.isLinux, libao ? null +, aoSupport ? !stdenv.hostPlatform.isLinux, libao ? null , jackSupport ? false, libjack ? null , samplerateSupport ? jackSupport, libsamplerate ? null , ossSupport ? false, alsa-oss ? null , pulseaudioSupport ? config.pulseaudio or false, libpulseaudio ? null , sndioSupport ? false, sndio ? null -, mprisSupport ? stdenv.isLinux, systemd ? null +, mprisSupport ? stdenv.hostPlatform.isLinux, systemd ? null # TODO: add these #, artsSupport @@ -103,7 +103,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ ncurses ] - ++ lib.optionals stdenv.isDarwin [ libiconv CoreAudio AudioUnit VideoToolbox ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv CoreAudio AudioUnit VideoToolbox ] ++ lib.flatten (lib.concatMap (a: a.deps) opts); prefixKey = "prefix="; diff --git a/pkgs/applications/audio/cmusfm/default.nix b/pkgs/applications/audio/cmusfm/default.nix index 5d3a62bd2a562..117356bf948e7 100644 --- a/pkgs/applications/audio/cmusfm/default.nix +++ b/pkgs/applications/audio/cmusfm/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, curl, libnotify -, gdk-pixbuf, libnotifySupport ? stdenv.isLinux, debug ? false }: +, gdk-pixbuf, libnotifySupport ? stdenv.hostPlatform.isLinux, debug ? false }: stdenv.mkDerivation rec { pname = "cmusfm"; diff --git a/pkgs/applications/audio/cozy/default.nix b/pkgs/applications/audio/cozy/default.nix index 6777893460877..22ebd11c77253 100644 --- a/pkgs/applications/audio/cozy/default.nix +++ b/pkgs/applications/audio/cozy/default.nix @@ -24,6 +24,14 @@ python3Packages.buildPythonApplication rec { hash = "sha256-oMgdz2dny0u1XV13aHu5s8/pcAz8z/SAOf4hbCDsdjw"; }; + # FIX: The "Support Debian non-standard python paths" resolves to store path of python + postPatch = '' + substituteInPlace meson.build \ + --replace-fail \ + 'from distutils.sysconfig import get_python_lib; print(get_python_lib(prefix=""))' \ + "print(\"$out/${python3Packages.python.sitePackages}\")" + ''; + nativeBuildInputs = [ meson ninja diff --git a/pkgs/applications/audio/csound/csound-qt/default.nix b/pkgs/applications/audio/csound/csound-qt/default.nix index c2c9432eaeb0b..a747cb2e14d74 100644 --- a/pkgs/applications/audio/csound/csound-qt/default.nix +++ b/pkgs/applications/audio/csound/csound-qt/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "csound-qt"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitHub { owner = "CsoundQt"; repo = "CsoundQt"; rev = "v${version}"; - hash = "sha256-PdylVOnunbB36dbZX/wzd9A8CJPDv/xH5HPLAUkRu28="; + hash = "sha256-ufjZQnO3H5pwdeEwGqunbXCfx7nvWTzak4cwVYWqvz4="; }; patches = [ diff --git a/pkgs/applications/audio/csound/default.nix b/pkgs/applications/audio/csound/default.nix index ccaacf189faea..c6359103593ff 100644 --- a/pkgs/applications/audio/csound/default.nix +++ b/pkgs/applications/audio/csound/default.nix @@ -31,21 +31,21 @@ stdenv.mkDerivation rec { }; cmakeFlags = [ "-DBUILD_CSOUND_AC=0" ] # fails to find Score.hpp - ++ lib.optional stdenv.isDarwin "-DCS_FRAMEWORK_DEST=${placeholder "out"}/lib" + ++ lib.optional stdenv.hostPlatform.isDarwin "-DCS_FRAMEWORK_DEST=${placeholder "out"}/lib" # Ignore gettext in CMAKE_PREFIX_PATH on cross to prevent find_program picking up the wrong gettext ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "-DCMAKE_IGNORE_PATH=${lib.getBin gettext}/bin"; nativeBuildInputs = [ cmake flex bison gettext ]; buildInputs = [ libsndfile libsamplerate boost ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Accelerate AudioUnit CoreAudio CoreMIDI portaudio - ] ++ lib.optionals stdenv.isLinux (builtins.filter (optional: optional != null) [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux (builtins.filter (optional: optional != null) [ alsa-lib libpulseaudio libjack2 liblo ladspa-sdk fluidsynth eigen curl tcltk fltk ]); - postInstall = lib.optional stdenv.isDarwin '' + postInstall = lib.optional stdenv.hostPlatform.isDarwin '' mkdir -p $out/Library/Frameworks ln -s $out/lib/CsoundLib64.framework $out/Library/Frameworks ''; diff --git a/pkgs/applications/audio/delayarchitect/default.nix b/pkgs/applications/audio/delayarchitect/default.nix index a3a38c93953f2..c422549d6617b 100644 --- a/pkgs/applications/audio/delayarchitect/default.nix +++ b/pkgs/applications/audio/delayarchitect/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "jpcima"; repo = "DelayArchitect"; rev = "5abf4dfb7f92ba604d591a2c388d2d69a9055fe3"; - sha256 = "sha256-LoK2pYPLzyJF7tDJPRYer6gKHNYzvFvX/d99TuOPECo="; + hash = "sha256-LoK2pYPLzyJF7tDJPRYer6gKHNYzvFvX/d99TuOPECo="; fetchSubmodules = true; }; diff --git a/pkgs/applications/audio/dexed/default.nix b/pkgs/applications/audio/dexed/default.nix index d7e8b0fd23803..46cdb937f75ef 100644 --- a/pkgs/applications/audio/dexed/default.nix +++ b/pkgs/applications/audio/dexed/default.nix @@ -29,12 +29,11 @@ stdenv.mkDerivation rec { repo = "dexed"; rev = "2c036316bcd512818aa9cc8129767ad9e0ec7132"; fetchSubmodules = true; - sha256 = "sha256-6buvA72YRlGjHWLPEZMr45lYYG6ZY+IWmylcHruX27g="; + hash = "sha256-6buvA72YRlGjHWLPEZMr45lYYG6ZY+IWmylcHruX27g="; }; postPatch = '' # needs special setup on Linux, dunno if it can work on Darwin - # https://github.com/NixOS/nixpkgs/issues/19098 sed -i -e '/juce::juce_recommended_lto_flags/d' Source/CMakeLists.txt ''; diff --git a/pkgs/applications/audio/distrho/default.nix b/pkgs/applications/audio/distrho/default.nix index 258eec83724e4..1da0b6ee0d220 100644 --- a/pkgs/applications/audio/distrho/default.nix +++ b/pkgs/applications/audio/distrho/default.nix @@ -92,7 +92,7 @@ stdenv.mkDerivation rec { wolpertinger ''; license = with licenses; [ gpl2Only gpl3Only gpl2Plus lgpl2Plus lgpl3Only mit ]; - maintainers = [ maintainers.goibhniu ]; + maintainers = [ ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/audio/dragonfly-reverb/default.nix b/pkgs/applications/audio/dragonfly-reverb/default.nix index a495e77651b04..3ec98c9bd7172 100644 --- a/pkgs/applications/audio/dragonfly-reverb/default.nix +++ b/pkgs/applications/audio/dragonfly-reverb/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "michaelwillis"; repo = "dragonfly-reverb"; rev = version; - sha256 = "sha256-YXJ4U5J8Za+DlXvp6QduvCHIVC2eRJ3+I/KPihCaIoY="; + hash = "sha256-YXJ4U5J8Za+DlXvp6QduvCHIVC2eRJ3+I/KPihCaIoY="; fetchSubmodules = true; }; diff --git a/pkgs/applications/audio/drumgizmo/default.nix b/pkgs/applications/audio/drumgizmo/default.nix index f7d05198939b7..fb0483dcdf9c8 100644 --- a/pkgs/applications/audio/drumgizmo/default.nix +++ b/pkgs/applications/audio/drumgizmo/default.nix @@ -35,6 +35,6 @@ stdenv.mkDerivation rec { homepage = "https://www.drumgizmo.org"; license = licenses.lgpl3Plus; platforms = platforms.linux; - maintainers = [ maintainers.goibhniu maintainers.nico202 ]; + maintainers = [ maintainers.nico202 ]; }; } diff --git a/pkgs/applications/audio/drumkv1/default.nix b/pkgs/applications/audio/drumkv1/default.nix index 73d55c97f56f2..345116e938257 100644 --- a/pkgs/applications/audio/drumkv1/default.nix +++ b/pkgs/applications/audio/drumkv1/default.nix @@ -19,6 +19,6 @@ mkDerivation rec { homepage = "http://drumkv1.sourceforge.net/"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = [ maintainers.goibhniu ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/audio/eartag/default.nix b/pkgs/applications/audio/eartag/default.nix index 11bd27953f12d..d3df0295802c6 100644 --- a/pkgs/applications/audio/eartag/default.nix +++ b/pkgs/applications/audio/eartag/default.nix @@ -50,7 +50,7 @@ python3Packages.buildPythonApplication rec { gobject-introspection wrapGAppsHook4 blueprint-compiler - ] ++ lib.optional stdenv.isDarwin gtk4; # for gtk4-update-icon-cache + ] ++ lib.optional stdenv.hostPlatform.isDarwin gtk4; # for gtk4-update-icon-cache buildInputs = [ librsvg diff --git a/pkgs/applications/audio/easyaudiosync/default.nix b/pkgs/applications/audio/easyaudiosync/default.nix index 0b910dfb573b8..38fe6b15d9378 100644 --- a/pkgs/applications/audio/easyaudiosync/default.nix +++ b/pkgs/applications/audio/easyaudiosync/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { cmake pkg-config wrapQtAppsHook - ] ++ lib.optional stdenv.isLinux copyDesktopItems; + ] ++ lib.optional stdenv.hostPlatform.isLinux copyDesktopItems; buildInputs = [ qtbase @@ -48,11 +48,11 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications mv "easyaudiosync.app" "Easy Audio Sync.app" cp -r "Easy Audio Sync.app" $out/Applications - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' install -Dm755 easyaudiosync $out/bin/easyaudiosync for RES in 48 64 128 256; do diff --git a/pkgs/applications/audio/easyeffects/default.nix b/pkgs/applications/audio/easyeffects/default.nix deleted file mode 100644 index 4730df0464d66..0000000000000 --- a/pkgs/applications/audio/easyeffects/default.nix +++ /dev/null @@ -1,122 +0,0 @@ -{ lib -, stdenv -, appstream-glib -, desktop-file-utils -, deepfilternet -, fetchFromGitHub -, calf -, fftw -, fftwFloat -, fmt_9 -, glib -, gsl -, gtk4 -, itstool -, ladspaH -, libadwaita -, libbs2b -, libebur128 -, libportal-gtk4 -, libsamplerate -, libsigcxx30 -, libsndfile -, lilv -, lsp-plugins -, lv2 -, mda_lv2 -, meson -, ninja -, nlohmann_json -, pipewire -, pkg-config -, rnnoise -, rubberband -, speexdsp -, soundtouch -, tbb -, wrapGAppsHook4 -, zam-plugins -, zita-convolver -}: - -stdenv.mkDerivation rec { - pname = "easyeffects"; - version = "7.1.6"; - - src = fetchFromGitHub { - owner = "wwmm"; - repo = "easyeffects"; - rev = "v${version}"; - hash = "sha256-NViRZHNgsweoD1YbyWYrRTZPKTCkKk3fGDLLYDD7JfA="; - }; - - nativeBuildInputs = [ - desktop-file-utils - itstool - meson - ninja - pkg-config - wrapGAppsHook4 - ]; - - buildInputs = [ - appstream-glib - deepfilternet - fftw - fftwFloat - fmt_9 - glib - gsl - gtk4 - ladspaH - libadwaita - libbs2b - libebur128 - libportal-gtk4 - libsamplerate - libsigcxx30 - libsndfile - lilv - lv2 - nlohmann_json - pipewire - rnnoise - rubberband - soundtouch - speexdsp - tbb - zita-convolver - ]; - - preFixup = - let - lv2Plugins = [ - calf # compressor exciter, bass enhancer and others - lsp-plugins # delay, limiter, multiband compressor - mda_lv2 # loudness - zam-plugins # maximizer - ]; - ladspaPlugins = [ - deepfilternet # deep noise remover - rubberband # pitch shifting - ]; - in - '' - gappsWrapperArgs+=( - --set LV2_PATH "${lib.makeSearchPath "lib/lv2" lv2Plugins}" - --set LADSPA_PATH "${lib.makeSearchPath "lib/ladspa" ladspaPlugins}" - ) - ''; - - separateDebugInfo = true; - - meta = with lib; { - changelog = "https://github.com/wwmm/easyeffects/blob/v${version}/CHANGELOG.md"; - description = "Audio effects for PipeWire applications"; - homepage = "https://github.com/wwmm/easyeffects"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ ]; - platforms = platforms.linux; - mainProgram = "easyeffects"; - }; -} 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/eflite/default.nix b/pkgs/applications/audio/eflite/default.nix deleted file mode 100644 index 96b604b7c0584..0000000000000 --- a/pkgs/applications/audio/eflite/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ lib, stdenv, fetchurl, fetchpatch, flite, alsa-lib, debug ? false }: - -stdenv.mkDerivation rec { - pname = "eflite"; - version = "0.4.1"; - - src = fetchurl { - url = "https://sourceforge.net/projects/eflite/files/eflite/${version}/${pname}-${version}.tar.gz"; - sha256 = "088p9w816s02s64grfs28gai3lnibzdjb9d1jwxzr8smbs2qbbci"; - }; - - buildInputs = [ flite alsa-lib ]; - - configureFlags = [ - "flite_dir=${flite}" - "--with-audio=alsa" - "--with-vox=cmu_us_kal16" - ]; - - patches = [ - (fetchpatch { - url = "https://sources.debian.org/data/main/e/eflite/0.4.1-8/debian/patches/cvs-update"; - sha256 = "0r631vzmky7b7qyhm152557y4fr0xqrpi3y4w66fcn6p4rj03j05"; - }) - (fetchpatch { - url = "https://sources.debian.org/data/main/e/eflite/0.4.1-8/debian/patches/buf-overflow"; - sha256 = "071qk133kb7n7bq6kxgh3p9bba6hcl1ixsn4lx8vp8klijgrvkmx"; - }) - (fetchpatch { - url = "https://sources.debian.org/data/main/e/eflite/0.4.1-8/debian/patches/link"; - sha256 = "0p833dp4pdsya72bwh3syvkq85927pm6snxvx13lvcppisbhj0fc"; - }) - ./format.patch - ]; - - CFLAGS = lib.optionalString debug " -DDEBUG=2"; - - meta = { - homepage = "https://eflite.sourceforge.net"; - description = "Speech server for screen readers"; - longDescription = '' - EFlite is a speech server for Emacspeak and other screen - readers that allows them to interface with Festival Lite, - a free text-to-speech engine developed at the CMU Speech - Center as an off-shoot of Festival. - ''; - license = lib.licenses.gpl2; - platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ jhhuh ]; - mainProgram = "eflite"; - }; -} diff --git a/pkgs/applications/audio/eflite/format.patch b/pkgs/applications/audio/eflite/format.patch deleted file mode 100644 index d1a81aac48012..0000000000000 --- a/pkgs/applications/audio/eflite/format.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- eflite-0.4.1.orig/es.c 2017-03-02 14:38:36.009731423 +0100 -+++ eflite-0.4.1/es.c 2017-03-02 14:39:06.285894934 +0100 -@@ -449,7 +449,7 @@ - fclose(fp); - if (flags & LOG_STDERR) - { -- fprintf(stderr, buf); -+ fprintf(stderr, "%s", buf); - fprintf(stderr, "\n"); - } - #endif diff --git a/pkgs/applications/audio/ekho/default.nix b/pkgs/applications/audio/ekho/default.nix deleted file mode 100644 index c0cde8aaf9a1e..0000000000000 --- a/pkgs/applications/audio/ekho/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, pkg-config -, autoconf -, automake -, libtool -, libsndfile -, libpulseaudio -, espeak-ng -, sonic -, utf8cpp -, AudioUnit -}: - -stdenv.mkDerivation rec { - pname = "ekho"; - version = "9.0"; - - src = fetchFromGitHub { - owner = "hgneng"; - repo = "ekho"; - rev = "v${version}"; - hash = "sha256-VYN9tR3BJXd3UA0V5vqQJNItJe1e1knZ+S7tLeaeYYk="; - }; - - preConfigure = '' - ./autogen.sh - ''; - - CXXFLAGS = [ - "-O0" - "-I${lib.getDev utf8cpp}/include/utf8cpp" - ]; - - nativeBuildInputs = [ pkg-config autoconf automake libtool ]; - - buildInputs = [ libsndfile libpulseaudio espeak-ng sonic utf8cpp ] - ++ lib.optionals stdenv.isDarwin [ AudioUnit ]; - - meta = with lib; { - description = "Chinese text-to-speech software"; - homepage = "http://www.eguidedog.net/ekho.php"; - longDescription = '' - Ekho (余音) is a free, open source and multilingual text-to-speech (TTS) - software. It supports Cantonese (Chinese dialect spoken in Hong Kong and - part of Guangdong province), Mandarin (standard Chinese), Zhaoan Hakka - (a dialect in Taiwan), Tibetan, Ngangien (an ancient Chinese before - Yuan Dynasty) and Korean (in trial). - ''; - license = licenses.gpl2Plus; - platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ aaronjheng ]; - }; -} diff --git a/pkgs/applications/audio/eq10q/default.nix b/pkgs/applications/audio/eq10q/default.nix index 84c8333d18575..5be1594343545 100644 --- a/pkgs/applications/audio/eq10q/default.nix +++ b/pkgs/applications/audio/eq10q/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ''; meta = { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); description = "LV2 EQ plugins and more, with 64 bit processing"; longDescription = '' Up to 10-Bands parametric equalizer with mono and stereo versions. diff --git a/pkgs/applications/audio/espeak-ng/default.nix b/pkgs/applications/audio/espeak-ng/default.nix index f0aebf4e4a32a..7eabadec04c22 100644 --- a/pkgs/applications/audio/espeak-ng/default.nix +++ b/pkgs/applications/audio/espeak-ng/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { buildInputs = lib.optional mbrolaSupport mbrola ++ lib.optional pcaudiolibSupport pcaudiolib ++ lib.optional sonicSupport sonic - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreAudio AudioToolbox AudioUnit @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { # touch ChangeLog to avoid below error on darwin: # Makefile.am: error: required file './ChangeLog.md' not found - preConfigure = lib.optionalString stdenv.isDarwin '' + preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin '' touch ChangeLog '' + '' ./autogen.sh @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { --replace '../src/espeak-ng --compile' "${lib.getExe buildPackages.espeak-ng} --compile" ''; - postInstall = lib.optionalString stdenv.isLinux '' + postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' patchelf --set-rpath "$(patchelf --print-rpath $out/bin/espeak-ng)" $out/bin/speak-ng wrapProgram $out/bin/espeak-ng \ --set ALSA_PLUGIN_DIR ${alsa-plugins}/lib/alsa-lib 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/famistudio/default.nix b/pkgs/applications/audio/famistudio/default.nix index b858edf29bca5..4e13d1aa0a5fa 100644 --- a/pkgs/applications/audio/famistudio/default.nix +++ b/pkgs/applications/audio/famistudio/default.nix @@ -9,7 +9,6 @@ , libglvnd , libogg , libvorbis -, makeWrapper , openal , portaudio , rtmidi diff --git a/pkgs/applications/audio/faust/faust2.nix b/pkgs/applications/audio/faust/faust2.nix index a1d1bd06ab759..68a9708e2842e 100644 --- a/pkgs/applications/audio/faust/faust2.nix +++ b/pkgs/applications/audio/faust/faust2.nix @@ -29,7 +29,7 @@ let owner = "grame-cncm"; repo = "faust"; rev = version; - sha256 = "sha256-0r7DjTrsNKZ5ZmWoA+Y9OXyJFUiUFZiPQb1skXXWYTw="; + hash = "sha256-0r7DjTrsNKZ5ZmWoA+Y9OXyJFUiUFZiPQb1skXXWYTw="; fetchSubmodules = true; }; diff --git a/pkgs/applications/audio/faust/faust2lv2.nix b/pkgs/applications/audio/faust/faust2lv2.nix index b7e9ffb488c43..b863ad25ebdb5 100644 --- a/pkgs/applications/audio/faust/faust2lv2.nix +++ b/pkgs/applications/audio/faust/faust2lv2.nix @@ -2,7 +2,6 @@ , faust , lv2 , qtbase -, which }: faust.wrapWithBuildEnv { diff --git a/pkgs/applications/audio/faustPhysicalModeling/default.nix b/pkgs/applications/audio/faustPhysicalModeling/default.nix index 8b00ca2252a69..1b7372d5d904c 100644 --- a/pkgs/applications/audio/faustPhysicalModeling/default.nix +++ b/pkgs/applications/audio/faustPhysicalModeling/default.nix @@ -1,13 +1,13 @@ { stdenv, lib, fetchFromGitHub, faust2jaqt, faust2lv2 }: stdenv.mkDerivation rec { pname = "faustPhysicalModeling"; - version = "2.74.6"; + version = "2.75.7"; src = fetchFromGitHub { owner = "grame-cncm"; repo = "faust"; rev = version; - sha256 = "sha256-2qgw7pauDZBvEb5iySNiq2Fq+T+qw+AjVTwxaSQ9Eko="; + sha256 = "sha256-j5Qg/H7aMBZ6A8gh6v6+ICxmCZ7ya2tVF2FjueVtvHo="; }; buildInputs = [ faust2jaqt faust2lv2 ]; diff --git a/pkgs/applications/audio/fdkaac/default.nix b/pkgs/applications/audio/fdkaac/default.nix index f944d414098f1..fffa6faf1006d 100644 --- a/pkgs/applications/audio/fdkaac/default.nix +++ b/pkgs/applications/audio/fdkaac/default.nix @@ -1,17 +1,17 @@ -{ lib, stdenv, autoreconfHook, fetchFromGitHub, fdk_aac }: +{ lib, stdenv, autoreconfHook, fetchFromGitHub, pkg-config, fdk_aac }: stdenv.mkDerivation rec { pname = "fdkaac"; - version = "1.0.5"; + version = "1.0.6"; src = fetchFromGitHub { owner = "nu774"; repo = pname; rev = "v${version}"; - sha256 = "sha256-GYvI9T5Bv2OcK0hMAQE7/tE6ajDyqkaak66b3Hc0Fls="; + hash = "sha256-nVVeYk7t4+n/BsOKs744stsvgJd+zNnbASk3bAgFTpk="; }; - nativeBuildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ fdk_aac ]; diff --git a/pkgs/applications/audio/feishin/default.nix b/pkgs/applications/audio/feishin/default.nix deleted file mode 100644 index 98a0c5edebce1..0000000000000 --- a/pkgs/applications/audio/feishin/default.nix +++ /dev/null @@ -1,161 +0,0 @@ -{ - lib, - stdenv, - buildNpmPackage, - fetchFromGitHub, - electron_30, - darwin, - copyDesktopItems, - makeDesktopItem, - ... -}: -let - pname = "feishin"; - version = "0.7.1"; - - src = fetchFromGitHub { - owner = "jeffvli"; - repo = pname; - rev = "v${version}"; - hash = "sha256-eNGHrSF/MgRHh0CVc0l8denZIbAnPXwFCZJZcvF+Xtc="; - }; - - electron = electron_30; -in -buildNpmPackage { - inherit pname version; - - inherit src; - npmDepsHash = "sha256-7oh5bl5APAvzb/TxHMUP/saRWLwuP9xqGvn7/RDhFk8="; - - npmFlags = [ "--legacy-peer-deps" ]; - makeCacheWritable = true; - - env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; - - nativeBuildInputs = - lib.optionals (stdenv.isLinux) [ copyDesktopItems ] - ++ lib.optionals stdenv.isDarwin [ darwin.autoSignDarwinBinariesHook ]; - - postPatch = - '' - # release/app dependencies are installed on preConfigure - substituteInPlace package.json \ - --replace-fail "electron-builder install-app-deps &&" "" - - # Don't check for updates. - substituteInPlace src/main/main.ts \ - --replace-fail "autoUpdater.checkForUpdatesAndNotify();" "" - '' - + lib.optionalString stdenv.isLinux '' - # https://github.com/electron/electron/issues/31121 - substituteInPlace src/main/main.ts \ - --replace-fail "process.resourcesPath" "'$out/share/feishin/resources'" - ''; - - preConfigure = - let - releaseAppDeps = buildNpmPackage { - pname = "${pname}-release-app"; - inherit version; - - src = "${src}/release/app"; - npmDepsHash = "sha256-NgWPr3mctn7f6X2JFsbdNNHkN84RRlLAywqfbyahCQw="; - - npmFlags = [ "--ignore-scripts" ]; - dontNpmBuild = true; - - env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; - }; - releaseNodeModules = "${releaseAppDeps}/lib/node_modules/feishin/node_modules"; - in - '' - for release_module_path in "${releaseNodeModules}"/*; do - rm -rf node_modules/"$(basename "$release_module_path")" - ln -s "$release_module_path" node_modules/ - done - ''; - - postBuild = - lib.optionalString stdenv.isDarwin '' - # electron-builder appears to build directly on top of Electron.app, by overwriting the files in the bundle. - cp -r ${electron}/Applications/Electron.app ./ - find ./Electron.app -name 'Info.plist' | xargs -d '\n' chmod +rw - - # Disable code signing during build on macOS. - # https://github.com/electron-userland/electron-builder/blob/fa6fc16/docs/code-signing.md#how-to-disable-code-signing-during-the-build-process-on-macos - export CSC_IDENTITY_AUTO_DISCOVERY=false - sed -i "/afterSign/d" package.json - '' - + '' - npm exec electron-builder -- \ - --dir \ - -c.electronDist=${if stdenv.isDarwin then "./" else "${electron}/libexec/electron"} \ - -c.electronVersion=${electron.version} \ - -c.npmRebuild=false - ''; - - installPhase = - '' - runHook preInstall - '' - + lib.optionalString stdenv.isDarwin '' - mkdir -p $out/{Applications,bin} - cp -r release/build/**/Feishin.app $out/Applications/ - makeWrapper $out/Applications/Feishin.app/Contents/MacOS/Feishin $out/bin/feishin - '' - + lib.optionalString stdenv.isLinux '' - mkdir -p $out/share/feishin - pushd release/build/*/ - cp -r locales resources{,.pak} $out/share/feishin - popd - - # Code relies on checking app.isPackaged, which returns false if the executable is electron. - # Set ELECTRON_FORCE_IS_PACKAGED=1. - # https://github.com/electron/electron/issues/35153#issuecomment-1202718531 - makeWrapper ${lib.getExe electron} $out/bin/feishin \ - --add-flags $out/share/feishin/resources/app.asar \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ - --set ELECTRON_FORCE_IS_PACKAGED=1 \ - --inherit-argv0 - - for size in 32 64 128 256 512 1024; do - mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps - ln -s \ - $out/share/feishin/resources/assets/icons/"$size"x"$size".png \ - $out/share/icons/hicolor/"$size"x"$size"/apps/${pname}.png - done - '' - + '' - runHook postInstall - ''; - - desktopItems = [ - (makeDesktopItem { - name = "feishin"; - desktopName = "Feishin"; - comment = "Full-featured Subsonic/Jellyfin compatible desktop music player"; - icon = pname; - exec = "feishin %u"; - categories = [ - "Audio" - "AudioVideo" - ]; - mimeTypes = [ "x-scheme-handler/feishin" ]; - }) - ]; - - meta = with lib; { - description = "Full-featured Subsonic/Jellyfin compatible desktop music player"; - homepage = "https://github.com/jeffvli/feishin"; - changelog = "https://github.com/jeffvli/feishin/releases/tag/v${version}"; - sourceProvenance = with sourceTypes; [ fromSource ]; - license = licenses.gpl3Plus; - platforms = platforms.unix; - mainProgram = "feishin"; - maintainers = with maintainers; [ - onny - jlbribeiro - ]; - }; -} diff --git a/pkgs/applications/audio/fire/default.nix b/pkgs/applications/audio/fire/default.nix index c1ccad191602b..5b71667a2af0b 100644 --- a/pkgs/applications/audio/fire/default.nix +++ b/pkgs/applications/audio/fire/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { repo = "Fire"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-X3pzTrNd0G6BouCDkr3dukQTFDzZ7qblIYxFQActKGE="; + hash = "sha256-X3pzTrNd0G6BouCDkr3dukQTFDzZ7qblIYxFQActKGE="; }; patches = [ @@ -49,7 +49,6 @@ stdenv.mkDerivation rec { postPatch = '' # 1. Remove hardcoded LTO flags: needs extra setup on Linux, # possibly broken on Darwin - # https://github.com/NixOS/nixpkgs/issues/19098 # 2. Disable automatic copying of built plugins during buildPhase, it defaults # into user home and we want to have building & installing separated. sed -i \ diff --git a/pkgs/applications/audio/fluidsynth/default.nix b/pkgs/applications/audio/fluidsynth/default.nix index 9197a21a28e10..d02f87642f3fb 100644 --- a/pkgs/applications/audio/fluidsynth/default.nix +++ b/pkgs/applications/audio/fluidsynth/default.nix @@ -19,8 +19,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ buildPackages.stdenv.cc pkg-config cmake ]; buildInputs = [ glib libsndfile libjack2 ] - ++ lib.optionals stdenv.isLinux [ alsa-lib libpulseaudio ] - ++ lib.optionals stdenv.isDarwin [ AppKit AudioUnit CoreAudio CoreMIDI CoreServices ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib libpulseaudio ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit AudioUnit CoreAudio CoreMIDI CoreServices ]; cmakeFlags = [ "-Denable-framework=off" @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { description = "Real-time software synthesizer based on the SoundFont 2 specifications"; homepage = "https://www.fluidsynth.org"; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ goibhniu lovek323 ]; + maintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; mainProgram = "fluidsynth"; }; diff --git a/pkgs/applications/audio/fmit/default.nix b/pkgs/applications/audio/fmit/default.nix index fdcf944220488..c22fe3ab0977a 100644 --- a/pkgs/applications/audio/fmit/default.nix +++ b/pkgs/applications/audio/fmit/default.nix @@ -36,17 +36,6 @@ mkDerivation rec { PREFIXSHORTCUT=$out" ''; - postInstall = '' - mkdir -p $out/share/applications - ln -s $out/fmit.desktop $out/share/applications/fmit.desktop - - mkdir -p $out/share/icons/hicolor/128x128/apps - ln -s $out/fmit.png $out/share/icons/hicolor/128x128/apps/fmit.png - - mkdir -p $out/share/icons/hicolor/scalable/apps - ln -s $out/fmit.svg $out/share/icons/hicolor/scalable/apps/fmit.svg - ''; - meta = with lib; { description = "Free Musical Instrument Tuner"; longDescription = '' @@ -55,6 +44,7 @@ mkDerivation rec { ''; homepage = "http://gillesdegottex.github.io/fmit/"; license = licenses.gpl3Plus; + maintainers = with maintainers; [ orivej ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/audio/friture/default.nix b/pkgs/applications/audio/friture/default.nix deleted file mode 100644 index b42cfb05c7fa0..0000000000000 --- a/pkgs/applications/audio/friture/default.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ lib, fetchFromGitHub, python3Packages, wrapQtAppsHook }: - -python3Packages.buildPythonApplication rec { - pname = "friture"; - version = "0.49"; - - src = fetchFromGitHub { - owner = "tlecomte"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-xKgyBV/Qc+9PgXyxcT0xG1GXLC6KnjavJ/0SUE+9VSY="; - }; - - nativeBuildInputs = (with python3Packages; [ numpy cython scipy ]) ++ - [ wrapQtAppsHook ]; - - propagatedBuildInputs = with python3Packages; [ - sounddevice - pyopengl - pyopengl-accelerate - docutils - numpy - pyqt5 - appdirs - pyrr - rtmixer - ]; - - postPatch = '' - # Remove version constraints from Python dependencies in setup.py - sed -i -E "s/\"([A-Za-z0-9]+)(=|>|<)=[0-9\.]+\"/\"\1\"/g" setup.py - ''; - - preFixup = '' - makeWrapperArgs+=("''${qtWrapperArgs[@]}") - ''; - - postInstall = '' - substituteInPlace $out/share/applications/friture.desktop --replace usr/bin/friture friture - - for size in 16 32 128 256 512 - do - mkdir -p $out/share/icons/hicolor/$size\x$size - cp $src/resources/images/friture.iconset/icon_$size\x$size.png $out/share/icons/hicolor/$size\x$size/friture.png - done - mkdir -p $out/share/icons/hicolor/scalable/apps/ - cp $src/resources/images-src/window-icon.svg $out/share/icons/hicolor/scalable/apps/friture.svg - ''; - - meta = with lib; { - description = "Real-time audio analyzer"; - mainProgram = "friture"; - homepage = "https://friture.org/"; - license = licenses.gpl3; - platforms = platforms.linux; # fails on Darwin - maintainers = with maintainers; [ laikq alyaeanyx ]; - }; -} diff --git a/pkgs/applications/audio/ft2-clone/default.nix b/pkgs/applications/audio/ft2-clone/default.nix index aac0eacad0d45..84de0229497d2 100644 --- a/pkgs/applications/audio/ft2-clone/default.nix +++ b/pkgs/applications/audio/ft2-clone/default.nix @@ -13,19 +13,19 @@ stdenv.mkDerivation rec { pname = "ft2-clone"; - version = "1.84"; + version = "1.86"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "ft2-clone"; rev = "v${version}"; - hash = "sha256-RPrNpm+0N//CpVtG6cJD+m+0G6ca75hZwdEdHsGadEg="; + hash = "sha256-/sdMBRCZvuKTp8ygCrLmIy0DiWJC6lLWdsY+ZxRY+pY="; }; nativeBuildInputs = [ cmake ]; buildInputs = [ SDL2 ] - ++ lib.optional stdenv.isLinux alsa-lib - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optional stdenv.hostPlatform.isLinux alsa-lib + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv CoreAudio CoreMIDI diff --git a/pkgs/applications/audio/g4music/default.nix b/pkgs/applications/audio/g4music/default.nix deleted file mode 100644 index da7e7777af5ff..0000000000000 --- a/pkgs/applications/audio/g4music/default.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ lib -, stdenv -, fetchFromGitLab -, desktop-file-utils -, gitUpdater -, gobject-introspection -, gst_all_1 -, gtk4 -, libadwaita -, meson -, ninja -, pkg-config -, vala -, wrapGAppsHook4 -}: -stdenv.mkDerivation (finalAttrs: { - pname = "g4music"; - version = "3.6.2"; - - src = fetchFromGitLab { - domain = "gitlab.gnome.org"; - owner = "neithern"; - repo = "g4music"; - rev = "v${finalAttrs.version}"; - hash = "sha256-yNKDTcLunTLhAtOBrjuycw0rrdCSwmhhVyBg3AfMUCQ="; - }; - - nativeBuildInputs = [ - desktop-file-utils - gobject-introspection - meson - ninja - pkg-config - vala - wrapGAppsHook4 - ]; - - buildInputs = [ - gtk4 - libadwaita - ] ++ (with gst_all_1; [ - gst-plugins-bad - gst-plugins-base - gst-plugins-good - gstreamer - ]); - - passthru.updateScript = gitUpdater { - rev-prefix = "v"; - }; - - meta = with lib; { - description = "Beautiful, fast, fluent, light weight music player written in GTK4"; - mainProgram = "g4music"; - homepage = "https://gitlab.gnome.org/neithern/g4music"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ magnouvean ]; - platforms = platforms.linux; - }; -}) diff --git a/pkgs/applications/audio/geonkick/default.nix b/pkgs/applications/audio/geonkick/default.nix index 2ff3c823a7ab7..da22ade3868c2 100644 --- a/pkgs/applications/audio/geonkick/default.nix +++ b/pkgs/applications/audio/geonkick/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { owner = "Geonkick-Synthesizer"; repo = pname; rev = "v${version}"; - sha256 = "sha256-zoEC85QYcQMF92KvLBikYw1nDoSHaedpTDDqvoAtte0="; + hash = "sha256-zoEC85QYcQMF92KvLBikYw1nDoSHaedpTDDqvoAtte0="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/applications/audio/gigedit/default.nix b/pkgs/applications/audio/gigedit/default.nix index 7a367aa7ba71b..d53aa51d9b569 100644 --- a/pkgs/applications/audio/gigedit/default.nix +++ b/pkgs/applications/audio/gigedit/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { homepage = "http://www.linuxsampler.org"; description = "Gigasampler file access library"; license = licenses.gpl2; - maintainers = [ maintainers.goibhniu ]; + maintainers = [ ]; platforms = platforms.linux; mainProgram = "gigedit"; }; diff --git a/pkgs/applications/audio/glicol-cli/default.nix b/pkgs/applications/audio/glicol-cli/default.nix index b549b6ac4fbec..8279bfc6b30db 100644 --- a/pkgs/applications/audio/glicol-cli/default.nix +++ b/pkgs/applications/audio/glicol-cli/default.nix @@ -25,9 +25,9 @@ rustPlatform.buildRustPackage rec { rustPlatform.bindgenHook ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AudioUnit - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib ]; diff --git a/pkgs/applications/audio/gmpc/default.nix b/pkgs/applications/audio/gmpc/default.nix deleted file mode 100644 index 3bd6f3138146c..0000000000000 --- a/pkgs/applications/audio/gmpc/default.nix +++ /dev/null @@ -1,67 +0,0 @@ -{ lib -, stdenv -, fetchurl -, libtool -, intltool -, pkg-config -, glib -, gtk2 -, curl -, libmpdclient -, libsoup -, gob2 -, vala -, libunique -, libSM -, libICE -, sqlite -, hicolor-icon-theme -, wrapGAppsHook3 -}: - -stdenv.mkDerivation rec { - pname = "gmpc"; - version = "11.8.16"; - - libmpd = stdenv.mkDerivation { - pname = "libmpd"; - version = "11.8.17"; - src = fetchurl { - url = "https://download.sarine.nl/Programs/gmpc/${lib.versions.majorMinor version}/libmpd-${version}.tar.gz"; - sha256 = "10vspwsgr8pwf3qp2bviw6b2l8prgdiswgv7qiqiyr0h1mmk487y"; - }; - patches = [ ./libmpd-11.8.17-remove-strndup.patch ]; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ glib ]; - }; - - src = fetchurl { - url = "http://download.sarine.nl/Programs/gmpc/11.8/gmpc-11.8.16.tar.gz"; - sha256 = "0b3bnxf98i5lhjyljvgxgx9xmb6p46cn3a9cccrng14nagri9556"; - }; - - nativeBuildInputs = [ pkg-config libtool intltool gob2 vala wrapGAppsHook3 ]; - buildInputs = [ - glib - gtk2 - curl - libmpdclient - libsoup - libunique - libmpd - libSM - libICE - sqlite - hicolor-icon-theme - ]; - - meta = with lib; { - homepage = "https://gmpclient.org"; - description = "GTK2 frontend for Music Player Daemon"; - license = licenses.gpl2; - maintainers = []; - platforms = platforms.linux; - }; -} -# TODO: what is this libmpd derivation embedded above? diff --git a/pkgs/applications/audio/gmpc/libmpd-11.8.17-remove-strndup.patch b/pkgs/applications/audio/gmpc/libmpd-11.8.17-remove-strndup.patch deleted file mode 100644 index ad4fdc02ef3e1..0000000000000 --- a/pkgs/applications/audio/gmpc/libmpd-11.8.17-remove-strndup.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/src/libmpd-internal.h b/src/libmpd-internal.h -index c84c3a4..51be441 100644 ---- a/src/libmpd-internal.h -+++ b/src/libmpd-internal.h -@@ -206,10 +206,6 @@ int mpd_unlock_conn(MpdObj *mi); - MpdData * mpd_misc_sort_tag_list(MpdData *data); - - --#ifndef HAVE_STRNDUP --char * strndup (const char *s, size_t n); --#endif -- - int mpd_server_get_allowed_commands(MpdObj *mi); - typedef enum _MpdSearchType { - MPD_SEARCH_TYPE_NONE, diff --git a/pkgs/applications/audio/gnome-podcasts/default.nix b/pkgs/applications/audio/gnome-podcasts/default.nix index f5e53a1c7c66a..5625f15e3a232 100644 --- a/pkgs/applications/audio/gnome-podcasts/default.nix +++ b/pkgs/applications/audio/gnome-podcasts/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { }; cargoDeps = rustPlatform.fetchCargoTarball { - inherit pname version src; + inherit src; hash = "sha256-XTfKqKs7874ak7Lzscxw8E2qcnJOWMZaaol8TpIB6Vw="; }; @@ -75,6 +75,6 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Plus; maintainers = lib.teams.gnome.members; platforms = lib.platforms.unix; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/gnome-podcasts.x86_64-darwin + broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/gnome-podcasts.x86_64-darwin }; } diff --git a/pkgs/applications/audio/go-musicfox/default.nix b/pkgs/applications/audio/go-musicfox/default.nix index 243fa8fa1a2a1..d0da4ce048b15 100644 --- a/pkgs/applications/audio/go-musicfox/default.nix +++ b/pkgs/applications/audio/go-musicfox/default.nix @@ -37,7 +37,7 @@ buildGoModule rec { buildInputs = [ flac - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib ]; diff --git a/pkgs/applications/audio/gpodder/default.nix b/pkgs/applications/audio/gpodder/default.nix index 0e6178006ccfc..9a62fab2850c9 100644 --- a/pkgs/applications/audio/gpodder/default.nix +++ b/pkgs/applications/audio/gpodder/default.nix @@ -2,17 +2,16 @@ , fetchFromGitHub , gitUpdater , glibcLocales -, gnome +, adwaita-icon-theme , gobject-introspection , gtk3 , intltool -, python3 -, python3Packages +, python311Packages , wrapGAppsHook3 , xdg-utils }: -python3Packages.buildPythonApplication rec { +python311Packages.buildPythonApplication rec { pname = "gpodder"; version = "3.11.4"; format = "other"; @@ -28,7 +27,7 @@ python3Packages.buildPythonApplication rec { ./disable-autoupdate.patch ]; - postPatch = with lib; '' + postPatch = '' sed -i -re 's,^( *gpodder_dir *= *).*,\1"'"$out"'",' bin/gpodder ''; @@ -40,21 +39,20 @@ python3Packages.buildPythonApplication rec { ]; buildInputs = [ - python3 gtk3 - gnome.adwaita-icon-theme + adwaita-icon-theme ]; - nativeCheckInputs = with python3Packages; [ + nativeCheckInputs = with python311Packages; [ minimock pytest pytest-httpserver - pytest-cov + pytest-cov-stub ]; doCheck = true; - propagatedBuildInputs = with python3Packages; [ + propagatedBuildInputs = with python311Packages; [ feedparser dbus-python mygpoclient diff --git a/pkgs/applications/audio/grandorgue/default.nix b/pkgs/applications/audio/grandorgue/default.nix index 9e519510eb721..771bef276221e 100644 --- a/pkgs/applications/audio/grandorgue/default.nix +++ b/pkgs/applications/audio/grandorgue/default.nix @@ -21,14 +21,14 @@ stdenv.mkDerivation rec { pname = "grandorgue"; - version = "3.14.2-1"; + version = "3.15.1-1"; src = fetchFromGitHub { owner = "GrandOrgue"; - repo = pname; + repo = "grandorgue"; rev = version; fetchSubmodules = true; - hash = "sha256-FHM8fFUga9poGhojKBTF4gsJ6L4XEksueVxfMbngvks="; + hash = "sha256-5uAA878OBc04PkUgCwoRtc6lIASivq3YcfFffTae6uM="; }; postPatch = '' @@ -41,8 +41,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config imagemagick libicns makeWrapper ]; buildInputs = [ fftwFloat zlib wavpack wxGTK32 yaml-cpp ] - ++ lib.optionals stdenv.isLinux [ alsa-lib udev ] - ++ lib.optionals stdenv.isDarwin [ Cocoa ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib udev ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ] ++ lib.optional jackaudioSupport libjack2; cmakeFlags = lib.optionals (!jackaudioSupport) [ @@ -52,12 +52,12 @@ stdenv.mkDerivation rec { "-DINSTALL_DEPEND=OFF" ] ++ lib.optional (!includeDemo) "-DINSTALL_DEMO=OFF"; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-DTARGET_OS_IPHONE=0"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-DTARGET_OS_IPHONE=0"; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/{Applications,bin,lib} mv $out/GrandOrgue.app $out/Applications/ - for lib in $out/Applications/GrandOrgue.app/Contents/MacOS/lib*; do + for lib in $out/Applications/GrandOrgue.app/Contents/Frameworks/lib*; do ln -s $lib $out/lib/ done makeWrapper $out/{Applications/GrandOrgue.app/Contents/MacOS,bin}/GrandOrgue diff --git a/pkgs/applications/audio/gst123/default.nix b/pkgs/applications/audio/gst123/default.nix index 65d925342be2c..d988983dcae5f 100644 --- a/pkgs/applications/audio/gst123/default.nix +++ b/pkgs/applications/audio/gst123/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; meta = { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "GStreamer based command line media player"; homepage = "https://space.twc.de/~stefan/gst123.php"; license = lib.licenses.lgpl2Plus; diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix index 71ac598000daf..5b23b0e34a219 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 @@ -131,7 +131,7 @@ stdenv.mkDerivation (finalAttrs: { ''; homepage = "https://github.com/brummer10/guitarix"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ astsmtl goibhniu lord-valen ]; + maintainers = with maintainers; [ astsmtl lord-valen ]; platforms = platforms.linux; }; }) diff --git a/pkgs/applications/audio/gxplugins-lv2/default.nix b/pkgs/applications/audio/gxplugins-lv2/default.nix index 93ae0cbc2e04d..8d3fb0046eed8 100644 --- a/pkgs/applications/audio/gxplugins-lv2/default.nix +++ b/pkgs/applications/audio/gxplugins-lv2/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "brummer10"; repo = pname; rev = "v${version}"; - sha256 = "sha256-NvmFoOAQtAnKrZgzG1Shy1HuJEWgjJloQEx6jw59hag="; + hash = "sha256-NvmFoOAQtAnKrZgzG1Shy1HuJEWgjJloQEx6jw59hag="; fetchSubmodules = true; }; diff --git a/pkgs/applications/audio/helio-workstation/default.nix b/pkgs/applications/audio/helio-workstation/default.nix index dc4bf6333d384..45cf34588948d 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 }: @@ -12,12 +12,12 @@ stdenv.mkDerivation rec { repo = pname; rev = version; fetchSubmodules = true; - sha256 = "sha256-esCulHphPD0gr0dsVBnRTvsGp56vHZmzdbz99mWq9R4="; + hash = "sha256-esCulHphPD0gr0dsVBnRTvsGp56vHZmzdbz99mWq9R4="; }; 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/hivelytracker/default.nix b/pkgs/applications/audio/hivelytracker/default.nix index 8ad62eb81a5a4..49cd0a78ed751 100644 --- a/pkgs/applications/audio/hivelytracker/default.nix +++ b/pkgs/applications/audio/hivelytracker/default.nix @@ -66,6 +66,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = platforms.all; mainProgram = "hivelytracker"; maintainers = with maintainers; [ fgaz ]; - broken = stdenv.isDarwin; # TODO: try to use xcbuild + broken = stdenv.hostPlatform.isDarwin; # TODO: try to use xcbuild }; }) diff --git a/pkgs/applications/audio/hydrogen/default.nix b/pkgs/applications/audio/hydrogen/default.nix index 1460a78d9a9b7..011cb71663c1f 100644 --- a/pkgs/applications/audio/hydrogen/default.nix +++ b/pkgs/applications/audio/hydrogen/default.nix @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { homepage = "http://www.hydrogen-music.org"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = with maintainers; [ goibhniu orivej ]; + maintainers = with maintainers; [ orivej ]; }; } diff --git a/pkgs/applications/audio/in-formant/default.nix b/pkgs/applications/audio/in-formant/default.nix index a6bcc68bf5a7a..1f33323736cef 100644 --- a/pkgs/applications/audio/in-formant/default.nix +++ b/pkgs/applications/audio/in-formant/default.nix @@ -13,7 +13,6 @@ , pkg-config , autoPatchelfHook , soxr -, freetype , libsamplerate , armadillo , tomlplusplus @@ -67,6 +66,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 = [ ]; }; } diff --git a/pkgs/applications/audio/indicator-sound-switcher/default.nix b/pkgs/applications/audio/indicator-sound-switcher/default.nix index 1a99287348276..cb8439305c681 100644 --- a/pkgs/applications/audio/indicator-sound-switcher/default.nix +++ b/pkgs/applications/audio/indicator-sound-switcher/default.nix @@ -1,7 +1,6 @@ { python3Packages , lib , fetchFromGitHub -, perlPackages , gettext , gtk3 , gobject-introspection @@ -15,13 +14,13 @@ python3Packages.buildPythonApplication rec { pname = "indicator-sound-switcher"; - version = "2.3.9"; + version = "2.3.10.1"; src = fetchFromGitHub { owner = "yktoo"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-qJ1lg9A1aCM+/v/JbQAVpYGX25qA5ULqsM8k7uH1uvQ="; + sha256 = "sha256-Benhlhz81EgL6+pmjzyruKBOS6O7ce5PPmIIzk2Zong="; }; postPatch = '' @@ -35,6 +34,7 @@ python3Packages.buildPythonApplication rec { wrapGAppsHook3 glib gdk-pixbuf + gobject-introspection ]; buildInputs = [ @@ -45,7 +45,6 @@ python3Packages.buildPythonApplication rec { python3Packages.setuptools python3Packages.pygobject3 gtk3 - gobject-introspection librsvg libayatana-appindicator libpulseaudio diff --git a/pkgs/applications/audio/ingen/default.nix b/pkgs/applications/audio/ingen/default.nix index b81201cc83e4f..81bd40c8207a5 100644 --- a/pkgs/applications/audio/ingen/default.nix +++ b/pkgs/applications/audio/ingen/default.nix @@ -1,29 +1,60 @@ -{ lib, stdenv, fetchgit, boost, ganv, glibmm, gtkmm2, libjack2, lilv -, lv2, pkg-config, python3, raul, serd, sord, sratom -, wafHook -, suil +{ + lib, + stdenv, + fetchFromGitLab, + portaudio, + boost, + ganv, + gtkmm2, + libjack2, + lilv, + pkg-config, + python3, + raul, + sord, + sratom, + suil, + meson, + ninja, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "ingen"; - version = "unstable-2019-12-09"; - name = "${pname}-${version}"; - - src = fetchgit { - url = "https://gitlab.com/drobilla/ingen.git"; - rev = "e32f32a360f2bf8f017ea347b6d1e568c0beaf68"; - sha256 = "0wjn2i3j7jb0bmxymg079xpk4iplb91q0xqqnvnpvyldrr7gawlb"; - deepClone = true; + version = "0-unstable-2024-07-13"; + + src = fetchFromGitLab { + owner = "drobilla"; + repo = "ingen"; + rev = "bbdab98ed282291b6e29a944359c360c9cca127e"; + hash = "sha256-BllWeVmEkHQaZD9Ba7H0JMRlxVROJ8pkIiC2VXYiweA="; }; - nativeBuildInputs = [ pkg-config wafHook python3 python3.pkgs.wrapPython ]; + nativeBuildInputs = [ + meson + ninja + pkg-config + python3 + python3.pkgs.wrapPython + ]; + buildInputs = [ - boost ganv glibmm gtkmm2 libjack2 lilv lv2 - python3 raul serd sord sratom suil + boost + ganv + gtkmm2 + libjack2 + lilv + portaudio + raul + sord + sratom + suil ]; strictDeps = true; + # lv2specgen.py is not packaged in lv2 but required to build docs + mesonFlags = [ "-Ddocs=disabled" ]; + pythonPath = [ python3 python3.pkgs.rdflib @@ -31,13 +62,14 @@ stdenv.mkDerivation rec { postInstall = '' wrapPythonProgramsIn "$out/bin" "$out $pythonPath" + wrapProgram "$out/bin/ingen" --set INGEN_UI_PATH "$out/share/ingen/ingen_gui.ui" ''; - meta = with lib; { + meta = { description = "Modular audio processing system using JACK and LV2 or LADSPA plugins"; homepage = "http://drobilla.net/software/ingen"; - license = licenses.agpl3Plus; - maintainers = [ maintainers.goibhniu ]; - platforms = platforms.linux; + license = lib.licenses.agpl3Plus; + maintainers = with lib.maintainers; [ t4ccer ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/audio/jack-capture/default.nix b/pkgs/applications/audio/jack-capture/default.nix index c3fc09cb088f9..6f5dd4ed0d3ce 100644 --- a/pkgs/applications/audio/jack-capture/default.nix +++ b/pkgs/applications/audio/jack-capture/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { mainProgram = "jack_capture"; homepage = "https://github.com/kmatheussen/jack_capture/"; license = licenses.gpl2; - maintainers = with maintainers; [ goibhniu orivej ]; + maintainers = with maintainers; [ orivej ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/audio/jack-oscrolloscope/default.nix b/pkgs/applications/audio/jack-oscrolloscope/default.nix index ea2d37151c79d..d3dee233fcf26 100644 --- a/pkgs/applications/audio/jack-oscrolloscope/default.nix +++ b/pkgs/applications/audio/jack-oscrolloscope/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { mainProgram = "jack_oscrolloscope"; homepage = "http://das.nasophon.de/jack_oscrolloscope"; license = licenses.gpl2; - maintainers = [ maintainers.goibhniu ]; + maintainers = [ ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/audio/jack-passthrough/default.nix b/pkgs/applications/audio/jack-passthrough/default.nix index b73e3035a6706..1fb0ce081fb35 100644 --- a/pkgs/applications/audio/jack-passthrough/default.nix +++ b/pkgs/applications/audio/jack-passthrough/default.nix @@ -8,14 +8,14 @@ , fmt_9 }: -stdenv.mkDerivation (finalAttrs: { +stdenv.mkDerivation { pname = "jack-passthrough"; version = "2021-9-25"; # https://github.com/guysherman/jack-passthrough src = fetchFromGitHub { owner = "guysherman"; - repo = finalAttrs.pname; + repo = "jack-passthrough"; rev = "aad03b7c5ccc4a4dcb8fa38c49aa64cb9d628660"; hash = "sha256-9IsNaLW5dYAqiwe+vX0+D3oIKFP2TIfy1q1YaqmS6wE="; }; @@ -37,4 +37,4 @@ stdenv.mkDerivation (finalAttrs: { platforms = [ "x86_64-linux" ]; mainProgram = "jack-passthru"; }; -}) +} diff --git a/pkgs/applications/audio/jacktrip/default.nix b/pkgs/applications/audio/jacktrip/default.nix index a7b3624546e0d..4d20e7a66b39e 100644 --- a/pkgs/applications/audio/jacktrip/default.nix +++ b/pkgs/applications/audio/jacktrip/default.nix @@ -11,7 +11,7 @@ }: stdenv.mkDerivation rec { - version = "2.3.0"; + version = "2.4.0"; pname = "jacktrip"; src = fetchFromGitHub { @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { repo = "jacktrip"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-MUP+8Hjrj95D5SONIEsweB5j+kgEhLEWTKWBlEWLt94="; + hash = "sha256-sTCzmQ/dq12ZmkbarVX1jpSODlBf9OuSB1XwKUnfV64="; }; preConfigure = '' diff --git a/pkgs/applications/audio/jalv/default.nix b/pkgs/applications/audio/jalv/default.nix index a528a209efa74..b17460e4e2e70 100644 --- a/pkgs/applications/audio/jalv/default.nix +++ b/pkgs/applications/audio/jalv/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { description = "Simple but fully featured LV2 host for Jack"; homepage = "http://drobilla.net/software/jalv"; license = licenses.isc; - maintainers = [ maintainers.goibhniu ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/audio/jamesdsp/default.nix b/pkgs/applications/audio/jamesdsp/default.nix index 4f9b5c68c859b..20c40d5d9d9b4 100644 --- a/pkgs/applications/audio/jamesdsp/default.nix +++ b/pkgs/applications/audio/jamesdsp/default.nix @@ -11,6 +11,7 @@ , qmake , qtbase , qtsvg +, qtwayland , stdenv , usePipewire ? true , usePulseaudio ? false @@ -43,6 +44,7 @@ stdenv.mkDerivation (finalAttrs: { libarchive qtbase qtsvg + qtwayland ] ++ lib.optionals usePipewire [ pipewire ] ++ lib.optionals usePulseaudio [ @@ -78,7 +80,7 @@ stdenv.mkDerivation (finalAttrs: { ''; meta = { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); description = "Audio effect processor for PipeWire clients"; mainProgram = "jamesdsp"; homepage = "https://github.com/Audio4Linux/JDSP4Linux"; diff --git a/pkgs/applications/audio/jellycli/default.nix b/pkgs/applications/audio/jellycli/default.nix index ddaa6721dfb7e..15d69211e1eff 100644 --- a/pkgs/applications/audio/jellycli/default.nix +++ b/pkgs/applications/audio/jellycli/default.nix @@ -21,7 +21,7 @@ buildGoModule rec { buildInputs = [ alsa-lib ]; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); description = "Jellyfin terminal client"; longDescription = '' Terminal music player, works with Jellyfin (>= 10.6) , Emby (>= 4.4), and diff --git a/pkgs/applications/audio/jmusicbot/default.nix b/pkgs/applications/audio/jmusicbot/default.nix index 3bf4d63eec721..1278bcc045235 100644 --- a/pkgs/applications/audio/jmusicbot/default.nix +++ b/pkgs/applications/audio/jmusicbot/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "JMusicBot"; - version = "0.4.1"; + version = "0.4.3"; src = fetchurl { url = "https://github.com/jagrosh/MusicBot/releases/download/${version}/JMusicBot-${version}.jar"; - sha256 = "sha256-+0814w4zKNr2TxZ9CS8FxeuTLa71jM+DhrfFvLMFlw0="; + sha256 = "sha256-7CHFc94Fe6ip7RY+XJR9gWpZPKM5JY7utHp8C3paU9s="; }; dontUnpack = true; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/jagrosh/MusicBot"; sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; inherit (jre_headless.meta) platforms; mainProgram = "JMusicBot"; }; diff --git a/pkgs/applications/audio/keyfinder-cli/default.nix b/pkgs/applications/audio/keyfinder-cli/default.nix index 9fe910d857691..1a4ac86cc2139 100644 --- a/pkgs/applications/audio/keyfinder-cli/default.nix +++ b/pkgs/applications/audio/keyfinder-cli/default.nix @@ -1,17 +1,17 @@ -{ lib, stdenv, fetchFromGitHub, ffmpeg, libkeyfinder }: +{ lib, stdenv, fetchFromGitHub, ffmpeg_7, libkeyfinder, fftw }: stdenv.mkDerivation rec { pname = "keyfinder-cli"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitHub { repo = "keyfinder-cli"; owner = "EvanPurkhiser"; rev = "v${version}"; - sha256 = "1mlcygbj3gqii3cz8jd6ks1lz612i4jp0343qjg293xm39fg47ns"; + hash = "sha256-9/+wzPTaQ5PfPiqTZ5EuHdswXJgfgnvAul/FeeDbbJA="; }; - buildInputs = [ ffmpeg libkeyfinder ]; + buildInputs = [ ffmpeg_7 libkeyfinder fftw ]; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/applications/audio/keyfinder/default.nix b/pkgs/applications/audio/keyfinder/default.nix deleted file mode 100644 index 24a72501db54e..0000000000000 --- a/pkgs/applications/audio/keyfinder/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib, mkDerivation, fetchFromGitHub, libav_0_8, libkeyfinder, qtbase, qtxmlpatterns, qmake, taglib }: - -mkDerivation rec { - pname = "keyfinder"; - version = "2.4"; - - src = fetchFromGitHub { - sha256 = "11yhdwan7bz8nn8vxr54drckyrnlxynhx5s981i475bbccg8g7ls"; - rev = "530034d6fe86d185f6a68b817f8db5f552f065d7"; # tag is missing - repo = "is_KeyFinder"; - owner = "ibsh"; - }; - - nativeBuildInputs = [ qmake ]; - buildInputs = [ libav_0_8 libkeyfinder qtbase qtxmlpatterns taglib ]; - - postPatch = '' - substituteInPlace is_KeyFinder.pro \ - --replace "-stdlib=libc++" "" \ - --replace "\$\$[QT_INSTALL_PREFIX]" "$out" - ''; - - dontWrapQtApps = true; - - meta = with lib; { - description = "Musical key detection for digital audio (graphical UI)"; - longDescription = '' - KeyFinder is an open source key detection tool, for DJs interested in - harmonic and tonal mixing. Designed primarily for electronic and dance - music, it is highly configurable and can be applied to many genres. It - supports a huge range of codecs thanks to LibAV, and writes to metadata - tags using TagLib. It's intended to be very focused: no library - management, no track suggestions, no media player. Just a fast, - efficient workflow tool. - ''; - homepage = "https://www.ibrahimshaath.co.uk/keyfinder/"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/audio/lash/default.nix b/pkgs/applications/audio/lash/default.nix index 090c457d44a86..e7c5a822cd4b3 100644 --- a/pkgs/applications/audio/lash/default.nix +++ b/pkgs/applications/audio/lash/default.nix @@ -34,6 +34,6 @@ stdenv.mkDerivation rec { homepage = "https://www.nongnu.org/lash"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = [ maintainers.goibhniu ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/audio/ledfx/default.nix b/pkgs/applications/audio/ledfx/default.nix index f45c7dc3af558..1a42bdc45819c 100644 --- a/pkgs/applications/audio/ledfx/default.nix +++ b/pkgs/applications/audio/ledfx/default.nix @@ -6,12 +6,12 @@ python3.pkgs.buildPythonPackage rec { pname = "ledfx"; - version = "2.0.99"; + version = "2.0.100"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-pwrAVcIwZ3RDYFMDk80q5aVSqLTQ5weZqgB3GRRu2ig="; + hash = "sha256-IRwzm0ODeT+umLvIjNURdTE9igpJ03r+ArjNN3y//z0="; }; pythonRelaxDeps = true; @@ -26,7 +26,6 @@ python3.pkgs.buildPythonPackage rec { poetry-core ]; - nativeBuildInputs = with python3.pkgs; [ pythonRelaxDepsHook ]; dependencies = with python3.pkgs; [ aiohttp diff --git a/pkgs/applications/audio/librespot/default.nix b/pkgs/applications/audio/librespot/default.nix index dc60185fc0f74..c6c274f60da19 100644 --- a/pkgs/applications/audio/librespot/default.nix +++ b/pkgs/applications/audio/librespot/default.nix @@ -5,7 +5,7 @@ , pkg-config , stdenv , openssl -, withALSA ? stdenv.isLinux +, withALSA ? stdenv.hostPlatform.isLinux , alsa-lib , alsa-plugins , withPortAudio ? false @@ -26,9 +26,9 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-DtF6asSlLdC2m/0JTBo4YUx9HgsojpfiqVdqaIwniKA="; }; - cargoSha256 = "sha256-tbDlWP0sUIa0W9HhdYNOvo9cGeqFemclhA7quh7f/Rw="; + cargoHash = "sha256-tbDlWP0sUIa0W9HhdYNOvo9cGeqFemclhA7quh7f/Rw="; - nativeBuildInputs = [ pkg-config makeWrapper ] ++ lib.optionals stdenv.isDarwin [ + nativeBuildInputs = [ pkg-config makeWrapper ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ rustPlatform.bindgenHook ]; diff --git a/pkgs/applications/audio/lingot/default.nix b/pkgs/applications/audio/lingot/default.nix index 4cc31ae421549..b024b42a6f1af 100644 --- a/pkgs/applications/audio/lingot/default.nix +++ b/pkgs/applications/audio/lingot/default.nix @@ -46,6 +46,6 @@ stdenv.mkDerivation rec { homepage = "https://www.nongnu.org/lingot/"; license = lib.licenses.gpl2Plus; platforms = with lib.platforms; linux; - maintainers = with lib.maintainers; [ viric ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/audio/linuxsampler/default.nix b/pkgs/applications/audio/linuxsampler/default.nix index f2d512c721a82..53e5b6e6e7333 100644 --- a/pkgs/applications/audio/linuxsampler/default.nix +++ b/pkgs/applications/audio/linuxsampler/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { FAQ, please contact us. ''; license = licenses.unfree; - maintainers = [ maintainers.goibhniu ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/audio/listenbrainz-mpd/default.nix b/pkgs/applications/audio/listenbrainz-mpd/default.nix index d8bdd4fec98d3..900839081e717 100644 --- a/pkgs/applications/audio/listenbrainz-mpd/default.nix +++ b/pkgs/applications/audio/listenbrainz-mpd/default.nix @@ -14,21 +14,21 @@ rustPlatform.buildRustPackage rec { pname = "listenbrainz-mpd"; - version = "2.3.7"; + version = "2.3.8"; src = fetchFromGitea { domain = "codeberg.org"; owner = "elomatreb"; repo = "listenbrainz-mpd"; rev = "v${version}"; - hash = "sha256-xnVhPiHhI7VqkSBBlrKJBpdS6kd51DMlKWVnJIo/OQQ="; + hash = "sha256-QBc0avci232UIxzTKlS0pjL7cCuvwAFgw6dSwdtYAtU="; }; - cargoHash = "sha256-Reglc7UtsFk+VIwg4Q9TIChVrWweuV6yPWxbtTDH6mU="; + cargoHash = "sha256-jnDS9tIJ387A2P9oUSYB3tXrXjwwVmQ26erIIlHBkao="; nativeBuildInputs = [ pkg-config installShellFiles asciidoctor ]; - buildInputs = [ sqlite ] ++ (if stdenv.isDarwin then [ + buildInputs = [ sqlite ] ++ (if stdenv.hostPlatform.isDarwin then [ libiconv Security SystemConfiguration @@ -39,7 +39,7 @@ rustPlatform.buildRustPackage rec { buildFeatures = [ "shell_completion" - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "systemd" ]; diff --git a/pkgs/applications/audio/littlegptracker/default.nix b/pkgs/applications/audio/littlegptracker/default.nix index fad1d3f15cac6..754bf7865f77b 100644 --- a/pkgs/applications/audio/littlegptracker/default.nix +++ b/pkgs/applications/audio/littlegptracker/default.nix @@ -20,8 +20,8 @@ stdenv.mkDerivation { buildInputs = [ SDL ] - ++ lib.optional stdenv.isDarwin Foundation - ++ lib.optional stdenv.isLinux jack2; + ++ lib.optional stdenv.hostPlatform.isDarwin Foundation + ++ lib.optional stdenv.hostPlatform.isLinux jack2; patches = [ # Remove outdated (pre-64bit) checks that would fail on modern platforms @@ -32,15 +32,15 @@ stdenv.mkDerivation { preBuild = "cd projects"; makeFlags = [ "CXX=${stdenv.cc.targetPrefix}c++" ] - ++ lib.optionals stdenv.isLinux [ "PLATFORM=DEB" ] - ++ lib.optionals stdenv.isDarwin [ "PLATFORM=OSX" ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ "PLATFORM=DEB" ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "PLATFORM=OSX" ]; env.NIX_CFLAGS_COMPILE = toString ([ "-fpermissive" ] ++ lib.optional stdenv.hostPlatform.isAarch64 "-Wno-error=narrowing"); - NIX_LDFLAGS = lib.optional stdenv.isDarwin "-framework Foundation"; + NIX_LDFLAGS = lib.optional stdenv.hostPlatform.isDarwin "-framework Foundation"; - installPhase = let extension = if stdenv.isDarwin then "app" else "deb-exe"; + installPhase = let extension = if stdenv.hostPlatform.isDarwin then "app" else "deb-exe"; in "install -Dm555 lgpt.${extension} $out/bin/lgpt"; passthru.updateScript = unstableGitUpdater { @@ -69,7 +69,7 @@ stdenv.mkDerivation { maintainers = with maintainers; [ fgaz ]; platforms = platforms.all; # https://github.com/NixOS/nixpkgs/pull/91766#issuecomment-688751821 - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; mainProgram = "lgpt"; }; } diff --git a/pkgs/applications/audio/lmms/default.nix b/pkgs/applications/audio/lmms/default.nix index 75e5e9d39e831..e1e338698f433 100644 --- a/pkgs/applications/audio/lmms/default.nix +++ b/pkgs/applications/audio/lmms/default.nix @@ -52,6 +52,6 @@ mkDerivation rec { homepage = "https://lmms.io"; license = licenses.gpl2Plus; platforms = [ "x86_64-linux" "i686-linux" ]; - maintainers = with maintainers; [ goibhniu yana ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/audio/lollypop/default.nix b/pkgs/applications/audio/lollypop/default.nix deleted file mode 100644 index 8b492e09cc5cc..0000000000000 --- a/pkgs/applications/audio/lollypop/default.nix +++ /dev/null @@ -1,107 +0,0 @@ -{ lib -, fetchFromGitLab -, nix-update-script -, meson -, ninja -, pkg-config -, python3 -, gtk3 -, gst_all_1 -, libhandy -, libsecret -, libsoup_3 -, appstream-glib -, desktop-file-utils -, totem-pl-parser -, gobject-introspection -, glib-networking -, gdk-pixbuf -, glib -, pango -, wrapGAppsHook3 -, lastFMSupport ? true -, youtubeSupport ? true -, kid3Support ? true -}: - -python3.pkgs.buildPythonApplication rec { - pname = "lollypop"; - version = "1.4.39"; - - format = "other"; - - src = fetchFromGitLab { - domain = "gitlab.gnome.org"; - owner = "World"; - repo = pname; - rev = version; - fetchSubmodules = true; - sha256 = "sha256-VPHQwy2+XR9R7toIN5sNFB91ddROlL7Scr8AKLgUzuo="; - }; - - nativeBuildInputs = [ - appstream-glib - desktop-file-utils - gobject-introspection - meson - ninja - pkg-config - wrapGAppsHook3 - ]; - - buildInputs = with gst_all_1; - [ - gdk-pixbuf - glib - glib-networking - gst-libav - gst-plugins-bad - gst-plugins-base - gst-plugins-good - gst-plugins-ugly - gstreamer - gtk3 - libhandy - libsoup_3 - pango - totem-pl-parser - ] ++ lib.optional lastFMSupport libsecret; - - propagatedBuildInputs = with python3.pkgs; - [ beautifulsoup4 pillow pycairo pygobject3 ] - ++ lib.optional lastFMSupport pylast - ++ lib.optional youtubeSupport youtube-dl - ++ lib.optional kid3Support pkgs.kid3; - - postPatch = '' - chmod +x meson_post_install.py - patchShebangs meson_post_install.py - ''; - - postFixup = '' - wrapPythonProgramsIn $out/libexec "$out $propagatedBuildInputs" - ''; - - strictDeps = false; - - # Produce only one wrapper using wrap-python passing - # gappsWrapperArgs to wrap-python additional wrapper - # argument - dontWrapGApps = true; - - preFixup = '' - makeWrapperArgs+=("''${gappsWrapperArgs[@]}") - ''; - - passthru = { updateScript = nix-update-script { }; }; - - meta = with lib; { - changelog = "https://gitlab.gnome.org/World/lollypop/tags/${version}"; - description = "Modern music player for GNOME"; - homepage = "https://gitlab.gnome.org/World/lollypop"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ lovesegfault ]; - platforms = platforms.linux; - mainProgram = "lollypop"; - }; -} diff --git a/pkgs/applications/audio/lsp-plugins/default.nix b/pkgs/applications/audio/lsp-plugins/default.nix index 56b508df7f6f6..ae768da7a0128 100644 --- a/pkgs/applications/audio/lsp-plugins/default.nix +++ b/pkgs/applications/audio/lsp-plugins/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { version = "1.2.16"; src = fetchurl { - url = "https://github.com/sadko4u/${pname}/releases/download/${version}/${pname}-src-${version}.tar.gz"; + url = "https://github.com/lsp-plugins/lsp-plugins/releases/download/${version}/lsp-plugins-src-${version}.tar.gz"; sha256 = "sha256-w2BUIF44z78syLroQk2asVXA5bt9P9POiuwxpnlkc8o="; }; outputs = [ "out" "dev" "doc" ]; - nativeBuildInputs = [ pkg-config php makeWrapper ]; + nativeBuildInputs = [ pkg-config (php.withExtensions (_: [])) makeWrapper ]; buildInputs = [ jack2 libsndfile libGLU libGL lv2 cairo ladspaH libXrandr ]; makeFlags = [ diff --git a/pkgs/applications/audio/master_me/default.nix b/pkgs/applications/audio/master_me/default.nix index 8d8782eabdcc7..4d8a35588e7e6 100644 --- a/pkgs/applications/audio/master_me/default.nix +++ b/pkgs/applications/audio/master_me/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { repo = "master_me"; rev = version; fetchSubmodules = true; - sha256 = "sha256-FG3X1dOF9KRHHSnd5/zP+GrYCB2O0y+tnI5/l9tNhyE="; + hash = "sha256-FG3X1dOF9KRHHSnd5/zP+GrYCB2O0y+tnI5/l9tNhyE="; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libGL python3 ] - ++ lib.optionals stdenv.isDarwin [ Cocoa ] - ++ lib.optionals stdenv.isLinux [ libX11 libXext libXrandr ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ libX11 libXext libXrandr ]; enableParallelBuilding = true; @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { description = "automatic mastering plugin for live streaming, podcasts and internet radio"; maintainers = with maintainers; [ magnetophon ]; platforms = platforms.all; - broken = stdenv.isDarwin; # error: no type or protocol named 'NSPasteboardType' + broken = stdenv.hostPlatform.isDarwin; # error: no type or protocol named 'NSPasteboardType' license = licenses.gpl3Plus; mainProgram = "master_me"; }; diff --git a/pkgs/applications/audio/mbrola/default.nix b/pkgs/applications/audio/mbrola/default.nix index 6cc20269dcf31..888ae82cdbab5 100644 --- a/pkgs/applications/audio/mbrola/default.nix +++ b/pkgs/applications/audio/mbrola/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, runCommandLocal }: +{ stdenv, lib, fetchFromGitHub, runCommandLocal, mbrola-voices }: let pname = "mbrola"; @@ -12,20 +12,6 @@ let homepage = "https://github.com/numediart/MBROLA"; }; - # Very big (0.65 G) so kept as a fixed-output derivation to limit "duplicates". - voices = fetchFromGitHub { - owner = "numediart"; - repo = "MBROLA-voices"; - rev = "fe05a0ccef6a941207fd6aaad0b31294a1f93a51"; # using latest commit - sha256 = "1w0y2xjp9rndwdjagp2wxh656mdm3d6w9cs411g27rjyfy1205a0"; - - name = "${pname}-voices-${version}"; - meta = meta // { - description = "Speech synthesizer based on the concatenation of diphones (voice files)"; - homepage = "https://github.com/numediart/MBROLA-voices"; - }; - }; - bin = stdenv.mkDerivation { pname = "${pname}-bin"; inherit version; @@ -60,7 +46,7 @@ in } '' mkdir -p "$out/share/mbrola" - ln -s '${voices}/data' "$out/share/mbrola/voices" + ln -s '${mbrola-voices}/data' "$out/share/mbrola/voices" ln -s '${bin}/bin' "$out/" '' diff --git a/pkgs/applications/audio/mbrola/voices.nix b/pkgs/applications/audio/mbrola/voices.nix new file mode 100644 index 0000000000000..df4521acd6097 --- /dev/null +++ b/pkgs/applications/audio/mbrola/voices.nix @@ -0,0 +1,50 @@ +{ + lib, + stdenv, + fetchFromGitHub, + mbrola, + languages ? [ ], +}: + +let + src = fetchFromGitHub { + owner = "numediart"; + repo = "MBROLA-voices"; + rev = "fe05a0ccef6a941207fd6aaad0b31294a1f93a51"; + hash = "sha256-QBUggnde5iNeCESzxE0btVVTDOxc3Kdk483mdGUXHvA="; + }; + + meta = { + description = "Speech synthesizer based on the concatenation of diphones (voice files)"; + homepage = "https://github.com/numediart/MBROLA-voices"; + license = mbrola.meta.license; + }; +in + +if (languages == [ ]) then + src // { inherit meta; } +else + stdenv.mkDerivation { + pname = "mbrola-voices"; + version = "0-unstable-2020-03-30"; + + inherit src; + + postPatch = '' + shopt -s extglob + pushd data + rm -rfv !(${lib.concatStringsSep "|" languages}) + popd + ''; + + installPhase = '' + runHook preInstall + + mkdir $out + cp -R data $out/ + + runHook postInstall + ''; + + inherit meta; + } diff --git a/pkgs/applications/audio/mda-lv2/default.nix b/pkgs/applications/audio/mda-lv2/default.nix index b1f0f5b53c5b7..f30dd9746dec9 100644 --- a/pkgs/applications/audio/mda-lv2/default.nix +++ b/pkgs/applications/audio/mda-lv2/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { homepage = "http://drobilla.net/software/mda-lv2.html"; description = "LV2 port of the MDA plugins by Paul Kellett"; license = licenses.gpl2Plus; - maintainers = [ maintainers.goibhniu ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/audio/mellowplayer/default.nix b/pkgs/applications/audio/mellowplayer/default.nix index b5eb65cad4444..2bffd43b7b957 100644 --- a/pkgs/applications/audio/mellowplayer/default.nix +++ b/pkgs/applications/audio/mellowplayer/default.nix @@ -21,7 +21,7 @@ mkDerivation rec { owner = "ColinDuquesnoy"; repo = "MellowPlayer"; rev = version; - sha256 = "sha256-rsF2xQet7U8d4oGU/HgghvE3vvmkxjlGXPBlLD9mWTk="; + hash = "sha256-rsF2xQet7U8d4oGU/HgghvE3vvmkxjlGXPBlLD9mWTk="; }; nativeBuildInputs = [ cmake pkg-config ]; @@ -62,7 +62,7 @@ mkDerivation rec { meta = with lib; { inherit (qtbase.meta) platforms; - broken = stdenv.isDarwin; # test build fails, but the project is not maintained anymore + broken = stdenv.hostPlatform.isDarwin; # test build fails, but the project is not maintained anymore description = "Cloud music integration for your desktop"; mainProgram = "MellowPlayer"; diff --git a/pkgs/applications/audio/mhwaveedit/default.nix b/pkgs/applications/audio/mhwaveedit/default.nix deleted file mode 100644 index 42d4c38d47a30..0000000000000 --- a/pkgs/applications/audio/mhwaveedit/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper, SDL, alsa-lib, autoreconfHook, gtk2, libjack2, ladspaH -, ladspaPlugins, libsamplerate, libsndfile, pkg-config, libpulseaudio, lame -, vorbis-tools }: - -stdenv.mkDerivation rec { - pname = "mhwaveedit"; - version = "1.4.24"; - - src = fetchFromGitHub { - owner = "magnush"; - repo = "mhwaveedit"; - rev = "v${version}"; - sha256 = "037pbq23kh8hsih994x2sv483imglwcrqrx6m8visq9c46fi0j1y"; - }; - - nativeBuildInputs = [ autoreconfHook makeWrapper pkg-config ]; - - preAutoreconf = "(cd docgen && sh gendocs.sh)"; - - buildInputs = [ - SDL alsa-lib gtk2 libjack2 ladspaH libsamplerate libsndfile libpulseaudio - ]; - - configureFlags = [ "--with-default-ladspa-path=${ladspaPlugins}/lib/ladspa" ]; - - postInstall = '' - wrapProgram $out/bin/mhwaveedit \ - --prefix PATH : ${lame}/bin/ \ - --prefix PATH : ${vorbis-tools}/bin/ - ''; - - meta = with lib; { - description = "Graphical program for editing, playing and recording sound files"; - mainProgram = "mhwaveedit"; - homepage = "https://github.com/magnush/mhwaveedit"; - license = licenses.gpl2Plus; - platforms = platforms.linux; - maintainers = [ maintainers.goibhniu ]; - }; -} diff --git a/pkgs/applications/audio/mid2key/default.nix b/pkgs/applications/audio/mid2key/default.nix index f17fd476613a5..95b48779459a2 100644 --- a/pkgs/applications/audio/mid2key/default.nix +++ b/pkgs/applications/audio/mid2key/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { homepage = "http://code.google.com/p/mid2key/"; description = "Simple tool which maps midi notes to simulated keystrokes"; license = licenses.gpl3; - maintainers = [ maintainers.goibhniu ]; + maintainers = [ ]; platforms = platforms.linux; mainProgram = "mid2key"; }; diff --git a/pkgs/applications/audio/midivisualizer/default.nix b/pkgs/applications/audio/midivisualizer/default.nix index 10a2a5de6a096..54f13d3e628a7 100644 --- a/pkgs/applications/audio/midivisualizer/default.nix +++ b/pkgs/applications/audio/midivisualizer/default.nix @@ -36,13 +36,13 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ glfw ffmpeg-full - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libX11 libXrandr libXinerama libXcursor gtk3 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit Carbon Cocoa @@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { Kernel ]; - installPhase = if stdenv.isDarwin then '' + installPhase = if stdenv.hostPlatform.isDarwin then '' mkdir -p $out/Applications $out/bin cp -r MIDIVisualizer.app $out/Applications/ ln -s ../Applications/MIDIVisualizer.app/Contents/MacOS/MIDIVisualizer $out/bin/ diff --git a/pkgs/applications/audio/mikmod/default.nix b/pkgs/applications/audio/mikmod/default.nix index abe8ac01cce21..7cc6bb62275a4 100644 --- a/pkgs/applications/audio/mikmod/default.nix +++ b/pkgs/applications/audio/mikmod/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { description = "Tracker music player for the terminal"; homepage = "http://mikmod.shlomifish.org/"; license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; platforms = with lib.platforms; linux; mainProgram = "mikmod"; }; diff --git a/pkgs/applications/audio/miniaudicle/default.nix b/pkgs/applications/audio/miniaudicle/default.nix index f3cd335b47be6..25ab4f7c6b71c 100644 --- a/pkgs/applications/audio/miniaudicle/default.nix +++ b/pkgs/applications/audio/miniaudicle/default.nix @@ -59,6 +59,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.gpl2Plus; maintainers = with maintainers; [ fgaz ]; platforms = platforms.all; - broken = stdenv.isDarwin; # not attempted + broken = stdenv.hostPlatform.isDarwin; # not attempted }; }) diff --git a/pkgs/applications/audio/minidsp/default.nix b/pkgs/applications/audio/minidsp/default.nix index 1ba98f0034813..6691d3e9507e4 100644 --- a/pkgs/applications/audio/minidsp/default.nix +++ b/pkgs/applications/audio/minidsp/default.nix @@ -25,10 +25,10 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = ["-p minidsp -p minidsp-daemon"]; buildInputs = - lib.optionals stdenv.isLinux [libusb1] - ++ lib.optionals stdenv.isDarwin [AppKit IOKit]; + lib.optionals stdenv.hostPlatform.isLinux [libusb1] + ++ lib.optionals stdenv.hostPlatform.isDarwin [AppKit IOKit]; - nativeBuildInputs = lib.optionals stdenv.isLinux [pkg-config]; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [pkg-config]; meta = with lib; { description = "Control interface for some MiniDSP products"; diff --git a/pkgs/applications/audio/mixxx/default.nix b/pkgs/applications/audio/mixxx/default.nix index 0f65d5cea8c7c..90bc036103180 100644 --- a/pkgs/applications/audio/mixxx/default.nix +++ b/pkgs/applications/audio/mixxx/default.nix @@ -132,7 +132,7 @@ mkDerivation rec { "-DINSTALL_USER_UDEV_RULES=OFF" ]; - postInstall = lib.optionalString stdenv.isLinux '' + postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' rules="$src/res/linux/mixxx-usb-uaccess.rules" if [ ! -f "$rules" ]; then echo "$rules is missing, must update the Nix file." @@ -147,7 +147,7 @@ mkDerivation rec { description = "Digital DJ mixing software"; mainProgram = "mixxx"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ goibhniu bfortz benley ]; + maintainers = with maintainers; [ bfortz benley ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/audio/mmtc/default.nix b/pkgs/applications/audio/mmtc/default.nix index 8227d12bbcb5b..384bd44929746 100644 --- a/pkgs/applications/audio/mmtc/default.nix +++ b/pkgs/applications/audio/mmtc/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-gs6uytX4rm2JrJ4UbtHJDg+b+Z1ZjcsuUR0b13jQIy4="; }; - cargoSha256 = "sha256-7zV/AsSZHk99ROC1301nkwJ22dvh4afeCI//G1zWHu8="; + cargoHash = "sha256-7zV/AsSZHk99ROC1301nkwJ22dvh4afeCI//G1zWHu8="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/audio/moc/default.nix b/pkgs/applications/audio/moc/default.nix index e81382f344050..6039654d76dcd 100644 --- a/pkgs/applications/audio/moc/default.nix +++ b/pkgs/applications/audio/moc/default.nix @@ -1,9 +1,10 @@ -{ lib, stdenv, fetchurl, pkg-config +{ lib, stdenv, fetchsvn, fetchpatch2, pkg-config +, autoreconfHook, autoconf-archive , ncurses, db , popt, libtool , libiconv, CoreServices # Sound sub-systems -, alsaSupport ? (!stdenv.isDarwin), alsa-lib -, pulseSupport ? true, libpulseaudio, autoreconfHook +, alsaSupport ? (!stdenv.hostPlatform.isDarwin), alsa-lib +, pulseSupport ? true, libpulseaudio , jackSupport ? true, libjack2 , ossSupport ? true # Audio formats @@ -15,7 +16,7 @@ , musepackSupport ? true, libmpc, libmpcdec, taglib , vorbisSupport ? true, libvorbis , speexSupport ? true, speex -, ffmpegSupport ? true, ffmpeg_4 +, ffmpegSupport ? true, ffmpeg_7 , sndfileSupport ? true, libsndfile , wavpackSupport ? true, wavpack # Misc @@ -24,22 +25,39 @@ , withDebug ? false }: -stdenv.mkDerivation rec { - +stdenv.mkDerivation { pname = "moc"; - version = "2.5.2"; + version = "2.6-alpha3-unstable-2019-09-14"; - src = fetchurl { - url = "http://ftp.daper.net/pub/soft/moc/stable/moc-${version}.tar.bz2"; - sha256 = "026v977kwb0wbmlmf6mnik328plxg8wykfx9ryvqhirac0aq39pk"; + src = fetchsvn { + url = "svn://svn.daper.net/moc/trunk"; + rev = "3005"; + hash = "sha256-JksJxHQgQ8hPTFtLvEvZuFh2lflDNrEmDTMWWwVnjZQ="; }; - patches = [] - ++ lib.optional ffmpegSupport ./moc-ffmpeg4.patch - ++ lib.optional pulseSupport ./pulseaudio.patch; + patches = [ + # FFmpeg 6 support + (fetchpatch2 { + url = "https://cygwin.com/cgit/cygwin-packages/moc/plain/Support-for-recent-ffmpeg-change.patch?id=ab70f1306b8416852915be4347003aac3bdc216"; + hash = "sha256-5hLEFBJ+7Nvxn6pNj4bngcg2qJsCzxiuP6yEj+7tvs0="; + stripLen = 1; + }) + + # FFmpeg 7 support + (fetchpatch2 { + url = "https://cygwin.com/cgit/cygwin-packages/moc/plain/ffmpeg-7.0.patch?id=ab70f1306b8416852915be4347003aac3bdc216e"; + hash = "sha256-dYw6DNyw61MGfv+GdBz5Dtrr9fVph1tf7vxexWONwF8="; + stripLen = 1; + }) + + ./use-ax-check-compile-flag.patch + ] ++ lib.optional pulseSupport ./pulseaudio.patch; + + postPatch = '' + rm m4/* + ''; - nativeBuildInputs = [ pkg-config ] - ++ lib.optional pulseSupport autoreconfHook; + nativeBuildInputs = [ pkg-config autoreconfHook autoconf-archive ]; buildInputs = [ ncurses db popt libtool ] # Sound sub-systems @@ -56,13 +74,13 @@ stdenv.mkDerivation rec { ++ lib.optionals musepackSupport [ libmpc libmpcdec taglib ] ++ lib.optional vorbisSupport libvorbis ++ lib.optional speexSupport speex - ++ lib.optional ffmpegSupport ffmpeg_4 + ++ lib.optional ffmpegSupport ffmpeg_7 ++ lib.optional sndfileSupport libsndfile ++ lib.optional wavpackSupport wavpack # Misc ++ lib.optional curlSupport curl ++ lib.optional samplerateSupport libsamplerate - ++ lib.optionals stdenv.isDarwin [ libiconv CoreServices ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv CoreServices ]; configureFlags = [ # Sound sub-systems diff --git a/pkgs/applications/audio/moc/moc-ffmpeg4.patch b/pkgs/applications/audio/moc/moc-ffmpeg4.patch deleted file mode 100644 index 7499f9c539bcd..0000000000000 --- a/pkgs/applications/audio/moc/moc-ffmpeg4.patch +++ /dev/null @@ -1,33 +0,0 @@ -Index: decoder_plugins/ffmpeg/ffmpeg.c -=================================================================== ---- /decoder_plugins/ffmpeg/ffmpeg.c (revisión: 2963) -+++ /decoder_plugins/ffmpeg/ffmpeg.c (copia de trabajo) -@@ -697,7 +697,7 @@ - * FFmpeg/LibAV in use. For some versions this will be caught in - * *_find_stream_info() above and misreported as an unfound codec - * parameters error. */ -- if (data->codec->capabilities & CODEC_CAP_EXPERIMENTAL) { -+ if (data->codec->capabilities & AV_CODEC_CAP_EXPERIMENTAL) { - decoder_error (&data->error, ERROR_FATAL, 0, - "The codec is experimental and may damage MOC: %s", - data->codec->name); -@@ -705,8 +705,8 @@ - } - - set_downmixing (data); -- if (data->codec->capabilities & CODEC_CAP_TRUNCATED) -- data->enc->flags |= CODEC_FLAG_TRUNCATED; -+ if (data->codec->capabilities & AV_CODEC_CAP_TRUNCATED) -+ data->enc->flags |= AV_CODEC_FLAG_TRUNCATED; - - if (avcodec_open2 (data->enc, data->codec, NULL) < 0) - { -@@ -725,7 +725,7 @@ - - data->sample_width = sfmt_Bps (data->fmt); - -- if (data->codec->capabilities & CODEC_CAP_DELAY) -+ if (data->codec->capabilities & AV_CODEC_CAP_DELAY) - data->delay = true; - data->seek_broken = is_seek_broken (data); - data->timing_broken = is_timing_broken (data->ic); diff --git a/pkgs/applications/audio/moc/use-ax-check-compile-flag.patch b/pkgs/applications/audio/moc/use-ax-check-compile-flag.patch new file mode 100644 index 0000000000000..90dadf092bb79 --- /dev/null +++ b/pkgs/applications/audio/moc/use-ax-check-compile-flag.patch @@ -0,0 +1,43 @@ +diff --git a/configure.in b/configure.in +index eb71bdf0b0...342baf10c5 100644 +--- a/configure.in ++++ b/configure.in +@@ -102,16 +102,16 @@ + + AC_C_CONST + AC_TYPE_INTPTR_T +-AX_CFLAGS_GCC_OPTION(-Wall) +-AX_CFLAGS_GCC_OPTION(-Wextra) ++AX_CHECK_COMPILE_FLAG(-Wall) ++AX_CHECK_COMPILE_FLAG(-Wextra) + + dnl Overly-enthusiastic warning suppression. + save_CFLAGS="$CFLAGS" +-AX_CFLAGS_GCC_OPTION([-Wgnu-zero-variadic-macro-arguments], , ++AX_CHECK_COMPILE_FLAG([-Wgnu-zero-variadic-macro-arguments], + AC_DEFINE([HAVE_VARIADIC_MACRO_WARNING], 1, + [Define if compiler recognises warning option])) +-AX_CFLAGS_GCC_OPTION([-Werror=unknown-warning-option]) +-AX_CFLAGS_GCC_OPTION([-Wformat-truncation], , ++AX_CHECK_COMPILE_FLAG([-Werror=unknown-warning-option]) ++AX_CHECK_COMPILE_FLAG([-Wformat-truncation], + AC_DEFINE([HAVE_FORMAT_TRUNCATION_WARNING], 1, + [Define if compiler recognises warning option])) + CFLAGS="$save_CFLAGS" +@@ -242,13 +242,13 @@ + else + if test "x$enable_debug" = "xgdb" + then +- AX_CFLAGS_GCC_OPTION([-ggdb]) +- AX_CFLAGS_GCC_OPTION([-O0]) ++ AX_CHECK_COMPILE_FLAG([-ggdb]) ++ AX_CHECK_COMPILE_FLAG([-O0]) + COMPILE_DEBUG='gdb' + fi + if test "x$ac_cv_cflags_gcc_option__ggdb" = "x" + then +- AX_CFLAGS_GCC_OPTION([-g]) ++ AX_CHECK_COMPILE_FLAG([-g]) + COMPILE_DEBUG='yes' + fi + EXTRA_OBJS="$EXTRA_OBJS null_out.o md5.o" diff --git a/pkgs/applications/audio/monkeys-audio/default.nix b/pkgs/applications/audio/monkeys-audio/default.nix index 3fdcda98d1160..f1101e7c793f3 100644 --- a/pkgs/applications/audio/monkeys-audio/default.nix +++ b/pkgs/applications/audio/monkeys-audio/default.nix @@ -5,13 +5,13 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "10.72"; + version = "10.74"; pname = "monkeys-audio"; src = fetchzip { url = "https://monkeysaudio.com/files/MAC_${ builtins.concatStringsSep "" (lib.strings.splitString "." finalAttrs.version)}_SDK.zip"; - hash = "sha256-vtpQhCV1hkme69liTO13vz+kxpA3zJ+U1In/4z6qLbQ="; + hash = "sha256-AxRADWS5Ka62NLj6IqX5uF39mPxoWy+zQZQ7A2+DM7Y="; stripRoot = false; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/mopidy/bandcamp.nix b/pkgs/applications/audio/mopidy/bandcamp.nix index 01a5f9f6bd9fd..35491813f1a2e 100644 --- a/pkgs/applications/audio/mopidy/bandcamp.nix +++ b/pkgs/applications/audio/mopidy/bandcamp.nix @@ -5,7 +5,7 @@ python3Packages.buildPythonApplication rec { version = "1.1.5"; src = fetchPypi { inherit pname version; - sha256 = "sha256-wg9zcOKfZQRhpyA1Cu5wvdwKpmrlcr2m9mrqBHgUXAQ="; + hash = "sha256-wg9zcOKfZQRhpyA1Cu5wvdwKpmrlcr2m9mrqBHgUXAQ="; }; propagatedBuildInputs = with python3Packages; [ mopidy pykka ]; diff --git a/pkgs/applications/audio/mopidy/iris.nix b/pkgs/applications/audio/mopidy/iris.nix index 66af8c6586873..bebb4082a40fa 100644 --- a/pkgs/applications/audio/mopidy/iris.nix +++ b/pkgs/applications/audio/mopidy/iris.nix @@ -6,7 +6,7 @@ python3Packages.buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-PEAXnapiyxozijR053I7zQYRYLeDOV719L0QbO2r4r4="; + hash = "sha256-PEAXnapiyxozijR053I7zQYRYLeDOV719L0QbO2r4r4="; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/audio/mopidy/jellyfin.nix b/pkgs/applications/audio/mopidy/jellyfin.nix index 932983aa4ddaf..8193361666109 100644 --- a/pkgs/applications/audio/mopidy/jellyfin.nix +++ b/pkgs/applications/audio/mopidy/jellyfin.nix @@ -7,7 +7,7 @@ python3Packages.buildPythonApplication rec { src = fetchPypi { inherit version; pname = "Mopidy-Jellyfin"; - sha256 = "sha256-cZliraTxTAJ2dXaxttWI3x4wCkmEhEo33GTNtAYwgTc="; + hash = "sha256-cZliraTxTAJ2dXaxttWI3x4wCkmEhEo33GTNtAYwgTc="; }; propagatedBuildInputs = [ mopidy python3Packages.unidecode python3Packages.websocket-client ]; diff --git a/pkgs/applications/audio/mopidy/moped.nix b/pkgs/applications/audio/mopidy/moped.nix index 3e4e728c3c2de..afefc0f0d9d51 100644 --- a/pkgs/applications/audio/mopidy/moped.nix +++ b/pkgs/applications/audio/mopidy/moped.nix @@ -20,7 +20,7 @@ pythonPackages.buildPythonApplication rec { homepage = "https://github.com/martijnboland/moped"; description = "Web client for Mopidy"; license = licenses.mit; - maintainers = []; + maintainers = [ ]; hydraPlatforms = []; }; } diff --git a/pkgs/applications/audio/mopidy/mopidy.nix b/pkgs/applications/audio/mopidy/mopidy.nix index ef604a6b41502..12eab45c52a22 100644 --- a/pkgs/applications/audio/mopidy/mopidy.nix +++ b/pkgs/applications/audio/mopidy/mopidy.nix @@ -33,7 +33,7 @@ pythonPackages.buildPythonApplication rec { requests setuptools tornado - ] ++ lib.optional (!stdenv.isDarwin) dbus-python + ] ++ lib.optional (!stdenv.hostPlatform.isDarwin) dbus-python ); propagatedNativeBuildInputs = [ diff --git a/pkgs/applications/audio/mopidy/mopify.nix b/pkgs/applications/audio/mopidy/mopify.nix index b5f89f4f4511b..21ebc32b9d15f 100644 --- a/pkgs/applications/audio/mopidy/mopify.nix +++ b/pkgs/applications/audio/mopidy/mopify.nix @@ -6,7 +6,7 @@ pythonPackages.buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-RlCC+39zC+LeA/QDWPHYx5TrEwOgVrnvcH1Xg12qSLE="; + hash = "sha256-RlCC+39zC+LeA/QDWPHYx5TrEwOgVrnvcH1Xg12qSLE="; }; propagatedBuildInputs = with pythonPackages; [ mopidy configobj ]; diff --git a/pkgs/applications/audio/mopidy/mpd.nix b/pkgs/applications/audio/mopidy/mpd.nix index 281efc028951e..303a4c733e8aa 100644 --- a/pkgs/applications/audio/mopidy/mpd.nix +++ b/pkgs/applications/audio/mopidy/mpd.nix @@ -6,7 +6,7 @@ python3Packages.buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-CeLMRqj9cwBvQrOx7XHVV8MjDjwOosONVlsN2o+vTVM="; + hash = "sha256-CeLMRqj9cwBvQrOx7XHVV8MjDjwOosONVlsN2o+vTVM="; }; propagatedBuildInputs = [ mopidy ]; diff --git a/pkgs/applications/audio/mopidy/mpris.nix b/pkgs/applications/audio/mopidy/mpris.nix index 86f85749573eb..c4f205cd359b6 100644 --- a/pkgs/applications/audio/mopidy/mpris.nix +++ b/pkgs/applications/audio/mopidy/mpris.nix @@ -7,7 +7,7 @@ python3Packages.buildPythonApplication rec { src = fetchPypi { inherit version; pname = "Mopidy-MPRIS"; - sha256 = "sha256-rHQgNIyludTEL7RDC8dIpyGTMOt1Tazn6i/orKlSP4U="; + hash = "sha256-rHQgNIyludTEL7RDC8dIpyGTMOt1Tazn6i/orKlSP4U="; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/audio/mopidy/muse.nix b/pkgs/applications/audio/mopidy/muse.nix index 9721c5bcc1cc7..f98d1ca458fe2 100644 --- a/pkgs/applications/audio/mopidy/muse.nix +++ b/pkgs/applications/audio/mopidy/muse.nix @@ -7,7 +7,7 @@ pythonPackages.buildPythonApplication rec { src = fetchPypi { inherit version; pname = "Mopidy-Muse"; - sha256 = "sha256-CEPAPWtMrD+HljyqBB6EAyGVeOjzkvVoEywlE4XEJGs="; + hash = "sha256-CEPAPWtMrD+HljyqBB6EAyGVeOjzkvVoEywlE4XEJGs="; }; propagatedBuildInputs = [ @@ -24,6 +24,6 @@ pythonPackages.buildPythonApplication rec { description = "Mopidy web client with Snapcast support"; homepage = "https://github.com/cristianpb/muse"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/audio/mopidy/musicbox-webclient.nix b/pkgs/applications/audio/mopidy/musicbox-webclient.nix index 902d209f0286a..105fcff2accdd 100644 --- a/pkgs/applications/audio/mopidy/musicbox-webclient.nix +++ b/pkgs/applications/audio/mopidy/musicbox-webclient.nix @@ -26,6 +26,6 @@ pythonPackages.buildPythonApplication rec { homepage = "https://github.com/pimusicbox/mopidy-musicbox-webclient"; changelog = "https://github.com/pimusicbox/mopidy-musicbox-webclient/blob/v${version}/CHANGELOG.rst"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/audio/mopidy/notify.nix b/pkgs/applications/audio/mopidy/notify.nix index 8b90089ef23d2..f52ed61911135 100644 --- a/pkgs/applications/audio/mopidy/notify.nix +++ b/pkgs/applications/audio/mopidy/notify.nix @@ -6,7 +6,7 @@ pythonPackages.buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-8FT4O4k0wEsdHA1vJaOW9UamJ3QLyO47HwL5XcSU3Pc="; + hash = "sha256-8FT4O4k0wEsdHA1vJaOW9UamJ3QLyO47HwL5XcSU3Pc="; }; propagatedBuildInputs = [ @@ -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 = [ ]; }; } diff --git a/pkgs/applications/audio/mopidy/podcast.nix b/pkgs/applications/audio/mopidy/podcast.nix index 8d75b888826c4..8af6dff625481 100644 --- a/pkgs/applications/audio/mopidy/podcast.nix +++ b/pkgs/applications/audio/mopidy/podcast.nix @@ -7,7 +7,7 @@ python3Packages.buildPythonApplication rec { src = fetchPypi { inherit version; pname = "Mopidy-Podcast"; - sha256 = "sha256-grNPVEVM2PlpYhBXe6sabFjWVB9+q+apIRjcHUxH52A="; + hash = "sha256-grNPVEVM2PlpYhBXe6sabFjWVB9+q+apIRjcHUxH52A="; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/audio/mopidy/spotify.nix b/pkgs/applications/audio/mopidy/spotify.nix index 4b6fe17e8225f..d719a03c7cffd 100644 --- a/pkgs/applications/audio/mopidy/spotify.nix +++ b/pkgs/applications/audio/mopidy/spotify.nix @@ -1,35 +1,62 @@ -{ lib, fetchFromGitHub, pythonPackages, mopidy, unstableGitUpdater }: +{ + lib, + fetchFromGitHub, + pythonPackages, + mopidy, + nix-update-script, +}: pythonPackages.buildPythonApplication rec { pname = "mopidy-spotify"; - version = "4.1.1-unstable-2024-02-27"; + version = "5.0.0a2"; + pyproject = true; src = fetchFromGitHub { owner = "mopidy"; repo = "mopidy-spotify"; - rev = "112d4abbb3f5b6477dab796f2824fa42196bfa0a"; - hash = "sha256-RkXDzAbOOll3uCNZ2mFRnjqMkT/NkXOGjywLRTC9i60="; + rev = "refs/tags/v${version}"; + hash = "sha256-QeABG9rQKJ8sIoK38R74N0s5rRG+zws7AZR0xPysdcY="; }; - propagatedBuildInputs = [ + build-system = [ pythonPackages.setuptools ]; + + dependencies = [ mopidy - pythonPackages.responses + pythonPackages.pykka + pythonPackages.requests ]; - nativeBuildInputs = [ - pythonPackages.pytestCheckHook - ]; + optional-dependencies = { + lint = with pythonPackages; [ + black + check-manifest + flake8 + flake8-bugbear + isort + ]; + + test = with pythonPackages; [ + pytest + pytest-cov + responses + ]; + + dev = optional-dependencies.lint ++ optional-dependencies.test ++ [ pythonPackages.tox ]; + }; + + nativeCheckInputs = [ pythonPackages.pytestCheckHook ] ++ optional-dependencies.test; pythonImportsCheck = [ "mopidy_spotify" ]; - passthru.updateScript = unstableGitUpdater { - tagPrefix = "v"; + passthru = { + updateScript = nix-update-script { }; }; - meta = with lib; { - homepage = "https://github.com/mopidy/mopidy-spotify"; + meta = { description = "Mopidy extension for playing music from Spotify"; - license = licenses.asl20; - maintainers = with maintainers; [ lilyinstarlight ]; + homepage = "https://github.com/mopidy/mopidy-spotify"; + changelog = "https://github.com/mopidy/mopidy-spotify/releases/tag/v${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ getchoo ]; }; } diff --git a/pkgs/applications/audio/mopidy/tunein.nix b/pkgs/applications/audio/mopidy/tunein.nix index 537baa3de020e..b306ae91f17c2 100644 --- a/pkgs/applications/audio/mopidy/tunein.nix +++ b/pkgs/applications/audio/mopidy/tunein.nix @@ -20,6 +20,6 @@ python3Packages.buildPythonApplication rec { description = "Mopidy extension for playing music from tunein"; homepage = "https://github.com/kingosticks/mopidy-tunein"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/audio/mopidy/youtube.nix b/pkgs/applications/audio/mopidy/youtube.nix index a4aea017ea4e4..cd57667b427c0 100644 --- a/pkgs/applications/audio/mopidy/youtube.nix +++ b/pkgs/applications/audio/mopidy/youtube.nix @@ -1,8 +1,10 @@ -{ lib -, fetchFromGitHub -, python3 -, mopidy -, extraPkgs ? pkgs: [] +{ + lib, + fetchFromGitHub, + python3, + mopidy, + yt-dlp, + extraPkgs ? pkgs: [ ], }: python3.pkgs.buildPythonApplication rec { @@ -17,22 +19,36 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-iFt7r8Ljymc+grNJiOClTHkZOeo7AcYpcNc8tLMPROk="; }; - propagatedBuildInputs = with python3.pkgs; [ - beautifulsoup4 - cachetools - pykka - requests - youtube-dl - ytmusicapi - ] ++ [ - mopidy - ] ++ extraPkgs pkgs; + propagatedBuildInputs = + with python3.pkgs; + [ + beautifulsoup4 + cachetools + pykka + requests + ytmusicapi + ] + ++ [ + mopidy + yt-dlp + ] + ++ extraPkgs pkgs; nativeCheckInputs = with python3.pkgs; [ vcrpy pytestCheckHook ]; + postPatch = '' + substituteInPlace mopidy_youtube/youtube.py \ + --replace-fail 'youtube_dl_package = "youtube_dl"' 'youtube_dl_package = "yt_dlp"' + substituteInPlace tests/conftest.py \ + --replace-fail 'import youtube_dl' 'import yt_dlp' \ + --replace-fail 'patcher = mock.patch.object(youtube, "youtube_dl", spec=youtube_dl)' \ + 'patcher = mock.patch.object(youtube, "youtube_dl", spec=yt_dlp)' \ + --replace-fail '"youtube_dl_package": "youtube_dl",' '"youtube_dl_package": "yt_dlp",' + ''; + disabledTests = [ # Test requires a YouTube API key "test_get_default_config" @@ -45,14 +61,12 @@ python3.pkgs.buildPythonApplication rec { "tests/test_youtube.py" ]; - pythonImportsCheck = [ - "mopidy_youtube" - ]; + pythonImportsCheck = [ "mopidy_youtube" ]; meta = with lib; { description = "Mopidy extension for playing music from YouTube"; homepage = "https://github.com/natumbri/mopidy-youtube"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/audio/mp3blaster/default.nix b/pkgs/applications/audio/mp3blaster/default.nix index 1faeddb4d8e0b..02711ab4e1314 100644 --- a/pkgs/applications/audio/mp3blaster/default.nix +++ b/pkgs/applications/audio/mp3blaster/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses libvorbis - ] ++ lib.optional stdenv.isDarwin SDL; + ] ++ lib.optional stdenv.hostPlatform.isDarwin SDL; env.NIX_CFLAGS_COMPILE = toString ([ "-Wno-narrowing" diff --git a/pkgs/applications/audio/mp3info/default.nix b/pkgs/applications/audio/mp3info/default.nix deleted file mode 100644 index 86c1f87f5227f..0000000000000 --- a/pkgs/applications/audio/mp3info/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ fetchurl, lib, stdenv, ncurses, pkg-config, gtk2 }: - -stdenv.mkDerivation rec { - pname = "mp3info"; - version = "0.8.5a"; - - src = fetchurl { - url = "ftp://ftp.ibiblio.org/pub/linux/apps/sound/mp3-utils/${pname}/${pname}-${version}.tgz"; - sha256 = "042f1czcs9n2sbqvg4rsvfwlqib2gk976mfa2kxlfjghx5laqf04"; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ ncurses gtk2 ]; - - hardeningDisable = [ "format" ]; - - configurePhase = - '' sed -i Makefile \ - -e "s|^prefix=.*$|prefix=$out|g ; - s|/bin/rm|rm|g ; - s|/usr/bin/install|install|g" - ''; - - preInstall = - '' mkdir -p "$out/bin" - mkdir -p "$out/man/man1" - ''; - - meta = { - description = "MP3 technical info viewer and ID3 1.x tag editor"; - - longDescription = - '' MP3Info is a little utility used to read and modify the ID3 tags of - MP3 files. MP3Info can also display various techincal aspects of an - MP3 file including playing time, bit-rate, sampling frequency and - other attributes in a pre-defined or user-specifiable output format. - ''; - - homepage = "http://www.ibiblio.org/mp3info/"; - - license = lib.licenses.gpl2Plus; - - maintainers = [ ]; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/applications/audio/mpc/default.nix b/pkgs/applications/audio/mpc/default.nix index b0dcbfa18c595..c58c6831edf46 100644 --- a/pkgs/applications/audio/mpc/default.nix +++ b/pkgs/applications/audio/mpc/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { buildInputs = [ libmpdclient ] - ++ lib.optionals stdenv.isDarwin [ libiconv ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix index 479e8850872c5..6f28bf98a1b15 100644 --- a/pkgs/applications/audio/musescore/default.nix +++ b/pkgs/applications/audio/musescore/default.nix @@ -1,7 +1,9 @@ { stdenv , lib , fetchFromGitHub +, fetchpatch , cmake +, wrapGAppsHook3 , wrapQtAppsHook , pkg-config , ninja @@ -18,27 +20,25 @@ , portmidi , qtbase , qtdeclarative -, qtgraphicaleffects , flac , libopusenc , libopus , tinyxml-2 -, qtquickcontrols -, qtquickcontrols2 -, qtscript +, qt5compat +, qtwayland , qtsvg -, qtxmlpatterns +, qtscxml , qtnetworkauth -, qtx11extras +, qttools , nixosTests , darwin }: let - stdenv' = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; + stdenv' = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; # portaudio propagates Darwin frameworks. Rebuild it using the 11.0 stdenv # from Qt and the 11.0 SDK frameworks. - portaudio' = if stdenv.isDarwin then portaudio.override { + portaudio' = if stdenv.hostPlatform.isDarwin then portaudio.override { stdenv = stdenv'; inherit (darwin.apple_sdk_11_0.frameworks) AudioUnit @@ -50,52 +50,75 @@ let } else portaudio; in stdenv'.mkDerivation (finalAttrs: { pname = "musescore"; - version = "4.3.2"; + version = "4.4.2"; src = fetchFromGitHub { owner = "musescore"; repo = "MuseScore"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-QjvY8R2nq/DeFDikHn9qr4aCEwzAcogQXM5vdZqhoMM="; + sha256 = "sha256-wgujiFvaWejSEXTbq/Re/7Ca1jIqso2uZej3Lb3V4I8="; }; + patches = [ + # https://github.com/musescore/MuseScore/pull/24326 + (fetchpatch { + name = "fix-menubar-with-qt6.5+.patch"; + url = "https://github.com/musescore/MuseScore/pull/24326/commits/b274f13311ad0b2bce339634a006ba22fbd3379e.patch"; + hash = "sha256-ZGmjRa01CBEIxJdJYQMhdg4A9yjWdlgn0pCPmENBTq0="; + }) + (fetchpatch { + name = "fix-crash-accessing-uninitialized-properties.patch"; + url = "https://github.com/musescore/MuseScore/pull/24714.patch"; + hash = "sha256-ErrCU/U+wyfD7R8kiZTifGIeuCAdKi1q7uxYsoE/OLA="; + }) + ]; cmakeFlags = [ - "-DMUSESCORE_BUILD_MODE=release" + "-DMUSE_APP_BUILD_MODE=release" # Disable the build and usage of the `/bin/crashpad_handler` utility - it's # not useful on NixOS, see: # https://github.com/musescore/MuseScore/issues/15571 - "-DMUE_BUILD_CRASHPAD_CLIENT=OFF" + "-DMUSE_MODULE_DIAGNOSTICS_CRASHPAD_CLIENT=OFF" # Use our versions of system libraries "-DMUE_COMPILE_USE_SYSTEM_FREETYPE=ON" + "-DMUE_COMPILE_USE_SYSTEM_HARFBUZZ=ON" "-DMUE_COMPILE_USE_SYSTEM_TINYXML=ON" # Implies also -DMUE_COMPILE_USE_SYSTEM_OPUS=ON "-DMUE_COMPILE_USE_SYSTEM_OPUSENC=ON" "-DMUE_COMPILE_USE_SYSTEM_FLAC=ON" - # From some reason, in $src/build/cmake/SetupBuildEnvironment.cmake, - # upstream defaults to compiling to x86_64 only, unless this cmake flag is - # set - "-DMUE_COMPILE_BUILD_MACOS_APPLE_SILICON=ON" # Don't bundle qt qml files, relevant really only for darwin, but we set # this for all platforms anyway. "-DMUE_COMPILE_INSTALL_QTQML_FILES=OFF" + # Don't build unit tests unless we are going to run them. + (lib.cmakeBool "MUSE_ENABLE_UNIT_TESTS" finalAttrs.finalPackage.doCheck) ]; qtWrapperArgs = [ # MuseScore JACK backend loads libjack at runtime. - "--prefix ${lib.optionalString stdenv.isDarwin "DY"}LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libjack2 ]}" - ] ++ lib.optionals (stdenv.isLinux) [ + "--prefix ${lib.optionalString stdenv.hostPlatform.isDarwin "DY"}LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libjack2 ]}" + ] ++ lib.optionals (stdenv.hostPlatform.isLinux) [ "--set ALSA_PLUGIN_DIR ${alsa-plugins}/lib/alsa-lib" - ] ++ lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ # There are some issues with using the wayland backend, see: # https://musescore.org/en/node/321936 "--set-default QT_QPA_PLATFORM xcb" ]; + preFixup = '' + qtWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + + dontWrapGApps = true; + nativeBuildInputs = [ wrapQtAppsHook cmake + qttools pkg-config ninja + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ + # Since https://github.com/musescore/MuseScore/pull/13847/commits/685ac998 + # GTK3 is needed for file dialogs. Fixes crash with No GSettings schemas error. + wrapGAppsHook3 ]; buildInputs = [ @@ -114,28 +137,50 @@ in stdenv'.mkDerivation (finalAttrs: { tinyxml-2 qtbase qtdeclarative - qtgraphicaleffects - qtquickcontrols - qtquickcontrols2 - qtscript + qt5compat qtsvg - qtxmlpatterns + qtscxml qtnetworkauth - qtx11extras - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib + qtwayland + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + darwin.apple_sdk_11_0.frameworks.Cocoa ]; postInstall = '' # Remove unneeded bundled libraries and headers rm -r $out/{include,lib} - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p "$out/Applications" mv "$out/mscore.app" "$out/Applications/mscore.app" mkdir -p $out/bin ln -s $out/Applications/mscore.app/Contents/MacOS/mscore $out/bin/mscore ''; + # muse-sounds-manager installs Muse Sounds sampler libMuseSamplerCoreLib.so. + # It requires that argv0 of the calling process ends with "/mscore" or "/MuseScore-4". + # We need to ensure this in two cases: + # + # 1) when the user invokes MuseScore as "mscore" on the command line or from + # the .desktop file, and the normal argv0 is "mscore" (no "/"); + # 2) when MuseScore invokes itself via File -> New, and the normal argv0 is + # the target of /proc/self/exe, which in Nixpkgs was "{...}/.mscore-wrapped" + # + # In order to achieve (2) we install the final binary as $out/libexec/mscore, and + # in order to achieve (1) we use makeWrapper without --inherit-argv0. + # + # wrapQtAppsHook uses wrapQtApp -> wrapProgram -> makeBinaryWrapper --inherit-argv0 + # so we disable it and explicitly use makeQtWrapper. + # + # TODO: check if something like this is also needed for macOS. + dontWrapQtApps = stdenv.hostPlatform.isLinux; + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' + mkdir -p $out/libexec + mv $out/bin/mscore $out/libexec + makeQtWrapper $out/libexec/mscore $out/bin/mscore + ''; + # Don't run bundled upstreams tests, as they require a running X window system. doCheck = false; @@ -145,7 +190,7 @@ in stdenv'.mkDerivation (finalAttrs: { description = "Music notation and composition software"; homepage = "https://musescore.org/"; license = licenses.gpl3Only; - maintainers = with maintainers; [ vandenoever doronbehar ]; + maintainers = with maintainers; [ vandenoever doronbehar orivej ]; mainProgram = "mscore"; platforms = platforms.unix; }; diff --git a/pkgs/applications/audio/music-player/default.nix b/pkgs/applications/audio/music-player/default.nix deleted file mode 100644 index 137c463437756..0000000000000 --- a/pkgs/applications/audio/music-player/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ lib -, stdenv -, alsa-lib -, darwin -, fetchFromGitHub -, pkg-config -, protobuf -, rustPlatform -}: - -rustPlatform.buildRustPackage rec { - pname = "music-player"; - version = "0.2.0-alpha.14"; - - src = fetchFromGitHub { - owner = "tsirysndr"; - repo = "music-player"; - rev = "v${version}"; - hash = "sha256-l8Y1fc5v0YDm87b+d3DuMgKFiem6WFfJEASplHoqva0="; - }; - - cargoHash = "sha256-nnOHuAn+eGf+iiX3QbDTH4zHMQ6KV4QP6RnyBhLMrEc="; - - nativeBuildInputs = [ - protobuf - rustPlatform.bindgenHook - ] ++ lib.optionals stdenv.isLinux [ - pkg-config - ]; - - buildInputs = lib.optionals stdenv.isLinux [ - alsa-lib - ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.AudioUnit - ]; - - meta = with lib; { - description = "Extensible music player daemon written in Rust"; - homepage = "https://github.com/tsirysndr/music-player"; - changelog = "https://github.com/tsirysndr/music-player/releases/tag/v${version}"; - license = licenses.mit; - maintainers = [ ]; - mainProgram = "music-player"; - }; -} diff --git a/pkgs/applications/audio/musikcube/default.nix b/pkgs/applications/audio/musikcube/default.nix deleted file mode 100644 index db91a2952bf2a..0000000000000 --- a/pkgs/applications/audio/musikcube/default.nix +++ /dev/null @@ -1,94 +0,0 @@ -{ asio -, cmake -, curl -, fetchFromGitHub -, ffmpeg -, gnutls -, lame -, lib -, libev -, game-music-emu -, libmicrohttpd -, libopenmpt -, mpg123 -, ncurses -, pkg-config -, portaudio -, stdenv -, taglib -# Linux Dependencies -, alsa-lib -, pipewireSupport ? !stdenv.hostPlatform.isDarwin, pipewire -, pulseaudio -, sndioSupport ? true, sndio -, systemd -, systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd -# Darwin Dependencies -, Cocoa -, SystemConfiguration -, coreaudioSupport ? stdenv.hostPlatform.isDarwin, CoreAudio -}: - -stdenv.mkDerivation rec { - pname = "musikcube"; - version = "3.0.2"; - - src = fetchFromGitHub { - owner = "clangen"; - repo = pname; - rev = version; - hash = "sha512-IakZy6XsAE39awjzQI+R11JCPeQSaibx6+uX8Iea5WdlCundeovnPwSAi6RzzZl9dr2UftzzEiF4Aun8VMtqVA=="; - }; - - outputs = [ "out" "dev" ]; - - nativeBuildInputs = [ - cmake - pkg-config - ]; - - buildInputs = [ - asio - curl - ffmpeg - gnutls - lame - libev - game-music-emu - libmicrohttpd - libopenmpt - mpg123 - ncurses - portaudio - taglib - ] ++ lib.optionals systemdSupport [ - systemd - ] ++ lib.optionals stdenv.isLinux [ - alsa-lib pulseaudio - ] ++ lib.optionals stdenv.isDarwin [ - Cocoa SystemConfiguration - ] ++ lib.optionals coreaudioSupport [ - CoreAudio - ] ++ lib.optionals sndioSupport [ - sndio - ] ++ lib.optionals pipewireSupport [ - pipewire - ]; - - cmakeFlags = [ - "-DDISABLE_STRIP=true" - ]; - - postFixup = lib.optionalString stdenv.isDarwin '' - install_name_tool -add_rpath $out/share/${pname} $out/share/${pname}/${pname} - install_name_tool -add_rpath $out/share/${pname} $out/share/${pname}/${pname}d - ''; - - meta = { - description = "Terminal-based music player, library, and streaming audio server"; - homepage = "https://musikcube.com/"; - maintainers = with lib.maintainers; [ aanderse afh ]; - license = lib.licenses.bsd3; - platforms = lib.platforms.all; - }; -} diff --git a/pkgs/applications/audio/musly/default.nix b/pkgs/applications/audio/musly/default.nix deleted file mode 100644 index 1f8e1a9f3aef1..0000000000000 --- a/pkgs/applications/audio/musly/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, eigen, ffmpeg_4 }: -stdenv.mkDerivation { - pname = "musly"; - version = "unstable-2017-04-26"; - src = fetchFromGitHub { - owner = "dominikschnitzer"; - repo = "musly"; - rev = "f911eacbbe0b39ebe87cb37d0caef09632fa40d6"; - sha256 = "1q42wvdwy2pac7bhfraqqj2czw7w2m33ms3ifjl8phm7d87i8825"; - }; - nativeBuildInputs = [ cmake ]; - buildInputs = [ eigen ffmpeg_4 ]; - fixupPhase = lib.optionalString stdenv.isDarwin '' - install_name_tool -change libmusly.dylib $out/lib/libmusly.dylib $out/bin/musly - install_name_tool -change libmusly_resample.dylib $out/lib/libmusly_resample.dylib $out/bin/musly - install_name_tool -change libmusly_resample.dylib $out/lib/libmusly_resample.dylib $out/lib/libmusly.dylib - ''; - - meta = with lib; { - homepage = "https://www.musly.org"; - description = "Fast and high-quality audio music similarity library written in C/C++"; - longDescription = '' - Musly analyzes the the audio signal of music pieces to estimate their similarity. - No meta-data about the music piece is included in the similarity estimation. - To use Musly in your application, have a look at the library documentation - or try the command line application included in the package and start generating - some automatic music playlists right away. - ''; - license = licenses.mpl20; - maintainers = with maintainers; [ ggpeti ]; - platforms = with platforms; darwin ++ linux; - mainProgram = "musly"; - }; -} diff --git a/pkgs/applications/audio/muso/default.nix b/pkgs/applications/audio/muso/default.nix index 8cf4e31b79e47..97d897d5fcb39 100644 --- a/pkgs/applications/audio/muso/default.nix +++ b/pkgs/applications/audio/muso/default.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { }; nativeBuildInputs = [ pkg-config wrapGAppsHook3 ]; - buildInputs = lib.optional stdenv.isDarwin CoreServices; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin CoreServices; preConfigure = '' substituteInPlace lib/utils.rs \ @@ -29,11 +29,11 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-+UVUejKCfjC6zdW315wmu7f3A5GmnoQ3rIk8SK6LIRI="; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Automatic music sorter (based on ID3 tags)"; 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/mympd/default.nix b/pkgs/applications/audio/mympd/default.nix index 8e635ddd4796d..c756b2a58c80a 100644 --- a/pkgs/applications/audio/mympd/default.nix +++ b/pkgs/applications/audio/mympd/default.nix @@ -12,17 +12,18 @@ , gzip , perl , jq +, nixosTests }: stdenv.mkDerivation (finalAttrs: { pname = "mympd"; - version = "15.0.2"; + version = "17.0.4"; src = fetchFromGitHub { owner = "jcorporation"; repo = "myMPD"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-Yz6gL87Vc8iFTRgKhyUgLL1ool+oinvwq2W9OjFl/OQ="; + sha256 = "sha256-mtAMvaC8W9/o+ccHyvJRZ5Stq82m6IgXk/jOcxaGSXA="; }; nativeBuildInputs = [ @@ -57,6 +58,8 @@ stdenv.mkDerivation (finalAttrs: { # 5 tests out of 23 fail, probably due to the sandbox... doCheck = false; + passthru.tests = { inherit (nixosTests) mympd; }; + meta = { homepage = "https://jcorporation.github.io/myMPD"; description = "Standalone and mobile friendly web mpd client with a tiny footprint and advanced features"; diff --git a/pkgs/applications/audio/ncmpcpp/default.nix b/pkgs/applications/audio/ncmpcpp/default.nix index e2ecb813f5528..ebe6eb1530f32 100644 --- a/pkgs/applications/audio/ncmpcpp/default.nix +++ b/pkgs/applications/audio/ncmpcpp/default.nix @@ -1,53 +1,88 @@ -{ lib -, stdenv -, fetchurl -, boost -, libmpdclient -, ncurses -, pkg-config -, readline -, libiconv -, icu -, curl -, outputsSupport ? true # outputs screen -, visualizerSupport ? false, fftw # visualizer screen -, clockSupport ? true # clock screen -, taglibSupport ? true, taglib # tag editor +{ + lib, + stdenv, + fetchFromGitHub, + boost, + libmpdclient, + ncurses, + pkg-config, + readline, + libiconv, + icu, + curl, + autoconf, + automake, + libtool, + outputsSupport ? true, # outputs screen + visualizerSupport ? false, + fftw, # visualizer screen + clockSupport ? true, # clock screen + taglibSupport ? true, + taglib, # tag editor }: stdenv.mkDerivation rec { pname = "ncmpcpp"; - version = "0.9.2"; + version = "0.10"; - src = fetchurl { - url = "https://rybczak.net/ncmpcpp/stable/${pname}-${version}.tar.bz2"; - sha256 = "sha256-+qv2FXyMsbJKBZryduFi+p+aO5zTgQxDuRKIYMk4Ohs="; + src = fetchFromGitHub { + owner = "ncmpcpp"; + repo = "ncmpcpp"; + rev = "refs/tags/${version}"; + sha256 = "sha256-HRJQ+IOQ8xP1QkPlLI+VtDUWaI2m0Aw0fCDWHhgsOLY="; }; enableParallelBuilding = true; strictDeps = true; - configureFlags = [ "BOOST_LIB_SUFFIX=" ] - ++ lib.optional outputsSupport "--enable-outputs" - ++ lib.optional visualizerSupport "--enable-visualizer --with-fftw" - ++ lib.optional clockSupport "--enable-clock" - ++ lib.optional taglibSupport "--with-taglib"; + configureFlags = [ + "BOOST_LIB_SUFFIX=" + (lib.enableFeature outputsSupport "outputs") + (lib.enableFeature visualizerSupport "visualizer") + (lib.withFeature visualizerSupport "fftw") + (lib.enableFeature clockSupport "clock") + (lib.withFeature taglibSupport "taglib") + ]; - nativeBuildInputs = [ pkg-config ] - ++ lib.optional taglibSupport taglib; + nativeBuildInputs = [ + autoconf + automake + libtool + pkg-config + ]; - buildInputs = [ boost libmpdclient ncurses readline libiconv icu curl ] - ++ lib.optional visualizerSupport fftw + buildInputs = [ + boost + libmpdclient + ncurses + readline + libiconv + icu + curl + ] ++ lib.optional visualizerSupport fftw ++ lib.optional taglibSupport taglib; - meta = with lib; { + preConfigure = + '' + ./autogen.sh + '' + + lib.optionalString stdenv.isDarwin '' + # std::result_of was removed in c++20 and unusable for clang16 + substituteInPlace ./configure \ + --replace-fail "std=c++20" "std=c++17" + ''; + + meta = { description = "Featureful ncurses based MPD client inspired by ncmpc"; - homepage = "https://rybczak.net/ncmpcpp/"; - changelog = "https://github.com/ncmpcpp/ncmpcpp/blob/${version}/CHANGELOG.md"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ koral lovek323 ]; - platforms = platforms.all; + homepage = "https://rybczak.net/ncmpcpp/"; + changelog = "https://github.com/ncmpcpp/ncmpcpp/blob/${version}/CHANGELOG.md"; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ + koral + lovek323 + ]; + platforms = lib.platforms.all; mainProgram = "ncmpcpp"; }; } diff --git a/pkgs/applications/audio/ncspot/default.nix b/pkgs/applications/audio/ncspot/default.nix index d5abb66d23981..d2d428963badc 100644 --- a/pkgs/applications/audio/ncspot/default.nix +++ b/pkgs/applications/audio/ncspot/default.nix @@ -20,31 +20,31 @@ rustPlatform.buildRustPackage rec { pname = "ncspot"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitHub { owner = "hrkfdn"; repo = "ncspot"; rev = "v${version}"; - hash = "sha256-Sl4i9HFl+Dth9jmW6hPZzgh0Y35pRo1Xi9LRxCuSIP4="; + hash = "sha256-Lt2IuoiXYgSVPi4u8y16u9m5ya4HdpQme6snvNJrwso="; }; - cargoHash = "sha256-INgDavtBI75h+qVlxTncYu3su+SH/D7HTlThRHJzwkY="; + cargoHash = "sha256-JJTnaq0JLWHQxAbDpzDRPi5B+ePlQNlDOAsugPah7j4="; nativeBuildInputs = [ pkg-config ] ++ lib.optional withClipboard python3; buildInputs = [ ncurses ] - ++ lib.optional stdenv.isLinux openssl + ++ lib.optional stdenv.hostPlatform.isLinux openssl ++ lib.optional withALSA alsa-lib ++ lib.optional withClipboard libxcb ++ lib.optional withCover ueberzug ++ lib.optional withPulseAudio libpulseaudio ++ lib.optional withPortAudio portaudio ++ lib.optional (withMPRIS || withNotify) dbus - ++ lib.optional stdenv.isDarwin Cocoa; + ++ lib.optional stdenv.hostPlatform.isDarwin Cocoa; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-DNCURSES_UNCTRL_H_incl"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-DNCURSES_UNCTRL_H_incl"; buildNoDefaultFeatures = true; diff --git a/pkgs/applications/audio/noisetorch/default.nix b/pkgs/applications/audio/noisetorch/default.nix index 78f50cbbedbc1..5f3dfc7bf8fd9 100644 --- a/pkgs/applications/audio/noisetorch/default.nix +++ b/pkgs/applications/audio/noisetorch/default.nix @@ -9,7 +9,7 @@ buildGoModule rec { repo = "NoiseTorch"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-gOPSMPH99Upi/30OnAdwSb7SaMV0i/uHB051cclfz6A="; + hash = "sha256-gOPSMPH99Upi/30OnAdwSb7SaMV0i/uHB051cclfz6A="; }; vendorHash = null; diff --git a/pkgs/applications/audio/non/default.nix b/pkgs/applications/audio/non/default.nix index f6f2ba3f73c9f..bd4c83742930e 100644 --- a/pkgs/applications/audio/non/default.nix +++ b/pkgs/applications/audio/non/default.nix @@ -17,6 +17,13 @@ stdenv.mkDerivation { ladspaH liblo libsigcxx lrdf ]; + # NOTE: non provides its own waf script that is incompatible with new + # python versions. If the script is not present, wafHook will install + # a compatible version from nixpkgs. + prePatch = '' + rm waf + ''; + env.CXXFLAGS = "-std=c++14"; meta = { diff --git a/pkgs/applications/audio/noson/default.nix b/pkgs/applications/audio/noson/default.nix index 0184934ff2208..bf2c115758c48 100644 --- a/pkgs/applications/audio/noson/default.nix +++ b/pkgs/applications/audio/noson/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "noson"; - version = "5.6.7"; + version = "5.6.8"; src = fetchFromGitHub { owner = "janbar"; repo = "noson-app"; rev = finalAttrs.version; - hash = "sha256-lroQYO+Ab7uPQmsrUFK6uWdCoGQp1klyfLw6eAxdzjg="; + hash = "sha256-hCVGi+++6CcTRMXeRKH8xRncm/Gl83GgU3aAIPI/yGU="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/nuclear/default.nix b/pkgs/applications/audio/nuclear/default.nix deleted file mode 100644 index 2d6a4384e747e..0000000000000 --- a/pkgs/applications/audio/nuclear/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ appimageTools -, lib -, fetchurl -}: -let - pname = "nuclear"; - version = "0.6.30"; - - src = fetchurl { - url = "https://github.com/nukeop/nuclear/releases/download/v${version}/${pname}-v${version}.AppImage"; - hash = "sha256-he1uGC1M/nFcKpMM9JKY4oeexJcnzV0ZRxhTjtJz6xw="; - }; - - appimageContents = appimageTools.extract { inherit pname version src; }; -in -appimageTools.wrapType2 { - inherit pname version src; - - extraInstallCommands = '' - install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications - substituteInPlace $out/share/applications/${pname}.desktop \ - --replace 'Exec=AppRun' 'Exec=${pname}' - cp -r ${appimageContents}/usr/share/icons $out/share - ''; - - meta = with lib; { - description = "Streaming music player that finds free music for you"; - homepage = "https://nuclear.js.org/"; - license = licenses.agpl3Plus; - maintainers = [ maintainers.NotAShelf ]; - platforms = [ "x86_64-linux" ]; - mainProgram = "nuclear"; - }; -} diff --git a/pkgs/applications/audio/odin2/default.nix b/pkgs/applications/audio/odin2/default.nix index a6254d8c77e81..ae3a464f43b21 100644 --- a/pkgs/applications/audio/odin2/default.nix +++ b/pkgs/applications/audio/odin2/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { repo = "odin2"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-N96Nb7G6hqfh8DyMtHbttl/fRZUkS8f2KfPSqeMAhHY="; + hash = "sha256-N96Nb7G6hqfh8DyMtHbttl/fRZUkS8f2KfPSqeMAhHY="; }; postPatch = '' diff --git a/pkgs/applications/audio/open-music-kontrollers/generic.nix b/pkgs/applications/audio/open-music-kontrollers/generic.nix index b76a52ca3d28f..4c4211e49f0ae 100644 --- a/pkgs/applications/audio/open-music-kontrollers/generic.nix +++ b/pkgs/applications/audio/open-music-kontrollers/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, pkg-config, meson, ninja, libGLU, lv2, serd, sord, libX11, libXext, glew, lv2lint +{ stdenv, lib, fetchurl, pkg-config, meson, ninja, lv2, sord, libX11, libXext, glew, lv2lint , pname, version, sha256, description , url ? "https://git.open-music-kontrollers.ch/lv2/${pname}.lv2/snapshot/${pname}.lv2-${version}.tar.xz" , additionalBuildInputs ? [] @@ -28,7 +28,7 @@ stdenv.mkDerivation { ] ++ additionalBuildInputs; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = description; homepage = "https://open-music-kontrollers.ch/lv2/${pname}:"; license = licenses.artistic2; diff --git a/pkgs/applications/audio/open-stage-control/default.nix b/pkgs/applications/audio/open-stage-control/default.nix index 60b9bc23bc362..504351a1a41fc 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 = [ ]; 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..df53f4a49644a 100644 --- a/pkgs/applications/audio/openutau/default.nix +++ b/pkgs/applications/audio/openutau/default.nix @@ -5,26 +5,27 @@ , dotnetCorePackages , dbus , fontconfig -, libICE -, libSM -, libX11 , portaudio }: buildDotnetModule rec { pname = "OpenUtau"; - version = "0.1.327"; + version = "0.1.529"; src = fetchFromGitHub { owner = "stakira"; repo = "OpenUtau"; rev = "build/${version}"; - hash = "sha256-Bss32Fk4yBEFqaIxT2dfdvWXz09sO6akiitDQBXoSvY="; + hash = "sha256-HE0KxPKU7tYZbYiCL8sm6I/NZiX0MJktt+5d6qB1A2E="; }; dotnet-sdk = dotnetCorePackages.sdk_7_0; dotnet-runtime = dotnetCorePackages.runtime_7_0; + # [...]/Microsoft.NET.Sdk.targets(157,5): error MSB4018: The "GenerateDepsFile" task failed unexpectedly. [[...]/OpenUtau.Core.csproj] + # [...]/Microsoft.NET.Sdk.targets(157,5): error MSB4018: System.IO.IOException: The process cannot access the file '[...]/OpenUtau.Core.deps.json' because it is being used by another process. [[...]/OpenUtau.Core.csproj] + enableParallelBuilding = false; + projectFile = "OpenUtau.sln"; nugetDeps = ./deps.nix; @@ -32,17 +33,13 @@ buildDotnetModule rec { runtimeDeps = [ dbus - fontconfig - libICE - libSM - libX11 portaudio ]; dotnetInstallFlags = [ "-p:PublishReadyToRun=false" ]; # socket cannot bind to localhost on darwin for tests - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; # net7.0 replacement needed until upstream bumps to dotnet 7 postPatch = '' @@ -57,9 +54,9 @@ buildDotnetModule rec { # need to make sure proprietary worldline resampler is copied postInstall = let - runtime = if (stdenv.isLinux && stdenv.isx86_64) then "linux-x64" - else if (stdenv.isLinux && stdenv.isAarch64) then "linux-arm64" - else if stdenv.isDarwin then "osx" + runtime = if (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64) then "linux-x64" + else if (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) then "linux-arm64" + else if stdenv.hostPlatform.isDarwin then "osx" else null; in lib.optionalString (runtime != null) '' cp runtimes/${runtime}/native/libworldline${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/OpenUtau/ @@ -83,7 +80,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 = [ ]; platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; mainProgram = "OpenUtau"; }; diff --git a/pkgs/applications/audio/openutau/deps.nix b/pkgs/applications/audio/openutau/deps.nix index 5783ae18916b3..1994e4157ef7e 100644 --- a/pkgs/applications/audio/openutau/deps.nix +++ b/pkgs/applications/audio/openutau/deps.nix @@ -2,244 +2,245 @@ # Please dont edit it manually, your changes might get overwritten! { fetchNuGet }: [ - (fetchNuGet { pname = "AsyncIO"; version = "0.1.69"; sha256 = "1anby58bs94gf338vmn6vvwxw0kcz6y8yap57vgh8dgm9vysl0i5"; }) - (fetchNuGet { pname = "Avalonia"; version = "11.0.4"; sha256 = "0jid0x90dc8m609wqwbq87014yzih2iimz74wm6zi1j02k080jk0"; }) - (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.ReactiveUI"; version = "11.0.4"; sha256 = "1hs29qvbhm5qdhys0j3d89c37qfalx1pcpxl3hh9adz11wc0nb3b"; }) - (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 = "BunLabs.NAudio.Flac"; version = "2.0.1"; sha256 = "1ps7fs451ydsaz5g4j7bhcfawp8fys6vcah3rsrl36g7ni0dwf3v"; }) - (fetchNuGet { pname = "Concentus"; version = "1.1.7"; sha256 = "0y5z444wrbhlmsqpy2sxmajl1fbf74843lvgj3y6vz260dn2q0l0"; }) - (fetchNuGet { pname = "Concentus.Oggfile"; version = "1.0.4"; sha256 = "12n5bcg1i91daqgnl7q6d55phbkv1srkrvk2k7k8vxpyv231yb6v"; }) - (fetchNuGet { pname = "coverlet.collector"; version = "6.0.0"; sha256 = "12j34vrkmph8lspbafnqmfnj2qvysz1jcrks2khw798s6dwv0j90"; }) - (fetchNuGet { pname = "DotNet.Bundle"; version = "0.9.13"; sha256 = "0awzvk62hgszm9b8ar87y862aj8nlm77d7hgfmp84mxny0ag03jl"; }) - (fetchNuGet { pname = "DynamicData"; version = "7.9.5"; sha256 = "1m9qx8g6na5ka6kd9vhg8gjmxrnkzb6v5cl5yqp1kdjsw4rcwy6x"; }) - (fetchNuGet { pname = "Fody"; version = "6.6.3"; sha256 = "02qhz4l2qqzsjzhv0jyb0bp8dckpjfg6w6pss5cng98g92zxkma6"; }) - (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 = "K4os.Hash.xxHash"; version = "1.0.8"; sha256 = "0vz1f81z4rh7a576fdzbc6wmj7p4gaca1rch3anvh1s5qd7xdd10"; }) - (fetchNuGet { pname = "Melanchall.DryWetMidi"; version = "6.1.4"; sha256 = "1m0n6in27cpasmshw261az1n9y7rq4vp7z80gv7zpg8wqichqnqv"; }) - (fetchNuGet { pname = "MicroCom.Runtime"; version = "0.11.0"; sha256 = "0p9c3m0zk59x9dcqw077hzd2yk60myisbacvm36mnwpcjwzjkp2m"; }) - (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "5.0.0"; sha256 = "0cp5jbax2mf6xr3dqiljzlwi05fv6n9a35z337s92jcljiq674kf"; }) - (fetchNuGet { pname = "Microsoft.Bcl.HashCode"; version = "1.1.1"; sha256 = "0xwfph92p92d8hgrdiaka4cazqsjpg4ywfxfx6qbk3939f29kzl0"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.0.0"; sha256 = "0bbl0jpqywqmzz2gagld1p2gvdfldjfjmm25hil9wj2nq1zc4di8"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "3.8.0"; sha256 = "12n7rvr39bzkf2maw7zplw8rwpxpxss4ich3bb2pw770rx4nyvyw"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "3.8.0"; sha256 = "1kmry65csvfn72zzc16vj1nfbfwam28wcmlrk3m5rzb8ydbzgylb"; }) - (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.CodeCoverage"; version = "17.8.0"; sha256 = "173wjadp3gan4x2jfjchngnc4ca4mb95h1sbb28jydfkfw0z1zvj"; }) - (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.3.0"; sha256 = "0gw297dgkh0al1zxvgvncqs0j15lsna9l1wpqas4rflmys440xvb"; }) - (fetchNuGet { pname = "Microsoft.Extensions.ObjectPool"; version = "5.0.10"; sha256 = "07fk669pjydkcg6bxxv7aj548fzab4yb7ba8370d719lgi9y425l"; }) - (fetchNuGet { pname = "Microsoft.ML.OnnxRuntime"; version = "1.15.0"; sha256 = "1wjafpn0fgxxyl5kw427ypc8c2gwha286sf96mv3fivdk3qyysxw"; }) - (fetchNuGet { pname = "Microsoft.ML.OnnxRuntime.Managed"; version = "1.15.0"; sha256 = "06hnsx0a81gbz5zr4qqij2c518wqdn3hg784zvkj0jlkwi5z2hr8"; }) - (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.8.0"; sha256 = "1syvl3g0hbrcgfi9rq6pld8s8hqqww4dflf1lxn59ccddyyx0gmv"; }) - (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.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.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; }) - (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "5.0.0"; sha256 = "0sja4ba0mrvdamn0r9mhq38b9dxi08yb3c1hzh29n1z6ws1hlrcq"; }) - (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "6.0.0"; sha256 = "0c6pcj088g1yd1vs529q3ybgsd2vjlk5y1ic6dkmbhvrp5jibl9p"; }) - (fetchNuGet { pname = "NaCl.Net"; version = "0.1.13"; sha256 = "0n92rinhbhxvdrk7dhxj6vd7c4dv76ks8djqvyrc41bbzj85qbv7"; }) - (fetchNuGet { pname = "NAudio.Core"; version = "2.1.0"; sha256 = "1pxd2qmqxsia1spdylxvv8ik5r614yvkmki438ihmhvvs2mxsmvi"; }) - (fetchNuGet { pname = "NAudio.Midi"; version = "2.1.0"; sha256 = "1llki3c83qg1lf7bsbz94m2blrq1dmpwhkffqp9vj8q8w5fbjdkj"; }) - (fetchNuGet { pname = "NAudio.Vorbis"; version = "1.5.0"; sha256 = "1b3inmmvcsbfnvcnsg6wnhbcqxyz3x2qdkggcginfwabahfl8zhm"; }) - (fetchNuGet { pname = "NetMQ"; version = "4.0.1.12"; sha256 = "0zx0m26cbpp105lnwhaynl73sg7n2gni5744vnrk198iwd114zrv"; }) - (fetchNuGet { pname = "NetSparkleUpdater.SparkleUpdater"; version = "2.2.3"; sha256 = "13vmf176f2z71xf5inp440bbxnpg40mk44f1jdh8vip6g1rg72nc"; }) - (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; }) - (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.3"; sha256 = "0xrwysmrn4midrjal8g2hr1bbg38iyisl0svamb11arqws4w2bw7"; }) - (fetchNuGet { pname = "NLayer"; version = "1.14.0"; sha256 = "17srybcp3zlh31hlhpy2xd9lrka7i93842m2wf364fkgiqa4nssb"; }) - (fetchNuGet { pname = "NLayer.NAudioSupport"; version = "1.3.0"; sha256 = "0n2zk8r6sm3623j8a7rzb226i9mfr63vhf6718lyncmmsfjasmm4"; }) - (fetchNuGet { pname = "NuGet.Frameworks"; version = "6.5.0"; sha256 = "0s37d1p4md0k6d4cy6sq36f2dgkd9qfbzapxhkvi8awwh0vrynhj"; }) - (fetchNuGet { pname = "NumSharp"; version = "0.30.0"; sha256 = "0r12i48q8gn5nxkxs3kwqcyhbd2xxzrazxg4y9l5m4gvm64zjg7d"; }) - (fetchNuGet { pname = "NVorbis"; version = "0.10.4"; sha256 = "0l4f3vhqc6ly7s8mszwarszgirz6ywx1rjsr1jx0fdlsjl02x6p9"; }) - (fetchNuGet { pname = "NWaves"; version = "0.9.6"; sha256 = "16mxnc3hiaf38z3knsw54wkf9pw18yg63mzxqa4ccixf05ni3zhd"; }) - (fetchNuGet { pname = "PolySharp"; version = "1.10.0"; sha256 = "06qici3hhk6a0jmy0nyvspcnmhbapnic6iin3i28pkdvrii02hnz"; }) - (fetchNuGet { pname = "Portable.BouncyCastle"; version = "1.9.0"; sha256 = "0kphjwz4hk2nki3b4f9z096xzd520nrpvi3cjib8fkjk6zhwrr8q"; }) - (fetchNuGet { pname = "ReactiveUI"; version = "18.3.1"; sha256 = "1lxkc8yk9glj0w9n5vry2dnwwvh8152ad2c5bivk8aciq64zidyn"; }) - (fetchNuGet { pname = "ReactiveUI.Fody"; version = "18.3.1"; sha256 = "16xr69ls822azqv81wi13lbqgnff4i1lg61frx2s11mfa04jy1zz"; }) - (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; }) - (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "1wl76vk12zhdh66vmagni66h5xbhgqq7zkdpgw21jhxhvlbcl8pk"; }) - (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn"; }) - (fetchNuGet { pname = "runtime.any.System.Globalization"; version = "4.3.0"; sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"; }) - (fetchNuGet { pname = "runtime.any.System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1ghhhk5psqxcg6w88sxkqrc35bxcz27zbqm2y5p5298pv3v7g201"; }) - (fetchNuGet { pname = "runtime.any.System.IO"; version = "4.3.0"; sha256 = "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"; }) - (fetchNuGet { pname = "runtime.any.System.Reflection"; version = "4.3.0"; sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"; }) - (fetchNuGet { pname = "runtime.any.System.Reflection.Extensions"; version = "4.3.0"; sha256 = "0zyri97dfc5vyaz9ba65hjj1zbcrzaffhsdlpxc9bh09wy22fq33"; }) - (fetchNuGet { pname = "runtime.any.System.Reflection.Primitives"; version = "4.3.0"; sha256 = "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf"; }) - (fetchNuGet { pname = "runtime.any.System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl"; }) - (fetchNuGet { pname = "runtime.any.System.Runtime"; version = "4.3.0"; sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"; }) - (fetchNuGet { pname = "runtime.any.System.Runtime.Handles"; version = "4.3.0"; sha256 = "0bh5bi25nk9w9xi8z23ws45q5yia6k7dg3i4axhfqlnj145l011x"; }) - (fetchNuGet { pname = "runtime.any.System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19"; }) - (fetchNuGet { pname = "runtime.any.System.Text.Encoding"; version = "4.3.0"; sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"; }) - (fetchNuGet { pname = "runtime.any.System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8"; }) - (fetchNuGet { pname = "runtime.any.System.Threading.Tasks"; version = "4.3.0"; sha256 = "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va"; }) - (fetchNuGet { pname = "runtime.any.System.Threading.Timer"; version = "4.3.0"; sha256 = "0aw4phrhwqz9m61r79vyfl5la64bjxj8l34qnrcwb28v49fg2086"; }) - (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; }) - (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; }) - (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; }) - (fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; }) - (fetchNuGet { pname = "runtime.native.System.IO.Compression"; version = "4.3.0"; sha256 = "1vvivbqsk6y4hzcid27pqpm5bsi6sc50hvqwbcx8aap5ifrxfs8d"; }) - (fetchNuGet { pname = "runtime.native.System.Net.Http"; version = "4.3.0"; sha256 = "1n6rgz5132lcibbch1qlf0g9jk60r0kqv087hxc0lisy50zpm7kk"; }) - (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; sha256 = "1b61p6gw1m02cc1ry996fl49liiwky6181dzr873g9ds92zl326q"; }) - (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; }) - (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"; }) - (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf"; }) - (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; sha256 = "10yc8jdrwgcl44b4g93f1ds76b176bajd3zqi2faf5rvh1vy9smi"; }) - (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3"; }) - (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn"; }) - (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"; }) - (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"; }) - (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; }) - (fetchNuGet { pname = "runtime.unix.Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0y61k9zbxhdi0glg154v30kkq7f8646nif8lnnxbvkjpakggd5id"; }) - (fetchNuGet { pname = "runtime.unix.System.Console"; version = "4.3.0"; sha256 = "1pfpkvc6x2if8zbdzg9rnc5fx51yllprl8zkm5npni2k50lisy80"; }) - (fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5"; }) - (fetchNuGet { pname = "runtime.unix.System.IO.FileSystem"; version = "4.3.0"; sha256 = "14nbkhvs7sji5r1saj2x8daz82rnf9kx28d3v2qss34qbr32dzix"; }) - (fetchNuGet { pname = "runtime.unix.System.Net.Primitives"; version = "4.3.0"; sha256 = "0bdnglg59pzx9394sy4ic66kmxhqp8q8bvmykdxcbs5mm0ipwwm4"; }) - (fetchNuGet { pname = "runtime.unix.System.Net.Sockets"; version = "4.3.0"; sha256 = "03npdxzy8gfv035bv1b9rz7c7hv0rxl5904wjz51if491mw0xy12"; }) - (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; }) - (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; }) - (fetchNuGet { pname = "Serilog"; version = "2.12.0"; sha256 = "0lqxpc96qcjkv9pr1rln7mi4y7n7jdi4vb36c2fv3845w1vswgr4"; }) - (fetchNuGet { pname = "Serilog.Sinks.Console"; version = "4.1.0"; sha256 = "1rpkphmqfh3bv3m7v1zwz88wz4sirj4xqyff9ga0c6bqhblj6wii"; }) - (fetchNuGet { pname = "Serilog.Sinks.Debug"; version = "2.0.0"; sha256 = "1i7j870l47gan3gpnnlzkccn5lbm7518cnkp25a3g5gp9l0dbwpw"; }) - (fetchNuGet { pname = "Serilog.Sinks.File"; version = "5.0.0"; sha256 = "097rngmgcrdfy7jy8j7dq3xaq2qky8ijwg0ws6bfv5lx0f3vvb0q"; }) - (fetchNuGet { pname = "SharpCompress"; version = "0.33.0"; sha256 = "1j94hfjvkygpp97svv75jay0rmnx9ygg86d5syyahl9hayns4ig9"; }) - (fetchNuGet { pname = "SharpGen.Runtime"; version = "2.0.0-beta.13"; sha256 = "1250z6sa9ghf84czlkzvaysb29c0n229z1f0vh5qls89akrkl7h8"; }) - (fetchNuGet { pname = "SharpGen.Runtime.COM"; version = "2.0.0-beta.13"; sha256 = "1lmv3jp2g7mgy9j23pd3j0wr3p89qiq8v6c6qxqf688izyni1166"; }) - (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 = "Splat"; version = "14.4.1"; sha256 = "03ycyjn2ii44npi015p4rk344xnjgdzz02cf63cmhx2ab8hv6p4b"; }) - (fetchNuGet { pname = "System.AppContext"; version = "4.3.0"; sha256 = "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya"; }) - (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; }) - (fetchNuGet { pname = "System.Buffers"; version = "4.5.1"; sha256 = "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3"; }) - (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) - (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.3.0"; sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; }) - (fetchNuGet { pname = "System.Collections.Immutable"; version = "5.0.0"; sha256 = "1kvcllagxz2q92g81zkz81djkn2lid25ayjfgjalncyc68i15p0r"; }) - (fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "4.5.0"; sha256 = "1jj6f6g87k0iwsgmg3xmnn67a14mq88np0l1ys5zkxhkvbc8976p"; }) - (fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "5.0.0"; sha256 = "021h7x98lblq9avm1bgpa4i31c2kgsa7zn4sqhxf39g087ar756j"; }) - (fetchNuGet { pname = "System.Console"; version = "4.3.0"; sha256 = "1flr7a9x920mr5cjsqmsy9wgnv3lvd0h1g521pdr1lkb2qycy7ay"; }) - (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; }) - (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.3.0"; sha256 = "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq"; }) - (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1"; }) - (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; }) - (fetchNuGet { pname = "System.Drawing.Common"; version = "5.0.0"; sha256 = "0fag8hr2v9bswrsjka311lhbr1a43yzcc36j4fadz0f0kl2hby7h"; }) - (fetchNuGet { pname = "System.Drawing.Common"; version = "6.0.0"; sha256 = "02n8rzm58dac2np8b3xw8ychbvylja4nh6938l5k2fhyn40imlgz"; }) - (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.3.0"; sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk"; }) - (fetchNuGet { pname = "System.Formats.Asn1"; version = "5.0.0"; sha256 = "1axc8z0839yvqi2cb63l73l6d9j6wd20lsbdymwddz9hvrsgfwpn"; }) - (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; }) - (fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq"; }) - (fetchNuGet { pname = "System.Globalization.Extensions"; version = "4.3.0"; sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"; }) - (fetchNuGet { pname = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; }) - (fetchNuGet { pname = "System.IO.Compression"; version = "4.3.0"; sha256 = "084zc82yi6yllgda0zkgl2ys48sypiswbiwrv7irb3r0ai1fp4vz"; }) - (fetchNuGet { pname = "System.IO.Compression.ZipFile"; version = "4.3.0"; sha256 = "1yxy5pq4dnsm9hlkg9ysh5f6bf3fahqqb6p8668ndy5c0lk7w2ar"; }) - (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.3.0"; sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; }) - (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; }) - (fetchNuGet { pname = "System.IO.Packaging"; version = "7.0.0"; sha256 = "16fgj2ab5ci217shmfsi6c0rnmkh90h6vyb60503nhpmh7y8di13"; }) - (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"; }) - (fetchNuGet { pname = "System.Memory"; version = "4.5.3"; sha256 = "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a"; }) - (fetchNuGet { pname = "System.Memory"; version = "4.5.4"; sha256 = "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y"; }) - (fetchNuGet { pname = "System.Memory"; version = "4.5.5"; sha256 = "08jsfwimcarfzrhlyvjjid61j02irx6xsklf32rv57x2aaikvx0h"; }) - (fetchNuGet { pname = "System.Net.Http"; version = "4.3.0"; sha256 = "1i4gc757xqrzflbk7kc5ksn20kwwfjhw9w7pgdkn19y3cgnl302j"; }) - (fetchNuGet { pname = "System.Net.NameResolution"; version = "4.3.0"; sha256 = "15r75pwc0rm3vvwsn8rvm2krf929mjfwliv0mpicjnii24470rkq"; }) - (fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; }) - (fetchNuGet { pname = "System.Net.Sockets"; version = "4.3.0"; sha256 = "1ssa65k6chcgi6mfmzrznvqaxk8jp0gvl77xhf1hbzakjnpxspla"; }) - (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.4.0"; sha256 = "0rdvma399070b0i46c4qq1h2yvjj3k013sqzkilz4bz5cwmx1rba"; }) - (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.5.0"; sha256 = "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59"; }) - (fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; }) - (fetchNuGet { pname = "System.Private.ServiceModel"; version = "4.9.0"; sha256 = "117vxa0pfgg6xfdxfpza4296ay7sqiaynyvfbsai43yrkh0lmch1"; }) - (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; }) - (fetchNuGet { pname = "System.Reactive"; version = "5.0.0"; sha256 = "1lafmpnadhiwxyd543kraxa3jfdpm6ipblxrjlibym9b1ykpr5ik"; }) - (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; }) - (fetchNuGet { pname = "System.Reflection.DispatchProxy"; version = "4.7.1"; sha256 = "10yh3q2i71gcw7c0dfz9qxql2vlvnqjav1hyf1q9rpbvdbgsabrs"; }) - (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.3.0"; sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; }) - (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; }) - (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.3.0"; sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; }) - (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; }) - (fetchNuGet { pname = "System.Reflection.Metadata"; version = "1.6.0"; sha256 = "1wdbavrrkajy7qbdblpbpbalbdl48q3h34cchz24gvdgyrlf15r4"; }) - (fetchNuGet { pname = "System.Reflection.Metadata"; version = "5.0.0"; sha256 = "17qsl5nanlqk9iz0l5wijdn6ka632fs1m1fvx18dfgswm258r3ss"; }) - (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; }) - (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.3.0"; sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; }) - (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.5.2"; sha256 = "1vz4275fjij8inf31np78hw50al8nqkngk04p3xv5n4fcmf1grgi"; }) - (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.3"; sha256 = "1afi6s2r1mh1kygbjmfba6l4f87pi5sg13p4a48idqafli94qxln"; }) - (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.7.0"; sha256 = "16r6sn4czfjk8qhnz7bnqlyiaaszr0ihinb7mq9zzr1wba257r54"; }) - (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.Runtime.InteropServices.RuntimeInformation"; version = "4.3.0"; sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; }) - (fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.3.0"; sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; }) - (fetchNuGet { pname = "System.Security.AccessControl"; version = "5.0.0"; sha256 = "17n3lrrl6vahkqmhlpn3w20afgz09n7i6rv0r3qypngwi7wqdr5r"; }) - (fetchNuGet { pname = "System.Security.Claims"; version = "4.3.0"; sha256 = "0jvfn7j22l3mm28qjy3rcw287y9h65ha4m940waaxah07jnbzrhn"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Algorithms"; version = "4.3.0"; sha256 = "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.3.0"; sha256 = "1k468aswafdgf56ab6yrn7649kfqx2wm9aslywjam1hdmk5yypmv"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "5.0.0"; sha256 = "06hkx2za8jifpslkh491dfwzm5dxrsyxzj5lsc0achb6yzg4zqlw"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Csp"; version = "4.3.0"; sha256 = "1x5wcrddf2s3hb8j78cry7yalca4lb5vfnkrysagbn6r9x6xvrx1"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Encoding"; version = "4.3.0"; sha256 = "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32"; }) - (fetchNuGet { pname = "System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0givpvvj8yc7gv4lhb6s1prq6p2c4147204a0wib89inqzd87gqc"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Pkcs"; version = "5.0.0"; sha256 = "0hb2mndac3xrw3786bsjxjfh19bwnr991qib54k6wsqjhjyyvbwj"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Primitives"; version = "4.3.0"; sha256 = "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby"; }) - (fetchNuGet { pname = "System.Security.Cryptography.X509Certificates"; version = "4.3.0"; sha256 = "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Xml"; version = "5.0.0"; sha256 = "1nmzm3d1hymc992qhbzb1ngx9pd7ww00581b2ici25d9m7n99g6h"; }) - (fetchNuGet { pname = "System.Security.Permissions"; version = "5.0.0"; sha256 = "1xs1lagxr5blc0dfm6xv1nawcz552lq332x3j2a7sizqfarlk384"; }) - (fetchNuGet { pname = "System.Security.Principal"; version = "4.3.0"; sha256 = "12cm2zws06z4lfc4dn31iqv7072zyi4m910d4r6wm8yx85arsfxf"; }) - (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.3.0"; sha256 = "00a0a7c40i3v4cb20s2cmh9csb5jv2l0frvnlzyfxh848xalpdwr"; }) - (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "5.0.0"; sha256 = "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8"; }) - (fetchNuGet { pname = "System.ServiceModel.Primitives"; version = "4.9.0"; sha256 = "1lzl69ar18fn4iqya2ymm9kdv54d4mi0hcdnyvyxjq3bnhnb22qf"; }) - (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.Text.Encoding.CodePages"; version = "4.7.0"; sha256 = "00yamg3b111blkjvyckxl5nxsxs2n9iccp7z1x0c2j96czgf60pz"; }) - (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "7.0.0"; sha256 = "0sn6hxdjm7bw3xgsmg041ccchsa4sp02aa27cislw3x61dbr68kq"; }) - (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; }) - (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "7.0.0"; sha256 = "1151hbyrcf8kyg1jz8k9awpbic98lwz9x129rg7zk1wrs6vjlpxl"; }) - (fetchNuGet { pname = "System.Text.Json"; version = "7.0.2"; sha256 = "1i6yinxvbwdk5g5z9y8l4a5hj2gw3h9ijlz2f1c1ngyprnwz2ivf"; }) - (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; }) - (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }) - (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) - (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.3.0"; sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; }) - (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; sha256 = "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153"; }) - (fetchNuGet { pname = "System.Threading.ThreadPool"; version = "4.3.0"; sha256 = "027s1f4sbx0y1xqw2irqn6x161lzj8qwvnh2gn78ciiczdv10vf1"; }) - (fetchNuGet { pname = "System.Threading.Timer"; version = "4.3.0"; sha256 = "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56"; }) - (fetchNuGet { pname = "System.ValueTuple"; version = "4.5.0"; sha256 = "00k8ja51d0f9wrq4vv5z2jhq8hy31kac2rg0rv06prylcybzl8cy"; }) - (fetchNuGet { pname = "System.Windows.Extensions"; version = "5.0.0"; sha256 = "0q776jpacfjmps4sc6gjvqj89w1ynj41hb0lvqmfl3j221lsfdbz"; }) - (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.3.0"; sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; }) - (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.3.0"; sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; }) - (fetchNuGet { pname = "Tmds.DBus.Protocol"; version = "0.15.0"; sha256 = "0d99kcs7r9cp6gpyc7z230czkkyx4164x86dhy0mca73f2ykc2g2"; }) - (fetchNuGet { pname = "UTF.Unknown"; version = "2.5.1"; sha256 = "0giks1ww539m4r5kzdyzkq0cvfi5k50va9idjz93rclgljl96gpl"; }) - (fetchNuGet { pname = "Vortice.DirectX"; version = "2.4.2"; sha256 = "11yjyvyz922z1ygl8gxmdym3918df12nl7xxry4pdjpl8is33qic"; }) - (fetchNuGet { pname = "Vortice.DXGI"; version = "2.4.2"; sha256 = "17vsnm9ca6nqk3f1dfpfvd6i6fp8x8v41bn65rchrzwcv1zzi6pz"; }) - (fetchNuGet { pname = "Vortice.Mathematics"; version = "1.4.25"; sha256 = "0vl6g087disxyzskvkbnwym74s47lkza0ly3nk4y0y88zibcggrj"; }) - (fetchNuGet { pname = "WanaKana-net"; version = "1.0.0"; sha256 = "197qklph8hzrihalpi0kx4n9sf94xnhywzscisnlsxybxxdjz79z"; }) - (fetchNuGet { pname = "xunit"; version = "2.6.2"; sha256 = "0g5j0xwrv9cwrx91cjb9gas3wnkcwwk8krhdzsv50vlyp71pqqgz"; }) - (fetchNuGet { pname = "xunit.abstractions"; version = "2.0.3"; sha256 = "00wl8qksgkxld76fgir3ycc5rjqv1sqds6x8yx40927q5py74gfh"; }) - (fetchNuGet { pname = "xunit.analyzers"; version = "1.6.0"; sha256 = "1nwrz0mxk2hk2rwwabgr0a4wa3j22qwm94xvrzci39l58hmzxpbi"; }) - (fetchNuGet { pname = "xunit.assert"; version = "2.6.2"; sha256 = "1nxg9m8qhh05i9linap7a8bdhxnr7x2pg7piw8hh76cshx0402ql"; }) - (fetchNuGet { pname = "xunit.core"; version = "2.6.2"; sha256 = "0q0kzjdb0hxq4bajl11pvnwl1dp47b2adqx47j30bi2llj21ihj6"; }) - (fetchNuGet { pname = "xunit.extensibility.core"; version = "2.6.2"; sha256 = "1a27ng02piwjr3ggff4mg0r92b6rabd1339clnxzqxwcyf620q2c"; }) - (fetchNuGet { pname = "xunit.extensibility.execution"; version = "2.6.2"; sha256 = "1lhhlrq6lzd4w61x78dhxjz1453lnipjgph8sc52izgwq9d5xp1n"; }) - (fetchNuGet { pname = "xunit.runner.visualstudio"; version = "2.5.4"; sha256 = "0mp3z8m5l4q09lr17142hff6p05zl189cwz3iavfqk8dpspyjgvd"; }) - (fetchNuGet { pname = "YamlDotNet"; version = "13.1.0"; sha256 = "1mqgg0m1mr8vmcz24miagmf1s2b4mmm5mbsf1p0d7cippficiiaz"; }) + (fetchNuGet { pname = "AsyncIO"; version = "0.1.69"; hash = "sha256-JQKq/U71NQTfPuUqj7z5bALe+d7G1o3GcI8kvVDxy6o="; }) + (fetchNuGet { pname = "Avalonia"; version = "11.0.4"; hash = "sha256-YEqAwBRAhvhN5eT8GqOA8XsSwEF4ccwTMBWxBlIHLUo="; }) + (fetchNuGet { pname = "Avalonia.Angle.Windows.Natives"; version = "2.1.0.2023020321"; hash = "sha256-TWop9cvak6cMv2vrA/GlpuYBxS8Fuj5UmupGIV7Q5Ks="; }) + (fetchNuGet { pname = "Avalonia.BuildServices"; version = "0.0.29"; hash = "sha256-WPHRMNowRnYSCh88DWNBCltWsLPyOfzXGzBqLYE7tRY="; }) + (fetchNuGet { pname = "Avalonia.Controls.ColorPicker"; version = "11.0.4"; hash = "sha256-Jp0j/58RF9Qooc7ATtq80FtX3TVLhi54JfgrbKdiDes="; }) + (fetchNuGet { pname = "Avalonia.Controls.DataGrid"; version = "11.0.4"; hash = "sha256-wlig5frBAO1DPH9GX0h8MZQq3U4F4K16EliC6N0NbII="; }) + (fetchNuGet { pname = "Avalonia.Desktop"; version = "11.0.4"; hash = "sha256-fg7IV0dp7YIYOjBB/P5ky0u59k2hn2bBtCk0IjqmMoA="; }) + (fetchNuGet { pname = "Avalonia.Diagnostics"; version = "11.0.4"; hash = "sha256-SkoODlaNJjTxrHaUUKJIY2QqJReYZ2L+Vvk7p7amvrc="; }) + (fetchNuGet { pname = "Avalonia.FreeDesktop"; version = "11.0.4"; hash = "sha256-2CjeOeLJxh3GO25wLchylzI1/uGJCHwjgKGcFZrRb+k="; }) + (fetchNuGet { pname = "Avalonia.Native"; version = "11.0.4"; hash = "sha256-wHSJqh5rlhuvumnVkixdNS275M8kTZpP9p0srIfJ3oE="; }) + (fetchNuGet { pname = "Avalonia.ReactiveUI"; version = "11.0.4"; hash = "sha256-aywLGA/hN5UgHLRfdkOnyuEzWEJtSKA9bLhUuDZOQsM="; }) + (fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "11.0.4"; hash = "sha256-13qXDjlWElmwQ0sb00+ny9gOgKuDOHKvALuQB6EZxCQ="; }) + (fetchNuGet { pname = "Avalonia.Skia"; version = "11.0.4"; hash = "sha256-1XfPTcAaNj1926uYkvo7P62++ds5M2gHvkv1hRzBVfs="; }) + (fetchNuGet { pname = "Avalonia.Themes.Fluent"; version = "11.0.4"; hash = "sha256-iuLlNuPjFvpITQY8DmLyGP+qfkOfiFs7q+SlamKP7Q8="; }) + (fetchNuGet { pname = "Avalonia.Themes.Simple"; version = "11.0.4"; hash = "sha256-PXuQB/3EKiOQ3id+KNQpvm+oGgWNGuheYTIr7CJazOY="; }) + (fetchNuGet { pname = "Avalonia.Win32"; version = "11.0.4"; hash = "sha256-ArhpMXygItqt1MZ8aW/2pV6Y0YoVzai73i+VD9edMh4="; }) + (fetchNuGet { pname = "Avalonia.X11"; version = "11.0.4"; hash = "sha256-zWdkQyTW096IlPzqWEiG2ArkbiY67xs1Zo1zNhruBnc="; }) + (fetchNuGet { pname = "BunLabs.NAudio.Flac"; version = "2.0.1"; hash = "sha256-ezjeQLTnmUGzzgMqto32Dl2uHIPrSPLKV7r5UIh2R98="; }) + (fetchNuGet { pname = "Concentus"; version = "1.1.7"; hash = "sha256-gAIsbANG/G38kG/TQRA5brlApapdC3+xrhSuzAkhv3g="; }) + (fetchNuGet { pname = "Concentus.Oggfile"; version = "1.0.4"; hash = "sha256-2ywfhtj+9o3mmWLuPLMOey54S2kGH2ofVi2kGB5bxYo="; }) + (fetchNuGet { pname = "coverlet.collector"; version = "6.0.2"; hash = "sha256-LdSQUrOmjFug47LjtqgtN2MM6BcfG0HR5iL+prVHlDo="; }) + (fetchNuGet { pname = "DotNet.Bundle"; version = "0.9.13"; hash = "sha256-VA7wFPC2V4JudQ+edk6lFkklDPIHZYVWql8/KMzcnys="; }) + (fetchNuGet { pname = "DynamicData"; version = "7.9.5"; hash = "sha256-3XjOMuFathku9oWyss360+Ze5UMP7tSmUbMoax7qONU="; }) + (fetchNuGet { pname = "Fody"; version = "6.6.3"; hash = "sha256-RtXZv0gPpWdZ0foabp6Td7KG7gLLS7Dhl/pjLCj5EAs="; }) + (fetchNuGet { pname = "HarfBuzzSharp"; version = "2.8.2.3"; hash = "sha256-4tbdgUabPjlkBm3aUFeocj4Fdslmms2olDFpzOLyqoQ="; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Linux"; version = "2.8.2.3"; hash = "sha256-3xwVfNfKTkuLdnT+e3bfG9tNTdEmar7ByzY+NTlUKLg="; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "2.8.2.3"; hash = "sha256-ZohUEaovj/sRB4rjuJIOq6S9eim3m+qMlpHIebNDTRQ="; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.WebAssembly"; version = "2.8.2.3"; hash = "sha256-ZsiBGpXfODHUHPgU/50k9QR/j6Klo7rsB0SUt8zYcBA="; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "2.8.2.3"; hash = "sha256-5GSzM5IUoOwK+zJg0d74WlT3n1VZly8pKlyjiqVocCI="; }) + (fetchNuGet { pname = "Ignore"; version = "0.1.50"; hash = "sha256-Wmjn2ZbfDrIvmLkvIUOZtaBqx9BPXvIyF5eesnlK7mk="; }) + (fetchNuGet { pname = "K4os.Hash.xxHash"; version = "1.0.8"; hash = "sha256-ILTWT8NFB7itGpDloJh65B5ZuWHrN2dOUQdm8gNy4W8="; }) + (fetchNuGet { pname = "Melanchall.DryWetMidi"; version = "7.0.2"; hash = "sha256-89uIWKqBRvuC0GOx1CnpVYmZl7BLyIlor5TvArna1gg="; }) + (fetchNuGet { pname = "MicroCom.Runtime"; version = "0.11.0"; hash = "sha256-VdwpP5fsclvNqJuppaOvwEwv2ofnAI5ZSz2V+UEdLF0="; }) + (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "5.0.0"; hash = "sha256-bpJjcJSUSZH0GeOXoZI12xUQOf2SRtxG7sZV0dWS5TI="; }) + (fetchNuGet { pname = "Microsoft.Bcl.HashCode"; version = "1.1.1"; hash = "sha256-gP6ZhEsjjbmw6a477sm7UuOvGFFTxZYfRE2kKxK8jnc="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.0.0"; hash = "sha256-KDbCfsBWSJ5ohEXUKp1s1LX9xA2NPvXE/xVzj68EdC0="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "3.8.0"; hash = "sha256-3G9vSc/gHH7FWgOySLTut1+eEaf3H66qcPOvNPLOx4o="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "3.8.0"; hash = "sha256-i/r3V/No/VzqmJlWxpGoirvlbJDbBPa/ONZtzYrxuc4="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Scripting"; version = "3.8.0"; hash = "sha256-fA9Qu+vTyMZ9REzxJ4aMg/SHCDRk4q9k4ZGUdynoHnA="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Scripting.Common"; version = "3.8.0"; hash = "sha256-866jMHp8kbc1FYpKuUWnd7ViU6kGJTAxPcL/IjXrT0I="; }) + (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.9.0"; hash = "sha256-OaGa4+jRPHs+T+p/oekm2Miluqfd2IX8Rt+BmUx8kr4="; }) + (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.3.0"; hash = "sha256-a3dAiPaVuky0wpcHmpTVtAQJNGZ2v91/oArA+dpJgj8="; }) + (fetchNuGet { pname = "Microsoft.Extensions.ObjectPool"; version = "5.0.10"; hash = "sha256-tAjiU3w0hdPAGUitszxZ6jtEilRn977MY7N5eZMx0x0="; }) + (fetchNuGet { pname = "Microsoft.ML.OnnxRuntime"; version = "1.15.0"; hash = "sha256-vGvv8ZhtRzd2Nclpg4SC/AmG2PVHED4L9b0/B+x1SvI="; }) + (fetchNuGet { pname = "Microsoft.ML.OnnxRuntime.Managed"; version = "1.15.0"; hash = "sha256-KEPxS+STSiDn/gSdB4dtmKNQmJARY5J/+esFpEDXFho="; }) + (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.9.0"; hash = "sha256-q/1AJ7eNlk02wvN76qvjl2xBx5iJ+h5ssiE/4akLmtI="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; hash = "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.1.2"; hash = "sha256-gYQQO7zsqG+OtN4ywYQyfsiggS2zmxw4+cPXlK+FB5Q="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; hash = "sha256-LIcg1StDcQLPOABp4JRXIs837d7z0ia6+++3SF3jl1c="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; hash = "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ="; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.9.0"; hash = "sha256-iiXUFzpvT8OWdzMj9FGJDqanwHx40s1TXVY9l3ii+s0="; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.9.0"; hash = "sha256-1BZIY1z+C9TROgdTV/tq4zsPy7Q71GQksr/LoMKAzqU="; }) + (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; hash = "sha256-mBNDmPXNTW54XLnPAUwBRvkIORFM7/j0D0I2SyQPDEg="; }) + (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "5.0.0"; hash = "sha256-mGUKg+bmB5sE/DCwsTwCsbe00MCwpgxsVW3nCtQiSmo="; }) + (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "6.0.0"; hash = "sha256-N9EVZbl5w1VnMywGXyaVWzT9lh84iaJ3aD48hIBk1zA="; }) + (fetchNuGet { pname = "NaCl.Net"; version = "0.1.13"; hash = "sha256-Zy9ckPxrBcKy31g2pKc5uxF22jayw3ZmbrvDBW3MIlk="; }) + (fetchNuGet { pname = "NAudio.Core"; version = "2.2.1"; hash = "sha256-eUZF2/0w5IgGY9UtnZIk1VwwH6VCKP9iPJXVcseIc0c="; }) + (fetchNuGet { pname = "NAudio.Vorbis"; version = "1.5.0"; hash = "sha256-FX5EHVRLcWfjY+/NhkUf33fMFrTcPG3Ztm5ptmu1caw="; }) + (fetchNuGet { pname = "NetMQ"; version = "4.0.1.13"; hash = "sha256-ICm61C9HlUQZe5KcIuzFO+hGmzULtouPIiUtfp+9x80="; }) + (fetchNuGet { pname = "NetSparkleUpdater.SparkleUpdater"; version = "2.2.3"; hash = "sha256-zIrzcnjmxo1gk8ERMisg79q+FiDk2lhcD+cLZ05wdY8="; }) + (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; hash = "sha256-iNan1ix7RtncGWC9AjAZ2sk70DoxOsmEOgQ10fXm4Pw="; }) + (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.3"; hash = "sha256-hy/BieY4qxBWVVsDqqOPaLy1QobiIapkbrESm6v2PHc="; }) + (fetchNuGet { pname = "NLayer"; version = "1.15.0"; hash = "sha256-B6TM5ZBDPwV09Ck6KGgq2+7YFBW43te5XN72bSEP70I="; }) + (fetchNuGet { pname = "NLayer.NAudioSupport"; version = "1.4.0"; hash = "sha256-7wurHkfzH7mgTMkcAlwyxTz3x3gkPbdCyHSCXo5J+Pc="; }) + (fetchNuGet { pname = "NumSharp"; version = "0.30.0"; hash = "sha256-7Tz5ian7kVpo8uT1r/LvXbQFPcN8Dt1nt8U+hBGJImQ="; }) + (fetchNuGet { pname = "NVorbis"; version = "0.10.4"; hash = "sha256-6ZouAJWaNge6DFnLHDr35uf4vs6Kf12RPp4ahuEejlA="; }) + (fetchNuGet { pname = "NWaves"; version = "0.9.6"; hash = "sha256-Df4RbQGuR8aIwv3XYZ5Hgd/kJieFazvHR8OpCAezvZo="; }) + (fetchNuGet { pname = "PolySharp"; version = "1.10.0"; hash = "sha256-30IBYsy7zYtEHDZGw6K9asFq2dXbW+CrBMpMCEdkERs="; }) + (fetchNuGet { pname = "Portable.BouncyCastle"; version = "1.9.0"; hash = "sha256-GOXM4TdTTodWlGzEfbMForTfTQI/ObJGnFZMSD6X8E4="; }) + (fetchNuGet { pname = "ReactiveUI"; version = "18.3.1"; hash = "sha256-1rf4icGRKTR3XIWJpkQJCG7ObRM+72ITB5K+ND1is9M="; }) + (fetchNuGet { pname = "ReactiveUI.Fody"; version = "18.3.1"; hash = "sha256-/wcvCVCuhqBFzy6YR0MkztmHFx0h8oA2/koIpGkyuZs="; }) + (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; hash = "sha256-4PGZqyWhZ6/HCTF2KddDsbmTTjxs2oW79YfkberDZS8="; }) + (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tools"; version = "4.3.0"; hash = "sha256-8yLKFt2wQxkEf7fNfzB+cPUCjYn2qbqNgQ1+EeY2h/I="; }) + (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tracing"; version = "4.3.0"; hash = "sha256-dsmTLGvt8HqRkDWP8iKVXJCS+akAzENGXKPV18W2RgI="; }) + (fetchNuGet { pname = "runtime.any.System.Globalization"; version = "4.3.0"; hash = "sha256-PaiITTFI2FfPylTEk7DwzfKeiA/g/aooSU1pDcdwWLU="; }) + (fetchNuGet { pname = "runtime.any.System.Globalization.Calendars"; version = "4.3.0"; hash = "sha256-AYh39tgXJVFu8aLi9Y/4rK8yWMaza4S4eaxjfcuEEL4="; }) + (fetchNuGet { pname = "runtime.any.System.IO"; version = "4.3.0"; hash = "sha256-vej7ySRhyvM3pYh/ITMdC25ivSd0WLZAaIQbYj/6HVE="; }) + (fetchNuGet { pname = "runtime.any.System.Reflection"; version = "4.3.0"; hash = "sha256-ns6f++lSA+bi1xXgmW1JkWFb2NaMD+w+YNTfMvyAiQk="; }) + (fetchNuGet { pname = "runtime.any.System.Reflection.Extensions"; version = "4.3.0"; hash = "sha256-Y2AnhOcJwJVYv7Rp6Jz6ma0fpITFqJW+8rsw106K2X8="; }) + (fetchNuGet { pname = "runtime.any.System.Reflection.Primitives"; version = "4.3.0"; hash = "sha256-LkPXtiDQM3BcdYkAm5uSNOiz3uF4J45qpxn5aBiqNXQ="; }) + (fetchNuGet { pname = "runtime.any.System.Resources.ResourceManager"; version = "4.3.0"; hash = "sha256-9EvnmZslLgLLhJ00o5MWaPuJQlbUFcUF8itGQNVkcQ4="; }) + (fetchNuGet { pname = "runtime.any.System.Runtime"; version = "4.3.0"; hash = "sha256-qwhNXBaJ1DtDkuRacgHwnZmOZ1u9q7N8j0cWOLYOELM="; }) + (fetchNuGet { pname = "runtime.any.System.Runtime.Handles"; version = "4.3.0"; hash = "sha256-PQRACwnSUuxgVySO1840KvqCC9F8iI9iTzxNW0RcBS4="; }) + (fetchNuGet { pname = "runtime.any.System.Runtime.InteropServices"; version = "4.3.0"; hash = "sha256-Kaw5PnLYIiqWbsoF3VKJhy7pkpoGsUwn4ZDCKscbbzA="; }) + (fetchNuGet { pname = "runtime.any.System.Text.Encoding"; version = "4.3.0"; hash = "sha256-Q18B9q26MkWZx68exUfQT30+0PGmpFlDgaF0TnaIGCs="; }) + (fetchNuGet { pname = "runtime.any.System.Text.Encoding.Extensions"; version = "4.3.0"; hash = "sha256-6MYj0RmLh4EVqMtO/MRqBi0HOn5iG4x9JimgCCJ+EFM="; }) + (fetchNuGet { pname = "runtime.any.System.Threading.Tasks"; version = "4.3.0"; hash = "sha256-agdOM0NXupfHbKAQzQT8XgbI9B8hVEh+a/2vqeHctg4="; }) + (fetchNuGet { pname = "runtime.any.System.Threading.Timer"; version = "4.3.0"; hash = "sha256-BgHxXCIbicVZtpgMimSXixhFC3V+p5ODqeljDjO8hCs="; }) + (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-LXUPLX3DJxsU1Pd3UwjO1PO9NM2elNEDXeu2Mu/vNps="; }) + (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-qeSqaUI80+lqw5MK4vMpmO0CZaqrmYktwp6L+vQAb0I="; }) + (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-SrHqT9wrCBsxILWtaJgGKd6Odmxm8/Mh7Kh0CUkZVzA="; }) + (fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; hash = "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y="; }) + (fetchNuGet { pname = "runtime.native.System.IO.Compression"; version = "4.3.0"; hash = "sha256-DWnXs4vlKoU6WxxvCArTJupV6sX3iBbZh8SbqfHace8="; }) + (fetchNuGet { pname = "runtime.native.System.Net.Http"; version = "4.3.0"; hash = "sha256-c556PyheRwpYhweBjSfIwEyZHnAUB8jWioyKEcp/2dg="; }) + (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; hash = "sha256-2IhBv0i6pTcOyr8FFIyfPEaaCHUmJZ8DYwLUwJ+5waw="; }) + (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-Jy01KhtcCl2wjMpZWH+X3fhHcVn+SyllWFY8zWlz/6I="; }) + (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-wyv00gdlqf8ckxEdV7E+Ql9hJIoPcmYEuyeWb5Oz3mM="; }) + (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-zi+b4sCFrA9QBiSGDD7xPV27r3iHGlV99gpyVUjRmc4="; }) + (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; hash = "sha256-serkd4A7F6eciPiPJtUyJyxzdAtupEcWIZQ9nptEzIM="; }) + (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-gybQU6mPgaWV3rBG2dbH6tT3tBq8mgze3PROdsuWnX0="; }) + (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-VsP72GVveWnGUvS/vjOQLv1U80H2K8nZ4fDAmI61Hm4="; }) + (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-4yKGa/IrNCKuQ3zaDzILdNPD32bNdy6xr5gdJigyF5g="; }) + (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-HmdJhhRsiVoOOCcUvAwdjpMRiyuSwdcgEv2j9hxi+Zc="; }) + (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-pVFUKuPPIx0edQKjzRon3zKq8zhzHEzko/lc01V/jdw="; }) + (fetchNuGet { pname = "runtime.unix.Microsoft.Win32.Primitives"; version = "4.3.0"; hash = "sha256-LZb23lRXzr26tRS5aA0xyB08JxiblPDoA7HBvn6awXg="; }) + (fetchNuGet { pname = "runtime.unix.System.Console"; version = "4.3.0"; hash = "sha256-AHkdKShTRHttqfMjmi+lPpTuCrM5vd/WRy6Kbtie190="; }) + (fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; hash = "sha256-ReoazscfbGH+R6s6jkg5sIEHWNEvjEoHtIsMbpc7+tI="; }) + (fetchNuGet { pname = "runtime.unix.System.IO.FileSystem"; version = "4.3.0"; hash = "sha256-Pf4mRl6YDK2x2KMh0WdyNgv0VUNdSKVDLlHqozecy5I="; }) + (fetchNuGet { pname = "runtime.unix.System.Net.Primitives"; version = "4.3.0"; hash = "sha256-pHJ+I6i16MV6m77uhTC6GPY6jWGReE3SSP3fVB59ti0="; }) + (fetchNuGet { pname = "runtime.unix.System.Net.Sockets"; version = "4.3.0"; hash = "sha256-IvgOeA2JuBjKl5yAVGjPYMPDzs9phb3KANs95H9v1w4="; }) + (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; hash = "sha256-c5tXWhE/fYbJVl9rXs0uHh3pTsg44YD1dJvyOA0WoMs="; }) + (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; hash = "sha256-l8S9gt6dk3qYG6HYonHtdlYtBKyPb29uQ6NDjmrt3V4="; }) + (fetchNuGet { pname = "Serilog"; version = "3.1.1"; hash = "sha256-L263y8jkn7dNFD2jAUK6mgvyRTqFe39i1tRhVZsNZTI="; }) + (fetchNuGet { pname = "Serilog.Sinks.Console"; version = "5.0.1"; hash = "sha256-aveoZM25ykc2haBHCXWD09jxZ2t2tYIGmaNTaO2V0jI="; }) + (fetchNuGet { pname = "Serilog.Sinks.Debug"; version = "2.0.0"; hash = "sha256-/PLVAE33lTdUEXdahkI5ddFiGZufWnvfsOodQsFB8sQ="; }) + (fetchNuGet { pname = "Serilog.Sinks.File"; version = "5.0.0"; hash = "sha256-GKy9hwOdlu2W0Rw8LiPyEwus+sDtSOTl8a5l9uqz+SQ="; }) + (fetchNuGet { pname = "SharpCompress"; version = "0.36.0"; hash = "sha256-8FIcC5b7A5gNqIwxBlolBuxilmSHCDpObpQ+MuGdkZg="; }) + (fetchNuGet { pname = "SharpGen.Runtime"; version = "2.0.0-beta.13"; hash = "sha256-CB4681QJaYoL3MCFn4SwgCWxtFf7T/oZQQ6+pLT5oIg="; }) + (fetchNuGet { pname = "SharpGen.Runtime.COM"; version = "2.0.0-beta.13"; hash = "sha256-xoQQrf8RIeNwx4aZjXDECd2ROZCj3SFk8q+eJ64cu9I="; }) + (fetchNuGet { pname = "SkiaSharp"; version = "2.88.3"; hash = "sha256-WyMAjnQt8ZsuWpGLI89l/f4bHvv+cg7FdTAL7CtJBvs="; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.88.3"; hash = "sha256-eExWAAURgnwwm2fRwsK/rf+TeOAPs2n02XZzC0zeUjU="; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.3"; hash = "sha256-8G4swiLMr6XS3kjfO/YC1PyoVdfSq7nxZthZZ+KTKqQ="; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.WebAssembly"; version = "2.88.3"; hash = "sha256-/SkV2pIZnt0ziSKB7gt7U2Rltk2Id+zOzbmqgfWUtvA="; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.3"; hash = "sha256-2PhMTwRHitT13KCKiZltKIFieAvNY4jBmVZ2ndVynA8="; }) + (fetchNuGet { pname = "Splat"; version = "14.4.1"; hash = "sha256-i1yzIVpKdFjZMI4J8H970nZCxszklgDitYTEKKz0zA8="; }) + (fetchNuGet { pname = "System.AppContext"; version = "4.3.0"; hash = "sha256-yg95LNQOwFlA1tWxXdQkVyJqT4AnoDc+ACmrNvzGiZg="; }) + (fetchNuGet { pname = "System.Buffers"; version = "4.5.1"; hash = "sha256-wws90sfi9M7kuCPWkv1CEYMJtCqx9QB/kj0ymlsNaxI="; }) + (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; hash = "sha256-afY7VUtD6w/5mYqrce8kQrvDIfS2GXDINDh73IjxJKc="; }) + (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.3.0"; hash = "sha256-KMY5DfJnDeIsa13DpqvyN8NkReZEMAFnlmNglVoFIXI="; }) + (fetchNuGet { pname = "System.Collections.Immutable"; version = "5.0.0"; hash = "sha256-GdwSIjLMM0uVfE56VUSLVNgpW0B//oCeSFj8/hSlbM8="; }) + (fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "4.5.0"; hash = "sha256-15yE2NoT9vmL9oGCaxHClQR1jLW1j1ef5hHMg55xRso="; }) + (fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "5.0.0"; hash = "sha256-0pST1UHgpeE6xJrYf5R+U7AwIlH3rVC3SpguilI/MAg="; }) + (fetchNuGet { pname = "System.Console"; version = "4.3.0"; hash = "sha256-Xh3PPBZr0pDbDaK8AEHbdGz7ePK6Yi1ZyRWI1JM6mbo="; }) + (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; hash = "sha256-fkA79SjPbSeiEcrbbUsb70u9B7wqbsdM9s1LnoKj0gM="; }) + (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.3.0"; hash = "sha256-OFJRb0ygep0Z3yDBLwAgM/Tkfs4JCDtsNhwDH9cd1Xw="; }) + (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "7.0.2"; hash = "sha256-8Uawe7mWOQsDzMSAAP16nuGD1FRSajyS8q+cA++MJ8E="; }) + (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.3.0"; hash = "sha256-gVOv1SK6Ape0FQhCVlNOd9cvQKBvMxRX9K0JPVi8w0Y="; }) + (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; hash = "sha256-hCETZpHHGVhPYvb4C0fh4zs+8zv4GPoixagkLZjpa9Q="; }) + (fetchNuGet { pname = "System.Drawing.Common"; version = "5.0.0"; hash = "sha256-8PgFBZ3Agd+UI9IMxr4fRIW8IA1hqCl15nqlLTJETzk="; }) + (fetchNuGet { pname = "System.Drawing.Common"; version = "6.0.0"; hash = "sha256-/9EaAbEeOjELRSMZaImS1O8FmUe8j4WuFUw1VOrPyAo="; }) + (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.3.0"; hash = "sha256-k75gjOYimIQtLBD5NDzwwi3ZMUBPRW3jmc3evDMMJbU="; }) + (fetchNuGet { pname = "System.Formats.Asn1"; version = "5.0.0"; hash = "sha256-9nL3dN4w/dZ49W1pCkTjRqZm6Dh0mMVExNungcBHrKs="; }) + (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; hash = "sha256-caL0pRmFSEsaoeZeWN5BTQtGrAtaQPwFi8YOZPZG5rI="; }) + (fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.3.0"; hash = "sha256-uNOD0EOVFgnS2fMKvMiEtI9aOw00+Pfy/H+qucAQlPc="; }) + (fetchNuGet { pname = "System.Globalization.Extensions"; version = "4.3.0"; hash = "sha256-mmJWA27T0GRVuFP9/sj+4TrR4GJWrzNIk2PDrbr7RQk="; }) + (fetchNuGet { pname = "System.IO"; version = "4.3.0"; hash = "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY="; }) + (fetchNuGet { pname = "System.IO.Compression"; version = "4.3.0"; hash = "sha256-f5PrQlQgj5Xj2ZnHxXW8XiOivaBvfqDao9Sb6AVinyA="; }) + (fetchNuGet { pname = "System.IO.Compression.ZipFile"; version = "4.3.0"; hash = "sha256-WQl+JgWs+GaRMeiahTFUbrhlXIHapzcpTFXbRvAtvvs="; }) + (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.3.0"; hash = "sha256-vNIYnvlayuVj0WfRfYKpDrhDptlhp1pN8CYmlVd2TXw="; }) + (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; hash = "sha256-LMnfg8Vwavs9cMnq9nNH8IWtAtSfk0/Fy4s4Rt9r1kg="; }) + (fetchNuGet { pname = "System.IO.Packaging"; version = "7.0.0"; hash = "sha256-I8SG/IH1QjtAAWb5bSBIcFabATNRuwr1CSKyspSQz5k="; }) + (fetchNuGet { pname = "System.IO.Pipelines"; version = "6.0.0"; hash = "sha256-xfjF4UqTMJpf8KsBWUyJlJkzPTOO/H5MW023yTYNQSA="; }) + (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; hash = "sha256-R5uiSL3l6a3XrXSSL6jz+q/PcyVQzEAByiuXZNSqD/A="; }) + (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; hash = "sha256-+3pvhZY7rip8HCbfdULzjlC9FPZFpYoQxhkcuFm2wk8="; }) + (fetchNuGet { pname = "System.Memory"; version = "4.5.3"; hash = "sha256-Cvl7RbRbRu9qKzeRBWjavUkseT2jhZBUWV1SPipUWFk="; }) + (fetchNuGet { pname = "System.Memory"; version = "4.5.4"; hash = "sha256-3sCEfzO4gj5CYGctl9ZXQRRhwAraMQfse7yzKoRe65E="; }) + (fetchNuGet { pname = "System.Memory"; version = "4.5.5"; hash = "sha256-EPQ9o1Kin7KzGI5O3U3PUQAZTItSbk9h/i4rViN3WiI="; }) + (fetchNuGet { pname = "System.Net.Http"; version = "4.3.0"; hash = "sha256-UoBB7WPDp2Bne/fwxKF0nE8grJ6FzTMXdT/jfsphj8Q="; }) + (fetchNuGet { pname = "System.Net.NameResolution"; version = "4.3.0"; hash = "sha256-eGZwCBExWsnirWBHyp2sSSSXp6g7I6v53qNmwPgtJ5c="; }) + (fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; hash = "sha256-MY7Z6vOtFMbEKaLW9nOSZeAjcWpwCtdO7/W1mkGZBzE="; }) + (fetchNuGet { pname = "System.Net.Sockets"; version = "4.3.0"; hash = "sha256-il7dr5VT/QWDg/0cuh+4Es2u8LY//+qqiY9BZmYxSus="; }) + (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.4.0"; hash = "sha256-auXQK2flL/JpnB/rEcAcUm4vYMCYMEMiWOCAlIaqu2U="; }) + (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.5.0"; hash = "sha256-qdSTIFgf2htPS+YhLGjAGiLN8igCYJnCCo6r78+Q+c8="; }) + (fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; hash = "sha256-gtmRkWP2Kwr3nHtDh0yYtce38z1wrGzb6fjm4v8wN6Q="; }) + (fetchNuGet { pname = "System.Private.ServiceModel"; version = "4.9.0"; hash = "sha256-AbJKAZzZDxKVXm5761XE+nhlkiDqX9eb6+Y9d4Hq+4Q="; }) + (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; hash = "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM="; }) + (fetchNuGet { pname = "System.Reactive"; version = "5.0.0"; hash = "sha256-M5Z8pw8rVb8ilbnTdaOptzk5VFd5DlKa7zzCpuytTtE="; }) + (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; hash = "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY="; }) + (fetchNuGet { pname = "System.Reflection.DispatchProxy"; version = "4.7.1"; hash = "sha256-Oi+l32p73ZxwcB6GrSS2m25BccfpuwbY4eyFEwUe0IM="; }) + (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.3.0"; hash = "sha256-5LhkDmhy2FkSxulXR+bsTtMzdU3VyyuZzsxp7/DwyIU="; }) + (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; hash = "sha256-mKRknEHNls4gkRwrEgi39B+vSaAz/Gt3IALtS98xNnA="; }) + (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.3.0"; hash = "sha256-rKx4a9yZKcajloSZHr4CKTVJ6Vjh95ni+zszPxWjh2I="; }) + (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; hash = "sha256-mMOCYzUenjd4rWIfq7zIX9PFYk/daUyF0A8l1hbydAk="; }) + (fetchNuGet { pname = "System.Reflection.Metadata"; version = "1.6.0"; hash = "sha256-JJfgaPav7UfEh4yRAQdGhLZF1brr0tUWPl6qmfNWq/E="; }) + (fetchNuGet { pname = "System.Reflection.Metadata"; version = "5.0.0"; hash = "sha256-Wo+MiqhcP9dQ6NuFGrQTw6hpbJORFwp+TBNTq2yhGp8="; }) + (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; hash = "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM="; }) + (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.3.0"; hash = "sha256-4U4/XNQAnddgQIHIJq3P2T80hN0oPdU2uCeghsDTWng="; }) + (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; hash = "sha256-idiOD93xbbrbwwSnD4mORA9RYi/D/U48eRUsn/WnWGo="; }) + (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; hash = "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg="; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.2"; hash = "sha256-8eUXXGWO2LL7uATMZye2iCpQOETn2jCcjUhG6coR5O8="; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.3"; hash = "sha256-lnZMUqRO4RYRUeSO8HSJ9yBHqFHLVbmenwHWkIU20ak="; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.7.0"; hash = "sha256-pORThFo85P8TrmfZCCPIXysVPcV2nW8hRlO6z4jVJps="; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.7.1"; hash = "sha256-UvyoDV8O0oY3HPG1GbA56YVdvwTGEfjYR5gW1O7IK4U="; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; hash = "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I="; }) + (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; hash = "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o="; }) + (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; hash = "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms="; }) + (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; hash = "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI="; }) + (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.3.0"; hash = "sha256-MYpl6/ZyC6hjmzWRIe+iDoldOMW1mfbwXsduAnXIKGA="; }) + (fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.3.0"; hash = "sha256-P5jHCgMbgFMYiONvzmaKFeOqcAIDPu/U8bOVrNPYKqc="; }) + (fetchNuGet { pname = "System.Security.AccessControl"; version = "5.0.0"; hash = "sha256-ueSG+Yn82evxyGBnE49N4D+ngODDXgornlBtQ3Omw54="; }) + (fetchNuGet { pname = "System.Security.Claims"; version = "4.3.0"; hash = "sha256-Fua/rDwAqq4UByRVomAxMPmDBGd5eImRqHVQIeSxbks="; }) + (fetchNuGet { pname = "System.Security.Cryptography.Algorithms"; version = "4.3.0"; hash = "sha256-tAJvNSlczYBJ3Ed24Ae27a55tq/n4D3fubNQdwcKWA8="; }) + (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.3.0"; hash = "sha256-u17vy6wNhqok91SrVLno2M1EzLHZm6VMca85xbVChsw="; }) + (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "5.0.0"; hash = "sha256-nOJP3vdmQaYA07TI373OvZX6uWshETipvi5KpL7oExo="; }) + (fetchNuGet { pname = "System.Security.Cryptography.Csp"; version = "4.3.0"; hash = "sha256-oefdTU/Z2PWU9nlat8uiRDGq/PGZoSPRgkML11pmvPQ="; }) + (fetchNuGet { pname = "System.Security.Cryptography.Encoding"; version = "4.3.0"; hash = "sha256-Yuge89N6M+NcblcvXMeyHZ6kZDfwBv3LPMDiF8HhJss="; }) + (fetchNuGet { pname = "System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-DL+D2sc2JrQiB4oAcUggTFyD8w3aLEjJfod5JPe+Oz4="; }) + (fetchNuGet { pname = "System.Security.Cryptography.Pkcs"; version = "5.0.0"; hash = "sha256-kq/tvYQSa24mKSvikFK2fKUAnexSL4PO4LkPppqtYkE="; }) + (fetchNuGet { pname = "System.Security.Cryptography.Primitives"; version = "4.3.0"; hash = "sha256-fnFi7B3SnVj5a+BbgXnbjnGNvWrCEU6Hp/wjsjWz318="; }) + (fetchNuGet { pname = "System.Security.Cryptography.X509Certificates"; version = "4.3.0"; hash = "sha256-MG3V/owDh273GCUPsGGraNwaVpcydupl3EtPXj6TVG0="; }) + (fetchNuGet { pname = "System.Security.Cryptography.Xml"; version = "5.0.0"; hash = "sha256-0LyU7KmpFRFZFCugAgDnp93Unw3rL4hFSqx6GNqov9o="; }) + (fetchNuGet { pname = "System.Security.Permissions"; version = "5.0.0"; hash = "sha256-BI1Js3L4R32UkKOLMTAVpXzGlQ27m+oaYHSV3J+iQfc="; }) + (fetchNuGet { pname = "System.Security.Principal"; version = "4.3.0"; hash = "sha256-rjudVUHdo8pNJg2EVEn0XxxwNo5h2EaYo+QboPkXlYk="; }) + (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.3.0"; hash = "sha256-mbdLVUcEwe78p3ZnB6jYsizNEqxMaCAWI3tEQNhRQAE="; }) + (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "5.0.0"; hash = "sha256-CBOQwl9veFkrKK2oU8JFFEiKIh/p+aJO+q9Tc2Q/89Y="; }) + (fetchNuGet { pname = "System.ServiceModel.Primitives"; version = "4.9.0"; hash = "sha256-DguxLLRrYNn99rYxCGIljZTdZqrVC+VxJNahkFUy9NM="; }) + (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; hash = "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg="; }) + (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "4.5.1"; hash = "sha256-PIhkv59IXjyiuefdhKxS9hQfEwO9YWRuNudpo53HQfw="; }) + (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "4.7.0"; hash = "sha256-/wLj3mcmScFAD/9cxmKyQnfdbaF9Mr/lpCuEsMarygM="; }) + (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "7.0.0"; hash = "sha256-eCKTVwumD051ZEcoJcDVRGnIGAsEvKpfH3ydKluHxmo="; }) + (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "8.0.0"; hash = "sha256-fjCLQc1PRW0Ix5IZldg0XKv+J1DqPSfu9pjMyNBp7dE="; }) + (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; hash = "sha256-vufHXg8QAKxHlujPHHcrtGwAqFmsCD6HKjfDAiHyAYc="; }) + (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "8.0.0"; hash = "sha256-IUQkQkV9po1LC0QsqrilqwNzPvnc+4eVvq+hCvq8fvE="; }) + (fetchNuGet { pname = "System.Text.Json"; version = "8.0.4"; hash = "sha256-g5oT7fbXxQ9Iah1nMCr4UUX/a2l+EVjJyTrw3FTbIaI="; }) + (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; hash = "sha256-VLCk1D1kcN2wbAe3d0YQM/PqCsPHOuqlBY1yd2Yo+K0="; }) + (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; hash = "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc="; }) + (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; hash = "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w="; }) + (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.3.0"; hash = "sha256-X2hQ5j+fxcmnm88Le/kSavjiGOmkcumBGTZKBLvorPc="; }) + (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; hash = "sha256-owSpY8wHlsUXn5xrfYAiu847L6fAKethlvYx97Ri1ng="; }) + (fetchNuGet { pname = "System.Threading.ThreadPool"; version = "4.3.0"; hash = "sha256-wW0QdvssRoaOfQLazTGSnwYTurE4R8FxDx70pYkL+gg="; }) + (fetchNuGet { pname = "System.Threading.Timer"; version = "4.3.0"; hash = "sha256-pmhslmhQhP32TWbBzoITLZ4BoORBqYk25OWbru04p9s="; }) + (fetchNuGet { pname = "System.ValueTuple"; version = "4.5.0"; hash = "sha256-niH6l2fU52vAzuBlwdQMw0OEoRS/7E1w5smBFoqSaAI="; }) + (fetchNuGet { pname = "System.Windows.Extensions"; version = "5.0.0"; hash = "sha256-fzWnaRBCDuoq3hQsGIi0PvCEJN7yGaaJvlU6pq4052A="; }) + (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.3.0"; hash = "sha256-QQ8KgU0lu4F5Unh+TbechO//zaAGZ4MfgvW72Cn1hzA="; }) + (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.3.0"; hash = "sha256-rWtdcmcuElNOSzCehflyKwHkDRpiOhJJs8CeQ0l1CCI="; }) + (fetchNuGet { pname = "Tmds.DBus.Protocol"; version = "0.15.0"; hash = "sha256-4gk2vXDjKFaBh82gTkwg3c/5GRjiH+bvM5elfDSbKTU="; }) + (fetchNuGet { pname = "UTF.Unknown"; version = "2.5.1"; hash = "sha256-9D6TqKSPsjzSly0mtUGZJbrNAJ7ftz9LJjWNwnnQMz4="; }) + (fetchNuGet { pname = "Vortice.DirectX"; version = "2.4.2"; hash = "sha256-LOIxdET0ynaJz70fakVwDYU0qm+1P0SfD1+I9P320oc="; }) + (fetchNuGet { pname = "Vortice.DXGI"; version = "2.4.2"; hash = "sha256-/5r4f9iM/wxZLsauQDbq6DoTTdvuuhbcmNgaxVK1ep8="; }) + (fetchNuGet { pname = "Vortice.Mathematics"; version = "1.4.25"; hash = "sha256-Mr/HVvwIeeDJtMNToP6kh2hyqud2zT31913HdhB4hm4="; }) + (fetchNuGet { pname = "WanaKana-net"; version = "1.0.0"; hash = "sha256-P50vW+/Ld02tjkx/7qHtJDmdLOkTxEsVjPlDBC+d+KQ="; }) + (fetchNuGet { pname = "xunit"; version = "2.7.1"; hash = "sha256-cf9vLYPIOvBGiUoUept+1NJfuhpSSdCFQSr6+XFde6E="; }) + (fetchNuGet { pname = "xunit.abstractions"; version = "2.0.3"; hash = "sha256-0D1y/C34iARI96gb3bAOG8tcGPMjx+fMabTPpydGlAM="; }) + (fetchNuGet { pname = "xunit.analyzers"; version = "1.12.0"; hash = "sha256-ZqbNShkNckXsZTght1ZlzkJyfd/e8oPtjSMDsJwqGuo="; }) + (fetchNuGet { pname = "xunit.assert"; version = "2.7.1"; hash = "sha256-RisnpE0ov99xyrxFywIctzzVnxwXb/HEp9E0dOAq4Ns="; }) + (fetchNuGet { pname = "xunit.core"; version = "2.7.1"; hash = "sha256-3+w1MZ/USIUqQbnyQT4ocgYfghpSoxawZN3E5EhtJ9M="; }) + (fetchNuGet { pname = "xunit.extensibility.core"; version = "2.7.1"; hash = "sha256-6AUG4c+cKswwoR2RMz+rrBjhdkIlGiRNxfLPkqKY8gI="; }) + (fetchNuGet { pname = "xunit.extensibility.execution"; version = "2.7.1"; hash = "sha256-3LEbfaJ2Uu/PWQW4NGONPr5SxZwy3Sj5yCWO6gy7IOk="; }) + (fetchNuGet { pname = "xunit.runner.visualstudio"; version = "2.5.8"; hash = "sha256-71EXxeR3yiZTAWCVnjIx9o4Lme6MVY04KXch9qZETQU="; }) + (fetchNuGet { pname = "YamlDotNet"; version = "15.1.2"; hash = "sha256-yrvQG/QMIEMOMCv4mtrzWJ5zdFSYEsSRHlkqzSShzts="; }) + (fetchNuGet { pname = "ZstdSharp.Port"; version = "0.7.4"; hash = "sha256-z39r5ekafRbZAsKbOtAlL7ymW5SLosb0NUlStqvPBwE="; }) ] diff --git a/pkgs/applications/audio/opus-tools/default.nix b/pkgs/applications/audio/opus-tools/default.nix index 6c602ef1d03ed..53233995ac100 100644 --- a/pkgs/applications/audio/opus-tools/default.nix +++ b/pkgs/applications/audio/opus-tools/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { description = "Tools to work with opus encoded audio streams"; homepage = "https://www.opus-codec.org/"; license = lib.licenses.bsd2; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; platforms = with lib.platforms; unix; }; } diff --git a/pkgs/applications/audio/opustags/default.nix b/pkgs/applications/audio/opustags/default.nix index 9bafacc2e30ec..9f306a3de1b46 100644 --- a/pkgs/applications/audio/opustags/default.nix +++ b/pkgs/applications/audio/opustags/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ] - ++ lib.optionals stdenv.isDarwin [ libiconv ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; buildInputs = [ libogg ]; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/fmang/opustags"; description = "Ogg Opus tags editor"; platforms = platforms.all; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; maintainers = with maintainers; [ kmein ]; license = licenses.bsd3; mainProgram = "opustags"; diff --git a/pkgs/applications/audio/parrot/default.nix b/pkgs/applications/audio/parrot/default.nix index db5b89bb39fa0..d7da9213bce85 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 @@ -28,14 +28,16 @@ rustPlatform.buildRustPackage { nativeBuildInputs = [ cmake makeBinaryWrapper pkg-config ]; buildInputs = [ libopus openssl ] - ++ lib.optionals stdenv.isDarwin [ Security ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; postInstall = '' wrapProgram $out/bin/parrot \ --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..027d3880bd9d1 100644 --- a/pkgs/applications/audio/pavucontrol/default.nix +++ b/pkgs/applications/audio/pavucontrol/default.nix @@ -1,56 +1,72 @@ -{ fetchurl -, lib -, stdenv -, pkg-config -, intltool -, libpulseaudio -, gtkmm3 -, libsigcxx -, libcanberra-gtk3 -, json-glib -, gnome -, wrapGAppsHook3 +{ + fetchFromGitLab, + lib, + stdenv, + pkg-config, + intltool, + libpulseaudio, + gtkmm4, + libsigcxx, + # Since version 6.0, libcanberra is optional + withLibcanberra ? true, + libcanberra-gtk3, + json-glib, + adwaita-icon-theme, + wrapGAppsHook4, + meson, + ninja, + libpressureaudio, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pavucontrol"; - version = "5.0"; + version = "6.0"; - src = fetchurl { - url = "https://freedesktop.org/software/pulseaudio/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-zityw7XxpwrQ3xndgXUPlFW9IIcNHTo20gU2ry6PTno="; + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "pulseaudio"; + repo = "pavucontrol"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-nxzFvD/KUevIJOw9jgcr0Hfvg7KiSOmTBfKN3jLu3Cg="; }; buildInputs = [ libpulseaudio - gtkmm3 + gtkmm4 libsigcxx - libcanberra-gtk3 + (lib.optionals withLibcanberra libcanberra-gtk3) json-glib - gnome.adwaita-icon-theme + adwaita-icon-theme + libpressureaudio ]; - nativeBuildInputs = [ pkg-config intltool wrapGAppsHook3 ]; + nativeBuildInputs = [ + pkg-config + intltool + wrapGAppsHook4 + meson + ninja + ]; - configureFlags = [ "--disable-lynx" ]; + mesonFlags = [ + "--prefix=${placeholder "out"}" + (lib.mesonBool "lynx" false) + ]; enableParallelBuilding = true; - meta = with lib; { + meta = { + changelog = "https://freedesktop.org/software/pulseaudio/pavucontrol/#news"; description = "PulseAudio Volume Control"; - + homepage = "http://freedesktop.org/software/pulseaudio/pavucontrol/"; + license = lib.licenses.gpl2Plus; longDescription = '' PulseAudio Volume Control (pavucontrol) provides a GTK graphical user interface to connect to a PulseAudio server and easily control the volume of all clients, sinks, etc. ''; - - homepage = "http://freedesktop.org/software/pulseaudio/pavucontrol/"; - - license = lib.licenses.gpl2Plus; - - maintainers = with maintainers; [ abbradar ]; - platforms = platforms.linux; mainProgram = "pavucontrol"; + maintainers = with lib.maintainers; [ abbradar ]; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/applications/audio/pd-plugins/gem/default.nix b/pkgs/applications/audio/pd-plugins/gem/default.nix index 7bfdb1bd8a8a4..5cb308988a4f7 100644 --- a/pkgs/applications/audio/pd-plugins/gem/default.nix +++ b/pkgs/applications/audio/pd-plugins/gem/default.nix @@ -7,7 +7,7 @@ , libGL , libGLU , glew -, freeglut +, libglut , libv4l , libX11 , file @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { libGL libGLU glew - freeglut + libglut libv4l libX11 ]; diff --git a/pkgs/applications/audio/pd-plugins/helmholtz/default.nix b/pkgs/applications/audio/pd-plugins/helmholtz/default.nix index 50455328f3a40..a82007c375bd9 100644 --- a/pkgs/applications/audio/pd-plugins/helmholtz/default.nix +++ b/pkgs/applications/audio/pd-plugins/helmholtz/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation { ''; meta = { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); description = "Time domain pitch tracker for Pure Data"; homepage = "http://www.katjaas.nl/helmholtz/helmholtz.html"; license = lib.licenses.bsd3; diff --git a/pkgs/applications/audio/petrifoo/default.nix b/pkgs/applications/audio/petrifoo/default.nix index 10a82bac6edbc..e8298ea321c39 100644 --- a/pkgs/applications/audio/petrifoo/default.nix +++ b/pkgs/applications/audio/petrifoo/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { homepage = "https://petri-foo.sourceforge.net"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = [ maintainers.goibhniu ]; + maintainers = [ ]; mainProgram = "petri-foo"; }; } diff --git a/pkgs/applications/audio/pianobar/default.nix b/pkgs/applications/audio/pianobar/default.nix index 7854203d89396..11116c7ffa5fd 100644 --- a/pkgs/applications/audio/pianobar/default.nix +++ b/pkgs/applications/audio/pianobar/default.nix @@ -1,17 +1,19 @@ -{ fetchurl, lib, stdenv, pkg-config, libao, json_c, libgcrypt, ffmpeg, curl }: +{ fetchFromGitHub, lib, stdenv, pkg-config, libao, json_c, libgcrypt, ffmpeg_7, curl }: stdenv.mkDerivation rec { pname = "pianobar"; - version = "2022.04.01"; + version = "2022.04.01-unstable-2024-08-16"; - src = fetchurl { - url = "https://6xq.net/projects/pianobar/${pname}-${version}.tar.bz2"; - sha256 = "sha256-FnCyiGWouCpXu23+p/FuL6QUXS81SRC7FzgLMsm5R2M="; + src = fetchFromGitHub { + owner = "PromyLOPh"; + repo = "pianobar"; + rev = "41ac06c8585dc535c4b1737b4c2943bb3fe7beb0"; + hash = "sha256-5LTZ6J9bvfsnpD/bGuojekutFVdH9feWLF+nLFvkeOA="; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ - libao json_c libgcrypt ffmpeg curl + libao json_c libgcrypt ffmpeg_7 curl ]; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/applications/audio/pianobooster/default.nix b/pkgs/applications/audio/pianobooster/default.nix index 8a78ca046e4de..216ca845f1fa1 100644 --- a/pkgs/applications/audio/pianobooster/default.nix +++ b/pkgs/applications/audio/pianobooster/default.nix @@ -67,6 +67,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/pianobooster/PianoBooster"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ goibhniu orivej ]; + maintainers = with maintainers; [ orivej ]; }; } diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix index 76edc412a3921..e43e39e5a47d0 100644 --- a/pkgs/applications/audio/picard/default.nix +++ b/pkgs/applications/audio/picard/default.nix @@ -1,5 +1,5 @@ { lib -, python3Packages +, python312Packages , fetchFromGitHub , chromaprint @@ -11,7 +11,7 @@ }: let - pythonPackages = python3Packages; + pythonPackages = python312Packages; pyqt5 = if enablePlayback then pythonPackages.pyqt5-multimedia @@ -20,19 +20,21 @@ let in pythonPackages.buildPythonApplication rec { pname = "picard"; - version = "2.11"; + # nix-update --commit picard --version-regex 'release-(.*)' + version = "2.12.3"; format = "setuptools"; src = fetchFromGitHub { owner = "metabrainz"; repo = "picard"; rev = "refs/tags/release-${version}"; - hash = "sha256-2RGKHJKJ/QXR6Rehch4r1UtI+frRXa4G+n0bUmCGSu8="; + hash = "sha256-ysHOiX8b9tlUaQDGl4qHUVLrLUF9MUDc4+vOQB76cj4="; }; nativeBuildInputs = [ gettext qt5.wrapQtAppsHook + pythonPackages.pytestCheckHook ] ++ lib.optionals (pyqt5.multimediaEnabled) [ gst_all_1.gst-libav gst_all_1.gst-plugins-base @@ -65,6 +67,7 @@ pythonPackages.buildPythonApplication rec { preCheck = '' export HOME=$(mktemp -d) ''; + doCheck = true; # In order to spare double wrapping, we use: preFixup = '' @@ -73,12 +76,13 @@ pythonPackages.buildPythonApplication rec { makeWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0") ''; - meta = with lib; { + meta = { homepage = "https://picard.musicbrainz.org"; changelog = "https://picard.musicbrainz.org/changelog"; description = "Official MusicBrainz tagger"; mainProgram = "picard"; - license = licenses.gpl2Plus; - platforms = platforms.all; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ doronbehar ]; }; } diff --git a/pkgs/applications/audio/pipecontrol/default.nix b/pkgs/applications/audio/pipecontrol/default.nix index 1586be58e3cf4..4bed5cb25037e 100644 --- a/pkgs/applications/audio/pipecontrol/default.nix +++ b/pkgs/applications/audio/pipecontrol/default.nix @@ -4,7 +4,6 @@ , pipewire , cmake , extra-cmake-modules -, gnumake , wrapQtAppsHook , qtbase , qttools diff --git a/pkgs/applications/audio/pithos/default.nix b/pkgs/applications/audio/pithos/default.nix index dbb3a63fce6b7..a9ea4096859c7 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 +{ stdenv, lib, fetchFromGitHub, meson, ninja, pkg-config, appstream-glib, glib +, wrapGAppsHook3, pythonPackages, gtk3, adwaita-icon-theme, gobject-introspection , libnotify, libsecret, gst_all_1 }: pythonPackages.buildPythonApplication rec { @@ -20,19 +20,17 @@ pythonPackages.buildPythonApplication rec { patchShebangs meson_post_install.py ''; - nativeBuildInputs = [ meson ninja pkg-config appstream-glib wrapGAppsHook3 ]; + nativeBuildInputs = [ meson ninja pkg-config appstream-glib wrapGAppsHook3 gobject-introspection ]; - propagatedNativeBuildInputs = [ - gobject-introspection - ]; + buildInputs = [ gtk3 libnotify libsecret glib ] + ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-ugly gst-plugins-bad ]); propagatedBuildInputs = - [ gtk3 gobject-introspection libnotify libsecret gnome.adwaita-icon-theme ] ++ - (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-ugly gst-plugins-bad ]) ++ + [ adwaita-icon-theme ] ++ (with pythonPackages; [ pygobject3 pylast ]); meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Pandora Internet Radio player for GNOME"; mainProgram = "pithos"; homepage = "https://pithos.github.io/"; diff --git a/pkgs/applications/audio/plexamp/default.nix b/pkgs/applications/audio/plexamp/default.nix index ec79cbefabf0f..2e1b7b7bc2a19 100644 --- a/pkgs/applications/audio/plexamp/default.nix +++ b/pkgs/applications/audio/plexamp/default.nix @@ -2,12 +2,12 @@ let pname = "plexamp"; - version = "4.10.1"; + version = "4.11.1"; src = fetchurl { url = "https://plexamp.plex.tv/plexamp.plex.tv/desktop/Plexamp-${version}.AppImage"; name = "${pname}-${version}.AppImage"; - hash = "sha512-Y43W6aPnZEMnkBQwSHbT8PWjuhkfNxce79Y9cixEPnq4VybROHGb9s6ghV7kP81TSWkb9QruFhmXfuJRSkXxTw=="; + hash = "sha512-miZACuT5kswIgdaYSFnYeoIUFtF6IRXKbLLrpOVga4UULgwnzinGehSNDd6feSyuDoKQhXIbDB/8eI4jERTS1A=="; }; appimageContents = appimageTools.extractType2 { @@ -30,7 +30,7 @@ appimageTools.wrapType2 { meta = with lib; { description = "Beautiful Plex music player for audiophiles, curators, and hipsters"; homepage = "https://plexamp.com/"; - changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/73"; + changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/75"; license = licenses.unfree; maintainers = with maintainers; [ killercup redhawk synthetica ]; platforms = [ "x86_64-linux" ]; 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/plugin-torture/default.nix b/pkgs/applications/audio/plugin-torture/default.nix index b3f671adc4b2a..4b5f0c4acd2f9 100644 --- a/pkgs/applications/audio/plugin-torture/default.nix +++ b/pkgs/applications/audio/plugin-torture/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { ''; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); homepage = "https://github.com/cth103/plugin-torture"; description = "Tool to test LADSPA and LV2 plugins"; license = licenses.gpl2; diff --git a/pkgs/applications/audio/pmidi/default.nix b/pkgs/applications/audio/pmidi/default.nix index 29215aa061952..f2e2310bd4c47 100644 --- a/pkgs/applications/audio/pmidi/default.nix +++ b/pkgs/applications/audio/pmidi/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = with lib; { homepage = "https://www.parabola.me.uk/alsa/pmidi.html"; description = "Straightforward command line program to play midi files through the ALSA sequencer"; - maintainers = with maintainers; [ ]; + maintainers = [ ]; license = licenses.gpl2; mainProgram = "pmidi"; }; diff --git a/pkgs/applications/audio/polyphone/default.nix b/pkgs/applications/audio/polyphone/default.nix index f9e33dc94a801..2a38222949f6c 100644 --- a/pkgs/applications/audio/polyphone/default.nix +++ b/pkgs/applications/audio/polyphone/default.nix @@ -1,55 +1,74 @@ -{ stdenv, lib, mkDerivation, fetchFromGitHub, qmake, pkg-config, alsa-lib, libjack2, portaudio, libogg, flac, libvorbis, rtmidi, qtsvg, qttools }: +{ + stdenv, + lib, + fetchFromGitHub, + pkg-config, + qmake, + qttools, + wrapQtAppsHook, + alsa-lib, + flac, + libjack2, + libogg, + libvorbis, + qtsvg, + qtwayland, + rtmidi, +}: -mkDerivation rec { - version = "2.3.0"; +stdenv.mkDerivation rec { + version = "2.4.0"; pname = "polyphone"; src = fetchFromGitHub { owner = "davy7125"; repo = "polyphone"; rev = version; - sha256 = "09habv51pw71wrb39shqi80i2w39dx5a39klzswsald5j9sia0ir"; + hash = "sha256-cPHLmqsS4ReqOCcsgOf77V/ShIkk7chGoJ6bU4W5ejs="; }; + nativeBuildInputs = [ + pkg-config + qmake + qttools + wrapQtAppsHook + ]; + buildInputs = [ alsa-lib + flac libjack2 - portaudio libogg - flac libvorbis - rtmidi qtsvg + qtwayland + rtmidi ]; - nativeBuildInputs = [ qmake qttools pkg-config ]; - preConfigure = '' cd ./sources/ ''; - installPhase = '' - runHook preInstall - install -d $out/bin - install -m755 bin/polyphone $out/bin/ - - install -Dm444 ./contrib/com.polyphone_soundfonts.polyphone.desktop -t $out/share/applications/ - install -Dm444 ./contrib/polyphone.svg -t $out/share/icons/hicolor/scalable/apps/ - runHook postInstall + postConfigure = '' + # Work around https://github.com/NixOS/nixpkgs/issues/214765 + substituteInPlace Makefile \ + --replace-fail "$(dirname $QMAKE)/lrelease" "${lib.getBin qttools}/bin/lrelease" ''; qmakeFlags = [ "DEFINES+=USE_LOCAL_STK" - "DEFINES+=USE_LOCAL_QCUSTOMPLOT" ]; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); description = "Soundfont editor for creating musical instruments"; mainProgram = "polyphone"; homepage = "https://www.polyphone-soundfonts.com/"; license = licenses.gpl3; - maintainers = [ maintainers.maxdamantus ]; + maintainers = with maintainers; [ + maxdamantus + orivej + ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/audio/praat/default.nix b/pkgs/applications/audio/praat/default.nix index 39d258c806c72..16f9283282980 100644 --- a/pkgs/applications/audio/praat/default.nix +++ b/pkgs/applications/audio/praat/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "praat"; - version = "6.4.12"; + version = "6.4.20"; src = fetchFromGitHub { owner = "praat"; repo = "praat"; rev = "v${finalAttrs.version}"; - hash = "sha256-nriw/nP73m27QWdhC5ooTuVMul+GdOUsnVroM/CZiiY="; + hash = "sha256-qal7eIKht0XkRDEsAfNkNDwmDYrr/cLQV4pMMWE+kFk="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/projectm/default.nix b/pkgs/applications/audio/projectm/default.nix index 6ca8d55bb249c..f7ca3d37793b6 100644 --- a/pkgs/applications/audio/projectm/default.nix +++ b/pkgs/applications/audio/projectm/default.nix @@ -56,7 +56,7 @@ mkDerivation rec { description = "Cross-platform Milkdrop-compatible music visualizer"; license = lib.licenses.lgpl21; platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; longDescription = '' The open-source project that reimplements the esteemed Winamp Milkdrop by Geiss in a more modern, cross-platform reusable library. Read an audio input and produces mesmerizing visuals, detecting tempo, and rendering advanced equations into a limitless array of user-contributed visualizations. diff --git a/pkgs/applications/audio/psst/Cargo.lock b/pkgs/applications/audio/psst/Cargo.lock index 48c37eb1e5a0c..a88b05440ee33 100644 --- a/pkgs/applications/audio/psst/Cargo.lock +++ b/pkgs/applications/audio/psst/Cargo.lock @@ -10,9 +10,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "aes" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2" +checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" dependencies = [ "cfg-if", "cipher", @@ -21,23 +21,28 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.1.1" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea5d730647d4fadd988536d06fecce94b7b4f2a7efdae548f1cf4b63205518ab" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ "memchr", ] [[package]] +name = "aligned-vec" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4aa90d7ce82d4be67b64039a3d588d38dbcc6736577de4a847025ce5b0c468d1" + +[[package]] name = "alsa" -version = "0.7.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2562ad8dcf0f789f65c6fdaad8a8a9708ed6b488e649da28c01656ad66b8b47" +checksum = "37fe60779335388a88c01ac6c3be40304d1e349de3ada3b15f7808bb90fa9dce" dependencies = [ "alsa-sys", - "bitflags 1.3.2", + "bitflags 2.6.0", "libc", - "nix", ] [[package]] @@ -66,10 +71,76 @@ dependencies = [ ] [[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.75" +version = "1.0.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" + +[[package]] +name = "arbitrary" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" + +[[package]] +name = "arg_enum_proc_macro" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" +checksum = "0ae92a5119aa49cdbcf6b9f893fe4e1d98b04ccbf82ee0584ad948a44a734dea" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] [[package]] name = "arrayvec" @@ -84,6 +155,175 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "46016233fc1bb55c23b856fe556b7db6ccd05119a0a392e04f0b3b7c79058f16" [[package]] +name = "async-broadcast" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c48ccdbf6ca6b121e0f586cbc0e73ae440e56c67c30fa0873b4e110d9c26d2b" +dependencies = [ + "event-listener 2.5.3", + "futures-core", +] + +[[package]] +name = "async-channel" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a" +dependencies = [ + "concurrent-queue", + "event-listener-strategy", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-executor" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8828ec6e544c02b0d6691d21ed9f9218d0384a82542855073c2a3f58304aaf0" +dependencies = [ + "async-task", + "concurrent-queue", + "fastrand 2.1.0", + "futures-lite 2.3.0", + "slab", +] + +[[package]] +name = "async-fs" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06" +dependencies = [ + "async-lock 2.8.0", + "autocfg", + "blocking", + "futures-lite 1.13.0", +] + +[[package]] +name = "async-io" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" +dependencies = [ + "async-lock 2.8.0", + "autocfg", + "cfg-if", + "concurrent-queue", + "futures-lite 1.13.0", + "log", + "parking", + "polling 2.8.0", + "rustix 0.37.27", + "slab", + "socket2", + "waker-fn", +] + +[[package]] +name = "async-io" +version = "2.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d6baa8f0178795da0e71bc42c9e5d13261aac7ee549853162e66a241ba17964" +dependencies = [ + "async-lock 3.4.0", + "cfg-if", + "concurrent-queue", + "futures-io", + "futures-lite 2.3.0", + "parking", + "polling 3.7.2", + "rustix 0.38.34", + "slab", + "tracing", + "windows-sys 0.52.0", +] + +[[package]] +name = "async-lock" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" +dependencies = [ + "event-listener 2.5.3", +] + +[[package]] +name = "async-lock" +version = "3.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18" +dependencies = [ + "event-listener 5.3.1", + "event-listener-strategy", + "pin-project-lite", +] + +[[package]] +name = "async-process" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88" +dependencies = [ + "async-io 1.13.0", + "async-lock 2.8.0", + "async-signal", + "blocking", + "cfg-if", + "event-listener 3.1.0", + "futures-lite 1.13.0", + "rustix 0.38.34", + "windows-sys 0.48.0", +] + +[[package]] +name = "async-recursion" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "async-signal" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "794f185324c2f00e771cd9f1ae8b5ac68be2ca7abb129a87afd6e86d228bc54d" +dependencies = [ + "async-io 2.3.3", + "async-lock 3.4.0", + "atomic-waker", + "cfg-if", + "futures-core", + "futures-io", + "rustix 0.38.34", + "signal-hook-registry", + "slab", + "windows-sys 0.52.0", +] + +[[package]] +name = "async-task" +version = "4.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" + +[[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.68", +] + +[[package]] name = "atk" version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -108,48 +348,78 @@ dependencies = [ ] [[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + +[[package]] name = "audio_thread_priority" -version = "0.27.1" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "171919e42cac3c2b837b5749bc9c4abc4b96def2a5be344ce207e0404e25c839" +checksum = "e3632611da7e79f8fc8fd75840f1ccfa7792dbf1e25d00791344a4450dd8834f" dependencies = [ "cfg-if", + "dbus", "libc", "log", "mach", - "winapi", + "windows-sys 0.52.0", ] [[package]] name = "autocfg" -version = "1.1.0" +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 = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "876c75a42f6364451a033496a14c44bffe41f5f4a8236f697391f11024e596d2" +dependencies = [ + "arrayvec", +] [[package]] name = "base64" -version = "0.21.4" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "bindgen" -version = "0.68.1" +version = "0.69.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "726e4313eb6ec35d2730258ad4e15b547ee75d6afaa1361a922e78e59b7d8078" +checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.6.0", "cexpr", "clang-sys", + "itertools 0.12.1", "lazy_static", "lazycell", - "peeking_take_while", "proc-macro2", "quote", "regex", "rustc-hash", "shlex", - "syn 2.0.37", + "syn 2.0.68", ] [[package]] @@ -166,9 +436,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" [[package]] name = "bitmaps" @@ -180,6 +450,12 @@ dependencies = [ ] [[package]] +name = "bitstream-io" +version = "2.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "415f8399438eb5e4b2f73ed3152a3448b98149dda642a957ee704e1daa5cf1d8" + +[[package]] name = "block" version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -195,10 +471,32 @@ dependencies = [ ] [[package]] +name = "block2" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c132eebf10f5cad5289222520a4a058514204aed6d791f1cf4fe8088b82d15f" +dependencies = [ + "objc2", +] + +[[package]] +name = "blocking" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea" +dependencies = [ + "async-channel", + "async-task", + "futures-io", + "futures-lite 2.3.0", + "piper", +] + +[[package]] name = "bstr" -version = "1.6.2" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c2f7349907b712260e64b0afe2f84692af14a454be26187d9df565c7f69266a" +checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706" dependencies = [ "memchr", "regex-automata", @@ -206,37 +504,40 @@ dependencies = [ ] [[package]] -name = "btoi" -version = "0.4.3" +name = "built" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dd6407f73a9b8b6162d8a2ef999fe6afd7cc15902ebf42c5cd296addf17e0ad" -dependencies = [ - "num-traits", -] +checksum = "c6a6c0b39c38fd754ac338b00a88066436389c0f029da5d37d1e01091d9b7c17" [[package]] name = "bumpalo" -version = "3.14.0" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "bytemuck" -version = "1.14.0" +version = "1.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" +checksum = "b236fc92302c97ed75b38da1f4917b5cdda4984745740f153a5d3059e48d725e" [[package]] name = "byteorder" -version = "1.4.3" +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 = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" +checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495" [[package]] name = "bytes" -version = "1.5.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" +checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" [[package]] name = "cairo-rs" @@ -265,12 +566,13 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.83" +version = "1.0.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +checksum = "74b6a57f98764a267ff415d50a25e6e166f3831a5071af4995296ea97d210490" dependencies = [ "jobserver", "libc", + "once_cell", ] [[package]] @@ -290,9 +592,9 @@ dependencies = [ [[package]] name = "cfg-expr" -version = "0.15.5" +version = "0.15.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03915af431787e6ffdcc74c645077518c6b6e01f80b761e0fbbfa288536311b3" +checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02" dependencies = [ "smallvec", "target-lexicon", @@ -306,16 +608,16 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.31" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" dependencies = [ "android-tzdata", "iana-time-zone", "js-sys", "num-traits", "wasm-bindgen", - "windows-targets 0.48.5", + "windows-targets 0.52.5", ] [[package]] @@ -330,9 +632,9 @@ dependencies = [ [[package]] name = "clang-sys" -version = "1.6.1" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f" +checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" dependencies = [ "glob", "libc", @@ -385,16 +687,31 @@ 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 = "combine" -version = "4.6.6" +version = "4.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4" +checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" dependencies = [ "bytes", "memchr", ] [[package]] +name = "concurrent-queue" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" +dependencies = [ + "crossbeam-utils", +] + +[[package]] name = "console_error_panic_hook" version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -406,25 +723,19 @@ dependencies = [ [[package]] name = "core-foundation" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" dependencies = [ - "core-foundation-sys 0.8.4", + "core-foundation-sys", "libc", ] [[package]] name = "core-foundation-sys" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b" - -[[package]] -name = "core-foundation-sys" -version = "0.8.4" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "core-graphics" @@ -441,9 +752,9 @@ dependencies = [ [[package]] name = "core-graphics-types" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bb142d41022986c1d8ff29103a1411c8a3dfad3552f87a4f8dc50d61d4f4e33" +checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf" dependencies = [ "bitflags 1.3.2", "core-foundation", @@ -464,109 +775,98 @@ dependencies = [ [[package]] name = "coreaudio-rs" -version = "0.11.2" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb17e2d1795b1996419648915df94bc7103c28f7b48062d7acf4652fc371b2ff" +checksum = "321077172d79c662f64f5071a03120748d5bb652f5231570141be24cfcd2bace" dependencies = [ "bitflags 1.3.2", - "core-foundation-sys 0.6.2", + "core-foundation-sys", "coreaudio-sys", ] [[package]] name = "coreaudio-sys" -version = "0.2.13" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8478e5bdad14dce236b9898ea002eabfa87cbe14f0aa538dbe3b6a4bec4332d" +checksum = "7f01585027057ff5f0a5bf276174ae4c1594a2c5bde93d5f46a016d76270f5a9" dependencies = [ "bindgen", ] [[package]] name = "cpal" -version = "0.15.2" +version = "0.15.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d959d90e938c5493000514b446987c07aed46c668faaa7d34d6c7a67b1a578c" +checksum = "873dab07c8f743075e57f524c583985fbaf745602acbe916a01539364369a779" dependencies = [ "alsa", - "core-foundation-sys 0.8.4", + "core-foundation-sys", "coreaudio-rs", "dasp_sample", - "jni 0.19.0", + "jni", "js-sys", "libc", "mach2", "ndk", "ndk-context", "oboe", - "once_cell", - "parking_lot", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "windows 0.46.0", + "windows 0.54.0", ] [[package]] name = "cpufeatures" -version = "0.2.9" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" dependencies = [ "libc", ] [[package]] name = "crc32fast" -version = "1.3.2" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" dependencies = [ "cfg-if", ] [[package]] name = "crossbeam-channel" -version = "0.5.8" +version = "0.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" +checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" dependencies = [ - "cfg-if", "crossbeam-utils", ] [[package]] name = "crossbeam-deque" -version = "0.8.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" dependencies = [ - "cfg-if", "crossbeam-epoch", "crossbeam-utils", ] [[package]] name = "crossbeam-epoch" -version = "0.9.15" +version = "0.9.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" dependencies = [ - "autocfg", - "cfg-if", "crossbeam-utils", - "memoffset", - "scopeguard", ] [[package]] name = "crossbeam-utils" -version = "0.8.16" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" -dependencies = [ - "cfg-if", -] +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" [[package]] name = "crunchy" @@ -595,16 +895,16 @@ dependencies = [ [[package]] name = "cubeb" -version = "0.10.3" -source = "git+https://github.com/mozilla/cubeb-rs#a2c1c29a0f74ed2e09c94596a87dd99056d98a91" +version = "0.13.0" +source = "git+https://github.com/mozilla/cubeb-rs#1c01012efea03cb528f2b0c62048ee5ed66565f0" dependencies = [ "cubeb-core", ] [[package]] name = "cubeb-core" -version = "0.10.4" -source = "git+https://github.com/mozilla/cubeb-rs#a2c1c29a0f74ed2e09c94596a87dd99056d98a91" +version = "0.13.0" +source = "git+https://github.com/mozilla/cubeb-rs#1c01012efea03cb528f2b0c62048ee5ed66565f0" dependencies = [ "bitflags 1.3.2", "cubeb-sys", @@ -612,8 +912,8 @@ dependencies = [ [[package]] name = "cubeb-sys" -version = "0.10.3" -source = "git+https://github.com/mozilla/cubeb-rs#a2c1c29a0f74ed2e09c94596a87dd99056d98a91" +version = "0.13.0" +source = "git+https://github.com/mozilla/cubeb-rs#1c01012efea03cb528f2b0c62048ee5ed66565f0" dependencies = [ "cmake", "pkg-config", @@ -627,29 +927,33 @@ checksum = "0c87e182de0887fd5361989c677c4e8f5000cd9491d6d563161a8f3a5519fc7f" [[package]] name = "dbus" -version = "0.9.7" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bb21987b9fb1613058ba3843121dd18b163b254d8a6e797e144cbac14d96d1b" +checksum = "48b5f0f36f1eebe901b0e6bee369a77ed3396334bf3f09abd46454a576f71819" dependencies = [ "libc", "libdbus-sys", - "winapi", ] [[package]] -name = "dbus-crossroads" -version = "0.5.2" +name = "deranged" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a4c83437187544ba5142427746835061b330446ca8902eabd70e4afb8f76de0" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" dependencies = [ - "dbus", + "powerfmt", ] [[package]] -name = "deranged" -version = "0.3.8" +name = "derivative" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946" +checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] [[package]] name = "digest" @@ -691,13 +995,13 @@ checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" [[package]] name = "displaydoc" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.68", ] [[package]] @@ -791,30 +1095,61 @@ dependencies = [ [[package]] name = "either" -version = "1.9.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "encoding_rs" -version = "0.8.33" +version = "0.8.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" +checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" dependencies = [ "cfg-if", ] [[package]] +name = "enumflags2" +version = "0.7.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d232db7f5956f3f14313dc2f87985c58bd2c695ce124c8cdd984e08e15ac133d" +dependencies = [ + "enumflags2_derive", + "serde", +] + +[[package]] +name = "enumflags2_derive" +version = "0.7.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "env_filter" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a009aa4810eb158359dda09d0c87378e4bbb89b5a801f016885a4707ba24f7ea" +dependencies = [ + "log", + "regex", +] + +[[package]] name = "env_logger" -version = "0.10.0" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" +checksum = "38b35839ba51819680ba087cd351788c9a3c476841207e0b8cee0b04722343b9" dependencies = [ + "anstream", + "anstyle", + "env_filter", "humantime", - "is-terminal", "log", - "regex", - "termcolor", ] [[package]] @@ -825,30 +1160,57 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.4" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "add4f07d43996f76ef320709726a556a9d4f965d9410d8d0271132d2f8293480" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" dependencies = [ - "errno-dragonfly", "libc", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] -name = "errno-dragonfly" -version = "0.1.2" +name = "event-listener" +version = "2.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" + +[[package]] +name = "event-listener" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d93877bcde0eb80ca09131a08d23f0a5c18a620b01db137dba666d18cd9b30c2" dependencies = [ - "cc", - "libc", + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener" +version = "5.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba" +dependencies = [ + "concurrent-queue", + "parking", + "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.1", + "pin-project-lite", ] [[package]] name = "exr" -version = "1.71.0" +version = "1.72.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "832a761f35ab3e6664babfbdc6cef35a4860e816ec3916dcfd0882954e98a8a8" +checksum = "887d93f60543e9a9362ef8a21beedd0a833c5d9610e18c67abe15a5963dcb1a4" dependencies = [ "bit_field", "flume", @@ -862,24 +1224,30 @@ dependencies = [ [[package]] name = "faster-hex" -version = "0.8.1" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2a2b11eda1d40935b26cf18f6833c526845ae8c41e58d09af6adeb6f0269183" + +[[package]] +name = "fastrand" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "239f7bfb930f820ab16a9cd95afc26f88264cf6905c960b340a615384aa3338a" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" dependencies = [ - "serde", + "instant", ] [[package]] name = "fastrand" -version = "2.0.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" +checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" [[package]] name = "fdeflate" -version = "0.3.0" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d329bdeac514ee06249dabc27877490f17f5d371ec693360768b838e19f3ae10" +checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645" dependencies = [ "simd-adler32", ] @@ -890,15 +1258,15 @@ version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f" dependencies = [ - "memoffset", + "memoffset 0.9.1", "rustc_version", ] [[package]] name = "flate2" -version = "1.0.27" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" +checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" dependencies = [ "crc32fast", "miniz_oxide", @@ -906,16 +1274,16 @@ dependencies = [ [[package]] name = "fluent-bundle" -version = "0.15.2" +version = "0.15.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e242c601dec9711505f6d5bbff5bedd4b61b2469f2e8bb8e57ee7c9747a87ffd" +checksum = "7fe0a21ee80050c678013f82edf4b705fe2f26f1f9877593d13198612503f493" dependencies = [ "fluent-langneg", "fluent-syntax", "intl-memoizer", "intl_pluralrules", "rustc-hash", - "self_cell", + "self_cell 0.10.3", "smallvec", "unic-langid", ] @@ -931,9 +1299,9 @@ dependencies = [ [[package]] name = "fluent-syntax" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0abed97648395c902868fee9026de96483933faa54ea3b40d652f7dfe61ca78" +checksum = "2a530c4694a6a8d528794ee9bbd8ba0122e779629ac908d15ad5a7ae7763a33d" dependencies = [ "thiserror", ] @@ -944,7 +1312,7 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" dependencies = [ - "spin 0.9.8", + "spin", ] [[package]] @@ -970,9 +1338,9 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "form_urlencoded" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" dependencies = [ "percent-encoding", ] @@ -985,24 +1353,24 @@ checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" [[package]] name = "futures-channel" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" dependencies = [ "futures-core", ] [[package]] name = "futures-core" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" [[package]] name = "futures-executor" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" dependencies = [ "futures-core", "futures-task", @@ -1011,36 +1379,73 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.28" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" + +[[package]] +name = "futures-lite" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" +dependencies = [ + "fastrand 1.9.0", + "futures-core", + "futures-io", + "memchr", + "parking", + "pin-project-lite", + "waker-fn", +] + +[[package]] +name = "futures-lite" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" +checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" +dependencies = [ + "fastrand 2.1.0", + "futures-core", + "futures-io", + "parking", + "pin-project-lite", +] [[package]] name = "futures-macro" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.68", ] [[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.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" [[package]] name = "futures-util" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" dependencies = [ "futures-core", + "futures-io", "futures-macro", + "futures-sink", "futures-task", + "memchr", "pin-project-lite", "pin-utils", "slab", @@ -1117,9 +1522,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.10" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "libc", @@ -1128,9 +1533,9 @@ dependencies = [ [[package]] name = "gif" -version = "0.12.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80792593675e051cf94a4b111980da2ba60d4a83e43e0048c5693baab3977045" +checksum = "3fb2d69b19215e18bb912fa30f7ce15846e301408695e44e0ef719f1da9e19f2" dependencies = [ "color_quant", "weezl", @@ -1171,45 +1576,43 @@ dependencies = [ [[package]] name = "git-version" -version = "0.3.5" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6b0decc02f4636b9ccad390dcbe77b722a77efedfa393caf8379a51d5c61899" +checksum = "1ad568aa3db0fcbc81f2f116137f263d7304f512a1209b35b85150d3ef88ad19" dependencies = [ "git-version-macro", - "proc-macro-hack", ] [[package]] name = "git-version-macro" -version = "0.3.5" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe69f1cbdb6e28af2bac214e943b99ce8a0a06b447d15d3e61161b0423139f3f" +checksum = "53010ccb100b96a67bc32c0175f0ed1426b31b655d562898e57325f81c023ac0" dependencies = [ - "proc-macro-hack", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.68", ] [[package]] name = "gix-actor" -version = "0.27.0" +version = "0.31.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08c60e982c5290897122d4e2622447f014a2dadd5a18cb73d50bb91b31645e27" +checksum = "e0f52455500a0fac1fd62a1cf42d9121cfddef8cb3ded2f9e7adb5775deb1fc9" dependencies = [ "bstr", - "btoi", "gix-date", + "gix-utils", "itoa", "thiserror", - "winnow", + "winnow 0.6.13", ] [[package]] name = "gix-config" -version = "0.30.0" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c171514b40487d3f677ae37efc0f45ac980e3169f23c27eb30a70b47fdf88ab5" +checksum = "53fafe42957e11d98e354a66b6bd70aeea00faf2f62dd11164188224a507c840" dependencies = [ "bstr", "gix-config-value", @@ -1223,16 +1626,16 @@ dependencies = [ "smallvec", "thiserror", "unicode-bom", - "winnow", + "winnow 0.6.13", ] [[package]] name = "gix-config-value" -version = "0.14.0" +version = "0.14.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea7505b97f4d8e7933e29735a568ba2f86d8de466669d9f0e8321384f9972f47" +checksum = "fbd06203b1a9b33a78c88252a625031b094d9e1b647260070c25b09910c0a804" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.6.0", "bstr", "gix-path", "libc", @@ -1241,9 +1644,9 @@ dependencies = [ [[package]] name = "gix-date" -version = "0.8.0" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc7df669639582dc7c02737642f76890b03b5544e141caba68a7d6b4eb551e0d" +checksum = "9eed6931f21491ee0aeb922751bd7ec97b4b2fe8fbfedcb678e2a2dce5f3b8c0" dependencies = [ "bstr", "itoa", @@ -1253,33 +1656,37 @@ dependencies = [ [[package]] name = "gix-features" -version = "0.35.0" +version = "0.38.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b9ff423ae4983f762659040d13dd7a5defbd54b6a04ac3cc7347741cec828cd" +checksum = "ac7045ac9fe5f9c727f38799d002a7ed3583cd777e3322a7c4b43e3cf437dc69" dependencies = [ "gix-hash", "gix-trace", + "gix-utils", "libc", + "prodash", "sha1_smol", "walkdir", ] [[package]] name = "gix-fs" -version = "0.7.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09815faba62fe9b32d918b75a554686c98e43f7d48c43a80df58eb718e5c6635" +checksum = "c3338ff92a2164f5209f185ec0cd316f571a72676bb01d27e22f2867ba69f77a" dependencies = [ + "fastrand 2.1.0", "gix-features", + "gix-utils", ] [[package]] name = "gix-glob" -version = "0.13.0" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9d76e85f11251dcf751d2c5e918a14f562db5be6f727fd24775245653e9b19d" +checksum = "c2a29ad0990cf02c48a7aac76ed0dbddeb5a0d070034b83675cc3bbf937eace4" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.6.0", "bstr", "gix-features", "gix-path", @@ -1287,9 +1694,9 @@ dependencies = [ [[package]] name = "gix-hash" -version = "0.13.0" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ccf425543779cddaa4a7c62aba3fa9d90ea135b160be0a72dd93c063121ad4a" +checksum = "f93d7df7366121b5018f947a04d37f034717e113dcf9ccd85c34b58e57a74d5e" dependencies = [ "faster-hex", "thiserror", @@ -1297,9 +1704,9 @@ dependencies = [ [[package]] name = "gix-lock" -version = "10.0.0" +version = "14.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47fc96fa8b6b6d33555021907c81eb3b27635daecf6e630630bdad44f8feaa95" +checksum = "e3bc7fe297f1f4614774989c00ec8b1add59571dc9b024b4c00acb7dedd4e19d" dependencies = [ "gix-tempfile", "gix-utils", @@ -1308,28 +1715,28 @@ dependencies = [ [[package]] name = "gix-object" -version = "0.37.0" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e7e19616c67967374137bae83e950e9b518a9ea8a605069bd6716ada357fd6f" +checksum = "1fe2dc4a41191c680c942e6ebd630c8107005983c4679214fdb1007dcf5ae1df" dependencies = [ "bstr", - "btoi", "gix-actor", "gix-date", "gix-features", "gix-hash", + "gix-utils", "gix-validate", "itoa", "smallvec", "thiserror", - "winnow", + "winnow 0.6.13", ] [[package]] name = "gix-path" -version = "0.10.0" +version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a1d370115171e3ae03c5c6d4f7d096f2981a40ddccb98dfd704c773530ba73b" +checksum = "ca987128ffb056d732bd545db5db3d8b103d252fbf083c2567bb0796876619a4" dependencies = [ "bstr", "gix-trace", @@ -1340,9 +1747,9 @@ dependencies = [ [[package]] name = "gix-ref" -version = "0.37.0" +version = "0.44.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22e6b749660b613641769edc1954132eb8071a13c32224891686091bef078de4" +checksum = "3394a2997e5bc6b22ebc1e1a87b41eeefbcfcff3dbfa7c4bd73cb0ac8f1f3e2e" dependencies = [ "gix-actor", "gix-date", @@ -1353,29 +1760,30 @@ dependencies = [ "gix-object", "gix-path", "gix-tempfile", + "gix-utils", "gix-validate", "memmap2", "thiserror", - "winnow", + "winnow 0.6.13", ] [[package]] name = "gix-sec" -version = "0.10.0" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92b9542ac025a8c02ed5d17b3fc031a111a384e859d0be3532ec4d58c40a0f28" +checksum = "fddc27984a643b20dd03e97790555804f98cf07404e0e552c0ad8133266a79a1" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.6.0", "gix-path", "libc", - "windows 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "gix-tempfile" -version = "10.0.0" +version = "14.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ae0978f3e11dc57290ee75ac2477c815bca1ce2fa7ed5dc5f16db067410ac4d" +checksum = "d3b0e276cd08eb2a22e9f286a4f13a222a01be2defafa8621367515375644b99" dependencies = [ "gix-fs", "libc", @@ -1386,24 +1794,25 @@ dependencies = [ [[package]] name = "gix-trace" -version = "0.1.3" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96b6d623a1152c3facb79067d6e2ecdae48130030cf27d6eb21109f13bd7b836" +checksum = "f924267408915fddcd558e3f37295cc7d6a3e50f8bd8b606cee0808c3915157e" [[package]] name = "gix-utils" -version = "0.1.5" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b85d89dc728613e26e0ed952a19583744e7f5240fcd4aa30d6c824ffd8b52f0f" +checksum = "35192df7fd0fa112263bad8021e2df7167df4cc2a6e6d15892e1e55621d3d4dc" dependencies = [ - "fastrand", + "fastrand 2.1.0", + "unicode-normalization", ] [[package]] name = "gix-validate" -version = "0.8.0" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e05cab2b03a45b866156e052aa38619f4ece4adcb2f79978bfc249bc3b21b8c5" +checksum = "82c27dd34a49b1addf193c92070bcbf3beaf6e10f16a78544de6372e146a0acf" dependencies = [ "bstr", "thiserror", @@ -1439,7 +1848,7 @@ checksum = "fb1a9325847aa46f1e96ffea37611b9d51fc4827e67f79e7de502a297560a67b" dependencies = [ "anyhow", "heck 0.4.1", - "proc-macro-crate", + "proc-macro-crate 1.3.1", "proc-macro-error", "proc-macro2", "quote", @@ -1521,7 +1930,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "096eb63c6fedf03bafe65e5924595785eaf1bcb7200dac0f2cbe9c9738f05ad8" dependencies = [ "anyhow", - "proc-macro-crate", + "proc-macro-crate 1.3.1", "proc-macro-error", "proc-macro2", "quote", @@ -1530,18 +1939,19 @@ dependencies = [ [[package]] name = "half" -version = "2.2.1" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02b4af3693f1b705df946e9fe5631932443781d0aabb423b62fcd4d73f6d2fd0" +checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888" dependencies = [ + "cfg-if", "crunchy", ] [[package]] name = "hashbrown" -version = "0.14.1" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dfda62a12f55daeae5015f81b0baea145391cb4520f86c248fc615d72640d12" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" [[package]] name = "heck" @@ -1559,10 +1969,28 @@ 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.3" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" + +[[package]] +name = "hermit-abi" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" +checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "hmac" @@ -1575,11 +2003,11 @@ dependencies = [ [[package]] name = "home" -version = "0.5.5" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" +checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -1590,16 +2018,16 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "iana-time-zone" -version = "0.1.57" +version = "0.1.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" dependencies = [ "android_system_properties", - "core-foundation-sys 0.8.4", + "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows 0.48.0", + "windows-core 0.52.0", ] [[package]] @@ -1613,9 +2041,9 @@ dependencies = [ [[package]] name = "idna" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" dependencies = [ "unicode-bidi", "unicode-normalization", @@ -1638,28 +2066,62 @@ dependencies = [ [[package]] name = "image" -version = "0.24.7" +version = "0.24.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f3dfdbdd72063086ff443e297b61695500514b1e41095b6fb9a5ab48a70a711" +checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d" +dependencies = [ + "bytemuck", + "byteorder", + "color_quant", + "jpeg-decoder", + "num-traits", + "png", +] + +[[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", - "jpeg-decoder", - "num-rational", + "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 = "indexmap" -version = "2.0.2" +version = "2.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", "hashbrown", @@ -1676,9 +2138,9 @@ dependencies = [ [[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", "js-sys", @@ -1687,10 +2149,21 @@ dependencies = [ ] [[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.68", +] + +[[package]] name = "intl-memoizer" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c310433e4a310918d6ed9243542a6b83ec1183df95dff8f23f87bb88a264a66f" +checksum = "fe22e020fce238ae18a6d5d8c502ee76a52a6e880d99477657e6acc30ec57bda" dependencies = [ "type-map", "unic-langid", @@ -1706,23 +2179,23 @@ dependencies = [ ] [[package]] -name = "is-docker" -version = "0.2.0" +name = "io-lifetimes" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "928bae27f42bc99b60d9ac7334e3a21d10ad8f1835a4e12ec3ec0464765ed1b3" +checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ - "once_cell", + "hermit-abi 0.3.9", + "libc", + "windows-sys 0.48.0", ] [[package]] -name = "is-terminal" -version = "0.4.9" +name = "is-docker" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" +checksum = "928bae27f42bc99b60d9ac7334e3a21d10ad8f1835a4e12ec3ec0464765ed1b3" dependencies = [ - "hermit-abi", - "rustix", - "windows-sys 0.48.0", + "once_cell", ] [[package]] @@ -1736,47 +2209,34 @@ dependencies = [ ] [[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" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" dependencies = [ "either", ] [[package]] -name = "itoa" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" - -[[package]] -name = "jni" -version = "0.19.0" +name = "itertools" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6df18c2e3db7e453d3c6ac5b3e9d5182664d28788126d39b91f2d1e22b017ec" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" dependencies = [ - "cesu8", - "combine", - "jni-sys", - "log", - "thiserror", - "walkdir", + "either", ] [[package]] -name = "jni" -version = "0.20.0" +name = "itoa" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "039022cdf4d7b1cf548d31f60ae783138e5fd42013f6271049d7df7afadef96c" -dependencies = [ - "cesu8", - "combine", - "jni-sys", - "log", - "thiserror", - "walkdir", -] +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "jni" @@ -1802,27 +2262,24 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" [[package]] name = "jobserver" -version = "0.1.26" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" +checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" dependencies = [ "libc", ] [[package]] name = "jpeg-decoder" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e" -dependencies = [ - "rayon", -] +checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" [[package]] name = "js-sys" -version = "0.3.64" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" dependencies = [ "wasm-bindgen", ] @@ -1848,9 +2305,9 @@ dependencies = [ [[package]] name = "lazy_static" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "lazycell" @@ -1866,9 +2323,9 @@ checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" [[package]] name = "libc" -version = "0.2.148" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libdbus-sys" @@ -1880,13 +2337,34 @@ dependencies = [ ] [[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.7.4" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" +checksum = "e310b3a6b5907f99202fcdb4960ff45b93735d7c7d96b760fcff8db2dc0e103d" dependencies = [ "cfg-if", - "winapi", + "windows-targets 0.52.5", +] + +[[package]] +name = "libredox" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" +dependencies = [ + "bitflags 2.6.0", + "libc", ] [[package]] @@ -1906,15 +2384,21 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "linux-raw-sys" -version = "0.4.8" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" + +[[package]] +name = "linux-raw-sys" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3852614a3bd9ca9804678ba6be5e3b8ce76dfc902cae004e3e0c44051b6e88db" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "lock_api" -version = "0.4.10" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" dependencies = [ "autocfg", "scopeguard", @@ -1922,9 +2406,18 @@ dependencies = [ [[package]] name = "log" -version = "0.4.20" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" + +[[package]] +name = "loop9" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fae87c125b03c1d2c0150c90365d7d6bcc53fb73a9acaef207d2d065860f062" +dependencies = [ + "imgref", +] [[package]] name = "lru-cache" @@ -1946,9 +2439,9 @@ dependencies = [ [[package]] name = "mach2" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d0d1830bcd151a6fc4aea1369af235b36c1528fe976b8ff678683c9995eade8" +checksum = "19b955cdeb2a02b9117f121ce63aa52d08ade45de53e48fe6a38b39c10f6f709" dependencies = [ "libc", ] @@ -1969,25 +2462,44 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" [[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.6.4" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "memmap2" -version = "0.7.1" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f49388d20533534cd19360ad3d6a7dadc885944aa802ba3995040c5ec11288c6" +checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322" dependencies = [ "libc", ] [[package]] name = "memoffset" -version = "0.9.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" +dependencies = [ + "autocfg", +] + +[[package]] +name = "memoffset" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" dependencies = [ "autocfg", ] @@ -2000,9 +2512,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.7.1" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" dependencies = [ "adler", "simd-adler32", @@ -2010,15 +2522,15 @@ dependencies = [ [[package]] name = "ndk" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "451422b7e4718271c8b5b3aadf5adedba43dc76312454b387e98fae0fc951aa0" +checksum = "2076a31b7010b17a38c01907c45b945e8f11495ee4dd588309718901b1f7a5b7" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", "jni-sys", + "log", "ndk-sys", "num_enum", - "raw-window-handle", "thiserror", ] @@ -2030,22 +2542,29 @@ checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" [[package]] name = "ndk-sys" -version = "0.4.1+23.1.7779620" +version = "0.5.0+25.2.9519653" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cf2aae958bd232cac5069850591667ad422d263686d75b52a065f9badeee5a3" +checksum = "8c196769dd60fd4f363e11d948139556a344e79d451aeb2fa2fd040738ef7691" dependencies = [ "jni-sys", ] [[package]] +name = "new_debug_unreachable" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" + +[[package]] name = "nix" -version = "0.24.3" +version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" +checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" dependencies = [ "bitflags 1.3.2", "cfg-if", "libc", + "memoffset 0.7.1", ] [[package]] @@ -2059,6 +2578,12 @@ dependencies = [ ] [[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" @@ -2070,53 +2595,57 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.4.4" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" dependencies = [ - "autocfg", "num-integer", "num-traits", "rand", ] [[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + +[[package]] name = "num-derive" -version = "0.3.3" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" +checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.68", ] [[package]] name = "num-integer" -version = "0.1.45" +version = "0.1.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" dependencies = [ - "autocfg", "num-traits", ] [[package]] name = "num-rational" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" +checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824" dependencies = [ - "autocfg", + "num-bigint", "num-integer", "num-traits", ] [[package]] name = "num-traits" -version = "0.2.16" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", ] @@ -2127,36 +2656,36 @@ version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi", + "hermit-abi 0.3.9", "libc", ] [[package]] name = "num_enum" -version = "0.5.11" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9" +checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845" dependencies = [ "num_enum_derive", ] [[package]] name = "num_enum_derive" -version = "0.5.11" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" +checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.68", ] [[package]] name = "num_threads" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" +checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9" dependencies = [ "libc", ] @@ -2171,12 +2700,46 @@ dependencies = [ ] [[package]] +name = "objc-sys" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310" + +[[package]] +name = "objc2" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46a785d4eeff09c14c487497c162e92766fbb3e4059a71840cecc03d9a50b804" +dependencies = [ + "objc-sys", + "objc2-encode", +] + +[[package]] +name = "objc2-encode" +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.6.0", + "block2", + "libc", + "objc2", +] + +[[package]] name = "oboe" -version = "0.5.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8868cc237ee02e2d9618539a23a8d228b9bb3fc2e7a5b11eed3831de77c395d0" +checksum = "e8b61bebd49e5d43f5f8cc7ee2891c16e0f41ec7954d36bcb6c14c5e0de867fb" dependencies = [ - "jni 0.20.0", + "jni", "ndk", "ndk-context", "num-derive", @@ -2186,24 +2749,24 @@ dependencies = [ [[package]] name = "oboe-sys" -version = "0.5.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f44155e7fb718d3cfddcf70690b2b51ac4412f347cd9e4fbe511abe9cd7b5f2" +checksum = "6c8bb09a4a2b1d668170cfe0a7d5bc103f8999fb316c98099b6a9939c9f2e79d" dependencies = [ "cc", ] [[package]] name = "once_cell" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "open" -version = "5.0.0" +version = "5.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfabf1927dce4d6fdf563d63328a0a506101ced3ec780ca2135747336c98cef8" +checksum = "9d2c909a3fce3bd80efef4cd1c6c056bd9376a8fe06fcfdbebaf32cb485a7e37" dependencies = [ "is-wsl", "libc", @@ -2211,6 +2774,16 @@ dependencies = [ ] [[package]] +name = "ordered-stream" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aa2b01e1d916879f73a53d01d1d6cee68adbb31d6d9177a8cfce093cced1d50" +dependencies = [ + "futures-core", + "pin-project-lite", +] + +[[package]] name = "overload" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2270,10 +2843,16 @@ dependencies = [ ] [[package]] +name = "parking" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" + +[[package]] name = "parking_lot" -version = "0.12.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ "lock_api", "parking_lot_core", @@ -2281,34 +2860,34 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.8" +version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.3.5", + "redox_syscall", "smallvec", - "windows-targets 0.48.5", + "windows-targets 0.52.5", ] [[package]] -name = "pathdiff" -version = "0.2.1" +name = "paste" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] -name = "peeking_take_while" -version = "0.1.2" +name = "pathdiff" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" +checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" [[package]] name = "percent-encoding" -version = "2.3.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "piet" @@ -2316,7 +2895,7 @@ version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e381186490a3e2017a506d62b759ea8eaf4be14666b13ed53973e8ae193451b1" dependencies = [ - "image", + "image 0.24.9", "kurbo", "unic-bidi", ] @@ -2362,7 +2941,7 @@ checksum = "a819b41d2ddb1d8abf3e45e49422f866cba281b4abb5e2fb948bba06e2c3d3f7" dependencies = [ "associative-cache", "core-foundation", - "core-foundation-sys 0.8.4", + "core-foundation-sys", "core-graphics", "core-text", "foreign-types", @@ -2399,9 +2978,9 @@ dependencies = [ [[package]] name = "pin-project-lite" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" [[package]] name = "pin-utils" @@ -2410,10 +2989,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] +name = "piper" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae1d5c74c9876f070d3e8fd503d748c7d974c3e48da8f41350fa5222ef9b4391" +dependencies = [ + "atomic-waker", + "fastrand 2.1.0", + "futures-io", +] + +[[package]] name = "pkg-config" -version = "0.3.27" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] name = "platform-dirs" @@ -2426,9 +3016,9 @@ dependencies = [ [[package]] name = "png" -version = "0.17.10" +version = "0.17.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd75bf2d8dd3702b9707cdbc56a5b9ef42cec752eb8b3bafc01234558442aa64" +checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1" dependencies = [ "bitflags 1.3.2", "crc32fast", @@ -2438,6 +3028,49 @@ dependencies = [ ] [[package]] +name = "polling" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" +dependencies = [ + "autocfg", + "bitflags 1.3.2", + "cfg-if", + "concurrent-queue", + "libc", + "log", + "pin-project-lite", + "windows-sys 0.48.0", +] + +[[package]] +name = "polling" +version = "3.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3ed00ed3fbf728b5816498ecd316d1716eecaced9c0c8d2c5a6740ca214985b" +dependencies = [ + "cfg-if", + "concurrent-queue", + "hermit-abi 0.4.0", + "pin-project-lite", + "rustix 0.38.34", + "tracing", + "windows-sys 0.52.0", +] + +[[package]] +name = "pollster" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22686f4785f02a4fcc856d3b3bb19bf6c8160d103f7a99cc258bddd0251dc7f2" + +[[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" @@ -2450,7 +3083,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" dependencies = [ "once_cell", - "toml_edit", + "toml_edit 0.19.15", +] + +[[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]] @@ -2478,18 +3120,37 @@ dependencies = [ ] [[package]] -name = "proc-macro-hack" -version = "0.5.20+deprecated" +name = "proc-macro2" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +dependencies = [ + "unicode-ident", +] [[package]] -name = "proc-macro2" -version = "1.0.67" +name = "prodash" +version = "28.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "744a264d26b88a6a7e37cbad97953fa233b94d585236310bcbc88474b4092d79" + +[[package]] +name = "profiling" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328" +checksum = "43d84d1d7a6ac92673717f9f6d1518374ef257669c24ebc5ac25d5033828be58" dependencies = [ - "unicode-ident", + "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.68", ] [[package]] @@ -2536,7 +3197,7 @@ dependencies = [ "tempfile", "ureq", "url", - "windows 0.51.1", + "windows 0.57.0", ] [[package]] @@ -2549,8 +3210,8 @@ dependencies = [ "druid-shell", "env_logger", "fs_extra", - "image", - "itertools", + "image 0.25.1", + "itertools 0.13.0", "log", "lru-cache", "once_cell", @@ -2590,6 +3251,12 @@ dependencies = [ ] [[package]] +name = "quick-error" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" + +[[package]] name = "quick-protobuf" version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2600,9 +3267,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.33" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] @@ -2648,9 +3315,59 @@ dependencies = [ [[package]] name = "rangemap" -version = "1.4.0" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f60fcc7d6849342eff22c4350c8b9a989ee8ceabc4b481253e8946b9fe83d684" + +[[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.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "977b1e897f9d764566891689e642653e5ed90c6895106acd005eb4c1d0203991" +checksum = "67376f469e7e7840d0040bbf4b9b3334005bb167f814621326e4c7ab8cd6e944" +dependencies = [ + "avif-serialize", + "imgref", + "loop9", + "quick-error", + "rav1e", + "rayon", + "rgb", +] [[package]] name = "raw-window-handle" @@ -2660,9 +3377,9 @@ checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" [[package]] name = "rayon" -version = "1.8.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" dependencies = [ "either", "rayon-core", @@ -2670,9 +3387,9 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.12.0" +version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" dependencies = [ "crossbeam-deque", "crossbeam-utils", @@ -2686,38 +3403,29 @@ checksum = "56cf8381505b60ae18a4097f1d0be093287ca3bf4fbb23d36ac5ad3bba335daa" [[package]] name = "redox_syscall" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "redox_syscall" -version = "0.3.5" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", ] [[package]] name = "redox_users" -version = "0.4.3" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" dependencies = [ "getrandom", - "redox_syscall 0.2.16", + "libredox", "thiserror", ] [[package]] name = "regex" -version = "1.9.6" +version = "1.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebee201405406dbf528b8b672104ae6d6d63e6d118cb10e4d51abbc7b58044ff" +checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" dependencies = [ "aho-corasick", "memchr", @@ -2727,9 +3435,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.9" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59b23e92ee4318893fa3fe3e6fb365258efbfe6ac6ab30f090cdcbb7aa37efa9" +checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" dependencies = [ "aho-corasick", "memchr", @@ -2738,23 +3446,32 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.7.5" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" + +[[package]] +name = "rgb" +version = "0.8.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" +checksum = "a7439be6844e40133eda024efd85bf07f59d0dd2f59b10c00dd6cfb92cc5c741" +dependencies = [ + "bytemuck", +] [[package]] name = "ring" -version = "0.16.20" +version = "0.17.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" +checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" dependencies = [ "cc", + "cfg-if", + "getrandom", "libc", - "once_cell", - "spin 0.5.2", + "spin", "untrusted", - "web-sys", - "winapi", + "windows-sys 0.52.0", ] [[package]] @@ -2774,44 +3491,67 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.15" +version = "0.37.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2f9da0cbd88f9f09e7814e388301c8414c51c62aa6ce1e4b5c551d49d96e531" +checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" dependencies = [ - "bitflags 2.4.0", + "bitflags 1.3.2", "errno", + "io-lifetimes", "libc", - "linux-raw-sys", + "linux-raw-sys 0.3.8", "windows-sys 0.48.0", ] [[package]] +name = "rustix" +version = "0.38.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" +dependencies = [ + "bitflags 2.6.0", + "errno", + "libc", + "linux-raw-sys 0.4.14", + "windows-sys 0.52.0", +] + +[[package]] name = "rustls" -version = "0.21.7" +version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8" +checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" dependencies = [ "log", "ring", + "rustls-pki-types", "rustls-webpki", - "sct", + "subtle", + "zeroize", ] [[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.101.6" +version = "0.102.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c7d5dece342910d9ba34d259310cae3e0154b873b35408b787b59bce53d34fe" +checksum = "ff448f7e92e913c4b7d4c6d8e4540a1724b319b4152b8aef6d4cf8339712b33e" dependencies = [ "ring", + "rustls-pki-types", "untrusted", ] [[package]] name = "ryu" -version = "1.0.15" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "same-file" @@ -2829,52 +3569,51 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] -name = "sct" -version = "0.7.0" +name = "self_cell" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" +checksum = "e14e4d63b804dc0c7ec4a1e52bcb63f02c7ac94476755aa579edac21e01f915d" dependencies = [ - "ring", - "untrusted", + "self_cell 1.0.4", ] [[package]] name = "self_cell" -version = "0.10.2" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ef965a420fe14fdac7dd018862966a4c14094f900e1650bbc71ddd7d580c8af" +checksum = "d369a96f978623eb3dc28807c4852d6cc617fed53da5d3c400feff1ef34a714a" [[package]] name = "semver" -version = "1.0.19" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad977052201c6de01a8ef2aa3378c4bd23217a056337d1d6da40468d267a4fb0" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.188" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" +checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.188" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" +checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.68", ] [[package]] name = "serde_json" -version = "1.0.107" +version = "1.0.120" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" +checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5" dependencies = [ "itoa", "ryu", @@ -2882,10 +3621,21 @@ dependencies = [ ] [[package]] +name = "serde_repr" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] name = "serde_spanned" -version = "0.6.3" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" +checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" dependencies = [ "serde", ] @@ -2902,6 +3652,17 @@ dependencies = [ ] [[package]] +name = "sha1" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] name = "sha1_smol" version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2918,18 +3679,27 @@ dependencies = [ [[package]] name = "sharded-slab" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1b21f559e07218024e7e9f90f96f601825397de0e25420135f7f952453fed0b" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" dependencies = [ "lazy_static", ] [[package]] name = "shlex" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + +[[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" @@ -2938,6 +3708,15 @@ 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 = "sized-chunks" version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2958,9 +3737,19 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.1" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" + +[[package]] +name = "socket2" +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" +dependencies = [ + "libc", + "winapi", +] [[package]] name = "socks" @@ -2975,28 +3764,24 @@ dependencies = [ [[package]] name = "souvlaki" -version = "0.6.1" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "951a075f224d8c87bb62a08c9c27a373fd6d453407e89cae00a25e2eac74ef51" +checksum = "ea4544ba17df4ac03d6503ae8abba19adad3ae89203a425945dc4c12d7790bfa" dependencies = [ "block", "cocoa", "core-graphics", - "dbus", - "dbus-crossroads", "dispatch", "objc", + "pollster", + "thiserror", "windows 0.44.0", + "zbus", + "zvariant", ] [[package]] name = "spin" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" - -[[package]] -name = "spin" version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" @@ -3005,16 +3790,22 @@ dependencies = [ ] [[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[package]] name = "subtle" -version = "2.5.0" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "symphonia" -version = "0.5.3" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62e48dba70095f265fdb269b99619b95d04c89e619538138383e63310b14d941" +checksum = "815c942ae7ee74737bb00f965fa5b5a2ac2ce7b6c01c0cc169bbeaf7abd5f5a9" dependencies = [ "lazy_static", "symphonia-bundle-mp3", @@ -3026,11 +3817,10 @@ dependencies = [ [[package]] name = "symphonia-bundle-mp3" -version = "0.5.3" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f31d7fece546f1e6973011a9eceae948133bbd18fd3d52f6073b1e38ae6368a" +checksum = "c01c2aae70f0f1fb096b6f0ff112a930b1fb3626178fba3ae68b09dce71706d4" dependencies = [ - "bitflags 1.3.2", "lazy_static", "log", "symphonia-core", @@ -3039,9 +3829,9 @@ dependencies = [ [[package]] name = "symphonia-codec-vorbis" -version = "0.5.3" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3953397e3506aa01350c4205817e4f95b58d476877a42f0458d07b665749e203" +checksum = "5a98765fb46a0a6732b007f7e2870c2129b6f78d87db7987e6533c8f164a9f30" dependencies = [ "log", "symphonia-core", @@ -3050,9 +3840,9 @@ dependencies = [ [[package]] name = "symphonia-core" -version = "0.5.3" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7c73eb88fee79705268cc7b742c7bc93a7b76e092ab751d0833866970754142" +checksum = "798306779e3dc7d5231bd5691f5a813496dc79d3f56bf82e25789f2094e022c3" dependencies = [ "arrayvec", "bitflags 1.3.2", @@ -3063,9 +3853,9 @@ dependencies = [ [[package]] name = "symphonia-format-ogg" -version = "0.5.3" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bf1a00ccd11452d44048a0368828040f778ae650418dbd9d8765b7ee2574c8d" +checksum = "ada3505789516bcf00fc1157c67729eded428b455c27ca370e41f4d785bfa931" dependencies = [ "log", "symphonia-core", @@ -3075,9 +3865,9 @@ dependencies = [ [[package]] name = "symphonia-metadata" -version = "0.5.3" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89c3e1937e31d0e068bbe829f66b2f2bfaa28d056365279e0ef897172c3320c0" +checksum = "bc622b9841a10089c5b18e99eb904f4341615d5aa55bbf4eedde1be721a4023c" dependencies = [ "encoding_rs", "lazy_static", @@ -3087,9 +3877,9 @@ dependencies = [ [[package]] name = "symphonia-utils-xiph" -version = "0.5.3" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a450ca645b80d69aff8b35576cbfdc7f20940b29998202aab910045714c951f8" +checksum = "484472580fa49991afda5f6550ece662237b00c6f562c7d9638d1b086ed010fe" dependencies = [ "symphonia-core", "symphonia-metadata", @@ -3108,9 +3898,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.37" +version = "2.0.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7303ef2c05cd654186cb250d29049a24840ca25d2747c25c0381c8d9e2f582e8" +checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9" dependencies = [ "proc-macro2", "quote", @@ -3119,70 +3909,60 @@ dependencies = [ [[package]] name = "system-deps" -version = "6.1.1" +version = "6.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30c2de8a4d8f4b823d634affc9cd2a74ec98c53a756f317e529a48046cbf71f3" +checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349" dependencies = [ "cfg-expr", - "heck 0.4.1", + "heck 0.5.0", "pkg-config", - "toml 0.7.8", + "toml 0.8.14", "version-compare", ] [[package]] name = "target-lexicon" -version = "0.12.11" +version = "0.12.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d0e916b1148c8e263850e1ebcbd046f333e0683c724876bb0da63ea4373dc8a" +checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" [[package]] name = "tempfile" -version = "3.8.0" +version = "3.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" dependencies = [ "cfg-if", - "fastrand", - "redox_syscall 0.3.5", - "rustix", - "windows-sys 0.48.0", -] - -[[package]] -name = "termcolor" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6093bad37da69aab9d123a8091e4be0aa4a03e4d601ec641c327398315f62b64" -dependencies = [ - "winapi-util", + "fastrand 2.1.0", + "rustix 0.38.34", + "windows-sys 0.52.0", ] [[package]] name = "thiserror" -version = "1.0.49" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1177e8c6d7ede7afde3585fd2513e611227efd6481bd78d2e82ba1ce16557ed4" +checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.49" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc" +checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.68", ] [[package]] name = "thread_local" -version = "1.1.7" +version = "1.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" +checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" dependencies = [ "cfg-if", "once_cell", @@ -3199,9 +3979,9 @@ dependencies = [ [[package]] name = "tiff" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d172b0f4d3fba17ba89811858b9d3d97f928aece846475bbda076ca46736211" +checksum = "ba1310fcea54c6a9a4fd1aad794ecc02c31682f6bfbecdf460bf19533eed1e3e" dependencies = [ "flate2", "jpeg-decoder", @@ -3210,14 +3990,16 @@ dependencies = [ [[package]] name = "time" -version = "0.3.29" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "426f806f4089c493dcac0d24c29c01e2c38baf8e30f1b716ee37e83d200b18fe" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ "deranged", "itoa", "libc", + "num-conv", "num_threads", + "powerfmt", "serde", "time-core", "time-macros", @@ -3237,27 +4019,28 @@ checksum = "3e32d019b4f7c100bcd5494e40a27119d45b71fba2b07a4684153129279a4647" [[package]] name = "time-macros" -version = "0.2.15" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" dependencies = [ + "num-conv", "time-core", ] [[package]] name = "tinystr" -version = "0.7.3" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b07bb54ef1f8ff27564b08b861144d3b8d40263efe07684f64987f4c0d044e3e" +checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" dependencies = [ "displaydoc", ] [[package]] name = "tinyvec" -version = "1.6.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +checksum = "c55115c6fbe2d2bef26eb09ad74bde02d8255476fc0c7b515ef09fbb35742d82" dependencies = [ "tinyvec_macros", ] @@ -3279,21 +4062,21 @@ dependencies = [ [[package]] name = "toml" -version = "0.7.8" +version = "0.8.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" +checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit", + "toml_edit 0.22.14", ] [[package]] name = "toml_datetime" -version = "0.6.3" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" +checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" dependencies = [ "serde", ] @@ -3305,19 +4088,40 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ "indexmap", + "toml_datetime", + "winnow 0.5.40", +] + +[[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", + "winnow 0.6.13", ] [[package]] name = "tracing" -version = "0.1.37" +version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ - "cfg-if", "pin-project-lite", "tracing-attributes", "tracing-core", @@ -3325,29 +4129,29 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.26" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.68", ] [[package]] name = "tracing-core" -version = "0.1.31" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" dependencies = [ "once_cell", ] [[package]] name = "tracing-subscriber" -version = "0.3.17" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" +checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" dependencies = [ "nu-ansi-term", "sharded-slab", @@ -3368,9 +4172,9 @@ dependencies = [ [[package]] name = "type-map" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6d3364c5e96cb2ad1603037ab253ddd34d7fb72a58bdddf4b7350760fc69a46" +checksum = "deb68604048ff8fa93347f02441e4487594adc20bb8a084f9e564d2b827a0a9f" dependencies = [ "rustc-hash", ] @@ -3382,6 +4186,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] +name = "uds_windows" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9" +dependencies = [ + "memoffset 0.9.1", + "tempfile", + "winapi", +] + +[[package]] name = "unic-bidi" version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3414,18 +4229,18 @@ checksum = "80d7ff825a6a654ee85a63e80f92f054f904f21e7d12da4e22f9834a4aaa35bc" [[package]] name = "unic-langid" -version = "0.9.1" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "398f9ad7239db44fd0f80fe068d12ff22d78354080332a5077dc6f52f14dcf2f" +checksum = "23dd9d1e72a73b25e07123a80776aae3e7b0ec461ef94f9151eed6ec88005a44" dependencies = [ "unic-langid-impl", ] [[package]] name = "unic-langid-impl" -version = "0.9.1" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e35bfd2f2b8796545b55d7d3fd3e89a0613f68a0d1c8bc28cb7ff96b411a35ff" +checksum = "0a5422c1f65949306c99240b81de9f3f15929f5a8bfe05bb44b034cc8bf593e5" dependencies = [ "tinystr", ] @@ -3452,15 +4267,15 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.13" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" [[package]] name = "unicode-bom" -version = "2.0.2" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98e90c70c9f0d4d1ee6d0a7d04aa06cb9bbd53d8cfbdd62a0269a7c2eb640552" +checksum = "7eec5d1121208364f6793f7d2e222bf75a915c19557537745b195b253dd64217" [[package]] name = "unicode-ident" @@ -3470,36 +4285,37 @@ checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" dependencies = [ "tinyvec", ] [[package]] name = "unicode-segmentation" -version = "1.10.1" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" +checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" [[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.8.0" +version = "2.9.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5ccd538d4a604753ebc2f17cd9946e89b77bf87f6a8e2309667c6f2e87855e3" +checksum = "d11a831e3c0b56e438a28308e7c810799e3c118417f342d30ecec080105395cd" dependencies = [ "base64", "flate2", "log", "once_cell", "rustls", + "rustls-pki-types", "rustls-webpki", "serde", "serde_json", @@ -3510,9 +4326,9 @@ dependencies = [ [[package]] name = "url" -version = "2.4.1" +version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" dependencies = [ "form_urlencoded", "idna", @@ -3526,10 +4342,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "14706d2a800ee8ff38c1d3edb873cd616971ea59eb7c0d046bb44ef59b06a1ae" [[package]] +name = "utf8parse" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" + +[[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 = "version-compare" -version = "0.1.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "579a42fc0b8e0c63b76519a339be31bed574929511fa53c1a3acae26eb258f29" +checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b" [[package]] name = "version_check" @@ -3538,10 +4371,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] +name = "waker-fn" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "317211a0dc0ceedd78fb2ca9a44aed3d7b9b26f81870d485c07122b4350673b7" + +[[package]] name = "walkdir" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" dependencies = [ "same-file", "winapi-util", @@ -3555,9 +4394,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.87" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -3565,24 +4404,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.87" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.68", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.37" +version = "0.4.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" +checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" dependencies = [ "cfg-if", "js-sys", @@ -3592,9 +4431,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.87" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -3602,28 +4441,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.87" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.68", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.87" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "web-sys" -version = "0.3.64" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" +checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" dependencies = [ "js-sys", "wasm-bindgen", @@ -3631,32 +4470,36 @@ dependencies = [ [[package]] name = "webbrowser" -version = "0.8.11" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2c79b77f525a2d670cb40619d7d9c673d09e0666f72c591ebd7861f84a87e57" +checksum = "425ba64c1e13b1c6e8c5d2541c8fac10022ca584f33da781db01b5756aef1f4e" dependencies = [ + "block2", "core-foundation", "home", - "jni 0.21.1", + "jni", "log", "ndk-context", - "objc", - "raw-window-handle", + "objc2", + "objc2-foundation", "url", "web-sys", ] [[package]] name = "webpki-roots" -version = "0.25.2" +version = "0.26.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc" +checksum = "bd7c23921eeb1713a4e851530e9b9756e4fb0e89978582942612524cf09f01cd" +dependencies = [ + "rustls-pki-types", +] [[package]] name = "weezl" -version = "0.1.7" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" +checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" [[package]] name = "winapi" @@ -3676,11 +4519,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.6" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" dependencies = [ - "winapi", + "windows-sys 0.52.0", ] [[package]] @@ -3700,39 +4543,84 @@ dependencies = [ [[package]] name = "windows" -version = "0.46.0" +version = "0.54.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdacb41e6a96a052c6cb63a144f24900236121c6f63f4f8219fef5977ecb0c25" +checksum = "9252e5725dbed82865af151df558e754e4a3c2c30818359eb17465f1346a1b49" dependencies = [ - "windows-targets 0.42.2", + "windows-core 0.54.0", + "windows-targets 0.52.5", ] [[package]] name = "windows" -version = "0.48.0" +version = "0.57.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +checksum = "12342cb4d8e3b046f3d80effd474a7a02447231330ef77d71daa6fbc40681143" dependencies = [ - "windows-targets 0.48.5", + "windows-core 0.57.0", + "windows-targets 0.52.5", ] [[package]] -name = "windows" -version = "0.51.1" +name = "windows-core" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-core", - "windows-targets 0.48.5", + "windows-targets 0.52.5", ] [[package]] name = "windows-core" -version = "0.51.1" +version = "0.54.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" +checksum = "12661b9c89351d684a50a8a643ce5f608e20243b9fb84687800163429f161d65" dependencies = [ - "windows-targets 0.48.5", + "windows-result", + "windows-targets 0.52.5", +] + +[[package]] +name = "windows-core" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2ed2439a290666cd67ecce2b0ffaad89c2a56b976b736e6ece670297897832d" +dependencies = [ + "windows-implement", + "windows-interface", + "windows-result", + "windows-targets 0.52.5", +] + +[[package]] +name = "windows-implement" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "windows-interface" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.68", +] + +[[package]] +name = "windows-result" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8" +dependencies = [ + "windows-targets 0.52.5", ] [[package]] @@ -3754,6 +4642,15 @@ dependencies = [ ] [[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.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3784,6 +4681,22 @@ dependencies = [ ] [[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.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3796,6 +4709,12 @@ 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.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3808,6 +4727,12 @@ 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.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3820,6 +4745,18 @@ 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.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3832,6 +4769,12 @@ 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.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3844,6 +4787,12 @@ 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.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3856,6 +4805,12 @@ 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.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3868,10 +4823,25 @@ 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.5.15" +version = "0.6.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc" +checksum = "59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1" dependencies = [ "memchr", ] @@ -3895,12 +4865,100 @@ dependencies = [ ] [[package]] +name = "xdg-home" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca91dcf8f93db085f3a0a29358cd0b9d670915468f4290e8b85d118a34211ab8" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] name = "xi-unicode" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a67300977d3dc3f8034dae89778f502b6ba20b269527b3223ba59c0cf393bb8a" [[package]] +name = "zbus" +version = "3.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "675d170b632a6ad49804c8cf2105d7c31eddd3312555cffd4b740e08e97c25e6" +dependencies = [ + "async-broadcast", + "async-executor", + "async-fs", + "async-io 1.13.0", + "async-lock 2.8.0", + "async-process", + "async-recursion", + "async-task", + "async-trait", + "blocking", + "byteorder", + "derivative", + "enumflags2", + "event-listener 2.5.3", + "futures-core", + "futures-sink", + "futures-util", + "hex", + "nix", + "once_cell", + "ordered-stream", + "rand", + "serde", + "serde_repr", + "sha1", + "static_assertions", + "tracing", + "uds_windows", + "winapi", + "xdg-home", + "zbus_macros", + "zbus_names", + "zvariant", +] + +[[package]] +name = "zbus_macros" +version = "3.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7131497b0f887e8061b430c530240063d33bf9455fa34438f388a245da69e0a5" +dependencies = [ + "proc-macro-crate 1.3.1", + "proc-macro2", + "quote", + "regex", + "syn 1.0.109", + "zvariant_utils", +] + +[[package]] +name = "zbus_names" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "437d738d3750bed6ca9b8d423ccc7a8eb284f6b1d6d4e225a0e4e6258d864c8d" +dependencies = [ + "serde", + "static_assertions", + "zvariant", +] + +[[package]] +name = "zeroize" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" + +[[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" @@ -3908,3 +4966,50 @@ 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", +] + +[[package]] +name = "zvariant" +version = "3.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4eef2be88ba09b358d3b58aca6e41cd853631d44787f319a1383ca83424fb2db" +dependencies = [ + "byteorder", + "enumflags2", + "libc", + "serde", + "static_assertions", + "zvariant_derive", +] + +[[package]] +name = "zvariant_derive" +version = "3.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37c24dc0bed72f5f90d1f8bb5b07228cbf63b3c6e9f82d82559d4bae666e7ed9" +dependencies = [ + "proc-macro-crate 1.3.1", + "proc-macro2", + "quote", + "syn 1.0.109", + "zvariant_utils", +] + +[[package]] +name = "zvariant_utils" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7234f0d811589db492d16893e3f21e8e2fd282e6d01b0cddee310322062cc200" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] diff --git a/pkgs/applications/audio/psst/default.nix b/pkgs/applications/audio/psst/default.nix index 2bd8573ab5807..6a6f7efd612ee 100644 --- a/pkgs/applications/audio/psst/default.nix +++ b/pkgs/applications/audio/psst/default.nix @@ -16,19 +16,19 @@ let in rustPlatform.buildRustPackage rec { pname = "psst"; - version = "unstable-2024-05-26"; + version = "unstable-2024-08-19"; src = fetchFromGitHub { owner = "jpochyla"; repo = pname; - rev = "6c9cd3f91653764b832ea5136cda04c9e0f8fe50"; - hash = "sha256-bttF+yX1BT4t1TUmJBs0OZuPD+6uPxHlb8YzRIVNKTQ="; + rev = "11bef15e66a3c9b0b991207d09a67c071b3dda02"; + hash = "sha256-lKxWIUDouUUul7CpuTy30z/cLJAjFE9e0J1zyZ/PnIo="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "cubeb-0.10.3" = "sha256-gV1KHOhq678E/Rj+u8jX9Fw+TepPwuZdV5y/D+Iby+o="; + "cubeb-0.13.0" = "sha256-l1JkKlq2qvvLwNLJ2DrIpAFYcRQyd6F8pAflmtnaXhU="; "druid-0.8.3" = "sha256-hTB9PQf2TAhcLr64VjjQIr18mczwcNogDSRSN5dQULA="; "druid-enums-0.1.0" = "sha256-KJvAgKxicx/g+4QRZq3iHt6MGVQbfOpyN+EhS6CyDZk="; }; diff --git a/pkgs/applications/audio/psst/make-build-reproducible.patch b/pkgs/applications/audio/psst/make-build-reproducible.patch index 17a93ef76caed..866d082175901 100644 --- a/pkgs/applications/audio/psst/make-build-reproducible.patch +++ b/pkgs/applications/audio/psst/make-build-reproducible.patch @@ -1,9 +1,9 @@ diff --git a/psst-core/build.rs b/psst-core/build.rs deleted file mode 100644 -index 1057827..0000000 +index e05191d..0000000 --- a/psst-core/build.rs +++ /dev/null -@@ -1,37 +0,0 @@ +@@ -1,39 +0,0 @@ -use std::{env, fs, io::Write}; - -fn main() { @@ -36,22 +36,25 @@ index 1057827..0000000 - // And construct the http-style url - remote_url = format!("https://{domain}/{path}"); - } -- remote_url = remote_url.trim_end_matches(".git").to_owned(); +- let trimmed_url = remote_url.trim_end_matches(".git"); +- remote_url.clone_from(&String::from(trimmed_url)); +- - let outfile = format!("{}/remote-url.txt", outdir); - let mut file = fs::File::create(outfile).unwrap(); - write!(file, r#""{}""#, remote_url).ok(); -} diff --git a/psst-core/src/lib.rs b/psst-core/src/lib.rs -index fcbd491..2d71ee3 100644 +index fcbd491..8f6e6f0 100644 --- a/psst-core/src/lib.rs +++ b/psst-core/src/lib.rs -@@ -3,8 +3,8 @@ +@@ -2,9 +2,9 @@ + use git_version::git_version; -pub const GIT_VERSION: &str = git_version!(); -pub const BUILD_TIME: &str = include!(concat!(env!("OUT_DIR"), "/build-time.txt")); -pub const REMOTE_URL: &str = include!(concat!(env!("OUT_DIR"), "/remote-url.txt")); -+pub const GIT_VERSION: &str = "6c9cd3f91653764b832ea5136cda04c9e0f8fe50"; ++pub const GIT_VERSION: &str = "11bef15e66a3c9b0b991207d09a67c071b3dda02"; +pub const BUILD_TIME: &str = "1970-01-01 00:00:00"; +pub const REMOTE_URL: &str = "https://github.com/jpochyla/psst"; diff --git a/pkgs/applications/audio/pt2-clone/default.nix b/pkgs/applications/audio/pt2-clone/default.nix index 98ff39c0f5b47..0cbb64e6dcad6 100644 --- a/pkgs/applications/audio/pt2-clone/default.nix +++ b/pkgs/applications/audio/pt2-clone/default.nix @@ -8,23 +8,27 @@ stdenv.mkDerivation (finalAttrs: { pname = "pt2-clone"; - version = "1.69.2"; + version = "1.70"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "pt2-clone"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-Vy8b9rbYM/bK/mCUW4V4rPeAmoBN/wn7iVBANSboL2Q="; + sha256 = "sha256-oGdgvyVIqM4YVxyr5DFBJ+YLtH95vqbNv0arD9yskdo="; }; nativeBuildInputs = [ cmake ]; - buildInputs = [ SDL2 ] ++ lib.optional stdenv.isLinux alsa-lib; + buildInputs = [ SDL2 ] ++ lib.optional stdenv.hostPlatform.isLinux alsa-lib; postInstall = '' install -Dm444 "$src/release/other/Freedesktop.org Resources/ProTracker 2 clone.desktop" \ - -t $out/share/applications + $out/share/applications/pt2-clone.desktop install -Dm444 "$src/release/other/Freedesktop.org Resources/ProTracker 2 clone.png" \ - -t $out/share/icons/hicolor/512x512/apps + $out/share/icons/hicolor/512x512/apps/pt2-clone.png + # gtk-update-icon-cache does not like whitespace. Note that removing this + # will not make the build fail, but it will make the NixOS test fail. + substituteInPlace $out/share/applications/pt2-clone.desktop \ + --replace-fail "Icon=ProTracker 2 clone" Icon=pt2-clone ''; passthru.tests = { diff --git a/pkgs/applications/audio/puddletag/default.nix b/pkgs/applications/audio/puddletag/default.nix index 97ea40d7438b4..09ed89bb2ba21 100644 --- a/pkgs/applications/audio/puddletag/default.nix +++ b/pkgs/applications/audio/puddletag/default.nix @@ -45,7 +45,6 @@ python3.pkgs.buildPythonApplication rec { ]; nativeBuildInputs = [ - python3.pkgs.pythonRelaxDepsHook wrapQtAppsHook ]; diff --git a/pkgs/applications/audio/pulseeffects-legacy/default.nix b/pkgs/applications/audio/pulseeffects-legacy/default.nix index 1fb71e05d2f20..6daaf094b3341 100644 --- a/pkgs/applications/audio/pulseeffects-legacy/default.nix +++ b/pkgs/applications/audio/pulseeffects-legacy/default.nix @@ -99,17 +99,12 @@ in stdenv.mkDerivation rec { ) ''; - # Meson is no longer able to pick up Boost automatically. - # https://github.com/NixOS/nixpkgs/issues/86131 - BOOST_INCLUDEDIR = "${lib.getDev boost}/include"; - BOOST_LIBRARYDIR = "${lib.getLib boost}/lib"; - meta = with lib; { description = "Limiter, compressor, reverberation, equalizer and auto volume effects for Pulseaudio applications"; mainProgram = "pulseeffects"; homepage = "https://github.com/wwmm/pulseeffects"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/audio/puredata/default.nix b/pkgs/applications/audio/puredata/default.nix index 44015fc48881e..5d1b11c4ef29e 100644 --- a/pkgs/applications/audio/puredata/default.nix +++ b/pkgs/applications/audio/puredata/default.nix @@ -25,9 +25,9 @@ stdenv.mkDerivation rec { buildInputs = [ fftw libjack2 - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ portaudio ]; @@ -35,9 +35,9 @@ stdenv.mkDerivation rec { "--enable-universal" "--enable-fftw" "--enable-jack" - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "--enable-alsa" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "--enable-portaudio" "--without-local-portaudio" "--disable-jack-framework" @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { homepage = "http://puredata.info"; license = licenses.bsd3; platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ goibhniu carlthome ]; + maintainers = with maintainers; [ carlthome ]; mainProgram = "pd"; changelog = "https://msp.puredata.info/Pd_documentation/x5.htm#s1"; }; diff --git a/pkgs/applications/audio/pwvucontrol/Cargo.lock b/pkgs/applications/audio/pwvucontrol/Cargo.lock index c07b91890643e..d3df103deeca7 100644 --- a/pkgs/applications/audio/pwvucontrol/Cargo.lock +++ b/pkgs/applications/audio/pwvucontrol/Cargo.lock @@ -4,56 +4,61 @@ version = 3 [[package]] name = "aho-corasick" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ "memchr", ] [[package]] +name = "annotate-snippets" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccaf7e9dfbb6ab22c82e473cd1a8a7bd313c19a5b7e40970f3d89ef5a5c9e81e" +dependencies = [ + "unicode-width", + "yansi-term", +] + +[[package]] name = "anyhow" -version = "1.0.77" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9d19de80eff169429ac1e9f48fffb163916b448a44e8e046186232046d9e1f9" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" [[package]] name = "autocfg" -version = "1.1.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "bindgen" -version = "0.66.1" +version = "0.69.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2b84e06fc203107bfbad243f4aba2af864eb7db3b1cf46ea0a023b0b433d2a7" +checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" dependencies = [ - "bitflags 2.4.1", + "annotate-snippets", + "bitflags", "cexpr", "clang-sys", + "itertools", "lazy_static", "lazycell", - "peeking_take_while", "proc-macro2", "quote", "regex", "rustc-hash", "shlex", - "syn 2.0.43", + "syn", ] [[package]] name = "bitflags" -version = "1.3.2" +version = "2.6.0" 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" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" [[package]] name = "bitmaps" @@ -69,23 +74,22 @@ checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" [[package]] name = "cairo-rs" -version = "0.18.3" +version = "0.19.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f33613627f0dea6a731b0605101fad59ba4f193a52c96c4687728d822605a8a1" +checksum = "b2ac2a4d0e69036cf0062976f6efcba1aaee3e448594e6514bb2ddf87acce562" dependencies = [ - "bitflags 2.4.1", + "bitflags", "cairo-sys-rs", "glib", "libc", - "once_cell", "thiserror", ] [[package]] name = "cairo-sys-rs" -version = "0.18.2" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "685c9fa8e590b8b3d678873528d83411db17242a73fccaed827770ea0fedda51" +checksum = "fd3bb3119664efbd78b5e6c93957447944f16bdbced84c17a9f41c7829b81e64" dependencies = [ "glib-sys", "libc", @@ -94,12 +98,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.83" +version = "1.0.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" -dependencies = [ - "libc", -] +checksum = "2755ff20a1d93490d26ba33a6f092a38a508398a5320df5d4b3014fcccce9410" [[package]] name = "cexpr" @@ -112,9 +113,9 @@ dependencies = [ [[package]] name = "cfg-expr" -version = "0.15.5" +version = "0.15.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03915af431787e6ffdcc74c645077518c6b6e01f80b761e0fbbfa288536311b3" +checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02" dependencies = [ "smallvec", "target-lexicon", @@ -128,9 +129,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "clang-sys" -version = "1.6.1" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f" +checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" dependencies = [ "glob", "libc", @@ -148,9 +149,18 @@ dependencies = [ [[package]] name = "cookie-factory" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "396de984970346b0d9e93d1415082923c679e5ae5c3ee3dcbd104f5610af126b" +checksum = "9885fa71e26b8ab7855e2ec7cae6e9b380edff76cd052e07c683a0319d51b3a2" +dependencies = [ + "futures", +] + +[[package]] +name = "either" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "equivalent" @@ -164,7 +174,7 @@ version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f" dependencies = [ - "memoffset 0.9.0", + "memoffset", "rustc_version", ] @@ -224,7 +234,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.43", + "syn", ] [[package]] @@ -259,22 +269,21 @@ dependencies = [ [[package]] name = "gdk-pixbuf" -version = "0.18.3" +version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "446f32b74d22c33b7b258d4af4ffde53c2bf96ca2e29abdf1a785fe59bd6c82c" +checksum = "624eaba126021103c7339b2e179ae4ee8cdab842daab419040710f38ed9f8699" dependencies = [ "gdk-pixbuf-sys", "gio", "glib", "libc", - "once_cell", ] [[package]] name = "gdk-pixbuf-sys" -version = "0.18.0" +version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9839ea644ed9c97a34d129ad56d38a25e6756f99f3a88e15cd39c20629caf7" +checksum = "4efa05a4f83c8cc50eb4d883787b919b85e5f1d8dd10b5a1df53bf5689782379" dependencies = [ "gio-sys", "glib-sys", @@ -285,9 +294,9 @@ dependencies = [ [[package]] name = "gdk4" -version = "0.7.3" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7edb019ad581f8ecf8ea8e4baa6df7c483a95b5a59be3140be6a9c3b0c632af6" +checksum = "db265c9dd42d6a371e09e52deab3a84808427198b86ac792d75fd35c07990a07" dependencies = [ "cairo-rs", "gdk-pixbuf", @@ -300,9 +309,9 @@ dependencies = [ [[package]] name = "gdk4-sys" -version = "0.7.2" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbab43f332a3cf1df9974da690b5bb0e26720ed09a228178ce52175372dcfef0" +checksum = "c9418fb4e8a67074919fe7604429c45aa74eb9df82e7ca529767c6d4e9dc66dd" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -337,9 +346,9 @@ dependencies = [ [[package]] name = "gio" -version = "0.18.4" +version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4fc8f532f87b79cbc51a79748f16a6828fb784be93145a322fa14d06d354c73" +checksum = "4c49f117d373ffcc98a35d114db5478bc223341cff53e39a5d6feced9e2ddffe" dependencies = [ "futures-channel", "futures-core", @@ -348,7 +357,6 @@ dependencies = [ "gio-sys", "glib", "libc", - "once_cell", "pin-project-lite", "smallvec", "thiserror", @@ -356,24 +364,24 @@ dependencies = [ [[package]] name = "gio-sys" -version = "0.18.1" +version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37566df850baf5e4cb0dfb78af2e4b9898d817ed9263d1090a2df958c64737d2" +checksum = "2cd743ba4714d671ad6b6234e8ab2a13b42304d0e13ab7eba1dcdd78a7d6d4ef" dependencies = [ "glib-sys", "gobject-sys", "libc", "system-deps", - "winapi", + "windows-sys", ] [[package]] name = "glib" -version = "0.18.4" +version = "0.19.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "951bbd7fdc5c044ede9f05170f05a3ae9479239c3afdfe2d22d537a3add15c4e" +checksum = "39650279f135469465018daae0ba53357942a5212137515777d5fdca74984a44" dependencies = [ - "bitflags 2.4.1", + "bitflags", "futures-channel", "futures-core", "futures-executor", @@ -386,30 +394,28 @@ dependencies = [ "libc", "log", "memchr", - "once_cell", "smallvec", "thiserror", ] [[package]] name = "glib-macros" -version = "0.18.3" +version = "0.19.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72793962ceece3863c2965d7f10c8786323b17c7adea75a515809fa20ab799a5" +checksum = "4429b0277a14ae9751350ad9b658b1be0abb5b54faa5bcdf6e74a3372582fad7" dependencies = [ "heck", - "proc-macro-crate 2.0.1", - "proc-macro-error", + "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.43", + "syn", ] [[package]] name = "glib-sys" -version = "0.18.1" +version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "063ce2eb6a8d0ea93d2bf8ba1957e78dbab6be1c2220dd3daca57d5a9d869898" +checksum = "5c2dc18d3a82b0006d470b13304fbbb3e0a9bd4884cf985a60a7ed733ac2c4a5" dependencies = [ "libc", "system-deps", @@ -423,9 +429,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "gobject-sys" -version = "0.18.0" +version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0850127b514d1c4a4654ead6dedadb18198999985908e6ffe4436f53c785ce44" +checksum = "2e697e252d6e0416fd1d9e169bda51c0f1c926026c39ca21fbe8b1bb5c3b8b9e" dependencies = [ "glib-sys", "libc", @@ -434,9 +440,9 @@ dependencies = [ [[package]] name = "graphene-rs" -version = "0.18.1" +version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b2228cda1505613a7a956cca69076892cfbda84fc2b7a62b94a41a272c0c401" +checksum = "f5fb86031d24d9ec0a2a15978fc7a65d545a2549642cf1eb7c3dda358da42bcf" dependencies = [ "glib", "graphene-sys", @@ -445,9 +451,9 @@ dependencies = [ [[package]] name = "graphene-sys" -version = "0.18.1" +version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc4144cee8fc8788f2a9b73dc5f1d4e1189d1f95305c4cb7bd9c1af1cfa31f59" +checksum = "2f530e0944bccba4b55065e9c69f4975ad691609191ebac16e13ab8e1f27af05" dependencies = [ "glib-sys", "libc", @@ -457,9 +463,9 @@ dependencies = [ [[package]] name = "gsk4" -version = "0.7.3" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d958e351d2f210309b32d081c832d7de0aca0b077aa10d88336c6379bd01f7e" +checksum = "7563884bf6939f4468e5d94654945bdd9afcaf8c3ba4c5dd17b5342b747221be" dependencies = [ "cairo-rs", "gdk4", @@ -472,9 +478,9 @@ dependencies = [ [[package]] name = "gsk4-sys" -version = "0.7.3" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12bd9e3effea989f020e8f1ff3fa3b8c63ba93d43b899c11a118868853a56d55" +checksum = "23024bf2636c38bbd1f822f58acc9d1c25b28da896ff0f291a1a232d4272b3dc" dependencies = [ "cairo-sys-rs", "gdk4-sys", @@ -488,9 +494,9 @@ dependencies = [ [[package]] name = "gtk4" -version = "0.7.3" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aeb51aa3e9728575a053e1f43543cd9992ac2477e1b186ad824fd4adfb70842" +checksum = "b04e11319b08af11358ab543105a9e49b0c491faca35e2b8e7e36bfba8b671ab" dependencies = [ "cairo-rs", "field-offset", @@ -509,23 +515,21 @@ dependencies = [ [[package]] name = "gtk4-macros" -version = "0.7.2" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d57ec49cf9b657f69a05bca8027cff0a8dfd0c49e812be026fc7311f2163832f" +checksum = "ec655a7ef88d8ce9592899deb8b2d0fa50bab1e6dd69182deb764e643c522408" dependencies = [ - "anyhow", - "proc-macro-crate 1.3.1", - "proc-macro-error", + "proc-macro-crate", "proc-macro2", "quote", - "syn 1.0.109", + "syn", ] [[package]] name = "gtk4-sys" -version = "0.7.3" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54d8c4aa23638ce9faa2caf7e2a27d4a1295af2155c8e8d28c4d4eeca7a65eb8" +checksum = "8c8aa86b7f85ea71d66ea88c1d4bae1cfacf51ca4856274565133838d77e57b5" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -542,15 +546,15 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.14.3" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" [[package]] name = "heck" -version = "0.4.1" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "imbl" @@ -576,19 +580,28 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.1.0" +version = "2.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", "hashbrown", ] [[package]] +name = "itertools" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +dependencies = [ + "either", +] + +[[package]] name = "lazy_static" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "lazycell" @@ -598,9 +611,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libadwaita" -version = "0.5.3" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fe7e70c06507ed10a16cda707f358fbe60fe0dc237498f78c686ade92fd979c" +checksum = "91b4990248b9e1ec5e72094a2ccaea70ec3809f88f6fd52192f2af306b87c5d9" dependencies = [ "gdk-pixbuf", "gdk4", @@ -614,9 +627,9 @@ dependencies = [ [[package]] name = "libadwaita-sys" -version = "0.5.3" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e10aaa38de1d53374f90deeb4535209adc40cc5dba37f9704724169bceec69a" +checksum = "23a748e4e92be1265cd9e93d569c0b5dfc7814107985aa6743d670ab281ea1a8" dependencies = [ "gdk4-sys", "gio-sys", @@ -630,27 +643,27 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.151" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libloading" -version = "0.7.4" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" +checksum = "e310b3a6b5907f99202fcdb4960ff45b93735d7c7d96b760fcff8db2dc0e103d" dependencies = [ "cfg-if", - "winapi", + "windows-targets", ] [[package]] name = "libspa" -version = "0.7.2" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0434617020ddca18b86067912970c55410ca654cdafd775480322f50b857a8c4" +checksum = "65f3a4b81b2a2d8c7f300643676202debd1b7c929dbf5c9bb89402ea11d19810" dependencies = [ - "bitflags 2.4.1", + "bitflags", "cc", "convert_case", "cookie-factory", @@ -663,9 +676,9 @@ dependencies = [ [[package]] name = "libspa-sys" -version = "0.7.2" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3e70ca3f3e70f858ef363046d06178c427b4e0b63d210c95fd87d752679d345" +checksum = "bf0d9716420364790e85cbb9d3ac2c950bde16a7dd36f3209b7dfdfc4a24d01f" dependencies = [ "bindgen", "cc", @@ -687,9 +700,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.20" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "malloc_buf" @@ -702,24 +715,15 @@ dependencies = [ [[package]] name = "memchr" -version = "2.6.4" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" - -[[package]] -name = "memoffset" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" -dependencies = [ - "autocfg", -] +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "memoffset" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" dependencies = [ "autocfg", ] @@ -732,15 +736,13 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "nix" -version = "0.26.4" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" +checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" dependencies = [ - "bitflags 1.3.2", + "bitflags", "cfg-if", "libc", - "memoffset 0.7.1", - "pin-utils", ] [[package]] @@ -790,22 +792,21 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "pango" -version = "0.18.3" +version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ca27ec1eb0457ab26f3036ea52229edbdb74dee1edd29063f5b9b010e7ebee4" +checksum = "3f0d328648058085cfd6897c9ae4272884098a926f3a833cd50c8c73e6eccecd" dependencies = [ "gio", "glib", "libc", - "once_cell", "pango-sys", ] [[package]] name = "pango-sys" -version = "0.18.0" +version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "436737e391a843e5933d6d9aa102cb126d501e815b83601365a948a518555dc5" +checksum = "ff03da4fa086c0b244d4a4587d3e20622a3ecdb21daea9edf66597224c634ba0" dependencies = [ "glib-sys", "gobject-sys", @@ -814,16 +815,10 @@ dependencies = [ ] [[package]] -name = "peeking_take_while" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" - -[[package]] name = "pin-project-lite" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" [[package]] name = "pin-utils" @@ -833,12 +828,12 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pipewire" -version = "0.7.2" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2d009c8dd65e890b515a71950f7e4c801523b8894ff33863a40830bf762e9e9" +checksum = "08e645ba5c45109106d56610b3ee60eb13a6f2beb8b74f8dc8186cf261788dda" dependencies = [ "anyhow", - "bitflags 2.4.1", + "bitflags", "libc", "libspa", "libspa-sys", @@ -850,9 +845,9 @@ dependencies = [ [[package]] name = "pipewire-sys" -version = "0.7.2" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "890c084e7b737246cb4799c86b71a0e4da536031ff7473dd639eba9f95039f64" +checksum = "849e188f90b1dda88fe2bfe1ad31fe5f158af2c98f80fb5d13726c44f3f01112" dependencies = [ "bindgen", "libspa-sys", @@ -861,66 +856,31 @@ dependencies = [ [[package]] name = "pkg-config" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69d3587f8a9e599cc7ec2c00e331f71c4e69a5f9a4b8a6efd5b07466b9736f9a" - -[[package]] -name = "proc-macro-crate" -version = "1.3.1" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" -dependencies = [ - "once_cell", - "toml_edit 0.19.15", -] +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] name = "proc-macro-crate" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97dc5fea232fc28d2f597b37c4876b348a40e33f3b02cc975c8d006d78d94b1a" -dependencies = [ - "toml_datetime", - "toml_edit 0.20.2", -] - -[[package]] -name = "proc-macro-error" -version = "1.0.4" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" 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", + "toml_edit 0.21.1", ] [[package]] name = "proc-macro2" -version = "1.0.71" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75cb1540fadbd5b8fbccc4dddad2734eba435053f725621c070711a14bb5f4b8" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] [[package]] name = "pwvucontrol" -version = "0.1.0" +version = "0.4.5" dependencies = [ "anyhow", "futures", @@ -930,16 +890,15 @@ dependencies = [ "imbl", "libadwaita", "log", - "once_cell", "pipewire", "wireplumber", ] [[package]] name = "quote" -version = "1.0.33" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] @@ -961,9 +920,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.2" +version = "1.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" dependencies = [ "aho-corasick", "memchr", @@ -973,9 +932,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.3" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" dependencies = [ "aho-corasick", "memchr", @@ -984,9 +943,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.2" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" [[package]] name = "rustc-hash" @@ -1005,44 +964,44 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.20" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.193" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" +checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.193" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" +checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.43", + "syn", ] [[package]] name = "serde_spanned" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" +checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" dependencies = [ "serde", ] [[package]] name = "shlex" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" [[package]] name = "slab" @@ -1055,26 +1014,15 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" - -[[package]] -name = "syn" -version = "1.0.109" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "syn" -version = "2.0.43" +version = "2.0.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee659fb5f3d355364e1f3e5bc10fb82068efbf824a1e9d1c9504244a6469ad53" +checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9" dependencies = [ "proc-macro2", "quote", @@ -1083,9 +1031,9 @@ dependencies = [ [[package]] name = "system-deps" -version = "6.2.0" +version = "6.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a2d580ff6a20c55dfb86be5f9c238f67835d0e81cbdea8bf5680e0897320331" +checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349" dependencies = [ "cfg-expr", "heck", @@ -1096,79 +1044,79 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.12" +version = "0.12.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c39fd04924ca3a864207c66fc2cd7d22d7c016007f9ce846cbb9326331930a" +checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" [[package]] name = "temp-dir" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd16aa9ffe15fe021c6ee3766772132c6e98dfa395a167e16864f61a9cfb71d6" +checksum = "1f227968ec00f0e5322f9b8173c7a0cbcff6181a0a5b28e9892491c286277231" [[package]] name = "thiserror" -version = "1.0.52" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83a48fd946b02c0a526b2e9481c8e2a17755e47039164a86c4070446e3a4614d" +checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.52" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7fbe9b594d6568a6a1443250a7e67d80b74e1e96f6d1715e1e21cc1888291d3" +checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" dependencies = [ "proc-macro2", "quote", - "syn 2.0.43", + "syn", ] [[package]] name = "toml" -version = "0.8.2" +version = "0.8.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "185d8ab0dfbb35cf1399a6344d8484209c088f75f8f68230da55d48d95d43e3d" +checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.20.2", + "toml_edit 0.22.14", ] [[package]] name = "toml_datetime" -version = "0.6.3" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" +checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.19.15" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" dependencies = [ "indexmap", "toml_datetime", - "winnow", + "winnow 0.5.40", ] [[package]] name = "toml_edit" -version = "0.20.2" +version = "0.22.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338" +checksum = "f21c7aaf97f1bd9ca9d4f9e73b0a6c74bd5afef56f2bc931943a6e1c37e04e38" dependencies = [ "indexmap", "serde", "serde_spanned", "toml_datetime", - "winnow", + "winnow 0.6.13", ] [[package]] @@ -1179,15 +1127,21 @@ checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-segmentation" -version = "1.10.1" +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 = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" +checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" [[package]] name = "version-compare" -version = "0.1.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "579a42fc0b8e0c63b76519a339be31bed574929511fa53c1a3acae26eb258f29" +checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b" [[package]] name = "version_check" @@ -1218,10 +1172,92 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_gnullvm", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[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.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" + +[[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.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" + +[[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.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" + +[[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.5.31" +version = "0.6.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97a4882e6b134d6c28953a387571f1acdd3496830d5e36c5e3a1075580ea641c" +checksum = "59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1" dependencies = [ "memchr", ] @@ -1229,9 +1265,9 @@ dependencies = [ [[package]] name = "wireplumber" version = "0.1.0" -source = "git+https://github.com/arcnmx/wireplumber.rs.git?rev=2c0ee463d029d3562ee66db90554c5af573565c1#2c0ee463d029d3562ee66db90554c5af573565c1" +source = "git+https://github.com/arcnmx/wireplumber.rs.git?rev=6e48383a85aecfca22dac3ffc589fb3f25404eda#6e48383a85aecfca22dac3ffc589fb3f25404eda" dependencies = [ - "bitflags 2.4.1", + "bitflags", "gio", "glib", "libc", @@ -1245,7 +1281,7 @@ dependencies = [ [[package]] name = "wireplumber-sys" version = "0.1.0" -source = "git+https://github.com/arcnmx/wireplumber.rs.git?rev=2c0ee463d029d3562ee66db90554c5af573565c1#2c0ee463d029d3562ee66db90554c5af573565c1" +source = "git+https://github.com/arcnmx/wireplumber.rs.git?rev=6e48383a85aecfca22dac3ffc589fb3f25404eda#6e48383a85aecfca22dac3ffc589fb3f25404eda" dependencies = [ "gio-sys", "glib-sys", @@ -1255,3 +1291,12 @@ dependencies = [ "pipewire-sys", "system-deps", ] + +[[package]] +name = "yansi-term" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe5c30ade05e61656247b2e334a031dfd0cc466fadef865bdcdea8d537951bf1" +dependencies = [ + "winapi", +] diff --git a/pkgs/applications/audio/pwvucontrol/default.nix b/pkgs/applications/audio/pwvucontrol/default.nix index f6733b1e4fdfd..2726f1bedcab3 100644 --- a/pkgs/applications/audio/pwvucontrol/default.nix +++ b/pkgs/applications/audio/pwvucontrol/default.nix @@ -32,21 +32,21 @@ let }; }); in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pwvucontrol"; - version = "0.4.2"; + version = "0.4.5"; src = fetchFromGitHub { owner = "saivert"; repo = "pwvucontrol"; - rev = version; - hash = "sha256-cWNWdCMk9hF8Nzq2UFBEKSx1zS8JlplMG7B5gv7BaZA="; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-s4sop1qmqPVOGX7erRfClUUcixNhi+wUY5MXSmv+zVk="; }; cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; outputHashes = { - "wireplumber-0.1.0" = "sha256-r3p4OpmMgiFgjn1Fj4LeMOhx6R2UWollIdJRy/0kiNM="; + "wireplumber-0.1.0" = "sha256-ocagwmjyhfx6n/9xKxF2vhylqy2HunKQRx3eMo6m/l4="; }; }; @@ -73,12 +73,16 @@ stdenv.mkDerivation rec { wireplumber_0_4 ]; - meta = with lib; { + meta = { description = "Pipewire Volume Control"; homepage = "https://github.com/saivert/pwvucontrol"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ figsoda Guanran928 ]; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ + figsoda + Guanran928 + johnrtitor + ]; mainProgram = "pwvucontrol"; - platforms = platforms.linux; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/applications/audio/pyradio/default.nix b/pkgs/applications/audio/pyradio/default.nix deleted file mode 100644 index 6e07d531514ce..0000000000000 --- a/pkgs/applications/audio/pyradio/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ lib -, python3Packages -, fetchFromGitHub -, installShellFiles -}: - -python3Packages.buildPythonApplication rec { - pname = "pyradio"; - version = "0.9.3.9"; - - src = fetchFromGitHub { - owner = "coderholic"; - repo = "pyradio"; - rev = "refs/tags/${version}"; - hash = "sha256-EoHCOg4nPkKRSFX/3AUKJaXzS6J1quwtv+mKeKBu5Ns="; - }; - - nativeBuildInputs = [ - installShellFiles - ]; - - propagatedBuildInputs = with python3Packages; [ - dnspython - netifaces - psutil - python-dateutil - requests - rich - ]; - - postPatch = '' - # Disable update check - substituteInPlace pyradio/config \ - --replace-fail "distro = None" "distro = NixOS" - ''; - - checkPhase = '' - $out/bin/pyradio --help - ''; - - postInstall = '' - installManPage *.1 - ''; - - meta = with lib; { - homepage = "http://www.coderholic.com/pyradio/"; - description = "Curses based internet radio player"; - mainProgram = "pyradio"; - changelog = "https://github.com/coderholic/pyradio/releases/tag/${version}"; - license = licenses.mit; - maintainers = with maintainers; [ contrun yayayayaka ]; - }; -} diff --git a/pkgs/applications/audio/qjackctl/default.nix b/pkgs/applications/audio/qjackctl/default.nix index 871f9012a584c..6bfe6826f103b 100644 --- a/pkgs/applications/audio/qjackctl/default.nix +++ b/pkgs/applications/audio/qjackctl/default.nix @@ -41,7 +41,7 @@ mkDerivation rec { mainProgram = "qjackctl"; homepage = "https://github.com/rncbc/qjackctl"; license = licenses.gpl2Plus; - maintainers = [ maintainers.goibhniu ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/audio/qpwgraph/default.nix b/pkgs/applications/audio/qpwgraph/default.nix index 72b06a0bab0e0..85df0f595f335 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.5"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "rncbc"; repo = "qpwgraph"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-aXZsAOsdp0x7J0T9B9C1Qm2qDkhRNHRWUmPafdHRrOQ="; + sha256 = "sha256-EMBoP0gmJ1JwjkCc1UjTM4BgeYhFSFhUOD14rJRow1o="; }; nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; diff --git a/pkgs/applications/audio/qsampler/default.nix b/pkgs/applications/audio/qsampler/default.nix index bd4922394f6af..b4c7cf5bce1d2 100644 --- a/pkgs/applications/audio/qsampler/default.nix +++ b/pkgs/applications/audio/qsampler/default.nix @@ -22,7 +22,7 @@ mkDerivation rec { description = "Graphical frontend to LinuxSampler"; mainProgram = "qsampler"; license = licenses.gpl2; - maintainers = [ maintainers.goibhniu ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/audio/qsynth/default.nix b/pkgs/applications/audio/qsynth/default.nix index 4de19279b9372..a575cd57978ab 100644 --- a/pkgs/applications/audio/qsynth/default.nix +++ b/pkgs/applications/audio/qsynth/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { mainProgram = "qsynth"; homepage = "https://sourceforge.net/projects/qsynth"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ goibhniu ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/audio/quadrafuzz/default.nix b/pkgs/applications/audio/quadrafuzz/default.nix index 4f0ea946832e5..e2156b391007e 100644 --- a/pkgs/applications/audio/quadrafuzz/default.nix +++ b/pkgs/applications/audio/quadrafuzz/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); homepage = "https://github.com/jpcima/quadrafuzz"; description = "Multi-band fuzz distortion plugin"; maintainers = [ maintainers.magnetophon ]; diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix index 66d74efdcfd7a..a47b01b8cf585 100644 --- a/pkgs/applications/audio/quodlibet/default.nix +++ b/pkgs/applications/audio/quodlibet/default.nix @@ -1,136 +1,154 @@ -{ lib -, fetchFromGitHub -, tag ? "" +{ + lib, + fetchFromGitHub, + tag ? "", # build time -, gettext -, gobject-introspection -, wrapGAppsHook3 + gettext, + gobject-introspection, + wrapGAppsHook3, # runtime -, adwaita-icon-theme -, gdk-pixbuf -, glib -, glib-networking -, gtk3 -, gtksourceview -, kakasi -, keybinder3 -, libappindicator-gtk3 -, libmodplug -, librsvg -, libsoup -, webkitgtk + adwaita-icon-theme, + gdk-pixbuf, + glib, + glib-networking, + gtk3, + gtksourceview, + kakasi, + keybinder3, + libappindicator-gtk3, + libmodplug, + librsvg, + libsoup, + webkitgtk, # optional features -, withDbusPython ? false -, withMusicBrainzNgs ? false -, withPahoMqtt ? false -, withPyInotify ? false -, withPypresence ? false -, withSoco ? false + withDbusPython ? false, + withMusicBrainzNgs ? false, + withPahoMqtt ? false, + withPypresence ? false, + withSoco ? false, # backends -, withGstPlugins ? withGstreamerBackend -, withGstreamerBackend ? true -, gst_all_1 -, withXineBackend ? true -, xine-lib + withGstPlugins ? withGstreamerBackend, + withGstreamerBackend ? true, + gst_all_1, + withXineBackend ? true, + xine-lib, # tests -, dbus -, glibcLocales -, hicolor-icon-theme -, python3 -, xvfb-run + dbus, + glibcLocales, + hicolor-icon-theme, + python3, + xvfb-run, }: -python3.pkgs.buildPythonApplication rec { +python3.pkgs.buildPythonApplication { pname = "quodlibet${tag}"; - version = "4.6.0"; - format = "pyproject"; + version = "4.6.0-unstable-2024-08-08"; + pyproject = true; - outputs = [ "out" "doc" ]; + outputs = [ + "out" + "doc" + ]; src = fetchFromGitHub { owner = "quodlibet"; repo = "quodlibet"; - rev = "refs/tags/release-${version}"; - hash = "sha256-dkO/CFN7Dk72xhtmcSDcwUciOPMeEjQS2mch+jSfiII="; + rev = "3dcf31dfc8db9806d1f73a47fdabc950d35ded1d"; + hash = "sha256-8qWuxTvMF6ksDkbZ6wRLPCJK1cSqgGMPac/ht6qVpnA="; }; - nativeBuildInputs = [ - gettext - gobject-introspection - wrapGAppsHook3 - ] ++ (with python3.pkgs; [ - sphinx-rtd-theme - sphinxHook - setuptools - ]); - - buildInputs = [ - adwaita-icon-theme - gdk-pixbuf - glib - glib-networking - gtk3 - gtksourceview - kakasi - keybinder3 - libappindicator-gtk3 - libmodplug - libsoup - webkitgtk - ] ++ lib.optionals (withXineBackend) [ - xine-lib - ] ++ lib.optionals (withGstreamerBackend) (with gst_all_1; [ - gst-plugins-base - gstreamer - ] ++ lib.optionals (withGstPlugins) [ - gst-libav - gst-plugins-bad - gst-plugins-good - gst-plugins-ugly - ]); - - propagatedBuildInputs = with python3.pkgs; [ - feedparser - gst-python - mutagen - pycairo - pygobject3 - ] - ++ lib.optionals withDbusPython [ dbus-python ] - ++ lib.optionals withMusicBrainzNgs [ musicbrainzngs ] - ++ lib.optionals withPahoMqtt [ paho-mqtt ] - ++ lib.optionals withPyInotify [ pyinotify ] - ++ lib.optionals withPypresence [ pypresence ] - ++ lib.optionals withSoco [ soco ]; - - nativeCheckInputs = [ - dbus - gdk-pixbuf - glibcLocales - hicolor-icon-theme - xvfb-run - ] ++ (with python3.pkgs; [ - polib - pytest - pytest-xdist - ]); - - pytestFlags = [ - # missing translation strings in potfiles - "--deselect=tests/test_po.py::TPOTFILESIN::test_missing" - # require networking - "--deselect=tests/plugin/test_covers.py::test_live_cover_download" - "--deselect=tests/test_browsers_iradio.py::TInternetRadio::test_click_add_station" - # upstream does actually not enforce source code linting - "--ignore=tests/quality" - ] ++ lib.optionals (withXineBackend || !withGstPlugins) [ - "--ignore=tests/plugin/test_replaygain.py" - ]; + patches = [ ./fix-gdist-python-3.12.patch ]; + + build-system = [ python3.pkgs.setuptools ]; + + nativeBuildInputs = + [ + gettext + gobject-introspection + wrapGAppsHook3 + ] + ++ (with python3.pkgs; [ + sphinx-rtd-theme + sphinxHook + ]); + + buildInputs = + [ + adwaita-icon-theme + gdk-pixbuf + glib + glib-networking + gtk3 + gtksourceview + kakasi + keybinder3 + libappindicator-gtk3 + libmodplug + libsoup + webkitgtk + ] + ++ lib.optionals (withXineBackend) [ xine-lib ] + ++ lib.optionals (withGstreamerBackend) ( + with gst_all_1; + [ + gst-plugins-base + gstreamer + ] + ++ lib.optionals (withGstPlugins) [ + gst-libav + gst-plugins-bad + gst-plugins-good + gst-plugins-ugly + ] + ); + + dependencies = + with python3.pkgs; + [ + feedparser + gst-python + mutagen + pycairo + pygobject3 + ] + ++ lib.optionals withDbusPython [ dbus-python ] + ++ lib.optionals withMusicBrainzNgs [ musicbrainzngs ] + ++ lib.optionals withPahoMqtt [ paho-mqtt ] + ++ lib.optionals withPypresence [ pypresence ] + ++ lib.optionals withSoco [ soco ]; + + nativeCheckInputs = + [ + dbus + gdk-pixbuf + glibcLocales + hicolor-icon-theme + xvfb-run + ] + ++ (with python3.pkgs; [ + polib + pytest + pytest-xdist + ]); + + pytestFlags = + [ + # missing translation strings in potfiles + "--deselect=tests/test_po.py::TPOTFILESIN::test_missing" + # require networking + "--deselect=tests/plugin/test_covers.py::test_live_cover_download" + "--deselect=tests/test_browsers_iradio.py::TInternetRadio::test_click_add_station" + # upstream does actually not enforce source code linting + "--ignore=tests/quality" + ] + ++ lib.optionals (withXineBackend || !withGstPlugins) [ + "--ignore=tests/plugin/test_replaygain.py" + ]; env.LC_ALL = "en_US.UTF-8"; @@ -171,6 +189,9 @@ python3.pkgs.buildPythonApplication rec { ''; homepage = "https://quodlibet.readthedocs.io/en/latest"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ coroa pbogdan ]; + maintainers = with maintainers; [ + coroa + pbogdan + ]; }; } diff --git a/pkgs/applications/audio/quodlibet/fix-gdist-python-3.12.patch b/pkgs/applications/audio/quodlibet/fix-gdist-python-3.12.patch new file mode 100644 index 0000000000000..a9dc7b7f66999 --- /dev/null +++ b/pkgs/applications/audio/quodlibet/fix-gdist-python-3.12.patch @@ -0,0 +1,23 @@ +From b3980cf4c8766815e4c13ee1695cebfbf473a2e6 Mon Sep 17 00:00:00 2001 +From: Pavel Sobolev <contact@paveloom.dev> +Date: Sun, 14 Jul 2024 11:30:11 +0300 +Subject: [PATCH] Import `setuptools` before importing `distutils`. + +--- + gdist/__init__.py | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/gdist/__init__.py b/gdist/__init__.py +index 71814af49..a54aac653 100644 +--- a/gdist/__init__.py ++++ b/gdist/__init__.py +@@ -31,6 +31,7 @@ Also supports setuptools but needs to be imported after setuptools + (which does some monkey patching) + """ + ++import setuptools + import sys + + from distutils.core import setup +-- +2.45.2 \ No newline at end of file diff --git a/pkgs/applications/audio/r128gain/default.nix b/pkgs/applications/audio/r128gain/default.nix index 6cf7f41f10ce7..5444ffb4a178b 100644 --- a/pkgs/applications/audio/r128gain/default.nix +++ b/pkgs/applications/audio/r128gain/default.nix @@ -39,7 +39,7 @@ python3Packages.buildPythonApplication rec { mainProgram = "r128gain"; homepage = "https://github.com/desbma/r128gain"; license = licenses.lgpl2Plus; - maintainers = [ maintainers.AluisioASG ]; + maintainers = [ ]; platforms = platforms.all; }; } diff --git a/pkgs/applications/audio/radiotray-ng/default.nix b/pkgs/applications/audio/radiotray-ng/default.nix index 51dbc26f5617d..6577f33baba0c 100644 --- a/pkgs/applications/audio/radiotray-ng/default.nix +++ b/pkgs/applications/audio/radiotray-ng/default.nix @@ -94,7 +94,7 @@ stdenv.mkDerivation rec { env.NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; nativeCheckInputs = [ gtest ]; - doCheck = !stdenv.isAarch64; # single failure that I can't explain + doCheck = !stdenv.hostPlatform.isAarch64; # single failure that I can't explain preFixup = '' gappsWrapperArgs+=(--suffix PATH : ${lib.makeBinPath [ dbus ]}) @@ -105,7 +105,7 @@ stdenv.mkDerivation rec { description = "Internet radio player for linux"; homepage = "https://github.com/ebruck/radiotray-ng"; license = licenses.gpl3; - maintainers = with maintainers; [ dtzWill ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/audio/rakarrack/default.nix b/pkgs/applications/audio/rakarrack/default.nix index 4b693da3a622f..04a05c2c6f115 100644 --- a/pkgs/applications/audio/rakarrack/default.nix +++ b/pkgs/applications/audio/rakarrack/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { homepage = "https://rakarrack.sourceforge.net"; license = licenses.gpl2; platforms = platforms.linux; - maintainers = [ maintainers.goibhniu ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/audio/reaper/default.nix b/pkgs/applications/audio/reaper/default.nix index 833b4e3b073a1..ff8d32b907805 100644 --- a/pkgs/applications/audio/reaper/default.nix +++ b/pkgs/applications/audio/reaper/default.nix @@ -15,49 +15,49 @@ , xdotool , which -, jackSupport ? stdenv.isLinux +, jackSupport ? stdenv.hostPlatform.isLinux , jackLibrary -, pulseaudioSupport ? config.pulseaudio or stdenv.isLinux +, pulseaudioSupport ? config.pulseaudio or stdenv.hostPlatform.isLinux , libpulseaudio }: let - url_for_platform = version: arch: if stdenv.isDarwin + url_for_platform = version: arch: if stdenv.hostPlatform.isDarwin then "https://www.reaper.fm/files/${lib.versions.major version}.x/reaper${builtins.replaceStrings ["."] [""] version}_universal.dmg" else "https://www.reaper.fm/files/${lib.versions.major version}.x/reaper${builtins.replaceStrings ["."] [""] version}_linux_${arch}.tar.xz"; in stdenv.mkDerivation rec { pname = "reaper"; - version = "7.16"; + version = "7.22"; 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.hostPlatform.isDarwin then "sha256-dIRZCUIfqnGTxBaLzczwzD6hA/PyAxPqfa+FfCRKdu0=" else { + x86_64-linux = "sha256-aa2KcL8yZYG+Dki7J6U473E2BQgdACAIzRLtD9zuHV0="; + aarch64-linux = "sha256-NECEEUKtTQajl0MZK8/NsbhcuyihHOo0Q5Y5UpAAgrM="; }.${stdenv.hostPlatform.system}; }; nativeBuildInputs = [ makeWrapper - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ which autoPatchelfHook xdg-utils # Required for desktop integration - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ undmg ]; - sourceRoot = lib.optionalString stdenv.isDarwin "Reaper.app"; + sourceRoot = lib.optionalString stdenv.hostPlatform.isDarwin "Reaper.app"; buildInputs = [ stdenv.cc.cc.lib # reaper and libSwell need libstdc++.so.6 - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ gtk3 alsa-lib ]; - runtimeDependencies = lib.optionals stdenv.isLinux [ + runtimeDependencies = lib.optionals stdenv.hostPlatform.isLinux [ gtk3 # libSwell needs libgdk-3.so.0 ] ++ lib.optional jackSupport jackLibrary @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { dontBuild = true; - installPhase = if stdenv.isDarwin then '' + installPhase = if stdenv.hostPlatform.isDarwin then '' runHook preInstall mkdir -p "$out/Applications/Reaper.app" cp -r * "$out/Applications/Reaper.app/" @@ -92,7 +92,6 @@ stdenv.mkDerivation rec { mkdir $out/bin ln -s $out/opt/REAPER/reaper $out/bin/ - ln -s $out/opt/REAPER/reamote-server $out/bin/ runHook postInstall ''; diff --git a/pkgs/applications/audio/redux/default.nix b/pkgs/applications/audio/redux/default.nix index d0a6d9393031f..a21202ebd5ba4 100644 --- a/pkgs/applications/audio/redux/default.nix +++ b/pkgs/applications/audio/redux/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, writeScript , libX11 , libXext , alsa-lib @@ -16,12 +17,15 @@ stdenv.mkDerivation rec { pname = "redux"; - version = "1.3.2"; + version = "1.3.5"; src = if releasePath != null then releasePath else fetchurl { - url = "https://files.renoise.com/demo/Renoise_Redux_${lib.replaceStrings ["."] ["_"] version}_Demo_Linux_x86_64.tar.gz"; - sha256 = "sha256-wafOeNvVIHc8pOHoNQcCwV8+OwnuevJo1EcRQKRX4YA="; + urls = [ + "https://files.renoise.com/demo/Renoise_Redux_${lib.replaceStrings ["."] ["_"] version}_Demo_Linux_x86_64.tar.gz" + "https://files.renoise.com/demo/archive/Renoise_Redux_${lib.replaceStrings ["."] ["_"] version}_Demo_Linux_x86_64.tar.gz" + ]; + sha256 = "sha256-eznsdLzgdJ7MyWe5WAEg1MHId5VlfyanoZ6+I9nI/0I="; }; nativeBuildInputs = [ @@ -45,6 +49,23 @@ stdenv.mkDerivation rec { runHook postInstall ''; + + passthru.updateScript = writeScript "update-redux" '' + #!/usr/bin/env nix-shell + #!nix-shell -I nixpkgs=./. -i bash -p curl htmlq common-updater-scripts + set -euo pipefail + + new_version="$( + curl 'https://files.renoise.com/demo/' \ + | htmlq a --text \ + | grep -E '^Renoise_Redux_([0-9]+_?)+_Demo_Linux_x86_64\.tar\.gz$' \ + | grep -Eo '[0-9]+(_[0-9]+)*' \ + | head -n1 \ + | tr _ . + )" + update-source-version redux "$new_version" --system="x86_64-linux" + ''; + meta = with lib; { description = "Sample-based instrument, with a powerful phrase sequencer"; homepage = "https://www.renoise.com/products/redux"; diff --git a/pkgs/applications/audio/renoise/default.nix b/pkgs/applications/audio/renoise/default.nix index a56d43876fb04..7e178728c2dd5 100644 --- a/pkgs/applications/audio/renoise/default.nix +++ b/pkgs/applications/audio/renoise/default.nix @@ -1,5 +1,6 @@ { lib , stdenv +, writeScript , alsa-lib , fetchurl , libjack2 @@ -23,17 +24,17 @@ let platforms = { x86_64-linux = { archSuffix = "x86_64"; - hash = "sha256-Etz6NaeLMysSkcQGC3g+IqUy9QrONCrbkyej63uLflo="; + hash = "sha256-b+YXBVnxu54HfC/tWapcs/ZYzwBOJswYbEbEU3SVNss="; }; aarch64-linux = { archSuffix = "arm64"; - hash = "sha256-PVpgxhJU8RY6QepydqImQnisWBjbrsuW4j49Xot3C6Y="; + hash = "sha256-l54FAtT+Rj4Mv3GuOF0/9WuKdJowgbZDZYo7VCh6Flg="; }; }; in stdenv.mkDerivation rec { pname = "renoise"; - version = "3.4.3"; + version = "3.4.4"; src = if releasePath != null then releasePath @@ -42,8 +43,10 @@ in stdenv.mkDerivation rec { platform = platforms.${stdenv.system} or (throw "unsupported system ${stdenv.hostPlatform.system}"); urlVersion = lib.replaceStrings [ "." ] [ "_" ] version; in fetchurl { - url = - "https://files.renoise.com/demo/Renoise_${urlVersion}_Demo_Linux_${platform.archSuffix}.tar.gz"; + urls = [ + "https://files.renoise.com/demo/Renoise_${urlVersion}_Demo_Linux_${platform.archSuffix}.tar.gz" + "https://files.renoise.com/demo/archive/Renoise_${urlVersion}_Demo_Linux_${platform.archSuffix}.tar.gz" + ]; hash = platform.hash; }; @@ -103,6 +106,27 @@ in stdenv.mkDerivation rec { --replace Exec=renoise Exec=$out/bin/renoise ''; + passthru.updateScript = writeScript "update-renoise" '' + #!/usr/bin/env nix-shell + #!nix-shell -I nixpkgs=./. -i bash -p curl htmlq common-updater-scripts + set -euo pipefail + + new_version="$( + curl 'https://files.renoise.com/demo/' \ + | htmlq a --text \ + | grep -E '^Renoise_([0-9]+_?)+_Demo_Linux_x86_64\.tar\.gz$' \ + | grep -Eo '[0-9]+(_[0-9]+)*' \ + | head -n1 \ + | tr _ . + )" + hash_x86_64="$(nix-prefetch-url "https://files.renoise.com/demo/Renoise_$(echo "$new_version" | tr . _)_Demo_Linux_x86_64.tar.gz")" + hash_arm64="$( nix-prefetch-url "https://files.renoise.com/demo/Renoise_$(echo "$new_version" | tr . _)_Demo_Linux_arm64.tar.gz")" + sri_x86_64="$(nix --extra-experimental-features nix-command hash to-sri --type sha256 "$hash_x86_64")" + sri_arm64="$( nix --extra-experimental-features nix-command hash to-sri --type sha256 "$hash_arm64")" + update-source-version renoise "$new_version" "$sri_x86_64" --system="x86_64-linux" --ignore-same-version + update-source-version renoise "$new_version" "$sri_arm64" --system="aarch64-linux" --ignore-same-version + ''; + meta = { description = "Modern tracker-based DAW"; homepage = "https://www.renoise.com/"; diff --git a/pkgs/applications/audio/rhvoice/default.nix b/pkgs/applications/audio/rhvoice/default.nix index 16614d0e32e69..d7676ca22df0c 100644 --- a/pkgs/applications/audio/rhvoice/default.nix +++ b/pkgs/applications/audio/rhvoice/default.nix @@ -7,7 +7,7 @@ , glibmm , libpulseaudio , libao -, speechd +, speechd-minimal }: stdenv.mkDerivation rec { @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { glibmm libpulseaudio libao - speechd + speechd-minimal ]; meta = { diff --git a/pkgs/applications/audio/rkrlv2/default.nix b/pkgs/applications/audio/rkrlv2/default.nix index 19fca6af988da..fa62fcfa47ac6 100644 --- a/pkgs/applications/audio/rkrlv2/default.nix +++ b/pkgs/applications/audio/rkrlv2/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Only; maintainers = [ maintainers.joelmo ]; platforms = platforms.unix; - broken = stdenv.isAarch64; # g++: error: unrecognized command line option '-mfpmath=sse' + broken = stdenv.hostPlatform.isAarch64; # g++: error: unrecognized command line option '-mfpmath=sse' }; } diff --git a/pkgs/applications/audio/roomeqwizard/default.nix b/pkgs/applications/audio/roomeqwizard/default.nix index 042666d2e1c7a..cd67e3ad14406 100644 --- a/pkgs/applications/audio/roomeqwizard/default.nix +++ b/pkgs/applications/audio/roomeqwizard/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "roomeqwizard"; - version = "5.31.1"; + version = "5.31.3"; src = fetchurl { url = "https://www.roomeqwizard.com/installers/REW_linux_no_jre_${lib.replaceStrings [ "." ] [ "_" ] version}.sh"; - sha256 = "sha256-n1Ohja6Hpg/TNoxQKF1VCDkVj0UDCefr1x5ArIsgs2A="; + sha256 = "sha256-qaGkKVoiBJ2UWVKAMqbuqNFi6FGcblMxAbYwhf/71CY="; }; dontUnpack = true; diff --git a/pkgs/applications/audio/samplv1/default.nix b/pkgs/applications/audio/samplv1/default.nix index 991af8eac354b..c2f86609d45eb 100644 --- a/pkgs/applications/audio/samplv1/default.nix +++ b/pkgs/applications/audio/samplv1/default.nix @@ -22,6 +22,6 @@ mkDerivation rec { homepage = "http://samplv1.sourceforge.net/"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = [ maintainers.goibhniu ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/audio/sayonara/default.nix b/pkgs/applications/audio/sayonara/default.nix index e7efb7896be7c..e937cd6ea7790 100644 --- a/pkgs/applications/audio/sayonara/default.nix +++ b/pkgs/applications/audio/sayonara/default.nix @@ -22,15 +22,21 @@ let in mkDerivation rec { pname = "sayonara"; - version = "1.7.0-stable3"; + version = "1.10.0-stable1"; src = fetchFromGitLab { owner = "luciocarreras"; repo = "sayonara-player"; rev = version; - sha256 = "sha256-tJ/8tGNkmTwWRCpPy/h85SP/6QDAgcaKWJdM5MSAXJw="; + hash = "sha256-ZcuWe1dsLJS4/nLXSSKB7wzPU9COFyE4vPSwZIo0bgI="; }; + # error: no matching function for call to 'max' + postPatch = '' + substituteInPlace src/Components/Playlist/PlaylistModifiers.cpp \ + --replace-fail "std::max" "std::max<MilliSeconds>" + ''; + nativeBuildInputs = [ cmake ninja pkg-config qttools ]; buildInputs = [ diff --git a/pkgs/applications/audio/schismtracker/default.nix b/pkgs/applications/audio/schismtracker/default.nix index bc6a406ba2f5c..6147973f14931 100644 --- a/pkgs/applications/audio/schismtracker/default.nix +++ b/pkgs/applications/audio/schismtracker/default.nix @@ -21,18 +21,18 @@ stdenv.mkDerivation rec { }; configureFlags = [ "--enable-dependency-tracking" ] - ++ lib.optional stdenv.isDarwin "--disable-sdltest"; + ++ lib.optional stdenv.hostPlatform.isDarwin "--disable-sdltest"; nativeBuildInputs = [ autoreconfHook python3 ]; buildInputs = [ SDL2 ] - ++ lib.optionals stdenv.isLinux [ alsa-lib libXext ] - ++ lib.optionals stdenv.isDarwin [ Cocoa ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib libXext ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ]; enableParallelBuilding = true; # Our Darwin SDL2 doesn't have a SDL2main to link against - preConfigure = lib.optionalString stdenv.isDarwin '' + preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace configure.ac \ --replace '-lSDL2main' '-lSDL2' ''; diff --git a/pkgs/applications/audio/scream/default.nix b/pkgs/applications/audio/scream/default.nix index 3c0b83d46c193..cc09b21875353 100644 --- a/pkgs/applications/audio/scream/default.nix +++ b/pkgs/applications/audio/scream/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, config, fetchFromGitHub, cmake, pkg-config -, alsaSupport ? stdenv.isLinux, alsa-lib -, pulseSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio +, alsaSupport ? stdenv.hostPlatform.isLinux, alsa-lib +, pulseSupport ? config.pulseaudio or stdenv.hostPlatform.isLinux, libpulseaudio , jackSupport ? false, libjack2, soxr , pcapSupport ? false, libpcap }: diff --git a/pkgs/applications/audio/seq24/default.nix b/pkgs/applications/audio/seq24/default.nix index f2858f8f291f1..441f858a1055c 100644 --- a/pkgs/applications/audio/seq24/default.nix +++ b/pkgs/applications/audio/seq24/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { homepage = "http://www.filter24.org/seq24"; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ goibhniu ]; + maintainers = [ ]; mainProgram = "seq24"; }; } diff --git a/pkgs/applications/audio/seq66/default.nix b/pkgs/applications/audio/seq66/default.nix index 51d40f962a889..500e85d68416a 100644 --- a/pkgs/applications/audio/seq66/default.nix +++ b/pkgs/applications/audio/seq66/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "seq66"; - version = "0.99.12"; + version = "0.99.14"; src = fetchFromGitHub { owner = "ahlstromcj"; repo = "seq66"; rev = version; - hash = "sha256-+EU0UdmZaDnhN142yR/r0tK1FKBbuFPmde6iSS26Tjo="; + hash = "sha256-0xexKu8qQd0HzEHYKMomeoBE1s/tC5T1jzUl+AkhTqY="; }; nativeBuildInputs = [ autoreconfHook pkg-config qttools which wrapQtAppsHook ]; diff --git a/pkgs/applications/audio/setbfree/default.nix b/pkgs/applications/audio/setbfree/default.nix index 309cac8e8559c..550c0e8d042af 100644 --- a/pkgs/applications/audio/setbfree/default.nix +++ b/pkgs/applications/audio/setbfree/default.nix @@ -48,6 +48,6 @@ stdenv.mkDerivation rec { homepage = "https://setbfree.org"; license = licenses.gpl2; platforms = [ "x86_64-linux" "i686-linux" ]; # fails on ARM and Darwin - maintainers = [ maintainers.goibhniu ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/audio/sfizz/default.nix b/pkgs/applications/audio/sfizz/default.nix index c6a0ac824566f..a76654fdd9098 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 }: @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "sfztools"; repo = pname; rev = version; - sha256 = "sha256-/G9tvJ4AcBSTmo44xDDKf6et1nSn/FV5m27ztDu10kI="; + hash = "sha256-/G9tvJ4AcBSTmo44xDDKf6et1nSn/FV5m27ztDu10kI="; fetchSubmodules = true; }; @@ -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/sfxr-qt/default.nix b/pkgs/applications/audio/sfxr-qt/default.nix index 33724f9230e73..a204ad566d4d1 100644 --- a/pkgs/applications/audio/sfxr-qt/default.nix +++ b/pkgs/applications/audio/sfxr-qt/default.nix @@ -1,41 +1,29 @@ { lib , mkDerivation , fetchFromGitHub -, fetchpatch , cmake , extra-cmake-modules , qtbase , qtquickcontrols2 , SDL , python3 -, catch2 +, catch2_3 , callPackage , nixosTests }: mkDerivation rec { pname = "sfxr-qt"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "agateau"; repo = "sfxr-qt"; rev = version; - sha256 = "sha256-Ce5NJe1f+C4pPmtenHYvtkxste+nPuxJoB+N7K2nyRo="; + hash = "sha256-JAWDk7mGkPtQ5yaA6UT9hlAy770MHrTBhBP9G8UqFKg="; fetchSubmodules = true; }; - postPatch = '' - cp ${catch2}/include/catch2/catch.hpp 3rdparty/catch2/single_include/catch2/catch.hpp - ''; - - # Remove on next release - patches = [(fetchpatch { - name = "sfxr-qr-missing-qpainterpath-include"; - url = "https://github.com/agateau/sfxr-qt/commit/ef051f473654052112b647df987eb263e38faf47.patch"; - sha256 = "sha256-bqMnxHUzdS5oG/2hfr5MvkpwrtZW+GTN5fS2WpV2W2c="; - })]; - nativeBuildInputs = [ cmake extra-cmake-modules @@ -48,6 +36,14 @@ mkDerivation rec { SDL ]; + checkInputs = [ + catch2_3 + ]; + + cmakeFlags = [ + (lib.cmakeBool "USE_SYSTEM_CATCH2" true) + ]; + doCheck = true; passthru.tests = { diff --git a/pkgs/applications/audio/sfxr/default.nix b/pkgs/applications/audio/sfxr/default.nix index d3314facb6920..03813ff35248d 100644 --- a/pkgs/applications/audio/sfxr/default.nix +++ b/pkgs/applications/audio/sfxr/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: { makeFlags = [ "DESTDIR=$(out)" ]; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; homepage = "http://www.drpetter.se/project_sfxr.html"; description = "Videogame sound effect generator"; mainProgram = "sfxr"; diff --git a/pkgs/applications/audio/sidplayfp/default.nix b/pkgs/applications/audio/sidplayfp/default.nix index c0a30fb900162..f80707c96ff10 100644 --- a/pkgs/applications/audio/sidplayfp/default.nix +++ b/pkgs/applications/audio/sidplayfp/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "sidplayfp"; - version = "2.8.0"; + version = "2.9.0"; src = fetchFromGitHub { owner = "libsidplayfp"; repo = "sidplayfp"; rev = "v${finalAttrs.version}"; - hash = "sha256-2OgU2J/tot5HK4FV1pvZzI9u/e8p65Ymnqj7IdCcfIs="; + hash = "sha256-07Pwh7qbw6Emr5+F89v9i2ARdSosukjjuarJ+uZR7xY="; }; strictDeps = true; diff --git a/pkgs/applications/audio/snapcast/default.nix b/pkgs/applications/audio/snapcast/default.nix index d3add0f604f73..821cda32e9779 100644 --- a/pkgs/applications/audio/snapcast/default.nix +++ b/pkgs/applications/audio/snapcast/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "snapcast"; - version = "0.28.0"; + version = "0.29.0"; src = fetchFromGitHub { owner = "badaix"; repo = "snapcast"; rev = "v${version}"; - sha256 = "sha256-XxpiLojs1TI3qM7yXS+OPcHKo6pLcfJ+Eop7GjQ4HQw="; + hash = "sha256-FWOGBXYWLHHZhvC5/BpkDd70ZupzALZ3ks3qTcrtwKQ="; }; nativeBuildInputs = [ cmake pkg-config ]; @@ -24,10 +24,10 @@ stdenv.mkDerivation rec { asio avahi flac libogg libvorbis libopus aixlog popl soxr ] ++ lib.optional pulseaudioSupport libpulseaudio - ++ lib.optional stdenv.isLinux alsa-lib - ++ lib.optionals stdenv.isDarwin [ IOKit AudioToolbox ]; + ++ lib.optional stdenv.hostPlatform.isLinux alsa-lib + ++ lib.optionals stdenv.hostPlatform.isDarwin [ IOKit AudioToolbox ]; - TARGET=lib.optionalString stdenv.isDarwin "MACOS"; + TARGET=lib.optionalString stdenv.hostPlatform.isDarwin "MACOS"; # Upstream systemd unit files are pretty awful, so we provide our own in a # NixOS module. It might make sense to get that upstreamed... diff --git a/pkgs/applications/audio/snd/default.nix b/pkgs/applications/audio/snd/default.nix index 67ec87343c74a..8bb0bf1387e22 100644 --- a/pkgs/applications/audio/snd/default.nix +++ b/pkgs/applications/audio/snd/default.nix @@ -5,18 +5,18 @@ stdenv.mkDerivation rec { pname = "snd"; - version = "24.4"; + version = "24.5"; src = fetchurl { url = "mirror://sourceforge/snd/snd-${version}.tar.gz"; - sha256 = "sha256-nP4ngNUQvveSQBEqXlzYdaqD0SGzTDPwIiWhSabRu+8="; + sha256 = "sha256-Y497KAlUXtWhkrCd1QrqJkvWGwnzZfYRKaALiEo/7EI="; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ fftw gsl motif ] - ++ lib.optionals stdenv.isLinux [ alsa-lib ] - ++ lib.optionals stdenv.isDarwin [ CoreServices CoreMIDI ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices CoreMIDI ] ++ (with xorg; [ libXext libXft libXpm libXt ]); configureFlags = [ "--with-motif" ]; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { homepage = "https://ccrma.stanford.edu/software/snd/"; platforms = platforms.unix; license = licenses.free; - maintainers = with maintainers; [ ]; + maintainers = [ ]; mainProgram = "snd"; }; } diff --git a/pkgs/applications/audio/sndpeek/default.nix b/pkgs/applications/audio/sndpeek/default.nix index c65208343aff7..7cf8636ad1074 100644 --- a/pkgs/applications/audio/sndpeek/default.nix +++ b/pkgs/applications/audio/sndpeek/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, libsndfile, freeglut, alsa-lib, mesa, libGLU, libX11, libXmu +{ lib, stdenv, fetchurl, libsndfile, libglut, alsa-lib, mesa, libGLU, libX11, libXmu , libXext, libXi }: stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { patches = [ ./pthread.patch ]; buildInputs = [ - freeglut + libglut alsa-lib mesa libGLU 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/sonic-visualiser/default.nix b/pkgs/applications/audio/sonic-visualiser/default.nix index cc24f396f56ff..ef6ed0c695a06 100644 --- a/pkgs/applications/audio/sonic-visualiser/default.nix +++ b/pkgs/applications/audio/sonic-visualiser/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { description = "View and analyse contents of music audio files"; homepage = "https://www.sonicvisualiser.org/"; license = licenses.gpl2Plus; - maintainers = [ maintainers.goibhniu maintainers.marcweber ]; + maintainers = [ maintainers.marcweber ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/audio/sonobus/default.nix b/pkgs/applications/audio/sonobus/default.nix index 959c7a9d0623c..d8a69ecd9a0b7 100644 --- a/pkgs/applications/audio/sonobus/default.nix +++ b/pkgs/applications/audio/sonobus/default.nix @@ -59,16 +59,15 @@ stdenv.mkDerivation (finalAttrs: { env.NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isLinux "-rpath ${lib.makeLibraryPath (finalAttrs.runtimeDependencies)}"; dontPatchELF = true; # needed or nix will try to optimize the binary by removing "useless" rpath - postPatch = lib.optionalString (stdenv.isLinux) '' + postPatch = lib.optionalString (stdenv.hostPlatform.isLinux) '' # needs special setup on Linux, dunno if it can work on Darwin - # https://github.com/NixOS/nixpkgs/issues/19098 # Also, I get issues with linking without that, not sure why sed -i -e '/juce::juce_recommended_lto_flags/d' CMakeLists.txt patchShebangs linux/install.sh ''; # The program does not provide any CMake install instructions - installPhase = lib.optionalString (stdenv.isLinux) '' + installPhase = lib.optionalString (stdenv.hostPlatform.isLinux) '' runHook preInstall cd ../linux ./install.sh "$out" @@ -81,7 +80,7 @@ stdenv.mkDerivation (finalAttrs: { license = with licenses; [ gpl3Plus ]; maintainers = with maintainers; [ PowerUser64 ]; platforms = platforms.unix; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; mainProgram = "sonobus"; }; }) diff --git a/pkgs/applications/audio/sorcer/default.nix b/pkgs/applications/audio/sorcer/default.nix index 6c28d540458f5..bcca16089a27c 100644 --- a/pkgs/applications/audio/sorcer/default.nix +++ b/pkgs/applications/audio/sorcer/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); homepage = "http://openavproductions.com/sorcer/"; description = "Wavetable LV2 plugin synth, targeted at the electronic / dubstep genre"; license = licenses.gpl3Plus; 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/soundconverter/default.nix b/pkgs/applications/audio/soundconverter/default.nix index 27238e36d088c..5e5303bb1da35 100644 --- a/pkgs/applications/audio/soundconverter/default.nix +++ b/pkgs/applications/audio/soundconverter/default.nix @@ -1,17 +1,29 @@ -{ lib, fetchurl -# Optional due to unfree license. -, faacSupport ? false -, glib, python3Packages, gtk3, wrapGAppsHook3 -, gsettings-desktop-schemas, intltool, xvfb-run -, gobject-introspection, gst_all_1, fdk-aac-encoder }: +{ + lib, + # Optional due to unfree license. + faacSupport ? false, + fetchFromGitHub, + glib, + python3Packages, + gtk3, + wrapGAppsHook3, + gsettings-desktop-schemas, + intltool, + xvfb-run, + gobject-introspection, + gst_all_1, + fdk-aac-encoder, +}: python3Packages.buildPythonApplication rec { pname = "soundconverter"; - version = "4.0.3"; + version = "4.0.5"; - src = fetchurl { - url = "https://launchpad.net/soundconverter/trunk/${version}/+download/${pname}-${version}.tar.gz"; - sha256 = "sha256-hzIG/4LD3705erPYvXb7uoRwF9LtKKIKB3jrhpYMsZ0="; + src = fetchFromGitHub { + owner = "kassoulet"; + repo = "soundconverter"; + rev = version; + hash = "sha256-sno5EOh8HHfBTIE67VA8mheYp5wUMFRCbcS2EtKES3c="; }; buildInputs = [ @@ -30,16 +42,14 @@ python3Packages.buildPythonApplication rec { gobject-introspection ]; - propagatedBuildInputs = [ - python3Packages.gst-python - python3Packages.distutils-extra - python3Packages.setuptools - python3Packages.pygobject3 + dependencies = with python3Packages; [ + gst-python + distutils-extra + setuptools + pygobject3 ]; - nativeCheckInputs = [ - xvfb-run - ]; + nativeCheckInputs = [ xvfb-run ]; postPatch = '' substituteInPlace bin/soundconverter --replace \ @@ -47,19 +57,31 @@ python3Packages.buildPythonApplication rec { "DATA_PATH = '$out/share/soundconverter'" ''; - preCheck = let - self = { outPath = "$out"; name = "${pname}-${version}"; }; - xdgPaths = lib.concatMapStringsSep ":" glib.getSchemaDataDirPath; - in '' - export HOME=$TMPDIR - export XDG_DATA_DIRS=$XDG_DATA_DIRS:${xdgPaths [gtk3 gsettings-desktop-schemas self]} - # FIXME: Fails due to weird Gio.file_parse_name() behavior. - sed -i '49 a\ @unittest.skip("Gio.file_parse_name issues")' tests/testcases/names.py - '' + lib.optionalString (!faacSupport) '' - substituteInPlace tests/testcases/integration.py --replace \ - "for encoder in ['fdkaacenc', 'faac', 'avenc_aac']:" \ - "for encoder in ['fdkaacenc', 'avenc_aac']:" - ''; + preCheck = + let + self = { + outPath = "$out"; + name = "${pname}-${version}"; + }; + xdgPaths = lib.concatMapStringsSep ":" glib.getSchemaDataDirPath; + in + '' + export HOME=$TMPDIR + export XDG_DATA_DIRS=$XDG_DATA_DIRS:${ + xdgPaths [ + gtk3 + gsettings-desktop-schemas + self + ] + } + # FIXME: Fails due to weird Gio.file_parse_name() behavior. + sed -i '49 a\ @unittest.skip("Gio.file_parse_name issues")' tests/testcases/names.py + '' + + lib.optionalString (!faacSupport) '' + substituteInPlace tests/testcases/gui_integration.py --replace \ + "for encoder in ['fdkaacenc', 'faac', 'avenc_aac']:" \ + "for encoder in ['fdkaacenc', 'avenc_aac']:" + ''; checkPhase = '' runHook preCheck @@ -70,7 +92,13 @@ python3Packages.buildPythonApplication rec { # Necessary to set GDK_PIXBUF_MODULE_FILE. strictDeps = false; - meta = with lib; { + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + + meta = { homepage = "https://soundconverter.org/"; description = "Leading audio file converter for the GNOME Desktop"; mainProgram = "soundconverter"; @@ -79,8 +107,11 @@ python3Packages.buildPythonApplication rec { and writes WAV, FLAC, MP3, AAC and Ogg Vorbis files. Uses Python and GTK+ GUI toolkit, and runs on X Window System. ''; - license = licenses.gpl3Only; - platforms = platforms.linux; - maintainers = with maintainers; [ jakubgs ]; + license = lib.licenses.gpl3Only; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ + jakubgs + aleksana + ]; }; } diff --git a/pkgs/applications/audio/soundsource/default.nix b/pkgs/applications/audio/soundsource/default.nix index 8f2d743e03df1..c76d0c0999d6b 100644 --- a/pkgs/applications/audio/soundsource/default.nix +++ b/pkgs/applications/audio/soundsource/default.nix @@ -1,15 +1,16 @@ -{ lib -, stdenvNoCC -, fetchurl -, unzip +{ + lib, + stdenvNoCC, + fetchurl, + unzip, }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "soundsource"; - version = "5.6.3"; + version = "5.7.1"; src = fetchurl { - url = "https://web.archive.org/web/20240505002011/https://rogueamoeba.com/soundsource/download/SoundSource.zip"; - sha256 = "sha256-uXQw4MEV4hkrd7tjNCxtuXpbfmdW8bilI5ZmXwn9BLM="; + url = "https://web.archive.org/web/20240924103013/https://cdn.rogueamoeba.com/soundsource/download/SoundSource.zip"; + sha256 = "sha256-02+Jb+3GSirypBISjdFg89Dp3LtkgPKho8OCVS+GGcQ="; }; dontUnpack = true; @@ -29,7 +30,10 @@ stdenvNoCC.mkDerivation (finalAttrs: { homepage = "https://rogueamoeba.com/soundsource"; license = licenses.unfree; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - maintainers = with maintainers; [ emilytrau Enzime ]; + maintainers = with maintainers; [ + emilytrau + donteatoreo + ]; platforms = platforms.darwin; }; }) diff --git a/pkgs/applications/audio/soundtracker/default.nix b/pkgs/applications/audio/soundtracker/default.nix index 02c4813e03703..36f90e67a6394 100644 --- a/pkgs/applications/audio/soundtracker/default.nix +++ b/pkgs/applications/audio/soundtracker/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: { goocanvas libxml2 libsndfile - ] ++ lib.optional stdenv.isLinux alsa-lib; + ] ++ lib.optional stdenv.hostPlatform.isLinux alsa-lib; meta = with lib; { description = "Music tracking tool similar in design to the DOS program FastTracker and the Amiga legend ProTracker"; diff --git a/pkgs/applications/audio/speech-denoiser/default.nix b/pkgs/applications/audio/speech-denoiser/default.nix index 415bf352cae9f..a0c3d2d257061 100644 --- a/pkgs/applications/audio/speech-denoiser/default.nix +++ b/pkgs/applications/audio/speech-denoiser/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation { ''; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); description = "Speech denoise lv2 plugin based on RNNoise library"; homepage = "https://github.com/lucianodato/speech-denoiser"; license = licenses.lgpl3; diff --git a/pkgs/applications/audio/spot/default.nix b/pkgs/applications/audio/spot/default.nix deleted file mode 100644 index 183aae58d167a..0000000000000 --- a/pkgs/applications/audio/spot/default.nix +++ /dev/null @@ -1,84 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, nix-update-script -, meson -, ninja -, gettext -, desktop-file-utils -, cargo -, rustPlatform -, rustc -, pkg-config -, glib -, libadwaita -, libhandy -, gtk4 -, openssl -, alsa-lib -, libpulseaudio -, wrapGAppsHook4 -, blueprint-compiler -, gst_all_1 -}: - -stdenv.mkDerivation rec { - pname = "spot"; - version = "0.4.1"; - - src = fetchFromGitHub { - owner = "xou816"; - repo = "spot"; - rev = version; - hash = "sha256-F875e/VZyN8mTfe9lgjtILNxMqn+66XoPCdaEUagHyU="; - }; - - cargoDeps = rustPlatform.fetchCargoTarball { - inherit src; - name = "${pname}-${version}"; - hash = "sha256-45Rqs2/tSWoyZVjFuygR5SxldjoqpprtOKEnMqJK+p8="; - }; - - nativeBuildInputs = [ - gettext - meson - ninja - pkg-config - gtk4 # for gtk-update-icon-cache - glib # for glib-compile-schemas - desktop-file-utils - cargo - rustPlatform.cargoSetupHook - rustc - wrapGAppsHook4 - blueprint-compiler - ]; - - buildInputs = [ - glib - gtk4 - libadwaita - libhandy - openssl - alsa-lib - libpulseaudio - gst_all_1.gst-plugins-base - gst_all_1.gstreamer - ]; - - # https://github.com/xou816/spot/issues/313 - mesonBuildType = "release"; - - passthru = { - updateScript = nix-update-script { }; - }; - - meta = with lib; { - description = "Native Spotify client for the GNOME desktop"; - mainProgram = "spot"; - homepage = "https://github.com/xou816/spot"; - license = licenses.mit; - maintainers = with maintainers; [ ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/audio/spotify-cli-linux/default.nix b/pkgs/applications/audio/spotify-cli-linux/default.nix index 38aec6ea6f082..944fa4dd3ee09 100644 --- a/pkgs/applications/audio/spotify-cli-linux/default.nix +++ b/pkgs/applications/audio/spotify-cli-linux/default.nix @@ -5,7 +5,7 @@ python3Packages.buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-XJMkiQR1FoeIPfAuJT22kfYJdc/ABuxExELh0EEev8k="; + hash = "sha256-XJMkiQR1FoeIPfAuJT22kfYJdc/ABuxExELh0EEev8k="; }; preBuild = '' diff --git a/pkgs/applications/audio/spotify-player/default.nix b/pkgs/applications/audio/spotify-player/default.nix index 2a250ff946652..a3c51cfaaba2c 100644 --- a/pkgs/applications/audio/spotify-player/default.nix +++ b/pkgs/applications/audio/spotify-player/default.nix @@ -24,6 +24,7 @@ , withImage ? true , withNotify ? true , withSixel ? true +, withFuzzy ? true , stdenv , darwin , makeBinaryWrapper @@ -33,22 +34,22 @@ assert lib.assertOneOf "withAudioBackend" withAudioBackend [ "" "alsa" "pulseaud rustPlatform.buildRustPackage rec { pname = "spotify-player"; - version = "0.18.2"; + version = "0.19.1"; src = fetchFromGitHub { owner = "aome510"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-bLUPQgqSsE9tF5YiFj5B+Ylyy96DhWFNjwqXbQ9H8uc="; + hash = "sha256-R8F7s8FPnCe+shNUN/u0qcxFy3IbyfVo2xZ5/E/qwaw="; }; - cargoHash = "sha256-rptGA7J63rHdmxuPIguhZYYs8tZbpidJ0fXroBBoEIM="; + cargoHash = "sha256-7vximGisIIXBrwHXSWQjO08OraaweG7ZT6v+gVdYGVc="; nativeBuildInputs = [ pkg-config cmake rustPlatform.bindgenHook - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ makeBinaryWrapper ]; @@ -60,14 +61,14 @@ rustPlatform.buildRustPackage rec { ++ lib.optionals withSixel [ libsixel ] ++ lib.optionals (withAudioBackend == "alsa") [ alsa-lib ] ++ lib.optionals (withAudioBackend == "pulseaudio") [ libpulseaudio ] - ++ lib.optionals (withAudioBackend == "rodio" && stdenv.isLinux) [ alsa-lib ] + ++ lib.optionals (withAudioBackend == "rodio" && stdenv.hostPlatform.isLinux) [ alsa-lib ] ++ lib.optionals (withAudioBackend == "portaudio") [ portaudio ] ++ lib.optionals (withAudioBackend == "jackaudio") [ libjack2 ] ++ lib.optionals (withAudioBackend == "rodiojack") [ alsa-lib libjack2 ] ++ lib.optionals (withAudioBackend == "sdl") [ SDL2 ] ++ lib.optionals (withAudioBackend == "gstreamer") [ gst_all_1.gstreamer gst_all_1.gst-devtools gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good ] - ++ lib.optionals (stdenv.isDarwin && withMediaControl) [ darwin.apple_sdk.frameworks.MediaPlayer ] - ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + ++ lib.optionals (stdenv.hostPlatform.isDarwin && withMediaControl) [ darwin.apple_sdk.frameworks.MediaPlayer ] + ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ AppKit AudioUnit Cocoa @@ -83,10 +84,11 @@ rustPlatform.buildRustPackage rec { ++ lib.optionals withDaemon [ "daemon" ] ++ lib.optionals withNotify [ "notify" ] ++ lib.optionals withStreaming [ "streaming" ] - ++ lib.optionals withSixel [ "sixel" ]; + ++ lib.optionals withSixel [ "sixel" ] + ++ lib.optionals withFuzzy [ "fzf" ]; # sixel-sys is dynamically linked to libsixel - postInstall = lib.optionals (stdenv.isDarwin && withSixel) '' + postInstall = lib.optionals (stdenv.hostPlatform.isDarwin && withSixel) '' wrapProgram $out/bin/spotify_player \ --prefix DYLD_LIBRARY_PATH : "${lib.makeLibraryPath [libsixel]}" ''; @@ -97,6 +99,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/aome510/spotify-player/releases/tag/v${version}"; mainProgram = "spotify_player"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ dit7ya xyven1 ]; + maintainers = with lib.maintainers; [ dit7ya xyven1 _71zenith ]; }; } diff --git a/pkgs/applications/audio/spotify-qt/default.nix b/pkgs/applications/audio/spotify-qt/default.nix index 0fbf7c9438427..cbe252bc2b946 100644 --- a/pkgs/applications/audio/spotify-qt/default.nix +++ b/pkgs/applications/audio/spotify-qt/default.nix @@ -27,7 +27,7 @@ mkDerivation rec { installFlags = [ "DESTDIR=$(out)" ]; - postInstall = lib.optionalString stdenvNoCC.isDarwin '' + postInstall = lib.optionalString stdenvNoCC.hostPlatform.isDarwin '' mkdir -p $out/Applications mv $out/bin/spotify-qt.app $out/Applications ln $out/Applications/spotify-qt.app/Contents/MacOS/spotify-qt $out/bin/spotify-qt diff --git a/pkgs/applications/audio/spotify/darwin.nix b/pkgs/applications/audio/spotify/darwin.nix index 25899ad167835..bc643d4f1b6ee 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 ( + src = if stdenv.hostPlatform.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 ]; @@ -36,6 +36,6 @@ stdenv.mkDerivation { ''; meta = meta // { - maintainers = with lib.maintainers; [ Enzime ]; + maintainers = with lib.maintainers; [ matteopacini ]; }; } diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index df6d762c65efd..fe49e680908f0 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -18,6 +18,6 @@ let mainProgram = "spotify"; }; -in if stdenv.isDarwin +in if stdenv.hostPlatform.isDarwin then callPackage ./darwin.nix (extraArgs // { inherit pname meta; }) else callPackage ./linux.nix (extraArgs // { inherit pname meta; }) diff --git a/pkgs/applications/audio/spotify/linux.nix b/pkgs/applications/audio/spotify/linux.nix index 8886e851c3c95..3383e47cb8fe6 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 @@ -14,14 +14,14 @@ let # If an update breaks things, one of those might have valuable info: # https://aur.archlinux.org/packages/spotify/ # https://community.spotify.com/t5/Desktop-Linux - version = "1.2.37.701.ge66eb7bc"; + version = "1.2.45.454.gc16ec9f6"; # To get the latest stable revision: # curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/spotify?channel=stable' | jq '.download_url,.version,.last_updated' # To get general information: # curl -H 'Snap-Device-Series: 16' 'https://api.snapcraft.io/v2/snaps/info/spotify' | jq '.' # More examples of api usage: # https://github.com/canonical-websites/snapcraft.io/blob/master/webapp/publisher/snaps/views.py - rev = "76"; + rev = "79"; deps = [ alsa-lib @@ -88,7 +88,7 @@ stdenv.mkDerivation { src = fetchurl { name = "spotify-${version}-${rev}.snap"; url = "https://api.snapcraft.io/api/v1/snaps/download/pOBIoZ2LrCB3rDohMxoYGnbN14EHOgD7_${rev}.snap"; - hash = "sha512-k7aw1QM3NCFkm0tXcHgYyeEBagGFpCL6JdWlFruJszPloiCy5vopOsD4PdqyiSEs0rSUP0rLxX2UBs3XuI5cUA=="; + hash = "sha512-F1Npz/oKCsMKaQx2M5dm1dhWhaSlt8422tpRWnwuk2yjwLWrOYDY2uKYph8YFXfOdS3mV6u5yVlzgFdDqAFmCQ=="; }; nativeBuildInputs = [ wrapGAppsHook3 makeShellWrapper squashfsTools ]; @@ -133,8 +133,6 @@ stdenv.mkDerivation { mkdir -p $libdir mv ./usr/* $out/ - cp meta/snap.yaml $out - # Work around Spotify referring to a specific minor version of # OpenSSL. @@ -179,13 +177,13 @@ 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 ''; meta = meta // { - maintainers = with lib.maintainers; [ eelco ftrvxmtrx sheenobu timokau ma27 ]; + maintainers = with lib.maintainers; [ ftrvxmtrx sheenobu timokau ma27 ]; }; } diff --git a/pkgs/applications/audio/spotifyd/default.nix b/pkgs/applications/audio/spotifyd/default.nix deleted file mode 100644 index 13c85e7d3584c..0000000000000 --- a/pkgs/applications/audio/spotifyd/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, rustPackages, pkg-config, openssl -, withALSA ? true, alsa-lib -, withPulseAudio ? false, libpulseaudio -, withPortAudio ? false, portaudio -, withMpris ? false -, withKeyring ? false -, dbus -}: - -rustPackages.rustPlatform.buildRustPackage rec { - pname = "spotifyd"; - version = "0.3.5-unstable-2024-02-18"; - - src = fetchFromGitHub { - owner = "Spotifyd"; - repo = "spotifyd"; - rev = "ff2f7a06e54bf05afd57a0243dc9f67abc15f040"; - hash = "sha256-nebAd4a+ht+blRP52OF830/Dm15ZPwRL4IPWmmT9ViM="; - }; - - cargoHash = "sha256-6BRIMTrWTwvX3yIGEYEvigMT+n4EtaruMdrej2Dd49w="; - - nativeBuildInputs = [ pkg-config ]; - - buildInputs = lib.optionals stdenv.isLinux [ openssl ] - ++ lib.optional withALSA alsa-lib - ++ lib.optional withPulseAudio libpulseaudio - ++ lib.optional withPortAudio portaudio - ++ lib.optional (withMpris || withKeyring) dbus; - - buildNoDefaultFeatures = true; - buildFeatures = lib.optional withALSA "alsa_backend" - ++ lib.optional withPulseAudio "pulseaudio_backend" - ++ lib.optional withPortAudio "portaudio_backend" - ++ lib.optional withMpris "dbus_mpris" - ++ lib.optional withKeyring "dbus_keyring"; - - doCheck = false; - - meta = with lib; { - description = "Open source Spotify client running as a UNIX daemon"; - homepage = "https://spotifyd.rs/"; - changelog = "https://github.com/Spotifyd/spotifyd/blob/${src.rev}/CHANGELOG.md"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ anderslundstedt Br1ght0ne ]; - platforms = platforms.unix; - mainProgram = "spotifyd"; - }; -} diff --git a/pkgs/applications/audio/stochas/default.nix b/pkgs/applications/audio/stochas/default.nix index 4f7ff6b6b5b41..33d9b050a1ff9 100644 --- a/pkgs/applications/audio/stochas/default.nix +++ b/pkgs/applications/audio/stochas/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "surge-synthesizer"; repo = pname; rev = "v${version}"; - sha256 = "sha256-L7dzUUQNCwcuQavUx9hBH0FX5KSocfeYUv5qBcPD2Vg="; + hash = "sha256-L7dzUUQNCwcuQavUx9hBH0FX5KSocfeYUv5qBcPD2Vg="; fetchSubmodules = true; }; diff --git a/pkgs/applications/audio/stone-phaser/default.nix b/pkgs/applications/audio/stone-phaser/default.nix index 6bef356172cd5..f581ae1b1cb64 100644 --- a/pkgs/applications/audio/stone-phaser/default.nix +++ b/pkgs/applications/audio/stone-phaser/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=$(out)" ]; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); homepage = "https://github.com/jpcima/stone-phaser"; description = "Classic analog phaser effect, made with DPF and Faust"; maintainers = [ maintainers.magnetophon ]; diff --git a/pkgs/applications/audio/strawberry/default.nix b/pkgs/applications/audio/strawberry/default.nix index 0646099973ffa..7fedaf3c2fd8d 100644 --- a/pkgs/applications/audio/strawberry/default.nix +++ b/pkgs/applications/audio/strawberry/default.nix @@ -44,13 +44,13 @@ let in stdenv.mkDerivation rec { pname = "strawberry"; - version = "1.0.23"; + version = "1.1.2"; src = fetchFromGitHub { owner = "jonaski"; repo = pname; rev = version; - hash = "sha256-hzZx530HD7R3JOG6cCsoaW9puYkmu7m5lr+EfobKX7o="; + hash = "sha256-86AMmp8R9/NibTsMFTTFcMeIqZ5x8din9RcBvhGO9xg="; fetchSubmodules = true; }; @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { taglib qtbase qtx11extras - ] ++ optionals stdenv.isLinux [ + ] ++ optionals stdenv.hostPlatform.isLinux [ libgpod libpulseaudio libselinux @@ -101,7 +101,7 @@ stdenv.mkDerivation rec { pkg-config qttools wrapQtAppsHook - ] ++ optionals stdenv.isLinux [ + ] ++ optionals stdenv.hostPlatform.isLinux [ util-linux ]; diff --git a/pkgs/applications/audio/surge-XT/default.nix b/pkgs/applications/audio/surge-XT/default.nix index 08dd794275d68..3169cddfa7d58 100644 --- a/pkgs/applications/audio/surge-XT/default.nix +++ b/pkgs/applications/audio/surge-XT/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { repo = "surge"; rev = "release_xt_${version}"; fetchSubmodules = true; - sha256 = "sha256-r8CZxjmH9lfCizc95jRB4je+R/74zMqRMlGIZxxxriw="; + hash = "sha256-r8CZxjmH9lfCizc95jRB4je+R/74zMqRMlGIZxxxriw="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/swh-lv2/default.nix b/pkgs/applications/audio/swh-lv2/default.nix index 338877d2be21f..224ab749593dd 100644 --- a/pkgs/applications/audio/swh-lv2/default.nix +++ b/pkgs/applications/audio/swh-lv2/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { generators, surround encoders and more. ''; license = licenses.gpl3; - maintainers = [ maintainers.goibhniu ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/audio/synthv1/default.nix b/pkgs/applications/audio/synthv1/default.nix index 77dfec0dd8e6d..a42671b3d303d 100644 --- a/pkgs/applications/audio/synthv1/default.nix +++ b/pkgs/applications/audio/synthv1/default.nix @@ -19,6 +19,6 @@ mkDerivation rec { homepage = "https://synthv1.sourceforge.io/"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = [ maintainers.goibhniu ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/audio/tageditor/default.nix b/pkgs/applications/audio/tageditor/default.nix index af45e965b7ec4..173ced9ca525f 100644 --- a/pkgs/applications/audio/tageditor/default.nix +++ b/pkgs/applications/audio/tageditor/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "tageditor"; - version = "3.9.0"; + version = "3.9.3"; src = fetchFromGitHub { owner = "martchus"; repo = pname; rev = "v${version}"; - hash = "sha256-caki8WVnu8ELE2mXwRvT9TTTXCtMZEa0E3KVpHl05jg="; + hash = "sha256-KAtOnTf3foOILDfTjVpkCOG6jsyS5fv0/Wv9Zcut2oE="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/tagger/default.nix b/pkgs/applications/audio/tagger/default.nix index 4298702073393..a8074cef40747 100644 --- a/pkgs/applications/audio/tagger/default.nix +++ b/pkgs/applications/audio/tagger/default.nix @@ -1,67 +1,64 @@ { lib -, stdenv +, buildDotnetModule , fetchFromGitHub -, meson -, ninja -, pkg-config -, jsoncpp -, taglib -, curl -, curlpp +, dotnetCorePackages +, blueprint-compiler +, chromaprint , glib , gtk4 , libadwaita -, wrapGAppsHook4 -, desktop-file-utils -, chromaprint # fpcalc }: -stdenv.mkDerivation rec { +let + dotnet = dotnetCorePackages.dotnet_8; +in + +buildDotnetModule rec { pname = "tagger"; - version = "2022.11.2"; + version = "2024.6.0-1"; src = fetchFromGitHub { owner = "nlogozzo"; repo = "NickvisionTagger"; rev = version; - hash = "sha256-gFpnTuUROYwPANrkD+g7a3FHSCVY2oB97flCK+LLowY="; + hash = "sha256-4OfByQYhLXmeFWxzhqt8d7pLUyuMLhDM20E2YcA9Q3s="; }; + projectFile = "NickvisionTagger.GNOME/NickvisionTagger.GNOME.csproj"; + dotnet-sdk = dotnet.sdk; + dotnet-runtime = dotnet.runtime; + nugetDeps = ./deps.nix; + nativeBuildInputs = [ - meson - ninja - pkg-config - wrapGAppsHook4 - desktop-file-utils + blueprint-compiler + libadwaita ]; buildInputs = [ + chromaprint + ]; + + runtimeDeps = [ glib gtk4 libadwaita - jsoncpp - taglib - curl - curlpp ]; - # Don't install compiled binary - postPatch = '' - sed -i '/fpcalc/d' meson.build - ''; + executables = [ "NickvisionTagger.GNOME" ]; - preFixup = '' - gappsWrapperArgs+=( - --prefix PATH : "${lib.makeBinPath [ chromaprint ]}" - ) + postInstall = '' + substituteInPlace NickvisionTagger.Shared/Linux/org.nickvision.tagger.desktop.in --replace '@EXEC@' "NickvisionTagger.GNOME" + install -Dm444 NickvisionTagger.Shared/Resources/org.nickvision.tagger.svg -t $out/share/icons/hicolor/scalable/apps/ + install -Dm444 NickvisionTagger.Shared/Resources/org.nickvision.tagger-symbolic.svg -t $out/share/icons/hicolor/symbolic/apps/ + install -Dm444 NickvisionTagger.Shared/Linux/org.nickvision.tagger.desktop.in -T $out/share/applications/org.nickvision.tagger.desktop ''; meta = with lib; { description = "Easy-to-use music tag (metadata) editor"; - homepage = "https://github.com/nlogozzo/NickvisionTagger"; - mainProgram = "org.nickvision.tagger"; - license = licenses.gpl3Plus; + homepage = "https://github.com/NickvisionApps/Tagger"; + mainProgram = "NickvisionTagger.GNOME"; + license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ zendo ]; + maintainers = with maintainers; [ zendo ratcornu ]; }; } diff --git a/pkgs/applications/audio/tagger/deps.nix b/pkgs/applications/audio/tagger/deps.nix new file mode 100644 index 0000000000000..231c388ebe678 --- /dev/null +++ b/pkgs/applications/audio/tagger/deps.nix @@ -0,0 +1,50 @@ +# This file was automatically generated by passthru.fetch-deps. +# Please dont edit it manually, your changes might get overwritten! + +{ fetchNuGet }: [ + (fetchNuGet { pname = "Ace4896.DBus.Services.Secrets"; version = "1.2.0"; hash = "sha256-dgGnQL+y7UubFgG0dVmuz1J/uMhR7bOirKA38dHmOcQ="; }) + (fetchNuGet { pname = "AcoustID.NET"; version = "1.3.3"; hash = "sha256-VF7GwQhk9hVBToj9K2UK356H6toDugMI/rosAT2P2TY="; }) + (fetchNuGet { pname = "Cake.Tool"; version = "4.0.0"; hash = "sha256-guIxNh+ENqZroPaoh7bJ+R0OP9Ed64BAMYSbWKMrbIc="; }) + (fetchNuGet { pname = "FuzzySharp"; version = "2.0.2"; hash = "sha256-GuWqVOo+AG8MSvIbusLPjKfJFQRJhSSJ9eGWljTBA/c="; }) + (fetchNuGet { pname = "GetText.NET"; version = "1.9.14"; hash = "sha256-JAFqmwXkRJCHMOLIN2NShSe5aXtDvo5+II412oBj5KM="; }) + (fetchNuGet { pname = "GirCore.Adw-1"; version = "0.5.0"; hash = "sha256-qfXR3lTI5IeFlZ+eoXiEjvvU7a94ksDA1NDDO+fjEow="; }) + (fetchNuGet { pname = "GirCore.Cairo-1.0"; version = "0.5.0"; hash = "sha256-9vu8cLiI8UJzIwcx/EtNPp0uYBTAYYP7f+K4+78cLfU="; }) + (fetchNuGet { pname = "GirCore.FreeType2-2.0"; version = "0.5.0"; hash = "sha256-ngF0UjqeWWPJM6oHWe1Ii+h1BUccFDQd1Qwz35DNCJk="; }) + (fetchNuGet { pname = "GirCore.Gdk-4.0"; version = "0.5.0"; hash = "sha256-pl04bEdh1kzjzT2MgENyitvU9YNU+7zdxzSQBF+iVuw="; }) + (fetchNuGet { pname = "GirCore.GdkPixbuf-2.0"; version = "0.5.0"; hash = "sha256-2dY45sZRqLAHjXx8G3aLGnftJuMS/367E7oMAtlkdT0="; }) + (fetchNuGet { pname = "GirCore.Gio-2.0"; version = "0.5.0"; hash = "sha256-lEcxgUtvw+/wP68h1xXLodjALdFgA8fWlP8e75kcovs="; }) + (fetchNuGet { pname = "GirCore.GLib-2.0"; version = "0.5.0"; hash = "sha256-e8/5XRtUr5PMROr9t3t1y+S5ittGigeMvkC1x0AaPpk="; }) + (fetchNuGet { pname = "GirCore.GObject-2.0"; version = "0.5.0"; hash = "sha256-cobt8ueN6++TqbOfSn1yKYkjCKlpRc04te8BW2dQZfA="; }) + (fetchNuGet { pname = "GirCore.Graphene-1.0"; version = "0.5.0"; hash = "sha256-mF5paOfxW2T/BIa9MSRBCXI0IxyjPEiHSVAl+58ZyJs="; }) + (fetchNuGet { pname = "GirCore.Gsk-4.0"; version = "0.5.0"; hash = "sha256-joLS4KfAWkp3z8r7i5MtBDotTv2zMnYRw2bTQNNATJQ="; }) + (fetchNuGet { pname = "GirCore.Gtk-4.0"; version = "0.5.0"; hash = "sha256-LN/u9QuAxRMDJfly1LeMwCgJMkTeZyJJ4unrmTpORlI="; }) + (fetchNuGet { pname = "GirCore.HarfBuzz-0.0"; version = "0.5.0"; hash = "sha256-hBFkQK/LPSTIU8M8Tv0hyRG4d4ibh/Iaa3ZySYpg0TI="; }) + (fetchNuGet { pname = "GirCore.Pango-1.0"; version = "0.5.0"; hash = "sha256-6cxAaxynKx7kTsLy++qcrhD+G7OBfVRYohe1MX3Sk1w="; }) + (fetchNuGet { pname = "GirCore.PangoCairo-1.0"; version = "0.5.0"; hash = "sha256-tpIeKhZPrntKIFkeMIYyDHgOSw2Il/L4E7OpBHsUo0g="; }) + (fetchNuGet { pname = "HtmlAgilityPack"; version = "1.11.61"; hash = "sha256-exRJTP7mHNt31CKaejKSSkKPm74ratfnpGl50AqZwlY="; }) + (fetchNuGet { pname = "Markdig"; version = "0.33.0"; hash = "sha256-OWlYrZnvNIFwmxKnmfWTq1wOz9e+hewsiVJW3B43QLY="; }) + (fetchNuGet { pname = "MetaBrainz.Common"; version = "3.0.0"; hash = "sha256-P+XTQhffqSVIn0ZbC5Npl80xlx1QYHoL0y20KTvKRy0="; }) + (fetchNuGet { pname = "MetaBrainz.Common.Json"; version = "6.0.2"; hash = "sha256-4IcF9xZZmI3H7WAiuN2kK61BMXS4gh2T2WrCqkwQhX8="; }) + (fetchNuGet { pname = "MetaBrainz.MusicBrainz"; version = "6.1.0"; hash = "sha256-wZBTTSQNPll/5/sZPPxa6d0QBjwA8FLA2vFE/838VWs="; }) + (fetchNuGet { pname = "MetaBrainz.MusicBrainz.CoverArt"; version = "6.0.0"; hash = "sha256-yN+godNeB6l8ihNupq9cNe+PaYaPTngHJzwkMH9ySbE="; }) + (fetchNuGet { pname = "Meziantou.Framework.Win32.CredentialManager"; version = "1.4.5"; hash = "sha256-aJyLlVg6jKY2Van0hwAC5JEF/j+YtEq5ZFLkyI3scsY="; }) + (fetchNuGet { pname = "Microsoft.Data.Sqlite.Core"; version = "8.0.0"; hash = "sha256-aew8/vRyzCc7MMNHziR8tsg66EFkJC+Snst3F+a3Ehc="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "5.0.0"; hash = "sha256-5rFBJ8Fkw7+11iCG9nMVhOqPCpyVIrbUzrFQhc/2eHw="; }) + (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "8.0.0"; hash = "sha256-UcxurEamYD+Bua0PbPNMYAZaRulMrov8CfbJGIgTaRQ="; }) + (fetchNuGet { pname = "Nickvision.Aura"; version = "2023.11.4"; hash = "sha256-us9K5RayuZGe2fkhk/c2Qw45gKmrfvyNBvHdcOnzWj0="; }) + (fetchNuGet { pname = "Octokit"; version = "9.0.0"; hash = "sha256-5crRhibEw2pl8M6AmgutI/uA0xcBoFRSF43MDgNPhE8="; }) + (fetchNuGet { pname = "SixLabors.ImageSharp"; version = "3.1.4"; hash = "sha256-zOqHVIInvJiqmx4JF+8USYvdKAGRZVUqQpdncrrjRjM="; }) + (fetchNuGet { pname = "SQLitePCLRaw.bundle_e_sqlcipher"; version = "2.1.6"; hash = "sha256-ikaVYtmka8VuZ2BDbH4rkT/L19uLMZnUIZSdSfzpYpc="; }) + (fetchNuGet { pname = "SQLitePCLRaw.core"; version = "2.1.6"; hash = "sha256-RxWjm52PdmMV98dgDy0BCpF988+BssRZUgALLv7TH/E="; }) + (fetchNuGet { pname = "SQLitePCLRaw.lib.e_sqlcipher"; version = "2.1.6"; hash = "sha256-HyCw64Ir+JTmAQpBRR2Y7L/o1l+RiwoL9URDXoJVhTY="; }) + (fetchNuGet { pname = "SQLitePCLRaw.provider.e_sqlcipher"; version = "2.1.6"; hash = "sha256-OD+cJ6dvUv/bYhMR9hWnsz23un1CHH5WKEnwghtpqMs="; }) + (fetchNuGet { pname = "System.Drawing.Common"; version = "8.0.0"; hash = "sha256-xPNnKUTcZiqnTtRgI2YazMoZgay/prwKrJjbZUbVmcg="; }) + (fetchNuGet { pname = "System.IO.Pipelines"; version = "6.0.0"; hash = "sha256-xfjF4UqTMJpf8KsBWUyJlJkzPTOO/H5MW023yTYNQSA="; }) + (fetchNuGet { pname = "System.Memory"; version = "4.5.3"; hash = "sha256-Cvl7RbRbRu9qKzeRBWjavUkseT2jhZBUWV1SPipUWFk="; }) + (fetchNuGet { pname = "System.Memory"; version = "4.5.5"; hash = "sha256-EPQ9o1Kin7KzGI5O3U3PUQAZTItSbk9h/i4rViN3WiI="; }) + (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "8.0.0"; hash = "sha256-fjCLQc1PRW0Ix5IZldg0XKv+J1DqPSfu9pjMyNBp7dE="; }) + (fetchNuGet { pname = "Tmds.DBus"; version = "0.15.0"; hash = "sha256-hnG44eEULZY79phZ/E1/RG2acjW0y12eIxam67iR5a8="; }) + (fetchNuGet { pname = "Tmds.DBus.Protocol"; version = "0.15.0"; hash = "sha256-4gk2vXDjKFaBh82gTkwg3c/5GRjiH+bvM5elfDSbKTU="; }) + (fetchNuGet { pname = "Ude.NetStandard"; version = "1.2.0"; hash = "sha256-9Dq7UE5OiuvciURQV8Aa13elolt1fzDhvF8c8Yxznhw="; }) + (fetchNuGet { pname = "z440.atl.core"; version = "5.25.0"; hash = "sha256-wyhSBvwzIXFLERBCr2s1zebaebOVANvUcwmJkrNdJi8="; }) +] diff --git a/pkgs/applications/audio/tap-plugins/default.nix b/pkgs/applications/audio/tap-plugins/default.nix deleted file mode 100644 index 7cd64eb420868..0000000000000 --- a/pkgs/applications/audio/tap-plugins/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, ladspa-sdk -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "tap-plugins"; - version = "unstable-2020-12-09"; - - src = fetchFromGitHub { - owner = "tomscii"; - repo = "tap-plugins"; - rev = "5d882799f37dffe37fc73451f2c5b4fb24316f3b"; - hash = "sha256-bwybMxIAbOzPr43QGshjbnRK5GdziGiYDsTutZdSj4s="; - }; - - buildInputs = [ - ladspa-sdk - ]; - - postPatch = '' - substituteInPlace Makefile --replace /usr/local "$out" - ''; - - meta = { - homepage = "https://tomscii.sig7.se/tap-plugins/"; - description = "Tom's Audio Processing plugins"; - longDescription = '' - A number of LADSPA plugins including: TAP AutoPanner, TAP Chorus/Flanger, - TAP DeEsser, TAP Dynamics (Mono & Stereo), TAP Equalizer and TAP - Equalizer/BW, TAP Fractal Doubler, TAP Pink/Fractal Noise, TAP Pitch - Shifter, TAP Reflector, TAP Reverberator, TAP Rotary Speaker, TAP Scaling - Limiter, TAP Sigmoid Booster, TAP Stereo Echo, TAP Tremolo, TAP - TubeWarmth, TAP Vibrato. - ''; - license = lib.licenses.gpl3Plus; - maintainers = [ lib.maintainers.AndersonTorres ]; - platforms = lib.platforms.unix; - }; -}) diff --git a/pkgs/applications/audio/tauon/default.nix b/pkgs/applications/audio/tauon/default.nix index 990f0601c51dc..3ed875b668bae 100644 --- a/pkgs/applications/audio/tauon/default.nix +++ b/pkgs/applications/audio/tauon/default.nix @@ -1,38 +1,40 @@ -{ lib -, stdenv -, fetchFromGitHub -, pkg-config -, python3Packages -, ffmpeg -, flac -, libjxl -, librsvg -, gobject-introspection -, gtk3 -, kissfft -, libappindicator -, libnotify -, libsamplerate -, libvorbis -, miniaudio -, mpg123 -, libopenmpt -, opusfile -, wavpack -, pango -, pulseaudio -, withDiscordRPC ? false +{ + lib, + stdenv, + fetchFromGitHub, + kissfft, + miniaudio, + pkg-config, + python3Packages, + gobject-introspection, + flac, + game-music-emu, + gtk3, + libappindicator, + libnotify, + libopenmpt, + librsvg, + libsamplerate, + libvorbis, + mpg123, + opusfile, + pango, + pipewire, + wavpack, + ffmpeg, + pulseaudio, + withDiscordRPC ? true, }: stdenv.mkDerivation (finalAttrs: { pname = "tauon"; - version = "7.7.2"; + version = "7.8.3"; src = fetchFromGitHub { owner = "Taiko2k"; - repo = "TauonMusicBox"; + repo = "Tauon"; rev = "v${finalAttrs.version}"; - hash = "sha256-IVl7XL6nn42zaY4bDraF9os0dXfquUql4E96djfVdVg="; + hash = "sha256-A7JRJ0Eh0ynuwPYZFLEeqWLf6OKdN59jM2vozdpSZC8="; }; postUnpack = '' @@ -45,26 +47,24 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' substituteInPlace tauon.py \ - --replace 'install_mode = False' 'install_mode = True' \ - --replace 'install_directory = os.path.dirname(os.path.abspath(__file__))' 'install_directory = "${placeholder "out"}/share/tauon"' + --replace-fail 'install_mode = False' 'install_mode = True' \ + --replace-fail 'install_directory = os.path.dirname(os.path.abspath(__file__))' 'install_directory = "${placeholder "out"}/share/tauon"' substituteInPlace t_modules/t_main.py \ - --replace 'install_mode = False' 'install_mode = True' \ - --replace 'libopenmpt.so' '${lib.getLib libopenmpt}/lib/libopenmpt.so' \ - --replace 'lib/libphazor.so' '../../lib/libphazor.so' + --replace-fail 'install_mode = False' 'install_mode = True' \ + --replace-fail 'libopenmpt.so' '${lib.getLib libopenmpt}/lib/libopenmpt.so' substituteInPlace t_modules/t_phazor.py \ - --replace 'lib/libphazor.so' '../../lib/libphazor.so' + --replace-fail 'lib/libphazor' '../../lib/libphazor' - patchShebangs compile-phazor.sh + substituteInPlace compile-phazor*.sh --replace-fail 'gcc' '${stdenv.cc.targetPrefix}cc' - substituteInPlace compile-phazor.sh --replace 'gcc' '${stdenv.cc.targetPrefix}cc' - - substituteInPlace extra/tauonmb.desktop --replace 'Exec=/opt/tauon-music-box/tauonmb.sh' 'Exec=${placeholder "out"}/bin/tauon' + substituteInPlace extra/tauonmb.desktop --replace-fail 'Exec=/opt/tauon-music-box/tauonmb.sh' 'Exec=${placeholder "out"}/bin/tauon' ''; postBuild = '' - ./compile-phazor.sh + bash ./compile-phazor.sh + bash ./compile-phazor-pipewire.sh ''; nativeBuildInputs = [ @@ -75,6 +75,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ flac + game-music-emu gtk3 libappindicator libnotify @@ -85,35 +86,42 @@ stdenv.mkDerivation (finalAttrs: { mpg123 opusfile pango + pipewire wavpack ]; - pythonPath = with python3Packages; [ - beautifulsoup4 - gst-python - dbus-python - isounidecode - libjxl - musicbrainzngs - mutagen - natsort - pillow - plexapi - pycairo - pychromecast - pylast - pygobject3 - pylyrics - pysdl2 - requests - send2trash - setproctitle - ] ++ lib.optional withDiscordRPC pypresence - ++ lib.optional stdenv.isLinux pulsectl; + pythonPath = + with python3Packages; + [ + beautifulsoup4 + dbus-python + unidecode + jxlpy + musicbrainzngs + mutagen + natsort + pillow + plexapi + pycairo + pychromecast + pylast + pygobject3 + pysdl2 + requests + send2trash + setproctitle + ] + ++ lib.optional withDiscordRPC pypresence + ++ lib.optional stdenv.hostPlatform.isLinux pulsectl; makeWrapperArgs = [ - "--prefix PATH : ${lib.makeBinPath [ffmpeg]}" - "--prefix LD_LIBRARY_PATH : ${pulseaudio}/lib" + "--prefix PATH : ${lib.makeBinPath [ ffmpeg ]}" + "--prefix LD_LIBRARY_PATH : ${ + lib.makeLibraryPath [ + game-music-emu + pulseaudio + ] + }" "--prefix PYTHONPATH : $out/share/tauon" "--set GI_TYPELIB_PATH $GI_TYPELIB_PATH" ]; diff --git a/pkgs/applications/audio/tenacity/default.nix b/pkgs/applications/audio/tenacity/default.nix index c5606677fd45c..0ef4ed73787bc 100644 --- a/pkgs/applications/audio/tenacity/default.nix +++ b/pkgs/applications/audio/tenacity/default.nix @@ -29,7 +29,7 @@ , expat , libid3tag , libopus -, ffmpeg_5 +, ffmpeg , soundtouch , pcre , portaudio @@ -97,14 +97,14 @@ stdenv.mkDerivation rec { makeWrapper pkg-config python3 - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ linuxHeaders ]; buildInputs = [ alsa-lib expat - ffmpeg_5 + ffmpeg file flac glib @@ -129,7 +129,7 @@ stdenv.mkDerivation rec { twolame wxGTK32 gtk3 - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ at-spi2-core dbus libepoxy diff --git a/pkgs/applications/audio/termusic/default.nix b/pkgs/applications/audio/termusic/default.nix index c36240558b722..c4a42aa3837c7 100644 --- a/pkgs/applications/audio/termusic/default.nix +++ b/pkgs/applications/audio/termusic/default.nix @@ -6,11 +6,13 @@ , dbus , Foundation , fetchFromGitHub +, fetchpatch , glib , gst_all_1 , IOKit , lib , MediaPlayer +, mpv-unwrapped , openssl , pkg-config , protobuf @@ -22,26 +24,42 @@ rustPlatform.buildRustPackage rec { pname = "termusic"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "tramhao"; repo = "termusic"; rev = "v${version}"; - hash = "sha256-FOFZg32hrWpKVsjkMDkiqah7jmUZw0HRWGqOvsN0t8Q="; + hash = "sha256-aEkg1j6R86QGn21HBimtZwmjmW1K9Wo+67G4DlpY960="; }; + cargoPatches = [ + # both following patches can be removed with the follow up release to 0.9.1 as they are cherry-picked from `termusic/master` branch + # fix build issue with 0.9.1 release and vendoring producing wrong hash for soundtouch-ffi + (fetchpatch { + url = "https://github.com/tramhao/termusic/commit/211fc3fe008932d052d31d3b836e8a80eade3cfe.patch"; + hash = "sha256-11kSI28YonoTe5W31+R76lGhNiN1ZLAg94FrfYiZUAY="; + }) + # fix a bug through previous patch + (fetchpatch { + url = "https://github.com/tramhao/termusic/commit/2a40b2f366dfa5c1f008c79a3ff5c1bbf53fe10f.patch"; + hash = "sha256-b7CJ5SqxrU1Jr4GDaJe9sFutDHMqIQxGhXbBFGB6y84="; + }) + ]; + postPatch = '' pushd $cargoDepsCopy/stream-download oldHash=$(sha256sum src/lib.rs | cut -d " " -f 1) substituteInPlace $cargoDepsCopy/stream-download/src/lib.rs \ --replace-warn '#![doc = include_str!("../README.md")]' "" substituteInPlace .cargo-checksum.json \ - --replace $oldHash $(sha256sum src/lib.rs | cut -d " " -f 1) + --replace-warn $oldHash $(sha256sum src/lib.rs | cut -d " " -f 1) popd ''; - cargoHash = "sha256-r5FOl3Bp3GYhOhvWj/y6FXsuG2wvuFcMcYKBzVBVqiM="; + cargoHash = "sha256-4PprZdTIcYa8y7FwQVrG0ZBg7N/Xe6HDt/z6ZmaHd5Y="; + + useNextest = true; nativeBuildInputs = [ pkg-config @@ -53,9 +71,10 @@ rustPlatform.buildRustPackage rec { dbus glib gst_all_1.gstreamer + mpv-unwrapped openssl sqlite - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit CoreAudio CoreGraphics @@ -63,7 +82,7 @@ rustPlatform.buildRustPackage rec { IOKit MediaPlayer Security - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib ]; diff --git a/pkgs/applications/audio/tidal-hifi/default.nix b/pkgs/applications/audio/tidal-hifi/default.nix index e432560524faf..1a5b41808a752 100644 --- a/pkgs/applications/audio/tidal-hifi/default.nix +++ b/pkgs/applications/audio/tidal-hifi/default.nix @@ -4,6 +4,7 @@ , autoPatchelfHook , dpkg , makeWrapper +, wrapGAppsHook3 , alsa-lib , at-spi2-atk , at-spi2-core @@ -37,14 +38,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "tidal-hifi"; - version = "5.13.1"; + version = "5.16.0"; src = fetchurl { url = "https://github.com/Mastermindzh/tidal-hifi/releases/download/${finalAttrs.version}/tidal-hifi_${finalAttrs.version}_amd64.deb"; - sha256 = "sha256-TnvVm0qjm41if90+f9YtO8wR6NYg6oUZbZd0RiUU33M="; + sha256 = "sha256-gDinm7kILm4SKlWmaJ1grwRuketGs/aWlJfNEF+AIRo="; }; - nativeBuildInputs = [ autoPatchelfHook dpkg makeWrapper ]; + nativeBuildInputs = [ autoPatchelfHook dpkg makeWrapper wrapGAppsHook3 ]; buildInputs = [ alsa-lib diff --git a/pkgs/applications/audio/touchosc/default.nix b/pkgs/applications/audio/touchosc/default.nix index bc53b296357b6..e63be43fe6b5d 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,13 +39,13 @@ let ]; runBinDeps = [ - gnome.zenity + zenity ]; in stdenv.mkDerivation rec { pname = "touchosc"; - version = "1.3.3.207"; + version = "1.3.5.212"; suffix = { aarch64-linux = "linux-arm64"; @@ -56,9 +56,9 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://hexler.net/pub/${pname}/${pname}-${version}-${suffix}.deb"; hash = { - aarch64-linux = "sha256-peEO5haVHXvCT+F48UiKdgwuccqBuZACEXnepB4dcvY="; - armv7l-linux = "sha256-uQNoEye/Jd3T6pLJY2sN7hkTQl3AAilG5Vr9G61vFRM="; - x86_64-linux = "sha256-+/r9gRK8HyynlJ1syC2VQ6VboPEzsVNqEVrQfNLeEv0="; + aarch64-linux = "sha256-eaZNiZsmPHKvgvcfs8LcJjbHas+AlnRniBhAet1ld0E="; + armv7l-linux = "sha256-/ZIUen0qYRcfG6WmO3K3n1xIhUY3JqZFO7Pwnw3c/9c="; + x86_64-linux = "sha256-5KBrelfElsnGHcJObIj8CJ5L3jJO54tSjlEUcXhH/lE="; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; @@ -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 = [ ]; platforms = [ "aarch64-linux" "armv7l-linux" "x86_64-linux" ]; mainProgram = "TouchOSC"; }; diff --git a/pkgs/applications/audio/transcribe/default.nix b/pkgs/applications/audio/transcribe/default.nix index 785550a0a040b..16f0082ec7901 100644 --- a/pkgs/applications/audio/transcribe/default.nix +++ b/pkgs/applications/audio/transcribe/default.nix @@ -22,14 +22,14 @@ stdenv.mkDerivation rec { pname = "transcribe"; - version = "9.40.0"; + version = "9.41.2"; src = if stdenv.hostPlatform.system == "x86_64-linux" then fetchzip { url = "https://www.seventhstring.com/xscribe/downlo/xscsetup-${version}.tar.gz"; - sha256 = "sha256-GHTr1rk7Kh5M0UYnryUlCk/G6pW3p80GJ6Ai0zXdfNs="; + sha256 = "sha256-VWfjtNbwK9ZiWgs161ubRy+IjSXXk3FEfMkmA6Jhz8A="; } else throw "Platform not supported"; @@ -106,6 +106,7 @@ stdenv.mkDerivation rec { conventional music players. ''; homepage = "https://www.seventhstring.com/xscribe/"; + changelog = "https://www.seventhstring.com/xscribe/history.html"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ iwanb ]; diff --git a/pkgs/applications/audio/uade/default.nix b/pkgs/applications/audio/uade/default.nix index 8a7a336283cc4..b435bba66b961 100644 --- a/pkgs/applications/audio/uade/default.nix +++ b/pkgs/applications/audio/uade/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { owner = "uade-music-player"; repo = "uade"; rev = "uade-${version}"; - sha256 = "sha256-skPEXBQwyr326zCmZ2jwGxcBoTt3Y/h2hagDeeqbMpw="; + hash = "sha256-skPEXBQwyr326zCmZ2jwGxcBoTt3Y/h2hagDeeqbMpw="; }; postPatch = '' diff --git a/pkgs/applications/audio/vcv-rack/default.nix b/pkgs/applications/audio/vcv-rack/default.nix index 7a1ded3e2f82a..db7cdf11ba9cd 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 @@ -36,8 +36,8 @@ let pffft-source = fetchFromBitbucket { owner = "jpommier"; repo = "pffft"; - rev = "38946c766c1afecfa4c5945af77913e38b3cec31"; - sha256 = "1w6g9v9fy7bavqacb6qw1nxhcik2w36cvl2d7b0bh68w0pd70j5q"; + rev = "fbc4058602803f40dc554b8a5d2bcc694c005f2f"; + sha256 = "16biji3115232cr1j975hpxw68lfybajlspnhfjcwg8jz2d8ybrf"; }; fuzzysearchdatabase-source = fetchFromBitbucket { owner = "j_norberg"; @@ -64,28 +64,28 @@ let sha256 = "1d3058x6wgzw7b0wai792flk7s6ffw0z4n9sl016v91yjwv7ds3a"; }; oui-blendish-source = fetchFromGitHub { - owner = "AndrewBelt"; + owner = "VCVRack"; repo = "oui-blendish"; rev = "2fc6405883f8451944ed080547d073c8f9f31898"; - sha256 = "/QZFZuI5kSsEvSfMJlcqB1HiZ9Vcf3vqLqWIMEgxQK8="; + sha256 = "1bs0654312555vm7nzswsmky4l8759bjdk17pl22p49rw9k4a1px"; }; simde-source = fetchFromGitHub { owner = "simd-everywhere"; repo = "simde"; - rev = "b309d8951997201e493380a2fd09198c09ae1b4e"; - sha256 = "1hz8mfbhbiafvim4qrkyvh1yndlhydqkxwhls7cfqa48wkpxfip8"; + rev = "416091ebdb9e901b29d026633e73167d6353a0b0"; + sha256 = "064ygc6c737yjx04rydwwhkr4n4s4rbvj27swxwyzvp1h8nka6xf"; }; tinyexpr-source = fetchFromGitHub { owner = "codeplea"; repo = "tinyexpr"; - rev = "74804b8c5d296aad0866bbde6c27e2bc1d85e5f2"; - sha256 = "0z3r7wfw7p2wwl6wls2nxacirppr2147yz29whxmjaxy89ic1744"; + rev = "9907207e5def0fabdb60c443517b0d9e9d521393"; + sha256 = "0xbpd09zvrk2ppm1qm1skk6p50mqr9mzjixv3s0biqq6jpabs88l"; }; fundamental-source = fetchFromGitHub { owner = "VCVRack"; repo = "Fundamental"; - rev = "962547d7651260fb6a04f4d8aafd7c27f0221bee"; # tip of branch v2 - sha256 = "066gcjkni8ba98vv0di59x3f9piir0vyy5sb53cqrbrl51x853cg"; + rev = "5ed79544161e0fa9a55faa7c0a5f299e828e12ab"; # tip of branch v2 + sha256 = "0c6qpigyr0ppvra20hcy1fdcmqa212jckb9wkx4f6fgdby7565wv"; }; vcv-rtaudio = stdenv.mkDerivation rec { pname = "vcv-rtaudio"; @@ -112,7 +112,7 @@ let in stdenv.mkDerivation rec { pname = "vcv-rack"; - version = "2.4.1"; + version = "2.5.1"; desktopItems = [ (makeDesktopItem { @@ -132,7 +132,7 @@ stdenv.mkDerivation rec { owner = "VCVRack"; repo = "Rack"; rev = "v${version}"; - hash = "sha256-Gn/sFltLXX2mLv4dDqmr/UPd+JBXVkIZGwMI6Rm0Ih4="; + sha256 = "1q2bwjfn6crk9lyd6m3py0v754arw1xgpv5kkj6ka1bc2yz839qh"; }; patches = [ @@ -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/audio/vgmstream/default.nix b/pkgs/applications/audio/vgmstream/default.nix deleted file mode 100644 index 95d36296033ed..0000000000000 --- a/pkgs/applications/audio/vgmstream/default.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, gtk3 -, audacious, mpg123, ffmpeg, libvorbis, libao, jansson, speex -, nix-update-script -, buildAudaciousPlugin ? false # only build cli by default, pkgs.audacious-plugins sets this to enable plugin support -}: - -stdenv.mkDerivation rec { - pname = "vgmstream"; - version = "1917"; - - src = fetchFromGitHub { - owner = "vgmstream"; - repo = "vgmstream"; - rev = "refs/tags/r${version}"; - sha256 = "sha256-9HIa5/whdLouUWNFml7tPfXStIkO76dxUl5S4yiat64="; - }; - - passthru.updateScript = nix-update-script { - attrPath = "vgmstream"; - extraArgs = [ "--version-regex" "r(.*)" ]; - }; - - nativeBuildInputs = [ - cmake - pkg-config - ] ++ lib.optional buildAudaciousPlugin gtk3; - - buildInputs = [ - mpg123 - ffmpeg - libvorbis - libao - jansson - speex - ] ++ lib.optional buildAudaciousPlugin (audacious.override { audacious-plugins = null; }); - - preConfigure = '' - substituteInPlace cmake/dependencies/audacious.cmake \ - --replace "pkg_get_variable(AUDACIOUS_PLUGIN_DIR audacious plugin_dir)" "set(AUDACIOUS_PLUGIN_DIR \"$out/lib/audacious\")" - ''; - - cmakeFlags = [ - # It always tries to download it, no option to use the system one - "-DUSE_CELT=OFF" - ] ++ lib.optional (! buildAudaciousPlugin) "-DBUILD_AUDACIOUS=OFF"; - - meta = with lib; { - description = "Library for playback of various streamed audio formats used in video games"; - homepage = "https://vgmstream.org"; - maintainers = with maintainers; [ zane ]; - license = with licenses; isc; - platforms = with platforms; unix; - }; -} diff --git a/pkgs/applications/audio/viper4linux/default.nix b/pkgs/applications/audio/viper4linux/default.nix index 289c6fbf233f7..134e535a78342 100644 --- a/pkgs/applications/audio/viper4linux/default.nix +++ b/pkgs/applications/audio/viper4linux/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, pkg-config , gst_all_1 , libviperfx , makeWrapper diff --git a/pkgs/applications/audio/virtual-ans/default.nix b/pkgs/applications/audio/virtual-ans/default.nix index 4bec1952e03eb..22e18502866ae 100644 --- a/pkgs/applications/audio/virtual-ans/default.nix +++ b/pkgs/applications/audio/virtual-ans/default.nix @@ -43,13 +43,13 @@ stdenv.mkDerivation rec { ln -s $out/${startScript} $out/bin/virtual-ans ''; - startScript = if stdenv.isx86_32 then "START_LINUX_X86" - else if stdenv.isx86_64 then "START_LINUX_X86_64" - #else if stdenv.isDarwin then "START_MACOS.app" # disabled because I cannot test on Darwin + startScript = if stdenv.hostPlatform.isx86_32 then "START_LINUX_X86" + else if stdenv.hostPlatform.isx86_64 then "START_LINUX_X86_64" + #else if stdenv.hostPlatform.isDarwin then "START_MACOS.app" # disabled because I cannot test on Darwin else abort "Unsupported platform: ${stdenv.hostPlatform.linuxArch}."; - linuxExecutable = if stdenv.isx86_32 then "pixilang_linux_x86" - else if stdenv.isx86_64 then "pixilang_linux_x86_64" + linuxExecutable = if stdenv.hostPlatform.isx86_32 then "pixilang_linux_x86" + else if stdenv.hostPlatform.isx86_64 then "pixilang_linux_x86_64" else ""; meta = with lib; { diff --git a/pkgs/applications/audio/vkeybd/default.nix b/pkgs/applications/audio/vkeybd/default.nix index 642a75f71f2f5..1afac1aba5583 100644 --- a/pkgs/applications/audio/vkeybd/default.nix +++ b/pkgs/applications/audio/vkeybd/default.nix @@ -24,6 +24,6 @@ stdenv.mkDerivation rec { homepage = "https://www.alsa-project.org/~tiwai/alsa.html"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = [ maintainers.goibhniu ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/audio/vorbis-tools/default.nix b/pkgs/applications/audio/vorbis-tools/default.nix index 877f670d68617..4325d934e84b5 100644 --- a/pkgs/applications/audio/vorbis-tools/default.nix +++ b/pkgs/applications/audio/vorbis-tools/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libogg libvorbis libao curl speex flac ] - ++ lib.optionals stdenv.isDarwin [ libiconv ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; meta = with lib; { description = "Extra tools for Ogg-Vorbis audio codec"; diff --git a/pkgs/applications/audio/wavegain/default.nix b/pkgs/applications/audio/wavegain/default.nix index 93dd7bf6fb235..49c66b07a91c6 100644 --- a/pkgs/applications/audio/wavegain/default.nix +++ b/pkgs/applications/audio/wavegain/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { ''; meta = { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); description = "ReplayGain for wave files"; homepage = "https://github.com/MestreLion/wavegain"; license = lib.licenses.lgpl21; diff --git a/pkgs/applications/audio/waylyrics/default.nix b/pkgs/applications/audio/waylyrics/default.nix index 69069f01243c3..ca43d76b55812 100644 --- a/pkgs/applications/audio/waylyrics/default.nix +++ b/pkgs/applications/audio/waylyrics/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "waylyrics"; - version = "0.3.12"; + version = "0.3.15"; src = fetchFromGitHub { owner = "waylyrics"; repo = "waylyrics"; rev = "v${version}"; - hash = "sha256-FfrgeUDKiM9m0mvKlu02KEuvsq+3Gv3yPFW1DIQw05I="; + hash = "sha256-iW3NIPdnMoardC95kgU/jgzHy7qu/7wpJrkMdJE/r9U="; }; - cargoHash = "sha256-xD46aKT18Kl+81Pfv+zleUUKhSV1Px7JFjhXw1/4cBA="; + cargoHash = "sha256-3nPLi7/F8AG5pqHHPHzLCbXKZFeV/Z+LR3nK2BbrlEE="; nativeBuildInputs = [ pkg-config wrapGAppsHook4 ]; buildInputs = [ openssl dbus ]; diff --git a/pkgs/applications/audio/whipper/default.nix b/pkgs/applications/audio/whipper/default.nix index 179bb96660859..b6ff1f45440c7 100644 --- a/pkgs/applications/audio/whipper/default.nix +++ b/pkgs/applications/audio/whipper/default.nix @@ -21,6 +21,7 @@ let in python3.pkgs.buildPythonApplication rec { pname = "whipper"; version = "0.10.0"; + pyproject = true; src = fetchFromGitHub { owner = "whipper-team"; @@ -38,14 +39,15 @@ in python3.pkgs.buildPythonApplication rec { }) ]; - nativeBuildInputs = with python3.pkgs; [ + nativeBuildInputs = [ installShellFiles wrapGAppsNoGuiHook gobject-introspection + ]; - setuptools-scm + build-system = with python3.pkgs; [ docutils - setuptoolsCheckHook + setuptools-scm ]; propagatedBuildInputs = with python3.pkgs; [ @@ -63,6 +65,7 @@ in python3.pkgs.buildPythonApplication rec { nativeCheckInputs = with python3.pkgs; [ twisted + pytestCheckHook ] ++ bins; makeWrapperArgs = [ diff --git a/pkgs/applications/audio/x42-avldrums/default.nix b/pkgs/applications/audio/x42-avldrums/default.nix index 3234a719e3c00..4a802a324e8a0 100644 --- a/pkgs/applications/audio/x42-avldrums/default.nix +++ b/pkgs/applications/audio/x42-avldrums/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); description = "Drum sample player LV2 plugin dedicated to Glen MacArthur's AVLdrums"; homepage = "https://x42-plugins.com/x42/x42-avldrums"; maintainers = with maintainers; [ magnetophon orivej ]; diff --git a/pkgs/applications/audio/x42-gmsynth/default.nix b/pkgs/applications/audio/x42-gmsynth/default.nix index 8f83263d0a000..1d31211ec80d6 100644 --- a/pkgs/applications/audio/x42-gmsynth/default.nix +++ b/pkgs/applications/audio/x42-gmsynth/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); description = "Chris Colins' General User soundfont player LV2 plugin"; homepage = "https://x42-plugins.com/x42/x42-gmsynth"; maintainers = with maintainers; [ orivej ]; diff --git a/pkgs/applications/audio/xmp/default.nix b/pkgs/applications/audio/xmp/default.nix index efd5fb9caa60d..8abce73aff1ff 100644 --- a/pkgs/applications/audio/xmp/default.nix +++ b/pkgs/applications/audio/xmp/default.nix @@ -13,8 +13,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libxmp ] - ++ lib.optionals stdenv.isLinux [ alsa-lib ] - ++ lib.optionals stdenv.isDarwin [ AudioUnit CoreAudio ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ AudioUnit CoreAudio ]; meta = with lib; { description = "Extended module player"; diff --git a/pkgs/applications/audio/xsynth-dssi/default.nix b/pkgs/applications/audio/xsynth-dssi/default.nix index 02336f753450f..788453f51955f 100644 --- a/pkgs/applications/audio/xsynth-dssi/default.nix +++ b/pkgs/applications/audio/xsynth-dssi/default.nix @@ -34,6 +34,6 @@ stdenv.mkDerivation rec { homepage = "https://dssi.sourceforge.net/download.html#Xsynth-DSSI"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = [ maintainers.goibhniu ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/audio/yasr/default.nix b/pkgs/applications/audio/yasr/default.nix index 7da1e066413b7..da18f0cc825e6 100644 --- a/pkgs/applications/audio/yasr/default.nix +++ b/pkgs/applications/audio/yasr/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { longDescription = "Yasr is a general-purpose console screen reader for GNU/Linux and other Unix-like operating systems."; platforms = lib.platforms.linux; license = lib.licenses.gpl2; - maintainers = with lib.maintainers; [ jhhuh ]; + maintainers = [ ]; mainProgram = "yasr"; }; } diff --git a/pkgs/applications/audio/yoshimi/default.nix b/pkgs/applications/audio/yoshimi/default.nix index 02370d22ab7aa..d152eee637a1b 100644 --- a/pkgs/applications/audio/yoshimi/default.nix +++ b/pkgs/applications/audio/yoshimi/default.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { homepage = "https://yoshimi.github.io/"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = [ maintainers.goibhniu ]; + maintainers = [ ]; mainProgram = "yoshimi"; }; } diff --git a/pkgs/applications/audio/youtube-music/default.nix b/pkgs/applications/audio/youtube-music/default.nix index e02bc32412bd2..046203416a032 100644 --- a/pkgs/applications/audio/youtube-music/default.nix +++ b/pkgs/applications/audio/youtube-music/default.nix @@ -12,45 +12,45 @@ stdenv.mkDerivation (finalAttrs: { pname = "youtube-music"; - version = "3.3.12"; + version = "3.5.1"; src = fetchFromGitHub { owner = "th-ch"; repo = "youtube-music"; rev = "v${finalAttrs.version}"; - hash = "sha256-kBGMp58086NQ77x1YGS5NewWfiDaXHOEbyflHPtdfIs="; + hash = "sha256-6aAaIugho8yHohEHp0HVkmzIOfhpkNYts6BOKPp9Wbw="; }; pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-t5omzz6y8lVFGAuhtc+HF5gwu4Ntt/dxml+nWysEpVs="; + hash = "sha256-lxqBmtHkyk4mnM/AJQmpyCmvhW2e96vZBkgtoREjEXY="; }; nativeBuildInputs = [ makeWrapper python3 nodejs pnpm.configHook ] - ++ lib.optionals (!stdenv.isDarwin) [ copyDesktopItems ]; + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ copyDesktopItems ]; ELECTRON_SKIP_BINARY_DOWNLOAD = 1; - postBuild = lib.optionalString stdenv.isDarwin '' - cp -R ${electron}/Applications/Electron.app Electron.app + postBuild = lib.optionalString stdenv.hostPlatform.isDarwin '' + cp -R ${electron.dist}/Electron.app Electron.app chmod -R u+w Electron.app '' + '' pnpm build ./node_modules/.bin/electron-builder \ --dir \ - -c.electronDist=${if stdenv.isDarwin then "." else "${electron}/libexec/electron"} \ + -c.electronDist=${if stdenv.hostPlatform.isDarwin then "." else electron.dist} \ -c.electronVersion=${electron.version} ''; installPhase = '' runHook preInstall - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/{Applications,bin} mv pack/mac*/YouTube\ Music.app $out/Applications makeWrapper $out/Applications/YouTube\ Music.app/Contents/MacOS/YouTube\ Music $out/bin/youtube-music - '' + lib.optionalString (!stdenv.isDarwin) '' + '' + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' mkdir -p "$out/share/lib/youtube-music" cp -r pack/*-unpacked/{locales,resources{,.pak}} "$out/share/lib/youtube-music" @@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; - postFixup = lib.optionalString (!stdenv.isDarwin) '' + postFixup = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' makeWrapper ${electron}/bin/electron $out/bin/youtube-music \ --add-flags $out/share/lib/youtube-music/resources/app.asar \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ diff --git a/pkgs/applications/audio/zam-plugins/default.nix b/pkgs/applications/audio/zam-plugins/default.nix index 1638954c15c83..dc27db5ca8b3f 100644 --- a/pkgs/applications/audio/zam-plugins/default.nix +++ b/pkgs/applications/audio/zam-plugins/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "zamaudio"; repo = pname; rev = version; - sha256 = "sha256-wT1BXQrcD+TI+trqx0ZVUmVLZMTDQgJI3dAvN54wy6Y="; + hash = "sha256-wT1BXQrcD+TI+trqx0ZVUmVLZMTDQgJI3dAvN54wy6Y="; fetchSubmodules = true; }; diff --git a/pkgs/applications/audio/zrythm/default.nix b/pkgs/applications/audio/zrythm/default.nix index 8ec6ba1a040aa..28315b0a3701b 100644 --- a/pkgs/applications/audio/zrythm/default.nix +++ b/pkgs/applications/audio/zrythm/default.nix @@ -82,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: { version = "1.0.0-rc.1"; src = fetchzip { - url = "https://www.zrythm.org/releases/${finalAttrs.pname}-${finalAttrs.version}.tar.xz"; + url = "https://www.zrythm.org/releases/zrythm-${finalAttrs.version}.tar.xz"; sha256 = "sha256-Ljbw7bjGI6js4OP9KEXCkhC9AMbInSz0nn+pROm4vXw="; }; @@ -206,7 +206,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Automated and intuitive digital audio workstation"; maintainers = with maintainers; [ tshaynik magnetophon yuu astavie PowerUser64 ]; platforms = platforms.unix; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; license = licenses.agpl3Plus; }; }) diff --git a/pkgs/applications/audio/zynaddsubfx/default.nix b/pkgs/applications/audio/zynaddsubfx/default.nix index 20dcd0d491e8b..59f0310263a4d 100644 --- a/pkgs/applications/audio/zynaddsubfx/default.nix +++ b/pkgs/applications/audio/zynaddsubfx/default.nix @@ -2,6 +2,7 @@ , stdenv , fetchFromGitHub , callPackage +, fetchpatch # Required build tools , cmake @@ -15,7 +16,7 @@ , zlib # Optional dependencies -, alsaSupport ? stdenv.isLinux +, alsaSupport ? stdenv.hostPlatform.isLinux , alsa-lib , dssiSupport ? false , dssi @@ -27,7 +28,7 @@ , ossSupport ? true , portaudioSupport ? true , portaudio -, sndioSupport ? stdenv.isOpenBSD +, sndioSupport ? stdenv.hostPlatform.isOpenBSD , sndio # Optional GUI dependencies @@ -64,14 +65,21 @@ in stdenv.mkDerivation rec { repo = pname; rev = "refs/tags/${version}"; fetchSubmodules = true; - sha256 = "sha256-0siAx141DZx39facXWmKbsi0rHBNpobApTdey07EcXg="; + hash = "sha256-0siAx141DZx39facXWmKbsi0rHBNpobApTdey07EcXg="; }; outputs = [ "out" "doc" ]; + patches = [ + # Lazily expand ZYN_DATADIR to fix builtin banks across updates + (fetchpatch { + url = "https://github.com/zynaddsubfx/zynaddsubfx/commit/853aa03f4f92a180b870fa62a04685d12fca55a7.patch"; + hash = "sha256-4BsRZ9keeqKopr6lCQJznaZ3qWuMgD1/mCrdMiskusg="; + }) + ]; + postPatch = '' patchShebangs rtosc/test/test-port-checker.rb src/Tests/check-ports.rb - substituteInPlace src/Misc/Config.cpp --replace /usr $out ''; nativeBuildInputs = [ cmake makeWrapper pkg-config ]; @@ -87,7 +95,11 @@ in stdenv.mkDerivation rec { ++ lib.optionals (guiModule == "ntk") [ ntk cairo libXpm ] ++ lib.optionals (guiModule == "zest") [ libGL libX11 ]; - cmakeFlags = [ "-DGuiModule=${guiModule}" ] + cmakeFlags = + [ + "-DGuiModule=${guiModule}" + "-DZYN_DATADIR=${placeholder "out"}/share/zynaddsubfx" + ] # OSS library is included in glibc. # Must explicitly disable if support is not wanted. ++ lib.optional (!ossSupport) "-DOssEnable=OFF" @@ -110,7 +122,7 @@ in stdenv.mkDerivation rec { lib.optionals lashSupport [ "PortChecker" ] # Tests fail on aarch64 - ++ lib.optionals stdenv.isAarch64 [ "MessageTest" "UnisonTest" ]; + ++ lib.optionals stdenv.hostPlatform.isAarch64 [ "MessageTest" "UnisonTest" ]; in '' runHook preCheck ctest --output-on-failure -E '^${lib.concatStringsSep "|" disabledTests}$' @@ -148,7 +160,7 @@ in stdenv.mkDerivation rec { else "https://zynaddsubfx.sourceforge.io"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ goibhniu kira-bruneau ]; + maintainers = with maintainers; [ kira-bruneau ]; platforms = platforms.all; # On macOS: @@ -156,6 +168,6 @@ in stdenv.mkDerivation rec { # - ZynAddSubFX LV2 & VST plugin fail to compile (not setup to use ObjC version of pugl) # - TTL generation crashes (`pointer being freed was not allocated`) for all VST plugins using AbstractFX # - Zest UI fails to start on pulg_setup: Could not open display, aborting. - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/applications/backup/deja-dup/default.nix b/pkgs/applications/backup/deja-dup/default.nix index 8e30c7b8998c0..baeb123988a46 100644 --- a/pkgs/applications/backup/deja-dup/default.nix +++ b/pkgs/applications/backup/deja-dup/default.nix @@ -18,18 +18,19 @@ , libgpg-error , json-glib , duplicity +, rclone }: stdenv.mkDerivation (finalAttrs: { pname = "deja-dup"; - version = "45.2"; + version = "46.1"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "deja-dup"; rev = finalAttrs.version; - hash = "sha256-nscswpWX6UB1zuv6TXcT3YE1wkREJYDGQrEPryyUYUM="; + hash = "sha256-tKVY0wewBDx0AMzmTdko8vGg5bNGfYohgcSDg5Oky30="; }; patches = [ @@ -61,9 +62,17 @@ stdenv.mkDerivation (finalAttrs: { ]; mesonFlags = [ - "-Dduplicity_command=${duplicity}/bin/duplicity" + "-Dduplicity_command=${lib.getExe duplicity}" + "-Drclone_command=${lib.getExe rclone}" ]; + preFixup = '' + gappsWrapperArgs+=( + # Required by duplicity + --prefix PATH : "${lib.makeBinPath [ rclone ]}" + ) + ''; + meta = with lib; { description = "Simple backup tool"; longDescription = '' diff --git a/pkgs/applications/backup/deja-dup/fix-paths.patch b/pkgs/applications/backup/deja-dup/fix-paths.patch index b7b26ee9a664e..c5a735b1c5582 100644 --- a/pkgs/applications/backup/deja-dup/fix-paths.patch +++ b/pkgs/applications/backup/deja-dup/fix-paths.patch @@ -1,11 +1,13 @@ --- a/libdeja/duplicity/DuplicityInstance.vala +++ b/libdeja/duplicity/DuplicityInstance.vala -@@ -114,7 +114,7 @@ internal class DuplicityInstance : Object +@@ -114,8 +114,8 @@ internal class DuplicityInstance : Object // We already are pretty sure we don't have other duplicities in our // archive directories, because we use our own and we ensure we only have // one deja-dup running at a time via DBus. -- Posix.system("/bin/rm -f " + Shell.quote(cache_dir) + "/*/lockfile.lock"); -+ Posix.system("@coreutils@/bin/rm -f " + Shell.quote(cache_dir) + "/*/lockfile.lock"); + var lockfile_glob = Shell.quote(cache_dir) + "/*/lockfile.lock"; +- if (Posix.system("/bin/rm -f " + lockfile_glob) != 0) ++ if (Posix.system("@coreutils@/bin/rm -f " + lockfile_glob) != 0) + warning("Could not delete '%s'", lockfile_glob); Process.spawn_async_with_pipes(null, real_argv, real_envp, SpawnFlags.SEARCH_PATH | diff --git a/pkgs/applications/backup/ludusavi/default.nix b/pkgs/applications/backup/ludusavi/default.nix index 17b006f38566f..62a6ac58b7b4c 100644 --- a/pkgs/applications/backup/ludusavi/default.nix +++ b/pkgs/applications/backup/ludusavi/default.nix @@ -17,22 +17,22 @@ , libxkbcommon , vulkan-loader , wayland -, gnome +, zenity , libsForQt5 }: rustPlatform.buildRustPackage rec { pname = "ludusavi"; - version = "0.23.0"; + version = "0.25.0"; src = fetchFromGitHub { owner = "mtkennerly"; repo = "ludusavi"; rev = "v${version}"; - hash = "sha256-3Z/v3+3mrmPV2Rb/5tM+h6UN+MEIF/aK07B93Zn38AA="; + hash = "sha256-GjecssOc5xVni73uNRQ/GaZmIdM9r09I8GpPK+jwoAY="; }; - cargoHash = "sha256-bAap8eSXAPLrs5MEX1Pp6gKdp0iLxci4aX+2+ve6Wk0="; + cargoHash = "sha256-9QaQjb7bdDl4NWKbV+dfu9BgFU8NO3CZEvKSXujMUtI="; nativeBuildInputs = [ cmake @@ -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/pika-backup/default.nix b/pkgs/applications/backup/pika-backup/default.nix index 3d919449be3ee..f446dc47fffb3 100644 --- a/pkgs/applications/backup/pika-backup/default.nix +++ b/pkgs/applications/backup/pika-backup/default.nix @@ -21,20 +21,20 @@ stdenv.mkDerivation rec { pname = "pika-backup"; - version = "0.7.2"; + version = "0.7.4"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "pika-backup"; rev = "v${version}"; - hash = "sha256-Z9vRuz5PwOhJ3DQD9zvCilgTMww7bRL4aR6fRoHIayI="; + hash = "sha256-DtLGD7+Ydj2fvEHU+bDQDMC/E/9VgrlVNMCG6OlPmfg="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-hcfkwxwLOUBMj6rvhI5F4OO9UaSP7CAE0JNOGlh2lVY="; + hash = "sha256-8nFkc77FiLxMA1hMm8k5VB84l+pQeL0JSzYDytXrNUE="; }; patches = [ diff --git a/pkgs/applications/backup/restic-integrity/default.nix b/pkgs/applications/backup/restic-integrity/default.nix index d0311e5d40d0a..41bb1c318ff54 100644 --- a/pkgs/applications/backup/restic-integrity/default.nix +++ b/pkgs/applications/backup/restic-integrity/default.nix @@ -5,23 +5,23 @@ rustPlatform.buildRustPackage rec { pname = "restic-integrity"; - version = "1.2.2"; + version = "1.3.1"; src = fetchFromGitea { domain = "git.nwex.de"; owner = "networkException"; repo = "restic-integrity"; rev = version; - hash = "sha256-QiISJCxxJH8wQeH/klB48POn6W9juQmIMCLGzGSyl6w="; + hash = "sha256-5F2nFSyqrT4JEzUb1NVk0g2LqgwRix3rfflXJ3pttvo="; }; - cargoHash = "sha256-GxehJjDd0AHbEc8kPWyLXAOPbrPCT59LddAL1ydnT5g="; + cargoHash = "sha256-97M7dqgTzl2ysegavwzf6xtYKum/s9cq4vgaIQR7IA0="; meta = with lib; { 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; [ networkexception ]; mainProgram = "restic-integrity"; }; } diff --git a/pkgs/applications/backup/timeshift/default.nix b/pkgs/applications/backup/timeshift/default.nix index 0a6a9bf38865d..85a3295fb064f 100644 --- a/pkgs/applications/backup/timeshift/default.nix +++ b/pkgs/applications/backup/timeshift/default.nix @@ -1,6 +1,5 @@ { callPackage , timeshift-unwrapped -, lib , rsync , coreutils , mount diff --git a/pkgs/applications/backup/timeshift/unwrapped.nix b/pkgs/applications/backup/timeshift/unwrapped.nix index e9d6e5795c5a1..534145c19cbe5 100644 --- a/pkgs/applications/backup/timeshift/unwrapped.nix +++ b/pkgs/applications/backup/timeshift/unwrapped.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "timeshift"; - version = "24.06.2"; + version = "24.06.3"; src = fetchFromGitHub { owner = "linuxmint"; repo = "timeshift"; rev = version; - hash = "sha256-/Rk95fAAquPrKwRchIgU8p9dpwvEV25ku1rknbJNlJc="; + hash = "sha256-npYiUSAPzr6g29ilQ1JELxqR1VbOR7TNMkdx37n92kk="; }; patches = [ diff --git a/pkgs/applications/backup/unifi-protect-backup/default.nix b/pkgs/applications/backup/unifi-protect-backup/default.nix index 4981d509e236d..1ffdeca5b38db 100644 --- a/pkgs/applications/backup/unifi-protect-backup/default.nix +++ b/pkgs/applications/backup/unifi-protect-backup/default.nix @@ -1,25 +1,11 @@ -{ lib -, fetchFromGitHub -, python3 +{ + lib, + fetchFromGitHub, + fetchpatch, + python3, }: -let - python = python3.override { - packageOverrides = self: super: { - pyunifiprotect = super.pyunifiprotect.overridePythonAttrs { - version = "unstable-2024-06-08"; - src = fetchFromGitHub { - owner = "ep1cman"; - repo = "pyunifiprotect"; - rev = "d967bca2c65e0aa6a7363afb6367c3745c076747"; - hash = "sha256-gSAK/T9cjIiRC/WjwrdLP+LHzEEUsNbwpXClYqpnMio="; - }; - }; - }; - }; -in - -python.pkgs.buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "unifi-protect-backup"; version = "0.11.0"; pyproject = true; @@ -31,19 +17,25 @@ python.pkgs.buildPythonApplication rec { hash = "sha256-t4AgPFqKS6u9yITIkUUB19/SxVwR7X8Cc01oPx3M+E0="; }; + patches = [ + # Switch to using UIProtect library, https://github.com/ep1cman/unifi-protect-backup/pull/160 + (fetchpatch { + name = "switch-uiprotect.patch"; + url = "https://github.com/ep1cman/unifi-protect-backup/commit/ccf2cde27229ade5c70ebfa902f289bf1a439f64.patch"; + hash = "sha256-kogl/crvLE+7t9DLTuZqeW3/WB5/sytWDgbndoBw+RQ="; + }) + ]; + pythonRelaxDeps = [ "aiorun" "aiosqlite" "click" - "pyunifiprotect" + "uiprotect" ]; - nativeBuildInputs = with python.pkgs; [ - poetry-core - pythonRelaxDepsHook - ]; + nativeBuildInputs = with python3.pkgs; [ poetry-core ]; - propagatedBuildInputs = with python.pkgs; [ + propagatedBuildInputs = with python3.pkgs; [ aiocron aiolimiter aiorun @@ -53,12 +45,10 @@ python.pkgs.buildPythonApplication rec { click expiring-dict python-dateutil - pyunifiprotect + uiprotect ]; - nativeCheckInputs = with python.pkgs; [ - pytestCheckHook - ]; + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ]; meta = with lib; { description = "Python tool to backup unifi event clips in realtime"; diff --git a/pkgs/applications/backup/vorta/default.nix b/pkgs/applications/backup/vorta/default.nix index b620459f3c738..8bc6e719718ad 100644 --- a/pkgs/applications/backup/vorta/default.nix +++ b/pkgs/applications/backup/vorta/default.nix @@ -26,7 +26,7 @@ python3Packages.buildPythonApplication rec { wrapQtAppsHook ]; - buildInputs = lib.optionals stdenv.isLinux [ + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ qtwayland ]; diff --git a/pkgs/applications/blockchains/aeon/default.nix b/pkgs/applications/blockchains/aeon/default.nix deleted file mode 100644 index 3939dbce31579..0000000000000 --- a/pkgs/applications/blockchains/aeon/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, git, doxygen, graphviz -, boost, miniupnpc, openssl, unbound, cppzmq -, pcsclite, readline, libsodium -}: - -let - version = "0.14.2.2"; -in -stdenv.mkDerivation { - pname = "aeon"; - inherit version; - - src = fetchFromGitHub { - owner = "aeonix"; - repo = "aeon"; - rev = "v${version}-aeon"; - fetchSubmodules = true; - sha256 = "sha256-2MptLS12CUm9eUKm+V+yYpbLVwNyZeZ5HvAFyjEc4R4="; - }; - - nativeBuildInputs = [ cmake pkg-config git doxygen graphviz ]; - - buildInputs = [ - boost miniupnpc openssl unbound - cppzmq pcsclite readline libsodium - ]; - - cmakeFlags = [ - "-DBUILD_GUI_DEPS=ON" - "-DReadline_ROOT_DIR=${readline.dev}" - ]; - - hardeningDisable = [ "fortify" ]; - - meta = with lib; { - # Does not build against gcc-13. No development activity upstream - # for past few years. - broken = true; - description = "Private, secure, untraceable currency"; - homepage = "http://www.aeon.cash/"; - license = licenses.bsd3; - maintainers = [ maintainers.aij ]; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/pkgs/applications/blockchains/alfis/Cargo.lock b/pkgs/applications/blockchains/alfis/Cargo.lock index 997f44144daca..fde80422eea27 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.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "884391ef1066acaa41e766ba8f596341b96e93ce34f9a43e7d24bf0a0eaf0561" +checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" 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.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" 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.14", "ureq", "uuid", "web-view", "winapi", + "windows-service", "winres", "x25519-dalek", ] [[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" @@ -152,21 +137,21 @@ dependencies = [ [[package]] name = "autocfg" -version = "1.0.1" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "base64" -version = "0.13.1" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[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" @@ -184,12 +169,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] +name = "bitflags" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" + +[[package]] name = "blake2" 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 +197,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 +212,15 @@ checksum = "5988cb1d626264ac94100be357308f29ff7cbdd3b36bda27f450a4ee3f713426" [[package]] name = "bumpalo" -version = "3.8.0" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f1e260c3a9040a7c19a12468758f4c16f31a81a1fe087482be9570ec864bb6c" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[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 +234,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.71" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79c2681d6594606957bbb8631c4b90a7fcaaa72cdb714743a437b156d6a7eedd" +checksum = "eaff6f8ce506b9773fa786672d63fc7a191ffea1be33f72bbd4aeacefca9ffc8" [[package]] name = "cfg-if" @@ -264,68 +246,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.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfd4d1b31faaa3a89d7934dbded3111da0d2ef28e3ebccdb4f0179f5929d1ef1" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" dependencies = [ + "android-tzdata", "iana-time-zone", "js-sys", - "num-integer", "num-traits", "serde", - "time 0.1.44", "wasm-bindgen", - "winapi", + "windows-targets", ] [[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 +308,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.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "738c290dfaea84fc1ca15ad9c168d083b05a714e1efddd8edaab678dc28d2836" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" 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,48 +352,71 @@ 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.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97fb8b7c4503de7d6ae7b42ab72a5a59857b4c937ec27a3d4539dba95b5ab2be" +dependencies = [ + "cfg-if", + "cpufeatures", + "curve25519-dalek-derive", + "digest 0.10.7", + "fiat-crypto", + "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.70", ] [[package]] -name = "curve25519-dalek" -version = "3.2.0" +name = "der" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b9fdf9972b2bd6af2d913799d9ebc165ea4d2e65878e329d9c6b372c4491b61" +checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0" 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" +version = "0.99.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" +checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce" dependencies = [ "convert_case", "proc-macro2", "quote", "rustc_version", - "syn", + "syn 2.0.70", ] [[package]] @@ -439,73 +430,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.3" +source = "git+https://github.com/Revertron/ecies-ed25519-ng?rev=554ca29#554ca29a1bbd55f0c7e2f75cb3c7e0e3030afc15" 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.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d" +checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871" 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.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d" + +[[package]] name = "flate2" -version = "1.0.22" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e6988e897c1c9c485f43b47a529cef42fde0547f9d8d41a7062518f1d8fc53f" +checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" 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 +542,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 +561,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.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "libc", - "wasi 0.10.0+wasi-snapshot-preview1", + "wasi", ] [[package]] name = "ghash" -version = "0.3.1" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97304e4cd182c3846f7575ced3890c53012ce534ad9114046b0a9e00bb30a375" +checksum = "f0d8a4362ccb29cb0b265253fb0a2728f592895ee6854fd9bc13f2ffda266ff1" dependencies = [ "opaque-debug", "polyval", @@ -644,23 +634,18 @@ dependencies = [ [[package]] name = "half" -version = "1.8.1" +version = "1.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bd566f08830dd1fa75b2a5f1d8def8336de7f08b2692a9a71efbe7188aea36f" +checksum = "1b43ede17f21864e81be2fa654110bf1e793774238d86ef8555c37e6519c0403" [[package]] name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" - -[[package]] -name = "hashbrown" -version = "0.13.2" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" dependencies = [ "ahash", + "allocator-api2", ] [[package]] @@ -674,12 +659,9 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.1.19" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" [[package]] name = "hex" @@ -689,64 +671,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.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c495f162af0bf17656d0014a0eded5f3cd2f365fdd204548c2869db89359dc7" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" 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.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" 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.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "javascriptcore-rs-sys" @@ -759,112 +775,107 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.59" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "258451ab10b34f8af53416d1fdab72c22e805f0c92a1136d59470ec0b11138b2" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" dependencies = [ "wasm-bindgen", ] [[package]] name = "lazy_static" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libc" -version = "0.2.132" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8371e4e5341c3a96db127eb2465ac681ced4c433e01dd0e938adbef26ba93ba5" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "log" -version = "0.4.17" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if", -] +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "lru" -version = "0.9.0" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71e7d46de488603ffdd5f30afbc64fbba2378214a2c3a2fb83abf3d33126df17" +checksum = "d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc" 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.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "miniz_oxide" -version = "0.4.4" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b" +checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" dependencies = [ "adler", - "autocfg", ] [[package]] name = "mio" -version = "0.8.5" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5d732bc30207a6423068df043e3d02e0735b155ad7ce1a6f76fe2baa5b158de" +checksum = "4929e1f84c5e54c3ec6141cd5d8b5a5c055f031f80cf78f2072920173cb4d880" dependencies = [ + "hermit-abi", "libc", "log", - "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.42.0", + "wasi", + "windows-sys", ] [[package]] name = "num-bigint" -version = "0.4.3" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" dependencies = [ - "autocfg", "num-integer", "num-traits", ] [[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + +[[package]] name = "num-integer" -version = "0.1.44" +version = "0.1.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" dependencies = [ - "autocfg", "num-traits", ] [[package]] name = "num-traits" -version = "0.2.15" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" 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", @@ -872,33 +883,34 @@ dependencies = [ [[package]] name = "num_threads" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" +checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9" dependencies = [ "libc", ] [[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" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" +checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" [[package]] name = "open" -version = "3.0.3" +version = "5.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4a3100141f1733ea40b53381b0ae3117330735ef22309a190ac57b9576ea716" +checksum = "9d2c909a3fce3bd80efef4cd1c6c056bd9376a8fe06fcfdbebaf32cb485a7e37" dependencies = [ + "is-wsl", + "libc", "pathdiff", - "windows-sys 0.36.1", ] [[package]] @@ -921,21 +933,31 @@ 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 = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + +[[package]] +name = "pkcs8" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" +checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" +dependencies = [ + "der", + "spki", +] [[package]] name = "pkg-config" -version = "0.3.20" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c9b1041b4387893b91ee6746cddfc28516aff326a3519fb2adf820932c5e6cb" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[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 +966,55 @@ dependencies = [ [[package]] name = "polyval" -version = "0.4.5" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eebcc4aa140b9abd2bc40d9c3f7ccec842679cd79045ac3a7ac698c1a064b7cd" +checksum = "9d1fe60d06143b2430aa532c94cfe9e29783047f06c0d7fd359a9a51b729fa25" 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.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d727cae5b39d21da60fa540906919ad737832fe0b1c165da3a34d6548c849d6" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.10" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38bc8cc6a5f2e3655e0899c1b848643b2562f853f114bfec7be120678e3ace05" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" 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 +1024,31 @@ 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.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" +checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" dependencies = [ "cc", + "cfg-if", + "getrandom", "libc", - "once_cell", "spin", "untrusted", - "web-sys", - "winapi", + "windows-sys", ] [[package]] @@ -1074,52 +1062,68 @@ dependencies = [ [[package]] name = "rustls" -version = "0.20.2" +version = "0.23.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d37e5e2290f3e040b594b1a9e04377c2c671f1a1cfd9bfdef82106ac1c113f84" +checksum = "4828ea528154ae444e5a642dbb7d5623354030dc9822b83fd9bb79683c7399d0" dependencies = [ "log", + "once_cell", "ring", - "sct", - "webpki", + "rustls-pki-types", + "rustls-webpki", + "subtle", + "zeroize", ] [[package]] -name = "ryu" -version = "1.0.5" +name = "rustls-pki-types" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" +checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" [[package]] -name = "sct" -version = "0.7.0" +name = "rustls-webpki" +version = "0.102.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" +checksum = "f9a6fccd794a42c2c105b513a2f62bc3fd8f3ba57a4593677ceb0bd035164d78" 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 = "semver" -version = "1.0.4" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "568a8e6258aa33c13358f81fd834adb854c6f7c9468520910a9b1e8fac068012" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.152" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb" +checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" dependencies = [ "serde_derive", ] [[package]] name = "serde_bytes" -version = "0.11.7" +version = "0.11.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfc50e8183eeeb6178dcb167ae34a8051d63535023ae38b5d8d12beae193d37b" +checksum = "387cc504cb06bb40a96c8e04e951fe01854cf6bc921053c954e4a606d9675c6a" dependencies = [ "serde", ] @@ -1136,20 +1140,20 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.152" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e" +checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.70", ] [[package]] name = "serde_json" -version = "1.0.85" +version = "1.0.120" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e55a28e3aaef9d5ce0506d0a14dbba8054ddc7e499ef522dd8b26859ec9d4a44" +checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5" dependencies = [ "itoa", "ryu", @@ -1158,58 +1162,42 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.1" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0efd8caf556a6cebd3b285caf480045fcc1ac04f6bd786b09a6f11af30c4fcf4" +checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" 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.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48dfff04aade74dd495b007c831cd6f4e0cee19c344dd9dc0884c0289b70a786" +checksum = "16257adbfaef1ee58b1363bdc0664c9b8e1e30aed86049635fb5f147d065a9c0" dependencies = [ "log", "termcolor", - "time 0.3.14", + "time", ] [[package]] @@ -1218,7 +1206,7 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3c7adf08565630bbb71f955f11f8a68464817ded2703a3549747c235b58a13e" dependencies = [ - "bitflags", + "bitflags 1.3.2", "gio-sys", "glib-sys", "gobject-sys", @@ -1229,9 +1217,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,19 +1239,18 @@ checksum = "02a8428da277a8e3a15271d79943e80ccc2ef254e78813a166a08d65e4c3ece5" [[package]] name = "sqlite" -version = "0.30.4" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b1908664131c21a38e5b531344d52a196ec338af5bf44f7fa2c83d539e9561d" +checksum = "274e5a9a0968bc9797fd3fe75a544cbcd3e3c2a111cb1c11cb8a0290f9684cb2" dependencies = [ - "libc", "sqlite3-sys", ] [[package]] name = "sqlite3-src" -version = "0.4.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1815a7a02c996eb8e5c64f61fcb6fd9b12e593ce265c512c5853b2513635691" +checksum = "174d4a6df77c27db281fb23de1a6d968f3aaaa4807c2a1afa8056b971f947b4a" dependencies = [ "cc", "pkg-config", @@ -1261,11 +1258,10 @@ dependencies = [ [[package]] name = "sqlite3-sys" -version = "0.14.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d47c99824fc55360ba00caf28de0b8a0458369b832e016a64c13af0ad9fbb9ee" +checksum = "3901ada7090c3c3584dc92ec7ef1b7091868d13bfe6d7de9f0bcaffee7d0ade5" dependencies = [ - "libc", "sqlite3-src", ] @@ -1284,14 +1280,14 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "subtle" -version = "2.4.1" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "syn" @@ -1305,15 +1301,14 @@ dependencies = [ ] [[package]] -name = "synstructure" -version = "0.12.6" +name = "syn" +version = "2.0.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" +checksum = "2f0209b68b3613b093e0ec905354eccaedcfe83b8cb37cbdeae64026c3064c16" dependencies = [ "proc-macro2", "quote", - "syn", - "unicode-xid", + "unicode-ident", ] [[package]] @@ -1327,79 +1322,85 @@ dependencies = [ "strum", "strum_macros", "thiserror", - "toml 0.5.9", + "toml 0.5.11", "version-compare", ] [[package]] name = "termcolor" -version = "1.1.2" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" dependencies = [ "winapi-util", ] [[package]] name = "thiserror" -version = "1.0.30" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "854babe52e4df1653706b98fcfc05843010039b406875930a70e4d9644e5c417" +checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.30" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b" +checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.70", ] [[package]] name = "thread-priority" -version = "0.10.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978519ae4c6891352f964b88da4ab5a3a9b74a40247cda5baee145dae6cd3b71" +checksum = "0d3b04d33c9633b8662b167b847c7ab521f83d1ae20f2321b65b5b925e532e36" dependencies = [ + "bitflags 2.6.0", "cfg-if", "libc", "log", + "rustversion", "winapi", ] [[package]] name = "time" -version = "0.1.44" +version = "0.3.36" 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" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c3f9a28b618c3a6b9251b6908e9c99e04b9e5c02e6581ccbb67d59c34ef7f9b" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ + "deranged", "itoa", "libc", + "num-conv", "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.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42657b1a6f4d817cda8e7a0ace261fe0cc946cf3a80314390b22cc61ae080792" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" +dependencies = [ + "num-conv", + "time-core", +] [[package]] name = "tinyfiledialogs" @@ -1413,33 +1414,33 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.5.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f83b2a3d4d9091d0abd7eba4dc2710b1718583bd4d8992e2190720ea38f391f7" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" 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.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7afcae9e3f0fe2c370fd4657108972cbb2fa9db1b9f84849cefd80741b01cb6" +checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335" dependencies = [ "serde", "serde_spanned", @@ -1449,18 +1450,18 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.1" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622" +checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.19.4" +version = "0.22.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a1eb0622d28f4b9c90adc4ea4b2b46b47663fde9ac5fafcb14a1369d5508825" +checksum = "d59a3a72298453f564e2b111fa896f8d07fabb36f51f06d7e875fc5e0b5a3ef1" dependencies = [ "indexmap", "serde", @@ -1471,91 +1472,82 @@ 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.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a01404663e3db436ed2746d9fefef640d868edae3cceb81c3b8d5732fda678f" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" [[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.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" dependencies = [ "tinyvec", ] [[package]] name = "unicode-segmentation" -version = "1.8.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8895849a949e7845e06bd6dc1aa51731a103c42707010a5b591c0038fb73385b" +checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" [[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.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" +checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" [[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.10.0" +source = "git+https://github.com/algesten/ureq#1cad58f5a4f359e318858810de51666d63de70e8" dependencies = [ - "base64 0.13.1", - "chunked_transfer", + "base64", "flate2", "log", "once_cell", "rustls", + "rustls-pki-types", "url", - "webpki", "webpki-roots", ] [[package]] name = "url" -version = "2.2.2" +version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" dependencies = [ "form_urlencoded", "idna", - "matches", "percent-encoding", ] @@ -1567,11 +1559,11 @@ checksum = "5a1f0175e03a0973cf4afd476bef05c26e228520400eb1fd473ad417b1c00ffb" [[package]] name = "uuid" -version = "1.3.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1674845326ee10d37ca60470760d4288a6f80f304007d92e5c53bab78c9cfd79" +checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" dependencies = [ - "getrandom 0.2.3", + "getrandom", "serde", ] @@ -1589,27 +1581,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.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc7652e3f6c4706c8d9cd54832c4a4ccb9b5336e2c3bd154d5cccfbf1c1f5f7d" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -1617,24 +1597,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.82" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "662cd44805586bd52971b9586b1df85cdbbd9112e4ef4d8f41559c334dc6ac3f" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn", + "syn 2.0.70", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.82" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b260f13d3012071dfb1512849c033b1925038373aea48ced3012c09df952c602" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -1642,37 +1622,27 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.82" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5be8e654bdd9b79216c2929ab90721aa82faf65c48cdf08bdc4e7f51357b80da" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.70", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.82" +version = "0.2.92" 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 = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[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", @@ -1687,7 +1657,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "389e5138c85a0d111b9bda05b59efa8562315e1d657d72451410e12c858f0619" dependencies = [ "atk-sys", - "bitflags", + "bitflags 1.3.2", "cairo-sys-rs", "gdk-pixbuf-sys", "gdk-sys", @@ -1703,28 +1673,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.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c475786c6f47219345717a043a37ec04cb4bc185e28853adcc4fa0a947eba630" +checksum = "bd7c23921eeb1713a4e851530e9b9756e4fb0e89978582942612524cf09f01cd" 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 +1699,12 @@ dependencies = [ ] [[package]] +name = "widestring" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7219d36b6eac893fa81e84ebe06485e7dcbb616177469b142df14f1f4deb1311" + +[[package]] name = "winapi" version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1756,11 +1722,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.5" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" dependencies = [ - "winapi", + "windows-sys", ] [[package]] @@ -1770,110 +1736,103 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] -name = "windows-sys" -version = "0.36.1" +name = "windows-core" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" 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", ] [[package]] -name = "windows-sys" -version = "0.42.0" +name = "windows-service" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +checksum = "d24d6bcc7f734a4091ecf8d7a64c5f7d7066f45585c1861eba06449909609c8a" 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", + "bitflags 2.6.0", + "widestring", + "windows-sys", ] [[package]] -name = "windows_aarch64_gnullvm" -version = "0.42.0" +name = "windows-sys" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets", +] [[package]] -name = "windows_aarch64_msvc" -version = "0.36.1" +name = "windows-targets" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_gnullvm", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] [[package]] -name = "windows_aarch64_msvc" -version = "0.42.0" +name = "windows_aarch64_gnullvm" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] -name = "windows_i686_gnu" -version = "0.36.1" +name = "windows_aarch64_msvc" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" -version = "0.42.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" [[package]] -name = "windows_i686_msvc" -version = "0.36.1" +name = "windows_i686_gnullvm" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" -version = "0.42.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" -version = "0.36.1" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" -version = "0.42.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" -version = "0.36.1" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" -version = "0.3.3" +version = "0.6.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "faf09497b8f8b5ac5d3bb4d05c0a99be20f26fd3d5f2db7b0716e946d5103658" +checksum = "59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1" dependencies = [ "memchr", ] @@ -1884,37 +1843,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.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2392b6b94a576b4e2bf3c5b2757d63f10ada8020a2e4d08ac849ebcf6ea8e077" +checksum = "c7e468321c81fb07fa7f4c636c3972b9100f0346e5b6a9f2bd0603a52f7ed277" dependencies = [ "curve25519-dalek", - "rand_core 0.5.1", + "rand_core", + "serde", "zeroize", ] [[package]] +name = "zerocopy" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.70", +] + +[[package]] name = "zeroize" -version = "1.3.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4756f7db3f7b5574938c3eb1c117038b8e07f95ee6718c0efad4ac21508f1efd" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" 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.70", ] diff --git a/pkgs/applications/blockchains/alfis/default.nix b/pkgs/applications/blockchains/alfis/default.nix index af1da19f63867..ad40bbef75c9c 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.5"; src = fetchFromGitHub { owner = "Revertron"; repo = "Alfis"; rev = "v${version}"; - sha256 = "sha256-BNpz4SjWeZ20CxjyEIaFI43X7P3uoyWqOQssFb38Gv8="; + hash = "sha256-ettStNktSDZnYNN/IWqTB1Ou1g1QEGFabS4EatnDLaE="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "web-view-0.7.3" = "sha256-8C/2bXAbxP5tdo9RLvNn89krzy08+yKy3kERfz31HJE="; + "ecies-ed25519-ng-0.5.3" = "sha256-sJZ5JCaGNa3DdAaHw7/2qeLYv+HDKEMcY4uHbzfzQBM="; + "ureq-2.10.0" = "sha256-XNjY8qTgt2OzlfKu7ECIfgRLkSlprvjpgITsNVMi1uc="; + "web-view-0.7.3" = "sha256-eVMcpMRZHwOdWhfV6Z1uGUNOmhB41YZPaiz1tRQvhrI="; }; }; + nativeBuildInputs = [ + pkg-config + makeWrapper + ]; + buildInputs = + lib.optional stdenv.hostPlatform.isDarwin Security + ++ lib.optional (withGui && stdenv.hostPlatform.isLinux) webkitgtk + ++ lib.optionals (withGui && stdenv.hostPlatform.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) '' + postInstall = lib.optionalString (withGui && stdenv.hostPlatform.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.hostPlatform.isDarwin; }; } diff --git a/pkgs/applications/blockchains/besu/default.nix b/pkgs/applications/blockchains/besu/default.nix index ef985a2806b7b..3c48f930a625f 100644 --- a/pkgs/applications/blockchains/besu/default.nix +++ b/pkgs/applications/blockchains/besu/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation (finalAttrs: rec { sha256 = "sha256-CC24z0+2dSeqDddX5dJUs7SX9QJ8Iyh/nAp0pqdDvwg="; }; - buildInputs = lib.optionals stdenv.isLinux [ jemalloc ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ jemalloc ]; nativeBuildInputs = [ makeWrapper ]; installPhase = '' @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: rec { cp -r lib $out/ wrapProgram $out/bin/${pname} \ --set JAVA_HOME "${jre}" \ - --suffix ${if stdenv.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"} : ${lib.makeLibraryPath buildInputs} + --suffix ${if stdenv.hostPlatform.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"} : ${lib.makeLibraryPath buildInputs} ''; passthru.tests = { diff --git a/pkgs/applications/blockchains/bisq-desktop/default.nix b/pkgs/applications/blockchains/bisq-desktop/default.nix index 26b2cb94e1aaa..097acda8e8e90 100644 --- a/pkgs/applications/blockchains/bisq-desktop/default.nix +++ b/pkgs/applications/blockchains/bisq-desktop/default.nix @@ -38,11 +38,11 @@ let in stdenv.mkDerivation rec { pname = "bisq-desktop"; - version = "1.9.16"; + version = "1.9.17"; src = fetchurl { url = "https://github.com/bisq-network/bisq/releases/download/v${version}/Bisq-64bit-${version}.deb"; - sha256 = "sha256-DxYgZgDa3vOHj7svJqu/pdyXKZ+uBTy35Fchw49xxoA="; + sha256 = "1wqzgxsm9p6lh0bmvw0byaxx1r5v64d024jf1pg9mykb1dnnx0wy"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/blockchains/bitcoin-abc/default.nix b/pkgs/applications/blockchains/bitcoin-abc/default.nix index 857467c967392..75c782a7f45ee 100644 --- a/pkgs/applications/blockchains/bitcoin-abc/default.nix +++ b/pkgs/applications/blockchains/bitcoin-abc/default.nix @@ -2,6 +2,7 @@ , stdenv , mkDerivation , fetchFromGitHub +, fetchpatch2 , pkg-config , cmake , openssl @@ -34,6 +35,14 @@ mkDerivation rec { hash = "sha256-+9uBmmdQ/shWYnJ7tM+Y8OgqYcQHHI2qeMw2tl1lE+w="; }; + patches = [ + # upnp: add compatibility for miniupnpc 2.2.8 + (fetchpatch2 { + url = "https://github.com/Bitcoin-ABC/bitcoin-abc/commit/5678070f182124a1a8c7c60873d1877094be76ab.patch?full_index=1"; + hash = "sha256-QC7TlWepVxQuIZVTbGtQy+HmmXP8PWNhJWdVYudJvmI="; + }) + ]; + nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ openssl @@ -72,7 +81,7 @@ mkDerivation rec { homepage = "https://bitcoinabc.org/"; maintainers = with maintainers; [ lassulus ]; license = licenses.mit; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; platforms = platforms.unix; mainProgram = "bitcoin-cli"; }; diff --git a/pkgs/applications/blockchains/bitcoin-knots/default.nix b/pkgs/applications/blockchains/bitcoin-knots/default.nix index 0306be5378292..5c41ba65a695d 100644 --- a/pkgs/applications/blockchains/bitcoin-knots/default.nix +++ b/pkgs/applications/blockchains/bitcoin-knots/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, fetchpatch2 , autoreconfHook , pkg-config , util-linux @@ -18,7 +19,6 @@ , qtbase ? null , qttools ? null , python3 -, nixosTests , withGui , withWallet ? true }: @@ -32,16 +32,24 @@ stdenv.mkDerivation rec { hash = "sha256-PqpePDna2gpCzF2K43N4h6cV5Y9w/e5ZcUvaNEaFaIk="; }; + patches = [ + # upnp: add compatibility for miniupnpc 2.2.8 + (fetchpatch2 { + url = "https://github.com/bitcoinknots/bitcoin/commit/643014424359a4783cf9c73bee3346ac2f04e713.patch?full_index=1"; + hash = "sha256-FdLoNH3+ZZTbqrwRvhbAeJuGz4SgnIvoWUBzRxjfzs8="; + }) + ]; + nativeBuildInputs = [ autoreconfHook pkg-config ] - ++ lib.optionals stdenv.isLinux [ util-linux ] - ++ lib.optionals stdenv.isDarwin [ hexdump ] - ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ autoSignDarwinBinariesHook ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ util-linux ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ hexdump ] + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ autoSignDarwinBinariesHook ] ++ lib.optionals withGui [ wrapQtAppsHook ]; buildInputs = [ boost libevent miniupnpc zeromq zlib ] ++ lib.optionals withWallet [ sqlite ] - ++ lib.optionals (withWallet && !stdenv.isDarwin) [ db48 ] + ++ lib.optionals (withWallet && !stdenv.hostPlatform.isDarwin) [ db48 ] ++ lib.optionals withGui [ qrencode qtbase qttools ]; configureFlags = [ diff --git a/pkgs/applications/blockchains/bitcoin-unlimited/default.nix b/pkgs/applications/blockchains/bitcoin-unlimited/default.nix deleted file mode 100644 index 033c3d6ed9bf5..0000000000000 --- a/pkgs/applications/blockchains/bitcoin-unlimited/default.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ lib, stdenv, fetchFromGitLab, pkg-config, autoreconfHook, openssl, db48, boost -, zlib, miniupnpc, util-linux, protobuf, qrencode, libevent, python3 -, withGui, wrapQtAppsHook ? null, qtbase ? null, qttools ? null -, Foundation, ApplicationServices, AppKit }: - -stdenv.mkDerivation rec { - pname = "bitcoin" + lib.optionalString (!withGui) "d" + "-unlimited"; - version = "1.10.0.0"; - - src = fetchFromGitLab { - owner = "bitcoinunlimited"; - repo = "BCHUnlimited"; - rev = "BCHunlimited${version}"; - sha256 = "sha256-d+giTXq/6HpysRAPT7yOl/B1x4zie9irs4O7cJsBqHg="; - }; - - nativeBuildInputs = [ pkg-config autoreconfHook python3 ] - ++ lib.optionals withGui [ wrapQtAppsHook qttools ]; - buildInputs = [ openssl db48 boost zlib - miniupnpc util-linux protobuf libevent ] - ++ lib.optionals withGui [ qtbase qttools qrencode ] - ++ lib.optionals stdenv.isDarwin [ Foundation ApplicationServices AppKit ]; - - configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ] - ++ lib.optionals withGui [ "--with-gui=qt5" - "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin" - ]; - enableParallelBuilding = true; - - meta = with lib; { - description = "Peer-to-peer electronic cash system (Unlimited client)"; - longDescription= '' - Bitcoin is a free open source peer-to-peer electronic cash system that is - completely decentralized, without the need for a central server or trusted - parties. Users hold the crypto keys to their own money and transact directly - with each other, with the help of a P2P network to check for double-spending. - - The Bitcoin Unlimited (BU) project seeks to provide a voice to all - stakeholders in the Bitcoin ecosystem. - - Every node operator or miner can currently choose their own blocksize limit - by modifying their client. Bitcoin Unlimited makes the process easier by - providing a configurable option for the accepted and generated blocksize via - a GUI menu. Bitcoin Unlimited further provides a user-configurable failsafe - setting allowing you to accept a block larger than your maximum accepted - blocksize if it reaches a certain number of blocks deep in the chain. - - The Bitcoin Unlimited client is not a competitive block scaling proposal - like BIP-101, BIP-102, etc. Instead it tracks consensus. This means that it - tracks the blockchain that the hash power majority follows, irrespective of - blocksize, and signals its ability to accept larger blocks via protocol and - block versioning fields. - - If you support an increase in the blocksize limit by any means - or just - support Bitcoin conflict resolution as originally envisioned by its founder - - consider running a Bitcoin Unlimited client. - ''; - homepage = "https://www.bitcoinunlimited.info/"; - maintainers = with maintainers; [ DmitryTsygankov ]; - license = licenses.mit; - broken = true; - platforms = platforms.unix; - }; -} diff --git a/pkgs/applications/blockchains/bitcoin/default.nix b/pkgs/applications/blockchains/bitcoin/default.nix index 7e995ad60a8c6..e3eb1cf3bc31b 100644 --- a/pkgs/applications/blockchains/bitcoin/default.nix +++ b/pkgs/applications/blockchains/bitcoin/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, fetchpatch2 , autoreconfHook , pkg-config , installShellFiles @@ -43,17 +44,25 @@ stdenv.mkDerivation rec { sha256 = "0c1051fd921b8fae912f5c2dfd86b085ab45baa05cd7be4585b10b4d1818f3da"; }; + patches = [ + # upnp: fix build with miniupnpc 2.2.8 + (fetchpatch2 { + url = "https://github.com/bitcoin/bitcoin/commit/8acdf66540834b9f9cf28f16d389e8b6a48516d5.patch?full_index=1"; + hash = "sha256-oDvHUvwAEp0LJCf6QBESn38Bu359TcPpLhvuLX3sm6M="; + }) + ]; + nativeBuildInputs = [ autoreconfHook pkg-config installShellFiles ] - ++ lib.optionals stdenv.isLinux [ util-linux ] - ++ lib.optionals stdenv.isDarwin [ hexdump ] - ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ autoSignDarwinBinariesHook ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ util-linux ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ hexdump ] + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ autoSignDarwinBinariesHook ] ++ lib.optionals withGui [ wrapQtAppsHook ]; buildInputs = [ boost libevent miniupnpc zeromq zlib ] ++ lib.optionals withWallet [ sqlite ] # building with db48 (for legacy descriptor wallet support) is broken on Darwin - ++ lib.optionals (withWallet && !stdenv.isDarwin) [ db48 ] + ++ lib.optionals (withWallet && !stdenv.hostPlatform.isDarwin) [ db48 ] ++ lib.optionals withGui [ qrencode qtbase qttools ]; postInstall = '' @@ -74,7 +83,7 @@ stdenv.mkDerivation rec { install -Dm644 share/pixmaps/bitcoin256.png $out/share/pixmaps/bitcoin.png ''; - preConfigure = lib.optionalString stdenv.isDarwin '' + preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin '' export MACOSX_DEPLOYMENT_TARGET=10.13 ''; diff --git a/pkgs/applications/blockchains/btcpayserver/default.nix b/pkgs/applications/blockchains/btcpayserver/default.nix index 15d0335736017..3d97da4895cb9 100644 --- a/pkgs/applications/blockchains/btcpayserver/default.nix +++ b/pkgs/applications/blockchains/btcpayserver/default.nix @@ -6,13 +6,13 @@ buildDotnetModule rec { pname = "btcpayserver"; - version = "1.13.1"; + version = "1.13.5"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-p0GNwwbhsgChlSlPVD/RHhzWF/1URdYp/iYQmJxORU8="; + sha256 = "sha256-xga/v+4keZSgayPzitchzV4IRdui1IBPYB/uNVVMIaM="; }; projectFile = "BTCPayServer/BTCPayServer.csproj"; diff --git a/pkgs/applications/blockchains/btcpayserver/deps.nix b/pkgs/applications/blockchains/btcpayserver/deps.nix index 2ae9af5a08878..f61f2e02a649d 100644 --- a/pkgs/applications/blockchains/btcpayserver/deps.nix +++ b/pkgs/applications/blockchains/btcpayserver/deps.nix @@ -2,375 +2,382 @@ # Please dont edit it manually, your changes might get overwritten! { fetchNuGet }: [ - (fetchNuGet { pname = "AngleSharp"; version = "0.17.1"; sha256 = "038idg33ydy72362qplsd7y8ldifi9zg02dhjli6wy4p47hyqcph"; }) - (fetchNuGet { pname = "AngleSharp.Css"; version = "0.17.0"; sha256 = "0q5vfj4l24kz1djigl0fva0dv64j2f90x3g1db59vbiz8vvfjz5i"; }) - (fetchNuGet { pname = "AWSSDK.Core"; version = "3.3.104.14"; sha256 = "157694kb63z1szbsv861515fvjv7amrjrfmgbm3idpyw31afk650"; }) - (fetchNuGet { pname = "AWSSDK.S3"; version = "3.3.110.10"; sha256 = "1lf1hfbx792dpa1hxgn0a0jrrvldd16hgbxx229dk2qcz5qlnc38"; }) - (fetchNuGet { pname = "BIP78.Sender"; version = "0.2.2"; sha256 = "12pm2s35c0qzc06099q2z1pxwq94rq85n74yz8fs8gwvm2ksgp4p"; }) - (fetchNuGet { pname = "BTCPayServer.Hwi"; version = "2.0.2"; sha256 = "0lh3n1qncqs4kbrmx65xs271f0d9c7irrs9qnsa9q51cbbqbljh9"; }) - (fetchNuGet { pname = "BTCPayServer.Lightning.All"; version = "1.6.0"; sha256 = "0xcqf7jz5rsi6nawcjfdbbdjlnqbx8xfzw8sn3a9ks8xjqv37krn"; }) - (fetchNuGet { pname = "BTCPayServer.Lightning.Charge"; version = "1.5.1"; sha256 = "1sb6qhm15d6qqyx9v5g7csvp8phhs6k2py5wmfmbpnjydaydf76g"; }) - (fetchNuGet { pname = "BTCPayServer.Lightning.CLightning"; version = "1.6.0"; sha256 = "1bsmic9i1p2ya5hv1mscv46fxh6ibczfj1srylzwcpgs0mypy5y3"; }) - (fetchNuGet { pname = "BTCPayServer.Lightning.Common"; version = "1.3.21"; sha256 = "042xwfsxd30zgwiz0w14ynb755w5sldkplxgw1fkw68lrz66x5s4"; }) - (fetchNuGet { pname = "BTCPayServer.Lightning.Common"; version = "1.5.1"; sha256 = "1jy5k0nd2b10p3gyv8qm3nb31chkpcssrb9sjw2dqbac757nv154"; }) - (fetchNuGet { pname = "BTCPayServer.Lightning.Eclair"; version = "1.5.2"; sha256 = "1wmj66my2cg9dbz4bf8vrkxpkpl4wfqaxxzqxgs830vdk8h7pp50"; }) - (fetchNuGet { pname = "BTCPayServer.Lightning.LNBank"; version = "1.5.2"; sha256 = "0g2jv712lb3arlpf6j8p0ccq62gz1bjipb9ndzhdk7mwhaznkrwl"; }) - (fetchNuGet { pname = "BTCPayServer.Lightning.LND"; version = "1.5.4"; sha256 = "0jqxy60msq9rl04lmqyiz9f02mjywypfh3apr9vcbyv2q47maxnd"; }) - (fetchNuGet { pname = "BTCPayServer.Lightning.LNDhub"; version = "1.5.2"; sha256 = "09i663w6i93675bxrq5x6l26kr60mafwfr6ny92xrppj8rmd2lzx"; }) - (fetchNuGet { pname = "BTCPayServer.NETCore.Plugins"; version = "1.4.4"; sha256 = "0rk0prmb0539ji5fd33cqy3yvw51i5i8m5hb43admr5z8960dd6l"; }) - (fetchNuGet { pname = "BTCPayServer.NETCore.Plugins.Mvc"; version = "1.4.4"; sha256 = "1kmmj5m7s41wc1akpqw1b1j7pp4c0vn6sqxb487980ibpj6hyisl"; }) - (fetchNuGet { pname = "BTCPayServer.NTag424"; version = "1.0.22"; sha256 = "1gy81kqd745p2sak7yj5phn25k8blwwjzi39s5ikpwyqg3b0arsw"; }) - (fetchNuGet { pname = "CsvHelper"; version = "15.0.5"; sha256 = "01y8bhsnxghn3flz0pr11vj6wjrpmia8rpdrsp7kjfc1zmhqlgma"; }) - (fetchNuGet { pname = "Dapper"; version = "2.1.28"; sha256 = "15vpa9k11rr1mh5vb6hdchy8hqa03lqs83w19s3kxzh1089yl9m8"; }) - (fetchNuGet { pname = "DigitalRuby.ExchangeSharp"; version = "1.0.4"; sha256 = "1hkdls4wjrxq6df1zq9saa6hn5hynalq3gxb486w59j7i9f3g7d8"; }) - (fetchNuGet { pname = "Fido2"; version = "2.0.2"; sha256 = "1wqlk48apm7h637da7sav0r1a8yz2yy2gxhifpvydjqk1n3qybz4"; }) - (fetchNuGet { pname = "Fido2.AspNet"; version = "2.0.2"; sha256 = "0x2k1wyd0p7cy4ir15m2bxiggckl98znc65b4vq75ckjyd6dm1a1"; }) - (fetchNuGet { pname = "Fido2.Models"; version = "2.0.2"; sha256 = "1vk4h9sv2dhdr0jvh2a7yk6v9rhxk9y8hxz4mkal8vd9psajz5cg"; }) - (fetchNuGet { pname = "Google.Api.Gax"; version = "2.5.0"; sha256 = "0q6pi53px998i3gdndla8v0zqdpyi9gnsy9mdcfpkrg09vfbdsl9"; }) - (fetchNuGet { pname = "Google.Api.Gax.Rest"; version = "2.5.0"; sha256 = "1zkjl5zh6qwdz4qmnxnk5877pas638i2qi25znilhqqf3mrkp0rp"; }) - (fetchNuGet { pname = "Google.Apis"; version = "1.35.1"; sha256 = "1022l8m7v9f3rkjc9l11mkzwsbmqx9sk5f4aym035vn9hdr16d49"; }) - (fetchNuGet { pname = "Google.Apis"; version = "1.38.0"; sha256 = "01j3d1lv106cqw9n0lwgclrxghy852fsibv6av4xr03ivrkm8g40"; }) - (fetchNuGet { pname = "Google.Apis.Auth"; version = "1.35.1"; sha256 = "1qdnd1nq9bfgyljmiww91pfi0iz1n29rz2dlizhxcijqya2ldha3"; }) - (fetchNuGet { pname = "Google.Apis.Auth"; version = "1.38.0"; sha256 = "0x3bdwiyqjxw5df99bfasmsv09kb47wzisag938631cijl0g277y"; }) - (fetchNuGet { pname = "Google.Apis.Core"; version = "1.35.1"; sha256 = "01dfw2kxknlc5pm7x1q88lv9j979509lkkgvlffjry5bawsxsja4"; }) - (fetchNuGet { pname = "Google.Apis.Core"; version = "1.38.0"; sha256 = "012gslhnx65vqfyzjnqx4bqk9kb8bwbx966q2f9fdgrfcn26gj9j"; }) - (fetchNuGet { pname = "Google.Apis.Storage.v1"; version = "1.38.0.1470"; sha256 = "0mfrz7fmpfbjvp4zfpjasmnfbgxgxrrjkf8xgp9p6h9g8qh2f2h2"; }) - (fetchNuGet { pname = "Google.Cloud.Storage.V1"; version = "2.3.0"; sha256 = "01jhrd6m6md8m28chzg2dkdfd4yris79j1xi7r1ydm1cfjhmlj64"; }) - (fetchNuGet { pname = "HtmlSanitizer"; version = "8.0.838"; sha256 = "1k05ld36872lzbhlby9m1vf9y7chlijbflbk2pzcni57b9rp2qrg"; }) - (fetchNuGet { pname = "Humanizer.Core"; version = "2.14.1"; sha256 = "1ai7hgr0qwd7xlqfd92immddyi41j3ag91h3594yzfsgsy6yhyqi"; }) - (fetchNuGet { pname = "libsodium"; version = "1.0.18"; sha256 = "15qzl5k31yaaapqlijr336lh4lzz1qqxlimgxy8fdyig8jdmgszn"; }) - (fetchNuGet { pname = "LNURL"; version = "0.0.34"; sha256 = "1sbkqsln7wq5fsbw63wdha8kqwxgd95j0iblv4kxa1shyg3c5d9x"; }) - (fetchNuGet { pname = "MailKit"; version = "3.3.0"; sha256 = "18l0jkrc4d553kiw4vdjzzpafpvsgjs1n19kjbi8isnhzidmsl4j"; }) - (fetchNuGet { pname = "Microsoft.AspNet.SignalR.Client"; version = "2.4.3"; sha256 = "1whxcmxydcxjkw84sqk5idd406v3ia0xj2m4ia4b6wqbvkdqn7rf"; }) - (fetchNuGet { pname = "Microsoft.AspNet.WebApi.Client"; version = "5.2.9"; sha256 = "1sy1q36bm9fz3gi780w4jgysw3dwaz2f3a5gcn6jxw1gkmdasb08"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Connections.Abstractions"; version = "8.0.0"; sha256 = "0whzyzmsk5lylvdz30kchiwkpc495n837hn41165idj8b2f0p4c9"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Cryptography.Internal"; version = "8.0.1"; sha256 = "1gc2y4v1cvayy2fai02gsv1z6fr58kxb5jnmbjqxnd0zf49m88j7"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Cryptography.KeyDerivation"; version = "8.0.1"; sha256 = "0fnvim0rmiw9jm8xvajb5b9w4wawp95szy2dfh2aw1n8jgzs207x"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Http.Connections.Client"; version = "8.0.0"; sha256 = "1bkkwayfg78cbgj1bqklz60hm1h19rzh1r439b4jhd5b56m2krqv"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Http.Connections.Common"; version = "8.0.0"; sha256 = "1r0lqw6pq2m3636ym1qmh3n12qi2x80fjanpq831mjdmyl2p5agb"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Identity.EntityFrameworkCore"; version = "8.0.1"; sha256 = "08pnswpz17pfr923p9iv6imgzb8yfhsi4g31lxrhzglagahv4hiy"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.JsonPatch"; version = "8.0.1"; sha256 = "1jgkjna579pw5fx1pjbz0dc2lil9i3djf9c8lkb4vxrzrwmrdw31"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.NewtonsoftJson"; version = "8.0.1"; sha256 = "05pfp1kq24aqc56dbx2i2s71rbypc1czidhd6nvah0r3pn91rfny"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.Razor.Extensions"; version = "6.0.0"; sha256 = "1l26il73lrr48afwksd05qlaa9h7v14kydrvfcz2iczdh2r7id2f"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation"; version = "8.0.1"; sha256 = "0lqybwazpnivi7nq59yphizsq33wpz52s0n9iipvdg9lhhjns8xf"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Razor.Language"; version = "6.0.0"; sha256 = "0lssd2j44m0ybwmm1yphyncnh4jy5pg404767rzi8m5y06hdsiiz"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Client"; version = "8.0.0"; sha256 = "0mziqda492663w6k2v28v9fzwpzis2g81vck3d17rnzc872pkmnp"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Client.Core"; version = "8.0.0"; sha256 = "11273dhmdmrpkcc6hv448nvnr8lq9c3wj4bh55nijir7w0l70m7k"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Common"; version = "8.0.0"; sha256 = "0k4zlb3p57208zmmndlw2j1q160wawc93ixlbfwkqihnm1hcig6y"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Protocols.Json"; version = "8.0.0"; sha256 = "1va843rls7iffygjw9xijs15shd4jprhaa3b8ixgym52n2k12pxl"; }) - (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; sha256 = "15gqy2m14fdlvy1g59207h5kisznm355kbw010gy19vh47z8gpz3"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.3.2"; sha256 = "162vb5894zxps0cf5n9gc08an7gwybzz87allx3lsszvllr9ldx4"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.3.3"; sha256 = "09m4cpry8ivm9ga1abrxmvw16sslxhy2k5sl14zckhqb1j164im6"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.3.4"; sha256 = "0wd6v57p53ahz5z9zg4iyzmy3src7rlsncyqpcag02jjj1yx6g58"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "4.0.0"; sha256 = "1rwnz5zy7ia9312n2qzzar95x9p7iiw57cql7ssdwv255xl1ix29"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "4.5.0"; sha256 = "0hjzca7v3qq4wqzi9chgxzycbaysnjgj28ps20695x61sia6i3da"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "4.8.0"; sha256 = "0gmbxn91h4r23fhzpl1dh56cpva4sg2h659kdbdazayrajfj50fw"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "4.0.0"; sha256 = "1mzxjy7xp8r9x25xyspq89ngsz0hmkbp0l0h3v1jv2rcrw63wqb4"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "4.5.0"; sha256 = "1l6v0ii5lapmfnfpjwi3j5bwlx8v9nvyani5pwvqzdfqsd5m7mp5"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "4.8.0"; sha256 = "0idaksbib90zgi8xlycmdzk77dlxichspp23wpnfrzfxkdfafqrj"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Workspaces"; version = "4.5.0"; sha256 = "0skg5a8i4fq6cndxcjwciai808p0zpqz9kbvck94mcywfzassv1a"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Razor"; version = "6.0.0"; sha256 = "183jyvimyacynn6gc9b5r7l2d8q5gfbzkdl6hqfywsskxyjwqpwg"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Workspaces.Common"; version = "4.5.0"; sha256 = "1wjwsrnn5frahqciwaxsgalv80fs6xhqy6kcqy7hcsh7jrfc1kjq"; }) - (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.Core"; version = "8.0.1"; sha256 = "1ippysjxq97vz4kd0jxiqbcamgd9xxb6n23ias5d4c7gbiwayz0z"; }) - (fetchNuGet { pname = "Microsoft.EntityFrameworkCore"; version = "8.0.1"; sha256 = "1k1c63vkzr020q0pb6xxf29xlgxldnzhlqpmpq9fig85y73s84ds"; }) - (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Abstractions"; version = "8.0.0"; sha256 = "019r991228nxv1fibsxg5z81rr7ydgy77c9v7yvlx35kfppxq4s3"; }) - (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Abstractions"; version = "8.0.1"; sha256 = "1p8c2xfz8kgzswh9kq38mmy8qxfynnkywj9vwx15azbi8wcmh24x"; }) - (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Analyzers"; version = "8.0.1"; sha256 = "0l0fi9kiinj021sfk85qds1rdzavpkl24sjyzfyb8q8jmj5l2i0n"; }) - (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Design"; version = "8.0.1"; sha256 = "1y21lmbnq271q7q1vsq1z5gnz4fy89zca8qzm6bg2qfv8bgqqrny"; }) - (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Relational"; version = "8.0.0"; sha256 = "0ngsxk717si11g4a01ah2np8gp8b3k09y23229anr9jrhykr1bw1"; }) - (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Relational"; version = "8.0.1"; sha256 = "12zmg196mpd0wacwyrckv6l5rl76dzmvr588i437xiwp0iyjcsh9"; }) - (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Sqlite"; version = "8.0.1"; sha256 = "1igwxjmzgzkzyhmg5jbis6hynnzf5vfzl00h053si89h5m6vvhmb"; }) - (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Sqlite.Core"; version = "8.0.1"; sha256 = "0zg7whf02jlpcs72ngiydwd2xwwlvz3nja0xnyxv4k4w56qs8qcj"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Caching.Abstractions"; version = "2.2.0"; sha256 = "0hhxc5dp52faha1bdqw0k426zicsv6x1kfqi30m9agr0b2hixj52"; }) - (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.5"; sha256 = "1i7zm8ghgxwp655anyfm910qm7rcpvrz48fxjyzw9w63hj4sv6bk"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "6.0.0"; sha256 = "1zdyai2rzngmsp3706d12qrdk315c1s3ja218fzb3nc3wd1vz0s8"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "3.1.5"; sha256 = "03jwqjrfyx11ax19bq84c28qzaiyj4whrx7vayy4hr7sv0p28h8k"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "6.0.0"; sha256 = "0w6wwxv12nbc3sghvr68847wc9skkdgsicrz3fx4chgng1i3xy0j"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "8.0.0"; sha256 = "1jlpa4ggl1gr5fs7fdcw04li3y3iy05w3klr9lrrlc7v8w76kq71"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "3.1.5"; sha256 = "0310pvrwbbqak7k4s32syryqxlkwli8w8bwlpnqmz42svh2302wv"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "8.0.0"; sha256 = "1m0gawiz8f5hc3li9vd5psddlygwgkiw13d7div87kmkf4idza8r"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.EnvironmentVariables"; version = "6.0.0"; sha256 = "19w2vxliz1xangbach3hkx72x2pxqhc9n9c3kc3l8mhicl8w6vdl"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.FileExtensions"; version = "6.0.0"; sha256 = "02nna984iwnyyz4jjh9vs405nlj0yk1g5vz4v2x30z2c89mx5f9w"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Ini"; version = "6.0.0"; sha256 = "18qg1f7yvgvrgsq40cgc1yvpb9av84ma80k3grhvwn1cyam2img6"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "8.0.0"; sha256 = "0i7qziz0iqmbk8zzln7kx9vd0lbx1x3va0yi3j1bgkjir13h78ps"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "3.1.5"; sha256 = "1wkf8ajh4pj6g3wwd18g3hjc3lqqny8052rl373ddcardxrs2gvn"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "8.0.0"; sha256 = "1zw0bpp5742jzx03wvqc8csnvsbgdqi0ls9jfc5i2vd3cl8b74pg"; }) - (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.Features"; version = "8.0.0"; sha256 = "0v8xp320jki9vsrm1gd4k3bhafa3q9c3bf3wc5z59bnx56d06cly"; }) - (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.FileProviders.Physical"; version = "6.0.0"; sha256 = "1ikc3kf325xig6njbi2aj5kmww4xlaq9lsrpc8v764fsm4x10474"; }) - (fetchNuGet { pname = "Microsoft.Extensions.FileSystemGlobbing"; version = "6.0.0"; sha256 = "09gyyv4fwy9ys84z3aq4lm9y09b7bd1d4l4gfdinmg0z9678f1a4"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Hosting.Abstractions"; version = "8.0.0"; sha256 = "00d5dwmzw76iy8z40ly01hy9gly49a7rpf7k7m99vrid1kxp346h"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Identity.Core"; version = "8.0.1"; sha256 = "0gf68x3zxbn3gxzdjmbfcqhm58ybxvpanl4pq8vs5g492qw7h24b"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Identity.Stores"; version = "8.0.1"; sha256 = "19c0by2r85jqz6pj8mnr047aasasr7fbzi3ih04gchj8la69ka5h"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "8.0.0"; sha256 = "0nppj34nmq25gnrg0wh1q22y4wdqbih4ax493f226azv8mkp9s1i"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "1.0.0"; sha256 = "1sh9bidmhy32gkz6fkli79mxv06546ybrzppfw5v2aq0bda1ghka"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "3.1.5"; sha256 = "0lr22hlf52csrna9ly2lbz3y1agfgdlg7rvsqjg7ik488dhkmhji"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "6.0.0"; sha256 = "0b75fmins171zi6bfdcq1kcvyrirs8n91mknjnxy4c3ygi1rrnj0"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "7.0.1"; sha256 = "0xv3sqc1lbx5j4yy6g2w3kakzvrpwqs2ihax6lqasj5sz5map6fk"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "8.0.0"; sha256 = "1klcqhg3hk55hb6vmjiq2wgqidsl81aldw0li2z98lrwx26msrr6"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "3.1.5"; sha256 = "0rhqyqa7vhlmz2g0250zhypaayvckx4dv89micdg521cpvr5arpr"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "8.0.0"; sha256 = "0p50qn6zhinzyhq9sy5svnmqqwhw2jajs2pbjh9sah504wjvhscz"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "8.0.1"; sha256 = "01jsya858i861x6d7qbl3wlr0gp2y7x2m4q6f1r743w360z8zgpn"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Options.ConfigurationExtensions"; version = "3.1.5"; sha256 = "10w78fj2jpmghvprz6b046xcr68zzp6x550a7m1iivn0h7a3l7pi"; }) - (fetchNuGet { pname = "Microsoft.Extensions.PlatformAbstractions"; version = "1.1.0"; sha256 = "0r4j8v2vvp3kalvb11ny9cvpls3nrvqj0c81rxbkh99ynd2dbscp"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "2.2.0"; sha256 = "0znah6arbcqari49ymigg3wiy2hgdifz8zsq8vdc3ynnf45r7h0c"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "3.1.5"; sha256 = "0n2pk1sy8ikd29282sx4ps9r1wnhzgg4nwmkka9ypjizd8lkkk2m"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "6.0.0"; sha256 = "1kjiw6s4yfz9gm7mx3wkhp06ghnbs95icj9hi505shz9rjrg42q2"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "8.0.0"; sha256 = "0aldaz5aapngchgdr7dax9jw5wy7k7hmjgjpfgfv1wfif27jlkqm"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "6.6.0"; sha256 = "06z5a1jpqpdd1pix85is7kkpn4v0l4an909skji2p8gm09p5sfyv"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "6.6.0"; sha256 = "1mpkx544cbxws1a22zwxbp3lqqamcc3x915l23spsxqvgr02jjrq"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "6.6.0"; sha256 = "0h5vbsd5x9cf7nqyrwn7d7y1axhf1zz0jr9prvi4xpxawa3kajyj"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.1.2"; sha256 = "1507hnpr9my3z4w1r6xk5n0s1j3y6a2c2cnynj76za7cphxi1141"; }) - (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.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; }) - (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "7.0.0"; sha256 = "1bh77misznh19m1swqm3dsbji499b8xh9gk6w74sgbkarf6ni8lb"; }) - (fetchNuGet { pname = "MimeKit"; version = "3.3.0"; sha256 = "0rslxmwlv6w2fssv0mz2v6qi6zg1v0lmly6hvh258xqdfxrhn0y8"; }) - (fetchNuGet { pname = "Mono.TextTemplating"; version = "2.2.1"; sha256 = "1ih6399x4bxzchw7pq5195imir9viy2r1w702vy87vrarxyjqdp1"; }) - (fetchNuGet { pname = "MySqlConnector"; version = "2.3.1"; sha256 = "12j62zmn2ma3xymp0iyiq64g7a9mpcfshg4zkk2wcmvfggga5wml"; }) - (fetchNuGet { pname = "NBitcoin"; version = "5.0.40"; sha256 = "1rqzn84yaww4afagwg8jg1l5qdkvqyjdfcyd5widddqwxabbsjvh"; }) - (fetchNuGet { pname = "NBitcoin"; version = "6.0.8"; sha256 = "1f90zyrd35fzx0vgvd83jhd6hczd4037h2k198xiyxj04l4m3wm5"; }) - (fetchNuGet { pname = "NBitcoin"; version = "7.0.1"; sha256 = "05kqpjyp3ckb2183g9vfsdv362y5xg5j21p36zls0x3b0jgrwxw7"; }) - (fetchNuGet { pname = "NBitcoin"; version = "7.0.31"; sha256 = "07i20b6q2fmzrcibypcs2ys72ifnl9jbkjxaadxm6ml60gfds9mk"; }) - (fetchNuGet { pname = "NBitcoin"; version = "7.0.34"; sha256 = "0hw69gcmkxyz6y06c10hjmjm3avrpzc0lhn2n0k5fspnsh4bnrkz"; }) - (fetchNuGet { pname = "NBitcoin.Altcoins"; version = "3.0.23"; sha256 = "0nr8yryixhip7ffqlr584j8pfvjwggng23m0h0mad3liv3hxhb7k"; }) - (fetchNuGet { pname = "NBitpayClient"; version = "1.0.0.39"; sha256 = "1sgwradg7jnb4n3chwqfkximj1qhgl3r23p0sifmaa0kql2hlira"; }) - (fetchNuGet { pname = "NBXplorer.Client"; version = "4.3.0"; sha256 = "067v8438mys96r5c50xm5ifbnj1d9j58zj53zfw9xilylgr0wa69"; }) - (fetchNuGet { pname = "NdefLibrary"; version = "4.1.0"; sha256 = "1zqdia6jzhk6pr3d0szacc8knir035hk9qar7vnq1pv0yawn21z6"; }) - (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; }) - (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; }) - (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.3"; sha256 = "0xrwysmrn4midrjal8g2hr1bbg38iyisl0svamb11arqws4w2bw7"; }) - (fetchNuGet { pname = "Newtonsoft.Json.Bson"; version = "1.0.1"; sha256 = "1r1hvj5gjl466bya2bfl5aaj8rbwyf5x1msg710wf3k2llbci1xa"; }) - (fetchNuGet { pname = "Newtonsoft.Json.Bson"; version = "1.0.2"; sha256 = "0c27bhy9x3c2n26inq32kmp6drpm71n6mqnmcr19wrlcaihglj35"; }) - (fetchNuGet { pname = "NicolasDorier.CommandLine"; version = "2.0.0"; sha256 = "0gywvl0gqs3crlzwgwzcqf0qsrbhk3dxjycpimxqvs1ihg4dhb1f"; }) - (fetchNuGet { pname = "NicolasDorier.CommandLine.Configuration"; version = "2.0.0"; sha256 = "1cng096r3kb85lf5wjill4yhxx8nv9v0d6ksbn1i1vvdawwl6fkw"; }) - (fetchNuGet { pname = "NicolasDorier.RateLimits"; version = "1.2.3"; sha256 = "197cqb0yxd2hfxyikxw53m4lmxh87l9sqrr8xihg1j0knvwzgyyp"; }) - (fetchNuGet { pname = "NicolasDorier.StandardConfiguration"; version = "2.0.1"; sha256 = "1jiinqj1y8vv78p766asml4bd0k5gwrpl9ksi176h0z7wsj6ilrx"; }) - (fetchNuGet { pname = "NLog"; version = "5.1.3"; sha256 = "0r09pd9cax95gn5bxskfhmalfd5qi3xx5j14znvryd1vn2vy6fln"; }) - (fetchNuGet { pname = "Npgsql"; version = "8.0.0"; sha256 = "1x3jlin44frkhd7d50q0vmy0gapxqhmd4jv1nvsnkndp3xjsaynd"; }) - (fetchNuGet { pname = "Npgsql.EntityFrameworkCore.PostgreSQL"; version = "8.0.0"; sha256 = "0gakaj66imb5248w7sircam4b69y5di6xkrd62flqb5szlai3vg5"; }) - (fetchNuGet { pname = "NSec.Cryptography"; version = "20.2.0"; sha256 = "19slji51v8s8i4836nqqg7qb3i3p4ahqahz0fbb3gwpp67pn6izx"; }) - (fetchNuGet { pname = "PeterO.Cbor"; version = "4.1.3"; sha256 = "0882i3bhhx2yag2m4lbdsgngjwaj9ff4v0ab9zb839i4r77aq1yn"; }) - (fetchNuGet { pname = "PeterO.Numbers"; version = "1.6.0"; sha256 = "04kfdkfr600h69g67g6izbn57bxqjamvaadyw3p9gjsc0wrivi98"; }) - (fetchNuGet { pname = "PeterO.URIUtility"; version = "1.0.0"; sha256 = "04ihfbk2lf0smznwfb62h57qknls5jyxirdz72g5wn9h1dcgkdac"; }) - (fetchNuGet { pname = "Pomelo.EntityFrameworkCore.MySql"; version = "8.0.0-beta.2"; sha256 = "0f93gqzs6xr9lb6my8lmwkfvbb7lcgjq04715wk2k37mbb0smirv"; }) - (fetchNuGet { pname = "Portable.BouncyCastle"; version = "1.9.0"; sha256 = "0kphjwz4hk2nki3b4f9z096xzd520nrpvi3cjib8fkjk6zhwrr8q"; }) - (fetchNuGet { pname = "QRCoder"; version = "1.4.3"; sha256 = "1hmlqbdyq5n9bsmns5h0dwcxpd2jvqr9a2y6dyc9kbjmc8j1dpla"; }) - (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.0.11"; sha256 = "1x44bm1cgv28zmrp095wf9mn8a6a0ivnzp9v14dcbhx06igxzgg0"; }) - (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.1.0"; sha256 = "041im8hmp1zdgrx6jzyrdch6kshvbddmkar7r2mlm1ksb5c5kwpq"; }) - (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn"; }) - (fetchNuGet { pname = "runtime.any.System.Globalization"; version = "4.0.11"; sha256 = "0240rp66pi5bw1xklmh421hj7arwcdmjmgfkiq1cbc6nrm8ah286"; }) - (fetchNuGet { pname = "runtime.any.System.Globalization"; version = "4.3.0"; sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"; }) - (fetchNuGet { pname = "runtime.any.System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1ghhhk5psqxcg6w88sxkqrc35bxcz27zbqm2y5p5298pv3v7g201"; }) - (fetchNuGet { pname = "runtime.any.System.IO"; version = "4.1.0"; sha256 = "0kasfkjiml2kk8prnyn1990nhsahnjggvqwszqjdsfwfl43vpcb5"; }) - (fetchNuGet { pname = "runtime.any.System.IO"; version = "4.3.0"; sha256 = "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"; }) - (fetchNuGet { pname = "runtime.any.System.Reflection"; version = "4.1.0"; sha256 = "06kcs059d5czyakx75rvlwa2mr86156w18fs7chd03f7084l7mq6"; }) - (fetchNuGet { pname = "runtime.any.System.Reflection"; version = "4.3.0"; sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"; }) - (fetchNuGet { pname = "runtime.any.System.Reflection.Extensions"; version = "4.3.0"; sha256 = "0zyri97dfc5vyaz9ba65hjj1zbcrzaffhsdlpxc9bh09wy22fq33"; }) - (fetchNuGet { pname = "runtime.any.System.Reflection.Primitives"; version = "4.0.1"; sha256 = "1zxrpvixr5fqzkxpnin6g6gjq6xajy1snghz99ds2dwbhm276rhz"; }) - (fetchNuGet { pname = "runtime.any.System.Reflection.Primitives"; version = "4.3.0"; sha256 = "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf"; }) - (fetchNuGet { pname = "runtime.any.System.Resources.ResourceManager"; version = "4.0.1"; sha256 = "1jmgs7hynb2rff48623wnyb37558bbh1q28k9c249j5r5sgsr5kr"; }) - (fetchNuGet { pname = "runtime.any.System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl"; }) - (fetchNuGet { pname = "runtime.any.System.Runtime"; version = "4.1.0"; sha256 = "0mjr2bi7wvnkphfjqgkyf8vfyvy15a829jz6mivl6jmksh2bx40m"; }) - (fetchNuGet { pname = "runtime.any.System.Runtime"; version = "4.3.0"; sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"; }) - (fetchNuGet { pname = "runtime.any.System.Runtime.Handles"; version = "4.0.1"; sha256 = "1kswgqhy34qvc49i981fk711s7knd6z13bp0rin8ms6axkh98nas"; }) - (fetchNuGet { pname = "runtime.any.System.Runtime.Handles"; version = "4.3.0"; sha256 = "0bh5bi25nk9w9xi8z23ws45q5yia6k7dg3i4axhfqlnj145l011x"; }) - (fetchNuGet { pname = "runtime.any.System.Runtime.InteropServices"; version = "4.1.0"; sha256 = "0gm8if0hcmp1qys1wmx4970k2x62pqvldgljsyzbjhiy5644vl8z"; }) - (fetchNuGet { pname = "runtime.any.System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19"; }) - (fetchNuGet { pname = "runtime.any.System.Text.Encoding"; version = "4.0.11"; sha256 = "0m4vgmzi1ky8xlj0r7xcyazxln3j9dlialnk6d2gmgrfnzf8f9m7"; }) - (fetchNuGet { pname = "runtime.any.System.Text.Encoding"; version = "4.3.0"; sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"; }) - (fetchNuGet { pname = "runtime.any.System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8"; }) - (fetchNuGet { pname = "runtime.any.System.Threading.Tasks"; version = "4.0.11"; sha256 = "1qzdp09qs8br5qxzlm1lgbjn4n57fk8vr1lzrmli2ysdg6x1xzvk"; }) - (fetchNuGet { pname = "runtime.any.System.Threading.Tasks"; version = "4.3.0"; sha256 = "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va"; }) - (fetchNuGet { pname = "runtime.any.System.Threading.Timer"; version = "4.3.0"; sha256 = "0aw4phrhwqz9m61r79vyfl5la64bjxj8l34qnrcwb28v49fg2086"; }) - (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; }) - (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; }) - (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; }) - (fetchNuGet { pname = "runtime.native.System"; version = "4.0.0"; sha256 = "1ppk69xk59ggacj9n7g6fyxvzmk1g5p4fkijm0d7xqfkig98qrkf"; }) - (fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; }) - (fetchNuGet { pname = "runtime.native.System.IO.Compression"; version = "4.3.0"; sha256 = "1vvivbqsk6y4hzcid27pqpm5bsi6sc50hvqwbcx8aap5ifrxfs8d"; }) - (fetchNuGet { pname = "runtime.native.System.Net.Http"; version = "4.3.0"; sha256 = "1n6rgz5132lcibbch1qlf0g9jk60r0kqv087hxc0lisy50zpm7kk"; }) - (fetchNuGet { pname = "runtime.native.System.Net.Security"; version = "4.3.0"; sha256 = "0dnqjhw445ay3chpia9p6vy4w2j6s9vy3hxszqvdanpvvyaxijr3"; }) - (fetchNuGet { pname = "runtime.native.System.Security.Cryptography"; version = "4.0.0"; sha256 = "0k57aa2c3b10wl3hfqbgrl7xq7g8hh3a3ir44b31dn5p61iiw3z9"; }) - (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; sha256 = "1b61p6gw1m02cc1ry996fl49liiwky6181dzr873g9ds92zl326q"; }) - (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; }) - (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"; }) - (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf"; }) - (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; sha256 = "10yc8jdrwgcl44b4g93f1ds76b176bajd3zqi2faf5rvh1vy9smi"; }) - (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3"; }) - (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn"; }) - (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"; }) - (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"; }) - (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; }) - (fetchNuGet { pname = "runtime.unix.Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0y61k9zbxhdi0glg154v30kkq7f8646nif8lnnxbvkjpakggd5id"; }) - (fetchNuGet { pname = "runtime.unix.System.Console"; version = "4.3.0"; sha256 = "1pfpkvc6x2if8zbdzg9rnc5fx51yllprl8zkm5npni2k50lisy80"; }) - (fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.0.11"; sha256 = "05ndbai4vpqrry0ghbfgqc8xblmplwjgndxmdn1zklqimczwjg2d"; }) - (fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5"; }) - (fetchNuGet { pname = "runtime.unix.System.IO.FileSystem"; version = "4.3.0"; sha256 = "14nbkhvs7sji5r1saj2x8daz82rnf9kx28d3v2qss34qbr32dzix"; }) - (fetchNuGet { pname = "runtime.unix.System.Net.Primitives"; version = "4.3.0"; sha256 = "0bdnglg59pzx9394sy4ic66kmxhqp8q8bvmykdxcbs5mm0ipwwm4"; }) - (fetchNuGet { pname = "runtime.unix.System.Net.Sockets"; version = "4.3.0"; sha256 = "03npdxzy8gfv035bv1b9rz7c7hv0rxl5904wjz51if491mw0xy12"; }) - (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.0.1"; sha256 = "0ic5dgc45jkhcr1g9xmmzjm7ffiw4cymm0fprczlx4fnww4783nm"; }) - (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; }) - (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.1.0"; sha256 = "0x1cwd7cvifzmn5x1wafvj75zdxlk3mxy860igh3x1wx0s8167y4"; }) - (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.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"; }) - (fetchNuGet { pname = "Serilog.Settings.Configuration"; version = "8.0.0"; sha256 = "0245gvndwbj4nbp8q09vp7w4i9iddxr0vzda2c3ja5afz1zgs395"; }) - (fetchNuGet { pname = "Serilog.Sinks.Console"; version = "5.0.0"; sha256 = "0qk5b9vfgzx00a1c2rnih2p3jlcc88vdi9ar5cpwv1jb09x6brah"; }) - (fetchNuGet { pname = "Serilog.Sinks.Debug"; version = "2.0.0"; sha256 = "1i7j870l47gan3gpnnlzkccn5lbm7518cnkp25a3g5gp9l0dbwpw"; }) - (fetchNuGet { pname = "Serilog.Sinks.File"; version = "5.0.1-dev-00968"; sha256 = "03p0pyydks9dpzisp9ryjgf54rlh1ym8wpy1nv5692smffbfyyl1"; }) - (fetchNuGet { pname = "SocketIOClient"; version = "3.0.8"; sha256 = "1k3csni1zyy55rdzcyivppqmyxvrmm31bqm6gffc25v959jp73wv"; }) - (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 = "SSH.NET"; version = "2023.0.0"; sha256 = "16pjwb4ns8vq561x7ib9vbpmxqvvh9ibl8af2s7v4a5wxc21y832"; }) - (fetchNuGet { pname = "SshNet.Security.Cryptography"; version = "1.3.0"; sha256 = "1y9r9c2dn81l1l4nn976fwf0by83qbvb0sp1hw7m19pqz7pmaflh"; }) - (fetchNuGet { pname = "System.AppContext"; version = "4.3.0"; sha256 = "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya"; }) - (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; }) - (fetchNuGet { pname = "System.Buffers"; version = "4.5.1"; sha256 = "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3"; }) - (fetchNuGet { pname = "System.CodeDom"; version = "4.4.0"; sha256 = "1zgbafm5p380r50ap5iddp11kzhr9khrf2pnai6k593wjar74p1g"; }) - (fetchNuGet { pname = "System.Collections"; version = "4.0.11"; sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; }) - (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) - (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.0.12"; sha256 = "07y08kvrzpak873pmyxs129g1ch8l27zmg51pcyj2jvq03n0r0fc"; }) - (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.3.0"; sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; }) - (fetchNuGet { pname = "System.Collections.Immutable"; version = "5.0.0"; sha256 = "1kvcllagxz2q92g81zkz81djkn2lid25ayjfgjalncyc68i15p0r"; }) - (fetchNuGet { pname = "System.Collections.Immutable"; version = "6.0.0"; sha256 = "1js98kmjn47ivcvkjqdmyipzknb9xbndssczm8gq224pbaj1p88c"; }) - (fetchNuGet { pname = "System.Collections.Immutable"; version = "7.0.0"; sha256 = "1n9122cy6v3qhsisc9lzwa1m1j62b8pi2678nsmnlyvfpk0zdagm"; }) - (fetchNuGet { pname = "System.Collections.Immutable"; version = "8.0.0"; sha256 = "0z53a42zjd59zdkszcm7pvij4ri5xbb8jly9hzaad9khlf69bcqp"; }) - (fetchNuGet { pname = "System.Composition"; version = "6.0.0"; sha256 = "1p7hysns39cc24af6dwd4m48bqjsrr3clvi4aws152mh2fgyg50z"; }) - (fetchNuGet { pname = "System.Composition.AttributedModel"; version = "6.0.0"; sha256 = "1mqrblb0l65hw39d0hnspqcv85didpn4wbiwhfgj4784wzqx2w6k"; }) - (fetchNuGet { pname = "System.Composition.Convention"; version = "6.0.0"; sha256 = "02km3yb94p1c4s7liyhkmda0g71zm1rc8ijsfmy4bnlkq15xjw3b"; }) - (fetchNuGet { pname = "System.Composition.Hosting"; version = "6.0.0"; sha256 = "0big5nk8c44rxp6cfykhk7rxvn2cgwa99w6c3v2a36adc3lj36ky"; }) - (fetchNuGet { pname = "System.Composition.Runtime"; version = "6.0.0"; sha256 = "0vq5ik63yii1784gsa2f2kx9w6xllmm8b8rk0arid1jqdj1nyrlw"; }) - (fetchNuGet { pname = "System.Composition.TypedParts"; version = "6.0.0"; sha256 = "0y9pq3y60nyrpfy51f576a0qjjdh61mcv8vnik32pm4bz56h9q72"; }) - (fetchNuGet { pname = "System.Configuration.ConfigurationManager"; version = "7.0.0"; sha256 = "149d9kmakzkbw69cip1ny0wjlgcvnhrr7vz5pavpsip36k2mw02a"; }) - (fetchNuGet { pname = "System.Console"; version = "4.3.0"; sha256 = "1flr7a9x920mr5cjsqmsy9wgnv3lvd0h1g521pdr1lkb2qycy7ay"; }) - (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.0.11"; sha256 = "0gmjghrqmlgzxivd2xl50ncbglb7ljzb66rlx8ws6dv8jm0d5siz"; }) - (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; }) - (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.3.0"; sha256 = "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq"; }) - (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "8.0.0"; sha256 = "0nzra1i0mljvmnj1qqqg37xs7bl71fnpl68nwmdajchh65l878zr"; }) - (fetchNuGet { pname = "System.Diagnostics.EventLog"; version = "7.0.0"; sha256 = "16p8z975dnzmncfifa9gw9n3k9ycpr2qvz7lglpghsvx0fava8k9"; }) - (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1"; }) - (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.1.0"; sha256 = "1d2r76v1x610x61ahfpigda89gd13qydz6vbwzhpqlyvq8jj6394"; }) - (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; }) - (fetchNuGet { pname = "System.Drawing.Common"; version = "7.0.0"; sha256 = "0jwyv5zjxzr4bm4vhmz394gsxqa02q6pxdqd2hwy1f116f0l30dp"; }) - (fetchNuGet { pname = "System.Formats.Asn1"; version = "6.0.0"; sha256 = "1vvr7hs4qzjqb37r0w1mxq7xql2b17la63jwvmgv65s1hj00g8r9"; }) - (fetchNuGet { pname = "System.Globalization"; version = "4.0.11"; sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; }) - (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; }) - (fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq"; }) - (fetchNuGet { pname = "System.Globalization.Extensions"; version = "4.3.0"; sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"; }) - (fetchNuGet { pname = "System.IdentityModel.Tokens.Jwt"; version = "6.6.0"; sha256 = "17i6a43g1fksq9xy77dgsz54klz71pz062pb58lqx8h06p1818h1"; }) - (fetchNuGet { pname = "System.Interactive.Async"; version = "3.1.1"; sha256 = "03iq20gq0n2b2sdzs5jhxf46nzkfgvzip6q5248vka2rcvn1yanh"; }) - (fetchNuGet { pname = "System.IO"; version = "4.1.0"; sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; }) - (fetchNuGet { pname = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; }) - (fetchNuGet { pname = "System.IO.Compression"; version = "4.3.0"; sha256 = "084zc82yi6yllgda0zkgl2ys48sypiswbiwrv7irb3r0ai1fp4vz"; }) - (fetchNuGet { pname = "System.IO.Compression.ZipFile"; version = "4.3.0"; sha256 = "1yxy5pq4dnsm9hlkg9ysh5f6bf3fahqqb6p8668ndy5c0lk7w2ar"; }) - (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.3.0"; sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; }) - (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; }) - (fetchNuGet { pname = "System.IO.Pipelines"; version = "6.0.3"; sha256 = "1jgdazpmwc21dd9naq3l9n5s8a1jnbwlvgkf1pnm0aji6jd4xqdz"; }) - (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.3.0"; sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; }) - (fetchNuGet { pname = "System.Memory"; version = "4.5.1"; sha256 = "0f07d7hny38lq9w69wx4lxkn4wszrqf9m9js6fh9is645csm167c"; }) - (fetchNuGet { pname = "System.Memory"; version = "4.5.3"; sha256 = "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a"; }) - (fetchNuGet { pname = "System.Memory"; version = "4.5.4"; sha256 = "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y"; }) - (fetchNuGet { pname = "System.Net.Http"; version = "4.3.0"; sha256 = "1i4gc757xqrzflbk7kc5ksn20kwwfjhw9w7pgdkn19y3cgnl302j"; }) - (fetchNuGet { pname = "System.Net.NameResolution"; version = "4.3.0"; sha256 = "15r75pwc0rm3vvwsn8rvm2krf929mjfwliv0mpicjnii24470rkq"; }) - (fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; }) - (fetchNuGet { pname = "System.Net.Security"; version = "4.3.0"; sha256 = "1aa5igz31ivk6kpgsrwck3jccab7wd88wr52lddmgypmbh9mmf87"; }) - (fetchNuGet { pname = "System.Net.Sockets"; version = "4.3.0"; sha256 = "1ssa65k6chcgi6mfmzrznvqaxk8jp0gvl77xhf1hbzakjnpxspla"; }) - (fetchNuGet { pname = "System.Net.WebHeaderCollection"; version = "4.3.0"; sha256 = "0ms3ddjv1wn8sqa5qchm245f3vzzif6l6fx5k92klqpn7zf4z562"; }) - (fetchNuGet { pname = "System.Net.WebSockets"; version = "4.3.0"; sha256 = "1gfj800078kggcgl0xyl00a6y5k4wwh2k2qm69rjy22wbmq7fy4p"; }) - (fetchNuGet { pname = "System.Net.WebSockets.Client"; version = "4.3.2"; sha256 = "103y8lfsfa5xd1sqmq9sml4qyp4rij2i3fnnw119h119hb04l0rk"; }) - (fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; }) - (fetchNuGet { pname = "System.Private.Uri"; version = "4.0.1"; sha256 = "0k57qhawjysm4cpbfpc49kl4av7lji310kjcamkl23bwgij5ld9j"; }) - (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; }) - (fetchNuGet { pname = "System.Reflection"; version = "4.1.0"; sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9"; }) - (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; }) - (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.3.0"; sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; }) - (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; }) - (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.3.0"; sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; }) - (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; }) - (fetchNuGet { pname = "System.Reflection.Metadata"; version = "5.0.0"; sha256 = "17qsl5nanlqk9iz0l5wijdn6ka632fs1m1fvx18dfgswm258r3ss"; }) - (fetchNuGet { pname = "System.Reflection.Metadata"; version = "6.0.1"; sha256 = "0fjqifk4qz9lw5gcadpfalpplyr0z2b3p9x7h0ll481a9sqvppc9"; }) - (fetchNuGet { pname = "System.Reflection.Metadata"; version = "7.0.0"; sha256 = "1wilasn2qmj870h2bhw348lspamm7pbinpb4m89icg113510l00v"; }) - (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.0.1"; sha256 = "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28"; }) - (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; }) - (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.3.0"; sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; }) - (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.0.1"; sha256 = "0b4i7mncaf8cnai85jv3wnw6hps140cxz8vylv2bik6wyzgvz7bi"; }) - (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; }) - (fetchNuGet { pname = "System.Runtime"; version = "4.1.0"; sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; }) - (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; }) - (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.1"; sha256 = "1xcrjx5fwg284qdnxyi2d0lzdm5q4frlpkp0nf6vvkx1kdz2prrf"; }) - (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.7.0"; sha256 = "16r6sn4czfjk8qhnz7bnqlyiaaszr0ihinb7mq9zzr1wba257r54"; }) - (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "5.0.0"; sha256 = "02k25ivn50dmqx5jn8hawwmz24yf0454fjd823qk6lygj9513q4x"; }) - (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; sha256 = "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc"; }) - (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.1.0"; sha256 = "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z"; }) - (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; }) - (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.0.1"; sha256 = "1g0zrdi5508v49pfm3iii2hn6nm00bgvfpjq1zxknfjrxxa20r4g"; }) - (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; }) - (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.1.0"; sha256 = "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1"; }) - (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; }) - (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.3.0"; sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; }) - (fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.3.0"; sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; }) - (fetchNuGet { pname = "System.Security.Claims"; version = "4.3.0"; sha256 = "0jvfn7j22l3mm28qjy3rcw287y9h65ha4m940waaxah07jnbzrhn"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Algorithms"; version = "4.3.0"; sha256 = "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.3.0"; sha256 = "1k468aswafdgf56ab6yrn7649kfqx2wm9aslywjam1hdmk5yypmv"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.7.0"; sha256 = "00797sqbba8lys486ifxblz9j52m29kidclvmqpk531820k55x9j"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Csp"; version = "4.3.0"; sha256 = "1x5wcrddf2s3hb8j78cry7yalca4lb5vfnkrysagbn6r9x6xvrx1"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Encoding"; version = "4.3.0"; sha256 = "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32"; }) - (fetchNuGet { pname = "System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0givpvvj8yc7gv4lhb6s1prq6p2c4147204a0wib89inqzd87gqc"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Pkcs"; version = "6.0.0"; sha256 = "1q80znpwkv5wrzgx0qnzxqaa5k1s72fnk3g1yng62l7y14d8ki64"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Primitives"; version = "4.3.0"; sha256 = "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby"; }) - (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "7.0.0"; sha256 = "15s9s6hsj9bz0nzw41mxbqdjgjd71w2djqbv0aj413gfi9amybk9"; }) - (fetchNuGet { pname = "System.Security.Cryptography.X509Certificates"; version = "4.3.0"; sha256 = "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h"; }) - (fetchNuGet { pname = "System.Security.Permissions"; version = "7.0.0"; sha256 = "0wkm6bj4abknzj41ygkziifx8mzhj4bix92wjvj6lihaw1gniq8c"; }) - (fetchNuGet { pname = "System.Security.Principal"; version = "4.3.0"; sha256 = "12cm2zws06z4lfc4dn31iqv7072zyi4m910d4r6wm8yx85arsfxf"; }) - (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.3.0"; sha256 = "00a0a7c40i3v4cb20s2cmh9csb5jv2l0frvnlzyfxh848xalpdwr"; }) - (fetchNuGet { pname = "System.Text.Encoding"; version = "4.0.11"; sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; }) - (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) - (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "4.5.1"; sha256 = "1z21qyfs6sg76rp68qdx0c9iy57naan89pg7p6i3qpj8kyzn921w"; }) - (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "6.0.0"; sha256 = "0gm2kiz2ndm9xyzxgi0jhazgwslcs427waxgfa30m7yqll1kcrww"; }) - (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; }) - (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 = "7.0.2"; sha256 = "1i6yinxvbwdk5g5z9y8l4a5hj2gw3h9ijlz2f1c1ngyprnwz2ivf"; }) - (fetchNuGet { pname = "System.Text.Json"; version = "8.0.0"; sha256 = "134savxw0sq7s448jnzw17bxcijsi1v38mirpbb6zfxmqlf04msw"; }) - (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 = "6.0.0"; sha256 = "1qbyi7yymqc56frqy7awvcqc1m7x3xrpx87a37dgb3mbrjg9hlcj"; }) - (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.3.0"; sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; }) - (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; sha256 = "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153"; }) - (fetchNuGet { pname = "System.Threading.ThreadPool"; version = "4.3.0"; sha256 = "027s1f4sbx0y1xqw2irqn6x161lzj8qwvnh2gn78ciiczdv10vf1"; }) - (fetchNuGet { pname = "System.Threading.Timer"; version = "4.3.0"; sha256 = "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56"; }) - (fetchNuGet { pname = "System.Windows.Extensions"; version = "7.0.0"; sha256 = "11r9f0v7qp365bdpq5ax023yra4qvygljz18dlqs650d44iay669"; }) - (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.3.0"; sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; }) - (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.3.0"; sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; }) - (fetchNuGet { pname = "TwentyTwenty.Storage"; version = "2.12.1"; sha256 = "0m41dxzc3hh0f4j1k4q915pvcq6zr0hv1pj6b3sayrn8vjhk64qb"; }) - (fetchNuGet { pname = "TwentyTwenty.Storage.Amazon"; version = "2.12.1"; sha256 = "03nrkvhki35w1rqx94s97rwxl0qwqlczyiimhrkc72vjppn5p6ph"; }) - (fetchNuGet { pname = "TwentyTwenty.Storage.Azure"; version = "2.12.1"; sha256 = "10q7gpr8kmgzmxrzj3paqlnw4d8li8scwpxkzs11ildscfp6hvlv"; }) - (fetchNuGet { pname = "TwentyTwenty.Storage.Google"; version = "2.12.1"; sha256 = "0d8s7p9brp03h9dpv3wxnqg0xsm7d9p4k6dpxpb9jak535khxzhp"; }) - (fetchNuGet { pname = "TwentyTwenty.Storage.Local"; version = "2.12.1"; sha256 = "1zmjqwd1v3z78ab4vdmaadh94465k1qgpv7ylv8x3sdx4z78yjm8"; }) - (fetchNuGet { pname = "WindowsAzure.Storage"; version = "9.3.3"; sha256 = "14b0b0nj85yvyn0h8ghr3kj6di2nkbzjxc2q98f1wcr0151xvdfx"; }) - (fetchNuGet { pname = "YamlDotNet"; version = "8.0.0"; sha256 = "09hr1jimmfhcpk97p963y94h2k5p7wzcj4mpwqpdnwzbyrp2flpm"; }) + (fetchNuGet { pname = "AngleSharp"; version = "0.17.1"; hash = "sha256-8DLs4SGXeG4ilbAJ8H6KLjaK/GmaXizMEMc3P8ZrEQ0="; }) + (fetchNuGet { pname = "AngleSharp.Css"; version = "0.17.0"; hash = "sha256-sXzp9kY/rp3KauGNDpITkpjdgNoO0BdlC38SQYl0u2A="; }) + (fetchNuGet { pname = "AWSSDK.Core"; version = "3.3.104.14"; hash = "sha256-oJjpVBjc3xZHXa+6LHNVZ8vtSijBoK3X1+EPsyZJ5pQ="; }) + (fetchNuGet { pname = "AWSSDK.S3"; version = "3.3.110.10"; hash = "sha256-aDBLcfkMi9mSEL2vB01oje6cJVDAvg6Duk2k05eDwdE="; }) + (fetchNuGet { pname = "BIP78.Sender"; version = "0.2.2"; hash = "sha256-l9ynp6ibP6Qd+p4cWxDOJGHeb/gCpwQMYB8DVoYW9Yo="; }) + (fetchNuGet { pname = "BTCPayServer.Hwi"; version = "2.0.2"; hash = "sha256-CUq68FosFJyUtjjpnONhqQEXjtC9mF7zmkRjZnGwA1I="; }) + (fetchNuGet { pname = "BTCPayServer.Lightning.All"; version = "1.6.0"; hash = "sha256-Ns8zNpYd6ZnUsBrx7zrqC1sq21rNScaVNVHn8uVxmHU="; }) + (fetchNuGet { pname = "BTCPayServer.Lightning.Charge"; version = "1.5.1"; hash = "sha256-zxzXvGpe2ruqq7z4K6bREF50t2bnlZ26x9i0EirEZuk="; }) + (fetchNuGet { pname = "BTCPayServer.Lightning.CLightning"; version = "1.6.0"; hash = "sha256-wxd/fQX6XcY/9VkH6T5b0cDuDNlM17BhUV7cEBOLVa8="; }) + (fetchNuGet { pname = "BTCPayServer.Lightning.Common"; version = "1.3.21"; hash = "sha256-RJduzM8UGT5d4K/TOxvVhZdylvUkcPAjfx+M1rXjXRA="; }) + (fetchNuGet { pname = "BTCPayServer.Lightning.Common"; version = "1.5.1"; hash = "sha256-pIRtTzlMLdwElzqtrDW7E7Iwlh0Vo+3fuCAs0SyYxcs="; }) + (fetchNuGet { pname = "BTCPayServer.Lightning.Eclair"; version = "1.5.2"; hash = "sha256-oNx7IJptg4H06/j3rrDjhN55+8wbuUX+aukx4asxsvI="; }) + (fetchNuGet { pname = "BTCPayServer.Lightning.LNBank"; version = "1.5.2"; hash = "sha256-lOdpv4K8ntngbzatG+UK/wmDGQMXSeMuzWosKsLZUjw="; }) + (fetchNuGet { pname = "BTCPayServer.Lightning.LND"; version = "1.5.4"; hash = "sha256-zXZVD8Fi+8V2ylcN6K7nXlYBXPrR40oJoDlhXYHxHUs="; }) + (fetchNuGet { pname = "BTCPayServer.Lightning.LNDhub"; version = "1.5.2"; hash = "sha256-/VPRakby3txF8tZkx52qwORpBDW94NxXOWakaPgwJiY="; }) + (fetchNuGet { pname = "BTCPayServer.NETCore.Plugins"; version = "1.4.4"; hash = "sha256-1LQGTEK/5NrUIAuWimKJofDth8dsjOZKlGkUsGq+YGY="; }) + (fetchNuGet { pname = "BTCPayServer.NETCore.Plugins.Mvc"; version = "1.4.4"; hash = "sha256-VEcPjbwrApQOIqtjbewGjNx7ZFiB4ztVYDwQfWqRtc4="; }) + (fetchNuGet { pname = "BTCPayServer.NTag424"; version = "1.0.23"; hash = "sha256-KbROPk6QSOpitvPXWrsco0lCdlZr9ZMY6Fjd4/dUYtU="; }) + (fetchNuGet { pname = "CsvHelper"; version = "32.0.3"; hash = "sha256-XbRxWNgxYe3sUZQZr5d9DxLAOl10cBCZ7JGm4xujuMQ="; }) + (fetchNuGet { pname = "Dapper"; version = "2.1.35"; hash = "sha256-zeroySx7lO1yLtbhKhFQ87diWXOq9gPnv3qFcmNcs9M="; }) + (fetchNuGet { pname = "DigitalRuby.ExchangeSharp"; version = "1.0.4"; hash = "sha256-qJ03XIpHpsINIqu/gamyHhYLjVI64R9cM7hnyYmmbcI="; }) + (fetchNuGet { pname = "Fido2"; version = "2.0.2"; hash = "sha256-5C+Phw0Ty+b3dRH2J7wX3yMVMthKH9XOMPDUqxCZFPM="; }) + (fetchNuGet { pname = "Fido2.AspNet"; version = "2.0.2"; hash = "sha256-QYXaTPNysnLwJqsYZj9KdLL3Yl+ilpAj8exc0DwPU3Q="; }) + (fetchNuGet { pname = "Fido2.Models"; version = "2.0.2"; hash = "sha256-j5Uvlb6pbUTVrOR3iHyaHea0zfRHCbglyA02sXWCZO4="; }) + (fetchNuGet { pname = "Google.Api.Gax"; version = "2.5.0"; hash = "sha256-ieq23E7g5XkdazV5bV+K/jb8wUaKNtveiCilfkeJ12A="; }) + (fetchNuGet { pname = "Google.Api.Gax.Rest"; version = "2.5.0"; hash = "sha256-N4M7cx0OY0ij/UVELCIaRqt7DirTdlsx+Y1jA3+hcv4="; }) + (fetchNuGet { pname = "Google.Apis"; version = "1.35.1"; hash = "sha256-iTQTcoPJ7jJA9Yq4MnXquC7N/6wh0MTkzMOlfSqiQoA="; }) + (fetchNuGet { pname = "Google.Apis"; version = "1.38.0"; hash = "sha256-gDxUZ95xgNzJVmavqJ0oyMPXM2WPU2ATx8yAsGloQwY="; }) + (fetchNuGet { pname = "Google.Apis.Auth"; version = "1.35.1"; hash = "sha256-Q8FGhfJYRtbhj7SJn5Ow4UcQ3Q2J81gl9c+thG1otuE="; }) + (fetchNuGet { pname = "Google.Apis.Auth"; version = "1.38.0"; hash = "sha256-/hzxAJWRhWHQSE/p+PkhayawddXKrZRcK7xL7CNva3Q="; }) + (fetchNuGet { pname = "Google.Apis.Core"; version = "1.35.1"; hash = "sha256-REndNVer+Cydo/vNSRMo6SSZNkUIh37qLYza2afgrgU="; }) + (fetchNuGet { pname = "Google.Apis.Core"; version = "1.38.0"; hash = "sha256-MslnhGUuv+aSE9iY1BdfaM008SIdW/m9w7uYbiHVTwQ="; }) + (fetchNuGet { pname = "Google.Apis.Storage.v1"; version = "1.38.0.1470"; hash = "sha256-AgonIEYvQXPTfR25KXPur7/lbNVKXvfJ3XK5W9352VU="; }) + (fetchNuGet { pname = "Google.Cloud.Storage.V1"; version = "2.3.0"; hash = "sha256-xEhaoXQs1OZDPrEHmY6O2ZPm2mzifciQqKhVU03LUAY="; }) + (fetchNuGet { pname = "HtmlSanitizer"; version = "8.0.838"; hash = "sha256-L2Nxc1qnRMv+FXNRt2SkkB2f3A41+UXh+lQcZEajBcw="; }) + (fetchNuGet { pname = "Humanizer.Core"; version = "2.14.1"; hash = "sha256-EXvojddPu+9JKgOG9NSQgUTfWq1RpOYw7adxDPKDJ6o="; }) + (fetchNuGet { pname = "libsodium"; version = "1.0.18"; hash = "sha256-9utXm0Qv+uaQ769G2jEO/1MCqRkjy0jxVUr5MGahH5c="; }) + (fetchNuGet { pname = "LNURL"; version = "0.0.34"; hash = "sha256-PbXCxvNQB9Un2XRFIEtqr3M8kYKND8OXdgXzY6nGc+k="; }) + (fetchNuGet { pname = "MailKit"; version = "3.3.0"; hash = "sha256-klBdW/zQ6ojikjMFG7R8el+n7v+ybcLjHKU0wvKUgKI="; }) + (fetchNuGet { pname = "Microsoft.AspNet.SignalR.Client"; version = "2.4.3"; hash = "sha256-Lh+L29wLc7OIiqQK2YGKYxtAWotlYk0Qn7Kz5ntlHfI="; }) + (fetchNuGet { pname = "Microsoft.AspNet.WebApi.Client"; version = "5.2.9"; hash = "sha256-CCytWp0v8C6NZa+o4cRXvA2u/ZOEA3TiG9+luszAwes="; }) + (fetchNuGet { pname = "Microsoft.AspNet.WebApi.Client"; version = "6.0.0"; hash = "sha256-lNL5C4W7/p8homWooO/3ZKDZQ2M0FUTDixJwqWBPVbo="; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Connections.Abstractions"; version = "8.0.0"; hash = "sha256-iZELnFhItlhMCMTCM5AtibA7eYRsgvHbpp6Wqev3H3I="; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Cryptography.Internal"; version = "8.0.7"; hash = "sha256-10N8W6/uHUkWfp8sZKbI/AOE0UjJUnUY20CSOo4G2ro="; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Cryptography.KeyDerivation"; version = "8.0.7"; hash = "sha256-AhGoDSx+dA6vBDGu652KmOkp+iD+/Ntdms52C2BV+Mc="; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Http.Connections.Client"; version = "8.0.0"; hash = "sha256-G+cpqimrNCjJSoPkAH9OAYYKgfl04hXkWwyd57zic64="; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Http.Connections.Common"; version = "8.0.0"; hash = "sha256-66lyBfW1yRoGwtcq6QDqImIR7IAVh+rNMKMKfA3HFOQ="; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Identity.EntityFrameworkCore"; version = "8.0.7"; hash = "sha256-AlQ4h8t8W8g3e8l20/pzpGrDaBnmKF7wlJZev1fb7a0="; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.JsonPatch"; version = "8.0.7"; hash = "sha256-LP/OZQs56HKBp26Ok1XeL9BRmHL05y+dnuTCK1BzF3Y="; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.NewtonsoftJson"; version = "8.0.7"; hash = "sha256-oOb2m53qLEvX1diNvXoagEGI/uIt0HiSGbSqYRioJD0="; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.Razor.Extensions"; version = "6.0.0"; hash = "sha256-TrR4soDtsyg+czs3P0nYByalKC6g6cmdQiRnOg6NRtA="; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation"; version = "8.0.6"; hash = "sha256-s+MyQom7sv4sABfxjbHnuAcrF2uUAgJfizZVUqb0Qqo="; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Razor.Language"; version = "6.0.0"; hash = "sha256-P0bdoAG+VBR/PuYQQN4tXhJomfXw+lArXx5UQqRoWlM="; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Client"; version = "8.0.0"; hash = "sha256-19Z5xUHs23xCG5PtgJ7Q8V/+XdpIbDENH8aIRFTD8Vc="; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Client.Core"; version = "8.0.0"; hash = "sha256-81RwKOAnRxltKXARyQdLmKJst0WEbGgYmzfXVmEbR4Q="; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Common"; version = "8.0.0"; hash = "sha256-3rzIYKgWRjy5W7THkRhXHJiAgxScNlvrR0Cccsein0w="; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Protocols.Json"; version = "8.0.0"; hash = "sha256-tF8RprCiVP96RGsoBfOVpEFdgpaxJy6fdy4eTfMgSO0="; }) + (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; hash = "sha256-49+H/iFwp+AfCICvWcqo9us4CzxApPKC37Q5Eqrw+JU="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.3.2"; hash = "sha256-pDeaMqX7a01Hp1Qd9P/y/B2rEGAv2eIY0Ld/klBZW5g="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.3.3"; hash = "sha256-pkZiggwLw8k+CVSXKTzsVGsT+K49LxXUS3VH5PNlpCY="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.3.4"; hash = "sha256-qDzTfZBSCvAUu9gzq2k+LOvh6/eRvJ9++VCNck/ZpnE="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "4.0.0"; hash = "sha256-SfQYaC9FbN60PhSzU3iM56ZeUlb/Y2FFGEnF43/5luc="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "4.10.0"; hash = "sha256-gtGxb7gPSOWVN2SS5CaHtZO+i6hvBbiXyA2AZ8dOKzY="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "4.5.0"; hash = "sha256-qo1oVNTB9JIMEPoiIZ+02qvF/O8PshQ/5gTjsY9iX0I="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "4.0.0"; hash = "sha256-ZGE+DM8siy3DHhBQcNesEHz9bEL4at+L6Cmj24+X/dc="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "4.10.0"; hash = "sha256-HjKeyCBJ+tylS3EaF18Z99Qj2F0eJQvUZo/pYrBcfLI="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "4.5.0"; hash = "sha256-5dZTS9PYtY83vyVa5bdNG3XKV5EjcnmddfUqWmIE29A="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Workspaces"; version = "4.5.0"; hash = "sha256-Kmyt1Xfcs0rSZHvN9PH94CKAooqMS9abZQY7EpEqb2o="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Razor"; version = "6.0.0"; hash = "sha256-j1/Mpe9Ta+4dhoa2+Zd7BaMm6MllJfaMtZ4pX+P2cqA="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Workspaces.Common"; version = "4.5.0"; hash = "sha256-WM7AXJYHagaPx2waj2E32gG0qXq6Kx4Zhiq7Ym3WXPI="; }) + (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.5.0"; hash = "sha256-dAhj/CgXG5VIy2dop1xplUsLje7uBPFjxasz9rdFIgY="; }) + (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; hash = "sha256-Enknv2RsFF68lEPdrf5M+BpV1kHoLTVRApKUwuk/pj0="; }) + (fetchNuGet { pname = "Microsoft.Data.Sqlite.Core"; version = "8.0.5"; hash = "sha256-PH+ZS45SGfWSFcYZA+V3m0k1r3kxaDzD3DutVVRyqfQ="; }) + (fetchNuGet { pname = "Microsoft.EntityFrameworkCore"; version = "8.0.6"; hash = "sha256-T9Pz6bCGULBEYjzdUBd1KXSAnw1c4VljSkwgbTE2MmE="; }) + (fetchNuGet { pname = "Microsoft.EntityFrameworkCore"; version = "8.0.7"; hash = "sha256-frnGwFjqiq2Ja451sYmH8ZbTtDtSPGyGurzStkDkIpk="; }) + (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Abstractions"; version = "8.0.4"; hash = "sha256-ywVWOje6duVcJ8gSSC5HER2UO0mAzfg6VMtqloRmQfc="; }) + (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Abstractions"; version = "8.0.6"; hash = "sha256-RdcIA9WUJnHyAFdlpBPs5qUusKMUH9uLFGusKBWDCX8="; }) + (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Abstractions"; version = "8.0.7"; hash = "sha256-MuddWH+nSOJQzHmYeo6NBZDCFIhKXmkkmrJKYP1Gw9A="; }) + (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Analyzers"; version = "8.0.6"; hash = "sha256-aTWfaOL0MfWYBbR+1Q1g+sxzmcjA4Q/OBFnVZDQqKJ8="; }) + (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Analyzers"; version = "8.0.7"; hash = "sha256-iWgYqv1/162ldAjwmZ9piCMlzcuyzfPki8+ZU7DMdYU="; }) + (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Design"; version = "8.0.6"; hash = "sha256-svQdeAv19bCM/RQwWFA6wFssrXecqazqs5ctbdZCBgQ="; }) + (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Relational"; version = "8.0.0"; hash = "sha256-ga+Qp4dZpmxVEmIIn8AcC92HrhVQBaDICyHqE87s+lk="; }) + (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Relational"; version = "8.0.4"; hash = "sha256-TRP/Ior708EQjD03GGxKom2eLOxcUYN1MoFqzk3lYp8="; }) + (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Relational"; version = "8.0.5"; hash = "sha256-peIG9ZgXvvEB2wJ2QFxC3u+H8LnZ9xL/HIegw4R00Do="; }) + (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Relational"; version = "8.0.6"; hash = "sha256-l2fkzSq3Tb15Uq7a879Bihat+Y7rijDwsrs/MDiApdw="; }) + (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Relational"; version = "8.0.7"; hash = "sha256-cTIllPWauAbpiMFw5FdacpF6ZJr+ehf+eFG8RrA5Wjg="; }) + (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Sqlite"; version = "8.0.5"; hash = "sha256-lED2YXKz6PzYAC5iIXW957N74KUuYtJ9cKvoPFiebpk="; }) + (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Sqlite.Core"; version = "8.0.5"; hash = "sha256-+6AvDE+Fj0Oc7EfA4SXwFUdkOSvvX6jC5HPtbUhYQwE="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Caching.Abstractions"; version = "2.2.0"; hash = "sha256-osgeoVggP5UqGBG7GbrZmsVvBJmA47aCgsqJclthHUI="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Caching.Abstractions"; version = "8.0.0"; hash = "sha256-xGpKrywQvU1Wm/WolYIxgHYEFfgkNGeJ+GGc5DT3phI="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Caching.Memory"; version = "8.0.0"; hash = "sha256-RUQe2VgOATM9JkZ/wGm9mreKoCmOS4pPyvyJWBqMaC8="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "3.1.5"; hash = "sha256-c5mtiYTD8MS/l90h8vO+LJ+KQUjVeatKMZf3Bx+q/8Q="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "6.0.0"; hash = "sha256-SIO/Q+OD2bG+Q0EoOXRgJYzZMhahGXDG1fXZn0VUvv0="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "3.1.5"; hash = "sha256-E0EkLtj6ZEi8V/v0DDmRPqqPkWAE4ZVCVyF077LEXA4="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "6.0.0"; hash = "sha256-Evg+Ynj2QUa6Gz+zqF+bUyfGD0HI5A2fHmxZEXbn3HA="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "8.0.0"; hash = "sha256-4eBpDkf7MJozTZnOwQvwcfgRKQGcNXe0K/kF+h5Rl8o="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "3.1.5"; hash = "sha256-mwswBNxakF+xvZQvxFGkfNKOffZaDE3mmQqvxfO+IAw="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "8.0.0"; hash = "sha256-GanfInGzzoN2bKeNwON8/Hnamr6l7RTpYLA49CNXD9Q="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.EnvironmentVariables"; version = "6.0.0"; hash = "sha256-tG3DEWURVkQHm4MlmxjE/YouTp9wQKbWs6qHH2nfgqc="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.FileExtensions"; version = "6.0.0"; hash = "sha256-PLnSa0JMfDC62OTv8sL0QFJbANE7QSnJ997ySFBS1go="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Ini"; version = "6.0.0"; hash = "sha256-5tUoqvIsWL5hfmMCpCpBW6V1tw/sMUCwfnm/7Y8LD6M="; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "8.0.0"; hash = "sha256-+qIDR8hRzreCHNEDtUcPfVHQdurzWPo/mqviCH78+EQ="; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "3.1.5"; hash = "sha256-dj+hc29ZsdbGGTSLApC3GNPBJBwPhcb5eEZeAqVCbvI="; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "8.0.0"; hash = "sha256-75KzEGWjbRELczJpCiJub+ltNUMMbz5A/1KQU+5dgP8="; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "8.0.0"; hash = "sha256-qkCdwemqdZY/yIW5Xmh7Exv74XuE39T8aHGHCofoVgo="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Diagnostics.Abstractions"; version = "8.0.0"; hash = "sha256-USD5uZOaahMqi6u7owNWx/LR4EDrOwqPrAAim7iRpJY="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Features"; version = "8.0.0"; hash = "sha256-njIDmindrlR+YXy4NVjCQzkF15ikvVCz3ilOCcS4HW0="; }) + (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Abstractions"; version = "6.0.0"; hash = "sha256-uBjWjHKEXjZ9fDfFxMjOou3lhfTNhs1yO+e3fpWreLk="; }) + (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Abstractions"; version = "8.0.0"; hash = "sha256-uQSXmt47X2HGoVniavjLICbPtD2ReQOYQMgy3l0xuMU="; }) + (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Physical"; version = "6.0.0"; hash = "sha256-5BAQOqnaEXM2YjdrmrCinXBeZ5FKxCWtebEXMdwcbMY="; }) + (fetchNuGet { pname = "Microsoft.Extensions.FileSystemGlobbing"; version = "6.0.0"; hash = "sha256-RAWHjkkfvGpjc49Q0kJbZyXgU6UEq/EJ0j557sj2/iU="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Hosting.Abstractions"; version = "8.0.0"; hash = "sha256-0JBx+wwt5p1SPfO4m49KxNOXPAzAU0A+8tEc/itvpQE="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Identity.Core"; version = "8.0.7"; hash = "sha256-zPHu/A8MX/FNt7nVJO2gpzIXa1Yw23GHqLfI0IO/B+k="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Identity.Stores"; version = "8.0.7"; hash = "sha256-E6rTtrvhV9bgAMks5RHMCbT1e26ttsWDNJWyGnECSNo="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "8.0.0"; hash = "sha256-Meh0Z0X7KyOEG4l0RWBcuHHihcABcvCyfUXgasmQ91o="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "1.0.0"; hash = "sha256-asIXVFsAK7ELd/f+vLwhxYDdazqRTmf+fGJ4WFtcCeo="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "3.1.5"; hash = "sha256-UcI6YUOIzHiexHrn82h77qngx19UeJqUzZqJ4igUIlM="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "6.0.0"; hash = "sha256-QNqcQ3x+MOK7lXbWkCzSOWa/2QyYNbdM/OEEbWN15Sw="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "7.0.1"; hash = "sha256-05mravm6SK0wNV3BKDTmN+8/1RxcPOM9kaUvGhjWY3c="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "8.0.0"; hash = "sha256-Jmddjeg8U5S+iBTwRlVAVLeIHxc4yrrNgqVMOB7EjM4="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "3.1.5"; hash = "sha256-+WZV8r4siPIaizWh3UifbHulrocfFAGe+JXCfRT2GGY="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "8.0.0"; hash = "sha256-n2m4JSegQKUTlOsKLZUUHHKMq926eJ0w9N9G+I3FoFw="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "8.0.2"; hash = "sha256-AjcldddddtN/9aH9pg7ClEZycWtFHLi9IPe1GGhNQys="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Options.ConfigurationExtensions"; version = "3.1.5"; hash = "sha256-8R461IHA7hhDPQqU0s39H5nMuiFgmZ/vhq9eKaRDh4M="; }) + (fetchNuGet { pname = "Microsoft.Extensions.PlatformAbstractions"; version = "1.1.0"; hash = "sha256-l+nVRLM+JThXzwExIPHOdmh6N0vehrA2VXPcvcVGkmQ="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "2.2.0"; hash = "sha256-DMCTC3HW+sHaRlh/9F1sDwof+XgvVp9IzAqzlZWByn4="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "3.1.5"; hash = "sha256-Vcw5KWo/yuuTmrNyS9770PKQk76ka4FEEm1G5HWYV1g="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "6.0.0"; hash = "sha256-AgvysszpQ11AiTBJFkvSy8JnwIWTj15Pfek7T7ThUc4="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "8.0.0"; hash = "sha256-FU8qj3DR8bDdc1c+WeGZx/PCZeqqndweZM9epcpXjSo="; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "6.6.0"; hash = "sha256-2ztdbgL1oSuinDqBZBWhYBN75zw6FtTjDa1dfGVQ5Rs="; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "6.6.0"; hash = "sha256-OEspQH4bd331ELSE1AdjVWFMx12dfyFU0LwvRkjp89Y="; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "6.6.0"; hash = "sha256-0ks1h+Kq307izjdlCf4PDnYV/GnH8uyxPY6lXppeu0A="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; hash = "sha256-mZotlGZqtrqDSoBrZhsxFe6fuOv5/BIo0w2Z2x0zVAU="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; hash = "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.1.2"; hash = "sha256-gYQQO7zsqG+OtN4ywYQyfsiggS2zmxw4+cPXlK+FB5Q="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; hash = "sha256-lxxw/Gy32xHi0fLgFWNj4YTFBSBkjx5l6ucmbTyf7V4="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; hash = "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ="; }) + (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; hash = "sha256-mBNDmPXNTW54XLnPAUwBRvkIORFM7/j0D0I2SyQPDEg="; }) + (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "7.0.0"; hash = "sha256-i6JojctqrqfJ4Wa+BDtaKZEol26jYq5DTQHar2M9B64="; }) + (fetchNuGet { pname = "MimeKit"; version = "3.3.0"; hash = "sha256-yAMLc3cNd1QE3NB4WinY4X0TsdniV7C1doKbTXntVGc="; }) + (fetchNuGet { pname = "Mono.TextTemplating"; version = "2.2.1"; hash = "sha256-4TYsfc8q74P8FuDwkIWPO+VYY0mh4Hs4ZL8v0lMaBsY="; }) + (fetchNuGet { pname = "MySqlConnector"; version = "2.3.1"; hash = "sha256-tPKi3ntuV8bFnJ88qB27NanziMHRR3Cr70NVYesXRoo="; }) + (fetchNuGet { pname = "NBitcoin"; version = "5.0.40"; hash = "sha256-cEu9luoct9YiL80z16THezZcaHgSPf6UU4Rz5QmyH+c="; }) + (fetchNuGet { pname = "NBitcoin"; version = "6.0.8"; hash = "sha256-pfJRCSVAdh87SmEKeAYg7TNoGpQDtf026N+V0bL/ILk="; }) + (fetchNuGet { pname = "NBitcoin"; version = "7.0.1"; hash = "sha256-h3eenwRrdKDpN+MGIcvrxQszdtNupzdQEGuycb28eBY="; }) + (fetchNuGet { pname = "NBitcoin"; version = "7.0.31"; hash = "sha256-sybd3AOGVlN7U6rLuWSi1kVxtBeaXb8iy786gc0CIh4="; }) + (fetchNuGet { pname = "NBitcoin"; version = "7.0.37"; hash = "sha256-RclQZgot+Y8PZi9JEX7tgUJinkIBXs1Qgf4vGR2y4rc="; }) + (fetchNuGet { pname = "NBitcoin.Altcoins"; version = "3.0.24"; hash = "sha256-MGxIuYtWPgSYj5JCMmZfP7u04ki/UpeN1+//gU6RsdI="; }) + (fetchNuGet { pname = "NBitpayClient"; version = "1.0.0.39"; hash = "sha256-KkcKBcUTKFVd1OAOkQd9EAdZY58Oc8iGJcvK85rK/Ok="; }) + (fetchNuGet { pname = "NBXplorer.Client"; version = "4.3.1"; hash = "sha256-hrgJwOoM0kD/90eUsqEK+nZLKCCItV+dQE/Gf1Gh4jc="; }) + (fetchNuGet { pname = "NdefLibrary"; version = "4.1.0"; hash = "sha256-5gdhufJg34DtPlnhNGEZIEc7EWPqa9BGvmbCL42KDf8="; }) + (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; hash = "sha256-iNan1ix7RtncGWC9AjAZ2sk70DoxOsmEOgQ10fXm4Pw="; }) + (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; hash = "sha256-K2tSVW4n4beRPzPu3rlVaBEMdGvWSv/3Q1fxaDh4Mjo="; }) + (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.3"; hash = "sha256-hy/BieY4qxBWVVsDqqOPaLy1QobiIapkbrESm6v2PHc="; }) + (fetchNuGet { pname = "Newtonsoft.Json.Bson"; version = "1.0.1"; hash = "sha256-qofIFqViDsdBOE/X0IvzfGUklSrULaH8MoZQ+YrcMOQ="; }) + (fetchNuGet { pname = "Newtonsoft.Json.Bson"; version = "1.0.2"; hash = "sha256-ZUj6YFSMZp5CZtXiamw49eZmbp1iYBuNsIKNnjxcRzA="; }) + (fetchNuGet { pname = "NicolasDorier.CommandLine"; version = "2.0.0"; hash = "sha256-LizYyIMx6I17jZd52duYcGWNgcPs88c/zWxo/ADd3D8="; }) + (fetchNuGet { pname = "NicolasDorier.CommandLine.Configuration"; version = "2.0.0"; hash = "sha256-fDpDOVdt7xCDXXqaBnbaFvUOPaE0Sl4cLWjNkU0Cz7I="; }) + (fetchNuGet { pname = "NicolasDorier.RateLimits"; version = "1.2.3"; hash = "sha256-1/v3+bYTyPBg7ChnrBM9CPZKSR2F9xl9d1C07sHC7KQ="; }) + (fetchNuGet { pname = "NicolasDorier.StandardConfiguration"; version = "2.0.1"; hash = "sha256-PdNopObnA2hOiHomejN/ZYK2CK1aGXMuOnsjHyS2Mco="; }) + (fetchNuGet { pname = "NLog"; version = "5.1.3"; hash = "sha256-ljrjt7A7NJ+3/STI0vuIuDRHVYVu6r6KfSV1xVK7CWQ="; }) + (fetchNuGet { pname = "Npgsql"; version = "8.0.3"; hash = "sha256-weBGo/IXKI5ufixBCuWG7OqDSyIqvGV07oxrG0XnQIQ="; }) + (fetchNuGet { pname = "Npgsql.EntityFrameworkCore.PostgreSQL"; version = "8.0.4"; hash = "sha256-T5yuMlQc/eUJtTjHygRqtEO4wKc9YQSVYDKU7ZS8WIU="; }) + (fetchNuGet { pname = "NSec.Cryptography"; version = "20.2.0"; hash = "sha256-/Udj7zH38jfWcuBDhaEid8Sx8HkYWzMQiUijHUqUVKc="; }) + (fetchNuGet { pname = "PeterO.Cbor"; version = "4.1.3"; hash = "sha256-1geszskkpoHWT0uBTZxLUnH57NNtUVLFU150CNeIAiE="; }) + (fetchNuGet { pname = "PeterO.Numbers"; version = "1.6.0"; hash = "sha256-KMUdMwdMy5fu4L4ptauSuK9T7PrRvGNeMhAAk91sbhI="; }) + (fetchNuGet { pname = "PeterO.URIUtility"; version = "1.0.0"; hash = "sha256-TLX5WAswWV6eOL/l2L0smtqJT4HCLMftrxo4KuZyMBI="; }) + (fetchNuGet { pname = "Pomelo.EntityFrameworkCore.MySql"; version = "8.0.0-beta.2"; hash = "sha256-O8eqwVr1jCkmL+EQgOVj9Ky13eSVIl/Noil3oz9+Izk="; }) + (fetchNuGet { pname = "Portable.BouncyCastle"; version = "1.9.0"; hash = "sha256-GOXM4TdTTodWlGzEfbMForTfTQI/ObJGnFZMSD6X8E4="; }) + (fetchNuGet { pname = "QRCoder"; version = "1.4.3"; hash = "sha256-it4WJGJVrpmYb8YLlTLeUrTbGW8AFm2rXskW7NvCtMI="; }) + (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.0.11"; hash = "sha256-4L3fXzSgw8UaCTvdb3cEyihka3K8JHBz/Ujsx0JdhPQ="; }) + (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; hash = "sha256-4PGZqyWhZ6/HCTF2KddDsbmTTjxs2oW79YfkberDZS8="; }) + (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tools"; version = "4.3.0"; hash = "sha256-8yLKFt2wQxkEf7fNfzB+cPUCjYn2qbqNgQ1+EeY2h/I="; }) + (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tracing"; version = "4.1.0"; hash = "sha256-+PJZWFl6hkqryCerWVtbG+ppIGvZf2l6fu2HWyGqMRA="; }) + (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tracing"; version = "4.3.0"; hash = "sha256-dsmTLGvt8HqRkDWP8iKVXJCS+akAzENGXKPV18W2RgI="; }) + (fetchNuGet { pname = "runtime.any.System.Globalization"; version = "4.0.11"; hash = "sha256-BgmoUM3WsMUCjtO9KmtjPKsjYRAEVjp74KvEa8zNgAg="; }) + (fetchNuGet { pname = "runtime.any.System.Globalization"; version = "4.3.0"; hash = "sha256-PaiITTFI2FfPylTEk7DwzfKeiA/g/aooSU1pDcdwWLU="; }) + (fetchNuGet { pname = "runtime.any.System.Globalization.Calendars"; version = "4.3.0"; hash = "sha256-AYh39tgXJVFu8aLi9Y/4rK8yWMaza4S4eaxjfcuEEL4="; }) + (fetchNuGet { pname = "runtime.any.System.IO"; version = "4.1.0"; hash = "sha256-ZbG7B6GOO90k/prj/Z60UGloQUrBepsvmlPQGuV0Wk0="; }) + (fetchNuGet { pname = "runtime.any.System.IO"; version = "4.3.0"; hash = "sha256-vej7ySRhyvM3pYh/ITMdC25ivSd0WLZAaIQbYj/6HVE="; }) + (fetchNuGet { pname = "runtime.any.System.Reflection"; version = "4.1.0"; hash = "sha256-BtdDCQLHDdAgO9qhwE0JBuUqFKc7l9On8p+VlgrQbBo="; }) + (fetchNuGet { pname = "runtime.any.System.Reflection"; version = "4.3.0"; hash = "sha256-ns6f++lSA+bi1xXgmW1JkWFb2NaMD+w+YNTfMvyAiQk="; }) + (fetchNuGet { pname = "runtime.any.System.Reflection.Extensions"; version = "4.3.0"; hash = "sha256-Y2AnhOcJwJVYv7Rp6Jz6ma0fpITFqJW+8rsw106K2X8="; }) + (fetchNuGet { pname = "runtime.any.System.Reflection.Primitives"; version = "4.0.1"; hash = "sha256-H2ZzRIWLN6FbSh8+q4OXqhssn3nGRnv7/NiV3OO+uf8="; }) + (fetchNuGet { pname = "runtime.any.System.Reflection.Primitives"; version = "4.3.0"; hash = "sha256-LkPXtiDQM3BcdYkAm5uSNOiz3uF4J45qpxn5aBiqNXQ="; }) + (fetchNuGet { pname = "runtime.any.System.Resources.ResourceManager"; version = "4.0.1"; hash = "sha256-eZasny65yEQESxMJHOBaqJQzlrd8CIOIc1ks6+HRr8o="; }) + (fetchNuGet { pname = "runtime.any.System.Resources.ResourceManager"; version = "4.3.0"; hash = "sha256-9EvnmZslLgLLhJ00o5MWaPuJQlbUFcUF8itGQNVkcQ4="; }) + (fetchNuGet { pname = "runtime.any.System.Runtime"; version = "4.1.0"; hash = "sha256-FZC+BNSzSkN3rObLJJAqwW/vNnJ+PiwdvNNufuISWVY="; }) + (fetchNuGet { pname = "runtime.any.System.Runtime"; version = "4.3.0"; hash = "sha256-qwhNXBaJ1DtDkuRacgHwnZmOZ1u9q7N8j0cWOLYOELM="; }) + (fetchNuGet { pname = "runtime.any.System.Runtime.Handles"; version = "4.0.1"; hash = "sha256-WlmU4OzK6IpszOCuEb5pdh4dwpkuoBQTYRuT4SF+XM8="; }) + (fetchNuGet { pname = "runtime.any.System.Runtime.Handles"; version = "4.3.0"; hash = "sha256-PQRACwnSUuxgVySO1840KvqCC9F8iI9iTzxNW0RcBS4="; }) + (fetchNuGet { pname = "runtime.any.System.Runtime.InteropServices"; version = "4.1.0"; hash = "sha256-H9FNiCk+Qrm+15K+Rje+wnQxwUmkVx60x+FWBoGLqD4="; }) + (fetchNuGet { pname = "runtime.any.System.Runtime.InteropServices"; version = "4.3.0"; hash = "sha256-Kaw5PnLYIiqWbsoF3VKJhy7pkpoGsUwn4ZDCKscbbzA="; }) + (fetchNuGet { pname = "runtime.any.System.Text.Encoding"; version = "4.0.11"; hash = "sha256-pyaH3Lcuv/pEM9NSFWlLcljav/Ksnwwk7cjPEH99m1Q="; }) + (fetchNuGet { pname = "runtime.any.System.Text.Encoding"; version = "4.3.0"; hash = "sha256-Q18B9q26MkWZx68exUfQT30+0PGmpFlDgaF0TnaIGCs="; }) + (fetchNuGet { pname = "runtime.any.System.Text.Encoding.Extensions"; version = "4.3.0"; hash = "sha256-6MYj0RmLh4EVqMtO/MRqBi0HOn5iG4x9JimgCCJ+EFM="; }) + (fetchNuGet { pname = "runtime.any.System.Threading.Tasks"; version = "4.0.11"; hash = "sha256-c/8eunlNexFpzZ+GvNF0p1hi5Xo0VPo7LnkhjRO47eM="; }) + (fetchNuGet { pname = "runtime.any.System.Threading.Tasks"; version = "4.3.0"; hash = "sha256-agdOM0NXupfHbKAQzQT8XgbI9B8hVEh+a/2vqeHctg4="; }) + (fetchNuGet { pname = "runtime.any.System.Threading.Timer"; version = "4.3.0"; hash = "sha256-BgHxXCIbicVZtpgMimSXixhFC3V+p5ODqeljDjO8hCs="; }) + (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-LXUPLX3DJxsU1Pd3UwjO1PO9NM2elNEDXeu2Mu/vNps="; }) + (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-qeSqaUI80+lqw5MK4vMpmO0CZaqrmYktwp6L+vQAb0I="; }) + (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-SrHqT9wrCBsxILWtaJgGKd6Odmxm8/Mh7Kh0CUkZVzA="; }) + (fetchNuGet { pname = "runtime.native.System"; version = "4.0.0"; hash = "sha256-bmaM0ovT4X4aqDJOR255Yda/u3fmHZskU++lMnsy894="; }) + (fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; hash = "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y="; }) + (fetchNuGet { pname = "runtime.native.System.IO.Compression"; version = "4.3.0"; hash = "sha256-DWnXs4vlKoU6WxxvCArTJupV6sX3iBbZh8SbqfHace8="; }) + (fetchNuGet { pname = "runtime.native.System.Net.Http"; version = "4.3.0"; hash = "sha256-c556PyheRwpYhweBjSfIwEyZHnAUB8jWioyKEcp/2dg="; }) + (fetchNuGet { pname = "runtime.native.System.Net.Security"; version = "4.3.0"; hash = "sha256-I8vYld/7WtU2/rrD4XfSRgpO/DY3qXghG14VQjiU2DY="; }) + (fetchNuGet { pname = "runtime.native.System.Security.Cryptography"; version = "4.0.0"; hash = "sha256-6Q8eYzC32BbGIiTHoQaE6B3cD81vYQcH5SCswYRSp0w="; }) + (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; hash = "sha256-2IhBv0i6pTcOyr8FFIyfPEaaCHUmJZ8DYwLUwJ+5waw="; }) + (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-Jy01KhtcCl2wjMpZWH+X3fhHcVn+SyllWFY8zWlz/6I="; }) + (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-wyv00gdlqf8ckxEdV7E+Ql9hJIoPcmYEuyeWb5Oz3mM="; }) + (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-zi+b4sCFrA9QBiSGDD7xPV27r3iHGlV99gpyVUjRmc4="; }) + (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; hash = "sha256-serkd4A7F6eciPiPJtUyJyxzdAtupEcWIZQ9nptEzIM="; }) + (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-gybQU6mPgaWV3rBG2dbH6tT3tBq8mgze3PROdsuWnX0="; }) + (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-VsP72GVveWnGUvS/vjOQLv1U80H2K8nZ4fDAmI61Hm4="; }) + (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-4yKGa/IrNCKuQ3zaDzILdNPD32bNdy6xr5gdJigyF5g="; }) + (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-HmdJhhRsiVoOOCcUvAwdjpMRiyuSwdcgEv2j9hxi+Zc="; }) + (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-pVFUKuPPIx0edQKjzRon3zKq8zhzHEzko/lc01V/jdw="; }) + (fetchNuGet { pname = "runtime.unix.Microsoft.Win32.Primitives"; version = "4.3.0"; hash = "sha256-LZb23lRXzr26tRS5aA0xyB08JxiblPDoA7HBvn6awXg="; }) + (fetchNuGet { pname = "runtime.unix.System.Console"; version = "4.3.0"; hash = "sha256-AHkdKShTRHttqfMjmi+lPpTuCrM5vd/WRy6Kbtie190="; }) + (fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.0.11"; hash = "sha256-TTzJP6sR0/mDbbU3+ySnt9LVEcPPLfiAzxnfTaJazRY="; }) + (fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; hash = "sha256-ReoazscfbGH+R6s6jkg5sIEHWNEvjEoHtIsMbpc7+tI="; }) + (fetchNuGet { pname = "runtime.unix.System.IO.FileSystem"; version = "4.3.0"; hash = "sha256-Pf4mRl6YDK2x2KMh0WdyNgv0VUNdSKVDLlHqozecy5I="; }) + (fetchNuGet { pname = "runtime.unix.System.Net.Primitives"; version = "4.3.0"; hash = "sha256-pHJ+I6i16MV6m77uhTC6GPY6jWGReE3SSP3fVB59ti0="; }) + (fetchNuGet { pname = "runtime.unix.System.Net.Sockets"; version = "4.3.0"; hash = "sha256-IvgOeA2JuBjKl5yAVGjPYMPDzs9phb3KANs95H9v1w4="; }) + (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.0.1"; hash = "sha256-1Q50COfWkU4/y9eBWj0jPDp3qvy19vRCZnDKQthrhUU="; }) + (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; hash = "sha256-c5tXWhE/fYbJVl9rXs0uHh3pTsg44YD1dJvyOA0WoMs="; }) + (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.1.0"; hash = "sha256-xB8TkAadhz7gi8Ag3+uYtLdfjtxO8dCLrd/FzU7jLHQ="; }) + (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; hash = "sha256-l8S9gt6dk3qYG6HYonHtdlYtBKyPb29uQ6NDjmrt3V4="; }) + (fetchNuGet { pname = "Serilog"; version = "3.1.1"; hash = "sha256-L263y8jkn7dNFD2jAUK6mgvyRTqFe39i1tRhVZsNZTI="; }) + (fetchNuGet { pname = "Serilog.AspNetCore"; version = "8.0.0"; hash = "sha256-0V4BmXmKeSy5ND5aONhSW3iL/+fZ2jB781HdooJlOjw="; }) + (fetchNuGet { pname = "Serilog.Extensions.Hosting"; version = "8.0.0"; hash = "sha256-OEVkEQoONawJF+SXeyqqgU0OGp9ubtt9aXT+rC25j4E="; }) + (fetchNuGet { pname = "Serilog.Extensions.Logging"; version = "8.0.0"; hash = "sha256-GoWxCpkdahMvYd7ZrhwBxxTyjHGcs9ENNHJCp0la6iA="; }) + (fetchNuGet { pname = "Serilog.Formatting.Compact"; version = "2.0.0"; hash = "sha256-c3STGleyMijY4QnxPuAz/NkJs1r+TZAPjlmAKLF4+3g="; }) + (fetchNuGet { pname = "Serilog.Settings.Configuration"; version = "8.0.0"; hash = "sha256-JQ39fvhOFSUHE6r9DXJvLaZI+Lk7AYzuskQu3ux+hQg="; }) + (fetchNuGet { pname = "Serilog.Sinks.Console"; version = "5.0.0"; hash = "sha256-UOVlegJLhs0vK1ml2DZCjFE5roDRZsGCAqD/53ZaZWI="; }) + (fetchNuGet { pname = "Serilog.Sinks.Debug"; version = "2.0.0"; hash = "sha256-/PLVAE33lTdUEXdahkI5ddFiGZufWnvfsOodQsFB8sQ="; }) + (fetchNuGet { pname = "Serilog.Sinks.File"; version = "5.0.1-dev-00968"; hash = "sha256-gXrvlnNVi2TKtsFfjqoPkGZS3JM+p6vjvy3p2by/4A4="; }) + (fetchNuGet { pname = "SocketIOClient"; version = "3.0.8"; hash = "sha256-m49zZSppF8Gce6biFUateXdf8b07evZbLsX7H6LVbMw="; }) + (fetchNuGet { pname = "SQLitePCLRaw.bundle_e_sqlite3"; version = "2.1.6"; hash = "sha256-dZD/bZsYXjOu46ZH5Y/wgh0uhHOqIxC+S+0ecKhr718="; }) + (fetchNuGet { pname = "SQLitePCLRaw.core"; version = "2.1.6"; hash = "sha256-RxWjm52PdmMV98dgDy0BCpF988+BssRZUgALLv7TH/E="; }) + (fetchNuGet { pname = "SQLitePCLRaw.lib.e_sqlite3"; version = "2.1.6"; hash = "sha256-uHt5d+SFUkSd6WD7Tg0J3e8eVoxy/FM/t4PAkc9PJT0="; }) + (fetchNuGet { pname = "SQLitePCLRaw.provider.e_sqlite3"; version = "2.1.6"; hash = "sha256-zHc/YZsd72eXlI8ba1tv58HZWUIiyjJaxq2CCP1hQe8="; }) + (fetchNuGet { pname = "SSH.NET"; version = "2023.0.0"; hash = "sha256-YiAfBOu8KLKPFk4humKCe+Ne79ppxdODKXgjbcni8po="; }) + (fetchNuGet { pname = "SshNet.Security.Cryptography"; version = "1.3.0"; hash = "sha256-kDpV7/n4plAPh+FqsPbCA/kFHHfmJGsJDTQg2wRLOfk="; }) + (fetchNuGet { pname = "System.AppContext"; version = "4.3.0"; hash = "sha256-yg95LNQOwFlA1tWxXdQkVyJqT4AnoDc+ACmrNvzGiZg="; }) + (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; hash = "sha256-XqZWb4Kd04960h4U9seivjKseGA/YEIpdplfHYHQ9jk="; }) + (fetchNuGet { pname = "System.Buffers"; version = "4.5.1"; hash = "sha256-wws90sfi9M7kuCPWkv1CEYMJtCqx9QB/kj0ymlsNaxI="; }) + (fetchNuGet { pname = "System.CodeDom"; version = "4.4.0"; hash = "sha256-L1xyspJ8pDJNVPYKl+FMGf4Zwm0tlqtAyQCNW6pT6/0="; }) + (fetchNuGet { pname = "System.Collections"; version = "4.0.11"; hash = "sha256-puoFMkx4Z55C1XPxNw3np8nzNGjH+G24j43yTIsDRL0="; }) + (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; hash = "sha256-afY7VUtD6w/5mYqrce8kQrvDIfS2GXDINDh73IjxJKc="; }) + (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.0.12"; hash = "sha256-zIEM7AB4SyE9u6G8+o+gCLLwkgi6+3rHQVPdn/dEwB8="; }) + (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.3.0"; hash = "sha256-KMY5DfJnDeIsa13DpqvyN8NkReZEMAFnlmNglVoFIXI="; }) + (fetchNuGet { pname = "System.Collections.Immutable"; version = "5.0.0"; hash = "sha256-GdwSIjLMM0uVfE56VUSLVNgpW0B//oCeSFj8/hSlbM8="; }) + (fetchNuGet { pname = "System.Collections.Immutable"; version = "6.0.0"; hash = "sha256-DKEbpFqXCIEfqp9p3ezqadn5b/S1YTk32/EQK+tEScs="; }) + (fetchNuGet { pname = "System.Collections.Immutable"; version = "8.0.0"; hash = "sha256-F7OVjKNwpqbUh8lTidbqJWYi476nsq9n+6k0+QVRo3w="; }) + (fetchNuGet { pname = "System.Composition"; version = "6.0.0"; hash = "sha256-H5TnnxOwihI0VyRuykbOWuKFSCWNN+MUEYyloa328Nw="; }) + (fetchNuGet { pname = "System.Composition.AttributedModel"; version = "6.0.0"; hash = "sha256-03DR8ecEHSKfgzwuTuxtsRW0Gb7aQtDS4LAYChZdGdc="; }) + (fetchNuGet { pname = "System.Composition.Convention"; version = "6.0.0"; hash = "sha256-a3DZS8CT2kV8dVpGxHKoP5wHVKsT+kiPJixckpYfdQo="; }) + (fetchNuGet { pname = "System.Composition.Hosting"; version = "6.0.0"; hash = "sha256-fpoh6WBNmaHEHszwlBR/TNjd85lwesfM7ZkQhqYtLy4="; }) + (fetchNuGet { pname = "System.Composition.Runtime"; version = "6.0.0"; hash = "sha256-nGZvg2xYhhazAjOjhWqltBue+hROKP0IOiFGP8yMBW8="; }) + (fetchNuGet { pname = "System.Composition.TypedParts"; version = "6.0.0"; hash = "sha256-4uAETfmL1CvGjHajzWowsEmJgTKnuFC8u9lbYPzAN3k="; }) + (fetchNuGet { pname = "System.Configuration.ConfigurationManager"; version = "7.0.0"; hash = "sha256-SgBexTTjRn23uuXvkzO0mz0qOfA23MiS4Wv+qepMLZE="; }) + (fetchNuGet { pname = "System.Console"; version = "4.3.0"; hash = "sha256-Xh3PPBZr0pDbDaK8AEHbdGz7ePK6Yi1ZyRWI1JM6mbo="; }) + (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.0.11"; hash = "sha256-P+rSQJVoN6M56jQbs76kZ9G3mAWFdtF27P/RijN8sj4="; }) + (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; hash = "sha256-fkA79SjPbSeiEcrbbUsb70u9B7wqbsdM9s1LnoKj0gM="; }) + (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.3.0"; hash = "sha256-OFJRb0ygep0Z3yDBLwAgM/Tkfs4JCDtsNhwDH9cd1Xw="; }) + (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "8.0.0"; hash = "sha256-+aODaDEQMqla5RYZeq0Lh66j+xkPYxykrVvSCmJQ+Vs="; }) + (fetchNuGet { pname = "System.Diagnostics.EventLog"; version = "7.0.0"; hash = "sha256-aSK1lQN9a/guffT8jUW+zKc5bOIvKRcds/XbVk766Jo="; }) + (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.3.0"; hash = "sha256-gVOv1SK6Ape0FQhCVlNOd9cvQKBvMxRX9K0JPVi8w0Y="; }) + (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.1.0"; hash = "sha256-JA0jJcLbU3zh52ub3zweob2EVHvxOqiC6SCYHrY5WbQ="; }) + (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; hash = "sha256-hCETZpHHGVhPYvb4C0fh4zs+8zv4GPoixagkLZjpa9Q="; }) + (fetchNuGet { pname = "System.Drawing.Common"; version = "7.0.0"; hash = "sha256-t4FBgTMhuOA5FA23fg0WQOGuH0njV7hJXST/Ln/Znks="; }) + (fetchNuGet { pname = "System.Formats.Asn1"; version = "6.0.0"; hash = "sha256-KaMHgIRBF7Nf3VwOo+gJS1DcD+41cJDPWFh+TDQ8ee8="; }) + (fetchNuGet { pname = "System.Globalization"; version = "4.0.11"; hash = "sha256-rbSgc2PIEc2c2rN6LK3qCREAX3DqA2Nq1WcLrZYsDBw="; }) + (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; hash = "sha256-caL0pRmFSEsaoeZeWN5BTQtGrAtaQPwFi8YOZPZG5rI="; }) + (fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.3.0"; hash = "sha256-uNOD0EOVFgnS2fMKvMiEtI9aOw00+Pfy/H+qucAQlPc="; }) + (fetchNuGet { pname = "System.Globalization.Extensions"; version = "4.3.0"; hash = "sha256-mmJWA27T0GRVuFP9/sj+4TrR4GJWrzNIk2PDrbr7RQk="; }) + (fetchNuGet { pname = "System.IdentityModel.Tokens.Jwt"; version = "6.6.0"; hash = "sha256-AaKAwjUAoo4pKusKA/4N59NJytevneN7wnq68AZRJp4="; }) + (fetchNuGet { pname = "System.Interactive.Async"; version = "3.1.1"; hash = "sha256-0Cof7GZZqLkREQWbG/9+bn5riOtQFv2bFktYgB8QOA4="; }) + (fetchNuGet { pname = "System.IO"; version = "4.1.0"; hash = "sha256-V6oyQFwWb8NvGxAwvzWnhPxy9dKOfj/XBM3tEC5aHrw="; }) + (fetchNuGet { pname = "System.IO"; version = "4.3.0"; hash = "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY="; }) + (fetchNuGet { pname = "System.IO.Compression"; version = "4.3.0"; hash = "sha256-f5PrQlQgj5Xj2ZnHxXW8XiOivaBvfqDao9Sb6AVinyA="; }) + (fetchNuGet { pname = "System.IO.Compression.ZipFile"; version = "4.3.0"; hash = "sha256-WQl+JgWs+GaRMeiahTFUbrhlXIHapzcpTFXbRvAtvvs="; }) + (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.3.0"; hash = "sha256-vNIYnvlayuVj0WfRfYKpDrhDptlhp1pN8CYmlVd2TXw="; }) + (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; hash = "sha256-LMnfg8Vwavs9cMnq9nNH8IWtAtSfk0/Fy4s4Rt9r1kg="; }) + (fetchNuGet { pname = "System.IO.Pipelines"; version = "6.0.3"; hash = "sha256-v+FOmjRRKlDtDW6+TfmyMiiki010YGVTa0EwXu9X7ck="; }) + (fetchNuGet { pname = "System.IO.Pipelines"; version = "8.0.0"; hash = "sha256-LdpB1s4vQzsOODaxiKstLks57X9DTD5D6cPx8DE1wwE="; }) + (fetchNuGet { pname = "System.Linq"; version = "4.1.0"; hash = "sha256-ZQpFtYw5N1F1aX0jUK3Tw+XvM5tnlnshkTCNtfVA794="; }) + (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; hash = "sha256-R5uiSL3l6a3XrXSSL6jz+q/PcyVQzEAByiuXZNSqD/A="; }) + (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; hash = "sha256-+3pvhZY7rip8HCbfdULzjlC9FPZFpYoQxhkcuFm2wk8="; }) + (fetchNuGet { pname = "System.Memory"; version = "4.5.1"; hash = "sha256-7JhQNSvE6JigM1qmmhzOX3NiZ6ek82R4whQNb+FpBzg="; }) + (fetchNuGet { pname = "System.Memory"; version = "4.5.3"; hash = "sha256-Cvl7RbRbRu9qKzeRBWjavUkseT2jhZBUWV1SPipUWFk="; }) + (fetchNuGet { pname = "System.Memory"; version = "4.5.4"; hash = "sha256-3sCEfzO4gj5CYGctl9ZXQRRhwAraMQfse7yzKoRe65E="; }) + (fetchNuGet { pname = "System.Memory"; version = "4.5.5"; hash = "sha256-EPQ9o1Kin7KzGI5O3U3PUQAZTItSbk9h/i4rViN3WiI="; }) + (fetchNuGet { pname = "System.Net.Http"; version = "4.3.0"; hash = "sha256-UoBB7WPDp2Bne/fwxKF0nE8grJ6FzTMXdT/jfsphj8Q="; }) + (fetchNuGet { pname = "System.Net.NameResolution"; version = "4.3.0"; hash = "sha256-eGZwCBExWsnirWBHyp2sSSSXp6g7I6v53qNmwPgtJ5c="; }) + (fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; hash = "sha256-MY7Z6vOtFMbEKaLW9nOSZeAjcWpwCtdO7/W1mkGZBzE="; }) + (fetchNuGet { pname = "System.Net.Security"; version = "4.3.0"; hash = "sha256-B7laE1z1+ldbo6JkjlDjZynG5JiMZ/3uNHPHMP6LRak="; }) + (fetchNuGet { pname = "System.Net.Sockets"; version = "4.3.0"; hash = "sha256-il7dr5VT/QWDg/0cuh+4Es2u8LY//+qqiY9BZmYxSus="; }) + (fetchNuGet { pname = "System.Net.WebHeaderCollection"; version = "4.3.0"; hash = "sha256-wpRP3D/2YjpFmqU7Q42L/+/hChEVMlwU1sjysGVrQ1c="; }) + (fetchNuGet { pname = "System.Net.WebSockets"; version = "4.3.0"; hash = "sha256-l3h3cF1cCC9zMhWLKSDnZBZvFADUd0Afe2+iAwBA0r0="; }) + (fetchNuGet { pname = "System.Net.WebSockets.Client"; version = "4.3.2"; hash = "sha256-MwNKwIIpBJhC4Na6EYWMmVyPCa064Yp1aL0opx1FfoA="; }) + (fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; hash = "sha256-gtmRkWP2Kwr3nHtDh0yYtce38z1wrGzb6fjm4v8wN6Q="; }) + (fetchNuGet { pname = "System.Private.Uri"; version = "4.0.1"; hash = "sha256-MjVaZHx8DUFnVUxOEEaU9GxF6EyEXbcuI1V7yRXEp0w="; }) + (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; hash = "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM="; }) + (fetchNuGet { pname = "System.Reflection"; version = "4.1.0"; hash = "sha256-idZHGH2Yl/hha1CM4VzLhsaR8Ljo/rV7TYe7mwRJSMs="; }) + (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; hash = "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY="; }) + (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.3.0"; hash = "sha256-5LhkDmhy2FkSxulXR+bsTtMzdU3VyyuZzsxp7/DwyIU="; }) + (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; hash = "sha256-mKRknEHNls4gkRwrEgi39B+vSaAz/Gt3IALtS98xNnA="; }) + (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.3.0"; hash = "sha256-rKx4a9yZKcajloSZHr4CKTVJ6Vjh95ni+zszPxWjh2I="; }) + (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; hash = "sha256-mMOCYzUenjd4rWIfq7zIX9PFYk/daUyF0A8l1hbydAk="; }) + (fetchNuGet { pname = "System.Reflection.Metadata"; version = "5.0.0"; hash = "sha256-Wo+MiqhcP9dQ6NuFGrQTw6hpbJORFwp+TBNTq2yhGp8="; }) + (fetchNuGet { pname = "System.Reflection.Metadata"; version = "6.0.1"; hash = "sha256-id27sU4qIEIpgKenO5b4IHt6L1XuNsVe4TR9TKaLWDo="; }) + (fetchNuGet { pname = "System.Reflection.Metadata"; version = "8.0.0"; hash = "sha256-dQGC30JauIDWNWXMrSNOJncVa1umR1sijazYwUDdSIE="; }) + (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.0.1"; hash = "sha256-SFSfpWEyCBMAOerrMCOiKnpT+UAWTvRcmoRquJR6Vq0="; }) + (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; hash = "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM="; }) + (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.3.0"; hash = "sha256-4U4/XNQAnddgQIHIJq3P2T80hN0oPdU2uCeghsDTWng="; }) + (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.0.1"; hash = "sha256-cZ2/3/fczLjEpn6j3xkgQV9ouOVjy4Kisgw5xWw9kSw="; }) + (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; hash = "sha256-idiOD93xbbrbwwSnD4mORA9RYi/D/U48eRUsn/WnWGo="; }) + (fetchNuGet { pname = "System.Runtime"; version = "4.1.0"; hash = "sha256-FViNGM/4oWtlP6w0JC0vJU+k9efLKZ+yaXrnEeabDQo="; }) + (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; hash = "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg="; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.1"; hash = "sha256-Lucrfpuhz72Ns+DOS7MjuNT2KWgi+m4bJkg87kqXmfU="; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.7.0"; hash = "sha256-pORThFo85P8TrmfZCCPIXysVPcV2nW8hRlO6z4jVJps="; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "5.0.0"; hash = "sha256-neARSpLPUzPxEKhJRwoBzhPxK+cKIitLx7WBYncsYgo="; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; hash = "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I="; }) + (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.1.0"; hash = "sha256-X7DZ5CbPY7jHs20YZ7bmcXs9B5Mxptu/HnBUvUnNhGc="; }) + (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; hash = "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o="; }) + (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.0.1"; hash = "sha256-j2QgVO9ZOjv7D1het98CoFpjoYgxjupuIhuBUmLLH7w="; }) + (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; hash = "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms="; }) + (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.1.0"; hash = "sha256-QceAYlJvkPRJc/+5jR+wQpNNI3aqGySWWSO30e/FfQY="; }) + (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; hash = "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI="; }) + (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.3.0"; hash = "sha256-MYpl6/ZyC6hjmzWRIe+iDoldOMW1mfbwXsduAnXIKGA="; }) + (fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.3.0"; hash = "sha256-P5jHCgMbgFMYiONvzmaKFeOqcAIDPu/U8bOVrNPYKqc="; }) + (fetchNuGet { pname = "System.Security.Claims"; version = "4.3.0"; hash = "sha256-Fua/rDwAqq4UByRVomAxMPmDBGd5eImRqHVQIeSxbks="; }) + (fetchNuGet { pname = "System.Security.Cryptography.Algorithms"; version = "4.3.0"; hash = "sha256-tAJvNSlczYBJ3Ed24Ae27a55tq/n4D3fubNQdwcKWA8="; }) + (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.3.0"; hash = "sha256-u17vy6wNhqok91SrVLno2M1EzLHZm6VMca85xbVChsw="; }) + (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.7.0"; hash = "sha256-MvVSJhAojDIvrpuyFmcSVRSZPl3dRYOI9hSptbA+6QA="; }) + (fetchNuGet { pname = "System.Security.Cryptography.Csp"; version = "4.3.0"; hash = "sha256-oefdTU/Z2PWU9nlat8uiRDGq/PGZoSPRgkML11pmvPQ="; }) + (fetchNuGet { pname = "System.Security.Cryptography.Encoding"; version = "4.3.0"; hash = "sha256-Yuge89N6M+NcblcvXMeyHZ6kZDfwBv3LPMDiF8HhJss="; }) + (fetchNuGet { pname = "System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-DL+D2sc2JrQiB4oAcUggTFyD8w3aLEjJfod5JPe+Oz4="; }) + (fetchNuGet { pname = "System.Security.Cryptography.Pkcs"; version = "6.0.0"; hash = "sha256-xMSJGgn+UGGe9eGNaZ04OsyiFO7fYtDfz7zsya/9AOE="; }) + (fetchNuGet { pname = "System.Security.Cryptography.Primitives"; version = "4.3.0"; hash = "sha256-fnFi7B3SnVj5a+BbgXnbjnGNvWrCEU6Hp/wjsjWz318="; }) + (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "7.0.0"; hash = "sha256-aS5fVYrujUCkAnth2QQPp8knG169BsK/BX8lqaHRSZc="; }) + (fetchNuGet { pname = "System.Security.Cryptography.X509Certificates"; version = "4.3.0"; hash = "sha256-MG3V/owDh273GCUPsGGraNwaVpcydupl3EtPXj6TVG0="; }) + (fetchNuGet { pname = "System.Security.Permissions"; version = "7.0.0"; hash = "sha256-DOFoX+AKRmrkllykHheR8FfUXYx/Ph+I/HYuReQydXI="; }) + (fetchNuGet { pname = "System.Security.Principal"; version = "4.3.0"; hash = "sha256-rjudVUHdo8pNJg2EVEn0XxxwNo5h2EaYo+QboPkXlYk="; }) + (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.3.0"; hash = "sha256-mbdLVUcEwe78p3ZnB6jYsizNEqxMaCAWI3tEQNhRQAE="; }) + (fetchNuGet { pname = "System.Text.Encoding"; version = "4.0.11"; hash = "sha256-PEailOvG05CVgPTyKLtpAgRydlSHmtd5K0Y8GSHY2Lc="; }) + (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; hash = "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg="; }) + (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "4.5.1"; hash = "sha256-PIhkv59IXjyiuefdhKxS9hQfEwO9YWRuNudpo53HQfw="; }) + (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "6.0.0"; hash = "sha256-nGc2A6XYnwqGcq8rfgTRjGr+voISxNe/76k2K36coj4="; }) + (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; hash = "sha256-vufHXg8QAKxHlujPHHcrtGwAqFmsCD6HKjfDAiHyAYc="; }) + (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "7.0.0"; hash = "sha256-tF8qt9GZh/nPy0mEnj6nKLG4Lldpoi/D8xM5lv2CoYQ="; }) + (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "8.0.0"; hash = "sha256-IUQkQkV9po1LC0QsqrilqwNzPvnc+4eVvq+hCvq8fvE="; }) + (fetchNuGet { pname = "System.Text.Json"; version = "7.0.2"; hash = "sha256-bkfxuc3XPxtYcOJTGRMc/AkJiyIU+fTLK7PxtbuN3sQ="; }) + (fetchNuGet { pname = "System.Text.Json"; version = "8.0.0"; hash = "sha256-XFcCHMW1u2/WujlWNHaIWkbW1wn8W4kI0QdrwPtWmow="; }) + (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; hash = "sha256-VLCk1D1kcN2wbAe3d0YQM/PqCsPHOuqlBY1yd2Yo+K0="; }) + (fetchNuGet { pname = "System.Threading"; version = "4.0.11"; hash = "sha256-mob1Zv3qLQhQ1/xOLXZmYqpniNUMCfn02n8ZkaAhqac="; }) + (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; hash = "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc="; }) + (fetchNuGet { pname = "System.Threading.Channels"; version = "6.0.0"; hash = "sha256-klGYnsyrjvXaGeqgfnMf/dTAMNtcHY+zM4Xh6v2JfuE="; }) + (fetchNuGet { pname = "System.Threading.Channels"; version = "8.0.0"; hash = "sha256-c5TYoLNXDLroLIPnlfyMHk7nZ70QAckc/c7V199YChg="; }) + (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.0.11"; hash = "sha256-5SLxzFg1df6bTm2t09xeI01wa5qQglqUwwJNlQPJIVs="; }) + (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; hash = "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w="; }) + (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.3.0"; hash = "sha256-X2hQ5j+fxcmnm88Le/kSavjiGOmkcumBGTZKBLvorPc="; }) + (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; hash = "sha256-owSpY8wHlsUXn5xrfYAiu847L6fAKethlvYx97Ri1ng="; }) + (fetchNuGet { pname = "System.Threading.ThreadPool"; version = "4.3.0"; hash = "sha256-wW0QdvssRoaOfQLazTGSnwYTurE4R8FxDx70pYkL+gg="; }) + (fetchNuGet { pname = "System.Threading.Timer"; version = "4.3.0"; hash = "sha256-pmhslmhQhP32TWbBzoITLZ4BoORBqYk25OWbru04p9s="; }) + (fetchNuGet { pname = "System.Windows.Extensions"; version = "7.0.0"; hash = "sha256-yRivIiENFKMxbSh8SZ/fmKjshwBdFXzbKmZcfDZwKYc="; }) + (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.3.0"; hash = "sha256-QQ8KgU0lu4F5Unh+TbechO//zaAGZ4MfgvW72Cn1hzA="; }) + (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.3.0"; hash = "sha256-rWtdcmcuElNOSzCehflyKwHkDRpiOhJJs8CeQ0l1CCI="; }) + (fetchNuGet { pname = "TwentyTwenty.Storage"; version = "2.12.1"; hash = "sha256-CxMzodzIZq/0WEbesCHI32C2bwkJkxkkcQDCwX5vgVQ="; }) + (fetchNuGet { pname = "TwentyTwenty.Storage.Amazon"; version = "2.12.1"; hash = "sha256-8Jpb7L1yi8NmhjVG/xnFHAPaeT5Jk9RxDryMOOGe2Q4="; }) + (fetchNuGet { pname = "TwentyTwenty.Storage.Azure"; version = "2.12.1"; hash = "sha256-m25ormO60RiC/rNfzjSKFDXCLcXqDvlzr//VifJ9B4M="; }) + (fetchNuGet { pname = "TwentyTwenty.Storage.Google"; version = "2.12.1"; hash = "sha256-F/4OZxllKpnW7beZSW5qp+oOHradj31bggPcvNI9GjU="; }) + (fetchNuGet { pname = "TwentyTwenty.Storage.Local"; version = "2.12.1"; hash = "sha256-qEqPzie96dHRpv7s+3CYxRCSYFOqtk2WQuePHRrHsv4="; }) + (fetchNuGet { pname = "WindowsAzure.Storage"; version = "9.3.3"; hash = "sha256-3bXdQwkgMx4cSliwLv+aVsRm5BwZPgSB9dsXJC1YYJE="; }) + (fetchNuGet { pname = "YamlDotNet"; version = "8.0.0"; hash = "sha256-9VInbvbrc9su5rcSyT4/t0wBSfLDpHvSvAy6WqMMGSY="; }) ] diff --git a/pkgs/applications/blockchains/clboss/default.nix b/pkgs/applications/blockchains/clboss/default.nix index da6e5b41aae15..2695198bf0e2e 100644 --- a/pkgs/applications/blockchains/clboss/default.nix +++ b/pkgs/applications/blockchains/clboss/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "clboss"; - version = "0.13.1"; + version = "0.13.3"; src = fetchFromGitHub { owner = "ZmnSCPxj"; repo = "clboss"; rev = "v${version}"; - hash = "sha256-DQvcf+y73QQYQanEvbOCOgwQzvNOXS1ZY+hVvS6N+G0="; + hash = "sha256-T61rkTEGLCZrEBp1WFhHnQ7DQyhctMf5lgbOs6u9E0o="; }; nativeBuildInputs = [ autoconf-archive autoreconfHook pkg-config libev curlWithGnuTls sqlite ]; diff --git a/pkgs/applications/blockchains/clightning/default.nix b/pkgs/applications/blockchains/clightning/default.nix index 2d1efc3e882e7..9f84685e8c105 100644 --- a/pkgs/applications/blockchains/clightning/default.nix +++ b/pkgs/applications/blockchains/clightning/default.nix @@ -1,5 +1,6 @@ { lib , stdenv +, cctools , darwin , fetchurl , autoconf @@ -19,28 +20,28 @@ , jq }: let - py3 = python3.withPackages (p: [ p.mako ]); + py3 = python3.withPackages (p: [ p.distutils p.mako ]); in stdenv.mkDerivation rec { pname = "clightning"; - version = "24.05"; + version = "24.08.1"; src = fetchurl { url = "https://github.com/ElementsProject/lightning/releases/download/v${version}/clightning-v${version}.zip"; - hash = "sha256-FD7JFM80wrruqBWjYnJHZh2f2GZJ6XDQmUQ0XetnWBg="; + hash = "sha256-2ZKvhNuzGftKwSdmMkHOwE9UEI5Ewn5HHSyyZUcCwB4="; }; - # when building on darwin we need dawin.cctools to provide the correct libtool + # when building on darwin we need cctools to provide the correct libtool # as libwally-core detects the host as darwin and tries to add the -static # option to libtool, also we have to add the modified gsed package. nativeBuildInputs = [ autoconf autogen automake gettext libtool lowdown protobuf py3 unzip which ] - ++ lib.optionals stdenv.isDarwin [ darwin.cctools darwin.autoSignDarwinBinariesHook ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools darwin.autoSignDarwinBinariesHook ]; buildInputs = [ gmp libsodium sqlite zlib jq ]; # this causes some python trouble on a darwin host so we skip this step. # also we have to tell libwally-core to use sed instead of gsed. - postPatch = if !stdenv.isDarwin then '' + postPatch = if !stdenv.hostPlatform.isDarwin then '' patchShebangs \ tools/generate-wire.py \ tools/update-mocks.sh \ @@ -61,7 +62,7 @@ stdenv.mkDerivation rec { # workaround for build issue, happens only x86_64-darwin, not aarch64-darwin # ccan/ccan/fdpass/fdpass.c:16:8: error: variable length array folded to constant array as an extension [-Werror,-Wgnu-folding-constant] # char buf[CMSG_SPACE(sizeof(fd))]; - env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) "-Wno-error=gnu-folding-constant"; + env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) "-Wno-error=gnu-folding-constant"; # The `clnrest` plugin requires a Python environment to run postInstall = '' diff --git a/pkgs/applications/blockchains/dcrctl/default.nix b/pkgs/applications/blockchains/dcrctl/default.nix index c388bd75f724e..eb8f53d1cda59 100644 --- a/pkgs/applications/blockchains/dcrctl/default.nix +++ b/pkgs/applications/blockchains/dcrctl/default.nix @@ -19,7 +19,7 @@ buildGoModule rec { homepage = "https://decred.org"; description = "Secure Decred wallet daemon written in Go (golang)"; license = with lib.licenses; [ isc ]; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; mainProgram = "dcrctl"; }; } diff --git a/pkgs/applications/blockchains/dcrwallet/default.nix b/pkgs/applications/blockchains/dcrwallet/default.nix index 07dc5b24bc987..1773d45157ce1 100644 --- a/pkgs/applications/blockchains/dcrwallet/default.nix +++ b/pkgs/applications/blockchains/dcrwallet/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dcrwallet"; - version = "2.0.3"; + version = "2.0.4"; src = fetchFromGitHub { owner = "decred"; repo = "dcrwallet"; rev = "release-v${version}"; - hash = "sha256-sRwGpOVydfZjgo7W+4RsHC4JElPyilbV5xhcHxPh2Wc="; + hash = "sha256-JKux64ANtoBumfVU2OyAyLgHDNZMe/bn+SMuQ8qV43M="; }; - vendorHash = "sha256-lVVIS3FL8XwthCpzRKdw59NVtHVxXQ0ouD7jYQzOecM="; + vendorHash = "sha256-ic8328r3BpycC2NiErTiFtRIkQaBhYcBwRgq/t9hmT8="; subPackages = [ "." ]; diff --git a/pkgs/applications/blockchains/electrs/default.nix b/pkgs/applications/blockchains/electrs/default.nix index d77694b450f22..a31982666ab09 100644 --- a/pkgs/applications/blockchains/electrs/default.nix +++ b/pkgs/applications/blockchains/electrs/default.nix @@ -2,7 +2,6 @@ , stdenv , rustPlatform , fetchFromGitHub -, llvmPackages , rocksdb_7_10 , Security }: @@ -30,7 +29,7 @@ rustPlatform.buildRustPackage rec { ROCKSDB_INCLUDE_DIR = "${rocksdb}/include"; ROCKSDB_LIB_DIR = "${rocksdb}/lib"; - buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; passthru.updateScript = ./update.sh; diff --git a/pkgs/applications/blockchains/elements/default.nix b/pkgs/applications/blockchains/elements/default.nix index 68dfa2be0579a..01abe7c2974e3 100644 --- a/pkgs/applications/blockchains/elements/default.nix +++ b/pkgs/applications/blockchains/elements/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch2 , autoreconfHook , pkg-config , util-linux @@ -33,11 +34,19 @@ stdenv.mkDerivation rec { sha256 = "sha256-qHtSgfZGZ4Beu5fsJAOZm8ejj7wfHBbOS6WAjOrCuw4="; }; + patches = [ + # upnp: fix build with miniupnpc 2.2.8 + (fetchpatch2 { + url = "https://github.com/bitcoin/bitcoin/commit/8acdf66540834b9f9cf28f16d389e8b6a48516d5.patch?full_index=1"; + hash = "sha256-oDvHUvwAEp0LJCf6QBESn38Bu359TcPpLhvuLX3sm6M="; + }) + ]; + nativeBuildInputs = [ autoreconfHook pkg-config ] - ++ lib.optionals stdenv.isLinux [ util-linux ] - ++ lib.optionals stdenv.isDarwin [ hexdump ] - ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ autoSignDarwinBinariesHook ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ util-linux ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ hexdump ] + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ autoSignDarwinBinariesHook ] ++ lib.optionals withGui [ wrapQtAppsHook ]; buildInputs = [ boost libevent miniupnpc zeromq zlib ] @@ -59,7 +68,7 @@ stdenv.mkDerivation rec { # fix "Killed: 9 test/test_bitcoin" # https://github.com/NixOS/nixpkgs/issues/179474 - hardeningDisable = lib.optionals (stdenv.isAarch64 && stdenv.isDarwin) [ "fortify" "stackprotector" ]; + hardeningDisable = lib.optionals (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isDarwin) [ "fortify" "stackprotector" ]; nativeCheckInputs = [ python3 ]; diff --git a/pkgs/applications/blockchains/ergo/default.nix b/pkgs/applications/blockchains/ergo/default.nix index b3ff8ccce2c24..ba24148ed51e4 100644 --- a/pkgs/applications/blockchains/ergo/default.nix +++ b/pkgs/applications/blockchains/ergo/default.nix @@ -1,12 +1,12 @@ -{ lib, stdenv, fetchurl, makeWrapper, jre }: +{ lib, stdenv, fetchurl, makeWrapper, jre, nixosTests }: stdenv.mkDerivation rec { pname = "ergo"; - version = "5.0.21"; + version = "5.0.22"; src = fetchurl { url = "https://github.com/ergoplatform/ergo/releases/download/v${version}/ergo-${version}.jar"; - sha256 = "sha256-WtBsChSHnYbRBojxRUGdMnXlG+45hp4ZSd8GLx5n/88="; + sha256 = "sha256-fuea76l6kIjk9n/LlktZmJ1B8wiwSfEeHUkTr+I1a2c="; }; nativeBuildInputs = [ makeWrapper ]; @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { makeWrapper ${jre}/bin/java $out/bin/ergo --add-flags "-jar $src" ''; + passthru.tests = { inherit (nixosTests) ergo; }; + meta = with lib; { description = "Open protocol that implements modern scientific ideas in the blockchain area"; homepage = "https://ergoplatform.org/en/"; diff --git a/pkgs/applications/blockchains/erigon/default.nix b/pkgs/applications/blockchains/erigon/default.nix index ed470dec1f355..b5fa4dfe134dc 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.6"; in buildGoModule { inherit pname version; @@ -11,11 +11,11 @@ buildGoModule { owner = "ledgerwatch"; repo = pname; rev = "v${version}"; - hash = "sha256-VZzDG9qUjEBSNxQcmkqPTTDQjh7BZFqyRSaCfio8X2I="; + hash = "sha256-208gJTLaVEikH92ZDEULPtfnKJyZhZCRCDfCxewABK4="; fetchSubmodules = true; }; - vendorHash = "sha256-38NmSSK3a70WvhZAZ529wdAMlEuk8/4YqtadoLOn1IY="; + vendorHash = "sha256-TUK7obI1wOXroI1NE1GfIP+NMW909+z92Wpy9B/soY0="; proxyVendor = true; # Build errors in mdbx when format hardening is enabled: diff --git a/pkgs/applications/blockchains/ethabi/Cargo.lock b/pkgs/applications/blockchains/ethabi/Cargo.lock deleted file mode 100644 index 05e3f0fef1d92..0000000000000 --- a/pkgs/applications/blockchains/ethabi/Cargo.lock +++ /dev/null @@ -1,677 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -[[package]] -name = "ansi_term" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" -dependencies = [ - "winapi", -] - -[[package]] -name = "anyhow" -version = "1.0.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28b2cd92db5cbd74e8e5028f7e27dd7aa3090e89e4f2a197cc7c8dfb69c7063b" - -[[package]] -name = "arrayvec" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" - -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi", - "libc", - "winapi", -] - -[[package]] -name = "bitflags" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" - -[[package]] -name = "bitvec" -version = "0.17.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41262f11d771fd4a61aa3ce019fca363b4b6c282fca9da2a31186d3965a47a5c" -dependencies = [ - "either", - "radium", -] - -[[package]] -name = "block-buffer" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" -dependencies = [ - "block-padding", - "generic-array", -] - -[[package]] -name = "block-padding" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae" - -[[package]] -name = "byte-slice-cast" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0a5e3906bcbf133e33c1d4d95afc664ad37fbdb9f6568d8043e7ea8c27d93d3" - -[[package]] -name = "byteorder" -version = "1.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" - -[[package]] -name = "bytes" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b700ce4376041dcd0a327fd0097c41095743c4c8af8887265942faf1100bd040" - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "clap" -version = "2.33.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002" -dependencies = [ - "ansi_term", - "atty", - "bitflags", - "strsim", - "textwrap", - "unicode-width", - "vec_map", -] - -[[package]] -name = "crunchy" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" - -[[package]] -name = "digest" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" -dependencies = [ - "generic-array", -] - -[[package]] -name = "either" -version = "1.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" - -[[package]] -name = "ethabi" -version = "13.0.0" -dependencies = [ - "anyhow", - "ethereum-types", - "hex", - "hex-literal", - "paste", - "serde", - "serde_json", - "sha3", - "thiserror", - "uint", -] - -[[package]] -name = "ethabi-cli" -version = "13.0.0" -dependencies = [ - "anyhow", - "ethabi", - "hex", - "itertools", - "sha3", - "structopt", -] - -[[package]] -name = "ethabi-contract" -version = "11.0.0" - -[[package]] -name = "ethabi-derive" -version = "13.0.0" -dependencies = [ - "anyhow", - "ethabi", - "heck", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "ethabi-tests" -version = "0.1.1" -dependencies = [ - "ethabi", - "ethabi-contract", - "ethabi-derive", - "hex", - "hex-literal", -] - -[[package]] -name = "ethbloom" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22a621dcebea74f2a6f2002d0a885c81ccf6cbdf86760183316a7722b5707ca4" -dependencies = [ - "crunchy", - "fixed-hash", - "impl-rlp", - "impl-serde", - "tiny-keccak", -] - -[[package]] -name = "ethereum-types" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05dc5f0df4915fa6dff7f975a8366ecfaaa8959c74235469495153e7bb1b280e" -dependencies = [ - "ethbloom", - "fixed-hash", - "impl-rlp", - "impl-serde", - "primitive-types", - "uint", -] - -[[package]] -name = "fixed-hash" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfcf0ed7fe52a17a03854ec54a9f76d6d84508d1c0e66bc1793301c73fc8493c" -dependencies = [ - "byteorder", - "rand", - "rustc-hex", - "static_assertions", -] - -[[package]] -name = "generic-array" -version = "0.14.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "501466ecc8a30d1d3b7fc9229b122b2ce8ed6e9d9223f1138d4babb253e51817" -dependencies = [ - "typenum", - "version_check", -] - -[[package]] -name = "getrandom" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9495705279e7140bf035dde1f6e750c162df8b625267cd52cc44e0b156732c8" -dependencies = [ - "cfg-if", - "libc", - "wasi", -] - -[[package]] -name = "heck" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cbf45460356b7deeb5e3415b5563308c0a9b057c85e12b06ad551f98d0a6ac" -dependencies = [ - "unicode-segmentation", -] - -[[package]] -name = "hermit-abi" -version = "0.1.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c" -dependencies = [ - "libc", -] - -[[package]] -name = "hex" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" - -[[package]] -name = "hex-literal" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5af1f635ef1bc545d78392b136bfe1c9809e029023c84a3638a864a10b8819c8" - -[[package]] -name = "impl-codec" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1be51a921b067b0eaca2fad532d9400041561aa922221cc65f95a85641c6bf53" -dependencies = [ - "parity-scale-codec", -] - -[[package]] -name = "impl-rlp" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f28220f89297a075ddc7245cd538076ee98b01f2a9c23a53a4f1105d5a322808" -dependencies = [ - "rlp", -] - -[[package]] -name = "impl-serde" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b47ca4d2b6931707a55fce5cf66aff80e2178c8b63bbb4ecb5695cbc870ddf6f" -dependencies = [ - "serde", -] - -[[package]] -name = "itertools" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b" -dependencies = [ - "either", -] - -[[package]] -name = "itoa" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736" - -[[package]] -name = "keccak" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67c21572b4949434e4fc1e1978b99c5f77064153c59d998bf13ecd96fb5ecba7" - -[[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.94" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18794a8ad5b29321f790b55d93dfba91e125cb1a9edbd4f8e3150acc771c1a5e" - -[[package]] -name = "opaque-debug" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" - -[[package]] -name = "parity-scale-codec" -version = "1.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4b26b16c7687c3075982af47719e481815df30bc544f7a6690763a25ca16e9d" -dependencies = [ - "arrayvec", - "bitvec", - "byte-slice-cast", - "serde", -] - -[[package]] -name = "paste" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf547ad0c65e31259204bd90935776d1c693cec2f4ff7abb7a1bbbd40dfe58" - -[[package]] -name = "ppv-lite86" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" - -[[package]] -name = "primitive-types" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3824ae2c5e27160113b9e029a10ec9e3f0237bad8029f69c7724393c9fdefd8" -dependencies = [ - "fixed-hash", - "impl-codec", - "impl-rlp", - "impl-serde", - "uint", -] - -[[package]] -name = "proc-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", -] - -[[package]] -name = "proc-macro2" -version = "1.0.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a152013215dca273577e18d2bf00fa862b89b24169fb78c4c95aeb07992c9cec" -dependencies = [ - "unicode-xid", -] - -[[package]] -name = "quote" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "radium" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "def50a86306165861203e7f84ecffbbdfdea79f0e51039b33de1e952358c47ac" - -[[package]] -name = "rand" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ef9e7e66b4468674bfcb0c81af8b7fa0bb154fa9f28eb840da5c447baeb8d7e" -dependencies = [ - "libc", - "rand_chacha", - "rand_core", -] - -[[package]] -name = "rand_chacha" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e12735cf05c9e10bf21534da50a147b924d555dc7a547c42e6bb2d5b6017ae0d" -dependencies = [ - "ppv-lite86", - "rand_core", -] - -[[package]] -name = "rand_core" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34cf66eb183df1c5876e2dcf6b13d57340741e8dc255b48e40a26de954d06ae7" -dependencies = [ - "getrandom", -] - -[[package]] -name = "rlp" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e54369147e3e7796c9b885c7304db87ca3d09a0a98f72843d532868675bbfba8" -dependencies = [ - "bytes", - "rustc-hex", -] - -[[package]] -name = "rustc-hex" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e75f6a532d0fd9f7f13144f392b6ad56a32696bfcd9c78f797f16bbb6f072d6" - -[[package]] -name = "ryu" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" - -[[package]] -name = "serde" -version = "1.0.125" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "558dc50e1a5a5fa7112ca2ce4effcb321b0300c0d4ccf0776a9f60cd89031171" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.125" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b093b7a2bb58203b5da3056c05b4ec1fed827dcfdb37347a8841695263b3d06d" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "serde_json" -version = "1.0.64" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "799e97dc9fdae36a5c8b8f2cae9ce2ee9fdce2058c57a93e6099d919fd982f79" -dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "sha3" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f81199417d4e5de3f04b1e871023acea7389672c4135918f05aa9cbf2f2fa809" -dependencies = [ - "block-buffer", - "digest", - "keccak", - "opaque-debug", -] - -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - -[[package]] -name = "strsim" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" - -[[package]] -name = "structopt" -version = "0.3.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5277acd7ee46e63e5168a80734c9f6ee81b1367a7d8772a2d765df2a3705d28c" -dependencies = [ - "clap", - "lazy_static", - "structopt-derive", -] - -[[package]] -name = "structopt-derive" -version = "0.4.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ba9cdfda491b814720b6b06e0cac513d922fc407582032e8706e9f137976f90" -dependencies = [ - "heck", - "proc-macro-error", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "syn" -version = "1.0.72" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1e8cdbefb79a9a5a65e0db8b47b723ee907b7c7f8496c76a1770b5c310bab82" -dependencies = [ - "proc-macro2", - "quote", - "unicode-xid", -] - -[[package]] -name = "textwrap" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -dependencies = [ - "unicode-width", -] - -[[package]] -name = "thiserror" -version = "1.0.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0f4a65597094d4483ddaed134f409b2cb7c1beccf25201a9f73c719254fa98e" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7765189610d8241a44529806d6fd1f2e0a08734313a35d5b3a556f92b381f3c0" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "tiny-keccak" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" -dependencies = [ - "crunchy", -] - -[[package]] -name = "typenum" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "879f6906492a7cd215bfa4cf595b600146ccfac0c79bcbd1f3000162af5e8b06" - -[[package]] -name = "uint" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e11fe9a9348741cf134085ad57c249508345fe16411b3d7fb4ff2da2f1d6382e" -dependencies = [ - "byteorder", - "crunchy", - "hex", - "static_assertions", -] - -[[package]] -name = "unicode-segmentation" -version = "1.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb0d2e7be6ae3a5fa87eed5fb451aff96f2573d2694942e40543ae0bbe19c796" - -[[package]] -name = "unicode-width" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" - -[[package]] -name = "unicode-xid" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" - -[[package]] -name = "vec_map" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" - -[[package]] -name = "version_check" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe" - -[[package]] -name = "wasi" -version = "0.10.2+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" - -[[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" diff --git a/pkgs/applications/blockchains/ethabi/default.nix b/pkgs/applications/blockchains/ethabi/default.nix deleted file mode 100644 index 50fa8fee06687..0000000000000 --- a/pkgs/applications/blockchains/ethabi/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, rustPlatform, fetchFromGitHub }: - -rustPlatform.buildRustPackage rec { - pname = "ethabi"; - version = "13.0.0"; - - src = fetchFromGitHub { - owner = "rust-ethereum"; - repo = "ethabi"; - rev = "v${version}"; - sha256 = "sha256-bl46CSVP1MMYI3tkVAHFrjMFwTt8QoleZCV9pMIMZyc="; - }; - - cargoLock = { - lockFile = ./Cargo.lock; - }; - - postPatch = '' - ln -s ${./Cargo.lock} Cargo.lock - ''; - - meta = with lib; { - description = "Ethereum function call encoding (ABI) utility"; - homepage = "https://github.com/rust-ethereum/ethabi"; - maintainers = [ maintainers.dbrock ]; - license = licenses.asl20; - mainProgram = "ethabi"; - }; -} diff --git a/pkgs/applications/blockchains/framesh/default.nix b/pkgs/applications/blockchains/framesh/default.nix index 6c39d9d212d66..b4673ca4cff90 100644 --- a/pkgs/applications/blockchains/framesh/default.nix +++ b/pkgs/applications/blockchains/framesh/default.nix @@ -14,13 +14,12 @@ let in appimageTools.wrapType2 { inherit pname version src; + nativeBuildInputs = [ makeWrapper ]; extraInstallCommands = '' install -m 444 -D ${appimageContents}/frame.desktop $out/share/applications/frame.desktop install -m 444 -D ${appimageContents}/frame.png \ $out/share/icons/hicolor/512x512/apps/frame.png - - source "${makeWrapper}/nix-support/setup-hook" wrapProgram "$out/bin/${pname}" \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations}}" diff --git a/pkgs/applications/blockchains/fulcrum/default.nix b/pkgs/applications/blockchains/fulcrum/default.nix index 189af6c028691..8c45ab4857028 100644 --- a/pkgs/applications/blockchains/fulcrum/default.nix +++ b/pkgs/applications/blockchains/fulcrum/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "fulcrum"; - version = "1.11.0"; + version = "1.11.1"; src = fetchFromGitHub { owner = "cculianu"; repo = "Fulcrum"; rev = "v${version}"; - sha256 = "sha256-VY6yUdmU8MLwSH3VeAWCGbdouOxGrhDc1usYj70jrd8="; + sha256 = "sha256-+hBc7jW1MVLVjYXNOV7QvFJJpZ5RzW5/c9NdqOXrsj0="; }; nativeBuildInputs = [ pkg-config qmake ]; diff --git a/pkgs/applications/blockchains/go-ethereum/default.nix b/pkgs/applications/blockchains/go-ethereum/default.nix deleted file mode 100644 index 7ee1ffab25593..0000000000000 --- a/pkgs/applications/blockchains/go-ethereum/default.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, libobjc, IOKit, nixosTests }: - -let - # A list of binaries to put into separate outputs - bins = [ - "geth" - "clef" - ]; - -in buildGoModule rec { - pname = "go-ethereum"; - version = "1.14.5"; - - src = fetchFromGitHub { - owner = "ethereum"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-IY0BKoDRMVRZTIysdUgqhTFQx0Pz+kl61vbPbhSdT8k="; - }; - - proxyVendor = true; - vendorHash = "sha256-vzxtoLlD1RjmKBpMPqcH/AAzk2l/NifpRl4Sp4qBYLg="; - - doCheck = false; - - outputs = [ "out" ] ++ bins; - - # Move binaries to separate outputs and symlink them back to $out - postInstall = lib.concatStringsSep "\n" ( - builtins.map (bin: "mkdir -p \$${bin}/bin && mv $out/bin/${bin} \$${bin}/bin/ && ln -s \$${bin}/bin/${bin} $out/bin/") bins - ); - - subPackages = [ - "cmd/abidump" - "cmd/abigen" - "cmd/blsync" - "cmd/bootnode" - "cmd/clef" - "cmd/devp2p" - "cmd/era" - "cmd/ethkey" - "cmd/evm" - "cmd/geth" - "cmd/p2psim" - "cmd/rlpdump" - "cmd/utils" - ]; - - # Following upstream: https://github.com/ethereum/go-ethereum/blob/v1.11.6/build/ci.go#L218 - tags = [ "urfave_cli_no_docs" ]; - - # Fix for usb-related segmentation faults on darwin - propagatedBuildInputs = - lib.optionals stdenv.isDarwin [ libobjc IOKit ]; - - passthru.tests = { inherit (nixosTests) geth; }; - - meta = with lib; { - homepage = "https://geth.ethereum.org/"; - description = "Official golang implementation of the Ethereum protocol"; - license = with licenses; [ lgpl3Plus gpl3Plus ]; - maintainers = with maintainers; [ RaghavSood ]; - }; -} diff --git a/pkgs/applications/blockchains/gridcoin-research/default.nix b/pkgs/applications/blockchains/gridcoin-research/default.nix index ac38af861493b..d5e06622ae0d2 100644 --- a/pkgs/applications/blockchains/gridcoin-research/default.nix +++ b/pkgs/applications/blockchains/gridcoin-research/default.nix @@ -1,6 +1,5 @@ { fetchFromGitHub , stdenv -, makeDesktopItem , lib , openssl , boost @@ -20,13 +19,13 @@ stdenv.mkDerivation rec { pname = "gridcoin-research"; - version = "5.4.8.0"; + version = "5.4.8.0-hotfix-1"; src = fetchFromGitHub { owner = "gridcoin-community"; repo = "Gridcoin-Research"; rev = "${version}"; - sha256 = "sha256-HZirzXkqM2aep+wq8k2UCFWHPtN0sBZXjamgt7RYPBo="; + hash = "sha256-e58GJNiZq4LP/HTeveTQD6APeTvUbhUTwMwhU+PiVc0="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/blockchains/groestlcoin/default.nix b/pkgs/applications/blockchains/groestlcoin/default.nix index 4e6e685316bf4..18861f0214319 100644 --- a/pkgs/applications/blockchains/groestlcoin/default.nix +++ b/pkgs/applications/blockchains/groestlcoin/default.nix @@ -2,6 +2,7 @@ , stdenv , fetchurl , fetchFromGitHub +, fetchpatch2 , autoreconfHook , pkg-config , installShellFiles @@ -41,10 +42,18 @@ stdenv.mkDerivation rec { sha256 = "0f6vi2k5xvjrhiazfjcd4aj246dfcg51xsnqb9wdjl41cg0ckwmf"; }; + patches = [ + # upnp: add compatibility for miniupnpc 2.2.8 + (fetchpatch2 { + url = "https://github.com/Groestlcoin/groestlcoin/commit/8acdf66540834b9f9cf28f16d389e8b6a48516d5.patch?full_index=1"; + hash = "sha256-oDvHUvwAEp0LJCf6QBESn38Bu359TcPpLhvuLX3sm6M="; + }) + ]; + nativeBuildInputs = [ autoreconfHook pkg-config installShellFiles ] - ++ lib.optionals stdenv.isLinux [ util-linux ] - ++ lib.optionals stdenv.isDarwin [ hexdump ] - ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ autoSignDarwinBinariesHook ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ util-linux ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ hexdump ] + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ autoSignDarwinBinariesHook ] ++ lib.optionals withGui [ wrapQtAppsHook ]; buildInputs = [ boost libevent miniupnpc zeromq zlib ] @@ -67,7 +76,7 @@ stdenv.mkDerivation rec { install -Dm644 share/pixmaps/groestlcoin256.png $out/share/pixmaps/groestlcoin.png ''; - preConfigure = lib.optionalString stdenv.isDarwin '' + preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin '' export MACOSX_DEPLOYMENT_TARGET=10.13 ''; diff --git a/pkgs/applications/blockchains/haven-cli/default.nix b/pkgs/applications/blockchains/haven-cli/default.nix index e4b108ecadcfd..e433aa562cf66 100644 --- a/pkgs/applications/blockchains/haven-cli/default.nix +++ b/pkgs/applications/blockchains/haven-cli/default.nix @@ -1,26 +1,25 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config +{ lib, stdenv, fetchFromGitHub, cmake, ninja, pkg-config , boost, miniupnpc, openssl, unbound , zeromq, pcsclite, readline, libsodium, hidapi , randomx, rapidjson, easyloggingpp , CoreData, IOKit, PCSC , trezorSupport ? true, libusb1, protobuf, python3 +, monero-cli }: stdenv.mkDerivation rec { pname = "haven-cli"; - version = "3.3.4"; + version = "4.1.0"; src = fetchFromGitHub { owner = "haven-protocol-org"; repo = "haven-main"; rev = "v${version}"; - sha256 = "sha256-jKeLFWJDwS8WWRynkDgBjvjq2EDpTEJadwkNsANQXws="; + hash = "sha256-UPDhvARXatqvxwsuSfxdasVcLbjkXOpK8yY7GoEPxxw="; fetchSubmodules = true; }; - patches = [ - ./use-system-libraries.patch - ]; + inherit (monero-cli) patches; postPatch = '' # remove vendored libraries @@ -29,14 +28,14 @@ stdenv.mkDerivation rec { cp -r . $source ''; - nativeBuildInputs = [ cmake pkg-config ]; + nativeBuildInputs = [ cmake ninja pkg-config ]; buildInputs = [ boost miniupnpc openssl unbound zeromq pcsclite readline libsodium hidapi randomx rapidjson protobuf readline easyloggingpp - ] ++ lib.optionals stdenv.isDarwin [ IOKit CoreData PCSC ] + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ IOKit CoreData PCSC ] ++ lib.optionals trezorSupport [ libusb1 protobuf python3 ]; cmakeFlags = [ @@ -44,7 +43,7 @@ stdenv.mkDerivation rec { "-DReadline_ROOT_DIR=${readline.dev}" "-DReadline_INCLUDE_DIR=${readline.dev}/include/readline" "-DRandomX_ROOT_DIR=${randomx}" - ] ++ lib.optional stdenv.isDarwin "-DBoost_USE_MULTITHREADED=OFF" + ] ++ lib.optional stdenv.hostPlatform.isDarwin "-DBoost_USE_MULTITHREADED=OFF" ++ lib.optional (!trezorSupport) "-DUSE_DEVICE_TREZOR=OFF"; outputs = [ "out" "source" ]; diff --git a/pkgs/applications/blockchains/haven-cli/use-system-libraries.patch b/pkgs/applications/blockchains/haven-cli/use-system-libraries.patch deleted file mode 100644 index 367c432b826ba..0000000000000 --- a/pkgs/applications/blockchains/haven-cli/use-system-libraries.patch +++ /dev/null @@ -1,94 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index fb71d2d..3a710a4 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -364,10 +364,10 @@ if(NOT MANUAL_SUBMODULES) - endfunction () - - message(STATUS "Checking submodules") -- check_submodule(external/miniupnp) -- check_submodule(external/rapidjson) -+ # check_submodule(external/miniupnp) -+ # check_submodule(external/rapidjson) - check_submodule(external/trezor-common) -- check_submodule(external/randomx) -+ # check_submodule(external/randomx) - check_submodule(external/supercop) - endif() - endif() - -@@ -300,7 +300,8 @@ endif() - # elseif(CMAKE_SYSTEM_NAME MATCHES ".*BSDI.*") - # set(BSDI TRUE) - --include_directories(external/rapidjson/include external/easylogging++ src contrib/epee/include external) -+include_directories(external/easylogging++ src contrib/epee/include external) -+#include_directories(external/rapidjson/include external/easylogging++ src contrib/epee/include external) - - if(APPLE) - include_directories(SYSTEM /usr/include/malloc) -diff --git a/cmake/FindMiniupnpc.cmake b/cmake/FindMiniupnpc.cmake -index ad2004a..7f4bb68 100644 ---- a/cmake/FindMiniupnpc.cmake -+++ b/cmake/FindMiniupnpc.cmake -@@ -37,7 +37,7 @@ set(MINIUPNP_STATIC_LIBRARIES ${MINIUPNP_STATIC_LIBRARY}) - - include(FindPackageHandleStandardArgs) - find_package_handle_standard_args( -- MiniUPnPc DEFAULT_MSG -+ Miniupnpc DEFAULT_MSG - MINIUPNP_INCLUDE_DIR - MINIUPNP_LIBRARY - ) -diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt -index 71b165f..10189ce 100644 ---- a/external/CMakeLists.txt -+++ b/external/CMakeLists.txt -@@ -37,21 +37,9 @@ - - find_package(Miniupnpc REQUIRED) - --message(STATUS "Using in-tree miniupnpc") --set(UPNPC_NO_INSTALL TRUE CACHE BOOL "Disable miniupnp installation" FORCE) --add_subdirectory(miniupnp/miniupnpc) --set_property(TARGET libminiupnpc-static PROPERTY FOLDER "external") --set_property(TARGET libminiupnpc-static PROPERTY POSITION_INDEPENDENT_CODE ON) --if(MSVC) -- set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -wd4244 -wd4267") --elseif(NOT MSVC) -- set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-undef -Wno-unused-result -Wno-unused-value") --endif() --if(CMAKE_SYSTEM_NAME MATCHES "NetBSD") -- set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -D_NETBSD_SOURCE") --endif() -- --set(UPNP_LIBRARIES "libminiupnpc-static" PARENT_SCOPE) -+set(UPNP_STATIC false PARENT_SCOPE) -+set(UPNP_INCLUDE ${MINIUPNP_INCLUDE_DIR} PARENT_SCOPE) -+set(UPNP_LIBRARIES ${MINIUPNP_LIBRARY} PARENT_SCOPE) - - find_package(Unbound) - -@@ -69,5 +69,4 @@ endif() - - add_subdirectory(db_drivers) - add_subdirectory(easylogging++) - add_subdirectory(qrcodegen) --add_subdirectory(randomx EXCLUDE_FROM_ALL) -diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl -index c626e22..be570ed 100644 ---- a/src/p2p/net_node.inl -+++ b/src/p2p/net_node.inl -@@ -60,9 +60,9 @@ - #include "cryptonote_core/cryptonote_core.h" - #include "net/parse.h" - --#include <miniupnp/miniupnpc/miniupnpc.h> --#include <miniupnp/miniupnpc/upnpcommands.h> --#include <miniupnp/miniupnpc/upnperrors.h> -+#include <miniupnpc/miniupnpc.h> -+#include <miniupnpc/upnpcommands.h> -+#include <miniupnpc/upnperrors.h> - - #undef MONERO_DEFAULT_LOG_CATEGORY - #define MONERO_DEFAULT_LOG_CATEGORY "net.p2p" diff --git a/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/pkgs/applications/blockchains/ledger-live-desktop/default.nix index 36344bf1a6e15..cfd9193f08be5 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.84.1"; src = fetchurl { url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage"; - hash = "sha256-dnlIIOOYmCN209avQFMcoekB7nJpc2dJnS2OBI+dq7E="; + hash = "sha256-V/bOCddc7UhmN8zlHmKj+H4v+ZZ/qn8jRj0jH4EtwMI="; }; appimageContents = appimageTools.extractType2 { @@ -16,13 +16,14 @@ in appimageTools.wrapType2 rec { inherit pname version src; + nativeBuildInputs = [ makeWrapper ]; + extraInstallCommands = '' install -m 444 -D ${appimageContents}/ledger-live-desktop.desktop $out/share/applications/ledger-live-desktop.desktop install -m 444 -D ${appimageContents}/ledger-live-desktop.png $out/share/icons/hicolor/1024x1024/apps/ledger-live-desktop.png ${imagemagick}/bin/convert ${appimageContents}/ledger-live-desktop.png -resize 512x512 ledger-live-desktop_512.png install -m 444 -D ledger-live-desktop_512.png $out/share/icons/hicolor/512x512/apps/ledger-live-desktop.png - source "${makeWrapper}/nix-support/setup-hook" wrapProgram "$out/bin/${pname}" \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" diff --git a/pkgs/applications/blockchains/lighthouse/Cargo.lock b/pkgs/applications/blockchains/lighthouse/Cargo.lock index 6d76f7aef763f..0c7d10d6a58f9 100644 --- a/pkgs/applications/blockchains/lighthouse/Cargo.lock +++ b/pkgs/applications/blockchains/lighthouse/Cargo.lock @@ -30,10 +30,7 @@ dependencies = [ "filesystem", "safe_arith", "sensitive_url", - "serde", - "serde_json", "slashing_protection", - "slog", "slot_clock", "tempfile", "tokio", @@ -62,9 +59,9 @@ dependencies = [ [[package]] name = "addr2line" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" dependencies = [ "gimli", ] @@ -115,9 +112,9 @@ dependencies = [ [[package]] name = "aes" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2" +checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" dependencies = [ "cfg-if", "cipher 0.4.4", @@ -145,18 +142,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "831010a0f742e1209b3bcea8fab6a8e149051ba6099432c8cb2cc117dec3ead1" dependencies = [ "aead 0.5.2", - "aes 0.8.3", + "aes 0.8.4", "cipher 0.4.4", "ctr 0.9.2", - "ghash 0.5.0", + "ghash 0.5.1", "subtle", ] [[package]] name = "ahash" -version = "0.8.7" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ "cfg-if", "once_cell", @@ -166,23 +163,88 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ "memchr", ] [[package]] name = "allocator-api2" -version = "0.2.16" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" +checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" [[package]] -name = "amcl" -version = "0.3.0" -source = "git+https://github.com/sigp/milagro_bls?tag=v1.5.1#d3fc0a40cfe8b72ccda46ba050ee6786a59ce753" +name = "alloy-consensus" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f58047cc851e58c26224521d1ecda466e3d746ebca0274cd5427aa660a88c353" +dependencies = [ + "alloy-eips", + "alloy-primitives", + "alloy-rlp", + "c-kzg", +] + +[[package]] +name = "alloy-eips" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d32a3e14fa0d152d00bd8daf605eb74ad397efb0f54bd7155585823dddb4401e" +dependencies = [ + "alloy-primitives", + "alloy-rlp", + "c-kzg", + "once_cell", + "serde", + "sha2 0.10.8", +] + +[[package]] +name = "alloy-primitives" +version = "0.7.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccb3ead547f4532bc8af961649942f0b9c16ee9226e26caa3f38420651cc0bf4" +dependencies = [ + "alloy-rlp", + "bytes", + "cfg-if", + "const-hex", + "derive_more", + "hex-literal", + "itoa", + "k256 0.13.3", + "keccak-asm", + "proptest", + "rand", + "ruint", + "serde", + "tiny-keccak", +] + +[[package]] +name = "alloy-rlp" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a43b18702501396fa9bcdeecd533bc85fac75150d308fc0f6800a01e6234a003" +dependencies = [ + "alloy-rlp-derive", + "arrayvec", + "bytes", +] + +[[package]] +name = "alloy-rlp-derive" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d83524c1f6162fcb5b0decf775498a125066c86dda6066ed609531b0e912f85a" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.72", +] [[package]] name = "android-tzdata" @@ -200,19 +262,65 @@ dependencies = [ ] [[package]] -name = "ansi_term" -version = "0.12.1" +name = "anes" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" +checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" + +[[package]] +name = "anstream" +version = "0.6.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b" dependencies = [ - "winapi", + "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.79" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" [[package]] name = "arbitrary" @@ -225,15 +333,154 @@ dependencies = [ [[package]] name = "arc-swap" -version = "1.6.0" +version = "1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" + +[[package]] +name = "archery" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a8da9bc4c4053ee067669762bcaeea6e241841295a2b6c948312dad6ef4cc02" +dependencies = [ + "static_assertions", +] + +[[package]] +name = "ark-ff" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b3235cc41ee7a12aaaf2c575a2ad7b46713a8a50bda2fc3b003a04845c05dd6" +dependencies = [ + "ark-ff-asm 0.3.0", + "ark-ff-macros 0.3.0", + "ark-serialize 0.3.0", + "ark-std 0.3.0", + "derivative", + "num-bigint", + "num-traits", + "paste", + "rustc_version 0.3.3", + "zeroize", +] + +[[package]] +name = "ark-ff" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec847af850f44ad29048935519032c33da8aa03340876d351dfab5660d2966ba" +dependencies = [ + "ark-ff-asm 0.4.2", + "ark-ff-macros 0.4.2", + "ark-serialize 0.4.2", + "ark-std 0.4.0", + "derivative", + "digest 0.10.7", + "itertools 0.10.5", + "num-bigint", + "num-traits", + "paste", + "rustc_version 0.4.0", + "zeroize", +] + +[[package]] +name = "ark-ff-asm" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6" +checksum = "db02d390bf6643fb404d3d22d31aee1c4bc4459600aef9113833d17e786c6e44" +dependencies = [ + "quote", + "syn 1.0.109", +] + +[[package]] +name = "ark-ff-asm" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ed4aa4fe255d0bc6d79373f7e31d2ea147bcf486cba1be5ba7ea85abdb92348" +dependencies = [ + "quote", + "syn 1.0.109", +] + +[[package]] +name = "ark-ff-macros" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db2fd794a08ccb318058009eefdf15bcaaaaf6f8161eb3345f907222bac38b20" +dependencies = [ + "num-bigint", + "num-traits", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "ark-ff-macros" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7abe79b0e4288889c4574159ab790824d0033b9fdcb2a112a3182fac2e514565" +dependencies = [ + "num-bigint", + "num-traits", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "ark-serialize" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d6c2b318ee6e10f8c2853e73a83adc0ccb88995aa978d8a3408d492ab2ee671" +dependencies = [ + "ark-std 0.3.0", + "digest 0.9.0", +] + +[[package]] +name = "ark-serialize" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adb7b85a02b83d2f22f89bd5cac66c9c89474240cb6207cb1efc16d098e822a5" +dependencies = [ + "ark-std 0.4.0", + "digest 0.10.7", + "num-bigint", +] + +[[package]] +name = "ark-std" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1df2c09229cbc5a028b1d70e00fdb2acee28b1055dfb5ca73eea49c5a25c4e7c" +dependencies = [ + "num-traits", + "rand", +] + +[[package]] +name = "ark-std" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94893f1e0c6eeab764ade8dc4c0db24caf4fe7cbbaafc0eba0a9030f447b5185" +dependencies = [ + "num-traits", + "rand", +] + +[[package]] +name = "arraydeque" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d902e3d592a523def97af8f317b08ce16b7ab854c1985a0c671e6f15cebc236" [[package]] name = "arrayref" -version = "0.3.7" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" +checksum = "9d151e35f61089500b617991b791fc8bfd237ae50cd5950803758a179b41e67a" [[package]] name = "arrayvec" @@ -243,9 +490,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" [[package]] name = "asn1-rs" -version = "0.5.2" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f6fd5ddaf0351dff5b8da21b2fb4ff8e08ddd02857f0bf69c47639106c0fff0" +checksum = "22ad1373757efa0f70ec53939aabc7152e1591cb485208052993070ac8d2429d" dependencies = [ "asn1-rs-derive", "asn1-rs-impl", @@ -259,25 +506,25 @@ dependencies = [ [[package]] name = "asn1-rs-derive" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "726535892e8eae7e70657b4c8ea93d26b8553afb1ce617caee529ef96d7dee6c" +checksum = "7378575ff571966e99a744addeff0bff98b8ada0dedf1956d59e634db95eaac1" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.72", "synstructure", ] [[package]] name = "asn1-rs-impl" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2777730b2039ac0f95f093556e61b6d26cebed5393ca6f152717777cec3a42ed" +checksum = "7b18050c2cd6fe86c3a76584ef5e0baf286d038cda203eb6223df2cc413565f7" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.72", ] [[package]] @@ -299,9 +546,9 @@ dependencies = [ [[package]] name = "async-io" -version = "2.3.0" +version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb41eb19024a91746eba0773aa5e16036045bbf45733766661099e182ea6a744" +checksum = "0d6baa8f0178795da0e71bc42c9e5d13261aac7ee549853162e66a241ba17964" dependencies = [ "async-lock", "cfg-if", @@ -310,7 +557,7 @@ dependencies = [ "futures-lite", "parking", "polling", - "rustix 0.38.30", + "rustix 0.38.34", "slab", "tracing", "windows-sys 0.52.0", @@ -318,24 +565,24 @@ 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 5.3.1", "event-listener-strategy", "pin-project-lite", ] [[package]] name = "async-trait" -version = "0.1.77" +version = "0.1.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" +checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.72", ] [[package]] @@ -346,14 +593,14 @@ checksum = "b6d7b9decdf35d8908a7e3ef02f64c5e9b1695e230154c0e8de3969142d9b94c" dependencies = [ "futures", "pharos", - "rustc_version", + "rustc_version 0.4.0", ] [[package]] name = "asynchronous-codec" -version = "0.7.0" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a860072022177f903e59730004fb5dc13db9275b79bb2aef7ba8ce831956c233" +checksum = "4057f2c32adbb2fc158e22fb38433c8e9bbf76b75a4732c7c0cbaf695fb65568" dependencies = [ "bytes", "futures-sink", @@ -363,15 +610,16 @@ dependencies = [ ] [[package]] -name = "attohttpc" -version = "0.16.3" +name = "asynchronous-codec" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdb8867f378f33f78a811a8eb9bf108ad99430d7aad43315dd9319c827ef6247" +checksum = "a860072022177f903e59730004fb5dc13db9275b79bb2aef7ba8ce831956c233" dependencies = [ - "http 0.2.11", - "log", - "url", - "wildmatch", + "bytes", + "futures-sink", + "futures-util", + "memchr", + "pin-project-lite", ] [[package]] @@ -380,7 +628,7 @@ version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8d9a9bf8b79a749ee0b911b91b671cc2b6c670bdbc7e3dfd537576ddc94bb2a2" dependencies = [ - "http 0.2.11", + "http 0.2.12", "log", "url", ] @@ -398,36 +646,35 @@ dependencies = [ [[package]] name = "auto_impl" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fee3da8ef1276b0bee5dd1c7258010d8fffd31801447323115a25560e1327b89" +checksum = "3c87f3f15e7794432337fc718554eaa4dc8f04c9677a950ffe366f20a162ae42" dependencies = [ - "proc-macro-error", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.72", ] [[package]] name = "autocfg" -version = "1.1.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "axum" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1236b4b292f6c4d6dc34604bb5120d85c3fe1d1aa596bd5cc52ca054d13e7b9e" +checksum = "3a6c9af12842a67734c9a2e355436e5d03b22383ed60cf13cd0c18fbfe3dcbcf" dependencies = [ "async-trait", "axum-core", "bytes", "futures-util", - "http 1.0.0", - "http-body 1.0.0", + "http 1.1.0", + "http-body 1.0.1", "http-body-util", - "hyper 1.1.0", + "hyper 1.4.1", "hyper-util", "itoa", "matchit", @@ -440,7 +687,7 @@ dependencies = [ "serde_json", "serde_path_to_error", "serde_urlencoded", - "sync_wrapper", + "sync_wrapper 1.0.1", "tokio", "tower", "tower-layer", @@ -457,13 +704,13 @@ dependencies = [ "async-trait", "bytes", "futures-util", - "http 1.0.0", - "http-body 1.0.0", + "http 1.1.0", + "http-body 1.0.1", "http-body-util", "mime", "pin-project-lite", "rustversion", - "sync_wrapper", + "sync_wrapper 0.1.2", "tower-layer", "tower-service", "tracing", @@ -471,9 +718,9 @@ dependencies = [ [[package]] name = "backtrace" -version = "0.3.69" +version = "0.3.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" dependencies = [ "addr2line", "cc", @@ -515,6 +762,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" [[package]] +name = "base64" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" + +[[package]] name = "base64ct" version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -536,23 +789,23 @@ dependencies = [ "ethereum_ssz", "ethereum_ssz_derive", "execution_layer", - "exit-future", "fork_choice", "futures", "genesis", "hex", "int_to_bytes", - "itertools", + "itertools 0.10.5", "kzg", "lazy_static", "lighthouse_metrics", + "lighthouse_version", "logging", "lru", "maplit", "merkle_proof", "oneshot_broadcast", "operation_pool", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "proto_array", "rand", "rayon", @@ -583,7 +836,7 @@ dependencies = [ [[package]] name = "beacon_node" -version = "4.6.0" +version = "5.3.0" dependencies = [ "beacon_chain", "clap", @@ -593,19 +846,15 @@ dependencies = [ "dirs", "environment", "eth2_config", - "eth2_network_config", "execution_layer", - "futures", "genesis", "hex", "http_api", - "hyper 1.1.0", + "hyper 1.4.1", "lighthouse_network", - "lighthouse_version", "monitoring_api", "node_test_rig", "sensitive_url", - "serde", "serde_json", "slasher", "slog", @@ -620,25 +869,22 @@ dependencies = [ name = "beacon_processor" version = "0.1.0" dependencies = [ - "derivative", - "ethereum_ssz", "fnv", "futures", - "hex", - "itertools", + "itertools 0.10.5", "lazy_static", "lighthouse_metrics", "lighthouse_network", "logging", "num_cpus", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "serde", "slog", "slot_clock", "strum", "task_executor", "tokio", - "tokio-util 0.6.10", + "tokio-util", "types", ] @@ -653,47 +899,40 @@ dependencies = [ [[package]] name = "bindgen" -version = "0.59.2" +version = "0.69.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bd2a9a458e8f4304c52c43ebb0cfbd520289f8379a52e329a38afda99bf8eb8" +checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", "cexpr", "clang-sys", + "itertools 0.12.1", "lazy_static", "lazycell", - "peeking_take_while", "proc-macro2", "quote", "regex", "rustc-hash", "shlex", + "syn 2.0.72", ] [[package]] -name = "bindgen" -version = "0.66.1" +name = "bit-set" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2b84e06fc203107bfbad243f4aba2af864eb7db3b1cf46ea0a023b0b433d2a7" +checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" dependencies = [ - "bitflags 2.4.2", - "cexpr", - "clang-sys", - "lazy_static", - "lazycell", - "log", - "peeking_take_while", - "prettyplease", - "proc-macro2", - "quote", - "regex", - "rustc-hash", - "shlex", - "syn 2.0.48", - "which", + "bit-vec", ] [[package]] +name = "bit-vec" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" + +[[package]] name = "bitflags" version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -701,9 +940,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.2" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" [[package]] name = "bitvec" @@ -774,7 +1013,6 @@ dependencies = [ "ethereum_serde_utils", "ethereum_ssz", "hex", - "milagro_bls", "rand", "serde", "tree_hash", @@ -783,9 +1021,9 @@ dependencies = [ [[package]] name = "blst" -version = "0.3.11" +version = "0.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c94087b935a822949d3291a9989ad2b2051ea141eda0fd4e478a75f6aa3e604b" +checksum = "62dc83a094a71d43eeadd254b1ec2d24cb6a0bb6cadce00df51f0db594711a32" dependencies = [ "cc", "glob", @@ -805,7 +1043,7 @@ dependencies = [ [[package]] name = "boot_node" -version = "4.6.0" +version = "5.3.0" dependencies = [ "beacon_node", "clap", @@ -817,12 +1055,9 @@ dependencies = [ "log", "logging", "serde", - "serde_json", - "serde_yaml", "slog", "slog-async", "slog-scope", - "slog-stdlog", "slog-term", "tokio", "types", @@ -836,9 +1071,9 @@ checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3" [[package]] name = "bs58" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5353f36341f7451062466f0b755b96ac3a9547e4d7f6b70d603fc721a7d7896" +checksum = "bf88ba1141d185c399bee5288d850d63b8369520c1eafc32a0430b5b6c287bf4" dependencies = [ "tinyvec", ] @@ -852,14 +1087,13 @@ dependencies = [ "reqwest", "sensitive_url", "serde", - "serde_json", ] [[package]] name = "bumpalo" -version = "3.14.0" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "byte-slice-cast" @@ -875,9 +1109,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.5.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" +checksum = "a12916984aab3fa6e39d655a33e09c0071eb36d6ab3aea5c2d78551f1df6d952" dependencies = [ "serde", ] @@ -905,11 +1139,10 @@ dependencies = [ [[package]] name = "c-kzg" -version = "0.4.0" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32700dc7904064bb64e857d38a1766607372928e2466ee5f02a869829b3297d7" +checksum = "cdf100c4cea8f207e883ff91ca886d621d8a166cb04971dfaa9bb8fd99ed95df" dependencies = [ - "bindgen 0.66.1", "blst", "cc", "glob", @@ -919,34 +1152,19 @@ dependencies = [ ] [[package]] -name = "cached_tree_hash" -version = "0.1.0" -dependencies = [ - "ethereum-types 0.14.1", - "ethereum_hashing", - "ethereum_ssz", - "ethereum_ssz_derive", - "quickcheck", - "quickcheck_macros", - "smallvec", - "ssz_types", - "tree_hash", -] - -[[package]] name = "camino" -version = "1.1.6" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c59e92b5a388f549b863a7bea62612c09f24c8393560709a54558a9abdfb3b9c" +checksum = "e0ec6b951b160caa93cc0c7b209e5a3bff7aae9062213451ac99493cd844c239" dependencies = [ "serde", ] [[package]] name = "cargo-platform" -version = "0.1.6" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ceed8ef69d8518a5dda55c07425450b58a4e1946f4951eab6d7191ee86c2443d" +checksum = "24b1f0365a6c6bb4020cd05806fd0d33c44d38046b8bd7f0e40814b9763cabfc" dependencies = [ "serde", ] @@ -959,7 +1177,7 @@ checksum = "eee4243f1f26fc7a42710e7439c149e2b10b05472f88090acce52632f231a73a" dependencies = [ "camino", "cargo-platform", - "semver", + "semver 1.0.23", "serde", "serde_json", "thiserror", @@ -973,9 +1191,9 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cc" -version = "1.0.83" +version = "1.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +checksum = "2aba8f4e9906c7ce3c73463f62a7f0c65183ada1a2d47e397cc8810827f9694f" dependencies = [ "jobserver", "libc", @@ -997,6 +1215,12 @@ 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 = "chacha20" version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1022,14 +1246,41 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.32" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41daef31d7a747c5c847246f36de49ced6f7403b4cdabc807a97b5cc184cda7a" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" dependencies = [ "android-tzdata", "iana-time-zone", "num-traits", - "windows-targets 0.52.0", + "windows-targets 0.52.6", +] + +[[package]] +name = "ciborium" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e" +dependencies = [ + "ciborium-io", + "ciborium-ll", + "serde", +] + +[[package]] +name = "ciborium-io" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757" + +[[package]] +name = "ciborium-ll" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9" +dependencies = [ + "ciborium-io", + "half", ] [[package]] @@ -1054,9 +1305,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", @@ -1065,20 +1316,46 @@ dependencies = [ [[package]] name = "clap" -version = "2.34.0" +version = "4.5.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" +checksum = "8f6b81fb3c84f5563d509c59b5a48d935f689e993afa90fe39047f05adef9142" dependencies = [ - "ansi_term", - "atty", - "bitflags 1.3.2", - "strsim 0.8.0", - "textwrap", - "unicode-width", - "vec_map", + "clap_builder", + "clap_derive", ] [[package]] +name = "clap_builder" +version = "4.5.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ca6706fd5224857d9ac5eb9355f6683563cc0541c7cd9d014043b57cbec78ac" +dependencies = [ + "anstream", + "anstyle", + "clap_lex", + "strsim 0.11.1", + "terminal_size", +] + +[[package]] +name = "clap_derive" +version = "4.5.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bac35c6dafb060fd4d275d9a4ffae97917c13a6327903a8be2153cd964f7085" +dependencies = [ + "heck 0.5.0", + "proc-macro2", + "quote", + "syn 2.0.72", +] + +[[package]] +name = "clap_lex" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b82cf0babdbd58558212896d1a4272303a57bdb245c2bf1147185fb45640e70" + +[[package]] name = "clap_utils" version = "0.1.0" dependencies = [ @@ -1107,19 +1384,18 @@ dependencies = [ "eth1", "eth2", "eth2_config", + "ethereum_ssz", "execution_layer", + "futures", "genesis", "http_api", "http_metrics", "lazy_static", "lighthouse_metrics", "lighthouse_network", - "logging", "monitoring_api", "network", - "num_cpus", "operation_pool", - "parking_lot 0.12.1", "sensitive_url", "serde", "serde_yaml", @@ -1146,11 +1422,17 @@ dependencies = [ ] [[package]] +name = "colorchoice" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" + +[[package]] name = "compare_fields" version = "0.2.0" dependencies = [ "compare_fields_derive", - "itertools", + "itertools 0.10.5", ] [[package]] @@ -1163,14 +1445,27 @@ dependencies = [ [[package]] name = "concurrent-queue" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" dependencies = [ "crossbeam-utils", ] [[package]] +name = "const-hex" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94fb8a24a26d37e1ffd45343323dc9fe6654ceea44c12f2fcb3d7ac29e610bc6" +dependencies = [ + "cfg-if", + "cpufeatures", + "hex", + "proptest", + "serde", +] + +[[package]] name = "const-oid" version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1224,33 +1519,33 @@ dependencies = [ [[package]] name = "crc32fast" -version = "1.3.2" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" dependencies = [ "cfg-if", ] [[package]] name = "criterion" -version = "0.3.6" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b01d6de93b2b6c65e17c634a26653a29d107b3c98c607c765bf38d041531cd8f" +checksum = "f2b12d017a929603d80db1831cd3a24082f8137ce19c69e6447f54f5fc8d692f" dependencies = [ - "atty", + "anes", "cast", + "ciborium", "clap", "criterion-plot", - "csv", - "itertools", - "lazy_static", + "is-terminal", + "itertools 0.10.5", "num-traits", + "once_cell", "oorandom", "plotters", "rayon", "regex", "serde", - "serde_cbor", "serde_derive", "serde_json", "tinytemplate", @@ -1259,19 +1554,19 @@ dependencies = [ [[package]] name = "criterion-plot" -version = "0.4.5" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2673cc8207403546f45f5fd319a974b1e6983ad1a3ee7e6041650013be041876" +checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1" dependencies = [ "cast", - "itertools", + "itertools 0.10.5", ] [[package]] name = "crossbeam-channel" -version = "0.5.11" +version = "0.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "176dc175b78f56c0f321911d9c8eb2b77a78a4860b9c19db83835fea1a46649b" +checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" dependencies = [ "crossbeam-utils", ] @@ -1297,9 +1592,9 @@ dependencies = [ [[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 = "crunchy" @@ -1363,27 +1658,6 @@ dependencies = [ ] [[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 = "ctr" version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1412,27 +1686,26 @@ dependencies = [ [[package]] name = "ctrlc" -version = "3.4.2" +version = "3.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b467862cc8610ca6fc9a1532d7777cee0804e678ab45410897b9396495994a0b" +checksum = "672465ae37dc1bc6380a6547a8883d5dd397b0f1faaad4f265726cc7042a5345" dependencies = [ - "nix 0.27.1", + "nix 0.28.0", "windows-sys 0.52.0", ] [[package]] name = "curve25519-dalek" -version = "4.1.1" +version = "4.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89b8c6a2e4b1f45971ad09761aafb85514a84744b67a95e32c3cc1352d1f65c" +checksum = "97fb8b7c4503de7d6ae7b42ab72a5a59857b4c937ec27a3d4539dba95b5ab2be" dependencies = [ "cfg-if", "cpufeatures", "curve25519-dalek-derive", "digest 0.10.7", "fiat-crypto", - "platforms 3.3.0", - "rustc_version", + "rustc_version 0.4.0", "subtle", "zeroize", ] @@ -1445,7 +1718,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.72", ] [[package]] @@ -1454,8 +1727,18 @@ version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c" dependencies = [ - "darling_core", - "darling_macro", + "darling_core 0.13.4", + "darling_macro 0.13.4", +] + +[[package]] +name = "darling" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" +dependencies = [ + "darling_core 0.20.10", + "darling_macro 0.20.10", ] [[package]] @@ -1473,17 +1756,42 @@ dependencies = [ ] [[package]] +name = "darling_core" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim 0.11.1", + "syn 2.0.72", +] + +[[package]] name = "darling_macro" version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" dependencies = [ - "darling_core", + "darling_core 0.13.4", "quote", "syn 1.0.109", ] [[package]] +name = "darling_macro" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" +dependencies = [ + "darling_core 0.20.10", + "quote", + "syn 2.0.72", +] + +[[package]] name = "darwin-libproc" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1504,16 +1812,22 @@ dependencies = [ ] [[package]] +name = "dary_heap" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7762d17f1241643615821a8455a0b2c3e803784b058693d990b11f2dce25a0ca" + +[[package]] name = "data-encoding" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" +checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2" [[package]] name = "data-encoding-macro" -version = "0.1.14" +version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20c01c06f5f429efdf2bae21eb67c28b3df3cf85b7dd2d8ef09c0838dac5d33e" +checksum = "f1559b6cba622276d6d63706db152618eeb15b89b3e4041446b05876e352e639" dependencies = [ "data-encoding", "data-encoding-macro-internal", @@ -1521,9 +1835,9 @@ dependencies = [ [[package]] name = "data-encoding-macro-internal" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0047d07f2c89b17dd631c80450d69841a6b5d7fb17278cbc43d7e4cfcf2576f3" +checksum = "332d754c0af53bc87c108fed664d121ecf59207ec4196041f04d6ab9002ad33f" dependencies = [ "data-encoding", "syn 1.0.109", @@ -1539,12 +1853,10 @@ dependencies = [ "clap_utils", "environment", "hex", - "logging", + "serde", "slog", - "sloggers", "store", "strum", - "tempfile", "types", ] @@ -1561,7 +1873,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e4355c25cbf99edcb6b4a0e906f6bdc6956eda149e84455bea49696429b2f8e8" dependencies = [ "futures", - "tokio-util 0.7.10", + "tokio-util", ] [[package]] @@ -1590,9 +1902,9 @@ dependencies = [ [[package]] name = "der" -version = "0.7.8" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c" +checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0" dependencies = [ "const-oid", "pem-rfc7468", @@ -1601,9 +1913,9 @@ dependencies = [ [[package]] name = "der-parser" -version = "8.2.0" +version = "9.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbd676fbbab537128ef0278adb5576cf363cff6aa22a7b24effe97347cfab61e" +checksum = "5cd0a5c643689626bec213c4d8bd4d96acc8ffdb4ad4bb6bc16abf27d5f4b553" dependencies = [ "asn1-rs", "displaydoc", @@ -1641,29 +1953,29 @@ checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.72", ] [[package]] name = "derive_more" -version = "0.99.17" +version = "0.99.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" +checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce" dependencies = [ "convert_case", "proc-macro2", "quote", - "rustc_version", - "syn 1.0.109", + "rustc_version 0.4.0", + "syn 2.0.72", ] [[package]] name = "diesel" -version = "2.1.4" +version = "2.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62c6fcf842f17f8c78ecf7c81d75c5ce84436b41ee07e03f490fbb5f5a8731d8" +checksum = "bf97ee7261bb708fa3402fa9c17a54b70e90e3cb98afb3dc8999d5512cb03f94" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.6.0", "byteorder", "diesel_derives", "itoa", @@ -1673,21 +1985,22 @@ dependencies = [ [[package]] name = "diesel_derives" -version = "2.1.2" +version = "2.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef8337737574f55a468005a83499da720f20c65586241ffea339db9ecdfd2b44" +checksum = "d6ff2be1e7312c858b2ef974f5c7089833ae57b5311b334b30923af58e5718d8" dependencies = [ "diesel_table_macro_syntax", + "dsl_auto_type", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.72", ] [[package]] name = "diesel_migrations" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6036b3f0120c5961381b570ee20a02432d7e2d27ea60de9578799cf9156914ac" +checksum = "8a73ce704bad4231f001bff3314d91dce4aba0770cee8b233991859abc15c1f6" dependencies = [ "diesel", "migrations_internals", @@ -1696,11 +2009,11 @@ dependencies = [ [[package]] name = "diesel_table_macro_syntax" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc5557efc453706fed5e4fa85006fe9817c224c3f480a34c7e5959fd700921c5" +checksum = "209c735641a413bc68c4923a9d6ad4bcb3ca306b794edaa7eb0b3228a99ffb25" dependencies = [ - "syn 2.0.48", + "syn 2.0.72", ] [[package]] @@ -1776,8 +2089,9 @@ dependencies = [ [[package]] name = "discv5" -version = "0.4.0" -source = "git+https://github.com/sigp/discv5?rev=e30a2c31b7ac0c57876458b971164654dfa4513b#e30a2c31b7ac0c57876458b971164654dfa4513b" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bac33cb3f99889a57e56a8c6ccb77aaf0cfc7787602b7af09783f736d77314e1" dependencies = [ "aes 0.7.5", "aes-gcm 0.9.2", @@ -1786,7 +2100,7 @@ dependencies = [ "enr", "fnv", "futures", - "hashlink", + "hashlink 0.8.4", "hex", "hkdf", "lazy_static", @@ -1806,13 +2120,27 @@ dependencies = [ [[package]] name = "displaydoc" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.72", +] + +[[package]] +name = "dsl_auto_type" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5d9abe6314103864cc2d8901b7ae224e0ab1a103a0a416661b4097b0779b607" +dependencies = [ + "darling 0.20.10", + "either", + "heck 0.5.0", + "proc-macro2", + "quote", + "syn 2.0.72", ] [[package]] @@ -1845,7 +2173,7 @@ version = "0.16.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca" dependencies = [ - "der 0.7.8", + "der 0.7.9", "digest 0.10.7", "elliptic-curve 0.13.8", "rfc6979 0.4.0", @@ -1865,9 +2193,9 @@ dependencies = [ [[package]] name = "ed25519-dalek" -version = "2.1.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f628eaec48bfd21b865dc2950cfa014450c01d2fa2b69a86c2fd5844ec523c0" +checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871" dependencies = [ "curve25519-dalek", "ed25519", @@ -1884,13 +2212,11 @@ version = "0.2.0" dependencies = [ "beacon_chain", "bls", - "cached_tree_hash", "compare_fields", "compare_fields_derive", "derivative", "eth2_network_config", "ethereum-types 0.14.1", - "ethereum_serde_utils", "ethereum_ssz", "ethereum_ssz_derive", "execution_layer", @@ -1906,7 +2232,6 @@ dependencies = [ "serde_yaml", "snap", "state_processing", - "store", "swap_or_not_shuffle", "tree_hash", "tree_hash_derive", @@ -1915,9 +2240,9 @@ dependencies = [ [[package]] name = "either" -version = "1.9.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "elliptic-curve" @@ -1960,9 +2285,9 @@ dependencies = [ [[package]] name = "encoding_rs" -version = "0.8.33" +version = "0.8.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" +checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" dependencies = [ "cfg-if", ] @@ -1992,10 +2317,10 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5ffccbb6966c05b32ef8fbac435df276c4ae4d3dc55a8cd0eb9745e6c12f546a" dependencies = [ - "heck", + "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.72", ] [[package]] @@ -2025,10 +2350,10 @@ dependencies = [ name = "environment" version = "0.1.2" dependencies = [ + "async-channel", "ctrlc", "eth2_config", "eth2_network_config", - "exit-future", "futures", "logging", "serde", @@ -2059,9 +2384,9 @@ dependencies = [ [[package]] name = "errno" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" dependencies = [ "libc", "windows-sys 0.52.0", @@ -2088,15 +2413,12 @@ dependencies = [ "ethereum_ssz_derive", "execution_layer", "futures", - "hex", "lazy_static", "lighthouse_metrics", "merkle_proof", - "parking_lot 0.12.1", - "reqwest", + "parking_lot 0.12.3", "sensitive_url", "serde", - "serde_json", "serde_yaml", "slog", "sloggers", @@ -2138,7 +2460,6 @@ dependencies = [ "libsecp256k1", "lighthouse_network", "mediatype", - "mime", "pretty_reqwest_error", "procfs", "proto_array", @@ -2152,7 +2473,6 @@ dependencies = [ "ssz_types", "store", "tokio", - "tree_hash", "types", ] @@ -2224,7 +2544,6 @@ dependencies = [ "pretty_reqwest_error", "reqwest", "sensitive_url", - "serde_json", "serde_yaml", "sha2 0.9.9", "slog", @@ -2352,13 +2671,13 @@ dependencies = [ [[package]] name = "ethereum_hashing" -version = "1.0.0-beta.2" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "233dc6f434ce680dbabf4451ee3380cec46cb3c45d66660445a435619710dd35" +checksum = "6ea7b408432c13f71af01197b1d3d0069c48a27bfcfbe72a81fc346e47f6defb" dependencies = [ "cpufeatures", "lazy_static", - "ring 0.16.20", + "ring 0.17.8", "sha2 0.10.8", ] @@ -2377,22 +2696,22 @@ dependencies = [ [[package]] name = "ethereum_ssz" -version = "0.5.3" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e61ffea29f26e8249d35128a82ec8d3bd4fbc80179ea5f5e5e3daafef6a80fcb" +checksum = "7d3627f83d8b87b432a5fad9934b4565260722a141a2c40f371f8080adec9425" dependencies = [ "ethereum-types 0.14.1", - "itertools", + "itertools 0.10.5", "smallvec", ] [[package]] name = "ethereum_ssz_derive" -version = "0.5.3" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6085d7fd3cf84bd2b8fec150d54c8467fb491d8db9c460607c5534f653a0ee38" +checksum = "8eccd5378ec34a07edd3d9b48088cbc63309d0367d14ba10b0cdb1d1791080ea" dependencies = [ - "darling", + "darling 0.13.4", "proc-macro2", "quote", "syn 1.0.109", @@ -2502,7 +2821,7 @@ dependencies = [ "getrandom", "hashers", "hex", - "http 0.2.11", + "http 0.2.12", "once_cell", "parking_lot 0.11.2", "pin-project", @@ -2529,9 +2848,9 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] name = "event-listener" -version = "4.0.3" +version = "5.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e" +checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba" dependencies = [ "concurrent-queue", "parking", @@ -2540,11 +2859,11 @@ dependencies = [ [[package]] name = "event-listener-strategy" -version = "0.4.0" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" +checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" dependencies = [ - "event-listener 4.0.3", + "event-listener 5.3.1", "pin-project-lite", ] @@ -2552,12 +2871,11 @@ dependencies = [ name = "execution_engine_integration" version = "0.1.0" dependencies = [ + "async-channel", "deposit_contract", - "environment", "ethers-core", "ethers-providers", "execution_layer", - "exit-future", "fork_choice", "futures", "hex", @@ -2576,8 +2894,10 @@ dependencies = [ name = "execution_layer" version = "0.1.0" dependencies = [ + "alloy-consensus", + "alloy-primitives", + "alloy-rlp", "arc-swap", - "async-trait", "builder_client", "bytes", "environment", @@ -2586,9 +2906,7 @@ dependencies = [ "ethereum_serde_utils", "ethereum_ssz", "ethers-core", - "exit-future", "fork_choice", - "futures", "hash-db", "hash256-std-hasher", "hex", @@ -2597,8 +2915,9 @@ dependencies = [ "kzg", "lazy_static", "lighthouse_metrics", + "lighthouse_version", "lru", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "pretty_reqwest_error", "rand", "reqwest", @@ -2624,19 +2943,10 @@ dependencies = [ ] [[package]] -name = "exit-future" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e43f2f1833d64e33f15592464d6fdd70f349dda7b1a53088eb83cd94014008c5" -dependencies = [ - "futures", -] - -[[package]] name = "eyre" -version = "0.6.11" +version = "0.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6267a1fa6f59179ea4afc8e50fd8612a3cc60bc858f786ff877a4a8cb042799" +checksum = "7cd915d99f24784cdc19fd37ef22b97e3ff0ae756c7e492e9fbfe897d61e2aec" dependencies = [ "indenter", "once_cell", @@ -2656,9 +2966,30 @@ checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a" [[package]] name = "fastrand" -version = "2.0.1" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" + +[[package]] +name = "fastrlp" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" +checksum = "139834ddba373bbdd213dffe02c8d110508dcf1726c2be27e8d1f7d7e1856418" +dependencies = [ + "arrayvec", + "auto_impl", + "bytes", +] + +[[package]] +name = "fdlimit" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e182f7dbc2ef73d9ef67351c5fbbea084729c48362d3ce9dd44c28e32e277fe5" +dependencies = [ + "libc", + "thiserror", +] [[package]] name = "ff" @@ -2688,9 +3019,9 @@ checksum = "ec54ac60a7f2ee9a97cad9946f9bf629a3bc6a7ae59e68983dc9318f5a54b81a" [[package]] name = "fiat-crypto" -version = "0.2.5" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27573eac26f4dd11e2b1916c3fe1baa56407c83c71a773a8ba17ec0bca03b6b7" +checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d" [[package]] name = "field-offset" @@ -2699,7 +3030,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f" dependencies = [ "memoffset", - "rustc_version", + "rustc_version 0.4.0", ] [[package]] @@ -2711,12 +3042,6 @@ dependencies = [ ] [[package]] -name = "finl_unicode" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fcfdc7a0362c9f4444381a9e697c79d435fe65b52a37466fc2c1184cee9edc6" - -[[package]] name = "fixed-hash" version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2743,9 +3068,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.28" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" dependencies = [ "crc32fast", "libz-sys", @@ -2836,8 +3161,9 @@ dependencies = [ [[package]] name = "futures-bounded" -version = "0.2.3" -source = "git+https://github.com/sigp/rust-libp2p/?rev=cfa3275ca17e502799ed56e555b6c0611752e369#cfa3275ca17e502799ed56e555b6c0611752e369" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91f328e7fb845fc832912fb6a34f40cf6d1888c92f974d1893a54e97b5ff542e" dependencies = [ "futures-timer", "futures-util", @@ -2879,9 +3205,9 @@ checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" [[package]] name = "futures-lite" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445ba825b27408685aaecefd65178908c36c6e96aaf6d8599419d46e624192ba" +checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" dependencies = [ "futures-core", "pin-project-lite", @@ -2895,17 +3221,18 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.72", ] [[package]] name = "futures-rustls" -version = "0.24.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35bd3cf68c183738046838e300353e4716c674dc5e56890de4826801a6622a28" +checksum = "a8f2f12607f92c69b12ed746fabf9ca4f5c482cba46679c1a75b874ed7c26adb" dependencies = [ "futures-io", - "rustls 0.21.10", + "rustls 0.23.12", + "rustls-pki-types", ] [[package]] @@ -2933,9 +3260,9 @@ dependencies = [ [[package]] name = "futures-timer" -version = "3.0.2" +version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" +checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24" [[package]] name = "futures-util" @@ -2998,9 +3325,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.12" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "js-sys", @@ -3021,19 +3348,19 @@ dependencies = [ [[package]] name = "ghash" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d930750de5717d2dd0b8c0d42c076c0e884c81a73e6cab859bbd2339c71e3e40" +checksum = "f0d8a4362ccb29cb0b265253fb0a2728f592895ee6854fd9bc13f2ffda266ff1" dependencies = [ "opaque-debug", - "polyval 0.6.1", + "polyval 0.6.2", ] [[package]] name = "gimli" -version = "0.28.1" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" +checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" [[package]] name = "git-version" @@ -3052,7 +3379,7 @@ checksum = "53010ccb100b96a67bc32c0175f0ed1426b31b655d562898e57325f81c023ac0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.72", ] [[package]] @@ -3062,6 +3389,37 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] +name = "gossipsub" +version = "0.5.0" +dependencies = [ + "async-channel", + "asynchronous-codec 0.7.0", + "base64 0.21.7", + "byteorder", + "bytes", + "either", + "fnv", + "futures", + "futures-ticker", + "futures-timer", + "getrandom", + "hashlink 0.9.1", + "hex_fmt", + "libp2p", + "prometheus-client", + "quick-protobuf", + "quick-protobuf-codec 0.3.1", + "quickcheck", + "rand", + "regex", + "serde", + "sha2 0.10.8", + "tracing", + "void", + "web-time", +] + +[[package]] name = "group" version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3085,49 +3443,34 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.24" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9" +checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" dependencies = [ "bytes", "fnv", "futures-core", "futures-sink", "futures-util", - "http 0.2.11", - "indexmap 2.1.0", + "http 0.2.12", + "indexmap 2.2.6", "slab", "tokio", - "tokio-util 0.7.10", + "tokio-util", "tracing", ] [[package]] -name = "h2" -version = "0.4.2" +name = "half" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31d030e59af851932b72ceebadf4a2b5986dba4c3b99dd2493f8273a0f151943" +checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888" dependencies = [ - "bytes", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http 1.0.0", - "indexmap 2.1.0", - "slab", - "tokio", - "tokio-util 0.7.10", - "tracing", + "cfg-if", + "crunchy", ] [[package]] -name = "half" -version = "1.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" - -[[package]] name = "hash-db" version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3150,9 +3493,9 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" [[package]] name = "hashbrown" -version = "0.14.3" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" dependencies = [ "ahash", "allocator-api2", @@ -3173,7 +3516,16 @@ version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" dependencies = [ - "hashbrown 0.14.3", + "hashbrown 0.14.5", +] + +[[package]] +name = "hashlink" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ba4ff7128dee98c7dc9794b6a411377e1404dba1c97deb8d1a55297bd25d8af" +dependencies = [ + "hashbrown 0.14.5", ] [[package]] @@ -3185,7 +3537,7 @@ dependencies = [ "base64 0.21.7", "bytes", "headers-core", - "http 0.2.11", + "http 0.2.12", "httpdate", "mime", "sha1", @@ -3197,7 +3549,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429" dependencies = [ - "http 0.2.11", + "http 0.2.12", ] [[package]] @@ -3207,6 +3559,12 @@ 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.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3217,9 +3575,15 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.3.4" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" + +[[package]] +name = "hermit-abi" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d3d0e0f38255e7fa3cf31335b3a56f05febd18025f4db5ef7a0cfb4f8da651f" +checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" [[package]] name = "hex" @@ -3228,6 +3592,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] +name = "hex-literal" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" + +[[package]] name = "hex_fmt" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3235,9 +3605,9 @@ checksum = "b07f60793ff0a4d9cef0f18e63b5357e06209987153a64648c972c1e5aff336f" [[package]] name = "hickory-proto" -version = "0.24.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "091a6fbccf4860009355e3efc52ff4acf37a63489aad7435372d44ceeb6fbbcf" +checksum = "07698b8420e2f0d6447a436ba999ec85d8fbf2a398bbd737b82cac4a2e96e512" dependencies = [ "async-trait", "cfg-if", @@ -3250,7 +3620,7 @@ dependencies = [ "ipnet", "once_cell", "rand", - "socket2 0.5.5", + "socket2 0.5.7", "thiserror", "tinyvec", "tokio", @@ -3260,9 +3630,9 @@ dependencies = [ [[package]] name = "hickory-resolver" -version = "0.24.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35b8f021164e6a984c9030023544c57789c51760065cd510572fedcfb04164e8" +checksum = "28757f23aa75c98f254cf0405e6d8c25b831b32921b050a66692427679b1f243" dependencies = [ "cfg-if", "futures-util", @@ -3270,7 +3640,7 @@ dependencies = [ "ipconfig", "lru-cache", "once_cell", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "rand", "resolv-conf", "smallvec", @@ -3329,15 +3699,6 @@ dependencies = [ ] [[package]] -name = "home" -version = "0.5.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" -dependencies = [ - "windows-sys 0.52.0", -] - -[[package]] name = "hostname" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3350,9 +3711,9 @@ dependencies = [ [[package]] name = "http" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" +checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" dependencies = [ "bytes", "fnv", @@ -3361,9 +3722,9 @@ dependencies = [ [[package]] name = "http" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b32afd38673a8016f7c9ae69e5af41a58f81b1d31689040f2f1959594ce194ea" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" dependencies = [ "bytes", "fnv", @@ -3377,30 +3738,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" dependencies = [ "bytes", - "http 0.2.11", + "http 0.2.12", "pin-project-lite", ] [[package]] name = "http-body" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" +checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" dependencies = [ "bytes", - "http 1.0.0", + "http 1.1.0", ] [[package]] name = "http-body-util" -version = "0.1.0" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41cb79eb393015dadd30fc252023adb0b2400a0caee0fa2a077e6e21a551e840" +checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" dependencies = [ "bytes", "futures-util", - "http 1.0.0", - "http-body 1.0.0", + "http 1.1.0", + "http-body 1.0.1", "pin-project-lite", ] @@ -3430,7 +3791,7 @@ dependencies = [ "lru", "network", "operation_pool", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "proto_array", "safe_arith", "sensitive_url", @@ -3474,9 +3835,9 @@ dependencies = [ [[package]] name = "httparse" -version = "1.8.0" +version = "1.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" +checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" [[package]] name = "httpdate" @@ -3492,22 +3853,22 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.28" +version = "0.14.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" +checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9" dependencies = [ "bytes", "futures-channel", "futures-core", "futures-util", - "h2 0.3.24", - "http 0.2.11", + "h2", + "http 0.2.12", "http-body 0.4.6", "httparse", "httpdate", "itoa", "pin-project-lite", - "socket2 0.5.5", + "socket2 0.5.7", "tokio", "tower-service", "tracing", @@ -3516,20 +3877,20 @@ dependencies = [ [[package]] name = "hyper" -version = "1.1.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5aa53871fc917b1a9ed87b683a5d86db645e23acb32c2e0785a353e522fb75" +checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" dependencies = [ "bytes", "futures-channel", "futures-util", - "h2 0.4.2", - "http 1.0.0", - "http-body 1.0.0", + "http 1.1.0", + "http-body 1.0.1", "httparse", "httpdate", "itoa", "pin-project-lite", + "smallvec", "tokio", ] @@ -3540,9 +3901,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ "futures-util", - "http 0.2.11", - "hyper 0.14.28", - "rustls 0.21.10", + "http 0.2.12", + "hyper 0.14.30", + "rustls 0.21.12", "tokio", "tokio-rustls 0.24.1", ] @@ -3554,7 +3915,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" dependencies = [ "bytes", - "hyper 0.14.28", + "hyper 0.14.30", "native-tls", "tokio", "tokio-native-tls", @@ -3562,27 +3923,24 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.2" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdea9aac0dbe5a9240d68cfd9501e2db94222c6dc06843e06640b9e07f0fdc67" +checksum = "3ab92f4f49ee4fb4f997c784b7a2e0fa70050211e0b6a287f898c3c9785ca956" dependencies = [ "bytes", - "futures-channel", "futures-util", - "http 1.0.0", - "http-body 1.0.0", - "hyper 1.1.0", + "http 1.1.0", + "http-body 1.0.1", + "hyper 1.4.1", "pin-project-lite", - "socket2 0.5.5", "tokio", - "tracing", ] [[package]] name = "iana-time-zone" -version = "0.1.59" +version = "0.1.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6a67363e2aa4443928ce15e57ebae94fd8949958fd1223c4cfc0cd473ad7539" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -3629,17 +3987,6 @@ dependencies = [ [[package]] name = "if-addrs" -version = "0.6.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2273e421f7c4f0fc99e1934fe4776f59d8df2972f4199d703fc0da9f2a9f73de" -dependencies = [ - "if-addrs-sys", - "libc", - "winapi", -] - -[[package]] -name = "if-addrs" version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cabb0019d51a643781ff15c9c8a3e5dedc365c47211270f4e8f82812fedd8f0a" @@ -3649,16 +3996,6 @@ dependencies = [ ] [[package]] -name = "if-addrs-sys" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de74b9dd780476e837e5eb5ab7c88b49ed304126e412030a0adba99c8efe79ea" -dependencies = [ - "cc", - "libc", -] - -[[package]] name = "if-watch" version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3668,7 +4005,7 @@ dependencies = [ "core-foundation", "fnv", "futures", - "if-addrs 0.10.2", + "if-addrs", "ipnet", "log", "rtnetlink", @@ -3678,30 +4015,17 @@ dependencies = [ ] [[package]] -name = "igd" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "556b5a75cd4adb7c4ea21c64af1c48cefb2ce7d43dc4352c720a1fe47c21f355" -dependencies = [ - "attohttpc 0.16.3", - "log", - "rand", - "url", - "xmltree", -] - -[[package]] name = "igd-next" version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "064d90fec10d541084e7b39ead8875a5a80d9114a2b18791565253bae25f49e4" dependencies = [ "async-trait", - "attohttpc 0.24.1", + "attohttpc", "bytes", "futures", - "http 0.2.11", - "hyper 0.14.28", + "http 0.2.12", + "hyper 0.14.30", "log", "rand", "tokio", @@ -3724,7 +4048,7 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba6a270039626615617f3f36d15fc827041df3b78c439da2cadfa47455a77f2f" dependencies = [ - "parity-scale-codec 3.6.9", + "parity-scale-codec 3.6.12", ] [[package]] @@ -3783,12 +4107,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.1.0" +version = "2.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", - "hashbrown 0.14.3", + "hashbrown 0.14.5", ] [[package]] @@ -3802,9 +4126,9 @@ dependencies = [ [[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", "js-sys", @@ -3818,7 +4142,7 @@ version = "0.2.0" dependencies = [ "bytes", "hex", - "yaml-rust", + "yaml-rust2", ] [[package]] @@ -3836,7 +4160,7 @@ version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ - "hermit-abi 0.3.4", + "hermit-abi 0.3.9", "libc", "windows-sys 0.48.0", ] @@ -3847,8 +4171,8 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f" dependencies = [ - "socket2 0.5.5", - "widestring 1.0.2", + "socket2 0.5.7", + "widestring 1.1.0", "windows-sys 0.48.0", "winreg", ] @@ -3860,6 +4184,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" [[package]] +name = "is-terminal" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" +dependencies = [ + "hermit-abi 0.3.9", + "libc", + "windows-sys 0.52.0", +] + +[[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.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3869,10 +4210,19 @@ dependencies = [ ] [[package]] +name = "itertools" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +dependencies = [ + "either", +] + +[[package]] name = "itoa" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "jemalloc-ctl" @@ -3907,18 +4257,18 @@ dependencies = [ [[package]] name = "jobserver" -version = "0.1.27" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" +checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" dependencies = [ "libc", ] [[package]] name = "js-sys" -version = "0.3.67" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a1d36f1235bc969acba30b7f5990b864423a6068a10f7c90ae8f0112e3a59d1" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" dependencies = [ "wasm-bindgen", ] @@ -3974,6 +4324,16 @@ dependencies = [ ] [[package]] +name = "keccak-asm" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47a3633291834c4fbebf8673acbc1b04ec9d151418ff9b8e26dcd79129928758" +dependencies = [ + "digest 0.10.7", + "sha3-asm", +] + +[[package]] name = "keccak-hash" version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4001,11 +4361,11 @@ dependencies = [ [[package]] name = "lazy_static" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" dependencies = [ - "spin 0.5.2", + "spin 0.9.8", ] [[package]] @@ -4016,7 +4376,7 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "lcli" -version = "4.6.0" +version = "5.3.0" dependencies = [ "account_utils", "beacon_chain", @@ -4024,25 +4384,20 @@ dependencies = [ "clap", "clap_utils", "deposit_contract", - "directory", "env_logger 0.9.3", "environment", - "eth1_test_rig", "eth2", "eth2_network_config", "eth2_wallet", "ethereum_hashing", "ethereum_ssz", "execution_layer", - "genesis", "hex", - "int_to_bytes", "lighthouse_network", "lighthouse_version", "log", "malloc_utils", "rayon", - "sensitive_url", "serde", "serde_json", "serde_yaml", @@ -4079,38 +4434,42 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.152" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libflate" -version = "1.4.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ff4ae71b685bbad2f2f391fe74f6b7659a34871c08b210fdc039e43bee07d18" +checksum = "45d9dfdc14ea4ef0900c1cddbc8dcd553fbaacd8a4a282cf4018ae9dd04fb21e" dependencies = [ "adler32", + "core2", "crc32fast", + "dary_heap", "libflate_lz77", ] [[package]] name = "libflate_lz77" -version = "1.2.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a52d3a8bfc85f250440e4424db7d857e241a3aebbbe301f3eb606ab15c39acbf" +checksum = "e6e0d73b369f386f1c44abd9c570d5318f55ccde816ff4b562fa452e5182863d" dependencies = [ + "core2", + "hashbrown 0.14.5", "rle-decode-fast", ] [[package]] name = "libloading" -version = "0.8.1" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161" +checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" dependencies = [ "cfg-if", - "windows-sys 0.48.0", + "windows-targets 0.52.6", ] [[package]] @@ -4122,7 +4481,7 @@ checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" [[package]] name = "libmdbx" version = "0.1.4" -source = "git+https://github.com/sigp/libmdbx-rs?tag=v0.1.4#096da80a83d14343f8df833006483f48075cd135" +source = "git+https://github.com/sigp/libmdbx-rs?rev=e6ff4b9377c1619bcf0bfdf52bee5a980a432a1a#e6ff4b9377c1619bcf0bfdf52bee5a980a432a1a" dependencies = [ "bitflags 1.3.2", "byteorder", @@ -4130,14 +4489,15 @@ dependencies = [ "indexmap 1.9.3", "libc", "mdbx-sys", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "thiserror", ] [[package]] name = "libp2p" -version = "0.54.0" -source = "git+https://github.com/sigp/rust-libp2p/?rev=cfa3275ca17e502799ed56e555b6c0611752e369#cfa3275ca17e502799ed56e555b6c0611752e369" +version = "0.53.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "681fb3f183edfbedd7a57d32ebe5dcdc0b9f94061185acf3c30249349cc6fc99" dependencies = [ "bytes", "either", @@ -4149,7 +4509,6 @@ dependencies = [ "libp2p-connection-limits", "libp2p-core", "libp2p-dns", - "libp2p-gossipsub", "libp2p-identify", "libp2p-identity", "libp2p-mdns", @@ -4170,7 +4529,8 @@ dependencies = [ [[package]] name = "libp2p-allow-block-list" version = "0.3.0" -source = "git+https://github.com/sigp/rust-libp2p/?rev=cfa3275ca17e502799ed56e555b6c0611752e369#cfa3275ca17e502799ed56e555b6c0611752e369" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "107b238b794cb83ab53b74ad5dcf7cca3200899b72fe662840cfb52f5b0a32e6" dependencies = [ "libp2p-core", "libp2p-identity", @@ -4181,7 +4541,8 @@ dependencies = [ [[package]] name = "libp2p-connection-limits" version = "0.3.1" -source = "git+https://github.com/sigp/rust-libp2p/?rev=cfa3275ca17e502799ed56e555b6c0611752e369#cfa3275ca17e502799ed56e555b6c0611752e369" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7cd50a78ccfada14de94cbacd3ce4b0138157f376870f13d3a8422cd075b4fd" dependencies = [ "libp2p-core", "libp2p-identity", @@ -4191,20 +4552,20 @@ dependencies = [ [[package]] name = "libp2p-core" -version = "0.41.2" -source = "git+https://github.com/sigp/rust-libp2p/?rev=cfa3275ca17e502799ed56e555b6c0611752e369#cfa3275ca17e502799ed56e555b6c0611752e369" +version = "0.41.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5a8920cbd8540059a01950c1e5c96ea8d89eb50c51cd366fc18bdf540a6e48f" dependencies = [ "either", "fnv", "futures", "futures-timer", - "instant", "libp2p-identity", "multiaddr", "multihash", "multistream-select", "once_cell", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "pin-project", "quick-protobuf", "rand", @@ -4214,61 +4575,32 @@ dependencies = [ "tracing", "unsigned-varint 0.8.0", "void", + "web-time", ] [[package]] name = "libp2p-dns" version = "0.41.1" -source = "git+https://github.com/sigp/rust-libp2p/?rev=cfa3275ca17e502799ed56e555b6c0611752e369#cfa3275ca17e502799ed56e555b6c0611752e369" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d17cbcf7160ff35c3e8e560de4a068fe9d6cb777ea72840e48eb76ff9576c4b6" dependencies = [ "async-trait", "futures", "hickory-resolver", "libp2p-core", "libp2p-identity", - "parking_lot 0.12.1", - "smallvec", - "tracing", -] - -[[package]] -name = "libp2p-gossipsub" -version = "0.46.1" -source = "git+https://github.com/sigp/rust-libp2p/?rev=cfa3275ca17e502799ed56e555b6c0611752e369#cfa3275ca17e502799ed56e555b6c0611752e369" -dependencies = [ - "async-channel", - "asynchronous-codec", - "base64 0.21.7", - "byteorder", - "bytes", - "either", - "fnv", - "futures", - "futures-ticker", - "futures-timer", - "getrandom", - "hex_fmt", - "instant", - "libp2p-core", - "libp2p-identity", - "libp2p-swarm", - "prometheus-client", - "quick-protobuf", - "quick-protobuf-codec", - "rand", - "regex", - "sha2 0.10.8", + "parking_lot 0.12.3", "smallvec", "tracing", - "void", ] [[package]] name = "libp2p-identify" -version = "0.44.1" -source = "git+https://github.com/sigp/rust-libp2p/?rev=cfa3275ca17e502799ed56e555b6c0611752e369#cfa3275ca17e502799ed56e555b6c0611752e369" +version = "0.44.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5d635ebea5ca0c3c3e77d414ae9b67eccf2a822be06091b9c1a0d13029a1e2f" dependencies = [ - "asynchronous-codec", + "asynchronous-codec 0.7.0", "either", "futures", "futures-bounded", @@ -4278,7 +4610,7 @@ dependencies = [ "libp2p-swarm", "lru", "quick-protobuf", - "quick-protobuf-codec", + "quick-protobuf-codec 0.3.1", "smallvec", "thiserror", "tracing", @@ -4287,12 +4619,12 @@ dependencies = [ [[package]] name = "libp2p-identity" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "999ec70441b2fb35355076726a6bc466c932e9bdc66f6a11c6c0aa17c7ab9be0" +checksum = "55cca1eb2bc1fd29f099f3daaab7effd01e1a54b7c577d0ed082521034d912e8" dependencies = [ "asn1_der", - "bs58 0.5.0", + "bs58 0.5.1", "ed25519-dalek", "hkdf", "libsecp256k1", @@ -4311,7 +4643,8 @@ dependencies = [ [[package]] name = "libp2p-mdns" version = "0.45.1" -source = "git+https://github.com/sigp/rust-libp2p/?rev=cfa3275ca17e502799ed56e555b6c0611752e369#cfa3275ca17e502799ed56e555b6c0611752e369" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49007d9a339b3e1d7eeebc4d67c05dbf23d300b7d091193ec2d3f26802d7faf2" dependencies = [ "data-encoding", "futures", @@ -4322,7 +4655,7 @@ dependencies = [ "libp2p-swarm", "rand", "smallvec", - "socket2 0.5.5", + "socket2 0.5.7", "tokio", "tracing", "void", @@ -4331,12 +4664,12 @@ dependencies = [ [[package]] name = "libp2p-metrics" version = "0.14.1" -source = "git+https://github.com/sigp/rust-libp2p/?rev=cfa3275ca17e502799ed56e555b6c0611752e369#cfa3275ca17e502799ed56e555b6c0611752e369" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdac91ae4f291046a3b2660c039a2830c931f84df2ee227989af92f7692d3357" dependencies = [ "futures", "instant", "libp2p-core", - "libp2p-gossipsub", "libp2p-identify", "libp2p-identity", "libp2p-swarm", @@ -4347,27 +4680,29 @@ dependencies = [ [[package]] name = "libp2p-mplex" version = "0.41.0" -source = "git+https://github.com/sigp/rust-libp2p/?rev=cfa3275ca17e502799ed56e555b6c0611752e369#cfa3275ca17e502799ed56e555b6c0611752e369" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5e895765e27e30217b25f7cb7ac4686dad1ff80bf2fdeffd1d898566900a924" dependencies = [ - "asynchronous-codec", + "asynchronous-codec 0.6.2", "bytes", "futures", "libp2p-core", "libp2p-identity", "nohash-hasher", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "rand", "smallvec", "tracing", - "unsigned-varint 0.8.0", + "unsigned-varint 0.7.2", ] [[package]] name = "libp2p-noise" version = "0.44.0" -source = "git+https://github.com/sigp/rust-libp2p/?rev=cfa3275ca17e502799ed56e555b6c0611752e369#cfa3275ca17e502799ed56e555b6c0611752e369" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecd0545ce077f6ea5434bcb76e8d0fe942693b4380aaad0d34a358c2bd05793" dependencies = [ - "asynchronous-codec", + "asynchronous-codec 0.7.0", "bytes", "curve25519-dalek", "futures", @@ -4390,22 +4725,24 @@ dependencies = [ [[package]] name = "libp2p-plaintext" version = "0.41.0" -source = "git+https://github.com/sigp/rust-libp2p/?rev=cfa3275ca17e502799ed56e555b6c0611752e369#cfa3275ca17e502799ed56e555b6c0611752e369" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67330af40b67217e746d42551913cfb7ad04c74fa300fb329660a56318590b3f" dependencies = [ - "asynchronous-codec", + "asynchronous-codec 0.6.2", "bytes", "futures", "libp2p-core", "libp2p-identity", "quick-protobuf", - "quick-protobuf-codec", + "quick-protobuf-codec 0.2.0", "tracing", ] [[package]] name = "libp2p-quic" -version = "0.10.2" -source = "git+https://github.com/sigp/rust-libp2p/?rev=cfa3275ca17e502799ed56e555b6c0611752e369#cfa3275ca17e502799ed56e555b6c0611752e369" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c67296ad4e092e23f92aea3d2bdb6f24eab79c0929ed816dfb460ea2f4567d2b" dependencies = [ "bytes", "futures", @@ -4414,12 +4751,12 @@ dependencies = [ "libp2p-core", "libp2p-identity", "libp2p-tls", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "quinn", "rand", - "ring 0.16.20", - "rustls 0.21.10", - "socket2 0.5.5", + "ring 0.17.8", + "rustls 0.23.12", + "socket2 0.5.7", "thiserror", "tokio", "tracing", @@ -4427,8 +4764,9 @@ dependencies = [ [[package]] name = "libp2p-swarm" -version = "0.45.0" -source = "git+https://github.com/sigp/rust-libp2p/?rev=cfa3275ca17e502799ed56e555b6c0611752e369#cfa3275ca17e502799ed56e555b6c0611752e369" +version = "0.44.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80cae6cb75f89dbca53862f9ebe0b9f463aa7b302762fcfaafb9e51dcc9b0f7e" dependencies = [ "either", "fnv", @@ -4438,6 +4776,7 @@ dependencies = [ "libp2p-core", "libp2p-identity", "libp2p-swarm-derive", + "lru", "multistream-select", "once_cell", "rand", @@ -4449,19 +4788,21 @@ dependencies = [ [[package]] name = "libp2p-swarm-derive" -version = "0.34.1" -source = "git+https://github.com/sigp/rust-libp2p/?rev=cfa3275ca17e502799ed56e555b6c0611752e369#cfa3275ca17e502799ed56e555b6c0611752e369" +version = "0.34.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5daceb9dd908417b6dfcfe8e94098bc4aac54500c282e78120b885dadc09b999" dependencies = [ - "heck", + "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.72", ] [[package]] name = "libp2p-tcp" version = "0.41.0" -source = "git+https://github.com/sigp/rust-libp2p/?rev=cfa3275ca17e502799ed56e555b6c0611752e369#cfa3275ca17e502799ed56e555b6c0611752e369" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b2460fc2748919adff99ecbc1aab296e4579e41f374fb164149bd2c9e529d4c" dependencies = [ "futures", "futures-timer", @@ -4469,23 +4810,24 @@ dependencies = [ "libc", "libp2p-core", "libp2p-identity", - "socket2 0.5.5", + "socket2 0.5.7", "tokio", "tracing", ] [[package]] name = "libp2p-tls" -version = "0.3.0" -source = "git+https://github.com/sigp/rust-libp2p/?rev=cfa3275ca17e502799ed56e555b6c0611752e369#cfa3275ca17e502799ed56e555b6c0611752e369" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b7b831e55ce2aa6c354e6861a85fdd4dd0a2b97d5e276fabac0e4810a71776" dependencies = [ "futures", "futures-rustls", "libp2p-core", "libp2p-identity", "rcgen", - "ring 0.16.20", - "rustls 0.21.10", + "ring 0.17.8", + "rustls 0.23.12", "rustls-webpki 0.101.7", "thiserror", "x509-parser", @@ -4494,8 +4836,9 @@ dependencies = [ [[package]] name = "libp2p-upnp" -version = "0.2.0" -source = "git+https://github.com/sigp/rust-libp2p/?rev=cfa3275ca17e502799ed56e555b6c0611752e369#cfa3275ca17e502799ed56e555b6c0611752e369" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cccf04b0e3ff3de52d07d5fd6c3b061d0e7f908ffc683c32d9638caedce86fc8" dependencies = [ "futures", "futures-timer", @@ -4510,7 +4853,8 @@ dependencies = [ [[package]] name = "libp2p-yamux" version = "0.45.1" -source = "git+https://github.com/sigp/rust-libp2p/?rev=cfa3275ca17e502799ed56e555b6c0611752e369#cfa3275ca17e502799ed56e555b6c0611752e369" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "200cbe50349a44760927d50b431d77bed79b9c0a3959de1af8d24a63434b71e5" dependencies = [ "either", "futures", @@ -4518,18 +4862,17 @@ dependencies = [ "thiserror", "tracing", "yamux 0.12.1", - "yamux 0.13.1", + "yamux 0.13.3", ] [[package]] name = "libredox" -version = "0.0.1" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.6.0", "libc", - "redox_syscall 0.4.1", ] [[package]] @@ -4586,15 +4929,16 @@ version = "0.25.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "29f835d03d717946d28b1d1ed632eb6f0e24a299388ee623d0c23118d3e8a7fa" dependencies = [ + "cc", "pkg-config", "vcpkg", ] [[package]] name = "libz-sys" -version = "1.1.14" +version = "1.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "295c17e837573c8c821dbaeb3cceb3d745ad082f7572191409e69cbc1b3fd050" +checksum = "c15da26e5af7e25c90b37a2d75cdbf940cf4a55316de9d84c679c9b8bfabf82e" dependencies = [ "cc", "pkg-config", @@ -4603,7 +4947,7 @@ dependencies = [ [[package]] name = "lighthouse" -version = "4.6.0" +version = "5.3.0" dependencies = [ "account_manager", "account_utils", @@ -4634,10 +4978,8 @@ dependencies = [ "slasher", "slashing_protection", "slog", - "sloggers", "task_executor", "tempfile", - "tracing-subscriber", "types", "unused_port", "validator_client", @@ -4649,7 +4991,6 @@ dependencies = [ name = "lighthouse_metrics" version = "0.2.0" dependencies = [ - "lazy_static", "prometheus", ] @@ -4657,25 +4998,30 @@ dependencies = [ name = "lighthouse_network" version = "0.2.0" dependencies = [ + "async-channel", + "bytes", "delay_map", "directory", "dirs", "discv5", + "either", "error-chain", "ethereum_ssz", "ethereum_ssz_derive", - "exit-future", "fnv", "futures", + "gossipsub", "hex", + "itertools 0.10.5", "lazy_static", "libp2p", "libp2p-mplex", "lighthouse_metrics", "lighthouse_version", + "logging", "lru", "lru_cache", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "prometheus-client", "quickcheck", "quickcheck_macros", @@ -4696,11 +5042,9 @@ dependencies = [ "tiny-keccak", "tokio", "tokio-io-timeout", - "tokio-util 0.6.10", - "tree_hash", - "tree_hash_derive", + "tokio-util", "types", - "unsigned-varint 0.6.0", + "unsigned-varint 0.8.0", "unused_port", "void", ] @@ -4728,9 +5072,9 @@ checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" [[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 = "lmdb-rkv" @@ -4755,9 +5099,9 @@ dependencies = [ [[package]] name = "lock_api" -version = "0.4.11" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" dependencies = [ "autocfg", "scopeguard", @@ -4773,9 +5117,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.20" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "logging" @@ -4784,11 +5128,10 @@ dependencies = [ "chrono", "lazy_static", "lighthouse_metrics", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "serde", "serde_json", "slog", - "slog-async", "slog-term", "sloggers", "take_mut", @@ -4802,11 +5145,11 @@ dependencies = [ [[package]] name = "lru" -version = "0.12.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2994eeba8ed550fd9b47a0b38f0242bc3344e496483c6180b69139cc2fa5d1d7" +checksum = "d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc" dependencies = [ - "hashbrown 0.14.3", + "hashbrown 0.14.5", ] [[package]] @@ -4844,7 +5187,7 @@ dependencies = [ "lazy_static", "libc", "lighthouse_metrics", - "parking_lot 0.12.1", + "parking_lot 0.12.3", ] [[package]] @@ -4893,9 +5236,9 @@ dependencies = [ [[package]] name = "mdbx-sys" version = "0.11.6-4" -source = "git+https://github.com/sigp/libmdbx-rs?tag=v0.1.4#096da80a83d14343f8df833006483f48075cd135" +source = "git+https://github.com/sigp/libmdbx-rs?rev=e6ff4b9377c1619bcf0bfdf52bee5a980a432a1a#e6ff4b9377c1619bcf0bfdf52bee5a980a432a1a" dependencies = [ - "bindgen 0.59.2", + "bindgen", "cc", "cmake", "libc", @@ -4903,21 +5246,21 @@ dependencies = [ [[package]] name = "mediatype" -version = "0.19.17" +version = "0.19.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83a018c36a54f4e12c30464bbc59311f85d3f6f4d6c1b4fa4ea9db2b174ddefc" +checksum = "8878cd8d1b3c8c8ae4b2ba0a36652b7cf192f618a599a7fbdfa25cffd4ea72dd" [[package]] name = "memchr" -version = "2.7.1" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "memoffset" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" dependencies = [ "autocfg", ] @@ -4936,21 +5279,21 @@ dependencies = [ [[package]] name = "metastruct" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccfbb8826226b09b05bb62a0937cf6abb16f1f7d4b746eb95a83db14aec60f06" +checksum = "f00a5ba4a0f3453c31c397b214e1675d95b697c33763aa58add57ea833424384" dependencies = [ "metastruct_macro", ] [[package]] name = "metastruct_macro" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37cb4045d5677b7da537f8cb5d0730d5b6414e3cc81c61e4b50e1f0cbdc73909" +checksum = "7c3a991d4536c933306e52f0e8ab303757185ec13a09d1f3e1cbde5a0d8410bf" dependencies = [ - "darling", - "itertools", + "darling 0.13.4", + "itertools 0.10.5", "proc-macro2", "quote", "smallvec", @@ -4959,19 +5302,19 @@ dependencies = [ [[package]] name = "migrations_internals" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f23f71580015254b020e856feac3df5878c2c7a8812297edd6c0a485ac9dada" +checksum = "fd01039851e82f8799046eabbb354056283fb265c8ec0996af940f4e85a380ff" dependencies = [ "serde", - "toml 0.7.8", + "toml 0.8.15", ] [[package]] name = "migrations_macros" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cce3325ac70e67bbab5bd837a31cae01f1a6db64e0e744a33cb03a543469ef08" +checksum = "ffb161cc72176cb37aa47f1fc520d3ef02263d67d661f44f05d05a079e1237fd" dependencies = [ "migrations_internals", "proc-macro2", @@ -4979,15 +5322,26 @@ dependencies = [ ] [[package]] -name = "milagro_bls" -version = "1.5.1" -source = "git+https://github.com/sigp/milagro_bls?tag=v1.5.1#d3fc0a40cfe8b72ccda46ba050ee6786a59ce753" +name = "milhouse" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3826d3602a3674b07e080ce1982350e454ec253d73f156bd927ac1b652293f4d" dependencies = [ - "amcl", - "hex", - "lazy_static", - "rand", - "zeroize", + "arbitrary", + "derivative", + "ethereum-types 0.14.1", + "ethereum_hashing", + "ethereum_ssz", + "ethereum_ssz_derive", + "itertools 0.10.5", + "parking_lot 0.12.3", + "rayon", + "serde", + "smallvec", + "tree_hash", + "triomphe", + "typenum", + "vec_map", ] [[package]] @@ -4998,9 +5352,9 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] name = "mime_guess" -version = "2.0.4" +version = "2.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" +checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e" dependencies = [ "mime", "unicase", @@ -5014,29 +5368,30 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.7.1" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" dependencies = [ "adler", ] [[package]] name = "mio" -version = "0.8.10" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" +checksum = "4569e456d394deccd22ce1c1913e6ea0e54519f577285001215d33557431afe4" dependencies = [ + "hermit-abi 0.3.9", "libc", "wasi", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "mock_instant" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c1a54de846c4006b88b1516731cc1f6026eb5dc4bcb186aa071ef66d40524ec" +checksum = "9366861eb2a2c436c20b12c8dbec5f798cea6b47ad99216be0282942e2c81ea0" [[package]] name = "monitoring_api" @@ -5106,23 +5461,23 @@ dependencies = [ [[package]] name = "multistream-select" version = "0.13.0" -source = "git+https://github.com/sigp/rust-libp2p/?rev=cfa3275ca17e502799ed56e555b6c0611752e369#cfa3275ca17e502799ed56e555b6c0611752e369" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea0df8e5eec2298a62b326ee4f0d7fe1a6b90a09dfcf9df37b38f947a8c42f19" dependencies = [ "bytes", "futures", + "log", "pin-project", "smallvec", - "tracing", - "unsigned-varint 0.8.0", + "unsigned-varint 0.7.2", ] [[package]] name = "native-tls" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" +checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466" dependencies = [ - "lazy_static", "libc", "log", "openssl", @@ -5189,9 +5544,9 @@ dependencies = [ [[package]] name = "netlink-sys" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6471bf08e7ac0135876a9581bf3217ef0333c191c128d34878079f42ee150411" +checksum = "416060d346fbaf1f23f9512963e3e878f1a78e707cb699ba9215761754244307" dependencies = [ "bytes", "futures", @@ -5204,34 +5559,31 @@ dependencies = [ name = "network" version = "0.2.0" dependencies = [ + "anyhow", + "async-channel", "beacon_chain", "beacon_processor", "delay_map", "derivative", - "environment", "error-chain", "eth2", - "ethereum-types 0.14.1", "ethereum_ssz", "execution_layer", - "exit-future", "fnv", "futures", "genesis", + "gossipsub", "hex", - "if-addrs 0.6.7", - "igd", - "itertools", + "igd-next", + "itertools 0.10.5", "lazy_static", "lighthouse_metrics", "lighthouse_network", "logging", - "lru", "lru_cache", "matches", - "num_cpus", "operation_pool", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "rand", "rlp", "slog", @@ -5246,7 +5598,6 @@ dependencies = [ "task_executor", "tokio", "tokio-stream", - "tokio-util 0.6.10", "types", ] @@ -5263,12 +5614,13 @@ dependencies = [ [[package]] name = "nix" -version = "0.27.1" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" +checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.6.0", "cfg-if", + "cfg_aliases", "libc", ] @@ -5325,11 +5677,10 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.4.4" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" dependencies = [ - "autocfg", "num-integer", "num-traits", ] @@ -5353,20 +5704,25 @@ dependencies = [ ] [[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + +[[package]] name = "num-integer" -version = "0.1.45" +version = "0.1.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" dependencies = [ - "autocfg", "num-traits", ] [[package]] name = "num-iter" -version = "0.1.43" +version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" +checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" dependencies = [ "autocfg", "num-integer", @@ -5375,11 +5731,12 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.17" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", + "libm", ] [[package]] @@ -5388,33 +5745,24 @@ version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.3.4", - "libc", -] - -[[package]] -name = "num_threads" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" -dependencies = [ + "hermit-abi 0.3.9", "libc", ] [[package]] name = "object" -version = "0.32.2" +version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +checksum = "081b846d1d56ddfc18fdf1a922e4f6e07a11768ea1b92dec44e42b72712ccfce" dependencies = [ "memchr", ] [[package]] name = "oid-registry" -version = "0.6.1" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bedf36ffb6ba96c2eb7144ef6270557b52e54b20c0a8e1eb2ff99a6c6959bff" +checksum = "1c958dd45046245b9c3c2547369bb634eb461670b2e7e0de552905801a648d1d" dependencies = [ "asn1-rs", ] @@ -5429,20 +5777,20 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" name = "oneshot_broadcast" version = "0.1.0" dependencies = [ - "parking_lot 0.12.1", + "parking_lot 0.12.3", ] [[package]] name = "oorandom" -version = "11.1.3" +version = "11.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" +checksum = "b410bbe7e14ab526a0e86877eb47c6996a2bd7746f027ba551028c925390e4e9" [[package]] name = "opaque-debug" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" +checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" [[package]] name = "open-fastrlp" @@ -5471,11 +5819,11 @@ dependencies = [ [[package]] name = "openssl" -version = "0.10.63" +version = "0.10.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15c9d69dd87a29568d4d017cfe8ec518706046a05184e5aea92d0af890b803c8" +checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.6.0", "cfg-if", "foreign-types", "libc", @@ -5492,7 +5840,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.72", ] [[package]] @@ -5503,18 +5851,18 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-src" -version = "300.2.1+3.2.0" +version = "300.3.1+3.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fe476c29791a5ca0d1273c697e96085bbabbbea2ef7afd5617e78a4b40332d3" +checksum = "7259953d42a81bf137fbbd73bd30a8e1914d6dce43c2b90ed575783a22608b91" dependencies = [ "cc", ] [[package]] name = "openssl-sys" -version = "0.9.99" +version = "0.9.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22e1bf214306098e4832460f797824c05d25aacdf896f64a985fb0fd992454ae" +checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" dependencies = [ "cc", "libc", @@ -5532,11 +5880,11 @@ dependencies = [ "derivative", "ethereum_ssz", "ethereum_ssz_derive", - "itertools", + "itertools 0.10.5", "lazy_static", "lighthouse_metrics", "maplit", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "rand", "rayon", "serde", @@ -5580,15 +5928,15 @@ dependencies = [ [[package]] name = "parity-scale-codec" -version = "3.6.9" +version = "3.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "881331e34fa842a2fb61cc2db9643a8fedc615e47cfcc52597d1af0db9a7e8fe" +checksum = "306800abfa29c7f16596b5970a588435e3d5b3149683d00c12b699cc19f895ee" dependencies = [ "arrayvec", "bitvec 1.0.1", "byte-slice-cast", "impl-trait-for-tuples", - "parity-scale-codec-derive 3.6.9", + "parity-scale-codec-derive 3.6.12", "serde", ] @@ -5606,11 +5954,11 @@ dependencies = [ [[package]] name = "parity-scale-codec-derive" -version = "3.6.9" +version = "3.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be30eaf4b0a9fba5336683b38de57bb86d179a35862ba6bfcf57625d006bde5b" +checksum = "d830939c76d294956402033aee57a6da7b438f2294eb94864c37b0569053a42c" dependencies = [ - "proc-macro-crate 2.0.0", + "proc-macro-crate 3.1.0", "proc-macro2", "quote", "syn 1.0.109", @@ -5635,12 +5983,12 @@ dependencies = [ [[package]] name = "parking_lot" -version = "0.12.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ "lock_api", - "parking_lot_core 0.9.9", + "parking_lot_core 0.9.10", ] [[package]] @@ -5659,15 +6007,15 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.9" +version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.4.1", + "redox_syscall 0.5.3", "smallvec", - "windows-targets 0.48.5", + "windows-targets 0.52.6", ] [[package]] @@ -5683,9 +6031,9 @@ dependencies = [ [[package]] name = "paste" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "pbkdf2" @@ -5709,12 +6057,6 @@ dependencies = [ ] [[package]] -name = "peeking_take_while" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" - -[[package]] name = "pem" version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5725,11 +6067,11 @@ dependencies = [ [[package]] name = "pem" -version = "3.0.3" +version = "3.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b8fcc794035347fb64beda2d3b462595dd2753e3f268d89c5aae77e8cf2c310" +checksum = "8e459365e590736a54c3fa561947c84837534b8e9af6fc5bf781307e82658fae" dependencies = [ - "base64 0.21.7", + "base64 0.22.1", "serde", ] @@ -5749,13 +6091,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] +name = "pest" +version = "2.7.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd53dff83f26735fdc1ca837098ccf133605d794cdae66acfc2bfac3ec809d95" +dependencies = [ + "memchr", + "thiserror", + "ucd-trie", +] + +[[package]] name = "pharos" version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e9567389417feee6ce15dd6527a8a1ecac205ef62c2932bcf3d9f6fc5b78b414" dependencies = [ "futures", - "rustc_version", + "rustc_version 0.4.0", ] [[package]] @@ -5778,29 +6131,29 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.1.3" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" +checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.3" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" +checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.72", ] [[package]] name = "pin-project-lite" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" [[package]] name = "pin-utils" @@ -5824,15 +6177,15 @@ version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" dependencies = [ - "der 0.7.8", + "der 0.7.9", "spki 0.7.3", ] [[package]] name = "pkg-config" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2900ede94e305130c13ddd391e0ab7cbaeb783945ae07a279c268cb05109c6cb" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] name = "platforms" @@ -5841,16 +6194,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8d0eef3571242013a0d5dc84861c3ae4a652e56e12adf8bdc26ff5f8cb34c94" [[package]] -name = "platforms" -version = "3.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "626dec3cac7cc0e1577a2ec3fc496277ec2baa084bebad95bb6fdbfae235f84c" - -[[package]] name = "plotters" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2c224ba00d7cadd4d5c660deaf2098e5e80e07846537c51f9cfa4be50c1fd45" +checksum = "a15b6eccb8484002195a3e44fe65a4ce8e93a625797a063735536fd59cb01cf3" dependencies = [ "num-traits", "plotters-backend", @@ -5861,29 +6208,30 @@ dependencies = [ [[package]] name = "plotters-backend" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e76628b4d3a7581389a35d5b6e2139607ad7c75b17aed325f210aa91f4a9609" +checksum = "414cec62c6634ae900ea1c56128dfe87cf63e7caece0852ec76aba307cebadb7" [[package]] name = "plotters-svg" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38f6d39893cca0701371e3c27294f09797214b86f1fb951b89ade8ec04e2abab" +checksum = "81b30686a7d9c3e010b84284bdd26a29f2138574f52f5eb6f794fc0ad924e705" dependencies = [ "plotters-backend", ] [[package]] name = "polling" -version = "3.3.2" +version = "3.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "545c980a3880efd47b2e262f6a4bb6daad6555cf3367aa9c4e52895f69537a41" +checksum = "a3ed00ed3fbf728b5816498ecd316d1716eecaced9c0c8d2c5a6740ca214985b" dependencies = [ "cfg-if", "concurrent-queue", + "hermit-abi 0.4.0", "pin-project-lite", - "rustix 0.38.30", + "rustix 0.38.34", "tracing", "windows-sys 0.52.0", ] @@ -5913,9 +6261,9 @@ dependencies = [ [[package]] name = "polyval" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52cff9d1d4dee5fe6d03729099f4a310a41179e0a10dbf542039873f2e826fb" +checksum = "9d1fe60d06143b2430aa532c94cfe9e29783047f06c0d7fd359a9a51b729fa25" dependencies = [ "cfg-if", "cpufeatures", @@ -5925,11 +6273,11 @@ dependencies = [ [[package]] name = "postgres-protocol" -version = "0.6.6" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49b6c5ef183cd3ab4ba005f1ca64c21e8bd97ce4699cfea9e8d9a2c4958ca520" +checksum = "acda0ebdebc28befa84bee35e651e4c5f09073d668c7aed4cf7e23c3cda84b23" dependencies = [ - "base64 0.21.7", + "base64 0.22.1", "byteorder", "bytes", "fallible-iterator", @@ -5943,9 +6291,9 @@ dependencies = [ [[package]] name = "postgres-types" -version = "0.2.6" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d2234cdee9408b523530a9b6d2d6b373d1db34f6a8e51dc03ded1828d7fb67c" +checksum = "02048d9e032fb3cc3413bbf7b83a15d84a5d419778e2628751896d856498eee9" dependencies = [ "bytes", "fallible-iterator", @@ -5966,9 +6314,9 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "pq-sys" -version = "0.4.8" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31c0052426df997c0cbd30789eb44ca097e3541717a7b8fa36b1c464ee7edebd" +checksum = "a24ff9e4cf6945c988f0db7005d87747bf72864965c3529d259ad155ac41d584" dependencies = [ "vcpkg", ] @@ -5982,16 +6330,6 @@ dependencies = [ ] [[package]] -name = "prettyplease" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a41cf62165e97c7f814d2221421dbb9afcbcdb0a88068e5ea206e19951c2cbb5" -dependencies = [ - "proc-macro2", - "syn 2.0.48", -] - -[[package]] name = "primeorder" version = "0.13.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6039,42 +6377,18 @@ dependencies = [ [[package]] name = "proc-macro-crate" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e8366a6159044a37876a2b9817124296703c586a5c92e2c53751fa06d8d43e8" -dependencies = [ - "toml_edit 0.20.7", -] - -[[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" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" dependencies = [ - "proc-macro2", - "quote", - "version_check", + "toml_edit 0.21.1", ] [[package]] name = "proc-macro2" -version = "1.0.78" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] @@ -6096,28 +6410,28 @@ dependencies = [ [[package]] name = "prometheus" -version = "0.13.3" +version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "449811d15fbdf5ceb5c1144416066429cf82316e2ec8ce0c1f6f8a02e7bbcf8c" +checksum = "3d33c28a30771f7f96db69893f78b857f7450d7e0237e9c8fc6427a81bae7ed1" dependencies = [ "cfg-if", "fnv", "lazy_static", "memchr", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "protobuf", "thiserror", ] [[package]] name = "prometheus-client" -version = "0.22.0" +version = "0.22.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "510c4f1c9d81d556458f94c98f857748130ea9737bbd6053da497503b26ea63c" +checksum = "504ee9ff529add891127c4827eb481bd69dc0ebc72e9a682e187db4caa60c3ca" dependencies = [ "dtoa", "itoa", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "prometheus-client-derive-encode", ] @@ -6129,7 +6443,27 @@ checksum = "440f724eba9f6996b75d63681b0a92b06947f1457076d503a4d2e2c8f56442b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.72", +] + +[[package]] +name = "proptest" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4c2511913b88df1637da85cc8d96ec8e43a3f8bb8ccb71ee1ac240d6f3df58d" +dependencies = [ + "bit-set", + "bit-vec", + "bitflags 2.6.0", + "lazy_static", + "num-traits", + "rand", + "rand_chacha", + "rand_xorshift", + "regex-syntax 0.8.4", + "rusty-fork", + "tempfile", + "unarray", ] [[package]] @@ -6165,7 +6499,7 @@ dependencies = [ "nix 0.24.3", "num_cpus", "once_cell", - "platforms 2.0.0", + "platforms", "thiserror", "unescape", ] @@ -6179,18 +6513,31 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" [[package]] name = "quick-protobuf" version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d6da84cc204722a989e01ba2f6e1e276e190f22263d0cb6ce8526fcdb0d2e1f" +source = "git+https://github.com/sigp/quick-protobuf.git?rev=681f413312404ab6e51f0b46f39b0075c6f4ebfd#681f413312404ab6e51f0b46f39b0075c6f4ebfd" dependencies = [ "byteorder", ] [[package]] name = "quick-protobuf-codec" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8ededb1cd78531627244d51dd0c7139fbe736c7d57af0092a76f0ffb2f56e98" +dependencies = [ + "asynchronous-codec 0.6.2", + "bytes", + "quick-protobuf", + "thiserror", + "unsigned-varint 0.7.2", +] + +[[package]] +name = "quick-protobuf-codec" version = "0.3.1" -source = "git+https://github.com/sigp/rust-libp2p/?rev=cfa3275ca17e502799ed56e555b6c0611752e369#cfa3275ca17e502799ed56e555b6c0611752e369" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15a0580ab32b169745d7a39db2ba969226ca16738931be152a3209b409de2474" dependencies = [ - "asynchronous-codec", + "asynchronous-codec 0.7.0", "bytes", "quick-protobuf", "thiserror", @@ -6221,9 +6568,9 @@ dependencies = [ [[package]] name = "quinn" -version = "0.10.2" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cc2c5017e4b43d5995dcea317bc46c1e09404c0a9664d2908f7f02dfe943d75" +checksum = "e4ceeeeabace7857413798eb1ffa1e9c905a9946a57d81fb69b4b71c4d8eb3ad" dependencies = [ "bytes", "futures-io", @@ -6231,7 +6578,7 @@ dependencies = [ "quinn-proto", "quinn-udp", "rustc-hash", - "rustls 0.21.10", + "rustls 0.23.12", "thiserror", "tokio", "tracing", @@ -6239,15 +6586,15 @@ dependencies = [ [[package]] name = "quinn-proto" -version = "0.10.6" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "141bf7dfde2fbc246bfd3fe12f2455aa24b0fbd9af535d8c86c7bd1381ff2b1a" +checksum = "ddf517c03a109db8100448a4be38d498df8a210a99fe0e1b9eaf39e78c640efe" dependencies = [ "bytes", "rand", - "ring 0.16.20", + "ring 0.17.8", "rustc-hash", - "rustls 0.21.10", + "rustls 0.23.12", "slab", "thiserror", "tinyvec", @@ -6256,22 +6603,21 @@ dependencies = [ [[package]] name = "quinn-udp" -version = "0.4.1" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "055b4e778e8feb9f93c4e439f71dc2156ef13360b432b799e179a8c4cdf0b1d7" +checksum = "8bffec3605b73c6f1754535084a85229fa8a30f86014e6c81aeec4abb68b0285" dependencies = [ - "bytes", "libc", - "socket2 0.5.5", - "tracing", - "windows-sys 0.48.0", + "once_cell", + "socket2 0.5.7", + "windows-sys 0.52.0", ] [[package]] name = "quote" -version = "1.0.35" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] @@ -6283,7 +6629,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "51de85fb3fb6524929c8a2eb85e6b6d363de4e8c48f9e2c2eac4944abc181c93" dependencies = [ "log", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "scheduled-thread-pool", ] @@ -6350,9 +6696,9 @@ dependencies = [ [[package]] name = "rayon" -version = "1.8.1" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa7237101a77a10773db45d62004a272517633fbcc3df19d96455ede1122e051" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" dependencies = [ "either", "rayon-core", @@ -6374,13 +6720,22 @@ version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "52c4f3084aa3bc7dfbba4eff4fab2a54db4324965d8872ab933565e6fbd83bc6" dependencies = [ - "pem 3.0.3", + "pem 3.0.4", "ring 0.16.20", "time", "yasna", ] [[package]] +name = "redb" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6dd20d3cdeb9c7d2366a0b16b93b35b75aec15309fbeb7ce477138c9f68c8c0" +dependencies = [ + "libc", +] + +[[package]] name = "redox_syscall" version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6399,10 +6754,19 @@ dependencies = [ ] [[package]] +name = "redox_syscall" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" +dependencies = [ + "bitflags 2.6.0", +] + +[[package]] name = "redox_users" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" +checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" dependencies = [ "getrandom", "libredox", @@ -6411,14 +6775,14 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.3" +version = "1.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" +checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.4", - "regex-syntax 0.8.2", + "regex-automata 0.4.7", + "regex-syntax 0.8.4", ] [[package]] @@ -6432,13 +6796,13 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.4" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b7fa1134405e2ec9353fd416b17f8dacd46c473d7d3fd1cf202706a14eb792a" +checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.2", + "regex-syntax 0.8.4", ] [[package]] @@ -6449,25 +6813,25 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.8.2" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" [[package]] name = "reqwest" -version = "0.11.23" +version = "0.11.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37b1ae8d9ac08420c66222fb9096fc5de435c3c48542bc5336c51892cffafb41" +checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" dependencies = [ "base64 0.21.7", "bytes", "encoding_rs", "futures-core", "futures-util", - "h2 0.3.24", - "http 0.2.11", + "h2", + "http 0.2.12", "http-body 0.4.6", - "hyper 0.14.28", + "hyper 0.14.30", "hyper-rustls", "hyper-tls", "ipnet", @@ -6478,16 +6842,17 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", - "rustls 0.21.10", + "rustls 0.21.12", "rustls-pemfile 1.0.4", "serde", "serde_json", "serde_urlencoded", + "sync_wrapper 0.1.2", "system-configuration", "tokio", "tokio-native-tls", "tokio-rustls 0.24.1", - "tokio-util 0.7.10", + "tokio-util", "tower-service", "url", "wasm-bindgen", @@ -6546,16 +6911,17 @@ dependencies = [ [[package]] name = "ring" -version = "0.17.7" +version = "0.17.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74" +checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" dependencies = [ "cc", + "cfg-if", "getrandom", "libc", "spin 0.9.8", "untrusted 0.9.0", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -6596,6 +6962,15 @@ dependencies = [ ] [[package]] +name = "rpds" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4ef5140bcb576bfd6d56cd2de709a7d17851ac1f3805e67fe9d99e42a11821f" +dependencies = [ + "archery", +] + +[[package]] name = "rtnetlink" version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6611,6 +6986,36 @@ dependencies = [ ] [[package]] +name = "ruint" +version = "1.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c3cc4c2511671f327125da14133d0c5c5d137f006a1017a16f557bc85b16286" +dependencies = [ + "alloy-rlp", + "ark-ff 0.3.0", + "ark-ff 0.4.2", + "bytes", + "fastrlp", + "num-bigint", + "num-traits", + "parity-scale-codec 3.6.12", + "primitive-types 0.12.2", + "proptest", + "rand", + "rlp", + "ruint-macro", + "serde", + "valuable", + "zeroize", +] + +[[package]] +name = "ruint-macro" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48fd7bd8a6377e15ad9d42a8ec25371b94ddc67abe7c8b9127bec79bebaaae18" + +[[package]] name = "rusqlite" version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6619,16 +7024,16 @@ dependencies = [ "bitflags 1.3.2", "fallible-iterator", "fallible-streaming-iterator", - "hashlink", + "hashlink 0.8.4", "libsqlite3-sys", "smallvec", ] [[package]] name = "rustc-demangle" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustc-hash" @@ -6644,11 +7049,20 @@ checksum = "3e75f6a532d0fd9f7f13144f392b6ad56a32696bfcd9c78f797f16bbb6f072d6" [[package]] name = "rustc_version" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0dfe2087c51c460008730de8b57e6a320782fbfb312e1f4d520e6c6fae155ee" +dependencies = [ + "semver 0.11.0", +] + +[[package]] +name = "rustc_version" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "semver", + "semver 1.0.23", ] [[package]] @@ -6676,39 +7090,53 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.30" +version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "322394588aaf33c24007e8bb3238ee3e4c5c09c084ab32bc73890b99ff326bca" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.6.0", "errno", "libc", - "linux-raw-sys 0.4.13", + "linux-raw-sys 0.4.14", "windows-sys 0.52.0", ] [[package]] name = "rustls" -version = "0.21.10" +version = "0.21.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" +checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" dependencies = [ "log", - "ring 0.17.7", + "ring 0.17.8", "rustls-webpki 0.101.7", "sct", ] [[package]] name = "rustls" -version = "0.22.2" +version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e87c9956bd9807afa1f77e0f7594af32566e830e088a5576d27c5b6f30f49d41" +checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" dependencies = [ "log", - "ring 0.17.7", + "ring 0.17.8", "rustls-pki-types", - "rustls-webpki 0.102.1", + "rustls-webpki 0.102.6", + "subtle", + "zeroize", +] + +[[package]] +name = "rustls" +version = "0.23.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044" +dependencies = [ + "once_cell", + "ring 0.17.8", + "rustls-pki-types", + "rustls-webpki 0.102.6", "subtle", "zeroize", ] @@ -6724,19 +7152,19 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "2.0.0" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35e4980fa29e4c4b212ffb3db068a564cbf560e51d3944b7c88bd8bf5bec64f4" +checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d" dependencies = [ - "base64 0.21.7", + "base64 0.22.1", "rustls-pki-types", ] [[package]] name = "rustls-pki-types" -version = "1.1.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e9d979b3ce68192e42760c7810125eb6cf2ea10efae545a156063e61f314e2a" +checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" [[package]] name = "rustls-webpki" @@ -6744,31 +7172,44 @@ version = "0.101.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" dependencies = [ - "ring 0.17.7", + "ring 0.17.8", "untrusted 0.9.0", ] [[package]] name = "rustls-webpki" -version = "0.102.1" +version = "0.102.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef4ca26037c909dedb327b48c3327d0ba91d3dd3c4e05dad328f210ffb68e95b" +checksum = "8e6b52d4fda176fd835fdc55a835d4a89b8499cad995885a21149d5ad62f852e" dependencies = [ - "ring 0.17.7", + "ring 0.17.8", "rustls-pki-types", "untrusted 0.9.0", ] [[package]] name = "rustversion" -version = "1.0.14" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" + +[[package]] +name = "rusty-fork" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" +checksum = "cb3dcc6e454c328bb824492db107ab7c0ae8fcffe4ad210136ef014458c1bc4f" +dependencies = [ + "fnv", + "quick-error", + "tempfile", + "wait-timeout", +] [[package]] name = "rw-stream-sink" version = "0.4.0" -source = "git+https://github.com/sigp/rust-libp2p/?rev=cfa3275ca17e502799ed56e555b6c0611752e369#cfa3275ca17e502799ed56e555b6c0611752e369" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8c9026ff5d2f23da5e45bbc283f156383001bfb09c4e44256d02c1a685fe9a1" dependencies = [ "futures", "pin-project", @@ -6777,9 +7218,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.16" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "safe_arith" @@ -6805,23 +7246,23 @@ dependencies = [ [[package]] name = "scale-info" -version = "2.10.0" +version = "2.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f7d66a1128282b7ef025a8ead62a4a9fcf017382ec53b8ffbf4d7bf77bd3c60" +checksum = "eca070c12893629e2cc820a9761bedf6ce1dcddc9852984d1dc734b8bd9bd024" dependencies = [ "cfg-if", "derive_more", - "parity-scale-codec 3.6.9", + "parity-scale-codec 3.6.12", "scale-info-derive", ] [[package]] name = "scale-info-derive" -version = "2.10.0" +version = "2.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abf2c68b89cafb3b8d918dd07b42be0da66ff202cf1155c5739a4e0c1ea0dc19" +checksum = "2d35494501194174bda522a32605929eefc9ecf7e0a326c26db1fdd85881eb62" dependencies = [ - "proc-macro-crate 1.3.1", + "proc-macro-crate 3.1.0", "proc-macro2", "quote", "syn 1.0.109", @@ -6842,7 +7283,7 @@ version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3cbc66816425a074528352f5789333ecff06ca41b36b0b0efdfbb29edc391a19" dependencies = [ - "parking_lot 0.12.1", + "parking_lot 0.12.3", ] [[package]] @@ -6875,7 +7316,7 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" dependencies = [ - "ring 0.17.7", + "ring 0.17.8", "untrusted 0.9.0", ] @@ -6900,7 +7341,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc" dependencies = [ "base16ct 0.2.0", - "der 0.7.8", + "der 0.7.9", "generic-array", "pkcs8 0.10.2", "subtle", @@ -6909,11 +7350,11 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.9.2" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" +checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", "core-foundation", "core-foundation-sys", "libc", @@ -6922,9 +7363,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.9.1" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" +checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf" dependencies = [ "core-foundation-sys", "libc", @@ -6932,14 +7373,32 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.21" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b97ed7a9823b74f99c7742f5336af7be5ecd3eeafcb1507d1fa93347b1d589b0" +checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6" +dependencies = [ + "semver-parser", +] + +[[package]] +name = "semver" +version = "1.0.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" dependencies = [ "serde", ] [[package]] +name = "semver-parser" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7" +dependencies = [ + "pest", +] + +[[package]] name = "send_wrapper" version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6955,9 +7414,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.195" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63261df402c67811e9ac6def069e4786148c4563f4b50fd4bf30aa370d626b02" +checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" dependencies = [ "serde_derive", ] @@ -6973,31 +7432,21 @@ dependencies = [ ] [[package]] -name = "serde_cbor" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5" -dependencies = [ - "half", - "serde", -] - -[[package]] name = "serde_derive" -version = "1.0.195" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46fe8f8603d81ba86327b23a2e9cdf49e1255fb94a4c5f297f6ee0547178ea2c" +checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.72", ] [[package]] name = "serde_json" -version = "1.0.111" +version = "1.0.120" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "176e46fa42316f18edd598015a5166857fc835ec732f5215eac6b7bdbf0a84f4" +checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5" dependencies = [ "itoa", "ryu", @@ -7006,9 +7455,9 @@ dependencies = [ [[package]] name = "serde_path_to_error" -version = "0.1.15" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebd154a240de39fdebcf5775d2675c204d7c13cf39a4c697be6493c8e734337c" +checksum = "af99884400da37c88f5e9146b7f1fd0fbcae8f6eec4e9da38b67d05486f814a6" dependencies = [ "itoa", "serde", @@ -7016,20 +7465,20 @@ dependencies = [ [[package]] name = "serde_repr" -version = "0.1.18" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb" +checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.72", ] [[package]] name = "serde_spanned" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" +checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" dependencies = [ "serde", ] @@ -7062,7 +7511,7 @@ version = "1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e182d6ec6f05393cc0e5ed1bf81ad6db3a8feedf8ee515ecdd369809bcce8082" dependencies = [ - "darling", + "darling 0.13.4", "proc-macro2", "quote", "syn 1.0.109", @@ -7070,11 +7519,11 @@ dependencies = [ [[package]] name = "serde_yaml" -version = "0.9.30" +version = "0.9.34+deprecated" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1bf28c79a99f70ee1f1d83d10c875d2e70618417fda01ad1785e027579d9d38" +checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" dependencies = [ - "indexmap 2.1.0", + "indexmap 2.2.6", "itoa", "ryu", "serde", @@ -7139,6 +7588,16 @@ dependencies = [ ] [[package]] +name = "sha3-asm" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9b57fd861253bff08bb1919e995f90ba8f4889de2726091c8876f3a4e823b40" +dependencies = [ + "cc", + "cfg-if", +] + +[[package]] name = "sharded-slab" version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -7155,9 +7614,9 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" [[package]] name = "signal-hook-registry" -version = "1.4.1" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" dependencies = [ "libc", ] @@ -7200,14 +7659,14 @@ version = "0.2.0" dependencies = [ "clap", "env_logger 0.9.3", - "eth1", - "eth1_test_rig", + "eth2_network_config", "execution_layer", "futures", "node_test_rig", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "rayon", "sensitive_url", + "serde_json", "tokio", "types", ] @@ -7233,6 +7692,7 @@ version = "0.1.0" dependencies = [ "bincode", "byteorder", + "derivative", "ethereum_ssz", "ethereum_ssz_derive", "filesystem", @@ -7245,13 +7705,14 @@ dependencies = [ "logging", "lru", "maplit", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "rand", "rayon", + "redb", "safe_arith", "serde", "slog", - "sloggers", + "ssz_types", "strum", "tempfile", "tree_hash", @@ -7361,11 +7822,11 @@ dependencies = [ [[package]] name = "slog-term" -version = "2.9.0" +version = "2.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87d29185c55b7b258b4f120eab00f48557d4d9bc814f41713f449d35b0f8977c" +checksum = "b6e022d0b998abfe5c3782c1f03551a596269450ccd677ea51c56f8b214610e8" dependencies = [ - "atty", + "is-terminal", "slog", "term", "thread_local", @@ -7374,9 +7835,9 @@ dependencies = [ [[package]] name = "sloggers" -version = "2.1.2" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a0a4d8569a69ee56f277bffc2f6eee637b98ed468448e8a5a84fa63efe4de9d" +checksum = "75062c2738b82cd45ae633623caae3393f43eb00aada1dc2d3ebe88db6b0db9b" dependencies = [ "chrono", "libc", @@ -7402,15 +7863,18 @@ version = "0.2.0" dependencies = [ "lazy_static", "lighthouse_metrics", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "types", ] [[package]] name = "smallvec" -version = "1.13.1" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" +dependencies = [ + "arbitrary", +] [[package]] name = "snap" @@ -7420,17 +7884,17 @@ checksum = "1b6b67fb9a61334225b5b790716f609cd58395f895b3fe8b328786812a40bc3b" [[package]] name = "snow" -version = "0.9.4" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58021967fd0a5eeeb23b08df6cc244a4d4a5b4aec1d27c9e02fad1a58b4cd74e" +checksum = "850948bee068e713b8ab860fe1adc4d109676ab4c3b621fd8147f06b261f2f85" dependencies = [ "aes-gcm 0.10.3", "blake2", "chacha20poly1305", "curve25519-dalek", "rand_core", - "ring 0.17.7", - "rustc_version", + "ring 0.17.8", + "rustc_version 0.4.0", "sha2 0.10.8", "subtle", ] @@ -7447,12 +7911,12 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.5" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" dependencies = [ "libc", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -7484,20 +7948,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" dependencies = [ "base64ct", - "der 0.7.8", + "der 0.7.9", ] [[package]] name = "ssz_types" -version = "0.5.4" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "382939886cb24ee8ac885d09116a60f6262d827c7a9e36012b4f6d3d0116d0b3" +checksum = "625b20de2d4b3891e6972f4ce5061cb11bd52b3479270c4b177c134b571194a9" dependencies = [ "arbitrary", "derivative", "ethereum_serde_utils", "ethereum_ssz", - "itertools", + "itertools 0.10.5", "serde", "serde_derive", "smallvec", @@ -7506,6 +7970,12 @@ dependencies = [ ] [[package]] +name = "stable_deref_trait" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" + +[[package]] name = "state_processing" version = "0.2.0" dependencies = [ @@ -7519,14 +7989,16 @@ dependencies = [ "ethereum_ssz_derive", "int_to_bytes", "integer-sqrt", - "itertools", + "itertools 0.10.5", "lazy_static", "lighthouse_metrics", "merkle_proof", + "rand", "rayon", "safe_arith", "smallvec", "ssz_types", + "test_random_derive", "tokio", "tree_hash", "types", @@ -7559,12 +8031,12 @@ dependencies = [ "directory", "ethereum_ssz", "ethereum_ssz_derive", - "itertools", + "itertools 0.10.5", "lazy_static", "leveldb", "lighthouse_metrics", "lru", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "serde", "slog", "sloggers", @@ -7576,26 +8048,26 @@ dependencies = [ [[package]] name = "stringprep" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb41d74e231a107a1b4ee36bd1214b11285b77768d2e3824aedafa988fd36ee6" +checksum = "7b4df3d392d81bd458a8a621b8bffbd2302a12ffe288a9d931670948749463b1" dependencies = [ - "finl_unicode", "unicode-bidi", "unicode-normalization", + "unicode-properties", ] [[package]] name = "strsim" -version = "0.8.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "strsim" -version = "0.10.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "strum" @@ -7612,7 +8084,7 @@ version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" dependencies = [ - "heck", + "heck 0.4.1", "proc-macro2", "quote", "rustversion", @@ -7621,18 +8093,18 @@ dependencies = [ [[package]] name = "subtle" -version = "2.5.0" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "superstruct" -version = "0.6.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75b9e5728aa1a87141cefd4e7509903fc01fa0dcb108022b1e841a67c5159fc5" +checksum = "bf0f31f730ad9e579364950e10d6172b4a9bd04b447edf5988b066a860cc340e" dependencies = [ - "darling", - "itertools", + "darling 0.13.4", + "itertools 0.10.5", "proc-macro2", "quote", "smallvec", @@ -7661,9 +8133,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.48" +version = "2.0.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" +checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af" dependencies = [ "proc-macro2", "quote", @@ -7677,15 +8149,20 @@ 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.12.6" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" +checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", - "unicode-xid", + "syn 2.0.72", ] [[package]] @@ -7729,9 +8206,8 @@ name = "system_health" version = "0.1.0" dependencies = [ "lighthouse_network", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "serde", - "serde_json", "sysinfo", "types", ] @@ -7765,10 +8241,11 @@ checksum = "c63f48baada5c52e65a29eef93ab4f8982681b67f9e8d29c7b05abcfec2b9ffe" name = "task_executor" version = "0.1.0" dependencies = [ - "exit-future", + "async-channel", "futures", "lazy_static", "lighthouse_metrics", + "logging", "slog", "sloggers", "tokio", @@ -7776,14 +8253,13 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.9.0" +version = "3.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01ce4141aa927a6d1bd34a041795abd0db1cccba5d5f24b009f694bdf3a1f3fa" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" dependencies = [ "cfg-if", "fastrand", - "redox_syscall 0.4.1", - "rustix 0.38.30", + "rustix 0.38.34", "windows-sys 0.52.0", ] @@ -7808,6 +8284,16 @@ dependencies = [ ] [[package]] +name = "terminal_size" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7" +dependencies = [ + "rustix 0.38.34", + "windows-sys 0.48.0", +] + +[[package]] name = "test-test_logger" version = "0.1.0" dependencies = [ @@ -7841,39 +8327,30 @@ dependencies = [ ] [[package]] -name = "textwrap" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -dependencies = [ - "unicode-width", -] - -[[package]] name = "thiserror" -version = "1.0.56" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.56" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.72", ] [[package]] name = "thread_local" -version = "1.1.7" +version = "1.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" +checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" dependencies = [ "cfg-if", "once_cell", @@ -7890,14 +8367,13 @@ dependencies = [ [[package]] name = "time" -version = "0.3.31" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f657ba42c3f86e7680e53c8cd3af8abbe56b5491790b46e22e19c0d57463583e" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ "deranged", "itoa", - "libc", - "num_threads", + "num-conv", "powerfmt", "serde", "time-core", @@ -7912,10 +8388,11 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.16" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26197e33420244aeb70c3e8c78376ca46571bc4e701e4791c2cd9f57dcb3a43f" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" dependencies = [ + "num-conv", "time-core", ] @@ -7970,9 +8447,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.6.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" dependencies = [ "tinyvec_macros", ] @@ -7985,20 +8462,19 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.35.1" +version = "1.39.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104" +checksum = "d040ac2b29ab03b09d4129c2f5bbd012a3ac2f79d38ff506a4bf8dd34b0eac8a" dependencies = [ "backtrace", "bytes", "libc", "mio", - "num_cpus", "pin-project-lite", "signal-hook-registry", - "socket2 0.5.5", + "socket2 0.5.7", "tokio-macros", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -8013,13 +8489,13 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.2.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" +checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.72", ] [[package]] @@ -8034,9 +8510,9 @@ dependencies = [ [[package]] name = "tokio-postgres" -version = "0.7.10" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d340244b32d920260ae7448cb72b6e238bddc3d4f7603394e7dd46ed8e48f5b8" +checksum = "03adcf0147e203b6032c0b2d30be1415ba03bc348901f3ff1cc0df6a733e60c3" dependencies = [ "async-trait", "byteorder", @@ -8045,16 +8521,16 @@ dependencies = [ "futures-channel", "futures-util", "log", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "percent-encoding", "phf", "pin-project-lite", "postgres-protocol", "postgres-types", "rand", - "socket2 0.5.5", + "socket2 0.5.7", "tokio", - "tokio-util 0.7.10", + "tokio-util", "whoami", ] @@ -8064,7 +8540,7 @@ version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ - "rustls 0.21.10", + "rustls 0.21.12", "tokio", ] @@ -8074,55 +8550,39 @@ version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" dependencies = [ - "rustls 0.22.2", + "rustls 0.22.4", "rustls-pki-types", "tokio", ] [[package]] name = "tokio-stream" -version = "0.1.14" +version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" +checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" dependencies = [ "futures-core", "pin-project-lite", "tokio", - "tokio-util 0.7.10", + "tokio-util", ] [[package]] name = "tokio-util" -version = "0.6.10" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36943ee01a6d67977dd3f84a5a1d2efeb4ada3a1ae771cadfaa535d9d9fc6507" +checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" dependencies = [ "bytes", "futures-core", "futures-io", "futures-sink", - "log", "pin-project-lite", "slab", "tokio", ] [[package]] -name = "tokio-util" -version = "0.7.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" -dependencies = [ - "bytes", - "futures-core", - "futures-sink", - "pin-project-lite", - "slab", - "tokio", - "tracing", -] - -[[package]] name = "toml" version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -8133,21 +8593,21 @@ dependencies = [ [[package]] name = "toml" -version = "0.7.8" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" +checksum = "ac2caab0bf757388c6c0ae23b3293fdb463fee59434529014f85e3263b995c28" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.19.15", + "toml_edit 0.22.16", ] [[package]] name = "toml_datetime" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" dependencies = [ "serde", ] @@ -8158,22 +8618,33 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.1.0", - "serde", - "serde_spanned", + "indexmap 2.2.6", "toml_datetime", - "winnow", + "winnow 0.5.40", ] [[package]] name = "toml_edit" -version = "0.20.7" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" +checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" dependencies = [ - "indexmap 2.1.0", + "indexmap 2.2.6", "toml_datetime", - "winnow", + "winnow 0.5.40", +] + +[[package]] +name = "toml_edit" +version = "0.22.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "278f3d518e152219c994ce877758516bca5e118eaed6996192a774fb9fbf0788" +dependencies = [ + "indexmap 2.2.6", + "serde", + "serde_spanned", + "toml_datetime", + "winnow 0.6.15", ] [[package]] @@ -8236,7 +8707,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.72", ] [[package]] @@ -8309,9 +8780,9 @@ dependencies = [ [[package]] name = "tree_hash" -version = "0.5.2" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c998ac5fe2b07c025444bdd522e6258110b63861c6698eedc610c071980238d" +checksum = "134d6b24a5b829f30b5ee7de05ba7384557f5f6b00e29409cdf2392f93201bfa" dependencies = [ "ethereum-types 0.14.1", "ethereum_hashing", @@ -8320,11 +8791,11 @@ dependencies = [ [[package]] name = "tree_hash_derive" -version = "0.5.2" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84303a9c7cda5f085a3ed9cd241d1e95e04d88aab1d679b02f212e653537ba86" +checksum = "9ce7bccc538359a213436af7bc95804bdbf1c2a21d80e22953cbe9e096837ff1" dependencies = [ - "darling", + "darling 0.13.4", "quote", "syn 1.0.109", ] @@ -8340,6 +8811,16 @@ dependencies = [ ] [[package]] +name = "triomphe" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6631e42e10b40c0690bf92f404ebcfe6e1fdb480391d15f17cc8e96eeed5369" +dependencies = [ + "serde", + "stable_deref_trait", +] + +[[package]] name = "try-lock" version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -8355,10 +8836,11 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" name = "types" version = "0.2.1" dependencies = [ + "alloy-primitives", + "alloy-rlp", "arbitrary", "beacon_chain", "bls", - "cached_tree_hash", "compare_fields", "compare_fields_derive", "criterion", @@ -8371,19 +8853,21 @@ dependencies = [ "ethereum_ssz_derive", "hex", "int_to_bytes", - "itertools", + "itertools 0.10.5", "kzg", "lazy_static", "log", "maplit", "merkle_proof", "metastruct", - "parking_lot 0.12.1", + "milhouse", + "parking_lot 0.12.3", "paste", "rand", "rand_xorshift", "rayon", "regex", + "rpds", "rusqlite", "safe_arith", "serde", @@ -8393,7 +8877,6 @@ dependencies = [ "smallvec", "ssz_types", "state_processing", - "strum", "superstruct", "swap_or_not_shuffle", "tempfile", @@ -8404,6 +8887,12 @@ dependencies = [ ] [[package]] +name = "ucd-trie" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" + +[[package]] name = "uint" version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -8417,6 +8906,12 @@ dependencies = [ ] [[package]] +name = "unarray" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94" + +[[package]] name = "unescape" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -8445,18 +8940,18 @@ checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" dependencies = [ "tinyvec", ] [[package]] -name = "unicode-width" -version = "0.1.11" +name = "unicode-properties" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" +checksum = "e4259d9d4425d9f0661581b804cb85fe66a4c631cadd8f490d1c13a35d5d9291" [[package]] name = "unicode-xid" @@ -8486,34 +8981,28 @@ dependencies = [ [[package]] name = "unsafe-libyaml" -version = "0.2.10" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab4c90930b95a82d00dc9e9ac071b4991924390d46cbd0dfe566148667605e4b" +checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861" [[package]] name = "unsigned-varint" -version = "0.6.0" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35581ff83d4101e58b582e607120c7f5ffb17e632a980b1f38334d76b36908b2" +checksum = "6889a77d49f1f013504cec6bf97a2c730394adedaeb1deb5ea08949a50541105" dependencies = [ + "asynchronous-codec 0.6.2", "bytes", - "tokio-util 0.6.10", ] [[package]] name = "unsigned-varint" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6889a77d49f1f013504cec6bf97a2c730394adedaeb1deb5ea08949a50541105" - -[[package]] -name = "unsigned-varint" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eb066959b24b5196ae73cb057f45598450d2c5f71460e98c49b738086eff9c06" dependencies = [ - "asynchronous-codec", "bytes", + "tokio-util", ] [[package]] @@ -8534,14 +9023,14 @@ version = "0.1.0" dependencies = [ "lazy_static", "lru_cache", - "parking_lot 0.12.1", + "parking_lot 0.12.3", ] [[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 0.5.0", @@ -8549,6 +9038,12 @@ dependencies = [ ] [[package]] +name = "utf8parse" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" + +[[package]] name = "uuid" version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -8574,12 +9069,12 @@ dependencies = [ "eth2", "eth2_keystore", "ethereum_serde_utils", - "exit-future", + "fdlimit", "filesystem", "futures", "hex", - "hyper 1.1.0", - "itertools", + "hyper 1.4.1", + "itertools 0.10.5", "lazy_static", "libsecp256k1", "lighthouse_metrics", @@ -8588,7 +9083,7 @@ dependencies = [ "logging", "malloc_utils", "monitoring_api", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "rand", "reqwest", "ring 0.16.20", @@ -8637,12 +9132,10 @@ name = "validator_manager" version = "0.1.0" dependencies = [ "account_utils", - "bls", "clap", "clap_utils", "environment", "eth2", - "eth2_keystore", "eth2_network_config", "eth2_wallet", "ethereum_serde_utils", @@ -8688,10 +9181,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" [[package]] +name = "wait-timeout" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6" +dependencies = [ + "libc", +] + +[[package]] name = "walkdir" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" dependencies = [ "same-file", "winapi-util", @@ -8708,28 +9210,29 @@ dependencies = [ [[package]] name = "warp" -version = "0.3.6" -source = "git+https://github.com/seanmonstar/warp.git#7b07043cee0ca24e912155db4e8f6d9ab7c049ed" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4378d202ff965b011c64817db11d5829506d3404edeadb61f190d111da3f231c" dependencies = [ "bytes", "futures-channel", "futures-util", "headers", - "http 0.2.11", - "hyper 0.14.28", + "http 0.2.12", + "hyper 0.14.30", "log", "mime", "mime_guess", "percent-encoding", "pin-project", - "rustls-pemfile 2.0.0", + "rustls-pemfile 2.1.2", "scoped-tls", "serde", "serde_json", "serde_urlencoded", "tokio", "tokio-rustls 0.25.0", - "tokio-util 0.7.10", + "tokio-util", "tower-service", "tracing", ] @@ -8739,6 +9242,7 @@ name = "warp_utils" version = "0.1.0" dependencies = [ "beacon_chain", + "bytes", "eth2", "headers", "lazy_static", @@ -8746,6 +9250,7 @@ dependencies = [ "safe_arith", "serde", "serde_array_query", + "serde_json", "state_processing", "tokio", "types", @@ -8759,10 +9264,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] +name = "wasite" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b" + +[[package]] name = "wasm-bindgen" -version = "0.2.90" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1223296a201415c7fad14792dbefaace9bd52b62d33453ade1c5b5f07555406" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -8770,24 +9281,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.90" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcdc935b63408d58a32f8cc9738a0bffd8f05cc7c002086c6ef20b7312ad9dcd" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.72", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.40" +version = "0.4.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bde2032aeb86bdfaecc8b261eef3cba735cc426c1f3a3416d1e0791be95fc461" +checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" dependencies = [ "cfg-if", "js-sys", @@ -8797,9 +9308,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.90" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e4c238561b2d428924c49815533a8b9121c664599558a5d9ec51f8a1740a999" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -8807,28 +9318,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.90" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bae1abb6806dc1ad9e560ed242107c0f6c84335f1749dd4e8ddb012ebd5e25a7" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.72", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.90" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d91413b1c31d7539ba5ef2451af3f0b833a005eb27a631cec32bc0635a8602b" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "wasm-streams" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4609d447824375f43e1ffbc051b50ad8f4b3ae8219680c94452ea05eb240ac7" +checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129" dependencies = [ "futures-util", "js-sys", @@ -8860,15 +9371,14 @@ dependencies = [ "beacon_chain", "beacon_node", "bls", - "byteorder", "clap", + "clap_utils", "diesel", "diesel_migrations", "env_logger 0.9.3", "eth2", - "hex", "http_api", - "hyper 1.1.0", + "hyper 1.4.1", "log", "logging", "network", @@ -8889,9 +9399,19 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.67" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "web-time" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58cd2333b6e0be7a39605f0e255892fd7418a682d8da8fe042fe25128794d2ed" +checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" dependencies = [ "js-sys", "wasm-bindgen", @@ -8902,13 +9422,13 @@ name = "web3signer_tests" version = "0.1.0" dependencies = [ "account_utils", + "async-channel", "environment", "eth2_keystore", "eth2_network_config", - "exit-future", "futures", "lazy_static", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "reqwest", "serde", "serde_json", @@ -8925,29 +9445,18 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.25.3" +version = "0.25.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1778a42e8b3b90bff8d0f5032bf22250792889a5cdc752aa0020c84abe3aaf10" - -[[package]] -name = "which" -version = "4.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" -dependencies = [ - "either", - "home", - "once_cell", - "rustix 0.38.30", -] +checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" [[package]] name = "whoami" -version = "1.4.1" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22fc3756b8a9133049b26c7f61ab35416c130e8c09b660f5b3958b446f52cc50" +checksum = "a44ab49fad634e88f55bf8f9bb3abd2f27d7204172a112c7c9987e01c1c94ea9" dependencies = [ - "wasm-bindgen", + "redox_syscall 0.4.1", + "wasite", "web-sys", ] @@ -8959,15 +9468,9 @@ checksum = "c168940144dd21fd8046987c16a46a33d5fc84eec29ef9dcddc2ac9e31526b7c" [[package]] name = "widestring" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8" - -[[package]] -name = "wildmatch" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f44b95f62d34113cf558c93511ac93027e03e9c29a60dd0fd70e6e025c7270a" +checksum = "7219d36b6eac893fa81e84ebe06485e7dcbb616177469b142df14f1f4deb1311" [[package]] name = "winapi" @@ -8987,11 +9490,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.6" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" dependencies = [ - "winapi", + "windows-sys 0.52.0", ] [[package]] @@ -9037,7 +9540,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.0", + "windows-targets 0.52.6", ] [[package]] @@ -9064,7 +9567,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.0", + "windows-targets 0.52.6", ] [[package]] @@ -9099,17 +9602,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "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", + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", ] [[package]] @@ -9126,9 +9630,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" @@ -9144,9 +9648,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" @@ -9162,9 +9666,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.0" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" @@ -9180,9 +9690,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" @@ -9198,9 +9708,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" @@ -9216,9 +9726,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" @@ -9234,15 +9744,24 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" -version = "0.5.34" +version = "0.5.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7cf47b659b318dccbd69cc4797a39ae128f533dce7902a1096044d1967b9c16" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" +dependencies = [ + "memchr", +] + +[[package]] +name = "winnow" +version = "0.6.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "557404e450152cd6795bb558bca69e43c585055f4606e3bcae5894fc6dac9ba0" dependencies = [ "memchr", ] @@ -9268,7 +9787,7 @@ dependencies = [ "js-sys", "log", "pharos", - "rustc_version", + "rustc_version 0.4.0", "send_wrapper", "thiserror", "wasm-bindgen", @@ -9293,9 +9812,9 @@ dependencies = [ [[package]] name = "x25519-dalek" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb66477291e7e8d2b0ff1bcb900bf29489a9692816d79874bea351e7a8b6de96" +checksum = "c7e468321c81fb07fa7f4c636c3972b9100f0346e5b6a9f2bd0603a52f7ed277" dependencies = [ "curve25519-dalek", "rand_core", @@ -9305,9 +9824,9 @@ dependencies = [ [[package]] name = "x509-parser" -version = "0.15.1" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7069fba5b66b9193bd2c5d3d4ff12b839118f6bcbef5328efafafb5395cf63da" +checksum = "fcbc162f30700d6f3f82a24bf7cc62ffe7caea42c0b2cba8bf7f3ae50cf51f69" dependencies = [ "asn1-rs", "data-encoding", @@ -9322,9 +9841,9 @@ dependencies = [ [[package]] name = "xml-rs" -version = "0.8.19" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a" +checksum = "791978798f0597cfc70478424c2b4fdc2b7a8024aaff78497ef00f24ef674193" [[package]] name = "xmltree" @@ -9336,12 +9855,14 @@ dependencies = [ ] [[package]] -name = "yaml-rust" -version = "0.4.5" +name = "yaml-rust2" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" +checksum = "8902160c4e6f2fb145dbe9d6760a75e3c9522d8bf796ed7047c85919ac7115f8" dependencies = [ - "linked-hash-map", + "arraydeque", + "encoding_rs", + "hashlink 0.8.4", ] [[package]] @@ -9353,7 +9874,7 @@ dependencies = [ "futures", "log", "nohash-hasher", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "pin-project", "rand", "static_assertions", @@ -9361,18 +9882,18 @@ dependencies = [ [[package]] name = "yamux" -version = "0.13.1" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad1d0148b89300047e72994bee99ecdabd15a9166a7b70c8b8c37c314dcc9002" +checksum = "a31b5e376a8b012bee9c423acdbb835fc34d45001cfa3106236a624e4b738028" dependencies = [ "futures", - "instant", "log", "nohash-hasher", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "pin-project", "rand", "static_assertions", + "web-time", ] [[package]] @@ -9386,29 +9907,29 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.7.32" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.32" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.72", ] [[package]] name = "zeroize" -version = "1.7.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" dependencies = [ "zeroize_derive", ] @@ -9421,7 +9942,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.72", ] [[package]] @@ -9430,7 +9951,7 @@ version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261" dependencies = [ - "aes 0.8.3", + "aes 0.8.4", "byteorder", "bzip2", "constant_time_eq", @@ -9465,9 +9986,9 @@ dependencies = [ [[package]] name = "zstd-sys" -version = "2.0.9+zstd.1.5.5" +version = "2.0.12+zstd.1.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e16efa8a874a0481a574084d34cc26fdb3b99627480f785888deb6386506656" +checksum = "0a4e40c320c3cb459d9a9ff6de98cff88f4751ee9275d140e2be94a2b74e4c13" dependencies = [ "cc", "pkg-config", diff --git a/pkgs/applications/blockchains/lighthouse/default.nix b/pkgs/applications/blockchains/lighthouse/default.nix index b348233d312d7..2afce895da6e5 100644 --- a/pkgs/applications/blockchains/lighthouse/default.nix +++ b/pkgs/applications/blockchains/lighthouse/default.nix @@ -1,5 +1,4 @@ -{ clang -, cmake +{ cmake , CoreFoundation , fetchFromGitHub , fetchurl @@ -7,7 +6,7 @@ , lighthouse , nix-update-script , nodePackages -, perl +, openssl , pkg-config , postgresql , protobuf @@ -18,12 +17,11 @@ , stdenv , SystemConfiguration , testers -, unzip }: rustPlatform.buildRustPackage rec { pname = "lighthouse"; - version = "4.6.0"; + version = "5.3.0"; # lighthouse/common/deposit_contract/build.rs depositContractSpecVersion = "0.12.1"; @@ -33,12 +31,12 @@ rustPlatform.buildRustPackage rec { owner = "sigp"; repo = "lighthouse"; rev = "v${version}"; - hash = "sha256-uMrVnVvYXcY2Axn3ycsf+Pwur3HYGoOYjjUkGS5c3l4="; + hash = "sha256-wIj+YabyUrgLjWCfjCAH/Xb8jUG6ss+5SwnE2M82a+4="; }; patches = [ ./use-system-sqlite.patch - ./use-c-kzg-from-crates-io.patch + ./fix-dep-lazy_static.patch ]; postPatch = '' @@ -48,12 +46,9 @@ rustPlatform.buildRustPackage rec { cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "amcl-0.3.0" = "sha256-kc8k/ls4W0TwFBsRcyyotyz8ZBEjsZXHeJnJtsnW/LM="; - "discv5-0.4.0" = "sha256-GKAk9Du6fy0ldeBEwPueDbVPhyNxdKNROKpMJvR/OTc="; - "futures-bounded-0.2.3" = "sha256-/LbD+je9P1lPnXMJVDqRQHJziQPXPvSDmQadTfsQ5I8="; - "libmdbx-0.1.4" = "sha256-NMsR/Wl1JIj+YFPyeMMkrJFfoS07iEAKEQawO89a+/Q="; + "libmdbx-0.1.4" = "sha256-ONp4uPkVCN84MObjXorCZuSjnM6uFSMXK1vdJiX074o="; "lmdb-rkv-0.14.0" = "sha256-sxmguwqqcyOlfXOZogVz1OLxfJPo+Q0+UjkROkbbOCk="; - "warp-0.3.6" = "sha256-knDt2aw/PJ0iabhKg+okwwnEzCY+vQVhE7HKCTM6QbE="; + "quick-protobuf-0.8.1" = "sha256-dgePLYCeoEZz5DGaLifhf3gEIPaL7XB0QT9wRKY8LJg="; }; }; @@ -62,7 +57,6 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ rustPlatform.bindgenHook cmake - perl pkg-config protobuf ]; @@ -70,7 +64,9 @@ rustPlatform.buildRustPackage rec { buildInputs = [ rust-jemalloc-sys sqlite - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ + openssl + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreFoundation Security SystemConfiguration @@ -89,6 +85,8 @@ rustPlatform.buildRustPackage rec { LIGHTHOUSE_DEPOSIT_CONTRACT_SPEC_URL = "file://${depositContractSpec}"; LIGHTHOUSE_DEPOSIT_CONTRACT_TESTNET_URL = "file://${testnetDepositContractSpec}"; + OPENSSL_NO_VENDOR = true; + cargoBuildFlags = [ "--package lighthouse" ]; @@ -126,7 +124,7 @@ rustPlatform.buildRustPackage rec { "--skip persist::test_persist_caches" "--skip service::tests::tests::test_dht_persistence" "--skip time::test::test_reinsertion_updates_timeout" - ] ++ lib.optionals (stdenv.isAarch64 && stdenv.isDarwin) [ + ] ++ lib.optionals (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isDarwin) [ "--skip subnet_service::tests::attestation_service::test_subscribe_same_subnet_several_slots_apart" "--skip subnet_service::tests::sync_committee_service::same_subscription_with_lower_until_epoch" "--skip subnet_service::tests::sync_committee_service::subscribe_and_unsubscribe" diff --git a/pkgs/applications/blockchains/lighthouse/fix-dep-lazy_static.patch b/pkgs/applications/blockchains/lighthouse/fix-dep-lazy_static.patch new file mode 100644 index 0000000000000..bc0b4b51a10da --- /dev/null +++ b/pkgs/applications/blockchains/lighthouse/fix-dep-lazy_static.patch @@ -0,0 +1,11 @@ +diff --git a/common/lighthouse_metrics/Cargo.toml b/common/lighthouse_metrics/Cargo.toml +index fe966f4a9..f4153fec2 100644 +--- a/common/lighthouse_metrics/Cargo.toml ++++ b/common/lighthouse_metrics/Cargo.toml +@@ -8,3 +8,6 @@ edition = { workspace = true } + + [dependencies] + prometheus = "0.13.0" ++ ++[dev-dependencies] ++lazy_static.workspace = true diff --git a/pkgs/applications/blockchains/lighthouse/use-c-kzg-from-crates-io.patch b/pkgs/applications/blockchains/lighthouse/use-c-kzg-from-crates-io.patch deleted file mode 100644 index b6cb1768636ad..0000000000000 --- a/pkgs/applications/blockchains/lighthouse/use-c-kzg-from-crates-io.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff --git a/crypto/kzg/Cargo.toml b/crypto/kzg/Cargo.toml -index 7b70166f9..857fa4ee1 100644 ---- a/crypto/kzg/Cargo.toml -+++ b/crypto/kzg/Cargo.toml -@@ -16,4 +16,4 @@ serde = { workspace = true } - ethereum_serde_utils = { workspace = true } - hex = { workspace = true } - ethereum_hashing = { workspace = true } --c-kzg = { git = "https://github.com/ethereum/c-kzg-4844", rev = "748283cced543c486145d5f3f38684becdfe3e1b"} -\ No newline at end of file -+c-kzg = "0.4.0" diff --git a/pkgs/applications/blockchains/lighthouse/use-system-sqlite.patch b/pkgs/applications/blockchains/lighthouse/use-system-sqlite.patch index 88025059662ed..28abf3b119de5 100644 --- a/pkgs/applications/blockchains/lighthouse/use-system-sqlite.patch +++ b/pkgs/applications/blockchains/lighthouse/use-system-sqlite.patch @@ -1,11 +1,11 @@ diff --git a/Cargo.toml b/Cargo.toml -index ca55d00d4..76514b545 100644 +index b942d1719..da6f245c5 100644 --- a/Cargo.toml +++ b/Cargo.toml -@@ -139,7 +139,7 @@ rayon = "1.7" - regex = "1" +@@ -148,7 +148,7 @@ regex = "1" reqwest = { version = "0.11", default-features = false, features = ["blocking", "json", "stream", "rustls-tls", "native-tls-vendored"] } ring = "0.16" + rpds = "0.11" -rusqlite = { version = "0.28", features = ["bundled"] } +rusqlite = { version = "0.28" } serde = { version = "1", features = ["derive"] } diff --git a/pkgs/applications/blockchains/litecoin/default.nix b/pkgs/applications/blockchains/litecoin/default.nix index 3f8f5e236a6da..0f923fb8f6b8e 100644 --- a/pkgs/applications/blockchains/litecoin/default.nix +++ b/pkgs/applications/blockchains/litecoin/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, fetchpatch +{ lib, stdenv, mkDerivation, fetchFromGitHub, fetchpatch, fetchpatch2 , pkg-config, autoreconfHook , openssl, db48, boost, zlib, miniupnpc , glib, protobuf, util-linux, qrencode @@ -34,12 +34,19 @@ mkDerivation rec { url = "https://github.com/litecoin-project/litecoin/commit/6d1adb19aa79a8e8e140582759515bbd76816aa0.patch"; hash = "sha256-1y4Iz2plMw5HMAjl9x50QQpYrYaUd2WKrrAcUnQmlBY="; }) + + # net: add compatibility for miniupnpc 2.2.8 + # https://github.com/litecoin-project/litecoin/pull/971 + (fetchpatch2 { + url = "https://github.com/litecoin-project/litecoin/commit/5dddffa3e1bbcc7a3e6963b4860ba2d675ca847b.patch?full_index=1"; + hash = "sha256-F5GcL1RM91l04WrS3qYlV5zEcwyXrcRdmLLCqu1Hop0="; + }) ]; nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ openssl db48 boost zlib zeromq fmt miniupnpc glib protobuf util-linux libevent ] - ++ lib.optionals stdenv.isDarwin [ AppKit ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit ] ++ lib.optionals withGui [ qtbase qttools qrencode ]; configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ] @@ -55,7 +62,7 @@ mkDerivation rec { ''; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) || stdenv.hostPlatform.isDarwin; description = "Lite version of Bitcoin using scrypt as a proof-of-work algorithm"; longDescription= '' Litecoin is a peer-to-peer Internet currency that enables instant payments diff --git a/pkgs/applications/blockchains/lnd/default.nix b/pkgs/applications/blockchains/lnd/default.nix index a4271b9367951..e015a5ceea1b6 100644 --- a/pkgs/applications/blockchains/lnd/default.nix +++ b/pkgs/applications/blockchains/lnd/default.nix @@ -1,22 +1,37 @@ { buildGoModule , fetchFromGitHub , lib -, go -, tags ? [ "autopilotrpc" "signrpc" "walletrpc" "chainrpc" "invoicesrpc" "watchtowerrpc" "routerrpc" "monitoring" "kvdb_postgres" "kvdb_etcd" ] +, tags ? [ + # `RELEASE_TAGS` from https://github.com/lightningnetwork/lnd/blob/master/make/release_flags.mk + "autopilotrpc" + "chainrpc" + "invoicesrpc" + "kvdb_etcd" + "kvdb_postgres" + "kvdb_sqlite" + "monitoring" + "neutrinorpc" + "peersrpc" + "signrpc" + "walletrpc" + "watchtowerrpc" + # Extra tags useful for testing + "routerrpc" + ] }: buildGoModule rec { pname = "lnd"; - version = "0.18.0-beta"; + version = "0.18.3-beta"; src = fetchFromGitHub { owner = "lightningnetwork"; repo = "lnd"; rev = "v${version}"; - hash = "sha256-LkVlsmL/NjWtKUnerqTiT/jNfxazYw0B0GhBDCTGmao="; + hash = "sha256-CNCMVYuLUVmNgW5YTTn3TR1+2UCLbF3/gXXZWiREj/E="; }; - vendorHash = "sha256-T7jPuhAEeQ0U43J9gTQ+0/BdLAn4BOupAkmmmofhHtY="; + vendorHash = "sha256-dr8Ra8ywy+Zow8JF3K21XZ7lDIIdxvjRz+OD3E+348o="; subPackages = [ "cmd/lncli" "cmd/lnd" ]; diff --git a/pkgs/applications/blockchains/lndhub-go/default.nix b/pkgs/applications/blockchains/lndhub-go/default.nix index b4056283c50e3..74d7b8d538124 100644 --- a/pkgs/applications/blockchains/lndhub-go/default.nix +++ b/pkgs/applications/blockchains/lndhub-go/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "lndhub-go"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "getAlby"; repo = "lndhub.go"; rev = version; - sha256 = "sha256-YOLqMIfZSGD+AOng1XWCBlzaHkPnQc+2kmDXF2fh+ps="; + sha256 = "sha256-17vvC6J0VdXouGfX4k1kCVRlkXbNSX3AT8QIY8uKDUE="; }; vendorHash = "sha256-Vo29w04cRW0syD2tjieKVeZ3srFNuEC3T17birVWn6k="; diff --git a/pkgs/applications/blockchains/masari/default.nix b/pkgs/applications/blockchains/masari/default.nix deleted file mode 100644 index 27bf5a0aad162..0000000000000 --- a/pkgs/applications/blockchains/masari/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, unbound, openssl, boost -, lmdb, miniupnpc, readline, git, libsodium, rapidjson, cppzmq }: - -stdenv.mkDerivation rec { - pname = "masari"; - version = "unstable-2022-10-09"; - - src = fetchFromGitHub { - owner = "masari-project"; - repo = "masari"; - rev = "ff71f52220858b84a4403dab9a14339bcad57826"; - sha256 = "sha256-GunNFqZNgpLfyAA9BiBC98axgTQuK76z3BUl5T0iJqs="; - }; - - postPatch = '' - # remove vendored libraries - rm -r external/{miniupnpc,rapidjson} - - # include missing headers - sed -i "1i #include <map>" src/device/device_default.hpp - sed -i "1i #include <boost/mpl/contains.hpp>" contrib/epee/include/storages/portable_storage.h - ''; - - nativeBuildInputs = [ cmake pkg-config git ]; - - buildInputs = [ - boost miniupnpc openssl unbound - readline libsodium - rapidjson cppzmq - ]; - - meta = with lib; { - description = "scalability-focused, untraceable, secure, and fungible cryptocurrency using the RingCT protocol"; - homepage = "https://www.getmasari.org/"; - license = licenses.bsd3; - maintainers = with maintainers; [ matthewcroughan ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/blockchains/miniscript/default.nix b/pkgs/applications/blockchains/miniscript/default.nix index 84b1b55f66184..0c3ad55ab4405 100644 --- a/pkgs/applications/blockchains/miniscript/default.nix +++ b/pkgs/applications/blockchains/miniscript/default.nix @@ -15,15 +15,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-qkYDzsl2Y4WEDDXs9cE/jIXm01jclkYUQbDGe1S0wYs="; }; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' # Replace hardcoded g++ with c++ so clang can be used # on darwin - # - # lto must be disabled on darwin as well due to - # https://github.com/NixOS/nixpkgs/issues/19098 substituteInPlace Makefile \ - --replace-fail 'g++' 'c++' \ - --replace-fail '-flto' "" + --replace-fail 'g++' 'c++' ''; installPhase = '' diff --git a/pkgs/applications/blockchains/monero-cli/default.nix b/pkgs/applications/blockchains/monero-cli/default.nix index 8f2f3b8501255..7e87695e78c87 100644 --- a/pkgs/applications/blockchains/monero-cli/default.nix +++ b/pkgs/applications/blockchains/monero-cli/default.nix @@ -1,9 +1,29 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config -, boost, miniupnpc, openssl, unbound -, zeromq, pcsclite, readline, libsodium, hidapi -, randomx, rapidjson -, CoreData, IOKit, PCSC -, trezorSupport ? true, libusb1, protobuf, python3 +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + pkg-config, + boost, + libsodium, + miniupnpc, + openssl, + python3, + randomx, + rapidjson, + readline, + unbound, + zeromq, + + # darwin + CoreData, + IOKit, + + trezorSupport ? true, + hidapi, + libusb1, + protobuf_21, + udev, }: let @@ -25,18 +45,16 @@ in stdenv.mkDerivation rec { pname = "monero-cli"; - version = "0.18.3.3"; + version = "0.18.3.4"; src = fetchFromGitHub { owner = "monero-project"; repo = "monero"; rev = "v${version}"; - hash = "sha256-1LkKIrud317BEE+713t5wiJV6FcDlJdj4ypXPR0bKTs="; + hash = "sha256-nDiFJjhsISYM8kTgJUaPYL44iyccnz5+Pd5beBh+lsM="; }; - patches = [ - ./use-system-libraries.patch - ]; + patches = [ ./use-system-libraries.patch ]; postPatch = '' # manually install submodules @@ -47,31 +65,60 @@ stdenv.mkDerivation rec { cp -r . $source ''; - nativeBuildInputs = [ cmake pkg-config ]; + nativeBuildInputs = [ + cmake + pkg-config + ]; - buildInputs = [ - boost miniupnpc openssl unbound - zeromq pcsclite readline - libsodium hidapi randomx rapidjson - protobuf - ] ++ lib.optionals stdenv.isDarwin [ IOKit CoreData PCSC ] - ++ lib.optionals trezorSupport [ libusb1 protobuf python3 ]; + buildInputs = + [ + boost + libsodium + miniupnpc + openssl + randomx + rapidjson + readline + unbound + zeromq + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + IOKit + CoreData + ] + ++ lib.optionals trezorSupport [ + python3 + hidapi + libusb1 + protobuf_21 + ] + ++ lib.optionals (trezorSupport && stdenv.hostPlatform.isLinux) [ + udev + ]; - cmakeFlags = [ - "-DUSE_DEVICE_TREZOR=ON" - "-DBUILD_GUI_DEPS=ON" - "-DReadline_ROOT_DIR=${readline.dev}" - "-DRandomX_ROOT_DIR=${randomx}" - ] ++ lib.optional stdenv.isDarwin "-DBoost_USE_MULTITHREADED=OFF"; + cmakeFlags = + [ + # skip submodules init + "-DMANUAL_SUBMODULES=ON" + # required by monero-gui + "-DBUILD_GUI_DEPS=ON" + "-DReadline_ROOT_DIR=${readline.dev}" + ] + ++ lib.optional stdenv.hostPlatform.isDarwin "-DBoost_USE_MULTITHREADED=OFF" + ++ lib.optional trezorSupport [ + "-DUSE_DEVICE_TREZOR=ON" + # fix build on recent gcc versions + "-DCMAKE_CXX_FLAGS=-fpermissive" + ]; outputs = [ "out" "source" ]; - meta = with lib; { + meta = { description = "Private, secure, untraceable currency"; - homepage = "https://getmonero.org/"; - license = licenses.bsd3; - platforms = platforms.all; - maintainers = with maintainers; [ rnhmjoj ]; + homepage = "https://getmonero.org/"; + license = lib.licenses.bsd3; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ rnhmjoj ]; mainProgram = "monero-wallet-cli"; }; } diff --git a/pkgs/applications/blockchains/monero-cli/use-system-libraries.patch b/pkgs/applications/blockchains/monero-cli/use-system-libraries.patch index 5d3e3561d5548..adb41fb4ac25a 100644 --- a/pkgs/applications/blockchains/monero-cli/use-system-libraries.patch +++ b/pkgs/applications/blockchains/monero-cli/use-system-libraries.patch @@ -1,11 +1,12 @@ diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt -index 5b7f69a56..5536debe8 100644 +index 5b7f69a56..cc4b0a346 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt -@@ -36,22 +36,9 @@ +@@ -35,25 +35,14 @@ + # ...except for FreeBSD, because FreeBSD is a special case that doesn't play well with # others. - find_package(Miniupnpc REQUIRED) +-find_package(Miniupnpc REQUIRED) - -message(STATUS "Using in-tree miniupnpc") -set(UPNPC_NO_INSTALL TRUE CACHE BOOL "Disable miniupnp installation" FORCE) @@ -22,22 +23,27 @@ index 5b7f69a56..5536debe8 100644 -endif() - -set(UPNP_LIBRARIES "libminiupnpc-static" PARENT_SCOPE) -+set(UPNP_STATIC false PARENT_SCOPE) -+set(UPNP_INCLUDE ${MINIUPNP_INCLUDE_DIR} PARENT_SCOPE) -+set(UPNP_LIBRARIES ${MINIUPNP_LIBRARY} PARENT_SCOPE) ++find_package(PkgConfig REQUIRED) ++pkg_check_modules(MINIUPNPC REQUIRED miniupnpc) ++link_libraries(${MINIUPNPC_LIBRARIES}) ++include_directories(${MINIUPNPC_INCLUDE_DIRS}) ++find_package(RapidJSON) find_package(Unbound) ++find_library(RANDOMX_LIBRARY randomx) -@@ -69,4 +56,3 @@ endif() + if(NOT UNBOUND_INCLUDE_DIR) + die("Could not find libunbound") +@@ -69,4 +58,3 @@ endif() add_subdirectory(db_drivers) add_subdirectory(easylogging++) add_subdirectory(qrcodegen) -add_subdirectory(randomx EXCLUDE_FROM_ALL) diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl -index d4b39869c..13071d898 100644 +index 71f5393e8..bb48083d0 100644 --- a/src/p2p/net_node.inl +++ b/src/p2p/net_node.inl -@@ -61,9 +61,9 @@ +@@ -60,9 +60,9 @@ #include "cryptonote_core/cryptonote_core.h" #include "net/parse.h" @@ -50,3 +56,23 @@ index d4b39869c..13071d898 100644 #undef MONERO_DEFAULT_LOG_CATEGORY #define MONERO_DEFAULT_LOG_CATEGORY "net.p2p" +@@ -2989,7 +2989,8 @@ namespace nodetool + UPNPUrls urls; + IGDdatas igdData; + char lanAddress[64]; +- result = UPNP_GetValidIGD(deviceList, &urls, &igdData, lanAddress, sizeof lanAddress); ++ char wanAddress[64]; ++ result = UPNP_GetValidIGD(deviceList, &urls, &igdData, lanAddress, sizeof lanAddress, wanAddress, sizeof wanAddress); + freeUPNPDevlist(deviceList); + if (result > 0) { + if (result == 1) { +@@ -3057,7 +3058,8 @@ namespace nodetool + UPNPUrls urls; + IGDdatas igdData; + char lanAddress[64]; +- result = UPNP_GetValidIGD(deviceList, &urls, &igdData, lanAddress, sizeof lanAddress); ++ char wanAddress[64]; ++ result = UPNP_GetValidIGD(deviceList, &urls, &igdData, lanAddress, sizeof lanAddress, wanAddress, sizeof wanAddress); + freeUPNPDevlist(deviceList); + if (result > 0) { + if (result == 1) { diff --git a/pkgs/applications/blockchains/monero-gui/default.nix b/pkgs/applications/blockchains/monero-gui/default.nix index d72cad5c53673..7e8a5fe73dcd2 100644 --- a/pkgs/applications/blockchains/monero-gui/default.nix +++ b/pkgs/applications/blockchains/monero-gui/default.nix @@ -1,43 +1,88 @@ -{ lib, stdenv, wrapQtAppsHook, makeDesktopItem -, fetchFromGitHub -, cmake, qttools, pkg-config -, qtbase, qtdeclarative, qtgraphicaleffects -, qtmultimedia, qtxmlpatterns -, qtquickcontrols, qtquickcontrols2 -, qtmacextras -, monero-cli, miniupnpc, unbound, readline -, boost, libunwind, libsodium, pcsclite -, randomx, zeromq, libgcrypt, libgpg-error -, hidapi, rapidjson, quirc -, trezorSupport ? true, libusb1, protobuf, python3 +{ + lib, + fetchFromGitHub, + makeDesktopItem, + boost, + cmake, + libgcrypt, + libgpg-error, + libsodium, + miniupnpc, + monero-cli, + pkg-config, + qtbase, + qtdeclarative, + qtgraphicaleffects, + qtmacextras, + qtmultimedia, + qtquickcontrols, + qtquickcontrols2, + qttools, + qtxmlpatterns, + quirc, + randomx, + rapidjson, + stdenv, + unbound, + wrapQtAppsHook, + zeromq, + + trezorSupport ? true, + hidapi, + libusb1, + protobuf_21, + python3, + udev, }: stdenv.mkDerivation rec { pname = "monero-gui"; - version = "0.18.3.3"; + version = "0.18.3.4"; src = fetchFromGitHub { owner = "monero-project"; repo = "monero-gui"; rev = "v${version}"; - hash = "sha256-6qadBm4bPui11OVY1tLFcHsfswXWBFiJvutIsF6EfX8="; + hash = "sha256-wnU24EmZig2W/psy4OhaQVy2WwR0CgljlyYwOg4bzwM="; }; nativeBuildInputs = [ - cmake pkg-config wrapQtAppsHook + cmake + pkg-config + wrapQtAppsHook (lib.getDev qttools) ]; - buildInputs = [ - qtbase qtdeclarative qtgraphicaleffects - qtmultimedia qtquickcontrols qtquickcontrols2 - qtxmlpatterns - monero-cli miniupnpc unbound readline - randomx libgcrypt libgpg-error - boost libunwind libsodium pcsclite - zeromq hidapi rapidjson quirc - ] ++ lib.optionals trezorSupport [ libusb1 protobuf python3 ] - ++ lib.optionals stdenv.isDarwin [ qtmacextras ]; + buildInputs = + [ + boost + libgcrypt + libgpg-error + libsodium + miniupnpc + qtbase + qtdeclarative + qtgraphicaleffects + qtmultimedia + qtquickcontrols + qtquickcontrols2 + qtxmlpatterns + quirc + randomx + rapidjson + unbound + zeromq + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ qtmacextras ] + ++ lib.optionals trezorSupport [ + hidapi + libusb1 + protobuf_21 + python3 + ] + ++ lib.optionals (trezorSupport && stdenv.hostPlatform.isLinux) [ + udev + ]; postUnpack = '' # copy monero sources here @@ -68,7 +113,12 @@ stdenv.mkDerivation rec { --replace 'add_subdirectory(external)' "" ''; - cmakeFlags = [ "-DARCH=default" ]; + cmakeFlags = + [ "-DARCH=default" ] + ++ lib.optional trezorSupport [ + # fix build on recent gcc versions + "-DCMAKE_CXX_FLAGS=-fpermissive" + ]; desktopItem = makeDesktopItem { name = "monero-wallet-gui"; @@ -76,7 +126,7 @@ stdenv.mkDerivation rec { icon = "monero"; desktopName = "Monero"; genericName = "Wallet"; - categories = [ "Network" "Utility" ]; + categories = [ "Network" "Utility" ]; }; postInstall = '' @@ -93,12 +143,12 @@ stdenv.mkDerivation rec { done; ''; - meta = with lib; { - description = "Private, secure, untraceable currency"; - homepage = "https://getmonero.org/"; - license = licenses.bsd3; - platforms = platforms.all; - maintainers = with maintainers; [ rnhmjoj ]; - mainProgram = "monero-wallet-gui"; + meta = { + description = "Private, secure, untraceable currency"; + homepage = "https://getmonero.org/"; + license = lib.licenses.bsd3; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ rnhmjoj ]; + mainProgram = "monero-wallet-gui"; }; } diff --git a/pkgs/applications/blockchains/namecoin/default.nix b/pkgs/applications/blockchains/namecoin/default.nix index 4cf298c178595..42f4be7a227bd 100644 --- a/pkgs/applications/blockchains/namecoin/default.nix +++ b/pkgs/applications/blockchains/namecoin/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, openssl, boost, libevent, autoreconfHook, db4, miniupnpc, eject, pkg-config, hexdump }: +{ lib, stdenv, fetchFromGitHub, fetchpatch2, openssl, boost, libevent, autoreconfHook, db4, miniupnpc, eject, pkg-config, hexdump }: stdenv.mkDerivation rec { pname = "namecoind"; @@ -11,6 +11,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-2KMK5Vb8osuaKbzI1aaPSYg+te+v9CEcGUkrVI6Fk54="; }; + patches = [ + # upnp: add compatibility for miniupnpc 2.2.8 + (fetchpatch2 { + url = "https://github.com/namecoin/namecoin-core/commit/8acdf66540834b9f9cf28f16d389e8b6a48516d5.patch?full_index=1"; + hash = "sha256-oDvHUvwAEp0LJCf6QBESn38Bu359TcPpLhvuLX3sm6M="; + }) + ]; + nativeBuildInputs = [ autoreconfHook pkg-config @@ -36,7 +44,7 @@ stdenv.mkDerivation rec { description = "Decentralized open source information registration and transfer system based on the Bitcoin cryptocurrency"; homepage = "https://namecoin.org"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/blockchains/nbxplorer/default.nix b/pkgs/applications/blockchains/nbxplorer/default.nix index 5f8c0110402e3..170316494a8a4 100644 --- a/pkgs/applications/blockchains/nbxplorer/default.nix +++ b/pkgs/applications/blockchains/nbxplorer/default.nix @@ -6,13 +6,13 @@ buildDotnetModule rec { pname = "nbxplorer"; - version = "2.5.2"; + version = "2.5.6"; src = fetchFromGitHub { owner = "dgarage"; repo = "NBXplorer"; rev = "v${version}"; - sha256 = "sha256-zfL+VoDfICUtw02KeRghaq3XPOa/YnSh8orhqmo3Auo="; + sha256 = "sha256-GPquY5kfn08TUCum/INdHPasx8BWK2mf+PQlSgTl4iw="; }; projectFile = "NBXplorer/NBXplorer.csproj"; diff --git a/pkgs/applications/blockchains/nbxplorer/deps.nix b/pkgs/applications/blockchains/nbxplorer/deps.nix index cdf73d5de09ad..441a54528783f 100644 --- a/pkgs/applications/blockchains/nbxplorer/deps.nix +++ b/pkgs/applications/blockchains/nbxplorer/deps.nix @@ -2,221 +2,219 @@ # Please dont edit it manually, your changes might get overwritten! { fetchNuGet }: [ - (fetchNuGet { pname = "Dapper"; version = "2.1.28"; sha256 = "15vpa9k11rr1mh5vb6hdchy8hqa03lqs83w19s3kxzh1089yl9m8"; }) - (fetchNuGet { pname = "DBTrie"; version = "1.0.39"; sha256 = "0kbvl3kf73hrh1w2n3d2wshlxpqsv1pwydhwv2wxigmvs70fn1xp"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.JsonPatch"; version = "8.0.1"; sha256 = "1jgkjna579pw5fx1pjbz0dc2lil9i3djf9c8lkb4vxrzrwmrdw31"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.NewtonsoftJson"; version = "8.0.1"; sha256 = "05pfp1kq24aqc56dbx2i2s71rbypc1czidhd6nvah0r3pn91rfny"; }) - (fetchNuGet { pname = "Microsoft.Azure.Amqp"; version = "2.4.9"; sha256 = "15kvklhfl17713kwin8p71lcxq2jx87bk1d8gsl597z3w6l4cqma"; }) - (fetchNuGet { pname = "Microsoft.Azure.ServiceBus"; version = "4.2.1"; sha256 = "0akxqds078p7djd5g95i9dh4wrlfarabkq2ybn614cqdgl4z0is5"; }) - (fetchNuGet { pname = "Microsoft.Azure.Services.AppAuthentication"; version = "1.0.3"; sha256 = "0as64agcsilwgbvwx7iw3abdxyp9cbfpczbagjz49mqmmgnqp899"; }) - (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.3.0"; sha256 = "0gw297dgkh0al1zxvgvncqs0j15lsna9l1wpqas4rflmys440xvb"; }) - (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "6.0.0"; sha256 = "1zdyai2rzngmsp3706d12qrdk315c1s3ja218fzb3nc3wd1vz0s8"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "6.0.0"; sha256 = "0w6wwxv12nbc3sghvr68847wc9skkdgsicrz3fx4chgng1i3xy0j"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.EnvironmentVariables"; version = "6.0.0"; sha256 = "19w2vxliz1xangbach3hkx72x2pxqhc9n9c3kc3l8mhicl8w6vdl"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.FileExtensions"; version = "6.0.0"; sha256 = "02nna984iwnyyz4jjh9vs405nlj0yk1g5vz4v2x30z2c89mx5f9w"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Ini"; version = "6.0.0"; sha256 = "18qg1f7yvgvrgsq40cgc1yvpb9av84ma80k3grhvwn1cyam2img6"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "8.0.0"; sha256 = "1zw0bpp5742jzx03wvqc8csnvsbgdqi0ls9jfc5i2vd3cl8b74pg"; }) - (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Abstractions"; version = "6.0.0"; sha256 = "1fbqmfapxdz77drcv1ndyj2ybvd2rv4c9i9pgiykcpl4fa6dc65q"; }) - (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Physical"; version = "6.0.0"; sha256 = "1ikc3kf325xig6njbi2aj5kmww4xlaq9lsrpc8v764fsm4x10474"; }) - (fetchNuGet { pname = "Microsoft.Extensions.FileSystemGlobbing"; version = "6.0.0"; sha256 = "09gyyv4fwy9ys84z3aq4lm9y09b7bd1d4l4gfdinmg0z9678f1a4"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "1.0.0"; sha256 = "1sh9bidmhy32gkz6fkli79mxv06546ybrzppfw5v2aq0bda1ghka"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "6.0.0"; sha256 = "0b75fmins171zi6bfdcq1kcvyrirs8n91mknjnxy4c3ygi1rrnj0"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "8.0.0"; sha256 = "1klcqhg3hk55hb6vmjiq2wgqidsl81aldw0li2z98lrwx26msrr6"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "6.0.0"; sha256 = "1kjiw6s4yfz9gm7mx3wkhp06ghnbs95icj9hi505shz9rjrg42q2"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Clients.ActiveDirectory"; version = "3.14.2"; sha256 = "0g9a2z1qjxd71lqqghp0a542xk9jkvz951bbnnnw43is4hlnqncq"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "5.4.0"; sha256 = "0a5fn0p10dmkwa7vvbq28xw78aq33xm7c82l7vhla95n0lr178n8"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "5.4.0"; sha256 = "1idlpyg3q3syam6aflfbnsa7iql685mjralr1cnfpryf00lm59v0"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "5.4.0"; sha256 = "0gpdh5rs0p97zm41pphha8n3ccd50b1iszikj3917f111khpw8l0"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.2"; sha256 = "17rrj0awknxx6rpdxr7yijdxqdmbbpdlcf2nsadjbd4d2gw7dck0"; }) - (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.Win32.Primitives"; version = "4.0.1"; sha256 = "1n8ap0cmljbqskxpf8fjzn7kh1vvlndsa75k01qig26mbw97k2q7"; }) - (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; }) - (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "4.3.0"; sha256 = "1gxyzxam8163vk1kb6xzxjj4iwspjsz9zhgn1w9rjzciphaz0ig7"; }) - (fetchNuGet { pname = "NBitcoin"; version = "7.0.34"; sha256 = "0hw69gcmkxyz6y06c10hjmjm3avrpzc0lhn2n0k5fspnsh4bnrkz"; }) - (fetchNuGet { pname = "NBitcoin.Altcoins"; version = "3.0.23"; sha256 = "0nr8yryixhip7ffqlr584j8pfvjwggng23m0h0mad3liv3hxhb7k"; }) - (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; }) - (fetchNuGet { pname = "Newtonsoft.Json"; version = "10.0.3"; sha256 = "06vy67bkshclpz69kps4vgzc9h2cgg41c8vlqmdbwclfky7c4haq"; }) - (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; }) - (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.3"; sha256 = "0xrwysmrn4midrjal8g2hr1bbg38iyisl0svamb11arqws4w2bw7"; }) - (fetchNuGet { pname = "Newtonsoft.Json.Bson"; version = "1.0.2"; sha256 = "0c27bhy9x3c2n26inq32kmp6drpm71n6mqnmcr19wrlcaihglj35"; }) - (fetchNuGet { pname = "NicolasDorier.CommandLine"; version = "2.0.0"; sha256 = "0gywvl0gqs3crlzwgwzcqf0qsrbhk3dxjycpimxqvs1ihg4dhb1f"; }) - (fetchNuGet { pname = "NicolasDorier.CommandLine.Configuration"; version = "2.0.0"; sha256 = "1cng096r3kb85lf5wjill4yhxx8nv9v0d6ksbn1i1vvdawwl6fkw"; }) - (fetchNuGet { pname = "NicolasDorier.StandardConfiguration"; version = "2.0.0"; sha256 = "0058dx34ja2idw468bmw7l3w21wr2am6yx57sqp7llhjl5ayy0wv"; }) - (fetchNuGet { pname = "Npgsql"; version = "8.0.2"; sha256 = "0w1hm3bjh1vfnkzflp1x8bd4d723mpr4y6gb6ga79v5kkf09cmm2"; }) - (fetchNuGet { pname = "RabbitMQ.Client"; version = "5.1.2"; sha256 = "195nxmnva1z2p0ahvn0kswv4d39f5bdy2sl3cxcvfziamc21xrmd"; }) - (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; }) - (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "1wl76vk12zhdh66vmagni66h5xbhgqq7zkdpgw21jhxhvlbcl8pk"; }) - (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn"; }) - (fetchNuGet { pname = "runtime.any.System.Globalization"; version = "4.3.0"; sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"; }) - (fetchNuGet { pname = "runtime.any.System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1ghhhk5psqxcg6w88sxkqrc35bxcz27zbqm2y5p5298pv3v7g201"; }) - (fetchNuGet { pname = "runtime.any.System.IO"; version = "4.3.0"; sha256 = "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"; }) - (fetchNuGet { pname = "runtime.any.System.Reflection"; version = "4.3.0"; sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"; }) - (fetchNuGet { pname = "runtime.any.System.Reflection.Extensions"; version = "4.3.0"; sha256 = "0zyri97dfc5vyaz9ba65hjj1zbcrzaffhsdlpxc9bh09wy22fq33"; }) - (fetchNuGet { pname = "runtime.any.System.Reflection.Primitives"; version = "4.3.0"; sha256 = "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf"; }) - (fetchNuGet { pname = "runtime.any.System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl"; }) - (fetchNuGet { pname = "runtime.any.System.Runtime"; version = "4.3.0"; sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"; }) - (fetchNuGet { pname = "runtime.any.System.Runtime.Handles"; version = "4.3.0"; sha256 = "0bh5bi25nk9w9xi8z23ws45q5yia6k7dg3i4axhfqlnj145l011x"; }) - (fetchNuGet { pname = "runtime.any.System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19"; }) - (fetchNuGet { pname = "runtime.any.System.Text.Encoding"; version = "4.3.0"; sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"; }) - (fetchNuGet { pname = "runtime.any.System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8"; }) - (fetchNuGet { pname = "runtime.any.System.Threading.Tasks"; version = "4.3.0"; sha256 = "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va"; }) - (fetchNuGet { pname = "runtime.any.System.Threading.Timer"; version = "4.3.0"; sha256 = "0aw4phrhwqz9m61r79vyfl5la64bjxj8l34qnrcwb28v49fg2086"; }) - (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; }) - (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; }) - (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; }) - (fetchNuGet { pname = "runtime.native.System"; version = "4.0.0"; sha256 = "1ppk69xk59ggacj9n7g6fyxvzmk1g5p4fkijm0d7xqfkig98qrkf"; }) - (fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; }) - (fetchNuGet { pname = "runtime.native.System.IO.Compression"; version = "4.3.0"; sha256 = "1vvivbqsk6y4hzcid27pqpm5bsi6sc50hvqwbcx8aap5ifrxfs8d"; }) - (fetchNuGet { pname = "runtime.native.System.Net.Http"; version = "4.0.1"; sha256 = "1hgv2bmbaskx77v8glh7waxws973jn4ah35zysnkxmf0196sfxg6"; }) - (fetchNuGet { pname = "runtime.native.System.Net.Http"; version = "4.3.0"; sha256 = "1n6rgz5132lcibbch1qlf0g9jk60r0kqv087hxc0lisy50zpm7kk"; }) - (fetchNuGet { pname = "runtime.native.System.Net.Security"; version = "4.3.0"; sha256 = "0dnqjhw445ay3chpia9p6vy4w2j6s9vy3hxszqvdanpvvyaxijr3"; }) - (fetchNuGet { pname = "runtime.native.System.Security.Cryptography"; version = "4.0.0"; sha256 = "0k57aa2c3b10wl3hfqbgrl7xq7g8hh3a3ir44b31dn5p61iiw3z9"; }) - (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; sha256 = "1b61p6gw1m02cc1ry996fl49liiwky6181dzr873g9ds92zl326q"; }) - (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; }) - (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"; }) - (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf"; }) - (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; sha256 = "10yc8jdrwgcl44b4g93f1ds76b176bajd3zqi2faf5rvh1vy9smi"; }) - (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3"; }) - (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn"; }) - (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"; }) - (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"; }) - (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; }) - (fetchNuGet { pname = "runtime.unix.Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0y61k9zbxhdi0glg154v30kkq7f8646nif8lnnxbvkjpakggd5id"; }) - (fetchNuGet { pname = "runtime.unix.System.Console"; version = "4.3.0"; sha256 = "1pfpkvc6x2if8zbdzg9rnc5fx51yllprl8zkm5npni2k50lisy80"; }) - (fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5"; }) - (fetchNuGet { pname = "runtime.unix.System.IO.FileSystem"; version = "4.3.0"; sha256 = "14nbkhvs7sji5r1saj2x8daz82rnf9kx28d3v2qss34qbr32dzix"; }) - (fetchNuGet { pname = "runtime.unix.System.Net.Primitives"; version = "4.3.0"; sha256 = "0bdnglg59pzx9394sy4ic66kmxhqp8q8bvmykdxcbs5mm0ipwwm4"; }) - (fetchNuGet { pname = "runtime.unix.System.Net.Sockets"; version = "4.3.0"; sha256 = "03npdxzy8gfv035bv1b9rz7c7hv0rxl5904wjz51if491mw0xy12"; }) - (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; }) - (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; }) - (fetchNuGet { pname = "System.AppContext"; version = "4.3.0"; sha256 = "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya"; }) - (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; }) - (fetchNuGet { pname = "System.Collections"; version = "4.0.11"; sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; }) - (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) - (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.0.12"; sha256 = "07y08kvrzpak873pmyxs129g1ch8l27zmg51pcyj2jvq03n0r0fc"; }) - (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.3.0"; sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; }) - (fetchNuGet { pname = "System.Collections.NonGeneric"; version = "4.3.0"; sha256 = "07q3k0hf3mrcjzwj8fwk6gv3n51cb513w4mgkfxzm3i37sc9kz7k"; }) - (fetchNuGet { pname = "System.Collections.Specialized"; version = "4.3.0"; sha256 = "1sdwkma4f6j85m3dpb53v9vcgd0zyc9jb33f8g63byvijcj39n20"; }) - (fetchNuGet { pname = "System.ComponentModel"; version = "4.3.0"; sha256 = "0986b10ww3nshy30x9sjyzm0jx339dkjxjj3401r3q0f6fx2wkcb"; }) - (fetchNuGet { pname = "System.ComponentModel.Primitives"; version = "4.3.0"; sha256 = "1svfmcmgs0w0z9xdw2f2ps05rdxmkxxhf0l17xk9l1l8xfahkqr0"; }) - (fetchNuGet { pname = "System.ComponentModel.TypeConverter"; version = "4.3.0"; sha256 = "17ng0p7v3nbrg3kycz10aqrrlw4lz9hzhws09pfh8gkwicyy481x"; }) - (fetchNuGet { pname = "System.Console"; version = "4.3.0"; sha256 = "1flr7a9x920mr5cjsqmsy9wgnv3lvd0h1g521pdr1lkb2qycy7ay"; }) - (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.0.11"; sha256 = "0gmjghrqmlgzxivd2xl50ncbglb7ljzb66rlx8ws6dv8jm0d5siz"; }) - (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; }) - (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.5.1"; sha256 = "1j8dgilsgd0n7y87wq1cdlnwck96wijhbyhdp4d01l1gzm3074c1"; }) - (fetchNuGet { pname = "System.Diagnostics.Process"; version = "4.3.0"; sha256 = "0g4prsbkygq8m21naqmcp70f24a1ksyix3dihb1r1f71lpi3cfj7"; }) - (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1"; }) - (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.1.0"; sha256 = "1d2r76v1x610x61ahfpigda89gd13qydz6vbwzhpqlyvq8jj6394"; }) - (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; }) - (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.3.0"; sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk"; }) - (fetchNuGet { pname = "System.Globalization"; version = "4.0.11"; sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; }) - (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; }) - (fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.0.1"; sha256 = "0bv0alrm2ck2zk3rz25lfyk9h42f3ywq77mx1syl6vvyncnpg4qh"; }) - (fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq"; }) - (fetchNuGet { pname = "System.Globalization.Extensions"; version = "4.3.0"; sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"; }) - (fetchNuGet { pname = "System.IdentityModel.Tokens.Jwt"; version = "5.4.0"; sha256 = "05f91fjn054bwphmbbg7c38ipl4i81v73j232jgcq6y16dx6ifyc"; }) - (fetchNuGet { pname = "System.IO"; version = "4.1.0"; sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; }) - (fetchNuGet { pname = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; }) - (fetchNuGet { pname = "System.IO.Compression"; version = "4.3.0"; sha256 = "084zc82yi6yllgda0zkgl2ys48sypiswbiwrv7irb3r0ai1fp4vz"; }) - (fetchNuGet { pname = "System.IO.Compression.ZipFile"; version = "4.3.0"; sha256 = "1yxy5pq4dnsm9hlkg9ysh5f6bf3fahqqb6p8668ndy5c0lk7w2ar"; }) - (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.0.1"; sha256 = "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1"; }) - (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.3.0"; sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; }) - (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.0.1"; sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612"; }) - (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; }) - (fetchNuGet { pname = "System.Linq"; version = "4.1.0"; sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5"; }) - (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; }) - (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; }) - (fetchNuGet { pname = "System.Net.Http"; version = "4.3.0"; sha256 = "1i4gc757xqrzflbk7kc5ksn20kwwfjhw9w7pgdkn19y3cgnl302j"; }) - (fetchNuGet { pname = "System.Net.NameResolution"; version = "4.3.0"; sha256 = "15r75pwc0rm3vvwsn8rvm2krf929mjfwliv0mpicjnii24470rkq"; }) - (fetchNuGet { pname = "System.Net.Primitives"; version = "4.0.11"; sha256 = "10xzzaynkzkakp7jai1ik3r805zrqjxiz7vcagchyxs2v26a516r"; }) - (fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; }) - (fetchNuGet { pname = "System.Net.Security"; version = "4.3.0"; sha256 = "1aa5igz31ivk6kpgsrwck3jccab7wd88wr52lddmgypmbh9mmf87"; }) - (fetchNuGet { pname = "System.Net.Sockets"; version = "4.3.0"; sha256 = "1ssa65k6chcgi6mfmzrznvqaxk8jp0gvl77xhf1hbzakjnpxspla"; }) - (fetchNuGet { pname = "System.Net.WebHeaderCollection"; version = "4.0.1"; sha256 = "10bxpxj80c4z00z3ksrfswspq9qqsw8jwxcbzvymzycb97m9b55q"; }) - (fetchNuGet { pname = "System.Net.WebHeaderCollection"; version = "4.3.0"; sha256 = "0ms3ddjv1wn8sqa5qchm245f3vzzif6l6fx5k92klqpn7zf4z562"; }) - (fetchNuGet { pname = "System.Net.WebSockets"; version = "4.0.0"; sha256 = "04jdhq9dp43x1m6hddn06sq74skc50i1yk6hip0224pj6fwxa4k2"; }) - (fetchNuGet { pname = "System.Net.WebSockets"; version = "4.3.0"; sha256 = "1gfj800078kggcgl0xyl00a6y5k4wwh2k2qm69rjy22wbmq7fy4p"; }) - (fetchNuGet { pname = "System.Net.WebSockets.Client"; version = "4.0.2"; sha256 = "0p8m9h94h9za8281hngpi6awka6v26s1gkk0npmxzqq4ilas6b4s"; }) - (fetchNuGet { pname = "System.Net.WebSockets.Client"; version = "4.3.2"; sha256 = "103y8lfsfa5xd1sqmq9sml4qyp4rij2i3fnnw119h119hb04l0rk"; }) - (fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; }) - (fetchNuGet { pname = "System.Private.DataContractSerialization"; version = "4.1.1"; sha256 = "1xk9wvgzipssp1393nsg4n16zbr5481k03nkdlj954hzq5jkx89r"; }) - (fetchNuGet { pname = "System.Private.DataContractSerialization"; version = "4.3.0"; sha256 = "06fjipqvjp559rrm825x6pll8gimdj9x1n3larigh5hsm584gndw"; }) - (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; }) - (fetchNuGet { pname = "System.Reflection"; version = "4.1.0"; sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9"; }) - (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; }) - (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.0.1"; sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp"; }) - (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.3.0"; sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; }) - (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.0.1"; sha256 = "1pcd2ig6bg144y10w7yxgc9d22r7c7ww7qn1frdfwgxr24j9wvv0"; }) - (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; }) - (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.0.1"; sha256 = "1s4b043zdbx9k39lfhvsk68msv1nxbidhkq6nbm27q7sf8xcsnxr"; }) - (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.3.0"; sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; }) - (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.0.1"; sha256 = "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn"; }) - (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; }) - (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.0.1"; sha256 = "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28"; }) - (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; }) - (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.1.0"; sha256 = "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7"; }) - (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.3.0"; sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; }) - (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.0.1"; sha256 = "0b4i7mncaf8cnai85jv3wnw6hps140cxz8vylv2bik6wyzgvz7bi"; }) - (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; }) - (fetchNuGet { pname = "System.Runtime"; version = "4.1.0"; sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; }) - (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; }) - (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; sha256 = "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc"; }) - (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.1.0"; sha256 = "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z"; }) - (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; }) - (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.0.1"; sha256 = "1g0zrdi5508v49pfm3iii2hn6nm00bgvfpjq1zxknfjrxxa20r4g"; }) - (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; }) - (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.1.0"; sha256 = "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1"; }) - (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; }) - (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.3.0"; sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; }) - (fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.0.1"; sha256 = "1y308zfvy0l5nrn46mqqr4wb4z1xk758pkk8svbz8b5ij7jnv4nn"; }) - (fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.3.0"; sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; }) - (fetchNuGet { pname = "System.Runtime.Serialization.Formatters"; version = "4.3.0"; sha256 = "114j35n8gcvn3sqv9ar36r1jjq0y1yws9r0yk8i6wm4aq7n9rs0m"; }) - (fetchNuGet { pname = "System.Runtime.Serialization.Json"; version = "4.0.2"; sha256 = "08ypbzs0sb302ga04ds5b2wxa2gg0q50zpa0nvc87ipjhs0v66dn"; }) - (fetchNuGet { pname = "System.Runtime.Serialization.Primitives"; version = "4.1.1"; sha256 = "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k"; }) - (fetchNuGet { pname = "System.Runtime.Serialization.Primitives"; version = "4.3.0"; sha256 = "01vv2p8h4hsz217xxs0rixvb7f2xzbh6wv1gzbfykcbfrza6dvnf"; }) - (fetchNuGet { pname = "System.Runtime.Serialization.Xml"; version = "4.3.0"; sha256 = "1b2cxl2h7s8cydbhbmxhvvq071n9ck61g08npg4gyw7nvg37rfni"; }) - (fetchNuGet { pname = "System.Security.Claims"; version = "4.3.0"; sha256 = "0jvfn7j22l3mm28qjy3rcw287y9h65ha4m940waaxah07jnbzrhn"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Algorithms"; version = "4.2.0"; sha256 = "148s9g5dgm33ri7dnh19s4lgnlxbpwvrw2jnzllq2kijj4i4vs85"; }) - (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.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"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Encoding"; version = "4.3.0"; sha256 = "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32"; }) - (fetchNuGet { pname = "System.Security.Cryptography.OpenSsl"; version = "4.0.0"; sha256 = "16sx3cig3d0ilvzl8xxgffmxbiqx87zdi8fc73i3i7zjih1a7f4q"; }) - (fetchNuGet { pname = "System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0givpvvj8yc7gv4lhb6s1prq6p2c4147204a0wib89inqzd87gqc"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Primitives"; version = "4.0.0"; sha256 = "0i7cfnwph9a10bm26m538h5xcr8b36jscp9sy1zhgifksxz4yixh"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Primitives"; version = "4.3.0"; sha256 = "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby"; }) - (fetchNuGet { pname = "System.Security.Cryptography.X509Certificates"; version = "4.1.0"; sha256 = "0clg1bv55mfv5dq00m19cp634zx6inm31kf8ppbq1jgyjf2185dh"; }) - (fetchNuGet { pname = "System.Security.Cryptography.X509Certificates"; version = "4.3.0"; sha256 = "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h"; }) - (fetchNuGet { pname = "System.Security.Principal"; version = "4.3.0"; sha256 = "12cm2zws06z4lfc4dn31iqv7072zyi4m910d4r6wm8yx85arsfxf"; }) - (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.3.0"; sha256 = "00a0a7c40i3v4cb20s2cmh9csb5jv2l0frvnlzyfxh848xalpdwr"; }) - (fetchNuGet { pname = "System.Text.Encoding"; version = "4.0.11"; sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; }) - (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) - (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.0.11"; sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; }) - (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; }) - (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.1.0"; sha256 = "1mw7vfkkyd04yn2fbhm38msk7dz2xwvib14ygjsb8dq2lcvr18y7"; }) - (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; }) - (fetchNuGet { pname = "System.Threading"; version = "4.0.11"; sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; }) - (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }) - (fetchNuGet { pname = "System.Threading.Channels"; version = "4.7.1"; sha256 = "038fyrriypwzsj5fwgnkw79hm5ya0x63r724yizgahbxf512chr2"; }) - (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.0.11"; sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"; }) - (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) - (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.0.0"; sha256 = "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr"; }) - (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.3.0"; sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; }) - (fetchNuGet { pname = "System.Threading.Thread"; version = "4.3.0"; sha256 = "0y2xiwdfcph7znm2ysxanrhbqqss6a3shi1z3c779pj2s523mjx4"; }) - (fetchNuGet { pname = "System.Threading.ThreadPool"; version = "4.3.0"; sha256 = "027s1f4sbx0y1xqw2irqn6x161lzj8qwvnh2gn78ciiczdv10vf1"; }) - (fetchNuGet { pname = "System.Threading.Timer"; version = "4.3.0"; sha256 = "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56"; }) - (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.0.11"; sha256 = "0c6ky1jk5ada9m94wcadih98l6k1fvf6vi7vhn1msjixaha419l5"; }) - (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.3.0"; sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; }) - (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.3.0"; sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; }) - (fetchNuGet { pname = "System.Xml.XmlDocument"; version = "4.0.1"; sha256 = "0ihsnkvyc76r4dcky7v3ansnbyqjzkbyyia0ir5zvqirzan0bnl1"; }) - (fetchNuGet { pname = "System.Xml.XmlDocument"; version = "4.3.0"; sha256 = "0bmz1l06dihx52jxjr22dyv5mxv6pj4852lx68grjm7bivhrbfwi"; }) - (fetchNuGet { pname = "System.Xml.XmlSerializer"; version = "4.0.11"; sha256 = "01nzc3gdslw90qfykq4qzr2mdnqxjl4sj0wp3fixiwdmlmvpib5z"; }) - (fetchNuGet { pname = "System.Xml.XmlSerializer"; version = "4.3.0"; sha256 = "07pa4sx196vxkgl3csvdmw94nydlsm9ir38xxcs84qjn8cycd912"; }) + (fetchNuGet { pname = "Dapper"; version = "2.1.35"; hash = "sha256-zeroySx7lO1yLtbhKhFQ87diWXOq9gPnv3qFcmNcs9M="; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.JsonPatch"; version = "8.0.5"; hash = "sha256-i5VzC7peTKTiwjoqzlUFysyu7oUxBtf3bG/BZ6QYs/A="; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.NewtonsoftJson"; version = "8.0.5"; hash = "sha256-8GX1oDCmWiX3t/gwpn2fVl3Pw3DdXgWru5refK8w+aw="; }) + (fetchNuGet { pname = "Microsoft.Azure.Amqp"; version = "2.4.9"; hash = "sha256-qmJGqOHjn1SofqiFuQ7qUuDOaDgX2cjnCOcE6iCde5Y="; }) + (fetchNuGet { pname = "Microsoft.Azure.ServiceBus"; version = "4.2.1"; hash = "sha256-RUfwCX0NMxKMXV7guVRWjmZOYEuxpFeabOeiA3TDfSo="; }) + (fetchNuGet { pname = "Microsoft.Azure.Services.AppAuthentication"; version = "1.0.3"; hash = "sha256-KaGL7asV10S+fGp9dt1i6frelho8ns73epxGzZ4iRis="; }) + (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.3.0"; hash = "sha256-a3dAiPaVuky0wpcHmpTVtAQJNGZ2v91/oArA+dpJgj8="; }) + (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; hash = "sha256-Enknv2RsFF68lEPdrf5M+BpV1kHoLTVRApKUwuk/pj0="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "6.0.0"; hash = "sha256-SIO/Q+OD2bG+Q0EoOXRgJYzZMhahGXDG1fXZn0VUvv0="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "6.0.0"; hash = "sha256-Evg+Ynj2QUa6Gz+zqF+bUyfGD0HI5A2fHmxZEXbn3HA="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.EnvironmentVariables"; version = "6.0.0"; hash = "sha256-tG3DEWURVkQHm4MlmxjE/YouTp9wQKbWs6qHH2nfgqc="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.FileExtensions"; version = "6.0.0"; hash = "sha256-PLnSa0JMfDC62OTv8sL0QFJbANE7QSnJ997ySFBS1go="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Ini"; version = "6.0.0"; hash = "sha256-5tUoqvIsWL5hfmMCpCpBW6V1tw/sMUCwfnm/7Y8LD6M="; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "8.0.0"; hash = "sha256-75KzEGWjbRELczJpCiJub+ltNUMMbz5A/1KQU+5dgP8="; }) + (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Abstractions"; version = "6.0.0"; hash = "sha256-uBjWjHKEXjZ9fDfFxMjOou3lhfTNhs1yO+e3fpWreLk="; }) + (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Physical"; version = "6.0.0"; hash = "sha256-5BAQOqnaEXM2YjdrmrCinXBeZ5FKxCWtebEXMdwcbMY="; }) + (fetchNuGet { pname = "Microsoft.Extensions.FileSystemGlobbing"; version = "6.0.0"; hash = "sha256-RAWHjkkfvGpjc49Q0kJbZyXgU6UEq/EJ0j557sj2/iU="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "1.0.0"; hash = "sha256-asIXVFsAK7ELd/f+vLwhxYDdazqRTmf+fGJ4WFtcCeo="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "6.0.0"; hash = "sha256-QNqcQ3x+MOK7lXbWkCzSOWa/2QyYNbdM/OEEbWN15Sw="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "8.0.0"; hash = "sha256-Jmddjeg8U5S+iBTwRlVAVLeIHxc4yrrNgqVMOB7EjM4="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "6.0.0"; hash = "sha256-AgvysszpQ11AiTBJFkvSy8JnwIWTj15Pfek7T7ThUc4="; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Clients.ActiveDirectory"; version = "3.14.2"; hash = "sha256-mFlsKSQ6DsKttWuFkv6eMs0uSFHgwocxDad1icMXKj0="; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "5.4.0"; hash = "sha256-yKITMgW2JEXhPlQgdmofAyt0eEcCr72P4rM2EC6wrig="; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "5.4.0"; hash = "sha256-YKdSKQDO5+ssC5mqLGtBhuJ4lLbLUadMVV4PPJ6/tMU="; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "5.4.0"; hash = "sha256-gCJ+4QwhuBPSkDN+HcMCpTE2LFIQ3htI/SddoHOB7T4="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; hash = "sha256-mZotlGZqtrqDSoBrZhsxFe6fuOv5/BIo0w2Z2x0zVAU="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.2"; hash = "sha256-YLJ2+BONtCWb0lY4Rttdqzbcm4z+5N5uNr3byRWQOZ8="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; hash = "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; hash = "sha256-lxxw/Gy32xHi0fLgFWNj4YTFBSBkjx5l6ucmbTyf7V4="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; hash = "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ="; }) + (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.0.1"; hash = "sha256-B4t5El/ViBdxALMcpZulewc4j/3SIXf71HhJWhm4Ctk="; }) + (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; hash = "sha256-mBNDmPXNTW54XLnPAUwBRvkIORFM7/j0D0I2SyQPDEg="; }) + (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "4.3.0"; hash = "sha256-50XwFbyRfZkTD/bBn76WV/NIpOy/mzXD3MMEVFX/vr8="; }) + (fetchNuGet { pname = "NBitcoin"; version = "7.0.37"; hash = "sha256-RclQZgot+Y8PZi9JEX7tgUJinkIBXs1Qgf4vGR2y4rc="; }) + (fetchNuGet { pname = "NBitcoin.Altcoins"; version = "3.0.24"; hash = "sha256-MGxIuYtWPgSYj5JCMmZfP7u04ki/UpeN1+//gU6RsdI="; }) + (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; hash = "sha256-iNan1ix7RtncGWC9AjAZ2sk70DoxOsmEOgQ10fXm4Pw="; }) + (fetchNuGet { pname = "Newtonsoft.Json"; version = "10.0.3"; hash = "sha256-WEHCjp+OMr5axXQjFsh7TMDE/ttE35nMv5RBPdcxfhs="; }) + (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; hash = "sha256-K2tSVW4n4beRPzPu3rlVaBEMdGvWSv/3Q1fxaDh4Mjo="; }) + (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.3"; hash = "sha256-hy/BieY4qxBWVVsDqqOPaLy1QobiIapkbrESm6v2PHc="; }) + (fetchNuGet { pname = "Newtonsoft.Json.Bson"; version = "1.0.2"; hash = "sha256-ZUj6YFSMZp5CZtXiamw49eZmbp1iYBuNsIKNnjxcRzA="; }) + (fetchNuGet { pname = "NicolasDorier.CommandLine"; version = "2.0.0"; hash = "sha256-LizYyIMx6I17jZd52duYcGWNgcPs88c/zWxo/ADd3D8="; }) + (fetchNuGet { pname = "NicolasDorier.CommandLine.Configuration"; version = "2.0.0"; hash = "sha256-fDpDOVdt7xCDXXqaBnbaFvUOPaE0Sl4cLWjNkU0Cz7I="; }) + (fetchNuGet { pname = "NicolasDorier.StandardConfiguration"; version = "2.0.0"; hash = "sha256-mwPvVaESUnou1qd0b6oSmQfBBz28LmQIb1EoSUZvqAA="; }) + (fetchNuGet { pname = "Npgsql"; version = "8.0.3"; hash = "sha256-weBGo/IXKI5ufixBCuWG7OqDSyIqvGV07oxrG0XnQIQ="; }) + (fetchNuGet { pname = "RabbitMQ.Client"; version = "5.1.2"; hash = "sha256-reYeBKsqfrdZZ4Nq4dsqLo1GNtcT2A0VuOIHtW3ttqQ="; }) + (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; hash = "sha256-4PGZqyWhZ6/HCTF2KddDsbmTTjxs2oW79YfkberDZS8="; }) + (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tools"; version = "4.3.0"; hash = "sha256-8yLKFt2wQxkEf7fNfzB+cPUCjYn2qbqNgQ1+EeY2h/I="; }) + (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tracing"; version = "4.3.0"; hash = "sha256-dsmTLGvt8HqRkDWP8iKVXJCS+akAzENGXKPV18W2RgI="; }) + (fetchNuGet { pname = "runtime.any.System.Globalization"; version = "4.3.0"; hash = "sha256-PaiITTFI2FfPylTEk7DwzfKeiA/g/aooSU1pDcdwWLU="; }) + (fetchNuGet { pname = "runtime.any.System.Globalization.Calendars"; version = "4.3.0"; hash = "sha256-AYh39tgXJVFu8aLi9Y/4rK8yWMaza4S4eaxjfcuEEL4="; }) + (fetchNuGet { pname = "runtime.any.System.IO"; version = "4.3.0"; hash = "sha256-vej7ySRhyvM3pYh/ITMdC25ivSd0WLZAaIQbYj/6HVE="; }) + (fetchNuGet { pname = "runtime.any.System.Reflection"; version = "4.3.0"; hash = "sha256-ns6f++lSA+bi1xXgmW1JkWFb2NaMD+w+YNTfMvyAiQk="; }) + (fetchNuGet { pname = "runtime.any.System.Reflection.Extensions"; version = "4.3.0"; hash = "sha256-Y2AnhOcJwJVYv7Rp6Jz6ma0fpITFqJW+8rsw106K2X8="; }) + (fetchNuGet { pname = "runtime.any.System.Reflection.Primitives"; version = "4.3.0"; hash = "sha256-LkPXtiDQM3BcdYkAm5uSNOiz3uF4J45qpxn5aBiqNXQ="; }) + (fetchNuGet { pname = "runtime.any.System.Resources.ResourceManager"; version = "4.3.0"; hash = "sha256-9EvnmZslLgLLhJ00o5MWaPuJQlbUFcUF8itGQNVkcQ4="; }) + (fetchNuGet { pname = "runtime.any.System.Runtime"; version = "4.3.0"; hash = "sha256-qwhNXBaJ1DtDkuRacgHwnZmOZ1u9q7N8j0cWOLYOELM="; }) + (fetchNuGet { pname = "runtime.any.System.Runtime.Handles"; version = "4.3.0"; hash = "sha256-PQRACwnSUuxgVySO1840KvqCC9F8iI9iTzxNW0RcBS4="; }) + (fetchNuGet { pname = "runtime.any.System.Runtime.InteropServices"; version = "4.3.0"; hash = "sha256-Kaw5PnLYIiqWbsoF3VKJhy7pkpoGsUwn4ZDCKscbbzA="; }) + (fetchNuGet { pname = "runtime.any.System.Text.Encoding"; version = "4.3.0"; hash = "sha256-Q18B9q26MkWZx68exUfQT30+0PGmpFlDgaF0TnaIGCs="; }) + (fetchNuGet { pname = "runtime.any.System.Text.Encoding.Extensions"; version = "4.3.0"; hash = "sha256-6MYj0RmLh4EVqMtO/MRqBi0HOn5iG4x9JimgCCJ+EFM="; }) + (fetchNuGet { pname = "runtime.any.System.Threading.Tasks"; version = "4.3.0"; hash = "sha256-agdOM0NXupfHbKAQzQT8XgbI9B8hVEh+a/2vqeHctg4="; }) + (fetchNuGet { pname = "runtime.any.System.Threading.Timer"; version = "4.3.0"; hash = "sha256-BgHxXCIbicVZtpgMimSXixhFC3V+p5ODqeljDjO8hCs="; }) + (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-LXUPLX3DJxsU1Pd3UwjO1PO9NM2elNEDXeu2Mu/vNps="; }) + (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-qeSqaUI80+lqw5MK4vMpmO0CZaqrmYktwp6L+vQAb0I="; }) + (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-SrHqT9wrCBsxILWtaJgGKd6Odmxm8/Mh7Kh0CUkZVzA="; }) + (fetchNuGet { pname = "runtime.native.System"; version = "4.0.0"; hash = "sha256-bmaM0ovT4X4aqDJOR255Yda/u3fmHZskU++lMnsy894="; }) + (fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; hash = "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y="; }) + (fetchNuGet { pname = "runtime.native.System.IO.Compression"; version = "4.3.0"; hash = "sha256-DWnXs4vlKoU6WxxvCArTJupV6sX3iBbZh8SbqfHace8="; }) + (fetchNuGet { pname = "runtime.native.System.Net.Http"; version = "4.0.1"; hash = "sha256-5nWnTQrA1T6t9r8MqIiV4yTNu+IH0of2OX1qteoS+8E="; }) + (fetchNuGet { pname = "runtime.native.System.Net.Http"; version = "4.3.0"; hash = "sha256-c556PyheRwpYhweBjSfIwEyZHnAUB8jWioyKEcp/2dg="; }) + (fetchNuGet { pname = "runtime.native.System.Net.Security"; version = "4.3.0"; hash = "sha256-I8vYld/7WtU2/rrD4XfSRgpO/DY3qXghG14VQjiU2DY="; }) + (fetchNuGet { pname = "runtime.native.System.Security.Cryptography"; version = "4.0.0"; hash = "sha256-6Q8eYzC32BbGIiTHoQaE6B3cD81vYQcH5SCswYRSp0w="; }) + (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; hash = "sha256-2IhBv0i6pTcOyr8FFIyfPEaaCHUmJZ8DYwLUwJ+5waw="; }) + (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-Jy01KhtcCl2wjMpZWH+X3fhHcVn+SyllWFY8zWlz/6I="; }) + (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-wyv00gdlqf8ckxEdV7E+Ql9hJIoPcmYEuyeWb5Oz3mM="; }) + (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-zi+b4sCFrA9QBiSGDD7xPV27r3iHGlV99gpyVUjRmc4="; }) + (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; hash = "sha256-serkd4A7F6eciPiPJtUyJyxzdAtupEcWIZQ9nptEzIM="; }) + (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-gybQU6mPgaWV3rBG2dbH6tT3tBq8mgze3PROdsuWnX0="; }) + (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-VsP72GVveWnGUvS/vjOQLv1U80H2K8nZ4fDAmI61Hm4="; }) + (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-4yKGa/IrNCKuQ3zaDzILdNPD32bNdy6xr5gdJigyF5g="; }) + (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-HmdJhhRsiVoOOCcUvAwdjpMRiyuSwdcgEv2j9hxi+Zc="; }) + (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-pVFUKuPPIx0edQKjzRon3zKq8zhzHEzko/lc01V/jdw="; }) + (fetchNuGet { pname = "runtime.unix.Microsoft.Win32.Primitives"; version = "4.3.0"; hash = "sha256-LZb23lRXzr26tRS5aA0xyB08JxiblPDoA7HBvn6awXg="; }) + (fetchNuGet { pname = "runtime.unix.System.Console"; version = "4.3.0"; hash = "sha256-AHkdKShTRHttqfMjmi+lPpTuCrM5vd/WRy6Kbtie190="; }) + (fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; hash = "sha256-ReoazscfbGH+R6s6jkg5sIEHWNEvjEoHtIsMbpc7+tI="; }) + (fetchNuGet { pname = "runtime.unix.System.IO.FileSystem"; version = "4.3.0"; hash = "sha256-Pf4mRl6YDK2x2KMh0WdyNgv0VUNdSKVDLlHqozecy5I="; }) + (fetchNuGet { pname = "runtime.unix.System.Net.Primitives"; version = "4.3.0"; hash = "sha256-pHJ+I6i16MV6m77uhTC6GPY6jWGReE3SSP3fVB59ti0="; }) + (fetchNuGet { pname = "runtime.unix.System.Net.Sockets"; version = "4.3.0"; hash = "sha256-IvgOeA2JuBjKl5yAVGjPYMPDzs9phb3KANs95H9v1w4="; }) + (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; hash = "sha256-c5tXWhE/fYbJVl9rXs0uHh3pTsg44YD1dJvyOA0WoMs="; }) + (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; hash = "sha256-l8S9gt6dk3qYG6HYonHtdlYtBKyPb29uQ6NDjmrt3V4="; }) + (fetchNuGet { pname = "System.AppContext"; version = "4.3.0"; hash = "sha256-yg95LNQOwFlA1tWxXdQkVyJqT4AnoDc+ACmrNvzGiZg="; }) + (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; hash = "sha256-XqZWb4Kd04960h4U9seivjKseGA/YEIpdplfHYHQ9jk="; }) + (fetchNuGet { pname = "System.Collections"; version = "4.0.11"; hash = "sha256-puoFMkx4Z55C1XPxNw3np8nzNGjH+G24j43yTIsDRL0="; }) + (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; hash = "sha256-afY7VUtD6w/5mYqrce8kQrvDIfS2GXDINDh73IjxJKc="; }) + (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.0.12"; hash = "sha256-zIEM7AB4SyE9u6G8+o+gCLLwkgi6+3rHQVPdn/dEwB8="; }) + (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.3.0"; hash = "sha256-KMY5DfJnDeIsa13DpqvyN8NkReZEMAFnlmNglVoFIXI="; }) + (fetchNuGet { pname = "System.Collections.NonGeneric"; version = "4.3.0"; hash = "sha256-8/yZmD4jjvq7m68SPkJZLBQ79jOTOyT5lyzX4SCYAx8="; }) + (fetchNuGet { pname = "System.Collections.Specialized"; version = "4.3.0"; hash = "sha256-QNg0JJNx+zXMQ26MJRPzH7THdtqjrNtGLUgaR1SdvOk="; }) + (fetchNuGet { pname = "System.ComponentModel"; version = "4.3.0"; hash = "sha256-i00uujMO4JEDIEPKLmdLY3QJ6vdSpw6Gh9oOzkFYBiU="; }) + (fetchNuGet { pname = "System.ComponentModel.Primitives"; version = "4.3.0"; hash = "sha256-IOMJleuIBppmP4ECB3uftbdcgL7CCd56+oAD/Sqrbus="; }) + (fetchNuGet { pname = "System.ComponentModel.TypeConverter"; version = "4.3.0"; hash = "sha256-PSDiPYt8PgTdTUBz+GH6lHCaM1YgfObneHnZsc8Fz54="; }) + (fetchNuGet { pname = "System.Console"; version = "4.3.0"; hash = "sha256-Xh3PPBZr0pDbDaK8AEHbdGz7ePK6Yi1ZyRWI1JM6mbo="; }) + (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.0.11"; hash = "sha256-P+rSQJVoN6M56jQbs76kZ9G3mAWFdtF27P/RijN8sj4="; }) + (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; hash = "sha256-fkA79SjPbSeiEcrbbUsb70u9B7wqbsdM9s1LnoKj0gM="; }) + (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.5.1"; hash = "sha256-gZEDRv0v0AAauQ36BWXkJk3GLW0sYH6QPxa0p2l8Dck="; }) + (fetchNuGet { pname = "System.Diagnostics.Process"; version = "4.3.0"; hash = "sha256-Rzo24qXhuJDDgrGNHr2eQRHhwLmsYmWDqAg/P5fOlzw="; }) + (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.3.0"; hash = "sha256-gVOv1SK6Ape0FQhCVlNOd9cvQKBvMxRX9K0JPVi8w0Y="; }) + (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.1.0"; hash = "sha256-JA0jJcLbU3zh52ub3zweob2EVHvxOqiC6SCYHrY5WbQ="; }) + (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; hash = "sha256-hCETZpHHGVhPYvb4C0fh4zs+8zv4GPoixagkLZjpa9Q="; }) + (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.3.0"; hash = "sha256-k75gjOYimIQtLBD5NDzwwi3ZMUBPRW3jmc3evDMMJbU="; }) + (fetchNuGet { pname = "System.Globalization"; version = "4.0.11"; hash = "sha256-rbSgc2PIEc2c2rN6LK3qCREAX3DqA2Nq1WcLrZYsDBw="; }) + (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; hash = "sha256-caL0pRmFSEsaoeZeWN5BTQtGrAtaQPwFi8YOZPZG5rI="; }) + (fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.0.1"; hash = "sha256-EJN3LbN+b0O9Dr2eg7kfThCYpne0iJ/H/GIyUTNVYC8="; }) + (fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.3.0"; hash = "sha256-uNOD0EOVFgnS2fMKvMiEtI9aOw00+Pfy/H+qucAQlPc="; }) + (fetchNuGet { pname = "System.Globalization.Extensions"; version = "4.3.0"; hash = "sha256-mmJWA27T0GRVuFP9/sj+4TrR4GJWrzNIk2PDrbr7RQk="; }) + (fetchNuGet { pname = "System.IdentityModel.Tokens.Jwt"; version = "5.4.0"; hash = "sha256-zLtoejPBG8yeFEPIcXZAkdAb0WDnrVXh5YsUYKULyRU="; }) + (fetchNuGet { pname = "System.IO"; version = "4.1.0"; hash = "sha256-V6oyQFwWb8NvGxAwvzWnhPxy9dKOfj/XBM3tEC5aHrw="; }) + (fetchNuGet { pname = "System.IO"; version = "4.3.0"; hash = "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY="; }) + (fetchNuGet { pname = "System.IO.Compression"; version = "4.3.0"; hash = "sha256-f5PrQlQgj5Xj2ZnHxXW8XiOivaBvfqDao9Sb6AVinyA="; }) + (fetchNuGet { pname = "System.IO.Compression.ZipFile"; version = "4.3.0"; hash = "sha256-WQl+JgWs+GaRMeiahTFUbrhlXIHapzcpTFXbRvAtvvs="; }) + (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.0.1"; hash = "sha256-4VKXFgcGYCTWVXjAlniAVq0dO3o5s8KHylg2wg2/7k0="; }) + (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.3.0"; hash = "sha256-vNIYnvlayuVj0WfRfYKpDrhDptlhp1pN8CYmlVd2TXw="; }) + (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.0.1"; hash = "sha256-IpigKMomqb6pmYWkrlf0ZdpILtRluX2cX5sOKVW0Feg="; }) + (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; hash = "sha256-LMnfg8Vwavs9cMnq9nNH8IWtAtSfk0/Fy4s4Rt9r1kg="; }) + (fetchNuGet { pname = "System.Linq"; version = "4.1.0"; hash = "sha256-ZQpFtYw5N1F1aX0jUK3Tw+XvM5tnlnshkTCNtfVA794="; }) + (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; hash = "sha256-R5uiSL3l6a3XrXSSL6jz+q/PcyVQzEAByiuXZNSqD/A="; }) + (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; hash = "sha256-+3pvhZY7rip8HCbfdULzjlC9FPZFpYoQxhkcuFm2wk8="; }) + (fetchNuGet { pname = "System.Net.Http"; version = "4.3.0"; hash = "sha256-UoBB7WPDp2Bne/fwxKF0nE8grJ6FzTMXdT/jfsphj8Q="; }) + (fetchNuGet { pname = "System.Net.NameResolution"; version = "4.3.0"; hash = "sha256-eGZwCBExWsnirWBHyp2sSSSXp6g7I6v53qNmwPgtJ5c="; }) + (fetchNuGet { pname = "System.Net.Primitives"; version = "4.0.11"; hash = "sha256-2YSijNhCdw/ZU2yfH7vE+ReA8pgxRCXPnWr+ab36v4M="; }) + (fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; hash = "sha256-MY7Z6vOtFMbEKaLW9nOSZeAjcWpwCtdO7/W1mkGZBzE="; }) + (fetchNuGet { pname = "System.Net.Security"; version = "4.3.0"; hash = "sha256-B7laE1z1+ldbo6JkjlDjZynG5JiMZ/3uNHPHMP6LRak="; }) + (fetchNuGet { pname = "System.Net.Sockets"; version = "4.3.0"; hash = "sha256-il7dr5VT/QWDg/0cuh+4Es2u8LY//+qqiY9BZmYxSus="; }) + (fetchNuGet { pname = "System.Net.WebHeaderCollection"; version = "4.0.1"; hash = "sha256-uJSV6kmL+V/9/ot1LhHXGCd8Ndcu6zk+AJ8wgGS/fYE="; }) + (fetchNuGet { pname = "System.Net.WebHeaderCollection"; version = "4.3.0"; hash = "sha256-wpRP3D/2YjpFmqU7Q42L/+/hChEVMlwU1sjysGVrQ1c="; }) + (fetchNuGet { pname = "System.Net.WebSockets"; version = "4.0.0"; hash = "sha256-YhLVuTPyEiHAjdBMHyIobGpysDbAtgZNDX2Q2xKGTRI="; }) + (fetchNuGet { pname = "System.Net.WebSockets"; version = "4.3.0"; hash = "sha256-l3h3cF1cCC9zMhWLKSDnZBZvFADUd0Afe2+iAwBA0r0="; }) + (fetchNuGet { pname = "System.Net.WebSockets.Client"; version = "4.0.2"; hash = "sha256-miyjFY0E49/rtWDOF7QR26jJlYn3WRiQQOonSBJMFV0="; }) + (fetchNuGet { pname = "System.Net.WebSockets.Client"; version = "4.3.2"; hash = "sha256-MwNKwIIpBJhC4Na6EYWMmVyPCa064Yp1aL0opx1FfoA="; }) + (fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; hash = "sha256-gtmRkWP2Kwr3nHtDh0yYtce38z1wrGzb6fjm4v8wN6Q="; }) + (fetchNuGet { pname = "System.Private.DataContractSerialization"; version = "4.1.1"; hash = "sha256-OaE+ZcEfkpIkbdMOMAMiJa9vgiVP25FGuFrf+N/mafY="; }) + (fetchNuGet { pname = "System.Private.DataContractSerialization"; version = "4.3.0"; hash = "sha256-vNlHUKkaFvhiVnTY0JNsNT5E6TW9CFRzTqVcufGN0hk="; }) + (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; hash = "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM="; }) + (fetchNuGet { pname = "System.Reflection"; version = "4.1.0"; hash = "sha256-idZHGH2Yl/hha1CM4VzLhsaR8Ljo/rV7TYe7mwRJSMs="; }) + (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; hash = "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY="; }) + (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.0.1"; hash = "sha256-F1MvYoQWHCY89/O4JBwswogitqVvKuVfILFqA7dmuHk="; }) + (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.3.0"; hash = "sha256-5LhkDmhy2FkSxulXR+bsTtMzdU3VyyuZzsxp7/DwyIU="; }) + (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.0.1"; hash = "sha256-YG+eJBG5P+5adsHiw/lhJwvREnvdHw6CJyS8ZV4Ujd0="; }) + (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; hash = "sha256-mKRknEHNls4gkRwrEgi39B+vSaAz/Gt3IALtS98xNnA="; }) + (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.0.1"; hash = "sha256-uVvNOnL64CPqsgZP2OLqNmxdkZl6Q0fTmKmv9gcBi+g="; }) + (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.3.0"; hash = "sha256-rKx4a9yZKcajloSZHr4CKTVJ6Vjh95ni+zszPxWjh2I="; }) + (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.0.1"; hash = "sha256-NsfmzM9G/sN3H8X2cdnheTGRsh7zbRzvegnjDzDH/FQ="; }) + (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; hash = "sha256-mMOCYzUenjd4rWIfq7zIX9PFYk/daUyF0A8l1hbydAk="; }) + (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.0.1"; hash = "sha256-SFSfpWEyCBMAOerrMCOiKnpT+UAWTvRcmoRquJR6Vq0="; }) + (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; hash = "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM="; }) + (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.1.0"; hash = "sha256-R0YZowmFda+xzKNR4kKg7neFoE30KfZwp/IwfRSKVK4="; }) + (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.3.0"; hash = "sha256-4U4/XNQAnddgQIHIJq3P2T80hN0oPdU2uCeghsDTWng="; }) + (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.0.1"; hash = "sha256-cZ2/3/fczLjEpn6j3xkgQV9ouOVjy4Kisgw5xWw9kSw="; }) + (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; hash = "sha256-idiOD93xbbrbwwSnD4mORA9RYi/D/U48eRUsn/WnWGo="; }) + (fetchNuGet { pname = "System.Runtime"; version = "4.1.0"; hash = "sha256-FViNGM/4oWtlP6w0JC0vJU+k9efLKZ+yaXrnEeabDQo="; }) + (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; hash = "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg="; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; hash = "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I="; }) + (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.1.0"; hash = "sha256-X7DZ5CbPY7jHs20YZ7bmcXs9B5Mxptu/HnBUvUnNhGc="; }) + (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; hash = "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o="; }) + (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.0.1"; hash = "sha256-j2QgVO9ZOjv7D1het98CoFpjoYgxjupuIhuBUmLLH7w="; }) + (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; hash = "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms="; }) + (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.1.0"; hash = "sha256-QceAYlJvkPRJc/+5jR+wQpNNI3aqGySWWSO30e/FfQY="; }) + (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; hash = "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI="; }) + (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.3.0"; hash = "sha256-MYpl6/ZyC6hjmzWRIe+iDoldOMW1mfbwXsduAnXIKGA="; }) + (fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.0.1"; hash = "sha256-1pJt5ZGxLPTX1mjOi8qZPXyyOMkYV0NstoUCv91HYPg="; }) + (fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.3.0"; hash = "sha256-P5jHCgMbgFMYiONvzmaKFeOqcAIDPu/U8bOVrNPYKqc="; }) + (fetchNuGet { pname = "System.Runtime.Serialization.Formatters"; version = "4.3.0"; hash = "sha256-Feic7MGKVG4imh7kpLkPHmApQzYjq7SxHnazh2wZkoQ="; }) + (fetchNuGet { pname = "System.Runtime.Serialization.Json"; version = "4.0.2"; hash = "sha256-thmzgYbyxoPYtkDdDwoG7wnVuVhFNwLUE2AsDfRf1yM="; }) + (fetchNuGet { pname = "System.Runtime.Serialization.Primitives"; version = "4.1.1"; hash = "sha256-80B05oxJbPLGq2pGOSl6NlZvintX9A1CNpna2aN0WRA="; }) + (fetchNuGet { pname = "System.Runtime.Serialization.Primitives"; version = "4.3.0"; hash = "sha256-zu5m1M9usend+i9sbuD6Xbizdo8Z6N5PEF9DAtEVewc="; }) + (fetchNuGet { pname = "System.Runtime.Serialization.Xml"; version = "4.3.0"; hash = "sha256-0bp8xtv2cP/IuxaBF8xkyYYD8N6w1wVX8wzpAwXtTKw="; }) + (fetchNuGet { pname = "System.Security.Claims"; version = "4.3.0"; hash = "sha256-Fua/rDwAqq4UByRVomAxMPmDBGd5eImRqHVQIeSxbks="; }) + (fetchNuGet { pname = "System.Security.Cryptography.Algorithms"; version = "4.2.0"; hash = "sha256-BelNIpEyToEp/VYKnje/q1P7KNEpQNtOzGPU18pLGpE="; }) + (fetchNuGet { pname = "System.Security.Cryptography.Algorithms"; version = "4.3.0"; hash = "sha256-tAJvNSlczYBJ3Ed24Ae27a55tq/n4D3fubNQdwcKWA8="; }) + (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.2.0"; hash = "sha256-7F+m3HnmBsgE4xWF8FeCGlaEgQM3drqA6HEaQr6MEoU="; }) + (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.3.0"; hash = "sha256-u17vy6wNhqok91SrVLno2M1EzLHZm6VMca85xbVChsw="; }) + (fetchNuGet { pname = "System.Security.Cryptography.Csp"; version = "4.0.0"; hash = "sha256-WHyR6vVK3zaT4De7jgQFUar1P5fiX9ECwiVkJDFFm7M="; }) + (fetchNuGet { pname = "System.Security.Cryptography.Csp"; version = "4.3.0"; hash = "sha256-oefdTU/Z2PWU9nlat8uiRDGq/PGZoSPRgkML11pmvPQ="; }) + (fetchNuGet { pname = "System.Security.Cryptography.Encoding"; version = "4.0.0"; hash = "sha256-ZO7ha39J5uHkIF2RoEKv/bW/bLbVvYMO4+rWyYsKHik="; }) + (fetchNuGet { pname = "System.Security.Cryptography.Encoding"; version = "4.3.0"; hash = "sha256-Yuge89N6M+NcblcvXMeyHZ6kZDfwBv3LPMDiF8HhJss="; }) + (fetchNuGet { pname = "System.Security.Cryptography.OpenSsl"; version = "4.0.0"; hash = "sha256-mLijAozynzjiOMyh2P5BHcfVq3Ovd0T/phG08SIbXZs="; }) + (fetchNuGet { pname = "System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-DL+D2sc2JrQiB4oAcUggTFyD8w3aLEjJfod5JPe+Oz4="; }) + (fetchNuGet { pname = "System.Security.Cryptography.Primitives"; version = "4.0.0"; hash = "sha256-sEdPftfTxQd/8DpdpqUZC2XWC0SjVCPqAkEleLl17EQ="; }) + (fetchNuGet { pname = "System.Security.Cryptography.Primitives"; version = "4.3.0"; hash = "sha256-fnFi7B3SnVj5a+BbgXnbjnGNvWrCEU6Hp/wjsjWz318="; }) + (fetchNuGet { pname = "System.Security.Cryptography.X509Certificates"; version = "4.1.0"; hash = "sha256-sBUUhJP+yYDXvcjNMKqNpn8yzGUpVABwK9vVUvYKjzI="; }) + (fetchNuGet { pname = "System.Security.Cryptography.X509Certificates"; version = "4.3.0"; hash = "sha256-MG3V/owDh273GCUPsGGraNwaVpcydupl3EtPXj6TVG0="; }) + (fetchNuGet { pname = "System.Security.Principal"; version = "4.3.0"; hash = "sha256-rjudVUHdo8pNJg2EVEn0XxxwNo5h2EaYo+QboPkXlYk="; }) + (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.3.0"; hash = "sha256-mbdLVUcEwe78p3ZnB6jYsizNEqxMaCAWI3tEQNhRQAE="; }) + (fetchNuGet { pname = "System.Text.Encoding"; version = "4.0.11"; hash = "sha256-PEailOvG05CVgPTyKLtpAgRydlSHmtd5K0Y8GSHY2Lc="; }) + (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; hash = "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg="; }) + (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.0.11"; hash = "sha256-+kf7J3dEhgCbnCM5vHYlsTm5/R/Ud0Jr6elpHm922iI="; }) + (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; hash = "sha256-vufHXg8QAKxHlujPHHcrtGwAqFmsCD6HKjfDAiHyAYc="; }) + (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.1.0"; hash = "sha256-x6OQN6MCN7S0fJ6EFTfv4rczdUWjwuWE9QQ0P6fbh9c="; }) + (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; hash = "sha256-VLCk1D1kcN2wbAe3d0YQM/PqCsPHOuqlBY1yd2Yo+K0="; }) + (fetchNuGet { pname = "System.Threading"; version = "4.0.11"; hash = "sha256-mob1Zv3qLQhQ1/xOLXZmYqpniNUMCfn02n8ZkaAhqac="; }) + (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; hash = "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc="; }) + (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.0.11"; hash = "sha256-5SLxzFg1df6bTm2t09xeI01wa5qQglqUwwJNlQPJIVs="; }) + (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; hash = "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w="; }) + (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.0.0"; hash = "sha256-+YdcPkMhZhRbMZHnfsDwpNbUkr31X7pQFGxXYcAPZbE="; }) + (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.3.0"; hash = "sha256-X2hQ5j+fxcmnm88Le/kSavjiGOmkcumBGTZKBLvorPc="; }) + (fetchNuGet { pname = "System.Threading.Thread"; version = "4.3.0"; hash = "sha256-pMs6RNFC3nQOGz9EqIcyWmO8YLaqay+q/Qde5hqPXXg="; }) + (fetchNuGet { pname = "System.Threading.ThreadPool"; version = "4.3.0"; hash = "sha256-wW0QdvssRoaOfQLazTGSnwYTurE4R8FxDx70pYkL+gg="; }) + (fetchNuGet { pname = "System.Threading.Timer"; version = "4.3.0"; hash = "sha256-pmhslmhQhP32TWbBzoITLZ4BoORBqYk25OWbru04p9s="; }) + (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.0.11"; hash = "sha256-haZAFFQ9Sl2DhfvEbdx2YRqKEoxNMU5STaqpMmXw0zA="; }) + (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.3.0"; hash = "sha256-QQ8KgU0lu4F5Unh+TbechO//zaAGZ4MfgvW72Cn1hzA="; }) + (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.3.0"; hash = "sha256-rWtdcmcuElNOSzCehflyKwHkDRpiOhJJs8CeQ0l1CCI="; }) + (fetchNuGet { pname = "System.Xml.XmlDocument"; version = "4.0.1"; hash = "sha256-gdoFrPo54v1LjkBF79f8EvtltVVjHz9ZI9kc5ve0GkY="; }) + (fetchNuGet { pname = "System.Xml.XmlDocument"; version = "4.3.0"; hash = "sha256-kbuV4Y7rVJkfMp2Kgoi8Zvdatm9CZNmlKB3GZgANvy4="; }) + (fetchNuGet { pname = "System.Xml.XmlSerializer"; version = "4.0.11"; hash = "sha256-v6x4d6W18dijG5cDqQmVHdtWRf6Y4OkdBolT3d5g3wY="; }) + (fetchNuGet { pname = "System.Xml.XmlSerializer"; version = "4.3.0"; hash = "sha256-IqTGPENWYoI06x2NHFPVtHlLEq9tazbom32bFLom6h4="; }) ] diff --git a/pkgs/applications/blockchains/nearcore/default.nix b/pkgs/applications/blockchains/nearcore/default.nix index ec8d4360a6fff..46fbc289bde35 100644 --- a/pkgs/applications/blockchains/nearcore/default.nix +++ b/pkgs/applications/blockchains/nearcore/default.nix @@ -1,6 +1,6 @@ { rustPlatform, lib, fetchFromGitHub , zlib, openssl -, pkg-config, protobuf, llvmPackages +, pkg-config, protobuf }: rustPlatform.buildRustPackage rec { pname = "nearcore"; diff --git a/pkgs/applications/blockchains/optimism/default.nix b/pkgs/applications/blockchains/optimism/default.nix index 5411d5a06a22d..945ef865f9647 100644 --- a/pkgs/applications/blockchains/optimism/default.nix +++ b/pkgs/applications/blockchains/optimism/default.nix @@ -6,19 +6,19 @@ buildGoModule rec { pname = "optimism"; - version = "1.7.7"; + version = "1.9.1"; src = fetchFromGitHub { owner = "ethereum-optimism"; repo = "optimism"; rev = "op-node/v${version}"; - hash = "sha256-KN6Y8YhYGNGg/t4t599RAo6mF7Wn7GaSnrLEk3WLekc="; + hash = "sha256-PlwpN8P1t0NNIU+Ys50dIXmfUQFIY9e1tLABiVK0JQo="; fetchSubmodules = true; }; subPackages = [ "op-node/cmd" "op-proposer/cmd" "op-batcher/cmd" ]; - vendorHash = "sha256-MWGjRj5SMFi3O86l3Gc/oavzWd1TtoKr53eEXbCOamQ="; + vendorHash = "sha256-n1uJ/dkEjjsTdmL7TeHU4PKnBhiRrqCNtcGxK70Q0c4="; buildInputs = [ libpcap diff --git a/pkgs/applications/blockchains/optimism/geth.nix b/pkgs/applications/blockchains/optimism/geth.nix index 722402e704d3e..473ee254d08fe 100644 --- a/pkgs/applications/blockchains/optimism/geth.nix +++ b/pkgs/applications/blockchains/optimism/geth.nix @@ -37,7 +37,7 @@ buildGoModule rec { # Fix for usb-related segmentation faults on darwin propagatedBuildInputs = - lib.optionals stdenv.isDarwin [ libobjc IOKit ]; + lib.optionals stdenv.hostPlatform.isDarwin [ libobjc IOKit ]; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/applications/blockchains/particl-core/default.nix b/pkgs/applications/blockchains/particl-core/default.nix index dcd9f107b9267..12e86358c9544 100644 --- a/pkgs/applications/blockchains/particl-core/default.nix +++ b/pkgs/applications/blockchains/particl-core/default.nix @@ -4,6 +4,7 @@ , boost , db48 , fetchFromGitHub +, fetchpatch2 , libevent , miniupnpc , openssl @@ -25,6 +26,14 @@ stdenv.mkDerivation rec { hash = "sha256-RxkLt+7u+r5jNwEWiArTUpZ8ykYwWtvIDFXTSKhGN/w="; }; + patches = [ + # upnp: fix build with miniupnpc 2.2.8 + (fetchpatch2 { + url = "https://github.com/bitcoin/bitcoin/commit/8acdf66540834b9f9cf28f16d389e8b6a48516d5.patch?full_index=1"; + hash = "sha256-oDvHUvwAEp0LJCf6QBESn38Bu359TcPpLhvuLX3sm6M="; + }) + ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ openssl db48 boost zlib miniupnpc libevent zeromq unixtools.hexdump python3 ]; @@ -41,7 +50,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); description = "Privacy-Focused Marketplace & Decentralized Application Platform"; longDescription = '' An open source, decentralized privacy platform built for global person to person eCommerce. diff --git a/pkgs/applications/blockchains/pivx/default.nix b/pkgs/applications/blockchains/pivx/default.nix deleted file mode 100644 index 9e6894d760d46..0000000000000 --- a/pkgs/applications/blockchains/pivx/default.nix +++ /dev/null @@ -1,79 +0,0 @@ -{ fetchFromGitHub -, lib -, stdenv -, pkg-config -, autoreconfHook -, wrapQtAppsHook -, openssl -, db48 -, boost -, zlib -, miniupnpc -, gmp -, qrencode -, glib -, protobuf -, yasm -, libevent -, util-linux -, qtbase -, qttools -, enableUpnp ? false -, disableWallet ? false -, disableDaemon ? false -, withGui ? false -}: - -stdenv.mkDerivation rec { - pname = "pivx"; - version = "4.1.1"; - - src = fetchFromGitHub { - owner = "PIVX-Project"; - repo = "PIVX"; - rev = "v${version}"; - sha256 = "03ndk46h6093v8s18d5iffz48zhlshq7jrk6vgpjfs6z2iqgd2sy"; - }; - - nativeBuildInputs = [ pkg-config autoreconfHook ] - ++ lib.optionals withGui [ wrapQtAppsHook ]; - - buildInputs = [ glib gmp openssl db48 yasm boost zlib libevent miniupnpc protobuf util-linux ] - ++ lib.optionals withGui [ qtbase qttools qrencode ]; - - configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ] - ++ lib.optional enableUpnp "--enable-upnp-default" - ++ lib.optional disableWallet "--disable-wallet" - ++ lib.optional disableDaemon "--disable-daemon" - ++ lib.optionals withGui [ - "--with-gui=yes" - "--with-qt-bindir=${lib.getDev qtbase}/bin:${lib.getDev qttools}/bin" - ]; - - enableParallelBuilding = true; - doCheck = true; - postBuild = '' - mkdir -p $out/share/applications $out/share/icons - cp contrib/debian/pivx-qt.desktop $out/share/applications/ - cp share/pixmaps/*128.png $out/share/icons/ - ''; - - doInstallCheck = true; - installCheckPhase = '' - $out/bin/test_pivx - ''; - - meta = with lib; { - broken = true; - description = "Open source crypto-currency focused on fast private transactions"; - longDescription = '' - PIVX is an MIT licensed, open source, blockchain-based cryptocurrency with - ultra fast transactions, low fees, high network decentralization, and - Zero Knowledge cryptography proofs for industry-leading transaction anonymity. - ''; - license = licenses.mit; - homepage = "https://pivx.org"; - maintainers = with maintainers; [ ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/applications/blockchains/polkadot/Cargo.lock b/pkgs/applications/blockchains/polkadot/Cargo.lock index 35ecdef1364c3..5b5faf69a831d 100644 --- a/pkgs/applications/blockchains/polkadot/Cargo.lock +++ b/pkgs/applications/blockchains/polkadot/Cargo.lock @@ -83,19 +83,19 @@ version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9" dependencies = [ - "getrandom 0.2.10", + "getrandom", "once_cell", "version_check", ] [[package]] name = "ahash" -version = "0.8.8" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42cd52102d3df161c77a887b608d7a4897d7cc112886a9537b738a887a03aaff" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ "cfg-if", - "getrandom 0.2.10", + "getrandom", "once_cell", "version_check", "zerocopy", @@ -130,7 +130,7 @@ dependencies = [ "hex-literal", "itoa", "proptest", - "rand 0.8.5", + "rand", "ruint", "serde", "tiny-keccak", @@ -551,20 +551,6 @@ dependencies = [ [[package]] name = "ark-scale" -version = "0.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51bd73bb6ddb72630987d37fa963e99196896c0d0ea81b7c894567e74a2f83af" -dependencies = [ - "ark-ec", - "ark-ff 0.4.2", - "ark-serialize 0.4.2", - "ark-std 0.4.0", - "parity-scale-codec", - "scale-info", -] - -[[package]] -name = "ark-scale" version = "0.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f69c00b3b529be29528a6f2fd5fa7b1790f8bed81b9cdca17e326538545a179" @@ -578,21 +564,6 @@ dependencies = [ ] [[package]] -name = "ark-secret-scalar" -version = "0.0.2" -source = "git+https://github.com/w3f/ring-vrf?rev=e9782f9#e9782f938629c90f3adb3fff2358bc8d1386af3e" -dependencies = [ - "ark-ec", - "ark-ff 0.4.2", - "ark-serialize 0.4.2", - "ark-std 0.4.0", - "ark-transcript", - "digest 0.10.7", - "getrandom_or_panic", - "zeroize", -] - -[[package]] name = "ark-serialize" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -632,7 +603,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1df2c09229cbc5a028b1d70e00fdb2acee28b1055dfb5ca73eea49c5a25c4e7c" dependencies = [ "num-traits", - "rand 0.8.5", + "rand", ] [[package]] @@ -642,24 +613,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94893f1e0c6eeab764ade8dc4c0db24caf4fe7cbbaafc0eba0a9030f447b5185" dependencies = [ "num-traits", - "rand 0.8.5", + "rand", "rayon", ] [[package]] -name = "ark-transcript" -version = "0.0.2" -source = "git+https://github.com/w3f/ring-vrf?rev=e9782f9#e9782f938629c90f3adb3fff2358bc8d1386af3e" -dependencies = [ - "ark-ff 0.4.2", - "ark-serialize 0.4.2", - "ark-std 0.4.0", - "digest 0.10.7", - "rand_core 0.6.4", - "sha3", -] - -[[package]] name = "array-bytes" version = "6.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -692,8 +650,24 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f6fd5ddaf0351dff5b8da21b2fb4ff8e08ddd02857f0bf69c47639106c0fff0" dependencies = [ - "asn1-rs-derive", - "asn1-rs-impl", + "asn1-rs-derive 0.4.0", + "asn1-rs-impl 0.1.0", + "displaydoc", + "nom", + "num-traits", + "rusticata-macros", + "thiserror", + "time", +] + +[[package]] +name = "asn1-rs" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22ad1373757efa0f70ec53939aabc7152e1591cb485208052993070ac8d2429d" +dependencies = [ + "asn1-rs-derive 0.5.0", + "asn1-rs-impl 0.2.0", "displaydoc", "nom", "num-traits", @@ -711,7 +685,19 @@ dependencies = [ "proc-macro2 1.0.82", "quote 1.0.35", "syn 1.0.109", - "synstructure", + "synstructure 0.12.6", +] + +[[package]] +name = "asn1-rs-derive" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7378575ff571966e99a744addeff0bff98b8ada0dedf1956d59e634db95eaac1" +dependencies = [ + "proc-macro2 1.0.82", + "quote 1.0.35", + "syn 2.0.61", + "synstructure 0.13.1", ] [[package]] @@ -726,6 +712,17 @@ dependencies = [ ] [[package]] +name = "asn1-rs-impl" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b18050c2cd6fe86c3a76584ef5e0baf286d038cda203eb6223df2cc413565f7" +dependencies = [ + "proc-macro2 1.0.82", + "quote 1.0.35", + "syn 2.0.61", +] + +[[package]] name = "assert_cmd" version = "2.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -748,7 +745,7 @@ checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9" [[package]] name = "asset-hub-rococo-emulated-chain" -version = "0.0.0" +version = "0.1.0" dependencies = [ "asset-hub-rococo-runtime", "cumulus-primitives-core", @@ -766,7 +763,6 @@ name = "asset-hub-rococo-integration-tests" version = "1.0.0" dependencies = [ "assert_matches", - "asset-hub-rococo-runtime", "asset-test-utils", "cumulus-pallet-parachain-system", "emulated-integration-tests-common", @@ -780,9 +776,7 @@ dependencies = [ "pallet-xcm", "parachains-common", "parity-scale-codec", - "penpal-runtime", "polkadot-runtime-common", - "rococo-runtime", "rococo-runtime-constants", "rococo-system-emulated-network", "sp-runtime", @@ -792,7 +786,7 @@ dependencies = [ [[package]] name = "asset-hub-rococo-runtime" -version = "0.11.0" +version = "0.21.0" dependencies = [ "asset-test-utils", "assets-common", @@ -823,6 +817,7 @@ dependencies = [ "pallet-asset-conversion-ops", "pallet-asset-conversion-tx-payment", "pallet-assets", + "pallet-assets-freezer", "pallet-aura", "pallet-authorship", "pallet-balances", @@ -859,8 +854,7 @@ dependencies = [ "sp-offchain", "sp-runtime", "sp-session", - "sp-std 14.0.0", - "sp-storage 19.0.0", + "sp-storage", "sp-transaction-pool", "sp-version", "sp-weights", @@ -870,12 +864,12 @@ dependencies = [ "staging-xcm-executor", "substrate-wasm-builder", "testnet-parachains-constants", - "xcm-fee-payment-runtime-api", + "xcm-runtime-apis", ] [[package]] name = "asset-hub-westend-emulated-chain" -version = "0.0.0" +version = "0.1.0" dependencies = [ "asset-hub-westend-runtime", "cumulus-primitives-core", @@ -893,7 +887,6 @@ name = "asset-hub-westend-integration-tests" version = "1.0.0" dependencies = [ "assert_matches", - "asset-hub-westend-runtime", "asset-test-utils", "cumulus-pallet-parachain-system", "cumulus-pallet-xcmp-queue", @@ -911,21 +904,19 @@ dependencies = [ "pallet-xcm", "parachains-common", "parity-scale-codec", - "penpal-runtime", "polkadot-runtime-common", "sp-core", "sp-keyring", "sp-runtime", "staging-xcm", "staging-xcm-executor", - "westend-runtime", "westend-system-emulated-network", - "xcm-fee-payment-runtime-api", + "xcm-runtime-apis", ] [[package]] name = "asset-hub-westend-runtime" -version = "0.15.0" +version = "0.25.0" dependencies = [ "asset-test-utils", "assets-common", @@ -956,6 +947,7 @@ dependencies = [ "pallet-asset-conversion-ops", "pallet-asset-conversion-tx-payment", "pallet-assets", + "pallet-assets-freezer", "pallet-aura", "pallet-authorship", "pallet-balances", @@ -991,8 +983,7 @@ dependencies = [ "sp-offchain", "sp-runtime", "sp-session", - "sp-std 14.0.0", - "sp-storage 19.0.0", + "sp-storage", "sp-transaction-pool", "sp-version", "staging-parachain-info", @@ -1002,12 +993,12 @@ dependencies = [ "substrate-wasm-builder", "testnet-parachains-constants", "westend-runtime-constants", - "xcm-fee-payment-runtime-api", + "xcm-runtime-apis", ] [[package]] name = "asset-test-utils" -version = "7.0.0" +version = "17.0.0" dependencies = [ "cumulus-pallet-parachain-system", "cumulus-pallet-xcmp-queue", @@ -1027,7 +1018,6 @@ dependencies = [ "parity-scale-codec", "sp-io", "sp-runtime", - "sp-std 14.0.0", "staging-parachain-info", "staging-xcm", "staging-xcm-builder", @@ -1037,7 +1027,7 @@ dependencies = [ [[package]] name = "assets-common" -version = "0.7.0" +version = "0.17.0" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -1050,7 +1040,6 @@ dependencies = [ "scale-info", "sp-api", "sp-runtime", - "sp-std 14.0.0", "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", @@ -1074,7 +1063,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" dependencies = [ "concurrent-queue", - "event-listener", + "event-listener 2.5.3", "futures-core", ] @@ -1084,11 +1073,11 @@ version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6fa3dc5f2a8564f07759c008b9109dc0d39de92a88d5588b8a5036d286383afb" dependencies = [ - "async-lock", + "async-lock 2.8.0", "async-task", "concurrent-queue", "fastrand 1.9.0", - "futures-lite", + "futures-lite 1.13.0", "slab", ] @@ -1098,10 +1087,10 @@ version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06" dependencies = [ - "async-lock", + "async-lock 2.8.0", "autocfg", "blocking", - "futures-lite", + "futures-lite 1.13.0", ] [[package]] @@ -1112,10 +1101,10 @@ checksum = "f1b6f5d7df27bd294849f8eec66ecfc63d11814df7a4f5d74168a2394467b776" dependencies = [ "async-channel", "async-executor", - "async-io", - "async-lock", + "async-io 1.13.0", + "async-lock 2.8.0", "blocking", - "futures-lite", + "futures-lite 1.13.0", "once_cell", ] @@ -1125,14 +1114,14 @@ version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" dependencies = [ - "async-lock", + "async-lock 2.8.0", "autocfg", "cfg-if", "concurrent-queue", - "futures-lite", + "futures-lite 1.13.0", "log", "parking", - "polling", + "polling 2.8.0", "rustix 0.37.23", "slab", "socket2 0.4.9", @@ -1140,12 +1129,42 @@ dependencies = [ ] [[package]] +name = "async-io" +version = "2.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d6baa8f0178795da0e71bc42c9e5d13261aac7ee549853162e66a241ba17964" +dependencies = [ + "async-lock 3.4.0", + "cfg-if", + "concurrent-queue", + "futures-io", + "futures-lite 2.3.0", + "parking", + "polling 3.4.0", + "rustix 0.38.21", + "slab", + "tracing", + "windows-sys 0.52.0", +] + +[[package]] name = "async-lock" version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" dependencies = [ - "event-listener", + "event-listener 2.5.3", +] + +[[package]] +name = "async-lock" +version = "3.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18" +dependencies = [ + "event-listener 5.2.0", + "event-listener-strategy", + "pin-project-lite", ] [[package]] @@ -1154,10 +1173,10 @@ version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4051e67316bc7eff608fe723df5d32ed639946adcd69e07df41fd42a7b411f1f" dependencies = [ - "async-io", + "async-io 1.13.0", "autocfg", "blocking", - "futures-lite", + "futures-lite 1.13.0", ] [[package]] @@ -1166,13 +1185,13 @@ version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a9d28b1d97e08915212e2e45310d47854eafa69600756fc735fb788f75199c9" dependencies = [ - "async-io", - "async-lock", + "async-io 1.13.0", + "async-lock 2.8.0", "autocfg", "blocking", "cfg-if", - "event-listener", - "futures-lite", + "event-listener 2.5.3", + "futures-lite 1.13.0", "rustix 0.37.23", "signal-hook", "windows-sys 0.48.0", @@ -1187,19 +1206,19 @@ dependencies = [ "async-attributes", "async-channel", "async-global-executor", - "async-io", - "async-lock", + "async-io 1.13.0", + "async-lock 2.8.0", "crossbeam-utils", "futures-channel", "futures-core", "futures-io", - "futures-lite", + "futures-lite 1.13.0", "gloo-timers", "kv-log-macro", "log", "memchr", "once_cell", - "pin-project-lite 0.2.12", + "pin-project-lite", "pin-utils", "slab", "wasm-bindgen-futures", @@ -1213,7 +1232,7 @@ checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51" dependencies = [ "async-stream-impl", "futures-core", - "pin-project-lite 0.2.12", + "pin-project-lite", ] [[package]] @@ -1235,9 +1254,9 @@ checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae" [[package]] name = "async-trait" -version = "0.1.79" +version = "0.1.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507401cad91ec6a857ed5513a2073c82a9b9048762b885bb98655b306964681" +checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" dependencies = [ "proc-macro2 1.0.82", "quote 1.0.35", @@ -1254,7 +1273,7 @@ dependencies = [ "futures-sink", "futures-util", "memchr", - "pin-project-lite 0.2.12", + "pin-project-lite", ] [[package]] @@ -1270,6 +1289,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1181e1e0d1fce796a03db1ae795d67167da795f9cf4a39c37589e85ef57f26d3" [[package]] +name = "attohttpc" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d9a9bf8b79a749ee0b911b91b671cc2b6c670bdbc7e3dfd537576ddc94bb2a2" +dependencies = [ + "http 0.2.9", + "log", + "url", +] + +[[package]] name = "atty" version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1304,9 +1334,9 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b62ddb9cb1ec0a098ad4bbf9344d0713fa193ae1a80af55febcff2627b6a00c1" dependencies = [ - "getrandom 0.2.10", + "getrandom", "instant", - "rand 0.8.5", + "rand", ] [[package]] @@ -1325,29 +1355,6 @@ dependencies = [ ] [[package]] -name = "bandersnatch_vrfs" -version = "0.0.4" -source = "git+https://github.com/w3f/ring-vrf?rev=e9782f9#e9782f938629c90f3adb3fff2358bc8d1386af3e" -dependencies = [ - "ark-bls12-381", - "ark-ec", - "ark-ed-on-bls12-381-bandersnatch", - "ark-ff 0.4.2", - "ark-serialize 0.4.2", - "ark-std 0.4.0", - "dleq_vrf", - "fflonk", - "merlin", - "rand_chacha 0.3.1", - "rand_core 0.6.4", - "ring 0.1.0", - "sha2 0.10.8", - "sp-ark-bls12-381", - "sp-ark-ed-on-bls12-381-bandersnatch", - "zeroize", -] - -[[package]] name = "base-x" version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1372,6 +1379,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" [[package]] +name = "base64" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" + +[[package]] name = "base64ct" version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1397,7 +1410,7 @@ dependencies = [ [[package]] name = "binary-merkle-tree" -version = "13.0.0" +version = "15.0.0" dependencies = [ "array-bytes", "env_logger 0.11.3", @@ -1493,9 +1506,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" [[package]] name = "bitvec" @@ -1601,11 +1614,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77231a1c8f801696fc0123ec6150ce92cffb8e164a02afb9c8ddee0e9b65ad65" dependencies = [ "async-channel", - "async-lock", + "async-lock 2.8.0", "async-task", "atomic-waker", "fastrand 1.9.0", - "futures-lite", + "futures-lite 1.13.0", "log", ] @@ -1633,7 +1646,7 @@ dependencies = [ [[package]] name = "bp-asset-hub-rococo" -version = "0.4.0" +version = "0.13.0" dependencies = [ "bp-xcm-bridge-hub-router", "frame-support", @@ -1643,7 +1656,7 @@ dependencies = [ [[package]] name = "bp-asset-hub-westend" -version = "0.3.0" +version = "0.12.0" dependencies = [ "bp-xcm-bridge-hub-router", "frame-support", @@ -1665,12 +1678,12 @@ dependencies = [ "serde", "sp-consensus-beefy", "sp-runtime", - "sp-std 14.0.0", + "sp-std", ] [[package]] name = "bp-bridge-hub-cumulus" -version = "0.7.0" +version = "0.17.0" dependencies = [ "bp-messages", "bp-polkadot-core", @@ -1679,12 +1692,12 @@ dependencies = [ "frame-system", "polkadot-primitives", "sp-api", - "sp-std 14.0.0", + "sp-std", ] [[package]] name = "bp-bridge-hub-kusama" -version = "0.6.0" +version = "0.16.0" dependencies = [ "bp-bridge-hub-cumulus", "bp-messages", @@ -1692,12 +1705,12 @@ dependencies = [ "frame-support", "sp-api", "sp-runtime", - "sp-std 14.0.0", + "sp-std", ] [[package]] name = "bp-bridge-hub-polkadot" -version = "0.6.0" +version = "0.16.0" dependencies = [ "bp-bridge-hub-cumulus", "bp-messages", @@ -1705,12 +1718,12 @@ dependencies = [ "frame-support", "sp-api", "sp-runtime", - "sp-std 14.0.0", + "sp-std", ] [[package]] name = "bp-bridge-hub-rococo" -version = "0.7.0" +version = "0.17.0" dependencies = [ "bp-bridge-hub-cumulus", "bp-messages", @@ -1718,12 +1731,12 @@ dependencies = [ "frame-support", "sp-api", "sp-runtime", - "sp-std 14.0.0", + "sp-std", ] [[package]] name = "bp-bridge-hub-westend" -version = "0.3.0" +version = "0.13.0" dependencies = [ "bp-bridge-hub-cumulus", "bp-messages", @@ -1731,12 +1744,12 @@ dependencies = [ "frame-support", "sp-api", "sp-runtime", - "sp-std 14.0.0", + "sp-std", ] [[package]] name = "bp-header-chain" -version = "0.7.0" +version = "0.17.0" dependencies = [ "bp-runtime", "bp-test-utils", @@ -1750,24 +1763,24 @@ dependencies = [ "sp-consensus-grandpa", "sp-core", "sp-runtime", - "sp-std 14.0.0", + "sp-std", ] [[package]] name = "bp-kusama" -version = "0.5.0" +version = "0.15.0" dependencies = [ "bp-header-chain", "bp-polkadot-core", "bp-runtime", "frame-support", "sp-api", - "sp-std 14.0.0", + "sp-std", ] [[package]] name = "bp-messages" -version = "0.7.0" +version = "0.17.0" dependencies = [ "bp-header-chain", "bp-runtime", @@ -1778,12 +1791,12 @@ dependencies = [ "scale-info", "serde", "sp-core", - "sp-std 14.0.0", + "sp-std", ] [[package]] name = "bp-parachains" -version = "0.7.0" +version = "0.17.0" dependencies = [ "bp-header-chain", "bp-polkadot-core", @@ -1794,24 +1807,24 @@ dependencies = [ "scale-info", "sp-core", "sp-runtime", - "sp-std 14.0.0", + "sp-std", ] [[package]] name = "bp-polkadot" -version = "0.5.0" +version = "0.15.0" dependencies = [ "bp-header-chain", "bp-polkadot-core", "bp-runtime", "frame-support", "sp-api", - "sp-std 14.0.0", + "sp-std", ] [[package]] name = "bp-polkadot-bulletin" -version = "0.4.0" +version = "0.14.0" dependencies = [ "bp-header-chain", "bp-messages", @@ -1823,12 +1836,12 @@ dependencies = [ "scale-info", "sp-api", "sp-runtime", - "sp-std 14.0.0", + "sp-std", ] [[package]] name = "bp-polkadot-core" -version = "0.7.0" +version = "0.17.0" dependencies = [ "bp-messages", "bp-runtime", @@ -1841,12 +1854,12 @@ dependencies = [ "serde", "sp-core", "sp-runtime", - "sp-std 14.0.0", + "sp-std", ] [[package]] name = "bp-relayers" -version = "0.7.0" +version = "0.17.0" dependencies = [ "bp-messages", "bp-runtime", @@ -1856,24 +1869,24 @@ dependencies = [ "parity-scale-codec", "scale-info", "sp-runtime", - "sp-std 14.0.0", + "sp-std", ] [[package]] name = "bp-rococo" -version = "0.6.0" +version = "0.16.0" dependencies = [ "bp-header-chain", "bp-polkadot-core", "bp-runtime", "frame-support", "sp-api", - "sp-std 14.0.0", + "sp-std", ] [[package]] name = "bp-runtime" -version = "0.7.0" +version = "0.17.0" dependencies = [ "frame-support", "frame-system", @@ -1889,52 +1902,52 @@ dependencies = [ "sp-io", "sp-runtime", "sp-state-machine", - "sp-std 14.0.0", + "sp-std", "sp-trie", "trie-db", ] [[package]] name = "bp-test-utils" -version = "0.7.0" +version = "0.17.0" dependencies = [ "bp-header-chain", "bp-parachains", "bp-polkadot-core", "bp-runtime", - "ed25519-dalek 2.1.1", + "ed25519-dalek", "finality-grandpa", "parity-scale-codec", "sp-application-crypto", "sp-consensus-grandpa", "sp-core", "sp-runtime", - "sp-std 14.0.0", + "sp-std", "sp-trie", ] [[package]] name = "bp-westend" -version = "0.3.0" +version = "0.13.0" dependencies = [ "bp-header-chain", "bp-polkadot-core", "bp-runtime", "frame-support", "sp-api", - "sp-std 14.0.0", + "sp-std", ] [[package]] name = "bp-xcm-bridge-hub" -version = "0.2.0" +version = "0.3.0" dependencies = [ - "sp-std 14.0.0", + "sp-std", ] [[package]] name = "bp-xcm-bridge-hub-router" -version = "0.6.0" +version = "0.14.0" dependencies = [ "parity-scale-codec", "scale-info", @@ -1944,7 +1957,7 @@ dependencies = [ [[package]] name = "bridge-hub-common" -version = "0.1.0" +version = "0.9.0" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -1954,13 +1967,12 @@ dependencies = [ "snowbridge-core", "sp-core", "sp-runtime", - "sp-std 14.0.0", "staging-xcm", ] [[package]] name = "bridge-hub-rococo-emulated-chain" -version = "0.0.0" +version = "0.1.0" dependencies = [ "bridge-hub-common", "bridge-hub-rococo-runtime", @@ -1975,8 +1987,6 @@ dependencies = [ name = "bridge-hub-rococo-integration-tests" version = "1.0.0" dependencies = [ - "asset-hub-rococo-runtime", - "bridge-hub-rococo-runtime", "cumulus-pallet-xcmp-queue", "emulated-integration-tests-common", "frame-support", @@ -2006,7 +2016,7 @@ dependencies = [ [[package]] name = "bridge-hub-rococo-runtime" -version = "0.5.0" +version = "0.15.0" dependencies = [ "bp-asset-hub-rococo", "bp-asset-hub-westend", @@ -2090,8 +2100,8 @@ dependencies = [ "sp-offchain", "sp-runtime", "sp-session", - "sp-std 14.0.0", - "sp-storage 19.0.0", + "sp-std", + "sp-storage", "sp-transaction-pool", "sp-version", "staging-parachain-info", @@ -2101,13 +2111,12 @@ dependencies = [ "static_assertions", "substrate-wasm-builder", "testnet-parachains-constants", - "tuplex", - "xcm-fee-payment-runtime-api", + "xcm-runtime-apis", ] [[package]] name = "bridge-hub-test-utils" -version = "0.7.0" +version = "0.17.0" dependencies = [ "asset-test-utils", "bp-header-chain", @@ -2137,8 +2146,7 @@ dependencies = [ "sp-io", "sp-keyring", "sp-runtime", - "sp-std 14.0.0", - "sp-tracing 16.0.0", + "sp-tracing", "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", @@ -2146,7 +2154,7 @@ dependencies = [ [[package]] name = "bridge-hub-westend-emulated-chain" -version = "0.0.0" +version = "0.1.0" dependencies = [ "bridge-hub-common", "bridge-hub-westend-runtime", @@ -2161,10 +2169,10 @@ dependencies = [ name = "bridge-hub-westend-integration-tests" version = "1.0.0" dependencies = [ - "bridge-hub-westend-runtime", "cumulus-pallet-xcmp-queue", "emulated-integration-tests-common", "frame-support", + "hex-literal", "pallet-asset-conversion", "pallet-assets", "pallet-balances", @@ -2180,7 +2188,7 @@ dependencies = [ [[package]] name = "bridge-hub-westend-runtime" -version = "0.2.0" +version = "0.12.0" dependencies = [ "bp-asset-hub-rococo", "bp-asset-hub-westend", @@ -2250,8 +2258,8 @@ dependencies = [ "sp-offchain", "sp-runtime", "sp-session", - "sp-std 14.0.0", - "sp-storage 19.0.0", + "sp-std", + "sp-storage", "sp-transaction-pool", "sp-version", "staging-parachain-info", @@ -2261,14 +2269,13 @@ dependencies = [ "static_assertions", "substrate-wasm-builder", "testnet-parachains-constants", - "tuplex", "westend-runtime-constants", - "xcm-fee-payment-runtime-api", + "xcm-runtime-apis", ] [[package]] name = "bridge-runtime-common" -version = "0.7.0" +version = "0.17.0" dependencies = [ "bp-header-chain", "bp-messages", @@ -2281,7 +2288,6 @@ dependencies = [ "bp-xcm-bridge-hub-router", "frame-support", "frame-system", - "hash-db", "log", "pallet-balances", "pallet-bridge-grandpa", @@ -2292,11 +2298,9 @@ dependencies = [ "pallet-utility", "parity-scale-codec", "scale-info", - "sp-api", - "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", + "sp-std", "sp-trie", "staging-xcm", "staging-xcm-builder", @@ -2451,6 +2455,12 @@ dependencies = [ ] [[package]] +name = "cesu8" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" + +[[package]] name = "cexpr" version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2516,7 +2526,7 @@ dependencies = [ [[package]] name = "chain-spec-guide-runtime" -version = "0.0.0" +version = "0.1.0" dependencies = [ "docify", "pallet-balances", @@ -2535,7 +2545,6 @@ dependencies = [ "sp-genesis-builder", "sp-keyring", "sp-runtime", - "sp-std 14.0.0", "staging-chain-spec-builder", "substrate-wasm-builder", ] @@ -2591,7 +2600,7 @@ dependencies = [ "multibase", "multihash 0.17.0", "serde", - "unsigned-varint", + "unsigned-varint 0.7.2", ] [[package]] @@ -2604,7 +2613,7 @@ dependencies = [ "multibase", "multihash 0.18.1", "serde", - "unsigned-varint", + "unsigned-varint 0.7.2", ] [[package]] @@ -2768,7 +2777,7 @@ checksum = "a90d114103adbc625300f346d4d09dfb4ab1c4a8df6868435dd903392ecf4354" dependencies = [ "libc", "once_cell", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", "wasm-bindgen", ] @@ -2784,7 +2793,7 @@ dependencies = [ [[package]] name = "collectives-westend-emulated-chain" -version = "0.0.0" +version = "0.1.0" dependencies = [ "collectives-westend-runtime", "cumulus-primitives-core", @@ -2800,8 +2809,6 @@ name = "collectives-westend-integration-tests" version = "1.0.0" dependencies = [ "assert_matches", - "asset-hub-westend-runtime", - "collectives-westend-runtime", "cumulus-pallet-parachain-system", "cumulus-pallet-xcmp-queue", "emulated-integration-tests-common", @@ -2820,14 +2827,13 @@ dependencies = [ "staging-xcm", "staging-xcm-executor", "testnet-parachains-constants", - "westend-runtime", "westend-runtime-constants", "westend-system-emulated-network", ] [[package]] name = "collectives-westend-runtime" -version = "3.0.0" +version = "13.0.0" dependencies = [ "cumulus-pallet-aura-ext", "cumulus-pallet-parachain-system", @@ -2888,8 +2894,7 @@ dependencies = [ "sp-offchain", "sp-runtime", "sp-session", - "sp-std 14.0.0", - "sp-storage 19.0.0", + "sp-storage", "sp-transaction-pool", "sp-version", "staging-parachain-info", @@ -2899,7 +2904,7 @@ dependencies = [ "substrate-wasm-builder", "testnet-parachains-constants", "westend-runtime-constants", - "xcm-fee-payment-runtime-api", + "xcm-runtime-apis", ] [[package]] @@ -2975,22 +2980,6 @@ dependencies = [ ] [[package]] -name = "common" -version = "0.1.0" -source = "git+https://github.com/w3f/ring-proof#b273d33f9981e2bb3375ab45faeb537f7ee35224" -dependencies = [ - "ark-ec", - "ark-ff 0.4.2", - "ark-poly", - "ark-serialize 0.4.2", - "ark-std 0.4.0", - "fflonk", - "getrandom_or_panic", - "merlin", - "rand_chacha 0.3.1", -] - -[[package]] name = "common-path" version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3063,7 +3052,7 @@ version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d7d6ab3c3a2282db210df5f02c4dab6e0a7057af0fb7ebd4070f30fe05c0ddb" dependencies = [ - "getrandom 0.2.10", + "getrandom", "once_cell", "proc-macro-hack", "tiny-keccak", @@ -3095,7 +3084,7 @@ checksum = "f272d0c4cf831b4fa80ee529c7707f76585986e910e1fbce1d7921970bc1a241" [[package]] name = "contracts-rococo-runtime" -version = "0.8.0" +version = "0.18.0" dependencies = [ "cumulus-pallet-aura-ext", "cumulus-pallet-parachain-system", @@ -3145,8 +3134,7 @@ dependencies = [ "sp-offchain", "sp-runtime", "sp-session", - "sp-std 14.0.0", - "sp-storage 19.0.0", + "sp-storage", "sp-transaction-pool", "sp-version", "staging-parachain-info", @@ -3155,7 +3143,7 @@ dependencies = [ "staging-xcm-executor", "substrate-wasm-builder", "testnet-parachains-constants", - "xcm-fee-payment-runtime-api", + "xcm-runtime-apis", ] [[package]] @@ -3166,9 +3154,9 @@ checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" [[package]] name = "core-foundation" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" dependencies = [ "core-foundation-sys", "libc", @@ -3176,9 +3164,9 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.4" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "core2" @@ -3191,7 +3179,7 @@ dependencies = [ [[package]] name = "coretime-rococo-runtime" -version = "0.1.0" +version = "0.11.0" dependencies = [ "cumulus-pallet-aura-ext", "cumulus-pallet-parachain-system", @@ -3204,6 +3192,7 @@ dependencies = [ "cumulus-primitives-utility", "frame-benchmarking", "frame-executive", + "frame-metadata-hash-extension", "frame-support", "frame-system", "frame-system-benchmarking", @@ -3242,8 +3231,7 @@ dependencies = [ "sp-offchain", "sp-runtime", "sp-session", - "sp-std 14.0.0", - "sp-storage 19.0.0", + "sp-storage", "sp-transaction-pool", "sp-version", "staging-parachain-info", @@ -3252,12 +3240,12 @@ dependencies = [ "staging-xcm-executor", "substrate-wasm-builder", "testnet-parachains-constants", - "xcm-fee-payment-runtime-api", + "xcm-runtime-apis", ] [[package]] name = "coretime-westend-runtime" -version = "0.1.0" +version = "0.11.0" dependencies = [ "cumulus-pallet-aura-ext", "cumulus-pallet-parachain-system", @@ -3270,6 +3258,7 @@ dependencies = [ "cumulus-primitives-utility", "frame-benchmarking", "frame-executive", + "frame-metadata-hash-extension", "frame-support", "frame-system", "frame-system-benchmarking", @@ -3306,8 +3295,7 @@ dependencies = [ "sp-offchain", "sp-runtime", "sp-session", - "sp-std 14.0.0", - "sp-storage 19.0.0", + "sp-storage", "sp-transaction-pool", "sp-version", "staging-parachain-info", @@ -3317,7 +3305,7 @@ dependencies = [ "substrate-wasm-builder", "testnet-parachains-constants", "westend-runtime-constants", - "xcm-fee-payment-runtime-api", + "xcm-runtime-apis", ] [[package]] @@ -3573,7 +3561,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf4c2f4e1afd912bc40bfd6fed5d9dc1f288e0ba01bfcc835cc5bc3eb13efe15" dependencies = [ "generic-array 0.14.7", - "rand_core 0.6.4", + "rand_core", "subtle 2.5.0", "zeroize", ] @@ -3585,7 +3573,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" dependencies = [ "generic-array 0.14.7", - "rand_core 0.6.4", + "rand_core", "typenum", ] @@ -3620,7 +3608,7 @@ dependencies = [ [[package]] name = "cumulus-client-cli" -version = "0.7.0" +version = "0.17.0" dependencies = [ "clap 4.5.3", "parity-scale-codec", @@ -3636,7 +3624,7 @@ dependencies = [ [[package]] name = "cumulus-client-collator" -version = "0.7.0" +version = "0.17.0" dependencies = [ "async-trait", "cumulus-client-consensus-common", @@ -3647,7 +3635,7 @@ dependencies = [ "cumulus-test-runtime", "futures", "parity-scale-codec", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-node-subsystem-test-helpers", @@ -3660,13 +3648,13 @@ dependencies = [ "sp-maybe-compressed-blob", "sp-runtime", "sp-state-machine", - "sp-tracing 16.0.0", + "sp-tracing", "tracing", ] [[package]] name = "cumulus-client-consensus-aura" -version = "0.7.0" +version = "0.17.1" dependencies = [ "async-trait", "cumulus-client-collator", @@ -3678,6 +3666,7 @@ dependencies = [ "cumulus-relay-chain-interface", "futures", "parity-scale-codec", + "parking_lot 0.12.3", "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-overseer", @@ -3688,6 +3677,7 @@ dependencies = [ "sc-consensus-babe", "sc-consensus-slots", "sc-telemetry", + "sc-utils", "schnellru", "sp-api", "sp-application-crypto", @@ -3702,12 +3692,13 @@ dependencies = [ "sp-state-machine", "sp-timestamp", "substrate-prometheus-endpoint", + "tokio", "tracing", ] [[package]] name = "cumulus-client-consensus-common" -version = "0.7.0" +version = "0.17.0" dependencies = [ "async-trait", "cumulus-client-pov-recovery", @@ -3731,15 +3722,16 @@ dependencies = [ "sp-core", "sp-runtime", "sp-timestamp", - "sp-tracing 16.0.0", + "sp-tracing", "sp-trie", + "sp-version", "substrate-prometheus-endpoint", "tracing", ] [[package]] name = "cumulus-client-consensus-proposer" -version = "0.7.0" +version = "0.15.0" dependencies = [ "anyhow", "async-trait", @@ -3753,14 +3745,14 @@ dependencies = [ [[package]] name = "cumulus-client-consensus-relay-chain" -version = "0.7.0" +version = "0.17.0" dependencies = [ "async-trait", "cumulus-client-consensus-common", "cumulus-primitives-core", "cumulus-relay-chain-interface", "futures", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "sc-consensus", "sp-api", "sp-block-builder", @@ -3775,7 +3767,7 @@ dependencies = [ [[package]] name = "cumulus-client-network" -version = "0.7.0" +version = "0.17.0" dependencies = [ "async-trait", "cumulus-primitives-core", @@ -3785,14 +3777,17 @@ dependencies = [ "futures", "futures-timer", "parity-scale-codec", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "polkadot-node-primitives", + "polkadot-node-subsystem", "polkadot-parachain-primitives", "polkadot-primitives", "polkadot-test-client", "portpicker", + "rstest", "sc-cli", "sc-client-api", + "sp-api", "sp-blockchain", "sp-consensus", "sp-core", @@ -3800,6 +3795,7 @@ dependencies = [ "sp-keystore", "sp-runtime", "sp-state-machine", + "sp-version", "substrate-test-utils", "tokio", "tracing", @@ -3808,7 +3804,7 @@ dependencies = [ [[package]] name = "cumulus-client-parachain-inherent" -version = "0.1.0" +version = "0.11.0" dependencies = [ "async-trait", "cumulus-primitives-core", @@ -3817,25 +3813,25 @@ dependencies = [ "cumulus-test-relay-sproof-builder", "parity-scale-codec", "sc-client-api", - "scale-info", "sp-api", "sp-crypto-hashing", "sp-inherents", "sp-runtime", "sp-state-machine", - "sp-std 14.0.0", - "sp-storage 19.0.0", + "sp-storage", "sp-trie", "tracing", ] [[package]] name = "cumulus-client-pov-recovery" -version = "0.7.0" +version = "0.17.0" dependencies = [ + "assert_matches", "async-trait", "cumulus-primitives-core", "cumulus-relay-chain-interface", + "cumulus-test-client", "cumulus-test-service", "futures", "futures-timer", @@ -3845,13 +3841,19 @@ dependencies = [ "polkadot-overseer", "polkadot-primitives", "portpicker", - "rand 0.8.5", + "rand", + "rstest", "sc-cli", "sc-client-api", "sc-consensus", + "sc-utils", + "sp-api", + "sp-blockchain", "sp-consensus", "sp-maybe-compressed-blob", "sp-runtime", + "sp-tracing", + "sp-version", "substrate-test-utils", "tokio", "tracing", @@ -3859,7 +3861,7 @@ dependencies = [ [[package]] name = "cumulus-client-service" -version = "0.7.0" +version = "0.17.0" dependencies = [ "cumulus-client-cli", "cumulus-client-collator", @@ -3895,7 +3897,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-aura-ext" -version = "0.7.0" +version = "0.16.0" dependencies = [ "cumulus-pallet-parachain-system", "frame-support", @@ -3907,12 +3909,11 @@ dependencies = [ "sp-application-crypto", "sp-consensus-aura", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "cumulus-pallet-dmp-queue" -version = "0.7.0" +version = "0.16.0" dependencies = [ "cumulus-primitives-core", "frame-benchmarking", @@ -3924,14 +3925,13 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", - "sp-tracing 16.0.0", + "sp-tracing", "staging-xcm", ] [[package]] name = "cumulus-pallet-parachain-system" -version = "0.7.0" +version = "0.16.0" dependencies = [ "assert_matches", "bytes", @@ -3956,20 +3956,20 @@ dependencies = [ "polkadot-parachain-primitives", "polkadot-runtime-common", "polkadot-runtime-parachains", - "rand 0.8.5", + "rand", "sc-client-api", "scale-info", "sp-consensus-slots", "sp-core", "sp-crypto-hashing", - "sp-externalities 0.25.0", + "sp-externalities", "sp-inherents", "sp-io", "sp-keyring", "sp-runtime", "sp-state-machine", - "sp-std 14.0.0", - "sp-tracing 16.0.0", + "sp-std", + "sp-tracing", "sp-trie", "sp-version", "staging-xcm", @@ -3990,7 +3990,7 @@ dependencies = [ [[package]] name = "cumulus-pallet-session-benchmarking" -version = "9.0.0" +version = "18.0.0" dependencies = [ "frame-benchmarking", "frame-support", @@ -3998,12 +3998,11 @@ dependencies = [ "pallet-session", "parity-scale-codec", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "cumulus-pallet-solo-to-para" -version = "0.7.0" +version = "0.16.0" dependencies = [ "cumulus-pallet-parachain-system", "frame-support", @@ -4013,12 +4012,11 @@ dependencies = [ "polkadot-primitives", "scale-info", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "cumulus-pallet-xcm" -version = "0.7.0" +version = "0.16.0" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -4027,13 +4025,12 @@ dependencies = [ "scale-info", "sp-io", "sp-runtime", - "sp-std 14.0.0", "staging-xcm", ] [[package]] name = "cumulus-pallet-xcmp-queue" -version = "0.7.0" +version = "0.16.0" dependencies = [ "bounded-collections", "bp-xcm-bridge-hub-router", @@ -4052,7 +4049,6 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", @@ -4060,7 +4056,7 @@ dependencies = [ [[package]] name = "cumulus-ping" -version = "0.7.0" +version = "0.16.0" dependencies = [ "cumulus-pallet-xcm", "cumulus-primitives-core", @@ -4069,13 +4065,12 @@ dependencies = [ "parity-scale-codec", "scale-info", "sp-runtime", - "sp-std 14.0.0", "staging-xcm", ] [[package]] name = "cumulus-primitives-aura" -version = "0.7.0" +version = "0.15.0" dependencies = [ "parity-scale-codec", "polkadot-core-primitives", @@ -4083,12 +4078,11 @@ dependencies = [ "sp-api", "sp-consensus-aura", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "cumulus-primitives-core" -version = "0.7.0" +version = "0.15.0" dependencies = [ "parity-scale-codec", "polkadot-core-primitives", @@ -4097,14 +4091,13 @@ dependencies = [ "scale-info", "sp-api", "sp-runtime", - "sp-std 14.0.0", "sp-trie", "staging-xcm", ] [[package]] name = "cumulus-primitives-parachain-inherent" -version = "0.7.0" +version = "0.15.0" dependencies = [ "async-trait", "cumulus-primitives-core", @@ -4114,25 +4107,24 @@ dependencies = [ "sp-inherents", "sp-runtime", "sp-state-machine", - "sp-std 14.0.0", "sp-trie", ] [[package]] name = "cumulus-primitives-proof-size-hostfunction" -version = "0.2.0" +version = "0.10.0" dependencies = [ "sp-core", - "sp-externalities 0.25.0", + "sp-externalities", "sp-io", - "sp-runtime-interface 24.0.0", + "sp-runtime-interface", "sp-state-machine", "sp-trie", ] [[package]] name = "cumulus-primitives-storage-weight-reclaim" -version = "1.0.0" +version = "7.0.1" dependencies = [ "cumulus-primitives-core", "cumulus-primitives-proof-size-hostfunction", @@ -4145,25 +4137,21 @@ dependencies = [ "scale-info", "sp-io", "sp-runtime", - "sp-std 14.0.0", "sp-trie", ] [[package]] name = "cumulus-primitives-timestamp" -version = "0.7.0" +version = "0.15.1" dependencies = [ "cumulus-primitives-core", - "futures", - "parity-scale-codec", "sp-inherents", - "sp-std 14.0.0", "sp-timestamp", ] [[package]] name = "cumulus-primitives-utility" -version = "0.7.0" +version = "0.16.0" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -4174,7 +4162,6 @@ dependencies = [ "polkadot-runtime-parachains", "sp-io", "sp-runtime", - "sp-std 14.0.0", "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", @@ -4182,7 +4169,7 @@ dependencies = [ [[package]] name = "cumulus-relay-chain-inprocess-interface" -version = "0.7.0" +version = "0.17.0" dependencies = [ "async-trait", "cumulus-primitives-core", @@ -4210,7 +4197,7 @@ dependencies = [ [[package]] name = "cumulus-relay-chain-interface" -version = "0.7.0" +version = "0.17.0" dependencies = [ "async-trait", "cumulus-primitives-core", @@ -4222,12 +4209,13 @@ dependencies = [ "sp-api", "sp-blockchain", "sp-state-machine", + "sp-version", "thiserror", ] [[package]] name = "cumulus-relay-chain-minimal-node" -version = "0.7.0" +version = "0.17.0" dependencies = [ "array-bytes", "async-trait", @@ -4235,15 +4223,8 @@ dependencies = [ "cumulus-relay-chain-interface", "cumulus-relay-chain-rpc-interface", "futures", - "parking_lot 0.12.1", - "polkadot-availability-recovery", - "polkadot-collator-protocol", "polkadot-core-primitives", "polkadot-network-bridge", - "polkadot-node-collation-generation", - "polkadot-node-core-chain-api", - "polkadot-node-core-prospective-parachains", - "polkadot-node-core-runtime-api", "polkadot-node-network-protocol", "polkadot-node-subsystem-util", "polkadot-overseer", @@ -4268,7 +4249,7 @@ dependencies = [ [[package]] name = "cumulus-relay-chain-rpc-interface" -version = "0.7.0" +version = "0.17.0" dependencies = [ "async-trait", "cumulus-primitives-core", @@ -4280,7 +4261,7 @@ dependencies = [ "parity-scale-codec", "pin-project", "polkadot-overseer", - "rand 0.8.5", + "rand", "sc-client-api", "sc-rpc-api", "sc-service", @@ -4295,7 +4276,7 @@ dependencies = [ "sp-core", "sp-runtime", "sp-state-machine", - "sp-storage 19.0.0", + "sp-storage", "sp-version", "thiserror", "tokio", @@ -4343,14 +4324,13 @@ dependencies = [ [[package]] name = "cumulus-test-relay-sproof-builder" -version = "0.7.0" +version = "0.15.0" dependencies = [ "cumulus-primitives-core", "parity-scale-codec", "polkadot-primitives", "sp-runtime", "sp-state-machine", - "sp-std 14.0.0", "sp-trie", ] @@ -4389,7 +4369,6 @@ dependencies = [ "sp-offchain", "sp-runtime", "sp-session", - "sp-std 14.0.0", "sp-transaction-pool", "sp-version", "staging-parachain-info", @@ -4436,8 +4415,7 @@ dependencies = [ "polkadot-service", "polkadot-test-service", "portpicker", - "rand 0.8.5", - "rococo-parachain-runtime", + "rand", "sc-basic-authorship", "sc-block-builder", "sc-chain-spec", @@ -4462,14 +4440,13 @@ dependencies = [ "sp-blockchain", "sp-consensus", "sp-consensus-aura", - "sp-consensus-grandpa", "sp-core", "sp-io", "sp-keyring", "sp-runtime", "sp-state-machine", "sp-timestamp", - "sp-tracing 16.0.0", + "sp-tracing", "substrate-test-client", "substrate-test-utils", "tempfile", @@ -4489,7 +4466,7 @@ dependencies = [ "openssl-probe", "openssl-sys", "schannel", - "socket2 0.5.6", + "socket2 0.5.7", "windows-sys 0.52.0", ] @@ -4511,29 +4488,15 @@ dependencies = [ [[package]] name = "curve25519-dalek" -version = "3.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b9fdf9972b2bd6af2d913799d9ebc165ea4d2e65878e329d9c6b372c4491b61" -dependencies = [ - "byteorder", - "digest 0.9.0", - "rand_core 0.5.1", - "subtle 2.5.0", - "zeroize", -] - -[[package]] -name = "curve25519-dalek" -version = "4.1.2" +version = "4.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a677b8922c94e01bdbb12126b0bc852f00447528dee1782229af9c720c3f348" +checksum = "97fb8b7c4503de7d6ae7b42ab72a5a59857b4c937ec27a3d4539dba95b5ab2be" dependencies = [ "cfg-if", "cpufeatures", "curve25519-dalek-derive", "digest 0.10.7", "fiat-crypto", - "platforms", "rustc_version 0.4.0", "subtle 2.5.0", "zeroize", @@ -4558,7 +4521,7 @@ checksum = "1c359b7249347e46fb28804470d071c921156ad62b3eef5d34e2ba867533dec8" dependencies = [ "byteorder", "digest 0.9.0", - "rand_core 0.6.4", + "rand_core", "subtle-ng", "zeroize", ] @@ -4671,7 +4634,7 @@ version = "8.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dbd676fbbab537128ef0278adb5576cf363cff6aa22a7b24effe97347cfab61e" dependencies = [ - "asn1-rs", + "asn1-rs 0.5.2", "displaydoc", "nom", "num-bigint", @@ -4680,27 +4643,33 @@ dependencies = [ ] [[package]] -name = "deranged" -version = "0.3.8" +name = "der-parser" +version = "9.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946" +checksum = "5cd0a5c643689626bec213c4d8bd4d96acc8ffdb4ad4bb6bc16abf27d5f4b553" +dependencies = [ + "asn1-rs 0.6.1", + "displaydoc", + "nom", + "num-bigint", + "num-traits", + "rusticata-macros", +] [[package]] -name = "derivative" -version = "2.2.0" +name = "deranged" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" dependencies = [ - "proc-macro2 1.0.82", - "quote 1.0.35", - "syn 1.0.109", + "powerfmt", ] [[package]] -name = "derive-syn-parse" -version = "0.1.5" +name = "derivative" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e79116f119dd1dba1abf1f3405f03b9b0e79a27a3883864bfebded8a3dc768cd" +checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" dependencies = [ "proc-macro2 1.0.82", "quote 1.0.35", @@ -4844,22 +4813,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "86e3bdc80eee6e16b2b6b0f87fbc98c04bee3455e35174c0de1a125d0688c632" [[package]] -name = "dleq_vrf" -version = "0.0.2" -source = "git+https://github.com/w3f/ring-vrf?rev=e9782f9#e9782f938629c90f3adb3fff2358bc8d1386af3e" -dependencies = [ - "ark-ec", - "ark-ff 0.4.2", - "ark-scale 0.0.12", - "ark-secret-scalar", - "ark-serialize 0.4.2", - "ark-std 0.4.0", - "ark-transcript", - "arrayvec 0.7.4", - "zeroize", -] - -[[package]] name = "dlmalloc" version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4890,7 +4843,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a081e51fb188742f5a7a1164ad752121abcb22874b21e2c3b0dd040c515fdad" dependencies = [ "common-path", - "derive-syn-parse 0.2.0", + "derive-syn-parse", "once_cell", "proc-macro2 1.0.82", "quote 1.0.35", @@ -4963,41 +4916,18 @@ dependencies = [ "elliptic-curve", "rfc6979", "serdect", - "signature 2.1.0", + "signature", "spki", ] [[package]] name = "ed25519" -version = "1.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91cff35c70bba8a626e3185d8cd48cc11b5437e1a5bcd15b9b5fa3c64b6dfee7" -dependencies = [ - "signature 1.6.4", -] - -[[package]] -name = "ed25519" version = "2.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "60f6d271ca33075c88028be6f04d502853d63a5ece419d269c15315d4fc1cf1d" dependencies = [ "pkcs8", - "signature 2.1.0", -] - -[[package]] -name = "ed25519-dalek" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d" -dependencies = [ - "curve25519-dalek 3.2.0", - "ed25519 1.5.3", - "rand 0.7.3", - "serde", - "sha2 0.9.9", - "zeroize", + "signature", ] [[package]] @@ -5006,9 +4936,9 @@ version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871" dependencies = [ - "curve25519-dalek 4.1.2", - "ed25519 2.2.2", - "rand_core 0.6.4", + "curve25519-dalek", + "ed25519", + "rand_core", "serde", "sha2 0.10.8", "subtle 2.5.0", @@ -5021,11 +4951,11 @@ version = "4.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7d9ce6874da5d4415896cd45ffbc4d1cfc0c4f9c079427bd870742c30f2f65a9" dependencies = [ - "curve25519-dalek 4.1.2", - "ed25519 2.2.2", + "curve25519-dalek", + "ed25519", "hashbrown 0.14.3", "hex", - "rand_core 0.6.4", + "rand_core", "sha2 0.10.8", "zeroize", ] @@ -5049,7 +4979,7 @@ dependencies = [ "generic-array 0.14.7", "group", "pkcs8", - "rand_core 0.6.4", + "rand_core", "sec1", "serdect", "subtle 2.5.0", @@ -5058,7 +4988,7 @@ dependencies = [ [[package]] name = "emulated-integration-tests-common" -version = "3.0.0" +version = "13.0.0" dependencies = [ "asset-test-utils", "bp-messages", @@ -5180,19 +5110,6 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7" -dependencies = [ - "atty", - "humantime", - "log", - "regex", - "termcolor", -] - -[[package]] -name = "env_logger" version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95b3f3e67048839cb0d0781f445682a35113da7121f7c949db0e2be96a4fbece" @@ -5332,6 +5249,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] +name = "event-listener" +version = "5.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b5fb89194fa3cad959b833185b3063ba881dbfc7030680b314250779fb4cc91" +dependencies = [ + "concurrent-queue", + "parking", + "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.2.0", + "pin-project-lite", +] + +[[package]] name = "exit-future" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5342,12 +5280,14 @@ dependencies = [ [[package]] name = "expander" -version = "2.0.0" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f86a749cf851891866c10515ef6c299b5c69661465e9c3bbe7e07a2b77fb0f7" +checksum = "e2c470c71d91ecbd179935b24170459e926382eaaa86b590b78814e180d8a8e2" dependencies = [ "blake2 0.10.6", + "file-guard", "fs-err", + "prettyplease 0.2.12", "proc-macro2 1.0.82", "quote 1.0.35", "syn 2.0.61", @@ -5457,30 +5397,27 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449" dependencies = [ - "rand_core 0.6.4", + "rand_core", "subtle 2.5.0", ] [[package]] -name = "fflonk" -version = "0.1.0" -source = "git+https://github.com/w3f/fflonk#1e854f35e9a65d08b11a86291405cdc95baa0a35" -dependencies = [ - "ark-ec", - "ark-ff 0.4.2", - "ark-poly", - "ark-serialize 0.4.2", - "ark-std 0.4.0", - "merlin", -] - -[[package]] name = "fiat-crypto" version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "27573eac26f4dd11e2b1916c3fe1baa56407c83c71a773a8ba17ec0bca03b6b7" [[package]] +name = "file-guard" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21ef72acf95ec3d7dbf61275be556299490a245f017cf084bd23b4f68cf9407c" +dependencies = [ + "libc", + "winapi", +] + +[[package]] name = "file-per-thread-logger" version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5514,8 +5451,8 @@ dependencies = [ "log", "num-traits", "parity-scale-codec", - "parking_lot 0.12.1", - "rand 0.8.5", + "parking_lot 0.12.3", + "rand", "scale-info", ] @@ -5530,7 +5467,7 @@ dependencies = [ "futures", "log", "num-traits", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "relay-utils", ] @@ -5553,7 +5490,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "835c052cb0c08c1acf6ffd71c022172e18723949c8282f2b9f27efbc51e64534" dependencies = [ "byteorder", - "rand 0.8.5", + "rand", "rustc-hex", "static_assertions", ] @@ -5571,7 +5508,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" dependencies = [ "crc32fast", - "libz-sys", "miniz_oxide", ] @@ -5607,16 +5543,16 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "fork-tree" -version = "12.0.0" +version = "13.0.0" dependencies = [ "parity-scale-codec", ] [[package]] name = "form_urlencoded" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" dependencies = [ "percent-encoding", ] @@ -5649,7 +5585,7 @@ checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" [[package]] name = "frame-benchmarking" -version = "28.0.0" +version = "37.0.0" dependencies = [ "array-bytes", "frame-support", @@ -5668,15 +5604,14 @@ dependencies = [ "sp-io", "sp-keystore", "sp-runtime", - "sp-runtime-interface 24.0.0", - "sp-std 14.0.0", - "sp-storage 19.0.0", + "sp-runtime-interface", + "sp-storage", "static_assertions", ] [[package]] name = "frame-benchmarking-cli" -version = "32.0.0" +version = "42.0.0" dependencies = [ "Inflector", "array-bytes", @@ -5693,7 +5628,7 @@ dependencies = [ "linked-hash-map", "log", "parity-scale-codec", - "rand 0.8.5", + "rand", "rand_pcg", "sc-block-builder", "sc-chain-spec", @@ -5709,23 +5644,23 @@ dependencies = [ "sp-blockchain", "sp-core", "sp-database", - "sp-externalities 0.25.0", + "sp-externalities", "sp-genesis-builder", "sp-inherents", "sp-io", "sp-keystore", "sp-runtime", "sp-state-machine", - "sp-storage 19.0.0", + "sp-storage", "sp-trie", - "sp-wasm-interface 20.0.0", + "sp-wasm-interface", "thiserror", "thousands", ] [[package]] name = "frame-benchmarking-pallet-pov" -version = "18.0.0" +version = "27.0.0" dependencies = [ "frame-benchmarking", "frame-support", @@ -5734,12 +5669,11 @@ dependencies = [ "scale-info", "sp-io", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "frame-election-provider-solution-type" -version = "13.0.0" +version = "14.0.1" dependencies = [ "frame-election-provider-support", "frame-support", @@ -5755,25 +5689,24 @@ dependencies = [ [[package]] name = "frame-election-provider-support" -version = "28.0.0" +version = "37.0.0" dependencies = [ "frame-election-provider-solution-type", "frame-support", "frame-system", "parity-scale-codec", - "rand 0.8.5", + "rand", "scale-info", "sp-arithmetic", "sp-core", "sp-io", "sp-npos-elections", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "frame-election-solution-type-fuzzer" -version = "2.0.0-alpha.5" +version = "2.0.0" dependencies = [ "clap 4.5.3", "frame-election-provider-solution-type", @@ -5781,7 +5714,7 @@ dependencies = [ "frame-support", "honggfuzz", "parity-scale-codec", - "rand 0.8.5", + "rand", "scale-info", "sp-arithmetic", "sp-npos-elections", @@ -5790,7 +5723,7 @@ dependencies = [ [[package]] name = "frame-executive" -version = "28.0.0" +version = "37.0.0" dependencies = [ "aquamarine", "array-bytes", @@ -5806,8 +5739,7 @@ dependencies = [ "sp-inherents", "sp-io", "sp-runtime", - "sp-std 14.0.0", - "sp-tracing 16.0.0", + "sp-tracing", "sp-version", ] @@ -5825,7 +5757,7 @@ dependencies = [ [[package]] name = "frame-metadata-hash-extension" -version = "0.1.0" +version = "0.5.0" dependencies = [ "array-bytes", "docify", @@ -5838,7 +5770,7 @@ dependencies = [ "scale-info", "sp-api", "sp-runtime", - "sp-tracing 16.0.0", + "sp-tracing", "sp-transaction-pool", "substrate-test-runtime-client", "substrate-wasm-builder", @@ -5846,7 +5778,7 @@ dependencies = [ [[package]] name = "frame-omni-bencher" -version = "0.1.0" +version = "0.6.0" dependencies = [ "clap 4.5.3", "cumulus-primitives-proof-size-hostfunction", @@ -5860,7 +5792,7 @@ dependencies = [ [[package]] name = "frame-remote-externalities" -version = "0.35.0" +version = "0.45.0" dependencies = [ "futures", "indicatif", @@ -5873,7 +5805,7 @@ dependencies = [ "sp-io", "sp-runtime", "sp-state-machine", - "sp-tracing 16.0.0", + "sp-tracing", "spinners", "substrate-rpc-client", "tokio", @@ -5882,7 +5814,7 @@ dependencies = [ [[package]] name = "frame-support" -version = "28.0.0" +version = "37.0.0" dependencies = [ "aquamarine", "array-bytes", @@ -5909,7 +5841,7 @@ dependencies = [ "sp-core", "sp-crypto-hashing", "sp-crypto-hashing-proc-macro", - "sp-debug-derive 14.0.0", + "sp-debug-derive", "sp-genesis-builder", "sp-inherents", "sp-io", @@ -5917,9 +5849,9 @@ dependencies = [ "sp-runtime", "sp-staking", "sp-state-machine", - "sp-std 14.0.0", + "sp-std", "sp-timestamp", - "sp-tracing 16.0.0", + "sp-tracing", "sp-weights", "static_assertions", "tt-call", @@ -5927,16 +5859,16 @@ dependencies = [ [[package]] name = "frame-support-procedural" -version = "23.0.0" +version = "30.0.2" dependencies = [ "Inflector", "cfg-expr", - "derive-syn-parse 0.2.0", + "derive-syn-parse", "expander", "frame-support-procedural-tools", "itertools 0.11.0", "macro_magic", - "proc-macro-warning", + "proc-macro-warning 1.0.0", "proc-macro2 1.0.82", "quote 1.0.35", "regex", @@ -5946,7 +5878,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" -version = "10.0.0" +version = "13.0.0" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate 3.1.0", @@ -5957,7 +5889,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" -version = "11.0.0" +version = "12.0.0" dependencies = [ "proc-macro2 1.0.82", "quote 1.0.35", @@ -5986,7 +5918,6 @@ dependencies = [ "sp-metadata-ir", "sp-runtime", "sp-state-machine", - "sp-std 14.0.0", "sp-version", "static_assertions", "trybuild", @@ -5994,7 +5925,7 @@ dependencies = [ [[package]] name = "frame-support-test-compile-pass" -version = "4.0.0-dev" +version = "4.0.0" dependencies = [ "frame-support", "frame-system", @@ -6007,7 +5938,7 @@ dependencies = [ [[package]] name = "frame-support-test-pallet" -version = "4.0.0-dev" +version = "4.0.0" dependencies = [ "frame-support", "frame-system", @@ -6028,7 +5959,7 @@ dependencies = [ [[package]] name = "frame-system" -version = "28.0.0" +version = "37.1.0" dependencies = [ "cfg-if", "criterion", @@ -6039,10 +5970,10 @@ dependencies = [ "scale-info", "serde", "sp-core", - "sp-externalities 0.25.0", + "sp-externalities", "sp-io", "sp-runtime", - "sp-std 14.0.0", + "sp-std", "sp-version", "sp-weights", "substrate-test-runtime-client", @@ -6050,7 +5981,7 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" -version = "28.0.0" +version = "37.0.0" dependencies = [ "frame-benchmarking", "frame-support", @@ -6058,30 +5989,29 @@ dependencies = [ "parity-scale-codec", "scale-info", "sp-core", - "sp-externalities 0.25.0", + "sp-externalities", "sp-io", "sp-runtime", - "sp-std 14.0.0", "sp-version", ] [[package]] name = "frame-system-rpc-runtime-api" -version = "26.0.0" +version = "34.0.0" dependencies = [ + "docify", "parity-scale-codec", "sp-api", ] [[package]] name = "frame-try-runtime" -version = "0.34.0" +version = "0.43.0" dependencies = [ "frame-support", "parity-scale-codec", "sp-api", "sp-runtime", - "sp-std 14.0.0", ] [[package]] @@ -6138,6 +6068,16 @@ dependencies = [ ] [[package]] +name = "futures-bounded" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b07bbbe7d7e78809544c6f718d875627addc73a7c3582447abc052cd3dc67e0" +dependencies = [ + "futures-timer", + "futures-util", +] + +[[package]] name = "futures-channel" version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6182,11 +6122,21 @@ dependencies = [ "futures-io", "memchr", "parking", - "pin-project-lite 0.2.12", + "pin-project-lite", "waker-fn", ] [[package]] +name = "futures-lite" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" +dependencies = [ + "futures-core", + "pin-project-lite", +] + +[[package]] name = "futures-macro" version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6199,13 +6149,12 @@ dependencies = [ [[package]] name = "futures-rustls" -version = "0.22.2" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2411eed028cdf8c8034eaf21f9915f956b6c3abec4d4c7949ee67f0721127bd" +checksum = "35bd3cf68c183738046838e300353e4716c674dc5e56890de4826801a6622a28" dependencies = [ "futures-io", - "rustls 0.20.8", - "webpki", + "rustls 0.21.7", ] [[package]] @@ -6239,7 +6188,7 @@ dependencies = [ "futures-sink", "futures-task", "memchr", - "pin-project-lite 0.2.12", + "pin-project-lite", "pin-utils", "slab", ] @@ -6255,7 +6204,7 @@ dependencies = [ [[package]] name = "generate-bags" -version = "28.0.0" +version = "37.0.0" dependencies = [ "chrono", "frame-election-provider-support", @@ -6298,24 +6247,13 @@ 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.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" dependencies = [ "cfg-if", "libc", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", ] [[package]] @@ -6324,8 +6262,8 @@ version = "0.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6ea1015b5a70616b688dc230cfe50c8af89d972cb132d5a622814d29773b10b9" dependencies = [ - "rand 0.8.5", - "rand_core 0.6.4", + "rand", + "rand_core", ] [[package]] @@ -6379,7 +6317,7 @@ dependencies = [ [[package]] name = "glutton-westend-runtime" -version = "3.0.0" +version = "13.0.0" dependencies = [ "cumulus-pallet-aura-ext", "cumulus-pallet-parachain-system", @@ -6411,8 +6349,7 @@ dependencies = [ "sp-offchain", "sp-runtime", "sp-session", - "sp-std 14.0.0", - "sp-storage 19.0.0", + "sp-storage", "sp-transaction-pool", "sp-version", "staging-parachain-info", @@ -6435,9 +6372,9 @@ dependencies = [ "futures-timer", "no-std-compat", "nonzero_ext", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "quanta", - "rand 0.8.5", + "rand", "smallvec", ] @@ -6448,7 +6385,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" dependencies = [ "ff", - "rand_core 0.6.4", + "rand_core", "subtle 2.5.0", ] @@ -6463,7 +6400,26 @@ dependencies = [ "futures-core", "futures-sink", "futures-util", - "http", + "http 0.2.9", + "indexmap 2.2.3", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[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 1.1.0", "indexmap 2.2.3", "slab", "tokio", @@ -6521,7 +6477,7 @@ version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" dependencies = [ - "ahash 0.8.8", + "ahash 0.8.11", ] [[package]] @@ -6530,7 +6486,7 @@ version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" dependencies = [ - "ahash 0.8.8", + "ahash 0.8.11", "allocator-api2", "serde", ] @@ -6672,21 +6628,49 @@ dependencies = [ ] [[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 = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" dependencies = [ "bytes", - "http", - "pin-project-lite 0.2.12", + "http 0.2.9", + "pin-project-lite", ] [[package]] -name = "http-range-header" -version = "0.3.1" +name = "http-body" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "add0ab9360ddbd88cfeb3bd9574a1d85cfdfa14db10b3e21d3700dbc4328758f" +checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" +dependencies = [ + "bytes", + "http 1.1.0", +] + +[[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 1.1.0", + "http-body 1.0.0", + "pin-project-lite", +] [[package]] name = "httparse" @@ -6708,22 +6692,22 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.27" +version = "0.14.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" +checksum = "f361cde2f109281a220d4307746cdfd5ee3f410da58a70377762396775634b33" dependencies = [ "bytes", "futures-channel", "futures-core", "futures-util", - "h2", - "http", - "http-body", + "h2 0.3.26", + "http 0.2.9", + "http-body 0.4.5", "httparse", "httpdate", "itoa", - "pin-project-lite 0.2.12", - "socket2 0.4.9", + "pin-project-lite", + "socket2 0.5.7", "tokio", "tower-service", "tracing", @@ -6731,22 +6715,81 @@ dependencies = [ ] [[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 0.4.5", + "http 1.1.0", + "http-body 1.0.0", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "smallvec", + "tokio", + "want", +] + +[[package]] name = "hyper-rustls" -version = "0.24.1" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d78e1e73ec14cf7375674f74d7dde185c8206fd9dea6fb6295e8a98098aaa97" +checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ "futures-util", - "http", - "hyper", + "http 0.2.9", + "hyper 0.14.29", "log", - "rustls 0.21.6", + "rustls 0.21.7", "rustls-native-certs 0.6.3", "tokio", "tokio-rustls 0.24.1", ] [[package]] +name = "hyper-rustls" +version = "0.27.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155" +dependencies = [ + "futures-util", + "http 1.1.0", + "hyper 1.3.1", + "hyper-util", + "log", + "rustls 0.23.10", + "rustls-pki-types", + "tokio", + "tokio-rustls 0.26.0", + "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 1.1.0", + "http-body 1.0.0", + "hyper 1.3.1", + "pin-project-lite", + "socket2 0.5.7", + "tokio", + "tower", + "tower-service", + "tracing", +] + +[[package]] name = "iana-time-zone" version = "0.1.57" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6791,22 +6834,32 @@ dependencies = [ ] [[package]] +name = "idna" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] name = "if-addrs" -version = "0.7.0" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbc0fa01ffc752e9dbc72818cdb072cd028b86be5e09dd04c5a643704fe101a9" +checksum = "cabb0019d51a643781ff15c9c8a3e5dedc365c47211270f4e8f82812fedd8f0a" dependencies = [ "libc", - "winapi", + "windows-sys 0.48.0", ] [[package]] name = "if-watch" -version = "3.0.1" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9465340214b296cd17a0009acdb890d6160010b8adf8f78a00d0d7ab270f79f" +checksum = "d6b0422c86d7ce0e97169cc42e04ae643caf278874a7a3c87b8150a220dc7e1e" dependencies = [ - "async-io", + "async-io 2.3.3", "core-foundation", "fnv", "futures", @@ -6816,7 +6869,26 @@ dependencies = [ "rtnetlink", "system-configuration", "tokio", - "windows 0.34.0", + "windows 0.51.1", +] + +[[package]] +name = "igd-next" +version = "0.14.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "064d90fec10d541084e7b39ead8875a5a80d9114a2b18791565253bae25f49e4" +dependencies = [ + "async-trait", + "attohttpc", + "bytes", + "futures", + "http 0.2.9", + "hyper 0.14.29", + "log", + "rand", + "tokio", + "url", + "xmltree", ] [[package]] @@ -6989,7 +7061,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f" dependencies = [ - "socket2 0.5.6", + "socket2 0.5.7", "widestring", "windows-sys 0.48.0", "winreg", @@ -7033,13 +7105,13 @@ dependencies = [ "curl", "curl-sys", "encoding_rs", - "event-listener", - "futures-lite", - "http", + "event-listener 2.5.3", + "futures-lite 1.13.0", + "http 0.2.9", "log", "mime", "once_cell", - "polling", + "polling 2.8.0", "slab", "sluice", "tracing", @@ -7073,6 +7145,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] +name = "jni" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6df18c2e3db7e453d3c6ac5b3e9d5182664d28788126d39b91f2d1e22b017ec" +dependencies = [ + "cesu8", + "combine", + "jni-sys", + "log", + "thiserror", + "walkdir", +] + +[[package]] +name = "jni-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" + +[[package]] name = "jobserver" version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -7109,9 +7201,9 @@ dependencies = [ [[package]] name = "jsonrpsee" -version = "0.22.5" +version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfdb12a2381ea5b2e68c3469ec604a007b367778cdb14d09612c8069ebd616ad" +checksum = "62b089779ad7f80768693755a031cc14a7766aba707cbe886674e3f79e9b7e47" dependencies = [ "jsonrpsee-core", "jsonrpsee-http-client", @@ -7125,20 +7217,22 @@ dependencies = [ [[package]] name = "jsonrpsee-client-transport" -version = "0.22.5" +version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4978087a58c3ab02efc5b07c5e5e2803024536106fd5506f558db172c889b3aa" +checksum = "08163edd8bcc466c33d79e10f695cdc98c00d1e6ddfb95cec41b6b0279dd5432" dependencies = [ + "base64 0.22.1", "futures-util", - "http", + "http 1.1.0", "jsonrpsee-core", "pin-project", - "rustls-native-certs 0.7.0", + "rustls 0.23.10", "rustls-pki-types", - "soketto", + "rustls-platform-verifier", + "soketto 0.8.0", "thiserror", "tokio", - "tokio-rustls 0.25.0", + "tokio-rustls 0.26.0", "tokio-util", "tracing", "url", @@ -7146,20 +7240,23 @@ dependencies = [ [[package]] name = "jsonrpsee-core" -version = "0.22.5" +version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4b257e1ec385e07b0255dde0b933f948b5c8b8c28d42afda9587c3a967b896d" +checksum = "79712302e737d23ca0daa178e752c9334846b08321d439fd89af9a384f8c830b" dependencies = [ "anyhow", "async-trait", "beef", + "bytes", "futures-timer", "futures-util", - "hyper", + "http 1.1.0", + "http-body 1.0.0", + "http-body-util", "jsonrpsee-types", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "pin-project", - "rand 0.8.5", + "rand", "rustc-hash", "serde", "serde_json", @@ -7171,15 +7268,20 @@ dependencies = [ [[package]] name = "jsonrpsee-http-client" -version = "0.22.5" +version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ccf93fc4a0bfe05d851d37d7c32b7f370fe94336b52a2f0efc5f1981895c2e5" +checksum = "2d90064e04fb9d7282b1c71044ea94d0bbc6eff5621c66f1a0bce9e9de7cf3ac" dependencies = [ "async-trait", - "hyper", - "hyper-rustls", + "base64 0.22.1", + "http-body 1.0.0", + "hyper 1.3.1", + "hyper-rustls 0.27.2", + "hyper-util", "jsonrpsee-core", "jsonrpsee-types", + "rustls 0.23.10", + "rustls-platform-verifier", "serde", "serde_json", "thiserror", @@ -7191,11 +7293,11 @@ dependencies = [ [[package]] name = "jsonrpsee-proc-macros" -version = "0.22.5" +version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d0bb047e79a143b32ea03974a6bf59b62c2a4c5f5d42a381c907a8bbb3f75c0" +checksum = "7895f186d5921065d96e16bd795e5ca89ac8356ec423fafc6e3d7cf8ec11aee4" dependencies = [ - "heck 0.4.1", + "heck 0.5.0", "proc-macro-crate 3.1.0", "proc-macro2 1.0.82", "quote 1.0.35", @@ -7204,20 +7306,24 @@ dependencies = [ [[package]] name = "jsonrpsee-server" -version = "0.22.5" +version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12d8b6a9674422a8572e0b0abb12feeb3f2aeda86528c80d0350c2bd0923ab41" +checksum = "654afab2e92e5d88ebd8a39d6074483f3f2bfdf91c5ac57fe285e7127cdd4f51" dependencies = [ + "anyhow", "futures-util", - "http", - "hyper", + "http 1.1.0", + "http-body 1.0.0", + "http-body-util", + "hyper 1.3.1", + "hyper-util", "jsonrpsee-core", "jsonrpsee-types", "pin-project", "route-recognizer", "serde", "serde_json", - "soketto", + "soketto 0.8.0", "thiserror", "tokio", "tokio-stream", @@ -7228,12 +7334,12 @@ dependencies = [ [[package]] name = "jsonrpsee-types" -version = "0.22.5" +version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "150d6168405890a7a3231a3c74843f58b8959471f6df76078db2619ddee1d07d" +checksum = "d9c465fbe385238e861fdc4d1c85e04ada6c1fd246161d26385c1b311724d2af" dependencies = [ - "anyhow", "beef", + "http 1.1.0", "serde", "serde_json", "thiserror", @@ -7241,11 +7347,11 @@ dependencies = [ [[package]] name = "jsonrpsee-ws-client" -version = "0.22.5" +version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58b9db2dfd5bb1194b0ce921504df9ceae210a345bc2f6c5a61432089bbab070" +checksum = "1c28759775f5cb2f1ea9667672d3fe2b0e701d1f4b7b67954e60afe7fd058b5e" dependencies = [ - "http", + "http 1.1.0", "jsonrpsee-client-transport", "jsonrpsee-core", "jsonrpsee-types", @@ -7294,7 +7400,7 @@ checksum = "c33070833c9ee02266356de0c43f723152bd38bd96ddf52c82b3af10c9138b28" [[package]] name = "kitchensink-runtime" -version = "3.0.0-dev" +version = "3.0.0" dependencies = [ "log", "node-primitives", @@ -7334,7 +7440,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bf7a85fe66f9ff9cd74e169fdd2c94c6e1e74c412c99a73b4df3200b5d3760b2" dependencies = [ "kvdb", - "parking_lot 0.12.1", + "parking_lot 0.12.3", ] [[package]] @@ -7345,7 +7451,7 @@ checksum = "b644c70b92285f66bfc2032922a79000ea30af7bc2ab31902992a5dcb9b434f6" dependencies = [ "kvdb", "num_cpus", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "regex", "rocksdb", "smallvec", @@ -7438,9 +7544,9 @@ dependencies = [ [[package]] name = "libm" -version = "0.2.7" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" +checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" [[package]] name = "libnghttp2-sys" @@ -7454,14 +7560,15 @@ dependencies = [ [[package]] name = "libp2p" -version = "0.51.4" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f35eae38201a993ece6bdc823292d6abd1bffed1c4d0f4a3517d2bd8e1d917fe" +checksum = "e94495eb319a85b70a68b85e2389a95bb3555c71c49025b78c691a854a7e6464" dependencies = [ "bytes", + "either", "futures", "futures-timer", - "getrandom 0.2.10", + "getrandom", "instant", "libp2p-allow-block-list", "libp2p-connection-limits", @@ -7478,18 +7585,21 @@ dependencies = [ "libp2p-request-response", "libp2p-swarm", "libp2p-tcp", + "libp2p-upnp", "libp2p-wasm-ext", "libp2p-websocket", "libp2p-yamux", - "multiaddr", + "multiaddr 0.18.1", "pin-project", + "rw-stream-sink", + "thiserror", ] [[package]] name = "libp2p-allow-block-list" -version = "0.1.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "510daa05efbc25184458db837f6f9a5143888f1caa742426d92e1833ddd38a50" +checksum = "55b46558c5c0bf99d3e2a1a38fd54ff5476ca66dd1737b12466a1824dd219311" dependencies = [ "libp2p-core", "libp2p-identity", @@ -7499,9 +7609,9 @@ dependencies = [ [[package]] name = "libp2p-connection-limits" -version = "0.1.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4caa33f1d26ed664c4fe2cca81a08c8e07d4c1c04f2f4ac7655c2dd85467fda0" +checksum = "2f5107ad45cb20b2f6c3628c7b6014b996fcb13a88053f4569c872c6e30abf58" dependencies = [ "libp2p-core", "libp2p-identity", @@ -7511,9 +7621,9 @@ dependencies = [ [[package]] name = "libp2p-core" -version = "0.39.2" +version = "0.40.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c1df63c0b582aa434fb09b2d86897fa2b419ffeccf934b36f87fcedc8e835c2" +checksum = "dd44289ab25e4c9230d9246c475a22241e301b23e8f4061d3bdef304a1a99713" dependencies = [ "either", "fnv", @@ -7522,50 +7632,53 @@ dependencies = [ "instant", "libp2p-identity", "log", - "multiaddr", - "multihash 0.17.0", + "multiaddr 0.18.1", + "multihash 0.19.1", "multistream-select", "once_cell", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "pin-project", "quick-protobuf", - "rand 0.8.5", + "rand", "rw-stream-sink", "smallvec", "thiserror", - "unsigned-varint", + "unsigned-varint 0.7.2", "void", ] [[package]] name = "libp2p-dns" -version = "0.39.0" +version = "0.40.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "146ff7034daae62077c415c2376b8057368042df6ab95f5432ad5e88568b1554" +checksum = "e6a18db73084b4da2871438f6239fef35190b05023de7656e877c18a00541a3b" dependencies = [ + "async-trait", "futures", "libp2p-core", + "libp2p-identity", "log", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "smallvec", - "trust-dns-resolver 0.22.0", + "trust-dns-resolver", ] [[package]] name = "libp2p-identify" -version = "0.42.2" +version = "0.43.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5455f472243e63b9c497ff320ded0314254a9eb751799a39c283c6f20b793f3c" +checksum = "45a96638a0a176bec0a4bcaebc1afa8cf909b114477209d7456ade52c61cd9cd" dependencies = [ "asynchronous-codec", "either", "futures", + "futures-bounded", "futures-timer", "libp2p-core", "libp2p-identity", "libp2p-swarm", "log", - "lru 0.10.1", + "lru 0.12.3", "quick-protobuf", "quick-protobuf-codec", "smallvec", @@ -7575,27 +7688,27 @@ dependencies = [ [[package]] name = "libp2p-identity" -version = "0.1.3" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "276bb57e7af15d8f100d3c11cbdd32c6752b7eef4ba7a18ecf464972c07abcce" +checksum = "999ec70441b2fb35355076726a6bc466c932e9bdc66f6a11c6c0aa17c7ab9be0" dependencies = [ - "bs58 0.4.0", - "ed25519-dalek 2.1.1", - "log", - "multiaddr", - "multihash 0.17.0", + "bs58 0.5.0", + "ed25519-dalek", + "hkdf", + "multihash 0.19.1", "quick-protobuf", - "rand 0.8.5", + "rand", "sha2 0.10.8", "thiserror", + "tracing", "zeroize", ] [[package]] name = "libp2p-kad" -version = "0.43.3" +version = "0.44.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39d5ef876a2b2323d63c258e63c2f8e36f205fe5a11f0b3095d59635650790ff" +checksum = "16ea178dabba6dde6ffc260a8e0452ccdc8f79becf544946692fff9d412fc29d" dependencies = [ "arrayvec 0.7.4", "asynchronous-codec", @@ -7610,20 +7723,21 @@ dependencies = [ "libp2p-swarm", "log", "quick-protobuf", - "rand 0.8.5", + "quick-protobuf-codec", + "rand", "sha2 0.10.8", "smallvec", "thiserror", "uint", - "unsigned-varint", + "unsigned-varint 0.7.2", "void", ] [[package]] name = "libp2p-mdns" -version = "0.43.1" +version = "0.44.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19983e1f949f979a928f2c603de1cf180cc0dc23e4ac93a62651ccb18341460b" +checksum = "42a2567c305232f5ef54185e9604579a894fd0674819402bb0ac0246da82f52a" dependencies = [ "data-encoding", "futures", @@ -7632,9 +7746,9 @@ dependencies = [ "libp2p-identity", "libp2p-swarm", "log", - "rand 0.8.5", + "rand", "smallvec", - "socket2 0.4.9", + "socket2 0.5.7", "tokio", "trust-dns-proto 0.22.0", "void", @@ -7642,63 +7756,69 @@ dependencies = [ [[package]] name = "libp2p-metrics" -version = "0.12.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a42ec91e227d7d0dafa4ce88b333cdf5f277253873ab087555c92798db2ddd46" +checksum = "239ba7d28f8d0b5d77760dc6619c05c7e88e74ec8fbbe97f856f20a56745e620" dependencies = [ + "instant", "libp2p-core", "libp2p-identify", + "libp2p-identity", "libp2p-kad", "libp2p-ping", "libp2p-swarm", + "once_cell", "prometheus-client", ] [[package]] name = "libp2p-noise" -version = "0.42.2" +version = "0.43.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c3673da89d29936bc6435bafc638e2f184180d554ce844db65915113f86ec5e" +checksum = "d2eeec39ad3ad0677551907dd304b2f13f17208ccebe333bef194076cd2e8921" dependencies = [ "bytes", - "curve25519-dalek 3.2.0", + "curve25519-dalek", "futures", "libp2p-core", "libp2p-identity", "log", + "multiaddr 0.18.1", + "multihash 0.19.1", "once_cell", "quick-protobuf", - "rand 0.8.5", + "rand", "sha2 0.10.8", "snow", "static_assertions", "thiserror", - "x25519-dalek 1.1.1", + "x25519-dalek", "zeroize", ] [[package]] name = "libp2p-ping" -version = "0.42.0" +version = "0.43.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e57759c19c28a73ef1eb3585ca410cefb72c1a709fcf6de1612a378e4219202" +checksum = "e702d75cd0827dfa15f8fd92d15b9932abe38d10d21f47c50438c71dd1b5dae3" dependencies = [ "either", "futures", "futures-timer", "instant", "libp2p-core", + "libp2p-identity", "libp2p-swarm", "log", - "rand 0.8.5", + "rand", "void", ] [[package]] name = "libp2p-quic" -version = "0.7.0-alpha.3" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6b26abd81cd2398382a1edfe739b539775be8a90fa6914f39b2ab49571ec735" +checksum = "130d451d83f21b81eb7b35b360bc7972aeafb15177784adc56528db082e6b927" dependencies = [ "bytes", "futures", @@ -7708,19 +7828,21 @@ dependencies = [ "libp2p-identity", "libp2p-tls", "log", - "parking_lot 0.12.1", - "quinn-proto", - "rand 0.8.5", - "rustls 0.20.8", + "parking_lot 0.12.3", + "quinn 0.10.2", + "rand", + "ring 0.16.20", + "rustls 0.21.7", + "socket2 0.5.7", "thiserror", "tokio", ] [[package]] name = "libp2p-request-response" -version = "0.24.1" +version = "0.25.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffdb374267d42dc5ed5bc53f6e601d4a64ac5964779c6e40bb9e4f14c1e30d5" +checksum = "d8e3b4d67870478db72bac87bfc260ee6641d0734e0e3e275798f089c3fecfd4" dependencies = [ "async-trait", "futures", @@ -7728,15 +7850,17 @@ dependencies = [ "libp2p-core", "libp2p-identity", "libp2p-swarm", - "rand 0.8.5", + "log", + "rand", "smallvec", + "void", ] [[package]] name = "libp2p-swarm" -version = "0.42.2" +version = "0.43.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "903b3d592d7694e56204d211f29d31bc004be99386644ba8731fc3e3ef27b296" +checksum = "580189e0074af847df90e75ef54f3f30059aedda37ea5a1659e8b9fca05c0141" dependencies = [ "either", "fnv", @@ -7747,7 +7871,9 @@ dependencies = [ "libp2p-identity", "libp2p-swarm-derive", "log", - "rand 0.8.5", + "multistream-select", + "once_cell", + "rand", "smallvec", "tokio", "void", @@ -7755,36 +7881,39 @@ dependencies = [ [[package]] name = "libp2p-swarm-derive" -version = "0.32.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fba456131824ab6acd4c7bf61e9c0f0a3014b5fc9868ccb8e10d344594cdc4f" +checksum = "c4d5ec2a3df00c7836d7696c136274c9c59705bac69133253696a6c932cd1d74" dependencies = [ "heck 0.4.1", + "proc-macro-warning 0.4.2", + "proc-macro2 1.0.82", "quote 1.0.35", - "syn 1.0.109", + "syn 2.0.61", ] [[package]] name = "libp2p-tcp" -version = "0.39.0" +version = "0.40.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33d33698596d7722d85d3ab0c86c2c322254fce1241e91208e3679b4eb3026cf" +checksum = "b558dd40d1bcd1aaaed9de898e9ec6a436019ecc2420dd0016e712fbb61c5508" dependencies = [ "futures", "futures-timer", "if-watch", "libc", "libp2p-core", + "libp2p-identity", "log", - "socket2 0.4.9", + "socket2 0.5.7", "tokio", ] [[package]] name = "libp2p-tls" -version = "0.1.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff08d13d0dc66e5e9ba6279c1de417b84fa0d0adc3b03e5732928c180ec02781" +checksum = "8218d1d5482b122ccae396bbf38abdcb283ecc96fa54760e1dfd251f0546ac61" dependencies = [ "futures", "futures-rustls", @@ -7792,51 +7921,69 @@ dependencies = [ "libp2p-identity", "rcgen", "ring 0.16.20", - "rustls 0.20.8", + "rustls 0.21.7", + "rustls-webpki 0.101.4", "thiserror", - "webpki", - "x509-parser 0.14.0", + "x509-parser 0.15.1", "yasna", ] [[package]] +name = "libp2p-upnp" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82775a47b34f10f787ad3e2a22e2c1541e6ebef4fe9f28f3ac553921554c94c1" +dependencies = [ + "futures", + "futures-timer", + "igd-next", + "libp2p-core", + "libp2p-swarm", + "log", + "tokio", + "void", +] + +[[package]] name = "libp2p-wasm-ext" -version = "0.39.0" +version = "0.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77dff9d32353a5887adb86c8afc1de1a94d9e8c3bc6df8b2201d7cdf5c848f43" +checksum = "1e5d8e3a9e07da0ef5b55a9f26c009c8fb3c725d492d8bb4b431715786eea79c" dependencies = [ "futures", "js-sys", "libp2p-core", - "parity-send-wrapper", + "send_wrapper", "wasm-bindgen", "wasm-bindgen-futures", ] [[package]] name = "libp2p-websocket" -version = "0.41.0" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "111273f7b3d3510524c752e8b7a5314b7f7a1fee7e68161c01a7d72cbb06db9f" +checksum = "004ee9c4a4631435169aee6aad2f62e3984dc031c43b6d29731e8e82a016c538" dependencies = [ "either", "futures", "futures-rustls", "libp2p-core", + "libp2p-identity", "log", - "parking_lot 0.12.1", - "quicksink", + "parking_lot 0.12.3", + "pin-project-lite", "rw-stream-sink", - "soketto", + "soketto 0.8.0", + "thiserror", "url", - "webpki-roots 0.22.6", + "webpki-roots 0.25.2", ] [[package]] name = "libp2p-yamux" -version = "0.43.1" +version = "0.44.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dcd21d950662700a385d4c6d68e2f5f54d778e97068cdd718522222ef513bda" +checksum = "8eedcb62824c4300efb9cfd4e2a6edaf3ca097b9e68b36dabe45a44469fd6a85" dependencies = [ "futures", "libp2p-core", @@ -7873,7 +8020,7 @@ dependencies = [ "libsecp256k1-core", "libsecp256k1-gen-ecmult", "libsecp256k1-gen-genmult", - "rand 0.8.5", + "rand", "serde", "sha2 0.9.9", "typenum", @@ -8003,40 +8150,40 @@ dependencies = [ [[package]] name = "litep2p" -version = "0.5.0" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f02542ae3a94b4c4ffa37dc56388c923e286afa3bf65452e3984b50b2a2f316" +checksum = "0f46c51c205264b834ceed95c8b195026e700494bc3991aaba3b4ea9e20626d9" dependencies = [ "async-trait", "bs58 0.4.0", "bytes", "cid 0.10.1", - "ed25519-dalek 1.0.1", + "ed25519-dalek", "futures", "futures-timer", "hex-literal", "indexmap 2.2.3", "libc", "mockall 0.12.1", - "multiaddr", + "multiaddr 0.17.1", "multihash 0.17.0", "network-interface", "nohash-hasher", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "pin-project", - "prost 0.11.9", + "prost 0.12.6", "prost-build 0.11.9", - "quinn", - "rand 0.8.5", + "quinn 0.9.4", + "rand", "rcgen", "ring 0.16.20", - "rustls 0.20.8", + "rustls 0.20.9", "serde", "sha2 0.10.8", "simple-dns", "smallvec", "snow", - "socket2 0.5.6", + "socket2 0.5.7", "static_assertions", "str0m", "thiserror", @@ -8045,13 +8192,13 @@ dependencies = [ "tokio-tungstenite", "tokio-util", "tracing", - "trust-dns-resolver 0.23.2", + "trust-dns-resolver", "uint", - "unsigned-varint", + "unsigned-varint 0.8.0", "url", "webpki", - "x25519-dalek 2.0.0", - "x509-parser 0.15.1", + "x25519-dalek", + "x509-parser 0.16.0", "yasna", "zeroize", ] @@ -8087,18 +8234,18 @@ dependencies = [ [[package]] name = "lru" -version = "0.10.1" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "718e8fae447df0c7e1ba7f5189829e63fd536945c8988d61444c19039f16b670" -dependencies = [ - "hashbrown 0.13.2", -] +checksum = "eedb2bdbad7e0634f83989bf596f497b070130daaa398ab22d84c39e266deec5" [[package]] name = "lru" -version = "0.11.0" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eedb2bdbad7e0634f83989bf596f497b070130daaa398ab22d84c39e266deec5" +checksum = "d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc" +dependencies = [ + "hashbrown 0.14.3", +] [[package]] name = "lru-cache" @@ -8149,9 +8296,9 @@ dependencies = [ [[package]] name = "macro_magic" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e03844fc635e92f3a0067e25fa4bf3e3dbf3f2927bf3aa01bb7bc8f1c428949d" +checksum = "cc33f9f0351468d26fbc53d9ce00a096c8522ecb42f19b50f34f2c422f76d21d" dependencies = [ "macro_magic_core", "macro_magic_macros", @@ -8161,12 +8308,12 @@ dependencies = [ [[package]] name = "macro_magic_core" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "468155613a44cfd825f1fb0ffa532b018253920d404e6fca1e8d43155198a46d" +checksum = "1687dc887e42f352865a393acae7cf79d98fab6351cde1f58e9e057da89bf150" dependencies = [ "const-random", - "derive-syn-parse 0.1.5", + "derive-syn-parse", "macro_magic_core_macros", "proc-macro2 1.0.82", "quote 1.0.35", @@ -8175,9 +8322,9 @@ dependencies = [ [[package]] name = "macro_magic_core_macros" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ea73aa640dc01d62a590d48c0c3521ed739d53b27f919b25c3551e233481654" +checksum = "b02abfe41815b5bd98dbd4260173db2c116dda171dc0fe7838cb206333b83308" dependencies = [ "proc-macro2 1.0.82", "quote 1.0.35", @@ -8186,9 +8333,9 @@ dependencies = [ [[package]] name = "macro_magic_macros" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef9d79ae96aaba821963320eb2b6e34d17df1e5a83d8a1985c29cc5be59577b3" +checksum = "73ea28ee64b88876bf45277ed9a5817c1817df061a74f2b988971a12570e5869" dependencies = [ "macro_magic_core", "quote 1.0.35", @@ -8209,15 +8356,6 @@ checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4" [[package]] name = "matchers" -version = "0.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f099785f7595cc4b4553a174ce30dd7589ef93391ff414dbb67f62392b9e0ce1" -dependencies = [ - "regex-automata 0.1.10", -] - -[[package]] -name = "matchers" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" @@ -8243,9 +8381,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.6.4" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "memfd" @@ -8323,7 +8461,7 @@ checksum = "58c38e2799fc0978b65dfff8023ec7843e2330bb462f19198840b34b6582397d" dependencies = [ "byteorder", "keccak", - "rand_core 0.6.4", + "rand_core", "zeroize", ] @@ -8334,13 +8472,12 @@ dependencies = [ "async-std", "async-trait", "bp-messages", - "env_logger 0.11.3", "finality-relay", "futures", "hex", "log", "num-traits", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "relay-utils", "sp-arithmetic", ] @@ -8352,7 +8489,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "69672161530e8aeca1d1400fbf3f1a1747ff60ea604265a4e906c2442df20532" dependencies = [ "futures", - "rand 0.8.5", + "rand", "thrift", ] @@ -8370,7 +8507,7 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "minimal-template" -version = "0.0.0" +version = "0.1.0" dependencies = [ "docify", "minimal-template-node", @@ -8383,9 +8520,10 @@ dependencies = [ [[package]] name = "minimal-template-node" -version = "0.0.0" +version = "0.1.0" dependencies = [ "clap 4.5.3", + "docify", "futures", "futures-timer", "jsonrpsee", @@ -8418,7 +8556,7 @@ dependencies = [ [[package]] name = "minimal-template-runtime" -version = "0.0.0" +version = "0.1.0" dependencies = [ "pallet-balances", "pallet-minimal-template", @@ -8450,7 +8588,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" dependencies = [ "libc", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", "windows-sys 0.48.0", ] @@ -8465,14 +8603,14 @@ dependencies = [ "bitflags 1.3.2", "blake2 0.10.6", "c2-chacha", - "curve25519-dalek 4.1.2", + "curve25519-dalek", "either", "hashlink", "lioness", "log", - "parking_lot 0.12.1", - "rand 0.8.5", - "rand_chacha 0.3.1", + "parking_lot 0.12.3", + "rand", + "rand_chacha", "rand_distr", "subtle 2.5.0", "thiserror", @@ -8481,12 +8619,12 @@ dependencies = [ [[package]] name = "mmr-gadget" -version = "29.0.0" +version = "39.0.0" dependencies = [ "futures", "log", "parity-scale-codec", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "sc-block-builder", "sc-client-api", "sc-offchain", @@ -8497,14 +8635,14 @@ dependencies = [ "sp-core", "sp-mmr-primitives", "sp-runtime", - "sp-tracing 16.0.0", + "sp-tracing", "substrate-test-runtime-client", "tokio", ] [[package]] name = "mmr-rpc" -version = "28.0.0" +version = "37.0.0" dependencies = [ "jsonrpsee", "parity-scale-codec", @@ -8572,6 +8710,12 @@ dependencies = [ ] [[package]] +name = "multi-stash" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "685a9ac4b61f4e728e1d2c6a7844609c16527aeb5e6c865915c08e619c16410f" + +[[package]] name = "multiaddr" version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -8586,7 +8730,26 @@ dependencies = [ "percent-encoding", "serde", "static_assertions", - "unsigned-varint", + "unsigned-varint 0.7.2", + "url", +] + +[[package]] +name = "multiaddr" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b852bc02a2da5feed68cd14fa50d0774b92790a5bdbfa932a813926c8472070" +dependencies = [ + "arrayref", + "byteorder", + "data-encoding", + "libp2p-identity", + "multibase", + "multihash 0.19.1", + "percent-encoding", + "serde", + "static_assertions", + "unsigned-varint 0.7.2", "url", ] @@ -8612,10 +8775,10 @@ dependencies = [ "blake3", "core2", "digest 0.10.7", - "multihash-derive 0.8.0", + "multihash-derive", "sha2 0.10.8", "sha3", - "unsigned-varint", + "unsigned-varint 0.7.2", ] [[package]] @@ -8629,10 +8792,10 @@ dependencies = [ "blake3", "core2", "digest 0.10.7", - "multihash-derive 0.8.0", + "multihash-derive", "sha2 0.10.8", "sha3", - "unsigned-varint", + "unsigned-varint 0.7.2", ] [[package]] @@ -8642,27 +8805,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "076d548d76a0e2a0d4ab471d0b1c36c577786dfc4471242035d97a12a735c492" dependencies = [ "core2", - "unsigned-varint", -] - -[[package]] -name = "multihash-codetable" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6d815ecb3c8238d00647f8630ede7060a642c9f704761cd6082cb4028af6935" -dependencies = [ - "blake2b_simd", - "blake2s_simd", - "blake3", - "core2", - "digest 0.10.7", - "multihash-derive 0.9.0", - "ripemd", - "serde", - "sha1", - "sha2 0.10.8", - "sha3", - "strobe-rs", + "unsigned-varint 0.7.2", ] [[package]] @@ -8676,32 +8819,7 @@ dependencies = [ "proc-macro2 1.0.82", "quote 1.0.35", "syn 1.0.109", - "synstructure", -] - -[[package]] -name = "multihash-derive" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "890e72cb7396cb99ed98c1246a97b243cc16394470d94e0bc8b0c2c11d84290e" -dependencies = [ - "core2", - "multihash 0.19.1", - "multihash-derive-impl", -] - -[[package]] -name = "multihash-derive-impl" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d38685e08adb338659871ecfc6ee47ba9b22dcc8abcf6975d379cc49145c3040" -dependencies = [ - "proc-macro-crate 1.3.1", - "proc-macro-error", - "proc-macro2 1.0.82", - "quote 1.0.35", - "syn 1.0.109", - "synstructure", + "synstructure 0.12.6", ] [[package]] @@ -8712,16 +8830,16 @@ checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" [[package]] name = "multistream-select" -version = "0.12.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8552ab875c1313b97b8d20cb857b9fd63e2d1d6a0a1b53ce9821e575405f27a" +checksum = "ea0df8e5eec2298a62b326ee4f0d7fe1a6b90a09dfcf9df37b38f947a8c42f19" dependencies = [ "bytes", "futures", "log", "pin-project", "smallvec", - "unsigned-varint", + "unsigned-varint 0.7.2", ] [[package]] @@ -8758,7 +8876,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7bddcd3bf5144b6392de80e04c347cd7fab2508f6df16a85fc496ecd5cec39bc" dependencies = [ "clap 3.2.25", - "rand 0.8.5", + "rand", ] [[package]] @@ -8874,7 +8992,7 @@ version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.6.0", "cfg-if", "cfg_aliases", "libc", @@ -8894,7 +9012,7 @@ checksum = "43794a0ace135be66a25d3ae77d41b91615fb68ae937f904090203e81f755b65" [[package]] name = "node-bench" -version = "0.9.0-dev" +version = "0.9.0" dependencies = [ "array-bytes", "clap 4.5.3", @@ -8910,7 +9028,7 @@ dependencies = [ "node-primitives", "node-testing", "parity-db", - "rand 0.8.5", + "rand", "sc-basic-authorship", "sc-client-api", "sc-transaction-pool", @@ -8923,7 +9041,7 @@ dependencies = [ "sp-runtime", "sp-state-machine", "sp-timestamp", - "sp-tracing 16.0.0", + "sp-tracing", "sp-trie", "tempfile", ] @@ -8938,7 +9056,7 @@ dependencies = [ [[package]] name = "node-rpc" -version = "3.0.0-dev" +version = "3.0.0" dependencies = [ "jsonrpsee", "mmr-rpc", @@ -8997,7 +9115,7 @@ dependencies = [ [[package]] name = "node-testing" -version = "3.0.0-dev" +version = "3.0.0" dependencies = [ "frame-metadata-hash-extension", "frame-system", @@ -9128,6 +9246,23 @@ dependencies = [ ] [[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + +[[package]] +name = "num-derive" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" +dependencies = [ + "proc-macro2 1.0.82", + "quote 1.0.35", + "syn 2.0.61", +] + +[[package]] name = "num-format" version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -9232,7 +9367,16 @@ version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9bedf36ffb6ba96c2eb7144ef6270557b52e54b20c0a8e1eb2ff99a6c6959bff" dependencies = [ - "asn1-rs", + "asn1-rs 0.5.2", +] + +[[package]] +name = "oid-registry" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c958dd45046245b9c3c2547369bb634eb461670b2e7e0de552905801a648d1d" +dependencies = [ + "asn1-rs 0.6.1", ] [[package]] @@ -9265,7 +9409,7 @@ version = "0.10.64" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.6.0", "cfg-if", "foreign-types", "libc", @@ -9321,9 +9465,9 @@ checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" [[package]] name = "orchestra" -version = "0.3.6" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92829eef0328a3d1cd22a02c0e51deb92a5362df3e7d21a4e9bdc38934694e66" +checksum = "41f6bbacc8c189a3f2e45e0fd0436e5d97f194db888e721bdbc3973e7dbed4c2" dependencies = [ "async-trait", "dyn-clonable", @@ -9338,9 +9482,9 @@ dependencies = [ [[package]] name = "orchestra-proc-macro" -version = "0.3.6" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1344346d5af32c95bbddea91b18a88cc83eac394192d20ef2fc4c40a74332355" +checksum = "f7b1d40dd8f367db3c65bec8d3dd47d4a604ee8874480738f93191bddab4e0e0" dependencies = [ "expander", "indexmap 2.2.3", @@ -9381,7 +9525,7 @@ checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" [[package]] name = "pallet-alliance" -version = "27.0.0" +version = "36.0.0" dependencies = [ "array-bytes", "frame-benchmarking", @@ -9397,12 +9541,11 @@ dependencies = [ "sp-crypto-hashing", "sp-io", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "pallet-asset-conversion" -version = "10.0.0" +version = "19.0.0" dependencies = [ "frame-benchmarking", "frame-support", @@ -9418,12 +9561,11 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "pallet-asset-conversion-ops" -version = "0.1.0" +version = "0.5.0" dependencies = [ "frame-benchmarking", "frame-support", @@ -9439,12 +9581,11 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "pallet-asset-conversion-tx-payment" -version = "10.0.0" +version = "19.0.0" dependencies = [ "frame-support", "frame-system", @@ -9457,13 +9598,12 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", - "sp-storage 19.0.0", + "sp-storage", ] [[package]] name = "pallet-asset-rate" -version = "7.0.0" +version = "16.0.0" dependencies = [ "frame-benchmarking", "frame-support", @@ -9474,12 +9614,11 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "pallet-asset-tx-payment" -version = "28.0.0" +version = "37.0.0" dependencies = [ "frame-benchmarking", "frame-support", @@ -9495,30 +9634,47 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", - "sp-storage 19.0.0", + "sp-storage", ] [[package]] name = "pallet-assets" -version = "29.1.0" +version = "39.0.0" +dependencies = [ + "frame-benchmarking", + "frame-support", + "frame-system", + "impl-trait-for-tuples", + "log", + "pallet-balances", + "parity-scale-codec", + "scale-info", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", +] + +[[package]] +name = "pallet-assets-freezer" +version = "0.4.0" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "log", + "pallet-assets", "pallet-balances", "parity-scale-codec", "scale-info", "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "pallet-atomic-swap" -version = "28.0.0" +version = "37.0.0" dependencies = [ "frame-support", "frame-system", @@ -9528,12 +9684,11 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "pallet-aura" -version = "27.0.0" +version = "36.0.0" dependencies = [ "frame-support", "frame-system", @@ -9546,12 +9701,11 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "pallet-authority-discovery" -version = "28.0.0" +version = "37.0.0" dependencies = [ "frame-support", "frame-system", @@ -9563,12 +9717,11 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "pallet-authorship" -version = "28.0.0" +version = "37.0.0" dependencies = [ "frame-support", "frame-system", @@ -9578,12 +9731,11 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "pallet-babe" -version = "28.0.0" +version = "37.0.0" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -9606,12 +9758,11 @@ dependencies = [ "sp-runtime", "sp-session", "sp-staking", - "sp-std 14.0.0", ] [[package]] name = "pallet-bags-list" -version = "27.0.0" +version = "36.0.0" dependencies = [ "aquamarine", "docify", @@ -9626,23 +9777,22 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", - "sp-tracing 16.0.0", + "sp-tracing", ] [[package]] name = "pallet-bags-list-fuzzer" -version = "4.0.0-dev" +version = "4.0.0" dependencies = [ "frame-election-provider-support", "honggfuzz", "pallet-bags-list", - "rand 0.8.5", + "rand", ] [[package]] name = "pallet-bags-list-remote-tests" -version = "4.0.0-dev" +version = "4.0.0" dependencies = [ "frame-election-provider-support", "frame-remote-externalities", @@ -9653,14 +9803,14 @@ dependencies = [ "pallet-staking", "sp-core", "sp-runtime", - "sp-std 14.0.0", - "sp-storage 19.0.0", - "sp-tracing 16.0.0", + "sp-std", + "sp-storage", + "sp-tracing", ] [[package]] name = "pallet-balances" -version = "28.0.0" +version = "38.0.0" dependencies = [ "docify", "frame-benchmarking", @@ -9674,12 +9824,11 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "pallet-beefy" -version = "28.0.0" +version = "38.0.0" dependencies = [ "frame-election-provider-support", "frame-support", @@ -9702,12 +9851,11 @@ dependencies = [ "sp-session", "sp-staking", "sp-state-machine", - "sp-std 14.0.0", ] [[package]] name = "pallet-beefy-mmr" -version = "28.0.0" +version = "38.0.0" dependencies = [ "array-bytes", "binary-merkle-tree", @@ -9727,12 +9875,11 @@ dependencies = [ "sp-runtime", "sp-staking", "sp-state-machine", - "sp-std 14.0.0", ] [[package]] name = "pallet-bounties" -version = "27.0.0" +version = "36.0.0" dependencies = [ "frame-benchmarking", "frame-support", @@ -9745,7 +9892,6 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", ] [[package]] @@ -9762,24 +9908,23 @@ dependencies = [ "pallet-beefy-mmr", "pallet-mmr", "parity-scale-codec", - "rand 0.8.5", + "rand", "scale-info", "serde", "sp-consensus-beefy", "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", + "sp-std", ] [[package]] name = "pallet-bridge-grandpa" -version = "0.7.0" +version = "0.17.0" dependencies = [ "bp-header-chain", "bp-runtime", "bp-test-utils", - "finality-grandpa", "frame-benchmarking", "frame-support", "frame-system", @@ -9790,14 +9935,14 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", - "sp-trie", + "sp-std", ] [[package]] name = "pallet-bridge-messages" -version = "0.7.0" +version = "0.17.0" dependencies = [ + "bp-header-chain", "bp-messages", "bp-runtime", "bp-test-utils", @@ -9805,18 +9950,20 @@ dependencies = [ "frame-support", "frame-system", "log", - "num-traits", "pallet-balances", + "pallet-bridge-grandpa", "parity-scale-codec", "scale-info", + "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", + "sp-std", + "sp-trie", ] [[package]] name = "pallet-bridge-parachains" -version = "0.7.0" +version = "0.17.0" dependencies = [ "bp-header-chain", "bp-parachains", @@ -9833,13 +9980,12 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", - "sp-trie", + "sp-std", ] [[package]] name = "pallet-bridge-relayers" -version = "0.7.0" +version = "0.17.0" dependencies = [ "bp-messages", "bp-relayers", @@ -9855,12 +10001,12 @@ dependencies = [ "sp-arithmetic", "sp-io", "sp-runtime", - "sp-std 14.0.0", + "sp-std", ] [[package]] name = "pallet-broker" -version = "0.6.0" +version = "0.16.0" dependencies = [ "bitvec", "frame-benchmarking", @@ -9875,13 +10021,12 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", - "sp-tracing 16.0.0", + "sp-tracing", ] [[package]] name = "pallet-child-bounties" -version = "27.0.0" +version = "36.0.0" dependencies = [ "frame-benchmarking", "frame-support", @@ -9895,12 +10040,11 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "pallet-collator-selection" -version = "9.0.0" +version = "18.0.0" dependencies = [ "frame-benchmarking", "frame-support", @@ -9912,20 +10056,19 @@ dependencies = [ "pallet-session", "pallet-timestamp", "parity-scale-codec", - "rand 0.8.5", + "rand", "scale-info", "sp-consensus-aura", "sp-core", "sp-io", "sp-runtime", "sp-staking", - "sp-std 14.0.0", - "sp-tracing 16.0.0", + "sp-tracing", ] [[package]] name = "pallet-collective" -version = "28.0.0" +version = "37.0.0" dependencies = [ "frame-benchmarking", "frame-support", @@ -9936,12 +10079,11 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "pallet-collective-content" -version = "0.6.0" +version = "0.15.0" dependencies = [ "frame-benchmarking", "frame-support", @@ -9951,12 +10093,11 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "pallet-contracts" -version = "27.0.0" +version = "37.0.0" dependencies = [ "array-bytes", "assert_matches", @@ -9981,7 +10122,7 @@ dependencies = [ "parity-scale-codec", "paste", "pretty_assertions", - "rand 0.8.5", + "rand", "rand_pcg", "scale-info", "serde", @@ -9991,12 +10132,12 @@ dependencies = [ "sp-io", "sp-keystore", "sp-runtime", - "sp-std 14.0.0", - "sp-tracing 16.0.0", + "sp-std", + "sp-tracing", "staging-xcm", "staging-xcm-builder", "wasm-instrument", - "wasmi", + "wasmi 0.32.3", "wat", ] @@ -10016,7 +10157,7 @@ dependencies = [ [[package]] name = "pallet-contracts-mock-network" -version = "3.0.0" +version = "13.0.0" dependencies = [ "assert_matches", "frame-support", @@ -10044,8 +10185,7 @@ dependencies = [ "sp-io", "sp-keystore", "sp-runtime", - "sp-std 14.0.0", - "sp-tracing 16.0.0", + "sp-tracing", "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", @@ -10054,7 +10194,7 @@ dependencies = [ [[package]] name = "pallet-contracts-proc-macro" -version = "18.0.0" +version = "23.0.1" dependencies = [ "proc-macro2 1.0.82", "quote 1.0.35", @@ -10063,7 +10203,7 @@ dependencies = [ [[package]] name = "pallet-contracts-uapi" -version = "5.0.0" +version = "12.0.0" dependencies = [ "bitflags 1.3.2", "parity-scale-codec", @@ -10074,7 +10214,7 @@ dependencies = [ [[package]] name = "pallet-conviction-voting" -version = "28.0.0" +version = "37.0.0" dependencies = [ "assert_matches", "frame-benchmarking", @@ -10088,12 +10228,11 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "pallet-core-fellowship" -version = "12.0.0" +version = "21.0.0" dependencies = [ "frame-benchmarking", "frame-support", @@ -10106,7 +10245,6 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", ] [[package]] @@ -10120,12 +10258,11 @@ dependencies = [ "scale-info", "sp-io", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "pallet-delegated-staking" -version = "1.0.0" +version = "4.0.0" dependencies = [ "frame-election-provider-support", "frame-support", @@ -10141,14 +10278,13 @@ dependencies = [ "sp-io", "sp-runtime", "sp-staking", - "sp-std 14.0.0", - "sp-tracing 16.0.0", + "sp-tracing", "substrate-test-utils", ] [[package]] name = "pallet-democracy" -version = "28.0.0" +version = "37.0.0" dependencies = [ "frame-benchmarking", "frame-support", @@ -10163,12 +10299,11 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "pallet-dev-mode" -version = "10.0.0" +version = "19.0.0" dependencies = [ "frame-support", "frame-system", @@ -10179,7 +10314,6 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", ] [[package]] @@ -10198,20 +10332,20 @@ dependencies = [ "pallet-staking", "pallet-timestamp", "parity-scale-codec", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "scale-info", "sp-core", "sp-io", "sp-npos-elections", "sp-runtime", "sp-staking", - "sp-std 14.0.0", - "sp-tracing 16.0.0", + "sp-std", + "sp-tracing", ] [[package]] name = "pallet-election-provider-multi-phase" -version = "27.0.0" +version = "36.0.0" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -10221,22 +10355,21 @@ dependencies = [ "pallet-balances", "pallet-election-provider-support-benchmarking", "parity-scale-codec", - "parking_lot 0.12.1", - "rand 0.8.5", + "parking_lot 0.12.3", + "rand", "scale-info", "sp-arithmetic", "sp-core", "sp-io", "sp-npos-elections", "sp-runtime", - "sp-std 14.0.0", - "sp-tracing 16.0.0", + "sp-tracing", "strum 0.26.2", ] [[package]] name = "pallet-election-provider-support-benchmarking" -version = "27.0.0" +version = "36.0.0" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -10244,12 +10377,11 @@ dependencies = [ "parity-scale-codec", "sp-npos-elections", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "pallet-elections-phragmen" -version = "29.0.0" +version = "38.0.0" dependencies = [ "frame-benchmarking", "frame-support", @@ -10263,14 +10395,13 @@ dependencies = [ "sp-npos-elections", "sp-runtime", "sp-staking", - "sp-std 14.0.0", - "sp-tracing 16.0.0", + "sp-tracing", "substrate-test-utils", ] [[package]] name = "pallet-example-basic" -version = "27.0.0" +version = "34.0.0" dependencies = [ "frame-benchmarking", "frame-support", @@ -10282,12 +10413,11 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "pallet-example-frame-crate" -version = "0.0.1" +version = "0.1.0" dependencies = [ "parity-scale-codec", "polkadot-sdk-frame", @@ -10296,7 +10426,7 @@ dependencies = [ [[package]] name = "pallet-example-kitchensink" -version = "4.0.0-dev" +version = "4.0.0" dependencies = [ "frame-benchmarking", "frame-support", @@ -10308,7 +10438,6 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", ] [[package]] @@ -10339,12 +10468,11 @@ dependencies = [ "sp-io", "sp-keystore", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "pallet-example-single-block-migrations" -version = "0.0.1" +version = "0.1.0" dependencies = [ "docify", "frame-executive", @@ -10358,7 +10486,6 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", "sp-version", ] @@ -10374,7 +10501,6 @@ dependencies = [ "scale-info", "sp-core", "sp-io", - "sp-std 14.0.0", ] [[package]] @@ -10390,12 +10516,11 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "pallet-examples" -version = "4.0.0-dev" +version = "7.0.0" dependencies = [ "pallet-default-config-example", "pallet-dev-mode", @@ -10410,7 +10535,7 @@ dependencies = [ [[package]] name = "pallet-fast-unstake" -version = "27.0.0" +version = "36.0.0" dependencies = [ "docify", "frame-benchmarking", @@ -10428,14 +10553,13 @@ dependencies = [ "sp-io", "sp-runtime", "sp-staking", - "sp-std 14.0.0", - "sp-tracing 16.0.0", + "sp-tracing", "substrate-test-utils", ] [[package]] name = "pallet-glutton" -version = "14.0.0" +version = "23.0.0" dependencies = [ "blake2 0.10.6", "frame-benchmarking", @@ -10446,14 +10570,14 @@ dependencies = [ "parity-scale-codec", "scale-info", "sp-core", + "sp-inherents", "sp-io", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "pallet-grandpa" -version = "28.0.0" +version = "37.0.0" dependencies = [ "finality-grandpa", "frame-benchmarking", @@ -10478,12 +10602,11 @@ dependencies = [ "sp-runtime", "sp-session", "sp-staking", - "sp-std 14.0.0", ] [[package]] name = "pallet-identity" -version = "29.0.0" +version = "37.0.0" dependencies = [ "enumflags2", "frame-benchmarking", @@ -10497,12 +10620,11 @@ dependencies = [ "sp-io", "sp-keystore", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "pallet-im-online" -version = "27.0.0" +version = "36.0.0" dependencies = [ "frame-benchmarking", "frame-support", @@ -10517,12 +10639,11 @@ dependencies = [ "sp-io", "sp-runtime", "sp-staking", - "sp-std 14.0.0", ] [[package]] name = "pallet-indices" -version = "28.0.0" +version = "37.0.0" dependencies = [ "frame-benchmarking", "frame-support", @@ -10534,12 +10655,11 @@ dependencies = [ "sp-io", "sp-keyring", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "pallet-insecure-randomness-collective-flip" -version = "16.0.0" +version = "25.0.0" dependencies = [ "frame-support", "frame-system", @@ -10549,12 +10669,11 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "pallet-lottery" -version = "28.0.0" +version = "37.0.0" dependencies = [ "frame-benchmarking", "frame-support", @@ -10566,12 +10685,11 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "pallet-membership" -version = "28.0.0" +version = "37.0.0" dependencies = [ "frame-benchmarking", "frame-support", @@ -10582,12 +10700,11 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "pallet-message-queue" -version = "31.0.0" +version = "40.0.0" dependencies = [ "environmental", "frame-benchmarking", @@ -10595,7 +10712,7 @@ dependencies = [ "frame-system", "log", "parity-scale-codec", - "rand 0.8.5", + "rand", "rand_distr", "scale-info", "serde", @@ -10604,14 +10721,13 @@ dependencies = [ "sp-crypto-hashing", "sp-io", "sp-runtime", - "sp-std 14.0.0", - "sp-tracing 16.0.0", + "sp-tracing", "sp-weights", ] [[package]] name = "pallet-migrations" -version = "1.0.0" +version = "7.0.0" dependencies = [ "docify", "frame-benchmarking", @@ -10628,14 +10744,13 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", - "sp-tracing 16.0.0", + "sp-tracing", "sp-version", ] [[package]] name = "pallet-minimal-template" -version = "0.0.0" +version = "0.1.0" dependencies = [ "parity-scale-codec", "polkadot-sdk-frame", @@ -10644,7 +10759,7 @@ dependencies = [ [[package]] name = "pallet-mixnet" -version = "0.4.0" +version = "0.13.0" dependencies = [ "frame-benchmarking", "frame-support", @@ -10658,12 +10773,11 @@ dependencies = [ "sp-io", "sp-mixnet", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "pallet-mmr" -version = "27.0.0" +version = "37.0.0" dependencies = [ "array-bytes", "env_logger 0.11.3", @@ -10678,12 +10792,11 @@ dependencies = [ "sp-io", "sp-mmr-primitives", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "pallet-multisig" -version = "28.0.0" +version = "37.0.0" dependencies = [ "frame-benchmarking", "frame-support", @@ -10694,12 +10807,11 @@ dependencies = [ "scale-info", "sp-io", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "pallet-nft-fractionalization" -version = "10.0.0" +version = "20.0.0" dependencies = [ "frame-benchmarking", "frame-support", @@ -10713,12 +10825,12 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", + "sp-std", ] [[package]] name = "pallet-nfts" -version = "22.0.0" +version = "31.0.0" dependencies = [ "enumflags2", "frame-benchmarking", @@ -10732,22 +10844,20 @@ dependencies = [ "sp-io", "sp-keystore", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "pallet-nfts-runtime-api" -version = "14.0.0" +version = "23.0.0" dependencies = [ "pallet-nfts", "parity-scale-codec", "sp-api", - "sp-std 14.0.0", ] [[package]] name = "pallet-nis" -version = "28.0.0" +version = "37.0.0" dependencies = [ "frame-benchmarking", "frame-support", @@ -10759,12 +10869,11 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "pallet-node-authorization" -version = "28.0.0" +version = "37.0.0" dependencies = [ "frame-support", "frame-system", @@ -10774,12 +10883,11 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "pallet-nomination-pools" -version = "25.0.0" +version = "34.0.0" dependencies = [ "frame-support", "frame-system", @@ -10791,13 +10899,12 @@ dependencies = [ "sp-io", "sp-runtime", "sp-staking", - "sp-std 14.0.0", - "sp-tracing 16.0.0", + "sp-tracing", ] [[package]] name = "pallet-nomination-pools-benchmarking" -version = "26.0.0" +version = "35.0.0" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -10815,9 +10922,8 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-runtime-interface 24.0.0", + "sp-runtime-interface", "sp-staking", - "sp-std 14.0.0", ] [[package]] @@ -10829,20 +10935,19 @@ dependencies = [ "honggfuzz", "log", "pallet-nomination-pools", - "rand 0.8.5", + "rand", "sp-io", "sp-runtime", - "sp-tracing 16.0.0", + "sp-tracing", ] [[package]] name = "pallet-nomination-pools-runtime-api" -version = "23.0.0" +version = "32.0.0" dependencies = [ "pallet-nomination-pools", "parity-scale-codec", "sp-api", - "sp-std 14.0.0", ] [[package]] @@ -10866,8 +10971,8 @@ dependencies = [ "sp-io", "sp-runtime", "sp-staking", - "sp-std 14.0.0", - "sp-tracing 16.0.0", + "sp-std", + "sp-tracing", ] [[package]] @@ -10890,13 +10995,13 @@ dependencies = [ "sp-io", "sp-runtime", "sp-staking", - "sp-std 14.0.0", - "sp-tracing 16.0.0", + "sp-std", + "sp-tracing", ] [[package]] name = "pallet-offences" -version = "27.0.0" +version = "36.0.0" dependencies = [ "frame-support", "frame-system", @@ -10909,12 +11014,11 @@ dependencies = [ "sp-io", "sp-runtime", "sp-staking", - "sp-std 14.0.0", ] [[package]] name = "pallet-offences-benchmarking" -version = "28.0.0" +version = "37.0.0" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -10936,12 +11040,11 @@ dependencies = [ "sp-io", "sp-runtime", "sp-staking", - "sp-std 14.0.0", ] [[package]] name = "pallet-paged-list" -version = "0.6.0" +version = "0.15.0" dependencies = [ "docify", "frame-benchmarking", @@ -10953,7 +11056,6 @@ dependencies = [ "sp-io", "sp-metadata-ir", "sp-runtime", - "sp-std 14.0.0", ] [[package]] @@ -10969,7 +11071,7 @@ dependencies = [ [[package]] name = "pallet-parachain-template" -version = "0.0.0" +version = "0.1.0" dependencies = [ "frame-benchmarking", "frame-support", @@ -10983,7 +11085,7 @@ dependencies = [ [[package]] name = "pallet-parameters" -version = "0.1.0" +version = "0.8.0" dependencies = [ "docify", "frame-benchmarking", @@ -10998,12 +11100,11 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "pallet-preimage" -version = "28.0.0" +version = "37.0.0" dependencies = [ "frame-benchmarking", "frame-support", @@ -11015,12 +11116,11 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "pallet-proxy" -version = "28.0.0" +version = "37.0.0" dependencies = [ "frame-benchmarking", "frame-support", @@ -11032,12 +11132,11 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "pallet-ranked-collective" -version = "28.0.0" +version = "37.0.0" dependencies = [ "frame-benchmarking", "frame-support", @@ -11050,12 +11149,11 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "pallet-recovery" -version = "28.0.0" +version = "37.0.0" dependencies = [ "frame-benchmarking", "frame-support", @@ -11066,12 +11164,11 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "pallet-referenda" -version = "28.0.0" +version = "37.0.0" dependencies = [ "assert_matches", "frame-benchmarking", @@ -11088,12 +11185,11 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "pallet-remark" -version = "28.0.0" +version = "37.0.0" dependencies = [ "frame-benchmarking", "frame-support", @@ -11104,12 +11200,11 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "pallet-root-offences" -version = "25.0.0" +version = "34.0.0" dependencies = [ "frame-election-provider-support", "frame-support", @@ -11125,12 +11220,12 @@ dependencies = [ "sp-io", "sp-runtime", "sp-staking", - "sp-std 14.0.0", + "sp-std", ] [[package]] name = "pallet-root-testing" -version = "4.0.0" +version = "13.0.0" dependencies = [ "frame-support", "frame-system", @@ -11139,12 +11234,11 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "pallet-safe-mode" -version = "9.0.0" +version = "18.0.0" dependencies = [ "docify", "frame-benchmarking", @@ -11159,12 +11253,11 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "pallet-salary" -version = "13.0.0" +version = "22.0.0" dependencies = [ "frame-benchmarking", "frame-support", @@ -11177,31 +11270,11 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", -] - -[[package]] -name = "pallet-sassafras" -version = "0.3.5-dev" -dependencies = [ - "array-bytes", - "frame-benchmarking", - "frame-support", - "frame-system", - "log", - "parity-scale-codec", - "scale-info", - "sp-consensus-sassafras", - "sp-core", - "sp-crypto-hashing", - "sp-io", - "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "pallet-scheduler" -version = "29.0.0" +version = "38.0.0" dependencies = [ "docify", "frame-benchmarking", @@ -11214,14 +11287,13 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", "sp-weights", "substrate-test-utils", ] [[package]] name = "pallet-scored-pool" -version = "28.0.0" +version = "37.0.0" dependencies = [ "frame-support", "frame-system", @@ -11231,12 +11303,11 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "pallet-session" -version = "28.0.0" +version = "37.0.0" dependencies = [ "frame-support", "frame-system", @@ -11251,13 +11322,12 @@ dependencies = [ "sp-session", "sp-staking", "sp-state-machine", - "sp-std 14.0.0", "sp-trie", ] [[package]] name = "pallet-session-benchmarking" -version = "28.0.0" +version = "37.0.0" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -11269,30 +11339,28 @@ dependencies = [ "pallet-staking-reward-curve", "pallet-timestamp", "parity-scale-codec", - "rand 0.8.5", + "rand", "scale-info", "sp-core", "sp-io", "sp-runtime", "sp-session", - "sp-std 14.0.0", ] [[package]] name = "pallet-skip-feeless-payment" -version = "3.0.0" +version = "12.0.0" dependencies = [ "frame-support", "frame-system", "parity-scale-codec", "scale-info", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "pallet-society" -version = "28.0.0" +version = "37.0.0" dependencies = [ "frame-benchmarking", "frame-support", @@ -11301,19 +11369,18 @@ dependencies = [ "log", "pallet-balances", "parity-scale-codec", - "rand_chacha 0.3.1", + "rand_chacha", "scale-info", "sp-arithmetic", "sp-core", "sp-crypto-hashing", "sp-io", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "pallet-staking" -version = "28.0.0" +version = "37.0.0" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -11327,7 +11394,7 @@ dependencies = [ "pallet-staking-reward-curve", "pallet-timestamp", "parity-scale-codec", - "rand_chacha 0.3.1", + "rand_chacha", "scale-info", "serde", "sp-application-crypto", @@ -11336,14 +11403,13 @@ dependencies = [ "sp-npos-elections", "sp-runtime", "sp-staking", - "sp-std 14.0.0", - "sp-tracing 16.0.0", + "sp-tracing", "substrate-test-utils", ] [[package]] name = "pallet-staking-reward-curve" -version = "11.0.0" +version = "12.0.0" dependencies = [ "proc-macro-crate 3.1.0", "proc-macro2 1.0.82", @@ -11354,7 +11420,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-fn" -version = "19.0.0" +version = "22.0.0" dependencies = [ "log", "sp-arithmetic", @@ -11362,7 +11428,7 @@ dependencies = [ [[package]] name = "pallet-staking-runtime-api" -version = "14.0.0" +version = "22.0.0" dependencies = [ "parity-scale-codec", "sp-api", @@ -11371,7 +11437,7 @@ dependencies = [ [[package]] name = "pallet-state-trie-migration" -version = "29.0.0" +version = "39.0.0" dependencies = [ "frame-benchmarking", "frame-remote-externalities", @@ -11380,14 +11446,13 @@ dependencies = [ "log", "pallet-balances", "parity-scale-codec", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "scale-info", "serde", "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", - "sp-tracing 16.0.0", + "sp-tracing", "substrate-state-trie-migration-rpc", "thousands", "tokio", @@ -11396,7 +11461,7 @@ dependencies = [ [[package]] name = "pallet-statement" -version = "10.0.0" +version = "19.0.0" dependencies = [ "frame-support", "frame-system", @@ -11409,12 +11474,11 @@ dependencies = [ "sp-io", "sp-runtime", "sp-statement-store", - "sp-std 14.0.0", ] [[package]] name = "pallet-sudo" -version = "28.0.0" +version = "37.0.0" dependencies = [ "docify", "frame-benchmarking", @@ -11425,12 +11489,11 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "pallet-template" -version = "0.0.0" +version = "0.1.0" dependencies = [ "frame-benchmarking", "frame-support", @@ -11444,7 +11507,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" -version = "27.0.0" +version = "36.0.1" dependencies = [ "docify", "frame-benchmarking", @@ -11457,14 +11520,13 @@ dependencies = [ "sp-inherents", "sp-io", "sp-runtime", - "sp-std 14.0.0", - "sp-storage 19.0.0", + "sp-storage", "sp-timestamp", ] [[package]] name = "pallet-tips" -version = "27.0.0" +version = "36.0.0" dependencies = [ "frame-benchmarking", "frame-support", @@ -11478,13 +11540,12 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", - "sp-storage 19.0.0", + "sp-storage", ] [[package]] name = "pallet-transaction-payment" -version = "28.0.0" +version = "37.0.0" dependencies = [ "frame-support", "frame-system", @@ -11496,12 +11557,11 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "pallet-transaction-payment-rpc" -version = "30.0.0" +version = "40.0.0" dependencies = [ "jsonrpsee", "pallet-transaction-payment-rpc-runtime-api", @@ -11516,7 +11576,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" -version = "28.0.0" +version = "37.0.0" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", @@ -11527,7 +11587,7 @@ dependencies = [ [[package]] name = "pallet-transaction-storage" -version = "27.0.0" +version = "36.0.0" dependencies = [ "array-bytes", "frame-benchmarking", @@ -11542,13 +11602,12 @@ dependencies = [ "sp-inherents", "sp-io", "sp-runtime", - "sp-std 14.0.0", "sp-transaction-storage-proof", ] [[package]] name = "pallet-treasury" -version = "27.0.0" +version = "36.0.0" dependencies = [ "docify", "frame-benchmarking", @@ -11563,12 +11622,11 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "pallet-tx-pause" -version = "9.0.0" +version = "18.0.0" dependencies = [ "docify", "frame-benchmarking", @@ -11582,12 +11640,11 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "pallet-uniques" -version = "28.0.0" +version = "37.0.0" dependencies = [ "frame-benchmarking", "frame-support", @@ -11599,12 +11656,12 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", + "sp-std", ] [[package]] name = "pallet-utility" -version = "28.0.0" +version = "37.0.0" dependencies = [ "frame-benchmarking", "frame-support", @@ -11618,12 +11675,11 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "pallet-vesting" -version = "28.0.0" +version = "37.0.0" dependencies = [ "frame-benchmarking", "frame-support", @@ -11635,12 +11691,11 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "pallet-whitelist" -version = "27.0.0" +version = "36.0.0" dependencies = [ "frame-benchmarking", "frame-support", @@ -11653,12 +11708,11 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "pallet-xcm" -version = "7.0.0" +version = "16.0.0" dependencies = [ "bounded-collections", "frame-benchmarking", @@ -11675,16 +11729,15 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", - "xcm-fee-payment-runtime-api", + "xcm-runtime-apis", ] [[package]] name = "pallet-xcm-benchmarks" -version = "7.0.0" +version = "16.0.0" dependencies = [ "frame-benchmarking", "frame-support", @@ -11699,8 +11752,7 @@ dependencies = [ "scale-info", "sp-io", "sp-runtime", - "sp-std 14.0.0", - "sp-tracing 16.0.0", + "sp-tracing", "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", @@ -11708,7 +11760,7 @@ dependencies = [ [[package]] name = "pallet-xcm-bridge-hub" -version = "0.2.0" +version = "0.12.0" dependencies = [ "bp-header-chain", "bp-messages", @@ -11725,7 +11777,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", + "sp-std", "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", @@ -11733,7 +11785,7 @@ dependencies = [ [[package]] name = "pallet-xcm-bridge-hub-router" -version = "0.5.0" +version = "0.14.0" dependencies = [ "bp-xcm-bridge-hub-router", "frame-benchmarking", @@ -11745,14 +11797,14 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", + "sp-std", "staging-xcm", "staging-xcm-builder", ] [[package]] name = "parachain-template-node" -version = "0.0.0" +version = "0.1.0" dependencies = [ "clap 4.5.3", "color-print", @@ -11811,7 +11863,7 @@ dependencies = [ [[package]] name = "parachain-template-runtime" -version = "0.0.0" +version = "0.1.0" dependencies = [ "cumulus-pallet-aura-ext", "cumulus-pallet-parachain-system", @@ -11860,7 +11912,6 @@ dependencies = [ "sp-offchain", "sp-runtime", "sp-session", - "sp-std 14.0.0", "sp-transaction-pool", "sp-version", "staging-parachain-info", @@ -11872,7 +11923,7 @@ dependencies = [ [[package]] name = "parachains-common" -version = "7.0.0" +version = "17.0.0" dependencies = [ "cumulus-primitives-core", "cumulus-primitives-utility", @@ -11893,7 +11944,6 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", "staging-parachain-info", "staging-xcm", "staging-xcm-executor", @@ -11917,7 +11967,7 @@ dependencies = [ [[package]] name = "parachains-runtimes-test-utils" -version = "7.0.0" +version = "16.0.0" dependencies = [ "cumulus-pallet-parachain-system", "cumulus-pallet-xcmp-queue", @@ -11938,8 +11988,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", - "sp-tracing 16.0.0", + "sp-tracing", "staging-parachain-info", "staging-xcm", "staging-xcm-executor", @@ -11953,8 +12002,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4e69bf016dc406eff7d53a7d3f7cf1c2e72c82b9088aac1118591e36dd2cd3e9" dependencies = [ "bitcoin_hashes 0.13.0", - "rand 0.8.5", - "rand_core 0.6.4", + "rand", + "rand_core", "serde", "unicode-normalization", ] @@ -11979,8 +12028,8 @@ dependencies = [ "log", "lz4", "memmap2 0.5.10", - "parking_lot 0.12.1", - "rand 0.8.5", + "parking_lot 0.12.3", + "rand", "siphasher", "snap", ] @@ -12013,12 +12062,6 @@ dependencies = [ ] [[package]] -name = "parity-send-wrapper" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa9777aa91b8ad9dd5aaa04a9b6bcb02c7f1deb952fca5a66034d5e63afc5c6f" - -[[package]] name = "parity-util-mem" version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -12030,7 +12073,7 @@ dependencies = [ "impl-trait-for-tuples", "lru 0.8.1", "parity-util-mem-derive", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "primitive-types", "smallvec", "winapi", @@ -12044,7 +12087,7 @@ checksum = "f557c32c6d268a07c921471619c0295f5efad3a0e76d4f97a05c091a51d110b2" dependencies = [ "proc-macro2 1.0.82", "syn 1.0.109", - "synstructure", + "synstructure 0.12.6", ] [[package]] @@ -12072,9 +12115,9 @@ dependencies = [ [[package]] name = "parking_lot" -version = "0.12.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ "lock_api", "parking_lot_core 0.9.8", @@ -12120,7 +12163,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "346f04948ba92c43e8469c1ee6736c7563d71012b17d40745260fe106aac2166" dependencies = [ "base64ct", - "rand_core 0.6.4", + "rand_core", "subtle 2.5.0", ] @@ -12157,7 +12200,7 @@ dependencies = [ [[package]] name = "penpal-emulated-chain" -version = "0.0.0" +version = "0.1.0" dependencies = [ "cumulus-primitives-core", "emulated-integration-tests-common", @@ -12170,7 +12213,7 @@ dependencies = [ [[package]] name = "penpal-runtime" -version = "0.14.0" +version = "0.24.0" dependencies = [ "assets-common", "cumulus-pallet-aura-ext", @@ -12218,8 +12261,7 @@ dependencies = [ "sp-offchain", "sp-runtime", "sp-session", - "sp-std 14.0.0", - "sp-storage 19.0.0", + "sp-storage", "sp-transaction-pool", "sp-version", "staging-parachain-info", @@ -12227,7 +12269,7 @@ dependencies = [ "staging-xcm-builder", "staging-xcm-executor", "substrate-wasm-builder", - "xcm-fee-payment-runtime-api", + "xcm-runtime-apis", ] [[package]] @@ -12255,9 +12297,7 @@ dependencies = [ "pallet-message-queue", "parachains-common", "parity-scale-codec", - "people-rococo-runtime", "polkadot-runtime-common", - "rococo-runtime", "rococo-runtime-constants", "rococo-system-emulated-network", "sp-runtime", @@ -12267,7 +12307,7 @@ dependencies = [ [[package]] name = "people-rococo-runtime" -version = "0.1.0" +version = "0.11.0" dependencies = [ "cumulus-pallet-aura-ext", "cumulus-pallet-parachain-system", @@ -12318,8 +12358,7 @@ dependencies = [ "sp-offchain", "sp-runtime", "sp-session", - "sp-std 14.0.0", - "sp-storage 19.0.0", + "sp-storage", "sp-transaction-pool", "sp-version", "staging-parachain-info", @@ -12328,7 +12367,7 @@ dependencies = [ "staging-xcm-executor", "substrate-wasm-builder", "testnet-parachains-constants", - "xcm-fee-payment-runtime-api", + "xcm-runtime-apis", ] [[package]] @@ -12356,19 +12395,17 @@ dependencies = [ "pallet-message-queue", "parachains-common", "parity-scale-codec", - "people-westend-runtime", "polkadot-runtime-common", "sp-runtime", "staging-xcm", "staging-xcm-executor", - "westend-runtime", "westend-runtime-constants", "westend-system-emulated-network", ] [[package]] name = "people-westend-runtime" -version = "0.1.0" +version = "0.11.0" dependencies = [ "cumulus-pallet-aura-ext", "cumulus-pallet-parachain-system", @@ -12418,8 +12455,7 @@ dependencies = [ "sp-offchain", "sp-runtime", "sp-session", - "sp-std 14.0.0", - "sp-storage 19.0.0", + "sp-storage", "sp-transaction-pool", "sp-version", "staging-parachain-info", @@ -12429,14 +12465,14 @@ dependencies = [ "substrate-wasm-builder", "testnet-parachains-constants", "westend-runtime-constants", - "xcm-fee-payment-runtime-api", + "xcm-runtime-apis", ] [[package]] name = "percent-encoding" -version = "2.3.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pest" @@ -12514,15 +12550,9 @@ dependencies = [ [[package]] name = "pin-project-lite" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "257b64915a082f7811703966789728173279bdebb956b143dbcd23f6f970a777" - -[[package]] -name = "pin-project-lite" -version = "0.2.12" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12cc1b0bf1727a77a54b6654e7b5f1af8604923edc8b81885f8ec92f9e3f0a05" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" [[package]] name = "pin-utils" @@ -12582,7 +12612,7 @@ dependencies = [ [[package]] name = "polkadot" -version = "6.0.0" +version = "16.0.1" dependencies = [ "assert_cmd", "color-eyre", @@ -12603,7 +12633,7 @@ dependencies = [ [[package]] name = "polkadot-approval-distribution" -version = "7.0.0" +version = "17.0.0" dependencies = [ "assert_matches", "bitvec", @@ -12621,9 +12651,9 @@ dependencies = [ "polkadot-node-subsystem-util", "polkadot-primitives", "polkadot-primitives-test-helpers", - "rand 0.8.5", - "rand_chacha 0.3.1", - "rand_core 0.6.4", + "rand", + "rand_chacha", + "rand_core", "schnorrkel 0.11.4", "sp-authority-discovery", "sp-core", @@ -12632,7 +12662,7 @@ dependencies = [ [[package]] name = "polkadot-availability-bitfield-distribution" -version = "7.0.0" +version = "17.0.0" dependencies = [ "always-assert", "assert_matches", @@ -12647,8 +12677,8 @@ dependencies = [ "polkadot-node-subsystem-test-helpers", "polkadot-node-subsystem-util", "polkadot-primitives", - "rand 0.8.5", - "rand_chacha 0.3.1", + "rand", + "rand_chacha", "sp-application-crypto", "sp-authority-discovery", "sp-core", @@ -12659,7 +12689,7 @@ dependencies = [ [[package]] name = "polkadot-availability-distribution" -version = "7.0.0" +version = "17.0.1" dependencies = [ "assert_matches", "derive_more", @@ -12676,21 +12706,21 @@ dependencies = [ "polkadot-primitives", "polkadot-primitives-test-helpers", "polkadot-subsystem-bench", - "rand 0.8.5", + "rand", "rstest", "sc-network", "schnellru", "sp-core", "sp-keyring", "sp-keystore", - "sp-tracing 16.0.0", + "sp-tracing", "thiserror", "tracing-gum", ] [[package]] name = "polkadot-availability-recovery" -version = "7.0.0" +version = "17.0.0" dependencies = [ "assert_matches", "async-trait", @@ -12708,14 +12738,14 @@ dependencies = [ "polkadot-primitives", "polkadot-primitives-test-helpers", "polkadot-subsystem-bench", - "rand 0.8.5", + "rand", "rstest", "sc-network", "schnellru", "sp-application-crypto", "sp-core", "sp-keyring", - "sp-tracing 16.0.0", + "sp-tracing", "thiserror", "tokio", "tracing-gum", @@ -12733,7 +12763,7 @@ dependencies = [ [[package]] name = "polkadot-cli" -version = "7.0.0" +version = "17.0.0" dependencies = [ "cfg-if", "clap 4.5.3", @@ -12762,7 +12792,7 @@ dependencies = [ [[package]] name = "polkadot-collator-protocol" -version = "7.0.0" +version = "17.0.0" dependencies = [ "assert_matches", "bitvec", @@ -12793,18 +12823,17 @@ dependencies = [ [[package]] name = "polkadot-core-primitives" -version = "7.0.0" +version = "15.0.0" dependencies = [ "parity-scale-codec", "scale-info", "sp-core", "sp-runtime", - "sp-std 14.0.0", ] [[package]] name = "polkadot-dispute-distribution" -version = "7.0.0" +version = "17.0.1" dependencies = [ "assert_matches", "async-channel", @@ -12830,14 +12859,14 @@ dependencies = [ "sp-application-crypto", "sp-keyring", "sp-keystore", - "sp-tracing 16.0.0", + "sp-tracing", "thiserror", "tracing-gum", ] [[package]] name = "polkadot-erasure-coding" -version = "7.0.0" +version = "15.0.0" dependencies = [ "criterion", "parity-scale-codec", @@ -12852,22 +12881,22 @@ dependencies = [ [[package]] name = "polkadot-gossip-support" -version = "7.0.0" +version = "17.0.0" dependencies = [ "assert_matches", "async-trait", "futures", "futures-timer", "lazy_static", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "polkadot-node-network-protocol", "polkadot-node-subsystem", "polkadot-node-subsystem-test-helpers", "polkadot-node-subsystem-util", "polkadot-primitives", "quickcheck", - "rand 0.8.5", - "rand_chacha 0.3.1", + "rand", + "rand_chacha", "sc-network", "sc-network-common", "sp-application-crypto", @@ -12877,13 +12906,13 @@ dependencies = [ "sp-crypto-hashing", "sp-keyring", "sp-keystore", - "sp-tracing 16.0.0", + "sp-tracing", "tracing-gum", ] [[package]] name = "polkadot-network-bridge" -version = "7.0.0" +version = "17.0.0" dependencies = [ "always-assert", "assert_matches", @@ -12893,7 +12922,7 @@ dependencies = [ "futures", "futures-timer", "parity-scale-codec", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "polkadot-node-metrics", "polkadot-node-network-protocol", "polkadot-node-subsystem", @@ -12912,7 +12941,7 @@ dependencies = [ [[package]] name = "polkadot-node-collation-generation" -version = "7.0.0" +version = "17.0.0" dependencies = [ "assert_matches", "futures", @@ -12934,7 +12963,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-approval-voting" -version = "7.0.0" +version = "17.0.0" dependencies = [ "assert_matches", "async-trait", @@ -12949,7 +12978,7 @@ dependencies = [ "log", "merlin", "parity-scale-codec", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "polkadot-node-jaeger", "polkadot-node-primitives", "polkadot-node-subsystem", @@ -12959,9 +12988,9 @@ dependencies = [ "polkadot-primitives", "polkadot-primitives-test-helpers", "polkadot-subsystem-bench", - "rand 0.8.5", - "rand_chacha 0.3.1", - "rand_core 0.6.4", + "rand", + "rand_chacha", + "rand_core", "sc-keystore", "schnellru", "schnorrkel 0.11.4", @@ -12979,7 +13008,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-av-store" -version = "7.0.0" +version = "17.0.0" dependencies = [ "assert_matches", "bitvec", @@ -12990,7 +13019,7 @@ dependencies = [ "kvdb-memorydb", "log", "parity-scale-codec", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "polkadot-erasure-coding", "polkadot-node-jaeger", "polkadot-node-primitives", @@ -13009,7 +13038,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-backing" -version = "7.0.0" +version = "17.0.0" dependencies = [ "assert_matches", "bitvec", @@ -13030,14 +13059,14 @@ dependencies = [ "sp-core", "sp-keyring", "sp-keystore", - "sp-tracing 16.0.0", + "sp-tracing", "thiserror", "tracing-gum", ] [[package]] name = "polkadot-node-core-bitfield-signing" -version = "7.0.0" +version = "17.0.0" dependencies = [ "futures", "polkadot-node-subsystem", @@ -13053,7 +13082,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-candidate-validation" -version = "7.0.0" +version = "17.1.0" dependencies = [ "assert_matches", "async-trait", @@ -13070,15 +13099,17 @@ dependencies = [ "polkadot-parachain-primitives", "polkadot-primitives", "polkadot-primitives-test-helpers", + "sp-application-crypto", "sp-core", "sp-keyring", + "sp-keystore", "sp-maybe-compressed-blob", "tracing-gum", ] [[package]] name = "polkadot-node-core-chain-api" -version = "7.0.0" +version = "17.0.0" dependencies = [ "futures", "maplit", @@ -13098,7 +13129,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-chain-selection" -version = "7.0.0" +version = "17.0.0" dependencies = [ "assert_matches", "futures", @@ -13106,7 +13137,7 @@ dependencies = [ "kvdb", "kvdb-memorydb", "parity-scale-codec", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-node-subsystem-test-helpers", @@ -13119,7 +13150,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-dispute-coordinator" -version = "7.0.0" +version = "17.0.0" dependencies = [ "assert_matches", "fatality", @@ -13140,14 +13171,14 @@ dependencies = [ "sp-core", "sp-keyring", "sp-keystore", - "sp-tracing 16.0.0", + "sp-tracing", "thiserror", "tracing-gum", ] [[package]] name = "polkadot-node-core-parachains-inherent" -version = "7.0.0" +version = "17.0.0" dependencies = [ "async-trait", "futures", @@ -13163,32 +13194,27 @@ dependencies = [ [[package]] name = "polkadot-node-core-prospective-parachains" -version = "6.0.0" +version = "16.1.0" dependencies = [ "assert_matches", - "bitvec", "fatality", "futures", - "parity-scale-codec", - "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-node-subsystem-test-helpers", - "polkadot-node-subsystem-types", "polkadot-node-subsystem-util", "polkadot-primitives", "polkadot-primitives-test-helpers", - "sc-keystore", - "sp-application-crypto", + "rand", + "rstest", "sp-core", - "sp-keyring", - "sp-keystore", + "sp-tracing", "thiserror", "tracing-gum", ] [[package]] name = "polkadot-node-core-provisioner" -version = "7.0.0" +version = "17.0.0" dependencies = [ "bitvec", "fatality", @@ -13210,7 +13236,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-pvf" -version = "7.0.0" +version = "17.0.0" dependencies = [ "always-assert", "array-bytes", @@ -13236,7 +13262,7 @@ dependencies = [ "polkadot-parachain-primitives", "polkadot-primitives", "procfs", - "rand 0.8.5", + "rand", "rococo-runtime", "rusty-fork", "sc-sysinfo", @@ -13253,7 +13279,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-pvf-checker" -version = "7.0.0" +version = "17.0.0" dependencies = [ "futures", "futures-timer", @@ -13276,7 +13302,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-pvf-common" -version = "7.0.0" +version = "15.0.0" dependencies = [ "assert_matches", "cpu-time", @@ -13293,9 +13319,9 @@ dependencies = [ "seccompiler", "sp-core", "sp-crypto-hashing", - "sp-externalities 0.25.0", + "sp-externalities", "sp-io", - "sp-tracing 16.0.0", + "sp-tracing", "tempfile", "thiserror", "tracing-gum", @@ -13303,7 +13329,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-pvf-execute-worker" -version = "7.0.0" +version = "15.0.0" dependencies = [ "cfg-if", "cpu-time", @@ -13318,7 +13344,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-pvf-prepare-worker" -version = "7.0.0" +version = "15.0.0" dependencies = [ "blake3", "cfg-if", @@ -13341,7 +13367,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-runtime-api" -version = "7.0.0" +version = "17.0.0" dependencies = [ "async-trait", "futures", @@ -13362,13 +13388,13 @@ dependencies = [ [[package]] name = "polkadot-node-jaeger" -version = "7.0.0" +version = "17.0.0" dependencies = [ "lazy_static", "log", "mick-jaeger", "parity-scale-codec", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "polkadot-node-primitives", "polkadot-primitives", "sc-network", @@ -13380,13 +13406,15 @@ dependencies = [ [[package]] name = "polkadot-node-metrics" -version = "7.0.0" +version = "17.0.0" dependencies = [ "assert_cmd", "bs58 0.5.0", "futures", "futures-timer", - "hyper", + "http-body-util", + "hyper 1.3.1", + "hyper-util", "log", "parity-scale-codec", "polkadot-primitives", @@ -13406,7 +13434,7 @@ dependencies = [ [[package]] name = "polkadot-node-network-protocol" -version = "7.0.0" +version = "17.0.0" dependencies = [ "async-channel", "async-trait", @@ -13419,8 +13447,8 @@ dependencies = [ "polkadot-node-jaeger", "polkadot-node-primitives", "polkadot-primitives", - "rand 0.8.5", - "rand_chacha 0.3.1", + "rand", + "rand_chacha", "sc-authority-discovery", "sc-network", "sc-network-types", @@ -13432,7 +13460,7 @@ dependencies = [ [[package]] name = "polkadot-node-primitives" -version = "7.0.0" +version = "15.0.0" dependencies = [ "bitvec", "bounded-vec", @@ -13455,7 +13483,7 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem" -version = "7.0.0" +version = "17.0.0" dependencies = [ "polkadot-node-jaeger", "polkadot-node-subsystem-types", @@ -13468,7 +13496,7 @@ version = "1.0.0" dependencies = [ "async-trait", "futures", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "polkadot-erasure-coding", "polkadot-node-primitives", "polkadot-node-subsystem", @@ -13485,7 +13513,7 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem-types" -version = "7.0.0" +version = "17.1.0" dependencies = [ "async-trait", "bitvec", @@ -13514,7 +13542,7 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem-util" -version = "7.0.0" +version = "17.1.0" dependencies = [ "assert_matches", "async-trait", @@ -13531,7 +13559,7 @@ dependencies = [ "log", "parity-db", "parity-scale-codec", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "pin-project", "polkadot-erasure-coding", "polkadot-node-jaeger", @@ -13545,7 +13573,7 @@ dependencies = [ "polkadot-primitives", "polkadot-primitives-test-helpers", "prioritized-metered-channel", - "rand 0.8.5", + "rand", "sc-client-api", "schnellru", "sp-application-crypto", @@ -13558,7 +13586,7 @@ dependencies = [ [[package]] name = "polkadot-overseer" -version = "7.0.0" +version = "17.0.0" dependencies = [ "assert_matches", "async-trait", @@ -13566,7 +13594,7 @@ dependencies = [ "futures", "futures-timer", "orchestra", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "polkadot-node-metrics", "polkadot-node-network-protocol", "polkadot-node-primitives", @@ -13584,7 +13612,7 @@ dependencies = [ [[package]] name = "polkadot-parachain-bin" -version = "1.13.0" +version = "5.0.0" dependencies = [ "assert_cmd", "asset-hub-rococo-runtime", @@ -13609,6 +13637,7 @@ dependencies = [ "cumulus-primitives-aura", "cumulus-primitives-core", "cumulus-relay-chain-interface", + "docify", "frame-benchmarking", "frame-benchmarking-cli", "frame-support", @@ -13663,9 +13692,9 @@ dependencies = [ "sp-offchain", "sp-runtime", "sp-session", - "sp-std 14.0.0", + "sp-std", "sp-timestamp", - "sp-tracing 16.0.0", + "sp-tracing", "sp-transaction-pool", "sp-version", "staging-xcm", @@ -13681,7 +13710,7 @@ dependencies = [ [[package]] name = "polkadot-parachain-primitives" -version = "6.0.0" +version = "14.0.0" dependencies = [ "bounded-collections", "derive_more", @@ -13691,13 +13720,12 @@ dependencies = [ "serde", "sp-core", "sp-runtime", - "sp-std 14.0.0", "sp-weights", ] [[package]] name = "polkadot-primitives" -version = "7.0.0" +version = "15.0.0" dependencies = [ "bitvec", "hex-literal", @@ -13718,15 +13746,14 @@ dependencies = [ "sp-keystore", "sp-runtime", "sp-staking", - "sp-std 14.0.0", ] [[package]] name = "polkadot-primitives-test-helpers" -version = "1.0.0" +version = "0.1.0" dependencies = [ "polkadot-primitives", - "rand 0.8.5", + "rand", "sp-application-crypto", "sp-core", "sp-keyring", @@ -13735,7 +13762,7 @@ dependencies = [ [[package]] name = "polkadot-rpc" -version = "7.0.0" +version = "17.0.0" dependencies = [ "jsonrpsee", "mmr-rpc", @@ -13769,7 +13796,7 @@ dependencies = [ [[package]] name = "polkadot-runtime-common" -version = "7.0.0" +version = "16.0.0" dependencies = [ "bitvec", "frame-benchmarking", @@ -13816,7 +13843,6 @@ dependencies = [ "sp-runtime", "sp-session", "sp-staking", - "sp-std 14.0.0", "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", @@ -13825,19 +13851,18 @@ dependencies = [ [[package]] name = "polkadot-runtime-metrics" -version = "7.0.0" +version = "16.0.0" dependencies = [ "bs58 0.5.0", "frame-benchmarking", "parity-scale-codec", "polkadot-primitives", - "sp-std 14.0.0", - "sp-tracing 16.0.0", + "sp-tracing", ] [[package]] name = "polkadot-runtime-parachains" -version = "7.0.0" +version = "16.0.2" dependencies = [ "assert_matches", "bitflags 1.3.2", @@ -13867,10 +13892,9 @@ dependencies = [ "polkadot-primitives", "polkadot-primitives-test-helpers", "polkadot-runtime-metrics", - "rand 0.8.5", - "rand_chacha 0.3.1", + "rand", + "rand_chacha", "rstest", - "rustc-hex", "sc-keystore", "scale-info", "serde", @@ -13887,8 +13911,7 @@ dependencies = [ "sp-runtime", "sp-session", "sp-staking", - "sp-std 14.0.0", - "sp-tracing 16.0.0", + "sp-tracing", "staging-xcm", "staging-xcm-executor", "static_assertions", @@ -13897,7 +13920,7 @@ dependencies = [ [[package]] name = "polkadot-sdk" -version = "0.1.0" +version = "0.5.0" dependencies = [ "asset-test-utils", "assets-common", @@ -13985,6 +14008,7 @@ dependencies = [ "pallet-asset-rate", "pallet-asset-tx-payment", "pallet-assets", + "pallet-assets-freezer", "pallet-atomic-swap", "pallet-aura", "pallet-authority-discovery", @@ -14218,12 +14242,12 @@ dependencies = [ "sp-core", "sp-core-hashing", "sp-core-hashing-proc-macro", - "sp-crypto-ec-utils 0.10.0", + "sp-crypto-ec-utils", "sp-crypto-hashing", "sp-crypto-hashing-proc-macro", "sp-database", - "sp-debug-derive 14.0.0", - "sp-externalities 0.25.0", + "sp-debug-derive", + "sp-externalities", "sp-genesis-builder", "sp-inherents", "sp-io", @@ -14238,22 +14262,22 @@ dependencies = [ "sp-panic-handler", "sp-rpc", "sp-runtime", - "sp-runtime-interface 24.0.0", - "sp-runtime-interface-proc-macro 17.0.0", + "sp-runtime-interface", + "sp-runtime-interface-proc-macro", "sp-session", "sp-staking", "sp-state-machine", "sp-statement-store", - "sp-std 14.0.0", - "sp-storage 19.0.0", + "sp-std", + "sp-storage", "sp-timestamp", - "sp-tracing 16.0.0", + "sp-tracing", "sp-transaction-pool", "sp-transaction-storage-proof", "sp-trie", "sp-version", "sp-version-proc-macro", - "sp-wasm-interface 20.0.0", + "sp-wasm-interface", "sp-weights", "staging-chain-spec-builder", "staging-node-inspect", @@ -14276,14 +14300,14 @@ dependencies = [ "tracing-gum-proc-macro", "westend-runtime-constants", "xcm-emulator", - "xcm-fee-payment-runtime-api", "xcm-procedural", + "xcm-runtime-apis", "xcm-simulator", ] [[package]] name = "polkadot-sdk-docs" -version = "0.0.1" +version = "0.1.0" dependencies = [ "chain-spec-guide-runtime", "cumulus-client-service", @@ -14297,6 +14321,9 @@ dependencies = [ "frame-support", "frame-system", "kitchensink-runtime", + "minimal-template-runtime", + "pallet-asset-conversion-tx-payment", + "pallet-asset-tx-payment", "pallet-assets", "pallet-aura", "pallet-authorship", @@ -14315,10 +14342,12 @@ dependencies = [ "pallet-proxy", "pallet-referenda", "pallet-scheduler", + "pallet-skip-feeless-payment", "pallet-timestamp", "pallet-transaction-payment", "pallet-uniques", "pallet-utility", + "parachain-template-runtime", "parity-scale-codec", "polkadot-sdk", "polkadot-sdk-frame", @@ -14338,6 +14367,7 @@ dependencies = [ "sc-service", "scale-info", "simple-mermaid 0.1.1", + "solochain-template-runtime", "sp-api", "sp-arithmetic", "sp-core", @@ -14346,6 +14376,9 @@ dependencies = [ "sp-keyring", "sp-offchain", "sp-runtime", + "sp-runtime-interface", + "sp-std", + "sp-tracing", "sp-version", "staging-chain-spec-builder", "staging-node-cli", @@ -14358,7 +14391,7 @@ dependencies = [ [[package]] name = "polkadot-sdk-frame" -version = "0.1.0" +version = "0.6.0" dependencies = [ "docify", "frame-benchmarking", @@ -14383,15 +14416,14 @@ dependencies = [ "sp-offchain", "sp-runtime", "sp-session", - "sp-std 14.0.0", - "sp-storage 19.0.0", + "sp-storage", "sp-transaction-pool", "sp-version", ] [[package]] name = "polkadot-service" -version = "7.0.0" +version = "17.0.1" dependencies = [ "assert_matches", "async-trait", @@ -14416,7 +14448,7 @@ dependencies = [ "pallet-transaction-payment-rpc-runtime-api", "parity-db", "parity-scale-codec", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "polkadot-approval-distribution", "polkadot-availability-bitfield-distribution", "polkadot-availability-distribution", @@ -14502,7 +14534,7 @@ dependencies = [ "sp-runtime", "sp-session", "sp-state-machine", - "sp-storage 19.0.0", + "sp-storage", "sp-timestamp", "sp-transaction-pool", "sp-version", @@ -14514,12 +14546,12 @@ dependencies = [ "tracing-gum", "westend-runtime", "westend-runtime-constants", - "xcm-fee-payment-runtime-api", + "xcm-runtime-apis", ] [[package]] name = "polkadot-statement-distribution" -version = "7.0.0" +version = "17.0.0" dependencies = [ "arrayvec 0.7.4", "assert_matches", @@ -14538,7 +14570,7 @@ dependencies = [ "polkadot-primitives", "polkadot-primitives-test-helpers", "polkadot-subsystem-bench", - "rand_chacha 0.3.1", + "rand_chacha", "sc-keystore", "sc-network", "sp-application-crypto", @@ -14547,14 +14579,14 @@ dependencies = [ "sp-keyring", "sp-keystore", "sp-staking", - "sp-tracing 16.0.0", + "sp-tracing", "thiserror", "tracing-gum", ] [[package]] name = "polkadot-statement-table" -version = "7.0.0" +version = "15.0.0" dependencies = [ "parity-scale-codec", "polkadot-primitives", @@ -14606,9 +14638,9 @@ dependencies = [ "prometheus", "pyroscope", "pyroscope_pprofrs", - "rand 0.8.5", - "rand_chacha 0.3.1", - "rand_core 0.6.4", + "rand", + "rand_chacha", + "rand_core", "rand_distr", "sc-keystore", "sc-network", @@ -14627,7 +14659,7 @@ dependencies = [ "sp-keystore", "sp-runtime", "sp-timestamp", - "strum 0.24.1", + "strum 0.26.2", "substrate-prometheus-endpoint", "tokio", "tracing-gum", @@ -14687,7 +14719,7 @@ dependencies = [ "polkadot-node-subsystem-types", "polkadot-node-subsystem-util", "polkadot-primitives", - "rand 0.8.5", + "rand", "sp-core", "sp-keystore", "substrate-build-script-utils", @@ -14743,7 +14775,6 @@ dependencies = [ "sp-runtime", "sp-session", "sp-staking", - "sp-std 14.0.0", "sp-transaction-pool", "sp-trie", "sp-version", @@ -14775,7 +14806,7 @@ dependencies = [ "polkadot-runtime-parachains", "polkadot-service", "polkadot-test-runtime", - "rand 0.8.5", + "rand", "sc-authority-discovery", "sc-chain-spec", "sc-cli", @@ -14809,7 +14840,7 @@ dependencies = [ [[package]] name = "polkadot-voter-bags" -version = "7.0.0" +version = "17.0.0" dependencies = [ "clap 4.5.3", "generate-bags", @@ -14912,11 +14943,25 @@ dependencies = [ "concurrent-queue", "libc", "log", - "pin-project-lite 0.2.12", + "pin-project-lite", "windows-sys 0.48.0", ] [[package]] +name = "polling" +version = "3.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30054e72317ab98eddd8561db0f6524df3367636884b7b21b703e4b280a84a14" +dependencies = [ + "cfg-if", + "concurrent-queue", + "pin-project-lite", + "rustix 0.38.21", + "tracing", + "windows-sys 0.52.0", +] + +[[package]] name = "poly1305" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -14951,10 +14996,16 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be97d76faf1bfab666e1375477b23fde79eccf0276e9b63b92a39d676a889ba9" dependencies = [ - "rand 0.8.5", + "rand", ] [[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + +[[package]] name = "pprof" version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -14967,7 +15018,7 @@ dependencies = [ "log", "nix 0.26.2", "once_cell", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "smallvec", "symbolic-demangle", "tempfile", @@ -15134,6 +15185,17 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" [[package]] name = "proc-macro-warning" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d1eaa7fa0aa1929ffdf7eeb6eac234dde6268914a14ad44d23521ab6a9b258e" +dependencies = [ + "proc-macro2 1.0.82", + "quote 1.0.35", + "syn 2.0.61", +] + +[[package]] +name = "proc-macro-warning" version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b698b0b09d40e9b7c1a47b132d66a8b54bcd20583d9b6d06e4535e383b4405c" @@ -15167,7 +15229,7 @@ version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "731e0d9356b0c25f16f33b5be79b1c57b562f141ebfcdb0ad8ac2c13a24293b4" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.6.0", "chrono", "flate2", "hex", @@ -15182,7 +15244,7 @@ version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2d3554923a69f4ce04c4a754260c338f505ce22642d3830e049a399fc2059a29" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.6.0", "chrono", "hex", ] @@ -15197,19 +15259,19 @@ dependencies = [ "fnv", "lazy_static", "memchr", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "thiserror", ] [[package]] name = "prometheus-client" -version = "0.19.0" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d6fa99d535dd930d1249e6c79cb3c2915f9172a540fe2b02a4c8f9ca954721e" +checksum = "3c99afa9a01501019ac3a14d71d9f94050346f55ca471ce90c799a15c58f61e2" dependencies = [ "dtoa", "itoa", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "prometheus-client-derive-encode", ] @@ -15244,11 +15306,11 @@ checksum = "31b476131c3c86cb68032fdc5cb6d5a1045e3e42d96b69fa599fd77701e1f5bf" dependencies = [ "bit-set", "bit-vec", - "bitflags 2.4.0", + "bitflags 2.6.0", "lazy_static", "num-traits", - "rand 0.8.5", - "rand_chacha 0.3.1", + "rand", + "rand_chacha", "rand_xorshift", "regex-syntax 0.8.2", "rusty-fork", @@ -15268,12 +15330,12 @@ dependencies = [ [[package]] name = "prost" -version = "0.12.4" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0f5d036824e4761737860779c906171497f6d55681139d8312388f8fe398922" +checksum = "deb1435c188b76130da55f17a466d252ff7b1418b2ad3e037d127b94e3411f29" dependencies = [ "bytes", - "prost-derive 0.12.4", + "prost-derive 0.12.6", ] [[package]] @@ -15312,7 +15374,7 @@ dependencies = [ "once_cell", "petgraph", "prettyplease 0.2.12", - "prost 0.12.4", + "prost 0.12.6", "prost-types 0.12.4", "regex", "syn 2.0.61", @@ -15334,9 +15396,9 @@ dependencies = [ [[package]] name = "prost-derive" -version = "0.12.4" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19de2de2a00075bf566bee3bd4db014b11587e84184d3f7a791bc17f1a8e9e48" +checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1" dependencies = [ "anyhow", "itertools 0.11.0", @@ -15360,7 +15422,7 @@ version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3235c33eb02c1f1e212abdbe34c78b264b038fb58ca612664343271e36e55ffe" dependencies = [ - "prost 0.12.4", + "prost 0.12.6", ] [[package]] @@ -15413,7 +15475,7 @@ dependencies = [ "mach2", "once_cell", "raw-cpuid", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", "web-sys", "winapi", ] @@ -15435,15 +15497,26 @@ dependencies = [ [[package]] name = "quick-protobuf-codec" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1693116345026436eb2f10b677806169c1a1260c1c60eaaffe3fb5a29ae23d8b" +checksum = "f8ededb1cd78531627244d51dd0c7139fbe736c7d57af0092a76f0ffb2f56e98" dependencies = [ "asynchronous-codec", "bytes", "quick-protobuf", "thiserror", - "unsigned-varint", + "unsigned-varint 0.7.2", +] + +[[package]] +name = "quick_cache" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5253a3a0d56548d5b0be25414171dc780cc6870727746d05bd2bde352eee96c5" +dependencies = [ + "ahash 0.8.11", + "hashbrown 0.13.2", + "parking_lot 0.12.3", ] [[package]] @@ -15454,49 +15527,56 @@ checksum = "588f6378e4dd99458b60ec275b4477add41ce4fa9f64dcba6f15adccb19b50d6" dependencies = [ "env_logger 0.8.4", "log", - "rand 0.8.5", + "rand", ] [[package]] -name = "quicksink" -version = "0.1.2" +name = "quinn" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77de3c815e5a160b1539c6592796801df2043ae35e123b46d73380cfa57af858" +checksum = "2e8b432585672228923edbbf64b8b12c14e1112f62e88737655b4a083dbcd78e" dependencies = [ - "futures-core", - "futures-sink", - "pin-project-lite 0.1.12", + "bytes", + "pin-project-lite", + "quinn-proto 0.9.6", + "quinn-udp 0.3.2", + "rustc-hash", + "rustls 0.20.9", + "thiserror", + "tokio", + "tracing", + "webpki", ] [[package]] name = "quinn" -version = "0.9.4" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e8b432585672228923edbbf64b8b12c14e1112f62e88737655b4a083dbcd78e" +checksum = "8cc2c5017e4b43d5995dcea317bc46c1e09404c0a9664d2908f7f02dfe943d75" dependencies = [ "bytes", - "pin-project-lite 0.2.12", - "quinn-proto", - "quinn-udp", + "futures-io", + "pin-project-lite", + "quinn-proto 0.10.6", + "quinn-udp 0.4.1", "rustc-hash", - "rustls 0.20.8", + "rustls 0.21.7", "thiserror", "tokio", "tracing", - "webpki", ] [[package]] name = "quinn-proto" -version = "0.9.5" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c956be1b23f4261676aed05a0046e204e8a6836e50203902683a718af0797989" +checksum = "94b0b33c13a79f669c85defaf4c275dc86a0c0372807d0ca3d78e0bb87274863" dependencies = [ "bytes", - "rand 0.8.5", + "rand", "ring 0.16.20", "rustc-hash", - "rustls 0.20.8", + "rustls 0.20.9", "slab", "thiserror", "tinyvec", @@ -15505,19 +15585,49 @@ dependencies = [ ] [[package]] +name = "quinn-proto" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "141bf7dfde2fbc246bfd3fe12f2455aa24b0fbd9af535d8c86c7bd1381ff2b1a" +dependencies = [ + "bytes", + "rand", + "ring 0.16.20", + "rustc-hash", + "rustls 0.21.7", + "slab", + "thiserror", + "tinyvec", + "tracing", +] + +[[package]] name = "quinn-udp" version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "641538578b21f5e5c8ea733b736895576d0fe329bb883b937db6f4d163dbaaf4" dependencies = [ "libc", - "quinn-proto", + "quinn-proto 0.9.6", "socket2 0.4.9", "tracing", "windows-sys 0.42.0", ] [[package]] +name = "quinn-udp" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "055b4e778e8feb9f93c4e439f71dc2156ef13360b432b799e179a8c4cdf0b1d7" +dependencies = [ + "bytes", + "libc", + "socket2 0.5.7", + "tracing", + "windows-sys 0.48.0", +] + +[[package]] name = "quote" version = "0.6.13" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -15543,36 +15653,13 @@ checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" [[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.4", -] - -[[package]] -name = "rand_chacha" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" -dependencies = [ - "ppv-lite86", - "rand_core 0.5.1", + "rand_chacha", + "rand_core", ] [[package]] @@ -15582,16 +15669,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ "ppv-lite86", - "rand_core 0.6.4", -] - -[[package]] -name = "rand_core" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -dependencies = [ - "getrandom 0.1.16", + "rand_core", ] [[package]] @@ -15600,7 +15678,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.10", + "getrandom", ] [[package]] @@ -15610,16 +15688,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32cb0b9bc82b0a0876c2dd994a7e7a2683d3e7390ca40e6886785ef0c7e3ee31" dependencies = [ "num-traits", - "rand 0.8.5", -] - -[[package]] -name = "rand_hc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -dependencies = [ - "rand_core 0.5.1", + "rand", ] [[package]] @@ -15628,7 +15697,7 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "59cad018caf63deb318e5a4586d99a24424a364f40f1e5778c29aca23f4fc73e" dependencies = [ - "rand_core 0.6.4", + "rand_core", ] [[package]] @@ -15637,7 +15706,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d25bf25ec5ae4a3f1b92f929810509a2f53d7dca2f50b794ff57e3face536c8f" dependencies = [ - "rand_core 0.6.4", + "rand_core", ] [[package]] @@ -15740,7 +15809,7 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" dependencies = [ - "getrandom 0.2.10", + "getrandom", "redox_syscall 0.2.16", "thiserror", ] @@ -15870,28 +15939,27 @@ dependencies = [ "bp-runtime", "finality-relay", "frame-support", - "frame-system", "futures", "jsonrpsee", "log", "num-traits", - "pallet-balances", - "pallet-bridge-messages", "pallet-transaction-payment", "pallet-transaction-payment-rpc-runtime-api", "pallet-utility", "parity-scale-codec", - "rand 0.8.5", + "quick_cache", + "rand", "relay-utils", "sc-chain-spec", "sc-rpc-api", "sc-transaction-pool-api", "scale-info", + "serde_json", "sp-consensus-grandpa", "sp-core", "sp-rpc", "sp-runtime", - "sp-std 14.0.0", + "sp-std", "sp-trie", "sp-version", "staging-xcm", @@ -15915,7 +15983,7 @@ dependencies = [ "jsonpath_lib", "log", "num-traits", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "serde_json", "sp-runtime", "substrate-prometheus-endpoint", @@ -15934,7 +16002,7 @@ dependencies = [ "log", "pallet-bags-list-remote-tests", "sp-core", - "sp-tracing 16.0.0", + "sp-tracing", "tokio", "westend-runtime", "westend-runtime-constants", @@ -15951,19 +16019,19 @@ dependencies = [ "encoding_rs", "futures-core", "futures-util", - "h2", - "http", - "http-body", - "hyper", - "hyper-rustls", + "h2 0.3.26", + "http 0.2.9", + "http-body 0.4.5", + "hyper 0.14.29", + "hyper-rustls 0.24.2", "ipnet", "js-sys", "log", "mime", "once_cell", "percent-encoding", - "pin-project-lite 0.2.12", - "rustls 0.21.6", + "pin-project-lite", + "rustls 0.21.7", "rustls-pemfile 1.0.3", "serde", "serde_json", @@ -16001,22 +16069,6 @@ dependencies = [ [[package]] name = "ring" -version = "0.1.0" -source = "git+https://github.com/w3f/ring-proof#b273d33f9981e2bb3375ab45faeb537f7ee35224" -dependencies = [ - "ark-ec", - "ark-ff 0.4.2", - "ark-poly", - "ark-serialize 0.4.2", - "ark-std 0.4.0", - "blake2 0.10.6", - "common", - "fflonk", - "merlin", -] - -[[package]] -name = "ring" version = "0.16.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" @@ -16037,7 +16089,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74" dependencies = [ "cc", - "getrandom 0.2.10", + "getrandom", "libc", "spin 0.9.8", "untrusted 0.9.0", @@ -16045,15 +16097,6 @@ dependencies = [ ] [[package]] -name = "ripemd" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd124222d17ad93a644ed9d011a40f4fb64aa54275c08cc216524a9ea82fb09f" -dependencies = [ - "digest 0.10.7", -] - -[[package]] name = "rle-decode-fast" version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -16081,7 +16124,7 @@ dependencies = [ [[package]] name = "rococo-emulated-chain" -version = "0.0.0" +version = "0.1.0" dependencies = [ "emulated-integration-tests-common", "parachains-common", @@ -16097,7 +16140,7 @@ dependencies = [ [[package]] name = "rococo-parachain-runtime" -version = "0.6.0" +version = "0.16.0" dependencies = [ "cumulus-pallet-aura-ext", "cumulus-pallet-parachain-system", @@ -16136,7 +16179,6 @@ dependencies = [ "sp-offchain", "sp-runtime", "sp-session", - "sp-std 14.0.0", "sp-transaction-pool", "sp-version", "staging-parachain-info", @@ -16149,7 +16191,7 @@ dependencies = [ [[package]] name = "rococo-runtime" -version = "7.0.0" +version = "17.0.0" dependencies = [ "binary-merkle-tree", "bitvec", @@ -16238,9 +16280,8 @@ dependencies = [ "sp-runtime", "sp-session", "sp-staking", - "sp-std 14.0.0", - "sp-storage 19.0.0", - "sp-tracing 16.0.0", + "sp-storage", + "sp-tracing", "sp-transaction-pool", "sp-trie", "sp-version", @@ -16251,12 +16292,12 @@ dependencies = [ "substrate-wasm-builder", "tiny-keccak", "tokio", - "xcm-fee-payment-runtime-api", + "xcm-runtime-apis", ] [[package]] name = "rococo-runtime-constants" -version = "7.0.0" +version = "16.0.0" dependencies = [ "frame-support", "polkadot-primitives", @@ -16271,7 +16312,7 @@ dependencies = [ [[package]] name = "rococo-system-emulated-network" -version = "0.0.0" +version = "0.1.0" dependencies = [ "asset-hub-rococo-emulated-chain", "bridge-hub-rococo-emulated-chain", @@ -16283,7 +16324,7 @@ dependencies = [ [[package]] name = "rococo-westend-system-emulated-network" -version = "0.0.0" +version = "0.1.0" dependencies = [ "asset-hub-rococo-emulated-chain", "asset-hub-westend-emulated-chain", @@ -16382,7 +16423,7 @@ dependencies = [ "parity-scale-codec", "primitive-types", "proptest", - "rand 0.8.5", + "rand", "rlp", "ruint-macro", "serde", @@ -16484,7 +16525,7 @@ version = "0.38.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b426b0506e5d50a7d8dafcf2e81471400deb602392c7dd110815afb4eaf02a3" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.6.0", "errno", "libc", "linux-raw-sys 0.4.10", @@ -16493,11 +16534,10 @@ dependencies = [ [[package]] name = "rustls" -version = "0.20.8" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f" +checksum = "1b80e3dec595989ea8510028f30c408a4630db12c9cbb8de34203b89d6577e99" dependencies = [ - "log", "ring 0.16.20", "sct", "webpki", @@ -16505,9 +16545,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.21.6" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d1feddffcfcc0b33f5c6ce9a29e341e4cd59c3f78e7ee45f4a40c038b1d6cbb" +checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8" dependencies = [ "log", "ring 0.16.20", @@ -16517,14 +16557,15 @@ dependencies = [ [[package]] name = "rustls" -version = "0.22.2" +version = "0.23.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e87c9956bd9807afa1f77e0f7594af32566e830e088a5576d27c5b6f30f49d41" +checksum = "05cff451f60db80f490f3c182b77c35260baace73209e9cdbbe526bfe3a4d402" dependencies = [ "log", + "once_cell", "ring 0.17.7", "rustls-pki-types", - "rustls-webpki 0.102.2", + "rustls-webpki 0.102.4", "subtle 2.5.0", "zeroize", ] @@ -16575,9 +16616,36 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.2.0" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" + +[[package]] +name = "rustls-platform-verifier" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a716eb65e3158e90e17cd93d855216e27bde02745ab842f2cab4a39dba1bacf" +checksum = "b5f0d26fa1ce3c790f9590868f0109289a044acb954525f933e2aa3b871c157d" +dependencies = [ + "core-foundation", + "core-foundation-sys", + "jni", + "log", + "once_cell", + "rustls 0.23.10", + "rustls-native-certs 0.7.0", + "rustls-platform-verifier-android", + "rustls-webpki 0.102.4", + "security-framework", + "security-framework-sys", + "webpki-roots 0.26.3", + "winapi", +] + +[[package]] +name = "rustls-platform-verifier-android" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84e217e7fdc8466b5b35d30f8c0a30febd29173df4a3a0c2115d306b9c4117ad" [[package]] name = "rustls-webpki" @@ -16591,9 +16659,9 @@ dependencies = [ [[package]] name = "rustls-webpki" -version = "0.102.2" +version = "0.102.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "faaa0a62740bedb9b2ef5afa303da42764c012f743917351dc9a237ea1663610" +checksum = "ff448f7e92e913c4b7d4c6d8e4540a1724b319b4152b8aef6d4cf8339712b33e" dependencies = [ "ring 0.17.7", "rustls-pki-types", @@ -16631,9 +16699,9 @@ dependencies = [ [[package]] name = "rw-stream-sink" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26338f5e09bb721b85b135ea05af7767c90b52f6de4f087d4f4a3a9d64e7dc04" +checksum = "d8c9026ff5d2f23da5e45bbc283f156383001bfb09c4e44256d02c1a685fe9a1" dependencies = [ "futures", "pin-project", @@ -16675,17 +16743,17 @@ dependencies = [ [[package]] name = "sc-allocator" -version = "23.0.0" +version = "29.0.0" dependencies = [ "log", "sp-core", - "sp-wasm-interface 20.0.0", + "sp-wasm-interface", "thiserror", ] [[package]] name = "sc-authority-discovery" -version = "0.34.0" +version = "0.44.0" dependencies = [ "async-trait", "futures", @@ -16694,13 +16762,12 @@ dependencies = [ "libp2p", "linked_hash_set", "log", - "multihash 0.17.0", - "multihash-codetable", + "multihash 0.19.1", "parity-scale-codec", - "prost 0.12.4", + "prost 0.12.6", "prost-build 0.12.4", "quickcheck", - "rand 0.8.5", + "rand", "sc-client-api", "sc-network", "sc-network-types", @@ -16710,7 +16777,7 @@ dependencies = [ "sp-core", "sp-keystore", "sp-runtime", - "sp-tracing 16.0.0", + "sp-tracing", "substrate-prometheus-endpoint", "substrate-test-runtime-client", "thiserror", @@ -16718,13 +16785,13 @@ dependencies = [ [[package]] name = "sc-basic-authorship" -version = "0.34.0" +version = "0.44.0" dependencies = [ "futures", "futures-timer", "log", "parity-scale-codec", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "sc-block-builder", "sc-client-api", "sc-proposer-metrics", @@ -16743,7 +16810,7 @@ dependencies = [ [[package]] name = "sc-block-builder" -version = "0.33.0" +version = "0.42.0" dependencies = [ "parity-scale-codec", "sp-api", @@ -16759,7 +16826,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" -version = "28.0.0" +version = "37.0.0" dependencies = [ "array-bytes", "clap 4.5.3", @@ -16785,13 +16852,13 @@ dependencies = [ "sp-keyring", "sp-runtime", "sp-state-machine", - "sp-tracing 16.0.0", + "sp-tracing", "substrate-test-runtime", ] [[package]] name = "sc-chain-spec-derive" -version = "11.0.0" +version = "12.0.0" dependencies = [ "proc-macro-crate 3.1.0", "proc-macro2 1.0.82", @@ -16801,7 +16868,7 @@ dependencies = [ [[package]] name = "sc-cli" -version = "0.36.0" +version = "0.46.0" dependencies = [ "array-bytes", "chrono", @@ -16815,7 +16882,7 @@ dependencies = [ "names", "parity-bip39", "parity-scale-codec", - "rand 0.8.5", + "rand", "regex", "rpassword", "sc-client-api", @@ -16835,7 +16902,7 @@ dependencies = [ "sp-keystore", "sp-panic-handler", "sp-runtime", - "sp-tracing 16.0.0", + "sp-tracing", "sp-version", "tempfile", "thiserror", @@ -16844,13 +16911,13 @@ dependencies = [ [[package]] name = "sc-client-api" -version = "28.0.0" +version = "37.0.0" dependencies = [ "fnv", "futures", "log", "parity-scale-codec", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "sc-executor", "sc-transaction-pool-api", "sc-utils", @@ -16859,11 +16926,11 @@ dependencies = [ "sp-consensus", "sp-core", "sp-database", - "sp-externalities 0.25.0", + "sp-externalities", "sp-runtime", "sp-state-machine", "sp-statement-store", - "sp-storage 19.0.0", + "sp-storage", "sp-test-primitives", "sp-trie", "substrate-prometheus-endpoint", @@ -16873,7 +16940,7 @@ dependencies = [ [[package]] name = "sc-client-db" -version = "0.35.0" +version = "0.44.0" dependencies = [ "array-bytes", "criterion", @@ -16886,9 +16953,9 @@ dependencies = [ "log", "parity-db", "parity-scale-codec", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "quickcheck", - "rand 0.8.5", + "rand", "sc-client-api", "sc-state-db", "schnellru", @@ -16898,7 +16965,7 @@ dependencies = [ "sp-database", "sp-runtime", "sp-state-machine", - "sp-tracing 16.0.0", + "sp-tracing", "sp-trie", "substrate-test-runtime-client", "tempfile", @@ -16906,14 +16973,13 @@ dependencies = [ [[package]] name = "sc-consensus" -version = "0.33.0" +version = "0.43.0" dependencies = [ "async-trait", "futures", - "futures-timer", "log", "mockall 0.11.4", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "sc-client-api", "sc-network-types", "sc-utils", @@ -16931,13 +16997,13 @@ dependencies = [ [[package]] name = "sc-consensus-aura" -version = "0.34.0" +version = "0.44.0" dependencies = [ "async-trait", "futures", "log", "parity-scale-codec", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "sc-block-builder", "sc-client-api", "sc-consensus", @@ -16959,7 +17025,7 @@ dependencies = [ "sp-keystore", "sp-runtime", "sp-timestamp", - "sp-tracing 16.0.0", + "sp-tracing", "substrate-prometheus-endpoint", "substrate-test-runtime-client", "tempfile", @@ -16969,7 +17035,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe" -version = "0.34.0" +version = "0.44.0" dependencies = [ "async-trait", "fork-tree", @@ -16979,7 +17045,7 @@ dependencies = [ "num-rational", "num-traits", "parity-scale-codec", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "sc-block-builder", "sc-client-api", "sc-consensus", @@ -17002,7 +17068,7 @@ dependencies = [ "sp-keystore", "sp-runtime", "sp-timestamp", - "sp-tracing 16.0.0", + "sp-tracing", "substrate-prometheus-endpoint", "substrate-test-runtime-client", "thiserror", @@ -17011,7 +17077,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" -version = "0.34.0" +version = "0.44.0" dependencies = [ "futures", "jsonrpsee", @@ -17039,7 +17105,7 @@ dependencies = [ [[package]] name = "sc-consensus-beefy" -version = "13.0.0" +version = "23.0.0" dependencies = [ "array-bytes", "async-channel", @@ -17048,7 +17114,7 @@ dependencies = [ "futures", "log", "parity-scale-codec", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "sc-block-builder", "sc-client-api", "sc-consensus", @@ -17072,7 +17138,7 @@ dependencies = [ "sp-keystore", "sp-mmr-primitives", "sp-runtime", - "sp-tracing 16.0.0", + "sp-tracing", "substrate-prometheus-endpoint", "substrate-test-runtime-client", "tempfile", @@ -17083,13 +17149,13 @@ dependencies = [ [[package]] name = "sc-consensus-beefy-rpc" -version = "13.0.0" +version = "23.0.0" dependencies = [ "futures", "jsonrpsee", "log", "parity-scale-codec", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "sc-consensus-beefy", "sc-rpc", "serde", @@ -17105,7 +17171,7 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" -version = "0.33.0" +version = "0.43.0" dependencies = [ "fork-tree", "parity-scale-codec", @@ -17117,9 +17183,9 @@ dependencies = [ [[package]] name = "sc-consensus-grandpa" -version = "0.19.0" +version = "0.29.1" dependencies = [ - "ahash 0.8.8", + "ahash 0.8.11", "array-bytes", "assert_matches", "async-trait", @@ -17130,8 +17196,8 @@ dependencies = [ "futures-timer", "log", "parity-scale-codec", - "parking_lot 0.12.1", - "rand 0.8.5", + "parking_lot 0.12.3", + "rand", "sc-block-builder", "sc-chain-spec", "sc-client-api", @@ -17158,7 +17224,7 @@ dependencies = [ "sp-keyring", "sp-keystore", "sp-runtime", - "sp-tracing 16.0.0", + "sp-tracing", "substrate-prometheus-endpoint", "substrate-test-runtime-client", "thiserror", @@ -17167,7 +17233,7 @@ dependencies = [ [[package]] name = "sc-consensus-grandpa-rpc" -version = "0.19.0" +version = "0.29.0" dependencies = [ "finality-grandpa", "futures", @@ -17191,7 +17257,7 @@ dependencies = [ [[package]] name = "sc-consensus-manual-seal" -version = "0.35.0" +version = "0.45.0" dependencies = [ "assert_matches", "async-trait", @@ -17229,14 +17295,14 @@ dependencies = [ [[package]] name = "sc-consensus-pow" -version = "0.33.0" +version = "0.43.0" dependencies = [ "async-trait", "futures", "futures-timer", "log", "parity-scale-codec", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "sc-client-api", "sc-consensus", "sp-api", @@ -17253,7 +17319,7 @@ dependencies = [ [[package]] name = "sc-consensus-slots" -version = "0.33.0" +version = "0.43.0" dependencies = [ "async-trait", "futures", @@ -17276,7 +17342,7 @@ dependencies = [ [[package]] name = "sc-executor" -version = "0.32.0" +version = "0.40.0" dependencies = [ "array-bytes", "assert_matches", @@ -17284,7 +17350,7 @@ dependencies = [ "env_logger 0.11.3", "num_cpus", "parity-scale-codec", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "paste", "regex", "sc-executor-common", @@ -17296,49 +17362,49 @@ dependencies = [ "sp-api", "sp-core", "sp-crypto-hashing", - "sp-externalities 0.25.0", + "sp-externalities", "sp-io", "sp-maybe-compressed-blob", "sp-panic-handler", "sp-runtime", - "sp-runtime-interface 24.0.0", + "sp-runtime-interface", "sp-state-machine", - "sp-tracing 16.0.0", + "sp-tracing", "sp-trie", "sp-version", - "sp-wasm-interface 20.0.0", + "sp-wasm-interface", "substrate-test-runtime", "tempfile", "tracing", - "tracing-subscriber 0.3.18", + "tracing-subscriber", "wat", ] [[package]] name = "sc-executor-common" -version = "0.29.0" +version = "0.35.0" dependencies = [ "polkavm", "sc-allocator", "sp-maybe-compressed-blob", - "sp-wasm-interface 20.0.0", + "sp-wasm-interface", "thiserror", "wasm-instrument", ] [[package]] name = "sc-executor-polkavm" -version = "0.29.0" +version = "0.32.0" dependencies = [ "log", "polkavm", "sc-executor-common", - "sp-wasm-interface 20.0.0", + "sp-wasm-interface", ] [[package]] name = "sc-executor-wasmtime" -version = "0.29.0" +version = "0.35.0" dependencies = [ "anyhow", "cargo_metadata", @@ -17346,15 +17412,15 @@ dependencies = [ "libc", "log", "parity-scale-codec", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "paste", "rustix 0.36.15", "sc-allocator", "sc-executor-common", "sc-runtime-test", "sp-io", - "sp-runtime-interface 24.0.0", - "sp-wasm-interface 20.0.0", + "sp-runtime-interface", + "sp-wasm-interface", "tempfile", "wasmtime", "wat", @@ -17362,7 +17428,7 @@ dependencies = [ [[package]] name = "sc-informant" -version = "0.33.0" +version = "0.43.0" dependencies = [ "ansi_term", "futures", @@ -17378,10 +17444,10 @@ dependencies = [ [[package]] name = "sc-keystore" -version = "25.0.0" +version = "33.0.0" dependencies = [ "array-bytes", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "serde_json", "sp-application-crypto", "sp-core", @@ -17392,7 +17458,7 @@ dependencies = [ [[package]] name = "sc-mixnet" -version = "0.4.0" +version = "0.14.0" dependencies = [ "array-bytes", "arrayvec 0.7.4", @@ -17402,9 +17468,9 @@ dependencies = [ "futures-timer", "log", "mixnet", - "multiaddr", + "multiaddr 0.18.1", "parity-scale-codec", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "sc-client-api", "sc-network", "sc-network-types", @@ -17420,7 +17486,7 @@ dependencies = [ [[package]] name = "sc-network" -version = "0.34.0" +version = "0.44.0" dependencies = [ "array-bytes", "assert_matches", @@ -17442,12 +17508,12 @@ dependencies = [ "multistream-select", "once_cell", "parity-scale-codec", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "partial_sort", "pin-project", - "prost 0.12.4", + "prost 0.12.6", "prost-build 0.12.4", - "rand 0.8.5", + "rand", "sc-block-builder", "sc-client-api", "sc-network-common", @@ -17466,7 +17532,7 @@ dependencies = [ "sp-crypto-hashing", "sp-runtime", "sp-test-primitives", - "sp-tracing 16.0.0", + "sp-tracing", "substrate-prometheus-endpoint", "substrate-test-runtime", "substrate-test-runtime-client", @@ -17476,7 +17542,7 @@ dependencies = [ "tokio-stream", "tokio-test", "tokio-util", - "unsigned-varint", + "unsigned-varint 0.7.2", "void", "wasm-timer", "zeroize", @@ -17484,7 +17550,7 @@ dependencies = [ [[package]] name = "sc-network-common" -version = "0.33.0" +version = "0.43.0" dependencies = [ "async-trait", "bitflags 1.3.2", @@ -17502,13 +17568,12 @@ dependencies = [ [[package]] name = "sc-network-gossip" -version = "0.34.0" +version = "0.44.0" dependencies = [ - "ahash 0.8.8", + "ahash 0.8.11", "async-trait", "futures", "futures-timer", - "libp2p", "log", "parity-scale-codec", "quickcheck", @@ -17526,14 +17591,14 @@ dependencies = [ [[package]] name = "sc-network-light" -version = "0.33.0" +version = "0.43.0" dependencies = [ "array-bytes", "async-channel", "futures", "log", "parity-scale-codec", - "prost 0.12.4", + "prost 0.12.6", "prost-build 0.12.4", "sc-client-api", "sc-network", @@ -17546,12 +17611,11 @@ dependencies = [ [[package]] name = "sc-network-statement" -version = "0.16.0" +version = "0.26.0" dependencies = [ "array-bytes", "async-channel", "futures", - "libp2p", "log", "parity-scale-codec", "sc-network", @@ -17566,7 +17630,7 @@ dependencies = [ [[package]] name = "sc-network-sync" -version = "0.33.0" +version = "0.43.0" dependencies = [ "array-bytes", "async-channel", @@ -17578,7 +17642,7 @@ dependencies = [ "log", "mockall 0.11.4", "parity-scale-codec", - "prost 0.12.4", + "prost 0.12.6", "prost-build 0.12.4", "quickcheck", "sc-block-builder", @@ -17597,7 +17661,7 @@ dependencies = [ "sp-core", "sp-runtime", "sp-test-primitives", - "sp-tracing 16.0.0", + "sp-tracing", "substrate-prometheus-endpoint", "substrate-test-runtime-client", "thiserror", @@ -17614,8 +17678,8 @@ dependencies = [ "futures-timer", "libp2p", "log", - "parking_lot 0.12.1", - "rand 0.8.5", + "parking_lot 0.12.3", + "rand", "sc-block-builder", "sc-client-api", "sc-consensus", @@ -17630,7 +17694,7 @@ dependencies = [ "sp-consensus", "sp-core", "sp-runtime", - "sp-tracing 16.0.0", + "sp-tracing", "substrate-test-runtime", "substrate-test-runtime-client", "tokio", @@ -17638,11 +17702,10 @@ dependencies = [ [[package]] name = "sc-network-transactions" -version = "0.33.0" +version = "0.43.0" dependencies = [ "array-bytes", "futures", - "libp2p", "log", "parity-scale-codec", "sc-network", @@ -17657,23 +17720,24 @@ dependencies = [ [[package]] name = "sc-network-types" -version = "0.10.0" +version = "0.12.1" dependencies = [ "bs58 0.5.0", - "ed25519-dalek 2.1.1", + "ed25519-dalek", "libp2p-identity", "litep2p", - "multiaddr", - "multihash 0.17.0", + "log", + "multiaddr 0.18.1", + "multihash 0.19.1", "quickcheck", - "rand 0.8.5", + "rand", "thiserror", "zeroize", ] [[package]] name = "sc-offchain" -version = "29.0.0" +version = "39.0.0" dependencies = [ "array-bytes", "async-trait", @@ -17681,16 +17745,15 @@ dependencies = [ "fnv", "futures", "futures-timer", - "hyper", - "hyper-rustls", + "hyper 0.14.29", + "hyper-rustls 0.24.2", "lazy_static", - "libp2p", "log", "num_cpus", "once_cell", "parity-scale-codec", - "parking_lot 0.12.1", - "rand 0.8.5", + "parking_lot 0.12.3", + "rand", "sc-block-builder", "sc-client-api", "sc-client-db", @@ -17703,11 +17766,11 @@ dependencies = [ "sp-api", "sp-consensus", "sp-core", - "sp-externalities 0.25.0", + "sp-externalities", "sp-keystore", "sp-offchain", "sp-runtime", - "sp-tracing 16.0.0", + "sp-tracing", "substrate-test-runtime-client", "threadpool", "tokio", @@ -17716,7 +17779,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" -version = "0.17.0" +version = "0.18.0" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -17724,7 +17787,7 @@ dependencies = [ [[package]] name = "sc-rpc" -version = "29.0.0" +version = "39.0.0" dependencies = [ "assert_matches", "env_logger 0.11.3", @@ -17732,7 +17795,7 @@ dependencies = [ "jsonrpsee", "log", "parity-scale-codec", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "pretty_assertions", "sc-block-builder", "sc-chain-spec", @@ -17761,12 +17824,12 @@ dependencies = [ "sp-version", "substrate-test-runtime-client", "tokio", - "tracing-subscriber 0.3.18", + "tracing-subscriber", ] [[package]] name = "sc-rpc-api" -version = "0.33.0" +version = "0.43.0" dependencies = [ "jsonrpsee", "parity-scale-codec", @@ -17785,16 +17848,18 @@ dependencies = [ [[package]] name = "sc-rpc-server" -version = "11.0.0" +version = "16.0.2" dependencies = [ "forwarded-header-value", "futures", "governor", - "http", - "hyper", + "http 1.1.0", + "http-body-util", + "hyper 1.3.1", "ip_network", "jsonrpsee", "log", + "serde", "serde_json", "substrate-prometheus-endpoint", "tokio", @@ -17804,7 +17869,7 @@ dependencies = [ [[package]] name = "sc-rpc-spec-v2" -version = "0.34.0" +version = "0.44.0" dependencies = [ "array-bytes", "assert_matches", @@ -17814,9 +17879,9 @@ dependencies = [ "jsonrpsee", "log", "parity-scale-codec", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "pretty_assertions", - "rand 0.8.5", + "rand", "sc-block-builder", "sc-chain-spec", "sc-client-api", @@ -17832,7 +17897,7 @@ dependencies = [ "sp-blockchain", "sp-consensus", "sp-core", - "sp-externalities 0.25.0", + "sp-externalities", "sp-maybe-compressed-blob", "sp-rpc", "sp-runtime", @@ -17852,14 +17917,13 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-runtime-interface 24.0.0", - "sp-std 14.0.0", + "sp-runtime-interface", "substrate-wasm-builder", ] [[package]] name = "sc-service" -version = "0.35.0" +version = "0.45.0" dependencies = [ "async-trait", "directories", @@ -17869,9 +17933,9 @@ dependencies = [ "jsonrpsee", "log", "parity-scale-codec", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "pin-project", - "rand 0.8.5", + "rand", "sc-chain-spec", "sc-client-api", "sc-client-db", @@ -17901,12 +17965,12 @@ dependencies = [ "sp-blockchain", "sp-consensus", "sp-core", - "sp-externalities 0.25.0", + "sp-externalities", "sp-keystore", "sp-runtime", "sp-session", "sp-state-machine", - "sp-storage 19.0.0", + "sp-storage", "sp-transaction-pool", "sp-transaction-storage-proof", "sp-trie", @@ -17932,7 +17996,7 @@ dependencies = [ "futures", "log", "parity-scale-codec", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "sc-block-builder", "sc-client-api", "sc-client-db", @@ -17949,8 +18013,8 @@ dependencies = [ "sp-io", "sp-runtime", "sp-state-machine", - "sp-storage 19.0.0", - "sp-tracing 16.0.0", + "sp-storage", + "sp-tracing", "sp-trie", "substrate-test-runtime", "substrate-test-runtime-client", @@ -17960,22 +18024,22 @@ dependencies = [ [[package]] name = "sc-state-db" -version = "0.30.0" +version = "0.36.0" dependencies = [ "log", "parity-scale-codec", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "sp-core", ] [[package]] name = "sc-statement-store" -version = "10.0.0" +version = "19.0.0" dependencies = [ "env_logger 0.11.3", "log", "parity-db", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "sc-client-api", "sc-keystore", "sp-api", @@ -17990,7 +18054,7 @@ dependencies = [ [[package]] name = "sc-storage-monitor" -version = "0.16.0" +version = "0.22.0" dependencies = [ "clap 4.5.3", "fs4", @@ -18002,7 +18066,7 @@ dependencies = [ [[package]] name = "sc-sync-state-rpc" -version = "0.34.0" +version = "0.44.0" dependencies = [ "jsonrpsee", "parity-scale-codec", @@ -18020,13 +18084,13 @@ dependencies = [ [[package]] name = "sc-sysinfo" -version = "27.0.0" +version = "37.0.0" dependencies = [ "derive_more", "futures", "libc", "log", - "rand 0.8.5", + "rand", "rand_pcg", "regex", "sc-telemetry", @@ -18036,20 +18100,20 @@ dependencies = [ "sp-crypto-hashing", "sp-io", "sp-runtime", - "sp-std 14.0.0", + "sp-std", ] [[package]] name = "sc-telemetry" -version = "15.0.0" +version = "24.0.0" dependencies = [ "chrono", "futures", "libp2p", "log", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "pin-project", - "rand 0.8.5", + "rand", "sc-network", "sc-utils", "serde", @@ -18060,7 +18124,7 @@ dependencies = [ [[package]] name = "sc-tracing" -version = "28.0.0" +version = "37.0.0" dependencies = [ "ansi_term", "chrono", @@ -18070,7 +18134,7 @@ dependencies = [ "libc", "log", "parity-scale-codec", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "regex", "rustc-hash", "sc-client-api", @@ -18081,11 +18145,11 @@ dependencies = [ "sp-core", "sp-rpc", "sp-runtime", - "sp-tracing 16.0.0", + "sp-tracing", "thiserror", "tracing", - "tracing-log 0.2.0", - "tracing-subscriber 0.3.18", + "tracing-log", + "tracing-subscriber", ] [[package]] @@ -18100,7 +18164,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool" -version = "28.0.0" +version = "37.0.0" dependencies = [ "array-bytes", "assert_matches", @@ -18111,7 +18175,7 @@ dependencies = [ "linked-hash-map", "log", "parity-scale-codec", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "sc-block-builder", "sc-client-api", "sc-transaction-pool-api", @@ -18123,7 +18187,7 @@ dependencies = [ "sp-core", "sp-crypto-hashing", "sp-runtime", - "sp-tracing 16.0.0", + "sp-tracing", "sp-transaction-pool", "substrate-prometheus-endpoint", "substrate-test-runtime", @@ -18134,7 +18198,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool-api" -version = "28.0.0" +version = "37.0.0" dependencies = [ "async-trait", "futures", @@ -18150,14 +18214,14 @@ dependencies = [ [[package]] name = "sc-utils" -version = "14.0.0" +version = "17.0.0" dependencies = [ "async-channel", "futures", "futures-timer", "lazy_static", "log", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "prometheus", "sp-arithmetic", "tokio-test", @@ -18175,9 +18239,9 @@ dependencies = [ [[package]] name = "scale-decode" -version = "0.13.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b12ebca36cec2a3f983c46295b282b35e5f8496346fb859a8776dad5389e5389" +checksum = "e98f3262c250d90e700bb802eb704e1f841e03331c2eb815e46516c4edbf5b27" dependencies = [ "derive_more", "parity-scale-codec", @@ -18257,7 +18321,7 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "772575a524feeb803e5b0fcbc6dd9f367e579488197c94c6e4023aad2305774d" dependencies = [ - "ahash 0.8.8", + "ahash 0.8.11", "cfg-if", "hashbrown 0.13.2", ] @@ -18272,7 +18336,7 @@ dependencies = [ "arrayvec 0.7.4", "curve25519-dalek-ng", "merlin", - "rand_core 0.6.4", + "rand_core", "sha2 0.9.9", "subtle-ng", "zeroize", @@ -18287,10 +18351,10 @@ dependencies = [ "aead", "arrayref", "arrayvec 0.7.4", - "curve25519-dalek 4.1.2", + "curve25519-dalek", "getrandom_or_panic", "merlin", - "rand_core 0.6.4", + "rand_core", "serde_bytes", "sha2 0.10.8", "subtle 2.5.0", @@ -18335,7 +18399,7 @@ dependencies = [ "crc", "fxhash", "log", - "rand 0.8.5", + "rand", "slab", "thiserror", ] @@ -18366,18 +18430,18 @@ dependencies = [ [[package]] name = "secp256k1" -version = "0.28.0" +version = "0.28.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2acea373acb8c21ecb5a23741452acd2593ed44ee3d343e72baaa143bc89d0d5" +checksum = "d24b59d129cdadea20aea4fb2352fa053712e5d713eee47d700cd4b2bc002f10" dependencies = [ "secp256k1-sys", ] [[package]] name = "secp256k1-sys" -version = "0.9.0" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09e67c467c38fd24bd5499dc9a18183b31575c12ee549197e3e20d57aa4fe3b7" +checksum = "e5d1746aae42c19d583c3c1a8c646bfad910498e2051c551a7f2e3c0c9fbb7eb" dependencies = [ "cc", ] @@ -18393,22 +18457,23 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.9.2" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" +checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", "core-foundation", "core-foundation-sys", "libc", + "num-bigint", "security-framework-sys", ] [[package]] name = "security-framework-sys" -version = "2.9.1" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" +checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7" dependencies = [ "core-foundation-sys", "libc", @@ -18416,7 +18481,7 @@ dependencies = [ [[package]] name = "seedling-runtime" -version = "0.7.0" +version = "0.17.0" dependencies = [ "cumulus-pallet-aura-ext", "cumulus-pallet-parachain-system", @@ -18442,7 +18507,6 @@ dependencies = [ "sp-offchain", "sp-runtime", "sp-session", - "sp-std 14.0.0", "sp-transaction-pool", "sp-version", "staging-parachain-info", @@ -18501,6 +18565,12 @@ dependencies = [ ] [[package]] +name = "send_wrapper" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73" + +[[package]] name = "separator" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -18566,12 +18636,13 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.114" +version = "1.0.121" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" +checksum = "4ab380d7d9f22ef3f21ad3e6c1ebe8e4fc7a2000ccba2e4d71fc96f15b2cb609" dependencies = [ "indexmap 2.2.3", "itoa", + "memchr", "ryu", "serde", ] @@ -18630,7 +18701,7 @@ dependencies = [ "futures", "lazy_static", "log", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "serial_test_derive", ] @@ -18735,7 +18806,7 @@ dependencies = [ [[package]] name = "shell-runtime" -version = "0.7.0" +version = "0.17.0" dependencies = [ "cumulus-pallet-aura-ext", "cumulus-pallet-parachain-system", @@ -18760,7 +18831,6 @@ dependencies = [ "sp-offchain", "sp-runtime", "sp-session", - "sp-std 14.0.0", "sp-transaction-pool", "sp-version", "staging-parachain-info", @@ -18797,18 +18867,12 @@ dependencies = [ [[package]] name = "signature" -version = "1.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" - -[[package]] -name = "signature" version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5e1788eed21689f9cf370582dfc467ef36ed9c707f073528ddafa8d83e3b8500" dependencies = [ "digest 0.10.7", - "rand_core 0.6.4", + "rand_core", ] [[package]] @@ -18830,7 +18894,7 @@ version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cae9a3fcdadafb6d97f4c0e007e4247b114ee0f119f650c3cbf3a8b3a1479694" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.6.0", ] [[package]] @@ -18867,13 +18931,12 @@ checksum = "826167069c09b99d56f31e9ae5c99049e932a98c9dc2dac47645b08dbbf76ba7" [[package]] name = "slot-range-helper" -version = "7.0.0" +version = "15.0.0" dependencies = [ "enumn", "parity-scale-codec", "paste", "sp-runtime", - "sp-std 14.0.0", ] [[package]] @@ -18911,12 +18974,12 @@ dependencies = [ "async-channel", "async-executor", "async-fs", - "async-io", - "async-lock", + "async-io 1.13.0", + "async-lock 2.8.0", "async-net", "async-process", "blocking", - "futures-lite", + "futures-lite 1.13.0", ] [[package]] @@ -18935,7 +18998,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0bb30cf57b7b5f6109ce17c3164445e2d6f270af2cb48f6e4d31c2967c9a9f5" dependencies = [ "arrayvec 0.7.4", - "async-lock", + "async-lock 2.8.0", "atomic-take", "base64 0.21.2", "bip39", @@ -18946,9 +19009,9 @@ dependencies = [ "derive_more", "ed25519-zebra", "either", - "event-listener", + "event-listener 2.5.3", "fnv", - "futures-lite", + "futures-lite 1.13.0", "futures-util", "hashbrown 0.14.3", "hex", @@ -18964,8 +19027,8 @@ dependencies = [ "pbkdf2", "pin-project", "poly1305", - "rand 0.8.5", - "rand_chacha 0.3.1", + "rand", + "rand_chacha", "ruzstd", "schnorrkel 0.10.2", "serde", @@ -18975,10 +19038,10 @@ dependencies = [ "siphasher", "slab", "smallvec", - "soketto", + "soketto 0.7.1", "twox-hash", - "wasmi", - "x25519-dalek 2.0.0", + "wasmi 0.31.2", + "x25519-dalek", "zeroize", ] @@ -18989,15 +19052,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "256b5bad1d6b49045e95fe87492ce73d5af81545d8b4d8318a872d2007024c33" dependencies = [ "async-channel", - "async-lock", + "async-lock 2.8.0", "base64 0.21.2", "blake2-rfc", "derive_more", "either", - "event-listener", + "event-listener 2.5.3", "fnv", "futures-channel", - "futures-lite", + "futures-lite 1.13.0", "futures-util", "hashbrown 0.14.3", "hex", @@ -19005,10 +19068,10 @@ dependencies = [ "log", "lru 0.11.0", "no-std-net", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "pin-project", - "rand 0.8.5", - "rand_chacha 0.3.1", + "rand", + "rand_chacha", "serde", "serde_json", "siphasher", @@ -19033,8 +19096,8 @@ dependencies = [ "aes-gcm", "blake2 0.10.6", "chacha20poly1305", - "curve25519-dalek 4.1.2", - "rand_core 0.6.4", + "curve25519-dalek", + "rand_core", "ring 0.17.7", "rustc_version 0.4.0", "sha2 0.10.8", @@ -19053,7 +19116,7 @@ dependencies = [ [[package]] name = "snowbridge-beacon-primitives" -version = "0.2.0" +version = "0.9.0" dependencies = [ "byte-slice-cast", "frame-support", @@ -19068,14 +19131,14 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", + "sp-std", "ssz_rs", "ssz_rs_derive", ] [[package]] name = "snowbridge-core" -version = "0.2.0" +version = "0.9.0" dependencies = [ "ethabi-decode", "frame-support", @@ -19091,14 +19154,14 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", + "sp-std", "staging-xcm", "staging-xcm-builder", ] [[package]] name = "snowbridge-ethereum" -version = "0.3.0" +version = "0.9.0" dependencies = [ "ethabi-decode", "ethbloom", @@ -19106,7 +19169,7 @@ dependencies = [ "hex-literal", "parity-bytes", "parity-scale-codec", - "rand 0.8.5", + "rand", "rlp", "scale-info", "serde", @@ -19114,7 +19177,7 @@ dependencies = [ "serde_json", "sp-io", "sp-runtime", - "sp-std 14.0.0", + "sp-std", "wasm-bindgen-test", ] @@ -19127,7 +19190,7 @@ dependencies = [ "hex", "lazy_static", "parity-scale-codec", - "rand 0.8.5", + "rand", "scale-info", "snowbridge-amcl", "zeroize", @@ -19135,7 +19198,7 @@ dependencies = [ [[package]] name = "snowbridge-outbound-queue-merkle-tree" -version = "0.3.0" +version = "0.9.0" dependencies = [ "array-bytes", "env_logger 0.11.3", @@ -19150,19 +19213,19 @@ dependencies = [ [[package]] name = "snowbridge-outbound-queue-runtime-api" -version = "0.2.0" +version = "0.9.0" dependencies = [ "frame-support", "parity-scale-codec", "snowbridge-core", "snowbridge-outbound-queue-merkle-tree", "sp-api", - "sp-std 14.0.0", + "sp-std", ] [[package]] name = "snowbridge-pallet-ethereum-client" -version = "0.2.0" +version = "0.9.0" dependencies = [ "frame-benchmarking", "frame-support", @@ -19171,7 +19234,7 @@ dependencies = [ "log", "pallet-timestamp", "parity-scale-codec", - "rand 0.8.5", + "rand", "scale-info", "serde", "serde_json", @@ -19183,24 +19246,24 @@ dependencies = [ "sp-io", "sp-keyring", "sp-runtime", - "sp-std 14.0.0", + "sp-std", "static_assertions", ] [[package]] name = "snowbridge-pallet-ethereum-client-fixtures" -version = "0.9.0" +version = "0.17.0" dependencies = [ "hex-literal", "snowbridge-beacon-primitives", "snowbridge-core", "sp-core", - "sp-std 14.0.0", + "sp-std", ] [[package]] name = "snowbridge-pallet-inbound-queue" -version = "0.2.0" +version = "0.9.0" dependencies = [ "alloy-primitives", "alloy-sol-types", @@ -19222,25 +19285,25 @@ dependencies = [ "sp-io", "sp-keyring", "sp-runtime", - "sp-std 14.0.0", + "sp-std", "staging-xcm", "staging-xcm-executor", ] [[package]] name = "snowbridge-pallet-inbound-queue-fixtures" -version = "0.10.0" +version = "0.17.0" dependencies = [ "hex-literal", "snowbridge-beacon-primitives", "snowbridge-core", "sp-core", - "sp-std 14.0.0", + "sp-std", ] [[package]] name = "snowbridge-pallet-outbound-queue" -version = "0.2.0" +version = "0.9.0" dependencies = [ "bridge-hub-common", "ethabi-decode", @@ -19258,12 +19321,12 @@ dependencies = [ "sp-io", "sp-keyring", "sp-runtime", - "sp-std 14.0.0", + "sp-std", ] [[package]] name = "snowbridge-pallet-system" -version = "0.2.0" +version = "0.9.0" dependencies = [ "frame-benchmarking", "frame-support", @@ -19282,40 +19345,39 @@ dependencies = [ "sp-io", "sp-keyring", "sp-runtime", - "sp-std 14.0.0", + "sp-std", "staging-xcm", "staging-xcm-executor", ] [[package]] name = "snowbridge-router-primitives" -version = "0.9.0" +version = "0.15.0" dependencies = [ "frame-support", "hex-literal", "log", "parity-scale-codec", - "rustc-hex", "scale-info", "snowbridge-core", "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", + "sp-std", "staging-xcm", "staging-xcm-executor", ] [[package]] name = "snowbridge-runtime-common" -version = "0.2.0" +version = "0.9.0" dependencies = [ "frame-support", "log", "parity-scale-codec", "snowbridge-core", "sp-arithmetic", - "sp-std 14.0.0", + "sp-std", "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", @@ -19323,7 +19385,7 @@ dependencies = [ [[package]] name = "snowbridge-runtime-test-common" -version = "0.2.0" +version = "0.9.0" dependencies = [ "cumulus-pallet-parachain-system", "frame-support", @@ -19353,12 +19415,12 @@ dependencies = [ [[package]] name = "snowbridge-system-runtime-api" -version = "0.2.0" +version = "0.9.0" dependencies = [ "parity-scale-codec", "snowbridge-core", "sp-api", - "sp-std 14.0.0", + "sp-std", "staging-xcm", ] @@ -19374,9 +19436,9 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.6" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" dependencies = [ "libc", "windows-sys 0.52.0", @@ -19390,18 +19452,32 @@ checksum = "41d1c5305e39e09653383c2c7244f2f78b3bcae37cf50c64cb4789c9f5096ec2" dependencies = [ "base64 0.13.1", "bytes", - "flate2", "futures", - "http", "httparse", "log", - "rand 0.8.5", + "rand", "sha-1 0.9.8", ] [[package]] +name = "soketto" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37468c595637c10857701c990f93a40ce0e357cedb0953d1c26c8d8027f9bb53" +dependencies = [ + "base64 0.22.1", + "bytes", + "futures", + "http 1.1.0", + "httparse", + "log", + "rand", + "sha1", +] + +[[package]] name = "solochain-template-node" -version = "0.0.0" +version = "0.1.0" dependencies = [ "clap 4.5.3", "frame-benchmarking-cli", @@ -19443,7 +19519,7 @@ dependencies = [ [[package]] name = "solochain-template-runtime" -version = "0.0.0" +version = "0.1.0" dependencies = [ "frame-benchmarking", "frame-executive", @@ -19472,8 +19548,7 @@ dependencies = [ "sp-offchain", "sp-runtime", "sp-session", - "sp-std 14.0.0", - "sp-storage 19.0.0", + "sp-storage", "sp-transaction-pool", "sp-version", "substrate-wasm-builder", @@ -19481,20 +19556,20 @@ dependencies = [ [[package]] name = "sp-api" -version = "26.0.0" +version = "34.0.0" dependencies = [ + "docify", "hash-db", "log", "parity-scale-codec", "scale-info", "sp-api-proc-macro", "sp-core", - "sp-externalities 0.25.0", + "sp-externalities", "sp-metadata-ir", "sp-runtime", - "sp-runtime-interface 24.0.0", + "sp-runtime-interface", "sp-state-machine", - "sp-std 14.0.0", "sp-test-primitives", "sp-trie", "sp-version", @@ -19503,7 +19578,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" -version = "15.0.0" +version = "20.0.0" dependencies = [ "Inflector", "assert_matches", @@ -19531,7 +19606,7 @@ dependencies = [ "sp-core", "sp-runtime", "sp-state-machine", - "sp-tracing 16.0.0", + "sp-tracing", "sp-version", "static_assertions", "substrate-test-runtime-client", @@ -19540,14 +19615,13 @@ dependencies = [ [[package]] name = "sp-application-crypto" -version = "30.0.0" +version = "38.0.0" dependencies = [ "parity-scale-codec", "scale-info", "serde", "sp-core", "sp-io", - "sp-std 14.0.0", ] [[package]] @@ -19563,7 +19637,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" -version = "23.0.0" +version = "26.0.0" dependencies = [ "criterion", "docify", @@ -19571,11 +19645,10 @@ dependencies = [ "num-traits", "parity-scale-codec", "primitive-types", - "rand 0.8.5", + "rand", "scale-info", "serde", "sp-crypto-hashing", - "sp-std 14.0.0", "static_assertions", ] @@ -19591,26 +19664,8 @@ dependencies = [ ] [[package]] -name = "sp-ark-bls12-381" -version = "0.4.2" -source = "git+https://github.com/paritytech/arkworks-substrate#caa2eed74beb885dd07c7db5f916f2281dad818f" -dependencies = [ - "ark-bls12-381-ext", - "sp-crypto-ec-utils 0.4.1", -] - -[[package]] -name = "sp-ark-ed-on-bls12-381-bandersnatch" -version = "0.4.2" -source = "git+https://github.com/paritytech/arkworks-substrate#caa2eed74beb885dd07c7db5f916f2281dad818f" -dependencies = [ - "ark-ed-on-bls12-381-bandersnatch-ext", - "sp-crypto-ec-utils 0.4.1", -] - -[[package]] name = "sp-authority-discovery" -version = "26.0.0" +version = "34.0.0" dependencies = [ "parity-scale-codec", "scale-info", @@ -19621,7 +19676,7 @@ dependencies = [ [[package]] name = "sp-block-builder" -version = "26.0.0" +version = "34.0.0" dependencies = [ "sp-api", "sp-inherents", @@ -19630,24 +19685,25 @@ dependencies = [ [[package]] name = "sp-blockchain" -version = "28.0.0" +version = "37.0.1" dependencies = [ "futures", - "log", "parity-scale-codec", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "schnellru", "sp-api", "sp-consensus", + "sp-core", "sp-database", "sp-runtime", "sp-state-machine", "thiserror", + "tracing", ] [[package]] name = "sp-consensus" -version = "0.32.0" +version = "0.40.0" dependencies = [ "async-trait", "futures", @@ -19662,7 +19718,7 @@ dependencies = [ [[package]] name = "sp-consensus-aura" -version = "0.32.0" +version = "0.40.0" dependencies = [ "async-trait", "parity-scale-codec", @@ -19677,7 +19733,7 @@ dependencies = [ [[package]] name = "sp-consensus-babe" -version = "0.32.0" +version = "0.40.0" dependencies = [ "async-trait", "parity-scale-codec", @@ -19694,7 +19750,7 @@ dependencies = [ [[package]] name = "sp-consensus-beefy" -version = "13.0.0" +version = "22.0.0" dependencies = [ "array-bytes", "lazy_static", @@ -19715,7 +19771,7 @@ dependencies = [ [[package]] name = "sp-consensus-grandpa" -version = "13.0.0" +version = "21.0.0" dependencies = [ "finality-grandpa", "log", @@ -19731,31 +19787,17 @@ dependencies = [ [[package]] name = "sp-consensus-pow" -version = "0.32.0" -dependencies = [ - "parity-scale-codec", - "sp-api", - "sp-core", - "sp-runtime", -] - -[[package]] -name = "sp-consensus-sassafras" -version = "0.3.4-dev" +version = "0.40.0" dependencies = [ "parity-scale-codec", - "scale-info", - "serde", "sp-api", - "sp-application-crypto", - "sp-consensus-slots", "sp-core", "sp-runtime", ] [[package]] name = "sp-consensus-slots" -version = "0.32.0" +version = "0.40.0" dependencies = [ "parity-scale-codec", "scale-info", @@ -19765,10 +19807,9 @@ dependencies = [ [[package]] name = "sp-core" -version = "28.0.0" +version = "34.0.0" dependencies = [ "array-bytes", - "bandersnatch_vrfs", "bitflags 1.3.2", "blake2 0.10.6", "bounded-collections", @@ -19788,10 +19829,10 @@ dependencies = [ "merlin", "parity-bip39", "parity-scale-codec", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "paste", "primitive-types", - "rand 0.8.5", + "rand", "regex", "scale-info", "schnorrkel 0.11.4", @@ -19800,11 +19841,11 @@ dependencies = [ "serde", "serde_json", "sp-crypto-hashing", - "sp-debug-derive 14.0.0", - "sp-externalities 0.25.0", - "sp-runtime-interface 24.0.0", - "sp-std 14.0.0", - "sp-storage 19.0.0", + "sp-debug-derive", + "sp-externalities", + "sp-runtime-interface", + "sp-std", + "sp-storage", "ss58-registry", "substrate-bip39", "thiserror", @@ -19815,7 +19856,7 @@ dependencies = [ [[package]] name = "sp-core-fuzz" -version = "0.0.0" +version = "0.1.0" dependencies = [ "lazy_static", "libfuzzer-sys", @@ -19825,42 +19866,21 @@ dependencies = [ [[package]] name = "sp-core-hashing" -version = "15.0.0" +version = "16.0.0" dependencies = [ "sp-crypto-hashing", ] [[package]] name = "sp-core-hashing-proc-macro" -version = "15.0.0" +version = "16.0.0" dependencies = [ "sp-crypto-hashing-proc-macro", ] [[package]] name = "sp-crypto-ec-utils" -version = "0.4.1" -source = "git+https://github.com/paritytech/polkadot-sdk#82912acb33a9030c0ef3bf590a34fca09b72dc5f" -dependencies = [ - "ark-bls12-377", - "ark-bls12-377-ext", - "ark-bls12-381", - "ark-bls12-381-ext", - "ark-bw6-761", - "ark-bw6-761-ext", - "ark-ec", - "ark-ed-on-bls12-377", - "ark-ed-on-bls12-377-ext", - "ark-ed-on-bls12-381-bandersnatch", - "ark-ed-on-bls12-381-bandersnatch-ext", - "ark-scale 0.0.11", - "sp-runtime-interface 17.0.0", - "sp-std 8.0.0", -] - -[[package]] -name = "sp-crypto-ec-utils" -version = "0.10.0" +version = "0.14.0" dependencies = [ "ark-bls12-377", "ark-bls12-377-ext", @@ -19873,8 +19893,8 @@ dependencies = [ "ark-ed-on-bls12-377-ext", "ark-ed-on-bls12-381-bandersnatch", "ark-ed-on-bls12-381-bandersnatch-ext", - "ark-scale 0.0.12", - "sp-runtime-interface 24.0.0", + "ark-scale", + "sp-runtime-interface", ] [[package]] @@ -19905,17 +19925,7 @@ name = "sp-database" version = "10.0.0" dependencies = [ "kvdb", - "parking_lot 0.12.1", -] - -[[package]] -name = "sp-debug-derive" -version = "8.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk#82912acb33a9030c0ef3bf590a34fca09b72dc5f" -dependencies = [ - "proc-macro2 1.0.82", - "quote 1.0.35", - "syn 2.0.61", + "parking_lot 0.12.3", ] [[package]] @@ -19929,27 +19939,16 @@ dependencies = [ [[package]] name = "sp-externalities" -version = "0.19.0" -source = "git+https://github.com/paritytech/polkadot-sdk#82912acb33a9030c0ef3bf590a34fca09b72dc5f" -dependencies = [ - "environmental", - "parity-scale-codec", - "sp-std 8.0.0", - "sp-storage 13.0.0", -] - -[[package]] -name = "sp-externalities" -version = "0.25.0" +version = "0.29.0" dependencies = [ "environmental", "parity-scale-codec", - "sp-storage 19.0.0", + "sp-storage", ] [[package]] name = "sp-genesis-builder" -version = "0.8.0" +version = "0.15.0" dependencies = [ "parity-scale-codec", "scale-info", @@ -19960,7 +19959,7 @@ dependencies = [ [[package]] name = "sp-inherents" -version = "26.0.0" +version = "34.0.0" dependencies = [ "async-trait", "futures", @@ -19973,10 +19972,11 @@ dependencies = [ [[package]] name = "sp-io" -version = "30.0.0" +version = "38.0.0" dependencies = [ "bytes", - "ed25519-dalek 2.1.1", + "docify", + "ed25519-dalek", "libsecp256k1", "log", "parity-scale-codec", @@ -19985,12 +19985,11 @@ dependencies = [ "secp256k1", "sp-core", "sp-crypto-hashing", - "sp-externalities 0.25.0", + "sp-externalities", "sp-keystore", - "sp-runtime-interface 24.0.0", + "sp-runtime-interface", "sp-state-machine", - "sp-std 14.0.0", - "sp-tracing 16.0.0", + "sp-tracing", "sp-trie", "tracing", "tracing-core", @@ -19998,7 +19997,7 @@ dependencies = [ [[package]] name = "sp-keyring" -version = "31.0.0" +version = "39.0.0" dependencies = [ "sp-core", "sp-runtime", @@ -20007,14 +20006,14 @@ dependencies = [ [[package]] name = "sp-keystore" -version = "0.34.0" +version = "0.40.0" dependencies = [ "parity-scale-codec", - "parking_lot 0.12.1", - "rand 0.8.5", - "rand_chacha 0.3.1", + "parking_lot 0.12.3", + "rand", + "rand_chacha", "sp-core", - "sp-externalities 0.25.0", + "sp-externalities", ] [[package]] @@ -20027,7 +20026,7 @@ dependencies = [ [[package]] name = "sp-metadata-ir" -version = "0.6.0" +version = "0.7.0" dependencies = [ "frame-metadata", "parity-scale-codec", @@ -20036,7 +20035,7 @@ dependencies = [ [[package]] name = "sp-mixnet" -version = "0.4.0" +version = "0.12.0" dependencies = [ "parity-scale-codec", "scale-info", @@ -20046,7 +20045,7 @@ dependencies = [ [[package]] name = "sp-mmr-primitives" -version = "26.0.0" +version = "34.0.0" dependencies = [ "array-bytes", "log", @@ -20056,17 +20055,17 @@ dependencies = [ "serde", "sp-api", "sp-core", - "sp-debug-derive 14.0.0", + "sp-debug-derive", "sp-runtime", "thiserror", ] [[package]] name = "sp-npos-elections" -version = "26.0.0" +version = "34.0.0" dependencies = [ "parity-scale-codec", - "rand 0.8.5", + "rand", "scale-info", "serde", "sp-arithmetic", @@ -20077,18 +20076,18 @@ dependencies = [ [[package]] name = "sp-npos-elections-fuzzer" -version = "2.0.0-alpha.5" +version = "2.0.0" dependencies = [ "clap 4.5.3", "honggfuzz", - "rand 0.8.5", + "rand", "sp-npos-elections", "sp-runtime", ] [[package]] name = "sp-offchain" -version = "26.0.0" +version = "34.0.0" dependencies = [ "sp-api", "sp-core", @@ -20106,7 +20105,7 @@ dependencies = [ [[package]] name = "sp-rpc" -version = "26.0.0" +version = "32.0.0" dependencies = [ "rustc-hash", "serde", @@ -20116,7 +20115,7 @@ dependencies = [ [[package]] name = "sp-runtime" -version = "31.0.1" +version = "39.0.0" dependencies = [ "docify", "either", @@ -20126,7 +20125,7 @@ dependencies = [ "num-traits", "parity-scale-codec", "paste", - "rand 0.8.5", + "rand", "scale-info", "serde", "serde_json", @@ -20137,34 +20136,17 @@ dependencies = [ "sp-core", "sp-io", "sp-state-machine", - "sp-std 14.0.0", - "sp-tracing 16.0.0", + "sp-std", + "sp-tracing", "sp-weights", "substrate-test-runtime-client", + "tracing", "zstd 0.12.4", ] [[package]] name = "sp-runtime-interface" -version = "17.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk#82912acb33a9030c0ef3bf590a34fca09b72dc5f" -dependencies = [ - "bytes", - "impl-trait-for-tuples", - "parity-scale-codec", - "primitive-types", - "sp-externalities 0.19.0", - "sp-runtime-interface-proc-macro 11.0.0", - "sp-std 8.0.0", - "sp-storage 13.0.0", - "sp-tracing 10.0.0", - "sp-wasm-interface 14.0.0", - "static_assertions", -] - -[[package]] -name = "sp-runtime-interface" -version = "24.0.0" +version = "28.0.0" dependencies = [ "bytes", "impl-trait-for-tuples", @@ -20173,34 +20155,22 @@ dependencies = [ "primitive-types", "rustversion", "sp-core", - "sp-externalities 0.25.0", + "sp-externalities", "sp-io", - "sp-runtime-interface-proc-macro 17.0.0", + "sp-runtime-interface-proc-macro", "sp-runtime-interface-test-wasm", "sp-state-machine", - "sp-std 14.0.0", - "sp-storage 19.0.0", - "sp-tracing 16.0.0", - "sp-wasm-interface 20.0.0", + "sp-std", + "sp-storage", + "sp-tracing", + "sp-wasm-interface", "static_assertions", "trybuild", ] [[package]] name = "sp-runtime-interface-proc-macro" -version = "11.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk#82912acb33a9030c0ef3bf590a34fca09b72dc5f" -dependencies = [ - "Inflector", - "proc-macro-crate 1.3.1", - "proc-macro2 1.0.82", - "quote 1.0.35", - "syn 2.0.61", -] - -[[package]] -name = "sp-runtime-interface-proc-macro" -version = "17.0.0" +version = "18.0.0" dependencies = [ "Inflector", "expander", @@ -20218,7 +20188,7 @@ dependencies = [ "sc-executor-common", "sp-io", "sp-runtime", - "sp-runtime-interface 24.0.0", + "sp-runtime-interface", "sp-runtime-interface-test-wasm", "sp-runtime-interface-test-wasm-deprecated", "sp-state-machine", @@ -20233,8 +20203,7 @@ dependencies = [ "bytes", "sp-core", "sp-io", - "sp-runtime-interface 24.0.0", - "sp-std 14.0.0", + "sp-runtime-interface", "substrate-wasm-builder", ] @@ -20244,13 +20213,13 @@ version = "2.0.0" dependencies = [ "sp-core", "sp-io", - "sp-runtime-interface 24.0.0", + "sp-runtime-interface", "substrate-wasm-builder", ] [[package]] name = "sp-session" -version = "27.0.0" +version = "35.0.0" dependencies = [ "parity-scale-codec", "scale-info", @@ -20263,7 +20232,7 @@ dependencies = [ [[package]] name = "sp-staking" -version = "26.0.0" +version = "34.0.0" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -20275,7 +20244,7 @@ dependencies = [ [[package]] name = "sp-state-machine" -version = "0.35.0" +version = "0.43.0" dependencies = [ "arbitrary", "array-bytes", @@ -20283,12 +20252,12 @@ dependencies = [ "hash-db", "log", "parity-scale-codec", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "pretty_assertions", - "rand 0.8.5", + "rand", "smallvec", "sp-core", - "sp-externalities 0.25.0", + "sp-externalities", "sp-panic-handler", "sp-runtime", "sp-trie", @@ -20299,58 +20268,40 @@ dependencies = [ [[package]] name = "sp-statement-store" -version = "10.0.0" +version = "18.0.0" dependencies = [ "aes-gcm", - "curve25519-dalek 4.1.2", - "ed25519-dalek 2.1.1", + "curve25519-dalek", + "ed25519-dalek", "hkdf", "parity-scale-codec", - "rand 0.8.5", + "rand", "scale-info", "sha2 0.10.8", "sp-api", "sp-application-crypto", "sp-core", "sp-crypto-hashing", - "sp-externalities 0.25.0", + "sp-externalities", "sp-runtime", - "sp-runtime-interface 24.0.0", + "sp-runtime-interface", "thiserror", - "x25519-dalek 2.0.0", + "x25519-dalek", ] [[package]] name = "sp-std" -version = "8.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk#82912acb33a9030c0ef3bf590a34fca09b72dc5f" - -[[package]] -name = "sp-std" version = "14.0.0" [[package]] name = "sp-storage" -version = "13.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk#82912acb33a9030c0ef3bf590a34fca09b72dc5f" -dependencies = [ - "impl-serde", - "parity-scale-codec", - "ref-cast", - "serde", - "sp-debug-derive 8.0.0", - "sp-std 8.0.0", -] - -[[package]] -name = "sp-storage" -version = "19.0.0" +version = "21.0.0" dependencies = [ "impl-serde", "parity-scale-codec", "ref-cast", "serde", - "sp-debug-derive 14.0.0", + "sp-debug-derive", ] [[package]] @@ -20367,7 +20318,7 @@ dependencies = [ [[package]] name = "sp-timestamp" -version = "26.0.0" +version = "34.0.0" dependencies = [ "async-trait", "parity-scale-codec", @@ -20378,29 +20329,17 @@ dependencies = [ [[package]] name = "sp-tracing" -version = "10.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk#82912acb33a9030c0ef3bf590a34fca09b72dc5f" -dependencies = [ - "parity-scale-codec", - "sp-std 8.0.0", - "tracing", - "tracing-core", - "tracing-subscriber 0.2.25", -] - -[[package]] -name = "sp-tracing" -version = "16.0.0" +version = "17.0.0" dependencies = [ "parity-scale-codec", "tracing", "tracing-core", - "tracing-subscriber 0.3.18", + "tracing-subscriber", ] [[package]] name = "sp-transaction-pool" -version = "26.0.0" +version = "34.0.0" dependencies = [ "sp-api", "sp-runtime", @@ -20408,7 +20347,7 @@ dependencies = [ [[package]] name = "sp-transaction-storage-proof" -version = "26.0.0" +version = "34.0.0" dependencies = [ "async-trait", "parity-scale-codec", @@ -20421,9 +20360,9 @@ dependencies = [ [[package]] name = "sp-trie" -version = "29.0.0" +version = "37.0.0" dependencies = [ - "ahash 0.8.8", + "ahash 0.8.11", "array-bytes", "criterion", "hash-db", @@ -20431,12 +20370,12 @@ dependencies = [ "memory-db", "nohash-hasher", "parity-scale-codec", - "parking_lot 0.12.1", - "rand 0.8.5", + "parking_lot 0.12.3", + "rand", "scale-info", "schnellru", "sp-core", - "sp-externalities 0.25.0", + "sp-externalities", "sp-runtime", "thiserror", "tracing", @@ -20448,7 +20387,7 @@ dependencies = [ [[package]] name = "sp-version" -version = "29.0.0" +version = "37.0.0" dependencies = [ "impl-serde", "parity-scale-codec", @@ -20457,14 +20396,14 @@ dependencies = [ "serde", "sp-crypto-hashing-proc-macro", "sp-runtime", - "sp-std 14.0.0", + "sp-std", "sp-version-proc-macro", "thiserror", ] [[package]] name = "sp-version-proc-macro" -version = "13.0.0" +version = "14.0.0" dependencies = [ "parity-scale-codec", "proc-macro2 1.0.82", @@ -20475,20 +20414,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" -version = "14.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk#82912acb33a9030c0ef3bf590a34fca09b72dc5f" -dependencies = [ - "anyhow", - "impl-trait-for-tuples", - "log", - "parity-scale-codec", - "sp-std 8.0.0", - "wasmtime", -] - -[[package]] -name = "sp-wasm-interface" -version = "20.0.0" +version = "21.0.0" dependencies = [ "anyhow", "impl-trait-for-tuples", @@ -20499,7 +20425,7 @@ dependencies = [ [[package]] name = "sp-weights" -version = "27.0.0" +version = "31.0.0" dependencies = [ "bounded-collections", "parity-scale-codec", @@ -20508,7 +20434,7 @@ dependencies = [ "serde", "smallvec", "sp-arithmetic", - "sp-debug-derive 14.0.0", + "sp-debug-derive", ] [[package]] @@ -20590,18 +20516,18 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] name = "staging-chain-spec-builder" -version = "1.6.1" +version = "5.0.0" dependencies = [ "clap 4.5.3", "log", "sc-chain-spec", "serde_json", - "sp-tracing 16.0.0", + "sp-tracing", ] [[package]] name = "staging-node-cli" -version = "3.0.0-dev" +version = "3.0.0" dependencies = [ "array-bytes", "assert_cmd", @@ -20619,13 +20545,13 @@ dependencies = [ "parity-scale-codec", "platforms", "polkadot-sdk", - "rand 0.8.5", + "rand", "regex", "sc-service-test", "scale-info", "serde", "serde_json", - "soketto", + "soketto 0.7.1", "staging-node-inspect", "substrate-cli-test-utils", "tempfile", @@ -20637,7 +20563,7 @@ dependencies = [ [[package]] name = "staging-node-inspect" -version = "0.12.0" +version = "0.22.0" dependencies = [ "clap 4.5.3", "parity-scale-codec", @@ -20654,7 +20580,7 @@ dependencies = [ [[package]] name = "staging-parachain-info" -version = "0.7.0" +version = "0.16.0" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -20662,7 +20588,6 @@ dependencies = [ "parity-scale-codec", "scale-info", "sp-runtime", - "sp-std 14.0.0", ] [[package]] @@ -20671,7 +20596,7 @@ version = "2.0.0" [[package]] name = "staging-xcm" -version = "7.0.0" +version = "14.1.0" dependencies = [ "array-bytes", "bounded-collections", @@ -20692,7 +20617,7 @@ dependencies = [ [[package]] name = "staging-xcm-builder" -version = "7.0.0" +version = "16.0.0" dependencies = [ "assert_matches", "frame-support", @@ -20714,7 +20639,6 @@ dependencies = [ "sp-arithmetic", "sp-io", "sp-runtime", - "sp-std 14.0.0", "sp-weights", "staging-xcm", "staging-xcm-executor", @@ -20722,22 +20646,21 @@ dependencies = [ [[package]] name = "staging-xcm-executor" -version = "7.0.0" +version = "16.0.0" dependencies = [ "environmental", "frame-benchmarking", "frame-support", "impl-trait-for-tuples", - "log", "parity-scale-codec", "scale-info", "sp-arithmetic", "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", "sp-weights", "staging-xcm", + "tracing", ] [[package]] @@ -20795,16 +20718,14 @@ dependencies = [ ] [[package]] -name = "strobe-rs" -version = "0.8.1" +name = "string-interner" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fabb238a1cccccfa4c4fb703670c0d157e1256c1ba695abf1b93bd2bb14bab2d" +checksum = "1c6a0d765f5807e98a091107bae0a56ea3799f66a5de47b2c84c94a39c09974e" dependencies = [ - "bitflags 1.3.2", - "byteorder", - "keccak", - "subtle 2.5.0", - "zeroize", + "cfg-if", + "hashbrown 0.14.3", + "serde", ] [[package]] @@ -20914,7 +20835,7 @@ dependencies = [ [[package]] name = "subkey" -version = "9.0.0" +version = "19.0.0" dependencies = [ "clap 4.5.3", "sc-cli", @@ -20922,7 +20843,7 @@ dependencies = [ [[package]] name = "substrate-bip39" -version = "0.4.7" +version = "0.6.0" dependencies = [ "bip39", "hmac 0.12.1", @@ -20956,7 +20877,7 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-support" -version = "29.0.0" +version = "39.0.0" dependencies = [ "frame-support", "frame-system", @@ -20967,15 +20888,16 @@ dependencies = [ "serde", "sp-core", "sp-runtime", - "sp-storage 19.0.0", + "sp-storage", "tokio", ] [[package]] name = "substrate-frame-rpc-system" -version = "28.0.0" +version = "38.0.0" dependencies = [ "assert_matches", + "docify", "frame-system-rpc-runtime-api", "futures", "jsonrpsee", @@ -20989,7 +20911,7 @@ dependencies = [ "sp-blockchain", "sp-core", "sp-runtime", - "sp-tracing 16.0.0", + "sp-tracing", "substrate-test-runtime-client", "tokio", ] @@ -20998,7 +20920,9 @@ dependencies = [ name = "substrate-prometheus-endpoint" version = "0.17.0" dependencies = [ - "hyper", + "http-body-util", + "hyper 1.3.1", + "hyper-util", "log", "prometheus", "thiserror", @@ -21018,9 +20942,7 @@ dependencies = [ "bp-polkadot-core", "bp-relayers", "bp-runtime", - "bridge-runtime-common", "equivocation-detector", - "finality-grandpa", "finality-relay", "frame-support", "frame-system", @@ -21040,9 +20962,11 @@ dependencies = [ "rbtag", "relay-substrate-client", "relay-utils", + "scale-info", "sp-consensus-grandpa", "sp-core", "sp-runtime", + "sp-trie", "structopt", "strum 0.26.2", "thiserror", @@ -21050,7 +20974,7 @@ dependencies = [ [[package]] name = "substrate-rpc-client" -version = "0.33.0" +version = "0.43.0" dependencies = [ "async-trait", "jsonrpsee", @@ -21064,7 +20988,7 @@ dependencies = [ [[package]] name = "substrate-state-trie-migration-rpc" -version = "27.0.0" +version = "37.0.0" dependencies = [ "jsonrpsee", "parity-scale-codec", @@ -21116,7 +21040,6 @@ dependencies = [ "frame-system", "frame-system-rpc-runtime-api", "futures", - "hex-literal", "log", "pallet-babe", "pallet-balances", @@ -21139,7 +21062,7 @@ dependencies = [ "sp-consensus-grandpa", "sp-core", "sp-crypto-hashing", - "sp-externalities 0.25.0", + "sp-externalities", "sp-genesis-builder", "sp-inherents", "sp-io", @@ -21148,12 +21071,13 @@ dependencies = [ "sp-runtime", "sp-session", "sp-state-machine", - "sp-tracing 16.0.0", + "sp-tracing", "sp-transaction-pool", "sp-trie", "sp-version", "substrate-test-runtime-client", "substrate-wasm-builder", + "tracing", "trie-db", ] @@ -21180,7 +21104,7 @@ version = "2.0.0" dependencies = [ "futures", "parity-scale-codec", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "sc-transaction-pool", "sc-transaction-pool-api", "sp-blockchain", @@ -21191,7 +21115,7 @@ dependencies = [ [[package]] name = "substrate-test-utils" -version = "4.0.0-dev" +version = "3.0.0" dependencies = [ "futures", "sc-service", @@ -21201,7 +21125,7 @@ dependencies = [ [[package]] name = "substrate-wasm-builder" -version = "17.0.0" +version = "24.0.0" dependencies = [ "array-bytes", "build-helper", @@ -21217,7 +21141,7 @@ dependencies = [ "sp-core", "sp-io", "sp-maybe-compressed-blob", - "sp-tracing 16.0.0", + "sp-tracing", "sp-version", "strum 0.26.2", "tempfile", @@ -21393,6 +21317,17 @@ dependencies = [ ] [[package]] +name = "synstructure" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" +dependencies = [ + "proc-macro2 1.0.82", + "quote 1.0.35", + "syn 2.0.61", +] + +[[package]] name = "sysinfo" version = "0.30.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -21497,7 +21432,7 @@ checksum = "3dffced63c2b5c7be278154d76b479f9f9920ed34e7574201407f0b14e2bbb93" dependencies = [ "env_logger 0.11.3", "test-log-macros", - "tracing-subscriber 0.3.18", + "tracing-subscriber", ] [[package]] @@ -21513,13 +21448,12 @@ dependencies = [ [[package]] name = "test-parachain-adder" -version = "1.0.0" +version = "0.1.0" dependencies = [ "dlmalloc", "parity-scale-codec", "polkadot-parachain-primitives", "sp-io", - "sp-std 14.0.0", "substrate-wasm-builder", "tiny-keccak", ] @@ -21552,7 +21486,7 @@ dependencies = [ [[package]] name = "test-parachain-halt" -version = "1.0.0" +version = "0.1.0" dependencies = [ "rustversion", "substrate-wasm-builder", @@ -21567,7 +21501,6 @@ dependencies = [ "parity-scale-codec", "polkadot-parachain-primitives", "sp-io", - "sp-std 14.0.0", "substrate-wasm-builder", "tiny-keccak", ] @@ -21621,7 +21554,7 @@ dependencies = [ [[package]] name = "testnet-parachains-constants" -version = "1.0.0" +version = "9.0.0" dependencies = [ "cumulus-primitives-core", "frame-support", @@ -21759,14 +21692,16 @@ dependencies = [ [[package]] name = "time" -version = "0.3.27" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bb39ee79a6d8de55f48f2293a830e040392f1c5f16e336bdd1788cd0aadce07" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ "deranged", "itoa", "libc", + "num-conv", "num_threads", + "powerfmt", "serde", "time-core", "time-macros", @@ -21774,16 +21709,17 @@ dependencies = [ [[package]] name = "time-core" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.13" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "733d258752e9303d392b94b75230d07b0b9c489350c69b851fc6c065fde3e8f9" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" dependencies = [ + "num-conv", "time-core", ] @@ -21832,10 +21768,10 @@ dependencies = [ "libc", "mio", "num_cpus", - "parking_lot 0.12.1", - "pin-project-lite 0.2.12", + "parking_lot 0.12.3", + "pin-project-lite", "signal-hook-registry", - "socket2 0.5.6", + "socket2 0.5.7", "tokio-macros", "windows-sys 0.48.0", ] @@ -21858,7 +21794,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f57eb36ecbe0fc510036adff84824dd3c24bb781e21bfa67b69d556aa85214f" dependencies = [ "pin-project", - "rand 0.8.5", + "rand", "tokio", ] @@ -21868,17 +21804,17 @@ version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ - "rustls 0.21.6", + "rustls 0.21.7", "tokio", ] [[package]] name = "tokio-rustls" -version = "0.25.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" +checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" dependencies = [ - "rustls 0.22.2", + "rustls 0.23.10", "rustls-pki-types", "tokio", ] @@ -21890,7 +21826,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" dependencies = [ "futures-core", - "pin-project-lite 0.2.12", + "pin-project-lite", "tokio", "tokio-util", ] @@ -21916,7 +21852,7 @@ checksum = "212d5dcb2a1ce06d81107c3d0ffa3121fe974b73f068c8282cb1c32328113b6c" dependencies = [ "futures-util", "log", - "rustls 0.21.6", + "rustls 0.21.7", "rustls-native-certs 0.6.3", "tokio", "tokio-rustls 0.24.1", @@ -21933,7 +21869,7 @@ dependencies = [ "futures-core", "futures-io", "futures-sink", - "pin-project-lite 0.2.12", + "pin-project-lite", "tokio", ] @@ -22000,7 +21936,8 @@ dependencies = [ "futures-core", "futures-util", "pin-project", - "pin-project-lite 0.2.12", + "pin-project-lite", + "tokio", "tower-layer", "tower-service", "tracing", @@ -22008,18 +21945,16 @@ dependencies = [ [[package]] name = "tower-http" -version = "0.4.3" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55ae70283aba8d2a8b411c695c437fe25b8b5e44e23e780662002fc72fb47a82" +checksum = "1e9cd434a998747dd2c4276bc96ee2e0c7a2eadf3cae88e52be55a05fa9053f5" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.6.0", "bytes", - "futures-core", - "futures-util", - "http", - "http-body", - "http-range-header", - "pin-project-lite 0.2.12", + "http 1.1.0", + "http-body 1.0.0", + "http-body-util", + "pin-project-lite", "tower-layer", "tower-service", ] @@ -22043,7 +21978,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ "log", - "pin-project-lite 0.2.12", + "pin-project-lite", "tracing-attributes", "tracing-core", ] @@ -22081,7 +22016,7 @@ dependencies = [ [[package]] name = "tracing-gum" -version = "7.0.0" +version = "15.0.0" dependencies = [ "coarsetime", "polkadot-primitives", @@ -22103,17 +22038,6 @@ dependencies = [ [[package]] name = "tracing-log" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" -dependencies = [ - "lazy_static", - "log", - "tracing-core", -] - -[[package]] -name = "tracing-log" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" @@ -22124,55 +22048,23 @@ dependencies = [ ] [[package]] -name = "tracing-serde" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc6b213177105856957181934e4920de57730fc69bf42c37ee5bb664d406d9e1" -dependencies = [ - "serde", - "tracing-core", -] - -[[package]] -name = "tracing-subscriber" -version = "0.2.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e0d2eaa99c3c2e41547cfa109e910a68ea03823cccad4a0525dcbc9b01e8c71" -dependencies = [ - "ansi_term", - "chrono", - "lazy_static", - "matchers 0.0.1", - "regex", - "serde", - "serde_json", - "sharded-slab", - "smallvec", - "thread_local", - "tracing", - "tracing-core", - "tracing-log 0.1.3", - "tracing-serde", -] - -[[package]] name = "tracing-subscriber" version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" dependencies = [ "chrono", - "matchers 0.1.0", + "matchers", "nu-ansi-term", "once_cell", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "regex", "sharded-slab", "smallvec", "thread_local", "tracing", "tracing-core", - "tracing-log 0.2.0", + "tracing-log", ] [[package]] @@ -22238,7 +22130,7 @@ dependencies = [ "idna 0.2.3", "ipnet", "lazy_static", - "rand 0.8.5", + "rand", "smallvec", "socket2 0.4.9", "thiserror", @@ -22264,7 +22156,7 @@ dependencies = [ "idna 0.4.0", "ipnet", "once_cell", - "rand 0.8.5", + "rand", "smallvec", "thiserror", "tinyvec", @@ -22275,26 +22167,6 @@ dependencies = [ [[package]] name = "trust-dns-resolver" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aff21aa4dcefb0a1afbfac26deb0adc93888c7d295fb63ab273ef276ba2b7cfe" -dependencies = [ - "cfg-if", - "futures-util", - "ipconfig", - "lazy_static", - "lru-cache", - "parking_lot 0.12.1", - "resolv-conf", - "smallvec", - "thiserror", - "tokio", - "tracing", - "trust-dns-proto 0.22.0", -] - -[[package]] -name = "trust-dns-resolver" version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "10a3e6c3aff1718b3c73e395d1f35202ba2ffa847c6a62eea0db8fb4cfe30be6" @@ -22304,8 +22176,8 @@ dependencies = [ "ipconfig", "lru-cache", "once_cell", - "parking_lot 0.12.1", - "rand 0.8.5", + "parking_lot 0.12.3", + "rand", "resolv-conf", "smallvec", "thiserror", @@ -22351,11 +22223,11 @@ dependencies = [ "byteorder", "bytes", "data-encoding", - "http", + "http 0.2.9", "httparse", "log", - "rand 0.8.5", - "rustls 0.21.6", + "rand", + "rustls 0.21.7", "sha1", "thiserror", "url", @@ -22376,7 +22248,7 @@ checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" dependencies = [ "cfg-if", "digest 0.10.7", - "rand 0.8.5", + "rand", "static_assertions", ] @@ -22481,6 +22353,15 @@ dependencies = [ "bytes", "futures-io", "futures-util", +] + +[[package]] +name = "unsigned-varint" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb066959b24b5196ae73cb057f45598450d2c5f71460e98c49b738086eff9c06" +dependencies = [ + "bytes", "tokio-util", ] @@ -22498,12 +22379,12 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "url" -version = "2.4.0" +version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" dependencies = [ "form_urlencoded", - "idna 0.4.0", + "idna 0.5.0", "percent-encoding", ] @@ -22606,9 +22487,9 @@ dependencies = [ "arrayref", "constcat", "digest 0.10.7", - "rand 0.8.5", - "rand_chacha 0.3.1", - "rand_core 0.6.4", + "rand", + "rand_chacha", + "rand_core", "sha2 0.10.8", "sha3", "thiserror", @@ -22651,12 +22532,6 @@ dependencies = [ [[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.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" @@ -22835,7 +22710,24 @@ dependencies = [ "smallvec", "spin 0.9.8", "wasmi_arena", - "wasmi_core", + "wasmi_core 0.13.0", + "wasmparser-nostd", +] + +[[package]] +name = "wasmi" +version = "0.32.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50386c99b9c32bd2ed71a55b6dd4040af2580530fae8bdb9a6576571a80d0cca" +dependencies = [ + "arrayvec 0.7.4", + "multi-stash", + "num-derive", + "num-traits", + "smallvec", + "spin 0.9.8", + "wasmi_collections", + "wasmi_core 0.32.3", "wasmparser-nostd", ] @@ -22846,6 +22738,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "104a7f73be44570cac297b3035d76b169d6599637631cf37a1703326a0727073" [[package]] +name = "wasmi_collections" +version = "0.32.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c128c039340ffd50d4195c3f8ce31aac357f06804cfc494c8b9508d4b30dca4" +dependencies = [ + "ahash 0.8.11", + "hashbrown 0.14.3", + "string-interner", +] + +[[package]] name = "wasmi_core" version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -22858,6 +22761,18 @@ dependencies = [ ] [[package]] +name = "wasmi_core" +version = "0.32.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a23b3a7f6c8c3ceeec6b83531ee61f0013c56e51cbf2b14b0f213548b23a4b41" +dependencies = [ + "downcast-rs", + "libm", + "num-traits", + "paste", +] + +[[package]] name = "wasmparser" version = "0.102.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -22869,9 +22784,9 @@ dependencies = [ [[package]] name = "wasmparser-nostd" -version = "0.100.1" +version = "0.100.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9157cab83003221bfd385833ab587a039f5d6fa7304854042ba358a3b09e0724" +checksum = "d5a015fe95f3504a94bb1462c717aae75253e39b9dd6c3fb1062c934535c64aa" dependencies = [ "indexmap-nostd", ] @@ -23051,7 +22966,7 @@ dependencies = [ "memfd", "memoffset 0.8.0", "paste", - "rand 0.8.5", + "rand", "rustix 0.36.15", "wasmtime-asm-macros", "wasmtime-environ", @@ -23114,22 +23029,22 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.22.6" +version = "0.25.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87" -dependencies = [ - "webpki", -] +checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc" [[package]] name = "webpki-roots" -version = "0.25.2" +version = "0.26.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc" +checksum = "bd7c23921eeb1713a4e851530e9b9756e4fb0e89978582942612524cf09f01cd" +dependencies = [ + "rustls-pki-types", +] [[package]] name = "westend-emulated-chain" -version = "0.0.0" +version = "0.1.0" dependencies = [ "emulated-integration-tests-common", "pallet-staking", @@ -23144,12 +23059,12 @@ dependencies = [ "staging-xcm", "westend-runtime", "westend-runtime-constants", - "xcm-fee-payment-runtime-api", + "xcm-runtime-apis", ] [[package]] name = "westend-runtime" -version = "7.0.0" +version = "17.0.0" dependencies = [ "binary-merkle-tree", "bitvec", @@ -23221,7 +23136,6 @@ dependencies = [ "polkadot-primitives", "polkadot-runtime-common", "polkadot-runtime-parachains", - "rustc-hex", "scale-info", "serde", "serde_derive", @@ -23245,9 +23159,8 @@ dependencies = [ "sp-runtime", "sp-session", "sp-staking", - "sp-std 14.0.0", - "sp-storage 19.0.0", - "sp-tracing 16.0.0", + "sp-storage", + "sp-tracing", "sp-transaction-pool", "sp-version", "staging-xcm", @@ -23257,12 +23170,12 @@ dependencies = [ "tiny-keccak", "tokio", "westend-runtime-constants", - "xcm-fee-payment-runtime-api", + "xcm-runtime-apis", ] [[package]] name = "westend-runtime-constants" -version = "7.0.0" +version = "16.0.0" dependencies = [ "frame-support", "polkadot-primitives", @@ -23277,7 +23190,7 @@ dependencies = [ [[package]] name = "westend-system-emulated-network" -version = "0.0.0" +version = "0.1.0" dependencies = [ "asset-hub-westend-emulated-chain", "bridge-hub-westend-emulated-chain", @@ -23348,23 +23261,20 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows" -version = "0.34.0" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45296b64204227616fdbf2614cefa4c236b98ee64dfaaaa435207ed99fe7829f" +checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" dependencies = [ - "windows_aarch64_msvc 0.34.0", - "windows_i686_gnu 0.34.0", - "windows_i686_msvc 0.34.0", - "windows_x86_64_gnu 0.34.0", - "windows_x86_64_msvc 0.34.0", + "windows-targets 0.48.5", ] [[package]] name = "windows" -version = "0.48.0" +version = "0.51.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9" dependencies = [ + "windows-core 0.51.1", "windows-targets 0.48.5", ] @@ -23374,12 +23284,21 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" dependencies = [ - "windows-core", + "windows-core 0.52.0", "windows-targets 0.52.0", ] [[package]] name = "windows-core" +version = "0.51.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-core" version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" @@ -23494,12 +23413,6 @@ checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" [[package]] name = "windows_aarch64_msvc" -version = "0.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17cffbe740121affb56fad0fc0e421804adf0ae00891205213b5cecd30db881d" - -[[package]] -name = "windows_aarch64_msvc" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" @@ -23518,12 +23431,6 @@ checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" [[package]] name = "windows_i686_gnu" -version = "0.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2564fde759adb79129d9b4f54be42b32c89970c18ebf93124ca8870a498688ed" - -[[package]] -name = "windows_i686_gnu" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" @@ -23542,12 +23449,6 @@ checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" [[package]] name = "windows_i686_msvc" -version = "0.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cd9d32ba70453522332c14d38814bceeb747d80b3958676007acadd7e166956" - -[[package]] -name = "windows_i686_msvc" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" @@ -23566,12 +23467,6 @@ checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" [[package]] name = "windows_x86_64_gnu" -version = "0.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfce6deae227ee8d356d19effc141a509cc503dfd1f850622ec4b0f84428e1f4" - -[[package]] -name = "windows_x86_64_gnu" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" @@ -23608,12 +23503,6 @@ checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" [[package]] name = "windows_x86_64_msvc" -version = "0.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d19538ccc21819d01deaf88d6a17eae6596a12e9aafdbb97916fb49896d89de9" - -[[package]] -name = "windows_x86_64_msvc" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" @@ -23660,40 +23549,28 @@ dependencies = [ [[package]] name = "x25519-dalek" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a0c105152107e3b96f6a00a65e86ce82d9b125230e1c4302940eca58ff71f4f" -dependencies = [ - "curve25519-dalek 3.2.0", - "rand_core 0.5.1", - "zeroize", -] - -[[package]] -name = "x25519-dalek" version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb66477291e7e8d2b0ff1bcb900bf29489a9692816d79874bea351e7a8b6de96" dependencies = [ - "curve25519-dalek 4.1.2", - "rand_core 0.6.4", + "curve25519-dalek", + "rand_core", "serde", "zeroize", ] [[package]] name = "x509-parser" -version = "0.14.0" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0ecbeb7b67ce215e40e3cc7f2ff902f94a223acf44995934763467e7b1febc8" +checksum = "7069fba5b66b9193bd2c5d3d4ff12b839118f6bcbef5328efafafb5395cf63da" dependencies = [ - "asn1-rs", - "base64 0.13.1", + "asn1-rs 0.5.2", "data-encoding", - "der-parser", + "der-parser 8.2.0", "lazy_static", "nom", - "oid-registry", + "oid-registry 0.6.1", "rusticata-macros", "thiserror", "time", @@ -23701,16 +23578,16 @@ dependencies = [ [[package]] name = "x509-parser" -version = "0.15.1" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7069fba5b66b9193bd2c5d3d4ff12b839118f6bcbef5328efafafb5395cf63da" +checksum = "fcbc162f30700d6f3f82a24bf7cc62ffe7caea42c0b2cba8bf7f3ae50cf51f69" dependencies = [ - "asn1-rs", + "asn1-rs 0.6.1", "data-encoding", - "der-parser", + "der-parser 9.0.0", "lazy_static", "nom", - "oid-registry", + "oid-registry 0.7.0", "rusticata-macros", "thiserror", "time", @@ -23742,7 +23619,7 @@ dependencies = [ "simple-mermaid 0.1.0", "sp-io", "sp-runtime", - "sp-std 14.0.0", + "sp-std", "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", @@ -23752,7 +23629,7 @@ dependencies = [ [[package]] name = "xcm-emulator" -version = "0.5.0" +version = "0.15.0" dependencies = [ "cumulus-pallet-parachain-system", "cumulus-pallet-xcmp-queue", @@ -23777,8 +23654,8 @@ dependencies = [ "sp-crypto-hashing", "sp-io", "sp-runtime", - "sp-std 14.0.0", - "sp-tracing 16.0.0", + "sp-std", + "sp-tracing", "staging-xcm", "staging-xcm-executor", ] @@ -23802,19 +23679,32 @@ dependencies = [ "sp-keyring", "sp-runtime", "sp-state-machine", - "sp-tracing 16.0.0", + "sp-tracing", "staging-xcm", "staging-xcm-executor", ] [[package]] -name = "xcm-fee-payment-runtime-api" -version = "0.1.0" +name = "xcm-procedural" +version = "10.1.0" dependencies = [ - "env_logger 0.9.3", + "Inflector", + "proc-macro2 1.0.82", + "quote 1.0.35", + "staging-xcm", + "syn 2.0.61", + "trybuild", +] + +[[package]] +name = "xcm-runtime-apis" +version = "0.3.0" +dependencies = [ + "env_logger 0.11.3", "frame-executive", "frame-support", "frame-system", + "hex-literal", "log", "pallet-assets", "pallet-balances", @@ -23823,8 +23713,6 @@ dependencies = [ "scale-info", "sp-api", "sp-io", - "sp-runtime", - "sp-std 14.0.0", "sp-weights", "staging-xcm", "staging-xcm-builder", @@ -23832,20 +23720,8 @@ dependencies = [ ] [[package]] -name = "xcm-procedural" -version = "7.0.0" -dependencies = [ - "Inflector", - "proc-macro2 1.0.82", - "quote 1.0.35", - "staging-xcm", - "syn 2.0.61", - "trybuild", -] - -[[package]] name = "xcm-simulator" -version = "7.0.0" +version = "16.0.0" dependencies = [ "frame-support", "frame-system", @@ -23858,7 +23734,7 @@ dependencies = [ "scale-info", "sp-io", "sp-runtime", - "sp-std 14.0.0", + "sp-std", "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", @@ -23866,7 +23742,7 @@ dependencies = [ [[package]] name = "xcm-simulator-example" -version = "7.0.0" +version = "16.0.0" dependencies = [ "frame-support", "frame-system", @@ -23883,8 +23759,8 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", - "sp-tracing 16.0.0", + "sp-std", + "sp-tracing", "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", @@ -23912,7 +23788,7 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", - "sp-std 14.0.0", + "sp-std", "staging-xcm", "staging-xcm-builder", "staging-xcm-executor", @@ -23920,16 +23796,32 @@ dependencies = [ ] [[package]] +name = "xml-rs" +version = "0.8.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "791978798f0597cfc70478424c2b4fdc2b7a8024aaff78497ef00f24ef674193" + +[[package]] +name = "xmltree" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7d8a75eaf6557bb84a65ace8609883db44a29951042ada9b393151532e41fcb" +dependencies = [ + "xml-rs", +] + +[[package]] name = "yamux" -version = "0.10.2" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5d9ba232399af1783a58d8eb26f6b5006fbefe2dc9ef36bd283324792d03ea5" +checksum = "9ed0164ae619f2dc144909a9f082187ebb5893693d8c0196e8085283ccd4b776" dependencies = [ "futures", "log", "nohash-hasher", - "parking_lot 0.12.1", - "rand 0.8.5", + "parking_lot 0.12.3", + "pin-project", + "rand", "static_assertions", ] @@ -23970,9 +23862,9 @@ dependencies = [ [[package]] name = "zeroize" -version = "1.7.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" dependencies = [ "zeroize_derive", ] diff --git a/pkgs/applications/blockchains/polkadot/default.nix b/pkgs/applications/blockchains/polkadot/default.nix index 6af16ffac8a46..65e945d77d306 100644 --- a/pkgs/applications/blockchains/polkadot/default.nix +++ b/pkgs/applications/blockchains/polkadot/default.nix @@ -17,13 +17,13 @@ let in rustPlatform.buildRustPackage rec { pname = "polkadot"; - version = "1.13.0"; + version = "stable2407-2"; src = fetchFromGitHub { owner = "paritytech"; repo = "polkadot-sdk"; - rev = "polkadot-v${version}"; - hash = "sha256-9ZjiKv+05//Kf6q3mL1P5kOCOm1KCGmQIZkrD54pyeI="; + rev = "polkadot-${version}"; + hash = "sha256-4WOoFjihzErc6lIgiWvLg6fqDOxs1A+A0ERvu/D8btw="; # the build process of polkadot requires a .git folder in order to determine # the git commit hash that is being built and add it to the version string. @@ -47,12 +47,7 @@ rustPlatform.buildRustPackage rec { cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "ark-secret-scalar-0.0.2" = "sha256-91sODxaj0psMw0WqigMCGO5a7+NenAsRj5ZmW6C7lvc="; - "common-0.1.0" = "sha256-LHz2dK1p8GwyMimlR7AxHLz1tjTYolPwdjP7pxork1o="; - "fflonk-0.1.0" = "sha256-+BvZ03AhYNP0D8Wq9EMsP+lSgPA6BBlnWkoxTffVLwo="; "simple-mermaid-0.1.0" = "sha256-IekTldxYq+uoXwGvbpkVTXv2xrcZ0TQfyyE2i2zH+6w="; - "sp-ark-bls12-381-0.4.2" = "sha256-nNr0amKhSvvI9BlsoP+8v6Xppx/s7zkf0l9Lm3DW8w8="; - "sp-crypto-ec-utils-0.4.1" = "sha256-/Sw1ZM/JcJBokFE4y2mv/P43ciTL5DEm0PDG0jZvMkI="; }; }; @@ -74,8 +69,8 @@ rustPlatform.buildRustPackage rec { # NOTE: jemalloc is used by default on Linux with unprefixed enabled buildInputs = [ openssl ] ++ - lib.optionals stdenv.isLinux [ rust-jemalloc-sys-unprefixed ] ++ - lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; + lib.optionals stdenv.hostPlatform.isLinux [ rust-jemalloc-sys-unprefixed ] ++ + lib.optionals stdenv.hostPlatform.isDarwin [ Security SystemConfiguration ]; # NOTE: disable building `core`/`std` in wasm environment since rust-src isn't # available for `rustc-wasm32` @@ -92,8 +87,5 @@ rustPlatform.buildRustPackage rec { maintainers = with maintainers; [ akru andresilva FlorianFranzen RaghavSood ]; # See Iso::from_arch in src/isa/mod.rs in cranelift-codegen-meta. platforms = intersectLists platforms.unix (platforms.aarch64 ++ platforms.s390x ++ platforms.riscv64 ++ platforms.x86); - # See comment about wasm32-unknown-unknown in rustc.nix. - broken = lib.any (a: lib.hasAttr a stdenv.hostPlatform.gcc) [ "cpu" "float-abi" "fpu" ] || - !stdenv.hostPlatform.gcc.thumb or true; }; } diff --git a/pkgs/applications/blockchains/quorum/default.nix b/pkgs/applications/blockchains/quorum/default.nix index 23e1d92a83143..ca323bba3a7bb 100644 --- a/pkgs/applications/blockchains/quorum/default.nix +++ b/pkgs/applications/blockchains/quorum/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, buildGoModule }: +{ lib, fetchFromGitHub, buildGoModule, nixosTests }: buildGoModule rec { pname = "quorum"; @@ -20,6 +20,8 @@ buildGoModule rec { ldflags = [ "-s" "-w" ]; + passthru.tests = { inherit (nixosTests) quorum; }; + meta = with lib; { description = "Permissioned implementation of Ethereum supporting data privacy"; homepage = "https://consensys.net/quorum/"; diff --git a/pkgs/applications/blockchains/snarkos/default.nix b/pkgs/applications/blockchains/snarkos/default.nix index 8e6fb1b388937..0cebbecc03095 100644 --- a/pkgs/applications/blockchains/snarkos/default.nix +++ b/pkgs/applications/blockchains/snarkos/default.nix @@ -6,7 +6,6 @@ , curl , pkg-config , openssl -, llvmPackages }: rustPlatform.buildRustPackage rec { pname = "snarkos"; @@ -23,7 +22,7 @@ rustPlatform.buildRustPackage rec { # buildAndTestSubdir = "cli"; - nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config rustPlatform.bindgenHook ]; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config rustPlatform.bindgenHook ]; # Needed to get openssl-sys to use pkg-config. OPENSSL_NO_VENDOR = 1; @@ -36,11 +35,11 @@ rustPlatform.buildRustPackage rec { # ROCKSDB_INCLUDE_DIR="${rocksdb}/include"; # ROCKSDB_LIB_DIR="${rocksdb}/lib"; - buildInputs = lib.optionals stdenv.isDarwin [ Security curl ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security curl ]; # some tests are flaky and some need network access # TODO finish filtering the tests to enable them - doCheck = !stdenv.isLinux; + doCheck = !stdenv.hostPlatform.isLinux; # checkFlags = [ # # tries to make a network access # "--skip=rpc::rpc::tests::test_send_transaction_large" diff --git a/pkgs/applications/blockchains/solana-validator/default.nix b/pkgs/applications/blockchains/solana-validator/default.nix index 35dc9b31e16ec..5b18f5fc4cc45 100644 --- a/pkgs/applications/blockchains/solana-validator/default.nix +++ b/pkgs/applications/blockchains/solana-validator/default.nix @@ -75,8 +75,8 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config protobuf rustfmt perl rustPlatform.bindgenHook ]; buildInputs = - [ openssl zlib libclang hidapi ] ++ (lib.optionals stdenv.isLinux [ udev ]) - ++ lib.optionals stdenv.isDarwin [ Security System Libsystem libcxx ]; + [ openssl zlib libclang hidapi ] ++ (lib.optionals stdenv.hostPlatform.isLinux [ udev ]) + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security System Libsystem libcxx ]; strictDeps = true; doCheck = false; @@ -88,7 +88,7 @@ rustPlatform.buildRustPackage rec { # If set, always finds OpenSSL in the system, even if the vendored feature is enabled. OPENSSL_NO_VENDOR = "1"; - } // lib.optionalAttrs stdenv.isDarwin { + } // lib.optionalAttrs stdenv.hostPlatform.isDarwin { # Require this on darwin otherwise the compiler starts rambling about missing # cmath functions CPPFLAGS = "-isystem ${lib.getDev libcxx}/include/c++/v1"; @@ -96,7 +96,7 @@ rustPlatform.buildRustPackage rec { }; meta = with lib; { - description = "Web-Scale Blockchain for fast, secure, scalable, decentralized apps and marketplaces. "; + description = "Web-Scale Blockchain for fast, secure, scalable, decentralized apps and marketplaces."; homepage = "https://solana.com"; license = licenses.asl20; maintainers = with maintainers; [ adjacentresearch ]; diff --git a/pkgs/applications/blockchains/sparrow/fhsenv.nix b/pkgs/applications/blockchains/sparrow/fhsenv.nix index 26bf9da0b85dd..671da04b69215 100644 --- a/pkgs/applications/blockchains/sparrow/fhsenv.nix +++ b/pkgs/applications/blockchains/sparrow/fhsenv.nix @@ -1,5 +1,4 @@ -{ lib -, buildFHSEnv +{ buildFHSEnv , sparrow-unwrapped }: diff --git a/pkgs/applications/blockchains/taproot-assets/default.nix b/pkgs/applications/blockchains/taproot-assets/default.nix index 1012db5337ea7..d560d3b6db801 100644 --- a/pkgs/applications/blockchains/taproot-assets/default.nix +++ b/pkgs/applications/blockchains/taproot-assets/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "taproot-assets"; - version = "0.3.3"; + version = "0.4.1"; src = fetchFromGitHub { owner = "lightninglabs"; repo = "taproot-assets"; rev = "v${version}"; - hash = "sha256-KEEecyZA+sVAkg2/i9AcfvPTB26Dk02r77Py87LP758="; + hash = "sha256-aQYVPSDudLK4ZBcBN/wNjVoF/9inOaJRbcyTP6VMdA0="; }; - vendorHash = "sha256-jz6q3l2FtkJM3qyaTTqqu3ZG2FeKW9s7WdlW1pHij5k="; + vendorHash = "sha256-IFzYW5vAtBoUC2ebFYnxS/TojQR4kXxQACNbyn2ZkCs="; subPackages = [ "cmd/tapcli" "cmd/tapd" ]; diff --git a/pkgs/applications/blockchains/teos/default.nix b/pkgs/applications/blockchains/teos/default.nix index c2e4fb01384d9..61299621e0fb5 100644 --- a/pkgs/applications/blockchains/teos/default.nix +++ b/pkgs/applications/blockchains/teos/default.nix @@ -40,7 +40,7 @@ in rustfmt ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; @@ -69,7 +69,7 @@ in buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; diff --git a/pkgs/applications/blockchains/terra-station/default.nix b/pkgs/applications/blockchains/terra-station/default.nix index 2ae6ca12b6054..fef54f6844faa 100644 --- a/pkgs/applications/blockchains/terra-station/default.nix +++ b/pkgs/applications/blockchains/terra-station/default.nix @@ -1,8 +1,6 @@ { lib, stdenv , fetchurl , dpkg -, util-linux -, bash , makeWrapper , electron , asar diff --git a/pkgs/applications/blockchains/ton/default.nix b/pkgs/applications/blockchains/ton/default.nix index 07be7664acba2..c4014a0127237 100644 --- a/pkgs/applications/blockchains/ton/default.nix +++ b/pkgs/applications/blockchains/ton/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "ton"; - version = "2024.06"; + version = "2024.09"; src = fetchFromGitHub { owner = "ton-blockchain"; repo = "ton"; rev = "v${version}"; - hash = "sha256-5fuRdVayvmM+yK1WsdtWlCZpxz7KKBs+ZRfnueP0Ny0="; + hash = "sha256-IzDftvPwsKWEVn4R8QL6j1ceA26BksKSrlr0CkFZlrU="; fetchSubmodules = true; }; @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { meta = with lib; { # The build fails on darwin as: # error: aligned allocation function of type 'void *(std::size_t, std::align_val_t)' is only available on macOS 10.13 or newer - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Fully decentralized layer-1 blockchain designed by Telegram"; homepage = "https://ton.org/"; changelog = "https://github.com/ton-blockchain/ton/blob/v${version}/Changelog.md"; diff --git a/pkgs/applications/blockchains/trezor-suite/default.nix b/pkgs/applications/blockchains/trezor-suite/default.nix index 5884fd2a275da..dae20c379d919 100644 --- a/pkgs/applications/blockchains/trezor-suite/default.nix +++ b/pkgs/applications/blockchains/trezor-suite/default.nix @@ -8,8 +8,7 @@ let pname = "trezor-suite"; - version = "24.5.4"; - name = "${pname}-${version}"; + version = "24.8.3"; suffix = { aarch64-linux = "linux-arm64"; @@ -17,24 +16,23 @@ let }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); src = fetchurl { - url = "https://github.com/trezor/${pname}/releases/download/v${version}/Trezor-Suite-${version}-${suffix}.AppImage"; - hash = { # curl -Lfs https://github.com/trezor/trezor-suite/releases/latest/download/latest-linux{-arm64,}.yml | grep ^sha512 | sed 's/: /-/' - aarch64-linux = "sha512-gkN6e4Ndc96FT6vaCmSxuViTKuOc5vnCqptPN8IRno9Nv8L0k6hB7O+0g5E+9hd+3o5WASXKefYIOZAnPI3RZA=="; - x86_64-linux = "sha512-uHMI0fm02XdOyt6mAXEZuTZkNlNykTQbJNeGATBrlLLR98cxrOj8DQ1S7gPd5dkQCJzdmR7ydylj/XPOHsV2Ug=="; + url = "https://github.com/trezor/trezor-suite/releases/download/v${version}/Trezor-Suite-${version}-${suffix}.AppImage"; + hash = { # curl -Lfs https://github.com/trezor/trezor-suite/releases/download/v${version}/latest-linux{-arm64,}.yml | grep ^sha512 | sed 's/: /-/' + aarch64-linux = "sha512-od/OmYbPd3mmmyz131nQCVrhuSMU9znV8REHwbJLWVRoATMc21LSwCuAGZGRE1ijowJ1DI+TkLiLEq9rLldRmw="; + x86_64-linux = "sha512-IeEbscMGGaCaDQbNqmHYiKqdVm/QfyNDludiLWpcfnbN7udcxWIQG6tB9C9UY2BrimyNFvZgq1z9mZMfGScEYQ=="; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; appimageContents = appimageTools.extractType2 { - inherit name src; + inherit pname version src; }; in appimageTools.wrapType2 rec { - inherit name src; + inherit pname version src; extraInstallCommands = '' - mv $out/bin/${name} $out/bin/${pname} mkdir -p $out/bin $out/share/${pname} $out/share/${pname}/resources cp -a ${appimageContents}/locales/ $out/share/${pname} diff --git a/pkgs/applications/blockchains/wasabibackend/default.nix b/pkgs/applications/blockchains/wasabibackend/default.nix index 1371be1a97520..59a3c1689b075 100644 --- a/pkgs/applications/blockchains/wasabibackend/default.nix +++ b/pkgs/applications/blockchains/wasabibackend/default.nix @@ -6,6 +6,7 @@ dotnetCorePackages, zlib, openssl, + nixosTests, }: buildDotnetModule rec { pname = "wasabibackend"; @@ -38,6 +39,10 @@ buildDotnetModule rec { mv $out/bin/WalletWasabi.Backend $out/bin/WasabiBackend ''; + passthru.tests = { + inherit (nixosTests) wasabibackend; + }; + meta = with lib; { description = "Backend for the Wasabi Wallet"; homepage = "https://wasabiwallet.io/"; diff --git a/pkgs/applications/blockchains/wownero/default.nix b/pkgs/applications/blockchains/wownero/default.nix index 82b6d12153611..7ec9f8d83ed82 100644 --- a/pkgs/applications/blockchains/wownero/default.nix +++ b/pkgs/applications/blockchains/wownero/default.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { readline unbound zeromq - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.IOKit ]; @@ -101,7 +101,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://wownero.org/"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/blockchains/zcash/default.nix b/pkgs/applications/blockchains/zcash/default.nix index dbada09c1b6e9..35a3bdb91e8aa 100644 --- a/pkgs/applications/blockchains/zcash/default.nix +++ b/pkgs/applications/blockchains/zcash/default.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage.override { inherit stdenv; } rec { hash = "sha256-XGq/cYUo43FcpmRDO2YiNLCuEQLsTFLBFC4M1wM29l8="; }; - prePatch = lib.optionalString stdenv.isAarch64 '' + prePatch = lib.optionalString stdenv.hostPlatform.isAarch64 '' substituteInPlace .cargo/config.offline \ --replace "[target.aarch64-unknown-linux-gnu]" "" \ --replace "linker = \"aarch64-linux-gnu-gcc\"" "" @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage.override { inherit stdenv; } rec { tl-expected utf8cpp zeromq - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; diff --git a/pkgs/applications/display-managers/emptty/default.nix b/pkgs/applications/display-managers/emptty/default.nix index eb25c1b109050..b4a55ece76757 100644 --- a/pkgs/applications/display-managers/emptty/default.nix +++ b/pkgs/applications/display-managers/emptty/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "emptty"; - version = "0.12.1"; + version = "0.13.0"; src = fetchFromGitHub { owner = "tvrzna"; repo = pname; rev = "v${version}"; - hash = "sha256-9qNAQBmcFKPpJ+AqfOy3emA1fvqI/XaT39KwI5fpXHU="; + hash = "sha256-xZfR4sn20fDaTNAxuxVflpr+8AFg5Z7vesO7P8Jxw6A="; }; buildInputs = [ pam libX11 ]; @@ -27,7 +27,7 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ urandom ]; # many undefined functions - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; mainProgram = "emptty"; }; } diff --git a/pkgs/applications/display-managers/greetd/default.nix b/pkgs/applications/display-managers/greetd/default.nix index 6d8a5f2bda293..1b960265c67ef 100644 --- a/pkgs/applications/display-managers/greetd/default.nix +++ b/pkgs/applications/display-managers/greetd/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "greetd"; - version = "0.10.0"; + version = "0.10.3"; src = fetchFromSourcehut { owner = "~kennylevinsen"; repo = pname; rev = version; - sha256 = "sha256-QFxE5c4XDOBa3rKpUFur6xOG+5m0NSCOWo7960ZWEow="; + sha256 = "sha256-jgvYnjt7j4uubpBxrYM3YiUfF1PWuHAN1kwnv6Y+bMg="; }; - cargoHash = "sha256-w7V5ZBFy5MIEQKOPPgsc7XnrXsF5rEDNzUKeLPPy4P4="; + cargoHash = "sha256-M52Kj14X+vMPKeGwi5pbEuh3F9/a3eVjhsbZI06Jkzs="; nativeBuildInputs = [ scdoc diff --git a/pkgs/applications/display-managers/greetd/dlm.nix b/pkgs/applications/display-managers/greetd/dlm.nix deleted file mode 100644 index a73a96c779a84..0000000000000 --- a/pkgs/applications/display-managers/greetd/dlm.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib -, rustPlatform -, fetchFromSourcehut -}: - -rustPlatform.buildRustPackage rec { - pname = "dlm"; - version = "2020-01-07"; - - src = fetchFromSourcehut { - owner = "~kennylevinsen"; - repo = pname; - rev = "6b0e11c4f453b1a4d7a32019227539a980b7ce66"; - sha256 = "1r3w7my0g3v2ya317qnvjx8wnagjahpj7yx72a65hf2pjbf5x42p"; - }; - - cargoSha256 = "01a8k60qnx2pgxb2adgw30c2hjb60w6230khm5hyqgmp7z4rm8k8"; - - meta = with lib; { - description = "Stupid simple graphical login manager"; - mainProgram = "dlm"; - homepage = "https://git.sr.ht/~kennylevinsen/dlm"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ luc65r ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/display-managers/greetd/tuigreet.nix b/pkgs/applications/display-managers/greetd/tuigreet.nix index 40b52ecf7592b..11ca43c61436b 100644 --- a/pkgs/applications/display-managers/greetd/tuigreet.nix +++ b/pkgs/applications/display-managers/greetd/tuigreet.nix @@ -14,14 +14,14 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-e0YtpakEaaWdgu+bMr2VFoUc6+SUMFk4hYtSyk5aApY="; }; - cargoSha256 = "sha256-RkJjAmZ++4nc/lLh8g0LxGq2DjZGxQEjFOl8Yzx116A="; + cargoHash = "sha256-RkJjAmZ++4nc/lLh8g0LxGq2DjZGxQEjFOl8Yzx116A="; meta = { description = "Graphical console greeter for greetd"; homepage = "https://github.com/apognu/tuigreet"; changelog = "https://github.com/apognu/tuigreet/releases/tag/${version}"; license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ luc65r ivar ]; + maintainers = with lib.maintainers; [ luc65r ]; platforms = lib.platforms.linux; mainProgram = "tuigreet"; }; diff --git a/pkgs/applications/display-managers/lightdm-slick-greeter/default.nix b/pkgs/applications/display-managers/lightdm-slick-greeter/default.nix index d7054e6f4080a..ca3767b5db60f 100644 --- a/pkgs/applications/display-managers/lightdm-slick-greeter/default.nix +++ b/pkgs/applications/display-managers/lightdm-slick-greeter/default.nix @@ -7,7 +7,7 @@ , python3 , vala , wrapGAppsHook3 -, cinnamon +, xapp , lightdm , gtk3 , pixman @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "lightdm-slick-greeter"; - version = "2.0.5"; + version = "2.0.6"; src = fetchFromGitHub { owner = "linuxmint"; repo = "slick-greeter"; rev = version; - sha256 = "sha256-Q37CprukHvDRBcuPbfusKg2DY+JCwmjVX1+KnfSH2iw="; + sha256 = "sha256-Q6V4axKlGhX1/uaugNkjoynHSL5jWA/eqzAsbJYcRSo="; }; nativeBuildInputs = [ @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - cinnamon.xapp + xapp lightdm gtk3 pixman diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix index 8361461fb7d37..820477861bb59 100644 --- a/pkgs/applications/display-managers/lightdm/default.nix +++ b/pkgs/applications/display-managers/lightdm/default.nix @@ -21,13 +21,14 @@ , polkit , accountsservice , gtk-doc -, gnome , gobject-introspection , vala , fetchpatch , withQt5 ? false , qtbase , yelp-tools +, yelp-xsl +, nixosTests }: stdenv.mkDerivation rec { @@ -47,7 +48,7 @@ stdenv.mkDerivation rec { autoconf automake yelp-tools - gnome.yelp-xsl + yelp-xsl gobject-introspection gtk-doc intltool @@ -115,6 +116,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = nix-update-script { }; + tests = { inherit (nixosTests) lightdm; }; }; diff --git a/pkgs/applications/display-managers/ly/default.nix b/pkgs/applications/display-managers/ly/default.nix index 9376dc476dec2..24332a10c080f 100644 --- a/pkgs/applications/display-managers/ly/default.nix +++ b/pkgs/applications/display-managers/ly/default.nix @@ -1,26 +1,26 @@ -{ stdenv, lib, fetchFromGitHub, git, linux-pam, libxcb }: +{ stdenv, lib, fetchFromGitHub, linux-pam, libxcb, makeBinaryWrapper, zig_0_12 +, callPackage, nixosTests }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "ly"; - version = "0.6.0"; + version = "1.0.2"; src = fetchFromGitHub { owner = "fairyglade"; repo = "ly"; - rev = "v${version}"; - hash = "sha256-78XD6DK9aQi8hITWJWnFZ3U9zWTcuw3vtRiU3Lhu7O4="; - fetchSubmodules = true; + rev = "v1.0.2"; + hash = "sha256-VUtNEL7Te/ba+wvL0SsUHlyv2NPmkYKs76TnW8r3ysw="; }; - hardeningDisable = [ "all" ]; - nativeBuildInputs = [ git ]; + nativeBuildInputs = [ makeBinaryWrapper zig_0_12.hook ]; buildInputs = [ libxcb linux-pam ]; - installPhase = '' - mkdir -p $out/bin - cp bin/ly $out/bin + postPatch = '' + ln -s ${callPackage ./deps.nix { }} $ZIG_GLOBAL_CACHE_DIR/p ''; + passthru.tests = { inherit (nixosTests) ly; }; + meta = with lib; { description = "TUI display manager"; license = licenses.wtfpl; diff --git a/pkgs/applications/display-managers/ly/deps.nix b/pkgs/applications/display-managers/ly/deps.nix new file mode 100644 index 0000000000000..c1f733aebc994 --- /dev/null +++ b/pkgs/applications/display-managers/ly/deps.nix @@ -0,0 +1,110 @@ +# generated by zon2nix (https://github.com/Cloudef/zig2nix) + +{ + lib, + linkFarm, + fetchurl, + fetchgit, + runCommandLocal, + zig, + name ? "zig-packages", +}: + +let + unpackZigArtifact = + { name, artifact }: + runCommandLocal name { nativeBuildInputs = [ zig ]; } '' + hash="$(zig fetch --global-cache-dir "$TMPDIR" ${artifact})" + mv "$TMPDIR/p/$hash" "$out" + chmod 755 "$out" + ''; + + fetchZig = + { + name, + url, + hash, + }: + let + artifact = fetchurl { inherit url hash; }; + in + unpackZigArtifact { inherit name artifact; }; + + fetchGitZig = + { + name, + url, + hash, + }: + let + parts = lib.splitString "#" url; + base = lib.elemAt parts 0; + rev = lib.elemAt parts 1; + in + fetchgit { + inherit name rev hash; + url = base; + deepClone = false; + }; + + fetchZigArtifact = + { + name, + url, + hash, + }: + let + parts = lib.splitString "://" url; + proto = lib.elemAt parts 0; + path = lib.elemAt parts 1; + fetcher = { + "git+http" = fetchGitZig { + inherit name hash; + url = "http://${path}"; + }; + "git+https" = fetchGitZig { + inherit name hash; + url = "https://${path}"; + }; + http = fetchZig { + inherit name hash; + url = "http://${path}"; + }; + https = fetchZig { + inherit name hash; + url = "https://${path}"; + }; + file = unpackZigArtifact { + inherit name; + artifact = /. + path; + }; + }; + in + fetcher.${proto}; +in +linkFarm name [ + { + name = "122014e73fd712190e109950837b97f6143f02d7e2b6986e1db70b6f4aadb5ba6a0d"; + path = fetchZigArtifact { + name = "clap"; + url = "https://github.com/Hejsil/zig-clap/archive/8c98e6404b22aafc0184e999d8f068b81cc22fa1.tar.gz"; + hash = "sha256-3P9LyIlq4eNMOe+/jdVJgECfzveSUuRzTf9yhT4t8Zo="; + }; + } + { + name = "12209b971367b4066d40ecad4728e6fdffc4cc4f19356d424c2de57f5b69ac7a619a"; + path = fetchZigArtifact { + name = "zigini"; + url = "https://github.com/Kawaii-Ash/zigini/archive/0bba97a12582928e097f4074cc746c43351ba4c8.tar.gz"; + hash = "sha256-OdaJ5tqmk2MPwaAbpK4HRD/CcQCN+Cjj8U63BqUcFMs="; + }; + } + { + name = "1220b0979ea9891fa4aeb85748fc42bc4b24039d9c99a4d65d893fb1c83e921efad8"; + path = fetchZigArtifact { + name = "ini"; + url = "https://github.com/ziglibs/ini/archive/e18d36665905c1e7ba0c1ce3e8780076b33e3002.tar.gz"; + hash = "sha256-RQ6OPJBqqH7PCL+xiI58JT7vnIo6zbwpLWn+byZO5iM="; + }; + } +] diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix index 2708ff0608144..451317fae2681 100644 --- a/pkgs/applications/display-managers/sddm/default.nix +++ b/pkgs/applications/display-managers/sddm/default.nix @@ -2,20 +2,25 @@ lib, callPackage, runCommand, + layer-shell-qt, qtwayland, wrapQtAppsHook, unwrapped ? callPackage ./unwrapped.nix {}, withWayland ? false, + withLayerShellQt ? false, extraPackages ? [], }: runCommand "sddm-wrapped" { inherit (unwrapped) version; - buildInputs = unwrapped.buildInputs ++ extraPackages ++ lib.optional withWayland qtwayland; + buildInputs = unwrapped.buildInputs ++ extraPackages + ++ lib.optional withWayland qtwayland + ++ lib.optional (withWayland && withLayerShellQt) layer-shell-qt; nativeBuildInputs = [ wrapQtAppsHook ]; passthru = { inherit unwrapped; + inherit (unwrapped.passthru) tests; }; meta = unwrapped.meta; diff --git a/pkgs/applications/display-managers/sddm/unwrapped.nix b/pkgs/applications/display-managers/sddm/unwrapped.nix index 430e62a5ef4a4..3a7a73dd9610f 100644 --- a/pkgs/applications/display-managers/sddm/unwrapped.nix +++ b/pkgs/applications/display-managers/sddm/unwrapped.nix @@ -2,6 +2,7 @@ , cmake, pkg-config, qttools , libxcb, libXau, pam, qtbase, qtdeclarative , qtquickcontrols2 ? null, systemd, xkeyboardconfig +, nixosTests }: let isQt6 = lib.versions.major qtbase.version == "6"; @@ -76,6 +77,8 @@ in stdenv.mkDerivation(finalAttrs: { done ''; + passthru.tests = { inherit (nixosTests) sddm; }; + meta = with lib; { description = "QML based X11 display manager"; homepage = "https://github.com/sddm/sddm"; diff --git a/pkgs/applications/editors/amp/default.nix b/pkgs/applications/editors/amp/default.nix deleted file mode 100644 index e559ceb73ec73..0000000000000 --- a/pkgs/applications/editors/amp/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, openssl, pkg-config, python3, xorg, cmake, libgit2, darwin -, curl }: - -rustPlatform.buildRustPackage rec { - pname = "amp"; - version = "0.7.0"; - - src = fetchFromGitHub { - owner = "jmacdonald"; - repo = pname; - rev = version; - sha256 = "sha256-xNadwz2agPbxvgUqrUf1+KsWTmeNh8hJIWcNwTzzM/M="; - }; - - cargoHash = "sha256-4c72l3R9OyxvslKC4RrIu/Ka3grGxIUCY6iF/NHS5X8="; - - nativeBuildInputs = [ cmake pkg-config python3 ]; - buildInputs = [ openssl xorg.libxcb libgit2 ] ++ lib.optionals stdenv.isDarwin - (with darwin.apple_sdk.frameworks; [ curl Security AppKit ]); - - # Tests need to write to the theme directory in HOME. - preCheck = "export HOME=`mktemp -d`"; - - meta = with lib; { - description = "Modern text editor inspired by Vim"; - homepage = "https://amp.rs"; - license = [ licenses.gpl3 ]; - maintainers = [ maintainers.sb0 ]; - platforms = platforms.unix; - mainProgram = "amp"; - }; -} 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/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix index 74f7d3c8f7a47..758552ce028e1 100644 --- a/pkgs/applications/editors/android-studio/common.nix +++ b/pkgs/applications/editors/android-studio/common.nix @@ -13,11 +13,10 @@ , file , fontsConf , git -, glxinfo , gnugrep , gnused , gnutar -, gtk2, gnome_vfs, glib, GConf +, gtk2, glib , gzip , fontconfig , freetype @@ -30,6 +29,7 @@ , libX11 , libxcb , libxkbcommon +, mesa-demos , xcbutilwm , xcbutilrenderutil , xcbutilkeysyms @@ -107,7 +107,7 @@ let # For Android emulator file - glxinfo + mesa-demos pciutils setxkbmap @@ -175,9 +175,7 @@ let # For GTKLookAndFeel gtk2 - gnome_vfs glib - GConf ]}" # AS launches LLDBFrontend with a custom LD_LIBRARY_PATH diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index c2bc17f8692b5..a7345f26f1518 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -1,25 +1,24 @@ -{ callPackage, makeFontsConf, gnome2, buildFHSEnv, tiling_wm ? false }: +{ callPackage, makeFontsConf, buildFHSEnv, tiling_wm ? false }: let mkStudio = opts: callPackage (import ./common.nix opts) { fontsConf = makeFontsConf { fontDirectories = []; }; - inherit (gnome2) GConf gnome_vfs; inherit buildFHSEnv; inherit tiling_wm; }; stableVersion = { - version = "2024.1.1.11"; # "Android Studio Koala | 2024.1.1" - sha256Hash = "sha256-2PqOz+QVtEUTNQkBUB4qD0KcoDPPGAUFSxyBbEpwRWU="; + version = "2024.1.2.13"; # "Android Studio Koala Feature Drop | 2024.1.2 Patch 1" + sha256Hash = "sha256-aIxlXCMPKYZ6Eq44LMJuxnBr9/ML1Nl/LxXI+WDLG5s="; }; betaVersion = { - version = "2024.1.1.10"; # "Android Studio Koala | 2024.1.1 RC 2" - sha256Hash = "sha256-84CpZfoAvJHUCO3ZBJqDbuz9xuGE/5xJfXoetJDXju8="; + version = "2024.2.1.8"; # "Android Studio Ladybug | 2024.2.1 RC 1" + sha256Hash = "sha256-Kb/1+g9rIuU/pAO1ue5h0+BU7OCE09QqV9XFoiJxBL4="; }; latestVersion = { - version = "2024.1.2.7"; # "Android Studio Koala Feature Drop | 2024.1.2 Canary 7" - sha256Hash = "sha256-opoAKslh8DqS/iS5gw8AxX6x89t2BNX7yaU88XNd2kM="; + version = "2024.2.2.4"; # "Android Studio Ladybug Feature Drop | 2024.2.2 Canary 4" + sha256Hash = "sha256-Rw+smKU2F11ZpK6lWb3VyLGTKt3qWFoUqnfcs5OXBcU="; }; in { # Attributes are named by their corresponding release channels diff --git a/pkgs/applications/editors/bless/default.nix b/pkgs/applications/editors/bless/default.nix deleted file mode 100644 index 2ac885683eb17..0000000000000 --- a/pkgs/applications/editors/bless/default.nix +++ /dev/null @@ -1,71 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, pkg-config -, mono -, meson -, ninja -, gtk-sharp-2_0 -, gettext -, makeWrapper -, glib -, gtk2-x11 -, libxslt -, docbook_xsl -, python3 -, itstool -}: - -stdenv.mkDerivation rec { - pname = "bless"; - version = "0.6.3"; - - src = fetchFromGitHub { - owner = "afrantzis"; - repo = pname; - rev = "v${version}"; - hash = "sha256-rS+vJX0y9v1TiPsRfABroHiTuENQKEOxNsyKwagRuHM="; - }; - - buildInputs = [ - gtk-sharp-2_0 - mono - # runtime only deps - glib - gtk2-x11 - ]; - - nativeBuildInputs = [ - pkg-config - meson - ninja - gettext - makeWrapper - libxslt - docbook_xsl - python3 - itstool - ]; - - mesonFlags = [ - "-Dtests=false" # requires NUnit - ]; - - postPatch = '' - patchShebangs . - ''; - - preFixup = '' - MPATH="${gtk-sharp-2_0}/lib/mono/gtk-sharp-2.0:${glib.out}/lib:${gtk2-x11}/lib:${gtk-sharp-2_0}/lib" - wrapProgram $out/bin/bless --prefix MONO_PATH : "$MPATH" --prefix LD_LIBRARY_PATH : "$MPATH" --prefix PATH : ${lib.makeBinPath [ mono ]} - ''; - - meta = with lib; { - homepage = "https://github.com/afrantzis/bless"; - description = "Gtk# Hex Editor"; - maintainers = [ maintainers.mkg20001 ]; - license = licenses.gpl2; - platforms = platforms.linux; - mainProgram = "bless"; - }; -} 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/bviplus/default.nix b/pkgs/applications/editors/bviplus/default.nix index ddf37bb69fc6d..ebc3c246518a8 100644 --- a/pkgs/applications/editors/bviplus/default.nix +++ b/pkgs/applications/editors/bviplus/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { homepage = "https://bviplus.sourceforge.net"; license = licenses.gpl3; platforms = platforms.linux; - maintainers = with maintainers; [ ]; + maintainers = [ ]; mainProgram = "bviplus"; }; } diff --git a/pkgs/applications/editors/codeblocks/default.nix b/pkgs/applications/editors/codeblocks/default.nix index 235fef97d0836..80fbe5674635d 100644 --- a/pkgs/applications/editors/codeblocks/default.nix +++ b/pkgs/applications/editors/codeblocks/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, fetchpatch, pkg-config, file, zip, wxGTK32, gtk3 -, contribPlugins ? false, hunspell, gamin, boost, wrapGAppsHook3 +, contribPlugins ? false, hunspell, boost, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config file zip wrapGAppsHook3 ]; buildInputs = [ wxGTK32 gtk3 ] - ++ lib.optionals contribPlugins [ hunspell gamin boost ]; + ++ lib.optionals contribPlugins [ hunspell boost ]; enableParallelBuilding = true; patches = [ ./writable-projects.patch @@ -117,12 +117,12 @@ stdenv.mkDerivation rec { }) ]; preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file"; - postConfigure = lib.optionalString stdenv.isLinux "substituteInPlace libtool --replace ldconfig ${stdenv.cc.libc.bin}/bin/ldconfig"; + postConfigure = lib.optionalString stdenv.hostPlatform.isLinux "substituteInPlace libtool --replace ldconfig ${stdenv.cc.libc.bin}/bin/ldconfig"; configureFlags = [ "--enable-pch=no" ] ++ lib.optionals contribPlugins [ - ("--with-contrib-plugins" + lib.optionalString stdenv.isDarwin "=all,-FileManager,-NassiShneiderman") + ("--with-contrib-plugins=all,-FileManager" + lib.optionalString stdenv.hostPlatform.isDarwin ",-NassiShneiderman") "--with-boost-libdir=${boost}/lib" ]; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' ln -s $out/lib/codeblocks/plugins $out/share/codeblocks/plugins ''; diff --git a/pkgs/applications/editors/cpeditor/default.nix b/pkgs/applications/editors/cpeditor/default.nix index 48e00514cbed0..d90ab08614077 100644 --- a/pkgs/applications/editors/cpeditor/default.nix +++ b/pkgs/applications/editors/cpeditor/default.nix @@ -29,6 +29,7 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace src/Core/Runner.cpp --replace-fail "/bin/bash" "${runtimeShell}" + substituteInPlace dist/linux/cpeditor.desktop --replace-fail 'Exec=/usr/bin/cpeditor' "Exec=cpeditor" ''; meta = with lib; { diff --git a/pkgs/applications/editors/dit/default.nix b/pkgs/applications/editors/dit/default.nix index d0ded7ae72bdc..d809348b3f522 100644 --- a/pkgs/applications/editors/dit/default.nix +++ b/pkgs/applications/editors/dit/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ ncurses lua ] - ++ lib.optional stdenv.isDarwin libiconv; + ++ lib.optional stdenv.hostPlatform.isDarwin libiconv; # fix paths prePatch = '' diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix index 6219ab2b7bd29..9c1963554c3fa 100644 --- a/pkgs/applications/editors/eclipse/default.nix +++ b/pkgs/applications/editors/eclipse/default.nix @@ -13,11 +13,11 @@ let platform_major = "4"; - platform_minor = "31"; + platform_minor = "32"; year = "2024"; - month = "03"; #release month - buildmonth = "02"; #sometimes differs from release month - timestamp = "${year}${buildmonth}290520"; + month = "06"; #release month + buildmonth = "06"; #sometimes differs from release month + timestamp = "${year}${buildmonth}010610"; gtk = gtk3; arch = if stdenv.hostPlatform.isx86_64 then "x86_64" @@ -43,8 +43,8 @@ in rec { fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-cpp-${year}-${month}-R-linux-gtk-${arch}.tar.gz"; hash = { - x86_64 = "sha256-lZtU/IUNx2tc6TwCFQ5WS7cO/Gui2JpeknnL+Z/mBow="; - aarch64 = "sha256-iIUOiFp0uLOzwdqBV1txRhliaE2l1kbhGv1F6h0WO+w="; + x86_64 = "sha256-yMyigXPd6BhSiyoLTFQhBrHnatgXMw1BrH7xWfoT0Zo="; + aarch64 = "sha256-YZ1MhvXWcYRgQ4ZR/hXEWNKmYji/9PyKbdnm27i8Vjs="; }.${arch}; }; }; @@ -58,8 +58,8 @@ in rec { fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-dsl-${year}-${month}-R-linux-gtk-${arch}.tar.gz"; hash = { - x86_64 = "sha256-gdtDI9A+sUDAFsyqEmXuIkqgd/v1WF+Euj0TSWwjeL4="; - aarch64 = "sha256-kYa+8E5KLqHdumBQiIom3eG5rM/9TFZlJyyc7HpySes="; + x86_64 = "sha256-m2kcsQicvZcIHAP0zcOGYQjS4vdiTo62o1cfDpG4Ea8="; + aarch64 = "sha256-UuMfIO6jgMpAmtGihWdJZ7RwilBVdsCaPJH3tKdwyLY="; }.${arch}; }; }; @@ -73,8 +73,8 @@ in rec { fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-embedcpp-${year}-${month}-R-linux-gtk-${arch}.tar.gz"; hash = { - x86_64 = "sha256-5g4CAX2mu1i6aMqmbgy4R3Npk1IC/W73FrIZAQwgGCc="; - aarch64 = "sha256-KcfybNDyGglULKF3HF5v50mBs69FFryCMZ+oBtjBFiw="; + x86_64 = "sha256-dpsdjBfF83B8wGwoIsT4QW/n4Qo/w+n4mNYtILdCJKw="; + aarch64 = "sha256-kDPZJbrxEBhx/KI/9SqOtOOoMVWvYJqTLLgR9YPNH5A="; }.${arch}; }; }; @@ -88,8 +88,8 @@ in rec { fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-modeling-${year}-${month}-R-linux-gtk-${arch}.tar.gz"; hash = { - x86_64 = "sha256-yRJWSEg0TVWpgQBSS+y8/YrjdU3PSvJoruEUwjZcrLc="; - aarch64 = "sha256-Czm8nYAkVqS8gaowDp1LrJ31iE32d6klT6JvHekL52c="; + x86_64 = "sha256-vANUS1IbYrhrpNX095XIhpaHlZhTkZe894nhrDPndJc="; + aarch64 = "sha256-ykw9Og4D3hVfUvJlbtSDUB7iOmDJ9gPVTmpXlGZX304="; }.${arch}; }; }; @@ -103,8 +103,8 @@ in rec { fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-platform-${platform_major}.${platform_minor}-linux-gtk-${arch}.tar.gz"; hash = { - x86_64 = "sha256-PIvJeITqftd9eHhfbF+R+SQ+MXp4OmM5xi8ZDdUvXaI="; - aarch64 = "sha256-C04AICPcb9foEai3Nk4S4zxQ3oUv+i2tckwqDscpx7I="; + x86_64 = "sha256-ow4i9sDPQUAolzBymvucqpdZrn+bggxR6BD2RnyBVns="; + aarch64 = "sha256-XZY7MQr1cCToIlEXSltxWRZbHu1Ex0wzLvL1nUhuKhw="; }.${arch}; }; }; @@ -135,8 +135,8 @@ in rec { fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-SDK-${platform_major}.${platform_minor}-linux-gtk-${arch}.tar.gz"; hash = { - x86_64 = "sha256-omsAZSlCvggTjoAPQt0oGqRUZwyt5H2LswGpFt88L+I="; - aarch64 = "sha256-wcrYVlL5x+Wve2MAgnEFQ4H3a/gc2y8Fr5TmwHU9p6A="; + x86_64 = "sha256-zb6/AMe7ArSw1mzPIvaSVeuNly6WO7pHQAuYUT8eGkk="; + aarch64 = "sha256-jgT3BpD04ELV2+WuRw1mbDw6S1SYDo7jfrijSNs8GLM="; }.${arch}; }; }; @@ -150,8 +150,8 @@ in rec { fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-java-${year}-${month}-R-linux-gtk-${arch}.tar.gz"; hash = { - x86_64 = "sha256-8WqHFLywYQXtzUGxBVstxGqVU55WHoApZnyZ6ur4XgU="; - aarch64 = "sha256-GlD0ykJbwdbzh1K3XQQ79yBhCJQUlmt2v8c2OMYNWp4="; + x86_64 = "sha256-fXfj0PImyd2nPUkaGvOu7BGAeIHkTocKH94oM/Vd+LU="; + aarch64 = "sha256-0EZXbngXIso8fS8bvSDPyRGCre2dF0+6wyldQ6GhGmo="; }.${arch}; }; }; @@ -165,8 +165,8 @@ in rec { fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-jee-${year}-${month}-R-linux-gtk-${arch}.tar.gz"; hash = { - x86_64 = "sha256-K2uo2VVL6rP9kxicJRLzsJiOFKloLD0vInSon8JsUWg="; - aarch64 = "sha256-qeEQTlFeWBag6SLXoatDeviR/NG8EcTi6VyUo9P6STM="; + x86_64 = "sha256-YIoa837bbnqm/4wuwRfx+5UNxyQJySbTX+lhL/FluS0="; + aarch64 = "sha256-0hwKU29RJdjyaF4ot0OpXt/illOsx1n38nhK5zteQBk="; }.${arch}; }; }; @@ -180,8 +180,8 @@ in rec { fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-committers-${year}-${month}-R-linux-gtk-${arch}.tar.gz"; hash = { - x86_64 = "sha256-Ko4NCU9jbkjAWY7Ky5tPlhXOnzkpY4GjPi6Z0CBmzzc="; - aarch64 = "sha256-RBT+xwdQcJh+YgsuCPTWy9MM2y45bhIF9DttPm6Qz+Q="; + x86_64 = "sha256-IFQkSOs0wk7chR9Ti3WG/7WDrXBWnaRH9AqC9jTmuT8="; + aarch64 = "sha256-iiS3hZWfinHYVhZsMntXQp+OgL7kcE/2jqx2JomBdIk="; }.${arch}; }; }; @@ -195,8 +195,8 @@ in rec { fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-rcp-${year}-${month}-R-linux-gtk-${arch}.tar.gz"; hash = { - x86_64 = "sha256-dWwDv8cfUxnU/24ASYLvSTbS3xV5ugG98jYMhAXTfS8="; - aarch64 = "sha256-+bAKFZ4u5PvCdC4Ifj5inppWb6C8wh0tar66qryx76o="; + x86_64 = "sha256-+U3wHbUgxkqWZjZyAXAqkZHeoNp+CwL1NBO4myDdJhE="; + aarch64 = "sha256-zDLt3lOqf2HyUP/oqbff6XupF2Vab7+gxpQriztunH4="; }.${arch}; }; }; @@ -210,9 +210,7 @@ in rec { # Gather up the desired plugins. pluginEnv = buildEnv { name = "eclipse-plugins"; - paths = - with lib; - filter (x: x ? isEclipsePlugin) (closePropagation plugins); + paths = lib.filter (x: x ? isEclipsePlugin) (lib.closePropagation plugins); }; # Prepare the JVM arguments to add to the ini file. We here also @@ -241,6 +239,6 @@ in rec { ### Plugins - plugins = callPackage ./plugins.nix { } // { __attrsFailEvaluation = true; }; + plugins = callPackage ./plugins.nix { }; } diff --git a/pkgs/applications/editors/ed/default.nix b/pkgs/applications/editors/ed/default.nix deleted file mode 100644 index c1f99de71057c..0000000000000 --- a/pkgs/applications/editors/ed/default.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ lib, pkgs }: - -lib.makeScope pkgs.newScope (self: - let - inherit (self) callPackage; - in { - sources = import ./sources.nix { - inherit lib; - inherit (pkgs) fetchurl; - }; - - ed = callPackage (self.sources.ed) { }; - edUnstable = callPackage (self.sources.edUnstable) { }; - }) diff --git a/pkgs/applications/editors/ed/generic.nix b/pkgs/applications/editors/ed/generic.nix deleted file mode 100644 index 70ffdb4c4af93..0000000000000 --- a/pkgs/applications/editors/ed/generic.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ pname -, version -, src -, patches ? [ ] -, meta -}: - -# Note: this package is used for bootstrapping fetchurl, and thus cannot use -# fetchpatch! All mutable patches (generated by GitHub or cgit) that are needed -# here should be included directly in Nixpkgs as files. - -{ lib -, stdenv -, fetchurl -, lzip -, runtimeShellPackage -}: - -stdenv.mkDerivation { - inherit pname version src patches; - - nativeBuildInputs = [ lzip ]; - buildInputs = [ runtimeShellPackage ]; - - configureFlags = [ - "CC=${stdenv.cc.targetPrefix}cc" - ]; - - doCheck = true; - - inherit meta; -} diff --git a/pkgs/applications/editors/ed/sources.nix b/pkgs/applications/editors/ed/sources.nix deleted file mode 100644 index 6601876c88b09..0000000000000 --- a/pkgs/applications/editors/ed/sources.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ lib -, fetchurl -}: - -let - meta = { - description = "GNU implementation of the standard Unix editor"; - longDescription = '' - GNU ed is a line-oriented text editor. It is used to create, display, - modify and otherwise manipulate text files, both interactively and via - shell scripts. A restricted version of ed, red, can only edit files in the - current directory and cannot execute shell commands. Ed is the 'standard' - text editor in the sense that it is the original editor for Unix, and thus - widely available. For most purposes, however, it is superseded by - full-screen editors such as GNU Emacs or GNU Moe. - ''; - license = lib.licenses.gpl3Plus; - homepage = "https://www.gnu.org/software/ed/"; - maintainers = with lib.maintainers; [ AndersonTorres ]; - platforms = lib.platforms.unix; - }; -in -{ - ed = let - pname = "ed"; - version = "1.20.2"; - src = fetchurl { - url = "mirror://gnu/ed/ed-${version}.tar.lz"; - hash = "sha256-Zf7HMY9IwsoX8zSsD0cD3v5iA3uxPMI5IN4He1+iRSM="; - }; - in import ./generic.nix { - inherit pname version src meta; - }; - - edUnstable = let - pname = "ed"; - version = "1.20-pre2"; - src = fetchurl { - url = "http://download.savannah.gnu.org/releases/ed/ed-${version}.tar.lz"; - hash = "sha256-bHTDeMhVNNo3qqDNoBNaBA+DHDa4WJpfQNcTvAUPgsY="; - }; - in import ./generic.nix { - inherit pname version src meta; - }; -} diff --git a/pkgs/applications/editors/edit/default.nix b/pkgs/applications/editors/edit/default.nix deleted file mode 100644 index b1a0440bb004f..0000000000000 --- a/pkgs/applications/editors/edit/default.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ lib -, stdenv -, fetchgit -, cwebbin -, libX11 -, libXft -, ncurses -, pkg-config -, unzip -}: - -stdenv.mkDerivation { - pname = "edit"; - version = "unstable-2021-04-05"; - - src = fetchgit { - url = "git://c9x.me/ed.git"; - rev = "bc24e3d4f716b0afacef559f952c40f0be5a1c58"; - hash = "sha256-DzQ+3B96+UzQqL3lhn0DfYmZy2LOANtibj1e1iVR+Jo="; - }; - - nativeBuildInputs = [ - cwebbin - pkg-config - unzip - ]; - - buildInputs = [ - libX11 - libXft - ncurses - ]; - - preBuild = '' - ctangle vicmd.w - ''; - - installPhase = '' - runHook preInstall - - install -Dm755 obj/edit -t $out/bin - - runHook postInstall - ''; - - meta = { - description = "Relaxing mix of Vi and ACME"; - homepage = "https://c9x.me/edit"; - license = lib.licenses.publicDomain; - maintainers = with lib.maintainers; [ AndersonTorres vrthra ]; - platforms = lib.platforms.unix; - mainProgram = "edit"; - }; -} diff --git a/pkgs/applications/editors/edlin/default.nix b/pkgs/applications/editors/edlin/default.nix deleted file mode 100644 index f8baa9aa67bc1..0000000000000 --- a/pkgs/applications/editors/edlin/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib -, stdenv -, fetchurl -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "edlin"; - version = "2.21"; - - src = let - inherit (finalAttrs) version; - in fetchurl { - url = "mirror://sourceforge/freedos-edlin/freedos-edlin/${version}/edlin-${version}.tar.bz2"; - hash = "sha256-lQ/tw8dvEKV81k5GV05o49glOmfYcEeJBmgPUmL3S2I="; - }; - - postInstall = '' - mkdir -p $out/share/doc/edlin-${finalAttrs.version}/ - cp AUTHORS ChangeLog README TODO edlin.htm $out/share/doc/edlin-${finalAttrs.version}/ - ''; - - meta = with lib; { - homepage = "https://sourceforge.net/projects/freedos-edlin/"; - description = "FreeDOS line editor"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = with platforms; unix; - mainProgram = "edlin"; - }; -}) diff --git a/pkgs/applications/editors/elvis/default.nix b/pkgs/applications/editors/elvis/default.nix deleted file mode 100644 index 046aac459b53c..0000000000000 --- a/pkgs/applications/editors/elvis/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ fetchurl, fetchpatch, lib, stdenv, ncurses }: - -stdenv.mkDerivation rec { - pname = "elvis"; - version = "2.2_0"; - - src = fetchurl { - url = "http://www.the-little-red-haired-girl.org/pub/elvis/elvis-${version}.tar.gz"; - sha256 = "182fj9qzyq6cjq1r849gpam6nq9smwv9f9xwaq84961p56r6d14s"; - }; - - buildInputs = [ ncurses ]; - - patches = [ - (fetchpatch { - url = "https://github.com/mbert/elvis/commit/076cf4ad5cc993be0c6195ec0d5d57e5ad8ac1eb.patch"; - sha256 = "0yzkc1mxjwg09mfmrk20ksa0vfnb2x83ndybwvawq4xjm1qkcahc"; - }) - ]; - - postPatch = '' - substituteInPlace configure \ - --replace '-lcurses' '-lncurses' - ''; - - preConfigure = '' - mkdir -p $out/share/man/man1 - ''; - - installPhase = '' - mkdir -p $out/bin $out/share/elvis $out/share/elvis/doc - cp elvis ref elvtags elvfmt $out/bin - cp -R data/* $out/share/elvis - cp doc/* $out/share/elvis/doc - - mkdir -p $out/share/man/man1 - for a in doc/*.man; do - cp $a $out/share/man/man1/`basename $a .man`.1 - done - ''; - - configureFlags = [ "--ioctl=termios" ]; - - meta = { - homepage = "http://elvis.the-little-red-haired-girl.org/"; - description = "Vi clone for Unix and other operating systems"; - license = lib.licenses.free; - }; -} diff --git a/pkgs/applications/editors/em/default.nix b/pkgs/applications/editors/em/default.nix deleted file mode 100644 index 89da2d719fa8c..0000000000000 --- a/pkgs/applications/editors/em/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib -, stdenv -, fetchurl -}: - -stdenv.mkDerivation rec { - pname = "em"; - version = "1.0.0"; - - src = fetchurl { - url = "http://pgas.freeshell.org/C/em/${pname}-${version}.tar.gz"; - hash = "sha256-ijMBkl7U1f9MTXgli9kUFB8ttMG6TMQnxfDMP9AblTQ="; - }; - - meta = with lib; { - homepage = "http://pgas.freeshell.org/C/em/"; - description = "Editor for Mortals"; - longDescription = '' - Em is a QMC variant of the standard Unix text editor - ed. It includes all - of ed, so the documentation for ed is fully applicable to em. Em also has - a number of new commands and facilities designed to improve its - interaction and increase its usefulness to users at fast vdu terminals - (such as the ITT's at QMC). - ''; - license = licenses.publicDomain; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.unix; - mainProgram = "em"; - }; -} diff --git a/pkgs/applications/editors/emacs/build-support/buffer.nix b/pkgs/applications/editors/emacs/build-support/buffer.nix new file mode 100644 index 0000000000000..48a7996916e8d --- /dev/null +++ b/pkgs/applications/editors/emacs/build-support/buffer.nix @@ -0,0 +1,77 @@ +# Functions to build elisp files to locally configure emcas buffers. +# See https://github.com/shlevy/nix-buffer + +{ lib, writeText, inherit-local }: + +rec { + withPackages = pkgs': let + pkgs = builtins.filter (x: x != null) pkgs'; + extras = map (x: x.emacsBufferSetup pkgs) (builtins.filter (builtins.hasAttr "emacsBufferSetup") pkgs); + in writeText "dir-locals.el" '' + (require 'inherit-local "${inherit-local}/share/emacs/site-lisp/elpa/inherit-local-${inherit-local.version}/inherit-local.elc") + + ; Only set up nixpkgs buffer handling when we have some buffers active + (defvar nixpkgs--buffer-count 0) + (when (eq nixpkgs--buffer-count 0) + (make-variable-buffer-local 'nixpkgs--is-nixpkgs-buffer) + ; When generating a new temporary buffer (one whose name starts with a space), do inherit-local inheritance and make it a nixpkgs buffer + (defun nixpkgs--around-generate (orig name &optional ibh) + (if (and nixpkgs--is-nixpkgs-buffer (eq (aref name 0) ?\s)) + (let ((buf (funcall orig name ibh))) + (progn + (inherit-local-inherit-child buf) + (with-current-buffer buf + (setq nixpkgs--buffer-count (1+ nixpkgs--buffer-count)) + (add-hook 'kill-buffer-hook 'nixpkgs--decrement-buffer-count nil t))) + buf) + (funcall orig name ibh))) + (advice-add 'generate-new-buffer :around #'nixpkgs--around-generate) + ; When we have no more nixpkgs buffers, tear down the buffer handling + (defun nixpkgs--decrement-buffer-count () + (setq nixpkgs--buffer-count (1- nixpkgs--buffer-count)) + (when (eq nixpkgs--buffer-count 0) + (advice-remove 'generate-new-buffer #'nixpkgs--around-generate) + (fmakunbound 'nixpkgs--around-generate) + (fmakunbound 'nixpkgs--decrement-buffer-count)))) + (setq nixpkgs--buffer-count (1+ nixpkgs--buffer-count)) + (add-hook 'kill-buffer-hook 'nixpkgs--decrement-buffer-count nil t) + + ; Add packages to PATH and exec-path + (make-local-variable 'process-environment) + (put 'process-environment 'permanent-local t) + (inherit-local 'process-environment) + ; setenv modifies in place, so copy the environment first + (setq process-environment (copy-tree process-environment)) + (setenv "PATH" (concat "${lib.makeSearchPath "bin" pkgs}:" (getenv "PATH"))) + (inherit-local-permanent exec-path (append '(${builtins.concatStringsSep " " (map (p: "\"${p}/bin\"") pkgs)}) exec-path)) + + (inherit-local-permanent eshell-path-env (concat "${lib.makeSearchPath "bin" pkgs}:" (if (boundp 'eshell-path-env) eshell-path-env (getenv "PATH")))) + + (setq nixpkgs--is-nixpkgs-buffer t) + (inherit-local 'nixpkgs--is-nixpkgs-buffer) + + ${lib.concatStringsSep "\n" extras} + ''; + # nix-buffer function for a project with a bunch of haskell packages + # in one directory + haskellMonoRepo = { project-root # The monorepo root + , haskellPackages # The composed haskell packages set that contains all of the packages + }: { root }: + let # The haskell paths. + haskell-paths = lib.filesystem.haskellPathsInDir project-root; + # Find the haskell package that the 'root' is in, if any. + haskell-path-parent = + let filtered = builtins.filter (name: + lib.hasPrefix (toString (project-root + "/${name}")) (toString root) + ) (builtins.attrNames haskell-paths); + in + if filtered == [] then null else builtins.head filtered; + # We're in the directory of a haskell package + is-haskell-package = haskell-path-parent != null; + haskell-package = haskellPackages.${haskell-path-parent}; + # GHC environment with all needed deps for the haskell package + haskell-package-env = + builtins.head haskell-package.env.nativeBuildInputs; + in + lib.optionalAttrs is-haskell-package (withPackages [ haskell-package-env ]); +} diff --git a/pkgs/applications/editors/emacs/build-support/elpa.nix b/pkgs/applications/editors/emacs/build-support/elpa.nix new file mode 100644 index 0000000000000..5a8f0ab9e52c8 --- /dev/null +++ b/pkgs/applications/editors/emacs/build-support/elpa.nix @@ -0,0 +1,40 @@ +# builder for Emacs packages built for packages.el + +{ lib, stdenv, emacs, texinfo, writeText }: + +let + genericBuild = import ./generic.nix { inherit lib stdenv emacs texinfo writeText; }; + libBuildHelper = import ./lib-build-helper.nix; + +in + +libBuildHelper.extendMkDerivation' genericBuild (finalAttrs: + +{ pname +, dontUnpack ? true +, meta ? {} +, ... +}@args: + +{ + + elpa2nix = args.elpa2nix or ./elpa2nix.el; + + inherit dontUnpack; + + installPhase = args.installPhase or '' + runHook preInstall + + emacs --batch -Q -l "$elpa2nix" \ + -f elpa2nix-install-package \ + "$src" "$out/share/emacs/site-lisp/elpa" + + runHook postInstall + ''; + + meta = { + homepage = args.src.meta.homepage or "https://elpa.gnu.org/packages/${pname}.html"; + } // meta; +} + +) diff --git a/pkgs/applications/editors/emacs/build-support/elpa2nix.el b/pkgs/applications/editors/emacs/build-support/elpa2nix.el new file mode 100644 index 0000000000000..64587c0fad1a7 --- /dev/null +++ b/pkgs/applications/editors/emacs/build-support/elpa2nix.el @@ -0,0 +1,33 @@ +(require 'package) +(package-initialize) + +(defun elpa2nix-install-package () + (if (not noninteractive) + (error "`elpa2nix-install-package' is to be used only with -batch")) + (pcase command-line-args-left + (`(,archive ,elpa) + (progn (setq package-user-dir elpa) + (elpa2nix-install-file archive))))) + +(defun elpa2nix-install-from-buffer () + "Install a package from the current buffer." + (let ((pkg-desc (if (derived-mode-p 'tar-mode) + (package-tar-file-info) + (package-buffer-info)))) + ;; Install the package itself. + (package-unpack pkg-desc) + pkg-desc)) + +(defun elpa2nix-install-file (file) + "Install a package from a file. +The file can either be a tar file or an Emacs Lisp file." + (let ((is-tar (string-match "\\.tar\\'" file))) + (with-temp-buffer + (if is-tar + (insert-file-contents-literally file) + (insert-file-contents file)) + (when is-tar (tar-mode)) + (elpa2nix-install-from-buffer)))) + +;; Allow installing package tarfiles larger than 10MB +(setq large-file-warning-threshold nil) diff --git a/pkgs/applications/editors/emacs/build-support/emacs-funcs.sh b/pkgs/applications/editors/emacs/build-support/emacs-funcs.sh new file mode 100644 index 0000000000000..e1e6a3b622087 --- /dev/null +++ b/pkgs/applications/editors/emacs/build-support/emacs-funcs.sh @@ -0,0 +1,34 @@ +addToEmacsLoadPath() { + local lispDir="$1" + if [[ -d $lispDir && ${EMACSLOADPATH-} != *"$lispDir":* ]] ; then + # It turns out, that the trailing : is actually required + # see https://www.gnu.org/software/emacs/manual/html_node/elisp/Library-Search.html + export EMACSLOADPATH="$lispDir:${EMACSLOADPATH-}" + fi +} + +addToEmacsNativeLoadPath() { + local nativeDir="$1" + if [[ -d $nativeDir && ${EMACSNATIVELOADPATH-} != *"$nativeDir":* ]]; then + export EMACSNATIVELOADPATH="$nativeDir:${EMACSNATIVELOADPATH-}" + fi +} + +addEmacsVars () { + addToEmacsLoadPath "$1/share/emacs/site-lisp" + + if [ -n "${addEmacsNativeLoadPath:-}" ]; then + addToEmacsNativeLoadPath "$1/share/emacs/native-lisp" + fi + + # Add sub paths to the Emacs load path if it is a directory + # containing .el files. This is necessary to build some packages, + # e.g., using trivialBuild. + for lispDir in \ + "$1/share/emacs/site-lisp/"* \ + "$1/share/emacs/site-lisp/elpa/"*; do + if [[ -d $lispDir && "$(echo "$lispDir"/*.el)" ]] ; then + addToEmacsLoadPath "$lispDir" + fi + done +} diff --git a/pkgs/applications/editors/emacs/build-support/generic.nix b/pkgs/applications/editors/emacs/build-support/generic.nix new file mode 100644 index 0000000000000..3ff10ee865fb3 --- /dev/null +++ b/pkgs/applications/editors/emacs/build-support/generic.nix @@ -0,0 +1,100 @@ +# generic builder for Emacs packages + +{ lib, stdenv, emacs, texinfo, writeText, ... }: + +let + inherit (lib) optionalAttrs; + + setupHook = writeText "setup-hook.sh" '' + source ${./emacs-funcs.sh} + + if [[ ! -v emacsHookDone ]]; then + emacsHookDone=1 + + # If this is for a wrapper derivation, emacs and the dependencies are all + # run-time dependencies. If this is for precompiling packages into bytecode, + # emacs is a compile-time dependency of the package. + addEnvHooks "$hostOffset" addEmacsVars + addEnvHooks "$targetOffset" addEmacsVars + fi + ''; + + libBuildHelper = import ./lib-build-helper.nix; + +in + +libBuildHelper.extendMkDerivation' stdenv.mkDerivation (finalAttrs: + +{ buildInputs ? [] +, nativeBuildInputs ? [] +, packageRequires ? [] +, propagatedBuildInputs ? [] +, propagatedUserEnvPkgs ? [] +, postInstall ? "" +, meta ? {} +, turnCompilationWarningToError ? false +, ignoreCompilationError ? true +, ... +}@args: + +{ + name = args.name or "emacs-${finalAttrs.pname}-${finalAttrs.version}"; + + unpackCmd = args.unpackCmd or '' + case "$curSrc" in + *.el) + # keep original source filename without the hash + local filename=$(basename "$curSrc") + filename="''${filename:33}" + cp $curSrc $filename + chmod +w $filename + sourceRoot="." + ;; + *) + _defaultUnpack "$curSrc" + ;; + esac + ''; + + inherit packageRequires; + buildInputs = finalAttrs.packageRequires ++ buildInputs; + nativeBuildInputs = [ emacs texinfo ] ++ nativeBuildInputs; + propagatedBuildInputs = finalAttrs.packageRequires ++ propagatedBuildInputs; + propagatedUserEnvPkgs = finalAttrs.packageRequires ++ propagatedUserEnvPkgs; + + setupHook = args.setupHook or setupHook; + + meta = { + broken = false; + platforms = emacs.meta.platforms; + } // optionalAttrs ((args.src.meta.homepage or "") != "") { + homepage = args.src.meta.homepage; + } // meta; +} + +// optionalAttrs (emacs.withNativeCompilation or false) { + + addEmacsNativeLoadPath = args.addEmacsNativeLoadPath or true; + + inherit turnCompilationWarningToError ignoreCompilationError; + + postInstall = '' + # Besides adding the output directory to the native load path, make sure + # the current package's elisp files are in the load path, otherwise + # (require 'file-b) from file-a.el in the same package will fail. + mkdir -p $out/share/emacs/native-lisp + source ${./emacs-funcs.sh} + addEmacsVars "$out" + + find $out/share/emacs -type f -name '*.el' -print0 \ + | xargs --verbose -0 -I {} -n 1 -P $NIX_BUILD_CORES sh -c \ + "emacs \ + --batch \ + --eval '(setq large-file-warning-threshold nil)' \ + --eval '(setq byte-compile-error-on-warn ${if finalAttrs.turnCompilationWarningToError then "t" else "nil"})' \ + -f batch-native-compile {} \ + || exit ${if finalAttrs.ignoreCompilationError then "0" else "\\$?"}" + '' + postInstall; +} + +) diff --git a/pkgs/applications/editors/emacs/build-support/lib-build-helper.nix b/pkgs/applications/editors/emacs/build-support/lib-build-helper.nix new file mode 100644 index 0000000000000..23267f592359e --- /dev/null +++ b/pkgs/applications/editors/emacs/build-support/lib-build-helper.nix @@ -0,0 +1,5 @@ +{ + extendMkDerivation' = + mkDerivationBase: attrsOverlay: fpargs: + (mkDerivationBase fpargs).overrideAttrs attrsOverlay; +} diff --git a/pkgs/applications/editors/emacs/build-support/melpa.nix b/pkgs/applications/editors/emacs/build-support/melpa.nix new file mode 100644 index 0000000000000..e129e3ebdeb09 --- /dev/null +++ b/pkgs/applications/editors/emacs/build-support/melpa.nix @@ -0,0 +1,168 @@ +# builder for Emacs packages built for packages.el +# using MELPA package-build.el + +{ lib, stdenv, fetchFromGitHub, emacs, texinfo, writeText }: + +let + genericBuild = import ./generic.nix { inherit lib stdenv emacs texinfo writeText; }; + libBuildHelper = import ./lib-build-helper.nix; + + packageBuild = stdenv.mkDerivation { + name = "package-build"; + src = fetchFromGitHub { + owner = "melpa"; + repo = "package-build"; + rev = "c48aa078c01b4f07b804270c4583a0a58ffea1c0"; + sha256 = "sha256-MzPj375upIiYXdQR+wWXv3A1zMqbSrZlH0taLuxx/1M="; + }; + + patches = [ ./package-build-dont-use-mtime.patch ]; + + dontConfigure = true; + dontBuild = true; + + installPhase = " + mkdir -p $out + cp -r * $out + "; + }; + +in + +libBuildHelper.extendMkDerivation' genericBuild (finalAttrs: + +{ /* + pname: Nix package name without special symbols and without version or + "emacs-" prefix. + */ + pname + /* + ename: Original Emacs package name, possibly containing special symbols. + Default: pname + */ +, ename ? pname + /* + version: Either a stable version such as "1.2" or an unstable version. + An unstable version can use either Nix format (preferred) such as + "1.2-unstable-2024-06-01" or MELPA format such as "20240601.1230". + */ +, version + /* + commit: Optional package history commit. + Default: src.rev or "unknown" + This will be written into the generated package but it is not needed during + the build process. + */ +, commit ? (finalAttrs.src.rev or "unknown") + /* + files: Optional recipe property specifying the files used to build the package. + If null, do not set it in recipe, keeping the default upstream behaviour. + Default: null + */ +, files ? null + /* + recipe: Optional MELPA recipe. + Default: a minimally functional recipe + This can be a path of a recipe file, a string of the recipe content or an empty string. + The default value is used if it is an empty string. + */ +, recipe ? "" +, preUnpack ? "" +, postUnpack ? "" +, meta ? {} +, ... +}@args: + +{ + + elpa2nix = args.elpa2nix or ./elpa2nix.el; + melpa2nix = args.melpa2nix or ./melpa2nix.el; + + inherit commit ename files recipe; + + packageBuild = args.packageBuild or packageBuild; + + melpaVersion = args.melpaVersion or ( + let + parsed = lib.flip builtins.match version + # match <version>-unstable-YYYY-MM-DD format + "^.*-unstable-([[:digit:]]{4})-([[:digit:]]{2})-([[:digit:]]{2})$"; + unstableVersionInNixFormat = parsed != null; # heuristics + date = builtins.concatStringsSep "" parsed; + time = "0"; # unstable version in nix format lacks this info + in + if unstableVersionInNixFormat + then date + "." + time + else finalAttrs.version); + + preUnpack = '' + mkdir -p "$NIX_BUILD_TOP/recipes" + recipeFile="$NIX_BUILD_TOP/recipes/$ename" + if [ -r "$recipe" ]; then + ln -s "$recipe" "$recipeFile" + nixInfoLog "link recipe" + elif [ -n "$recipe" ]; then + printf "%s" "$recipe" > "$recipeFile" + nixInfoLog "write recipe" + else + cat > "$recipeFile" <<'EOF' +(${finalAttrs.ename} :fetcher git :url "" ${lib.optionalString (finalAttrs.files != null) ":files ${finalAttrs.files}"}) +EOF + nixInfoLog "use default recipe" + fi + nixInfoLog "recipe content:" "$(< $recipeFile)" + unset -v recipeFile + + ln -s "$packageBuild" "$NIX_BUILD_TOP/package-build" + + mkdir -p "$NIX_BUILD_TOP/packages" + '' + preUnpack; + + postUnpack = '' + mkdir -p "$NIX_BUILD_TOP/working" + ln -s "$NIX_BUILD_TOP/$sourceRoot" "$NIX_BUILD_TOP/working/$ename" + '' + postUnpack; + + buildPhase = args.buildPhase or '' + runHook preBuild + + # This is modified from stdenv buildPhase. foundMakefile is used in stdenv checkPhase. + if [[ ! ( -z "''${makeFlags-}" && -z "''${makefile:-}" && ! ( -e Makefile || -e makefile || -e GNUmakefile ) ) ]]; then + foundMakefile=1 + fi + + pushd "$NIX_BUILD_TOP" + + emacs --batch -Q \ + -L "$NIX_BUILD_TOP/package-build" \ + -l "$melpa2nix" \ + -f melpa2nix-build-package \ + $ename $melpaVersion $commit + + popd + + runHook postBuild + ''; + + installPhase = args.installPhase or '' + runHook preInstall + + archive="$NIX_BUILD_TOP/packages/$ename-$melpaVersion.el" + if [ ! -f "$archive" ]; then + archive="$NIX_BUILD_TOP/packages/$ename-$melpaVersion.tar" + fi + + emacs --batch -Q \ + -l "$elpa2nix" \ + -f elpa2nix-install-package \ + "$archive" "$out/share/emacs/site-lisp/elpa" + + runHook postInstall + ''; + + meta = { + homepage = args.src.meta.homepage or "https://melpa.org/#/${pname}"; + } // meta; +} + +) diff --git a/pkgs/applications/editors/emacs/build-support/melpa2nix.el b/pkgs/applications/editors/emacs/build-support/melpa2nix.el new file mode 100644 index 0000000000000..3de77dbf5e5c6 --- /dev/null +++ b/pkgs/applications/editors/emacs/build-support/melpa2nix.el @@ -0,0 +1,32 @@ +(require 'package) +(package-initialize) + +(require 'package-recipe) +(require 'package-build) + +(setq package-build-working-dir (expand-file-name "working/")) +(setq package-build-archive-dir (expand-file-name "packages/")) +(setq package-build-recipes-dir (expand-file-name "recipes/")) + +;; Allow installing package tarfiles larger than 10MB +(setq large-file-warning-threshold nil) + +(defun melpa2nix-build-package-1 (rcp) + (let* ((default-directory (package-recipe--working-tree rcp))) + (unwind-protect + (let ((files (package-build-expand-files-spec rcp t))) + (unless files + (error "Unable to find files matching recipe patterns")) + (if (> (length files) 1) + (package-build--build-multi-file-package rcp files) + (package-build--build-single-file-package rcp files)))))) + +(defun melpa2nix-build-package () + (unless noninteractive + (error "`melpa2nix-build-package' is to be used only with -batch")) + (pcase command-line-args-left + (`(,package ,version ,commit) + (let ((recipe (package-recipe-lookup package))) + (setf (oref recipe commit) commit) + (setf (oref recipe version) version) + (melpa2nix-build-package-1 recipe))))) diff --git a/pkgs/applications/editors/emacs/build-support/mk-wrapper-subdirs.el b/pkgs/applications/editors/emacs/build-support/mk-wrapper-subdirs.el new file mode 100644 index 0000000000000..7d30400a5c65f --- /dev/null +++ b/pkgs/applications/editors/emacs/build-support/mk-wrapper-subdirs.el @@ -0,0 +1,6 @@ +(defmacro mk-subdirs-expr (path) + `(setq load-path + (delete-dups (append '(,path) + ',(let ((default-directory path)) + (normal-top-level-add-subdirs-to-load-path)) + load-path)))) diff --git a/pkgs/applications/editors/emacs/build-support/package-build-dont-use-mtime.patch b/pkgs/applications/editors/emacs/build-support/package-build-dont-use-mtime.patch new file mode 100644 index 0000000000000..1ace7771ea3ac --- /dev/null +++ b/pkgs/applications/editors/emacs/build-support/package-build-dont-use-mtime.patch @@ -0,0 +1,21 @@ +diff --git a/package-build.el b/package-build.el +index 29cdb61..c19be1b 100644 +--- a/package-build.el ++++ b/package-build.el +@@ -923,7 +923,6 @@ DIRECTORY is a temporary directory that contains the directory + that is put in the tarball." + (let* ((name (oref rcp name)) + (version (oref rcp version)) +- (time (oref rcp time)) + (tar (expand-file-name (concat name "-" version ".tar") + package-build-archive-dir)) + (dir (concat name "-" version))) +@@ -939,7 +938,7 @@ that is put in the tarball." + ;; prevent a reproducible tarball as described at + ;; https://reproducible-builds.org/docs/archives. + "--sort=name" +- (format "--mtime=@%d" time) ++ "--mtime=@0" + "--owner=0" "--group=0" "--numeric-owner" + "--pax-option=exthdr.name=%d/PaxHeaders/%f,delete=atime,delete=ctime")) + (when (and package-build-verbose noninteractive) diff --git a/pkgs/applications/editors/emacs/build-support/trivial.nix b/pkgs/applications/editors/emacs/build-support/trivial.nix new file mode 100644 index 0000000000000..8c515363f427b --- /dev/null +++ b/pkgs/applications/editors/emacs/build-support/trivial.nix @@ -0,0 +1,38 @@ +# trivial builder for Emacs packages + +{ callPackage, lib, ... }@envargs: + +let + libBuildHelper = import ./lib-build-helper.nix; +in + +libBuildHelper.extendMkDerivation' (callPackage ./generic.nix envargs) (finalAttrs: + +args: + +{ + buildPhase = args.buildPhase or '' + runHook preBuild + + # This is modified from stdenv buildPhase. foundMakefile is used in stdenv checkPhase. + if [[ ! ( -z "''${makeFlags-}" && -z "''${makefile:-}" && ! ( -e Makefile || -e makefile || -e GNUmakefile ) ) ]]; then + foundMakefile=1 + fi + + emacs -L . --batch -f batch-byte-compile *.el + + runHook postBuild + ''; + + installPhase = args.installPhase or '' + runHook preInstall + + LISPDIR=$out/share/emacs/site-lisp + install -d $LISPDIR + install *.el *.elc $LISPDIR + + runHook postInstall + ''; +} + +) diff --git a/pkgs/applications/editors/emacs/build-support/wrapper.nix b/pkgs/applications/editors/emacs/build-support/wrapper.nix new file mode 100644 index 0000000000000..5b325f5e0a9e6 --- /dev/null +++ b/pkgs/applications/editors/emacs/build-support/wrapper.nix @@ -0,0 +1,235 @@ +/* + +# Usage + +`emacs.pkgs.withPackages` takes a single argument: a function from a package +set to a list of packages (the packages that will be available in +Emacs). For example, +``` +emacs.pkgs.withPackages (epkgs: [ epkgs.evil epkgs.magit ]) +``` +All the packages in the list should come from the provided package +set. It is possible to add any package to the list, but the provided +set is guaranteed to have consistent dependencies and be built with +the correct version of Emacs. + +# Overriding + +`emacs.pkgs.withPackages` inherits the package set which contains it, so the +correct way to override the provided package set is to override the +set which contains `emacs.pkgs.withPackages`. For example, to override +`emacs.pkgs.emacs.pkgs.withPackages`, +``` +let customEmacsPackages = + emacs.pkgs.overrideScope (self: super: { + # use a custom version of emacs + emacs = ...; + # use the unstable MELPA version of magit + magit = self.melpaPackages.magit; + }); +in customEmacsPackages.withPackages (epkgs: [ epkgs.evil epkgs.magit ]) +``` + +*/ + +{ lib, lndir, makeBinaryWrapper, runCommand }: +self: +let + inherit (self) emacs; + withNativeCompilation = emacs.withNativeCompilation or false; + withTreeSitter = emacs.withTreeSitter or false; +in +packagesFun: # packages explicitly requested by the user +let + explicitRequires = + if lib.isFunction packagesFun + then packagesFun self + else packagesFun; +in +runCommand + (lib.appendToName "with-packages" emacs).name + { + inherit emacs explicitRequires; + nativeBuildInputs = [ emacs lndir makeBinaryWrapper ]; + + preferLocalBuild = true; + allowSubstitutes = false; + + # Store all paths we want to add to emacs here, so that we only need to add + # one path to the load lists + deps = runCommand "emacs-packages-deps" + ({ + inherit explicitRequires lndir emacs; + } // lib.optionalAttrs withNativeCompilation { + inherit (emacs) LIBRARY_PATH; + }) + '' + findInputsOld() { + local pkg="$1"; shift + local var="$1"; shift + local propagatedBuildInputsFiles=("$@") + + # TODO(@Ericson2314): Restore using associative array once Darwin + # nix-shell doesn't use impure bash. This should replace the O(n) + # case with an O(1) hash map lookup, assuming bash is implemented + # well :D. + local varSlice="$var[*]" + # ''${..-} to hack around old bash empty array problem + case "''${!varSlice-}" in + *" $pkg "*) return 0 ;; + esac + unset -v varSlice + + eval "$var"'+=("$pkg")' + + if ! [ -e "$pkg" ]; then + echo "build input $pkg does not exist" >&2 + exit 1 + fi + + local file + for file in "''${propagatedBuildInputsFiles[@]}"; do + file="$pkg/nix-support/$file" + [[ -f "$file" ]] || continue + + local pkgNext + for pkgNext in $(< "$file"); do + findInputsOld "$pkgNext" "$var" "''${propagatedBuildInputsFiles[@]}" + done + done + } + mkdir -p $out/bin + mkdir -p $out/share/emacs/site-lisp + ${lib.optionalString withNativeCompilation '' + mkdir -p $out/share/emacs/native-lisp + ''} + ${lib.optionalString withTreeSitter '' + mkdir -p $out/lib + ''} + + local requires + for pkg in $explicitRequires; do + findInputsOld $pkg requires propagated-user-env-packages + done + # requires now holds all requested packages and their transitive dependencies + + linkPath() { + local pkg=$1 + local origin_path=$2 + local dest_path=$3 + + # Add the path to the search path list, but only if it exists + if [[ -d "$pkg/$origin_path" ]]; then + $lndir/bin/lndir -silent "$pkg/$origin_path" "$out/$dest_path" + fi + } + + linkEmacsPackage() { + linkPath "$1" "bin" "bin" + linkPath "$1" "share/emacs/site-lisp" "share/emacs/site-lisp" + ${lib.optionalString withNativeCompilation '' + linkPath "$1" "share/emacs/native-lisp" "share/emacs/native-lisp" + ''} + ${lib.optionalString withTreeSitter '' + linkPath "$1" "lib" "lib" + ''} + } + + # Iterate over the array of inputs (avoiding nix's own interpolation) + for pkg in "''${requires[@]}"; do + linkEmacsPackage $pkg + done + + siteStart="$out/share/emacs/site-lisp/site-start.el" + siteStartByteCompiled="$siteStart"c + subdirs="$out/share/emacs/site-lisp/subdirs.el" + subdirsByteCompiled="$subdirs"c + + # A dependency may have brought the original siteStart or subdirs, delete + # it and create our own + # Begin the new site-start.el by loading the original, which sets some + # NixOS-specific paths. Paths are searched in the reverse of the order + # they are specified in, so user and system profile paths are searched last. + # + # NOTE: Avoid displaying messages early at startup by binding + # inhibit-message to t. This would prevent the Emacs GUI from showing up + # prematurely. The messages would still be logged to the *Messages* + # buffer. + rm -f $siteStart $siteStartByteCompiled $subdirs $subdirsByteCompiled + cat >"$siteStart" <<EOF + (let ((inhibit-message t)) + (load "$emacs/share/emacs/site-lisp/site-start")) + ;; "$out/share/emacs/site-lisp" is added to load-path in wrapper.sh + ;; "$out/share/emacs/native-lisp" is added to native-comp-eln-load-path in wrapper.sh + (add-to-list 'exec-path "$out/bin") + ${lib.optionalString withTreeSitter '' + (add-to-list 'treesit-extra-load-path "$out/lib/") + ''} + EOF + + # Generate a subdirs.el that statically adds all subdirectories to load-path. + $emacs/bin/emacs \ + --batch \ + --load ${./mk-wrapper-subdirs.el} \ + --eval "(prin1 (macroexpand-1 '(mk-subdirs-expr \"$out/share/emacs/site-lisp\")))" \ + > "$subdirs" + + # Byte-compiling improves start-up time only slightly, but costs nothing. + $emacs/bin/emacs --batch -f batch-byte-compile "$siteStart" "$subdirs" + + ${lib.optionalString withNativeCompilation '' + $emacs/bin/emacs --batch \ + --eval "(add-to-list 'native-comp-eln-load-path \"$out/share/emacs/native-lisp/\")" \ + -f batch-native-compile "$siteStart" "$subdirs" + ''} + ''; + + inherit (emacs) meta; + } + '' + mkdir -p "$out/bin" + + # Wrap emacs and friends so they find our site-start.el before the original. + for prog in $emacs/bin/*; do # */ + local progname=$(basename "$prog") + rm -f "$out/bin/$progname" + + substitute ${./wrapper.sh} $out/bin/$progname \ + --subst-var-by bash ${emacs.stdenv.shell} \ + --subst-var-by wrapperSiteLisp "$deps/share/emacs/site-lisp" \ + --subst-var-by wrapperSiteLispNative "$deps/share/emacs/native-lisp" \ + --subst-var prog + chmod +x $out/bin/$progname + # Create a “NOP” binary wrapper for the pure sake of it becoming a + # non-shebang, actual binary. See the makeBinaryWrapper docs for rationale + # (summary: it allows you to use emacs as a shebang itself on Darwin, + # e.g. #!$ {emacs}/bin/emacs --script) + wrapProgramBinary $out/bin/$progname + done + + # Wrap MacOS app + # this has to pick up resources and metadata + # to recognize it as an "app" + if [ -d "$emacs/Applications/Emacs.app" ]; then + mkdir -p $out/Applications/Emacs.app/Contents/MacOS + cp -r $emacs/Applications/Emacs.app/Contents/Info.plist \ + $emacs/Applications/Emacs.app/Contents/PkgInfo \ + $emacs/Applications/Emacs.app/Contents/Resources \ + $out/Applications/Emacs.app/Contents + + + substitute ${./wrapper.sh} $out/Applications/Emacs.app/Contents/MacOS/Emacs \ + --subst-var-by bash ${emacs.stdenv.shell} \ + --subst-var-by wrapperSiteLisp "$deps/share/emacs/site-lisp" \ + --subst-var-by wrapperSiteLispNative "$deps/share/emacs/native-lisp" \ + --subst-var-by prog "$emacs/Applications/Emacs.app/Contents/MacOS/Emacs" + chmod +x $out/Applications/Emacs.app/Contents/MacOS/Emacs + wrapProgramBinary $out/Applications/Emacs.app/Contents/MacOS/Emacs + fi + + mkdir -p $out/share + # Link icons and desktop files into place + for dir in applications icons info man; do + ln -s $emacs/share/$dir $out/share/$dir + done + '' diff --git a/pkgs/applications/editors/emacs/build-support/wrapper.sh b/pkgs/applications/editors/emacs/build-support/wrapper.sh new file mode 100644 index 0000000000000..44762bd4582b0 --- /dev/null +++ b/pkgs/applications/editors/emacs/build-support/wrapper.sh @@ -0,0 +1,53 @@ +#!@bash@ + +IFS=: + +newLoadPath=() +newNativeLoadPath=() +addedNewLoadPath= +addedNewNativeLoadPath= + +if [[ -n $EMACSLOADPATH ]] +then + while read -rd: entry + do + if [[ -z $entry && -z $addedNewLoadPath ]] + then + newLoadPath+=(@wrapperSiteLisp@) + addedNewLoadPath=1 + fi + newLoadPath+=("$entry") + done <<< "$EMACSLOADPATH:" +else + newLoadPath+=(@wrapperSiteLisp@) + newLoadPath+=("") +fi + +# NOTE: Even though we treat EMACSNATIVELOADPATH like EMACSLOADPATH in +# this wrapper, empty elements in EMACSNATIVELOADPATH have no special +# meaning for Emacs. Only non-empty elements in EMACSNATIVELOADPATH +# will be prepended to native-comp-eln-load-path. +# https://git.savannah.gnu.org/cgit/emacs.git/tree/lisp/startup.el?id=3685387e609753293c4518be75e77c659c3b2d8d#n599 +if [[ -n $EMACSNATIVELOADPATH ]] +then + while read -rd: entry + do + if [[ -z $entry && -z $addedNewNativeLoadPath ]] + then + newNativeLoadPath+=(@wrapperSiteLispNative@) + addedNewNativeLoadPath=1 + fi + newNativeLoadPath+=("$entry") + done <<< "$EMACSNATIVELOADPATH:" +else + newNativeLoadPath+=(@wrapperSiteLispNative@) + newNativeLoadPath+=("") +fi + +export EMACSLOADPATH="${newLoadPath[*]}" +export emacsWithPackages_siteLisp=@wrapperSiteLisp@ + +export EMACSNATIVELOADPATH="${newNativeLoadPath[*]}" +export emacsWithPackages_siteLispNative=@wrapperSiteLispNative@ + +exec @prog@ "$@" diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix index 29e2c2d85f495..faf06ca843c7f 100644 --- a/pkgs/applications/editors/emacs/default.nix +++ b/pkgs/applications/editors/emacs/default.nix @@ -2,27 +2,13 @@ lib.makeScope pkgs.newScope (self: let - gconf = pkgs.gnome2.GConf; inherit (self) callPackage; - stdenv = if pkgs.stdenv.isDarwin - then pkgs.darwin.apple_sdk_11_0.stdenv - else pkgs.stdenv; inheritedArgs = { - inherit gconf; - inherit stdenv; - inherit (pkgs.darwin) sigtool; - inherit (pkgs.darwin.apple_sdk_11_0) llvmPackages_14; - inherit (pkgs.darwin.apple_sdk_11_0.frameworks) + inherit (pkgs.darwin.apple_sdk.frameworks) Accelerate AppKit Carbon Cocoa GSS ImageCaptureCore ImageIO IOKit OSAKit - Quartz QuartzCore UniformTypeIdentifiers WebKit; - gnutls = - if pkgs.stdenv.isDarwin - then pkgs.gnutls.override { - inherit stdenv; - inherit (pkgs.darwin.apple_sdk_11_0.frameworks) Security; - } - else pkgs.gnutls; + Quartz QuartzCore WebKit; + inherit (pkgs.darwin.apple_sdk_11_0.frameworks) UniformTypeIdentifiers; }; in { sources = import ./sources.nix { @@ -34,10 +20,6 @@ lib.makeScope pkgs.newScope (self: emacs28 = callPackage (self.sources.emacs28) inheritedArgs; - emacs28-gtk2 = self.emacs28.override { - withGTK2 = true; - }; - emacs28-gtk3 = self.emacs28.override { withGTK3 = true; }; @@ -60,6 +42,20 @@ lib.makeScope pkgs.newScope (self: withPgtk = true; }; + emacs30 = callPackage (self.sources.emacs30) inheritedArgs; + + emacs30-gtk3 = self.emacs30.override { + withGTK3 = true; + }; + + emacs30-nox = self.emacs30.override { + noGui = true; + }; + + emacs30-pgtk = self.emacs30.override { + withPgtk = true; + }; + emacs28-macport = callPackage (self.sources.emacs28-macport) inheritedArgs; emacs29-macport = callPackage (self.sources.emacs29-macport) inheritedArgs; diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-common-overrides.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-common-overrides.nix new file mode 100644 index 0000000000000..56cdd8ad733ed --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-common-overrides.nix @@ -0,0 +1,156 @@ +pkgs: lib: buildPackages: + +self: super: + +let + libExt = pkgs.stdenv.hostPlatform.extensions.sharedLibrary; +in +{ + cl-lib = null; # builtin + cl-print = null; # builtin + tle = null; # builtin + advice = null; # builtin + + # Compilation instructions for the Ada executables: + # https://www.nongnu.org/ada-mode/ + ada-mode = super.ada-mode.overrideAttrs ( + finalAttrs: previousAttrs: { + # actually unpack source of ada-mode and wisi + # which are both needed to compile the tools + # we need at runtime + dontUnpack = false; + srcs = [ + super.ada-mode.src + self.wisi.src + ]; + + sourceRoot = "ada-mode-${finalAttrs.version}"; + + nativeBuildInputs = previousAttrs.nativeBuildInputs or [ ] ++ [ + buildPackages.gnat + buildPackages.gprbuild + buildPackages.dos2unix + buildPackages.re2c + ]; + + buildInputs = previousAttrs.buildInputs or [ ] ++ [ pkgs.gnatPackages.gnatcoll-xref ]; + + buildPhase = '' + runHook preBuild + ./build.sh -j$NIX_BUILD_CORES + runHook postBuild + ''; + + postInstall = + previousAttrs.postInstall or "" + + "\n" + + '' + ./install.sh "$out" + ''; + + meta = previousAttrs.meta // { + maintainers = [ lib.maintainers.sternenseemann ]; + }; + } + ); + + eglot = super.eglot.overrideAttrs ( + finalAttrs: previousAttrs: { + postInstall = + previousAttrs.postInstall or "" + # old versions do not include an info manual + + lib.optionalString (lib.versionAtLeast "1.17.0.20240829.5352" finalAttrs.version) '' + local info_file=eglot.info + pushd $out/share/emacs/site-lisp/elpa/eglot-* + # specify output info file to override the one defined in eglot.texi + makeinfo --output=$info_file eglot.texi + install-info $info_file dir + popd + ''; + } + ); + + jinx = super.jinx.overrideAttrs (old: { + dontUnpack = false; + + nativeBuildInputs = old.nativeBuildInputs or [ ] ++ [ pkgs.pkg-config ]; + + buildInputs = old.buildInputs or [ ] ++ [ pkgs.enchant2 ]; + + postBuild = + old.postBuild or "" + + "\n" + + '' + NIX_CFLAGS_COMPILE="$($PKG_CONFIG --cflags enchant-2) $NIX_CFLAGS_COMPILE" + $CC -shared -o jinx-mod${libExt} jinx-mod.c -lenchant-2 + ''; + + postInstall = + old.postInstall or "" + + "\n" + + '' + outd=$out/share/emacs/site-lisp/elpa/jinx-* + install -m444 -t $outd jinx-mod${libExt} + rm $outd/jinx-mod.c $outd/emacs-module.h + ''; + + meta = old.meta // { + maintainers = [ lib.maintainers.DamienCassou ]; + }; + }); + + plz = super.plz.overrideAttrs (old: { + dontUnpack = false; + postPatch = + old.postPatch or "" + + "\n" + + '' + substituteInPlace plz.el \ + --replace-fail 'plz-curl-program "curl"' 'plz-curl-program "${lib.getExe pkgs.curl}"' + ''; + preInstall = + old.preInstall or "" + + "\n" + + '' + tar -cf "$ename-$version.tar" --transform "s,^,$ename-$version/," * .[!.]* + src="$ename-$version.tar" + ''; + }); + + pq = super.pq.overrideAttrs (old: { + buildInputs = old.buildInputs or [ ] ++ [ pkgs.postgresql ]; + }); + + # native compilation for tests/seq-tests.el never ends + # delete tests/seq-tests.el to workaround this + seq = super.seq.overrideAttrs (old: { + dontUnpack = false; + postUnpack = + old.postUnpack or "" + + "\n" + + '' + local content_directory=$(echo seq-*) + rm --verbose $content_directory/tests/seq-tests.el + src=$PWD/$content_directory.tar + tar --create --verbose --file=$src $content_directory + ''; + }); + + xeft = super.xeft.overrideAttrs (old: { + dontUnpack = false; + buildInputs = old.buildInputs or [ ] ++ [ pkgs.xapian ]; + buildPhase = + old.buildPhase or "" + + '' + $CXX -shared -o xapian-lite${libExt} xapian-lite.cc -lxapian + ''; + postInstall = + old.postInstall or "" + + "\n" + + '' + outd=$out/share/emacs/site-lisp/elpa/xeft-* + install -m444 -t $outd xapian-lite${libExt} + rm $outd/xapian-lite.cc $outd/emacs-module.h $outd/emacs-module-prelude.h $outd/demo.gif $outd/Makefile + ''; + }); +} diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix index 1ba0ea1519b06..f01f841edbe53 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix @@ -1,7597 +1,10057 @@ { callPackage }: - { - ace-window = callPackage ({ avy - , elpaBuild - , fetchurl - , lib }: - elpaBuild { - pname = "ace-window"; - ename = "ace-window"; - version = "0.10.0.0.20220911.35841"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/ace-window-0.10.0.0.20220911.35841.tar"; - sha256 = "0xfc1pw7m4vg0xvj40djm7rxqr0405pby3rgl5vyd8ci5kpmmvhs"; - }; - packageRequires = [ avy ]; - meta = { - homepage = "https://elpa.gnu.org/packages/ace-window.html"; - license = lib.licenses.free; - }; - }) {}; - ack = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "ack"; - ename = "ack"; - version = "1.11.0.20220924.84123"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/ack-1.11.0.20220924.84123.tar"; - sha256 = "0vic2izviakj6qh2l15jd8qm8yr0h0qhy4r8sx7zdngpi9i14r5v"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/ack.html"; - license = lib.licenses.free; - }; - }) {}; - activities = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib - , persist }: - elpaBuild { - pname = "activities"; - ename = "activities"; - version = "0.8pre0.20240328.110921"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/activities-0.8pre0.20240328.110921.tar"; - sha256 = "0b8g9zb0x0hx0fgkrvn0lr7sxakrm931m1mrdzxrg779h8h24025"; - }; - packageRequires = [ emacs persist ]; - meta = { - homepage = "https://elpa.gnu.org/packages/activities.html"; - license = lib.licenses.free; - }; - }) {}; - ada-mode = callPackage ({ elpaBuild - , emacs - , fetchurl - , gnat-compiler - , lib - , uniquify-files - , wisi }: - elpaBuild { - pname = "ada-mode"; - ename = "ada-mode"; - version = "8.1.0.0.20231018.91522"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/ada-mode-8.1.0.0.20231018.91522.tar"; - sha256 = "07kd6dj1dbds68qmi4dh4w3fc8l18jyxrfbz4lxb5v9c59hk8c46"; - }; - packageRequires = [ emacs gnat-compiler uniquify-files wisi ]; - meta = { - homepage = "https://elpa.gnu.org/packages/ada-mode.html"; - license = lib.licenses.free; - }; - }) {}; - ada-ref-man = callPackage ({ elpaBuild - , fetchurl - , lib }: - elpaBuild { - pname = "ada-ref-man"; - ename = "ada-ref-man"; - version = "2020.1.0.20201129.190419"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/ada-ref-man-2020.1.0.20201129.190419.tar"; - sha256 = "0a201fn9xs3vg52vri8aw2p56rsw428hk745m6hja6q5gn6rl0zw"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/ada-ref-man.html"; - license = lib.licenses.free; - }; - }) {}; - adaptive-wrap = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "adaptive-wrap"; - ename = "adaptive-wrap"; - version = "0.8.0.20240113.95028"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/adaptive-wrap-0.8.0.20240113.95028.tar"; - sha256 = "0dj20mmipnik62480cm11rnvsvbc3js2ql5r321kj20g87rz9l2a"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/adaptive-wrap.html"; - license = lib.licenses.free; - }; - }) {}; - adjust-parens = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "adjust-parens"; - ename = "adjust-parens"; - version = "3.2.0.20240113.95404"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/adjust-parens-3.2.0.20240113.95404.tar"; - sha256 = "0l7s63dfpar2ddiydl43m6ipzc7qghv9k5hfcnj56aj6hs7ibcd2"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/adjust-parens.html"; - license = lib.licenses.free; - }; - }) {}; - advice-patch = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "advice-patch"; - ename = "advice-patch"; - version = "0.1.0.20201220.233221"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/advice-patch-0.1.0.20201220.233221.tar"; - sha256 = "1bca9s6cxpsyvyl0fxqa59x68rpdj44kxcaxmaa0lsy10vgib542"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/advice-patch.html"; - license = lib.licenses.free; - }; - }) {}; - aggressive-completion = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "aggressive-completion"; - ename = "aggressive-completion"; - version = "1.7.0.20220417.71805"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/aggressive-completion-1.7.0.20220417.71805.tar"; - sha256 = "1nmh9as4m0xjvda1f0hda8s1wk1z973wlfxcfci768y45ffnjn0g"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/aggressive-completion.html"; - license = lib.licenses.free; - }; - }) {}; - aggressive-indent = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "aggressive-indent"; - ename = "aggressive-indent"; - version = "1.10.0.0.20230112.100030"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/aggressive-indent-1.10.0.0.20230112.100030.tar"; - sha256 = "0vp49nz5n82pcds2hxqz0fy5zcmvcrpfd1zgsm1cwyph7vvx7djj"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/aggressive-indent.html"; - license = lib.licenses.free; - }; - }) {}; - agitate = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "agitate"; - ename = "agitate"; - version = "0.0.20240117.23316"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/agitate-0.0.20240117.23316.tar"; - sha256 = "0md795hvmz15bb3vsji4p12g9lm8j34mj9wqq338dhn6zw91n5hi"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/agitate.html"; - license = lib.licenses.free; - }; - }) {}; - ahungry-theme = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "ahungry-theme"; - ename = "ahungry-theme"; - version = "1.10.0.0.20211231.115425"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/ahungry-theme-1.10.0.0.20211231.115425.tar"; - sha256 = "0iddqqkv9i3d9yajhysl54av91i0gdngxqyn7vvapf1nz3pxzrvz"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/ahungry-theme.html"; - license = lib.licenses.free; - }; - }) {}; - aircon-theme = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "aircon-theme"; - ename = "aircon-theme"; - version = "0.0.6.0.20240307.233340"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/aircon-theme-0.0.6.0.20240307.233340.tar"; - sha256 = "0wlnk169zkb3l7aw8536p6dvlf7qzqdcf0jbmn92w75hy8k7jwjk"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/aircon-theme.html"; - license = lib.licenses.free; - }; - }) {}; - all = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "all"; - ename = "all"; - version = "1.1.0.20240405.133638"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/all-1.1.0.20240405.133638.tar"; - sha256 = "0cybsyr7ksgslwdfnrz8cpymk34f9gz75ahz368rhg926qlxy95j"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/all.html"; - license = lib.licenses.free; - }; - }) {}; - altcaps = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "altcaps"; - ename = "altcaps"; - version = "1.2.0.0.20240117.23410"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/altcaps-1.2.0.0.20240117.23410.tar"; - sha256 = "0ylsxw86h2d8b407rmai174yw4hq4jjcpviz7hq2aj0amvk7p5ml"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/altcaps.html"; - license = lib.licenses.free; - }; - }) {}; - ampc = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "ampc"; - ename = "ampc"; - version = "0.2.0.20240220.181558"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/ampc-0.2.0.20240220.181558.tar"; - sha256 = "139gqhijy92qnprk25av550zd7165ilsnnmdx4v0v0fnwgxnya7h"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/ampc.html"; - license = lib.licenses.free; - }; - }) {}; - arbitools = callPackage ({ cl-lib ? null - , elpaBuild - , fetchurl - , lib }: - elpaBuild { - pname = "arbitools"; - ename = "arbitools"; - version = "0.977.0.20221212.221354"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/arbitools-0.977.0.20221212.221354.tar"; - sha256 = "0s9w9hfki33bnfgm7yyhhcl0kbpn1ahd5li7nfy409zcb5spz17h"; - }; - packageRequires = [ cl-lib ]; - meta = { - homepage = "https://elpa.gnu.org/packages/arbitools.html"; - license = lib.licenses.free; - }; - }) {}; - ascii-art-to-unicode = callPackage ({ elpaBuild - , fetchurl - , lib }: - elpaBuild { - pname = "ascii-art-to-unicode"; - ename = "ascii-art-to-unicode"; - version = "1.13.0.20230911.4520"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/ascii-art-to-unicode-1.13.0.20230911.4520.tar"; - sha256 = "10x2svbc9qkrcckwjfsd1rlcqbvapvrb80x8m0p2awffwisr165j"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/ascii-art-to-unicode.html"; - license = lib.licenses.free; - }; - }) {}; - assess = callPackage ({ elpaBuild, emacs, fetchurl, lib, m-buffer }: - elpaBuild { - pname = "assess"; - ename = "assess"; - version = "0.7.0.20240303.95456"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/assess-0.7.0.20240303.95456.tar"; - sha256 = "0yqiqlgnhqvqc4w9s05csk2h2iwyv1m32wb121v6famfqaicgl12"; - }; - packageRequires = [ emacs m-buffer ]; - meta = { - homepage = "https://elpa.gnu.org/packages/assess.html"; - license = lib.licenses.free; - }; - }) {}; - async = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "async"; - ename = "async"; - version = "1.9.8.0.20240323.191212"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/async-1.9.8.0.20240323.191212.tar"; - sha256 = "0ji1ai2zx8wly0b0f670v0wij57hrclr4yr6kwiq0ljaqnbm59h3"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/async.html"; - license = lib.licenses.free; - }; - }) {}; - auctex = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "auctex"; - ename = "auctex"; - version = "14.0.5.0.20240519.95252"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/auctex-14.0.5.0.20240519.95252.tar"; - sha256 = "0nb8djks4lpbkmsm4v8v6rnhh1wplcnarfc80fi7mglw26cls1lq"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/auctex.html"; - license = lib.licenses.free; - }; - }) {}; - aumix-mode = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "aumix-mode"; - ename = "aumix-mode"; - version = "7.0.20221221.74552"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/aumix-mode-7.0.20221221.74552.tar"; - sha256 = "0c3yhk8ir4adv3wy80iywbvl1sm86xssg0j0q4rym50pr4vqx60n"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/aumix-mode.html"; - license = lib.licenses.free; - }; - }) {}; - auto-correct = callPackage ({ elpaBuild - , fetchurl - , lib }: - elpaBuild { - pname = "auto-correct"; - ename = "auto-correct"; - version = "1.1.4.0.20221221.74656"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/auto-correct-1.1.4.0.20221221.74656.tar"; - sha256 = "10h6b5px4krcwjwhc475al9kcizijsz773zkcijrfi83283l35nc"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/auto-correct.html"; - license = lib.licenses.free; - }; - }) {}; - auto-header = callPackage ({ elpaBuild - , fetchurl - , lib }: - elpaBuild { - pname = "auto-header"; - ename = "auto-header"; - version = "0.1.2.0.20230407.82136"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/auto-header-0.1.2.0.20230407.82136.tar"; - sha256 = "1dm5nqcvbya9fyj45q6k8ni507prs3ij2q5rhdl9m8vwkq6gf72w"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/auto-header.html"; - license = lib.licenses.free; - }; - }) {}; - auto-overlays = callPackage ({ cl-lib ? null - , elpaBuild - , fetchurl - , lib }: - elpaBuild { - pname = "auto-overlays"; - ename = "auto-overlays"; - version = "0.10.10.0.20201215.220815"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/auto-overlays-0.10.10.0.20201215.220815.tar"; - sha256 = "1gmsli1bil210867x642x4zvhqradl3d4pk4n5ky5g6xp1h36c7w"; - }; - packageRequires = [ cl-lib ]; - meta = { - homepage = "https://elpa.gnu.org/packages/auto-overlays.html"; - license = lib.licenses.free; - }; - }) {}; - autocrypt = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "autocrypt"; - ename = "autocrypt"; - version = "0.4.2.0.20240410.70023"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/autocrypt-0.4.2.0.20240410.70023.tar"; - sha256 = "13g6422lcv8bjwcfrkxmw7fi5by1liz2ni6zxf10pr3qcpv6046n"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/autocrypt.html"; - license = lib.licenses.free; - }; - }) {}; - avy = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "avy"; - ename = "avy"; - version = "0.5.0.0.20230424.65712"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/avy-0.5.0.0.20230424.65712.tar"; - sha256 = "1z7d59fif97j12jx9vmk2p91sr01d53gp57gjvqdcdr2lqvdsaz8"; - }; - packageRequires = [ cl-lib emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/avy.html"; - license = lib.licenses.free; - }; - }) {}; - bbdb = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "bbdb"; - ename = "bbdb"; - version = "3.2.2.4.0.20231023.5901"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/bbdb-3.2.2.4.0.20231023.5901.tar"; - sha256 = "16m5irp1y9crv13l2qncafys4fscwq2d28ig8hnx4g5bag9bi7j4"; - }; - packageRequires = [ cl-lib emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/bbdb.html"; - license = lib.licenses.free; - }; - }) {}; - beacon = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "beacon"; - ename = "beacon"; - version = "1.3.4.0.20220729.220057"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/beacon-1.3.4.0.20220729.220057.tar"; - sha256 = "1dpd3j2aip3zi3ivbszsgrifw43bryx01df868hmrxm1s0vvjhh6"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/beacon.html"; - license = lib.licenses.free; - }; - }) {}; - beframe = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "beframe"; - ename = "beframe"; - version = "1.1.1.0.20240522.34215"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/beframe-1.1.1.0.20240522.34215.tar"; - sha256 = "1ws11ynbcgi37sbh6p3nilq9ca26694qzqvd1h4dk0lb815b66l4"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/beframe.html"; - license = lib.licenses.free; - }; - }) {}; - bicep-ts-mode = callPackage ({ elpaBuild - , fetchurl - , lib }: - elpaBuild { - pname = "bicep-ts-mode"; - ename = "bicep-ts-mode"; - version = "0.1.3.0.20240218.140135"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/bicep-ts-mode-0.1.3.0.20240218.140135.tar"; - sha256 = "1qa1ws7hvn7ni8qnrzhmwnf8hq2wb3dc36i49vdiv0rf68kci210"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/bicep-ts-mode.html"; - license = lib.licenses.free; - }; - }) {}; - bind-key = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "bind-key"; - ename = "bind-key"; - version = "2.4.1.0.20240321.194020"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/bind-key-2.4.1.0.20240321.194020.tar"; - sha256 = "02v2pc830b9vp0rmdxwcxjj36y5x2p8sy381h3c8hsi61pwyqy93"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/bind-key.html"; - license = lib.licenses.free; - }; - }) {}; - blist = callPackage ({ elpaBuild, emacs, fetchurl, ilist, lib }: - elpaBuild { - pname = "blist"; - ename = "blist"; - version = "0.3.0.20231213.61103"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/blist-0.3.0.20231213.61103.tar"; - sha256 = "01pqf794syngh6v4bym3qzg2rh2gp3z9h6hvpw74nadimfg5pz61"; - }; - packageRequires = [ emacs ilist ]; - meta = { - homepage = "https://elpa.gnu.org/packages/blist.html"; - license = lib.licenses.free; - }; - }) {}; - bluetooth = callPackage ({ dash - , elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "bluetooth"; - ename = "bluetooth"; - version = "0.3.1.0.20230119.122638"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/bluetooth-0.3.1.0.20230119.122638.tar"; - sha256 = "1s5vfprs06xf400p01qiwxbcy0y05pbgmp731c8z3zyk5ai4s88g"; - }; - packageRequires = [ dash emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/bluetooth.html"; - license = lib.licenses.free; - }; - }) {}; - bnf-mode = callPackage ({ cl-lib ? null - , elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "bnf-mode"; - ename = "bnf-mode"; - version = "0.4.5.0.20221205.150230"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/bnf-mode-0.4.5.0.20221205.150230.tar"; - sha256 = "0ljzk39ck12hyshm32vbwjx1a87dw7v9v3wmf01cyc7k2i5d8rip"; - }; - packageRequires = [ cl-lib emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/bnf-mode.html"; - license = lib.licenses.free; - }; - }) {}; - boxy = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "boxy"; - ename = "boxy"; - version = "1.1.4.0.20240505.204058"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/boxy-1.1.4.0.20240505.204058.tar"; - sha256 = "18sgxarymy65vjzb94jjd0npxfd7920xlw49py5lc2y8d508p3rf"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/boxy.html"; - license = lib.licenses.free; - }; - }) {}; - boxy-headings = callPackage ({ boxy - , elpaBuild - , emacs - , fetchurl - , lib - , org }: - elpaBuild { - pname = "boxy-headings"; - ename = "boxy-headings"; - version = "2.1.6.0.20240505.204122"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/boxy-headings-2.1.6.0.20240505.204122.tar"; - sha256 = "1m3k25j5z7q1gz2bbmyjkh79rq2b4350zz6csb2l0l8s4g1yddph"; - }; - packageRequires = [ boxy emacs org ]; - meta = { - homepage = "https://elpa.gnu.org/packages/boxy-headings.html"; - license = lib.licenses.free; - }; - }) {}; - breadcrumb = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib - , project }: - elpaBuild { - pname = "breadcrumb"; - ename = "breadcrumb"; - version = "1.0.1.0.20231126.221621"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/breadcrumb-1.0.1.0.20231126.221621.tar"; - sha256 = "11qx345ggpm78dcvlrnji50b50wh3cv3i0ihxwxsw55n86kv9x0k"; - }; - packageRequires = [ emacs project ]; - meta = { - homepage = "https://elpa.gnu.org/packages/breadcrumb.html"; - license = lib.licenses.free; - }; - }) {}; - brief = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib, nadvice }: - elpaBuild { - pname = "brief"; - ename = "brief"; - version = "5.91.0.20240401.34715"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/brief-5.91.0.20240401.34715.tar"; - sha256 = "1knpamvbpz92b9zql6p0l7g1p5595l6kns0gw1vfhm7cl37dngyr"; - }; - packageRequires = [ cl-lib nadvice ]; - meta = { - homepage = "https://elpa.gnu.org/packages/brief.html"; - license = lib.licenses.free; - }; - }) {}; - buffer-env = callPackage ({ compat - , elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "buffer-env"; - ename = "buffer-env"; - version = "0.6.0.20240323.72724"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/buffer-env-0.6.0.20240323.72724.tar"; - sha256 = "061cbq2pb5wg3jap3l9lbm1axb700aqar9s8vx2zys0hl65klw51"; - }; - packageRequires = [ compat emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/buffer-env.html"; - license = lib.licenses.free; - }; - }) {}; - buffer-expose = callPackage ({ cl-lib ? null - , elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "buffer-expose"; - ename = "buffer-expose"; - version = "0.4.3.0.20190429.135558"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/buffer-expose-0.4.3.0.20190429.135558.tar"; - sha256 = "0f3a064i4a1ylb1ibqmz302h24kymir3zj1d225b7v6r89nam216"; - }; - packageRequires = [ cl-lib emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/buffer-expose.html"; - license = lib.licenses.free; - }; - }) {}; - bufferlo = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "bufferlo"; - ename = "bufferlo"; - version = "0.8.0.20240516.162426"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/bufferlo-0.8.0.20240516.162426.tar"; - sha256 = "1w4vw1f5qmgv9207wpgmw5ahq4kans5dh775l213vzh32s6cdxx1"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/bufferlo.html"; - license = lib.licenses.free; - }; - }) {}; - bug-hunter = callPackage ({ cl-lib ? null - , elpaBuild - , fetchurl - , lib - , seq }: - elpaBuild { - pname = "bug-hunter"; - ename = "bug-hunter"; - version = "1.3.1.0.20201128.92354"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/bug-hunter-1.3.1.0.20201128.92354.tar"; - sha256 = "1bskf9csg49n4cisl57wv0sa74s6v3wffdxw80m3r2yr0kx01cfs"; - }; - packageRequires = [ cl-lib seq ]; - meta = { - homepage = "https://elpa.gnu.org/packages/bug-hunter.html"; - license = lib.licenses.free; - }; - }) {}; - buildbot = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "buildbot"; - ename = "buildbot"; - version = "0.0.1.0.20230726.134747"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/buildbot-0.0.1.0.20230726.134747.tar"; - sha256 = "1z27pfx3h1fad9wiazrkqgfdc1h06g2rlb3cq1zk83hilg64nnjd"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/buildbot.html"; - license = lib.licenses.free; - }; - }) {}; - calibre = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "calibre"; - ename = "calibre"; - version = "1.4.1.0.20240208.85735"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/calibre-1.4.1.0.20240208.85735.tar"; - sha256 = "1rbmck8bc28c2rf321606w748nqc5klly6yrm3r8zyviggwd1v2c"; - }; - packageRequires = [ compat emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/calibre.html"; - license = lib.licenses.free; - }; - }) {}; - cape = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "cape"; - ename = "cape"; - version = "1.5.0.20240517.221612"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/cape-1.5.0.20240517.221612.tar"; - sha256 = "1gxk070lf204hp62zlxqkc0h8k7ml6sywms1m8kadbl650dl8fdc"; - }; - packageRequires = [ compat emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/cape.html"; - license = lib.licenses.free; - }; - }) {}; - capf-autosuggest = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "capf-autosuggest"; - ename = "capf-autosuggest"; - version = "0.3.0.20211123.104430"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/capf-autosuggest-0.3.0.20211123.104430.tar"; - sha256 = "0f16csl2ky8kys3wcv41zqh1l9976gc009pjy21kp6ck0pm0m3kg"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/capf-autosuggest.html"; - license = lib.licenses.free; - }; - }) {}; - caps-lock = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "caps-lock"; - ename = "caps-lock"; - version = "1.0.0.20221221.74713"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/caps-lock-1.0.0.20221221.74713.tar"; - sha256 = "0f8n79yw9zs1cpa8nhqmvw95kj762lv8rzrkj30ybvj1612vl1z9"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/caps-lock.html"; - license = lib.licenses.free; - }; - }) {}; - captain = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "captain"; - ename = "captain"; - version = "1.0.3.0.20221221.74732"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/captain-1.0.3.0.20221221.74732.tar"; - sha256 = "0ay26xzbhrxgvslrwcc504k5s0kxk0c8rnps656xz1wl38fbvm5b"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/captain.html"; - license = lib.licenses.free; - }; - }) {}; - chess = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "chess"; - ename = "chess"; - version = "2.0.5.0.20220926.150547"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/chess-2.0.5.0.20220926.150547.tar"; - sha256 = "16md052m600mmy43fgpcpwl4jz5q67v9w2h3y234ild6sp1qanlj"; - }; - packageRequires = [ cl-lib ]; - meta = { - homepage = "https://elpa.gnu.org/packages/chess.html"; - license = lib.licenses.free; - }; - }) {}; - cl-generic = callPackage ({ elpaBuild - , fetchurl - , lib }: - elpaBuild { - pname = "cl-generic"; - ename = "cl-generic"; - version = "0.3.0.20221221.74800"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/cl-generic-0.3.0.20221221.74800.tar"; - sha256 = "1yhjgcc3rnhi0kf2mgm7yii1pa9hzz0dnfkg393p456rl07q7vqq"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/cl-generic.html"; - license = lib.licenses.free; - }; - }) {}; - cl-lib = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "cl-lib"; - ename = "cl-lib"; - version = "0.7.1.0.20221221.74809"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/cl-lib-0.7.1.0.20221221.74809.tar"; - sha256 = "1xig9cma7p5bplnqnxmwh1axxlf813ar69bzyvks09yhg04jikm1"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/cl-lib.html"; - license = lib.licenses.free; - }; - }) {}; - clipboard-collector = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "clipboard-collector"; - ename = "clipboard-collector"; - version = "0.3.0.20190215.154741"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/clipboard-collector-0.3.0.20190215.154741.tar"; - sha256 = "03y1wivagbsl4f2qgmxcy43pbpvpxhd1d57ihpdvsl2illb6bwlq"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/clipboard-collector.html"; - license = lib.licenses.free; - }; - }) {}; - cobol-mode = callPackage ({ cl-lib ? null - , elpaBuild - , fetchurl - , lib }: - elpaBuild { - pname = "cobol-mode"; - ename = "cobol-mode"; - version = "1.1.0.20221221.74904"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/cobol-mode-1.1.0.20221221.74904.tar"; - sha256 = "0268d848pj3vszspmbcz9923945pzz4kzcd0jcrl7k3dasg3mpka"; - }; - packageRequires = [ cl-lib ]; - meta = { - homepage = "https://elpa.gnu.org/packages/cobol-mode.html"; - license = lib.licenses.free; - }; - }) {}; - code-cells = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "code-cells"; - ename = "code-cells"; - version = "0.4.0.20231119.213845"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/code-cells-0.4.0.20231119.213845.tar"; - sha256 = "1i66d234fb9g4aqnpzjz9dn6hs37bq5l1vrk076hib1rb1vm36ir"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/code-cells.html"; - license = lib.licenses.free; - }; - }) {}; - colorful-mode = callPackage ({ compat - , elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "colorful-mode"; - ename = "colorful-mode"; - version = "1.0.0.0.20240427.103837"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/colorful-mode-1.0.0.0.20240427.103837.tar"; - sha256 = "1ggasm3b678rnh96l4bynlbqciwsznsrljhxsi9ifak4xb3zlg8s"; - }; - packageRequires = [ compat emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/colorful-mode.html"; - license = lib.licenses.free; - }; - }) {}; - comint-mime = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "comint-mime"; - ename = "comint-mime"; - version = "0.4.0.20240426.193136"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/comint-mime-0.4.0.20240426.193136.tar"; - sha256 = "1znk6anr6yxb9jfh3z7702msl011k54z37vbixbdk2bvd7hihcx3"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/comint-mime.html"; - license = lib.licenses.free; - }; - }) {}; - compact-docstrings = callPackage ({ elpaBuild - , fetchurl - , lib }: - elpaBuild { - pname = "compact-docstrings"; - ename = "compact-docstrings"; - version = "0.2.0.20220305.183958"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/compact-docstrings-0.2.0.20220305.183958.tar"; - sha256 = "024l45bxxkh6x7rd8qcmykxdhdj0yckcf7vzacl7ynzwm9ah7sry"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/compact-docstrings.html"; - license = lib.licenses.free; - }; - }) {}; - company = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "company"; - ename = "company"; - version = "0.10.2.0.20240514.232026"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/company-0.10.2.0.20240514.232026.tar"; - sha256 = "10sh1pi3wb38r5v6vka0g3dxsmp3yr6p2iqrr3icqrx8mbz2mhvz"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/company.html"; - license = lib.licenses.free; - }; - }) {}; - company-ebdb = callPackage ({ company - , ebdb - , elpaBuild - , fetchurl - , lib }: - elpaBuild { - pname = "company-ebdb"; - ename = "company-ebdb"; - version = "1.1.0.20221221.74915"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/company-ebdb-1.1.0.20221221.74915.tar"; - sha256 = "1qidrgcm2hdkrbh75rjfzxbmbyvxvyfy4m2kd6lgcx0v494lzvqw"; - }; - packageRequires = [ company ebdb ]; - meta = { - homepage = "https://elpa.gnu.org/packages/company-ebdb.html"; - license = lib.licenses.free; - }; - }) {}; - company-math = callPackage ({ company - , elpaBuild - , fetchurl - , lib - , math-symbol-lists }: - elpaBuild { - pname = "company-math"; - ename = "company-math"; - version = "1.5.1.0.20221227.132907"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/company-math-1.5.1.0.20221227.132907.tar"; - sha256 = "070kfw13aw1hfvkdxb83zic44301nawnl57saqwrg6lh0psxpyxv"; - }; - packageRequires = [ company math-symbol-lists ]; - meta = { - homepage = "https://elpa.gnu.org/packages/company-math.html"; - license = lib.licenses.free; - }; - }) {}; - company-statistics = callPackage ({ company - , elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "company-statistics"; - ename = "company-statistics"; - version = "0.2.3.0.20170210.193350"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/company-statistics-0.2.3.0.20170210.193350.tar"; - sha256 = "0fwvaadfr5jlx3021kfjbij9692c2v3l600v2rwqijc563phdfg3"; - }; - packageRequires = [ company emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/company-statistics.html"; - license = lib.licenses.free; - }; - }) {}; - compat = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib - , seq }: - elpaBuild { - pname = "compat"; - ename = "compat"; - version = "29.1.4.5.0.20240520.101243"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/compat-29.1.4.5.0.20240520.101243.tar"; - sha256 = "0ik2qlvkd414fs2zpks7bfdylcwpchx0mw2d5932156k3bchm0ib"; - }; - packageRequires = [ emacs seq ]; - meta = { - homepage = "https://elpa.gnu.org/packages/compat.html"; - license = lib.licenses.free; - }; - }) {}; - consult = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "consult"; - ename = "consult"; - version = "1.6.0.20240517.91901"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/consult-1.6.0.20240517.91901.tar"; - sha256 = "0nyx7dncdqv40cfwzy2hfi4f23mph6q41yz5d04r0mzachpbh5zg"; - }; - packageRequires = [ compat emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/consult.html"; - license = lib.licenses.free; - }; - }) {}; - consult-denote = callPackage ({ consult - , denote - , elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "consult-denote"; - ename = "consult-denote"; - version = "0.0.0.0.20240521.82207"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/consult-denote-0.0.0.0.20240521.82207.tar"; - sha256 = "1yj93195gzjgwfms6k2chwbhq3w14vpab7r9dq24gjxcgb3f63w3"; - }; - packageRequires = [ consult denote emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/consult-denote.html"; - license = lib.licenses.free; - }; - }) {}; - consult-hoogle = callPackage ({ elpaBuild - , emacs - , fetchurl - , haskell-mode - , lib }: - elpaBuild { - pname = "consult-hoogle"; - ename = "consult-hoogle"; - version = "0.2.1.0.20240427.131842"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/consult-hoogle-0.2.1.0.20240427.131842.tar"; - sha256 = "05rx4kw9w51cbgx8nm1jbi2yv7p70w1yv9np8gmpj7z65gbw7v0m"; - }; - packageRequires = [ emacs haskell-mode ]; - meta = { - homepage = "https://elpa.gnu.org/packages/consult-hoogle.html"; - license = lib.licenses.free; - }; - }) {}; - consult-recoll = callPackage ({ consult - , elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "consult-recoll"; - ename = "consult-recoll"; - version = "0.8.1.0.20231211.122134"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/consult-recoll-0.8.1.0.20231211.122134.tar"; - sha256 = "1hpgcqbnvqcd6vzhxqi4axihjyp764hvbggk1skviys2apywk4s1"; - }; - packageRequires = [ consult emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/consult-recoll.html"; - license = lib.licenses.free; - }; - }) {}; - context-coloring = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "context-coloring"; - ename = "context-coloring"; - version = "8.1.0.0.20240331.133753"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/context-coloring-8.1.0.0.20240331.133753.tar"; - sha256 = "1m8c7vccdb868n777rqi8mhjwfbm25q7hbx7x6y145mxmnqr1vgn"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/context-coloring.html"; - license = lib.licenses.free; - }; - }) {}; - corfu = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "corfu"; - ename = "corfu"; - version = "1.3.0.20240514.120535"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/corfu-1.3.0.20240514.120535.tar"; - sha256 = "0nqq690pnjx7dlab6ba1y1n8m6bhbwm1yl7iqzv8php9j4bxyd20"; - }; - packageRequires = [ compat emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/corfu.html"; - license = lib.licenses.free; - }; - }) {}; - coterm = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "coterm"; - ename = "coterm"; - version = "1.6.0.20221015.160420"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/coterm-1.6.0.20221015.160420.tar"; - sha256 = "1633q3vrqhjfv4ipirirgkpmal5j1rfh6jxkq3sm3qwlg8lgak4s"; - }; - packageRequires = [ compat emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/coterm.html"; - license = lib.licenses.free; - }; - }) {}; - counsel = callPackage ({ elpaBuild - , emacs - , fetchurl - , ivy - , lib - , swiper }: - elpaBuild { - pname = "counsel"; - ename = "counsel"; - version = "0.14.2.0.20240520.132838"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/counsel-0.14.2.0.20240520.132838.tar"; - sha256 = "1xpvkyljahcjf84f4b40ivax1i06vyyyhlj3v7x0g90qjl6ba2cr"; - }; - packageRequires = [ emacs ivy swiper ]; - meta = { - homepage = "https://elpa.gnu.org/packages/counsel.html"; - license = lib.licenses.free; - }; - }) {}; - cpio-mode = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "cpio-mode"; - ename = "cpio-mode"; - version = "0.17.0.20211211.193556"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/cpio-mode-0.17.0.20211211.193556.tar"; - sha256 = "0z9dkdz1s1b7gfd0fgfxjdvbjlwwqwa6q4jjf8kkvvkgwwvqv3yq"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/cpio-mode.html"; - license = lib.licenses.free; - }; - }) {}; - cpupower = callPackage ({ elpaBuild - , fetchurl - , lib }: - elpaBuild { - pname = "cpupower"; - ename = "cpupower"; - version = "1.0.5.0.20230704.131557"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/cpupower-1.0.5.0.20230704.131557.tar"; - sha256 = "1xls5wjxrx2a193piav0yp0sv1m7jv5zqk46hbxxhfakl3jg5zlq"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/cpupower.html"; - license = lib.licenses.free; - }; - }) {}; - crdt = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "crdt"; - ename = "crdt"; - version = "0.3.5.0.20230213.22302"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/crdt-0.3.5.0.20230213.22302.tar"; - sha256 = "0cl97di7s5a1v6widil63pwzywxpcxmhvhp34kqn256czsliv4pw"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/crdt.html"; - license = lib.licenses.free; - }; - }) {}; - crisp = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "crisp"; - ename = "crisp"; - version = "1.3.6.0.20221221.74923"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/crisp-1.3.6.0.20221221.74923.tar"; - sha256 = "0kpw81h9n8qwrvmqan9bwj32d4vgsrmma4f0rig04bdx0mxmdzir"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/crisp.html"; - license = lib.licenses.free; - }; - }) {}; - csharp-mode = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "csharp-mode"; - ename = "csharp-mode"; - version = "2.0.0.0.20221205.181941"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/csharp-mode-2.0.0.0.20221205.181941.tar"; - sha256 = "1cmc6b7pwjalzipc2clis2si7d03r0glpgxj7qpvfdp26y1cjabv"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/csharp-mode.html"; - license = lib.licenses.free; - }; - }) {}; - csv-mode = callPackage ({ cl-lib ? null - , elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "csv-mode"; - ename = "csv-mode"; - version = "1.23.0.20240114.203711"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/csv-mode-1.23.0.20240114.203711.tar"; - sha256 = "0r36dycnc76a5l94ad6p7lkx0f9ma6qmjvnivimgq6man5lw6lxh"; - }; - packageRequires = [ cl-lib emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/csv-mode.html"; - license = lib.licenses.free; - }; - }) {}; - cursory = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "cursory"; - ename = "cursory"; - version = "1.0.1.0.20240425.35714"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/cursory-1.0.1.0.20240425.35714.tar"; - sha256 = "0bm381nbrnh4j0pq1a53whsbs0mjvznr9mp0ymhxw8w935cvbl72"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/cursory.html"; - license = lib.licenses.free; - }; - }) {}; - cycle-quotes = callPackage ({ elpaBuild - , fetchurl - , lib }: - elpaBuild { - pname = "cycle-quotes"; - ename = "cycle-quotes"; - version = "0.1.0.20221221.75021"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/cycle-quotes-0.1.0.20221221.75021.tar"; - sha256 = "0igwwbhf1b6c67znik3zphdngddkgai146qcjlkgg1ihr4ajc3pc"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/cycle-quotes.html"; - license = lib.licenses.free; - }; - }) {}; - dape = callPackage ({ elpaBuild, emacs, fetchurl, jsonrpc, lib }: - elpaBuild { - pname = "dape"; - ename = "dape"; - version = "0.11.1.0.20240518.161137"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/dape-0.11.1.0.20240518.161137.tar"; - sha256 = "1v359ilhbpsvyvr7x1c9lj2hadsblp2lxd7vwsqx87bf1ls2cpzi"; - }; - packageRequires = [ emacs jsonrpc ]; - meta = { - homepage = "https://elpa.gnu.org/packages/dape.html"; - license = lib.licenses.free; - }; - }) {}; - darkroom = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "darkroom"; - ename = "darkroom"; - version = "0.3.0.20200507.173652"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/darkroom-0.3.0.20200507.173652.tar"; - sha256 = "1j57wa2jhpjs6ynda73s0vv4dzyr9jg0lifv7nc8bv79lr4sjab2"; - }; - packageRequires = [ cl-lib ]; - meta = { - homepage = "https://elpa.gnu.org/packages/darkroom.html"; - license = lib.licenses.free; - }; - }) {}; - dash = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "dash"; - ename = "dash"; - version = "2.19.1.0.20240510.132708"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/dash-2.19.1.0.20240510.132708.tar"; - sha256 = "1m16w781gzsjim087jj8n42kn1lrvkplsigbsx0l7fd6hqagyl2k"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/dash.html"; - license = lib.licenses.free; - }; - }) {}; - dbus-codegen = callPackage ({ cl-lib ? null - , elpaBuild - , fetchurl - , lib }: - elpaBuild { - pname = "dbus-codegen"; - ename = "dbus-codegen"; - version = "0.1.0.20220306.62546"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/dbus-codegen-0.1.0.20220306.62546.tar"; - sha256 = "1jg8ibxy79g93b3hl97bpgz90ny5q936k8bjcmxix7hn82wg7a9l"; - }; - packageRequires = [ cl-lib ]; - meta = { - homepage = "https://elpa.gnu.org/packages/dbus-codegen.html"; - license = lib.licenses.free; - }; - }) {}; - debbugs = callPackage ({ elpaBuild, emacs, fetchurl, lib, soap-client }: - elpaBuild { - pname = "debbugs"; - ename = "debbugs"; - version = "0.40.0.20240318.175047"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/debbugs-0.40.0.20240318.175047.tar"; - sha256 = "02kb6klsixyxn4a65mgr9m8n1cx68n7zqyym8m14381k0mi8pq0h"; - }; - packageRequires = [ emacs soap-client ]; - meta = { - homepage = "https://elpa.gnu.org/packages/debbugs.html"; - license = lib.licenses.free; - }; - }) {}; - delight = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib, nadvice }: - elpaBuild { - pname = "delight"; - ename = "delight"; - version = "1.7.0.20200711.42851"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/delight-1.7.0.20200711.42851.tar"; - sha256 = "1v8yhii0s1rs1c2i7gs2rd98224qhpkybvrks8w5ghq4p3nxrrvw"; - }; - packageRequires = [ cl-lib nadvice ]; - meta = { - homepage = "https://elpa.gnu.org/packages/delight.html"; - license = lib.licenses.free; - }; - }) {}; - denote = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "denote"; - ename = "denote"; - version = "2.3.5.0.20240520.93621"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/denote-2.3.5.0.20240520.93621.tar"; - sha256 = "12mxsadpikjp3315cd20cp59r9f3g9jznkljp2yc3bkkjfrbjz5v"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/denote.html"; - license = lib.licenses.free; - }; - }) {}; - denote-menu = callPackage ({ denote - , elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "denote-menu"; - ename = "denote-menu"; - version = "1.2.0.0.20230927.131718"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/denote-menu-1.2.0.0.20230927.131718.tar"; - sha256 = "0pq8k2aif60y22sjxs6d4vlf43fqlizs1zlk3wrd1k52sn2dkgxp"; - }; - packageRequires = [ denote emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/denote-menu.html"; - license = lib.licenses.free; - }; - }) {}; - detached = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "detached"; - ename = "detached"; - version = "0.10.1.0.20221129.143049"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/detached-0.10.1.0.20221129.143049.tar"; - sha256 = "0fidhqf1m599v939hv3xsqbkckgk2fm550i7lkh0p961a3v542i8"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/detached.html"; - license = lib.licenses.free; - }; - }) {}; - devdocs = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "devdocs"; - ename = "devdocs"; - version = "0.6.1.0.20240428.71147"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/devdocs-0.6.1.0.20240428.71147.tar"; - sha256 = "0pvv4rvr14rc51gxb20zbyh42ijpq37dsmlzdsk8ypbfbgz3jw1s"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/devdocs.html"; - license = lib.licenses.free; - }; - }) {}; - devicetree-ts-mode = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "devicetree-ts-mode"; - ename = "devicetree-ts-mode"; - version = "0.3.0.20240117.132538"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/devicetree-ts-mode-0.3.0.20240117.132538.tar"; - sha256 = "12jfiv7j0k5sqjbz28nd5x34hpxp76lyl41fl7bvsgiyb06i0gnf"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/devicetree-ts-mode.html"; - license = lib.licenses.free; - }; - }) {}; - dict-tree = callPackage ({ elpaBuild - , emacs - , fetchurl - , heap - , lib - , tNFA - , trie }: - elpaBuild { - pname = "dict-tree"; - ename = "dict-tree"; - version = "0.17.0.20231015.24654"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/dict-tree-0.17.0.20231015.24654.tar"; - sha256 = "0nij9pkscr6mdjmrq9dlqnks91sd21pn01bsgn4zk918zygnkggj"; - }; - packageRequires = [ emacs heap tNFA trie ]; - meta = { - homepage = "https://elpa.gnu.org/packages/dict-tree.html"; - license = lib.licenses.free; - }; - }) {}; - diff-hl = callPackage ({ cl-lib ? null - , elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "diff-hl"; - ename = "diff-hl"; - version = "1.9.2.0.20240505.211034"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/diff-hl-1.9.2.0.20240505.211034.tar"; - sha256 = "0mbxas2mx0pyvs3ccpp6ss2q8j7n5mva1ngg004fdhp8br8qknhn"; - }; - packageRequires = [ cl-lib emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/diff-hl.html"; - license = lib.licenses.free; - }; - }) {}; - diffview = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "diffview"; - ename = "diffview"; - version = "1.0.0.20230224.111651"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/diffview-1.0.0.20230224.111651.tar"; - sha256 = "1shw58jk2dzr8sc9hhfjqjrmwqarvq989ic96zjmhajxvcqcz3ql"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/diffview.html"; - license = lib.licenses.free; - }; - }) {}; - diminish = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "diminish"; - ename = "diminish"; - version = "0.46.0.20220909.84745"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/diminish-0.46.0.20220909.84745.tar"; - sha256 = "1d31bk42p1qjhpbr6lin87y18nya1qk9dm37vhhiq5sxajfr5ab9"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/diminish.html"; - license = lib.licenses.free; - }; - }) {}; - dired-du = callPackage ({ cl-lib ? null - , elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "dired-du"; - ename = "dired-du"; - version = "0.5.2.0.20221221.75108"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/dired-du-0.5.2.0.20221221.75108.tar"; - sha256 = "0h31k45sx47vmk20sn77fzz86gbwiqxrryr091p5s05smrlsfxc2"; - }; - packageRequires = [ cl-lib emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/dired-du.html"; - license = lib.licenses.free; - }; - }) {}; - dired-duplicates = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "dired-duplicates"; - ename = "dired-duplicates"; - version = "0.4.0.20240328.201645"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/dired-duplicates-0.4.0.20240328.201645.tar"; - sha256 = "0122wxl2sql31s4h7rf7mxz6kv15m77q9bqmixxsgzhfghbia7k7"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/dired-duplicates.html"; - license = lib.licenses.free; - }; - }) {}; - dired-git-info = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "dired-git-info"; - ename = "dired-git-info"; - version = "0.3.1.0.20191229.192948"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/dired-git-info-0.3.1.0.20191229.192948.tar"; - sha256 = "0zq74nynra4cbyb81l3v9w0qrzz057z9abg6c6zjshlrq8kxv5kx"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/dired-git-info.html"; - license = lib.licenses.free; - }; - }) {}; - dired-preview = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "dired-preview"; - ename = "dired-preview"; - version = "0.2.0.0.20240507.55800"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/dired-preview-0.2.0.0.20240507.55800.tar"; - sha256 = "1m7zgmjhw86yrhj5chci73rbgky3ybzni5j6xvwpxqxl6g41ph04"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/dired-preview.html"; - license = lib.licenses.free; - }; - }) {}; - disk-usage = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "disk-usage"; - ename = "disk-usage"; - version = "1.3.3.0.20230920.164444"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/disk-usage-1.3.3.0.20230920.164444.tar"; - sha256 = "06vd56yaaz9a6b46g4r6ccasc74pyqls9krj3bcrdayhj34w3mxy"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/disk-usage.html"; - license = lib.licenses.free; - }; - }) {}; - dismal = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "dismal"; - ename = "dismal"; - version = "1.5.2.0.20221221.75154"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/dismal-1.5.2.0.20221221.75154.tar"; - sha256 = "0nyy9dkafkzxvx60d1bzrn2a1m3n53al3x17r3kf7d2b24gcljbd"; - }; - packageRequires = [ cl-lib emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/dismal.html"; - license = lib.licenses.free; - }; - }) {}; - djvu = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "djvu"; - ename = "djvu"; - version = "1.1.2.0.20221221.75224"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/djvu-1.1.2.0.20221221.75224.tar"; - sha256 = "0iirmzaah0nix14jaj0hnszrdkdsh4wli8hb951l7iw7szkc5fsp"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/djvu.html"; - license = lib.licenses.free; - }; - }) {}; - do-at-point = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "do-at-point"; - ename = "do-at-point"; - version = "0.1.1.0.20231027.63811"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/do-at-point-0.1.1.0.20231027.63811.tar"; - sha256 = "1cf4inz5805vd9hcrqsmwxjzc8wy7qwwxg9731d03czjxxcvyp0d"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/do-at-point.html"; - license = lib.licenses.free; - }; - }) {}; - doc-toc = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "doc-toc"; - ename = "doc-toc"; - version = "1.2.0.20230409.212954"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/doc-toc-1.2.0.20230409.212954.tar"; - sha256 = "1gcdkcb1ydgl24jmrnkg1a7kndl7kkvckwf12y5pj2l2idf9ifx8"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/doc-toc.html"; - license = lib.licenses.free; - }; - }) {}; - docbook = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "docbook"; - ename = "docbook"; - version = "0.1.0.20221221.75233"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/docbook-0.1.0.20221221.75233.tar"; - sha256 = "0r7sjnbj4wgqa2vw57ac28gixw762km0cwas0qhclxizb95nsnz2"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/docbook.html"; - license = lib.licenses.free; - }; - }) {}; - drepl = callPackage ({ comint-mime, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "drepl"; - ename = "drepl"; - version = "0.3.0.20240511.124331"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/drepl-0.3.0.20240511.124331.tar"; - sha256 = "0xfmna8a8nh48ir9nl5gv4y03kqsvrzars74lza5k0cdsslga4gr"; - }; - packageRequires = [ comint-mime emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/drepl.html"; - license = lib.licenses.free; - }; - }) {}; - dts-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "dts-mode"; - ename = "dts-mode"; - version = "1.0.0.20221221.75311"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/dts-mode-1.0.0.20221221.75311.tar"; - sha256 = "1bpd6npx70rzh3mb5235g1ydh839bnjag70qp17r0wd2wkj6w0gj"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/dts-mode.html"; - license = lib.licenses.free; - }; - }) {}; - easy-escape = callPackage ({ elpaBuild - , fetchurl - , lib }: - elpaBuild { - pname = "easy-escape"; - ename = "easy-escape"; - version = "0.2.1.0.20210917.85414"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/easy-escape-0.2.1.0.20210917.85414.tar"; - sha256 = "0hk9244g7hgnan7xd4451qjklfqh5hbkxjl60l32nr19ynw0ygif"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/easy-escape.html"; - license = lib.licenses.free; - }; - }) {}; - easy-kill = callPackage ({ cl-lib ? null - , elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "easy-kill"; - ename = "easy-kill"; - version = "0.9.5.0.20220511.55730"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/easy-kill-0.9.5.0.20220511.55730.tar"; - sha256 = "0il8lhi2j80sz63lnjkayryikcya03zn3z40bnfjbsydpyqj4kzd"; - }; - packageRequires = [ cl-lib emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/easy-kill.html"; - license = lib.licenses.free; - }; - }) {}; - ebdb = callPackage ({ elpaBuild, emacs, fetchurl, lib, seq }: - elpaBuild { - pname = "ebdb"; - ename = "ebdb"; - version = "0.8.22.0.20240305.123820"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/ebdb-0.8.22.0.20240305.123820.tar"; - sha256 = "0j6wflmslapq3wr5bg6ql7qamh9k9zzp1xzadkxq3i3124syanfs"; - }; - packageRequires = [ emacs seq ]; - meta = { - homepage = "https://elpa.gnu.org/packages/ebdb.html"; - license = lib.licenses.free; - }; - }) {}; - ebdb-gnorb = callPackage ({ ebdb - , elpaBuild - , fetchurl - , gnorb - , lib }: - elpaBuild { - pname = "ebdb-gnorb"; - ename = "ebdb-gnorb"; - version = "1.0.2.0.20221221.75324"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/ebdb-gnorb-1.0.2.0.20221221.75324.tar"; - sha256 = "0lzsarv0pkdgkj19il0syk7yz6gcfkp0rl3i49rsqb3lpf5b6s5q"; - }; - packageRequires = [ ebdb gnorb ]; - meta = { - homepage = "https://elpa.gnu.org/packages/ebdb-gnorb.html"; - license = lib.licenses.free; - }; - }) {}; - ebdb-i18n-chn = callPackage ({ ebdb - , elpaBuild - , fetchurl - , lib - , pyim }: - elpaBuild { - pname = "ebdb-i18n-chn"; - ename = "ebdb-i18n-chn"; - version = "1.3.2.0.20221221.75334"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/ebdb-i18n-chn-1.3.2.0.20221221.75334.tar"; - sha256 = "16hna0z08903pkq957cgxk26ihq6j3fab775ickb24zfssjm3l61"; - }; - packageRequires = [ ebdb pyim ]; - meta = { - homepage = "https://elpa.gnu.org/packages/ebdb-i18n-chn.html"; - license = lib.licenses.free; - }; - }) {}; - ediprolog = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "ediprolog"; - ename = "ediprolog"; - version = "2.2.0.20221026.91800"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/ediprolog-2.2.0.20221026.91800.tar"; - sha256 = "0y2xa0k7sv21yabxkfzxnl0fdnppgcwx5jdnm1zw2j2sbaf9k6ca"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/ediprolog.html"; - license = lib.licenses.free; - }; - }) {}; - eev = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "eev"; - ename = "eev"; - version = "20240513.0.20240517.104050"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/eev-20240513.0.20240517.104050.tar"; - sha256 = "03bdj2f3y5xj33vq7mgxb8s0n05b5qnrsbak2xqjv2bgfky08dmq"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/eev.html"; - license = lib.licenses.free; - }; - }) {}; - ef-themes = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "ef-themes"; - ename = "ef-themes"; - version = "1.7.0.0.20240510.44643"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/ef-themes-1.7.0.0.20240510.44643.tar"; - sha256 = "0iygfxy4h74nd2glx7kb4faw4b0f2gpfakdwi1icfkkn021kr781"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/ef-themes.html"; - license = lib.licenses.free; - }; - }) {}; - eglot = callPackage ({ compat - , eldoc - , elpaBuild - , emacs - , external-completion - , fetchurl - , flymake ? null - , jsonrpc - , lib - , project - , seq - , track-changes - , xref }: - elpaBuild { - pname = "eglot"; - ename = "eglot"; - version = "1.17.0.20240518.213720"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/eglot-1.17.0.20240518.213720.tar"; - sha256 = "10hpsip9ai41pxh5a32dwh9z90h2lrjvd3jh666zl3m11g906iwh"; - }; - packageRequires = [ - compat - eldoc - emacs - external-completion - flymake - jsonrpc - project - seq - track-changes - xref - ]; - meta = { - homepage = "https://elpa.gnu.org/packages/eglot.html"; - license = lib.licenses.free; - }; - }) {}; - el-search = callPackage ({ cl-print ? null - , elpaBuild - , emacs - , fetchurl - , lib - , stream }: - elpaBuild { - pname = "el-search"; - ename = "el-search"; - version = "1.12.6.1.0.20221221.75346"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/el-search-1.12.6.1.0.20221221.75346.tar"; - sha256 = "12500xc7aln09kzf3kn6xq7xnphbqzmyz20h0sgpf8f1rvlh2h33"; - }; - packageRequires = [ cl-print emacs stream ]; - meta = { - homepage = "https://elpa.gnu.org/packages/el-search.html"; - license = lib.licenses.free; - }; - }) {}; - eldoc = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "eldoc"; - ename = "eldoc"; - version = "1.15.0.0.20240223.120227"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/eldoc-1.15.0.0.20240223.120227.tar"; - sha256 = "1jlvlzd2bvz0xgc8gdlzw655v5qiaihc4wz5k3yqqck6dbmhd8fy"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/eldoc.html"; - license = lib.licenses.free; - }; - }) {}; - electric-spacing = callPackage ({ elpaBuild - , fetchurl - , lib }: - elpaBuild { - pname = "electric-spacing"; - ename = "electric-spacing"; - version = "5.0.0.20201201.154407"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/electric-spacing-5.0.0.20201201.154407.tar"; - sha256 = "0ywa68zwci0v6g9nc8czlhvf9872vl262nrxffahc5r7lp1hay8k"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/electric-spacing.html"; - license = lib.licenses.free; - }; - }) {}; - elisp-benchmarks = callPackage ({ elpaBuild - , fetchurl - , lib }: - elpaBuild { - pname = "elisp-benchmarks"; - ename = "elisp-benchmarks"; - version = "1.16.0.20240518.180006"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/elisp-benchmarks-1.16.0.20240518.180006.tar"; - sha256 = "1pc3qs0j8hh68lbh4lqyf2xkahiylpqaaac3cpvard0wdp9b4wsr"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/elisp-benchmarks.html"; - license = lib.licenses.free; - }; - }) {}; - ellama = callPackage ({ elpaBuild, emacs, fetchurl, lib, llm, spinner }: - elpaBuild { - pname = "ellama"; - ename = "ellama"; - version = "0.9.4.0.20240517.145740"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/ellama-0.9.4.0.20240517.145740.tar"; - sha256 = "0qb849ij6v7d8kk9mkx7nbk24d1dh32kydjddxykyn64xixw79kc"; - }; - packageRequires = [ emacs llm spinner ]; - meta = { - homepage = "https://elpa.gnu.org/packages/ellama.html"; - license = lib.licenses.free; - }; - }) {}; - emacs-gc-stats = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "emacs-gc-stats"; - ename = "emacs-gc-stats"; - version = "1.4.2.0.20231206.152254"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/emacs-gc-stats-1.4.2.0.20231206.152254.tar"; - sha256 = "08ivfm6m9y4i1w0xmjkbs6b2h7i5q1v2991rjs2w5s9d864yqg2l"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/emacs-gc-stats.html"; - license = lib.licenses.free; - }; - }) {}; - embark = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "embark"; - ename = "embark"; - version = "1.1.0.20240418.225241"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/embark-1.1.0.20240418.225241.tar"; - sha256 = "120wh0r76wnsk5kczdnr5b7029x78fyd8p0h9rl2sbss4ac8wa48"; - }; - packageRequires = [ compat emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/embark.html"; - license = lib.licenses.free; - }; - }) {}; - embark-consult = callPackage ({ compat - , consult - , elpaBuild - , emacs - , embark - , fetchurl - , lib }: - elpaBuild { - pname = "embark-consult"; - ename = "embark-consult"; - version = "1.1.0.20240418.225241"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/embark-consult-1.1.0.20240418.225241.tar"; - sha256 = "09qqwd5p7gasazg0plz1ijq5lgxh26358sia4727rs75pxwlz0zv"; - }; - packageRequires = [ compat consult emacs embark ]; - meta = { - homepage = "https://elpa.gnu.org/packages/embark-consult.html"; - license = lib.licenses.free; - }; - }) {}; - ement = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib - , map - , persist - , plz - , svg-lib - , taxy - , taxy-magit-section - , transient }: - elpaBuild { - pname = "ement"; - ename = "ement"; - version = "0.15.0.20240416.101741"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/ement-0.15.0.20240416.101741.tar"; - sha256 = "1fjns4li3cvi3p2jkwxagzs6aj8x9s4zjc1lwpj013d54mflkndp"; - }; - packageRequires = [ - emacs - map - persist - plz - svg-lib - taxy - taxy-magit-section - transient - ]; - meta = { - homepage = "https://elpa.gnu.org/packages/ement.html"; - license = lib.licenses.free; - }; - }) {}; - emms = callPackage ({ cl-lib ? null - , elpaBuild - , fetchurl - , lib - , nadvice - , seq }: - elpaBuild { - pname = "emms"; - ename = "emms"; - version = "19.0.20240512.173549"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/emms-19.0.20240512.173549.tar"; - sha256 = "13y0g21giswhhysm5252q1rb066a3sap4z51j4cprmwhj282zglj"; - }; - packageRequires = [ cl-lib nadvice seq ]; - meta = { - homepage = "https://elpa.gnu.org/packages/emms.html"; - license = lib.licenses.free; - }; - }) {}; - engrave-faces = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "engrave-faces"; - ename = "engrave-faces"; - version = "0.3.1.0.20240421.82802"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/engrave-faces-0.3.1.0.20240421.82802.tar"; - sha256 = "0dxj9m9jyvrqhv67m2kkh0akjc7l6h40fvsy20k721zq9xvc6zkl"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/engrave-faces.html"; - license = lib.licenses.free; - }; - }) {}; - enwc = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "enwc"; - ename = "enwc"; - version = "2.0.0.20171007.121321"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/enwc-2.0.0.20171007.121321.tar"; - sha256 = "0c308kd1pinhb1lh2vi40bcnmvzydf1j7sqka9kajhxr0l4kjazb"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/enwc.html"; - license = lib.licenses.free; - }; - }) {}; - epoch-view = callPackage ({ elpaBuild - , fetchurl - , lib }: - elpaBuild { - pname = "epoch-view"; - ename = "epoch-view"; - version = "0.0.1.0.20221221.75416"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/epoch-view-0.0.1.0.20221221.75416.tar"; - sha256 = "0hd51d441c2w05rx10wpa0rbc94pjwwaqy5mxlgfwnx52jabz15h"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/epoch-view.html"; - license = lib.licenses.free; - }; - }) {}; - erc = callPackage ({ compat - , elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "erc"; - ename = "erc"; - version = "5.6snapshot0.20240518.154805"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/erc-5.6snapshot0.20240518.154805.tar"; - sha256 = "0hscaz2nn08zv54gr2xfcg4pf66hycjsz31v603mbqyzgx6538hl"; - }; - packageRequires = [ compat emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/erc.html"; - license = lib.licenses.free; - }; - }) {}; - ergoemacs-mode = callPackage ({ cl-lib ? null - , elpaBuild - , emacs - , fetchurl - , lib - , nadvice }: - elpaBuild { - pname = "ergoemacs-mode"; - ename = "ergoemacs-mode"; - version = "5.16.10.12.0.20240129.80712"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/ergoemacs-mode-5.16.10.12.0.20240129.80712.tar"; - sha256 = "0jsl7yyhbcg1y20lp50r3i3rcxmxq035mks1kwbsnyqmdikby9s3"; - }; - packageRequires = [ cl-lib emacs nadvice ]; - meta = { - homepage = "https://elpa.gnu.org/packages/ergoemacs-mode.html"; - license = lib.licenses.free; - }; - }) {}; - ess = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "ess"; - ename = "ess"; - version = "24.1.1.0.20240516.81354"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/ess-24.1.1.0.20240516.81354.tar"; - sha256 = "0r4kk65sd8kzdm11c7dz1m4qicjv6zg36r7gdg2mzpl0ym33g8aj"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/ess.html"; - license = lib.licenses.free; - }; - }) {}; - excorporate = callPackage ({ cl-lib ? null - , elpaBuild - , emacs - , fetchurl - , fsm - , lib - , nadvice - , soap-client - , url-http-ntlm - , url-http-oauth }: - elpaBuild { - pname = "excorporate"; - ename = "excorporate"; - version = "1.1.2.0.20240219.90343"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/excorporate-1.1.2.0.20240219.90343.tar"; - sha256 = "0wm1qx1y9az3fdh81hjccpsw4xxx0p9acz9pfvsyjlywclcycd4i"; - }; - packageRequires = [ - cl-lib - emacs - fsm - nadvice - soap-client - url-http-ntlm - url-http-oauth - ]; - meta = { - homepage = "https://elpa.gnu.org/packages/excorporate.html"; - license = lib.licenses.free; - }; - }) {}; - expand-region = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "expand-region"; - ename = "expand-region"; - version = "1.0.0.0.20240119.103925"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/expand-region-1.0.0.0.20240119.103925.tar"; - sha256 = "16npbi0nryvnrz61ycpdp4s4nb067brkv83ih7fymc0dlmvp1x50"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/expand-region.html"; - license = lib.licenses.free; - }; - }) {}; - expreg = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "expreg"; - ename = "expreg"; - version = "1.3.1.0.20230915.150818"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/expreg-1.3.1.0.20230915.150818.tar"; - sha256 = "11r4vwavax904dxmcpbr2nbycr7096aalblh6pfvjbhb23a0vx7m"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/expreg.html"; - license = lib.licenses.free; - }; - }) {}; - external-completion = callPackage ({ elpaBuild - , fetchurl - , lib }: - elpaBuild { - pname = "external-completion"; - ename = "external-completion"; - version = "0.1.0.20240102.22814"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/external-completion-0.1.0.20240102.22814.tar"; - sha256 = "0y2lh89zmyrfkdzwxhc7npbbyp97xi1mnr7qdlsnlnw8gllknf27"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/external-completion.html"; - license = lib.licenses.free; - }; - }) {}; - exwm = callPackage ({ elpaBuild, emacs, fetchurl, lib, xelb }: - elpaBuild { - pname = "exwm"; - ename = "exwm"; - version = "0.28.0.20240517.92828"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/exwm-0.28.0.20240517.92828.tar"; - sha256 = "0d65091s706ajfqi9kp3m6k9hvlwhab6f484fs5v14c9rvspy1pa"; - }; - packageRequires = [ emacs xelb ]; - meta = { - homepage = "https://elpa.gnu.org/packages/exwm.html"; - license = lib.licenses.free; - }; - }) {}; - f90-interface-browser = callPackage ({ cl-lib ? null - , elpaBuild - , fetchurl - , lib }: - elpaBuild { - pname = "f90-interface-browser"; - ename = "f90-interface-browser"; - version = "1.1.0.20221221.75553"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/f90-interface-browser-1.1.0.20221221.75553.tar"; - sha256 = "0qv3v3ya8qdgwq0plcc3qbba4n66fqww3sawmqhzssksry39l1yj"; - }; - packageRequires = [ cl-lib ]; - meta = { - homepage = "https://elpa.gnu.org/packages/f90-interface-browser.html"; - license = lib.licenses.free; - }; - }) {}; - face-shift = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "face-shift"; - ename = "face-shift"; - version = "0.2.1.0.20230426.73945"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/face-shift-0.2.1.0.20230426.73945.tar"; - sha256 = "0gl9k7g3wsc045dx9mp9ypk084r4j3mhf2a4xn08lzz8z8i9k2rz"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/face-shift.html"; - license = lib.licenses.free; - }; - }) {}; - filechooser = callPackage ({ compat - , elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "filechooser"; - ename = "filechooser"; - version = "0.2.0.0.20240310.203607"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/filechooser-0.2.0.0.20240310.203607.tar"; - sha256 = "1hcjnhb3bhk6im5k1mqrlb599jrdg9hxadjhvw31f5l5rjg2636l"; - }; - packageRequires = [ compat emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/filechooser.html"; - license = lib.licenses.free; - }; - }) {}; - filladapt = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "filladapt"; - ename = "filladapt"; - version = "2.12.2.0.20221221.75607"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/filladapt-2.12.2.0.20221221.75607.tar"; - sha256 = "11s9n8d4psjs4dbsx2w8hyir5hapz952da5nz3xihli8a0q93mhv"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/filladapt.html"; - license = lib.licenses.free; - }; - }) {}; - firefox-javascript-repl = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "firefox-javascript-repl"; - ename = "firefox-javascript-repl"; - version = "0.9.5.0.20230605.161924"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/firefox-javascript-repl-0.9.5.0.20230605.161924.tar"; - sha256 = "1nfkzx07j3hddai213lia9pixfrrdajrvg7fvlx5js8zxfpvcjx6"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/firefox-javascript-repl.html"; - license = lib.licenses.free; - }; - }) {}; - flylisp = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "flylisp"; - ename = "flylisp"; - version = "0.2.0.20221221.75619"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/flylisp-0.2.0.20221221.75619.tar"; - sha256 = "110hfk979c664y27qf5af54phm8i4iq5qqk5vygjwd7252nd7i4a"; - }; - packageRequires = [ cl-lib emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/flylisp.html"; - license = lib.licenses.free; - }; - }) {}; - flymake = callPackage ({ eldoc, elpaBuild, emacs, fetchurl, lib, project }: - elpaBuild { - pname = "flymake"; - ename = "flymake"; - version = "1.3.7.0.20240503.61639"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/flymake-1.3.7.0.20240503.61639.tar"; - sha256 = "0qrdjynam3nvhm5qwjks308r28f8wlgsfdmdw4d7sb4xqyr2mzrz"; - }; - packageRequires = [ eldoc emacs project ]; - meta = { - homepage = "https://elpa.gnu.org/packages/flymake.html"; - license = lib.licenses.free; - }; - }) {}; - flymake-codespell = callPackage ({ compat - , elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "flymake-codespell"; - ename = "flymake-codespell"; - version = "0.1.0.20231030.222337"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/flymake-codespell-0.1.0.20231030.222337.tar"; - sha256 = "1v3a2gg4myav4cs1vj4d5isxhbw9qvryk5r2dx3x19qqmmmm6djz"; - }; - packageRequires = [ compat emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/flymake-codespell.html"; - license = lib.licenses.free; - }; - }) {}; - flymake-proselint = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "flymake-proselint"; - ename = "flymake-proselint"; - version = "0.3.0.0.20230325.160756"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/flymake-proselint-0.3.0.0.20230325.160756.tar"; - sha256 = "1p3jpsv6w4hask7bk07dmafwgymbw3xl6i0vx0sjd0i5aa0xs9vz"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/flymake-proselint.html"; - license = lib.licenses.free; - }; - }) {}; - fontaine = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "fontaine"; - ename = "fontaine"; - version = "2.0.0.0.20240426.105847"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/fontaine-2.0.0.0.20240426.105847.tar"; - sha256 = "0h7l5agnzpq8k14c3lr6dkpsh2id9akiqa9z3x88xn440rjbld51"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/fontaine.html"; - license = lib.licenses.free; - }; - }) {}; - frame-tabs = callPackage ({ elpaBuild - , fetchurl - , lib }: - elpaBuild { - pname = "frame-tabs"; - ename = "frame-tabs"; - version = "1.1.0.20221221.75627"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/frame-tabs-1.1.0.20221221.75627.tar"; - sha256 = "08ql56h8h425ngs40m9zpy4ysxlxi74vanlkga42bskzax0ns2cm"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/frame-tabs.html"; - license = lib.licenses.free; - }; - }) {}; - frog-menu = callPackage ({ avy - , elpaBuild - , emacs - , fetchurl - , lib - , posframe }: - elpaBuild { - pname = "frog-menu"; - ename = "frog-menu"; - version = "0.2.11.0.20201115.95734"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/frog-menu-0.2.11.0.20201115.95734.tar"; - sha256 = "00ihlqq4bxgrp6hdf1b6xhnvp87ilys1ykp0l38cs5lv6a10wvqs"; - }; - packageRequires = [ avy emacs posframe ]; - meta = { - homepage = "https://elpa.gnu.org/packages/frog-menu.html"; - license = lib.licenses.free; - }; - }) {}; - fsm = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "fsm"; - ename = "fsm"; - version = "0.2.1.0.20221212.223608"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/fsm-0.2.1.0.20221212.223608.tar"; - sha256 = "1zwl1b9sn4imxynada0vf8nxwm49lh8fahxfc35czlbn0w0jqm1k"; - }; - packageRequires = [ cl-lib emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/fsm.html"; - license = lib.licenses.free; - }; - }) {}; - ftable = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "ftable"; - ename = "ftable"; - version = "1.1.0.20230102.145125"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/ftable-1.1.0.20230102.145125.tar"; - sha256 = "0231qjah5s76g8dmnc5zpn6i6lysypf6jvvzmnyyv92lr8arzmfz"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/ftable.html"; - license = lib.licenses.free; - }; - }) {}; - gcmh = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "gcmh"; - ename = "gcmh"; - version = "0.2.1.0.20201116.225142"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/gcmh-0.2.1.0.20201116.225142.tar"; - sha256 = "0yb47avdy5f3a2g9cg2028h5agsqpddsbfsc6ncavnxnnyiccj8h"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/gcmh.html"; - license = lib.licenses.free; - }; - }) {}; - ggtags = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "ggtags"; - ename = "ggtags"; - version = "0.9.0.0.20230602.13355"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/ggtags-0.9.0.0.20230602.13355.tar"; - sha256 = "1krykf1hknczhdhh8rfj4vzcba87q5sjbv0p2y41mcvmmfnhharw"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/ggtags.html"; - license = lib.licenses.free; - }; - }) {}; - gited = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "gited"; - ename = "gited"; - version = "0.6.0.0.20221221.75709"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/gited-0.6.0.0.20221221.75709.tar"; - sha256 = "095679pq1lam42zran5qjk3zd4gf908vd5fkq9jppqlilcsqf7zb"; - }; - packageRequires = [ cl-lib emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/gited.html"; - license = lib.licenses.free; - }; - }) {}; - gle-mode = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "gle-mode"; - ename = "gle-mode"; - version = "1.1.0.20221221.75729"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/gle-mode-1.1.0.20221221.75729.tar"; - sha256 = "1bakvlx4bzz62hibwwm0hmhyzqqzy31xvsg6pw3lh2i028qd1ykx"; - }; - packageRequires = [ cl-lib ]; - meta = { - homepage = "https://elpa.gnu.org/packages/gle-mode.html"; - license = lib.licenses.free; - }; - }) {}; - gnat-compiler = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib - , wisi }: - elpaBuild { - pname = "gnat-compiler"; - ename = "gnat-compiler"; - version = "1.0.3.0.20230915.165808"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/gnat-compiler-1.0.3.0.20230915.165808.tar"; - sha256 = "0rm0s33nl9dzghlfsprycr2na412z4vnfc69q2pc6nlazsliz6w0"; - }; - packageRequires = [ emacs wisi ]; - meta = { - homepage = "https://elpa.gnu.org/packages/gnat-compiler.html"; - license = lib.licenses.free; - }; - }) {}; - gnome-c-style = callPackage ({ elpaBuild - , fetchurl - , lib }: - elpaBuild { - pname = "gnome-c-style"; - ename = "gnome-c-style"; - version = "0.1.0.20230924.235858"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/gnome-c-style-0.1.0.20230924.235858.tar"; - sha256 = "0gij2d1k40yhifr7ad3p465f5lg77cb441pl41mdc0g6v5gipnqf"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/gnome-c-style.html"; - license = lib.licenses.free; - }; - }) {}; - gnorb = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "gnorb"; - ename = "gnorb"; - version = "1.6.11.0.20230108.110132"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/gnorb-1.6.11.0.20230108.110132.tar"; - sha256 = "0jha80xr8pbribp0ki40cydvi35as7v2c2xsy0anh65j9ciym5ag"; - }; - packageRequires = [ cl-lib ]; - meta = { - homepage = "https://elpa.gnu.org/packages/gnorb.html"; - license = lib.licenses.free; - }; - }) {}; - gnu-elpa = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "gnu-elpa"; - ename = "gnu-elpa"; - version = "1.1.0.20221212.224322"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/gnu-elpa-1.1.0.20221212.224322.tar"; - sha256 = "0hk9ha7f0721wnsnjazpr970lfa4q03dhpxxffw9qcn1mlvh8qb8"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/gnu-elpa.html"; - license = lib.licenses.free; - }; - }) {}; - gnu-elpa-keyring-update = callPackage ({ elpaBuild - , fetchurl - , lib }: - elpaBuild { - pname = "gnu-elpa-keyring-update"; - ename = "gnu-elpa-keyring-update"; - version = "2022.12.0.20221228.123117"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/gnu-elpa-keyring-update-2022.12.0.20221228.123117.tar"; - sha256 = "18dqjkg9gva5a9967k4gkyjvzhjvh55z2jds7xwgbwczppg8mdz2"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/gnu-elpa-keyring-update.html"; - license = lib.licenses.free; - }; - }) {}; - gnugo = callPackage ({ ascii-art-to-unicode - , cl-lib ? null - , elpaBuild - , fetchurl - , lib - , xpm }: - elpaBuild { - pname = "gnugo"; - ename = "gnugo"; - version = "3.1.2.0.20230911.4426"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/gnugo-3.1.2.0.20230911.4426.tar"; - sha256 = "0pxw1z6inw0ikagcfvi14i83sg6affii277mbyzh5liv655hn9rj"; - }; - packageRequires = [ ascii-art-to-unicode cl-lib xpm ]; - meta = { - homepage = "https://elpa.gnu.org/packages/gnugo.html"; - license = lib.licenses.free; - }; - }) {}; - gnus-mock = callPackage ({ elpaBuild - , fetchurl - , lib }: - elpaBuild { - pname = "gnus-mock"; - ename = "gnus-mock"; - version = "0.5.0.20210503.105756"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/gnus-mock-0.5.0.20210503.105756.tar"; - sha256 = "1gpjbx9iabrx2b4qinw0chv44g2v1z2ivaiywjzr3vy3h3pp6fga"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/gnus-mock.html"; - license = lib.licenses.free; - }; - }) {}; - gpastel = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "gpastel"; - ename = "gpastel"; - version = "0.5.0.0.20231030.71342"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/gpastel-0.5.0.0.20231030.71342.tar"; - sha256 = "1d5pj1rk0xv2fww827yplpcll5hy8w9fkcm9c8wf4yi3l6igkmgz"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/gpastel.html"; - license = lib.licenses.free; - }; - }) {}; - gpr-mode = callPackage ({ elpaBuild - , emacs - , fetchurl - , gnat-compiler - , lib - , wisi }: - elpaBuild { - pname = "gpr-mode"; - ename = "gpr-mode"; - version = "1.0.5.0.20231115.90848"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/gpr-mode-1.0.5.0.20231115.90848.tar"; - sha256 = "1m768s196027zl402vmfvdzvdl3whbjg5lyfiwjx25d9gfx32351"; - }; - packageRequires = [ emacs gnat-compiler wisi ]; - meta = { - homepage = "https://elpa.gnu.org/packages/gpr-mode.html"; - license = lib.licenses.free; - }; - }) {}; - gpr-query = callPackage ({ elpaBuild - , emacs - , fetchurl - , gnat-compiler - , lib - , wisi }: - elpaBuild { - pname = "gpr-query"; - ename = "gpr-query"; - version = "1.0.4.0.20231018.92052"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/gpr-query-1.0.4.0.20231018.92052.tar"; - sha256 = "0j0p685v1v0byma8x5lpihvfj6hyg30dx8jqa6q0xmm2c6i8cqai"; - }; - packageRequires = [ emacs gnat-compiler wisi ]; - meta = { - homepage = "https://elpa.gnu.org/packages/gpr-query.html"; - license = lib.licenses.free; - }; - }) {}; - graphql = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "graphql"; - ename = "graphql"; - version = "0.1.2.0.20221202.2453"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/graphql-0.1.2.0.20221202.2453.tar"; - sha256 = "0wh1lnn85nj026iln02b7p5hgrwd3dmqjkv48gc33ypyd4afh31z"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/graphql.html"; - license = lib.licenses.free; - }; - }) {}; - greader = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "greader"; - ename = "greader"; - version = "0.9.20.0.20240427.100340"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/greader-0.9.20.0.20240427.100340.tar"; - sha256 = "0g07dvn21g35vx0g7c5dhhwv1pci3jxlpacd9f0iyj42f52yxxhy"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/greader.html"; - license = lib.licenses.free; - }; - }) {}; - greenbar = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "greenbar"; - ename = "greenbar"; - version = "1.1.0.20221221.80217"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/greenbar-1.1.0.20221221.80217.tar"; - sha256 = "00kch8c0sz5z3cx0likx0pyqp9jxvjd6lkmdcli4zzpc6j1f1a0k"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/greenbar.html"; - license = lib.licenses.free; - }; - }) {}; - gtags-mode = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "gtags-mode"; - ename = "gtags-mode"; - version = "1.6.0.20240511.23214"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/gtags-mode-1.6.0.20240511.23214.tar"; - sha256 = "0wi1pfvx7wrd8jfnhlim2zp4k2n96c6prl42f8asbvq1rgi5qh1p"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/gtags-mode.html"; - license = lib.licenses.free; - }; - }) {}; - guess-language = callPackage ({ cl-lib ? null - , elpaBuild - , emacs - , fetchurl - , lib - , nadvice }: - elpaBuild { - pname = "guess-language"; - ename = "guess-language"; - version = "0.0.1.0.20190417.81229"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/guess-language-0.0.1.0.20190417.81229.tar"; - sha256 = "167cz86pfxxszr57v312m9gb0l9318mvgg2lld6m5ppgzfmxlmnm"; - }; - packageRequires = [ cl-lib emacs nadvice ]; - meta = { - homepage = "https://elpa.gnu.org/packages/guess-language.html"; - license = lib.licenses.free; - }; - }) {}; - hcel = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "hcel"; - ename = "hcel"; - version = "1.0.0.0.20221012.11633"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/hcel-1.0.0.0.20221012.11633.tar"; - sha256 = "03k08w10bvl6fz7nkmv2d7kksphxigw6cwfhfq0kkgxn4l8h37an"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/hcel.html"; - license = lib.licenses.free; - }; - }) {}; - heap = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "heap"; - ename = "heap"; - version = "0.5.0.20201214.121301"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/heap-0.5.0.20201214.121301.tar"; - sha256 = "0917bfrdiwwmdqmnpy2cg1dn7v5gyl7damwp6ld7sky6v3d113ya"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/heap.html"; - license = lib.licenses.free; - }; - }) {}; - hiddenquote = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "hiddenquote"; - ename = "hiddenquote"; - version = "1.2.0.20231107.184113"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/hiddenquote-1.2.0.20231107.184113.tar"; - sha256 = "0iy7mxqhph4kmp4a96r141f4dpk5vwiydx9i9gx5c13zzwvy2y7r"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/hiddenquote.html"; - license = lib.licenses.free; - }; - }) {}; - highlight-escape-sequences = callPackage ({ elpaBuild - , fetchurl - , lib }: - elpaBuild { - pname = "highlight-escape-sequences"; - ename = "highlight-escape-sequences"; - version = "0.4.0.20201214.173014"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/highlight-escape-sequences-0.4.0.20201214.173014.tar"; - sha256 = "13x8750r3zn9sqbsxliiipk6kfnpg7clmd49niyrh80x9nj4pf72"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/highlight-escape-sequences.html"; - license = lib.licenses.free; - }; - }) {}; - hook-helpers = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "hook-helpers"; - ename = "hook-helpers"; - version = "1.1.1.0.20201201.93957"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/hook-helpers-1.1.1.0.20201201.93957.tar"; - sha256 = "0x3358k5lglnb4yf27c2ybzlsw9jp4n4jh5sizczl9n8g1vxbgkb"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/hook-helpers.html"; - license = lib.licenses.free; - }; - }) {}; - html5-schema = callPackage ({ elpaBuild - , fetchurl - , lib }: - elpaBuild { - pname = "html5-schema"; - ename = "html5-schema"; - version = "0.1.0.20221221.80245"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/html5-schema-0.1.0.20221221.80245.tar"; - sha256 = "15f1nhsgpp0mv8mdrvv0jnscq0j23ggriw2d2dw26sr6lv93w2r4"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/html5-schema.html"; - license = lib.licenses.free; - }; - }) {}; - hydra = callPackage ({ elpaBuild, emacs, fetchurl, lib, lv }: - elpaBuild { - pname = "hydra"; - ename = "hydra"; - version = "0.15.0.0.20221030.224757"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/hydra-0.15.0.0.20221030.224757.tar"; - sha256 = "1d8xdxv9j3vb0jkq6bx3f6kbjc990lbmdr78yqchai861hhllmdn"; - }; - packageRequires = [ emacs lv ]; - meta = { - homepage = "https://elpa.gnu.org/packages/hydra.html"; - license = lib.licenses.free; - }; - }) {}; - hyperbole = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "hyperbole"; - ename = "hyperbole"; - version = "9.0.2pre0.20240519.180059"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/hyperbole-9.0.2pre0.20240519.180059.tar"; - sha256 = "0i5h57a2ng28ijwds7ddy5ay8dkkgg817p35ig51mjrk7ljz6w2n"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/hyperbole.html"; - license = lib.licenses.free; - }; - }) {}; - idlwave = callPackage ({ elpaBuild - , fetchurl - , lib }: - elpaBuild { - pname = "idlwave"; - ename = "idlwave"; - version = "6.5.0.0.20240430.163614"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/idlwave-6.5.0.0.20240430.163614.tar"; - sha256 = "165lbvhrvrd1szvqns6pd7wmr9zxszzvq3lqz11qg20didi6sngr"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/idlwave.html"; - license = lib.licenses.free; - }; - }) {}; - ilist = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "ilist"; - ename = "ilist"; - version = "0.3.0.20240219.40214"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/ilist-0.3.0.20240219.40214.tar"; - sha256 = "0nxwvnpnyccx384f8ik0z8a74fksvwrmpdzk4wia1x6wdwwvblvs"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/ilist.html"; - license = lib.licenses.free; - }; - }) {}; - inspector = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "inspector"; - ename = "inspector"; - version = "0.36.0.20230925.194622"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/inspector-0.36.0.20230925.194622.tar"; - sha256 = "1g989zgbhila0f4yca70iwgnqr0zcainji9mps0ywrmlmn270gdv"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/inspector.html"; - license = lib.licenses.free; - }; - }) {}; - ioccur = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "ioccur"; - ename = "ioccur"; - version = "2.6.0.20211231.163129"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/ioccur-2.6.0.20211231.163129.tar"; - sha256 = "0v048d1p95km3jwgs6x805fjg6qfv5pjwdwia1wzl9liqai21v1c"; - }; - packageRequires = [ cl-lib emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/ioccur.html"; - license = lib.licenses.free; - }; - }) {}; - isearch-mb = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "isearch-mb"; - ename = "isearch-mb"; - version = "0.8.0.20240310.84654"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/isearch-mb-0.8.0.20240310.84654.tar"; - sha256 = "1rb97ir8nbv7ici8isjcm4bfaxakd6a05yxv9as2wv9xl8fzfhwq"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/isearch-mb.html"; - license = lib.licenses.free; - }; - }) {}; - iterators = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "iterators"; - ename = "iterators"; - version = "0.1.1.0.20221221.80300"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/iterators-0.1.1.0.20221221.80300.tar"; - sha256 = "10cx933rk7f92jk8q87b69ls3w823fwxnr7i6j0bxpzjx66q15yk"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/iterators.html"; - license = lib.licenses.free; - }; - }) {}; - ivy = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "ivy"; - ename = "ivy"; - version = "0.14.2.0.20240519.163855"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/ivy-0.14.2.0.20240519.163855.tar"; - sha256 = "1r1b5znx1dzwpz903sm85sm2yp03yp4mvds782j8lngl46r5ibsr"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/ivy.html"; - license = lib.licenses.free; - }; - }) {}; - ivy-avy = callPackage ({ avy - , elpaBuild - , emacs - , fetchurl - , ivy - , lib }: - elpaBuild { - pname = "ivy-avy"; - ename = "ivy-avy"; - version = "0.14.2.0.20240214.214218"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/ivy-avy-0.14.2.0.20240214.214218.tar"; - sha256 = "1i3hrc5pb30qkzzpiza0mff97132b04sglg39mg0ad05hl3sq5dc"; - }; - packageRequires = [ avy emacs ivy ]; - meta = { - homepage = "https://elpa.gnu.org/packages/ivy-avy.html"; - license = lib.licenses.free; - }; - }) {}; - ivy-explorer = callPackage ({ elpaBuild - , emacs - , fetchurl - , ivy - , lib }: - elpaBuild { - pname = "ivy-explorer"; - ename = "ivy-explorer"; - version = "0.3.2.0.20190909.192125"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/ivy-explorer-0.3.2.0.20190909.192125.tar"; - sha256 = "1jvahaswknvaia62cq8bz5lx55fb1c07zr63n7awcp0sajk3ph3z"; - }; - packageRequires = [ emacs ivy ]; - meta = { - homepage = "https://elpa.gnu.org/packages/ivy-explorer.html"; - license = lib.licenses.free; - }; - }) {}; - ivy-hydra = callPackage ({ elpaBuild - , emacs - , fetchurl - , hydra - , ivy - , lib }: - elpaBuild { - pname = "ivy-hydra"; - ename = "ivy-hydra"; - version = "0.14.2.0.20240214.214337"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/ivy-hydra-0.14.2.0.20240214.214337.tar"; - sha256 = "1paqprwizhavr1kfijfbr0my3ncmw94821d3c9qj1fnjkp3nfj4x"; - }; - packageRequires = [ emacs hydra ivy ]; - meta = { - homepage = "https://elpa.gnu.org/packages/ivy-hydra.html"; - license = lib.licenses.free; - }; - }) {}; - ivy-posframe = callPackage ({ elpaBuild - , emacs - , fetchurl - , ivy - , lib - , posframe }: - elpaBuild { - pname = "ivy-posframe"; - ename = "ivy-posframe"; - version = "0.6.3.0.20211217.23411"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/ivy-posframe-0.6.3.0.20211217.23411.tar"; - sha256 = "03v4k7hx2bdxhjghanpmy9r50q9ksmz2xcwypxxhyywlglfk0d69"; - }; - packageRequires = [ emacs ivy posframe ]; - meta = { - homepage = "https://elpa.gnu.org/packages/ivy-posframe.html"; - license = lib.licenses.free; - }; - }) {}; - jami-bot = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "jami-bot"; - ename = "jami-bot"; - version = "0.0.4.0.20240204.184721"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/jami-bot-0.0.4.0.20240204.184721.tar"; - sha256 = "04zdnrah3jypkyx8dl0ns7cjcws5yv4d56ixaa94vjjjvyw9d8mv"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/jami-bot.html"; - license = lib.licenses.free; - }; - }) {}; - jarchive = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "jarchive"; - ename = "jarchive"; - version = "0.11.0.0.20231010.221311"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/jarchive-0.11.0.0.20231010.221311.tar"; - sha256 = "122qffkbl5in1y1zpphn38kmg49xpvddxzf8im9hcvigf7dik6f5"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/jarchive.html"; - license = lib.licenses.free; - }; - }) {}; - javaimp = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "javaimp"; - ename = "javaimp"; - version = "0.9.1.0.20221221.80314"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/javaimp-0.9.1.0.20221221.80314.tar"; - sha256 = "0dj7mzdfj1gvd18mdnf19pv5zljhhada6a5s3bm5drpw12vx5334"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/javaimp.html"; - license = lib.licenses.free; - }; - }) {}; - jgraph-mode = callPackage ({ cl-lib ? null - , elpaBuild - , fetchurl - , lib }: - elpaBuild { - pname = "jgraph-mode"; - ename = "jgraph-mode"; - version = "1.1.0.20221221.80333"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/jgraph-mode-1.1.0.20221221.80333.tar"; - sha256 = "1ddmyxanfnqfmwx3ld25awm4qhwbzavla8xan261nyh4wwnm8hfq"; - }; - packageRequires = [ cl-lib ]; - meta = { - homepage = "https://elpa.gnu.org/packages/jgraph-mode.html"; - license = lib.licenses.free; - }; - }) {}; - jinx = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "jinx"; - ename = "jinx"; - version = "1.7.0.20240515.101640"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/jinx-1.7.0.20240515.101640.tar"; - sha256 = "1ghp16kmplj9kj92867xsv3bnl6f0w95xl8hgjxbck4krj8k6is5"; - }; - packageRequires = [ compat emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/jinx.html"; - license = lib.licenses.free; - }; - }) {}; - jit-spell = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "jit-spell"; - ename = "jit-spell"; - version = "0.4.0.20240323.72834"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/jit-spell-0.4.0.20240323.72834.tar"; - sha256 = "1as5s3y1hgjzaz2325rayg0xm80wq2frswcxcarywn85gyfbpskn"; - }; - packageRequires = [ compat emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/jit-spell.html"; - license = lib.licenses.free; - }; - }) {}; - js2-mode = callPackage ({ cl-lib ? null - , elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "js2-mode"; - ename = "js2-mode"; - version = "20231224.0.20240418.608"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/js2-mode-20231224.0.20240418.608.tar"; - sha256 = "0l0pcq8v2mnig6jb2qamnm3ih37bl0vlknzqkp3vsznlasjm5srj"; - }; - packageRequires = [ cl-lib emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/js2-mode.html"; - license = lib.licenses.free; - }; - }) {}; - json-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "json-mode"; - ename = "json-mode"; - version = "0.2.0.20221221.80401"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/json-mode-0.2.0.20221221.80401.tar"; - sha256 = "0hr0dqnz3c9bc78k3nnwrhwqhgyjq1qpnjfa7wd9bsla3gfp88hk"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/json-mode.html"; - license = lib.licenses.free; - }; - }) {}; - jsonrpc = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "jsonrpc"; - ename = "jsonrpc"; - version = "1.0.25.0.20240427.91928"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/jsonrpc-1.0.25.0.20240427.91928.tar"; - sha256 = "18x620ayb9bwp2crxn2mibl7arqc4dzhaykmp5lfqibjkx6qmm9i"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/jsonrpc.html"; - license = lib.licenses.free; - }; - }) {}; - jumpc = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "jumpc"; - ename = "jumpc"; - version = "3.1.0.20231015.14814"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/jumpc-3.1.0.20231015.14814.tar"; - sha256 = "1v8jxyvs0540w6rdsy96a49lb8nhrq4r66mmvc42j8lh7k4nggdw"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/jumpc.html"; - license = lib.licenses.free; - }; - }) {}; - kind-icon = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib - , svg-lib }: - elpaBuild { - pname = "kind-icon"; - ename = "kind-icon"; - version = "0.2.2.0.20240321.120430"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/kind-icon-0.2.2.0.20240321.120430.tar"; - sha256 = "1cwp2cc2qy36s4zz6arfr760a9x77h0cj42q6a0s32l56sddh7ws"; - }; - packageRequires = [ emacs svg-lib ]; - meta = { - homepage = "https://elpa.gnu.org/packages/kind-icon.html"; - license = lib.licenses.free; - }; - }) {}; - kiwix = callPackage ({ elpaBuild, emacs, fetchurl, lib, request }: - elpaBuild { - pname = "kiwix"; - ename = "kiwix"; - version = "1.1.5.0.20220316.84759"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/kiwix-1.1.5.0.20220316.84759.tar"; - sha256 = "0pi543y1gzkhi9chzwfmp9is8jnp31wx69m9355afrvxdncq6gna"; - }; - packageRequires = [ emacs request ]; - meta = { - homepage = "https://elpa.gnu.org/packages/kiwix.html"; - license = lib.licenses.free; - }; - }) {}; - kmb = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "kmb"; - ename = "kmb"; - version = "0.1.0.20221221.80420"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/kmb-0.1.0.20221221.80420.tar"; - sha256 = "00zqrfh1nqn01azmkd2gy3il48h1sddp6addj9yfq4kwd7ylhym5"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/kmb.html"; - license = lib.licenses.free; - }; - }) {}; - landmark = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "landmark"; - ename = "landmark"; - version = "1.0.0.20221221.80428"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/landmark-1.0.0.20221221.80428.tar"; - sha256 = "1rwiysmynp2z4bfynhf9k1zd3y5s6dyp2312vq1rhyifgdd8mivq"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/landmark.html"; - license = lib.licenses.free; - }; - }) {}; - latex-table-wizard = callPackage ({ auctex - , elpaBuild - , emacs - , fetchurl - , lib - , transient }: - elpaBuild { - pname = "latex-table-wizard"; - ename = "latex-table-wizard"; - version = "1.5.4.0.20230903.170436"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/latex-table-wizard-1.5.4.0.20230903.170436.tar"; - sha256 = "1y1crsd29fvqabzwzki7jqziarycix6bib0cmxlrfsqs95y7dr5w"; - }; - packageRequires = [ auctex emacs transient ]; - meta = { - homepage = "https://elpa.gnu.org/packages/latex-table-wizard.html"; - license = lib.licenses.free; - }; - }) {}; - leaf = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "leaf"; - ename = "leaf"; - version = "4.5.5.0.20230803.74443"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/leaf-4.5.5.0.20230803.74443.tar"; - sha256 = "1xkqwkkk3k5k3lg10amh2lvric2xcqd35ad30c0jyvzn9fsxkbn0"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/leaf.html"; - license = lib.licenses.free; - }; - }) {}; - lentic = callPackage ({ dash, elpaBuild, emacs, fetchurl, lib, m-buffer }: - elpaBuild { - pname = "lentic"; - ename = "lentic"; - version = "0.12.0.20240303.95600"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/lentic-0.12.0.20240303.95600.tar"; - sha256 = "0w6fl0yzmh0gd3d5d5049zrx341x0jrj48g265jy4jywdvk621kv"; - }; - packageRequires = [ dash emacs m-buffer ]; - meta = { - homepage = "https://elpa.gnu.org/packages/lentic.html"; - license = lib.licenses.free; - }; - }) {}; - lentic-server = callPackage ({ elpaBuild - , fetchurl - , lentic - , lib - , web-server }: - elpaBuild { - pname = "lentic-server"; - ename = "lentic-server"; - version = "0.2.0.20240314.214448"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/lentic-server-0.2.0.20240314.214448.tar"; - sha256 = "1mg12bkwsqm4nwwwmpfx3dav583i96dsk5ap5hjiz2ggwwrmrq8h"; - }; - packageRequires = [ lentic web-server ]; - meta = { - homepage = "https://elpa.gnu.org/packages/lentic-server.html"; - license = lib.licenses.free; - }; - }) {}; - let-alist = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "let-alist"; - ename = "let-alist"; - version = "1.0.6.0.20240102.14710"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/let-alist-1.0.6.0.20240102.14710.tar"; - sha256 = "1iyw8kaqgd5kmfzyzcmrnaa40bn6azvhlmsppnvfnwxgslcjgp1p"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/let-alist.html"; - license = lib.licenses.free; - }; - }) {}; - lex = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "lex"; - ename = "lex"; - version = "1.2.0.20240216.82808"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/lex-1.2.0.20240216.82808.tar"; - sha256 = "0mh2jk838216mwv6bab28mq9nb5617c5y7s0yqynkz3vkarnnxx1"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/lex.html"; - license = lib.licenses.free; - }; - }) {}; - lin = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "lin"; - ename = "lin"; - version = "1.0.0.0.20240117.24849"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/lin-1.0.0.0.20240117.24849.tar"; - sha256 = "1yjqq1zzv0a7ydhjjh7ycgwd8fzlkvza3m8dm9wa45lqljf5ysim"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/lin.html"; - license = lib.licenses.free; - }; - }) {}; - listen = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib - , persist - , taxy - , taxy-magit-section - , transient }: - elpaBuild { - pname = "listen"; - ename = "listen"; - version = "0.10pre0.20240419.165028"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/listen-0.10pre0.20240419.165028.tar"; - sha256 = "1bmjnigb4ly14i3n7wgd0jx4k0g06cf2n3dapfdwlv80bi57x20a"; - }; - packageRequires = [ emacs persist taxy taxy-magit-section transient ]; - meta = { - homepage = "https://elpa.gnu.org/packages/listen.html"; - license = lib.licenses.free; - }; - }) {}; - llm = callPackage ({ elpaBuild, emacs, fetchurl, lib, plz }: - elpaBuild { - pname = "llm"; - ename = "llm"; - version = "0.15.0.0.20240518.145931"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/llm-0.15.0.0.20240518.145931.tar"; - sha256 = "0dzvgq7lvlg62rzv9p62r5m0gm5glwd37mnw3sf6w5h3jfnkpzv0"; - }; - packageRequires = [ emacs plz ]; - meta = { - homepage = "https://elpa.gnu.org/packages/llm.html"; - license = lib.licenses.free; - }; - }) {}; - lmc = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "lmc"; - ename = "lmc"; - version = "1.4.0.20230105.113402"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/lmc-1.4.0.20230105.113402.tar"; - sha256 = "0ldwr9gw0bkcj43w5x84qwq2gvv2nr53711wlh42zawh0dyhm8h7"; - }; - packageRequires = [ cl-lib emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/lmc.html"; - license = lib.licenses.free; - }; - }) {}; - load-dir = callPackage ({ cl-lib ? null - , elpaBuild - , fetchurl - , lib }: - elpaBuild { - pname = "load-dir"; - ename = "load-dir"; - version = "0.0.5.0.20221221.80456"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/load-dir-0.0.5.0.20221221.80456.tar"; - sha256 = "00ynwml6xf7341z1w0wz1afh9jc4v8ggc8izy8qcvdiawxc418iq"; - }; - packageRequires = [ cl-lib ]; - meta = { - homepage = "https://elpa.gnu.org/packages/load-dir.html"; - license = lib.licenses.free; - }; - }) {}; - load-relative = callPackage ({ elpaBuild - , fetchurl - , lib }: - elpaBuild { - pname = "load-relative"; - ename = "load-relative"; - version = "1.3.2.0.20230214.53224"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/load-relative-1.3.2.0.20230214.53224.tar"; - sha256 = "19pkb7xqyllll2pgyqs7bv0qfbv6n9i5qlx9rjzm4ws0c9j464zd"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/load-relative.html"; - license = lib.licenses.free; - }; - }) {}; - loc-changes = callPackage ({ elpaBuild - , fetchurl - , lib }: - elpaBuild { - pname = "loc-changes"; - ename = "loc-changes"; - version = "1.2.0.20201201.94106"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/loc-changes-1.2.0.20201201.94106.tar"; - sha256 = "1jrjqn5600l245vhr5h6zwg6g72k0n721ck94mji755bqd231yxs"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/loc-changes.html"; - license = lib.licenses.free; - }; - }) {}; - loccur = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "loccur"; - ename = "loccur"; - version = "1.2.4.0.20201130.183958"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/loccur-1.2.4.0.20201130.183958.tar"; - sha256 = "1ghig684f2r6dl5czym3d5hqhf72y1hilnhbk95lg890cc0yacir"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/loccur.html"; - license = lib.licenses.free; - }; - }) {}; - logos = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "logos"; - ename = "logos"; - version = "1.1.1.0.20240224.55443"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/logos-1.1.1.0.20240224.55443.tar"; - sha256 = "1zr2g2bj2xkjwj509vijqdqhx1dgmbr73i605677hjw01d2skch3"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/logos.html"; - license = lib.licenses.free; - }; - }) {}; - luwak = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "luwak"; - ename = "luwak"; - version = "1.0.0.0.20221125.50733"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/luwak-1.0.0.0.20221125.50733.tar"; - sha256 = "0b4kxq5im8gvg1zg12b8ii62w0vsf3gacimwd603srfc5l1rbvcw"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/luwak.html"; - license = lib.licenses.free; - }; - }) {}; - lv = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "lv"; - ename = "lv"; - version = "0.15.0.0.20221030.224757"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/lv-0.15.0.0.20221030.224757.tar"; - sha256 = "07m1m2rgwnb7916hzdjccnq4is0z7m5mwmvc0f7mpc4h61sa6cdn"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/lv.html"; - license = lib.licenses.free; - }; - }) {}; - m-buffer = callPackage ({ elpaBuild - , fetchurl - , lib - , seq }: - elpaBuild { - pname = "m-buffer"; - ename = "m-buffer"; - version = "0.16.0.20240302.175529"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/m-buffer-0.16.0.20240302.175529.tar"; - sha256 = "18lj0gb56xhwrbihijy4p5lyxqvdfcwyabcd30qy1dn4k715v614"; - }; - packageRequires = [ seq ]; - meta = { - homepage = "https://elpa.gnu.org/packages/m-buffer.html"; - license = lib.licenses.free; - }; - }) {}; - map = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "map"; - ename = "map"; - version = "3.3.1.0.20240221.84915"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/map-3.3.1.0.20240221.84915.tar"; - sha256 = "0cmxxgxi7nsgbx4a94pxhn4y6qddp14crfl2250nk6a1h17zvsnn"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/map.html"; - license = lib.licenses.free; - }; - }) {}; - marginalia = callPackage ({ compat - , elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "marginalia"; - ename = "marginalia"; - version = "1.6.0.20240404.45149"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/marginalia-1.6.0.20240404.45149.tar"; - sha256 = "1bqynrmb99691k0cmdn30g780356gff30bd7lirlriraabj19y7h"; - }; - packageRequires = [ compat emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/marginalia.html"; - license = lib.licenses.free; - }; - }) {}; - markchars = callPackage ({ elpaBuild - , fetchurl - , lib }: - elpaBuild { - pname = "markchars"; - ename = "markchars"; - version = "0.2.2.0.20221221.80510"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/markchars-0.2.2.0.20221221.80510.tar"; - sha256 = "0f1n1jzhksl5cl5c4n2arqhj2zkwzs8i4yzdz39y2b51x2gi2yav"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/markchars.html"; - license = lib.licenses.free; - }; - }) {}; - math-symbol-lists = callPackage ({ elpaBuild - , fetchurl - , lib }: - elpaBuild { - pname = "math-symbol-lists"; - ename = "math-symbol-lists"; - version = "1.3.0.20220828.204754"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/math-symbol-lists-1.3.0.20220828.204754.tar"; - sha256 = "0q038qwcq7lg3a7n451gw80xlwv4hczz3432xcx00hxgvlh744yc"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/math-symbol-lists.html"; - license = lib.licenses.free; - }; - }) {}; - mct = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "mct"; - ename = "mct"; - version = "1.0.0.0.20240429.72524"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/mct-1.0.0.0.20240429.72524.tar"; - sha256 = "07nb0y0ld6x2j5g1a0sjm5ihck41xkk55p5hm5279ddjklcp8p6a"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/mct.html"; - license = lib.licenses.free; - }; - }) {}; - memory-usage = callPackage ({ elpaBuild - , fetchurl - , lib }: - elpaBuild { - pname = "memory-usage"; - ename = "memory-usage"; - version = "0.2.0.20201201.223908"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/memory-usage-0.2.0.20201201.223908.tar"; - sha256 = "1jybms0756sswwdq8gqc6kpp5m7y971v4yzcmhraykhf32rwf4rq"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/memory-usage.html"; - license = lib.licenses.free; - }; - }) {}; - metar = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "metar"; - ename = "metar"; - version = "0.3.0.20221221.80722"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/metar-0.3.0.20221221.80722.tar"; - sha256 = "08xcxx9wbjkqf6s1rbsp54f648r8n122k66nfd8ibv9qbd8qvmxq"; - }; - packageRequires = [ cl-lib ]; - meta = { - homepage = "https://elpa.gnu.org/packages/metar.html"; - license = lib.licenses.free; - }; - }) {}; - midi-kbd = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "midi-kbd"; - ename = "midi-kbd"; - version = "0.2.0.20221221.80736"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/midi-kbd-0.2.0.20221221.80736.tar"; - sha256 = "0fz9r0y3qdnaq9wi00151xzqh3ygwcfw6yl32cs1vaaxv2czkjai"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/midi-kbd.html"; - license = lib.licenses.free; - }; - }) {}; - mines = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "mines"; - ename = "mines"; - version = "1.6.0.20201130.184335"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/mines-1.6.0.20201130.184335.tar"; - sha256 = "0vl93im89fg72wpcqdhg1x2l4iybznh6gjvpkr1i29y05fsx2aad"; - }; - packageRequires = [ cl-lib emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/mines.html"; - license = lib.licenses.free; - }; - }) {}; - minibuffer-header = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "minibuffer-header"; - ename = "minibuffer-header"; - version = "0.5.0.20220921.71345"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/minibuffer-header-0.5.0.20220921.71345.tar"; - sha256 = "1s77h5s2abpm75k57zcp1s525qs74sdm6vpzlkvqjz8lpn8zkkp0"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/minibuffer-header.html"; - license = lib.licenses.free; - }; - }) {}; - minibuffer-line = callPackage ({ elpaBuild - , fetchurl - , lib }: - elpaBuild { - pname = "minibuffer-line"; - ename = "minibuffer-line"; - version = "0.1.0.20221221.80745"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/minibuffer-line-0.1.0.20221221.80745.tar"; - sha256 = "10gl1lnihawv9dw2rzaydyh8cdgpqgj7y8jsr6hjgqv82hxqyccn"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/minibuffer-line.html"; - license = lib.licenses.free; - }; - }) {}; - minimap = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "minimap"; - ename = "minimap"; - version = "1.4.0.20201201.162630"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/minimap-1.4.0.20201201.162630.tar"; - sha256 = "0h0ydmfinr82j0ifkgwjhc8blg6z2f5k0711fwrcbx8wrgrvfh5v"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/minimap.html"; - license = lib.licenses.free; - }; - }) {}; - mmm-mode = callPackage ({ cl-lib ? null - , elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "mmm-mode"; - ename = "mmm-mode"; - version = "0.5.11.0.20240222.42825"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/mmm-mode-0.5.11.0.20240222.42825.tar"; - sha256 = "037g19hdya14q7wivdcw8h7wyx8lb8pw5waya3ak435cyfmpg1a7"; - }; - packageRequires = [ cl-lib emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/mmm-mode.html"; - license = lib.licenses.free; - }; - }) {}; - modus-themes = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "modus-themes"; - ename = "modus-themes"; - version = "4.4.0.0.20240505.33119"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/modus-themes-4.4.0.0.20240505.33119.tar"; - sha256 = "1y637n8cll4932hyi16gnzpjqypwgwxbyq8mfhgjbz26663nksxs"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/modus-themes.html"; - license = lib.licenses.free; - }; - }) {}; - mpdired = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "mpdired"; - ename = "mpdired"; - version = "2pre0.20240414.172616"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/mpdired-2pre0.20240414.172616.tar"; - sha256 = "0c7rjws601wh7bxg549hbbfanh5lxwrhrm03ay2ziriswqdrq5ng"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/mpdired.html"; - license = lib.licenses.free; - }; - }) {}; - multi-mode = callPackage ({ elpaBuild - , fetchurl - , lib }: - elpaBuild { - pname = "multi-mode"; - ename = "multi-mode"; - version = "1.14.0.20221221.80812"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/multi-mode-1.14.0.20221221.80812.tar"; - sha256 = "1r41alsvaab8h5cngy0hjs78shv60qp1g68jppl5qlhd6a7h95ih"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/multi-mode.html"; - license = lib.licenses.free; - }; - }) {}; - multishell = callPackage ({ cl-lib ? null - , elpaBuild - , fetchurl - , lib }: - elpaBuild { - pname = "multishell"; - ename = "multishell"; - version = "1.1.10.0.20220605.120254"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/multishell-1.1.10.0.20220605.120254.tar"; - sha256 = "0pl45mwwgdf505sviyzacalq6kisq0pnh99i1cnclrmjkjy6yxz9"; - }; - packageRequires = [ cl-lib ]; - meta = { - homepage = "https://elpa.gnu.org/packages/multishell.html"; - license = lib.licenses.free; - }; - }) {}; - muse = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "muse"; - ename = "muse"; - version = "3.20.2.0.20240209.184001"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/muse-3.20.2.0.20240209.184001.tar"; - sha256 = "1sn5siingpzg4y5wjc3ff2ln98gb7hhvwmhnvhmmqbnb8r459vs0"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/muse.html"; - license = lib.licenses.free; - }; - }) {}; - myers = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "myers"; - ename = "myers"; - version = "0.1.0.20221221.80834"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/myers-0.1.0.20221221.80834.tar"; - sha256 = "11nwn1nysr09r1701cd3wvkzn01s19l6lla0f33vqm66ahj9yldh"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/myers.html"; - license = lib.licenses.free; - }; - }) {}; - nadvice = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "nadvice"; - ename = "nadvice"; - version = "0.4.0.20230111.104526"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/nadvice-0.4.0.20230111.104526.tar"; - sha256 = "0855x3vgp0i6kmi5kf8365xqnj92k9lwqyfn40i59fp4jj3c00kr"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/nadvice.html"; - license = lib.licenses.free; - }; - }) {}; - nameless = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "nameless"; - ename = "nameless"; - version = "1.0.2.0.20230112.95905"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/nameless-1.0.2.0.20230112.95905.tar"; - sha256 = "1b44w8jkqqsi995a2daw05ks64njlgpkab6m3iy3lx3v8fggjahp"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/nameless.html"; - license = lib.licenses.free; - }; - }) {}; - names = callPackage ({ cl-lib ? null - , elpaBuild - , emacs - , fetchurl - , lib - , nadvice }: - elpaBuild { - pname = "names"; - ename = "names"; - version = "20151201.0.0.20220425.173515"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/names-20151201.0.0.20220425.173515.tar"; - sha256 = "1s91v83jkwxjl1iqrmjy60rnnqcgzly0z8chp87f7i22fj5gjz4h"; - }; - packageRequires = [ cl-lib emacs nadvice ]; - meta = { - homepage = "https://elpa.gnu.org/packages/names.html"; - license = lib.licenses.free; - }; - }) {}; - nano-agenda = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "nano-agenda"; - ename = "nano-agenda"; - version = "0.3.0.20230417.100538"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/nano-agenda-0.3.0.20230417.100538.tar"; - sha256 = "1fhpic6zimk81a7w6m9hl6iw0vniz3pl775sxyg167ysn5sqsl2y"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/nano-agenda.html"; - license = lib.licenses.free; - }; - }) {}; - nano-modeline = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "nano-modeline"; - ename = "nano-modeline"; - version = "1.1.0.0.20240429.102433"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/nano-modeline-1.1.0.0.20240429.102433.tar"; - sha256 = "0jlaqkrqn2x4fhlz57c94586xjqi1sb89p6py4j5r00669djwhrf"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/nano-modeline.html"; - license = lib.licenses.free; - }; - }) {}; - nano-theme = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "nano-theme"; - ename = "nano-theme"; - version = "0.3.4.0.20240319.93238"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/nano-theme-0.3.4.0.20240319.93238.tar"; - sha256 = "0xh3m9c4wq7zvc634nvfvxyyi0snlb67286znmnfkpgb3j84vshk"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/nano-theme.html"; - license = lib.licenses.free; - }; - }) {}; - nftables-mode = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "nftables-mode"; - ename = "nftables-mode"; - version = "1.1.0.20221221.80909"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/nftables-mode-1.1.0.20221221.80909.tar"; - sha256 = "149qz88wlapln0b8d9mcmj630vyh2ha65hqb46yrf08fch992cpx"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/nftables-mode.html"; - license = lib.licenses.free; - }; - }) {}; - nhexl-mode = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "nhexl-mode"; - ename = "nhexl-mode"; - version = "1.5.0.20221215.152407"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/nhexl-mode-1.5.0.20221215.152407.tar"; - sha256 = "0bdw6lycm1hclz3qzckcpnssrd4i52051dzbs87f9sv6f6v31373"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/nhexl-mode.html"; - license = lib.licenses.free; - }; - }) {}; - nlinum = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "nlinum"; - ename = "nlinum"; - version = "1.9.0.20221221.80940"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/nlinum-1.9.0.20221221.80940.tar"; - sha256 = "15kw7r8lz9nb5s0rzgdlj1s1kl1l6nxzr7kmwv5i7b1xhpnyn7xn"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/nlinum.html"; - license = lib.licenses.free; - }; - }) {}; - notes-mode = callPackage ({ elpaBuild - , fetchurl - , lib }: - elpaBuild { - pname = "notes-mode"; - ename = "notes-mode"; - version = "1.31.0.20240402.80928"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/notes-mode-1.31.0.20240402.80928.tar"; - sha256 = "1kiki1b6bx3nn1xgbnh0xnwnhx5wkn0zzlk6jfsks5npj2a4h88g"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/notes-mode.html"; - license = lib.licenses.free; - }; - }) {}; - notmuch-indicator = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "notmuch-indicator"; - ename = "notmuch-indicator"; - version = "1.2.0.0.20240511.94138"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/notmuch-indicator-1.2.0.0.20240511.94138.tar"; - sha256 = "0f1bq1mbjiy1akqml3fb85xz5923j3w2dz4p6yij3kfb5cks42d1"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/notmuch-indicator.html"; - license = lib.licenses.free; - }; - }) {}; - ntlm = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "ntlm"; - ename = "ntlm"; - version = "2.1.0.0.20240102.22814"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/ntlm-2.1.0.0.20240102.22814.tar"; - sha256 = "0wr9bhxxdkpfvwla97xrd77dv3321apq1gmcpqadyjvxl44c0km7"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/ntlm.html"; - license = lib.licenses.free; - }; - }) {}; - num3-mode = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "num3-mode"; - ename = "num3-mode"; - version = "1.5.0.20221221.81242"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/num3-mode-1.5.0.20221221.81242.tar"; - sha256 = "076m1lh9ma1wzavirmy7dq7nsl410n03yf7vq4ljxvbkw801sig7"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/num3-mode.html"; - license = lib.licenses.free; - }; - }) {}; - oauth2 = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib, nadvice }: - elpaBuild { - pname = "oauth2"; - ename = "oauth2"; - version = "0.16.0.20221221.81302"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/oauth2-0.16.0.20221221.81302.tar"; - sha256 = "1imdggvj98db8cs0s2qx72ifavi6h3flym70zm2g1w8v2fmcq8dj"; - }; - packageRequires = [ cl-lib nadvice ]; - meta = { - homepage = "https://elpa.gnu.org/packages/oauth2.html"; - license = lib.licenses.free; - }; - }) {}; - ob-asymptote = callPackage ({ elpaBuild - , fetchurl - , lib }: - elpaBuild { - pname = "ob-asymptote"; - ename = "ob-asymptote"; - version = "1.0.0.20230908.121002"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/ob-asymptote-1.0.0.20230908.121002.tar"; - sha256 = "1lpv4rf7qf1yvpm4j3wiajdk72lgl4gk8qgwflzyq9yvmksakdvp"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/ob-asymptote.html"; - license = lib.licenses.free; - }; - }) {}; - ob-haxe = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "ob-haxe"; - ename = "ob-haxe"; - version = "1.0.0.20210211.73431"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/ob-haxe-1.0.0.20210211.73431.tar"; - sha256 = "148bly2nf0r64q2cfm0hd6i26bxaans7aj52nv4gb5qxsiqng0ly"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/ob-haxe.html"; - license = lib.licenses.free; - }; - }) {}; - objed = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "objed"; - ename = "objed"; - version = "0.8.3.0.20201002.84752"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/objed-0.8.3.0.20201002.84752.tar"; - sha256 = "1fjcl2gm4675l430rdr2lihsj13n24pi9zwjfqvsm4bnqbx9ywiz"; - }; - packageRequires = [ cl-lib emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/objed.html"; - license = lib.licenses.free; - }; - }) {}; - omn-mode = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "omn-mode"; - ename = "omn-mode"; - version = "1.3.0.20240326.173146"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/omn-mode-1.3.0.20240326.173146.tar"; - sha256 = "1iyh0xqm9aag92vj44l4ymrjc0gnn41gckk1l96605cfkwr5m6qa"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/omn-mode.html"; - license = lib.licenses.free; - }; - }) {}; - on-screen = callPackage ({ cl-lib ? null - , elpaBuild - , fetchurl - , lib }: - elpaBuild { - pname = "on-screen"; - ename = "on-screen"; - version = "1.3.3.0.20201127.191411"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/on-screen-1.3.3.0.20201127.191411.tar"; - sha256 = "1dak8rb89mkdpv3xc2h0kpn09i4l42iavslvkhy2vxj0qq6c1r9p"; - }; - packageRequires = [ cl-lib ]; - meta = { - homepage = "https://elpa.gnu.org/packages/on-screen.html"; - license = lib.licenses.free; - }; - }) {}; - openpgp = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "openpgp"; - ename = "openpgp"; - version = "1.0.1.0.20230325.141904"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/openpgp-1.0.1.0.20230325.141904.tar"; - sha256 = "012svyzmr4rwi2a1v99klyjnwrrfqz8jd053f9xjfm44payfafkg"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/openpgp.html"; - license = lib.licenses.free; - }; - }) {}; - orderless = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "orderless"; - ename = "orderless"; - version = "1.1.0.20240401.95916"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/orderless-1.1.0.20240401.95916.tar"; - sha256 = "0w2n1b65hj642a36i6022kmzwgwlb72aicfc6hj3b7rk5zsjg0hc"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/orderless.html"; - license = lib.licenses.free; - }; - }) {}; - org = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "org"; - ename = "org"; - version = "9.7pre0.20240530.133120"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/org-9.7pre0.20240530.133120.tar"; - sha256 = "sha256-DuuLDBJKI2LwC0PH9PtujcPvaqaKLWYij+KzP1U7o9M="; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/org.html"; - license = lib.licenses.free; - }; - }) {}; - org-contacts = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib - , org }: - elpaBuild { - pname = "org-contacts"; - ename = "org-contacts"; - version = "1.1.0.20240521.114436"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/org-contacts-1.1.0.20240521.114436.tar"; - sha256 = "0srbl81ngk24c9kf991ps2j53kpqriwgs8ld4lfcqmxzclr5y8iv"; - }; - packageRequires = [ emacs org ]; - meta = { - homepage = "https://elpa.gnu.org/packages/org-contacts.html"; - license = lib.licenses.free; - }; - }) {}; - org-edna = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib - , org - , seq }: - elpaBuild { - pname = "org-edna"; - ename = "org-edna"; - version = "1.1.2.0.20200902.94459"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/org-edna-1.1.2.0.20200902.94459.tar"; - sha256 = "043pb34ai8rj515zgbw5nq5x3mkiyqcnk25787qc3mbddi9n9hwq"; - }; - packageRequires = [ emacs org seq ]; - meta = { - homepage = "https://elpa.gnu.org/packages/org-edna.html"; - license = lib.licenses.free; - }; - }) {}; - org-jami-bot = callPackage ({ elpaBuild - , emacs - , fetchurl - , jami-bot - , lib }: - elpaBuild { - pname = "org-jami-bot"; - ename = "org-jami-bot"; - version = "0.0.5.0.20240204.184749"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/org-jami-bot-0.0.5.0.20240204.184749.tar"; - sha256 = "1zl9xblhppqwddizf7s7l9d4qzcr8d6vgvjwmiw4wvb4lpyba9r4"; - }; - packageRequires = [ emacs jami-bot ]; - meta = { - homepage = "https://elpa.gnu.org/packages/org-jami-bot.html"; - license = lib.licenses.free; - }; - }) {}; - org-modern = callPackage ({ compat - , elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "org-modern"; - ename = "org-modern"; - version = "1.2.0.20240515.193202"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/org-modern-1.2.0.20240515.193202.tar"; - sha256 = "05mbgm95rlcv5liswlckd26izz5p3a6mkcfnz60widnilfmza9k6"; - }; - packageRequires = [ compat emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/org-modern.html"; - license = lib.licenses.free; - }; - }) {}; - org-notify = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "org-notify"; - ename = "org-notify"; - version = "0.1.1.0.20231016.93952"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/org-notify-0.1.1.0.20231016.93952.tar"; - sha256 = "0pxm5pbmsf965daf3y7v5x6ca8ddi2a9d4lm04ky3113zz5ay95d"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/org-notify.html"; - license = lib.licenses.free; - }; - }) {}; - org-real = callPackage ({ boxy - , elpaBuild - , emacs - , fetchurl - , lib - , org }: - elpaBuild { - pname = "org-real"; - ename = "org-real"; - version = "1.0.9.0.20240505.204156"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/org-real-1.0.9.0.20240505.204156.tar"; - sha256 = "05z8kycyqcfj0w18mnqys54wnlwa9yijlb5c0h86fqbhr7shbjmp"; - }; - packageRequires = [ boxy emacs org ]; - meta = { - homepage = "https://elpa.gnu.org/packages/org-real.html"; - license = lib.licenses.free; - }; - }) {}; - org-remark = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib - , org }: - elpaBuild { - pname = "org-remark"; - ename = "org-remark"; - version = "1.2.2.0.20240325.201734"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/org-remark-1.2.2.0.20240325.201734.tar"; - sha256 = "1m5fwry6854w1iv6pahvqgyakws31d82l8f14k585rdxx2n8fwzb"; - }; - packageRequires = [ emacs org ]; - meta = { - homepage = "https://elpa.gnu.org/packages/org-remark.html"; - license = lib.licenses.free; - }; - }) {}; - org-transclusion = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib - , org }: - elpaBuild { - pname = "org-transclusion"; - ename = "org-transclusion"; - version = "1.4.0.0.20240520.170949"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/org-transclusion-1.4.0.0.20240520.170949.tar"; - sha256 = "15i8my50y1m44rhk06rfs6bwlc3mavb73bjysg3wp1j132m2dcrl"; - }; - packageRequires = [ emacs org ]; - meta = { - homepage = "https://elpa.gnu.org/packages/org-transclusion.html"; - license = lib.licenses.free; - }; - }) {}; - org-translate = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib - , org }: - elpaBuild { - pname = "org-translate"; - ename = "org-translate"; - version = "0.1.4.0.20220312.90634"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/org-translate-0.1.4.0.20220312.90634.tar"; - sha256 = "1fq0h0q5nh92dc9vgp7nmqyz2nl0byd2v6vl5k2lk3rlmbx7jnkz"; - }; - packageRequires = [ emacs org ]; - meta = { - homepage = "https://elpa.gnu.org/packages/org-translate.html"; - license = lib.licenses.free; - }; - }) {}; - orgalist = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "orgalist"; - ename = "orgalist"; - version = "1.14.0.20240111.181530"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/orgalist-1.14.0.20240111.181530.tar"; - sha256 = "05nbkphk3ii3ibfap9y9ss3w0g3qzl6qiynflib1dhbk2v222z3x"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/orgalist.html"; - license = lib.licenses.free; - }; - }) {}; - osc = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "osc"; - ename = "osc"; - version = "0.4.0.20221221.81343"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/osc-0.4.0.20221221.81343.tar"; - sha256 = "0mlyszhc2nbf5p4jnc6wlq8iipzmy9ymvbszq13myza410nd9xqh"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/osc.html"; - license = lib.licenses.free; - }; - }) {}; - osm = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "osm"; - ename = "osm"; - version = "1.3.0.20240122.225511"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/osm-1.3.0.20240122.225511.tar"; - sha256 = "0xddnwrnypqz5l4swwbi5k9qdlv260fyq766vpg31r86z92q7r24"; - }; - packageRequires = [ compat emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/osm.html"; - license = lib.licenses.free; - }; - }) {}; - other-frame-window = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "other-frame-window"; - ename = "other-frame-window"; - version = "1.0.6.0.20221221.81352"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/other-frame-window-1.0.6.0.20221221.81352.tar"; - sha256 = "11fdg3nl1w4vm46477kwk6d6vz769q726iz5cwknbvjzj8an994s"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/other-frame-window.html"; - license = lib.licenses.free; - }; - }) {}; - pabbrev = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "pabbrev"; - ename = "pabbrev"; - version = "4.3.0.0.20240216.43949"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/pabbrev-4.3.0.0.20240216.43949.tar"; - sha256 = "0lkqg6qv06ayianrxs9mivy8pny7hzr0743mlaa20adgk681v1s4"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/pabbrev.html"; - license = lib.licenses.free; - }; - }) {}; - paced = callPackage ({ async, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "paced"; - ename = "paced"; - version = "1.1.3.0.20190227.204125"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/paced-1.1.3.0.20190227.204125.tar"; - sha256 = "1ykjmv45kkfa569m8hpvya8a7wvkqrg9nbz28sbxmx79abm1bmmi"; - }; - packageRequires = [ async emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/paced.html"; - license = lib.licenses.free; - }; - }) {}; - parsec = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "parsec"; - ename = "parsec"; - version = "0.1.3.0.20180729.171626"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/parsec-0.1.3.0.20180729.171626.tar"; - sha256 = "0lhcj6cjgkq9ha85n0hqcm0ik7avfzw9f8zcklyivwn2bx80r7r7"; - }; - packageRequires = [ cl-lib emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/parsec.html"; - license = lib.licenses.free; - }; - }) {}; - parser-generator = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "parser-generator"; - ename = "parser-generator"; - version = "0.2.1.0.20240220.204114"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/parser-generator-0.2.1.0.20240220.204114.tar"; - sha256 = "1yb3wv183xii4rvj7asccg9cgkv061vprakcpdq99fgc9zdx0maq"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/parser-generator.html"; - license = lib.licenses.free; - }; - }) {}; - path-iterator = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "path-iterator"; - ename = "path-iterator"; - version = "1.0.0.20221221.81414"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/path-iterator-1.0.0.20221221.81414.tar"; - sha256 = "1ln9l9x6bj1sp7shc2iafn11yji6lsgm4fm1ji1kfp3my1zhqc40"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/path-iterator.html"; - license = lib.licenses.free; - }; - }) {}; - peg = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "peg"; - ename = "peg"; - version = "1.0.1.0.20221221.81502"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/peg-1.0.1.0.20221221.81502.tar"; - sha256 = "0gc41pf2gy01bmjgx09c1kifi6pkhcm8jrbdx1ncblhix76ia4q4"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/peg.html"; - license = lib.licenses.free; - }; - }) {}; - perl-doc = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "perl-doc"; - ename = "perl-doc"; - version = "0.81.0.20230805.210315"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/perl-doc-0.81.0.20230805.210315.tar"; - sha256 = "0n129rcmn827payv0aqg8iz7dc7wg4rm27hvvw1wwj2k5x5vnd6r"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/perl-doc.html"; - license = lib.licenses.free; - }; - }) {}; - persist = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "persist"; - ename = "persist"; - version = "0.6.0.20240114.52348"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/persist-0.6.0.20240114.52348.tar"; - sha256 = "1k4m2zmcb4l3q39qnx3kfl2wsm4380ih3mf0lc54g9l77fw4rfxr"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/persist.html"; - license = lib.licenses.free; - }; - }) {}; - phpinspect = callPackage ({ compat, elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "phpinspect"; - ename = "phpinspect"; - version = "0.0.20240322.152749"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/phpinspect-0.0.20240322.152749.tar"; - sha256 = "0060s1p60cqq0llx5m41iwqj1bxl98c444kyhfvdvx3c7z5dapmp"; - }; - packageRequires = [ compat ]; - meta = { - homepage = "https://elpa.gnu.org/packages/phpinspect.html"; - license = lib.licenses.free; - }; - }) {}; - phps-mode = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "phps-mode"; - ename = "phps-mode"; - version = "0.4.49.0.20240424.65247"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/phps-mode-0.4.49.0.20240424.65247.tar"; - sha256 = "03xz1ig3zsbwixa4hkh7g9ihjxlw2jmzydqldkvjsyv1yhyyf2j4"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/phps-mode.html"; - license = lib.licenses.free; - }; - }) {}; - pinentry = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "pinentry"; - ename = "pinentry"; - version = "0.1.0.20231126.141402"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/pinentry-0.1.0.20231126.141402.tar"; - sha256 = "056h9zfbk4mfpvfpli2kr48i5cdcrf73v15id0dk762iy7iz38af"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/pinentry.html"; - license = lib.licenses.free; - }; - }) {}; - plz = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "plz"; - ename = "plz"; - version = "0.8.0.20240425.201348"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/plz-0.8.0.20240425.201348.tar"; - sha256 = "00kprdnnz584fa2r8mkn4wzyk4fyxgn5d22z6s5c6lag0il1bjvc"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/plz.html"; - license = lib.licenses.free; - }; - }) {}; - plz-event-source = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib - , plz }: - elpaBuild { - pname = "plz-event-source"; - ename = "plz-event-source"; - version = "0.1pre0.20240501.111443"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/plz-event-source-0.1pre0.20240501.111443.tar"; - sha256 = "1bygbgzvyc6k8bqrnl5gwdbjmlrdh25fmf7n0rllfz4b055cdj6a"; - }; - packageRequires = [ emacs plz ]; - meta = { - homepage = "https://elpa.gnu.org/packages/plz-event-source.html"; - license = lib.licenses.free; - }; - }) {}; - plz-media-type = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib - , plz }: - elpaBuild { - pname = "plz-media-type"; - ename = "plz-media-type"; - version = "0.1pre0.20240501.111146"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/plz-media-type-0.1pre0.20240501.111146.tar"; - sha256 = "0l2zgxgi48rvzs79qq2bjmp7bg2qhd3709rpyzfkv77gigcjwqj6"; - }; - packageRequires = [ emacs plz ]; - meta = { - homepage = "https://elpa.gnu.org/packages/plz-media-type.html"; - license = lib.licenses.free; - }; - }) {}; - plz-see = callPackage ({ elpaBuild, emacs, fetchurl, lib, plz }: - elpaBuild { - pname = "plz-see"; - ename = "plz-see"; - version = "0.1.0.20231101.73512"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/plz-see-0.1.0.20231101.73512.tar"; - sha256 = "09ibjvd9wvndrygnfq0jic7m9bk6v490rk1k3b4qjvv5xfvsvvhq"; - }; - packageRequires = [ emacs plz ]; - meta = { - homepage = "https://elpa.gnu.org/packages/plz-see.html"; - license = lib.licenses.free; - }; - }) {}; - poke = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "poke"; - ename = "poke"; - version = "3.2.0.20230517.100500"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/poke-3.2.0.20230517.100500.tar"; - sha256 = "0p12szh563vynl7h9j55v7373g43fhmsy03iibvnywaira4arw5l"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/poke.html"; - license = lib.licenses.free; - }; - }) {}; - poke-mode = callPackage ({ elpaBuild - , fetchurl - , lib }: - elpaBuild { - pname = "poke-mode"; - ename = "poke-mode"; - version = "3.1.0.20231014.222558"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/poke-mode-3.1.0.20231014.222558.tar"; - sha256 = "1aqw9rn17n7ywnys6dlwykrf63l4kgapqsk1fay5qjj0y1nkq167"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/poke-mode.html"; - license = lib.licenses.free; - }; - }) {}; - poker = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "poker"; - ename = "poker"; - version = "0.2.0.20221221.81510"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/poker-0.2.0.20221221.81510.tar"; - sha256 = "14xc4jpkpy88drijp19znfhlyv61p2fx2l3zqsqbl3br2xwxy219"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/poker.html"; - license = lib.licenses.free; - }; - }) {}; - polymode = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "polymode"; - ename = "polymode"; - version = "0.2.2.0.20230317.121821"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/polymode-0.2.2.0.20230317.121821.tar"; - sha256 = "17dl20fzn15km0d2ypsrzij247yjr3nx5lk1sn5hwr3dvsapvagz"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/polymode.html"; - license = lib.licenses.free; - }; - }) {}; - popper = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "popper"; - ename = "popper"; - version = "0.4.6.0.20240323.172152"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/popper-0.4.6.0.20240323.172152.tar"; - sha256 = "1avpaza4w7hav5x7wz6jvk0gacxas11cdlpggx9chjlp0klns0v2"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/popper.html"; - license = lib.licenses.free; - }; - }) {}; - posframe = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "posframe"; - ename = "posframe"; - version = "1.4.3.0.20240507.14806"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/posframe-1.4.3.0.20240507.14806.tar"; - sha256 = "08jhv15hwrdjgdzl6d8xwdmx46afwlpd6yz3h5k7y7lhbnlc5jkp"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/posframe.html"; - license = lib.licenses.free; - }; - }) {}; - pq = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "pq"; - ename = "pq"; - version = "0.2.0.20240317.135839"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/pq-0.2.0.20240317.135839.tar"; - sha256 = "0hva6d8iqqdvnllm7cssxrmn21alcb2aa4d6874bqdfqjij2hw1z"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/pq.html"; - license = lib.licenses.free; - }; - }) {}; - prefixed-core = callPackage ({ elpaBuild - , fetchurl - , lib }: - elpaBuild { - pname = "prefixed-core"; - ename = "prefixed-core"; - version = "0.0.20221212.225529"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/prefixed-core-0.0.20221212.225529.tar"; - sha256 = "1b9bikccig8l96fal97lv6gajjip6qmbkx21y0pndfbw2kaamic4"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/prefixed-core.html"; - license = lib.licenses.free; - }; - }) {}; - project = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib - , xref }: - elpaBuild { - pname = "project"; - ename = "project"; - version = "0.10.0.0.20240512.175655"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/project-0.10.0.0.20240512.175655.tar"; - sha256 = "1228kpfyj3zd1bz8xjv257mhhxgvrj8d67saxgfxix3y62fhb2wc"; - }; - packageRequires = [ emacs xref ]; - meta = { - homepage = "https://elpa.gnu.org/packages/project.html"; - license = lib.licenses.free; - }; - }) {}; - psgml = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "psgml"; - ename = "psgml"; - version = "1.3.5.0.20221229.184738"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/psgml-1.3.5.0.20221229.184738.tar"; - sha256 = "1zdfdzbadrbj6g4k2q7w5yvxvblpwn4mkihmnmag7jym66r4wmnb"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/psgml.html"; - license = lib.licenses.free; - }; - }) {}; - pspp-mode = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "pspp-mode"; - ename = "pspp-mode"; - version = "1.1.0.20221221.81719"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/pspp-mode-1.1.0.20221221.81719.tar"; - sha256 = "010qckmc85wc4i7k1rmhffcdbpxpvs6p5qxdvr6g3ws00c1a3j4l"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/pspp-mode.html"; - license = lib.licenses.free; - }; - }) {}; - pulsar = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "pulsar"; - ename = "pulsar"; - version = "1.0.1.0.20240429.64508"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/pulsar-1.0.1.0.20240429.64508.tar"; - sha256 = "1ak3vphfw0rsm4rrqyg72zjjwm68ypwxbbif8fz31rnsp0n66f8n"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/pulsar.html"; - license = lib.licenses.free; - }; - }) {}; - pyim = callPackage ({ async, elpaBuild, emacs, fetchurl, lib, xr }: - elpaBuild { - pname = "pyim"; - ename = "pyim"; - version = "5.3.4.0.20240508.25615"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/pyim-5.3.4.0.20240508.25615.tar"; - sha256 = "0p079girx795fvqswdjh8l5mwdyndanfcsvb1qvj2klq063y1vv5"; - }; - packageRequires = [ async emacs xr ]; - meta = { - homepage = "https://elpa.gnu.org/packages/pyim.html"; - license = lib.licenses.free; - }; - }) {}; - pyim-basedict = callPackage ({ elpaBuild - , fetchurl - , lib }: - elpaBuild { - pname = "pyim-basedict"; - ename = "pyim-basedict"; - version = "0.5.4.0.20220614.110824"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/pyim-basedict-0.5.4.0.20220614.110824.tar"; - sha256 = "0md12ysqcmz737vcs8wh561zl8s98w04cgzs69pbdnzzxas7iy2j"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/pyim-basedict.html"; - license = lib.licenses.free; - }; - }) {}; - python = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib, seq }: - elpaBuild { - pname = "python"; - ename = "python"; - version = "0.28.0.20240518.202234"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/python-0.28.0.20240518.202234.tar"; - sha256 = "0nk9rdr62c9j27gbjz3z6ri35aw026pmj6lhqvn6j9ci8ijif3yf"; - }; - packageRequires = [ compat emacs seq ]; - meta = { - homepage = "https://elpa.gnu.org/packages/python.html"; - license = lib.licenses.free; - }; - }) {}; - quarter-plane = callPackage ({ elpaBuild - , fetchurl - , lib }: - elpaBuild { - pname = "quarter-plane"; - ename = "quarter-plane"; - version = "0.1.0.20221221.81727"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/quarter-plane-0.1.0.20221221.81727.tar"; - sha256 = "1s0fl9sxjhv0sl5ikvkhdnddjg1n2hzw0a64xcvm8859dk77fmy8"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/quarter-plane.html"; - license = lib.licenses.free; - }; - }) {}; - queue = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "queue"; - ename = "queue"; - version = "0.2.0.20210306.173709"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/queue-0.2.0.20210306.173709.tar"; - sha256 = "09iicl5fdpli6jnvdj0h8cwj7wqqmxnfzdd57vfjdq09v3sjkljs"; - }; - packageRequires = [ cl-lib ]; - meta = { - homepage = "https://elpa.gnu.org/packages/queue.html"; - license = lib.licenses.free; - }; - }) {}; - rainbow-mode = callPackage ({ elpaBuild - , fetchurl - , lib }: - elpaBuild { - pname = "rainbow-mode"; - ename = "rainbow-mode"; - version = "1.0.6.0.20231215.171141"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/rainbow-mode-1.0.6.0.20231215.171141.tar"; - sha256 = "0qr0yl8fszrrdnl8x3d8lnndr5s9g3bf708qilb3f6i5ahkqhq7l"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/rainbow-mode.html"; - license = lib.licenses.free; - }; - }) {}; - rbit = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "rbit"; - ename = "rbit"; - version = "0.1.0.20201128.182847"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/rbit-0.1.0.20201128.182847.tar"; - sha256 = "1ajjfkih0dji2mdsvcpdzmb32nv20niryl8x17ki1016302qfvdj"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/rbit.html"; - license = lib.licenses.free; - }; - }) {}; - rcirc-color = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "rcirc-color"; - ename = "rcirc-color"; - version = "0.4.5.0.20230414.195045"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/rcirc-color-0.4.5.0.20230414.195045.tar"; - sha256 = "1amlzg7njbmk1kbb569ygx2az7vd7py89z9aq9cmf5rm15hjsm59"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/rcirc-color.html"; - license = lib.licenses.free; - }; - }) {}; - rcirc-menu = callPackage ({ elpaBuild - , fetchurl - , lib }: - elpaBuild { - pname = "rcirc-menu"; - ename = "rcirc-menu"; - version = "1.1.0.20221221.81818"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/rcirc-menu-1.1.0.20221221.81818.tar"; - sha256 = "0gd19rzqgqb9w5cfpr1rz719k5z1rfkn8480b0h1zkvgpgmdrzbx"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/rcirc-menu.html"; - license = lib.licenses.free; - }; - }) {}; - rcirc-sqlite = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "rcirc-sqlite"; - ename = "rcirc-sqlite"; - version = "1.0.1.0.20240422.191938"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/rcirc-sqlite-1.0.1.0.20240422.191938.tar"; - sha256 = "1nspv7qgwzjpy9jsgh3m75iimy8piicimv9r82ahm5vrpaxkwg3p"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/rcirc-sqlite.html"; - license = lib.licenses.free; - }; - }) {}; - realgud = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib - , load-relative - , loc-changes - , test-simple }: - elpaBuild { - pname = "realgud"; - ename = "realgud"; - version = "1.5.1.0.20231113.141045"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/realgud-1.5.1.0.20231113.141045.tar"; - sha256 = "1nvmpbnx31fdi2ps243xx6cnvhmyv9n1kvb98ydnxydmalxs4iva"; - }; - packageRequires = [ emacs load-relative loc-changes test-simple ]; - meta = { - homepage = "https://elpa.gnu.org/packages/realgud.html"; - license = lib.licenses.free; - }; - }) {}; - realgud-ipdb = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib - , load-relative - , realgud }: - elpaBuild { - pname = "realgud-ipdb"; - ename = "realgud-ipdb"; - version = "1.0.0.0.20231216.160636"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/realgud-ipdb-1.0.0.0.20231216.160636.tar"; - sha256 = "1s08gngzq18bgxdc6qpsg7j9wjqq842wj5bki2l8jgyqpin6g3h5"; - }; - packageRequires = [ emacs load-relative realgud ]; - meta = { - homepage = "https://elpa.gnu.org/packages/realgud-ipdb.html"; - license = lib.licenses.free; - }; - }) {}; - realgud-jdb = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib - , load-relative - , realgud }: - elpaBuild { - pname = "realgud-jdb"; - ename = "realgud-jdb"; - version = "1.0.0.0.20200722.72030"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/realgud-jdb-1.0.0.0.20200722.72030.tar"; - sha256 = "1vh4x50gcy5i9v9pisn0swmv0ighksn8ni68pdwxkns5ka99qqi6"; - }; - packageRequires = [ emacs load-relative realgud ]; - meta = { - homepage = "https://elpa.gnu.org/packages/realgud-jdb.html"; - license = lib.licenses.free; - }; - }) {}; - realgud-lldb = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib - , load-relative - , realgud }: - elpaBuild { - pname = "realgud-lldb"; - ename = "realgud-lldb"; - version = "1.0.2.0.20230319.171320"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/realgud-lldb-1.0.2.0.20230319.171320.tar"; - sha256 = "0isnyflg507qngv8xjw8zwzwh4qy0d3c123d5rirwbissjcfxmrs"; - }; - packageRequires = [ emacs load-relative realgud ]; - meta = { - homepage = "https://elpa.gnu.org/packages/realgud-lldb.html"; - license = lib.licenses.free; - }; - }) {}; - realgud-node-debug = callPackage ({ cl-lib ? null - , elpaBuild - , emacs - , fetchurl - , lib - , load-relative - , realgud }: - elpaBuild { - pname = "realgud-node-debug"; - ename = "realgud-node-debug"; - version = "1.0.0.0.20190525.123417"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/realgud-node-debug-1.0.0.0.20190525.123417.tar"; - sha256 = "1s5zav3d0xdj0jggw3znfzb43d9jrnzaafk51wiachh7j673gjjv"; - }; - packageRequires = [ cl-lib emacs load-relative realgud ]; - meta = { - homepage = "https://elpa.gnu.org/packages/realgud-node-debug.html"; - license = lib.licenses.free; - }; - }) {}; - realgud-node-inspect = callPackage ({ cl-lib ? null - , elpaBuild - , emacs - , fetchurl - , lib - , load-relative - , realgud }: - elpaBuild { - pname = "realgud-node-inspect"; - ename = "realgud-node-inspect"; - version = "1.0.0.0.20190526.154549"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/realgud-node-inspect-1.0.0.0.20190526.154549.tar"; - sha256 = "0hss16d3avyisdxp1xhzjqn2kd9xc3vkqg4ynsgvxampzli78fw9"; - }; - packageRequires = [ cl-lib emacs load-relative realgud ]; - meta = { - homepage = "https://elpa.gnu.org/packages/realgud-node-inspect.html"; - license = lib.licenses.free; - }; - }) {}; - realgud-trepan-ni = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib - , load-relative - , realgud }: - elpaBuild { - pname = "realgud-trepan-ni"; - ename = "realgud-trepan-ni"; - version = "1.0.1.0.20210513.183733"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/realgud-trepan-ni-1.0.1.0.20210513.183733.tar"; - sha256 = "0p7sc7g1nwg1hyvgx5mzs2qpjnrayp7brw720kzxfxnxdfj7p0gj"; - }; - packageRequires = [ emacs load-relative realgud ]; - meta = { - homepage = "https://elpa.gnu.org/packages/realgud-trepan-ni.html"; - license = lib.licenses.free; - }; - }) {}; - realgud-trepan-xpy = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib - , load-relative - , realgud }: - elpaBuild { - pname = "realgud-trepan-xpy"; - ename = "realgud-trepan-xpy"; - version = "1.0.1.0.20230322.184556"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/realgud-trepan-xpy-1.0.1.0.20230322.184556.tar"; - sha256 = "0m9pwqbkhwkm9fys7rs2lapydkinh4v7q3q3j8b0qb0nl8qcni7i"; - }; - packageRequires = [ emacs load-relative realgud ]; - meta = { - homepage = "https://elpa.gnu.org/packages/realgud-trepan-xpy.html"; - license = lib.licenses.free; - }; - }) {}; - rec-mode = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "rec-mode"; - ename = "rec-mode"; - version = "1.9.3.0.20231120.221944"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/rec-mode-1.9.3.0.20231120.221944.tar"; - sha256 = "1vi5fkxfjfq7z0dc3vhdknzw8id5a1fm0zaxr3y09np7z6n3iv7z"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/rec-mode.html"; - license = lib.licenses.free; - }; - }) {}; - register-list = callPackage ({ elpaBuild - , fetchurl - , lib }: - elpaBuild { - pname = "register-list"; - ename = "register-list"; - version = "0.1.0.20221212.230034"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/register-list-0.1.0.20221212.230034.tar"; - sha256 = "02qc5ll26br1smx5d0ci3wm0s4hdj8sw72xdapn5bql5509n75dx"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/register-list.html"; - license = lib.licenses.free; - }; - }) {}; - relint = callPackage ({ elpaBuild, emacs, fetchurl, lib, xr }: - elpaBuild { - pname = "relint"; - ename = "relint"; - version = "1.24.0.20240510.91500"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/relint-1.24.0.20240510.91500.tar"; - sha256 = "171dnhya0ij5lapn9h2d8ssxx163lwgasvfssd07739171h07389"; - }; - packageRequires = [ emacs xr ]; - meta = { - homepage = "https://elpa.gnu.org/packages/relint.html"; - license = lib.licenses.free; - }; - }) {}; - repology = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "repology"; - ename = "repology"; - version = "1.2.4.0.20240108.130348"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/repology-1.2.4.0.20240108.130348.tar"; - sha256 = "1ybr0zn647sb6gfqrm6ahdkx3q30j2b0gaab335nkc7jqx1ba565"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/repology.html"; - license = lib.licenses.free; - }; - }) {}; - rich-minority = callPackage ({ cl-lib ? null - , elpaBuild - , fetchurl - , lib }: - elpaBuild { - pname = "rich-minority"; - ename = "rich-minority"; - version = "1.0.3.0.20190419.83620"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/rich-minority-1.0.3.0.20190419.83620.tar"; - sha256 = "0kx516s0kv8ni3w408hb9bpnig83bv4m1l7b5lhdigmp8zvqm8jm"; - }; - packageRequires = [ cl-lib ]; - meta = { - homepage = "https://elpa.gnu.org/packages/rich-minority.html"; - license = lib.licenses.free; - }; - }) {}; - rnc-mode = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "rnc-mode"; - ename = "rnc-mode"; - version = "0.3.0.20221221.81910"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/rnc-mode-0.3.0.20221221.81910.tar"; - sha256 = "1rdz1g440sjzxcqc4p2s0vv525ala4k470ddn4h9ghljnncqbady"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/rnc-mode.html"; - license = lib.licenses.free; - }; - }) {}; - rt-liberation = callPackage ({ elpaBuild - , fetchurl - , lib }: - elpaBuild { - pname = "rt-liberation"; - ename = "rt-liberation"; - version = "7.0.20240306.83828"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/rt-liberation-7.0.20240306.83828.tar"; - sha256 = "1gz0hiwl8qqf1adxwgr8ly98pymqjrl3jjfly5r182l3rwp82gsh"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/rt-liberation.html"; - license = lib.licenses.free; - }; - }) {}; - ruby-end = callPackage ({ elpaBuild - , fetchurl - , lib }: - elpaBuild { - pname = "ruby-end"; - ename = "ruby-end"; - version = "0.4.3.0.20230205.12506"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/ruby-end-0.4.3.0.20230205.12506.tar"; - sha256 = "0cr18s311c986gwx12f6fmnqwyqb4fh7j6h8m2cgp767vn4aqwxl"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/ruby-end.html"; - license = lib.licenses.free; - }; - }) {}; - rudel = callPackage ({ cl-generic - , cl-lib ? null - , cl-print ? null - , elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "rudel"; - ename = "rudel"; - version = "0.3.2.0.20221212.230154"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/rudel-0.3.2.0.20221212.230154.tar"; - sha256 = "0lcdc0gdqkl4disr9rwn1dmziwaiwnsyhfwvf02vrgpabd7dq95w"; - }; - packageRequires = [ cl-generic cl-lib cl-print emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/rudel.html"; - license = lib.licenses.free; - }; - }) {}; - satchel = callPackage ({ elpaBuild, emacs, fetchurl, lib, project }: - elpaBuild { - pname = "satchel"; - ename = "satchel"; - version = "0.2.0.20220223.202624"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/satchel-0.2.0.20220223.202624.tar"; - sha256 = "1x558csdfahlp459m4bb827yayrzgisaijzbpxbl1pjhq595585d"; - }; - packageRequires = [ emacs project ]; - meta = { - homepage = "https://elpa.gnu.org/packages/satchel.html"; - license = lib.licenses.free; - }; - }) {}; - scanner = callPackage ({ dash, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "scanner"; - ename = "scanner"; - version = "0.2.0.20210104.105054"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/scanner-0.2.0.20210104.105054.tar"; - sha256 = "1ah74y9ragw3kycqwgxkmnxrzl7s2n43cjpw6r25hmbyzjnhdppm"; - }; - packageRequires = [ dash emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/scanner.html"; - license = lib.licenses.free; - }; - }) {}; - scroll-restore = callPackage ({ elpaBuild - , fetchurl - , lib }: - elpaBuild { - pname = "scroll-restore"; - ename = "scroll-restore"; - version = "1.0.0.20221221.81959"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/scroll-restore-1.0.0.20221221.81959.tar"; - sha256 = "04xhshjm5fr5q85srmjhvm20l0zljgbdsy1f3g3lczgzqrwvyg9f"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/scroll-restore.html"; - license = lib.licenses.free; - }; - }) {}; - sed-mode = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "sed-mode"; - ename = "sed-mode"; - version = "1.1.0.20230721.154631"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/sed-mode-1.1.0.20230721.154631.tar"; - sha256 = "1gb7m8w5v0ay8mcm7alyixsnmndivd24467v58rkj0bpf7bmfa5v"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/sed-mode.html"; - license = lib.licenses.free; - }; - }) {}; - seq = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "seq"; - ename = "seq"; - version = "2.24.0.20240201.135317"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/seq-2.24.0.20240201.135317.tar"; - sha256 = "0plr9pbvzd5cfivj90n0jm920hp2x1giy9889pr8x5bqqnba6j66"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/seq.html"; - license = lib.licenses.free; - }; - }) {}; - setup = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "setup"; - ename = "setup"; - version = "1.4.0.0.20240413.75454"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/setup-1.4.0.0.20240413.75454.tar"; - sha256 = "1ryxa0991mzvx2ai4bkmjxnikpnalmr4gdggakfg8i8ag65149rn"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/setup.html"; - license = lib.licenses.free; - }; - }) {}; - shelisp = callPackage ({ elpaBuild - , fetchurl - , lib }: - elpaBuild { - pname = "shelisp"; - ename = "shelisp"; - version = "1.0.0.0.20221212.230255"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/shelisp-1.0.0.0.20221212.230255.tar"; - sha256 = "0kk24mkmm4imf7gsr7xihj3xf2y9mgy61gpyql0wms1vlmkl0mwk"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/shelisp.html"; - license = lib.licenses.free; - }; - }) {}; - shell-command-plus = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "shell-command-plus"; - ename = "shell-command+"; - version = "2.4.2.0.20240313.182825"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/shell-command+-2.4.2.0.20240313.182825.tar"; - sha256 = "17rqdk23w41dl44imrk6b7p3r4g0ldppj84hp7s6w7amx6fia7ah"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/shell-command+.html"; - license = lib.licenses.free; - }; - }) {}; - shell-quasiquote = callPackage ({ elpaBuild - , fetchurl - , lib }: - elpaBuild { - pname = "shell-quasiquote"; - ename = "shell-quasiquote"; - version = "0.0.20221221.82030"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/shell-quasiquote-0.0.20221221.82030.tar"; - sha256 = "0g2yq64yyim35lvxify65kq3y49qrvgri7jyl9rgz8999gb3h8dj"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/shell-quasiquote.html"; - license = lib.licenses.free; - }; - }) {}; - shen-mode = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "shen-mode"; - ename = "shen-mode"; - version = "0.1.0.20221221.82050"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/shen-mode-0.1.0.20221221.82050.tar"; - sha256 = "17ygb1c0x52n3cnmvaacrcf7m6qdjxdqaw1pn7lg3899kl45dh3r"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/shen-mode.html"; - license = lib.licenses.free; - }; - }) {}; - sisu-mode = callPackage ({ elpaBuild - , fetchurl - , lib }: - elpaBuild { - pname = "sisu-mode"; - ename = "sisu-mode"; - version = "7.1.8.0.20221221.82114"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/sisu-mode-7.1.8.0.20221221.82114.tar"; - sha256 = "1cyynn3sk8wxfhiz5q0lqwq07kqy67s2rvjql62880in5m5r2jpa"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/sisu-mode.html"; - license = lib.licenses.free; - }; - }) {}; - site-lisp = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "site-lisp"; - ename = "site-lisp"; - version = "0.1.2.0.20240308.82403"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/site-lisp-0.1.2.0.20240308.82403.tar"; - sha256 = "0c9r5pp2lr4wmpcfa8qz0xvq1vhzyhvnn14kawjarhx9p5mvgdq1"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/site-lisp.html"; - license = lib.licenses.free; - }; - }) {}; - sketch-mode = callPackage ({ elpaBuild - , fetchurl - , lib }: - elpaBuild { - pname = "sketch-mode"; - ename = "sketch-mode"; - version = "1.0.4.0.20230420.122954"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/sketch-mode-1.0.4.0.20230420.122954.tar"; - sha256 = "0ssh1v49h94gvchpynvjcsw80swpcdw541zxxhxm5zi6gsnyhnjd"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/sketch-mode.html"; - license = lib.licenses.free; - }; - }) {}; - slime-volleyball = callPackage ({ cl-lib ? null - , elpaBuild - , fetchurl - , lib }: - elpaBuild { - pname = "slime-volleyball"; - ename = "slime-volleyball"; - version = "1.2.0.0.20221221.82156"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/slime-volleyball-1.2.0.0.20221221.82156.tar"; - sha256 = "015qpac86km7czpqr2f7xpjlkwbq9s4z9jl0dnr8b2bzh0iwqiik"; - }; - packageRequires = [ cl-lib ]; - meta = { - homepage = "https://elpa.gnu.org/packages/slime-volleyball.html"; - license = lib.licenses.free; - }; - }) {}; - sm-c-mode = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "sm-c-mode"; - ename = "sm-c-mode"; - version = "1.2.0.20240404.93144"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/sm-c-mode-1.2.0.20240404.93144.tar"; - sha256 = "1xbkdvhxaffk6csav2ivbrqv85rkb4arnsslp2ji13alkm5hx1zx"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/sm-c-mode.html"; - license = lib.licenses.free; - }; - }) {}; - smalltalk-mode = callPackage ({ elpaBuild - , fetchurl - , lib }: - elpaBuild { - pname = "smalltalk-mode"; - ename = "smalltalk-mode"; - version = "4.0.0.20221221.82225"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/smalltalk-mode-4.0.0.20221221.82225.tar"; - sha256 = "1qk0z1gddw7fidvj429ivjwnxb4f5g074r531nmpvmy2l7srchd9"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/smalltalk-mode.html"; - license = lib.licenses.free; - }; - }) {}; - smart-yank = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "smart-yank"; - ename = "smart-yank"; - version = "0.1.1.0.20221221.82231"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/smart-yank-0.1.1.0.20221221.82231.tar"; - sha256 = "17w9ybfvdsnsy1vf1mg7a4428rna49i2yfifrp20srj8c0dapwzd"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/smart-yank.html"; - license = lib.licenses.free; - }; - }) {}; - sml-mode = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "sml-mode"; - ename = "sml-mode"; - version = "6.12.0.20230411.5343"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/sml-mode-6.12.0.20230411.5343.tar"; - sha256 = "1a7n0lvrjq4xnn0cr6qwgh7l54m95mf2nxwv1rplair4r8si8y0d"; - }; - packageRequires = [ cl-lib emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/sml-mode.html"; - license = lib.licenses.free; - }; - }) {}; - so-long = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "so-long"; - ename = "so-long"; - version = "1.1.2.0.20240102.22814"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/so-long-1.1.2.0.20240102.22814.tar"; - sha256 = "0fq1c34jlp9jc3zz4rrf9zz6mww0ydm3lh0zrfy3qgssj248ghmy"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/so-long.html"; - license = lib.licenses.free; - }; - }) {}; - soap-client = callPackage ({ cl-lib ? null - , elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "soap-client"; - ename = "soap-client"; - version = "3.2.3.0.20240102.22814"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/soap-client-3.2.3.0.20240102.22814.tar"; - sha256 = "084svzsb2rrqxvb76qxnwdj64kn364dqgbgdpymqngihngyr88fb"; - }; - packageRequires = [ cl-lib emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/soap-client.html"; - license = lib.licenses.free; - }; - }) {}; - sokoban = callPackage ({ cl-lib ? null - , elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "sokoban"; - ename = "sokoban"; - version = "1.4.9.0.20220928.185052"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/sokoban-1.4.9.0.20220928.185052.tar"; - sha256 = "1d3s1v81mvfjcq5bbf0338ldxgl2rymqb3vqqw7drbics4jq5fc0"; - }; - packageRequires = [ cl-lib emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/sokoban.html"; - license = lib.licenses.free; - }; - }) {}; - sotlisp = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "sotlisp"; - ename = "sotlisp"; - version = "1.6.2.0.20220909.50328"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/sotlisp-1.6.2.0.20220909.50328.tar"; - sha256 = "1g48ahiwdipk4ckynqipsfradd1qafg59s10jkbpkp3wvfmxi5sf"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/sotlisp.html"; - license = lib.licenses.free; - }; - }) {}; - spacious-padding = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "spacious-padding"; - ename = "spacious-padding"; - version = "0.5.0.0.20240429.82953"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/spacious-padding-0.5.0.0.20240429.82953.tar"; - sha256 = "0k5w5d9prlasvv6074nxl8782mbhhvccpkc1zjrp228frkbgfpmi"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/spacious-padding.html"; - license = lib.licenses.free; - }; - }) {}; - spinner = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "spinner"; - ename = "spinner"; - version = "1.7.4.0.20220915.94959"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/spinner-1.7.4.0.20220915.94959.tar"; - sha256 = "1110bxj7vgai0wgsqbd9917k72xmalyfy0rlwqp46azg02ljam6j"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/spinner.html"; - license = lib.licenses.free; - }; - }) {}; - sql-beeline = callPackage ({ elpaBuild - , fetchurl - , lib }: - elpaBuild { - pname = "sql-beeline"; - ename = "sql-beeline"; - version = "0.2.0.20221221.82329"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/sql-beeline-0.2.0.20221221.82329.tar"; - sha256 = "0qfw9q5isyjywlm2fyaazci24jza6h4s50i0zmjk35j6spyxwffs"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/sql-beeline.html"; - license = lib.licenses.free; - }; - }) {}; - sql-cassandra = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "sql-cassandra"; - ename = "sql-cassandra"; - version = "0.2.2.0.20221221.82336"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/sql-cassandra-0.2.2.0.20221221.82336.tar"; - sha256 = "1rl2bdjyglzssm00zdfqidd9j7jzizxaq60bclqa5dsz80zsd6aq"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/sql-cassandra.html"; - license = lib.licenses.free; - }; - }) {}; - sql-indent = callPackage ({ cl-lib ? null - , elpaBuild - , fetchurl - , lib }: - elpaBuild { - pname = "sql-indent"; - ename = "sql-indent"; - version = "1.7.0.20240323.40057"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/sql-indent-1.7.0.20240323.40057.tar"; - sha256 = "0zrsglgw2zjxn9810r022kanvfj0zrhvr696yxlnvd05f9hv9bpp"; - }; - packageRequires = [ cl-lib ]; - meta = { - homepage = "https://elpa.gnu.org/packages/sql-indent.html"; - license = lib.licenses.free; - }; - }) {}; - sql-smie = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "sql-smie"; - ename = "sql-smie"; - version = "0.0.20221221.82351"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/sql-smie-0.0.20221221.82351.tar"; - sha256 = "05jv2k9gswwwyi19da8d5f176lb81qmnf94dvghyzh272v9iwvkr"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/sql-smie.html"; - license = lib.licenses.free; - }; - }) {}; - srht = callPackage ({ elpaBuild, emacs, fetchurl, lib, plz, transient }: - elpaBuild { - pname = "srht"; - ename = "srht"; - version = "0.4.0.20240506.104337"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/srht-0.4.0.20240506.104337.tar"; - sha256 = "1fs6av8l3v4vvzxxhd20rzwrwh8dkk1d1x21jkjx8nczj2jydwb0"; - }; - packageRequires = [ emacs plz transient ]; - meta = { - homepage = "https://elpa.gnu.org/packages/srht.html"; - license = lib.licenses.free; - }; - }) {}; - ssh-deploy = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "ssh-deploy"; - ename = "ssh-deploy"; - version = "3.1.16.0.20230702.92809"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/ssh-deploy-3.1.16.0.20230702.92809.tar"; - sha256 = "0zjkc1gb3hpknx8012crcbdy3w1w597qk8qajhpaijhjhispm507"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/ssh-deploy.html"; - license = lib.licenses.free; - }; - }) {}; - standard-themes = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "standard-themes"; - ename = "standard-themes"; - version = "2.0.1.0.20240520.83250"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/standard-themes-2.0.1.0.20240520.83250.tar"; - sha256 = "08lb47hilg5dniqxlxp773s16m0shqmglcrf1qdm48ddg05911gx"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/standard-themes.html"; - license = lib.licenses.free; - }; - }) {}; - stream = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "stream"; - ename = "stream"; - version = "2.3.0.0.20230908.74447"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/stream-2.3.0.0.20230908.74447.tar"; - sha256 = "1zfw7plnlsijs8aw5726adjwd65g1x3xs4vcs3rcc2ybv8cz886s"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/stream.html"; - license = lib.licenses.free; - }; - }) {}; - substitute = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "substitute"; - ename = "substitute"; - version = "0.3.1.0.20240522.34122"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/substitute-0.3.1.0.20240522.34122.tar"; - sha256 = "02n78x82sl7i0xzpp1468i1bwm9kic2ycc9vvhymxalpiylc3iqq"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/substitute.html"; - license = lib.licenses.free; - }; - }) {}; - svg = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "svg"; - ename = "svg"; - version = "1.1.0.20240102.22814"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/svg-1.1.0.20240102.22814.tar"; - sha256 = "1ddz3zadwmm4am2ywwmrqj2a56kr73i45q7svjmgnljgvvs267b3"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/svg.html"; - license = lib.licenses.free; - }; - }) {}; - svg-clock = callPackage ({ elpaBuild, emacs, fetchurl, lib, svg }: - elpaBuild { - pname = "svg-clock"; - ename = "svg-clock"; - version = "1.2.0.20221221.82408"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/svg-clock-1.2.0.20221221.82408.tar"; - sha256 = "15fshgjqv3995f2339rwvjw9vyiqz2lfs9h80gkmssha7fdfw3qx"; - }; - packageRequires = [ emacs svg ]; - meta = { - homepage = "https://elpa.gnu.org/packages/svg-clock.html"; - license = lib.licenses.free; - }; - }) {}; - svg-lib = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "svg-lib"; - ename = "svg-lib"; - version = "0.3.0.20240219.161327"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/svg-lib-0.3.0.20240219.161327.tar"; - sha256 = "1qycnhjinmn1smajsniz34kv7jkl4gycjhsl6mxxjhq0432cw2fc"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/svg-lib.html"; - license = lib.licenses.free; - }; - }) {}; - svg-tag-mode = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib - , svg-lib }: - elpaBuild { - pname = "svg-tag-mode"; - ename = "svg-tag-mode"; - version = "0.3.2.0.20240429.105240"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/svg-tag-mode-0.3.2.0.20240429.105240.tar"; - sha256 = "0isp9zcyx9dqb0nah1b990nikwiaxm5lvqlbya9v1rcb3fbvf9hc"; - }; - packageRequires = [ emacs svg-lib ]; - meta = { - homepage = "https://elpa.gnu.org/packages/svg-tag-mode.html"; - license = lib.licenses.free; - }; - }) {}; - swiper = callPackage ({ elpaBuild - , emacs - , fetchurl - , ivy - , lib }: - elpaBuild { - pname = "swiper"; - ename = "swiper"; - version = "0.14.2.0.20240520.120545"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/swiper-0.14.2.0.20240520.120545.tar"; - sha256 = "1wcxf1d3kn19yq3gk4d4fqs7p61i1rm316glzlcksny6rp2f1sma"; - }; - packageRequires = [ emacs ivy ]; - meta = { - homepage = "https://elpa.gnu.org/packages/swiper.html"; - license = lib.licenses.free; - }; - }) {}; - switchy-window = callPackage ({ compat - , elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "switchy-window"; - ename = "switchy-window"; - version = "1.3.0.20230411.180529"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/switchy-window-1.3.0.20230411.180529.tar"; - sha256 = "1h3jib0qr8wj3xk3qha5yrw2vqhidnqhj4jhw2smrfk61vyfs83b"; - }; - packageRequires = [ compat emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/switchy-window.html"; - license = lib.licenses.free; - }; - }) {}; - sxhkdrc-mode = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "sxhkdrc-mode"; - ename = "sxhkdrc-mode"; - version = "1.0.0.0.20240117.30132"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/sxhkdrc-mode-1.0.0.0.20240117.30132.tar"; - sha256 = "0sbp6n6j7m0q4gj2x02q2f7ncwsji5jgy6d113n6qfain5ffj0fs"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/sxhkdrc-mode.html"; - license = lib.licenses.free; - }; - }) {}; - system-packages = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "system-packages"; - ename = "system-packages"; - version = "1.0.13.0.20230908.453"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/system-packages-1.0.13.0.20230908.453.tar"; - sha256 = "0qh4z6sik94hkms5nfharx2y8np2a1a2r9yrf8lw6xihdnd7bfcv"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/system-packages.html"; - license = lib.licenses.free; - }; - }) {}; - systemd = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "systemd"; - ename = "systemd"; - version = "0.0.20221221.82418"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/systemd-0.0.20221221.82418.tar"; - sha256 = "1ir3y4w2x1cl24zy66yym5rlpffgrcs10x4sxhb2sgg5k4d88scn"; - }; - packageRequires = [ cl-lib ]; - meta = { - homepage = "https://elpa.gnu.org/packages/systemd.html"; - license = lib.licenses.free; - }; - }) {}; - tNFA = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib, queue }: - elpaBuild { - pname = "tNFA"; - ename = "tNFA"; - version = "0.1.1.0.20240405.140856"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/tNFA-0.1.1.0.20240405.140856.tar"; - sha256 = "0m2lh50bz56j5gdpjvan0sksgnlb3cszb28q69xni88hajacn4aw"; - }; - packageRequires = [ cl-lib queue ]; - meta = { - homepage = "https://elpa.gnu.org/packages/tNFA.html"; - license = lib.licenses.free; - }; - }) {}; - tam = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "tam"; - ename = "tam"; - version = "0.1.0.20230920.103516"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/tam-0.1.0.20230920.103516.tar"; - sha256 = "01w1vwb1ajmbk90c79wc0dc367sy5b5qdf471zr0xinajfv47709"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/tam.html"; - license = lib.licenses.free; - }; - }) {}; - taxy = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "taxy"; - ename = "taxy"; - version = "0.10.1.0.20220919.160646"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/taxy-0.10.1.0.20220919.160646.tar"; - sha256 = "0bld0sjni4ipbllrjnlwk5419454ac5s3mf6imw91z4ddk46vp18"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/taxy.html"; - license = lib.licenses.free; - }; - }) {}; - taxy-magit-section = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib - , magit-section - , taxy }: - elpaBuild { - pname = "taxy-magit-section"; - ename = "taxy-magit-section"; - version = "0.13.0.20240124.3519"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/taxy-magit-section-0.13.0.20240124.3519.tar"; - sha256 = "1z1cypw7g5vs8vrm1mjvfzxaasr8nz89w1br9dhk8wshyy4kmgf3"; - }; - packageRequires = [ emacs magit-section taxy ]; - meta = { - homepage = "https://elpa.gnu.org/packages/taxy-magit-section.html"; - license = lib.licenses.free; - }; - }) {}; - temp-buffer-browse = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "temp-buffer-browse"; - ename = "temp-buffer-browse"; - version = "1.5.0.20160804.124501"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/temp-buffer-browse-1.5.0.20160804.124501.tar"; - sha256 = "0jw3fjbnbbrsz54hmg4rhcwrl0ag7h6873n2kdph3gjds29d8jxp"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/temp-buffer-browse.html"; - license = lib.licenses.free; - }; - }) {}; - tempel = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "tempel"; - ename = "tempel"; - version = "1.1.0.20240216.154335"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/tempel-1.1.0.20240216.154335.tar"; - sha256 = "14zraddmfxnz7bzr9m2qk38hqy3bmd8ypq5x7ni8xapc6lyqd0pm"; - }; - packageRequires = [ compat emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/tempel.html"; - license = lib.licenses.free; - }; - }) {}; - test-simple = callPackage ({ cl-lib ? null - , elpaBuild - , fetchurl - , lib }: - elpaBuild { - pname = "test-simple"; - ename = "test-simple"; - version = "1.3.0.0.20230916.123447"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/test-simple-1.3.0.0.20230916.123447.tar"; - sha256 = "1xbf63qg17va0qwq2mkg12jg1fk6wwrs43jjzxxccx28h6d205il"; - }; - packageRequires = [ cl-lib ]; - meta = { - homepage = "https://elpa.gnu.org/packages/test-simple.html"; - license = lib.licenses.free; - }; - }) {}; - theme-buffet = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "theme-buffet"; - ename = "theme-buffet"; - version = "0.1.2.0.20240105.165329"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/theme-buffet-0.1.2.0.20240105.165329.tar"; - sha256 = "1p1vmyl2cdm6vk45884jhrxjgd53mdch4wfkd1hx269v76zl58pa"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/theme-buffet.html"; - license = lib.licenses.free; - }; - }) {}; - timerfunctions = callPackage ({ cl-lib ? null - , elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "timerfunctions"; - ename = "timerfunctions"; - version = "1.4.2.0.20221221.82440"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/timerfunctions-1.4.2.0.20221221.82440.tar"; - sha256 = "08spli0dfi882wrjcxjgk3zl4g4b5rlrvpyjmkgkzq6ix5z7w80j"; - }; - packageRequires = [ cl-lib emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/timerfunctions.html"; - license = lib.licenses.free; - }; - }) {}; - tiny = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "tiny"; - ename = "tiny"; - version = "0.2.1.0.20220910.192941"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/tiny-0.2.1.0.20220910.192941.tar"; - sha256 = "04ybgq2ppzjpindwgypsp4sb0hmzq5k7sg9niyp18dxkj0nv1l7n"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/tiny.html"; - license = lib.licenses.free; - }; - }) {}; - tmr = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "tmr"; - ename = "tmr"; - version = "0.4.0.0.20240117.30342"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/tmr-0.4.0.0.20240117.30342.tar"; - sha256 = "0sxxc9q97b64rl4kcp0zimlvsvxmdr447vmf8a9f74pddg1djvbw"; - }; - packageRequires = [ compat emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/tmr.html"; - license = lib.licenses.free; - }; - }) {}; - tomelr = callPackage ({ elpaBuild, emacs, fetchurl, lib, map, seq }: - elpaBuild { - pname = "tomelr"; - ename = "tomelr"; - version = "0.4.3.0.20220511.213722"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/tomelr-0.4.3.0.20220511.213722.tar"; - sha256 = "0vjhbz8lfhk84kgm8vd9lfn9qx60g40j7n3kx7iadk0p4842fpaa"; - }; - packageRequires = [ emacs map seq ]; - meta = { - homepage = "https://elpa.gnu.org/packages/tomelr.html"; - license = lib.licenses.free; - }; - }) {}; - topspace = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "topspace"; - ename = "topspace"; - version = "0.3.1.0.20230106.94110"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/topspace-0.3.1.0.20230106.94110.tar"; - sha256 = "179k6d4v4lw66gpb2lmf1zcz6ww1fr3ys0x992wd1r7mvlc070s8"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/topspace.html"; - license = lib.licenses.free; - }; - }) {}; - track-changes = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "track-changes"; - ename = "track-changes"; - version = "1.2.0.20240505.172329"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/track-changes-1.2.0.20240505.172329.tar"; - sha256 = "1mvgwrrqfa3yix9lrsx4mb6zqaydjjqc69nh9lyrcgi54819jlvh"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/track-changes.html"; - license = lib.licenses.free; - }; - }) {}; - tramp = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "tramp"; - ename = "tramp"; - version = "2.6.3.0.20240331.120258"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/tramp-2.6.3.0.20240331.120258.tar"; - sha256 = "07358iw3skm59qjry7qggj2rggbdbghmw0yrbdpyabrqmdfv3li8"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/tramp.html"; - license = lib.licenses.free; - }; - }) {}; - tramp-nspawn = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "tramp-nspawn"; - ename = "tramp-nspawn"; - version = "1.0.1.0.20220923.120957"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/tramp-nspawn-1.0.1.0.20220923.120957.tar"; - sha256 = "0mpr7d5vgfwsafbmj8lqc1k563b7qnjz1zq73rl8rb2km5jxczhn"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/tramp-nspawn.html"; - license = lib.licenses.free; - }; - }) {}; - tramp-theme = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "tramp-theme"; - ename = "tramp-theme"; - version = "0.2.0.20221221.82451"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/tramp-theme-0.2.0.20221221.82451.tar"; - sha256 = "0x7wa17f2pnhd6nv7p2m5pafqqgpfp9n773qcmyxkawi4l5bp5d3"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/tramp-theme.html"; - license = lib.licenses.free; - }; - }) {}; - transcribe = callPackage ({ elpaBuild - , fetchurl - , lib }: - elpaBuild { - pname = "transcribe"; - ename = "transcribe"; - version = "1.5.2.0.20221221.82457"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/transcribe-1.5.2.0.20221221.82457.tar"; - sha256 = "12xw9vxzqfr3pis49apdzc5bg0n30wfx0xa9kycdbcpda88f3z6h"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/transcribe.html"; - license = lib.licenses.free; - }; - }) {}; - transient = callPackage ({ compat - , elpaBuild - , emacs - , fetchurl - , lib - , seq }: - elpaBuild { - pname = "transient"; - ename = "transient"; - version = "0.6.0.0.20240509.184906"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/transient-0.6.0.0.20240509.184906.tar"; - sha256 = "1axy5ccwd4n63saaf10af182r2k3j8x4vbyhxa81rdv73ndr652g"; - }; - packageRequires = [ compat emacs seq ]; - meta = { - homepage = "https://elpa.gnu.org/packages/transient.html"; - license = lib.licenses.free; - }; - }) {}; - transient-cycles = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "transient-cycles"; - ename = "transient-cycles"; - version = "1.0.0.20220410.130412"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/transient-cycles-1.0.0.20220410.130412.tar"; - sha256 = "1rmgmlbjig866gr5jr89mv8ikvpf0p0pcgpa236nmiw3j6jsywa8"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/transient-cycles.html"; - license = lib.licenses.free; - }; - }) {}; - tree-inspector = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib - , treeview }: - elpaBuild { - pname = "tree-inspector"; - ename = "tree-inspector"; - version = "0.4.0.20240322.113138"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/tree-inspector-0.4.0.20240322.113138.tar"; - sha256 = "15k30zdbr8cr88z00dn2jfnybrhkmp769pc361v9n4mdgapwmiap"; - }; - packageRequires = [ emacs treeview ]; - meta = { - homepage = "https://elpa.gnu.org/packages/tree-inspector.html"; - license = lib.licenses.free; - }; - }) {}; - trie = callPackage ({ elpaBuild, fetchurl, heap, lib, tNFA }: - elpaBuild { - pname = "trie"; - ename = "trie"; - version = "0.6.0.20231015.13107"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/trie-0.6.0.20231015.13107.tar"; - sha256 = "0kwz7b7y90yq676r09h4w0wbrm61030sw6mqhrcq9130s107lbkx"; - }; - packageRequires = [ heap tNFA ]; - meta = { - homepage = "https://elpa.gnu.org/packages/trie.html"; - license = lib.licenses.free; - }; - }) {}; - triples = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib - , seq }: - elpaBuild { - pname = "triples"; - ename = "triples"; - version = "0.3.5.0.20240201.233852"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/triples-0.3.5.0.20240201.233852.tar"; - sha256 = "1hw0pgd87cack1ya76bckwjbxxyr4fd8gkp5ngkvjl8l8yhvvrpi"; - }; - packageRequires = [ emacs seq ]; - meta = { - homepage = "https://elpa.gnu.org/packages/triples.html"; - license = lib.licenses.free; - }; - }) {}; - typo = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "typo"; - ename = "typo"; - version = "1.0.1.0.20230730.150555"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/typo-1.0.1.0.20230730.150555.tar"; - sha256 = "0cjn2lh0949kc6c9fxknzg2fyb4p3iwic2a9md5yxpdl42j24fvw"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/typo.html"; - license = lib.licenses.free; - }; - }) {}; - ulisp-repl = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "ulisp-repl"; - ename = "ulisp-repl"; - version = "1.0.3.0.20230604.111559"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/ulisp-repl-1.0.3.0.20230604.111559.tar"; - sha256 = "0b6yvlwikgkkfqklrhbcs0p6y349b6700x78n77xf0kkgv7mca1i"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/ulisp-repl.html"; - license = lib.licenses.free; - }; - }) {}; - undo-tree = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib - , queue }: - elpaBuild { - pname = "undo-tree"; - ename = "undo-tree"; - version = "0.8.2.0.20220312.180415"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/undo-tree-0.8.2.0.20220312.180415.tar"; - sha256 = "1gm5108p4qv7v4dqpxkd3zb2h5w8nsz0xjbxzxpkvykqp982g030"; - }; - packageRequires = [ emacs queue ]; - meta = { - homepage = "https://elpa.gnu.org/packages/undo-tree.html"; - license = lib.licenses.free; - }; - }) {}; - uni-confusables = callPackage ({ elpaBuild - , fetchurl - , lib }: - elpaBuild { - pname = "uni-confusables"; - ename = "uni-confusables"; - version = "0.3.0.20221212.230830"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/uni-confusables-0.3.0.20221212.230830.tar"; - sha256 = "15kc12zih2d6lazcqgiaq9jc5zgznnhaywh7ibflwc6siqvwxzvg"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/uni-confusables.html"; - license = lib.licenses.free; - }; - }) {}; - uniquify-files = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "uniquify-files"; - ename = "uniquify-files"; - version = "1.0.4.0.20221221.82507"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/uniquify-files-1.0.4.0.20221221.82507.tar"; - sha256 = "0zn7z3y7f7hw4144ssa398455091qrg238wp9fr53l2rxpdkdkwf"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/uniquify-files.html"; - license = lib.licenses.free; - }; - }) {}; - urgrep = callPackage ({ compat - , elpaBuild - , emacs - , fetchurl - , lib - , project }: - elpaBuild { - pname = "urgrep"; - ename = "urgrep"; - version = "0.5.1snapshot0.20240511.180511"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/urgrep-0.5.1snapshot0.20240511.180511.tar"; - sha256 = "03dpbsmx11r14mi6vlh4phknmxlayxng2rfphv8q7wn4cvgv18q2"; - }; - packageRequires = [ compat emacs project ]; - meta = { - homepage = "https://elpa.gnu.org/packages/urgrep.html"; - license = lib.licenses.free; - }; - }) {}; - url-http-ntlm = callPackage ({ cl-lib ? null - , elpaBuild - , fetchurl - , lib - , nadvice - , ntlm ? null }: - elpaBuild { - pname = "url-http-ntlm"; - ename = "url-http-ntlm"; - version = "2.0.5.0.20231024.31412"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/url-http-ntlm-2.0.5.0.20231024.31412.tar"; - sha256 = "1crjiq72fcpzw4nlrm8nh3q2llvxc7bgjqq6vr6ma055d0m6xrsd"; - }; - packageRequires = [ cl-lib nadvice ntlm ]; - meta = { - homepage = "https://elpa.gnu.org/packages/url-http-ntlm.html"; - license = lib.licenses.free; - }; - }) {}; - url-http-oauth = callPackage ({ elpaBuild - , fetchurl - , lib }: - elpaBuild { - pname = "url-http-oauth"; - ename = "url-http-oauth"; - version = "0.8.3.0.20230510.175959"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/url-http-oauth-0.8.3.0.20230510.175959.tar"; - sha256 = "00shj8zvjvdy7gh29sx08m3cn9lyivjlzmzll0i2zy9389i1l360"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/url-http-oauth.html"; - license = lib.licenses.free; - }; - }) {}; - url-scgi = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "url-scgi"; - ename = "url-scgi"; - version = "0.9.0.20231222.161107"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/url-scgi-0.9.0.20231222.161107.tar"; - sha256 = "1dgi0r0igwsk3mx6b7mvd6xz7dmb545g2394s0wh9kkjhlkyd5b3"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/url-scgi.html"; - license = lib.licenses.free; - }; - }) {}; - use-package = callPackage ({ bind-key - , elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "use-package"; - ename = "use-package"; - version = "2.4.5.0.20240518.103045"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/use-package-2.4.5.0.20240518.103045.tar"; - sha256 = "0zh4vb5h2733glbj3izflw0laxvf2y34cm924jpgyrjkz66ld6wc"; - }; - packageRequires = [ bind-key emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/use-package.html"; - license = lib.licenses.free; - }; - }) {}; - validate = callPackage ({ cl-lib ? null - , elpaBuild - , emacs - , fetchurl - , lib - , seq }: - elpaBuild { - pname = "validate"; - ename = "validate"; - version = "1.0.4.0.20180215.204244"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/validate-1.0.4.0.20180215.204244.tar"; - sha256 = "1hayzx6x2xqfzg84ik5n5x84ixmwc0kc8h7f0796d4rfiljl4y3c"; - }; - packageRequires = [ cl-lib emacs seq ]; - meta = { - homepage = "https://elpa.gnu.org/packages/validate.html"; - license = lib.licenses.free; - }; - }) {}; - valign = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "valign"; - ename = "valign"; - version = "3.1.1.0.20210501.211155"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/valign-3.1.1.0.20210501.211155.tar"; - sha256 = "1w5by0y4552c2qlm708b3523fp9sgizd0zxrwk2k1v6qwh04pa67"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/valign.html"; - license = lib.licenses.free; - }; - }) {}; - vc-backup = callPackage ({ compat - , elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "vc-backup"; - ename = "vc-backup"; - version = "1.1.0.0.20220825.144758"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/vc-backup-1.1.0.0.20220825.144758.tar"; - sha256 = "1jd3mv5467vy3ddrrhsv6nwsmyksqls5zhnb8hjb6imrhsylprbv"; - }; - packageRequires = [ compat emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/vc-backup.html"; - license = lib.licenses.free; - }; - }) {}; - vc-got = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "vc-got"; - ename = "vc-got"; - version = "1.2.0.20230129.104658"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/vc-got-1.2.0.20230129.104658.tar"; - sha256 = "0dwigmr1rm8a80ngx25jrqlgnbdj51db6avmyg3v7avhkyg5x455"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/vc-got.html"; - license = lib.licenses.free; - }; - }) {}; - vc-hgcmd = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "vc-hgcmd"; - ename = "vc-hgcmd"; - version = "1.14.1.0.20230605.161947"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/vc-hgcmd-1.14.1.0.20230605.161947.tar"; - sha256 = "1qrrbr7qgbsc00mrbslaa0k6n3dnighw5dq3mx1hlgz0flm623gi"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/vc-hgcmd.html"; - license = lib.licenses.free; - }; - }) {}; - vcard = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "vcard"; - ename = "vcard"; - version = "0.2.2.0.20230718.145809"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/vcard-0.2.2.0.20230718.145809.tar"; - sha256 = "14rc6glk0wyfjymiv2h5db0cxpl7j8i7h3xlm5bhvgiab00vhk6x"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/vcard.html"; - license = lib.licenses.free; - }; - }) {}; - vcl-mode = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "vcl-mode"; - ename = "vcl-mode"; - version = "1.1.0.20201127.191542"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/vcl-mode-1.1.0.20201127.191542.tar"; - sha256 = "1fjf37s5yfivjbagw7m83y7z5i3dfzqnhcaga7r092v9jvkabw51"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/vcl-mode.html"; - license = lib.licenses.free; - }; - }) {}; - vdiff = callPackage ({ elpaBuild, emacs, fetchurl, hydra, lib }: - elpaBuild { - pname = "vdiff"; - ename = "vdiff"; - version = "0.2.4.0.20230620.220116"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/vdiff-0.2.4.0.20230620.220116.tar"; - sha256 = "1974s441i7hvz6jly2xzndrfpp94nidhkb6gjgfk9f5lml1z17n1"; - }; - packageRequires = [ emacs hydra ]; - meta = { - homepage = "https://elpa.gnu.org/packages/vdiff.html"; - license = lib.licenses.free; - }; - }) {}; - verilog-mode = callPackage ({ elpaBuild - , fetchurl - , lib }: - elpaBuild { - pname = "verilog-mode"; - ename = "verilog-mode"; - version = "2024.3.1.121933719.0.20240314.104026"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/verilog-mode-2024.3.1.121933719.0.20240314.104026.tar"; - sha256 = "1fk5jl9897jbzg4dqf1mhdk7dmjmcqxpb1v2sv9ni06bh25rn6z8"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/verilog-mode.html"; - license = lib.licenses.free; - }; - }) {}; - vertico = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "vertico"; - ename = "vertico"; - version = "1.8.0.20240511.204721"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/vertico-1.8.0.20240511.204721.tar"; - sha256 = "0gd68x98dghqa7da0ybah2w27bxipal262n9d6rpdhxb361cmpca"; - }; - packageRequires = [ compat emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/vertico.html"; - license = lib.licenses.free; - }; - }) {}; - vertico-posframe = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib - , posframe - , vertico }: - elpaBuild { - pname = "vertico-posframe"; - ename = "vertico-posframe"; - version = "0.7.7.0.20240202.84736"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/vertico-posframe-0.7.7.0.20240202.84736.tar"; - sha256 = "02kwhyhvcjpnq5wskhydjf0v2qbk4dfp8x4nvsxfh31jfvxqvn8k"; - }; - packageRequires = [ emacs posframe vertico ]; - meta = { - homepage = "https://elpa.gnu.org/packages/vertico-posframe.html"; - license = lib.licenses.free; - }; - }) {}; - vigenere = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "vigenere"; - ename = "vigenere"; - version = "1.0.0.20221221.82600"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/vigenere-1.0.0.20221221.82600.tar"; - sha256 = "03zkmvx6cs5s0plbafb40pxs0rqx1vz12ql03zlx21h0zwgynqwf"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/vigenere.html"; - license = lib.licenses.free; - }; - }) {}; - visual-filename-abbrev = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "visual-filename-abbrev"; - ename = "visual-filename-abbrev"; - version = "1.2.0.20221221.82606"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/visual-filename-abbrev-1.2.0.20221221.82606.tar"; - sha256 = "1lb02jpljj2l1qkmn2pmbvw910nrpg9bsz6yfqfccyppvnmrv788"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/visual-filename-abbrev.html"; - license = lib.licenses.free; - }; - }) {}; - visual-fill = callPackage ({ elpaBuild - , fetchurl - , lib }: - elpaBuild { - pname = "visual-fill"; - ename = "visual-fill"; - version = "0.2.0.20240424.95324"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/visual-fill-0.2.0.20240424.95324.tar"; - sha256 = "1vgfa29gl4rh6gx08r1imlabznrlmx21p41ns62w9lxi6y8hzf8y"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/visual-fill.html"; - license = lib.licenses.free; - }; - }) {}; - vlf = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "vlf"; - ename = "vlf"; - version = "1.7.2.0.20231016.224412"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/vlf-1.7.2.0.20231016.224412.tar"; - sha256 = "1smcw9x38cl7pnxdzy8ycx6g80yb5k0qd7x1520wzbp1g31dsar1"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/vlf.html"; - license = lib.licenses.free; - }; - }) {}; - vundo = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "vundo"; - ename = "vundo"; - version = "2.3.0.0.20240425.211317"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/vundo-2.3.0.0.20240425.211317.tar"; - sha256 = "0dif9f3s3igpfi0r4dgzy14g8m6xf1g6lqyc0gfzf40n301iw4kz"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/vundo.html"; - license = lib.licenses.free; - }; - }) {}; - wcheck-mode = callPackage ({ elpaBuild - , fetchurl - , lib }: - elpaBuild { - pname = "wcheck-mode"; - ename = "wcheck-mode"; - version = "2021.0.20220101.81620"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/wcheck-mode-2021.0.20220101.81620.tar"; - sha256 = "15785pi3fgfdi3adsa4lhsbdqw6bnfcm44apxpfixqfx56d3xh8m"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/wcheck-mode.html"; - license = lib.licenses.free; - }; - }) {}; - wconf = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "wconf"; - ename = "wconf"; - version = "0.2.1.0.20201202.220257"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/wconf-0.2.1.0.20201202.220257.tar"; - sha256 = "0nnf2jak4hjzj2m2v44ymnyvsgiyzz49nnz48j3cpiw7vpb79ibh"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/wconf.html"; - license = lib.licenses.free; - }; - }) {}; - web-server = callPackage ({ cl-lib ? null - , elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "web-server"; - ename = "web-server"; - version = "0.1.2.0.20210811.22503"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/web-server-0.1.2.0.20210811.22503.tar"; - sha256 = "1d2ij23gswvg41xgdg51m2prqn1f9lcwb2rb9rh3s9p6skj14y9b"; - }; - packageRequires = [ cl-lib emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/web-server.html"; - license = lib.licenses.free; - }; - }) {}; - webfeeder = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "webfeeder"; - ename = "webfeeder"; - version = "1.1.2.0.20210605.74155"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/webfeeder-1.1.2.0.20210605.74155.tar"; - sha256 = "1xcaycimshijmyq071i5qch3idjfl3g4sws9ig97a9hx3m5wfi53"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/webfeeder.html"; - license = lib.licenses.free; - }; - }) {}; - websocket = callPackage ({ cl-lib ? null - , elpaBuild - , fetchurl - , lib }: - elpaBuild { - pname = "websocket"; - ename = "websocket"; - version = "1.15.0.20230808.230535"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/websocket-1.15.0.20230808.230535.tar"; - sha256 = "15xry8bv9vcc470j3an5ks9z2hg7ia4nl7x4xvqb77rpbkq53rb9"; - }; - packageRequires = [ cl-lib ]; - meta = { - homepage = "https://elpa.gnu.org/packages/websocket.html"; - license = lib.licenses.free; - }; - }) {}; - which-key = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "which-key"; - ename = "which-key"; - version = "3.6.0.0.20240501.85118"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/which-key-3.6.0.0.20240501.85118.tar"; - sha256 = "080i7b37fzvf020q4dqxy0dr8na0qqaymv8bd048yrw70wcrlz0w"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/which-key.html"; - license = lib.licenses.free; - }; - }) {}; - window-commander = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "window-commander"; - ename = "window-commander"; - version = "3.0.2.0.20240314.125442"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/window-commander-3.0.2.0.20240314.125442.tar"; - sha256 = "082fwi8basfddwvi5yjgvdbf0f7xh58kmbvshnpim143pyxzgi9q"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/window-commander.html"; - license = lib.licenses.free; - }; - }) {}; - window-tool-bar = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "window-tool-bar"; - ename = "window-tool-bar"; - version = "0.2.0.20240519.64147"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/window-tool-bar-0.2.0.20240519.64147.tar"; - sha256 = "1z5fdlrrjdx0lhfwzahnlqxg75fy9abrj3izc8mfwy5j1bkrym6m"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/window-tool-bar.html"; - license = lib.licenses.free; - }; - }) {}; - windower = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "windower"; - ename = "windower"; - version = "0.0.1.0.20200212.91532"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/windower-0.0.1.0.20200212.91532.tar"; - sha256 = "1s9kq9256x8chayqfcczxfcdb67pk6752xg7v6ixb9f3ad590ls2"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/windower.html"; - license = lib.licenses.free; - }; - }) {}; - windresize = callPackage ({ elpaBuild - , fetchurl - , lib }: - elpaBuild { - pname = "windresize"; - ename = "windresize"; - version = "0.1.0.20221221.82616"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/windresize-0.1.0.20221221.82616.tar"; - sha256 = "0hgfyhz3jx4yhxspvh8zb4s852j8iwijrg7d4madr1p9rm2g3pjq"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/windresize.html"; - license = lib.licenses.free; - }; - }) {}; - wisi = callPackage ({ elpaBuild, emacs, fetchurl, lib, seq }: - elpaBuild { - pname = "wisi"; - ename = "wisi"; - version = "4.3.2.0.20240313.173240"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/wisi-4.3.2.0.20240313.173240.tar"; - sha256 = "01i5r77ndxy76gby6v4j25w4pf6kmqaxagya29b9gnrnw07m8n5b"; - }; - packageRequires = [ emacs seq ]; - meta = { - homepage = "https://elpa.gnu.org/packages/wisi.html"; - license = lib.licenses.free; - }; - }) {}; - wisitoken-grammar-mode = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib - , mmm-mode - , wisi }: - elpaBuild { - pname = "wisitoken-grammar-mode"; - ename = "wisitoken-grammar-mode"; - version = "1.3.0.0.20231023.83923"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/wisitoken-grammar-mode-1.3.0.0.20231023.83923.tar"; - sha256 = "0ai5s1sgy0wk8hc84w7da65p30ldk514n2h6hqa71f9ia5jbd0j8"; - }; - packageRequires = [ emacs mmm-mode wisi ]; - meta = { - homepage = "https://elpa.gnu.org/packages/wisitoken-grammar-mode.html"; - license = lib.licenses.free; - }; - }) {}; - wpuzzle = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "wpuzzle"; - ename = "wpuzzle"; - version = "1.1.0.20221221.82918"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/wpuzzle-1.1.0.20221221.82918.tar"; - sha256 = "0ky8n0xjxsw4a684g3l8imbrfsvbc9nq1i8gi1y384qjvvjqxaxv"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/wpuzzle.html"; - license = lib.licenses.free; - }; - }) {}; - wrap-search = callPackage ({ elpaBuild - , fetchurl - , lib }: - elpaBuild { - pname = "wrap-search"; - ename = "wrap-search"; - version = "4.16.13.0.20240517.214404"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/wrap-search-4.16.13.0.20240517.214404.tar"; - sha256 = "14rk7gyab0m19z0rhrpqcfdqrdrbz9v5zw36rkn5qxzrpv6cw7hq"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/wrap-search.html"; - license = lib.licenses.free; - }; - }) {}; - xclip = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "xclip"; - ename = "xclip"; - version = "1.11.0.20221221.82941"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/xclip-1.11.0.20221221.82941.tar"; - sha256 = "18l69h1vg98fd35hsbbzdlhgmilyj192g9vr34kkwzj0r6bak4l2"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/xclip.html"; - license = lib.licenses.free; - }; - }) {}; - xeft = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "xeft"; - ename = "xeft"; - version = "3.3.0.20230913.220528"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/xeft-3.3.0.20230913.220528.tar"; - sha256 = "1zpm678nmnfs7vwirjil35nfwjkhr83f6pmn43lcdzrcz6y7nxn1"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/xeft.html"; - license = lib.licenses.free; - }; - }) {}; - xelb = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "xelb"; - ename = "xelb"; - version = "0.18.0.20240415.160551"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/xelb-0.18.0.20240415.160551.tar"; - sha256 = "13bvf0k39bdwh8xr2m096idx371xqdxh2x0g9kh6y65hc80l1k1x"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/xelb.html"; - license = lib.licenses.free; - }; - }) {}; - xpm = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib, queue }: - elpaBuild { - pname = "xpm"; - ename = "xpm"; - version = "1.0.5.0.20230911.4618"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/xpm-1.0.5.0.20230911.4618.tar"; - sha256 = "0ymby7wqz6bmn4kcl0if0ybhafba139pgmzifvk00bh7r0s5gsz9"; - }; - packageRequires = [ cl-lib queue ]; - meta = { - homepage = "https://elpa.gnu.org/packages/xpm.html"; - license = lib.licenses.free; - }; - }) {}; - xr = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "xr"; - ename = "xr"; - version = "1.25.0.20240401.74532"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/xr-1.25.0.20240401.74532.tar"; - sha256 = "0q9s706dz52mfnjhc9b5km7756zsx9ws4nlc607i1v71hhz2k3lg"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/xr.html"; - license = lib.licenses.free; - }; - }) {}; - xref = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "xref"; - ename = "xref"; - version = "1.6.3.0.20240518.3950"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/xref-1.6.3.0.20240518.3950.tar"; - sha256 = "0k60vvhpw5bzbs3qv28sip7dl2p44m8bczx54ff32klgfwpk06zk"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/xref.html"; - license = lib.licenses.free; - }; - }) {}; - xref-union = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "xref-union"; - ename = "xref-union"; - version = "0.2.0.0.20231225.162837"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/xref-union-0.2.0.0.20231225.162837.tar"; - sha256 = "0is4r12r30drq1msa5143bgnwam1kgbf2iia30fbqv0l0rhvqd9x"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/xref-union.html"; - license = lib.licenses.free; - }; - }) {}; - yasnippet = callPackage ({ cl-lib ? null - , elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "yasnippet"; - ename = "yasnippet"; - version = "0.14.1.0.20240406.91451"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/yasnippet-0.14.1.0.20240406.91451.tar"; - sha256 = "02nkjbn2kgq2x1kbbmqygwqzrdy48nhizsy734n3gm8fnp4p5kxp"; - }; - packageRequires = [ cl-lib emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/yasnippet.html"; - license = lib.licenses.free; - }; - }) {}; - yasnippet-classic-snippets = callPackage ({ elpaBuild - , fetchurl - , lib - , yasnippet }: - elpaBuild { - pname = "yasnippet-classic-snippets"; - ename = "yasnippet-classic-snippets"; - version = "1.0.2.0.20221221.83103"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/yasnippet-classic-snippets-1.0.2.0.20221221.83103.tar"; - sha256 = "01066fmg42031naaqpy1ls8xw8k2hq02sib43smx20wdbqak6gx7"; - }; - packageRequires = [ yasnippet ]; - meta = { - homepage = "https://elpa.gnu.org/packages/yasnippet-classic-snippets.html"; - license = lib.licenses.free; - }; - }) {}; - zones = callPackage ({ elpaBuild - , fetchurl - , lib }: - elpaBuild { - pname = "zones"; - ename = "zones"; - version = "2023.6.11.0.20231018.110342"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/zones-2023.6.11.0.20231018.110342.tar"; - sha256 = "0gyla7n7znzhxfdwb9jmxkijvidpxvqs9p68dbaiyk86daq2pxzm"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/zones.html"; - license = lib.licenses.free; - }; - }) {}; - ztree = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "ztree"; - ename = "ztree"; - version = "1.0.6.0.20230617.194317"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/ztree-1.0.6.0.20230617.194317.tar"; - sha256 = "1zh6qdzalvikb48dc0pk3rnk7jvknx07dkrggc259q61jdp3pj1m"; - }; - packageRequires = [ cl-lib ]; - meta = { - homepage = "https://elpa.gnu.org/packages/ztree.html"; - license = lib.licenses.free; - }; - }) {}; - zuul = callPackage ({ elpaBuild, emacs, fetchurl, lib, project }: - elpaBuild { - pname = "zuul"; - ename = "zuul"; - version = "0.4.0.0.20230524.131806"; - src = fetchurl { - url = "https://elpa.gnu.org/devel/zuul-0.4.0.0.20230524.131806.tar"; - sha256 = "1pvfi8dp5i6h7z35h91408pz8bsval35sd7dk02v0hr6znln0pvb"; - }; - packageRequires = [ emacs project ]; - meta = { - homepage = "https://elpa.gnu.org/packages/zuul.html"; - license = lib.licenses.free; - }; - }) {}; - } +{ + ace-window = callPackage ( + { + avy, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "ace-window"; + ename = "ace-window"; + version = "0.10.0.0.20220911.35841"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/ace-window-0.10.0.0.20220911.35841.tar"; + sha256 = "0xfc1pw7m4vg0xvj40djm7rxqr0405pby3rgl5vyd8ci5kpmmvhs"; + }; + packageRequires = [ avy ]; + meta = { + homepage = "https://elpa.gnu.org/devel/ace-window.html"; + license = lib.licenses.free; + }; + } + ) { }; + ack = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "ack"; + ename = "ack"; + version = "1.11.0.20220924.84123"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/ack-1.11.0.20220924.84123.tar"; + sha256 = "0vic2izviakj6qh2l15jd8qm8yr0h0qhy4r8sx7zdngpi9i14r5v"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/ack.html"; + license = lib.licenses.free; + }; + } + ) { }; + activities = callPackage ( + { + elpaBuild, + fetchurl, + lib, + persist, + }: + elpaBuild { + pname = "activities"; + ename = "activities"; + version = "0.8pre0.20240727.5721"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/activities-0.8pre0.20240727.5721.tar"; + sha256 = "0f4p39vgi7fv3bh97267ys6rfy0ak0b4c15p57xfbybc47f8iwi1"; + }; + packageRequires = [ persist ]; + meta = { + homepage = "https://elpa.gnu.org/devel/activities.html"; + license = lib.licenses.free; + }; + } + ) { }; + ada-mode = callPackage ( + { + elpaBuild, + fetchurl, + gnat-compiler, + lib, + uniquify-files, + wisi, + }: + elpaBuild { + pname = "ada-mode"; + ename = "ada-mode"; + version = "8.1.0.0.20231018.91522"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/ada-mode-8.1.0.0.20231018.91522.tar"; + sha256 = "07kd6dj1dbds68qmi4dh4w3fc8l18jyxrfbz4lxb5v9c59hk8c46"; + }; + packageRequires = [ + gnat-compiler + uniquify-files + wisi + ]; + meta = { + homepage = "https://elpa.gnu.org/devel/ada-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + ada-ref-man = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "ada-ref-man"; + ename = "ada-ref-man"; + version = "2020.1.0.20201129.190419"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/ada-ref-man-2020.1.0.20201129.190419.tar"; + sha256 = "0a201fn9xs3vg52vri8aw2p56rsw428hk745m6hja6q5gn6rl0zw"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/ada-ref-man.html"; + license = lib.licenses.free; + }; + } + ) { }; + adaptive-wrap = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "adaptive-wrap"; + ename = "adaptive-wrap"; + version = "0.8.0.20240113.95028"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/adaptive-wrap-0.8.0.20240113.95028.tar"; + sha256 = "0dj20mmipnik62480cm11rnvsvbc3js2ql5r321kj20g87rz9l2a"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/adaptive-wrap.html"; + license = lib.licenses.free; + }; + } + ) { }; + adjust-parens = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "adjust-parens"; + ename = "adjust-parens"; + version = "3.2.0.20240113.95404"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/adjust-parens-3.2.0.20240113.95404.tar"; + sha256 = "0l7s63dfpar2ddiydl43m6ipzc7qghv9k5hfcnj56aj6hs7ibcd2"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/adjust-parens.html"; + license = lib.licenses.free; + }; + } + ) { }; + advice-patch = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "advice-patch"; + ename = "advice-patch"; + version = "0.1.0.20201220.233221"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/advice-patch-0.1.0.20201220.233221.tar"; + sha256 = "1bca9s6cxpsyvyl0fxqa59x68rpdj44kxcaxmaa0lsy10vgib542"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/advice-patch.html"; + license = lib.licenses.free; + }; + } + ) { }; + aggressive-completion = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "aggressive-completion"; + ename = "aggressive-completion"; + version = "1.7.0.20220417.71805"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/aggressive-completion-1.7.0.20220417.71805.tar"; + sha256 = "1nmh9as4m0xjvda1f0hda8s1wk1z973wlfxcfci768y45ffnjn0g"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/aggressive-completion.html"; + license = lib.licenses.free; + }; + } + ) { }; + aggressive-indent = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "aggressive-indent"; + ename = "aggressive-indent"; + version = "1.10.0.0.20230112.100030"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/aggressive-indent-1.10.0.0.20230112.100030.tar"; + sha256 = "0vp49nz5n82pcds2hxqz0fy5zcmvcrpfd1zgsm1cwyph7vvx7djj"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/aggressive-indent.html"; + license = lib.licenses.free; + }; + } + ) { }; + agitate = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "agitate"; + ename = "agitate"; + version = "0.0.20240117.23316"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/agitate-0.0.20240117.23316.tar"; + sha256 = "0md795hvmz15bb3vsji4p12g9lm8j34mj9wqq338dhn6zw91n5hi"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/agitate.html"; + license = lib.licenses.free; + }; + } + ) { }; + ahungry-theme = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "ahungry-theme"; + ename = "ahungry-theme"; + version = "1.10.0.0.20211231.115425"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/ahungry-theme-1.10.0.0.20211231.115425.tar"; + sha256 = "0iddqqkv9i3d9yajhysl54av91i0gdngxqyn7vvapf1nz3pxzrvz"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/ahungry-theme.html"; + license = lib.licenses.free; + }; + } + ) { }; + aircon-theme = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "aircon-theme"; + ename = "aircon-theme"; + version = "0.0.6.0.20240613.140459"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/aircon-theme-0.0.6.0.20240613.140459.tar"; + sha256 = "1npppgbs1dfixqpmdc0nfxx4vvnsvpy101q8lcf7h9i8br63mlqy"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/aircon-theme.html"; + license = lib.licenses.free; + }; + } + ) { }; + all = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "all"; + ename = "all"; + version = "1.1.0.20240405.133638"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/all-1.1.0.20240405.133638.tar"; + sha256 = "0cybsyr7ksgslwdfnrz8cpymk34f9gz75ahz368rhg926qlxy95j"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/all.html"; + license = lib.licenses.free; + }; + } + ) { }; + altcaps = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "altcaps"; + ename = "altcaps"; + version = "1.2.0.0.20240117.23410"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/altcaps-1.2.0.0.20240117.23410.tar"; + sha256 = "0ylsxw86h2d8b407rmai174yw4hq4jjcpviz7hq2aj0amvk7p5ml"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/altcaps.html"; + license = lib.licenses.free; + }; + } + ) { }; + ampc = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "ampc"; + ename = "ampc"; + version = "0.2.0.20240220.181558"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/ampc-0.2.0.20240220.181558.tar"; + sha256 = "139gqhijy92qnprk25av550zd7165ilsnnmdx4v0v0fnwgxnya7h"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/ampc.html"; + license = lib.licenses.free; + }; + } + ) { }; + arbitools = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "arbitools"; + ename = "arbitools"; + version = "0.977.0.20221212.221354"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/arbitools-0.977.0.20221212.221354.tar"; + sha256 = "0s9w9hfki33bnfgm7yyhhcl0kbpn1ahd5li7nfy409zcb5spz17h"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.gnu.org/devel/arbitools.html"; + license = lib.licenses.free; + }; + } + ) { }; + ascii-art-to-unicode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "ascii-art-to-unicode"; + ename = "ascii-art-to-unicode"; + version = "1.13.0.20230911.4520"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/ascii-art-to-unicode-1.13.0.20230911.4520.tar"; + sha256 = "10x2svbc9qkrcckwjfsd1rlcqbvapvrb80x8m0p2awffwisr165j"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/ascii-art-to-unicode.html"; + license = lib.licenses.free; + }; + } + ) { }; + assess = callPackage ( + { + elpaBuild, + fetchurl, + lib, + m-buffer, + }: + elpaBuild { + pname = "assess"; + ename = "assess"; + version = "0.7.0.20240303.95456"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/assess-0.7.0.20240303.95456.tar"; + sha256 = "0yqiqlgnhqvqc4w9s05csk2h2iwyv1m32wb121v6famfqaicgl12"; + }; + packageRequires = [ m-buffer ]; + meta = { + homepage = "https://elpa.gnu.org/devel/assess.html"; + license = lib.licenses.free; + }; + } + ) { }; + async = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "async"; + ename = "async"; + version = "1.9.8.0.20240811.143437"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/async-1.9.8.0.20240811.143437.tar"; + sha256 = "0fybzmnw8gyz2c1zw1qbgk5j5sllgxnjjzj3jw5lqqa211ppy700"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/async.html"; + license = lib.licenses.free; + }; + } + ) { }; + auctex = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "auctex"; + ename = "auctex"; + version = "14.0.6.0.20240819.102544"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/auctex-14.0.6.0.20240819.102544.tar"; + sha256 = "1ca4h7d3shaykzay0cv48sfwkykjwc717557f1syy42xgnq1ghhd"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/auctex.html"; + license = lib.licenses.free; + }; + } + ) { }; + auctex-cont-latexmk = callPackage ( + { + auctex, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "auctex-cont-latexmk"; + ename = "auctex-cont-latexmk"; + version = "0.2.0.20240625.221402"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/auctex-cont-latexmk-0.2.0.20240625.221402.tar"; + sha256 = "1yxc34q68cnri7k9m2gdnhhwyqz0gs1ip2r956fbxv65s0s7nbab"; + }; + packageRequires = [ auctex ]; + meta = { + homepage = "https://elpa.gnu.org/devel/auctex-cont-latexmk.html"; + license = lib.licenses.free; + }; + } + ) { }; + auctex-label-numbers = callPackage ( + { + auctex, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "auctex-label-numbers"; + ename = "auctex-label-numbers"; + version = "0.2.0.20240617.174703"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/auctex-label-numbers-0.2.0.20240617.174703.tar"; + sha256 = "14zj8wgk1vs96z5sba4m3m0zhl02zr3mbapgpypf9ff4c28v8g1b"; + }; + packageRequires = [ auctex ]; + meta = { + homepage = "https://elpa.gnu.org/devel/auctex-label-numbers.html"; + license = lib.licenses.free; + }; + } + ) { }; + aumix-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "aumix-mode"; + ename = "aumix-mode"; + version = "7.0.20221221.74552"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/aumix-mode-7.0.20221221.74552.tar"; + sha256 = "0c3yhk8ir4adv3wy80iywbvl1sm86xssg0j0q4rym50pr4vqx60n"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/aumix-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + auto-correct = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "auto-correct"; + ename = "auto-correct"; + version = "1.1.4.0.20221221.74656"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/auto-correct-1.1.4.0.20221221.74656.tar"; + sha256 = "10h6b5px4krcwjwhc475al9kcizijsz773zkcijrfi83283l35nc"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/auto-correct.html"; + license = lib.licenses.free; + }; + } + ) { }; + auto-header = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "auto-header"; + ename = "auto-header"; + version = "0.1.2.0.20230407.82136"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/auto-header-0.1.2.0.20230407.82136.tar"; + sha256 = "1dm5nqcvbya9fyj45q6k8ni507prs3ij2q5rhdl9m8vwkq6gf72w"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/auto-header.html"; + license = lib.licenses.free; + }; + } + ) { }; + auto-overlays = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "auto-overlays"; + ename = "auto-overlays"; + version = "0.10.10.0.20201215.220815"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/auto-overlays-0.10.10.0.20201215.220815.tar"; + sha256 = "1gmsli1bil210867x642x4zvhqradl3d4pk4n5ky5g6xp1h36c7w"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.gnu.org/devel/auto-overlays.html"; + license = lib.licenses.free; + }; + } + ) { }; + autocrypt = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "autocrypt"; + ename = "autocrypt"; + version = "0.4.2.0.20240410.70023"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/autocrypt-0.4.2.0.20240410.70023.tar"; + sha256 = "13g6422lcv8bjwcfrkxmw7fi5by1liz2ni6zxf10pr3qcpv6046n"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/autocrypt.html"; + license = lib.licenses.free; + }; + } + ) { }; + avy = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "avy"; + ename = "avy"; + version = "0.5.0.0.20230424.65712"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/avy-0.5.0.0.20230424.65712.tar"; + sha256 = "1z7d59fif97j12jx9vmk2p91sr01d53gp57gjvqdcdr2lqvdsaz8"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.gnu.org/devel/avy.html"; + license = lib.licenses.free; + }; + } + ) { }; + bbdb = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "bbdb"; + ename = "bbdb"; + version = "3.2.2.4.0.20231023.5901"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/bbdb-3.2.2.4.0.20231023.5901.tar"; + sha256 = "16m5irp1y9crv13l2qncafys4fscwq2d28ig8hnx4g5bag9bi7j4"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.gnu.org/devel/bbdb.html"; + license = lib.licenses.free; + }; + } + ) { }; + beacon = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "beacon"; + ename = "beacon"; + version = "1.3.4.0.20220729.220057"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/beacon-1.3.4.0.20220729.220057.tar"; + sha256 = "1dpd3j2aip3zi3ivbszsgrifw43bryx01df868hmrxm1s0vvjhh6"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/beacon.html"; + license = lib.licenses.free; + }; + } + ) { }; + beframe = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "beframe"; + ename = "beframe"; + version = "1.1.1.0.20240815.175555"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/beframe-1.1.1.0.20240815.175555.tar"; + sha256 = "1rzc4r9dfp0wnjlc1j662avpip1m8s00amv9sdshpbkz142c7paq"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/beframe.html"; + license = lib.licenses.free; + }; + } + ) { }; + bicep-ts-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "bicep-ts-mode"; + ename = "bicep-ts-mode"; + version = "0.1.3.0.20240530.63226"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/bicep-ts-mode-0.1.3.0.20240530.63226.tar"; + sha256 = "0xmljjfx7a5b3jfqf7cbpb9102ci5vnkqqww1b328rr42v5sdmqm"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/bicep-ts-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + bind-key = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "bind-key"; + ename = "bind-key"; + version = "2.4.1.0.20240321.194020"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/bind-key-2.4.1.0.20240321.194020.tar"; + sha256 = "02v2pc830b9vp0rmdxwcxjj36y5x2p8sy381h3c8hsi61pwyqy93"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/bind-key.html"; + license = lib.licenses.free; + }; + } + ) { }; + blist = callPackage ( + { + elpaBuild, + fetchurl, + ilist, + lib, + }: + elpaBuild { + pname = "blist"; + ename = "blist"; + version = "0.4.0.20240807.40202"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/blist-0.4.0.20240807.40202.tar"; + sha256 = "1y1sfyvxca5g2rsh579lly1drr9qs1czb1z692fysir7l48p3y3w"; + }; + packageRequires = [ ilist ]; + meta = { + homepage = "https://elpa.gnu.org/devel/blist.html"; + license = lib.licenses.free; + }; + } + ) { }; + bluetooth = callPackage ( + { + dash, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "bluetooth"; + ename = "bluetooth"; + version = "0.3.1.0.20230119.122638"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/bluetooth-0.3.1.0.20230119.122638.tar"; + sha256 = "1s5vfprs06xf400p01qiwxbcy0y05pbgmp731c8z3zyk5ai4s88g"; + }; + packageRequires = [ dash ]; + meta = { + homepage = "https://elpa.gnu.org/devel/bluetooth.html"; + license = lib.licenses.free; + }; + } + ) { }; + bnf-mode = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "bnf-mode"; + ename = "bnf-mode"; + version = "0.4.5.0.20221205.150230"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/bnf-mode-0.4.5.0.20221205.150230.tar"; + sha256 = "0ljzk39ck12hyshm32vbwjx1a87dw7v9v3wmf01cyc7k2i5d8rip"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.gnu.org/devel/bnf-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + boxy = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "boxy"; + ename = "boxy"; + version = "1.1.4.0.20240505.204058"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/boxy-1.1.4.0.20240505.204058.tar"; + sha256 = "18sgxarymy65vjzb94jjd0npxfd7920xlw49py5lc2y8d508p3rf"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/boxy.html"; + license = lib.licenses.free; + }; + } + ) { }; + boxy-headings = callPackage ( + { + boxy, + elpaBuild, + fetchurl, + lib, + org, + }: + elpaBuild { + pname = "boxy-headings"; + ename = "boxy-headings"; + version = "2.1.6.0.20240505.204122"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/boxy-headings-2.1.6.0.20240505.204122.tar"; + sha256 = "1m3k25j5z7q1gz2bbmyjkh79rq2b4350zz6csb2l0l8s4g1yddph"; + }; + packageRequires = [ + boxy + org + ]; + meta = { + homepage = "https://elpa.gnu.org/devel/boxy-headings.html"; + license = lib.licenses.free; + }; + } + ) { }; + breadcrumb = callPackage ( + { + elpaBuild, + fetchurl, + lib, + project, + }: + elpaBuild { + pname = "breadcrumb"; + ename = "breadcrumb"; + version = "1.0.1.0.20231126.221621"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/breadcrumb-1.0.1.0.20231126.221621.tar"; + sha256 = "11qx345ggpm78dcvlrnji50b50wh3cv3i0ihxwxsw55n86kv9x0k"; + }; + packageRequires = [ project ]; + meta = { + homepage = "https://elpa.gnu.org/devel/breadcrumb.html"; + license = lib.licenses.free; + }; + } + ) { }; + brief = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + nadvice, + }: + elpaBuild { + pname = "brief"; + ename = "brief"; + version = "5.91.0.20240401.34715"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/brief-5.91.0.20240401.34715.tar"; + sha256 = "1knpamvbpz92b9zql6p0l7g1p5595l6kns0gw1vfhm7cl37dngyr"; + }; + packageRequires = [ + cl-lib + nadvice + ]; + meta = { + homepage = "https://elpa.gnu.org/devel/brief.html"; + license = lib.licenses.free; + }; + } + ) { }; + buffer-env = callPackage ( + { + compat, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "buffer-env"; + ename = "buffer-env"; + version = "0.6.0.20240323.72724"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/buffer-env-0.6.0.20240323.72724.tar"; + sha256 = "061cbq2pb5wg3jap3l9lbm1axb700aqar9s8vx2zys0hl65klw51"; + }; + packageRequires = [ compat ]; + meta = { + homepage = "https://elpa.gnu.org/devel/buffer-env.html"; + license = lib.licenses.free; + }; + } + ) { }; + buffer-expose = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "buffer-expose"; + ename = "buffer-expose"; + version = "0.4.3.0.20190429.135558"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/buffer-expose-0.4.3.0.20190429.135558.tar"; + sha256 = "0f3a064i4a1ylb1ibqmz302h24kymir3zj1d225b7v6r89nam216"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.gnu.org/devel/buffer-expose.html"; + license = lib.licenses.free; + }; + } + ) { }; + bufferlo = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "bufferlo"; + ename = "bufferlo"; + version = "0.8.0.20240621.221659"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/bufferlo-0.8.0.20240621.221659.tar"; + sha256 = "14nmd2c3d6vdbr5jj8mdyg0r1i4gvhjxq6y37xy3mj4lf96v1yjp"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/bufferlo.html"; + license = lib.licenses.free; + }; + } + ) { }; + bug-hunter = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + seq, + }: + elpaBuild { + pname = "bug-hunter"; + ename = "bug-hunter"; + version = "1.3.1.0.20201128.92354"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/bug-hunter-1.3.1.0.20201128.92354.tar"; + sha256 = "1bskf9csg49n4cisl57wv0sa74s6v3wffdxw80m3r2yr0kx01cfs"; + }; + packageRequires = [ + cl-lib + seq + ]; + meta = { + homepage = "https://elpa.gnu.org/devel/bug-hunter.html"; + license = lib.licenses.free; + }; + } + ) { }; + buildbot = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "buildbot"; + ename = "buildbot"; + version = "0.0.1.0.20230726.134747"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/buildbot-0.0.1.0.20230726.134747.tar"; + sha256 = "1z27pfx3h1fad9wiazrkqgfdc1h06g2rlb3cq1zk83hilg64nnjd"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/buildbot.html"; + license = lib.licenses.free; + }; + } + ) { }; + calibre = callPackage ( + { + compat, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "calibre"; + ename = "calibre"; + version = "1.4.1.0.20240208.85735"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/calibre-1.4.1.0.20240208.85735.tar"; + sha256 = "1rbmck8bc28c2rf321606w748nqc5klly6yrm3r8zyviggwd1v2c"; + }; + packageRequires = [ compat ]; + meta = { + homepage = "https://elpa.gnu.org/devel/calibre.html"; + license = lib.licenses.free; + }; + } + ) { }; + cape = callPackage ( + { + compat, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "cape"; + ename = "cape"; + version = "1.6.0.20240818.141447"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/cape-1.6.0.20240818.141447.tar"; + sha256 = "0gs6xqmv3qv6b1d373n42g6qhb5v4g5x0g6ra2z58bjggz1qz30h"; + }; + packageRequires = [ compat ]; + meta = { + homepage = "https://elpa.gnu.org/devel/cape.html"; + license = lib.licenses.free; + }; + } + ) { }; + capf-autosuggest = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "capf-autosuggest"; + ename = "capf-autosuggest"; + version = "0.3.0.20211123.104430"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/capf-autosuggest-0.3.0.20211123.104430.tar"; + sha256 = "0f16csl2ky8kys3wcv41zqh1l9976gc009pjy21kp6ck0pm0m3kg"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/capf-autosuggest.html"; + license = lib.licenses.free; + }; + } + ) { }; + caps-lock = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "caps-lock"; + ename = "caps-lock"; + version = "1.0.0.20221221.74713"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/caps-lock-1.0.0.20221221.74713.tar"; + sha256 = "0f8n79yw9zs1cpa8nhqmvw95kj762lv8rzrkj30ybvj1612vl1z9"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/caps-lock.html"; + license = lib.licenses.free; + }; + } + ) { }; + captain = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "captain"; + ename = "captain"; + version = "1.0.3.0.20221221.74732"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/captain-1.0.3.0.20221221.74732.tar"; + sha256 = "0ay26xzbhrxgvslrwcc504k5s0kxk0c8rnps656xz1wl38fbvm5b"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/captain.html"; + license = lib.licenses.free; + }; + } + ) { }; + chess = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "chess"; + ename = "chess"; + version = "2.0.5.0.20220926.150547"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/chess-2.0.5.0.20220926.150547.tar"; + sha256 = "16md052m600mmy43fgpcpwl4jz5q67v9w2h3y234ild6sp1qanlj"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.gnu.org/devel/chess.html"; + license = lib.licenses.free; + }; + } + ) { }; + cl-generic = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "cl-generic"; + ename = "cl-generic"; + version = "0.3.0.20221221.74800"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/cl-generic-0.3.0.20221221.74800.tar"; + sha256 = "1yhjgcc3rnhi0kf2mgm7yii1pa9hzz0dnfkg393p456rl07q7vqq"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/cl-generic.html"; + license = lib.licenses.free; + }; + } + ) { }; + cl-lib = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "cl-lib"; + ename = "cl-lib"; + version = "0.7.1.0.20221221.74809"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/cl-lib-0.7.1.0.20221221.74809.tar"; + sha256 = "1xig9cma7p5bplnqnxmwh1axxlf813ar69bzyvks09yhg04jikm1"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/cl-lib.html"; + license = lib.licenses.free; + }; + } + ) { }; + clipboard-collector = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "clipboard-collector"; + ename = "clipboard-collector"; + version = "0.3.0.20190215.154741"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/clipboard-collector-0.3.0.20190215.154741.tar"; + sha256 = "03y1wivagbsl4f2qgmxcy43pbpvpxhd1d57ihpdvsl2illb6bwlq"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/clipboard-collector.html"; + license = lib.licenses.free; + }; + } + ) { }; + cobol-mode = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "cobol-mode"; + ename = "cobol-mode"; + version = "1.1.0.20240505.191317"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/cobol-mode-1.1.0.20240505.191317.tar"; + sha256 = "1nv0594a244yp5rv9y7bna37sr4cn0869g7i48888dphg6savlb7"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.gnu.org/devel/cobol-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + code-cells = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "code-cells"; + ename = "code-cells"; + version = "0.4.0.20240809.93222"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/code-cells-0.4.0.20240809.93222.tar"; + sha256 = "19mibw99y13fmbngbg1x1zv02j50pcbrifl62slrx4aj3v796839"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/code-cells.html"; + license = lib.licenses.free; + }; + } + ) { }; + colorful-mode = callPackage ( + { + compat, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "colorful-mode"; + ename = "colorful-mode"; + version = "1.0.4.0.20240712.155246"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/colorful-mode-1.0.4.0.20240712.155246.tar"; + sha256 = "1n2b5av3k8kwx6f5x0ziq7virv7n2d9npw11s934qzq3qfk2m8i3"; + }; + packageRequires = [ compat ]; + meta = { + homepage = "https://elpa.gnu.org/devel/colorful-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + comint-mime = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "comint-mime"; + ename = "comint-mime"; + version = "0.4.0.20240810.184048"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/comint-mime-0.4.0.20240810.184048.tar"; + sha256 = "0gaz8f730d6z8y1f8yckklgimm85c7qm96ascdj8yw0mh483xcg6"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/comint-mime.html"; + license = lib.licenses.free; + }; + } + ) { }; + compact-docstrings = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "compact-docstrings"; + ename = "compact-docstrings"; + version = "0.2.0.20220305.183958"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/compact-docstrings-0.2.0.20220305.183958.tar"; + sha256 = "024l45bxxkh6x7rd8qcmykxdhdj0yckcf7vzacl7ynzwm9ah7sry"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/compact-docstrings.html"; + license = lib.licenses.free; + }; + } + ) { }; + company = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "company"; + ename = "company"; + version = "0.10.2.0.20240729.84605"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/company-0.10.2.0.20240729.84605.tar"; + sha256 = "09r7jjz0hqks08syxg889d1qbwwla6kwp29n5h660np4ymx38gbq"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/company.html"; + license = lib.licenses.free; + }; + } + ) { }; + company-ebdb = callPackage ( + { + company, + ebdb, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "company-ebdb"; + ename = "company-ebdb"; + version = "1.1.0.20221221.74915"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/company-ebdb-1.1.0.20221221.74915.tar"; + sha256 = "1qidrgcm2hdkrbh75rjfzxbmbyvxvyfy4m2kd6lgcx0v494lzvqw"; + }; + packageRequires = [ + company + ebdb + ]; + meta = { + homepage = "https://elpa.gnu.org/devel/company-ebdb.html"; + license = lib.licenses.free; + }; + } + ) { }; + company-math = callPackage ( + { + company, + elpaBuild, + fetchurl, + lib, + math-symbol-lists, + }: + elpaBuild { + pname = "company-math"; + ename = "company-math"; + version = "1.5.1.0.20221227.132907"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/company-math-1.5.1.0.20221227.132907.tar"; + sha256 = "070kfw13aw1hfvkdxb83zic44301nawnl57saqwrg6lh0psxpyxv"; + }; + packageRequires = [ + company + math-symbol-lists + ]; + meta = { + homepage = "https://elpa.gnu.org/devel/company-math.html"; + license = lib.licenses.free; + }; + } + ) { }; + company-statistics = callPackage ( + { + company, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "company-statistics"; + ename = "company-statistics"; + version = "0.2.3.0.20170210.193350"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/company-statistics-0.2.3.0.20170210.193350.tar"; + sha256 = "0fwvaadfr5jlx3021kfjbij9692c2v3l600v2rwqijc563phdfg3"; + }; + packageRequires = [ company ]; + meta = { + homepage = "https://elpa.gnu.org/devel/company-statistics.html"; + license = lib.licenses.free; + }; + } + ) { }; + compat = callPackage ( + { + elpaBuild, + fetchurl, + lib, + seq, + }: + elpaBuild { + pname = "compat"; + ename = "compat"; + version = "30.0.0.0.0.20240803.181300"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/compat-30.0.0.0.0.20240803.181300.tar"; + sha256 = "15an93nh3l0njb9vl1bmg59r8z7mcp3zpjp27vwg0rmvldqg72r3"; + }; + packageRequires = [ seq ]; + meta = { + homepage = "https://elpa.gnu.org/devel/compat.html"; + license = lib.licenses.free; + }; + } + ) { }; + consult = callPackage ( + { + compat, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "consult"; + ename = "consult"; + version = "1.8.0.20240818.112757"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/consult-1.8.0.20240818.112757.tar"; + sha256 = "1f5likm0mv41by193dc714lvcjz9604k31pswr2nnfknia164x5k"; + }; + packageRequires = [ compat ]; + meta = { + homepage = "https://elpa.gnu.org/devel/consult.html"; + license = lib.licenses.free; + }; + } + ) { }; + consult-denote = callPackage ( + { + consult, + denote, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "consult-denote"; + ename = "consult-denote"; + version = "0.1.1.0.20240703.93551"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/consult-denote-0.1.1.0.20240703.93551.tar"; + sha256 = "1275qhz4fyrh1qr1mjhzy923x4rs90v80sdiazmszn72dcvp25bq"; + }; + packageRequires = [ + consult + denote + ]; + meta = { + homepage = "https://elpa.gnu.org/devel/consult-denote.html"; + license = lib.licenses.free; + }; + } + ) { }; + consult-hoogle = callPackage ( + { + elpaBuild, + fetchurl, + haskell-mode, + lib, + }: + elpaBuild { + pname = "consult-hoogle"; + ename = "consult-hoogle"; + version = "0.2.1.0.20240427.131842"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/consult-hoogle-0.2.1.0.20240427.131842.tar"; + sha256 = "05rx4kw9w51cbgx8nm1jbi2yv7p70w1yv9np8gmpj7z65gbw7v0m"; + }; + packageRequires = [ haskell-mode ]; + meta = { + homepage = "https://elpa.gnu.org/devel/consult-hoogle.html"; + license = lib.licenses.free; + }; + } + ) { }; + consult-recoll = callPackage ( + { + consult, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "consult-recoll"; + ename = "consult-recoll"; + version = "0.8.1.0.20231211.122134"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/consult-recoll-0.8.1.0.20231211.122134.tar"; + sha256 = "1hpgcqbnvqcd6vzhxqi4axihjyp764hvbggk1skviys2apywk4s1"; + }; + packageRequires = [ consult ]; + meta = { + homepage = "https://elpa.gnu.org/devel/consult-recoll.html"; + license = lib.licenses.free; + }; + } + ) { }; + context-coloring = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "context-coloring"; + ename = "context-coloring"; + version = "8.1.0.0.20240331.133753"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/context-coloring-8.1.0.0.20240331.133753.tar"; + sha256 = "1m8c7vccdb868n777rqi8mhjwfbm25q7hbx7x6y145mxmnqr1vgn"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/context-coloring.html"; + license = lib.licenses.free; + }; + } + ) { }; + corfu = callPackage ( + { + compat, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "corfu"; + ename = "corfu"; + version = "1.5.0.20240818.102943"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/corfu-1.5.0.20240818.102943.tar"; + sha256 = "0arfkrnls7gj6z1k764p6vgfmb915fa61hwbflfgsnhms3x0vpmv"; + }; + packageRequires = [ compat ]; + meta = { + homepage = "https://elpa.gnu.org/devel/corfu.html"; + license = lib.licenses.free; + }; + } + ) { }; + coterm = callPackage ( + { + compat, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "coterm"; + ename = "coterm"; + version = "1.6.0.20221015.160420"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/coterm-1.6.0.20221015.160420.tar"; + sha256 = "1633q3vrqhjfv4ipirirgkpmal5j1rfh6jxkq3sm3qwlg8lgak4s"; + }; + packageRequires = [ compat ]; + meta = { + homepage = "https://elpa.gnu.org/devel/coterm.html"; + license = lib.licenses.free; + }; + } + ) { }; + counsel = callPackage ( + { + elpaBuild, + fetchurl, + ivy, + lib, + swiper, + }: + elpaBuild { + pname = "counsel"; + ename = "counsel"; + version = "0.14.2.0.20240520.132838"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/counsel-0.14.2.0.20240520.132838.tar"; + sha256 = "1xpvkyljahcjf84f4b40ivax1i06vyyyhlj3v7x0g90qjl6ba2cr"; + }; + packageRequires = [ + ivy + swiper + ]; + meta = { + homepage = "https://elpa.gnu.org/devel/counsel.html"; + license = lib.licenses.free; + }; + } + ) { }; + cpio-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "cpio-mode"; + ename = "cpio-mode"; + version = "0.17.0.20211211.193556"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/cpio-mode-0.17.0.20211211.193556.tar"; + sha256 = "0z9dkdz1s1b7gfd0fgfxjdvbjlwwqwa6q4jjf8kkvvkgwwvqv3yq"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/cpio-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + cpupower = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "cpupower"; + ename = "cpupower"; + version = "1.0.5.0.20230704.131557"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/cpupower-1.0.5.0.20230704.131557.tar"; + sha256 = "1xls5wjxrx2a193piav0yp0sv1m7jv5zqk46hbxxhfakl3jg5zlq"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/cpupower.html"; + license = lib.licenses.free; + }; + } + ) { }; + crdt = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "crdt"; + ename = "crdt"; + version = "0.3.5.0.20230213.22302"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/crdt-0.3.5.0.20230213.22302.tar"; + sha256 = "0cl97di7s5a1v6widil63pwzywxpcxmhvhp34kqn256czsliv4pw"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/crdt.html"; + license = lib.licenses.free; + }; + } + ) { }; + crisp = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "crisp"; + ename = "crisp"; + version = "1.3.6.0.20221221.74923"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/crisp-1.3.6.0.20221221.74923.tar"; + sha256 = "0kpw81h9n8qwrvmqan9bwj32d4vgsrmma4f0rig04bdx0mxmdzir"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/crisp.html"; + license = lib.licenses.free; + }; + } + ) { }; + csharp-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "csharp-mode"; + ename = "csharp-mode"; + version = "2.0.0.0.20221205.181941"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/csharp-mode-2.0.0.0.20221205.181941.tar"; + sha256 = "1cmc6b7pwjalzipc2clis2si7d03r0glpgxj7qpvfdp26y1cjabv"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/csharp-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + csv-mode = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "csv-mode"; + ename = "csv-mode"; + version = "1.27.0.20240816.74202"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/csv-mode-1.27.0.20240816.74202.tar"; + sha256 = "1j6iqjp9k14i3d9n9dnk3m4wpixkflq8dlr6mapbgvd2kksmgigp"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.gnu.org/devel/csv-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + cursor-undo = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "cursor-undo"; + ename = "cursor-undo"; + version = "1.1.5.0.20240818.152228"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/cursor-undo-1.1.5.0.20240818.152228.tar"; + sha256 = "0hz6na9izpzbf50sq0bsy0q265g66ic67kc9zzhw0hqsfpym6b7f"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/cursor-undo.html"; + license = lib.licenses.free; + }; + } + ) { }; + cursory = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "cursory"; + ename = "cursory"; + version = "1.0.1.0.20240425.35714"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/cursory-1.0.1.0.20240425.35714.tar"; + sha256 = "0bm381nbrnh4j0pq1a53whsbs0mjvznr9mp0ymhxw8w935cvbl72"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/cursory.html"; + license = lib.licenses.free; + }; + } + ) { }; + cycle-quotes = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "cycle-quotes"; + ename = "cycle-quotes"; + version = "0.1.0.20221221.75021"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/cycle-quotes-0.1.0.20221221.75021.tar"; + sha256 = "0igwwbhf1b6c67znik3zphdngddkgai146qcjlkgg1ihr4ajc3pc"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/cycle-quotes.html"; + license = lib.licenses.free; + }; + } + ) { }; + dape = callPackage ( + { + elpaBuild, + fetchurl, + jsonrpc, + lib, + }: + elpaBuild { + pname = "dape"; + ename = "dape"; + version = "0.14.0.0.20240818.195258"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/dape-0.14.0.0.20240818.195258.tar"; + sha256 = "0bl8a05vrf7z7pc5gj947cir7cg3rzzljn2ck11l5801w5zq5yr5"; + }; + packageRequires = [ jsonrpc ]; + meta = { + homepage = "https://elpa.gnu.org/devel/dape.html"; + license = lib.licenses.free; + }; + } + ) { }; + darkroom = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "darkroom"; + ename = "darkroom"; + version = "0.3.0.20200507.173652"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/darkroom-0.3.0.20200507.173652.tar"; + sha256 = "1j57wa2jhpjs6ynda73s0vv4dzyr9jg0lifv7nc8bv79lr4sjab2"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.gnu.org/devel/darkroom.html"; + license = lib.licenses.free; + }; + } + ) { }; + dash = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "dash"; + ename = "dash"; + version = "2.19.1.0.20240510.132708"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/dash-2.19.1.0.20240510.132708.tar"; + sha256 = "1m16w781gzsjim087jj8n42kn1lrvkplsigbsx0l7fd6hqagyl2k"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/dash.html"; + license = lib.licenses.free; + }; + } + ) { }; + dbus-codegen = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "dbus-codegen"; + ename = "dbus-codegen"; + version = "0.1.0.20220306.62546"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/dbus-codegen-0.1.0.20220306.62546.tar"; + sha256 = "1jg8ibxy79g93b3hl97bpgz90ny5q936k8bjcmxix7hn82wg7a9l"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.gnu.org/devel/dbus-codegen.html"; + license = lib.licenses.free; + }; + } + ) { }; + debbugs = callPackage ( + { + elpaBuild, + fetchurl, + lib, + soap-client, + }: + elpaBuild { + pname = "debbugs"; + ename = "debbugs"; + version = "0.40.0.20240812.95045"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/debbugs-0.40.0.20240812.95045.tar"; + sha256 = "0lylhjg1a6iwb7w08xnblv9890c3din8w7hgja8bf4qq8j6w8xwq"; + }; + packageRequires = [ soap-client ]; + meta = { + homepage = "https://elpa.gnu.org/devel/debbugs.html"; + license = lib.licenses.free; + }; + } + ) { }; + delight = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + nadvice, + }: + elpaBuild { + pname = "delight"; + ename = "delight"; + version = "1.7.0.20200711.42851"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/delight-1.7.0.20200711.42851.tar"; + sha256 = "1v8yhii0s1rs1c2i7gs2rd98224qhpkybvrks8w5ghq4p3nxrrvw"; + }; + packageRequires = [ + cl-lib + nadvice + ]; + meta = { + homepage = "https://elpa.gnu.org/devel/delight.html"; + license = lib.licenses.free; + }; + } + ) { }; + denote = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "denote"; + ename = "denote"; + version = "3.0.8.0.20240804.85702"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/denote-3.0.8.0.20240804.85702.tar"; + sha256 = "01kvkcdl60xdfrdxj02llbdxnp5dbkkmyabw9188hd58kvvxkwdn"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/denote.html"; + license = lib.licenses.free; + }; + } + ) { }; + denote-menu = callPackage ( + { + denote, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "denote-menu"; + ename = "denote-menu"; + version = "1.3.0.0.20240813.204446"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/denote-menu-1.3.0.0.20240813.204446.tar"; + sha256 = "0ifs4f1x9cgz324cj57f86qifwx0pnzvq12ma0b55s3din0xsvcc"; + }; + packageRequires = [ denote ]; + meta = { + homepage = "https://elpa.gnu.org/devel/denote-menu.html"; + license = lib.licenses.free; + }; + } + ) { }; + detached = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "detached"; + ename = "detached"; + version = "0.10.1.0.20221129.143049"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/detached-0.10.1.0.20221129.143049.tar"; + sha256 = "0fidhqf1m599v939hv3xsqbkckgk2fm550i7lkh0p961a3v542i8"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/detached.html"; + license = lib.licenses.free; + }; + } + ) { }; + devdocs = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "devdocs"; + ename = "devdocs"; + version = "0.6.1.0.20240428.71147"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/devdocs-0.6.1.0.20240428.71147.tar"; + sha256 = "0pvv4rvr14rc51gxb20zbyh42ijpq37dsmlzdsk8ypbfbgz3jw1s"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/devdocs.html"; + license = lib.licenses.free; + }; + } + ) { }; + devicetree-ts-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "devicetree-ts-mode"; + ename = "devicetree-ts-mode"; + version = "0.3.0.20240117.132538"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/devicetree-ts-mode-0.3.0.20240117.132538.tar"; + sha256 = "12jfiv7j0k5sqjbz28nd5x34hpxp76lyl41fl7bvsgiyb06i0gnf"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/devicetree-ts-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + dict-tree = callPackage ( + { + elpaBuild, + fetchurl, + heap, + lib, + tNFA, + trie, + }: + elpaBuild { + pname = "dict-tree"; + ename = "dict-tree"; + version = "0.17.0.20231015.24654"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/dict-tree-0.17.0.20231015.24654.tar"; + sha256 = "0nij9pkscr6mdjmrq9dlqnks91sd21pn01bsgn4zk918zygnkggj"; + }; + packageRequires = [ + heap + tNFA + trie + ]; + meta = { + homepage = "https://elpa.gnu.org/devel/dict-tree.html"; + license = lib.licenses.free; + }; + } + ) { }; + diff-hl = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "diff-hl"; + ename = "diff-hl"; + version = "1.10.0.0.20240802.231611"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/diff-hl-1.10.0.0.20240802.231611.tar"; + sha256 = "11zp0h0n1myj1d9x5bi8b0kdrgs4wf0nc3zc2zkz8zh7fz5rhc9p"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.gnu.org/devel/diff-hl.html"; + license = lib.licenses.free; + }; + } + ) { }; + diffview = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "diffview"; + ename = "diffview"; + version = "1.0.0.20230224.111651"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/diffview-1.0.0.20230224.111651.tar"; + sha256 = "1shw58jk2dzr8sc9hhfjqjrmwqarvq989ic96zjmhajxvcqcz3ql"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/diffview.html"; + license = lib.licenses.free; + }; + } + ) { }; + diminish = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "diminish"; + ename = "diminish"; + version = "0.46.0.20220909.84745"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/diminish-0.46.0.20220909.84745.tar"; + sha256 = "1d31bk42p1qjhpbr6lin87y18nya1qk9dm37vhhiq5sxajfr5ab9"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/diminish.html"; + license = lib.licenses.free; + }; + } + ) { }; + dired-du = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "dired-du"; + ename = "dired-du"; + version = "0.5.2.0.20221221.75108"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/dired-du-0.5.2.0.20221221.75108.tar"; + sha256 = "0h31k45sx47vmk20sn77fzz86gbwiqxrryr091p5s05smrlsfxc2"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.gnu.org/devel/dired-du.html"; + license = lib.licenses.free; + }; + } + ) { }; + dired-duplicates = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "dired-duplicates"; + ename = "dired-duplicates"; + version = "0.4.0.20240328.201645"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/dired-duplicates-0.4.0.20240328.201645.tar"; + sha256 = "0122wxl2sql31s4h7rf7mxz6kv15m77q9bqmixxsgzhfghbia7k7"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/dired-duplicates.html"; + license = lib.licenses.free; + }; + } + ) { }; + dired-git-info = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "dired-git-info"; + ename = "dired-git-info"; + version = "0.3.1.0.20191229.192948"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/dired-git-info-0.3.1.0.20191229.192948.tar"; + sha256 = "0zq74nynra4cbyb81l3v9w0qrzz057z9abg6c6zjshlrq8kxv5kx"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/dired-git-info.html"; + license = lib.licenses.free; + }; + } + ) { }; + dired-preview = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "dired-preview"; + ename = "dired-preview"; + version = "0.2.0.0.20240805.90710"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/dired-preview-0.2.0.0.20240805.90710.tar"; + sha256 = "0n606w117y7swf95hxycxdf7nrzyxz8lsa6723p7bbrjnbal5863"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/dired-preview.html"; + license = lib.licenses.free; + }; + } + ) { }; + disk-usage = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "disk-usage"; + ename = "disk-usage"; + version = "1.3.3.0.20230920.164444"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/disk-usage-1.3.3.0.20230920.164444.tar"; + sha256 = "06vd56yaaz9a6b46g4r6ccasc74pyqls9krj3bcrdayhj34w3mxy"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/disk-usage.html"; + license = lib.licenses.free; + }; + } + ) { }; + dismal = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "dismal"; + ename = "dismal"; + version = "1.5.2.0.20221221.75154"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/dismal-1.5.2.0.20221221.75154.tar"; + sha256 = "0nyy9dkafkzxvx60d1bzrn2a1m3n53al3x17r3kf7d2b24gcljbd"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.gnu.org/devel/dismal.html"; + license = lib.licenses.free; + }; + } + ) { }; + djvu = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "djvu"; + ename = "djvu"; + version = "1.1.2.0.20221221.75224"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/djvu-1.1.2.0.20221221.75224.tar"; + sha256 = "0iirmzaah0nix14jaj0hnszrdkdsh4wli8hb951l7iw7szkc5fsp"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/djvu.html"; + license = lib.licenses.free; + }; + } + ) { }; + do-at-point = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "do-at-point"; + ename = "do-at-point"; + version = "0.1.2.0.20240625.155102"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/do-at-point-0.1.2.0.20240625.155102.tar"; + sha256 = "035f0gqywlrr8cwwk9b04nczcv8slf76f2ixvam949fphhc0zkrb"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/do-at-point.html"; + license = lib.licenses.free; + }; + } + ) { }; + doc-toc = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "doc-toc"; + ename = "doc-toc"; + version = "1.2.0.20230409.212954"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/doc-toc-1.2.0.20230409.212954.tar"; + sha256 = "1gcdkcb1ydgl24jmrnkg1a7kndl7kkvckwf12y5pj2l2idf9ifx8"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/doc-toc.html"; + license = lib.licenses.free; + }; + } + ) { }; + docbook = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "docbook"; + ename = "docbook"; + version = "0.1.0.20221221.75233"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/docbook-0.1.0.20221221.75233.tar"; + sha256 = "0r7sjnbj4wgqa2vw57ac28gixw762km0cwas0qhclxizb95nsnz2"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/docbook.html"; + license = lib.licenses.free; + }; + } + ) { }; + drepl = callPackage ( + { + comint-mime, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "drepl"; + ename = "drepl"; + version = "0.3.0.20240810.74103"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/drepl-0.3.0.20240810.74103.tar"; + sha256 = "0l1xgw6wh1j6xmiqhf7h5h9wg010dhclpxn6xxb372mqxlnylvld"; + }; + packageRequires = [ comint-mime ]; + meta = { + homepage = "https://elpa.gnu.org/devel/drepl.html"; + license = lib.licenses.free; + }; + } + ) { }; + dts-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "dts-mode"; + ename = "dts-mode"; + version = "1.0.0.20221221.75311"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/dts-mode-1.0.0.20221221.75311.tar"; + sha256 = "1bpd6npx70rzh3mb5235g1ydh839bnjag70qp17r0wd2wkj6w0gj"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/dts-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + easy-escape = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "easy-escape"; + ename = "easy-escape"; + version = "0.2.1.0.20210917.85414"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/easy-escape-0.2.1.0.20210917.85414.tar"; + sha256 = "0hk9244g7hgnan7xd4451qjklfqh5hbkxjl60l32nr19ynw0ygif"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/easy-escape.html"; + license = lib.licenses.free; + }; + } + ) { }; + easy-kill = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "easy-kill"; + ename = "easy-kill"; + version = "0.9.5.0.20220511.55730"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/easy-kill-0.9.5.0.20220511.55730.tar"; + sha256 = "0il8lhi2j80sz63lnjkayryikcya03zn3z40bnfjbsydpyqj4kzd"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.gnu.org/devel/easy-kill.html"; + license = lib.licenses.free; + }; + } + ) { }; + ebdb = callPackage ( + { + elpaBuild, + fetchurl, + lib, + seq, + }: + elpaBuild { + pname = "ebdb"; + ename = "ebdb"; + version = "0.8.22.0.20240305.123820"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/ebdb-0.8.22.0.20240305.123820.tar"; + sha256 = "0j6wflmslapq3wr5bg6ql7qamh9k9zzp1xzadkxq3i3124syanfs"; + }; + packageRequires = [ seq ]; + meta = { + homepage = "https://elpa.gnu.org/devel/ebdb.html"; + license = lib.licenses.free; + }; + } + ) { }; + ebdb-gnorb = callPackage ( + { + ebdb, + elpaBuild, + fetchurl, + gnorb, + lib, + }: + elpaBuild { + pname = "ebdb-gnorb"; + ename = "ebdb-gnorb"; + version = "1.0.2.0.20221221.75324"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/ebdb-gnorb-1.0.2.0.20221221.75324.tar"; + sha256 = "0lzsarv0pkdgkj19il0syk7yz6gcfkp0rl3i49rsqb3lpf5b6s5q"; + }; + packageRequires = [ + ebdb + gnorb + ]; + meta = { + homepage = "https://elpa.gnu.org/devel/ebdb-gnorb.html"; + license = lib.licenses.free; + }; + } + ) { }; + ebdb-i18n-chn = callPackage ( + { + ebdb, + elpaBuild, + fetchurl, + lib, + pyim, + }: + elpaBuild { + pname = "ebdb-i18n-chn"; + ename = "ebdb-i18n-chn"; + version = "1.3.2.0.20221221.75334"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/ebdb-i18n-chn-1.3.2.0.20221221.75334.tar"; + sha256 = "16hna0z08903pkq957cgxk26ihq6j3fab775ickb24zfssjm3l61"; + }; + packageRequires = [ + ebdb + pyim + ]; + meta = { + homepage = "https://elpa.gnu.org/devel/ebdb-i18n-chn.html"; + license = lib.licenses.free; + }; + } + ) { }; + ediprolog = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "ediprolog"; + ename = "ediprolog"; + version = "2.2.0.20221026.91800"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/ediprolog-2.2.0.20221026.91800.tar"; + sha256 = "0y2xa0k7sv21yabxkfzxnl0fdnppgcwx5jdnm1zw2j2sbaf9k6ca"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/ediprolog.html"; + license = lib.licenses.free; + }; + } + ) { }; + eev = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "eev"; + ename = "eev"; + version = "20240811.0.20240811.220128"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/eev-20240811.0.20240811.220128.tar"; + sha256 = "0smywkzygmbmzv4zj95y6cjj9gjj5ggh4cknscgsrbva2nffrp7v"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/eev.html"; + license = lib.licenses.free; + }; + } + ) { }; + ef-themes = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "ef-themes"; + ename = "ef-themes"; + version = "1.7.0.0.20240819.163406"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/ef-themes-1.7.0.0.20240819.163406.tar"; + sha256 = "1shapc9zjw3ca1x4gxwy7pz7ajm0h07nk8xrf4bypc629gzsg107"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/ef-themes.html"; + license = lib.licenses.free; + }; + } + ) { }; + eglot = callPackage ( + { + compat, + eldoc, + elpaBuild, + external-completion, + fetchurl, + flymake ? null, + jsonrpc, + lib, + project, + seq, + track-changes, + xref, + }: + elpaBuild { + pname = "eglot"; + ename = "eglot"; + version = "1.17.0.20240817.135350"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/eglot-1.17.0.20240817.135350.tar"; + sha256 = "1sk1xgliar7c5glhx8k9r6di7f5xpxx6m0myh8kdsmrsh67198gh"; + }; + packageRequires = [ + compat + eldoc + external-completion + flymake + jsonrpc + project + seq + track-changes + xref + ]; + meta = { + homepage = "https://elpa.gnu.org/devel/eglot.html"; + license = lib.licenses.free; + }; + } + ) { }; + el-search = callPackage ( + { + cl-print ? null, + elpaBuild, + fetchurl, + lib, + stream, + }: + elpaBuild { + pname = "el-search"; + ename = "el-search"; + version = "1.12.6.1.0.20221221.75346"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/el-search-1.12.6.1.0.20221221.75346.tar"; + sha256 = "12500xc7aln09kzf3kn6xq7xnphbqzmyz20h0sgpf8f1rvlh2h33"; + }; + packageRequires = [ + cl-print + stream + ]; + meta = { + homepage = "https://elpa.gnu.org/devel/el-search.html"; + license = lib.licenses.free; + }; + } + ) { }; + eldoc = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "eldoc"; + ename = "eldoc"; + version = "1.15.0.0.20240708.123037"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/eldoc-1.15.0.0.20240708.123037.tar"; + sha256 = "1ngi7zfg0l261myhnyifbvywak2clagiqmjdqbnwwnvs8gmj02in"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/eldoc.html"; + license = lib.licenses.free; + }; + } + ) { }; + electric-spacing = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "electric-spacing"; + ename = "electric-spacing"; + version = "5.0.0.20201201.154407"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/electric-spacing-5.0.0.20201201.154407.tar"; + sha256 = "0ywa68zwci0v6g9nc8czlhvf9872vl262nrxffahc5r7lp1hay8k"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/electric-spacing.html"; + license = lib.licenses.free; + }; + } + ) { }; + elisa = callPackage ( + { + async, + ellama, + elpaBuild, + fetchurl, + lib, + llm, + plz, + }: + elpaBuild { + pname = "elisa"; + ename = "elisa"; + version = "1.0.4.0.20240721.124701"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/elisa-1.0.4.0.20240721.124701.tar"; + sha256 = "0p903ljagaza0n2kw2hicvara903mwwjia4587wqwvydrfvhal7a"; + }; + packageRequires = [ + async + ellama + llm + plz + ]; + meta = { + homepage = "https://elpa.gnu.org/devel/elisa.html"; + license = lib.licenses.free; + }; + } + ) { }; + elisp-benchmarks = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "elisp-benchmarks"; + ename = "elisp-benchmarks"; + version = "1.16.0.20240708.114026"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/elisp-benchmarks-1.16.0.20240708.114026.tar"; + sha256 = "1njklwjfmwmxzhd535bkq32ljx99rb0q0jspg02vy88w89wbnkb8"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/elisp-benchmarks.html"; + license = lib.licenses.free; + }; + } + ) { }; + ellama = callPackage ( + { + compat, + elpaBuild, + fetchurl, + lib, + llm, + spinner, + }: + elpaBuild { + pname = "ellama"; + ename = "ellama"; + version = "0.11.13.0.20240721.113845"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/ellama-0.11.13.0.20240721.113845.tar"; + sha256 = "123gzcxmszx25464d7as8w9c2pv94kpr1br2njf03474vj7fa91m"; + }; + packageRequires = [ + compat + llm + spinner + ]; + meta = { + homepage = "https://elpa.gnu.org/devel/ellama.html"; + license = lib.licenses.free; + }; + } + ) { }; + emacs-gc-stats = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "emacs-gc-stats"; + ename = "emacs-gc-stats"; + version = "1.4.2.0.20231206.152254"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/emacs-gc-stats-1.4.2.0.20231206.152254.tar"; + sha256 = "08ivfm6m9y4i1w0xmjkbs6b2h7i5q1v2991rjs2w5s9d864yqg2l"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/emacs-gc-stats.html"; + license = lib.licenses.free; + }; + } + ) { }; + embark = callPackage ( + { + compat, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "embark"; + ename = "embark"; + version = "1.1.0.20240724.120153"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/embark-1.1.0.20240724.120153.tar"; + sha256 = "15qbmcx86yb8qk1k89gdrdj09bdaganzd82w23710z5qblmkpn44"; + }; + packageRequires = [ compat ]; + meta = { + homepage = "https://elpa.gnu.org/devel/embark.html"; + license = lib.licenses.free; + }; + } + ) { }; + embark-consult = callPackage ( + { + compat, + consult, + elpaBuild, + embark, + fetchurl, + lib, + }: + elpaBuild { + pname = "embark-consult"; + ename = "embark-consult"; + version = "1.1.0.20240724.120153"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/embark-consult-1.1.0.20240724.120153.tar"; + sha256 = "1i17xwlnmimnqzgnm2chghv1jnd026iiz6n94nfgwvw0avs7h5g2"; + }; + packageRequires = [ + compat + consult + embark + ]; + meta = { + homepage = "https://elpa.gnu.org/devel/embark-consult.html"; + license = lib.licenses.free; + }; + } + ) { }; + ement = callPackage ( + { + elpaBuild, + fetchurl, + lib, + map, + persist, + plz, + svg-lib, + taxy, + taxy-magit-section, + transient, + }: + elpaBuild { + pname = "ement"; + ename = "ement"; + version = "0.16pre0.20240707.203749"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/ement-0.16pre0.20240707.203749.tar"; + sha256 = "0ac02r7rbw2p8wcw9dqm1aykj0ng3vmk4np6fdzzhyn78d1jkps2"; + }; + packageRequires = [ + map + persist + plz + svg-lib + taxy + taxy-magit-section + transient + ]; + meta = { + homepage = "https://elpa.gnu.org/devel/ement.html"; + license = lib.licenses.free; + }; + } + ) { }; + emms = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + nadvice, + seq, + }: + elpaBuild { + pname = "emms"; + ename = "emms"; + version = "20.1.0.20240704.95932"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/emms-20.1.0.20240704.95932.tar"; + sha256 = "1mid0m39af2mcq99xbdjxiiliw6axaysm6cfriyl00w0w6ybfrjf"; + }; + packageRequires = [ + cl-lib + nadvice + seq + ]; + meta = { + homepage = "https://elpa.gnu.org/devel/emms.html"; + license = lib.licenses.free; + }; + } + ) { }; + engrave-faces = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "engrave-faces"; + ename = "engrave-faces"; + version = "0.3.1.0.20240421.82802"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/engrave-faces-0.3.1.0.20240421.82802.tar"; + sha256 = "0dxj9m9jyvrqhv67m2kkh0akjc7l6h40fvsy20k721zq9xvc6zkl"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/engrave-faces.html"; + license = lib.licenses.free; + }; + } + ) { }; + enwc = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "enwc"; + ename = "enwc"; + version = "2.0.0.20171007.121321"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/enwc-2.0.0.20171007.121321.tar"; + sha256 = "0c308kd1pinhb1lh2vi40bcnmvzydf1j7sqka9kajhxr0l4kjazb"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/enwc.html"; + license = lib.licenses.free; + }; + } + ) { }; + epoch-view = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "epoch-view"; + ename = "epoch-view"; + version = "0.0.1.0.20221221.75416"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/epoch-view-0.0.1.0.20221221.75416.tar"; + sha256 = "0hd51d441c2w05rx10wpa0rbc94pjwwaqy5mxlgfwnx52jabz15h"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/epoch-view.html"; + license = lib.licenses.free; + }; + } + ) { }; + erc = callPackage ( + { + compat, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "erc"; + ename = "erc"; + version = "5.6.1snapshot0.20240813.11230"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/erc-5.6.1snapshot0.20240813.11230.tar"; + sha256 = "1r2a3n4lfsjmlg7vg816hmxvdzmapp89vym2jh4vwkng1v5bfzq1"; + }; + packageRequires = [ compat ]; + meta = { + homepage = "https://elpa.gnu.org/devel/erc.html"; + license = lib.licenses.free; + }; + } + ) { }; + ergoemacs-mode = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + nadvice, + }: + elpaBuild { + pname = "ergoemacs-mode"; + ename = "ergoemacs-mode"; + version = "5.16.10.12.0.20240809.174605"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/ergoemacs-mode-5.16.10.12.0.20240809.174605.tar"; + sha256 = "1pq78fyr26rmg1vg4xhl095yhaxi8pdnhx0hjcwv5gvxxd462ggq"; + }; + packageRequires = [ + cl-lib + nadvice + ]; + meta = { + homepage = "https://elpa.gnu.org/devel/ergoemacs-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + ess = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "ess"; + ename = "ess"; + version = "24.1.1.0.20240819.131103"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/ess-24.1.1.0.20240819.131103.tar"; + sha256 = "0kh6xbnw3w21dxz7d32cfckfrii104bjh05gi94agqqb2npkhgkm"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/ess.html"; + license = lib.licenses.free; + }; + } + ) { }; + excorporate = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + fsm, + lib, + nadvice, + soap-client, + url-http-ntlm, + url-http-oauth, + }: + elpaBuild { + pname = "excorporate"; + ename = "excorporate"; + version = "1.1.2.0.20240219.90343"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/excorporate-1.1.2.0.20240219.90343.tar"; + sha256 = "0wm1qx1y9az3fdh81hjccpsw4xxx0p9acz9pfvsyjlywclcycd4i"; + }; + packageRequires = [ + cl-lib + fsm + nadvice + soap-client + url-http-ntlm + url-http-oauth + ]; + meta = { + homepage = "https://elpa.gnu.org/devel/excorporate.html"; + license = lib.licenses.free; + }; + } + ) { }; + expand-region = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "expand-region"; + ename = "expand-region"; + version = "1.0.0.0.20240119.103925"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/expand-region-1.0.0.0.20240119.103925.tar"; + sha256 = "16npbi0nryvnrz61ycpdp4s4nb067brkv83ih7fymc0dlmvp1x50"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/expand-region.html"; + license = lib.licenses.free; + }; + } + ) { }; + expreg = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "expreg"; + ename = "expreg"; + version = "1.3.1.0.20230915.150818"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/expreg-1.3.1.0.20230915.150818.tar"; + sha256 = "11r4vwavax904dxmcpbr2nbycr7096aalblh6pfvjbhb23a0vx7m"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/expreg.html"; + license = lib.licenses.free; + }; + } + ) { }; + external-completion = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "external-completion"; + ename = "external-completion"; + version = "0.1.0.20240725.13518"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/external-completion-0.1.0.20240725.13518.tar"; + sha256 = "0xhpmayv23iiysi5smk0sq9r8rp3vr5sq12p6584128pss75viqh"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/external-completion.html"; + license = lib.licenses.free; + }; + } + ) { }; + exwm = callPackage ( + { + compat, + elpaBuild, + fetchurl, + lib, + xelb, + }: + elpaBuild { + pname = "exwm"; + ename = "exwm"; + version = "0.31.0.20240818.191337"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/exwm-0.31.0.20240818.191337.tar"; + sha256 = "1mx4a3pvymja31g0b97h90qgqj11w5gddldyk4xragxq71avnf18"; + }; + packageRequires = [ + compat + xelb + ]; + meta = { + homepage = "https://elpa.gnu.org/devel/exwm.html"; + license = lib.licenses.free; + }; + } + ) { }; + f90-interface-browser = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "f90-interface-browser"; + ename = "f90-interface-browser"; + version = "1.1.0.20221221.75553"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/f90-interface-browser-1.1.0.20221221.75553.tar"; + sha256 = "0qv3v3ya8qdgwq0plcc3qbba4n66fqww3sawmqhzssksry39l1yj"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.gnu.org/devel/f90-interface-browser.html"; + license = lib.licenses.free; + }; + } + ) { }; + face-shift = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "face-shift"; + ename = "face-shift"; + version = "0.2.1.0.20230426.73945"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/face-shift-0.2.1.0.20230426.73945.tar"; + sha256 = "0gl9k7g3wsc045dx9mp9ypk084r4j3mhf2a4xn08lzz8z8i9k2rz"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/face-shift.html"; + license = lib.licenses.free; + }; + } + ) { }; + filechooser = callPackage ( + { + compat, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "filechooser"; + ename = "filechooser"; + version = "0.2.1.0.20240707.120050"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/filechooser-0.2.1.0.20240707.120050.tar"; + sha256 = "0ri460zys97h9q4bqg43vlfdpjrizvv412y3f4hj4cazsvwlr9k1"; + }; + packageRequires = [ compat ]; + meta = { + homepage = "https://elpa.gnu.org/devel/filechooser.html"; + license = lib.licenses.free; + }; + } + ) { }; + filladapt = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "filladapt"; + ename = "filladapt"; + version = "2.12.2.0.20221221.75607"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/filladapt-2.12.2.0.20221221.75607.tar"; + sha256 = "11s9n8d4psjs4dbsx2w8hyir5hapz952da5nz3xihli8a0q93mhv"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/filladapt.html"; + license = lib.licenses.free; + }; + } + ) { }; + firefox-javascript-repl = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "firefox-javascript-repl"; + ename = "firefox-javascript-repl"; + version = "0.9.5.0.20230605.161924"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/firefox-javascript-repl-0.9.5.0.20230605.161924.tar"; + sha256 = "1nfkzx07j3hddai213lia9pixfrrdajrvg7fvlx5js8zxfpvcjx6"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/firefox-javascript-repl.html"; + license = lib.licenses.free; + }; + } + ) { }; + flylisp = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "flylisp"; + ename = "flylisp"; + version = "0.2.0.20221221.75619"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/flylisp-0.2.0.20221221.75619.tar"; + sha256 = "110hfk979c664y27qf5af54phm8i4iq5qqk5vygjwd7252nd7i4a"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.gnu.org/devel/flylisp.html"; + license = lib.licenses.free; + }; + } + ) { }; + flymake = callPackage ( + { + eldoc, + elpaBuild, + fetchurl, + lib, + project, + }: + elpaBuild { + pname = "flymake"; + ename = "flymake"; + version = "1.3.7.0.20240707.154630"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/flymake-1.3.7.0.20240707.154630.tar"; + sha256 = "1y1r7hz8692y1q9n75vgq26liilaaiz1h8l3jh3n6dqyzll6c2wi"; + }; + packageRequires = [ + eldoc + project + ]; + meta = { + homepage = "https://elpa.gnu.org/devel/flymake.html"; + license = lib.licenses.free; + }; + } + ) { }; + flymake-codespell = callPackage ( + { + compat, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "flymake-codespell"; + ename = "flymake-codespell"; + version = "0.1.0.20231030.222337"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/flymake-codespell-0.1.0.20231030.222337.tar"; + sha256 = "1v3a2gg4myav4cs1vj4d5isxhbw9qvryk5r2dx3x19qqmmmm6djz"; + }; + packageRequires = [ compat ]; + meta = { + homepage = "https://elpa.gnu.org/devel/flymake-codespell.html"; + license = lib.licenses.free; + }; + } + ) { }; + flymake-proselint = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "flymake-proselint"; + ename = "flymake-proselint"; + version = "0.3.0.0.20230325.160756"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/flymake-proselint-0.3.0.0.20230325.160756.tar"; + sha256 = "1p3jpsv6w4hask7bk07dmafwgymbw3xl6i0vx0sjd0i5aa0xs9vz"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/flymake-proselint.html"; + license = lib.licenses.free; + }; + } + ) { }; + fontaine = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "fontaine"; + ename = "fontaine"; + version = "2.0.0.0.20240819.122228"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/fontaine-2.0.0.0.20240819.122228.tar"; + sha256 = "17l62k153g6qd79kmpy4rw2y05dd442vm6cyslxw3n8bkgfma6xi"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/fontaine.html"; + license = lib.licenses.free; + }; + } + ) { }; + frame-tabs = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "frame-tabs"; + ename = "frame-tabs"; + version = "1.1.0.20221221.75627"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/frame-tabs-1.1.0.20221221.75627.tar"; + sha256 = "08ql56h8h425ngs40m9zpy4ysxlxi74vanlkga42bskzax0ns2cm"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/frame-tabs.html"; + license = lib.licenses.free; + }; + } + ) { }; + frog-menu = callPackage ( + { + avy, + elpaBuild, + fetchurl, + lib, + posframe, + }: + elpaBuild { + pname = "frog-menu"; + ename = "frog-menu"; + version = "0.2.11.0.20201115.95734"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/frog-menu-0.2.11.0.20201115.95734.tar"; + sha256 = "00ihlqq4bxgrp6hdf1b6xhnvp87ilys1ykp0l38cs5lv6a10wvqs"; + }; + packageRequires = [ + avy + posframe + ]; + meta = { + homepage = "https://elpa.gnu.org/devel/frog-menu.html"; + license = lib.licenses.free; + }; + } + ) { }; + fsm = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "fsm"; + ename = "fsm"; + version = "0.2.1.0.20221212.223608"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/fsm-0.2.1.0.20221212.223608.tar"; + sha256 = "1zwl1b9sn4imxynada0vf8nxwm49lh8fahxfc35czlbn0w0jqm1k"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.gnu.org/devel/fsm.html"; + license = lib.licenses.free; + }; + } + ) { }; + ftable = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "ftable"; + ename = "ftable"; + version = "1.1.0.20230102.145125"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/ftable-1.1.0.20230102.145125.tar"; + sha256 = "0231qjah5s76g8dmnc5zpn6i6lysypf6jvvzmnyyv92lr8arzmfz"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/ftable.html"; + license = lib.licenses.free; + }; + } + ) { }; + gcmh = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "gcmh"; + ename = "gcmh"; + version = "0.2.1.0.20201116.225142"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/gcmh-0.2.1.0.20201116.225142.tar"; + sha256 = "0yb47avdy5f3a2g9cg2028h5agsqpddsbfsc6ncavnxnnyiccj8h"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/gcmh.html"; + license = lib.licenses.free; + }; + } + ) { }; + ggtags = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "ggtags"; + ename = "ggtags"; + version = "0.9.0.0.20230602.13355"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/ggtags-0.9.0.0.20230602.13355.tar"; + sha256 = "1krykf1hknczhdhh8rfj4vzcba87q5sjbv0p2y41mcvmmfnhharw"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/ggtags.html"; + license = lib.licenses.free; + }; + } + ) { }; + gited = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "gited"; + ename = "gited"; + version = "0.6.0.0.20221221.75709"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/gited-0.6.0.0.20221221.75709.tar"; + sha256 = "095679pq1lam42zran5qjk3zd4gf908vd5fkq9jppqlilcsqf7zb"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.gnu.org/devel/gited.html"; + license = lib.licenses.free; + }; + } + ) { }; + gle-mode = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "gle-mode"; + ename = "gle-mode"; + version = "1.1.0.20221221.75729"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/gle-mode-1.1.0.20221221.75729.tar"; + sha256 = "1bakvlx4bzz62hibwwm0hmhyzqqzy31xvsg6pw3lh2i028qd1ykx"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.gnu.org/devel/gle-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + gnat-compiler = callPackage ( + { + elpaBuild, + fetchurl, + lib, + wisi, + }: + elpaBuild { + pname = "gnat-compiler"; + ename = "gnat-compiler"; + version = "1.0.3.0.20230915.165808"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/gnat-compiler-1.0.3.0.20230915.165808.tar"; + sha256 = "0rm0s33nl9dzghlfsprycr2na412z4vnfc69q2pc6nlazsliz6w0"; + }; + packageRequires = [ wisi ]; + meta = { + homepage = "https://elpa.gnu.org/devel/gnat-compiler.html"; + license = lib.licenses.free; + }; + } + ) { }; + gnome-c-style = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "gnome-c-style"; + ename = "gnome-c-style"; + version = "0.1.0.20230924.235858"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/gnome-c-style-0.1.0.20230924.235858.tar"; + sha256 = "0gij2d1k40yhifr7ad3p465f5lg77cb441pl41mdc0g6v5gipnqf"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/gnome-c-style.html"; + license = lib.licenses.free; + }; + } + ) { }; + gnorb = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "gnorb"; + ename = "gnorb"; + version = "1.6.11.0.20230108.110132"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/gnorb-1.6.11.0.20230108.110132.tar"; + sha256 = "0jha80xr8pbribp0ki40cydvi35as7v2c2xsy0anh65j9ciym5ag"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.gnu.org/devel/gnorb.html"; + license = lib.licenses.free; + }; + } + ) { }; + gnu-elpa = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "gnu-elpa"; + ename = "gnu-elpa"; + version = "1.1.0.20221212.224322"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/gnu-elpa-1.1.0.20221212.224322.tar"; + sha256 = "0hk9ha7f0721wnsnjazpr970lfa4q03dhpxxffw9qcn1mlvh8qb8"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/gnu-elpa.html"; + license = lib.licenses.free; + }; + } + ) { }; + gnu-elpa-keyring-update = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "gnu-elpa-keyring-update"; + ename = "gnu-elpa-keyring-update"; + version = "2022.12.1.0.20240525.173808"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/gnu-elpa-keyring-update-2022.12.1.0.20240525.173808.tar"; + sha256 = "0s8fydk7b3qc6zv90n3bjniczr5911jkza5xqwi69cb1v9fbfjyd"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/gnu-elpa-keyring-update.html"; + license = lib.licenses.free; + }; + } + ) { }; + gnugo = callPackage ( + { + ascii-art-to-unicode, + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + xpm, + }: + elpaBuild { + pname = "gnugo"; + ename = "gnugo"; + version = "3.1.2.0.20230911.4426"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/gnugo-3.1.2.0.20230911.4426.tar"; + sha256 = "0pxw1z6inw0ikagcfvi14i83sg6affii277mbyzh5liv655hn9rj"; + }; + packageRequires = [ + ascii-art-to-unicode + cl-lib + xpm + ]; + meta = { + homepage = "https://elpa.gnu.org/devel/gnugo.html"; + license = lib.licenses.free; + }; + } + ) { }; + gnus-mock = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "gnus-mock"; + ename = "gnus-mock"; + version = "0.5.0.20210503.105756"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/gnus-mock-0.5.0.20210503.105756.tar"; + sha256 = "1gpjbx9iabrx2b4qinw0chv44g2v1z2ivaiywjzr3vy3h3pp6fga"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/gnus-mock.html"; + license = lib.licenses.free; + }; + } + ) { }; + gpastel = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "gpastel"; + ename = "gpastel"; + version = "0.5.0.0.20231030.71342"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/gpastel-0.5.0.0.20231030.71342.tar"; + sha256 = "1d5pj1rk0xv2fww827yplpcll5hy8w9fkcm9c8wf4yi3l6igkmgz"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/gpastel.html"; + license = lib.licenses.free; + }; + } + ) { }; + gpr-mode = callPackage ( + { + elpaBuild, + fetchurl, + gnat-compiler, + lib, + wisi, + }: + elpaBuild { + pname = "gpr-mode"; + ename = "gpr-mode"; + version = "1.0.5.0.20231115.90848"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/gpr-mode-1.0.5.0.20231115.90848.tar"; + sha256 = "1m768s196027zl402vmfvdzvdl3whbjg5lyfiwjx25d9gfx32351"; + }; + packageRequires = [ + gnat-compiler + wisi + ]; + meta = { + homepage = "https://elpa.gnu.org/devel/gpr-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + gpr-query = callPackage ( + { + elpaBuild, + fetchurl, + gnat-compiler, + lib, + wisi, + }: + elpaBuild { + pname = "gpr-query"; + ename = "gpr-query"; + version = "1.0.4.0.20231018.92052"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/gpr-query-1.0.4.0.20231018.92052.tar"; + sha256 = "0j0p685v1v0byma8x5lpihvfj6hyg30dx8jqa6q0xmm2c6i8cqai"; + }; + packageRequires = [ + gnat-compiler + wisi + ]; + meta = { + homepage = "https://elpa.gnu.org/devel/gpr-query.html"; + license = lib.licenses.free; + }; + } + ) { }; + graphql = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "graphql"; + ename = "graphql"; + version = "0.1.2.0.20221202.2453"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/graphql-0.1.2.0.20221202.2453.tar"; + sha256 = "0wh1lnn85nj026iln02b7p5hgrwd3dmqjkv48gc33ypyd4afh31z"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/graphql.html"; + license = lib.licenses.free; + }; + } + ) { }; + greader = callPackage ( + { + compat, + elpaBuild, + fetchurl, + lib, + seq, + }: + elpaBuild { + pname = "greader"; + ename = "greader"; + version = "0.11.15.0.20240806.162404"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/greader-0.11.15.0.20240806.162404.tar"; + sha256 = "11mh3cii9713bdl00kcxf2jhk04k9yi4x2bpazymz1iwfg4pk1hq"; + }; + packageRequires = [ + compat + seq + ]; + meta = { + homepage = "https://elpa.gnu.org/devel/greader.html"; + license = lib.licenses.free; + }; + } + ) { }; + greenbar = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "greenbar"; + ename = "greenbar"; + version = "1.1.0.20221221.80217"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/greenbar-1.1.0.20221221.80217.tar"; + sha256 = "00kch8c0sz5z3cx0likx0pyqp9jxvjd6lkmdcli4zzpc6j1f1a0k"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/greenbar.html"; + license = lib.licenses.free; + }; + } + ) { }; + gtags-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "gtags-mode"; + ename = "gtags-mode"; + version = "1.8.1.0.20240808.153728"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/gtags-mode-1.8.1.0.20240808.153728.tar"; + sha256 = "1bfblsay8qsglhh4iqhv9wl8s445piwykyx4lz7cbn74wpn2prin"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/gtags-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + guess-language = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + nadvice, + }: + elpaBuild { + pname = "guess-language"; + ename = "guess-language"; + version = "0.0.1.0.20240528.185800"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/guess-language-0.0.1.0.20240528.185800.tar"; + sha256 = "0hlcnd69mqs90ndp59pqcjdwl27cswnpqy6yjzaspmbya6plv3g6"; + }; + packageRequires = [ + cl-lib + nadvice + ]; + meta = { + homepage = "https://elpa.gnu.org/devel/guess-language.html"; + license = lib.licenses.free; + }; + } + ) { }; + hcel = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "hcel"; + ename = "hcel"; + version = "1.0.0.0.20221012.11633"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/hcel-1.0.0.0.20221012.11633.tar"; + sha256 = "03k08w10bvl6fz7nkmv2d7kksphxigw6cwfhfq0kkgxn4l8h37an"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/hcel.html"; + license = lib.licenses.free; + }; + } + ) { }; + heap = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "heap"; + ename = "heap"; + version = "0.5.0.20201214.121301"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/heap-0.5.0.20201214.121301.tar"; + sha256 = "0917bfrdiwwmdqmnpy2cg1dn7v5gyl7damwp6ld7sky6v3d113ya"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/heap.html"; + license = lib.licenses.free; + }; + } + ) { }; + hiddenquote = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "hiddenquote"; + ename = "hiddenquote"; + version = "1.2.0.20231107.184113"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/hiddenquote-1.2.0.20231107.184113.tar"; + sha256 = "0iy7mxqhph4kmp4a96r141f4dpk5vwiydx9i9gx5c13zzwvy2y7r"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/hiddenquote.html"; + license = lib.licenses.free; + }; + } + ) { }; + highlight-escape-sequences = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "highlight-escape-sequences"; + ename = "highlight-escape-sequences"; + version = "0.4.0.20201214.173014"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/highlight-escape-sequences-0.4.0.20201214.173014.tar"; + sha256 = "13x8750r3zn9sqbsxliiipk6kfnpg7clmd49niyrh80x9nj4pf72"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/highlight-escape-sequences.html"; + license = lib.licenses.free; + }; + } + ) { }; + hook-helpers = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "hook-helpers"; + ename = "hook-helpers"; + version = "1.1.1.0.20201201.93957"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/hook-helpers-1.1.1.0.20201201.93957.tar"; + sha256 = "0x3358k5lglnb4yf27c2ybzlsw9jp4n4jh5sizczl9n8g1vxbgkb"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/hook-helpers.html"; + license = lib.licenses.free; + }; + } + ) { }; + html5-schema = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "html5-schema"; + ename = "html5-schema"; + version = "0.1.0.20221221.80245"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/html5-schema-0.1.0.20221221.80245.tar"; + sha256 = "15f1nhsgpp0mv8mdrvv0jnscq0j23ggriw2d2dw26sr6lv93w2r4"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/html5-schema.html"; + license = lib.licenses.free; + }; + } + ) { }; + hydra = callPackage ( + { + elpaBuild, + fetchurl, + lib, + lv, + }: + elpaBuild { + pname = "hydra"; + ename = "hydra"; + version = "0.15.0.0.20221030.224757"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/hydra-0.15.0.0.20221030.224757.tar"; + sha256 = "1d8xdxv9j3vb0jkq6bx3f6kbjc990lbmdr78yqchai861hhllmdn"; + }; + packageRequires = [ lv ]; + meta = { + homepage = "https://elpa.gnu.org/devel/hydra.html"; + license = lib.licenses.free; + }; + } + ) { }; + hyperbole = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "hyperbole"; + ename = "hyperbole"; + version = "9.0.2pre0.20240819.10443"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/hyperbole-9.0.2pre0.20240819.10443.tar"; + sha256 = "0j3rz9hpqbv8757y3cbg5yx1kf56f5wkdvncch5pmg774v4lk5cl"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/hyperbole.html"; + license = lib.licenses.free; + }; + } + ) { }; + idlwave = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "idlwave"; + ename = "idlwave"; + version = "6.5.1.0.20240523.142720"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/idlwave-6.5.1.0.20240523.142720.tar"; + sha256 = "00i7kl0j7aacm7vyjgmm2kqhjjb3s70g69ka3sqhigm7s1hn3zk9"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/idlwave.html"; + license = lib.licenses.free; + }; + } + ) { }; + ilist = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "ilist"; + ename = "ilist"; + version = "0.4.0.20240807.41050"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/ilist-0.4.0.20240807.41050.tar"; + sha256 = "1j9ihvkbribvach3z23qw1fcf03gm9ijhmh6mrcvagcy7gllz02n"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/ilist.html"; + license = lib.licenses.free; + }; + } + ) { }; + inspector = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "inspector"; + ename = "inspector"; + version = "0.37.0.20240731.203714"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/inspector-0.37.0.20240731.203714.tar"; + sha256 = "0w6hqi2hv7vps8l5mgzvgxn53wxnyc24fhrmvxldajw8q8isi122"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/inspector.html"; + license = lib.licenses.free; + }; + } + ) { }; + ioccur = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "ioccur"; + ename = "ioccur"; + version = "2.6.0.20211231.163129"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/ioccur-2.6.0.20211231.163129.tar"; + sha256 = "0v048d1p95km3jwgs6x805fjg6qfv5pjwdwia1wzl9liqai21v1c"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.gnu.org/devel/ioccur.html"; + license = lib.licenses.free; + }; + } + ) { }; + isearch-mb = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "isearch-mb"; + ename = "isearch-mb"; + version = "0.8.0.20240310.84654"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/isearch-mb-0.8.0.20240310.84654.tar"; + sha256 = "1rb97ir8nbv7ici8isjcm4bfaxakd6a05yxv9as2wv9xl8fzfhwq"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/isearch-mb.html"; + license = lib.licenses.free; + }; + } + ) { }; + iterators = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "iterators"; + ename = "iterators"; + version = "0.1.1.0.20221221.80300"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/iterators-0.1.1.0.20221221.80300.tar"; + sha256 = "10cx933rk7f92jk8q87b69ls3w823fwxnr7i6j0bxpzjx66q15yk"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/iterators.html"; + license = lib.licenses.free; + }; + } + ) { }; + ivy = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "ivy"; + ename = "ivy"; + version = "0.14.2.0.20240524.114155"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/ivy-0.14.2.0.20240524.114155.tar"; + sha256 = "0k6nyyc1pmwdsqbvrz1w2bchm426cbgffgqq37sm2n4wjzcvmfz9"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/ivy.html"; + license = lib.licenses.free; + }; + } + ) { }; + ivy-avy = callPackage ( + { + avy, + elpaBuild, + fetchurl, + ivy, + lib, + }: + elpaBuild { + pname = "ivy-avy"; + ename = "ivy-avy"; + version = "0.14.2.0.20240214.214218"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/ivy-avy-0.14.2.0.20240214.214218.tar"; + sha256 = "1i3hrc5pb30qkzzpiza0mff97132b04sglg39mg0ad05hl3sq5dc"; + }; + packageRequires = [ + avy + ivy + ]; + meta = { + homepage = "https://elpa.gnu.org/devel/ivy-avy.html"; + license = lib.licenses.free; + }; + } + ) { }; + ivy-explorer = callPackage ( + { + elpaBuild, + fetchurl, + ivy, + lib, + }: + elpaBuild { + pname = "ivy-explorer"; + ename = "ivy-explorer"; + version = "0.3.2.0.20190909.192125"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/ivy-explorer-0.3.2.0.20190909.192125.tar"; + sha256 = "1jvahaswknvaia62cq8bz5lx55fb1c07zr63n7awcp0sajk3ph3z"; + }; + packageRequires = [ ivy ]; + meta = { + homepage = "https://elpa.gnu.org/devel/ivy-explorer.html"; + license = lib.licenses.free; + }; + } + ) { }; + ivy-hydra = callPackage ( + { + elpaBuild, + fetchurl, + hydra, + ivy, + lib, + }: + elpaBuild { + pname = "ivy-hydra"; + ename = "ivy-hydra"; + version = "0.14.2.0.20240214.214337"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/ivy-hydra-0.14.2.0.20240214.214337.tar"; + sha256 = "1paqprwizhavr1kfijfbr0my3ncmw94821d3c9qj1fnjkp3nfj4x"; + }; + packageRequires = [ + hydra + ivy + ]; + meta = { + homepage = "https://elpa.gnu.org/devel/ivy-hydra.html"; + license = lib.licenses.free; + }; + } + ) { }; + ivy-posframe = callPackage ( + { + elpaBuild, + fetchurl, + ivy, + lib, + posframe, + }: + elpaBuild { + pname = "ivy-posframe"; + ename = "ivy-posframe"; + version = "0.6.3.0.20211217.23411"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/ivy-posframe-0.6.3.0.20211217.23411.tar"; + sha256 = "03v4k7hx2bdxhjghanpmy9r50q9ksmz2xcwypxxhyywlglfk0d69"; + }; + packageRequires = [ + ivy + posframe + ]; + meta = { + homepage = "https://elpa.gnu.org/devel/ivy-posframe.html"; + license = lib.licenses.free; + }; + } + ) { }; + jami-bot = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "jami-bot"; + ename = "jami-bot"; + version = "0.0.4.0.20240204.184721"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/jami-bot-0.0.4.0.20240204.184721.tar"; + sha256 = "04zdnrah3jypkyx8dl0ns7cjcws5yv4d56ixaa94vjjjvyw9d8mv"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/jami-bot.html"; + license = lib.licenses.free; + }; + } + ) { }; + jarchive = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "jarchive"; + ename = "jarchive"; + version = "0.11.0.0.20231010.221311"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/jarchive-0.11.0.0.20231010.221311.tar"; + sha256 = "122qffkbl5in1y1zpphn38kmg49xpvddxzf8im9hcvigf7dik6f5"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/jarchive.html"; + license = lib.licenses.free; + }; + } + ) { }; + javaimp = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "javaimp"; + ename = "javaimp"; + version = "0.9.1.0.20221221.80314"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/javaimp-0.9.1.0.20221221.80314.tar"; + sha256 = "0dj7mzdfj1gvd18mdnf19pv5zljhhada6a5s3bm5drpw12vx5334"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/javaimp.html"; + license = lib.licenses.free; + }; + } + ) { }; + jgraph-mode = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "jgraph-mode"; + ename = "jgraph-mode"; + version = "1.1.0.20221221.80333"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/jgraph-mode-1.1.0.20221221.80333.tar"; + sha256 = "1ddmyxanfnqfmwx3ld25awm4qhwbzavla8xan261nyh4wwnm8hfq"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.gnu.org/devel/jgraph-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + jinx = callPackage ( + { + compat, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "jinx"; + ename = "jinx"; + version = "1.10.0.20240724.91709"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/jinx-1.10.0.20240724.91709.tar"; + sha256 = "1pfx68hcd0gfs78kq2xwr34cq6p1fm6ab4kmmhalld87jkq11ss1"; + }; + packageRequires = [ compat ]; + meta = { + homepage = "https://elpa.gnu.org/devel/jinx.html"; + license = lib.licenses.free; + }; + } + ) { }; + jit-spell = callPackage ( + { + compat, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "jit-spell"; + ename = "jit-spell"; + version = "0.4.0.20240810.110215"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/jit-spell-0.4.0.20240810.110215.tar"; + sha256 = "0k4icsk8wdshdza9mgdlfyg5ybnhkzdwjjkjq4s2g6d5h0ai1xzl"; + }; + packageRequires = [ compat ]; + meta = { + homepage = "https://elpa.gnu.org/devel/jit-spell.html"; + license = lib.licenses.free; + }; + } + ) { }; + js2-mode = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "js2-mode"; + ename = "js2-mode"; + version = "20231224.0.20240418.608"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/js2-mode-20231224.0.20240418.608.tar"; + sha256 = "0l0pcq8v2mnig6jb2qamnm3ih37bl0vlknzqkp3vsznlasjm5srj"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.gnu.org/devel/js2-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + json-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "json-mode"; + ename = "json-mode"; + version = "0.2.0.20221221.80401"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/json-mode-0.2.0.20221221.80401.tar"; + sha256 = "0hr0dqnz3c9bc78k3nnwrhwqhgyjq1qpnjfa7wd9bsla3gfp88hk"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/json-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + jsonrpc = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "jsonrpc"; + ename = "jsonrpc"; + version = "1.0.25.0.20240720.4208"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/jsonrpc-1.0.25.0.20240720.4208.tar"; + sha256 = "0r5aw8w5qxf2kqxh4x4q1lyhci2cbcxf31shshagf16zpcm71qz3"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/jsonrpc.html"; + license = lib.licenses.free; + }; + } + ) { }; + jumpc = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "jumpc"; + ename = "jumpc"; + version = "3.1.0.20231015.14814"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/jumpc-3.1.0.20231015.14814.tar"; + sha256 = "1v8jxyvs0540w6rdsy96a49lb8nhrq4r66mmvc42j8lh7k4nggdw"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/jumpc.html"; + license = lib.licenses.free; + }; + } + ) { }; + kind-icon = callPackage ( + { + elpaBuild, + fetchurl, + lib, + svg-lib, + }: + elpaBuild { + pname = "kind-icon"; + ename = "kind-icon"; + version = "0.2.2.0.20240717.130344"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/kind-icon-0.2.2.0.20240717.130344.tar"; + sha256 = "1rp4fx1ygwaz4sd26xkp3iz008dwg430dx7xzdba0prycdc9kh7f"; + }; + packageRequires = [ svg-lib ]; + meta = { + homepage = "https://elpa.gnu.org/devel/kind-icon.html"; + license = lib.licenses.free; + }; + } + ) { }; + kiwix = callPackage ( + { + elpaBuild, + fetchurl, + lib, + request, + }: + elpaBuild { + pname = "kiwix"; + ename = "kiwix"; + version = "1.1.5.0.20220316.84759"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/kiwix-1.1.5.0.20220316.84759.tar"; + sha256 = "0pi543y1gzkhi9chzwfmp9is8jnp31wx69m9355afrvxdncq6gna"; + }; + packageRequires = [ request ]; + meta = { + homepage = "https://elpa.gnu.org/devel/kiwix.html"; + license = lib.licenses.free; + }; + } + ) { }; + kmb = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "kmb"; + ename = "kmb"; + version = "0.1.0.20221221.80420"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/kmb-0.1.0.20221221.80420.tar"; + sha256 = "00zqrfh1nqn01azmkd2gy3il48h1sddp6addj9yfq4kwd7ylhym5"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/kmb.html"; + license = lib.licenses.free; + }; + } + ) { }; + kubed = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "kubed"; + ename = "kubed"; + version = "0.3.2.0.20240815.172320"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/kubed-0.3.2.0.20240815.172320.tar"; + sha256 = "0rzf1vyzmxm36w1ljxc09adqrp2w8bn0bn5gk5k0z4vy3r5yysj6"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/kubed.html"; + license = lib.licenses.free; + }; + } + ) { }; + landmark = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "landmark"; + ename = "landmark"; + version = "1.0.0.20221221.80428"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/landmark-1.0.0.20221221.80428.tar"; + sha256 = "1rwiysmynp2z4bfynhf9k1zd3y5s6dyp2312vq1rhyifgdd8mivq"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/landmark.html"; + license = lib.licenses.free; + }; + } + ) { }; + latex-table-wizard = callPackage ( + { + auctex, + elpaBuild, + fetchurl, + lib, + transient, + }: + elpaBuild { + pname = "latex-table-wizard"; + ename = "latex-table-wizard"; + version = "1.5.4.0.20230903.170436"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/latex-table-wizard-1.5.4.0.20230903.170436.tar"; + sha256 = "1y1crsd29fvqabzwzki7jqziarycix6bib0cmxlrfsqs95y7dr5w"; + }; + packageRequires = [ + auctex + transient + ]; + meta = { + homepage = "https://elpa.gnu.org/devel/latex-table-wizard.html"; + license = lib.licenses.free; + }; + } + ) { }; + leaf = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "leaf"; + ename = "leaf"; + version = "4.5.5.0.20230803.74443"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/leaf-4.5.5.0.20230803.74443.tar"; + sha256 = "1xkqwkkk3k5k3lg10amh2lvric2xcqd35ad30c0jyvzn9fsxkbn0"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/leaf.html"; + license = lib.licenses.free; + }; + } + ) { }; + lentic = callPackage ( + { + dash, + elpaBuild, + fetchurl, + lib, + m-buffer, + }: + elpaBuild { + pname = "lentic"; + ename = "lentic"; + version = "0.12.0.20240303.95600"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/lentic-0.12.0.20240303.95600.tar"; + sha256 = "0w6fl0yzmh0gd3d5d5049zrx341x0jrj48g265jy4jywdvk621kv"; + }; + packageRequires = [ + dash + m-buffer + ]; + meta = { + homepage = "https://elpa.gnu.org/devel/lentic.html"; + license = lib.licenses.free; + }; + } + ) { }; + lentic-server = callPackage ( + { + elpaBuild, + fetchurl, + lentic, + lib, + web-server, + }: + elpaBuild { + pname = "lentic-server"; + ename = "lentic-server"; + version = "0.2.0.20240314.214448"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/lentic-server-0.2.0.20240314.214448.tar"; + sha256 = "1mg12bkwsqm4nwwwmpfx3dav583i96dsk5ap5hjiz2ggwwrmrq8h"; + }; + packageRequires = [ + lentic + web-server + ]; + meta = { + homepage = "https://elpa.gnu.org/devel/lentic-server.html"; + license = lib.licenses.free; + }; + } + ) { }; + let-alist = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "let-alist"; + ename = "let-alist"; + version = "1.0.6.0.20240102.14710"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/let-alist-1.0.6.0.20240102.14710.tar"; + sha256 = "1iyw8kaqgd5kmfzyzcmrnaa40bn6azvhlmsppnvfnwxgslcjgp1p"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/let-alist.html"; + license = lib.licenses.free; + }; + } + ) { }; + lex = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "lex"; + ename = "lex"; + version = "1.2.0.20240216.82808"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/lex-1.2.0.20240216.82808.tar"; + sha256 = "0mh2jk838216mwv6bab28mq9nb5617c5y7s0yqynkz3vkarnnxx1"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/lex.html"; + license = lib.licenses.free; + }; + } + ) { }; + lin = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "lin"; + ename = "lin"; + version = "1.1.0.0.20240805.61912"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/lin-1.1.0.0.20240805.61912.tar"; + sha256 = "1r7l28h60cv3ba361rq1r6ksf8401q147j4n76q6d51w4v0gvjfm"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/lin.html"; + license = lib.licenses.free; + }; + } + ) { }; + listen = callPackage ( + { + elpaBuild, + fetchurl, + lib, + persist, + taxy, + taxy-magit-section, + transient, + }: + elpaBuild { + pname = "listen"; + ename = "listen"; + version = "0.10pre0.20240818.210429"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/listen-0.10pre0.20240818.210429.tar"; + sha256 = "1cww04hcna6biv9928xrfwh6vxhp8n66z3ws1xckg08wj18apnwv"; + }; + packageRequires = [ + persist + taxy + taxy-magit-section + transient + ]; + meta = { + homepage = "https://elpa.gnu.org/devel/listen.html"; + license = lib.licenses.free; + }; + } + ) { }; + literate-scratch = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "literate-scratch"; + ename = "literate-scratch"; + version = "1.0.0.20240621.41043"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/literate-scratch-1.0.0.20240621.41043.tar"; + sha256 = "0k1vgb1pmrdhq0mlvrpgdsamqfbhvrjwm2jgixla82j7814zzckq"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/literate-scratch.html"; + license = lib.licenses.free; + }; + } + ) { }; + llm = callPackage ( + { + elpaBuild, + fetchurl, + lib, + plz, + }: + elpaBuild { + pname = "llm"; + ename = "llm"; + version = "0.17.1.0.20240817.163032"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/llm-0.17.1.0.20240817.163032.tar"; + sha256 = "13c6fr5xjiynya6dx39bp5zs9q0csq98a92nb8mg4bdx6lkldqaa"; + }; + packageRequires = [ plz ]; + meta = { + homepage = "https://elpa.gnu.org/devel/llm.html"; + license = lib.licenses.free; + }; + } + ) { }; + lmc = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "lmc"; + ename = "lmc"; + version = "1.4.0.20230105.113402"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/lmc-1.4.0.20230105.113402.tar"; + sha256 = "0ldwr9gw0bkcj43w5x84qwq2gvv2nr53711wlh42zawh0dyhm8h7"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.gnu.org/devel/lmc.html"; + license = lib.licenses.free; + }; + } + ) { }; + load-dir = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "load-dir"; + ename = "load-dir"; + version = "0.0.5.0.20221221.80456"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/load-dir-0.0.5.0.20221221.80456.tar"; + sha256 = "00ynwml6xf7341z1w0wz1afh9jc4v8ggc8izy8qcvdiawxc418iq"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.gnu.org/devel/load-dir.html"; + license = lib.licenses.free; + }; + } + ) { }; + load-relative = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "load-relative"; + ename = "load-relative"; + version = "1.3.2.0.20230214.53224"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/load-relative-1.3.2.0.20230214.53224.tar"; + sha256 = "19pkb7xqyllll2pgyqs7bv0qfbv6n9i5qlx9rjzm4ws0c9j464zd"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/load-relative.html"; + license = lib.licenses.free; + }; + } + ) { }; + loc-changes = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "loc-changes"; + ename = "loc-changes"; + version = "1.2.0.20201201.94106"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/loc-changes-1.2.0.20201201.94106.tar"; + sha256 = "1jrjqn5600l245vhr5h6zwg6g72k0n721ck94mji755bqd231yxs"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/loc-changes.html"; + license = lib.licenses.free; + }; + } + ) { }; + loccur = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "loccur"; + ename = "loccur"; + version = "1.2.5.0.20240610.183057"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/loccur-1.2.5.0.20240610.183057.tar"; + sha256 = "1apir3ijix4pkrv8q30xxqbiwvj78vp3y68ffq18fcwiww0gkavf"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/loccur.html"; + license = lib.licenses.free; + }; + } + ) { }; + logos = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "logos"; + ename = "logos"; + version = "1.1.1.0.20240224.55443"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/logos-1.1.1.0.20240224.55443.tar"; + sha256 = "1zr2g2bj2xkjwj509vijqdqhx1dgmbr73i605677hjw01d2skch3"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/logos.html"; + license = lib.licenses.free; + }; + } + ) { }; + luwak = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "luwak"; + ename = "luwak"; + version = "1.0.0.0.20221125.50733"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/luwak-1.0.0.0.20221125.50733.tar"; + sha256 = "0b4kxq5im8gvg1zg12b8ii62w0vsf3gacimwd603srfc5l1rbvcw"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/luwak.html"; + license = lib.licenses.free; + }; + } + ) { }; + lv = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "lv"; + ename = "lv"; + version = "0.15.0.0.20221030.224757"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/lv-0.15.0.0.20221030.224757.tar"; + sha256 = "07m1m2rgwnb7916hzdjccnq4is0z7m5mwmvc0f7mpc4h61sa6cdn"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/lv.html"; + license = lib.licenses.free; + }; + } + ) { }; + m-buffer = callPackage ( + { + elpaBuild, + fetchurl, + lib, + seq, + }: + elpaBuild { + pname = "m-buffer"; + ename = "m-buffer"; + version = "0.16.0.20240302.175529"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/m-buffer-0.16.0.20240302.175529.tar"; + sha256 = "18lj0gb56xhwrbihijy4p5lyxqvdfcwyabcd30qy1dn4k715v614"; + }; + packageRequires = [ seq ]; + meta = { + homepage = "https://elpa.gnu.org/devel/m-buffer.html"; + license = lib.licenses.free; + }; + } + ) { }; + map = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "map"; + ename = "map"; + version = "3.3.1.0.20240221.84915"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/map-3.3.1.0.20240221.84915.tar"; + sha256 = "0cmxxgxi7nsgbx4a94pxhn4y6qddp14crfl2250nk6a1h17zvsnn"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/map.html"; + license = lib.licenses.free; + }; + } + ) { }; + marginalia = callPackage ( + { + compat, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "marginalia"; + ename = "marginalia"; + version = "1.7.0.20240818.101722"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/marginalia-1.7.0.20240818.101722.tar"; + sha256 = "1pvr1sr97hbibbpypvp82z85l0g4pmr3mm0qqynv5g5rfb51k53k"; + }; + packageRequires = [ compat ]; + meta = { + homepage = "https://elpa.gnu.org/devel/marginalia.html"; + license = lib.licenses.free; + }; + } + ) { }; + markchars = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "markchars"; + ename = "markchars"; + version = "0.2.2.0.20221221.80510"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/markchars-0.2.2.0.20221221.80510.tar"; + sha256 = "0f1n1jzhksl5cl5c4n2arqhj2zkwzs8i4yzdz39y2b51x2gi2yav"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/markchars.html"; + license = lib.licenses.free; + }; + } + ) { }; + math-symbol-lists = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "math-symbol-lists"; + ename = "math-symbol-lists"; + version = "1.3.0.20220828.204754"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/math-symbol-lists-1.3.0.20220828.204754.tar"; + sha256 = "0q038qwcq7lg3a7n451gw80xlwv4hczz3432xcx00hxgvlh744yc"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/math-symbol-lists.html"; + license = lib.licenses.free; + }; + } + ) { }; + mct = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "mct"; + ename = "mct"; + version = "1.0.0.0.20240429.72524"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/mct-1.0.0.0.20240429.72524.tar"; + sha256 = "07nb0y0ld6x2j5g1a0sjm5ihck41xkk55p5hm5279ddjklcp8p6a"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/mct.html"; + license = lib.licenses.free; + }; + } + ) { }; + memory-usage = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "memory-usage"; + ename = "memory-usage"; + version = "0.2.0.20201201.223908"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/memory-usage-0.2.0.20201201.223908.tar"; + sha256 = "1jybms0756sswwdq8gqc6kpp5m7y971v4yzcmhraykhf32rwf4rq"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/memory-usage.html"; + license = lib.licenses.free; + }; + } + ) { }; + metar = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "metar"; + ename = "metar"; + version = "0.3.0.20221221.80722"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/metar-0.3.0.20221221.80722.tar"; + sha256 = "08xcxx9wbjkqf6s1rbsp54f648r8n122k66nfd8ibv9qbd8qvmxq"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.gnu.org/devel/metar.html"; + license = lib.licenses.free; + }; + } + ) { }; + midi-kbd = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "midi-kbd"; + ename = "midi-kbd"; + version = "0.2.0.20221221.80736"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/midi-kbd-0.2.0.20221221.80736.tar"; + sha256 = "0fz9r0y3qdnaq9wi00151xzqh3ygwcfw6yl32cs1vaaxv2czkjai"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/midi-kbd.html"; + license = lib.licenses.free; + }; + } + ) { }; + mines = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "mines"; + ename = "mines"; + version = "1.6.0.20201130.184335"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/mines-1.6.0.20201130.184335.tar"; + sha256 = "0vl93im89fg72wpcqdhg1x2l4iybznh6gjvpkr1i29y05fsx2aad"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.gnu.org/devel/mines.html"; + license = lib.licenses.free; + }; + } + ) { }; + minibuffer-header = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "minibuffer-header"; + ename = "minibuffer-header"; + version = "0.5.0.20220921.71345"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/minibuffer-header-0.5.0.20220921.71345.tar"; + sha256 = "1s77h5s2abpm75k57zcp1s525qs74sdm6vpzlkvqjz8lpn8zkkp0"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/minibuffer-header.html"; + license = lib.licenses.free; + }; + } + ) { }; + minibuffer-line = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "minibuffer-line"; + ename = "minibuffer-line"; + version = "0.1.0.20221221.80745"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/minibuffer-line-0.1.0.20221221.80745.tar"; + sha256 = "10gl1lnihawv9dw2rzaydyh8cdgpqgj7y8jsr6hjgqv82hxqyccn"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/minibuffer-line.html"; + license = lib.licenses.free; + }; + } + ) { }; + minimap = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "minimap"; + ename = "minimap"; + version = "1.4.0.20201201.162630"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/minimap-1.4.0.20201201.162630.tar"; + sha256 = "0h0ydmfinr82j0ifkgwjhc8blg6z2f5k0711fwrcbx8wrgrvfh5v"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/minimap.html"; + license = lib.licenses.free; + }; + } + ) { }; + mmm-mode = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "mmm-mode"; + ename = "mmm-mode"; + version = "0.5.11.0.20240222.42825"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/mmm-mode-0.5.11.0.20240222.42825.tar"; + sha256 = "037g19hdya14q7wivdcw8h7wyx8lb8pw5waya3ak435cyfmpg1a7"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.gnu.org/devel/mmm-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + modus-themes = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "modus-themes"; + ename = "modus-themes"; + version = "4.4.0.0.20240811.50238"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/modus-themes-4.4.0.0.20240811.50238.tar"; + sha256 = "1bmjhjgj44h4g7fg1m937s5l3rf565kczi3jmm4yc7hhh50k1had"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/modus-themes.html"; + license = lib.licenses.free; + }; + } + ) { }; + mpdired = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "mpdired"; + ename = "mpdired"; + version = "2.0.20240614.95804"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/mpdired-2.0.20240614.95804.tar"; + sha256 = "0xjfabyc3da6270gapx4cnqc71mxx518jnf7xmi2mz9hpq1202n3"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/mpdired.html"; + license = lib.licenses.free; + }; + } + ) { }; + multi-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "multi-mode"; + ename = "multi-mode"; + version = "1.14.0.20221221.80812"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/multi-mode-1.14.0.20221221.80812.tar"; + sha256 = "1r41alsvaab8h5cngy0hjs78shv60qp1g68jppl5qlhd6a7h95ih"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/multi-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + multishell = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "multishell"; + ename = "multishell"; + version = "1.1.10.0.20220605.120254"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/multishell-1.1.10.0.20220605.120254.tar"; + sha256 = "0pl45mwwgdf505sviyzacalq6kisq0pnh99i1cnclrmjkjy6yxz9"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.gnu.org/devel/multishell.html"; + license = lib.licenses.free; + }; + } + ) { }; + muse = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "muse"; + ename = "muse"; + version = "3.20.2.0.20240209.184001"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/muse-3.20.2.0.20240209.184001.tar"; + sha256 = "1sn5siingpzg4y5wjc3ff2ln98gb7hhvwmhnvhmmqbnb8r459vs0"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/muse.html"; + license = lib.licenses.free; + }; + } + ) { }; + myers = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "myers"; + ename = "myers"; + version = "0.1.0.20221221.80834"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/myers-0.1.0.20221221.80834.tar"; + sha256 = "11nwn1nysr09r1701cd3wvkzn01s19l6lla0f33vqm66ahj9yldh"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/myers.html"; + license = lib.licenses.free; + }; + } + ) { }; + nadvice = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "nadvice"; + ename = "nadvice"; + version = "0.4.0.20230111.104526"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/nadvice-0.4.0.20230111.104526.tar"; + sha256 = "0855x3vgp0i6kmi5kf8365xqnj92k9lwqyfn40i59fp4jj3c00kr"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/nadvice.html"; + license = lib.licenses.free; + }; + } + ) { }; + nameless = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "nameless"; + ename = "nameless"; + version = "1.0.2.0.20230112.95905"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/nameless-1.0.2.0.20230112.95905.tar"; + sha256 = "1b44w8jkqqsi995a2daw05ks64njlgpkab6m3iy3lx3v8fggjahp"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/nameless.html"; + license = lib.licenses.free; + }; + } + ) { }; + names = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + nadvice, + }: + elpaBuild { + pname = "names"; + ename = "names"; + version = "20151201.0.0.20220425.173515"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/names-20151201.0.0.20220425.173515.tar"; + sha256 = "1s91v83jkwxjl1iqrmjy60rnnqcgzly0z8chp87f7i22fj5gjz4h"; + }; + packageRequires = [ + cl-lib + nadvice + ]; + meta = { + homepage = "https://elpa.gnu.org/devel/names.html"; + license = lib.licenses.free; + }; + } + ) { }; + nano-agenda = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "nano-agenda"; + ename = "nano-agenda"; + version = "0.3.0.20230417.100538"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/nano-agenda-0.3.0.20230417.100538.tar"; + sha256 = "1fhpic6zimk81a7w6m9hl6iw0vniz3pl775sxyg167ysn5sqsl2y"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/nano-agenda.html"; + license = lib.licenses.free; + }; + } + ) { }; + nano-modeline = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "nano-modeline"; + ename = "nano-modeline"; + version = "1.1.0.0.20240429.102433"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/nano-modeline-1.1.0.0.20240429.102433.tar"; + sha256 = "0jlaqkrqn2x4fhlz57c94586xjqi1sb89p6py4j5r00669djwhrf"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/nano-modeline.html"; + license = lib.licenses.free; + }; + } + ) { }; + nano-theme = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "nano-theme"; + ename = "nano-theme"; + version = "0.3.4.0.20240624.80231"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/nano-theme-0.3.4.0.20240624.80231.tar"; + sha256 = "1h2sifcl26av1lzzmngb2svl23hchjnzd8aaszkxxwh34wg1cgnk"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/nano-theme.html"; + license = lib.licenses.free; + }; + } + ) { }; + nftables-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "nftables-mode"; + ename = "nftables-mode"; + version = "1.1.0.20221221.80909"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/nftables-mode-1.1.0.20221221.80909.tar"; + sha256 = "149qz88wlapln0b8d9mcmj630vyh2ha65hqb46yrf08fch992cpx"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/nftables-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + nhexl-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "nhexl-mode"; + ename = "nhexl-mode"; + version = "1.5.0.20221215.152407"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/nhexl-mode-1.5.0.20221215.152407.tar"; + sha256 = "0bdw6lycm1hclz3qzckcpnssrd4i52051dzbs87f9sv6f6v31373"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/nhexl-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + nlinum = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "nlinum"; + ename = "nlinum"; + version = "1.9.0.20221221.80940"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/nlinum-1.9.0.20221221.80940.tar"; + sha256 = "15kw7r8lz9nb5s0rzgdlj1s1kl1l6nxzr7kmwv5i7b1xhpnyn7xn"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/nlinum.html"; + license = lib.licenses.free; + }; + } + ) { }; + notes-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "notes-mode"; + ename = "notes-mode"; + version = "1.31.0.20240402.80928"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/notes-mode-1.31.0.20240402.80928.tar"; + sha256 = "1kiki1b6bx3nn1xgbnh0xnwnhx5wkn0zzlk6jfsks5npj2a4h88g"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/notes-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + notmuch-indicator = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "notmuch-indicator"; + ename = "notmuch-indicator"; + version = "1.2.0.0.20240511.94138"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/notmuch-indicator-1.2.0.0.20240511.94138.tar"; + sha256 = "0f1bq1mbjiy1akqml3fb85xz5923j3w2dz4p6yij3kfb5cks42d1"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/notmuch-indicator.html"; + license = lib.licenses.free; + }; + } + ) { }; + ntlm = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "ntlm"; + ename = "ntlm"; + version = "2.1.0.0.20240102.22814"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/ntlm-2.1.0.0.20240102.22814.tar"; + sha256 = "0wr9bhxxdkpfvwla97xrd77dv3321apq1gmcpqadyjvxl44c0km7"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/ntlm.html"; + license = lib.licenses.free; + }; + } + ) { }; + num3-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "num3-mode"; + ename = "num3-mode"; + version = "1.5.0.20221221.81242"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/num3-mode-1.5.0.20221221.81242.tar"; + sha256 = "076m1lh9ma1wzavirmy7dq7nsl410n03yf7vq4ljxvbkw801sig7"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/num3-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + oauth2 = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + nadvice, + }: + elpaBuild { + pname = "oauth2"; + ename = "oauth2"; + version = "0.16.0.20221221.81302"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/oauth2-0.16.0.20221221.81302.tar"; + sha256 = "1imdggvj98db8cs0s2qx72ifavi6h3flym70zm2g1w8v2fmcq8dj"; + }; + packageRequires = [ + cl-lib + nadvice + ]; + meta = { + homepage = "https://elpa.gnu.org/devel/oauth2.html"; + license = lib.licenses.free; + }; + } + ) { }; + ob-asymptote = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "ob-asymptote"; + ename = "ob-asymptote"; + version = "1.0.0.20230908.121002"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/ob-asymptote-1.0.0.20230908.121002.tar"; + sha256 = "1lpv4rf7qf1yvpm4j3wiajdk72lgl4gk8qgwflzyq9yvmksakdvp"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/ob-asymptote.html"; + license = lib.licenses.free; + }; + } + ) { }; + ob-haxe = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "ob-haxe"; + ename = "ob-haxe"; + version = "1.0.0.20210211.73431"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/ob-haxe-1.0.0.20210211.73431.tar"; + sha256 = "148bly2nf0r64q2cfm0hd6i26bxaans7aj52nv4gb5qxsiqng0ly"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/ob-haxe.html"; + license = lib.licenses.free; + }; + } + ) { }; + objed = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "objed"; + ename = "objed"; + version = "0.8.3.0.20201002.84752"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/objed-0.8.3.0.20201002.84752.tar"; + sha256 = "1fjcl2gm4675l430rdr2lihsj13n24pi9zwjfqvsm4bnqbx9ywiz"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.gnu.org/devel/objed.html"; + license = lib.licenses.free; + }; + } + ) { }; + omn-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "omn-mode"; + ename = "omn-mode"; + version = "1.3.0.20240326.173146"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/omn-mode-1.3.0.20240326.173146.tar"; + sha256 = "1iyh0xqm9aag92vj44l4ymrjc0gnn41gckk1l96605cfkwr5m6qa"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/omn-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + on-screen = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "on-screen"; + ename = "on-screen"; + version = "1.3.3.0.20201127.191411"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/on-screen-1.3.3.0.20201127.191411.tar"; + sha256 = "1dak8rb89mkdpv3xc2h0kpn09i4l42iavslvkhy2vxj0qq6c1r9p"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.gnu.org/devel/on-screen.html"; + license = lib.licenses.free; + }; + } + ) { }; + openpgp = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "openpgp"; + ename = "openpgp"; + version = "1.0.2.0.20240726.81226"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/openpgp-1.0.2.0.20240726.81226.tar"; + sha256 = "0yxvzc0jbkgx9hvd57cicmw38bm178w0ahqqa6fvxn55i4ssgmjs"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/openpgp.html"; + license = lib.licenses.free; + }; + } + ) { }; + orderless = callPackage ( + { + compat, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "orderless"; + ename = "orderless"; + version = "1.1.0.20240717.75820"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/orderless-1.1.0.20240717.75820.tar"; + sha256 = "0x54jhhxm1j8hbxhwpn5ws3dcg20bszpwm7qhqg3hk1jf3f9xp61"; + }; + packageRequires = [ compat ]; + meta = { + homepage = "https://elpa.gnu.org/devel/orderless.html"; + license = lib.licenses.free; + }; + } + ) { }; + org = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "org"; + ename = "org"; + version = "9.8pre0.20240818.102310"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/org-9.8pre0.20240818.102310.tar"; + sha256 = "0mcisziws7nx445csnz6q89gwm4q2fxy4ddz1d4dixqsj4r1pkdj"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/org.html"; + license = lib.licenses.free; + }; + } + ) { }; + org-contacts = callPackage ( + { + elpaBuild, + fetchurl, + lib, + org, + }: + elpaBuild { + pname = "org-contacts"; + ename = "org-contacts"; + version = "1.1.0.20240807.73345"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/org-contacts-1.1.0.20240807.73345.tar"; + sha256 = "1j0qwzhxaj1499qk0bjfvvgywi34v7p9cmpc585kxcanb8g1lvg2"; + }; + packageRequires = [ org ]; + meta = { + homepage = "https://elpa.gnu.org/devel/org-contacts.html"; + license = lib.licenses.free; + }; + } + ) { }; + org-edna = callPackage ( + { + elpaBuild, + fetchurl, + lib, + org, + seq, + }: + elpaBuild { + pname = "org-edna"; + ename = "org-edna"; + version = "1.1.2.0.20200902.94459"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/org-edna-1.1.2.0.20200902.94459.tar"; + sha256 = "043pb34ai8rj515zgbw5nq5x3mkiyqcnk25787qc3mbddi9n9hwq"; + }; + packageRequires = [ + org + seq + ]; + meta = { + homepage = "https://elpa.gnu.org/devel/org-edna.html"; + license = lib.licenses.free; + }; + } + ) { }; + org-jami-bot = callPackage ( + { + elpaBuild, + fetchurl, + jami-bot, + lib, + }: + elpaBuild { + pname = "org-jami-bot"; + ename = "org-jami-bot"; + version = "0.0.5.0.20240204.184749"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/org-jami-bot-0.0.5.0.20240204.184749.tar"; + sha256 = "1zl9xblhppqwddizf7s7l9d4qzcr8d6vgvjwmiw4wvb4lpyba9r4"; + }; + packageRequires = [ jami-bot ]; + meta = { + homepage = "https://elpa.gnu.org/devel/org-jami-bot.html"; + license = lib.licenses.free; + }; + } + ) { }; + org-modern = callPackage ( + { + compat, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "org-modern"; + ename = "org-modern"; + version = "1.5.0.20240803.195206"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/org-modern-1.5.0.20240803.195206.tar"; + sha256 = "1nrry2zn7ldmbmsr0iznf4w01dhkc618ywbqbbz10ahhja509z2v"; + }; + packageRequires = [ compat ]; + meta = { + homepage = "https://elpa.gnu.org/devel/org-modern.html"; + license = lib.licenses.free; + }; + } + ) { }; + org-notify = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "org-notify"; + ename = "org-notify"; + version = "0.1.1.0.20231016.93952"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/org-notify-0.1.1.0.20231016.93952.tar"; + sha256 = "0pxm5pbmsf965daf3y7v5x6ca8ddi2a9d4lm04ky3113zz5ay95d"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/org-notify.html"; + license = lib.licenses.free; + }; + } + ) { }; + org-real = callPackage ( + { + boxy, + elpaBuild, + fetchurl, + lib, + org, + }: + elpaBuild { + pname = "org-real"; + ename = "org-real"; + version = "1.0.9.0.20240505.204156"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/org-real-1.0.9.0.20240505.204156.tar"; + sha256 = "05z8kycyqcfj0w18mnqys54wnlwa9yijlb5c0h86fqbhr7shbjmp"; + }; + packageRequires = [ + boxy + org + ]; + meta = { + homepage = "https://elpa.gnu.org/devel/org-real.html"; + license = lib.licenses.free; + }; + } + ) { }; + org-remark = callPackage ( + { + elpaBuild, + fetchurl, + lib, + org, + }: + elpaBuild { + pname = "org-remark"; + ename = "org-remark"; + version = "1.2.2.0.20240629.103632"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/org-remark-1.2.2.0.20240629.103632.tar"; + sha256 = "1jhqnrg8priqhs5g39jjgrnlh2bw2k0n39g3hk2m30vxbgyydqbm"; + }; + packageRequires = [ org ]; + meta = { + homepage = "https://elpa.gnu.org/devel/org-remark.html"; + license = lib.licenses.free; + }; + } + ) { }; + org-transclusion = callPackage ( + { + elpaBuild, + fetchurl, + lib, + org, + }: + elpaBuild { + pname = "org-transclusion"; + ename = "org-transclusion"; + version = "1.4.0.0.20240520.170949"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/org-transclusion-1.4.0.0.20240520.170949.tar"; + sha256 = "15i8my50y1m44rhk06rfs6bwlc3mavb73bjysg3wp1j132m2dcrl"; + }; + packageRequires = [ org ]; + meta = { + homepage = "https://elpa.gnu.org/devel/org-transclusion.html"; + license = lib.licenses.free; + }; + } + ) { }; + org-translate = callPackage ( + { + elpaBuild, + fetchurl, + lib, + org, + }: + elpaBuild { + pname = "org-translate"; + ename = "org-translate"; + version = "0.1.4.0.20220312.90634"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/org-translate-0.1.4.0.20220312.90634.tar"; + sha256 = "1fq0h0q5nh92dc9vgp7nmqyz2nl0byd2v6vl5k2lk3rlmbx7jnkz"; + }; + packageRequires = [ org ]; + meta = { + homepage = "https://elpa.gnu.org/devel/org-translate.html"; + license = lib.licenses.free; + }; + } + ) { }; + orgalist = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "orgalist"; + ename = "orgalist"; + version = "1.16.0.20240618.91747"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/orgalist-1.16.0.20240618.91747.tar"; + sha256 = "0kw1iasyg5j1kghwb952rah040qhybhycsmgk8y0rfk382ra3a1i"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/orgalist.html"; + license = lib.licenses.free; + }; + } + ) { }; + osc = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "osc"; + ename = "osc"; + version = "0.4.0.20221221.81343"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/osc-0.4.0.20221221.81343.tar"; + sha256 = "0mlyszhc2nbf5p4jnc6wlq8iipzmy9ymvbszq13myza410nd9xqh"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/osc.html"; + license = lib.licenses.free; + }; + } + ) { }; + osm = callPackage ( + { + compat, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "osm"; + ename = "osm"; + version = "1.4.0.20240723.220720"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/osm-1.4.0.20240723.220720.tar"; + sha256 = "0z3ng8p5921haj0ynn6sfgsdssfmkz2gsm5ybrz9wanxznswrs9d"; + }; + packageRequires = [ compat ]; + meta = { + homepage = "https://elpa.gnu.org/devel/osm.html"; + license = lib.licenses.free; + }; + } + ) { }; + other-frame-window = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "other-frame-window"; + ename = "other-frame-window"; + version = "1.0.6.0.20221221.81352"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/other-frame-window-1.0.6.0.20221221.81352.tar"; + sha256 = "11fdg3nl1w4vm46477kwk6d6vz769q726iz5cwknbvjzj8an994s"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/other-frame-window.html"; + license = lib.licenses.free; + }; + } + ) { }; + pabbrev = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "pabbrev"; + ename = "pabbrev"; + version = "4.3.0.0.20240617.162224"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/pabbrev-4.3.0.0.20240617.162224.tar"; + sha256 = "0wkizis0wb6syy2lzp1mi2cn5znzangi1w18jcn5ra8k8xj66yp4"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/pabbrev.html"; + license = lib.licenses.free; + }; + } + ) { }; + paced = callPackage ( + { + async, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "paced"; + ename = "paced"; + version = "1.1.3.0.20190227.204125"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/paced-1.1.3.0.20190227.204125.tar"; + sha256 = "1ykjmv45kkfa569m8hpvya8a7wvkqrg9nbz28sbxmx79abm1bmmi"; + }; + packageRequires = [ async ]; + meta = { + homepage = "https://elpa.gnu.org/devel/paced.html"; + license = lib.licenses.free; + }; + } + ) { }; + parsec = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "parsec"; + ename = "parsec"; + version = "0.1.3.0.20180729.171626"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/parsec-0.1.3.0.20180729.171626.tar"; + sha256 = "0lhcj6cjgkq9ha85n0hqcm0ik7avfzw9f8zcklyivwn2bx80r7r7"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.gnu.org/devel/parsec.html"; + license = lib.licenses.free; + }; + } + ) { }; + parser-generator = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "parser-generator"; + ename = "parser-generator"; + version = "0.2.1.0.20240220.204114"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/parser-generator-0.2.1.0.20240220.204114.tar"; + sha256 = "1yb3wv183xii4rvj7asccg9cgkv061vprakcpdq99fgc9zdx0maq"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/parser-generator.html"; + license = lib.licenses.free; + }; + } + ) { }; + path-iterator = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "path-iterator"; + ename = "path-iterator"; + version = "1.0.0.20221221.81414"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/path-iterator-1.0.0.20221221.81414.tar"; + sha256 = "1ln9l9x6bj1sp7shc2iafn11yji6lsgm4fm1ji1kfp3my1zhqc40"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/path-iterator.html"; + license = lib.licenses.free; + }; + } + ) { }; + peg = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "peg"; + ename = "peg"; + version = "1.0.1.0.20221221.81502"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/peg-1.0.1.0.20221221.81502.tar"; + sha256 = "0gc41pf2gy01bmjgx09c1kifi6pkhcm8jrbdx1ncblhix76ia4q4"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/peg.html"; + license = lib.licenses.free; + }; + } + ) { }; + perl-doc = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "perl-doc"; + ename = "perl-doc"; + version = "0.81.0.20230805.210315"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/perl-doc-0.81.0.20230805.210315.tar"; + sha256 = "0n129rcmn827payv0aqg8iz7dc7wg4rm27hvvw1wwj2k5x5vnd6r"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/perl-doc.html"; + license = lib.licenses.free; + }; + } + ) { }; + persist = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "persist"; + ename = "persist"; + version = "0.6.1.0.20240801.14323"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/persist-0.6.1.0.20240801.14323.tar"; + sha256 = "05y2a66a9gzs2xn4skb7ralidfk01z49ac3hf51sznrlri3wikng"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/persist.html"; + license = lib.licenses.free; + }; + } + ) { }; + phpinspect = callPackage ( + { + compat, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "phpinspect"; + ename = "phpinspect"; + version = "0.0.20240819.94625"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/phpinspect-0.0.20240819.94625.tar"; + sha256 = "1xmyhfzl04aq82a1880p9l7m0az3267amz2qi0a36p5pxcnshz7z"; + }; + packageRequires = [ compat ]; + meta = { + homepage = "https://elpa.gnu.org/devel/phpinspect.html"; + license = lib.licenses.free; + }; + } + ) { }; + phps-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "phps-mode"; + ename = "phps-mode"; + version = "0.4.49.0.20240424.65247"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/phps-mode-0.4.49.0.20240424.65247.tar"; + sha256 = "03xz1ig3zsbwixa4hkh7g9ihjxlw2jmzydqldkvjsyv1yhyyf2j4"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/phps-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + pinentry = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "pinentry"; + ename = "pinentry"; + version = "0.1.0.20231126.141402"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/pinentry-0.1.0.20231126.141402.tar"; + sha256 = "056h9zfbk4mfpvfpli2kr48i5cdcrf73v15id0dk762iy7iz38af"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/pinentry.html"; + license = lib.licenses.free; + }; + } + ) { }; + plz = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "plz"; + ename = "plz"; + version = "0.10pre0.20240816.164727"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/plz-0.10pre0.20240816.164727.tar"; + sha256 = "13rimqccllasx5zvb5hm3mkcnhwzy2b2fp5p3klv4xz0szf1981k"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/plz.html"; + license = lib.licenses.free; + }; + } + ) { }; + plz-event-source = callPackage ( + { + elpaBuild, + fetchurl, + lib, + plz-media-type, + }: + elpaBuild { + pname = "plz-event-source"; + ename = "plz-event-source"; + version = "0.1.1.0.20240814.73632"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/plz-event-source-0.1.1.0.20240814.73632.tar"; + sha256 = "1bcmc2wribnhvkp0yg57k8xvdbi2hp39jmvapjfpy6hhs1c5j7n9"; + }; + packageRequires = [ plz-media-type ]; + meta = { + homepage = "https://elpa.gnu.org/devel/plz-event-source.html"; + license = lib.licenses.free; + }; + } + ) { }; + plz-media-type = callPackage ( + { + elpaBuild, + fetchurl, + lib, + plz, + }: + elpaBuild { + pname = "plz-media-type"; + ename = "plz-media-type"; + version = "0.2.1.0.20240814.73530"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/plz-media-type-0.2.1.0.20240814.73530.tar"; + sha256 = "0lw95balq4zasj7q2ck1fmbkzs8rkasaqsda3aj859y3zdsqlqkd"; + }; + packageRequires = [ plz ]; + meta = { + homepage = "https://elpa.gnu.org/devel/plz-media-type.html"; + license = lib.licenses.free; + }; + } + ) { }; + plz-see = callPackage ( + { + elpaBuild, + fetchurl, + lib, + plz, + }: + elpaBuild { + pname = "plz-see"; + ename = "plz-see"; + version = "0.1.0.20231101.73512"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/plz-see-0.1.0.20231101.73512.tar"; + sha256 = "09ibjvd9wvndrygnfq0jic7m9bk6v490rk1k3b4qjvv5xfvsvvhq"; + }; + packageRequires = [ plz ]; + meta = { + homepage = "https://elpa.gnu.org/devel/plz-see.html"; + license = lib.licenses.free; + }; + } + ) { }; + poke = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "poke"; + ename = "poke"; + version = "3.2.0.20230517.100500"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/poke-3.2.0.20230517.100500.tar"; + sha256 = "0p12szh563vynl7h9j55v7373g43fhmsy03iibvnywaira4arw5l"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/poke.html"; + license = lib.licenses.free; + }; + } + ) { }; + poke-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "poke-mode"; + ename = "poke-mode"; + version = "3.1.0.20231014.222558"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/poke-mode-3.1.0.20231014.222558.tar"; + sha256 = "1aqw9rn17n7ywnys6dlwykrf63l4kgapqsk1fay5qjj0y1nkq167"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/poke-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + poker = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "poker"; + ename = "poker"; + version = "0.2.0.20221221.81510"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/poker-0.2.0.20221221.81510.tar"; + sha256 = "14xc4jpkpy88drijp19znfhlyv61p2fx2l3zqsqbl3br2xwxy219"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/poker.html"; + license = lib.licenses.free; + }; + } + ) { }; + polymode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "polymode"; + ename = "polymode"; + version = "0.2.2.0.20230317.121821"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/polymode-0.2.2.0.20230317.121821.tar"; + sha256 = "17dl20fzn15km0d2ypsrzij247yjr3nx5lk1sn5hwr3dvsapvagz"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/polymode.html"; + license = lib.licenses.free; + }; + } + ) { }; + popper = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "popper"; + ename = "popper"; + version = "0.4.6.0.20240701.211603"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/popper-0.4.6.0.20240701.211603.tar"; + sha256 = "0jhcpz0y5girsqqfliyg3a4h798hz316i813qdhz1s1xivpd91pk"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/popper.html"; + license = lib.licenses.free; + }; + } + ) { }; + posframe = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "posframe"; + ename = "posframe"; + version = "1.4.3.0.20240703.35906"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/posframe-1.4.3.0.20240703.35906.tar"; + sha256 = "19jwqgrns7i7dpyb83p7b07qbxw2w50vzcr722i1kzz0nrjl30dj"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/posframe.html"; + license = lib.licenses.free; + }; + } + ) { }; + pq = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "pq"; + ename = "pq"; + version = "0.2.0.20240317.135839"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/pq-0.2.0.20240317.135839.tar"; + sha256 = "0hva6d8iqqdvnllm7cssxrmn21alcb2aa4d6874bqdfqjij2hw1z"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/pq.html"; + license = lib.licenses.free; + }; + } + ) { }; + prefixed-core = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "prefixed-core"; + ename = "prefixed-core"; + version = "0.0.20221212.225529"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/prefixed-core-0.0.20221212.225529.tar"; + sha256 = "1b9bikccig8l96fal97lv6gajjip6qmbkx21y0pndfbw2kaamic4"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/prefixed-core.html"; + license = lib.licenses.free; + }; + } + ) { }; + preview-auto = callPackage ( + { + auctex, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "preview-auto"; + ename = "preview-auto"; + version = "0.3.0.20240818.113948"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/preview-auto-0.3.0.20240818.113948.tar"; + sha256 = "1nr80nrzkq0pak5pinxz3v6j6kr879y35whaxn9q6as1c93aay9d"; + }; + packageRequires = [ auctex ]; + meta = { + homepage = "https://elpa.gnu.org/devel/preview-auto.html"; + license = lib.licenses.free; + }; + } + ) { }; + preview-tailor = callPackage ( + { + auctex, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "preview-tailor"; + ename = "preview-tailor"; + version = "0.2.0.20240617.174356"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/preview-tailor-0.2.0.20240617.174356.tar"; + sha256 = "17x74wzfi7kc08x1kwlzvsyiqmimxf77k58amskyg73l1iqmr8s8"; + }; + packageRequires = [ auctex ]; + meta = { + homepage = "https://elpa.gnu.org/devel/preview-tailor.html"; + license = lib.licenses.free; + }; + } + ) { }; + project = callPackage ( + { + elpaBuild, + fetchurl, + lib, + xref, + }: + elpaBuild { + pname = "project"; + ename = "project"; + version = "0.11.1.0.20240817.24032"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/project-0.11.1.0.20240817.24032.tar"; + sha256 = "1f29qrv2g772sgc4m1y2agm3hwz9fl06mpizak1kbx6ak8klw6zk"; + }; + packageRequires = [ xref ]; + meta = { + homepage = "https://elpa.gnu.org/devel/project.html"; + license = lib.licenses.free; + }; + } + ) { }; + psgml = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "psgml"; + ename = "psgml"; + version = "1.3.5.0.20221229.184738"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/psgml-1.3.5.0.20221229.184738.tar"; + sha256 = "1zdfdzbadrbj6g4k2q7w5yvxvblpwn4mkihmnmag7jym66r4wmnb"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/psgml.html"; + license = lib.licenses.free; + }; + } + ) { }; + pspp-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "pspp-mode"; + ename = "pspp-mode"; + version = "1.1.0.20221221.81719"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/pspp-mode-1.1.0.20221221.81719.tar"; + sha256 = "010qckmc85wc4i7k1rmhffcdbpxpvs6p5qxdvr6g3ws00c1a3j4l"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/pspp-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + pulsar = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "pulsar"; + ename = "pulsar"; + version = "1.0.1.0.20240429.64508"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/pulsar-1.0.1.0.20240429.64508.tar"; + sha256 = "1ak3vphfw0rsm4rrqyg72zjjwm68ypwxbbif8fz31rnsp0n66f8n"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/pulsar.html"; + license = lib.licenses.free; + }; + } + ) { }; + pyim = callPackage ( + { + async, + elpaBuild, + fetchurl, + lib, + xr, + }: + elpaBuild { + pname = "pyim"; + ename = "pyim"; + version = "5.3.4.0.20240508.25615"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/pyim-5.3.4.0.20240508.25615.tar"; + sha256 = "0p079girx795fvqswdjh8l5mwdyndanfcsvb1qvj2klq063y1vv5"; + }; + packageRequires = [ + async + xr + ]; + meta = { + homepage = "https://elpa.gnu.org/devel/pyim.html"; + license = lib.licenses.free; + }; + } + ) { }; + pyim-basedict = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "pyim-basedict"; + ename = "pyim-basedict"; + version = "0.5.4.0.20220614.110824"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/pyim-basedict-0.5.4.0.20220614.110824.tar"; + sha256 = "0md12ysqcmz737vcs8wh561zl8s98w04cgzs69pbdnzzxas7iy2j"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/pyim-basedict.html"; + license = lib.licenses.free; + }; + } + ) { }; + python = callPackage ( + { + compat, + elpaBuild, + fetchurl, + lib, + seq, + }: + elpaBuild { + pname = "python"; + ename = "python"; + version = "0.28.0.20240708.74355"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/python-0.28.0.20240708.74355.tar"; + sha256 = "0q4s3lqifq6nrs9irqz709msja5slw6kc66gigm653m1n9j9kr1i"; + }; + packageRequires = [ + compat + seq + ]; + meta = { + homepage = "https://elpa.gnu.org/devel/python.html"; + license = lib.licenses.free; + }; + } + ) { }; + quarter-plane = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "quarter-plane"; + ename = "quarter-plane"; + version = "0.1.0.20221221.81727"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/quarter-plane-0.1.0.20221221.81727.tar"; + sha256 = "1s0fl9sxjhv0sl5ikvkhdnddjg1n2hzw0a64xcvm8859dk77fmy8"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/quarter-plane.html"; + license = lib.licenses.free; + }; + } + ) { }; + queue = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "queue"; + ename = "queue"; + version = "0.2.0.20210306.173709"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/queue-0.2.0.20210306.173709.tar"; + sha256 = "09iicl5fdpli6jnvdj0h8cwj7wqqmxnfzdd57vfjdq09v3sjkljs"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.gnu.org/devel/queue.html"; + license = lib.licenses.free; + }; + } + ) { }; + rainbow-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "rainbow-mode"; + ename = "rainbow-mode"; + version = "1.0.6.0.20231215.171141"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/rainbow-mode-1.0.6.0.20231215.171141.tar"; + sha256 = "0qr0yl8fszrrdnl8x3d8lnndr5s9g3bf708qilb3f6i5ahkqhq7l"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/rainbow-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + rbit = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "rbit"; + ename = "rbit"; + version = "0.1.0.20201128.182847"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/rbit-0.1.0.20201128.182847.tar"; + sha256 = "1ajjfkih0dji2mdsvcpdzmb32nv20niryl8x17ki1016302qfvdj"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/rbit.html"; + license = lib.licenses.free; + }; + } + ) { }; + rcirc-color = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "rcirc-color"; + ename = "rcirc-color"; + version = "0.4.5.0.20230414.195045"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/rcirc-color-0.4.5.0.20230414.195045.tar"; + sha256 = "1amlzg7njbmk1kbb569ygx2az7vd7py89z9aq9cmf5rm15hjsm59"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/rcirc-color.html"; + license = lib.licenses.free; + }; + } + ) { }; + rcirc-menu = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "rcirc-menu"; + ename = "rcirc-menu"; + version = "1.1.0.20221221.81818"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/rcirc-menu-1.1.0.20221221.81818.tar"; + sha256 = "0gd19rzqgqb9w5cfpr1rz719k5z1rfkn8480b0h1zkvgpgmdrzbx"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/rcirc-menu.html"; + license = lib.licenses.free; + }; + } + ) { }; + rcirc-sqlite = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "rcirc-sqlite"; + ename = "rcirc-sqlite"; + version = "1.0.2.0.20240606.194313"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/rcirc-sqlite-1.0.2.0.20240606.194313.tar"; + sha256 = "0x8mxf03ri10wcm4sqmf2w7858lyxvhlq7d3a7dsblpkhiyaj3fm"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/rcirc-sqlite.html"; + license = lib.licenses.free; + }; + } + ) { }; + realgud = callPackage ( + { + elpaBuild, + fetchurl, + lib, + load-relative, + loc-changes, + test-simple, + }: + elpaBuild { + pname = "realgud"; + ename = "realgud"; + version = "1.5.1.0.20231113.141045"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/realgud-1.5.1.0.20231113.141045.tar"; + sha256 = "1nvmpbnx31fdi2ps243xx6cnvhmyv9n1kvb98ydnxydmalxs4iva"; + }; + packageRequires = [ + load-relative + loc-changes + test-simple + ]; + meta = { + homepage = "https://elpa.gnu.org/devel/realgud.html"; + license = lib.licenses.free; + }; + } + ) { }; + realgud-ipdb = callPackage ( + { + elpaBuild, + fetchurl, + lib, + load-relative, + realgud, + }: + elpaBuild { + pname = "realgud-ipdb"; + ename = "realgud-ipdb"; + version = "1.0.0.0.20231216.160636"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/realgud-ipdb-1.0.0.0.20231216.160636.tar"; + sha256 = "1s08gngzq18bgxdc6qpsg7j9wjqq842wj5bki2l8jgyqpin6g3h5"; + }; + packageRequires = [ + load-relative + realgud + ]; + meta = { + homepage = "https://elpa.gnu.org/devel/realgud-ipdb.html"; + license = lib.licenses.free; + }; + } + ) { }; + realgud-jdb = callPackage ( + { + elpaBuild, + fetchurl, + lib, + load-relative, + realgud, + }: + elpaBuild { + pname = "realgud-jdb"; + ename = "realgud-jdb"; + version = "1.0.0.0.20200722.72030"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/realgud-jdb-1.0.0.0.20200722.72030.tar"; + sha256 = "1vh4x50gcy5i9v9pisn0swmv0ighksn8ni68pdwxkns5ka99qqi6"; + }; + packageRequires = [ + load-relative + realgud + ]; + meta = { + homepage = "https://elpa.gnu.org/devel/realgud-jdb.html"; + license = lib.licenses.free; + }; + } + ) { }; + realgud-lldb = callPackage ( + { + elpaBuild, + fetchurl, + lib, + load-relative, + realgud, + }: + elpaBuild { + pname = "realgud-lldb"; + ename = "realgud-lldb"; + version = "1.0.2.0.20230319.171320"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/realgud-lldb-1.0.2.0.20230319.171320.tar"; + sha256 = "0isnyflg507qngv8xjw8zwzwh4qy0d3c123d5rirwbissjcfxmrs"; + }; + packageRequires = [ + load-relative + realgud + ]; + meta = { + homepage = "https://elpa.gnu.org/devel/realgud-lldb.html"; + license = lib.licenses.free; + }; + } + ) { }; + realgud-node-debug = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + load-relative, + realgud, + }: + elpaBuild { + pname = "realgud-node-debug"; + ename = "realgud-node-debug"; + version = "1.0.0.0.20190525.123417"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/realgud-node-debug-1.0.0.0.20190525.123417.tar"; + sha256 = "1s5zav3d0xdj0jggw3znfzb43d9jrnzaafk51wiachh7j673gjjv"; + }; + packageRequires = [ + cl-lib + load-relative + realgud + ]; + meta = { + homepage = "https://elpa.gnu.org/devel/realgud-node-debug.html"; + license = lib.licenses.free; + }; + } + ) { }; + realgud-node-inspect = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + load-relative, + realgud, + }: + elpaBuild { + pname = "realgud-node-inspect"; + ename = "realgud-node-inspect"; + version = "1.0.0.0.20190526.154549"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/realgud-node-inspect-1.0.0.0.20190526.154549.tar"; + sha256 = "0hss16d3avyisdxp1xhzjqn2kd9xc3vkqg4ynsgvxampzli78fw9"; + }; + packageRequires = [ + cl-lib + load-relative + realgud + ]; + meta = { + homepage = "https://elpa.gnu.org/devel/realgud-node-inspect.html"; + license = lib.licenses.free; + }; + } + ) { }; + realgud-trepan-ni = callPackage ( + { + elpaBuild, + fetchurl, + lib, + load-relative, + realgud, + }: + elpaBuild { + pname = "realgud-trepan-ni"; + ename = "realgud-trepan-ni"; + version = "1.0.1.0.20210513.183733"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/realgud-trepan-ni-1.0.1.0.20210513.183733.tar"; + sha256 = "0p7sc7g1nwg1hyvgx5mzs2qpjnrayp7brw720kzxfxnxdfj7p0gj"; + }; + packageRequires = [ + load-relative + realgud + ]; + meta = { + homepage = "https://elpa.gnu.org/devel/realgud-trepan-ni.html"; + license = lib.licenses.free; + }; + } + ) { }; + realgud-trepan-xpy = callPackage ( + { + elpaBuild, + fetchurl, + lib, + load-relative, + realgud, + }: + elpaBuild { + pname = "realgud-trepan-xpy"; + ename = "realgud-trepan-xpy"; + version = "1.0.1.0.20230322.184556"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/realgud-trepan-xpy-1.0.1.0.20230322.184556.tar"; + sha256 = "0m9pwqbkhwkm9fys7rs2lapydkinh4v7q3q3j8b0qb0nl8qcni7i"; + }; + packageRequires = [ + load-relative + realgud + ]; + meta = { + homepage = "https://elpa.gnu.org/devel/realgud-trepan-xpy.html"; + license = lib.licenses.free; + }; + } + ) { }; + rec-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "rec-mode"; + ename = "rec-mode"; + version = "1.9.3.0.20231120.221944"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/rec-mode-1.9.3.0.20231120.221944.tar"; + sha256 = "1vi5fkxfjfq7z0dc3vhdknzw8id5a1fm0zaxr3y09np7z6n3iv7z"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/rec-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + register-list = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "register-list"; + ename = "register-list"; + version = "0.1.0.20221212.230034"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/register-list-0.1.0.20221212.230034.tar"; + sha256 = "02qc5ll26br1smx5d0ci3wm0s4hdj8sw72xdapn5bql5509n75dx"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/register-list.html"; + license = lib.licenses.free; + }; + } + ) { }; + relint = callPackage ( + { + elpaBuild, + fetchurl, + lib, + xr, + }: + elpaBuild { + pname = "relint"; + ename = "relint"; + version = "2.0.0.20240802.81954"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/relint-2.0.0.20240802.81954.tar"; + sha256 = "1ncai8nbswxgx18kc8qvm47am4n6qbhs38gjbx1ps6xxbipbks1z"; + }; + packageRequires = [ xr ]; + meta = { + homepage = "https://elpa.gnu.org/devel/relint.html"; + license = lib.licenses.free; + }; + } + ) { }; + repology = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "repology"; + ename = "repology"; + version = "1.2.4.0.20240108.130348"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/repology-1.2.4.0.20240108.130348.tar"; + sha256 = "1ybr0zn647sb6gfqrm6ahdkx3q30j2b0gaab335nkc7jqx1ba565"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/repology.html"; + license = lib.licenses.free; + }; + } + ) { }; + rich-minority = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "rich-minority"; + ename = "rich-minority"; + version = "1.0.3.0.20190419.83620"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/rich-minority-1.0.3.0.20190419.83620.tar"; + sha256 = "0kx516s0kv8ni3w408hb9bpnig83bv4m1l7b5lhdigmp8zvqm8jm"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.gnu.org/devel/rich-minority.html"; + license = lib.licenses.free; + }; + } + ) { }; + rnc-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "rnc-mode"; + ename = "rnc-mode"; + version = "0.3.0.20221221.81910"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/rnc-mode-0.3.0.20221221.81910.tar"; + sha256 = "1rdz1g440sjzxcqc4p2s0vv525ala4k470ddn4h9ghljnncqbady"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/rnc-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + rt-liberation = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "rt-liberation"; + ename = "rt-liberation"; + version = "7.0.20240306.83828"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/rt-liberation-7.0.20240306.83828.tar"; + sha256 = "1gz0hiwl8qqf1adxwgr8ly98pymqjrl3jjfly5r182l3rwp82gsh"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/rt-liberation.html"; + license = lib.licenses.free; + }; + } + ) { }; + ruby-end = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "ruby-end"; + ename = "ruby-end"; + version = "0.4.3.0.20230205.12506"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/ruby-end-0.4.3.0.20230205.12506.tar"; + sha256 = "0cr18s311c986gwx12f6fmnqwyqb4fh7j6h8m2cgp767vn4aqwxl"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/ruby-end.html"; + license = lib.licenses.free; + }; + } + ) { }; + rudel = callPackage ( + { + cl-generic, + cl-lib ? null, + cl-print ? null, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "rudel"; + ename = "rudel"; + version = "0.3.2.0.20221212.230154"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/rudel-0.3.2.0.20221212.230154.tar"; + sha256 = "0lcdc0gdqkl4disr9rwn1dmziwaiwnsyhfwvf02vrgpabd7dq95w"; + }; + packageRequires = [ + cl-generic + cl-lib + cl-print + ]; + meta = { + homepage = "https://elpa.gnu.org/devel/rudel.html"; + license = lib.licenses.free; + }; + } + ) { }; + satchel = callPackage ( + { + elpaBuild, + fetchurl, + lib, + project, + }: + elpaBuild { + pname = "satchel"; + ename = "satchel"; + version = "0.2.0.20220223.202624"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/satchel-0.2.0.20220223.202624.tar"; + sha256 = "1x558csdfahlp459m4bb827yayrzgisaijzbpxbl1pjhq595585d"; + }; + packageRequires = [ project ]; + meta = { + homepage = "https://elpa.gnu.org/devel/satchel.html"; + license = lib.licenses.free; + }; + } + ) { }; + scanner = callPackage ( + { + dash, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "scanner"; + ename = "scanner"; + version = "0.2.0.20210104.105054"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/scanner-0.2.0.20210104.105054.tar"; + sha256 = "1ah74y9ragw3kycqwgxkmnxrzl7s2n43cjpw6r25hmbyzjnhdppm"; + }; + packageRequires = [ dash ]; + meta = { + homepage = "https://elpa.gnu.org/devel/scanner.html"; + license = lib.licenses.free; + }; + } + ) { }; + scroll-restore = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "scroll-restore"; + ename = "scroll-restore"; + version = "1.0.0.20221221.81959"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/scroll-restore-1.0.0.20221221.81959.tar"; + sha256 = "04xhshjm5fr5q85srmjhvm20l0zljgbdsy1f3g3lczgzqrwvyg9f"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/scroll-restore.html"; + license = lib.licenses.free; + }; + } + ) { }; + sed-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "sed-mode"; + ename = "sed-mode"; + version = "1.1.0.20230721.154631"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/sed-mode-1.1.0.20230721.154631.tar"; + sha256 = "1gb7m8w5v0ay8mcm7alyixsnmndivd24467v58rkj0bpf7bmfa5v"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/sed-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + seq = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "seq"; + ename = "seq"; + version = "2.24.0.20240201.135317"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/seq-2.24.0.20240201.135317.tar"; + sha256 = "0plr9pbvzd5cfivj90n0jm920hp2x1giy9889pr8x5bqqnba6j66"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/seq.html"; + license = lib.licenses.free; + }; + } + ) { }; + setup = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "setup"; + ename = "setup"; + version = "1.4.0.0.20240413.75454"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/setup-1.4.0.0.20240413.75454.tar"; + sha256 = "1ryxa0991mzvx2ai4bkmjxnikpnalmr4gdggakfg8i8ag65149rn"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/setup.html"; + license = lib.licenses.free; + }; + } + ) { }; + shelisp = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "shelisp"; + ename = "shelisp"; + version = "1.0.0.0.20221212.230255"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/shelisp-1.0.0.0.20221212.230255.tar"; + sha256 = "0kk24mkmm4imf7gsr7xihj3xf2y9mgy61gpyql0wms1vlmkl0mwk"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/shelisp.html"; + license = lib.licenses.free; + }; + } + ) { }; + shell-command-plus = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "shell-command-plus"; + ename = "shell-command+"; + version = "2.4.2.0.20240801.143007"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/shell-command+-2.4.2.0.20240801.143007.tar"; + sha256 = "0mhr5yki3b0px40ldk8wzwpzy5ji0l301v4wilivzii8lgaq571c"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/shell-command+.html"; + license = lib.licenses.free; + }; + } + ) { }; + shell-quasiquote = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "shell-quasiquote"; + ename = "shell-quasiquote"; + version = "0.0.20221221.82030"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/shell-quasiquote-0.0.20221221.82030.tar"; + sha256 = "0g2yq64yyim35lvxify65kq3y49qrvgri7jyl9rgz8999gb3h8dj"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/shell-quasiquote.html"; + license = lib.licenses.free; + }; + } + ) { }; + shen-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "shen-mode"; + ename = "shen-mode"; + version = "0.1.0.20221221.82050"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/shen-mode-0.1.0.20221221.82050.tar"; + sha256 = "17ygb1c0x52n3cnmvaacrcf7m6qdjxdqaw1pn7lg3899kl45dh3r"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/shen-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + sisu-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "sisu-mode"; + ename = "sisu-mode"; + version = "7.1.8.0.20221221.82114"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/sisu-mode-7.1.8.0.20221221.82114.tar"; + sha256 = "1cyynn3sk8wxfhiz5q0lqwq07kqy67s2rvjql62880in5m5r2jpa"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/sisu-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + site-lisp = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "site-lisp"; + ename = "site-lisp"; + version = "0.1.2.0.20240308.82403"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/site-lisp-0.1.2.0.20240308.82403.tar"; + sha256 = "0c9r5pp2lr4wmpcfa8qz0xvq1vhzyhvnn14kawjarhx9p5mvgdq1"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/site-lisp.html"; + license = lib.licenses.free; + }; + } + ) { }; + sketch-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "sketch-mode"; + ename = "sketch-mode"; + version = "1.0.4.0.20230420.122954"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/sketch-mode-1.0.4.0.20230420.122954.tar"; + sha256 = "0ssh1v49h94gvchpynvjcsw80swpcdw541zxxhxm5zi6gsnyhnjd"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/sketch-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + slime-volleyball = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "slime-volleyball"; + ename = "slime-volleyball"; + version = "1.2.0.0.20221221.82156"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/slime-volleyball-1.2.0.0.20221221.82156.tar"; + sha256 = "015qpac86km7czpqr2f7xpjlkwbq9s4z9jl0dnr8b2bzh0iwqiik"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.gnu.org/devel/slime-volleyball.html"; + license = lib.licenses.free; + }; + } + ) { }; + sm-c-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "sm-c-mode"; + ename = "sm-c-mode"; + version = "1.2.0.20240404.93144"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/sm-c-mode-1.2.0.20240404.93144.tar"; + sha256 = "1xbkdvhxaffk6csav2ivbrqv85rkb4arnsslp2ji13alkm5hx1zx"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/sm-c-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + smalltalk-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "smalltalk-mode"; + ename = "smalltalk-mode"; + version = "4.0.0.20221221.82225"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/smalltalk-mode-4.0.0.20221221.82225.tar"; + sha256 = "1qk0z1gddw7fidvj429ivjwnxb4f5g074r531nmpvmy2l7srchd9"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/smalltalk-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + smart-yank = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "smart-yank"; + ename = "smart-yank"; + version = "0.1.1.0.20221221.82231"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/smart-yank-0.1.1.0.20221221.82231.tar"; + sha256 = "17w9ybfvdsnsy1vf1mg7a4428rna49i2yfifrp20srj8c0dapwzd"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/smart-yank.html"; + license = lib.licenses.free; + }; + } + ) { }; + sml-mode = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "sml-mode"; + ename = "sml-mode"; + version = "6.12.0.20230411.5343"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/sml-mode-6.12.0.20230411.5343.tar"; + sha256 = "1a7n0lvrjq4xnn0cr6qwgh7l54m95mf2nxwv1rplair4r8si8y0d"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.gnu.org/devel/sml-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + so-long = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "so-long"; + ename = "so-long"; + version = "1.1.2.0.20240102.22814"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/so-long-1.1.2.0.20240102.22814.tar"; + sha256 = "0fq1c34jlp9jc3zz4rrf9zz6mww0ydm3lh0zrfy3qgssj248ghmy"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/so-long.html"; + license = lib.licenses.free; + }; + } + ) { }; + soap-client = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "soap-client"; + ename = "soap-client"; + version = "3.2.3.0.20240102.22814"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/soap-client-3.2.3.0.20240102.22814.tar"; + sha256 = "084svzsb2rrqxvb76qxnwdj64kn364dqgbgdpymqngihngyr88fb"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.gnu.org/devel/soap-client.html"; + license = lib.licenses.free; + }; + } + ) { }; + sokoban = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "sokoban"; + ename = "sokoban"; + version = "1.4.9.0.20220928.185052"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/sokoban-1.4.9.0.20220928.185052.tar"; + sha256 = "1d3s1v81mvfjcq5bbf0338ldxgl2rymqb3vqqw7drbics4jq5fc0"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.gnu.org/devel/sokoban.html"; + license = lib.licenses.free; + }; + } + ) { }; + sotlisp = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "sotlisp"; + ename = "sotlisp"; + version = "1.6.2.0.20220909.50328"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/sotlisp-1.6.2.0.20220909.50328.tar"; + sha256 = "1g48ahiwdipk4ckynqipsfradd1qafg59s10jkbpkp3wvfmxi5sf"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/sotlisp.html"; + license = lib.licenses.free; + }; + } + ) { }; + spacious-padding = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "spacious-padding"; + ename = "spacious-padding"; + version = "0.5.0.0.20240801.94014"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/spacious-padding-0.5.0.0.20240801.94014.tar"; + sha256 = "0nv1gg30kwdcb0isp159ir03xh3l28yv11m9rznch48axwd1bjwp"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/spacious-padding.html"; + license = lib.licenses.free; + }; + } + ) { }; + spinner = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "spinner"; + ename = "spinner"; + version = "1.7.4.0.20220915.94959"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/spinner-1.7.4.0.20220915.94959.tar"; + sha256 = "1110bxj7vgai0wgsqbd9917k72xmalyfy0rlwqp46azg02ljam6j"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/spinner.html"; + license = lib.licenses.free; + }; + } + ) { }; + sql-beeline = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "sql-beeline"; + ename = "sql-beeline"; + version = "0.2.0.20221221.82329"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/sql-beeline-0.2.0.20221221.82329.tar"; + sha256 = "0qfw9q5isyjywlm2fyaazci24jza6h4s50i0zmjk35j6spyxwffs"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/sql-beeline.html"; + license = lib.licenses.free; + }; + } + ) { }; + sql-cassandra = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "sql-cassandra"; + ename = "sql-cassandra"; + version = "0.2.2.0.20221221.82336"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/sql-cassandra-0.2.2.0.20221221.82336.tar"; + sha256 = "1rl2bdjyglzssm00zdfqidd9j7jzizxaq60bclqa5dsz80zsd6aq"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/sql-cassandra.html"; + license = lib.licenses.free; + }; + } + ) { }; + sql-indent = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "sql-indent"; + ename = "sql-indent"; + version = "1.7.0.20240323.40057"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/sql-indent-1.7.0.20240323.40057.tar"; + sha256 = "0zrsglgw2zjxn9810r022kanvfj0zrhvr696yxlnvd05f9hv9bpp"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.gnu.org/devel/sql-indent.html"; + license = lib.licenses.free; + }; + } + ) { }; + sql-smie = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "sql-smie"; + ename = "sql-smie"; + version = "0.0.20221221.82351"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/sql-smie-0.0.20221221.82351.tar"; + sha256 = "05jv2k9gswwwyi19da8d5f176lb81qmnf94dvghyzh272v9iwvkr"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/sql-smie.html"; + license = lib.licenses.free; + }; + } + ) { }; + srht = callPackage ( + { + elpaBuild, + fetchurl, + lib, + plz, + transient, + }: + elpaBuild { + pname = "srht"; + ename = "srht"; + version = "0.4.0.20240506.104337"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/srht-0.4.0.20240506.104337.tar"; + sha256 = "1fs6av8l3v4vvzxxhd20rzwrwh8dkk1d1x21jkjx8nczj2jydwb0"; + }; + packageRequires = [ + plz + transient + ]; + meta = { + homepage = "https://elpa.gnu.org/devel/srht.html"; + license = lib.licenses.free; + }; + } + ) { }; + ssh-deploy = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "ssh-deploy"; + ename = "ssh-deploy"; + version = "3.1.16.0.20230702.92809"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/ssh-deploy-3.1.16.0.20230702.92809.tar"; + sha256 = "0zjkc1gb3hpknx8012crcbdy3w1w597qk8qajhpaijhjhispm507"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/ssh-deploy.html"; + license = lib.licenses.free; + }; + } + ) { }; + standard-themes = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "standard-themes"; + ename = "standard-themes"; + version = "2.1.0.0.20240811.61021"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/standard-themes-2.1.0.0.20240811.61021.tar"; + sha256 = "15p3fa8a5gqxkzkk5ldcjbzq7ja478w0w3xc4xhw4hbklzknph6n"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/standard-themes.html"; + license = lib.licenses.free; + }; + } + ) { }; + stream = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "stream"; + ename = "stream"; + version = "2.3.0.0.20230908.74447"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/stream-2.3.0.0.20230908.74447.tar"; + sha256 = "1zfw7plnlsijs8aw5726adjwd65g1x3xs4vcs3rcc2ybv8cz886s"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/stream.html"; + license = lib.licenses.free; + }; + } + ) { }; + substitute = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "substitute"; + ename = "substitute"; + version = "0.3.1.0.20240522.34122"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/substitute-0.3.1.0.20240522.34122.tar"; + sha256 = "02n78x82sl7i0xzpp1468i1bwm9kic2ycc9vvhymxalpiylc3iqq"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/substitute.html"; + license = lib.licenses.free; + }; + } + ) { }; + svg = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "svg"; + ename = "svg"; + version = "1.1.0.20240804.74716"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/svg-1.1.0.20240804.74716.tar"; + sha256 = "1jgcs5x5rq4bd1ac2kyh9ylid9wp9c4sijxd1zch0yi2z67x8z62"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/svg.html"; + license = lib.licenses.free; + }; + } + ) { }; + svg-clock = callPackage ( + { + elpaBuild, + fetchurl, + lib, + svg, + }: + elpaBuild { + pname = "svg-clock"; + ename = "svg-clock"; + version = "1.2.0.20221221.82408"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/svg-clock-1.2.0.20221221.82408.tar"; + sha256 = "15fshgjqv3995f2339rwvjw9vyiqz2lfs9h80gkmssha7fdfw3qx"; + }; + packageRequires = [ svg ]; + meta = { + homepage = "https://elpa.gnu.org/devel/svg-clock.html"; + license = lib.licenses.free; + }; + } + ) { }; + svg-lib = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "svg-lib"; + ename = "svg-lib"; + version = "0.3.0.20240219.161327"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/svg-lib-0.3.0.20240219.161327.tar"; + sha256 = "1qycnhjinmn1smajsniz34kv7jkl4gycjhsl6mxxjhq0432cw2fc"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/svg-lib.html"; + license = lib.licenses.free; + }; + } + ) { }; + svg-tag-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + svg-lib, + }: + elpaBuild { + pname = "svg-tag-mode"; + ename = "svg-tag-mode"; + version = "0.3.2.0.20240624.85758"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/svg-tag-mode-0.3.2.0.20240624.85758.tar"; + sha256 = "01hhdvbsrdbmaspdl1vbpsa1rxc5qxc5rhqi8yhgb711wcwghgln"; + }; + packageRequires = [ svg-lib ]; + meta = { + homepage = "https://elpa.gnu.org/devel/svg-tag-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + swiper = callPackage ( + { + elpaBuild, + fetchurl, + ivy, + lib, + }: + elpaBuild { + pname = "swiper"; + ename = "swiper"; + version = "0.14.2.0.20240520.120545"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/swiper-0.14.2.0.20240520.120545.tar"; + sha256 = "1wcxf1d3kn19yq3gk4d4fqs7p61i1rm316glzlcksny6rp2f1sma"; + }; + packageRequires = [ ivy ]; + meta = { + homepage = "https://elpa.gnu.org/devel/swiper.html"; + license = lib.licenses.free; + }; + } + ) { }; + switchy-window = callPackage ( + { + compat, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "switchy-window"; + ename = "switchy-window"; + version = "1.3.0.20230411.180529"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/switchy-window-1.3.0.20230411.180529.tar"; + sha256 = "1h3jib0qr8wj3xk3qha5yrw2vqhidnqhj4jhw2smrfk61vyfs83b"; + }; + packageRequires = [ compat ]; + meta = { + homepage = "https://elpa.gnu.org/devel/switchy-window.html"; + license = lib.licenses.free; + }; + } + ) { }; + sxhkdrc-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "sxhkdrc-mode"; + ename = "sxhkdrc-mode"; + version = "1.0.0.0.20240117.30132"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/sxhkdrc-mode-1.0.0.0.20240117.30132.tar"; + sha256 = "0sbp6n6j7m0q4gj2x02q2f7ncwsji5jgy6d113n6qfain5ffj0fs"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/sxhkdrc-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + system-packages = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "system-packages"; + ename = "system-packages"; + version = "1.0.13.0.20230908.453"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/system-packages-1.0.13.0.20230908.453.tar"; + sha256 = "0qh4z6sik94hkms5nfharx2y8np2a1a2r9yrf8lw6xihdnd7bfcv"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/system-packages.html"; + license = lib.licenses.free; + }; + } + ) { }; + systemd = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "systemd"; + ename = "systemd"; + version = "0.0.20221221.82418"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/systemd-0.0.20221221.82418.tar"; + sha256 = "1ir3y4w2x1cl24zy66yym5rlpffgrcs10x4sxhb2sgg5k4d88scn"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.gnu.org/devel/systemd.html"; + license = lib.licenses.free; + }; + } + ) { }; + tNFA = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + queue, + }: + elpaBuild { + pname = "tNFA"; + ename = "tNFA"; + version = "0.1.1.0.20240405.140856"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/tNFA-0.1.1.0.20240405.140856.tar"; + sha256 = "0m2lh50bz56j5gdpjvan0sksgnlb3cszb28q69xni88hajacn4aw"; + }; + packageRequires = [ + cl-lib + queue + ]; + meta = { + homepage = "https://elpa.gnu.org/devel/tNFA.html"; + license = lib.licenses.free; + }; + } + ) { }; + tam = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "tam"; + ename = "tam"; + version = "0.1.0.20230920.103516"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/tam-0.1.0.20230920.103516.tar"; + sha256 = "01w1vwb1ajmbk90c79wc0dc367sy5b5qdf471zr0xinajfv47709"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/tam.html"; + license = lib.licenses.free; + }; + } + ) { }; + taxy = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "taxy"; + ename = "taxy"; + version = "0.10.2.0.20240816.184044"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/taxy-0.10.2.0.20240816.184044.tar"; + sha256 = "1qsy9j5si9kkhv7vssc7cg8iypizgzfckb5bpvas0cxiv7ibfqv6"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/taxy.html"; + license = lib.licenses.free; + }; + } + ) { }; + taxy-magit-section = callPackage ( + { + elpaBuild, + fetchurl, + lib, + magit-section, + taxy, + }: + elpaBuild { + pname = "taxy-magit-section"; + ename = "taxy-magit-section"; + version = "0.14.0.20240816.184417"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/taxy-magit-section-0.14.0.20240816.184417.tar"; + sha256 = "1r1akz148a9sbqcsycc8i5vdifxsamcy8qhrlq0s8fj39qcdj39m"; + }; + packageRequires = [ + magit-section + taxy + ]; + meta = { + homepage = "https://elpa.gnu.org/devel/taxy-magit-section.html"; + license = lib.licenses.free; + }; + } + ) { }; + temp-buffer-browse = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "temp-buffer-browse"; + ename = "temp-buffer-browse"; + version = "1.5.0.20160804.124501"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/temp-buffer-browse-1.5.0.20160804.124501.tar"; + sha256 = "0jw3fjbnbbrsz54hmg4rhcwrl0ag7h6873n2kdph3gjds29d8jxp"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/temp-buffer-browse.html"; + license = lib.licenses.free; + }; + } + ) { }; + tempel = callPackage ( + { + compat, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "tempel"; + ename = "tempel"; + version = "1.2.0.20240723.220630"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/tempel-1.2.0.20240723.220630.tar"; + sha256 = "0a5z3lw4lf6swanvs22z2wpayclmk573gb6r9v93xwj3941dwgnk"; + }; + packageRequires = [ compat ]; + meta = { + homepage = "https://elpa.gnu.org/devel/tempel.html"; + license = lib.licenses.free; + }; + } + ) { }; + test-simple = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "test-simple"; + ename = "test-simple"; + version = "1.3.0.0.20230916.123447"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/test-simple-1.3.0.0.20230916.123447.tar"; + sha256 = "1xbf63qg17va0qwq2mkg12jg1fk6wwrs43jjzxxccx28h6d205il"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.gnu.org/devel/test-simple.html"; + license = lib.licenses.free; + }; + } + ) { }; + tex-item = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "tex-item"; + ename = "tex-item"; + version = "0.1.0.20240617.174820"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/tex-item-0.1.0.20240617.174820.tar"; + sha256 = "17b95npakxjzc03qrsxla5jhdzhq0clwdrx57f9ck94a0fnpji3x"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/tex-item.html"; + license = lib.licenses.free; + }; + } + ) { }; + tex-parens = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "tex-parens"; + ename = "tex-parens"; + version = "0.4.0.20240630.70456"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/tex-parens-0.4.0.20240630.70456.tar"; + sha256 = "0rz6qmmmfajndq3irvrfvmjp1l3j0cfkz5fp36nabyrpj0v8g821"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/tex-parens.html"; + license = lib.licenses.free; + }; + } + ) { }; + theme-buffet = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "theme-buffet"; + ename = "theme-buffet"; + version = "0.1.2.0.20240105.165329"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/theme-buffet-0.1.2.0.20240105.165329.tar"; + sha256 = "1p1vmyl2cdm6vk45884jhrxjgd53mdch4wfkd1hx269v76zl58pa"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/theme-buffet.html"; + license = lib.licenses.free; + }; + } + ) { }; + timerfunctions = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "timerfunctions"; + ename = "timerfunctions"; + version = "1.4.2.0.20221221.82440"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/timerfunctions-1.4.2.0.20221221.82440.tar"; + sha256 = "08spli0dfi882wrjcxjgk3zl4g4b5rlrvpyjmkgkzq6ix5z7w80j"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.gnu.org/devel/timerfunctions.html"; + license = lib.licenses.free; + }; + } + ) { }; + tiny = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "tiny"; + ename = "tiny"; + version = "0.2.1.0.20220910.192941"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/tiny-0.2.1.0.20220910.192941.tar"; + sha256 = "04ybgq2ppzjpindwgypsp4sb0hmzq5k7sg9niyp18dxkj0nv1l7n"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/tiny.html"; + license = lib.licenses.free; + }; + } + ) { }; + tmr = callPackage ( + { + compat, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "tmr"; + ename = "tmr"; + version = "0.4.0.0.20240117.30342"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/tmr-0.4.0.0.20240117.30342.tar"; + sha256 = "0sxxc9q97b64rl4kcp0zimlvsvxmdr447vmf8a9f74pddg1djvbw"; + }; + packageRequires = [ compat ]; + meta = { + homepage = "https://elpa.gnu.org/devel/tmr.html"; + license = lib.licenses.free; + }; + } + ) { }; + tomelr = callPackage ( + { + elpaBuild, + fetchurl, + lib, + map, + seq, + }: + elpaBuild { + pname = "tomelr"; + ename = "tomelr"; + version = "0.4.3.0.20220511.213722"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/tomelr-0.4.3.0.20220511.213722.tar"; + sha256 = "0vjhbz8lfhk84kgm8vd9lfn9qx60g40j7n3kx7iadk0p4842fpaa"; + }; + packageRequires = [ + map + seq + ]; + meta = { + homepage = "https://elpa.gnu.org/devel/tomelr.html"; + license = lib.licenses.free; + }; + } + ) { }; + topspace = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "topspace"; + ename = "topspace"; + version = "0.3.1.0.20230106.94110"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/topspace-0.3.1.0.20230106.94110.tar"; + sha256 = "179k6d4v4lw66gpb2lmf1zcz6ww1fr3ys0x992wd1r7mvlc070s8"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/topspace.html"; + license = lib.licenses.free; + }; + } + ) { }; + track-changes = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "track-changes"; + ename = "track-changes"; + version = "1.2.0.20240604.221628"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/track-changes-1.2.0.20240604.221628.tar"; + sha256 = "1pkpifyfmll01n5jiq6819l6xxr05p4v9sw4a7ij49rm2lvdkanf"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/track-changes.html"; + license = lib.licenses.free; + }; + } + ) { }; + tramp = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "tramp"; + ename = "tramp"; + version = "2.7.1.1.0.20240730.150621"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/tramp-2.7.1.1.0.20240730.150621.tar"; + sha256 = "13abfs3a483ird3gwc49ixbxdwmayrlqnh349wm0j1hlmbciqczh"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/tramp.html"; + license = lib.licenses.free; + }; + } + ) { }; + tramp-nspawn = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "tramp-nspawn"; + ename = "tramp-nspawn"; + version = "1.0.1.0.20220923.120957"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/tramp-nspawn-1.0.1.0.20220923.120957.tar"; + sha256 = "0mpr7d5vgfwsafbmj8lqc1k563b7qnjz1zq73rl8rb2km5jxczhn"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/tramp-nspawn.html"; + license = lib.licenses.free; + }; + } + ) { }; + tramp-theme = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "tramp-theme"; + ename = "tramp-theme"; + version = "0.2.0.20221221.82451"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/tramp-theme-0.2.0.20221221.82451.tar"; + sha256 = "0x7wa17f2pnhd6nv7p2m5pafqqgpfp9n773qcmyxkawi4l5bp5d3"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/tramp-theme.html"; + license = lib.licenses.free; + }; + } + ) { }; + transcribe = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "transcribe"; + ename = "transcribe"; + version = "1.5.2.0.20221221.82457"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/transcribe-1.5.2.0.20221221.82457.tar"; + sha256 = "12xw9vxzqfr3pis49apdzc5bg0n30wfx0xa9kycdbcpda88f3z6h"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/transcribe.html"; + license = lib.licenses.free; + }; + } + ) { }; + transient = callPackage ( + { + compat, + elpaBuild, + fetchurl, + lib, + seq, + }: + elpaBuild { + pname = "transient"; + ename = "transient"; + version = "0.7.4.0.20240805.123130"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/transient-0.7.4.0.20240805.123130.tar"; + sha256 = "1bm1kv7n24bzixa2gmb6km2iacqag4l8kwrcxdf09yxwisg0a3zf"; + }; + packageRequires = [ + compat + seq + ]; + meta = { + homepage = "https://elpa.gnu.org/devel/transient.html"; + license = lib.licenses.free; + }; + } + ) { }; + transient-cycles = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "transient-cycles"; + ename = "transient-cycles"; + version = "1.0.0.20220410.130412"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/transient-cycles-1.0.0.20220410.130412.tar"; + sha256 = "1rmgmlbjig866gr5jr89mv8ikvpf0p0pcgpa236nmiw3j6jsywa8"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/transient-cycles.html"; + license = lib.licenses.free; + }; + } + ) { }; + tree-inspector = callPackage ( + { + elpaBuild, + fetchurl, + lib, + treeview, + }: + elpaBuild { + pname = "tree-inspector"; + ename = "tree-inspector"; + version = "0.4.0.20240322.113138"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/tree-inspector-0.4.0.20240322.113138.tar"; + sha256 = "15k30zdbr8cr88z00dn2jfnybrhkmp769pc361v9n4mdgapwmiap"; + }; + packageRequires = [ treeview ]; + meta = { + homepage = "https://elpa.gnu.org/devel/tree-inspector.html"; + license = lib.licenses.free; + }; + } + ) { }; + trie = callPackage ( + { + elpaBuild, + fetchurl, + heap, + lib, + tNFA, + }: + elpaBuild { + pname = "trie"; + ename = "trie"; + version = "0.6.0.20231015.13107"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/trie-0.6.0.20231015.13107.tar"; + sha256 = "0kwz7b7y90yq676r09h4w0wbrm61030sw6mqhrcq9130s107lbkx"; + }; + packageRequires = [ + heap + tNFA + ]; + meta = { + homepage = "https://elpa.gnu.org/devel/trie.html"; + license = lib.licenses.free; + }; + } + ) { }; + triples = callPackage ( + { + elpaBuild, + fetchurl, + lib, + seq, + }: + elpaBuild { + pname = "triples"; + ename = "triples"; + version = "0.3.5.0.20240201.233852"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/triples-0.3.5.0.20240201.233852.tar"; + sha256 = "1hw0pgd87cack1ya76bckwjbxxyr4fd8gkp5ngkvjl8l8yhvvrpi"; + }; + packageRequires = [ seq ]; + meta = { + homepage = "https://elpa.gnu.org/devel/triples.html"; + license = lib.licenses.free; + }; + } + ) { }; + typo = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "typo"; + ename = "typo"; + version = "1.0.1.0.20230730.150555"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/typo-1.0.1.0.20230730.150555.tar"; + sha256 = "0cjn2lh0949kc6c9fxknzg2fyb4p3iwic2a9md5yxpdl42j24fvw"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/typo.html"; + license = lib.licenses.free; + }; + } + ) { }; + ulisp-repl = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "ulisp-repl"; + ename = "ulisp-repl"; + version = "1.0.3.0.20230604.111559"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/ulisp-repl-1.0.3.0.20230604.111559.tar"; + sha256 = "0b6yvlwikgkkfqklrhbcs0p6y349b6700x78n77xf0kkgv7mca1i"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/ulisp-repl.html"; + license = lib.licenses.free; + }; + } + ) { }; + undo-tree = callPackage ( + { + elpaBuild, + fetchurl, + lib, + queue, + }: + elpaBuild { + pname = "undo-tree"; + ename = "undo-tree"; + version = "0.8.2.0.20220312.180415"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/undo-tree-0.8.2.0.20220312.180415.tar"; + sha256 = "1gm5108p4qv7v4dqpxkd3zb2h5w8nsz0xjbxzxpkvykqp982g030"; + }; + packageRequires = [ queue ]; + meta = { + homepage = "https://elpa.gnu.org/devel/undo-tree.html"; + license = lib.licenses.free; + }; + } + ) { }; + uni-confusables = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "uni-confusables"; + ename = "uni-confusables"; + version = "0.3.0.20221212.230830"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/uni-confusables-0.3.0.20221212.230830.tar"; + sha256 = "15kc12zih2d6lazcqgiaq9jc5zgznnhaywh7ibflwc6siqvwxzvg"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/uni-confusables.html"; + license = lib.licenses.free; + }; + } + ) { }; + uniquify-files = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "uniquify-files"; + ename = "uniquify-files"; + version = "1.0.4.0.20221221.82507"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/uniquify-files-1.0.4.0.20221221.82507.tar"; + sha256 = "0zn7z3y7f7hw4144ssa398455091qrg238wp9fr53l2rxpdkdkwf"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/uniquify-files.html"; + license = lib.licenses.free; + }; + } + ) { }; + urgrep = callPackage ( + { + compat, + elpaBuild, + fetchurl, + lib, + project, + }: + elpaBuild { + pname = "urgrep"; + ename = "urgrep"; + version = "0.5.1snapshot0.20240729.214836"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/urgrep-0.5.1snapshot0.20240729.214836.tar"; + sha256 = "008kdywxj0zpgiqbjcngs8kbj4az2liisblkcc2cifhj31427cyd"; + }; + packageRequires = [ + compat + project + ]; + meta = { + homepage = "https://elpa.gnu.org/devel/urgrep.html"; + license = lib.licenses.free; + }; + } + ) { }; + url-http-ntlm = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + nadvice, + ntlm ? null, + }: + elpaBuild { + pname = "url-http-ntlm"; + ename = "url-http-ntlm"; + version = "2.0.5.0.20231024.31412"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/url-http-ntlm-2.0.5.0.20231024.31412.tar"; + sha256 = "1crjiq72fcpzw4nlrm8nh3q2llvxc7bgjqq6vr6ma055d0m6xrsd"; + }; + packageRequires = [ + cl-lib + nadvice + ntlm + ]; + meta = { + homepage = "https://elpa.gnu.org/devel/url-http-ntlm.html"; + license = lib.licenses.free; + }; + } + ) { }; + url-http-oauth = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "url-http-oauth"; + ename = "url-http-oauth"; + version = "0.8.3.0.20230510.175959"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/url-http-oauth-0.8.3.0.20230510.175959.tar"; + sha256 = "00shj8zvjvdy7gh29sx08m3cn9lyivjlzmzll0i2zy9389i1l360"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/url-http-oauth.html"; + license = lib.licenses.free; + }; + } + ) { }; + url-scgi = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "url-scgi"; + ename = "url-scgi"; + version = "0.9.0.20231222.161107"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/url-scgi-0.9.0.20231222.161107.tar"; + sha256 = "1dgi0r0igwsk3mx6b7mvd6xz7dmb545g2394s0wh9kkjhlkyd5b3"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/url-scgi.html"; + license = lib.licenses.free; + }; + } + ) { }; + use-package = callPackage ( + { + bind-key, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "use-package"; + ename = "use-package"; + version = "2.4.5.0.20240804.85212"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/use-package-2.4.5.0.20240804.85212.tar"; + sha256 = "1i1vm2vsc9wa25lxyrfaizrnj47l5cbfaxaan3n6rc7i88zw62bx"; + }; + packageRequires = [ bind-key ]; + meta = { + homepage = "https://elpa.gnu.org/devel/use-package.html"; + license = lib.licenses.free; + }; + } + ) { }; + validate = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + seq, + }: + elpaBuild { + pname = "validate"; + ename = "validate"; + version = "1.0.4.0.20180215.204244"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/validate-1.0.4.0.20180215.204244.tar"; + sha256 = "1hayzx6x2xqfzg84ik5n5x84ixmwc0kc8h7f0796d4rfiljl4y3c"; + }; + packageRequires = [ + cl-lib + seq + ]; + meta = { + homepage = "https://elpa.gnu.org/devel/validate.html"; + license = lib.licenses.free; + }; + } + ) { }; + valign = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "valign"; + ename = "valign"; + version = "3.1.1.0.20210501.211155"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/valign-3.1.1.0.20210501.211155.tar"; + sha256 = "1w5by0y4552c2qlm708b3523fp9sgizd0zxrwk2k1v6qwh04pa67"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/valign.html"; + license = lib.licenses.free; + }; + } + ) { }; + vc-backup = callPackage ( + { + compat, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "vc-backup"; + ename = "vc-backup"; + version = "1.1.0.0.20220825.144758"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/vc-backup-1.1.0.0.20220825.144758.tar"; + sha256 = "1jd3mv5467vy3ddrrhsv6nwsmyksqls5zhnb8hjb6imrhsylprbv"; + }; + packageRequires = [ compat ]; + meta = { + homepage = "https://elpa.gnu.org/devel/vc-backup.html"; + license = lib.licenses.free; + }; + } + ) { }; + vc-got = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "vc-got"; + ename = "vc-got"; + version = "1.2.0.20230129.104658"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/vc-got-1.2.0.20230129.104658.tar"; + sha256 = "0dwigmr1rm8a80ngx25jrqlgnbdj51db6avmyg3v7avhkyg5x455"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/vc-got.html"; + license = lib.licenses.free; + }; + } + ) { }; + vc-hgcmd = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "vc-hgcmd"; + ename = "vc-hgcmd"; + version = "1.14.1.0.20230605.161947"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/vc-hgcmd-1.14.1.0.20230605.161947.tar"; + sha256 = "1qrrbr7qgbsc00mrbslaa0k6n3dnighw5dq3mx1hlgz0flm623gi"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/vc-hgcmd.html"; + license = lib.licenses.free; + }; + } + ) { }; + vcard = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "vcard"; + ename = "vcard"; + version = "0.2.2.0.20230718.145809"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/vcard-0.2.2.0.20230718.145809.tar"; + sha256 = "14rc6glk0wyfjymiv2h5db0cxpl7j8i7h3xlm5bhvgiab00vhk6x"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/vcard.html"; + license = lib.licenses.free; + }; + } + ) { }; + vcl-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "vcl-mode"; + ename = "vcl-mode"; + version = "1.1.0.20201127.191542"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/vcl-mode-1.1.0.20201127.191542.tar"; + sha256 = "1fjf37s5yfivjbagw7m83y7z5i3dfzqnhcaga7r092v9jvkabw51"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/vcl-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + vdiff = callPackage ( + { + elpaBuild, + fetchurl, + hydra, + lib, + }: + elpaBuild { + pname = "vdiff"; + ename = "vdiff"; + version = "0.2.4.0.20230620.220116"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/vdiff-0.2.4.0.20230620.220116.tar"; + sha256 = "1974s441i7hvz6jly2xzndrfpp94nidhkb6gjgfk9f5lml1z17n1"; + }; + packageRequires = [ hydra ]; + meta = { + homepage = "https://elpa.gnu.org/devel/vdiff.html"; + license = lib.licenses.free; + }; + } + ) { }; + verilog-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "verilog-mode"; + ename = "verilog-mode"; + version = "2024.3.1.121933719.0.20240707.154630"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/verilog-mode-2024.3.1.121933719.0.20240707.154630.tar"; + sha256 = "1sh1piff0jiahn7w9i607l6j28g74ysylr3n7xrp59nh07y2br6b"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/verilog-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + vertico = callPackage ( + { + compat, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "vertico"; + ename = "vertico"; + version = "1.9.0.20240726.213105"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/vertico-1.9.0.20240726.213105.tar"; + sha256 = "1gdmn8xs5d4mma8q8zvvnqvzdblxcv2xyc3lbkjw1rjjqg5xzj2i"; + }; + packageRequires = [ compat ]; + meta = { + homepage = "https://elpa.gnu.org/devel/vertico.html"; + license = lib.licenses.free; + }; + } + ) { }; + vertico-posframe = callPackage ( + { + elpaBuild, + fetchurl, + lib, + posframe, + vertico, + }: + elpaBuild { + pname = "vertico-posframe"; + ename = "vertico-posframe"; + version = "0.7.7.0.20240202.84736"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/vertico-posframe-0.7.7.0.20240202.84736.tar"; + sha256 = "02kwhyhvcjpnq5wskhydjf0v2qbk4dfp8x4nvsxfh31jfvxqvn8k"; + }; + packageRequires = [ + posframe + vertico + ]; + meta = { + homepage = "https://elpa.gnu.org/devel/vertico-posframe.html"; + license = lib.licenses.free; + }; + } + ) { }; + vigenere = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "vigenere"; + ename = "vigenere"; + version = "1.0.0.20221221.82600"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/vigenere-1.0.0.20221221.82600.tar"; + sha256 = "03zkmvx6cs5s0plbafb40pxs0rqx1vz12ql03zlx21h0zwgynqwf"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/vigenere.html"; + license = lib.licenses.free; + }; + } + ) { }; + visual-filename-abbrev = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "visual-filename-abbrev"; + ename = "visual-filename-abbrev"; + version = "1.3.0.20240721.74720"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/visual-filename-abbrev-1.3.0.20240721.74720.tar"; + sha256 = "06pl6cn2lrxjvhdjmcw0lf7hh1p4lhii86imxa2cqiciyysfxm9c"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/visual-filename-abbrev.html"; + license = lib.licenses.free; + }; + } + ) { }; + visual-fill = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "visual-fill"; + ename = "visual-fill"; + version = "0.2.0.20240424.95324"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/visual-fill-0.2.0.20240424.95324.tar"; + sha256 = "1vgfa29gl4rh6gx08r1imlabznrlmx21p41ns62w9lxi6y8hzf8y"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/visual-fill.html"; + license = lib.licenses.free; + }; + } + ) { }; + vlf = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "vlf"; + ename = "vlf"; + version = "1.7.2.0.20231016.224412"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/vlf-1.7.2.0.20231016.224412.tar"; + sha256 = "1smcw9x38cl7pnxdzy8ycx6g80yb5k0qd7x1520wzbp1g31dsar1"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/vlf.html"; + license = lib.licenses.free; + }; + } + ) { }; + vundo = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "vundo"; + ename = "vundo"; + version = "2.3.0.0.20240425.211317"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/vundo-2.3.0.0.20240425.211317.tar"; + sha256 = "0dif9f3s3igpfi0r4dgzy14g8m6xf1g6lqyc0gfzf40n301iw4kz"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/vundo.html"; + license = lib.licenses.free; + }; + } + ) { }; + wcheck-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "wcheck-mode"; + ename = "wcheck-mode"; + version = "2021.0.20220101.81620"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/wcheck-mode-2021.0.20220101.81620.tar"; + sha256 = "15785pi3fgfdi3adsa4lhsbdqw6bnfcm44apxpfixqfx56d3xh8m"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/wcheck-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + wconf = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "wconf"; + ename = "wconf"; + version = "0.2.1.0.20201202.220257"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/wconf-0.2.1.0.20201202.220257.tar"; + sha256 = "0nnf2jak4hjzj2m2v44ymnyvsgiyzz49nnz48j3cpiw7vpb79ibh"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/wconf.html"; + license = lib.licenses.free; + }; + } + ) { }; + web-server = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "web-server"; + ename = "web-server"; + version = "0.1.2.0.20210811.22503"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/web-server-0.1.2.0.20210811.22503.tar"; + sha256 = "1d2ij23gswvg41xgdg51m2prqn1f9lcwb2rb9rh3s9p6skj14y9b"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.gnu.org/devel/web-server.html"; + license = lib.licenses.free; + }; + } + ) { }; + webfeeder = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "webfeeder"; + ename = "webfeeder"; + version = "1.1.2.0.20210605.74155"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/webfeeder-1.1.2.0.20210605.74155.tar"; + sha256 = "1xcaycimshijmyq071i5qch3idjfl3g4sws9ig97a9hx3m5wfi53"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/webfeeder.html"; + license = lib.licenses.free; + }; + } + ) { }; + websocket = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "websocket"; + ename = "websocket"; + version = "1.15.0.20230808.230535"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/websocket-1.15.0.20230808.230535.tar"; + sha256 = "15xry8bv9vcc470j3an5ks9z2hg7ia4nl7x4xvqb77rpbkq53rb9"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.gnu.org/devel/websocket.html"; + license = lib.licenses.free; + }; + } + ) { }; + which-key = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "which-key"; + ename = "which-key"; + version = "3.6.1.0.20240727.42753"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/which-key-3.6.1.0.20240727.42753.tar"; + sha256 = "1db4g0yhin44lxl4hpzsnn68f8hik705a89dgq20jiyihdji5ldq"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/which-key.html"; + license = lib.licenses.free; + }; + } + ) { }; + window-commander = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "window-commander"; + ename = "window-commander"; + version = "3.0.2.0.20240314.125442"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/window-commander-3.0.2.0.20240314.125442.tar"; + sha256 = "082fwi8basfddwvi5yjgvdbf0f7xh58kmbvshnpim143pyxzgi9q"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/window-commander.html"; + license = lib.licenses.free; + }; + } + ) { }; + window-tool-bar = callPackage ( + { + compat, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "window-tool-bar"; + ename = "window-tool-bar"; + version = "0.2.1.0.20240609.122134"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/window-tool-bar-0.2.1.0.20240609.122134.tar"; + sha256 = "1xfwirfdy69c349052jx31c3ib708mwl68458lj8dar5y2cqwk0q"; + }; + packageRequires = [ compat ]; + meta = { + homepage = "https://elpa.gnu.org/devel/window-tool-bar.html"; + license = lib.licenses.free; + }; + } + ) { }; + windower = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "windower"; + ename = "windower"; + version = "0.0.1.0.20200212.91532"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/windower-0.0.1.0.20200212.91532.tar"; + sha256 = "1s9kq9256x8chayqfcczxfcdb67pk6752xg7v6ixb9f3ad590ls2"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/windower.html"; + license = lib.licenses.free; + }; + } + ) { }; + windresize = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "windresize"; + ename = "windresize"; + version = "0.1.0.20221221.82616"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/windresize-0.1.0.20221221.82616.tar"; + sha256 = "0hgfyhz3jx4yhxspvh8zb4s852j8iwijrg7d4madr1p9rm2g3pjq"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/windresize.html"; + license = lib.licenses.free; + }; + } + ) { }; + wisi = callPackage ( + { + elpaBuild, + fetchurl, + lib, + seq, + }: + elpaBuild { + pname = "wisi"; + ename = "wisi"; + version = "4.3.2.0.20240313.173240"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/wisi-4.3.2.0.20240313.173240.tar"; + sha256 = "01i5r77ndxy76gby6v4j25w4pf6kmqaxagya29b9gnrnw07m8n5b"; + }; + packageRequires = [ seq ]; + meta = { + homepage = "https://elpa.gnu.org/devel/wisi.html"; + license = lib.licenses.free; + }; + } + ) { }; + wisitoken-grammar-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + mmm-mode, + wisi, + }: + elpaBuild { + pname = "wisitoken-grammar-mode"; + ename = "wisitoken-grammar-mode"; + version = "1.3.0.0.20231023.83923"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/wisitoken-grammar-mode-1.3.0.0.20231023.83923.tar"; + sha256 = "0ai5s1sgy0wk8hc84w7da65p30ldk514n2h6hqa71f9ia5jbd0j8"; + }; + packageRequires = [ + mmm-mode + wisi + ]; + meta = { + homepage = "https://elpa.gnu.org/devel/wisitoken-grammar-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + wpuzzle = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "wpuzzle"; + ename = "wpuzzle"; + version = "1.1.0.20221221.82918"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/wpuzzle-1.1.0.20221221.82918.tar"; + sha256 = "0ky8n0xjxsw4a684g3l8imbrfsvbc9nq1i8gi1y384qjvvjqxaxv"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/wpuzzle.html"; + license = lib.licenses.free; + }; + } + ) { }; + wrap-search = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "wrap-search"; + ename = "wrap-search"; + version = "4.16.19.0.20240813.40618"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/wrap-search-4.16.19.0.20240813.40618.tar"; + sha256 = "1g8c6wdwb6clrqy61n914ilk1bq1023dilfcqx98c37x8yi0wmm2"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/wrap-search.html"; + license = lib.licenses.free; + }; + } + ) { }; + xclip = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "xclip"; + ename = "xclip"; + version = "1.11.0.20221221.82941"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/xclip-1.11.0.20221221.82941.tar"; + sha256 = "18l69h1vg98fd35hsbbzdlhgmilyj192g9vr34kkwzj0r6bak4l2"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/xclip.html"; + license = lib.licenses.free; + }; + } + ) { }; + xeft = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "xeft"; + ename = "xeft"; + version = "3.3.0.20230913.220528"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/xeft-3.3.0.20230913.220528.tar"; + sha256 = "1zpm678nmnfs7vwirjil35nfwjkhr83f6pmn43lcdzrcz6y7nxn1"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/xeft.html"; + license = lib.licenses.free; + }; + } + ) { }; + xelb = callPackage ( + { + compat, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "xelb"; + ename = "xelb"; + version = "0.20.0.20240708.212415"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/xelb-0.20.0.20240708.212415.tar"; + sha256 = "0sv3p1q3gc9jpjvnl9pjr98kzl3i969hmqbznpby1fgdrlbinvik"; + }; + packageRequires = [ compat ]; + meta = { + homepage = "https://elpa.gnu.org/devel/xelb.html"; + license = lib.licenses.free; + }; + } + ) { }; + xpm = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + queue, + }: + elpaBuild { + pname = "xpm"; + ename = "xpm"; + version = "1.0.5.0.20230911.4618"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/xpm-1.0.5.0.20230911.4618.tar"; + sha256 = "0ymby7wqz6bmn4kcl0if0ybhafba139pgmzifvk00bh7r0s5gsz9"; + }; + packageRequires = [ + cl-lib + queue + ]; + meta = { + homepage = "https://elpa.gnu.org/devel/xpm.html"; + license = lib.licenses.free; + }; + } + ) { }; + xr = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "xr"; + ename = "xr"; + version = "2.0.0.20240802.81742"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/xr-2.0.0.20240802.81742.tar"; + sha256 = "1x93v2x8zkr3s55c8r8lpimavqzcq0zjxshg5kif84gir10jgcdn"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/xr.html"; + license = lib.licenses.free; + }; + } + ) { }; + xref = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "xref"; + ename = "xref"; + version = "1.7.0.0.20240707.154630"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/xref-1.7.0.0.20240707.154630.tar"; + sha256 = "1j9p82w2qf6lv7jl92ihlrixacgj4c271ncylvg97an3lx3fprh7"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/xref.html"; + license = lib.licenses.free; + }; + } + ) { }; + xref-union = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "xref-union"; + ename = "xref-union"; + version = "0.2.0.0.20231225.162837"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/xref-union-0.2.0.0.20231225.162837.tar"; + sha256 = "0is4r12r30drq1msa5143bgnwam1kgbf2iia30fbqv0l0rhvqd9x"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/xref-union.html"; + license = lib.licenses.free; + }; + } + ) { }; + yasnippet = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "yasnippet"; + ename = "yasnippet"; + version = "0.14.1.0.20240406.91451"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/yasnippet-0.14.1.0.20240406.91451.tar"; + sha256 = "02nkjbn2kgq2x1kbbmqygwqzrdy48nhizsy734n3gm8fnp4p5kxp"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.gnu.org/devel/yasnippet.html"; + license = lib.licenses.free; + }; + } + ) { }; + yasnippet-classic-snippets = callPackage ( + { + elpaBuild, + fetchurl, + lib, + yasnippet, + }: + elpaBuild { + pname = "yasnippet-classic-snippets"; + ename = "yasnippet-classic-snippets"; + version = "1.0.2.0.20221221.83103"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/yasnippet-classic-snippets-1.0.2.0.20221221.83103.tar"; + sha256 = "01066fmg42031naaqpy1ls8xw8k2hq02sib43smx20wdbqak6gx7"; + }; + packageRequires = [ yasnippet ]; + meta = { + homepage = "https://elpa.gnu.org/devel/yasnippet-classic-snippets.html"; + license = lib.licenses.free; + }; + } + ) { }; + zones = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "zones"; + ename = "zones"; + version = "2023.6.11.0.20231018.110342"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/zones-2023.6.11.0.20231018.110342.tar"; + sha256 = "0gyla7n7znzhxfdwb9jmxkijvidpxvqs9p68dbaiyk86daq2pxzm"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/zones.html"; + license = lib.licenses.free; + }; + } + ) { }; + ztree = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "ztree"; + ename = "ztree"; + version = "1.0.6.0.20230617.194317"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/ztree-1.0.6.0.20230617.194317.tar"; + sha256 = "1zh6qdzalvikb48dc0pk3rnk7jvknx07dkrggc259q61jdp3pj1m"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.gnu.org/devel/ztree.html"; + license = lib.licenses.free; + }; + } + ) { }; + zuul = callPackage ( + { + elpaBuild, + fetchurl, + lib, + project, + }: + elpaBuild { + pname = "zuul"; + ename = "zuul"; + version = "0.4.0.0.20230524.131806"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/zuul-0.4.0.0.20230524.131806.tar"; + sha256 = "1pvfi8dp5i6h7z35h91408pz8bsval35sd7dk02v0hr6znln0pvb"; + }; + packageRequires = [ project ]; + meta = { + homepage = "https://elpa.gnu.org/devel/zuul.html"; + license = lib.licenses.free; + }; + } + ) { }; +} diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix index 192320fab674d..5744eaa4e5a15 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix @@ -22,20 +22,13 @@ formats commits for you. */ -{ lib, stdenv, texinfo, writeText, gcc, pkgs, buildPackages }: +{ lib, pkgs, buildPackages }: self: let - markBroken = pkg: pkg.override { - elpaBuild = args: self.elpaBuild (args // { - meta = (args.meta or {}) // { broken = true; }; - }); - }; - - elpaBuild = import ../../../../build-support/emacs/elpa.nix { - inherit lib stdenv texinfo writeText gcc; - inherit (self) emacs; - }; + inherit (import ./lib-override-helper.nix pkgs) + markBroken + ; # Use custom elpa url fetcher with fallback/uncompress fetchurl = buildPackages.callPackage ./fetchelpa.nix { }; @@ -50,75 +43,16 @@ self: let }); }; - super = removeAttrs imported [ "dash" ]; - - overrides = { - eglot = super.eglot.overrideAttrs (old: { - postInstall = (old.postInstall or "") + '' - local info_file=eglot.info - pushd $out/share/emacs/site-lisp/elpa/eglot-* - # specify output info file to override the one defined in eglot.texi - makeinfo --output=$info_file eglot.texi - install-info $info_file dir - popd - ''; - }); - - org = super.org.overrideAttrs (old: { - dontUnpack = false; - patches = old.patches or [ ] ++ lib.optionals (lib.versionOlder old.version "9.7.5") [ - # security fix backported from 9.7.5 - (pkgs.fetchpatch { - url = "https://git.savannah.gnu.org/cgit/emacs/org-mode.git/patch/?id=f4cc61636947b5c2f0afc67174dd369fe3277aa8"; - hash = "sha256-bGgsnTSn6SMu1J8P2BfJjrKx2845FCsUB2okcIrEjDg="; - stripLen = 1; - }) - ]; - postPatch = old.postPatch or "" + "\n" + '' - pushd .. - local content_directory=${old.ename}-${old.version} - src=$PWD/$content_directory.tar - tar --create --verbose --file=$src $content_directory - popd - ''; - dontBuild = true; - }); - - pq = super.pq.overrideAttrs (old: { - buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.postgresql ]; - }); + super = imported; - xeft = super.xeft.overrideAttrs (old: let - libExt = pkgs.stdenv.hostPlatform.extensions.sharedLibrary; - in { - dontUnpack = false; - - buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.xapian ]; - buildPhase = (old.buildPhase or "") + '' - $CXX -shared -o xapian-lite${libExt} xapian-lite.cc $NIX_CFLAGS_COMPILE -lxapian - ''; - postInstall = (old.postInstall or "") + "\n" + '' - outd=$out/share/emacs/site-lisp/elpa/xeft-* - install -m444 -t $outd xapian-lite${libExt} - rm $outd/xapian-lite.cc $outd/emacs-module.h $outd/emacs-module-prelude.h $outd/demo.gif $outd/Makefile - ''; - }); + commonOverrides = import ./elpa-common-overrides.nix pkgs lib buildPackages; - # native compilation for tests/seq-tests.el never ends - # delete tests/seq-tests.el to workaround this - seq = super.seq.overrideAttrs (old: { - dontUnpack = false; - postUnpack = (old.postUnpack or "") + "\n" + '' - local content_directory=$(echo seq-*) - rm --verbose $content_directory/tests/seq-tests.el - src=$PWD/$content_directory.tar - tar --create --verbose --file=$src $content_directory - ''; - }); + overrides = self: super: { }; - elpaDevelPackages = super // overrides; + elpaDevelPackages = + let super' = super // (commonOverrides self super); in super' // (overrides self super'); - in elpaDevelPackages // { inherit elpaBuild; }); + in elpaDevelPackages); -in (generateElpa { }) // { __attrsFailEvaluation = true; } +in generateElpa { } diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix index b1145baf3781e..d9839c4d46e54 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix @@ -1,6780 +1,9890 @@ { callPackage }: - { - ace-window = callPackage ({ avy, elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "ace-window"; - ename = "ace-window"; - version = "0.10.0"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/ace-window-0.10.0.tar"; - sha256 = "1sdzk1hgi3axqqbxf6aq1v5j3d8bybkz40dk8zqn49xxxfmzbdv4"; - }; - packageRequires = [ avy ]; - meta = { - homepage = "https://elpa.gnu.org/packages/ace-window.html"; - license = lib.licenses.free; - }; - }) {}; - ack = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "ack"; - ename = "ack"; - version = "1.11"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/ack-1.11.tar"; - sha256 = "1ji02v3qis5sx7hpaaxksgh2jqxzzilagz6z33kjb1lds1sq4z2c"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/ack.html"; - license = lib.licenses.free; - }; - }) {}; - activities = callPackage ({ elpaBuild, emacs, fetchurl, lib, persist }: - elpaBuild { - pname = "activities"; - ename = "activities"; - version = "0.7"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/activities-0.7.tar"; - sha256 = "1775cdk9hv257m6l7icg247fc36g7lwgjg8iivj52m6qg7p7cz9g"; - }; - packageRequires = [ emacs persist ]; - meta = { - homepage = "https://elpa.gnu.org/packages/activities.html"; - license = lib.licenses.free; - }; - }) {}; - ada-mode = callPackage ({ elpaBuild - , emacs - , fetchurl - , gnat-compiler - , lib - , uniquify-files - , wisi }: - elpaBuild { - pname = "ada-mode"; - ename = "ada-mode"; - version = "8.1.0"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/ada-mode-8.1.0.tar"; - sha256 = "10k514al716qjx3qg1m4k1rnf70fa73vrmmx3pp75zrw1d0db9y6"; - }; - packageRequires = [ emacs gnat-compiler uniquify-files wisi ]; - meta = { - homepage = "https://elpa.gnu.org/packages/ada-mode.html"; - license = lib.licenses.free; - }; - }) {}; - ada-ref-man = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "ada-ref-man"; - ename = "ada-ref-man"; - version = "2020.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/ada-ref-man-2020.1.tar"; - sha256 = "0ijgl9lnmn8n3pllgh3apl2shbl38f3fxn8z5yy4q6pqqx0vr3fn"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/ada-ref-man.html"; - license = lib.licenses.free; - }; - }) {}; - adaptive-wrap = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "adaptive-wrap"; - ename = "adaptive-wrap"; - version = "0.8"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/adaptive-wrap-0.8.tar"; - sha256 = "1dz5mi21v2wqh969m3xggxbzq3qf78hps418rzl73bb57l837qp8"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/adaptive-wrap.html"; - license = lib.licenses.free; - }; - }) {}; - adjust-parens = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "adjust-parens"; - ename = "adjust-parens"; - version = "3.2"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/adjust-parens-3.2.tar"; - sha256 = "1gdlykg7ix3833s40152p1ji4r1ycp18niqjr1f994y4ydqxq8yl"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/adjust-parens.html"; - license = lib.licenses.free; - }; - }) {}; - advice-patch = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "advice-patch"; - ename = "advice-patch"; - version = "0.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/advice-patch-0.1.tar"; - sha256 = "0km891648k257k4d6hbrv6jyz9663kww8gfarvzf9lv8i4qa5scp"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/advice-patch.html"; - license = lib.licenses.free; - }; - }) {}; - aggressive-completion = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "aggressive-completion"; - ename = "aggressive-completion"; - version = "1.7"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/aggressive-completion-1.7.tar"; - sha256 = "0d388w0yjpjzhqlar9fjrxsjxma09j8as6758sswv01r084gpdbk"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/aggressive-completion.html"; - license = lib.licenses.free; - }; - }) {}; - aggressive-indent = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "aggressive-indent"; - ename = "aggressive-indent"; - version = "1.10.0"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/aggressive-indent-1.10.0.tar"; - sha256 = "1c27g9qhqc4bh96bkxdcjbrhiwi7kzki1l4yhxvyvwwarisl6c7b"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/aggressive-indent.html"; - license = lib.licenses.free; - }; - }) {}; - ahungry-theme = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "ahungry-theme"; - ename = "ahungry-theme"; - version = "1.10.0"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/ahungry-theme-1.10.0.tar"; - sha256 = "16k6wm1qss5bk45askhq5vswrqsjic5dijpkgnmwgvm8xsdlvni6"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/ahungry-theme.html"; - license = lib.licenses.free; - }; - }) {}; - aircon-theme = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "aircon-theme"; - ename = "aircon-theme"; - version = "0.0.6"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/aircon-theme-0.0.6.tar"; - sha256 = "0dcnlk3q95bcghlwj8ii40xxhspnfbqcr9mvj1v3adl1s623fyp0"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/aircon-theme.html"; - license = lib.licenses.free; - }; - }) {}; - all = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "all"; - ename = "all"; - version = "1.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/all-1.1.tar"; - sha256 = "067c5ynklw1inbjwd1l6dkbpx3vw487qv39y7mdl55a6nqx7hgk4"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/all.html"; - license = lib.licenses.free; - }; - }) {}; - altcaps = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "altcaps"; - ename = "altcaps"; - version = "1.2.0"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/altcaps-1.2.0.tar"; - sha256 = "1smqvq21jparnph03kyyzm47rv5kia6bna1m1pf8ibpkph64rykw"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/altcaps.html"; - license = lib.licenses.free; - }; - }) {}; - ampc = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "ampc"; - ename = "ampc"; - version = "0.2"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/ampc-0.2.tar"; - sha256 = "17l2c5hr7cq0vf4qc8s2adwlhqp74glc4v909h0jcavrnbn8yn80"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/ampc.html"; - license = lib.licenses.free; - }; - }) {}; - arbitools = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "arbitools"; - ename = "arbitools"; - version = "0.977"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/arbitools-0.977.tar"; - sha256 = "0s5dpprx24fxm0qk8nzm39c16ydiq97wzz3l7zi69r3l9wf31rb3"; - }; - packageRequires = [ cl-lib ]; - meta = { - homepage = "https://elpa.gnu.org/packages/arbitools.html"; - license = lib.licenses.free; - }; - }) {}; - ascii-art-to-unicode = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "ascii-art-to-unicode"; - ename = "ascii-art-to-unicode"; - version = "1.13"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/ascii-art-to-unicode-1.13.tar"; - sha256 = "0qlh8zi691gz7s1ayp1x5ga3sj3rfy79y21r6hqf696mrkgpz1d8"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/ascii-art-to-unicode.html"; - license = lib.licenses.free; - }; - }) {}; - assess = callPackage ({ elpaBuild, emacs, fetchurl, lib, m-buffer }: - elpaBuild { - pname = "assess"; - ename = "assess"; - version = "0.7"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/assess-0.7.tar"; - sha256 = "1wka2idr63bn8fgh0cz4lf21jvlhkr895y0xnh3syp9vrss5hzsp"; - }; - packageRequires = [ emacs m-buffer ]; - meta = { - homepage = "https://elpa.gnu.org/packages/assess.html"; - license = lib.licenses.free; - }; - }) {}; - async = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "async"; - ename = "async"; - version = "1.9.8"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/async-1.9.8.tar"; - sha256 = "0m9w7f8rgpcljsv2p6a9gwqx12whf66mbjranwwzacn98rwchh4v"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/async.html"; - license = lib.licenses.free; - }; - }) {}; - auctex = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "auctex"; - ename = "auctex"; - version = "14.0.5"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/auctex-14.0.5.tar"; - sha256 = "0sycj6ad5jazmsxq37hsnvbywkpj66lrw3d3mxqr1wqkb67cdd3k"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/auctex.html"; - license = lib.licenses.free; - }; - }) {}; - aumix-mode = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "aumix-mode"; - ename = "aumix-mode"; - version = "7"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/aumix-mode-7.tar"; - sha256 = "08baz31hm0nhikqg5h294kg5m4qkiayjhirhb57v57g5722jfk3m"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/aumix-mode.html"; - license = lib.licenses.free; - }; - }) {}; - auto-correct = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "auto-correct"; - ename = "auto-correct"; - version = "1.1.4"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/auto-correct-1.1.4.tar"; - sha256 = "05ky3qxbvxrkywpqj6syl7ll6za74fhjzrcia6wdmxsnjya5qbf1"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/auto-correct.html"; - license = lib.licenses.free; - }; - }) {}; - auto-header = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "auto-header"; - ename = "auto-header"; - version = "0.1.2"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/auto-header-0.1.2.tar"; - sha256 = "0p22bpdy29i7ff8rzjh1qzvj4d8igl36gs1981kmds4qz23qn447"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/auto-header.html"; - license = lib.licenses.free; - }; - }) {}; - auto-overlays = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "auto-overlays"; - ename = "auto-overlays"; - version = "0.10.10"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/auto-overlays-0.10.10.tar"; - sha256 = "0jn7lk8vzdrf0flxwwx295z0mrghd3lyspfadwz35c6kygvy8078"; - }; - packageRequires = [ cl-lib ]; - meta = { - homepage = "https://elpa.gnu.org/packages/auto-overlays.html"; - license = lib.licenses.free; - }; - }) {}; - autocrypt = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "autocrypt"; - ename = "autocrypt"; - version = "0.4.2"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/autocrypt-0.4.2.tar"; - sha256 = "0mc4vb6x7qzn29dg9m05zgli6mwh9cj4vc5n6hvarzkn9lxl6mr3"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/autocrypt.html"; - license = lib.licenses.free; - }; - }) {}; - avy = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "avy"; - ename = "avy"; - version = "0.5.0"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/avy-0.5.0.tar"; - sha256 = "1xfcml38qmrwdd0rkhwrvv2s7dbznwhk3vy9pjd6ljpg22wkb80d"; - }; - packageRequires = [ cl-lib emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/avy.html"; - license = lib.licenses.free; - }; - }) {}; - bbdb = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "bbdb"; - ename = "bbdb"; - version = "3.2.2.4"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/bbdb-3.2.2.4.tar"; - sha256 = "1ymjydf54z3rbkxk4irvan5s8lc8wdhk01691741vfznx0nsc4a2"; - }; - packageRequires = [ cl-lib emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/bbdb.html"; - license = lib.licenses.free; - }; - }) {}; - beacon = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "beacon"; - ename = "beacon"; - version = "1.3.4"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/beacon-1.3.4.tar"; - sha256 = "1hxb6vyvpppj7yzphknmh8m4a1h89lg6jr98g4d62k0laxazvdza"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/beacon.html"; - license = lib.licenses.free; - }; - }) {}; - beframe = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "beframe"; - ename = "beframe"; - version = "1.1.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/beframe-1.1.1.tar"; - sha256 = "0xx2zvgjilivi6nnr2x9bwwcifinj66j6r07wxjawqkrsknyypas"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/beframe.html"; - license = lib.licenses.free; - }; - }) {}; - bicep-ts-mode = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "bicep-ts-mode"; - ename = "bicep-ts-mode"; - version = "0.1.3"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/bicep-ts-mode-0.1.3.tar"; - sha256 = "02377gsdnfvvydjw014p2y6y74nd5zfh1ghq5l9ayq0ilvv8fmx7"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/bicep-ts-mode.html"; - license = lib.licenses.free; - }; - }) {}; - bind-key = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "bind-key"; - ename = "bind-key"; - version = "2.4.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/bind-key-2.4.1.tar"; - sha256 = "0jrbm2l6h4r7qjcdcsfczbijmbf3njzzzrymv08zanchmy7lvsv2"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/bind-key.html"; - license = lib.licenses.free; - }; - }) {}; - blist = callPackage ({ elpaBuild, emacs, fetchurl, ilist, lib }: - elpaBuild { - pname = "blist"; - ename = "blist"; - version = "0.3"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/blist-0.3.tar"; - sha256 = "1p10d9q14px19m3vajqmm71lmnbxxsc7qczgq11vhg485c20y3va"; - }; - packageRequires = [ emacs ilist ]; - meta = { - homepage = "https://elpa.gnu.org/packages/blist.html"; - license = lib.licenses.free; - }; - }) {}; - bluetooth = callPackage ({ dash, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "bluetooth"; - ename = "bluetooth"; - version = "0.3.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/bluetooth-0.3.1.tar"; - sha256 = "1yjqjm6cis6bq18li63hbhc4qzki3486xvdjkzs2gj4chc1yw1x4"; - }; - packageRequires = [ dash emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/bluetooth.html"; - license = lib.licenses.free; - }; - }) {}; - bnf-mode = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "bnf-mode"; - ename = "bnf-mode"; - version = "0.4.5"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/bnf-mode-0.4.5.tar"; - sha256 = "1x6km8rhhb5bkas3yfmjfpyxlhyxkqnzviw1pqlq88c95j88h3d4"; - }; - packageRequires = [ cl-lib emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/bnf-mode.html"; - license = lib.licenses.free; - }; - }) {}; - boxy = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "boxy"; - ename = "boxy"; - version = "1.1.4"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/boxy-1.1.4.tar"; - sha256 = "0mwj1qc626f1iaq5iaqm1f4iwyz91hzqhzfk5f53gsqka7yz2fnf"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/boxy.html"; - license = lib.licenses.free; - }; - }) {}; - boxy-headings = callPackage ({ boxy, elpaBuild, emacs, fetchurl, lib, org }: - elpaBuild { - pname = "boxy-headings"; - ename = "boxy-headings"; - version = "2.1.6"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/boxy-headings-2.1.6.tar"; - sha256 = "0wnks9a4agvqjivp9myl8zcdq6rj7hh5ig73f8qv5imar0i76izc"; - }; - packageRequires = [ boxy emacs org ]; - meta = { - homepage = "https://elpa.gnu.org/packages/boxy-headings.html"; - license = lib.licenses.free; - }; - }) {}; - breadcrumb = callPackage ({ elpaBuild, emacs, fetchurl, lib, project }: - elpaBuild { - pname = "breadcrumb"; - ename = "breadcrumb"; - version = "1.0.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/breadcrumb-1.0.1.tar"; - sha256 = "1s69a2z183mla4d4b5pcsswbwa3hjvsg1xj7r3hdw6j841b0l9dw"; - }; - packageRequires = [ emacs project ]; - meta = { - homepage = "https://elpa.gnu.org/packages/breadcrumb.html"; - license = lib.licenses.free; - }; - }) {}; - brief = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib, nadvice }: - elpaBuild { - pname = "brief"; - ename = "brief"; - version = "5.91"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/brief-5.91.tar"; - sha256 = "106xm23045l3ds5q04s7c6wa00ffv7rw495cjqp99nzqvvbmivcb"; - }; - packageRequires = [ cl-lib nadvice ]; - meta = { - homepage = "https://elpa.gnu.org/packages/brief.html"; - license = lib.licenses.free; - }; - }) {}; - buffer-env = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "buffer-env"; - ename = "buffer-env"; - version = "0.6"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/buffer-env-0.6.tar"; - sha256 = "08qaw4y1sszhh97ih13vfrm0r1nn1k410f2wwvffvncxhqgxz5lv"; - }; - packageRequires = [ compat emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/buffer-env.html"; - license = lib.licenses.free; - }; - }) {}; - buffer-expose = callPackage ({ cl-lib ? null - , elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "buffer-expose"; - ename = "buffer-expose"; - version = "0.4.3"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/buffer-expose-0.4.3.tar"; - sha256 = "1ymjjjrbknp3hdfwd8zyzfrsn5n267245ffmplm7yk2s34kgxr0n"; - }; - packageRequires = [ cl-lib emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/buffer-expose.html"; - license = lib.licenses.free; - }; - }) {}; - bufferlo = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "bufferlo"; - ename = "bufferlo"; - version = "0.8"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/bufferlo-0.8.tar"; - sha256 = "0ypd611xmjsir24nv8gr19pq7f1n0gbgq9yzvfy3m6k97gpw2jzq"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/bufferlo.html"; - license = lib.licenses.free; - }; - }) {}; - bug-hunter = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib, seq }: - elpaBuild { - pname = "bug-hunter"; - ename = "bug-hunter"; - version = "1.3.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/bug-hunter-1.3.1.tar"; - sha256 = "0cgwq8b6jglbg9ydvf80ijgbbccrks3yb9af46sdd6aqdmvdlx21"; - }; - packageRequires = [ cl-lib seq ]; - meta = { - homepage = "https://elpa.gnu.org/packages/bug-hunter.html"; - license = lib.licenses.free; - }; - }) {}; - buildbot = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "buildbot"; - ename = "buildbot"; - version = "0.0.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/buildbot-0.0.1.tar"; - sha256 = "056jakpyslizsp8sik5f7m90dpcga8y38hb5rh1yfa7k1xwcrrk2"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/buildbot.html"; - license = lib.licenses.free; - }; - }) {}; - calibre = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "calibre"; - ename = "calibre"; - version = "1.4.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/calibre-1.4.1.tar"; - sha256 = "1ak05y3cmmwpg8bijkwl97kvfxhxh9xxc74askyafc50n0jvaq87"; - }; - packageRequires = [ compat emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/calibre.html"; - license = lib.licenses.free; - }; - }) {}; - cape = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "cape"; - ename = "cape"; - version = "1.5"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/cape-1.5.tar"; - sha256 = "1kg5a2x23gmdcv8kwzmz8qjfr05r9rfzwb7cj38ambpqpppxl7ij"; - }; - packageRequires = [ compat emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/cape.html"; - license = lib.licenses.free; - }; - }) {}; - capf-autosuggest = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "capf-autosuggest"; - ename = "capf-autosuggest"; - version = "0.3"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/capf-autosuggest-0.3.tar"; - sha256 = "18cwiv227m8y1xqvsnjrzgd6f6kvvih742h8y38pphljssl109fk"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/capf-autosuggest.html"; - license = lib.licenses.free; - }; - }) {}; - caps-lock = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "caps-lock"; - ename = "caps-lock"; - version = "1.0"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/caps-lock-1.0.tar"; - sha256 = "1yy4kjc1zlpzkam0jj8h3v5h23wyv1yfvwj2drknn59d8amc1h4y"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/caps-lock.html"; - license = lib.licenses.free; - }; - }) {}; - captain = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "captain"; - ename = "captain"; - version = "1.0.3"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/captain-1.0.3.tar"; - sha256 = "0l8z8bqk705jdl7gvd2x7nhs0z6gn3swk5yzp3mnhjcfda6whz8l"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/captain.html"; - license = lib.licenses.free; - }; - }) {}; - chess = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "chess"; - ename = "chess"; - version = "2.0.5"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/chess-2.0.5.tar"; - sha256 = "0dgmp7ymjyb5pa93n05s0d4ql7wk98r9s4f9w35yahgqk9xvqclj"; - }; - packageRequires = [ cl-lib ]; - meta = { - homepage = "https://elpa.gnu.org/packages/chess.html"; - license = lib.licenses.free; - }; - }) {}; - cl-generic = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "cl-generic"; - ename = "cl-generic"; - version = "0.3"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/cl-generic-0.3.tar"; - sha256 = "0dqn484xb25ifiqd9hqdrs954c74akrf95llx23b2kzf051pqh1k"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/cl-generic.html"; - license = lib.licenses.free; - }; - }) {}; - cl-lib = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "cl-lib"; - ename = "cl-lib"; - version = "0.7.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/cl-lib-0.7.1.tar"; - sha256 = "1wpdg2zwhzxv4bkx9ldiwd16l6244wakv8yphrws4mnymkxvf2q1"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/cl-lib.html"; - license = lib.licenses.free; - }; - }) {}; - clipboard-collector = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "clipboard-collector"; - ename = "clipboard-collector"; - version = "0.3"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/clipboard-collector-0.3.tar"; - sha256 = "0v70f9pljq3jar3d1vpaj48nhrg90jzsvqcbzgv54989w8rvvcd6"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/clipboard-collector.html"; - license = lib.licenses.free; - }; - }) {}; - cobol-mode = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "cobol-mode"; - ename = "cobol-mode"; - version = "1.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/cobol-mode-1.1.tar"; - sha256 = "0aicx6vvhgn0fvikbq74vnvvwh228pxdqf52sbiffhzgb7pkbvcj"; - }; - packageRequires = [ cl-lib ]; - meta = { - homepage = "https://elpa.gnu.org/packages/cobol-mode.html"; - license = lib.licenses.free; - }; - }) {}; - code-cells = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "code-cells"; - ename = "code-cells"; - version = "0.4"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/code-cells-0.4.tar"; - sha256 = "0kxpnydxlj8pqh54c4c80jlyc6jcplf89bkh3jmm509fmyr7sf20"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/code-cells.html"; - license = lib.licenses.free; - }; - }) {}; - colorful-mode = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "colorful-mode"; - ename = "colorful-mode"; - version = "1.0.0"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/colorful-mode-1.0.0.tar"; - sha256 = "1gmbrb5z3rmw0fjrdymfbcx74szcy963dx53ksykvfd9355azj3x"; - }; - packageRequires = [ compat emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/colorful-mode.html"; - license = lib.licenses.free; - }; - }) {}; - comint-mime = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "comint-mime"; - ename = "comint-mime"; - version = "0.4"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/comint-mime-0.4.tar"; - sha256 = "13vi973p0ahpvssv5m1pb63f2wkca0lz0nw3nsj6p4s3jzp46npa"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/comint-mime.html"; - license = lib.licenses.free; - }; - }) {}; - compact-docstrings = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "compact-docstrings"; - ename = "compact-docstrings"; - version = "0.2"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/compact-docstrings-0.2.tar"; - sha256 = "00fjhfysjyqigkg0icxlqw6imzhjk5xhlxmxxs1jiafhn55dbcpj"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/compact-docstrings.html"; - license = lib.licenses.free; - }; - }) {}; - company = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "company"; - ename = "company"; - version = "0.10.2"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/company-0.10.2.tar"; - sha256 = "1708cqrcw26y8z7inm4nzbn2y8gkan5nv5bjzc4ry8zhqz94sxkz"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/company.html"; - license = lib.licenses.free; - }; - }) {}; - company-ebdb = callPackage ({ company, ebdb, elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "company-ebdb"; - ename = "company-ebdb"; - version = "1.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/company-ebdb-1.1.tar"; - sha256 = "1ym0r7y90n4d6grd4l02rxk096gsjmw9j81slig0pq1ky33rb6ks"; - }; - packageRequires = [ company ebdb ]; - meta = { - homepage = "https://elpa.gnu.org/packages/company-ebdb.html"; - license = lib.licenses.free; - }; - }) {}; - company-math = callPackage ({ company - , elpaBuild - , fetchurl - , lib - , math-symbol-lists }: - elpaBuild { - pname = "company-math"; - ename = "company-math"; - version = "1.5.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/company-math-1.5.1.tar"; - sha256 = "16ya3yscxxmz9agi0nc5pi43wkfv45lh1zd89yqfc7zcw02nsnld"; - }; - packageRequires = [ company math-symbol-lists ]; - meta = { - homepage = "https://elpa.gnu.org/packages/company-math.html"; - license = lib.licenses.free; - }; - }) {}; - company-statistics = callPackage ({ company - , elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "company-statistics"; - ename = "company-statistics"; - version = "0.2.3"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/company-statistics-0.2.3.tar"; - sha256 = "1gfwhgv7q9d3xjgaim25diyd6jfl9w3j07qrssphcrdxv0q24d14"; - }; - packageRequires = [ company emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/company-statistics.html"; - license = lib.licenses.free; - }; - }) {}; - compat = callPackage ({ elpaBuild, emacs, fetchurl, lib, seq }: - elpaBuild { - pname = "compat"; - ename = "compat"; - version = "29.1.4.5"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/compat-29.1.4.5.tar"; - sha256 = "0i57hs3ak5y0fsfdwg87ib64ny0ar1nk67f5dy2qrm8x3i0h086s"; - }; - packageRequires = [ emacs seq ]; - meta = { - homepage = "https://elpa.gnu.org/packages/compat.html"; - license = lib.licenses.free; - }; - }) {}; - consult = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "consult"; - ename = "consult"; - version = "1.6"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/consult-1.6.tar"; - sha256 = "00wsv6dvlyf7ygi586pdyhgp7f5ic2qqyqjz3g2g8hmgya5javdb"; - }; - packageRequires = [ compat emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/consult.html"; - license = lib.licenses.free; - }; - }) {}; - consult-denote = callPackage ({ consult - , denote - , elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "consult-denote"; - ename = "consult-denote"; - version = "0.0.0"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/consult-denote-0.0.0.tar"; - sha256 = "191qf8knrmimam98jv8kgrl6mfrnwpdmw160s5qw6wcik7j4z6kv"; - }; - packageRequires = [ consult denote emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/consult-denote.html"; - license = lib.licenses.free; - }; - }) {}; - consult-hoogle = callPackage ({ elpaBuild - , emacs - , fetchurl - , haskell-mode - , lib }: - elpaBuild { - pname = "consult-hoogle"; - ename = "consult-hoogle"; - version = "0.2.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/consult-hoogle-0.2.1.tar"; - sha256 = "15am29sn0qx6yn8xcmdafzh1ijph10yd65cphcax02yx782hv6pr"; - }; - packageRequires = [ emacs haskell-mode ]; - meta = { - homepage = "https://elpa.gnu.org/packages/consult-hoogle.html"; - license = lib.licenses.free; - }; - }) {}; - consult-recoll = callPackage ({ consult, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "consult-recoll"; - ename = "consult-recoll"; - version = "0.8.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/consult-recoll-0.8.1.tar"; - sha256 = "1zdmkq9cjb6kb0hf3ngm07r3mhrjal27x34i1bm7ri3089wbsp8v"; - }; - packageRequires = [ consult emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/consult-recoll.html"; - license = lib.licenses.free; - }; - }) {}; - context-coloring = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "context-coloring"; - ename = "context-coloring"; - version = "8.1.0"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/context-coloring-8.1.0.tar"; - sha256 = "0mqdl34g493pps85ckin5i3iz8kwlqkcwjvsf2sj4nldjvvfk1ng"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/context-coloring.html"; - license = lib.licenses.free; - }; - }) {}; - corfu = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "corfu"; - ename = "corfu"; - version = "1.3"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/corfu-1.3.tar"; - sha256 = "13y0dws1k4682v039ab6b0xxqlg7anknscqs20bmj8lfm2z48znx"; - }; - packageRequires = [ compat emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/corfu.html"; - license = lib.licenses.free; - }; - }) {}; - coterm = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "coterm"; - ename = "coterm"; - version = "1.6"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/coterm-1.6.tar"; - sha256 = "0kgsg99dggirz6asyppwx1ydc0jh62xd1bfhnm2hyby5qkqz1yvk"; - }; - packageRequires = [ compat emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/coterm.html"; - license = lib.licenses.free; - }; - }) {}; - counsel = callPackage ({ elpaBuild, emacs, fetchurl, ivy, lib, swiper }: - elpaBuild { - pname = "counsel"; - ename = "counsel"; - version = "0.14.2"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/counsel-0.14.2.tar"; - sha256 = "10jajfl2vhqj2awy991kqrf1hcsj8nkvn760cbxjsm2lhzvqqhj3"; - }; - packageRequires = [ emacs ivy swiper ]; - meta = { - homepage = "https://elpa.gnu.org/packages/counsel.html"; - license = lib.licenses.free; - }; - }) {}; - cpio-mode = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "cpio-mode"; - ename = "cpio-mode"; - version = "0.17"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/cpio-mode-0.17.tar"; - sha256 = "13jay5c36svq2r78gwp7d1slpkkzrx749q28554mxd855fr6pvaj"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/cpio-mode.html"; - license = lib.licenses.free; - }; - }) {}; - cpupower = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "cpupower"; - ename = "cpupower"; - version = "1.0.5"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/cpupower-1.0.5.tar"; - sha256 = "155fhf38p95a5ws6jzpczw0z03zwbsqzdwj50v3grjivyp74pddz"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/cpupower.html"; - license = lib.licenses.free; - }; - }) {}; - crdt = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "crdt"; - ename = "crdt"; - version = "0.3.5"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/crdt-0.3.5.tar"; - sha256 = "038qivbw02h1i98ym0fwx72x05gm0j4h93a54v1l7g25drm5zm83"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/crdt.html"; - license = lib.licenses.free; - }; - }) {}; - crisp = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "crisp"; - ename = "crisp"; - version = "1.3.6"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/crisp-1.3.6.tar"; - sha256 = "0am7gwadjp0nwlvf7y4sp9brbm0234k55bnxfv44lkwdf502mq8y"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/crisp.html"; - license = lib.licenses.free; - }; - }) {}; - csharp-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "csharp-mode"; - ename = "csharp-mode"; - version = "2.0.0"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/csharp-mode-2.0.0.tar"; - sha256 = "1jjxq5vkqq2v8rkcm2ygggpg355aqmrl2hdhh1xma3jlnj5carnf"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/csharp-mode.html"; - license = lib.licenses.free; - }; - }) {}; - csv-mode = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "csv-mode"; - ename = "csv-mode"; - version = "1.23"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/csv-mode-1.23.tar"; - sha256 = "0b5qcxdp7y78mfgcvh9plfc0l5qbwsvrj1bswyimrzg210zhk4zm"; - }; - packageRequires = [ cl-lib emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/csv-mode.html"; - license = lib.licenses.free; - }; - }) {}; - cursory = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "cursory"; - ename = "cursory"; - version = "1.0.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/cursory-1.0.1.tar"; - sha256 = "09ddn7rlmznq833nsm6s6zhzrq94lrbmm1vln43hax9yf784pqbr"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/cursory.html"; - license = lib.licenses.free; - }; - }) {}; - cycle-quotes = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "cycle-quotes"; - ename = "cycle-quotes"; - version = "0.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/cycle-quotes-0.1.tar"; - sha256 = "1glf8sd3gqp9qbd238vxd3aprdz93f887893xji3ybqli36i2xs1"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/cycle-quotes.html"; - license = lib.licenses.free; - }; - }) {}; - dape = callPackage ({ elpaBuild, emacs, fetchurl, jsonrpc, lib }: - elpaBuild { - pname = "dape"; - ename = "dape"; - version = "0.11.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/dape-0.11.1.tar"; - sha256 = "0i04wwklypzxh78gwd9zjxjm3lwi2sn7qpqnlgd6n8hhcigyzhp0"; - }; - packageRequires = [ emacs jsonrpc ]; - meta = { - homepage = "https://elpa.gnu.org/packages/dape.html"; - license = lib.licenses.free; - }; - }) {}; - darkroom = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "darkroom"; - ename = "darkroom"; - version = "0.3"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/darkroom-0.3.tar"; - sha256 = "0gxixkai8awc77vzckwljmyapdnxw5j9ajxmlr8rq42994gjr4fm"; - }; - packageRequires = [ cl-lib ]; - meta = { - homepage = "https://elpa.gnu.org/packages/darkroom.html"; - license = lib.licenses.free; - }; - }) {}; - dash = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "dash"; - ename = "dash"; - version = "2.19.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/dash-2.19.1.tar"; - sha256 = "1c7yibfikkwlip8zh4kiamh3kljil3hyl250g8fkxpdyhljjdk6m"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/dash.html"; - license = lib.licenses.free; - }; - }) {}; - dbus-codegen = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "dbus-codegen"; - ename = "dbus-codegen"; - version = "0.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/dbus-codegen-0.1.tar"; - sha256 = "0d3sbqs5r8578629inx8nhqvx0kshf41d00c8dpc75v4b2vx0h6w"; - }; - packageRequires = [ cl-lib ]; - meta = { - homepage = "https://elpa.gnu.org/packages/dbus-codegen.html"; - license = lib.licenses.free; - }; - }) {}; - debbugs = callPackage ({ elpaBuild, emacs, fetchurl, lib, soap-client }: - elpaBuild { - pname = "debbugs"; - ename = "debbugs"; - version = "0.40"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/debbugs-0.40.tar"; - sha256 = "1agms2il38lgz02g4fswil9x5j1xwpl8kvhbd48jcx57nq18a7bl"; - }; - packageRequires = [ emacs soap-client ]; - meta = { - homepage = "https://elpa.gnu.org/packages/debbugs.html"; - license = lib.licenses.free; - }; - }) {}; - delight = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib, nadvice }: - elpaBuild { - pname = "delight"; - ename = "delight"; - version = "1.7"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/delight-1.7.tar"; - sha256 = "1j7srr0i7s9hcny45m8zmj33nl9g6zi55cbkdzzlbx6si2rqwwlj"; - }; - packageRequires = [ cl-lib nadvice ]; - meta = { - homepage = "https://elpa.gnu.org/packages/delight.html"; - license = lib.licenses.free; - }; - }) {}; - denote = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "denote"; - ename = "denote"; - version = "2.3.5"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/denote-2.3.5.tar"; - sha256 = "1l8nlr8q7c51j2f528a0568pa3ywfv8pr47fzpd6pk2scc0y372b"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/denote.html"; - license = lib.licenses.free; - }; - }) {}; - denote-menu = callPackage ({ denote, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "denote-menu"; - ename = "denote-menu"; - version = "1.2.0"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/denote-menu-1.2.0.tar"; - sha256 = "042avabc97wgkz85x40dq7rmv4h9n5kmq935lrg9s20klbs9axs1"; - }; - packageRequires = [ denote emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/denote-menu.html"; - license = lib.licenses.free; - }; - }) {}; - detached = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "detached"; - ename = "detached"; - version = "0.10.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/detached-0.10.1.tar"; - sha256 = "0w6xgidi0g1pc13xfm8hcgmc7i2h5brj443cykwgvr5wkqnpmp9m"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/detached.html"; - license = lib.licenses.free; - }; - }) {}; - devdocs = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "devdocs"; - ename = "devdocs"; - version = "0.6.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/devdocs-0.6.1.tar"; - sha256 = "04m3jd3wymrsdlb1i7z6dz9pf1q8q38ihkbn3jisdca6xkk9jd6p"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/devdocs.html"; - license = lib.licenses.free; - }; - }) {}; - devicetree-ts-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "devicetree-ts-mode"; - ename = "devicetree-ts-mode"; - version = "0.3"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/devicetree-ts-mode-0.3.tar"; - sha256 = "06j385pvlhd7hp9isqp5gcf378m8p6578q6nz81r8dx93ymaak79"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/devicetree-ts-mode.html"; - license = lib.licenses.free; - }; - }) {}; - dict-tree = callPackage ({ elpaBuild - , emacs - , fetchurl - , heap - , lib - , tNFA - , trie }: - elpaBuild { - pname = "dict-tree"; - ename = "dict-tree"; - version = "0.17"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/dict-tree-0.17.tar"; - sha256 = "0p4j0m3b9i38l4rcgzdps95wqk27zz156d4q73vq054kpcphrfpp"; - }; - packageRequires = [ emacs heap tNFA trie ]; - meta = { - homepage = "https://elpa.gnu.org/packages/dict-tree.html"; - license = lib.licenses.free; - }; - }) {}; - diff-hl = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "diff-hl"; - ename = "diff-hl"; - version = "1.9.2"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/diff-hl-1.9.2.tar"; - sha256 = "0skla012qw55qhzykgrk3zk5x76dfsj11kq8q2msyrq3jxcbyq6p"; - }; - packageRequires = [ cl-lib emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/diff-hl.html"; - license = lib.licenses.free; - }; - }) {}; - diffview = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "diffview"; - ename = "diffview"; - version = "1.0"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/diffview-1.0.el"; - sha256 = "1gkdmzmgjixz9nak7dxvqy28kz0g7i672gavamwgnc1jl37wkcwi"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/diffview.html"; - license = lib.licenses.free; - }; - }) {}; - diminish = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "diminish"; - ename = "diminish"; - version = "0.46"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/diminish-0.46.tar"; - sha256 = "1xqd6ldxl93l281ncddik1lfxjngi2drq61mv7v18r756c7bqr5r"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/diminish.html"; - license = lib.licenses.free; - }; - }) {}; - dired-du = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "dired-du"; - ename = "dired-du"; - version = "0.5.2"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/dired-du-0.5.2.tar"; - sha256 = "066yjy9vdbf20adcqdcknk5b0ml18fy2bm9gkgcp0qfg37yy1yjg"; - }; - packageRequires = [ cl-lib emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/dired-du.html"; - license = lib.licenses.free; - }; - }) {}; - dired-duplicates = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "dired-duplicates"; - ename = "dired-duplicates"; - version = "0.4"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/dired-duplicates-0.4.tar"; - sha256 = "1srih47bq7szg6n3qlz4yzzcijg79p8xpwmi5c4v9xscl94nnc4z"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/dired-duplicates.html"; - license = lib.licenses.free; - }; - }) {}; - dired-git-info = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "dired-git-info"; - ename = "dired-git-info"; - version = "0.3.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/dired-git-info-0.3.1.tar"; - sha256 = "0rryvlbqx1j48wafja15yc39jd0fzgz9i6bzmq9jpql3w9445772"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/dired-git-info.html"; - license = lib.licenses.free; - }; - }) {}; - dired-preview = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "dired-preview"; - ename = "dired-preview"; - version = "0.2.0"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/dired-preview-0.2.0.tar"; - sha256 = "15l01javijjjjc9bycljgshg9jv3clmfnsisy7f3caqxq78sb61l"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/dired-preview.html"; - license = lib.licenses.free; - }; - }) {}; - disk-usage = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "disk-usage"; - ename = "disk-usage"; - version = "1.3.3"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/disk-usage-1.3.3.tar"; - sha256 = "02i7i7mrn6ky3lzhcadvq7wlznd0b2ay107h2b3yh4wwwxjxymyg"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/disk-usage.html"; - license = lib.licenses.free; - }; - }) {}; - dismal = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "dismal"; - ename = "dismal"; - version = "1.5.2"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/dismal-1.5.2.tar"; - sha256 = "1706m5ya6q0jf8mzfkqn47aqd7ygm88fm7pvzbd4cry30mjs5vki"; - }; - packageRequires = [ cl-lib ]; - meta = { - homepage = "https://elpa.gnu.org/packages/dismal.html"; - license = lib.licenses.free; - }; - }) {}; - djvu = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "djvu"; - ename = "djvu"; - version = "1.1.2"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/djvu-1.1.2.tar"; - sha256 = "0z74aicvy680m1d6v5zk5pcpkd310jqqdxadpjcbnjcybzp1zisq"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/djvu.html"; - license = lib.licenses.free; - }; - }) {}; - do-at-point = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "do-at-point"; - ename = "do-at-point"; - version = "0.1.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/do-at-point-0.1.1.tar"; - sha256 = "1lqnarb9jiig85j3dv37jsqkmmfbcwb52i2akimzf9r57pypiylk"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/do-at-point.html"; - license = lib.licenses.free; - }; - }) {}; - doc-toc = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "doc-toc"; - ename = "doc-toc"; - version = "1.2"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/doc-toc-1.2.tar"; - sha256 = "09xwa0xgnzlaff0j5zy3kam6spcnw0npppc3gf6ka5bizbk4dq99"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/doc-toc.html"; - license = lib.licenses.free; - }; - }) {}; - docbook = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "docbook"; - ename = "docbook"; - version = "0.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/docbook-0.1.tar"; - sha256 = "1kn71kpyb1maww414zgpc1ccgb02mmaiaix06jyqhf75hfxms2lv"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/docbook.html"; - license = lib.licenses.free; - }; - }) {}; - drepl = callPackage ({ comint-mime, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "drepl"; - ename = "drepl"; - version = "0.3"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/drepl-0.3.tar"; - sha256 = "0dy8xvx5nwibiyhddm6nhcw384vhkhsbbxcs4hah0yxwajfm8yds"; - }; - packageRequires = [ comint-mime emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/drepl.html"; - license = lib.licenses.free; - }; - }) {}; - dts-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "dts-mode"; - ename = "dts-mode"; - version = "1.0"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/dts-mode-1.0.tar"; - sha256 = "16ads9xjbqgmgwzj63anhc6yb1j79qpcnxjafqrzdih1p5j7hrr9"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/dts-mode.html"; - license = lib.licenses.free; - }; - }) {}; - easy-escape = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "easy-escape"; - ename = "easy-escape"; - version = "0.2.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/easy-escape-0.2.1.tar"; - sha256 = "0mwam1a7sl90aqgz6mj3zm0w1dq15b5jpxmwxv21xs1imyv696ci"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/easy-escape.html"; - license = lib.licenses.free; - }; - }) {}; - easy-kill = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "easy-kill"; - ename = "easy-kill"; - version = "0.9.5"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/easy-kill-0.9.5.tar"; - sha256 = "1nwhqidy5zq6j867b21zng5ppb7n56drnhn3wjs7hjmkf23r63qy"; - }; - packageRequires = [ cl-lib emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/easy-kill.html"; - license = lib.licenses.free; - }; - }) {}; - ebdb = callPackage ({ elpaBuild, emacs, fetchurl, lib, seq }: - elpaBuild { - pname = "ebdb"; - ename = "ebdb"; - version = "0.8.22"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/ebdb-0.8.22.tar"; - sha256 = "0nmrhjk2ddml115ibsy8j4crw5hzq9fa94v8y41iyj9h3gf8irzc"; - }; - packageRequires = [ emacs seq ]; - meta = { - homepage = "https://elpa.gnu.org/packages/ebdb.html"; - license = lib.licenses.free; - }; - }) {}; - ebdb-gnorb = callPackage ({ ebdb, elpaBuild, fetchurl, gnorb, lib }: - elpaBuild { - pname = "ebdb-gnorb"; - ename = "ebdb-gnorb"; - version = "1.0.2"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/ebdb-gnorb-1.0.2.tar"; - sha256 = "1kwcrg268vmskls9p4ccs6ybdip30cb4fw3xzq11gqjch1nssh18"; - }; - packageRequires = [ ebdb gnorb ]; - meta = { - homepage = "https://elpa.gnu.org/packages/ebdb-gnorb.html"; - license = lib.licenses.free; - }; - }) {}; - ebdb-i18n-chn = callPackage ({ ebdb, elpaBuild, fetchurl, lib, pyim }: - elpaBuild { - pname = "ebdb-i18n-chn"; - ename = "ebdb-i18n-chn"; - version = "1.3.2"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/ebdb-i18n-chn-1.3.2.tar"; - sha256 = "1qyia40z6ssvnlpra116avakyf81vqn42860ny21g0zsl99a58j2"; - }; - packageRequires = [ ebdb pyim ]; - meta = { - homepage = "https://elpa.gnu.org/packages/ebdb-i18n-chn.html"; - license = lib.licenses.free; - }; - }) {}; - ediprolog = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "ediprolog"; - ename = "ediprolog"; - version = "2.2"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/ediprolog-2.2.tar"; - sha256 = "13g8y51lvdphi1v6rdca36c0r9v35lldx5979yrccsf07h0hw5gm"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/ediprolog.html"; - license = lib.licenses.free; - }; - }) {}; - eev = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "eev"; - ename = "eev"; - version = "20240513"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/eev-20240513.tar"; - sha256 = "133blp5696f2adxqny5kyylr6s3n3vixs0ak1n3i58sqb0krp2pj"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/eev.html"; - license = lib.licenses.free; - }; - }) {}; - ef-themes = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "ef-themes"; - ename = "ef-themes"; - version = "1.7.0"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/ef-themes-1.7.0.tar"; - sha256 = "0d6rpwk1z9sc1yzfc4d4icb43pqwvdfvqap1m4r4aajvc5kasq1v"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/ef-themes.html"; - license = lib.licenses.free; - }; - }) {}; - eglot = callPackage ({ eldoc - , elpaBuild - , emacs - , external-completion - , fetchurl - , flymake ? null - , jsonrpc - , lib - , project - , seq - , xref }: - elpaBuild { - pname = "eglot"; - ename = "eglot"; - version = "1.17"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/eglot-1.17.tar"; - sha256 = "1cnx522wb49f1dkm80sigz3kvzrblmq5b1lnfyq9wdnh6zdm4l00"; - }; - packageRequires = [ - eldoc - emacs - external-completion - flymake - jsonrpc - project - seq - xref - ]; - meta = { - homepage = "https://elpa.gnu.org/packages/eglot.html"; - license = lib.licenses.free; - }; - }) {}; - el-search = callPackage ({ cl-print ? null - , elpaBuild - , emacs - , fetchurl - , lib - , stream }: - elpaBuild { - pname = "el-search"; - ename = "el-search"; - version = "1.12.6.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/el-search-1.12.6.1.tar"; - sha256 = "1vq8cp2icpl8vkc9r8brzbn0mpaj03mnvdz1bdqn8nqrzc3w0h24"; - }; - packageRequires = [ cl-print emacs stream ]; - meta = { - homepage = "https://elpa.gnu.org/packages/el-search.html"; - license = lib.licenses.free; - }; - }) {}; - eldoc = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "eldoc"; - ename = "eldoc"; - version = "1.15.0"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/eldoc-1.15.0.tar"; - sha256 = "05fgk3y2rp0xrm3x0xmf9fm72l442y7ydxxg3xk006d9cq06h8kz"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/eldoc.html"; - license = lib.licenses.free; - }; - }) {}; - electric-spacing = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "electric-spacing"; - ename = "electric-spacing"; - version = "5.0"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/electric-spacing-5.0.tar"; - sha256 = "1gr35nri25ycxr0wwkypky8zv43nnfrilx4jaj66mb9jsyix6smi"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/electric-spacing.html"; - license = lib.licenses.free; - }; - }) {}; - elisp-benchmarks = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "elisp-benchmarks"; - ename = "elisp-benchmarks"; - version = "1.16"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/elisp-benchmarks-1.16.tar"; - sha256 = "0v5db89z6hirvixgjwyz3a9dkx6xf486hy51sprvslki706m08p2"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/elisp-benchmarks.html"; - license = lib.licenses.free; - }; - }) {}; - ellama = callPackage ({ elpaBuild, emacs, fetchurl, lib, llm, spinner }: - elpaBuild { - pname = "ellama"; - ename = "ellama"; - version = "0.9.4"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/ellama-0.9.4.tar"; - sha256 = "12l8k7dwcdgndy0zbdgkhx94y46fkzwjrbwlgj9922zbk38nnz46"; - }; - packageRequires = [ emacs llm spinner ]; - meta = { - homepage = "https://elpa.gnu.org/packages/ellama.html"; - license = lib.licenses.free; - }; - }) {}; - emacs-gc-stats = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "emacs-gc-stats"; - ename = "emacs-gc-stats"; - version = "1.4.2"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/emacs-gc-stats-1.4.2.tar"; - sha256 = "055ma32r92ksjnqy8xbzv0a79r7aap12h61dj860781fapfnifa3"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/emacs-gc-stats.html"; - license = lib.licenses.free; - }; - }) {}; - embark = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "embark"; - ename = "embark"; - version = "1.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/embark-1.1.tar"; - sha256 = "074ggh7dkr5jdkwcndl6znhkq48jmc62rp7mc6vjidr6yxf8d1rn"; - }; - packageRequires = [ compat emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/embark.html"; - license = lib.licenses.free; - }; - }) {}; - embark-consult = callPackage ({ compat - , consult - , elpaBuild - , emacs - , embark - , fetchurl - , lib }: - elpaBuild { - pname = "embark-consult"; - ename = "embark-consult"; - version = "1.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/embark-consult-1.1.tar"; - sha256 = "06yh6w4zgvvkfllmcr0szsgjrfhh9rpjwgmcrf6h2gai2ps9xdqr"; - }; - packageRequires = [ compat consult emacs embark ]; - meta = { - homepage = "https://elpa.gnu.org/packages/embark-consult.html"; - license = lib.licenses.free; - }; - }) {}; - ement = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib - , map - , persist - , plz - , svg-lib - , taxy - , taxy-magit-section - , transient }: - elpaBuild { - pname = "ement"; - ename = "ement"; - version = "0.15"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/ement-0.15.tar"; - sha256 = "0mphkvmsmrfyr3prr5a2x6ijr27z96ixpaxs9871kn7f1x0brn5r"; - }; - packageRequires = [ - emacs - map - persist - plz - svg-lib - taxy - taxy-magit-section - transient - ]; - meta = { - homepage = "https://elpa.gnu.org/packages/ement.html"; - license = lib.licenses.free; - }; - }) {}; - emms = callPackage ({ cl-lib ? null - , elpaBuild - , fetchurl - , lib - , nadvice - , seq }: - elpaBuild { - pname = "emms"; - ename = "emms"; - version = "19"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/emms-19.tar"; - sha256 = "1k0hybw826f2hlw8m0aihkydlkdzjsgvrfibpsqrxxcn9d7zxwjd"; - }; - packageRequires = [ cl-lib nadvice seq ]; - meta = { - homepage = "https://elpa.gnu.org/packages/emms.html"; - license = lib.licenses.free; - }; - }) {}; - engrave-faces = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "engrave-faces"; - ename = "engrave-faces"; - version = "0.3.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/engrave-faces-0.3.1.tar"; - sha256 = "0nl5wx61192dqd0191dvaszgjc7b2adrxsyc75f529fcyrfwgqfa"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/engrave-faces.html"; - license = lib.licenses.free; - }; - }) {}; - enwc = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "enwc"; - ename = "enwc"; - version = "2.0"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/enwc-2.0.tar"; - sha256 = "0y8154ykrashgg0bina5ambdrxw2qpimycvjldrk9d67hrccfh3m"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/enwc.html"; - license = lib.licenses.free; - }; - }) {}; - epoch-view = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "epoch-view"; - ename = "epoch-view"; - version = "0.0.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/epoch-view-0.0.1.el"; - sha256 = "1wy25ryyg9f4v83qjym2pwip6g9mszhqkf5a080z0yl47p71avfx"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/epoch-view.html"; - license = lib.licenses.free; - }; - }) {}; - erc = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "erc"; - ename = "erc"; - version = "5.5"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/erc-5.5.tar"; - sha256 = "02649ijnpyalk0k1yq1dcinj92awhbnkia2x9sdb9xjk80xw1gqp"; - }; - packageRequires = [ compat emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/erc.html"; - license = lib.licenses.free; - }; - }) {}; - ergoemacs-mode = callPackage ({ cl-lib ? null - , elpaBuild - , emacs - , fetchurl - , lib - , undo-tree }: - elpaBuild { - pname = "ergoemacs-mode"; - ename = "ergoemacs-mode"; - version = "5.16.10.12"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/ergoemacs-mode-5.16.10.12.tar"; - sha256 = "0s4lwb76c67npbcnvbxdawnj02zkc85sbm392lym1qccjmj9d02f"; - }; - packageRequires = [ cl-lib emacs undo-tree ]; - meta = { - homepage = "https://elpa.gnu.org/packages/ergoemacs-mode.html"; - license = lib.licenses.free; - }; - }) {}; - ess = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "ess"; - ename = "ess"; - version = "24.1.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/ess-24.1.1.tar"; - sha256 = "11hn571q8vpjy1kx8d1hn8mm2sna0ar1q2z4vmb6rwqi9wsda6a0"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/ess.html"; - license = lib.licenses.free; - }; - }) {}; - excorporate = callPackage ({ cl-lib ? null - , elpaBuild - , emacs - , fetchurl - , fsm - , lib - , nadvice - , soap-client - , url-http-ntlm - , url-http-oauth }: - elpaBuild { - pname = "excorporate"; - ename = "excorporate"; - version = "1.1.2"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/excorporate-1.1.2.tar"; - sha256 = "111wvkn0ks7syfgf1cydq5s0kymha0j280xvnp09zcfbj706yhbw"; - }; - packageRequires = [ - cl-lib - emacs - fsm - nadvice - soap-client - url-http-ntlm - url-http-oauth - ]; - meta = { - homepage = "https://elpa.gnu.org/packages/excorporate.html"; - license = lib.licenses.free; - }; - }) {}; - expand-region = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "expand-region"; - ename = "expand-region"; - version = "1.0.0"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/expand-region-1.0.0.tar"; - sha256 = "1rjx7w4gss8sbsjaljraa6cjpb57kdpx9zxmr30kbifb5lp511rd"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/expand-region.html"; - license = lib.licenses.free; - }; - }) {}; - expreg = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "expreg"; - ename = "expreg"; - version = "1.3.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/expreg-1.3.1.tar"; - sha256 = "12msng4ypmw6s3pja66kkjxkbadla0fxmak1r3drxiihpwmh5zm6"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/expreg.html"; - license = lib.licenses.free; - }; - }) {}; - external-completion = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "external-completion"; - ename = "external-completion"; - version = "0.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/external-completion-0.1.tar"; - sha256 = "1bw2kvz7zf1s60d37j31krakryc1kpyial2idjy6ac6w7n1h0jzc"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/external-completion.html"; - license = lib.licenses.free; - }; - }) {}; - exwm = callPackage ({ elpaBuild, fetchurl, lib, xelb }: - elpaBuild { - pname = "exwm"; - ename = "exwm"; - version = "0.28"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/exwm-0.28.tar"; - sha256 = "11j1ciyrnzkbcb7ffgs670mxqd1xbxf41c6jwnwwqjfzmqhsm0m4"; - }; - packageRequires = [ xelb ]; - meta = { - homepage = "https://elpa.gnu.org/packages/exwm.html"; - license = lib.licenses.free; - }; - }) {}; - f90-interface-browser = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "f90-interface-browser"; - ename = "f90-interface-browser"; - version = "1.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/f90-interface-browser-1.1.el"; - sha256 = "0mf32w2bgc6b43k0r4a11bywprj7y3rvl21i0ry74v425r6hc3is"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/f90-interface-browser.html"; - license = lib.licenses.free; - }; - }) {}; - face-shift = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "face-shift"; - ename = "face-shift"; - version = "0.2.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/face-shift-0.2.1.tar"; - sha256 = "14sbafkxr7kmv6sd5rw7d7hcsh0hhx92wkh6arfbchxad8jzimr6"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/face-shift.html"; - license = lib.licenses.free; - }; - }) {}; - filechooser = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "filechooser"; - ename = "filechooser"; - version = "0.2.0"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/filechooser-0.2.0.tar"; - sha256 = "1fjf8bmdrrrgbv4sgx4nry5pl8plg9kyzyfd038985v3dsqasi9q"; - }; - packageRequires = [ compat emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/filechooser.html"; - license = lib.licenses.free; - }; - }) {}; - filladapt = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "filladapt"; - ename = "filladapt"; - version = "2.12.2"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/filladapt-2.12.2.tar"; - sha256 = "0nmgw6v2krxn5palddqj1jzqxrajhpyq9v2x9lw12cdcldm9ab4k"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/filladapt.html"; - license = lib.licenses.free; - }; - }) {}; - firefox-javascript-repl = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "firefox-javascript-repl"; - ename = "firefox-javascript-repl"; - version = "0.9.5"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/firefox-javascript-repl-0.9.5.tar"; - sha256 = "07qmp6hfzgljrl9gkwy673xk67b3bgxq4kkw2kzr8ma4a7lx7a8l"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/firefox-javascript-repl.html"; - license = lib.licenses.free; - }; - }) {}; - flylisp = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "flylisp"; - ename = "flylisp"; - version = "0.2"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/flylisp-0.2.tar"; - sha256 = "1agny4hc75xc8a9f339bynsazmxw8ccvyb03qx1d6nvwh9d7v1b9"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/flylisp.html"; - license = lib.licenses.free; - }; - }) {}; - flymake = callPackage ({ eldoc, elpaBuild, emacs, fetchurl, lib, project }: - elpaBuild { - pname = "flymake"; - ename = "flymake"; - version = "1.3.7"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/flymake-1.3.7.tar"; - sha256 = "15ikzdqyh77cgx94jaigfrrzfvwvpca8s2120gi82i9aaiypr7jl"; - }; - packageRequires = [ eldoc emacs project ]; - meta = { - homepage = "https://elpa.gnu.org/packages/flymake.html"; - license = lib.licenses.free; - }; - }) {}; - flymake-codespell = callPackage ({ compat - , elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "flymake-codespell"; - ename = "flymake-codespell"; - version = "0.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/flymake-codespell-0.1.tar"; - sha256 = "1x1bmdjmdaciknd702z54002bi1a5n51vvn9g7j6rnzjc1dxw97f"; - }; - packageRequires = [ compat emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/flymake-codespell.html"; - license = lib.licenses.free; - }; - }) {}; - flymake-proselint = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "flymake-proselint"; - ename = "flymake-proselint"; - version = "0.3.0"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/flymake-proselint-0.3.0.tar"; - sha256 = "0bq7nc1qiqwxi848xy7wg1ig8k38nmq1w13xws10scjvndlbcjpl"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/flymake-proselint.html"; - license = lib.licenses.free; - }; - }) {}; - fontaine = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "fontaine"; - ename = "fontaine"; - version = "2.0.0"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/fontaine-2.0.0.tar"; - sha256 = "1h3hsqfx16ff0s776xvnafrlmj0m0r66hjra1mq2j55ahvh0aavk"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/fontaine.html"; - license = lib.licenses.free; - }; - }) {}; - frame-tabs = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "frame-tabs"; - ename = "frame-tabs"; - version = "1.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/frame-tabs-1.1.tar"; - sha256 = "1a7hklir19inai68azgyfiw1bzq5z57kkp33lj6qbxxvfcqvw62w"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/frame-tabs.html"; - license = lib.licenses.free; - }; - }) {}; - frog-menu = callPackage ({ avy, elpaBuild, emacs, fetchurl, lib, posframe }: - elpaBuild { - pname = "frog-menu"; - ename = "frog-menu"; - version = "0.2.11"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/frog-menu-0.2.11.tar"; - sha256 = "1iwyg9z8i03p9kkz6vhv00bzsqrsgl4xqqh08icial29c80q939l"; - }; - packageRequires = [ avy emacs posframe ]; - meta = { - homepage = "https://elpa.gnu.org/packages/frog-menu.html"; - license = lib.licenses.free; - }; - }) {}; - fsm = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "fsm"; - ename = "fsm"; - version = "0.2.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/fsm-0.2.1.tar"; - sha256 = "0kvm16077bn6bpbyw3k5935fhiq86ry2j1zcx9sj7dvb9w737qz4"; - }; - packageRequires = [ cl-lib emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/fsm.html"; - license = lib.licenses.free; - }; - }) {}; - ftable = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "ftable"; - ename = "ftable"; - version = "1.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/ftable-1.1.tar"; - sha256 = "052vqw8892wv8lh5slm90gcvfk7ws5sgl1mzbdi4d3sy4kc4q48h"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/ftable.html"; - license = lib.licenses.free; - }; - }) {}; - gcmh = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "gcmh"; - ename = "gcmh"; - version = "0.2.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/gcmh-0.2.1.tar"; - sha256 = "030w493ilmc7w13jizwqsc33a424qjgicy1yxvlmy08yipnw3587"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/gcmh.html"; - license = lib.licenses.free; - }; - }) {}; - ggtags = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "ggtags"; - ename = "ggtags"; - version = "0.9.0"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/ggtags-0.9.0.tar"; - sha256 = "02gj8ghkk35clyscbvp1p1nlhmgm5h9g2cy4mavnfmx7jikmr4m3"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/ggtags.html"; - license = lib.licenses.free; - }; - }) {}; - gited = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "gited"; - ename = "gited"; - version = "0.6.0"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/gited-0.6.0.tar"; - sha256 = "1s2h6y1adh28pvm3h5bivfja2nqnzm8w9sfza894pxf96kwk3pg2"; - }; - packageRequires = [ cl-lib emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/gited.html"; - license = lib.licenses.free; - }; - }) {}; - gle-mode = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "gle-mode"; - ename = "gle-mode"; - version = "1.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/gle-mode-1.1.tar"; - sha256 = "12vbif4b4j87z7fg18dlcmzmbs2fp1g8bgsk5rch9h6dblg72prq"; - }; - packageRequires = [ cl-lib ]; - meta = { - homepage = "https://elpa.gnu.org/packages/gle-mode.html"; - license = lib.licenses.free; - }; - }) {}; - gnat-compiler = callPackage ({ elpaBuild, emacs, fetchurl, lib, wisi }: - elpaBuild { - pname = "gnat-compiler"; - ename = "gnat-compiler"; - version = "1.0.3"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/gnat-compiler-1.0.3.tar"; - sha256 = "1chydgswab2m81m3kbd31b1akyw4v1c9468wlfxpg2yydy8fc7vs"; - }; - packageRequires = [ emacs wisi ]; - meta = { - homepage = "https://elpa.gnu.org/packages/gnat-compiler.html"; - license = lib.licenses.free; - }; - }) {}; - gnome-c-style = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "gnome-c-style"; - ename = "gnome-c-style"; - version = "0.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/gnome-c-style-0.1.tar"; - sha256 = "09w68jbpzyyhcaqw335qpr840j7xx0j81zxxkxq4ahqv6ck27v4x"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/gnome-c-style.html"; - license = lib.licenses.free; - }; - }) {}; - gnorb = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "gnorb"; - ename = "gnorb"; - version = "1.6.11"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/gnorb-1.6.11.tar"; - sha256 = "1y0xpbifb8dm8hd5i9g8jph4jm76wviphszl5x3zi6w053jpss9b"; - }; - packageRequires = [ cl-lib ]; - meta = { - homepage = "https://elpa.gnu.org/packages/gnorb.html"; - license = lib.licenses.free; - }; - }) {}; - gnu-elpa = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "gnu-elpa"; - ename = "gnu-elpa"; - version = "1.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/gnu-elpa-1.1.tar"; - sha256 = "01cw1r5y86q1aardpvcwvwq161invrzxd0kv4qqi5agaff2nbp26"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/gnu-elpa.html"; - license = lib.licenses.free; - }; - }) {}; - gnu-elpa-keyring-update = callPackage ({ elpaBuild - , fetchurl - , lib }: - elpaBuild { - pname = "gnu-elpa-keyring-update"; - ename = "gnu-elpa-keyring-update"; - version = "2022.12"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/gnu-elpa-keyring-update-2022.12.tar"; - sha256 = "0pabqsfw0d9knfigpcsrwfw7qrf2vlg9h0i582212gsqd7snlnxb"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/gnu-elpa-keyring-update.html"; - license = lib.licenses.free; - }; - }) {}; - gnugo = callPackage ({ ascii-art-to-unicode - , cl-lib ? null - , elpaBuild - , fetchurl - , lib - , xpm }: - elpaBuild { - pname = "gnugo"; - ename = "gnugo"; - version = "3.1.2"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/gnugo-3.1.2.tar"; - sha256 = "0wingn5v4wa1xgsgmqqls28cifnff8mvm098kn8clw42mxr40257"; - }; - packageRequires = [ ascii-art-to-unicode cl-lib xpm ]; - meta = { - homepage = "https://elpa.gnu.org/packages/gnugo.html"; - license = lib.licenses.free; - }; - }) {}; - gnus-mock = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "gnus-mock"; - ename = "gnus-mock"; - version = "0.5"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/gnus-mock-0.5.tar"; - sha256 = "1yl624wzs4kw45zpnxh04dxn1kkpb6c2jl3i0sm1bijyhm303l4h"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/gnus-mock.html"; - license = lib.licenses.free; - }; - }) {}; - gpastel = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "gpastel"; - ename = "gpastel"; - version = "0.5.0"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/gpastel-0.5.0.tar"; - sha256 = "12y1ysgnqjvsdp5gal90mp2wplif7rq1cj61393l6gf3pgv6jkzc"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/gpastel.html"; - license = lib.licenses.free; - }; - }) {}; - gpr-mode = callPackage ({ elpaBuild - , emacs - , fetchurl - , gnat-compiler - , lib - , wisi }: - elpaBuild { - pname = "gpr-mode"; - ename = "gpr-mode"; - version = "1.0.5"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/gpr-mode-1.0.5.tar"; - sha256 = "1qdk2pkdxggfhj8gm39jb2b29g0gbw50vgil6rv3z0q7nlhpm2fp"; - }; - packageRequires = [ emacs gnat-compiler wisi ]; - meta = { - homepage = "https://elpa.gnu.org/packages/gpr-mode.html"; - license = lib.licenses.free; - }; - }) {}; - gpr-query = callPackage ({ elpaBuild - , emacs - , fetchurl - , gnat-compiler - , lib - , wisi }: - elpaBuild { - pname = "gpr-query"; - ename = "gpr-query"; - version = "1.0.4"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/gpr-query-1.0.4.tar"; - sha256 = "1y283x549w544x37lmh25n19agyah2iz0b052hx8br4rnjdd9ii3"; - }; - packageRequires = [ emacs gnat-compiler wisi ]; - meta = { - homepage = "https://elpa.gnu.org/packages/gpr-query.html"; - license = lib.licenses.free; - }; - }) {}; - graphql = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "graphql"; - ename = "graphql"; - version = "0.1.2"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/graphql-0.1.2.tar"; - sha256 = "1blpsj6sav3z9gj733cccdhpdnyvnvxp48z1hnjh0f0fl5avvkix"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/graphql.html"; - license = lib.licenses.free; - }; - }) {}; - greader = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "greader"; - ename = "greader"; - version = "0.9.20"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/greader-0.9.20.tar"; - sha256 = "11n88xmr2qa5as5kpy4yy616nlh08nw5rkcbgmf9skgka3g1hmip"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/greader.html"; - license = lib.licenses.free; - }; - }) {}; - greenbar = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "greenbar"; - ename = "greenbar"; - version = "1.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/greenbar-1.1.tar"; - sha256 = "14azd170xq602fy4mcc770x5063rvpms8ilbzzn8kwyfvmijlbbx"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/greenbar.html"; - license = lib.licenses.free; - }; - }) {}; - gtags-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "gtags-mode"; - ename = "gtags-mode"; - version = "1.6"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/gtags-mode-1.6.tar"; - sha256 = "1r3ih44kzkrx9bmfl8ri2yv90b7g4nhb0vvdnz1ba3f44x15ppjx"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/gtags-mode.html"; - license = lib.licenses.free; - }; - }) {}; - guess-language = callPackage ({ cl-lib ? null - , elpaBuild - , emacs - , fetchurl - , lib - , nadvice }: - elpaBuild { - pname = "guess-language"; - ename = "guess-language"; - version = "0.0.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/guess-language-0.0.1.el"; - sha256 = "11a6m2337j4ncppaf59yr2vavvvsph2qh51d12zmq58g9wh3d7wz"; - }; - packageRequires = [ cl-lib emacs nadvice ]; - meta = { - homepage = "https://elpa.gnu.org/packages/guess-language.html"; - license = lib.licenses.free; - }; - }) {}; - hcel = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "hcel"; - ename = "hcel"; - version = "1.0.0"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/hcel-1.0.0.tar"; - sha256 = "1pm3d0nz2mpf667jkjlmlidh203i4d4gk0n8xd3r66bzwc4l042b"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/hcel.html"; - license = lib.licenses.free; - }; - }) {}; - heap = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "heap"; - ename = "heap"; - version = "0.5"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/heap-0.5.tar"; - sha256 = "1q42v9mzmlhl4pr3wr94nsis7a9977f35w0qsyx2r982kwgmbndw"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/heap.html"; - license = lib.licenses.free; - }; - }) {}; - hiddenquote = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "hiddenquote"; - ename = "hiddenquote"; - version = "1.2"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/hiddenquote-1.2.tar"; - sha256 = "051aqiq77n487lnsxxwa8q0vyzk6m2fwi3l7xwvrl49p5xpia6zr"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/hiddenquote.html"; - license = lib.licenses.free; - }; - }) {}; - highlight-escape-sequences = callPackage ({ elpaBuild - , fetchurl - , lib }: - elpaBuild { - pname = "highlight-escape-sequences"; - ename = "highlight-escape-sequences"; - version = "0.4"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/highlight-escape-sequences-0.4.tar"; - sha256 = "1gs662vvvzrqdlb1z73jf6wykjzs1jskcdksk8akqmply4sjvbpr"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/highlight-escape-sequences.html"; - license = lib.licenses.free; - }; - }) {}; - hook-helpers = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "hook-helpers"; - ename = "hook-helpers"; - version = "1.1.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/hook-helpers-1.1.1.tar"; - sha256 = "05nqlshdqh32smav58hzqg8wp04h7w9sxr239qrz4wqxwlxlv9im"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/hook-helpers.html"; - license = lib.licenses.free; - }; - }) {}; - html5-schema = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "html5-schema"; - ename = "html5-schema"; - version = "0.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/html5-schema-0.1.tar"; - sha256 = "018zvdjhdrkcy8yrsqqqikhl6drmqm1fs0y50m8q8vx42p0cyi1p"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/html5-schema.html"; - license = lib.licenses.free; - }; - }) {}; - hydra = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib, lv }: - elpaBuild { - pname = "hydra"; - ename = "hydra"; - version = "0.15.0"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/hydra-0.15.0.tar"; - sha256 = "082wdr2nsfz8jhh7ic4nq4labz0pq8lcdwnxdmw79ppm20p2jipk"; - }; - packageRequires = [ cl-lib lv ]; - meta = { - homepage = "https://elpa.gnu.org/packages/hydra.html"; - license = lib.licenses.free; - }; - }) {}; - hyperbole = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "hyperbole"; - ename = "hyperbole"; - version = "9.0.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/hyperbole-9.0.1.tar"; - sha256 = "0gjscqa0zagbymm6wfilvc8g68f8myv90ryd8kqfcpy81fh4dhiz"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/hyperbole.html"; - license = lib.licenses.free; - }; - }) {}; - ilist = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "ilist"; - ename = "ilist"; - version = "0.3"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/ilist-0.3.tar"; - sha256 = "01a522sqx7j5m6b1k8xn71963igm93cd7ms1aawh1v2wmb09vbhm"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/ilist.html"; - license = lib.licenses.free; - }; - }) {}; - inspector = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "inspector"; - ename = "inspector"; - version = "0.36"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/inspector-0.36.tar"; - sha256 = "0hbh4a71w4yxicn7v7v492i7iv0ncv5sxwwsbwknbl9ixm482h2z"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/inspector.html"; - license = lib.licenses.free; - }; - }) {}; - ioccur = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "ioccur"; - ename = "ioccur"; - version = "2.6"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/ioccur-2.6.tar"; - sha256 = "0xyx5xd46n5x078k7pv022h84xmxv7fkh31ddib872bmnirhk6ln"; - }; - packageRequires = [ cl-lib emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/ioccur.html"; - license = lib.licenses.free; - }; - }) {}; - isearch-mb = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "isearch-mb"; - ename = "isearch-mb"; - version = "0.8"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/isearch-mb-0.8.tar"; - sha256 = "1b4929vr5gib406p51zcvq1ysmzvnz6bs1lqwjp517kzp6r4gc5y"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/isearch-mb.html"; - license = lib.licenses.free; - }; - }) {}; - iterators = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "iterators"; - ename = "iterators"; - version = "0.1.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/iterators-0.1.1.tar"; - sha256 = "1xcqvj9dail1irvj2nbfx9x106mcav104pp89jz2diamrky6ja49"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/iterators.html"; - license = lib.licenses.free; - }; - }) {}; - ivy = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "ivy"; - ename = "ivy"; - version = "0.14.2"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/ivy-0.14.2.tar"; - sha256 = "1h9gfkkcw9nfw85m0mh08qfmi2y0jkvdk54qx0iy5p04ysmhs6k1"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/ivy.html"; - license = lib.licenses.free; - }; - }) {}; - ivy-avy = callPackage ({ avy, elpaBuild, emacs, fetchurl, ivy, lib }: - elpaBuild { - pname = "ivy-avy"; - ename = "ivy-avy"; - version = "0.14.2"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/ivy-avy-0.14.2.tar"; - sha256 = "12s5z3h8bpa6vdk7f54i2dy18hd3p782pq3x6mkclkvlxijv7d11"; - }; - packageRequires = [ avy emacs ivy ]; - meta = { - homepage = "https://elpa.gnu.org/packages/ivy-avy.html"; - license = lib.licenses.free; - }; - }) {}; - ivy-explorer = callPackage ({ elpaBuild, emacs, fetchurl, ivy, lib }: - elpaBuild { - pname = "ivy-explorer"; - ename = "ivy-explorer"; - version = "0.3.2"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/ivy-explorer-0.3.2.tar"; - sha256 = "0wv7gp2kznc6f6g9ky1gvq72i78ihp582kyks82h13w25rvh6f0a"; - }; - packageRequires = [ emacs ivy ]; - meta = { - homepage = "https://elpa.gnu.org/packages/ivy-explorer.html"; - license = lib.licenses.free; - }; - }) {}; - ivy-hydra = callPackage ({ elpaBuild, emacs, fetchurl, hydra, ivy, lib }: - elpaBuild { - pname = "ivy-hydra"; - ename = "ivy-hydra"; - version = "0.14.2"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/ivy-hydra-0.14.2.tar"; - sha256 = "1p08rpj3ac2rwjcqbzkq9r5pmc1d9ci7s9bl0qv5cj5r8wpl69mx"; - }; - packageRequires = [ emacs hydra ivy ]; - meta = { - homepage = "https://elpa.gnu.org/packages/ivy-hydra.html"; - license = lib.licenses.free; - }; - }) {}; - ivy-posframe = callPackage ({ elpaBuild - , emacs - , fetchurl - , ivy - , lib - , posframe }: - elpaBuild { - pname = "ivy-posframe"; - ename = "ivy-posframe"; - version = "0.6.3"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/ivy-posframe-0.6.3.tar"; - sha256 = "027lbddg4rc44jpvxsqyw9n9pi1bnsssfislg2il3hbr86v88va9"; - }; - packageRequires = [ emacs ivy posframe ]; - meta = { - homepage = "https://elpa.gnu.org/packages/ivy-posframe.html"; - license = lib.licenses.free; - }; - }) {}; - jami-bot = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "jami-bot"; - ename = "jami-bot"; - version = "0.0.4"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/jami-bot-0.0.4.tar"; - sha256 = "1dp4k5y7qy793m3fyxvkk57bfy42kac2w5wvy7zqzd4lckm0a93z"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/jami-bot.html"; - license = lib.licenses.free; - }; - }) {}; - jarchive = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "jarchive"; - ename = "jarchive"; - version = "0.11.0"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/jarchive-0.11.0.tar"; - sha256 = "17klpdrv74hgpwnhknbihg90j6sbikf4j62lq0vbfv3s7r0a0gb8"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/jarchive.html"; - license = lib.licenses.free; - }; - }) {}; - javaimp = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "javaimp"; - ename = "javaimp"; - version = "0.9.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/javaimp-0.9.1.tar"; - sha256 = "1gy7qys9mzpgbqm5798fncmblmi32b350q51ccsyydq67yh69s3z"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/javaimp.html"; - license = lib.licenses.free; - }; - }) {}; - jgraph-mode = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "jgraph-mode"; - ename = "jgraph-mode"; - version = "1.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/jgraph-mode-1.1.tar"; - sha256 = "1ryxbszp15dy2chch2irqy7rmcspfjw717w4rd0vxjpwvgkjgiql"; - }; - packageRequires = [ cl-lib ]; - meta = { - homepage = "https://elpa.gnu.org/packages/jgraph-mode.html"; - license = lib.licenses.free; - }; - }) {}; - jinx = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "jinx"; - ename = "jinx"; - version = "1.7"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/jinx-1.7.tar"; - sha256 = "13snfsrwdbn23fdwpk42xp24x8bskl8sgsbq51nr896smjp2x3b4"; - }; - packageRequires = [ compat emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/jinx.html"; - license = lib.licenses.free; - }; - }) {}; - jit-spell = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "jit-spell"; - ename = "jit-spell"; - version = "0.4"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/jit-spell-0.4.tar"; - sha256 = "0p9nf2n0x6c6xl32aczghzipx8n5aq7a1x6r2s78xvpwr299k998"; - }; - packageRequires = [ compat emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/jit-spell.html"; - license = lib.licenses.free; - }; - }) {}; - js2-mode = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "js2-mode"; - ename = "js2-mode"; - version = "20231224"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/js2-mode-20231224.tar"; - sha256 = "023z76zxh5q6g26x7qlgf9476lj95sj84d5s3aqhy6xyskkyyg6c"; - }; - packageRequires = [ cl-lib emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/js2-mode.html"; - license = lib.licenses.free; - }; - }) {}; - json-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "json-mode"; - ename = "json-mode"; - version = "0.2"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/json-mode-0.2.tar"; - sha256 = "1ix8nq9rjfgbq8vzzjp179j2wa11il0ys8fjjy9gnlqwk6lnk86h"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/json-mode.html"; - license = lib.licenses.free; - }; - }) {}; - jsonrpc = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "jsonrpc"; - ename = "jsonrpc"; - version = "1.0.25"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/jsonrpc-1.0.25.tar"; - sha256 = "18f0g8j1rd2fpa707w6fll6ryj7mg6hbcy2pc3xff2a4ps8zv12b"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/jsonrpc.html"; - license = lib.licenses.free; - }; - }) {}; - jumpc = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "jumpc"; - ename = "jumpc"; - version = "3.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/jumpc-3.1.tar"; - sha256 = "1c6wzwrr1ydpn5ah5xnk159xcn4v1gv5rjm4iyfj83dss2ygirzp"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/jumpc.html"; - license = lib.licenses.free; - }; - }) {}; - kind-icon = callPackage ({ elpaBuild, emacs, fetchurl, lib, svg-lib }: - elpaBuild { - pname = "kind-icon"; - ename = "kind-icon"; - version = "0.2.2"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/kind-icon-0.2.2.tar"; - sha256 = "1zafx7rvfyahb7zzl2n9gpb2lc8x3k0bkcap2fl0n54aw4j98i69"; - }; - packageRequires = [ emacs svg-lib ]; - meta = { - homepage = "https://elpa.gnu.org/packages/kind-icon.html"; - license = lib.licenses.free; - }; - }) {}; - kiwix = callPackage ({ elpaBuild, emacs, fetchurl, lib, request }: - elpaBuild { - pname = "kiwix"; - ename = "kiwix"; - version = "1.1.5"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/kiwix-1.1.5.tar"; - sha256 = "1krmlyfjs8b7ibixbmv41vhg1gm7prck6lpp61v17fgig92a9k2s"; - }; - packageRequires = [ emacs request ]; - meta = { - homepage = "https://elpa.gnu.org/packages/kiwix.html"; - license = lib.licenses.free; - }; - }) {}; - kmb = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "kmb"; - ename = "kmb"; - version = "0.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/kmb-0.1.tar"; - sha256 = "12klfmdjjlyjvrzz3rx8dmamnag1fwljhs05jqwd0dv4a2q11gg5"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/kmb.html"; - license = lib.licenses.free; - }; - }) {}; - landmark = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "landmark"; - ename = "landmark"; - version = "1.0"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/landmark-1.0.tar"; - sha256 = "1nnmnvyfjmkk5ddw4q24py1bqzykr29klip61n16bqpr39v56gpg"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/landmark.html"; - license = lib.licenses.free; - }; - }) {}; - latex-table-wizard = callPackage ({ auctex - , elpaBuild - , emacs - , fetchurl - , lib - , transient }: - elpaBuild { - pname = "latex-table-wizard"; - ename = "latex-table-wizard"; - version = "1.5.4"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/latex-table-wizard-1.5.4.tar"; - sha256 = "1999kh5yi0cg1k0al3np3zi2qhrmcpzxqsfvwg0mgrg3mww4gqlw"; - }; - packageRequires = [ auctex emacs transient ]; - meta = { - homepage = "https://elpa.gnu.org/packages/latex-table-wizard.html"; - license = lib.licenses.free; - }; - }) {}; - leaf = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "leaf"; - ename = "leaf"; - version = "4.5.5"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/leaf-4.5.5.tar"; - sha256 = "1nvpl9ffma0ybbr7vlpcj7q33ja17zrswvl91bqljlmb4lb5121m"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/leaf.html"; - license = lib.licenses.free; - }; - }) {}; - lentic = callPackage ({ dash, elpaBuild, emacs, fetchurl, lib, m-buffer }: - elpaBuild { - pname = "lentic"; - ename = "lentic"; - version = "0.12"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/lentic-0.12.tar"; - sha256 = "0pszjhgy9dlk3h5gc8wnlklgl30ha3ig9bpmw2j1ps713vklfms7"; - }; - packageRequires = [ dash emacs m-buffer ]; - meta = { - homepage = "https://elpa.gnu.org/packages/lentic.html"; - license = lib.licenses.free; - }; - }) {}; - lentic-server = callPackage ({ elpaBuild - , fetchurl - , lentic - , lib - , web-server }: - elpaBuild { - pname = "lentic-server"; - ename = "lentic-server"; - version = "0.2"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/lentic-server-0.2.tar"; - sha256 = "1r0jcfylvhlihwm6pm4f8pzvsmnlspfkph1hgi5qjkv311045244"; - }; - packageRequires = [ lentic web-server ]; - meta = { - homepage = "https://elpa.gnu.org/packages/lentic-server.html"; - license = lib.licenses.free; - }; - }) {}; - let-alist = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "let-alist"; - ename = "let-alist"; - version = "1.0.6"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/let-alist-1.0.6.tar"; - sha256 = "1fk1yl2cg4gxcn02n2gki289dgi3lv56n0akkm2h7dhhbgfr6gqm"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/let-alist.html"; - license = lib.licenses.free; - }; - }) {}; - lex = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "lex"; - ename = "lex"; - version = "1.2"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/lex-1.2.tar"; - sha256 = "1pqjrlw558l4z4k40jmli8lmcqlzddhkr0mfm38rbycp7ghdr4zx"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/lex.html"; - license = lib.licenses.free; - }; - }) {}; - lin = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "lin"; - ename = "lin"; - version = "1.0.0"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/lin-1.0.0.tar"; - sha256 = "1yxvpgh3sbw0d0zkjfgbhjc2bziqvkyj7fgwcl3814q7hh8m4146"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/lin.html"; - license = lib.licenses.free; - }; - }) {}; - listen = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib - , persist - , taxy - , taxy-magit-section - , transient }: - elpaBuild { - pname = "listen"; - ename = "listen"; - version = "0.9"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/listen-0.9.tar"; - sha256 = "1g1sv8fs8vl93fah7liaqzgwvc4b1chasx5151ayizz4q2qgwwbp"; - }; - packageRequires = [ emacs persist taxy taxy-magit-section transient ]; - meta = { - homepage = "https://elpa.gnu.org/packages/listen.html"; - license = lib.licenses.free; - }; - }) {}; - llm = callPackage ({ elpaBuild, emacs, fetchurl, lib, plz }: - elpaBuild { - pname = "llm"; - ename = "llm"; - version = "0.15.0"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/llm-0.15.0.tar"; - sha256 = "1y3gs8zsng87wmlkx5az396hci4xyn0ww7cbaavisqbrxam51qvj"; - }; - packageRequires = [ emacs plz ]; - meta = { - homepage = "https://elpa.gnu.org/packages/llm.html"; - license = lib.licenses.free; - }; - }) {}; - lmc = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "lmc"; - ename = "lmc"; - version = "1.4"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/lmc-1.4.tar"; - sha256 = "0c8sd741a7imn1im4j17m99bs6zmppndsxpn23k33lmcqj1rfhsk"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/lmc.html"; - license = lib.licenses.free; - }; - }) {}; - load-dir = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "load-dir"; - ename = "load-dir"; - version = "0.0.5"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/load-dir-0.0.5.tar"; - sha256 = "1yxnckd7s4alkaddfs672g0jnsxir7c70crnm6rsc5vhmw6310nx"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/load-dir.html"; - license = lib.licenses.free; - }; - }) {}; - load-relative = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "load-relative"; - ename = "load-relative"; - version = "1.3.2"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/load-relative-1.3.2.tar"; - sha256 = "04ppqfzlqz7156aqm56yccizv0n71qir7yyp7xfiqq6vgj322rqv"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/load-relative.html"; - license = lib.licenses.free; - }; - }) {}; - loc-changes = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "loc-changes"; - ename = "loc-changes"; - version = "1.2"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/loc-changes-1.2.el"; - sha256 = "1x8fn8vqasayf1rb8a6nma9n6nbvkx60krmiahyb05vl5rrsw6r3"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/loc-changes.html"; - license = lib.licenses.free; - }; - }) {}; - loccur = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "loccur"; - ename = "loccur"; - version = "1.2.4"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/loccur-1.2.4.tar"; - sha256 = "1b8rmbl03k8fdy217ngbxsc0a3jxxmqnwshf72f4iay8ln4hasgk"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/loccur.html"; - license = lib.licenses.free; - }; - }) {}; - logos = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "logos"; - ename = "logos"; - version = "1.1.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/logos-1.1.1.tar"; - sha256 = "0dyy1y6225kbmsl5zy4hp0bdnnp06l05m8zqxc22alsivy2qvkjb"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/logos.html"; - license = lib.licenses.free; - }; - }) {}; - luwak = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "luwak"; - ename = "luwak"; - version = "1.0.0"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/luwak-1.0.0.tar"; - sha256 = "0z6h1cg7nshv87zl4fia6l5gwf9ax6f4wgxijf2smi8cpwmv6j79"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/luwak.html"; - license = lib.licenses.free; - }; - }) {}; - lv = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "lv"; - ename = "lv"; - version = "0.15.0"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/lv-0.15.0.tar"; - sha256 = "1wb8whyj8zpsd7nm7r0yjvkfkr2ml80di7alcafpadzli808j2l4"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/lv.html"; - license = lib.licenses.free; - }; - }) {}; - m-buffer = callPackage ({ elpaBuild, fetchurl, lib, seq }: - elpaBuild { - pname = "m-buffer"; - ename = "m-buffer"; - version = "0.16"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/m-buffer-0.16.tar"; - sha256 = "16drbgamp7yd1ndw2qrycrgmnknv5k7h4d7svcdhv9az6fg1vzn4"; - }; - packageRequires = [ seq ]; - meta = { - homepage = "https://elpa.gnu.org/packages/m-buffer.html"; - license = lib.licenses.free; - }; - }) {}; - map = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "map"; - ename = "map"; - version = "3.3.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/map-3.3.1.tar"; - sha256 = "1za8wjdvyxsxvmzla823f7z0s4wbl22l8k08v8b4h4m6i7w356lp"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/map.html"; - license = lib.licenses.free; - }; - }) {}; - marginalia = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "marginalia"; - ename = "marginalia"; - version = "1.6"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/marginalia-1.6.tar"; - sha256 = "0an3ayka1f7n511bjfwz42h9g5b1vhb6x47jy0k9psscr7pbhszg"; - }; - packageRequires = [ compat emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/marginalia.html"; - license = lib.licenses.free; - }; - }) {}; - markchars = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "markchars"; - ename = "markchars"; - version = "0.2.2"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/markchars-0.2.2.tar"; - sha256 = "0jagp5s2kk8ijwxbg5ccq31bjlcxkqpqhsg7a1hbyp3p5z3j73m0"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/markchars.html"; - license = lib.licenses.free; - }; - }) {}; - math-symbol-lists = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "math-symbol-lists"; - ename = "math-symbol-lists"; - version = "1.3"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/math-symbol-lists-1.3.tar"; - sha256 = "1r2acaf79kwwvndqn9xbvq9dc12vr3lryc25yp0w0gksp86p8cfa"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/math-symbol-lists.html"; - license = lib.licenses.free; - }; - }) {}; - mct = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "mct"; - ename = "mct"; - version = "1.0.0"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/mct-1.0.0.tar"; - sha256 = "0f8znz4basrdh56pcldsazxv3mwqir807lsaza2g5bfqws0c7h8k"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/mct.html"; - license = lib.licenses.free; - }; - }) {}; - memory-usage = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "memory-usage"; - ename = "memory-usage"; - version = "0.2"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/memory-usage-0.2.tar"; - sha256 = "04bylvy86x8w96g7zil3jzyac0fijvb5lz4830ja5yabpvsnk3vq"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/memory-usage.html"; - license = lib.licenses.free; - }; - }) {}; - metar = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "metar"; - ename = "metar"; - version = "0.3"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/metar-0.3.tar"; - sha256 = "07nf14zm5y6ma6wqnyw5bf7cvk3ybw7hvlrwcnri10s8vh3rqd0r"; - }; - packageRequires = [ cl-lib ]; - meta = { - homepage = "https://elpa.gnu.org/packages/metar.html"; - license = lib.licenses.free; - }; - }) {}; - midi-kbd = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "midi-kbd"; - ename = "midi-kbd"; - version = "0.2"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/midi-kbd-0.2.tar"; - sha256 = "0jd92rainjd1nx72z7mrvsxs3az6axxiw1v9sbpsj03x8qq0129q"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/midi-kbd.html"; - license = lib.licenses.free; - }; - }) {}; - mines = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "mines"; - ename = "mines"; - version = "1.6"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/mines-1.6.tar"; - sha256 = "0j52n43mv963hpgdh5kk1k9wi821r6w3diwdp47rfwsijdd0wnhs"; - }; - packageRequires = [ cl-lib emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/mines.html"; - license = lib.licenses.free; - }; - }) {}; - minibuffer-header = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "minibuffer-header"; - ename = "minibuffer-header"; - version = "0.5"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/minibuffer-header-0.5.tar"; - sha256 = "1qic33wsdba5xw3qxigq18nibwhj45ggk0ragy4zj9cfy1l2ni44"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/minibuffer-header.html"; - license = lib.licenses.free; - }; - }) {}; - minibuffer-line = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "minibuffer-line"; - ename = "minibuffer-line"; - version = "0.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/minibuffer-line-0.1.tar"; - sha256 = "0sg9vhv7bi82a90ziiwsabnfvw8zp544v0l93hbl42cj432bpwfx"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/minibuffer-line.html"; - license = lib.licenses.free; - }; - }) {}; - minimap = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "minimap"; - ename = "minimap"; - version = "1.4"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/minimap-1.4.tar"; - sha256 = "0n27wp65x5n21qy6x5dhzms8inf0248kzninp56kfx1bbf9w4x66"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/minimap.html"; - license = lib.licenses.free; - }; - }) {}; - mmm-mode = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "mmm-mode"; - ename = "mmm-mode"; - version = "0.5.11"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/mmm-mode-0.5.11.tar"; - sha256 = "0dh76lk0am07j2zi7hhbmr6cnnss7l0b9rhi9is0w0n5i7j4i0p2"; - }; - packageRequires = [ cl-lib emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/mmm-mode.html"; - license = lib.licenses.free; - }; - }) {}; - modus-themes = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "modus-themes"; - ename = "modus-themes"; - version = "4.4.0"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/modus-themes-4.4.0.tar"; - sha256 = "1bqvyf8xq55dligwqhw4d6z9bv529rhnijxv5y5gdlzap973bf71"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/modus-themes.html"; - license = lib.licenses.free; - }; - }) {}; - mpdired = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "mpdired"; - ename = "mpdired"; - version = "1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/mpdired-1.tar"; - sha256 = "08lc0j25kxisykd2l9v4iamalmm5hzsnsm026v808krny28wwbp3"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/mpdired.html"; - license = lib.licenses.free; - }; - }) {}; - multi-mode = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "multi-mode"; - ename = "multi-mode"; - version = "1.14"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/multi-mode-1.14.tar"; - sha256 = "0i2l50lcsj3mm9k38kfmh2hnb437pjbk2yxv26p6na1g1n44lkil"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/multi-mode.html"; - license = lib.licenses.free; - }; - }) {}; - multishell = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "multishell"; - ename = "multishell"; - version = "1.1.10"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/multishell-1.1.10.tar"; - sha256 = "1khqc7a04ynl63lpv898361sv37jgpd1fzvl0ryphprv9shnhw10"; - }; - packageRequires = [ cl-lib ]; - meta = { - homepage = "https://elpa.gnu.org/packages/multishell.html"; - license = lib.licenses.free; - }; - }) {}; - muse = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "muse"; - ename = "muse"; - version = "3.20.2"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/muse-3.20.2.tar"; - sha256 = "0g2ff6x45x2k5dnkp31sk3bjj92jyhhnar7l5hzn8vp22l0rv8wn"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/muse.html"; - license = lib.licenses.free; - }; - }) {}; - myers = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "myers"; - ename = "myers"; - version = "0.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/myers-0.1.tar"; - sha256 = "0a053w7nj0qfryvsh1ss854wxwbk5mhkl8a5nprcfgsh4qh2m487"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/myers.html"; - license = lib.licenses.free; - }; - }) {}; - nadvice = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "nadvice"; - ename = "nadvice"; - version = "0.4"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/nadvice-0.4.tar"; - sha256 = "19dx07v4z2lyyp18v45c5hgp65akw58bdqg5lcrzyb9mrlji8js6"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/nadvice.html"; - license = lib.licenses.free; - }; - }) {}; - nameless = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "nameless"; - ename = "nameless"; - version = "1.0.2"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/nameless-1.0.2.tar"; - sha256 = "0m3z701j2i13zmr4g0wjd3ms6ajr6w371n5kx95n9ssxyjwjppcm"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/nameless.html"; - license = lib.licenses.free; - }; - }) {}; - names = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "names"; - ename = "names"; - version = "20151201.0"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/names-20151201.0.tar"; - sha256 = "0nf6n8hk58a7r56d899s5dsva3jjvh3qx9g2d1hra403fwlds74k"; - }; - packageRequires = [ cl-lib emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/names.html"; - license = lib.licenses.free; - }; - }) {}; - nano-agenda = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "nano-agenda"; - ename = "nano-agenda"; - version = "0.3"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/nano-agenda-0.3.tar"; - sha256 = "12sh6wqqd13sv966wj4k4djidn238fdb6l4wg3z9ib0dx36nygcr"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/nano-agenda.html"; - license = lib.licenses.free; - }; - }) {}; - nano-modeline = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "nano-modeline"; - ename = "nano-modeline"; - version = "1.1.0"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/nano-modeline-1.1.0.tar"; - sha256 = "1x4b4j82vzbi1mhbs9bwgw41hcagnfk56kswjk928i179pnkr0cx"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/nano-modeline.html"; - license = lib.licenses.free; - }; - }) {}; - nano-theme = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "nano-theme"; - ename = "nano-theme"; - version = "0.3.4"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/nano-theme-0.3.4.tar"; - sha256 = "0x49lk0kx8mz72a81li6gwg3kivn7bn4ld0mml28smzqqfr3873a"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/nano-theme.html"; - license = lib.licenses.free; - }; - }) {}; - nftables-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "nftables-mode"; - ename = "nftables-mode"; - version = "1.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/nftables-mode-1.1.tar"; - sha256 = "1wjw6n60kj84j8gj62mr6s97xd0aqvr4v7npyxwmhckw9z13xcqv"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/nftables-mode.html"; - license = lib.licenses.free; - }; - }) {}; - nhexl-mode = callPackage ({ cl-lib ? null - , elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "nhexl-mode"; - ename = "nhexl-mode"; - version = "1.5"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/nhexl-mode-1.5.tar"; - sha256 = "1i1by5bp5dby2r2jhzr0jvnchrybgnzmc5ln84w66180shk2s3yk"; - }; - packageRequires = [ cl-lib emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/nhexl-mode.html"; - license = lib.licenses.free; - }; - }) {}; - nlinum = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "nlinum"; - ename = "nlinum"; - version = "1.9"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/nlinum-1.9.tar"; - sha256 = "1cpyg6cxaaaaq6hc066l759dlas5mhn1fi398myfglnwrglia3lm"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/nlinum.html"; - license = lib.licenses.free; - }; - }) {}; - notes-mode = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "notes-mode"; - ename = "notes-mode"; - version = "1.31"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/notes-mode-1.31.tar"; - sha256 = "0lwja53cknd1w432mcbfrcshmxmk23dqrbr9k2101pqfzbw8nri2"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/notes-mode.html"; - license = lib.licenses.free; - }; - }) {}; - notmuch-indicator = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "notmuch-indicator"; - ename = "notmuch-indicator"; - version = "1.2.0"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/notmuch-indicator-1.2.0.tar"; - sha256 = "1n525slxs0l5nbila1sy62fz384yz7f54nrq1ixdlq0j3czgh9kz"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/notmuch-indicator.html"; - license = lib.licenses.free; - }; - }) {}; - ntlm = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "ntlm"; - ename = "ntlm"; - version = "2.1.0"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/ntlm-2.1.0.tar"; - sha256 = "0kivmb6b57qjrwd41zwlfdq7l9nisbh4mgd96rplrkxpzw6dq0j7"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/ntlm.html"; - license = lib.licenses.free; - }; - }) {}; - num3-mode = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "num3-mode"; - ename = "num3-mode"; - version = "1.5"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/num3-mode-1.5.tar"; - sha256 = "1a7w2qd210zp199c1js639xbv2kmqmgvcqi5dn1vsazasp2dwlj2"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/num3-mode.html"; - license = lib.licenses.free; - }; - }) {}; - oauth2 = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib, nadvice }: - elpaBuild { - pname = "oauth2"; - ename = "oauth2"; - version = "0.16"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/oauth2-0.16.tar"; - sha256 = "0bz4gqg5bhv6zk875q7sb0y56yvylnv0chj77ivjjpkha6rdp311"; - }; - packageRequires = [ cl-lib nadvice ]; - meta = { - homepage = "https://elpa.gnu.org/packages/oauth2.html"; - license = lib.licenses.free; - }; - }) {}; - ob-asymptote = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "ob-asymptote"; - ename = "ob-asymptote"; - version = "1.0"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/ob-asymptote-1.0.tar"; - sha256 = "1hmqbkrqg18w454xg37rg5cg0q3vd0b0fm14n5chihqrwwnwrf4l"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/ob-asymptote.html"; - license = lib.licenses.free; - }; - }) {}; - ob-haxe = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "ob-haxe"; - ename = "ob-haxe"; - version = "1.0"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/ob-haxe-1.0.tar"; - sha256 = "095qcvxpanw6fh96dfkdydn10xikbrjwih7i05iiyvazpk4x6nbz"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/ob-haxe.html"; - license = lib.licenses.free; - }; - }) {}; - objed = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "objed"; - ename = "objed"; - version = "0.8.3"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/objed-0.8.3.tar"; - sha256 = "1shgpha6f1pql95v86whsw6w6j7v35cas98fyygwrpkcrxx9a56r"; - }; - packageRequires = [ cl-lib emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/objed.html"; - license = lib.licenses.free; - }; - }) {}; - omn-mode = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "omn-mode"; - ename = "omn-mode"; - version = "1.3"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/omn-mode-1.3.tar"; - sha256 = "01yg4ifbz7jfhvq6r6naf50vx00wpjsr44mmlj580bylfrmdc839"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/omn-mode.html"; - license = lib.licenses.free; - }; - }) {}; - on-screen = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "on-screen"; - ename = "on-screen"; - version = "1.3.3"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/on-screen-1.3.3.tar"; - sha256 = "0w5cv3bhb6cyjhvglp5y6cy51ppsh2xd1x53i4w0gm44g5n8l6bd"; - }; - packageRequires = [ cl-lib ]; - meta = { - homepage = "https://elpa.gnu.org/packages/on-screen.html"; - license = lib.licenses.free; - }; - }) {}; - openpgp = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "openpgp"; - ename = "openpgp"; - version = "1.0.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/openpgp-1.0.1.tar"; - sha256 = "052wh38q6r09avxa0bgc5gn4769763zmgijza76mb0b3lzj66syv"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/openpgp.html"; - license = lib.licenses.free; - }; - }) {}; - orderless = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "orderless"; - ename = "orderless"; - version = "1.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/orderless-1.1.tar"; - sha256 = "1qjxln21ydc86kabk5kwa6ky40qjqcrk5nmc92w42x3ypxs711f3"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/orderless.html"; - license = lib.licenses.free; - }; - }) {}; - org = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "org"; - ename = "org"; - version = "9.6.30"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/org-9.6.30.tar"; - sha256 = "0h2p7gjiys5ch68y35l6bpw9pp852vprmfzi0dk86z1wkilhycip"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/org.html"; - license = lib.licenses.free; - }; - }) {}; - org-contacts = callPackage ({ elpaBuild, emacs, fetchurl, lib, org }: - elpaBuild { - pname = "org-contacts"; - ename = "org-contacts"; - version = "1.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/org-contacts-1.1.tar"; - sha256 = "0gqanhnrxajx5cf7g9waks23sclbmvmwjqrs0q4frcih3gs2nhix"; - }; - packageRequires = [ emacs org ]; - meta = { - homepage = "https://elpa.gnu.org/packages/org-contacts.html"; - license = lib.licenses.free; - }; - }) {}; - org-edna = callPackage ({ elpaBuild, emacs, fetchurl, lib, org, seq }: - elpaBuild { - pname = "org-edna"; - ename = "org-edna"; - version = "1.1.2"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/org-edna-1.1.2.tar"; - sha256 = "1pifs5mbcjab21ylclck4kjdcds1xkvym27ncn9wwr8fl3fff2yl"; - }; - packageRequires = [ emacs org seq ]; - meta = { - homepage = "https://elpa.gnu.org/packages/org-edna.html"; - license = lib.licenses.free; - }; - }) {}; - org-jami-bot = callPackage ({ elpaBuild, emacs, fetchurl, jami-bot, lib }: - elpaBuild { - pname = "org-jami-bot"; - ename = "org-jami-bot"; - version = "0.0.5"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/org-jami-bot-0.0.5.tar"; - sha256 = "1fiv0a7k6alvfvb7c6av0kbkwbw58plw05hhcf1vnkr9gda3s13y"; - }; - packageRequires = [ emacs jami-bot ]; - meta = { - homepage = "https://elpa.gnu.org/packages/org-jami-bot.html"; - license = lib.licenses.free; - }; - }) {}; - org-modern = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "org-modern"; - ename = "org-modern"; - version = "1.2"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/org-modern-1.2.tar"; - sha256 = "1bm8kkcrn0glsb69sapj1zmb2ygd4sxksb3gag4hw1v5w3g51jjh"; - }; - packageRequires = [ compat emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/org-modern.html"; - license = lib.licenses.free; - }; - }) {}; - org-notify = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "org-notify"; - ename = "org-notify"; - version = "0.1.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/org-notify-0.1.1.tar"; - sha256 = "1vg0h32x5lc3p5n71m23q8mfdd1fq9ffmy9rsm5rcdphfk8s9x5l"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/org-notify.html"; - license = lib.licenses.free; - }; - }) {}; - org-real = callPackage ({ boxy, elpaBuild, emacs, fetchurl, lib, org }: - elpaBuild { - pname = "org-real"; - ename = "org-real"; - version = "1.0.9"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/org-real-1.0.9.tar"; - sha256 = "0g19pgg7rqijb6q1vpifvpzl2gyc13a42q1n23x3kawl2srhcjp2"; - }; - packageRequires = [ boxy emacs org ]; - meta = { - homepage = "https://elpa.gnu.org/packages/org-real.html"; - license = lib.licenses.free; - }; - }) {}; - org-remark = callPackage ({ elpaBuild, emacs, fetchurl, lib, org }: - elpaBuild { - pname = "org-remark"; - ename = "org-remark"; - version = "1.2.2"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/org-remark-1.2.2.tar"; - sha256 = "01iprzgbyvbfpxp6fls4lfx2lxx7xkff80m35s9kc0ih5jlxc5qs"; - }; - packageRequires = [ emacs org ]; - meta = { - homepage = "https://elpa.gnu.org/packages/org-remark.html"; - license = lib.licenses.free; - }; - }) {}; - org-transclusion = callPackage ({ elpaBuild, emacs, fetchurl, lib, org }: - elpaBuild { - pname = "org-transclusion"; - ename = "org-transclusion"; - version = "1.4.0"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/org-transclusion-1.4.0.tar"; - sha256 = "0ci6xja3jkj1a9f76sf3780gcjrdpbds2y2bwba3b55fjmr1fscl"; - }; - packageRequires = [ emacs org ]; - meta = { - homepage = "https://elpa.gnu.org/packages/org-transclusion.html"; - license = lib.licenses.free; - }; - }) {}; - org-translate = callPackage ({ elpaBuild, emacs, fetchurl, lib, org }: - elpaBuild { - pname = "org-translate"; - ename = "org-translate"; - version = "0.1.4"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/org-translate-0.1.4.tar"; - sha256 = "0s0vqpncb6rvhpxdir5ghanjyhpw7bplqfh3bpgri5ay2b46kj4f"; - }; - packageRequires = [ emacs org ]; - meta = { - homepage = "https://elpa.gnu.org/packages/org-translate.html"; - license = lib.licenses.free; - }; - }) {}; - orgalist = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "orgalist"; - ename = "orgalist"; - version = "1.14"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/orgalist-1.14.tar"; - sha256 = "02diwanqldzr42aaa5kqcj1xgxmf1k6rqhk9zv40psqpzgd1yms5"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/orgalist.html"; - license = lib.licenses.free; - }; - }) {}; - osc = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "osc"; - ename = "osc"; - version = "0.4"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/osc-0.4.tar"; - sha256 = "1ls6v0mkh7z90amrlczrvv6mgpv6hzzjw0zlxjlzsj2vr1gz3vca"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/osc.html"; - license = lib.licenses.free; - }; - }) {}; - osm = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "osm"; - ename = "osm"; - version = "1.3"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/osm-1.3.tar"; - sha256 = "0s5k6akdvbm9gsgzjlz795vgfy3pkl4qdk45p16p40f59dr49g4r"; - }; - packageRequires = [ compat emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/osm.html"; - license = lib.licenses.free; - }; - }) {}; - other-frame-window = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "other-frame-window"; - ename = "other-frame-window"; - version = "1.0.6"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/other-frame-window-1.0.6.tar"; - sha256 = "1x8i6hbl48vmp5h43drr35lwaiwhcyr3vnk7rcyim5jl2ijw8yc0"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/other-frame-window.html"; - license = lib.licenses.free; - }; - }) {}; - pabbrev = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "pabbrev"; - ename = "pabbrev"; - version = "4.3.0"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/pabbrev-4.3.0.tar"; - sha256 = "1fplbmzqz066gsmvmf2indg4n348vdgs2m34dm32gnrjghfrxxhs"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/pabbrev.html"; - license = lib.licenses.free; - }; - }) {}; - paced = callPackage ({ async, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "paced"; - ename = "paced"; - version = "1.1.3"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/paced-1.1.3.tar"; - sha256 = "0j2362zq22j6qma6bb6jh6qpd12zrc161pgl9cfhnq5m3s9i1sz4"; - }; - packageRequires = [ async emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/paced.html"; - license = lib.licenses.free; - }; - }) {}; - parsec = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "parsec"; - ename = "parsec"; - version = "0.1.3"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/parsec-0.1.3.tar"; - sha256 = "032m9iks5a05vbc4159dfs9b7shmqm6mk05jgbs9ndvy400drwd6"; - }; - packageRequires = [ cl-lib emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/parsec.html"; - license = lib.licenses.free; - }; - }) {}; - parser-generator = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "parser-generator"; - ename = "parser-generator"; - version = "0.2.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/parser-generator-0.2.1.tar"; - sha256 = "1vrgkvcj16550frq2jivw31cmq6rhwrifmdk4rf0266br3jdarpf"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/parser-generator.html"; - license = lib.licenses.free; - }; - }) {}; - path-iterator = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "path-iterator"; - ename = "path-iterator"; - version = "1.0"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/path-iterator-1.0.tar"; - sha256 = "0v9gasc0wlqd7pks6k3695md7mdfnaknh6xinmp4pkvvalfh7shv"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/path-iterator.html"; - license = lib.licenses.free; - }; - }) {}; - peg = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "peg"; - ename = "peg"; - version = "1.0.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/peg-1.0.1.tar"; - sha256 = "14ll56fn9n11nydydslp7xyn79122dprm89i181ks170v0qcsps3"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/peg.html"; - license = lib.licenses.free; - }; - }) {}; - perl-doc = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "perl-doc"; - ename = "perl-doc"; - version = "0.81"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/perl-doc-0.81.tar"; - sha256 = "1828jfl5dwk1751jsrpr2gr8hs1x315xlb9vhiis8frzvqmsribw"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/perl-doc.html"; - license = lib.licenses.free; - }; - }) {}; - persist = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "persist"; - ename = "persist"; - version = "0.6"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/persist-0.6.tar"; - sha256 = "1p6h211xk0lrk4zqlm51rsms5lza9ymx6ayh9ij0afqrjqgffw77"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/persist.html"; - license = lib.licenses.free; - }; - }) {}; - phps-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "phps-mode"; - ename = "phps-mode"; - version = "0.4.49"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/phps-mode-0.4.49.tar"; - sha256 = "1zxzv6h2075s0ldwr9izfy3sxrrg3x5y5vilnlgnwd7prcq8qa8y"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/phps-mode.html"; - license = lib.licenses.free; - }; - }) {}; - pinentry = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "pinentry"; - ename = "pinentry"; - version = "0.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/pinentry-0.1.tar"; - sha256 = "0i5g4yj2qva3rp8ay2fl9gcmp7q42caqryjyni8r5h4f3misviwq"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/pinentry.html"; - license = lib.licenses.free; - }; - }) {}; - plz = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "plz"; - ename = "plz"; - version = "0.8"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/plz-0.8.tar"; - sha256 = "0kg275kq5hi83ry0n83w8pi0qn2lmlv9gnxcbwf1dcqk7n9i2v64"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/plz.html"; - license = lib.licenses.free; - }; - }) {}; - plz-see = callPackage ({ elpaBuild, emacs, fetchurl, lib, plz }: - elpaBuild { - pname = "plz-see"; - ename = "plz-see"; - version = "0.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/plz-see-0.1.tar"; - sha256 = "1mi35d9b26d425v1kkmmbh477klcxf76fnyg154ddjm0nkgqq90d"; - }; - packageRequires = [ emacs plz ]; - meta = { - homepage = "https://elpa.gnu.org/packages/plz-see.html"; - license = lib.licenses.free; - }; - }) {}; - poke = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "poke"; - ename = "poke"; - version = "3.2"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/poke-3.2.tar"; - sha256 = "15j4g5y427d9mja2irv3ak6x60ik4kpnscnwl9pqym7qly7sa3v9"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/poke.html"; - license = lib.licenses.free; - }; - }) {}; - poke-mode = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "poke-mode"; - ename = "poke-mode"; - version = "3.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/poke-mode-3.1.tar"; - sha256 = "0g4vd26ahkmjxlcvqwd0mbk60qaf6c9zba9x7bb9pqabka9438y1"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/poke-mode.html"; - license = lib.licenses.free; - }; - }) {}; - poker = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "poker"; - ename = "poker"; - version = "0.2"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/poker-0.2.tar"; - sha256 = "10lfc6i4f08ydxanidwiq9404h4nxfa0vh4av5rrj6snqzqvd1bw"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/poker.html"; - license = lib.licenses.free; - }; - }) {}; - popper = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "popper"; - ename = "popper"; - version = "0.4.6"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/popper-0.4.6.tar"; - sha256 = "0xwy4p9g0lfd4ybamsl5gsppmx79yv16s4lh095x5y5qfmgcvq2c"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/popper.html"; - license = lib.licenses.free; - }; - }) {}; - posframe = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "posframe"; - ename = "posframe"; - version = "1.4.3"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/posframe-1.4.3.tar"; - sha256 = "1kw37dhyd6qxj0h2qpzi539jrgc0pj90psf2k58z4jc9199bgsax"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/posframe.html"; - license = lib.licenses.free; - }; - }) {}; - pq = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "pq"; - ename = "pq"; - version = "0.2"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/pq-0.2.tar"; - sha256 = "0d8ylsbmypaj29w674a4k445zr6hnggic8rsv7wx7jml6p2zph2n"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/pq.html"; - license = lib.licenses.free; - }; - }) {}; - project = callPackage ({ elpaBuild, emacs, fetchurl, lib, xref }: - elpaBuild { - pname = "project"; - ename = "project"; - version = "0.10.0"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/project-0.10.0.tar"; - sha256 = "07lv41asdah2v3k6nrc73z3pjhsm7viygr12ly9p96g2yw11irg6"; - }; - packageRequires = [ emacs xref ]; - meta = { - homepage = "https://elpa.gnu.org/packages/project.html"; - license = lib.licenses.free; - }; - }) {}; - psgml = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "psgml"; - ename = "psgml"; - version = "1.3.5"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/psgml-1.3.5.tar"; - sha256 = "1lfk95kr43az6ykfyhj7ygccw3ms2ifyyp43w9lwm5fcawgc8952"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/psgml.html"; - license = lib.licenses.free; - }; - }) {}; - pspp-mode = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "pspp-mode"; - ename = "pspp-mode"; - version = "1.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/pspp-mode-1.1.el"; - sha256 = "1qnwj7r367qs0ykw71c6s96ximgg2wb3hxg5fwsl9q2vfhbh35ca"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/pspp-mode.html"; - license = lib.licenses.free; - }; - }) {}; - pulsar = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "pulsar"; - ename = "pulsar"; - version = "1.0.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/pulsar-1.0.1.tar"; - sha256 = "0xljxkls6lckfg5whx2kb44dp67q2jfs7cbk6ih5b3zm6h599d4k"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/pulsar.html"; - license = lib.licenses.free; - }; - }) {}; - pyim = callPackage ({ async, elpaBuild, emacs, fetchurl, lib, xr }: - elpaBuild { - pname = "pyim"; - ename = "pyim"; - version = "5.3.4"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/pyim-5.3.4.tar"; - sha256 = "0axi8vizr2pdswdnnkr409k926h9k7w3c18nbmb9j3pfc32inkjs"; - }; - packageRequires = [ async emacs xr ]; - meta = { - homepage = "https://elpa.gnu.org/packages/pyim.html"; - license = lib.licenses.free; - }; - }) {}; - pyim-basedict = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "pyim-basedict"; - ename = "pyim-basedict"; - version = "0.5.4"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/pyim-basedict-0.5.4.tar"; - sha256 = "0i42i9jr0p940w17fjjrzd258winjl7sv4g423ihd6057xmdpyd8"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/pyim-basedict.html"; - license = lib.licenses.free; - }; - }) {}; - python = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "python"; - ename = "python"; - version = "0.28"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/python-0.28.tar"; - sha256 = "042jhg87bnc750wwjwvp32ici3pyswx1pza2qz014ykdqqnsx0aq"; - }; - packageRequires = [ cl-lib emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/python.html"; - license = lib.licenses.free; - }; - }) {}; - quarter-plane = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "quarter-plane"; - ename = "quarter-plane"; - version = "0.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/quarter-plane-0.1.tar"; - sha256 = "06syayqdmh4nb7ys52g1mw01wnz5hjv710dari106fk8fm9cy18c"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/quarter-plane.html"; - license = lib.licenses.free; - }; - }) {}; - queue = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "queue"; - ename = "queue"; - version = "0.2"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/queue-0.2.tar"; - sha256 = "117g6sl5dh7ssp6m18npvrqik5rs2mnr16129cfpnbi3crsw23c8"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/queue.html"; - license = lib.licenses.free; - }; - }) {}; - rainbow-mode = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "rainbow-mode"; - ename = "rainbow-mode"; - version = "1.0.6"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/rainbow-mode-1.0.6.tar"; - sha256 = "0xv39jix1gbwq6f8laj93sqkf2j5hwda3l7mjqc7vsqjw1lkhmjv"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/rainbow-mode.html"; - license = lib.licenses.free; - }; - }) {}; - rbit = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "rbit"; - ename = "rbit"; - version = "0.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/rbit-0.1.tar"; - sha256 = "1xfl3m53bdi25h8mp7s0zp1yy7436cfydxrgkfc31fsxkh009l9h"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/rbit.html"; - license = lib.licenses.free; - }; - }) {}; - rcirc-color = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "rcirc-color"; - ename = "rcirc-color"; - version = "0.4.5"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/rcirc-color-0.4.5.tar"; - sha256 = "0sfwmi0sspj7sx1psij4fzq1knwva8706w0204mbjxsq2nh5s9f3"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/rcirc-color.html"; - license = lib.licenses.free; - }; - }) {}; - rcirc-menu = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "rcirc-menu"; - ename = "rcirc-menu"; - version = "1.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/rcirc-menu-1.1.el"; - sha256 = "0w77qlwlmx59v5894i96fldn6x4lliv4ddv8967vq1kfchn4w5mc"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/rcirc-menu.html"; - license = lib.licenses.free; - }; - }) {}; - rcirc-sqlite = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "rcirc-sqlite"; - ename = "rcirc-sqlite"; - version = "1.0.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/rcirc-sqlite-1.0.1.tar"; - sha256 = "0n0492s500gplmv7l8n8l7s3rpm1nli3n706n9f91qc15z6p6mcv"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/rcirc-sqlite.html"; - license = lib.licenses.free; - }; - }) {}; - realgud = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib - , load-relative - , loc-changes - , test-simple }: - elpaBuild { - pname = "realgud"; - ename = "realgud"; - version = "1.5.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/realgud-1.5.1.tar"; - sha256 = "1iisvzxvdsifxkz7b2wacw85dkjagrmbcdhcfsnswnfbp3r3kg35"; - }; - packageRequires = [ emacs load-relative loc-changes test-simple ]; - meta = { - homepage = "https://elpa.gnu.org/packages/realgud.html"; - license = lib.licenses.free; - }; - }) {}; - realgud-ipdb = callPackage ({ elpaBuild, emacs, fetchurl, lib, realgud }: - elpaBuild { - pname = "realgud-ipdb"; - ename = "realgud-ipdb"; - version = "1.0.0"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/realgud-ipdb-1.0.0.tar"; - sha256 = "0zmgsrb15rmgszidx4arjazb6fz523q5w516z5k5cn92wfzfyncr"; - }; - packageRequires = [ emacs realgud ]; - meta = { - homepage = "https://elpa.gnu.org/packages/realgud-ipdb.html"; - license = lib.licenses.free; - }; - }) {}; - realgud-jdb = callPackage ({ cl-lib ? null - , elpaBuild - , emacs - , fetchurl - , lib - , load-relative - , realgud }: - elpaBuild { - pname = "realgud-jdb"; - ename = "realgud-jdb"; - version = "1.0.0"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/realgud-jdb-1.0.0.tar"; - sha256 = "081lqsxbg6cxv8hz8s0z2gbdif9drp5b0crbixmwf164i4h8l4gc"; - }; - packageRequires = [ cl-lib emacs load-relative realgud ]; - meta = { - homepage = "https://elpa.gnu.org/packages/realgud-jdb.html"; - license = lib.licenses.free; - }; - }) {}; - realgud-lldb = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib - , load-relative - , realgud }: - elpaBuild { - pname = "realgud-lldb"; - ename = "realgud-lldb"; - version = "1.0.2"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/realgud-lldb-1.0.2.tar"; - sha256 = "1g4spjrldyi9rrh5dwrcqpz5qm37fq2qpvmirxvdqgfbwl6gapzj"; - }; - packageRequires = [ emacs load-relative realgud ]; - meta = { - homepage = "https://elpa.gnu.org/packages/realgud-lldb.html"; - license = lib.licenses.free; - }; - }) {}; - realgud-node-debug = callPackage ({ cl-lib ? null - , elpaBuild - , emacs - , fetchurl - , lib - , load-relative - , realgud }: - elpaBuild { - pname = "realgud-node-debug"; - ename = "realgud-node-debug"; - version = "1.0.0"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/realgud-node-debug-1.0.0.tar"; - sha256 = "1wyh6apy289a3qa1bnwv68x8pjkpqy4m18ygqnr4x759hjkq3nir"; - }; - packageRequires = [ cl-lib emacs load-relative realgud ]; - meta = { - homepage = "https://elpa.gnu.org/packages/realgud-node-debug.html"; - license = lib.licenses.free; - }; - }) {}; - realgud-node-inspect = callPackage ({ cl-lib ? null - , elpaBuild - , emacs - , fetchurl - , lib - , load-relative - , realgud }: - elpaBuild { - pname = "realgud-node-inspect"; - ename = "realgud-node-inspect"; - version = "1.0.0"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/realgud-node-inspect-1.0.0.tar"; - sha256 = "16cx0rq4zx5k0y75j044dbqzrzs1df3r95rissmhfgsi5m2qf1h2"; - }; - packageRequires = [ cl-lib emacs load-relative realgud ]; - meta = { - homepage = "https://elpa.gnu.org/packages/realgud-node-inspect.html"; - license = lib.licenses.free; - }; - }) {}; - realgud-trepan-ni = callPackage ({ cl-lib ? null - , elpaBuild - , emacs - , fetchurl - , lib - , load-relative - , realgud }: - elpaBuild { - pname = "realgud-trepan-ni"; - ename = "realgud-trepan-ni"; - version = "1.0.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/realgud-trepan-ni-1.0.1.tar"; - sha256 = "09vllklpfc0q28ankp2s1v10kwnxab4g6hb9zn63d1rfa92qy44k"; - }; - packageRequires = [ cl-lib emacs load-relative realgud ]; - meta = { - homepage = "https://elpa.gnu.org/packages/realgud-trepan-ni.html"; - license = lib.licenses.free; - }; - }) {}; - realgud-trepan-xpy = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib - , load-relative - , realgud }: - elpaBuild { - pname = "realgud-trepan-xpy"; - ename = "realgud-trepan-xpy"; - version = "1.0.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/realgud-trepan-xpy-1.0.1.tar"; - sha256 = "13fll0c6p2idg56q0czgv6s00vvb585b40dn3b14hdpy0givrc0x"; - }; - packageRequires = [ emacs load-relative realgud ]; - meta = { - homepage = "https://elpa.gnu.org/packages/realgud-trepan-xpy.html"; - license = lib.licenses.free; - }; - }) {}; - rec-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "rec-mode"; - ename = "rec-mode"; - version = "1.9.3"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/rec-mode-1.9.3.tar"; - sha256 = "00hps4pi7r20qqqlfl8g5dqwipgyqqrhxc4hi5igl0rg563jc1wx"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/rec-mode.html"; - license = lib.licenses.free; - }; - }) {}; - register-list = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "register-list"; - ename = "register-list"; - version = "0.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/register-list-0.1.tar"; - sha256 = "01w2yyvbmnkjrmx5f0dk0327c0k7fvmgi928j6hbvlrp5wk6s394"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/register-list.html"; - license = lib.licenses.free; - }; - }) {}; - relint = callPackage ({ elpaBuild, emacs, fetchurl, lib, xr }: - elpaBuild { - pname = "relint"; - ename = "relint"; - version = "1.24"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/relint-1.24.tar"; - sha256 = "0pnv2pkx5jq30049zplrmspkm1cc7p6vy9xfv215d27v8nas0374"; - }; - packageRequires = [ emacs xr ]; - meta = { - homepage = "https://elpa.gnu.org/packages/relint.html"; - license = lib.licenses.free; - }; - }) {}; - repology = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "repology"; - ename = "repology"; - version = "1.2.4"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/repology-1.2.4.tar"; - sha256 = "0nj4dih9mv8crqq8rd4k8dzgq7l0195syfxsf2gyikmqz9sjbr85"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/repology.html"; - license = lib.licenses.free; - }; - }) {}; - rich-minority = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "rich-minority"; - ename = "rich-minority"; - version = "1.0.3"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/rich-minority-1.0.3.tar"; - sha256 = "0npk6gnr2m4mfv40y2m265lxk1dyn8fd6d90vs3j2xrhpybgbln2"; - }; - packageRequires = [ cl-lib ]; - meta = { - homepage = "https://elpa.gnu.org/packages/rich-minority.html"; - license = lib.licenses.free; - }; - }) {}; - rnc-mode = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "rnc-mode"; - ename = "rnc-mode"; - version = "0.3"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/rnc-mode-0.3.tar"; - sha256 = "1p03g451888v86k9z6g8gj375p1pcdvikgk1phxkhipwi5hbf5g8"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/rnc-mode.html"; - license = lib.licenses.free; - }; - }) {}; - rt-liberation = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "rt-liberation"; - ename = "rt-liberation"; - version = "7"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/rt-liberation-7.tar"; - sha256 = "0bi1qyc4n4ar0rblnddmlrlrkdvdrvv54wg4ii39hhxij4p6niif"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/rt-liberation.html"; - license = lib.licenses.free; - }; - }) {}; - ruby-end = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "ruby-end"; - ename = "ruby-end"; - version = "0.4.3"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/ruby-end-0.4.3.tar"; - sha256 = "07175v9fy96lmkfa0007lhx7v3fkk77iwca3rjl94dgdp4b8lbk5"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/ruby-end.html"; - license = lib.licenses.free; - }; - }) {}; - rudel = callPackage ({ cl-generic - , cl-lib ? null - , cl-print ? null - , elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "rudel"; - ename = "rudel"; - version = "0.3.2"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/rudel-0.3.2.tar"; - sha256 = "00rs2fy64ybam26szpc93miwajq42acyh0dkg0ixr95mg49sc46j"; - }; - packageRequires = [ cl-generic cl-lib cl-print emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/rudel.html"; - license = lib.licenses.free; - }; - }) {}; - satchel = callPackage ({ elpaBuild, emacs, fetchurl, lib, project }: - elpaBuild { - pname = "satchel"; - ename = "satchel"; - version = "0.2"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/satchel-0.2.tar"; - sha256 = "115rkq2ygawsg8ph44zfqwsd9ykm4370v0whgjwhc1wx2iyn5ir9"; - }; - packageRequires = [ emacs project ]; - meta = { - homepage = "https://elpa.gnu.org/packages/satchel.html"; - license = lib.licenses.free; - }; - }) {}; - scanner = callPackage ({ dash, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "scanner"; - ename = "scanner"; - version = "0.2"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/scanner-0.2.tar"; - sha256 = "1c42mg7m6fa7xw3svv741sgrc9zjl1zcq0vg45k61iqmnx8d44vp"; - }; - packageRequires = [ dash emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/scanner.html"; - license = lib.licenses.free; - }; - }) {}; - scroll-restore = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "scroll-restore"; - ename = "scroll-restore"; - version = "1.0"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/scroll-restore-1.0.tar"; - sha256 = "1i9ld1l5h2cpzf8bzk7nlk2bcln48gya8zrq79v6rawbrwdlz2z4"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/scroll-restore.html"; - license = lib.licenses.free; - }; - }) {}; - sed-mode = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "sed-mode"; - ename = "sed-mode"; - version = "1.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/sed-mode-1.1.tar"; - sha256 = "0zhga0xsffdcinh10di046n6wbx35gi1zknnqzgm9wvnm2iqxlyn"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/sed-mode.html"; - license = lib.licenses.free; - }; - }) {}; - seq = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "seq"; - ename = "seq"; - version = "2.24"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/seq-2.24.tar"; - sha256 = "13x8l1m5if6jpc8sbrbx9r64fyhh450ml6vfm92p6i5wv6gl74w6"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/seq.html"; - license = lib.licenses.free; - }; - }) {}; - setup = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "setup"; - ename = "setup"; - version = "1.4.0"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/setup-1.4.0.tar"; - sha256 = "0id7j8xvbkbpfiv7m55dl64y27dpiczljagldf4p9q6qwlhf42f7"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/setup.html"; - license = lib.licenses.free; - }; - }) {}; - shelisp = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "shelisp"; - ename = "shelisp"; - version = "1.0.0"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/shelisp-1.0.0.tar"; - sha256 = "0zhkk04nj25lmpdlqblfhx3rb415w2f58f7wb19k1s2ry4k7m15g"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/shelisp.html"; - license = lib.licenses.free; - }; - }) {}; - shell-command-plus = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "shell-command-plus"; - ename = "shell-command+"; - version = "2.4.2"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/shell-command+-2.4.2.tar"; - sha256 = "1kjj8n3nws7dl7k3ksnfx0s0kwvqb9wzy9k42xs5s51k7xrp1l18"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/shell-command+.html"; - license = lib.licenses.free; - }; - }) {}; - shen-mode = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "shen-mode"; - ename = "shen-mode"; - version = "0.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/shen-mode-0.1.tar"; - sha256 = "0xskyd0d3krwgrpca10m7l7c0l60qq7jjn2q207n61yw5yx71pqn"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/shen-mode.html"; - license = lib.licenses.free; - }; - }) {}; - sisu-mode = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "sisu-mode"; - ename = "sisu-mode"; - version = "7.1.8"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/sisu-mode-7.1.8.tar"; - sha256 = "02cfyrjynwvf2rlnkfy8285ga9kzbg1b614sch0xnxqw81mp7drp"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/sisu-mode.html"; - license = lib.licenses.free; - }; - }) {}; - site-lisp = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "site-lisp"; - ename = "site-lisp"; - version = "0.1.2"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/site-lisp-0.1.2.tar"; - sha256 = "1w27nd061y7a5qhdmij2056751wx9nwv89qx3hxcl473iz03b09l"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/site-lisp.html"; - license = lib.licenses.free; - }; - }) {}; - sketch-mode = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "sketch-mode"; - ename = "sketch-mode"; - version = "1.0.4"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/sketch-mode-1.0.4.tar"; - sha256 = "1vrbmyhf9bffy2fkz91apzxla6v8nbv2wb25vxcr9x3smbag9kal"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/sketch-mode.html"; - license = lib.licenses.free; - }; - }) {}; - slime-volleyball = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "slime-volleyball"; - ename = "slime-volleyball"; - version = "1.2.0"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/slime-volleyball-1.2.0.tar"; - sha256 = "1qlmsxnhja8p873rvb1qj4xsf938bs3hl8qqqsmrm0csvlb9737p"; - }; - packageRequires = [ cl-lib ]; - meta = { - homepage = "https://elpa.gnu.org/packages/slime-volleyball.html"; - license = lib.licenses.free; - }; - }) {}; - sm-c-mode = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "sm-c-mode"; - ename = "sm-c-mode"; - version = "1.2"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/sm-c-mode-1.2.tar"; - sha256 = "0xykl8wkbw5y7ah79zlfzz1k0di9ghfsv2xjxwx7rrb37wny5184"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/sm-c-mode.html"; - license = lib.licenses.free; - }; - }) {}; - smalltalk-mode = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "smalltalk-mode"; - ename = "smalltalk-mode"; - version = "4.0"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/smalltalk-mode-4.0.tar"; - sha256 = "0ly2qmsbmzd5nd7iaighws10y0yj7p2356fw32pkp0cmzzvc3d54"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/smalltalk-mode.html"; - license = lib.licenses.free; - }; - }) {}; - smart-yank = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "smart-yank"; - ename = "smart-yank"; - version = "0.1.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/smart-yank-0.1.1.tar"; - sha256 = "08dc4c60jcjyiixyzckxk5qk6s2pl1jmrp4h1bj53ssd1kn4208m"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/smart-yank.html"; - license = lib.licenses.free; - }; - }) {}; - sml-mode = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "sml-mode"; - ename = "sml-mode"; - version = "6.12"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/sml-mode-6.12.tar"; - sha256 = "10zp0gi5rbjjxjzn9k6klvdms9k3yxx0qry0wa75a68sj5x2rdzh"; - }; - packageRequires = [ cl-lib emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/sml-mode.html"; - license = lib.licenses.free; - }; - }) {}; - so-long = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "so-long"; - ename = "so-long"; - version = "1.1.2"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/so-long-1.1.2.tar"; - sha256 = "01qdxlsllpj5ajixkqf7v9p95zn9qnvjdnp30v54ymj2pd0d9a32"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/so-long.html"; - license = lib.licenses.free; - }; - }) {}; - soap-client = callPackage ({ cl-lib ? null - , elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "soap-client"; - ename = "soap-client"; - version = "3.2.3"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/soap-client-3.2.3.tar"; - sha256 = "1yhs661g0vqxpxqcxgsxvljmrpcqzl0y52lz6jvfilmshw7r6k2s"; - }; - packageRequires = [ cl-lib emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/soap-client.html"; - license = lib.licenses.free; - }; - }) {}; - sokoban = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "sokoban"; - ename = "sokoban"; - version = "1.4.9"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/sokoban-1.4.9.tar"; - sha256 = "1l3d4al96252kdhyn4dr88ir67kay57n985w0qy8p930ncrs846v"; - }; - packageRequires = [ cl-lib emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/sokoban.html"; - license = lib.licenses.free; - }; - }) {}; - sotlisp = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "sotlisp"; - ename = "sotlisp"; - version = "1.6.2"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/sotlisp-1.6.2.tar"; - sha256 = "0q65iwr89cwwqnc1kndf2agq5wp48a7k02qsksgaj0n6zv7i4dfn"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/sotlisp.html"; - license = lib.licenses.free; - }; - }) {}; - spacious-padding = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "spacious-padding"; - ename = "spacious-padding"; - version = "0.5.0"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/spacious-padding-0.5.0.tar"; - sha256 = "0x5bsyd6b1d3bzrsrpf9nvw7xj5ch114m2dilq64bg8y2db3452z"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/spacious-padding.html"; - license = lib.licenses.free; - }; - }) {}; - spinner = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "spinner"; - ename = "spinner"; - version = "1.7.4"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/spinner-1.7.4.tar"; - sha256 = "0lq8q62q5an8199p8pyafg5l6hdnnqi6i6sybnk60sdcqy62pa6r"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/spinner.html"; - license = lib.licenses.free; - }; - }) {}; - sql-beeline = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "sql-beeline"; - ename = "sql-beeline"; - version = "0.2"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/sql-beeline-0.2.tar"; - sha256 = "0ngvvfhs1fj3ca5g563bssaz9ac5fiqkqzv09s4ramalp2q6axq9"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/sql-beeline.html"; - license = lib.licenses.free; - }; - }) {}; - sql-cassandra = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "sql-cassandra"; - ename = "sql-cassandra"; - version = "0.2.2"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/sql-cassandra-0.2.2.tar"; - sha256 = "154rymq0k6869cw7sc7nhx3di5qv1ffgf8shkxc22gvkrj2s7p9b"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/sql-cassandra.html"; - license = lib.licenses.free; - }; - }) {}; - sql-indent = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "sql-indent"; - ename = "sql-indent"; - version = "1.7"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/sql-indent-1.7.tar"; - sha256 = "1yfb01wh5drgvrwbn0hgzyi0rc4zlr1w23d065x4qrld31jbka8i"; - }; - packageRequires = [ cl-lib ]; - meta = { - homepage = "https://elpa.gnu.org/packages/sql-indent.html"; - license = lib.licenses.free; - }; - }) {}; - srht = callPackage ({ elpaBuild, emacs, fetchurl, lib, plz, transient }: - elpaBuild { - pname = "srht"; - ename = "srht"; - version = "0.4"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/srht-0.4.tar"; - sha256 = "0ps49syzlaf4lxvji61y6y7r383r65v96d57hj75xkn6hvyrz74n"; - }; - packageRequires = [ emacs plz transient ]; - meta = { - homepage = "https://elpa.gnu.org/packages/srht.html"; - license = lib.licenses.free; - }; - }) {}; - ssh-deploy = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "ssh-deploy"; - ename = "ssh-deploy"; - version = "3.1.16"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/ssh-deploy-3.1.16.tar"; - sha256 = "0fb88l3270d7l808q8x16zcvjgsjbyhgifgv17syfsj0ja63x28p"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/ssh-deploy.html"; - license = lib.licenses.free; - }; - }) {}; - standard-themes = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "standard-themes"; - ename = "standard-themes"; - version = "2.0.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/standard-themes-2.0.1.tar"; - sha256 = "0cyr3n9w359sa8ylcgzsvhxrk9f1rl1scb5339ci2la7zpg5vxwr"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/standard-themes.html"; - license = lib.licenses.free; - }; - }) {}; - stream = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "stream"; - ename = "stream"; - version = "2.3.0"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/stream-2.3.0.tar"; - sha256 = "0224hjcxvy3cxv1c3pz9j2laxld2cxqbs5sigr02fcdcb9qn7hay"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/stream.html"; - license = lib.licenses.free; - }; - }) {}; - substitute = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "substitute"; - ename = "substitute"; - version = "0.3.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/substitute-0.3.1.tar"; - sha256 = "0038kkn6v2w3asg9abwary2cacr9wbw90wdvq7q9wyk1818cygff"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/substitute.html"; - license = lib.licenses.free; - }; - }) {}; - svg = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "svg"; - ename = "svg"; - version = "1.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/svg-1.1.tar"; - sha256 = "10x2rry349ibzd9awy4rg18cd376yvkzqsyq0fm4i05kq4dzqp4a"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/svg.html"; - license = lib.licenses.free; - }; - }) {}; - svg-clock = callPackage ({ elpaBuild, emacs, fetchurl, lib, svg }: - elpaBuild { - pname = "svg-clock"; - ename = "svg-clock"; - version = "1.2"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/svg-clock-1.2.tar"; - sha256 = "0r0wayb1q0dd2yi1nqa0m4jfy36lydxxa6xvvd6amgh9sy499qs8"; - }; - packageRequires = [ emacs svg ]; - meta = { - homepage = "https://elpa.gnu.org/packages/svg-clock.html"; - license = lib.licenses.free; - }; - }) {}; - svg-lib = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "svg-lib"; - ename = "svg-lib"; - version = "0.3"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/svg-lib-0.3.tar"; - sha256 = "1s7n3j1yzprs9frb554c66pcrv3zss1y26y6qgndii4bbzpa7jh8"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/svg-lib.html"; - license = lib.licenses.free; - }; - }) {}; - svg-tag-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib, svg-lib }: - elpaBuild { - pname = "svg-tag-mode"; - ename = "svg-tag-mode"; - version = "0.3.2"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/svg-tag-mode-0.3.2.tar"; - sha256 = "0wzcq00kbjpbwz7acn4d7jd98v5kicq3iwgf6dnmz2kflvkfwkvr"; - }; - packageRequires = [ emacs svg-lib ]; - meta = { - homepage = "https://elpa.gnu.org/packages/svg-tag-mode.html"; - license = lib.licenses.free; - }; - }) {}; - swiper = callPackage ({ elpaBuild, emacs, fetchurl, ivy, lib }: - elpaBuild { - pname = "swiper"; - ename = "swiper"; - version = "0.14.2"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/swiper-0.14.2.tar"; - sha256 = "1rzp78ix19ddm7fx7p4i5iybd5lw244kqvf3nrafz3r7q6hi8yds"; - }; - packageRequires = [ emacs ivy ]; - meta = { - homepage = "https://elpa.gnu.org/packages/swiper.html"; - license = lib.licenses.free; - }; - }) {}; - switchy-window = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "switchy-window"; - ename = "switchy-window"; - version = "1.3"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/switchy-window-1.3.tar"; - sha256 = "0ym5cy6czsrd15f8rgh3dad8fwn8pb2xrvhlmdikc59cc29zamrv"; - }; - packageRequires = [ compat emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/switchy-window.html"; - license = lib.licenses.free; - }; - }) {}; - sxhkdrc-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "sxhkdrc-mode"; - ename = "sxhkdrc-mode"; - version = "1.0.0"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/sxhkdrc-mode-1.0.0.tar"; - sha256 = "0gfv5l71md2ica9jfa8ynwfag3zvayc435pl91lzcz92qy5n0hlj"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/sxhkdrc-mode.html"; - license = lib.licenses.free; - }; - }) {}; - system-packages = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "system-packages"; - ename = "system-packages"; - version = "1.0.13"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/system-packages-1.0.13.tar"; - sha256 = "0xlbq44c7f2assp36g5z9hn5gldq76wzpcinp782whqzpgz2k4sy"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/system-packages.html"; - license = lib.licenses.free; - }; - }) {}; - tNFA = callPackage ({ elpaBuild, fetchurl, lib, queue }: - elpaBuild { - pname = "tNFA"; - ename = "tNFA"; - version = "0.1.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/tNFA-0.1.1.el"; - sha256 = "01n4p8lg8f2k55l2z77razb2sl202qisjqm5lff96a2kxnxinsds"; - }; - packageRequires = [ queue ]; - meta = { - homepage = "https://elpa.gnu.org/packages/tNFA.html"; - license = lib.licenses.free; - }; - }) {}; - tam = callPackage ({ elpaBuild, emacs, fetchurl, lib, queue }: - elpaBuild { - pname = "tam"; - ename = "tam"; - version = "0.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/tam-0.1.tar"; - sha256 = "16ms55cwm2cwixl03a3bbsqs159c3r3dv5kaazvsghby6c511bx8"; - }; - packageRequires = [ emacs queue ]; - meta = { - homepage = "https://elpa.gnu.org/packages/tam.html"; - license = lib.licenses.free; - }; - }) {}; - taxy = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "taxy"; - ename = "taxy"; - version = "0.10.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/taxy-0.10.1.tar"; - sha256 = "0r4kv0lqjk720p8kfah256370miqg68598jp5466sc6v9qax4wd9"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/taxy.html"; - license = lib.licenses.free; - }; - }) {}; - taxy-magit-section = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib - , magit-section - , taxy }: - elpaBuild { - pname = "taxy-magit-section"; - ename = "taxy-magit-section"; - version = "0.13"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/taxy-magit-section-0.13.tar"; - sha256 = "06sivl4rc06qr67qw2gqpw7lsaqf3j78llkrljwby7a77yzlhbrj"; - }; - packageRequires = [ emacs magit-section taxy ]; - meta = { - homepage = "https://elpa.gnu.org/packages/taxy-magit-section.html"; - license = lib.licenses.free; - }; - }) {}; - temp-buffer-browse = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "temp-buffer-browse"; - ename = "temp-buffer-browse"; - version = "1.5"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/temp-buffer-browse-1.5.tar"; - sha256 = "00hbh25fj5fm9dsp8fpdk8lap3gi5jlva6f0m6kvjqnmvc06q36r"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/temp-buffer-browse.html"; - license = lib.licenses.free; - }; - }) {}; - tempel = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "tempel"; - ename = "tempel"; - version = "1.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/tempel-1.1.tar"; - sha256 = "01zrp3wi4nvp67wda1b5fyjfxd0akhk7aqc2nqh1sk4mjp5zpnsq"; - }; - packageRequires = [ compat emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/tempel.html"; - license = lib.licenses.free; - }; - }) {}; - test-simple = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "test-simple"; - ename = "test-simple"; - version = "1.3.0"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/test-simple-1.3.0.tar"; - sha256 = "065jfps5ixpy5d4l2xgwhkpafdwiziqh4msbjcascwpac3j5c5yp"; - }; - packageRequires = [ cl-lib ]; - meta = { - homepage = "https://elpa.gnu.org/packages/test-simple.html"; - license = lib.licenses.free; - }; - }) {}; - theme-buffet = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "theme-buffet"; - ename = "theme-buffet"; - version = "0.1.2"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/theme-buffet-0.1.2.tar"; - sha256 = "1cfrrl41rlxdbybvxs8glkgmgkznwgpq70h58rkvwm6b5jfs8wv0"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/theme-buffet.html"; - license = lib.licenses.free; - }; - }) {}; - timerfunctions = callPackage ({ cl-lib ? null - , elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "timerfunctions"; - ename = "timerfunctions"; - version = "1.4.2"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/timerfunctions-1.4.2.el"; - sha256 = "122q8nv08pz1mkgilvi9qfrs7rsnc5picr7jyz2jpnvpd9qw6jw5"; - }; - packageRequires = [ cl-lib emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/timerfunctions.html"; - license = lib.licenses.free; - }; - }) {}; - tiny = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "tiny"; - ename = "tiny"; - version = "0.2.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/tiny-0.2.1.tar"; - sha256 = "1cr73a8gba549ja55x0c2s554f3zywf69zbnd7v82jz5q1k9wd2v"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/tiny.html"; - license = lib.licenses.free; - }; - }) {}; - tmr = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "tmr"; - ename = "tmr"; - version = "0.4.0"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/tmr-0.4.0.tar"; - sha256 = "0vvsanjs6b9m3gxm84qr0ywwdj0378y5jkv1nzqdn980rfgfimsv"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/tmr.html"; - license = lib.licenses.free; - }; - }) {}; - tomelr = callPackage ({ elpaBuild, emacs, fetchurl, lib, map, seq }: - elpaBuild { - pname = "tomelr"; - ename = "tomelr"; - version = "0.4.3"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/tomelr-0.4.3.tar"; - sha256 = "0r2f4dl10fl75ygvbmb4vkqixy24k0z2wpr431ljzp5m29bn74kh"; - }; - packageRequires = [ emacs map seq ]; - meta = { - homepage = "https://elpa.gnu.org/packages/tomelr.html"; - license = lib.licenses.free; - }; - }) {}; - topspace = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "topspace"; - ename = "topspace"; - version = "0.3.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/topspace-0.3.1.tar"; - sha256 = "0m8z2q1gdi0zfh1df5xb2v0sg1v5fysrl00fv2qqgnd61c2n0hhz"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/topspace.html"; - license = lib.licenses.free; - }; - }) {}; - track-changes = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "track-changes"; - ename = "track-changes"; - version = "1.2"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/track-changes-1.2.tar"; - sha256 = "0al6a1xjs6p2pn6z976pnmfqz2x5xcz99b5gkdzz90ywbn7018m4"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/track-changes.html"; - license = lib.licenses.free; - }; - }) {}; - tramp = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "tramp"; - ename = "tramp"; - version = "2.6.3"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/tramp-2.6.3.tar"; - sha256 = "0z44mfpvn4qy2xc2fsiahw3xir140ljna8aq45dcb7qnmr044xjb"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/tramp.html"; - license = lib.licenses.free; - }; - }) {}; - tramp-nspawn = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "tramp-nspawn"; - ename = "tramp-nspawn"; - version = "1.0.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/tramp-nspawn-1.0.1.tar"; - sha256 = "0cy8l389s6pi135gxcygv1vna6k3gizqd33avf3wsdbnqdf2pjnc"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/tramp-nspawn.html"; - license = lib.licenses.free; - }; - }) {}; - tramp-theme = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "tramp-theme"; - ename = "tramp-theme"; - version = "0.2"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/tramp-theme-0.2.tar"; - sha256 = "0dz8ndnmwc38g1gy30f3jcjqg5nzdi6721x921r4s5a8i1mx2kpm"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/tramp-theme.html"; - license = lib.licenses.free; - }; - }) {}; - transcribe = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "transcribe"; - ename = "transcribe"; - version = "1.5.2"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/transcribe-1.5.2.tar"; - sha256 = "1v1bvcv3zqrj073l3vw7gz20rpa9p86rf1yv219n47kmh27c80hq"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/transcribe.html"; - license = lib.licenses.free; - }; - }) {}; - transient = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib, seq }: - elpaBuild { - pname = "transient"; - ename = "transient"; - version = "0.6.0"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/transient-0.6.0.tar"; - sha256 = "0rk4gafx3yylzawiny86ml4jzrs8x6cf2bvmnv36p8l13wgp0w9p"; - }; - packageRequires = [ compat emacs seq ]; - meta = { - homepage = "https://elpa.gnu.org/packages/transient.html"; - license = lib.licenses.free; - }; - }) {}; - transient-cycles = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "transient-cycles"; - ename = "transient-cycles"; - version = "1.0"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/transient-cycles-1.0.tar"; - sha256 = "0s6cxagqxj4i3qf4kx8mdrihciz3v6ga7zw19jcv896rdhx75bx5"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/transient-cycles.html"; - license = lib.licenses.free; - }; - }) {}; - tree-inspector = callPackage ({ elpaBuild, emacs, fetchurl, lib, treeview }: - elpaBuild { - pname = "tree-inspector"; - ename = "tree-inspector"; - version = "0.4"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/tree-inspector-0.4.tar"; - sha256 = "0v59kp1didml9k245m1v0s0ahh2r79cc0hp5ika93iamrdxkxaiz"; - }; - packageRequires = [ emacs treeview ]; - meta = { - homepage = "https://elpa.gnu.org/packages/tree-inspector.html"; - license = lib.licenses.free; - }; - }) {}; - trie = callPackage ({ elpaBuild, fetchurl, heap, lib, tNFA }: - elpaBuild { - pname = "trie"; - ename = "trie"; - version = "0.6"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/trie-0.6.tar"; - sha256 = "1jvhvvxkxbbpy93x9kpznvp2hqkkbdbbjaj27fd0wkbijg0k03ln"; - }; - packageRequires = [ heap tNFA ]; - meta = { - homepage = "https://elpa.gnu.org/packages/trie.html"; - license = lib.licenses.free; - }; - }) {}; - triples = callPackage ({ elpaBuild, emacs, fetchurl, lib, seq }: - elpaBuild { - pname = "triples"; - ename = "triples"; - version = "0.3.5"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/triples-0.3.5.tar"; - sha256 = "1wvmfw8yc7nh42f1skmpxqz5f57vkhg7x2cdngpq11lqbgvypj7m"; - }; - packageRequires = [ emacs seq ]; - meta = { - homepage = "https://elpa.gnu.org/packages/triples.html"; - license = lib.licenses.free; - }; - }) {}; - typo = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "typo"; - ename = "typo"; - version = "1.0.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/typo-1.0.1.tar"; - sha256 = "1w4m2admlgmx7d661l70rryyxbaahfvrvhxc1b9sq41nx88bmgn1"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/typo.html"; - license = lib.licenses.free; - }; - }) {}; - ulisp-repl = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "ulisp-repl"; - ename = "ulisp-repl"; - version = "1.0.3"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/ulisp-repl-1.0.3.tar"; - sha256 = "1c23d66vydfp29px2dlvgl5xg91a0rh4w4b79q8ach533nfag3ia"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/ulisp-repl.html"; - license = lib.licenses.free; - }; - }) {}; - undo-tree = callPackage ({ elpaBuild, fetchurl, lib, queue }: - elpaBuild { - pname = "undo-tree"; - ename = "undo-tree"; - version = "0.8.2"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/undo-tree-0.8.2.tar"; - sha256 = "0ad1zhkjdf73j3b2i8nd7f10jlqqvcaa852yycms4jr636xw6ms6"; - }; - packageRequires = [ queue ]; - meta = { - homepage = "https://elpa.gnu.org/packages/undo-tree.html"; - license = lib.licenses.free; - }; - }) {}; - uni-confusables = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "uni-confusables"; - ename = "uni-confusables"; - version = "0.3"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/uni-confusables-0.3.tar"; - sha256 = "08150kgqsbcpykvf8m2b25y386h2b4pj08vffm6wh4f000wr72k3"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/uni-confusables.html"; - license = lib.licenses.free; - }; - }) {}; - uniquify-files = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "uniquify-files"; - ename = "uniquify-files"; - version = "1.0.4"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/uniquify-files-1.0.4.tar"; - sha256 = "0xw2l49xhdy5qgwja8bkiq2ibdppl45xzqlr17z92l1vfq4akpzp"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/uniquify-files.html"; - license = lib.licenses.free; - }; - }) {}; - urgrep = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib, project }: - elpaBuild { - pname = "urgrep"; - ename = "urgrep"; - version = "0.5.0"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/urgrep-0.5.0.tar"; - sha256 = "14vga04hf03hj1ilcpl3qblmb7mhl9j0qwkq2whbc50p98avkhqi"; - }; - packageRequires = [ compat emacs project ]; - meta = { - homepage = "https://elpa.gnu.org/packages/urgrep.html"; - license = lib.licenses.free; - }; - }) {}; - url-http-ntlm = callPackage ({ cl-lib ? null - , elpaBuild - , fetchurl - , lib - , nadvice - , ntlm ? null }: - elpaBuild { - pname = "url-http-ntlm"; - ename = "url-http-ntlm"; - version = "2.0.5"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/url-http-ntlm-2.0.5.tar"; - sha256 = "02b65z70kw37mzj2hh8q6z0zhhacf9sc4hlczpfxdfsy05b8yri9"; - }; - packageRequires = [ cl-lib nadvice ntlm ]; - meta = { - homepage = "https://elpa.gnu.org/packages/url-http-ntlm.html"; - license = lib.licenses.free; - }; - }) {}; - url-http-oauth = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "url-http-oauth"; - ename = "url-http-oauth"; - version = "0.8.3"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/url-http-oauth-0.8.3.tar"; - sha256 = "06lpzh8kpxn8cr92blxrjw44h2cfc6fw0pr024sign4acczx10ws"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/url-http-oauth.html"; - license = lib.licenses.free; - }; - }) {}; - url-scgi = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "url-scgi"; - ename = "url-scgi"; - version = "0.9"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/url-scgi-0.9.tar"; - sha256 = "19lvr4d2y9rd5gibaavp7ghkxmdh5zad9ynarbi2w4rjgmz5y981"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/url-scgi.html"; - license = lib.licenses.free; - }; - }) {}; - use-package = callPackage ({ bind-key, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "use-package"; - ename = "use-package"; - version = "2.4.5"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/use-package-2.4.5.tar"; - sha256 = "060bbrbmx3psv4jkn95zjyhbyfidip86sfi8975fhqcc0aagnwhp"; - }; - packageRequires = [ bind-key emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/use-package.html"; - license = lib.licenses.free; - }; - }) {}; - validate = callPackage ({ cl-lib ? null - , elpaBuild - , emacs - , fetchurl - , lib - , seq }: - elpaBuild { - pname = "validate"; - ename = "validate"; - version = "1.0.4"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/validate-1.0.4.tar"; - sha256 = "1bn25l62zcabg2ppxwr4049m1qd0yj095cflqrak0n50acgjs6w5"; - }; - packageRequires = [ cl-lib emacs seq ]; - meta = { - homepage = "https://elpa.gnu.org/packages/validate.html"; - license = lib.licenses.free; - }; - }) {}; - valign = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "valign"; - ename = "valign"; - version = "3.1.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/valign-3.1.1.tar"; - sha256 = "16v2mmrih0ykk4z6qmy29gajjb3v83q978gzn3y6pg8y48b2wxpb"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/valign.html"; - license = lib.licenses.free; - }; - }) {}; - vc-backup = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "vc-backup"; - ename = "vc-backup"; - version = "1.1.0"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/vc-backup-1.1.0.tar"; - sha256 = "0a45bbrvk4s9cj3ih3hb6vqjv4hkwnz7m9a4mr45m6cb0sl9b8a3"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/vc-backup.html"; - license = lib.licenses.free; - }; - }) {}; - vc-got = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "vc-got"; - ename = "vc-got"; - version = "1.2"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/vc-got-1.2.tar"; - sha256 = "04m1frrnla4zc8db728280r9fbk50bgjkk4k7dizb0hawghk4r3p"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/vc-got.html"; - license = lib.licenses.free; - }; - }) {}; - vc-hgcmd = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "vc-hgcmd"; - ename = "vc-hgcmd"; - version = "1.14.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/vc-hgcmd-1.14.1.tar"; - sha256 = "0a8a4d9difrp2r6ac8micxn8ij96inba390324w087yxwqzkgk1g"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/vc-hgcmd.html"; - license = lib.licenses.free; - }; - }) {}; - vcard = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "vcard"; - ename = "vcard"; - version = "0.2.2"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/vcard-0.2.2.tar"; - sha256 = "0r56y3q2gigm8rxifly50m5h1k948y987541cqd8w207wf1b56bh"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/vcard.html"; - license = lib.licenses.free; - }; - }) {}; - vcl-mode = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "vcl-mode"; - ename = "vcl-mode"; - version = "1.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/vcl-mode-1.1.tar"; - sha256 = "0zz664c263x24xzs7hk2mqchzplmx2dlba98d5fpy8ybdnziqfkj"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/vcl-mode.html"; - license = lib.licenses.free; - }; - }) {}; - vdiff = callPackage ({ elpaBuild, emacs, fetchurl, hydra, lib }: - elpaBuild { - pname = "vdiff"; - ename = "vdiff"; - version = "0.2.4"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/vdiff-0.2.4.tar"; - sha256 = "0crgb32dk0yzcgvjai0b67wcbcfppc3h0ppfqgdrim1nincbwc1m"; - }; - packageRequires = [ emacs hydra ]; - meta = { - homepage = "https://elpa.gnu.org/packages/vdiff.html"; - license = lib.licenses.free; - }; - }) {}; - verilog-mode = callPackage ({ elpaBuild - , fetchurl - , lib }: - elpaBuild { - pname = "verilog-mode"; - ename = "verilog-mode"; - version = "2024.3.1.121933719"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/verilog-mode-2024.3.1.121933719.tar"; - sha256 = "1z0mbd5sbbq2prhc0vfpqd4h4a6jwl5fqyrnl39yp05zm66va34w"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/verilog-mode.html"; - license = lib.licenses.free; - }; - }) {}; - vertico = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "vertico"; - ename = "vertico"; - version = "1.8"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/vertico-1.8.tar"; - sha256 = "0k6sfla0183vyjf2yd9sycck9nxz0x659kygxgiaip3zq7f9zkg8"; - }; - packageRequires = [ compat emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/vertico.html"; - license = lib.licenses.free; - }; - }) {}; - vertico-posframe = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib - , posframe - , vertico }: - elpaBuild { - pname = "vertico-posframe"; - ename = "vertico-posframe"; - version = "0.7.7"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/vertico-posframe-0.7.7.tar"; - sha256 = "0ahn0b5v9xw6f1zvgv27c82kxdh4rx7n9dbp17rkkkg3dvvkdzxy"; - }; - packageRequires = [ emacs posframe vertico ]; - meta = { - homepage = "https://elpa.gnu.org/packages/vertico-posframe.html"; - license = lib.licenses.free; - }; - }) {}; - vigenere = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "vigenere"; - ename = "vigenere"; - version = "1.0"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/vigenere-1.0.tar"; - sha256 = "1zlni6amznzi9w96kj7lnhfrr049crva2l8kwl5jsvyaj5fc6nq5"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/vigenere.html"; - license = lib.licenses.free; - }; - }) {}; - visual-filename-abbrev = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "visual-filename-abbrev"; - ename = "visual-filename-abbrev"; - version = "1.2"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/visual-filename-abbrev-1.2.tar"; - sha256 = "0vy4ar10wbdykzl47xnrfcwszjxyq2f1vhdbynfcmkcyrr40v4wm"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/visual-filename-abbrev.html"; - license = lib.licenses.free; - }; - }) {}; - visual-fill = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "visual-fill"; - ename = "visual-fill"; - version = "0.2"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/visual-fill-0.2.tar"; - sha256 = "00r3cclhrdx5y0h1p1rrx5psvc8d95dayzpjdsy9xj44i8pcnvja"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/visual-fill.html"; - license = lib.licenses.free; - }; - }) {}; - vlf = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "vlf"; - ename = "vlf"; - version = "1.7.2"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/vlf-1.7.2.tar"; - sha256 = "1napxdavsrwb5dq2i4ka06rhmmfk6qixc8mm2a6ab68iavprrqkv"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/vlf.html"; - license = lib.licenses.free; - }; - }) {}; - vundo = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "vundo"; - ename = "vundo"; - version = "2.3.0"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/vundo-2.3.0.tar"; - sha256 = "165y277fi0vp9301hy3pqgfnf160k29n8vri0zyq8a3vz3f8lqrl"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/vundo.html"; - license = lib.licenses.free; - }; - }) {}; - wcheck-mode = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "wcheck-mode"; - ename = "wcheck-mode"; - version = "2021"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/wcheck-mode-2021.tar"; - sha256 = "0igsdsfw80nnrbw1ba3rgwp16ncy195kwv78ll9zbbf3y23n7kr0"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/wcheck-mode.html"; - license = lib.licenses.free; - }; - }) {}; - wconf = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "wconf"; - ename = "wconf"; - version = "0.2.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/wconf-0.2.1.tar"; - sha256 = "1ci5ysn2w9hjzcsv698b6mh14qbrmvlzn4spaq4wzwl9p8672n08"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/wconf.html"; - license = lib.licenses.free; - }; - }) {}; - web-server = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "web-server"; - ename = "web-server"; - version = "0.1.2"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/web-server-0.1.2.tar"; - sha256 = "0wikajm4pbffcy8clwwb5bnz67isqmcsbf9kca8rzx4svzi5j2gc"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/web-server.html"; - license = lib.licenses.free; - }; - }) {}; - webfeeder = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "webfeeder"; - ename = "webfeeder"; - version = "1.1.2"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/webfeeder-1.1.2.tar"; - sha256 = "0418fpw2ra12n77560gh9j9ymv28d895bdhpr7x9xakvijjh705m"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/webfeeder.html"; - license = lib.licenses.free; - }; - }) {}; - websocket = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "websocket"; - ename = "websocket"; - version = "1.15"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/websocket-1.15.tar"; - sha256 = "0cm3x6qzr4zqj46w0qfpn7n9g5z80figcv824869snvc74465h1g"; - }; - packageRequires = [ cl-lib ]; - meta = { - homepage = "https://elpa.gnu.org/packages/websocket.html"; - license = lib.licenses.free; - }; - }) {}; - which-key = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "which-key"; - ename = "which-key"; - version = "3.6.0"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/which-key-3.6.0.tar"; - sha256 = "1lf8q6sq0hnrspj6qy49i48az3js24ab4y0gksw4giiifiqlc5ba"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/which-key.html"; - license = lib.licenses.free; - }; - }) {}; - window-commander = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "window-commander"; - ename = "window-commander"; - version = "3.0.2"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/window-commander-3.0.2.tar"; - sha256 = "15345sgdmgz0vv9bk2cmffjp66i0msqj0xn2cxl7wny3bkfx8amv"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/window-commander.html"; - license = lib.licenses.free; - }; - }) {}; - window-tool-bar = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "window-tool-bar"; - ename = "window-tool-bar"; - version = "0.2"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/window-tool-bar-0.2.tar"; - sha256 = "191v21rrw1j560512mjn1s1avhirk1awy746xajjra8lb1ywnxw7"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/window-tool-bar.html"; - license = lib.licenses.free; - }; - }) {}; - windower = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "windower"; - ename = "windower"; - version = "0.0.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/windower-0.0.1.el"; - sha256 = "19xizbfbnzhhmhlqy20ir1a1y87bjwrq67bcawxy6nxpkwbizsv7"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/windower.html"; - license = lib.licenses.free; - }; - }) {}; - windresize = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "windresize"; - ename = "windresize"; - version = "0.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/windresize-0.1.tar"; - sha256 = "1wjqrwrfql5c67yv59hc95ga0mkvrqz74gy46aawhn8r3xr65qai"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/windresize.html"; - license = lib.licenses.free; - }; - }) {}; - wisi = callPackage ({ elpaBuild, emacs, fetchurl, lib, seq }: - elpaBuild { - pname = "wisi"; - ename = "wisi"; - version = "4.3.2"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/wisi-4.3.2.tar"; - sha256 = "0qa6nig33igv4sqk3fxzrmx889pswq10smj9c9l3phz2acqx8q92"; - }; - packageRequires = [ emacs seq ]; - meta = { - homepage = "https://elpa.gnu.org/packages/wisi.html"; - license = lib.licenses.free; - }; - }) {}; - wisitoken-grammar-mode = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib - , mmm-mode - , wisi }: - elpaBuild { - pname = "wisitoken-grammar-mode"; - ename = "wisitoken-grammar-mode"; - version = "1.3.0"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/wisitoken-grammar-mode-1.3.0.tar"; - sha256 = "0i0vy751ycbfp8l8ynzj6iqgvc3scllwysdchpjv4lyj0m7m3s20"; - }; - packageRequires = [ emacs mmm-mode wisi ]; - meta = { - homepage = "https://elpa.gnu.org/packages/wisitoken-grammar-mode.html"; - license = lib.licenses.free; - }; - }) {}; - wpuzzle = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "wpuzzle"; - ename = "wpuzzle"; - version = "1.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/wpuzzle-1.1.tar"; - sha256 = "05dgvr1miqp870nl7c8dw7j1kv4mgwm8scynjfwbs9wjz4xmzc6c"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/wpuzzle.html"; - license = lib.licenses.free; - }; - }) {}; - wrap-search = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "wrap-search"; - ename = "wrap-search"; - version = "4.16.13"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/wrap-search-4.16.13.tar"; - sha256 = "0h5wlvmxq1rcmkhmaan3118w5480xx1gblg73lsfhxnj2xkmhrbi"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/wrap-search.html"; - license = lib.licenses.free; - }; - }) {}; - xclip = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "xclip"; - ename = "xclip"; - version = "1.11"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/xclip-1.11.tar"; - sha256 = "081k9azz9jnmjmqlcc1yw9s4nziac772lw75xcm78fgsfrx42hmr"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/xclip.html"; - license = lib.licenses.free; - }; - }) {}; - xeft = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "xeft"; - ename = "xeft"; - version = "3.3"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/xeft-3.3.tar"; - sha256 = "00zkhqajkkf979ccbnz076dpav2v52q44li2m4m4c6p3z0c3y255"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/xeft.html"; - license = lib.licenses.free; - }; - }) {}; - xelb = callPackage ({ cl-generic, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "xelb"; - ename = "xelb"; - version = "0.18"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/xelb-0.18.tar"; - sha256 = "1qixb236z01azjbc1xycji99rjkq747hip4gcf0gli1is8ink0bs"; - }; - packageRequires = [ cl-generic emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/xelb.html"; - license = lib.licenses.free; - }; - }) {}; - xpm = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib, queue }: - elpaBuild { - pname = "xpm"; - ename = "xpm"; - version = "1.0.5"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/xpm-1.0.5.tar"; - sha256 = "12a12rmbc1c0j60nv1s8fgg3r2lcjw8hs7qpyscm7ggwanylxn6q"; - }; - packageRequires = [ cl-lib queue ]; - meta = { - homepage = "https://elpa.gnu.org/packages/xpm.html"; - license = lib.licenses.free; - }; - }) {}; - xr = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "xr"; - ename = "xr"; - version = "1.25"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/xr-1.25.tar"; - sha256 = "0jmhcrz6mj3fwm9acwv1jj6nlnqikprjgvglr3cgxysinqh6y3xi"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/xr.html"; - license = lib.licenses.free; - }; - }) {}; - xref = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "xref"; - ename = "xref"; - version = "1.6.3"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/xref-1.6.3.tar"; - sha256 = "0mir1nhic0rnz12d8i1n6m2ihfynhkkg8yccy4v9j4kd31w6f1gs"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/xref.html"; - license = lib.licenses.free; - }; - }) {}; - xref-union = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "xref-union"; - ename = "xref-union"; - version = "0.2.0"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/xref-union-0.2.0.tar"; - sha256 = "0ghhasqs0xq2i576fp97qx6x3h940kgyp76a49gj5cdmig8kyfi8"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/xref-union.html"; - license = lib.licenses.free; - }; - }) {}; - yasnippet = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "yasnippet"; - ename = "yasnippet"; - version = "0.14.1"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/yasnippet-0.14.1.tar"; - sha256 = "0xsq0i9xv9hib5a52rv5vywq1v6gr44gjsyfmqxwffmw1a25x25g"; - }; - packageRequires = [ cl-lib emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/yasnippet.html"; - license = lib.licenses.free; - }; - }) {}; - yasnippet-classic-snippets = callPackage ({ elpaBuild - , fetchurl - , lib - , yasnippet }: - elpaBuild { - pname = "yasnippet-classic-snippets"; - ename = "yasnippet-classic-snippets"; - version = "1.0.2"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/yasnippet-classic-snippets-1.0.2.tar"; - sha256 = "1qiw5592mj8gmq1lhdcpxfza7iqn4cmhn36vdskfa7zpd1lq26y1"; - }; - packageRequires = [ yasnippet ]; - meta = { - homepage = "https://elpa.gnu.org/packages/yasnippet-classic-snippets.html"; - license = lib.licenses.free; - }; - }) {}; - zones = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "zones"; - ename = "zones"; - version = "2023.6.11"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/zones-2023.6.11.tar"; - sha256 = "1z3kq0lfc4fbr9dnk9kj2hqcv60bnjp0x4kbxaxy77vv02a62rzc"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/zones.html"; - license = lib.licenses.free; - }; - }) {}; - ztree = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "ztree"; - ename = "ztree"; - version = "1.0.6"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/ztree-1.0.6.tar"; - sha256 = "1yyh09jff31j5w6mqsnibig3wizv7acsw39pjjfv1rmngni2b8zi"; - }; - packageRequires = [ cl-lib ]; - meta = { - homepage = "https://elpa.gnu.org/packages/ztree.html"; - license = lib.licenses.free; - }; - }) {}; - zuul = callPackage ({ elpaBuild, emacs, fetchurl, lib, project }: - elpaBuild { - pname = "zuul"; - ename = "zuul"; - version = "0.4.0"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/zuul-0.4.0.tar"; - sha256 = "1mj54hm4cqidrmbxyqdjfsc3qcmjhbl0wii79bydx637dvpfvqgf"; - }; - packageRequires = [ emacs project ]; - meta = { - homepage = "https://elpa.gnu.org/packages/zuul.html"; - license = lib.licenses.free; - }; - }) {}; - } +{ + ace-window = callPackage ( + { + avy, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "ace-window"; + ename = "ace-window"; + version = "0.10.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/ace-window-0.10.0.tar"; + sha256 = "1sdzk1hgi3axqqbxf6aq1v5j3d8bybkz40dk8zqn49xxxfmzbdv4"; + }; + packageRequires = [ avy ]; + meta = { + homepage = "https://elpa.gnu.org/packages/ace-window.html"; + license = lib.licenses.free; + }; + } + ) { }; + ack = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "ack"; + ename = "ack"; + version = "1.11"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/ack-1.11.tar"; + sha256 = "1ji02v3qis5sx7hpaaxksgh2jqxzzilagz6z33kjb1lds1sq4z2c"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/ack.html"; + license = lib.licenses.free; + }; + } + ) { }; + activities = callPackage ( + { + elpaBuild, + fetchurl, + lib, + persist, + }: + elpaBuild { + pname = "activities"; + ename = "activities"; + version = "0.7.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/activities-0.7.1.tar"; + sha256 = "1khhkfyy251mag5zqybsvfg3sak0aac1qlsdl1wyiin7f6sq9563"; + }; + packageRequires = [ persist ]; + meta = { + homepage = "https://elpa.gnu.org/packages/activities.html"; + license = lib.licenses.free; + }; + } + ) { }; + ada-mode = callPackage ( + { + elpaBuild, + fetchurl, + gnat-compiler, + lib, + uniquify-files, + wisi, + }: + elpaBuild { + pname = "ada-mode"; + ename = "ada-mode"; + version = "8.1.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/ada-mode-8.1.0.tar"; + sha256 = "10k514al716qjx3qg1m4k1rnf70fa73vrmmx3pp75zrw1d0db9y6"; + }; + packageRequires = [ + gnat-compiler + uniquify-files + wisi + ]; + meta = { + homepage = "https://elpa.gnu.org/packages/ada-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + ada-ref-man = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "ada-ref-man"; + ename = "ada-ref-man"; + version = "2020.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/ada-ref-man-2020.1.tar"; + sha256 = "0ijgl9lnmn8n3pllgh3apl2shbl38f3fxn8z5yy4q6pqqx0vr3fn"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/ada-ref-man.html"; + license = lib.licenses.free; + }; + } + ) { }; + adaptive-wrap = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "adaptive-wrap"; + ename = "adaptive-wrap"; + version = "0.8"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/adaptive-wrap-0.8.tar"; + sha256 = "1dz5mi21v2wqh969m3xggxbzq3qf78hps418rzl73bb57l837qp8"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/adaptive-wrap.html"; + license = lib.licenses.free; + }; + } + ) { }; + adjust-parens = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "adjust-parens"; + ename = "adjust-parens"; + version = "3.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/adjust-parens-3.2.tar"; + sha256 = "1gdlykg7ix3833s40152p1ji4r1ycp18niqjr1f994y4ydqxq8yl"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/adjust-parens.html"; + license = lib.licenses.free; + }; + } + ) { }; + advice-patch = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "advice-patch"; + ename = "advice-patch"; + version = "0.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/advice-patch-0.1.tar"; + sha256 = "0km891648k257k4d6hbrv6jyz9663kww8gfarvzf9lv8i4qa5scp"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/advice-patch.html"; + license = lib.licenses.free; + }; + } + ) { }; + aggressive-completion = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "aggressive-completion"; + ename = "aggressive-completion"; + version = "1.7"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/aggressive-completion-1.7.tar"; + sha256 = "0d388w0yjpjzhqlar9fjrxsjxma09j8as6758sswv01r084gpdbk"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/aggressive-completion.html"; + license = lib.licenses.free; + }; + } + ) { }; + aggressive-indent = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "aggressive-indent"; + ename = "aggressive-indent"; + version = "1.10.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/aggressive-indent-1.10.0.tar"; + sha256 = "1c27g9qhqc4bh96bkxdcjbrhiwi7kzki1l4yhxvyvwwarisl6c7b"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/aggressive-indent.html"; + license = lib.licenses.free; + }; + } + ) { }; + ahungry-theme = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "ahungry-theme"; + ename = "ahungry-theme"; + version = "1.10.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/ahungry-theme-1.10.0.tar"; + sha256 = "16k6wm1qss5bk45askhq5vswrqsjic5dijpkgnmwgvm8xsdlvni6"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/ahungry-theme.html"; + license = lib.licenses.free; + }; + } + ) { }; + aircon-theme = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "aircon-theme"; + ename = "aircon-theme"; + version = "0.0.6"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/aircon-theme-0.0.6.tar"; + sha256 = "0dcnlk3q95bcghlwj8ii40xxhspnfbqcr9mvj1v3adl1s623fyp0"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/aircon-theme.html"; + license = lib.licenses.free; + }; + } + ) { }; + all = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "all"; + ename = "all"; + version = "1.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/all-1.1.tar"; + sha256 = "067c5ynklw1inbjwd1l6dkbpx3vw487qv39y7mdl55a6nqx7hgk4"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/all.html"; + license = lib.licenses.free; + }; + } + ) { }; + altcaps = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "altcaps"; + ename = "altcaps"; + version = "1.2.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/altcaps-1.2.0.tar"; + sha256 = "1smqvq21jparnph03kyyzm47rv5kia6bna1m1pf8ibpkph64rykw"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/altcaps.html"; + license = lib.licenses.free; + }; + } + ) { }; + ampc = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "ampc"; + ename = "ampc"; + version = "0.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/ampc-0.2.tar"; + sha256 = "17l2c5hr7cq0vf4qc8s2adwlhqp74glc4v909h0jcavrnbn8yn80"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/ampc.html"; + license = lib.licenses.free; + }; + } + ) { }; + arbitools = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "arbitools"; + ename = "arbitools"; + version = "0.977"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/arbitools-0.977.tar"; + sha256 = "0s5dpprx24fxm0qk8nzm39c16ydiq97wzz3l7zi69r3l9wf31rb3"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.gnu.org/packages/arbitools.html"; + license = lib.licenses.free; + }; + } + ) { }; + ascii-art-to-unicode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "ascii-art-to-unicode"; + ename = "ascii-art-to-unicode"; + version = "1.13"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/ascii-art-to-unicode-1.13.tar"; + sha256 = "0qlh8zi691gz7s1ayp1x5ga3sj3rfy79y21r6hqf696mrkgpz1d8"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/ascii-art-to-unicode.html"; + license = lib.licenses.free; + }; + } + ) { }; + assess = callPackage ( + { + elpaBuild, + fetchurl, + lib, + m-buffer, + }: + elpaBuild { + pname = "assess"; + ename = "assess"; + version = "0.7"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/assess-0.7.tar"; + sha256 = "1wka2idr63bn8fgh0cz4lf21jvlhkr895y0xnh3syp9vrss5hzsp"; + }; + packageRequires = [ m-buffer ]; + meta = { + homepage = "https://elpa.gnu.org/packages/assess.html"; + license = lib.licenses.free; + }; + } + ) { }; + async = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "async"; + ename = "async"; + version = "1.9.8"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/async-1.9.8.tar"; + sha256 = "0m9w7f8rgpcljsv2p6a9gwqx12whf66mbjranwwzacn98rwchh4v"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/async.html"; + license = lib.licenses.free; + }; + } + ) { }; + auctex = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "auctex"; + ename = "auctex"; + version = "14.0.6"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/auctex-14.0.6.tar"; + sha256 = "0cajri7x6770wjkrasa0p2s0dvcp74fpv1znac5wdfiwhvl1i9yr"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/auctex.html"; + license = lib.licenses.free; + }; + } + ) { }; + auctex-cont-latexmk = callPackage ( + { + auctex, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "auctex-cont-latexmk"; + ename = "auctex-cont-latexmk"; + version = "0.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/auctex-cont-latexmk-0.2.tar"; + sha256 = "0ggyjxjqwpx3h1963i8w96m6kisc65ni9hksn2kjfjddnj1hx0hf"; + }; + packageRequires = [ auctex ]; + meta = { + homepage = "https://elpa.gnu.org/packages/auctex-cont-latexmk.html"; + license = lib.licenses.free; + }; + } + ) { }; + auctex-label-numbers = callPackage ( + { + auctex, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "auctex-label-numbers"; + ename = "auctex-label-numbers"; + version = "0.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/auctex-label-numbers-0.2.tar"; + sha256 = "1cd68yvpm061r9k4x6rvy3g2wdynv5gbjg2dyp06nkrgvakdb00x"; + }; + packageRequires = [ auctex ]; + meta = { + homepage = "https://elpa.gnu.org/packages/auctex-label-numbers.html"; + license = lib.licenses.free; + }; + } + ) { }; + aumix-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "aumix-mode"; + ename = "aumix-mode"; + version = "7"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/aumix-mode-7.tar"; + sha256 = "08baz31hm0nhikqg5h294kg5m4qkiayjhirhb57v57g5722jfk3m"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/aumix-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + auto-correct = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "auto-correct"; + ename = "auto-correct"; + version = "1.1.4"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/auto-correct-1.1.4.tar"; + sha256 = "05ky3qxbvxrkywpqj6syl7ll6za74fhjzrcia6wdmxsnjya5qbf1"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/auto-correct.html"; + license = lib.licenses.free; + }; + } + ) { }; + auto-header = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "auto-header"; + ename = "auto-header"; + version = "0.1.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/auto-header-0.1.2.tar"; + sha256 = "0p22bpdy29i7ff8rzjh1qzvj4d8igl36gs1981kmds4qz23qn447"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/auto-header.html"; + license = lib.licenses.free; + }; + } + ) { }; + auto-overlays = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "auto-overlays"; + ename = "auto-overlays"; + version = "0.10.10"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/auto-overlays-0.10.10.tar"; + sha256 = "0jn7lk8vzdrf0flxwwx295z0mrghd3lyspfadwz35c6kygvy8078"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.gnu.org/packages/auto-overlays.html"; + license = lib.licenses.free; + }; + } + ) { }; + autocrypt = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "autocrypt"; + ename = "autocrypt"; + version = "0.4.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/autocrypt-0.4.2.tar"; + sha256 = "0mc4vb6x7qzn29dg9m05zgli6mwh9cj4vc5n6hvarzkn9lxl6mr3"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/autocrypt.html"; + license = lib.licenses.free; + }; + } + ) { }; + avy = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "avy"; + ename = "avy"; + version = "0.5.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/avy-0.5.0.tar"; + sha256 = "1xfcml38qmrwdd0rkhwrvv2s7dbznwhk3vy9pjd6ljpg22wkb80d"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.gnu.org/packages/avy.html"; + license = lib.licenses.free; + }; + } + ) { }; + bbdb = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "bbdb"; + ename = "bbdb"; + version = "3.2.2.4"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/bbdb-3.2.2.4.tar"; + sha256 = "1ymjydf54z3rbkxk4irvan5s8lc8wdhk01691741vfznx0nsc4a2"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.gnu.org/packages/bbdb.html"; + license = lib.licenses.free; + }; + } + ) { }; + beacon = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "beacon"; + ename = "beacon"; + version = "1.3.4"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/beacon-1.3.4.tar"; + sha256 = "1hxb6vyvpppj7yzphknmh8m4a1h89lg6jr98g4d62k0laxazvdza"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/beacon.html"; + license = lib.licenses.free; + }; + } + ) { }; + beframe = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "beframe"; + ename = "beframe"; + version = "1.1.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/beframe-1.1.1.tar"; + sha256 = "0xx2zvgjilivi6nnr2x9bwwcifinj66j6r07wxjawqkrsknyypas"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/beframe.html"; + license = lib.licenses.free; + }; + } + ) { }; + bicep-ts-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "bicep-ts-mode"; + ename = "bicep-ts-mode"; + version = "0.1.3"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/bicep-ts-mode-0.1.3.tar"; + sha256 = "02377gsdnfvvydjw014p2y6y74nd5zfh1ghq5l9ayq0ilvv8fmx7"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/bicep-ts-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + bind-key = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "bind-key"; + ename = "bind-key"; + version = "2.4.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/bind-key-2.4.1.tar"; + sha256 = "0jrbm2l6h4r7qjcdcsfczbijmbf3njzzzrymv08zanchmy7lvsv2"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/bind-key.html"; + license = lib.licenses.free; + }; + } + ) { }; + blist = callPackage ( + { + elpaBuild, + fetchurl, + ilist, + lib, + }: + elpaBuild { + pname = "blist"; + ename = "blist"; + version = "0.4"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/blist-0.4.tar"; + sha256 = "0k1h6rmyphqsgznk53hc1xbbnj2h2n2jknlb8vjxlv01z83s32wy"; + }; + packageRequires = [ ilist ]; + meta = { + homepage = "https://elpa.gnu.org/packages/blist.html"; + license = lib.licenses.free; + }; + } + ) { }; + bluetooth = callPackage ( + { + dash, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "bluetooth"; + ename = "bluetooth"; + version = "0.3.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/bluetooth-0.3.1.tar"; + sha256 = "1yjqjm6cis6bq18li63hbhc4qzki3486xvdjkzs2gj4chc1yw1x4"; + }; + packageRequires = [ dash ]; + meta = { + homepage = "https://elpa.gnu.org/packages/bluetooth.html"; + license = lib.licenses.free; + }; + } + ) { }; + bnf-mode = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "bnf-mode"; + ename = "bnf-mode"; + version = "0.4.5"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/bnf-mode-0.4.5.tar"; + sha256 = "1x6km8rhhb5bkas3yfmjfpyxlhyxkqnzviw1pqlq88c95j88h3d4"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.gnu.org/packages/bnf-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + boxy = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "boxy"; + ename = "boxy"; + version = "1.1.4"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/boxy-1.1.4.tar"; + sha256 = "0mwj1qc626f1iaq5iaqm1f4iwyz91hzqhzfk5f53gsqka7yz2fnf"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/boxy.html"; + license = lib.licenses.free; + }; + } + ) { }; + boxy-headings = callPackage ( + { + boxy, + elpaBuild, + fetchurl, + lib, + org, + }: + elpaBuild { + pname = "boxy-headings"; + ename = "boxy-headings"; + version = "2.1.6"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/boxy-headings-2.1.6.tar"; + sha256 = "0wnks9a4agvqjivp9myl8zcdq6rj7hh5ig73f8qv5imar0i76izc"; + }; + packageRequires = [ + boxy + org + ]; + meta = { + homepage = "https://elpa.gnu.org/packages/boxy-headings.html"; + license = lib.licenses.free; + }; + } + ) { }; + breadcrumb = callPackage ( + { + elpaBuild, + fetchurl, + lib, + project, + }: + elpaBuild { + pname = "breadcrumb"; + ename = "breadcrumb"; + version = "1.0.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/breadcrumb-1.0.1.tar"; + sha256 = "1s69a2z183mla4d4b5pcsswbwa3hjvsg1xj7r3hdw6j841b0l9dw"; + }; + packageRequires = [ project ]; + meta = { + homepage = "https://elpa.gnu.org/packages/breadcrumb.html"; + license = lib.licenses.free; + }; + } + ) { }; + brief = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + nadvice, + }: + elpaBuild { + pname = "brief"; + ename = "brief"; + version = "5.91"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/brief-5.91.tar"; + sha256 = "106xm23045l3ds5q04s7c6wa00ffv7rw495cjqp99nzqvvbmivcb"; + }; + packageRequires = [ + cl-lib + nadvice + ]; + meta = { + homepage = "https://elpa.gnu.org/packages/brief.html"; + license = lib.licenses.free; + }; + } + ) { }; + buffer-env = callPackage ( + { + compat, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "buffer-env"; + ename = "buffer-env"; + version = "0.6"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/buffer-env-0.6.tar"; + sha256 = "08qaw4y1sszhh97ih13vfrm0r1nn1k410f2wwvffvncxhqgxz5lv"; + }; + packageRequires = [ compat ]; + meta = { + homepage = "https://elpa.gnu.org/packages/buffer-env.html"; + license = lib.licenses.free; + }; + } + ) { }; + buffer-expose = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "buffer-expose"; + ename = "buffer-expose"; + version = "0.4.3"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/buffer-expose-0.4.3.tar"; + sha256 = "1ymjjjrbknp3hdfwd8zyzfrsn5n267245ffmplm7yk2s34kgxr0n"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.gnu.org/packages/buffer-expose.html"; + license = lib.licenses.free; + }; + } + ) { }; + bufferlo = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "bufferlo"; + ename = "bufferlo"; + version = "0.8"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/bufferlo-0.8.tar"; + sha256 = "0ypd611xmjsir24nv8gr19pq7f1n0gbgq9yzvfy3m6k97gpw2jzq"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/bufferlo.html"; + license = lib.licenses.free; + }; + } + ) { }; + bug-hunter = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + seq, + }: + elpaBuild { + pname = "bug-hunter"; + ename = "bug-hunter"; + version = "1.3.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/bug-hunter-1.3.1.tar"; + sha256 = "0cgwq8b6jglbg9ydvf80ijgbbccrks3yb9af46sdd6aqdmvdlx21"; + }; + packageRequires = [ + cl-lib + seq + ]; + meta = { + homepage = "https://elpa.gnu.org/packages/bug-hunter.html"; + license = lib.licenses.free; + }; + } + ) { }; + buildbot = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "buildbot"; + ename = "buildbot"; + version = "0.0.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/buildbot-0.0.1.tar"; + sha256 = "056jakpyslizsp8sik5f7m90dpcga8y38hb5rh1yfa7k1xwcrrk2"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/buildbot.html"; + license = lib.licenses.free; + }; + } + ) { }; + calibre = callPackage ( + { + compat, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "calibre"; + ename = "calibre"; + version = "1.4.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/calibre-1.4.1.tar"; + sha256 = "1ak05y3cmmwpg8bijkwl97kvfxhxh9xxc74askyafc50n0jvaq87"; + }; + packageRequires = [ compat ]; + meta = { + homepage = "https://elpa.gnu.org/packages/calibre.html"; + license = lib.licenses.free; + }; + } + ) { }; + cape = callPackage ( + { + compat, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "cape"; + ename = "cape"; + version = "1.6"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/cape-1.6.tar"; + sha256 = "1pqkdajl7nd510hxq4lph5cqj3j84mi01nl0ka2k4j8wrvb9zagn"; + }; + packageRequires = [ compat ]; + meta = { + homepage = "https://elpa.gnu.org/packages/cape.html"; + license = lib.licenses.free; + }; + } + ) { }; + capf-autosuggest = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "capf-autosuggest"; + ename = "capf-autosuggest"; + version = "0.3"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/capf-autosuggest-0.3.tar"; + sha256 = "18cwiv227m8y1xqvsnjrzgd6f6kvvih742h8y38pphljssl109fk"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/capf-autosuggest.html"; + license = lib.licenses.free; + }; + } + ) { }; + caps-lock = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "caps-lock"; + ename = "caps-lock"; + version = "1.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/caps-lock-1.0.tar"; + sha256 = "1yy4kjc1zlpzkam0jj8h3v5h23wyv1yfvwj2drknn59d8amc1h4y"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/caps-lock.html"; + license = lib.licenses.free; + }; + } + ) { }; + captain = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "captain"; + ename = "captain"; + version = "1.0.3"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/captain-1.0.3.tar"; + sha256 = "0l8z8bqk705jdl7gvd2x7nhs0z6gn3swk5yzp3mnhjcfda6whz8l"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/captain.html"; + license = lib.licenses.free; + }; + } + ) { }; + chess = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "chess"; + ename = "chess"; + version = "2.0.5"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/chess-2.0.5.tar"; + sha256 = "0dgmp7ymjyb5pa93n05s0d4ql7wk98r9s4f9w35yahgqk9xvqclj"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.gnu.org/packages/chess.html"; + license = lib.licenses.free; + }; + } + ) { }; + cl-generic = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "cl-generic"; + ename = "cl-generic"; + version = "0.3"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/cl-generic-0.3.tar"; + sha256 = "0dqn484xb25ifiqd9hqdrs954c74akrf95llx23b2kzf051pqh1k"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/cl-generic.html"; + license = lib.licenses.free; + }; + } + ) { }; + cl-lib = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "cl-lib"; + ename = "cl-lib"; + version = "0.7.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/cl-lib-0.7.1.tar"; + sha256 = "1wpdg2zwhzxv4bkx9ldiwd16l6244wakv8yphrws4mnymkxvf2q1"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/cl-lib.html"; + license = lib.licenses.free; + }; + } + ) { }; + clipboard-collector = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "clipboard-collector"; + ename = "clipboard-collector"; + version = "0.3"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/clipboard-collector-0.3.tar"; + sha256 = "0v70f9pljq3jar3d1vpaj48nhrg90jzsvqcbzgv54989w8rvvcd6"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/clipboard-collector.html"; + license = lib.licenses.free; + }; + } + ) { }; + cobol-mode = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "cobol-mode"; + ename = "cobol-mode"; + version = "1.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/cobol-mode-1.1.tar"; + sha256 = "0aicx6vvhgn0fvikbq74vnvvwh228pxdqf52sbiffhzgb7pkbvcj"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.gnu.org/packages/cobol-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + code-cells = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "code-cells"; + ename = "code-cells"; + version = "0.4"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/code-cells-0.4.tar"; + sha256 = "0kxpnydxlj8pqh54c4c80jlyc6jcplf89bkh3jmm509fmyr7sf20"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/code-cells.html"; + license = lib.licenses.free; + }; + } + ) { }; + colorful-mode = callPackage ( + { + compat, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "colorful-mode"; + ename = "colorful-mode"; + version = "1.0.4"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/colorful-mode-1.0.4.tar"; + sha256 = "0vy1rqv9aknns81v97j6dwr621hbs0489p7bhpg7k7qva39i97vs"; + }; + packageRequires = [ compat ]; + meta = { + homepage = "https://elpa.gnu.org/packages/colorful-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + comint-mime = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "comint-mime"; + ename = "comint-mime"; + version = "0.4"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/comint-mime-0.4.tar"; + sha256 = "13vi973p0ahpvssv5m1pb63f2wkca0lz0nw3nsj6p4s3jzp46npa"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/comint-mime.html"; + license = lib.licenses.free; + }; + } + ) { }; + compact-docstrings = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "compact-docstrings"; + ename = "compact-docstrings"; + version = "0.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/compact-docstrings-0.2.tar"; + sha256 = "00fjhfysjyqigkg0icxlqw6imzhjk5xhlxmxxs1jiafhn55dbcpj"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/compact-docstrings.html"; + license = lib.licenses.free; + }; + } + ) { }; + company = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "company"; + ename = "company"; + version = "0.10.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/company-0.10.2.tar"; + sha256 = "1708cqrcw26y8z7inm4nzbn2y8gkan5nv5bjzc4ry8zhqz94sxkz"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/company.html"; + license = lib.licenses.free; + }; + } + ) { }; + company-ebdb = callPackage ( + { + company, + ebdb, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "company-ebdb"; + ename = "company-ebdb"; + version = "1.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/company-ebdb-1.1.tar"; + sha256 = "1ym0r7y90n4d6grd4l02rxk096gsjmw9j81slig0pq1ky33rb6ks"; + }; + packageRequires = [ + company + ebdb + ]; + meta = { + homepage = "https://elpa.gnu.org/packages/company-ebdb.html"; + license = lib.licenses.free; + }; + } + ) { }; + company-math = callPackage ( + { + company, + elpaBuild, + fetchurl, + lib, + math-symbol-lists, + }: + elpaBuild { + pname = "company-math"; + ename = "company-math"; + version = "1.5.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/company-math-1.5.1.tar"; + sha256 = "16ya3yscxxmz9agi0nc5pi43wkfv45lh1zd89yqfc7zcw02nsnld"; + }; + packageRequires = [ + company + math-symbol-lists + ]; + meta = { + homepage = "https://elpa.gnu.org/packages/company-math.html"; + license = lib.licenses.free; + }; + } + ) { }; + company-statistics = callPackage ( + { + company, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "company-statistics"; + ename = "company-statistics"; + version = "0.2.3"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/company-statistics-0.2.3.tar"; + sha256 = "1gfwhgv7q9d3xjgaim25diyd6jfl9w3j07qrssphcrdxv0q24d14"; + }; + packageRequires = [ company ]; + meta = { + homepage = "https://elpa.gnu.org/packages/company-statistics.html"; + license = lib.licenses.free; + }; + } + ) { }; + compat = callPackage ( + { + elpaBuild, + fetchurl, + lib, + seq, + }: + elpaBuild { + pname = "compat"; + ename = "compat"; + version = "30.0.0.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/compat-30.0.0.0.tar"; + sha256 = "0z7049xkdyx22ywq821d19lp73ywaz6brxj461h0h2a73y7999cl"; + }; + packageRequires = [ seq ]; + meta = { + homepage = "https://elpa.gnu.org/packages/compat.html"; + license = lib.licenses.free; + }; + } + ) { }; + consult = callPackage ( + { + compat, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "consult"; + ename = "consult"; + version = "1.8"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/consult-1.8.tar"; + sha256 = "0k3k1jmwdw4w8rr5z2030ba37mcia2zghh6p4c36ck51hwvfkb8w"; + }; + packageRequires = [ compat ]; + meta = { + homepage = "https://elpa.gnu.org/packages/consult.html"; + license = lib.licenses.free; + }; + } + ) { }; + consult-denote = callPackage ( + { + consult, + denote, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "consult-denote"; + ename = "consult-denote"; + version = "0.1.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/consult-denote-0.1.1.tar"; + sha256 = "0yhf9fifas87rs4wdapszbpx1xqyq44izjq7vzpyvdlh5a5fhhx1"; + }; + packageRequires = [ + consult + denote + ]; + meta = { + homepage = "https://elpa.gnu.org/packages/consult-denote.html"; + license = lib.licenses.free; + }; + } + ) { }; + consult-hoogle = callPackage ( + { + elpaBuild, + fetchurl, + haskell-mode, + lib, + }: + elpaBuild { + pname = "consult-hoogle"; + ename = "consult-hoogle"; + version = "0.2.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/consult-hoogle-0.2.1.tar"; + sha256 = "15am29sn0qx6yn8xcmdafzh1ijph10yd65cphcax02yx782hv6pr"; + }; + packageRequires = [ haskell-mode ]; + meta = { + homepage = "https://elpa.gnu.org/packages/consult-hoogle.html"; + license = lib.licenses.free; + }; + } + ) { }; + consult-recoll = callPackage ( + { + consult, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "consult-recoll"; + ename = "consult-recoll"; + version = "0.8.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/consult-recoll-0.8.1.tar"; + sha256 = "1zdmkq9cjb6kb0hf3ngm07r3mhrjal27x34i1bm7ri3089wbsp8v"; + }; + packageRequires = [ consult ]; + meta = { + homepage = "https://elpa.gnu.org/packages/consult-recoll.html"; + license = lib.licenses.free; + }; + } + ) { }; + context-coloring = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "context-coloring"; + ename = "context-coloring"; + version = "8.1.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/context-coloring-8.1.0.tar"; + sha256 = "0mqdl34g493pps85ckin5i3iz8kwlqkcwjvsf2sj4nldjvvfk1ng"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/context-coloring.html"; + license = lib.licenses.free; + }; + } + ) { }; + corfu = callPackage ( + { + compat, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "corfu"; + ename = "corfu"; + version = "1.5"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/corfu-1.5.tar"; + sha256 = "0m80slhpr9xd57b3nvrqgfxm44851v9gfcy8ky3d3v2g5i2mrm6x"; + }; + packageRequires = [ compat ]; + meta = { + homepage = "https://elpa.gnu.org/packages/corfu.html"; + license = lib.licenses.free; + }; + } + ) { }; + coterm = callPackage ( + { + compat, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "coterm"; + ename = "coterm"; + version = "1.6"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/coterm-1.6.tar"; + sha256 = "0kgsg99dggirz6asyppwx1ydc0jh62xd1bfhnm2hyby5qkqz1yvk"; + }; + packageRequires = [ compat ]; + meta = { + homepage = "https://elpa.gnu.org/packages/coterm.html"; + license = lib.licenses.free; + }; + } + ) { }; + counsel = callPackage ( + { + elpaBuild, + fetchurl, + ivy, + lib, + swiper, + }: + elpaBuild { + pname = "counsel"; + ename = "counsel"; + version = "0.14.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/counsel-0.14.2.tar"; + sha256 = "10jajfl2vhqj2awy991kqrf1hcsj8nkvn760cbxjsm2lhzvqqhj3"; + }; + packageRequires = [ + ivy + swiper + ]; + meta = { + homepage = "https://elpa.gnu.org/packages/counsel.html"; + license = lib.licenses.free; + }; + } + ) { }; + cpio-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "cpio-mode"; + ename = "cpio-mode"; + version = "0.17"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/cpio-mode-0.17.tar"; + sha256 = "13jay5c36svq2r78gwp7d1slpkkzrx749q28554mxd855fr6pvaj"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/cpio-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + cpupower = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "cpupower"; + ename = "cpupower"; + version = "1.0.5"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/cpupower-1.0.5.tar"; + sha256 = "155fhf38p95a5ws6jzpczw0z03zwbsqzdwj50v3grjivyp74pddz"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/cpupower.html"; + license = lib.licenses.free; + }; + } + ) { }; + crdt = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "crdt"; + ename = "crdt"; + version = "0.3.5"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/crdt-0.3.5.tar"; + sha256 = "038qivbw02h1i98ym0fwx72x05gm0j4h93a54v1l7g25drm5zm83"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/crdt.html"; + license = lib.licenses.free; + }; + } + ) { }; + crisp = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "crisp"; + ename = "crisp"; + version = "1.3.6"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/crisp-1.3.6.tar"; + sha256 = "0am7gwadjp0nwlvf7y4sp9brbm0234k55bnxfv44lkwdf502mq8y"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/crisp.html"; + license = lib.licenses.free; + }; + } + ) { }; + csharp-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "csharp-mode"; + ename = "csharp-mode"; + version = "2.0.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/csharp-mode-2.0.0.tar"; + sha256 = "1jjxq5vkqq2v8rkcm2ygggpg355aqmrl2hdhh1xma3jlnj5carnf"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/csharp-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + csv-mode = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "csv-mode"; + ename = "csv-mode"; + version = "1.27"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/csv-mode-1.27.tar"; + sha256 = "0jxf4id5c9696nh666x0xbzqx3vskyv810km61y9nkg7sp4ln2qf"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.gnu.org/packages/csv-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + cursor-undo = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "cursor-undo"; + ename = "cursor-undo"; + version = "1.1.5"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/cursor-undo-1.1.5.tar"; + sha256 = "1zbn4wfirnwjhy4q0lz8s0zffp84v6zs1x6wjxlcr0la7xn2sx4v"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/cursor-undo.html"; + license = lib.licenses.free; + }; + } + ) { }; + cursory = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "cursory"; + ename = "cursory"; + version = "1.0.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/cursory-1.0.1.tar"; + sha256 = "09ddn7rlmznq833nsm6s6zhzrq94lrbmm1vln43hax9yf784pqbr"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/cursory.html"; + license = lib.licenses.free; + }; + } + ) { }; + cycle-quotes = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "cycle-quotes"; + ename = "cycle-quotes"; + version = "0.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/cycle-quotes-0.1.tar"; + sha256 = "1glf8sd3gqp9qbd238vxd3aprdz93f887893xji3ybqli36i2xs1"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/cycle-quotes.html"; + license = lib.licenses.free; + }; + } + ) { }; + dape = callPackage ( + { + elpaBuild, + fetchurl, + jsonrpc, + lib, + }: + elpaBuild { + pname = "dape"; + ename = "dape"; + version = "0.14.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/dape-0.14.0.tar"; + sha256 = "1aakk2v3nw1pl4ai9bb4h748z6bkfkilw283ndfah7jz61j90van"; + }; + packageRequires = [ jsonrpc ]; + meta = { + homepage = "https://elpa.gnu.org/packages/dape.html"; + license = lib.licenses.free; + }; + } + ) { }; + darkroom = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "darkroom"; + ename = "darkroom"; + version = "0.3"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/darkroom-0.3.tar"; + sha256 = "0gxixkai8awc77vzckwljmyapdnxw5j9ajxmlr8rq42994gjr4fm"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.gnu.org/packages/darkroom.html"; + license = lib.licenses.free; + }; + } + ) { }; + dash = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "dash"; + ename = "dash"; + version = "2.19.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/dash-2.19.1.tar"; + sha256 = "1c7yibfikkwlip8zh4kiamh3kljil3hyl250g8fkxpdyhljjdk6m"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/dash.html"; + license = lib.licenses.free; + }; + } + ) { }; + dbus-codegen = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "dbus-codegen"; + ename = "dbus-codegen"; + version = "0.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/dbus-codegen-0.1.tar"; + sha256 = "0d3sbqs5r8578629inx8nhqvx0kshf41d00c8dpc75v4b2vx0h6w"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.gnu.org/packages/dbus-codegen.html"; + license = lib.licenses.free; + }; + } + ) { }; + debbugs = callPackage ( + { + elpaBuild, + fetchurl, + lib, + soap-client, + }: + elpaBuild { + pname = "debbugs"; + ename = "debbugs"; + version = "0.40"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/debbugs-0.40.tar"; + sha256 = "1agms2il38lgz02g4fswil9x5j1xwpl8kvhbd48jcx57nq18a7bl"; + }; + packageRequires = [ soap-client ]; + meta = { + homepage = "https://elpa.gnu.org/packages/debbugs.html"; + license = lib.licenses.free; + }; + } + ) { }; + delight = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + nadvice, + }: + elpaBuild { + pname = "delight"; + ename = "delight"; + version = "1.7"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/delight-1.7.tar"; + sha256 = "1j7srr0i7s9hcny45m8zmj33nl9g6zi55cbkdzzlbx6si2rqwwlj"; + }; + packageRequires = [ + cl-lib + nadvice + ]; + meta = { + homepage = "https://elpa.gnu.org/packages/delight.html"; + license = lib.licenses.free; + }; + } + ) { }; + denote = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "denote"; + ename = "denote"; + version = "3.0.8"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/denote-3.0.8.tar"; + sha256 = "0hqv0lbjjs3df2vjwx3mnyj98kl3shh9aahl2y9mnmfq4fingdi8"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/denote.html"; + license = lib.licenses.free; + }; + } + ) { }; + denote-menu = callPackage ( + { + denote, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "denote-menu"; + ename = "denote-menu"; + version = "1.3.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/denote-menu-1.3.0.tar"; + sha256 = "0flkb3f1zpp3sbjx6h7qb6fnjgg44s53zkv3q3fj6cl7c0f11n02"; + }; + packageRequires = [ denote ]; + meta = { + homepage = "https://elpa.gnu.org/packages/denote-menu.html"; + license = lib.licenses.free; + }; + } + ) { }; + detached = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "detached"; + ename = "detached"; + version = "0.10.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/detached-0.10.1.tar"; + sha256 = "0w6xgidi0g1pc13xfm8hcgmc7i2h5brj443cykwgvr5wkqnpmp9m"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/detached.html"; + license = lib.licenses.free; + }; + } + ) { }; + devdocs = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "devdocs"; + ename = "devdocs"; + version = "0.6.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/devdocs-0.6.1.tar"; + sha256 = "04m3jd3wymrsdlb1i7z6dz9pf1q8q38ihkbn3jisdca6xkk9jd6p"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/devdocs.html"; + license = lib.licenses.free; + }; + } + ) { }; + devicetree-ts-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "devicetree-ts-mode"; + ename = "devicetree-ts-mode"; + version = "0.3"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/devicetree-ts-mode-0.3.tar"; + sha256 = "06j385pvlhd7hp9isqp5gcf378m8p6578q6nz81r8dx93ymaak79"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/devicetree-ts-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + dict-tree = callPackage ( + { + elpaBuild, + fetchurl, + heap, + lib, + tNFA, + trie, + }: + elpaBuild { + pname = "dict-tree"; + ename = "dict-tree"; + version = "0.17"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/dict-tree-0.17.tar"; + sha256 = "0p4j0m3b9i38l4rcgzdps95wqk27zz156d4q73vq054kpcphrfpp"; + }; + packageRequires = [ + heap + tNFA + trie + ]; + meta = { + homepage = "https://elpa.gnu.org/packages/dict-tree.html"; + license = lib.licenses.free; + }; + } + ) { }; + diff-hl = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "diff-hl"; + ename = "diff-hl"; + version = "1.10.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/diff-hl-1.10.0.tar"; + sha256 = "0v8nm2sx3v405fj6i5v7nnar47j6na0q5cm5za9y33n6xaw3v2yh"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.gnu.org/packages/diff-hl.html"; + license = lib.licenses.free; + }; + } + ) { }; + diffview = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "diffview"; + ename = "diffview"; + version = "1.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/diffview-1.0.el"; + sha256 = "1gkdmzmgjixz9nak7dxvqy28kz0g7i672gavamwgnc1jl37wkcwi"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/diffview.html"; + license = lib.licenses.free; + }; + } + ) { }; + diminish = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "diminish"; + ename = "diminish"; + version = "0.46"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/diminish-0.46.tar"; + sha256 = "1xqd6ldxl93l281ncddik1lfxjngi2drq61mv7v18r756c7bqr5r"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/diminish.html"; + license = lib.licenses.free; + }; + } + ) { }; + dired-du = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "dired-du"; + ename = "dired-du"; + version = "0.5.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/dired-du-0.5.2.tar"; + sha256 = "066yjy9vdbf20adcqdcknk5b0ml18fy2bm9gkgcp0qfg37yy1yjg"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.gnu.org/packages/dired-du.html"; + license = lib.licenses.free; + }; + } + ) { }; + dired-duplicates = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "dired-duplicates"; + ename = "dired-duplicates"; + version = "0.4"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/dired-duplicates-0.4.tar"; + sha256 = "1srih47bq7szg6n3qlz4yzzcijg79p8xpwmi5c4v9xscl94nnc4z"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/dired-duplicates.html"; + license = lib.licenses.free; + }; + } + ) { }; + dired-git-info = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "dired-git-info"; + ename = "dired-git-info"; + version = "0.3.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/dired-git-info-0.3.1.tar"; + sha256 = "0rryvlbqx1j48wafja15yc39jd0fzgz9i6bzmq9jpql3w9445772"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/dired-git-info.html"; + license = lib.licenses.free; + }; + } + ) { }; + dired-preview = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "dired-preview"; + ename = "dired-preview"; + version = "0.2.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/dired-preview-0.2.0.tar"; + sha256 = "15l01javijjjjc9bycljgshg9jv3clmfnsisy7f3caqxq78sb61l"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/dired-preview.html"; + license = lib.licenses.free; + }; + } + ) { }; + disk-usage = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "disk-usage"; + ename = "disk-usage"; + version = "1.3.3"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/disk-usage-1.3.3.tar"; + sha256 = "02i7i7mrn6ky3lzhcadvq7wlznd0b2ay107h2b3yh4wwwxjxymyg"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/disk-usage.html"; + license = lib.licenses.free; + }; + } + ) { }; + dismal = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "dismal"; + ename = "dismal"; + version = "1.5.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/dismal-1.5.2.tar"; + sha256 = "1706m5ya6q0jf8mzfkqn47aqd7ygm88fm7pvzbd4cry30mjs5vki"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.gnu.org/packages/dismal.html"; + license = lib.licenses.free; + }; + } + ) { }; + djvu = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "djvu"; + ename = "djvu"; + version = "1.1.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/djvu-1.1.2.tar"; + sha256 = "0z74aicvy680m1d6v5zk5pcpkd310jqqdxadpjcbnjcybzp1zisq"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/djvu.html"; + license = lib.licenses.free; + }; + } + ) { }; + do-at-point = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "do-at-point"; + ename = "do-at-point"; + version = "0.1.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/do-at-point-0.1.2.tar"; + sha256 = "0kirhg78ra6311hx1f1kpqhpxjxxg61gnzsh9j6id10f92h6m5gz"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/do-at-point.html"; + license = lib.licenses.free; + }; + } + ) { }; + doc-toc = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "doc-toc"; + ename = "doc-toc"; + version = "1.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/doc-toc-1.2.tar"; + sha256 = "09xwa0xgnzlaff0j5zy3kam6spcnw0npppc3gf6ka5bizbk4dq99"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/doc-toc.html"; + license = lib.licenses.free; + }; + } + ) { }; + docbook = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "docbook"; + ename = "docbook"; + version = "0.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/docbook-0.1.tar"; + sha256 = "1kn71kpyb1maww414zgpc1ccgb02mmaiaix06jyqhf75hfxms2lv"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/docbook.html"; + license = lib.licenses.free; + }; + } + ) { }; + drepl = callPackage ( + { + comint-mime, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "drepl"; + ename = "drepl"; + version = "0.3"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/drepl-0.3.tar"; + sha256 = "0dy8xvx5nwibiyhddm6nhcw384vhkhsbbxcs4hah0yxwajfm8yds"; + }; + packageRequires = [ comint-mime ]; + meta = { + homepage = "https://elpa.gnu.org/packages/drepl.html"; + license = lib.licenses.free; + }; + } + ) { }; + dts-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "dts-mode"; + ename = "dts-mode"; + version = "1.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/dts-mode-1.0.tar"; + sha256 = "16ads9xjbqgmgwzj63anhc6yb1j79qpcnxjafqrzdih1p5j7hrr9"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/dts-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + easy-escape = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "easy-escape"; + ename = "easy-escape"; + version = "0.2.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/easy-escape-0.2.1.tar"; + sha256 = "0mwam1a7sl90aqgz6mj3zm0w1dq15b5jpxmwxv21xs1imyv696ci"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/easy-escape.html"; + license = lib.licenses.free; + }; + } + ) { }; + easy-kill = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "easy-kill"; + ename = "easy-kill"; + version = "0.9.5"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/easy-kill-0.9.5.tar"; + sha256 = "1nwhqidy5zq6j867b21zng5ppb7n56drnhn3wjs7hjmkf23r63qy"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.gnu.org/packages/easy-kill.html"; + license = lib.licenses.free; + }; + } + ) { }; + ebdb = callPackage ( + { + elpaBuild, + fetchurl, + lib, + seq, + }: + elpaBuild { + pname = "ebdb"; + ename = "ebdb"; + version = "0.8.22"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/ebdb-0.8.22.tar"; + sha256 = "0nmrhjk2ddml115ibsy8j4crw5hzq9fa94v8y41iyj9h3gf8irzc"; + }; + packageRequires = [ seq ]; + meta = { + homepage = "https://elpa.gnu.org/packages/ebdb.html"; + license = lib.licenses.free; + }; + } + ) { }; + ebdb-gnorb = callPackage ( + { + ebdb, + elpaBuild, + fetchurl, + gnorb, + lib, + }: + elpaBuild { + pname = "ebdb-gnorb"; + ename = "ebdb-gnorb"; + version = "1.0.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/ebdb-gnorb-1.0.2.tar"; + sha256 = "1kwcrg268vmskls9p4ccs6ybdip30cb4fw3xzq11gqjch1nssh18"; + }; + packageRequires = [ + ebdb + gnorb + ]; + meta = { + homepage = "https://elpa.gnu.org/packages/ebdb-gnorb.html"; + license = lib.licenses.free; + }; + } + ) { }; + ebdb-i18n-chn = callPackage ( + { + ebdb, + elpaBuild, + fetchurl, + lib, + pyim, + }: + elpaBuild { + pname = "ebdb-i18n-chn"; + ename = "ebdb-i18n-chn"; + version = "1.3.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/ebdb-i18n-chn-1.3.2.tar"; + sha256 = "1qyia40z6ssvnlpra116avakyf81vqn42860ny21g0zsl99a58j2"; + }; + packageRequires = [ + ebdb + pyim + ]; + meta = { + homepage = "https://elpa.gnu.org/packages/ebdb-i18n-chn.html"; + license = lib.licenses.free; + }; + } + ) { }; + ediprolog = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "ediprolog"; + ename = "ediprolog"; + version = "2.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/ediprolog-2.2.tar"; + sha256 = "13g8y51lvdphi1v6rdca36c0r9v35lldx5979yrccsf07h0hw5gm"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/ediprolog.html"; + license = lib.licenses.free; + }; + } + ) { }; + eev = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "eev"; + ename = "eev"; + version = "20240811"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/eev-20240811.tar"; + sha256 = "1m5d0jr408fc42kk5vdkdb2kk3x4k1q7k32hwbjb7fkmp8nkv7ll"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/eev.html"; + license = lib.licenses.free; + }; + } + ) { }; + ef-themes = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "ef-themes"; + ename = "ef-themes"; + version = "1.7.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/ef-themes-1.7.0.tar"; + sha256 = "0d6rpwk1z9sc1yzfc4d4icb43pqwvdfvqap1m4r4aajvc5kasq1v"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/ef-themes.html"; + license = lib.licenses.free; + }; + } + ) { }; + eglot = callPackage ( + { + eldoc, + elpaBuild, + external-completion, + fetchurl, + flymake ? null, + jsonrpc, + lib, + project, + seq, + xref, + }: + elpaBuild { + pname = "eglot"; + ename = "eglot"; + version = "1.17"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/eglot-1.17.tar"; + sha256 = "1cnx522wb49f1dkm80sigz3kvzrblmq5b1lnfyq9wdnh6zdm4l00"; + }; + packageRequires = [ + eldoc + external-completion + flymake + jsonrpc + project + seq + xref + ]; + meta = { + homepage = "https://elpa.gnu.org/packages/eglot.html"; + license = lib.licenses.free; + }; + } + ) { }; + el-search = callPackage ( + { + cl-print ? null, + elpaBuild, + fetchurl, + lib, + stream, + }: + elpaBuild { + pname = "el-search"; + ename = "el-search"; + version = "1.12.6.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/el-search-1.12.6.1.tar"; + sha256 = "1vq8cp2icpl8vkc9r8brzbn0mpaj03mnvdz1bdqn8nqrzc3w0h24"; + }; + packageRequires = [ + cl-print + stream + ]; + meta = { + homepage = "https://elpa.gnu.org/packages/el-search.html"; + license = lib.licenses.free; + }; + } + ) { }; + eldoc = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "eldoc"; + ename = "eldoc"; + version = "1.15.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/eldoc-1.15.0.tar"; + sha256 = "05fgk3y2rp0xrm3x0xmf9fm72l442y7ydxxg3xk006d9cq06h8kz"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/eldoc.html"; + license = lib.licenses.free; + }; + } + ) { }; + electric-spacing = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "electric-spacing"; + ename = "electric-spacing"; + version = "5.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/electric-spacing-5.0.tar"; + sha256 = "1gr35nri25ycxr0wwkypky8zv43nnfrilx4jaj66mb9jsyix6smi"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/electric-spacing.html"; + license = lib.licenses.free; + }; + } + ) { }; + elisa = callPackage ( + { + async, + ellama, + elpaBuild, + fetchurl, + lib, + llm, + plz, + }: + elpaBuild { + pname = "elisa"; + ename = "elisa"; + version = "1.0.4"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/elisa-1.0.4.tar"; + sha256 = "07f9micfp3p8r58kdnqv0pa7i8nyqaz35llahwp2jl16c63pl9wn"; + }; + packageRequires = [ + async + ellama + llm + plz + ]; + meta = { + homepage = "https://elpa.gnu.org/packages/elisa.html"; + license = lib.licenses.free; + }; + } + ) { }; + elisp-benchmarks = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "elisp-benchmarks"; + ename = "elisp-benchmarks"; + version = "1.16"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/elisp-benchmarks-1.16.tar"; + sha256 = "0v5db89z6hirvixgjwyz3a9dkx6xf486hy51sprvslki706m08p2"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/elisp-benchmarks.html"; + license = lib.licenses.free; + }; + } + ) { }; + ellama = callPackage ( + { + compat, + elpaBuild, + fetchurl, + lib, + llm, + spinner, + }: + elpaBuild { + pname = "ellama"; + ename = "ellama"; + version = "0.11.13"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/ellama-0.11.13.tar"; + sha256 = "1i5pn976a8y3b6927wq51cy9adjipn7xqlmdxy9gnhfnjsma2446"; + }; + packageRequires = [ + compat + llm + spinner + ]; + meta = { + homepage = "https://elpa.gnu.org/packages/ellama.html"; + license = lib.licenses.free; + }; + } + ) { }; + emacs-gc-stats = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "emacs-gc-stats"; + ename = "emacs-gc-stats"; + version = "1.4.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/emacs-gc-stats-1.4.2.tar"; + sha256 = "055ma32r92ksjnqy8xbzv0a79r7aap12h61dj860781fapfnifa3"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/emacs-gc-stats.html"; + license = lib.licenses.free; + }; + } + ) { }; + embark = callPackage ( + { + compat, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "embark"; + ename = "embark"; + version = "1.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/embark-1.1.tar"; + sha256 = "074ggh7dkr5jdkwcndl6znhkq48jmc62rp7mc6vjidr6yxf8d1rn"; + }; + packageRequires = [ compat ]; + meta = { + homepage = "https://elpa.gnu.org/packages/embark.html"; + license = lib.licenses.free; + }; + } + ) { }; + embark-consult = callPackage ( + { + compat, + consult, + elpaBuild, + embark, + fetchurl, + lib, + }: + elpaBuild { + pname = "embark-consult"; + ename = "embark-consult"; + version = "1.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/embark-consult-1.1.tar"; + sha256 = "06yh6w4zgvvkfllmcr0szsgjrfhh9rpjwgmcrf6h2gai2ps9xdqr"; + }; + packageRequires = [ + compat + consult + embark + ]; + meta = { + homepage = "https://elpa.gnu.org/packages/embark-consult.html"; + license = lib.licenses.free; + }; + } + ) { }; + ement = callPackage ( + { + elpaBuild, + fetchurl, + lib, + map, + persist, + plz, + svg-lib, + taxy, + taxy-magit-section, + transient, + }: + elpaBuild { + pname = "ement"; + ename = "ement"; + version = "0.15.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/ement-0.15.1.tar"; + sha256 = "1n1kxj5p6c6cnz6z54zayyb9lr6l54crfh5im2pbwpai1bk8lsld"; + }; + packageRequires = [ + map + persist + plz + svg-lib + taxy + taxy-magit-section + transient + ]; + meta = { + homepage = "https://elpa.gnu.org/packages/ement.html"; + license = lib.licenses.free; + }; + } + ) { }; + emms = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + nadvice, + seq, + }: + elpaBuild { + pname = "emms"; + ename = "emms"; + version = "20.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/emms-20.1.tar"; + sha256 = "0h0v31f1q7k45k8s9kncvim3a7np7fgjz4qg9v8gjc5ag01dzwkx"; + }; + packageRequires = [ + cl-lib + nadvice + seq + ]; + meta = { + homepage = "https://elpa.gnu.org/packages/emms.html"; + license = lib.licenses.free; + }; + } + ) { }; + engrave-faces = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "engrave-faces"; + ename = "engrave-faces"; + version = "0.3.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/engrave-faces-0.3.1.tar"; + sha256 = "0nl5wx61192dqd0191dvaszgjc7b2adrxsyc75f529fcyrfwgqfa"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/engrave-faces.html"; + license = lib.licenses.free; + }; + } + ) { }; + enwc = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "enwc"; + ename = "enwc"; + version = "2.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/enwc-2.0.tar"; + sha256 = "0y8154ykrashgg0bina5ambdrxw2qpimycvjldrk9d67hrccfh3m"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/enwc.html"; + license = lib.licenses.free; + }; + } + ) { }; + epoch-view = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "epoch-view"; + ename = "epoch-view"; + version = "0.0.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/epoch-view-0.0.1.el"; + sha256 = "1wy25ryyg9f4v83qjym2pwip6g9mszhqkf5a080z0yl47p71avfx"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/epoch-view.html"; + license = lib.licenses.free; + }; + } + ) { }; + erc = callPackage ( + { + compat, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "erc"; + ename = "erc"; + version = "5.6"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/erc-5.6.tar"; + sha256 = "16qyfsa2q297xcfjiacjms9v14kjwwrsp3m8kcs5s50aavzfvc1s"; + }; + packageRequires = [ compat ]; + meta = { + homepage = "https://elpa.gnu.org/packages/erc.html"; + license = lib.licenses.free; + }; + } + ) { }; + ergoemacs-mode = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + undo-tree, + }: + elpaBuild { + pname = "ergoemacs-mode"; + ename = "ergoemacs-mode"; + version = "5.16.10.12"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/ergoemacs-mode-5.16.10.12.tar"; + sha256 = "0s4lwb76c67npbcnvbxdawnj02zkc85sbm392lym1qccjmj9d02f"; + }; + packageRequires = [ + cl-lib + undo-tree + ]; + meta = { + homepage = "https://elpa.gnu.org/packages/ergoemacs-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + ess = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "ess"; + ename = "ess"; + version = "24.1.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/ess-24.1.1.tar"; + sha256 = "11hn571q8vpjy1kx8d1hn8mm2sna0ar1q2z4vmb6rwqi9wsda6a0"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/ess.html"; + license = lib.licenses.free; + }; + } + ) { }; + excorporate = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + fsm, + lib, + nadvice, + soap-client, + url-http-ntlm, + url-http-oauth, + }: + elpaBuild { + pname = "excorporate"; + ename = "excorporate"; + version = "1.1.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/excorporate-1.1.2.tar"; + sha256 = "111wvkn0ks7syfgf1cydq5s0kymha0j280xvnp09zcfbj706yhbw"; + }; + packageRequires = [ + cl-lib + fsm + nadvice + soap-client + url-http-ntlm + url-http-oauth + ]; + meta = { + homepage = "https://elpa.gnu.org/packages/excorporate.html"; + license = lib.licenses.free; + }; + } + ) { }; + expand-region = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "expand-region"; + ename = "expand-region"; + version = "1.0.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/expand-region-1.0.0.tar"; + sha256 = "1rjx7w4gss8sbsjaljraa6cjpb57kdpx9zxmr30kbifb5lp511rd"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/expand-region.html"; + license = lib.licenses.free; + }; + } + ) { }; + expreg = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "expreg"; + ename = "expreg"; + version = "1.3.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/expreg-1.3.1.tar"; + sha256 = "12msng4ypmw6s3pja66kkjxkbadla0fxmak1r3drxiihpwmh5zm6"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/expreg.html"; + license = lib.licenses.free; + }; + } + ) { }; + external-completion = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "external-completion"; + ename = "external-completion"; + version = "0.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/external-completion-0.1.tar"; + sha256 = "1bw2kvz7zf1s60d37j31krakryc1kpyial2idjy6ac6w7n1h0jzc"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/external-completion.html"; + license = lib.licenses.free; + }; + } + ) { }; + exwm = callPackage ( + { + compat, + elpaBuild, + fetchurl, + lib, + xelb, + }: + elpaBuild { + pname = "exwm"; + ename = "exwm"; + version = "0.31"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/exwm-0.31.tar"; + sha256 = "1i1k8w641n2fd6xifl92pvvq0s0b820lq76d1cyc7iyaqs44w9qq"; + }; + packageRequires = [ + compat + xelb + ]; + meta = { + homepage = "https://elpa.gnu.org/packages/exwm.html"; + license = lib.licenses.free; + }; + } + ) { }; + f90-interface-browser = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "f90-interface-browser"; + ename = "f90-interface-browser"; + version = "1.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/f90-interface-browser-1.1.el"; + sha256 = "0mf32w2bgc6b43k0r4a11bywprj7y3rvl21i0ry74v425r6hc3is"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/f90-interface-browser.html"; + license = lib.licenses.free; + }; + } + ) { }; + face-shift = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "face-shift"; + ename = "face-shift"; + version = "0.2.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/face-shift-0.2.1.tar"; + sha256 = "14sbafkxr7kmv6sd5rw7d7hcsh0hhx92wkh6arfbchxad8jzimr6"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/face-shift.html"; + license = lib.licenses.free; + }; + } + ) { }; + filechooser = callPackage ( + { + compat, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "filechooser"; + ename = "filechooser"; + version = "0.2.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/filechooser-0.2.1.tar"; + sha256 = "1q9yxq4c6lp1fllcd60mcj4bs0ia03i649jilknkcp7jmjihq07i"; + }; + packageRequires = [ compat ]; + meta = { + homepage = "https://elpa.gnu.org/packages/filechooser.html"; + license = lib.licenses.free; + }; + } + ) { }; + filladapt = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "filladapt"; + ename = "filladapt"; + version = "2.12.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/filladapt-2.12.2.tar"; + sha256 = "0nmgw6v2krxn5palddqj1jzqxrajhpyq9v2x9lw12cdcldm9ab4k"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/filladapt.html"; + license = lib.licenses.free; + }; + } + ) { }; + firefox-javascript-repl = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "firefox-javascript-repl"; + ename = "firefox-javascript-repl"; + version = "0.9.5"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/firefox-javascript-repl-0.9.5.tar"; + sha256 = "07qmp6hfzgljrl9gkwy673xk67b3bgxq4kkw2kzr8ma4a7lx7a8l"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/firefox-javascript-repl.html"; + license = lib.licenses.free; + }; + } + ) { }; + flylisp = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "flylisp"; + ename = "flylisp"; + version = "0.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/flylisp-0.2.tar"; + sha256 = "1agny4hc75xc8a9f339bynsazmxw8ccvyb03qx1d6nvwh9d7v1b9"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/flylisp.html"; + license = lib.licenses.free; + }; + } + ) { }; + flymake = callPackage ( + { + eldoc, + elpaBuild, + fetchurl, + lib, + project, + }: + elpaBuild { + pname = "flymake"; + ename = "flymake"; + version = "1.3.7"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/flymake-1.3.7.tar"; + sha256 = "15ikzdqyh77cgx94jaigfrrzfvwvpca8s2120gi82i9aaiypr7jl"; + }; + packageRequires = [ + eldoc + project + ]; + meta = { + homepage = "https://elpa.gnu.org/packages/flymake.html"; + license = lib.licenses.free; + }; + } + ) { }; + flymake-codespell = callPackage ( + { + compat, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "flymake-codespell"; + ename = "flymake-codespell"; + version = "0.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/flymake-codespell-0.1.tar"; + sha256 = "1x1bmdjmdaciknd702z54002bi1a5n51vvn9g7j6rnzjc1dxw97f"; + }; + packageRequires = [ compat ]; + meta = { + homepage = "https://elpa.gnu.org/packages/flymake-codespell.html"; + license = lib.licenses.free; + }; + } + ) { }; + flymake-proselint = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "flymake-proselint"; + ename = "flymake-proselint"; + version = "0.3.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/flymake-proselint-0.3.0.tar"; + sha256 = "0bq7nc1qiqwxi848xy7wg1ig8k38nmq1w13xws10scjvndlbcjpl"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/flymake-proselint.html"; + license = lib.licenses.free; + }; + } + ) { }; + fontaine = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "fontaine"; + ename = "fontaine"; + version = "2.0.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/fontaine-2.0.0.tar"; + sha256 = "1h3hsqfx16ff0s776xvnafrlmj0m0r66hjra1mq2j55ahvh0aavk"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/fontaine.html"; + license = lib.licenses.free; + }; + } + ) { }; + frame-tabs = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "frame-tabs"; + ename = "frame-tabs"; + version = "1.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/frame-tabs-1.1.tar"; + sha256 = "1a7hklir19inai68azgyfiw1bzq5z57kkp33lj6qbxxvfcqvw62w"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/frame-tabs.html"; + license = lib.licenses.free; + }; + } + ) { }; + frog-menu = callPackage ( + { + avy, + elpaBuild, + fetchurl, + lib, + posframe, + }: + elpaBuild { + pname = "frog-menu"; + ename = "frog-menu"; + version = "0.2.11"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/frog-menu-0.2.11.tar"; + sha256 = "1iwyg9z8i03p9kkz6vhv00bzsqrsgl4xqqh08icial29c80q939l"; + }; + packageRequires = [ + avy + posframe + ]; + meta = { + homepage = "https://elpa.gnu.org/packages/frog-menu.html"; + license = lib.licenses.free; + }; + } + ) { }; + fsm = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "fsm"; + ename = "fsm"; + version = "0.2.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/fsm-0.2.1.tar"; + sha256 = "0kvm16077bn6bpbyw3k5935fhiq86ry2j1zcx9sj7dvb9w737qz4"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.gnu.org/packages/fsm.html"; + license = lib.licenses.free; + }; + } + ) { }; + ftable = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "ftable"; + ename = "ftable"; + version = "1.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/ftable-1.1.tar"; + sha256 = "052vqw8892wv8lh5slm90gcvfk7ws5sgl1mzbdi4d3sy4kc4q48h"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/ftable.html"; + license = lib.licenses.free; + }; + } + ) { }; + gcmh = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "gcmh"; + ename = "gcmh"; + version = "0.2.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/gcmh-0.2.1.tar"; + sha256 = "030w493ilmc7w13jizwqsc33a424qjgicy1yxvlmy08yipnw3587"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/gcmh.html"; + license = lib.licenses.free; + }; + } + ) { }; + ggtags = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "ggtags"; + ename = "ggtags"; + version = "0.9.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/ggtags-0.9.0.tar"; + sha256 = "02gj8ghkk35clyscbvp1p1nlhmgm5h9g2cy4mavnfmx7jikmr4m3"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/ggtags.html"; + license = lib.licenses.free; + }; + } + ) { }; + gited = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "gited"; + ename = "gited"; + version = "0.6.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/gited-0.6.0.tar"; + sha256 = "1s2h6y1adh28pvm3h5bivfja2nqnzm8w9sfza894pxf96kwk3pg2"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.gnu.org/packages/gited.html"; + license = lib.licenses.free; + }; + } + ) { }; + gle-mode = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "gle-mode"; + ename = "gle-mode"; + version = "1.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/gle-mode-1.1.tar"; + sha256 = "12vbif4b4j87z7fg18dlcmzmbs2fp1g8bgsk5rch9h6dblg72prq"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.gnu.org/packages/gle-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + gnat-compiler = callPackage ( + { + elpaBuild, + fetchurl, + lib, + wisi, + }: + elpaBuild { + pname = "gnat-compiler"; + ename = "gnat-compiler"; + version = "1.0.3"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/gnat-compiler-1.0.3.tar"; + sha256 = "1chydgswab2m81m3kbd31b1akyw4v1c9468wlfxpg2yydy8fc7vs"; + }; + packageRequires = [ wisi ]; + meta = { + homepage = "https://elpa.gnu.org/packages/gnat-compiler.html"; + license = lib.licenses.free; + }; + } + ) { }; + gnome-c-style = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "gnome-c-style"; + ename = "gnome-c-style"; + version = "0.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/gnome-c-style-0.1.tar"; + sha256 = "09w68jbpzyyhcaqw335qpr840j7xx0j81zxxkxq4ahqv6ck27v4x"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/gnome-c-style.html"; + license = lib.licenses.free; + }; + } + ) { }; + gnorb = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "gnorb"; + ename = "gnorb"; + version = "1.6.11"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/gnorb-1.6.11.tar"; + sha256 = "1y0xpbifb8dm8hd5i9g8jph4jm76wviphszl5x3zi6w053jpss9b"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.gnu.org/packages/gnorb.html"; + license = lib.licenses.free; + }; + } + ) { }; + gnu-elpa = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "gnu-elpa"; + ename = "gnu-elpa"; + version = "1.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/gnu-elpa-1.1.tar"; + sha256 = "01cw1r5y86q1aardpvcwvwq161invrzxd0kv4qqi5agaff2nbp26"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/gnu-elpa.html"; + license = lib.licenses.free; + }; + } + ) { }; + gnu-elpa-keyring-update = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "gnu-elpa-keyring-update"; + ename = "gnu-elpa-keyring-update"; + version = "2022.12.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/gnu-elpa-keyring-update-2022.12.1.tar"; + sha256 = "0yb81ly7y5262fpa0n96yngqmz1rgfwrpm0a6vqghdpr5x0c8z6n"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/gnu-elpa-keyring-update.html"; + license = lib.licenses.free; + }; + } + ) { }; + gnugo = callPackage ( + { + ascii-art-to-unicode, + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + xpm, + }: + elpaBuild { + pname = "gnugo"; + ename = "gnugo"; + version = "3.1.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/gnugo-3.1.2.tar"; + sha256 = "0wingn5v4wa1xgsgmqqls28cifnff8mvm098kn8clw42mxr40257"; + }; + packageRequires = [ + ascii-art-to-unicode + cl-lib + xpm + ]; + meta = { + homepage = "https://elpa.gnu.org/packages/gnugo.html"; + license = lib.licenses.free; + }; + } + ) { }; + gnus-mock = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "gnus-mock"; + ename = "gnus-mock"; + version = "0.5"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/gnus-mock-0.5.tar"; + sha256 = "1yl624wzs4kw45zpnxh04dxn1kkpb6c2jl3i0sm1bijyhm303l4h"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/gnus-mock.html"; + license = lib.licenses.free; + }; + } + ) { }; + gpastel = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "gpastel"; + ename = "gpastel"; + version = "0.5.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/gpastel-0.5.0.tar"; + sha256 = "12y1ysgnqjvsdp5gal90mp2wplif7rq1cj61393l6gf3pgv6jkzc"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/gpastel.html"; + license = lib.licenses.free; + }; + } + ) { }; + gpr-mode = callPackage ( + { + elpaBuild, + fetchurl, + gnat-compiler, + lib, + wisi, + }: + elpaBuild { + pname = "gpr-mode"; + ename = "gpr-mode"; + version = "1.0.5"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/gpr-mode-1.0.5.tar"; + sha256 = "1qdk2pkdxggfhj8gm39jb2b29g0gbw50vgil6rv3z0q7nlhpm2fp"; + }; + packageRequires = [ + gnat-compiler + wisi + ]; + meta = { + homepage = "https://elpa.gnu.org/packages/gpr-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + gpr-query = callPackage ( + { + elpaBuild, + fetchurl, + gnat-compiler, + lib, + wisi, + }: + elpaBuild { + pname = "gpr-query"; + ename = "gpr-query"; + version = "1.0.4"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/gpr-query-1.0.4.tar"; + sha256 = "1y283x549w544x37lmh25n19agyah2iz0b052hx8br4rnjdd9ii3"; + }; + packageRequires = [ + gnat-compiler + wisi + ]; + meta = { + homepage = "https://elpa.gnu.org/packages/gpr-query.html"; + license = lib.licenses.free; + }; + } + ) { }; + graphql = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "graphql"; + ename = "graphql"; + version = "0.1.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/graphql-0.1.2.tar"; + sha256 = "1blpsj6sav3z9gj733cccdhpdnyvnvxp48z1hnjh0f0fl5avvkix"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/graphql.html"; + license = lib.licenses.free; + }; + } + ) { }; + greader = callPackage ( + { + compat, + elpaBuild, + fetchurl, + lib, + seq, + }: + elpaBuild { + pname = "greader"; + ename = "greader"; + version = "0.11.15"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/greader-0.11.15.tar"; + sha256 = "0052gsjdqnlxgwd8l3h3x2zh2lzw76cwfdxvgxdk6x1g4cvhmjbx"; + }; + packageRequires = [ + compat + seq + ]; + meta = { + homepage = "https://elpa.gnu.org/packages/greader.html"; + license = lib.licenses.free; + }; + } + ) { }; + greenbar = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "greenbar"; + ename = "greenbar"; + version = "1.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/greenbar-1.1.tar"; + sha256 = "14azd170xq602fy4mcc770x5063rvpms8ilbzzn8kwyfvmijlbbx"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/greenbar.html"; + license = lib.licenses.free; + }; + } + ) { }; + gtags-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "gtags-mode"; + ename = "gtags-mode"; + version = "1.8.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/gtags-mode-1.8.1.tar"; + sha256 = "1n4mc33hz12p0fljrs4big317148272vz2zn16n98sakpv7jk4b6"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/gtags-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + guess-language = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + nadvice, + }: + elpaBuild { + pname = "guess-language"; + ename = "guess-language"; + version = "0.0.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/guess-language-0.0.1.el"; + sha256 = "11a6m2337j4ncppaf59yr2vavvvsph2qh51d12zmq58g9wh3d7wz"; + }; + packageRequires = [ + cl-lib + nadvice + ]; + meta = { + homepage = "https://elpa.gnu.org/packages/guess-language.html"; + license = lib.licenses.free; + }; + } + ) { }; + hcel = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "hcel"; + ename = "hcel"; + version = "1.0.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/hcel-1.0.0.tar"; + sha256 = "1pm3d0nz2mpf667jkjlmlidh203i4d4gk0n8xd3r66bzwc4l042b"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/hcel.html"; + license = lib.licenses.free; + }; + } + ) { }; + heap = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "heap"; + ename = "heap"; + version = "0.5"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/heap-0.5.tar"; + sha256 = "1q42v9mzmlhl4pr3wr94nsis7a9977f35w0qsyx2r982kwgmbndw"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/heap.html"; + license = lib.licenses.free; + }; + } + ) { }; + hiddenquote = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "hiddenquote"; + ename = "hiddenquote"; + version = "1.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/hiddenquote-1.2.tar"; + sha256 = "051aqiq77n487lnsxxwa8q0vyzk6m2fwi3l7xwvrl49p5xpia6zr"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/hiddenquote.html"; + license = lib.licenses.free; + }; + } + ) { }; + highlight-escape-sequences = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "highlight-escape-sequences"; + ename = "highlight-escape-sequences"; + version = "0.4"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/highlight-escape-sequences-0.4.tar"; + sha256 = "1gs662vvvzrqdlb1z73jf6wykjzs1jskcdksk8akqmply4sjvbpr"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/highlight-escape-sequences.html"; + license = lib.licenses.free; + }; + } + ) { }; + hook-helpers = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "hook-helpers"; + ename = "hook-helpers"; + version = "1.1.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/hook-helpers-1.1.1.tar"; + sha256 = "05nqlshdqh32smav58hzqg8wp04h7w9sxr239qrz4wqxwlxlv9im"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/hook-helpers.html"; + license = lib.licenses.free; + }; + } + ) { }; + html5-schema = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "html5-schema"; + ename = "html5-schema"; + version = "0.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/html5-schema-0.1.tar"; + sha256 = "018zvdjhdrkcy8yrsqqqikhl6drmqm1fs0y50m8q8vx42p0cyi1p"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/html5-schema.html"; + license = lib.licenses.free; + }; + } + ) { }; + hydra = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + lv, + }: + elpaBuild { + pname = "hydra"; + ename = "hydra"; + version = "0.15.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/hydra-0.15.0.tar"; + sha256 = "082wdr2nsfz8jhh7ic4nq4labz0pq8lcdwnxdmw79ppm20p2jipk"; + }; + packageRequires = [ + cl-lib + lv + ]; + meta = { + homepage = "https://elpa.gnu.org/packages/hydra.html"; + license = lib.licenses.free; + }; + } + ) { }; + hyperbole = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "hyperbole"; + ename = "hyperbole"; + version = "9.0.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/hyperbole-9.0.1.tar"; + sha256 = "0gjscqa0zagbymm6wfilvc8g68f8myv90ryd8kqfcpy81fh4dhiz"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/hyperbole.html"; + license = lib.licenses.free; + }; + } + ) { }; + idlwave = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "idlwave"; + ename = "idlwave"; + version = "6.5.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/idlwave-6.5.1.tar"; + sha256 = "0dd0dm92qyin8k4kgavrg82zwjhv6wsjq6gk55rzcspx0s8y2c24"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/idlwave.html"; + license = lib.licenses.free; + }; + } + ) { }; + ilist = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "ilist"; + ename = "ilist"; + version = "0.4"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/ilist-0.4.tar"; + sha256 = "1hsja208yaszviv8p3mzi04j0jz8ij02nbl1y6shk3b965sflhyp"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/ilist.html"; + license = lib.licenses.free; + }; + } + ) { }; + inspector = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "inspector"; + ename = "inspector"; + version = "0.37"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/inspector-0.37.tar"; + sha256 = "0825qd5ldx63li3vf89dsizn6w2gj87jn16yrfw0bxxn5jg255a0"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/inspector.html"; + license = lib.licenses.free; + }; + } + ) { }; + ioccur = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "ioccur"; + ename = "ioccur"; + version = "2.6"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/ioccur-2.6.tar"; + sha256 = "0xyx5xd46n5x078k7pv022h84xmxv7fkh31ddib872bmnirhk6ln"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.gnu.org/packages/ioccur.html"; + license = lib.licenses.free; + }; + } + ) { }; + isearch-mb = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "isearch-mb"; + ename = "isearch-mb"; + version = "0.8"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/isearch-mb-0.8.tar"; + sha256 = "1b4929vr5gib406p51zcvq1ysmzvnz6bs1lqwjp517kzp6r4gc5y"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/isearch-mb.html"; + license = lib.licenses.free; + }; + } + ) { }; + iterators = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "iterators"; + ename = "iterators"; + version = "0.1.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/iterators-0.1.1.tar"; + sha256 = "1xcqvj9dail1irvj2nbfx9x106mcav104pp89jz2diamrky6ja49"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/iterators.html"; + license = lib.licenses.free; + }; + } + ) { }; + ivy = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "ivy"; + ename = "ivy"; + version = "0.14.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/ivy-0.14.2.tar"; + sha256 = "1h9gfkkcw9nfw85m0mh08qfmi2y0jkvdk54qx0iy5p04ysmhs6k1"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/ivy.html"; + license = lib.licenses.free; + }; + } + ) { }; + ivy-avy = callPackage ( + { + avy, + elpaBuild, + fetchurl, + ivy, + lib, + }: + elpaBuild { + pname = "ivy-avy"; + ename = "ivy-avy"; + version = "0.14.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/ivy-avy-0.14.2.tar"; + sha256 = "12s5z3h8bpa6vdk7f54i2dy18hd3p782pq3x6mkclkvlxijv7d11"; + }; + packageRequires = [ + avy + ivy + ]; + meta = { + homepage = "https://elpa.gnu.org/packages/ivy-avy.html"; + license = lib.licenses.free; + }; + } + ) { }; + ivy-explorer = callPackage ( + { + elpaBuild, + fetchurl, + ivy, + lib, + }: + elpaBuild { + pname = "ivy-explorer"; + ename = "ivy-explorer"; + version = "0.3.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/ivy-explorer-0.3.2.tar"; + sha256 = "0wv7gp2kznc6f6g9ky1gvq72i78ihp582kyks82h13w25rvh6f0a"; + }; + packageRequires = [ ivy ]; + meta = { + homepage = "https://elpa.gnu.org/packages/ivy-explorer.html"; + license = lib.licenses.free; + }; + } + ) { }; + ivy-hydra = callPackage ( + { + elpaBuild, + fetchurl, + hydra, + ivy, + lib, + }: + elpaBuild { + pname = "ivy-hydra"; + ename = "ivy-hydra"; + version = "0.14.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/ivy-hydra-0.14.2.tar"; + sha256 = "1p08rpj3ac2rwjcqbzkq9r5pmc1d9ci7s9bl0qv5cj5r8wpl69mx"; + }; + packageRequires = [ + hydra + ivy + ]; + meta = { + homepage = "https://elpa.gnu.org/packages/ivy-hydra.html"; + license = lib.licenses.free; + }; + } + ) { }; + ivy-posframe = callPackage ( + { + elpaBuild, + fetchurl, + ivy, + lib, + posframe, + }: + elpaBuild { + pname = "ivy-posframe"; + ename = "ivy-posframe"; + version = "0.6.3"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/ivy-posframe-0.6.3.tar"; + sha256 = "027lbddg4rc44jpvxsqyw9n9pi1bnsssfislg2il3hbr86v88va9"; + }; + packageRequires = [ + ivy + posframe + ]; + meta = { + homepage = "https://elpa.gnu.org/packages/ivy-posframe.html"; + license = lib.licenses.free; + }; + } + ) { }; + jami-bot = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "jami-bot"; + ename = "jami-bot"; + version = "0.0.4"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/jami-bot-0.0.4.tar"; + sha256 = "1dp4k5y7qy793m3fyxvkk57bfy42kac2w5wvy7zqzd4lckm0a93z"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/jami-bot.html"; + license = lib.licenses.free; + }; + } + ) { }; + jarchive = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "jarchive"; + ename = "jarchive"; + version = "0.11.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/jarchive-0.11.0.tar"; + sha256 = "17klpdrv74hgpwnhknbihg90j6sbikf4j62lq0vbfv3s7r0a0gb8"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/jarchive.html"; + license = lib.licenses.free; + }; + } + ) { }; + javaimp = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "javaimp"; + ename = "javaimp"; + version = "0.9.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/javaimp-0.9.1.tar"; + sha256 = "1gy7qys9mzpgbqm5798fncmblmi32b350q51ccsyydq67yh69s3z"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/javaimp.html"; + license = lib.licenses.free; + }; + } + ) { }; + jgraph-mode = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "jgraph-mode"; + ename = "jgraph-mode"; + version = "1.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/jgraph-mode-1.1.tar"; + sha256 = "1ryxbszp15dy2chch2irqy7rmcspfjw717w4rd0vxjpwvgkjgiql"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.gnu.org/packages/jgraph-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + jinx = callPackage ( + { + compat, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "jinx"; + ename = "jinx"; + version = "1.10"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/jinx-1.10.tar"; + sha256 = "19l1wcrv610l6alb9xzyfmdkmnzgcf60z3557q4dkgvz35959p4y"; + }; + packageRequires = [ compat ]; + meta = { + homepage = "https://elpa.gnu.org/packages/jinx.html"; + license = lib.licenses.free; + }; + } + ) { }; + jit-spell = callPackage ( + { + compat, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "jit-spell"; + ename = "jit-spell"; + version = "0.4"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/jit-spell-0.4.tar"; + sha256 = "0p9nf2n0x6c6xl32aczghzipx8n5aq7a1x6r2s78xvpwr299k998"; + }; + packageRequires = [ compat ]; + meta = { + homepage = "https://elpa.gnu.org/packages/jit-spell.html"; + license = lib.licenses.free; + }; + } + ) { }; + js2-mode = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "js2-mode"; + ename = "js2-mode"; + version = "20231224"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/js2-mode-20231224.tar"; + sha256 = "023z76zxh5q6g26x7qlgf9476lj95sj84d5s3aqhy6xyskkyyg6c"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.gnu.org/packages/js2-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + json-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "json-mode"; + ename = "json-mode"; + version = "0.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/json-mode-0.2.tar"; + sha256 = "1ix8nq9rjfgbq8vzzjp179j2wa11il0ys8fjjy9gnlqwk6lnk86h"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/json-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + jsonrpc = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "jsonrpc"; + ename = "jsonrpc"; + version = "1.0.25"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/jsonrpc-1.0.25.tar"; + sha256 = "18f0g8j1rd2fpa707w6fll6ryj7mg6hbcy2pc3xff2a4ps8zv12b"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/jsonrpc.html"; + license = lib.licenses.free; + }; + } + ) { }; + jumpc = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "jumpc"; + ename = "jumpc"; + version = "3.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/jumpc-3.1.tar"; + sha256 = "1c6wzwrr1ydpn5ah5xnk159xcn4v1gv5rjm4iyfj83dss2ygirzp"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/jumpc.html"; + license = lib.licenses.free; + }; + } + ) { }; + kind-icon = callPackage ( + { + elpaBuild, + fetchurl, + lib, + svg-lib, + }: + elpaBuild { + pname = "kind-icon"; + ename = "kind-icon"; + version = "0.2.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/kind-icon-0.2.2.tar"; + sha256 = "1zafx7rvfyahb7zzl2n9gpb2lc8x3k0bkcap2fl0n54aw4j98i69"; + }; + packageRequires = [ svg-lib ]; + meta = { + homepage = "https://elpa.gnu.org/packages/kind-icon.html"; + license = lib.licenses.free; + }; + } + ) { }; + kiwix = callPackage ( + { + elpaBuild, + fetchurl, + lib, + request, + }: + elpaBuild { + pname = "kiwix"; + ename = "kiwix"; + version = "1.1.5"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/kiwix-1.1.5.tar"; + sha256 = "1krmlyfjs8b7ibixbmv41vhg1gm7prck6lpp61v17fgig92a9k2s"; + }; + packageRequires = [ request ]; + meta = { + homepage = "https://elpa.gnu.org/packages/kiwix.html"; + license = lib.licenses.free; + }; + } + ) { }; + kmb = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "kmb"; + ename = "kmb"; + version = "0.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/kmb-0.1.tar"; + sha256 = "12klfmdjjlyjvrzz3rx8dmamnag1fwljhs05jqwd0dv4a2q11gg5"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/kmb.html"; + license = lib.licenses.free; + }; + } + ) { }; + kubed = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "kubed"; + ename = "kubed"; + version = "0.3.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/kubed-0.3.2.tar"; + sha256 = "1adr74gdfvg9djd8hr457jgx2p08drc235l3p4ni76fnjngki1z2"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/kubed.html"; + license = lib.licenses.free; + }; + } + ) { }; + landmark = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "landmark"; + ename = "landmark"; + version = "1.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/landmark-1.0.tar"; + sha256 = "1nnmnvyfjmkk5ddw4q24py1bqzykr29klip61n16bqpr39v56gpg"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/landmark.html"; + license = lib.licenses.free; + }; + } + ) { }; + latex-table-wizard = callPackage ( + { + auctex, + elpaBuild, + fetchurl, + lib, + transient, + }: + elpaBuild { + pname = "latex-table-wizard"; + ename = "latex-table-wizard"; + version = "1.5.4"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/latex-table-wizard-1.5.4.tar"; + sha256 = "1999kh5yi0cg1k0al3np3zi2qhrmcpzxqsfvwg0mgrg3mww4gqlw"; + }; + packageRequires = [ + auctex + transient + ]; + meta = { + homepage = "https://elpa.gnu.org/packages/latex-table-wizard.html"; + license = lib.licenses.free; + }; + } + ) { }; + leaf = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "leaf"; + ename = "leaf"; + version = "4.5.5"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/leaf-4.5.5.tar"; + sha256 = "1nvpl9ffma0ybbr7vlpcj7q33ja17zrswvl91bqljlmb4lb5121m"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/leaf.html"; + license = lib.licenses.free; + }; + } + ) { }; + lentic = callPackage ( + { + dash, + elpaBuild, + fetchurl, + lib, + m-buffer, + }: + elpaBuild { + pname = "lentic"; + ename = "lentic"; + version = "0.12"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/lentic-0.12.tar"; + sha256 = "0pszjhgy9dlk3h5gc8wnlklgl30ha3ig9bpmw2j1ps713vklfms7"; + }; + packageRequires = [ + dash + m-buffer + ]; + meta = { + homepage = "https://elpa.gnu.org/packages/lentic.html"; + license = lib.licenses.free; + }; + } + ) { }; + lentic-server = callPackage ( + { + elpaBuild, + fetchurl, + lentic, + lib, + web-server, + }: + elpaBuild { + pname = "lentic-server"; + ename = "lentic-server"; + version = "0.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/lentic-server-0.2.tar"; + sha256 = "1r0jcfylvhlihwm6pm4f8pzvsmnlspfkph1hgi5qjkv311045244"; + }; + packageRequires = [ + lentic + web-server + ]; + meta = { + homepage = "https://elpa.gnu.org/packages/lentic-server.html"; + license = lib.licenses.free; + }; + } + ) { }; + let-alist = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "let-alist"; + ename = "let-alist"; + version = "1.0.6"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/let-alist-1.0.6.tar"; + sha256 = "1fk1yl2cg4gxcn02n2gki289dgi3lv56n0akkm2h7dhhbgfr6gqm"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/let-alist.html"; + license = lib.licenses.free; + }; + } + ) { }; + lex = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "lex"; + ename = "lex"; + version = "1.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/lex-1.2.tar"; + sha256 = "1pqjrlw558l4z4k40jmli8lmcqlzddhkr0mfm38rbycp7ghdr4zx"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/lex.html"; + license = lib.licenses.free; + }; + } + ) { }; + lin = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "lin"; + ename = "lin"; + version = "1.1.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/lin-1.1.0.tar"; + sha256 = "1rf81r8ylq2cccx4svdkiy2rvz1rq6cw0dakrcd4jrrscww52d7c"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/lin.html"; + license = lib.licenses.free; + }; + } + ) { }; + listen = callPackage ( + { + elpaBuild, + fetchurl, + lib, + persist, + taxy, + taxy-magit-section, + transient, + }: + elpaBuild { + pname = "listen"; + ename = "listen"; + version = "0.9"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/listen-0.9.tar"; + sha256 = "1g1sv8fs8vl93fah7liaqzgwvc4b1chasx5151ayizz4q2qgwwbp"; + }; + packageRequires = [ + persist + taxy + taxy-magit-section + transient + ]; + meta = { + homepage = "https://elpa.gnu.org/packages/listen.html"; + license = lib.licenses.free; + }; + } + ) { }; + literate-scratch = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "literate-scratch"; + ename = "literate-scratch"; + version = "1.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/literate-scratch-1.0.tar"; + sha256 = "1rby70wfj6g0p4hc6xqzwgqj2g8780qm5mnjn95bl2wrvdi0ds6n"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/literate-scratch.html"; + license = lib.licenses.free; + }; + } + ) { }; + llm = callPackage ( + { + elpaBuild, + fetchurl, + lib, + plz, + }: + elpaBuild { + pname = "llm"; + ename = "llm"; + version = "0.17.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/llm-0.17.1.tar"; + sha256 = "15raqqychsag53q4pnlh6iwzb81z9zmi7nd0x5zkfpf4q71llsxc"; + }; + packageRequires = [ plz ]; + meta = { + homepage = "https://elpa.gnu.org/packages/llm.html"; + license = lib.licenses.free; + }; + } + ) { }; + lmc = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "lmc"; + ename = "lmc"; + version = "1.4"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/lmc-1.4.tar"; + sha256 = "0c8sd741a7imn1im4j17m99bs6zmppndsxpn23k33lmcqj1rfhsk"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/lmc.html"; + license = lib.licenses.free; + }; + } + ) { }; + load-dir = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "load-dir"; + ename = "load-dir"; + version = "0.0.5"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/load-dir-0.0.5.tar"; + sha256 = "1yxnckd7s4alkaddfs672g0jnsxir7c70crnm6rsc5vhmw6310nx"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/load-dir.html"; + license = lib.licenses.free; + }; + } + ) { }; + load-relative = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "load-relative"; + ename = "load-relative"; + version = "1.3.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/load-relative-1.3.2.tar"; + sha256 = "04ppqfzlqz7156aqm56yccizv0n71qir7yyp7xfiqq6vgj322rqv"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/load-relative.html"; + license = lib.licenses.free; + }; + } + ) { }; + loc-changes = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "loc-changes"; + ename = "loc-changes"; + version = "1.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/loc-changes-1.2.el"; + sha256 = "1x8fn8vqasayf1rb8a6nma9n6nbvkx60krmiahyb05vl5rrsw6r3"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/loc-changes.html"; + license = lib.licenses.free; + }; + } + ) { }; + loccur = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "loccur"; + ename = "loccur"; + version = "1.2.5"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/loccur-1.2.5.tar"; + sha256 = "0dp7nhafx5x0aw4svd826bqsrn6qk46w12p04w7khpk7d9768a8x"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/loccur.html"; + license = lib.licenses.free; + }; + } + ) { }; + logos = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "logos"; + ename = "logos"; + version = "1.1.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/logos-1.1.1.tar"; + sha256 = "0dyy1y6225kbmsl5zy4hp0bdnnp06l05m8zqxc22alsivy2qvkjb"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/logos.html"; + license = lib.licenses.free; + }; + } + ) { }; + luwak = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "luwak"; + ename = "luwak"; + version = "1.0.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/luwak-1.0.0.tar"; + sha256 = "0z6h1cg7nshv87zl4fia6l5gwf9ax6f4wgxijf2smi8cpwmv6j79"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/luwak.html"; + license = lib.licenses.free; + }; + } + ) { }; + lv = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "lv"; + ename = "lv"; + version = "0.15.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/lv-0.15.0.tar"; + sha256 = "1wb8whyj8zpsd7nm7r0yjvkfkr2ml80di7alcafpadzli808j2l4"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/lv.html"; + license = lib.licenses.free; + }; + } + ) { }; + m-buffer = callPackage ( + { + elpaBuild, + fetchurl, + lib, + seq, + }: + elpaBuild { + pname = "m-buffer"; + ename = "m-buffer"; + version = "0.16"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/m-buffer-0.16.tar"; + sha256 = "16drbgamp7yd1ndw2qrycrgmnknv5k7h4d7svcdhv9az6fg1vzn4"; + }; + packageRequires = [ seq ]; + meta = { + homepage = "https://elpa.gnu.org/packages/m-buffer.html"; + license = lib.licenses.free; + }; + } + ) { }; + map = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "map"; + ename = "map"; + version = "3.3.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/map-3.3.1.tar"; + sha256 = "1za8wjdvyxsxvmzla823f7z0s4wbl22l8k08v8b4h4m6i7w356lp"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/map.html"; + license = lib.licenses.free; + }; + } + ) { }; + marginalia = callPackage ( + { + compat, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "marginalia"; + ename = "marginalia"; + version = "1.7"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/marginalia-1.7.tar"; + sha256 = "1bwbkz71w81zcqsydvqic2xri52pm1h9nac8i7i04nl5b98pszkk"; + }; + packageRequires = [ compat ]; + meta = { + homepage = "https://elpa.gnu.org/packages/marginalia.html"; + license = lib.licenses.free; + }; + } + ) { }; + markchars = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "markchars"; + ename = "markchars"; + version = "0.2.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/markchars-0.2.2.tar"; + sha256 = "0jagp5s2kk8ijwxbg5ccq31bjlcxkqpqhsg7a1hbyp3p5z3j73m0"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/markchars.html"; + license = lib.licenses.free; + }; + } + ) { }; + math-symbol-lists = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "math-symbol-lists"; + ename = "math-symbol-lists"; + version = "1.3"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/math-symbol-lists-1.3.tar"; + sha256 = "1r2acaf79kwwvndqn9xbvq9dc12vr3lryc25yp0w0gksp86p8cfa"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/math-symbol-lists.html"; + license = lib.licenses.free; + }; + } + ) { }; + mct = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "mct"; + ename = "mct"; + version = "1.0.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/mct-1.0.0.tar"; + sha256 = "0f8znz4basrdh56pcldsazxv3mwqir807lsaza2g5bfqws0c7h8k"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/mct.html"; + license = lib.licenses.free; + }; + } + ) { }; + memory-usage = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "memory-usage"; + ename = "memory-usage"; + version = "0.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/memory-usage-0.2.tar"; + sha256 = "04bylvy86x8w96g7zil3jzyac0fijvb5lz4830ja5yabpvsnk3vq"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/memory-usage.html"; + license = lib.licenses.free; + }; + } + ) { }; + metar = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "metar"; + ename = "metar"; + version = "0.3"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/metar-0.3.tar"; + sha256 = "07nf14zm5y6ma6wqnyw5bf7cvk3ybw7hvlrwcnri10s8vh3rqd0r"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.gnu.org/packages/metar.html"; + license = lib.licenses.free; + }; + } + ) { }; + midi-kbd = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "midi-kbd"; + ename = "midi-kbd"; + version = "0.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/midi-kbd-0.2.tar"; + sha256 = "0jd92rainjd1nx72z7mrvsxs3az6axxiw1v9sbpsj03x8qq0129q"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/midi-kbd.html"; + license = lib.licenses.free; + }; + } + ) { }; + mines = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "mines"; + ename = "mines"; + version = "1.6"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/mines-1.6.tar"; + sha256 = "0j52n43mv963hpgdh5kk1k9wi821r6w3diwdp47rfwsijdd0wnhs"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.gnu.org/packages/mines.html"; + license = lib.licenses.free; + }; + } + ) { }; + minibuffer-header = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "minibuffer-header"; + ename = "minibuffer-header"; + version = "0.5"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/minibuffer-header-0.5.tar"; + sha256 = "1qic33wsdba5xw3qxigq18nibwhj45ggk0ragy4zj9cfy1l2ni44"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/minibuffer-header.html"; + license = lib.licenses.free; + }; + } + ) { }; + minibuffer-line = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "minibuffer-line"; + ename = "minibuffer-line"; + version = "0.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/minibuffer-line-0.1.tar"; + sha256 = "0sg9vhv7bi82a90ziiwsabnfvw8zp544v0l93hbl42cj432bpwfx"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/minibuffer-line.html"; + license = lib.licenses.free; + }; + } + ) { }; + minimap = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "minimap"; + ename = "minimap"; + version = "1.4"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/minimap-1.4.tar"; + sha256 = "0n27wp65x5n21qy6x5dhzms8inf0248kzninp56kfx1bbf9w4x66"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/minimap.html"; + license = lib.licenses.free; + }; + } + ) { }; + mmm-mode = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "mmm-mode"; + ename = "mmm-mode"; + version = "0.5.11"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/mmm-mode-0.5.11.tar"; + sha256 = "0dh76lk0am07j2zi7hhbmr6cnnss7l0b9rhi9is0w0n5i7j4i0p2"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.gnu.org/packages/mmm-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + modus-themes = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "modus-themes"; + ename = "modus-themes"; + version = "4.4.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/modus-themes-4.4.0.tar"; + sha256 = "1bqvyf8xq55dligwqhw4d6z9bv529rhnijxv5y5gdlzap973bf71"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/modus-themes.html"; + license = lib.licenses.free; + }; + } + ) { }; + mpdired = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "mpdired"; + ename = "mpdired"; + version = "2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/mpdired-2.tar"; + sha256 = "0synpanyqka8nyz9mma69na307vm5pjvn21znbdvz56gka2mbg23"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/mpdired.html"; + license = lib.licenses.free; + }; + } + ) { }; + multi-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "multi-mode"; + ename = "multi-mode"; + version = "1.14"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/multi-mode-1.14.tar"; + sha256 = "0i2l50lcsj3mm9k38kfmh2hnb437pjbk2yxv26p6na1g1n44lkil"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/multi-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + multishell = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "multishell"; + ename = "multishell"; + version = "1.1.10"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/multishell-1.1.10.tar"; + sha256 = "1khqc7a04ynl63lpv898361sv37jgpd1fzvl0ryphprv9shnhw10"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.gnu.org/packages/multishell.html"; + license = lib.licenses.free; + }; + } + ) { }; + muse = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "muse"; + ename = "muse"; + version = "3.20.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/muse-3.20.2.tar"; + sha256 = "0g2ff6x45x2k5dnkp31sk3bjj92jyhhnar7l5hzn8vp22l0rv8wn"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/muse.html"; + license = lib.licenses.free; + }; + } + ) { }; + myers = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "myers"; + ename = "myers"; + version = "0.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/myers-0.1.tar"; + sha256 = "0a053w7nj0qfryvsh1ss854wxwbk5mhkl8a5nprcfgsh4qh2m487"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/myers.html"; + license = lib.licenses.free; + }; + } + ) { }; + nadvice = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "nadvice"; + ename = "nadvice"; + version = "0.4"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/nadvice-0.4.tar"; + sha256 = "19dx07v4z2lyyp18v45c5hgp65akw58bdqg5lcrzyb9mrlji8js6"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/nadvice.html"; + license = lib.licenses.free; + }; + } + ) { }; + nameless = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "nameless"; + ename = "nameless"; + version = "1.0.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/nameless-1.0.2.tar"; + sha256 = "0m3z701j2i13zmr4g0wjd3ms6ajr6w371n5kx95n9ssxyjwjppcm"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/nameless.html"; + license = lib.licenses.free; + }; + } + ) { }; + names = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "names"; + ename = "names"; + version = "20151201.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/names-20151201.0.tar"; + sha256 = "0nf6n8hk58a7r56d899s5dsva3jjvh3qx9g2d1hra403fwlds74k"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.gnu.org/packages/names.html"; + license = lib.licenses.free; + }; + } + ) { }; + nano-agenda = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "nano-agenda"; + ename = "nano-agenda"; + version = "0.3"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/nano-agenda-0.3.tar"; + sha256 = "12sh6wqqd13sv966wj4k4djidn238fdb6l4wg3z9ib0dx36nygcr"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/nano-agenda.html"; + license = lib.licenses.free; + }; + } + ) { }; + nano-modeline = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "nano-modeline"; + ename = "nano-modeline"; + version = "1.1.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/nano-modeline-1.1.0.tar"; + sha256 = "1x4b4j82vzbi1mhbs9bwgw41hcagnfk56kswjk928i179pnkr0cx"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/nano-modeline.html"; + license = lib.licenses.free; + }; + } + ) { }; + nano-theme = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "nano-theme"; + ename = "nano-theme"; + version = "0.3.4"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/nano-theme-0.3.4.tar"; + sha256 = "0x49lk0kx8mz72a81li6gwg3kivn7bn4ld0mml28smzqqfr3873a"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/nano-theme.html"; + license = lib.licenses.free; + }; + } + ) { }; + nftables-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "nftables-mode"; + ename = "nftables-mode"; + version = "1.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/nftables-mode-1.1.tar"; + sha256 = "1wjw6n60kj84j8gj62mr6s97xd0aqvr4v7npyxwmhckw9z13xcqv"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/nftables-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + nhexl-mode = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "nhexl-mode"; + ename = "nhexl-mode"; + version = "1.5"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/nhexl-mode-1.5.tar"; + sha256 = "1i1by5bp5dby2r2jhzr0jvnchrybgnzmc5ln84w66180shk2s3yk"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.gnu.org/packages/nhexl-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + nlinum = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "nlinum"; + ename = "nlinum"; + version = "1.9"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/nlinum-1.9.tar"; + sha256 = "1cpyg6cxaaaaq6hc066l759dlas5mhn1fi398myfglnwrglia3lm"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/nlinum.html"; + license = lib.licenses.free; + }; + } + ) { }; + notes-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "notes-mode"; + ename = "notes-mode"; + version = "1.31"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/notes-mode-1.31.tar"; + sha256 = "0lwja53cknd1w432mcbfrcshmxmk23dqrbr9k2101pqfzbw8nri2"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/notes-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + notmuch-indicator = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "notmuch-indicator"; + ename = "notmuch-indicator"; + version = "1.2.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/notmuch-indicator-1.2.0.tar"; + sha256 = "1n525slxs0l5nbila1sy62fz384yz7f54nrq1ixdlq0j3czgh9kz"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/notmuch-indicator.html"; + license = lib.licenses.free; + }; + } + ) { }; + ntlm = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "ntlm"; + ename = "ntlm"; + version = "2.1.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/ntlm-2.1.0.tar"; + sha256 = "0kivmb6b57qjrwd41zwlfdq7l9nisbh4mgd96rplrkxpzw6dq0j7"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/ntlm.html"; + license = lib.licenses.free; + }; + } + ) { }; + num3-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "num3-mode"; + ename = "num3-mode"; + version = "1.5"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/num3-mode-1.5.tar"; + sha256 = "1a7w2qd210zp199c1js639xbv2kmqmgvcqi5dn1vsazasp2dwlj2"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/num3-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + oauth2 = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + nadvice, + }: + elpaBuild { + pname = "oauth2"; + ename = "oauth2"; + version = "0.16"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/oauth2-0.16.tar"; + sha256 = "0bz4gqg5bhv6zk875q7sb0y56yvylnv0chj77ivjjpkha6rdp311"; + }; + packageRequires = [ + cl-lib + nadvice + ]; + meta = { + homepage = "https://elpa.gnu.org/packages/oauth2.html"; + license = lib.licenses.free; + }; + } + ) { }; + ob-asymptote = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "ob-asymptote"; + ename = "ob-asymptote"; + version = "1.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/ob-asymptote-1.0.tar"; + sha256 = "1hmqbkrqg18w454xg37rg5cg0q3vd0b0fm14n5chihqrwwnwrf4l"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/ob-asymptote.html"; + license = lib.licenses.free; + }; + } + ) { }; + ob-haxe = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "ob-haxe"; + ename = "ob-haxe"; + version = "1.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/ob-haxe-1.0.tar"; + sha256 = "095qcvxpanw6fh96dfkdydn10xikbrjwih7i05iiyvazpk4x6nbz"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/ob-haxe.html"; + license = lib.licenses.free; + }; + } + ) { }; + objed = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "objed"; + ename = "objed"; + version = "0.8.3"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/objed-0.8.3.tar"; + sha256 = "1shgpha6f1pql95v86whsw6w6j7v35cas98fyygwrpkcrxx9a56r"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.gnu.org/packages/objed.html"; + license = lib.licenses.free; + }; + } + ) { }; + omn-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "omn-mode"; + ename = "omn-mode"; + version = "1.3"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/omn-mode-1.3.tar"; + sha256 = "01yg4ifbz7jfhvq6r6naf50vx00wpjsr44mmlj580bylfrmdc839"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/omn-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + on-screen = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "on-screen"; + ename = "on-screen"; + version = "1.3.3"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/on-screen-1.3.3.tar"; + sha256 = "0w5cv3bhb6cyjhvglp5y6cy51ppsh2xd1x53i4w0gm44g5n8l6bd"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.gnu.org/packages/on-screen.html"; + license = lib.licenses.free; + }; + } + ) { }; + openpgp = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "openpgp"; + ename = "openpgp"; + version = "1.0.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/openpgp-1.0.2.tar"; + sha256 = "1gaq6hf9mwk52zjqw3d0wrj9l8mgzrbrk7nzywap4psnriq0vs0j"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/openpgp.html"; + license = lib.licenses.free; + }; + } + ) { }; + orderless = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "orderless"; + ename = "orderless"; + version = "1.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/orderless-1.1.tar"; + sha256 = "1qjxln21ydc86kabk5kwa6ky40qjqcrk5nmc92w42x3ypxs711f3"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/orderless.html"; + license = lib.licenses.free; + }; + } + ) { }; + org = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "org"; + ename = "org"; + version = "9.7.10"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/org-9.7.10.tar"; + sha256 = "0rabxq2diikdwifybril1b9cxkwry7agyw8gsdyf1n800f8vq5ka"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/org.html"; + license = lib.licenses.free; + }; + } + ) { }; + org-contacts = callPackage ( + { + elpaBuild, + fetchurl, + lib, + org, + }: + elpaBuild { + pname = "org-contacts"; + ename = "org-contacts"; + version = "1.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/org-contacts-1.1.tar"; + sha256 = "0gqanhnrxajx5cf7g9waks23sclbmvmwjqrs0q4frcih3gs2nhix"; + }; + packageRequires = [ org ]; + meta = { + homepage = "https://elpa.gnu.org/packages/org-contacts.html"; + license = lib.licenses.free; + }; + } + ) { }; + org-edna = callPackage ( + { + elpaBuild, + fetchurl, + lib, + org, + seq, + }: + elpaBuild { + pname = "org-edna"; + ename = "org-edna"; + version = "1.1.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/org-edna-1.1.2.tar"; + sha256 = "1pifs5mbcjab21ylclck4kjdcds1xkvym27ncn9wwr8fl3fff2yl"; + }; + packageRequires = [ + org + seq + ]; + meta = { + homepage = "https://elpa.gnu.org/packages/org-edna.html"; + license = lib.licenses.free; + }; + } + ) { }; + org-jami-bot = callPackage ( + { + elpaBuild, + fetchurl, + jami-bot, + lib, + }: + elpaBuild { + pname = "org-jami-bot"; + ename = "org-jami-bot"; + version = "0.0.5"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/org-jami-bot-0.0.5.tar"; + sha256 = "1fiv0a7k6alvfvb7c6av0kbkwbw58plw05hhcf1vnkr9gda3s13y"; + }; + packageRequires = [ jami-bot ]; + meta = { + homepage = "https://elpa.gnu.org/packages/org-jami-bot.html"; + license = lib.licenses.free; + }; + } + ) { }; + org-modern = callPackage ( + { + compat, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "org-modern"; + ename = "org-modern"; + version = "1.5"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/org-modern-1.5.tar"; + sha256 = "08s253r3z5r37swlsgrp97ls7p3bdr4hr2xvyb1pm57j7livv74b"; + }; + packageRequires = [ compat ]; + meta = { + homepage = "https://elpa.gnu.org/packages/org-modern.html"; + license = lib.licenses.free; + }; + } + ) { }; + org-notify = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "org-notify"; + ename = "org-notify"; + version = "0.1.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/org-notify-0.1.1.tar"; + sha256 = "1vg0h32x5lc3p5n71m23q8mfdd1fq9ffmy9rsm5rcdphfk8s9x5l"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/org-notify.html"; + license = lib.licenses.free; + }; + } + ) { }; + org-real = callPackage ( + { + boxy, + elpaBuild, + fetchurl, + lib, + org, + }: + elpaBuild { + pname = "org-real"; + ename = "org-real"; + version = "1.0.9"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/org-real-1.0.9.tar"; + sha256 = "0g19pgg7rqijb6q1vpifvpzl2gyc13a42q1n23x3kawl2srhcjp2"; + }; + packageRequires = [ + boxy + org + ]; + meta = { + homepage = "https://elpa.gnu.org/packages/org-real.html"; + license = lib.licenses.free; + }; + } + ) { }; + org-remark = callPackage ( + { + elpaBuild, + fetchurl, + lib, + org, + }: + elpaBuild { + pname = "org-remark"; + ename = "org-remark"; + version = "1.2.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/org-remark-1.2.2.tar"; + sha256 = "01iprzgbyvbfpxp6fls4lfx2lxx7xkff80m35s9kc0ih5jlxc5qs"; + }; + packageRequires = [ org ]; + meta = { + homepage = "https://elpa.gnu.org/packages/org-remark.html"; + license = lib.licenses.free; + }; + } + ) { }; + org-transclusion = callPackage ( + { + elpaBuild, + fetchurl, + lib, + org, + }: + elpaBuild { + pname = "org-transclusion"; + ename = "org-transclusion"; + version = "1.4.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/org-transclusion-1.4.0.tar"; + sha256 = "0ci6xja3jkj1a9f76sf3780gcjrdpbds2y2bwba3b55fjmr1fscl"; + }; + packageRequires = [ org ]; + meta = { + homepage = "https://elpa.gnu.org/packages/org-transclusion.html"; + license = lib.licenses.free; + }; + } + ) { }; + org-translate = callPackage ( + { + elpaBuild, + fetchurl, + lib, + org, + }: + elpaBuild { + pname = "org-translate"; + ename = "org-translate"; + version = "0.1.4"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/org-translate-0.1.4.tar"; + sha256 = "0s0vqpncb6rvhpxdir5ghanjyhpw7bplqfh3bpgri5ay2b46kj4f"; + }; + packageRequires = [ org ]; + meta = { + homepage = "https://elpa.gnu.org/packages/org-translate.html"; + license = lib.licenses.free; + }; + } + ) { }; + orgalist = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "orgalist"; + ename = "orgalist"; + version = "1.16"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/orgalist-1.16.tar"; + sha256 = "0j78g12q66piclraa2nvd1h4ri8d6cnw5jahw6k5zi4xfjag6yx3"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/orgalist.html"; + license = lib.licenses.free; + }; + } + ) { }; + osc = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "osc"; + ename = "osc"; + version = "0.4"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/osc-0.4.tar"; + sha256 = "1ls6v0mkh7z90amrlczrvv6mgpv6hzzjw0zlxjlzsj2vr1gz3vca"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/osc.html"; + license = lib.licenses.free; + }; + } + ) { }; + osm = callPackage ( + { + compat, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "osm"; + ename = "osm"; + version = "1.4"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/osm-1.4.tar"; + sha256 = "0cix4jn3919xnlsj85l4m83znkqf4m2988zzqwcsvvvjrmgccanh"; + }; + packageRequires = [ compat ]; + meta = { + homepage = "https://elpa.gnu.org/packages/osm.html"; + license = lib.licenses.free; + }; + } + ) { }; + other-frame-window = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "other-frame-window"; + ename = "other-frame-window"; + version = "1.0.6"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/other-frame-window-1.0.6.tar"; + sha256 = "1x8i6hbl48vmp5h43drr35lwaiwhcyr3vnk7rcyim5jl2ijw8yc0"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/other-frame-window.html"; + license = lib.licenses.free; + }; + } + ) { }; + pabbrev = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "pabbrev"; + ename = "pabbrev"; + version = "4.3.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/pabbrev-4.3.0.tar"; + sha256 = "1fplbmzqz066gsmvmf2indg4n348vdgs2m34dm32gnrjghfrxxhs"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/pabbrev.html"; + license = lib.licenses.free; + }; + } + ) { }; + paced = callPackage ( + { + async, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "paced"; + ename = "paced"; + version = "1.1.3"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/paced-1.1.3.tar"; + sha256 = "0j2362zq22j6qma6bb6jh6qpd12zrc161pgl9cfhnq5m3s9i1sz4"; + }; + packageRequires = [ async ]; + meta = { + homepage = "https://elpa.gnu.org/packages/paced.html"; + license = lib.licenses.free; + }; + } + ) { }; + parsec = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "parsec"; + ename = "parsec"; + version = "0.1.3"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/parsec-0.1.3.tar"; + sha256 = "032m9iks5a05vbc4159dfs9b7shmqm6mk05jgbs9ndvy400drwd6"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.gnu.org/packages/parsec.html"; + license = lib.licenses.free; + }; + } + ) { }; + parser-generator = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "parser-generator"; + ename = "parser-generator"; + version = "0.2.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/parser-generator-0.2.1.tar"; + sha256 = "1vrgkvcj16550frq2jivw31cmq6rhwrifmdk4rf0266br3jdarpf"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/parser-generator.html"; + license = lib.licenses.free; + }; + } + ) { }; + path-iterator = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "path-iterator"; + ename = "path-iterator"; + version = "1.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/path-iterator-1.0.tar"; + sha256 = "0v9gasc0wlqd7pks6k3695md7mdfnaknh6xinmp4pkvvalfh7shv"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/path-iterator.html"; + license = lib.licenses.free; + }; + } + ) { }; + peg = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "peg"; + ename = "peg"; + version = "1.0.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/peg-1.0.1.tar"; + sha256 = "14ll56fn9n11nydydslp7xyn79122dprm89i181ks170v0qcsps3"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/peg.html"; + license = lib.licenses.free; + }; + } + ) { }; + perl-doc = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "perl-doc"; + ename = "perl-doc"; + version = "0.81"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/perl-doc-0.81.tar"; + sha256 = "1828jfl5dwk1751jsrpr2gr8hs1x315xlb9vhiis8frzvqmsribw"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/perl-doc.html"; + license = lib.licenses.free; + }; + } + ) { }; + persist = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "persist"; + ename = "persist"; + version = "0.6.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/persist-0.6.1.tar"; + sha256 = "1a7lls81q247mbkcnifmsva16cfjjma6yihxmj5zrj8ac774z9j3"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/persist.html"; + license = lib.licenses.free; + }; + } + ) { }; + phps-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "phps-mode"; + ename = "phps-mode"; + version = "0.4.49"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/phps-mode-0.4.49.tar"; + sha256 = "1zxzv6h2075s0ldwr9izfy3sxrrg3x5y5vilnlgnwd7prcq8qa8y"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/phps-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + pinentry = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "pinentry"; + ename = "pinentry"; + version = "0.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/pinentry-0.1.tar"; + sha256 = "0i5g4yj2qva3rp8ay2fl9gcmp7q42caqryjyni8r5h4f3misviwq"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/pinentry.html"; + license = lib.licenses.free; + }; + } + ) { }; + plz = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "plz"; + ename = "plz"; + version = "0.9.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/plz-0.9.1.tar"; + sha256 = "0kx8zjqczsqhxd95bdy9b0kkpgkva4zq549d2hcfrkqhrqivm6qd"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/plz.html"; + license = lib.licenses.free; + }; + } + ) { }; + plz-event-source = callPackage ( + { + elpaBuild, + fetchurl, + lib, + plz-media-type, + }: + elpaBuild { + pname = "plz-event-source"; + ename = "plz-event-source"; + version = "0.1.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/plz-event-source-0.1.1.tar"; + sha256 = "0mraza6r8p6rwmsmgz7kkllhwi6spz8jzkk458jlgqxilm0jajib"; + }; + packageRequires = [ plz-media-type ]; + meta = { + homepage = "https://elpa.gnu.org/packages/plz-event-source.html"; + license = lib.licenses.free; + }; + } + ) { }; + plz-media-type = callPackage ( + { + elpaBuild, + fetchurl, + lib, + plz, + }: + elpaBuild { + pname = "plz-media-type"; + ename = "plz-media-type"; + version = "0.2.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/plz-media-type-0.2.1.tar"; + sha256 = "05hr78iw9s34vf2lpyh79xfnd4gs4q07rha1ahdrmxvkk9mnmk90"; + }; + packageRequires = [ plz ]; + meta = { + homepage = "https://elpa.gnu.org/packages/plz-media-type.html"; + license = lib.licenses.free; + }; + } + ) { }; + plz-see = callPackage ( + { + elpaBuild, + fetchurl, + lib, + plz, + }: + elpaBuild { + pname = "plz-see"; + ename = "plz-see"; + version = "0.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/plz-see-0.1.tar"; + sha256 = "1mi35d9b26d425v1kkmmbh477klcxf76fnyg154ddjm0nkgqq90d"; + }; + packageRequires = [ plz ]; + meta = { + homepage = "https://elpa.gnu.org/packages/plz-see.html"; + license = lib.licenses.free; + }; + } + ) { }; + poke = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "poke"; + ename = "poke"; + version = "3.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/poke-3.2.tar"; + sha256 = "15j4g5y427d9mja2irv3ak6x60ik4kpnscnwl9pqym7qly7sa3v9"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/poke.html"; + license = lib.licenses.free; + }; + } + ) { }; + poke-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "poke-mode"; + ename = "poke-mode"; + version = "3.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/poke-mode-3.1.tar"; + sha256 = "0g4vd26ahkmjxlcvqwd0mbk60qaf6c9zba9x7bb9pqabka9438y1"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/poke-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + poker = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "poker"; + ename = "poker"; + version = "0.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/poker-0.2.tar"; + sha256 = "10lfc6i4f08ydxanidwiq9404h4nxfa0vh4av5rrj6snqzqvd1bw"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/poker.html"; + license = lib.licenses.free; + }; + } + ) { }; + popper = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "popper"; + ename = "popper"; + version = "0.4.6"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/popper-0.4.6.tar"; + sha256 = "0xwy4p9g0lfd4ybamsl5gsppmx79yv16s4lh095x5y5qfmgcvq2c"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/popper.html"; + license = lib.licenses.free; + }; + } + ) { }; + posframe = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "posframe"; + ename = "posframe"; + version = "1.4.3"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/posframe-1.4.3.tar"; + sha256 = "1kw37dhyd6qxj0h2qpzi539jrgc0pj90psf2k58z4jc9199bgsax"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/posframe.html"; + license = lib.licenses.free; + }; + } + ) { }; + pq = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "pq"; + ename = "pq"; + version = "0.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/pq-0.2.tar"; + sha256 = "0d8ylsbmypaj29w674a4k445zr6hnggic8rsv7wx7jml6p2zph2n"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/pq.html"; + license = lib.licenses.free; + }; + } + ) { }; + preview-auto = callPackage ( + { + auctex, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "preview-auto"; + ename = "preview-auto"; + version = "0.3"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/preview-auto-0.3.tar"; + sha256 = "19jih2bn6ac82jx6w7jhv9hbz47c8argv24lfglvv6532fda218r"; + }; + packageRequires = [ auctex ]; + meta = { + homepage = "https://elpa.gnu.org/packages/preview-auto.html"; + license = lib.licenses.free; + }; + } + ) { }; + preview-tailor = callPackage ( + { + auctex, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "preview-tailor"; + ename = "preview-tailor"; + version = "0.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/preview-tailor-0.2.tar"; + sha256 = "1mqh2myz5w84f4n01ibd695h4mnqwjxmg7rvs7pz3sylz1xqyks7"; + }; + packageRequires = [ auctex ]; + meta = { + homepage = "https://elpa.gnu.org/packages/preview-tailor.html"; + license = lib.licenses.free; + }; + } + ) { }; + project = callPackage ( + { + elpaBuild, + fetchurl, + lib, + xref, + }: + elpaBuild { + pname = "project"; + ename = "project"; + version = "0.11.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/project-0.11.1.tar"; + sha256 = "1973d6z7nx9pp5gadqk8p71v6s5wqja40a0f8zjrn6rrnfarrcd0"; + }; + packageRequires = [ xref ]; + meta = { + homepage = "https://elpa.gnu.org/packages/project.html"; + license = lib.licenses.free; + }; + } + ) { }; + psgml = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "psgml"; + ename = "psgml"; + version = "1.3.5"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/psgml-1.3.5.tar"; + sha256 = "1lfk95kr43az6ykfyhj7ygccw3ms2ifyyp43w9lwm5fcawgc8952"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/psgml.html"; + license = lib.licenses.free; + }; + } + ) { }; + pspp-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "pspp-mode"; + ename = "pspp-mode"; + version = "1.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/pspp-mode-1.1.el"; + sha256 = "1qnwj7r367qs0ykw71c6s96ximgg2wb3hxg5fwsl9q2vfhbh35ca"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/pspp-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + pulsar = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "pulsar"; + ename = "pulsar"; + version = "1.0.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/pulsar-1.0.1.tar"; + sha256 = "0xljxkls6lckfg5whx2kb44dp67q2jfs7cbk6ih5b3zm6h599d4k"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/pulsar.html"; + license = lib.licenses.free; + }; + } + ) { }; + pyim = callPackage ( + { + async, + elpaBuild, + fetchurl, + lib, + xr, + }: + elpaBuild { + pname = "pyim"; + ename = "pyim"; + version = "5.3.4"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/pyim-5.3.4.tar"; + sha256 = "0axi8vizr2pdswdnnkr409k926h9k7w3c18nbmb9j3pfc32inkjs"; + }; + packageRequires = [ + async + xr + ]; + meta = { + homepage = "https://elpa.gnu.org/packages/pyim.html"; + license = lib.licenses.free; + }; + } + ) { }; + pyim-basedict = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "pyim-basedict"; + ename = "pyim-basedict"; + version = "0.5.4"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/pyim-basedict-0.5.4.tar"; + sha256 = "0i42i9jr0p940w17fjjrzd258winjl7sv4g423ihd6057xmdpyd8"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/pyim-basedict.html"; + license = lib.licenses.free; + }; + } + ) { }; + python = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "python"; + ename = "python"; + version = "0.28"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/python-0.28.tar"; + sha256 = "042jhg87bnc750wwjwvp32ici3pyswx1pza2qz014ykdqqnsx0aq"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.gnu.org/packages/python.html"; + license = lib.licenses.free; + }; + } + ) { }; + quarter-plane = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "quarter-plane"; + ename = "quarter-plane"; + version = "0.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/quarter-plane-0.1.tar"; + sha256 = "06syayqdmh4nb7ys52g1mw01wnz5hjv710dari106fk8fm9cy18c"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/quarter-plane.html"; + license = lib.licenses.free; + }; + } + ) { }; + queue = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "queue"; + ename = "queue"; + version = "0.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/queue-0.2.tar"; + sha256 = "117g6sl5dh7ssp6m18npvrqik5rs2mnr16129cfpnbi3crsw23c8"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/queue.html"; + license = lib.licenses.free; + }; + } + ) { }; + rainbow-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "rainbow-mode"; + ename = "rainbow-mode"; + version = "1.0.6"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/rainbow-mode-1.0.6.tar"; + sha256 = "0xv39jix1gbwq6f8laj93sqkf2j5hwda3l7mjqc7vsqjw1lkhmjv"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/rainbow-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + rbit = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "rbit"; + ename = "rbit"; + version = "0.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/rbit-0.1.tar"; + sha256 = "1xfl3m53bdi25h8mp7s0zp1yy7436cfydxrgkfc31fsxkh009l9h"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/rbit.html"; + license = lib.licenses.free; + }; + } + ) { }; + rcirc-color = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "rcirc-color"; + ename = "rcirc-color"; + version = "0.4.5"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/rcirc-color-0.4.5.tar"; + sha256 = "0sfwmi0sspj7sx1psij4fzq1knwva8706w0204mbjxsq2nh5s9f3"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/rcirc-color.html"; + license = lib.licenses.free; + }; + } + ) { }; + rcirc-menu = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "rcirc-menu"; + ename = "rcirc-menu"; + version = "1.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/rcirc-menu-1.1.el"; + sha256 = "0w77qlwlmx59v5894i96fldn6x4lliv4ddv8967vq1kfchn4w5mc"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/rcirc-menu.html"; + license = lib.licenses.free; + }; + } + ) { }; + rcirc-sqlite = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "rcirc-sqlite"; + ename = "rcirc-sqlite"; + version = "1.0.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/rcirc-sqlite-1.0.2.tar"; + sha256 = "128wq3mm2ckcchly6c31i87jrkq19q7ysvx5fg34jhjg53dkrz28"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/rcirc-sqlite.html"; + license = lib.licenses.free; + }; + } + ) { }; + realgud = callPackage ( + { + elpaBuild, + fetchurl, + lib, + load-relative, + loc-changes, + test-simple, + }: + elpaBuild { + pname = "realgud"; + ename = "realgud"; + version = "1.5.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/realgud-1.5.1.tar"; + sha256 = "1iisvzxvdsifxkz7b2wacw85dkjagrmbcdhcfsnswnfbp3r3kg35"; + }; + packageRequires = [ + load-relative + loc-changes + test-simple + ]; + meta = { + homepage = "https://elpa.gnu.org/packages/realgud.html"; + license = lib.licenses.free; + }; + } + ) { }; + realgud-ipdb = callPackage ( + { + elpaBuild, + fetchurl, + lib, + realgud, + }: + elpaBuild { + pname = "realgud-ipdb"; + ename = "realgud-ipdb"; + version = "1.0.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/realgud-ipdb-1.0.0.tar"; + sha256 = "0zmgsrb15rmgszidx4arjazb6fz523q5w516z5k5cn92wfzfyncr"; + }; + packageRequires = [ realgud ]; + meta = { + homepage = "https://elpa.gnu.org/packages/realgud-ipdb.html"; + license = lib.licenses.free; + }; + } + ) { }; + realgud-jdb = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + load-relative, + realgud, + }: + elpaBuild { + pname = "realgud-jdb"; + ename = "realgud-jdb"; + version = "1.0.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/realgud-jdb-1.0.0.tar"; + sha256 = "081lqsxbg6cxv8hz8s0z2gbdif9drp5b0crbixmwf164i4h8l4gc"; + }; + packageRequires = [ + cl-lib + load-relative + realgud + ]; + meta = { + homepage = "https://elpa.gnu.org/packages/realgud-jdb.html"; + license = lib.licenses.free; + }; + } + ) { }; + realgud-lldb = callPackage ( + { + elpaBuild, + fetchurl, + lib, + load-relative, + realgud, + }: + elpaBuild { + pname = "realgud-lldb"; + ename = "realgud-lldb"; + version = "1.0.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/realgud-lldb-1.0.2.tar"; + sha256 = "1g4spjrldyi9rrh5dwrcqpz5qm37fq2qpvmirxvdqgfbwl6gapzj"; + }; + packageRequires = [ + load-relative + realgud + ]; + meta = { + homepage = "https://elpa.gnu.org/packages/realgud-lldb.html"; + license = lib.licenses.free; + }; + } + ) { }; + realgud-node-debug = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + load-relative, + realgud, + }: + elpaBuild { + pname = "realgud-node-debug"; + ename = "realgud-node-debug"; + version = "1.0.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/realgud-node-debug-1.0.0.tar"; + sha256 = "1wyh6apy289a3qa1bnwv68x8pjkpqy4m18ygqnr4x759hjkq3nir"; + }; + packageRequires = [ + cl-lib + load-relative + realgud + ]; + meta = { + homepage = "https://elpa.gnu.org/packages/realgud-node-debug.html"; + license = lib.licenses.free; + }; + } + ) { }; + realgud-node-inspect = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + load-relative, + realgud, + }: + elpaBuild { + pname = "realgud-node-inspect"; + ename = "realgud-node-inspect"; + version = "1.0.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/realgud-node-inspect-1.0.0.tar"; + sha256 = "16cx0rq4zx5k0y75j044dbqzrzs1df3r95rissmhfgsi5m2qf1h2"; + }; + packageRequires = [ + cl-lib + load-relative + realgud + ]; + meta = { + homepage = "https://elpa.gnu.org/packages/realgud-node-inspect.html"; + license = lib.licenses.free; + }; + } + ) { }; + realgud-trepan-ni = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + load-relative, + realgud, + }: + elpaBuild { + pname = "realgud-trepan-ni"; + ename = "realgud-trepan-ni"; + version = "1.0.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/realgud-trepan-ni-1.0.1.tar"; + sha256 = "09vllklpfc0q28ankp2s1v10kwnxab4g6hb9zn63d1rfa92qy44k"; + }; + packageRequires = [ + cl-lib + load-relative + realgud + ]; + meta = { + homepage = "https://elpa.gnu.org/packages/realgud-trepan-ni.html"; + license = lib.licenses.free; + }; + } + ) { }; + realgud-trepan-xpy = callPackage ( + { + elpaBuild, + fetchurl, + lib, + load-relative, + realgud, + }: + elpaBuild { + pname = "realgud-trepan-xpy"; + ename = "realgud-trepan-xpy"; + version = "1.0.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/realgud-trepan-xpy-1.0.1.tar"; + sha256 = "13fll0c6p2idg56q0czgv6s00vvb585b40dn3b14hdpy0givrc0x"; + }; + packageRequires = [ + load-relative + realgud + ]; + meta = { + homepage = "https://elpa.gnu.org/packages/realgud-trepan-xpy.html"; + license = lib.licenses.free; + }; + } + ) { }; + rec-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "rec-mode"; + ename = "rec-mode"; + version = "1.9.3"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/rec-mode-1.9.3.tar"; + sha256 = "00hps4pi7r20qqqlfl8g5dqwipgyqqrhxc4hi5igl0rg563jc1wx"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/rec-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + register-list = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "register-list"; + ename = "register-list"; + version = "0.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/register-list-0.1.tar"; + sha256 = "01w2yyvbmnkjrmx5f0dk0327c0k7fvmgi928j6hbvlrp5wk6s394"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/register-list.html"; + license = lib.licenses.free; + }; + } + ) { }; + relint = callPackage ( + { + elpaBuild, + fetchurl, + lib, + xr, + }: + elpaBuild { + pname = "relint"; + ename = "relint"; + version = "2.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/relint-2.0.tar"; + sha256 = "0r89b5yk5lp92k4gnr0sx6ccilqzpv6kd5csqhxydk0xmqh8rsff"; + }; + packageRequires = [ xr ]; + meta = { + homepage = "https://elpa.gnu.org/packages/relint.html"; + license = lib.licenses.free; + }; + } + ) { }; + repology = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "repology"; + ename = "repology"; + version = "1.2.4"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/repology-1.2.4.tar"; + sha256 = "0nj4dih9mv8crqq8rd4k8dzgq7l0195syfxsf2gyikmqz9sjbr85"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/repology.html"; + license = lib.licenses.free; + }; + } + ) { }; + rich-minority = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "rich-minority"; + ename = "rich-minority"; + version = "1.0.3"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/rich-minority-1.0.3.tar"; + sha256 = "0npk6gnr2m4mfv40y2m265lxk1dyn8fd6d90vs3j2xrhpybgbln2"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.gnu.org/packages/rich-minority.html"; + license = lib.licenses.free; + }; + } + ) { }; + rnc-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "rnc-mode"; + ename = "rnc-mode"; + version = "0.3"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/rnc-mode-0.3.tar"; + sha256 = "1p03g451888v86k9z6g8gj375p1pcdvikgk1phxkhipwi5hbf5g8"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/rnc-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + rt-liberation = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "rt-liberation"; + ename = "rt-liberation"; + version = "7"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/rt-liberation-7.tar"; + sha256 = "0bi1qyc4n4ar0rblnddmlrlrkdvdrvv54wg4ii39hhxij4p6niif"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/rt-liberation.html"; + license = lib.licenses.free; + }; + } + ) { }; + ruby-end = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "ruby-end"; + ename = "ruby-end"; + version = "0.4.3"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/ruby-end-0.4.3.tar"; + sha256 = "07175v9fy96lmkfa0007lhx7v3fkk77iwca3rjl94dgdp4b8lbk5"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/ruby-end.html"; + license = lib.licenses.free; + }; + } + ) { }; + rudel = callPackage ( + { + cl-generic, + cl-lib ? null, + cl-print ? null, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "rudel"; + ename = "rudel"; + version = "0.3.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/rudel-0.3.2.tar"; + sha256 = "00rs2fy64ybam26szpc93miwajq42acyh0dkg0ixr95mg49sc46j"; + }; + packageRequires = [ + cl-generic + cl-lib + cl-print + ]; + meta = { + homepage = "https://elpa.gnu.org/packages/rudel.html"; + license = lib.licenses.free; + }; + } + ) { }; + satchel = callPackage ( + { + elpaBuild, + fetchurl, + lib, + project, + }: + elpaBuild { + pname = "satchel"; + ename = "satchel"; + version = "0.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/satchel-0.2.tar"; + sha256 = "115rkq2ygawsg8ph44zfqwsd9ykm4370v0whgjwhc1wx2iyn5ir9"; + }; + packageRequires = [ project ]; + meta = { + homepage = "https://elpa.gnu.org/packages/satchel.html"; + license = lib.licenses.free; + }; + } + ) { }; + scanner = callPackage ( + { + dash, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "scanner"; + ename = "scanner"; + version = "0.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/scanner-0.2.tar"; + sha256 = "1c42mg7m6fa7xw3svv741sgrc9zjl1zcq0vg45k61iqmnx8d44vp"; + }; + packageRequires = [ dash ]; + meta = { + homepage = "https://elpa.gnu.org/packages/scanner.html"; + license = lib.licenses.free; + }; + } + ) { }; + scroll-restore = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "scroll-restore"; + ename = "scroll-restore"; + version = "1.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/scroll-restore-1.0.tar"; + sha256 = "1i9ld1l5h2cpzf8bzk7nlk2bcln48gya8zrq79v6rawbrwdlz2z4"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/scroll-restore.html"; + license = lib.licenses.free; + }; + } + ) { }; + sed-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "sed-mode"; + ename = "sed-mode"; + version = "1.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/sed-mode-1.1.tar"; + sha256 = "0zhga0xsffdcinh10di046n6wbx35gi1zknnqzgm9wvnm2iqxlyn"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/sed-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + seq = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "seq"; + ename = "seq"; + version = "2.24"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/seq-2.24.tar"; + sha256 = "13x8l1m5if6jpc8sbrbx9r64fyhh450ml6vfm92p6i5wv6gl74w6"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/seq.html"; + license = lib.licenses.free; + }; + } + ) { }; + setup = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "setup"; + ename = "setup"; + version = "1.4.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/setup-1.4.0.tar"; + sha256 = "0id7j8xvbkbpfiv7m55dl64y27dpiczljagldf4p9q6qwlhf42f7"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/setup.html"; + license = lib.licenses.free; + }; + } + ) { }; + shelisp = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "shelisp"; + ename = "shelisp"; + version = "1.0.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/shelisp-1.0.0.tar"; + sha256 = "0zhkk04nj25lmpdlqblfhx3rb415w2f58f7wb19k1s2ry4k7m15g"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/shelisp.html"; + license = lib.licenses.free; + }; + } + ) { }; + shell-command-plus = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "shell-command-plus"; + ename = "shell-command+"; + version = "2.4.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/shell-command+-2.4.2.tar"; + sha256 = "1kjj8n3nws7dl7k3ksnfx0s0kwvqb9wzy9k42xs5s51k7xrp1l18"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/shell-command+.html"; + license = lib.licenses.free; + }; + } + ) { }; + shen-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "shen-mode"; + ename = "shen-mode"; + version = "0.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/shen-mode-0.1.tar"; + sha256 = "0xskyd0d3krwgrpca10m7l7c0l60qq7jjn2q207n61yw5yx71pqn"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/shen-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + sisu-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "sisu-mode"; + ename = "sisu-mode"; + version = "7.1.8"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/sisu-mode-7.1.8.tar"; + sha256 = "02cfyrjynwvf2rlnkfy8285ga9kzbg1b614sch0xnxqw81mp7drp"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/sisu-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + site-lisp = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "site-lisp"; + ename = "site-lisp"; + version = "0.1.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/site-lisp-0.1.2.tar"; + sha256 = "1w27nd061y7a5qhdmij2056751wx9nwv89qx3hxcl473iz03b09l"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/site-lisp.html"; + license = lib.licenses.free; + }; + } + ) { }; + sketch-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "sketch-mode"; + ename = "sketch-mode"; + version = "1.0.4"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/sketch-mode-1.0.4.tar"; + sha256 = "1vrbmyhf9bffy2fkz91apzxla6v8nbv2wb25vxcr9x3smbag9kal"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/sketch-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + slime-volleyball = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "slime-volleyball"; + ename = "slime-volleyball"; + version = "1.2.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/slime-volleyball-1.2.0.tar"; + sha256 = "1qlmsxnhja8p873rvb1qj4xsf938bs3hl8qqqsmrm0csvlb9737p"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.gnu.org/packages/slime-volleyball.html"; + license = lib.licenses.free; + }; + } + ) { }; + sm-c-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "sm-c-mode"; + ename = "sm-c-mode"; + version = "1.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/sm-c-mode-1.2.tar"; + sha256 = "0xykl8wkbw5y7ah79zlfzz1k0di9ghfsv2xjxwx7rrb37wny5184"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/sm-c-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + smalltalk-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "smalltalk-mode"; + ename = "smalltalk-mode"; + version = "4.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/smalltalk-mode-4.0.tar"; + sha256 = "0ly2qmsbmzd5nd7iaighws10y0yj7p2356fw32pkp0cmzzvc3d54"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/smalltalk-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + smart-yank = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "smart-yank"; + ename = "smart-yank"; + version = "0.1.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/smart-yank-0.1.1.tar"; + sha256 = "08dc4c60jcjyiixyzckxk5qk6s2pl1jmrp4h1bj53ssd1kn4208m"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/smart-yank.html"; + license = lib.licenses.free; + }; + } + ) { }; + sml-mode = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "sml-mode"; + ename = "sml-mode"; + version = "6.12"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/sml-mode-6.12.tar"; + sha256 = "10zp0gi5rbjjxjzn9k6klvdms9k3yxx0qry0wa75a68sj5x2rdzh"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.gnu.org/packages/sml-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + so-long = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "so-long"; + ename = "so-long"; + version = "1.1.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/so-long-1.1.2.tar"; + sha256 = "01qdxlsllpj5ajixkqf7v9p95zn9qnvjdnp30v54ymj2pd0d9a32"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/so-long.html"; + license = lib.licenses.free; + }; + } + ) { }; + soap-client = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "soap-client"; + ename = "soap-client"; + version = "3.2.3"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/soap-client-3.2.3.tar"; + sha256 = "1yhs661g0vqxpxqcxgsxvljmrpcqzl0y52lz6jvfilmshw7r6k2s"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.gnu.org/packages/soap-client.html"; + license = lib.licenses.free; + }; + } + ) { }; + sokoban = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "sokoban"; + ename = "sokoban"; + version = "1.4.9"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/sokoban-1.4.9.tar"; + sha256 = "1l3d4al96252kdhyn4dr88ir67kay57n985w0qy8p930ncrs846v"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.gnu.org/packages/sokoban.html"; + license = lib.licenses.free; + }; + } + ) { }; + sotlisp = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "sotlisp"; + ename = "sotlisp"; + version = "1.6.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/sotlisp-1.6.2.tar"; + sha256 = "0q65iwr89cwwqnc1kndf2agq5wp48a7k02qsksgaj0n6zv7i4dfn"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/sotlisp.html"; + license = lib.licenses.free; + }; + } + ) { }; + spacious-padding = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "spacious-padding"; + ename = "spacious-padding"; + version = "0.5.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/spacious-padding-0.5.0.tar"; + sha256 = "0x5bsyd6b1d3bzrsrpf9nvw7xj5ch114m2dilq64bg8y2db3452z"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/spacious-padding.html"; + license = lib.licenses.free; + }; + } + ) { }; + spinner = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "spinner"; + ename = "spinner"; + version = "1.7.4"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/spinner-1.7.4.tar"; + sha256 = "0lq8q62q5an8199p8pyafg5l6hdnnqi6i6sybnk60sdcqy62pa6r"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/spinner.html"; + license = lib.licenses.free; + }; + } + ) { }; + sql-beeline = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "sql-beeline"; + ename = "sql-beeline"; + version = "0.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/sql-beeline-0.2.tar"; + sha256 = "0ngvvfhs1fj3ca5g563bssaz9ac5fiqkqzv09s4ramalp2q6axq9"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/sql-beeline.html"; + license = lib.licenses.free; + }; + } + ) { }; + sql-cassandra = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "sql-cassandra"; + ename = "sql-cassandra"; + version = "0.2.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/sql-cassandra-0.2.2.tar"; + sha256 = "154rymq0k6869cw7sc7nhx3di5qv1ffgf8shkxc22gvkrj2s7p9b"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/sql-cassandra.html"; + license = lib.licenses.free; + }; + } + ) { }; + sql-indent = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "sql-indent"; + ename = "sql-indent"; + version = "1.7"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/sql-indent-1.7.tar"; + sha256 = "1yfb01wh5drgvrwbn0hgzyi0rc4zlr1w23d065x4qrld31jbka8i"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.gnu.org/packages/sql-indent.html"; + license = lib.licenses.free; + }; + } + ) { }; + srht = callPackage ( + { + elpaBuild, + fetchurl, + lib, + plz, + transient, + }: + elpaBuild { + pname = "srht"; + ename = "srht"; + version = "0.4"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/srht-0.4.tar"; + sha256 = "0ps49syzlaf4lxvji61y6y7r383r65v96d57hj75xkn6hvyrz74n"; + }; + packageRequires = [ + plz + transient + ]; + meta = { + homepage = "https://elpa.gnu.org/packages/srht.html"; + license = lib.licenses.free; + }; + } + ) { }; + ssh-deploy = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "ssh-deploy"; + ename = "ssh-deploy"; + version = "3.1.16"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/ssh-deploy-3.1.16.tar"; + sha256 = "0fb88l3270d7l808q8x16zcvjgsjbyhgifgv17syfsj0ja63x28p"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/ssh-deploy.html"; + license = lib.licenses.free; + }; + } + ) { }; + standard-themes = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "standard-themes"; + ename = "standard-themes"; + version = "2.1.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/standard-themes-2.1.0.tar"; + sha256 = "0x7fphd36kwg4vfwix5rq7260xl6x6cjfwsq11rj4af30sm4hlfn"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/standard-themes.html"; + license = lib.licenses.free; + }; + } + ) { }; + stream = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "stream"; + ename = "stream"; + version = "2.3.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/stream-2.3.0.tar"; + sha256 = "0224hjcxvy3cxv1c3pz9j2laxld2cxqbs5sigr02fcdcb9qn7hay"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/stream.html"; + license = lib.licenses.free; + }; + } + ) { }; + substitute = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "substitute"; + ename = "substitute"; + version = "0.3.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/substitute-0.3.1.tar"; + sha256 = "0038kkn6v2w3asg9abwary2cacr9wbw90wdvq7q9wyk1818cygff"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/substitute.html"; + license = lib.licenses.free; + }; + } + ) { }; + svg = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "svg"; + ename = "svg"; + version = "1.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/svg-1.1.tar"; + sha256 = "10x2rry349ibzd9awy4rg18cd376yvkzqsyq0fm4i05kq4dzqp4a"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/svg.html"; + license = lib.licenses.free; + }; + } + ) { }; + svg-clock = callPackage ( + { + elpaBuild, + fetchurl, + lib, + svg, + }: + elpaBuild { + pname = "svg-clock"; + ename = "svg-clock"; + version = "1.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/svg-clock-1.2.tar"; + sha256 = "0r0wayb1q0dd2yi1nqa0m4jfy36lydxxa6xvvd6amgh9sy499qs8"; + }; + packageRequires = [ svg ]; + meta = { + homepage = "https://elpa.gnu.org/packages/svg-clock.html"; + license = lib.licenses.free; + }; + } + ) { }; + svg-lib = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "svg-lib"; + ename = "svg-lib"; + version = "0.3"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/svg-lib-0.3.tar"; + sha256 = "1s7n3j1yzprs9frb554c66pcrv3zss1y26y6qgndii4bbzpa7jh8"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/svg-lib.html"; + license = lib.licenses.free; + }; + } + ) { }; + svg-tag-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + svg-lib, + }: + elpaBuild { + pname = "svg-tag-mode"; + ename = "svg-tag-mode"; + version = "0.3.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/svg-tag-mode-0.3.2.tar"; + sha256 = "0wzcq00kbjpbwz7acn4d7jd98v5kicq3iwgf6dnmz2kflvkfwkvr"; + }; + packageRequires = [ svg-lib ]; + meta = { + homepage = "https://elpa.gnu.org/packages/svg-tag-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + swiper = callPackage ( + { + elpaBuild, + fetchurl, + ivy, + lib, + }: + elpaBuild { + pname = "swiper"; + ename = "swiper"; + version = "0.14.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/swiper-0.14.2.tar"; + sha256 = "1rzp78ix19ddm7fx7p4i5iybd5lw244kqvf3nrafz3r7q6hi8yds"; + }; + packageRequires = [ ivy ]; + meta = { + homepage = "https://elpa.gnu.org/packages/swiper.html"; + license = lib.licenses.free; + }; + } + ) { }; + switchy-window = callPackage ( + { + compat, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "switchy-window"; + ename = "switchy-window"; + version = "1.3"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/switchy-window-1.3.tar"; + sha256 = "0ym5cy6czsrd15f8rgh3dad8fwn8pb2xrvhlmdikc59cc29zamrv"; + }; + packageRequires = [ compat ]; + meta = { + homepage = "https://elpa.gnu.org/packages/switchy-window.html"; + license = lib.licenses.free; + }; + } + ) { }; + sxhkdrc-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "sxhkdrc-mode"; + ename = "sxhkdrc-mode"; + version = "1.0.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/sxhkdrc-mode-1.0.0.tar"; + sha256 = "0gfv5l71md2ica9jfa8ynwfag3zvayc435pl91lzcz92qy5n0hlj"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/sxhkdrc-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + system-packages = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "system-packages"; + ename = "system-packages"; + version = "1.0.13"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/system-packages-1.0.13.tar"; + sha256 = "0xlbq44c7f2assp36g5z9hn5gldq76wzpcinp782whqzpgz2k4sy"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/system-packages.html"; + license = lib.licenses.free; + }; + } + ) { }; + tNFA = callPackage ( + { + elpaBuild, + fetchurl, + lib, + queue, + }: + elpaBuild { + pname = "tNFA"; + ename = "tNFA"; + version = "0.1.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/tNFA-0.1.1.el"; + sha256 = "01n4p8lg8f2k55l2z77razb2sl202qisjqm5lff96a2kxnxinsds"; + }; + packageRequires = [ queue ]; + meta = { + homepage = "https://elpa.gnu.org/packages/tNFA.html"; + license = lib.licenses.free; + }; + } + ) { }; + tam = callPackage ( + { + elpaBuild, + fetchurl, + lib, + queue, + }: + elpaBuild { + pname = "tam"; + ename = "tam"; + version = "0.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/tam-0.1.tar"; + sha256 = "16ms55cwm2cwixl03a3bbsqs159c3r3dv5kaazvsghby6c511bx8"; + }; + packageRequires = [ queue ]; + meta = { + homepage = "https://elpa.gnu.org/packages/tam.html"; + license = lib.licenses.free; + }; + } + ) { }; + taxy = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "taxy"; + ename = "taxy"; + version = "0.10.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/taxy-0.10.2.tar"; + sha256 = "1nmlx2rvlgzvmz1h3s5yn3qnad12pn2a83gjzxf3ln79p8rv1mj6"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/taxy.html"; + license = lib.licenses.free; + }; + } + ) { }; + taxy-magit-section = callPackage ( + { + elpaBuild, + fetchurl, + lib, + magit-section, + taxy, + }: + elpaBuild { + pname = "taxy-magit-section"; + ename = "taxy-magit-section"; + version = "0.14"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/taxy-magit-section-0.14.tar"; + sha256 = "13xwhqlvzfkm5gpprv683r8jri6wy54bhbzg3wiw3m020hqw6ygi"; + }; + packageRequires = [ + magit-section + taxy + ]; + meta = { + homepage = "https://elpa.gnu.org/packages/taxy-magit-section.html"; + license = lib.licenses.free; + }; + } + ) { }; + temp-buffer-browse = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "temp-buffer-browse"; + ename = "temp-buffer-browse"; + version = "1.5"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/temp-buffer-browse-1.5.tar"; + sha256 = "00hbh25fj5fm9dsp8fpdk8lap3gi5jlva6f0m6kvjqnmvc06q36r"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/temp-buffer-browse.html"; + license = lib.licenses.free; + }; + } + ) { }; + tempel = callPackage ( + { + compat, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "tempel"; + ename = "tempel"; + version = "1.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/tempel-1.2.tar"; + sha256 = "0lvdd7lvdx4yf0zhrv380y5q3zvvk7gsxjgxj2c40np86c4q2q7m"; + }; + packageRequires = [ compat ]; + meta = { + homepage = "https://elpa.gnu.org/packages/tempel.html"; + license = lib.licenses.free; + }; + } + ) { }; + test-simple = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "test-simple"; + ename = "test-simple"; + version = "1.3.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/test-simple-1.3.0.tar"; + sha256 = "065jfps5ixpy5d4l2xgwhkpafdwiziqh4msbjcascwpac3j5c5yp"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.gnu.org/packages/test-simple.html"; + license = lib.licenses.free; + }; + } + ) { }; + tex-item = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "tex-item"; + ename = "tex-item"; + version = "0.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/tex-item-0.1.tar"; + sha256 = "0ggbn3lk64cv6pnw97ww7vn250jchj80zx3hvkcqlccyw34x6ziy"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/tex-item.html"; + license = lib.licenses.free; + }; + } + ) { }; + tex-parens = callPackage ( + { + auctex, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "tex-parens"; + ename = "tex-parens"; + version = "0.4"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/tex-parens-0.4.tar"; + sha256 = "08mj18sh32z61kjizf3y6bb0zvb6qgdhrk9q7b15bi5mllk834zd"; + }; + packageRequires = [ auctex ]; + meta = { + homepage = "https://elpa.gnu.org/packages/tex-parens.html"; + license = lib.licenses.free; + }; + } + ) { }; + theme-buffet = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "theme-buffet"; + ename = "theme-buffet"; + version = "0.1.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/theme-buffet-0.1.2.tar"; + sha256 = "1cfrrl41rlxdbybvxs8glkgmgkznwgpq70h58rkvwm6b5jfs8wv0"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/theme-buffet.html"; + license = lib.licenses.free; + }; + } + ) { }; + timerfunctions = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "timerfunctions"; + ename = "timerfunctions"; + version = "1.4.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/timerfunctions-1.4.2.el"; + sha256 = "122q8nv08pz1mkgilvi9qfrs7rsnc5picr7jyz2jpnvpd9qw6jw5"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.gnu.org/packages/timerfunctions.html"; + license = lib.licenses.free; + }; + } + ) { }; + tiny = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "tiny"; + ename = "tiny"; + version = "0.2.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/tiny-0.2.1.tar"; + sha256 = "1cr73a8gba549ja55x0c2s554f3zywf69zbnd7v82jz5q1k9wd2v"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/tiny.html"; + license = lib.licenses.free; + }; + } + ) { }; + tmr = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "tmr"; + ename = "tmr"; + version = "0.4.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/tmr-0.4.0.tar"; + sha256 = "0vvsanjs6b9m3gxm84qr0ywwdj0378y5jkv1nzqdn980rfgfimsv"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/tmr.html"; + license = lib.licenses.free; + }; + } + ) { }; + tomelr = callPackage ( + { + elpaBuild, + fetchurl, + lib, + map, + seq, + }: + elpaBuild { + pname = "tomelr"; + ename = "tomelr"; + version = "0.4.3"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/tomelr-0.4.3.tar"; + sha256 = "0r2f4dl10fl75ygvbmb4vkqixy24k0z2wpr431ljzp5m29bn74kh"; + }; + packageRequires = [ + map + seq + ]; + meta = { + homepage = "https://elpa.gnu.org/packages/tomelr.html"; + license = lib.licenses.free; + }; + } + ) { }; + topspace = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "topspace"; + ename = "topspace"; + version = "0.3.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/topspace-0.3.1.tar"; + sha256 = "0m8z2q1gdi0zfh1df5xb2v0sg1v5fysrl00fv2qqgnd61c2n0hhz"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/topspace.html"; + license = lib.licenses.free; + }; + } + ) { }; + track-changes = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "track-changes"; + ename = "track-changes"; + version = "1.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/track-changes-1.2.tar"; + sha256 = "0al6a1xjs6p2pn6z976pnmfqz2x5xcz99b5gkdzz90ywbn7018m4"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/track-changes.html"; + license = lib.licenses.free; + }; + } + ) { }; + tramp = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "tramp"; + ename = "tramp"; + version = "2.7.1.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/tramp-2.7.1.1.tar"; + sha256 = "1b14gwgfwx9n01mvbpi8q8lr9n4ik8lm580b8dvcaz456pm7bxb8"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/tramp.html"; + license = lib.licenses.free; + }; + } + ) { }; + tramp-nspawn = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "tramp-nspawn"; + ename = "tramp-nspawn"; + version = "1.0.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/tramp-nspawn-1.0.1.tar"; + sha256 = "0cy8l389s6pi135gxcygv1vna6k3gizqd33avf3wsdbnqdf2pjnc"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/tramp-nspawn.html"; + license = lib.licenses.free; + }; + } + ) { }; + tramp-theme = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "tramp-theme"; + ename = "tramp-theme"; + version = "0.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/tramp-theme-0.2.tar"; + sha256 = "0dz8ndnmwc38g1gy30f3jcjqg5nzdi6721x921r4s5a8i1mx2kpm"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/tramp-theme.html"; + license = lib.licenses.free; + }; + } + ) { }; + transcribe = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "transcribe"; + ename = "transcribe"; + version = "1.5.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/transcribe-1.5.2.tar"; + sha256 = "1v1bvcv3zqrj073l3vw7gz20rpa9p86rf1yv219n47kmh27c80hq"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/transcribe.html"; + license = lib.licenses.free; + }; + } + ) { }; + transient = callPackage ( + { + compat, + elpaBuild, + fetchurl, + lib, + seq, + }: + elpaBuild { + pname = "transient"; + ename = "transient"; + version = "0.7.4"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/transient-0.7.4.tar"; + sha256 = "00fcrbdk7gxaa25n5j1g688mlislnyj6w4743870liavvg982z9w"; + }; + packageRequires = [ + compat + seq + ]; + meta = { + homepage = "https://elpa.gnu.org/packages/transient.html"; + license = lib.licenses.free; + }; + } + ) { }; + transient-cycles = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "transient-cycles"; + ename = "transient-cycles"; + version = "1.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/transient-cycles-1.0.tar"; + sha256 = "0s6cxagqxj4i3qf4kx8mdrihciz3v6ga7zw19jcv896rdhx75bx5"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/transient-cycles.html"; + license = lib.licenses.free; + }; + } + ) { }; + tree-inspector = callPackage ( + { + elpaBuild, + fetchurl, + lib, + treeview, + }: + elpaBuild { + pname = "tree-inspector"; + ename = "tree-inspector"; + version = "0.4"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/tree-inspector-0.4.tar"; + sha256 = "0v59kp1didml9k245m1v0s0ahh2r79cc0hp5ika93iamrdxkxaiz"; + }; + packageRequires = [ treeview ]; + meta = { + homepage = "https://elpa.gnu.org/packages/tree-inspector.html"; + license = lib.licenses.free; + }; + } + ) { }; + trie = callPackage ( + { + elpaBuild, + fetchurl, + heap, + lib, + tNFA, + }: + elpaBuild { + pname = "trie"; + ename = "trie"; + version = "0.6"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/trie-0.6.tar"; + sha256 = "1jvhvvxkxbbpy93x9kpznvp2hqkkbdbbjaj27fd0wkbijg0k03ln"; + }; + packageRequires = [ + heap + tNFA + ]; + meta = { + homepage = "https://elpa.gnu.org/packages/trie.html"; + license = lib.licenses.free; + }; + } + ) { }; + triples = callPackage ( + { + elpaBuild, + fetchurl, + lib, + seq, + }: + elpaBuild { + pname = "triples"; + ename = "triples"; + version = "0.3.5"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/triples-0.3.5.tar"; + sha256 = "1wvmfw8yc7nh42f1skmpxqz5f57vkhg7x2cdngpq11lqbgvypj7m"; + }; + packageRequires = [ seq ]; + meta = { + homepage = "https://elpa.gnu.org/packages/triples.html"; + license = lib.licenses.free; + }; + } + ) { }; + typo = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "typo"; + ename = "typo"; + version = "1.0.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/typo-1.0.1.tar"; + sha256 = "1w4m2admlgmx7d661l70rryyxbaahfvrvhxc1b9sq41nx88bmgn1"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/typo.html"; + license = lib.licenses.free; + }; + } + ) { }; + ulisp-repl = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "ulisp-repl"; + ename = "ulisp-repl"; + version = "1.0.3"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/ulisp-repl-1.0.3.tar"; + sha256 = "1c23d66vydfp29px2dlvgl5xg91a0rh4w4b79q8ach533nfag3ia"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/ulisp-repl.html"; + license = lib.licenses.free; + }; + } + ) { }; + undo-tree = callPackage ( + { + elpaBuild, + fetchurl, + lib, + queue, + }: + elpaBuild { + pname = "undo-tree"; + ename = "undo-tree"; + version = "0.8.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/undo-tree-0.8.2.tar"; + sha256 = "0ad1zhkjdf73j3b2i8nd7f10jlqqvcaa852yycms4jr636xw6ms6"; + }; + packageRequires = [ queue ]; + meta = { + homepage = "https://elpa.gnu.org/packages/undo-tree.html"; + license = lib.licenses.free; + }; + } + ) { }; + uni-confusables = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "uni-confusables"; + ename = "uni-confusables"; + version = "0.3"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/uni-confusables-0.3.tar"; + sha256 = "08150kgqsbcpykvf8m2b25y386h2b4pj08vffm6wh4f000wr72k3"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/uni-confusables.html"; + license = lib.licenses.free; + }; + } + ) { }; + uniquify-files = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "uniquify-files"; + ename = "uniquify-files"; + version = "1.0.4"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/uniquify-files-1.0.4.tar"; + sha256 = "0xw2l49xhdy5qgwja8bkiq2ibdppl45xzqlr17z92l1vfq4akpzp"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/uniquify-files.html"; + license = lib.licenses.free; + }; + } + ) { }; + urgrep = callPackage ( + { + compat, + elpaBuild, + fetchurl, + lib, + project, + }: + elpaBuild { + pname = "urgrep"; + ename = "urgrep"; + version = "0.5.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/urgrep-0.5.0.tar"; + sha256 = "14vga04hf03hj1ilcpl3qblmb7mhl9j0qwkq2whbc50p98avkhqi"; + }; + packageRequires = [ + compat + project + ]; + meta = { + homepage = "https://elpa.gnu.org/packages/urgrep.html"; + license = lib.licenses.free; + }; + } + ) { }; + url-http-ntlm = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + nadvice, + ntlm ? null, + }: + elpaBuild { + pname = "url-http-ntlm"; + ename = "url-http-ntlm"; + version = "2.0.5"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/url-http-ntlm-2.0.5.tar"; + sha256 = "02b65z70kw37mzj2hh8q6z0zhhacf9sc4hlczpfxdfsy05b8yri9"; + }; + packageRequires = [ + cl-lib + nadvice + ntlm + ]; + meta = { + homepage = "https://elpa.gnu.org/packages/url-http-ntlm.html"; + license = lib.licenses.free; + }; + } + ) { }; + url-http-oauth = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "url-http-oauth"; + ename = "url-http-oauth"; + version = "0.8.3"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/url-http-oauth-0.8.3.tar"; + sha256 = "06lpzh8kpxn8cr92blxrjw44h2cfc6fw0pr024sign4acczx10ws"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/url-http-oauth.html"; + license = lib.licenses.free; + }; + } + ) { }; + url-scgi = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "url-scgi"; + ename = "url-scgi"; + version = "0.9"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/url-scgi-0.9.tar"; + sha256 = "19lvr4d2y9rd5gibaavp7ghkxmdh5zad9ynarbi2w4rjgmz5y981"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/url-scgi.html"; + license = lib.licenses.free; + }; + } + ) { }; + use-package = callPackage ( + { + bind-key, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "use-package"; + ename = "use-package"; + version = "2.4.5"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/use-package-2.4.5.tar"; + sha256 = "060bbrbmx3psv4jkn95zjyhbyfidip86sfi8975fhqcc0aagnwhp"; + }; + packageRequires = [ bind-key ]; + meta = { + homepage = "https://elpa.gnu.org/packages/use-package.html"; + license = lib.licenses.free; + }; + } + ) { }; + validate = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + seq, + }: + elpaBuild { + pname = "validate"; + ename = "validate"; + version = "1.0.4"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/validate-1.0.4.tar"; + sha256 = "1bn25l62zcabg2ppxwr4049m1qd0yj095cflqrak0n50acgjs6w5"; + }; + packageRequires = [ + cl-lib + seq + ]; + meta = { + homepage = "https://elpa.gnu.org/packages/validate.html"; + license = lib.licenses.free; + }; + } + ) { }; + valign = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "valign"; + ename = "valign"; + version = "3.1.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/valign-3.1.1.tar"; + sha256 = "16v2mmrih0ykk4z6qmy29gajjb3v83q978gzn3y6pg8y48b2wxpb"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/valign.html"; + license = lib.licenses.free; + }; + } + ) { }; + vc-backup = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "vc-backup"; + ename = "vc-backup"; + version = "1.1.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/vc-backup-1.1.0.tar"; + sha256 = "0a45bbrvk4s9cj3ih3hb6vqjv4hkwnz7m9a4mr45m6cb0sl9b8a3"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/vc-backup.html"; + license = lib.licenses.free; + }; + } + ) { }; + vc-got = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "vc-got"; + ename = "vc-got"; + version = "1.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/vc-got-1.2.tar"; + sha256 = "04m1frrnla4zc8db728280r9fbk50bgjkk4k7dizb0hawghk4r3p"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/vc-got.html"; + license = lib.licenses.free; + }; + } + ) { }; + vc-hgcmd = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "vc-hgcmd"; + ename = "vc-hgcmd"; + version = "1.14.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/vc-hgcmd-1.14.1.tar"; + sha256 = "0a8a4d9difrp2r6ac8micxn8ij96inba390324w087yxwqzkgk1g"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/vc-hgcmd.html"; + license = lib.licenses.free; + }; + } + ) { }; + vcard = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "vcard"; + ename = "vcard"; + version = "0.2.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/vcard-0.2.2.tar"; + sha256 = "0r56y3q2gigm8rxifly50m5h1k948y987541cqd8w207wf1b56bh"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/vcard.html"; + license = lib.licenses.free; + }; + } + ) { }; + vcl-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "vcl-mode"; + ename = "vcl-mode"; + version = "1.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/vcl-mode-1.1.tar"; + sha256 = "0zz664c263x24xzs7hk2mqchzplmx2dlba98d5fpy8ybdnziqfkj"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/vcl-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + vdiff = callPackage ( + { + elpaBuild, + fetchurl, + hydra, + lib, + }: + elpaBuild { + pname = "vdiff"; + ename = "vdiff"; + version = "0.2.4"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/vdiff-0.2.4.tar"; + sha256 = "0crgb32dk0yzcgvjai0b67wcbcfppc3h0ppfqgdrim1nincbwc1m"; + }; + packageRequires = [ hydra ]; + meta = { + homepage = "https://elpa.gnu.org/packages/vdiff.html"; + license = lib.licenses.free; + }; + } + ) { }; + verilog-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "verilog-mode"; + ename = "verilog-mode"; + version = "2024.3.1.121933719"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/verilog-mode-2024.3.1.121933719.tar"; + sha256 = "1z0mbd5sbbq2prhc0vfpqd4h4a6jwl5fqyrnl39yp05zm66va34w"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/verilog-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + vertico = callPackage ( + { + compat, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "vertico"; + ename = "vertico"; + version = "1.9"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/vertico-1.9.tar"; + sha256 = "12aiqxsar86xlmsfzvilza10wf184nwhg218bv6bip7v51ikh37y"; + }; + packageRequires = [ compat ]; + meta = { + homepage = "https://elpa.gnu.org/packages/vertico.html"; + license = lib.licenses.free; + }; + } + ) { }; + vertico-posframe = callPackage ( + { + elpaBuild, + fetchurl, + lib, + posframe, + vertico, + }: + elpaBuild { + pname = "vertico-posframe"; + ename = "vertico-posframe"; + version = "0.7.7"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/vertico-posframe-0.7.7.tar"; + sha256 = "0ahn0b5v9xw6f1zvgv27c82kxdh4rx7n9dbp17rkkkg3dvvkdzxy"; + }; + packageRequires = [ + posframe + vertico + ]; + meta = { + homepage = "https://elpa.gnu.org/packages/vertico-posframe.html"; + license = lib.licenses.free; + }; + } + ) { }; + vigenere = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "vigenere"; + ename = "vigenere"; + version = "1.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/vigenere-1.0.tar"; + sha256 = "1zlni6amznzi9w96kj7lnhfrr049crva2l8kwl5jsvyaj5fc6nq5"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/vigenere.html"; + license = lib.licenses.free; + }; + } + ) { }; + visual-filename-abbrev = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "visual-filename-abbrev"; + ename = "visual-filename-abbrev"; + version = "1.3"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/visual-filename-abbrev-1.3.tar"; + sha256 = "0aly8lkiykcxq3yyyd3lwyc7fmjpcxjdgny0iw0mzl8nhshrqrs0"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/visual-filename-abbrev.html"; + license = lib.licenses.free; + }; + } + ) { }; + visual-fill = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "visual-fill"; + ename = "visual-fill"; + version = "0.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/visual-fill-0.2.tar"; + sha256 = "00r3cclhrdx5y0h1p1rrx5psvc8d95dayzpjdsy9xj44i8pcnvja"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/visual-fill.html"; + license = lib.licenses.free; + }; + } + ) { }; + vlf = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "vlf"; + ename = "vlf"; + version = "1.7.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/vlf-1.7.2.tar"; + sha256 = "1napxdavsrwb5dq2i4ka06rhmmfk6qixc8mm2a6ab68iavprrqkv"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/vlf.html"; + license = lib.licenses.free; + }; + } + ) { }; + vundo = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "vundo"; + ename = "vundo"; + version = "2.3.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/vundo-2.3.0.tar"; + sha256 = "165y277fi0vp9301hy3pqgfnf160k29n8vri0zyq8a3vz3f8lqrl"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/vundo.html"; + license = lib.licenses.free; + }; + } + ) { }; + wcheck-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "wcheck-mode"; + ename = "wcheck-mode"; + version = "2021"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/wcheck-mode-2021.tar"; + sha256 = "0igsdsfw80nnrbw1ba3rgwp16ncy195kwv78ll9zbbf3y23n7kr0"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/wcheck-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + wconf = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "wconf"; + ename = "wconf"; + version = "0.2.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/wconf-0.2.1.tar"; + sha256 = "1ci5ysn2w9hjzcsv698b6mh14qbrmvlzn4spaq4wzwl9p8672n08"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/wconf.html"; + license = lib.licenses.free; + }; + } + ) { }; + web-server = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "web-server"; + ename = "web-server"; + version = "0.1.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/web-server-0.1.2.tar"; + sha256 = "0wikajm4pbffcy8clwwb5bnz67isqmcsbf9kca8rzx4svzi5j2gc"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/web-server.html"; + license = lib.licenses.free; + }; + } + ) { }; + webfeeder = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "webfeeder"; + ename = "webfeeder"; + version = "1.1.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/webfeeder-1.1.2.tar"; + sha256 = "0418fpw2ra12n77560gh9j9ymv28d895bdhpr7x9xakvijjh705m"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/webfeeder.html"; + license = lib.licenses.free; + }; + } + ) { }; + websocket = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "websocket"; + ename = "websocket"; + version = "1.15"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/websocket-1.15.tar"; + sha256 = "0cm3x6qzr4zqj46w0qfpn7n9g5z80figcv824869snvc74465h1g"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.gnu.org/packages/websocket.html"; + license = lib.licenses.free; + }; + } + ) { }; + which-key = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "which-key"; + ename = "which-key"; + version = "3.6.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/which-key-3.6.1.tar"; + sha256 = "0p1vl7dnd7nsvzgsff19px9yzcw4w07qb5sb8g9r8a8slgvf3vqh"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/which-key.html"; + license = lib.licenses.free; + }; + } + ) { }; + window-commander = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "window-commander"; + ename = "window-commander"; + version = "3.0.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/window-commander-3.0.2.tar"; + sha256 = "15345sgdmgz0vv9bk2cmffjp66i0msqj0xn2cxl7wny3bkfx8amv"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/window-commander.html"; + license = lib.licenses.free; + }; + } + ) { }; + window-tool-bar = callPackage ( + { + compat, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "window-tool-bar"; + ename = "window-tool-bar"; + version = "0.2.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/window-tool-bar-0.2.1.tar"; + sha256 = "06wf3kwc4sjd14ihagmahxjvk35skb28rh9yclpzbrvjqk0ss35v"; + }; + packageRequires = [ compat ]; + meta = { + homepage = "https://elpa.gnu.org/packages/window-tool-bar.html"; + license = lib.licenses.free; + }; + } + ) { }; + windower = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "windower"; + ename = "windower"; + version = "0.0.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/windower-0.0.1.el"; + sha256 = "19xizbfbnzhhmhlqy20ir1a1y87bjwrq67bcawxy6nxpkwbizsv7"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/windower.html"; + license = lib.licenses.free; + }; + } + ) { }; + windresize = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "windresize"; + ename = "windresize"; + version = "0.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/windresize-0.1.tar"; + sha256 = "1wjqrwrfql5c67yv59hc95ga0mkvrqz74gy46aawhn8r3xr65qai"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/windresize.html"; + license = lib.licenses.free; + }; + } + ) { }; + wisi = callPackage ( + { + elpaBuild, + fetchurl, + lib, + seq, + }: + elpaBuild { + pname = "wisi"; + ename = "wisi"; + version = "4.3.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/wisi-4.3.2.tar"; + sha256 = "0qa6nig33igv4sqk3fxzrmx889pswq10smj9c9l3phz2acqx8q92"; + }; + packageRequires = [ seq ]; + meta = { + homepage = "https://elpa.gnu.org/packages/wisi.html"; + license = lib.licenses.free; + }; + } + ) { }; + wisitoken-grammar-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + mmm-mode, + wisi, + }: + elpaBuild { + pname = "wisitoken-grammar-mode"; + ename = "wisitoken-grammar-mode"; + version = "1.3.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/wisitoken-grammar-mode-1.3.0.tar"; + sha256 = "0i0vy751ycbfp8l8ynzj6iqgvc3scllwysdchpjv4lyj0m7m3s20"; + }; + packageRequires = [ + mmm-mode + wisi + ]; + meta = { + homepage = "https://elpa.gnu.org/packages/wisitoken-grammar-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + wpuzzle = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "wpuzzle"; + ename = "wpuzzle"; + version = "1.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/wpuzzle-1.1.tar"; + sha256 = "05dgvr1miqp870nl7c8dw7j1kv4mgwm8scynjfwbs9wjz4xmzc6c"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/wpuzzle.html"; + license = lib.licenses.free; + }; + } + ) { }; + wrap-search = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "wrap-search"; + ename = "wrap-search"; + version = "4.16.19"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/wrap-search-4.16.19.tar"; + sha256 = "1qrvn5cxvd5sl18hyn979f9kany5vnypbflkhzmxas5q0n2miyfw"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/wrap-search.html"; + license = lib.licenses.free; + }; + } + ) { }; + xclip = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "xclip"; + ename = "xclip"; + version = "1.11"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/xclip-1.11.tar"; + sha256 = "081k9azz9jnmjmqlcc1yw9s4nziac772lw75xcm78fgsfrx42hmr"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/xclip.html"; + license = lib.licenses.free; + }; + } + ) { }; + xeft = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "xeft"; + ename = "xeft"; + version = "3.3"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/xeft-3.3.tar"; + sha256 = "00zkhqajkkf979ccbnz076dpav2v52q44li2m4m4c6p3z0c3y255"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/xeft.html"; + license = lib.licenses.free; + }; + } + ) { }; + xelb = callPackage ( + { + compat, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "xelb"; + ename = "xelb"; + version = "0.20"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/xelb-0.20.tar"; + sha256 = "12ikrnvik1n1fdc6ixx53d0z84v269wi463380k0i5zb6q8ncwpk"; + }; + packageRequires = [ compat ]; + meta = { + homepage = "https://elpa.gnu.org/packages/xelb.html"; + license = lib.licenses.free; + }; + } + ) { }; + xpm = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + queue, + }: + elpaBuild { + pname = "xpm"; + ename = "xpm"; + version = "1.0.5"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/xpm-1.0.5.tar"; + sha256 = "12a12rmbc1c0j60nv1s8fgg3r2lcjw8hs7qpyscm7ggwanylxn6q"; + }; + packageRequires = [ + cl-lib + queue + ]; + meta = { + homepage = "https://elpa.gnu.org/packages/xpm.html"; + license = lib.licenses.free; + }; + } + ) { }; + xr = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "xr"; + ename = "xr"; + version = "2.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/xr-2.0.tar"; + sha256 = "1y5pcrph6v8q06mipv3l49qhw55yvvb1nnq0817bzm25k0s3z70v"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/xr.html"; + license = lib.licenses.free; + }; + } + ) { }; + xref = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "xref"; + ename = "xref"; + version = "1.7.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/xref-1.7.0.tar"; + sha256 = "0jy49zrkqiqg9131k24y6nyjnq2am4dwwdrqmginrrwzvi3y9d24"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/xref.html"; + license = lib.licenses.free; + }; + } + ) { }; + xref-union = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "xref-union"; + ename = "xref-union"; + version = "0.2.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/xref-union-0.2.0.tar"; + sha256 = "0ghhasqs0xq2i576fp97qx6x3h940kgyp76a49gj5cdmig8kyfi8"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/xref-union.html"; + license = lib.licenses.free; + }; + } + ) { }; + yasnippet = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "yasnippet"; + ename = "yasnippet"; + version = "0.14.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/yasnippet-0.14.1.tar"; + sha256 = "0xsq0i9xv9hib5a52rv5vywq1v6gr44gjsyfmqxwffmw1a25x25g"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.gnu.org/packages/yasnippet.html"; + license = lib.licenses.free; + }; + } + ) { }; + yasnippet-classic-snippets = callPackage ( + { + elpaBuild, + fetchurl, + lib, + yasnippet, + }: + elpaBuild { + pname = "yasnippet-classic-snippets"; + ename = "yasnippet-classic-snippets"; + version = "1.0.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/yasnippet-classic-snippets-1.0.2.tar"; + sha256 = "1qiw5592mj8gmq1lhdcpxfza7iqn4cmhn36vdskfa7zpd1lq26y1"; + }; + packageRequires = [ yasnippet ]; + meta = { + homepage = "https://elpa.gnu.org/packages/yasnippet-classic-snippets.html"; + license = lib.licenses.free; + }; + } + ) { }; + zones = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "zones"; + ename = "zones"; + version = "2023.6.11"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/zones-2023.6.11.tar"; + sha256 = "1z3kq0lfc4fbr9dnk9kj2hqcv60bnjp0x4kbxaxy77vv02a62rzc"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/zones.html"; + license = lib.licenses.free; + }; + } + ) { }; + ztree = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "ztree"; + ename = "ztree"; + version = "1.0.6"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/ztree-1.0.6.tar"; + sha256 = "1yyh09jff31j5w6mqsnibig3wizv7acsw39pjjfv1rmngni2b8zi"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.gnu.org/packages/ztree.html"; + license = lib.licenses.free; + }; + } + ) { }; + zuul = callPackage ( + { + elpaBuild, + fetchurl, + lib, + project, + }: + elpaBuild { + pname = "zuul"; + ename = "zuul"; + version = "0.4.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/zuul-0.4.0.tar"; + sha256 = "1mj54hm4cqidrmbxyqdjfsc3qcmjhbl0wii79bydx637dvpfvqgf"; + }; + packageRequires = [ project ]; + meta = { + homepage = "https://elpa.gnu.org/packages/zuul.html"; + license = lib.licenses.free; + }; + } + ) { }; +} diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix index 3e8ab4625fec2..d20a2249703b6 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix @@ -22,20 +22,13 @@ formats commits for you. */ -{ lib, stdenv, texinfo, writeText, gcc, pkgs, buildPackages }: +{ lib, pkgs, buildPackages }: self: let - markBroken = pkg: pkg.override { - elpaBuild = args: self.elpaBuild (args // { - meta = (args.meta or {}) // { broken = true; }; - }); - }; - - elpaBuild = import ../../../../build-support/emacs/elpa.nix { - inherit lib stdenv texinfo writeText gcc; - inherit (self) emacs; - }; + inherit (import ./lib-override-helper.nix pkgs) + markBroken + ; # Use custom elpa url fetcher with fallback/uncompress fetchurl = buildPackages.callPackage ./fetchelpa.nix { }; @@ -50,164 +43,25 @@ self: let }); }; - super = removeAttrs imported [ "dash" ]; + super = imported; + + commonOverrides = import ./elpa-common-overrides.nix pkgs lib buildPackages; - overrides = { + overrides = self: super: { # upstream issue: Wrong type argument: arrayp, nil org-transclusion = if super.org-transclusion.version == "1.2.0" then markBroken super.org-transclusion else super.org-transclusion; rcirc-menu = markBroken super.rcirc-menu; # Missing file header - cl-lib = null; # builtin - cl-print = null; # builtin - tle = null; # builtin - advice = null; # builtin - # Compilation instructions for the Ada executables: - # https://www.nongnu.org/ada-mode/ - ada-mode = super.ada-mode.overrideAttrs (old: { - # actually unpack source of ada-mode and wisi - # which are both needed to compile the tools - # we need at runtime - dontUnpack = false; - srcs = [ - super.ada-mode.src - self.wisi.src - ]; - - sourceRoot = "ada-mode-${self.ada-mode.version}"; - - nativeBuildInputs = [ - buildPackages.gnat - buildPackages.gprbuild - buildPackages.dos2unix - buildPackages.re2c - ]; - - buildInputs = [ - pkgs.gnatPackages.gnatcoll-xref - ]; - - buildPhase = '' - runHook preBuild - ./build.sh -j$NIX_BUILD_CORES - runHook postBuild - ''; - - postInstall = (old.postInstall or "") + "\n" + '' - ./install.sh "$out" - ''; - - meta = old.meta // { - maintainers = [ lib.maintainers.sternenseemann ]; - }; - }); - - eglot = super.eglot.overrideAttrs (old: { - postInstall = (old.postInstall or "") + '' - local info_file=eglot.info - pushd $out/share/emacs/site-lisp/elpa/eglot-* - # specify output info file to override the one defined in eglot.texi - makeinfo --output=$info_file eglot.texi - install-info $info_file dir - popd - ''; - }); - - jinx = super.jinx.overrideAttrs (old: let - libExt = pkgs.stdenv.hostPlatform.extensions.sharedLibrary; - in { - dontUnpack = false; - - nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ - pkgs.pkg-config - ]; - - buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.enchant2 ]; - - postBuild = '' - NIX_CFLAGS_COMPILE="$($PKG_CONFIG --cflags enchant-2) $NIX_CFLAGS_COMPILE" - $CC -shared -o jinx-mod${libExt} jinx-mod.c -lenchant-2 - ''; - - postInstall = (old.postInstall or "") + "\n" + '' - outd=$out/share/emacs/site-lisp/elpa/jinx-* - install -m444 -t $outd jinx-mod${libExt} - rm $outd/jinx-mod.c $outd/emacs-module.h - ''; - - meta = old.meta // { - maintainers = [ lib.maintainers.DamienCassou ]; - }; - }); - - org = super.org.overrideAttrs (old: { - dontUnpack = false; - patches = old.patches or [ ] ++ lib.optionals (lib.versionOlder old.version "9.7.5") [ - # security fix backported from 9.7.5 - (pkgs.fetchpatch { - url = "https://git.savannah.gnu.org/cgit/emacs/org-mode.git/patch/?id=f4cc61636947b5c2f0afc67174dd369fe3277aa8"; - hash = "sha256-bGgsnTSn6SMu1J8P2BfJjrKx2845FCsUB2okcIrEjDg="; - stripLen = 1; - }) - ]; - postPatch = old.postPatch or "" + "\n" + '' - pushd .. - local content_directory=${old.ename}-${old.version} - src=$PWD/$content_directory.tar - tar --create --verbose --file=$src $content_directory - popd - ''; - dontBuild = true; - }); - - plz = super.plz.overrideAttrs ( - old: { - dontUnpack = false; - postPatch = old.postPatch or "" + '' - substituteInPlace ./plz.el \ - --replace 'plz-curl-program "curl"' 'plz-curl-program "${pkgs.curl}/bin/curl"' - ''; - preInstall = '' - tar -cf "$pname-$version.tar" --transform "s,^,$pname-$version/," * .[!.]* - src="$pname-$version.tar" - ''; - } - ); - - xeft = super.xeft.overrideAttrs (old: let - libExt = pkgs.stdenv.hostPlatform.extensions.sharedLibrary; - in { - dontUnpack = false; - - buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.xapian ]; - buildPhase = (old.buildPhase or "") + '' - $CXX -shared -o xapian-lite${libExt} xapian-lite.cc $NIX_CFLAGS_COMPILE -lxapian - ''; - postInstall = (old.postInstall or "") + "\n" + '' - outd=$out/share/emacs/site-lisp/elpa/xeft-* - install -m444 -t $outd xapian-lite${libExt} - rm $outd/xapian-lite.cc $outd/emacs-module.h $outd/emacs-module-prelude.h $outd/demo.gif $outd/Makefile - ''; - }); - - # native compilation for tests/seq-tests.el never ends - # delete tests/seq-tests.el to workaround this - seq = super.seq.overrideAttrs (old: { - dontUnpack = false; - postUnpack = (old.postUnpack or "") + "\n" + '' - local content_directory=$(echo seq-*) - rm --verbose $content_directory/tests/seq-tests.el - src=$PWD/$content_directory.tar - tar --create --verbose --file=$src $content_directory - ''; - }); }; - elpaPackages = super // overrides; + elpaPackages = + let super' = super // (commonOverrides self super); in super' // (overrides self super'); - in elpaPackages // { inherit elpaBuild; }); + in elpaPackages); -in (generateElpa { }) // { __attrsFailEvaluation = true; } +in +generateElpa { } diff --git a/pkgs/applications/editors/emacs/elisp-packages/emacs2nix.nix b/pkgs/applications/editors/emacs/elisp-packages/emacs2nix.nix index 6875030b24942..2879985e4b869 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/emacs2nix.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/emacs2nix.nix @@ -4,8 +4,8 @@ let src = pkgs.fetchFromGitHub { owner = "nix-community"; repo = "emacs2nix"; - rev = "e5389c3d7be9c3af135f022d86c61767d41c364f"; - sha256 = "sha256-mueyrGXgbjvmXQqPRuLUJdJuB5dqiGGdzCQ74Ud+Z9Y="; + rev = "8454f2857252f32621b8022f797fef9b96862204"; + hash = "sha256-UHHEkY+t/IzWe8jC8bm+p275sKfnL5/v5wbwRDw6FZw="; fetchSubmodules = true; }; in @@ -13,6 +13,7 @@ pkgs.mkShell { packages = [ pkgs.bash + pkgs.nixfmt-rfc-style ]; EMACS2NIX = src; diff --git a/pkgs/applications/editors/emacs/elisp-packages/lib-override-helper.nix b/pkgs/applications/editors/emacs/elisp-packages/lib-override-helper.nix new file mode 100644 index 0000000000000..74d185641e3d6 --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/lib-override-helper.nix @@ -0,0 +1,28 @@ +pkgs: + +rec { + buildWithGit = + pkg: + pkg.overrideAttrs (previousAttrs: { + nativeBuildInputs = previousAttrs.nativeBuildInputs or [ ] ++ [ pkgs.git ]; + }); + + dontConfigure = pkg: pkg.overrideAttrs { dontConfigure = true; }; + + externalSrc = + pkg: epkg: + pkg.overrideAttrs (previousAttrs: { + inherit (epkg) src version; + propagatedUserEnvPkgs = previousAttrs.propagatedUserEnvPkgs or [ ] ++ [ epkg ]; + }); + + fix-rtags = pkg: dontConfigure (externalSrc pkg pkgs.rtags); + + markBroken = + pkg: + pkg.overrideAttrs (previousAttrs: { + meta = previousAttrs.meta or { } // { + broken = true; + }; + }); +} diff --git a/pkgs/applications/editors/emacs/elisp-packages/libgenerated.nix b/pkgs/applications/editors/emacs/elisp-packages/libgenerated.nix index 36576f7c12398..1a2a138b206af 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/libgenerated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/libgenerated.nix @@ -1,63 +1,111 @@ lib: self: let + inherit (lib) elemAt; - fetcherGenerators = { repo ? null - , url ? null - , ... }: - { sha256 - , commit - , ...}: { - github = self.callPackage ({ fetchFromGitHub }: - fetchFromGitHub { - owner = lib.head (lib.splitString "/" repo); - repo = lib.head (lib.tail (lib.splitString "/" repo)); - rev = commit; - inherit sha256; - } - ) {}; - gitlab = self.callPackage ({ fetchFromGitLab }: - fetchFromGitLab { - owner = lib.head (lib.splitString "/" repo); - repo = lib.head (lib.tail (lib.splitString "/" repo)); - rev = commit; - inherit sha256; - } - ) {}; - git = self.callPackage ({ fetchgit }: - (fetchgit { - rev = commit; - inherit sha256 url; - }).overrideAttrs(_: { - GIT_SSL_NO_VERIFY = true; - }) - ) {}; - bitbucket = self.callPackage ({ fetchhg }: - fetchhg { - rev = commit; - url = "https://bitbucket.com/${repo}"; - inherit sha256; - } - ) {}; - hg = self.callPackage ({ fetchhg }: - fetchhg { - rev = commit; - inherit sha256 url; - } - ) {}; - sourcehut = self.callPackage ({ fetchzip }: - fetchzip { - url = "https://git.sr.ht/~${repo}/archive/${commit}.tar.gz"; - inherit sha256; - } - ) {}; - codeberg = self.callPackage ({ fetchzip }: - fetchzip { - url = "https://codeberg.org/${repo}/archive/${commit}.tar.gz"; - inherit sha256; - } - ) {}; - }; + matchForgeRepo = builtins.match "(.+)/(.+)"; + + fetchers = lib.mapAttrs (_: fetcher: self.callPackage fetcher { }) { + github = + { fetchFromGitHub }: + { + repo ? null, + ... + }: + { sha256, commit, ... }: + let + m = matchForgeRepo repo; + in + assert m != null; + fetchFromGitHub { + owner = elemAt m 0; + repo = elemAt m 1; + rev = commit; + inherit sha256; + }; + + gitlab = + { fetchFromGitLab }: + { + repo ? null, + ... + }: + { sha256, commit, ... }: + let + m = matchForgeRepo repo; + in + assert m != null; + fetchFromGitLab { + owner = elemAt m 0; + repo = elemAt m 1; + rev = commit; + inherit sha256; + }; + + git = ( + { fetchgit }: + { + url ? null, + ... + }: + { sha256, commit, ... }: + (fetchgit { + rev = commit; + inherit sha256 url; + }).overrideAttrs(_: { + GIT_SSL_NO_VERIFY = true; + }) + ); + + bitbucket = + { fetchhg }: + { + repo ? null, + ... + }: + { sha256, commit, ... }: + fetchhg { + rev = commit; + url = "https://bitbucket.com/${repo}"; + inherit sha256; + }; + + hg = + { fetchhg }: + { + url ? null, + ... + }: + { sha256, commit, ... }: + fetchhg { + rev = commit; + inherit sha256 url; + }; + + sourcehut = + { fetchzip }: + { + repo ? null, + ... + }: + { sha256, commit, ... }: + fetchzip { + url = "https://git.sr.ht/~${repo}/archive/${commit}.tar.gz"; + inherit sha256; + }; + + codeberg = + { fetchzip }: + { + repo ? null, + ... + }: + { sha256, commit, ... }: + fetchzip { + url = "https://codeberg.org/${repo}/archive/${commit}.tar.gz"; + inherit sha256; + }; + }; in { @@ -79,7 +127,8 @@ in { lib.nameValuePair ename ( self.callPackage ({ melpaBuild, fetchurl, ... }@pkgargs: melpaBuild { - inherit pname ename commit; + inherit pname ename; + inherit (sourceArgs) commit; version = lib.optionalString (version != null) (lib.concatStringsSep "." (map toString # Hack: Melpa archives contains versions with parse errors such as [ 4 4 -4 413 ] which should be 4.4-413 @@ -87,7 +136,7 @@ in { (builtins.filter (n: n >= 0) version))); # TODO: Broken should not result in src being null (hack to avoid eval errors) src = if (sha256 == null || broken) then null else - lib.getAttr fetcher (fetcherGenerators args sourceArgs); + fetchers.${fetcher} args sourceArgs; recipe = if commit == null then null else fetchurl { name = pname + "-recipe"; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix index 73e7f9a2c6722..5981faab2d1c9 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix @@ -4,127 +4,48 @@ self: let inherit (self) callPackage; in -{ +lib.packagesFromDirectoryRecursive { + inherit callPackage; + directory = ./manual-packages; +} +// { inherit (pkgs) emacspeak; - acm = callPackage ./manual-packages/acm { }; - - acm-terminal = callPackage ./manual-packages/acm-terminal { }; - - agda-input = callPackage ./manual-packages/agda-input { }; - - agda2-mode = callPackage ./manual-packages/agda2-mode { }; - - beancount = callPackage ./manual-packages/beancount { }; - - cask = callPackage ./manual-packages/cask { }; - - codeium = callPackage ./manual-packages/codeium { }; - - consult-gh = callPackage ./manual-packages/consult-gh { }; - - control-lock = callPackage ./manual-packages/control-lock { }; - - copilot = callPackage ./manual-packages/copilot { }; - - ebuild-mode = callPackage ./manual-packages/ebuild-mode { }; - - el-easydraw = callPackage ./manual-packages/el-easydraw { }; - - elisp-ffi = callPackage ./manual-packages/elisp-ffi { }; - - emacs-conflict = callPackage ./manual-packages/emacs-conflict { }; - - enlight = callPackage ./manual-packages/enlight { }; - - ess-R-object-popup = callPackage ./manual-packages/ess-R-object-popup { }; - - evil-markdown = callPackage ./manual-packages/evil-markdown { }; - - font-lock-plus = callPackage ./manual-packages/font-lock-plus { }; - - ghc-mod = callPackage ./manual-packages/ghc-mod { }; - - git-undo = callPackage ./manual-packages/git-undo { }; - - grid = callPackage ./manual-packages/grid { }; - - haskell-unicode-input-method = callPackage ./manual-packages/haskell-unicode-input-method { }; - - helm-words = callPackage ./manual-packages/helm-words { }; - - idris2-mode = callPackage ./manual-packages/idris2-mode { }; - - isearch-plus = callPackage ./manual-packages/isearch-plus { }; - - isearch-prop = callPackage ./manual-packages/isearch-prop { }; - - jam-mode = callPackage ./manual-packages/jam-mode { }; - - ligo-mode = callPackage ./manual-packages/ligo-mode { }; - - llvm-mode = callPackage ./manual-packages/llvm-mode { }; - - lsp-bridge = callPackage ./manual-packages/lsp-bridge { - inherit (pkgs) python3 git go gopls pyright; + codeium = callPackage ./manual-packages/codeium { + inherit (pkgs) codeium; }; - lspce = callPackage ./manual-packages/lspce { }; - - matrix-client = callPackage ./manual-packages/matrix-client { - _map = self.map; + consult-gh = callPackage ./manual-packages/consult-gh { + inherit (pkgs) gh; }; - mu4e = callPackage ./manual-packages/mu4e { }; - - notdeft = callPackage ./manual-packages/notdeft { }; - - ott-mode = callPackage ./manual-packages/ott-mode { }; - - perl-completion = callPackage ./manual-packages/perl-completion { }; - - pod-mode = callPackage ./manual-packages/pod-mode { }; - - prisma-mode = callPackage ./manual-packages/prisma-mode { }; + lsp-bridge = callPackage ./manual-packages/lsp-bridge { + inherit (pkgs) basedpyright git go gopls python3; + }; structured-haskell-mode = self.shm; - sv-kalender = callPackage ./manual-packages/sv-kalender { }; - texpresso = callPackage ./manual-packages/texpresso { inherit (pkgs) texpresso; }; tree-sitter-langs = callPackage ./manual-packages/tree-sitter-langs { final = self; }; - treesit-grammars = callPackage ./manual-packages/treesit-grammars { }; - - tsc = callPackage ./manual-packages/tsc { }; - - urweb-mode = callPackage ./manual-packages/urweb-mode { }; - - voicemacs = callPackage ./manual-packages/voicemacs { }; - - wat-mode = callPackage ./manual-packages/wat-mode { }; - - xapian-lite = callPackage ./manual-packages/xapian-lite { }; - - yes-no = callPackage ./manual-packages/yes-no { }; - - youtube-dl = callPackage ./manual-packages/youtube-dl { }; + zstd = callPackage ./manual-packages/zstd { inherit (pkgs) zstd; }; # From old emacsPackages (pre emacsPackagesNg) cedille = callPackage ./manual-packages/cedille { inherit (pkgs) cedille; }; - color-theme-solarized = callPackage ./manual-packages/color-theme-solarized { }; - hsc3-mode = callPackage ./manual-packages/hsc3 { }; - prolog-mode = callPackage ./manual-packages/prolog { }; - rect-mark = callPackage ./manual-packages/rect-mark { }; - session-management-for-emacs = callPackage ./manual-packages/session-management-for-emacs { }; - sunrise-commander = callPackage ./manual-packages/sunrise-commander { }; # camelCase aliases for some of the kebab-case expressions above colorThemeSolarized = self.color-theme-solarized; emacsSessionManagement = self.session-management-for-emacs; rectMark = self.rect-mark; sunriseCommander = self.sunrise-commander; - - __attrsFailEvaluation = true; +} +### Aliases +// lib.optionalAttrs pkgs.config.allowAliases { + agda-input = throw "emacsPackages.agda-input is contained in emacsPackages.agda2-mode, please use that instead."; # Added 2024-07-17 + ess-R-object-popup = throw "emacsPackages.ess-R-object-popup was deleted, since the upstream repo looks abandoned."; # Added 2024-07-15 + ghc-mod = throw "emacsPackages.ghc-mod was deleted because it is deprecated, use haskell-language-server instead."; # Added 2024-07-17 + haskell-unicode-input-method = throw "emacsPackages.haskell-unicode-input-method is contained in emacsPackages.haskell-mode, please use that instead."; # Added 2024-07-17 + matrix-client = throw "emacsPackages.matrix-client is deprecated in favor of emacsPackages.ement."; # Added 2024-08-17 + perl-completion = throw "emacsPackages.perl-completion was removed, since it is broken."; # Added 2024-07-19 } diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/acm-terminal/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/acm-terminal/default.nix deleted file mode 100644 index 970174f20c9f4..0000000000000 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/acm-terminal/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ lib -, melpaBuild -, fetchFromGitHub -, acm -, popon -, writeText -, writeScript -}: - -let - rev = "1851d8fa2a27d3fd8deeeb29cd21c3002b8351ba"; -in -melpaBuild { - pname = "acm-terminal"; - version = "20231206.1141"; - - src = fetchFromGitHub { - owner = "twlz0ne"; - repo = "acm-terminal"; - inherit rev; - sha256 = "sha256-EYhFrOo0j0JSNTdcZCbyM0iLxaymUXi1u6jZy8lTOaY="; - }; - - commit = rev; - - packageRequires = [ - acm - popon - ]; - - recipe = writeText "recipe" '' - (acm-terminal :repo "twlz0ne/acm-terminal" :fetcher github) - ''; - - passthru.updateScript = writeScript "update.sh" '' - #!/usr/bin/env nix-shell - #!nix-shell -i bash -p common-updater-scripts coreutils git gnused - set -eu -o pipefail - tmpdir="$(mktemp -d)" - git clone --depth=1 https://github.com/twlz0ne/acm-terminal.git "$tmpdir" - pushd "$tmpdir" - commit=$(git show -s --pretty='format:%H') - # Based on: https://github.com/melpa/melpa/blob/2d8716906a0c9e18d6c979d8450bf1d15dd785eb/package-build/package-build.el#L523-L533 - version=$(TZ=UTC git show -s --pretty='format:%cd' --date='format-local:%Y%m%d.%H%M' | sed 's|\.0*|.|') - popd - update-source-version emacsPackages.acm-terminal $version --rev="$commit" - ''; - - meta = with lib; { - description = "Patch for LSP bridge acm on Terminal"; - homepage = "https://github.com/twlz0ne/acm-terminal"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ kira-bruneau ]; - }; -} diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/acm-terminal/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/acm-terminal/package.nix new file mode 100644 index 0000000000000..f24a1e6682b70 --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/acm-terminal/package.nix @@ -0,0 +1,36 @@ +{ + lib, + melpaBuild, + fetchFromGitHub, + acm, + popon, + unstableGitUpdater, +}: + +melpaBuild { + pname = "acm-terminal"; + version = "0-unstable-2023-12-06"; + + src = fetchFromGitHub { + owner = "twlz0ne"; + repo = "acm-terminal"; + rev = "1851d8fa2a27d3fd8deeeb29cd21c3002b8351ba"; + hash = "sha256-EYhFrOo0j0JSNTdcZCbyM0iLxaymUXi1u6jZy8lTOaY="; + }; + + packageRequires = [ + acm + popon + ]; + + ignoreCompilationError = false; + + passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; }; + + meta = { + homepage = "https://github.com/twlz0ne/acm-terminal"; + description = "Patch for LSP bridge acm on Terminal"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ kira-bruneau ]; + }; +} diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/acm/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/acm/default.nix deleted file mode 100644 index 5879865c901e2..0000000000000 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/acm/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib -, melpaBuild -, lsp-bridge -, yasnippet -, writeText -}: - -melpaBuild { - pname = "acm"; - version = lsp-bridge.version; - - src = lsp-bridge.src; - commit = lsp-bridge.src.rev; - - packageRequires = [ - yasnippet - ]; - - recipe = writeText "recipe" '' - (acm - :repo "manateelazycat/lsp-bridge" - :fetcher github - :files ("acm/*.el" "acm/icons")) - ''; - - meta = with lib; { - description = "Asynchronous Completion Menu"; - homepage = "https://github.com/manateelazycat/lsp-bridge"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ fxttr kira-bruneau ]; - }; -} diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/acm/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/acm/package.nix new file mode 100644 index 0000000000000..8a37b99d8b1da --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/acm/package.nix @@ -0,0 +1,29 @@ +{ + lib, + melpaBuild, + lsp-bridge, + yasnippet, +}: + +melpaBuild { + pname = "acm"; + version = lsp-bridge.version; + + src = lsp-bridge.src; + + packageRequires = [ yasnippet ]; + + files = ''("acm/*.el" "acm/icons")''; + + ignoreCompilationError = false; + + meta = { + description = "Asynchronous Completion Menu"; + homepage = "https://github.com/manateelazycat/lsp-bridge"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ + fxttr + kira-bruneau + ]; + }; +} diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/agda-input/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/agda-input/default.nix deleted file mode 100644 index a3c820fac6e73..0000000000000 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/agda-input/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ trivialBuild -, haskellPackages -}: - -trivialBuild { - pname = "agda-input"; - - inherit (haskellPackages.Agda) src version; - - postUnpack = '' - mv $sourceRoot/src/data/emacs-mode/agda-input.el $sourceRoot - ''; - - meta = { - inherit (haskellPackages.Agda.meta) homepage license; - description = "Standalone package providing the agda-input method without building Agda"; - }; -} diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/agda2-mode/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/agda2-mode/default.nix deleted file mode 100644 index 7418a842148a7..0000000000000 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/agda2-mode/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ trivialBuild -, haskellPackages -}: -let - Agda = haskellPackages.Agda.bin; -in -trivialBuild { - pname = "agda-mode"; - version = Agda.version; - - dontUnpack = true; - - # already byte-compiled by Agda builder - buildPhase = '' - agda=`${Agda}/bin/agda-mode locate` - cp `dirname $agda`/*.el* . - ''; - - meta = { - inherit (Agda.meta) homepage license; - description = "Agda2-mode for Emacs extracted from Agda package"; - longDescription = '' - Wrapper packages that liberates init.el from `agda-mode locate` magic. - Simply add this to user profile or systemPackages and do `(require - 'agda2)` in init.el. - ''; - }; -} - diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/agda2-mode/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/agda2-mode/package.nix new file mode 100644 index 0000000000000..d02b2b29ce6a2 --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/agda2-mode/package.nix @@ -0,0 +1,17 @@ +{ melpaBuild, haskellPackages }: +let + Agda = haskellPackages.Agda; +in +melpaBuild { + pname = "agda2-mode"; + inherit (Agda) src version; + + files = ''("src/data/emacs-mode/*.el")''; + + ignoreCompilationError = false; + + meta = { + inherit (Agda.meta) homepage license; + description = "Agda2-mode for Emacs extracted from Agda package"; + }; +} diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/beancount/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/beancount/default.nix deleted file mode 100644 index 0e3c66e032429..0000000000000 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/beancount/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib -, melpaBuild -, fetchFromGitHub -, emacs -, writeText -}: - -let - rev = "519bfd868f206ed2fc538a57cdb631c4fec3c93e"; -in -melpaBuild { - pname = "beancount"; - version = "20230205.436"; - - src = fetchFromGitHub { - owner = "beancount"; - repo = "beancount-mode"; - inherit rev; - hash = "sha256-nTEXJdPEPZpNm06uYvRxLuiOHmsiIgMLerd//dA0+KQ="; - }; - - commit = rev; - - recipe = writeText "recipe" '' - (beancount :repo "beancount/beancount-mode" :fetcher github) - ''; - - meta = { - homepage = "https://github.com/beancount/beancount-mode"; - description = "Emacs major-mode to work with Beancount ledger files"; - maintainers = with lib.maintainers; [ polarmutex ]; - license = lib.licenses.gpl3Only; - inherit (emacs.meta) platforms; - }; -} diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/cask/0000-cask-lispdir.diff b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/cask/0000-cask-lispdir.diff new file mode 100644 index 0000000000000..7737594179ecf --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/cask/0000-cask-lispdir.diff @@ -0,0 +1,43 @@ +diff -Naur cask-source-0.9.0-old/bin/cask cask-source-0.9.0-new/bin/cask +--- cask-source-0.9.0-old/bin/cask 1969-12-31 21:00:01.000000000 -0300 ++++ cask-source-0.9.0-new/bin/cask 2024-09-02 12:46:48.316364621 -0300 +@@ -21,8 +21,6 @@ + set -euo pipefail + CASK=$0 + EMACS=${CASK_EMACS:-${EMACS:-emacs}} +-READLINK=${READLINK:-readlink} +-GREADLINK=${GREADLINK:-greadlink} + + if [ "$#" -eq "0" ] ; then + subcommand=install +@@ -31,21 +29,10 @@ + shift + fi + +-set +eu +-SRCDIR__=$($READLINK -f "$CASK" 2>/dev/null) +-if [ -z "$SRCDIR__" ] ; then +- SRCDIR__=$($GREADLINK -f "$CASK" 2>/dev/null) +-fi +-set -eu +-if [ -z "$SRCDIR__" ]; then +- SRCDIR__=$(python -c "import os, sys; print(os.path.realpath(sys.argv[1]))" "$CASK") +-fi +-SRCDIR_=$(dirname "$SRCDIR__") +-SRCDIR=$(dirname "$SRCDIR_") + case $subcommand in + emacs) + EMACS="$EMACS" \ +- "$EMACS" -Q -L "$SRCDIR" -l "$SRCDIR/cask" \ ++ "$EMACS" -Q -L "@lispdir@" -l "@lispdir@/cask" \ + --eval "(cask--initialize (expand-file-name default-directory))" \ + "$@" + ;; +@@ -53,6 +40,6 @@ + EMACSLOADPATH="$($CASK load-path)" PATH="$($CASK path)" EMACS="$EMACS" "$@" + ;; + *) +- "$EMACS" -Q --script "$SRCDIR/cask-cli.el" -- $subcommand "$@" ++ "$EMACS" -Q --script "@lispdir@/cask-cli.el" -- $subcommand "$@" + ;; + esac diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/cask/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/cask/default.nix deleted file mode 100644 index 3ab796bcbd196..0000000000000 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/cask/default.nix +++ /dev/null @@ -1,77 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, bash -, emacs -, python3 -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "cask"; - version = "0.8.8"; - - src = fetchFromGitHub { - owner = "cask"; - repo = "cask"; - rev = "v${finalAttrs.version}"; - hash = "sha256-TlReq5sLVJj+pXmJSnepKQkNEWVhnh30iq4egM1HJMU="; - }; - - doCheck = true; - - nativeBuildInputs = [ emacs ]; - buildInputs = [ - bash - python3 - ] - ++ (with emacs.pkgs; [ - ansi - dash - ecukes - el-mock - ert-async - ert-runner - f - git - noflet - package-build - s - servant - shell-split-string - ]); - - strictDeps = true; - - buildPhase = '' - runHook preBuild - - emacs --batch -L . -f batch-byte-compile cask.el cask-cli.el - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - mkdir -p $out/bin - install -Dm444 -t $out/share/emacs/site-lisp/cask *.el *.elc - install -Dm555 -t $out/share/emacs/site-lisp/cask/bin bin/cask - ln -s $out/share/emacs/site-lisp/cask/bin/cask $out/bin/cask - - runHook postInstall - ''; - - meta = with lib; { - description = "Project management for Emacs"; - mainProgram = "cask"; - longDescription = '' - Cask is a project management tool for Emacs that helps automate the - package development cycle; development, dependencies, testing, building, - packaging and more. - ''; - homepage = "https://cask.readthedocs.io/en/latest/index.html"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ AndersonTorres ]; - inherit (emacs.meta) platforms; - }; -}) diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/cask/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/cask/package.nix new file mode 100644 index 0000000000000..4334fce6ecbb3 --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/cask/package.nix @@ -0,0 +1,80 @@ +{ + lib, + ansi, + cl-generic, + cl-lib, + commander, + + epl, + f, + fetchFromGitHub, + git, + gitUpdater, + melpaBuild, + package-build, + s, + shut-up, +}: + +melpaBuild (finalAttrs: { + pname = "cask"; + version = "0.9.0"; + + src = fetchFromGitHub { + name = "cask-source-${finalAttrs.version}"; + owner = "cask"; + repo = "cask"; + rev = "v${finalAttrs.version}"; + hash = "sha256-91rJFsp2SLk/JY+v6G5JmXH5bg9QnT+qhI8ccNJlI4A="; + }; + + patches = [ + # Uses LISPDIR substitution var + ./0000-cask-lispdir.diff + ]; + + packageRequires = [ + ansi + cl-generic + cl-lib + commander + epl + f + git + package-build + s + shut-up + ]; + + ignoreCompilationError = false; + + strictDeps = true; + + # use melpaVersion so that it works for unstable releases too + postPatch = '' + lispdir=$out/share/emacs/site-lisp/elpa/cask-${finalAttrs.melpaVersion} \ + substituteAllInPlace bin/cask + ''; + + # TODO: use installBin as soon as installBin arrives Master branch + postInstall = '' + install -D -t $out/bin bin/cask + ''; + + passthru.updateScript = gitUpdater { + rev-prefix = "v"; + }; + + meta = { + homepage = "https://github.com/cask/cask"; + description = "Project management for Emacs"; + longDescription = '' + Cask is a project management tool for Emacs that helps automate the + package development cycle; development, dependencies, testing, building, + packaging and more. + ''; + license = lib.licenses.gpl3Plus; + mainProgram = "cask"; + maintainers = with lib.maintainers; [ AndersonTorres ]; + }; +}) diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/codeium/codeium.el.patch b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/codeium/0000-set-codeium-command-executable.patch index 57975251ef390..57975251ef390 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/codeium/codeium.el.patch +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/codeium/0000-set-codeium-command-executable.patch diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/codeium/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/codeium/default.nix index 1a31e8f9a28df..de7c69fd4dd62 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/codeium/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/codeium/default.nix @@ -1,36 +1,40 @@ -{ fetchFromGitHub, melpaBuild, pkgs, lib, substituteAll, writeText }: +{ + lib, + codeium, + fetchFromGitHub, + melpaBuild, + substituteAll, + gitUpdater, +}: melpaBuild { pname = "codeium"; version = "1.6.13"; + src = fetchFromGitHub { owner = "Exafunction"; repo = "codeium.el"; rev = "1.6.13"; hash = "sha256-CjT21GhryO8/iM0Uzm/s/I32WqVo4M3tSlHC06iEDXA="; }; - commit = "02f9382c925633a19dc928e99b868fd5f6947e58"; - buildInputs = [ pkgs.codeium ]; - - recipe = writeText "recipe" '' - (codeium - :repo "Exafunction/codeium.el" - :fetcher github) - ''; patches = [ (substituteAll { - src = ./codeium.el.patch; - codeium = "${pkgs.codeium}/bin/codeium_language_server"; + src = ./0000-set-codeium-command-executable.patch; + codeium = lib.getExe' codeium "codeium_language_server"; }) ]; + ignoreCompilationError = false; + + passthru.updateScript = gitUpdater { }; + meta = { description = "Free, ultrafast Copilot alternative for Emacs"; homepage = "https://github.com/Exafunction/codeium.el"; license = lib.licenses.mit; maintainers = [ lib.maintainers.running-grass ]; - platforms = pkgs.codeium.meta.platforms; + inherit (codeium.meta) platforms; sourceProvenance = [ lib.sourceTypes.fromSource ]; }; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/color-theme-solarized/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/color-theme-solarized/default.nix deleted file mode 100644 index 94486bdbfb4b4..0000000000000 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/color-theme-solarized/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib -, trivialBuild -, fetchFromGitHub -, color-theme -}: - -trivialBuild { - pname = "color-theme-solarized"; - version = "0-unstable-2017-10-24"; - - src = fetchFromGitHub { - owner = "sellout"; - repo = "emacs-color-theme-solarized"; - rev = "f3ca8902ea056fb8e46cb09f09c96294e31cd4ee"; - hash = "sha256-oxX0lo6sxotEiR3nPrKPE9H01HKB3ohB/p8eEHFTp5k="; - }; - - packageRequires = [ color-theme ]; - - meta = with lib; { - homepage = "http://ethanschoonover.com/solarized"; - description = "Precision colors for machines and people; Emacs implementation"; - license = licenses.mit; - maintainers = with maintainers; [ samuelrivas AndersonTorres ]; - }; -} diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/color-theme-solarized/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/color-theme-solarized/package.nix new file mode 100644 index 0000000000000..7c047fe32f4ef --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/color-theme-solarized/package.nix @@ -0,0 +1,27 @@ +{ + lib, + fetchFromGitHub, + melpaBuild, + unstableGitUpdater, +}: + +melpaBuild { + pname = "color-theme-solarized"; + version = "0-unstable-2023-02-09"; + + src = fetchFromGitHub { + owner = "sellout"; + repo = "emacs-color-theme-solarized"; + rev = "b186e5d62d0b83cbf5cf38f7eb7a199dea9a3ee3"; + hash = "sha256-7E8r56dzfD06tsQEnqU5mWSbwz9x9QPbzken2J/fhlg="; + }; + + passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; }; + + meta = { + homepage = "http://ethanschoonover.com/solarized"; + description = "Precision colors for machines and people; Emacs implementation"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ AndersonTorres ]; + }; +} diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/consult-gh/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/consult-gh/default.nix index e6e53f96f6590..cbeee76c172d0 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/consult-gh/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/consult-gh/default.nix @@ -1,45 +1,36 @@ -{ lib -, melpaBuild -, fetchFromGitHub -, consult -, embark -, forge -, gh -, markdown-mode -, writeText -, unstableGitUpdater +{ + lib, + consult, + embark-consult, + fetchFromGitHub, + forge, + gh, + markdown-mode, + melpaBuild, + unstableGitUpdater, }: -let - commit = "1fe876d9552b6ec6af257a4299a34eca99b40539"; -in melpaBuild { pname = "consult-gh"; - version = "20230706.438"; - - inherit commit; + version = "1.0-unstable-2024-08-24"; src = fetchFromGitHub { owner = "armindarvish"; repo = "consult-gh"; - rev = commit; - hash = "sha256-bi+qlNvNMXbS4cXbXt01txwD2NAyAqJGNKeOtdtj7tg="; + rev = "b1d85d179438e4b6469e1b78906a7dde8f07c822"; + hash = "sha256-VmxuXvO0nl0h9IKU+XWfjW90KG/1B+qHoOVhvYJ8XTs="; }; packageRequires = [ consult - embark + embark-consult forge - gh markdown-mode ]; - recipe = writeText "recipe" '' - (consult-gh - :repo "armindarvish/consult-gh" - :fetcher github - :files ("consult-gh-embark.el" "consult-gh-forge.el" "consult-gh.el")) - ''; + propagatedUserEnvPkgs = [ gh ]; + + ignoreCompilationError = false; passthru.updateScript = unstableGitUpdater { }; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/control-lock/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/control-lock/package.nix index 279c2b74d1d9f..058aa722ef8a6 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/control-lock/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/control-lock/package.nix @@ -1,18 +1,24 @@ -{ lib, trivialBuild, fetchurl }: +{ + lib, + fetchurl, + melpaBuild, +}: -trivialBuild { +melpaBuild { pname = "control-lock"; + version = "1.1.2"; src = fetchurl { url = "https://raw.githubusercontent.com/emacsmirror/emacswiki.org/185fdc34fb1e02b43759ad933d3ee5646b0e78f8/control-lock.el"; hash = "sha256-JCrmS3FSGDHSR+eAR0X/uO0nAgd3TUmFxwEVH5+KV+4="; }; - version = "1.1.2"; + ignoreCompilationError = false; meta = { - description = "Like caps-lock, but for your control key. Give your pinky a rest!"; homepage = "https://www.emacswiki.org/emacs/control-lock.el"; + description = "Like caps-lock, but for your control key"; + license = lib.licenses.free; platforms = lib.platforms.all; }; } diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/copilot/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/copilot/default.nix deleted file mode 100644 index da7f779852158..0000000000000 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/copilot/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ - dash, - editorconfig, - fetchFromGitHub, - nodejs, - s, - trivialBuild, -}: -trivialBuild { - pname = "copilot"; - version = "0-unstable-2023-12-26"; - src = fetchFromGitHub { - owner = "zerolfx"; - repo = "copilot.el"; - rev = "d4fa14cea818e041b4a536c5052cf6d28c7223d7"; - sha256 = "sha256-Tzs0Dawqa+OD0RSsf66ORbH6MdBp7BMXX7z+5UuNwq4="; - }; - packageRequires = [ - dash - editorconfig - nodejs - s - ]; - postInstall = '' - cp -r $src/dist $LISPDIR - ''; - - meta = { - description = "Unofficial copilot plugin for Emacs"; - homepage = "https://github.com/zerolfx/copilot.el"; - platforms = [ - "x86_64-darwin" - "x86_64-linux" - "x86_64-windows" - ]; - }; -} diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/copilot/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/copilot/package.nix new file mode 100644 index 0000000000000..37f8c81ce08e8 --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/copilot/package.nix @@ -0,0 +1,48 @@ +{ + lib, + dash, + editorconfig, + f, + fetchFromGitHub, + nodejs, + s, + melpaBuild, +}: +melpaBuild { + pname = "copilot"; + version = "0-unstable-2024-05-01"; + + src = fetchFromGitHub { + owner = "copilot-emacs"; + repo = "copilot.el"; + rev = "733bff26450255e092c10873580e9abfed8a81b8"; + sha256 = "sha256-Knp36PtgA73gtYO+W1clQfr570bKCxTFsGW3/iH86A0="; + }; + + files = ''(:defaults "dist")''; + + packageRequires = [ + dash + editorconfig + f + s + ]; + + propagatedUserEnvPkgs = [ nodejs ]; + + ignoreCompilationError = false; + + meta = { + description = "Unofficial copilot plugin for Emacs"; + homepage = "https://github.com/copilot-emacs/copilot.el"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ bbigras ]; + platforms = [ + "aarch64-darwin" + "aarch64-linux" + "x86_64-darwin" + "x86_64-linux" + "x86_64-windows" + ]; + }; +} diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/package.nix index fbd16c3f47af0..d37153261edf3 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/package.nix @@ -2,26 +2,18 @@ lib, melpaBuild, fetchzip, - writeText, }: melpaBuild rec { pname = "ebuild-mode"; - version = "1.71"; + version = "1.72"; src = fetchzip { url = "https://gitweb.gentoo.org/proj/ebuild-mode.git/snapshot/ebuild-mode-${version}.tar.bz2"; - hash = "sha256-HvaiH3I6hJMb1XFFf8FOw22X+47UayCIWAGuXAVP/ls="; + hash = "sha256-GFEDWT88Boz/DxEcmFgf7u2NOoMjAN05yRiYwoYtvXc="; }; - # not used but needs to be set; why? - commit = "a643f177b58aa8869f2f24814e990320aa4f0f96"; - - recipe = writeText "recipe" '' - (ebuild-mode - :url "https://gitweb.gentoo.org/proj/ebuild-mode.git" - :fetcher git) - ''; + ignoreCompilationError = false; meta = { homepage = "https://gitweb.gentoo.org/proj/ebuild-mode.git/"; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/el-easydraw/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/el-easydraw/default.nix deleted file mode 100644 index 148bb9dbc7f98..0000000000000 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/el-easydraw/default.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ lib -, melpaBuild -, fetchFromGitHub -, writeText -, writeScript -, gzip -}: - -let - rev = "99067dba625db3ac54ca4d3a3c811c41de207309"; -in -melpaBuild { - pname = "edraw"; - version = "20240612.1012"; - - src = fetchFromGitHub { - owner = "misohena"; - repo = "el-easydraw"; - inherit rev; - hash = "sha256-32N8kXGFCvB6IHKwUsBGpdtAAf/p3nlq8mAdZrxLt0c="; - }; - - commit = rev; - - packageRequires = [ gzip ]; - - recipe = writeText "recipe" '' - (edraw - :repo "misohena/el-easydraw" - :fetcher github - :files - ("*.el" - "msg")) - ''; - - passthru.updateScript = writeScript "update.sh" '' - #!/usr/bin/env nix-shell - #!nix-shell -i bash -p common-updater-scripts coreutils git gnused - set -eu -o pipefail - tmpdir="$(mktemp -d)" - git clone --depth=1 https://github.com/misohena/el-easydraw.git "$tmpdir" - pushd "$tmpdir" - commit=$(git show -s --pretty='format:%H') - # Based on: https://github.com/melpa/melpa/blob/2d8716906a0c9e18d6c979d8450bf1d15dd785eb/package-build/package-build.el#L523-L533 - version=$(TZ=UTC git show -s --pretty='format:%cd' --date='format-local:%Y%m%d.%H%M' | sed 's|\.0*|.|') - popd - update-source-version emacsPackages.el-easydraw $version --rev="$commit" - ''; - - meta = { - homepage = "https://github.com/misohena/el-easydraw"; - description = "Embedded drawing tool for Emacs"; - license = lib.licenses.gpl3; - maintainers = with lib.maintainers; [ brahyerr ]; - platforms = lib.platforms.all; - }; -} diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/el-easydraw/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/el-easydraw/package.nix new file mode 100644 index 0000000000000..fe4d9d33ee91e --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/el-easydraw/package.nix @@ -0,0 +1,34 @@ +{ + lib, + melpaBuild, + fetchFromGitHub, + gzip, + unstableGitUpdater, +}: + +melpaBuild { + pname = "edraw"; + version = "1.2.0-unstable-2024-07-24"; + + src = fetchFromGitHub { + owner = "misohena"; + repo = "el-easydraw"; + rev = "6f93e744d5f62de2176d3d0f0aa1f9e8d84ccefd"; + hash = "sha256-dXu4hDC4qE7W+KkWb9HIqYwesOKisMiZSTAulDpjyfA="; + }; + + propagatedUserEnvPkgs = [ gzip ]; + + files = ''(:defaults "msg")''; + + ignoreCompilationError = false; + + passthru.updateScript = unstableGitUpdater { tagPrefix = "v"; }; + + meta = { + homepage = "https://github.com/misohena/el-easydraw"; + description = "Embedded drawing tool for Emacs"; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ brahyerr ]; + }; +} diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/elisp-ffi/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/elisp-ffi/default.nix deleted file mode 100644 index 74b829701b0b5..0000000000000 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/elisp-ffi/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ lib -, melpaBuild -, fetchFromGitHub -, pkg-config -, libffi -, writeText -}: - -let - rev = "da37c516a0e59bdce63fb2dc006a231dee62a1d9"; -in melpaBuild { - pname = "elisp-ffi"; - version = "20170518.0"; - - commit = rev; - - src = fetchFromGitHub { - owner = "skeeto"; - repo = "elisp-ffi"; - inherit rev; - sha256 = "sha256-StOezQEnNTjRmjY02ub5FRh59aL6gWfw+qgboz0wF94="; - }; - - nativeBuildInputs = [ pkg-config ]; - - buildInputs = [ libffi ]; - - preBuild = '' - mv ffi.el elisp-ffi.el - make - ''; - - recipe = writeText "recipe" '' - (elisp-ffi :repo "skeeto/elisp-ffi" :fetcher github) - ''; - - meta = { - description = "Emacs Lisp Foreign Function Interface"; - longDescription = '' - This library provides an FFI for Emacs Lisp so that Emacs - programs can invoke functions in native libraries. It works by - driving a subprocess to do the heavy lifting, passing result - values on to Emacs. - ''; - license = lib.licenses.publicDomain; - }; -} diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/elisp-ffi/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/elisp-ffi/package.nix new file mode 100644 index 0000000000000..59e0b6b03fae4 --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/elisp-ffi/package.nix @@ -0,0 +1,48 @@ +{ + lib, + fetchFromGitHub, + libffi, + melpaBuild, + pkg-config, + unstableGitUpdater, +}: + +melpaBuild { + pname = "elisp-ffi"; + ename = "ffi"; + version = "1.0.0-unstable-2017-05-18"; + + src = fetchFromGitHub { + owner = "skeeto"; + repo = "elisp-ffi"; + rev = "da37c516a0e59bdce63fb2dc006a231dee62a1d9"; + hash = "sha256-StOezQEnNTjRmjY02ub5FRh59aL6gWfw+qgboz0wF94="; + }; + + files = ''(:defaults "ffi-glue")''; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ libffi ]; + + preBuild = '' + make CXX=$CXX + ''; + + ignoreCompilationError = false; + + passthru.updateScript = unstableGitUpdater { }; + + meta = { + homepage = "https://github.com/skeeto/elisp-ffi"; + description = "Emacs Lisp Foreign Function Interface"; + longDescription = '' + This library provides an FFI for Emacs Lisp so that Emacs + programs can invoke functions in native libraries. It works by + driving a subprocess to do the heavy lifting, passing result + values on to Emacs. + ''; + license = lib.licenses.unlicense; + maintainers = with lib.maintainers; [ AndersonTorres ]; + }; +} diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/emacs-conflict/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/emacs-conflict/package.nix index b32ee2f8a9f6f..aa5be89a9b3d6 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/emacs-conflict/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/emacs-conflict/package.nix @@ -1,10 +1,11 @@ -{ lib -, fetchFromGitHub -, trivialBuild -, emacs +{ + lib, + fetchFromGitHub, + melpaBuild, + unstableGitUpdater, }: -trivialBuild { +melpaBuild { pname = "emacs-conflict"; version = "0-unstable-2022-11-21"; @@ -12,14 +13,17 @@ trivialBuild { owner = "ibizaman"; repo = "emacs-conflict"; rev = "9f236b93930f3ceb4cb0258cf935c99599191de3"; - sha256 = "sha256-DIGvnotSQYIgHxGxtyCALHd8ZbrfkmdvjLXlkcqQ6v4="; + hash = "sha256-DIGvnotSQYIgHxGxtyCALHd8ZbrfkmdvjLXlkcqQ6v4="; }; - meta = with lib; { - description = "Resolve conflicts happening when using file synchronization tools"; + ignoreCompilationError = false; + + passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; }; + + meta = { homepage = "https://github.com/ibizaman/emacs-conflict"; - license = licenses.gpl3; - maintainers = with maintainers; [ ibizaman ]; - inherit (emacs.meta) platforms; + description = "Resolve conflicts happening when using file synchronization tools"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ ibizaman ]; }; } diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/enlight/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/enlight/default.nix deleted file mode 100644 index 6faa3ef8ad937..0000000000000 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/enlight/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ - lib, - compat, - fetchFromGitHub, - melpaBuild, -}: - -melpaBuild { - pname = "enlight"; - version = "20240601.1150"; - - src = fetchFromGitHub { - owner = "ichernyshovvv"; - repo = "enlight"; - rev = "76753736da1777c8f9ebbeb08beec15b330a5878"; - hash = "sha256-Ccfv4Ud5B4L4FfIOI2PDKikV9x8x3a7VeHYDyLV7t4g="; - }; - - packageRequires = [ compat ]; - - meta = { - homepage = "https://github.com/ichernyshovvv/enlight"; - description = "Highly customizable startup screen for Emacs"; - license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ AndersonTorres ]; - }; -} diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ess-R-object-popup/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ess-R-object-popup/default.nix deleted file mode 100644 index 7809dcd735660..0000000000000 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ess-R-object-popup/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ trivialBuild -, fetchFromGitHub -, emacs -, popup -, ess -}: - -trivialBuild rec { - pname = "ess-R-object-popup"; - version = "1.0"; - - src = fetchFromGitHub { - owner = "myuhe"; - repo = "ess-R-object-popup.el"; - rev = "v${version}"; - hash = "sha256-YN8ZLXEbwTFdFfovkV2IXV9v6y/PTgCdiRQqbpRaF2E="; - }; - - packageRequires = [ - popup - ess - ]; - - meta = { - homepage = "https://github.com/myuhe/ess-R-object-popup.el"; - description = "Popup descriptions of R objects"; - inherit (emacs.meta) platforms; - }; -} diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/evil-markdown/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/evil-markdown/package.nix index b95b05f986107..2140665296b60 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/evil-markdown/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/evil-markdown/package.nix @@ -1,12 +1,13 @@ -{ lib -, trivialBuild -, fetchFromGitHub -, emacs -, evil -, markdown-mode +{ + lib, + evil, + fetchFromGitHub, + markdown-mode, + melpaBuild, + unstableGitUpdater, }: -trivialBuild rec { +melpaBuild { pname = "evil-markdown"; version = "0-unstable-2021-07-21"; @@ -17,18 +18,19 @@ trivialBuild rec { hash = "sha256-HBBuZ1VWIn6kwK5CtGIvHM1+9eiNiKPH0GUsyvpUVN8="; }; - buildInputs = propagatedUserEnvPkgs; - - propagatedUserEnvPkgs = [ + packageRequires = [ evil markdown-mode ]; - meta = with lib; { + ignoreCompilationError = false; + + passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; }; + + meta = { homepage = "https://github.com/Somelauw/evil-markdown"; description = "Integrates Emacs evil and markdown"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ leungbk ]; - inherit (emacs.meta) platforms; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ leungbk ]; }; } diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/font-lock-plus/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/font-lock-plus/default.nix deleted file mode 100644 index be52cf155e5b3..0000000000000 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/font-lock-plus/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ lib -, fetchFromGitHub -, trivialBuild -}: - -trivialBuild { - pname = "font-lock-plus"; - version = "208-unstable-2018-01-01"; - - src = fetchFromGitHub { - owner = "emacsmirror"; - repo = "font-lock-plus"; - rev = "f2c1ddcd4c9d581bd32be88fad026b49f98b6541"; - hash = "sha256-lFmdVMXIIXZ9ZohAJw5rhxpTv017qIyzmpuKOWDdeJ4="; - }; - - meta = with lib; { - homepage = "https://github.com/emacsmirror/font-lock-plus"; - description = "Enhancements to standard library font-lock.el"; - license = licenses.gpl2Plus; - }; -} diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/font-lock-plus/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/font-lock-plus/package.nix new file mode 100644 index 0000000000000..4c615d0e6cc82 --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/font-lock-plus/package.nix @@ -0,0 +1,30 @@ +{ + lib, + fetchFromGitHub, + melpaBuild, + unstableGitUpdater, +}: + +melpaBuild { + pname = "font-lock-plus"; + ename = "font-lock+"; + version = "208-unstable-2022-04-02"; + + src = fetchFromGitHub { + owner = "emacsmirror"; + repo = "font-lock-plus"; + rev = "aa1c82d05c9222b09099a0ccd7468e955497940c"; + hash = "sha256-er+knxqAejgKAtOnhqHfsGN286biHFdeMIUlbW7JyYw="; + }; + + ignoreCompilationError = false; + + passthru.updateScript = unstableGitUpdater { }; + + meta = { + homepage = "https://github.com/emacsmirror/font-lock-plus"; + description = "Enhancements to standard library font-lock.el"; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ AndersonTorres ]; + }; +} diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ghc-mod/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ghc-mod/default.nix deleted file mode 100644 index e9ce9a35c409b..0000000000000 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ghc-mod/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib -, melpaBuild -, haskell-mode -, haskellPackages -, writeText -}: - -melpaBuild { - pname = "ghc"; - - inherit (haskellPackages.ghc-mod) version src; - - packageRequires = [ haskell-mode ]; - - propagatedUserEnvPkgs = [ haskellPackages.ghc-mod ]; - - recipe = writeText "recipe" '' - (ghc-mod :repo "DanielG/ghc-mod" :fetcher github :files ("elisp/*.el")) - ''; - - meta = { - description = "Extension of haskell-mode that provides completion of symbols and documentation browsing"; - license = lib.licenses.bsd3; - }; -} diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/git-undo/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/git-undo/default.nix deleted file mode 100644 index f0f16c8cf0636..0000000000000 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/git-undo/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib -, fetchFromGitHub -, emacs -, trivialBuild -}: - -trivialBuild { - pname = "git-undo"; - version = "0-unstable-2019-12-21"; - - src = fetchFromGitHub { - owner = "jwiegley"; - repo = "git-undo-el"; - rev = "cf31e38e7889e6ade7d2d2b9f8719fd44f52feb5"; - sha256 = "sha256-cVkK9EF6qQyVV3uVqnBEjF8e9nEx/8ixnM8PvxqCyYE="; - }; - - meta = with lib; { - homepage = "https://github.com/jwiegley/git-undo-el"; - description = "Revert region to most recent Git-historical version"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ leungbk ]; - inherit (emacs.meta) platforms; - }; -} diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/git-undo/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/git-undo/package.nix new file mode 100644 index 0000000000000..66f6f8c59c7fb --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/git-undo/package.nix @@ -0,0 +1,29 @@ +{ + lib, + fetchFromGitHub, + melpaBuild, + unstableGitUpdater, +}: + +melpaBuild { + pname = "git-undo"; + version = "0-unstable-2022-08-07"; + + src = fetchFromGitHub { + owner = "jwiegley"; + repo = "git-undo-el"; + rev = "3d9c95fc40a362eae4b88e20ee21212d234a9ee6"; + hash = "sha256-xwVCAdxnIRHrFNWvtlM3u6CShsUiGgl1CiBTsp2x7IM="; + }; + + ignoreCompilationError = false; + + passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; }; + + meta = { + homepage = "https://github.com/jwiegley/git-undo-el"; + description = "Revert region to most recent Git-historical version"; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ leungbk ]; + }; +} diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/gn-mode-from-sources/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/gn-mode-from-sources/package.nix new file mode 100644 index 0000000000000..8b554081d1fd9 --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/gn-mode-from-sources/package.nix @@ -0,0 +1,28 @@ +{ + lib, + gn, + melpaBuild, +}: + +melpaBuild { + pname = "gn-mode-from-sources"; + ename = "gn-mode"; + version = "0-unstable-${gn.version}"; + inherit (gn) src; + + files = ''("misc/emacs/gn-mode.el")''; + + # Fixes the malformed header error + postPatch = '' + substituteInPlace misc/emacs/gn-mode.el \ + --replace-fail ";;; gn-mode.el - " ";;; gn-mode.el --- " + ''; + + ignoreCompilationError = false; + + meta = { + inherit (gn.meta) homepage license; + maintainers = with lib.maintainers; [ rennsax ]; + description = "Major mode for editing GN files; taken from GN sources"; + }; +} diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/grid/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/grid/package.nix index 91b69b0fbbda2..cb81a81cc4a07 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/grid/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/grid/package.nix @@ -2,11 +2,12 @@ lib, fetchFromGitHub, melpaBuild, + unstableGitUpdater, }: melpaBuild { pname = "grid"; - version = "20240526.1305"; + version = "0-unstable-2024-05-26"; src = fetchFromGitHub { owner = "ichernyshovvv"; @@ -15,6 +16,10 @@ melpaBuild { hash = "sha256-3QDw4W3FbFvb2zpkDHAo9BJKxs3LaehyvUVJPKqS9RE="; }; + ignoreCompilationError = false; + + passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; }; + meta = { homepage = "https://github.com/ichernyshovvv/grid.el"; description = "Library to put text data into boxes and manipulate them"; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/haskell-unicode-input-method/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/haskell-unicode-input-method/default.nix deleted file mode 100644 index 1d9fa6a0c084a..0000000000000 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/haskell-unicode-input-method/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib -, melpaBuild -, fetchFromGitHub -, writeText -}: - -let - rev = "d8d168148c187ed19350bb7a1a190217c2915a63"; -in melpaBuild { - pname = "haskell-unicode-input-method"; - version = "20110905.2307"; - - commit = rev; - - src = fetchFromGitHub { - owner = "roelvandijk"; - repo = "emacs-haskell-unicode-input-method"; - inherit rev; - sha256 = "09b7bg2s9aa4s8f2kdqs4xps3jxkq5wsvbi87ih8b6id38blhf78"; - }; - - recipe = writeText "recipe" '' - (haskell-unicode-input-method - :repo "roelvandijk/emacs-haskell-unicode-input-method" - :fetcher github) - ''; - - packageRequires = []; - - meta = { - homepage = "https://melpa.org/#haskell-unicode-input-method/"; - license = lib.licenses.free; - }; -} diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/helm-words/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/helm-words/package.nix index eb16701f3856f..4a03ad5d97dfb 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/helm-words/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/helm-words/package.nix @@ -1,28 +1,32 @@ -{ lib -, trivialBuild -, fetchFromGitHub -, dictionary -, emacs -, helm +{ + lib, + dictionary, + fetchFromGitHub, + helm, + melpaBuild, }: -trivialBuild rec { +melpaBuild { pname = "helm-words"; version = "0-unstable-2019-03-12"; src = fetchFromGitHub { owner = "emacsmirror"; - repo = pname; + repo = "helm-words"; rev = "e6387ece1940a06695b9d910de3d90252efb8d29"; hash = "sha256-rh8YKDLZZCUE6JnnRnFyDDyUjK+35+M2dkawR/+qwNM="; }; - packageRequires = [ helm dictionary ]; + packageRequires = [ + dictionary + helm + ]; - meta = with lib; { + ignoreCompilationError = false; + + meta = { homepage = "https://github.com/emacsmirror/helm-words"; description = "Helm extension for looking up words in dictionaries and thesauri"; - license = licenses.gpl3Plus; - inherit (emacs.meta) platforms; + license = lib.licenses.gpl3Plus; }; } diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/hsc3-mode/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/hsc3-mode/package.nix new file mode 100644 index 0000000000000..d44afbeaf3e6b --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/hsc3-mode/package.nix @@ -0,0 +1,25 @@ +{ + melpaBuild, + haskell-mode, + haskellPackages, +}: + +let + inherit (haskellPackages) hsc3; +in +melpaBuild { + pname = "hsc3-mode"; + ename = "hsc3"; + inherit (hsc3) src version; + + files = ''("emacs/*.el")''; + + packageRequires = [ haskell-mode ]; + + ignoreCompilationError = false; + + meta = { + inherit (hsc3.meta) homepage license; + description = "Emacs mode for hsc3"; + }; +} diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/hsc3/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/hsc3/default.nix deleted file mode 100644 index 86b9e274a9673..0000000000000 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/hsc3/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ lib, trivialBuild, fetchurl, haskell-mode }: - -trivialBuild rec { - pname = "hsc3-mode"; - version = "0.15"; - - src = fetchurl { - url = "mirror://hackage/hsc3-${version}/hsc3-${version}.tar.gz"; - sha256 = "2f3b15655419cf8ebe25ab1c6ec22993b2589b4ffca7c3a75ce478ca78a0bde6"; - }; - - packageRequires = [ haskell-mode ]; - - sourceRoot = "hsc3-${version}/emacs"; - - meta = { - homepage = "http://rd.slavepianos.org/?t=hsc3"; - description = "hsc3 mode package for Emacs"; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/icicles/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/icicles/package.nix new file mode 100644 index 0000000000000..0228bd8f414ae --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/icicles/package.nix @@ -0,0 +1,29 @@ +{ + lib, + fetchFromGitHub, + melpaBuild, + unstableGitUpdater, +}: + +melpaBuild { + pname = "icicles"; + version = "0-unstable-2023-07-27"; + + src = fetchFromGitHub { + owner = "emacsmirror"; + repo = "icicles"; + rev = "dfc1d9caf1b5156567292c9548547a2975a841bc"; + hash = "sha256-Xbt0D9EgmvN1hDTeLbdxq1ARHObj8M4GfH2sbFILRTI="; + }; + + ignoreCompilationError = false; + + passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; }; + + meta = { + homepage = "https://emacswiki.org/emacs/Icicles"; + description = "Emacs library that enhances minibuffer completion"; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ AndersonTorres ]; + }; +} diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/idris2-mode/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/idris2-mode/default.nix deleted file mode 100644 index 59dd35bc34421..0000000000000 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/idris2-mode/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib -, trivialBuild -, fetchFromGitHub -, emacs -, prop-menu -}: - -trivialBuild rec { - pname = "idris2-mode"; - version = "1.1"; - - src = fetchFromGitHub { - owner = "idris-community"; - repo = pname; - rev = version; - hash = "sha256-rTeVjkAw44Q35vjaERs4uoZRJ6XR3FKplEUCVPHhY7Q="; - }; - - buildInputs = propagatedUserEnvPkgs; - - propagatedUserEnvPkgs = [ - prop-menu - ]; - - meta = with lib; { - homepage = "https://github.com/idris-community/idris2-mode"; - description = "This is an emacs mode for editing Idris 2 code"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ wuyoli ]; - inherit (emacs.meta) platforms; - }; -} diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/idris2-mode/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/idris2-mode/package.nix new file mode 100644 index 0000000000000..d9510a9c3e105 --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/idris2-mode/package.nix @@ -0,0 +1,37 @@ +{ + lib, + fetchFromGitHub, + melpaBuild, + prop-menu, + gitUpdater, +}: + +let + version = "1.1"; +in +melpaBuild { + pname = "idris2-mode"; + inherit version; + + src = fetchFromGitHub { + owner = "idris-community"; + repo = "idris2-mode"; + rev = version; + hash = "sha256-rTeVjkAw44Q35vjaERs4uoZRJ6XR3FKplEUCVPHhY7Q="; + }; + + packageRequires = [ + prop-menu + ]; + + ignoreCompilationError = false; + + passthru.updateScript = gitUpdater { }; + + meta = { + homepage = "https://github.com/idris-community/idris2-mode"; + description = "Emacs mode for editing Idris 2 code"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ wuyoli AndersonTorres ]; + }; +} diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/isearch-plus/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/isearch-plus/default.nix deleted file mode 100644 index d4f60c609381d..0000000000000 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/isearch-plus/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib -, trivialBuild -, fetchFromGitHub -, emacs -}: - -trivialBuild { - pname = "isearch-plus"; - version = "3434-unstable-2021-08-23"; - - src = fetchFromGitHub { - owner = "emacsmirror"; - repo = "isearch-plus"; - rev = "93088ea0ac4d51bdb76c4c32ea53172f6c435852"; - hash = "sha256-kD+Fyps3fc5YK6ATU1nrkKHazGMYJnU2gRcpQZf6A1E="; - }; - - meta = with lib; { - homepage = "https://www.emacswiki.org/emacs/IsearchPlus"; - description = "Extensions to isearch"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ leungbk AndersonTorres ]; - inherit (emacs.meta) platforms; - }; -} diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/isearch-plus/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/isearch-plus/package.nix new file mode 100644 index 0000000000000..8bc3a667b109d --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/isearch-plus/package.nix @@ -0,0 +1,33 @@ +{ + lib, + melpaBuild, + fetchFromGitHub, + unstableGitUpdater, +}: + +melpaBuild { + pname = "isearch-plus"; + ename = "isearch+"; + version = "3434-unstable-2023-09-27"; + + src = fetchFromGitHub { + owner = "emacsmirror"; + repo = "isearch-plus"; + rev = "b10a36fb6bb8b45ff9d924107384e3bf0cee201d"; + hash = "sha256-h/jkIWjkLFbtBp9F+lhA3CulYy2XaeloLmexR0CDm3E="; + }; + + ignoreCompilationError = false; + + passthru.updateScript = unstableGitUpdater { }; + + meta = { + homepage = "https://www.emacswiki.org/emacs/IsearchPlus"; + description = "Extensions to isearch"; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ + leungbk + AndersonTorres + ]; + }; +} diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/isearch-prop/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/isearch-prop/default.nix deleted file mode 100644 index 00ff1f0a9b216..0000000000000 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/isearch-prop/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib -, fetchFromGitHub -, trivialBuild -, emacs -}: - -trivialBuild { - pname = "isearch-prop"; - version = "0-unstable-2019-05-01"; - - src = fetchFromGitHub { - owner = "emacsmirror"; - repo = "isearch-prop"; - rev = "4a2765f835dd115d472142da05215c4c748809f4"; - hash = "sha256-A1Kt4nm7iRV9J5yaLupwiNL5g7ddZvQs79dggmqZ7Rk="; - }; - - meta = with lib; { - homepage = "https://www.emacswiki.org/emacs/IsearchPlus"; - description = "Search text- or overlay-property contexts"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ leungbk ]; - inherit (emacs.meta) platforms; - }; -} diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/isearch-prop/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/isearch-prop/package.nix new file mode 100644 index 0000000000000..72f4141df79e3 --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/isearch-prop/package.nix @@ -0,0 +1,29 @@ +{ + lib, + fetchFromGitHub, + melpaBuild, + unstableGitUpdater, +}: + +melpaBuild { + pname = "isearch-prop"; + version = "0-unstable-2022-12-30"; + + src = fetchFromGitHub { + owner = "emacsmirror"; + repo = "isearch-prop"; + rev = "5787fd57977c0d6c416ce71471c3b9da246dfb78"; + hash = "sha256-Xli7TxBenl5cDMJv3Qz7ZELFpvJKStMploLpf9a+uoA="; + }; + + ignoreCompilationError = false; + + passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; }; + + meta = { + homepage = "https://www.emacswiki.org/emacs/IsearchPlus"; + description = "Search text- or overlay-property contexts"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ leungbk AndersonTorres ]; + }; +} diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/jam-mode/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/jam-mode/package.nix index 6b060ffa3eac0..74e25b096b2bf 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/jam-mode/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/jam-mode/package.nix @@ -1,9 +1,10 @@ -{ lib -, trivialBuild -, fetchurl +{ + lib, + melpaBuild, + fetchurl, }: -trivialBuild rec { +melpaBuild rec { pname = "jam-mode"; version = "0.3"; @@ -20,10 +21,17 @@ trivialBuild rec { runHook postUnpack ''; - meta = with lib; { + postPatch = '' + echo ";;; jam-mode.el ---" > tmp.el + cat jam-mode.el >> tmp.el + mv tmp.el jam-mode.el + ''; + + ignoreCompilationError = false; + + meta = { description = "Emacs major mode for editing Jam files"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ qyliss ]; - platforms = platforms.all; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ qyliss ]; }; } diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ligo-mode/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ligo-mode/default.nix deleted file mode 100644 index c70835a0dacb3..0000000000000 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ligo-mode/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ lib -, melpaBuild -, fetchFromGitLab -, writeText -, unstableGitUpdater -}: - -let - pname = "ligo-mode"; - version = "20230302.1616"; - commit = "d1073474efc9e0a020a4bcdf5e0c12a217265a3a"; -in -melpaBuild { - inherit pname version commit; - - src = fetchFromGitLab { - owner = "ligolang"; - repo = "ligo"; - rev = commit; - hash = "sha256-wz9DF9mqi8WUt1Ebd+ueUTA314rKkdbjmoWF8cKuS8I="; - }; - - packageRequires = [ ]; - - buildInputs = [ ]; - - checkInputs = [ ]; - - recipe = writeText "recipe" '' - (ligo-mode :fetcher gitlab - :repo "ligolang/ligo" - :files ("tools/emacs/ligo-mode.el")) - ''; - - passthru.updateScript = unstableGitUpdater { }; - - meta = { - description = "Major mode for editing LIGO source code"; - homepage = "https://gitlab.com/ligolang/ligo"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ ]; - }; -} diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/llvm-mode/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/llvm-mode/package.nix index 02fec5ef7f720..befbf9df198b4 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/llvm-mode/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/llvm-mode/package.nix @@ -1,15 +1,16 @@ -{ trivialBuild -, llvmPackages -}: +{ melpaBuild, llvmPackages }: -trivialBuild { +melpaBuild { pname = "llvm-mode"; inherit (llvmPackages.llvm) src version; - postUnpack = '' - sourceRoot="$sourceRoot/llvm/utils/emacs" + files = '' + ("llvm/utils/emacs/*.el" + "llvm/utils/emacs/README") ''; + ignoreCompilationError = false; + meta = { inherit (llvmPackages.llvm.meta) homepage license; description = "Major mode for the LLVM assembler language"; 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..e34f1fd725cbb 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 @@ -1,44 +1,43 @@ -{ lib -, python3 -, melpaBuild -, fetchFromGitHub -, substituteAll -, acm -, markdown-mode -, git -, go -, gopls -, pyright -, ruff -, tempel -, writeScript -, writeText +{ + lib, + python3, + melpaBuild, + fetchFromGitHub, + substituteAll, + acm, + markdown-mode, + basedpyright, + git, + go, + gopls, + tempel, + unstableGitUpdater, }: let - rev = "4bfbbe4e6c44d80b15cb501fa3444ad03dba2824"; - python = python3.withPackages (ps: with ps; [ - epc - orjson - paramiko - rapidfuzz - sexpdata - six - ]); + python = python3.withPackages ( + ps: with ps; [ + epc + orjson + paramiko + rapidfuzz + setuptools + sexpdata + six + ] + ); in melpaBuild { pname = "lsp-bridge"; - version = "20240622.236"; + version = "0-unstable-2024-09-27"; src = fetchFromGitHub { owner = "manateelazycat"; repo = "lsp-bridge"; - inherit rev; - hash = "sha256-rzaUtUYDEZAuRjSgThHKxrQ7U8ZIO0k750aH08VpA08="; + rev = "f9d540ff451d9a0ee92819b84472820f16be15d5"; + hash = "sha256-YqUC2Z24ORwIMNZUsAJrAnSaDovccnGMg2OSYY1mYoQ="; }; - commit = rev; - patches = [ # Hardcode the python dependencies needed for lsp-bridge, so users # don't have to modify their global environment @@ -54,33 +53,30 @@ melpaBuild { ]; checkInputs = [ + # Emacs packages + tempel + + # Executables + basedpyright git go gopls - pyright python - ruff - tempel ]; - recipe = writeText "recipe" '' - (lsp-bridge - :repo "manateelazycat/lsp-bridge" - :fetcher github - :files - ("*.el" - "lsp_bridge.py" - "core" - "langserver" - "multiserver" - "resources")) + files = '' + ("*.el" + "lsp_bridge.py" + "core" + "langserver" + "multiserver" + "resources") ''; doCheck = true; checkPhase = '' runHook preCheck - cd "$sourceRoot" mkfifo test.log cat < test.log & HOME=$(mktemp -d) python -m test.test @@ -90,27 +86,17 @@ melpaBuild { __darwinAllowLocalNetworking = true; - passthru.updateScript = writeScript "update.sh" '' - #!/usr/bin/env nix-shell - #!nix-shell -i bash -p common-updater-scripts coreutils git gnused - set -eu -o pipefail + ignoreCompilationError = false; - tmpdir="$(mktemp -d)" - git clone --depth=1 https://github.com/manateelazycat/lsp-bridge.git "$tmpdir" - - pushd "$tmpdir" - commit=$(git show -s --pretty='format:%H') - # Based on: https://github.com/melpa/melpa/blob/2d8716906a0c9e18d6c979d8450bf1d15dd785eb/package-build/package-build.el#L523-L533 - version=$(TZ=UTC git show -s --pretty='format:%cd' --date='format-local:%Y%m%d.%H%M' | sed 's|\.0*|.|') - popd - - update-source-version emacsPackages.lsp-bridge $version --rev="$commit" - ''; + passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; }; - meta = with lib; { + meta = { description = "Blazingly fast LSP client for Emacs"; homepage = "https://github.com/manateelazycat/lsp-bridge"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ fxttr kira-bruneau ]; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ + fxttr + kira-bruneau + ]; }; } diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lspce/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lspce/default.nix deleted file mode 100644 index 97a9bea4f96ca..0000000000000 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lspce/default.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ lib -, emacs -, f -, fetchFromGitHub -, markdown-mode -, rustPlatform -, trivialBuild -, yasnippet -}: - -let - version = "1.0.0-unstable-2024-02-03"; - - src = fetchFromGitHub { - owner = "zbelial"; - repo = "lspce"; - rev = "543dcf0ea9e3ff5c142c4365d90b6ae8dc27bd15"; - hash = "sha256-LZWRQOKkTjNo8jecBRholW9SHpiK0SWcV8yObojpvxo="; - }; - - meta = { - homepage = "https://github.com/zbelial/lspce"; - description = "LSP Client for Emacs implemented as a module using rust"; - license = lib.licenses.gpl3Only; - maintainers = [ ]; - inherit (emacs.meta) platforms; - }; - - lspce-module = rustPlatform.buildRustPackage { - inherit version src meta; - pname = "lspce-module"; - - cargoHash = "sha256-W9rsi7o4KvyRoG/pqRKOBbJtUoSW549Sh8+OV9sLcxs="; - - checkFlags = [ - # flaky test - "--skip=msg::tests::serialize_request_with_null_params" - ]; - - postInstall = '' - mkdir -p $out/share/emacs/site-lisp - for f in $out/lib/*; do - mv $f $out/share/emacs/site-lisp/lspce-module.''${f##*.} - done - rmdir $out/lib - ''; - }; -in -trivialBuild rec { - inherit version src meta; - pname = "lspce"; - - buildInputs = propagatedUserEnvPkgs; - - propagatedUserEnvPkgs = [ - f - markdown-mode - yasnippet - lspce-module - ]; - - passthru = { - inherit lspce-module; - }; -} diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lspce/module.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lspce/module.nix new file mode 100644 index 0000000000000..cd2ed9b873689 --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lspce/module.nix @@ -0,0 +1,39 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + stdenv, +}: + +let + libExt = stdenv.hostPlatform.extensions.sharedLibrary; +in +rustPlatform.buildRustPackage { + pname = "lspce-module"; + version = "1.1.0-unstable-2024-07-29"; + + src = fetchFromGitHub { + owner = "zbelial"; + repo = "lspce"; + rev = "e954e4d77aeb45deb14182631f3d5aa9bcc9e587"; + hash = "sha256-9AUffkdgvVbHRIrHQPVl36plIfGxf3vsN9JCuFe0P6Q="; + }; + + cargoHash = "sha256-wrrdXX/rEVxmHdyblm4I9iHD3bPoDd1KlBe3ODeGFeM="; + + checkFlags = [ + # flaky test + "--skip=msg::tests::serialize_request_with_null_params" + ]; + + postInstall = '' + mv --verbose $out/lib/liblspce_module${libExt} $out/lib/lspce-module${libExt} + ''; + + meta = { + homepage = "https://github.com/zbelial/lspce"; + description = "LSP Client for Emacs implemented as a module using Rust"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ AndersonTorres ]; + }; +} diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lspce/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lspce/package.nix new file mode 100644 index 0000000000000..55a07cd66e68a --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lspce/package.nix @@ -0,0 +1,36 @@ +{ + lib, + callPackage, + f, + markdown-mode, + melpaBuild, + nix-update-script, + yasnippet, +}: + +let + lspce-module = callPackage ./module.nix { }; +in +melpaBuild { + pname = "lspce"; + inherit (lspce-module) version src meta; + + packageRequires = [ + f + markdown-mode + yasnippet + ]; + + # to compile lspce.el, it needs lspce-module.so + files = ''(:defaults "${lib.getLib lspce-module}/lib/lspce-module.*")''; + + ignoreCompilationError = false; + + passthru = { + inherit lspce-module; + updateScript = nix-update-script { + attrPath = "emacsPackages.lspce.lspce-module"; + extraArgs = [ "--version=branch" ]; + }; + }; +} diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/matrix-client/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/matrix-client/default.nix deleted file mode 100644 index a17689ddf52dc..0000000000000 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/matrix-client/default.nix +++ /dev/null @@ -1,73 +0,0 @@ -{ lib -, melpaBuild -, fetchFromGitHub -, fetchpatch -, writeText -# Emacs packages -, _map -, a -, anaphora -, cl-lib -, dash -, dash-functional -, esxml -, f -, frame-purpose -, ht -, ov -, rainbow-identifiers -, request -, s -, tracking -}: - -let - rev = "d2ac55293c96d4c95971ed8e2a3f6f354565c5ed"; -in melpaBuild { - pname = "matrix-client"; - version = "0.3.0"; - - commit = rev; - - src = fetchFromGitHub { - owner = "alphapapa"; - repo = "matrix-client.el"; - inherit rev; - sha256 = "1scfv1502yg7x4bsl253cpr6plml1j4d437vci2ggs764sh3rcqq"; - }; - - patches = [ - # Fix: avatar loading when imagemagick support is not available - (fetchpatch { - url = "https://github.com/alphapapa/matrix-client.el/commit/5f49e615c7cf2872f48882d3ee5c4a2bff117d07.patch"; - sha256 = "07bvid7s1nv1377p5n61q46yww3m1w6bw4vnd4iyayw3fby1lxbm"; - }) - ]; - - packageRequires = [ - _map - a - anaphora - cl-lib - dash - dash-functional - esxml - f - frame-purpose - ht - ov - rainbow-identifiers - request - s - tracking - ]; - - recipe = writeText "recipe" '' - (matrix-client :repo "alphapapa/matrix-client.el" :fetcher github) - ''; - - meta = { - description = "Chat client and API wrapper for Matrix.org"; - license = lib.licenses.gpl3Plus; - }; -} diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/mind-wave/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/mind-wave/default.nix deleted file mode 100644 index 2bc5a733f6ce8..0000000000000 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/mind-wave/default.nix +++ /dev/null @@ -1,89 +0,0 @@ -{ lib -, pkgs -, melpaBuild -, substituteAll -}: -# To use this package with emacs-overlay: -# nixpkgs.overlays = [ -# inputs.emacs-overlay.overlay -# (final: prev: { -# emacs30 = prev.emacsGit.overrideAttrs (old: { -# name = "emacs30"; -# version = inputs.emacs-upstream.shortRev; -# src = inputs.emacs-upstream; -# }); -# emacsWithConfig = prev.emacsWithPackagesFromUsePackage { -# config = let -# readRecursively = dir: -# builtins.concatStringsSep "\n" -# (lib.mapAttrsToList (name: value: -# if value == "regular" -# then builtins.readFile (dir + "/${name}") -# else -# ( -# if value == "directory" -# then readRecursively (dir + "/${name}") -# else [] -# )) -# (builtins.readDir dir)); -# in -# # your home-manager config -# readRecursively ./home/modules/emacs; -# alwaysEnsure = true; -# package = final.emacs30; -# extraEmacsPackages = epkgs: [ -# epkgs.use-package -# (epkgs.melpaBuild rec { -# # ... -# }) -# ]; -# override = epkgs: -# epkgs -# // { -# # ... -# }; -# }; -# }) -# ]; -melpaBuild rec { - pname = "mind-wave"; - version = "20230523.0332"; # 03:32 UTC - src = pkgs.fetchFromGitHub { - owner = "manateelazycat"; - repo = "mind-wave"; - rev = "5109162b74872091c5090a28389bef8f7020274c"; - sha256 = "sha256-ZyXrpb0GLWSGnMsVIGL9qALSBCeIWNF0UwkCFgCKnu8="; - }; - commit = "5109162b74872091c5090a28389bef8f7020274c"; - # elisp dependencies - packageRequires = [ - pkgs.emacsPackages.markdown-mode - ]; - buildInputs = [ - (pkgs.python3.withPackages (ps: - with ps; [ - openai - epc - sexpdata - six - ])) - ]; - recipe = pkgs.writeText "recipe" '' - (mind-wave - :repo "manateelazycat/mind-wave" - :fetcher github - :files - ("mind-wave.el" - "mind-wave-epc.el" - "mind_wave.py" - "utils.py")) - ''; - doCheck = true; - passthru.updateScript = pkgs.unstableGitUpdater {}; - meta = with lib; { - description = " Emacs AI plugin based on ChatGPT API "; - homepage = "https://github.com/manateelazycat/mind-wave"; - license = licenses.gpl3Only; - maintainers = with maintainers; [yuzukicat]; - }; -} diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/mu4e/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/mu4e/package.nix index 430b8af291a4b..b1c378cf31c4f 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/mu4e/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/mu4e/package.nix @@ -1,11 +1,12 @@ -{ elpaBuild, mu }: +{ + lib, + elpaBuild, + mu, +}: -let +elpaBuild { pname = "mu4e"; version = mu.mu4e.version; -in -elpaBuild { - inherit pname version; src = mu.mu4e; @@ -15,19 +16,20 @@ elpaBuild { # prepare a multi-file package tar archive according to info # "(elisp) Multi-file Packages" for elpaBuild to install - postUnpack = '' - pushd mu-*-mu4e - local content_directory=${pname}-${version} + postBuild = '' + local content_directory=$pname-$version mkdir $content_directory cp --verbose share/emacs/site-lisp/mu4e/*.el $content_directory/ rm --verbose --force $content_directory/mu4e-autoloads.el cp --verbose share/info/* $content_directory/ src=$PWD/$content_directory.tar tar --create --verbose --file=$src $content_directory - popd ''; - meta = mu.meta // { + ignoreCompilationError = false; + + meta = removeAttrs mu.meta [ "mainProgram" ] // { description = "Full-featured e-mail client"; + maintainers = mu.meta.maintainers ++ (with lib.maintainers; [ linj ]); }; } diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/notdeft/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/notdeft/default.nix deleted file mode 100644 index f9af8c465b930..0000000000000 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/notdeft/default.nix +++ /dev/null @@ -1,75 +0,0 @@ -{ lib -, stdenv -, trivialBuild -, fetchFromGitHub -, emacs -, hydra -, ivy -, pkg-config -, tclap -, xapian - # Include pre-configured hydras -, withHydra ? false - # Include Ivy integration -, withIvy ? false -}: - -let - pname = "notdeft"; - version = "20211204.0846"; - - src = fetchFromGitHub { - owner = "hasu"; - repo = "notdeft"; - rev = "1b7054dcfc3547a7cafeb621552cec01d0540478"; - hash = "sha256-LMMLJFVpmoE/y3MqrgY2fmsehmzk6TkLsVoHmFUxiSw="; - }; - - # Xapian bindings for NotDeft - notdeft-xapian = stdenv.mkDerivation { - pname = "notdeft-xapian"; - inherit version src; - - sourceRoot = "${src.name}/xapian"; - - nativeBuildInputs = [ pkg-config tclap xapian ]; - - installPhase = '' - runHook preInstall - - mkdir -p $out/bin - cp notdeft-xapian $out/bin - - runHook postInstall - ''; - }; -in -trivialBuild { - inherit pname version src; - packageRequires = lib.optional withHydra hydra - ++ lib.optional withIvy ivy; - buildInputs = [ xapian ]; - - postPatch = '' - substituteInPlace notdeft-xapian.el \ - --replace 'defcustom notdeft-xapian-program nil' \ - "defcustom notdeft-xapian-program \"${notdeft-xapian}/bin/notdeft-xapian\"" - ''; - - # Extra modules are contained in the extras/ directory - preBuild = lib.optionalString withHydra '' - mv extras/notdeft-{mode-hydra,global-hydra}.el ./ - '' + - lib.optionalString withIvy '' - mv extras/notdeft-ivy.el ./ - '' + '' - rm -r extras/ - ''; - - meta = with lib; { - homepage = "https://tero.hasu.is/notdeft/"; - description = "Fork of Deft that uses Xapian as a search engine"; - maintainers = [ maintainers.nessdoor ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/notdeft/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/notdeft/package.nix new file mode 100644 index 0000000000000..7554fd5983eaa --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/notdeft/package.nix @@ -0,0 +1,75 @@ +{ + lib, + stdenv, + melpaBuild, + fetchFromGitHub, + hydra, + ivy, + pkg-config, + tclap, + unstableGitUpdater, + xapian, + # Configurable options + # Include pre-configured hydras + withHydra ? false, + # Include Ivy integration + withIvy ? false, +}: + +melpaBuild { + pname = "notdeft"; + version = "0-unstable-2021-12-04"; + + src = fetchFromGitHub { + owner = "hasu"; + repo = "notdeft"; + rev = "1b7054dcfc3547a7cafeb621552cec01d0540478"; + hash = "sha256-LMMLJFVpmoE/y3MqrgY2fmsehmzk6TkLsVoHmFUxiSw="; + }; + + packageRequires = lib.optional withHydra hydra ++ lib.optional withIvy ivy; + + postPatch = '' + substituteInPlace notdeft-xapian.el \ + --replace-fail 'defcustom notdeft-xapian-program nil' \ + "defcustom notdeft-xapian-program \"$out/bin/notdeft-xapian\"" + ''; + + files = '' + (:defaults + ${lib.optionalString withHydra ''"extras/notdeft-global-hydra.el"''} + ${lib.optionalString withHydra ''"extras/notdeft-mode-hydra.el"''} + ${lib.optionalString withIvy ''"extras/notdeft-ivy.el"''}) + ''; + + strictDeps = true; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + tclap + xapian + ]; + + preBuild = '' + $CXX -std=c++11 -o notdeft-xapian xapian/notdeft-xapian.cc -lxapian + ''; + + preInstall = '' + install -D --target-directory=$out/bin notdeft-xapian + ''; + + ignoreCompilationError = false; + + passthru = { + updateScript = unstableGitUpdater { hardcodeZeroVersion = true; }; + }; + + meta = { + homepage = "https://tero.hasu.is/notdeft/"; + description = "Fork of Deft that uses Xapian as a search engine"; + maintainers = [ lib.maintainers.nessdoor ]; + license = lib.licenses.bsd3; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ott-mode/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ott-mode/default.nix deleted file mode 100644 index 6eeead468ff22..0000000000000 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ott-mode/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ trivialBuild -, ott -, haskellPackages -}: - -trivialBuild { - pname = "ott-mode"; - - inherit (ott) src version; - - postUnpack = '' - mv $sourceRoot/emacs/ott-mode.el $sourceRoot - ''; - - meta = { - description = "Emacs ott mode (from ott sources)"; - inherit (haskellPackages.Agda.meta) homepage license; - }; -} diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ott-mode/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ott-mode/package.nix new file mode 100644 index 0000000000000..94499d71521ed --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ott-mode/package.nix @@ -0,0 +1,24 @@ +{ melpaBuild, ott }: + +melpaBuild { + pname = "ott-mode"; + + inherit (ott) src version; + + files = ''("emacs/*.el")''; + + postPatch = '' + pushd emacs + echo ";;; ott-mode.el ---" > tmp.el + cat ott-mode.el >> tmp.el + mv tmp.el ott-mode.el + popd + ''; + + ignoreCompilationError = false; + + meta = { + description = "Emacs ott mode (from ott sources)"; + inherit (ott.meta) homepage license; + }; +} diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/perl-completion/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/perl-completion/default.nix deleted file mode 100644 index dea18e30dcd83..0000000000000 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/perl-completion/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ trivialBuild -, fetchurl -}: - -trivialBuild { - pname = "perl-completion"; - - src = fetchurl { - url = "http://emacswiki.org/emacs/download/perl-completion.el"; - sha256 = "0x6qsgs4hm87k0z9q3g4p6508kc3y123j5jayll3jf3lcl2vm6ks"; - }; - - version = "1.10"; - - meta = { - broken = true; - description = "Minor mode provides useful features for editing perl codes"; - homepage = "http://emacswiki.org/emacs/PerlCompletion"; - }; -} diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/pod-mode/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/pod-mode/default.nix deleted file mode 100644 index 549633b7dfbdc..0000000000000 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/pod-mode/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ trivialBuild, lib, fetchurl }: - -trivialBuild rec { - pname = "pod-mode"; - version = "1.04"; - - src = fetchurl { - url = "mirror://cpan/authors/id/F/FL/FLORA/pod-mode-${version}.tar.gz"; - sha256 = "1wr0khymkaa65blrc5nya607c1a3sjsww49bbf8f0a6176as71sv"; - }; - - meta = with lib; { - description = "Major mode for editing .pod-files"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ qyliss ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/pod-mode/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/pod-mode/package.nix new file mode 100644 index 0000000000000..a0ae4574e4d05 --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/pod-mode/package.nix @@ -0,0 +1,37 @@ +{ + lib, + melpaBuild, + fetchurl +}: + +let + pname = "pod-mode"; + version = "1.04"; + + src = fetchurl { + url = "mirror://cpan/authors/id/F/FL/FLORA/pod-mode-${version}.tar.gz"; + hash = "sha256-W4ejlTnBKOCQWysRzrXUQwV2gFHeFpbpKkapWT2cIPM="; + }; +in +melpaBuild { + inherit pname version src; + + outputs = [ + "out" + "doc" + ]; + + postInstall = '' + mkdir -p ''${!outputDoc}/share/doc/pod-mode/ + install -Dm644 -t ''${!outputDoc}/share/doc/pod-mode/ ChangeLog README + ''; + + ignoreCompilationError = false; + + meta = { + homepage = "https://metacpan.org/dist/pod-mode"; + description = "Major mode for editing .pod-files"; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ qyliss ]; + }; +} diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/prisma-mode/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/prisma-mode/default.nix deleted file mode 100644 index 983363ae838f4..0000000000000 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/prisma-mode/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib -, fetchFromGitHub -, melpaBuild -, js2-mode -, writeText -}: - -let - rev = "5283ca7403bcb21ca0cac8ecb063600752dfd9d4"; -in melpaBuild { - pname = "prisma-mode"; - version = "20211207.0"; - - commit = rev; - - packageRequires = [ js2-mode ]; - - src = fetchFromGitHub { - owner = "pimeys"; - repo = "emacs-prisma-mode"; - inherit rev; - sha256 = "sha256-DJJfjbu27Gi7Nzsa1cdi8nIQowKH8ZxgQBwfXLB0Q/I="; - }; - - recipe = writeText "recipe" '' - (prisma-mode :repo "pimeys/emacs-prisma-mode" :fetcher github) - ''; - - meta = { - description = "Major mode for Prisma Schema Language"; - license = lib.licenses.gpl2Only; - }; -} diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/prisma-mode/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/prisma-mode/package.nix new file mode 100644 index 0000000000000..c5e20aae5e221 --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/prisma-mode/package.nix @@ -0,0 +1,31 @@ +{ + lib, + fetchFromGitHub, + melpaBuild, + js2-mode, + lsp-mode, +}: + +melpaBuild { + pname = "prisma-mode"; + version = "0-unstable-2021-12-07"; + + packageRequires = [ + js2-mode + lsp-mode + ]; + + src = fetchFromGitHub { + owner = "pimeys"; + repo = "emacs-prisma-mode"; + rev = "5283ca7403bcb21ca0cac8ecb063600752dfd9d4"; + hash = "sha256-DJJfjbu27Gi7Nzsa1cdi8nIQowKH8ZxgQBwfXLB0Q/I="; + }; + + ignoreCompilationError = false; + + meta = { + description = "Major mode for Prisma Schema Language"; + license = lib.licenses.gpl2Only; + }; +} diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/prolog-mode/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/prolog-mode/package.nix new file mode 100644 index 0000000000000..817598551977c --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/prolog-mode/package.nix @@ -0,0 +1,29 @@ +{ + lib, + melpaBuild, + fetchurl, +}: + +melpaBuild { + pname = "prolog-mode"; + ename = "prolog"; + version = "1.28"; + + src = fetchurl { + url = "https://bruda.ca/_media/emacs/prolog.el"; + hash = "sha256-ZzIDFQWPq1vI9z3btgsHgn0axN6uRQn9Tt8TnqGybOk="; + }; + + postPatch = '' + substituteInPlace prolog.el \ + --replace-fail ";; prolog.el ---" ";;; prolog.el ---" + ''; + + ignoreCompilationError = false; + + meta = { + homepage = "https://bruda.ca/emacs/prolog_mode_for_emacs/"; + description = "Prolog mode for Emacs"; + license = lib.licenses.gpl2Plus; + }; +} diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/prolog/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/prolog/default.nix deleted file mode 100644 index 3e804551666cd..0000000000000 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/prolog/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ lib, trivialBuild, fetchurl }: - -trivialBuild { - pname = "prolog-mode"; - version = "1.28"; - - src = fetchurl { - url = "https://bruda.ca/_media/emacs/prolog.el"; - sha256 = "ZzIDFQWPq1vI9z3btgsHgn0axN6uRQn9Tt8TnqGybOk="; - }; - - meta = { - homepage = "https://bruda.ca/emacs/prolog_mode_for_emacs/"; - description = "Prolog mode for Emacs"; - license = lib.licenses.gpl2Plus; - }; -} diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/rect-mark/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/rect-mark/package.nix index 8d4fcf5090c34..b44b2281d59c2 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/rect-mark/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/rect-mark/package.nix @@ -1,24 +1,32 @@ -{ lib -, trivialBuild -, fetchFromGitHub -, emacs - }: +{ + lib, + melpaBuild, + fetchFromGitHub, + gitUpdater, +}: -trivialBuild rec { - pname = "rect-mark"; +let version = "1.4"; +in +melpaBuild { + pname = "rect-mark"; + inherit version; src = fetchFromGitHub { owner = "emacsmirror"; - repo = pname; + repo = "rect-mark"; rev = version; hash = "sha256-/8T1VTYkKUxlNWXuuS54S5jpl4UxJBbgSuWc17a/VyM="; }; - meta = with lib; { + ignoreCompilationError = false; + + passthru.updateScript = gitUpdater { }; + + meta = { homepage = "http://emacswiki.org/emacs/RectangleMark"; description = "Mark a rectangle of text with highlighting"; - license = licenses.gpl2Plus; - inherit (emacs.meta) platforms; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ AndersonTorres ]; }; } diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/session-management-for-emacs/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/session-management-for-emacs/default.nix deleted file mode 100644 index f21e79c8f33d8..0000000000000 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/session-management-for-emacs/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, fetchurl, emacs, lib }: - -stdenv.mkDerivation rec { - pname = "session-management-for-emacs"; - version = "2.2a"; - - src = fetchurl { - url = "mirror://sourceforge/emacs-session/session-${version}.tar.gz"; - sha256 = "37dfba7420b5164eab90dafa9e8bf9a2c8f76505fe2fefa14a64e81fa76d0144"; - }; - - buildInputs = [ emacs ]; - - installPhase = '' - mkdir -p "$out/share/emacs/site-lisp" - cp lisp/*.el "$out/share/emacs/site-lisp/" - ''; - - meta = with lib; { - /* installation: add to your ~/.emacs - (require 'session) - (add-hook 'after-init-hook 'session-initialize) - */ - description = "Small session management for emacs"; - homepage = "https://emacs-session.sourceforge.net/"; - license = licenses.gpl2; - maintainers = with maintainers; [ ]; - }; -} diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/session-management-for-emacs/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/session-management-for-emacs/package.nix new file mode 100644 index 0000000000000..b020d158f3e39 --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/session-management-for-emacs/package.nix @@ -0,0 +1,27 @@ +{ + melpaBuild, + fetchzip, + lib, +}: + +melpaBuild rec { + pname = "session-management-for-emacs"; + ename = "session"; + version = "2.2a"; + + src = fetchzip { + url = "mirror://sourceforge/emacs-session/session-${version}.tar.gz"; + hash = "sha256-lc6NIX+lx97qCs5JqG7x0iVE6ki09Gy7DEQuPW2c+7s="; + }; + + meta = { + /* + installation: add to your ~/.emacs + (require 'session) + (add-hook 'after-init-hook 'session-initialize) + */ + description = "Small session management for emacs"; + homepage = "https://emacs-session.sourceforge.net/"; + license = lib.licenses.gpl2; + }; +} diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/sunrise-commander/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/sunrise-commander/package.nix index efc422d601f06..ee50bda060bf6 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/sunrise-commander/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/sunrise-commander/package.nix @@ -1,11 +1,13 @@ -{ lib -, trivialBuild -, fetchFromGitHub -, emacs +{ + lib, + melpaBuild, + fetchFromGitHub, + unstableGitUpdater, }: -trivialBuild { +melpaBuild { pname = "sunrise-commander"; + ename = "sunrise"; version = "0-unstable-2021-09-27"; src = fetchFromGitHub { @@ -15,9 +17,9 @@ trivialBuild { hash = "sha256-D36qiRi5OTZrBtJ/bD/javAWizZ8NLlC/YP4rdLCSsw="; }; - buildInputs = [ - emacs - ]; + ignoreCompilationError = false; + + passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; }; meta = { homepage = "https://github.com/sunrise-commander/sunrise-commander/"; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/sv-kalender/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/sv-kalender/package.nix index 48cc866029a8c..8454c581e24a8 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/sv-kalender/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/sv-kalender/package.nix @@ -1,19 +1,24 @@ -{ fetchurl, lib, trivialBuild }: +{ + lib, + fetchurl, + melpaBuild, +}: -trivialBuild { +melpaBuild { pname = "sv-kalender"; version = "1.11"; src = fetchurl { url = "https://raw.githubusercontent.com/emacsmirror/emacswiki.org/ec4fa36bdba5d2c5c4f5e0400a70768c10e969e8/sv-kalender.el"; - sha256 = "0mcx7g1pg6kfp0i4b9rh3q9csgdf3054ijswy368bxwdxsjgfz2m"; + hash = "sha256-VXz3pO6N94XM8FzLSAoYrj3NEh4wp0UiuG6ad8M7nVU="; }; - meta = with lib; { - description = "Swedish calendar for Emacs"; + ignoreCompilationError = false; + + meta = { homepage = "https://www.emacswiki.org/emacs/sv-kalender.el"; - platforms = platforms.all; - license = licenses.gpl3Plus; - maintainers = [ maintainers.rycee ]; + description = "Swedish calendar for Emacs"; + license = lib.licenses.gpl3Plus; + maintainers = [ lib.maintainers.rycee ]; }; } diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/texpresso/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/texpresso/default.nix index cd449ab0f5d9a..f92bfed79c342 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/texpresso/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/texpresso/default.nix @@ -1,15 +1,16 @@ -{ lib -, trivialBuild -, texpresso +{ + lib, + melpaBuild, + texpresso, }: -trivialBuild { +melpaBuild { pname = "texpresso"; version = texpresso.version; src = texpresso.src; - preInstall = '' - cd emacs - ''; + files = ''("emacs/*.el")''; + + ignoreCompilationError = false; meta = { inherit (texpresso.meta) homepage license; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tree-sitter-langs/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tree-sitter-langs/default.nix index d9e2b850588c8..a0e8969f466bf 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tree-sitter-langs/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tree-sitter-langs/default.nix @@ -1,6 +1,5 @@ { lib , stdenv -, writeText , melpaStablePackages , runCommand , tree-sitter-grammars @@ -45,6 +44,8 @@ melpaStablePackages.tree-sitter-langs.overrideAttrs(old: { fi '') plugins); + ignoreCompilationError = false; + passthru = old.passthru or {} // { inherit plugins; withPlugins = fn: final.tree-sitter-langs.override { plugins = fn tree-sitter-grammars; }; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/treesit-grammars/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/treesit-grammars/package.nix index af720337ff05e..af720337ff05e 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/treesit-grammars/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/treesit-grammars/package.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/Cargo.lock b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/Cargo.lock new file mode 100644 index 0000000000000..7565a59cf88c9 --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/Cargo.lock @@ -0,0 +1,285 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "aho-corasick" +version = "0.7.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" +dependencies = [ + "memchr", +] + +[[package]] +name = "anyhow" +version = "1.0.51" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b26702f315f53b6071259e15dd9d64528213b44d61de1ec926eca7715d62203" + +[[package]] +name = "cc" +version = "1.0.72" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22a9137b95ea06864e018375b72adfb7db6e6f68cfc8df5a04d00288050485ee" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "ctor" +version = "0.1.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccc0a48a9b826acdf4028595adc9db92caea352f7af011a3034acd172a52a0aa" +dependencies = [ + "quote", + "syn", +] + +[[package]] +name = "darling" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d706e75d87e35569db781a9b5e2416cff1236a47ed380831f959382ccd5f858" +dependencies = [ + "darling_core", + "darling_macro", +] + +[[package]] +name = "darling_core" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0c960ae2da4de88a91b2d920c2a7233b400bc33cb28453a2987822d8392519b" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim", + "syn", +] + +[[package]] +name = "darling_macro" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9b5a2f4ac4969822c62224815d069952656cadc7084fdca9751e6d959189b72" +dependencies = [ + "darling_core", + "quote", + "syn", +] + +[[package]] +name = "emacs" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6797a940189d353de79bec32abe717aeeecd79a08236e84404c888354e040665" +dependencies = [ + "anyhow", + "ctor", + "emacs-macros", + "emacs_module", + "once_cell", + "rustc_version", + "thiserror", +] + +[[package]] +name = "emacs-macros" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69656fdfe7c2608b87164964db848b5c3795de7302e3130cce7131552c6be161" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "emacs-tree-sitter" +version = "0.18.0" +dependencies = [ + "emacs", + "libloading", + "once_cell", + "tree-sitter", +] + +[[package]] +name = "emacs_module" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3067bc974045ed2c6db333bd4fc30d3bdaafa6421a9a889fa7b2826b6f7f2fa" + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + +[[package]] +name = "libloading" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afe203d669ec979b7128619bae5a63b7b42e9203c1b29146079ee05e2f604b52" +dependencies = [ + "cfg-if", + "winapi", +] + +[[package]] +name = "memchr" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a" + +[[package]] +name = "once_cell" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56" + +[[package]] +name = "proc-macro2" +version = "1.0.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb37d2df5df740e582f28f8560cf425f52bb267d872fe58358eadb554909f07a" +dependencies = [ + "unicode-xid", +] + +[[package]] +name = "quote" +version = "1.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38bc8cc6a5f2e3655e0899c1b848643b2562f853f114bfec7be120678e3ace05" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "regex" +version = "1.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.6.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" + +[[package]] +name = "rustc_version" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" +dependencies = [ + "semver", +] + +[[package]] +name = "semver" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" +dependencies = [ + "semver-parser", +] + +[[package]] +name = "semver-parser" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" + +[[package]] +name = "strsim" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c" + +[[package]] +name = "syn" +version = "1.0.82" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8daf5dd0bb60cbd4137b1b587d2fc0ae729bc07cf01cd70b36a1ed5ade3b9d59" +dependencies = [ + "proc-macro2", + "quote", + "unicode-xid", +] + +[[package]] +name = "thiserror" +version = "1.0.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "854babe52e4df1653706b98fcfc05843010039b406875930a70e4d9644e5c417" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "tree-sitter" +version = "0.20.0" +source = "git+https://github.com/ubolonton/tree-sitter?branch=improve-text-provider#475b822f47bdc58d832533448b6f6d9818554f37" +dependencies = [ + "cc", + "regex", +] + +[[package]] +name = "unicode-xid" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" + +[[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" diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/default.nix deleted file mode 100644 index 018299650a9a4..0000000000000 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/default.nix +++ /dev/null @@ -1,85 +0,0 @@ -{ lib -, symlinkJoin -, melpaBuild -, fetchFromGitHub -, rustPlatform -, writeText -, clang -, llvmPackages - -, runtimeShell -, writeScript -, python3 -, nix-prefetch-github -, nix -}: - -let - - srcMeta = lib.importJSON ./src.json; - inherit (srcMeta) version; - - src = fetchFromGitHub srcMeta.src; - - tsc = melpaBuild { - inherit src; - inherit version; - - pname = "tsc"; - commit = version; - - sourceRoot = "${src.name}/core"; - - recipe = writeText "recipe" '' - (tsc - :repo "emacs-tree-sitter/elisp-tree-sitter" - :fetcher github) - ''; - }; - - tsc-dyn = rustPlatform.buildRustPackage { - inherit version; - inherit src; - - pname = "tsc-dyn"; - - nativeBuildInputs = [ rustPlatform.bindgenHook ]; - sourceRoot = "${src.name}/core"; - - postInstall = '' - LIB=($out/lib/libtsc_dyn.*) - TSC_PATH=$out/share/emacs/site-lisp/elpa/tsc-${version} - install -d $TSC_PATH - install -m444 $out/lib/libtsc_dyn.* $TSC_PATH/''${LIB/*libtsc_/tsc-} - echo -n $version > $TSC_PATH/DYN-VERSION - rm -r $out/lib - ''; - - inherit (srcMeta) cargoHash; - }; - -in symlinkJoin { - name = "tsc-${version}"; - paths = [ tsc tsc-dyn ]; - - passthru = { - updateScript = let - pythonEnv = python3.withPackages(ps: [ ps.requests ]); - in writeScript "tsc-update" '' - #!${runtimeShell} - set -euo pipefail - export PATH=${lib.makeBinPath [ - nix-prefetch-github - nix - pythonEnv - ]}:$PATH - exec python3 ${builtins.toString ./update.py} ${builtins.toString ./.} - ''; - }; - - meta = { - description = "Core APIs of the Emacs binding for tree-sitter"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ pimeys ]; - }; -} diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/package.nix new file mode 100644 index 0000000000000..cb020bc7efaf7 --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/package.nix @@ -0,0 +1,57 @@ +{ lib +, melpaBuild +, fetchFromGitHub +, rustPlatform +, stdenv +, nix-update-script +}: + +let + libExt = stdenv.hostPlatform.extensions.sharedLibrary; + + tsc-dyn = rustPlatform.buildRustPackage rec { + pname = "tsc-dyn"; + version = "0.18.0"; + + src = fetchFromGitHub { + owner = "emacs-tree-sitter"; + repo = "emacs-tree-sitter"; + rev = version; + hash = "sha256-LrakDpP3ZhRQqz47dPcyoQnu5lROdaNlxGaQfQT6u+k="; + }; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "tree-sitter-0.20.0" = "sha256-hGiJZFrQpO+xHXosbEKV2k64e2D8auNGEtdrFk2SsOU="; + }; + }; + + sourceRoot = "${src.name}/core"; + + postInstall = '' + pushd $out/lib + mv --verbose libtsc_dyn${libExt} tsc-dyn${libExt} + echo -n $version > DYN-VERSION + popd + ''; + }; +in melpaBuild { + pname = "tsc"; + inherit (tsc-dyn) version src; + + files = ''("core/*.el" "${tsc-dyn}/lib/*")''; + + ignoreCompilationError = false; + + passthru = { + inherit tsc-dyn; + updateScript = nix-update-script { attrPath = "emacsPackages.tsc.tsc-dyn"; }; + }; + + meta = { + description = "Core APIs of the Emacs binding for tree-sitter"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pimeys ]; + }; +} diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/src.json b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/src.json deleted file mode 100644 index b3ac6a030644e..0000000000000 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/src.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "src": { - "owner": "emacs-tree-sitter", - "repo": "elisp-tree-sitter", - "rev": "909717c685ff5a2327fa2ca8fb8a25216129361c", - "hash": "sha256-LrakDpP3ZhRQqz47dPcyoQnu5lROdaNlxGaQfQT6u+k=" - }, - "version": "0.18.0", - "cargoHash": "sha256-IRCZqszBkGF8anF/kpcPOzHdOP4lAtJBAp6FS5tAOx8=" -} diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/update.py b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/update.py deleted file mode 100644 index 77ef632ded6ec..0000000000000 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/update.py +++ /dev/null @@ -1,123 +0,0 @@ -#!/usr/bin/env python3 -from textwrap import dedent -from os.path import ( - abspath, - dirname, - join, -) -from typing import ( - Dict, - Any, -) -import subprocess -import tempfile -import json -import sys -import re - -import requests - - -def eval_drv(nixpkgs: str, expr: str) -> Any: - expr = "\n".join( - ( - "with (import %s {});" % nixpkgs, - expr, - ) - ) - - with tempfile.NamedTemporaryFile(mode="w") as f: - f.write(dedent(expr)) - f.flush() - p = subprocess.run( - ["nix-instantiate", "--json", f.name], stdout=subprocess.PIPE, check=True - ) - - return p.stdout.decode().strip() - - -def get_src(tag_name: str) -> Dict[str, str]: - p = subprocess.run( - [ - "nix-prefetch-github", - "--rev", - tag_name, - "--json", - "emacs-tree-sitter", - "elisp-tree-sitter", - ], - stdout=subprocess.PIPE, - check=True, - ) - src = json.loads(p.stdout) - - fields = ["owner", "repo", "rev", "hash"] - - return {f: src[f] for f in fields} - - -def get_cargo_hash(drv_path: str): - # Note: No check=True since we expect this command to fail - p = subprocess.run(["nix-store", "-r", drv_path], stderr=subprocess.PIPE) - - stderr = p.stderr.decode() - lines = iter(stderr.split("\n")) - - for l in lines: - if l.startswith("error: hash mismatch in fixed-output derivation"): - break - else: - raise ValueError("Did not find expected hash mismatch message") - - for l in lines: - m = re.match(r"\s+got:\s+(.+)$", l) - if m: - return m.group(1) - - raise ValueError("Could not extract actual hash: ", stderr) - - -if __name__ == "__main__": - cwd = sys.argv[1] - - # This should point to the root default.nix of Nixpkgs tree - nixpkgs = abspath(join(cwd, "../../../../../../..")) - - tag_name = requests.get( - "https://api.github.com/repos/emacs-tree-sitter/elisp-tree-sitter/releases/latest" - ).json()["tag_name"] - - src = get_src(tag_name) - - with tempfile.NamedTemporaryFile(mode="w") as f: - json.dump(src, f) - f.flush() - - drv_path = eval_drv( - nixpkgs, - """ - rustPlatform.buildRustPackage rec { - pname = "tsc-dyn"; - version = "%s"; - nativeBuildInputs = [ clang ]; - src = fetchFromGitHub (lib.importJSON %s); - sourceRoot = "${src.name}/core"; - cargoHash = lib.fakeHash; - } - """ - % (tag_name, f.name), - ) - - cargo_hash = get_cargo_hash(drv_path) - - with open(join(cwd, "src.json"), mode="w") as f: - json.dump( - { - "src": src, - "version": tag_name, - "cargoHash": cargo_hash, - }, - f, - indent=2, - ) - f.write("\n") diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/urweb-mode/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/urweb-mode/package.nix index 6f7e822d81d37..0d000a43d7385 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/urweb-mode/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/urweb-mode/package.nix @@ -1,11 +1,12 @@ -{ lib -, trivialBuild -, urweb -, cl-lib -, flycheck +{ + lib, + melpaBuild, + urweb, + cl-lib, + flycheck, }: -trivialBuild { +melpaBuild { pname = "urweb-mode"; inherit (urweb) src version; @@ -15,9 +16,11 @@ trivialBuild { flycheck ]; - postUnpack = '' - sourceRoot=$sourceRoot/src/elisp - ''; + files = ''("src/elisp/*.el")''; + + dontConfigure = true; + + ignoreCompilationError = false; meta = { description = "Major mode for editing Ur/Web"; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/voicemacs/add-missing-require.patch b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/voicemacs/0000-add-missing-require.patch index 58c043bf78ede..58c043bf78ede 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/voicemacs/add-missing-require.patch +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/voicemacs/0000-add-missing-require.patch diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/voicemacs/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/voicemacs/default.nix deleted file mode 100644 index 60f3e3a75e053..0000000000000 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/voicemacs/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ trivialBuild -, lib -, fetchFromGitHub -, avy -, json-rpc-server -, f -, nav-flash -, helm -, cl-lib -, porthole -, default-text-scale -, bind-key -, yasnippet -, company -, company-quickhelp -}: - -trivialBuild { - pname = "voicemacs"; - version = "0-unstable-2022-02-16"; - - src = fetchFromGitHub { - owner = "jcaw"; - repo = "voicemacs"; - rev = "d91de2a31c68ab083172ade2451419d6bd7bb389"; - sha256 = "sha256-/MBB2R9/V0aYZp15e0vx+67ijCPp2iPlgxe262ldmtc="; - }; - - patches = [ ./add-missing-require.patch ]; - - packageRequires = [ - avy - json-rpc-server - f - nav-flash - helm - cl-lib - porthole - default-text-scale - bind-key - yasnippet - company-quickhelp - ]; - - meta = { - description = "Voicemacs is a set of utilities for controlling Emacs by voice"; - license = lib.licenses.gpl3Only; - platforms = lib.platforms.all; - }; -} diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/voicemacs/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/voicemacs/package.nix new file mode 100644 index 0000000000000..94e3d17828f22 --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/voicemacs/package.nix @@ -0,0 +1,62 @@ +{ + lib, + avy, + bind-key, + cl-lib, + company, + company-quickhelp, + default-text-scale, + f, + fetchFromGitHub, + helm, + json-rpc-server, + melpaBuild, + nav-flash, + porthole, + unstableGitUpdater, + yasnippet, + el-patch, +}: + +melpaBuild { + pname = "voicemacs"; + version = "0-unstable-2024-01-03"; + + src = fetchFromGitHub { + owner = "jcaw"; + repo = "voicemacs"; + rev = "d93f15d855d61f78827d78c9ca3508766266366c"; + hash = "sha256-D/5+3SgECEb7A8qQqsAV1TQr+lA8EyOjf6NesnV2gos="; + }; + + patches = [ + ./0000-add-missing-require.patch + ]; + + packageRequires = [ + avy + bind-key + cl-lib + company + company-quickhelp + default-text-scale + f + helm + json-rpc-server + nav-flash + porthole + yasnippet + el-patch + ]; + + ignoreCompilationError = false; + + passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; }; + + meta = { + homepage = "https://github.com/jcaw/voicemacs/"; + description = "Set of utilities for controlling Emacs by voice"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ AndersonTorres ]; + }; +} diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/wat-mode/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/wat-mode/package.nix index 6eb5b9478541c..da9bde05eba91 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/wat-mode/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/wat-mode/package.nix @@ -1,23 +1,24 @@ -# Manually packaged until it is upstreamed to melpa -# See https://github.com/devonsparks/wat-mode/issues/1 -{ lib, melpaBuild, fetchFromGitHub, writeText }: +{ + lib, + melpaBuild, + fetchFromGitHub, + unstableGitUpdater, +}: -melpaBuild rec { +melpaBuild { pname = "wat-mode"; - version = "20220713.1"; + version = "0-unstable-2022-07-13"; src = fetchFromGitHub { owner = "devonsparks"; - repo = pname; + repo = "wat-mode"; rev = "46b4df83e92c585295d659d049560dbf190fe501"; hash = "sha256-jV5V3TRY+D3cPSz3yFwVWn9yInhGOYIaUTPEhsOBxto="; }; - commit = "46b4df83e92c585295d659d049560dbf190fe501"; + ignoreCompilationError = false; - recipe = writeText "recipe" '' - (wat-mode :repo "devonsparks/wat-mode" :fetcher github) - ''; + passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; }; meta = { homepage = "https://github.com/devonsparks/wat-mode"; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/xapian-lite/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/xapian-lite/package.nix index afd1ddb0fbebd..afd1ddb0fbebd 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/xapian-lite/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/xapian-lite/package.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/yes-no/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/yes-no/package.nix index 2cb229a4e1e39..41c0fcc1fdad0 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/yes-no/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/yes-no/package.nix @@ -1,19 +1,24 @@ -{ lib, fetchurl, trivialBuild }: +{ + lib, + fetchurl, + melpaBuild, +}: -trivialBuild { +melpaBuild { pname = "yes-no"; version = "0-unstable-2017-10-01"; src = fetchurl { url = "https://raw.githubusercontent.com/emacsmirror/emacswiki.org/143bcaeb679a8fa8a548e92a5a9d5c2baff50d9c/yes-no.el"; - sha256 = "03w4wfx885y89ckyd5d95n2571nmmzrll6kr0yan3ip2aw28xq3i"; + hash = "sha256-ceCOBFfixmGVB3kaSvOv1YZThC2pleYnS8gXhLrjhA8="; }; - meta = with lib; { - description = "Specify use of `y-or-n-p' or `yes-or-no-p' on a case-by-case basis"; + ignoreCompilationError = false; + + meta = { homepage = "https://www.emacswiki.org/emacs/yes-no.el"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ jcs090218 ]; - platforms = platforms.all; + description = "Specify use of `y-or-n-p' or `yes-or-no-p' on a case-by-case basis"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ jcs090218 ]; }; } diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/youtube-dl/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/youtube-dl/default.nix deleted file mode 100644 index ec25ab9b1bdf8..0000000000000 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/youtube-dl/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib -, fetchFromGitHub -, trivialBuild -, emacs -}: - -trivialBuild { - pname = "youtube-dl"; - version = "1.0-unstable-2018-10-12"; - - src = fetchFromGitHub { - owner = "skeeto"; - repo = "youtube-dl-emacs"; - rev = "af877b5bc4f01c04fccfa7d47a2c328926f20ef4"; - sha256 = "sha256-Etl95rcoRACDPjcTPQqYK2L+w8OZbOrTrRT0JadMdH4="; - }; - - meta = with lib; { - description = "Emacs youtube-dl download manager"; - homepage = "https://github.com/skeeto/youtube-dl-emacs"; - license = licenses.unlicense; - maintainers = with maintainers; [ leungbk ]; - inherit (emacs.meta) platforms; - }; -} diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/youtube-dl/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/youtube-dl/package.nix new file mode 100644 index 0000000000000..b8bb5cd8dc334 --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/youtube-dl/package.nix @@ -0,0 +1,29 @@ +{ + lib, + fetchFromGitHub, + melpaBuild, + unstableGitUpdater, +}: + +melpaBuild { + pname = "youtube-dl"; + version = "1.0-unstable-2018-10-12"; + + src = fetchFromGitHub { + owner = "skeeto"; + repo = "youtube-dl-emacs"; + rev = "af877b5bc4f01c04fccfa7d47a2c328926f20ef4"; + hash = "sha256-Etl95rcoRACDPjcTPQqYK2L+w8OZbOrTrRT0JadMdH4="; + }; + + ignoreCompilationError = false; + + passthru.updateScript = unstableGitUpdater { }; + + meta = { + description = "Emacs youtube-dl download manager"; + homepage = "https://github.com/skeeto/youtube-dl-emacs"; + license = lib.licenses.unlicense; + maintainers = with lib.maintainers; [ leungbk ]; + }; +} diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/zstd/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/zstd/default.nix new file mode 100644 index 0000000000000..4dfe2484dbfdd --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/zstd/default.nix @@ -0,0 +1,37 @@ +{ + lib, + melpaBuild, + stdenv, + fetchFromGitHub, + zstd, +}: + +let + libExt = stdenv.hostPlatform.extensions.sharedLibrary; +in +melpaBuild { + pname = "zstd"; + version = "0-unstable-2020-06-03"; + + src = fetchFromGitHub { + owner = "syohex"; + repo = "emacs-zstd"; + rev = "072b264e2cbd5c05be06a1208ebccc2dab44be39"; + hash = "sha256-p8bxefytTOSV6vIG8PAPBXfVKA2rfmWdRtVwjE42mAw="; + }; + + buildInputs = [ zstd ]; + + preBuild = '' + $CC -std=gnu99 -shared -o zstd-core${libExt} zstd-core.c -lzstd + ''; + + files = ''(:defaults "zstd-core${libExt}")''; + + meta = { + homepage = "https://github.com/syohex/emacs-zstd"; + description = "Zstd binding for Emacs Lisp"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ nagy ]; + }; +} diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix index bb45c383487cc..e680e1f7e63e4 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix @@ -23,41 +23,22 @@ formats commits for you. */ +let + # Read ./recipes-archive-melpa.json in an outer let to make sure we only do this once. + defaultArchive = builtins.fromJSON (builtins.readFile ./recipes-archive-melpa.json); +in + { lib, pkgs }: variant: self: let - dontConfigure = pkg: - if pkg != null then pkg.override (args: { - melpaBuild = drv: args.melpaBuild (drv // { - dontConfigure = true; - }); - }) else null; - - markBroken = pkg: - if pkg != null then pkg.override (args: { - melpaBuild = drv: args.melpaBuild (drv // { - meta = (drv.meta or { }) // { broken = true; }; - }); - }) else null; - - externalSrc = pkg: epkg: - if pkg != null then pkg.override (args: { - melpaBuild = drv: args.melpaBuild (drv // { - inherit (epkg) src version; - - propagatedUserEnvPkgs = [ epkg ]; - }); - }) else null; - - buildWithGit = pkg: pkg.overrideAttrs (attrs: { - nativeBuildInputs = - (attrs.nativeBuildInputs or [ ]) ++ [ pkgs.git ]; - }); - - fix-rtags = pkg: - if pkg != null then dontConfigure (externalSrc pkg pkgs.rtags) - else null; - - generateMelpa = lib.makeOverridable ({ archiveJson ? ./recipes-archive-melpa.json + inherit (import ./lib-override-helper.nix pkgs) + buildWithGit + dontConfigure + externalSrc + fix-rtags + markBroken + ; + + generateMelpa = lib.makeOverridable ({ archiveJson ? defaultArchive }: let inherit (import ./libgenerated.nix lib self) melpaDerivation; @@ -66,7 +47,7 @@ let (s: s != null) (map (melpaDerivation variant) - (lib.importJSON archiveJson) + (if builtins.isList archiveJson then archiveJson else lib.importJSON archiveJson) ) ) ); @@ -125,7 +106,7 @@ let ligo-mode = if super.ligo-mode.version == "0.3" then markBroken super.ligo-mode - else null; # auto-updater is failing; use manual one + else super.ligo-mode; # upstream issue: missing file header link = markBroken super.link; @@ -152,6 +133,13 @@ let # Expects bash to be at /bin/bash ac-rtags = fix-rtags super.ac-rtags; + age = super.age.overrideAttrs (attrs: { + postPatch = attrs.postPatch or "" + '' + substituteInPlace age.el \ + --replace-fail 'age-program (executable-find "age")' 'age-program "${lib.getExe pkgs.age}"' + ''; + }); + airline-themes = super.airline-themes.override { inherit (self.melpaPackages) powerline; }; @@ -181,30 +169,30 @@ let buildInputs = old.buildInputs ++ [ pkgs.sqlite ]; postBuild = '' - cd source/sqlite + pushd sqlite make - cd - + popd ''; postInstall = (old.postInstall or "") + "\n" + '' - install -m=755 -D source/sqlite/emacsql-sqlite \ + install -m=755 -D sqlite/emacsql-sqlite \ $out/share/emacs/site-lisp/elpa/emacsql-${old.version}/sqlite/emacsql-sqlite ''; stripDebugList = [ "share" ]; }); - emacsql-sqlite = super.emacsql-sqlite.overrideAttrs (old: { + emacsql-sqlite = super.emacsql-sqlite.overrideAttrs (old: lib.optionalAttrs (lib.versionOlder old.version "20240808.2016") { buildInputs = old.buildInputs ++ [ pkgs.sqlite ]; postBuild = '' - cd source/sqlite + pushd sqlite make - cd - + popd ''; postInstall = (old.postInstall or "") + "\n" + '' - install -m=755 -D source/sqlite/emacsql-sqlite \ + install -m=755 -D sqlite/emacsql-sqlite \ $out/share/emacs/site-lisp/elpa/emacsql-sqlite-${old.version}/sqlite/emacsql-sqlite ''; @@ -247,7 +235,7 @@ let # - https://github.com/vedang/pdf-tools/issues/109 CXXFLAGS = "-std=c++17"; - nativeBuildInputs = [ + nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.autoconf pkgs.automake pkgs.pkg-config @@ -265,7 +253,7 @@ let pkgs.zlib.dev pkgs.cairo.dev ] - ++ lib.optional pkgs.stdenv.isLinux pkgs.stdenv.cc.libc.dev + ++ lib.optional pkgs.stdenv.hostPlatform.isLinux pkgs.stdenv.cc.libc.dev ) )} server/epdfinfo ''; @@ -291,7 +279,7 @@ let ''; postInstall = (old.postInstall or "") + "\n" + '' - install source/hotfuzz-module.so $out/share/emacs/site-lisp/elpa/hotfuzz-* + install hotfuzz-module.so $out/share/emacs/site-lisp/elpa/hotfuzz-* ''; }); @@ -299,26 +287,25 @@ let cmakeFlags = old.cmakeFlags or [ ] ++ [ "-DCMAKE_INSTALL_BINDIR=bin" ]; env.NIX_CFLAGS_COMPILE = "-UCLANG_RESOURCE_DIR"; preConfigure = '' - cd server + pushd server ''; preBuild = '' make install -D bin/irony-server $out/bin/irony-server - cd .. + popd ''; checkPhase = '' - cd source/server + pushd server make check - cd ../.. + popd ''; preFixup = '' rm -rf $out/share/emacs/site-lisp/elpa/*/server ''; dontUseCmakeBuildDir = true; - doCheck = pkgs.stdenv.isLinux; - packageRequires = [ self.emacs ]; - buildInputs = [ pkgs.llvmPackages.libclang self.emacs ]; - nativeBuildInputs = [ pkgs.cmake pkgs.llvmPackages.llvm ]; + doCheck = pkgs.stdenv.hostPlatform.isLinux; + buildInputs = old.buildInputs ++ [ pkgs.llvmPackages.libclang ]; + nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.cmake pkgs.llvmPackages.llvm ]; }); # tries to write a log file to $HOME @@ -338,18 +325,14 @@ let buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.enchant2 ]; postBuild = '' - pushd working/jinx NIX_CFLAGS_COMPILE="$($PKG_CONFIG --cflags enchant-2) $NIX_CFLAGS_COMPILE" $CC -shared -o jinx-mod${libExt} jinx-mod.c -lenchant-2 - popd ''; postInstall = (old.postInstall or "") + "\n" + '' - pushd source outd=$(echo $out/share/emacs/site-lisp/elpa/jinx-*) install -m444 --target-directory=$outd jinx-mod${libExt} rm $outd/jinx-mod.c $outd/emacs-module.h - popd ''; meta = old.meta // { @@ -361,17 +344,13 @@ let buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.sqlite ]; postBuild = '' - pushd working/sqlite3 make - popd ''; postInstall = (old.postInstall or "") + "\n" + '' - pushd source outd=$out/share/emacs/site-lisp/elpa/sqlite3-* install -m444 -t $outd sqlite3-api.so rm $outd/*.c $outd/*.h - popd ''; meta = old.meta // { @@ -379,32 +358,26 @@ let }; }); - libgit = super.libgit.overrideAttrs(attrs: { - nativeBuildInputs = (attrs.nativeBuildInputs or []) ++ [ pkgs.cmake ]; - buildInputs = attrs.buildInputs ++ [ pkgs.libgit2 ]; - dontUseCmakeBuildDir = true; - postPatch = '' - sed -i s/'add_subdirectory(libgit2)'// CMakeLists.txt - ''; - postBuild = '' - pushd working/libgit - make - popd - ''; - postInstall = (attrs.postInstall or "") + "\n" + '' - outd=$(echo $out/share/emacs/site-lisp/elpa/libgit-**) - mkdir $outd/build - install -m444 -t $outd/build ./source/src/libegit2.so - rm -r $outd/src $outd/Makefile $outd/CMakeLists.txt - ''; - }); - evil-magit = buildWithGit super.evil-magit; eopengrok = buildWithGit super.eopengrok; forge = buildWithGit super.forge; + gnuplot = super.gnuplot.overrideAttrs (attrs: { + postPatch = attrs.postPatch or "" + '' + substituteInPlace gnuplot.el \ + --replace-fail 'gnuplot-program "gnuplot"' 'gnuplot-program "${lib.getExe pkgs.gnuplot}"' + ''; + }); + + gnuplot-mode = super.gnuplot-mode.overrideAttrs (attrs: { + postPatch = attrs.postPatch or "" + '' + substituteInPlace gnuplot-mode.el \ + --replace-fail 'gnuplot-program "gnuplot"' 'gnuplot-program "${lib.getExe pkgs.gnuplot}"' + ''; + }); + magit = buildWithGit super.magit; magit-find-file = buildWithGit super.magit-find-file; @@ -475,6 +448,13 @@ let orgit-forge = buildWithGit super.orgit-forge; + ormolu = super.ormolu.overrideAttrs (attrs: { + postPatch = attrs.postPatch or "" + '' + substituteInPlace ormolu.el \ + --replace-fail 'ormolu-process-path "ormolu"' 'ormolu-process-path "${lib.getExe pkgs.ormolu}"' + ''; + }); + ox-rss = buildWithGit super.ox-rss; python-isort = super.python-isort.overrideAttrs (attrs: { @@ -509,12 +489,10 @@ let rime = super.rime.overrideAttrs (old: { buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.librime ]; preBuild = (old.preBuild or "") + '' - make lib - mkdir -p /build/rime-lib - cp *.so /build/rime-lib + make lib CC=$CC MODULE_FILE_SUFFIX=${pkgs.stdenv.hostPlatform.extensions.sharedLibrary} ''; postInstall = (old.postInstall or "") + '' - install -m444 -t $out/share/emacs/site-lisp/elpa/rime-* /build/rime-lib/*.so + install -m444 -t $out/share/emacs/site-lisp/elpa/rime-* librime-emacs.* ''; }); @@ -525,7 +503,7 @@ let # Telega has a server portion for it's network protocol telega = super.telega.overrideAttrs (old: { buildInputs = old.buildInputs ++ [ pkgs.tdlib ]; - nativeBuildInputs = [ pkgs.pkg-config ]; + nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkg-config ]; postPatch = '' substituteInPlace telega-customize.el \ @@ -539,14 +517,14 @@ let ''; postBuild = '' - cd source/server + pushd server make - cd - + popd ''; postInstall = (old.postInstall or "") + "\n" + '' mkdir -p $out/bin - install -m755 -Dt $out/bin ./source/server/telega-server + install -m755 -Dt $out/bin server/telega-server ''; }); @@ -570,18 +548,32 @@ let ''; }); + units-mode = super.units-mode.overrideAttrs (attrs: { + postPatch = attrs.postPatch or "" + '' + substituteInPlace units-mode.el \ + --replace-fail 'units-binary-path "units"' 'units-binary-path "${lib.getExe pkgs.units}"' + ''; + }); + vdiff-magit = super.vdiff-magit.overrideAttrs (attrs: { nativeBuildInputs = (attrs.nativeBuildInputs or [ ]) ++ [ pkgs.git ]; }); + zig-mode = super.zig-mode.overrideAttrs (attrs: { + postPatch = attrs.postPatch or "" + '' + substituteInPlace zig-mode.el \ + --replace-fail 'zig-zig-bin "zig"' 'zig-zig-bin "${lib.getExe pkgs.zig}"' + ''; + }); + zmq = super.zmq.overrideAttrs (old: { stripDebugList = [ "share" ]; preBuild = '' export EZMQ_LIBDIR=$(mktemp -d) make ''; - nativeBuildInputs = [ + nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.autoconf pkgs.automake pkgs.pkg-config @@ -667,7 +659,7 @@ let }; vterm = super.vterm.overrideAttrs (old: { - nativeBuildInputs = [ pkgs.cmake ]; + nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.cmake ]; buildInputs = old.buildInputs ++ [ self.emacs pkgs.libvterm-neovim ]; cmakeFlags = [ "-DEMACS_SOURCE=${self.emacs.src}" @@ -676,10 +668,8 @@ let # we need the proper out directory to exist, so we do this in the # postInstall instead of postBuild postInstall = (old.postInstall or "") + "\n" + '' - pushd source/build >/dev/null make install -m444 -t $out/share/emacs/site-lisp/elpa/vterm-** ../*.so - popd > /dev/null rm -rf $out/share/emacs/site-lisp/elpa/vterm-**/{CMake*,build,*.c,*.h} ''; }); @@ -712,14 +702,12 @@ let # Build a helper executable that interacts with the macOS Dictionary.app osx-dictionary = - if pkgs.stdenv.isDarwin + if pkgs.stdenv.hostPlatform.isDarwin then super.osx-dictionary.overrideAttrs (old: { buildInputs = old.buildInputs ++ (with pkgs.darwin.apple_sdk.frameworks; [CoreServices Foundation]); - dontUnpack = false; - buildPhase = (old.buildPhase or "") + '' - cd source + postBuild = (old.postBuild or "") + '' $CXX -O3 -framework CoreServices -framework Foundation osx-dictionary.m -o osx-dictionary-cli ''; postInstall = (old.postInstall or "") + "\n" + '' @@ -735,5 +723,4 @@ let in lib.mapAttrs (n: v: if lib.hasAttr n overrides then overrides.${n} else v) super); in -(generateMelpa { }) -// { __attrsFailEvaluation = true; } +generateMelpa { } diff --git a/pkgs/applications/editors/emacs/elisp-packages/nongnu-common-overrides.nix b/pkgs/applications/editors/emacs/elisp-packages/nongnu-common-overrides.nix new file mode 100644 index 0000000000000..d6ac00a3a817c --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/nongnu-common-overrides.nix @@ -0,0 +1,21 @@ +pkgs: + +self: super: + +{ + p4-16-mode = super.p4-16-mode.overrideAttrs { + # workaround https://github.com/NixOS/nixpkgs/issues/301795 + prePatch = '' + mkdir tmp-untar-dir + pushd tmp-untar-dir + + tar --extract --verbose --file=$src + content_directory=$(echo p4-16-mode-*) + cp --verbose $content_directory/p4-16-mode-pkg.el $content_directory/p4-pkg.el + src=$PWD/$content_directory.tar + tar --create --verbose --file=$src $content_directory + + popd + ''; + }; +} diff --git a/pkgs/applications/editors/emacs/elisp-packages/nongnu-devel-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/nongnu-devel-generated.nix new file mode 100644 index 0000000000000..c416ba6cdb342 --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/nongnu-devel-generated.nix @@ -0,0 +1,5271 @@ +{ callPackage }: +{ + adoc-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "adoc-mode"; + ename = "adoc-mode"; + version = "0.8.0snapshot0.20240218.103518"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/adoc-mode-0.8.0snapshot0.20240218.103518.tar"; + sha256 = "149cj68amidnb9pgg3xh6bpfaxbcqlv5wnacajp4pr4cn5byr0sy"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/adoc-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + afternoon-theme = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "afternoon-theme"; + ename = "afternoon-theme"; + version = "0.1.0.20140104.185934"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/afternoon-theme-0.1.0.20140104.185934.tar"; + sha256 = "07x6mfmwci8m7dsrvvd679a1pj56dcd82bzr9dnhi7hy5nvnb93d"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/afternoon-theme.html"; + license = lib.licenses.free; + }; + } + ) { }; + alect-themes = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "alect-themes"; + ename = "alect-themes"; + version = "0.10.0.20211022.165129"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/alect-themes-0.10.0.20211022.165129.tar"; + sha256 = "1p9p5p58cyz5m1bsrm4icazm049n4q72mwawp0zlibsdqywjliqj"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/alect-themes.html"; + license = lib.licenses.free; + }; + } + ) { }; + ample-theme = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "ample-theme"; + ename = "ample-theme"; + version = "0.3.0.0.20240426.84530"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/ample-theme-0.3.0.0.20240426.84530.tar"; + sha256 = "00h1za3qdqjgaxr2c3qlmz374gl9fhrgg7r453wvkz1fy6n9vp5i"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/ample-theme.html"; + license = lib.licenses.free; + }; + } + ) { }; + annotate = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "annotate"; + ename = "annotate"; + version = "2.2.2.0.20240509.114401"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/annotate-2.2.2.0.20240509.114401.tar"; + sha256 = "0b78ilx6qwn2g0l6c1fn3vrm6bc2dgylpj8vm2wxwqyx621rf513"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/annotate.html"; + license = lib.licenses.free; + }; + } + ) { }; + anti-zenburn-theme = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "anti-zenburn-theme"; + ename = "anti-zenburn-theme"; + version = "2.5.1.0.20180712.183837"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/anti-zenburn-theme-2.5.1.0.20180712.183837.tar"; + sha256 = "1jn3kzzqjmcrfq381y71cc3ffyk0dr16nf86x193vm5jynbc3scq"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/anti-zenburn-theme.html"; + license = lib.licenses.free; + }; + } + ) { }; + anzu = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "anzu"; + ename = "anzu"; + version = "0.64.0.20240201.224751"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/anzu-0.64.0.20240201.224751.tar"; + sha256 = "0gfhzb3064d8j4z91636imrh11202sy4905gc4j5rn2raylwwx73"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/anzu.html"; + license = lib.licenses.free; + }; + } + ) { }; + apache-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "apache-mode"; + ename = "apache-mode"; + version = "2.2.0.0.20240327.1751"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/apache-mode-2.2.0.0.20240327.1751.tar"; + sha256 = "0yr3m1340327skxln7z2acns6kingaid4wryi9lyfv05fwhfgl5a"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/apache-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + apropospriate-theme = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "apropospriate-theme"; + ename = "apropospriate-theme"; + version = "0.2.0.0.20240517.142324"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/apropospriate-theme-0.2.0.0.20240517.142324.tar"; + sha256 = "0pcgwz5qwl45h2c0mknw7h977v74lzpyyaxavnnm3hr8mfx1jlgm"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/apropospriate-theme.html"; + license = lib.licenses.free; + }; + } + ) { }; + arduino-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + spinner, + }: + elpaBuild { + pname = "arduino-mode"; + ename = "arduino-mode"; + version = "1.3.1.0.20240527.160335"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/arduino-mode-1.3.1.0.20240527.160335.tar"; + sha256 = "016cidd24b098jnqsxi79pigakhpdl9cglhypa50xf3nnqpa6p75"; + }; + packageRequires = [ spinner ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/arduino-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + auto-dim-other-buffers = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "auto-dim-other-buffers"; + ename = "auto-dim-other-buffers"; + version = "2.1.1.0.20240515.131159"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/auto-dim-other-buffers-2.1.1.0.20240515.131159.tar"; + sha256 = "1dp3q1hrdcvi82pcj5hxha9yyy9lkdqs8kxfq6v7lq716wxkwxfl"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/auto-dim-other-buffers.html"; + license = lib.licenses.free; + }; + } + ) { }; + autothemer = callPackage ( + { + dash, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "autothemer"; + ename = "autothemer"; + version = "0.2.18.0.20230907.60046"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/autothemer-0.2.18.0.20230907.60046.tar"; + sha256 = "0qay7d5z0p91kzpbp140daqyiclsksql6cnp0bn1602n4f3dn4ii"; + }; + packageRequires = [ dash ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/autothemer.html"; + license = lib.licenses.free; + }; + } + ) { }; + base32 = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "base32"; + ename = "base32"; + version = "1.0.0.20240227.184114"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/base32-1.0.0.20240227.184114.tar"; + sha256 = "0nxxymnxy9sd12w1kfj8n86zbhxf40mi12nmb3q0wigg2nynl31k"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/base32.html"; + license = lib.licenses.free; + }; + } + ) { }; + bash-completion = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "bash-completion"; + ename = "bash-completion"; + version = "3.1.1.0.20230612.110320"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/bash-completion-3.1.1.0.20230612.110320.tar"; + sha256 = "1jw3cx6mzxv0mpk9xs1q3vll9sfyvw2mvvvpk9zirq2l13c31cjg"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/bash-completion.html"; + license = lib.licenses.free; + }; + } + ) { }; + beancount = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "beancount"; + ename = "beancount"; + version = "0.9.0.20240801.232930"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/beancount-0.9.0.20240801.232930.tar"; + sha256 = "0mjf5nsp4zpck6nrqrbzk4xwkwglngs1nv8vdifdzgfdj1gxc8l0"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/beancount.html"; + license = lib.licenses.free; + }; + } + ) { }; + better-jumper = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "better-jumper"; + ename = "better-jumper"; + version = "1.0.1.0.20220111.101829"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/better-jumper-1.0.1.0.20220111.101829.tar"; + sha256 = "10wgfplj5sxr6lp0i9p5r0mvb2cf2xbpyfs6ky2kr4i5d9x29gaq"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/better-jumper.html"; + license = lib.licenses.free; + }; + } + ) { }; + bind-map = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "bind-map"; + ename = "bind-map"; + version = "1.1.2.0.20240308.155008"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/bind-map-1.1.2.0.20240308.155008.tar"; + sha256 = "1vrn55667x38qqcaqy8f9p1l5f79j551qjw4m01k5ndan1ybbs8p"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/bind-map.html"; + license = lib.licenses.free; + }; + } + ) { }; + bison-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "bison-mode"; + ename = "bison-mode"; + version = "0.4.0.20210527.1753"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/bison-mode-0.4.0.20210527.1753.tar"; + sha256 = "0mx6qvy68cnc2j9ji8qyryqwlmqfyf21v65iqcqpjqmi7h0w8rk1"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/bison-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + blow = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "blow"; + ename = "blow"; + version = "1.0.0.20221128.51815"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/blow-1.0.0.20221128.51815.tar"; + sha256 = "1g7y9p3gr4v7bzrmwyssx5pf6zj9i0s7rggqyq3c4gssachicdiy"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/blow.html"; + license = lib.licenses.free; + }; + } + ) { }; + blueprint-ts-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "blueprint-ts-mode"; + ename = "blueprint-ts-mode"; + version = "0.0.3.0.20231031.183012"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/blueprint-ts-mode-0.0.3.0.20231031.183012.tar"; + sha256 = "1pa2a2r54pn7lmkgmwrc2lxvnabjbjlqs8rgkmqrfgnq1gkrm6rh"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/blueprint-ts-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + boxquote = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "boxquote"; + ename = "boxquote"; + version = "2.3.0.20231216.85245"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/boxquote-2.3.0.20231216.85245.tar"; + sha256 = "1b5kqxpvxfzq8n0q1bqjbyb0vmrsdm02qfai28ihxqixk4q8czbi"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/boxquote.html"; + license = lib.licenses.free; + }; + } + ) { }; + buttercup = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "buttercup"; + ename = "buttercup"; + version = "1.35.0.20240718.1456"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/buttercup-1.35.0.20240718.1456.tar"; + sha256 = "1f71i87mxd3z24mywwj3pdrdj4irg1k5bmrrlknbkm7i3427mm1z"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/buttercup.html"; + license = lib.licenses.free; + }; + } + ) { }; + camera = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "camera"; + ename = "camera"; + version = "0.3.0.20230828.93723"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/camera-0.3.0.20230828.93723.tar"; + sha256 = "1mykzs3filgi3za7rq4imjy8hymy3i4nsr8k9bcqvd5h3z19ijhm"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/camera.html"; + license = lib.licenses.free; + }; + } + ) { }; + caml = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "caml"; + ename = "caml"; + version = "4.10snapshot0.20231010.232819"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/caml-4.10snapshot0.20231010.232819.tar"; + sha256 = "0dw5429dy1m4jj0khs58fc8cisky8yd9m58ckhjx5qf1k1bm0hji"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/caml.html"; + license = lib.licenses.free; + }; + } + ) { }; + cdlatex = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "cdlatex"; + ename = "cdlatex"; + version = "4.18.4.0.20231118.64512"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/cdlatex-4.18.4.0.20231118.64512.tar"; + sha256 = "037lh3j49cv8yz0vwl441gg9s24im614gzjys6095mj794q47bq7"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/cdlatex.html"; + license = lib.licenses.free; + }; + } + ) { }; + cider = callPackage ( + { + clojure-mode, + elpaBuild, + fetchurl, + lib, + parseedn, + queue, + seq, + sesman, + spinner, + transient, + }: + elpaBuild { + pname = "cider"; + ename = "cider"; + version = "1.15.1.0.20240815.91839"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/cider-1.15.1.0.20240815.91839.tar"; + sha256 = "0bp0f886gmka3ryb8yr8qspwl5rxnca38yn6fhrwnm5ga8j11d90"; + }; + packageRequires = [ + clojure-mode + parseedn + queue + seq + sesman + spinner + transient + ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/cider.html"; + license = lib.licenses.free; + }; + } + ) { }; + clojure-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "clojure-mode"; + ename = "clojure-mode"; + version = "5.20.0snapshot0.20240611.73422"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/clojure-mode-5.20.0snapshot0.20240611.73422.tar"; + sha256 = "1jlmg2f4gvxqknyw5lqs7aqaar0ghw21hqphsmcvakpcn7d0nqiz"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/clojure-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + clojure-ts-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "clojure-ts-mode"; + ename = "clojure-ts-mode"; + version = "0.2.2.0.20240725.113944"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/clojure-ts-mode-0.2.2.0.20240725.113944.tar"; + sha256 = "0v487r0inll37lp6rvd9ljyv5286xqpkcv28lbchbl71x2pm73ac"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/clojure-ts-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + coffee-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "coffee-mode"; + ename = "coffee-mode"; + version = "0.6.3.0.20230908.103000"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/coffee-mode-0.6.3.0.20230908.103000.tar"; + sha256 = "171rj50xg708lmqmxh73ij92vdx07di2yw77bfywrbhrqb2bhvh6"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/coffee-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + consult-flycheck = callPackage ( + { + consult, + elpaBuild, + fetchurl, + flycheck, + lib, + }: + elpaBuild { + pname = "consult-flycheck"; + ename = "consult-flycheck"; + version = "1.0.0.20240718.101150"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/consult-flycheck-1.0.0.20240718.101150.tar"; + sha256 = "054mkwddsdyh3kkj0ky35gq38j2j4hxx98k5igx6awqsm1mpwgz1"; + }; + packageRequires = [ + consult + flycheck + ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/consult-flycheck.html"; + license = lib.licenses.free; + }; + } + ) { }; + corfu-terminal = callPackage ( + { + corfu, + elpaBuild, + fetchurl, + lib, + popon, + }: + elpaBuild { + pname = "corfu-terminal"; + ename = "corfu-terminal"; + version = "0.7.0.20230810.20636"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/corfu-terminal-0.7.0.20230810.20636.tar"; + sha256 = "0cz5qzdz4npd9lc4z06mwclrp6w1vw6vdqzgkhdjnfgi0ciylil0"; + }; + packageRequires = [ + corfu + popon + ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/corfu-terminal.html"; + license = lib.licenses.free; + }; + } + ) { }; + crux = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "crux"; + ename = "crux"; + version = "0.5.0.0.20240401.113645"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/crux-0.5.0.0.20240401.113645.tar"; + sha256 = "12pk351yrj850rg1yd9spxwrhkjlllgxbpbpfs829vnbpnvxlp6f"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/crux.html"; + license = lib.licenses.free; + }; + } + ) { }; + csv2ledger = callPackage ( + { + csv-mode, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "csv2ledger"; + ename = "csv2ledger"; + version = "1.5.4.0.20240605.63224"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/csv2ledger-1.5.4.0.20240605.63224.tar"; + sha256 = "0vh626mic3nd4ci7hc1ci8rmfh3k6frh8azgkj4784n3nhgr18h8"; + }; + packageRequires = [ csv-mode ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/csv2ledger.html"; + license = lib.licenses.free; + }; + } + ) { }; + cyberpunk-theme = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "cyberpunk-theme"; + ename = "cyberpunk-theme"; + version = "1.22.0.20240112.144451"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/cyberpunk-theme-1.22.0.20240112.144451.tar"; + sha256 = "05p6159ay4lil44mq7a1715jjv3rw6lh5f1ax4w98lf7v4kwl0hx"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/cyberpunk-theme.html"; + license = lib.licenses.free; + }; + } + ) { }; + cycle-at-point = callPackage ( + { + elpaBuild, + fetchurl, + lib, + recomplete, + }: + elpaBuild { + pname = "cycle-at-point"; + ename = "cycle-at-point"; + version = "0.2.0.20240422.30057"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/cycle-at-point-0.2.0.20240422.30057.tar"; + sha256 = "18nlbg8jwdgvi56qgbvqs0z8yfj9nkw30da45d7anjaln6a8089j"; + }; + packageRequires = [ recomplete ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/cycle-at-point.html"; + license = lib.licenses.free; + }; + } + ) { }; + d-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "d-mode"; + ename = "d-mode"; + version = "202408131340.0.20240813.65913"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/d-mode-202408131340.0.20240813.65913.tar"; + sha256 = "1lf78x8bkb41mr5p8api0f447z9k5yd2v9w97qw6l4dxcj2dldv5"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/d-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + dart-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "dart-mode"; + ename = "dart-mode"; + version = "1.0.7.0.20240523.181912"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/dart-mode-1.0.7.0.20240523.181912.tar"; + sha256 = "1v2nxiin07g3kycids2f9ixgnc3gcm592xs6022ks9px5x3rnnv9"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/dart-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + denote-refs = callPackage ( + { + denote, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "denote-refs"; + ename = "denote-refs"; + version = "0.1.2.0.20230115.155857"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/denote-refs-0.1.2.0.20230115.155857.tar"; + sha256 = "02d8vmlhxjj4vqlk8mnrym1xqdgznf83n7a8am5i3blrc3s48zs0"; + }; + packageRequires = [ denote ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/denote-refs.html"; + license = lib.licenses.free; + }; + } + ) { }; + devhelp = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "devhelp"; + ename = "devhelp"; + version = "1.0.0.20221128.51631"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/devhelp-1.0.0.20221128.51631.tar"; + sha256 = "0mkpagxz3vj8cwx9rxrdzygjf448iplmr89pani1q755ikz19njh"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/devhelp.html"; + license = lib.licenses.free; + }; + } + ) { }; + diff-ansi = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "diff-ansi"; + ename = "diff-ansi"; + version = "0.2.0.20240818.235912"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/diff-ansi-0.2.0.20240818.235912.tar"; + sha256 = "085h7xb75dkdmsnc572rmqgzw1pp4jmxcfrr3nnpbvirgjij8pma"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/diff-ansi.html"; + license = lib.licenses.free; + }; + } + ) { }; + doc-show-inline = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "doc-show-inline"; + ename = "doc-show-inline"; + version = "0.1.0.20240616.234552"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/doc-show-inline-0.1.0.20240616.234552.tar"; + sha256 = "0p39glahjqm2fv8xcnwyhcnzsf53g15013jbnj1lh7610bdgfk6g"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/doc-show-inline.html"; + license = lib.licenses.free; + }; + } + ) { }; + dockerfile-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "dockerfile-mode"; + ename = "dockerfile-mode"; + version = "1.7.0.20240324.61044"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/dockerfile-mode-1.7.0.20240324.61044.tar"; + sha256 = "0815zw60kjhsypriafi603vm3svp5x1bh5la0m9m9kw7dvgy04bj"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/dockerfile-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + dracula-theme = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "dracula-theme"; + ename = "dracula-theme"; + version = "1.8.2.0.20240614.130330"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/dracula-theme-1.8.2.0.20240614.130330.tar"; + sha256 = "04z1n3ay5n75bdz2fic9nzgjgsvvagl6620abi8gnznig85d60k7"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/dracula-theme.html"; + license = lib.licenses.free; + }; + } + ) { }; + drupal-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + php-mode, + }: + elpaBuild { + pname = "drupal-mode"; + ename = "drupal-mode"; + version = "0.8.1.0.20240816.123653"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/drupal-mode-0.8.1.0.20240816.123653.tar"; + sha256 = "135h1bm7zyk2nhcx6j3nc7n0fi180sld655212sin650hidiygnl"; + }; + packageRequires = [ php-mode ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/drupal-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + dslide = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "dslide"; + ename = "dslide"; + version = "0.5.3.0.20240704.131127"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/dslide-0.5.3.0.20240704.131127.tar"; + sha256 = "0mr4p3w5932bz9cj9b4b2lmp5dkrix79s6vf4s2h2rr8cjhgbb6s"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/dslide.html"; + license = lib.licenses.free; + }; + } + ) { }; + eat = callPackage ( + { + compat, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "eat"; + ename = "eat"; + version = "0.9.4.0.20240314.193241"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/eat-0.9.4.0.20240314.193241.tar"; + sha256 = "1ry5mlg9wmdr4n5zjq1n45z0xhnrpgjyr6611xd9j43i6dnldb38"; + }; + packageRequires = [ compat ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/eat.html"; + license = lib.licenses.free; + }; + } + ) { }; + edit-indirect = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "edit-indirect"; + ename = "edit-indirect"; + version = "0.1.13.0.20240128.11949"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/edit-indirect-0.1.13.0.20240128.11949.tar"; + sha256 = "1hb37vcda0ksbkm4ibr3nz5d8l4s15awff5qhdvjxihsnnj7fnz1"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/edit-indirect.html"; + license = lib.licenses.free; + }; + } + ) { }; + editorconfig = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "editorconfig"; + ename = "editorconfig"; + version = "0.11.0.0.20240813.80135"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/editorconfig-0.11.0.0.20240813.80135.tar"; + sha256 = "1ak09a6ay4234x4x9b8k6mqayb99129yk0p45iv782xsyc9r05h8"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/editorconfig.html"; + license = lib.licenses.free; + }; + } + ) { }; + elixir-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "elixir-mode"; + ename = "elixir-mode"; + version = "2.5.0.0.20230626.143859"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/elixir-mode-2.5.0.0.20230626.143859.tar"; + sha256 = "109v0lh9jfrva2qxa0zxw2zgjl4q67rx3ijsgsyg3m1p8rx2kpba"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/elixir-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + elpher = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "elpher"; + ename = "elpher"; + version = "3.6.2.0.20240702.81639"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/elpher-3.6.2.0.20240702.81639.tar"; + sha256 = "18b8g5z0w81704b84av6mcq2mf9mlj83qr18l2y7fv2qv16kwz85"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/elpher.html"; + license = lib.licenses.free; + }; + } + ) { }; + emacsql = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "emacsql"; + ename = "emacsql"; + version = "4.0.1.0.20240819.155921"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/emacsql-4.0.1.0.20240819.155921.tar"; + sha256 = "0xm5b913ja85rw7h7fjhbzz288brsgd8xiq5wi7f8s8dwkbmqdv4"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/emacsql.html"; + license = lib.licenses.free; + }; + } + ) { }; + engine-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "engine-mode"; + ename = "engine-mode"; + version = "2.2.4.0.20230911.95607"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/engine-mode-2.2.4.0.20230911.95607.tar"; + sha256 = "05avl4rdv2drlg9vzwld064dpf53cyqbf8pqnglsxwrimm7cd9yv"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/engine-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + evil = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + goto-chg, + lib, + }: + elpaBuild { + pname = "evil"; + ename = "evil"; + version = "1.15.0.0.20240810.165559"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/evil-1.15.0.0.20240810.165559.tar"; + sha256 = "0a406n947j8blv7yrx691bjfgfqmkbpszxjdvwq5hda0mrc9g2kl"; + }; + packageRequires = [ + cl-lib + goto-chg + ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/evil.html"; + license = lib.licenses.free; + }; + } + ) { }; + evil-anzu = callPackage ( + { + anzu, + elpaBuild, + evil, + fetchurl, + lib, + }: + elpaBuild { + pname = "evil-anzu"; + ename = "evil-anzu"; + version = "0.2.0.20220911.193944"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/evil-anzu-0.2.0.20220911.193944.tar"; + sha256 = "0ap13nrpcjm9q7pia8jy544sc08gc44bgyqi7yvkh2yk8cw96g8m"; + }; + packageRequires = [ + anzu + evil + ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/evil-anzu.html"; + license = lib.licenses.free; + }; + } + ) { }; + evil-args = callPackage ( + { + elpaBuild, + evil, + fetchurl, + lib, + }: + elpaBuild { + pname = "evil-args"; + ename = "evil-args"; + version = "1.1.0.20240209.210417"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/evil-args-1.1.0.20240209.210417.tar"; + sha256 = "0k1awcw8rdc5fwj03kw1xmc4iw2ivmv39lrs4pdp9by7396i6829"; + }; + packageRequires = [ evil ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/evil-args.html"; + license = lib.licenses.free; + }; + } + ) { }; + evil-escape = callPackage ( + { + cl-lib ? null, + elpaBuild, + evil, + fetchurl, + lib, + }: + elpaBuild { + pname = "evil-escape"; + ename = "evil-escape"; + version = "3.16.0.20231122.211452"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/evil-escape-3.16.0.20231122.211452.tar"; + sha256 = "1yv77vxvyl41795h7ixl6fhm43n7q6xqkqp1yaqgv5g9iymdj1s0"; + }; + packageRequires = [ + cl-lib + evil + ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/evil-escape.html"; + license = lib.licenses.free; + }; + } + ) { }; + evil-exchange = callPackage ( + { + cl-lib ? null, + elpaBuild, + evil, + fetchurl, + lib, + }: + elpaBuild { + pname = "evil-exchange"; + ename = "evil-exchange"; + version = "0.41.0.20220111.55801"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/evil-exchange-0.41.0.20220111.55801.tar"; + sha256 = "0fgw327b2gpppynrxpp6gs2ixhzchgi5wg97nan7cf5cp3c367ax"; + }; + packageRequires = [ + cl-lib + evil + ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/evil-exchange.html"; + license = lib.licenses.free; + }; + } + ) { }; + evil-goggles = callPackage ( + { + elpaBuild, + evil, + fetchurl, + lib, + }: + elpaBuild { + pname = "evil-goggles"; + ename = "evil-goggles"; + version = "0.0.2.0.20231021.73827"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/evil-goggles-0.0.2.0.20231021.73827.tar"; + sha256 = "10h27w2id8iv53nndjpv9rb99v758j041l2h4kl1kfy2ar8a7vk6"; + }; + packageRequires = [ evil ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/evil-goggles.html"; + license = lib.licenses.free; + }; + } + ) { }; + evil-iedit-state = callPackage ( + { + elpaBuild, + evil, + fetchurl, + iedit, + lib, + }: + elpaBuild { + pname = "evil-iedit-state"; + ename = "evil-iedit-state"; + version = "1.3.0.20220219.93900"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/evil-iedit-state-1.3.0.20220219.93900.tar"; + sha256 = "1fvwjvhzrkiaixvfsh2nrlhsvyw5igaighfpk57mnbyxarfc1564"; + }; + packageRequires = [ + evil + iedit + ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/evil-iedit-state.html"; + license = lib.licenses.free; + }; + } + ) { }; + evil-indent-plus = callPackage ( + { + cl-lib ? null, + elpaBuild, + evil, + fetchurl, + lib, + }: + elpaBuild { + pname = "evil-indent-plus"; + ename = "evil-indent-plus"; + version = "1.0.1.0.20230927.151313"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/evil-indent-plus-1.0.1.0.20230927.151313.tar"; + sha256 = "0vm6bsy33hc79nz17861wrxs3l56fsgc08s1lr6v3k65nwkv6i3m"; + }; + packageRequires = [ + cl-lib + evil + ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/evil-indent-plus.html"; + license = lib.licenses.free; + }; + } + ) { }; + evil-lisp-state = callPackage ( + { + bind-map, + elpaBuild, + evil, + fetchurl, + lib, + smartparens, + }: + elpaBuild { + pname = "evil-lisp-state"; + ename = "evil-lisp-state"; + version = "8.2.0.20160403.224859"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/evil-lisp-state-8.2.0.20160403.224859.tar"; + sha256 = "0ms80bxj64n7rqwjlqk4yqwwa1g90ldmb9vs597axzs25mv5jszk"; + }; + packageRequires = [ + bind-map + evil + smartparens + ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/evil-lisp-state.html"; + license = lib.licenses.free; + }; + } + ) { }; + evil-matchit = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "evil-matchit"; + ename = "evil-matchit"; + version = "3.0.4.0.20240418.73107"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/evil-matchit-3.0.4.0.20240418.73107.tar"; + sha256 = "01fsamf87a35xmw03b93yvvlkz2mi7xg9pblzakacwfnwksxr76i"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/evil-matchit.html"; + license = lib.licenses.free; + }; + } + ) { }; + evil-nerd-commenter = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "evil-nerd-commenter"; + ename = "evil-nerd-commenter"; + version = "3.6.1.0.20240216.114656"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/evil-nerd-commenter-3.6.1.0.20240216.114656.tar"; + sha256 = "0wav3c5k2iz4xzrkwj7nj3xg5zp9nldynxag2gl7p3nkz4scg49r"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/evil-nerd-commenter.html"; + license = lib.licenses.free; + }; + } + ) { }; + evil-numbers = callPackage ( + { + elpaBuild, + evil, + fetchurl, + lib, + }: + elpaBuild { + pname = "evil-numbers"; + ename = "evil-numbers"; + version = "0.7.0.20240416.14058"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/evil-numbers-0.7.0.20240416.14058.tar"; + sha256 = "1xn9r9iycrha64n379q8kqdbywcfqcwc9qqlnxi268rcxzsq99rx"; + }; + packageRequires = [ evil ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/evil-numbers.html"; + license = lib.licenses.free; + }; + } + ) { }; + evil-surround = callPackage ( + { + elpaBuild, + evil, + fetchurl, + lib, + }: + elpaBuild { + pname = "evil-surround"; + ename = "evil-surround"; + version = "1.0.4.0.20240325.85222"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/evil-surround-1.0.4.0.20240325.85222.tar"; + sha256 = "0ji4pp9dp0284km585a3iay60m9v0xzsn42g3fw431vadbs0y5ym"; + }; + packageRequires = [ evil ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/evil-surround.html"; + license = lib.licenses.free; + }; + } + ) { }; + evil-visual-mark-mode = callPackage ( + { + dash, + elpaBuild, + evil, + fetchurl, + lib, + }: + elpaBuild { + pname = "evil-visual-mark-mode"; + ename = "evil-visual-mark-mode"; + version = "0.0.5.0.20230202.31851"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/evil-visual-mark-mode-0.0.5.0.20230202.31851.tar"; + sha256 = "1n394k0mm3g44ai101651168h7gw8nr1ci2acb0bfr5qcpdc7g8d"; + }; + packageRequires = [ + dash + evil + ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/evil-visual-mark-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + evil-visualstar = callPackage ( + { + elpaBuild, + evil, + fetchurl, + lib, + }: + elpaBuild { + pname = "evil-visualstar"; + ename = "evil-visualstar"; + version = "0.2.0.0.20160222.194815"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/evil-visualstar-0.2.0.0.20160222.194815.tar"; + sha256 = "1577xx0fblnf7n28brfi959kw3hw85498vza1dsh6r5nhalawhg7"; + }; + packageRequires = [ evil ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/evil-visualstar.html"; + license = lib.licenses.free; + }; + } + ) { }; + exec-path-from-shell = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "exec-path-from-shell"; + ename = "exec-path-from-shell"; + version = "2.2.0.20240411.85903"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/exec-path-from-shell-2.2.0.20240411.85903.tar"; + sha256 = "1z8dxx8x87ndx4mfq2nhj2q6m0h5zd2v80pbwxirz4qnvivqspgv"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/exec-path-from-shell.html"; + license = lib.licenses.free; + }; + } + ) { }; + flx = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "flx"; + ename = "flx"; + version = "0.6.2.0.20240204.195634"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/flx-0.6.2.0.20240204.195634.tar"; + sha256 = "0k2irlx6v1mn23qvpsq1p6mdy8a78sx9xbnvy9ah1hnsq2z9x4ay"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/flx.html"; + license = lib.licenses.free; + }; + } + ) { }; + flx-ido = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + flx, + lib, + }: + elpaBuild { + pname = "flx-ido"; + ename = "flx-ido"; + version = "0.6.2.0.20240204.195634"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/flx-ido-0.6.2.0.20240204.195634.tar"; + sha256 = "1d9hg8pryf30bz9rnpb081vhw2axvbk62i9wiyfq0n0zwi23dwhj"; + }; + packageRequires = [ + cl-lib + flx + ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/flx-ido.html"; + license = lib.licenses.free; + }; + } + ) { }; + flycheck = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "flycheck"; + ename = "flycheck"; + version = "35.0snapshot0.20240726.45656"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/flycheck-35.0snapshot0.20240726.45656.tar"; + sha256 = "09hy61g6rcvl1xng2bnav9x58rg0ddq39mj4gicsyyxyqfyp2gc7"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/flycheck.html"; + license = lib.licenses.free; + }; + } + ) { }; + flymake-guile = callPackage ( + { + elpaBuild, + fetchurl, + flymake ? null, + lib, + }: + elpaBuild { + pname = "flymake-guile"; + ename = "flymake-guile"; + version = "0.5.0.20230905.194410"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/flymake-guile-0.5.0.20230905.194410.tar"; + sha256 = "1zxyz5nsx8dsg0x8ad6vkqs34pca62avswcvvkpgrcapxqvah9dq"; + }; + packageRequires = [ flymake ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/flymake-guile.html"; + license = lib.licenses.free; + }; + } + ) { }; + flymake-kondor = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "flymake-kondor"; + ename = "flymake-kondor"; + version = "0.1.3.0.20211026.50126"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/flymake-kondor-0.1.3.0.20211026.50126.tar"; + sha256 = "0b64x7rziyzr0db0hgfcccy3gw95588q6bs77v4d9gyjl32yz8jn"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/flymake-kondor.html"; + license = lib.licenses.free; + }; + } + ) { }; + flymake-popon = callPackage ( + { + elpaBuild, + fetchurl, + flymake ? null, + lib, + popon, + posframe, + }: + elpaBuild { + pname = "flymake-popon"; + ename = "flymake-popon"; + version = "0.5.1.0.20230208.145056"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/flymake-popon-0.5.1.0.20230208.145056.tar"; + sha256 = "0afkz6izdxzizip48ggnr1cdcfxkrj7ww1lb7jvd0cbpsx7lc126"; + }; + packageRequires = [ + flymake + popon + posframe + ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/flymake-popon.html"; + license = lib.licenses.free; + }; + } + ) { }; + focus = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "focus"; + ename = "focus"; + version = "1.0.1.0.20240528.90117"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/focus-1.0.1.0.20240528.90117.tar"; + sha256 = "0krfsxswwjzajxzr6kjxnkmzgi5nysnwa1yrhd205z1spb36i9i0"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/focus.html"; + license = lib.licenses.free; + }; + } + ) { }; + forth-mode = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "forth-mode"; + ename = "forth-mode"; + version = "0.2.0.20231206.112722"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/forth-mode-0.2.0.20231206.112722.tar"; + sha256 = "0vx3ic6xjpw6xfxb42n7fipkrxfbn1z86hngzg1yz77mig0fvw3n"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/forth-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + free-keys = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "free-keys"; + ename = "free-keys"; + version = "1.0.0.20211116.150106"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/free-keys-1.0.0.20211116.150106.tar"; + sha256 = "08z5w5xxaz577lnwfmvrbh7485rbra7rl6b77m54vjxi24m75jhv"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/free-keys.html"; + license = lib.licenses.free; + }; + } + ) { }; + gc-buffers = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "gc-buffers"; + ename = "gc-buffers"; + version = "1.0.0.20221128.50935"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/gc-buffers-1.0.0.20221128.50935.tar"; + sha256 = "0c7pwhpk4qmw6jdryabr051vwm5k0r9p1snwl1117wavcbdf3psx"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/gc-buffers.html"; + license = lib.licenses.free; + }; + } + ) { }; + geiser = callPackage ( + { + elpaBuild, + fetchurl, + lib, + project, + }: + elpaBuild { + pname = "geiser"; + ename = "geiser"; + version = "0.31.0.20240726.121756"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/geiser-0.31.0.20240726.121756.tar"; + sha256 = "19mfyvr13c95qpjrx7ngrraifiaqihpxkh7d6p5j0pda37hq5vav"; + }; + packageRequires = [ project ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/geiser.html"; + license = lib.licenses.free; + }; + } + ) { }; + geiser-chez = callPackage ( + { + elpaBuild, + fetchurl, + geiser, + lib, + }: + elpaBuild { + pname = "geiser-chez"; + ename = "geiser-chez"; + version = "0.18.0.20230707.93440"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/geiser-chez-0.18.0.20230707.93440.tar"; + sha256 = "1rl6qazqjjcwzyanx4bra3xmw9fjrpa6dkz36kfcvj8i8z7hsmcq"; + }; + packageRequires = [ geiser ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/geiser-chez.html"; + license = lib.licenses.free; + }; + } + ) { }; + geiser-chibi = callPackage ( + { + elpaBuild, + fetchurl, + geiser, + lib, + }: + elpaBuild { + pname = "geiser-chibi"; + ename = "geiser-chibi"; + version = "0.17.0.20240521.155242"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/geiser-chibi-0.17.0.20240521.155242.tar"; + sha256 = "0xiaikj274ypfj546snxpi6h30jlc9hifhnw8ljj1zxsafr1wzqq"; + }; + packageRequires = [ geiser ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/geiser-chibi.html"; + license = lib.licenses.free; + }; + } + ) { }; + geiser-chicken = callPackage ( + { + elpaBuild, + fetchurl, + geiser, + lib, + }: + elpaBuild { + pname = "geiser-chicken"; + ename = "geiser-chicken"; + version = "0.17.0.20220717.113055"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/geiser-chicken-0.17.0.20220717.113055.tar"; + sha256 = "1ajdmkykm23rxcnsbqadc39h72r30cdqzhxasq9s5hnnpk8qmyxk"; + }; + packageRequires = [ geiser ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/geiser-chicken.html"; + license = lib.licenses.free; + }; + } + ) { }; + geiser-gambit = callPackage ( + { + elpaBuild, + fetchurl, + geiser, + lib, + }: + elpaBuild { + pname = "geiser-gambit"; + ename = "geiser-gambit"; + version = "0.18.1.0.20220208.135610"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/geiser-gambit-0.18.1.0.20220208.135610.tar"; + sha256 = "07m1n1m8n869wdmwvfjimd8yamxp6hbx40mz07fcm826m553v670"; + }; + packageRequires = [ geiser ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/geiser-gambit.html"; + license = lib.licenses.free; + }; + } + ) { }; + geiser-gauche = callPackage ( + { + elpaBuild, + fetchurl, + geiser, + lib, + }: + elpaBuild { + pname = "geiser-gauche"; + ename = "geiser-gauche"; + version = "0.0.2.0.20220503.170006"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/geiser-gauche-0.0.2.0.20220503.170006.tar"; + sha256 = "159wlbsv6wr0wpp4y0a5y2dm7bk4rpzkvc7phl9ry3a60r10h8yc"; + }; + packageRequires = [ geiser ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/geiser-gauche.html"; + license = lib.licenses.free; + }; + } + ) { }; + geiser-guile = callPackage ( + { + elpaBuild, + fetchurl, + geiser, + lib, + transient, + }: + elpaBuild { + pname = "geiser-guile"; + ename = "geiser-guile"; + version = "0.28.2.0.20240811.112008"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/geiser-guile-0.28.2.0.20240811.112008.tar"; + sha256 = "144543qkxxycnailc8m7fhfqz4c8wphi9xc4b4p2cc009zn51xqs"; + }; + packageRequires = [ + geiser + transient + ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/geiser-guile.html"; + license = lib.licenses.free; + }; + } + ) { }; + geiser-kawa = callPackage ( + { + elpaBuild, + fetchurl, + geiser, + lib, + }: + elpaBuild { + pname = "geiser-kawa"; + ename = "geiser-kawa"; + version = "0.0.1.0.20210920.160740"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/geiser-kawa-0.0.1.0.20210920.160740.tar"; + sha256 = "1qbdmzv81gn3y3rgm10yadhw86a0p9lmxq8da4865x9gkccf2wa6"; + }; + packageRequires = [ geiser ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/geiser-kawa.html"; + license = lib.licenses.free; + }; + } + ) { }; + geiser-mit = callPackage ( + { + elpaBuild, + fetchurl, + geiser, + lib, + }: + elpaBuild { + pname = "geiser-mit"; + ename = "geiser-mit"; + version = "0.15.0.20211204.193555"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/geiser-mit-0.15.0.20211204.193555.tar"; + sha256 = "146pvaj6y60vg57swna1nh9f7hjkkxq3033204vqyn0gbqy6psyw"; + }; + packageRequires = [ geiser ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/geiser-mit.html"; + license = lib.licenses.free; + }; + } + ) { }; + geiser-racket = callPackage ( + { + elpaBuild, + fetchurl, + geiser, + lib, + }: + elpaBuild { + pname = "geiser-racket"; + ename = "geiser-racket"; + version = "0.16.0.20210421.12547"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/geiser-racket-0.16.0.20210421.12547.tar"; + sha256 = "0vqs61ga54mj241p7l5mly9pn8m819znm2dvw3hnlw3p6xp89fgq"; + }; + packageRequires = [ geiser ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/geiser-racket.html"; + license = lib.licenses.free; + }; + } + ) { }; + geiser-stklos = callPackage ( + { + elpaBuild, + fetchurl, + geiser, + lib, + }: + elpaBuild { + pname = "geiser-stklos"; + ename = "geiser-stklos"; + version = "1.8.0.20240521.161150"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/geiser-stklos-1.8.0.20240521.161150.tar"; + sha256 = "13y0p8iqm4lrjg5ksb8d3rgpmjs0kwak7zicdq5m7sx1x511znd7"; + }; + packageRequires = [ geiser ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/geiser-stklos.html"; + license = lib.licenses.free; + }; + } + ) { }; + git-commit = callPackage ( + { + compat, + elpaBuild, + fetchurl, + lib, + seq, + transient, + with-editor, + }: + elpaBuild { + pname = "git-commit"; + ename = "git-commit"; + version = "4.0.0.0.20240818.190757"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/git-commit-4.0.0.0.20240818.190757.tar"; + sha256 = "057xpp0w1hyb2c8h0sr4lnpyr5hphgb9yn27rq5jqhwkn8v9r8b2"; + }; + packageRequires = [ + compat + seq + transient + with-editor + ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/git-commit.html"; + license = lib.licenses.free; + }; + } + ) { }; + git-modes = callPackage ( + { + compat, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "git-modes"; + ename = "git-modes"; + version = "1.4.4.0.20240805.132007"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/git-modes-1.4.4.0.20240805.132007.tar"; + sha256 = "0gbgjdk6gi1898nbxj2wbiifbmld42v4s2zsckgqv4r5pxdwc6ai"; + }; + packageRequires = [ compat ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/git-modes.html"; + license = lib.licenses.free; + }; + } + ) { }; + gnosis = callPackage ( + { + compat, + elpaBuild, + emacsql, + fetchurl, + lib, + transient, + }: + elpaBuild { + pname = "gnosis"; + ename = "gnosis"; + version = "0.4.1.0.20240818.212703"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/gnosis-0.4.1.0.20240818.212703.tar"; + sha256 = "1nw13pfbgfja5c70zpmcrm6wqvps4zchskj26x1fh171233m8wln"; + }; + packageRequires = [ + compat + emacsql + transient + ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/gnosis.html"; + license = lib.licenses.free; + }; + } + ) { }; + gnu-apl-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "gnu-apl-mode"; + ename = "gnu-apl-mode"; + version = "1.5.1.0.20220404.34102"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/gnu-apl-mode-1.5.1.0.20220404.34102.tar"; + sha256 = "1da6vl1pr0k1id04fgw9pm5zcf5dkbwnx7xjgymg3n6yvm54f9kg"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/gnu-apl-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + gnu-indent = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "gnu-indent"; + ename = "gnu-indent"; + version = "1.0.0.20221127.211255"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/gnu-indent-1.0.0.20221127.211255.tar"; + sha256 = "1vfiwcw6cdl1861pjyc40r8wvagl9szqbk2icl4knl35jakxh6vl"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/gnu-indent.html"; + license = lib.licenses.free; + }; + } + ) { }; + gnuplot = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "gnuplot"; + ename = "gnuplot"; + version = "0.8.1.0.20230727.75810"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/gnuplot-0.8.1.0.20230727.75810.tar"; + sha256 = "16708cxz3jc0yw7wppdbqywy1k9drq9kqbk6j1sv1s7n1gc0xh00"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/gnuplot.html"; + license = lib.licenses.free; + }; + } + ) { }; + go-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "go-mode"; + ename = "go-mode"; + version = "1.6.0.0.20240630.202407"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/go-mode-1.6.0.0.20240630.202407.tar"; + sha256 = "0l99vsah7j79pfz0wnvpw4c7i9fw3miipfi7givgxanjrnyra859"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/go-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + golden-ratio = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "golden-ratio"; + ename = "golden-ratio"; + version = "1.0.1.0.20230912.112557"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/golden-ratio-1.0.1.0.20230912.112557.tar"; + sha256 = "1gwa5f9fclhky7kvpd1pwfrvx11jqjn3iqhxis4na6syh7ypk8vm"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/golden-ratio.html"; + license = lib.licenses.free; + }; + } + ) { }; + gotham-theme = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "gotham-theme"; + ename = "gotham-theme"; + version = "1.1.9.0.20220107.173034"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/gotham-theme-1.1.9.0.20220107.173034.tar"; + sha256 = "0zx9c4vh5sc6yl3m4fxpd5x77qvqqirpzkv2hwshxprhs5g9f4c8"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/gotham-theme.html"; + license = lib.licenses.free; + }; + } + ) { }; + goto-chg = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "goto-chg"; + ename = "goto-chg"; + version = "1.7.5.0.20240407.111017"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/goto-chg-1.7.5.0.20240407.111017.tar"; + sha256 = "0pg8k9idb59wp2h51b50dplw454caqa9gn9bcpvfil1fi7hg17h2"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/goto-chg.html"; + license = lib.licenses.free; + }; + } + ) { }; + gptel = callPackage ( + { + compat, + elpaBuild, + fetchurl, + lib, + transient, + }: + elpaBuild { + pname = "gptel"; + ename = "gptel"; + version = "0.9.0.0.20240814.85808"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/gptel-0.9.0.0.20240814.85808.tar"; + sha256 = "0kpd0fypky0mwfb1lfyd3jbpr2lxispx02nqiz3a61zziljgdazd"; + }; + packageRequires = [ + compat + transient + ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/gptel.html"; + license = lib.licenses.free; + }; + } + ) { }; + graphql-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "graphql-mode"; + ename = "graphql-mode"; + version = "1.0.0.0.20240328.173129"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/graphql-mode-1.0.0.0.20240328.173129.tar"; + sha256 = "1pwlmi35iyp397a3f7ipb5i1lx6v6qc03xz0l7nh4xlv0bkwxzk5"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/graphql-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + gruber-darker-theme = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "gruber-darker-theme"; + ename = "gruber-darker-theme"; + version = "0.7.0.20231026.203102"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/gruber-darker-theme-0.7.0.20231026.203102.tar"; + sha256 = "1hr2p575kz15yh4n68jymdm2i0kn7adynlnpqmcqqp8l4pr83v1f"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/gruber-darker-theme.html"; + license = lib.licenses.free; + }; + } + ) { }; + gruvbox-theme = callPackage ( + { + autothemer, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "gruvbox-theme"; + ename = "gruvbox-theme"; + version = "1.30.1.0.20240615.43214"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/gruvbox-theme-1.30.1.0.20240615.43214.tar"; + sha256 = "0fvhcilfkhwm544z3f16vssxc7fda1klib8fidnylaqj477pfigz"; + }; + packageRequires = [ autothemer ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/gruvbox-theme.html"; + license = lib.licenses.free; + }; + } + ) { }; + guru-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "guru-mode"; + ename = "guru-mode"; + version = "1.0.0.20211025.115715"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/guru-mode-1.0.0.20211025.115715.tar"; + sha256 = "0xs41855s581xbps3clx1s1wd0rhjxm0dnlhillnqbw409phzhs5"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/guru-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + haml-mode = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "haml-mode"; + ename = "haml-mode"; + version = "3.2.1.0.20231110.173413"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/haml-mode-3.2.1.0.20231110.173413.tar"; + sha256 = "0fb5mi0cqwi8186j8cqbzy1zhragj6kwxw779rkhx410vcarl4zi"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/haml-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + haskell-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "haskell-mode"; + ename = "haskell-mode"; + version = "17.5.0.20240527.85346"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/haskell-mode-17.5.0.20240527.85346.tar"; + sha256 = "0wdanl6dh3j4z00mrqz3763gg8gjx9c3qsfd1mkz4as17dmqppjm"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/haskell-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + haskell-tng-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + popup, + }: + elpaBuild { + pname = "haskell-tng-mode"; + ename = "haskell-tng-mode"; + version = "0.0.1.0.20230522.221126"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/haskell-tng-mode-0.0.1.0.20230522.221126.tar"; + sha256 = "0744xvrnjvn30vwbfdnndmb1x1ynmz87wvdb94syd1blfkdi9f6j"; + }; + packageRequires = [ popup ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/haskell-tng-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + helm = callPackage ( + { + elpaBuild, + fetchurl, + helm-core, + lib, + wfnames, + }: + elpaBuild { + pname = "helm"; + ename = "helm"; + version = "3.9.9.0.20240818.123128"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/helm-3.9.9.0.20240818.123128.tar"; + sha256 = "01zj0bi9189nbpgp88sdpl61ly1xhqaf33cp8k41sfpka3v0g24f"; + }; + packageRequires = [ + helm-core + wfnames + ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/helm.html"; + license = lib.licenses.free; + }; + } + ) { }; + helm-core = callPackage ( + { + async, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "helm-core"; + ename = "helm-core"; + version = "3.9.9.0.20240818.123128"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/helm-core-3.9.9.0.20240818.123128.tar"; + sha256 = "185acikmdvzlwjnac7xkh5agzihka1h6r8ng3ma05gwdxkxnb28s"; + }; + packageRequires = [ async ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/helm-core.html"; + license = lib.licenses.free; + }; + } + ) { }; + hideshowvis = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "hideshowvis"; + ename = "hideshowvis"; + version = "0.8.0.20240529.112833"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/hideshowvis-0.8.0.20240529.112833.tar"; + sha256 = "0wb1i3p79wf39svgbvdjlhivbyankm4xklf1r63i5vlaxz5fc6di"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/hideshowvis.html"; + license = lib.licenses.free; + }; + } + ) { }; + highlight-parentheses = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "highlight-parentheses"; + ename = "highlight-parentheses"; + version = "2.2.2.0.20240408.112634"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/highlight-parentheses-2.2.2.0.20240408.112634.tar"; + sha256 = "0by35fba69xnvq7jglr62i168s4jpy8jqs76gk29z92jcwk1brig"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/highlight-parentheses.html"; + license = lib.licenses.free; + }; + } + ) { }; + hl-block-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "hl-block-mode"; + ename = "hl-block-mode"; + version = "0.2.0.20240422.12652"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/hl-block-mode-0.2.0.20240422.12652.tar"; + sha256 = "1j3fp1p066j9b67hna6mh7pb96kld9nc0mkv8jl0qdwi95aah81q"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/hl-block-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + hl-column = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "hl-column"; + ename = "hl-column"; + version = "1.0.0.20221128.50752"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/hl-column-1.0.0.20221128.50752.tar"; + sha256 = "1zvfj0271pphl8h1d9mjmicrc81s3v0jq6p9ca4cnwdk6h9x1igg"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/hl-column.html"; + license = lib.licenses.free; + }; + } + ) { }; + htmlize = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "htmlize"; + ename = "htmlize"; + version = "1.57.0.20240527.145632"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/htmlize-1.57.0.20240527.145632.tar"; + sha256 = "1wcx6hi2jiaac801hzhiix5ymhxmh8whwbjd5l9fbjfhxf0m0r9b"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/htmlize.html"; + license = lib.licenses.free; + }; + } + ) { }; + hyperdrive = callPackage ( + { + compat, + elpaBuild, + fetchurl, + lib, + map, + org, + persist, + plz, + taxy-magit-section, + transient, + }: + elpaBuild { + pname = "hyperdrive"; + ename = "hyperdrive"; + version = "0.4pre0.20240818.142318"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/hyperdrive-0.4pre0.20240818.142318.tar"; + sha256 = "0ggsxw2s974l7m4v8p3f535fz13d0z15gwpx6pp7k3rrs5was9vp"; + }; + packageRequires = [ + compat + map + org + persist + plz + taxy-magit-section + transient + ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/hyperdrive.html"; + license = lib.licenses.free; + }; + } + ) { }; + idle-highlight-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "idle-highlight-mode"; + ename = "idle-highlight-mode"; + version = "1.1.4.0.20240421.64727"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/idle-highlight-mode-1.1.4.0.20240421.64727.tar"; + sha256 = "0wdzvy6zhxsr4i7s0169s8pl0bd3sms2xjqlvppkyqfmvwiggqkm"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/idle-highlight-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + idris-mode = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + prop-menu, + }: + elpaBuild { + pname = "idris-mode"; + ename = "idris-mode"; + version = "1.1.0.0.20240704.133442"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/idris-mode-1.1.0.0.20240704.133442.tar"; + sha256 = "0rbgv5gkm6q3a6l8yqmgn3mn6ic9jr1w80vrl4gvkfpklwys9y5f"; + }; + packageRequires = [ + cl-lib + prop-menu + ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/idris-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + iedit = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "iedit"; + ename = "iedit"; + version = "0.9.9.9.9.0.20220216.75011"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/iedit-0.9.9.9.9.0.20220216.75011.tar"; + sha256 = "0q31dfsh3ay2ls7f4i2f52zzjz62glwnccqmxww938hayn23lfg2"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/iedit.html"; + license = lib.licenses.free; + }; + } + ) { }; + inf-clojure = callPackage ( + { + clojure-mode, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "inf-clojure"; + ename = "inf-clojure"; + version = "3.2.1.0.20230909.44557"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/inf-clojure-3.2.1.0.20230909.44557.tar"; + sha256 = "0ncdqbz8z8wrcf3s1y3n1b11b7k3mwxdk4w5v7pr0j6jn3yfnbby"; + }; + packageRequires = [ clojure-mode ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/inf-clojure.html"; + license = lib.licenses.free; + }; + } + ) { }; + inf-ruby = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "inf-ruby"; + ename = "inf-ruby"; + version = "2.8.1.0.20240627.213541"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/inf-ruby-2.8.1.0.20240627.213541.tar"; + sha256 = "0yw67r2jwhrsxdzx1hnri6w8wxm5z76fxxbk333xf043gw5cg8ay"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/inf-ruby.html"; + license = lib.licenses.free; + }; + } + ) { }; + inkpot-theme = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "inkpot-theme"; + ename = "inkpot-theme"; + version = "0.1.0.20240610.140611"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/inkpot-theme-0.1.0.20240610.140611.tar"; + sha256 = "1291cwg6vk9y8an6a1pfbv05g2yqcswwry25c9ingsyb4ql0pr6k"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/inkpot-theme.html"; + license = lib.licenses.free; + }; + } + ) { }; + iwindow = callPackage ( + { + compat, + elpaBuild, + fetchurl, + lib, + seq, + }: + elpaBuild { + pname = "iwindow"; + ename = "iwindow"; + version = "1.1.0.20230920.203903"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/iwindow-1.1.0.20230920.203903.tar"; + sha256 = "0xjwignqff11y92lcscs0ssg19jh7pgap5i7kdx50nwp7g1wz57h"; + }; + packageRequires = [ + compat + seq + ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/iwindow.html"; + license = lib.licenses.free; + }; + } + ) { }; + j-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "j-mode"; + ename = "j-mode"; + version = "2.0.1.0.20240611.171122"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/j-mode-2.0.1.0.20240611.171122.tar"; + sha256 = "1c4k74an4ib2zv19mjxxn9vl34w0ybyhmmgiv1l8jimqn5vi293h"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/j-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + jade-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "jade-mode"; + ename = "jade-mode"; + version = "1.0.1.0.20211019.161323"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/jade-mode-1.0.1.0.20211019.161323.tar"; + sha256 = "11b7wkp3pszc90f04sq0jkb83vgjkx0hdv4fylv6q2hyxpfn08r2"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/jade-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + jinja2-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "jinja2-mode"; + ename = "jinja2-mode"; + version = "0.3.0.20220117.80711"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/jinja2-mode-0.3.0.20220117.80711.tar"; + sha256 = "05riwy4pn9i1jn5kr75hkb82n3jf0l3nsnzbwljbxvl362929x7m"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/jinja2-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + julia-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "julia-mode"; + ename = "julia-mode"; + version = "0.4.0.20240506.120530"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/julia-mode-0.4.0.20240506.120530.tar"; + sha256 = "0kiwlc017bw8y2p166y2hpkpssml2rrx6p056qqn99ki5m682kav"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/julia-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + keycast = callPackage ( + { + compat, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "keycast"; + ename = "keycast"; + version = "1.4.1.0.20240805.132239"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/keycast-1.4.1.0.20240805.132239.tar"; + sha256 = "1afmj52zcr8sdh2ijw0xhxv5p713mw85f4q9rizrpbcx3pw0xmbj"; + }; + packageRequires = [ compat ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/keycast.html"; + license = lib.licenses.free; + }; + } + ) { }; + kotlin-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "kotlin-mode"; + ename = "kotlin-mode"; + version = "2.0.0.0.20230123.105957"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/kotlin-mode-2.0.0.0.20230123.105957.tar"; + sha256 = "1jri3r3f6c09zf4x06a693r5izsdhijq2y279y764if2b3a8bwq2"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/kotlin-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + lorem-ipsum = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "lorem-ipsum"; + ename = "lorem-ipsum"; + version = "0.4.0.20221214.105746"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/lorem-ipsum-0.4.0.20221214.105746.tar"; + sha256 = "1wwynsvpcing7rrmacxrmnib044dajawbdqxhhcwniqrxyw883c0"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/lorem-ipsum.html"; + license = lib.licenses.free; + }; + } + ) { }; + lua-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "lua-mode"; + ename = "lua-mode"; + version = "20221027.0.20231023.94721"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/lua-mode-20221027.0.20231023.94721.tar"; + sha256 = "1zlllyj2w8am1fv3iia8yrqhwsk2pi9kkw8ml6qc2lamfa09y65p"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/lua-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + macrostep = callPackage ( + { + cl-lib ? null, + compat, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "macrostep"; + ename = "macrostep"; + version = "0.9.4.0.20240608.12616"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/macrostep-0.9.4.0.20240608.12616.tar"; + sha256 = "0wl8v174428vaxzf9ghyzm1ljsv0r5xw445lwzzj21yc4x1y2vh1"; + }; + packageRequires = [ + cl-lib + compat + ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/macrostep.html"; + license = lib.licenses.free; + }; + } + ) { }; + magit = callPackage ( + { + compat, + dash, + elpaBuild, + fetchurl, + git-commit, + lib, + magit-section, + seq, + transient, + with-editor, + }: + elpaBuild { + pname = "magit"; + ename = "magit"; + version = "4.0.0.0.20240817.175213"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/magit-4.0.0.0.20240817.175213.tar"; + sha256 = "1abp8d21dm8ygmmmx2bhq1wsz23w259l110743zyx77jbrynizci"; + }; + packageRequires = [ + compat + dash + git-commit + magit-section + seq + transient + with-editor + ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/magit.html"; + license = lib.licenses.free; + }; + } + ) { }; + magit-section = callPackage ( + { + compat, + dash, + elpaBuild, + fetchurl, + lib, + seq, + }: + elpaBuild { + pname = "magit-section"; + ename = "magit-section"; + version = "4.0.0.0.20240818.190757"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/magit-section-4.0.0.0.20240818.190757.tar"; + sha256 = "1bm8k9a8x06310099s71s11igh838fk4k26nb0gsd8xp1szima38"; + }; + packageRequires = [ + compat + dash + seq + ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/magit-section.html"; + license = lib.licenses.free; + }; + } + ) { }; + mastodon = callPackage ( + { + elpaBuild, + fetchurl, + lib, + persist, + request, + }: + elpaBuild { + pname = "mastodon"; + ename = "mastodon"; + version = "1.0.26.0.20240816.70908"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/mastodon-1.0.26.0.20240816.70908.tar"; + sha256 = "0nayg2py0n2m1ldpl1hwmiqv7yzvjxbbwndzxwipak0wvjzw0psl"; + }; + packageRequires = [ + persist + request + ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/mastodon.html"; + license = lib.licenses.free; + }; + } + ) { }; + material-theme = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "material-theme"; + ename = "material-theme"; + version = "2015.0.20210904.122621"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/material-theme-2015.0.20210904.122621.tar"; + sha256 = "15wn2372p6zsbpbrvhd1lyyh736zhjzgw2fp62wpsyf8hncdmzb3"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/material-theme.html"; + license = lib.licenses.free; + }; + } + ) { }; + mentor = callPackage ( + { + async, + elpaBuild, + fetchurl, + lib, + seq, + url-scgi, + xml-rpc, + }: + elpaBuild { + pname = "mentor"; + ename = "mentor"; + version = "0.5.0.20231009.93430"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/mentor-0.5.0.20231009.93430.tar"; + sha256 = "159ng3vq4swbn79im0nss5wddhn0hkd7fsrz4y6d71hbvx406bjz"; + }; + packageRequires = [ + async + seq + url-scgi + xml-rpc + ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/mentor.html"; + license = lib.licenses.free; + }; + } + ) { }; + meow = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "meow"; + ename = "meow"; + version = "1.4.5.0.20240818.154515"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/meow-1.4.5.0.20240818.154515.tar"; + sha256 = "0n716x8vyk44n4cw1rw68b747n2r3hvagx4asbhjck8mprnlw6z7"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/meow.html"; + license = lib.licenses.free; + }; + } + ) { }; + minibar = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "minibar"; + ename = "minibar"; + version = "0.3.0.20230414.114052"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/minibar-0.3.0.20230414.114052.tar"; + sha256 = "1qsz57bfbsq6d8p0wbvglbm3m7v6lsmvbg4hnmyxyinns98fwqig"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/minibar.html"; + license = lib.licenses.free; + }; + } + ) { }; + moe-theme = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "moe-theme"; + ename = "moe-theme"; + version = "1.0.2.0.20240716.85432"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/moe-theme-1.0.2.0.20240716.85432.tar"; + sha256 = "0xcqpdw7p6mphgrjl93cv25zj63r8bi1zi8jzd65k5s6sxlvz7bs"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/moe-theme.html"; + license = lib.licenses.free; + }; + } + ) { }; + monokai-theme = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "monokai-theme"; + ename = "monokai-theme"; + version = "3.5.3.0.20240710.102754"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/monokai-theme-3.5.3.0.20240710.102754.tar"; + sha256 = "0xncnb5fx7q55cl18gs6gw63di7p9kjyrfq7an5fig1rkmsyp4sx"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/monokai-theme.html"; + license = lib.licenses.free; + }; + } + ) { }; + mpv = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "mpv"; + ename = "mpv"; + version = "0.2.0.0.20220801.191738"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/mpv-0.2.0.0.20220801.191738.tar"; + sha256 = "0fanxxgmpjmy13lawr15ccnlzc5k89pix6m020kxbpi6aj2n1apc"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/mpv.html"; + license = lib.licenses.free; + }; + } + ) { }; + multiple-cursors = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "multiple-cursors"; + ename = "multiple-cursors"; + version = "1.4.0.0.20240223.113445"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/multiple-cursors-1.4.0.0.20240223.113445.tar"; + sha256 = "17wq8apfvcrmx4mvyw2pbkp9jg5c960w8j81blzxq1qxh1ggdv3z"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/multiple-cursors.html"; + license = lib.licenses.free; + }; + } + ) { }; + nasm-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "nasm-mode"; + ename = "nasm-mode"; + version = "1.1.1.0.20240610.150504"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/nasm-mode-1.1.1.0.20240610.150504.tar"; + sha256 = "1kkv7r6j02472d6c91xsrg9qlfvl70iyi538w2mh3s2adfkh7ps9"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/nasm-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + nginx-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "nginx-mode"; + ename = "nginx-mode"; + version = "1.1.10.0.20240412.40234"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/nginx-mode-1.1.10.0.20240412.40234.tar"; + sha256 = "1ni7bgbvgahdl0b0ki47av7i28059yyy2rld1wvdf2pkfk0r6cq1"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/nginx-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + nix-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + magit-section, + transient, + }: + elpaBuild { + pname = "nix-mode"; + ename = "nix-mode"; + version = "1.5.0.0.20230421.153655"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/nix-mode-1.5.0.0.20230421.153655.tar"; + sha256 = "186c1xng3phn3m4jvazn114l1ch1jldfyjaihb32rb9c8bf3mfr9"; + }; + packageRequires = [ + magit-section + transient + ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/nix-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + oblivion-theme = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "oblivion-theme"; + ename = "oblivion-theme"; + version = "0.1.0.20240320.115258"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/oblivion-theme-0.1.0.20240320.115258.tar"; + sha256 = "1m0r9laf3wk7pmw5p46cwh0k05lqs1p5806c1czqrqq35z29flwh"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/oblivion-theme.html"; + license = lib.licenses.free; + }; + } + ) { }; + opam-switch-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "opam-switch-mode"; + ename = "opam-switch-mode"; + version = "1.8snapshot0.20230802.91729"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/opam-switch-mode-1.8snapshot0.20230802.91729.tar"; + sha256 = "01ccpzlanc42na9hdm8f8ys4b1lsxqx5f2ks3ya3f5yr580amy1w"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/opam-switch-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + org-auto-tangle = callPackage ( + { + async, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "org-auto-tangle"; + ename = "org-auto-tangle"; + version = "0.6.0.0.20230201.195019"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/org-auto-tangle-0.6.0.0.20230201.195019.tar"; + sha256 = "1895wp7fajpz4mddp4qr136h30rp3ashn3zdb6zdrb2qfa275rri"; + }; + packageRequires = [ async ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/org-auto-tangle.html"; + license = lib.licenses.free; + }; + } + ) { }; + org-contrib = callPackage ( + { + elpaBuild, + fetchurl, + lib, + org, + }: + elpaBuild { + pname = "org-contrib"; + ename = "org-contrib"; + version = "0.4.2.0.20240518.90129"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/org-contrib-0.4.2.0.20240518.90129.tar"; + sha256 = "0rkvdmff5fnjaziq14vwr4af0msq5lwzf4cyqrnyakh4dq7ffmpx"; + }; + packageRequires = [ org ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/org-contrib.html"; + license = lib.licenses.free; + }; + } + ) { }; + org-drill = callPackage ( + { + elpaBuild, + fetchurl, + lib, + org, + persist, + seq, + }: + elpaBuild { + pname = "org-drill"; + ename = "org-drill"; + version = "2.7.0.0.20210428.101221"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/org-drill-2.7.0.0.20210428.101221.tar"; + sha256 = "1mib43crqgb45gwcy0kmk598f259l3wsycpzw4795xxfw1kj5z3y"; + }; + packageRequires = [ + org + persist + seq + ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/org-drill.html"; + license = lib.licenses.free; + }; + } + ) { }; + org-journal = callPackage ( + { + elpaBuild, + fetchurl, + lib, + org, + }: + elpaBuild { + pname = "org-journal"; + ename = "org-journal"; + version = "2.2.0.0.20240225.201950"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/org-journal-2.2.0.0.20240225.201950.tar"; + sha256 = "013yyxalngcl55z0z23qgjz0gwgjp5px0hd2ykibflw2vlqkl97p"; + }; + packageRequires = [ org ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/org-journal.html"; + license = lib.licenses.free; + }; + } + ) { }; + org-mime = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "org-mime"; + ename = "org-mime"; + version = "0.3.3.0.20240818.24342"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/org-mime-0.3.3.0.20240818.24342.tar"; + sha256 = "0xg73swqd6dff1nh4z2jhhvj9ssq65wymq3jlbyb1nscm3g4lr83"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/org-mime.html"; + license = lib.licenses.free; + }; + } + ) { }; + org-present = callPackage ( + { + elpaBuild, + fetchurl, + lib, + org, + }: + elpaBuild { + pname = "org-present"; + ename = "org-present"; + version = "0.1.0.20220806.144744"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/org-present-0.1.0.20220806.144744.tar"; + sha256 = "0k71hhl9gac0qvxmrjlf0cj60490m563ngbkr510vbkylri8rmdz"; + }; + packageRequires = [ org ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/org-present.html"; + license = lib.licenses.free; + }; + } + ) { }; + org-superstar = callPackage ( + { + elpaBuild, + fetchurl, + lib, + org, + }: + elpaBuild { + pname = "org-superstar"; + ename = "org-superstar"; + version = "1.5.1.0.20230116.151025"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/org-superstar-1.5.1.0.20230116.151025.tar"; + sha256 = "02f3lzb8k51rhf13a2warvhg8ib11wagw1zrfaknni7ssiwdj3x6"; + }; + packageRequires = [ org ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/org-superstar.html"; + license = lib.licenses.free; + }; + } + ) { }; + org-transclusion-http = callPackage ( + { + elpaBuild, + fetchurl, + lib, + org-transclusion, + plz, + }: + elpaBuild { + pname = "org-transclusion-http"; + ename = "org-transclusion-http"; + version = "0.5pre0.20240630.140904"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/org-transclusion-http-0.5pre0.20240630.140904.tar"; + sha256 = "1gkh5flmbj0gah8vbw6ghqagak220ljym8rsgpwmpxmqzwjhp5kp"; + }; + packageRequires = [ + org-transclusion + plz + ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/org-transclusion-http.html"; + license = lib.licenses.free; + }; + } + ) { }; + org-tree-slide = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "org-tree-slide"; + ename = "org-tree-slide"; + version = "2.8.22.0.20230826.132200"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/org-tree-slide-2.8.22.0.20230826.132200.tar"; + sha256 = "0hr237z10zpy3p37d0aa3dxcw61zqfpkip4z6h20kqvnclr65rx0"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/org-tree-slide.html"; + license = lib.licenses.free; + }; + } + ) { }; + orgit = callPackage ( + { + compat, + elpaBuild, + fetchurl, + lib, + magit, + org, + }: + elpaBuild { + pname = "orgit"; + ename = "orgit"; + version = "2.0.0.0.20240808.194549"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/orgit-2.0.0.0.20240808.194549.tar"; + sha256 = "14ql24z977myihyn5hv4ivayzfpj580dhr7rgwwb6yqzj8j1bz4l"; + }; + packageRequires = [ + compat + magit + org + ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/orgit.html"; + license = lib.licenses.free; + }; + } + ) { }; + p4-16-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "p4-16-mode"; + ename = "p4-16-mode"; + version = "0.3.0.20231118.161633"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/p4-16-mode-0.3.0.20231118.161633.tar"; + sha256 = "1fkpj2l3pd0vjrxl56jsg3ahkz2j1d48gghraq5ccdfalpmwmg75"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/p4-16-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + package-lint = callPackage ( + { + elpaBuild, + fetchurl, + let-alist, + lib, + }: + elpaBuild { + pname = "package-lint"; + ename = "package-lint"; + version = "0.23.0.20240516.73305"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/package-lint-0.23.0.20240516.73305.tar"; + sha256 = "1g1jinavkrlxnrpsjkfc8d9n9ag9y1svi0p8yqb4rswvjv0l6vll"; + }; + packageRequires = [ let-alist ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/package-lint.html"; + license = lib.licenses.free; + }; + } + ) { }; + pacmacs = callPackage ( + { + dash, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "pacmacs"; + ename = "pacmacs"; + version = "0.1.1.0.20220411.143014"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/pacmacs-0.1.1.0.20220411.143014.tar"; + sha256 = "1h542y8hnqvkp7i8fd08rplamlivipa99mnxkzh8xkd8d19hn95k"; + }; + packageRequires = [ dash ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/pacmacs.html"; + license = lib.licenses.free; + }; + } + ) { }; + page-break-lines = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "page-break-lines"; + ename = "page-break-lines"; + version = "0.15.0.20240311.102621"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/page-break-lines-0.15.0.20240311.102621.tar"; + sha256 = "03bz8kr6mk7k9sfnai805kjfb7w4q45ba83k4vylwb8c1x5km32h"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/page-break-lines.html"; + license = lib.licenses.free; + }; + } + ) { }; + parseclj = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "parseclj"; + ename = "parseclj"; + version = "1.1.1.0.20231203.190509"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/parseclj-1.1.1.0.20231203.190509.tar"; + sha256 = "1h0lfy17613s7ls55ca77nqmc87v3kdwz1cvymzf2jp4xckgcsvw"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/parseclj.html"; + license = lib.licenses.free; + }; + } + ) { }; + parseedn = callPackage ( + { + elpaBuild, + fetchurl, + lib, + map, + parseclj, + }: + elpaBuild { + pname = "parseedn"; + ename = "parseedn"; + version = "1.2.1.0.20231203.190947"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/parseedn-1.2.1.0.20231203.190947.tar"; + sha256 = "0l8w1qr2nqngpcdcw1052dpx8q69xyz20mr2vvqayr5jmsgbvaad"; + }; + packageRequires = [ + map + parseclj + ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/parseedn.html"; + license = lib.licenses.free; + }; + } + ) { }; + pcmpl-args = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "pcmpl-args"; + ename = "pcmpl-args"; + version = "0.1.3.0.20220510.145627"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/pcmpl-args-0.1.3.0.20220510.145627.tar"; + sha256 = "1j1imsxbmpbxwywpl399panwgh071f9bpz3s4yf0mzcb4slpyxsq"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/pcmpl-args.html"; + license = lib.licenses.free; + }; + } + ) { }; + pcre2el = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "pcre2el"; + ename = "pcre2el"; + version = "1.12.0.20240629.162214"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/pcre2el-1.12.0.20240629.162214.tar"; + sha256 = "1lcpxjq2qzjk4xzl5ndshkfga4j1jy1i296h3kc3y20ksjml92x4"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/pcre2el.html"; + license = lib.licenses.free; + }; + } + ) { }; + pdf-tools = callPackage ( + { + elpaBuild, + fetchurl, + let-alist, + lib, + tablist, + }: + elpaBuild { + pname = "pdf-tools"; + ename = "pdf-tools"; + version = "1.1.0.0.20240429.40722"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/pdf-tools-1.1.0.0.20240429.40722.tar"; + sha256 = "1799picrndkixcwhvvs0r1hkbjiw1hm2bq9wyj40ryx2a4y900n8"; + }; + packageRequires = [ + let-alist + tablist + ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/pdf-tools.html"; + license = lib.licenses.free; + }; + } + ) { }; + php-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "php-mode"; + ename = "php-mode"; + version = "1.25.1.0.20240722.164315"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/php-mode-1.25.1.0.20240722.164315.tar"; + sha256 = "1fz4w8sbz59ylrag2kdv4wqjmvxj4dhi4q0bhslxa55vwgg2yfd6"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/php-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + popon = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "popon"; + ename = "popon"; + version = "0.13.0.20230703.82713"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/popon-0.13.0.20230703.82713.tar"; + sha256 = "10zlzlzjgmg29qmnk5skp1sf378wsavzpgpxx5590fy4gj5xwqbj"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/popon.html"; + license = lib.licenses.free; + }; + } + ) { }; + popup = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "popup"; + ename = "popup"; + version = "0.5.9.0.20240721.5155"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/popup-0.5.9.0.20240721.5155.tar"; + sha256 = "11ay4yknbc6dy7c08dcaz4sy1ly98m0ghchif0m2mm72s2hgw7g7"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/popup.html"; + license = lib.licenses.free; + }; + } + ) { }; + projectile = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "projectile"; + ename = "projectile"; + version = "2.9.0snapshot0.20240814.185449"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/projectile-2.9.0snapshot0.20240814.185449.tar"; + sha256 = "059pjfr5gqmd7mrpxmkgasqaqcbhp8q0nj9dhrwqrlfm6g5xgg1q"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/projectile.html"; + license = lib.licenses.free; + }; + } + ) { }; + proof-general = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "proof-general"; + ename = "proof-general"; + version = "4.6snapshot0.20240708.152546"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/proof-general-4.6snapshot0.20240708.152546.tar"; + sha256 = "1gc8g6gm0q7iirvgniv7fm3djlb651czr9iws0p41fvi4kq28b1r"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/proof-general.html"; + license = lib.licenses.free; + }; + } + ) { }; + prop-menu = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "prop-menu"; + ename = "prop-menu"; + version = "0.1.2.0.20150728.51803"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/prop-menu-0.1.2.0.20150728.51803.tar"; + sha256 = "04qvjlq0kra1j3all8mh5appbpwwc2pkzkjrpwdsa85hkd18ls38"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/prop-menu.html"; + license = lib.licenses.free; + }; + } + ) { }; + racket-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "racket-mode"; + ename = "racket-mode"; + version = "1.0.20240813.124142"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/racket-mode-1.0.20240813.124142.tar"; + sha256 = "0ypqv36wibcagkqpjwl3mwpqa4k59wns6kb1v55w2gywnk6qgv1y"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/racket-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + rainbow-delimiters = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "rainbow-delimiters"; + ename = "rainbow-delimiters"; + version = "2.1.5.0.20230830.160022"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/rainbow-delimiters-2.1.5.0.20230830.160022.tar"; + sha256 = "1nkc02b6agkcig5gfc7rh4k203q67ss11l0yxr1fa83w7jd0gdkk"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/rainbow-delimiters.html"; + license = lib.licenses.free; + }; + } + ) { }; + raku-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "raku-mode"; + ename = "raku-mode"; + version = "0.2.1.0.20240429.100744"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/raku-mode-0.2.1.0.20240429.100744.tar"; + sha256 = "0nz5gp98m5cl6l0agk2chz7llqldzkl7swkcmka5i4r1m7qx39rr"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/raku-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + recomplete = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "recomplete"; + ename = "recomplete"; + version = "0.2.0.20240616.234552"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/recomplete-0.2.0.20240616.234552.tar"; + sha256 = "0gkd3g1p6i4l7s6gqjsdj20m3y8n75wlcfw6xii0ka7n8j8dmrz4"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/recomplete.html"; + license = lib.licenses.free; + }; + } + ) { }; + reformatter = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "reformatter"; + ename = "reformatter"; + version = "0.8.0.20240515.204925"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/reformatter-0.8.0.20240515.204925.tar"; + sha256 = "1iq4a99fxaaq2k0q9rfsprxx21sam8cpn455jddpcdcl71flbd72"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/reformatter.html"; + license = lib.licenses.free; + }; + } + ) { }; + request = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "request"; + ename = "request"; + version = "0.3.3.0.20230126.231738"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/request-0.3.3.0.20230126.231738.tar"; + sha256 = "1fsyi1g65am1ln72hmxi216g95l29v9xdx9hrhky7i3j96fflnf6"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/request.html"; + license = lib.licenses.free; + }; + } + ) { }; + rfc-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "rfc-mode"; + ename = "rfc-mode"; + version = "1.4.2.0.20231013.135347"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/rfc-mode-1.4.2.0.20231013.135347.tar"; + sha256 = "0jp5xamraan313nsgy8w7c91jjvqrxphzsm2wg8sgnj00zpr3jfb"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/rfc-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + rubocop = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "rubocop"; + ename = "rubocop"; + version = "0.7.0snapshot0.20210309.124149"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/rubocop-0.7.0snapshot0.20210309.124149.tar"; + sha256 = "110rfww9kl2f8mj45nf1irwmwj4bfgla6glc52dhqi2ibvpik1h5"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/rubocop.html"; + license = lib.licenses.free; + }; + } + ) { }; + rust-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "rust-mode"; + ename = "rust-mode"; + version = "1.0.5.0.20240520.74946"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/rust-mode-1.0.5.0.20240520.74946.tar"; + sha256 = "0k64mr7z18rf1w8fn83ajsbdghc9i8qf6lmc2wyckif8cwj3f9fa"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/rust-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + sass-mode = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + haml-mode, + lib, + }: + elpaBuild { + pname = "sass-mode"; + ename = "sass-mode"; + version = "3.0.16.0.20190502.5315"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/sass-mode-3.0.16.0.20190502.5315.tar"; + sha256 = "1699icjrlliwr949g3933614idyzvk8g9srl346g0s9jfd2llxb8"; + }; + packageRequires = [ + cl-lib + haml-mode + ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/sass-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + scad-mode = callPackage ( + { + compat, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "scad-mode"; + ename = "scad-mode"; + version = "94.0.0.20240708.212011"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/scad-mode-94.0.0.20240708.212011.tar"; + sha256 = "01jyhpqqskizsclvxzii1kv20iklb8y01hglhhavrddf1dri7jza"; + }; + packageRequires = [ compat ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/scad-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + scala-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "scala-mode"; + ename = "scala-mode"; + version = "1.1.0.0.20240729.42046"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/scala-mode-1.1.0.0.20240729.42046.tar"; + sha256 = "0981n96zx633iypwyz2f6af7r1lzx0lick7zv0azqglrwgnly35r"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/scala-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + scroll-on-drag = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "scroll-on-drag"; + ename = "scroll-on-drag"; + version = "0.1.0.20240421.80350"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/scroll-on-drag-0.1.0.20240421.80350.tar"; + sha256 = "0yvz2349ii06r69q2a40qw7grxviqfj9bpm36pjb7wzc46bywl23"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/scroll-on-drag.html"; + license = lib.licenses.free; + }; + } + ) { }; + scroll-on-jump = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "scroll-on-jump"; + ename = "scroll-on-jump"; + version = "0.2.0.20240421.90558"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/scroll-on-jump-0.2.0.20240421.90558.tar"; + sha256 = "0wfdq7myzywqq1nl5f0mz43xiqmpl8vq3p87z7222szi0mm9r6ra"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/scroll-on-jump.html"; + license = lib.licenses.free; + }; + } + ) { }; + sesman = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "sesman"; + ename = "sesman"; + version = "0.3.3snapshot0.20240417.172323"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/sesman-0.3.3snapshot0.20240417.172323.tar"; + sha256 = "1d4c3ymxas4xsjbkg7yj80x6lgly5rch7fvyvi495yvk3mzd9yzk"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/sesman.html"; + license = lib.licenses.free; + }; + } + ) { }; + shellcop = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "shellcop"; + ename = "shellcop"; + version = "0.1.0.0.20220728.132914"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/shellcop-0.1.0.0.20220728.132914.tar"; + sha256 = "0jdh00gw99gm33sviqp9rba6551qpp7pmdfdjd8gqzfk3ziwfdw0"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/shellcop.html"; + license = lib.licenses.free; + }; + } + ) { }; + slime = callPackage ( + { + elpaBuild, + fetchurl, + lib, + macrostep, + }: + elpaBuild { + pname = "slime"; + ename = "slime"; + version = "2.30snapshot0.20240731.151818"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/slime-2.30snapshot0.20240731.151818.tar"; + sha256 = "16xbiwqbp2zpppymxxwkbg1qmahih6dfb535dfa47b26j2wschhp"; + }; + packageRequires = [ macrostep ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/slime.html"; + license = lib.licenses.free; + }; + } + ) { }; + sly = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "sly"; + ename = "sly"; + version = "1.0.43.0.20240809.211904"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/sly-1.0.43.0.20240809.211904.tar"; + sha256 = "1np4rciwcijr6bv13s5vvl95wl28ad60snr6wdbjh7ya922x37rv"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/sly.html"; + license = lib.licenses.free; + }; + } + ) { }; + smartparens = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "smartparens"; + ename = "smartparens"; + version = "1.11.0.0.20240713.100215"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/smartparens-1.11.0.0.20240713.100215.tar"; + sha256 = "0479n363cz4izdxdl2420fcmngbfjp7a5xv9xlxyab62aph63f0w"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/smartparens.html"; + license = lib.licenses.free; + }; + } + ) { }; + solarized-theme = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "solarized-theme"; + ename = "solarized-theme"; + version = "2.0.1.0.20240725.161711"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/solarized-theme-2.0.1.0.20240725.161711.tar"; + sha256 = "1d3m6h00awq2az6vkal631k9l1jpqm2qxr1067rzd1q2qdlaf2ji"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/solarized-theme.html"; + license = lib.licenses.free; + }; + } + ) { }; + spacemacs-theme = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "spacemacs-theme"; + ename = "spacemacs-theme"; + version = "0.2.0.20240815.213429"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/spacemacs-theme-0.2.0.20240815.213429.tar"; + sha256 = "1g7fzghy5nmz8v8vx5y6g3cwc2n9c1ryr09nrdfz3zlrv7r32df6"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/spacemacs-theme.html"; + license = lib.licenses.free; + }; + } + ) { }; + spell-fu = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "spell-fu"; + ename = "spell-fu"; + version = "0.3.0.20240616.234552"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/spell-fu-0.3.0.20240616.234552.tar"; + sha256 = "1dnyz5dm2p6nj8imqpmz23n2j368ygnff4z6f90vl6g52pv07d9r"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/spell-fu.html"; + license = lib.licenses.free; + }; + } + ) { }; + sqlite3 = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "sqlite3"; + ename = "sqlite3"; + version = "0.17.0.20231124.132621"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/sqlite3-0.17.0.20231124.132621.tar"; + sha256 = "10mgf69dvvglf067n59w3dy08jc245rhbqqjbfr27ff9xjrklvfh"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/sqlite3.html"; + license = lib.licenses.free; + }; + } + ) { }; + stylus-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "stylus-mode"; + ename = "stylus-mode"; + version = "1.0.1.0.20211019.161323"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/stylus-mode-1.0.1.0.20211019.161323.tar"; + sha256 = "17hnlylbmk0a3sdcz61crj3ky8224jawlsdzqcvhjbnbmnflvd3z"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/stylus-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + subatomic-theme = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "subatomic-theme"; + ename = "subatomic-theme"; + version = "1.8.2.0.20220128.161518"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/subatomic-theme-1.8.2.0.20220128.161518.tar"; + sha256 = "1h4rr2g6lhn186df2nk026xk1x6yhh441d6mjcdrfkii17n15552"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/subatomic-theme.html"; + license = lib.licenses.free; + }; + } + ) { }; + subed = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "subed"; + ename = "subed"; + version = "1.2.14.0.20240724.164835"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/subed-1.2.14.0.20240724.164835.tar"; + sha256 = "153rx77g6v6klyb4y3r322lbd7s1ympkya3sj04gvz3ka5d7znf3"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/subed.html"; + license = lib.licenses.free; + }; + } + ) { }; + sweeprolog = callPackage ( + { + compat, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "sweeprolog"; + ename = "sweeprolog"; + version = "0.27.5.0.20240411.60241"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/sweeprolog-0.27.5.0.20240411.60241.tar"; + sha256 = "03diw4psd0chk3l6vd3fm1y99xby9b77nnd48jlxa06dgdx3jan9"; + }; + packageRequires = [ compat ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/sweeprolog.html"; + license = lib.licenses.free; + }; + } + ) { }; + swift-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + seq, + }: + elpaBuild { + pname = "swift-mode"; + ename = "swift-mode"; + version = "9.1.0.0.20240622.93531"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/swift-mode-9.1.0.0.20240622.93531.tar"; + sha256 = "0b4x4p8iypmmqw0yn4c683rbvkn5n7nccr9pjnn89yx93d4pab0y"; + }; + packageRequires = [ seq ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/swift-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + symbol-overlay = callPackage ( + { + elpaBuild, + fetchurl, + lib, + seq, + }: + elpaBuild { + pname = "symbol-overlay"; + ename = "symbol-overlay"; + version = "4.1.0.20240311.120733"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/symbol-overlay-4.1.0.20240311.120733.tar"; + sha256 = "0q4jj92l2xj5lj6hbxx42flrx4x923jidqmvkqq3japc2gvp8g00"; + }; + packageRequires = [ seq ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/symbol-overlay.html"; + license = lib.licenses.free; + }; + } + ) { }; + systemd = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "systemd"; + ename = "systemd"; + version = "1.6.1.0.20230131.220207"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/systemd-1.6.1.0.20230131.220207.tar"; + sha256 = "0q7yz96vp1p424whfap7iaxbxa7ydj50v32y3q85lwicfy5838gj"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/systemd.html"; + license = lib.licenses.free; + }; + } + ) { }; + tablist = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "tablist"; + ename = "tablist"; + version = "1.0.0.20200427.220558"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/tablist-1.0.0.20200427.220558.tar"; + sha256 = "12wfryycv3vrrmwj41r8l3rc0w0dy4b7ay0a86q5kah22az38q4x"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/tablist.html"; + license = lib.licenses.free; + }; + } + ) { }; + tangotango-theme = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "tangotango-theme"; + ename = "tangotango-theme"; + version = "0.0.7.0.20240522.132740"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/tangotango-theme-0.0.7.0.20240522.132740.tar"; + sha256 = "1psr1amscknyw41dmsw6mvy73v271l8mzibwhl6kfp41a97cnlki"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/tangotango-theme.html"; + license = lib.licenses.free; + }; + } + ) { }; + telephone-line = callPackage ( + { + cl-generic, + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + seq, + }: + elpaBuild { + pname = "telephone-line"; + ename = "telephone-line"; + version = "0.5.0.20240109.152108"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/telephone-line-0.5.0.20240109.152108.tar"; + sha256 = "18sgw1q80wxi38n815rv70146yiwr2dq5c1a7saabs1y6zmq3fdq"; + }; + packageRequires = [ + cl-generic + cl-lib + seq + ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/telephone-line.html"; + license = lib.licenses.free; + }; + } + ) { }; + testcover-mark-line = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "testcover-mark-line"; + ename = "testcover-mark-line"; + version = "0.3.0.20221128.191350"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/testcover-mark-line-0.3.0.20221128.191350.tar"; + sha256 = "1199bd15bxyb661b74nqixq9f39j87lijw105il0fslc3dw7hi5n"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/testcover-mark-line.html"; + license = lib.licenses.free; + }; + } + ) { }; + textile-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "textile-mode"; + ename = "textile-mode"; + version = "1.0.0.0.20240212.175553"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/textile-mode-1.0.0.0.20240212.175553.tar"; + sha256 = "1kiy4zh7x79igi8x872rjmliik1m0iyfkwng2i64llqf3yiasmwj"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/textile-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + toc-org = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "toc-org"; + ename = "toc-org"; + version = "1.1.0.20230831.75249"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/toc-org-1.1.0.20230831.75249.tar"; + sha256 = "1kscz2s87l8a8w0d4s3g8ilspd63p0ij2vgncvzvb8hjld4pdcfh"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/toc-org.html"; + license = lib.licenses.free; + }; + } + ) { }; + totp-auth = callPackage ( + { + base32, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "totp-auth"; + ename = "totp-auth"; + version = "1.0.0.20240227.184114"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/totp-auth-1.0.0.20240227.184114.tar"; + sha256 = "1yqvn30qc1vdhshcss4znzily08rbv77mf8hrhmy5zayq4n23nca"; + }; + packageRequires = [ base32 ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/totp-auth.html"; + license = lib.licenses.free; + }; + } + ) { }; + treesit-fold = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "treesit-fold"; + ename = "treesit-fold"; + version = "0.1.0.0.20240630.204821"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/treesit-fold-0.1.0.0.20240630.204821.tar"; + sha256 = "1h99gh11xhmzs7ix94y609sijdchz692ixkxxsmnxbrniybpfcsv"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/treesit-fold.html"; + license = lib.licenses.free; + }; + } + ) { }; + treeview = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "treeview"; + ename = "treeview"; + version = "1.2.0.0.20230728.234322"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/treeview-1.2.0.0.20230728.234322.tar"; + sha256 = "0cf64zj3iv1qzzddr5hg9rsjilczfn2c84dcgpfny7l3wzqrmwl1"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/treeview.html"; + license = lib.licenses.free; + }; + } + ) { }; + tuareg = callPackage ( + { + caml, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "tuareg"; + ename = "tuareg"; + version = "3.0.2snapshot0.20231009.174342"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/tuareg-3.0.2snapshot0.20231009.174342.tar"; + sha256 = "10ijh4h8srm810b74jb0bqb8zxca91bsbhlb85fyyscbsvhms2f1"; + }; + packageRequires = [ caml ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/tuareg.html"; + license = lib.licenses.free; + }; + } + ) { }; + typescript-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "typescript-mode"; + ename = "typescript-mode"; + version = "0.4.0.20240603.115709"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/typescript-mode-0.4.0.20240603.115709.tar"; + sha256 = "0v00kk4035i7b4b7clcwqxiavz89l2zxfpgk7f773ymamxpr3g82"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/typescript-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + ujelly-theme = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "ujelly-theme"; + ename = "ujelly-theme"; + version = "1.2.9.0.20180214.162459"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/ujelly-theme-1.2.9.0.20180214.162459.tar"; + sha256 = "1frl87liqd9wdd6i1wwi94qzbwdx24p5shr90flrnpj6hs2yx1n3"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/ujelly-theme.html"; + license = lib.licenses.free; + }; + } + ) { }; + undo-fu = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "undo-fu"; + ename = "undo-fu"; + version = "0.5.0.20240707.141050"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/undo-fu-0.5.0.20240707.141050.tar"; + sha256 = "0glgy1manfv9rykkxhafc969mhazd119zgrkm5fg9shcyb7q629a"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/undo-fu.html"; + license = lib.licenses.free; + }; + } + ) { }; + undo-fu-session = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "undo-fu-session"; + ename = "undo-fu-session"; + version = "0.7.0.20240713.142701"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/undo-fu-session-0.7.0.20240713.142701.tar"; + sha256 = "1c70cvf9f1x96l8gxfl4qpljwsqsqjcn745srsf9w9mcz520fyaa"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/undo-fu-session.html"; + license = lib.licenses.free; + }; + } + ) { }; + vc-fossil = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "vc-fossil"; + ename = "vc-fossil"; + version = "20230504.0.20230504.162626"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/vc-fossil-20230504.0.20230504.162626.tar"; + sha256 = "1w6vi3cflbyrw6109s0w4dbr0axid1abi3s2jvgjikjcggxwrk5f"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/vc-fossil.html"; + license = lib.licenses.free; + }; + } + ) { }; + vcomplete = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "vcomplete"; + ename = "vcomplete"; + version = "2.0.0.20230227.132830"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/vcomplete-2.0.0.20230227.132830.tar"; + sha256 = "0klfc9x2wn91q1v3056hv5kmyzpl1jkigsdw9yjf9623z2fa1s5v"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/vcomplete.html"; + license = lib.licenses.free; + }; + } + ) { }; + visual-fill-column = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "visual-fill-column"; + ename = "visual-fill-column"; + version = "2.6.3.0.20240411.65626"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/visual-fill-column-2.6.3.0.20240411.65626.tar"; + sha256 = "0hyhxpqj39say3w9rpw3mhx7r9aici1wfsrr9631bnc0249qylj2"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/visual-fill-column.html"; + license = lib.licenses.free; + }; + } + ) { }; + vm = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + nadvice, + }: + elpaBuild { + pname = "vm"; + ename = "vm"; + version = "8.3.0snapshot0.20240814.44941"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/vm-8.3.0snapshot0.20240814.44941.tar"; + sha256 = "1w5a0jm22xr6m1i2c5gghgy159dpqndkqhkyma3sagx5bmdsldrb"; + }; + packageRequires = [ + cl-lib + nadvice + ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/vm.html"; + license = lib.licenses.free; + }; + } + ) { }; + web-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "web-mode"; + ename = "web-mode"; + version = "17.3.20.0.20240804.82110"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/web-mode-17.3.20.0.20240804.82110.tar"; + sha256 = "17r0jhcgxnc1k42yxaw1i7wwyb0sp311a1gz8bdjax0zn05ki4xc"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/web-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + webpaste = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + request, + }: + elpaBuild { + pname = "webpaste"; + ename = "webpaste"; + version = "3.2.2.0.20240306.62647"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/webpaste-3.2.2.0.20240306.62647.tar"; + sha256 = "1iw744ncnfq8mhr5r1v09n14nvf26bhvja7fqwjsw5ainhfxzw6y"; + }; + packageRequires = [ + cl-lib + request + ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/webpaste.html"; + license = lib.licenses.free; + }; + } + ) { }; + wfnames = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "wfnames"; + ename = "wfnames"; + version = "1.2.0.20240418.100527"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/wfnames-1.2.0.20240418.100527.tar"; + sha256 = "112m3y96bdsk75vza4lh9lgdcnv35c3iqgidkgpynsgxil4njshj"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/wfnames.html"; + license = lib.licenses.free; + }; + } + ) { }; + wgrep = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "wgrep"; + ename = "wgrep"; + version = "3.0.0.0.20231216.120954"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/wgrep-3.0.0.0.20231216.120954.tar"; + sha256 = "1qadyl29a70d9m5z32s0r18rjxg0jdmbpjr47zgvppl807mfni85"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/wgrep.html"; + license = lib.licenses.free; + }; + } + ) { }; + why-this = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "why-this"; + ename = "why-this"; + version = "2.0.4.0.20221129.81751"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/why-this-2.0.4.0.20221129.81751.tar"; + sha256 = "1qvywhi3nibq1sr8fc1msnnjrdf70j308bp69sl9cirsd61p62bw"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/why-this.html"; + license = lib.licenses.free; + }; + } + ) { }; + with-editor = callPackage ( + { + compat, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "with-editor"; + ename = "with-editor"; + version = "3.4.1.0.20240816.195813"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/with-editor-3.4.1.0.20240816.195813.tar"; + sha256 = "1z9c5ymia0g8mpx0nszrbw0yy23a7f91kyqxpvx544kbxh6k62dy"; + }; + packageRequires = [ compat ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/with-editor.html"; + license = lib.licenses.free; + }; + } + ) { }; + with-simulated-input = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "with-simulated-input"; + ename = "with-simulated-input"; + version = "3.0.0.20210602.224623"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/with-simulated-input-3.0.0.20210602.224623.tar"; + sha256 = "17rshlrz09kxzqb2z54xhmqz2kjj717jkw4bv1inz3vvxi25ndca"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/with-simulated-input.html"; + license = lib.licenses.free; + }; + } + ) { }; + workroom = callPackage ( + { + compat, + elpaBuild, + fetchurl, + lib, + project, + }: + elpaBuild { + pname = "workroom"; + ename = "workroom"; + version = "2.3.1.0.20230926.163128"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/workroom-2.3.1.0.20230926.163128.tar"; + sha256 = "0jmjck89xrsv9l386aayirnbb2ambkfria3jirp09zz7fx582936"; + }; + packageRequires = [ + compat + project + ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/workroom.html"; + license = lib.licenses.free; + }; + } + ) { }; + writegood-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "writegood-mode"; + ename = "writegood-mode"; + version = "2.2.0.0.20220511.170949"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/writegood-mode-2.2.0.0.20220511.170949.tar"; + sha256 = "06rx9ak2wfcnd81a9hj310m22r7gpc2fnpy0hn1qcrfalsnp2kf1"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/writegood-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + ws-butler = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "ws-butler"; + ename = "ws-butler"; + version = "0.6.0.20201117.102839"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/ws-butler-0.6.0.20201117.102839.tar"; + sha256 = "0k1dwxw22ar3837i05a17pr52nzxjdcs1fldwlq0b5xynjfj2i3k"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/ws-butler.html"; + license = lib.licenses.free; + }; + } + ) { }; + xah-fly-keys = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "xah-fly-keys"; + ename = "xah-fly-keys"; + version = "25.9.20240725161125.0.20240725.161208"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/xah-fly-keys-25.9.20240725161125.0.20240725.161208.tar"; + sha256 = "06pvcbwj7b7h7nbv223yfjrxanf25s6rm3fq09zwmphwyy3ldlaw"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/xah-fly-keys.html"; + license = lib.licenses.free; + }; + } + ) { }; + xkcd = callPackage ( + { + elpaBuild, + fetchurl, + json ? null, + lib, + }: + elpaBuild { + pname = "xkcd"; + ename = "xkcd"; + version = "1.1.0.20220503.110939"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/xkcd-1.1.0.20220503.110939.tar"; + sha256 = "1rn5g8m1zd6jajasq4mi3jq1jgk8xw2jykzwd0hjmaz77psqb6af"; + }; + packageRequires = [ json ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/xkcd.html"; + license = lib.licenses.free; + }; + } + ) { }; + xml-rpc = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "xml-rpc"; + ename = "xml-rpc"; + version = "1.6.17.0.20231009.103222"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/xml-rpc-1.6.17.0.20231009.103222.tar"; + sha256 = "19invp04068pzyjbbbscc7vlqh76r8n3f9d4mxacbvi5bhvrc2p0"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/xml-rpc.html"; + license = lib.licenses.free; + }; + } + ) { }; + yaml-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "yaml-mode"; + ename = "yaml-mode"; + version = "0.0.16.0.20240317.160205"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/yaml-mode-0.0.16.0.20240317.160205.tar"; + sha256 = "08k4bygryrv0byczs6v06bm18m654fc070jjx85d3a2fxr9dh9a9"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/yaml-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + yasnippet-snippets = callPackage ( + { + elpaBuild, + fetchurl, + lib, + yasnippet, + }: + elpaBuild { + pname = "yasnippet-snippets"; + ename = "yasnippet-snippets"; + version = "1.0.0.20240603.75736"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/yasnippet-snippets-1.0.0.20240603.75736.tar"; + sha256 = "0nw30a4ilgm65ic97vsvxjj6bw4p27mblrlymwnsg8hm7rnxmnwy"; + }; + packageRequires = [ yasnippet ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/yasnippet-snippets.html"; + license = lib.licenses.free; + }; + } + ) { }; + zenburn-theme = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "zenburn-theme"; + ename = "zenburn-theme"; + version = "2.9.0snapshot0.20240612.125832"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/zenburn-theme-2.9.0snapshot0.20240612.125832.tar"; + sha256 = "1wgpb9x591z28gy7cm8i45qxl7srhj6sgcpnbzi303rbh90rd4sg"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/zenburn-theme.html"; + license = lib.licenses.free; + }; + } + ) { }; + zig-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + reformatter, + }: + elpaBuild { + pname = "zig-mode"; + ename = "zig-mode"; + version = "0.0.8.0.20240507.233944"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/zig-mode-0.0.8.0.20240507.233944.tar"; + sha256 = "1skx0if2ac40csgsrfvkd73ydsvr24ijkmqrpya65n67388gibfv"; + }; + packageRequires = [ reformatter ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/zig-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; +} diff --git a/pkgs/applications/editors/emacs/elisp-packages/nongnu-devel-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/nongnu-devel-packages.nix new file mode 100644 index 0000000000000..8cbcd0a711195 --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/nongnu-devel-packages.nix @@ -0,0 +1,54 @@ +/* + # Updating + + To update the list of packages from nongnu devel (ELPA), + + 1. Run `./update-nongnu-devel`. + 2. Check for evaluation errors: + # "../../../../../" points to the default.nix from root of Nixpkgs tree + env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate ../../../../../ -A emacs.pkgs.nongnuDevelPackages + 3. Run `git commit -m "nongnu-devel-packages $(date -Idate)" -- nongnu-devel-generated.nix` +*/ + +{ + lib, + pkgs, + buildPackages, +}: + +self: +let + + generateNongnu = lib.makeOverridable ( + { + generated ? ./nongnu-devel-generated.nix, + }: + let + + imported = import generated { + callPackage = + pkgs: args: + self.callPackage pkgs ( + args + // { + # Use custom elpa url fetcher with fallback/uncompress + fetchurl = buildPackages.callPackage ./fetchelpa.nix { }; + } + ); + }; + + super = imported; + + commonOverrides = import ./nongnu-common-overrides.nix pkgs; + + overrides = self: super: { }; + + in + let + super' = super // (commonOverrides self super); + in + super' // (overrides self super') + ); + +in +generateNongnu { } diff --git a/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix index 762359a47e275..832fc2c9b16fe 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix @@ -1,3693 +1,5327 @@ { callPackage }: - { - adoc-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "adoc-mode"; - ename = "adoc-mode"; - version = "0.7.0"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/adoc-mode-0.7.0.tar"; - sha256 = "1gdjgybpbw3qj9mfmq9ljx4xaam1f6rwyrav2y2f5fpv6z7w0i61"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/adoc-mode.html"; - license = lib.licenses.free; - }; - }) {}; - afternoon-theme = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "afternoon-theme"; - ename = "afternoon-theme"; - version = "0.1"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/afternoon-theme-0.1.tar"; - sha256 = "0xxvr3njpbdlm8iyyklwijjaysyknwpw51hq2443wq37bsxciils"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/afternoon-theme.html"; - license = lib.licenses.free; - }; - }) {}; - alect-themes = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "alect-themes"; - ename = "alect-themes"; - version = "0.10"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/alect-themes-0.10.tar"; - sha256 = "0pagkf0bb85sr3mvg8z6h6akb9hjmvfqmpiaiz121ys0r92m6nb7"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/alect-themes.html"; - license = lib.licenses.free; - }; - }) {}; - ample-theme = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "ample-theme"; - ename = "ample-theme"; - version = "0.3.0"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/ample-theme-0.3.0.tar"; - sha256 = "12z8z6da1xfc642w2wc82sjlfj3ymlz3jwrg3ydc2fapis2d3ibi"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/ample-theme.html"; - license = lib.licenses.free; - }; - }) {}; - annotate = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "annotate"; - ename = "annotate"; - version = "2.2.2"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/annotate-2.2.2.tar"; - sha256 = "0hrb7kjzhgy46hxaa77rv5ilsdsv6zxpawnkx4viw5jq0v5s4fl6"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/annotate.html"; - license = lib.licenses.free; - }; - }) {}; - anti-zenburn-theme = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "anti-zenburn-theme"; - ename = "anti-zenburn-theme"; - version = "2.5.1"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/anti-zenburn-theme-2.5.1.tar"; - sha256 = "121038d6mjdfis1c5v9277bd6kz656n0c25daxq85mfswvjlar0i"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/anti-zenburn-theme.html"; - license = lib.licenses.free; - }; - }) {}; - anzu = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "anzu"; - ename = "anzu"; - version = "0.64"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/anzu-0.64.tar"; - sha256 = "0mv4xiy3481d5r4rypmw7nn1hjmsvlfz5dhgmpn6cqbpzkgb6zjb"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/anzu.html"; - license = lib.licenses.free; - }; - }) {}; - apache-mode = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "apache-mode"; - ename = "apache-mode"; - version = "2.2.0"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/apache-mode-2.2.0.tar"; - sha256 = "10fgbgww7j60dik7b7mvnm1zwgv9y8p5wzggkrdk50dv3gjfxg8f"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/apache-mode.html"; - license = lib.licenses.free; - }; - }) {}; - apropospriate-theme = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "apropospriate-theme"; - ename = "apropospriate-theme"; - version = "0.2.0"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/apropospriate-theme-0.2.0.tar"; - sha256 = "1hsv26iqr0g6c3gy1df2qkd3ilwq6xaa89ch7pqh64737qrlw9db"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/apropospriate-theme.html"; - license = lib.licenses.free; - }; - }) {}; - arduino-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib, spinner }: - elpaBuild { - pname = "arduino-mode"; - ename = "arduino-mode"; - version = "1.3.0"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/arduino-mode-1.3.0.tar"; - sha256 = "167b35s34x51qnlx59sawaz4wzlnk2kf9130ylz2b1bj7jy5n27a"; - }; - packageRequires = [ emacs spinner ]; - meta = { - homepage = "https://elpa.gnu.org/packages/arduino-mode.html"; - license = lib.licenses.free; - }; - }) {}; - auto-dim-other-buffers = callPackage ({ elpaBuild - , fetchurl - , lib }: - elpaBuild { - pname = "auto-dim-other-buffers"; - ename = "auto-dim-other-buffers"; - version = "2.1.1"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/auto-dim-other-buffers-2.1.1.tar"; - sha256 = "0rgf0q66kdw9ind5bi01ydk84rclcd3kmlfzm9rfb429xnhqfzw8"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/auto-dim-other-buffers.html"; - license = lib.licenses.free; - }; - }) {}; - autothemer = callPackage ({ dash, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "autothemer"; - ename = "autothemer"; - version = "0.2.18"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/autothemer-0.2.18.tar"; - sha256 = "1v6si9fh3rbka72r5jfd35bbvfbfaxr2kfi7jmsgj07fhx4bgl2d"; - }; - packageRequires = [ dash emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/autothemer.html"; - license = lib.licenses.free; - }; - }) {}; - base32 = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "base32"; - ename = "base32"; - version = "1.0"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/base32-1.0.tar"; - sha256 = "1k1n0zlks9dammpmr0875xh5vw5prmc7rr5kwd262xidscj19k6w"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/base32.html"; - license = lib.licenses.free; - }; - }) {}; - bash-completion = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "bash-completion"; - ename = "bash-completion"; - version = "3.1.1"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/bash-completion-3.1.1.tar"; - sha256 = "1yc1a5cvmnp8dranrglpd7qjg35r6x4ndniinbmzinqr7dmydh62"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/bash-completion.html"; - license = lib.licenses.free; - }; - }) {}; - better-jumper = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "better-jumper"; - ename = "better-jumper"; - version = "1.0.1"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/better-jumper-1.0.1.tar"; - sha256 = "1jdmbp1jjip8vmmc66z2wgx95lzp1b92m66p160mdm4g3skl64c2"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/better-jumper.html"; - license = lib.licenses.free; - }; - }) {}; - bind-map = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "bind-map"; - ename = "bind-map"; - version = "1.1.2"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/bind-map-1.1.2.tar"; - sha256 = "037xk912hx00ia62h6kdfa56g44dhd0628va22znxg251izvnqxq"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/bind-map.html"; - license = lib.licenses.free; - }; - }) {}; - bison-mode = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "bison-mode"; - ename = "bison-mode"; - version = "0.4"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/bison-mode-0.4.tar"; - sha256 = "0k0h96bpcndi3m9fdk74j0ynm50n6by508mv3ds9ala26dpdr7qa"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/bison-mode.html"; - license = lib.licenses.free; - }; - }) {}; - blow = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "blow"; - ename = "blow"; - version = "1.0"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/blow-1.0.tar"; - sha256 = "009x0y86692ccj2v0cizr40ly6xdp72bnwj5pjayg3y0ph4iz0cj"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/blow.html"; - license = lib.licenses.free; - }; - }) {}; - blueprint-ts-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "blueprint-ts-mode"; - ename = "blueprint-ts-mode"; - version = "0.0.3"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/blueprint-ts-mode-0.0.3.tar"; - sha256 = "0v1sk80dka2gdkwcbria12ih3jrna3866ngdswcskyqcnkxm7b7n"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/blueprint-ts-mode.html"; - license = lib.licenses.free; - }; - }) {}; - boxquote = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "boxquote"; - ename = "boxquote"; - version = "2.3"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/boxquote-2.3.tar"; - sha256 = "0fsvfy5b4k0h6fxmvvdngxap5pfypm8iik0m1jq70za7n7g8qvmy"; - }; - packageRequires = [ cl-lib ]; - meta = { - homepage = "https://elpa.gnu.org/packages/boxquote.html"; - license = lib.licenses.free; - }; - }) {}; - buttercup = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "buttercup"; - ename = "buttercup"; - version = "1.35"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/buttercup-1.35.tar"; - sha256 = "0b9dxbn7pni2203xdg289ymkmhf458898i2lh7aplppmh68bms2c"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/buttercup.html"; - license = lib.licenses.free; - }; - }) {}; - camera = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "camera"; - ename = "camera"; - version = "0.3"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/camera-0.3.tar"; - sha256 = "0r9b20li82qcc141p4blyaj0xng5f4xrghhl09wc15ffi0cmbq7d"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/camera.html"; - license = lib.licenses.free; - }; - }) {}; - caml = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "caml"; - ename = "caml"; - version = "4.9"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/caml-4.9.tar"; - sha256 = "1xzk83bds4d23rk170n975mijlmin5dh7crfc5swwvzh8w88qxmk"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/caml.html"; - license = lib.licenses.free; - }; - }) {}; - cdlatex = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "cdlatex"; - ename = "cdlatex"; - version = "4.18.4"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/cdlatex-4.18.4.tar"; - sha256 = "174i72z3pyxsbagqk7g8d84282fh3y3ipv0bcghrgqjznxdjx427"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/cdlatex.html"; - license = lib.licenses.free; - }; - }) {}; - cider = callPackage ({ clojure-mode - , elpaBuild - , emacs - , fetchurl - , lib - , parseedn - , queue - , seq - , sesman - , spinner - , transient }: - elpaBuild { - pname = "cider"; - ename = "cider"; - version = "1.13.1"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/cider-1.13.1.tar"; - sha256 = "0df5z57schfszlp1vkb6fiiadx12qlpk5qzfw61g664a2i654fsg"; - }; - packageRequires = [ - clojure-mode - emacs - parseedn - queue - seq - sesman - spinner - transient - ]; - meta = { - homepage = "https://elpa.gnu.org/packages/cider.html"; - license = lib.licenses.free; - }; - }) {}; - clojure-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "clojure-mode"; - ename = "clojure-mode"; - version = "5.18.1"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/clojure-mode-5.18.1.tar"; - sha256 = "1p9nh4p3skjxbsnyj2in3m8jdyrrj8iw0malfcz0ppc4d7zm6klx"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/clojure-mode.html"; - license = lib.licenses.free; - }; - }) {}; - clojure-ts-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "clojure-ts-mode"; - ename = "clojure-ts-mode"; - version = "0.2.2"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/clojure-ts-mode-0.2.2.tar"; - sha256 = "14s3gawx2lazzd5ziz2plhl6k1qik8gfjka7fijgxb55ls9bvgrp"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/clojure-ts-mode.html"; - license = lib.licenses.free; - }; - }) {}; - coffee-mode = callPackage ({ cl-lib ? null - , elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "coffee-mode"; - ename = "coffee-mode"; - version = "0.6.3"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/coffee-mode-0.6.3.tar"; - sha256 = "1anywqp2b99dmilfnajxgf4msc0viw6ndl0lxpgaa7d2b3mzx9nq"; - }; - packageRequires = [ cl-lib emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/coffee-mode.html"; - license = lib.licenses.free; - }; - }) {}; - color-theme-tangotango = callPackage ({ color-theme - , elpaBuild - , fetchurl - , lib }: - elpaBuild { - pname = "color-theme-tangotango"; - ename = "color-theme-tangotango"; - version = "0.0.6"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/color-theme-tangotango-0.0.6.tar"; - sha256 = "0lfr3xg9xvfjb12kcw80d35a1ayn4f5w1dkd2b0kx0wxkq0bykim"; - }; - packageRequires = [ color-theme ]; - meta = { - homepage = "https://elpa.gnu.org/packages/color-theme-tangotango.html"; - license = lib.licenses.free; - }; - }) {}; - consult-flycheck = callPackage ({ consult - , elpaBuild - , emacs - , fetchurl - , flycheck - , lib }: - elpaBuild { - pname = "consult-flycheck"; - ename = "consult-flycheck"; - version = "1.0"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/consult-flycheck-1.0.tar"; - sha256 = "17kc7v50zq69l4803nh8sjnqwi59p09wjzqkwka6g4dapya3h2xy"; - }; - packageRequires = [ consult emacs flycheck ]; - meta = { - homepage = "https://elpa.gnu.org/packages/consult-flycheck.html"; - license = lib.licenses.free; - }; - }) {}; - corfu-terminal = callPackage ({ corfu - , elpaBuild - , emacs - , fetchurl - , lib - , popon }: - elpaBuild { - pname = "corfu-terminal"; - ename = "corfu-terminal"; - version = "0.7"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/corfu-terminal-0.7.tar"; - sha256 = "0a41hfma4iiinq2cgvwqqwxhrwjn5c7igl5sgvgx0mbjki2n6sll"; - }; - packageRequires = [ corfu emacs popon ]; - meta = { - homepage = "https://elpa.gnu.org/packages/corfu-terminal.html"; - license = lib.licenses.free; - }; - }) {}; - crux = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "crux"; - ename = "crux"; - version = "0.5.0"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/crux-0.5.0.tar"; - sha256 = "0cykjwwhl6r02fsyam4vnmlxiyq8b8qsgncb1hjnz4gj7mxc9gg4"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/crux.html"; - license = lib.licenses.free; - }; - }) {}; - cyberpunk-theme = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "cyberpunk-theme"; - ename = "cyberpunk-theme"; - version = "1.22"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/cyberpunk-theme-1.22.tar"; - sha256 = "1kgkgpb07d4kh2rf88pfgyji42qv80443i67nzha2fx01zbd5swb"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/cyberpunk-theme.html"; - license = lib.licenses.free; - }; - }) {}; - cycle-at-point = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib - , recomplete }: - elpaBuild { - pname = "cycle-at-point"; - ename = "cycle-at-point"; - version = "0.2"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/cycle-at-point-0.2.tar"; - sha256 = "1q3gylksr754s0pl8x1hdk0q4p0vz6lnasswgsqpx44nmnbsrw6z"; - }; - packageRequires = [ emacs recomplete ]; - meta = { - homepage = "https://elpa.gnu.org/packages/cycle-at-point.html"; - license = lib.licenses.free; - }; - }) {}; - d-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "d-mode"; - ename = "d-mode"; - version = "202003130913"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/d-mode-202003130913.tar"; - sha256 = "0sdyk8q1pfk5gbj5hdyc1djmyb02vvhs4s2fbbxk52nlkx95p46s"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/d-mode.html"; - license = lib.licenses.free; - }; - }) {}; - dart-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "dart-mode"; - ename = "dart-mode"; - version = "1.0.7"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/dart-mode-1.0.7.tar"; - sha256 = "1k9pn7nqskz39m3zwi9jhd1a2q440jgrla1a37qip73mwrdril1i"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/dart-mode.html"; - license = lib.licenses.free; - }; - }) {}; - denote-refs = callPackage ({ denote, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "denote-refs"; - ename = "denote-refs"; - version = "0.1.2"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/denote-refs-0.1.2.tar"; - sha256 = "0jq14adxpx9bxddkj3a4bahyr3yarjn85iplhhy9yk7k9wy7wis0"; - }; - packageRequires = [ denote emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/denote-refs.html"; - license = lib.licenses.free; - }; - }) {}; - devhelp = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "devhelp"; - ename = "devhelp"; - version = "1.0"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/devhelp-1.0.tar"; - sha256 = "14x1990yr3qqzv9dqn7xg69hqgpmgjsi68f2fg07v670lk7hs8xb"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/devhelp.html"; - license = lib.licenses.free; - }; - }) {}; - devil = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "devil"; - ename = "devil"; - version = "0.6.0"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/devil-0.6.0.tar"; - sha256 = "01n552pvr598igmd2q6w9kgjrwgzrgrb4w59mxpsylcv6wy2v2h5"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/devil.html"; - license = lib.licenses.free; - }; - }) {}; - diff-ansi = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "diff-ansi"; - ename = "diff-ansi"; - version = "0.2"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/diff-ansi-0.2.tar"; - sha256 = "0i1216mw0zgy3jdhhxsn5wpjqgxv5als1lljb1ddqjl21y6z74nw"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/diff-ansi.html"; - license = lib.licenses.free; - }; - }) {}; - doc-show-inline = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "doc-show-inline"; - ename = "doc-show-inline"; - version = "0.1"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/doc-show-inline-0.1.tar"; - sha256 = "13y7k4zp8x8fcyidw0jy6zf92af660zwb7qpps91l2dh7zwjsl2v"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/doc-show-inline.html"; - license = lib.licenses.free; - }; - }) {}; - dockerfile-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "dockerfile-mode"; - ename = "dockerfile-mode"; - version = "1.7"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/dockerfile-mode-1.7.tar"; - sha256 = "1rpgjhbb2vzz6fqcqksvx27a1mj8p3bgmjh00433qd8g7hghc9v7"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/dockerfile-mode.html"; - license = lib.licenses.free; - }; - }) {}; - dracula-theme = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "dracula-theme"; - ename = "dracula-theme"; - version = "1.8.2"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/dracula-theme-1.8.2.tar"; - sha256 = "04r7cn4n8n4fiwblmfsa23d1qh11mqfz0cghq6ss72flp5awj46g"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/dracula-theme.html"; - license = lib.licenses.free; - }; - }) {}; - drupal-mode = callPackage ({ elpaBuild, fetchurl, lib, php-mode }: - elpaBuild { - pname = "drupal-mode"; - ename = "drupal-mode"; - version = "0.7.4"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/drupal-mode-0.7.4.tar"; - sha256 = "1wr05pi5sm994cdzj329gr1lwxvq4w9wmc806izxq3fjifx0m609"; - }; - packageRequires = [ php-mode ]; - meta = { - homepage = "https://elpa.gnu.org/packages/drupal-mode.html"; - license = lib.licenses.free; - }; - }) {}; - eat = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "eat"; - ename = "eat"; - version = "0.9.4"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/eat-0.9.4.tar"; - sha256 = "0jn5rzyg1abjsb18brr1ha4vmhvxpkp8pxvaxfa0g0phcb2iz5ql"; - }; - packageRequires = [ compat emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/eat.html"; - license = lib.licenses.free; - }; - }) {}; - edit-indirect = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "edit-indirect"; - ename = "edit-indirect"; - version = "0.1.13"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/edit-indirect-0.1.13.tar"; - sha256 = "10zshywbp0f00k2d4f5bc44ynvw3f0626vl35lbah1kwmgzrrjdd"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/edit-indirect.html"; - license = lib.licenses.free; - }; - }) {}; - editorconfig = callPackage ({ elpaBuild, emacs, fetchurl, lib, nadvice }: - elpaBuild { - pname = "editorconfig"; - ename = "editorconfig"; - version = "0.11.0"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/editorconfig-0.11.0.tar"; - sha256 = "0adzm6fhx5vgg20qy9f7cqpnx938mp1ls91y5cw71pjm9ihs2cyv"; - }; - packageRequires = [ emacs nadvice ]; - meta = { - homepage = "https://elpa.gnu.org/packages/editorconfig.html"; - license = lib.licenses.free; - }; - }) {}; - elixir-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "elixir-mode"; - ename = "elixir-mode"; - version = "2.5.0"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/elixir-mode-2.5.0.tar"; - sha256 = "1x6aral441mv9443h21lnaymbpazwii22wcqvk2jfqjmyl1xj1yz"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/elixir-mode.html"; - license = lib.licenses.free; - }; - }) {}; - elpher = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "elpher"; - ename = "elpher"; - version = "3.6.0"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/elpher-3.6.0.tar"; - sha256 = "1xf3kl09inswx4w03fxj35n1ypvlin39z493fw4ksnpf79ccfk4x"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/elpher.html"; - license = lib.licenses.free; - }; - }) {}; - engine-mode = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "engine-mode"; - ename = "engine-mode"; - version = "2.2.4"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/engine-mode-2.2.4.tar"; - sha256 = "0gp1mnf0yaq4w91pj989dzlxpbpcqqj0yls23wf2ly53kbaarzv9"; - }; - packageRequires = [ cl-lib ]; - meta = { - homepage = "https://elpa.gnu.org/packages/engine-mode.html"; - license = lib.licenses.free; - }; - }) {}; - evil = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "evil"; - ename = "evil"; - version = "1.15.0"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/evil-1.15.0.tar"; - sha256 = "0ciglddlq0z91jyggp86d9g3gwfzjp55xhldqpxpq39a2xkwqh0q"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/evil.html"; - license = lib.licenses.free; - }; - }) {}; - evil-anzu = callPackage ({ anzu, elpaBuild, evil, fetchurl, lib }: - elpaBuild { - pname = "evil-anzu"; - ename = "evil-anzu"; - version = "0.2"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/evil-anzu-0.2.tar"; - sha256 = "1vn61aj0bnvkj2l3cd8m8q3n7kn09hdp6d13wc58w9pw8nrg0vq5"; - }; - packageRequires = [ anzu evil ]; - meta = { - homepage = "https://elpa.gnu.org/packages/evil-anzu.html"; - license = lib.licenses.free; - }; - }) {}; - evil-args = callPackage ({ elpaBuild, evil, fetchurl, lib }: - elpaBuild { - pname = "evil-args"; - ename = "evil-args"; - version = "1.1"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/evil-args-1.1.tar"; - sha256 = "0fv30wny2f4mg8l9jrjgxisz6nbmn84980yszbrcbkqi81dzzlyi"; - }; - packageRequires = [ evil ]; - meta = { - homepage = "https://elpa.gnu.org/packages/evil-args.html"; - license = lib.licenses.free; - }; - }) {}; - evil-escape = callPackage ({ cl-lib ? null - , elpaBuild - , emacs - , evil - , fetchurl - , lib }: - elpaBuild { - pname = "evil-escape"; - ename = "evil-escape"; - version = "3.16"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/evil-escape-3.16.tar"; - sha256 = "0vv6k3zaaw4ckk6qjiw1n41815w1g4qgy2hfgsj1vm7xc9i9zjzp"; - }; - packageRequires = [ cl-lib emacs evil ]; - meta = { - homepage = "https://elpa.gnu.org/packages/evil-escape.html"; - license = lib.licenses.free; - }; - }) {}; - evil-exchange = callPackage ({ cl-lib ? null - , elpaBuild - , evil - , fetchurl - , lib }: - elpaBuild { - pname = "evil-exchange"; - ename = "evil-exchange"; - version = "0.41"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/evil-exchange-0.41.tar"; - sha256 = "1yk7zdxl7c8c2ic37l0rsaynnpcrhdbblk2frl5m8phf54g82d8i"; - }; - packageRequires = [ cl-lib evil ]; - meta = { - homepage = "https://elpa.gnu.org/packages/evil-exchange.html"; - license = lib.licenses.free; - }; - }) {}; - evil-goggles = callPackage ({ elpaBuild, emacs, evil, fetchurl, lib }: - elpaBuild { - pname = "evil-goggles"; - ename = "evil-goggles"; - version = "0.0.2"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/evil-goggles-0.0.2.tar"; - sha256 = "0nipk8r7l5c50n9zry5264cfilx730l68ssldw3hyj14ybdf6dch"; - }; - packageRequires = [ emacs evil ]; - meta = { - homepage = "https://elpa.gnu.org/packages/evil-goggles.html"; - license = lib.licenses.free; - }; - }) {}; - evil-iedit-state = callPackage ({ elpaBuild, evil, fetchurl, iedit, lib }: - elpaBuild { - pname = "evil-iedit-state"; - ename = "evil-iedit-state"; - version = "1.3"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/evil-iedit-state-1.3.tar"; - sha256 = "1955bci018rpbdvixlw0gxay10g0vgg2xwsfmfyxcblk5glrv5cp"; - }; - packageRequires = [ evil iedit ]; - meta = { - homepage = "https://elpa.gnu.org/packages/evil-iedit-state.html"; - license = lib.licenses.free; - }; - }) {}; - evil-indent-plus = callPackage ({ cl-lib ? null - , elpaBuild - , evil - , fetchurl - , lib }: - elpaBuild { - pname = "evil-indent-plus"; - ename = "evil-indent-plus"; - version = "1.0.1"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/evil-indent-plus-1.0.1.tar"; - sha256 = "1kzlvi8xgfxy26w1m31nyh6vrq787vchkmk4r1xaphk9wn9bw1pq"; - }; - packageRequires = [ cl-lib evil ]; - meta = { - homepage = "https://elpa.gnu.org/packages/evil-indent-plus.html"; - license = lib.licenses.free; - }; - }) {}; - evil-lisp-state = callPackage ({ bind-map - , elpaBuild - , evil - , fetchurl - , lib - , smartparens }: - elpaBuild { - pname = "evil-lisp-state"; - ename = "evil-lisp-state"; - version = "8.2"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/evil-lisp-state-8.2.tar"; - sha256 = "14v1nv797b4rxxxnvzwy6pp10g3mmvifb919iv7nx96sbn919w0p"; - }; - packageRequires = [ bind-map evil smartparens ]; - meta = { - homepage = "https://elpa.gnu.org/packages/evil-lisp-state.html"; - license = lib.licenses.free; - }; - }) {}; - evil-matchit = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "evil-matchit"; - ename = "evil-matchit"; - version = "3.0.4"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/evil-matchit-3.0.4.tar"; - sha256 = "1ib2xlz7ciaszw2j5184mf6560jmap93vh515sk8dmkkahdwsjgz"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/evil-matchit.html"; - license = lib.licenses.free; - }; - }) {}; - evil-nerd-commenter = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "evil-nerd-commenter"; - ename = "evil-nerd-commenter"; - version = "3.6.1"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/evil-nerd-commenter-3.6.1.tar"; - sha256 = "1nzqwqp2gq3wka2x782yqz5d8bw3wglra42907kylkqwqbxryh0w"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/evil-nerd-commenter.html"; - license = lib.licenses.free; - }; - }) {}; - evil-numbers = callPackage ({ elpaBuild, emacs, evil, fetchurl, lib }: - elpaBuild { - pname = "evil-numbers"; - ename = "evil-numbers"; - version = "0.7"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/evil-numbers-0.7.tar"; - sha256 = "1k5vrh8bj9kldqq8kxn1qi3k82i7k4v4h6nkk9hng8p90zhac02i"; - }; - packageRequires = [ emacs evil ]; - meta = { - homepage = "https://elpa.gnu.org/packages/evil-numbers.html"; - license = lib.licenses.free; - }; - }) {}; - evil-surround = callPackage ({ elpaBuild, evil, fetchurl, lib }: - elpaBuild { - pname = "evil-surround"; - ename = "evil-surround"; - version = "1.0.4"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/evil-surround-1.0.4.tar"; - sha256 = "1fzhqg2zrfl1yvhf96s5m0b9793cysciqbxiihxzrnnf2rnrlls2"; - }; - packageRequires = [ evil ]; - meta = { - homepage = "https://elpa.gnu.org/packages/evil-surround.html"; - license = lib.licenses.free; - }; - }) {}; - evil-visual-mark-mode = callPackage ({ dash - , elpaBuild - , evil - , fetchurl - , lib }: - elpaBuild { - pname = "evil-visual-mark-mode"; - ename = "evil-visual-mark-mode"; - version = "0.0.5"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/evil-visual-mark-mode-0.0.5.tar"; - sha256 = "0hjg9jmyhhc6a6zzjicwy62m9bh7wlw6hc4cf2g6g416c0ri2d18"; - }; - packageRequires = [ dash evil ]; - meta = { - homepage = "https://elpa.gnu.org/packages/evil-visual-mark-mode.html"; - license = lib.licenses.free; - }; - }) {}; - evil-visualstar = callPackage ({ elpaBuild, evil, fetchurl, lib }: - elpaBuild { - pname = "evil-visualstar"; - ename = "evil-visualstar"; - version = "0.2.0"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/evil-visualstar-0.2.0.tar"; - sha256 = "03liavxxpawvlgwdsihzz3z08yv227zjjqyll1cbmbk0678kbl7m"; - }; - packageRequires = [ evil ]; - meta = { - homepage = "https://elpa.gnu.org/packages/evil-visualstar.html"; - license = lib.licenses.free; - }; - }) {}; - exec-path-from-shell = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "exec-path-from-shell"; - ename = "exec-path-from-shell"; - version = "2.2"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/exec-path-from-shell-2.2.tar"; - sha256 = "14nzk04aypqminpqs181nh3di23nnw64z0ir940ajs9bx5pv9s1w"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/exec-path-from-shell.html"; - license = lib.licenses.free; - }; - }) {}; - flx = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "flx"; - ename = "flx"; - version = "0.6.2"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/flx-0.6.2.tar"; - sha256 = "00d3q238grxcvnx6pshb7ajbz559gfp00pqaq56r2n5xqrvrxfnc"; - }; - packageRequires = [ cl-lib ]; - meta = { - homepage = "https://elpa.gnu.org/packages/flx.html"; - license = lib.licenses.free; - }; - }) {}; - flx-ido = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, flx, lib }: - elpaBuild { - pname = "flx-ido"; - ename = "flx-ido"; - version = "0.6.2"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/flx-ido-0.6.2.tar"; - sha256 = "1933d3dcwynzs5qnv3pl4xdybj5gg0sa8zb58j0ld9hyiacm6zn5"; - }; - packageRequires = [ cl-lib flx ]; - meta = { - homepage = "https://elpa.gnu.org/packages/flx-ido.html"; - license = lib.licenses.free; - }; - }) {}; - flycheck = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "flycheck"; - ename = "flycheck"; - version = "34.1"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/flycheck-34.1.tar"; - sha256 = "1jj1c4gq39ik8fihsz13wp4c26fm2m6kyr7ir22ql0d007zm3173"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/flycheck.html"; - license = lib.licenses.free; - }; - }) {}; - flymake-guile = callPackage ({ elpaBuild - , emacs - , fetchurl - , flymake ? null - , lib }: - elpaBuild { - pname = "flymake-guile"; - ename = "flymake-guile"; - version = "0.5"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/flymake-guile-0.5.tar"; - sha256 = "0gfblb49l52j7iq3y6fxx1jpr72z61pwxsxfknvfi4y05znxnf0k"; - }; - packageRequires = [ emacs flymake ]; - meta = { - homepage = "https://elpa.gnu.org/packages/flymake-guile.html"; - license = lib.licenses.free; - }; - }) {}; - flymake-kondor = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "flymake-kondor"; - ename = "flymake-kondor"; - version = "0.1.3"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/flymake-kondor-0.1.3.tar"; - sha256 = "0y5qnlk3q0fjch12d4vwni7v6rk0h5056s5lzjgns71x36xd1i21"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/flymake-kondor.html"; - license = lib.licenses.free; - }; - }) {}; - flymake-popon = callPackage ({ elpaBuild - , emacs - , fetchurl - , flymake ? null - , lib - , popon - , posframe }: - elpaBuild { - pname = "flymake-popon"; - ename = "flymake-popon"; - version = "0.5.1"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/flymake-popon-0.5.1.tar"; - sha256 = "0a9p0mnp1n4znb9xgi5ldjv8x1khhdr5idb8vcd444nd03q0lj6s"; - }; - packageRequires = [ emacs flymake popon posframe ]; - meta = { - homepage = "https://elpa.gnu.org/packages/flymake-popon.html"; - license = lib.licenses.free; - }; - }) {}; - focus = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "focus"; - ename = "focus"; - version = "1.0.1"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/focus-1.0.1.tar"; - sha256 = "164xlxc5x2i955rfjdhlxp5ch55bh79gr7mzfychkjx0x088hcaa"; - }; - packageRequires = [ cl-lib emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/focus.html"; - license = lib.licenses.free; - }; - }) {}; - forth-mode = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "forth-mode"; - ename = "forth-mode"; - version = "0.2"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/forth-mode-0.2.tar"; - sha256 = "04xcvjzvl4pgx48l2pzil7s2iqqbf86z57wv76ahp4sd1xigpfqc"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/forth-mode.html"; - license = lib.licenses.free; - }; - }) {}; - free-keys = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "free-keys"; - ename = "free-keys"; - version = "1.0"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/free-keys-1.0.tar"; - sha256 = "04x4hmia5rx6bd8pkp5b9g4mn081r14vyk1jbdygdzr5w5rhifx3"; - }; - packageRequires = [ cl-lib ]; - meta = { - homepage = "https://elpa.gnu.org/packages/free-keys.html"; - license = lib.licenses.free; - }; - }) {}; - gc-buffers = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "gc-buffers"; - ename = "gc-buffers"; - version = "1.0"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/gc-buffers-1.0.tar"; - sha256 = "00204vanfabyf6cgbn64xgqhqz8mlppizsgi31xg6id1qgrj37p3"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/gc-buffers.html"; - license = lib.licenses.free; - }; - }) {}; - geiser = callPackage ({ elpaBuild, emacs, fetchurl, lib, project }: - elpaBuild { - pname = "geiser"; - ename = "geiser"; - version = "0.30"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/geiser-0.30.tar"; - sha256 = "0h63skslmc23rjlsrqmcnqf2s431ml0wmkbza38j44kzxnsz0x5g"; - }; - packageRequires = [ emacs project ]; - meta = { - homepage = "https://elpa.gnu.org/packages/geiser.html"; - license = lib.licenses.free; - }; - }) {}; - geiser-chez = callPackage ({ elpaBuild, emacs, fetchurl, geiser, lib }: - elpaBuild { - pname = "geiser-chez"; - ename = "geiser-chez"; - version = "0.18"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/geiser-chez-0.18.tar"; - sha256 = "14l2a7njx3bzxj1qpc1m5mx4prm3ixgsiii3k484brbn4vim4j58"; - }; - packageRequires = [ emacs geiser ]; - meta = { - homepage = "https://elpa.gnu.org/packages/geiser-chez.html"; - license = lib.licenses.free; - }; - }) {}; - geiser-chibi = callPackage ({ elpaBuild, emacs, fetchurl, geiser, lib }: - elpaBuild { - pname = "geiser-chibi"; - ename = "geiser-chibi"; - version = "0.17"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/geiser-chibi-0.17.tar"; - sha256 = "17kkgs0z2xwbbwn7s49lnha6pmri1h7jnnhh5qvxif5xyvyy8bih"; - }; - packageRequires = [ emacs geiser ]; - meta = { - homepage = "https://elpa.gnu.org/packages/geiser-chibi.html"; - license = lib.licenses.free; - }; - }) {}; - geiser-chicken = callPackage ({ elpaBuild, emacs, fetchurl, geiser, lib }: - elpaBuild { - pname = "geiser-chicken"; - ename = "geiser-chicken"; - version = "0.17"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/geiser-chicken-0.17.tar"; - sha256 = "1l0x0b5gcmc6v2gd2jhrz4zz2630rggq8w7ffzhsf8b8hr4d1ixy"; - }; - packageRequires = [ emacs geiser ]; - meta = { - homepage = "https://elpa.gnu.org/packages/geiser-chicken.html"; - license = lib.licenses.free; - }; - }) {}; - geiser-gambit = callPackage ({ elpaBuild, emacs, fetchurl, geiser, lib }: - elpaBuild { - pname = "geiser-gambit"; - ename = "geiser-gambit"; - version = "0.18.1"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/geiser-gambit-0.18.1.tar"; - sha256 = "1pqify8vqxzpm202zz9q92hp65yhs624z6qc2hgp9c1zms56jkqs"; - }; - packageRequires = [ emacs geiser ]; - meta = { - homepage = "https://elpa.gnu.org/packages/geiser-gambit.html"; - license = lib.licenses.free; - }; - }) {}; - geiser-gauche = callPackage ({ elpaBuild, emacs, fetchurl, geiser, lib }: - elpaBuild { - pname = "geiser-gauche"; - ename = "geiser-gauche"; - version = "0.0.2"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/geiser-gauche-0.0.2.tar"; - sha256 = "189addy5xvx62j91ihi23i8dh5msm0wlwxyi8n07f4m2garrn14l"; - }; - packageRequires = [ emacs geiser ]; - meta = { - homepage = "https://elpa.gnu.org/packages/geiser-gauche.html"; - license = lib.licenses.free; - }; - }) {}; - geiser-guile = callPackage ({ elpaBuild - , emacs - , fetchurl - , geiser - , lib - , transient }: - elpaBuild { - pname = "geiser-guile"; - ename = "geiser-guile"; - version = "0.28.1"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/geiser-guile-0.28.1.tar"; - sha256 = "148bvwcppv0qk7yh38c0m36hldw58cqhbyniyzwffagmlg0yqzsb"; - }; - packageRequires = [ emacs geiser transient ]; - meta = { - homepage = "https://elpa.gnu.org/packages/geiser-guile.html"; - license = lib.licenses.free; - }; - }) {}; - geiser-kawa = callPackage ({ elpaBuild, emacs, fetchurl, geiser, lib }: - elpaBuild { - pname = "geiser-kawa"; - ename = "geiser-kawa"; - version = "0.0.1"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/geiser-kawa-0.0.1.tar"; - sha256 = "1qh4qr406ahk4k8g46nzkiic1fidhni0a5zv4i84cdypv1c4473p"; - }; - packageRequires = [ emacs geiser ]; - meta = { - homepage = "https://elpa.gnu.org/packages/geiser-kawa.html"; - license = lib.licenses.free; - }; - }) {}; - geiser-mit = callPackage ({ elpaBuild, emacs, fetchurl, geiser, lib }: - elpaBuild { - pname = "geiser-mit"; - ename = "geiser-mit"; - version = "0.15"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/geiser-mit-0.15.tar"; - sha256 = "12wimv5x2k64ww9x147dlx2gfygmgz96hqcdhkbidi1smhfz11gk"; - }; - packageRequires = [ emacs geiser ]; - meta = { - homepage = "https://elpa.gnu.org/packages/geiser-mit.html"; - license = lib.licenses.free; - }; - }) {}; - geiser-racket = callPackage ({ elpaBuild, emacs, fetchurl, geiser, lib }: - elpaBuild { - pname = "geiser-racket"; - ename = "geiser-racket"; - version = "0.16"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/geiser-racket-0.16.tar"; - sha256 = "08sn32ams88ism6k24kq7s54vrdblkn15x9lldyqg4zapbllr1ny"; - }; - packageRequires = [ emacs geiser ]; - meta = { - homepage = "https://elpa.gnu.org/packages/geiser-racket.html"; - license = lib.licenses.free; - }; - }) {}; - geiser-stklos = callPackage ({ elpaBuild, emacs, fetchurl, geiser, lib }: - elpaBuild { - pname = "geiser-stklos"; - ename = "geiser-stklos"; - version = "1.8"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/geiser-stklos-1.8.tar"; - sha256 = "1525n49igcnwr2wsjv4a74yk1gbjvv1l9rmkcpafyxyykvi94j6s"; - }; - packageRequires = [ emacs geiser ]; - meta = { - homepage = "https://elpa.gnu.org/packages/geiser-stklos.html"; - license = lib.licenses.free; - }; - }) {}; - git-commit = callPackage ({ dash - , elpaBuild - , emacs - , fetchurl - , lib - , transient - , with-editor }: - elpaBuild { - pname = "git-commit"; - ename = "git-commit"; - version = "3.3.0"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/git-commit-3.3.0.tar"; - sha256 = "0lp6r4w1k0idvfc2h0chlplap2i4x2slva9cw3iw1rhhxbcvlmdx"; - }; - packageRequires = [ dash emacs transient with-editor ]; - meta = { - homepage = "https://elpa.gnu.org/packages/git-commit.html"; - license = lib.licenses.free; - }; - }) {}; - git-modes = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "git-modes"; - ename = "git-modes"; - version = "1.4.2"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/git-modes-1.4.2.tar"; - sha256 = "0hdy4wpnyrn3a8i9yxk5gvsggnpgpg6r0wip0zmhcl9nxi4h6kb3"; - }; - packageRequires = [ compat emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/git-modes.html"; - license = lib.licenses.free; - }; - }) {}; - gnu-apl-mode = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "gnu-apl-mode"; - ename = "gnu-apl-mode"; - version = "1.5.1"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/gnu-apl-mode-1.5.1.tar"; - sha256 = "0hzdmrhrcnq49cklpmbx1sq7d9qd2q6pprgshhhjx45mnn1q24v0"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/gnu-apl-mode.html"; - license = lib.licenses.free; - }; - }) {}; - gnu-indent = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "gnu-indent"; - ename = "gnu-indent"; - version = "1.0"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/gnu-indent-1.0.tar"; - sha256 = "1aj8si93ig1qbdqgq3f4jwnsws63drkfwfzxlq0i3qqfhsni0a15"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/gnu-indent.html"; - license = lib.licenses.free; - }; - }) {}; - gnuplot = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "gnuplot"; - ename = "gnuplot"; - version = "0.8.1"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/gnuplot-0.8.1.tar"; - sha256 = "1y364j5gr8cnkndxd088kaxd2ah0nd7176gfjligm3ngpgg6ndyx"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/gnuplot.html"; - license = lib.licenses.free; - }; - }) {}; - go-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "go-mode"; - ename = "go-mode"; - version = "1.6.0"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/go-mode-1.6.0.tar"; - sha256 = "0ilvkl7iv47v0xyha07gfyv1a4c50ifw57bp7rx8ai77v30f3a2a"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/go-mode.html"; - license = lib.licenses.free; - }; - }) {}; - golden-ratio = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "golden-ratio"; - ename = "golden-ratio"; - version = "1.0.1"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/golden-ratio-1.0.1.tar"; - sha256 = "169jl82906k03vifks0zs4sk5gcxax5jii6nysh6y6ns2h656cqx"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/golden-ratio.html"; - license = lib.licenses.free; - }; - }) {}; - gotham-theme = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "gotham-theme"; - ename = "gotham-theme"; - version = "1.1.9"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/gotham-theme-1.1.9.tar"; - sha256 = "195r8idq2ak6wpmgifpgvx52hljb8i7p9wx6ii1kh0baaqk31qq2"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/gotham-theme.html"; - license = lib.licenses.free; - }; - }) {}; - goto-chg = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "goto-chg"; - ename = "goto-chg"; - version = "1.7.5"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/goto-chg-1.7.5.tar"; - sha256 = "1j5vk8vc1v865fc8gdy0p5lpp2kkl0yn9f75npiva3ay6mwvnvay"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/goto-chg.html"; - license = lib.licenses.free; - }; - }) {}; - gptel = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib, transient }: - elpaBuild { - pname = "gptel"; - ename = "gptel"; - version = "0.8.6"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/gptel-0.8.6.tar"; - sha256 = "1ds0i32bdmdi5w68cjxm9xlg0m9n29yr4hl6sqi8gn3kgswfx1sb"; - }; - packageRequires = [ compat emacs transient ]; - meta = { - homepage = "https://elpa.gnu.org/packages/gptel.html"; - license = lib.licenses.free; - }; - }) {}; - graphql-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "graphql-mode"; - ename = "graphql-mode"; - version = "1.0.0"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/graphql-mode-1.0.0.tar"; - sha256 = "0pfyznfndc8g2g3a3pxzcjsh3cah3amhz5124flrja5fqdgdmpjz"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/graphql-mode.html"; - license = lib.licenses.free; - }; - }) {}; - gruber-darker-theme = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "gruber-darker-theme"; - ename = "gruber-darker-theme"; - version = "0.7"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/gruber-darker-theme-0.7.tar"; - sha256 = "1ib9ad120g39fbkj41am6khglv1p6g3a9hk2jj2kl0c6czr1il2r"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/gruber-darker-theme.html"; - license = lib.licenses.free; - }; - }) {}; - gruvbox-theme = callPackage ({ autothemer, elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "gruvbox-theme"; - ename = "gruvbox-theme"; - version = "1.30.1"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/gruvbox-theme-1.30.1.tar"; - sha256 = "1y30aahdxzdfmj021vbrz4zmdq6lr9k08hna9i1a8g4cywgbz8ri"; - }; - packageRequires = [ autothemer ]; - meta = { - homepage = "https://elpa.gnu.org/packages/gruvbox-theme.html"; - license = lib.licenses.free; - }; - }) {}; - guru-mode = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "guru-mode"; - ename = "guru-mode"; - version = "1.0"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/guru-mode-1.0.tar"; - sha256 = "0kmbllzvp8qzj8ck2azq2wfw66ywc80zicncja62bi6zsh2l622z"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/guru-mode.html"; - license = lib.licenses.free; - }; - }) {}; - haml-mode = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "haml-mode"; - ename = "haml-mode"; - version = "3.2.1"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/haml-mode-3.2.1.tar"; - sha256 = "0hhra7bryk3n649s3byzq6vv5ywd4bqkfppya7bswqkj3bakiyil"; - }; - packageRequires = [ cl-lib emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/haml-mode.html"; - license = lib.licenses.free; - }; - }) {}; - haskell-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "haskell-mode"; - ename = "haskell-mode"; - version = "17.5"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/haskell-mode-17.5.tar"; - sha256 = "1yjy0cvgs5cnq5d9sv24p1p66z83r9rhbgn0nsccc12rn2gm3hyn"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/haskell-mode.html"; - license = lib.licenses.free; - }; - }) {}; - haskell-tng-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "haskell-tng-mode"; - ename = "haskell-tng-mode"; - version = "0.0.1"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/haskell-tng-mode-0.0.1.tar"; - sha256 = "0l6rs93322la2fn8wyvxshl6f967ngamw2m1hnm2j6hvmqph5cpj"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/haskell-tng-mode.html"; - license = lib.licenses.free; - }; - }) {}; - helm = callPackage ({ elpaBuild, fetchurl, helm-core, lib, popup, wfnames }: - elpaBuild { - pname = "helm"; - ename = "helm"; - version = "3.9.8"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/helm-3.9.8.tar"; - sha256 = "1vcz3vj6drp5v66s3nsrai39rcwp1q3l2qdd1qxw7n58m4fgrkm6"; - }; - packageRequires = [ helm-core popup wfnames ]; - meta = { - homepage = "https://elpa.gnu.org/packages/helm.html"; - license = lib.licenses.free; - }; - }) {}; - helm-core = callPackage ({ async, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "helm-core"; - ename = "helm-core"; - version = "3.9.8"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/helm-core-3.9.8.tar"; - sha256 = "03l5sva3qhfmjdpys1k2pbcja58fsdxljvmffjx70j7wyclb3v03"; - }; - packageRequires = [ async emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/helm-core.html"; - license = lib.licenses.free; - }; - }) {}; - highlight-parentheses = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "highlight-parentheses"; - ename = "highlight-parentheses"; - version = "2.2.2"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/highlight-parentheses-2.2.2.tar"; - sha256 = "13686dkgpn30di3kkc60l3dhrrjdknqkmvgjnl97mrbikxfma7w2"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/highlight-parentheses.html"; - license = lib.licenses.free; - }; - }) {}; - hl-block-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "hl-block-mode"; - ename = "hl-block-mode"; - version = "0.2"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/hl-block-mode-0.2.tar"; - sha256 = "0anv7bvrwylp504l3g42jcbcfmibv9jzs2kbkny46xd9vfb3kyrl"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/hl-block-mode.html"; - license = lib.licenses.free; - }; - }) {}; - hl-column = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "hl-column"; - ename = "hl-column"; - version = "1.0"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/hl-column-1.0.tar"; - sha256 = "11d7xplpjx0b6ppcjv4giazrla1qcaaf2i6s5g0j5zxb1m60kkfz"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/hl-column.html"; - license = lib.licenses.free; - }; - }) {}; - htmlize = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "htmlize"; - ename = "htmlize"; - version = "1.56"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/htmlize-1.56.tar"; - sha256 = "0s4k5q8b4grx3zyrryxcqahixkpzcni2qqnmm07axfxpgcqcnk9c"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/htmlize.html"; - license = lib.licenses.free; - }; - }) {}; - hyperdrive = callPackage ({ compat - , elpaBuild - , emacs - , fetchurl - , lib - , map - , persist - , plz - , taxy-magit-section - , transient }: - elpaBuild { - pname = "hyperdrive"; - ename = "hyperdrive"; - version = "0.3"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/hyperdrive-0.3.tar"; - sha256 = "03r5qx3a0w1ll4ql7nrjgp19cnk7rrf7ibvj8gd57gqqihkdmqqw"; - }; - packageRequires = [ - compat - emacs - map - persist - plz - taxy-magit-section - transient - ]; - meta = { - homepage = "https://elpa.gnu.org/packages/hyperdrive.html"; - license = lib.licenses.free; - }; - }) {}; - idle-highlight-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "idle-highlight-mode"; - ename = "idle-highlight-mode"; - version = "1.1.4"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/idle-highlight-mode-1.1.4.tar"; - sha256 = "0vp45ww8bxacrwzv0jqzs782symxysmpvawd29pa1yci1qp2pvm5"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/idle-highlight-mode.html"; - license = lib.licenses.free; - }; - }) {}; - idris-mode = callPackage ({ cl-lib ? null - , elpaBuild - , emacs - , fetchurl - , lib - , prop-menu }: - elpaBuild { - pname = "idris-mode"; - ename = "idris-mode"; - version = "1.1.0"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/idris-mode-1.1.0.tar"; - sha256 = "1vlm7gshrkwp9lfm5jcp1rnsjxwzqknrjhl3q5ifwmicyvqkqwsv"; - }; - packageRequires = [ cl-lib emacs prop-menu ]; - meta = { - homepage = "https://elpa.gnu.org/packages/idris-mode.html"; - license = lib.licenses.free; - }; - }) {}; - iedit = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "iedit"; - ename = "iedit"; - version = "0.9.9.9.9"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/iedit-0.9.9.9.9.tar"; - sha256 = "12s71yj8ycrls2fl97qs3igk5y06ksbmfq2idz0a2zrdggndg0b6"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/iedit.html"; - license = lib.licenses.free; - }; - }) {}; - inf-clojure = callPackage ({ clojure-mode - , elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "inf-clojure"; - ename = "inf-clojure"; - version = "3.2.1"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/inf-clojure-3.2.1.tar"; - sha256 = "1pvngj87hqr0qzc62cgq294rllxbmn7803pnqqr8ah1qxy65a1wb"; - }; - packageRequires = [ clojure-mode emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/inf-clojure.html"; - license = lib.licenses.free; - }; - }) {}; - inf-ruby = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "inf-ruby"; - ename = "inf-ruby"; - version = "2.8.1"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/inf-ruby-2.8.1.tar"; - sha256 = "1iisxgrw7lkrcl86mj3s3578qxnx1cn615swsmnch2ilwjqdrdza"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/inf-ruby.html"; - license = lib.licenses.free; - }; - }) {}; - inkpot-theme = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "inkpot-theme"; - ename = "inkpot-theme"; - version = "0.1"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/inkpot-theme-0.1.tar"; - sha256 = "0ik7vkwqlsgxmdckd154kh82zg8jr41vwc0a200x9920l5mnfjq2"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/inkpot-theme.html"; - license = lib.licenses.free; - }; - }) {}; - iwindow = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib, seq }: - elpaBuild { - pname = "iwindow"; - ename = "iwindow"; - version = "1.1"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/iwindow-1.1.tar"; - sha256 = "04d5dxqazxfx8ap9vmhj643x7lmpa0wmzcm9w9mlvsk2kaz0j19i"; - }; - packageRequires = [ compat emacs seq ]; - meta = { - homepage = "https://elpa.gnu.org/packages/iwindow.html"; - license = lib.licenses.free; - }; - }) {}; - j-mode = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "j-mode"; - ename = "j-mode"; - version = "1.1.1"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/j-mode-1.1.1.tar"; - sha256 = "056af7l7rn116nygln41rsq2val5s3y0pz1pj2736mqsx3lcyiy2"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/j-mode.html"; - license = lib.licenses.free; - }; - }) {}; - jade-mode = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "jade-mode"; - ename = "jade-mode"; - version = "1.0.1"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/jade-mode-1.0.1.tar"; - sha256 = "0pv0n9vharda92avggd91q8i98yjim9ccnz5m5c5xw12hxcsfj17"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/jade-mode.html"; - license = lib.licenses.free; - }; - }) {}; - jinja2-mode = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "jinja2-mode"; - ename = "jinja2-mode"; - version = "0.3"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/jinja2-mode-0.3.tar"; - sha256 = "0dg1zn7mghclnxsmcl5nq5jqibm18sja23058q9lk6nph4fvz5dq"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/jinja2-mode.html"; - license = lib.licenses.free; - }; - }) {}; - julia-mode = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "julia-mode"; - ename = "julia-mode"; - version = "0.4"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/julia-mode-0.4.tar"; - sha256 = "15x63nwq6rh1yxwwd8hf0a8nznws8gzxqiw45n6pv8vp8h2v3fsi"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/julia-mode.html"; - license = lib.licenses.free; - }; - }) {}; - keycast = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "keycast"; - ename = "keycast"; - version = "1.3.3"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/keycast-1.3.3.tar"; - sha256 = "048j5q4hpr8y89lrcqwbcqjazj52rak8jv8nl6fs4sqjik10zcji"; - }; - packageRequires = [ compat emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/keycast.html"; - license = lib.licenses.free; - }; - }) {}; - kotlin-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "kotlin-mode"; - ename = "kotlin-mode"; - version = "2.0.0"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/kotlin-mode-2.0.0.tar"; - sha256 = "0d247kxbrhkbmgldmalywmx6fqiz35ifvjbv20lyrmnbyhx1zr97"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/kotlin-mode.html"; - license = lib.licenses.free; - }; - }) {}; - lorem-ipsum = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "lorem-ipsum"; - ename = "lorem-ipsum"; - version = "0.4"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/lorem-ipsum-0.4.tar"; - sha256 = "0d1c6zalnqhyn88dbbi8wqzvp0ppswhqv656hbj129jwp4iida4x"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/lorem-ipsum.html"; - license = lib.licenses.free; - }; - }) {}; - lua-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "lua-mode"; - ename = "lua-mode"; - version = "20221027"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/lua-mode-20221027.tar"; - sha256 = "0mg4fjprrcwqfrzxh6wpl92r3ywpj3586444c6yvq1rs56z5wvj5"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/lua-mode.html"; - license = lib.licenses.free; - }; - }) {}; - macrostep = callPackage ({ cl-lib ? null - , compat - , elpaBuild - , fetchurl - , lib }: - elpaBuild { - pname = "macrostep"; - ename = "macrostep"; - version = "0.9.4"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/macrostep-0.9.4.tar"; - sha256 = "01n3qhxfjd9vg93ddrhnm275v24ih5qczkphc232m0csswxghpdk"; - }; - packageRequires = [ cl-lib compat ]; - meta = { - homepage = "https://elpa.gnu.org/packages/macrostep.html"; - license = lib.licenses.free; - }; - }) {}; - magit = callPackage ({ dash - , elpaBuild - , emacs - , fetchurl - , git-commit - , lib - , magit-section - , transient - , with-editor }: - elpaBuild { - pname = "magit"; - ename = "magit"; - version = "3.3.0"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/magit-3.3.0.tar"; - sha256 = "0ihrds45z12z155c1y7haz1mxc95w6v4rynh0izm159xhz44121z"; - }; - packageRequires = [ - dash - emacs - git-commit - magit-section - transient - with-editor - ]; - meta = { - homepage = "https://elpa.gnu.org/packages/magit.html"; - license = lib.licenses.free; - }; - }) {}; - magit-section = callPackage ({ dash, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "magit-section"; - ename = "magit-section"; - version = "3.3.0"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/magit-section-3.3.0.tar"; - sha256 = "08ac10vips6f2gy4x4w2wkz2ki3q0d6dhynkmlpdinsdmgagziny"; - }; - packageRequires = [ dash emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/magit-section.html"; - license = lib.licenses.free; - }; - }) {}; - markdown-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "markdown-mode"; - ename = "markdown-mode"; - version = "2.6"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/markdown-mode-2.6.tar"; - sha256 = "15s8snzfvzzfk7wfizz5r8aksywq7s9h6xbb2y5dqjkpqg951va2"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/markdown-mode.html"; - license = lib.licenses.free; - }; - }) {}; - mastodon = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib - , persist - , request }: - elpaBuild { - pname = "mastodon"; - ename = "mastodon"; - version = "1.0.21"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/mastodon-1.0.21.tar"; - sha256 = "1qlpkg28q4iyvjjzv8b40b8q7ni7rc94lj5akgzxbzw4avpp1217"; - }; - packageRequires = [ emacs persist request ]; - meta = { - homepage = "https://elpa.gnu.org/packages/mastodon.html"; - license = lib.licenses.free; - }; - }) {}; - material-theme = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "material-theme"; - ename = "material-theme"; - version = "2015"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/material-theme-2015.tar"; - sha256 = "117ismd3p577cr59b6995byyq90zn4nd81dlf4pm8p0iiziryyji"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/material-theme.html"; - license = lib.licenses.free; - }; - }) {}; - mentor = callPackage ({ async - , elpaBuild - , emacs - , fetchurl - , lib - , seq - , url-scgi - , xml-rpc }: - elpaBuild { - pname = "mentor"; - ename = "mentor"; - version = "0.5"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/mentor-0.5.tar"; - sha256 = "1sqdwdbanrdvrr8qqn23ylcyc98jcjc7yq1g1d963v8d9wfbailv"; - }; - packageRequires = [ async emacs seq url-scgi xml-rpc ]; - meta = { - homepage = "https://elpa.gnu.org/packages/mentor.html"; - license = lib.licenses.free; - }; - }) {}; - meow = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "meow"; - ename = "meow"; - version = "1.4.5"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/meow-1.4.5.tar"; - sha256 = "1d63mw88vq97rq3a7qhkxid2xaag5dp21ijisw9s3fk972kcks3s"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/meow.html"; - license = lib.licenses.free; - }; - }) {}; - minibar = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "minibar"; - ename = "minibar"; - version = "0.3"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/minibar-0.3.tar"; - sha256 = "0vxjw485bja8h3gmqmvg9541f21ricwcw6ydlhv9174as5cmwx5j"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/minibar.html"; - license = lib.licenses.free; - }; - }) {}; - moe-theme = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "moe-theme"; - ename = "moe-theme"; - version = "1.0.2"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/moe-theme-1.0.2.tar"; - sha256 = "13c4rj0c9fi4nipzsrmvgb8ddvk3dckijga07yxp71x5ba6mrp2n"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/moe-theme.html"; - license = lib.licenses.free; - }; - }) {}; - monokai-theme = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "monokai-theme"; - ename = "monokai-theme"; - version = "3.5.3"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/monokai-theme-3.5.3.tar"; - sha256 = "14ylizbhfj2hlc52gi2fs70avz39s46wnr96dbbq4l8vmhxs7il5"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/monokai-theme.html"; - license = lib.licenses.free; - }; - }) {}; - mpv = callPackage ({ cl-lib ? null - , elpaBuild - , emacs - , fetchurl - , json ? null - , lib - , org }: - elpaBuild { - pname = "mpv"; - ename = "mpv"; - version = "0.2.0"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/mpv-0.2.0.tar"; - sha256 = "183alhd5fvmlhhfm0wl7b50axs01pgiwv735c43bfzdi2ny4szcm"; - }; - packageRequires = [ cl-lib emacs json org ]; - meta = { - homepage = "https://elpa.gnu.org/packages/mpv.html"; - license = lib.licenses.free; - }; - }) {}; - multiple-cursors = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "multiple-cursors"; - ename = "multiple-cursors"; - version = "1.4.0"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/multiple-cursors-1.4.0.tar"; - sha256 = "0452wrbwg8hyvsri99h71g04dll5w65na265pp9whphq6l06ikrx"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/multiple-cursors.html"; - license = lib.licenses.free; - }; - }) {}; - nasm-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "nasm-mode"; - ename = "nasm-mode"; - version = "1.1.1"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/nasm-mode-1.1.1.tar"; - sha256 = "19k0gwwx2fz779yli6pcl0a7grhsbhwyisq76lmnnclw0gkf686l"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/nasm-mode.html"; - license = lib.licenses.free; - }; - }) {}; - nginx-mode = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "nginx-mode"; - ename = "nginx-mode"; - version = "1.1.10"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/nginx-mode-1.1.10.tar"; - sha256 = "0c6biqxbwpkrbqi639ifgv8jkfadssyznjkq6hxvqgjh3nnyrlx3"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/nginx-mode.html"; - license = lib.licenses.free; - }; - }) {}; - nix-mode = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib - , magit-section - , transient }: - elpaBuild { - pname = "nix-mode"; - ename = "nix-mode"; - version = "1.5.0"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/nix-mode-1.5.0.tar"; - sha256 = "0hansrsyzx8j31rk45y8zs9hbfjgbv9sf3r37s2a2adz48n9k86g"; - }; - packageRequires = [ emacs magit-section transient ]; - meta = { - homepage = "https://elpa.gnu.org/packages/nix-mode.html"; - license = lib.licenses.free; - }; - }) {}; - oblivion-theme = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "oblivion-theme"; - ename = "oblivion-theme"; - version = "0.1"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/oblivion-theme-0.1.tar"; - sha256 = "0njm7znh84drqwkp4jjsr8by6q9xd65r8l7xaqahzhk78167q6s4"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/oblivion-theme.html"; - license = lib.licenses.free; - }; - }) {}; - opam-switch-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "opam-switch-mode"; - ename = "opam-switch-mode"; - version = "1.7"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/opam-switch-mode-1.7.tar"; - sha256 = "1gpc1syb51am2gkb3cgfb28rhh6ik41c1gx9gjf1h8m6zxb75433"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/opam-switch-mode.html"; - license = lib.licenses.free; - }; - }) {}; - org-auto-tangle = callPackage ({ async, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "org-auto-tangle"; - ename = "org-auto-tangle"; - version = "0.6.0"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/org-auto-tangle-0.6.0.tar"; - sha256 = "1vh3k283h90v3qilyx1n30k4ny5rkry6x9s6778s0sm6f6hwdggd"; - }; - packageRequires = [ async emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/org-auto-tangle.html"; - license = lib.licenses.free; - }; - }) {}; - org-contrib = callPackage ({ elpaBuild, emacs, fetchurl, lib, org }: - elpaBuild { - pname = "org-contrib"; - ename = "org-contrib"; - version = "0.4.2"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/org-contrib-0.4.2.tar"; - sha256 = "1v1g359dqyq8h4y5rjhllc93dq1vysnfk23lqn3smdvdi3ba9zlr"; - }; - packageRequires = [ emacs org ]; - meta = { - homepage = "https://elpa.gnu.org/packages/org-contrib.html"; - license = lib.licenses.free; - }; - }) {}; - org-drill = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib - , org - , persist - , seq }: - elpaBuild { - pname = "org-drill"; - ename = "org-drill"; - version = "2.7.0"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/org-drill-2.7.0.tar"; - sha256 = "0118vdd0gv2ipgfljkda4388gdly45c5vg0yfn3z4p0p8mjd15lg"; - }; - packageRequires = [ emacs org persist seq ]; - meta = { - homepage = "https://elpa.gnu.org/packages/org-drill.html"; - license = lib.licenses.free; - }; - }) {}; - org-journal = callPackage ({ elpaBuild, emacs, fetchurl, lib, org }: - elpaBuild { - pname = "org-journal"; - ename = "org-journal"; - version = "2.2.0"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/org-journal-2.2.0.tar"; - sha256 = "12mvi8x8rsm93s55z8ns1an00l2p545swc0gzmx38ff57m7jb1mj"; - }; - packageRequires = [ emacs org ]; - meta = { - homepage = "https://elpa.gnu.org/packages/org-journal.html"; - license = lib.licenses.free; - }; - }) {}; - org-mime = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "org-mime"; - ename = "org-mime"; - version = "0.3.2"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/org-mime-0.3.2.tar"; - sha256 = "1r24inqadhlsqc896vlm10bhr76aj6hnm6q5snhzpz4kk9j0gybd"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/org-mime.html"; - license = lib.licenses.free; - }; - }) {}; - org-present = callPackage ({ elpaBuild, fetchurl, lib, org }: - elpaBuild { - pname = "org-present"; - ename = "org-present"; - version = "0.1"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/org-present-0.1.tar"; - sha256 = "18zrvrd9aih57gj14qmxv9rf5j859vkvxcni3fkdbj84y5pq2fpy"; - }; - packageRequires = [ org ]; - meta = { - homepage = "https://elpa.gnu.org/packages/org-present.html"; - license = lib.licenses.free; - }; - }) {}; - org-superstar = callPackage ({ elpaBuild, emacs, fetchurl, lib, org }: - elpaBuild { - pname = "org-superstar"; - ename = "org-superstar"; - version = "1.5.1"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/org-superstar-1.5.1.tar"; - sha256 = "1v6v7a0frgxlywfq6g4mdl6sz448k2ql7j4j4f1wrll33mr7gx8g"; - }; - packageRequires = [ emacs org ]; - meta = { - homepage = "https://elpa.gnu.org/packages/org-superstar.html"; - license = lib.licenses.free; - }; - }) {}; - org-tree-slide = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "org-tree-slide"; - ename = "org-tree-slide"; - version = "2.8.22"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/org-tree-slide-2.8.22.tar"; - sha256 = "1wqc5d2nxs4s6p2ap6sdalxnyigpxini8ck6jikaarmfqcghnx2m"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/org-tree-slide.html"; - license = lib.licenses.free; - }; - }) {}; - orgit = callPackage ({ compat - , elpaBuild - , emacs - , fetchurl - , lib - , magit - , org }: - elpaBuild { - pname = "orgit"; - ename = "orgit"; - version = "1.9.0"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/orgit-1.9.0.tar"; - sha256 = "0g0nr284lgmd6jmk0w412gcildl6fzxv9kskgzr7ksk09qk9qfll"; - }; - packageRequires = [ compat emacs magit org ]; - meta = { - homepage = "https://elpa.gnu.org/packages/orgit.html"; - license = lib.licenses.free; - }; - }) {}; - p4-16-mode = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "p4-16-mode"; - ename = "p4-16-mode"; - version = "0.3"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/p4-16-mode-0.3.tar"; - sha256 = "1kwfqs7ikfjkkpv3m440ak40mjyf493gqygmc4hac8phlf9ns6dv"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/p4-16-mode.html"; - license = lib.licenses.free; - }; - }) {}; - package-lint = callPackage ({ elpaBuild, emacs, fetchurl, let-alist, lib }: - elpaBuild { - pname = "package-lint"; - ename = "package-lint"; - version = "0.23"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/package-lint-0.23.tar"; - sha256 = "116kc7j0g2r8fzyb07b7xb767wzjqnigi504r0rb7cc93b44c4gg"; - }; - packageRequires = [ emacs let-alist ]; - meta = { - homepage = "https://elpa.gnu.org/packages/package-lint.html"; - license = lib.licenses.free; - }; - }) {}; - pacmacs = callPackage ({ dash, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "pacmacs"; - ename = "pacmacs"; - version = "0.1.1"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/pacmacs-0.1.1.tar"; - sha256 = "02ahl0608xmmlkb014gqvv6f45l5lrkm3s4l6m5p5r98rwmlj3q9"; - }; - packageRequires = [ dash emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/pacmacs.html"; - license = lib.licenses.free; - }; - }) {}; - page-break-lines = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "page-break-lines"; - ename = "page-break-lines"; - version = "0.15"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/page-break-lines-0.15.tar"; - sha256 = "018mn6h6nmkkgv1hsk0k8fjyg38wpg2f0cvqlv9p392sapca59ay"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/page-break-lines.html"; - license = lib.licenses.free; - }; - }) {}; - paredit = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "paredit"; - ename = "paredit"; - version = "26"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/paredit-26.tar"; - sha256 = "1sk8nhsysa3y8fvds67cbwwzivzxlyw8d81y7f7pqc5lflidjrpc"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/paredit.html"; - license = lib.licenses.free; - }; - }) {}; - parseclj = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "parseclj"; - ename = "parseclj"; - version = "1.1.1"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/parseclj-1.1.1.tar"; - sha256 = "0kkg5fdjbf2dm8jmirm86sjbqnzyhy72iml4qwwnshxjfhz1f0yi"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/parseclj.html"; - license = lib.licenses.free; - }; - }) {}; - parseedn = callPackage ({ elpaBuild, emacs, fetchurl, lib, map, parseclj }: - elpaBuild { - pname = "parseedn"; - ename = "parseedn"; - version = "1.2.1"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/parseedn-1.2.1.tar"; - sha256 = "0q6wkcjxwqf81pvrcjbga91lr4ml6adbhmc7j71f53awrpc980ak"; - }; - packageRequires = [ emacs map parseclj ]; - meta = { - homepage = "https://elpa.gnu.org/packages/parseedn.html"; - license = lib.licenses.free; - }; - }) {}; - pcmpl-args = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "pcmpl-args"; - ename = "pcmpl-args"; - version = "0.1.3"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/pcmpl-args-0.1.3.tar"; - sha256 = "1lycckmwhp9l0pcrzx6c11iqwaw94h00334pzagkcfay7lz3hcgd"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/pcmpl-args.html"; - license = lib.licenses.free; - }; - }) {}; - pcre2el = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "pcre2el"; - ename = "pcre2el"; - version = "1.12"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/pcre2el-1.12.tar"; - sha256 = "1p0fgqm5342698gadnvziwbvv2kxj953975sp92cx7ddcyv2xr3c"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/pcre2el.html"; - license = lib.licenses.free; - }; - }) {}; - pdf-tools = callPackage ({ elpaBuild - , emacs - , fetchurl - , let-alist - , lib - , tablist }: - elpaBuild { - pname = "pdf-tools"; - ename = "pdf-tools"; - version = "1.1.0"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/pdf-tools-1.1.0.tar"; - sha256 = "0shlpdy07pk9qj5a7d7yivpvgp5bh65psm0g9wkrvyhpkc93aylc"; - }; - packageRequires = [ emacs let-alist tablist ]; - meta = { - homepage = "https://elpa.gnu.org/packages/pdf-tools.html"; - license = lib.licenses.free; - }; - }) {}; - php-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "php-mode"; - ename = "php-mode"; - version = "1.25.1"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/php-mode-1.25.1.tar"; - sha256 = "1cfk7nq5x2p4adcf6q9igsh2jm0sdmsaf5l2sqx4idda28vp3gwc"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/php-mode.html"; - license = lib.licenses.free; - }; - }) {}; - popon = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "popon"; - ename = "popon"; - version = "0.13"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/popon-0.13.tar"; - sha256 = "0z0m7j30pdfw58cxxkmw5pkfpy8y1ax00wm4820rkqxz1f5sbkdb"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/popon.html"; - license = lib.licenses.free; - }; - }) {}; - popup = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "popup"; - ename = "popup"; - version = "0.5.9"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/popup-0.5.9.tar"; - sha256 = "06q31bv6nsdkdgyg6x0zzjnlq007zhqw2ssjmj44izl6h6fkr26m"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/popup.html"; - license = lib.licenses.free; - }; - }) {}; - projectile = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "projectile"; - ename = "projectile"; - version = "2.8.0"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/projectile-2.8.0.tar"; - sha256 = "05llvm3xw3dbjdnfhy2kk6z3pysrsc9f6i7dm4glw5j1k7vig306"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/projectile.html"; - license = lib.licenses.free; - }; - }) {}; - proof-general = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "proof-general"; - ename = "proof-general"; - version = "4.5"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/proof-general-4.5.tar"; - sha256 = "0mlmh7z93f7ypjlh6mxrxgcn47ysvi8qg8869qfxjgmskbfdvx2w"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/proof-general.html"; - license = lib.licenses.free; - }; - }) {}; - prop-menu = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "prop-menu"; - ename = "prop-menu"; - version = "0.1.2"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/prop-menu-0.1.2.tar"; - sha256 = "1cbps617k2nfi5jcv7y1zip4v64mi17r3rhw9w3n4r5hbl4sjwmw"; - }; - packageRequires = [ cl-lib emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/prop-menu.html"; - license = lib.licenses.free; - }; - }) {}; - racket-mode = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "racket-mode"; - ename = "racket-mode"; - version = "1.0.20240514.112412"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/racket-mode-1.0.20240514.112412.tar"; - sha256 = "1ysjq9jvkm8qibj0z6j4q90sx19xyz9z9qzdlci9mw872r21ak9h"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/racket-mode.html"; - license = lib.licenses.free; - }; - }) {}; - rainbow-delimiters = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "rainbow-delimiters"; - ename = "rainbow-delimiters"; - version = "2.1.5"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/rainbow-delimiters-2.1.5.tar"; - sha256 = "0f4zhz92z5qk3p9ips2d76qi64xv6y8jrxh5nvbq46ivj5c0hnw2"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/rainbow-delimiters.html"; - license = lib.licenses.free; - }; - }) {}; - raku-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "raku-mode"; - ename = "raku-mode"; - version = "0.2.1"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/raku-mode-0.2.1.tar"; - sha256 = "00iwkp4hwjdiymzbwm41m27avrn3n63hnwd9amyx0nsa0kdhrfyx"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/raku-mode.html"; - license = lib.licenses.free; - }; - }) {}; - recomplete = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "recomplete"; - ename = "recomplete"; - version = "0.2"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/recomplete-0.2.tar"; - sha256 = "1jhyqgww8wawrxxd2zjb7scpamkbcp98hak9qmbn6ckgzdadks64"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/recomplete.html"; - license = lib.licenses.free; - }; - }) {}; - reformatter = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "reformatter"; - ename = "reformatter"; - version = "0.8"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/reformatter-0.8.tar"; - sha256 = "0bv0fbw3ach6jgnv67xjzxdzaghqa1rhgkmfsmkkbyz8ncbybj87"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/reformatter.html"; - license = lib.licenses.free; - }; - }) {}; - request = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "request"; - ename = "request"; - version = "0.3.3"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/request-0.3.3.tar"; - sha256 = "02j24v8jdjsvi3v3asydb1zfiarzaxrpsshvgf62nhgk6x08845z"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/request.html"; - license = lib.licenses.free; - }; - }) {}; - rfc-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "rfc-mode"; - ename = "rfc-mode"; - version = "1.4.2"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/rfc-mode-1.4.2.tar"; - sha256 = "0lhs8wa4sr387xyibqqskkqgyhhhy48qp5wbjs8r5p68j1s1q86m"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/rfc-mode.html"; - license = lib.licenses.free; - }; - }) {}; - rubocop = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "rubocop"; - ename = "rubocop"; - version = "0.6.0"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/rubocop-0.6.0.tar"; - sha256 = "026cna402hg9lsrf88kmb2as667fgaianj2qd3ik9y89ps4xyzxf"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/rubocop.html"; - license = lib.licenses.free; - }; - }) {}; - rust-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "rust-mode"; - ename = "rust-mode"; - version = "1.0.5"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/rust-mode-1.0.5.tar"; - sha256 = "1cilbf4yw4723bn1vh9ww79875fxh0r1j2c7wxjqfjk5xnx4s6q4"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/rust-mode.html"; - license = lib.licenses.free; - }; - }) {}; - sass-mode = callPackage ({ elpaBuild, fetchurl, haml-mode, lib }: - elpaBuild { - pname = "sass-mode"; - ename = "sass-mode"; - version = "3.0.16"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/sass-mode-3.0.16.tar"; - sha256 = "0ag7qi9dq4j23ywbwni7pblp6l1ik95vjhclxm82s1911a8m7pj2"; - }; - packageRequires = [ haml-mode ]; - meta = { - homepage = "https://elpa.gnu.org/packages/sass-mode.html"; - license = lib.licenses.free; - }; - }) {}; - scad-mode = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "scad-mode"; - ename = "scad-mode"; - version = "93.3"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/scad-mode-93.3.tar"; - sha256 = "1d3mv50n3d0qg1sxvp11a4i15vc75j9gpzlqcxnc0l1lqhn64rwh"; - }; - packageRequires = [ compat emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/scad-mode.html"; - license = lib.licenses.free; - }; - }) {}; - scala-mode = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "scala-mode"; - ename = "scala-mode"; - version = "0.23"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/scala-mode-0.23.tar"; - sha256 = "1zwd9cajw90v25rwdlylhdrc1xwvnf74c2rckz3cs096xsxc1qx2"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/scala-mode.html"; - license = lib.licenses.free; - }; - }) {}; - scroll-on-drag = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "scroll-on-drag"; - ename = "scroll-on-drag"; - version = "0.1"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/scroll-on-drag-0.1.tar"; - sha256 = "0ga8w9px2x9a2ams0lm7ganbixylgpx8g2m3jrwfih0ib3z26kqc"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/scroll-on-drag.html"; - license = lib.licenses.free; - }; - }) {}; - scroll-on-jump = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "scroll-on-jump"; - ename = "scroll-on-jump"; - version = "0.2"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/scroll-on-jump-0.2.tar"; - sha256 = "1gg5lpr21v9bjzjy33j8ziyhh5a1sad509c7rjkdlqda2z3xfrhr"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/scroll-on-jump.html"; - license = lib.licenses.free; - }; - }) {}; - sesman = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "sesman"; - ename = "sesman"; - version = "0.3.2"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/sesman-0.3.2.tar"; - sha256 = "1mrv32cp87dhzpcv55v4zv4nq37lrsprsdhhjb2q0msqab3b0r31"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/sesman.html"; - license = lib.licenses.free; - }; - }) {}; - shellcop = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "shellcop"; - ename = "shellcop"; - version = "0.1.0"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/shellcop-0.1.0.tar"; - sha256 = "1gj178fm0jj8dbfy0crwcjidih4r6g9dl9lprzpxzgswvma32g0w"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/shellcop.html"; - license = lib.licenses.free; - }; - }) {}; - slime = callPackage ({ elpaBuild, emacs, fetchurl, lib, macrostep }: - elpaBuild { - pname = "slime"; - ename = "slime"; - version = "2.30"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/slime-2.30.tar"; - sha256 = "0gzgwrx6llj35kga21m3m4vp0g7f7dypim7pdnhy9sxrvl0k8v5f"; - }; - packageRequires = [ emacs macrostep ]; - meta = { - homepage = "https://elpa.gnu.org/packages/slime.html"; - license = lib.licenses.free; - }; - }) {}; - sly = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "sly"; - ename = "sly"; - version = "1.0.43"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/sly-1.0.43.tar"; - sha256 = "1c7kzbpcrij4z09bxfa1rq5w23jw9h8v4s6fa6ihr13x67gsif84"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/sly.html"; - license = lib.licenses.free; - }; - }) {}; - smartparens = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "smartparens"; - ename = "smartparens"; - version = "1.11.0"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/smartparens-1.11.0.tar"; - sha256 = "0kvlyx2bhw4q6k79wf5cm4srlmfncsbii4spdgafwmv8j7vw6ya3"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/smartparens.html"; - license = lib.licenses.free; - }; - }) {}; - solarized-theme = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "solarized-theme"; - ename = "solarized-theme"; - version = "2.0.1"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/solarized-theme-2.0.1.tar"; - sha256 = "1lk1g8v2chjrbbxplw3pd7yn3syjgywxkbdc7dbd76x168qz54qx"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/solarized-theme.html"; - license = lib.licenses.free; - }; - }) {}; - spacemacs-theme = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "spacemacs-theme"; - ename = "spacemacs-theme"; - version = "0.2"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/spacemacs-theme-0.2.tar"; - sha256 = "07lkaj6gm5iz503p5l6sm1y62mc5wk13nrwzv81f899jw99jcgml"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/spacemacs-theme.html"; - license = lib.licenses.free; - }; - }) {}; - spell-fu = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "spell-fu"; - ename = "spell-fu"; - version = "0.3"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/spell-fu-0.3.tar"; - sha256 = "11a5361xjap02s0mm2sylhxqqrv64v72d70cg1vzch7iwfi18l9c"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/spell-fu.html"; - license = lib.licenses.free; - }; - }) {}; - sqlite3 = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "sqlite3"; - ename = "sqlite3"; - version = "0.17"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/sqlite3-0.17.tar"; - sha256 = "17fx2bnzajqjzd9jgwvn6pjwshgirign975rrsc1m47cwniz0bnq"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/sqlite3.html"; - license = lib.licenses.free; - }; - }) {}; - stylus-mode = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "stylus-mode"; - ename = "stylus-mode"; - version = "1.0.1"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/stylus-mode-1.0.1.tar"; - sha256 = "0vihp241msg8f0ph8w3w9fkad9b12pmpwg0q5la8nbw7gfy41mz5"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/stylus-mode.html"; - license = lib.licenses.free; - }; - }) {}; - subatomic-theme = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "subatomic-theme"; - ename = "subatomic-theme"; - version = "1.8.2"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/subatomic-theme-1.8.2.tar"; - sha256 = "0vpaswm5mdyb8cir160mb8ffgzaz7kbq3gvc2zrnh531zb994mqg"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/subatomic-theme.html"; - license = lib.licenses.free; - }; - }) {}; - subed = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "subed"; - ename = "subed"; - version = "1.2.11"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/subed-1.2.11.tar"; - sha256 = "0grzlxibv57qds3dml6yjpw9hag86hbkrb1f66k7qn5hxaadmvpw"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/subed.html"; - license = lib.licenses.free; - }; - }) {}; - sweeprolog = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "sweeprolog"; - ename = "sweeprolog"; - version = "0.27.5"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/sweeprolog-0.27.5.tar"; - sha256 = "0mw8fddzcbn9h5l55v12n4nmickqdxc3y7y0xfzm6m42cvqkzdzf"; - }; - packageRequires = [ compat emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/sweeprolog.html"; - license = lib.licenses.free; - }; - }) {}; - swift-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib, seq }: - elpaBuild { - pname = "swift-mode"; - ename = "swift-mode"; - version = "9.1.0"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/swift-mode-9.1.0.tar"; - sha256 = "1h7fbrgp2jsn0nk6c84vzvipm86macxf2975l0av8gxv0kpzcaiv"; - }; - packageRequires = [ emacs seq ]; - meta = { - homepage = "https://elpa.gnu.org/packages/swift-mode.html"; - license = lib.licenses.free; - }; - }) {}; - swsw = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "swsw"; - ename = "swsw"; - version = "2.3"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/swsw-2.3.tar"; - sha256 = "0qwdv174bh9k1bpd5szzmhk7hw89xf7rz2i2hzdrmlpvcs3ps653"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/swsw.html"; - license = lib.licenses.free; - }; - }) {}; - symbol-overlay = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "symbol-overlay"; - ename = "symbol-overlay"; - version = "4.1"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/symbol-overlay-4.1.tar"; - sha256 = "0l877zm8fbf6qqcg7zx26w32x885axcj01l4y1m98jzryjhszfgn"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/symbol-overlay.html"; - license = lib.licenses.free; - }; - }) {}; - systemd = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "systemd"; - ename = "systemd"; - version = "1.6.1"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/systemd-1.6.1.tar"; - sha256 = "0b0l70271kalicaix4p1ipr5vrj401cj8zvsi3243q1hp04k1m2g"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/systemd.html"; - license = lib.licenses.free; - }; - }) {}; - tablist = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "tablist"; - ename = "tablist"; - version = "1.0"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/tablist-1.0.tar"; - sha256 = "0z05va5fq054xysvhnpblxk5x0v6k4ian0hby6vryfxg9828gy57"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/tablist.html"; - license = lib.licenses.free; - }; - }) {}; - tangotango-theme = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "tangotango-theme"; - ename = "tangotango-theme"; - version = "0.0.7"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/tangotango-theme-0.0.7.tar"; - sha256 = "1w287p8lpmkm80qy1di2xmd71k051qmg89cn7s21kgi4br3hbbph"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/tangotango-theme.html"; - license = lib.licenses.free; - }; - }) {}; - telephone-line = callPackage ({ cl-generic - , cl-lib ? null - , elpaBuild - , emacs - , fetchurl - , lib - , seq }: - elpaBuild { - pname = "telephone-line"; - ename = "telephone-line"; - version = "0.5"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/telephone-line-0.5.tar"; - sha256 = "0pmn1r2g639c8g3rw5q2d5cgdz79d4ipr3r4dzwx2mgff3ri1ylm"; - }; - packageRequires = [ cl-generic cl-lib emacs seq ]; - meta = { - homepage = "https://elpa.gnu.org/packages/telephone-line.html"; - license = lib.licenses.free; - }; - }) {}; - testcover-mark-line = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "testcover-mark-line"; - ename = "testcover-mark-line"; - version = "0.3"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/testcover-mark-line-0.3.tar"; - sha256 = "1p1dmxqdyk82qbcmggmzn15nz4jm98j5bjivy56vimgncqfbaf4h"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/testcover-mark-line.html"; - license = lib.licenses.free; - }; - }) {}; - textile-mode = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "textile-mode"; - ename = "textile-mode"; - version = "1.0.0"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/textile-mode-1.0.0.tar"; - sha256 = "02nc3wijsb626631m09f2ygpmimkbl46x5hi8yk0wl18y66yq972"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/textile-mode.html"; - license = lib.licenses.free; - }; - }) {}; - toc-org = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "toc-org"; - ename = "toc-org"; - version = "1.1"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/toc-org-1.1.tar"; - sha256 = "0qhkn1a4j1q5gflqlyha2534sms8xsx03i7dizrckhl368yznwan"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/toc-org.html"; - license = lib.licenses.free; - }; - }) {}; - totp-auth = callPackage ({ base32, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "totp-auth"; - ename = "totp-auth"; - version = "1.0"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/totp-auth-1.0.tar"; - sha256 = "0hzj0p1r18q8vkhkbxbfakvmgld9y8n5hzza5zir0cpalv5590r5"; - }; - packageRequires = [ base32 emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/totp-auth.html"; - license = lib.licenses.free; - }; - }) {}; - treeview = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "treeview"; - ename = "treeview"; - version = "1.2.0"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/treeview-1.2.0.tar"; - sha256 = "1dmix7hn5yl69r987f0g2m00p866ln8412dm7fj399pmn1kdfsvy"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/treeview.html"; - license = lib.licenses.free; - }; - }) {}; - tuareg = callPackage ({ caml, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "tuareg"; - ename = "tuareg"; - version = "3.0.1"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/tuareg-3.0.1.tar"; - sha256 = "04lb71cafg4bqicx3q3rb9jpxbq6hmdrzw88f52sjqxq5c4cqdkj"; - }; - packageRequires = [ caml emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/tuareg.html"; - license = lib.licenses.free; - }; - }) {}; - typescript-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "typescript-mode"; - ename = "typescript-mode"; - version = "0.4"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/typescript-mode-0.4.tar"; - sha256 = "1fs369h8ysrx1d8qzvz75izmlx4gzl619g7yjp9ck2wjv50wx95q"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/typescript-mode.html"; - license = lib.licenses.free; - }; - }) {}; - ujelly-theme = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "ujelly-theme"; - ename = "ujelly-theme"; - version = "1.2.9"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/ujelly-theme-1.2.9.tar"; - sha256 = "1yyjsdcwprynwk86phpqfifv6xkmn49yrj6fkh5s57w5sbby4fp0"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/ujelly-theme.html"; - license = lib.licenses.free; - }; - }) {}; - undo-fu = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "undo-fu"; - ename = "undo-fu"; - version = "0.5"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/undo-fu-0.5.tar"; - sha256 = "00pgvmks1nvdimsac534qny5vpq8sgcfgybiz3ck3mgfklj4kshj"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/undo-fu.html"; - license = lib.licenses.free; - }; - }) {}; - undo-fu-session = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "undo-fu-session"; - ename = "undo-fu-session"; - version = "0.6"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/undo-fu-session-0.6.tar"; - sha256 = "057izvr86har50z1sfk4s6r88w2ga57afwm2w9p5v14lq31vj7cp"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/undo-fu-session.html"; - license = lib.licenses.free; - }; - }) {}; - vc-fossil = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "vc-fossil"; - ename = "vc-fossil"; - version = "20230504"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/vc-fossil-20230504.tar"; - sha256 = "1q78xcfzpvvrlr9b9yh57asrlks2n0nhxhxl8dyfwad6gm0yr948"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/vc-fossil.html"; - license = lib.licenses.free; - }; - }) {}; - vcomplete = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "vcomplete"; - ename = "vcomplete"; - version = "2.0"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/vcomplete-2.0.tar"; - sha256 = "03f60ncrf994pc4q15m0p2admmy4gpg5c51nbr3xycqp16pq8dz1"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/vcomplete.html"; - license = lib.licenses.free; - }; - }) {}; - visual-fill-column = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "visual-fill-column"; - ename = "visual-fill-column"; - version = "2.6.3"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/visual-fill-column-2.6.3.tar"; - sha256 = "0agxixxlv3lnsng8jk7y6x1kzzvx3sw5m3mhl8gr4i1didgxc37n"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/visual-fill-column.html"; - license = lib.licenses.free; - }; - }) {}; - web-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "web-mode"; - ename = "web-mode"; - version = "17.3.19"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/web-mode-17.3.19.tar"; - sha256 = "0gmi0p118kd2xvlbp6y5mz2f0sgdm8qwna76lrmbnsxw4c9g5c6p"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/web-mode.html"; - license = lib.licenses.free; - }; - }) {}; - webpaste = callPackage ({ cl-lib ? null - , elpaBuild - , emacs - , fetchurl - , lib - , request }: - elpaBuild { - pname = "webpaste"; - ename = "webpaste"; - version = "3.2.2"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/webpaste-3.2.2.tar"; - sha256 = "04156iwgbc49l3b6s5vzbffw1xrkansvczi6q29d5waxwi6a2nfc"; - }; - packageRequires = [ cl-lib emacs request ]; - meta = { - homepage = "https://elpa.gnu.org/packages/webpaste.html"; - license = lib.licenses.free; - }; - }) {}; - wfnames = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "wfnames"; - ename = "wfnames"; - version = "1.2"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/wfnames-1.2.tar"; - sha256 = "1yy034fx86wn6yv4671fybc4zn5g619zcnnfvryq6zpwibj6fikz"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/wfnames.html"; - license = lib.licenses.free; - }; - }) {}; - wgrep = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "wgrep"; - ename = "wgrep"; - version = "3.0.0"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/wgrep-3.0.0.tar"; - sha256 = "18j94y6xrjdmy5sk83mh5zaz4vqpi97pcjila387c0d84j1v2wzz"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/wgrep.html"; - license = lib.licenses.free; - }; - }) {}; - why-this = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "why-this"; - ename = "why-this"; - version = "2.0.4"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/why-this-2.0.4.tar"; - sha256 = "1swidi6z6rhhy2zvas84vmkj41zaqpdxfssg6x6lvzzq34cgq0ph"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/why-this.html"; - license = lib.licenses.free; - }; - }) {}; - with-editor = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "with-editor"; - ename = "with-editor"; - version = "3.3.2"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/with-editor-3.3.2.tar"; - sha256 = "1yjx1w54qdjpmq5f7l3y19d4bayyk01rgd82c56swsaxsf4j5fpv"; - }; - packageRequires = [ compat emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/with-editor.html"; - license = lib.licenses.free; - }; - }) {}; - with-simulated-input = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "with-simulated-input"; - ename = "with-simulated-input"; - version = "3.0"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/with-simulated-input-3.0.tar"; - sha256 = "0a2kqrv3q399n1y21v7m4c9ivm56j28kasb466rq704jccvzblfr"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/with-simulated-input.html"; - license = lib.licenses.free; - }; - }) {}; - workroom = callPackage ({ compat - , elpaBuild - , emacs - , fetchurl - , lib - , project }: - elpaBuild { - pname = "workroom"; - ename = "workroom"; - version = "2.3.1"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/workroom-2.3.1.tar"; - sha256 = "0k0npmcs3cdkfds0r8p0gm8xa42bzdjiciilh65jka15fqknx486"; - }; - packageRequires = [ compat emacs project ]; - meta = { - homepage = "https://elpa.gnu.org/packages/workroom.html"; - license = lib.licenses.free; - }; - }) {}; - writegood-mode = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "writegood-mode"; - ename = "writegood-mode"; - version = "2.2.0"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/writegood-mode-2.2.0.tar"; - sha256 = "00phrzbd03gzc5y2ybizyp9smd6ybmmx2j7jf6hg5cmfyjmq8ahw"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/writegood-mode.html"; - license = lib.licenses.free; - }; - }) {}; - ws-butler = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "ws-butler"; - ename = "ws-butler"; - version = "0.6"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/ws-butler-0.6.tar"; - sha256 = "1jzlwj2pqan3bj0mipvh8vzvmgynrxf1dqphix7g86ppjv1ivmfy"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/ws-butler.html"; - license = lib.licenses.free; - }; - }) {}; - xah-fly-keys = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: - elpaBuild { - pname = "xah-fly-keys"; - ename = "xah-fly-keys"; - version = "25.6.20240521220424"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-25.6.20240521220424.tar"; - sha256 = "029hy3qmf6nvibbq9w2b964gzbw99lja595h4g1y5zzyrgzqrhrn"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/xah-fly-keys.html"; - license = lib.licenses.free; - }; - }) {}; - xkcd = callPackage ({ elpaBuild, fetchurl, json ? null, lib }: - elpaBuild { - pname = "xkcd"; - ename = "xkcd"; - version = "1.1"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/xkcd-1.1.tar"; - sha256 = "1qs4jv6h2i8g7s214xr4s6jgykdbac4lfc5hd0gmylkwlvs3pzcp"; - }; - packageRequires = [ json ]; - meta = { - homepage = "https://elpa.gnu.org/packages/xkcd.html"; - license = lib.licenses.free; - }; - }) {}; - xml-rpc = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "xml-rpc"; - ename = "xml-rpc"; - version = "1.6.17"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/xml-rpc-1.6.17.tar"; - sha256 = "1r8j87xddv80dx6lxzr2kq6czwk2l22bfxmplnma9fc2bsf1k2wy"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/xml-rpc.html"; - license = lib.licenses.free; - }; - }) {}; - yaml-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "yaml-mode"; - ename = "yaml-mode"; - version = "0.0.16"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/yaml-mode-0.0.16.tar"; - sha256 = "0bhflv50z379p6ysdq89bdszkxp8zdmlb8plj1bm2nqsgc39hdm7"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/yaml-mode.html"; - license = lib.licenses.free; - }; - }) {}; - yasnippet-snippets = callPackage ({ elpaBuild, fetchurl, lib, yasnippet }: - elpaBuild { - pname = "yasnippet-snippets"; - ename = "yasnippet-snippets"; - version = "1.0"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/yasnippet-snippets-1.0.tar"; - sha256 = "0si61d0niabh18vbgdz6w5zirpxpp7c4mrcn5x1n3r5vnhv3n7m2"; - }; - packageRequires = [ yasnippet ]; - meta = { - homepage = "https://elpa.gnu.org/packages/yasnippet-snippets.html"; - license = lib.licenses.free; - }; - }) {}; - zenburn-theme = callPackage ({ elpaBuild, fetchurl, lib }: - elpaBuild { - pname = "zenburn-theme"; - ename = "zenburn-theme"; - version = "2.8.0"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/zenburn-theme-2.8.0.tar"; - sha256 = "0z733svsjsads655jgmc0b33icmygwaahxa27qi32s1pq84zqb4z"; - }; - packageRequires = []; - meta = { - homepage = "https://elpa.gnu.org/packages/zenburn-theme.html"; - license = lib.licenses.free; - }; - }) {}; - zig-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib, reformatter }: - elpaBuild { - pname = "zig-mode"; - ename = "zig-mode"; - version = "0.0.8"; - src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/zig-mode-0.0.8.tar"; - sha256 = "1085lxm6k7b91c0q8jmmir59hzaqi8jgspbs89bvia2vq5x9xd87"; - }; - packageRequires = [ emacs reformatter ]; - meta = { - homepage = "https://elpa.gnu.org/packages/zig-mode.html"; - license = lib.licenses.free; - }; - }) {}; - } +{ + adoc-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "adoc-mode"; + ename = "adoc-mode"; + version = "0.7.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/adoc-mode-0.7.0.tar"; + sha256 = "1gdjgybpbw3qj9mfmq9ljx4xaam1f6rwyrav2y2f5fpv6z7w0i61"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/adoc-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + afternoon-theme = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "afternoon-theme"; + ename = "afternoon-theme"; + version = "0.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/afternoon-theme-0.1.tar"; + sha256 = "0xxvr3njpbdlm8iyyklwijjaysyknwpw51hq2443wq37bsxciils"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/afternoon-theme.html"; + license = lib.licenses.free; + }; + } + ) { }; + alect-themes = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "alect-themes"; + ename = "alect-themes"; + version = "0.10"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/alect-themes-0.10.tar"; + sha256 = "0pagkf0bb85sr3mvg8z6h6akb9hjmvfqmpiaiz121ys0r92m6nb7"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/alect-themes.html"; + license = lib.licenses.free; + }; + } + ) { }; + ample-theme = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "ample-theme"; + ename = "ample-theme"; + version = "0.3.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/ample-theme-0.3.0.tar"; + sha256 = "12z8z6da1xfc642w2wc82sjlfj3ymlz3jwrg3ydc2fapis2d3ibi"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/ample-theme.html"; + license = lib.licenses.free; + }; + } + ) { }; + annotate = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "annotate"; + ename = "annotate"; + version = "2.2.2"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/annotate-2.2.2.tar"; + sha256 = "0hrb7kjzhgy46hxaa77rv5ilsdsv6zxpawnkx4viw5jq0v5s4fl6"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/annotate.html"; + license = lib.licenses.free; + }; + } + ) { }; + anti-zenburn-theme = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "anti-zenburn-theme"; + ename = "anti-zenburn-theme"; + version = "2.5.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/anti-zenburn-theme-2.5.1.tar"; + sha256 = "121038d6mjdfis1c5v9277bd6kz656n0c25daxq85mfswvjlar0i"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/anti-zenburn-theme.html"; + license = lib.licenses.free; + }; + } + ) { }; + anzu = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "anzu"; + ename = "anzu"; + version = "0.64"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/anzu-0.64.tar"; + sha256 = "0mv4xiy3481d5r4rypmw7nn1hjmsvlfz5dhgmpn6cqbpzkgb6zjb"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/anzu.html"; + license = lib.licenses.free; + }; + } + ) { }; + apache-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "apache-mode"; + ename = "apache-mode"; + version = "2.2.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/apache-mode-2.2.0.tar"; + sha256 = "10fgbgww7j60dik7b7mvnm1zwgv9y8p5wzggkrdk50dv3gjfxg8f"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/apache-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + apropospriate-theme = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "apropospriate-theme"; + ename = "apropospriate-theme"; + version = "0.2.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/apropospriate-theme-0.2.0.tar"; + sha256 = "1hsv26iqr0g6c3gy1df2qkd3ilwq6xaa89ch7pqh64737qrlw9db"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/apropospriate-theme.html"; + license = lib.licenses.free; + }; + } + ) { }; + arduino-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + spinner, + }: + elpaBuild { + pname = "arduino-mode"; + ename = "arduino-mode"; + version = "1.3.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/arduino-mode-1.3.1.tar"; + sha256 = "1k42qx7kgm8svv70czzlkmm3c7cddf93bqvf6267hbkaihhyd21y"; + }; + packageRequires = [ spinner ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/arduino-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + auto-dim-other-buffers = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "auto-dim-other-buffers"; + ename = "auto-dim-other-buffers"; + version = "2.1.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/auto-dim-other-buffers-2.1.1.tar"; + sha256 = "0rgf0q66kdw9ind5bi01ydk84rclcd3kmlfzm9rfb429xnhqfzw8"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/auto-dim-other-buffers.html"; + license = lib.licenses.free; + }; + } + ) { }; + autothemer = callPackage ( + { + dash, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "autothemer"; + ename = "autothemer"; + version = "0.2.18"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/autothemer-0.2.18.tar"; + sha256 = "1v6si9fh3rbka72r5jfd35bbvfbfaxr2kfi7jmsgj07fhx4bgl2d"; + }; + packageRequires = [ dash ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/autothemer.html"; + license = lib.licenses.free; + }; + } + ) { }; + base32 = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "base32"; + ename = "base32"; + version = "1.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/base32-1.0.tar"; + sha256 = "1k1n0zlks9dammpmr0875xh5vw5prmc7rr5kwd262xidscj19k6w"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/base32.html"; + license = lib.licenses.free; + }; + } + ) { }; + bash-completion = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "bash-completion"; + ename = "bash-completion"; + version = "3.1.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/bash-completion-3.1.1.tar"; + sha256 = "1yc1a5cvmnp8dranrglpd7qjg35r6x4ndniinbmzinqr7dmydh62"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/bash-completion.html"; + license = lib.licenses.free; + }; + } + ) { }; + beancount = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "beancount"; + ename = "beancount"; + version = "0.9"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/beancount-0.9.tar"; + sha256 = "1s0w17mq8kilkrd33pan78px6mz5z96d7gvdmy2shg3hvj1jbq09"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/beancount.html"; + license = lib.licenses.free; + }; + } + ) { }; + better-jumper = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "better-jumper"; + ename = "better-jumper"; + version = "1.0.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/better-jumper-1.0.1.tar"; + sha256 = "1jdmbp1jjip8vmmc66z2wgx95lzp1b92m66p160mdm4g3skl64c2"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/better-jumper.html"; + license = lib.licenses.free; + }; + } + ) { }; + bind-map = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "bind-map"; + ename = "bind-map"; + version = "1.1.2"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/bind-map-1.1.2.tar"; + sha256 = "037xk912hx00ia62h6kdfa56g44dhd0628va22znxg251izvnqxq"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/bind-map.html"; + license = lib.licenses.free; + }; + } + ) { }; + bison-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "bison-mode"; + ename = "bison-mode"; + version = "0.4"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/bison-mode-0.4.tar"; + sha256 = "0k0h96bpcndi3m9fdk74j0ynm50n6by508mv3ds9ala26dpdr7qa"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/bison-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + blow = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "blow"; + ename = "blow"; + version = "1.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/blow-1.0.tar"; + sha256 = "009x0y86692ccj2v0cizr40ly6xdp72bnwj5pjayg3y0ph4iz0cj"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/blow.html"; + license = lib.licenses.free; + }; + } + ) { }; + blueprint-ts-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "blueprint-ts-mode"; + ename = "blueprint-ts-mode"; + version = "0.0.3"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/blueprint-ts-mode-0.0.3.tar"; + sha256 = "0v1sk80dka2gdkwcbria12ih3jrna3866ngdswcskyqcnkxm7b7n"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/blueprint-ts-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + boxquote = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "boxquote"; + ename = "boxquote"; + version = "2.3"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/boxquote-2.3.tar"; + sha256 = "0fsvfy5b4k0h6fxmvvdngxap5pfypm8iik0m1jq70za7n7g8qvmy"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/boxquote.html"; + license = lib.licenses.free; + }; + } + ) { }; + buttercup = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "buttercup"; + ename = "buttercup"; + version = "1.35"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/buttercup-1.35.tar"; + sha256 = "0b9dxbn7pni2203xdg289ymkmhf458898i2lh7aplppmh68bms2c"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/buttercup.html"; + license = lib.licenses.free; + }; + } + ) { }; + camera = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "camera"; + ename = "camera"; + version = "0.3"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/camera-0.3.tar"; + sha256 = "0r9b20li82qcc141p4blyaj0xng5f4xrghhl09wc15ffi0cmbq7d"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/camera.html"; + license = lib.licenses.free; + }; + } + ) { }; + caml = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "caml"; + ename = "caml"; + version = "4.9"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/caml-4.9.tar"; + sha256 = "1xzk83bds4d23rk170n975mijlmin5dh7crfc5swwvzh8w88qxmk"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/caml.html"; + license = lib.licenses.free; + }; + } + ) { }; + cdlatex = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "cdlatex"; + ename = "cdlatex"; + version = "4.18.4"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/cdlatex-4.18.4.tar"; + sha256 = "174i72z3pyxsbagqk7g8d84282fh3y3ipv0bcghrgqjznxdjx427"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/cdlatex.html"; + license = lib.licenses.free; + }; + } + ) { }; + cider = callPackage ( + { + clojure-mode, + elpaBuild, + fetchurl, + lib, + parseedn, + queue, + seq, + sesman, + spinner, + transient, + }: + elpaBuild { + pname = "cider"; + ename = "cider"; + version = "1.15.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/cider-1.15.1.tar"; + sha256 = "0qfh98hrlxpr71jqgsghmv687sp90iaffcgb7q5candcq8dscfb6"; + }; + packageRequires = [ + clojure-mode + parseedn + queue + seq + sesman + spinner + transient + ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/cider.html"; + license = lib.licenses.free; + }; + } + ) { }; + clojure-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "clojure-mode"; + ename = "clojure-mode"; + version = "5.19.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/clojure-mode-5.19.0.tar"; + sha256 = "10dpdi4yc7bbga2mllk46jfy58ppj8vlhs37zd9vlk9rnfc54r99"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/clojure-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + clojure-ts-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "clojure-ts-mode"; + ename = "clojure-ts-mode"; + version = "0.2.2"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/clojure-ts-mode-0.2.2.tar"; + sha256 = "14s3gawx2lazzd5ziz2plhl6k1qik8gfjka7fijgxb55ls9bvgrp"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/clojure-ts-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + coffee-mode = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "coffee-mode"; + ename = "coffee-mode"; + version = "0.6.3"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/coffee-mode-0.6.3.tar"; + sha256 = "1anywqp2b99dmilfnajxgf4msc0viw6ndl0lxpgaa7d2b3mzx9nq"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/coffee-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + color-theme-tangotango = callPackage ( + { + color-theme, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "color-theme-tangotango"; + ename = "color-theme-tangotango"; + version = "0.0.6"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/color-theme-tangotango-0.0.6.tar"; + sha256 = "0lfr3xg9xvfjb12kcw80d35a1ayn4f5w1dkd2b0kx0wxkq0bykim"; + }; + packageRequires = [ color-theme ]; + meta = { + homepage = "https://elpa.gnu.org/packages/color-theme-tangotango.html"; + license = lib.licenses.free; + }; + } + ) { }; + consult-flycheck = callPackage ( + { + consult, + elpaBuild, + fetchurl, + flycheck, + lib, + }: + elpaBuild { + pname = "consult-flycheck"; + ename = "consult-flycheck"; + version = "1.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/consult-flycheck-1.0.tar"; + sha256 = "17kc7v50zq69l4803nh8sjnqwi59p09wjzqkwka6g4dapya3h2xy"; + }; + packageRequires = [ + consult + flycheck + ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/consult-flycheck.html"; + license = lib.licenses.free; + }; + } + ) { }; + corfu-terminal = callPackage ( + { + corfu, + elpaBuild, + fetchurl, + lib, + popon, + }: + elpaBuild { + pname = "corfu-terminal"; + ename = "corfu-terminal"; + version = "0.7"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/corfu-terminal-0.7.tar"; + sha256 = "0a41hfma4iiinq2cgvwqqwxhrwjn5c7igl5sgvgx0mbjki2n6sll"; + }; + packageRequires = [ + corfu + popon + ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/corfu-terminal.html"; + license = lib.licenses.free; + }; + } + ) { }; + crux = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "crux"; + ename = "crux"; + version = "0.5.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/crux-0.5.0.tar"; + sha256 = "0cykjwwhl6r02fsyam4vnmlxiyq8b8qsgncb1hjnz4gj7mxc9gg4"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/crux.html"; + license = lib.licenses.free; + }; + } + ) { }; + csv2ledger = callPackage ( + { + csv-mode, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "csv2ledger"; + ename = "csv2ledger"; + version = "1.5.4"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/csv2ledger-1.5.4.tar"; + sha256 = "1h935g97fjrs1q0yz0q071zp91bhsb3yg13zqpp8il5gif20qqls"; + }; + packageRequires = [ csv-mode ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/csv2ledger.html"; + license = lib.licenses.free; + }; + } + ) { }; + cyberpunk-theme = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "cyberpunk-theme"; + ename = "cyberpunk-theme"; + version = "1.22"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/cyberpunk-theme-1.22.tar"; + sha256 = "1kgkgpb07d4kh2rf88pfgyji42qv80443i67nzha2fx01zbd5swb"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/cyberpunk-theme.html"; + license = lib.licenses.free; + }; + } + ) { }; + cycle-at-point = callPackage ( + { + elpaBuild, + fetchurl, + lib, + recomplete, + }: + elpaBuild { + pname = "cycle-at-point"; + ename = "cycle-at-point"; + version = "0.2"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/cycle-at-point-0.2.tar"; + sha256 = "1q3gylksr754s0pl8x1hdk0q4p0vz6lnasswgsqpx44nmnbsrw6z"; + }; + packageRequires = [ recomplete ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/cycle-at-point.html"; + license = lib.licenses.free; + }; + } + ) { }; + d-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "d-mode"; + ename = "d-mode"; + version = "202408131340"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/d-mode-202408131340.tar"; + sha256 = "19dgc0yd2fmc9xbrajc1l98p7p2wiwg43ajq4gssxdshb5vi5mn9"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/d-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + dart-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "dart-mode"; + ename = "dart-mode"; + version = "1.0.7"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/dart-mode-1.0.7.tar"; + sha256 = "1k9pn7nqskz39m3zwi9jhd1a2q440jgrla1a37qip73mwrdril1i"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/dart-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + denote-refs = callPackage ( + { + denote, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "denote-refs"; + ename = "denote-refs"; + version = "0.1.2"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/denote-refs-0.1.2.tar"; + sha256 = "0jq14adxpx9bxddkj3a4bahyr3yarjn85iplhhy9yk7k9wy7wis0"; + }; + packageRequires = [ denote ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/denote-refs.html"; + license = lib.licenses.free; + }; + } + ) { }; + devhelp = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "devhelp"; + ename = "devhelp"; + version = "1.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/devhelp-1.0.tar"; + sha256 = "14x1990yr3qqzv9dqn7xg69hqgpmgjsi68f2fg07v670lk7hs8xb"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/devhelp.html"; + license = lib.licenses.free; + }; + } + ) { }; + devil = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "devil"; + ename = "devil"; + version = "0.6.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/devil-0.6.0.tar"; + sha256 = "01n552pvr598igmd2q6w9kgjrwgzrgrb4w59mxpsylcv6wy2v2h5"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/devil.html"; + license = lib.licenses.free; + }; + } + ) { }; + diff-ansi = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "diff-ansi"; + ename = "diff-ansi"; + version = "0.2"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/diff-ansi-0.2.tar"; + sha256 = "0i1216mw0zgy3jdhhxsn5wpjqgxv5als1lljb1ddqjl21y6z74nw"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/diff-ansi.html"; + license = lib.licenses.free; + }; + } + ) { }; + doc-show-inline = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "doc-show-inline"; + ename = "doc-show-inline"; + version = "0.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/doc-show-inline-0.1.tar"; + sha256 = "13y7k4zp8x8fcyidw0jy6zf92af660zwb7qpps91l2dh7zwjsl2v"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/doc-show-inline.html"; + license = lib.licenses.free; + }; + } + ) { }; + dockerfile-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "dockerfile-mode"; + ename = "dockerfile-mode"; + version = "1.7"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/dockerfile-mode-1.7.tar"; + sha256 = "1rpgjhbb2vzz6fqcqksvx27a1mj8p3bgmjh00433qd8g7hghc9v7"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/dockerfile-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + dracula-theme = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "dracula-theme"; + ename = "dracula-theme"; + version = "1.8.2"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/dracula-theme-1.8.2.tar"; + sha256 = "04r7cn4n8n4fiwblmfsa23d1qh11mqfz0cghq6ss72flp5awj46g"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/dracula-theme.html"; + license = lib.licenses.free; + }; + } + ) { }; + drupal-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + php-mode, + }: + elpaBuild { + pname = "drupal-mode"; + ename = "drupal-mode"; + version = "0.8.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/drupal-mode-0.8.1.tar"; + sha256 = "0f3dd2647g964grzq95d73iznhpmrr9w7fmkifjk3ivz0rgdgjsq"; + }; + packageRequires = [ php-mode ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/drupal-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + dslide = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "dslide"; + ename = "dslide"; + version = "0.5.3"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/dslide-0.5.3.tar"; + sha256 = "11q807jp90y37s1njmr6qlnqi9pk371gj8mwg57kgjvc55qdyas5"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/dslide.html"; + license = lib.licenses.free; + }; + } + ) { }; + eat = callPackage ( + { + compat, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "eat"; + ename = "eat"; + version = "0.9.4"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/eat-0.9.4.tar"; + sha256 = "0jn5rzyg1abjsb18brr1ha4vmhvxpkp8pxvaxfa0g0phcb2iz5ql"; + }; + packageRequires = [ compat ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/eat.html"; + license = lib.licenses.free; + }; + } + ) { }; + edit-indirect = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "edit-indirect"; + ename = "edit-indirect"; + version = "0.1.13"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/edit-indirect-0.1.13.tar"; + sha256 = "10zshywbp0f00k2d4f5bc44ynvw3f0626vl35lbah1kwmgzrrjdd"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/edit-indirect.html"; + license = lib.licenses.free; + }; + } + ) { }; + editorconfig = callPackage ( + { + elpaBuild, + fetchurl, + lib, + nadvice, + }: + elpaBuild { + pname = "editorconfig"; + ename = "editorconfig"; + version = "0.11.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/editorconfig-0.11.0.tar"; + sha256 = "0adzm6fhx5vgg20qy9f7cqpnx938mp1ls91y5cw71pjm9ihs2cyv"; + }; + packageRequires = [ nadvice ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/editorconfig.html"; + license = lib.licenses.free; + }; + } + ) { }; + elixir-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "elixir-mode"; + ename = "elixir-mode"; + version = "2.5.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/elixir-mode-2.5.0.tar"; + sha256 = "1x6aral441mv9443h21lnaymbpazwii22wcqvk2jfqjmyl1xj1yz"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/elixir-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + elpher = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "elpher"; + ename = "elpher"; + version = "3.6.2"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/elpher-3.6.2.tar"; + sha256 = "168cyhkp2q57k26r961c3g521qf8gj2b5rl8k1fg4z60y63s1rpk"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/elpher.html"; + license = lib.licenses.free; + }; + } + ) { }; + emacsql = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "emacsql"; + ename = "emacsql"; + version = "4.0.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/emacsql-4.0.1.tar"; + sha256 = "0098ixlx70vx4mxlcyddkij9aj4sgcf7p699cii0pz51lg9bymc0"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/emacsql.html"; + license = lib.licenses.free; + }; + } + ) { }; + engine-mode = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "engine-mode"; + ename = "engine-mode"; + version = "2.2.4"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/engine-mode-2.2.4.tar"; + sha256 = "0gp1mnf0yaq4w91pj989dzlxpbpcqqj0yls23wf2ly53kbaarzv9"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/engine-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + evil = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "evil"; + ename = "evil"; + version = "1.15.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/evil-1.15.0.tar"; + sha256 = "0ciglddlq0z91jyggp86d9g3gwfzjp55xhldqpxpq39a2xkwqh0q"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/evil.html"; + license = lib.licenses.free; + }; + } + ) { }; + evil-anzu = callPackage ( + { + anzu, + elpaBuild, + evil, + fetchurl, + lib, + }: + elpaBuild { + pname = "evil-anzu"; + ename = "evil-anzu"; + version = "0.2"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/evil-anzu-0.2.tar"; + sha256 = "1vn61aj0bnvkj2l3cd8m8q3n7kn09hdp6d13wc58w9pw8nrg0vq5"; + }; + packageRequires = [ + anzu + evil + ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/evil-anzu.html"; + license = lib.licenses.free; + }; + } + ) { }; + evil-args = callPackage ( + { + elpaBuild, + evil, + fetchurl, + lib, + }: + elpaBuild { + pname = "evil-args"; + ename = "evil-args"; + version = "1.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/evil-args-1.1.tar"; + sha256 = "0fv30wny2f4mg8l9jrjgxisz6nbmn84980yszbrcbkqi81dzzlyi"; + }; + packageRequires = [ evil ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/evil-args.html"; + license = lib.licenses.free; + }; + } + ) { }; + evil-escape = callPackage ( + { + cl-lib ? null, + elpaBuild, + evil, + fetchurl, + lib, + }: + elpaBuild { + pname = "evil-escape"; + ename = "evil-escape"; + version = "3.16"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/evil-escape-3.16.tar"; + sha256 = "0vv6k3zaaw4ckk6qjiw1n41815w1g4qgy2hfgsj1vm7xc9i9zjzp"; + }; + packageRequires = [ + cl-lib + evil + ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/evil-escape.html"; + license = lib.licenses.free; + }; + } + ) { }; + evil-exchange = callPackage ( + { + cl-lib ? null, + elpaBuild, + evil, + fetchurl, + lib, + }: + elpaBuild { + pname = "evil-exchange"; + ename = "evil-exchange"; + version = "0.41"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/evil-exchange-0.41.tar"; + sha256 = "1yk7zdxl7c8c2ic37l0rsaynnpcrhdbblk2frl5m8phf54g82d8i"; + }; + packageRequires = [ + cl-lib + evil + ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/evil-exchange.html"; + license = lib.licenses.free; + }; + } + ) { }; + evil-goggles = callPackage ( + { + elpaBuild, + evil, + fetchurl, + lib, + }: + elpaBuild { + pname = "evil-goggles"; + ename = "evil-goggles"; + version = "0.0.2"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/evil-goggles-0.0.2.tar"; + sha256 = "0nipk8r7l5c50n9zry5264cfilx730l68ssldw3hyj14ybdf6dch"; + }; + packageRequires = [ evil ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/evil-goggles.html"; + license = lib.licenses.free; + }; + } + ) { }; + evil-iedit-state = callPackage ( + { + elpaBuild, + evil, + fetchurl, + iedit, + lib, + }: + elpaBuild { + pname = "evil-iedit-state"; + ename = "evil-iedit-state"; + version = "1.3"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/evil-iedit-state-1.3.tar"; + sha256 = "1955bci018rpbdvixlw0gxay10g0vgg2xwsfmfyxcblk5glrv5cp"; + }; + packageRequires = [ + evil + iedit + ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/evil-iedit-state.html"; + license = lib.licenses.free; + }; + } + ) { }; + evil-indent-plus = callPackage ( + { + cl-lib ? null, + elpaBuild, + evil, + fetchurl, + lib, + }: + elpaBuild { + pname = "evil-indent-plus"; + ename = "evil-indent-plus"; + version = "1.0.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/evil-indent-plus-1.0.1.tar"; + sha256 = "1kzlvi8xgfxy26w1m31nyh6vrq787vchkmk4r1xaphk9wn9bw1pq"; + }; + packageRequires = [ + cl-lib + evil + ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/evil-indent-plus.html"; + license = lib.licenses.free; + }; + } + ) { }; + evil-lisp-state = callPackage ( + { + bind-map, + elpaBuild, + evil, + fetchurl, + lib, + smartparens, + }: + elpaBuild { + pname = "evil-lisp-state"; + ename = "evil-lisp-state"; + version = "8.2"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/evil-lisp-state-8.2.tar"; + sha256 = "14v1nv797b4rxxxnvzwy6pp10g3mmvifb919iv7nx96sbn919w0p"; + }; + packageRequires = [ + bind-map + evil + smartparens + ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/evil-lisp-state.html"; + license = lib.licenses.free; + }; + } + ) { }; + evil-matchit = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "evil-matchit"; + ename = "evil-matchit"; + version = "3.0.4"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/evil-matchit-3.0.4.tar"; + sha256 = "1ib2xlz7ciaszw2j5184mf6560jmap93vh515sk8dmkkahdwsjgz"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/evil-matchit.html"; + license = lib.licenses.free; + }; + } + ) { }; + evil-nerd-commenter = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "evil-nerd-commenter"; + ename = "evil-nerd-commenter"; + version = "3.6.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/evil-nerd-commenter-3.6.1.tar"; + sha256 = "1nzqwqp2gq3wka2x782yqz5d8bw3wglra42907kylkqwqbxryh0w"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/evil-nerd-commenter.html"; + license = lib.licenses.free; + }; + } + ) { }; + evil-numbers = callPackage ( + { + elpaBuild, + evil, + fetchurl, + lib, + }: + elpaBuild { + pname = "evil-numbers"; + ename = "evil-numbers"; + version = "0.7"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/evil-numbers-0.7.tar"; + sha256 = "1k5vrh8bj9kldqq8kxn1qi3k82i7k4v4h6nkk9hng8p90zhac02i"; + }; + packageRequires = [ evil ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/evil-numbers.html"; + license = lib.licenses.free; + }; + } + ) { }; + evil-surround = callPackage ( + { + elpaBuild, + evil, + fetchurl, + lib, + }: + elpaBuild { + pname = "evil-surround"; + ename = "evil-surround"; + version = "1.0.4"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/evil-surround-1.0.4.tar"; + sha256 = "1fzhqg2zrfl1yvhf96s5m0b9793cysciqbxiihxzrnnf2rnrlls2"; + }; + packageRequires = [ evil ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/evil-surround.html"; + license = lib.licenses.free; + }; + } + ) { }; + evil-visual-mark-mode = callPackage ( + { + dash, + elpaBuild, + evil, + fetchurl, + lib, + }: + elpaBuild { + pname = "evil-visual-mark-mode"; + ename = "evil-visual-mark-mode"; + version = "0.0.5"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/evil-visual-mark-mode-0.0.5.tar"; + sha256 = "0hjg9jmyhhc6a6zzjicwy62m9bh7wlw6hc4cf2g6g416c0ri2d18"; + }; + packageRequires = [ + dash + evil + ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/evil-visual-mark-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + evil-visualstar = callPackage ( + { + elpaBuild, + evil, + fetchurl, + lib, + }: + elpaBuild { + pname = "evil-visualstar"; + ename = "evil-visualstar"; + version = "0.2.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/evil-visualstar-0.2.0.tar"; + sha256 = "03liavxxpawvlgwdsihzz3z08yv227zjjqyll1cbmbk0678kbl7m"; + }; + packageRequires = [ evil ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/evil-visualstar.html"; + license = lib.licenses.free; + }; + } + ) { }; + exec-path-from-shell = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "exec-path-from-shell"; + ename = "exec-path-from-shell"; + version = "2.2"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/exec-path-from-shell-2.2.tar"; + sha256 = "14nzk04aypqminpqs181nh3di23nnw64z0ir940ajs9bx5pv9s1w"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/exec-path-from-shell.html"; + license = lib.licenses.free; + }; + } + ) { }; + flx = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "flx"; + ename = "flx"; + version = "0.6.2"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/flx-0.6.2.tar"; + sha256 = "00d3q238grxcvnx6pshb7ajbz559gfp00pqaq56r2n5xqrvrxfnc"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/flx.html"; + license = lib.licenses.free; + }; + } + ) { }; + flx-ido = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + flx, + lib, + }: + elpaBuild { + pname = "flx-ido"; + ename = "flx-ido"; + version = "0.6.2"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/flx-ido-0.6.2.tar"; + sha256 = "1933d3dcwynzs5qnv3pl4xdybj5gg0sa8zb58j0ld9hyiacm6zn5"; + }; + packageRequires = [ + cl-lib + flx + ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/flx-ido.html"; + license = lib.licenses.free; + }; + } + ) { }; + flycheck = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "flycheck"; + ename = "flycheck"; + version = "34.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/flycheck-34.1.tar"; + sha256 = "1jj1c4gq39ik8fihsz13wp4c26fm2m6kyr7ir22ql0d007zm3173"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/flycheck.html"; + license = lib.licenses.free; + }; + } + ) { }; + flymake-guile = callPackage ( + { + elpaBuild, + fetchurl, + flymake ? null, + lib, + }: + elpaBuild { + pname = "flymake-guile"; + ename = "flymake-guile"; + version = "0.5"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/flymake-guile-0.5.tar"; + sha256 = "0gfblb49l52j7iq3y6fxx1jpr72z61pwxsxfknvfi4y05znxnf0k"; + }; + packageRequires = [ flymake ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/flymake-guile.html"; + license = lib.licenses.free; + }; + } + ) { }; + flymake-kondor = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "flymake-kondor"; + ename = "flymake-kondor"; + version = "0.1.3"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/flymake-kondor-0.1.3.tar"; + sha256 = "0y5qnlk3q0fjch12d4vwni7v6rk0h5056s5lzjgns71x36xd1i21"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/flymake-kondor.html"; + license = lib.licenses.free; + }; + } + ) { }; + flymake-popon = callPackage ( + { + elpaBuild, + fetchurl, + flymake ? null, + lib, + popon, + posframe, + }: + elpaBuild { + pname = "flymake-popon"; + ename = "flymake-popon"; + version = "0.5.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/flymake-popon-0.5.1.tar"; + sha256 = "0a9p0mnp1n4znb9xgi5ldjv8x1khhdr5idb8vcd444nd03q0lj6s"; + }; + packageRequires = [ + flymake + popon + posframe + ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/flymake-popon.html"; + license = lib.licenses.free; + }; + } + ) { }; + focus = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "focus"; + ename = "focus"; + version = "1.0.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/focus-1.0.1.tar"; + sha256 = "164xlxc5x2i955rfjdhlxp5ch55bh79gr7mzfychkjx0x088hcaa"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/focus.html"; + license = lib.licenses.free; + }; + } + ) { }; + forth-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "forth-mode"; + ename = "forth-mode"; + version = "0.2"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/forth-mode-0.2.tar"; + sha256 = "04xcvjzvl4pgx48l2pzil7s2iqqbf86z57wv76ahp4sd1xigpfqc"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/forth-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + free-keys = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "free-keys"; + ename = "free-keys"; + version = "1.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/free-keys-1.0.tar"; + sha256 = "04x4hmia5rx6bd8pkp5b9g4mn081r14vyk1jbdygdzr5w5rhifx3"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/free-keys.html"; + license = lib.licenses.free; + }; + } + ) { }; + gc-buffers = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "gc-buffers"; + ename = "gc-buffers"; + version = "1.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/gc-buffers-1.0.tar"; + sha256 = "00204vanfabyf6cgbn64xgqhqz8mlppizsgi31xg6id1qgrj37p3"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/gc-buffers.html"; + license = lib.licenses.free; + }; + } + ) { }; + geiser = callPackage ( + { + elpaBuild, + fetchurl, + lib, + project, + }: + elpaBuild { + pname = "geiser"; + ename = "geiser"; + version = "0.31"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/geiser-0.31.tar"; + sha256 = "0szyasza76ak4qny9v9i3sk1m3mahlxcvvsk078q8rp9cms5lzkv"; + }; + packageRequires = [ project ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/geiser.html"; + license = lib.licenses.free; + }; + } + ) { }; + geiser-chez = callPackage ( + { + elpaBuild, + fetchurl, + geiser, + lib, + }: + elpaBuild { + pname = "geiser-chez"; + ename = "geiser-chez"; + version = "0.18"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/geiser-chez-0.18.tar"; + sha256 = "14l2a7njx3bzxj1qpc1m5mx4prm3ixgsiii3k484brbn4vim4j58"; + }; + packageRequires = [ geiser ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/geiser-chez.html"; + license = lib.licenses.free; + }; + } + ) { }; + geiser-chibi = callPackage ( + { + elpaBuild, + fetchurl, + geiser, + lib, + }: + elpaBuild { + pname = "geiser-chibi"; + ename = "geiser-chibi"; + version = "0.17"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/geiser-chibi-0.17.tar"; + sha256 = "17kkgs0z2xwbbwn7s49lnha6pmri1h7jnnhh5qvxif5xyvyy8bih"; + }; + packageRequires = [ geiser ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/geiser-chibi.html"; + license = lib.licenses.free; + }; + } + ) { }; + geiser-chicken = callPackage ( + { + elpaBuild, + fetchurl, + geiser, + lib, + }: + elpaBuild { + pname = "geiser-chicken"; + ename = "geiser-chicken"; + version = "0.17"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/geiser-chicken-0.17.tar"; + sha256 = "1l0x0b5gcmc6v2gd2jhrz4zz2630rggq8w7ffzhsf8b8hr4d1ixy"; + }; + packageRequires = [ geiser ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/geiser-chicken.html"; + license = lib.licenses.free; + }; + } + ) { }; + geiser-gambit = callPackage ( + { + elpaBuild, + fetchurl, + geiser, + lib, + }: + elpaBuild { + pname = "geiser-gambit"; + ename = "geiser-gambit"; + version = "0.18.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/geiser-gambit-0.18.1.tar"; + sha256 = "1pqify8vqxzpm202zz9q92hp65yhs624z6qc2hgp9c1zms56jkqs"; + }; + packageRequires = [ geiser ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/geiser-gambit.html"; + license = lib.licenses.free; + }; + } + ) { }; + geiser-gauche = callPackage ( + { + elpaBuild, + fetchurl, + geiser, + lib, + }: + elpaBuild { + pname = "geiser-gauche"; + ename = "geiser-gauche"; + version = "0.0.2"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/geiser-gauche-0.0.2.tar"; + sha256 = "189addy5xvx62j91ihi23i8dh5msm0wlwxyi8n07f4m2garrn14l"; + }; + packageRequires = [ geiser ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/geiser-gauche.html"; + license = lib.licenses.free; + }; + } + ) { }; + geiser-guile = callPackage ( + { + elpaBuild, + fetchurl, + geiser, + lib, + transient, + }: + elpaBuild { + pname = "geiser-guile"; + ename = "geiser-guile"; + version = "0.28.2"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/geiser-guile-0.28.2.tar"; + sha256 = "02s44dj6cr6fmiby6yljil7cgp00h31h3fs1a428lr3v51z1i38m"; + }; + packageRequires = [ + geiser + transient + ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/geiser-guile.html"; + license = lib.licenses.free; + }; + } + ) { }; + geiser-kawa = callPackage ( + { + elpaBuild, + fetchurl, + geiser, + lib, + }: + elpaBuild { + pname = "geiser-kawa"; + ename = "geiser-kawa"; + version = "0.0.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/geiser-kawa-0.0.1.tar"; + sha256 = "1qh4qr406ahk4k8g46nzkiic1fidhni0a5zv4i84cdypv1c4473p"; + }; + packageRequires = [ geiser ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/geiser-kawa.html"; + license = lib.licenses.free; + }; + } + ) { }; + geiser-mit = callPackage ( + { + elpaBuild, + fetchurl, + geiser, + lib, + }: + elpaBuild { + pname = "geiser-mit"; + ename = "geiser-mit"; + version = "0.15"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/geiser-mit-0.15.tar"; + sha256 = "12wimv5x2k64ww9x147dlx2gfygmgz96hqcdhkbidi1smhfz11gk"; + }; + packageRequires = [ geiser ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/geiser-mit.html"; + license = lib.licenses.free; + }; + } + ) { }; + geiser-racket = callPackage ( + { + elpaBuild, + fetchurl, + geiser, + lib, + }: + elpaBuild { + pname = "geiser-racket"; + ename = "geiser-racket"; + version = "0.16"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/geiser-racket-0.16.tar"; + sha256 = "08sn32ams88ism6k24kq7s54vrdblkn15x9lldyqg4zapbllr1ny"; + }; + packageRequires = [ geiser ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/geiser-racket.html"; + license = lib.licenses.free; + }; + } + ) { }; + geiser-stklos = callPackage ( + { + elpaBuild, + fetchurl, + geiser, + lib, + }: + elpaBuild { + pname = "geiser-stklos"; + ename = "geiser-stklos"; + version = "1.8"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/geiser-stklos-1.8.tar"; + sha256 = "1525n49igcnwr2wsjv4a74yk1gbjvv1l9rmkcpafyxyykvi94j6s"; + }; + packageRequires = [ geiser ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/geiser-stklos.html"; + license = lib.licenses.free; + }; + } + ) { }; + git-commit = callPackage ( + { + compat, + elpaBuild, + fetchurl, + lib, + seq, + transient, + with-editor, + }: + elpaBuild { + pname = "git-commit"; + ename = "git-commit"; + version = "4.0.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/git-commit-4.0.0.tar"; + sha256 = "10fh8i3l07qxsfw23q2mkb7rxgc7n2chirzdjd9bnlqrxybrayli"; + }; + packageRequires = [ + compat + seq + transient + with-editor + ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/git-commit.html"; + license = lib.licenses.free; + }; + } + ) { }; + git-modes = callPackage ( + { + compat, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "git-modes"; + ename = "git-modes"; + version = "1.4.4"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/git-modes-1.4.4.tar"; + sha256 = "161n8anh3i7aj9995nry879kkfvawm1dkzlxdqfwmzl85g8yqx58"; + }; + packageRequires = [ compat ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/git-modes.html"; + license = lib.licenses.free; + }; + } + ) { }; + gnosis = callPackage ( + { + compat, + elpaBuild, + emacsql, + fetchurl, + lib, + transient, + }: + elpaBuild { + pname = "gnosis"; + ename = "gnosis"; + version = "0.4.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/gnosis-0.4.1.tar"; + sha256 = "1iqpssf3gxv54gig718529y3cfjybvvjcvndzhjsiyw5b33pkbby"; + }; + packageRequires = [ + compat + emacsql + transient + ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/gnosis.html"; + license = lib.licenses.free; + }; + } + ) { }; + gnu-apl-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "gnu-apl-mode"; + ename = "gnu-apl-mode"; + version = "1.5.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/gnu-apl-mode-1.5.1.tar"; + sha256 = "0hzdmrhrcnq49cklpmbx1sq7d9qd2q6pprgshhhjx45mnn1q24v0"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/gnu-apl-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + gnu-indent = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "gnu-indent"; + ename = "gnu-indent"; + version = "1.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/gnu-indent-1.0.tar"; + sha256 = "1aj8si93ig1qbdqgq3f4jwnsws63drkfwfzxlq0i3qqfhsni0a15"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/gnu-indent.html"; + license = lib.licenses.free; + }; + } + ) { }; + gnuplot = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "gnuplot"; + ename = "gnuplot"; + version = "0.8.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/gnuplot-0.8.1.tar"; + sha256 = "1y364j5gr8cnkndxd088kaxd2ah0nd7176gfjligm3ngpgg6ndyx"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/gnuplot.html"; + license = lib.licenses.free; + }; + } + ) { }; + go-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "go-mode"; + ename = "go-mode"; + version = "1.6.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/go-mode-1.6.0.tar"; + sha256 = "0ilvkl7iv47v0xyha07gfyv1a4c50ifw57bp7rx8ai77v30f3a2a"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/go-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + golden-ratio = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "golden-ratio"; + ename = "golden-ratio"; + version = "1.0.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/golden-ratio-1.0.1.tar"; + sha256 = "169jl82906k03vifks0zs4sk5gcxax5jii6nysh6y6ns2h656cqx"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/golden-ratio.html"; + license = lib.licenses.free; + }; + } + ) { }; + gotham-theme = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "gotham-theme"; + ename = "gotham-theme"; + version = "1.1.9"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/gotham-theme-1.1.9.tar"; + sha256 = "195r8idq2ak6wpmgifpgvx52hljb8i7p9wx6ii1kh0baaqk31qq2"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/gotham-theme.html"; + license = lib.licenses.free; + }; + } + ) { }; + goto-chg = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "goto-chg"; + ename = "goto-chg"; + version = "1.7.5"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/goto-chg-1.7.5.tar"; + sha256 = "1j5vk8vc1v865fc8gdy0p5lpp2kkl0yn9f75npiva3ay6mwvnvay"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/goto-chg.html"; + license = lib.licenses.free; + }; + } + ) { }; + gptel = callPackage ( + { + compat, + elpaBuild, + fetchurl, + lib, + transient, + }: + elpaBuild { + pname = "gptel"; + ename = "gptel"; + version = "0.9.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/gptel-0.9.0.tar"; + sha256 = "1crcng1h6i64h6l3pha96k3hy2hga73pp0wy4i9gdrc1ra0dbjf4"; + }; + packageRequires = [ + compat + transient + ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/gptel.html"; + license = lib.licenses.free; + }; + } + ) { }; + graphql-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "graphql-mode"; + ename = "graphql-mode"; + version = "1.0.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/graphql-mode-1.0.0.tar"; + sha256 = "0pfyznfndc8g2g3a3pxzcjsh3cah3amhz5124flrja5fqdgdmpjz"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/graphql-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + gruber-darker-theme = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "gruber-darker-theme"; + ename = "gruber-darker-theme"; + version = "0.7"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/gruber-darker-theme-0.7.tar"; + sha256 = "1ib9ad120g39fbkj41am6khglv1p6g3a9hk2jj2kl0c6czr1il2r"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/gruber-darker-theme.html"; + license = lib.licenses.free; + }; + } + ) { }; + gruvbox-theme = callPackage ( + { + autothemer, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "gruvbox-theme"; + ename = "gruvbox-theme"; + version = "1.30.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/gruvbox-theme-1.30.1.tar"; + sha256 = "1y30aahdxzdfmj021vbrz4zmdq6lr9k08hna9i1a8g4cywgbz8ri"; + }; + packageRequires = [ autothemer ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/gruvbox-theme.html"; + license = lib.licenses.free; + }; + } + ) { }; + guru-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "guru-mode"; + ename = "guru-mode"; + version = "1.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/guru-mode-1.0.tar"; + sha256 = "0kmbllzvp8qzj8ck2azq2wfw66ywc80zicncja62bi6zsh2l622z"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/guru-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + haml-mode = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "haml-mode"; + ename = "haml-mode"; + version = "3.2.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/haml-mode-3.2.1.tar"; + sha256 = "0hhra7bryk3n649s3byzq6vv5ywd4bqkfppya7bswqkj3bakiyil"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/haml-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + haskell-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "haskell-mode"; + ename = "haskell-mode"; + version = "17.5"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/haskell-mode-17.5.tar"; + sha256 = "1yjy0cvgs5cnq5d9sv24p1p66z83r9rhbgn0nsccc12rn2gm3hyn"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/haskell-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + haskell-tng-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "haskell-tng-mode"; + ename = "haskell-tng-mode"; + version = "0.0.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/haskell-tng-mode-0.0.1.tar"; + sha256 = "0l6rs93322la2fn8wyvxshl6f967ngamw2m1hnm2j6hvmqph5cpj"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/haskell-tng-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + helm = callPackage ( + { + elpaBuild, + fetchurl, + helm-core, + lib, + wfnames, + }: + elpaBuild { + pname = "helm"; + ename = "helm"; + version = "3.9.9"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/helm-3.9.9.tar"; + sha256 = "1k3jq2miivj881h0mpl68zgd229kj50axynsgxizdddg56nfsdm0"; + }; + packageRequires = [ + helm-core + wfnames + ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/helm.html"; + license = lib.licenses.free; + }; + } + ) { }; + helm-core = callPackage ( + { + async, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "helm-core"; + ename = "helm-core"; + version = "3.9.9"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/helm-core-3.9.9.tar"; + sha256 = "067x4g19w032671545bfah4262xyhgnwxkaw8pdk4fqd5znw0yck"; + }; + packageRequires = [ async ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/helm-core.html"; + license = lib.licenses.free; + }; + } + ) { }; + hideshowvis = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "hideshowvis"; + ename = "hideshowvis"; + version = "0.8"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/hideshowvis-0.8.tar"; + sha256 = "0xx2jjv95r1nhlf729y0zplfpjlh46nfnixmd3f5jc3z2pc6zf5b"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/hideshowvis.html"; + license = lib.licenses.free; + }; + } + ) { }; + highlight-parentheses = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "highlight-parentheses"; + ename = "highlight-parentheses"; + version = "2.2.2"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/highlight-parentheses-2.2.2.tar"; + sha256 = "13686dkgpn30di3kkc60l3dhrrjdknqkmvgjnl97mrbikxfma7w2"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/highlight-parentheses.html"; + license = lib.licenses.free; + }; + } + ) { }; + hl-block-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "hl-block-mode"; + ename = "hl-block-mode"; + version = "0.2"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/hl-block-mode-0.2.tar"; + sha256 = "0anv7bvrwylp504l3g42jcbcfmibv9jzs2kbkny46xd9vfb3kyrl"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/hl-block-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + hl-column = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "hl-column"; + ename = "hl-column"; + version = "1.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/hl-column-1.0.tar"; + sha256 = "11d7xplpjx0b6ppcjv4giazrla1qcaaf2i6s5g0j5zxb1m60kkfz"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/hl-column.html"; + license = lib.licenses.free; + }; + } + ) { }; + htmlize = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "htmlize"; + ename = "htmlize"; + version = "1.56"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/htmlize-1.56.tar"; + sha256 = "0s4k5q8b4grx3zyrryxcqahixkpzcni2qqnmm07axfxpgcqcnk9c"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/htmlize.html"; + license = lib.licenses.free; + }; + } + ) { }; + hyperdrive = callPackage ( + { + compat, + elpaBuild, + fetchurl, + lib, + map, + persist, + plz, + taxy-magit-section, + transient, + }: + elpaBuild { + pname = "hyperdrive"; + ename = "hyperdrive"; + version = "0.3"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/hyperdrive-0.3.tar"; + sha256 = "03r5qx3a0w1ll4ql7nrjgp19cnk7rrf7ibvj8gd57gqqihkdmqqw"; + }; + packageRequires = [ + compat + map + persist + plz + taxy-magit-section + transient + ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/hyperdrive.html"; + license = lib.licenses.free; + }; + } + ) { }; + idle-highlight-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "idle-highlight-mode"; + ename = "idle-highlight-mode"; + version = "1.1.4"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/idle-highlight-mode-1.1.4.tar"; + sha256 = "0vp45ww8bxacrwzv0jqzs782symxysmpvawd29pa1yci1qp2pvm5"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/idle-highlight-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + idris-mode = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + prop-menu, + }: + elpaBuild { + pname = "idris-mode"; + ename = "idris-mode"; + version = "1.1.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/idris-mode-1.1.0.tar"; + sha256 = "1vlm7gshrkwp9lfm5jcp1rnsjxwzqknrjhl3q5ifwmicyvqkqwsv"; + }; + packageRequires = [ + cl-lib + prop-menu + ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/idris-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + iedit = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "iedit"; + ename = "iedit"; + version = "0.9.9.9.9"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/iedit-0.9.9.9.9.tar"; + sha256 = "12s71yj8ycrls2fl97qs3igk5y06ksbmfq2idz0a2zrdggndg0b6"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/iedit.html"; + license = lib.licenses.free; + }; + } + ) { }; + inf-clojure = callPackage ( + { + clojure-mode, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "inf-clojure"; + ename = "inf-clojure"; + version = "3.2.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/inf-clojure-3.2.1.tar"; + sha256 = "1pvngj87hqr0qzc62cgq294rllxbmn7803pnqqr8ah1qxy65a1wb"; + }; + packageRequires = [ clojure-mode ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/inf-clojure.html"; + license = lib.licenses.free; + }; + } + ) { }; + inf-ruby = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "inf-ruby"; + ename = "inf-ruby"; + version = "2.8.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/inf-ruby-2.8.1.tar"; + sha256 = "1iisxgrw7lkrcl86mj3s3578qxnx1cn615swsmnch2ilwjqdrdza"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/inf-ruby.html"; + license = lib.licenses.free; + }; + } + ) { }; + inkpot-theme = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "inkpot-theme"; + ename = "inkpot-theme"; + version = "0.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/inkpot-theme-0.1.tar"; + sha256 = "0ik7vkwqlsgxmdckd154kh82zg8jr41vwc0a200x9920l5mnfjq2"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/inkpot-theme.html"; + license = lib.licenses.free; + }; + } + ) { }; + iwindow = callPackage ( + { + compat, + elpaBuild, + fetchurl, + lib, + seq, + }: + elpaBuild { + pname = "iwindow"; + ename = "iwindow"; + version = "1.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/iwindow-1.1.tar"; + sha256 = "04d5dxqazxfx8ap9vmhj643x7lmpa0wmzcm9w9mlvsk2kaz0j19i"; + }; + packageRequires = [ + compat + seq + ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/iwindow.html"; + license = lib.licenses.free; + }; + } + ) { }; + j-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "j-mode"; + ename = "j-mode"; + version = "2.0.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/j-mode-2.0.1.tar"; + sha256 = "0kk29s3xqad72jxvzzbl4b4z8b4l7xx1vyfcbsj8ns8hv8cip3l3"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/j-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + jade-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "jade-mode"; + ename = "jade-mode"; + version = "1.0.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/jade-mode-1.0.1.tar"; + sha256 = "0pv0n9vharda92avggd91q8i98yjim9ccnz5m5c5xw12hxcsfj17"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/jade-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + jinja2-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "jinja2-mode"; + ename = "jinja2-mode"; + version = "0.3"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/jinja2-mode-0.3.tar"; + sha256 = "0dg1zn7mghclnxsmcl5nq5jqibm18sja23058q9lk6nph4fvz5dq"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/jinja2-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + julia-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "julia-mode"; + ename = "julia-mode"; + version = "0.4"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/julia-mode-0.4.tar"; + sha256 = "15x63nwq6rh1yxwwd8hf0a8nznws8gzxqiw45n6pv8vp8h2v3fsi"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/julia-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + keycast = callPackage ( + { + compat, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "keycast"; + ename = "keycast"; + version = "1.4.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/keycast-1.4.1.tar"; + sha256 = "0xpdz6fqvmx6ha20c957r4psz393r0ag7ml971x21v035r3gfx8r"; + }; + packageRequires = [ compat ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/keycast.html"; + license = lib.licenses.free; + }; + } + ) { }; + kotlin-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "kotlin-mode"; + ename = "kotlin-mode"; + version = "2.0.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/kotlin-mode-2.0.0.tar"; + sha256 = "0d247kxbrhkbmgldmalywmx6fqiz35ifvjbv20lyrmnbyhx1zr97"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/kotlin-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + lorem-ipsum = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "lorem-ipsum"; + ename = "lorem-ipsum"; + version = "0.4"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/lorem-ipsum-0.4.tar"; + sha256 = "0d1c6zalnqhyn88dbbi8wqzvp0ppswhqv656hbj129jwp4iida4x"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/lorem-ipsum.html"; + license = lib.licenses.free; + }; + } + ) { }; + lua-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "lua-mode"; + ename = "lua-mode"; + version = "20221027"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/lua-mode-20221027.tar"; + sha256 = "0mg4fjprrcwqfrzxh6wpl92r3ywpj3586444c6yvq1rs56z5wvj5"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/lua-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + macrostep = callPackage ( + { + cl-lib ? null, + compat, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "macrostep"; + ename = "macrostep"; + version = "0.9.4"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/macrostep-0.9.4.tar"; + sha256 = "01n3qhxfjd9vg93ddrhnm275v24ih5qczkphc232m0csswxghpdk"; + }; + packageRequires = [ + cl-lib + compat + ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/macrostep.html"; + license = lib.licenses.free; + }; + } + ) { }; + magit = callPackage ( + { + compat, + dash, + elpaBuild, + fetchurl, + git-commit, + lib, + magit-section, + seq, + transient, + with-editor, + }: + elpaBuild { + pname = "magit"; + ename = "magit"; + version = "4.0.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/magit-4.0.0.tar"; + sha256 = "0sii8gr69j29fzvcdyabnabldkvi6r5dpiamfs3bsmh66vf8wvjh"; + }; + packageRequires = [ + compat + dash + git-commit + magit-section + seq + transient + with-editor + ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/magit.html"; + license = lib.licenses.free; + }; + } + ) { }; + magit-section = callPackage ( + { + compat, + dash, + elpaBuild, + fetchurl, + lib, + seq, + }: + elpaBuild { + pname = "magit-section"; + ename = "magit-section"; + version = "4.0.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/magit-section-4.0.0.tar"; + sha256 = "1dyw275qfnpz7fs1s952b9fl9vgfzfk8aiclznfhhl43nvxxglb7"; + }; + packageRequires = [ + compat + dash + seq + ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/magit-section.html"; + license = lib.licenses.free; + }; + } + ) { }; + markdown-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "markdown-mode"; + ename = "markdown-mode"; + version = "2.6"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/markdown-mode-2.6.tar"; + sha256 = "15s8snzfvzzfk7wfizz5r8aksywq7s9h6xbb2y5dqjkpqg951va2"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/markdown-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + mastodon = callPackage ( + { + elpaBuild, + fetchurl, + lib, + persist, + request, + }: + elpaBuild { + pname = "mastodon"; + ename = "mastodon"; + version = "1.0.26"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/mastodon-1.0.26.tar"; + sha256 = "1p4nzgw8rf7zx4z17nn7bdh106qdhb54m20dkkz43wr4dgqp61bn"; + }; + packageRequires = [ + persist + request + ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/mastodon.html"; + license = lib.licenses.free; + }; + } + ) { }; + material-theme = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "material-theme"; + ename = "material-theme"; + version = "2015"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/material-theme-2015.tar"; + sha256 = "117ismd3p577cr59b6995byyq90zn4nd81dlf4pm8p0iiziryyji"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/material-theme.html"; + license = lib.licenses.free; + }; + } + ) { }; + mentor = callPackage ( + { + async, + elpaBuild, + fetchurl, + lib, + seq, + url-scgi, + xml-rpc, + }: + elpaBuild { + pname = "mentor"; + ename = "mentor"; + version = "0.5"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/mentor-0.5.tar"; + sha256 = "1sqdwdbanrdvrr8qqn23ylcyc98jcjc7yq1g1d963v8d9wfbailv"; + }; + packageRequires = [ + async + seq + url-scgi + xml-rpc + ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/mentor.html"; + license = lib.licenses.free; + }; + } + ) { }; + meow = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "meow"; + ename = "meow"; + version = "1.4.5"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/meow-1.4.5.tar"; + sha256 = "1d63mw88vq97rq3a7qhkxid2xaag5dp21ijisw9s3fk972kcks3s"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/meow.html"; + license = lib.licenses.free; + }; + } + ) { }; + minibar = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "minibar"; + ename = "minibar"; + version = "0.3"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/minibar-0.3.tar"; + sha256 = "0vxjw485bja8h3gmqmvg9541f21ricwcw6ydlhv9174as5cmwx5j"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/minibar.html"; + license = lib.licenses.free; + }; + } + ) { }; + moe-theme = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "moe-theme"; + ename = "moe-theme"; + version = "1.0.2"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/moe-theme-1.0.2.tar"; + sha256 = "13c4rj0c9fi4nipzsrmvgb8ddvk3dckijga07yxp71x5ba6mrp2n"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/moe-theme.html"; + license = lib.licenses.free; + }; + } + ) { }; + monokai-theme = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "monokai-theme"; + ename = "monokai-theme"; + version = "3.5.3"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/monokai-theme-3.5.3.tar"; + sha256 = "14ylizbhfj2hlc52gi2fs70avz39s46wnr96dbbq4l8vmhxs7il5"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/monokai-theme.html"; + license = lib.licenses.free; + }; + } + ) { }; + mpv = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + json ? null, + lib, + org, + }: + elpaBuild { + pname = "mpv"; + ename = "mpv"; + version = "0.2.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/mpv-0.2.0.tar"; + sha256 = "183alhd5fvmlhhfm0wl7b50axs01pgiwv735c43bfzdi2ny4szcm"; + }; + packageRequires = [ + cl-lib + json + org + ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/mpv.html"; + license = lib.licenses.free; + }; + } + ) { }; + multiple-cursors = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "multiple-cursors"; + ename = "multiple-cursors"; + version = "1.4.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/multiple-cursors-1.4.0.tar"; + sha256 = "0452wrbwg8hyvsri99h71g04dll5w65na265pp9whphq6l06ikrx"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/multiple-cursors.html"; + license = lib.licenses.free; + }; + } + ) { }; + nasm-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "nasm-mode"; + ename = "nasm-mode"; + version = "1.1.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/nasm-mode-1.1.1.tar"; + sha256 = "19k0gwwx2fz779yli6pcl0a7grhsbhwyisq76lmnnclw0gkf686l"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/nasm-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + nginx-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "nginx-mode"; + ename = "nginx-mode"; + version = "1.1.10"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/nginx-mode-1.1.10.tar"; + sha256 = "0c6biqxbwpkrbqi639ifgv8jkfadssyznjkq6hxvqgjh3nnyrlx3"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/nginx-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + nix-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + magit-section, + transient, + }: + elpaBuild { + pname = "nix-mode"; + ename = "nix-mode"; + version = "1.5.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/nix-mode-1.5.0.tar"; + sha256 = "0hansrsyzx8j31rk45y8zs9hbfjgbv9sf3r37s2a2adz48n9k86g"; + }; + packageRequires = [ + magit-section + transient + ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/nix-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + oblivion-theme = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "oblivion-theme"; + ename = "oblivion-theme"; + version = "0.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/oblivion-theme-0.1.tar"; + sha256 = "0njm7znh84drqwkp4jjsr8by6q9xd65r8l7xaqahzhk78167q6s4"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/oblivion-theme.html"; + license = lib.licenses.free; + }; + } + ) { }; + opam-switch-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "opam-switch-mode"; + ename = "opam-switch-mode"; + version = "1.7"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/opam-switch-mode-1.7.tar"; + sha256 = "1gpc1syb51am2gkb3cgfb28rhh6ik41c1gx9gjf1h8m6zxb75433"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/opam-switch-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + org-auto-tangle = callPackage ( + { + async, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "org-auto-tangle"; + ename = "org-auto-tangle"; + version = "0.6.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/org-auto-tangle-0.6.0.tar"; + sha256 = "1vh3k283h90v3qilyx1n30k4ny5rkry6x9s6778s0sm6f6hwdggd"; + }; + packageRequires = [ async ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/org-auto-tangle.html"; + license = lib.licenses.free; + }; + } + ) { }; + org-contrib = callPackage ( + { + elpaBuild, + fetchurl, + lib, + org, + }: + elpaBuild { + pname = "org-contrib"; + ename = "org-contrib"; + version = "0.4.2"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/org-contrib-0.4.2.tar"; + sha256 = "1v1g359dqyq8h4y5rjhllc93dq1vysnfk23lqn3smdvdi3ba9zlr"; + }; + packageRequires = [ org ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/org-contrib.html"; + license = lib.licenses.free; + }; + } + ) { }; + org-drill = callPackage ( + { + elpaBuild, + fetchurl, + lib, + org, + persist, + seq, + }: + elpaBuild { + pname = "org-drill"; + ename = "org-drill"; + version = "2.7.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/org-drill-2.7.0.tar"; + sha256 = "0118vdd0gv2ipgfljkda4388gdly45c5vg0yfn3z4p0p8mjd15lg"; + }; + packageRequires = [ + org + persist + seq + ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/org-drill.html"; + license = lib.licenses.free; + }; + } + ) { }; + org-journal = callPackage ( + { + elpaBuild, + fetchurl, + lib, + org, + }: + elpaBuild { + pname = "org-journal"; + ename = "org-journal"; + version = "2.2.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/org-journal-2.2.0.tar"; + sha256 = "12mvi8x8rsm93s55z8ns1an00l2p545swc0gzmx38ff57m7jb1mj"; + }; + packageRequires = [ org ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/org-journal.html"; + license = lib.licenses.free; + }; + } + ) { }; + org-mime = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "org-mime"; + ename = "org-mime"; + version = "0.3.3"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/org-mime-0.3.3.tar"; + sha256 = "1ylsdfifa4ykrf5vncnnj6v2bgc3ixlskgxb1v7qggmkb5mzy2yv"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/org-mime.html"; + license = lib.licenses.free; + }; + } + ) { }; + org-present = callPackage ( + { + elpaBuild, + fetchurl, + lib, + org, + }: + elpaBuild { + pname = "org-present"; + ename = "org-present"; + version = "0.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/org-present-0.1.tar"; + sha256 = "18zrvrd9aih57gj14qmxv9rf5j859vkvxcni3fkdbj84y5pq2fpy"; + }; + packageRequires = [ org ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/org-present.html"; + license = lib.licenses.free; + }; + } + ) { }; + org-superstar = callPackage ( + { + elpaBuild, + fetchurl, + lib, + org, + }: + elpaBuild { + pname = "org-superstar"; + ename = "org-superstar"; + version = "1.5.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/org-superstar-1.5.1.tar"; + sha256 = "1v6v7a0frgxlywfq6g4mdl6sz448k2ql7j4j4f1wrll33mr7gx8g"; + }; + packageRequires = [ org ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/org-superstar.html"; + license = lib.licenses.free; + }; + } + ) { }; + org-transclusion-http = callPackage ( + { + elpaBuild, + fetchurl, + lib, + org-transclusion, + plz, + }: + elpaBuild { + pname = "org-transclusion-http"; + ename = "org-transclusion-http"; + version = "0.4"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/org-transclusion-http-0.4.tar"; + sha256 = "1k57672w0dcw63dp1a6m5fc0pkm8p5la9811m16r440i7wqq0kmr"; + }; + packageRequires = [ + org-transclusion + plz + ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/org-transclusion-http.html"; + license = lib.licenses.free; + }; + } + ) { }; + org-tree-slide = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "org-tree-slide"; + ename = "org-tree-slide"; + version = "2.8.22"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/org-tree-slide-2.8.22.tar"; + sha256 = "1wqc5d2nxs4s6p2ap6sdalxnyigpxini8ck6jikaarmfqcghnx2m"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/org-tree-slide.html"; + license = lib.licenses.free; + }; + } + ) { }; + orgit = callPackage ( + { + compat, + elpaBuild, + fetchurl, + lib, + magit, + org, + }: + elpaBuild { + pname = "orgit"; + ename = "orgit"; + version = "2.0.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/orgit-2.0.0.tar"; + sha256 = "16i702ziy5z9zrmgz55bky0nar2hy55mkllswf7pgk8x4aihlda0"; + }; + packageRequires = [ + compat + magit + org + ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/orgit.html"; + license = lib.licenses.free; + }; + } + ) { }; + p4-16-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "p4-16-mode"; + ename = "p4-16-mode"; + version = "0.3"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/p4-16-mode-0.3.tar"; + sha256 = "1kwfqs7ikfjkkpv3m440ak40mjyf493gqygmc4hac8phlf9ns6dv"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/p4-16-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + package-lint = callPackage ( + { + elpaBuild, + fetchurl, + let-alist, + lib, + }: + elpaBuild { + pname = "package-lint"; + ename = "package-lint"; + version = "0.23"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/package-lint-0.23.tar"; + sha256 = "116kc7j0g2r8fzyb07b7xb767wzjqnigi504r0rb7cc93b44c4gg"; + }; + packageRequires = [ let-alist ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/package-lint.html"; + license = lib.licenses.free; + }; + } + ) { }; + pacmacs = callPackage ( + { + dash, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "pacmacs"; + ename = "pacmacs"; + version = "0.1.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/pacmacs-0.1.1.tar"; + sha256 = "02ahl0608xmmlkb014gqvv6f45l5lrkm3s4l6m5p5r98rwmlj3q9"; + }; + packageRequires = [ dash ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/pacmacs.html"; + license = lib.licenses.free; + }; + } + ) { }; + page-break-lines = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "page-break-lines"; + ename = "page-break-lines"; + version = "0.15"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/page-break-lines-0.15.tar"; + sha256 = "018mn6h6nmkkgv1hsk0k8fjyg38wpg2f0cvqlv9p392sapca59ay"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/page-break-lines.html"; + license = lib.licenses.free; + }; + } + ) { }; + paredit = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "paredit"; + ename = "paredit"; + version = "26"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/paredit-26.tar"; + sha256 = "1sk8nhsysa3y8fvds67cbwwzivzxlyw8d81y7f7pqc5lflidjrpc"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/paredit.html"; + license = lib.licenses.free; + }; + } + ) { }; + parseclj = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "parseclj"; + ename = "parseclj"; + version = "1.1.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/parseclj-1.1.1.tar"; + sha256 = "0kkg5fdjbf2dm8jmirm86sjbqnzyhy72iml4qwwnshxjfhz1f0yi"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/parseclj.html"; + license = lib.licenses.free; + }; + } + ) { }; + parseedn = callPackage ( + { + elpaBuild, + fetchurl, + lib, + map, + parseclj, + }: + elpaBuild { + pname = "parseedn"; + ename = "parseedn"; + version = "1.2.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/parseedn-1.2.1.tar"; + sha256 = "0q6wkcjxwqf81pvrcjbga91lr4ml6adbhmc7j71f53awrpc980ak"; + }; + packageRequires = [ + map + parseclj + ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/parseedn.html"; + license = lib.licenses.free; + }; + } + ) { }; + pcmpl-args = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "pcmpl-args"; + ename = "pcmpl-args"; + version = "0.1.3"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/pcmpl-args-0.1.3.tar"; + sha256 = "1lycckmwhp9l0pcrzx6c11iqwaw94h00334pzagkcfay7lz3hcgd"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/pcmpl-args.html"; + license = lib.licenses.free; + }; + } + ) { }; + pcre2el = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "pcre2el"; + ename = "pcre2el"; + version = "1.12"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/pcre2el-1.12.tar"; + sha256 = "1p0fgqm5342698gadnvziwbvv2kxj953975sp92cx7ddcyv2xr3c"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/pcre2el.html"; + license = lib.licenses.free; + }; + } + ) { }; + pdf-tools = callPackage ( + { + elpaBuild, + fetchurl, + let-alist, + lib, + tablist, + }: + elpaBuild { + pname = "pdf-tools"; + ename = "pdf-tools"; + version = "1.1.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/pdf-tools-1.1.0.tar"; + sha256 = "0shlpdy07pk9qj5a7d7yivpvgp5bh65psm0g9wkrvyhpkc93aylc"; + }; + packageRequires = [ + let-alist + tablist + ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/pdf-tools.html"; + license = lib.licenses.free; + }; + } + ) { }; + php-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "php-mode"; + ename = "php-mode"; + version = "1.25.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/php-mode-1.25.1.tar"; + sha256 = "1cfk7nq5x2p4adcf6q9igsh2jm0sdmsaf5l2sqx4idda28vp3gwc"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/php-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + popon = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "popon"; + ename = "popon"; + version = "0.13"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/popon-0.13.tar"; + sha256 = "0z0m7j30pdfw58cxxkmw5pkfpy8y1ax00wm4820rkqxz1f5sbkdb"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/popon.html"; + license = lib.licenses.free; + }; + } + ) { }; + popup = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "popup"; + ename = "popup"; + version = "0.5.9"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/popup-0.5.9.tar"; + sha256 = "06q31bv6nsdkdgyg6x0zzjnlq007zhqw2ssjmj44izl6h6fkr26m"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/popup.html"; + license = lib.licenses.free; + }; + } + ) { }; + projectile = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "projectile"; + ename = "projectile"; + version = "2.8.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/projectile-2.8.0.tar"; + sha256 = "05llvm3xw3dbjdnfhy2kk6z3pysrsc9f6i7dm4glw5j1k7vig306"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/projectile.html"; + license = lib.licenses.free; + }; + } + ) { }; + proof-general = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "proof-general"; + ename = "proof-general"; + version = "4.5"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/proof-general-4.5.tar"; + sha256 = "0mlmh7z93f7ypjlh6mxrxgcn47ysvi8qg8869qfxjgmskbfdvx2w"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/proof-general.html"; + license = lib.licenses.free; + }; + } + ) { }; + prop-menu = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "prop-menu"; + ename = "prop-menu"; + version = "0.1.2"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/prop-menu-0.1.2.tar"; + sha256 = "1cbps617k2nfi5jcv7y1zip4v64mi17r3rhw9w3n4r5hbl4sjwmw"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/prop-menu.html"; + license = lib.licenses.free; + }; + } + ) { }; + racket-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "racket-mode"; + ename = "racket-mode"; + version = "1.0.20240813.124142"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/racket-mode-1.0.20240813.124142.tar"; + sha256 = "0arsrq5lp8a6s6gh2dwc4m43f7gmhrwlpgxn6xsglscpvhlrair8"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/racket-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + rainbow-delimiters = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "rainbow-delimiters"; + ename = "rainbow-delimiters"; + version = "2.1.5"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/rainbow-delimiters-2.1.5.tar"; + sha256 = "0f4zhz92z5qk3p9ips2d76qi64xv6y8jrxh5nvbq46ivj5c0hnw2"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/rainbow-delimiters.html"; + license = lib.licenses.free; + }; + } + ) { }; + raku-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "raku-mode"; + ename = "raku-mode"; + version = "0.2.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/raku-mode-0.2.1.tar"; + sha256 = "00iwkp4hwjdiymzbwm41m27avrn3n63hnwd9amyx0nsa0kdhrfyx"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/raku-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + recomplete = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "recomplete"; + ename = "recomplete"; + version = "0.2"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/recomplete-0.2.tar"; + sha256 = "1jhyqgww8wawrxxd2zjb7scpamkbcp98hak9qmbn6ckgzdadks64"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/recomplete.html"; + license = lib.licenses.free; + }; + } + ) { }; + reformatter = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "reformatter"; + ename = "reformatter"; + version = "0.8"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/reformatter-0.8.tar"; + sha256 = "0bv0fbw3ach6jgnv67xjzxdzaghqa1rhgkmfsmkkbyz8ncbybj87"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/reformatter.html"; + license = lib.licenses.free; + }; + } + ) { }; + request = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "request"; + ename = "request"; + version = "0.3.3"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/request-0.3.3.tar"; + sha256 = "02j24v8jdjsvi3v3asydb1zfiarzaxrpsshvgf62nhgk6x08845z"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/request.html"; + license = lib.licenses.free; + }; + } + ) { }; + rfc-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "rfc-mode"; + ename = "rfc-mode"; + version = "1.4.2"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/rfc-mode-1.4.2.tar"; + sha256 = "0lhs8wa4sr387xyibqqskkqgyhhhy48qp5wbjs8r5p68j1s1q86m"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/rfc-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + rubocop = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "rubocop"; + ename = "rubocop"; + version = "0.6.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/rubocop-0.6.0.tar"; + sha256 = "026cna402hg9lsrf88kmb2as667fgaianj2qd3ik9y89ps4xyzxf"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/rubocop.html"; + license = lib.licenses.free; + }; + } + ) { }; + rust-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "rust-mode"; + ename = "rust-mode"; + version = "1.0.5"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/rust-mode-1.0.5.tar"; + sha256 = "1cilbf4yw4723bn1vh9ww79875fxh0r1j2c7wxjqfjk5xnx4s6q4"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/rust-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + sass-mode = callPackage ( + { + elpaBuild, + fetchurl, + haml-mode, + lib, + }: + elpaBuild { + pname = "sass-mode"; + ename = "sass-mode"; + version = "3.0.16"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/sass-mode-3.0.16.tar"; + sha256 = "0ag7qi9dq4j23ywbwni7pblp6l1ik95vjhclxm82s1911a8m7pj2"; + }; + packageRequires = [ haml-mode ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/sass-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + scad-mode = callPackage ( + { + compat, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "scad-mode"; + ename = "scad-mode"; + version = "94.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/scad-mode-94.0.tar"; + sha256 = "1cqai7qb9m17rf7llkn9vbxddgn0ixcf3dbnsjk1aflvj8mq9nr3"; + }; + packageRequires = [ compat ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/scad-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + scala-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "scala-mode"; + ename = "scala-mode"; + version = "1.1.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/scala-mode-1.1.0.tar"; + sha256 = "1x3vw4fzy1z6gavnbsm4lnwzkp47zd8gasvxxvfk57qn09hpwixh"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/scala-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + scroll-on-drag = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "scroll-on-drag"; + ename = "scroll-on-drag"; + version = "0.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/scroll-on-drag-0.1.tar"; + sha256 = "0ga8w9px2x9a2ams0lm7ganbixylgpx8g2m3jrwfih0ib3z26kqc"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/scroll-on-drag.html"; + license = lib.licenses.free; + }; + } + ) { }; + scroll-on-jump = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "scroll-on-jump"; + ename = "scroll-on-jump"; + version = "0.2"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/scroll-on-jump-0.2.tar"; + sha256 = "1gg5lpr21v9bjzjy33j8ziyhh5a1sad509c7rjkdlqda2z3xfrhr"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/scroll-on-jump.html"; + license = lib.licenses.free; + }; + } + ) { }; + sesman = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "sesman"; + ename = "sesman"; + version = "0.3.2"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/sesman-0.3.2.tar"; + sha256 = "1mrv32cp87dhzpcv55v4zv4nq37lrsprsdhhjb2q0msqab3b0r31"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/sesman.html"; + license = lib.licenses.free; + }; + } + ) { }; + shellcop = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "shellcop"; + ename = "shellcop"; + version = "0.1.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/shellcop-0.1.0.tar"; + sha256 = "1gj178fm0jj8dbfy0crwcjidih4r6g9dl9lprzpxzgswvma32g0w"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/shellcop.html"; + license = lib.licenses.free; + }; + } + ) { }; + slime = callPackage ( + { + elpaBuild, + fetchurl, + lib, + macrostep, + }: + elpaBuild { + pname = "slime"; + ename = "slime"; + version = "2.30"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/slime-2.30.tar"; + sha256 = "0gzgwrx6llj35kga21m3m4vp0g7f7dypim7pdnhy9sxrvl0k8v5f"; + }; + packageRequires = [ macrostep ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/slime.html"; + license = lib.licenses.free; + }; + } + ) { }; + sly = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "sly"; + ename = "sly"; + version = "1.0.43"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/sly-1.0.43.tar"; + sha256 = "1c7kzbpcrij4z09bxfa1rq5w23jw9h8v4s6fa6ihr13x67gsif84"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/sly.html"; + license = lib.licenses.free; + }; + } + ) { }; + smartparens = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "smartparens"; + ename = "smartparens"; + version = "1.11.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/smartparens-1.11.0.tar"; + sha256 = "0kvlyx2bhw4q6k79wf5cm4srlmfncsbii4spdgafwmv8j7vw6ya3"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/smartparens.html"; + license = lib.licenses.free; + }; + } + ) { }; + solarized-theme = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "solarized-theme"; + ename = "solarized-theme"; + version = "2.0.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/solarized-theme-2.0.1.tar"; + sha256 = "1lk1g8v2chjrbbxplw3pd7yn3syjgywxkbdc7dbd76x168qz54qx"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/solarized-theme.html"; + license = lib.licenses.free; + }; + } + ) { }; + spacemacs-theme = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "spacemacs-theme"; + ename = "spacemacs-theme"; + version = "0.2"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/spacemacs-theme-0.2.tar"; + sha256 = "07lkaj6gm5iz503p5l6sm1y62mc5wk13nrwzv81f899jw99jcgml"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/spacemacs-theme.html"; + license = lib.licenses.free; + }; + } + ) { }; + spell-fu = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "spell-fu"; + ename = "spell-fu"; + version = "0.3"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/spell-fu-0.3.tar"; + sha256 = "11a5361xjap02s0mm2sylhxqqrv64v72d70cg1vzch7iwfi18l9c"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/spell-fu.html"; + license = lib.licenses.free; + }; + } + ) { }; + sqlite3 = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "sqlite3"; + ename = "sqlite3"; + version = "0.17"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/sqlite3-0.17.tar"; + sha256 = "17fx2bnzajqjzd9jgwvn6pjwshgirign975rrsc1m47cwniz0bnq"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/sqlite3.html"; + license = lib.licenses.free; + }; + } + ) { }; + stylus-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "stylus-mode"; + ename = "stylus-mode"; + version = "1.0.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/stylus-mode-1.0.1.tar"; + sha256 = "0vihp241msg8f0ph8w3w9fkad9b12pmpwg0q5la8nbw7gfy41mz5"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/stylus-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + subatomic-theme = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "subatomic-theme"; + ename = "subatomic-theme"; + version = "1.8.2"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/subatomic-theme-1.8.2.tar"; + sha256 = "0vpaswm5mdyb8cir160mb8ffgzaz7kbq3gvc2zrnh531zb994mqg"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/subatomic-theme.html"; + license = lib.licenses.free; + }; + } + ) { }; + subed = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "subed"; + ename = "subed"; + version = "1.2.14"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/subed-1.2.14.tar"; + sha256 = "0kzb054radxq9hqviadmbr4cln39yp7yz4inq4ip52rd3qdm8vy4"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/subed.html"; + license = lib.licenses.free; + }; + } + ) { }; + sweeprolog = callPackage ( + { + compat, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "sweeprolog"; + ename = "sweeprolog"; + version = "0.27.5"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/sweeprolog-0.27.5.tar"; + sha256 = "0mw8fddzcbn9h5l55v12n4nmickqdxc3y7y0xfzm6m42cvqkzdzf"; + }; + packageRequires = [ compat ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/sweeprolog.html"; + license = lib.licenses.free; + }; + } + ) { }; + swift-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + seq, + }: + elpaBuild { + pname = "swift-mode"; + ename = "swift-mode"; + version = "9.1.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/swift-mode-9.1.0.tar"; + sha256 = "1h7fbrgp2jsn0nk6c84vzvipm86macxf2975l0av8gxv0kpzcaiv"; + }; + packageRequires = [ seq ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/swift-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + swsw = callPackage ( + { + elpaBuild, + emacs, + fetchurl, + lib, + }: + elpaBuild { + pname = "swsw"; + ename = "swsw"; + version = "2.3"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/swsw-2.3.tar"; + sha256 = "0qwdv174bh9k1bpd5szzmhk7hw89xf7rz2i2hzdrmlpvcs3ps653"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/swsw.html"; + license = lib.licenses.free; + }; + } + ) { }; + symbol-overlay = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "symbol-overlay"; + ename = "symbol-overlay"; + version = "4.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/symbol-overlay-4.1.tar"; + sha256 = "0l877zm8fbf6qqcg7zx26w32x885axcj01l4y1m98jzryjhszfgn"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/symbol-overlay.html"; + license = lib.licenses.free; + }; + } + ) { }; + systemd = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "systemd"; + ename = "systemd"; + version = "1.6.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/systemd-1.6.1.tar"; + sha256 = "0b0l70271kalicaix4p1ipr5vrj401cj8zvsi3243q1hp04k1m2g"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/systemd.html"; + license = lib.licenses.free; + }; + } + ) { }; + tablist = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "tablist"; + ename = "tablist"; + version = "1.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/tablist-1.0.tar"; + sha256 = "0z05va5fq054xysvhnpblxk5x0v6k4ian0hby6vryfxg9828gy57"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/tablist.html"; + license = lib.licenses.free; + }; + } + ) { }; + tangotango-theme = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "tangotango-theme"; + ename = "tangotango-theme"; + version = "0.0.7"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/tangotango-theme-0.0.7.tar"; + sha256 = "1w287p8lpmkm80qy1di2xmd71k051qmg89cn7s21kgi4br3hbbph"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/tangotango-theme.html"; + license = lib.licenses.free; + }; + } + ) { }; + telephone-line = callPackage ( + { + cl-generic, + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + seq, + }: + elpaBuild { + pname = "telephone-line"; + ename = "telephone-line"; + version = "0.5"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/telephone-line-0.5.tar"; + sha256 = "0pmn1r2g639c8g3rw5q2d5cgdz79d4ipr3r4dzwx2mgff3ri1ylm"; + }; + packageRequires = [ + cl-generic + cl-lib + seq + ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/telephone-line.html"; + license = lib.licenses.free; + }; + } + ) { }; + testcover-mark-line = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "testcover-mark-line"; + ename = "testcover-mark-line"; + version = "0.3"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/testcover-mark-line-0.3.tar"; + sha256 = "1p1dmxqdyk82qbcmggmzn15nz4jm98j5bjivy56vimgncqfbaf4h"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/testcover-mark-line.html"; + license = lib.licenses.free; + }; + } + ) { }; + textile-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "textile-mode"; + ename = "textile-mode"; + version = "1.0.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/textile-mode-1.0.0.tar"; + sha256 = "02nc3wijsb626631m09f2ygpmimkbl46x5hi8yk0wl18y66yq972"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/textile-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + toc-org = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "toc-org"; + ename = "toc-org"; + version = "1.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/toc-org-1.1.tar"; + sha256 = "0qhkn1a4j1q5gflqlyha2534sms8xsx03i7dizrckhl368yznwan"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/toc-org.html"; + license = lib.licenses.free; + }; + } + ) { }; + totp-auth = callPackage ( + { + base32, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "totp-auth"; + ename = "totp-auth"; + version = "1.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/totp-auth-1.0.tar"; + sha256 = "0hzj0p1r18q8vkhkbxbfakvmgld9y8n5hzza5zir0cpalv5590r5"; + }; + packageRequires = [ base32 ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/totp-auth.html"; + license = lib.licenses.free; + }; + } + ) { }; + treeview = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "treeview"; + ename = "treeview"; + version = "1.2.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/treeview-1.2.0.tar"; + sha256 = "1dmix7hn5yl69r987f0g2m00p866ln8412dm7fj399pmn1kdfsvy"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/treeview.html"; + license = lib.licenses.free; + }; + } + ) { }; + tuareg = callPackage ( + { + caml, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "tuareg"; + ename = "tuareg"; + version = "3.0.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/tuareg-3.0.1.tar"; + sha256 = "04lb71cafg4bqicx3q3rb9jpxbq6hmdrzw88f52sjqxq5c4cqdkj"; + }; + packageRequires = [ caml ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/tuareg.html"; + license = lib.licenses.free; + }; + } + ) { }; + typescript-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "typescript-mode"; + ename = "typescript-mode"; + version = "0.4"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/typescript-mode-0.4.tar"; + sha256 = "1fs369h8ysrx1d8qzvz75izmlx4gzl619g7yjp9ck2wjv50wx95q"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/typescript-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + ujelly-theme = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "ujelly-theme"; + ename = "ujelly-theme"; + version = "1.2.9"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/ujelly-theme-1.2.9.tar"; + sha256 = "1yyjsdcwprynwk86phpqfifv6xkmn49yrj6fkh5s57w5sbby4fp0"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/ujelly-theme.html"; + license = lib.licenses.free; + }; + } + ) { }; + undo-fu = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "undo-fu"; + ename = "undo-fu"; + version = "0.5"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/undo-fu-0.5.tar"; + sha256 = "00pgvmks1nvdimsac534qny5vpq8sgcfgybiz3ck3mgfklj4kshj"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/undo-fu.html"; + license = lib.licenses.free; + }; + } + ) { }; + undo-fu-session = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "undo-fu-session"; + ename = "undo-fu-session"; + version = "0.7"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/undo-fu-session-0.7.tar"; + sha256 = "1gly9fl8kvfssh2h90j9qcqvxvmnckn0x1wfm4qbz9ax57xvms23"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/undo-fu-session.html"; + license = lib.licenses.free; + }; + } + ) { }; + vc-fossil = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "vc-fossil"; + ename = "vc-fossil"; + version = "20230504"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/vc-fossil-20230504.tar"; + sha256 = "1q78xcfzpvvrlr9b9yh57asrlks2n0nhxhxl8dyfwad6gm0yr948"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/vc-fossil.html"; + license = lib.licenses.free; + }; + } + ) { }; + vcomplete = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "vcomplete"; + ename = "vcomplete"; + version = "2.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/vcomplete-2.0.tar"; + sha256 = "03f60ncrf994pc4q15m0p2admmy4gpg5c51nbr3xycqp16pq8dz1"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/vcomplete.html"; + license = lib.licenses.free; + }; + } + ) { }; + visual-fill-column = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "visual-fill-column"; + ename = "visual-fill-column"; + version = "2.6.3"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/visual-fill-column-2.6.3.tar"; + sha256 = "0agxixxlv3lnsng8jk7y6x1kzzvx3sw5m3mhl8gr4i1didgxc37n"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/visual-fill-column.html"; + license = lib.licenses.free; + }; + } + ) { }; + web-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "web-mode"; + ename = "web-mode"; + version = "17.3.20"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/web-mode-17.3.20.tar"; + sha256 = "1l4bmvc53ma2n3y143k86ip0w4am65zwxnl36lzqavs1hr55qvb2"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/web-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + webpaste = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + request, + }: + elpaBuild { + pname = "webpaste"; + ename = "webpaste"; + version = "3.2.2"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/webpaste-3.2.2.tar"; + sha256 = "04156iwgbc49l3b6s5vzbffw1xrkansvczi6q29d5waxwi6a2nfc"; + }; + packageRequires = [ + cl-lib + request + ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/webpaste.html"; + license = lib.licenses.free; + }; + } + ) { }; + wfnames = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "wfnames"; + ename = "wfnames"; + version = "1.2"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/wfnames-1.2.tar"; + sha256 = "1yy034fx86wn6yv4671fybc4zn5g619zcnnfvryq6zpwibj6fikz"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/wfnames.html"; + license = lib.licenses.free; + }; + } + ) { }; + wgrep = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "wgrep"; + ename = "wgrep"; + version = "3.0.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/wgrep-3.0.0.tar"; + sha256 = "18j94y6xrjdmy5sk83mh5zaz4vqpi97pcjila387c0d84j1v2wzz"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/wgrep.html"; + license = lib.licenses.free; + }; + } + ) { }; + why-this = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "why-this"; + ename = "why-this"; + version = "2.0.4"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/why-this-2.0.4.tar"; + sha256 = "1swidi6z6rhhy2zvas84vmkj41zaqpdxfssg6x6lvzzq34cgq0ph"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/why-this.html"; + license = lib.licenses.free; + }; + } + ) { }; + with-editor = callPackage ( + { + compat, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "with-editor"; + ename = "with-editor"; + version = "3.4.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/with-editor-3.4.1.tar"; + sha256 = "0nhlr2qjn351p0vd8vdnrwsb6wi2klh5ny84k90m8kzwcmvglhfd"; + }; + packageRequires = [ compat ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/with-editor.html"; + license = lib.licenses.free; + }; + } + ) { }; + with-simulated-input = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "with-simulated-input"; + ename = "with-simulated-input"; + version = "3.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/with-simulated-input-3.0.tar"; + sha256 = "0a2kqrv3q399n1y21v7m4c9ivm56j28kasb466rq704jccvzblfr"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/with-simulated-input.html"; + license = lib.licenses.free; + }; + } + ) { }; + workroom = callPackage ( + { + compat, + elpaBuild, + fetchurl, + lib, + project, + }: + elpaBuild { + pname = "workroom"; + ename = "workroom"; + version = "2.3.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/workroom-2.3.1.tar"; + sha256 = "0k0npmcs3cdkfds0r8p0gm8xa42bzdjiciilh65jka15fqknx486"; + }; + packageRequires = [ + compat + project + ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/workroom.html"; + license = lib.licenses.free; + }; + } + ) { }; + writegood-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "writegood-mode"; + ename = "writegood-mode"; + version = "2.2.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/writegood-mode-2.2.0.tar"; + sha256 = "00phrzbd03gzc5y2ybizyp9smd6ybmmx2j7jf6hg5cmfyjmq8ahw"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/writegood-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + ws-butler = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "ws-butler"; + ename = "ws-butler"; + version = "0.6"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/ws-butler-0.6.tar"; + sha256 = "1jzlwj2pqan3bj0mipvh8vzvmgynrxf1dqphix7g86ppjv1ivmfy"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/ws-butler.html"; + license = lib.licenses.free; + }; + } + ) { }; + xah-fly-keys = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "xah-fly-keys"; + ename = "xah-fly-keys"; + version = "25.9.20240725161125"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-25.9.20240725161125.tar"; + sha256 = "1kkis9qrfks40dlibkn4f75al0h61ixdw30a45ql09nsg4n5rzky"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/xah-fly-keys.html"; + license = lib.licenses.free; + }; + } + ) { }; + xkcd = callPackage ( + { + elpaBuild, + fetchurl, + json ? null, + lib, + }: + elpaBuild { + pname = "xkcd"; + ename = "xkcd"; + version = "1.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/xkcd-1.1.tar"; + sha256 = "1qs4jv6h2i8g7s214xr4s6jgykdbac4lfc5hd0gmylkwlvs3pzcp"; + }; + packageRequires = [ json ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/xkcd.html"; + license = lib.licenses.free; + }; + } + ) { }; + xml-rpc = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "xml-rpc"; + ename = "xml-rpc"; + version = "1.6.17"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/xml-rpc-1.6.17.tar"; + sha256 = "1r8j87xddv80dx6lxzr2kq6czwk2l22bfxmplnma9fc2bsf1k2wy"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/xml-rpc.html"; + license = lib.licenses.free; + }; + } + ) { }; + yaml-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "yaml-mode"; + ename = "yaml-mode"; + version = "0.0.16"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/yaml-mode-0.0.16.tar"; + sha256 = "0bhflv50z379p6ysdq89bdszkxp8zdmlb8plj1bm2nqsgc39hdm7"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/yaml-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; + yasnippet-snippets = callPackage ( + { + elpaBuild, + fetchurl, + lib, + yasnippet, + }: + elpaBuild { + pname = "yasnippet-snippets"; + ename = "yasnippet-snippets"; + version = "1.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/yasnippet-snippets-1.0.tar"; + sha256 = "0si61d0niabh18vbgdz6w5zirpxpp7c4mrcn5x1n3r5vnhv3n7m2"; + }; + packageRequires = [ yasnippet ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/yasnippet-snippets.html"; + license = lib.licenses.free; + }; + } + ) { }; + zenburn-theme = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "zenburn-theme"; + ename = "zenburn-theme"; + version = "2.8.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/zenburn-theme-2.8.0.tar"; + sha256 = "0z733svsjsads655jgmc0b33icmygwaahxa27qi32s1pq84zqb4z"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/zenburn-theme.html"; + license = lib.licenses.free; + }; + } + ) { }; + zig-mode = callPackage ( + { + elpaBuild, + fetchurl, + lib, + reformatter, + }: + elpaBuild { + pname = "zig-mode"; + ename = "zig-mode"; + version = "0.0.8"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/zig-mode-0.0.8.tar"; + sha256 = "1085lxm6k7b91c0q8jmmir59hzaqi8jgspbs89bvia2vq5x9xd87"; + }; + packageRequires = [ reformatter ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/zig-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; +} diff --git a/pkgs/applications/editors/emacs/elisp-packages/nongnu-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/nongnu-packages.nix index beca93ea4c35f..4466621b39261 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/nongnu-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/nongnu-packages.nix @@ -12,7 +12,7 @@ To update the list of packages from nongnu (ELPA), */ -{ lib, buildPackages }: +{ lib, pkgs, buildPackages }: self: let @@ -20,18 +20,20 @@ self: let generated ? ./nongnu-generated.nix }: let - imported = (import generated { + imported = import generated { callPackage = pkgs: args: self.callPackage pkgs (args // { # Use custom elpa url fetcher with fallback/uncompress fetchurl = buildPackages.callPackage ./fetchelpa.nix { }; }); - }) // { __attrsFailEvaluation = true; }; + }; super = imported; - overrides = { - }; + commonOverrides = import ./nongnu-common-overrides.nix pkgs; + + overrides = self: super: { }; - in super // overrides); + in + let super' = super // (commonOverrides self super); in super' // (overrides self super')); in generateNongnu { } diff --git a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json index 9dd51bcbc5a47..375b589bcb9a3 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json +++ b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json @@ -318,8 +318,8 @@ "repo": "abstools/abs-mode", "unstable": { "version": [ - 20230705, - 1437 + 20240723, + 1401 ], "deps": [ "erlang", @@ -327,13 +327,13 @@ "maude-mode", "yasnippet" ], - "commit": "bf21971bf57100e9e1ac26563207b35b377ec057", - "sha256": "070xa0hylkxy2j8g5jhdv3q003aqvasp7ald6f98skg6a0hsrvc7" + "commit": "c3ba6466507bd35ae1d5a2d12e1da9d5c44a02b3", + "sha256": "1xssk5srbs56jibkpl8wb8qn021kwdg36kafi7immnrpic4fx1xk" }, "stable": { "version": [ 1, - 6 + 7 ], "deps": [ "erlang", @@ -341,8 +341,8 @@ "maude-mode", "yasnippet" ], - "commit": "e6edb867b5cc68b5c9c112a51f51f7c1d22554dc", - "sha256": "1h355815bk4bs7wmmjkchb3c5v2fd5sfw7cqcxf4dgll3jpnphkv" + "commit": "0132032d9317861e63bea865746124accab9db83", + "sha256": "0xm88xqwlvdz2jj2fb196c4af64psyll1bjxmr5pvsgnn4j1pjay" } }, { @@ -1569,14 +1569,14 @@ "repo": "gvol/emacs-achievements", "unstable": { "version": [ - 20150531, - 1317 + 20240703, + 318 ], "deps": [ "keyfreq" ], - "commit": "5c3c430b21bcf685c412cf5ceb3769f630082e4f", - "sha256": "0zjncby2884cv8nz2ss7i0p17l15lsk88zwvb7b0gr3apbfpcpa3" + "commit": "c229d21ad5d1e13be08e087ab498800b2b9b7c97", + "sha256": "0xwhzrmiph9dg9gqm8fd3bv0sz8izl7cr298rbyjzlrq6lksaf5y" } }, { @@ -1622,6 +1622,21 @@ } }, { + "ename": "act-mode", + "commit": "cf407f944186776070ec6900d1bb8846cb3b8e57", + "sha256": "01nybw8gz2fk4938nkb68znbgcpw1ik31kqc2h6iwn6kvnchpw26", + "fetcher": "github", + "repo": "rafaelcn/act", + "unstable": { + "version": [ + 20240718, + 39 + ], + "commit": "90d7d626691591b24d83596149bc89fd51ba39b4", + "sha256": "14ym2i12d3nz7wrqbq6xy44zvh8fw601idapafi5zcsl1mpfc9f0" + } + }, + { "ename": "actionscript-mode", "commit": "2c11e74f2156f109b713380cebf83022d7159d4a", "sha256": "1dkiay9jmizvslji5kzab4dxm1dq0jm8ps7sjq6710g7a5aqdvwq", @@ -1687,11 +1702,11 @@ "repo": "brownts/ada-ts-mode", "unstable": { "version": [ - 20240506, - 1140 + 20240713, + 1754 ], - "commit": "3f83ab4c99cf13cf4693dde29eb1e950bbbb6595", - "sha256": "1jqsv7f24j39kbh4msvsfm0sv90k20fnw9r1wvmbgi8m7xgdhgzv" + "commit": "1e7ea28c1cdfe10a37855105bd47f820bfc90a27", + "sha256": "1z1w4wxk7dkhyjp4wh5m3r7v8izbr0iikc09gyq0120h7k51nagx" } }, { @@ -1726,10 +1741,10 @@ }, { "ename": "add-hooks", - "commit": "901f846aef46d512dc0a1770bab7f07c0ae330cd", - "sha256": "09a5b3prznibkb5igfn8x3vsjrlkh3534zycs8g25g4li87mcb6p", + "commit": "acd620719dff4fcbd32c6cd50d7954732c182c73", + "sha256": "14jh1nfzn529i6l3zf005rx9zmlmrxl7pgb6vwkc469ij1hdddn5", "fetcher": "github", - "repo": "nickmccurdy/add-hooks", + "repo": "nickserv/add-hooks", "unstable": { "version": [ 20171217, @@ -1904,14 +1919,14 @@ "repo": "minad/affe", "unstable": { "version": [ - 20240102, - 331 + 20240718, + 1250 ], "deps": [ "consult" ], - "commit": "1fd5732afa5d68b120fd2e949702b1abde0466d7", - "sha256": "16xi584ls9ll7x3y63hwqp2gv3j0b4dgy40xsnjkmzifp5xl0npr" + "commit": "e82be0be353dafe15c5ff617917806bd3728463a", + "sha256": "08ph4h883fyzx88jd70pjjraj0ya4rq3k7g2q9l1jjcf2hh0wmmb" }, "stable": { "version": [ @@ -2049,11 +2064,11 @@ "repo": "t4ccer/agenix.el", "unstable": { "version": [ - 20231016, - 614 + 20240601, + 1304 ], - "commit": "c3afc8d109dc19bfe2f97ce47184ca748dbe4816", - "sha256": "0h7lk050c7arhnvv2anlgqq39r3690fw9l0n8bjk5qh38dsgwmah" + "commit": "b9c7ad33b534d80af207949cc06c0bcd1e60fd63", + "sha256": "0pibky4ndm765xwz6964yihl0v5pmfdj90rnalb5zld1bfv4dv1x" }, "stable": { "version": [ @@ -2114,11 +2129,11 @@ "repo": "vietor/agtags", "unstable": { "version": [ - 20221026, - 904 + 20240701, + 1433 ], - "commit": "e8e04ece2f32d65b084974597bfe8077da3ddba0", - "sha256": "14sxysq606rq06banjhj5andny3j9r8yk3v4w8ipk0kd033qrr22" + "commit": "d47e58d024007d629b5a73c98c7c7e79f64be4d8", + "sha256": "13a9j56nnjh1zbglbd844wxr1zyw6jbdpmnmxcvhi9h5vksdxsgl" } }, { @@ -2254,14 +2269,14 @@ "repo": "AnthonyDiGirolamo/airline-themes", "unstable": { "version": [ - 20211214, - 1749 + 20240530, + 1704 ], "deps": [ "powerline" ], - "commit": "6bd102e49a7d87af1a72eb86e953991ff7bc954e", - "sha256": "0yrkbg4wwbp2rm60gmsalz7vrrklw908m6ws66j611z6h6wgmj48" + "commit": "baaa4f1f0acd339b1efc1058654ea7d9e6e44ead", + "sha256": "0biyna1agxknsg2farj2bi0pnqqxkvdnicmnazl77kcxknhs0r9s" }, "stable": { "version": [ @@ -2590,11 +2605,11 @@ "repo": "domtronn/all-the-icons.el", "unstable": { "version": [ - 20240108, - 559 + 20240623, + 1800 ], - "commit": "ee414384938ccf2ce93c77d717b85dc5538a257d", - "sha256": "18gk71fsh99m6hafc85nwg7rx416d5pnnjyk506i15nnwywsbbqd" + "commit": "39ef44f810c34e8900978788467cc675870bcd19", + "sha256": "00d7z43xxbgfi0yms57qj5yksd6wfri186fq26fjrdn5xbqqjnja" }, "stable": { "version": [ @@ -3261,11 +3276,11 @@ "repo": "anki-editor/anki-editor", "unstable": { "version": [ - 20240514, - 1944 + 20240716, + 1922 ], - "commit": "32d81be1d8305c5ccde12c7d0b29845d4f831888", - "sha256": "1chlj0igxk2mmmdvmw3qahp3pz9ra6yabm4711xhlnx7zj028lkc" + "commit": "ba7c7bf3269f7630ef8c06f342ab04bdd8efea53", + "sha256": "1pf243pv9mnqb1dlb2n3677abg7r3b69zizc7laxxqhik5dn9dd9" } }, { @@ -3424,12 +3439,11 @@ "stable": { "version": [ 2, - 6, - 4, - 3 + 7, + 0 ], - "commit": "714c7d2c76c5ffda3180e95c28669259f0dc5b5c", - "sha256": "1vyah8rxizx8gi5j17k1llii7i7nlqf2yw8nsqj4ky7q3dvy3zyy" + "commit": "df1a26d96683ebb06aa8476e4af6bbeddf23efbe", + "sha256": "1vi2h8lwfixpphh0kz5jiam43ld8ddzz71jspwfvmyhmyrriabb8" } }, { @@ -3492,21 +3506,21 @@ }, { "ename": "ansible", - "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", - "sha256": "17pfdyfv5z7bw0xhh8apqww8wsmvb5p5y0xs8048gh427mgw5yrf", - "fetcher": "github", - "repo": "k1LoW/emacs-ansible", + "commit": "db66ccdf93a7dde428808db839dfc42e1fb7a429", + "sha256": "0h4zh2w3hja9psfafdfy1i8bxial4l77ba778wvxnfgmx3kyab1p", + "fetcher": "gitlab", + "repo": "emacs-ansible/emacs-ansible", "unstable": { "version": [ - 20240212, - 325 + 20240624, + 1452 ], "deps": [ "f", "s" ], - "commit": "1d7de8d3ddac980715eebd87ee66859f8665b101", - "sha256": "1indmjrk3gwvxpigmn8lkdgnb841k2n8s2q4dsl8vppy4hfrl7aa" + "commit": "eebb2fb49d3c0a0586d1e4ead9ba618c7d003cae", + "sha256": "0ivmhavvi25kwz9kn5pf5kmsncwaqj4hzsf4i77c14sh8s0fjka9" }, "stable": { "version": [ @@ -3795,19 +3809,19 @@ "repo": "radian-software/apheleia", "unstable": { "version": [ - 20240517, - 2228 + 20240803, + 2322 ], - "commit": "61766b50b24fa16be519d77795dc63522e04dce8", - "sha256": "1zichs8b1kczzb63r1pwyiqzav7c0x8sxdvg0inv02w5wq96r2wc" + "commit": "3e347cff47eb0072b47c56f6188c4f440e477770", + "sha256": "1an8k1zgahsjscmdm5s4mp71afb1mf86s63vg3pc8kalj4yw9gbj" }, "stable": { "version": [ 4, - 1 + 2 ], - "commit": "7ba74c7cc28e4f0da4006968ecb8587133daa142", - "sha256": "10adk4l5090dy0as6xqv5qpgdc0vf7jy8s1nrsn3zgf6n3s3ffqb" + "commit": "3e347cff47eb0072b47c56f6188c4f440e477770", + "sha256": "1an8k1zgahsjscmdm5s4mp71afb1mf86s63vg3pc8kalj4yw9gbj" } }, { @@ -3870,11 +3884,11 @@ "repo": "Greybeard-Entertainment/app-monochrome", "unstable": { "version": [ - 20240406, - 36 + 20240611, + 1623 ], - "commit": "9324ec430a5154853c1da711e1c9738d61f1135a", - "sha256": "09jxb4b4lb19z2dfvpa0rjba89gcsphkx5d45p56rbb1b0i3h5iz" + "commit": "e319fcfeb56d0fe28bbda7fc813537593c2f368d", + "sha256": "0qgj8l22cyyxwknkwc0104nhi5kcswgx5amd1b67pmrxj6cni0ws" } }, { @@ -3885,11 +3899,11 @@ "repo": "alexmurray/apparmor-mode", "unstable": { "version": [ - 20240211, - 2243 + 20240801, + 505 ], - "commit": "05a67cba7508cf63bed22763a8949e55a7bf6786", - "sha256": "0644zfmrhlfrrgy5z21bp95885spcfxi93lv77gz070zzxk4ciq7" + "commit": "770f2f0356dbf56a5ae2e2d3abc11f317f5e2556", + "sha256": "0jlxy7q4p05d922cm1prxk06b9dzc791kly66gkflgkwl5jmwb3a" } }, { @@ -4105,11 +4119,11 @@ "repo": "motform/arduino-cli-mode", "unstable": { "version": [ - 20210511, - 653 + 20240613, + 640 ], - "commit": "9ff2c47a3b56cbffd41a62376f7c2ff16ccbf4e0", - "sha256": "1vj649nrj7f7r7vmp97z1llbgl7sd8vlxvn30l8kdfrfkyf4gq3q" + "commit": "3265507b5fe4173b3f452a9519c3d09a777f35fb", + "sha256": "1xsd0y5m59701gz1xcy0n95c80ggz5q2rf0m4dbbncp2pcmwmnl1" } }, { @@ -4120,14 +4134,14 @@ "url": "https://repo.or.cz/arduino-mode.git", "unstable": { "version": [ - 20220210, - 1355 + 20240527, + 1603 ], "deps": [ "spinner" ], - "commit": "652c6a328fa8f2db06534d5f231c6b6933be3edc", - "sha256": "16izwrk1dfsa14kylfhsxdwkx76g0jdk0znl1z7cypxh5q9ijy1x" + "commit": "b2ffd8441851659cb1cc844156073967729585e5", + "sha256": "0jk7l9y3x8p6c6m6qpg7vmzn3yirv0m5h483plq1i2qs8njk5v23" } }, { @@ -4404,20 +4418,20 @@ "repo": "Sorixelle/astro-ts-mode", "unstable": { "version": [ - 20230802, - 437 + 20240724, + 332 ], - "commit": "207e5da093aa8141b9dd2f5e98afd8952832b4b0", - "sha256": "0yfz5xdpwzbpihbnm5kixmjpqcmj86h6lm71ji8vzq044rassfga" + "commit": "78e7e942011839bd4f4de0a1d8460f5879ba4ca5", + "sha256": "1aqgpgxi1abfq2frpzrw5qphc3ca85n1l5f1isyhdigqrps8hpw2" }, "stable": { "version": [ 2, 0, - 0 + 1 ], - "commit": "688b7c9f661571fcd7d6d754a91e48a9938d8684", - "sha256": "00smy30cxx0n0v2r2pl4jh10vw3w0klhbgk14cbw3yq73gp29pmi" + "commit": "78e7e942011839bd4f4de0a1d8460f5879ba4ca5", + "sha256": "1aqgpgxi1abfq2frpzrw5qphc3ca85n1l5f1isyhdigqrps8hpw2" } }, { @@ -4461,11 +4475,11 @@ "repo": "jwiegley/emacs-async", "unstable": { "version": [ - 20240323, - 1912 + 20240811, + 1434 ], - "commit": "72b70b004505db2f06318fefd6b358704b9167d7", - "sha256": "00dpd202b9g2qpzb1ijbw8j69j2fxf0q3hdqrxpbhcagh22yn0qr" + "commit": "e1d46f97a56e0c57206bd1ea31d04311097a8cbb", + "sha256": "0ik0vb37nlrx6pg4x8dd3cm3b585a9fp6bgp341f5slr108k8nsg" }, "stable": { "version": [ @@ -4569,11 +4583,11 @@ "repo": "meedstrom/asyncloop", "unstable": { "version": [ - 20240407, - 1153 + 20240818, + 1247 ], - "commit": "46e38388870b238221a4d96017874309aada7660", - "sha256": "188633b7fxy94xpdafksxxh3hd9cahcrg1f62d6p2j0qvw9a9ly7" + "commit": "7d60950d160098a879293e049b9863bc955f8666", + "sha256": "1bykvwx85pmh67s4yi8rpi94yx6zrhb8hnah4z5whxviwql3z3ld" }, "stable": { "version": [ @@ -4618,10 +4632,10 @@ }, { "ename": "atl-long-lines", - "commit": "e3144a999d236d2718b4b7b94cfafe26c3e4aada", - "sha256": "0pb8ysvv2wi5vsv1wj1aac2khjwkjm4rvf70fa0cla4xmnnczxla", + "commit": "024ff21dffa39b76019a0acb81a69de318665055", + "sha256": "07dyrs95dxm9xaqlzvhidbrdxz90wh02qy8g87vrkqqy006g4h40", "fetcher": "github", - "repo": "jcs-elpa/atl-long-lines", + "repo": "jcs-legacy/atl-long-lines", "unstable": { "version": [ 20240101, @@ -4642,10 +4656,10 @@ }, { "ename": "atl-markup", - "commit": "42025212ccfe998023f7eb563588be76282d53de", - "sha256": "1123lbnc6hlycm6bg5f7292z7cdnp2iv0wb8mg0n0ydma524s6bm", + "commit": "a80fa33585eae3add2e3249862be6195e0bd3b37", + "sha256": "0w95jvphv0fzas61ah11fiy961f7c2p2w2kzs8n5ffmw69i1yl29", "fetcher": "github", - "repo": "jcs-elpa/atl-markup", + "repo": "jcs-legacy/atl-markup", "unstable": { "version": [ 20240101, @@ -5097,20 +5111,20 @@ "repo": "emacscollective/auto-compile", "unstable": { "version": [ - 20240415, - 1533 + 20240805, + 1931 ], - "commit": "01844064e3f2bb9f109a8a064998baf89a864fbc", - "sha256": "1syrwi1rb9w4y4fi8kckvd27i879w35y0sbmlhqpp2li0yx51wwa" + "commit": "5cc4e97443727554357f6c57614f12ca87419627", + "sha256": "1pgc4m73yxz0hivf6cclqiwmjmg9hs3ncggk7wa10p8scd39ky2p" }, "stable": { "version": [ 2, 0, - 0 + 3 ], - "commit": "4ba644f3e3e33afb2b263e9d184b6e2b70d5fadd", - "sha256": "1h0rq69flrjj65wa1x7x0ispm041qr2xrzs5qxciabhav2hs3hqh" + "commit": "5cc4e97443727554357f6c57614f12ca87419627", + "sha256": "1pgc4m73yxz0hivf6cclqiwmjmg9hs3ncggk7wa10p8scd39ky2p" } }, { @@ -5412,11 +5426,11 @@ "repo": "LionyxML/auto-dark-emacs", "unstable": { "version": [ - 20240322, - 44 + 20240711, + 2247 ], - "commit": "066f9723001647bec88b051e543b82366c9b7a42", - "sha256": "1r9pr8ars3341mh9mvybaigdq83i225rj3xr4c8c8lw93wl0pk0n" + "commit": "39b168e8e09b89ae8c8ef2388b895140901be48e", + "sha256": "1id8i9p6l46m1c09a7mz2335i168dj4q701d3a2q21i22lamhbff" } }, { @@ -5465,14 +5479,14 @@ "repo": "elp-revive/auto-highlight-symbol", "unstable": { "version": [ - 20240101, - 905 + 20240627, + 650 ], "deps": [ "ht" ], - "commit": "6194af718b758e10a0401104760b9d9cf96735db", - "sha256": "17rnhmnwmb5lrm8z8gps8sh8ni3c94ixwks09pfqvsj0mlvgiswc" + "commit": "fe230750fdd3de07f71e776cb3270754e0865234", + "sha256": "0y5jcx8fkljfcsl5g92fzwq4x0ifr843bi9hy452kwgim6afi9ri" }, "stable": { "version": [ @@ -6326,26 +6340,26 @@ "repo": "licht1stein/babashka.el", "unstable": { "version": [ - 20240417, - 1347 + 20240527, + 732 ], "deps": [ "parseedn" ], - "commit": "117138c0b7361e70282ee53825e2f4de1a782609", - "sha256": "1k3zy6y682g3sab0by6lp9bbx8w4m9npjpjkxhhxgcqhglhpqcm4" + "commit": "4ea9d7febf3e9d301c91231ba2833f3417ba9059", + "sha256": "0rjka55nbs76ykjfifwawm5knrsrhcx0q7dfaqvdjfzypz1r2bhc" }, "stable": { "version": [ 1, 0, - 7 + 8 ], "deps": [ "parseedn" ], - "commit": "117138c0b7361e70282ee53825e2f4de1a782609", - "sha256": "1k3zy6y682g3sab0by6lp9bbx8w4m9npjpjkxhhxgcqhglhpqcm4" + "commit": "4ea9d7febf3e9d301c91231ba2833f3417ba9059", + "sha256": "0rjka55nbs76ykjfifwawm5knrsrhcx0q7dfaqvdjfzypz1r2bhc" } }, { @@ -6447,28 +6461,28 @@ "repo": "tarsius/backline", "unstable": { "version": [ - 20240415, - 1533 + 20240805, + 1306 ], "deps": [ "compat", "outline-minor-faces" ], - "commit": "f070ebb33eb44087e07ff647d8d87d1b27ce40d4", - "sha256": "0d0dh67acqzqsys5rn0lfd8xwg4mhcyk32093s0qwybvsx42x7ng" + "commit": "9c791fb9a4a2e4a09443ec8b0da8f1f10890c0c6", + "sha256": "1gpfg0bvp0333aw9nfaa61nyd01linn9fhishfsyri167k3avihr" }, "stable": { "version": [ 1, 0, - 0 + 2 ], "deps": [ "compat", "outline-minor-faces" ], - "commit": "f1d9e1cd5cba6362b152b5f4227d1714918fba59", - "sha256": "0f7rcbmaggj644z3j1pq2sjg4c12g9s2k4c5x3yrirjgazxfpr8x" + "commit": "9c791fb9a4a2e4a09443ec8b0da8f1f10890c0c6", + "sha256": "1gpfg0bvp0333aw9nfaa61nyd01linn9fhishfsyri167k3avihr" } }, { @@ -6681,11 +6695,11 @@ "repo": "tinted-theming/base16-emacs", "unstable": { "version": [ - 20240421, - 101 + 20240819, + 340 ], - "commit": "c7ea8116d331fd9ce913267489e7846c34795b38", - "sha256": "07vziyp5nn1rxgx0z467yjahvm90w5f62h5ysggrp924ywwzblp5" + "commit": "c49bb721af8f15434731bccf42f64dd226c38733", + "sha256": "1bv537jys33jv8hkvpdw686wwqjq4k8d13bx8n0iq2j61zsx49fv" }, "stable": { "version": [ @@ -7779,26 +7793,26 @@ "repo": "tarsius/bicycle", "unstable": { "version": [ - 20240415, - 1533 + 20240810, + 2050 ], "deps": [ "compat" ], - "commit": "0ac08d9946f0da7066a6c2242025b42983c0c2e8", - "sha256": "1pp8m5ai7353jzm54laxg3l1c3xfsk32dlrg8wnpz6cgqkd47ajs" + "commit": "80858c93ba5e24b89f1ccc6e4b21548f3eec35ae", + "sha256": "0l3lfx362vpbix3hq0hrimxdgv2s4nx1kg7ldsk5qnv8yxmf3xh6" }, "stable": { "version": [ 0, 4, - 6 + 8 ], "deps": [ "compat" ], - "commit": "dfc0c874d66d671cbb15149db27134e4ff4f54b8", - "sha256": "13aaz5fzdbplaf78713ax5f8v3qd7ggafdh1pgnc1mv4a37bjkl8" + "commit": "2f1f037af123df2b8c971f0137da87e55813eefa", + "sha256": "0q0cd4xyw0wi6hyj9d914mwvm57vglh82r8mc29rca21ss143id5" } }, { @@ -7966,14 +7980,14 @@ "repo": "rnkn/binder", "unstable": { "version": [ - 20230729, - 350 + 20240630, + 725 ], "deps": [ "seq" ], - "commit": "859d89c00e21c83565ed2b45f8d7527b45b1292c", - "sha256": "0da3wx93rbsy9y1hd5w722sgblg5bffznw00vyylwnq5zaikh5lp" + "commit": "a17eb5089bbab05372c018e67b3da9aa25217d81", + "sha256": "0nbczlvcdygfjy0grlxqpc5ygnwk8nyxi3pk8kkgp681c19bcpdi" }, "stable": { "version": [ @@ -7984,7 +7998,7 @@ "deps": [ "seq" ], - "commit": "3cf7c254703f5c3a90c2cd617b522d09e7913c7b", + "commit": "9881ca21d30400681e0b3de404e5cc020e060209", "sha256": "01y9yd1rvi1ll3pp2i44g7ivkvz1cvc22207f8a3dbv90jw4c66m" } }, @@ -8020,14 +8034,14 @@ "repo": "liuyinz/binky.el", "unstable": { "version": [ - 20240519, - 732 + 20240525, + 715 ], "deps": [ "dash" ], - "commit": "f2fe74321f87dfe46421a7a7aaaec30b7f831059", - "sha256": "17h4jypfhlc7wbw3k7mr8l9hz3f5ji77xxi80i6p7mj5613j26fc" + "commit": "39c1a1e78aea36f79104fdc256949901e3d3d2c0", + "sha256": "086rcvdr58c9p2snqgh2mdnmrdigkzn8909a6ncg9c3j18x55bzj" }, "stable": { "version": [ @@ -8142,16 +8156,16 @@ "repo": "canatella/bitbake-el", "unstable": { "version": [ - 20220509, - 1236 + 20240605, + 1322 ], "deps": [ "dash", "mmm-mode", "s" ], - "commit": "434b088ab8715731d62978264cb934e34c75c4b3", - "sha256": "15p265zigxki80h3gfq61cmssqqwcnp0990zl8xmj8p377523l6m" + "commit": "8285f46fe19cb99fe5ed42d38de0fe5c51c98fb0", + "sha256": "1a929lxra50f99vc865iy2icprq3m40zg2zsgr5hxd2pvcpch927" } }, { @@ -8313,28 +8327,28 @@ "repo": "Artawower/blamer.el", "unstable": { "version": [ - 20240512, - 1514 + 20240701, + 1909 ], "deps": [ "async", "posframe" ], - "commit": "4cc2e6daaecf84c8dd00792f86724413423293a6", - "sha256": "1xyx1gls4d9xzlfwr0xkbblk8mzk3xhwbdqlag1xxdqnd1z96n5n" + "commit": "a6526820ac37a2ab041c4abda57b78f133299bf2", + "sha256": "1snm5k56142drdi84vg328yzl00l0fm4sl704pnk9bj6wb28l6q2" }, "stable": { "version": [ 0, - 8, - 0 + 9, + 1 ], "deps": [ "async", "posframe" ], - "commit": "e249fa3ae23cfc013883bcc138ef9f46107acb0c", - "sha256": "03wvmhv4m7am4hhy0m454bn1c2cvpi33z2sxdwf9fnfd5drwhrgm" + "commit": "281963da789fe9e47ce9efc4f7a9c4d19bf3a405", + "sha256": "0imqw1nczhi2wvl7wzbiwdh0rf2gklrl1ck5wrr2lg26hkjs0fmz" } }, { @@ -8876,16 +8890,16 @@ "repo": "jyp/boon", "unstable": { "version": [ - 20240314, - 920 + 20240628, + 703 ], "deps": [ "dash", "expand-region", "multiple-cursors" ], - "commit": "9e006726be9ac508e0bb0393393abce06f7493f4", - "sha256": "0n11869w4806lak36x54rfwsnckrv7ydp3lzmdbjcq48mcsh1jjg" + "commit": "19a7f76e75759f5266986b40c470edb1f70c43df", + "sha256": "1cv6hf3lfhbxaqv0r4d56gfw956mq5ylv2c85hcfhv5jmj4k69w8" }, "stable": { "version": [ @@ -8903,34 +8917,34 @@ }, { "ename": "borg", - "commit": "af5c1593052d63146e850683c461a760ab166033", - "sha256": "0gn4hf7hn190gl0kg59nr6jzjnb39c0hy9b3brrsfld9hyxga9jr", + "commit": "6a9de9fbe3147c9816ac909cfe365e66e888f9b7", + "sha256": "10nszv2wwzp5g95wgw2yj9n0na1a8rp6iy84b4myhpii9bvs5bd6", "fetcher": "github", "repo": "emacscollective/borg", "unstable": { "version": [ - 20240415, - 1553 + 20240817, + 1958 ], "deps": [ "epkg", "magit" ], - "commit": "dfc5d58b439042a6e323cb342ab7531692d118a0", - "sha256": "02rq0ps327v8xlhs69r0cxicg4kljcza8ha7gks7z728hprwvhdl" + "commit": "ad76a76424654d77b2b5d95472d86c03ce2c5410", + "sha256": "0vfyxd8si7ffwy1jryqk0d92zn0g3w09xr8130ikksazwqjfqzvx" }, "stable": { "version": [ - 3, - 3, - 1 + 4, + 0, + 0 ], "deps": [ "epkg", "magit" ], - "commit": "66f00318777a3530741535f64a420addc1ccf44a", - "sha256": "0w180am9p952j2iyidf5krivlx19mv1ji1f34cwm969mhb3652fy" + "commit": "e7a5a696d776f2b61c38335a8cec6108f4af2166", + "sha256": "1aclajsxr2nqd0mamr50j8xlgzk7pycigjw3n5wi6yr5c37pq30p" } }, { @@ -9069,11 +9083,11 @@ "repo": "museoa/bqn-mode", "unstable": { "version": [ - 20231217, - 1203 + 20240721, + 2036 ], - "commit": "23fd9db096ab3a5c5fbd034e721b8a7d27d1d6b7", - "sha256": "0nlwhk353fdl3jwmi1c6mz5898mh717lvldv9jypj9jdipcw6icc" + "commit": "80f6be6ca678d2f072be7a39e88b10d3c56e63e5", + "sha256": "1nwa39yslizdqkh8wixx55b153gri8gnj68s6b612jn8mry1dgny" } }, { @@ -9141,11 +9155,11 @@ "repo": "Michael-Allan/Breccia.Emacs", "unstable": { "version": [ - 20240507, - 504 + 20240620, + 1213 ], - "commit": "dafb49308796f75db802e2d23596dfd3fb7e37b0", - "sha256": "1fb20vhszf7la1skzy093m6kl3q3akicirbpdp0vhd3xs47jzk1h" + "commit": "942e042cc22224ec3940d0867c8c08f71e036924", + "sha256": "06ps4swqyf4b8pv3x51wqsnpkxp9dmq089rbyvhn4rp7rix8y8x7" } }, { @@ -9156,25 +9170,25 @@ "url": "https://bitbucket.org/MikeWoolley/brf-mode", "unstable": { "version": [ - 20230803, - 2022 + 20240702, + 1846 ], "deps": [ "fringe-helper" ], - "commit": "8875f5fcd173e220bbfa6bf9f8f09d721a29cd50", - "sha256": "0iqakgg7yz409776p14adg4vdn9ik0mf95vhzx23g3pd79lv34wb" + "commit": "495d69e5c615a27d928592e0c6c8184e869a23f2", + "sha256": "0klw4fgayyaj0pga3n6bq1zhr90mwih4v0qxdi6kp6vwyf1ffm96" }, "stable": { "version": [ - 1, - 25 + 2, + 0 ], "deps": [ "fringe-helper" ], - "commit": "ca6f9869707dab5929e1da9e13bdf602207bc7f9", - "sha256": "15qq87fhdb99qd9ndxpprk43ip1mk57k1f7gin2yv8wdvv36n6bz" + "commit": "495d69e5c615a27d928592e0c6c8184e869a23f2", + "sha256": "0klw4fgayyaj0pga3n6bq1zhr90mwih4v0qxdi6kp6vwyf1ffm96" } }, { @@ -9327,11 +9341,11 @@ "repo": "agzam/browser-hist.el", "unstable": { "version": [ - 20240402, - 2345 + 20240607, + 406 ], - "commit": "0b7e93274173e82c05e5d9c9d3055e4b9017612a", - "sha256": "0jsq1sk4vbs3r7lhz28a550w88qq0mj6y2ra5ry351dnxsypsmsn" + "commit": "0372c6d984ca194d9454b14eba6eadec480ec3ff", + "sha256": "0s19gglc9jwapy7a9mf4i97a7r5q9lpm2ivvn0zjhqxcmzj3295j" } }, { @@ -9357,14 +9371,14 @@ "repo": "plandes/bshell", "unstable": { "version": [ - 20230805, - 1646 + 20240112, + 2303 ], "deps": [ "buffer-manage" ], - "commit": "57f3409168ec9649508e3ee30d0d2de8f81b960e", - "sha256": "1pmaz7gw45y7mlina3h0db26khdsbmlcw7adkvri33sgrr9x83q7" + "commit": "d59559cf7c5dded8b9639346ae5c1384d8b9be4e", + "sha256": "0shfv1lxhz5k07jppdn0shm0pv1lzwsncfyniwm15fwhvb71bzhv" }, "stable": { "version": [ @@ -9379,25 +9393,6 @@ } }, { - "ename": "btc-ticker", - "commit": "f78796a8835ec44f4d13c99559fd4d113c6f4f29", - "sha256": "1vfnx114bvnly1k3fmcpkqq4m9558wqr5c9k9yj8f046dgfh8dp1", - "fetcher": "github", - "repo": "niedbalski/emacs-btc-ticker", - "unstable": { - "version": [ - 20220409, - 1647 - ], - "deps": [ - "json", - "request" - ], - "commit": "2ed18ac6338d5fe98c578f0875840af07f0bc42a", - "sha256": "0hx96ah2y1s5hj5f3i2y50v1m0lfphg71sr4fhssjls0yvl995sr" - } - }, - { "ename": "bts", "commit": "0d2f9c2f465b06c97cd03c5644155cd6c7fade24", "sha256": "1i1lbjracrgdxr52agxhxxgkra4w291dmz85s195lcx38rva7ib3", @@ -9990,14 +9985,14 @@ "repo": "alphapapa/burly.el", "unstable": { "version": [ - 20231218, - 1045 + 20240727, + 545 ], "deps": [ "map" ], - "commit": "6626df0c2054cb0662bf113ba4cbad641b588d0f", - "sha256": "10ggzbg04midvk932cj9vzg7ni5w97yn1gmx4mj0h5yr7h1lwzhp" + "commit": "d5b7133b5b629dd6bca29bb16660a9e472e82e25", + "sha256": "18qq5zsmb9gg701158dwx7qkh2l5m4m029lmgmydchi9xb2g9as9" }, "stable": { "version": [ @@ -10142,11 +10137,11 @@ "repo": "jorgenschaefer/emacs-buttercup", "unstable": { "version": [ - 20240328, - 2016 + 20240718, + 14 ], - "commit": "a1a86b027ffe030e1c78a9f43c50cd20a6fed19a", - "sha256": "0s5c7ia7b873dr6rqljkb1z4bf84zb3p3wjvcvpjhdcnf67m5x10" + "commit": "dfbef2177209e3a045e981b7d2956ec46ce3b25b", + "sha256": "1vgk6v22pldgi62f3gf816hdzbxfrl3sg4snxs0snfzb16si1bpc" }, "stable": { "version": [ @@ -10672,8 +10667,8 @@ "repo": "chenyanming/calibredb.el", "unstable": { "version": [ - 20240507, - 456 + 20240714, + 642 ], "deps": [ "dash", @@ -10683,13 +10678,13 @@ "s", "transient" ], - "commit": "8ca1b5262f0f0e4a0e295efc2c14db00333e9a85", - "sha256": "0f3fqgl8kqb1r3dcfd9fn0sh68ky2l13mmd6hqib7lmg4lf7aljz" + "commit": "bb9cfb5e5f9c2bb45386c1a9d1273a7832f8c28b", + "sha256": "0hmcmwmcv951v9bl8cr1cij6pkak84b9frr7h4aiydw6jpb0lcaa" }, "stable": { "version": [ 2, - 12, + 13, 0 ], "deps": [ @@ -10700,8 +10695,8 @@ "s", "transient" ], - "commit": "1e09bd7cdf7e3274a0f43a66bba3121ea6b42f4a", - "sha256": "1l30s3wv21mpybbxni5fziq2awai9k60i87s6fid56hg262r7jp0" + "commit": "a12746cdd2605eba0ff88706473a04492dec84a2", + "sha256": "1a4gyc3gcq18j29pw2i296d70nvx5fbzlw9fdmqwzncciqz5as6m" } }, { @@ -10851,25 +10846,25 @@ "repo": "minad/cape", "unstable": { "version": [ - 20240517, - 2216 + 20240818, + 1414 ], "deps": [ "compat" ], - "commit": "a71e5c96564163837810b96bd34322b42f6e4d9c", - "sha256": "0rwkn8p8p7axrh46x9cp3f90n5ic0dpm409pjn627s9sbz0j2vkj" + "commit": "944c60cc3ff81ceceeb239746f7dd9d8e7d0a663", + "sha256": "1y043hha07bi4q6wnq1sii8g4fihmm458xsvlk55p43c3dph1ms9" }, "stable": { "version": [ 1, - 5 + 6 ], "deps": [ "compat" ], - "commit": "bf22aa6ce0ffca1a1a77b693dddcd05eddc386f0", - "sha256": "1ah0nwib2k46467j0fhq9kckx7cqnjgwpdb7zk9jw8rbrjlndcpw" + "commit": "5c468d6d657e8dc604ddf3feb80f70e1e05ac0a1", + "sha256": "0bkkb4fpga7r0rmyj8i621xmn5s0l7w49xyj1byy8z4rgl73zlhb" } }, { @@ -11212,27 +11207,95 @@ } }, { - "ename": "casual", - "commit": "8eeb0f07cd1b2fff661cf6523390e81adfc060ba", - "sha256": "0d33xs732pnc4z29w13amslpx9qqbaxms7apqdwxcsyr8jsvybw0", + "ename": "casual-avy", + "commit": "1650f2d8352c64072794a1563f5b7728206acebd", + "sha256": "18rbw3mkmvadh517zcapfqfrmxb91xpp0dsmpdvcg3x05208dg20", "fetcher": "github", - "repo": "kickingvegas/Casual", + "repo": "kickingvegas/casual-avy", "unstable": { "version": [ - 20240416, - 2237 + 20240714, + 202 + ], + "deps": [ + "avy", + "casual-lib" ], - "commit": "a22cf128c3baa3e11f6aaff7dc44ef91cf0fe9ce", - "sha256": "0sx3hqpp8ikp3avzcj4d601zh80rs7qi2azl0vmgc4ymrd7g1af8" + "commit": "0f9072dc98b1af9200cf03c15b776cbd901333fc", + "sha256": "120dnixi8if8v4s4xr0lilpbkikk93v5icf16fydsd143q8x81gg" }, "stable": { "version": [ 1, - 5, + 4, + 1 + ], + "deps": [ + "avy", + "casual-lib" + ], + "commit": "0f9072dc98b1af9200cf03c15b776cbd901333fc", + "sha256": "120dnixi8if8v4s4xr0lilpbkikk93v5icf16fydsd143q8x81gg" + } + }, + { + "ename": "casual-bookmarks", + "commit": "19999b89a2fb2eddd3edbf0df4b9c674b4c2ef29", + "sha256": "18w9l94y9zzvdib8im232asw7vhqq49qhylph07ilj5gmqawdwfh", + "fetcher": "github", + "repo": "kickingvegas/casual-bookmarks", + "unstable": { + "version": [ + 20240806, + 2233 + ], + "deps": [ + "casual-lib" + ], + "commit": "d105638d9440581c4557a76f4d042a64b34e10ab", + "sha256": "18i4agmm00vn8lzjlnxm6iqgdfsww8yc0zx8isfjliw0c52licyl" + }, + "stable": { + "version": [ + 1, + 1, 0 ], - "commit": "a22cf128c3baa3e11f6aaff7dc44ef91cf0fe9ce", - "sha256": "0sx3hqpp8ikp3avzcj4d601zh80rs7qi2azl0vmgc4ymrd7g1af8" + "deps": [ + "casual-lib" + ], + "commit": "d105638d9440581c4557a76f4d042a64b34e10ab", + "sha256": "18i4agmm00vn8lzjlnxm6iqgdfsww8yc0zx8isfjliw0c52licyl" + } + }, + { + "ename": "casual-calc", + "commit": "47f061be179f0c7f8b86faa99ff0d3e9d8552ac1", + "sha256": "1c0wk9zbh7rzi9s0jcdxnzxy989545ccz1xmj7cs9jw4dq0i63z6", + "fetcher": "github", + "repo": "kickingvegas/casual-calc", + "unstable": { + "version": [ + 20240811, + 103 + ], + "deps": [ + "casual-lib" + ], + "commit": "a304f1ad086fad8cd78087f6b541940bf36d20d0", + "sha256": "0arc034pxqgc0ic4x880fmdj9mr8cj4npd32aah90mlh1ys81zfa" + }, + "stable": { + "version": [ + 1, + 11, + 2 + ], + "deps": [ + "casual-lib" + ], + "commit": "a304f1ad086fad8cd78087f6b541940bf36d20d0", + "sha256": "0arc034pxqgc0ic4x880fmdj9mr8cj4npd32aah90mlh1ys81zfa" } }, { @@ -11243,11 +11306,134 @@ "repo": "kickingvegas/casual-dired", "unstable": { "version": [ - 20240517, - 2348 + 20240811, + 2038 + ], + "deps": [ + "casual-lib" + ], + "commit": "9f0b49035c8bf16e0b3c1869709ce4a86fc2f31c", + "sha256": "024dyyk05r9kpvjizcr3lqn5kz4kwv8vkp66h2q2bf0k03vaj40c" + }, + "stable": { + "version": [ + 1, + 8, + 0 + ], + "deps": [ + "casual-lib" + ], + "commit": "9f0b49035c8bf16e0b3c1869709ce4a86fc2f31c", + "sha256": "024dyyk05r9kpvjizcr3lqn5kz4kwv8vkp66h2q2bf0k03vaj40c" + } + }, + { + "ename": "casual-ibuffer", + "commit": "de711e92fd2f8ff1c626c3f7f789f402e8e92007", + "sha256": "1gynvk22nhm8l7dix7hracr7m3y3d0h065mplkj78hpx2pkmhvja", + "fetcher": "github", + "repo": "kickingvegas/casual-ibuffer", + "unstable": { + "version": [ + 20240730, + 329 + ], + "deps": [ + "casual-lib" + ], + "commit": "877bffe4e69f2715f5f84ad15ca54f4a14493b80", + "sha256": "0gpklvr70vwkhsbb0s9khaj4mv8mizdyjrag8q6f5ajivaxp67vi" + }, + "stable": { + "version": [ + 1, + 1, + 3 + ], + "deps": [ + "casual-lib" + ], + "commit": "877bffe4e69f2715f5f84ad15ca54f4a14493b80", + "sha256": "0gpklvr70vwkhsbb0s9khaj4mv8mizdyjrag8q6f5ajivaxp67vi" + } + }, + { + "ename": "casual-info", + "commit": "1b06cc08de41e82f3f148aa9e35663e2e06427ae", + "sha256": "1d6jmjhc0xalw1ll15k69bazbvprmw519lcsm2gd2jpkbngw9rmy", + "fetcher": "github", + "repo": "kickingvegas/casual-info", + "unstable": { + "version": [ + 20240711, + 712 + ], + "deps": [ + "casual-lib" + ], + "commit": "23f970d58e5f3c2dc9fa291bdce5f9e560fb205c", + "sha256": "1s23pzmx2l5cs8n43yimf0fizxi0g7km9nxmv98gazkqb6shbqpz" + }, + "stable": { + "version": [ + 1, + 3, + 1 + ], + "deps": [ + "casual-lib" + ], + "commit": "23f970d58e5f3c2dc9fa291bdce5f9e560fb205c", + "sha256": "1s23pzmx2l5cs8n43yimf0fizxi0g7km9nxmv98gazkqb6shbqpz" + } + }, + { + "ename": "casual-isearch", + "commit": "7280670087e28ed08575c71165c095ee7be7da49", + "sha256": "02qb1bpx30cxyjrd821g4qc5v7xwv4rc1f67p1dx3fglms8p2zc5", + "fetcher": "github", + "repo": "kickingvegas/casual-isearch", + "unstable": { + "version": [ + 20240808, + 1638 + ], + "deps": [ + "casual-lib" + ], + "commit": "812355ca972c81d9a31611572c490a2ea8ed8881", + "sha256": "1kpwq046lw1sp07grxf9qlgnhiar32r65flrgbnyqafwgy95biky" + }, + "stable": { + "version": [ + 1, + 8, + 3 + ], + "deps": [ + "casual-lib" + ], + "commit": "812355ca972c81d9a31611572c490a2ea8ed8881", + "sha256": "1kpwq046lw1sp07grxf9qlgnhiar32r65flrgbnyqafwgy95biky" + } + }, + { + "ename": "casual-lib", + "commit": "fd3bb4b191bf416dd419c5c76d510c7f5890e673", + "sha256": "18g739n2dbcywamvkkpnrhsmmnk1l5b9v05d173b9qq1fj06pn8p", + "fetcher": "github", + "repo": "kickingvegas/casual-lib", + "unstable": { + "version": [ + 20240815, + 1946 + ], + "deps": [ + "transient" ], - "commit": "d49c5c84d222ff8db2038d1f25b32c607a46c8b6", - "sha256": "0rn71abqr198ww6v6fi813dnb4lgi1nsmgk7vw482znnd4jyw937" + "commit": "db18e23ca60c9b0ba21644d54bb343a1099c6dbb", + "sha256": "1y45iqswhib9bfwbqfmlvxmfdn0wcvyfy696skn2cr7sn2q0n8a3" }, "stable": { "version": [ @@ -11255,8 +11441,85 @@ 1, 2 ], - "commit": "d49c5c84d222ff8db2038d1f25b32c607a46c8b6", - "sha256": "0rn71abqr198ww6v6fi813dnb4lgi1nsmgk7vw482znnd4jyw937" + "deps": [ + "transient" + ], + "commit": "db18e23ca60c9b0ba21644d54bb343a1099c6dbb", + "sha256": "1y45iqswhib9bfwbqfmlvxmfdn0wcvyfy696skn2cr7sn2q0n8a3" + } + }, + { + "ename": "casual-re-builder", + "commit": "4963d8a23ffb1ed7222f3672e35239798ee1560d", + "sha256": "0li8vx0vq8abjnnssm2kx29mqzlpc7x8gcxjl1n4za315m3007wb", + "fetcher": "github", + "repo": "kickingvegas/casual-re-builder", + "unstable": { + "version": [ + 20240730, + 49 + ], + "deps": [ + "casual-lib" + ], + "commit": "f52e0f2ae1faee0d2988fe701880f13fda66ab86", + "sha256": "1j9mqj1xf09q1iwkxrgz2k83dcaa214khk3xcmndbl0c86amzd0z" + }, + "stable": { + "version": [ + 1, + 1, + 1 + ], + "deps": [ + "casual-lib" + ], + "commit": "f52e0f2ae1faee0d2988fe701880f13fda66ab86", + "sha256": "1j9mqj1xf09q1iwkxrgz2k83dcaa214khk3xcmndbl0c86amzd0z" + } + }, + { + "ename": "casual-suite", + "commit": "4294e2c5d538ee9e1f2a59ad0c32efcd7a6affd2", + "sha256": "1qbym111j4yjbkb87h31lnkx9c7jbzqgd9b2m2f9fkc1zj9ddkn9", + "fetcher": "github", + "repo": "kickingvegas/casual-suite", + "unstable": { + "version": [ + 20240730, + 426 + ], + "deps": [ + "casual-avy", + "casual-bookmarks", + "casual-calc", + "casual-dired", + "casual-ibuffer", + "casual-info", + "casual-isearch", + "casual-re-builder" + ], + "commit": "328c9a02af56d56fe794fb073c0b720cb7ff7efc", + "sha256": "09n9b1g6diclj3wvy3nqig4a7hq9l1y8fjga7y5zn51bawmk6spd" + }, + "stable": { + "version": [ + 1, + 4, + 1 + ], + "deps": [ + "casual-avy", + "casual-bookmarks", + "casual-calc", + "casual-dired", + "casual-ibuffer", + "casual-info", + "casual-isearch", + "casual-re-builder" + ], + "commit": "328c9a02af56d56fe794fb073c0b720cb7ff7efc", + "sha256": "09n9b1g6diclj3wvy3nqig4a7hq9l1y8fjga7y5zn51bawmk6spd" } }, { @@ -11291,11 +11554,11 @@ "repo": "catppuccin/emacs", "unstable": { "version": [ - 20240326, - 900 + 20240818, + 734 ], - "commit": "3d93abaa33e95f19b4a8b0e1e9bef1e3e68dd994", - "sha256": "1j6nsy9is067288x2riabb7kc3grghb2g7bkvwndn2jyglbbxgi0" + "commit": "0b4a7e43b80aedcb7a8088ce0ab4928bd34d5f95", + "sha256": "0875x96djls8yhk1j6g6rl9pml8zyx4r5vysbqjda1m98vdm23np" }, "stable": { "version": [ @@ -11382,30 +11645,6 @@ } }, { - "ename": "cc-isearch-menu", - "commit": "63dbaed255d4c0f263d534077b33c9cffec50b1b", - "sha256": "00jb1m3fdlp3pn75c67phshb22shyhga31s3wf1s7wldandrbkwj", - "fetcher": "github", - "repo": "kickingvegas/cc-isearch-menu", - "unstable": { - "version": [ - 20240401, - 48 - ], - "commit": "6eecc77a89ea63cab69fc8eb6dd1c32ad582b05b", - "sha256": "057bsx330da9vpn0292gxzn9gary5piqinmrw8hk072iwgk6kdwi" - }, - "stable": { - "version": [ - 1, - 4, - 1 - ], - "commit": "6eecc77a89ea63cab69fc8eb6dd1c32ad582b05b", - "sha256": "057bsx330da9vpn0292gxzn9gary5piqinmrw8hk072iwgk6kdwi" - } - }, - { "ename": "ccc", "commit": "7375cab750a67ede1a021b6a4371b678a7b991b0", "sha256": "0fckhmz4svcg059v4acbn13yf3ijs09fxmq1axc1b9bm3xxig2cq", @@ -11600,15 +11839,14 @@ "repo": "ema2159/centaur-tabs", "unstable": { "version": [ - 20240521, - 2204 + 20240813, + 1143 ], "deps": [ - "cl-lib", "powerline" ], - "commit": "3346b23545932c73c4c88a4cdb54778ecff95443", - "sha256": "1p2jllqv6d5xh1j06y9844msww56ldinnil8c1zd9jd4q6jsvnrz" + "commit": "ecee903518f1650421891f6c7bf521f200e22765", + "sha256": "0npi4r8bzbsha5m2zi77srlwyak6fk35xcmqyzl233dm7k9yi4sv" }, "stable": { "version": [ @@ -11828,7 +12066,7 @@ "repo": "worr/cfn-mode", "unstable": { "version": [ - 20240519, + 20240811, 805 ], "deps": [ @@ -11836,8 +12074,8 @@ "s", "yaml-mode" ], - "commit": "6ef789934d6b9b78cdbe5c90703f4afead736ead", - "sha256": "04hynyv60g9y3z76zlwvgfqmm4i9450skxhx0r8bw9m8yf04841i" + "commit": "4784f043b214aa38c0c2c7f01e67802832a6c380", + "sha256": "0zjwf654wf6d18jgn1kw8ll6pb476jqzrlixzlf8bbygsypw5pr8" }, "stable": { "version": [ @@ -11927,11 +12165,11 @@ "repo": "GrammarSoft/cg3", "unstable": { "version": [ - 20240430, - 2040 + 20240808, + 1902 ], - "commit": "06fb61345a4f3aae4bda74f3dfe261b1ec9d902d", - "sha256": "1bvbwk79wd13gvfa99ngz2z00b6wc2w8fh1py27zk024hxqbhf3v" + "commit": "07e099991185330b1d14e940e6e0e1d203972183", + "sha256": "1d4z03n8bl00axrkdkknmw48dlsf83s4fbh5gw9dcd01a41157dh" }, "stable": { "version": [ @@ -12101,14 +12339,26 @@ "repo": "xenodium/chatgpt-shell", "unstable": { "version": [ - 20240517, - 2003 + 20240816, + 737 ], "deps": [ "shell-maker" ], - "commit": "910b0ad5cdb633f6be64f88596219a7eb58af226", - "sha256": "1mqdgsy1l9lc94cg1q8gzm7phc3f4rafk39cjlf5i9a1wai7f7p6" + "commit": "0efead292f053774bba3c0789370e8e383aa49ec", + "sha256": "0bqc5d93nplfhhcfh1605pi6ymqbb15774f7ij58wvy98yb5rh0s" + }, + "stable": { + "version": [ + 1, + 3, + 1 + ], + "deps": [ + "shell-maker" + ], + "commit": "6fb85746bd0d316c97e375dcc14eb5314778e74d", + "sha256": "1kkq4wxkhv7cgksjpbdzm0r9x17y3sra1zk6h0213w4fi20z06lc" } }, { @@ -12527,26 +12777,26 @@ "repo": "breatheoutbreathein/chordpro-mode.el", "unstable": { "version": [ - 20231205, - 26 + 20240819, + 649 ], "deps": [ "compat" ], - "commit": "a63fc0b7181299befc4496cba04e0f84d5953000", - "sha256": "0b2psymnp5bvx1ags4dx0xpm852bygrslk2qj4c8br5g89xh3pil" + "commit": "75b5d36f56ede3af921126ea63bf9639c8dfedb5", + "sha256": "0b6mv3qlkc4cylhynkbzxb1h2qwfcw9jsd3pw331i8cg30rsggqy" }, "stable": { "version": [ 2, - 2, + 3, 0 ], "deps": [ "compat" ], - "commit": "5dd6e08bda7caea872d56b01d83080e5465d3548", - "sha256": "0jvw1pkncr27x86iyh51hkhxsnxl37rj4zrpdis2vk7hghqxca1v" + "commit": "1cff95d5974d1fb13c4e3e76176270a1342ea176", + "sha256": "10vhbjds90pwa2yfna5yfg2h4fvbccrd7fkqw932wc2h4fm84pb5" } }, { @@ -12557,11 +12807,11 @@ "repo": "galdor/chroma", "unstable": { "version": [ - 20230503, - 1210 + 20240716, + 1131 ], - "commit": "e6ebe08ce439b0dd8cfd2a0a78abf34f195feb3c", - "sha256": "1j8zap0jx0dx4f7n7851ipmky70cnq6ixz2jnpmdccpk4w6w6cv6" + "commit": "89324b476498bdfc657079040cfbbe33d1da48a3", + "sha256": "1zjcmaav6rfirbarqhdaicb7c1sgv90ya704ldmbl7xfi96s7z0v" }, "stable": { "version": [ @@ -12596,16 +12846,16 @@ "repo": "contrapunctus/chronometrist", "unstable": { "version": [ - 20230712, - 1532 + 20240807, + 1850 ], "deps": [ "dash", "seq", "ts" ], - "commit": "dbbcdfd4398cc2845a20aca4161358fafcb60c65", - "sha256": "1dq7gnvcck1sg7d8xr93inljfdc736kdlg8y4fa3796mbwb22vl9" + "commit": "fdeeba0c0f23cd0ebfa76d5ec2bf4e5e93f87941", + "sha256": "1xf7bnqxigc4c3pprv4b6hajc1dr33qsdnwfxjcfpk087xf48a1a" }, "stable": { "version": [ @@ -12711,11 +12961,11 @@ "repo": "DarkBuffalo/chronos", "unstable": { "version": [ - 20230804, - 1712 + 20240525, + 1339 ], - "commit": "517c53f57c54ec64e1bc870a63b0f4cf1772fcf1", - "sha256": "009wc3hb2mflcpk0jdifvppjjj7m5gzgcf1s4x1knsrzqhmm9vxz" + "commit": "5ea0bf7c3881ea905e280446342539b242401979", + "sha256": "1175kx6nbkl6s8qdfjsd4vv4n0g2yd5wf8vbj31z8rk45fv4gnv2" } }, { @@ -12737,6 +12987,21 @@ } }, { + "ename": "chyla-dark-theme", + "commit": "bdae382c677e77d005fa08fa0ce7d7984e6ead86", + "sha256": "0pbywy3l44qanw4xbiav7djxr0kgghhdc9z5294mgxaka9m6z54f", + "fetcher": "github", + "repo": "chyla/ChylaDarkThemeForEmacs", + "unstable": { + "version": [ + 20240708, + 2033 + ], + "commit": "8d5c9a2eaaf04e0f1ad953a34b15e9777407b760", + "sha256": "0lx51z5iwm0wz9c8d2fjx9974z2rp48q50dljvcfw795zgbdm79b" + } + }, + { "ename": "chyla-theme", "commit": "5c55eebf8df165360ce1e5d18e484c90f296fe52", "sha256": "1mgr6483bjjwk8bi6kijyw61s52nq6g2svhy5n1jnffi3gaw7hl5", @@ -12744,11 +13009,11 @@ "repo": "chyla/ChylaThemeForEmacs", "unstable": { "version": [ - 20231220, - 1545 + 20240708, + 2017 ], - "commit": "4d4b9dca3547e919ed5311cc7d04821f77860fbd", - "sha256": "1b41ar0ii5ikfi3hxss2maxgn2lx3kxzizpr9kf5218kmhjy3fh2" + "commit": "c2bb425eaff0975e0c7081f282d291f7853f8376", + "sha256": "0iqi0qfkwjhvqhs9yvs6pqbinp4jb6sj6fym4m69174fyqkjhc1b" } }, { @@ -12759,8 +13024,8 @@ "repo": "clojure-emacs/cider", "unstable": { "version": [ - 20240522, - 1030 + 20240815, + 918 ], "deps": [ "clojure-mode", @@ -12771,13 +13036,13 @@ "spinner", "transient" ], - "commit": "5a477c58dca86cbee723ddb2d0670689f53c47ed", - "sha256": "075ikfwrn3n0czzlj2233y7d0ljal8hwzab1vqhfl100q61j0hrj" + "commit": "144811a819b469cd797c88ec1f24119cfa8454af", + "sha256": "0lydhza3jy60y5wcqgaikbq3wa2gv4n4d4rkbbkqm6kbm5mphk5j" }, "stable": { "version": [ 1, - 13, + 15, 1 ], "deps": [ @@ -12789,8 +13054,8 @@ "spinner", "transient" ], - "commit": "06dc45844ad05fe23fccb7dec1609404e3cda88e", - "sha256": "0aswxqhdhxm2hx8cvpa47siah1d8n7kswdj1p7nplzqzzqzcy34h" + "commit": "810337cee931d9f14aa16550a74516f8337a47f3", + "sha256": "0kzgkx6jcv2864c32qr9qvrxm66l6ncakcpw1j7vf24xi51cs9a1" } }, { @@ -12969,20 +13234,20 @@ "repo": "guidoschmidt/circadian.el", "unstable": { "version": [ - 20221223, - 1419 + 20240603, + 935 ], - "commit": "f20cdbf164be10ef0c55d26eba4d270c7c826f42", - "sha256": "03wh3zb1pwvjn990bvd461397v8fh5y6asy0g5wb7x86sg6za1hg" + "commit": "76464419f69e9758bc5a76b2420c9648ddf93dba", + "sha256": "1blpk69ba2dira5av3ad854h4xkxxl5f47mkbjbgmzjlqihv8q3p" }, "stable": { "version": [ + 1, 0, - 4, 0 ], - "commit": "323039363588028c629604fae17b73a3d3c821cc", - "sha256": "108qsmzdbk4jw445chl6zhbd0mb95w3lc30c6jaijn4y7ys3dmls" + "commit": "76464419f69e9758bc5a76b2420c9648ddf93dba", + "sha256": "1blpk69ba2dira5av3ad854h4xkxxl5f47mkbjbgmzjlqihv8q3p" } }, { @@ -12993,14 +13258,14 @@ "repo": "emacs-circe/circe", "unstable": { "version": [ - 20240407, - 1101 + 20240630, + 2055 ], "deps": [ "cl-lib" ], - "commit": "9d703f481a2c65f2b17edcc2b05412f9865d24af", - "sha256": "1k8hydd45zqhbfd4lmcdr46wxj9m788wwjmr9ss0vyrqc0w6z6zw" + "commit": "3ae38790506311fd32b2d499804af69b16307652", + "sha256": "1gmzjcsk7vyp0mnx1ak4a5xi1wz9j1jcz5lvia68sx5wrwn2vicg" }, "stable": { "version": [ @@ -13105,16 +13370,16 @@ "repo": "pprevos/citar-denote", "unstable": { "version": [ - 20240520, - 2325 + 20240709, + 1954 ], "deps": [ "citar", "dash", "denote" ], - "commit": "1c62db7107b1ff9de5f87a03d9ac1973c4bbb0ec", - "sha256": "0140a7zxs479na6p94g9rsxg7sp08jx7ri4y1h764wxwfvl8qf8c" + "commit": "8333093ffcd05aaf5ec98568d9e4abe03a6eebb2", + "sha256": "19vrmsykp4j9p7ib686jc4qya2rra09685wp9c715r5kas4y8rva" }, "stable": { "version": [ @@ -13203,8 +13468,8 @@ "repo": "andras-simonyi/citeproc-el", "unstable": { "version": [ - 20240513, - 1309 + 20240722, + 1110 ], "deps": [ "compat", @@ -13216,8 +13481,8 @@ "s", "string-inflection" ], - "commit": "fed285385c1a8c0248890cd591f64a0e2598334d", - "sha256": "19m3q2izbgzvaimk9z38zznj1602vmr8y93c2sfrkyssjb4rmxfy" + "commit": "54184baaff555b5c7993d566d75dd04ed485b5c0", + "sha256": "003c8xjdz69irdgi58yibkgai4is0ffbavvkl370n214rwhhhib9" }, "stable": { "version": [ @@ -13285,19 +13550,20 @@ "repo": "universal-ctags/citre", "unstable": { "version": [ - 20240508, - 1154 + 20240630, + 721 ], - "commit": "fe670ff2410fe4cd59cdce8ef1b947deefa71879", - "sha256": "1fancp1z955z2clnr9rh6iqpg6cisama9drx51356n4afv60q9pv" + "commit": "d99483767016cada88a2877a77b9b76f8e118b80", + "sha256": "10sp5256354p6f3wcgvgniv7jsvb000nffzhq4lkc4kzf3b579q3" }, "stable": { "version": [ 0, - 4 + 4, + 1 ], - "commit": "ac01a5c5852fa3a170e5f00dafeb633012e25fd8", - "sha256": "0fq1f03v706gj6p2fjz51kvmj1pwc9p64chqap2ajr0a9cxpwln6" + "commit": "7c9c77276cc7dfcb77640df7d589eaac3198cfee", + "sha256": "1x5kxlzhzr2x4cszcqaxcg2lc71nwmmfnm2vzx7iz7h74hn4f1ld" } }, { @@ -13408,6 +13674,21 @@ } }, { + "ename": "clang-format-lite", + "commit": "748d88db575163fadbae8a20556351e4fe26d2dc", + "sha256": "0iy902lrk8518q2ndxb6b1xf9zdiy6h9hi021jpqg44v7rg7y9gp", + "fetcher": "github", + "repo": "arteen1000/clang-format-lite", + "unstable": { + "version": [ + 20240708, + 223 + ], + "commit": "4e60389129601ac81f8c698c1a6985ad72224b3e", + "sha256": "1hiviarym9ahf3hi0zqf2ja5y14cyvm56z922m11kyapbmwqprka" + } + }, + { "ename": "claude-shell", "commit": "a40f86ecc9a185f065a720318ff69afc10d92535", "sha256": "0lqw9qra8zdafwnyfm164h2nzh6ys5ndbf75s4dnwjpg5lxv135y", @@ -13415,14 +13696,14 @@ "repo": "arminfriedl/claude-shell", "unstable": { "version": [ - 20240420, - 1917 + 20240707, + 1743 ], "deps": [ "shell-maker" ], - "commit": "2574f5d1fe58c44dc0e16d3a7be36a9e4e0927ca", - "sha256": "1my1n0bsx7xghaxa3qyrsqkdn3nxxym00acncp24b1hsm63k12yx" + "commit": "6fb330578a84a8753e32b9ffc50a2506406f1099", + "sha256": "1v6jbqd3djk4h3id4spqax6wzg1sgqc7mypci1j1qvgxafg6iqyh" } }, { @@ -13586,11 +13867,11 @@ "repo": "llaisdy/clingo-mode", "unstable": { "version": [ - 20230825, - 1941 + 20240724, + 1135 ], - "commit": "8ea6ab5fa7dca439ec0e1dca8f3cdf7ace43390d", - "sha256": "0n13i8xkwz6r42qmd7id4bbzhj0q3lnsrvq0hl6y22c1awqi9dr7" + "commit": "feff7d3308a824e918740461e9df636ab67a8874", + "sha256": "0ci2sc7hc0lxlbkzfz8nbcivfjw3xzsvac64hzdmsys49k5hzwil" }, "stable": { "version": [ @@ -14079,20 +14360,20 @@ "repo": "clojure-emacs/clojure-mode", "unstable": { "version": [ - 20240516, - 525 + 20240526, + 1825 ], - "commit": "faee3efbb1e940af0e5777514923c8dea567f87d", - "sha256": "1d3pwwwwzfaqbynpmkpnmfmf2gh7nviy8nc18m0nm9g27i9x3wk4" + "commit": "815bc387ec1436fb2fcac00ba8a61207636d0186", + "sha256": "0rx7r4v6dfz26n9bqhfbd4jv0fj9zqnc22jk8pa5y4ldjzkas35c" }, "stable": { "version": [ 5, - 18, - 1 + 19, + 0 ], - "commit": "25d713a67d8e0209ee74bfc0153fdf677697b43f", - "sha256": "1d5kkq2i8d04k2qfrb31zyjpij92ckbccnzvz01mls3xrvpr57m5" + "commit": "4afdd3539036bbd6b1c01b2e00559676c4d40085", + "sha256": "0kv7jw1cg145zcy0pffjk9n2kkcgdn46nb2ny06ynadbivk2l4ds" } }, { @@ -14103,26 +14384,26 @@ "repo": "clojure-emacs/clojure-mode", "unstable": { "version": [ - 20231124, - 732 + 20240526, + 1824 ], "deps": [ "clojure-mode" ], - "commit": "25d713a67d8e0209ee74bfc0153fdf677697b43f", - "sha256": "1d5kkq2i8d04k2qfrb31zyjpij92ckbccnzvz01mls3xrvpr57m5" + "commit": "4afdd3539036bbd6b1c01b2e00559676c4d40085", + "sha256": "0kv7jw1cg145zcy0pffjk9n2kkcgdn46nb2ny06ynadbivk2l4ds" }, "stable": { "version": [ 5, - 18, - 1 + 19, + 0 ], "deps": [ "clojure-mode" ], - "commit": "25d713a67d8e0209ee74bfc0153fdf677697b43f", - "sha256": "1d5kkq2i8d04k2qfrb31zyjpij92ckbccnzvz01mls3xrvpr57m5" + "commit": "4afdd3539036bbd6b1c01b2e00559676c4d40085", + "sha256": "0kv7jw1cg145zcy0pffjk9n2kkcgdn46nb2ny06ynadbivk2l4ds" } }, { @@ -14195,11 +14476,11 @@ "repo": "clojure-emacs/clojure-ts-mode", "unstable": { "version": [ - 20240314, - 552 + 20240725, + 1139 ], - "commit": "8afa5656955814193b3b27020faf4edf00abda88", - "sha256": "0jxfzcmqlmc88ib483n6y445xs7bpaqw3b1w0z3nmcdfk512d0fr" + "commit": "0e6816e76ea31c0f0e4d39d8f016c262e57dcb10", + "sha256": "13dwgkqricisnxkp7x066f7gm9w22myc9s7m88s3kslvf9k4qap2" }, "stable": { "version": [ @@ -14254,27 +14535,28 @@ "repo": "magit/closql", "unstable": { "version": [ - 20240415, - 1534 + 20240808, + 1934 ], "deps": [ "compat", "emacsql" ], - "commit": "2bff36edd28c9a0d0c25b545b3837fa874376cc5", - "sha256": "1951r5p5p6jr9xahjw7sr0s01d6mhcp721b35gxa9d9kw3p52xx6" + "commit": "c1a346d56ecee16d1f0d7707f0d62c72604a8802", + "sha256": "0fh7mvm2qcwkkmzpkagwzrsi11nm4laj2bvjdmyrv8pnmjigwwqw" }, "stable": { "version": [ - 1, 2, - 1 + 0, + 0 ], "deps": [ - "emacsql-sqlite" + "compat", + "emacsql" ], - "commit": "1ba85ce9f7094aeddce25044689278eda6739531", - "sha256": "1s9riibws28xjn2bjn9qz3m2gvcmrn18b7g5y6am4sy7rgkx3nwx" + "commit": "c1a346d56ecee16d1f0d7707f0d62c72604a8802", + "sha256": "0fh7mvm2qcwkkmzpkagwzrsi11nm4laj2bvjdmyrv8pnmjigwwqw" } }, { @@ -14447,20 +14729,20 @@ "url": "https://gitlab.kitware.com/cmake/cmake.git", "unstable": { "version": [ - 20240412, - 1329 + 20240814, + 1725 ], - "commit": "3bb04b05a527b2443298cb7bc9520f58e56c4e9e", - "sha256": "0cn206miz1z0b92rg95z7qr240awh92vfby62gjh9pv0mazhac3q" + "commit": "cf1bc1b9371dc6063a1734a1cd80d6cb654ad53e", + "sha256": "1anxrj0bdl1z811dqz6cmxqyw0ipsim0hgxlqc0kngms9dnjilnx" }, "stable": { "version": [ 3, - 29, - 3 + 30, + 2 ], - "commit": "b39fb31bf411c3925bd937f8cffbc471c2588c34", - "sha256": "1bwa80zrqyav0bxpq6b9vrjijbfn5g52vqhzvy70g7bp3jbp6vzm" + "commit": "d88682dff6bf053e5bbdc10accf5d6825303e656", + "sha256": "1apk3vkg7n6mqpqibib02xmvzsy99zhyc6ajsk4ajr1iri9wyv1h" } }, { @@ -15046,14 +15328,14 @@ "repo": "purcell/color-theme-sanityinc-solarized", "unstable": { "version": [ - 20220917, - 1350 + 20240712, + 1038 ], "deps": [ "cl-lib" ], - "commit": "b8f4a65bd53b97b56b93fff2fb14f71b2831aa6f", - "sha256": "10vfbl9dry03dw264w7b4grmzcv78x3p7r86bsyhyl74hwwvx1hp" + "commit": "e1854917d84051393b64de54883f2df7b9cec797", + "sha256": "121y3hb2v17shv5r0y4vqsbw1avc19rv9bk99l3ls7apx6xma8ji" }, "stable": { "version": [ @@ -15072,11 +15354,11 @@ "repo": "purcell/color-theme-sanityinc-tomorrow", "unstable": { "version": [ - 20240429, - 949 + 20240621, + 1005 ], - "commit": "5f3b2039eda57e9e4501f8decab5808d9edf98eb", - "sha256": "11vpha0nmcxh7b1cp27778sacjzccp87b6db3mnsir5mbnxyhfx4" + "commit": "ddf2920a8866040e57359d2e1c5517fffcad2e38", + "sha256": "0qnn3dxzi40skrmi6a2w68c1dcn89zbdxnm18nw7axa7c0q0wcqs" }, "stable": { "version": [ @@ -15414,20 +15696,19 @@ "repo": "pzel/commentary-theme", "unstable": { "version": [ - 20210714, - 1757 + 20240620, + 1307 ], - "commit": "a73e1256f667065933e96bd6032c463cb115201d", - "sha256": "0dwd42afh4brcwz1jahxmn8l3aj6dmplidqv4x55z3di1spdjs98" + "commit": "31e3724631d20fe5854cf522443a31fc12245ce3", + "sha256": "09sm5da945qfxmjcyvjwhgbrgns5kqqxb0i8qh2d7b08qj1wr5p2" }, "stable": { "version": [ 0, - 4, - 1 + 5 ], - "commit": "a73e1256f667065933e96bd6032c463cb115201d", - "sha256": "0dwd42afh4brcwz1jahxmn8l3aj6dmplidqv4x55z3di1spdjs98" + "commit": "31e3724631d20fe5854cf522443a31fc12245ce3", + "sha256": "09sm5da945qfxmjcyvjwhgbrgns5kqqxb0i8qh2d7b08qj1wr5p2" } }, { @@ -15509,6 +15790,30 @@ } }, { + "ename": "communinfo", + "commit": "4e4c7240098f486d91cc819a13add2aabfc1f2b3", + "sha256": "1g6jhy7ibpxpri1spl4p26f52ba3bgcxf93sxg6vbi03f8p2dcwa", + "fetcher": "codeberg", + "repo": "mekeor/communinfo", + "unstable": { + "version": [ + 20240709, + 913 + ], + "commit": "2e1481c2441725f1938d8b11848e954906d118b8", + "sha256": "01vf2fz8s02ph3ppnx4sprk7cl7m3ifd5qfbz5d777swhar0wdsl" + }, + "stable": { + "version": [ + 0, + 1, + 1 + ], + "commit": "07bc9343c13809619f2c2229841d690df7f78312", + "sha256": "0f5yd86dym98jgf0h4ns6gq22cf9fgk3m382n18kiwpkgzxcdqx0" + } + }, + { "ename": "company", "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", "sha256": "0imik54s3y0xwr4l207rrwc4v77m0hmfvmvk0qx98mpn65g4l1v4", @@ -15516,11 +15821,11 @@ "repo": "company-mode/company-mode", "unstable": { "version": [ - 20240428, - 2258 + 20240729, + 846 ], - "commit": "32f030a4c79bbf082cc21ec21b2cf8ba9dfa22cc", - "sha256": "19y5s4jxz62ak9q3cq66d1gijpbv9bkxazm4qyglsk9ayjz03q43" + "commit": "1321e285a54dfe43cae71f52e58bff4f0c8c161d", + "sha256": "0h6hls2w2yl00wqqs187k3zr3g0yjkg7zw7v3g4dsjynkkri55f9" }, "stable": { "version": [ @@ -16102,16 +16407,16 @@ "repo": "jcs-elpa/company-fuzzy", "unstable": { "version": [ - 20240519, - 904 + 20240616, + 549 ], "deps": [ "company", "ht", "s" ], - "commit": "ae4dbb00d91fae8f13e236093d99c7e4d0d8fa73", - "sha256": "1akl4d83lydq1sjp56kfwwv4zya0awpvm8ifw7sj4f1fmvkz8awr" + "commit": "204f7d63a5388637a3767c0232173c477ce96df3", + "sha256": "1kxij0npbhfr9ngn0dyhlp77ida76nvlxs0a45ycmmj44y5a37ah" }, "stable": { "version": [ @@ -16325,10 +16630,10 @@ }, { "ename": "company-lean", - "commit": "42f4d6438c8aeb94ebc1782f2f5e2abd17f0ffde", - "sha256": "1hqkn7w5dyznf7i3r3132q8x31r74q188jsm5kdrjqgbwak2p91a", + "commit": "0bad7f91094d96d387bf0b121d6223afdc0f236c", + "sha256": "1grfa9944ssbpprrrz77jk6x0r8840kx6cb9pnd4mxwckgb7p2hv", "fetcher": "github", - "repo": "leanprover/lean-mode", + "repo": "leanprover/lean3-mode", "unstable": { "version": [ 20210305, @@ -16807,27 +17112,28 @@ "repo": "radian-software/prescient.el", "unstable": { "version": [ - 20240226, - 204 + 20240803, + 2320 ], "deps": [ "company", "prescient" ], - "commit": "c39bf07c56b427bf41aafd7d20eaef5cf3c312b5", - "sha256": "0pfc0ycp4cr9zwkjv3rqfkwkx8p52ad7aq2c60j0qwp3yd0cghc4" + "commit": "2b8a8b41228bddb2e11eb1c200e98a9edd04797c", + "sha256": "0qz3xv38vazxqsl7lan7fshj3gmb0qagkrvl5xzwqhdg0rir981j" }, "stable": { "version": [ 6, - 3 + 3, + 1 ], "deps": [ "company", "prescient" ], - "commit": "c39bf07c56b427bf41aafd7d20eaef5cf3c312b5", - "sha256": "0pfc0ycp4cr9zwkjv3rqfkwkx8p52ad7aq2c60j0qwp3yd0cghc4" + "commit": "2b8a8b41228bddb2e11eb1c200e98a9edd04797c", + "sha256": "0qz3xv38vazxqsl7lan7fshj3gmb0qagkrvl5xzwqhdg0rir981j" } }, { @@ -17551,8 +17857,8 @@ "repo": "mkcms/compiler-explorer.el", "unstable": { "version": [ - 20240517, - 1816 + 20240617, + 2114 ], "deps": [ "eldoc", @@ -17560,21 +17866,23 @@ "plz", "seq" ], - "commit": "ca01cbfa5941750f3cf2232f00e28032ef7f9bce", - "sha256": "05yzp9gch1hw10xgk742zdgky0vbbqhyn6fzxj2n6ilwaslcnprh" + "commit": "be99c0f00d4814c3602ea55ca116f5dcda6645a6", + "sha256": "1hdsa6jm75sga62xsw4054dnr1l8wqbb86bxqmq4zwlqnhi7rdp7" }, "stable": { "version": [ 0, - 4, + 5, 0 ], "deps": [ "eldoc", - "request" + "map", + "plz", + "seq" ], - "commit": "4980ed8f91a94b7a1cace9d199f1a0b35bed3a07", - "sha256": "1d181wm69r00j3wrvcb7i44v9c85ahk7b3hcqb91wlky25lsbjrz" + "commit": "f7b440125264efc043b9d61186e4ac662cb8b67c", + "sha256": "0yih4rl037f14v1cq13g49fx1dy6yl6v7ps13lrklv0pjjf7gc9c" } }, { @@ -17609,15 +17917,15 @@ "repo": "emacs-php/composer.el", "unstable": { "version": [ - 20221120, - 202 + 20240618, + 1112 ], "deps": [ "php-runtime", "seq" ], - "commit": "2299cd731205906350d615021f99a66d7a8905c2", - "sha256": "1s1wmvav83djcg6jgf5cjvwjm045y5fbwf0sqwgkfk8m4ka4473a" + "commit": "42cf9848d438f8dc4c07ac684a83280ace7bb94c", + "sha256": "0a7hwikxzw1y6i4ny9bxj4lnyaz2p25sx5w97rhnkagr0859jflg" }, "stable": { "version": [ @@ -17710,8 +18018,8 @@ "repo": "necaris/conda.el", "unstable": { "version": [ - 20231109, - 219 + 20240708, + 2135 ], "deps": [ "dash", @@ -17719,8 +18027,8 @@ "pythonic", "s" ], - "commit": "60e14d1e9793431b91913a5688e278bd91d56224", - "sha256": "1irrcdm3ckbafsjr442i9iljsfjqsg5mj79hzwps2k1j7b911gy1" + "commit": "ce748a53f9c7d7a7d112632d32c848d6e5482e18", + "sha256": "0l63dbkv91ashpjvnns4z5fzhmacal1pslycnmj05gar4sj4339v" }, "stable": { "version": [ @@ -17859,11 +18167,11 @@ "repo": "tralph3/conner", "unstable": { "version": [ - 20240512, - 1717 + 20240816, + 2343 ], - "commit": "d8dabaab32e39b01500841b7465076c6ad73c3b9", - "sha256": "1iw787gp2r7ab3xc8s6brsdc7a8cg5g2vsjlb1qhir6zmyz5y5dz" + "commit": "7ea91fb4f1a067a3352ad66b70acfe86c76610da", + "sha256": "1av59fgwpp9gvhdlkfxqa20lk0g2vmj9pxdbiwkkvn65jxpn4hml" }, "stable": { "version": [ @@ -17897,25 +18205,25 @@ "repo": "minad/consult", "unstable": { "version": [ - 20240516, - 2240 + 20240818, + 1112 ], "deps": [ "compat" ], - "commit": "80407622f323669c735737272ecbc3b602434b77", - "sha256": "0rrxyds14a3c1f96q3hx92hm4axl66cgghrvc3j745s257macx0y" + "commit": "d403b8bd1b49922de5a8060e79f647db7988ace6", + "sha256": "0kwa6vyd54hvlfscjy2i3rc0ln1n7d4614n1hy9vgk5w27iqnnng" }, "stable": { "version": [ 1, - 6 + 8 ], "deps": [ "compat" ], - "commit": "6eba1a3fa8e13681091a30b2490a03bdce5f243a", - "sha256": "1c6skqx5aqkb0mfnm5zw4mvzcrcr34zcd5jz3ypgb5483nv9kp3c" + "commit": "4889458dccf842ab6223099f8a73ff8b147e9459", + "sha256": "06jckxwagpvp4w8hykc0wr90pba9ih8376562g1q93g0nbb3rhrg" } }, { @@ -18004,15 +18312,15 @@ "repo": "mohkale/compile-multi", "unstable": { "version": [ - 20230904, - 1806 + 20240507, + 1949 ], "deps": [ "compile-multi", "consult" ], - "commit": "30edb0e86287101269debf20f43cead92310029a", - "sha256": "0ppm9zw65f1a7b6qb5hx60i6fxkqarrhlz2kn6p2b48s089dykyp" + "commit": "a8782ac55115b1afe0bee52664b46bfbd9bf202e", + "sha256": "1rr74klnariax66n7r5sbkqjszqslxg8l58rxmb1b3yv5mzic10y" }, "stable": { "version": [ @@ -18137,15 +18445,15 @@ "repo": "minad/consult-flycheck", "unstable": { "version": [ - 20240310, - 1442 + 20240718, + 1011 ], "deps": [ "consult", "flycheck" ], - "commit": "754f5497d827f7d58009256a21af614cc44378a3", - "sha256": "19smn8wyindw92nvfskg5s889pdc5hn0w9q5z13hmjb8iv2gx9yp" + "commit": "3b999ae983900c16c0b5b5c30b7eca640d386a76", + "sha256": "108ajqqi0dbcjykippsa6v25bvcc3d17jjyypknznlskch68yw88" }, "stable": { "version": [ @@ -18266,14 +18574,14 @@ "repo": "rcj/consult-ls-git", "unstable": { "version": [ - 20230924, - 810 + 20240529, + 641 ], "deps": [ "consult" ], - "commit": "3ccd9d80da73a05ef2a74616ffdc469860f74c21", - "sha256": "1gxh0zwfkm50493bbnvjlsx38i3sxmrajqm1gf65icp55s0slrp0" + "commit": "b1ca94f7c43cbd3811d09a0c9ab04f67f6318e95", + "sha256": "1r8d42r4dszg7jdabgs60inn6hkd293fddps1sjrs8y4ygkxcp61" } }, { @@ -18317,16 +18625,16 @@ "repo": "mclear-tools/consult-notes", "unstable": { "version": [ - 20240516, - 1423 + 20240810, + 1318 ], "deps": [ "consult", "dash", "s" ], - "commit": "c97420c8e91aaae214be7de897eb7eb9b7843520", - "sha256": "0nf06al179p3g7n0zvcxkwhq1ygakg4n554a1w8f6k00m1syslsh" + "commit": "6ece62337d6065e88a91b222fac5e252c00a8d53", + "sha256": "0jqfybd96wkqcdnwavsp2fzjxmqb7lff8ix23rvq7c1dsgrp0c0v" } }, { @@ -18486,14 +18794,14 @@ "repo": "titus.pinta/consult-tex", "unstable": { "version": [ - 20240417, - 1149 + 20240808, + 1300 ], "deps": [ "consult" ], - "commit": "675755e106f9e64e2c1fd3cf05a43275c09497da", - "sha256": "18kz99lmfqr7hm3n3xkp51hi6fibyj2ry6abpl897rl4ky9rabr9" + "commit": "9df92b31a8e7ef253667229a4e05153ea13346de", + "sha256": "0ipabvybhfk6zzv4q7vvlcpvhr7pxs4shwbvj3bxwr76303ajxvi" }, "stable": { "version": [ @@ -18567,20 +18875,20 @@ "repo": "licht1stein/context-transient.el", "unstable": { "version": [ - 20240507, - 1534 + 20240530, + 1344 ], - "commit": "efd8343f46f9fb2a1ee391c0292fb35d4f91b107", - "sha256": "0fmp011hnarc73b3zicknwfvql5a2q7ijmy63p0qnw735c9xcjvr" + "commit": "4461c3a5b8654cb1dacea404f78951172437804f", + "sha256": "1slj9js7c4cggdidr7miri9gf9xm7ij4hmd7y99km7bqmg57837l" }, "stable": { "version": [ 1, 0, - 0 + 1 ], - "commit": "efd8343f46f9fb2a1ee391c0292fb35d4f91b107", - "sha256": "0fmp011hnarc73b3zicknwfvql5a2q7ijmy63p0qnw735c9xcjvr" + "commit": "4461c3a5b8654cb1dacea404f78951172437804f", + "sha256": "1slj9js7c4cggdidr7miri9gf9xm7ij4hmd7y99km7bqmg57837l" } }, { @@ -18867,25 +19175,25 @@ "repo": "minad/corfu", "unstable": { "version": [ - 20240413, - 927 + 20240726, + 359 ], "deps": [ "compat" ], - "commit": "b779552341354d59365a981fd208ae07b7a2950a", - "sha256": "0yhdp1bf96m0llfc8v19swnrd4zl2dn5gxyppvjyidjvic3n0djv" + "commit": "5e3a959766d2313651c5db3beedd937bfc27b57a", + "sha256": "00w0qzx2cqyxy15ndqzl3d6f1k8gvqdxz407zbgy5n46408pjsi0" }, "stable": { "version": [ 1, - 3 + 5 ], "deps": [ "compat" ], - "commit": "6088f0550dc8f10f5bcf6f24d35ce24159b01b43", - "sha256": "1nrwh00dy2ffzd3np8yk4n0vn0r5iqqhgcr40wbnv5qzgbdw9kas" + "commit": "5e3a959766d2313651c5db3beedd937bfc27b57a", + "sha256": "00w0qzx2cqyxy15ndqzl3d6f1k8gvqdxz407zbgy5n46408pjsi0" } }, { @@ -18925,27 +19233,28 @@ "repo": "radian-software/prescient.el", "unstable": { "version": [ - 20240226, - 204 + 20240803, + 2320 ], "deps": [ "corfu", "prescient" ], - "commit": "c39bf07c56b427bf41aafd7d20eaef5cf3c312b5", - "sha256": "0pfc0ycp4cr9zwkjv3rqfkwkx8p52ad7aq2c60j0qwp3yd0cghc4" + "commit": "2b8a8b41228bddb2e11eb1c200e98a9edd04797c", + "sha256": "0qz3xv38vazxqsl7lan7fshj3gmb0qagkrvl5xzwqhdg0rir981j" }, "stable": { "version": [ 6, - 3 + 3, + 1 ], "deps": [ "corfu", "prescient" ], - "commit": "c39bf07c56b427bf41aafd7d20eaef5cf3c312b5", - "sha256": "0pfc0ycp4cr9zwkjv3rqfkwkx8p52ad7aq2c60j0qwp3yd0cghc4" + "commit": "2b8a8b41228bddb2e11eb1c200e98a9edd04797c", + "sha256": "0qz3xv38vazxqsl7lan7fshj3gmb0qagkrvl5xzwqhdg0rir981j" } }, { @@ -19076,14 +19385,14 @@ "repo": "ideasman42/emacs-counsel-at-point", "unstable": { "version": [ - 20240422, - 116 + 20240616, + 2345 ], "deps": [ "counsel" ], - "commit": "5aa7a483c5188d71c04c3302cfd900e7be91ffd6", - "sha256": "147v6nz5vhai38wxmfzsziwn50110viq575j33k0cm2iimv4gkpb" + "commit": "7da3813fe01e5a7a651632b1af031891c009b559", + "sha256": "15mq1lkjf72fb7g2di8gwvqk6iads2znhzbpx2khchia1vl30qba" } }, { @@ -19919,14 +20228,14 @@ "repo": "emacsfodder/emacs-theme-creamsody", "unstable": { "version": [ - 20240109, - 557 + 20240619, + 731 ], "deps": [ "autothemer" ], - "commit": "5f4fce9de6920cd2788bf6baf3a3da110f09bffd", - "sha256": "0qk76dk3g5whnx49qwahh32di7x9adw6d7gj4rr03d10zlvwsssb" + "commit": "10acf5c5d3e1108fc1e7a4ab487aa2ac79720f42", + "sha256": "0s07lvzrr12faxf5wpyg9s44g2v8w6vm4f59mam4xl6v8nq6pfdh" }, "stable": { "version": [ @@ -20275,8 +20584,8 @@ "repo": "hlolli/csound-mode", "unstable": { "version": [ - 20231024, - 1442 + 20240813, + 1802 ], "deps": [ "dash", @@ -20284,8 +20593,8 @@ "multi", "shut-up" ], - "commit": "2c9107a78048f16c4e274390eb3021e974372d64", - "sha256": "1sfmvqmgvvff56s39jb51sp9b5sz308y99b0xp4galw51s0vm4vq" + "commit": "bea3a94f4e1b4d3b32a4ed7943d2beda794908b5", + "sha256": "17mq1wkf9rx3idrvn99y2vyylm2xvh9k7288xjl0c6whznaya3zs" }, "stable": { "version": [ @@ -20666,11 +20975,14 @@ "repo": "chachi/cuda-mode", "unstable": { "version": [ - 20201013, - 2230 + 20240819, + 11 ], - "commit": "7f593518fd135fc6af994024bcb47986dfa502d2", - "sha256": "0ibap1k70b3c4fnyvgvnqdcxnchqwrpz20k2dk2lw3wgznv3bsx2" + "deps": [ + "compat" + ], + "commit": "c3dae31b3d1abedf4d0b98840127e2cac73d6ad8", + "sha256": "1025v3x4wr8pljjry9dvawyv3yjfs94kvvrn1hjknifq7mfrdwhm" }, "stable": { "version": [ @@ -21076,11 +21388,11 @@ "repo": "Emacs-D-Mode-Maintainers/Emacs-D-Mode", "unstable": { "version": [ - 20240218, - 1753 + 20240813, + 659 ], - "commit": "dc583981dd2d4097ce1c9a80a958a7a1bf225ad4", - "sha256": "1vrv2iwglrv6xnpcrdgy9wwsixz2bcimn3ylh10gyv3rajym69fk" + "commit": "9b1676d70edbc2f2788130adfd5797515a5c8538", + "sha256": "1fwrf9iy85z1hz1g65k52yyg9z17lmnk4bwci5p6pvcqb8dm2qgm" }, "stable": { "version": [ @@ -21100,11 +21412,11 @@ "repo": "andorsk/d2-mode", "unstable": { "version": [ - 20230210, - 1130 + 20240707, + 1850 ], - "commit": "cbe7b16141bd80fe4344f0403e61fd7ee4e0fd89", - "sha256": "1mdiafxbfz31blp7c86m6sp0dmn4yhnbs2mhzh75mczsg0gzqc4v" + "commit": "69374e0249df20139f3f2d475de9eae2b201d019", + "sha256": "0hr2q2d3qfrbd7vpxbcamawvdzvak30rdsbrkxcqz9d36grhsj97" }, "stable": { "version": [ @@ -21220,14 +21532,26 @@ "repo": "xenodium/chatgpt-shell", "unstable": { "version": [ - 20240112, - 1749 + 20240814, + 938 ], "deps": [ "shell-maker" ], - "commit": "39dd8e7415ebe6d836a1d721337019cfea89f5ad", - "sha256": "0xylvqjhdwmgbcm412jgyir8kwb16j1jzwp708z1p0yaw4j7c54c" + "commit": "6fb85746bd0d316c97e375dcc14eb5314778e74d", + "sha256": "1kkq4wxkhv7cgksjpbdzm0r9x17y3sra1zk6h0213w4fi20z06lc" + }, + "stable": { + "version": [ + 1, + 3, + 1 + ], + "deps": [ + "shell-maker" + ], + "commit": "6fb85746bd0d316c97e375dcc14eb5314778e74d", + "sha256": "1kkq4wxkhv7cgksjpbdzm0r9x17y3sra1zk6h0213w4fi20z06lc" } }, { @@ -21278,11 +21602,11 @@ "repo": "rails-to-cosmos/danneskjold-theme", "unstable": { "version": [ - 20231110, - 722 + 20240723, + 1000 ], - "commit": "b3335e44f468c019c95a8210ce1ed9fe23c65735", - "sha256": "19lncwxzxyi73cn7439rk8cvgcj6l4x1kj6fykmw3b18s7rj555f" + "commit": "d495ba64e4a9e3e44b028b9fbc3898da3348ffdc", + "sha256": "00x2r95xivww43al98w0pak7dh9rrh1vdjhkspyw8cdvq4259s3y" } }, { @@ -21334,8 +21658,8 @@ "repo": "emacs-lsp/dap-mode", "unstable": { "version": [ - 20240514, - 1617 + 20240611, + 1356 ], "deps": [ "bui", @@ -21348,8 +21672,8 @@ "posframe", "s" ], - "commit": "11431a26bc4c8ca92b097dbdbcbdc9e3d7fb5583", - "sha256": "1m77dwy1p7jy41v7gjqk9w7jy6sh3blg2qrlw22f3y1d6n0h3lvs" + "commit": "b407773ebca56e3bd8e6a4643854e91cbde0c35e", + "sha256": "1a1iwx299xcm5ldd2sh7sjhmpb6wndyrwx7q0q6nih6j8ly0nppr" }, "stable": { "version": [ @@ -21709,11 +22033,11 @@ "repo": "emacs-dashboard/emacs-dashboard", "unstable": { "version": [ - 20240407, - 12 + 20240813, + 838 ], - "commit": "89b42bff4d60fb00ef3d679e2d2289541e5009f6", - "sha256": "1cl9p8a9dxjbl8kn7fqkx1abr90frk4g7n09lqriyf8hn5bizy5c" + "commit": "187699e2d80f6a3b0ec7b2fb2e1d7ece2712208f", + "sha256": "0agx20phxdx4wrm4y6zhsin061a6945sdqh5vnqgs4kg1irhan42" }, "stable": { "version": [ @@ -22104,29 +22428,29 @@ "repo": "Wilfred/deadgrep", "unstable": { "version": [ - 20240408, - 1537 + 20240627, + 1535 ], "deps": [ "dash", "s", "spinner" ], - "commit": "eafc642c551e6d5df7eb1fee9aa7596e59811178", - "sha256": "029szbwssvdxrsrzv0ppgik30hl9apr0dp5hcp666zgpm415frc4" + "commit": "609a9c3bf52f44998dd0ec7275374d059a3fdc15", + "sha256": "0j8ggh70xvf72bf0d86kxqn19vpdylj7rchyf8asd0b9gq6l2ah6" }, "stable": { "version": [ 0, - 12 + 13 ], "deps": [ "dash", "s", "spinner" ], - "commit": "d32fe49079c1e9e0af95387120fa4990d4107778", - "sha256": "0bwf8gsqw7hsmacqd34piwgv066ijfclmxaigkvhvpac0lpsmi79" + "commit": "ad7ddfbce9d1b665281c2ec6ea48644602925d30", + "sha256": "1ry9qvvxwhh3gkb0kkwiwpx37jpdzgky1h2zkwpzjpkv5jm022dr" } }, { @@ -22137,11 +22461,11 @@ "url": "https://salsa.debian.org/emacsen-team/debian-el.git", "unstable": { "version": [ - 20240519, - 1104 + 20240727, + 2230 ], - "commit": "a76a38cf0af5625b38e1d298bbfa3ae5a2a1ebc9", - "sha256": "0k3r9a9qsi380m4j53j4irfv591irg9w2i0pqk1c8fv3rwxrdiq5" + "commit": "232a4b3f20ca7834a8993c4aac2678b7aecca505", + "sha256": "1n1c3gnv6svq9v4pji5ry4h6m1kr8gcrdfwrh26l5s61q6bdzk68" }, "stable": { "version": [ @@ -22272,20 +22596,20 @@ "repo": "KeyWeeUsr/decor", "unstable": { "version": [ - 20231210, - 1247 + 20240818, + 1100 ], - "commit": "b0c8dfee69c9c5fe54c82cfcb2638377eb744464", - "sha256": "01c65ppj2ygi5vbpgxyk15dbkl8ls8b00l66vd9i2gmkyj0pca93" + "commit": "f96828a9415f89eebe72a46b84aa047eb38279b9", + "sha256": "1jv11z29xn9gap6g62bx8w2pasmk3x986dhdps16ya0h5b39wpfy" }, "stable": { "version": [ 1, 3, - 0 + 1 ], - "commit": "b0c8dfee69c9c5fe54c82cfcb2638377eb744464", - "sha256": "01c65ppj2ygi5vbpgxyk15dbkl8ls8b00l66vd9i2gmkyj0pca93" + "commit": "f96828a9415f89eebe72a46b84aa047eb38279b9", + "sha256": "1jv11z29xn9gap6g62bx8w2pasmk3x986dhdps16ya0h5b39wpfy" } }, { @@ -22367,10 +22691,10 @@ }, { "ename": "defcapture", - "commit": "96bb0339b35e5a7128889637bbd811eb5df1aa7d", - "sha256": "0gmvrpq8fyq6g85fl5078v9yyg5pjydnfl14aapgcsdd2iml97f6", + "commit": "4075575ffa0487a8371fb893cf8acdcdf012573d", + "sha256": "062y3pna2yx2fi66a3ig2asdd3is5r3a7ki6fqis92rijlh39h0c", "fetcher": "github", - "repo": "aggu4/defcapture", + "repo": "aaguilarss/defcapture", "unstable": { "version": [ 20230909, @@ -22529,11 +22853,11 @@ "repo": "jrblevin/deft", "unstable": { "version": [ - 20240407, - 149 + 20240524, + 1524 ], - "commit": "7f352747a2c4dfe40ba060ab42f47ae8a9ddab41", - "sha256": "048kzgqxild8ywclp659wyvpjiqi16kpbc91zh1r459gzmawcll3" + "commit": "b369d7225d86551882568788a23c5497b232509c", + "sha256": "0zqkapm01czz6syvh125f2fird2mbxmrcgbksz4qycdc89hlrl1k" }, "stable": { "version": [ @@ -22676,6 +23000,27 @@ } }, { + "ename": "denote-citar-sections", + "commit": "9ba5d6796e1c2564f2fb49b6a020ab4f7aa90968", + "sha256": "00dskskj3gyqcm75akhply0c77z97g3yzx2fr6kvd0mmyc39qi7b", + "fetcher": "sourcehut", + "repo": "swflint/denote-sections", + "unstable": { + "version": [ + 20240608, + 1629 + ], + "deps": [ + "citar", + "citar-denote", + "denote", + "universal-sidecar" + ], + "commit": "00c7084652fa32f9f4ab504facaaed623f299684", + "sha256": "0cd9207b9gwbxgv1vvlfk9yv9fy51697fwpr6j0s9v2px3jv9ahj" + } + }, + { "ename": "denote-explore", "commit": "f304db78b4bfeb4e1061b4ef221bf46e1bafe9d0", "sha256": "0md432wh8yfsfhn87ncib04aziqj7mv3pfydj79d2k8dq95flyf5", @@ -22683,15 +23028,34 @@ "repo": "pprevos/denote-explore", "unstable": { "version": [ - 20240512, - 113 + 20240727, + 804 ], "deps": [ "dash", "denote" ], - "commit": "7073ef97758fbcf953557efa15da9226283ff6b0", - "sha256": "151ba0mhq61y2iwic5645rh4agklp1rg3618xcc7r76b4078fybs" + "commit": "ffa666846ab1c890b9475a13c196d9ab7511cbe4", + "sha256": "0sj6bpdsyxwp5axprmnhrnybphrmq6d4kh1gass13hkaxdg2f63r" + } + }, + { + "ename": "denote-sections", + "commit": "95afd698f7adbd47adb3ce1a8918cd75b87c1a5a", + "sha256": "1151f40j23yn1rllnnk10nr1vs3plm9087cx8320c7h7ccpmms0z", + "fetcher": "sourcehut", + "repo": "swflint/denote-sections", + "unstable": { + "version": [ + 20240608, + 1629 + ], + "deps": [ + "denote", + "universal-sidecar" + ], + "commit": "00c7084652fa32f9f4ab504facaaed623f299684", + "sha256": "0cd9207b9gwbxgv1vvlfk9yv9fy51697fwpr6j0s9v2px3jv9ahj" } }, { @@ -23152,11 +23516,11 @@ "repo": "ideasman42/emacs-diff-ansi", "unstable": { "version": [ - 20240421, - 810 + 20240818, + 2359 ], - "commit": "9e5b61a82e04ffd0e81f88fcf159575618886d72", - "sha256": "1jwgw5ypl9iw6hy1yk4y34l8n5mxaw3zhk4bly7wxpyq4di0n9ik" + "commit": "8edf92e34058f49788a085f490ad7ff169ef0d72", + "sha256": "17dm7b909j92hlfdz97k12mg7z71xvm9kncip36szflqrm14q33h" } }, { @@ -23182,26 +23546,26 @@ "repo": "dgutov/diff-hl", "unstable": { "version": [ - 20240505, - 2110 + 20240802, + 2316 ], "deps": [ "cl-lib" ], - "commit": "11f3113e790526d5ee00f61f8e7cd0d01e323b2e", - "sha256": "1a6hqb0258kdskixcwacq41d7x71rlpwwapmbpd9ds8w6dj5vi40" + "commit": "b80ff9b4a772f7ea000e86fbf88175104ddf9557", + "sha256": "0vfqyhzf3lyrhn788fbyc4p3lf36fkh8qnxvg6vddg4bxmqcjnsw" }, "stable": { "version": [ 1, - 9, - 2 + 10, + 0 ], "deps": [ "cl-lib" ], - "commit": "d20f16bf5eadd66e775f215e800f25caddae8cb5", - "sha256": "0nh3rrvjjddyng5j7wjrk4ls7l6cjx3fpf8ksg4kjq7wzw4abf1s" + "commit": "b80ff9b4a772f7ea000e86fbf88175104ddf9557", + "sha256": "0vfqyhzf3lyrhn788fbyc4p3lf36fkh8qnxvg6vddg4bxmqcjnsw" } }, { @@ -23212,11 +23576,11 @@ "repo": "ber-ro/diffed", "unstable": { "version": [ - 20230208, - 1546 + 20240618, + 2037 ], - "commit": "f7dc37f13a4f1660212c41a6e9faba61eb8cc078", - "sha256": "0g1xjwby2sljmkf4nl0das45464162hwlsrjhbwzf4bp4i1c8gi9" + "commit": "93251169a4fc8c07fdd5f3d32c89b4d3401d37a1", + "sha256": "1am6a4b7yvdr4v54zmanirqbqvsk3bzf4ghf1rpdab5jk3rdzzg9" } }, { @@ -23305,15 +23669,15 @@ "repo": "pkryger/difftastic.el", "unstable": { "version": [ - 20240429, - 2057 + 20240528, + 1657 ], "deps": [ "compat", "magit" ], - "commit": "90b9b223bfc39786f6fcf266cdc1cb982bdc37aa", - "sha256": "1z7q6rr3cnp6fpx0439hbk22g1kl84xa6k3pbxm4mph2cqw536jm" + "commit": "79753bfec7c32f44dc0d5ed57a8bc6b370392a87", + "sha256": "02rl4zrh871cck7gr0b7jgw2xzlx50lgldbdcx2vdmd3ljkq383h" } }, { @@ -23347,20 +23711,20 @@ "repo": "retroj/digistar-mode", "unstable": { "version": [ - 20240515, - 1529 + 20240814, + 1546 ], - "commit": "546adaccb1f90d6947c2c80c2fab4933f40bc274", - "sha256": "16a4x0zxrhs2c4k7v3qhinbxayx213mb8b84jrs21sq7whfad63d" + "commit": "2d7e1a11304399f4a625053ffce8a3ad05f4ec7f", + "sha256": "1cybl34n18ib051lq5mnrg5f1b8j5rys2bly82x6a5ic640288dn" }, "stable": { "version": [ 0, 9, - 13 + 14 ], - "commit": "a0f0756b132202fadf487d689d3c4312f480d2a7", - "sha256": "0i055f0kvm4ymq9a7ad4zg2kzw4gf60db0kcg5q8gmlsri7ppsl2" + "commit": "4e5d0b463468fcc4a54df1310360ba13b2bdff6a", + "sha256": "10ng3dxckgzanxl4p4yn6syabhkzpiq49c9czdbfqhmabr5ayb3m" } }, { @@ -23480,26 +23844,26 @@ "repo": "tarsius/dim-autoload", "unstable": { "version": [ - 20240415, - 1534 + 20240805, + 1309 ], "deps": [ "compat" ], - "commit": "54bd356cdac7bdae2bdff994b048f847374cec6c", - "sha256": "0hjs9nxw6hy7kvaw389n1k1rwqq22pvc3q5cbndnybpkbfpmrhjq" + "commit": "dbe0f038c0a7fcc7e0f021947a42db5b0e8f143d", + "sha256": "1mj1h0j6sdb5c7ylcks51xn69003l0j12kifwz7cmwrhv55g54az" }, "stable": { "version": [ 2, 0, - 5 + 7 ], "deps": [ "compat" ], - "commit": "9e7b4d47f2dc972ec16baa6bd56b016000790ff4", - "sha256": "1f7syxknpqxvrng1sa9a7ypwg7c4r5gsc3c88rm1p5mrak2xpcg9" + "commit": "dbe0f038c0a7fcc7e0f021947a42db5b0e8f143d", + "sha256": "1mj1h0j6sdb5c7ylcks51xn69003l0j12kifwz7cmwrhv55g54az" } }, { @@ -23563,11 +23927,11 @@ "repo": "jcs-elpa/diminish-buffer", "unstable": { "version": [ - 20240327, - 210 + 20240612, + 52 ], - "commit": "c577a8ed289d1a2cf56845fb6b8c7b9c638d4bc8", - "sha256": "11858nlkvpwyzkn7za8c45amv185pklg3x9z0s4a25zkxjrswi7m" + "commit": "ba65fec96983ae471edbeee2b38c2107bee94f31", + "sha256": "0blnbr4prdm1bg9qvyh8h2bkzzqnzbijrqzsz1327b1agqjh6j7c" }, "stable": { "version": [ @@ -23644,6 +24008,30 @@ } }, { + "ename": "dir-config", + "commit": "6b4cfc97f1fa63011ed08eca66d415b1b5fce96a", + "sha256": "1vhsrsai0kgw0q06i4km6bx9dp6wc352qvkjb8d4yab989ypqn7g", + "fetcher": "github", + "repo": "jamescherti/dir-config.el", + "unstable": { + "version": [ + 20240819, + 1747 + ], + "commit": "d070df87aa5872c9d36e20e6f10b1b2a6642e1fd", + "sha256": "1wnlp35wz7gyywxvb1lmj8b0sqnav0dl9n034wf5sd1n01abmdap" + }, + "stable": { + "version": [ + 1, + 0, + 1 + ], + "commit": "5cbc2655a5ee734a4747a1b580e331e88c720737", + "sha256": "13flkflgbbh41zr0x378hpcnvkbyld5qa2asr76087dd238ygxhz" + } + }, + { "ename": "dir-treeview", "commit": "763f2c1d932d6f415fb2e0be0ef514406fa74151", "sha256": "1kbmmp2ljczgg7kf4df44lmday4nnmqb62algnm1v35g8gcd9q75", @@ -23759,15 +24147,15 @@ "repo": "Fuco1/dired-hacks", "unstable": { "version": [ - 20230512, - 1107 + 20240629, + 1857 ], "deps": [ "dash", "dired-hacks-utils" ], - "commit": "523f51b4152a3bf4e60fe57f512732c698b5c96f", - "sha256": "09z238y41rgy0jrn2hq5k6kj1k2skkgpf4kbfzyjzi6kcw8586bf" + "commit": "d1a85901c892ba7ec273995070a43cbbbe5d0b37", + "sha256": "0gk01vhk69l61k9wjzdin7dqzq19flzz405x14j1h0cjcxs0w5pr" } }, { @@ -23778,16 +24166,16 @@ "repo": "Fuco1/dired-hacks", "unstable": { "version": [ - 20240328, - 1154 + 20240629, + 1857 ], "deps": [ - "dash", "dired-hacks-utils", - "f" + "f", + "s" ], - "commit": "e596b0bac3de8e7730dfb43ca10b0331b6f94469", - "sha256": "0sny6wqvckwp7h9dwsdvn55irnw94axqfa7jcbbwyxqs9ird8pg2" + "commit": "d1a85901c892ba7ec273995070a43cbbbe5d0b37", + "sha256": "0gk01vhk69l61k9wjzdin7dqzq19flzz405x14j1h0cjcxs0w5pr" } }, { @@ -23920,8 +24308,8 @@ "repo": "Fuco1/dired-hacks", "unstable": { "version": [ - 20221127, - 1247 + 20240629, + 1857 ], "deps": [ "cl-lib", @@ -23929,8 +24317,8 @@ "dired-hacks-utils", "f" ], - "commit": "41d3eb42195d9f0894c20d18cc8e722b099aa1c1", - "sha256": "0r08nxx5gw0sz9xhby77nw6rxd19wzvi9zkjkqwgixpxhbz6akvv" + "commit": "d1a85901c892ba7ec273995070a43cbbbe5d0b37", + "sha256": "0gk01vhk69l61k9wjzdin7dqzq19flzz405x14j1h0cjcxs0w5pr" } }, { @@ -23986,14 +24374,14 @@ "repo": "Fuco1/dired-hacks", "unstable": { "version": [ - 20230512, - 1107 + 20240629, + 1906 ], "deps": [ "dash" ], - "commit": "523f51b4152a3bf4e60fe57f512732c698b5c96f", - "sha256": "09z238y41rgy0jrn2hq5k6kj1k2skkgpf4kbfzyjzi6kcw8586bf" + "commit": "63b04d17936c98cb4ad7ce6bc3331cda8e30c55a", + "sha256": "187qgpfnfyw6qbif0hqw987inz6kbxmb2nx6431f9rjzzyz9q75r" } }, { @@ -24004,11 +24392,11 @@ "repo": "mattiasb/dired-hide-dotfiles", "unstable": { "version": [ - 20210222, - 1919 + 20240727, + 1720 ], - "commit": "6a379f23f64045f5950d229254ce6f32dbbf5364", - "sha256": "0cwsjndvnv9a62ism7ckj27jdqx362947lyizka78qvmv369avv3" + "commit": "0d035ba8c5decc5957d50f3c64ef860b5c2093a1", + "sha256": "0c2qb2jnwzgv55qki4lciik6xm32xj1w183ngv7gy4inmr5shz4h" }, "stable": { "version": [ @@ -24120,11 +24508,11 @@ "repo": "thomp/dired-launch", "unstable": { "version": [ - 20240417, - 1903 + 20240809, + 1910 ], - "commit": "933aa6b921010c9d33ddf18f48c8ce780443f963", - "sha256": "0al5pglxj12l13j849m4khgyq43nzrnsahn5n7d9a3pkrqhjwqkq" + "commit": "31066f860735325a284c12a2f79c51a640d13556", + "sha256": "0y4gl6krwbr5g8ac6qfxygd8h9wqx0cw51np5nga3zwnh9z8x766" } }, { @@ -24178,15 +24566,15 @@ "repo": "Fuco1/dired-hacks", "unstable": { "version": [ - 20230512, - 1107 + 20240629, + 1953 ], "deps": [ "dash", "dired-hacks-utils" ], - "commit": "523f51b4152a3bf4e60fe57f512732c698b5c96f", - "sha256": "09z238y41rgy0jrn2hq5k6kj1k2skkgpf4kbfzyjzi6kcw8586bf" + "commit": "e9e408e8571aee5574ca0a431ef15cac5a3585d4", + "sha256": "0lq73f49qd4ld55f3842vdhy8j6yxz2j37qhzy608pcnbraq0408" } }, { @@ -24197,15 +24585,38 @@ "repo": "Fuco1/dired-hacks", "unstable": { "version": [ - 20240330, - 1831 + 20240629, + 1857 ], "deps": [ "dash", "dired-hacks-utils" ], - "commit": "a01c126c3b1068655509487c76971895f5459d09", - "sha256": "128wy7i7qrs7yzw82hzsr7lxiifdgbvmxb1w18kspd82ijlj4j5q" + "commit": "d1a85901c892ba7ec273995070a43cbbbe5d0b37", + "sha256": "0gk01vhk69l61k9wjzdin7dqzq19flzz405x14j1h0cjcxs0w5pr" + } + }, + { + "ename": "dired-open-with", + "commit": "e4a6a8f4ccf395c3dc2e9b5638d90550a8497891", + "sha256": "060x16662pscafvl8lnfrhj03v4lpyiz2z8dlnghmr2zcj7d5ymw", + "fetcher": "github", + "repo": "FrostyX/dired-open-with", + "unstable": { + "version": [ + 20240614, + 2213 + ], + "commit": "f82f986263c7ded9ae87853544548d5bf7fbae81", + "sha256": "0vxi61hyifcz19bzlb5lx9xfw193awk64k08h6vr9bg98dic83wc" + }, + "stable": { + "version": [ + 1, + 1 + ], + "commit": "f82f986263c7ded9ae87853544548d5bf7fbae81", + "sha256": "0vxi61hyifcz19bzlb5lx9xfw193awk64k08h6vr9bg98dic83wc" } }, { @@ -24246,14 +24657,14 @@ "repo": "xuhdev/dired-quick-sort", "unstable": { "version": [ - 20240411, - 229 + 20240805, + 545 ], "deps": [ "hydra" ], - "commit": "d50b910baa716dfcf4830f1c08226c92bcaee7f6", - "sha256": "143rgmf4bn4mcfx3g4pa5qcd6ij4zqrn86qnhm0bffmd2x6pljsb" + "commit": "eaeab1021b391e3d6275ba7c186c5ac95fb8a10e", + "sha256": "1sxdiw1qwpr49a0l2q899r78mnwcwqhj4dfs22261acw7ifk07yb" }, "stable": { "version": [ @@ -24275,15 +24686,15 @@ "repo": "Fuco1/dired-hacks", "unstable": { "version": [ - 20221127, - 1247 + 20240629, + 1857 ], "deps": [ "dash", "dired-hacks-utils" ], - "commit": "41d3eb42195d9f0894c20d18cc8e722b099aa1c1", - "sha256": "0r08nxx5gw0sz9xhby77nw6rxd19wzvi9zkjkqwgixpxhbz6akvv" + "commit": "d1a85901c892ba7ec273995070a43cbbbe5d0b37", + "sha256": "0gk01vhk69l61k9wjzdin7dqzq19flzz405x14j1h0cjcxs0w5pr" } }, { @@ -24294,14 +24705,15 @@ "repo": "Fuco1/dired-hacks", "unstable": { "version": [ - 20230512, - 1107 + 20240629, + 1857 ], "deps": [ - "dash" + "dash", + "dired-hacks-utils" ], - "commit": "523f51b4152a3bf4e60fe57f512732c698b5c96f", - "sha256": "09z238y41rgy0jrn2hq5k6kj1k2skkgpf4kbfzyjzi6kcw8586bf" + "commit": "d1a85901c892ba7ec273995070a43cbbbe5d0b37", + "sha256": "0gk01vhk69l61k9wjzdin7dqzq19flzz405x14j1h0cjcxs0w5pr" } }, { @@ -24427,14 +24839,14 @@ "repo": "jojojames/dired-sidebar", "unstable": { "version": [ - 20240320, - 1952 + 20240522, + 2316 ], "deps": [ "dired-subtree" ], - "commit": "573658021fd6e6cf032d789de29aca4e5dd258fd", - "sha256": "0icy2mzkbcrf7dq0zlakq56h89jw0rdlgfn0z6zz0hlyq2d2zhz6" + "commit": "702165ad53a473992d84e0207b984b9be5114bde", + "sha256": "0f9cikyb53ybsawkm9g1sja2wsz2lmnc9zq63sx2h8d86acza2cp" }, "stable": { "version": [ @@ -24481,15 +24893,15 @@ "repo": "Fuco1/dired-hacks", "unstable": { "version": [ - 20230512, - 1107 + 20240629, + 1859 ], "deps": [ "dash", "dired-hacks-utils" ], - "commit": "523f51b4152a3bf4e60fe57f512732c698b5c96f", - "sha256": "09z238y41rgy0jrn2hq5k6kj1k2skkgpf4kbfzyjzi6kcw8586bf" + "commit": "b769c7de9c8c5dc70e4dcdbb3267c70fae3cb9b7", + "sha256": "05akgf4aqf687cvf5nw35v46c95f7nycdmxb4y6qmj2r39y5rmvz" } }, { @@ -24805,11 +25217,11 @@ "repo": "purcell/disable-mouse", "unstable": { "version": [ - 20210512, - 2114 + 20240604, + 900 ], - "commit": "cae3be9dd012727b40ad3b511731191f79cebe42", - "sha256": "0zx3ihhxhjvhsi08khyx8fdhw2kg065zhhicqc587jsabk0wzj6f" + "commit": "93a55a6453f34049375f97d3cf817b4e6db46f25", + "sha256": "0acqinbhb4vjyq4fhw2abslgkn6qwnvqbgzk6wbglff2m256vrdi" }, "stable": { "version": [ @@ -25466,11 +25878,11 @@ "repo": "ideasman42/emacs-doc-show-inline", "unstable": { "version": [ - 20240421, - 943 + 20240616, + 2345 ], - "commit": "d2bfa37f2f027c5da0abca319882daa3740ca57b", - "sha256": "0j70sg2gnf2qi367pskwbm24qvy8bl2qims04rjaw7knd9yiyh43" + "commit": "cc363ed39f023642c4d8e7c91b26c802ca356fa3", + "sha256": "02kh8wk202qppac7l7ap8hknb1hbg06gi66w5cpxhp32lijh1m90" } }, { @@ -25518,8 +25930,8 @@ "repo": "Silex/docker.el", "unstable": { "version": [ - 20231110, - 1006 + 20240805, + 1313 ], "deps": [ "aio", @@ -25528,8 +25940,8 @@ "tablist", "transient" ], - "commit": "2def2ab7fa04ed14403d00e3547a94c3822302cb", - "sha256": "13927ns3393q40gxrfzyqh6ajxzfjg14d0srfxi6ild3pmaz0460" + "commit": "d837c7dfc6c5a949f19e9d673a4ac70b960d282e", + "sha256": "09fyd6affgp7rfzfviw1qqqfpizkpyh0dl5pk7ck1ha1m2dymna0" }, "stable": { "version": [ @@ -25919,16 +26331,16 @@ "repo": "seagle0128/doom-modeline", "unstable": { "version": [ - 20240510, - 144 + 20240816, + 749 ], "deps": [ "compat", "nerd-icons", "shrink-path" ], - "commit": "65d0bd83eb7c393092e032c24b882f3ba19b4899", - "sha256": "1w657ss91f00kb3gghi9rs0a8cw2bszvik4yjzn6cj7m8ji3k3qi" + "commit": "37fc5cfe4cc8487e82942cf8478c4e42eb0a95bd", + "sha256": "104k3mj44qhb6m3bi3h84zgqrncfbhcc4frlig1ikbzpybmlxyi3" }, "stable": { "version": [ @@ -25953,15 +26365,15 @@ "repo": "elken/doom-modeline-now-playing", "unstable": { "version": [ - 20210831, - 1442 + 20240522, + 1704 ], "deps": [ "async", "doom-modeline" ], - "commit": "ef9158dfdf32e8eb789b69e7394d0bddaa68f42c", - "sha256": "1namv6qfmf5xxwbhsl5887cp41y8krr7g9vf3dzvi5n924ixlm2l" + "commit": "1532f324f98a234aa14e12ebdfd17cebba978d6a", + "sha256": "0mk759hznnpwvwzqykncgij60773z87x976ql5ccarz4j79j44sv" } }, { @@ -25972,14 +26384,14 @@ "repo": "doomemacs/themes", "unstable": { "version": [ - 20240404, - 2042 + 20240809, + 2135 ], "deps": [ "cl-lib" ], - "commit": "3b2422b208d28e8734b300cd3cc6a7f4af5eba55", - "sha256": "1ksv964vlzszbd2372kl80l60mmmiqxgyxypysrylrw831kkxfi9" + "commit": "c589b245d643dcc5ec93054ea436efc5255f9b88", + "sha256": "1dqcfh72x87lyx8f60nl25k7x9vdvgncl3a0cv952p022rclry00" }, "stable": { "version": [ @@ -26199,11 +26611,14 @@ "url": "https://salsa.debian.org/emacsen-team/dpkg-dev-el.git", "unstable": { "version": [ - 20240421, - 628 + 20240727, + 2303 + ], + "deps": [ + "debian-el" ], - "commit": "acfc3bd42271286d22d7cbadd48a5b9d5675f85c", - "sha256": "1mhh6kmlkbzaliyx8fwdnbmkhaaing4jkjc9ai76l5nyisjimqrc" + "commit": "eb00c58726be5e914b2487bccf7e3f716e7a61e1", + "sha256": "0by13757bxq794b1c11all0yd418mwjb0az70pf3m4lq6j9kn6pm" }, "stable": { "version": [ @@ -26249,11 +26664,11 @@ "repo": "dracula/emacs", "unstable": { "version": [ - 20231013, - 821 + 20240614, + 1303 ], - "commit": "29d5180f7e34c0c858a520068fb650f705b8cfc2", - "sha256": "0hjimiv6a0kaszypndb5l0axhiv0zih728p8wffil6jff9k8pr38" + "commit": "1dd3702bcca1191b082783062bde42668515c700", + "sha256": "0sxanisx51vcplnhgz7yn3xslslky4xp4ydjkrgwq045ppmq3rr7" }, "stable": { "version": [ @@ -26407,26 +26822,26 @@ "repo": "arnested/drupal-mode", "unstable": { "version": [ - 20220125, - 1044 + 20240816, + 1236 ], "deps": [ "php-mode" ], - "commit": "17927723adc5921e8058f7c29e5e50e88b975639", - "sha256": "1j0zlcjrz0pswcc8wh476vx503qvlyzjscwh0gs3cfss8j6r6gd5" + "commit": "3f91d1d44df11ebd0137a896055fca6a1bb2f554", + "sha256": "0gia6qrzdai0qa903gnxvnfn5mnva577jdf8zccz3i3f2ki02ygb" }, "stable": { "version": [ 0, - 7, - 3 + 8, + 1 ], "deps": [ "php-mode" ], - "commit": "49ce63c659aa0af7a2daf0c9e74e58fbce6deb71", - "sha256": "1l2xc24y037b3z62yxmq2bx1x3qqv56d15bf3qmb3mpgm4gh85j6" + "commit": "a353f8bdf3ed98f76b9418afbbc4ef17b5552647", + "sha256": "0gia6qrzdai0qa903gnxvnfn5mnva577jdf8zccz3i3f2ki02ygb" } }, { @@ -26454,6 +26869,30 @@ } }, { + "ename": "dslide", + "commit": "9e8c6aadf7a38beb2e18306067c5870195dc6b7c", + "sha256": "1hzz7bbn7d2qixa76jyw88z3bd42dm1p54lnjnzcnw3v7pikpwvq", + "fetcher": "github", + "repo": "positron-solutions/dslide", + "unstable": { + "version": [ + 20240703, + 1523 + ], + "commit": "2d8a9ac3e37157ce8b78880ebc1defc61303a44d", + "sha256": "177cfim8hd6292lhvvsapk695i0q378v4wk221l57nv197rnmy4n" + }, + "stable": { + "version": [ + 0, + 5, + 3 + ], + "commit": "2d8a9ac3e37157ce8b78880ebc1defc61303a44d", + "sha256": "177cfim8hd6292lhvvsapk695i0q378v4wk221l57nv197rnmy4n" + } + }, + { "ename": "dsvn", "commit": "be27e728327016b819535ef8cae10020e5a07c2e", "sha256": "189navhhakmkhfc2afsls1jiaxg62wxvpmmn00jlnwlgjm97gdk3", @@ -26542,19 +26981,19 @@ "repo": "jscheid/dtrt-indent", "unstable": { "version": [ - 20240211, - 1111 + 20240714, + 543 ], - "commit": "5d1b44f9a1a484ca229cc14f8062609a10ef4891", - "sha256": "1k8d4a7hq21ahiad0mlpyi637r0b2mzjpxhz09c69h1nk38nkzjn" + "commit": "a8aa356684804c52f26602d4e315f1306c6f3e59", + "sha256": "1bbgpljx6cqbcx9j35k1rid8bb2cydpkcssbh126pic53ng83iln" }, "stable": { "version": [ 1, - 17 + 18 ], - "commit": "e45fa760eecf74edfa9e8419f9f9773d8a7abadd", - "sha256": "0mjdqzl5mbasix8awav2qp9367waycmbcjy07s53nhv2xpqam9la" + "commit": "339755e4fb5245862737babf7f2c1e3bae1c129c", + "sha256": "1sw0wabk68ixqip7kmkdvhw9rxz266cj8rs4hz3zlbcf7q6pjq6r" } }, { @@ -26624,16 +27063,16 @@ "repo": "jacktasia/dumb-jump", "unstable": { "version": [ - 20240514, - 702 + 20240625, + 224 ], "deps": [ "dash", "popup", "s" ], - "commit": "3c2ab8dfff3a10d3c5f2efd69cfbc81fb5dbbd39", - "sha256": "0q37akv7xnwq14a7zn7cjr3njkkkl7vfrkkr0di8bw9p6dyvwqw4" + "commit": "cd65a743370ac7b1a12e9ef0a7371b285a2597fb", + "sha256": "1ly7xsfliyw38hqh862p6m37mxl460k4zq1fy3xs0jz9q3ak84iq" }, "stable": { "version": [ @@ -26682,11 +27121,11 @@ "stable": { "version": [ 3, - 15, - 2 + 16, + 0 ], - "commit": "c28817c416ac0b381f6a6938236419ab5d86d6e1", - "sha256": "0rgrfpw588mgw78p87xlrlidc9xhkppf6b7dqa3vqlhjxs5q6kqg" + "commit": "e4380ffddbdf924b3ec4c56048cd8331e1bf39ed", + "sha256": "0sxz15g1lhgm880glix2y0dinsidpv83ss7cvb2ff12rbjhk4a4w" } }, { @@ -26804,11 +27243,11 @@ "repo": "sadiq/dwim-coder-mode", "unstable": { "version": [ - 20230830, - 1215 + 20240712, + 1047 ], - "commit": "94a752fca078144dd309343880abafbc4eacca5f", - "sha256": "010z2bcscizd75shmbgrjfvlkzsfjcvqcif7pm5a5iynmjx5n4n7" + "commit": "02f5fa0c3ae5cc17ca860c792d988705f41b0eee", + "sha256": "0p1yz2lnzifqsjqcbk2jk9darj72icnydaxwhs2h0hmvl786g4gi" } }, { @@ -26819,11 +27258,20 @@ "repo": "xenodium/dwim-shell-command", "unstable": { "version": [ - 20240520, - 1732 + 20240818, + 1615 + ], + "commit": "2a97a027a0bb1c48fc2004d6e9ae4340522a9bfc", + "sha256": "1vb1irv81hzzpbdhgzxmq9zdfih1w9ckri9db4pfciy54gcsbwk8" + }, + "stable": { + "version": [ + 0, + 62, + 2 ], - "commit": "c20a474ba8fc0ad73a1b30aeb99502cbfc709c0b", - "sha256": "0lj8rkvpns4fpdmwriax0i5yijqraji1vjbdc6scyvpmdmsqd3p1" + "commit": "7d1c45aa2bc782c448cadd989dc776c2e5f83514", + "sha256": "0iy4pg86sl1z3mwnfm6nsy9gjanddbpyg9w099wvflpq0l54lm0g" } }, { @@ -26964,11 +27412,11 @@ "repo": "countvajhula/dynaring", "unstable": { "version": [ - 20230619, - 1854 + 20240615, + 129 ], - "commit": "909a64aa96f09b05fe59d5703f7e0ad22d161bb5", - "sha256": "18vf0646wqnahnc7rj0wzq9shd1g69hr5j35psgcdzkrczma16m7" + "commit": "90daf413abee1723c37697e72bb700a06727ff4b", + "sha256": "12634kmx7fdb3lndyjgf7hisdzcqg3hn90xqr56gjdj0m5yzq310" }, "stable": { "version": [ @@ -27287,20 +27735,20 @@ "repo": "emacs-eask/eask", "unstable": { "version": [ - 20240420, - 44 + 20240614, + 541 ], - "commit": "ecee5a60b9e13796400e9dec84ce55f89767b6fa", - "sha256": "09g53ijbxlk48i1s7fj7iyhh4j230xpv673lia19k3364pzy361g" + "commit": "8015c62602188c008988fc6825ff97b04c614c8f", + "sha256": "1qz7jql5g2n643hws5ybaj78zdrqm6pnnbi0bvgzchfbc5nc1h2b" }, "stable": { "version": [ 0, - 9, - 5 + 10, + 0 ], - "commit": "a0361201d5d0c4552b3075cec8ffaf11a867054d", - "sha256": "1irwqampchd2n70pnlhamnjnlaaj4qiqhwnmvhjgk5bi51bp8kb9" + "commit": "94a45a3422a04819a5090d8acaec4fc563c6dfa9", + "sha256": "0wm2bhadsgs429f67bgvxxfdxkhf4z3v3mypdxbyrhlkzwqdmiag" } }, { @@ -27338,8 +27786,8 @@ "repo": "emacs-eask/easky", "unstable": { "version": [ - 20240420, - 113 + 20240608, + 744 ], "deps": [ "ansi", @@ -27348,8 +27796,8 @@ "lv", "marquee-header" ], - "commit": "bde4a0af084f356b993b5fd5b727c05c54e1d132", - "sha256": "17cg70n50h1jpi2j705wpy4g3xgca8hqhraqinbk1lac9z2s3sil" + "commit": "d75ec4865742a4939bd685360f8ec5b076bdcf77", + "sha256": "10zqx7kfjw6rzq0mqpj4s3sdb13rabw98bkgm9nddi387ffmamql" }, "stable": { "version": [ @@ -27546,6 +27994,36 @@ } }, { + "ename": "easysession", + "commit": "3e9ed8efcc22219b1d4fb804521a47670b7668d3", + "sha256": "0k540y7vp5cb378fh3nn15f29551rj1b47dw4ambjn8gl0c0x7jq", + "fetcher": "github", + "repo": "jamescherti/easysession.el", + "unstable": { + "version": [ + 20240814, + 1817 + ], + "deps": [ + "f" + ], + "commit": "7bf893a307be84af43c00fa6b9eed2e4f9d920b8", + "sha256": "1mg6kkvgdb8fwbmw2ipb1jmrm4gdmkl62cdqr045mii5vkpmpmmf" + }, + "stable": { + "version": [ + 1, + 0, + 5 + ], + "deps": [ + "f" + ], + "commit": "3558bcf052e5cd9936ffd2a0d648d991a35581bd", + "sha256": "18ga3sq8jfyp4y7w16hkpbvlpmshv5la3ajgvagmanlqg3q81pys" + } + }, + { "ename": "ebdb-mua-sidecar", "commit": "14ce9b9c023ca8d3b42485253212c65e50a5e352", "sha256": "0zgf4ps0pid58md63l95kryhvi50pjpv4p4vhm0c6d47nwmysw6h", @@ -27618,28 +28096,28 @@ "repo": "joostkremers/ebib", "unstable": { "version": [ - 20240430, - 1436 + 20240723, + 1149 ], "deps": [ "compat", "parsebib" ], - "commit": "2f2d39d1953fa10d7c3dad6a4611d8ec0d489aba", - "sha256": "0x40cwcibl3dsyxmqn3yhsbw5pyisx5yypjy6qm7hzi6r2wxgvzr" + "commit": "5ea510a1e4ab17a442352d0212777da5f78d4be2", + "sha256": "080n9k0r9w4hdcg5g89blyyr0c6q2jhwqn42fvizn6z8xkkn5cbp" }, "stable": { "version": [ 2, - 41, - 1 + 42, + 2 ], "deps": [ "compat", "parsebib" ], - "commit": "3458aa7777e0acf883b17008da78788c62d9a337", - "sha256": "1ylq4l044rals7xbf8rcx97gz84kypksl2fs5xwin2rc6rvpli8d" + "commit": "dcebdbfdd3129a8e0b40fe69c27a6933bc0b7a4f", + "sha256": "1ib9jicj3hfwqz909fw4mzspbdg61g1kbi142r6qg99kaim5py2k" } }, { @@ -27731,11 +28209,11 @@ "repo": "benzanol/echo-bar.el", "unstable": { "version": [ - 20240521, - 326 + 20240601, + 1744 ], - "commit": "0e221754cb40406609ae5c79ac294683850638e1", - "sha256": "0cwpphdj78g6w4an58qrf3mbqji0lm6cfzkz099pcppg17ljz4h4" + "commit": "80f5a8bbd8ac848d4a69796c9568b4a55958e974", + "sha256": "1mpq8ha42lffzzwy0ib8vbb2dp9fgqnh112wfa1a6b3vh21wnxm8" } }, { @@ -28193,14 +28671,11 @@ "repo": "editorconfig/editorconfig-emacs", "unstable": { "version": [ - 20240512, - 1958 - ], - "deps": [ - "nadvice" + 20240813, + 801 ], - "commit": "6ac848e380322bb52d6f70a032e12f70d60daab1", - "sha256": "08fl3jg2vklyczqdz3ifaa0j4zkq7siz0m141lzcq5rahi7c65g6" + "commit": "648f0cf9aeb72db77b252832a58367332b7bc055", + "sha256": "03fms46mfdqi9czp1nkccm9zpi1g5n41djfh299phs4sz8nl19lk" }, "stable": { "version": [ @@ -28451,11 +28926,11 @@ "repo": "oxidase/eff", "unstable": { "version": [ - 20240108, - 658 + 20240708, + 231 ], - "commit": "b8ce5d82dc2ef4df912b2b0cbe79e20b455ebd84", - "sha256": "0y7hz4cmhr6n91wv5q82ly2fjj4k0ihvc7pgr7wmbj63pvzbdys8" + "commit": "b8298439360b29333d3dcd8a352e00cde2b6ccd7", + "sha256": "0s8k4nfr8m13c1ylsn401yhf17ym15lh950smv01lbymkghcxvkg" }, "stable": { "version": [ @@ -28727,22 +29202,22 @@ }, { "ename": "eglot-signature-eldoc-talkative", - "commit": "1639318f0f1730ab5b0e575256d93882d2fd063f", - "sha256": "03nz0xnzwf1db0b3whz7s8bykp2m9jnlssa9g4mpslaq1bwvfkry", + "commit": "1839deb57d34adc76db0b1a1a877b3cb542a6810", + "sha256": "1b1ymfm8nc505dy7c6cgmhac22pz98jb21gwnjynv5gbbqscb78s", "fetcher": "codeberg", - "repo": "mekeor/emacs-eglot-signature-eldoc-talkative", + "repo": "mekeor/eglot-signature-eldoc-talkative", "unstable": { "version": [ - 20240424, - 801 + 20240626, + 815 ], "deps": [ "eglot", "eldoc", "jsonrpc" ], - "commit": "859aa6f2c0acf060a8e7549b79daf46c8d63ea8d", - "sha256": "1s44kz9b2b61f5gy922rvzv1kpmx62chvdsnb1g785skdhfdzb6v" + "commit": "34cc207265f26f13142f5c62276e0ba18e1d55e4", + "sha256": "1p2qsv525jnmdsb7d3wqdhpryb1srgpf83g5l79lkq9mx776m2qn" }, "stable": { "version": [ @@ -28945,28 +29420,28 @@ "repo": "ahyatt/ekg", "unstable": { "version": [ - 20240506, - 419 + 20240818, + 437 ], "deps": [ "llm", "triples" ], - "commit": "c23f6672fa1075d11e942dffc1c37701731b94f0", - "sha256": "0s0cdvifxiz0r4widbcqlg19mcnxkhpcbgibi0c4p9n1iaqc1bfp" + "commit": "789cb6d954e0b31f8c25cc0bfa84ba812820f5cf", + "sha256": "0klwjc2k0kmbqpija9r4cjmdnf1j58n1gmmhqdp123q22pk4d96y" }, "stable": { "version": [ 0, - 5, - 1 + 6, + 2 ], "deps": [ "llm", "triples" ], - "commit": "8f050a65837d6d3ec4ea3ba7539541518d061539", - "sha256": "0hd5d7kiw8qbdpgxkv6zpknp799g61cqdjsi7jlgmj1dznryrxz6" + "commit": "00ae22d95ee7a006214589b905fc9b7e268141b2", + "sha256": "1hfp2v3d6wgbi8v53da72yanqrksyqygmqq6wkfhz896h21fi99j" } }, { @@ -29438,11 +29913,11 @@ "repo": "Mstrodl/elcord", "unstable": { "version": [ - 20240305, - 2138 + 20240815, + 30 ], - "commit": "e2775f40ec55dfdceea83d535dff77d60534b6bc", - "sha256": "0dw5vf6iqncs12x494z5cj7ym9daxaa9ldzbja7vgzkdyy82yvp4" + "commit": "252019e21d7de9c06124f4ceddae324b477a64b8", + "sha256": "1bvscz7v17p9f03n9mmxqwvnfp316f2z90h8zrd6fyvcafbw3af5" } }, { @@ -29480,6 +29955,21 @@ } }, { + "ename": "elcute", + "commit": "53b72d7a58b48652ecb140cb4ddac93536522c01", + "sha256": "0dawqaaghaiz6mqvmcmmws5wlhx3h9x8bnbf9qam4pvzm4c29nz4", + "fetcher": "codeberg", + "repo": "vilij/slurpbarf-elcute", + "unstable": { + "version": [ + 20240724, + 2106 + ], + "commit": "b604f934c0c919f5eb0155e38202875b796ac4de", + "sha256": "1ba6kf4fzjzcz30sv5976c4p25wd4xavw8hyh50hyyi4zsaqxdp6" + } + }, + { "ename": "eldev", "commit": "6d94da66938ea895c0b32bb54057c3b36bebf36d", "sha256": "11plii1q276ravzb3qi2h25rfadvx4j5l55lj7ldjar8rxvilhij", @@ -29487,11 +29977,11 @@ "repo": "emacs-eldev/eldev", "unstable": { "version": [ - 20240511, - 2039 + 20240609, + 1211 ], - "commit": "5153b5a747aaadb51ac14f3963e3ffbf59273e74", - "sha256": "183pa9sxg0qg0kd75vgll7xfaplpkrlj077vdqhh5qcciikhqhla" + "commit": "bb1938237ee85e477243cd45421330403df29390", + "sha256": "01fmgafs294lns10nj31pj327v943x7r4y81plp43gm8cngzgf0r" }, "stable": { "version": [ @@ -29511,20 +30001,20 @@ "repo": "casouri/eldoc-box", "unstable": { "version": [ - 20240426, - 408 + 20240605, + 1742 ], - "commit": "4392128d4caaa21f7810ba0955514c395e9f3cae", - "sha256": "0nf28jh02al8vqyj0awij2hbqa03jkggdysc0v8kjlsrd673scgp" + "commit": "9658ba7d4616e97f2feeda3abf4aab3e96c91f28", + "sha256": "0gr8k2xbqc43jhzd3j91dzl639hgq5083qx8k9rx30wjdlpd4j09" }, "stable": { "version": [ 1, - 11, + 12, 1 ], - "commit": "24c216ea3a2d369b814047271a8edf0c7c404b39", - "sha256": "0fzcyjg61icwjw1ml3p9qzd4a10vl7n1hqdpynqr5nlq9ih7rrgq" + "commit": "0be491c30e2f97da6bd680174a3223847eae567a", + "sha256": "1v163zk8qazz92q2iv9f0sgq2paryx80m94hbl588lhnyk227lsb" } }, { @@ -29862,20 +30352,20 @@ "repo": "skeeto/elfeed", "unstable": { "version": [ - 20240331, - 1348 + 20240729, + 1741 ], - "commit": "5c05a1eab37bc113ecb158a4d57fe05352fa2c6a", - "sha256": "1ir9vp2629dg3gxhlrf043gwbbf093p08q4igvx2r9hh6kraca5c" + "commit": "904b6d4feca78e7e5336d7dbb7b8ba53b8c4dac1", + "sha256": "0yq93abyadzrmcd40pi06wcr4jg9ddhlz2phg0wjypprqvv4q49z" }, "stable": { "version": [ 3, 4, - 1 + 2 ], - "commit": "0ccd59aaace34546017a1a0d7c393749747d5bc6", - "sha256": "1ghdvfn4f9y69r59i1ga9b3ib1r8sbqg6q1v5rz3f9paagfavrd1" + "commit": "904b6d4feca78e7e5336d7dbb7b8ba53b8c4dac1", + "sha256": "0yq93abyadzrmcd40pi06wcr4jg9ddhlz2phg0wjypprqvv4q49z" } }, { @@ -30046,26 +30536,26 @@ "repo": "sp1ff/elfeed-score", "unstable": { "version": [ - 20230728, - 1433 + 20240711, + 433 ], "deps": [ "elfeed" ], - "commit": "cc1a05a95bff953eb28151056ce3ce14ba3e901d", - "sha256": "0s37m8566g396d8480jac07c89f2jjpg6p3hcwwmz89s27agp81q" + "commit": "c2be8c12d4c1e7027409d4a1b7876da68f3c167c", + "sha256": "0kmg3pciqihs8r5xja3pv48gzkn3vs6y6ij0dlmzmavymfp7hq5z" }, "stable": { "version": [ 1, 2, - 7 + 8 ], "deps": [ "elfeed" ], - "commit": "cc1a05a95bff953eb28151056ce3ce14ba3e901d", - "sha256": "0s37m8566g396d8480jac07c89f2jjpg6p3hcwwmz89s27agp81q" + "commit": "c2be8c12d4c1e7027409d4a1b7876da68f3c167c", + "sha256": "0kmg3pciqihs8r5xja3pv48gzkn3vs6y6ij0dlmzmavymfp7hq5z" } }, { @@ -30108,15 +30598,15 @@ "repo": "karthink/elfeed-tube", "unstable": { "version": [ - 20240511, - 418 + 20240606, + 241 ], "deps": [ "aio", "elfeed" ], - "commit": "1f5ad2cc26d6290eb77dd36716e5887cb2cd617c", - "sha256": "1c0nxzqhldn59hgalvx24r7wn0s641jv6akv8vra6m8qwarw9ksk" + "commit": "0c3fbc21259e1fa794f3179a53b410ba610231f2", + "sha256": "0hg2s5yzpd1fsl0fyrfv2cc2m61a67drfg86msfqpqdmkv30pbca" }, "stable": { "version": [ @@ -30170,28 +30660,28 @@ "repo": "skeeto/elfeed", "unstable": { "version": [ - 20210226, - 258 + 20240729, + 1741 ], "deps": [ "elfeed", "simple-httpd" ], - "commit": "0ccd59aaace34546017a1a0d7c393749747d5bc6", - "sha256": "1ghdvfn4f9y69r59i1ga9b3ib1r8sbqg6q1v5rz3f9paagfavrd1" + "commit": "904b6d4feca78e7e5336d7dbb7b8ba53b8c4dac1", + "sha256": "0yq93abyadzrmcd40pi06wcr4jg9ddhlz2phg0wjypprqvv4q49z" }, "stable": { "version": [ 3, 4, - 1 + 2 ], "deps": [ "elfeed", "simple-httpd" ], - "commit": "0ccd59aaace34546017a1a0d7c393749747d5bc6", - "sha256": "1ghdvfn4f9y69r59i1ga9b3ib1r8sbqg6q1v5rz3f9paagfavrd1" + "commit": "904b6d4feca78e7e5336d7dbb7b8ba53b8c4dac1", + "sha256": "0yq93abyadzrmcd40pi06wcr4jg9ddhlz2phg0wjypprqvv4q49z" } }, { @@ -30280,30 +30770,32 @@ "repo": "s-kostyaev/elisa", "unstable": { "version": [ - 20240401, - 1528 + 20240721, + 1247 ], "deps": [ "async", "ellama", - "llm" + "llm", + "plz" ], - "commit": "c03baded1e6b1bb6b37f8df83a0d1af4cdbaf860", - "sha256": "0xl6yz6536mbnba2g1ghv3c8zqqbag3kr8nqa87p0hpcqa6daz0m" + "commit": "85373924896c92b7c27d6737d247f0084df99d6a", + "sha256": "09w1vvpx8zbsnp8sxk3ywzmim4w6msqg2cg19azgyd1kllxzsz0q" }, "stable": { "version": [ - 0, 1, + 0, 4 ], "deps": [ "async", "ellama", - "llm" + "llm", + "plz" ], - "commit": "c03baded1e6b1bb6b37f8df83a0d1af4cdbaf860", - "sha256": "0xl6yz6536mbnba2g1ghv3c8zqqbag3kr8nqa87p0hpcqa6daz0m" + "commit": "85373924896c92b7c27d6737d247f0084df99d6a", + "sha256": "09w1vvpx8zbsnp8sxk3ywzmim4w6msqg2cg19azgyd1kllxzsz0q" } }, { @@ -30314,11 +30806,11 @@ "repo": "ideasman42/emacs-elisp-autofmt", "unstable": { "version": [ - 20240421, - 854 + 20240801, + 1325 ], - "commit": "0560fe21d1173b2221fd8c600fab818f7eecbad4", - "sha256": "00vsgjqb3qfm2lr2vqf10yr84b07l63pgkqvi0s1a0js7mvv6s65" + "commit": "43a44dcbd17adf3b235de93e748321c7076f1c3c", + "sha256": "1c03qssa74jrsszcsvz1whj5md5vcdximxg8yfyq0s3spld8bs2n" } }, { @@ -30628,28 +31120,30 @@ "repo": "s-kostyaev/ellama", "unstable": { "version": [ - 20240517, - 1457 + 20240721, + 1138 ], "deps": [ + "compat", "llm", "spinner" ], - "commit": "fddc1022b5e16e356d6f65ddac51bd2ccf25209c", - "sha256": "0pkhm4kz6wrad3vwk9xf8876sz3fc9m7bypffzfa7wg0ivz547jk" + "commit": "8270e71c335b1656384e6c1b9d61c2a7ecc65bbb", + "sha256": "12p56vynj86qyz0bif1pcqz83n2q694frgxbfxlw5ws8igzx1hzl" }, "stable": { "version": [ 0, - 9, - 4 + 11, + 13 ], "deps": [ + "compat", "llm", "spinner" ], - "commit": "fddc1022b5e16e356d6f65ddac51bd2ccf25209c", - "sha256": "0pkhm4kz6wrad3vwk9xf8876sz3fc9m7bypffzfa7wg0ivz547jk" + "commit": "8270e71c335b1656384e6c1b9d61c2a7ecc65bbb", + "sha256": "12p56vynj86qyz0bif1pcqz83n2q694frgxbfxlw5ws8igzx1hzl" } }, { @@ -31009,11 +31503,11 @@ "url": "https://thelambdalab.xyz/git/elpher.git", "unstable": { "version": [ - 20240324, - 1315 + 20240702, + 816 ], - "commit": "56bc74e224d9835c41b6e6b68c9705b60e6dbbe2", - "sha256": "00z41vw63vm71i5szmvrxspvnzkpzflpip56jnmkjc94qfla2l8s" + "commit": "0bd12913940a047724d830725bf8649e4f8df499", + "sha256": "0pbx9zgig14qzgaar0ks425hmrmmgl3a50w4ykzy6r7ahbg93g88" }, "stable": { "version": [ @@ -31391,28 +31885,28 @@ "repo": "emacscollective/elx", "unstable": { "version": [ - 20240506, - 1556 + 20240805, + 1311 ], "deps": [ "compat", "llama" ], - "commit": "9db9f8dcc595717d82943fef66f554a4b40aff0b", - "sha256": "1cn4qya2miky1bwiwdkbp6kykcf5syy3hb7vfz5jlld4i9ckc23c" + "commit": "be1afda54a182c726d7f0c584b2ac4854384ffda", + "sha256": "02wy4wsp2lk07kwb2pzi9bsb947walsndbjgllqpc35bhky50l0k" }, "stable": { "version": [ 2, 0, - 0 + 3 ], "deps": [ "compat", "llama" ], - "commit": "f3dfcb41c6471b8150cc19cea5ff96fe1321f5a1", - "sha256": "1m01fmhxgqrk22llwwafyg3a29h5bhrbdv9mpf6yyqdm2f37h3yb" + "commit": "be1afda54a182c726d7f0c584b2ac4854384ffda", + "sha256": "02wy4wsp2lk07kwb2pzi9bsb947walsndbjgllqpc35bhky50l0k" } }, { @@ -31438,20 +31932,21 @@ "repo": "knu/emacsc", "unstable": { "version": [ - 20240104, - 634 + 20240629, + 1325 ], - "commit": "9bec453a4170dbcb409b884e3e8d30f388de7b8d", - "sha256": "0w24vkxdl7z9yfijc1r02siz48sixdm3mygm5dig0b30kc76agz1" + "commit": "49b0bbbcd021424da4000bf47193bd2d928b2228", + "sha256": "0fyxhbng9cckdbmp0jc2x88azajr68r14jzak2zqh5pqlvs6hcjz" }, "stable": { "version": [ 1, 5, - 20230104 + 20240629, + 1 ], - "commit": "9bec453a4170dbcb409b884e3e8d30f388de7b8d", - "sha256": "0w24vkxdl7z9yfijc1r02siz48sixdm3mygm5dig0b30kc76agz1" + "commit": "49b0bbbcd021424da4000bf47193bd2d928b2228", + "sha256": "0fyxhbng9cckdbmp0jc2x88azajr68r14jzak2zqh5pqlvs6hcjz" } }, { @@ -31471,185 +31966,170 @@ }, { "ename": "emacsql", - "commit": "2e40e3364a5dec38672753093c28ae97d85de189", - "sha256": "0chvx5y58zabp690fvxxizmvc8px62vqb88xq0s1qmi4k7w08bad", + "commit": "d3a5173a519b5b6d3dc37a8ff62d3c0e2dad8dff", + "sha256": "1jmci7m6my4w0k5xl1bhw2fa3f21546mf51lg13dmkjk7608bvy5", "fetcher": "github", "repo": "magit/emacsql", "unstable": { "version": [ - 20240415, - 1535 + 20240819, + 1559 ], - "commit": "5108c16c5e1d5bfdd41fcc0807241e28886ab763", - "sha256": "0sww0d4kbrsvf3123m0ddqxi59p4myajz1y2v25yx3ixrpy6xpmv" + "commit": "e5f0928a047dba8e3a00b6333400422b301bac35", + "sha256": "1d7628rmb5wwvafrn3m3f8z3mb696wklwlcds71j8l5x782wh8hf" }, "stable": { "version": [ - 3, - 1, + 4, + 0, 1 ], - "commit": "c1a44076c0e44d5730b67b13c0e741f66f52fc85", - "sha256": "1xpmji2qgr9r38cdhws65x9s9jy7fk93q8g1j2fm7j8kcfjh9x3g" + "commit": "e5f0928a047dba8e3a00b6333400422b301bac35", + "sha256": "1d7628rmb5wwvafrn3m3f8z3mb696wklwlcds71j8l5x782wh8hf" } }, { "ename": "emacsql-mysql", - "commit": "f7e6b437ceaaba30f84580656fcaee728332bece", - "sha256": "01zs7cprfjcjmw661k8c88nvp2lk7ynvhgbj9n24p8m042p4jj4v", + "commit": "9875de56d4c4f5e1d6f127a0b2e408e87a9dd932", + "sha256": "1bpi5iqfydcii7di990l5nskgxk0cqg6zg1yddadbdfdznsi37hm", "fetcher": "github", "repo": "magit/emacsql", "unstable": { "version": [ - 20240415, - 1535 - ], - "deps": [ - "emacsql" + 20240808, + 2016 ], - "commit": "5108c16c5e1d5bfdd41fcc0807241e28886ab763", - "sha256": "0sww0d4kbrsvf3123m0ddqxi59p4myajz1y2v25yx3ixrpy6xpmv" + "commit": "c786ea159facf5892e9c4e5b7bdda44da95cd62e", + "sha256": "0839mkwqb81g27bi6h92rpvl3dfy0dgc2yabrn9c4lby9c3pivp3" }, "stable": { "version": [ - 3, - 1, + 4, + 0, 1 ], - "deps": [ - "emacsql" - ], - "commit": "c1a44076c0e44d5730b67b13c0e741f66f52fc85", - "sha256": "1xpmji2qgr9r38cdhws65x9s9jy7fk93q8g1j2fm7j8kcfjh9x3g" + "commit": "e5f0928a047dba8e3a00b6333400422b301bac35", + "sha256": "1d7628rmb5wwvafrn3m3f8z3mb696wklwlcds71j8l5x782wh8hf" } }, { "ename": "emacsql-pg", - "commit": "f7e6b437ceaaba30f84580656fcaee728332bece", - "sha256": "0p3kq642lgjqfhfk1dfa15wfi0axb1zq9g7n75ci0p4fi761i020", + "commit": "9875de56d4c4f5e1d6f127a0b2e408e87a9dd932", + "sha256": "0pryfj9wi3kd6cbxnh8wwgyxhj17ihnic26a9a21rd769m2bsg5a", "fetcher": "github", "repo": "magit/emacsql", "unstable": { "version": [ - 20240415, - 1535 - ], - "deps": [ - "emacsql", - "pg" + 20240808, + 2016 ], - "commit": "5108c16c5e1d5bfdd41fcc0807241e28886ab763", - "sha256": "0sww0d4kbrsvf3123m0ddqxi59p4myajz1y2v25yx3ixrpy6xpmv" + "commit": "c786ea159facf5892e9c4e5b7bdda44da95cd62e", + "sha256": "0839mkwqb81g27bi6h92rpvl3dfy0dgc2yabrn9c4lby9c3pivp3" }, "stable": { "version": [ - 3, - 1, + 4, + 0, 1 ], - "deps": [ - "emacsql", - "pg" - ], - "commit": "c1a44076c0e44d5730b67b13c0e741f66f52fc85", - "sha256": "1xpmji2qgr9r38cdhws65x9s9jy7fk93q8g1j2fm7j8kcfjh9x3g" + "commit": "e5f0928a047dba8e3a00b6333400422b301bac35", + "sha256": "1d7628rmb5wwvafrn3m3f8z3mb696wklwlcds71j8l5x782wh8hf" } }, { "ename": "emacsql-psql", - "commit": "f7e6b437ceaaba30f84580656fcaee728332bece", - "sha256": "10fxnb0l5y0l39yry6y3gshnaml19m62ii72770sdcfqi2llm3hw", + "commit": "9875de56d4c4f5e1d6f127a0b2e408e87a9dd932", + "sha256": "1kgpmjc81y1851cwn3z2hfs4ia3hllh5b7h7iw5kzpb44kpicqpl", "fetcher": "github", "repo": "magit/emacsql", "unstable": { "version": [ - 20240415, - 1535 - ], - "deps": [ - "emacsql" + 20240808, + 2016 ], - "commit": "5108c16c5e1d5bfdd41fcc0807241e28886ab763", - "sha256": "0sww0d4kbrsvf3123m0ddqxi59p4myajz1y2v25yx3ixrpy6xpmv" + "commit": "c786ea159facf5892e9c4e5b7bdda44da95cd62e", + "sha256": "0839mkwqb81g27bi6h92rpvl3dfy0dgc2yabrn9c4lby9c3pivp3" }, "stable": { "version": [ - 3, - 1, + 4, + 0, 1 ], - "deps": [ - "emacsql" - ], - "commit": "c1a44076c0e44d5730b67b13c0e741f66f52fc85", - "sha256": "1xpmji2qgr9r38cdhws65x9s9jy7fk93q8g1j2fm7j8kcfjh9x3g" + "commit": "e5f0928a047dba8e3a00b6333400422b301bac35", + "sha256": "1d7628rmb5wwvafrn3m3f8z3mb696wklwlcds71j8l5x782wh8hf" } }, { "ename": "emacsql-sqlite", - "commit": "f5f22149f13c361f6657d41f4a22ede651eaaa25", - "sha256": "0323bvxrg7sgkb8fpi96b7ks4ypgxgxkryk0ccx0wsjp2v87kajb", + "commit": "9875de56d4c4f5e1d6f127a0b2e408e87a9dd932", + "sha256": "1dxc8iyshlg5k4hn3alpg4wwfs138f0i65bdjj9rlwl6qinxq0ab", "fetcher": "github", "repo": "magit/emacsql", "unstable": { "version": [ - 20240415, - 1535 - ], - "deps": [ - "emacsql" + 20240808, + 2016 ], - "commit": "5108c16c5e1d5bfdd41fcc0807241e28886ab763", - "sha256": "0sww0d4kbrsvf3123m0ddqxi59p4myajz1y2v25yx3ixrpy6xpmv" + "commit": "c786ea159facf5892e9c4e5b7bdda44da95cd62e", + "sha256": "0839mkwqb81g27bi6h92rpvl3dfy0dgc2yabrn9c4lby9c3pivp3" }, "stable": { "version": [ - 3, - 1, + 4, + 0, 1 ], - "deps": [ - "emacsql" - ], - "commit": "c1a44076c0e44d5730b67b13c0e741f66f52fc85", - "sha256": "1xpmji2qgr9r38cdhws65x9s9jy7fk93q8g1j2fm7j8kcfjh9x3g" + "commit": "e5f0928a047dba8e3a00b6333400422b301bac35", + "sha256": "1d7628rmb5wwvafrn3m3f8z3mb696wklwlcds71j8l5x782wh8hf" } }, { "ename": "emacsql-sqlite-builtin", - "commit": "62abfe3f85904858c9a1651ab98df763612f1b51", - "sha256": "10v2bf0av7li9q90csa6b478hjhfq83kr7laqvrcxxdx4kwi6cr3", + "commit": "9875de56d4c4f5e1d6f127a0b2e408e87a9dd932", + "sha256": "0yyabz7ai276lhqyc9w7jac8rky96635p34jy9bssh3nq2l99b9b", "fetcher": "github", "repo": "magit/emacsql", "unstable": { "version": [ - 20240415, - 1535 + 20240808, + 2016 ], - "deps": [ - "emacsql" + "commit": "c786ea159facf5892e9c4e5b7bdda44da95cd62e", + "sha256": "0839mkwqb81g27bi6h92rpvl3dfy0dgc2yabrn9c4lby9c3pivp3" + }, + "stable": { + "version": [ + 4, + 0, + 1 ], - "commit": "5108c16c5e1d5bfdd41fcc0807241e28886ab763", - "sha256": "0sww0d4kbrsvf3123m0ddqxi59p4myajz1y2v25yx3ixrpy6xpmv" + "commit": "e5f0928a047dba8e3a00b6333400422b301bac35", + "sha256": "1d7628rmb5wwvafrn3m3f8z3mb696wklwlcds71j8l5x782wh8hf" } }, { "ename": "emacsql-sqlite-module", - "commit": "62abfe3f85904858c9a1651ab98df763612f1b51", - "sha256": "1nhwc1yk0w3sa9x454j8gyi77h2d31dzvfph56xvfaa7r5i4a0j0", + "commit": "9875de56d4c4f5e1d6f127a0b2e408e87a9dd932", + "sha256": "07flj471cxdbhx4z8qzqghgk0n4y72mnw947ighasg9042564vqs", "fetcher": "github", "repo": "magit/emacsql", "unstable": { "version": [ - 20240415, - 1535 + 20240808, + 2016 ], - "deps": [ - "emacsql", - "sqlite3" + "commit": "c786ea159facf5892e9c4e5b7bdda44da95cd62e", + "sha256": "0839mkwqb81g27bi6h92rpvl3dfy0dgc2yabrn9c4lby9c3pivp3" + }, + "stable": { + "version": [ + 4, + 0, + 1 ], - "commit": "5108c16c5e1d5bfdd41fcc0807241e28886ab763", - "sha256": "0sww0d4kbrsvf3123m0ddqxi59p4myajz1y2v25yx3ixrpy6xpmv" + "commit": "e5f0928a047dba8e3a00b6333400422b301bac35", + "sha256": "1d7628rmb5wwvafrn3m3f8z3mb696wklwlcds71j8l5x782wh8hf" } }, { @@ -31756,14 +32236,14 @@ "repo": "oantolin/embark", "unstable": { "version": [ - 20240419, - 452 + 20240724, + 1801 ], "deps": [ "compat" ], - "commit": "195add1f1ccd1059472c9df7334c97c4d155425e", - "sha256": "1361jvwr3wjbpmq6dfkrhhhv9vrmqpkp1j18syp311g6h8hzi3hg" + "commit": "19a13e344e04bbf861eaa74491b23da52b398672", + "sha256": "1w9xr6dq625mnpzzxlkkkln5mmf85msjzm4nqgxh910xslk1xbrr" }, "stable": { "version": [ @@ -31785,16 +32265,16 @@ "repo": "oantolin/embark", "unstable": { "version": [ - 20240419, - 452 + 20240717, + 2103 ], "deps": [ "compat", "consult", "embark" ], - "commit": "195add1f1ccd1059472c9df7334c97c4d155425e", - "sha256": "1361jvwr3wjbpmq6dfkrhhhv9vrmqpkp1j18syp311g6h8hzi3hg" + "commit": "4ddbe6326bc596a05b574cf0109acdb5a79bc748", + "sha256": "0919drkk78ksqar8a9k2k9n84aq7fhmx5cpdbc3kqrwsyf3g8alm" }, "stable": { "version": [ @@ -31970,11 +32450,11 @@ "repo": "smihica/emmet-mode", "unstable": { "version": [ - 20221111, - 329 + 20240617, + 45 ], - "commit": "63b6932603184956b5ea8919036d2b307b48d7fd", - "sha256": "1g0fvp98w23dsyi75idyv4jf90635z80hchd1k13pychla6bw76j" + "commit": "322d3bb112fced57d63b44863357f7a0b7eee1e3", + "sha256": "1y41iqlybfls1rsagi9g1s879vw020r252j8m9jc89lsp5vkhawk" }, "stable": { "version": [ @@ -31994,28 +32474,29 @@ "url": "https://git.savannah.gnu.org/git/emms.git", "unstable": { "version": [ - 20240512, - 1735 + 20240704, + 1359 ], "deps": [ "cl-lib", "nadvice", "seq" ], - "commit": "c86ede13e80ad573f52e46de54fd24a97e2faa88", - "sha256": "04zw0al519n1xiyy15lzf1mv65d2fip5ha46h8lj03psl777bc4x" + "commit": "b5567be2176dcbdf42aa2d0ccad32a44f245dd09", + "sha256": "1kwybpr86ih0g739x3mqfpvbgsd9pfns1h6hm89f79qlgla282xz" }, "stable": { "version": [ - 19 + 20, + 1 ], "deps": [ "cl-lib", "nadvice", "seq" ], - "commit": "384ca4544ec359bba08d2f9d2a78acb8f9917e25", - "sha256": "06yk5fpmgqkxrpcyd8gqq9g11x0clv8zgbwvxr95nwz720j70i72" + "commit": "e0331bd7c480b3ac326140bd5b312bfdbc4881c9", + "sha256": "06vsf3mlj0sxhmcgz70haihsrskr98w2jnhy68h7g3b9rkbxgmhc" } }, { @@ -32405,28 +32886,28 @@ "repo": "isamert/empv.el", "unstable": { "version": [ - 20240517, - 1701 + 20240818, + 1845 ], "deps": [ "compat", "s" ], - "commit": "c7313288e350de7331779c0b37a8298980f6ff57", - "sha256": "00w59r7ycpv7819kbyjcvpiif9kzqh7k5nk1nfy2wgs1saxkg8ln" + "commit": "4bb96d112cab80a7c3a2cdf24e9457c313a9e3d2", + "sha256": "0j9qqmyszbaizzz6fwnkf0640wivjav1l3lqa0myi3spby3abnqn" }, "stable": { "version": [ 4, - 1, + 5, 0 ], "deps": [ "compat", "s" ], - "commit": "c48cd223b145806a6a36167c299e9a0384a5f2e6", - "sha256": "0p62wfsxk0sh8lpjm52md8kaixkfagfsl9gpmps76448iznn04m7" + "commit": "ccfe44bbfa79a2a4d2cab06b807d494d4e85d45b", + "sha256": "1qwbxhdcl2vvdf0sjgl1iafh47rgbabzmjjwg6jq32p7q64pw6dr" } }, { @@ -32571,11 +33052,11 @@ "repo": "zenspider/enhanced-ruby-mode", "unstable": { "version": [ - 20221011, - 1957 + 20240724, + 1809 ], - "commit": "7e76d754e1632b4fc9a024fa393c3fc837bcc86b", - "sha256": "1gc2kgvnzq6m6hswcvsd4c00xywi2phdnr121r53kvsv46avrq9z" + "commit": "69484d6cf0cb2d8bb1f873319bd7c448cb7add33", + "sha256": "00fcy97sfyac0c38xcq18zm3qcw2wvqa6149h617c4hlq9rx1lh8" }, "stable": { "version": [ @@ -32586,6 +33067,35 @@ } }, { + "ename": "enlight", + "commit": "b7f467a2dcf96f67e641b6bea9262bee469bea3a", + "sha256": "14ygvcd6ppvdcwlxj5mnhxp47h6ls9azhnjw0zalhb55rq62vq89", + "fetcher": "github", + "repo": "ichernyshovvv/enlight", + "unstable": { + "version": [ + 20240602, + 2025 + ], + "deps": [ + "compat" + ], + "commit": "5194c1a4f4c245a1ef544205d723381fac30414b", + "sha256": "0crccz28f54xc0202gdbnpkn7kfsxf66p2m2grs6wnwyjxrmpnsq" + }, + "stable": { + "version": [ + 0, + 3 + ], + "deps": [ + "compat" + ], + "commit": "5194c1a4f4c245a1ef544205d723381fac30414b", + "sha256": "0crccz28f54xc0202gdbnpkn7kfsxf66p2m2grs6wnwyjxrmpnsq" + } + }, + { "ename": "enlightened-theme", "commit": "93728d3fe62331b49627c1cfa1c4273a43407da8", "sha256": "18ry83hdmf3fx544s42rhkl5jnlvcvbfbardhwyciyp375jzam92", @@ -32709,25 +33219,25 @@ "repo": "purcell/envrc", "unstable": { "version": [ - 20240517, - 1633 + 20240613, + 907 ], "deps": [ "inheritenv" ], - "commit": "4405f6e7b2e300aa91211bd505364d8f01667c97", - "sha256": "0jkydssnmljj8d29h15gar90r5cgin8qnlwampf2af26zfxxgq3v" + "commit": "2316e004c1574234fe4d991bd75a254cdeaa83ae", + "sha256": "1kx5p85p2c682j50cah18njdraj07v9dg8imi7p97bkx7n5malxm" }, "stable": { "version": [ 0, - 11 + 12 ], "deps": [ "inheritenv" ], - "commit": "8571bf94b6a63ffd9a84100106602f88ba186854", - "sha256": "03mjws4fp00g5smivs1iz0r78mmd5sgj1g4xyi8aq21mpv5rd2m0" + "commit": "2316e004c1574234fe4d991bd75a254cdeaa83ae", + "sha256": "1kx5p85p2c682j50cah18njdraj07v9dg8imi7p97bkx7n5malxm" } }, { @@ -32846,14 +33356,14 @@ }, { "ename": "epkg", - "commit": "1ae754064cd1f062bbdd6ecf9af03fa0c2798cf6", - "sha256": "0vvkjjaffvwvsvld3c6hwd18icmp2lc7f9yqvclifpadi98dhpww", + "commit": "6a9de9fbe3147c9816ac909cfe365e66e888f9b7", + "sha256": "1p9l23c9ym306n1nlap2hvx9fy75pkx36cw2l467v954rj2ja5qa", "fetcher": "github", "repo": "emacscollective/epkg", "unstable": { "version": [ - 20240415, - 1554 + 20240818, + 1954 ], "deps": [ "closql", @@ -32861,20 +33371,23 @@ "emacsql", "llama" ], - "commit": "91c3e441eaa9f85b13d5957ee82f7c440addd147", - "sha256": "0n6psk9k2aglfsbxpnqfsmah4c9060sgf13wix0mmakba2iq11wc" + "commit": "b0003f88afae8b9843e77149c1b1284f7ec4de33", + "sha256": "0mffnxs5wwjx6vm82i4217kr8dwkylhdf7cpq5zqvbygs4p7sfhg" }, "stable": { "version": [ - 3, - 3, - 3 + 4, + 0, + 0 ], "deps": [ - "closql" + "closql", + "compat", + "emacsql", + "llama" ], - "commit": "3075b621a56f13a93337e2f04aea3565b625b8de", - "sha256": "0d09ddlhvgp8rpybqmzvzpzdp1hjaq97wp2br4g90lpx2vclkgn7" + "commit": "e14d2b4808631d37faac1ff1c7f962d60ec28825", + "sha256": "0w06bpwbwsl3diypywfzrwp6l0kr3h34xja34xssym2bmdl11z8p" } }, { @@ -32885,8 +33398,8 @@ "repo": "emacscollective/epkg-marginalia", "unstable": { "version": [ - 20240415, - 1536 + 20240808, + 1951 ], "deps": [ "compat", @@ -32894,14 +33407,14 @@ "llama", "marginalia" ], - "commit": "41bb627934e0a389e24573d2c9d088f6f6afdbcc", - "sha256": "1m0g1h81if11v0mw8l3kd6i2mxs1r1s1dh9c84niig0gw0dgligw" + "commit": "1e291facfbcce0d515a7a90b0bfd82d5b6358e92", + "sha256": "1fyfsav3n4y635apda6601g3jnyyfjq58jsclp6xb0b0sbq1gws8" }, "stable": { "version": [ 0, - 1, - 2 + 2, + 0 ], "deps": [ "compat", @@ -32909,8 +33422,8 @@ "llama", "marginalia" ], - "commit": "f5eda857a99d02aad9e89bd80c327930e815fc8a", - "sha256": "04z5xgcrl2q37fgr9bb1fwnspnn7zq5svmfkfslfmzbb3klvdkcw" + "commit": "1e291facfbcce0d515a7a90b0bfd82d5b6358e92", + "sha256": "1fyfsav3n4y635apda6601g3jnyyfjq58jsclp6xb0b0sbq1gws8" } }, { @@ -33010,20 +33523,20 @@ }, { "ename": "equake", - "commit": "2a4a0ec11a9c720d7ed90addcb31d0a9d5594f5b", - "sha256": "17r10d3acmhixbi24k19rx720qi8ss4v53n107arqmr04rkd1v2y", - "fetcher": "gitlab", + "commit": "7408152ad61656aee13c94678c76eb0a07baae37", + "sha256": "1kxybrzlhcpnjh7ikg2qdi71wj2m7j7gwka3ajk9s9039m9r5a2r", + "fetcher": "github", "repo": "emacsomancer/equake", "unstable": { "version": [ - 20220627, - 2248 + 20240801, + 1619 ], "deps": [ "dash" ], - "commit": "7aa2e1715e6ea286b08bb446d2d9915afa0fdf03", - "sha256": "11wag6sgfr62yj4zjr9n71kxd3kfa105l0rpbag47qmac2wsg7h5" + "commit": "2506c058fc8cc51539e80d093c9bcdac87720216", + "sha256": "0p8b016kqnxhvpb74p54s156qqvrvw20j67if5484y4lkdzispjs" } }, { @@ -33108,11 +33621,11 @@ "repo": "leathekd/erc-hl-nicks", "unstable": { "version": [ - 20200317, - 16 + 20240615, + 2058 ], - "commit": "a67fe361c8f2aa20fc235447fbb898f424b51439", - "sha256": "0k57scxa8rm859fqsm8srhps7rlq06jzazhjbwnadzrh8i5fyvra" + "commit": "fd2759bde20c25226a332c3d19aed6c7f135bf10", + "sha256": "1lpsm3z3q89hfpay476m7n7p1m897j0sl6z5bnvgn6cqyvhl1d8a" }, "stable": { "version": [ @@ -33458,15 +33971,15 @@ "repo": "ergoemacs/ergoemacs-mode", "unstable": { "version": [ - 20240129, - 1407 + 20240809, + 2246 ], "deps": [ "cl-lib", "nadvice" ], - "commit": "095129648e9846fbda1f585806de39c12e82f37e", - "sha256": "0bwvfgrn44hwswnmkhb3qsvgmaphh4c9vxwdy1rrj9x11n0c54z1" + "commit": "3c9081fe83f70cf791abc98d6b9184f8ea7fb714", + "sha256": "19r0gin181cmaip2jjm0j5kj6b8sba4lgqb37pyg0zvq5z7mjjf5" }, "stable": { "version": [ @@ -33518,12 +34031,11 @@ "stable": { "version": [ 2, - 6, - 4, - 3 + 7, + 0 ], - "commit": "714c7d2c76c5ffda3180e95c28669259f0dc5b5c", - "sha256": "1vyah8rxizx8gi5j17k1llii7i7nlqf2yw8nsqj4ky7q3dvy3zyy" + "commit": "df1a26d96683ebb06aa8476e4af6bbeddf23efbe", + "sha256": "1vi2h8lwfixpphh0kz5jiam43ld8ddzz71jspwfvmyhmyrriabb8" } }, { @@ -33568,19 +34080,20 @@ "repo": "erlang/otp", "unstable": { "version": [ - 20240517, - 1225 + 20240709, + 1136 ], - "commit": "601a012837ea0a5c8095bf24223132824177124d", - "sha256": "1vaczg52wb4nzkm3py6b2ndxq1fb7nr3n41sn9wc16v4r8nq35b1" + "commit": "ee9628e7ed09ef02e767994a6da5b7a225316aaa", + "sha256": "0m3l2d5vpd7wlw7grzdvz63vi1h8px9pjqqls7i70idsxbsqk7if" }, "stable": { "version": [ 27, - 0 + 0, + 1 ], - "commit": "601a012837ea0a5c8095bf24223132824177124d", - "sha256": "1vaczg52wb4nzkm3py6b2ndxq1fb7nr3n41sn9wc16v4r8nq35b1" + "commit": "ee9628e7ed09ef02e767994a6da5b7a225316aaa", + "sha256": "0m3l2d5vpd7wlw7grzdvz63vi1h8px9pjqqls7i70idsxbsqk7if" } }, { @@ -34046,6 +34559,21 @@ } }, { + "ename": "eshell-command-not-found", + "commit": "908102fbfdb7e7b3bbb0bf5a8bc5bfd37ce67586", + "sha256": "1vyl80078wswk4nypn3gjsbjas7vbz9dkljc0ch0zq975vr4wapz", + "fetcher": "github", + "repo": "jaeyeom/eshell-command-not-found", + "unstable": { + "version": [ + 20240708, + 512 + ], + "commit": "28427f0ca266fd75890ceafdd96997b5507e1bc4", + "sha256": "0cid9caklxbp4rfdpam42cmkxj1izzw84g9hpk7jabjmfgashrxg" + } + }, + { "ename": "eshell-did-you-mean", "commit": "a7649eca21a21ddbbc7131f29cbbd91a00a84060", "sha256": "1z1wpn3sj1gi5nn0a71wg0i3av0dijnk79dc32zh3qlh500kz8mz", @@ -34224,11 +34752,11 @@ "repo": "akreisher/eshell-syntax-highlighting", "unstable": { "version": [ - 20240509, - 241 + 20240701, + 502 ], - "commit": "1198fd658d317747eb606a50c7767fef579af324", - "sha256": "1j2qfaw2jrd9gpn7a0i0wd5hjqgzj3akgkayrw73bh285iz19fm6" + "commit": "26f49633308ea876b5850256e07622de34ad0bdd", + "sha256": "1p2lqx3rzfmn1lamnx9ns5mr0svjqamx7ah9342l30bmv87skz1h" }, "stable": { "version": [ @@ -34582,11 +35110,11 @@ "repo": "emacs-ess/ESS", "unstable": { "version": [ - 20240516, - 811 + 20240803, + 1733 ], - "commit": "f307097eac4d182986ed200924f92f14210a7c46", - "sha256": "08cnnmzj0da0vwv8m4cszhk0yy347pmqjmld7cvzn9xvqpghkmxv" + "commit": "950bf61054bd96d2203ac0457792c0af8dfba721", + "sha256": "19b88yd09rxrljfbai8q5hqcdpnsx8pjxkprzprk1smaqc4ppifg" }, "stable": { "version": [ @@ -35191,6 +35719,30 @@ } }, { + "ename": "evenok", + "commit": "c2568edb7d30ce34acd64ce0a211699ae87a0cb1", + "sha256": "03kvr25rd91hkrrymyhsv1j48hr06p1k6hrz0skfd4ns617ambd0", + "fetcher": "codeberg", + "repo": "mekeor/evenok", + "unstable": { + "version": [ + 20240718, + 723 + ], + "commit": "2963a451b12c3287879e3872dcc85c9ac476ac3d", + "sha256": "0sqgyks726lsy3lqasvkkm10pvm57s8ksj4d6qrvcnn43h7g54yq" + }, + "stable": { + "version": [ + 0, + 11, + 1 + ], + "commit": "1cdd8f8d09473bc8fb1c5157bd3a2129883701bc", + "sha256": "1qnncjdd2jc65zz2slm8pjgg64nqyvc9v8p6m0zl15xhh7kdavi3" + } + }, + { "ename": "everlasting-scratch", "commit": "7d14ddda9729eec229a72a8827d0f0a5be779db7", "sha256": "0ikpp9cvi4xh2bqlza8p2bnw26mv0km33ywp0l3a6n35n1f068v6", @@ -35198,11 +35750,11 @@ "repo": "beacoder/everlasting-scratch", "unstable": { "version": [ - 20240430, - 1713 + 20240612, + 814 ], - "commit": "1837142ae14fdfd4d634434ceff966b348826259", - "sha256": "15509mjlk382yws41gb90xqn9g06agjpd6c8b8ps4ykmswm6ad5h" + "commit": "fa1b2af29e8bb463400bbea912ab4dfaa2b0c890", + "sha256": "10zckrrz0mh6alrmav8lbzyz4imh7966m7524jzm2576pn6mxf04" }, "stable": { "version": [ @@ -35221,15 +35773,15 @@ "repo": "emacs-evil/evil", "unstable": { "version": [ - 20240521, - 954 + 20240810, + 1655 ], "deps": [ "cl-lib", "goto-chg" ], - "commit": "0b134d3bbf73c93f5fed2bb89a35f408a9d627ed", - "sha256": "1nrvrb520wpphbhj1ck7jz2ks55yd7bkzycbjzbh534zax1nri93" + "commit": "5db0bdc7dcd9300b983526d37cbe480f35e36211", + "sha256": "1vq7ks1j7h3h2x51mf64pph0ix5jnl6qfpvp3lvvy6wsrcvnmf07" }, "stable": { "version": [ @@ -35351,8 +35903,8 @@ "repo": "emacs-evil/evil-cleverparens", "unstable": { "version": [ - 20240308, - 751 + 20240529, + 1025 ], "deps": [ "dash", @@ -35360,8 +35912,8 @@ "paredit", "smartparens" ], - "commit": "aa19ed6fec73c883442fb4ffd8d300355d5a8580", - "sha256": "1lidyj1xk1xaszsi832f8bhpxgmfpjykd1gxn1y9zqi9rg9b8hpw" + "commit": "6637717af0bdac55f97eef98433d53a10395cf77", + "sha256": "15vsqm2pgyb1qg2rwnd4b6pny771zyp5x9z4a0p9pc67f11mrwp0" } }, { @@ -35422,15 +35974,15 @@ "repo": "emacs-evil/evil-collection", "unstable": { "version": [ - 20240417, - 1647 + 20240817, + 2119 ], "deps": [ "annalist", "evil" ], - "commit": "5886bab852dc9e31959e70384d535473e44504ad", - "sha256": "0dz9dkmxm4j2r2nilgxwgvsgbm531rrsiszzx480zrmqybdsziq6" + "commit": "772571fc6762b6cd1d35cc869e266de9a5c6022b", + "sha256": "196j1jnshb5skbngqisb43im0cl6s2fgpbxgwasyrxhingpzaj8i" }, "stable": { "version": [ @@ -36024,15 +36576,15 @@ "repo": "gabesoft/evil-mc", "unstable": { "version": [ - 20230529, - 210 + 20240701, + 140 ], "deps": [ "cl-lib", "evil" ], - "commit": "bdf893ea6f52fd0f10bece8ddae813658e17bbb4", - "sha256": "12r2vi3a3la93fm18rcwjy6v6x4rqa6khryxggdki3whlmzv60xf" + "commit": "cff3374bfe1b7b1932743425d7fc5d4ab66d747e", + "sha256": "1kmc9vmryqnzkc1xmdkycrrakcyscg2apixff63hdcr715bljrm9" }, "stable": { "version": [ @@ -36122,6 +36674,35 @@ } }, { + "ename": "evil-neo", + "commit": "15650a2fbc95c50bb09bb38a3f6d875a3f91d56f", + "sha256": "1p1kjyvwhwsmbd28i77fvs6xk98a1zlnq26fnv041vqs62dj7n5i", + "fetcher": "sourcehut", + "repo": "p-conrad/evil-neo", + "unstable": { + "version": [ + 20240721, + 1241 + ], + "deps": [ + "evil" + ], + "commit": "18f115a0ddc12a0930f0eb2f9f119b190c71017e", + "sha256": "0lkdl2g8h8sada4g3rzh8kcl14y5kidqy3fynmpjk17s3rv97747" + }, + "stable": { + "version": [ + 1, + 0 + ], + "deps": [ + "evil" + ], + "commit": "18f115a0ddc12a0930f0eb2f9f119b190c71017e", + "sha256": "0lkdl2g8h8sada4g3rzh8kcl14y5kidqy3fynmpjk17s3rv97747" + } + }, + { "ename": "evil-nerd-commenter", "commit": "a3e1ff69e7cc95a5b5d628524ad836833f4ee736", "sha256": "1pa5gh065hqn5mhs47qvjllwdwwafl0clk555mb6w7svq58r6i8d", @@ -37492,8 +38073,8 @@ "repo": "anonimitoraf/exercism.el", "unstable": { "version": [ - 20231007, - 1253 + 20240610, + 32 ], "deps": [ "a", @@ -37505,8 +38086,8 @@ "s", "transient" ], - "commit": "9d164a54fd7be933e6f65d4cc7112c99bd957b26", - "sha256": "1b73274krk38jb8znnp5q788jh66g3s8w8lslf79b34s586p8ih4" + "commit": "f9a287a4cd533fdbd3b0e645f425a7b9c469e6ab", + "sha256": "0lf6xa0x2g0izwfcpi48b0s0146mz8r60gf4ynqpx4fmyl2mccj5" } }, { @@ -37725,11 +38306,11 @@ "url": "https://repo.or.cz/external-dict.el.git", "unstable": { "version": [ - 20231129, - 1043 + 20240817, + 149 ], - "commit": "17807ac7e671b44da495e7e3fac5b8cb72a25feb", - "sha256": "1vb6xpwpvr0ly36rzbk7hvxxmr33yb0sif0x0sc5ld4zigr23xl6" + "commit": "0399b1c086417030f914bd26fff636dfdd55833a", + "sha256": "032ydp8vcl576hamq16wwmk6fl2j13yp6bimsscxjjz0lwiwsr39" } }, { @@ -38218,19 +38799,19 @@ "repo": "WJCFerguson/emacs-faff-theme", "unstable": { "version": [ - 20240520, - 1303 + 20240619, + 1314 ], - "commit": "452546431e3bef05fbf8914f6d41b8b7a3557bf3", - "sha256": "1dikgq84xfv2hq340f9m2nvhn4h09sv9py0sm3214nfssn6z4a55" + "commit": "763d524b5dd6273843256810e8531954335583bd", + "sha256": "117hbybdlcvgmisiagf247myww5b2q38yhi47fmlf9dqmpzfw4fz" }, "stable": { "version": [ 3, - 4 + 5 ], - "commit": "9b8ff139442b29a16a437c367f201f263bbb884c", - "sha256": "103npmlln3c394fkacapx17zjyw4niwqqn8c768gij0ny4k0qfg4" + "commit": "763d524b5dd6273843256810e8531954335583bd", + "sha256": "117hbybdlcvgmisiagf247myww5b2q38yhi47fmlf9dqmpzfw4fz" } }, { @@ -38681,14 +39262,14 @@ "repo": "martianh/fedi.el", "unstable": { "version": [ - 20240311, - 1417 + 20240711, + 753 ], "deps": [ "markdown-mode" ], - "commit": "b4996a467868b11e7f4ee9c53354131a99bc6bad", - "sha256": "0shh0k73h39yq44yrcqsvci88byrvc52x2r2vgld9fh1kfw9iq66" + "commit": "7c31f0d580bb20f70285bae136c6b4634a6c21b5", + "sha256": "0jxs8ic6z2rcv8l62614phf1hgq4zr4nmfm2bznbqf49kc5hpxhk" }, "stable": { "version": [ @@ -38778,11 +39359,11 @@ "repo": "technomancy/fennel-mode", "unstable": { "version": [ - 20240502, - 1555 + 20240721, + 1732 ], - "commit": "b07a726f4d8b6e7f69fdf7f2105abfa5707680dc", - "sha256": "129s957d4g288x75x1ixb4i8g6nbf2y032jj4minzhn51627cy88" + "commit": "f4bd34e1c3b14313c20af94dd34430b40c0ef35f", + "sha256": "1wfk3blx89afdllr47xgqz2ikfl8ya3lblrfwdydwcnbhv2jvq7w" }, "stable": { "version": [ @@ -38913,15 +39494,15 @@ "repo": "Artawower/file-info.el", "unstable": { "version": [ - 20231207, - 2041 + 20240621, + 653 ], "deps": [ "browse-at-remote", "hydra" ], - "commit": "158524c92f37eeccf55e096f3090db2baa12fbae", - "sha256": "0l17mmail2gcz71rmk2p1p4lf0lc10mhj5pdq1c1dpppri42cbwm" + "commit": "36fb3469a4d1c9d803e9d13e7e2e9582ced3043f", + "sha256": "1cd6m5acclfwzqpnrnqz08gm52jfjg7m137l005g9hn3vwlbc3bj" }, "stable": { "version": [ @@ -39318,8 +39899,8 @@ "repo": "LaurenceWarne/finito.el", "unstable": { "version": [ - 20240219, - 2059 + 20240818, + 1003 ], "deps": [ "async", @@ -39330,8 +39911,8 @@ "s", "transient" ], - "commit": "b4f1c776e3a6cda2f51dd71e55f72de6fd3c1dcf", - "sha256": "1qrr86xdf9dh7nwlsri5s2i27ynrwj2b3pqcyab3g49qdd2gwnx6" + "commit": "9ad22dbf34574c5d6070724eba0d22350b347e6b", + "sha256": "1vigknjchsz60pg9qgx95h3xkng5yhrn118rdldsyv03725ld7h8" }, "stable": { "version": [ @@ -39399,6 +39980,21 @@ } }, { + "ename": "firebase-rules-mode", + "commit": "c9d7c4fd4118244c73f11f8e34e478bb05642752", + "sha256": "0xqkyq6nbvy636r13pq61cykk00vl62a3cm9x798mbc958w01ny0", + "fetcher": "github", + "repo": "dherbst/firebase-rules-mode", + "unstable": { + "version": [ + 20240520, + 1326 + ], + "commit": "c88cb10251cdfce931e4fe48ce76eaa50cc7e791", + "sha256": "0sdqljlpgmhszkd8psfpx99wjcg5z5wg8q9lfcnw2j30hdlxiik2" + } + }, + { "ename": "firecode-theme", "commit": "641d1959bd31598fcdacd39a3d1bb077dcccfa5c", "sha256": "10lxd93lkrvz8884dv4sh6fzzg355j7ab4p5dpvwry79rhs7f739", @@ -39475,11 +40071,11 @@ "repo": "Anoncheg1/firstly-search", "unstable": { "version": [ - 20240408, - 556 + 20240804, + 955 ], - "commit": "2045d990509074a8151c8a27db50e477d254aa31", - "sha256": "1xaddr6zgnif4gng8sdqfsxckh2k35yblpn3mirz6zw7iyd46zs3" + "commit": "d2f58ef2411f664617e8164a1c8d036541f57cef", + "sha256": "035sh3nbdjdg7mg69mrykgz4gfy3rf5i70d2yraznazbzyab7nx9" }, "stable": { "version": [ @@ -39899,15 +40495,15 @@ "repo": "plandes/flex-compile", "unstable": { "version": [ - 20231219, - 2113 + 20240729, + 1757 ], "deps": [ "buffer-manage", "dash" ], - "commit": "817dd32411748682c13f752786b901041a470504", - "sha256": "0c2ysf7asb840xdf5x255r18c2v3j93bgjxsf5wsbgvykx21za00" + "commit": "335f6f2e9abb5b5bc1ccabf1136688a3a4e851b6", + "sha256": "077q93apmaibia9wr61zi3vzw43sj9y8vbicpnyq4s4cqj72hplv" }, "stable": { "version": [ @@ -39945,11 +40541,11 @@ "repo": "crmsnbleyd/flexoki-emacs-theme", "unstable": { "version": [ - 20240109, - 607 + 20240702, + 1515 ], - "commit": "9339a2a1a8052159916e9913b14ec062c0a3f506", - "sha256": "071if59ikrfyc17vw1fbzpqsg16zd7zpnfgxhi02sz8ng7q4jmx7" + "commit": "e9c352075eb3a0d06e280d60968b6147f9678b6e", + "sha256": "1g0n72j05s2k70a5d4plawrmffvinkc970pidysfjc7rpzfzrpgc" } }, { @@ -40261,11 +40857,11 @@ "repo": "flycheck/flycheck", "unstable": { "version": [ - 20240411, - 449 + 20240726, + 456 ], - "commit": "900b8e79754d21853a6e5b5a2802f317a7112a1e", - "sha256": "0k9gf7aim1ns09rmicaqy93lp1915c8llr9i837gw8a86c8fjfrr" + "commit": "7a6398ea3538a898eba0276f0f89b2f878325a89", + "sha256": "12y29m1gp0gdq8lfc2cd80869xsyasgsp4n2ck8rn4h164bnnn4q" }, "stable": { "version": [ @@ -40428,15 +41024,15 @@ "repo": "shuxiao9058/flycheck-buf-lint", "unstable": { "version": [ - 20230724, - 1501 + 20240612, + 1219 ], "deps": [ "flycheck", "s" ], - "commit": "51c439dcb9fa40966256d8cce835f7b7aabf44d0", - "sha256": "1gq8abj5ld2hqhwc0p7qmf8vfy8nj3pfzzdba2yh8zx8l22r2h3i" + "commit": "6cf7e7a01bfe150f9be45e83f9fc2d0c8b9d8de3", + "sha256": "1lf69gmbh0q9drjxb1h1wz426hxjr4mkzl8grz6ggl56rxwxj2f4" } }, { @@ -40537,14 +41133,14 @@ "repo": "zpp0/flycheck-checkpatch", "unstable": { "version": [ - 20170217, - 1025 + 20240810, + 1951 ], "deps": [ "flycheck" ], - "commit": "6461fc7b0d493eb9863814055f8bce5fa35739de", - "sha256": "1651xmw01n5h7x81y3cvsamdmb67jcf385ax52dkp8miyq1a090r" + "commit": "61710dff2828ff119968161e7118fce2a4a0b67f", + "sha256": "0zbsal98k8d0vxrabq40jpfpmg2m67yldnc1l91wm0jwqym0w14d" }, "stable": { "version": [ @@ -41087,15 +41683,15 @@ "repo": "flycheck/flycheck-eglot", "unstable": { "version": [ - 20240214, - 1937 + 20240705, + 1738 ], "deps": [ "eglot", "flycheck" ], - "commit": "a38101634c55ef6cfcfc74b4fd9a50b541b42457", - "sha256": "0r4h4c0pzfgp22iscgszvzv1sf3b286wrgmds0ijlha4r99ln88s" + "commit": "09e37f4c726d9b565b040ba9e89215158d3bd6b6", + "sha256": "0hxkgdgxlj4faylckbfj68pg0dxj5y8nfyq3rkqshswma1537zg1" } }, { @@ -41678,14 +42274,14 @@ "repo": "flycheck/flycheck-inline", "unstable": { "version": [ - 20200808, - 1019 + 20240709, + 1812 ], "deps": [ "flycheck" ], - "commit": "0662c314bd819f9b46f8b2b13f0c650445b3a8c5", - "sha256": "1wlvwi8y5pb3gy3j061v7krxfb1766yw5iika5ymk4zjg9g057vn" + "commit": "de96ba2eb4619a9a7d891773629ec70f2be89aec", + "sha256": "1nh28p3sf1swxgip732lh9k9bmw1k4x4z0pnjw8ihcas4xw0bygy" } }, { @@ -42231,15 +42827,15 @@ "repo": "emacs-php/phpstan.el", "unstable": { "version": [ - 20230417, - 1142 + 20240527, + 2142 ], "deps": [ "flycheck", "phpstan" ], - "commit": "2dc25cb2f3d83484ea0eb063c9ffca8148828a2b", - "sha256": "0drsp230nxs336zzfy8gjr7r3p7m8w9rp4ih1zjwarzl1svpp7yp" + "commit": "6f1c7bb357b1eb90b10a081f1831c1c548c40456", + "sha256": "1hnnhbma3mgbralp1f5c1gvm9pfswzf5xzi2nr22rs5d9r0zk2fj" }, "stable": { "version": [ @@ -42496,14 +43092,14 @@ "repo": "msherry/flycheck-pycheckers", "unstable": { "version": [ - 20220923, - 2250 + 20240817, + 2 ], "deps": [ "flycheck" ], - "commit": "897fba15787df94c1ce6a48551f1b149940ffc25", - "sha256": "1sdiixvc3rx4ig7p0gag58imc6gjsqr75zvkygnag2y0mfl3vzic" + "commit": "1bd9b7a7d4009a81ebd34515a72a3a94c313ad76", + "sha256": "1m33yrx2nbwawh38fsibv97fb8gnr461bbrh5yqcnjyw635n7199" }, "stable": { "version": [ @@ -43325,11 +43921,11 @@ "repo": "purcell/flymake-easy", "unstable": { "version": [ - 20141022, - 1828 + 20240624, + 1702 ], - "commit": "2a24f260cdc3b9c8f9263b653a475d90efa1d392", - "sha256": "1j35k52na02b59yglfb48w6m5qzydvzqfsylb8ax5ks0f287yf0c" + "commit": "1986500f75ea06f006ab1734abcce441117d385d", + "sha256": "1pb2angvlfdg4s9qbsm6yzhshxpfz75p3dd50vw7cbb4q1iws8a0" }, "stable": { "version": [ @@ -43416,11 +44012,11 @@ "repo": "orzechowskid/flymake-eslint", "unstable": { "version": [ - 20240322, - 2315 + 20240819, + 1943 ], - "commit": "6ab909b85a8e97815db9831cdd5f283a7830177f", - "sha256": "19jyim5rrmv8bdskaw8gxb6fch3jj3irqhddi2aaxvgdxn321yxm" + "commit": "8d6e7e23a1407eb0c6a68213622de7ac24338c5f", + "sha256": "097qd7740vrfbjrpbrp9sf443qybcnb1sb6ixmalqn7wajcgc50q" }, "stable": { "version": [ @@ -43933,11 +44529,11 @@ "repo": "LionyxML/flymake-margin", "unstable": { "version": [ - 20240401, - 2342 + 20240612, + 306 ], - "commit": "fe4da9f947c7a11aba331dd77637d471cedbd061", - "sha256": "1p3q7s5n1szggj8w8fmpz8l7g27srmsrgla5wag2320dnd6djrir" + "commit": "4e36634789d64c33a9fc0dc5bc2eb4a21c391d96", + "sha256": "05fw8ncspafk4j2mvqaznw78cqwf2v1xdl70b7j30cya97wab4kn" } }, { @@ -44303,14 +44899,14 @@ "repo": "erickgnavar/flymake-ruff", "unstable": { "version": [ - 20240419, - 232 + 20240721, + 2006 ], "deps": [ "project" ], - "commit": "15bf4d3a4ebe899991e385b64901b5cde0daa177", - "sha256": "0g9czaf6his577g1fcgi5xiy3fhfjkf8ihilgnxjydiwgr4fg4f1" + "commit": "6405c8a8eb48f371581a05c34ac1110a3d585dd7", + "sha256": "0lqjqp8v6ykvpm137cj2fmdw9y3vf2h0rxv5hhls88r72qh0wsdc" } }, { @@ -44412,11 +45008,11 @@ "repo": "erickgnavar/flymake-sqlfluff", "unstable": { "version": [ - 20231105, - 2009 + 20240611, + 1257 ], - "commit": "598dff268231f74ba902e2c607c85dd014fbee28", - "sha256": "0r32vhb9krjhq4xk0bmzk43x756jcw39k7vl0ps10zha7p7mnm69" + "commit": "0a836d7a919723ae5897fce01c3c7d651a30e8c6", + "sha256": "1i75c2i6ks2drq5a8y48m7wyk50jm5p7lj2xks3jwkzj4dgl7c4p" } }, { @@ -44834,14 +45430,14 @@ "repo": "larstvei/Focus", "unstable": { "version": [ - 20221016, - 1846 + 20240528, + 901 ], "deps": [ "cl-lib" ], - "commit": "2507ec4ec5a9402647ef85540669db1815520c15", - "sha256": "0qbzbs18isxyf5yiz64vyxvzjpfjdaafxnas2lhx3sjkgglb08i2" + "commit": "17c471544f540f2cf9a05fd6cd87e52e5de317e2", + "sha256": "0aqcnvnla4rmpc9iy679jaw1vqqg16j2fw7m9iis7j3w0wcw5c77" }, "stable": { "version": [ @@ -45230,14 +45826,14 @@ }, { "ename": "forge", - "commit": "1ae754064cd1f062bbdd6ecf9af03fa0c2798cf6", - "sha256": "0pzlh2b77qfg4fgpxm8zxvrnfwl7q38srxsvf39r4hgip30sk3lp", + "commit": "09f3189b08b8d8fcf2aebc17c048e4ccf7f55583", + "sha256": "0f97q2l3q127s3xh8p8ja51ghdf7ysralcmziw3izs9rql3k2zzb", "fetcher": "github", "repo": "magit/forge", "unstable": { "version": [ - 20240519, - 1510 + 20240818, + 1702 ], "deps": [ "closql", @@ -45252,28 +45848,30 @@ "transient", "yaml" ], - "commit": "d3b14f2cb6740d18827ed713715908b517e4a899", - "sha256": "058g4gi3p3r70h1bdpphbg65xwggq4azyw70wgq30b9q13v90lkh" + "commit": "a56eb3cbb27c61387d35cbff6b036a2c1bc1559d", + "sha256": "0in7qznyxl2b2y1dpfadbbpq3zy6bfhnz66cffiizwzgla7zgy17" }, "stable": { "version": [ 0, - 3, - 2 + 4, + 1 ], "deps": [ "closql", + "compat", "dash", - "emacsql-sqlite", + "emacsql", "ghub", "let-alist", "magit", "markdown-mode", + "seq", "transient", "yaml" ], - "commit": "ecedeaf641f3c06ac72db57837d15bdb02ac198b", - "sha256": "0p1jlq169hpalhzmjm3h4q3x5xr9kdmz0qig8jwfvisyqay5vbih" + "commit": "22a7aa5f0fe8cad99770fdcdb163de919a74ba76", + "sha256": "1kn3n1a6gdsd0l2v831sh43cly4p8s1snn494gdd23cw4jkk3qsv" } }, { @@ -45471,14 +46069,14 @@ "repo": "rnkn/fountain-mode", "unstable": { "version": [ - 20240520, - 307 + 20240716, + 311 ], "deps": [ "seq" ], - "commit": "7e10f27dd5d9a5d18e08a5454321e961167dfbf7", - "sha256": "0z7lf948l4yn8znir2nca2bd38c6wqcgihf6cx603j1q7ipfxnwb" + "commit": "f3e821797beecc73cc16e81bfcbbe126581359ec", + "sha256": "1jsa85gk92yvnaxf2ra31df7w5l0qzy5rcrzfch44zq4pj9iv7s5" }, "stable": { "version": [ @@ -45489,7 +46087,7 @@ "deps": [ "seq" ], - "commit": "b25315fed996cf1d41cc2d612dacc62b3e95f928", + "commit": "195fa8670456855b592e76fb495d03cc621ad647", "sha256": "15r0pzdmimm72jx26zgdxf7fwwcppl45vvh33xx5wnhqzd140hwn" } }, @@ -45624,15 +46222,15 @@ "repo": "davidshepherd7/frames-only-mode", "unstable": { "version": [ - 20240213, - 2142 + 20240716, + 706 ], "deps": [ "dash", "s" ], - "commit": "53b17d712e363991f070d790493cd3cbf1d8a9be", - "sha256": "091ppnizhfvrc9clrq9bd7fcbd7hgg39b8ym3ibbhh890b7a4p56" + "commit": "057462df122e588dceef472023343dee3315ceea", + "sha256": "00cirlblx28q5b6691l93v9ay8ry1gl4v2sxzn1r61d9ni8ig7c5" }, "stable": { "version": [ @@ -45655,26 +46253,26 @@ "repo": "tarsius/frameshot", "unstable": { "version": [ - 20240415, - 1537 + 20240805, + 1314 ], "deps": [ "compat" ], - "commit": "8bceac0988ea2e84452f87b96e0a9f669d717843", - "sha256": "1xw8cd8gaawggywpqkalzcjsvn6ns52v7bsp0jmbz113y6l8q689" + "commit": "050ef28e4007a608f12bbd476ccc52d19854f13d", + "sha256": "07wl86qamd3hrgybq29gmm1x0xc25qm3b95bj92ywh61wm173n1d" }, "stable": { "version": [ + 1, 0, - 2, - 6 + 0 ], "deps": [ "compat" ], - "commit": "f74d99be64dc7afa4bdea106c0597c1fa59b9a3d", - "sha256": "0qwffkpjh5zsj487yi5m5j5y7vxqc67pga5nj127nbg4rdmjs3ng" + "commit": "050ef28e4007a608f12bbd476ccc52d19854f13d", + "sha256": "07wl86qamd3hrgybq29gmm1x0xc25qm3b95bj92ywh61wm173n1d" } }, { @@ -45799,11 +46397,11 @@ "repo": "rnkn/freeze-it", "unstable": { "version": [ - 20220301, - 148 + 20240630, + 730 ], - "commit": "ad92e33a7ebd860905da60d194833516bf61cbf5", - "sha256": "0gvc6f8jdvrfwhm5rlvrjd6lbvw1j84z3pwcfajpgyr1a5y6gx49" + "commit": "0d0b6c425769a602ab18d41927feb8c0e22e214b", + "sha256": "0zs0d7r14yzw7nihw5v24drwbv1pf8ldrgfackkdkhxh1x6laqqm" }, "stable": { "version": [ @@ -45811,7 +46409,7 @@ 2, 2 ], - "commit": "1f252a922612e0d6ee62a683b7cdab8956460f11", + "commit": "6891d3b7a85da13e6d5982ac6b9588473941ec98", "sha256": "0bwd3hw5qdijmvbfm69iyhijjx12yqvsa8n08cawxfa26cs6hi1g" } }, @@ -46159,14 +46757,14 @@ "repo": "factor/factor", "unstable": { "version": [ - 20230824, - 1321 + 20240523, + 1604 ], "deps": [ "cl-lib" ], - "commit": "e10b64dbc53a8583098e73580a1eb9ff4ce0c709", - "sha256": "0fscknmhqc1lzjrv920wlch33vbxkys4290n51r9mrgz830lg41s" + "commit": "436d9a61aaa1fdaa319f14d0eac6b5aec920db05", + "sha256": "0z2xrin546dycz0vp9y9rq6jb3i13x0sfnmq0041zmr9nywb7wr6" }, "stable": { "version": [ @@ -46319,14 +46917,14 @@ "repo": "jojojames/fussy", "unstable": { "version": [ - 20240224, - 1641 + 20240607, + 2153 ], "deps": [ "flx" ], - "commit": "0f58683355986e3f8d49734cb1f2ecdd71729439", - "sha256": "1hqh656h7gy233d1557qrp4vq9vsalgdn9wa2bsd1c11z46f3r8f" + "commit": "21f4ac6b971f61890d46308d7ac5db64c20228e6", + "sha256": "0skjr9pqjbr4am3cdq78frf5bckpv5761j0ppp0pg6pfbrcdbaa3" }, "stable": { "version": [ @@ -46461,26 +47059,26 @@ "repo": "tarsius/fwb-cmds", "unstable": { "version": [ - 20240415, - 1537 + 20240805, + 1318 ], "deps": [ "compat" ], - "commit": "2214ad1094b0b4d466825521eefe39bba65634d0", - "sha256": "0cqxin5mnmkjzswh6vk46dhxyh6parxd74w4i2cd44ijrh6rx9yn" + "commit": "973a0033c406ce644ce0fb87de70c2f4046ab1b7", + "sha256": "0dwrmm4hir83xbnhxqjyalb17zk40y62m32i90q7svp32ydw3abg" }, "stable": { "version": [ 2, 0, - 0 + 2 ], "deps": [ "compat" ], - "commit": "1b375c6890de61eaccc97c92f2b46de6f9205417", - "sha256": "0wqkd8p04hklp1hysppp83rx3d32qv62ln5baf725f3xz0lilv21" + "commit": "973a0033c406ce644ce0fb87de70c2f4046ab1b7", + "sha256": "0dwrmm4hir83xbnhxqjyalb17zk40y62m32i90q7svp32ydw3abg" } }, { @@ -46586,25 +47184,25 @@ }, { "ename": "gams-mode", - "commit": "8b6568f0b8a52659864b90c455fd16c7ccfa7b05", - "sha256": "18nv0s9njlsrphpgi05srgvadcqv3071sqqn0jm715f0cd6b1ral", + "commit": "07c7057b75a61012e880ea3d4f08ee2b5e8fc06c", + "sha256": "0vqs24sf0l314q4g1fzaw99ghs9ig997kcyihnfj5mrmzqwj4n5q", "fetcher": "github", "repo": "ShiroTakeda/gams-mode", "unstable": { "version": [ - 20231202, - 1410 + 20240709, + 410 ], - "commit": "03c24b19c270feca0d3fc9494698cf6d4c7f8152", - "sha256": "1g1w0z04qc6k61p9y7mfplqk83yi3pcabv3mr4kfq1pmny8l46sp" + "commit": "6fb90d9c83747ac020743cd7a8c2efda0c5936eb", + "sha256": "09ldm491m1zf47x6gwdylilc5slcwzsbl498axlpzy723ysf916y" }, "stable": { "version": [ 6, - 12 + 16 ], - "commit": "ac2d1ef9695e395b4410ef342bbfb75d7852c798", - "sha256": "0wmmbz7scd0r1bahlvh9av3lwykni32sgyhcqyzd1w867hc77sv5" + "commit": "6fb90d9c83747ac020743cd7a8c2efda0c5936eb", + "sha256": "09ldm491m1zf47x6gwdylilc5slcwzsbl498axlpzy723ysf916y" } }, { @@ -46692,6 +47290,21 @@ } }, { + "ename": "gdb-x", + "commit": "563763f2ef13c67fef65d54df6a7370cfa07ab81", + "sha256": "1ilzb1gagis1jkwnr00xq2szvmbzv0a1k99n1gv4x2a9crn122ma", + "fetcher": "codeberg", + "repo": "shepherd/gdb-x", + "unstable": { + "version": [ + 20240814, + 2137 + ], + "commit": "55dd7a427a83a9abd5719cd2920ab7d2c94ba558", + "sha256": "1fncmi0ciz0fwf97li554kfvbpkqv5vwy0aafin9vcc63aawwi2y" + } + }, + { "ename": "gdscript-mode", "commit": "0694d21374661c7ff94202468d57ddd438c0973d", "sha256": "0jisqiyxdii1kl0kji0gj50ymviq0d7f2xqgjkh08ygdajvpz6cq", @@ -46800,25 +47413,25 @@ "repo": "emacs-geiser/geiser", "unstable": { "version": [ - 20240208, - 26 + 20240726, + 1217 ], "deps": [ "project" ], - "commit": "4e64934bd2ae7c6f0e4acb9f2ed017844c187223", - "sha256": "098xbywraa8a8qcg07iy2svvsqr10s9wdk2ixwcxdh0cskfq40m4" + "commit": "3b02581c8422d416d1d4dc3168db5cf7b0ef16fc", + "sha256": "0afsymy0751ngly1kwyw7i9i66ddm1sxdv3vags966n7i03lcj4r" }, "stable": { "version": [ 0, - 30 + 31 ], "deps": [ "project" ], - "commit": "f343592a52da0f947989d07c208a51ad6c972a5e", - "sha256": "1y9k9v7ll816rs20krchrk080b3a5q4hikskaamvr5hrmi0jw938" + "commit": "b6b4ac070d136345345c80ff649f0084e3c512a5", + "sha256": "1lxvgj50c3lbyib4lcv4f5xjhgnngnklc8sszrx5yy9snsrd1sn5" } }, { @@ -46972,28 +47585,28 @@ "repo": "emacs-geiser/guile", "unstable": { "version": [ - 20240314, - 1950 + 20240811, + 1520 ], "deps": [ "geiser", "transient" ], - "commit": "71a6be00433a157de3936f208c7a1bd0192b12cd", - "sha256": "0chwpwl55qbgfig7z4zdd4ly9vj2367b1ll1wg0q41sn34fqgpq5" + "commit": "5a856c2982030ff77e2d151ead4fcd991512f362", + "sha256": "0dm1fw3c5m0im8zg2q4zr37xkhw45k366gwmmfjl73bmf8qr8ysy" }, "stable": { "version": [ 0, 28, - 1 + 2 ], "deps": [ "geiser", "transient" ], - "commit": "f57bfd5039ce158de95d2ef2933e64fb16def4f6", - "sha256": "0gp8xbfm7y2gabjyys8jylfy1pkkglqas32xxrbqxfh1hv0cfh2f" + "commit": "5a856c2982030ff77e2d151ead4fcd991512f362", + "sha256": "0dm1fw3c5m0im8zg2q4zr37xkhw45k366gwmmfjl73bmf8qr8ysy" } }, { @@ -47611,27 +48224,27 @@ }, { "ename": "ghub", - "commit": "1ae754064cd1f062bbdd6ecf9af03fa0c2798cf6", - "sha256": "15kjyi8ialpr1zjqvw68w9pa5sigcwy2szq21yvcy295z7ylzy4i", + "commit": "6a9de9fbe3147c9816ac909cfe365e66e888f9b7", + "sha256": "0ny8yly8ighk07kiy701rlppkw2jipymwxrf3kkr3zvm9nz5wi4s", "fetcher": "github", "repo": "magit/ghub", "unstable": { "version": [ - 20240507, - 1647 + 20240818, + 1702 ], "deps": [ "compat", "let-alist", "treepy" ], - "commit": "1df5298c3c4d26ec3720dc6c31f8bfd07858f8a9", - "sha256": "1ag8jkc9kkq6rikz19gv2m2hj85f37zwdxxnx16825hf1q9xcjpk" + "commit": "3ad921bf1f5e91446f2a33004dfd51fa1b64ed59", + "sha256": "18f6p9ls4zhykbpsxi2di8d010ca4jyl3zgj4z9y7n56h7hc1i75" }, "stable": { "version": [ - 3, - 6, + 4, + 0, 0 ], "deps": [ @@ -47639,8 +48252,8 @@ "let-alist", "treepy" ], - "commit": "0fd648f0529f34b5da441d54c9dbff7810477d12", - "sha256": "11nrh2lr5179r0brd9vl7r0i0dpjxdr5frplxq6j2ca7l2vzwqyr" + "commit": "c20bc86c70eb2f43df8674097db7847e172ef2c2", + "sha256": "1dnl4idvc96jv73gdsrp377m1782i5n0cq0y4s0mp4i1vqd5drj2" } }, { @@ -47976,15 +48589,15 @@ "repo": "liuyinz/git-cliff.el", "unstable": { "version": [ - 20240517, - 1042 + 20240730, + 1912 ], "deps": [ "dash", "transient" ], - "commit": "90db86c1a600fc319e7c8172839bfe18c3e4221b", - "sha256": "0i0gdcs9lh7jm5sjwss0gadl7k645rns67va5d9xahzvfz1qkzb9" + "commit": "514396c9306338f7df49140e3c9d2177ad7f3567", + "sha256": "0n31v69vg0qn853pbgkxh1i6cvkas0pwivdxz4f8spg14avp7q6s" }, "stable": { "version": [ @@ -48035,36 +48648,38 @@ }, { "ename": "git-commit", - "commit": "325cca8031b99c6abe2ee9858a6b547d1af0cdde", - "sha256": "0cdrrmkjxl6dr967i0q9q4f9gw46gic6igw56276ahjk4n1ksqc7", + "commit": "3126dac37def07fcaa667a325ee79349fb80d285", + "sha256": "0gikqipqd4sp6y60i09bbspxd9q9bh00wn73fgrixkir4p1cgn3c", "fetcher": "github", "repo": "magit/magit", "unstable": { "version": [ - 20240520, - 1135 + 20240808, + 1852 ], "deps": [ "compat", + "seq", "transient", "with-editor" ], - "commit": "22fd8f8594202a0679ccc2f7d02bca44d48b8039", - "sha256": "1ddx82j2j8sf9w7vc9jqa8fm54slprz4jyg3bxmsh6qb0y7n3yni" + "commit": "020aca7c9c4154dbc4a72acbd56165ecccea1bf1", + "sha256": "0xfwli031hk2c0f6gj6f5f7bd9awyq70dl2a1z8k2a1j9msg1s6k" }, "stable": { "version": [ - 3, - 3, + 4, + 0, 0 ], "deps": [ - "dash", + "compat", + "seq", "transient", "with-editor" ], - "commit": "f44f6c14500476d918e9c01de8449edb20af4113", - "sha256": "0cxyvp2aav27znc7mf6c83q5pddpdniaqkrxn1r8dbgr540qmnpn" + "commit": "020aca7c9c4154dbc4a72acbd56165ecccea1bf1", + "sha256": "0xfwli031hk2c0f6gj6f5f7bd9awyq70dl2a1z8k2a1j9msg1s6k" } }, { @@ -48104,6 +48719,21 @@ } }, { + "ename": "git-commit-ts-mode", + "commit": "18b52cd5af8b5ccd5c28efcde18758d03e4c76dd", + "sha256": "0vp7r70j8sn5q8n30lhqjdhbk6kl2qrly1dq4a8vl5rfxs5rx81c", + "fetcher": "github", + "repo": "danilshvalov/git-commit-ts-mode", + "unstable": { + "version": [ + 20240722, + 1815 + ], + "commit": "ba722ba44964e87b2acf48cb7b6154ad4c99bc26", + "sha256": "1123h95cks0sk3dkmx0srazxslizdpk2wnmgz4hsgy78yn27i85b" + } + }, + { "ename": "git-dwim", "commit": "f8e4328cae9b4759a75da0b26ea8b68821bc71af", "sha256": "0xcigah06ak5wdma4ddcix58q2v5hszncb65f272m4lc2racgsfl", @@ -48137,6 +48767,40 @@ } }, { + "ename": "git-grep-transient", + "commit": "f44d0bfeebbc326f39f6996fe387389c421e4368", + "sha256": "133c8lss7nkak0983ax1fnzagd6vw5fx5ii87krszy3izzwiagil", + "fetcher": "github", + "repo": "adelplanque/git-grep-transient", + "unstable": { + "version": [ + 20240521, + 648 + ], + "deps": [ + "magit", + "symbol-overlay", + "transient" + ], + "commit": "c9eb6d76e6b0600d2f90d009fdc28a171f69dd80", + "sha256": "0kfzj77rl0lcdlwjcq6dqpm4ylqqxj38j4ymvdsk7whgnd1pwgji" + }, + "stable": { + "version": [ + 0, + 1, + 1 + ], + "deps": [ + "magit", + "symbol-overlay", + "transient" + ], + "commit": "c9eb6d76e6b0600d2f90d009fdc28a171f69dd80", + "sha256": "0kfzj77rl0lcdlwjcq6dqpm4ylqqxj38j4ymvdsk7whgnd1pwgji" + } + }, + { "ename": "git-gutter", "commit": "2a2670edb1155f02d1cbe2600db84a82c8f3398b", "sha256": "1vcrjxg9pckixsbfmvpf0624s990nx33qn0p6xhnag4jn81ih03x", @@ -48334,20 +48998,20 @@ "repo": "sshaw/git-link", "unstable": { "version": [ - 20240413, - 1547 + 20240809, + 300 ], - "commit": "f16ced38f954f1159fda2f0ba7b60842f8d7e9f9", - "sha256": "08miy2jdn5bbmwpz5p3a196p60j8ldgb4sk77rf1cz24dp490h1i" + "commit": "a0a2fff2d2fba516bc4c08cae10e067c3eb10529", + "sha256": "130d92jkxq22mz5b9s378nrx93a98nbmb84cjny5vmsl3c2rfzzm" }, "stable": { "version": [ 0, 9, - 1 + 2 ], - "commit": "14156291e0eb7156bd779a80c17e1935a7f8f5e5", - "sha256": "1dxmzk4qrz69h097lwshfg4qavdp92an5212ndhjkpmkgvk1v0xl" + "commit": "f66d1f3cdc2c99a2a5c193a6e2521118807f59e8", + "sha256": "1z7m7xl72x7as3d9l3zspac53kyij7hixpz1y2aq5gqpa7wzh87z" } }, { @@ -48387,26 +49051,26 @@ "repo": "magit/git-modes", "unstable": { "version": [ - 20240415, - 1538 + 20240805, + 1320 ], "deps": [ "compat" ], - "commit": "52ea2a1281ea9df9b8732fe2add0e6a0c9c2cd11", - "sha256": "1nf9ij8qab4lfcgj6h63mxlqph04z4icq5fxs5hsdxzcxrz3y6g1" + "commit": "f99010bbeb8b6d8a0819fac0195a2ef0159d08f0", + "sha256": "0nvkpy3bv9816hvgm91fv9l8lla4xras4i05579bs7bc8fck1mr3" }, "stable": { "version": [ 1, 4, - 2 + 4 ], "deps": [ "compat" ], - "commit": "399b1b446644afce8d0949ff85a882bfdbbfb7bf", - "sha256": "0npwjcm04gg1cy19gsha5m6my9xa0din860gv3h32cx8q3nizjjc" + "commit": "f99010bbeb8b6d8a0819fac0195a2ef0159d08f0", + "sha256": "0nvkpy3bv9816hvgm91fv9l8lla4xras4i05579bs7bc8fck1mr3" } }, { @@ -48650,20 +49314,20 @@ "repo": "Justintime50/github-dark-vscode-emacs-theme", "unstable": { "version": [ - 20231011, - 2034 + 20240716, + 523 ], - "commit": "9906e1412d692ea0c115998c1809bcc135e263f6", - "sha256": "087vycm8wjzwv271c2wqymplcwyrin5pj9pwcr1y44di658rckj4" + "commit": "00cac57857732999681e14d0c04fd8b8dbf3ef2d", + "sha256": "1lj75w4lzjk7c05mc2srjl5ciplwn6z5rd8rjj6q8ahsm5pkkd5k" }, "stable": { "version": [ 0, - 3, - 1 + 4, + 0 ], - "commit": "2123bcd08fe42094b07180632be2cd2af606ee21", - "sha256": "1n41px99cs6q53lfs2dn9h7ml6hc4yz7mbjlg30hp4l8a3j74lz3" + "commit": "00cac57857732999681e14d0c04fd8b8dbf3ef2d", + "sha256": "1lj75w4lzjk7c05mc2srjl5ciplwn6z5rd8rjj6q8ahsm5pkkd5k" } }, { @@ -48765,21 +49429,6 @@ } }, { - "ename": "github-modern-theme", - "commit": "35763febad20f29320d459394f810668db6c3353", - "sha256": "07xv4psw34mrpb1f5fsvj8vcm9k3xlm43zxr6qmj00p46b35z25r", - "fetcher": "github", - "repo": "philiparvidsson/GitHub-Modern-Theme-for-Emacs", - "unstable": { - "version": [ - 20171109, - 1251 - ], - "commit": "a7e7b8e5e9c122138e79e837caf9b7299e748d44", - "sha256": "0agfy3wiznb2ksfa00g7066mb0vps4g74mj6nl9wkvx847dzg34h" - } - }, - { "ename": "github-notifier", "commit": "c09f4e7e8a84a241881d214e8359f8a50ab14ddf", "sha256": "1jqc2wx1pvkca8syj97ds32404szm0wn12b7zpa98265sg3n64nw", @@ -48895,21 +49544,6 @@ } }, { - "ename": "github-theme", - "commit": "3416586d4d782cdd61a56159c5f80a0ca9b3ddf4", - "sha256": "132jahd8vvhzhhkm71dzq6x46wmaakbbxg9s7r9779bfwbrms9j9", - "fetcher": "github", - "repo": "philiparvidsson/GitHub-Theme-for-Emacs", - "unstable": { - "version": [ - 20170630, - 2201 - ], - "commit": "29f00a51d949a248a5f6355a97131e216747c797", - "sha256": "16ldfz1k0hxc1b785gzrf70hg0q88ijjxp39hb62iax1k1aw9vlw" - } - }, - { "ename": "gitignore-snippets", "commit": "b1d03ee45e45fc6ec30936a5f4bd8b756728da31", "sha256": "0mj0rrcd65py4w0ahy6l3yx6pmki2lqjhmi8hlxbjv0zzks71wy3", @@ -49252,6 +49886,21 @@ } }, { + "ename": "gleam-ts-mode", + "commit": "51b0a905d5748d4d4f2e807435e56c6c2a312edb", + "sha256": "0wbrryjmxczcgd0lp86iwnykmnxij2mxvyz5d9izy7g33092bscb", + "fetcher": "github", + "repo": "gleam-lang/gleam-mode", + "unstable": { + "version": [ + 20240819, + 1355 + ], + "commit": "8d2f1cf6d4b7850bb8fa66cf26b7365f0ad1e925", + "sha256": "0cra6mivfgzhizb1nv448jkr6js39blb74hfyckg3l2yf0fdhjxj" + } + }, + { "ename": "global-tags", "commit": "2bf3f3de312becb948000a21b280c990a03c8aa0", "sha256": "0zfjfn92dnz7x5k67fphch6a5n7nyigapcg20gsz34xshdnnsz3z", @@ -49502,28 +50151,30 @@ "url": "https://git.thanosapollo.org/gnosis", "unstable": { "version": [ - 20240517, - 334 + 20240818, + 2127 ], "deps": [ "compat", - "emacsql" + "emacsql", + "transient" ], - "commit": "b9c6c04e33ad2f541ab116dda9e460f21034a8eb", - "sha256": "0h9jjag7ip4rgwr3if9rjlglsp7fiklx52685d527gkv6wqqd5a7" + "commit": "4fe415d70277046f6b81a00e8e012634e4f0ac05", + "sha256": "0c8gal7lfibaryb5w85zcmzpmvifdjp959v5bcjxjl37cdws0cnd" }, "stable": { "version": [ 0, - 2, - 5 + 4, + 1 ], "deps": [ "compat", - "emacsql" + "emacsql", + "transient" ], - "commit": "b9c6c04e33ad2f541ab116dda9e460f21034a8eb", - "sha256": "0h9jjag7ip4rgwr3if9rjlglsp7fiklx52685d527gkv6wqqd5a7" + "commit": "4fe415d70277046f6b81a00e8e012634e4f0ac05", + "sha256": "0c8gal7lfibaryb5w85zcmzpmvifdjp959v5bcjxjl37cdws0cnd" } }, { @@ -50188,11 +50839,11 @@ "repo": "dominikh/go-mode.el", "unstable": { "version": [ - 20230823, - 2304 + 20240620, + 1948 ], - "commit": "8dce1e3ba1cdc34a856ad53c8421413cfe33660e", - "sha256": "0l002gcjmwrfkc4972hc8sal6xaja05s50rg7cbv2q9axb18rcqj" + "commit": "636d36e37a0d2b6adb2e12d802ff4794ccbba336", + "sha256": "0n8qx85ijrijq8wdmmlga69v47vq0kw0njjkvmvibv05hi8g2q2h" }, "stable": { "version": [ @@ -50429,19 +51080,20 @@ "repo": "lorniu/go-translate", "unstable": { "version": [ - 20240522, - 333 + 20240802, + 131 ], - "commit": "8cc1f9d013fd99d5bec8b862f8acb249c9104e7e", - "sha256": "15z86y5dvwdcds6w6vl1bv6j4rakc5a4gzawbacpb8wz25nbbigx" + "commit": "424682b94df9efb3dd59e396677b45e4a67b7723", + "sha256": "0cyg3wbxxhyp268w4sidbdi0jdig1a7614mnvd8jl91vryinjf55" }, "stable": { "version": [ + 3, 0, - 4 + 7 ], - "commit": "c12fe8552259e8c8d4e41fd83ce444a94e17f5da", - "sha256": "1bhfd41x3i2gabvf50pdpmnvcdqg69ygslyjcg7jvf486b44gvfk" + "commit": "334efbddd3d421ec294002fca166fbd6b0152e2e", + "sha256": "0603iq1vjbm44sl7qrmkdfcqzzc703h1g5hdcswpj7pi0w7fxb4s" } }, { @@ -50467,11 +51119,11 @@ "repo": "emacsorphanage/god-mode", "unstable": { "version": [ - 20221230, - 708 + 20240812, + 1014 ], - "commit": "607aff10a7b27a8aa0c1a15c2c39337ab17cfda7", - "sha256": "032c82cgf8dafc3w951f2n2a1327rxz9126ri8vz9n3fblwdizj5" + "commit": "55490fffd42ae7d4671ce409214a3fcd0868d791", + "sha256": "1mi74kzdqdlrhjisj1fg2zjbr0d9kc0fl00mss1r3wyjl1bjac2f" }, "stable": { "version": [ @@ -51057,8 +51709,8 @@ "stable": { "version": [ 0, - 37, - 2 + 42, + 0 ], "deps": [ "dash", @@ -51066,8 +51718,8 @@ "magit-popup", "s" ], - "commit": "9a1b3c8fdfd0fcbe460b3546ef1fba26905e6bd0", - "sha256": "1bcakhih2c3ql2npq4v8bsq88dknbk8658b94hbfhy16an81l2zn" + "commit": "7a7c064655147daa9d03c20c764c0dc3cd8111ff", + "sha256": "0hy96w8milg8ap7d3145ab84da9gjlwzh9f0c7ll6y6dg4jdrgaa" } }, { @@ -51150,11 +51802,11 @@ "repo": "stuhlmueller/gpt.el", "unstable": { "version": [ - 20231112, - 2012 + 20240721, + 1747 ], - "commit": "c1091d25db420320de4b121baba99d7ac2e23932", - "sha256": "0b9fcj7zkqxj5928038gnk93shi7k4mpikqir80lypbnnbn96l5f" + "commit": "06afbecccac8bf0d7a47b4c1b768a74ed66c5e84", + "sha256": "0jnaafsnridafqwndgjkp980pnz0lm4nrw2fqnhx15pzqz1w2v34" } }, { @@ -51221,28 +51873,28 @@ "repo": "karthink/gptel", "unstable": { "version": [ - 20240520, - 1943 + 20240814, + 1558 ], "deps": [ "compat", "transient" ], - "commit": "3bce2caa5dc773d1b1fce53e8453d2e1ce534b8b", - "sha256": "1v6pvla6kv9ym3vkd37k2hkn71ycgh4av933ipjqycy1zrwb968i" + "commit": "17f39f6a8144496252eacc012ef7f1d6a2ac883a", + "sha256": "1y1jz2njx8ggagjr4dqdjhbm948knb29qk2p2qhx0sgarfzvvsz6" }, "stable": { "version": [ 0, - 8, - 6 + 9, + 0 ], "deps": [ "compat", "transient" ], - "commit": "cdb07d0d2bb6a4fe6d6a620aa4eec98f70fe6f78", - "sha256": "1k3mq0xjxdbwbhssd16yh6hfg3jpm9qqx4q4jc2igisjja75nmrv" + "commit": "4c0583b2bd6557a09d66dfec84bab776242d0848", + "sha256": "0q99lms7dwfa5w48mykynyjs1wv4qjnlhf7qd816j6lvxkd40pi4" } }, { @@ -51253,11 +51905,11 @@ "repo": "mkcms/gpx-mode", "unstable": { "version": [ - 20240513, - 1737 + 20240609, + 2200 ], - "commit": "b79baf93040fb5c89e803848e8aff31331ea03b8", - "sha256": "0ffqzihh1c874bj53hdgjcvwhkmp2pdmcl6rmzjv1m9ijxhxnjmj" + "commit": "88aa5fed1b0987d90f442eb002ab0f2e4731e223", + "sha256": "1gc52avqkwq9l119ckah0qvwml6cc3w02gvl772ncj821ci90d7r" }, "stable": { "version": [ @@ -51561,15 +52213,15 @@ "repo": "ifitzpatrick/graphql-doc.el", "unstable": { "version": [ - 20220527, - 1721 + 20240716, + 38 ], "deps": [ "promise", "request" ], - "commit": "d37140267e0c426c7c18aff31900aa1650257394", - "sha256": "008wnng94pm2p1xjpbvzzm2l29yq1635j45xywgcj66vknsvvijg" + "commit": "17755a2466a1acef68eac664093fcd13cd51494a", + "sha256": "075p04xd4pkzmhq982x1b2azy7qdazrsdbrniyyrp58xdr83y9kr" }, "stable": { "version": [ @@ -51709,6 +52361,25 @@ } }, { + "ename": "greader", + "commit": "adeadbbb9d48e015f621a86bd4fbfb26465ff5e6", + "sha256": "1z3qqbbaydfpmzwm5ih9b3grf1xwjaxh5s565lbd8r9kmfvb08zp", + "fetcher": "gitlab", + "repo": "michelangelo-rodriguez/greader", + "unstable": { + "version": [ + 20240806, + 1624 + ], + "deps": [ + "compat", + "seq" + ], + "commit": "6664c20a6a6a32e3a6c31d13a160fb8c9c8e118c", + "sha256": "09lff7j09132k62zcgxdd0jk55zpvx2nylm63j1fy7mgjc5zxr3c" + } + }, + { "ename": "greek-polytonic", "commit": "bf0e6206be0e6f416c59323cf10bf052882863f3", "sha256": "0rp5iwiznp95r8srxvq72hna2hgcqj4q1dvg2ma86cqzgqwr4xnw", @@ -51854,20 +52525,20 @@ "repo": "seagle0128/grip-mode", "unstable": { "version": [ - 20230206, - 323 + 20240817, + 1013 ], - "commit": "bdee160db6ab8c988bb0de95ad306ff8b793ec67", - "sha256": "0mnwpng1zhq4piaxnbrqpn6di4jhnh7dhf2vrgmqiw66c16vz9hx" + "commit": "378de9609614448ca29e2add91f2d0059f963d8c", + "sha256": "0valpvbklqzc48f9m1rysjh24323cykpz39dk6avx6vj3y70lnaq" }, "stable": { "version": [ 2, 3, - 0 + 3 ], - "commit": "0ef2a3566f76e1c03ec64ac64cbb916530e40e32", - "sha256": "1p15b41bdzg8819hnq6js62486mwdqcwxns5mnqb21bn6m7pizpm" + "commit": "378de9609614448ca29e2add91f2d0059f963d8c", + "sha256": "0valpvbklqzc48f9m1rysjh24323cykpz39dk6avx6vj3y70lnaq" } }, { @@ -52047,14 +52718,14 @@ "repo": "greduan/emacs-theme-gruvbox", "unstable": { "version": [ - 20240515, - 553 + 20240615, + 432 ], "deps": [ "autothemer" ], - "commit": "3388a96d8e59c120bc243c1f90c614237f6ac3b5", - "sha256": "0r0yqa47zlwr9bv9m84dq3vl43k1gk5hlclcg40v4wqkiiyhwbvw" + "commit": "d2404eb157845536b111999a4332d58a4867427e", + "sha256": "1bnmp9nbpsrnxhn6v81533xcb9hx043wf86n5hwj9mpacl5ic33y" }, "stable": { "version": [ @@ -52236,14 +52907,14 @@ "repo": "tmalsburg/guess-language.el", "unstable": { "version": [ - 20220408, - 1545 + 20240528, + 1319 ], "deps": [ "cl-lib" ], - "commit": "b1fc363ca2c30b8a8ddaf2e366bca7770c8cfbec", - "sha256": "1sgzvi6ax05rfnjdlmhkd52sr26b6w3q1lfcrrv6rdzsifarh2iv" + "commit": "a17203d26135b970e4d7c5d101955d41303a758f", + "sha256": "1v9wwpfjl7a37jx0s2w5g48mv58vw8b3d0552v5ksxw21mbkya8s" } }, { @@ -52355,11 +53026,11 @@ "repo": "Overdr0ne/gumshoe", "unstable": { "version": [ - 20240304, - 525 + 20240628, + 2142 ], - "commit": "223d19ffbd6296864a775d18025150ccbcbc7800", - "sha256": "1lad09axg7iyk3iclk35fxpdb42s8sxxncfqgpqcc56grin7jq85" + "commit": "569ee770d022df9f6d51ff448652788a379c377c", + "sha256": "1gl0w48gpqd02zq3jh4gn2n41mr8g850fq6s10jlmkdh6q1za233" } }, { @@ -52491,14 +53162,14 @@ "repo": "abrochard/emacs-habitica", "unstable": { "version": [ - 20220215, - 1758 + 20240601, + 2029 ], "deps": [ "org" ], - "commit": "9e1fde7f359f7f6a6976b857fbbdbc8dd4fd3327", - "sha256": "0xi0yvm4v2mjyml44jbprdl9lza7lhxmf2j177nbgvn8zgfjc7ac" + "commit": "b884301058c075e6f530f10e970b744aa29f5937", + "sha256": "1jfizwqi54bw0w9p77wrz9b2a5jbyd2v14nrb1nr03l5jxmx0f1n" } }, { @@ -52509,14 +53180,14 @@ "repo": "hhvm/hack-mode", "unstable": { "version": [ - 20230227, - 1950 + 20240524, + 1838 ], "deps": [ "s" ], - "commit": "278e4cc4032bff92060496cf1179643cfc6f9c0f", - "sha256": "0b7831sklgal1zky772qdmg6b2a1kdy4nwhz398rb8shx66fx4pm" + "commit": "ccf20511f0f2ed45d00d423c703bb91ab6a8b80c", + "sha256": "0jnxys3zcmswb0z4zcd05c58cpw9qbw8hgwfqfsixyk720722b9g" }, "stable": { "version": [ @@ -52586,11 +53257,11 @@ "repo": "idlip/haki", "unstable": { "version": [ - 20240501, - 1610 + 20240801, + 1217 ], - "commit": "e076785ca936b723751b8957c5d5eab8dde12346", - "sha256": "17ypcl68d2f3m0nqma80g1mrbj50wbf4ljl02xl518y0i9cix50a" + "commit": "6b3f555cbf038cf4ad4fd296554467137892776c", + "sha256": "1l0wb1v3x3ngg3x0mv2pfa97qfxblm3ff6r2d7b5y5767ifmbn6j" } }, { @@ -52767,27 +53438,27 @@ "repo": "alphapapa/hammy.el", "unstable": { "version": [ - 20240423, - 407 + 20240608, + 359 ], "deps": [ "svg-lib", "ts" ], - "commit": "e3b2e365140abd87537edc09cd87fb04268bc439", - "sha256": "166wjgkdrp2gdw10a8bkpqbiaqhhxlwmk80ia9djnz6js50hx8xq" + "commit": "d5d154060bb13e9b61d74a83b25a12238973099d", + "sha256": "0mwp20nnrcbli4pp2lh4mkfcnfmckppigfi161cgbng44idywvsi" }, "stable": { "version": [ 0, - 2, - 1 + 3 ], "deps": [ + "svg-lib", "ts" ], - "commit": "84c0f14e2fcbaa36dfbf2986d44e672d028fa2e6", - "sha256": "1jz3cfmlwf5p5hzix4phl7gz8nymmbf5h3h3qd2ni37yz01d2xch" + "commit": "d5d154060bb13e9b61d74a83b25a12238973099d", + "sha256": "0mwp20nnrcbli4pp2lh4mkfcnfmckppigfi161cgbng44idywvsi" } }, { @@ -53076,11 +53747,11 @@ "repo": "haskell/haskell-mode", "unstable": { "version": [ - 20240116, - 1718 + 20240527, + 853 ], - "commit": "43b4036bf02b02de75643a1a2a31e28efac1c50b", - "sha256": "09lz6w8rwfvp57byzalz8l3622kb06inqf5p6ijngkrildfgzgcr" + "commit": "727f72a2a4b8e4fd0a7b62129668baea55a2c3e0", + "sha256": "0r0fzvrmqg4vi4q9h3b260dppxszq4gpak5jl8kqb84s22hx4g33" }, "stable": { "version": [ @@ -53396,6 +54067,21 @@ } }, { + "ename": "helix-theme", + "commit": "80c21c8b511b2fdf7948c37f0cfb81ca2a138404", + "sha256": "1wkrfr5d79h847g44y5gxw0lr9vfy2nxnm68pqlvzgps4wc9l9h8", + "fetcher": "github", + "repo": "ibakepunk/helix-theme", + "unstable": { + "version": [ + 20240814, + 1212 + ], + "commit": "8c70b48fe5fbb392d237b6be2ae9da7b84236320", + "sha256": "1v2il312ly6rv5gxg5lvv74zaazhbra9agx66c975p5nqva2vvzz" + } + }, + { "ename": "helm", "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", "sha256": "01h2k8xb4r98xxyff8cg53fzv3xc4nq7gl3qhghn03vla2l9hzpq", @@ -53403,30 +54089,28 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20240521, - 1457 + 20240818, + 1231 ], "deps": [ "helm-core", - "popup", "wfnames" ], - "commit": "c65a9039b6574183aa3f3e0b647c85470c002339", - "sha256": "0m0b6gb393q60cha19wm0xsry6rihqyp2v6yqcrbmhjr4qbsmni6" + "commit": "eb5edc60be7294f9fa623c208bfdb681fbe2a3f1", + "sha256": "062i9i8vg83i49k2w6qis6yd1annksf54whn7mxyfs15jikl43gh" }, "stable": { "version": [ 3, 9, - 8 + 9 ], "deps": [ "helm-core", - "popup", "wfnames" ], - "commit": "6ae44dba0cb72a3a6950cbe36d104db9c69dfb49", - "sha256": "01lqwqjgg1m7ixm160z88cv6mbacs1vxbkvzcgns0lspxckvl1b1" + "commit": "aa51c1a8d6ff4e1e88e61e989f41ac3aa808a592", + "sha256": "14wpfsxs9k0d6184d0laz1w11z9x2rmdii4kx4vfkd1qg0jglg7v" } }, { @@ -53778,23 +54462,22 @@ }, { "ename": "helm-bm", - "commit": "115033d7b02d3ca42902195de933f62c5f927ae4", - "sha256": "1dnlcvn0zv4qv4ii4j0h9r8w6vhi3l0c5aa768kblh5r2rf4bjjh", + "commit": "ae45333491f24e0ecb5945db6e929b56e737e260", + "sha256": "1bh0c863a5p7zqhm656a2wqgmw4gpk3qr61l25wy4gd1ymmfhx91", "fetcher": "github", - "repo": "yasuyk/helm-bm", + "repo": "emacs-helm/helm-bm", "unstable": { "version": [ - 20160321, - 1331 + 20240812, + 1738 ], "deps": [ "bm", "cl-lib", - "helm", - "s" + "helm" ], - "commit": "d66341f5646c23178d4d8bffb6cfebe3fb73f1d7", - "sha256": "011k37p4vnzm1x8vyairllanvjfknskl20bdfv0glf64xgbdpfil" + "commit": "4744b5784df5800f36c3c54de5269034191155f5", + "sha256": "0fwv4aw6ha0dj9g5paxrp2kwb89hw5daybqvlzfjs8zkyypdbcbh" }, "stable": { "version": [ @@ -54296,26 +54979,26 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20240518, - 1434 + 20240818, + 528 ], "deps": [ "async" ], - "commit": "ba2eb552353635222f14984b8a2f4456b4ac62e2", - "sha256": "15nb9dd59fbzmq2b78pnb9iy1d2q6bdnq6xxsmpycqr10kbmsv1p" + "commit": "36a6b50f325be94f30c6cf699ede042fa907c6b1", + "sha256": "0cf5q1lwd6ca5hi62cwvz4lfbxbs79403qs96p6bkajg4q4g186h" }, "stable": { "version": [ 3, 9, - 8 + 9 ], "deps": [ "async" ], - "commit": "6ae44dba0cb72a3a6950cbe36d104db9c69dfb49", - "sha256": "01lqwqjgg1m7ixm160z88cv6mbacs1vxbkvzcgns0lspxckvl1b1" + "commit": "aa51c1a8d6ff4e1e88e61e989f41ac3aa808a592", + "sha256": "14wpfsxs9k0d6184d0laz1w11z9x2rmdii4kx4vfkd1qg0jglg7v" } }, { @@ -54942,20 +55625,20 @@ }, { "ename": "helm-flymake", - "commit": "d8547036dceaa466957f4c5a07eb0461f313b924", - "sha256": "0h87yd56nhxpahrcpk6hin142hzv3sdr5bvz0injbv8a2lwnny3b", + "commit": "07799dc4acea7123ab1021b6be9bab9a37f5a6c1", + "sha256": "18hy2qvxaxvw58crzj41kqjdmnqc6fdnhp9klfy1j3751vfs9ik7", "fetcher": "github", - "repo": "tam17aki/helm-flymake", + "repo": "emacs-helm/helm-flymake", "unstable": { "version": [ - 20160610, - 2 + 20240727, + 617 ], "deps": [ "helm" ], - "commit": "72cf18a1a1f843db9bb5d58301739ea9ccb1655b", - "sha256": "05wpclg4ibp0ida692m3s8nknx4aizfcdgxgfzlwczgdgw0922kn" + "commit": "748193359c26d466b4ef4ff59d733a5edfcd0c48", + "sha256": "1ilrw99krmn086spv0lpdqc9dcp5c3m4i3xpg42pyifmhhck050h" } }, { @@ -55757,10 +56440,10 @@ }, { "ename": "helm-lean", - "commit": "42f4d6438c8aeb94ebc1782f2f5e2abd17f0ffde", - "sha256": "0j5ax14lhlyd9mpqk1jwh7nfp090kj71r045v2qjfaw2fa23b7si", + "commit": "0bad7f91094d96d387bf0b121d6223afdc0f236c", + "sha256": "0aszjrv08n8lzpzsj694kldnmmx9b9qh9xmwnb6d7qxygzmbw1dj", "fetcher": "github", - "repo": "leanprover/lean-mode", + "repo": "leanprover/lean3-mode", "unstable": { "version": [ 20210305, @@ -55852,14 +56535,14 @@ "repo": "emacs-helm/helm-ls-git", "unstable": { "version": [ - 20240315, - 1721 + 20240811, + 1739 ], "deps": [ "helm" ], - "commit": "8b0b9484d43153e0c1a1fb664a14b1a53874e60b", - "sha256": "1ggsx4hvkq7q13pxa4lqxj4s78fm5acl55z7b5c1qrvykkwjdfc4" + "commit": "244b6854c1c118e41c8fac0201eff03ba034ddc6", + "sha256": "02ckp8s9649kanawl662acl4vd5d5q9cfzvfkfh07xm3x03d44az" }, "stable": { "version": [ @@ -56122,14 +56805,14 @@ "repo": "emacs-helm/helm-mu", "unstable": { "version": [ - 20240421, - 1656 + 20240726, + 608 ], "deps": [ "helm" ], - "commit": "36bb948e239f21478939a6848c2b0a3985b27680", - "sha256": "18vr00vvra4sb91948h761k30bi9gm2vadyvsyk7r3jxmcyy1ixb" + "commit": "4a45bb87215a47c8638034a06bf6529369779c5c", + "sha256": "0344rmwl6g9wy2vf919idm0fnrplyw112sfb39h533y0sy2244sy" } }, { @@ -56321,23 +57004,24 @@ "repo": "alphapapa/org-ql", "unstable": { "version": [ - 20240403, - 2026 + 20240613, + 355 ], "deps": [ + "compat", "dash", "helm-org", "org-ql", "s" ], - "commit": "1f264bf4649dc2ad90f16a763794561ee6164d84", - "sha256": "0425r0qjl83d1zq2z9myish3iqa6pc9ml2jlwmffjnj5gm3vgfsj" + "commit": "f7c3a61e32e8da62da1e69a2a79ec5b333a7d1f5", + "sha256": "1di581sgfqjbij1s2ka5mkycdkrsg39rh6g51x1iicvs5j8r0ih9" }, "stable": { "version": [ 0, 8, - 6 + 7 ], "deps": [ "dash", @@ -56345,8 +57029,8 @@ "org-ql", "s" ], - "commit": "1f264bf4649dc2ad90f16a763794561ee6164d84", - "sha256": "0425r0qjl83d1zq2z9myish3iqa6pc9ml2jlwmffjnj5gm3vgfsj" + "commit": "c2b4404808185a9d5e160c8eea7967f906f77fd3", + "sha256": "0smk5affzlf0i4m10kx8mcffpysd61pjm4zidz2qdv5vsg3j9z50" } }, { @@ -57025,6 +57709,40 @@ } }, { + "ename": "helm-roam", + "commit": "3dc5cbec2474de49fd9f92ba5273981aa14ed14d", + "sha256": "08wvnx31i8r1gg3sirlxxh1w1bd1v97aw834qk82cxz1ikn2qhq8", + "fetcher": "github", + "repo": "vhqr0/helm-roam", + "unstable": { + "version": [ + 20240723, + 1443 + ], + "deps": [ + "helm", + "org", + "org-roam" + ], + "commit": "85222a9ea50c69b18c1e31a66cc70adb851967d5", + "sha256": "1853p09zn61m1bgyawn2lq96ls1ylxgsqz36q4x7hq7k1fpfzvj3" + }, + "stable": { + "version": [ + 1, + 0, + 2 + ], + "deps": [ + "helm", + "org", + "org-roam" + ], + "commit": "85222a9ea50c69b18c1e31a66cc70adb851967d5", + "sha256": "1853p09zn61m1bgyawn2lq96ls1ylxgsqz36q4x7hq7k1fpfzvj3" + } + }, + { "ename": "helm-robe", "commit": "2a2670edb1155f02d1cbe2600db84a82c8f3398b", "sha256": "143azbrj32mk0xv0i7wpvwcj4lqvphbjj3rbcpwnx76rywi3iqp7", @@ -58087,8 +58805,8 @@ "repo": "Wilfred/helpful", "unstable": { "version": [ - 20231028, - 516 + 20240613, + 1523 ], "deps": [ "dash", @@ -58096,8 +58814,8 @@ "f", "s" ], - "commit": "a32a5b3d959a7fccf09a71d97b3d7c888ac31c69", - "sha256": "1shv5v0rls38znv64g8h80541qyjqk39fpr7wkq5vis8xpfvvpp5" + "commit": "4ba24cac9fb14d5fdc32582cd947572040e82b2c", + "sha256": "1xhhm7avgv9iqnc9pdx8dzcx8p5xaqk81j5zp96qbv035mqkpzrx" }, "stable": { "version": [ @@ -59226,26 +59944,26 @@ "repo": "tarsius/hl-todo", "unstable": { "version": [ - 20240415, - 1538 + 20240805, + 1444 ], "deps": [ "compat" ], - "commit": "36b66cde5777943ca0f190ad7a33fae3b2f6a404", - "sha256": "0v9mrkqxbvjpx1ynx8pja5djghwnix80vkbazrfv39j7shmx2dkh" + "commit": "82eba6b8f7b5a4cbcf22436d5c5b88fb3134f57e", + "sha256": "00x17bcpdp7xa49jf2np77s8rxk6q8wb0rhfwmbg52z5y61gl7f8" }, "stable": { "version": [ 3, - 6, - 0 + 8, + 1 ], "deps": [ "compat" ], - "commit": "70ce48470c85f1441de2c9428a240c3287995846", - "sha256": "1rq16zrdmq9j2jrsg136r5qbqvsgd2bkgpb2wmxca91kfx86r2qq" + "commit": "82eba6b8f7b5a4cbcf22436d5c5b88fb3134f57e", + "sha256": "00x17bcpdp7xa49jf2np77s8rxk6q8wb0rhfwmbg52z5y61gl7f8" } }, { @@ -59796,11 +60514,11 @@ "repo": "hniksic/emacs-htmlize", "unstable": { "version": [ - 20240422, - 1351 + 20240527, + 1456 ], - "commit": "54ac89c5edc7a83344cf51d8be08e1e701f88863", - "sha256": "0sw9jc860fhlljq9s61qz6cgg2cf43zi2l0ff6mp4np5rdiyrwjd" + "commit": "ed5e5b05fd260e8f161a488d56f10e7f6e01fb75", + "sha256": "19q4m3bc7dljh04662vm4rr1kz5c11rwyyv27vp01yakwbfig772" }, "stable": { "version": [ @@ -59946,11 +60664,11 @@ "repo": "pnor/huecycle", "unstable": { "version": [ - 20210830, - 340 + 20240614, + 49 ], - "commit": "a05e32351dcff3e61b5f15800556adfe1939c112", - "sha256": "1qnid40hmz3yw5jr1i9xr91d57hjh90s98js48nk6m0sjbkkbb4r" + "commit": "8f3e8641f950072ebf4bb03afd49b87aad147ad9", + "sha256": "0v5d96sgfmglm4q2gi676ardkigdqws5k5cwcg8bk72cc2b35di1" }, "stable": { "version": [ @@ -60247,11 +60965,11 @@ "url": "https://git.savannah.gnu.org/git/hyperbole.git", "unstable": { "version": [ - 20240519, - 1800 + 20240819, + 504 ], - "commit": "61937530ea3713b37ed34b8ad62331a507ccf8c6", - "sha256": "0i6h8m04njp9vwzibm2ja299lrgygw222mgknf773dys3bdnf7pm" + "commit": "8fa9e4e19880b6270c138c634855edab8779c2f8", + "sha256": "1cr09q8ihjn7fycrz0k9957g8d9isq1lgy4fa5aifm3w3wxz9x9b" } }, { @@ -60262,19 +60980,20 @@ "repo": "ushin/hyperdrive.el", "unstable": { "version": [ - 20240522, - 627 + 20240818, + 2123 ], "deps": [ "compat", "map", + "org", "persist", "plz", "taxy-magit-section", "transient" ], - "commit": "f32525eea6032d3422a4419fe65d6c32eb359b8b", - "sha256": "0rs5ij0z82f2aiq5lrr0rkp33cxx2wb149mb2mrjczwrqm9riwbn" + "commit": "0af765ab019912b5a0bbdd91529bc51745d48f42", + "sha256": "19yp0dyrnsh68px546rz2nxz0kmiwz690w5fvmcknicgh2w9vyl3" }, "stable": { "version": [ @@ -60370,6 +61089,30 @@ } }, { + "ename": "hyperstitional-themes", + "commit": "0c845614a741c81502707156a4665b41cc504a78", + "sha256": "12z2dg035phanfdly1bkl48496yds4zbv7j9cn0211sx7bxfb265", + "fetcher": "github", + "repo": "precompute/hyperstitional-themes", + "unstable": { + "version": [ + 20240528, + 2016 + ], + "commit": "e87e4ca39384c75398c64c920bf4cbc253f6740b", + "sha256": "0026mlsank67q32sxhjmis9jhsd267gm1v5b7bdw8sm5mh96yx9g" + }, + "stable": { + "version": [ + 1, + 2, + 0 + ], + "commit": "e87e4ca39384c75398c64c920bf4cbc253f6740b", + "sha256": "0026mlsank67q32sxhjmis9jhsd267gm1v5b7bdw8sm5mh96yx9g" + } + }, + { "ename": "i-ching", "commit": "28b05f2e04d286f3115e33e9d3e717caef8a0a46", "sha256": "14g095dd8gzp64xwnnha1smd5jqgswzfaw9vfz4ihyglsjvl23m1", @@ -60377,14 +61120,14 @@ "repo": "zzkt/i-ching", "unstable": { "version": [ - 20230530, - 937 + 20240729, + 1054 ], "deps": [ "request" ], - "commit": "2f1e8393b09f926188eb640604f5bc637707315e", - "sha256": "1g1j0yb6x9bmlz3ld5w7wwgaxn7dw3nfba5jmlhg83q6m6h168qi" + "commit": "0870cb1fa5bca0b7848e3f4e902e6d58445eab09", + "sha256": "19prq2kmzk33i2w4bargls7zad41rvmdflbw7f1gyz4lyh7spgzg" } }, { @@ -60455,11 +61198,11 @@ "repo": "mkcms/interactive-align", "unstable": { "version": [ - 20240326, - 1233 + 20240531, + 2023 ], - "commit": "764aea597b8c9292da2d91294bb6a70e7ad7d6d7", - "sha256": "1hdkkrcs86xmw6j5z7bqqvk4kdsf4a8ksr9bfzwkfs8sc68314zv" + "commit": "96043dff1c542d15cccf5df46b778927fcf5680d", + "sha256": "1c9qpygvs5zqrsc2q0sdm6s3yz4qgwa6qin7vax13b1f654hz6mb" }, "stable": { "version": [ @@ -61268,15 +62011,15 @@ "repo": "idris-hackers/idris-mode", "unstable": { "version": [ - 20240423, - 1320 + 20240704, + 1334 ], "deps": [ "cl-lib", "prop-menu" ], - "commit": "aa580b61eb3d409ae9ceb141547937ad27fae24c", - "sha256": "0ylb8my9qs9agqv6i7xj4lgca2pg0cdlqagn345pydjhgd8n5cbx" + "commit": "09de86a8f056c61de72c678386039894779a9375", + "sha256": "1kdsrbh32dr3j0icnplpd4wjyp0n6d0kp7gfgbz1xcvh21gn8rdb" }, "stable": { "version": [ @@ -61378,28 +62121,28 @@ "repo": "KarimAziev/igist", "unstable": { "version": [ - 20240322, - 953 + 20240713, + 920 ], "deps": [ "ghub", "transient" ], - "commit": "051a58085cd9593665c59c75208cc10189b53504", - "sha256": "1pcm39n1kgl7h7bqkp7grwgd8fa720ss1px1by07al08g39xq72y" + "commit": "b3d6d3d95d0a394e19b3068e3ff553009b498fbc", + "sha256": "0byfi9ksms0hdzqx51qmv6as9bhjfmf5l0mpp48lcz0b0mbj542z" }, "stable": { "version": [ 1, 6, - 1 + 3 ], "deps": [ "ghub", "transient" ], - "commit": "051a58085cd9593665c59c75208cc10189b53504", - "sha256": "1pcm39n1kgl7h7bqkp7grwgd8fa720ss1px1by07al08g39xq72y" + "commit": "b3d6d3d95d0a394e19b3068e3ff553009b498fbc", + "sha256": "0byfi9ksms0hdzqx51qmv6as9bhjfmf5l0mpp48lcz0b0mbj542z" } }, { @@ -61554,26 +62297,26 @@ "repo": "tarsius/imake", "unstable": { "version": [ - 20240415, - 1539 + 20240805, + 1321 ], "deps": [ "compat" ], - "commit": "55c86a15fb253c7e351d55e762ece0a15dc816b9", - "sha256": "1svvjgp7ndn4i9rrg5idrqinhpfnmw0m5s5f4nr3c0zp44l2xn4i" + "commit": "f3765f893e74e63ccb15a577d6bdf5be5f0da788", + "sha256": "1ajg2vpxky8qbbfkv74as61c6g9g0bc3xry16vxk8g2fq62fm303" }, "stable": { "version": [ 1, 2, - 0 + 2 ], "deps": [ "compat" ], - "commit": "96ac809dbe9cae0e620bb5b1d5d1fb391f3f4741", - "sha256": "0xxh1jci3gvbiv0kcif1b39gfakgwaqd7a8pfwpw7f7prv44ifp6" + "commit": "f3765f893e74e63ccb15a577d6bdf5be5f0da788", + "sha256": "1ajg2vpxky8qbbfkv74as61c6g9g0bc3xry16vxk8g2fq62fm303" } }, { @@ -61860,14 +62603,14 @@ "repo": "jcs-elpa/impatient-showdown", "unstable": { "version": [ - 20240101, - 929 + 20240617, + 1944 ], "deps": [ "impatient-mode" ], - "commit": "f24ebb103cd8cba36943f6a41a0fed303bd7ba5c", - "sha256": "1hxxygwbs1wc080gs8lm2dij6m5qkzp0f88ifi9309b2gd0grg7n" + "commit": "6bdb55c33e99f97a26aab617b686daa6f193eafa", + "sha256": "00fh12ryrfvihckrvd9gh1cfxbj8gix0jagw816yzlj6i7530ldl" }, "stable": { "version": [ @@ -61980,11 +62723,11 @@ "repo": "flashcode/impostman", "unstable": { "version": [ - 20230111, - 2012 + 20240524, + 847 ], - "commit": "936575500f733c2428ba878f9400f3eef8c9645e", - "sha256": "16zd5bk7s1h9yrrsk0ngpzb4cfyj4gkmq70m0ijsc94az7m9rlx3" + "commit": "c0d7b5b0950fd8113f55a02b3ee7e0fc9c431bea", + "sha256": "0iydxmv5kawizfi0ibzlz38ycnacgskj6l1mrx47a2hxd5laz71i" }, "stable": { "version": [ @@ -62313,11 +63056,11 @@ "repo": "nonsequitur/inf-ruby", "unstable": { "version": [ - 20240509, - 143 + 20240627, + 2135 ], - "commit": "1dcaa0aad2eec23582263f934005140ddf70f52c", - "sha256": "1rxxn0329c3xvcn931rwb2chfzxm2m9zi2zq6kvgi5bwq2p5b53q" + "commit": "b234625c85a48cc71e7045f5d48f079f410d576a", + "sha256": "13x6jg89wg0s41p12srv61if9jwz1j0j0q5yfc543lx6ndk1w67g" }, "stable": { "version": [ @@ -62749,10 +63492,10 @@ "repo": "ideasman42/emacs-theme-inkpot", "unstable": { "version": [ - 20230618, - 715 + 20240610, + 1406 ], - "commit": "2f59c524e17f8fb157bdbae5cf10cfe42f63c6bd", + "commit": "259272084f8ead2453f83f526ed95061f879d464", "sha256": "08lnbvnn56hkm78sxs7k5h8wy4v0c2aynq41bqjr3p2j19hkxssr" } }, @@ -63157,6 +63900,29 @@ } }, { + "ename": "iosevka-theme", + "commit": "82c26e97c7d96817b9ae524a976b243cfe2d9c38", + "sha256": "0a6z01qqx63wg95cyvs1yc2mxsyys51j1msvx7myi9z8nqj5l3s7", + "fetcher": "codeberg", + "repo": "mekeor/iosevka-theme", + "unstable": { + "version": [ + 20240621, + 2151 + ], + "commit": "1f17b9cdb48021a0ac1369d9622742e0f5442c9d", + "sha256": "0gv79s2v0g5vjqg5xlbxhlqrg7fjymch4skgrnz0ni21h4m9c6gk" + }, + "stable": { + "version": [ + 0, + 2 + ], + "commit": "4b4fecee994b62c4b2b3d7bc34c181937c41eafc", + "sha256": "1ysdq690r8ks86j837dm5v9mlyh3l4mzxfm2dmhl0cg051azv0p2" + } + }, + { "ename": "iota", "commit": "4062b8df284ac67c8324c7aee82c6be955e6e3a8", "sha256": "0gc6x32nmxqr4xapp2kr9ygn1b6nrhpfgidzr59cjj1dgnvkx4m1", @@ -63312,11 +64078,11 @@ "repo": "a13/iqa.el", "unstable": { "version": [ - 20200520, - 1137 + 20201113, + 849 ], - "commit": "03f90a2f68b2f05d8a2509bf3612a337d3d5b67f", - "sha256": "0vri1i5lxgp8rcj6gr9sxkmfv2s3qkia3aw6cjm4dyp3q91m2vp1" + "commit": "eed962679783133e1ff6ae63d19efaeae4dadb6b", + "sha256": "0v5d51rzcx500rz3k0jqqssgiwfzl0m7sxkxz2xl8dpnjmkvsvym" } }, { @@ -63743,11 +64509,11 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20240519, - 1636 + 20240524, + 1139 ], - "commit": "6a98b006f140b588490c24c5f794aac4250bf300", - "sha256": "054wjara59jjqrhr7hq0h4h3f3k6gvbx6m8066s5hryvi1ij2p4y" + "commit": "2a25a6fb5b081cb141c5eccac8ee58ab1feeb747", + "sha256": "1z5975q7a67z2kgnx3klr35magrcgy6idhzhi73in133cff0d21n" }, "stable": { "version": [ @@ -64323,27 +65089,28 @@ "repo": "radian-software/prescient.el", "unstable": { "version": [ - 20240226, - 204 + 20240803, + 2320 ], "deps": [ "ivy", "prescient" ], - "commit": "c39bf07c56b427bf41aafd7d20eaef5cf3c312b5", - "sha256": "0pfc0ycp4cr9zwkjv3rqfkwkx8p52ad7aq2c60j0qwp3yd0cghc4" + "commit": "2b8a8b41228bddb2e11eb1c200e98a9edd04797c", + "sha256": "0qz3xv38vazxqsl7lan7fshj3gmb0qagkrvl5xzwqhdg0rir981j" }, "stable": { "version": [ 6, - 3 + 3, + 1 ], "deps": [ "ivy", "prescient" ], - "commit": "c39bf07c56b427bf41aafd7d20eaef5cf3c312b5", - "sha256": "0pfc0ycp4cr9zwkjv3rqfkwkx8p52ad7aq2c60j0qwp3yd0cghc4" + "commit": "2b8a8b41228bddb2e11eb1c200e98a9edd04797c", + "sha256": "0qz3xv38vazxqsl7lan7fshj3gmb0qagkrvl5xzwqhdg0rir981j" } }, { @@ -64659,11 +65426,11 @@ "repo": "zellio/j-mode", "unstable": { "version": [ - 20171224, - 1856 + 20240611, + 2211 ], - "commit": "e8725ac8af95498faabb2ca3ab3bd809a8f148e6", - "sha256": "0icrwny3cif0iwgyf9i25sj9i5gy056cn9ic2wwwbzqjqb4xg6dd" + "commit": "3f852d1476be5625fea51dcaaad66dd57593101a", + "sha256": "05biqy3gdq3k5yldjwpnsn9jabnchmdzcfkpkmcdr3j2dsh7rciw" }, "stable": { "version": [ @@ -64683,15 +65450,15 @@ "repo": "emacs-jabber/emacs-jabber", "unstable": { "version": [ - 20240522, - 1532 + 20240624, + 528 ], "deps": [ "fsm", "srv" ], - "commit": "02372a6673372779571b524319e08b84241e87c6", - "sha256": "0ps998w5z0qs676l29ag47mrrsg9k2g7pgl7fbfc0crbi2ivzj2a" + "commit": "e766d84b81d5df6abc30fcbbb94f7c8640ea54e2", + "sha256": "0b6msdyvhjr4v4j8hl6kmcjks88iq001w1fhjgfvg8ii9n77n6xn" } }, { @@ -65352,26 +66119,26 @@ "repo": "ericdallo/jet.el", "unstable": { "version": [ - 20230525, - 1334 + 20240730, + 1228 ], "deps": [ "transient" ], - "commit": "7a3821c2f351a3770ae23e143f286e6c3a868d38", - "sha256": "0r1wsz6zk3n67wl7bq7s9jwh38r2n1nr5jsq0hsln6f3jidpy3js" + "commit": "67ded216a0a6af0bb8d6874a7faea538912c0345", + "sha256": "0vsa8mhqi702fc9izza68maxqh0g80cv62y7vjasnvg3yq64hygm" }, "stable": { "version": [ 1, - 1, - 1 + 2, + 0 ], "deps": [ "transient" ], - "commit": "7a3821c2f351a3770ae23e143f286e6c3a868d38", - "sha256": "0r1wsz6zk3n67wl7bq7s9jwh38r2n1nr5jsq0hsln6f3jidpy3js" + "commit": "67ded216a0a6af0bb8d6874a7faea538912c0345", + "sha256": "0vsa8mhqi702fc9izza68maxqh0g80cv62y7vjasnvg3yq64hygm" } }, { @@ -65480,25 +66247,25 @@ "repo": "minad/jinx", "unstable": { "version": [ - 20240515, - 1016 + 20240724, + 917 ], "deps": [ "compat" ], - "commit": "3c36f1eb31713869ffbdbf55971671efa4f01966", - "sha256": "04f9yd710rrn1v5b44jaackrnc7f6ywy4r5j5ig12gkddbx3r29i" + "commit": "4c89699db3851c3ecfa5d007ab56c810e8e3ffeb", + "sha256": "1m5895c1vlrma0kpakx6s3q9kbjihss57kwjcx66pr342kjaklvm" }, "stable": { "version": [ 1, - 7 + 10 ], "deps": [ "compat" ], - "commit": "3c36f1eb31713869ffbdbf55971671efa4f01966", - "sha256": "04f9yd710rrn1v5b44jaackrnc7f6ywy4r5j5ig12gkddbx3r29i" + "commit": "4c89699db3851c3ecfa5d007ab56c810e8e3ffeb", + "sha256": "1m5895c1vlrma0kpakx6s3q9kbjihss57kwjcx66pr342kjaklvm" } }, { @@ -65589,11 +66356,11 @@ "repo": "ideasman42/emacs-jit-lock-stealth-progress", "unstable": { "version": [ - 20240422, - 105 + 20240616, + 2345 ], - "commit": "8f517230266faf1decb8e948110baef7539c9df3", - "sha256": "0n78ijl1z1rlyx8y83c71rhwf63lzicc39d05myj25r31may5k2l" + "commit": "caf256543cfe5404333f5cf914a478d14b2ec102", + "sha256": "1iiinybr3alh0afmyhb2mz7c1r3c360bxy7x6ha2jhjk8ncz946c" } }, { @@ -65634,11 +66401,11 @@ "repo": "Michael-Allan/Java_Mode_Tamed", "unstable": { "version": [ - 20240508, - 951 + 20240617, + 1034 ], - "commit": "4a0bcf5a8f86e26ce76df0ea984c316e63df13f3", - "sha256": "11ka3hcfzh7dzk37zb7lblyq6r5k2f4dpn8c1nkiyzamchbfg4df" + "commit": "278db38c30bd556793c9ce0c939045e95dbb6f32", + "sha256": "1viiwc8fjazrchbkxr63k4k3m9gsaay64jikq4prrnbpmz9ljng7" } }, { @@ -65752,11 +66519,11 @@ "repo": "ljos/jq-mode", "unstable": { "version": [ - 20240304, - 911 + 20240528, + 752 ], - "commit": "d533567a680bc87060c56a50f83d80e58646d2f2", - "sha256": "02bl5v7y64xl14g396yl9z8bb87aldhg8yb4c72jycqf9xkmanai" + "commit": "a0f79eba786d46f01aeabb5913aadc337e985d6c", + "sha256": "0x2rgy5f55zrgmcg4rz2ivrb8pws1v5yyy69bfkbqqggniplh5y8" }, "stable": { "version": [ @@ -66260,26 +67027,26 @@ "repo": "taku0/json-par", "unstable": { "version": [ - 20240217, - 550 + 20240608, + 725 ], "deps": [ "json-mode" ], - "commit": "52f69108d4eca328f7eb74c2dfb841db2f0ffa8a", - "sha256": "0ifsy0016yrh9dkw9zlfd4l7m30fncli954zm3n1qknk6dmyd19r" + "commit": "c4a9566142de6b0812cf4dfe0b0bf49b3e35f038", + "sha256": "0hhwhlfxrm6qnb99awy3hxm5zdjsz40jifxyp6qjsny5cg418zf9" }, "stable": { "version": [ - 4, + 5, 0, 0 ], "deps": [ "json-mode" ], - "commit": "8d6f6adb24c08896fbc285b7144202074c2d6244", - "sha256": "0himbsm42sgjc576p45r1v5jqpr91lzi2s54lrj45gf0bixgvql3" + "commit": "7b346b0f0db62d65f382ce48a9b2ecd9e180b0d7", + "sha256": "1rppp5yi3v3jf90di9jsil18fl00l4qlgandzb3bdrv0j9z2lfqc" } }, { @@ -66540,20 +67307,20 @@ "repo": "llemaitre19/jtsx", "unstable": { "version": [ - 20240519, - 1546 + 20240715, + 2002 ], - "commit": "7bbf02f046e375c23fe5a90eb0a9557e843eba41", - "sha256": "1x7w6g535la7fs05v2xil4bggif7j9f3qphc49fz9ay6q6rfsc84" + "commit": "e81259a7584619ce3266a2d532f674ef45ee4274", + "sha256": "0z8z41hy4ssyyb4skzzysayw72jc441bffhbw1mgmgpjr7412b94" }, "stable": { "version": [ 0, - 4, - 2 + 5, + 1 ], - "commit": "32dec6d5d5725a7fe2d50537e46c224349008896", - "sha256": "1g82cfkkv7vjsk29bfjjwjhwark1h371pzrfqnrm5sfpyn1h3nxv" + "commit": "e81259a7584619ce3266a2d532f674ef45ee4274", + "sha256": "0z8z41hy4ssyyb4skzzysayw72jc441bffhbw1mgmgpjr7412b94" } }, { @@ -66653,8 +67420,8 @@ "repo": "gcv/julia-snail", "unstable": { "version": [ - 20240521, - 22 + 20240812, + 840 ], "deps": [ "dash", @@ -66663,8 +67430,8 @@ "s", "spinner" ], - "commit": "f7784c50078332aeeb8e388bf5b8f13042b7406b", - "sha256": "0cds08nyr7px5mbna2gbmv6a82hc1my45illdgswf7k67jby46zr" + "commit": "dff92c4250e40a6cc106f0ea993f9631ad55eb7c", + "sha256": "1s2382n7bf741hnyxafx4f323f66xbfnpp3nky629s4sy8r4x0hr" }, "stable": { "version": [ @@ -66874,8 +67641,8 @@ "repo": "emacs-jupyter/jupyter", "unstable": { "version": [ - 20240418, - 1642 + 20240716, + 2028 ], "deps": [ "cl-lib", @@ -66884,8 +67651,8 @@ "websocket", "zmq" ], - "commit": "f1394d303be76a1fa44d4135b4f3ceab9387a16b", - "sha256": "0346ws7ym873dc3xbmpzlg371v0rgclz93hbfzcld7gv4g1dncfb" + "commit": "f97f4b5d8c83e0b901020f835183dde8a2bf649e", + "sha256": "0jmhh9ncnf4ai8rr2g474n6dv9m7v983s2w0smy0h7l07sp43klq" }, "stable": { "version": [ @@ -66935,8 +67702,8 @@ "repo": "psibi/justl.el", "unstable": { "version": [ - 20240224, - 428 + 20240701, + 1259 ], "deps": [ "f", @@ -66944,8 +67711,8 @@ "s", "transient" ], - "commit": "1b16ca44b227dc761a2c8631690140f62e024f98", - "sha256": "1ciwiamby7w8snkrn6c3s7y5fyfpv6982rihfx6gmbsg0r6vgmwl" + "commit": "e74fef3e99c5c9e2e1a8495c539e1eca2cd0676d", + "sha256": "07gj3xfwim1df5c1dck9a3w00xg4syywmfzdayby5af79lrbcyrf" }, "stable": { "version": [ @@ -67144,25 +67911,27 @@ "repo": "bram85/kagi.el", "unstable": { "version": [ - 20240424, - 2021 + 20240811, + 2130 ], "deps": [ + "markdown-mode", "shell-maker" ], - "commit": "b3d45264fb25aa95130352c65bc87ec4659e6e71", - "sha256": "0jm4h2sbj7wn6s520zi62l9iqggp2q5whpncc1mb3ckfvwn0vhfk" + "commit": "013749218495e2c1bf2bb203c6b61976963817b5", + "sha256": "094yip5xp36lyfbj17f46jjvzr8g5c0pqqdm1fhhx3ivahb3jx9x" }, "stable": { "version": [ 0, - 5 + 6 ], "deps": [ + "markdown-mode", "shell-maker" ], - "commit": "a0e06cb928c2def572b4be0a19686e6997c83d92", - "sha256": "1x5nrdb2qvy66cbdvk0fc9bq8if3jqzlfnnqfc9y2ifgvh8hg1z5" + "commit": "9e48fc96d513f863acde3689077197306e3d205c", + "sha256": "1j7z607dxqmyn4cscsv5a8f1n8pmr9nv7fyi7z04nvnpgpg08h05" } }, { @@ -67272,17 +68041,17 @@ }, { "ename": "kanagawa-theme", - "commit": "e4033364b3a2898858cecee0d6deff5779195f29", - "sha256": "00zx1zjvshvld6f1q9lk8j08nng1ra0isyhbyhnic6mhljb20mk3", + "commit": "031d8e3e0b3caa06935005d4388c605a2b9a9e7d", + "sha256": "0bipgikp4280j46yk91zdyg53yscs93lsdzfm7w8ppfl1c4g6xxh", "fetcher": "github", - "repo": "meritamen/emacs-kanagawa-theme", + "repo": "Fabiokleis/emacs-kanagawa-theme", "unstable": { "version": [ - 20240501, - 38 + 20240721, + 1720 ], - "commit": "3ac33b6a4c7c7ad751ec8f264aa05f135b5d953d", - "sha256": "0dbdv64yzhrhhzg0asxnabzhv1jhcihmkby3ilw8hgls0w0r24c0" + "commit": "e1cf4ddb7245031fb214baae95ebbffce27dec06", + "sha256": "107p3x02680ndfss9dfczj95yfj5j0xgqjbl6ldwmzjc8vf0j96s" } }, { @@ -67323,30 +68092,30 @@ "repo": "magnars/kaocha-runner.el", "unstable": { "version": [ - 20240410, - 1348 + 20240625, + 1010 ], "deps": [ "cider", "parseedn", "s" ], - "commit": "ab5b4f32c733e238bdf08e10cab9a0606675faa4", - "sha256": "0qjbaahx04nrasz75ni3s3snhpbrcrv0a6g3gqqjs6f7kw327laj" + "commit": "98f45ee396802c2225595c9151d4a941f9dcaa9d", + "sha256": "15smw8033hjwg7wh5zcdngr9my7yy8lbjgw5x3kck87chrwyj6fr" }, "stable": { "version": [ 0, 3, - 0 + 2 ], "deps": [ "cider", "parseedn", "s" ], - "commit": "c4ec9cdc817e5f4c3f8d6013e44ea2df8f3eb07f", - "sha256": "062c6j8l2vv2vc23z5iq4b50p92k6bni1rayhhd8j0h5bkiml4w3" + "commit": "e5071ce09ec2d8c700bac91c902318035c5489bf", + "sha256": "0kxsrk4brk24mlc7fxvv0yrx5piq26fyjqllxx3vkkrzps792z3x" } }, { @@ -67526,11 +68295,11 @@ "repo": "conao3/keg.el", "unstable": { "version": [ - 20230709, - 1321 + 20240713, + 1007 ], - "commit": "c0d24fdad4248e0291685b47a02df54e9f980aba", - "sha256": "0bd5jp1qy4d4v71jfn3qp7rfwfbjvsbcmk9c6m4dympv1w9dp56d" + "commit": "e1726f89dab1811a110eebb3f3e4b673742faf05", + "sha256": "02wwr40jxny9w0xnjwi4n40hn5jmdkkzng4rml846hw4ih1vxc0k" } }, { @@ -67556,8 +68325,8 @@ "repo": "jinnovation/kele.el", "unstable": { "version": [ - 20240428, - 2141 + 20240621, + 2110 ], "deps": [ "async", @@ -67569,13 +68338,13 @@ "s", "yaml" ], - "commit": "ee667b6581113be21e7d24935cf8a431eb382432", - "sha256": "038zqsgbg4j7mrhw7rf61qp0bja2m675rhxk6y8bbnvkva8z24w9" + "commit": "2460094aede77054f3200c61d807a445e3b79c9a", + "sha256": "1izyfhabmlqhbn0zv0vxc8c2ncxs26qw17k4772gpksvxxa29i44" }, "stable": { "version": [ 0, - 5, + 6, 0 ], "deps": [ @@ -67583,12 +68352,13 @@ "dash", "f", "ht", + "memoize", "plz", "s", "yaml" ], - "commit": "642c415a833a7a2aa1fb577261b1e2ae0c4bbb72", - "sha256": "07yb4sdgzqwr7snpvmc72zvpc5aq37gmwbjq4b05rwcrhcv88kc6" + "commit": "beec4a76c090101d8a98e631c292207be3c3a6a1", + "sha256": "0h67jvvql9z969wzzxx8g2hnnzxw5p1wqc211258bgyxm6p25yzq" } }, { @@ -67758,26 +68528,26 @@ "repo": "tarsius/keycast", "unstable": { "version": [ - 20240415, - 1539 + 20240805, + 1322 ], "deps": [ "compat" ], - "commit": "04fa2c65f0ae901ed3015f691ea70f7658ea24b8", - "sha256": "088grlq97g5csb1w84mjj7ffc3hjg55aa2i2km63xqx112l7h3m1" + "commit": "c44618d2867fc2410e5061fef2a805e974198cf2", + "sha256": "02h6dq1hq2k3x1gqcx5lafsl94wqq63jx1avf91dc6r0s6byb0sm" }, "stable": { "version": [ 1, - 3, - 3 + 4, + 1 ], "deps": [ "compat" ], - "commit": "c47fa154c756abd044da4a1353c30b978782f7dc", - "sha256": "0hwmjy90ngnbvhxiyf4l3lb7212i5bsqdz73qnfg1iwa7vgkv1q7" + "commit": "c44618d2867fc2410e5061fef2a805e974198cf2", + "sha256": "02h6dq1hq2k3x1gqcx5lafsl94wqq63jx1avf91dc6r0s6byb0sm" } }, { @@ -67861,26 +68631,26 @@ "repo": "tarsius/keymap-utils", "unstable": { "version": [ - 20240415, - 1539 + 20240805, + 1326 ], "deps": [ "compat" ], - "commit": "06572084a7965b86262d7f1b52c32ed2dde86a9e", - "sha256": "1mlf3g1ywbh4xk5fv0nq9fw6c39xh9r87csr8c09dkrjlgp0fagn" + "commit": "a1ea60ce0adfbb4b47cdd7f29943e5ee362b71ce", + "sha256": "1va7dsh0c2xf234lfkkmw63c9p0m9h8aiikrlf361nllrzz77497" }, "stable": { "version": [ 4, 0, - 0 + 2 ], "deps": [ "compat" ], - "commit": "1806ff73b0a68e84234d65c7d08a18cf3f0d29e5", - "sha256": "1amcipkd4k8kfrlnq5sqzgwwhd42kx6aw5fnallidahz8pw79s7g" + "commit": "a1ea60ce0adfbb4b47cdd7f29943e5ee362b71ce", + "sha256": "1va7dsh0c2xf234lfkkmw63c9p0m9h8aiikrlf361nllrzz77497" } }, { @@ -67981,11 +68751,11 @@ "repo": "hardenedapple/keyswap.el", "unstable": { "version": [ - 20160813, - 957 + 20240717, + 1440 ], - "commit": "cd682a7c4a8d64d6bae6a005db5045232e5e7b95", - "sha256": "191i2b2xx6180sly0dd6b1z6npsrzjqhxrbak9wm6yblx7alsgn2" + "commit": "d4f9f56a0e6e1365fc7c8ea8d953b8fdffad27fe", + "sha256": "1h229qpfhvfr47kbvip6a452czhjh3cnihsayrx4qkj42id0q2vr" } }, { @@ -68053,20 +68823,20 @@ "repo": "hperrey/khalel", "unstable": { "version": [ - 20240314, - 1347 + 20240527, + 527 ], - "commit": "9dea9e45ebb2364f9fe873ca773b9324b34b720f", - "sha256": "0gqwqhbg4hjlgln5gvkppq3rx2iwrqpdp9ivwspnpfqxrn1b8ihd" + "commit": "14ef50352394cd1d62b80bc17ab14f4f801f47cd", + "sha256": "017hw2mr810r7hxs8jvnf590n6van8w29ibryz9dwxszrij21gd7" }, "stable": { "version": [ 0, 1, - 11 + 12 ], - "commit": "9dea9e45ebb2364f9fe873ca773b9324b34b720f", - "sha256": "0gqwqhbg4hjlgln5gvkppq3rx2iwrqpdp9ivwspnpfqxrn1b8ihd" + "commit": "14ef50352394cd1d62b80bc17ab14f4f801f47cd", + "sha256": "017hw2mr810r7hxs8jvnf590n6van8w29ibryz9dwxszrij21gd7" } }, { @@ -68107,28 +68877,28 @@ "repo": "khoj-ai/khoj", "unstable": { "version": [ - 20240501, - 1100 + 20240816, + 1432 ], "deps": [ "dash", "transient" ], - "commit": "bc8b92a77dc40c93a5fdf6639f367d814339bbad", - "sha256": "195b9xnlmnlnnl84app8kqbacvlxfxr3li393p43wp5inqsajg2h" + "commit": "2b1482d2b44efeface0aff6b7479e4c46aca72b1", + "sha256": "0lr0v08c468m4i8w80xgpqzpfj621igff5c2xr0v5nn2phmi05rn" }, "stable": { "version": [ 1, - 12, - 0 + 20, + 4 ], "deps": [ "dash", "transient" ], - "commit": "bc8b92a77dc40c93a5fdf6639f367d814339bbad", - "sha256": "195b9xnlmnlnnl84app8kqbacvlxfxr3li393p43wp5inqsajg2h" + "commit": "7815e02dd421b705461df6a97033dafd61ba6419", + "sha256": "0rdnar6d85cdf5vligxxnxbsawmdmkxlq1niadk4mg6fmfb7akrz" } }, { @@ -68371,11 +69141,11 @@ "repo": "WammKD/emacs-klere-theme", "unstable": { "version": [ - 20240123, - 124 + 20240815, + 454 ], - "commit": "e73a01e69bf80f753a1603337fdc4b89e685219a", - "sha256": "1kyx1r0hwb1d16mw6y39gl7a3x32wsl0z3riki87c139z66zy8hn" + "commit": "fec81fb9925cbcc4472f34ca9625ee310802cbf3", + "sha256": "04kv6mca1j1h90l1jg7abwnwn6q5a193d4r51jv2j8cs9pi6rrfy" } }, { @@ -68410,11 +69180,11 @@ "repo": "vifon/kmacro-x.el", "unstable": { "version": [ - 20230502, - 1253 + 20240721, + 1103 ], - "commit": "b5f6b408a9134f3db14c0516c5ba48d68178a175", - "sha256": "1qcs1pn2mkgfxs3975c95xflzl45zkf66kslp9c2lvlw668xyg9i" + "commit": "3f58f5421b98b436122dba2514cf559a7359904d", + "sha256": "0l3qrxgb8d67vwny7gpjjwnz367pbrj1qhy29cj9bbl9bbnlnkp8" } }, { @@ -68425,20 +69195,20 @@ "repo": "for-GET/know-your-http-well", "unstable": { "version": [ - 20160208, - 2305 + 20240726, + 1649 ], - "commit": "c381a9735f3ea86ebc9667e35cdfeab0b67fefb7", - "sha256": "1lppggnii2r9fvlhh33gbdrwb50za8lnalavlq9s86ngndn4n94k" + "commit": "2ff1548a6d59f2b59cfbdd2697fcf202625cc248", + "sha256": "1p4ibx0qgznv8ard4a9m7345ay8ij2qzmqdqiqlllndqq6mz62x5" }, "stable": { "version": [ 0, - 5, + 6, 0 ], - "commit": "c381a9735f3ea86ebc9667e35cdfeab0b67fefb7", - "sha256": "1lppggnii2r9fvlhh33gbdrwb50za8lnalavlq9s86ngndn4n94k" + "commit": "2ff1548a6d59f2b59cfbdd2697fcf202625cc248", + "sha256": "1p4ibx0qgznv8ard4a9m7345ay8ij2qzmqdqiqlllndqq6mz62x5" } }, { @@ -68701,8 +69471,8 @@ "repo": "abrochard/kubel", "unstable": { "version": [ - 20240419, - 1521 + 20240807, + 905 ], "deps": [ "dash", @@ -68710,8 +69480,8 @@ "transient", "yaml-mode" ], - "commit": "eb41a6420d20142e5cd33cd34e17654294c99c86", - "sha256": "1zqm65vng1fiwfra21hz0xqnbiqh97av8jr981rczxin0byic66a" + "commit": "68da30c647e16307dff71e1614015ba9877cd621", + "sha256": "0mzrnzr23fva3kbkinn4a5m2lms415a2c71gwicbb02kxxwl1f7h" }, "stable": { "version": [ @@ -68992,8 +69762,8 @@ "repo": "isamert/lab.el", "unstable": { "version": [ - 20240517, - 1837 + 20240724, + 2233 ], "deps": [ "async-await", @@ -69004,8 +69774,8 @@ "request", "s" ], - "commit": "fec1d5ad4e09c89c7260dc440f2dce6692b1ec0f", - "sha256": "0gfkxxdqli97x81pcxj1p3w1z6q5w7sn7q636hycrj97v3rdv8br" + "commit": "8ecca9a5200b322ffb3aef1f690689dd35764ef1", + "sha256": "11nl7r8g8vcvcwmrc07lblbzs9fn6ydyk9jc8grij7h73gia5yxd" }, "stable": { "version": [ @@ -69112,30 +69882,30 @@ "repo": "Deducteam/lambdapi", "unstable": { "version": [ - 20240425, - 941 + 20240729, + 1656 ], "deps": [ "eglot", "highlight", "math-symbol-lists" ], - "commit": "a4bc3a492ff542be2989b545362cd98ed38412e1", - "sha256": "1968s3bmwhjrvp2lrwbjkjij0xl3s6isxy1fhdkhrpin0iyfizy9" + "commit": "230d5726b91d11d4b356235f37445ead0a99f3f5", + "sha256": "0azizlidvjxs9dhl5g669cbf13w7i17n5hjk1s41kys1jvc48faa" }, "stable": { "version": [ 2, 5, - 0 + 1 ], "deps": [ "eglot", "highlight", "math-symbol-lists" ], - "commit": "3730715c845c0732b912e10e14391350c327b6d3", - "sha256": "0cbs4nhj4lk6sj454vf6kfsljidchhh9h2ayn611kn9xd95hr082" + "commit": "230d5726b91d11d4b356235f37445ead0a99f3f5", + "sha256": "0azizlidvjxs9dhl5g669cbf13w7i17n5hjk1s41kys1jvc48faa" } }, { @@ -69285,11 +70055,11 @@ "repo": "lassik/emacs-language-id", "unstable": { "version": [ - 20240510, - 1342 + 20240609, + 1616 ], - "commit": "435114f208b97e97aa1576ef1966a33d90cad01b", - "sha256": "1gwdiyvzm3dz1dj5l763f1v68bb15g5qfmy5b9p58695l5hi135z" + "commit": "44452e4f7962aca41cc2539fce1d27799d6e656c", + "sha256": "1x87qrqyg12w5ncgv6592amp08bpdn4sybhwyf3nwfp8zpfficms" }, "stable": { "version": [ @@ -69452,20 +70222,20 @@ "repo": "X9hRRDys/latex-labeler", "unstable": { "version": [ - 20231231, - 1909 + 20240730, + 634 ], - "commit": "c2df4c9d0a41a36de893925a91445ea65d504222", - "sha256": "0ar6yr7z4vans1hmhwsz1n19sx90kpnydhr3v0bjh6d8xzv31q9r" + "commit": "9912f11ac683baa2336726d22ba1942c0c159106", + "sha256": "004bwy0hg9wrm4a2mkh511318h05v5a5dzk38pni2iy7lh1sa67j" }, "stable": { "version": [ 2, 1, - 0 + 1 ], - "commit": "c2df4c9d0a41a36de893925a91445ea65d504222", - "sha256": "0ar6yr7z4vans1hmhwsz1n19sx90kpnydhr3v0bjh6d8xzv31q9r" + "commit": "9912f11ac683baa2336726d22ba1942c0c159106", + "sha256": "004bwy0hg9wrm4a2mkh511318h05v5a5dzk38pni2iy7lh1sa67j" } }, { @@ -69893,14 +70663,14 @@ "repo": "conao3/leaf-keywords.el", "unstable": { "version": [ - 20210816, - 1107 + 20240808, + 2302 ], "deps": [ "leaf" ], - "commit": "849b579f87c263e2f1d7fb7eda93b6ce441f217e", - "sha256": "00fnkk6hl9l64dgmkhsqibhna7gdpazs4j28f7833n1dmg626ki6" + "commit": "82ec27e3441900daedeaaebca509181f964da81f", + "sha256": "0nsa01d35z3dvvb6dnc43ii461c15pp35ji92k15x8z9nyr25wrd" }, "stable": { "version": [ @@ -69978,10 +70748,10 @@ }, { "ename": "lean-mode", - "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", - "sha256": "0rwb4ca079myvipzq938mry5d0fvq5p7cj40fnjfx1cflwwfxbj8", + "commit": "95d2d051c47697fa09c37a64ce9070aded61503d", + "sha256": "1sgi79s2d511gb448cjd5sxrxrm2k0kv4ic7a27izm24vgfy77x4", "fetcher": "github", - "repo": "leanprover/lean-mode", + "repo": "leanprover/lean3-mode", "unstable": { "version": [ 20230611, @@ -70087,11 +70857,11 @@ "repo": "ledger/ledger-mode", "unstable": { "version": [ - 20240423, - 445 + 20240804, + 1623 ], - "commit": "c66e3e9adfb5d91f83a401387fad345f12004c8a", - "sha256": "1i0rar36xzv2gqkn8cn29m5xz0pwmd5y5in8iac2h2fcxvd48vc5" + "commit": "a6be7a2d79281a442ce5abd3f073b6c20d7d11d8", + "sha256": "0faj0q9amfisrjzf7cb0idnsyiw1sf4ravgjlh0k24y0mx25j1xw" }, "stable": { "version": [ @@ -70126,18 +70896,17 @@ "repo": "kaiwk/leetcode.el", "unstable": { "version": [ - 20230524, - 1851 + 20240807, + 1731 ], "deps": [ "aio", "dash", - "graphql", "log4e", - "spinner" + "s" ], - "commit": "e5701191a98d043acdc7112f28d67e3d5c848228", - "sha256": "0wdqr5lwgzq5rx47dhilcmldnvmrw16rlbaklbnyn3lfbsj8p18w" + "commit": "064a03d3407d67391fd8c0f6494d0e0f0d867edc", + "sha256": "0k0mqaj65sq6h45wh9y7qqv434n292r81iyam2ybxyxn99rzjmvh" }, "stable": { "version": [ @@ -70179,15 +70948,15 @@ "repo": "martianh/lem.el", "unstable": { "version": [ - 20240313, - 1154 + 20240630, + 1228 ], "deps": [ "fedi", "markdown-mode" ], - "commit": "48caf7b856efc0c98f5d735dc605fbe0db793ec5", - "sha256": "181n1ng8nlx3dkj9lhjjva80a9i4xz6lj3yajzmf36y2b35va6s9" + "commit": "2dc5036f0991db352948ea93ae895654c0fe775d", + "sha256": "0zf3wpzqxphzxlgvqhns4yf1aa6yfgkxi5r32wi2gcrwnd97qwqn" }, "stable": { "version": [ @@ -70368,20 +71137,20 @@ "repo": "fniessen/emacs-leuven-theme", "unstable": { "version": [ - 20240304, - 1034 + 20240713, + 929 ], - "commit": "04ac63e73f060edcb1bf5fadad3466c3ab557d47", - "sha256": "0g95z1khr1g4sr5ppzqxnakm2hkfxhavw1rl03r99csqj9qppv4c" + "commit": "4f355a9832095c49ec109cfc5b8f82cd8c469572", + "sha256": "148qb2k3np5k1sa8i7yc7qbn5s4sm9x2n3akvpvf512byx3mivs3" }, "stable": { "version": [ 1, 2, - 0 + 1 ], - "commit": "04ac63e73f060edcb1bf5fadad3466c3ab557d47", - "sha256": "0g95z1khr1g4sr5ppzqxnakm2hkfxhavw1rl03r99csqj9qppv4c" + "commit": "4f355a9832095c49ec109cfc5b8f82cd8c469572", + "sha256": "148qb2k3np5k1sa8i7yc7qbn5s4sm9x2n3akvpvf512byx3mivs3" } }, { @@ -70779,16 +71548,16 @@ "repo": "emacs-vs/line-reminder", "unstable": { "version": [ - 20240101, - 857 + 20240715, + 2304 ], "deps": [ "fringe-helper", "ht", "ov" ], - "commit": "91d8f57f11f5ddbb5e94cb23877c67a8f59d4d8c", - "sha256": "0pvyfnf7qy6m0gwbmr74lvmrki6cpm9k836bbrsjdh7rip4k6xrq" + "commit": "76677e48451b77508673a52dcc0845b87e5f81fe", + "sha256": "1zr4fvw286gdibf642hv7jnsyyvw81mxk7695g7wqb7q582lkm3h" }, "stable": { "version": [ @@ -70899,11 +71668,11 @@ "repo": "martianh/lingva.el", "unstable": { "version": [ - 20220910, - 1435 + 20240607, + 1120 ], - "commit": "6c33594068fa33de622172503deeec6778d9c744", - "sha256": "0r2f4wrd2v67m7198z0194pg853hbq4vvpd3x96y5ikbypywf426" + "commit": "c4cd68fb3ab1ebf419be0ec92b77d9feac921a87", + "sha256": "18kl31d5cxxj990vi11b9k0q2hhkchgb5d326h9v912d0bv64qfm" } }, { @@ -70937,14 +71706,14 @@ "repo": "noctuid/link-hint.el", "unstable": { "version": [ - 20240409, - 1250 + 20240803, + 1223 ], "deps": [ "avy" ], - "commit": "9ead085e9e6798ec4ea4791d9906d6655ea2b402", - "sha256": "055p9p6qnzhnlm97gnbjwk1dls796zsbsvcphlivkx4zlval099w" + "commit": "eade470b2fe35b36b2ab3cc1c5f87792954063a2", + "sha256": "1mkishny6agg02ilshl6apz80hvwibs22yhn8394jpi0iwp8y7yk" } }, { @@ -70955,11 +71724,11 @@ "repo": "erickgnavar/linkode.el", "unstable": { "version": [ - 20200607, - 2152 + 20240604, + 53 ], - "commit": "e31bdae11ff38b736b1869fbe94920e862f29794", - "sha256": "1klzqwnfb8f33ycx9nhlmbmmy61lgq1nqkkwr7s2gb9y0bxgfzzl" + "commit": "5152aa3ba7a4360133efd5892f0891837af30440", + "sha256": "0c9ly7lf1ydn3zjqn265vkjq4n4qn3xvr4lhs66gh2krk8qrm9cm" } }, { @@ -71445,24 +72214,6 @@ } }, { - "ename": "litecoin-ticker", - "commit": "4976446a8ae40980d502186615902fc05c15ec7c", - "sha256": "14pjizgdckqhm31ihbz35j8g95jdpmf1rd4l5zz38fyx12zbcpx5", - "fetcher": "github", - "repo": "llcc/btcbox-ticker", - "unstable": { - "version": [ - 20160612, - 11 - ], - "deps": [ - "json" - ], - "commit": "3d8047c736e4ee0b8638953f8cc63eaefad34106", - "sha256": "03iggfi3r5xjh9yhhpr1pgyayriycyybf8qnrhqkqcamh77kq21f" - } - }, - { "ename": "literal-string", "commit": "6519bb53f409eeb0d557809b338849e473c193c4", "sha256": "0ylv9dpw17w272f92vn5cldklyz1d8daihi1fsh5ylvxqpinyrkn", @@ -71659,11 +72410,11 @@ "repo": "donkirkby/live-py-plugin", "unstable": { "version": [ - 20240419, - 404 + 20240720, + 1532 ], - "commit": "bea9903bca0ece7546df9a00883f17e4eb49b4c7", - "sha256": "0mv9fsmjvixdk3db8j1cw7i2bgi2phwbdwwr0fq96azxzzgqh5jx" + "commit": "86f27626ca3c1350cb459aa2b72c12219962e8d8", + "sha256": "1i97jfmzq7q4xrp0h87s7kv2wszhjxa0z30sl4mxyqmv8q9qcc4x" }, "stable": { "version": [ @@ -71767,17 +72518,17 @@ }, { "ename": "llama", - "commit": "a3645b08cb46e3d91081da7baa982b5283918447", - "sha256": "0v9np9vzdzb9l1w915fw7impxqraiq8k464pgan3bc38r6gw40z2", - "fetcher": "sourcehut", + "commit": "572e92d1737bf72a1b8d399ef847d9c34862a680", + "sha256": "0gw02dcpwm1v4qz123d7p1sifcjgvg1wf8zw6si91hslrskkicw0", + "fetcher": "github", "repo": "tarsius/llama", "unstable": { "version": [ - 20240520, - 1947 + 20240817, + 1039 ], - "commit": "cea812d16129749deb524771e615a4a831604a83", - "sha256": "1wlc1m9w5s03w91i132yzxbd93pdfnxsf0pq56pfsl6xvrqbj82k" + "commit": "732389e3886b510c2661d7d4fd65e01837211e8a", + "sha256": "0c5dbslbfyj6aa8pssxwkbzdgsajhrjfm5hsy1qlhb3iasapslfc" }, "stable": { "version": [ @@ -71951,11 +72702,11 @@ "repo": "fourier/loccur", "unstable": { "version": [ - 20210224, - 2041 + 20240610, + 1830 ], - "commit": "01b7afa62589432a98171074abb8c5a1e089034a", - "sha256": "1b1x1xsiwqzsiss1jc6w990v1vfvbn5d5w67yzmx59s9ldjmdqq2" + "commit": "f47c53a24a9d262898517c71284337821dad7ea9", + "sha256": "08slwg063x51c2dm742sd7nlq5zf20xrdyprwk3irdanpn9skxjb" } }, { @@ -71974,6 +72725,30 @@ } }, { + "ename": "loco", + "commit": "80862bea5a620c338af456f1daff6de13f7650de", + "sha256": "0r67b3fd91w6nvifc3hydiihh2456sfiq5wr98shbd76b1zgimjw", + "fetcher": "github", + "repo": "csmclaren/loco", + "unstable": { + "version": [ + 20240718, + 125 + ], + "commit": "fc590068204ae27eef0addfe89071bff2cfe117c", + "sha256": "1ds9bvz6rq7vkw3vgl77arawkcf854sb5a57c77h849mgypj43wz" + }, + "stable": { + "version": [ + 0, + 1, + 15 + ], + "commit": "fc590068204ae27eef0addfe89071bff2cfe117c", + "sha256": "1ds9bvz6rq7vkw3vgl77arawkcf854sb5a57c77h849mgypj43wz" + } + }, + { "ename": "lodgeit", "commit": "c82e72535aefade20e23e38931ca573e3459401e", "sha256": "1ax2w5yxscycjz90g4jdbhd64g9sipzxpfjs7gq3na77s5dcjzsq", @@ -72350,30 +73125,32 @@ "repo": "okamsn/loopy", "unstable": { "version": [ - 20240310, - 50 + 20240818, + 245 ], "deps": [ "compat", "map", - "seq" + "seq", + "stream" ], - "commit": "de9a2933f4794d13236236db6165403d722e5105", - "sha256": "0ngmp81jd9fnvninw0v52535570np5jy194jwfqz6sp7b7394ijv" + "commit": "80a30903628bc8de36c51c966e6cf5b114001e47", + "sha256": "1yxgv2g42q3nqn24mnrk329jx0d0h2igc499xskfc46a5dqfxjym" }, "stable": { "version": [ 0, - 12, - 1 + 13, + 0 ], "deps": [ "compat", "map", - "seq" + "seq", + "stream" ], - "commit": "c7a9660df036ca3ba947fb877c0a05589d95f658", - "sha256": "02g4ic394jwbaskyy2knahf2x2jig1y98cpgfasf3gvl6gkhsk2p" + "commit": "80a30903628bc8de36c51c966e6cf5b114001e47", + "sha256": "1yxgv2g42q3nqn24mnrk329jx0d0h2igc499xskfc46a5dqfxjym" } }, { @@ -72384,28 +73161,28 @@ "repo": "okamsn/loopy", "unstable": { "version": [ - 20240225, - 1740 + 20240818, + 245 ], "deps": [ "dash", "loopy" ], - "commit": "eeebd2713d636b3cf08c6af22f46d23b9aa06592", - "sha256": "104vwcxcypib6w8706x27szdc2a40mcbz7kakkpk8qhvg5an6gq3" + "commit": "80a30903628bc8de36c51c966e6cf5b114001e47", + "sha256": "1yxgv2g42q3nqn24mnrk329jx0d0h2igc499xskfc46a5dqfxjym" }, "stable": { "version": [ 0, - 12, - 1 + 13, + 0 ], "deps": [ "dash", "loopy" ], - "commit": "c7a9660df036ca3ba947fb877c0a05589d95f658", - "sha256": "02g4ic394jwbaskyy2knahf2x2jig1y98cpgfasf3gvl6gkhsk2p" + "commit": "80a30903628bc8de36c51c966e6cf5b114001e47", + "sha256": "1yxgv2g42q3nqn24mnrk329jx0d0h2igc499xskfc46a5dqfxjym" } }, { @@ -72628,15 +73405,15 @@ "repo": "emacs-lsp/lsp-haskell", "unstable": { "version": [ - 20231011, - 1723 + 20240729, + 1637 ], "deps": [ "haskell-mode", "lsp-mode" ], - "commit": "89d16370434e9a247e95b8b701f524f5abfc884b", - "sha256": "0j1a6c1vz57xvk64n32qlaqwpvg91zh14ik7ajpyb7xm8gbw5ahv" + "commit": "85a82c9cf4a7ed4be339e80a98cf41cbf2c999d3", + "sha256": "1r4dvmhl7hq841l0iil2q2rjyzqipkk3sp9lrdb0f04p2wl3pzx4" } }, { @@ -72698,8 +73475,8 @@ "repo": "emacs-lsp/lsp-java", "unstable": { "version": [ - 20240501, - 1928 + 20240524, + 2207 ], "deps": [ "dap-mode", @@ -72711,8 +73488,8 @@ "request", "treemacs" ], - "commit": "37c95ef7e992001250d893277acfccf4af0099b4", - "sha256": "172mp8na5w3dc7k6rl543dar85siz15vlhqidinim8hg9c4v6xqz" + "commit": "4909c14b9012eed669a9c3f11a8df055d5bb8a0e", + "sha256": "0qw824vdqk92r8hrrjsi7pd00rw60wf5jfjk1x3nhs06hijs0x0s" }, "stable": { "version": [ @@ -72823,15 +73600,15 @@ "repo": "ROCKTAKEY/lsp-latex", "unstable": { "version": [ - 20240324, - 1218 + 20240803, + 1436 ], "deps": [ "consult", "lsp-mode" ], - "commit": "30e5ee2a387bee7b320564d402b3e587cdae536c", - "sha256": "0zfg35mq3a1550l2ds6wg5flxc04fq600apz3z5zfq58qqdiah8k" + "commit": "2f45606dce911ebc45a42cbbaa01973b8caff4ec", + "sha256": "1wslncvjrcvw7xjjpiyfy8avn30xa2n7jv01lqp66s0jmg7f9pln" }, "stable": { "version": [ @@ -72932,8 +73709,8 @@ "repo": "emacs-lsp/lsp-mode", "unstable": { "version": [ - 20240514, - 1430 + 20240817, + 1400 ], "deps": [ "dash", @@ -72944,8 +73721,8 @@ "markdown-mode", "spinner" ], - "commit": "62e1f68c1f2363f7ebe8f1c2762e472f3b5de46a", - "sha256": "17r4jg0i9df74bbphi4809l3q3mqy462syw5msf0sjv7k0f5fml0" + "commit": "12befaabe4a1bf8a548bc820faa192be8ee89533", + "sha256": "1p0sbcip9vzds2cpcq5r6zqnfn5g84gl9dmmkpgaws403cwz9fia" }, "stable": { "version": [ @@ -73093,16 +73870,16 @@ "repo": "emacs-lsp/lsp-pyright", "unstable": { "version": [ - 20240416, - 610 + 20240710, + 611 ], "deps": [ "dash", "ht", "lsp-mode" ], - "commit": "b891a5071fcb4371d7d817069cbb04f5bd160468", - "sha256": "1qiqbjvp315m7mjsyj1ab53fpk6m6qn6pjzkxls1m0rmmjmszzg4" + "commit": "b3ed995c335e4195f35322645c2624fdd95673fb", + "sha256": "0f8rg6p81rqsglzpgkm97sixgzp76hn0j54q4krrs2gm0cs1651b" }, "stable": { "version": [ @@ -73238,16 +74015,16 @@ "repo": "emacs-lsp/lsp-sonarlint", "unstable": { "version": [ - 20230814, - 1954 + 20240806, + 305 ], "deps": [ "dash", "ht", "lsp-mode" ], - "commit": "d131779950d5d45c3129eb088cef5fd11099f47c", - "sha256": "0qr9cmk148rcvn0swnvhicyy89n6lw8gkchxvvd8lwwl4ky6x9pb" + "commit": "ad668f7451664c901f798878534d85dd5e09a4a8", + "sha256": "15hsgbansrl08i6rbw5hkl3jqva4jwhlj1rlv33vxfkhkamv0krs" }, "stable": { "version": [ @@ -73425,10 +74202,10 @@ }, { "ename": "lurk-mode", - "commit": "4d2e408fe6728027e9b54e944c5c252e3fa5c25e", - "sha256": "1khsl69wm3b90ydxks1rc1rii9yzpj8b7ms1lpf0g1d6a6grkfx6", + "commit": "8399712211a0fb927970917aec906a97488d00fb", + "sha256": "09djfy6d0929csx6f32klm4p41rc6gvr01g60wjiyg7yycw1r4fr", "fetcher": "github", - "repo": "lurk-lab/lurk-emacs", + "repo": "argumentcomputer/lurk-emacs", "unstable": { "version": [ 20230120, @@ -73716,14 +74493,14 @@ "repo": "amake/macports.el", "unstable": { "version": [ - 20240321, - 2352 + 20240814, + 1020 ], "deps": [ "transient" ], - "commit": "a5ef9d69ff04f5dc62c5a48c5119d96ab3e4d62a", - "sha256": "1qwpj4qmq31270r0n17dfkwskxcyd5ysg78f2yggb9zfk5vvdn1d" + "commit": "594b0dcd596464270d5e954d7c78015df2132c33", + "sha256": "1i6kh84z7cifyb5h0a0p2sajbq6xyqm4pbf9pspqxphgmaspi2mp" } }, { @@ -73888,38 +74665,38 @@ "repo": "roadrunner1776/magik", "unstable": { "version": [ - 20240521, - 1419 + 20240814, + 914 ], "deps": [ "compat" ], - "commit": "51ec2d21e4d68fc549d2022f86a882e090541ec3", - "sha256": "1mxpwx1n537gjhb09h8d8mnf8ra5qlcnn13260447xk7z620sh8l" + "commit": "e4b0ab1e97095973e7c40fed20e3acbfa1172823", + "sha256": "1mkikn2wx32c1q7dbdnrr8r2sd02k4id5803lv7lbgc4h6q0n424" }, "stable": { "version": [ 0, 3, - 1 + 2 ], "deps": [ "compat" ], - "commit": "6ac83927a6c294619bb99cb1ceb2ecf352498599", - "sha256": "0x70dd12w0p44c7b5273fwi51sr2giqcl230170v8vk9rn73p12i" + "commit": "dfbb5482b18633adf9790599f415aa5c507228ca", + "sha256": "15kshz11g2h6d13vpayhl9p3d95qm253s5knhhlwxm8yykw94pp4" } }, { "ename": "magit", - "commit": "40dc61c315a69179487aa14e93acd48aa24d0008", - "sha256": "0c3gkp4l3y10gj6231w3x6zg5ybkfal4dp7hvjynaspgq5qkfsx5", + "commit": "3126dac37def07fcaa667a325ee79349fb80d285", + "sha256": "1fk4h891k1w6q0v6bbwlisfb0wc0pmyh2jxdf23v7crd2fc36wcc", "fetcher": "github", "repo": "magit/magit", "unstable": { "version": [ - 20240522, - 204 + 20240819, + 2250 ], "deps": [ "compat", @@ -73930,24 +74707,26 @@ "transient", "with-editor" ], - "commit": "f9268a959828d0c6ab26171dd2fb1ffc55e5ae70", - "sha256": "1xghq21qqjb2b31i75rd7j0h4fk7242vhbq976q1hls5j7a7x2mr" + "commit": "6234c35d80e994ce93a98a958be99c367dc10171", + "sha256": "16qm1lmy0qw05nmwz7c0ymg9753wsp1yy7hwha918gy48m1j4ild" }, "stable": { "version": [ - 3, - 3, + 4, + 0, 0 ], "deps": [ + "compat", "dash", "git-commit", "magit-section", + "seq", "transient", "with-editor" ], - "commit": "f44f6c14500476d918e9c01de8449edb20af4113", - "sha256": "0cxyvp2aav27znc7mf6c83q5pddpdniaqkrxn1r8dbgr540qmnpn" + "commit": "020aca7c9c4154dbc4a72acbd56165ecccea1bf1", + "sha256": "0xfwli031hk2c0f6gj6f5f7bd9awyq70dl2a1z8k2a1j9msg1s6k" } }, { @@ -73958,28 +74737,26 @@ "repo": "magit/magit-annex", "unstable": { "version": [ - 20231210, - 2140 + 20240811, + 1850 ], "deps": [ - "cl-lib", "magit" ], - "commit": "056f0d4462cdccbd7bb7589994da7fef9de766da", - "sha256": "1fwy7q03d8q1hnwnd86pygpf9l4lgfgslp6claxsyp840ibrxq5z" + "commit": "9db0bc61461f222106c7ae3d8cd6d3de1f1b143f", + "sha256": "0gbrn80xcwhfav962hjv6lhx444b81jknzj22zb8d5piqfpg8rvc" }, "stable": { "version": [ 1, - 8, - 1 + 9, + 0 ], "deps": [ - "cl-lib", "magit" ], - "commit": "018e8eebd2b1e56e9e8c152c6fb249f4de52e2d8", - "sha256": "1amr2c08mq1nnn6k66mgz4rzyni4np7gxm96g4qyla2cbfbachgk" + "commit": "9db0bc61461f222106c7ae3d8cd6d3de1f1b143f", + "sha256": "0gbrn80xcwhfav962hjv6lhx444b81jknzj22zb8d5piqfpg8rvc" } }, { @@ -74047,30 +74824,30 @@ "repo": "gekoke/magit-file-icons", "unstable": { "version": [ - 20240520, - 216 + 20240627, + 1228 ], "deps": [ "el-patch", "magit", "nerd-icons" ], - "commit": "d85fad81e74a9b6ce9fd7ab341f265d5a181d2a8", - "sha256": "1q03a4zzb2nvxgm84jj3wm4067hp2n4894xmxhc98w981vli41qm" + "commit": "861670d448df4fba6fb993941d41953cee230a7b", + "sha256": "0zldfmx9vx6fnaadx0q0vmgdsarfs284ffsj0b6qmcgxsbl2z67b" }, "stable": { "version": [ - 1, + 2, 0, - 2 + 0 ], "deps": [ "el-patch", "magit", "nerd-icons" ], - "commit": "33458112ae3701a82a02a4b88dd52baef48ababe", - "sha256": "1whx00jp2rgad2f3zir7qmhjpspsx6zs2hk8wlkv4hlsv9s1knpa" + "commit": "861670d448df4fba6fb993941d41953cee230a7b", + "sha256": "0zldfmx9vx6fnaadx0q0vmgdsarfs284ffsj0b6qmcgxsbl2z67b" } }, { @@ -74234,6 +75011,40 @@ } }, { + "ename": "magit-gitlab", + "commit": "421a510ea3876c1787ddd46041174190b82a053b", + "sha256": "1xm7hxzwg4bq0mjlix1wnqsmz21h1clfsgqngpmawk04628ga01s", + "fetcher": "gitlab", + "repo": "arvidnl/magit-gitlab", + "unstable": { + "version": [ + 20240707, + 1506 + ], + "deps": [ + "ghub", + "magit", + "transient" + ], + "commit": "6f10468f9091d02aa6f1ce4af914443209a7d2a5", + "sha256": "0c8wf5cywfqjjhdylcdrb0xq4pp2larfxxiicwp04ffapyq0z5bb" + }, + "stable": { + "version": [ + 0, + 1, + 0 + ], + "deps": [ + "ghub", + "magit", + "transient" + ], + "commit": "cca91ae8b192bb5b50361aab1f94f4ff2bf9e969", + "sha256": "12fma78fv3fp1cmazddll4jp4f1waigsmw55mdi3j6z58m3af6xh" + } + }, + { "ename": "magit-gptcommit", "commit": "674e68c28ee0e12e6f2b217b7d140eae22473d16", "sha256": "1mrygbjhha0kyl7jydhc3ycmmq6wpp6kb4sw7gjzbikw3vhqhgba", @@ -74241,16 +75052,16 @@ "repo": "douo/magit-gptcommit", "unstable": { "version": [ - 20240406, - 807 + 20240625, + 356 ], "deps": [ "dash", - "gptel", + "llm", "magit" ], - "commit": "3584b1036574c704e5bae04274b8849590a097b0", - "sha256": "1rfiaqdpkf9xh57gf4vsz65f2mnhzxyadddwxyk1yfzan1il7j01" + "commit": "91b23fde4a880566a4e493240865e3582cad7306", + "sha256": "0zbj8bk3vdzfpih8242gan7a8i4gkmixxzs952mm15wg2fd98gm5" } }, { @@ -74261,26 +75072,26 @@ "repo": "magit/magit-imerge", "unstable": { "version": [ - 20230522, - 1054 + 20240811, + 1933 ], "deps": [ "magit" ], - "commit": "b7cfe49a197c2cf5948109921e053711b156389d", - "sha256": "0hh73aq6afixq3wqc7fcrbj9jxvwllwyfxnd0k1b5dx2q02nrxyv" + "commit": "e9955c3b4dac2661f67d9882ed3367471e529cfc", + "sha256": "0wv37c6rjnmvba14p1zw2fvs698fxj3ka9nhlk1d7bg6wsyscr99" }, "stable": { "version": [ 1, - 2, + 3, 0 ], "deps": [ "magit" ], - "commit": "1ee213d7fa1536c86c128d09946b44ededbfac9c", - "sha256": "1virc4ps25nwv8jkyvlb4ylxpcz676bfw449izaly97f2f2a91hk" + "commit": "a4981f6944ff341c1b60b7b47babea625ec37d99", + "sha256": "15a66fv53wls4jldbgh6gycpabx7wnpg7x2dpllv3x1qv2159nnz" } }, { @@ -74469,33 +75280,36 @@ }, { "ename": "magit-section", - "commit": "2133b10c735ce47fc8d8ff8c51f29ec4b13982a3", - "sha256": "0p7x5s6sr9d7v633hqkp36iq601323vkr07402c563rs3a7anarx", + "commit": "3126dac37def07fcaa667a325ee79349fb80d285", + "sha256": "0jagkxhk7yr5hl6gfxknhk86nghyxm2wp89252r3d0mzf0p6gpsf", "fetcher": "github", "repo": "magit/magit", "unstable": { "version": [ - 20240508, - 2349 + 20240819, + 2250 ], "deps": [ "compat", - "dash" + "dash", + "seq" ], - "commit": "855d924969eb6231d62ab446f727c9f7ad5c4913", - "sha256": "0x13wwm6f93qvaqq7qlx97ahvbvgkqf2xdq7vjn6wm9h2mdkw4hh" + "commit": "6234c35d80e994ce93a98a958be99c367dc10171", + "sha256": "16qm1lmy0qw05nmwz7c0ymg9753wsp1yy7hwha918gy48m1j4ild" }, "stable": { "version": [ - 3, - 3, + 4, + 0, 0 ], "deps": [ - "dash" + "compat", + "dash", + "seq" ], - "commit": "f44f6c14500476d918e9c01de8449edb20af4113", - "sha256": "0cxyvp2aav27znc7mf6c83q5pddpdniaqkrxn1r8dbgr540qmnpn" + "commit": "020aca7c9c4154dbc4a72acbd56165ecccea1bf1", + "sha256": "0xfwli031hk2c0f6gj6f5f7bd9awyq70dl2a1z8k2a1j9msg1s6k" } }, { @@ -74585,26 +75399,26 @@ "repo": "magit/magit-tbdiff", "unstable": { "version": [ - 20220527, - 2213 + 20240811, + 1938 ], "deps": [ "magit" ], - "commit": "55e6443710def357f3f78eea27d5bbe023d868f5", - "sha256": "0ypkawcp964r9rx8bl3hppcvkkngljyhy1kpfvfxmqalgy2wr9ig" + "commit": "03cb872f00dd7fc868de0c8d7661803b5d011aa0", + "sha256": "1xmkdd8fg3rw5xhxhrilll5fqzhb2xr15qrjrcbblpnzn9zl5rvk" }, "stable": { "version": [ 1, - 1, - 1 + 2, + 0 ], "deps": [ "magit" ], - "commit": "ae9345d867539a4c5c635be04df2e26468444da8", - "sha256": "1klns192jlp0ba9gklkkjjhl33k7dha0ircpm4d11y8vcy3c3zh3" + "commit": "e8219d2db176bfccb1aa485c9ae91743c33ada0e", + "sha256": "1jh6wspb6ijmkqvyaswqj60ixpgjj2ijcf0b53q48pfs5dwc97p4" } }, { @@ -75303,25 +76117,25 @@ "repo": "minad/marginalia", "unstable": { "version": [ - 20240404, - 451 + 20240813, + 701 ], "deps": [ "compat" ], - "commit": "58eb5fd6e5cc21b12c5455ae69e7ae93579647bc", - "sha256": "196gjpmzra9azhrnvlhx50dlc59390hq4wxn0f9m4n86ig4i5dr0" + "commit": "c34fdacce64168cb20d710a87e66cc9d1f795a82", + "sha256": "11d1rf0yanknf85vrn0qp6flfrscx82zz3j0czypbgdqxcqjj08y" }, "stable": { "version": [ 1, - 6 + 7 ], "deps": [ "compat" ], - "commit": "58eb5fd6e5cc21b12c5455ae69e7ae93579647bc", - "sha256": "196gjpmzra9azhrnvlhx50dlc59390hq4wxn0f9m4n86ig4i5dr0" + "commit": "7a7f3363d042d1bf43ae697f4401638ed18230a5", + "sha256": "1y79fhki7wbfaw24n5n5w80yvchj1ncz74yvfbgf7sna2ngz4yih" } }, { @@ -75445,11 +76259,11 @@ "repo": "jrblevin/markdown-mode", "unstable": { "version": [ - 20240501, - 1057 + 20240716, + 249 ], - "commit": "0cdebc833ed9b98baf9f260ed12b1e36b0ca0e89", - "sha256": "09v1vkj02l58kz74rqh3vdfy75gi48pvcaz99k9i54wncy61bv5j" + "commit": "8a7773f87733866a961ea4c518a4a2f283f21970", + "sha256": "0nm6s8bw390zynwx4agc11gzqj515sxpzjqyih22lxlf4mmwmqqy" }, "stable": { "version": [ @@ -75790,28 +76604,28 @@ "repo": "martianh/mastodon.el", "unstable": { "version": [ - 20240521, - 1721 + 20240816, + 709 ], "deps": [ "persist", "request" ], - "commit": "49def07b3d9b6f0718ef9402a3808ca01557245e", - "sha256": "158a5hqhmz1dvdg7rcrdikbsqli8gc1kwks6gvbji2qb99zcd8x6" + "commit": "3443b49c55f65ae8e0b07e93e1e0299ce1bf8ed6", + "sha256": "0564nylzj5ysjma3vnphga6ngds2s9x4410qg3yqgy5caxkpz321" }, "stable": { "version": [ 1, 0, - 21 + 25 ], "deps": [ "persist", "request" ], - "commit": "49def07b3d9b6f0718ef9402a3808ca01557245e", - "sha256": "158a5hqhmz1dvdg7rcrdikbsqli8gc1kwks6gvbji2qb99zcd8x6" + "commit": "45903de823d3c6b46c4aa694112e9f5429e1a3f9", + "sha256": "02ykj4hyddd5p0idl8gvgl9q770vni69xsza99y3rpyilc2a8r66" } }, { @@ -75845,16 +76659,16 @@ "repo": "matsievskiysv/math-preview", "unstable": { "version": [ - 20240519, - 740 + 20240801, + 513 ], "deps": [ "dash", "json", "s" ], - "commit": "7c12235c7f8bb1af0e712a8bfa77f1f2635d964a", - "sha256": "0ia9ca9nlq7wjzwk7h1q0kw00avifmc86v0yimn04p21zv3bg45n" + "commit": "a2ca3c175468ceaf02bab6cdfd8ef016bda2b98d", + "sha256": "0hdd8fdgmnz3lyy1kfycb5lsy9pzdw3zp8z9arw6n7cwlzcz9fd3" }, "stable": { "version": [ @@ -76301,11 +77115,11 @@ "repo": "jojojames/media-thumbnail", "unstable": { "version": [ - 20220827, - 2325 + 20240816, + 458 ], - "commit": "14e626fe7ee714ab45c9e636d00a26e89aa2832a", - "sha256": "09h491hkpisk8nsi96v58glfxi1iidv1ajfy86fx7zrbwcwkfh9g" + "commit": "190632c1d6cc2ab94031d57e0c24412a4698faf0", + "sha256": "1bj4l8yb383m2b43i514044yjpgh27v69gvm71a08n7r4hhdhbpr" } }, { @@ -76434,11 +77248,11 @@ "repo": "gvol/emacs-memento-mori", "unstable": { "version": [ - 20240429, - 327 + 20240702, + 2332 ], - "commit": "424dc591b3dd8fe7f2f3ddef1baa647aa2b0cc7e", - "sha256": "1drsc9akr48q5bxrw43fs2lqjp5cdf2nxvng0nvr5v4xvckd1a9x" + "commit": "c53707871aa5aeb551c6b9c02bdca6f477bc9c5b", + "sha256": "1g70dsfm678jg8r7sg4661w9af0wqdl4csxg6vb76f4n44jy7zvb" }, "stable": { "version": [ @@ -76535,11 +77349,11 @@ "repo": "meow-edit/meow", "unstable": { "version": [ - 20240407, - 1642 + 20240809, + 1843 ], - "commit": "99e08c92bb5d8a695062ce53e2cffeffd3a058a6", - "sha256": "12fp6bj38a4rcxrra4w50wb4qrl5jbw1wyp5hhx26ayh99ajaigi" + "commit": "0611eba87ae3e86d19e2c4f50988ff2ec935f830", + "sha256": "1my99kfidqvdnd4b2jckwsrwh7lx513zbd8g06lqy6gfqf5qxksg" }, "stable": { "version": [ @@ -76552,6 +77366,36 @@ } }, { + "ename": "meow-tree-sitter", + "commit": "58128354525e09c1707eddd11d34edbe53501a68", + "sha256": "0kf47gs65ssazf4xgn39wwkymwf7w4mqq4n9s87g7y20pa7p1b69", + "fetcher": "github", + "repo": "skissue/meow-tree-sitter", + "unstable": { + "version": [ + 20240701, + 1422 + ], + "deps": [ + "meow" + ], + "commit": "d8dce964fac631a6d44b650a733075e14854159c", + "sha256": "0fzj8hnf9qiylx2b2s2vj8js32rd79gnw0x2c6l35zs9mm9dxm2x" + }, + "stable": { + "version": [ + 2, + 0, + 0 + ], + "deps": [ + "meow" + ], + "commit": "d8dce964fac631a6d44b650a733075e14854159c", + "sha256": "0fzj8hnf9qiylx2b2s2vj8js32rd79gnw0x2c6l35zs9mm9dxm2x" + } + }, + { "ename": "merlin", "commit": "17598d9a0e9f88db28014019769f3181c863e99e", "sha256": "05n6ack61impmnqn1gflkm0x085s98qlac4b4yg11r98cvsvcz04", @@ -76559,11 +77403,11 @@ "repo": "ocaml/merlin", "unstable": { "version": [ - 20231201, - 918 + 20240604, + 1521 ], - "commit": "ad9955c76b1cb031e847e139c5cf7b7cc5cb4696", - "sha256": "08p6zx4swycc4wi5rhynyip24skwhg0y1zlz4krrs9ar6m2lmfwm" + "commit": "bd900fd6cda97cfd10f2bf520848d0a8b0fe35b7", + "sha256": "1866y962v1xpw5klwn9sx8fvfhxg9w5sdj66nms815qkrkd3gvmk" }, "stable": { "version": [ @@ -76752,11 +77596,11 @@ "repo": "wentasah/meson-mode", "unstable": { "version": [ - 20240218, - 1834 + 20240601, + 1647 ], - "commit": "c8f4fbf075bb5db2bc0872afe02af2edac075e4e", - "sha256": "135glcrnbr7wmrygrngsxpma8bxajpxlanbkvk08v92p7ar6a21j" + "commit": "0449c649daaa9322e1c439c1540d8c290501d455", + "sha256": "0mmz5rqb0v668indj132kaiws1lcm1pw81pmq2nwx0d043dsci8k" }, "stable": { "version": [ @@ -77055,8 +77899,8 @@ "repo": "danielsz/meyvn-el", "unstable": { "version": [ - 20231213, - 230 + 20240818, + 2247 ], "deps": [ "cider", @@ -77067,16 +77911,25 @@ "projectile", "s" ], - "commit": "3afb0a4283afd4f63ef7fdd48eb5da972421fd7a", - "sha256": "1flxvaj8j5kg4r0cvns8z1xixgvsavq1i27z28j97m8dmndihihf" + "commit": "c72e41cff7b03e263fc2b850b7e0b6ddbf2267b0", + "sha256": "13b3nvw1f7cb2cxbp94f8il7j01kkjh4jmv0hz0p26zzqabn8x8g" }, "stable": { "version": [ 1, - 0 + 4 + ], + "deps": [ + "cider", + "dash", + "geiser", + "parseclj", + "parseedn", + "projectile", + "s" ], - "commit": "3119214ff45db630789f9371f956d5ac06229b1d", - "sha256": "0mnvc3f56x4icrqmc4kx6bzc9vac40f020npimdgiylbmyxj97vn" + "commit": "62802ab42ee021f89f980bd3de3e1336ad760944", + "sha256": "0821sk0mq1602mk3hp7igcafp8fpfg586nk41iz9syc06xbh0if7" } }, { @@ -77141,11 +77994,11 @@ "repo": "ROCKTAKEY/mic", "unstable": { "version": [ - 20230725, - 1139 + 20240806, + 1655 ], - "commit": "95dcc9fa306f579e8de6e417839841efe88ae1fc", - "sha256": "19v6q0knrkzchis3bax4h9szbiqxfk0fm83sy0zvd1gqh8jlpfh7" + "commit": "f552ddf397e899e9c2b96ef4e56a08cc8804a1c5", + "sha256": "0j8dpsj5i519i5imsg5s4bs25r050ha5b1db3r8rx7d6xa4325dn" }, "stable": { "version": [ @@ -77284,11 +78137,11 @@ "repo": "erikbackman/mindre-theme", "unstable": { "version": [ - 20220827, - 1031 + 20240610, + 2131 ], - "commit": "fc9ab1ba03494f2fb8cb8dc4e2ba5120ae35eb31", - "sha256": "1xqaxrzq7ws8ilbcmx5kb7g7xhch91lb9cisjydmi0xcfv34sxah" + "commit": "cbecece36988f83b7e355a3fcf5229f2494f3688", + "sha256": "1xhql4wy7r5f8bx4k1293gawbw83agf1s6va073q1pxqd94rjk6y" } }, { @@ -77299,14 +78152,14 @@ "repo": "countvajhula/mindstream", "unstable": { "version": [ - 20240519, - 1715 + 20240803, + 126 ], "deps": [ "magit" ], - "commit": "ae8b10b077d71de5e8ad966e03527e8d55b3e18d", - "sha256": "17f68h5ibn3klcfj570fprx7n9q59x8wjwdbzzhry2c7g9ay94nl" + "commit": "6a7d7b4fe496ff6bec27d52addd23947f81cb843", + "sha256": "05gpmaqb54xxy38lxaarh6l6i2hnyg1mh2ycsh8bxaiklslavzm6" }, "stable": { "version": [ @@ -77361,28 +78214,28 @@ "repo": "liuyinz/mini-echo.el", "unstable": { "version": [ - 20240518, - 849 + 20240816, + 2131 ], "deps": [ "dash", "hide-mode-line" ], - "commit": "4e2918225bea7fa7d232260bd0b2de48df68c6f8", - "sha256": "1bccmx0sd7qjfgd1p8yskw12phxc89arbiz064xk9jcl1cxaz57x" + "commit": "3f97d443554a7e98b68e541e2886f8a64f54d8b2", + "sha256": "0pjpa7cf372ps680isrqpnfz0ayzp88gikgm4a8grsx6wf9qgd3s" }, "stable": { "version": [ 0, - 9, - 2 + 11, + 1 ], "deps": [ "dash", "hide-mode-line" ], - "commit": "f0feae3bbd0becd79ea086d4a1b811162470b162", - "sha256": "1wz5ssp480zlfxdvgywxx72gkf7mldrd4gxah18ys09yycawa0hi" + "commit": "b556c0fa68dad76a478bd3f508e0501aa6933689", + "sha256": "1n00jpr6hyv1hwx36whpim6kzrybk236fhzj6dgnm6icarfmfzfa" } }, { @@ -77592,26 +78445,26 @@ "repo": "tarsius/minions", "unstable": { "version": [ - 20240415, - 1544 + 20240805, + 1422 ], "deps": [ "compat" ], - "commit": "ef234da0625397b994c0a17d1038037732c3c457", - "sha256": "1zd1gjg16yggmccpvv7fv32pfmh2a6227p21q2vdh8f1p0bwm10p" + "commit": "413b95a0d1c7c10d0f8d440d1982062b73d5ea4a", + "sha256": "10pxhsl9yr1nkbkhhvz5iq1q2dbcl315b6q02v23wmns66a9akya" }, "stable": { "version": [ 1, 0, - 0 + 2 ], "deps": [ "compat" ], - "commit": "62948a4a2951dab0716977421bfe0a87ea2583c5", - "sha256": "0ralw9znj749ii046l0dfa3aacm05g1ix59rfsjafhky8fiwz37m" + "commit": "413b95a0d1c7c10d0f8d440d1982062b73d5ea4a", + "sha256": "10pxhsl9yr1nkbkhhvz5iq1q2dbcl315b6q02v23wmns66a9akya" } }, { @@ -77760,28 +78613,28 @@ "repo": "liuyinz/mise.el", "unstable": { "version": [ - 20240514, - 452 + 20240707, + 1428 ], "deps": [ "dash", "inheritenv" ], - "commit": "cb19405eba3cfd679a5e3ac75c8c4c1146b16015", - "sha256": "0h0xkps9m1g7q21hij23rli7jq1ygzc74h8fn9am9rmj4dgy5dkg" + "commit": "20179a58132e5518a0868eac01dcd1d72db2e254", + "sha256": "0s81nsk500g5aqh1d8q3rbp4b9jkv4msfxsiqbgkf60ypzchc3zp" }, "stable": { "version": [ 0, - 1, + 3, 0 ], "deps": [ "dash", "inheritenv" ], - "commit": "e2db0d204890721e372ed89deb554d9a75385486", - "sha256": "02j067pyqf2xx48qg383wvhk267pj9wd6ckv1azsa20cm713bph4" + "commit": "20179a58132e5518a0868eac01dcd1d72db2e254", + "sha256": "0s81nsk500g5aqh1d8q3rbp4b9jkv4msfxsiqbgkf60ypzchc3zp" } }, { @@ -77872,20 +78725,20 @@ "repo": "jdtsmith/mlscroll", "unstable": { "version": [ - 20240420, - 1515 + 20240606, + 1855 ], - "commit": "cb9d7a256b8998565795d4be469d5a8dea96eb16", - "sha256": "1mvgb8fi7w0rpksfz4aalmn7f5a67zbq6a64cx9cmmqnn6r3llss" + "commit": "805d913771270f8157730f634108a237ca03137e", + "sha256": "0id3jglmqvzdpl5r26czxyb5vf0namvcxrql9b8djanvkd1pasz4" }, "stable": { "version": [ 0, - 1, - 10 + 2, + 1 ], - "commit": "cb9d7a256b8998565795d4be469d5a8dea96eb16", - "sha256": "1mvgb8fi7w0rpksfz4aalmn7f5a67zbq6a64cx9cmmqnn6r3llss" + "commit": "805d913771270f8157730f634108a237ca03137e", + "sha256": "0id3jglmqvzdpl5r26czxyb5vf0namvcxrql9b8djanvkd1pasz4" } }, { @@ -78114,20 +78967,20 @@ "repo": "DCsunset/modaled", "unstable": { "version": [ - 20240511, - 1540 + 20240728, + 1414 ], - "commit": "c7259e3e91fc8de4f17b2de9c83a12e855ae7932", - "sha256": "1vqfz3dcwlcmla8smwwn9r3kp859d10946zgab9y2x8zzidz7702" + "commit": "9a60234760b937728ebdec42b378edf99f29a484", + "sha256": "15s7brlab3whfsn1rj057q4626shlkss3bz3369yj1g0wzjb5waj" }, "stable": { "version": [ 0, - 8, - 4 + 9, + 1 ], - "commit": "c7259e3e91fc8de4f17b2de9c83a12e855ae7932", - "sha256": "1vqfz3dcwlcmla8smwwn9r3kp859d10946zgab9y2x8zzidz7702" + "commit": "9a60234760b937728ebdec42b378edf99f29a484", + "sha256": "15s7brlab3whfsn1rj057q4626shlkss3bz3369yj1g0wzjb5waj" } }, { @@ -78215,26 +79068,26 @@ "repo": "tarsius/mode-line-debug", "unstable": { "version": [ - 20240415, - 1545 + 20240805, + 1423 ], "deps": [ "compat" ], - "commit": "0ff591110c9db0bbc1372234902e28486c168a86", - "sha256": "0whjiadyygq8i3mf325zha8jl6hxm1q44rwvmlzvxzmjm42ag2gg" + "commit": "a88406d1a999107610a765550c3bc4d64850f8a0", + "sha256": "07mbq8psd5mzsqigdvjk5hdc8kbppfghg976p5nqq4xfy3p6n0v9" }, "stable": { "version": [ 1, 4, - 2 + 4 ], "deps": [ "compat" ], - "commit": "8e58bd51f1a8292c5df92e75a8c4a470e11a03e4", - "sha256": "157zssn9f5jd1b011x66ii97vmd9a16ng556xwlbnmqkcw2w42gq" + "commit": "a88406d1a999107610a765550c3bc4d64850f8a0", + "sha256": "07mbq8psd5mzsqigdvjk5hdc8kbppfghg976p5nqq4xfy3p6n0v9" } }, { @@ -78245,11 +79098,11 @@ "repo": "ideasman42/emacs-mode-line-idle", "unstable": { "version": [ - 20240421, - 623 + 20240801, + 1318 ], - "commit": "3bc67905ea3349ec20d4c537a0c5f2e833b9e905", - "sha256": "03z1940h3p5hlmgl0n82im4hn04rcmw4xwq3ygmqg999l10dcr2c" + "commit": "f1224688be854183ebe939876f6ac8372d3e9679", + "sha256": "1042ma7c6hbb2shi2m834c7aajk2qbygxdl4fhnp20ipf1gqchbw" } }, { @@ -78389,11 +79242,11 @@ "repo": "protesilaos/modus-themes", "unstable": { "version": [ - 20240505, - 331 + 20240811, + 502 ], - "commit": "d2762db19ed48bd0cbba61c41940be479760a35e", - "sha256": "1y8z4yfnqic9gg2nm0rqldhwkfz134zxv1x57x3jh9k04p1nblc1" + "commit": "3002f6fb64e147ece4284880ffa93c6c3baa0e75", + "sha256": "15sv711y34h6w5lzbkyvvbyh5j02288p5iqj3jngl1qsdz7xb79m" }, "stable": { "version": [ @@ -78413,11 +79266,11 @@ "repo": "kuanyui/moe-theme.el", "unstable": { "version": [ - 20240430, - 1601 + 20240716, + 854 ], - "commit": "6df0d99a1a2006b218282f15d84609b88478ca7a", - "sha256": "1rshp0n9nhnapp2glds6zrnp2l4nv93s0kxb8iqjr5n6a9x6m68y" + "commit": "4b3642157bfe9a9268310d321cfe67c8c236b5e1", + "sha256": "1smhp76aimy192s930d5pxpz4awbp1y0400vdzhqd5ii3q69ssb3" }, "stable": { "version": [ @@ -78580,11 +79433,11 @@ "repo": "ideasman42/emacs-mono-complete", "unstable": { "version": [ - 20240421, - 1234 + 20240627, + 317 ], - "commit": "3cb92a75cf20e1a5394e77e0e44a6b1c14cf315b", - "sha256": "1jzjy4pwwlyphj0warfywfqm2025wfkb8hvnn0478j26hs7141xs" + "commit": "3db3fa4ff88fc77fb56a54eee345bf326e0fa963", + "sha256": "0il28846vkql28a0dxsfncji9i2zmbqy4y6mdh4hbhg6xl16qbvk" } }, { @@ -78640,11 +79493,11 @@ "repo": "oneKelvinSmith/monokai-emacs", "unstable": { "version": [ - 20240324, - 1830 + 20240710, + 1027 ], - "commit": "df6c23d14e52f9d7f5bc2265facfbedfb07a444e", - "sha256": "0l0cc5qxr9fg7qs2fs2yk0nbgm6xnp2i0wvyxdnjzz6mz6c84ngk" + "commit": "9222cdf8209f0c3329f857ccb9edc1c79b06041a", + "sha256": "19zv7q9ixrvf3qbfj8xchcn7n0in6rpnkl4dd2vzbvic2lhg7nnr" }, "stable": { "version": [ @@ -78751,26 +79604,26 @@ "repo": "tarsius/moody", "unstable": { "version": [ - 20240520, - 1715 + 20240805, + 1425 ], "deps": [ "compat" ], - "commit": "1faf8c16073bb62ade53906eef549ed8ac79ae70", - "sha256": "1jbly23pr5lhgd9i6c0619v9pfrppk6614czf0wvz8ibkgdwsk2c" + "commit": "2f249978531ff1ec9f601c1e8f2ce83a1b50520e", + "sha256": "1dgamndly8lbjwzb4435v99izabdir9fbx31sm9bh1c5yqdka6cp" }, "stable": { "version": [ 1, - 0, - 0 + 1, + 1 ], "deps": [ "compat" ], - "commit": "888e6fb37eb5122803c70ae60d28fc54589e26c0", - "sha256": "03rg1f8lnxc16cipadaxgvl9cdxlihn64xbww35n8cbkhgmmir5z" + "commit": "2f249978531ff1ec9f601c1e8f2ce83a1b50520e", + "sha256": "1dgamndly8lbjwzb4435v99izabdir9fbx31sm9bh1c5yqdka6cp" } }, { @@ -78781,11 +79634,11 @@ "repo": "takaxp/moom", "unstable": { "version": [ - 20230722, - 2037 + 20240802, + 800 ], - "commit": "54750aa2e3e9476375a32ef94714e22ece6e4039", - "sha256": "119jzkf3ccqrxrjxx5x32rgpl7nip9c333ypmssy4pmylpcqls73" + "commit": "b90adeff532b39568a84f04f72a1eb60dbe4b175", + "sha256": "1flsbrw431jd2gqnhw3hddgy5vgp1vm7vqr4617rr6hdiscgx6kd" }, "stable": { "version": [ @@ -78878,26 +79731,26 @@ "repo": "tarsius/morlock", "unstable": { "version": [ - 20240415, - 1545 + 20240805, + 1424 ], "deps": [ "compat" ], - "commit": "ea728ba7dbae47d8516a6026038c305092d38078", - "sha256": "0qa4i6hx9xljrmhds7xfnyq391p7hkzdmkfa16yhfs75479dw805" + "commit": "b75fe54906eaf70143526c3d74930c811c819aa0", + "sha256": "16hxkva618fy7kyvnkawbkfds80dd433nld18kb1m0pvzs4dv2ga" }, "stable": { "version": [ 1, - 0, - 5 + 1, + 1 ], "deps": [ "compat" ], - "commit": "b7e2066a69c059c5d4c72e829b615a6b15cef4dc", - "sha256": "03q388lkbs1fx0x0wb0n06f9bfl4k67qvbhkxkw59kdlhxi7qwqm" + "commit": "b75fe54906eaf70143526c3d74930c811c819aa0", + "sha256": "16hxkva618fy7kyvnkawbkfds80dd433nld18kb1m0pvzs4dv2ga" } }, { @@ -78960,6 +79813,29 @@ } }, { + "ename": "most-faces", + "commit": "30ccf0c8f688679815bfebaed6a5c122f9fb6616", + "sha256": "1fjr0jb1n8p4jlp1sdf338yj9iq5pmgwc2j4ljrhwzvp90szag6f", + "fetcher": "codeberg", + "repo": "mekeor/most-faces", + "unstable": { + "version": [ + 20240620, + 2145 + ], + "commit": "846ca6db64527fe26d21421b8eaf7a63d8844c3e", + "sha256": "1r3gzrryd1pnhplnwzgh9x31hmm8bw9fys2mqfr40sbwzqphsdna" + }, + "stable": { + "version": [ + 0, + 2 + ], + "commit": "e37cd1baa74f1bdf3230a9174e5c6cde73e3474c", + "sha256": "0yr6r7dxrkh3r7sh7qwgd33px1ckxqxjbjxcz5frdbvxlhg0npp7" + } + }, + { "ename": "most-used-words", "commit": "934e64df7fba95b6dc06e76382013dc4a9ced82f", "sha256": "0dbjhqf5jxmicwl9allsr2vhqp4z6gkrwkdmnyphvn1kgr01kmjj", @@ -79116,6 +79992,30 @@ } }, { + "ename": "mowie", + "commit": "e995f6ce91c578a14966092246b6f48729500c10", + "sha256": "071agnqd4m3hzy3dh8plg7xk66n2b5ampa0djmf47lwnyy15va76", + "fetcher": "codeberg", + "repo": "mekeor/mowie", + "unstable": { + "version": [ + 20240626, + 717 + ], + "commit": "5236a231c172ffe3a831bb649031f4a1aaec5b15", + "sha256": "0kz0av456mzp3cblvkdwr6l6xwi9ibw7jhd7wjfypjajz5bzb9d1" + }, + "stable": { + "version": [ + 0, + 1, + 1 + ], + "commit": "7b826c751014a294b493a6bfebe1cda6a1832ab0", + "sha256": "19k89z6ji2j99q72b3dc28w2d9pqhcfwnzfll1yqd8sc1dkkd03k" + } + }, + { "ename": "mozc", "commit": "30fef77e1d7194ee3c3c1d4775c349a4a9f6af2c", "sha256": "0nslh4xyqpvzdxcgrd1bzaqcdz77bghizh6n2w6wk46cflir8xba", @@ -79123,21 +80023,21 @@ "repo": "google/mozc", "unstable": { "version": [ - 20240209, - 1327 + 20240729, + 1542 ], - "commit": "c2fcbf6515c5884437977de46187c16a8cb7bb50", - "sha256": "0jggi6bnvl0xl82nvspszmagprcc6k2wqczmp5v1fax0kd7qxdnj" + "commit": "5e6abfe1853b080766def432b746a9bed79e54b0", + "sha256": "0r37j85xh1nf3279c7v6bafp82g4sxav7bfzw1lw8v67kg1l4flf" }, "stable": { "version": [ 2, - 29, - 5374, + 30, + 5544, 102 ], - "commit": "c2fcbf6515c5884437977de46187c16a8cb7bb50", - "sha256": "0jggi6bnvl0xl82nvspszmagprcc6k2wqczmp5v1fax0kd7qxdnj" + "commit": "5e6abfe1853b080766def432b746a9bed79e54b0", + "sha256": "0r37j85xh1nf3279c7v6bafp82g4sxav7bfzw1lw8v67kg1l4flf" } }, { @@ -80585,11 +81485,11 @@ "repo": "kenranunderscore/emacs-naga-theme", "unstable": { "version": [ - 20240327, - 819 + 20240715, + 1925 ], - "commit": "a044e5eb5bf9bbefe34982ae9cc80ac9739a3e58", - "sha256": "13m17vwwrcs44xhzkh80nssgsn9p84f5vl50zk4y1712d087pc0d" + "commit": "cca6f1913cc899efaa59df52b8f09dd1a0768e20", + "sha256": "0a3fyzrv34k0q8df9iq4wqjsyqqxpvswndslakki6mkg3xl35f64" } }, { @@ -80934,11 +81834,11 @@ "repo": "skeeto/nasm-mode", "unstable": { "version": [ - 20190410, - 342 + 20240610, + 1505 ], - "commit": "65ca6546fc395711fac5b3b4299e76c2303d43a8", - "sha256": "00rv6m004hcsn71hv3p3rxmrpwajdy02qpi2ymhxx2w3r49ba562" + "commit": "7079eb4ce14d94830513facf9bf2fca9e030a4d1", + "sha256": "1dacd8yvbl6arvrxwdjws42nnvwflvwxz366y295izf00pl0knaj" }, "stable": { "version": [ @@ -80958,11 +81858,11 @@ "repo": "CeleritasCelery/emacs-native-shell-complete", "unstable": { "version": [ - 20231218, - 316 + 20240628, + 1901 ], - "commit": "56b20b414a9298f45b0923edf633c7153b97892b", - "sha256": "0d4h36ns13fra744nhk9azxqmxw14fwn908i3f1h2f4ll3hqbpfa" + "commit": "14e0a434cffa5688992b30d1b29bb21c561f8cd0", + "sha256": "14zrrvwppv12wj6rrp1agsmbpx9cmx1zr03jpc9162xz7sdq1szk" } }, { @@ -81186,20 +82086,20 @@ "repo": "babashka/neil", "unstable": { "version": [ - 20240402, - 1032 + 20240701, + 1458 ], - "commit": "9a795828e4c201a47c5851157868c06f2ca37448", - "sha256": "0fxla1s6sn9gzqrkmlm00klhbfa7h0ki80j8jp68zlqc984ah5a2" + "commit": "054ca51542837fec87e289a74ab139b4ae6e108b", + "sha256": "1jhpk9h9dv1zqba9076lvvy5cayirb49fzw9gfrqi1qp8zqi41cb" }, "stable": { "version": [ 0, 3, - 65 + 67 ], - "commit": "9a795828e4c201a47c5851157868c06f2ca37448", - "sha256": "0fxla1s6sn9gzqrkmlm00klhbfa7h0ki80j8jp68zlqc984ah5a2" + "commit": "054ca51542837fec87e289a74ab139b4ae6e108b", + "sha256": "1jhpk9h9dv1zqba9076lvvy5cayirb49fzw9gfrqi1qp8zqi41cb" } }, { @@ -81257,14 +82157,14 @@ "repo": "jaypei/emacs-neotree", "unstable": { "version": [ - 20230815, - 219 + 20240721, + 233 ], "deps": [ "cl-lib" ], - "commit": "2b0cb8285352202c62b1e46a8aa265a5e4f9d966", - "sha256": "1ar32yv9mrvg2q0wdi3da9hzk70ml5jj7wjrcnnmhdmi4sigzjpg" + "commit": "599bd049a5d9cfab8a0d7ab7bec99d58b4581751", + "sha256": "0xa9kz5rhqidhfcpjp9m7l4pgprhwd3wfps0y9wfgddb61rh5klp" }, "stable": { "version": [ @@ -81287,11 +82187,11 @@ "repo": "rainstormstudio/nerd-icons.el", "unstable": { "version": [ - 20240520, - 1050 + 20240816, + 1555 ], - "commit": "5ed32f43f2e92ac2600d0ff823ec75e4476cc53e", - "sha256": "0x0zipfdm6w861kmw3jjjsc1jqxdw0ggpylvwxbgbspfngl83awj" + "commit": "c3d641d8e14bd11b5f98372da34ee5313636e363", + "sha256": "0dmi01x8vk165i8161scqg3vmaspfih6pblr3iaw8ksp5ps1hnlf" }, "stable": { "version": [ @@ -81311,14 +82211,15 @@ "repo": "rainstormstudio/nerd-icons-completion", "unstable": { "version": [ - 20230430, - 1611 + 20240731, + 1213 ], "deps": [ + "compat", "nerd-icons" ], - "commit": "5cfee6ff1b9647c783bae944402d60440ce04cbb", - "sha256": "1kqjd2yvcnhivr0daj78ppxnz5cxb9cgrmnlxy1fighqp715g78d" + "commit": "426a1d7c29a04ae8e6ae9b55b0559f11a1e8b420", + "sha256": "03kkyxc9v38v1fc69xqc70gwvsq4pr8bgsk8f6is9z2w7p4y08sm" } }, { @@ -81594,11 +82495,11 @@ "repo": "vekatze/neut-mode", "unstable": { "version": [ - 20240414, - 2254 + 20240610, + 2326 ], - "commit": "e75f5f6bbcab4c042f331fcb2d0a628516cfec5f", - "sha256": "16iv3vn3inwjh29zk00w1l1cm8jqp96n2hrkgpmhcj0kbliy298h" + "commit": "c723e0a2e1f14b7f41d824ca354b0590399e2bc0", + "sha256": "0gcw7s3phyyidll37dm7cfrrvj7b7j5iqsbam5a0lpbi1p38rnlj" } }, { @@ -81898,11 +82799,11 @@ "repo": "mrcnski/nimbus-theme", "unstable": { "version": [ - 20231227, - 1644 + 20240819, + 14 ], - "commit": "09e6dcdd491c7aa5aa355e441a03492991830ad1", - "sha256": "1zi90ixnmgiwzclgji5l1w4qh9ib3lv2qkmjh2p2xrkivlq553b3" + "commit": "f184a3eaf61616a23c27147700bac883c4237fc4", + "sha256": "01711zjyfj21gjb7l9vwypfzk8gvkf1lx86ay2mkpb2r6xv8xnxm" }, "stable": { "version": [ @@ -81922,11 +82823,11 @@ "repo": "ninja-build/ninja", "unstable": { "version": [ - 20230421, - 1748 + 20240528, + 1945 ], - "commit": "adf9bddd73869084a505fac83246e55c35880079", - "sha256": "1p6nrqsjlpr1kkndihdkjl9cm37xblaky3jda6484y6d51mixgrv" + "commit": "0b4b43aa3e2fee391443dcc0c961c9d2354d8954", + "sha256": "1g779g7x1d0f7vi7d2sraqmd9zsccnmglp9fn7w5146swqpgsvqp" }, "stable": { "version": [ @@ -82090,11 +82991,11 @@ "repo": "nix-community/nix-ts-mode", "unstable": { "version": [ - 20240514, - 1605 + 20240710, + 1039 ], - "commit": "49d890e86a4597911366208930af6457ce1d46e7", - "sha256": "1s2kcm8rg35cl3vgbqny0ac2l00nqj5xdpll4z0is7zbhib74ll5" + "commit": "59ad17690576190811e0746c12ad6809596ca3ac", + "sha256": "0c9hxvh8v1pz4ni087dw84wzr7db057fgb37rk1qhjca0yq01mhf" }, "stable": { "version": [ @@ -82122,6 +83023,24 @@ } }, { + "ename": "nixfmt", + "commit": "acc471786956d364ffd04630161e8c05e5cb98c5", + "sha256": "1b901cyn2q3zmgzldjwm0ymw7491kcdakbqp6lvhczyd4v2ww05p", + "fetcher": "github", + "repo": "purcell/emacs-nixfmt", + "unstable": { + "version": [ + 20240724, + 1531 + ], + "deps": [ + "reformatter" + ], + "commit": "9c8a1c12320247a3fe643191b7574a3674fba317", + "sha256": "0jmficjx9hl7048pjwz72lj8344amlhndd1d6c3hjbjs6w19jl8i" + } + }, + { "ename": "nixos-options", "commit": "6846c7d86e70a9dd8300b89b61435aa7e146be96", "sha256": "1m3jipidk10zj68rzjbacgjlal31jf80gqjxlgj4qs8lm671gxmm", @@ -82291,8 +83210,8 @@ "repo": "dickmao/nnreddit", "unstable": { "version": [ - 20230705, - 1328 + 20240629, + 2347 ], "deps": [ "anaphora", @@ -82302,8 +83221,8 @@ "s", "virtualenvwrapper" ], - "commit": "221963fb0b7116729829145f055ed750d0e2f961", - "sha256": "1sha2sdamq583xaaiqx40vl12ahbsk93ksx7xwp5mmvgsns7wppk" + "commit": "f8e26834b523c03dfcb0c751373123ffd32b8522", + "sha256": "1a0b0dk578kw33qgfbb4zvqnc4cmix4mfwrlqy2rcg13z3ax39c7" } }, { @@ -82334,14 +83253,14 @@ "repo": "ranmaru22/no-clown-fiesta-theme.el", "unstable": { "version": [ - 20231214, - 2115 + 20240725, + 2030 ], "deps": [ "autothemer" ], - "commit": "0cd04a72aa5dcf61e82e2a613670334816326b02", - "sha256": "0ly95561skwfkn3kpv3269ffk7sd6p92dm1q6p4cq2fbm3v0w6xd" + "commit": "d97f521d4e29181af59412ac32de34ca487345d8", + "sha256": "0nf57jasppbnp0df968ikdqyk094qaxlsxwkcinq4572175lgq9h" } }, { @@ -82367,26 +83286,26 @@ "repo": "emacscollective/no-littering", "unstable": { "version": [ - 20240415, - 1545 + 20240812, + 1522 ], "deps": [ "compat" ], - "commit": "554d890c5d5b59ebcf83c67256d0012e23cd07f0", - "sha256": "0x0dk7yvrzcw1pjn86gqck5ksg48dnipvwir6va20i7cgi060qfy" + "commit": "d80f442c15a1e81ce939891bbb4497a0559831b9", + "sha256": "0mxy4gz53885kz4z4irni7hjigcmw16672fwwha33lyrd3822a4g" }, "stable": { "version": [ 1, - 5, - 0 + 7, + 1 ], "deps": [ "compat" ], - "commit": "1773beeb23c43ce52428957814a2be62532870f8", - "sha256": "14f07irjbk3akc07a0y5awyflmhsxvj8gg67y81zp90danjkgvvr" + "commit": "8658ff9a6f27512218fdbf7bba328917a27d5a47", + "sha256": "1ldsyzdnc79byg07j2fckh6m48iq8ffp19y6chhhi2dci35zard7" } }, { @@ -82637,6 +83556,29 @@ } }, { + "ename": "noman", + "commit": "e3c3445e29450f72a13543c888da5488b6fc2e08", + "sha256": "0g8l6clky05qxl7ql6nrkfvpfhl9p2m8r60kjmygm0p61z6brmnl", + "fetcher": "github", + "repo": "andykuszyk/noman.el", + "unstable": { + "version": [ + 20240610, + 1145 + ], + "commit": "61ab9c52273fc03b28881a5ce814b863cf050571", + "sha256": "0lxvl8mmmk01i14x7jjn3cq55620x420vxzsrqnbsmcpgzn5g6l5" + }, + "stable": { + "version": [ + 0, + 6 + ], + "commit": "953e3761b05874dee49952fad63ce1cb3c91d707", + "sha256": "0rh1p9nlhkmhfqmp507rz8hwfgwrdvxx0zba41lxsd2admai90wv" + } + }, + { "ename": "non-edit-mode", "commit": "6b0aafa28b53c49796016c34b6e35d6e8af974cf", "sha256": "11ss7gil0psc8xpqwcsba9dfspnw4wkl6clwxbf7kdbplbw3azrh", @@ -82692,11 +83634,11 @@ "repo": "ashton314/nordic-night", "unstable": { "version": [ - 20240311, - 2147 + 20240626, + 1936 ], - "commit": "a9e5918c7755ccb1fa20d3d8e3a3ea069455f87b", - "sha256": "079685xsh9jpariiagns06z8zqbna7s3pr054s1lx4y701bmxmss" + "commit": "72043ab206dea50b366b3848e8f66c0a7737bda4", + "sha256": "0mlpqzql5jghssnx9i474gvc0rdj2sw9wsd46pgs2xn7lcqfjgrf" }, "stable": { "version": [ @@ -82798,11 +83740,11 @@ "repo": "MetroWind/notink-theme", "unstable": { "version": [ - 20220114, - 1955 + 20240625, + 326 ], - "commit": "6115857fe75c1adbbce4165a2b77a11a271aaf31", - "sha256": "07gr1apbhd4kli2g0ld4yzpsc9hvkrh054b2dk47l2p9d1ki1j7g" + "commit": "d1e84622a491bb570d6a450706833fafaad74f39", + "sha256": "1xqjh28hpavk1lq51fs4nmpm8zkz8i7skrf034460kilnzyh2csr" } }, { @@ -82813,11 +83755,11 @@ "url": "https://git.notmuchmail.org/git/notmuch", "unstable": { "version": [ - 20240406, - 1803 + 20240816, + 2039 ], - "commit": "cd89065dc36e36b22a2a53832d2cac9b06fba41c", - "sha256": "179x3kz1504zlilh5y5h50sk5d0d9rhl6r6ccfgp4am2nn0d1qp7" + "commit": "2355ff274d3694fc79c655bb45c61245fb9a9302", + "sha256": "0xipy48rpalnqp24dh424xl6d8vh8f6r5b31rwq5n5f23m9hz300" }, "stable": { "version": [ @@ -82831,34 +83773,34 @@ }, { "ename": "notmuch-addr", - "commit": "a3645b08cb46e3d91081da7baa982b5283918447", - "sha256": "1whfz41z60jw0v1kfg73b6myjqknff76i1ialqc1schpgm9lgnkc", - "fetcher": "sourcehut", + "commit": "a4d051294c52a3648e5555d007fafb166c8cb60b", + "sha256": "03h4ij4nqvlzmr72zzzx3sb7ckn24bgip056p7p3gs3f3n1icfr8", + "fetcher": "github", "repo": "tarsius/notmuch-addr", "unstable": { "version": [ - 20240422, - 15 + 20240805, + 1915 ], "deps": [ "compat", "notmuch" ], - "commit": "e5755c5a752d2026b1c847bc5944bdd5f015c1a6", - "sha256": "0ysb99rda0ix6lcb8z8p72wb6z35agyn9jd1z0jxhqpp5xyajjsl" + "commit": "0d07e6fc9aff0f632a0d8aa9bd91ffccbef34e3b", + "sha256": "19bln0zyzixzibd94m3fhpjdi1yg81hhzchlb12dr4qqllq2wrb7" }, "stable": { "version": [ + 1, 0, - 2, - 2 + 0 ], "deps": [ "compat", "notmuch" ], - "commit": "89ced49cf3fb4d62bd4fea8bf9bd53ec8e4c7176", - "sha256": "0wggx4cqh1zgmax99bx2g90h51f2jxahqr5f35d0k1770zsds7f5" + "commit": "0d07e6fc9aff0f632a0d8aa9bd91ffccbef34e3b", + "sha256": "19bln0zyzixzibd94m3fhpjdi1yg81hhzchlb12dr4qqllq2wrb7" } }, { @@ -82923,68 +83865,68 @@ }, { "ename": "notmuch-maildir", - "commit": "a3645b08cb46e3d91081da7baa982b5283918447", - "sha256": "0jl89a7524mn15m59z8hiblwxwly3k5l0vjrqh015qschm89cf46", - "fetcher": "sourcehut", + "commit": "763ce547a4d60099f9e0ba770e47c1b4e6e49389", + "sha256": "0v43r5820s8vgjinaicgxwy9vrbykap42nkbixiwp1rbjdmb8grr", + "fetcher": "github", "repo": "tarsius/notmuch-maildir", "unstable": { "version": [ - 20240415, - 1545 + 20240805, + 1916 ], "deps": [ "compat", "notmuch" ], - "commit": "3a7240e6728731b427a763228c60104602f0fe4b", - "sha256": "13cajk4pb0x5r9azxilibc4v9xg3pxqiy0cx14b6kh6l9b0f26pq" + "commit": "f723dd29c836e1288abb99958376a086b9f6197a", + "sha256": "1pk0fwz0jbxcfal0jfa73swpdlbg4y4gc1l7na9qk3c7zi6fid4j" }, "stable": { "version": [ + 1, 0, - 2, - 2 + 0 ], "deps": [ "compat", "notmuch" ], - "commit": "4686e8e7b6d88439d4b0c39c7b17502b102a6f58", - "sha256": "09f5g2xll2wh9jkd8crgngnbhxxkiy1rqsjg5g4c0i3hdyk4c3s5" + "commit": "f723dd29c836e1288abb99958376a086b9f6197a", + "sha256": "1pk0fwz0jbxcfal0jfa73swpdlbg4y4gc1l7na9qk3c7zi6fid4j" } }, { "ename": "notmuch-transient", - "commit": "a3645b08cb46e3d91081da7baa982b5283918447", - "sha256": "1xxwj8awlsdw05dr9x4vcvp5yw88dghb55frgrx7682zfr44z8h8", - "fetcher": "sourcehut", + "commit": "1cb71793a8fe81abd7c50155468494a361fa33fd", + "sha256": "1lwx95vvk0c25228xc5szzmcm65fwvybw3j2cjsjc056n6nmx2as", + "fetcher": "github", "repo": "tarsius/notmuch-transient", "unstable": { "version": [ - 20240421, - 2351 + 20240805, + 1916 ], "deps": [ "compat", "notmuch", "transient" ], - "commit": "ef7a977a16e2c6a0ed3e139bdd6cc00a42b8c758", - "sha256": "1njy6cq7b9n2shvcgzrl8b3iclcyhx24bq1li1p292ipj3x3rkg4" + "commit": "ee365ca56140ab9c4c2324cb3c42e9037b6fa240", + "sha256": "0rzxzp0zzh5j61gwn2sj26gnqdch2jnfqd7m179840h0ap46jl2l" }, "stable": { "version": [ + 1, 0, - 2, - 1 + 0 ], "deps": [ "compat", "notmuch", "transient" ], - "commit": "b2a318be18ad2fc7553601f564132fa6882a4a0d", - "sha256": "0p90mdcwhfqpw6jzs8l4iw5072ziq82hm4xc18qyjj32h8lbs9p3" + "commit": "ee365ca56140ab9c4c2324cb3c42e9037b6fa240", + "sha256": "0rzxzp0zzh5j61gwn2sj26gnqdch2jnfqd7m179840h0ap46jl2l" } }, { @@ -82995,14 +83937,14 @@ "url": "https://depp.brause.cc/nov.el.git", "unstable": { "version": [ - 20240407, - 1219 + 20240421, + 2149 ], "deps": [ "esxml" ], - "commit": "9b7bef950d68c2518710c480729d6bb6026e9489", - "sha256": "10lxy18zs8bkld0ql75kdxdmbmr8h68lsk8a960iy3j1jg1rz1sn" + "commit": "66820c2c5bec54b080c9d7ed9e777611bae70776", + "sha256": "0vjpq9z7xckrgrwxzidhzy8y7kprc9x7m9fdj5gj3ygp86hhxs2c" }, "stable": { "version": [ @@ -83782,14 +84724,26 @@ "repo": "xenodium/chatgpt-shell", "unstable": { "version": [ - 20240213, - 1729 + 20240814, + 938 + ], + "deps": [ + "chatgpt-shell" + ], + "commit": "6fb85746bd0d316c97e375dcc14eb5314778e74d", + "sha256": "1kkq4wxkhv7cgksjpbdzm0r9x17y3sra1zk6h0213w4fi20z06lc" + }, + "stable": { + "version": [ + 1, + 3, + 1 ], "deps": [ "chatgpt-shell" ], - "commit": "2657079cb4d83d4fdcc0de4d5d225ed7e960ac9b", - "sha256": "0rm4mvd08vijw61ambbs9k0gc334iy5n2iaw886zpkyj5g4gngp5" + "commit": "6fb85746bd0d316c97e375dcc14eb5314778e74d", + "sha256": "1kkq4wxkhv7cgksjpbdzm0r9x17y3sra1zk6h0213w4fi20z06lc" } }, { @@ -83943,14 +84897,26 @@ "repo": "xenodium/chatgpt-shell", "unstable": { "version": [ - 20231129, - 130 + 20240814, + 938 ], "deps": [ "dall-e-shell" ], - "commit": "f27fc3ff5d01db4bae3e5c22c4ec208e387b7af1", - "sha256": "17jra66ffa8slzm0y6n64nxxns6a1m3sbd4azrzrlyqx81qh26dz" + "commit": "6fb85746bd0d316c97e375dcc14eb5314778e74d", + "sha256": "1kkq4wxkhv7cgksjpbdzm0r9x17y3sra1zk6h0213w4fi20z06lc" + }, + "stable": { + "version": [ + 1, + 3, + 1 + ], + "deps": [ + "dall-e-shell" + ], + "commit": "6fb85746bd0d316c97e375dcc14eb5314778e74d", + "sha256": "1kkq4wxkhv7cgksjpbdzm0r9x17y3sra1zk6h0213w4fi20z06lc" } }, { @@ -84453,10 +85419,10 @@ }, { "ename": "ob-lurk", - "commit": "cda18b6b3759d6cb39fd83782635f6380d04ec0a", - "sha256": "19x4ajjamql1w483lwvim47rr5mpimyiv81m22mknly3piw9z8l9", + "commit": "8399712211a0fb927970917aec906a97488d00fb", + "sha256": "0ajy98lzgq2k4dz4m03qlxndy38xqyr4whhd33v97mqwgzsdrf7c", "fetcher": "github", - "repo": "lurk-lab/lurk-emacs", + "repo": "argumentcomputer/lurk-emacs", "unstable": { "version": [ 20221122, @@ -84623,11 +85589,11 @@ "repo": "rkiggen/ob-powershell", "unstable": { "version": [ - 20221227, - 1106 + 20240718, + 1429 ], - "commit": "e514efa7fbbdac80082761580ed23fd5ae3abc5d", - "sha256": "1rkgrylcz07y1b5iyp0xh3bmckacwkm4x399lzl97i4cnpfl67s0" + "commit": "3f00ffdca27e52e0bac64d6616a4a3054f74a711", + "sha256": "154jmhdfnb1wwzxdp30ln3xza2cqq6y4j7cvchgs1banp36ddgnd" } }, { @@ -85166,8 +86132,8 @@ "repo": "licht1stein/obsidian.el", "unstable": { "version": [ - 20231218, - 1043 + 20240713, + 906 ], "deps": [ "dash", @@ -85177,8 +86143,8 @@ "s", "yaml" ], - "commit": "24ff6ef051ba1f1a1e80a2132fdada37e77eaad6", - "sha256": "12va9svwgsjwakqw17ik8xzpda1w9fjplfj5i7aq10ic8yq6fkyx" + "commit": "5730759eb22d6d3bc78761865dd0f2fdb4100e37", + "sha256": "0llf7ahgf2rb0b2znq99mr1wkvxnh1lb0lppk2zcklqhdw05ylzk" }, "stable": { "version": [ @@ -85451,26 +86417,26 @@ "repo": "oer/oer-reveal", "unstable": { "version": [ - 20240513, - 956 + 20240808, + 1328 ], "deps": [ "org-re-reveal" ], - "commit": "08c44d4fd212a7433ad2f863299b5c1bdd87e23f", - "sha256": "19c7qx8lyiysm59fnlvzgj53phs8x0k36wwyvm845h42azrhha9k" + "commit": "3d6e504e13002c2eea12199fdbdd976650ed20a9", + "sha256": "1hp10aayvpyirfcvc3hq2s4srcgscnh3zhb8cvwc6qymm64grsy6" }, "stable": { "version": [ 4, - 24, - 7 + 25, + 0 ], "deps": [ "org-re-reveal" ], - "commit": "08c44d4fd212a7433ad2f863299b5c1bdd87e23f", - "sha256": "19c7qx8lyiysm59fnlvzgj53phs8x0k36wwyvm845h42azrhha9k" + "commit": "3d6e504e13002c2eea12199fdbdd976650ed20a9", + "sha256": "1hp10aayvpyirfcvc3hq2s4srcgscnh3zhb8cvwc6qymm64grsy6" } }, { @@ -85515,36 +86481,36 @@ }, { "ename": "ol-notmuch", - "commit": "a3645b08cb46e3d91081da7baa982b5283918447", - "sha256": "0hfqkx1mwszrk8ak27igh830hkcb47z12zghzzary7mi15fq9vbp", - "fetcher": "sourcehut", + "commit": "c13d67c87248b9af8f9d6265a8626a330f9d478c", + "sha256": "1vxi5i2pmvbdqzpa1ksavp7ngpnki0x6svah686k528h1rky8zlv", + "fetcher": "github", "repo": "tarsius/ol-notmuch", "unstable": { "version": [ - 20240503, - 1711 + 20240805, + 1917 ], "deps": [ "compat", "notmuch", "org" ], - "commit": "f176ad73496ee086688ec5eeafcfff9372a833bc", - "sha256": "0gychpz53nhrrbs9w67400hbpyxp3q5jmhpj84fnqhnmf9q2dmnz" + "commit": "437aab56192ea86a52738fa5e9216c006df80bd0", + "sha256": "08anmfnk019d8xgmhxi1jhz3wlraz25f66k7rq3knn0lk8dgfm4w" }, "stable": { "version": [ 2, 0, - 1 + 3 ], "deps": [ "compat", "notmuch", "org" ], - "commit": "781c3518a537da2a8b5e8a4424f9441df463a147", - "sha256": "1rlpl3kb709q5brkjrrpirdnhvyh447q93li9lgfz67yya29rfqd" + "commit": "437aab56192ea86a52738fa5e9216c006df80bd0", + "sha256": "08anmfnk019d8xgmhxi1jhz3wlraz25f66k7rq3knn0lk8dgfm4w" } }, { @@ -85627,20 +86593,20 @@ "repo": "rnkn/olivetti", "unstable": { "version": [ - 20240519, - 914 + 20240727, + 431 ], - "commit": "5a7bd951d6135ff7ee3b45086308c14abce0936f", - "sha256": "1hww0900rfvfj43bn86ybzyc745js1xabp2whqd6dxajiklynky1" + "commit": "1a6a521273e70173af6dcf34e3c9f8bb97dd7afc", + "sha256": "0ngafkirgfhcq8vkphwd9z4whxwlv62y17a9ihav8f31v5d4kbm1" }, "stable": { "version": [ 2, 0, - 5 + 6 ], - "commit": "1f8b3d5cb155f7497083001037a09a972befab21", - "sha256": "1v5f0glp0ggmmzzhaxlijc58w4ip1nlik9lx7rcl6symsqcmqmq1" + "commit": "1a6a521273e70173af6dcf34e3c9f8bb97dd7afc", + "sha256": "0ngafkirgfhcq8vkphwd9z4whxwlv62y17a9ihav8f31v5d4kbm1" } }, { @@ -86103,26 +87069,18 @@ } }, { - "ename": "opencl-mode", - "commit": "d97575fdae88d55b55686aa6814f858813cad171", - "sha256": "1g351wiaycwmg1bnf4s2mdnc3lb2ml5l54g19184xqssfqlx7y79", + "ename": "opencl-c-mode", + "commit": "b32886c36b1953c1448cee2d0c9536b2ebfdacaa", + "sha256": "0hf6ibgiw391cqvs1hkdsiwcdagv2kv98239avqmrrw3z26yp9iq", "fetcher": "github", "repo": "salmanebah/opencl-mode", "unstable": { "version": [ - 20201025, - 1656 - ], - "commit": "15091eff92c33ee0d1ece40eb99299ef79fee92d", - "sha256": "1zn6rr48w0ai0sn51zzyp546va6flfgf9lm12vfrdb6kkiiiq403" - }, - "stable": { - "version": [ - 1, - 0 + 20240621, + 1714 ], - "commit": "14109a4bb56105a9c052ae49ad4c638b4cc210b2", - "sha256": "0n64l1jrrk60g192nn0240qcv2p9r138mi9gb38qq5k65wffbc21" + "commit": "d33ce29c19629e9c2f42e468d2687a475915f531", + "sha256": "085a16i7n5ph2spvvf60pg2bn42nfr017dy4zx6zzhghazmw7xzs" } }, { @@ -86350,11 +87308,14 @@ "repo": "oantolin/orderless", "unstable": { "version": [ - 20240401, - 959 + 20240717, + 758 + ], + "deps": [ + "compat" ], - "commit": "ac4aeb66f331f4c4a430d5556071e33177304c37", - "sha256": "1nphxjsxd6bi7lbhx5r1nzay6gkkwhm1q995k90gg9zcnyxz9k0c" + "commit": "49d1fdfb80b55699a00b11bc916ad29c0447039b", + "sha256": "0i18n5s52c98z1gjy7hd403f5bkdykifzpvfnchh90rgi24harng" }, "stable": { "version": [ @@ -86506,26 +87467,26 @@ "repo": "rksm/org-ai", "unstable": { "version": [ - 20240517, - 1114 + 20240806, + 1340 ], "deps": [ "websocket" ], - "commit": "fdcff489ef11bbc4b54c87b34a97bcc02f3994d4", - "sha256": "1j6rr8kn10j9wxqwhs4yd9k4fzjf2rz545if23xwqlg6ca39l16x" + "commit": "0184f063484cfd8079aa9aa30fa171a7a47f465e", + "sha256": "18y9c86zj88kijl205h34ra6kqqb5bljshng6sfr51833yjd4vc7" }, "stable": { "version": [ 0, - 4, - 7 + 5, + 1 ], "deps": [ "websocket" ], - "commit": "44e1298fd1b6ca9466f13ab6aadb08be6bde0b12", - "sha256": "0bag3ysg94l8dbvn7qnpyv2cd9f164aipmvkmxpvrgw4xl41lcqw" + "commit": "812b59f88851536ed3ded199fb55d303c16c7c12", + "sha256": "00f6k2gcglcr5mwdr3ixy5gazn2p1dnw3cvzsvzz870pl855f8fk" } }, { @@ -86536,15 +87497,15 @@ "repo": "spegoraro/org-alert", "unstable": { "version": [ - 20240122, - 1728 + 20240612, + 137 ], "deps": [ "alert", "org" ], - "commit": "b4bfd4cead89215cc9a46162234f7a4836da4dad", - "sha256": "0l4h5hi37s0b28v2ds8m01li0z80adlnhnvqhd6jszdsxv44fw5f" + "commit": "9d54b9d0956b2f9e199d8add48d544d09e58794c", + "sha256": "1nhbr8f137c2hxysc2sggnz095ah8qchrmx6g9ligq6gl3v0k7fj" }, "stable": { "version": [ @@ -86592,30 +87553,30 @@ "repo": "eyeinsky/org-anki", "unstable": { "version": [ - 20240427, - 1628 + 20240630, + 1401 ], "deps": [ "dash", "promise", "request" ], - "commit": "75c2cd6ababf3e2808107af32efc754bfd06a88b", - "sha256": "1plh177491bbfaybpaphd407iaadlm9imsdpkd8nws0qa9sflaw5" + "commit": "8b255bba68ee19c4e8a2704c1197ad963d0eb128", + "sha256": "19y513k1m6na6gvby10icdcl7bkik2694aq55liybp4iz33sw8ys" }, "stable": { "version": [ 3, 3, - 0 + 2 ], "deps": [ "dash", "promise", "request" ], - "commit": "75c2cd6ababf3e2808107af32efc754bfd06a88b", - "sha256": "1plh177491bbfaybpaphd407iaadlm9imsdpkd8nws0qa9sflaw5" + "commit": "8b255bba68ee19c4e8a2704c1197ad963d0eb128", + "sha256": "19y513k1m6na6gvby10icdcl7bkik2694aq55liybp4iz33sw8ys" } }, { @@ -86626,26 +87587,26 @@ "repo": "awth13/org-appear", "unstable": { "version": [ - 20231127, - 1052 + 20240716, + 1413 ], "deps": [ "org" ], - "commit": "81eba5d7a5b74cdb1bad091d85667e836f16b997", - "sha256": "1jh2rdp7rx1hnsfky5di1amz8rc5jf0qlc5ykr09m5f9fpz9m9x6" + "commit": "32ee50f8fdfa449bbc235617549c1bccb503cb09", + "sha256": "1hfhnzhmbxrw4kz977s48x4nbq86vda5dvj00s2ima2i22b8l2z4" }, "stable": { "version": [ 0, 3, - 0 + 1 ], "deps": [ "org" ], - "commit": "303fcc8d5d85a4ebff2798dab50b2ccc0255ea5f", - "sha256": "1pdf16agcjfzpjvz8kv39abir35rip93nkawxcpjjh4ywsdsbnm6" + "commit": "32ee50f8fdfa449bbc235617549c1bccb503cb09", + "sha256": "1hfhnzhmbxrw4kz977s48x4nbq86vda5dvj00s2ima2i22b8l2z4" } }, { @@ -86772,6 +87733,24 @@ } }, { + "ename": "org-autoexport", + "commit": "7945b20761a1cfaf35876825c505c26d42178a6d", + "sha256": "01s2a0l243wlg0gc2mmx8z2w2n0mjd06281w280qrg4xsqprdglj", + "fetcher": "sourcehut", + "repo": "zondo/org-autoexport", + "unstable": { + "version": [ + 20240817, + 623 + ], + "deps": [ + "org" + ], + "commit": "effe8d6a90e3ab26a7da65e21593e721784b1be7", + "sha256": "16h3rlyxlh09d0j42nk1p1kklb1kgi16767j86nz9xqamfjz90kl" + } + }, + { "ename": "org-autolist", "commit": "ca8e2cdb282674b20881bf6b4fc49af42a5d09a7", "sha256": "1jvspxhxlvd7h1srk9dbk1v5dykmf8jsjaqicpll7ial6i0qgikj", @@ -86881,20 +87860,26 @@ "repo": "alphapapa/org-bookmark-heading", "unstable": { "version": [ - 20231216, - 1234 + 20240622, + 947 + ], + "deps": [ + "compat" ], - "commit": "ed8b7fe2a08b06a1d750d1e1230e6728815e0bcd", - "sha256": "19fayjglgr3vk365a2f0c2mdnww30cxpzmi1sl2p2n3mic21av37" + "commit": "b667cfdde7631c656778473e6c87bc51e46280cd", + "sha256": "06pwxlhqcvz6fb8y4mm54r851x8gcqrwj3pgfnag7ydw881rlqg3" }, "stable": { "version": [ 1, 3, - 1 + 2 + ], + "deps": [ + "compat" ], - "commit": "3e95313837898ec8660c7a8b0f601ec7edda7bfc", - "sha256": "0dixym930mxsl954rbjay2wk4p0r5d90jgz2cyv5hs3pa40msgdl" + "commit": "c7c7dcc52d3ad78084ea15e95bd7f6037bf02543", + "sha256": "1xzwbvhj6x5vszxbrf1sws37i8m3kff3sf1xkzijvjn8c8da9r97" } }, { @@ -86905,19 +87890,19 @@ "url": "https://repo.or.cz/org-bookmarks.git", "unstable": { "version": [ - 20240520, - 16 + 20240710, + 1738 ], - "commit": "774b2cad8b77920e5ea2089d7dd11c8ccab4a471", - "sha256": "0z2703qjwbvivpqxqdxjb7rzv3yrcxvzksrpm768wdazvrk7gq9b" + "commit": "23942cd3f14f691a35bfb71e0559ed5eb5100909", + "sha256": "1l61v51hk1bs0rn7r3nw7pjmxccg9ghx1hf4y24363a70wkl45qw" }, "stable": { "version": [ 1, - 1 + 2 ], - "commit": "cdd57bf2aee9a26883312a2c5e48701e4b60802f", - "sha256": "04ydqa930b4xkk67i1ql59man08pc9y6l3nx3bpsi6va2djh0zjz" + "commit": "340319879d43e0a90c8f29f2b896ce28a69ec205", + "sha256": "13yk5j8461nz89bd0yi113wrhyc55g12yxzjqnrr7i0z7s09k9ni" } }, { @@ -87048,14 +88033,14 @@ "repo": "dengste/org-caldav", "unstable": { "version": [ - 20240415, - 1535 + 20240714, + 1732 ], "deps": [ "org" ], - "commit": "086a8f385138ef71f7e29f78f19fb3a65f8ee27c", - "sha256": "09j9sbjpj9bgxx2rrrmsyz9vk0xmhsljy6qrdjjzm230k80817xw" + "commit": "9f4db50f06e787737581e9134164837216848fa6", + "sha256": "14vnnnysnqacsfpd6288s8x4g9vr90giy00vfp03gfbq5ni43v2k" }, "stable": { "version": [ @@ -87173,14 +88158,26 @@ "repo": "swflint/org-cite-overlay", "unstable": { "version": [ - 20240207, - 1611 + 20240523, + 100 + ], + "deps": [ + "citeproc" + ], + "commit": "dc23b55c708c6399a12dbc79281110de7681b121", + "sha256": "0ymgy0jns2fr0s5c2q3i8xwwn15ln5l2rxng0y6lgnazxsp35p50" + }, + "stable": { + "version": [ + 1, + 0, + 0 ], "deps": [ "citeproc" ], - "commit": "cb401787b4569f43815cac55be8a319c489de3de", - "sha256": "1f4n67hlfaaxz12cyjj759kjkr1vxh8dfbaq987c5dzh5afjjzsj" + "commit": "dc23b55c708c6399a12dbc79281110de7681b121", + "sha256": "0ymgy0jns2fr0s5c2q3i8xwwn15ln5l2rxng0y6lgnazxsp35p50" } }, { @@ -87191,8 +88188,8 @@ "repo": "swflint/org-cite-overlay", "unstable": { "version": [ - 20240213, - 1802 + 20240523, + 100 ], "deps": [ "citeproc", @@ -87200,8 +88197,23 @@ "universal-sidecar", "universal-sidecar-citeproc" ], - "commit": "bb23142f5d0d390196839fa9b3ce27ce4d149b59", - "sha256": "1vjmygl9gm1syikf06iarri1yb8hrp3zvk0c9sm46h2wj476v4dy" + "commit": "dc23b55c708c6399a12dbc79281110de7681b121", + "sha256": "0ymgy0jns2fr0s5c2q3i8xwwn15ln5l2rxng0y6lgnazxsp35p50" + }, + "stable": { + "version": [ + 1, + 0, + 0 + ], + "deps": [ + "citeproc", + "org-cite-overlay", + "universal-sidecar", + "universal-sidecar-citeproc" + ], + "commit": "dc23b55c708c6399a12dbc79281110de7681b121", + "sha256": "0ymgy0jns2fr0s5c2q3i8xwwn15ln5l2rxng0y6lgnazxsp35p50" } }, { @@ -87371,14 +88383,14 @@ "url": "https://repo.or.cz/org-contacts.git", "unstable": { "version": [ - 20240521, - 1144 + 20240807, + 733 ], "deps": [ "org" ], - "commit": "722bc2ec91ca66a33f6b57cd02010f4fdbf542a9", - "sha256": "0750kckr7qfwnz5c3vr0s0d4nnfx3dshpgj19wh9yijq92v6q6mf" + "commit": "f0a430442b2ae60035dcd74fc6a76299875694f3", + "sha256": "1xs8693dhji2fa8gn3j3fr4qvp1zad0g71f9qlrd3ynkhgdai2r3" } }, { @@ -87437,29 +88449,29 @@ "url": "https://git.spwhitton.name/org-d20", "unstable": { "version": [ - 20230616, - 754 + 20240726, + 255 ], "deps": [ "dash", "s", "seq" ], - "commit": "5993e2b83831c1937eb70ef23629008218210d22", - "sha256": "131p7641n8v237nwvs84agvfl1h5nz53smq89k6fpl3ifkkicl6f" + "commit": "ad399cde0ee21adc67ed0c95ae20900fa936f008", + "sha256": "0l3814b0f3s35cspyim5q639f0jp6mw3ri2hqb1in6r2igacaq7d" }, "stable": { "version": [ 0, - 5 + 6 ], "deps": [ "dash", "s", "seq" ], - "commit": "e6149dcfbb6302d10109dd792fd0ffae7bfe2595", - "sha256": "129zdnz97h6px0yz0f0if4gw96zxmsg24xc8vg51crsazqqz8l3b" + "commit": "ad399cde0ee21adc67ed0c95ae20900fa936f008", + "sha256": "0l3814b0f3s35cspyim5q639f0jp6mw3ri2hqb1in6r2igacaq7d" } }, { @@ -87982,15 +88994,15 @@ "repo": "conao3/org-generate.el", "unstable": { "version": [ - 20200815, - 736 + 20240713, + 159 ], "deps": [ "mustache", "org" ], - "commit": "98825efb73c4537f05f653ce40e639a220d2ee5d", - "sha256": "0p4xc4rznkq0vp0bbm1k69bfbmlp46lap12q75wdpkdrn5k4sr2p" + "commit": "39dbf8b5c3d225438f7d65e0dc7e9766d61d4c81", + "sha256": "03xd0cm0splhiznd8sdaipjvifc8pvsyj82s7mj5f3nzpqvv1m9m" }, "stable": { "version": [ @@ -88406,30 +89418,30 @@ "repo": "ahungry/org-jira", "unstable": { "version": [ - 20230915, - 57 + 20240712, + 2234 ], "deps": [ "cl-lib", "dash", "request" ], - "commit": "295b01ede42952c848bd8d76bc8c456a87876cbc", - "sha256": "1qyabrz49fmzyylf2kpm2ygwzlxx3v3aa71pi8r7dnxc5fzcc5z1" + "commit": "bd573584a9d93b320d5adbfc09dee30e83e5120d", + "sha256": "1g48n7m1ind29vixzgyj615d484w073bkr4p0sdz8flrnlvsfdyd" }, "stable": { "version": [ 4, 4, - 1 + 2 ], "deps": [ "cl-lib", "dash", "request" ], - "commit": "fce9f8f28788d1d422fff2e17eb059e6ea546622", - "sha256": "1pkqyvziwp2573hnr8s41chsbm40564f76i3l8ynjr7955nccsms" + "commit": "ac625b080545a1ade22d070c23624f71b7ab02b5", + "sha256": "1mg7p9y4d4m6b6qkjvdz6lqby3kvvdb7qcjqgkrf75rzv0rsn1h2" } }, { @@ -88519,29 +89531,28 @@ "repo": "gizmomogwai/org-kanban", "unstable": { "version": [ - 20240430, - 944 + 20240607, + 1612 ], "deps": [ "dash", "s" ], - "commit": "e316be6a4f64c4869b911d2cbdc4673a0e398a5f", - "sha256": "10hczqx620vhf93y61rf4hliqpasrw3r12sxsh6z03x2zv6jhl0s" + "commit": "cdc66ff97cdf5275db9f507bf2c915bbc0183c30", + "sha256": "1v3r7yrvlxhaj5mj0r8vgd0a22q6qj9d61zf7q9cixcl72ifq8qr" }, "stable": { "version": [ 0, 6, - 6 + 9 ], "deps": [ "dash", - "org", "s" ], - "commit": "83d5a657d4c190c62663c9b2357105002795b2e3", - "sha256": "1ma1grcwjfkps3chs1f0md33hkkl4bj7s9apws61anr2yfcj5j7k" + "commit": "cdc66ff97cdf5275db9f507bf2c915bbc0183c30", + "sha256": "1v3r7yrvlxhaj5mj0r8vgd0a22q6qj9d61zf7q9cixcl72ifq8qr" } }, { @@ -88592,15 +89603,15 @@ "repo": "seokbeomKim/org-linenote", "unstable": { "version": [ - 20240325, - 320 + 20240410, + 410 ], "deps": [ "projectile", "vertico" ], - "commit": "4c081f4bbe13c48df7cb17f2f006465b8b95196b", - "sha256": "0a8pcds5vv5px47gzvmv94ymvhki7kjqah8i4w43f0lpx9dhwqzx" + "commit": "a015295ebf271c8b518238f7969a0b6e60429805", + "sha256": "1jn22rvlxy5d2p56vm2jgs5jz4nm76ji4xmd71pnc18x2ci2p2c8" } }, { @@ -88611,16 +89622,16 @@ "url": "https://repo.or.cz/org-link-beautify.git", "unstable": { "version": [ - 20240312, - 529 + 20240818, + 400 ], "deps": [ "fb2-reader", "nerd-icons", "qrencode" ], - "commit": "c77338cfac89a41f90eafea80d11d8134e8096f4", - "sha256": "1pvq83lca6sj19vra0r2cvzngqkkcwswqq1ma96dkl5xyn01ggw9" + "commit": "950095639fdac279022464e1f1efc602e704d1f0", + "sha256": "18fl3l5b69ar5sgj2mds5wvy31jzl0wha10cwks1pg4zs0drw0m8" }, "stable": { "version": [ @@ -88780,20 +89791,20 @@ "repo": "org-mime/org-mime", "unstable": { "version": [ - 20240129, - 2327 + 20240818, + 243 ], - "commit": "9d4584651d89806b79d5993b286d32d6f70499a9", - "sha256": "0zvzb6gbls3zv0qkm5x1vjx0mp4fpg0qy049lq35gqvdw1haxlsp" + "commit": "468604b8404d3c7d6148be83a4cf308ee95d2cfb", + "sha256": "1ynvyaxmv1pr6ivqrcghba55rmqgcl4ygci6ygm4mghg8am9cwvp" }, "stable": { "version": [ 0, 3, - 2 + 3 ], - "commit": "cc00afcf0291633324364c1c83bfe2833cfdc1bf", - "sha256": "1w5z9irzk918mj75z5m0j2h8mms8v27x50kp7r3b01wblf0jd2zc" + "commit": "468604b8404d3c7d6148be83a4cf308ee95d2cfb", + "sha256": "1ynvyaxmv1pr6ivqrcghba55rmqgcl4ygci6ygm4mghg8am9cwvp" } }, { @@ -88875,25 +89886,25 @@ "repo": "minad/org-modern", "unstable": { "version": [ - 20240515, - 1932 + 20240803, + 1952 ], "deps": [ "compat" ], - "commit": "ea829ce4b3ac035808d411b1a088e0947d75f554", - "sha256": "1igv0ph5nk0b6bav5fndgl5jrnf20hml0vkx81ia1amhv7isbiax" + "commit": "e306c7df4985f77e5c4e2146900259a23a76c974", + "sha256": "0zvg7jqfgaaayw8x3bi704ad47kpk4g8hxxfsd5p0xhyhxkq528m" }, "stable": { "version": [ 1, - 2 + 5 ], "deps": [ "compat" ], - "commit": "a2ff4c8e9cac412e8cb9c7faf618ac18146107ea", - "sha256": "19mn29f294wng6pgm1vwncx50963wnh7zj33ipynx8qxndbi6hsm" + "commit": "e306c7df4985f77e5c4e2146900259a23a76c974", + "sha256": "0zvg7jqfgaaayw8x3bi704ad47kpk4g8hxxfsd5p0xhyhxkq528m" } }, { @@ -89079,14 +90090,14 @@ "repo": "AntonHakansson/org-nix-shell", "unstable": { "version": [ - 20240205, - 1642 + 20240603, + 859 ], "deps": [ "org" ], - "commit": "d9843aa0f62a39b9938a89388e25129ecb39a4cc", - "sha256": "1ci8galz7cc8y2fdq1nl1wbpbid2ixvz77744yxxk43977gbpn1c" + "commit": "f359d9e1053fadee86dd668f4789ae2e700d8e8a", + "sha256": "1zbp2qwkj23nf4k3in9cb8rmymw7cg0v22b1wwbqlfh4b6h3jakm" }, "stable": { "version": [ @@ -89627,8 +90638,8 @@ "repo": "alphapapa/org-ql", "unstable": { "version": [ - 20240403, - 2027 + 20240627, + 1432 ], "deps": [ "compat", @@ -89643,14 +90654,14 @@ "transient", "ts" ], - "commit": "c9370982bfd4df04b590762bd795a7da3012c4dd", - "sha256": "1df7qd9f74gvpixpqchn1j47g4iwq6r9cvpc2g9cnb9mb16r2mjk" + "commit": "b7d4856f926cb71e01427a940dc948a48b0a702d", + "sha256": "07d8zq0a89qc3yrvq8qkvdqgw4rvbrrhwgj08qqdk698ny96qiwr" }, "stable": { "version": [ 0, 8, - 6 + 7 ], "deps": [ "compat", @@ -89665,8 +90676,8 @@ "transient", "ts" ], - "commit": "1f264bf4649dc2ad90f16a763794561ee6164d84", - "sha256": "0425r0qjl83d1zq2z9myish3iqa6pc9ml2jlwmffjnj5gm3vgfsj" + "commit": "c2b4404808185a9d5e160c8eea7967f906f77fd3", + "sha256": "0smk5affzlf0i4m10kx8mcffpysd61pjm4zidz2qdv5vsg3j9z50" } }, { @@ -89760,28 +90771,28 @@ "repo": "oer/org-re-reveal", "unstable": { "version": [ - 20240430, - 1155 + 20240808, + 1244 ], "deps": [ "htmlize", "org" ], - "commit": "ceb5420fd5200c3b4165ffc71360d5388dba7d29", - "sha256": "1ibdcjma6km680ckygd55plwjn5aagf1bfw1sa4374715k4r7722" + "commit": "99cf6fffe606a8461c2f057b67ee34408a75a072", + "sha256": "02na8jxnncq98gkh3cqsikwjmang26yd9jm8irhd9rjnb2y2yyjn" }, "stable": { "version": [ 3, - 28, - 2 + 32, + 0 ], "deps": [ "htmlize", "org" ], - "commit": "81cf9dfd3be4480bbaa6d0b6452ea38e8d4e45c0", - "sha256": "1qbp198xg8pkd9zdvapq8bdsxilgqqync8m3r1csg8nz8lbpkk1b" + "commit": "99cf6fffe606a8461c2f057b67ee34408a75a072", + "sha256": "02na8jxnncq98gkh3cqsikwjmang26yd9jm8irhd9rjnb2y2yyjn" } }, { @@ -89939,8 +90950,8 @@ "repo": "jkitchin/org-ref", "unstable": { "version": [ - 20240509, - 1211 + 20240802, + 1213 ], "deps": [ "avy", @@ -89956,8 +90967,8 @@ "request", "s" ], - "commit": "e435bc60228b985806ea7ea0856ceef1e5262c83", - "sha256": "1d13p33aypa3jip4xs5lx6vsimv7xg0m766nm35xapbmjjfihjkv" + "commit": "fd178abf12a85f8e12005d1df683564bdc534124", + "sha256": "0rdi1n4vay93xs7gwxxmivg3lq13sk10f0g505z0hagzcv2f48w7" }, "stable": { "version": [ @@ -90033,28 +91044,29 @@ "repo": "akirak/org-reverse-datetree", "unstable": { "version": [ - 20221203, - 259 + 20240802, + 1519 ], "deps": [ "dash", "org" ], - "commit": "fca95cd22ed29653f3217034c71ec0ab0a7c7734", - "sha256": "15jymjfdsmbcr5l03c605kbi68afcnwandhpgkcn912add9iqczr" + "commit": "d029e2263de23b19ed89f9757ad69b7cb33bda32", + "sha256": "08fh2qmzig3zw5106hhq55847b5cz9l2pl82cqsqbwf93ndflygk" }, "stable": { "version": [ 0, 4, + 2, 2 ], "deps": [ "dash", "org" ], - "commit": "6e5240f54423a3b98167e2fb7bbe51a1f15b7f75", - "sha256": "09xvkw2h7i702wr4k5zqcd91sc4jwqzawwqsxf13qiwdm4kfxfk8" + "commit": "3ac9b35ebe872f5a619f2e6abe281df66ebbcfe0", + "sha256": "0lfr88wb98yh9fi2hnvd5f3xdcb1d480shqrcyg7gyqcvx64shii" } }, { @@ -90104,8 +91116,8 @@ "repo": "org-roam/org-roam", "unstable": { "version": [ - 20240114, - 1941 + 20240715, + 1750 ], "deps": [ "dash", @@ -90113,8 +91125,8 @@ "magit-section", "org" ], - "commit": "2e94f55cc58f6dce2772a6f33521eb5afcf67265", - "sha256": "0hhq2qfdhp2nlnz3ldx9y36s95n6nmywmbfjrqgn2viwzap23xgn" + "commit": "3e186a85520f02c1672150f62eb921bcad5d2c2d", + "sha256": "1sih11zgfjvy61pgd8x8cjqkwxyarh1wpn2r5z18ii6a3fmjhpj7" }, "stable": { "version": [ @@ -90173,8 +91185,8 @@ "repo": "ahmed-shariff/org-roam-ql", "unstable": { "version": [ - 20240503, - 1845 + 20240721, + 306 ], "deps": [ "magit-section", @@ -90183,8 +91195,8 @@ "s", "transient" ], - "commit": "f628fef081394f159f196f4350132aecb3edb8cc", - "sha256": "1ssxvy6y79f035whk9b8jg1vqsy6vymgq9yrzbxv06g5vsggvlh5" + "commit": "f5c367fea8693491215ac61b211e98aef8dfaeec", + "sha256": "09pj272x1w3fys84xld8v7gpya5syh70irxd98sf0x2bpsrsqfry" }, "stable": { "version": [ @@ -90210,8 +91222,8 @@ "repo": "ahmed-shariff/org-roam-ql", "unstable": { "version": [ - 20240503, - 1845 + 20240721, + 306 ], "deps": [ "org-ql", @@ -90220,8 +91232,8 @@ "s", "transient" ], - "commit": "f628fef081394f159f196f4350132aecb3edb8cc", - "sha256": "1ssxvy6y79f035whk9b8jg1vqsy6vymgq9yrzbxv06g5vsggvlh5" + "commit": "f5c367fea8693491215ac61b211e98aef8dfaeec", + "sha256": "09pj272x1w3fys84xld8v7gpya5syh70irxd98sf0x2bpsrsqfry" }, "stable": { "version": [ @@ -90388,11 +91400,11 @@ "repo": "lordnik22/org-shoplist", "unstable": { "version": [ - 20210629, - 2157 + 20240605, + 2257 ], - "commit": "71ea7643e66c97d21df49fb8b600578ca0464f83", - "sha256": "0pjcpry9hzma87f8isyi0q5si0i67g0gd8shj2y3qyizi9ns64a2" + "commit": "6c2daa0b663d01a498dca2f2f4f4b645be1c365a", + "sha256": "0i71mgmvvsfycqlqj046184k3fzrqszhfffrjxfg2ai4lp9a8aql" } }, { @@ -90403,11 +91415,11 @@ "repo": "localauthor/org-side-tree", "unstable": { "version": [ - 20240130, - 656 + 20240601, + 1001 ], - "commit": "62169a26edfafacd681ecaf84289dd6b58be6c32", - "sha256": "1cjypg5fvvdd8flcbi4jyaql2bpd5xq283lxhgp9kr51x2ibzdnb" + "commit": "e8da5217ce23440a62f4a46ef60e2082b6284b28", + "sha256": "0cbnmw0ha6sbs1hvxv1j7mirdzy9kq3b1h60jx8a83gwgsbihzbg" } }, { @@ -90456,14 +91468,14 @@ "repo": "jcfk/org-sliced-images", "unstable": { "version": [ - 20240325, - 710 + 20240624, + 428 ], "deps": [ "org" ], - "commit": "f3964d4ba421953fe9f109a99811b6d884ca56ab", - "sha256": "0lf275dqvgjfsh6kfmrb05gxcv78ng6pdijj2b1c2arw4pwsjb0r" + "commit": "b98b88a55eff07e998e7789e0bf7307dd71db050", + "sha256": "0iq03zp3bm1ph5ryhx6zpjm830sliqj6bb7i0h2v0nfn07l0cby2" } }, { @@ -90535,8 +91547,8 @@ "repo": "ndwarshuis/org-sql", "unstable": { "version": [ - 20220621, - 2252 + 20240819, + 2145 ], "deps": [ "dash", @@ -90544,14 +91556,14 @@ "org-ml", "s" ], - "commit": "43376abf46b897a9a862cfcc1c087f4b8688634c", - "sha256": "0v2bbwxblzpkf57p6d5i0isia90jxw17p9aaslizpcybqsp3c3ha" + "commit": "3dbf11d692cf0d5e64235ad4041ed0b5a6775064", + "sha256": "0vfjj0854csra816040ihhlrsnxlaqnw3aqc18448ga7wbirrxs5" }, "stable": { "version": [ - 3, + 4, 0, - 4 + 0 ], "deps": [ "dash", @@ -90559,8 +91571,8 @@ "org-ml", "s" ], - "commit": "ea000131a6bfe2e22f3d9a65c0b0aeeab34434e3", - "sha256": "0v2bbwxblzpkf57p6d5i0isia90jxw17p9aaslizpcybqsp3c3ha" + "commit": "80bea9996de7fa8bc7ff891a91cfaff91111dcd8", + "sha256": "0vfjj0854csra816040ihhlrsnxlaqnw3aqc18448ga7wbirrxs5" } }, { @@ -90633,11 +91645,11 @@ "repo": "bastibe/org-static-blog", "unstable": { "version": [ - 20240124, - 1550 + 20240727, + 718 ], - "commit": "6459a46bd40abbfe21095504d229db0f66494e86", - "sha256": "061xnx36j1bapq60vsvi47a1619ndg0kg0yvfqm9d8g4a1mvay1p" + "commit": "34c9a60a00bce7ad70e7c6b28696edec5affcf06", + "sha256": "0g0y8w2i0hs9dywdpxv307gkqnpgyibzmi1sbbqxqj9m8gcib90k" }, "stable": { "version": [ @@ -90686,8 +91698,8 @@ "repo": "alphapapa/org-super-agenda", "unstable": { "version": [ - 20240301, - 1602 + 20240715, + 1639 ], "deps": [ "compat", @@ -90697,8 +91709,8 @@ "s", "ts" ], - "commit": "51c9da5ce7b791150758984bab469d2222516844", - "sha256": "1mddkfd6xiy2q0907dzyy3vf77yamm6pa608dhdy2chgc26l0ji4" + "commit": "05a710065af5ee4b3982f9619f864f7af12ca1d3", + "sha256": "1cy82dqamjxfr8clwk3r3pimvvmn7gkhxvzrnqdkbypzm7hpyd30" }, "stable": { "version": [ @@ -90875,14 +91887,14 @@ "url": "https://repo.or.cz/org-tag-beautify.git", "unstable": { "version": [ - 20240422, - 607 + 20240712, + 443 ], "deps": [ "nerd-icons" ], - "commit": "2f8b66e7aa2227411665f36d96bfc8a1b184bfbb", - "sha256": "0qz3f8phczmpyj8n6m9851cscwb7z0nkn4b5w79k21pgfhcmp6zf" + "commit": "cda8ffcfaa2619dd40cfd4dbe93a74a0f3326aae", + "sha256": "1y581d7cpyxm1s1za1619i2adz6pp4i21qgrzgjcw8rn3rzd4vi0" } }, { @@ -91138,6 +92150,37 @@ } }, { + "ename": "org-transclusion-http", + "commit": "d733b6eb2fe02b098f3c49f6bafb809156114cc5", + "sha256": "1nc31djfdyhfkr6yybx308dihp7kfbih58zwrxzkg4pl63sbmkyq", + "fetcher": "sourcehut", + "repo": "ushin/org-transclusion-http", + "unstable": { + "version": [ + 20240619, + 2130 + ], + "deps": [ + "org-transclusion", + "plz" + ], + "commit": "65caad0d9b19bf19c815bd7c033ffb907c3ebb12", + "sha256": "1cksd818yjxsydpmxb6744km8q97ykix071s7iqhzjamg8c7l6ca" + }, + "stable": { + "version": [ + 0, + 4 + ], + "deps": [ + "org-transclusion", + "plz" + ], + "commit": "a764f05a9eaeca002c76b85d090ca6b036e9dbaf", + "sha256": "0cz67lkm8dajvyxhzj5mchav5dxif3pk3bs03fz9jna6yc1v2fja" + } + }, + { "ename": "org-transform-tree-table", "commit": "afca0e652a993848610606866609edbf2f5f76ae", "sha256": "0n68cw769nk90ms6w1w6cc1nxjwn1navkz56mf11bsiqvsk3km7r", @@ -91503,30 +92546,28 @@ "repo": "p-snow/org-web-track", "unstable": { "version": [ - 20240424, - 756 + 20240720, + 904 ], "deps": [ "enlive", "request" ], - "commit": "92e97112aa63cbe14f7727b157eb3c11239bf86c", - "sha256": "1ni3l38zh2lzr2ri7vh6khp9c6fn4hafgc6234y707ysniz9dryx" + "commit": "bd96a755ff7c76142d27d6da319252dde9a4c7d6", + "sha256": "0f3n06s1nqw5fvms9xcq23m4s7wzwpklbh77lmbhrw6hg883lgi5" }, "stable": { "version": [ 0, 0, - 1 + 3 ], "deps": [ "enlive", - "org", - "org-agenda", "request" ], - "commit": "dab6a42982ad290564b09d2c1c3dbe3c63295964", - "sha256": "1v6zj6hkhn5xjq318vs5yhsdg6mgaw4qjd9fgi2fps7ry79drzf3" + "commit": "eff66fc207411d5a5265d4ee5232f13d268f252f", + "sha256": "18san6d7acfgz4fsjsv3w9bsbf41svf8p08jrc7rkqjp07h7hnwk" } }, { @@ -91627,11 +92668,11 @@ "repo": "ksqsf/org-xlatex", "unstable": { "version": [ - 20230820, - 2133 + 20240707, + 1343 ], - "commit": "f3cac5ea904e78ae2b47723fdce96e8e87edbe7c", - "sha256": "06y7lapsp4s9h07hdsd8wigmy6r5l36qiqwmz7j1n8zp3r8xg0pw" + "commit": "8f25ba5e4784b3f12f5ac5c69b1a1d0695c53b8e", + "sha256": "1cg11gqisigpa9prkm05z7wlajffzmhjiymg7frbibhrskhfhrp0" } }, { @@ -91642,14 +92683,14 @@ "repo": "ymherklotz/org-zettelkasten", "unstable": { "version": [ - 20230613, - 1924 + 20240716, + 2114 ], "deps": [ "org" ], - "commit": "5863a057f9b41dfa4cbf383c325b3fcddbbe5449", - "sha256": "1ibwcwn47pgf6dpqz71cm6azwdngb3blkwclii0y876fmyqhywsw" + "commit": "b6ee54071f9653fb95a33491e2c0152efc3c61c8", + "sha256": "1cw54bads6bfir5rslmq8bffx7ks6cdhhhhq7lrn1s0p1v2fnvx6" }, "stable": { "version": [ @@ -91840,11 +92881,11 @@ "repo": "kostafey/organic-green-theme", "unstable": { "version": [ - 20231225, - 149 + 20240731, + 2058 ], - "commit": "9b669465c875edd86289d017731880172dc08b9d", - "sha256": "0s0bdghcqddgi3a4cldldgw8rqqsax6smpsk198g5gmfnyaj1yfb" + "commit": "8ea2fea0aea27d67448440f22b4ccdf6f9e6e8f6", + "sha256": "0fz3qp6yqsjdn16siw73vjgc3m9ld536yrn0l8j1s0bkhby13xil" } }, { @@ -91923,21 +92964,21 @@ "repo": "magit/orgit", "unstable": { "version": [ - 20240415, - 1546 + 20240808, + 1945 ], "deps": [ "compat", "magit", "org" ], - "commit": "ca3bf7aa20074e25fee37b71cfef127b93a3dde7", - "sha256": "1ml64ddahk6szbynzrjm4zglkxhv9lgmaipm6fysalx48nxqvshh" + "commit": "59d21fdb21f84238c3172d37fdd2446b753e98dc", + "sha256": "0864y78kvcvha0rx0pzrxlyivr65zk21ji4md757alw1lr4zf408" }, "stable": { "version": [ - 1, - 9, + 2, + 0, 0 ], "deps": [ @@ -91945,8 +92986,8 @@ "magit", "org" ], - "commit": "4a585029875a1dbbe96d8ac157bd2fd02875f289", - "sha256": "00fkj88yddan80q8zbx0jy66d958srkm06jiy1nraamxqr15mmyz" + "commit": "59d21fdb21f84238c3172d37fdd2446b753e98dc", + "sha256": "0864y78kvcvha0rx0pzrxlyivr65zk21ji4md757alw1lr4zf408" } }, { @@ -91957,8 +92998,8 @@ "repo": "magit/orgit-forge", "unstable": { "version": [ - 20240415, - 1546 + 20240808, + 1947 ], "deps": [ "compat", @@ -91967,14 +93008,14 @@ "org", "orgit" ], - "commit": "7b010465ab96bea6d380ae1cfbd7999d528f1de9", - "sha256": "0xqwzb7jmh7mlq4b6wk7kkhgwjwb399bv215bx2n3iq9bi2x6mv8" + "commit": "2718a6aaf0f64cb52c64c419053fbc80eb358c8d", + "sha256": "1xcv7kqsrv39rk8fjd2sbl2wrr8mdb6y1xipifki4q7mry1c6v6w" }, "stable": { "version": [ - 0, 1, - 4 + 0, + 0 ], "deps": [ "compat", @@ -91983,8 +93024,8 @@ "org", "orgit" ], - "commit": "8ba92a54aee9693b1bf03baf14f83550a7c89b18", - "sha256": "0b7266k8n2wby5qc6kdi4b9850mnf646bp6q8n8wbsss1mnwaf6z" + "commit": "2718a6aaf0f64cb52c64c419053fbc80eb358c8d", + "sha256": "1xcv7kqsrv39rk8fjd2sbl2wrr8mdb6y1xipifki4q7mry1c6v6w" } }, { @@ -91995,30 +93036,30 @@ "repo": "tarsius/orglink", "unstable": { "version": [ - 20240415, - 1547 + 20240805, + 1431 ], "deps": [ "compat", "org", "seq" ], - "commit": "e513f25024b2db082dbdbd8bd713d57a2b7456eb", - "sha256": "0dmh9j9dz3j7h881126zj9bpbzh5sr444qw5029wfmsq4x5ls0yg" + "commit": "bc6135ef091c871b40e9fecd3126a177aed93e17", + "sha256": "1mmaaacpiwzd63qi9f7xi0giqn411vj0330wyxh5kgi5kls360ba" }, "stable": { "version": [ 1, 2, - 2 + 4 ], "deps": [ "compat", "org", "seq" ], - "commit": "afbeffdfa15a9fc532bba2e03626b9e82768ba2c", - "sha256": "0jkk6jiqmsns1pb0almaihyz6c3lim0r6l4x75qp7448p46q2him" + "commit": "bc6135ef091c871b40e9fecd3126a177aed93e17", + "sha256": "1mmaaacpiwzd63qi9f7xi0giqn411vj0330wyxh5kgi5kls360ba" } }, { @@ -92088,11 +93129,11 @@ "repo": "Artawower/orgnote.el", "unstable": { "version": [ - 20240516, - 1842 + 20240814, + 2021 ], - "commit": "0b6ab72bede2fa757758016ae69db2cc8332fa2d", - "sha256": "0g05x2ns54c4vyx1rxspi8x7b1q5z8cib4k7qlm5wnbblccmbvk3" + "commit": "d2d0c8d16ea2dbcc29b79f9d4a48e03e90c3f57d", + "sha256": "02i54x889714ma1r5pifb8pbcr850rd2vz0ssd923rip5iljs5xz" }, "stable": { "version": [ @@ -92136,11 +93177,11 @@ "repo": "tbanel/orgaggregate", "unstable": { "version": [ - 20240228, - 720 + 20240616, + 506 ], - "commit": "cc129b543c472c704c8dc074500a8192ac3d9f88", - "sha256": "1kcw09k5ga1sc8p4zzlcp3mnmqs6kx626vkk29awm0b1qyg8pk92" + "commit": "f343b6009d87630588d39dc3d92651008c1bad13", + "sha256": "0dig8axp5isv39nxmx1387yg9dy8cwl47qk8a1m0jv2dsybagw4s" } }, { @@ -92181,11 +93222,11 @@ "repo": "tbanel/orgtbljoin", "unstable": { "version": [ - 20240228, - 719 + 20240616, + 528 ], - "commit": "f243511ec4b3a712d0b868ecbc4c7b1310a3382d", - "sha256": "1lpgprrcwhzglddkr9q4v4qlr503wvvg1ri31445vp8fd4ldz0aa" + "commit": "441a426447965e9b4dc1b0a1fc010c07192f73b6", + "sha256": "16isqgnysbp64wvgl9skyhfqlwjxsvs4i8k5zzaxm5c7jrcwc78l" } }, { @@ -92344,25 +93385,25 @@ "repo": "minad/osm", "unstable": { "version": [ - 20240122, - 2255 + 20240723, + 2207 ], "deps": [ "compat" ], - "commit": "5dffbc00e4acfcddc13677f3b76a65dc3b6aee30", - "sha256": "1dr0415xr7a2h4y4zpjkh0hrrcfw4sa55y8y98131h2n5fzhd5sx" + "commit": "25eede7272bb2b4c0b009add264ebb45ab2f3691", + "sha256": "10l9nhxmshar4swf62rqgzyvpx0fn0dsyjvfg9dd78nmfkagfkh8" }, "stable": { "version": [ 1, - 3 + 4 ], "deps": [ "compat" ], - "commit": "5dffbc00e4acfcddc13677f3b76a65dc3b6aee30", - "sha256": "1dr0415xr7a2h4y4zpjkh0hrrcfw4sa55y8y98131h2n5fzhd5sx" + "commit": "25eede7272bb2b4c0b009add264ebb45ab2f3691", + "sha256": "10l9nhxmshar4swf62rqgzyvpx0fn0dsyjvfg9dd78nmfkagfkh8" } }, { @@ -92627,6 +93668,30 @@ } }, { + "ename": "outline-indent", + "commit": "330f86638778f4f104808bddc3e4d09d2ab18372", + "sha256": "1lfz87hhfqrva2g4hbsc9n8783zbvq6m1w6jf6ll9wi3v32lva0z", + "fetcher": "github", + "repo": "jamescherti/outline-indent.el", + "unstable": { + "version": [ + 20240817, + 1840 + ], + "commit": "4cc2a57e1125104cd94430524d3b4e2b4701d78b", + "sha256": "17a2qgda5nv650hx9rf8zfj264aqnb1k3x80lgn7ks98pwjdgrh4" + }, + "stable": { + "version": [ + 1, + 0, + 5 + ], + "commit": "69de157db109b9af94241f6b15c67d834e944361", + "sha256": "1mnkspl01hqsb5x5z2frhvk632l63c27h8g8bdrlapf7h7r4h7kd" + } + }, + { "ename": "outline-magic", "commit": "a98ad2ef680eef541ee82e8a65ed73e524df98a1", "sha256": "085yayzph3y7fh6pd5sdjdkhdcvwfzcyqd6y3xlbz7wni5ac6b5f", @@ -92649,26 +93714,26 @@ "repo": "tarsius/outline-minor-faces", "unstable": { "version": [ - 20240415, - 1547 + 20240809, + 2322 ], "deps": [ "compat" ], - "commit": "9f5c75e996388ead3472cd0dce8e9fc00407e210", - "sha256": "11jn4y2pa5v6bkijaf0d6ahg9zbz4mn11v9g1j46ldjwg3c7mbsf" + "commit": "5f227d165ca002d692fa80a71e727956b59568b6", + "sha256": "05gf4wvs3q0spjb5mw0dgqy234zgfc50s4z239d35r4nkal9ckwy" }, "stable": { "version": [ 1, 0, - 0 + 2 ], "deps": [ "compat" ], - "commit": "57c4a0fac36a26cfa8d1296e76afbcf7a5b87a57", - "sha256": "1pavzlb48a7062mrv9ldfwh1fl7pbhwy1i4j24lgmynbnv1kk96n" + "commit": "8884f1bc4c3f6fa4d40dd1ba728e84c8312391d6", + "sha256": "1g0l7c06gjb799h5whvh6y4wdalxs1261k7i8nhsacjjii1xzwwg" } }, { @@ -93357,11 +94422,11 @@ "repo": "DamienCassou/ox-linuxmag-fr", "unstable": { "version": [ - 20240326, - 722 + 20240624, + 1829 ], - "commit": "893a401db7d3b93e977b3c2608169dbb6e3fbdce", - "sha256": "1fh36w8iyrh5pqrfrcrh0f6clrmin5vg7r7hcg70z8s6w08ylzfy" + "commit": "3319c309f6fb0b0771363bec80557bc387243a82", + "sha256": "0iq63n4r78s4v75iadaqk06m37pg3allzrrdz2r1x3pm3br24nz0" }, "stable": { "version": [ @@ -93452,16 +94517,16 @@ "repo": "emacsorphanage/ox-pandoc", "unstable": { "version": [ - 20231222, - 1103 + 20240710, + 1424 ], "deps": [ "dash", "ht", "org" ], - "commit": "399d787b6e2124bd782615338b845c3724a47718", - "sha256": "0267m5n08w3h0zpniiwp4ngpmxkjwzndl9kg88k0cknkbqhg27ps" + "commit": "34e6ea97b586e20529d07158a73af3cf33cdd1d5", + "sha256": "0s4d639vfvqb6spnr3b0isrspbl876h22977pkb943ygd93bzx4p" }, "stable": { "version": [ @@ -93478,24 +94543,6 @@ } }, { - "ename": "ox-pukiwiki", - "commit": "cd4043336e54c6ae3976068a1af5cfe58713e408", - "sha256": "10sfbri5hv5hyx9jc1bzlk4qmzfmpfgfy8wkjkpv7lv2x0axqd8a", - "fetcher": "github", - "repo": "yashi/org-pukiwiki", - "unstable": { - "version": [ - 20150124, - 1716 - ], - "deps": [ - "org" - ], - "commit": "b53920abf698fa6682623d671108393e92c68bd7", - "sha256": "031xl8wry4frbc3d5d0nq7bca6y4plij9v8v8p8rg5ms3sh2fhjq" - } - }, - { "ename": "ox-qmd", "commit": "e71826e8a8c30b0eb535cce7a379740011b79534", "sha256": "1i2kdpp6prgphc1l42nz7q6vdfsbcn2vvlf10s7dfhhr8jzcyyy7", @@ -93951,11 +94998,11 @@ "repo": "phillord/pabbrev", "unstable": { "version": [ - 20240216, - 439 + 20240617, + 1622 ], - "commit": "bf8a498f2ddd268981d43fb71cf98aa2e4be3942", - "sha256": "1ilj6zm85hq95xlnx6b7sbzxdrkk5pdbcnd26igmy6z0z3br2kl3" + "commit": "d5f120c523ddce2e8dea1868150248cd188d8ad8", + "sha256": "1givc7d5wvq1chfbi2rdkwn36jfvdm930qzy5gzyav1ywdcm5sis" }, "stable": { "version": [ @@ -94066,14 +95113,14 @@ "repo": "melpa/package-build", "unstable": { "version": [ - 20240415, - 1547 + 20240718, + 1333 ], "deps": [ "compat" ], - "commit": "d9ce37b82529827ce720ad3ccf4af887d19fcfb0", - "sha256": "1hnv0yjc0yyjcp369z9nlvyxiqmzs0zqz5g6ly9cc3g43bjfavbj" + "commit": "6148407e9dfa6c92e067bcda86b25d15e3cbe8d3", + "sha256": "0zhbabja8rzqbnj9xbzg0xdvpndscxg1jd83y3gi72f85ajadys7" }, "stable": { "version": [ @@ -94204,36 +95251,6 @@ } }, { - "ename": "packed", - "commit": "f7cc44a1b339829cf7ee9b0cb4b2f113befd2c0d", - "sha256": "166s0kff4jn38xi1ygcalpqd90y124zscjvf5szqwxyjrrpqhdx8", - "fetcher": "github", - "repo": "emacsorphanage/packed", - "unstable": { - "version": [ - 20221130, - 2228 - ], - "deps": [ - "compat" - ], - "commit": "169064f7acfe198cc7dd43d02518b773691e1314", - "sha256": "1y3dbyaxr5smw9zxvy0cgfcg1i3ciq7r40njf8dkra4080ibxdnx" - }, - "stable": { - "version": [ - 3, - 1, - 0 - ], - "deps": [ - "compat" - ], - "commit": "c0d075fa02424b39bd5a3492167f914b8522f686", - "sha256": "0i2j5yk6xhv4rh3317f241y9llwf4wk18a6a4lkqrvbjpvi9yvn0" - } - }, - { "ename": "pacmacs", "commit": "52ce427e046267655dd9f836e57176d59f23e601", "sha256": "0w0r6z365jrglpbifb94w6c22wqi9x93qgkss9pn820hrndqbqxy", @@ -94416,11 +95433,19 @@ "repo": "danielsz/Palimpsest", "unstable": { "version": [ - 20200804, - 2308 + 20200805, + 1048 + ], + "commit": "f474b3ad706373d9953abdc401d683a2a023d28e", + "sha256": "0wzxl1zcbm3svspjpjzvx92is1k9sz7g0a99r8q066j2364la0zh" + }, + "stable": { + "version": [ + 1, + 1 ], - "commit": "5310c4a026954254ab82e5f3fe9f98dde2bb5c8b", - "sha256": "191d4x7fk5kl30fcgzfm6xn4mwxfpx65p5811ybyxci3rddd8al6" + "commit": "f474b3ad706373d9953abdc401d683a2a023d28e", + "sha256": "0wzxl1zcbm3svspjpjzvx92is1k9sz7g0a99r8q066j2364la0zh" } }, { @@ -94513,15 +95538,15 @@ "repo": "joostkremers/pandoc-mode", "unstable": { "version": [ - 20240311, - 2218 + 20240602, + 1006 ], "deps": [ "dash", "hydra" ], - "commit": "c7fa568ab9cfbb2abfb9b22f419d28ce570d7b22", - "sha256": "00l4vh8mx899k330fvkplz77rg502j406gjc3v2nyakfmf67h85h" + "commit": "18214fc2df357b50e62c79993aac4ff0cf1d9499", + "sha256": "01rpbvxpdmqrrdy6h3m86xng6vmnlavbhrl9p9ydg2x00iv8l09a" }, "stable": { "version": [ @@ -94682,11 +95707,11 @@ "url": "https://mumble.net/~campbell/git/paredit.git", "unstable": { "version": [ - 20221127, - 1452 + 20230718, + 2027 ], - "commit": "d700549d8aad684f1fabcfff565a9ad8b468199b", - "sha256": "0lx0l07psdm4dypvfadgdsx2wsjd7xpsdlagfbr7jr2nbgjkxzy7" + "commit": "037b9b8acbca75151f133b6c0f7f3ff97d9042e5", + "sha256": "0s3ia5yrhcl0wr4y7v70a68bhsvgkkfm3wvm3kmj37i84bb0nlrc" }, "stable": { "version": [ @@ -94766,26 +95791,26 @@ "repo": "tarsius/paren-face", "unstable": { "version": [ - 20240415, - 1547 + 20240805, + 1433 ], "deps": [ "compat" ], - "commit": "0cad6a4657ebfcdd2902746b99f01fea7cc05bd7", - "sha256": "17r70dwlg23kpv2dx4j7bs3pshisgz1j8k70vv3izyq0qg0n6vlp" + "commit": "9d369e6da2638702ce617a4ae4cf8d05cdc50d0b", + "sha256": "1zj99wz8649ixxvz3d0qg1sbi2sb54g42qwgi0ngqzr6qzdc03wa" }, "stable": { "version": [ 1, 1, - 0 + 2 ], "deps": [ "compat" ], - "commit": "8b575bc215e715525644ed66152a9bcefde3bd08", - "sha256": "0ma2sxhds4b73zap8kyphbng7a77fsbwrzlybar11if4asd1dfba" + "commit": "9d369e6da2638702ce617a4ae4cf8d05cdc50d0b", + "sha256": "1zj99wz8649ixxvz3d0qg1sbi2sb54g42qwgi0ngqzr6qzdc03wa" } }, { @@ -94820,26 +95845,26 @@ "repo": "justinbarclay/parinfer-rust-mode", "unstable": { "version": [ - 20240506, - 816 + 20240726, + 1640 ], "deps": [ "track-changes" ], - "commit": "d3bfb2745cc0858e2741dc2a2f00a86f456656ec", - "sha256": "0q60hj9300wiz1kr5x1r3zqhfk97ndyzj2ks49y1r5klmp9w5l9a" + "commit": "0d16bd75ad36d881194b58c572562023aa04eb58", + "sha256": "1z6ghxbib7lx1iliv3zcn85frav1aay9nn8mf7c1akz49mm295q9" }, "stable": { "version": [ 0, 9, - 0 + 2 ], "deps": [ "track-changes" ], - "commit": "d3bfb2745cc0858e2741dc2a2f00a86f456656ec", - "sha256": "0q60hj9300wiz1kr5x1r3zqhfk97ndyzj2ks49y1r5klmp9w5l9a" + "commit": "a96c768e9dc4427c9ea18812a2f09e209a5e1a5e", + "sha256": "17kkyqkn0r3s2rbgc6v5jygrq5bm5jcw54byjfkhnif90zvdch0n" } }, { @@ -95069,36 +96094,6 @@ } }, { - "ename": "passmm", - "commit": "1ae754064cd1f062bbdd6ecf9af03fa0c2798cf6", - "sha256": "17rd9pgi9p9w9m9grpnhn1d4mrx3bfrzl04z37mf4gd8qzzzqvqs", - "fetcher": "github", - "repo": "pjones/passmm", - "unstable": { - "version": [ - 20221204, - 1927 - ], - "deps": [ - "password-store" - ], - "commit": "66691e301dff476eaff7c6e817ed9df96d4404c8", - "sha256": "1rk0yrjdkhvqms137rlfryfmlyzkavs2m5qmdx644l7w4v86jd2n" - }, - "stable": { - "version": [ - 1, - 0, - 0 - ], - "deps": [ - "password-store" - ], - "commit": "66691e301dff476eaff7c6e817ed9df96d4404c8", - "sha256": "1rk0yrjdkhvqms137rlfryfmlyzkavs2m5qmdx644l7w4v86jd2n" - } - }, - { "ename": "password-generator", "commit": "fd591276073bf87fd9debdffc396f650790d566a", "sha256": "0kb424axcik38a9zn2a6mabs3ya6bs8zh06d26jzyaa4d2q75246", @@ -95531,21 +96526,6 @@ } }, { - "ename": "pcmpl-git", - "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", - "sha256": "078ajwsalirr9xkqfbbbmc5z3fdh9n5jckc6z7r90g899cxwcyzz", - "fetcher": "github", - "repo": "leoliu/pcmpl-git-el", - "unstable": { - "version": [ - 20170121, - 59 - ], - "commit": "9472ac70baeda025ef7becd1cf141d72aec93f32", - "sha256": "17y3rdp7fgyg4i9hwyzgpv1d19i5c6rqdf1gm5bdm2csk12vfg9n" - } - }, - { "ename": "pcmpl-homebrew", "commit": "cdd1f8002636bf02c7a3d3d0a075758972eaf228", "sha256": "100a64d8qvxdz1lk42pidj48iqsycyyw92jjqcrn8rnqw1rnb3s7", @@ -95617,10 +96597,10 @@ "repo": "joddie/pcre2el", "unstable": { "version": [ - 20240220, - 1530 + 20240629, + 2322 ], - "commit": "380723b2701cceb75c266440fb8db918f3340d50", + "commit": "b4d846d80dddb313042131cf2b8fbf647567e000", "sha256": "0h73d9f1zj74vjir2kiq4s2g5rai7b59z7da20kh862xnldfcxsx" }, "stable": { @@ -95954,11 +96934,11 @@ "repo": "mpwang/perfect-margin", "unstable": { "version": [ - 20240512, - 1120 + 20240731, + 1133 ], - "commit": "d2973b0dc44b086353a2920a66fec0fcc1b3b60a", - "sha256": "15m60851pzfm4kiql0w1l7h8y5cyhcxmfzan86wswcxhssyi7673" + "commit": "3281c5648d854f77450c1268dbb31f5a872900a5", + "sha256": "12zgzysljlq1vrl1c0s4bab5qf3ly257scby3fs56vnr4szhwla4" } }, { @@ -96003,19 +96983,19 @@ "repo": "bram85/emacs-persist-state", "unstable": { "version": [ - 20230728, - 714 + 20240720, + 1725 ], - "commit": "0b0dd8dca90414db3395860c2bf32a4c736acfb4", - "sha256": "0ib6racii2wrpf9j63bi29r2y54dy7hhwj40ys74isiysk2r8x07" + "commit": "99e22bd6dd7b768c617596da952a5b8e53d16ecb", + "sha256": "1lg1myxb5pqf9m19kza2iwbcdcdghkrcb7fbgk7jghn2ag0naasf" }, "stable": { "version": [ 0, - 3 + 4 ], - "commit": "d57cc443cc0fd9f8a7418045be2387ee72955bd4", - "sha256": "16qph2j5gwn9d43sig22g604gmpk55sh0v2i4aqvzkn1cl3188br" + "commit": "99e22bd6dd7b768c617596da952a5b8e53d16ecb", + "sha256": "1lg1myxb5pqf9m19kza2iwbcdcdghkrcb7fbgk7jghn2ag0naasf" } }, { @@ -96129,20 +97109,20 @@ "repo": "Bad-ptr/persp-mode.el", "unstable": { "version": [ - 20231010, - 1804 + 20240730, + 1353 ], - "commit": "345baaa520ab2d62205f85cc5f29d57d6063c141", - "sha256": "0y29vyvqdfxcpmzkyv2c6msbshx2f680izk2r0djrqj08ii8zmpr" + "commit": "40e9993a9711cba5fb56dfec81a507fabeba9668", + "sha256": "0fi07h5q0srjasjxn7rzzd8zahl15agspm6q9hs2rzd0m8x3zp52" }, "stable": { "version": [ - 2, - 9, + 3, + 0, 8 ], - "commit": "391a7dc248c9c04b7ad424c696bdff578e14dd2c", - "sha256": "0b4y7a6j70s9lvr37riyy9k5kh3yvmx0m6nd9c0c8572ji4ij65g" + "commit": "345baaa520ab2d62205f85cc5f29d57d6063c141", + "sha256": "0y29vyvqdfxcpmzkyv2c6msbshx2f680izk2r0djrqj08ii8zmpr" } }, { @@ -96356,21 +97336,21 @@ "repo": "wyuenho/emacs-pet", "unstable": { "version": [ - 20230906, - 46 + 20240715, + 1616 ], "deps": [ "f", "map", "seq" ], - "commit": "acd54c5b0171a82f88988b4fe2e6db112df5bf9a", - "sha256": "128mxbfzc42kmymbn7vwi4xvj6hzg8klv6iq212c47mzrgg8ycds" + "commit": "e5e3f9f0326ea1cc6edef017f0ee34cc42754b08", + "sha256": "1xdlqsybzhjfbi8icp22438pc51ybxnxg11ixpvhbr4c8jdwiwva" }, "stable": { "version": [ - 2, - 0, + 3, + 1, 0 ], "deps": [ @@ -96378,8 +97358,8 @@ "map", "seq" ], - "commit": "acd54c5b0171a82f88988b4fe2e6db112df5bf9a", - "sha256": "128mxbfzc42kmymbn7vwi4xvj6hzg8klv6iq212c47mzrgg8ycds" + "commit": "2041ba1caee94242362c955e697a3c03bfbc0402", + "sha256": "18mz7nhsii9l1iqa9yk97xbf6dn4mladwrnl5w7ksa2zcpcpph61" } }, { @@ -96414,25 +97394,25 @@ "repo": "emarsden/pg-el", "unstable": { "version": [ - 20240520, - 1322 + 20240814, + 1214 ], "deps": [ "peg" ], - "commit": "0f20a0051ab898ea53903284c47a4703555380ca", - "sha256": "0ynv154yhb878aqcjg1fv7zfvfrp839n8ys4wqp7gqhdqdwrf68h" + "commit": "93e3fe31c0cd5d31a046fa7c4feb4e3371ac4a8a", + "sha256": "1pc3j0yqgiskr8hk3jagwsp8hc88qics9wh72q1iw8sjn2yalrgy" }, "stable": { "version": [ 0, - 34 + 39 ], "deps": [ "peg" ], - "commit": "0f20a0051ab898ea53903284c47a4703555380ca", - "sha256": "0ynv154yhb878aqcjg1fv7zfvfrp839n8ys4wqp7gqhdqdwrf68h" + "commit": "69ca40a4206eff0b1c40e423ea8b815fdbcd438d", + "sha256": "1b5dg04pd5s5pq71yc3isl312y1fw88pjvnk8bgjc1f06xhjlrj4" } }, { @@ -96741,26 +97721,26 @@ "repo": "OVYA/php-cs-fixer", "unstable": { "version": [ - 20220516, - 1008 + 20240814, + 2249 ], "deps": [ "cl-lib" ], - "commit": "efe4368d891f1eec6311363cfd6be3e9eadb5e0a", - "sha256": "1j0ivk4d8xd2r9ssdn9y4xl3lr2isg4sks5va7wjvk6h7jnf81bj" + "commit": "e9db0576da25f8ebbae87cb2677ab8f694e14a61", + "sha256": "0b4f232msh0b1mspl8x7m6hr3cdijhx0am33qxab7538vqiyy8lz" }, "stable": { "version": [ 2, 0, - 0 + 1 ], "deps": [ "cl-lib" ], - "commit": "efe4368d891f1eec6311363cfd6be3e9eadb5e0a", - "sha256": "1j0ivk4d8xd2r9ssdn9y4xl3lr2isg4sks5va7wjvk6h7jnf81bj" + "commit": "e9db0576da25f8ebbae87cb2677ab8f694e14a61", + "sha256": "0b4f232msh0b1mspl8x7m6hr3cdijhx0am33qxab7538vqiyy8lz" } }, { @@ -96786,11 +97766,11 @@ "repo": "emacs-php/php-mode", "unstable": { "version": [ - 20240118, - 1458 + 20240621, + 742 ], - "commit": "f0a14387427244251883889ba616c7f042323f6d", - "sha256": "1r3vgzfrq87ffp7g0xx44iwjpakcp23fhd5cxbbnwvia0y49vv8l" + "commit": "4792988a120d6ac515ba16605278d04cb8be0d69", + "sha256": "0w9amslw2hpf0znfmn4cki3c6xqxjs11mayvzqiycfc6pabw4hzq" }, "stable": { "version": [ @@ -96898,8 +97878,8 @@ "repo": "emacs-php/phpactor.el", "unstable": { "version": [ - 20240407, - 1500 + 20240527, + 459 ], "deps": [ "async", @@ -96907,8 +97887,8 @@ "f", "php-runtime" ], - "commit": "1916e35e08d746a6ff8a2cd88ae43bdb6842feab", - "sha256": "0c9diqgy8v0bcx5011z2sd0q7s2xn2f4y7mpgv0x5fi0qh2a1mw1" + "commit": "6b5269ff82785a9bd1e648b2f91e5128353d5a67", + "sha256": "0ygnl1xpms8cnp5s7i9ng99azyzg0k3h830mazkhhpwlqhkjffyl" }, "stable": { "version": [ @@ -96932,16 +97912,16 @@ "repo": "emacs-php/phpstan.el", "unstable": { "version": [ - 20230417, - 1142 + 20240527, + 2142 ], "deps": [ "compat", "php-mode", "php-runtime" ], - "commit": "2dc25cb2f3d83484ea0eb063c9ffca8148828a2b", - "sha256": "0drsp230nxs336zzfy8gjr7r3p7m8w9rp4ih1zjwarzl1svpp7yp" + "commit": "6f1c7bb357b1eb90b10a081f1831c1c548c40456", + "sha256": "1hnnhbma3mgbralp1f5c1gvm9pfswzf5xzi2nr22rs5d9r0zk2fj" }, "stable": { "version": [ @@ -97303,11 +98283,11 @@ "repo": "Anoncheg1/pinyin-isearch", "unstable": { "version": [ - 20240224, - 709 + 20240328, + 2110 ], - "commit": "bb956213c6ccd3067d5e3c33d7695bdc5ba58133", - "sha256": "1yphxa4f7q2rlrgk3l9dr6yx2fha474phiz04cz863aqylwcxfw4" + "commit": "bc69e38e25e623a321c5c37959fb175334cf9e1a", + "sha256": "0vmsl4b8hv9hdass8w4j7gyrhp9acrnyyc30hqfflsb61p69h770" }, "stable": { "version": [ @@ -97393,14 +98373,14 @@ "repo": "Wilfred/pip-requirements.el", "unstable": { "version": [ - 20181027, - 1629 + 20240621, + 2151 ], "deps": [ "dash" ], - "commit": "216cd1690f80cc965d4ae47b8753fc185f778ff6", - "sha256": "0da3q0n5nn0l96kk49kanw5knx3jmga439zbmiii76na16bg5y3i" + "commit": "31e0dc62abb2d88fa765e0ea88b919d756cc0e4f", + "sha256": "08q225h8kahh632qkzpb1ih3jqg5imlzgrrh8ynkyxrr710madkl" }, "stable": { "version": [ @@ -97581,11 +98561,11 @@ "repo": "juergenhoetzel/pkgbuild-mode", "unstable": { "version": [ - 20220802, - 1951 + 20240531, + 1602 ], - "commit": "9525be8ecbd3a0d0bc7cc27e6d0f403e111aa067", - "sha256": "03rhhmwwigvych4qfn0hly0z2hihs57yjapvfinbkrmw8ajgnl01" + "commit": "8ef396d8fa9187b65c065a6bc2ca15dfaf3255df", + "sha256": "1p5xgq0mnyqxjmapki60xv1jns0pxszd04r0c1kdyk1bcdcpjm93" }, "stable": { "version": [ @@ -98115,8 +99095,8 @@ "repo": "alphapapa/pocket-lib.el", "unstable": { "version": [ - 20240407, - 2247 + 20240713, + 1529 ], "deps": [ "dash", @@ -98124,8 +99104,8 @@ "plz", "s" ], - "commit": "b13c899223a15481738c3105f07ee2205dcc937c", - "sha256": "0b5451fwsjqb603mmgw6kpd8w4gvndg3fxbdb44ib2245ynr5mms" + "commit": "f05f80645d8101518eed13b2da81400fe9b50918", + "sha256": "141zrc4w1np3a4j5xb0q1fw4xygjj0qg3bgsmrk0mmbdhk3hj6f4" }, "stable": { "version": [ @@ -98406,23 +99386,24 @@ "repo": "mavit/poly-ansible", "unstable": { "version": [ - 20240520, - 1500 + 20240803, + 1612 ], "deps": [ "ansible", "ansible-doc", "jinja2-mode", "polymode", + "systemd", "yaml-mode" ], - "commit": "187ad18b7c03eb2b286b4d49eb36572bb7847d57", - "sha256": "0980z444419pk7xgic6g5vvi30yibxfimd0rp0zznrshmc9xxra8" + "commit": "6fcfbb7163f7a74db9da0d54a5ecaec2ac93b315", + "sha256": "17c0c2gsxw892hq1acxsvl3i1cgpwfkk76hszcr9ydw566478972" }, "stable": { "version": [ 0, - 4, + 5, 1 ], "deps": [ @@ -98430,10 +99411,11 @@ "ansible-doc", "jinja2-mode", "polymode", + "systemd", "yaml-mode" ], - "commit": "187ad18b7c03eb2b286b4d49eb36572bb7847d57", - "sha256": "0980z444419pk7xgic6g5vvi30yibxfimd0rp0zznrshmc9xxra8" + "commit": "6fcfbb7163f7a74db9da0d54a5ecaec2ac93b315", + "sha256": "17c0c2gsxw892hq1acxsvl3i1cgpwfkk76hszcr9ydw566478972" } }, { @@ -98467,6 +99449,25 @@ } }, { + "ename": "poly-gams", + "commit": "b9c2722629821642466fd0c29a5bea150b953793", + "sha256": "0fp9kwg6x97m277hq4haqi3qy894r59zbxv202dzvp8dgpd13g2b", + "fetcher": "github", + "repo": "ShiroTakeda/poly-gams", + "unstable": { + "version": [ + 20240812, + 1540 + ], + "deps": [ + "gams-mode", + "polymode" + ], + "commit": "e3abb2a195077750c89146900607894ed6239cb4", + "sha256": "0bvjj2zdryxsacz8xmbi65psky3x0ni60pdigjwirl96kbyrb22m" + } + }, + { "ename": "poly-markdown", "commit": "3058351c4500fdcbe7f40b4c96ac8d6de9bbeb1d", "sha256": "0pxai5x2vz6j742s3bpcy82dxja6441fsgclhz1hbv2ykazbm141", @@ -98720,15 +99721,15 @@ "repo": "TatriX/pomidor", "unstable": { "version": [ - 20220714, - 1932 + 20240601, + 1617 ], "deps": [ "alert", "dash" ], - "commit": "394a52f95587b1d10d0c3bdca503d2cc876db35b", - "sha256": "1y64xs74p39rr1d4i1s0zjhqlcips9k11fr8z6wy1j7s9b142570" + "commit": "de71c34a1a9aff745181107094d3389816dbeca5", + "sha256": "00jh2hww8xpvnj9hqlgfg9rgqspwpp6nsqzjdsny96dps8myki1s" } }, { @@ -98739,16 +99740,16 @@ "repo": "SqrtMinusOne/pomm.el", "unstable": { "version": [ - 20240130, - 2126 + 20240709, + 2156 ], "deps": [ "alert", "seq", "transient" ], - "commit": "a95343f643b5674ad7714dc62f8436ba87ad8335", - "sha256": "08g28lx8rqvcff7dhcgrxavx59hx507gn6flsx39v0b865i52bmv" + "commit": "ba0b30888614a8dc932bd0ab198e08f78950c0e1", + "sha256": "1zd351gx3k31vmrs4g4q8fcqdwxp8zlqch40z4vhqy80alzlg88g" }, "stable": { "version": [ @@ -99177,8 +100178,8 @@ 4, 7 ], - "commit": "90a9babc829b298af36be695009894fc00a97935", - "sha256": "1k6r59jhbyiknhsl7df0zafyc4d9r3vk953x6sdxgz92kx6hxpfy" + "commit": "4889e08cf9077c8589ea6fea4e2ce558614dfcde", + "sha256": "0wnmh9a9ks0pmcjy9df5higfbz9gy1ydj4n8s84hkhd4wq4fndvv" } }, { @@ -99189,11 +100190,11 @@ "repo": "tumashu/posframe", "unstable": { "version": [ - 20240507, - 148 + 20240703, + 359 ], - "commit": "f4e9e509ba96ceb3c2b2b054957291607fb52651", - "sha256": "0hz7jgpsg3adgwg2qqgd9vy1mhbkr3c9rsy0zx5kmn42npdcf4az" + "commit": "493b17f74ad41104d0c4d648e8c96dc495279ac8", + "sha256": "1yjpkx5h8wm5hs448hri8zvhzq44g4qgb5g1ji6yj99x8vdpf5al" }, "stable": { "version": [ @@ -99500,15 +100501,15 @@ "repo": "LaurenceWarne/prefab.el", "unstable": { "version": [ - 20220828, - 2015 + 20240720, + 1858 ], "deps": [ "f", "transient" ], - "commit": "328c763d67cd53875d729af0bcb89d412455cf60", - "sha256": "16kz5yvqbzdyxcwsic9sdjckgyb74cfb96f2kgp6zpf7k5bbx7ry" + "commit": "51da6c214f095a44f3d2223bcf079a3073923115", + "sha256": "0jns5xlrhhhpmy918l4w0z9qax34244qxcccr269lmfk6385hd19" }, "stable": { "version": [ @@ -99547,19 +100548,20 @@ "repo": "radian-software/prescient.el", "unstable": { "version": [ - 20240226, - 204 + 20240803, + 2320 ], - "commit": "c39bf07c56b427bf41aafd7d20eaef5cf3c312b5", - "sha256": "0pfc0ycp4cr9zwkjv3rqfkwkx8p52ad7aq2c60j0qwp3yd0cghc4" + "commit": "2b8a8b41228bddb2e11eb1c200e98a9edd04797c", + "sha256": "0qz3xv38vazxqsl7lan7fshj3gmb0qagkrvl5xzwqhdg0rir981j" }, "stable": { "version": [ 6, - 3 + 3, + 1 ], - "commit": "c39bf07c56b427bf41aafd7d20eaef5cf3c312b5", - "sha256": "0pfc0ycp4cr9zwkjv3rqfkwkx8p52ad7aq2c60j0qwp3yd0cghc4" + "commit": "2b8a8b41228bddb2e11eb1c200e98a9edd04797c", + "sha256": "0qz3xv38vazxqsl7lan7fshj3gmb0qagkrvl5xzwqhdg0rir981j" } }, { @@ -99615,16 +100617,16 @@ "repo": "jscheid/prettier.el", "unstable": { "version": [ - 20231002, - 1153 + 20240601, + 1316 ], "deps": [ "editorconfig", "iter2", "nvm" ], - "commit": "d6d7a6ac9e8a08ab497d2cf4d7e2317f6b93dfbf", - "sha256": "0612snvsf6y0g6qfirjvnxk0labnm35wgbxvidyy0rzsasfszl9l" + "commit": "53327f039f2d4f3fd1eabece190857059b3765b5", + "sha256": "09rxd93pg9lx2gidyy1bb91hfla3df29y7hl2p1l4pwbf1rgmim1" }, "stable": { "version": [ @@ -99851,26 +100853,28 @@ "repo": "alphapapa/prism.el", "unstable": { "version": [ - 20230524, - 1130 + 20240807, + 147 ], "deps": [ + "compat", "dash" ], - "commit": "169b49afa91e69d35b8756df49ed3ca06f418d35", - "sha256": "0n2gf7302hqdnhsax1y3ahksfmmpd8cmiv1zgb7rjg8qhcs0iqp2" + "commit": "25df8494ee92c65bf66194e0e2663de487f9296b", + "sha256": "0xy8xpwnskk5w9wgw2qlxcqxb360qq5ilib827h480xyf6qkkcri" }, "stable": { "version": [ 0, 3, - 2 + 5 ], "deps": [ + "compat", "dash" ], - "commit": "169b49afa91e69d35b8756df49ed3ca06f418d35", - "sha256": "0n2gf7302hqdnhsax1y3ahksfmmpd8cmiv1zgb7rjg8qhcs0iqp2" + "commit": "3a61852dd01c738dc18b88a7be524db67a2d5520", + "sha256": "1p4vqyc4jm0pg4999i0k04pl0sa9nhrczxf4bng4id1r19sxm6dh" } }, { @@ -100190,20 +101194,20 @@ "repo": "jabbo/project-butler", "unstable": { "version": [ - 20240520, - 943 + 20240718, + 1920 ], - "commit": "1cf28f5e5e584bac2411662405c96f13d43179f9", - "sha256": "129m9mhpfsghk5gwvqjn7zblncj3wd2n3b46mcj0j20qqbkmbblr" + "commit": "7a20dd1e0672942ba971978baffa063b399151ef", + "sha256": "1a4d0m6gri04njm70xyc64nk8ypcvbywdhxpvvwa13sbaqq8af3p" }, "stable": { "version": [ 0, - 3, + 4, 0 ], - "commit": "1cf28f5e5e584bac2411662405c96f13d43179f9", - "sha256": "129m9mhpfsghk5gwvqjn7zblncj3wd2n3b46mcj0j20qqbkmbblr" + "commit": "7a20dd1e0672942ba971978baffa063b399151ef", + "sha256": "1a4d0m6gri04njm70xyc64nk8ypcvbywdhxpvvwa13sbaqq8af3p" } }, { @@ -100413,11 +101417,11 @@ "repo": "bbatsov/projectile", "unstable": { "version": [ - 20240212, - 1100 + 20240814, + 1854 ], - "commit": "0163b335a18af0f077a474d4dc6b36e22b5e3274", - "sha256": "0sy187ryln3jjnkwjxphdnfa20isv570js8ch3r3zrjl6c6d9xl8" + "commit": "01fb6a5ef023bcfc52b209586dcb4fd13db00218", + "sha256": "1frg36xicvivhlp3b4m86hg7gsg5b04lkkfymb18d1yzcwc40xwk" }, "stable": { "version": [ @@ -100678,8 +101682,8 @@ "repo": "mohkale/projection", "unstable": { "version": [ - 20240517, - 2023 + 20240803, + 1636 ], "deps": [ "compat", @@ -100687,8 +101691,8 @@ "project", "s" ], - "commit": "c6df3b19204113642ee14a87598d65c03688f0fa", - "sha256": "1f78nq135waqgkr5z9m5gxhplb2spbkap0diykb6h9j8l6g8xij7" + "commit": "1ed2ff94ffbf5b619e34e02baca324a580751723", + "sha256": "0s8vp39y8kpavx2m7b92mz8p8fsmy7rhh3zbf4k5zha7chv6wjmy" } }, { @@ -100718,15 +101722,15 @@ "repo": "mohkale/projection", "unstable": { "version": [ - 20240517, - 2021 + 20240803, + 1509 ], "deps": [ "compile-multi", "projection" ], - "commit": "68f2387219f2627506f5e345e9be04bd11aa0e65", - "sha256": "0785a47xirwk7q2159gmlibg3rkl54z211xykr0bld2jj73g0jyc" + "commit": "719be9e5cda7324eed0a82ce14a92f88c8608080", + "sha256": "0jjpx3ckm99yn4izn922dcpc42zfs5p5ji2b2qaxl6mnzrg86mpg" } }, { @@ -100737,15 +101741,15 @@ "repo": "mohkale/projection", "unstable": { "version": [ - 20231008, - 937 + 20240803, + 1509 ], "deps": [ "compile-multi-embark", "projection" ], - "commit": "928602ddd3003913cfefe343b5f057bfa360c0fe", - "sha256": "08p8igrlbzvw6h8j066nh7yvxgqzi9csjzbjhv34csasfd14mznx" + "commit": "719be9e5cda7324eed0a82ce14a92f88c8608080", + "sha256": "0jjpx3ckm99yn4izn922dcpc42zfs5p5ji2b2qaxl6mnzrg86mpg" } }, { @@ -100912,11 +101916,11 @@ "repo": "ProofGeneral/PG", "unstable": { "version": [ - 20240513, - 720 + 20240708, + 1525 ], - "commit": "55e133360c1b66b834f9ae2c4478d2c81b2d33ef", - "sha256": "00r3zyrc08j5a5np0xc6jkzvlpjxnax7dg2br8h85hk3fml2gihf" + "commit": "eca47ea8afdfcd94b4c8d88ee640f6631cfe5c5d", + "sha256": "1vr8k4s7dk5y5c7rmnparrigsih6cz9w01d8z1gmfp55adhyjvli" }, "stable": { "version": [ @@ -101024,11 +102028,11 @@ }, "stable": { "version": [ - 26, - 1 + 27, + 3 ], - "commit": "2434ef2adf0c74149b9d547ac5fb545a1ff8b6b5", - "sha256": "1n7w40wypayplykxhknm6sljzbfbm64mg1zysrjidac3hwqkxh7n" + "commit": "7cc670c1809e704ebeba90fb430d50e009f36727", + "sha256": "14aywn2llf3vg7qp57n085183rl06d8dyg7d4xawv7n0d0s536r5" } }, { @@ -101197,15 +102201,15 @@ "repo": "thierryvolpiatto/psession", "unstable": { "version": [ - 20240515, - 1449 + 20240612, + 1242 ], "deps": [ "async", "cl-lib" ], - "commit": "5a5b11df882339b4474ab0cc6dd847aaab6a84b6", - "sha256": "1cgx1k9vgq8avpjr1ig87wf6mv042504bf770x46dba3zswwy98z" + "commit": "cddba290ce39440a2e00bb92130030fe0f068f2c", + "sha256": "1z1kdgr3y5wgn8xqgr5ilpbzjqm54jz2icg34p6qc8d8s12chw8c" }, "stable": { "version": [ @@ -101577,6 +102581,21 @@ } }, { + "ename": "puppet-ts-mode", + "commit": "bf4dcc1a451a3bf5908f4a3b6f9636b4b958a804", + "sha256": "1ppzzbkvcq2wf725cb3cxl47q3i87x6d7ph2hngh29nw707nn8jv", + "fetcher": "github", + "repo": "smoeding/puppet-ts-mode", + "unstable": { + "version": [ + 20240626, + 646 + ], + "commit": "9622188612f3be347bd92f5a195999b36f95f988", + "sha256": "0jrrmd77i5md8psxq313i8amw2f8hmmh518f1bsajm4wg46pfh3c" + } + }, + { "ename": "purescript-mode", "commit": "55462ed7e9bf353f26c5315015436b2a1b37f9bc", "sha256": "1g30xbv3xvv52r873465a2lp6fnws9q8dz277697qm0mgxkpimbp", @@ -102399,16 +103418,16 @@ "repo": "wbolster/emacs-python-coverage", "unstable": { "version": [ - 20240509, - 856 + 20240703, + 917 ], "deps": [ "dash", "s", "xml+" ], - "commit": "7f130066460ab8a58c2667d9f76a3e2c168e0759", - "sha256": "0dxc09422nqpwdcvh90j41631198dxsxc6np1hhs5m6qf3fjsx1m" + "commit": "7077dabdee59efe1d7116149cdc0ef40e6816c2b", + "sha256": "0pf01b9xnzzibkbfx1l3i25ckljf73vr20fpnmfc9giaiz5lzl5l" } }, { @@ -102532,14 +103551,14 @@ "repo": "jdtsmith/python-mls", "unstable": { "version": [ - 20230920, - 1915 + 20240621, + 2114 ], "deps": [ "compat" ], - "commit": "821b93ff7c94a13090598c22fd92bd19b5ad951b", - "sha256": "1p9dcjz8hgjb8gz742pxqdrjh68mnyr2hssy6glhd2qb78d4927y" + "commit": "3ebacc6c46e9f7de25279783001ca3fc8964d7a8", + "sha256": "0qspqx1jlpcq64d5j05xfn6xdfnxixb654pczilxp6bqhyca8ln4" }, "stable": { "version": [ @@ -102562,11 +103581,11 @@ "repo": "python-mode-devs/python-mode", "unstable": { "version": [ - 20240520, - 1744 + 20240804, + 1207 ], - "commit": "5279a81ecaa9fc535915c58336c96baf3f2aa8b1", - "sha256": "0vhi7rlpd696244xl2kvlmqkq94cqwrhd6cvg8hfz6b4v1bbdf4r" + "commit": "6acfce561ed9b655c548d230eb990ad863a015ea", + "sha256": "1wyahxv1sckigwy4sd45lgpkdlhd0c90kwgffrl98xslh6ajlr3a" }, "stable": { "version": [ @@ -102586,17 +103605,16 @@ "repo": "wbolster/emacs-python-pytest", "unstable": { "version": [ - 20240416, - 1128 + 20240810, + 809 ], "deps": [ "dash", - "projectile", "s", "transient" ], - "commit": "9f850e22df93812a5b109968c549f9b3dd828ed1", - "sha256": "1f5b7ffcpmry2xiphclc4vv1zqva9rrhn08fgjq8qhdq3x0i5jah" + "commit": "bfcd28829076836904fed12a39c829970bcb6bb0", + "sha256": "07rrx6x8y58kah2h0imb4100qpwlmcnhsvm3dd49mbrs0827hddk" }, "stable": { "version": [ @@ -102728,6 +103746,21 @@ } }, { + "ename": "pythontest", + "commit": "cac44f0b664c362935aa1c6b6045a92721cda174", + "sha256": "0k2byrlr85phyy814dcd5fxpjs5pa716bd5w1kr50wfv58xayx4y", + "fetcher": "github", + "repo": "erickgnavar/pythontest.el", + "unstable": { + "version": [ + 20240813, + 1322 + ], + "commit": "4bb4f330c13ef82bb6e4a4b15c47cb3fede83523", + "sha256": "1ib8hlq2qhnvdi84qc03bl6la6h2xvz78qbzc8mj1lvgklk5zjap" + } + }, + { "ename": "pyvenv", "commit": "e37236b89b9705ba7a9d134b1fb2c3c003953a9b", "sha256": "0gai9idss1wvryxyqk3pv854mc2xg9hd0r55r2blql8n5rd2yv8v", @@ -103219,6 +104252,24 @@ } }, { + "ename": "qwen-chat-shell", + "commit": "c20f88160b4caeed30a78ecddd738f18acae39ae", + "sha256": "17c7bi0yvmpz23qpdhw78dy566b0f5jzr49k65jaxjrb0820g02c", + "fetcher": "github", + "repo": "Pavinberg/qwen-chat-shell", + "unstable": { + "version": [ + 20240612, + 343 + ], + "deps": [ + "shell-maker" + ], + "commit": "2d6562c8a75aebf7a59e554011571ba5883cf4fd", + "sha256": "1l43z5s3jfx6cxwf93yl6k9jpg7dlvlh3jmspa59jm5395cnvrh9" + } + }, + { "ename": "r-autoyas", "commit": "3a095d3a687055c6ac43a4338826542d14a25127", "sha256": "18zifadsgbwnga205jvpx61wa2dvjxmxs5v7cjqhny45a524nbv4", @@ -103289,11 +104340,11 @@ "repo": "greghendershott/racket-mode", "unstable": { "version": [ - 20240514, - 1524 + 20240813, + 1641 ], - "commit": "d2cff2b7f210846108875c7eccb1b5ab98bceb74", - "sha256": "0gxjm594k1i0xiavmk27z9mv9qh5q4k5h3ih198pm637k31ziviy" + "commit": "3cb49c513d56cc615e4b932bb08406dec93471a7", + "sha256": "0ynah71mr8b6d9fnffz5k8d33jfdw14py6i01yc88c2m925jbk0d" } }, { @@ -103718,20 +104769,20 @@ "repo": "ybiquitous/rbs-mode", "unstable": { "version": [ - 20210430, - 135 + 20240806, + 56 ], - "commit": "ad36bb138cec7396f029821d0cf755a8bc663260", - "sha256": "143wz47446dahp5zx9vvhjrqjadzgz4apzlvwhdbs7dgs8bgs7r7" + "commit": "d382032cb276d452fdd512c1f1f1b9f95153b356", + "sha256": "1ibn8246q0yqdnf3qdww9rvzac9gla7gzjj0n5j5x08brgj5ll2h" }, "stable": { "version": [ 0, 3, - 1 + 2 ], - "commit": "ad36bb138cec7396f029821d0cf755a8bc663260", - "sha256": "143wz47446dahp5zx9vvhjrqjadzgz4apzlvwhdbs7dgs8bgs7r7" + "commit": "d382032cb276d452fdd512c1f1f1b9f95153b356", + "sha256": "1ibn8246q0yqdnf3qdww9rvzac9gla7gzjj0n5j5x08brgj5ll2h" } }, { @@ -104022,6 +105073,30 @@ } }, { + "ename": "ready-player", + "commit": "f715bbd2109d4d283c5ed0e57e15a158d6919c05", + "sha256": "18yk9grj1ahnci21kph0541m4xpnh7ndi9gss6gxpkpqcad0nm41", + "fetcher": "github", + "repo": "xenodium/ready-player", + "unstable": { + "version": [ + 20240818, + 1104 + ], + "commit": "4da641ef345bf03ad4e2bd4c6b45d134ed96d08b", + "sha256": "0m19diwp2cr4r2n93dgyfv7yq3h0drv93vypyg34jlvj0bpskzsl" + }, + "stable": { + "version": [ + 0, + 4, + 4 + ], + "commit": "9fa93956e2fbe57856081f91a3635a21c3f03e8d", + "sha256": "011ikdx8gafdgyf1mxnv599fhdda49wgrkyag1l9qgyj0a9c4xnp" + } + }, + { "ename": "real-auto-save", "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", "sha256": "1n0hsms3g0z06b3i55gpp0xqxfychqscvfifpz4jmar87z7lvwp2", @@ -104513,11 +105588,11 @@ "repo": "ideasman42/emacs-recomplete", "unstable": { "version": [ - 20240422, - 15 + 20240616, + 2345 ], - "commit": "9b4ab842e37eed9b8314ba81b4eac49beeea8c1c", - "sha256": "1m9cz4g672wzsf2np7lzksgxl75bc790nq51gy97qrsjbwn6gj99" + "commit": "7a5c4c86cdbf8ba6b045d5ace466e5dcb2f10db0", + "sha256": "0j9ir47ny9m0kq4da7jvmv5qf282i0imm3xwfbjyxnhmmq5nj3zv" } }, { @@ -104628,14 +105703,14 @@ "repo": "minad/recursion-indicator", "unstable": { "version": [ - 20240122, - 2254 + 20240708, + 2119 ], "deps": [ "compat" ], - "commit": "548838df2ef15fdd8e9d904d0a74182297e3383f", - "sha256": "1m9fxl405yprz0id18g7192h8sp51j07n8lc41lb3yn8vwl13g0l" + "commit": "e0eccd3b4b7d7bb162767d4c5a028e646437555c", + "sha256": "0pzwyrsdpsrrnchxk8qihqr8blx366yw9snrcy1l1fj9hhsks7bs" }, "stable": { "version": [ @@ -104687,17 +105762,16 @@ "repo": "thanhvg/emacs-reddigg", "unstable": { "version": [ - 20240107, - 235 + 20240730, + 2339 ], "deps": [ "ht", "org", - "promise", - "request" + "promise" ], - "commit": "633c628d4544616cd023ca540819b784a6986426", - "sha256": "1lrb8fn31wc51yf8znaf51r2771jsv89qbjankwpnsf78yfb57b7" + "commit": "4d22e06a6e2523fe6d83c0280847d3bde19fabb5", + "sha256": "05i5nh2hr4janlhj4vqjnkabfq2y6py1vs5s1x9wpb8aaknhiww6" } }, { @@ -104965,11 +106039,11 @@ "repo": "alvarogonzalezsotillo/region-occurrences-highlighter", "unstable": { "version": [ - 20240417, - 2146 + 20240626, + 1101 ], - "commit": "a1ade7985656faf00f8a6afda885e8bdf959d133", - "sha256": "01j8i1z6mf7c2g59yzx6hrd799pxk6rdq2dvsl1r0bppgi5kv8dy" + "commit": "55f9d100ef67f174c55209f8d4cef1962a9adfc2", + "sha256": "0cay4dsqrcpwml0bpsmpnx0mkprr8jj1m6a027m7dfpmhf2xlrmn" } }, { @@ -105053,6 +106127,21 @@ } }, { + "ename": "regswap", + "commit": "ec1df4dd5d259b86ab7b726e482ad6ca7f0db63c", + "sha256": "0sh27hf69kqc34bb6syidk4x414h2liv3k0ilv976s3djs97wlf2", + "fetcher": "github", + "repo": "skitov/regswap", + "unstable": { + "version": [ + 20240602, + 2051 + ], + "commit": "65e2319e013c5d59f338edde12b98ef1c737e870", + "sha256": "0hbvf0f72a2icyi503iypqcy98pa5fkxxbv141r73xi53s1g2vqr" + } + }, + { "ename": "related", "commit": "555932a7b9cf11b50a61c2a9dd2636fd6844fac8", "sha256": "08cfr5qbm1h5j4v3vf3kjjwb9nxsrk74lx9gi1icdhqw631h3yxf", @@ -105840,14 +106929,14 @@ "repo": "a13/reverse-im.el", "unstable": { "version": [ - 20240315, - 1320 + 20240815, + 1055 ], "deps": [ "seq" ], - "commit": "bcd70b49b16abab53165cb464d0a9a5f95bf946b", - "sha256": "17br84xaxy1am01fdqi6742wwfp9aig1a71fmhvncpdi1plsxkca" + "commit": "dfb169b08e09be6ab113a7d423f79b1775a9334f", + "sha256": "1r4pvpn7fzj9w5d28mh8v80ml22cx6zpywb77sbnaq8lfb0jssfc" }, "stable": { "version": [ @@ -106139,17 +107228,17 @@ }, { "ename": "ride-mode", - "commit": "07536aeb9581da1ffbe25cc4e7d6d5d056062cf7", - "sha256": "0yhqg5qnkl4rz2b524md7z8x5b80ck2mgcdhwh5dr5wfqc72sbnl", - "fetcher": "github", + "commit": "e0713d480f6c5932561217f5fe9f48f189d4d534", + "sha256": "0v25w3snpq7p56ivkh71vvqrlhlyg2nfhhmfy6qdlz98hl955wli", + "fetcher": "codeberg", "repo": "deadblackclover/ride-mode", "unstable": { "version": [ - 20240511, - 1623 + 20240727, + 456 ], - "commit": "b693e5c33090530d2ea9d792fa148ea983f8607f", - "sha256": "1iwb941ld1rfshdq11km561xr75a3n63cw70h6x8wyb6iqdwbwk3" + "commit": "f1b826fc9b14007aefca8d5748549b9a720b0684", + "sha256": "1p5zz63ifgvb08gb8p0jx52sqh42mh0cpkj2gd64h6g7vlrj8zsb" } }, { @@ -106454,11 +107543,11 @@ "repo": "jgkamat/rmsbolt", "unstable": { "version": [ - 20240507, - 47 + 20240622, + 1704 ], - "commit": "32604147643dbfebe499ea8a4b139cc68acd2746", - "sha256": "07l5c1apdck8a73z4mh3r7jpwz1c97p4i6qz1lg5ygmr1wnhpncy" + "commit": "484d9c06f0544532336ad2ac2ddf46a1a81272ef", + "sha256": "1sky9qvrycqjmhlhrd3jn2mpdgii3m9m6r48nb6m6s7pshwlydw3" } }, { @@ -106523,11 +107612,11 @@ "repo": "kopoli/robot-mode", "unstable": { "version": [ - 20231118, - 826 + 20240721, + 1023 ], - "commit": "cb12e5adcba3379a67483e268229c152e0a8405f", - "sha256": "1a377lws4f0az2y1r3z2i3mghvg7a4094wkchvjvsl1nd6yxdxwa" + "commit": "7c8d7adfa37b7bd15d61cbb78a02e0e1596c453c", + "sha256": "05pngpaq0ap8v85axvslzknvxg5dcws82jjdvb3b17rz9iyi4a5l" }, "stable": { "version": [ @@ -107322,16 +108411,16 @@ "repo": "semenInRussia/emacs-run-command-recipes", "unstable": { "version": [ - 20231219, - 1331 + 20240708, + 1555 ], "deps": [ "dash", "f", "run-command" ], - "commit": "63405333f23b33ecda08e716eca8588c8950952d", - "sha256": "0wlg7qx7r94cnnrhp99wfiwna1zwccshg93r32zj2ah9j4mba500" + "commit": "5a249052933dfa5e8f768da6c73d926e167d6175", + "sha256": "0cpg31wm7r171ra86w3x2va08qx7b49mv397x13q7c1fkd3xxfx1" } }, { @@ -107498,29 +108587,29 @@ }, { "ename": "rustic", - "commit": "716c14a2ed8f5817c09c1ff530a4980c17b44bb3", - "sha256": "13bwrdqmm6xb34k8r72c0r3b9aym5dwsalp63bkfh9k9kq9hic0n", + "commit": "3cc337cbfdd1f09e6a18bbbe8f8cf470601a2db4", + "sha256": "1azn2m6vac8zinykzw8nhzmg16in3h4f0p6jl08sskgb6lc722kp", "fetcher": "github", - "repo": "brotzeit/rustic", + "repo": "emacs-rustic/rustic", "unstable": { "version": [ - 20230130, - 912 + 20240819, + 1214 ], "deps": [ "dash", "f", + "flycheck", "let-alist", "markdown-mode", "project", "rust-mode", "s", - "seq", "spinner", "xterm-color" ], - "commit": "a5fc66c8167a827a57c4426e4b8dbe717b3be43c", - "sha256": "1kg1brqy6bv8z2qw4q3f70az3mcz26pb387qrjlx2ik027zyr0ih" + "commit": "319a4ace84ae59bca44224eb93f440acfb105197", + "sha256": "0cm80y8s2qn7wsidn8jq4qv2ni5agrv5m5zqcvrismvqv4x0d6l7" }, "stable": { "version": [ @@ -107594,11 +108683,11 @@ "repo": "Kungsgeten/ryo-modal", "unstable": { "version": [ - 20221221, - 1355 + 20240819, + 1740 ], - "commit": "b9e6a0f33b9e2aeb6088accd23ed312083d8f707", - "sha256": "1kk3szdiqk3860wfjdfzv8l0fc303gr8gqnj2ynplpq0jp16lviw" + "commit": "b47b953811b4f18f8f11f2e247d947d0c4c72785", + "sha256": "0nr513gsq5ihxiw6hrv7scdk5v8r60wrz6gnz8kmqklxaan9jrn8" } }, { @@ -107844,14 +108933,15 @@ "repo": "thapakrish/samskritam.el", "unstable": { "version": [ - 20220912, - 255 + 20240723, + 1609 ], "deps": [ - "google-translate" + "google-translate", + "popper" ], - "commit": "93566481023b2645ca1f1dfcc5440712c2ec843b", - "sha256": "1sd6gq0sjjz3ym6p4avjfmw480yk6ww3rghq8i1aycfna7z1bz96" + "commit": "c1ff0ff27d37312549c7345b58593ab0a6083e31", + "sha256": "0rr8snrmgr1vadr6ivczz3zk0h2zyxrqqq9fs3kps3hwidpi6gcf" } }, { @@ -107994,11 +109084,11 @@ "repo": "nicolaisingh/saveplace-pdf-view", "unstable": { "version": [ - 20240209, - 505 + 20240816, + 1351 ], - "commit": "ee95460cd934080338f03a16f95b549577425216", - "sha256": "00cqk1qvmdw07vmmyxc843m2qgx1n9ivwzp73r27v4jxx1i38vx2" + "commit": "70e9ec40565021f4b5d51e4523f4c716183a8eef", + "sha256": "000xhr0f2hbdykycm7d5l1nc9knhh65dfnm307y39k236nwy4msc" } }, { @@ -108086,25 +109176,25 @@ "repo": "openscad/emacs-scad-mode", "unstable": { "version": [ - 20240429, - 1628 + 20240708, + 2120 ], "deps": [ "compat" ], - "commit": "8b830727c343bf762d9469b413f0c2a4c1996fe2", - "sha256": "07rk69b0sbcwh4mjpapzv93awwl4w5n0q73915rrxifqf6n3bjsp" + "commit": "17a8158cc55fed473aa87d53f3f2b42e1c249d11", + "sha256": "13h58abcpyykv136pfn7735jhx73dni91smmk52rv0p5cf8rd3qk" }, "stable": { "version": [ - 93, - 3 + 94, + 0 ], "deps": [ "compat" ], - "commit": "8d5650c5cfee96c42d64427bfcadb89f6bda66be", - "sha256": "08yia0q18b0w3lkr4wh1bd1v606cksi6hpz72nqjvv59qyjfmg01" + "commit": "3c32b141f083c31539bb24700eb0aa23ea55918c", + "sha256": "1fgnvshyyxyhp4qxc29iqdzvdg2cj2d94lbgsii2bby3k18fzqxc" } }, { @@ -108133,11 +109223,11 @@ "repo": "hvesalai/emacs-scala-mode", "unstable": { "version": [ - 20240113, - 1743 + 20240729, + 420 ], - "commit": "4c6d636b86e3bb1d95de819dc48dda92abdfbcf4", - "sha256": "0d3x0fk09a2bl2f7sy6k28164r8s2hvshh20p5kp1rg75y0syksa" + "commit": "bd0638c32ab0f2eadacf2809329abf5388211760", + "sha256": "1cn16cgh51am3skd081xz2di6fybn4c589f0g3qi5w73c5fmzq1d" }, "stable": { "version": [ @@ -108172,11 +109262,11 @@ "repo": "KaranAhlawat/scala-ts-mode", "unstable": { "version": [ - 20240420, - 1150 + 20240812, + 1639 ], - "commit": "d9424fa74acf930664c43d4c9f9625d8bfdd4d21", - "sha256": "0sc2sx3pgifcnd2zw7nvk3f8z3v1zh2q94d9rnlayvwr6y4cnlq4" + "commit": "3580c0c724df06af23dff986f0a7a400cbc58cb8", + "sha256": "02rm7gmlgxrpidvbj1s3gkqby5jrwvw8gfxg2i4fa9n1m00yyikg" } }, { @@ -108685,6 +109775,38 @@ } }, { + "ename": "sdml-mode", + "commit": "3ef7d39f3984edd3e50db8fe36ea496aec844648", + "sha256": "02ja7qa98r8azdkgbiqc8vg8lyba7qhqm2ng0aia739bpxqxac97", + "fetcher": "github", + "repo": "sdm-lang/emacs-sdml-mode", + "unstable": { + "version": [ + 20240801, + 1458 + ], + "deps": [ + "tree-sitter", + "tree-sitter-indent" + ], + "commit": "65e5bbd6e2e1a7c1e5795e20839a83ec9ddf48f5", + "sha256": "11avwv4nny33sdzj789ypkzgq06xangskr0s6k2zpfwpg7bq5d1y" + }, + "stable": { + "version": [ + 0, + 1, + 8 + ], + "deps": [ + "tree-sitter", + "tree-sitter-indent" + ], + "commit": "105c0fd42269ba8a5c29fa71e617644fa385f68f", + "sha256": "1axpf0cs4sk9aa23dhpxal1vwfpff2k10fg54iiqqbw4yvlckp8y" + } + }, + { "ename": "search-web", "commit": "1f1a3697649ccf69c8eb177c31ec4246b98f503b", "sha256": "0qqx9l8dn1as4gqpq80jfacn6lz0132m91pjzxv0fx6al2iz0m36", @@ -108944,14 +110066,14 @@ "repo": "captainflasmr/selected-window-accent-mode", "unstable": { "version": [ - 20240427, - 833 + 20240815, + 1934 ], "deps": [ - "visual-fill-column" + "transient" ], - "commit": "79397e634a89c5e16de1d317f735aafe75c78aea", - "sha256": "0dwb4j62n13dg8kl2maci1668v0nsnc55xfjfva3wm5singb72zl" + "commit": "8a49af37909779cb47d53ea41922deec2d87fe29", + "sha256": "1r09mchbqdq0rc3kxynl3djaf8v2w9wgid8br4sw3x1x5m9c73ix" }, "stable": { "version": [ @@ -109021,27 +110143,28 @@ "repo": "radian-software/prescient.el", "unstable": { "version": [ - 20240226, - 204 + 20240803, + 2320 ], "deps": [ "prescient", "selectrum" ], - "commit": "c39bf07c56b427bf41aafd7d20eaef5cf3c312b5", - "sha256": "0pfc0ycp4cr9zwkjv3rqfkwkx8p52ad7aq2c60j0qwp3yd0cghc4" + "commit": "2b8a8b41228bddb2e11eb1c200e98a9edd04797c", + "sha256": "0qz3xv38vazxqsl7lan7fshj3gmb0qagkrvl5xzwqhdg0rir981j" }, "stable": { "version": [ 6, - 3 + 3, + 1 ], "deps": [ "prescient", "selectrum" ], - "commit": "c39bf07c56b427bf41aafd7d20eaef5cf3c312b5", - "sha256": "0pfc0ycp4cr9zwkjv3rqfkwkx8p52ad7aq2c60j0qwp3yd0cghc4" + "commit": "2b8a8b41228bddb2e11eb1c200e98a9edd04797c", + "sha256": "0qz3xv38vazxqsl7lan7fshj3gmb0qagkrvl5xzwqhdg0rir981j" } }, { @@ -109104,15 +110227,15 @@ "repo": "wanderlust/semi", "unstable": { "version": [ - 20231102, - 1035 + 20240606, + 1327 ], "deps": [ "apel", "flim" ], - "commit": "9063a4485b148a767ea924f0e7cc78d3524ba256", - "sha256": "18km8jdxjcqnh378xxd7ivvvcxzrif8zpq9zgki9i7f0q8lsx677" + "commit": "85a52b899ac89be504d9e38d8d406bba98f4b0b3", + "sha256": "13sfwv889i99l5zv10ibzm221wvwbp3m45nf4nsr0dhvln90zrjj" } }, { @@ -109271,15 +110394,15 @@ "repo": "twlz0ne/separedit.el", "unstable": { "version": [ - 20240119, - 633 + 20240727, + 848 ], "deps": [ "dash", "edit-indirect" ], - "commit": "bfd0902d771f9f0160e4f16a7b6e8c29ce3447fe", - "sha256": "0qripg4hzyfldb39w44sp1iyg9c0nys9bny83rswxmqkha1f3904" + "commit": "89bfc60c9ed2a606643f9966df39998c973694ec", + "sha256": "11rzga8zbkzy0jx6w3maqian9nn7ijn0sxkq6qc5896yasg8zwbs" }, "stable": { "version": [ @@ -109881,11 +111004,20 @@ "repo": "xenodium/chatgpt-shell", "unstable": { "version": [ - 20240227, - 2310 + 20240814, + 938 ], - "commit": "03afa7339930e5715c217455f3070c88a7fac55c", - "sha256": "1n6gpfyq13180k41jn3xnar0gz3a9qz08nz8v5xjj0qxdgml02g6" + "commit": "6fb85746bd0d316c97e375dcc14eb5314778e74d", + "sha256": "1kkq4wxkhv7cgksjpbdzm0r9x17y3sra1zk6h0213w4fi20z06lc" + }, + "stable": { + "version": [ + 1, + 3, + 1 + ], + "commit": "6fb85746bd0d316c97e375dcc14eb5314778e74d", + "sha256": "1kkq4wxkhv7cgksjpbdzm0r9x17y3sra1zk6h0213w4fi20z06lc" } }, { @@ -110208,11 +111340,11 @@ "repo": "emacs-w3m/emacs-w3m", "unstable": { "version": [ - 20240423, - 31 + 20240819, + 38 ], - "commit": "1da8d4f11cc5f79bce124d0a32be59be18359373", - "sha256": "063klgl664n8qw82g7c31vsbw1npw7l2jc5n2g9bndhhq8hg5g2g" + "commit": "7a669b232cbb840ef8c8a893e7ea672e7eacf3f9", + "sha256": "07hqw5w5h767kdf07wyqjgscsf1vw63l0apl13b5l69jaizrbx6i" } }, { @@ -110240,6 +111372,21 @@ } }, { + "ename": "shortcuts-mode", + "commit": "e4c72fcc02373dab446c14eae1e518a4706bb993", + "sha256": "191s3r3ydl1mbchicq24vch2qcr57f480ypcy0zzrdjlw34jyl0n", + "fetcher": "github", + "repo": "tetron/shortcuts-mode", + "unstable": { + "version": [ + 20240707, + 1606 + ], + "commit": "a781ae97e33f5a0bf75058c21a7784032e22b28d", + "sha256": "1na0qmpq5z5fx3b84s9bxkfskny92bl7ny6lbmnbvhs3b0v84fk0" + } + }, + { "ename": "shoulda", "commit": "41497a876c80d81d9562ea4b2cc2a83dba98ae8a", "sha256": "0lmlhx34nwvn636y2wvw3sprhhh6q3mdg7dzgpjj7ybibvhp1lzk", @@ -110398,15 +111545,15 @@ "repo": "chenyanming/shrface", "unstable": { "version": [ - 20240401, - 957 + 20240812, + 653 ], "deps": [ "language-detection", "org" ], - "commit": "b82a174ee33f19ed96c7e8c85ec362eab147d4aa", - "sha256": "0qspg55r397p6p16c4cps547x2w7gdplshy3scr810iwphrzsvfy" + "commit": "71b17066edc8b49d11571ec94e339a93ab2f189c", + "sha256": "0yqwjjmzc0vv1x12vjffciwqzr1birpkr5nfihvaynwcc9z2iskp" }, "stable": { "version": [ @@ -110608,14 +111755,14 @@ "repo": "rnkn/side-hustle", "unstable": { "version": [ - 20240325, - 205 + 20240625, + 1228 ], "deps": [ "seq" ], - "commit": "903380cf9e08d98689c2c116965f8e47d002fad6", - "sha256": "0728k6dbx4435vnm0rfj2pw2kdp4f7j1pwqdmlwp8zf81i5bghzn" + "commit": "94450b58cec1b809afe08d0754a6662839efbc9d", + "sha256": "1lhvp1vqkkxrx1fl9xp1q0dvwgh8iidz6w0sznjvc0dbl15vx55q" }, "stable": { "version": [ @@ -110626,7 +111773,7 @@ "deps": [ "seq" ], - "commit": "903380cf9e08d98689c2c116965f8e47d002fad6", + "commit": "0ac8dfa02ddd33cfa0e3cff834b68e32185db9ee", "sha256": "0728k6dbx4435vnm0rfj2pw2kdp4f7j1pwqdmlwp8zf81i5bghzn" } }, @@ -110638,11 +111785,11 @@ "repo": "rnkn/side-notes", "unstable": { "version": [ - 20230814, - 302 + 20240629, + 1008 ], - "commit": "fbe409066df83a7e64a6a9ddf6d99ce7177fcdbb", - "sha256": "14jmki9lrcf78g362sxjvs1a55cz99p2pvnrvvr0hnn7lh6rfd4l" + "commit": "96a142dfd5768d66b1d574027e13c572e4c82a87", + "sha256": "09nisfdlib6n94pv5axvj64znh77jsdifv55d69kb71azpjl7r68" }, "stable": { "version": [ @@ -110650,7 +111797,7 @@ 4, 1 ], - "commit": "d41255fc2b8cadfc7882c617c7d1aff71524ed46", + "commit": "452378c68b7e95b9e8244d20ace073a0be27ccb2", "sha256": "0jsfa5dfs0kl9c7pjxi1niq1mknsxnqm9gs18l0lb9ipbzb949sr" } }, @@ -110677,14 +111824,14 @@ "repo": "emacs-sideline/sideline", "unstable": { "version": [ - 20240521, - 31 + 20240627, + 47 ], "deps": [ "ht" ], - "commit": "31ef3c21d99785e7a066ad8c188ddcd2b478b5fe", - "sha256": "17qflpmc7kwn0cikysardxda25wanmax55hc6ifwgcp330wp4742" + "commit": "ba55945617f04763f9e93525fdf1e2826e4d667a", + "sha256": "1iizibw9aai04ni0g074a7yb5bidmwvq2ygw72gwxdg4v6h2wldy" }, "stable": { "version": [ @@ -110736,16 +111883,16 @@ "repo": "emacs-sideline/sideline-flycheck", "unstable": { "version": [ - 20240509, - 742 + 20240629, + 840 ], "deps": [ "flycheck", "ht", "sideline" ], - "commit": "f809e627e433bd9a58471e4dea1ed50305eef7f2", - "sha256": "0z0152cnkb8bwc3j0gi1zyasvwxc7anlrj2qr0zj6pbxyl61k5m3" + "commit": "4147f2754c353e0b7920caf385b8dccc5e6301f7", + "sha256": "1978b149d7mza2r2mknp01zvpf55sz49addaxd153fqdsmf8hxq8" }, "stable": { "version": [ @@ -110946,14 +112093,14 @@ "repo": "vapniks/simple-call-tree", "unstable": { "version": [ - 20210625, - 2001 + 20240713, + 1008 ], "deps": [ "anaphora" ], - "commit": "26de24bcde0eae911a0185bb5a6b74b9864fcfc3", - "sha256": "0589ns2v6jxyd7adjkj34zlcnnxbfs6c7hm56yskbs2s4qkkf369" + "commit": "90de7cb42e1dbfe295516e696df928966f1eede9", + "sha256": "19nbwrc2pg44qqryslm3mzjc3isxx1indmdxms39j71qzwgig6ad" } }, { @@ -111231,6 +112378,21 @@ } }, { + "ename": "sink", + "commit": "9f6b09154d54b3bfbc16ef606fc7dfefb4762014", + "sha256": "0wqxm6qs736q856w4niy7zfi2bvb31dg8zw24xr42qr07irk4x84", + "fetcher": "github", + "repo": "alcah/sink.el", + "unstable": { + "version": [ + 20240523, + 747 + ], + "commit": "a14e1cc0a051543723c043a5ece081ce9a567ddd", + "sha256": "17pk3zqy1zddcdhfm0ybff41l1plx4cypv9sxaydgl3yyi34zwkv" + } + }, + { "ename": "siri-shortcuts", "commit": "f3a67195c63059fbc2d2714b540505bb9cde49d1", "sha256": "04fnzv6sq5mbj5difddbchvp7sgz48qrhs5izhl5w1si5q2ds5ri", @@ -111268,8 +112430,8 @@ "repo": "magit/sisyphus", "unstable": { "version": [ - 20240506, - 1558 + 20240713, + 1929 ], "deps": [ "compat", @@ -111277,8 +112439,8 @@ "llama", "magit" ], - "commit": "db9b36065faf149fef214248bdba1d90492cd2e9", - "sha256": "0czzvnchviwszgdpq1s3j2m9881a7dxh7hdd7hg7ay9ab18j0f1i" + "commit": "3caff966ef5cdaf4ee4ecfb36d0fc87e8840ce73", + "sha256": "0v2ipikqpwfvylmix8wm82qmjkcvq0diqjcr8y0ly2zagdg6hkwp" }, "stable": { "version": [ @@ -111592,14 +112754,14 @@ "repo": "slime/slime", "unstable": { "version": [ - 20240516, - 319 + 20240731, + 1518 ], "deps": [ "macrostep" ], - "commit": "5ced74ab35d91f6be7d8fa10e1098aaae6b749e3", - "sha256": "0bq0vi22mr43l64q501hkv11sp58bmn8hgxmc61if0xc1rlcs68v" + "commit": "3fca003ac639df989af3cfbfc8112bd34ea1a042", + "sha256": "0n8lj44c5s9c1x7xydc8mfz46pzfm4kabl342ipqs53ppvhd715l" }, "stable": { "version": [ @@ -111740,14 +112902,11 @@ "repo": "nilclass/slint-mode", "unstable": { "version": [ - 20230922, - 1143 - ], - "deps": [ - "lsp-mode" + 20240429, + 1333 ], - "commit": "1ef68ca9cf0cffd2c863c3135f96202a19cf8182", - "sha256": "17gz8yw7sqz1lh79v9nqqz0c3p4hbmrh532rkxbbljz58y2fip7i" + "commit": "168a6cfb90b5e36360074c83f80d5bbac2f0287e", + "sha256": "1bshm2rim7jifpy5xl42xdwzgrnkiq1jdjwpfzgzd0ljq7kw1vv8" } }, { @@ -111840,6 +112999,21 @@ } }, { + "ename": "slurpbarf", + "commit": "f04f3351fde50e02dbf673c84c2b90a45afa6b05", + "sha256": "07d52g9iaxlr7bs833fc5z3qwajxdzqlpbp5hran9gy0dcdk530k", + "fetcher": "codeberg", + "repo": "vilij/slurpbarf-elcute", + "unstable": { + "version": [ + 20240717, + 2213 + ], + "commit": "e85451da4a73e461f3ee2f62200cd241a72638ca", + "sha256": "0cjbx14f01fl0akc6xqf6cmvc8j4i4j1fy0j58avd04c3dxq62f2" + } + }, + { "ename": "sly", "commit": "28d1f6bc44ef8ab731b37c3eb6bdc29b68465e50", "sha256": "0rmglbkq3fhmaqm8gar3mn6f5r9cdb14anrnvr4n44x2d2qgrbn7", @@ -111847,11 +113021,11 @@ "repo": "joaotavora/sly", "unstable": { "version": [ - 20240501, - 1118 + 20240809, + 2119 ], - "commit": "ba40c8f054ec3b7040a6c36a1ef3e9596b936421", - "sha256": "0qhnn09pinrdjbkgl89xhgbrji2gagq05rrknklybklyvik851l6" + "commit": "742355f7554ab6c46e5c1c9bdb89068f55359eaa", + "sha256": "1mxkcgh7g76mqn148zm2mhsh09whwh89wldlyfhq0d9h96zch451" }, "stable": { "version": [ @@ -112389,15 +113563,15 @@ "repo": "Fuco1/smartparens", "unstable": { "version": [ - 20240416, - 2253 + 20240713, + 1002 ], "deps": [ "cl-lib", "dash" ], - "commit": "d3b616843167f04b8a9f53dd25e84818c9f6fbce", - "sha256": "04vv9swkn3l2lcdb4ncmc6vr3967mglfgiabn1978gyhv4xp9nwm" + "commit": "c7519a1b69f196050a13e2230b7532893b077086", + "sha256": "06bdr3vcywg6k89d5dmvj4sdxh95y0jgh5xlddvmv2x0i8d7g69b" }, "stable": { "version": [ @@ -112703,20 +113877,20 @@ "repo": "microamp/smmry.el", "unstable": { "version": [ - 20161024, - 901 + 20240718, + 947 ], - "commit": "b7ee765337fa627a6c59eb4f2a91df5d280ac6df", - "sha256": "0hzs8xi7n3bsqwm3nlm3vk8p2p33ydwxpwk9wp3325g03jl921in" + "commit": "d3473b139430d221b4c4587dae685cd67a02c099", + "sha256": "0f9in9sx7nvxhzlwib6fasdcv3xdipcan00anz1ak26yw0sc7yhk" }, "stable": { "version": [ 0, 0, - 3 + 4 ], - "commit": "b7ee765337fa627a6c59eb4f2a91df5d280ac6df", - "sha256": "0hzs8xi7n3bsqwm3nlm3vk8p2p33ydwxpwk9wp3325g03jl921in" + "commit": "d3473b139430d221b4c4587dae685cd67a02c099", + "sha256": "0f9in9sx7nvxhzlwib6fasdcv3xdipcan00anz1ak26yw0sc7yhk" } }, { @@ -112977,15 +114151,15 @@ "repo": "SpringHan/sniem", "unstable": { "version": [ - 20240423, - 858 + 20240814, + 931 ], "deps": [ "dash", "s" ], - "commit": "1791011310fe8d48fc8c5b79b32cb5cf586fb081", - "sha256": "0jdsyfj83y1i9dfc7d8d840brgz5q02cyxp4iqkq3a065gsajrwr" + "commit": "e57e3b2afdabfa3ed02307f2f8839c822d680f92", + "sha256": "1nk6q0a2ssbdqcidfbbq54alhpb7w1i4l00c8y3690n1i2q1r2rx" } }, { @@ -113191,14 +114365,14 @@ "repo": "hlissner/emacs-solaire-mode", "unstable": { "version": [ - 20240407, - 1751 + 20240716, + 1852 ], "deps": [ "cl-lib" ], - "commit": "8ccdceeb9298b3c4e35f630914f467bf164f39ad", - "sha256": "164qqzmj1321rkvpiwpr5xnm1nbniibjkymfw5az32m2acdwk52j" + "commit": "c9334666bd208f3322e6118d30eba1b2438e2bb9", + "sha256": "05a1m2ljczj5fayr2kncfi8p55j2gwa2qpzjmzg63admdr87yp5g" }, "stable": { "version": [ @@ -113221,11 +114395,11 @@ "repo": "bbatsov/solarized-emacs", "unstable": { "version": [ - 20231204, - 713 + 20240725, + 1617 ], - "commit": "922b5956a9e2e474f1595bad7b2b35f148b4df3f", - "sha256": "18z36nzyh4dsd8igys37x0r3lnav77fvjrkxv48v3yjsrwli19gl" + "commit": "80ee6b99b022b20c27ffb44fb146f5878c9b5776", + "sha256": "0cb12zwndvlilhfnhq0yh0ygp86xhb04fgb807a1rwf3mgzrw57n" }, "stable": { "version": [ @@ -113421,23 +114595,20 @@ "repo": "djgoku/sops", "unstable": { "version": [ - 20240315, - 2226 - ], - "deps": [ - "s" + 20240621, + 1919 ], - "commit": "9ed9f02ff83ab6e0cb0173f0578be1a5b71e3b66", - "sha256": "1120zfpnask7p3jspyk7yk1qq1g1m7vwp6kfxk7vd3yz9v732cds" + "commit": "2cb8621ed588c6f3e210c9e76d713e6dacc03030", + "sha256": "14pag50ky56wma1zcmsjy2270hvwwna2m85787r3cjkjkxhhhxmi" }, "stable": { "version": [ 0, 1, - 0 + 4 ], - "commit": "b7b6784fb53659c3e8d103dbb027b12cf4846d8c", - "sha256": "1bls67w733cgpnm3b3rrw93jpkckrc4g7a4pprgnm96b3w4qrrkp" + "commit": "2cb8621ed588c6f3e210c9e76d713e6dacc03030", + "sha256": "14pag50ky56wma1zcmsjy2270hvwwna2m85787r3cjkjkxhhhxmi" } }, { @@ -113466,11 +114637,11 @@ "repo": "mssola/soria", "unstable": { "version": [ - 20230227, - 1454 + 20240603, + 903 ], - "commit": "c5275d02fcc9f6af2cfebd69bcf69f8cdccbe3ab", - "sha256": "0zrz1n8b9hd6srwk1bjmb43y3cm9rvrkllv5030q43q0azjrhr81" + "commit": "c6dbabc1b4f956e19c7e80f16e69f3d6c57b84b4", + "sha256": "1zsazml4qsbvnqb418fiknpj3zcnicl6m6x65i29ipwrjsi41i6j" }, "stable": { "version": [ @@ -113870,11 +115041,11 @@ "repo": "nashamri/spacemacs-theme", "unstable": { "version": [ - 20230530, - 1751 + 20240815, + 2134 ], - "commit": "319ad1cd6aa05dcb43e4edca50eca339892e0865", - "sha256": "1kmfmf7d5qw06y5hrfspzmds13r9ijvsh9f2fnahg1mr3a6g3bjl" + "commit": "d02edec79404e807445b62d0d2fc1a6fbcc10c71", + "sha256": "15ychqqc05ajwd4nq5w360ayravbywdlm9lxbv6kchn2lm8y0fqp" }, "stable": { "version": [ @@ -114013,11 +115184,11 @@ "repo": "condy0919/spdx.el", "unstable": { "version": [ - 20240522, - 104 + 20240815, + 107 ], - "commit": "448e0e5e491e2447da2590ff216675e083d910ff", - "sha256": "160h11025fkxg734ri944l2jndfpmg9mlar0jy8aqk3bys3mc85i" + "commit": "65f4459dc2368d037417247b380d03708f7b8fc0", + "sha256": "1pmbfmmwd2vzxswlv1984c2qxi5fjdzzmzy018n25dyfkx552nvn" } }, { @@ -114141,11 +115312,11 @@ "repo": "ideasman42/emacs-spell-fu", "unstable": { "version": [ - 20240421, - 2351 + 20240616, + 2345 ], - "commit": "7f9332a299b41e1fa4da9a82669f5981f6ffd3cc", - "sha256": "19155y36mxdqrrnqw62hmysprvw1dajap1y4rcx1nr7j9xkwjs6h" + "commit": "74d2701d78c1759074566f150d96a3596072359a", + "sha256": "1fg6nyfw1hwfx8gxwkqyyy4b6hhb4nhvxpzq2zv89zqwkvn0byhc" } }, { @@ -114288,6 +115459,30 @@ } }, { + "ename": "splunk-mode", + "commit": "d1338dc75894d9494d769f220b836f98189b7254", + "sha256": "0k7vbcxwr4pfab8dh7kmnrqzbkfd5779icn8l5a3f8knzgs6w07r", + "fetcher": "github", + "repo": "jakewilliami/splunk-mode", + "unstable": { + "version": [ + 20240422, + 828 + ], + "commit": "3a9b114fdbabb6e7d6206b1863c54de438bf506b", + "sha256": "02xqingvciigy9bhl1348h0cidx09wcq6fi6rws71jsw99ppfls1" + }, + "stable": { + "version": [ + 1, + 1, + 0 + ], + "commit": "fbc0b5faa2f33a3656f7c549ed9f064a01530dc9", + "sha256": "1bwrq579jm6w23p8hblqm0yrgapqlh9zc63c8d1v5g6kv9hdblb9" + } + }, + { "ename": "spotify", "commit": "855ea20024b606314f8590129259747cac0bcc97", "sha256": "07y6d3cz3nziasza3znysvcnx3kw156ab78kw5y0pdll45nw210x", @@ -114473,20 +115668,20 @@ "repo": "sequoia-pgp/sqel", "unstable": { "version": [ - 20220717, - 2039 + 20240721, + 933 ], - "commit": "bb0d1756bb9c62bb999fa21e15949e28650c663e", - "sha256": "1ih91f58spn1225x6a8mlpikxqg2ga4xbln6aalrcjk6pk84s69d" + "commit": "096c641fe2ac1efeb8ba09d1244ef95bf25ae1bb", + "sha256": "19qgyd45kpgd79ilc9r6pjndn70qymrwz8zk4niv6gqd5hfxv7fa" }, "stable": { "version": [ 0, - 1, - 2 + 2, + 0 ], - "commit": "bb0d1756bb9c62bb999fa21e15949e28650c663e", - "sha256": "1ih91f58spn1225x6a8mlpikxqg2ga4xbln6aalrcjk6pk84s69d" + "commit": "096c641fe2ac1efeb8ba09d1244ef95bf25ae1bb", + "sha256": "19qgyd45kpgd79ilc9r6pjndn70qymrwz8zk4niv6gqd5hfxv7fa" } }, { @@ -114611,29 +115806,6 @@ } }, { - "ename": "sqlite", - "commit": "949556b57cea0fbbfc98b95d894de95257dfe1e5", - "sha256": "1c5dprdl8q09yd0kvpkm19z60m9rhkilj5zmj938wlj5bmdlydv8", - "fetcher": "gitlab", - "repo": "cnngimenez/sqlite.el", - "unstable": { - "version": [ - 20201227, - 1822 - ], - "commit": "f3da716302c929b9df4ba0c281968f72a9d1d188", - "sha256": "00fkjsc01fymhjrzlx3anl9vj85yw4jlxvh77d0mvchwzym8wi8l" - }, - "stable": { - "version": [ - 1, - 0 - ], - "commit": "f3da716302c929b9df4ba0c281968f72a9d1d188", - "sha256": "00fkjsc01fymhjrzlx3anl9vj85yw4jlxvh77d0mvchwzym8wi8l" - } - }, - { "ename": "sqlite-mode-extras", "commit": "5c109bdc19547ac1483b07c54a81934458b525f5", "sha256": "0v58wm0prl8hz1fzvg9vd7zxqmrd1zbbcnr4kjpqmy575mi9yxzf", @@ -114718,11 +115890,11 @@ "repo": "emacsorphanage/sr-speedbar", "unstable": { "version": [ - 20161025, - 831 + 20220705, + 1231 ], - "commit": "77a83fb50f763a465c021eca7343243f465b4a47", - "sha256": "0sd12555hk7z721y00kv3crdybvcn1i08wmd148z5imayzibj153" + "commit": "73ecfc21cf38f0cb1dfbbebebdc3cf573eccf7d2", + "sha256": "1f8gh4csg4p160r9rawm0m8xgdyskarhnmdsly46f6zci3yc35z3" }, "stable": { "version": [ @@ -114779,11 +115951,11 @@ "repo": "srfi-explorations/emacs-srfi", "unstable": { "version": [ - 20240507, - 58 + 20240813, + 1909 ], - "commit": "7d3584b0b887a3bedebe5fd829fa7623c1d730fc", - "sha256": "13652cn287d17jfvj37a14iy3awisibmrm7dglivm8hcjlkaj9fg" + "commit": "3dac6e04eb2ed797a617abf6b3288808e83d66b4", + "sha256": "1xd2dib5xhx0z3cdf0p21swialwaz4wc1vswy0mnpicvj9hrnqbz" }, "stable": { "version": [ @@ -115056,32 +116228,34 @@ "repo": "daanturo/starhugger.el", "unstable": { "version": [ - 20231202, - 235 + 20240731, + 347 ], "deps": [ "compat", "dash", + "request", "s", "spinner" ], - "commit": "1bb3464c3a198a4f5f2155817d6505c4bab7dc79", - "sha256": "1f6ixs708j9s1vcnw1xgl89xmsmv5c4lg8qlazk7cbrg034m9l9d" + "commit": "22eceb806947edc1ad35e10fb99bdfc65fe26ca3", + "sha256": "1c0xc5sbpgp4nfs4rr1zrzqpxd4jl3cjjpkp43zifahal3gm0am7" }, "stable": { "version": [ 0, - 4, - 2 + 5, + 0 ], "deps": [ "compat", "dash", + "request", "s", "spinner" ], - "commit": "1bb3464c3a198a4f5f2155817d6505c4bab7dc79", - "sha256": "1f6ixs708j9s1vcnw1xgl89xmsmv5c4lg8qlazk7cbrg034m9l9d" + "commit": "22eceb806947edc1ad35e10fb99bdfc65fe26ca3", + "sha256": "1c0xc5sbpgp4nfs4rr1zrzqpxd4jl3cjjpkp43zifahal3gm0am7" } }, { @@ -115251,20 +116425,20 @@ "repo": "stacked-git/stgit", "unstable": { "version": [ - 20240505, - 2218 + 20240817, + 2126 ], - "commit": "e2b799d7bd39f69b66b54d556e345699dee740d6", - "sha256": "1x1f0qrwk5nxcqlyk6ga0mh919pa5fgs72dpr86fh778vraadw2d" + "commit": "e666bf88cff0706166dd6b086414913ecc1a8f21", + "sha256": "0h14fc7whqfraspsb83c5z71cmd2hd0kjzxdb0p33yivl710qgfz" }, "stable": { "version": [ 2, 4, - 7 + 10 ], - "commit": "e2b799d7bd39f69b66b54d556e345699dee740d6", - "sha256": "1x1f0qrwk5nxcqlyk6ga0mh919pa5fgs72dpr86fh778vraadw2d" + "commit": "e666bf88cff0706166dd6b086414913ecc1a8f21", + "sha256": "0h14fc7whqfraspsb83c5z71cmd2hd0kjzxdb0p33yivl710qgfz" } }, { @@ -115491,11 +116665,11 @@ "repo": "akicho8/string-inflection", "unstable": { "version": [ - 20220910, - 1306 + 20240816, + 523 ], - "commit": "50ad54970b3cc79b6b83979bde9889ad9a9e1a9c", - "sha256": "1xjm3m929wigycv8z7859l4pyb363hbqff8si6xig7p5ya4ksal5" + "commit": "4cc92e1ecd3d165b55235b51ae65ac09a0364958", + "sha256": "10jiabaxzvcpnqskai0jacj5n9h4ni5yr0rc8j2w0q35wfi78vmn" }, "stable": { "version": [ @@ -116120,11 +117294,11 @@ "repo": "matsl/sv-kalender-namnsdagar", "unstable": { "version": [ - 20190421, - 1521 + 20240620, + 1416 ], - "commit": "fff970f49c77abfc69e37817f25a939818420971", - "sha256": "0c6xjw1wh94llwh8qkf3bfzx05ksk0lsdrqdfqn3qkjnf3bkbbh2" + "commit": "743aa9eec1364fa4194e11f7f10c29688cdd636b", + "sha256": "0mliqsd5s5vb229kn7813vq5crg1wlbbyjkkvq6841sk6y0x2mjn" } }, { @@ -116180,14 +117354,14 @@ "repo": "rougier/svg-tag-mode", "unstable": { "version": [ - 20240429, - 1052 + 20240624, + 857 ], "deps": [ "svg-lib" ], - "commit": "a152bc90a7c9dc17112893a19ddf91078b909057", - "sha256": "12spnrblv3h7yzc0cpk0xj6sbcfcq2y4j3mg7a16m2nhafw2kn0y" + "commit": "ece58da9362d34be48ac658107bd9b99ac250162", + "sha256": "0d1bkdqwawscdi1xfh54rv19sxfdagnxy1gz0xqkq8lhgs6asdsy" } }, { @@ -116478,14 +117652,14 @@ "repo": "swift-emacs/swift-mode", "unstable": { "version": [ - 20240217, - 631 + 20240622, + 935 ], "deps": [ "seq" ], - "commit": "25cf8237312bf5eddc2c90001feb8f73633ab523", - "sha256": "0p7rfzyysmxzwvy595b72jlbl2gjb4b6pgm21qdg9dg00hmf3c1n" + "commit": "b06c97b909418b5dca3d15351b2ce86a04df32fb", + "sha256": "03b7n4sw5q7dhl06bm9bkdzhlzn5kyvlsc149jplc4c9xxnvnki6" }, "stable": { "version": [ @@ -116508,11 +117682,11 @@ "repo": "rechsteiner/swift-ts-mode", "unstable": { "version": [ - 20240414, - 949 + 20240811, + 853 ], - "commit": "a62f4d84b836fe208d912c26fb561c93a0c8e296", - "sha256": "0zzx8fg17vzh0r8ln884zg2kd7qj1bn9mnnvcr4fiv0x4dc16sgg" + "commit": "e094c17022e5a3fc27cc504fef6138cdde14ad00", + "sha256": "1qrlxw0v9skj318vfllnalz7013bxdmmqp4cdv2hmdl6jnmzcz13" } }, { @@ -116858,11 +118032,11 @@ "repo": "liushihao456/symbols-outline.el", "unstable": { "version": [ - 20240517, - 819 + 20240701, + 849 ], - "commit": "bfebe73b1322cdc32353375b55f5f56aad85fb57", - "sha256": "0gnmqw3gdgjqb0vfzl2vi3zvk89mnx2yxq8sdz7rn4y8hbyxsmh0" + "commit": "9664a1338b5755fe811eddd59f20a64a23da4063", + "sha256": "172hnb2jgc5z3c89sdb3jnif4lwisrj7yanr2kl418mg61ngm024" } }, { @@ -116899,8 +118073,8 @@ "repo": "drym-org/symex.el", "unstable": { "version": [ - 20240418, - 806 + 20240721, + 2333 ], "deps": [ "evil", @@ -116913,8 +118087,8 @@ "tree-sitter", "tsc" ], - "commit": "db8ac5b3039b91e28d4c403c98fcb799ec94369e", - "sha256": "065njm2610vhvsg1f0pm7ri51fp93f8234in1p791iqmmykdk7jx" + "commit": "fe45b0bb13a6a906cc6ac7d836a4021ee4a82421", + "sha256": "170nz5938bv3908lp6wqfh7bn1kj0f8aj45fqrlnabnwy06p6x1y" }, "stable": { "version": [ @@ -117201,16 +118375,16 @@ "repo": "vapniks/syslog-mode", "unstable": { "version": [ - 20210910, - 1952 + 20240818, + 2215 ], "deps": [ "hide-lines", "hsluv", "ov" ], - "commit": "072664784dae41a573a9de8d178bf577b7526b82", - "sha256": "04ddpn6il6mh1f992x3fxl6yljryghi51q4845lx08cbc74wnfz0" + "commit": "3972f7e6697c052b293a8b090f08a94bf7296729", + "sha256": "1bhksmfrbzq2mirx8rqh3ccp0946rj53lh4218vg88pbvb9dh1v2" }, "stable": { "version": [ @@ -117362,11 +118536,11 @@ "repo": "fritzgrabo/tab-bar-echo-area", "unstable": { "version": [ - 20221115, - 1953 + 20240809, + 1442 ], - "commit": "3ab62ca7db3c1d83f96b7971ea4b3b0101b51ae9", - "sha256": "0grapqwfqjbi9yzcirgd8gmkg4zkplagwvdyal4jd4aajnnx6sh8" + "commit": "9ccff3b93385796bec1cd435674807c3907436dd", + "sha256": "0kn9ccsmqf10v3vnvdp0dh9qiqryrgkwly879z7v5mkzd6jp4ngr" } }, { @@ -117572,8 +118746,8 @@ "repo": "shuxiao9058/tabnine", "unstable": { "version": [ - 20240426, - 516 + 20240629, + 1347 ], "deps": [ "dash", @@ -117582,8 +118756,8 @@ "s", "transient" ], - "commit": "06804c5fea50d79de458a99699a16adaf3c52498", - "sha256": "1k9qv7w9065j4k601yy5jk0ypx5vk4ji6viv61ss9z1b1fq37yiq" + "commit": "64b1556e5acd165112827e4219d29cb0f5d24c7b", + "sha256": "1r7n1ksjvxi8gpk7a5s4vblxm6hrsc9s6gmfgn37wykxfmdad8yb" } }, { @@ -117594,14 +118768,14 @@ "repo": "mclear-tools/tabspaces", "unstable": { "version": [ - 20240415, - 1838 + 20240713, + 2215 ], "deps": [ "project" ], - "commit": "c21f28b96b63926a530babe50d2c4de81ebaaa18", - "sha256": "0pxmhh0pga7cq8pkbyj0hjmpbabhb3322gy33z9nahy3m616m6hy" + "commit": "7ca3131835da6eae52af723ec8a951801b2376f5", + "sha256": "1zfk9h82hlh46gzi02wgm3alpcympzjapx8kjrma41yd0nmdpi21" } }, { @@ -117716,11 +118890,11 @@ "repo": "tmalsburg/tango-plus-theme", "unstable": { "version": [ - 20221011, - 1012 + 20240703, + 1443 ], - "commit": "30495d1ab1df6213ecac008c599b91e6f9244c12", - "sha256": "1qdz7nf4wqv58ck02ralp7l4an1ashh1bnjgqkp444as3vyli2c4" + "commit": "e042de79ba009a55aeebe30aafed01234c925be2", + "sha256": "109g4w47bx17rpl4n96bcx254xiai89gbi4j89yhzf5cbldmj764" } }, { @@ -117761,11 +118935,11 @@ "repo": "11111000000/tao-theme-emacs", "unstable": { "version": [ - 20240426, - 439 + 20240615, + 517 ], - "commit": "af5926c53aebc591f1c77eb8ca8ff1ea9a73eaa5", - "sha256": "1jb2klplyngmv6pl6v39y0072hqgpgs22i7yk3097kbxv8llmk5c" + "commit": "cd8ac4aee9fff55bc092ce78d93bd40517fa2c2a", + "sha256": "1r27zvymbgq50akhj6l7s1aj0sz81a375lxdhl8cl9jg74w31i6i" }, "stable": { "version": [ @@ -117800,11 +118974,11 @@ "repo": "saf-dmitry/taskpaper-mode", "unstable": { "version": [ - 20240112, - 1656 + 20240710, + 1449 ], - "commit": "70897b621ab541dc4b7874a55378aa5a75095e2e", - "sha256": "1g5lpl8jr58c225rhvjjzrnarv30n0f3xk58srrqwzrcdvqzywmm" + "commit": "db698431a55bb68b8d756de3be7fe4a235ccf55c", + "sha256": "1ndka7dmf5p01nwz72r4cs3npl7zv3hixz6kwyf324n9xfar79z4" }, "stable": { "version": [ @@ -117991,16 +119165,16 @@ "repo": "zevlg/telega.el", "unstable": { "version": [ - 20240515, - 2217 + 20240818, + 929 ], "deps": [ "rainbow-identifiers", "transient", "visual-fill-column" ], - "commit": "3d2e5ee323366906b00d8ed40e818d41e82b73e5", - "sha256": "117mck96hd0ai0ra7kv8kv78v88vms55ac64dqbrqndiwna4c6sl" + "commit": "d86d943beca37b9270060e9acca65e8fe3f322f3", + "sha256": "0jwdv8pi7g1s44jvasq0apkmdfi2x8vk3ffznp3pm5mmrch661vn" }, "stable": { "version": [ @@ -118080,14 +119254,14 @@ "repo": "caramelhooves/teleport.el", "unstable": { "version": [ - 20240501, - 740 + 20240718, + 652 ], "deps": [ "dash" ], - "commit": "7a99ec17e5c1d3bab3bc842e045b06ea335c97b9", - "sha256": "15kns3478xvwnn0dl883swh7x7k043b71zrv3gk0jazh60vn3q6j" + "commit": "929f87990a6ee83dfcb7ebf9f8580828f1281ebb", + "sha256": "03l7g5cjsi6cnmd119fpkvhnc2arid467s9f7i4sh36l6xw5q5li" } }, { @@ -118131,25 +119305,25 @@ "repo": "minad/tempel", "unstable": { "version": [ - 20240216, - 1543 + 20240723, + 2206 ], "deps": [ "compat" ], - "commit": "bcc3185202edce67c7f7fc74287cc2ecbeef10c6", - "sha256": "004jwmfj7ymdaml8rdzn8fhki8x8n4d0ziq52wn4nqm5y8n90pz5" + "commit": "317c0e41d542721db11a7a8a1c6b78762959259b", + "sha256": "1yyq59rkcqlqm6ra6wp98sqn823a7f2r8nabd1kffqq38rgfj1hr" }, "stable": { "version": [ 1, - 1 + 2 ], "deps": [ "compat" ], - "commit": "bcc3185202edce67c7f7fc74287cc2ecbeef10c6", - "sha256": "004jwmfj7ymdaml8rdzn8fhki8x8n4d0ziq52wn4nqm5y8n90pz5" + "commit": "317c0e41d542721db11a7a8a1c6b78762959259b", + "sha256": "1yyq59rkcqlqm6ra6wp98sqn823a7f2r8nabd1kffqq38rgfj1hr" } }, { @@ -118194,6 +119368,25 @@ } }, { + "ename": "template-dumper", + "commit": "64632d1e754d4ad72db299a3e6f88b56091b9a9d", + "sha256": "0czf0cpszgpjbjpq56hmffhzkv3hbmg2q7nbfbp77s23v1wdfdln", + "fetcher": "github", + "repo": "natelastname/template-dumper", + "unstable": { + "version": [ + 20240630, + 2236 + ], + "deps": [ + "f", + "yasnippet" + ], + "commit": "92fb170d572f044aaedaa2535990eba556347dfe", + "sha256": "1ai27rlll766vp1njwzhvayad4k386j9x1hx550j1a8in9kk3wbh" + } + }, + { "ename": "template-overlays", "commit": "8856e67aae1f623714bc2a61a7b4773ed1fb2934", "sha256": "0vmadkgzp4i0mh64la67k1anvmlmd4i7iibdlr9ly8z7i3cdsxqn", @@ -118213,10 +119406,10 @@ }, { "ename": "templatel", - "commit": "0e43ad23f7b58ddb82bc08066d8b48e04708b5ba", - "sha256": "10sx3kd22z4qa1g60c3fzxpc55xlddmb4iqqdbiqkn6bqzdzrslq", + "commit": "28df3fa5bb95c17d1423532e156025cd64b59151", + "sha256": "0016yv3vcjakqax3b2pf6h4a9pac3xnmqb72d3mc8z35xzr02pcs", "fetcher": "github", - "repo": "clarete/templatel", + "repo": "emacs-love/templatel", "unstable": { "version": [ 20210902, @@ -118413,14 +119606,14 @@ "repo": "colonelpanic8/term-manager", "unstable": { "version": [ - 20230727, - 2308 + 20240811, + 2337 ], "deps": [ "dash" ], - "commit": "31a3d16ba5a4f9e6f4bc52275eaedf55a96154a8", - "sha256": "1c2fxsqfvyh0g77vsjc7qmpfc8d5vnwlxkb1gah57i6sri5c8hj0" + "commit": "fbf64768902cded6d75261515bd4aafe7cf56111", + "sha256": "05awn9fmm29jrrf8jflr0xy2c983lhx2r8xw7dkaimf4655pcy41" }, "stable": { "version": [ @@ -118443,14 +119636,14 @@ "repo": "colonelpanic8/term-manager", "unstable": { "version": [ - 20230727, - 2308 + 20240602, + 2356 ], "deps": [ "term-manager" ], - "commit": "31a3d16ba5a4f9e6f4bc52275eaedf55a96154a8", - "sha256": "1c2fxsqfvyh0g77vsjc7qmpfc8d5vnwlxkb1gah57i6sri5c8hj0" + "commit": "25353734c65cd5cc952e4893b552629ca1d0d37f", + "sha256": "1mik1cjy1mwqngawky3yp4jsl1d59bmvfaj1s2rg4gismjcg3n96" }, "stable": { "version": [ @@ -118473,15 +119666,15 @@ "repo": "colonelpanic8/term-manager", "unstable": { "version": [ - 20230727, - 2308 + 20240602, + 2356 ], "deps": [ "projectile", "term-manager" ], - "commit": "31a3d16ba5a4f9e6f4bc52275eaedf55a96154a8", - "sha256": "1c2fxsqfvyh0g77vsjc7qmpfc8d5vnwlxkb1gah57i6sri5c8hj0" + "commit": "25353734c65cd5cc952e4893b552629ca1d0d37f", + "sha256": "1mik1cjy1mwqngawky3yp4jsl1d59bmvfaj1s2rg4gismjcg3n96" }, "stable": { "version": [ @@ -118545,21 +119738,6 @@ } }, { - "ename": "terminal-focus-reporting", - "commit": "19e7149a0a2db7df7f890a2c1ad22266e97694d7", - "sha256": "0iwq0rabq0sdn4apa5ibfp912j76w7hzg3q5lbxp7fspfwwynvg2", - "fetcher": "github", - "repo": "veelenga/terminal-focus-reporting.el", - "unstable": { - "version": [ - 20180830, - 719 - ], - "commit": "8b84bf18f4c5f1b59a11692eb706f13c3598d9a5", - "sha256": "0bbcl0mq62f22n2aipgzx93164x81bgybfd0x7gvsfva76qs8pc4" - } - }, - { "ename": "terminal-here", "commit": "f8df6f7e23476eb52e7fdfbf9de277d3b44db978", "sha256": "1w64r3y88lspxxcqcqfwhakk8p9vl7q3z610dykfbqwqx61a6adj", @@ -118706,25 +119884,30 @@ "repo": "TxGVNN/terraform-doc", "unstable": { "version": [ - 20240328, - 802 + 20240714, + 418 ], "deps": [ "org", "promise", "request" ], - "commit": "32e65a46d1c31d1524002cc50b33082a84045173", - "sha256": "0bvd1drvgfkz8as134f0xdwvsa56l0hl59i66d77yryix3mmlg1f" + "commit": "26a6674fcf6f16e4865ff5e6600bb273fdc77779", + "sha256": "1180kaj9cc16n2glpc04pnzbia17daxk7dawc7l1hba7mk9vq1wm" }, "stable": { "version": [ - 1, 2, - 0 + 0, + 1 + ], + "deps": [ + "org", + "promise", + "request" ], - "commit": "16179e57ce290190c222b27961900657a1981330", - "sha256": "1p77m2babfw544cl9vpfjlnmga79hxfwv13hhczywapfqxzki8y6" + "commit": "26a6674fcf6f16e4865ff5e6600bb273fdc77779", + "sha256": "1180kaj9cc16n2glpc04pnzbia17daxk7dawc7l1hba7mk9vq1wm" } }, { @@ -118735,15 +119918,15 @@ "repo": "hcl-emacs/terraform-mode", "unstable": { "version": [ - 20240321, - 2136 + 20240801, + 921 ], "deps": [ "dash", "hcl-mode" ], - "commit": "a645c32a8f0f0d04034262ae5fea330d5c7a33c6", - "sha256": "17zb4adh8j333nc4w4ywnw4kvljbanrnkmf0k7m6nv71rp1v56fr" + "commit": "abfc10f5e313c4bb99de136a14636e9bc6df74f6", + "sha256": "0rlzx80dx1gv0hcpkjnlvabhf124l442pfish1vii1jaqm5b07ps" }, "stable": { "version": [ @@ -118829,39 +120012,15 @@ "repo": "johannes-mueller/test-cockpit.el", "unstable": { "version": [ - 20240519, - 1747 + 20240604, + 1943 ], "deps": [ "projectile", "toml" ], - "commit": "2b836e5f954059210b6efaecebfe5fd7c72e726c", - "sha256": "0f62xly0pvsfqnkzm0yfflbd54mljbfc6jzp8kqk8w8598j548ak" - } - }, - { - "ename": "test-kitchen", - "commit": "420d18c76f593338fb28807fcbe3b884be5b1634", - "sha256": "1bl3yvj56dq147yplrcwphcxiwvmx5n97y4qpkm9imiv8cnjm1g0", - "fetcher": "github", - "repo": "jjasghar/test-kitchen-el", - "unstable": { - "version": [ - 20171129, - 2035 - ], - "commit": "0fc0ca4808425f03fbeb8125246043723e2a179a", - "sha256": "1pip15ysya8nsk1xgz6k6gcjm6g60922r0im2anq4j2gjzdja79k" - }, - "stable": { - "version": [ - 0, - 3, - 0 - ], - "commit": "ddbcb964ac4700973eaf30ae366f086e3319e51f", - "sha256": "004rd6jkaklsbgka9mf2zi5qzxsl2shwl1kw0vgb963xkmk9zaz8" + "commit": "068d3a393cebdc871236b8d1e45e06f997e2b0d0", + "sha256": "1dhnvymy00f2h039v1cp4fq8fxhybswwsx4qnpvdjilf1lbcvxiw" } }, { @@ -119322,21 +120481,21 @@ "repo": "facebook/fbthrift", "unstable": { "version": [ - 20240519, - 1631 + 20240818, + 2324 ], - "commit": "8baf3aed99934494267647ee8f309f9d712d4325", - "sha256": "0svd697slkv6k46byvca8b9l4vkxgikyxanik78iwpz52mmgpc88" + "commit": "a591631fe1e77459e71fab018f0c1b326a2f4c26", + "sha256": "0d9s46k0h8c7c3pcynlqyjy7bzff9884y8pi0yka6b5gvvn005xf" }, "stable": { "version": [ 2024, - 5, - 20, + 8, + 19, 0 ], - "commit": "8baf3aed99934494267647ee8f309f9d712d4325", - "sha256": "0svd697slkv6k46byvca8b9l4vkxgikyxanik78iwpz52mmgpc88" + "commit": "a591631fe1e77459e71fab018f0c1b326a2f4c26", + "sha256": "0d9s46k0h8c7c3pcynlqyjy7bzff9884y8pi0yka6b5gvvn005xf" } }, { @@ -119588,6 +120747,21 @@ } }, { + "ename": "timeout", + "commit": "2d6d0964343cd9e23babbcc71b1dee07ca1ccf4c", + "sha256": "1zna80pa1csnigkz2nfvwrjnqnji1cj8dmbgq4wkbjg66hk7fbmn", + "fetcher": "github", + "repo": "karthink/timeout", + "unstable": { + "version": [ + 20240623, + 2023 + ], + "commit": "d59ca149307182b20e9843db0dd1738e01504cf1", + "sha256": "1adbcam0cz7gkijjzgajybz9z2cfizxylfggamqp23w52c1nbrxm" + } + }, + { "ename": "timer-revert", "commit": "991e68c59d1fbaef06ba2583f07499ecad05586d", "sha256": "0lvm2irfx9rb5psm1lf53fv2jjx745n1c172xmyqip5xwgmf6msy", @@ -120064,16 +121238,16 @@ "repo": "abrochard/emacs-todoist", "unstable": { "version": [ - 20240113, - 1729 + 20240624, + 1512 ], "deps": [ "dash", "org", "transient" ], - "commit": "e756a345d213d93fbb965d1314c4dec62566c653", - "sha256": "18hnpmbbmn939s0z0ynjxl3fkgg9xzpj82rvks81xvv8nf19wfsx" + "commit": "205c730a4615dec20ea71ccd0a09479a420cb974", + "sha256": "11hgxg5q84ql9hhcz5wiqsx4hd6s2mrvzvl1axh6l7li8mji67r7" } }, { @@ -120099,11 +121273,11 @@ "repo": "avillafiorita/todotxt-mode", "unstable": { "version": [ - 20200228, - 952 + 20240802, + 604 ], - "commit": "8b616ce1cf3e18a60757450a0acf22996abb9b79", - "sha256": "1frvksra8s004xknlizs5gz5rhy9xbis5r353pzsybmn1bxa40wk" + "commit": "ca4310cfcce4d1f3a6670b31412a9b56462e5b5d", + "sha256": "0pjjc9saa08f0xmb06bisg03pmv0nbgsnqmdjz6pph8ilwc1x3hx" } }, { @@ -120140,6 +121314,21 @@ } }, { + "ename": "toggle-term", + "commit": "e93a5811bdce0beeacc539b702ca4afd53508fda", + "sha256": "1i37alcpsziyidxzm6dvcc29gd6fbminhj1sq7xmwrznpl4ja1m1", + "fetcher": "github", + "repo": "justinlime/toggle-term.el", + "unstable": { + "version": [ + 20240804, + 117 + ], + "commit": "54605ed1d03dbfd324d9bec4ee314ab764a2a8dd", + "sha256": "15cmn2zwcypx17zxii3m39a7jwb4fsxm9ix8ykbmnxnjfl7kzxha" + } + }, + { "ename": "toggle-test", "commit": "8ea51a54b745d9978c5177182cd8501912aa2d01", "sha256": "0n8m325jcjhz8g75ysb9whsd12gpxw8598y5065j7c7gxjzv45l1", @@ -120286,6 +121475,30 @@ } }, { + "ename": "tomorrow-night-deepblue-theme", + "commit": "5de4420ac32b3f10b7ab5a5dff2c6a7a8f22aeb2", + "sha256": "0bzg8m0bqmgvfhz4xcrpsiy7wfbls1sq6fjh2yj02nnfmkgzqcs1", + "fetcher": "github", + "repo": "jamescherti/tomorrow-night-deepblue-theme.el", + "unstable": { + "version": [ + 20240727, + 51 + ], + "commit": "6e970e273ca3e4228145e968401497b38f0c9760", + "sha256": "0cpb8blskri1347csi29vicxiim5lzqdz5q8dndi111vv0i4lz9h" + }, + "stable": { + "version": [ + 1, + 1, + 2 + ], + "commit": "5359e32f641ba4f2d596999d32a702182a1add73", + "sha256": "166a7ch6xcl4sw7wj541y7vg962yzjwf8p4c3bajf6r24l6hnllp" + } + }, + { "ename": "tongbu", "commit": "e97578be9aa9bdadc6bdf6c7105242ca9d23bf80", "sha256": "1gnjvb4w0mgr0swpqqk3hmscypv9bdg9q2ixkp2sv19d45gd4pvb", @@ -120741,34 +121954,34 @@ }, { "ename": "transient", - "commit": "af5c1593052d63146e850683c461a760ab166033", - "sha256": "11a2m4vdccn2yfn5aj2g5smiml69vidir9ss8c70pld17z1wzx07", + "commit": "6a9de9fbe3147c9816ac909cfe365e66e888f9b7", + "sha256": "1a7q41wn950nj3l19mrlp415svix0v1794f4dx3aja4f8shkzvb1", "fetcher": "github", "repo": "magit/transient", "unstable": { "version": [ - 20240509, - 1849 + 20240819, + 1250 ], "deps": [ "compat", "seq" ], - "commit": "3d395d643b1476b07c6c3d7217f5b2ad2c0b425e", - "sha256": "1vrnxd95dmf6v6nzvzcf4nxz4sag9qwl1hj2ciiffl2d420shjsh" + "commit": "042291c530f71ea778b40a43552ec7263da24e8a", + "sha256": "0iddjpzw9hbhpzq81fyc5qsgbiky93acz2gm57hfr9jj54807s1w" }, "stable": { "version": [ 0, - 6, - 0 + 7, + 4 ], "deps": [ "compat", "seq" ], - "commit": "55d5d41b48d7f7bc1ecf1f90c012d7821dff5724", - "sha256": "1mdcph2g0nbava3npa7bz463jqrz8rp9zmjgx8rqk7bdz2gd2yai" + "commit": "b2cb4e578f2362a0354c4a31a6bd89d6c4b63d63", + "sha256": "0ad0qkcvc9w6ry8f4b6xrdy52vlxm8nrp67k2p97w6prhyfxbp7p" } }, { @@ -121038,34 +122251,34 @@ }, { "ename": "tray", - "commit": "a3645b08cb46e3d91081da7baa982b5283918447", - "sha256": "1zr6v7kypm9icjgxj6hn0gw44cxbnx1w3lfgyr1zjngvj9n94h36", - "fetcher": "sourcehut", + "commit": "e11a2781aeca4a66c715913872406160ef535d0a", + "sha256": "0w9jhi55ya7ggsajghd61b7lzf962zafm2lqc5vk3jhd53iqf0rc", + "fetcher": "github", "repo": "tarsius/tray", "unstable": { "version": [ - 20240415, - 1549 + 20240811, + 29 ], "deps": [ "compat", "transient" ], - "commit": "1ce8c7c74dec199e1045fec3c79cb9ff433b1735", - "sha256": "1b1i5hb9r8z6r1npbip8swgfizdkhwl1x5b6b9k9552i6gxm1qbz" + "commit": "fca0ed0010473a61be135b2791426ae5463fe9ea", + "sha256": "14kasydd09aff3jn5zkyk4wp4q97741slin1389673l3l04hha1q" }, "stable": { "version": [ 0, 1, - 2 + 4 ], "deps": [ "compat", "transient" ], - "commit": "b8d48c81de06261926420d75608cc69f99970563", - "sha256": "1l8jmkpdc9mc6z6znmxa7g5n6sgvpy78rgrpxfcafgjiki8lmqqr" + "commit": "988afc5967237ed9acfd6d9a53c631e476fccc62", + "sha256": "117ddayip71gmn62v179jkqd28d4zjrdl2pz8cnfwmlxaf7236pi" } }, { @@ -121205,14 +122418,14 @@ "repo": "erickgnavar/tree-sitter-ispell.el", "unstable": { "version": [ - 20240522, - 1356 + 20240610, + 2252 ], "deps": [ "tree-sitter" ], - "commit": "960e68d6c4a296e5ecf10d27bfd8bac42ba4a2ed", - "sha256": "1v0v6m5g03ydv38a9465nx3i5qfi106macwd5s63rllx88m395xg" + "commit": "a06eff00affff85992d2a8ad0019034747ffeb70", + "sha256": "19x25a1plwnrc68hxvdnbra7djlikq8vz590bvyvwvq0g66khfpq" } }, { @@ -121223,26 +122436,26 @@ "repo": "emacs-tree-sitter/tree-sitter-langs", "unstable": { "version": [ - 20240519, - 717 + 20240818, + 1702 ], "deps": [ "tree-sitter" ], - "commit": "6ce3de71c21a55ffe33ecdead57fff290a5d07df", - "sha256": "1i36zfww14zjxlcq8gkwj5346356zfcx6ldi59bp9c7vvi2gavg8" + "commit": "1c3d95d018c6ab09dbe0b31530bfb1865fac2e5f", + "sha256": "0y34dvfnc1mp4z750mqk1i6f4526x430j0s6wk8cy630vj90p42n" }, "stable": { "version": [ 0, 12, - 196 + 212 ], "deps": [ "tree-sitter" ], - "commit": "6ce3de71c21a55ffe33ecdead57fff290a5d07df", - "sha256": "1i36zfww14zjxlcq8gkwj5346356zfcx6ldi59bp9c7vvi2gavg8" + "commit": "1c3d95d018c6ab09dbe0b31530bfb1865fac2e5f", + "sha256": "0y34dvfnc1mp4z750mqk1i6f4526x430j0s6wk8cy630vj90p42n" } }, { @@ -121253,14 +122466,14 @@ "repo": "purplg/treebundel", "unstable": { "version": [ - 20240210, - 343 + 20240531, + 2321 ], "deps": [ "compat" ], - "commit": "2d6c69cb7798a8cb7fcf9923c4580220dd48b3d4", - "sha256": "18winxkh1934jr19prp2yxlnl2vgh1yhrrvy1flg0l2r2pb5zrch" + "commit": "b0a5d1bf924d8cadde5bae50b8d9ac131279b828", + "sha256": "0smcnpmchm6kgxbdirfw6y17ad4innppab4xzpvvnixhnqbnr655" }, "stable": { "version": [ @@ -121319,8 +122532,8 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20240518, - 932 + 20240815, + 1227 ], "deps": [ "ace-window", @@ -121332,8 +122545,8 @@ "pfuture", "s" ], - "commit": "923fbbdea57b27ed3293079b13846206add85d9d", - "sha256": "1dw8igrag918c9s2pz80nmri09kxay10v617zafg91kdqzpnwgyy" + "commit": "488dfc0a3aa7c1d35802d4f89be058e761578663", + "sha256": "01gljyihn9wyishd39vxav8rdzy19wsp0jyd0kr7w7xv83rbm57n" }, "stable": { "version": [ @@ -121674,6 +122887,21 @@ } }, { + "ename": "treesit-ispell", + "commit": "08692fd0e799bbe2afe086e5fa146628cd97bdc1", + "sha256": "1dnzmw3vr59l7n2rryf6w4sfx9vay1626cb62yvk3zjxl2kpn0wj", + "fetcher": "github", + "repo": "erickgnavar/treesit-ispell.el", + "unstable": { + "version": [ + 20240816, + 145 + ], + "commit": "9e06b5a37945f3ff96a5cfbb79ea3e4c2986bd6a", + "sha256": "1fq5j8rx1crwdjxsg18i8l83m0fql9z2rnkfjgjxwc75p83b77hi" + } + }, + { "ename": "treeview", "commit": "76e3235134af34a522b5bee69f0a16a54cbd9b52", "sha256": "18df7xpz42z408784w0s39hwp5pxrramzrbk7zfbr4qrnxnk0bva", @@ -121709,6 +122937,29 @@ } }, { + "ename": "trimspace-mode", + "commit": "d960195dbd955244478aaac43db4ef924efb9b58", + "sha256": "016blxasn2ghrj49dq6bn8w1p8d3vglqf9f6bz74nq5iccy18kg4", + "fetcher": "sourcehut", + "repo": "bkhl/trimspace-mode", + "unstable": { + "version": [ + 20240629, + 1843 + ], + "commit": "68fb627ba552644ddee0cf9048b2fefd722a59fb", + "sha256": "1p86w9imcpmx1ck64782agrz6b00qm2w2h5xkg0kx2507l2zd3ci" + }, + "stable": { + "version": [ + 1, + 1 + ], + "commit": "ea7dd0d4847e10c77d174f537051db70233ecf6e", + "sha256": "0jj3jj4wc48jf23qxc3avg9acmapi4gzhjpqdzi68y2mx3bdrrz4" + } + }, + { "ename": "trinary", "commit": "48fff02dde8a678e151f2765ea7c3a383912c68b", "sha256": "1k2jpay1wx2m54fpja9mrhqyk15ikml8xf15irh8yrxb3hah8f8k", @@ -122254,20 +123505,20 @@ }, { "ename": "twtxt", - "commit": "5490cd1e9008185e1c587fccf70f796e5a4da296", - "sha256": "0fpq3nz30v0g355xq0pcwf8iqykvn9af1wdx76v5fgzimlrpwy7l", - "fetcher": "github", + "commit": "32ad9cfa9ce6471b368488c3048052668c48a616", + "sha256": "08001bdqa3q6klirad26skqigp6dv04w9992m1my1smvbbvjyppq", + "fetcher": "codeberg", "repo": "deadblackclover/twtxt-el", "unstable": { "version": [ - 20220628, - 309 + 20240730, + 151 ], "deps": [ "request" ], - "commit": "eb9efa19086fcae343353f6a5e88c3377fd06dd4", - "sha256": "142kjwh5ya237j10hj6kvm28d22l8vmhbaahpn87bl70lcpqv3fb" + "commit": "d6a0fc57bcc7dd4a4a76a0836beb33900878ea0b", + "sha256": "1s5xzi1zqvl6395ynyrlq89d8cisnwzsdj1hgyw6zzd2vz4xy65z" } }, { @@ -122278,11 +123529,11 @@ "repo": "emacs-typescript/typescript.el", "unstable": { "version": [ - 20240507, - 617 + 20240603, + 630 ], - "commit": "1cf78d7ef8e0a1684a2cf265539c54ccff4068c0", - "sha256": "1f2sba6ld55w6mdbwwz4kqfp2rsgmbdm88apxjfglsa5nlh7g50b" + "commit": "5bb294411ff06ad40186bb7ca141fdbfff902e09", + "sha256": "1gspkch0dv9fx22n1sp0yq0qj61lg43hc1n5x0nz8mzy6bxc6bsx" }, "stable": { "version": [ @@ -122301,20 +123552,20 @@ "repo": "KeyWeeUsr/typewriter-roll-mode", "unstable": { "version": [ - 20240225, - 1412 + 20240817, + 928 ], - "commit": "99afeb13bd0340a23176c4ebfdabc93117c04069", - "sha256": "0xz7b1bgrlqp4bprr3gsgq3vxvh17lk0jgwdxkfsxv6vffqrzc0a" + "commit": "9ce34ea14616e478f10abc49727d9e9cee6c5dc3", + "sha256": "0kjqimpgm8awjav0m796w3bb0qrbvm2i85cn6b37fxbxa6dsxhql" }, "stable": { "version": [ 1, - 1, + 2, 0 ], - "commit": "99afeb13bd0340a23176c4ebfdabc93117c04069", - "sha256": "0xz7b1bgrlqp4bprr3gsgq3vxvh17lk0jgwdxkfsxv6vffqrzc0a" + "commit": "9ce34ea14616e478f10abc49727d9e9cee6c5dc3", + "sha256": "0kjqimpgm8awjav0m796w3bb0qrbvm2i85cn6b37fxbxa6dsxhql" } }, { @@ -122612,14 +123863,14 @@ "repo": "crmsnbleyd/uiua-mode", "unstable": { "version": [ - 20231219, - 1706 + 20240711, + 852 ], "deps": [ "reformatter" ], - "commit": "24115f187212a89e600dfb870fc34880355846ed", - "sha256": "11lagjk8vwbls5dxqfcrrljn82f0rbljn9x4fz0sf96svja8j2va" + "commit": "20344ddaa401ed172e4b3649076ae33c117918a0", + "sha256": "0qnnwkbgx013zfiihw5lfahmqbcp8ic8d03a7z1d3ic5lx439phh" } }, { @@ -122671,6 +123922,21 @@ } }, { + "ename": "ulisp-mode", + "commit": "569af2df55b728a965bcc27f81c777917d1e7b4a", + "sha256": "0h6x4lsy0vd8dk6j32yzx2v4v7bnz5x9ph5rklhz628jnq8npjmp", + "fetcher": "codeberg", + "repo": "deadblackclover/ulisp-mode", + "unstable": { + "version": [ + 20240807, + 1000 + ], + "commit": "7f52f030e5bf6e98ba9eee75631a6e2b95f90583", + "sha256": "0iqkwrqmbcblnh00w0lsgnf79mcqdb52wrdx41mvq6hx31zgrcjp" + } + }, + { "ename": "uml-mode", "commit": "d2dbf909ca733aef6a3da6c48165aa3d2e9dc186", "sha256": "0arkq5cymlvnga5fgzjfy5a6i6zpr0g6m66ycmxa04h6qkd73m9i", @@ -122814,11 +124080,11 @@ "repo": "ideasman42/emacs-undo-fu", "unstable": { "version": [ - 20240422, - 6 + 20240707, + 1410 ], - "commit": "d935af2c57ecfa14248a70b3fe8a84fb78fef209", - "sha256": "1zy4sxllmh0qa876qnc4h89f5fda3vcrgs4xpy7y1bgbfcpwks0q" + "commit": "dbb3e4b699dd488497ef9b32a04b8e928a6bc8ef", + "sha256": "1f4vsg68fylcp2cqc74mbw4zls3n0zq8wvyd0vahy9km7fr753p4" } }, { @@ -122829,11 +124095,11 @@ "repo": "ideasman42/emacs-undo-fu-session", "unstable": { "version": [ - 20240421, - 834 + 20240713, + 1427 ], - "commit": "75d78310c86901f01b35d47f3ac1a5c8368abba4", - "sha256": "0ywyjg8zpa8dzz6sw5zvzfck44iapr0iymmpbxh4ymli663fmw9p" + "commit": "beb0e285d074145eaf481a959c903b77c19ae91e", + "sha256": "02wvdnzc229aga5pjb5sqbpi22afjqn6q5v8qay901bgc6r6f9pl" } }, { @@ -123549,6 +124815,35 @@ } }, { + "ename": "unspecified-theme", + "commit": "07bc4820654e760404593662ec75e5490b7e60e4", + "sha256": "0vh492v3hls2ahhwky7zi01blrkjpsfwi8ya9gjn1y55hmjicnr1", + "fetcher": "codeberg", + "repo": "mekeor/unspecified-theme", + "unstable": { + "version": [ + 20240620, + 2310 + ], + "deps": [ + "most-faces" + ], + "commit": "822f461bb04b4f8751bc2431140197a077d6c4a6", + "sha256": "1haa2ikg71q3irf7vsm1kbxvkn24hkmws33ci2c5lm39f81rz7f0" + }, + "stable": { + "version": [ + 0, + 3 + ], + "deps": [ + "most-faces" + ], + "commit": "822f461bb04b4f8751bc2431140197a077d6c4a6", + "sha256": "1haa2ikg71q3irf7vsm1kbxvkn24hkmws33ci2c5lm39f81rz7f0" + } + }, + { "ename": "untappd", "commit": "0d7b1541a317cc253a55696d752ea57453475b8f", "sha256": "10lqrsrg9kx6134mmc6r4vk1bvggdnjg5mi1xm2b057g11qs8afm", @@ -123670,20 +124965,20 @@ "repo": "ursalang/ursa-ts-mode", "unstable": { "version": [ - 20231119, - 1545 + 20240721, + 732 ], - "commit": "8a2a6011ff68852c0714a9ef17b25efc519fdd64", - "sha256": "0m515zx8k1gh5lji7fs97wcj8r0w488lzid7jrp1s7m3a6cd27hr" + "commit": "3ef802532520c31ba7a4101748bac516325890b5", + "sha256": "1hqqibzf2nz5apj4m41hilfwwp6i34bkw9mna63c90hy191kk8yq" }, "stable": { "version": [ 1, 3, - 5 + 6 ], - "commit": "8a2a6011ff68852c0714a9ef17b25efc519fdd64", - "sha256": "0m515zx8k1gh5lji7fs97wcj8r0w488lzid7jrp1s7m3a6cd27hr" + "commit": "3ef802532520c31ba7a4101748bac516325890b5", + "sha256": "1hqqibzf2nz5apj4m41hilfwwp6i34bkw9mna63c90hy191kk8yq" } }, { @@ -124749,11 +126044,11 @@ "repo": "federicotdn/verb", "unstable": { "version": [ - 20240426, - 2014 + 20240808, + 2150 ], - "commit": "24784e7a81a937b4b294a2a57238999c53d6e5d1", - "sha256": "1z47qjhb427hrdmpxmjq4h5q20lzppy35im46dl5m3yzvx3k5aha" + "commit": "ae0c111ab00eb3bc2657fa0f0e1ffb455103ceb0", + "sha256": "08dp2j1mdm5gz2s652w4lca3v7pqavv5qfp2vlgp2iv0dzs0na30" }, "stable": { "version": [ @@ -124810,8 +126105,8 @@ "repo": "gmlarumbe/verilog-ext", "unstable": { "version": [ - 20240407, - 1352 + 20240729, + 1502 ], "deps": [ "ag", @@ -124826,8 +126121,8 @@ "verilog-ts-mode", "yasnippet" ], - "commit": "1454457a85c9fb10145f45f80e1d3baa065017e5", - "sha256": "1rngn0w88a18hy1cba8qlc71zh3k5611rx4zgvnx8n0b8n6j1758" + "commit": "de2f4af5ff669d2006eb84ef4bbf9f6a30cfb478", + "sha256": "0lvklhrwx66i4snr50daiadlpmp2ip798l8jap7v11z6zbmr681q" }, "stable": { "version": [ @@ -124860,11 +126155,11 @@ "repo": "gmlarumbe/verilog-ts-mode", "unstable": { "version": [ - 20240406, - 2147 + 20240729, + 1918 ], - "commit": "f2dda1b25a06661569e393b04902be6a8e992b90", - "sha256": "18bmp1al4wsz7pcal39qbgb0q2zmib1xvjxz78ylwimpd8x81i7l" + "commit": "aa2dd2217006d414e4637cf69515508978fb8bc0", + "sha256": "17ff6j9a5qpccjfwvq6mz8l0jkz1pid70x8f4xmbc2zfrbpajk8g" }, "stable": { "version": [ @@ -124944,14 +126239,14 @@ "repo": "baron42bba/vertica-snippets", "unstable": { "version": [ - 20240327, - 1013 + 20240625, + 1023 ], "deps": [ "yasnippet" ], - "commit": "11dd101eb431b7fc7695e5ad3b2a6444ac49e7a4", - "sha256": "03zba07d7d1c96ygkw1779v9ybnaap2668ss5w92zfzc8b45yvdr" + "commit": "4d3019e72a62dcbfede3d4812c913d5e6210c488", + "sha256": "0kxx08nl39qs35i086lxmh8kw8ljl7npi86djpr7ksl6p3sx5m7k" } }, { @@ -124962,25 +126257,25 @@ "repo": "minad/vertico", "unstable": { "version": [ - 20240511, - 2047 + 20240726, + 2131 ], "deps": [ "compat" ], - "commit": "ba650a7ab90d66686ba787937ac9e71f749c598e", - "sha256": "0cxaqlg0mllrnf7zx7j6rdmx3x42s9b2marisi7zwfiymsnbgarr" + "commit": "d70fdeb67be9ecc88c438039eefa9ef0e2104005", + "sha256": "1jszk3dlw6r9h7i858paby341zh1rbbrxafjg1sp890a0cjdd50p" }, "stable": { "version": [ 1, - 8 + 9 ], "deps": [ "compat" ], - "commit": "1def56a1e678ff9a8eeafafda9c474a5fbb097c4", - "sha256": "0cxaqlg0mllrnf7zx7j6rdmx3x42s9b2marisi7zwfiymsnbgarr" + "commit": "d70fdeb67be9ecc88c438039eefa9ef0e2104005", + "sha256": "1jszk3dlw6r9h7i858paby341zh1rbbrxafjg1sp890a0cjdd50p" } }, { @@ -124991,29 +126286,30 @@ "repo": "radian-software/prescient.el", "unstable": { "version": [ - 20240505, - 2249 + 20240803, + 2320 ], "deps": [ "compat", "prescient", "vertico" ], - "commit": "0765418e4362099db8788fcb745ce9b7602aa001", - "sha256": "1194racjqb6m2npsdyzbyf77ajrw8qkaq87ciy2z9fxxmzgwj84w" + "commit": "2b8a8b41228bddb2e11eb1c200e98a9edd04797c", + "sha256": "0qz3xv38vazxqsl7lan7fshj3gmb0qagkrvl5xzwqhdg0rir981j" }, "stable": { "version": [ 6, - 3 + 3, + 1 ], "deps": [ "compat", "prescient", "vertico" ], - "commit": "c39bf07c56b427bf41aafd7d20eaef5cf3c312b5", - "sha256": "0pfc0ycp4cr9zwkjv3rqfkwkx8p52ad7aq2c60j0qwp3yd0cghc4" + "commit": "2b8a8b41228bddb2e11eb1c200e98a9edd04797c", + "sha256": "0qz3xv38vazxqsl7lan7fshj3gmb0qagkrvl5xzwqhdg0rir981j" } }, { @@ -125068,8 +126364,8 @@ "repo": "gmlarumbe/vhdl-ext", "unstable": { "version": [ - 20240407, - 1353 + 20240808, + 1543 ], "deps": [ "ag", @@ -125081,14 +126377,14 @@ "ripgrep", "vhdl-ts-mode" ], - "commit": "bd5f97d811f4444ab523a5faace8e599a90d972d", - "sha256": "1x72kmwzyhwkxrqx4ijajz8wsxm389mj48ba2y9z1vpsiijvp7i6" + "commit": "ead58dc7615b8d923aab6e72c842be336ae3cf92", + "sha256": "0b77qwkqgyf9s3zwxnyln67nf9q2k2jlymgi0rp5bfn799z4yjhb" }, "stable": { "version": [ 0, 5, - 0 + 1 ], "deps": [ "ag", @@ -125100,8 +126396,8 @@ "ripgrep", "vhdl-ts-mode" ], - "commit": "08fc11c16c1e4425fe1dcc352e005c193112c1d7", - "sha256": "1q474h728zf6fv7zkh6fhfb81icqmyn48g6df79106z28vvfqdz7" + "commit": "ead58dc7615b8d923aab6e72c842be336ae3cf92", + "sha256": "0b77qwkqgyf9s3zwxnyln67nf9q2k2jlymgi0rp5bfn799z4yjhb" } }, { @@ -125145,20 +126441,20 @@ "repo": "gmlarumbe/vhdl-ts-mode", "unstable": { "version": [ - 20240406, - 2155 + 20240808, + 1032 ], - "commit": "eaeefce408085159cacf1ee9424fee20f20b6c39", - "sha256": "0p7qw4b8p1rgxd6zh9gpgxvhx7cr0xb9sjykmz74mscl4nfg7wck" + "commit": "807fdb43151edcf5bd91399246fc3f6da1326d27", + "sha256": "1wfsx9258j20il6b11s7lilmnk4dmriznsb6b3w29mp2xkn9hpkz" }, "stable": { "version": [ 0, 1, - 2 + 3 ], - "commit": "eaeefce408085159cacf1ee9424fee20f20b6c39", - "sha256": "0p7qw4b8p1rgxd6zh9gpgxvhx7cr0xb9sjykmz74mscl4nfg7wck" + "commit": "807fdb43151edcf5bd91399246fc3f6da1326d27", + "sha256": "1wfsx9258j20il6b11s7lilmnk4dmriznsb6b3w29mp2xkn9hpkz" } }, { @@ -125252,6 +126548,30 @@ } }, { + "ename": "vim-tab-bar", + "commit": "bf6f8f47c5cab38b0cfb0a5bd3f4b02cc4968f3a", + "sha256": "0v103a25ilc3hkh5n15rw5a2gs6i3m35cazsw5fd77756s5ix44l", + "fetcher": "github", + "repo": "jamescherti/vim-tab-bar.el", + "unstable": { + "version": [ + 20240714, + 2213 + ], + "commit": "b0846f214602a96a0c812029b10494749eb373a2", + "sha256": "0jk5qly6l85q6k5b7y6rbxqcqqd8bhw7fs2wa91bpsy1hv0qbwir" + }, + "stable": { + "version": [ + 1, + 0, + 6 + ], + "commit": "b0846f214602a96a0c812029b10494749eb373a2", + "sha256": "0jk5qly6l85q6k5b7y6rbxqcqqd8bhw7fs2wa91bpsy1hv0qbwir" + } + }, + { "ename": "vimgolf", "commit": "1de0a1cdc8fd33601ecca982fa9aa66f4400843b", "sha256": "15xq5vm82hy4pjw04m7xcqav7azsb3c65lp8cfxa29z7xg81w62f", @@ -125685,11 +127005,11 @@ "repo": "emacs-vs/vs-dark-theme", "unstable": { "version": [ - 20240521, - 2336 + 20240729, + 2203 ], - "commit": "d0d9fb57582677fc1f9a4a1467ec3f6470aff0d6", - "sha256": "03qy8d7vbnkx2ssfby7kgdjmz691rqw4vlikhpb37xkmhsqa0w0d" + "commit": "54f887bea8a5846b96febd1faf93c5910b8ac10b", + "sha256": "0rs1ppx82bhvnjakn4k12ycfxlia8v0gzbv8wgmyxr4gkl8c1n2g" }, "stable": { "version": [ @@ -125708,11 +127028,11 @@ "repo": "emacs-vs/vs-light-theme", "unstable": { "version": [ - 20240521, - 2340 + 20240729, + 2203 ], - "commit": "bc0250f261c066f576fa13112dcfbb10a4e5c6ef", - "sha256": "1ys5xhll909zfx02hf2gqbwcf3jcq83b5xxvajrr6xxqwa4mk9h3" + "commit": "e07fdeb808763b65dd918d7ae936744bc60d49fa", + "sha256": "0c4djxj5wzp394rdn3q425qcdpgzm5qla7s4dykpn9ysj0dsj71w" }, "stable": { "version": [ @@ -125778,6 +127098,21 @@ } }, { + "ename": "vsh-mode", + "commit": "9a1a2389ac6878bda016186a6741f4296b845615", + "sha256": "1wkcl9shpzvgzqpbs9wqjwhf0y8nbysyimq3wwiinxxmvpxybgnd", + "fetcher": "github", + "repo": "hardenedapple/vsh", + "unstable": { + "version": [ + 20240730, + 2036 + ], + "commit": "0d98be666ccc59f9b31521d20dda8d0e07dd53cd", + "sha256": "0l7m8i40hfhnd4jrvkjn4n18nfbigmh4sdbc0086mgn9xn23shv5" + } + }, + { "ename": "vterm", "commit": "a560fc2dbcfd37485890faf5243fbdb653ecaf99", "sha256": "196vad9hh44pc8r1qd7pv92wr4wa0ni92gjb8bd066a6aagxr6s7", @@ -125785,11 +127120,29 @@ "repo": "akermu/emacs-libvterm", "unstable": { "version": [ - 20240520, - 231 + 20240705, + 1533 + ], + "commit": "d9ea29fb10aed20512bd95dc5b8c1a01684044b1", + "sha256": "1q62yav93i3485iy7d4v1y00s0zyc0r9v06xb9r49rw70j6x4vmf" + } + }, + { + "ename": "vterm-hotkey", + "commit": "16c2db3a88115057c3ca6814046c3b63ef4fd00e", + "sha256": "1w0a7rzgws43i2hm2pgmcx5kzd7g4y531s7c761lb1dvf6a94s9d", + "fetcher": "github", + "repo": "rootatpixel/vterm-hotkey", + "unstable": { + "version": [ + 20240702, + 1445 + ], + "deps": [ + "vterm" ], - "commit": "df057b1af2bb89a1deb288086f13be296af42090", - "sha256": "11j89pldhmw9v2g1sqcg4piniijz4wzgmim1jv46iwnaiwzw20fi" + "commit": "039033a4c30dabca625d6924d1796bb9e13d85c7", + "sha256": "15xgb48q3jhhxn2il9bvldmsd8y0ffsc2ccjv1sf4xks7csj14l3" } }, { @@ -125929,8 +127282,8 @@ "repo": "d12frosted/vulpea", "unstable": { "version": [ - 20231113, - 717 + 20240716, + 1704 ], "deps": [ "dash", @@ -125938,8 +127291,8 @@ "org-roam", "s" ], - "commit": "e1ea8480daf3e480effdd7ba3799126295a4a59a", - "sha256": "1xv394dx122np58p281nqgrfnp6zjwqbvmqnpjsn6vxl59rqq1c6" + "commit": "f10da46d16af259aba7d703551b4aea42be8bad9", + "sha256": "085cqrx7w4lcx6m1bgwkgy3g2zhwyfpwm131c6qwg07v3ryilhp7" }, "stable": { "version": [ @@ -126044,11 +127397,11 @@ "repo": "emacs-w3m/emacs-w3m", "unstable": { "version": [ - 20231023, - 653 + 20240712, + 248 ], - "commit": "55baf2bcb1a583d3baae1d37ad0e17b0480ffd02", - "sha256": "1vqr7bmairp70lrx9gm80w7qr2jxiijg5w1na36k7if4wikfg4kl" + "commit": "a3dd9b16224893ef1d75ee9bf0c2b088bc2a5d92", + "sha256": "1sb2p0gxb8z9im0h5pky0fhvcxjhajsyd1gicfnhl8cqxmjjf907" } }, { @@ -126121,11 +127474,11 @@ "repo": "wakatime/wakatime-mode", "unstable": { "version": [ - 20240203, - 1221 + 20240623, + 653 ], - "commit": "25fb775178d16decb818b75f32fd23301c0f5da0", - "sha256": "0l8y0xinbh3l7d7klwvxrrc6q9zp51x7p8brapx56knh819w1bvk" + "commit": "1c5b2254dd72f2ff504d6a6189a8c10be03a98d1", + "sha256": "00qv6b756qiaqrmfg1w03psnsdj0iaz3sp50ib4kmdm2g9vgxl1s" } }, { @@ -126609,11 +127962,11 @@ "repo": "fxbois/web-mode", "unstable": { "version": [ - 20240413, - 1455 + 20240804, + 821 ], - "commit": "005aa62d6f41fbf9bc045cac3b3b772716ee8ba7", - "sha256": "15bd89dwpvsfgc2m0jnnmmwqfqzrd2z9nv2qjdac339ddivm2lp8" + "commit": "0c83581d1e93d1d802c730a1d5e90cd1c740e1b2", + "sha256": "0lvixg4c5apwrpqljj11b3yrq8nklz4ky4njnh8y6h1j5bisx40p" }, "stable": { "version": [ @@ -126803,14 +128156,14 @@ "repo": "emacs-love/weblorg", "unstable": { "version": [ - 20230828, - 150 + 20240711, + 940 ], "deps": [ "templatel" ], - "commit": "a889b29fc6e0d06a1480b1bf524f06a5be2022d7", - "sha256": "1zgmb6sjba71l5pb8ajqnm1sjaav291y849l3mwc50pv7b7pzch6" + "commit": "0db218bd6b2e083546d3a69a022dfb1a08900acd", + "sha256": "0fijrzc96p3jkq53i65bzhmxqyg28a49n21glkzb5b21agy0cdqh" }, "stable": { "version": [ @@ -127233,6 +128586,24 @@ } }, { + "ename": "whaler", + "commit": "b93a326420601a67a932315566b6bb6f25091800", + "sha256": "196qna6zrvsjy4x5f1i034a30b6935wmaklzdlgvadd1cz24nr94", + "fetcher": "github", + "repo": "SalOrak/whaler.el", + "unstable": { + "version": [ + 20240714, + 1833 + ], + "deps": [ + "f" + ], + "commit": "6909cc2280b9c0846255ca98b9f6420ec37efbc3", + "sha256": "1nrdyxfh7jidl9826gx20xvawmk63hqla80vgkyw0ab212sbv9k8" + } + }, + { "ename": "what-the-commit", "commit": "9af2c90af887e37c080a4a70e84ec5691c599d94", "sha256": "1lzafqw6j4xc7y8vg3q84wc1xxhc6z39dlw1sjs2vwnm9xzjnkl4", @@ -127255,11 +128626,11 @@ "repo": "justbur/emacs-which-key", "unstable": { "version": [ - 20240501, - 1251 + 20240620, + 2145 ], - "commit": "1e89fa000e9ba9549f15ef57abccd118d5f2fe1a", - "sha256": "01g5fgrbdgzh302ah7pqdrf98hxgah40140jjwfrx3mwcdicj7f1" + "commit": "ed389312170df955aaf10c2e120cc533ed5c509e", + "sha256": "084alfpigq5jdsdr7qh47xl3b8bwqv2ncm4df4gry1hxzpjrcjsw" }, "stable": { "version": [ @@ -127462,14 +128833,11 @@ "repo": "purcell/whole-line-or-region", "unstable": { "version": [ - 20201214, - 650 - ], - "deps": [ - "cl-lib" + 20240630, + 804 ], - "commit": "ba193b2034388bbc384cb04093150fca56f7e262", - "sha256": "0k6x3x9a9wgq94aiil4jdn84py2mqvmmwrjc1s0mx2qvhgwln2q1" + "commit": "f39fd03cf563ffdf57144a7586a5e845969fc641", + "sha256": "1l8xpfssvcfdm6q606h5sriais5i8a6j8s0i8gd6gjafby11s59y" }, "stable": { "version": [ @@ -128076,32 +129444,32 @@ }, { "ename": "with-editor", - "commit": "af5c1593052d63146e850683c461a760ab166033", - "sha256": "1wsl1vwvywlc32r5pcc9jqd0pbzq1sn4fppxk3vwl0s5h40v8rnb", + "commit": "6a9de9fbe3147c9816ac909cfe365e66e888f9b7", + "sha256": "10vj9b0m52k0f89mbmlgzx7y04k6g5zjp6i143vb6h3y66b0qpax", "fetcher": "github", "repo": "magit/with-editor", "unstable": { "version": [ - 20240415, - 1558 + 20240817, + 1959 ], "deps": [ "compat" ], - "commit": "1b4526453ef6bdee30635f469aa26085c02b1ac1", - "sha256": "1qv84lg4g4kihv53vrklm0rmh9hqiwk23bynldiwvmiq39fqasyw" + "commit": "8c550d9e799a0baedb2164471e7ed19fc15d9196", + "sha256": "1k9g1hrf6bdslbj1hkc71brj4sh45n837g1a128prxb70lkf6g2m" }, "stable": { "version": [ 3, - 3, - 2 + 4, + 1 ], "deps": [ "compat" ], - "commit": "d5f3f06cb830311e60c58f656988ef37c05a99e0", - "sha256": "1wzzymlka4f798m75kizjh1yvnh49y8m029c7p5pg7gbv6d0wd8a" + "commit": "78c303a0181f2132e2254f965176b549044d74f2", + "sha256": "1hnc0jbjdpjr7xzh8gmhxkcbpw6mbla9vg8vy6py6mdk7ap1zqj8" } }, { @@ -128237,6 +129605,36 @@ } }, { + "ename": "wiz", + "commit": "a197e0ebe77fc4d4b93bef2d92be41901eb7fba7", + "sha256": "0d5v4wrvy706pg8gkhijljhddpxxr69mlnd7an32ibw79zpbn19y", + "fetcher": "github", + "repo": "zonuexe/emacs-wiz", + "unstable": { + "version": [ + 20240629, + 447 + ], + "deps": [ + "exec-path-from-shell" + ], + "commit": "4f48029d39b870c9e6545516af1be9764e08cccc", + "sha256": "1cq12w81gbw2gmv92y9grh7fbfwhab73z9gwxwycz300xzakzydz" + }, + "stable": { + "version": [ + 0, + 0, + 5 + ], + "deps": [ + "exec-path-from-shell" + ], + "commit": "2c88a65205b11f97d20c3de907ccb19aa5830175", + "sha256": "0gi36imnx6gpv3jbjkd1dx2y7273cbn2a0lwzyczr17h6mq97h4r" + } + }, + { "ename": "wn-mode", "commit": "6213c01e6954985daff8cd1a5a3ef004431f0477", "sha256": "1qy1pkfdnm4pska4cnff9cx2c812ilymajhpmsfc9jdbvhzwrwg3", @@ -128885,14 +130283,14 @@ "repo": "jobbflykt/x509-mode", "unstable": { "version": [ - 20231215, - 850 + 20240801, + 719 ], "deps": [ "compat" ], - "commit": "b19260d9863f1f7e310154fef71b1f3bd0871241", - "sha256": "1angyjpr28zjsw5blsjrqn7vfvlz02pkqxx9ckrjjq14mx2yi125" + "commit": "d62e83f1041680df8de7bbfe19aaaa0f2dfa79b6", + "sha256": "0dbi5fwid24ilrvagj0s9v9gn1737889swycm20vggkdcij8fzh8" } }, { @@ -129109,15 +130507,28 @@ "repo": "akirak/xmind-org-el", "unstable": { "version": [ - 20220907, - 1310 + 20240723, + 1455 + ], + "deps": [ + "dash", + "org-ml" + ], + "commit": "01055f0b9a53d40c9ce6a7b1c259a3a73b4ff413", + "sha256": "0z2fchg19jqjalhkd64yx7l3s5rpgb04kvbgcg6s9ld70w8y94gr" + }, + "stable": { + "version": [ + 0, + 1, + 1 ], "deps": [ "dash", "org-ml" ], - "commit": "79f0b1d95af2a1b8436cee2d3d6c6115d9c6483d", - "sha256": "0khq7zm04pgj7a9alr2yl5s4q6xxyg5zyr90gkixbbc1g3xg59qh" + "commit": "01055f0b9a53d40c9ce6a7b1c259a3a73b4ff413", + "sha256": "0z2fchg19jqjalhkd64yx7l3s5rpgb04kvbgcg6s9ld70w8y94gr" } }, { @@ -129526,11 +130937,11 @@ "repo": "canatella/xwwp", "unstable": { "version": [ - 20200917, - 643 + 20240701, + 1040 ], - "commit": "f67e070a6e1b233e60274deb717274b000923231", - "sha256": "1ikhgi3gc86w7y3cjmw875c8ccsmj22yn1zm3abprdzbjqlyzhhg" + "commit": "0c875e460d1c0637766204dc289ffbd0f2284194", + "sha256": "0a5rl4p0kywzpwmawi8cwyk47nawblan0y01s6v6vbnyb8ylcgs3" } }, { @@ -129778,26 +131189,26 @@ "repo": "zkry/yaml-pro", "unstable": { "version": [ - 20240520, - 1215 + 20240623, + 1904 ], "deps": [ "yaml" ], - "commit": "d57cbd84ad0afd0fd3168e3d0e6cb5969b610b39", - "sha256": "1h6a6na77xfm88qcly6nc1r6bmf5l9aihjdyajfagfdms1wh8qf3" + "commit": "5f06949e92dc19dcc48dc31662b2aa958fe33726", + "sha256": "0affakq60pyi649gnc7xvjcb7dg1h8rvmwbcpxd2zicj9np289h2" }, "stable": { "version": [ 1, - 1, + 2, 0 ], "deps": [ "yaml" ], - "commit": "d57cbd84ad0afd0fd3168e3d0e6cb5969b610b39", - "sha256": "1h6a6na77xfm88qcly6nc1r6bmf5l9aihjdyajfagfdms1wh8qf3" + "commit": "5f06949e92dc19dcc48dc31662b2aa958fe33726", + "sha256": "0affakq60pyi649gnc7xvjcb7dg1h8rvmwbcpxd2zicj9np289h2" } }, { @@ -130027,14 +131438,14 @@ "repo": "elken/yasnippet-capf", "unstable": { "version": [ - 20240420, - 1531 + 20240716, + 1054 ], "deps": [ "yasnippet" ], - "commit": "ea2bbf4f1c5c133ca7105a5cda2bc01c8e378ef5", - "sha256": "07aqjni44hick55mphz4xq6rap7m3p5nbbc7x63984r0aa25ckac" + "commit": "4c2e33d70cd1d95cf1e08d134b058a6dd90a99c9", + "sha256": "0zqwrk1sssivjl9mjj9wm8s8c83hn23r3gxv13hg6dzh97rxllk8" } }, { @@ -130063,25 +131474,25 @@ "repo": "AndreaCrotti/yasnippet-snippets", "unstable": { "version": [ - 20240507, - 943 + 20240603, + 757 ], "deps": [ "yasnippet" ], - "commit": "6fafad13bb4689600285d9e38c61958dd63c356d", - "sha256": "0p38k8a3l9vpph1g2a6wz40y30wb2nhp770rv8947bxzjc5xc0gf" + "commit": "1bf034887c4048c38266842686b7f9c8384f72e7", + "sha256": "17r0p2yk0164i1sc4rl55sykpgk5f21kv958dqdhrf39r4gj0r4k" }, "stable": { "version": [ 1, - 0 + 1 ], "deps": [ "yasnippet" ], - "commit": "c0ef1e8cfd05ef77b9240f3d9e8f0798bbcf9a58", - "sha256": "0m78jxhjyf4212ig2ncxr6bhhd6yx4c3nc8x4ylamzq21x4fl21r" + "commit": "6fafad13bb4689600285d9e38c61958dd63c356d", + "sha256": "0p38k8a3l9vpph1g2a6wz40y30wb2nhp770rv8947bxzjc5xc0gf" } }, { @@ -130256,26 +131667,26 @@ "url": "https://git.thanosapollo.org/yeetube", "unstable": { "version": [ - 20240411, - 1328 + 20240708, + 2037 ], "deps": [ "compat" ], - "commit": "dfcbb8498b30b83d6f97d5777603d5f2dce39298", - "sha256": "013j8nm736lpkp2ygmgwdfbrylmwvlsgbf6qmscpfvn01n6w9s37" + "commit": "bd5418635f3483930d267bcb44cd3744db4ea3ac", + "sha256": "0z6kdzgpri5qqxdpxdl8qb4rgv32557rc4wac8mrh5a0jf682p42" }, "stable": { "version": [ 2, 1, - 4 + 7 ], "deps": [ "compat" ], - "commit": "f9feada5c09fa8245f0230696557f7e7ffa266f1", - "sha256": "1gpfm41d4wzk1i0hnmfn81xv05ida9ljibar7ji4d7nisjbd4vp9" + "commit": "5c0a3efd2fb5cc25a6a90741ad198e31fdb15640", + "sha256": "0a3pm8cz6yl5s2xnbnjvdwm8mf5hyman419xl4fyyfgwy6vrxp70" } }, { @@ -130654,11 +132065,11 @@ "repo": "bbatsov/zenburn-emacs", "unstable": { "version": [ - 20240331, - 1350 + 20240612, + 1258 ], - "commit": "14dda0596a7cd0750fc6566eacc203a126f136c2", - "sha256": "1cyspxwjjhflafkyb2mkcfc1227i8kzmxgz3yvrj3ykdsim9pjwy" + "commit": "15f48bfc6b52d112f3c3fd98e533bda9138ffdd2", + "sha256": "1nzqj55nc9klvgxhd20z1n1c06v453hjxf7s70gspa4v1pwgvjaz" }, "stable": { "version": [ @@ -130779,26 +132190,58 @@ "url": "https://gitlab.emacsos.com/sylecn/zero-el", "unstable": { "version": [ - 20200405, - 1220 + 20240527, + 728 ], "deps": [ "s" ], - "commit": "729da9f4b99acb744ee6974ed7f3d4e252fd19da", - "sha256": "1bcka4gzcb5r2y5g7a06l05n6ixvs7lm37w4ghvvq12ci2ypzp04" + "commit": "e87bbf24c1475a784ad9d1ba8447e038824d796b", + "sha256": "1p9mfmaq54jy0g1nwma46kq8562i3a5d6gfw5w3r53i9xd4vq0w3" }, "stable": { "version": [ 2, - 8, - 0 + 10, + 3 ], "deps": [ "s" ], - "commit": "729da9f4b99acb744ee6974ed7f3d4e252fd19da", - "sha256": "1bcka4gzcb5r2y5g7a06l05n6ixvs7lm37w4ghvvq12ci2ypzp04" + "commit": "e87bbf24c1475a784ad9d1ba8447e038824d796b", + "sha256": "1p9mfmaq54jy0g1nwma46kq8562i3a5d6gfw5w3r53i9xd4vq0w3" + } + }, + { + "ename": "zero-input-panel-posframe", + "commit": "a5ac1339f742f8ccc36eaf9fde5085bbc2ab42a0", + "sha256": "104ccz5s49m6y5si4k8qs7vv4w7a1zahy0isvr104jwihjsdnvix", + "fetcher": "git", + "url": "https://gitlab.emacsos.com/sylecn/zero-input-panel-posframe.git", + "unstable": { + "version": [ + 20240526, + 1604 + ], + "deps": [ + "posframe", + "zero-input" + ], + "commit": "714102090ba87b75a06b87792df696f6f48c2ea8", + "sha256": "0ffq6xi0spsy4rbksrbm5j2ny90szsklf3qymdxygp5kmc0ghia7" + }, + "stable": { + "version": [ + 1, + 0, + 1 + ], + "deps": [ + "posframe", + "zero-input" + ], + "commit": "01d5a8f94b7936152ae719e25ffc19574f7b0cc5", + "sha256": "12rgfmcbikip97nqwmbj4wsjcb8yb9yh7iiqab4vbpm4la4j63ip" } }, { @@ -131106,8 +132549,8 @@ "repo": "WillForan/zim-wiki-mode", "unstable": { "version": [ - 20230927, - 1410 + 20240613, + 8 ], "deps": [ "dokuwiki-mode", @@ -131116,8 +132559,8 @@ "link-hint", "pretty-hydra" ], - "commit": "7c62e0304750654709b4173bcc1e2681cf1fbe49", - "sha256": "1vfc48vz0ajcqcdx89wrwd3ksncwjlvi1via681d88y9in9bpbv4" + "commit": "11e077afbe21f2dd33fe7eae39c2a8345bb0b806", + "sha256": "0lc1rikrd5rhjy8p7ar649kxdv5slnkmkra6f7j00sbjwhw7bc89" } }, { @@ -131146,19 +132589,19 @@ "repo": "localauthor/zk", "unstable": { "version": [ - 20240102, - 1405 + 20240812, + 1148 ], - "commit": "82f636c1edda416794c7115757ecded64f22afbf", - "sha256": "1rxrasmhk28h3z9iyssvnhf3a57y2xmfjbl4il3mfd98gg6mhb8i" + "commit": "930e6904d8d14bff80a689ffe93c6b1dc15828ca", + "sha256": "1chrymrpl1szk6zbnfd375vj9a1c2xxapdv4ivkmz6cymsr8mbm7" }, "stable": { "version": [ 0, - 6 + 7 ], - "commit": "5be59ca972f3f624d444b7b7d7ca75a06bcd2ce5", - "sha256": "0hijdi10l44ky8j66qz6bxmg1vnfhikkd65iqfb3ycg1kwzd4r9p" + "commit": "599be69ae1c1283935f98f9aca4ccda47063d82c", + "sha256": "0449zsahyzvjlhv27lkj33ybnq86j47paww779zd0qhq550hdnjs" } }, { @@ -131169,27 +132612,27 @@ "repo": "localauthor/zk", "unstable": { "version": [ - 20240102, - 1405 + 20240812, + 1148 ], "deps": [ "zk", "zk-index" ], - "commit": "82f636c1edda416794c7115757ecded64f22afbf", - "sha256": "1rxrasmhk28h3z9iyssvnhf3a57y2xmfjbl4il3mfd98gg6mhb8i" + "commit": "930e6904d8d14bff80a689ffe93c6b1dc15828ca", + "sha256": "1chrymrpl1szk6zbnfd375vj9a1c2xxapdv4ivkmz6cymsr8mbm7" }, "stable": { "version": [ 0, - 6 + 7 ], "deps": [ "zk", "zk-index" ], - "commit": "5be59ca972f3f624d444b7b7d7ca75a06bcd2ce5", - "sha256": "0hijdi10l44ky8j66qz6bxmg1vnfhikkd65iqfb3ycg1kwzd4r9p" + "commit": "599be69ae1c1283935f98f9aca4ccda47063d82c", + "sha256": "0449zsahyzvjlhv27lkj33ybnq86j47paww779zd0qhq550hdnjs" } }, { @@ -131200,25 +132643,25 @@ "repo": "localauthor/zk", "unstable": { "version": [ - 20240102, - 1405 + 20240819, + 1355 ], "deps": [ "zk" ], - "commit": "82f636c1edda416794c7115757ecded64f22afbf", - "sha256": "1rxrasmhk28h3z9iyssvnhf3a57y2xmfjbl4il3mfd98gg6mhb8i" + "commit": "7d3ef8524d35d0e431ef91b14f1a1af5ca08e36d", + "sha256": "06cjr1nkbj667rwx3pp8cq7nd677h0v6i48b206dmpnghckj63gz" }, "stable": { "version": [ 0, - 6 + 7 ], "deps": [ "zk" ], - "commit": "5be59ca972f3f624d444b7b7d7ca75a06bcd2ce5", - "sha256": "0hijdi10l44ky8j66qz6bxmg1vnfhikkd65iqfb3ycg1kwzd4r9p" + "commit": "599be69ae1c1283935f98f9aca4ccda47063d82c", + "sha256": "0449zsahyzvjlhv27lkj33ybnq86j47paww779zd0qhq550hdnjs" } }, { @@ -131229,15 +132672,15 @@ "repo": "localauthor/zk-luhmann", "unstable": { "version": [ - 20240102, - 1406 + 20240812, + 1143 ], "deps": [ "zk", "zk-index" ], - "commit": "836943c5f6c6cdb932762385bbdf79e8bcfef3d7", - "sha256": "14wcqq6p7m1gq382y638fjcdvpd7206lrcrh5abnrprsyjxlr3l7" + "commit": "55eef9712984deab320fb1a952c0624af2988128", + "sha256": "11dj42pvfyqa0i6a31n2iicxrrh0psvvsiqq0pbrwk90hz7map34" } }, { @@ -131263,26 +132706,26 @@ "repo": "nnicandro/emacs-zmq", "unstable": { "version": [ - 20230608, - 1856 + 20240716, + 2000 ], "deps": [ "cl-lib" ], - "commit": "9d5679c54f361f518a426586b51686674fd3b0fa", - "sha256": "1bg4c26f8n1jy6z9dr2c9fz79myy9lbb5z67797qp1cbx8k6p3n7" + "commit": "1d9d5a3b46cfd1a90a45ff777f200eb4d5d6fd9e", + "sha256": "0brdnp5fp4gxiq2dz3szb9fdmbs88i1qfqzv03lqzr7arqwn9svk" }, "stable": { "version": [ 1, 0, - 0 + 1 ], "deps": [ "cl-lib" ], - "commit": "9d5679c54f361f518a426586b51686674fd3b0fa", - "sha256": "1bg4c26f8n1jy6z9dr2c9fz79myy9lbb5z67797qp1cbx8k6p3n7" + "commit": "37d42dc37506234aa4b35bec6c98500e6f648363", + "sha256": "171cm487jbdqi73lk7vc9dsrzhxqic0yvy1vvxwk3b9qx1m2ab6v" } }, { @@ -131743,11 +133186,11 @@ "repo": "pesterhazy/zprint-mode.el", "unstable": { "version": [ - 20240311, - 941 + 20240619, + 1639 ], - "commit": "cd7ae7400177b3c233a77c2a46de818c72375362", - "sha256": "0dygbbasz8mxbz6n6zcsd1xj1n3ab35yxiabjwgi7zlikxigjipw" + "commit": "ac3b25e250c83aedc49d1eab508142e3060e3833", + "sha256": "19aan4a2vidlr2ahsjyrlx318zqd7yyblxsw34a2hzj2pjx45l59" } }, { @@ -131769,21 +133212,6 @@ } }, { - "ename": "zweilight-theme", - "commit": "6440f81aed1fcddcaf7afeedb74520e605211986", - "sha256": "1j8skn9hz1zkpdg7q0njv5b50cbvrixjjmkp43p58gx98q02p0kq", - "fetcher": "github", - "repo": "philiparvidsson/Zweilight-Theme-for-Emacs", - "unstable": { - "version": [ - 20170113, - 605 - ], - "commit": "890f27c939d8a358c9ef0f402fc3314f475ec874", - "sha256": "0pl254c61405n6sgr01qj4z42vqdvbmf59nz55cl23l2q7kdbfdv" - } - }, - { "ename": "zygospore", "commit": "7fabdb05de9b8ec18a3a566f99688b50443b6b44", "sha256": "0n9qs6fymdjly0i4rmx87y8gapfn5sqivsivcffi42vcb5f17kxj", diff --git a/pkgs/applications/editors/emacs/elisp-packages/update-elpa b/pkgs/applications/editors/emacs/elisp-packages/update-elpa index ba2964b2ead09..6cf3bafd24e16 100755 --- a/pkgs/applications/editors/emacs/elisp-packages/update-elpa +++ b/pkgs/applications/editors/emacs/elisp-packages/update-elpa @@ -1,4 +1,6 @@ #! /usr/bin/env nix-shell #! nix-shell --show-trace ./emacs2nix.nix -i bash -exec elpa-packages.sh --names $EMACS2NIX/names.nix -o elpa-generated.nix +output="elpa-generated.nix" +elpa-packages.sh --names $EMACS2NIX/names.nix -o "$output" +nixfmt "$output" diff --git a/pkgs/applications/editors/emacs/elisp-packages/update-elpa-devel b/pkgs/applications/editors/emacs/elisp-packages/update-elpa-devel index b5af44424763c..356d93167af88 100755 --- a/pkgs/applications/editors/emacs/elisp-packages/update-elpa-devel +++ b/pkgs/applications/editors/emacs/elisp-packages/update-elpa-devel @@ -1,4 +1,6 @@ #! /usr/bin/env nix-shell #! nix-shell --show-trace ./emacs2nix.nix -i bash -exec elpa-devel-packages.sh --names $EMACS2NIX/names.nix -o elpa-devel-generated.nix +output="elpa-devel-generated.nix" +elpa-devel-packages.sh --names $EMACS2NIX/names.nix -o "$output" +nixfmt "$output" diff --git a/pkgs/applications/editors/emacs/elisp-packages/update-from-overlay b/pkgs/applications/editors/emacs/elisp-packages/update-from-overlay index 1344bb380c01e..5879f4e3eab56 100755 --- a/pkgs/applications/editors/emacs/elisp-packages/update-from-overlay +++ b/pkgs/applications/editors/emacs/elisp-packages/update-from-overlay @@ -33,8 +33,10 @@ download_change "elpa/elpa-generated.nix" download_change "elpa/elpa-devel-generated.nix" download_change "melpa/recipes-archive-melpa.json" download_change "nongnu/nongnu-generated.nix" +download_change "nongnu/nongnu-devel-generated.nix" test_packageset "nongnuPackages" +test_packageset "nongnuDevelPackages" test_packageset "elpaPackages" test_packageset "elpaDevelPackages" test_packageset "melpaStablePackages" @@ -44,3 +46,4 @@ commit_change "elpa-packages" "elpa-generated.nix" commit_change "elpa-devel-packages" "elpa-devel-generated.nix" commit_change "melpa-packages" "recipes-archive-melpa.json" commit_change "nongnu-packages" "nongnu-generated.nix" +commit_change "nongnu-devel-packages" "nongnu-devel-generated.nix" diff --git a/pkgs/applications/editors/emacs/elisp-packages/update-nongnu b/pkgs/applications/editors/emacs/elisp-packages/update-nongnu index dc43a86efbe3d..9a4b20716c152 100755 --- a/pkgs/applications/editors/emacs/elisp-packages/update-nongnu +++ b/pkgs/applications/editors/emacs/elisp-packages/update-nongnu @@ -1,4 +1,6 @@ #! /usr/bin/env nix-shell #! nix-shell --show-trace ./emacs2nix.nix -i bash -exec nongnu-packages.sh --names $EMACS2NIX/names.nix -o nongnu-generated.nix +output="nongnu-generated.nix" +nongnu-packages.sh --names $EMACS2NIX/names.nix -o "$output" +nixfmt "$output" diff --git a/pkgs/applications/editors/emacs/elisp-packages/update-nongnu-devel b/pkgs/applications/editors/emacs/elisp-packages/update-nongnu-devel new file mode 100755 index 0000000000000..a1f5f950d4387 --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/update-nongnu-devel @@ -0,0 +1,6 @@ +#! /usr/bin/env nix-shell +#! nix-shell --show-trace ./emacs2nix.nix -i bash + +output="nongnu-devel-generated.nix" +nongnu-devel-packages.sh --names $EMACS2NIX/names.nix -o "$output" +nixfmt "$output" diff --git a/pkgs/applications/editors/emacs/elisp-packages/updater-emacs.nix b/pkgs/applications/editors/emacs/elisp-packages/updater-emacs.nix index 0f69da2384d53..f527e64f0885f 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/updater-emacs.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/updater-emacs.nix @@ -3,27 +3,32 @@ let emacsEnv = pkgs.emacs.pkgs.withPackages (epkgs: let - promise = epkgs.trivialBuild { + promise = epkgs.melpaBuild { pname = "promise"; - version = "1"; + version = "0-unstable-2019-06-07"; + src = pkgs.fetchFromGitHub { owner = "bendlas"; repo = "emacs-promise"; rev = "4da97087c5babbd8429b5ce62a8323b9b03c6022"; - sha256 = "0yin7kj69g4zxs30pvk47cnfygxlaw7jc7chr3b36lz51yqczjsy"; + hash = "sha256-XsvPsA/lUzPWyJAdJg9XtD/vLDtk7guG7p+8ZOQ8Nno="; }; + + packageRequires = [ epkgs.async ]; }; - semaphore = epkgs.trivialBuild { + semaphore = epkgs.melpaBuild { pname = "semaphore"; - version = "1"; - packageRequires = [ promise ]; + version = "0-unstable-2019-06-07"; + src = pkgs.fetchFromGitHub { owner = "webnf"; repo = "semaphore.el"; rev = "93802cb093073bc6a6ccd797328dafffcef248e0"; - sha256 = "09pfyp27m35sv340xarhld7xx2vv5fs5xj4418709iw6l6hpk853"; + hash = "sha256-o6B5oaGGxwQOCoTIXrQre4veT6Mwqw7I2LqMesT17iY="; }; + + packageRequires = [ promise ]; }; in [ promise semaphore ]); diff --git a/pkgs/applications/editors/emacs/make-emacs.nix b/pkgs/applications/editors/emacs/make-emacs.nix index 59cced7ec49a5..8c53805978340 100644 --- a/pkgs/applications/editors/emacs/make-emacs.nix +++ b/pkgs/applications/editors/emacs/make-emacs.nix @@ -16,14 +16,12 @@ , dbus , emacsPackagesFor , fetchpatch -, gconf , gettext , giflib , glib-networking , gnutls , gpm , gsettings-desktop-schemas -, gtk2-x11 , gtk3 , gtk3-x11 , harfbuzz @@ -31,7 +29,6 @@ , jansson , libXaw , libXcursor -, libXft , libXi , libXpm , libgccjit @@ -60,6 +57,7 @@ , texinfo , webkitgtk , wrapGAppsHook3 +, zlib # Boolean flags , withNativeCompilation ? stdenv.buildPlatform.canExecute stdenv.hostPlatform @@ -69,34 +67,33 @@ , withAlsaLib ? false , withAthena ? false , withCsrc ? true -, withDbus ? stdenv.isLinux -, withGTK2 ? false +, withDbus ? stdenv.hostPlatform.isLinux , withGTK3 ? withPgtk && !noGui -, withGconf ? false , withGlibNetworking ? withPgtk || withGTK3 || (withX && withXwidgets) -, withGpm ? stdenv.isLinux +, withGpm ? stdenv.hostPlatform.isLinux , withImageMagick ? lib.versionOlder version "27" && (withX || withNS) +# Emacs 30+ has native JSON support +, withJansson ? lib.versionOlder version "30" , withMailutils ? true , withMotif ? false -, withNS ? stdenv.isDarwin && !(variant == "macport" || noGui) +, withNS ? stdenv.hostPlatform.isDarwin && !(variant == "macport" || noGui) , withPgtk ? false -, withSelinux ? stdenv.isLinux +, withSelinux ? stdenv.hostPlatform.isLinux , withSQLite3 ? lib.versionAtLeast version "29" , withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd , withToolkitScrollBars ? true , withTreeSitter ? lib.versionAtLeast version "29" , withWebP ? lib.versionAtLeast version "29" -, withX ? !(stdenv.isDarwin || noGui || withPgtk) +, withX ? !(stdenv.hostPlatform.isDarwin || noGui || withPgtk) , withXinput2 ? withX && lib.versionAtLeast version "29" -, withXwidgets ? !stdenv.isDarwin && !noGui && (withGTK3 || withPgtk) +, withXwidgets ? !stdenv.hostPlatform.isDarwin && !noGui && (withGTK3 || withPgtk) && (lib.versionOlder version "30") # XXX: upstream bug 66068 precludes newer versions of webkit2gtk (https://lists.gnu.org/archive/html/bug-gnu-emacs/2024-09/msg00695.html) , withSmallJaDic ? false , withCompressInstall ? true # Options , siteStart ? ./site-start.el , toolkit ? ( - if withGTK2 then "gtk2" - else if withGTK3 then "gtk3" + if withGTK3 then "gtk3" else if withMotif then "motif" else if withAthena then "athena" else "lucid") @@ -117,17 +114,13 @@ , WebKit }: -assert (withGTK2 && !withNS && variant != "macport") -> withX; assert (withGTK3 && !withNS && variant != "macport") -> withX || withPgtk; -assert noGui -> !(withX || withGTK2 || withGTK3 || withNS || variant == "macport"); -assert withAcl -> stdenv.isLinux; -assert withAlsaLib -> stdenv.isLinux; -assert withGTK2 -> !(withGTK3 || withPgtk); -assert withGTK3 -> !withGTK2 || withPgtk; -assert withGconf -> withX; -assert withGpm -> stdenv.isLinux; -assert withNS -> stdenv.isDarwin && !(withX || variant == "macport"); +assert noGui -> !(withX || withGTK3 || withNS || variant == "macport"); +assert withAcl -> stdenv.hostPlatform.isLinux; +assert withAlsaLib -> stdenv.hostPlatform.isLinux; +assert withGpm -> stdenv.hostPlatform.isLinux; +assert withNS -> stdenv.hostPlatform.isDarwin && !(withX || variant == "macport"); assert withPgtk -> withGTK3 && !withX; assert withXwidgets -> !noGui && (withGTK3 || withPgtk); @@ -135,8 +128,8 @@ let libGccJitLibraryPaths = [ "${lib.getLib libgccjit}/lib/gcc" "${lib.getLib stdenv.cc.libc}/lib" - ] ++ lib.optionals (stdenv.cc?cc.libgcc) [ - "${lib.getLib stdenv.cc.cc.libgcc}/lib" + ] ++ lib.optionals (stdenv.cc?cc.lib.libgcc) [ + "${lib.getLib stdenv.cc.cc.lib.libgcc}/lib" ]; inherit (if variant == "macport" @@ -149,7 +142,6 @@ mkDerivation (finalAttrs: { else if variant == "macport" then "-macport" else if withPgtk then "-pgtk" else if withGTK3 then "-gtk3" - else if withGTK2 then "-gtk2" else ""); inherit version; @@ -159,7 +151,9 @@ mkDerivation (finalAttrs: { (substituteAll { src = if lib.versionOlder finalAttrs.version "29" then ./native-comp-driver-options-28.patch - else ./native-comp-driver-options.patch; + else if lib.versionOlder finalAttrs.version "30" + then ./native-comp-driver-options.patch + else ./native-comp-driver-options-30.patch; backendPath = (lib.concatStringsSep " " (builtins.map (x: ''"-B${x}"'') ([ # Paths necessary so the JIT compiler finds its libraries: @@ -214,17 +208,17 @@ mkDerivation (finalAttrs: { ] ++ lib.optionals srcRepo [ autoreconfHook texinfo - ] ++ lib.optional (withPgtk || withX && (withGTK3 || withXwidgets)) wrapGAppsHook3; + ] ++ lib.optionals (withPgtk || withX && (withGTK3 || withXwidgets)) [ wrapGAppsHook3 ]; buildInputs = [ gettext gnutls - harfbuzz.dev + (lib.getDev harfbuzz) + ] ++ lib.optionals withJansson [ jansson + ] ++ [ libxml2 ncurses - ] ++ lib.optionals withGconf [ - gconf ] ++ lib.optionals withAcl [ acl ] ++ lib.optionals withAlsaLib [ @@ -235,13 +229,11 @@ mkDerivation (finalAttrs: { dbus ] ++ lib.optionals withSelinux [ libselinux - ] ++ lib.optionals (!stdenv.isDarwin && withGTK3) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin && withGTK3) [ gsettings-desktop-schemas - ] ++ lib.optionals (stdenv.isLinux && withX) [ + ] ++ lib.optionals (stdenv.hostPlatform.isLinux && withX) [ libotf m17n_lib - ] ++ lib.optionals (withX && withGTK2) [ - gtk2-x11 ] ++ lib.optionals (withX && withGTK3) [ gtk3-x11 ] ++ lib.optionals (withX && withMotif) [ @@ -250,6 +242,7 @@ mkDerivation (finalAttrs: { glib-networking ] ++ lib.optionals withNativeCompilation [ libgccjit + zlib ] ++ lib.optionals withImageMagick [ imagemagick ] ++ lib.optionals withPgtk [ @@ -282,7 +275,7 @@ mkDerivation (finalAttrs: { libXi ] ++ lib.optionals withXwidgets [ webkitgtk - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ sigtool ] ++ lib.optionals withNS [ librsvg @@ -298,12 +291,13 @@ mkDerivation (finalAttrs: { OSAKit Quartz QuartzCore - UniformTypeIdentifiers WebKit # TODO are these optional? GSS ImageCaptureCore ImageIO + ] ++ lib.optionals (variant == "macport" && stdenv.hostPlatform.isAarch64) [ + UniformTypeIdentifiers ]; # Emacs needs to find movemail at run time, see info (emacs) Movemail @@ -338,7 +332,7 @@ mkDerivation (finalAttrs: { (lib.withFeature true "mac") (lib.withFeature true "xml2") ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ (lib.withFeature withNS "ns") ] ++ [ @@ -405,7 +399,7 @@ mkDerivation (finalAttrs: { -f batch-native-compile $out/share/emacs/site-lisp/site-start.el ''; - postFixup = lib.optionalString (stdenv.isLinux && withX && toolkit == "lucid") '' + postFixup = lib.optionalString (stdenv.hostPlatform.isLinux && withX && toolkit == "lucid") '' patchelf --add-rpath ${lib.makeLibraryPath [ libXcursor ]} $out/bin/emacs patchelf --add-needed "libXcursor.so.1" "$out/bin/emacs" ''; diff --git a/pkgs/applications/editors/emacs/native-comp-driver-options-30.patch b/pkgs/applications/editors/emacs/native-comp-driver-options-30.patch new file mode 100644 index 0000000000000..bd3ff2adf77c1 --- /dev/null +++ b/pkgs/applications/editors/emacs/native-comp-driver-options-30.patch @@ -0,0 +1,16 @@ +diff -Naur a/lisp/emacs-lisp/comp.el b/lisp/emacs-lisp/comp.el +--- old/lisp/emacs-lisp/comp.el 1969-12-31 21:00:01.000000000 -0300 ++++ source/lisp/emacs-lisp/comp.el 2024-09-13 14:26:37.246614196 -0300 +@@ -101,8 +101,10 @@ + :version "28.1") + + (defcustom native-comp-driver-options +- (cond ((eq system-type 'darwin) '("-Wl,-w")) +- ((eq system-type 'cygwin) '("-Wl,-dynamicbase"))) ++ (append ++ (cond ((eq system-type 'darwin) '("-Wl,-w")) ++ ((eq system-type 'cygwin) '("-Wl,-dynamicbase"))) ++ '(@backendPath@)) + "Options passed verbatim to the native compiler's back-end driver. + Note that not all options are meaningful; typically only the options + affecting the assembler and linker are likely to be useful. diff --git a/pkgs/applications/editors/emacs/sources.nix b/pkgs/applications/editors/emacs/sources.nix index 487d8a3680a6d..ae93a2ed019a1 100644 --- a/pkgs/applications/editors/emacs/sources.nix +++ b/pkgs/applications/editors/emacs/sources.nix @@ -104,10 +104,18 @@ in emacs29 = import ./make-emacs.nix (mkArgs { pname = "emacs"; - version = "29.3"; + version = "29.4"; variant = "mainline"; - rev = "29.3"; - hash = "sha256-4yN81djeKb9Hlr6MvaDdXqf4XOl0oolXEYGqkA+KUO0="; + rev = "29.4"; + hash = "sha256-FCP6ySkN9mAdp2T09n6foS2OciqZXc/54guRZ0B4Z2s="; + }); + + emacs30 = import ./make-emacs.nix (mkArgs { + pname = "emacs"; + version = "30.0.91"; + variant = "mainline"; + rev = "30.0.91"; + hash = "sha256-X5J34BUY42JgA1s76eVeGA9WNtesU2c+JyndIHFbONQ="; }); emacs28-macport = import ./make-emacs.nix (mkArgs { diff --git a/pkgs/applications/editors/flpsed/default.nix b/pkgs/applications/editors/flpsed/default.nix index ae541b8dd7685..09caf3a271f3f 100644 --- a/pkgs/applications/editors/flpsed/default.nix +++ b/pkgs/applications/editors/flpsed/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { homepage = "https://flpsed.org/flpsed.html"; license = licenses.gpl3; platforms = platforms.linux; - maintainers = with maintainers; [ ]; + maintainers = [ ]; mainProgram = "flpsed"; }; } diff --git a/pkgs/applications/editors/geany/default.nix b/pkgs/applications/editors/geany/default.nix index f6755905c7394..8268c7c867897 100644 --- a/pkgs/applications/editors/geany/default.nix +++ b/pkgs/applications/editors/geany/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: { outputs = [ "out" "dev" "doc" "man" ]; src = fetchurl { - url = "https://download.geany.org/${finalAttrs.pname}-${finalAttrs.version}.tar.bz2"; + url = "https://download.geany.org/geany-${finalAttrs.version}.tar.bz2"; hash = "sha256-VltM0vAxHB46Fn7HHEoy26ZC4P5VSuW7a4F3t6dMzJI="; }; diff --git a/pkgs/applications/editors/gedit/correct-gir-lib-path.patch b/pkgs/applications/editors/gedit/correct-gir-lib-path.patch index b3689e4206693..3243243760007 100644 --- a/pkgs/applications/editors/gedit/correct-gir-lib-path.patch +++ b/pkgs/applications/editors/gedit/correct-gir-lib-path.patch @@ -1,13 +1,16 @@ diff --git a/gedit/meson.build b/gedit/meson.build -index a8683e61a..fc48669f7 100644 +index bc689e5..e3b90d8 100644 --- a/gedit/meson.build +++ b/gedit/meson.build -@@ -191,7 +191,7 @@ libgedit_shared_lib = shared_library( - c_args: libgedit_c_args, - link_args: libgedit_link_args, - install: true, -- install_dir: get_option('libdir') / 'gedit', -+ install_dir: get_option('prefix') / get_option('libdir') / 'gedit', - ) +@@ -165,9 +165,9 @@ libgedit_private_headers += 'gedit-enum-types-private.h' + subdir('resources') - # GObject Introspection + if host_machine.system() == 'windows' +- libgedit_shared_lib_install_dir = get_option('libdir') ++ libgedit_shared_lib_install_dir = get_option('prefix') / get_option('libdir') + else +- libgedit_shared_lib_install_dir = get_option('libdir') / 'gedit' ++ libgedit_shared_lib_install_dir = get_option('prefix') / get_option('libdir') / 'gedit' + endif + + libgedit_shared_lib = shared_library( diff --git a/pkgs/applications/editors/gedit/default.nix b/pkgs/applications/editors/gedit/default.nix index c3fc6fae2dcf1..7a1edc7294b11 100644 --- a/pkgs/applications/editors/gedit/default.nix +++ b/pkgs/applications/editors/gedit/default.nix @@ -4,7 +4,6 @@ , mesonEmulatorHook , fetchurl , python3 -, python3Packages , pkg-config , gtk3 , gtk-mac-integration @@ -30,13 +29,13 @@ stdenv.mkDerivation rec { pname = "gedit"; - version = "47.0"; + version = "48.0"; outputs = [ "out" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gedit/${lib.versions.major version}/gedit-${version}.tar.xz"; - sha256 = "+kpZfjTHbUrJFDG1rm4ZHJbGsK8XAuCJmrNRme36G/o="; + sha256 = "/g/vm3sHmRINuGrok6BgA2oTRFNS3tkWm6so04rPDoA="; }; patches = [ @@ -54,7 +53,6 @@ stdenv.mkDerivation rec { perl pkg-config python3 - python3Packages.wrapPython vala wrapGAppsHook3 gtk-doc @@ -73,7 +71,7 @@ stdenv.mkDerivation rec { libgedit-gtksourceview libgedit-tepl libpeas - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ gtk-mac-integration ]; @@ -87,16 +85,6 @@ stdenv.mkDerivation rec { # Reliably fails to generate gedit-file-browser-enum-types.h in time enableParallelBuilding = false; - pythonPath = with python3Packages; [ - # https://github.com/NixOS/nixpkgs/issues/298716 - pycairo - ]; - - postFixup = '' - buildPythonPath "$pythonPath" - patchPythonScript $out/lib/gedit/plugins/snippets/document.py - ''; - passthru = { updateScript = gnome.updateScript { packageName = "gedit"; @@ -104,7 +92,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "https://gedit-technology.github.io/apps/gedit/"; + homepage = "https://gitlab.gnome.org/World/gedit/gedit"; description = "Former GNOME text editor"; maintainers = with maintainers; [ bobby285271 ]; license = licenses.gpl2Plus; diff --git a/pkgs/applications/editors/glow/default.nix b/pkgs/applications/editors/glow/default.nix index 79e871561c075..5da1e6e2f07a8 100644 --- a/pkgs/applications/editors/glow/default.nix +++ b/pkgs/applications/editors/glow/default.nix @@ -3,34 +3,27 @@ , fetchFromGitHub , installShellFiles , stdenv -, fetchpatch }: buildGoModule rec { pname = "glow"; - version = "1.5.1"; + version = "2.0.0"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "glow"; rev = "v${version}"; - hash = "sha256-12UziCf3BO1z+W02slNCCvXhIkvZuVgXk++BdHG3gDI="; + hash = "sha256-gPy3MnQHmBJl06oVOpwQB4qIpJ10kUNMNMPkpsIujeI="; }; - vendorHash = "sha256-xxFC87t12bZKea9Snscul+xx8IGFAcoIr9Z8wxHL7nM="; + vendorHash = "sha256-vxw8yqY6MxIIWeSX1D+unb0VbBmIpz1431N7UNORJP0="; - # Remove whenever a release with it is available - patches = [(fetchpatch { - url = "https://github.com/charmbracelet/glow/commit/f0734709f0be19a34e648caaf63340938a50caa2.patch"; - name = "go-1-17-patch"; - hash = "sha256-vpMiVb/7SFT9xcSpVGQriEjkexh1F/ljpfpIswdBx2Y="; - })]; - - doCheck = false; + nativeBuildInputs = [ installShellFiles ]; ldflags = [ "-s" "-w" "-X=main.Version=${version}" ]; - nativeBuildInputs = [ installShellFiles ]; + doCheck = false; + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd glow \ --bash <($out/bin/glow completion bash) \ diff --git a/pkgs/applications/editors/gnome-builder/default.nix b/pkgs/applications/editors/gnome-builder/default.nix index 9bcbbe32d1c1a..769d5c68cbf78 100644 --- a/pkgs/applications/editors/gnome-builder/default.nix +++ b/pkgs/applications/editors/gnome-builder/default.nix @@ -42,13 +42,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-builder"; - version = "46.2"; + version = "46.3"; outputs = [ "out" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-builder/${lib.versions.major finalAttrs.version}/gnome-builder-${finalAttrs.version}.tar.xz"; - hash = "sha256-DIV7iQA7JHh/Kx0qrhLSdaB0xmhLSIA7SMACdtk3GWM="; + hash = "sha256-EvJ8DipKcxb59+IYWd9r8bd1cNKWb5V6QzBvaZ7FRhI="; }; patches = [ diff --git a/pkgs/applications/editors/gnome-latex/default.nix b/pkgs/applications/editors/gnome-latex/default.nix deleted file mode 100644 index 2c9ecd828a643..0000000000000 --- a/pkgs/applications/editors/gnome-latex/default.nix +++ /dev/null @@ -1,83 +0,0 @@ -{ stdenv -, lib -, fetchurl -, fetchpatch -, autoreconfHook -, gtk-doc -, vala -, gobject-introspection -, wrapGAppsHook3 -, gsettings-desktop-schemas -, gspell -, libgedit-gtksourceview -, libgedit-tepl -, libgee -, gnome -, glib -, pkg-config -, gettext -, itstool -, libxml2 -}: - -stdenv.mkDerivation rec { - version = "3.46.0"; - pname = "gnome-latex"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1nVVY5sqFaiuvVTzNTVORP40MxQ648s8ynqOJvgRKto="; - }; - - patches = [ - # Adapt for Tepl -> libgedit-tepl rename - (fetchpatch { - url = "https://gitlab.gnome.org/swilmet/gnome-latex/-/commit/41e532c427f43a5eed9081766963d6e29a9975a1.patch"; - hash = "sha256-gu8o/er4mP92dE5gWg9lGx5JwTHB8ytk3EMNlwlIpq4="; - }) - ]; - - nativeBuildInputs = [ - pkg-config - autoreconfHook - gtk-doc - vala - gobject-introspection - wrapGAppsHook3 - itstool - gettext - ]; - - buildInputs = [ - gnome.adwaita-icon-theme - glib - gsettings-desktop-schemas - gspell - libgedit-gtksourceview - libgedit-tepl - libgee - libxml2 - ]; - - configureFlags = [ - "--disable-dconf-migration" - ]; - - doCheck = true; - - env.NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; - - passthru.updateScript = gnome.updateScript { - packageName = pname; - versionPolicy = "odd-unstable"; - }; - - meta = with lib; { - homepage = "https://gitlab.gnome.org/swilmet/gnome-latex"; - description = "LaTeX editor for the GNOME desktop"; - maintainers = with maintainers; [ manveru bobby285271 ]; - license = licenses.gpl3Plus; - platforms = platforms.linux; - mainProgram = "gnome-latex"; - }; -} diff --git a/pkgs/applications/editors/heh/default.nix b/pkgs/applications/editors/heh/default.nix index 7fd704ab6e8bb..f89ee5a76a0a5 100644 --- a/pkgs/applications/editors/heh/default.nix +++ b/pkgs/applications/editors/heh/default.nix @@ -7,20 +7,20 @@ rustPlatform.buildRustPackage rec { pname = "heh"; - version = "0.5.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "ndd7xv"; repo = pname; rev = "v${version}"; - hash = "sha256-zkb+HogwioqxZ+BTl7bcDQx9i9uWhT2QdAIXpHqvDl0="; + hash = "sha256-eqWBTylvXqGhWdSGHdTM1ZURSD5pkUBoBOvBJ5zmJ7w="; }; - buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ AppKit ]); - cargoHash = "sha256-YcTaLq04NhmnJ1pdbiKMRIBSFvHNWNgoAS8Uz8uGGAw="; + cargoHash = "sha256-rLZgKLL28/ZrXzHVI6m4YeV2mk4E9W58HjTzRl2bMOw="; meta = with lib; { description = "Cross-platform terminal UI used for modifying file data in hex or ASCII"; diff --git a/pkgs/applications/editors/helix/default.nix b/pkgs/applications/editors/helix/default.nix index fe2979bc56baf..28c8cfe3dfa0f 100644 --- a/pkgs/applications/editors/helix/default.nix +++ b/pkgs/applications/editors/helix/default.nix @@ -2,17 +2,17 @@ rustPlatform.buildRustPackage rec { pname = "helix"; - version = "24.03"; + version = "24.07"; # This release tarball includes source code for the tree-sitter grammars, # which is not ordinarily part of the repository. src = fetchzip { url = "https://github.com/helix-editor/helix/releases/download/${version}/helix-${version}-source.tar.xz"; - hash = "sha256-1myVGFBwdLguZDPo1jrth/q2i5rn5R2+BVKIkCCUalc="; + hash = "sha256-R8foMx7YJ01ZS75275xPQ52Ns2EB3OPop10F4nicmoA="; stripRoot = false; }; - cargoHash = "sha256-THzPUVcmboVJHu3rJ6rev3GrkNilZRMlitCx7M1+HBE="; + cargoHash = "sha256-Y8zqdS8vl2koXmgFY0hZWWP1ZAO8JgwkoPTYPVpkWsA="; nativeBuildInputs = [ git installShellFiles ]; diff --git a/pkgs/applications/editors/hexcurse/default.nix b/pkgs/applications/editors/hexcurse/default.nix index 17291a458a4b5..a4d9905d6fa7a 100644 --- a/pkgs/applications/editors/hexcurse/default.nix +++ b/pkgs/applications/editors/hexcurse/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/LonnyGomes/hexcurse"; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ ]; + maintainers = [ ]; mainProgram = "hexcurse"; }; } diff --git a/pkgs/applications/editors/ht/default.nix b/pkgs/applications/editors/ht/default.nix index 363466e160d0b..a72bac0c27c2d 100644 --- a/pkgs/applications/editors/ht/default.nix +++ b/pkgs/applications/editors/ht/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { homepage = "https://hte.sourceforge.net"; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ ]; + maintainers = [ ]; mainProgram = "ht"; }; } diff --git a/pkgs/applications/editors/jetbrains/bin/ides.json b/pkgs/applications/editors/jetbrains/bin/ides.json index b44aa560e5432..2d5495d68b69c 100644 --- a/pkgs/applications/editors/jetbrains/bin/ides.json +++ b/pkgs/applications/editors/jetbrains/bin/ides.json @@ -1,4 +1,15 @@ { + "aqua": { + "product": "Aqua", + "wmClass": "jetbrains-aqua", + "meta": { + "isOpenSource": false, + "description": "Test automation IDE from JetBrains", + "maintainers": [ "remcoschrijver" ], + "longDescription": "Aqua is a test automation IDE from jetbrains that can deal with many languages and frameworks to improve your test workflows. Has support for popular testing frameworks like Selenium, Cypress, and Playwright.", + "homepage": "https://www.jetbrains.com/aqua/" + } + }, "clion": { "product": "CLion", "wmClass": "jetbrains-clion", diff --git a/pkgs/applications/editors/jetbrains/bin/linux.nix b/pkgs/applications/editors/jetbrains/bin/linux.nix index d9f0391ba8daa..b1ddb8f5cb62b 100644 --- a/pkgs/applications/editors/jetbrains/bin/linux.nix +++ b/pkgs/applications/editors/jetbrains/bin/linux.nix @@ -59,6 +59,7 @@ with stdenv; lib.makeOverridable mkDerivation (rec { startupWMClass = wmClass; }; + vmoptsIDE = if hiName == "WEBSTORM" then "WEBIDE" else hiName; vmoptsFile = lib.optionalString (vmopts != null) (writeText vmoptsName vmopts); nativeBuildInputs = [ makeWrapper patchelf unzip autoPatchelfHook ]; @@ -103,7 +104,14 @@ with stdenv; lib.makeOverridable mkDerivation (rec { jdk=${jdk.home} item=${desktopItem} - wrapProgram "$out/$pname/bin/${loName}.sh" \ + launcher="$out/$pname/bin/${loName}" + if [ -e "$launcher" ]; then + rm "$launcher".sh # We do not wrap the old script-style launcher anymore. + else + launcher+=.sh + fi + + wrapProgram "$launcher" \ --prefix PATH : "${lib.makeBinPath [ jdk coreutils gnugrep which git ]}" \ --suffix PATH : "${lib.makeBinPath [ python3 ]}" \ --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath extraLdPath}" \ @@ -114,9 +122,9 @@ with stdenv; lib.makeOverridable mkDerivation (rec { --set-default JETBRAINS_CLIENT_JDK "$jdk" \ --set-default ${hiName}_JDK "$jdk" \ --set-default LOCALE_ARCHIVE "${glibcLocales}/lib/locale/locale-archive" \ - --set-default ${hiName}_VM_OPTIONS ${vmoptsFile} + --set-default ${vmoptsIDE}_VM_OPTIONS ${vmoptsFile} - ln -s "$out/$pname/bin/${loName}.sh" $out/bin/$pname + ln -s "$launcher" $out/bin/$pname rm -rf $out/$pname/plugins/remote-dev-server/selfcontained/ echo -e '#!/usr/bin/env bash\n'"$out/$pname/bin/remote-dev-server.sh"' "$@"' > $out/$pname/bin/remote-dev-server-wrapped.sh chmod +x $out/$pname/bin/remote-dev-server-wrapped.sh diff --git a/pkgs/applications/editors/jetbrains/bin/update_bin.py b/pkgs/applications/editors/jetbrains/bin/update_bin.py index 604499203363a..25616e2321fe2 100755 --- a/pkgs/applications/editors/jetbrains/bin/update_bin.py +++ b/pkgs/applications/editors/jetbrains/bin/update_bin.py @@ -6,6 +6,8 @@ import logging import requests import subprocess import sys +from urllib.error import HTTPError +import urllib.request import xmltodict from packaging import version @@ -57,6 +59,19 @@ def download_sha256(url): channels = download_channels() +def get_url(template, version_or_build_number, version_number): + release = [str(n) for n in version.parse(version_number).release] + for k in range(len(release), 0, -1): + s = ".".join(release[0:k]) + url = template.format(version=version_or_build_number, versionMajorMinor=s) + try: + if urllib.request.urlopen(url).getcode() == 200: + return url + except HTTPError: + pass + return None + + def update_product(name, product): update_channel = product["update-channel"] logging.info("Updating %s", name) @@ -78,7 +93,9 @@ def update_product(name, product): else: version_or_build_number = new_build_number version_number = new_version.split(' ')[0] - download_url = product["url-template"].format(version=version_or_build_number, versionMajorMinor=version_number) + download_url = get_url(product["url-template"], version_or_build_number, version_number) + if not download_url: + raise Exception(f"No valid url for {name} version {version_or_build_number}") product["url"] = download_url if "sha256" not in product or product.get("build_number") != new_build_number: fromVersions[name] = product["version"] diff --git a/pkgs/applications/editors/jetbrains/bin/versions.json b/pkgs/applications/editors/jetbrains/bin/versions.json index fb09af6272dfb..4c89a63a41fae 100644 --- a/pkgs/applications/editors/jetbrains/bin/versions.json +++ b/pkgs/applications/editors/jetbrains/bin/versions.json @@ -1,526 +1,558 @@ { "x86_64-linux": { + "aqua": { + "update-channel": "Aqua RELEASE", + "url-template": "https://download.jetbrains.com/aqua/aqua-{version}.tar.gz", + "version": "2024.2.1", + "sha256": "847b7658843dd06b9d6f2689fa4030e54473b6e5e234f23b6e17a6c646fad07c", + "url": "https://download.jetbrains.com/aqua/aqua-2024.2.1.tar.gz", + "build_number": "242.22855.128" + }, "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.tar.gz", - "version": "2024.1.4", - "sha256": "4c7a0de431e93af748d1b695952809d4de43d9185d26c115c29aad683f511b8e", - "url": "https://download.jetbrains.com/cpp/CLion-2024.1.4.tar.gz", - "build_number": "241.18034.45" + "version": "2024.2.2", + "sha256": "1658fb15d41dfb804ab0ea3ed4781d4ae0f41d25cc9df17c3f536a565423aa5b", + "url": "https://download.jetbrains.com/cpp/CLion-2024.2.2.tar.gz", + "build_number": "242.22855.75" }, "datagrip": { "update-channel": "DataGrip RELEASE", "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}.tar.gz", - "version": "2024.1.4", - "sha256": "16b918fc53004726454e0c08e2a77adbabae34c6852eb1c0612635d3667e73a5", - "url": "https://download.jetbrains.com/datagrip/datagrip-2024.1.4.tar.gz", - "build_number": "241.17890.24" + "version": "2024.2.2", + "sha256": "989599d5f2c900219d3cac75557655927f0b2f95224c9cf3b1ec9ba3167bfc07", + "url": "https://download.jetbrains.com/datagrip/datagrip-2024.2.2.tar.gz", + "build_number": "242.21829.162" }, "dataspell": { "update-channel": "DataSpell RELEASE", "url-template": "https://download.jetbrains.com/python/dataspell-{version}.tar.gz", - "version": "2024.1.3", - "sha256": "aee5e18c44b9ed4e5c3ac13c0f2c8e5765105e7c12a8553e85ea8e64d5bb3d8c", - "url": "https://download.jetbrains.com/python/dataspell-2024.1.3.tar.gz", - "build_number": "241.18034.23" + "version": "2024.2.2", + "sha256": "9b3dd8185f805d8d968f5a515dbe74d3672e0cd1b2cb052cf81382bd63ddb3b8", + "url": "https://download.jetbrains.com/python/dataspell-2024.2.2.tar.gz", + "build_number": "242.22855.78" }, "gateway": { "update-channel": "Gateway RELEASE", "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.tar.gz", - "version": "2024.1.2", - "sha256": "d0ca5471d4e445ea931b25d1ee55cec0c40bb455de1aec861d5aa5ca0bbc176d", - "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2024.1.2.tar.gz", - "build_number": "241.17011.87" + "version": "2024.2.1", + "sha256": "bc4027c3322004d041571ede49f1dc3656d7abcecf6bdeb9caab191264e60fcb", + "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2024.2.1.tar.gz", + "build_number": "242.21829.203" }, "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}.tar.gz", - "version": "2024.1.4", - "sha256": "f982476c9d870f1f354ab15135094cbde5c25c851ec21f424d0cd24149a12be6", - "url": "https://download.jetbrains.com/go/goland-2024.1.4.tar.gz", - "build_number": "241.18034.61" + "version": "2024.2.3", + "sha256": "e42565be2df79b8765b1c4ec5db737a4ab36bdaed418cd3a9e340e2c2d92a561", + "url": "https://download.jetbrains.com/go/goland-2024.2.3.tar.gz", + "build_number": "242.23339.24" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.tar.gz", - "version": "2024.1.4", - "sha256": "7d5e4cdb5a7cb1c376ca66957481350571561edadc3f45e6fce422e14af0fc16", - "url": "https://download.jetbrains.com/idea/ideaIC-2024.1.4.tar.gz", - "build_number": "241.18034.62" + "version": "2024.2.3", + "sha256": "2698adf2f0c4239f21b997faf9fc85954fd654a58d52ff630613fed70fb9699d", + "url": "https://download.jetbrains.com/idea/ideaIC-2024.2.3.tar.gz", + "build_number": "242.23339.11" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.tar.gz", - "version": "2024.1.4", - "sha256": "cda20bbbc052c2b8e87ea8607235ee0f7b5775728e8648c0a603889a3efa685f", - "url": "https://download.jetbrains.com/idea/ideaIU-2024.1.4.tar.gz", - "build_number": "241.18034.62" + "version": "2024.2.3", + "sha256": "579021f82d31dceb0dd8581fe5c12d7481e52c24a10688898ed00af1a0295eb3", + "url": "https://download.jetbrains.com/idea/ideaIU-2024.2.3.tar.gz", + "build_number": "242.23339.11" }, "mps": { "update-channel": "MPS RELEASE", "url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}.tar.gz", - "version": "2023.3.1", - "sha256": "52a40fe05dd8d53a3f68faa7a6e40b73f72f80db5976d8ebd781955493a65fe1", - "url": "https://download.jetbrains.com/mps/2023.3.1/MPS-2023.3.1.tar.gz", - "build_number": "233.13135.1068" + "version": "2024.1", + "sha256": "aa537596103545021726b72d53a46726e4834d1c57af383ca1a94afc14a25642", + "url": "https://download.jetbrains.com/mps/2024.1/MPS-2024.1.tar.gz", + "build_number": "241.18034.1093" }, "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.tar.gz", - "version": "2024.1.4", - "sha256": "c6a9b57ecd8f588af512a1cba389738bd461531cab4f984ed9758abfdada822d", - "url": "https://download.jetbrains.com/webide/PhpStorm-2024.1.4.tar.gz", - "build_number": "241.18034.69", + "version": "2024.2.3", + "sha256": "8b3b1ba19c4d5f0cc1d6775bff58d38313414eae75976ca99915102c02368eea", + "url": "https://download.jetbrains.com/webide/PhpStorm-2024.2.3.tar.gz", + "build_number": "242.23339.16", "version-major-minor": "2022.3" }, "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.tar.gz", - "version": "2024.1.3", - "sha256": "7c05b5ade8c5eea48677d83a2ec816a86559dadfcf04c67f2c8584acf8716bc3", - "url": "https://download.jetbrains.com/python/pycharm-community-2024.1.3.tar.gz", - "build_number": "241.17890.14" + "version": "2024.2.3", + "sha256": "448f6c48a51bb419c68c763b0e4eefc0449ad7bbad534de3f93b2f1a40308833", + "url": "https://download.jetbrains.com/python/pycharm-community-2024.2.3.tar.gz", + "build_number": "242.23339.19" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.tar.gz", - "version": "2024.1.3", - "sha256": "be3be94349ec55726fe9180d8a46097e7110a9e1cb7fd2cca85b961814a6e415", - "url": "https://download.jetbrains.com/python/pycharm-professional-2024.1.3.tar.gz", - "build_number": "241.17890.14" + "version": "2024.2.3", + "sha256": "837876f0d4db2d6fc0c319e88fa6e24fbe81b80809d529d600ef86a524aa8312", + "url": "https://download.jetbrains.com/python/pycharm-professional-2024.2.3.tar.gz", + "build_number": "242.23339.19" }, "rider": { "update-channel": "Rider RELEASE", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.tar.gz", - "version": "2024.1.4", - "sha256": "e277c2636383c023f00bd7833be86ffe1f8f67cf98cb719bbb4293aa42ba8ad0", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2024.1.4.tar.gz", - "build_number": "241.18034.76" + "version": "2024.2.5", + "sha256": "7c8b3fc459f0a6314ebf2b7da0a202cb0cbbc7df432fa047673f34fbad9f9dfe", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2024.2.5.tar.gz", + "build_number": "242.22855.90" }, "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.tar.gz", - "version": "2024.1.4", - "sha256": "84b96e1f6cdbb5497fcce1a036044e5c51002006ac8926be72d37ec48b1ceb52", - "url": "https://download.jetbrains.com/ruby/RubyMine-2024.1.4.tar.gz", - "build_number": "241.18034.63" + "version": "2024.2.3", + "sha256": "54991cb37fd6495ad52a1b2b6bc1d6d7ab4fff20a1bd393cab72ac57ca4e31a5", + "url": "https://download.jetbrains.com/ruby/RubyMine-2024.2.3.tar.gz", + "build_number": "242.23339.18" }, "rust-rover": { "update-channel": "RustRover RELEASE", "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}.tar.gz", - "version": "2024.1.2", - "sha256": "68a94f4d57ca937629f825be9c1375328b4fbf50c4bf0561d1b9b8db04102a62", - "url": "https://download.jetbrains.com/rustrover/RustRover-2024.1.2.tar.gz", - "build_number": "241.17011.169" + "version": "2024.2.2", + "sha256": "ac2046c415906ba8f802a0b94119ff899efde41547a9fdd63b3c5e46bf9d42d1", + "url": "https://download.jetbrains.com/rustrover/RustRover-2024.2.2.tar.gz", + "build_number": "242.22855.126" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.tar.gz", - "version": "2024.1.5", - "sha256": "339ac8fc3ecc20afdef05b1782cb861d52eb09336d6a20cc4aa487c1bd108522", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.1.5.tar.gz", - "build_number": "241.18034.50" + "version": "2024.2.3", + "sha256": "b3c861e440a6747b87e329009910858a2a21661dd09e53b1b2b5d835b3bb76b6", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.2.3.tar.gz", + "build_number": "242.23339.15" }, "writerside": { "update-channel": "Writerside EAP", "url-template": "https://download.jetbrains.com/writerside/writerside-{version}.tar.gz", - "version": "2024.1 EAP", - "sha256": "efb69c46ab8f3a461c42d5b6d4f7e843d01f584ae97030110d36d71de453e320", - "url": "https://download.jetbrains.com/writerside/writerside-241.16003.85.tar.gz", - "build_number": "241.16003.85" + "version": "2024.2 EAP", + "sha256": "89d1f4bda404bb81c315600f6b673f89e2798066f68b661a904c9e30db45b4e8", + "url": "https://download.jetbrains.com/writerside/writerside-242.21870.138.tar.gz", + "build_number": "242.21870.138" } }, "aarch64-linux": { + "aqua": { + "update-channel": "Aqua RELEASE", + "url-template": "https://download.jetbrains.com/aqua/aqua-{version}-aarch64.tar.gz", + "version": "2024.2.1", + "sha256": "8136b8a13edc9d7cf35eb0bbac685e74a76b52b0f15541f0289ed0968b316c2c", + "url": "https://download.jetbrains.com/aqua/aqua-2024.2.1-aarch64.tar.gz", + "build_number": "242.22855.128" + }, "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.tar.gz", - "version": "2024.1.4", - "sha256": "1e707c5409fd4a8490893ce23ff427d8e96d2cb6c31f1457a363e3127f0d1319", - "url": "https://download.jetbrains.com/cpp/CLion-2024.1.4-aarch64.tar.gz", - "build_number": "241.18034.45" + "version": "2024.2.2", + "sha256": "35e089b8d8bf5f32c80022f394fe525b8aa37540d26c27e861db0df9e34716a4", + "url": "https://download.jetbrains.com/cpp/CLion-2024.2.2-aarch64.tar.gz", + "build_number": "242.22855.75" }, "datagrip": { "update-channel": "DataGrip RELEASE", "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}-aarch64.tar.gz", - "version": "2024.1.4", - "sha256": "e9ec44d7a219c3d6d1ae7cd2fd59bd67f62997f403f17154d9de3f700b52c412", - "url": "https://download.jetbrains.com/datagrip/datagrip-2024.1.4-aarch64.tar.gz", - "build_number": "241.17890.24" + "version": "2024.2.2", + "sha256": "1d915eb7426693fe490cfcd5b484f0e1c9d45c21a4050242101dbe33905a42ee", + "url": "https://download.jetbrains.com/datagrip/datagrip-2024.2.2-aarch64.tar.gz", + "build_number": "242.21829.162" }, "dataspell": { "update-channel": "DataSpell RELEASE", "url-template": "https://download.jetbrains.com/python/dataspell-{version}-aarch64.tar.gz", - "version": "2024.1.3", - "sha256": "d7d7647e2e6c398148d87690c0224cac2212bb56e1c9d802bd79748df77f1b24", - "url": "https://download.jetbrains.com/python/dataspell-2024.1.3-aarch64.tar.gz", - "build_number": "241.18034.23" + "version": "2024.2.2", + "sha256": "e529c27d3c5eeabec02c7ff2e3c0a682d60b962923054cb9dca2e46bf1ec9104", + "url": "https://download.jetbrains.com/python/dataspell-2024.2.2-aarch64.tar.gz", + "build_number": "242.22855.78" }, "gateway": { "update-channel": "Gateway RELEASE", "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}-aarch64.tar.gz", - "version": "2024.1.2", - "sha256": "ca3983e280d2184ce806741d47c72fb9d8e3610c89ee7e56940960a8385b473b", - "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2024.1.2-aarch64.tar.gz", - "build_number": "241.17011.87" + "version": "2024.2.1", + "sha256": "9dfe0228b651421e0972915472ea34a80940bf4b13a922b405d88207c4140c47", + "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2024.2.1-aarch64.tar.gz", + "build_number": "242.21829.203" }, "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}-aarch64.tar.gz", - "version": "2024.1.4", - "sha256": "b5b9efc087c71369c85080b9159e268bcf16a493e69e359b67108f71a474dd61", - "url": "https://download.jetbrains.com/go/goland-2024.1.4-aarch64.tar.gz", - "build_number": "241.18034.61" + "version": "2024.2.3", + "sha256": "f2d858aa433b452d2158eb4f2a0f7946b0be2568500f241e7a6b2575c22ba204", + "url": "https://download.jetbrains.com/go/goland-2024.2.3-aarch64.tar.gz", + "build_number": "242.23339.24" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}-aarch64.tar.gz", - "version": "2024.1.4", - "sha256": "d4991c6041bfbe9958b55e876a45672d90ddcaf7aae18ac1c9134747a102eddf", - "url": "https://download.jetbrains.com/idea/ideaIC-2024.1.4-aarch64.tar.gz", - "build_number": "241.18034.62" + "version": "2024.2.3", + "sha256": "97d5b585b9c7d5465ef7a0e99a41c35c405a7658fe61ece64be84c6ed6e45e4c", + "url": "https://download.jetbrains.com/idea/ideaIC-2024.2.3-aarch64.tar.gz", + "build_number": "242.23339.11" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.tar.gz", - "version": "2024.1.4", - "sha256": "35057b24047c719102f08a22754bba1c66098f0d410b21ab178d7b6b9a8f7882", - "url": "https://download.jetbrains.com/idea/ideaIU-2024.1.4-aarch64.tar.gz", - "build_number": "241.18034.62" + "version": "2024.2.3", + "sha256": "c6bf5a8183fb1c3422dec061e5198fa18bb6edaf2c64724efecf77fddaf747e1", + "url": "https://download.jetbrains.com/idea/ideaIU-2024.2.3-aarch64.tar.gz", + "build_number": "242.23339.11" }, "mps": { "update-channel": "MPS RELEASE", "url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}.tar.gz", - "version": "2023.3.1", - "sha256": "7f40c6a9b29e17e29fd2acb2e0d1d31d3353e28fce31a479dd81dd1b66c1fa8c", - "url": "https://download.jetbrains.com/mps/2023.3.1/MPS-2023.3.1.tar.gz", - "build_number": "233.13135.1068" + "version": "2024.1", + "sha256": "aa537596103545021726b72d53a46726e4834d1c57af383ca1a94afc14a25642", + "url": "https://download.jetbrains.com/mps/2024.1/MPS-2024.1.tar.gz", + "build_number": "241.18034.1093" }, "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.tar.gz", - "version": "2024.1.4", - "sha256": "45a11309799d23b1638a87ee4580bd5e8d4f50ea07d5467e99e416ae45a23b06", - "url": "https://download.jetbrains.com/webide/PhpStorm-2024.1.4-aarch64.tar.gz", - "build_number": "241.18034.69", + "version": "2024.2.3", + "sha256": "25fbd433eb53904efba7c05ad0a28cbd7a9e7c8e08cbf8aa81913cd8ca4db1cf", + "url": "https://download.jetbrains.com/webide/PhpStorm-2024.2.3-aarch64.tar.gz", + "build_number": "242.23339.16", "version-major-minor": "2022.3" }, "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}-aarch64.tar.gz", - "version": "2024.1.3", - "sha256": "bf3156d442119f6a522c08e888a591d6c199a441550bff90ee5729087d0401b9", - "url": "https://download.jetbrains.com/python/pycharm-community-2024.1.3-aarch64.tar.gz", - "build_number": "241.17890.14" + "version": "2024.2.3", + "sha256": "fd398923379f340d9454e00a23dabc141af1120c5a294a8fd899c2f542b00a57", + "url": "https://download.jetbrains.com/python/pycharm-community-2024.2.3-aarch64.tar.gz", + "build_number": "242.23339.19" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}-aarch64.tar.gz", - "version": "2024.1.3", - "sha256": "44f6134f352d0d3754a29d6ca6a6c2a084a2918d302946b45141714f3b8ceaaf", - "url": "https://download.jetbrains.com/python/pycharm-professional-2024.1.3-aarch64.tar.gz", - "build_number": "241.17890.14" + "version": "2024.2.3", + "sha256": "2f15216657b1b7b3083aaded473b992e22fbe38704e0ebe8057aecc7ef37d78b", + "url": "https://download.jetbrains.com/python/pycharm-professional-2024.2.3-aarch64.tar.gz", + "build_number": "242.23339.19" }, "rider": { "update-channel": "Rider RELEASE", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.tar.gz", - "version": "2024.1.4", - "sha256": "e0f8ac64b87c093c7f97ea6ee340c7f518d14d4c68c17d0a2b7a9f079d2fcd62", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2024.1.4-aarch64.tar.gz", - "build_number": "241.18034.76" + "version": "2024.2.5", + "sha256": "1a3a4cfe64525b3d744fe82378fd86d84ac87b66a69a37f930ae05bdaaecb010", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2024.2.5-aarch64.tar.gz", + "build_number": "242.22855.90" }, "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.tar.gz", - "version": "2024.1.4", - "sha256": "b4d51afd0cf8ef19e6eae5a401836a89164215cf532a08a33824895229dba321", - "url": "https://download.jetbrains.com/ruby/RubyMine-2024.1.4-aarch64.tar.gz", - "build_number": "241.18034.63" + "version": "2024.2.3", + "sha256": "2be5fa28bd5313b9a043818207b9f76f3f38513ec400dfd76b01b543ff8013cf", + "url": "https://download.jetbrains.com/ruby/RubyMine-2024.2.3-aarch64.tar.gz", + "build_number": "242.23339.18" }, "rust-rover": { "update-channel": "RustRover RELEASE", "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}-aarch64.tar.gz", - "version": "2024.1.2", - "sha256": "a6abde77ef84f10d342b57c3f6bff84d0b973d8265c2baeb2490fc36dbcca13f", - "url": "https://download.jetbrains.com/rustrover/RustRover-2024.1.2-aarch64.tar.gz", - "build_number": "241.17011.169" + "version": "2024.2.2", + "sha256": "7d3dc3d35f56f5948c294742a06a8e1cc7fc55dae7455b5bb8f99eb244ab7a20", + "url": "https://download.jetbrains.com/rustrover/RustRover-2024.2.2-aarch64.tar.gz", + "build_number": "242.22855.126" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.tar.gz", - "version": "2024.1.5", - "sha256": "20db531cecada0fdd1947234ac120d0cf2a40037a3af825f1cf2ac066709fb44", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.1.5-aarch64.tar.gz", - "build_number": "241.18034.50" + "version": "2024.2.3", + "sha256": "c57647c5c77770f76468a2aacb62655e27f6590b48967d5eafd37e468bd25437", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.2.3-aarch64.tar.gz", + "build_number": "242.23339.15" }, "writerside": { "update-channel": "Writerside EAP", "url-template": "https://download.jetbrains.com/writerside/writerside-{version}-aarch64.tar.gz", - "version": "2024.1 EAP", - "sha256": "d9f764a8fcbdf13e67f1f152f790c38602792b07fdfd7a8935d320ed8ae68921", - "url": "https://download.jetbrains.com/writerside/writerside-241.16003.85-aarch64.tar.gz", - "build_number": "241.16003.85" + "version": "2024.2 EAP", + "sha256": "28a7504a29ba573632e300fbe845d3b2fe3f2c689a853abf83e32ae161e476da", + "url": "https://download.jetbrains.com/writerside/writerside-242.21870.138-aarch64.tar.gz", + "build_number": "242.21870.138" } }, "x86_64-darwin": { + "aqua": { + "update-channel": "Aqua RELEASE", + "url-template": "https://download.jetbrains.com/aqua/aqua-{version}.dmg", + "version": "2024.2.1", + "sha256": "e65135897e988eb01e2f78e18a92953f592ac0de07c6626780fab544affcd64e", + "url": "https://download.jetbrains.com/aqua/aqua-2024.2.1.dmg", + "build_number": "242.22855.128" + }, "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.dmg", - "version": "2024.1.4", - "sha256": "1d1d03a19aba6f941703ca5724317464e670a1ab63d70882448cf0364bc13c8b", - "url": "https://download.jetbrains.com/cpp/CLion-2024.1.4.dmg", - "build_number": "241.18034.45" + "version": "2024.2.2", + "sha256": "35e1a0348353bc8c741c2dea429d0554c7d2a201e9c69b3bfc11c67accab2c52", + "url": "https://download.jetbrains.com/cpp/CLion-2024.2.2.dmg", + "build_number": "242.22855.75" }, "datagrip": { "update-channel": "DataGrip RELEASE", "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}.dmg", - "version": "2024.1.4", - "sha256": "2221288ed33060d67368aa9d56a8d7c25df8158b5d38bb26ddf145ef58de8721", - "url": "https://download.jetbrains.com/datagrip/datagrip-2024.1.4.dmg", - "build_number": "241.17890.24" + "version": "2024.2.2", + "sha256": "bc6247f976dfc216c86f9ff05a8401172af213230464bcff247ee432ce3140f4", + "url": "https://download.jetbrains.com/datagrip/datagrip-2024.2.2.dmg", + "build_number": "242.21829.162" }, "dataspell": { "update-channel": "DataSpell RELEASE", "url-template": "https://download.jetbrains.com/python/dataspell-{version}.dmg", - "version": "2024.1.3", - "sha256": "132c1e67c18d676844a26ad95fcd68942965157222f7dc931c15117e96d29a84", - "url": "https://download.jetbrains.com/python/dataspell-2024.1.3.dmg", - "build_number": "241.18034.23" + "version": "2024.2.2", + "sha256": "2afdedae414e62077580c88c76093ea608b49aa3e4c9c9f1ec8aef7d467a7285", + "url": "https://download.jetbrains.com/python/dataspell-2024.2.2.dmg", + "build_number": "242.22855.78" }, "gateway": { "update-channel": "Gateway RELEASE", "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.dmg", - "version": "2024.1.2", - "sha256": "be7e34b5a4a4e28b90c3d90f5761767d3d6e996cdc5846d3f8bd0e05d3ee0f1a", - "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2024.1.2.dmg", - "build_number": "241.17011.87" + "version": "2024.2.1", + "sha256": "4fabb5e9ea13fc1380779502915f0d6741ee75742a535ced679f68d72d40a41c", + "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2024.2.1.dmg", + "build_number": "242.21829.203" }, "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}.dmg", - "version": "2024.1.4", - "sha256": "e2b2ae8d52700335d539b28179410b2567c78f6c8121a742e4df208180b55884", - "url": "https://download.jetbrains.com/go/goland-2024.1.4.dmg", - "build_number": "241.18034.61" + "version": "2024.2.3", + "sha256": "e9cedcee2365db7eeeded75fafab8f25931819dc5ae111195e040354b3cc07f9", + "url": "https://download.jetbrains.com/go/goland-2024.2.3.dmg", + "build_number": "242.23339.24" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.dmg", - "version": "2024.1.4", - "sha256": "2420493df5796e47836d3dfd579006f25aa88f1252db4fd6999591529022e925", - "url": "https://download.jetbrains.com/idea/ideaIC-2024.1.4.dmg", - "build_number": "241.18034.62" + "version": "2024.2.3", + "sha256": "015db6b1a9b57b55db005d6eff8752e4155d52841f03dbd679e204d8ae9289e9", + "url": "https://download.jetbrains.com/idea/ideaIC-2024.2.3.dmg", + "build_number": "242.23339.11" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.dmg", - "version": "2024.1.4", - "sha256": "30396377e163ba7f8d5c4ef112e9c8abb064897dd337f059357feecaa6c53b6e", - "url": "https://download.jetbrains.com/idea/ideaIU-2024.1.4.dmg", - "build_number": "241.18034.62" + "version": "2024.2.3", + "sha256": "bc47dc27e81f0fd15a9b62132912e68051b5b9f31bef6faadfcf27a48db8ffa7", + "url": "https://download.jetbrains.com/idea/ideaIU-2024.2.3.dmg", + "build_number": "242.23339.11" }, "mps": { "update-channel": "MPS RELEASE", "url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}-macos.dmg", - "version": "2023.3.1", - "sha256": "c1e46dcb3429772b164f423cedc644f388217d1e7310d682b2341f9e744333bf", - "url": "https://download.jetbrains.com/mps/2023.3.1/MPS-2023.3.1-macos.dmg", - "build_number": "233.13135.1068" + "version": "2024.1", + "sha256": "93510db63ab6f3d7b6e139730f90836ba772032526d77e3de207e848c808d398", + "url": "https://download.jetbrains.com/mps/2024.1/MPS-2024.1-macos.dmg", + "build_number": "241.18034.1093" }, "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.dmg", - "version": "2024.1.4", - "sha256": "ce844a947a96d819a59b35705fd1007c5193a444c3bb5d237179bfb3ceb2ed8b", - "url": "https://download.jetbrains.com/webide/PhpStorm-2024.1.4.dmg", - "build_number": "241.18034.69", + "version": "2024.2.3", + "sha256": "e4824a57ba7bff5806c11c1eabe6f3615a4ae082cd83549631823fec0ca03b2f", + "url": "https://download.jetbrains.com/webide/PhpStorm-2024.2.3.dmg", + "build_number": "242.23339.16", "version-major-minor": "2022.3" }, "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.dmg", - "version": "2024.1.3", - "sha256": "e115df42536457558b632647b93f86605feaca23bcec5af2d03a8c50ce80e81e", - "url": "https://download.jetbrains.com/python/pycharm-community-2024.1.3.dmg", - "build_number": "241.17890.14" + "version": "2024.2.3", + "sha256": "8750abd7c24b26d8e226a1ba20f69174173e7e76cb6198c1ccc89117201417d5", + "url": "https://download.jetbrains.com/python/pycharm-community-2024.2.3.dmg", + "build_number": "242.23339.19" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.dmg", - "version": "2024.1.3", - "sha256": "01e29968ef3b5ef18b5425a1aa23d5a36d8c9f413a8ff6b0565f0d59e8601779", - "url": "https://download.jetbrains.com/python/pycharm-professional-2024.1.3.dmg", - "build_number": "241.17890.14" + "version": "2024.2.3", + "sha256": "a6252501f10a73151cba714080e7bb54197469de1be83b217b3479d5d0b7bc33", + "url": "https://download.jetbrains.com/python/pycharm-professional-2024.2.3.dmg", + "build_number": "242.23339.19" }, "rider": { "update-channel": "Rider RELEASE", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.dmg", - "version": "2024.1.4", - "sha256": "2fc9e3063278e510b28eea0b2823b0c2309d08728d53261b48cbac093255cbfe", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2024.1.4.dmg", - "build_number": "241.18034.76" + "version": "2024.2.5", + "sha256": "0161a1eb2d1e99ed88bebf26e7d1646434924a0878ab4c8e5ec1fc34b0998a5e", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2024.2.5.dmg", + "build_number": "242.22855.90" }, "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.dmg", - "version": "2024.1.4", - "sha256": "a4619da76349319b45a7bacbc49c3c53b8bd0769692e30f84f78a5c61ccd552b", - "url": "https://download.jetbrains.com/ruby/RubyMine-2024.1.4.dmg", - "build_number": "241.18034.63" + "version": "2024.2.3", + "sha256": "abb6c51d39c3132f60f0f5d8fd5038f908247c0c029b34ef63821ef2fc79b7fa", + "url": "https://download.jetbrains.com/ruby/RubyMine-2024.2.3.dmg", + "build_number": "242.23339.18" }, "rust-rover": { "update-channel": "RustRover RELEASE", "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}.dmg", - "version": "2024.1.2", - "sha256": "d937f1f8eb6a7d0ce35218a616d6e7e237b86c7fdb9562b2ff3213ad3c3730de", - "url": "https://download.jetbrains.com/rustrover/RustRover-2024.1.2.dmg", - "build_number": "241.17011.169" + "version": "2024.2.2", + "sha256": "b9c3959e7680c4b3ae341688597ac70606cb2179272440d9ee31d06633665fe2", + "url": "https://download.jetbrains.com/rustrover/RustRover-2024.2.2.dmg", + "build_number": "242.22855.126" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.dmg", - "version": "2024.1.5", - "sha256": "45475fda7a66ba5da23091a7d9ec3314c9482b0a31fe9cc40a3a02f243c86e48", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.1.5.dmg", - "build_number": "241.18034.50" + "version": "2024.2.3", + "sha256": "f092871d04fbd5c8cfd8fac7c47d84453c7134ffb937137a7d4b916c10ba5ece", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.2.3.dmg", + "build_number": "242.23339.15" }, "writerside": { "update-channel": "Writerside EAP", "url-template": "https://download.jetbrains.com/writerside/writerside-{version}.dmg", - "version": "2024.1 EAP", - "sha256": "a9ad84d95ad86b38f35bec25032235b907e19ddf3ef696404f4341650a7eb7b1", - "url": "https://download.jetbrains.com/writerside/writerside-241.16003.85.dmg", - "build_number": "241.16003.85" + "version": "2024.2 EAP", + "sha256": "bcf989440a220fff70600d38333bc99feef0453779e60caae0d05d1168cfffb0", + "url": "https://download.jetbrains.com/writerside/writerside-242.21870.138.dmg", + "build_number": "242.21870.138" } }, "aarch64-darwin": { + "aqua": { + "update-channel": "Aqua RELEASE", + "url-template": "https://download.jetbrains.com/aqua/aqua-{version}-aarch64.dmg", + "version": "2024.2.1", + "sha256": "f91c189a05b98e0e0ad0ddc9d08345e80b5cd6b784689b8e75bcbc74cc61d1ff", + "url": "https://download.jetbrains.com/aqua/aqua-2024.2.1-aarch64.dmg", + "build_number": "242.22855.128" + }, "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.dmg", - "version": "2024.1.4", - "sha256": "9eed7144d482a4fc9d6cc639c04c0b99cc6831aa73c5998ac9d1e1bd23f7ab66", - "url": "https://download.jetbrains.com/cpp/CLion-2024.1.4-aarch64.dmg", - "build_number": "241.18034.45" + "version": "2024.2.2", + "sha256": "428d557d4b5eb7687c7c8142b61591ef4fe7825891d91616019292280696180e", + "url": "https://download.jetbrains.com/cpp/CLion-2024.2.2-aarch64.dmg", + "build_number": "242.22855.75" }, "datagrip": { "update-channel": "DataGrip RELEASE", "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}-aarch64.dmg", - "version": "2024.1.4", - "sha256": "329bc223f5a3d16c68c2d271f2576f9e174ab88a9871b928f1dd8601b2d2cf70", - "url": "https://download.jetbrains.com/datagrip/datagrip-2024.1.4-aarch64.dmg", - "build_number": "241.17890.24" + "version": "2024.2.2", + "sha256": "9f92c4ba7d60a9df1e4450278125733ba1fed499d4a27bbd753d8c0d33a57dcb", + "url": "https://download.jetbrains.com/datagrip/datagrip-2024.2.2-aarch64.dmg", + "build_number": "242.21829.162" }, "dataspell": { "update-channel": "DataSpell RELEASE", "url-template": "https://download.jetbrains.com/python/dataspell-{version}-aarch64.dmg", - "version": "2024.1.3", - "sha256": "fa8f9c77b2fab31ea383a492c7a061e4b297e6581df4a5c116de9aec4a52c86d", - "url": "https://download.jetbrains.com/python/dataspell-2024.1.3-aarch64.dmg", - "build_number": "241.18034.23" + "version": "2024.2.2", + "sha256": "3d153a2813dd5b1527a0e5c429a390cdcb7d921774c369818283a6706bb47375", + "url": "https://download.jetbrains.com/python/dataspell-2024.2.2-aarch64.dmg", + "build_number": "242.22855.78" }, "gateway": { "update-channel": "Gateway RELEASE", "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}-aarch64.dmg", - "version": "2024.1.2", - "sha256": "70aab722715cb1abbab01e25109b6ca967588bcf3c1cec666986e42b825b0d9d", - "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2024.1.2-aarch64.dmg", - "build_number": "241.17011.87" + "version": "2024.2.1", + "sha256": "8a8242c53ddc85304922552fdf424fbe31b729f549feda30b8e6a982c5447f4d", + "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2024.2.1-aarch64.dmg", + "build_number": "242.21829.203" }, "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}-aarch64.dmg", - "version": "2024.1.4", - "sha256": "6dd71b3993b005e3557ad6ddb4d9ed87068be5225df19422e4b0e3fdd0fbbd10", - "url": "https://download.jetbrains.com/go/goland-2024.1.4-aarch64.dmg", - "build_number": "241.18034.61" + "version": "2024.2.3", + "sha256": "dd664944c119f01e81e9a864187510813521b1c2afab39ed57332b29cff9da61", + "url": "https://download.jetbrains.com/go/goland-2024.2.3-aarch64.dmg", + "build_number": "242.23339.24" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}-aarch64.dmg", - "version": "2024.1.4", - "sha256": "0c2e9a534d8f84acf8a17412d73e3f161864268acefee5130259489e2575d246", - "url": "https://download.jetbrains.com/idea/ideaIC-2024.1.4-aarch64.dmg", - "build_number": "241.18034.62" + "version": "2024.2.3", + "sha256": "67f71e9f2fd1401c46794e12cd660906fc4e667d68454f36807923dc5e5ffd42", + "url": "https://download.jetbrains.com/idea/ideaIC-2024.2.3-aarch64.dmg", + "build_number": "242.23339.11" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.dmg", - "version": "2024.1.4", - "sha256": "0d6dd0ebc97a61920721fb6c9663a905df1edea976f62b32bdf8ff879c02c7d0", - "url": "https://download.jetbrains.com/idea/ideaIU-2024.1.4-aarch64.dmg", - "build_number": "241.18034.62" + "version": "2024.2.3", + "sha256": "985a90d418ecef8758b466a245c3170df95dd2024922fcf9195be74465d77fe4", + "url": "https://download.jetbrains.com/idea/ideaIU-2024.2.3-aarch64.dmg", + "build_number": "242.23339.11" }, "mps": { "update-channel": "MPS RELEASE", "url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}-macos-aarch64.dmg", - "version": "2023.3.1", - "url": "https://download.jetbrains.com/mps/2023.3.1/MPS-2023.3.1-macos-aarch64.dmg", - "sha256": "133e5bae81d675a6ee7780efec18dd96dfed059dbfdd2ad4a1028d9956a1ec6e", - "build_number": "233.13135.1068" + "version": "2024.1", + "url": "https://download.jetbrains.com/mps/2024.1/MPS-2024.1-macos-aarch64.dmg", + "sha256": "2b070b9eb87fc910ef8b2ff96479e724f64864b6825375c272e1f7c604bbc4e7", + "build_number": "241.18034.1093" }, "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.dmg", - "version": "2024.1.4", - "sha256": "8e5bffb20b1606195afe6818429e99b31c56f2e8f390c81cd6d92ff3de80de68", - "url": "https://download.jetbrains.com/webide/PhpStorm-2024.1.4-aarch64.dmg", - "build_number": "241.18034.69", + "version": "2024.2.3", + "sha256": "9e406b15359c5ccc0f49cd66be0142fbe1a77dc979052943b2f54f1502acce5c", + "url": "https://download.jetbrains.com/webide/PhpStorm-2024.2.3-aarch64.dmg", + "build_number": "242.23339.16", "version-major-minor": "2022.3" }, "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}-aarch64.dmg", - "version": "2024.1.3", - "sha256": "4f0112b2629faa60325e82d70e8864bb796a41942eb06ddb287ca1ef0d9feba9", - "url": "https://download.jetbrains.com/python/pycharm-community-2024.1.3-aarch64.dmg", - "build_number": "241.17890.14" + "version": "2024.2.3", + "sha256": "ac8c4fe330ef670f7f6dde424b4c2218a1cdb8eb58773ce73510829e99d259df", + "url": "https://download.jetbrains.com/python/pycharm-community-2024.2.3-aarch64.dmg", + "build_number": "242.23339.19" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}-aarch64.dmg", - "version": "2024.1.3", - "sha256": "28ec2b34fecc8abd38a1ba1661f8a3e784b7cb8d7cf496a51235475db66a190a", - "url": "https://download.jetbrains.com/python/pycharm-professional-2024.1.3-aarch64.dmg", - "build_number": "241.17890.14" + "version": "2024.2.3", + "sha256": "c7550781611e6a9701295f76fd9e9572b767b6969dd28f52d872a1a1bccf3a7f", + "url": "https://download.jetbrains.com/python/pycharm-professional-2024.2.3-aarch64.dmg", + "build_number": "242.23339.19" }, "rider": { "update-channel": "Rider RELEASE", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.dmg", - "version": "2024.1.4", - "sha256": "0682ca85bb61534e39426d9f397eeb3c383dfd0a2e9dc4e8052d9e6408741fdb", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2024.1.4-aarch64.dmg", - "build_number": "241.18034.76" + "version": "2024.2.5", + "sha256": "bd89a85ccfbb019916fb4536d84a61b8013fcf67e12e13fd2855e27165a3b1d8", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2024.2.5-aarch64.dmg", + "build_number": "242.22855.90" }, "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.dmg", - "version": "2024.1.4", - "sha256": "ad3ebd40266f40f5aadb152fc5e845bda1eb8de75923cf598072458dc92b8194", - "url": "https://download.jetbrains.com/ruby/RubyMine-2024.1.4-aarch64.dmg", - "build_number": "241.18034.63" + "version": "2024.2.3", + "sha256": "79ac4f9fb54f7049c2bb5ab3ec78280fe4991e3aaa4cc608cb06ce980c76a05a", + "url": "https://download.jetbrains.com/ruby/RubyMine-2024.2.3-aarch64.dmg", + "build_number": "242.23339.18" }, "rust-rover": { "update-channel": "RustRover RELEASE", "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}-aarch64.dmg", - "version": "2024.1.2", - "sha256": "af973b73e5ced9982703d7f5d163e3bd8bee8b095aac16b2151ec2c7f1d4d870", - "url": "https://download.jetbrains.com/rustrover/RustRover-2024.1.2-aarch64.dmg", - "build_number": "241.17011.169" + "version": "2024.2.2", + "sha256": "9f04b137505dea34f71c8d37a9598fdc2f688dd1482dec2f554a5068a857b94a", + "url": "https://download.jetbrains.com/rustrover/RustRover-2024.2.2-aarch64.dmg", + "build_number": "242.22855.126" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.dmg", - "version": "2024.1.5", - "sha256": "e55e4671316ad2c2bfc5564516e261b59d139267c18d06d7a62b8f665d86da5e", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.1.5-aarch64.dmg", - "build_number": "241.18034.50" + "version": "2024.2.3", + "sha256": "581f60423d4d89275efe5c6744c7a72ebcda50edbac5ed9c876f7d7c18bc41a4", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.2.3-aarch64.dmg", + "build_number": "242.23339.15" }, "writerside": { "update-channel": "Writerside EAP", "url-template": "https://download.jetbrains.com/writerside/writerside-{version}-aarch64.dmg", - "version": "2024.1 EAP", - "sha256": "d3bb0079046570dbfa5175b388e091b1567c024a7ec8587e7c8e5389cf1bd721", - "url": "https://download.jetbrains.com/writerside/writerside-241.16003.85-aarch64.dmg", - "build_number": "241.16003.85" + "version": "2024.2 EAP", + "sha256": "cb815cfe2fa9fd69675a31cb870ccf5037ac429a954cb950141074668f250014", + "url": "https://download.jetbrains.com/writerside/writerside-242.21870.138-aarch64.dmg", + "build_number": "242.21870.138" } } } diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index fb57331cc3b46..0e3241a0397c1 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -1,3 +1,10 @@ +let + # `ides.json` is handwritten and contains information that doesn't change across updates, like maintainers and other metadata + # `versions.json` contains everything generated/needed by the update script version numbers, build numbers and tarball hashes + ideInfo = builtins.fromJSON (builtins.readFile ./bin/ides.json); + versions = builtins.fromJSON (builtins.readFile ./bin/versions.json); +in + { lib , stdenv , callPackage @@ -30,19 +37,17 @@ let inherit (stdenv.hostPlatform) system; - # `ides.json` is handwritten and contains information that doesn't change across updates, like maintainers and other metadata - # `versions.json` contains everything generated/needed by the update script version numbers, build numbers and tarball hashes - ideInfo = lib.importJSON ./bin/ides.json; - versions = lib.importJSON ./bin/versions.json; products = versions.${system} or (throw "Unsupported system: ${system}"); - package = if stdenv.isDarwin then ./bin/darwin.nix else ./bin/linux.nix; + package = if stdenv.hostPlatform.isDarwin then ./bin/darwin.nix else ./bin/linux.nix; mkJetBrainsProductCore = callPackage package { inherit vmopts; }; mkMeta = meta: fromSource: { inherit (meta) homepage longDescription; description = meta.description + lib.optionalString meta.isOpenSource (if fromSource then " (built from source)" else " (patched binaries from jetbrains)"); maintainers = map (x: lib.maintainers."${x}") meta.maintainers; license = if meta.isOpenSource then lib.licenses.asl20 else lib.licenses.unfree; + sourceProvenance = if fromSource then [ lib.sourceTypes.fromSource ] else + (if stdenv.hostPlatform.isDarwin then [ lib.sourceTypes.binaryNativeCode ] else [ lib.sourceTypes.binaryBytecode ]); }; mkJetBrainsProduct = @@ -80,7 +85,7 @@ let }); buildPycharm = args: - (mkJetBrainsProduct args).overrideAttrs (finalAttrs: previousAttrs: lib.optionalAttrs stdenv.isLinux { + (mkJetBrainsProduct args).overrideAttrs (finalAttrs: previousAttrs: lib.optionalAttrs stdenv.hostPlatform.isLinux { buildInputs = with python3.pkgs; (previousAttrs.buildInputs or []) ++ [ python3 setuptools ]; preInstall = '' echo "compiling cython debug speedups" @@ -97,9 +102,11 @@ in rec { # Sorted alphabetically + aqua = mkJetBrainsProduct { pname = "aqua"; extraBuildInputs = [ stdenv.cc.cc lldb ]; }; + clion = (mkJetBrainsProduct { pname = "clion"; - extraBuildInputs = lib.optionals (stdenv.isLinux) [ + extraBuildInputs = lib.optionals (stdenv.hostPlatform.isLinux) [ fontconfig python3 stdenv.cc.cc @@ -107,13 +114,13 @@ rec { libxcrypt-legacy lttng-ust_2_12 musl - ] ++ lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ + ] ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ expat libxml2 xz ]; }).overrideAttrs (attrs: { - postInstall = (attrs.postInstall or "") + lib.optionalString (stdenv.isLinux) '' + postInstall = (attrs.postInstall or "") + lib.optionalString (stdenv.hostPlatform.isLinux) '' ( cd $out/clion @@ -124,7 +131,7 @@ rec { ) ''; - postFixup = (attrs.postFixup or "") + lib.optionalString (stdenv.isLinux) '' + postFixup = (attrs.postFixup or "") + lib.optionalString (stdenv.hostPlatform.isLinux) '' ( cd $out/clion @@ -168,7 +175,7 @@ rec { extraBuildInputs = [ libgcc stdenv.cc.cc ]; }).overrideAttrs (attrs: { - postFixup = (attrs.postFixup or "") + lib.optionalString stdenv.isLinux '' + postFixup = (attrs.postFixup or "") + lib.optionalString stdenv.hostPlatform.isLinux '' interp="$(cat $NIX_CC/nix-support/dynamic-linker)" patchelf --set-interpreter $interp $out/goland/plugins/go-plugin/lib/dlv/linux/dlv chmod +x $out/goland/plugins/go-plugin/lib/dlv/linux/dlv @@ -179,7 +186,7 @@ rec { idea-community-src = buildIdea { pname = "idea-community"; extraBuildInputs = [ stdenv.cc.cc ]; fromSource = true; }; - idea-community = if stdenv.isDarwin || stdenv.isAarch64 then idea-community-bin else idea-community-src; + idea-community = if stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isAarch64 then idea-community-bin else idea-community-src; idea-ultimate = buildIdea { pname = "idea-ultimate"; extraBuildInputs = [ stdenv.cc.cc lldb musl ]; }; @@ -191,7 +198,7 @@ rec { pycharm-community-src = buildPycharm { pname = "pycharm-community"; fromSource = true; }; - pycharm-community = if stdenv.isDarwin then pycharm-community-bin else pycharm-community-src; + pycharm-community = if stdenv.hostPlatform.isDarwin then pycharm-community-bin else pycharm-community-src; pycharm-professional = buildPycharm { pname = "pycharm-professional"; extraBuildInputs = [ musl ]; }; @@ -204,14 +211,14 @@ rec { libxcrypt lttng-ust_2_12 musl - ]++ lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ + ]++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ expat libxml2 xz ]; }).overrideAttrs (attrs: { - postInstall = (attrs.postInstall or "") + lib.optionalString (stdenv.isLinux) '' + postInstall = (attrs.postInstall or "") + lib.optionalString (stdenv.hostPlatform.isLinux) '' ( cd $out/rider @@ -233,20 +240,20 @@ rec { rust-rover = (mkJetBrainsProduct { pname = "rust-rover"; - extraBuildInputs = lib.optionals (stdenv.isLinux) [ + extraBuildInputs = lib.optionals (stdenv.hostPlatform.isLinux) [ python3 openssl libxcrypt-legacy fontconfig xorg.libX11 libGL - ] ++ lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ + ] ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ expat libxml2 xz ]; }).overrideAttrs (attrs: { - postFixup = (attrs.postFixup or "") + lib.optionalString (stdenv.isLinux) '' + postFixup = (attrs.postFixup or "") + lib.optionalString (stdenv.hostPlatform.isLinux) '' ( cd $out/rust-rover diff --git a/pkgs/applications/editors/jetbrains/plugins/plugins.json b/pkgs/applications/editors/jetbrains/plugins/plugins.json index 00b2794a139f2..6d13dfb586cd5 100644 --- a/pkgs/applications/editors/jetbrains/plugins/plugins.json +++ b/pkgs/applications/editors/jetbrains/plugins/plugins.json @@ -17,17 +17,17 @@ "webstorm" ], "builds": { - "233.13135.1068": "https://plugins.jetbrains.com/files/164/546759/IdeaVim-2.12.0-signed.zip", - "241.17011.169": "https://plugins.jetbrains.com/files/164/546759/IdeaVim-2.12.0-signed.zip", - "241.17890.14": "https://plugins.jetbrains.com/files/164/546759/IdeaVim-2.12.0-signed.zip", - "241.17890.24": "https://plugins.jetbrains.com/files/164/546759/IdeaVim-2.12.0-signed.zip", - "241.18034.45": "https://plugins.jetbrains.com/files/164/546759/IdeaVim-2.12.0-signed.zip", - "241.18034.50": "https://plugins.jetbrains.com/files/164/546759/IdeaVim-2.12.0-signed.zip", - "241.18034.61": "https://plugins.jetbrains.com/files/164/546759/IdeaVim-2.12.0-signed.zip", - "241.18034.62": "https://plugins.jetbrains.com/files/164/546759/IdeaVim-2.12.0-signed.zip", - "241.18034.63": "https://plugins.jetbrains.com/files/164/546759/IdeaVim-2.12.0-signed.zip", - "241.18034.69": "https://plugins.jetbrains.com/files/164/546759/IdeaVim-2.12.0-signed.zip", - "241.18034.76": "https://plugins.jetbrains.com/files/164/546759/IdeaVim-2.12.0-signed.zip" + "241.18034.1093": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip", + "242.21829.162": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip", + "242.22855.126": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip", + "242.22855.75": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip", + "242.22855.90": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip", + "242.23339.11": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip", + "242.23339.15": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip", + "242.23339.16": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip", + "242.23339.18": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip", + "242.23339.19": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip", + "242.23339.24": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip" }, "name": "ideavim" }, @@ -36,10 +36,20 @@ "idea-ultimate" ], "builds": { - "241.18034.62": "https://plugins.jetbrains.com/files/631/559769/python-241.18034.62.zip" + "242.23339.11": "https://plugins.jetbrains.com/files/631/608464/python-242.23339.11.zip" }, "name": "python" }, + "1347": { + "compatible": [ + "idea-community", + "idea-ultimate" + ], + "builds": { + "242.23339.11": "https://plugins.jetbrains.com/files/1347/606389/scala-intellij-bin-2024.2.28.zip" + }, + "name": "scala" + }, "2162": { "compatible": [ "clion", @@ -57,17 +67,17 @@ "webstorm" ], "builds": { - "233.13135.1068": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", - "241.17011.169": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", - "241.17890.14": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", - "241.17890.24": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", - "241.18034.45": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", - "241.18034.50": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", - "241.18034.61": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", - "241.18034.62": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", - "241.18034.63": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", - "241.18034.69": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", - "241.18034.76": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip" + "241.18034.1093": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", + "242.21829.162": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", + "242.22855.126": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", + "242.22855.75": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", + "242.22855.90": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", + "242.23339.11": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", + "242.23339.15": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", + "242.23339.16": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", + "242.23339.18": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", + "242.23339.19": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip", + "242.23339.24": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip" }, "name": "string-manipulation" }, @@ -88,17 +98,17 @@ "webstorm" ], "builds": { - "233.13135.1068": null, - "241.17011.169": null, - "241.17890.14": null, - "241.17890.24": null, - "241.18034.45": null, - "241.18034.50": null, - "241.18034.61": null, - "241.18034.62": null, - "241.18034.63": null, - "241.18034.69": null, - "241.18034.76": null + "241.18034.1093": null, + "242.21829.162": null, + "242.22855.126": null, + "242.22855.75": null, + "242.22855.90": null, + "242.23339.11": null, + "242.23339.15": null, + "242.23339.16": null, + "242.23339.18": null, + "242.23339.19": null, + "242.23339.24": null }, "name": "kotlin" }, @@ -119,17 +129,17 @@ "webstorm" ], "builds": { - "233.13135.1068": null, - "241.17011.169": null, - "241.17890.14": "https://plugins.jetbrains.com/files/6981/552764/ini-241.17890.13.zip", - "241.17890.24": "https://plugins.jetbrains.com/files/6981/552764/ini-241.17890.13.zip", - "241.18034.45": "https://plugins.jetbrains.com/files/6981/560226/ini-241.18034.69.zip", - "241.18034.50": "https://plugins.jetbrains.com/files/6981/560226/ini-241.18034.69.zip", - "241.18034.61": "https://plugins.jetbrains.com/files/6981/560226/ini-241.18034.69.zip", - "241.18034.62": "https://plugins.jetbrains.com/files/6981/560226/ini-241.18034.69.zip", - "241.18034.63": "https://plugins.jetbrains.com/files/6981/560226/ini-241.18034.69.zip", - "241.18034.69": "https://plugins.jetbrains.com/files/6981/560226/ini-241.18034.69.zip", - "241.18034.76": "https://plugins.jetbrains.com/files/6981/560226/ini-241.18034.69.zip" + "241.18034.1093": null, + "242.21829.162": "https://plugins.jetbrains.com/files/6981/596022/ini-242.21829.162.zip", + "242.22855.126": "https://plugins.jetbrains.com/files/6981/608006/ini-242.22855.126.zip", + "242.22855.75": "https://plugins.jetbrains.com/files/6981/608006/ini-242.22855.126.zip", + "242.22855.90": "https://plugins.jetbrains.com/files/6981/608006/ini-242.22855.126.zip", + "242.23339.11": "https://plugins.jetbrains.com/files/6981/609355/ini-242.23339.18.zip", + "242.23339.15": "https://plugins.jetbrains.com/files/6981/609355/ini-242.23339.18.zip", + "242.23339.16": "https://plugins.jetbrains.com/files/6981/609355/ini-242.23339.18.zip", + "242.23339.18": "https://plugins.jetbrains.com/files/6981/609355/ini-242.23339.18.zip", + "242.23339.19": "https://plugins.jetbrains.com/files/6981/609355/ini-242.23339.18.zip", + "242.23339.24": "https://plugins.jetbrains.com/files/6981/609355/ini-242.23339.18.zip" }, "name": "ini" }, @@ -150,17 +160,17 @@ "webstorm" ], "builds": { - "233.13135.1068": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", - "241.17011.169": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", - "241.17890.14": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", - "241.17890.24": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", - "241.18034.45": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", - "241.18034.50": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", - "241.18034.61": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", - "241.18034.62": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", - "241.18034.63": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", - "241.18034.69": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", - "241.18034.76": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip" + "241.18034.1093": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", + "242.21829.162": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", + "242.22855.126": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", + "242.22855.75": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", + "242.22855.90": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", + "242.23339.11": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", + "242.23339.15": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", + "242.23339.16": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", + "242.23339.18": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", + "242.23339.19": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip", + "242.23339.24": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip" }, "name": "acejump" }, @@ -170,8 +180,8 @@ "phpstorm" ], "builds": { - "241.18034.62": "https://plugins.jetbrains.com/files/7219/542990/Symfony_Plugin-2024.1.274.zip", - "241.18034.69": "https://plugins.jetbrains.com/files/7219/542990/Symfony_Plugin-2024.1.274.zip" + "242.23339.11": "https://plugins.jetbrains.com/files/7219/605730/Symfony_Plugin-2024.1.276.zip", + "242.23339.16": "https://plugins.jetbrains.com/files/7219/605730/Symfony_Plugin-2024.1.276.zip" }, "name": "symfony-support" }, @@ -181,8 +191,8 @@ "phpstorm" ], "builds": { - "241.18034.62": "https://plugins.jetbrains.com/files/7320/507957/PHP_Annotations-10.0.0.zip", - "241.18034.69": "https://plugins.jetbrains.com/files/7320/507957/PHP_Annotations-10.0.0.zip" + "242.23339.11": "https://plugins.jetbrains.com/files/7320/596012/PHP_Annotations-11.0.3.zip", + "242.23339.16": "https://plugins.jetbrains.com/files/7320/596012/PHP_Annotations-11.0.3.zip" }, "name": "php-annotations" }, @@ -195,16 +205,18 @@ "idea-ultimate", "pycharm-community", "rider", - "rust-rover" + "rust-rover", + "webstorm" ], "builds": { - "241.17011.169": "https://plugins.jetbrains.com/files/7322/540027/python-ce-241.17011.48.zip", - "241.17890.14": "https://plugins.jetbrains.com/files/7322/552840/python-ce-241.17890.1.zip", - "241.17890.24": "https://plugins.jetbrains.com/files/7322/552840/python-ce-241.17890.1.zip", - "241.18034.45": "https://plugins.jetbrains.com/files/7322/559299/python-ce-241.18034.55.zip", - "241.18034.61": "https://plugins.jetbrains.com/files/7322/559299/python-ce-241.18034.55.zip", - "241.18034.62": "https://plugins.jetbrains.com/files/7322/559299/python-ce-241.18034.55.zip", - "241.18034.76": "https://plugins.jetbrains.com/files/7322/559299/python-ce-241.18034.55.zip" + "242.21829.162": "https://plugins.jetbrains.com/files/7322/595111/python-ce-242.21829.142.zip", + "242.22855.126": "https://plugins.jetbrains.com/files/7322/605059/python-ce-242.22855.74.zip", + "242.22855.75": "https://plugins.jetbrains.com/files/7322/605059/python-ce-242.22855.74.zip", + "242.22855.90": "https://plugins.jetbrains.com/files/7322/605059/python-ce-242.22855.74.zip", + "242.23339.11": "https://plugins.jetbrains.com/files/7322/608478/python-ce-242.23339.11.zip", + "242.23339.15": "https://plugins.jetbrains.com/files/7322/608478/python-ce-242.23339.11.zip", + "242.23339.19": "https://plugins.jetbrains.com/files/7322/608478/python-ce-242.23339.11.zip", + "242.23339.24": "https://plugins.jetbrains.com/files/7322/608478/python-ce-242.23339.11.zip" }, "name": "python-community-edition" }, @@ -225,17 +237,17 @@ "webstorm" ], "builds": { - "233.13135.1068": "https://plugins.jetbrains.com/files/7391/531687/asciidoctor-intellij-plugin-0.41.14.zip", - "241.17011.169": "https://plugins.jetbrains.com/files/7391/561441/asciidoctor-intellij-plugin-0.42.2.zip", - "241.17890.14": "https://plugins.jetbrains.com/files/7391/561441/asciidoctor-intellij-plugin-0.42.2.zip", - "241.17890.24": "https://plugins.jetbrains.com/files/7391/561441/asciidoctor-intellij-plugin-0.42.2.zip", - "241.18034.45": "https://plugins.jetbrains.com/files/7391/561441/asciidoctor-intellij-plugin-0.42.2.zip", - "241.18034.50": "https://plugins.jetbrains.com/files/7391/561441/asciidoctor-intellij-plugin-0.42.2.zip", - "241.18034.61": "https://plugins.jetbrains.com/files/7391/561441/asciidoctor-intellij-plugin-0.42.2.zip", - "241.18034.62": "https://plugins.jetbrains.com/files/7391/561441/asciidoctor-intellij-plugin-0.42.2.zip", - "241.18034.63": "https://plugins.jetbrains.com/files/7391/561441/asciidoctor-intellij-plugin-0.42.2.zip", - "241.18034.69": "https://plugins.jetbrains.com/files/7391/561441/asciidoctor-intellij-plugin-0.42.2.zip", - "241.18034.76": "https://plugins.jetbrains.com/files/7391/561441/asciidoctor-intellij-plugin-0.42.2.zip" + "241.18034.1093": "https://plugins.jetbrains.com/files/7391/561441/asciidoctor-intellij-plugin-0.42.2.zip", + "242.21829.162": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip", + "242.22855.126": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip", + "242.22855.75": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip", + "242.22855.90": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip", + "242.23339.11": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip", + "242.23339.15": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip", + "242.23339.16": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip", + "242.23339.18": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip", + "242.23339.19": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip", + "242.23339.24": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip" }, "name": "asciidoc" }, @@ -255,16 +267,16 @@ "webstorm" ], "builds": { - "233.13135.1068": "https://plugins.jetbrains.com/files/8182/466854/intellij-rust-233.15445.zip", - "241.17890.14": null, - "241.17890.24": null, - "241.18034.45": null, - "241.18034.50": null, - "241.18034.61": null, - "241.18034.62": null, - "241.18034.63": null, - "241.18034.69": null, - "241.18034.76": null + "241.18034.1093": null, + "242.21829.162": null, + "242.22855.75": null, + "242.22855.90": null, + "242.23339.11": null, + "242.23339.15": null, + "242.23339.16": null, + "242.23339.18": null, + "242.23339.19": null, + "242.23339.24": null }, "name": "-deprecated-rust" }, @@ -284,16 +296,16 @@ "webstorm" ], "builds": { - "233.13135.1068": null, - "241.17890.14": null, - "241.17890.24": null, - "241.18034.45": null, - "241.18034.50": null, - "241.18034.61": null, - "241.18034.62": null, - "241.18034.63": null, - "241.18034.69": null, - "241.18034.76": null + "241.18034.1093": null, + "242.21829.162": null, + "242.22855.75": null, + "242.22855.90": null, + "242.23339.11": null, + "242.23339.15": null, + "242.23339.16": null, + "242.23339.18": null, + "242.23339.19": null, + "242.23339.24": null }, "name": "-deprecated-rust-beta" }, @@ -307,10 +319,10 @@ "ruby-mine" ], "builds": { - "241.17890.14": "https://plugins.jetbrains.com/files/8554/535094/featuresTrainer-241.17011.14.zip", - "241.18034.61": "https://plugins.jetbrains.com/files/8554/535094/featuresTrainer-241.17011.14.zip", - "241.18034.62": "https://plugins.jetbrains.com/files/8554/535094/featuresTrainer-241.17011.14.zip", - "241.18034.63": "https://plugins.jetbrains.com/files/8554/535094/featuresTrainer-241.17011.14.zip" + "242.23339.11": "https://plugins.jetbrains.com/files/8554/588322/featuresTrainer-242.21829.14.zip", + "242.23339.18": "https://plugins.jetbrains.com/files/8554/588322/featuresTrainer-242.21829.14.zip", + "242.23339.19": "https://plugins.jetbrains.com/files/8554/588322/featuresTrainer-242.21829.14.zip", + "242.23339.24": "https://plugins.jetbrains.com/files/8554/588322/featuresTrainer-242.21829.14.zip" }, "name": "ide-features-trainer" }, @@ -331,17 +343,17 @@ "webstorm" ], "builds": { - "233.13135.1068": "https://plugins.jetbrains.com/files/8607/555059/NixIDEA-0.4.0.14.zip", - "241.17011.169": "https://plugins.jetbrains.com/files/8607/555059/NixIDEA-0.4.0.14.zip", - "241.17890.14": "https://plugins.jetbrains.com/files/8607/555059/NixIDEA-0.4.0.14.zip", - "241.17890.24": "https://plugins.jetbrains.com/files/8607/555059/NixIDEA-0.4.0.14.zip", - "241.18034.45": "https://plugins.jetbrains.com/files/8607/555059/NixIDEA-0.4.0.14.zip", - "241.18034.50": "https://plugins.jetbrains.com/files/8607/555059/NixIDEA-0.4.0.14.zip", - "241.18034.61": "https://plugins.jetbrains.com/files/8607/555059/NixIDEA-0.4.0.14.zip", - "241.18034.62": "https://plugins.jetbrains.com/files/8607/555059/NixIDEA-0.4.0.14.zip", - "241.18034.63": "https://plugins.jetbrains.com/files/8607/555059/NixIDEA-0.4.0.14.zip", - "241.18034.69": "https://plugins.jetbrains.com/files/8607/555059/NixIDEA-0.4.0.14.zip", - "241.18034.76": "https://plugins.jetbrains.com/files/8607/555059/NixIDEA-0.4.0.14.zip" + "241.18034.1093": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip", + "242.21829.162": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip", + "242.22855.126": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip", + "242.22855.75": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip", + "242.22855.90": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip", + "242.23339.11": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip", + "242.23339.15": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip", + "242.23339.16": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip", + "242.23339.18": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip", + "242.23339.19": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip", + "242.23339.24": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip" }, "name": "nixidea" }, @@ -351,8 +363,8 @@ "idea-ultimate" ], "builds": { - "241.18034.61": "https://plugins.jetbrains.com/files/9568/534161/go-plugin-241.17011.2.zip", - "241.18034.62": "https://plugins.jetbrains.com/files/9568/534161/go-plugin-241.17011.2.zip" + "242.23339.11": "https://plugins.jetbrains.com/files/9568/608453/go-plugin-242.23339.11.zip", + "242.23339.24": "https://plugins.jetbrains.com/files/9568/608453/go-plugin-242.23339.11.zip" }, "name": "go" }, @@ -373,17 +385,17 @@ "webstorm" ], "builds": { - "233.13135.1068": "https://plugins.jetbrains.com/files/10037/493012/CSVEditor-3.3.0-233.zip", - "241.17011.169": "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip", - "241.17890.14": "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip", - "241.17890.24": "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip", - "241.18034.45": "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip", - "241.18034.50": "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip", - "241.18034.61": "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip", - "241.18034.62": "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip", - "241.18034.63": "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip", - "241.18034.69": "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip", - "241.18034.76": "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip" + "241.18034.1093": "https://plugins.jetbrains.com/files/10037/585243/CSVEditor-3.4.0-241.zip", + "242.21829.162": "https://plugins.jetbrains.com/files/10037/585266/CSVEditor-3.4.0-242.zip", + "242.22855.126": "https://plugins.jetbrains.com/files/10037/585266/CSVEditor-3.4.0-242.zip", + "242.22855.75": "https://plugins.jetbrains.com/files/10037/585266/CSVEditor-3.4.0-242.zip", + "242.22855.90": "https://plugins.jetbrains.com/files/10037/585266/CSVEditor-3.4.0-242.zip", + "242.23339.11": "https://plugins.jetbrains.com/files/10037/585266/CSVEditor-3.4.0-242.zip", + "242.23339.15": "https://plugins.jetbrains.com/files/10037/585266/CSVEditor-3.4.0-242.zip", + "242.23339.16": "https://plugins.jetbrains.com/files/10037/585266/CSVEditor-3.4.0-242.zip", + "242.23339.18": "https://plugins.jetbrains.com/files/10037/585266/CSVEditor-3.4.0-242.zip", + "242.23339.19": "https://plugins.jetbrains.com/files/10037/585266/CSVEditor-3.4.0-242.zip", + "242.23339.24": "https://plugins.jetbrains.com/files/10037/585266/CSVEditor-3.4.0-242.zip" }, "name": "csv-editor" }, @@ -404,17 +416,17 @@ "webstorm" ], "builds": { - "233.13135.1068": "https://plugins.jetbrains.com/files/11349/561478/aws-toolkit-jetbrains-standalone-3.13-233.zip", - "241.17011.169": "https://plugins.jetbrains.com/files/11349/561482/aws-toolkit-jetbrains-standalone-3.13-241.zip", - "241.17890.14": "https://plugins.jetbrains.com/files/11349/561482/aws-toolkit-jetbrains-standalone-3.13-241.zip", - "241.17890.24": "https://plugins.jetbrains.com/files/11349/561482/aws-toolkit-jetbrains-standalone-3.13-241.zip", - "241.18034.45": "https://plugins.jetbrains.com/files/11349/561482/aws-toolkit-jetbrains-standalone-3.13-241.zip", - "241.18034.50": "https://plugins.jetbrains.com/files/11349/561482/aws-toolkit-jetbrains-standalone-3.13-241.zip", - "241.18034.61": "https://plugins.jetbrains.com/files/11349/561482/aws-toolkit-jetbrains-standalone-3.13-241.zip", - "241.18034.62": "https://plugins.jetbrains.com/files/11349/561482/aws-toolkit-jetbrains-standalone-3.13-241.zip", - "241.18034.63": "https://plugins.jetbrains.com/files/11349/561482/aws-toolkit-jetbrains-standalone-3.13-241.zip", - "241.18034.69": "https://plugins.jetbrains.com/files/11349/561482/aws-toolkit-jetbrains-standalone-3.13-241.zip", - "241.18034.76": "https://plugins.jetbrains.com/files/11349/561482/aws-toolkit-jetbrains-standalone-3.13-241.zip" + "241.18034.1093": "https://plugins.jetbrains.com/files/11349/605838/aws-toolkit-jetbrains-standalone-3.29-241.zip", + "242.21829.162": "https://plugins.jetbrains.com/files/11349/605840/aws-toolkit-jetbrains-standalone-3.29-242.zip", + "242.22855.126": "https://plugins.jetbrains.com/files/11349/605840/aws-toolkit-jetbrains-standalone-3.29-242.zip", + "242.22855.75": "https://plugins.jetbrains.com/files/11349/605840/aws-toolkit-jetbrains-standalone-3.29-242.zip", + "242.22855.90": "https://plugins.jetbrains.com/files/11349/605840/aws-toolkit-jetbrains-standalone-3.29-242.zip", + "242.23339.11": "https://plugins.jetbrains.com/files/11349/605840/aws-toolkit-jetbrains-standalone-3.29-242.zip", + "242.23339.15": "https://plugins.jetbrains.com/files/11349/605840/aws-toolkit-jetbrains-standalone-3.29-242.zip", + "242.23339.16": "https://plugins.jetbrains.com/files/11349/605840/aws-toolkit-jetbrains-standalone-3.29-242.zip", + "242.23339.18": "https://plugins.jetbrains.com/files/11349/605840/aws-toolkit-jetbrains-standalone-3.29-242.zip", + "242.23339.19": "https://plugins.jetbrains.com/files/11349/605840/aws-toolkit-jetbrains-standalone-3.29-242.zip", + "242.23339.24": "https://plugins.jetbrains.com/files/11349/605840/aws-toolkit-jetbrains-standalone-3.29-242.zip" }, "name": "aws-toolkit" }, @@ -435,17 +447,17 @@ "webstorm" ], "builds": { - "233.13135.1068": "https://plugins.jetbrains.com/files/12062/445740/keymap-vscode-233.11799.188.zip", - "241.17011.169": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip", - "241.17890.14": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip", - "241.17890.24": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip", - "241.18034.45": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip", - "241.18034.50": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip", - "241.18034.61": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip", - "241.18034.62": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip", - "241.18034.63": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip", - "241.18034.69": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip", - "241.18034.76": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip" + "241.18034.1093": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip", + "242.21829.162": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip", + "242.22855.126": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip", + "242.22855.75": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip", + "242.22855.90": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip", + "242.23339.11": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip", + "242.23339.15": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip", + "242.23339.16": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip", + "242.23339.18": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip", + "242.23339.19": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip", + "242.23339.24": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip" }, "name": "vscode-keymap" }, @@ -466,17 +478,17 @@ "webstorm" ], "builds": { - "233.13135.1068": "https://plugins.jetbrains.com/files/12559/445772/keymap-eclipse-233.11799.165.zip", - "241.17011.169": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip", - "241.17890.14": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip", - "241.17890.24": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip", - "241.18034.45": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip", - "241.18034.50": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip", - "241.18034.61": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip", - "241.18034.62": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip", - "241.18034.63": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip", - "241.18034.69": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip", - "241.18034.76": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip" + "241.18034.1093": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip", + "242.21829.162": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip", + "242.22855.126": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip", + "242.22855.75": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip", + "242.22855.90": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip", + "242.23339.11": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip", + "242.23339.15": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip", + "242.23339.16": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip", + "242.23339.18": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip", + "242.23339.19": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip", + "242.23339.24": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip" }, "name": "eclipse-keymap" }, @@ -497,20 +509,51 @@ "webstorm" ], "builds": { - "233.13135.1068": "https://plugins.jetbrains.com/files/13017/445774/keymap-visualStudio-233.11799.165.zip", - "241.17011.169": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip", - "241.17890.14": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip", - "241.17890.24": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip", - "241.18034.45": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip", - "241.18034.50": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip", - "241.18034.61": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip", - "241.18034.62": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip", - "241.18034.63": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip", - "241.18034.69": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip", - "241.18034.76": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip" + "241.18034.1093": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip", + "242.21829.162": "https://plugins.jetbrains.com/files/13017/591092/keymap-visualStudio-242.21829.44.zip", + "242.22855.126": "https://plugins.jetbrains.com/files/13017/591092/keymap-visualStudio-242.21829.44.zip", + "242.22855.75": "https://plugins.jetbrains.com/files/13017/591092/keymap-visualStudio-242.21829.44.zip", + "242.22855.90": "https://plugins.jetbrains.com/files/13017/591092/keymap-visualStudio-242.21829.44.zip", + "242.23339.11": "https://plugins.jetbrains.com/files/13017/591092/keymap-visualStudio-242.21829.44.zip", + "242.23339.15": "https://plugins.jetbrains.com/files/13017/591092/keymap-visualStudio-242.21829.44.zip", + "242.23339.16": "https://plugins.jetbrains.com/files/13017/591092/keymap-visualStudio-242.21829.44.zip", + "242.23339.18": "https://plugins.jetbrains.com/files/13017/591092/keymap-visualStudio-242.21829.44.zip", + "242.23339.19": "https://plugins.jetbrains.com/files/13017/591092/keymap-visualStudio-242.21829.44.zip", + "242.23339.24": "https://plugins.jetbrains.com/files/13017/591092/keymap-visualStudio-242.21829.44.zip" }, "name": "visual-studio-keymap" }, + "14004": { + "compatible": [ + "clion", + "datagrip", + "goland", + "idea-community", + "idea-ultimate", + "mps", + "phpstorm", + "pycharm-community", + "pycharm-professional", + "rider", + "ruby-mine", + "rust-rover", + "webstorm" + ], + "builds": { + "241.18034.1093": "https://plugins.jetbrains.com/files/14004/523287/protoeditor-241.15989.49.zip", + "242.21829.162": "https://plugins.jetbrains.com/files/14004/587347/protoeditor-242.21829.3.zip", + "242.22855.126": "https://plugins.jetbrains.com/files/14004/587347/protoeditor-242.21829.3.zip", + "242.22855.75": "https://plugins.jetbrains.com/files/14004/587347/protoeditor-242.21829.3.zip", + "242.22855.90": "https://plugins.jetbrains.com/files/14004/587347/protoeditor-242.21829.3.zip", + "242.23339.11": "https://plugins.jetbrains.com/files/14004/608477/protoeditor-242.23339.11.zip", + "242.23339.15": "https://plugins.jetbrains.com/files/14004/608477/protoeditor-242.23339.11.zip", + "242.23339.16": "https://plugins.jetbrains.com/files/14004/608477/protoeditor-242.23339.11.zip", + "242.23339.18": "https://plugins.jetbrains.com/files/14004/608477/protoeditor-242.23339.11.zip", + "242.23339.19": "https://plugins.jetbrains.com/files/14004/608477/protoeditor-242.23339.11.zip", + "242.23339.24": "https://plugins.jetbrains.com/files/14004/608477/protoeditor-242.23339.11.zip" + }, + "name": "protocol-buffers" + }, "14059": { "compatible": [ "clion", @@ -528,17 +571,17 @@ "webstorm" ], "builds": { - "233.13135.1068": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "241.17011.169": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "241.17890.14": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "241.17890.24": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "241.18034.45": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "241.18034.50": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "241.18034.61": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "241.18034.62": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "241.18034.63": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "241.18034.69": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "241.18034.76": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar" + "241.18034.1093": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "242.21829.162": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "242.22855.126": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "242.22855.75": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "242.22855.90": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "242.23339.11": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "242.23339.15": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "242.23339.16": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "242.23339.18": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "242.23339.19": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "242.23339.24": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar" }, "name": "darcula-pitch-black" }, @@ -559,17 +602,17 @@ "webstorm" ], "builds": { - "233.13135.1068": "https://plugins.jetbrains.com/files/17718/561438/github-copilot-intellij-1.5.11.5872.zip", - "241.17011.169": "https://plugins.jetbrains.com/files/17718/561438/github-copilot-intellij-1.5.11.5872.zip", - "241.17890.14": "https://plugins.jetbrains.com/files/17718/561438/github-copilot-intellij-1.5.11.5872.zip", - "241.17890.24": "https://plugins.jetbrains.com/files/17718/561438/github-copilot-intellij-1.5.11.5872.zip", - "241.18034.45": "https://plugins.jetbrains.com/files/17718/561438/github-copilot-intellij-1.5.11.5872.zip", - "241.18034.50": "https://plugins.jetbrains.com/files/17718/561438/github-copilot-intellij-1.5.11.5872.zip", - "241.18034.61": "https://plugins.jetbrains.com/files/17718/561438/github-copilot-intellij-1.5.11.5872.zip", - "241.18034.62": "https://plugins.jetbrains.com/files/17718/561438/github-copilot-intellij-1.5.11.5872.zip", - "241.18034.63": "https://plugins.jetbrains.com/files/17718/561438/github-copilot-intellij-1.5.11.5872.zip", - "241.18034.69": "https://plugins.jetbrains.com/files/17718/561438/github-copilot-intellij-1.5.11.5872.zip", - "241.18034.76": "https://plugins.jetbrains.com/files/17718/561438/github-copilot-intellij-1.5.11.5872.zip" + "241.18034.1093": "https://plugins.jetbrains.com/files/17718/607289/github-copilot-intellij-1.5.24.6840.zip", + "242.21829.162": "https://plugins.jetbrains.com/files/17718/607289/github-copilot-intellij-1.5.24.6840.zip", + "242.22855.126": "https://plugins.jetbrains.com/files/17718/607289/github-copilot-intellij-1.5.24.6840.zip", + "242.22855.75": "https://plugins.jetbrains.com/files/17718/607289/github-copilot-intellij-1.5.24.6840.zip", + "242.22855.90": "https://plugins.jetbrains.com/files/17718/607289/github-copilot-intellij-1.5.24.6840.zip", + "242.23339.11": "https://plugins.jetbrains.com/files/17718/607289/github-copilot-intellij-1.5.24.6840.zip", + "242.23339.15": "https://plugins.jetbrains.com/files/17718/607289/github-copilot-intellij-1.5.24.6840.zip", + "242.23339.16": "https://plugins.jetbrains.com/files/17718/607289/github-copilot-intellij-1.5.24.6840.zip", + "242.23339.18": "https://plugins.jetbrains.com/files/17718/607289/github-copilot-intellij-1.5.24.6840.zip", + "242.23339.19": "https://plugins.jetbrains.com/files/17718/607289/github-copilot-intellij-1.5.24.6840.zip", + "242.23339.24": "https://plugins.jetbrains.com/files/17718/607289/github-copilot-intellij-1.5.24.6840.zip" }, "name": "github-copilot" }, @@ -590,17 +633,17 @@ "webstorm" ], "builds": { - "233.13135.1068": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "241.17011.169": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "241.17890.14": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "241.17890.24": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "241.18034.45": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "241.18034.50": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "241.18034.61": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "241.18034.62": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "241.18034.63": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "241.18034.69": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "241.18034.76": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip" + "241.18034.1093": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "242.21829.162": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "242.22855.126": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "242.22855.75": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "242.22855.90": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "242.23339.11": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "242.23339.15": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "242.23339.16": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "242.23339.18": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "242.23339.19": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "242.23339.24": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip" }, "name": "netbeans-6-5-keymap" }, @@ -621,17 +664,17 @@ "webstorm" ], "builds": { - "233.13135.1068": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", - "241.17011.169": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", - "241.17890.14": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", - "241.17890.24": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", - "241.18034.45": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", - "241.18034.50": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", - "241.18034.61": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", - "241.18034.62": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", - "241.18034.63": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", - "241.18034.69": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", - "241.18034.76": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip" + "241.18034.1093": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", + "242.21829.162": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", + "242.22855.126": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", + "242.22855.75": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", + "242.22855.90": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", + "242.23339.11": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", + "242.23339.15": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", + "242.23339.16": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", + "242.23339.18": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", + "242.23339.19": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip", + "242.23339.24": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip" }, "name": "mermaid" }, @@ -642,45 +685,49 @@ "rust-rover" ], "builds": { - "241.17011.169": "https://plugins.jetbrains.com/files/22407/555351/intellij-rust-241.27011.169.zip", - "241.18034.45": "https://plugins.jetbrains.com/files/22407/555351/intellij-rust-241.27011.169.zip", - "241.18034.62": "https://plugins.jetbrains.com/files/22407/555351/intellij-rust-241.27011.169.zip" + "242.22855.126": "https://plugins.jetbrains.com/files/22407/608018/intellij-rust-242.22855.126.zip", + "242.22855.75": "https://plugins.jetbrains.com/files/22407/608018/intellij-rust-242.22855.126.zip", + "242.23339.11": "https://plugins.jetbrains.com/files/22407/608018/intellij-rust-242.22855.126.zip" }, "name": "rust" } }, "files": { - "https://plugins.jetbrains.com/files/10037/493010/CSVEditor-3.3.0-241.zip": "sha256-P8AFMVp/rFi7zTh9f/i45q/QalvI37itnK57Dz/W/z4=", - "https://plugins.jetbrains.com/files/10037/493012/CSVEditor-3.3.0-233.zip": "sha256-C3l3Z9a7maCrMjc2Fk/wf3AoExRbvN+fn2mAtXigt0A=", - "https://plugins.jetbrains.com/files/11349/561478/aws-toolkit-jetbrains-standalone-3.13-233.zip": "sha256-Cc87UUI1dAFqmmydPRAcirlF2kF1v1sMcYMdHVZ5lK8=", - "https://plugins.jetbrains.com/files/11349/561482/aws-toolkit-jetbrains-standalone-3.13-241.zip": "sha256-uk9DVZ7K+EwkoNubC5eoVwxlvYCd7KVTl90zJsKc4r0=", - "https://plugins.jetbrains.com/files/12062/445740/keymap-vscode-233.11799.188.zip": "sha256-9keDJ73bSHkzAEq8nT96I5sp05BgMZ08/4BzarOjO5g=", + "https://plugins.jetbrains.com/files/10037/585243/CSVEditor-3.4.0-241.zip": "sha256-QwguD4ENrL7GxmX+CGEyCPowbAPNpYgntVGAbHxOlyQ=", + "https://plugins.jetbrains.com/files/10037/585266/CSVEditor-3.4.0-242.zip": "sha256-CpIsmOIblkC5xMnKidbI+G+2QcZtXczu0rOSMtUcJPs=", + "https://plugins.jetbrains.com/files/11349/605838/aws-toolkit-jetbrains-standalone-3.29-241.zip": "sha256-rMgAPGqgERLKmMNafg17h//WR9Z+etkawd/OdDse4eI=", + "https://plugins.jetbrains.com/files/11349/605840/aws-toolkit-jetbrains-standalone-3.29-242.zip": "sha256-bIj7qOW4CBCwNiBK700Zh90Ijy2I+78rwN5zhUeMwuw=", "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip": "sha256-LeQ5vi9PCJYmWNmT/sutWjSlwZaAYYuEljVJBYG2VpY=", - "https://plugins.jetbrains.com/files/12559/445772/keymap-eclipse-233.11799.165.zip": "sha256-IsmoWuUroAp1LLuphp4F1dun4tQOOitZxoG+Nxs5pYk=", + "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip": "sha256-LpooujwYaX339yZJVe7HPYIOw+YdJLeEtRgwPxLJ9eI=", "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip": "sha256-/hEx0gIFvUXD799tRmMHAt9Z5ziFgaQs1RX0zQwTJIA=", - "https://plugins.jetbrains.com/files/13017/445774/keymap-visualStudio-233.11799.165.zip": "sha256-Nb2tSxL+mAY1qJ3waipgV8ep+0R/BaYnzz7zfwtLHmk=", + "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip": "sha256-bAN0ifNiUqj51TYc7RLKwTMtv9OxjzqEQwXa6KtFlsU=", "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip": "sha256-tNgt0vIkdCB/LcaSj58mT6cNlw4lytRo0cZSt7sIERU=", + "https://plugins.jetbrains.com/files/13017/591092/keymap-visualStudio-242.21829.44.zip": "sha256-aIwiMT30L3KCvbrkMUdgDdUdyBqGmT4w6c4pZEnMGNo=", + "https://plugins.jetbrains.com/files/1347/606389/scala-intellij-bin-2024.2.28.zip": "sha256-N5Hp9w/5aTYsZCRjdGCg0g1IlmRX/Lgi7Fx9OUJGz14=", + "https://plugins.jetbrains.com/files/14004/523287/protoeditor-241.15989.49.zip": "sha256-cltbHY5OOvf29otDNsF9Q2shJHDdW6UMbzDdZ6OATtI=", + "https://plugins.jetbrains.com/files/14004/587347/protoeditor-242.21829.3.zip": "sha256-Y6xplTjA9bmhwLS9clcu/4znltSgDsga8Na5BmOWX5E=", + "https://plugins.jetbrains.com/files/14004/608477/protoeditor-242.23339.11.zip": "sha256-gI3sY4jDXsY6pUhzqejJnvGJwLj6bNMs45UR8ekrZcs=", "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar": "sha256-eXInfAqY3yEZRXCAuv3KGldM1pNKEioNwPB0rIGgJFw=", - "https://plugins.jetbrains.com/files/164/546759/IdeaVim-2.12.0-signed.zip": "sha256-6ibo1vdwO4olQTCWpWAefT3QCwgtzTo1ojilDes8Rvg=", - "https://plugins.jetbrains.com/files/17718/561438/github-copilot-intellij-1.5.11.5872.zip": "sha256-4bYtBaLvcXZv8eVfG09ywSbcP+7SUb4j+NZ5mb2aluE=", + "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip": "sha256-uMIrYoZE16X/K96HuDJx8QMh6wUbi4+qSw+HJAq7ukI=", + "https://plugins.jetbrains.com/files/17718/607289/github-copilot-intellij-1.5.24.6840.zip": "sha256-2jcTuQruuUJUKEnomzl4DmqYZelk8Gygh8NT0PRwuOw=", "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip": "sha256-KrzZTKZMQqoEMw+vDUv2jjs0EX0leaPBkU8H/ecq/oI=", "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip": "sha256-DUiIQYIzYoXmgtBakSLtMB+xxJMaR70Jgg9erySa3wQ=", "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip": "sha256-OqeQCqFe8iW/8NPg+9i+UKh+twIPQ9uLZrItMukCi7k=", - "https://plugins.jetbrains.com/files/22407/555351/intellij-rust-241.27011.169.zip": "sha256-7rbYfO5CUvsW3HXWmEadreKbhJhX6joX15miODb2N+4=", - "https://plugins.jetbrains.com/files/631/559769/python-241.18034.62.zip": "sha256-DnjjUcwRL9dbNrHTnZacQYPE0biRFLmq6lR2ApRGgXI=", - "https://plugins.jetbrains.com/files/6981/552764/ini-241.17890.13.zip": "sha256-7JQpKNttNfTvzfZ2Qj42FZAtSqx6GjWHhT0WRecK3tc=", - "https://plugins.jetbrains.com/files/6981/560226/ini-241.18034.69.zip": "sha256-85KeM0H3Jw8WP6LjKf1L7mIRXxnTR3YUCT6xUduAN/s=", + "https://plugins.jetbrains.com/files/22407/608018/intellij-rust-242.22855.126.zip": "sha256-mIiNKoSmkHxoKdHiDPN19wH8ejhRS2F0Cb63E7PDXP0=", + "https://plugins.jetbrains.com/files/631/608464/python-242.23339.11.zip": "sha256-qXKW4C5/XMw1MgZxUZt2RlmycNN4zRcKMsTbkKS/lTU=", + "https://plugins.jetbrains.com/files/6981/596022/ini-242.21829.162.zip": "sha256-J6v5zHD7n1uqp3p2TptZpkPbGtkdFZdNCA+Xw4aHKDE=", + "https://plugins.jetbrains.com/files/6981/608006/ini-242.22855.126.zip": "sha256-TtBD4NuLhPbhod56wYtg4jY1yNSK+mTp6mEhDgtidBU=", + "https://plugins.jetbrains.com/files/6981/609355/ini-242.23339.18.zip": "sha256-WucgAKBoKxnZvRfN2g8in8LjOOKAtECEN0sGcz28j4c=", "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip": "sha256-kVUEgfEKUupV/qlB4Dpzi5pFHjhVvX74XIPetKtjysM=", - "https://plugins.jetbrains.com/files/7219/542990/Symfony_Plugin-2024.1.274.zip": "sha256-92uUIFz5kEjrbgPnomi0VXc9Du17evzGsO5ApsrtHrA=", - "https://plugins.jetbrains.com/files/7320/507957/PHP_Annotations-10.0.0.zip": "sha256-JIZ6Iq3sOcAm8fBXnjRrG9dqCZuD/WajyVmn1JjYMBA=", - "https://plugins.jetbrains.com/files/7322/540027/python-ce-241.17011.48.zip": "sha256-UrvhbGhcqxGke5tZTktyaWVYIWO5NhOU/WiswMYr83Y=", - "https://plugins.jetbrains.com/files/7322/552840/python-ce-241.17890.1.zip": "sha256-njHcuJmpc/5JsfZ6mmjcRK2j78J0E4bu68T1A0DNdVU=", - "https://plugins.jetbrains.com/files/7322/559299/python-ce-241.18034.55.zip": "sha256-e+MewymlNWzbut8eADe8jwqco921ULe83eLEGpDf1GY=", - "https://plugins.jetbrains.com/files/7391/531687/asciidoctor-intellij-plugin-0.41.14.zip": "sha256-icVvR79Ut6RopPKqvUQf4ZHKg14LV8/KWUZfQh/BYV8=", + "https://plugins.jetbrains.com/files/7219/605730/Symfony_Plugin-2024.1.276.zip": "sha256-drNmhJMe+kuY2fcHjY+SQmkACvFk0rVI4vAhyZ/bgLc=", + "https://plugins.jetbrains.com/files/7320/596012/PHP_Annotations-11.0.3.zip": "sha256-kRqgAW0bYEWLTCC6q2hhPmDwnOx3kiuqPhriZWizxTw=", + "https://plugins.jetbrains.com/files/7322/595111/python-ce-242.21829.142.zip": "sha256-DwQNhbNO1zk75lcf35spNnzo0u103UAhXignhO+grek=", + "https://plugins.jetbrains.com/files/7322/605059/python-ce-242.22855.74.zip": "sha256-As1MgvssBg+45DLRtNbirT5HyXPcabzt3ulKYBIiWj8=", + "https://plugins.jetbrains.com/files/7322/608478/python-ce-242.23339.11.zip": "sha256-tWsshZfm5czxBtF4ZfPHzi843Oztx2i0JEHcpnlLcSo=", "https://plugins.jetbrains.com/files/7391/561441/asciidoctor-intellij-plugin-0.42.2.zip": "sha256-oKczkLHAk2bJRNRgToVe0ySEJGF8+P4oWqQ33olwzWw=", - "https://plugins.jetbrains.com/files/8182/466854/intellij-rust-233.15445.zip": "sha256-+Lc/avYBLpyIV63DlbhAJtieHDv4HdggqdGFDw9iqN0=", - "https://plugins.jetbrains.com/files/8554/535094/featuresTrainer-241.17011.14.zip": "sha256-p26GW1NyVI8OR1VypeWUFWW8qlwB+LtzrEoKyXBwiCw=", - "https://plugins.jetbrains.com/files/8607/555059/NixIDEA-0.4.0.14.zip": "sha256-oP/tvAqzMSDLJ0Jah1eLJDZIm9WhOZas7lPWrvjWFMM=", - "https://plugins.jetbrains.com/files/9568/534161/go-plugin-241.17011.2.zip": "sha256-6+VdZVI/U+UxxNZM1/Va8RsiHG0ZnR6PpoOAhaOqk9U=" + "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip": "sha256-AGP8YY6NG/hy7xIDoiJy3GZHRB9stVNYYoHtqOmYCx0=", + "https://plugins.jetbrains.com/files/8554/588322/featuresTrainer-242.21829.14.zip": "sha256-pL+j0K6U0DZibnmcIE6kY9Kj/+5g8akuHeuppuZiEII=", + "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip": "sha256-9GMqs/hSavcw1E4ZJTLDH1lx3HEeQ5NR8BT+Q9pN3io=", + "https://plugins.jetbrains.com/files/9568/608453/go-plugin-242.23339.11.zip": "sha256-eEZw5q0+IHlf1Re3M6RwZOF7AXMn99a7n4nF54x5yew=" } } diff --git a/pkgs/applications/editors/jetbrains/plugins/specialPlugins.nix b/pkgs/applications/editors/jetbrains/plugins/specialPlugins.nix index e6e00962c9de5..574938eef0d32 100644 --- a/pkgs/applications/editors/jetbrains/plugins/specialPlugins.nix +++ b/pkgs/applications/editors/jetbrains/plugins/specialPlugins.nix @@ -27,7 +27,7 @@ buildInputs = [ delve ]; buildPhase = let - arch = (if stdenv.isLinux then "linux" else "mac") + (if stdenv.isAarch64 then "arm" else ""); + arch = (if stdenv.hostPlatform.isLinux then "linux" else "mac") + (if stdenv.hostPlatform.isAarch64 then "arm" else ""); in '' runHook preBuild ln -sf ${delve}/bin/dlv lib/dlv/${arch}/dlv @@ -38,7 +38,10 @@ # Github Copilot # Modified version of https://github.com/ktor/nixos/commit/35f4071faab696b2a4d86643726c9dd3e4293964 buildPhase = '' - agent="copilot-agent/bin/copilot-agent-linux" + agent='copilot-agent/native/${lib.toLower stdenv.hostPlatform.uname.system}${{ + x86_64 = "-x64"; + aarch64 = "-arm64"; + }.${stdenv.hostPlatform.uname.processor} or ""}/copilot-language-server' orig_size=$(stat --printf=%s $agent) patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $agent patchelf --set-rpath ${lib.makeLibraryPath [glibc gcc-unwrapped]} $agent diff --git a/pkgs/applications/editors/jetbrains/source/build.nix b/pkgs/applications/editors/jetbrains/source/build.nix index b5dbb28559c8f..132a2c377c065 100644 --- a/pkgs/applications/editors/jetbrains/source/build.nix +++ b/pkgs/applications/editors/jetbrains/source/build.nix @@ -79,7 +79,7 @@ let nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ glib xorg.libX11 libdbusmenu ]; inherit src; - sourceRoot = "source/native/LinuxGlobalMenu"; + sourceRoot = "${src.name}/native/LinuxGlobalMenu"; patches = [ ../patches/libdbm-headers.patch ]; postPatch = "cp ${libdbusmenu-jb}/lib/libdbusmenu-glib.a libdbusmenu-glib.a"; passthru.patched-libdbusmenu = libdbusmenu-jb; @@ -97,7 +97,7 @@ let pname = "fsnotifier"; version = buildVer; inherit src; - sourceRoot = "source/native/fsNotifier/linux"; + sourceRoot = "${src.name}/native/fsNotifier/linux"; buildPhase = '' runHook preBuild $CC -O2 -Wall -Wextra -Wpedantic -D "VERSION=\"${buildVer}\"" -std=c11 main.c inotify.c util.c -o fsnotifier @@ -115,7 +115,7 @@ let pname = "restarter"; version = buildVer; inherit src; - sourceRoot = "source/native/restarter"; + sourceRoot = "${src.name}/native/restarter"; cargoHash = restarterHash; }; @@ -138,7 +138,7 @@ let pname = "jps-bootstrap"; version = buildVer; inherit src; - sourceRoot = "source/platform/jps-bootstrap"; + sourceRoot = "${src.name}/platform/jps-bootstrap"; nativeBuildInputs = [ ant makeWrapper jbr ]; patches = [ ../patches/kotlinc-path.patch ]; postPatch = "sed -i 's|KOTLIN_PATH_HERE|${kotlin}|' src/main/java/org/jetbrains/jpsBootstrap/KotlinCompiler.kt"; diff --git a/pkgs/applications/editors/joe/default.nix b/pkgs/applications/editors/joe/default.nix deleted file mode 100644 index 9059fe69bdce2..0000000000000 --- a/pkgs/applications/editors/joe/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ lib, stdenv, fetchurl } : - -stdenv.mkDerivation rec { - pname = "joe"; - version = "4.6"; - - src = fetchurl { - url = "mirror://sourceforge/joe-editor/${pname}-${version}.tar.gz"; - sha256 = "1pmr598xxxm9j9dl93kq4dv36zyw0q2dh6d7x07hf134y9hhlnj9"; - }; - - meta = with lib; { - description = "Full featured terminal-based screen editor"; - longDescription = '' - JOE (Joe's Own Editor) is a full featured terminal-based screen editor - which is distributed under the GNU General Public License (GPL). JOE has - been around since 1988 and comes standard with many Linux distributions. - - JOE is being maintained by its original author Joseph Allen, plus all of - the people who send bug reports, feature suggestions and patches to the - project web site. JOE is hosted by SourceForge.net and its source code is - controlled under Mercurial. - - JOE is a blending of MicroPro's venerable microcomputer word processor - WordStar and Richard Stallman's famous LISP based text editor GNU-EMACS - (but it does not use code from either program): most of the basic editing - keys are the same as in WordStar as is the overall feel of the editor. JOE - also has some of the key bindings and many of the powerful features of - EMACS. - - JOE is written in C and its only dependency is libc. This makes JOE very - easy to build (just "configure" and "make install"), making it feasible to - include on small systems and recovery disks. The compiled binary is about - 300K in x86. Note that JOE can use either the termcap or terminfo terminal - capabilities databases (or a built-in termcap entry for ANSI - terminals). The choice is controlled by a "configure" option. If terminfo - is used, a library is required to access the database (on some systems - this library is ncurses, but JOE does not use curses to control the - terminal - it has its own code for this). - ''; - homepage = "https://joe-editor.sourceforge.io"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/applications/editors/jove/default.nix b/pkgs/applications/editors/jove/default.nix deleted file mode 100644 index 82c3f9056d351..0000000000000 --- a/pkgs/applications/editors/jove/default.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, groff -, makeWrapper -, ncurses -, runtimeShell -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "jove"; - version = "4.17.5.3"; - - src = fetchFromGitHub { - owner = "jonmacs"; - repo = "jove"; - rev = finalAttrs.version; - hash = "sha256-ZBq2zCml637p9VgedpOrUn2jSc5L0pthdgRS7YsB3zs="; - }; - - nativeBuildInputs = [ makeWrapper ]; - - buildInputs = [ - groff - ncurses - ]; - - postPatch = '' - patchShebangs testbuild.sh testmailer.sh teachjove jmake.sh - ''; - - dontConfigure = true; - - preBuild = '' - makeFlagsArray+=(SYSDEFS="-DSYSVR4 -D_XOPEN_SOURCE=500" \ - JTMPDIR=$TMPDIR - TERMCAPLIB=-lncurses \ - SHELL=${runtimeShell} \ - DFLTSHELL=${runtimeShell} \ - JOVEHOME=${placeholder "out"}) - ''; - - postInstall = '' - wrapProgram $out/bin/teachjove \ - --prefix PATH ":" "$out/bin" - ''; - - meta = { - homepage = "https://github.com/jonmacs/jove"; - description = "Jonathan's Own Version of Emacs"; - changelog = "https://github.com/jonmacs/jove/releases/tag/${finalAttrs.version}"; - license = lib.licenses.bsd2; - maintainers = with lib.maintainers; [ AndersonTorres ]; - platforms = lib.platforms.unix; - # never built on Hydra: https://hydra.nixos.org/job/nixpkgs/trunk/jove.x86_64-darwin - broken = stdenv.isDarwin; - }; -}) diff --git a/pkgs/applications/editors/jupp/default.nix b/pkgs/applications/editors/jupp/default.nix deleted file mode 100644 index 72e82da61ddad..0000000000000 --- a/pkgs/applications/editors/jupp/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ lib -, stdenv -, fetchurl -, ncurses -, gpm -}: - -stdenv.mkDerivation rec { - pname = "jupp"; - version = "40"; - srcName = "joe-3.1${pname}${version}"; - - src = fetchurl { - urls = [ - "https://www.mirbsd.org/MirOS/dist/jupp/${srcName}.tgz" - "https://pub.allbsd.org/MirOS/dist/jupp/${srcName}.tgz" - ]; - sha256 = "S+1DnN5/K+KU6W5J7z6RPqkPvl6RTbiIQD46J+gDWxo="; - }; - - preConfigure = "chmod +x ./configure"; - - buildInputs = [ - gpm - ncurses - ]; - - configureFlags = [ - "--enable-curses" - "--enable-getpwnam" - "--enable-largefile" - "--enable-termcap" - "--enable-termidx" - ]; - - meta = with lib; { - homepage = "http://www.mirbsd.org/jupp.htm"; - downloadPage = "https://www.mirbsd.org/MirOS/dist/jupp/"; - description = "Portable fork of Joe's editor"; - longDescription = '' - This is the portable version of JOE's Own Editor, which is currently - developed at sourceforge, licenced under the GNU General Public License, - Version 1, using autoconf/automake. This version has been enhanced by - several functions intended for programmers or other professional users, - and has a lot of bugs fixed. It is based upon an older version of joe - because these behave better overall. - ''; - license = licenses.gpl1Only; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = with platforms; unix; - }; -} diff --git a/pkgs/applications/editors/jupyter-kernels/xeus-cling/default.nix b/pkgs/applications/editors/jupyter-kernels/xeus-cling/default.nix index 943a7e49e9cdc..4158fc3dff0a2 100644 --- a/pkgs/applications/editors/jupyter-kernels/xeus-cling/default.nix +++ b/pkgs/applications/editors/jupyter-kernels/xeus-cling/default.nix @@ -1,11 +1,6 @@ { callPackage -, clangStdenv , cling , fetchurl -, lib -, llvmPackages_13 -, makeWrapper -, runCommand , stdenv }: diff --git a/pkgs/applications/editors/jupyter-kernels/xeus-cling/xeus-cling.nix b/pkgs/applications/editors/jupyter-kernels/xeus-cling/xeus-cling.nix index 48873326bfcfb..b944569ff4a7b 100644 --- a/pkgs/applications/editors/jupyter-kernels/xeus-cling/xeus-cling.nix +++ b/pkgs/applications/editors/jupyter-kernels/xeus-cling/xeus-cling.nix @@ -1,10 +1,7 @@ { lib -, callPackage , clangStdenv , cmake , fetchFromGitHub -, gcc -, git , llvmPackages_13 # Libraries , argparse @@ -71,9 +68,7 @@ clangStdenv.mkDerivation rec { zlib ]; - cmakeFlags = lib.optionals debug [ - "-DCMAKE_BUILD_TYPE=Debug" - ]; + cmakeBuildType = if debug then "Debug" else "Release"; postPatch = '' substituteInPlace src/xmagics/executable.cpp \ diff --git a/pkgs/applications/editors/jupyter/default.nix b/pkgs/applications/editors/jupyter/default.nix index 57122d173a441..08c33982364da 100644 --- a/pkgs/applications/editors/jupyter/default.nix +++ b/pkgs/applications/editors/jupyter/default.nix @@ -9,7 +9,7 @@ let jupyterPath = (jupyter-kernel.create { inherit definitions; }); jupyter-notebook = (python3.buildEnv.override { extraLibs = [ python3.pkgs.notebook ]; - makeWrapperArgs = ["--set JUPYTER_PATH ${jupyterPath}"]; + makeWrapperArgs = ["--prefix JUPYTER_PATH : ${jupyterPath}"]; }).overrideAttrs(oldAttrs: { meta = oldAttrs.meta // { mainProgram = "jupyter-notebook"; }; }); diff --git a/pkgs/applications/editors/jupyter/kernel.nix b/pkgs/applications/editors/jupyter/kernel.nix index 3640de28e8acc..b036c7274d51d 100644 --- a/pkgs/applications/editors/jupyter/kernel.nix +++ b/pkgs/applications/editors/jupyter/kernel.nix @@ -26,7 +26,7 @@ in # Definitions is an attribute set. - create = { definitions ? default }: with lib; stdenv.mkDerivation { + create = { definitions ? default }: stdenv.mkDerivation { name = "jupyter-kernels"; @@ -37,14 +37,14 @@ in installPhase = '' mkdir kernels - ${concatStringsSep "\n" (mapAttrsToList (kernelName: unfilteredKernel: + ${lib.concatStringsSep "\n" (lib.mapAttrsToList (kernelName: unfilteredKernel: let allowedKernelKeys = ["argv" "displayName" "language" "interruptMode" "env" "metadata" "logo32" "logo64" "extraPaths"]; - kernel = filterAttrs (n: v: (any (x: x == n) allowedKernelKeys)) unfilteredKernel; + kernel = lib.filterAttrs (n: v: (lib.any (x: x == n) allowedKernelKeys)) unfilteredKernel; config = builtins.toJSON ( kernel // {display_name = if (kernel.displayName != "") then kernel.displayName else kernelName;} - // (optionalAttrs (kernel ? interruptMode) { interrupt_mode = kernel.interruptMode; }) + // (lib.optionalAttrs (kernel ? interruptMode) { interrupt_mode = kernel.interruptMode; }) ); extraPaths = kernel.extraPaths or {} // lib.optionalAttrs (kernel.logo32 != null) { "logo-32x32.png" = kernel.logo32; } @@ -64,7 +64,7 @@ in meta = { description = "Wrapper to create jupyter notebook kernel definitions"; homepage = "https://jupyter.org/"; - maintainers = with maintainers; [ aborsu ]; + maintainers = with lib.maintainers; [ aborsu ]; }; }; } diff --git a/pkgs/applications/editors/kakoune/default.nix b/pkgs/applications/editors/kakoune/default.nix index 0e8ccb1d2d314..c45ad92674a68 100644 --- a/pkgs/applications/editors/kakoune/default.nix +++ b/pkgs/applications/editors/kakoune/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Vim inspired text editor"; license = licenses.publicDomain; mainProgram = "kak"; - maintainers = with maintainers; [ vrthra ]; + maintainers = with maintainers; [ philiptaron ]; platforms = platforms.unix; }; }) diff --git a/pkgs/applications/editors/kakoune/plugins/aliases.nix b/pkgs/applications/editors/kakoune/plugins/aliases.nix index 1d516f9b436f5..392ee835d3392 100644 --- a/pkgs/applications/editors/kakoune/plugins/aliases.nix +++ b/pkgs/applications/editors/kakoune/plugins/aliases.nix @@ -2,21 +2,19 @@ lib: overridden: -with overridden; - let # Removing recurseForDerivation prevents derivations of aliased attribute # set to appear while listing all the packages available. - removeRecurseForDerivations = alias: with lib; + removeRecurseForDerivations = alias: if alias.recurseForDerivations or false then - removeAttrs alias ["recurseForDerivations"] + lib.removeAttrs alias ["recurseForDerivations"] else alias; # Disabling distribution prevents top-level aliases for non-recursed package # sets from building on Hydra. - removeDistribute = alias: with lib; - if isDerivation alias then - dontDistribute alias + removeDistribute = alias: + if lib.isDerivation alias then + lib.dontDistribute alias else alias; # Make sure that we are not shadowing something from @@ -37,11 +35,11 @@ let in mapAliases ({ - kak-auto-pairs = auto-pairs-kak; # backwards compat, added 2021-01-04 - kak-buffers = kakoune-buffers; # backwards compat, added 2021-01-04 - kak-byline = byline-kak; # backwards compat, added 2023-10-22 - kak-fzf = fzf-kak; # backwards compat, added 2021-01-04 - kak-powerline = powerline-kak; # backwards compat, added 2021-01-04 - kak-prelude = prelude-kak; # backwards compat, added 2021-01-04 - kak-vertical-selection = kakoune-vertical-selection; # backwards compat, added 2021-01-04 + kak-auto-pairs = overridden.auto-pairs-kak; # backwards compat, added 2021-01-04 + kak-buffers = overridden.kakoune-buffers; # backwards compat, added 2021-01-04 + kak-byline = overridden.byline-kak; # backwards compat, added 2023-10-22 + kak-fzf = overridden.fzf-kak; # backwards compat, added 2021-01-04 + kak-powerline = overridden.powerline-kak; # backwards compat, added 2021-01-04 + kak-prelude = overridden.prelude-kak; # backwards compat, added 2021-01-04 + kak-vertical-selection = overridden.kakoune-vertical-selection; # backwards compat, added 2021-01-04 } // deprecations) diff --git a/pkgs/applications/editors/kakoune/plugins/overrides.nix b/pkgs/applications/editors/kakoune/plugins/overrides.nix index ebdcac8e4dae9..6f60573f48b29 100644 --- a/pkgs/applications/editors/kakoune/plugins/overrides.nix +++ b/pkgs/applications/editors/kakoune/plugins/overrides.nix @@ -2,6 +2,7 @@ , buildKakounePluginFrom2Nix , kakoune-lsp, parinfer-rust, rep , fzf, git, guile, kakoune-unwrapped, lua5_3, plan9port +, rustPlatform }: self: super: { @@ -58,7 +59,7 @@ declare-option -hidden str ansi_filter %{'"$out"'/bin/kak-ansi-filter} description = "Kakoune support for rendering ANSI code"; homepage = "https://github.com/eraserhd/kak-ansi"; license = licenses.unlicense; - maintainers = with maintainers; [ eraserhd ]; + maintainers = with maintainers; [ eraserhd philiptaron ]; platforms = platforms.all; }; }; @@ -88,7 +89,7 @@ declare-option -hidden str ansi_filter %{'"$out"'/bin/kak-ansi-filter} description = "Kakoune integration with the Plan 9 plumber"; homepage = "https://github.com/eraserhd/kak-plumb"; license = licenses.unlicense; - maintainers = with maintainers; [ eraserhd ]; + maintainers = with maintainers; [ eraserhd philiptaron ]; platforms = platforms.all; }; }; @@ -119,7 +120,7 @@ declare-option -hidden str ansi_filter %{'"$out"'/bin/kak-ansi-filter} description = "Help Kakoune save and restore state between sessions"; homepage = "https://gitlab.com/Screwtapello/kakoune-state-save"; license = licenses.mit; - maintainers = with maintainers; [ Flakebi ]; + maintainers = with maintainers; [ Flakebi philiptaron ]; platforms = platforms.all; }; }; @@ -131,6 +132,41 @@ declare-option -hidden str ansi_filter %{'"$out"'/bin/kak-ansi-filter} ''; }); + hop-kak = rustPlatform.buildRustPackage rec { + pname = "hop-kak"; + version = "0.2.0"; + + src = fetchgit { + url = "https://git.sr.ht/~hadronized/hop.kak"; + rev = "7314ec64809a69e0044ba7ec57a18b43e3b5f005"; + sha256 = "stmGZQU0tp+5xxrexKMzwSwHj5F/F4HzDO9BorNWC3w="; + + # this package uses git to put the commit hash in the + # help dialog, so leave the .git folder so the command + # succeeds. + leaveDotGit = true; + }; + + nativeBuildInputs = [ + git + ]; + + cargoHash = "sha256-EjSj/+BysGwJBxK6Ccg2+pXHdB2Lg3dxIURRsSVTHVY="; + + postInstall = '' + mkdir -p $out/share/kak/bin + mv $out/bin/hop-kak $out/share/kak/bin/ + ''; + + meta = with lib; { + description = "hinting brought to Kakoune selections"; + homepage = "https://git.sr.ht/~hadronized/hop.kak/"; + license = licenses.bsd3; + maintainers = with maintainers; [ oleina ]; + platforms = platforms.all; + }; + }; + quickscope-kak = buildKakounePluginFrom2Nix rec { pname = "quickscope-kak"; version = "1.0.0"; @@ -158,4 +194,22 @@ declare-option -hidden str ansi_filter %{'"$out"'/bin/kak-ansi-filter} platforms = platforms.all; }; }; + + kakoune-catppuccin = buildKakounePluginFrom2Nix { + pname = "kakoune-catppuccin"; + version = "0-unstable-2024-03-29"; + src = fetchFromGitHub { + owner = "catppuccin"; + repo = "kakoune"; + rev = "7f187d9da2867a7fda568b2135d29b9c00cfbb94"; + hash = "sha256-acBOQuJ8MgsMKdvFV5B2CxuxvXIYsg11n1mHEGqd120="; + }; + meta = with lib; { + description = "Soothing pastel theme for Kakoune"; + homepage = "https://github.com/catppuccin/kakoune/"; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ philipwilk ]; + }; + }; } diff --git a/pkgs/applications/editors/kakoune/wrapper.nix b/pkgs/applications/editors/kakoune/wrapper.nix index 451507885ce03..60ae58aa72c36 100644 --- a/pkgs/applications/editors/kakoune/wrapper.nix +++ b/pkgs/applications/editors/kakoune/wrapper.nix @@ -1,4 +1,4 @@ -{ symlinkJoin, makeWrapper, kakoune, plugins ? [], configure ? {} }: +{ lib, symlinkJoin, makeWrapper, kakoune, plugins ? [], configure ? {} }: let # "plugins" is the preferred way, but some configurations may be @@ -14,10 +14,17 @@ in paths = [ kakoune ] ++ requestedPlugins; postBuild = '' + # create a directory for bins that kakoune needs + # access to, without polluting the users path by adding + # that binary nested with this symlinkJoin. + mkdir -p $out/share/kak/bin + # location of kak binary is used to find ../share/kak/autoload, # unless explicitly overriden with KAKOUNE_RUNTIME rm "$out/bin/kak" - makeWrapper "${kakoune}/bin/kak" "$out/bin/kak" --set KAKOUNE_RUNTIME "$out/share/kak" + makeWrapper "${kakoune}/bin/kak" "$out/bin/kak" \ + --set KAKOUNE_RUNTIME "$out/share/kak" \ + --suffix PATH : "$out/share/kak/bin" # currently kakoune ignores doc files if they are symlinks, so workaround by # copying doc files over, so they become regular files... @@ -27,5 +34,5 @@ in rm -Rf "$out/DELETE_ME" ''; - meta = kakoune.meta // { priority = (kakoune.meta.priority or 0) - 1; }; + meta = kakoune.meta // { priority = (kakoune.meta.priority or lib.meta.defaultPriority) - 1; }; } diff --git a/pkgs/applications/editors/kibi/default.nix b/pkgs/applications/editors/kibi/default.nix index 368249cc3fe82..33295cdc02e64 100644 --- a/pkgs/applications/editors/kibi/default.nix +++ b/pkgs/applications/editors/kibi/default.nix @@ -8,7 +8,7 @@ rustPlatform.buildRustPackage rec { pname = "kibi"; version = "0.2.2"; - cargoSha256 = "sha256-ebUCkcUACganeq5U0XU4VIGClKDZGhUw6K3WBgTUUUw="; + cargoHash = "sha256-ebUCkcUACganeq5U0XU4VIGClKDZGhUw6K3WBgTUUUw="; src = fetchFromGitHub { owner = "ilai-deutel"; diff --git a/pkgs/applications/editors/l3afpad/default.nix b/pkgs/applications/editors/l3afpad/default.nix deleted file mode 100644 index 1ad346ed01de0..0000000000000 --- a/pkgs/applications/editors/l3afpad/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, stdenv, intltool, pkg-config, gtk3, fetchFromGitHub -, autoreconfHook, wrapGAppsHook3 }: - -stdenv.mkDerivation rec { - version = "unstable-2022-02-14"; - pname = "l3afpad"; - - src = fetchFromGitHub { - owner = "stevenhoneyman"; - repo = pname; - rev = "16f22222116b78b7f6a6fd83289937cdaabed624"; - sha256 = "sha256-ly2w9jmRlprm/PnyC0LYjrxBVK+J0DLiSpzuTUMZpWA="; - }; - - nativeBuildInputs = [ pkg-config autoreconfHook wrapGAppsHook3 intltool ]; - buildInputs = [ gtk3 ]; - - meta = with lib; { - description = "Simple text editor forked from Leafpad using GTK+ 3.x"; - homepage = "https://github.com/stevenhoneyman/l3afpad"; - platforms = platforms.linux; - maintainers = with maintainers; [ ckie ]; - license = licenses.gpl2; - mainProgram = "l3afpad"; - }; -} diff --git a/pkgs/applications/editors/lapce/Cargo.lock b/pkgs/applications/editors/lapce/Cargo.lock index 4937cc7d645fb..512e479805832 100644 --- a/pkgs/applications/editors/lapce/Cargo.lock +++ b/pkgs/applications/editors/lapce/Cargo.lock @@ -58,30 +58,20 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "0.7.19" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e" -dependencies = [ - "memchr", -] - -[[package]] -name = "aho-corasick" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ "memchr", ] [[package]] name = "alacritty_terminal" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6d1ea4484c8676f295307a4892d478c70ac8da1dbd8c7c10830a504b7f1022f" +version = "0.24.1-dev" +source = "git+https://github.com/alacritty/alacritty?rev=cacdb5bb3b72bad2c729227537979d95af75978f#cacdb5bb3b72bad2c729227537979d95af75978f" dependencies = [ "base64 0.22.0", - "bitflags 2.5.0", + "bitflags 2.6.0", "home", "libc", "log", @@ -95,16 +85,10 @@ dependencies = [ "signal-hook", "unicode-width", "vte", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] -name = "aliasable" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "250f629c0161ad8107cf89319e990051fae62832fd343083bea452d93e2205fd" - -[[package]] name = "allocator-api2" version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -123,7 +107,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "052ad56e336bcc615a214bffbeca6c181ee9550acec193f0327e0b103b033a4d" dependencies = [ "android-properties", - "bitflags 2.5.0", + "bitflags 2.6.0", "cc", "cesu8", "jni", @@ -208,11 +192,11 @@ checksum = "2d5f312b0a56c5cdf967c0aeb67f6289603354951683bc97ddc595ab974ba9aa" [[package]] name = "ash" -version = "0.37.3+1.3.251" +version = "0.38.0+1.3.281" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e9c3835d686b0a6084ab4234fcd1b07dbf6e4767dce60874b12356a25ecd4a" +checksum = "0bb44936d800fea8f016d7f2311c6a4f97aebd5dc86f09906139ec848cf3a46f" dependencies = [ - "libloading 0.7.4", + "libloading", ] [[package]] @@ -267,7 +251,7 @@ dependencies = [ "async-lock 3.3.0", "async-task", "concurrent-queue", - "fastrand 2.0.1", + "fastrand", "futures-lite", "slab", ] @@ -398,12 +382,6 @@ dependencies = [ ] [[package]] -name = "atomic" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c59bdb34bc650a32731b31bd8f0829cc15d24a708ee31559e0bb34f2bc320cba" - -[[package]] name = "atomic-waker" version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -453,18 +431,18 @@ dependencies = [ [[package]] name = "bit-set" -version = "0.5.3" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" +checksum = "f0481a0e032742109b1133a095184ee93d88f3dc9e0d28a5d033dc77a073f44f" dependencies = [ "bit-vec", ] [[package]] name = "bit-vec" -version = "0.6.3" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" +checksum = "d2c54ff287cfc0a34f38a6b832ea1bd8e448a330b3e40a50859e6488bee07f22" [[package]] name = "bitflags" @@ -474,9 +452,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" dependencies = [ "serde", ] @@ -521,23 +499,29 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "15b55663a85f33501257357e6421bb33e769d5c9ffb5ba0921c975a123e35e68" dependencies = [ "block-sys", - "objc2", + "objc2 0.4.1", +] + +[[package]] +name = "block2" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c132eebf10f5cad5289222520a4a058514204aed6d791f1cf4fe8088b82d15f" +dependencies = [ + "objc2 0.5.2", ] [[package]] name = "blocking" -version = "1.5.1" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118" +checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea" dependencies = [ "async-channel", - "async-lock 3.3.0", "async-task", - "fastrand 2.0.1", "futures-io", "futures-lite", "piper", - "tracing 0.1.37", ] [[package]] @@ -565,9 +549,9 @@ checksum = "2c676a478f63e9fa2dd5368a42f28bba0d6c560b775f38583c8bbaa7fcd67c9c" [[package]] name = "bytemuck" -version = "1.14.3" +version = "1.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2ef034f05691a48569bd920a96c81b9d91bbad1ab5ac7c4616c1f6ef36cb79f" +checksum = "102087e286b4677862ea56cf8fc58bb2cdfa8725c40ffb80fe3a008eb7f2fc83" dependencies = [ "bytemuck_derive", ] @@ -601,7 +585,7 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7b50b5a44d59a98c55a9eeb518f39bf7499ba19fd98ee7d22618687f3f10adbf" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "log", "polling", "rustix", @@ -704,12 +688,13 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cc" -version = "1.0.90" +version = "1.0.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5" +checksum = "96c51067fd44124faa7f870b4b1c969379ad32b2ba805aa959430ceaa384f695" dependencies = [ "jobserver", "libc", + "once_cell", ] [[package]] @@ -738,9 +723,9 @@ checksum = "77e53693616d3075149f4ead59bdeecd204ac6b8192d8969757601b74bddf00f" [[package]] name = "chrono" -version = "0.4.34" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bc015644b92d5890fab7489e49d21f879d5c990186827d42ec511919404f38b" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" dependencies = [ "android-tzdata", "iana-time-zone", @@ -952,9 +937,9 @@ dependencies = [ [[package]] name = "core-foundation" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" dependencies = [ "core-foundation-sys", "libc", @@ -962,9 +947,9 @@ dependencies = [ [[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 = "core-graphics" @@ -981,17 +966,39 @@ dependencies = [ [[package]] name = "core-graphics-types" -version = "0.1.1" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a68b68b3446082644c91ac778bf50cd4104bfb002b5a6a7c44cca5a2c70788b" +checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf" dependencies = [ "bitflags 1.3.2", "core-foundation", - "foreign-types 0.3.2", "libc", ] [[package]] +name = "cosmic-text" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59fd57d82eb4bfe7ffa9b1cec0c05e2fd378155b47f255a67983cb4afe0e80c2" +dependencies = [ + "bitflags 2.6.0", + "fontdb", + "log", + "rangemap", + "rayon", + "rustc-hash", + "rustybuzz 0.14.1", + "self_cell", + "swash", + "sys-locale", + "ttf-parser 0.21.1", + "unicode-bidi", + "unicode-linebreak", + "unicode-script", + "unicode-segmentation", +] + +[[package]] name = "cpp_demangle" version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1234,12 +1241,12 @@ dependencies = [ [[package]] name = "d3d12" -version = "0.19.0" +version = "22.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e3d747f100290a1ca24b752186f61f6637e1deffe3bf6320de6fcb29510a307" +checksum = "bdbd1f579714e3c809ebd822c81ef148b1ceaeb3d535352afc73fd0c4c6a0017" dependencies = [ - "bitflags 2.5.0", - "libloading 0.8.1", + "bitflags 2.6.0", + "libloading", "winapi", ] @@ -1385,7 +1392,7 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" dependencies = [ - "libloading 0.8.1", + "libloading", ] [[package]] @@ -1399,6 +1406,15 @@ dependencies = [ ] [[package]] +name = "document-features" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb6969eaabd2421f8a2775cfd2471a2b634372b4a25d41e3bd647b79912850a0" +dependencies = [ + "litrs", +] + +[[package]] name = "downcast-rs" version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1410,7 +1426,7 @@ version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a0f8a69e60d75ae7dab4ef26a59ca99f2a89d4c142089b537775ae0c198bdcde" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "bytemuck", "drm-ffi", "drm-fourcc", @@ -1463,15 +1479,15 @@ dependencies = [ [[package]] name = "either" -version = "1.8.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" +checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b" [[package]] name = "encoding_rs" -version = "0.8.31" +version = "0.8.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b" +checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" dependencies = [ "cfg-if", ] @@ -1613,15 +1629,6 @@ checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649" [[package]] name = "fastrand" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499" -dependencies = [ - "instant", -] - -[[package]] -name = "fastrand" version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" @@ -1660,9 +1667,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.28" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" dependencies = [ "crc32fast", "miniz_oxide", @@ -1677,15 +1684,14 @@ checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" [[package]] name = "floem" version = "0.1.1" -source = "git+https://github.com/lapce/floem?rev=a3dd7599823d74977ff431ecb08fffbcf4df2d8a#a3dd7599823d74977ff431ecb08fffbcf4df2d8a" +source = "git+https://github.com/lapce/floem?rev=157631a49d6ba13a3467dcb994eb46a98c52eb76#157631a49d6ba13a3467dcb994eb46a98c52eb76" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "copypasta", "crossbeam-channel", "downcast-rs", "educe", "floem-editor-core", - "floem-peniko", "floem-winit", "floem_reactive", "floem_renderer", @@ -1695,15 +1701,15 @@ dependencies = [ "im-rc", "image", "indexmap", - "kurbo 0.9.5", "lapce-xi-rope", - "once_cell", "parking_lot", + "peniko", "raw-window-handle 0.6.0", "rfd", "rustc-hash", "serde", "sha2", + "slotmap", "smallvec", "strum", "strum_macros", @@ -1713,63 +1719,27 @@ dependencies = [ ] [[package]] -name = "floem-cosmic-text" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43d74a7975acd84233e843c26da850aa43b39f1e64503fd46d6af9be4ea498dd" -dependencies = [ - "floem-peniko", - "fontdb", - "libm", - "log", - "once_cell", - "ouroboros", - "parking_lot", - "rangemap", - "rustybuzz", - "stretto", - "swash", - "sys-locale", - "ttf-parser 0.20.0", - "unicode-bidi", - "unicode-linebreak", - "unicode-script", - "unicode-segmentation", -] - -[[package]] name = "floem-editor-core" version = "0.1.1" -source = "git+https://github.com/lapce/floem?rev=a3dd7599823d74977ff431ecb08fffbcf4df2d8a#a3dd7599823d74977ff431ecb08fffbcf4df2d8a" +source = "git+https://github.com/lapce/floem?rev=157631a49d6ba13a3467dcb994eb46a98c52eb76#157631a49d6ba13a3467dcb994eb46a98c52eb76" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "itertools 0.12.1", "lapce-xi-rope", "memchr", - "once_cell", "serde", "strum", "strum_macros", ] [[package]] -name = "floem-peniko" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f505394c816e710e2b664647a7a1a4ffdf45e3b3493ad6560d9489f23100430" -dependencies = [ - "kurbo 0.9.5", - "smallvec", -] - -[[package]] name = "floem-vger" -version = "0.2.8" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ef11c9c2f1668ec58b1712f85afec989caaae19273b653aaad1964575f8871c" +checksum = "d384ed3dafa48c991166ed519da1a26dc3324ada418cd966f59a0770255e2518" dependencies = [ + "cosmic-text", "euclid", - "floem-cosmic-text", "fontdue", "rect_packer", "wgpu", @@ -1784,7 +1754,7 @@ dependencies = [ "ahash", "android-activity", "atomic-waker", - "bitflags 2.5.0", + "bitflags 2.6.0", "bytemuck", "calloop", "cfg_aliases 0.1.1", @@ -1795,10 +1765,10 @@ dependencies = [ "js-sys", "libc", "log", - "memmap2 0.9.0", + "memmap2", "ndk", "ndk-sys", - "objc2", + "objc2 0.4.1", "once_cell", "orbclient", "percent-encoding", @@ -1828,7 +1798,7 @@ dependencies = [ [[package]] name = "floem_reactive" version = "0.1.1" -source = "git+https://github.com/lapce/floem?rev=a3dd7599823d74977ff431ecb08fffbcf4df2d8a#a3dd7599823d74977ff431ecb08fffbcf4df2d8a" +source = "git+https://github.com/lapce/floem?rev=157631a49d6ba13a3467dcb994eb46a98c52eb76#157631a49d6ba13a3467dcb994eb46a98c52eb76" dependencies = [ "smallvec", ] @@ -1836,25 +1806,27 @@ dependencies = [ [[package]] name = "floem_renderer" version = "0.1.1" -source = "git+https://github.com/lapce/floem?rev=a3dd7599823d74977ff431ecb08fffbcf4df2d8a#a3dd7599823d74977ff431ecb08fffbcf4df2d8a" +source = "git+https://github.com/lapce/floem?rev=157631a49d6ba13a3467dcb994eb46a98c52eb76#157631a49d6ba13a3467dcb994eb46a98c52eb76" dependencies = [ - "floem-cosmic-text", - "floem-peniko", + "cosmic-text", "image", + "parking_lot", + "peniko", "resvg", + "swash", ] [[package]] name = "floem_tiny_skia_renderer" version = "0.1.1" -source = "git+https://github.com/lapce/floem?rev=a3dd7599823d74977ff431ecb08fffbcf4df2d8a#a3dd7599823d74977ff431ecb08fffbcf4df2d8a" +source = "git+https://github.com/lapce/floem?rev=157631a49d6ba13a3467dcb994eb46a98c52eb76#157631a49d6ba13a3467dcb994eb46a98c52eb76" dependencies = [ "anyhow", "bytemuck", - "floem-peniko", "floem_renderer", "futures", "image", + "peniko", "raw-window-handle 0.6.0", "resvg", "softbuffer", @@ -1864,14 +1836,14 @@ dependencies = [ [[package]] name = "floem_vger_renderer" version = "0.1.1" -source = "git+https://github.com/lapce/floem?rev=a3dd7599823d74977ff431ecb08fffbcf4df2d8a#a3dd7599823d74977ff431ecb08fffbcf4df2d8a" +source = "git+https://github.com/lapce/floem?rev=157631a49d6ba13a3467dcb994eb46a98c52eb76#157631a49d6ba13a3467dcb994eb46a98c52eb76" dependencies = [ "anyhow", - "floem-peniko", "floem-vger", "floem_renderer", "futures", "image", + "peniko", "raw-window-handle 0.6.0", "resvg", "swash", @@ -1885,12 +1857,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] +name = "font-types" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f0189ccb084f77c5523e08288d418cbaa09c451a08515678a0aa265df9a8b60" +dependencies = [ + "bytemuck", +] + +[[package]] name = "fontconfig-parser" -version = "0.5.3" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "674e258f4b5d2dcd63888c01c68413c51f565e8af99d2f7701c7b81d79ef41c4" +checksum = "6a595cb550439a117696039dfc69830492058211b771a2a165379f2a1a53d84d" dependencies = [ - "roxmltree 0.18.0", + "roxmltree", ] [[package]] @@ -1901,7 +1882,7 @@ checksum = "b0299020c3ef3f60f526a4f64ab4a3d4ce116b1acbf24cdd22da0068e5d81dc3" dependencies = [ "fontconfig-parser", "log", - "memmap2 0.9.0", + "memmap2", "slotmap", "tinyvec", "ttf-parser 0.20.0", @@ -2048,7 +2029,7 @@ version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "445ba825b27408685aaecefd65178908c36c6e96aaf6d8599419d46e624192ba" dependencies = [ - "fastrand 2.0.1", + "fastrand", "futures-core", "futures-io", "parking", @@ -2111,7 +2092,7 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "27d12c0aed7f1e24276a241aadc4cb8ea9f83000f34bc062b7cc2d51e3b0fabd" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "debugid", "fxhash", "serde", @@ -2181,11 +2162,11 @@ dependencies = [ [[package]] name = "git2" -version = "0.18.2" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b3ba52851e73b46a4c3df1d89343741112003f0f6f13beb0dfac9e457c3fdcd" +checksum = "b903b73e45dc0c6c596f2d37eccece7c1c8bb6e4407b001096387c63d0d93724" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "libc", "libgit2-sys", "log", @@ -2206,22 +2187,16 @@ dependencies = [ ] [[package]] -name = "glob" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" - -[[package]] name = "globset" version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1" dependencies = [ - "aho-corasick 1.1.2", + "aho-corasick", "bstr", "log", "regex-automata", - "regex-syntax 0.8.2", + "regex-syntax", ] [[package]] @@ -2238,9 +2213,9 @@ dependencies = [ [[package]] name = "glutin_wgl_sys" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8098adac955faa2d31079b65dc48841251f69efd3ac25477903fc424362ead" +checksum = "0a4e1951bbd9434a81aa496fe59ccc2235af3820d27b85f9314e279609211e2c" dependencies = [ "gl_generator", ] @@ -2251,7 +2226,7 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fbcd2dba93594b227a1f57ee09b8b9da8892c34d55aa332e034a228d0fe6a171" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "gpu-alloc-types", ] @@ -2261,14 +2236,14 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "98ff03b468aa837d70984d55f5d3f846f6ec31fe34bbb97c4f85219caeee1ca4" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", ] [[package]] name = "gpu-allocator" -version = "0.25.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f56f6318968d03c18e1bcf4857ff88c61157e9da8e47c5f29055d60e1228884" +checksum = "fdd4240fc91d3433d5e5b0fc5b67672d771850dc19bbee03c1381e19322803d7" dependencies = [ "log", "presser", @@ -2279,61 +2254,59 @@ dependencies = [ [[package]] name = "gpu-descriptor" -version = "0.2.4" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc11df1ace8e7e564511f53af41f3e42ddc95b56fd07b3f4445d2a6048bc682c" +checksum = "9c08c1f623a8d0b722b8b99f821eb0ba672a1618f0d3b16ddbee1cedd2dd8557" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "gpu-descriptor-types", "hashbrown", ] [[package]] name = "gpu-descriptor-types" -version = "0.1.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "363e3677e55ad168fef68cf9de3a4a310b53124c5e784c53a1d70e92d23f2126" +checksum = "fdf242682df893b86f33a73828fb09ca4b2d3bb6cc95249707fc684d27484b91" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", ] [[package]] name = "grep-matcher" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3902ca28f26945fe35cad349d776f163981d777fee382ccd6ef451126f51b319" +checksum = "47a3141a10a43acfedc7c98a60a834d7ba00dfe7bec9071cbfc19b55b292ac02" dependencies = [ "memchr", ] [[package]] name = "grep-regex" -version = "0.1.11" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "997598b41d53a37a2e3fc5300d5c11d825368c054420a9c65125b8fe1078463f" +checksum = "f748bb135ca835da5cbc67ca0e6955f968db9c5df74ca4f56b18e1ddbc68230d" dependencies = [ - "aho-corasick 0.7.19", "bstr", "grep-matcher", "log", - "regex", - "regex-syntax 0.6.27", - "thread_local", + "regex-automata", + "regex-syntax", ] [[package]] name = "grep-searcher" -version = "0.1.11" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5601c4b9f480f0c9ebb40b1f6cbf447b8a50c5369223937a6c5214368c58779f" +checksum = "ba536ae4f69bec62d8839584dd3153d3028ef31bb229f04e09fb5a9e5a193c54" dependencies = [ "bstr", - "bytecount", "encoding_rs", "encoding_rs_io", "grep-matcher", "log", - "memmap2 0.5.10", + "memchr", + "memmap2", ] [[package]] @@ -2369,9 +2342,9 @@ checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" [[package]] name = "hashbrown" -version = "0.14.3" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" dependencies = [ "ahash", "allocator-api2", @@ -2383,10 +2356,10 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af2a7e73e1f34c48da31fb668a907f250794837e08faa144fd24f0b8b741e890" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "com", "libc", - "libloading 0.8.1", + "libloading", "thiserror", "widestring", "winapi", @@ -2427,11 +2400,11 @@ checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df" [[package]] name = "home" -version = "0.5.5" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" +checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -2475,9 +2448,9 @@ source = "git+https://github.com/dragazo/human-sort?rev=1e74db1e09e8194ba88ad983 [[package]] name = "hyper" -version = "0.14.27" +version = "0.14.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" +checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" dependencies = [ "bytes", "futures-channel", @@ -2490,7 +2463,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2 0.4.7", + "socket2", "tokio", "tower-service", "tracing 0.1.37", @@ -2529,9 +2502,9 @@ version = "0.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "99d3aaff8a54577104bafdf686ff18565c3b6903ca5782a2026ef06e2c7aa319" dependencies = [ - "block2", + "block2 0.3.0", "dispatch", - "objc2", + "objc2 0.4.1", ] [[package]] @@ -2635,26 +2608,21 @@ checksum = "029d73f573d8e8d63e6d5020011d3255b28c3ba85d6cf870a07184ed23de9284" [[package]] name = "include_dir" -version = "0.6.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24b56e147e6187d61e9d0f039f10e070d0c0a887e24fe0bb9ca3f29bfde62cab" +checksum = "923d117408f1e49d914f1a379a309cffe4f18c05cf4e3d12e613a15fc81bd0dd" dependencies = [ - "glob", - "include_dir_impl", - "proc-macro-hack", + "include_dir_macros", ] [[package]] -name = "include_dir_impl" -version = "0.6.2" +name = "include_dir_macros" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a0c890c85da4bab7bce4204c707396bbd3c6c8a681716a51c8814cfc2b682df" +checksum = "7cab85a7ed0bd5f0e76d93846e0147172bed2e2d3f859bcc33a8d9699cad1a75" dependencies = [ - "anyhow", - "proc-macro-hack", "proc-macro2", "quote", - "syn 1.0.109", ] [[package]] @@ -2689,15 +2657,6 @@ dependencies = [ ] [[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if", -] - -[[package]] name = "interprocess" version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2843,9 +2802,9 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" [[package]] name = "jobserver" -version = "0.1.25" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "068b1ee6743e4d11fb9c6a1e6064b3693a1b600e7f5f5988047d98b3dc9fb90b" +checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" dependencies = [ "libc", ] @@ -2883,7 +2842,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6aae1df220ece3c0ada96b8153459b67eebe9ae9212258bb0134ae60416fdf76" dependencies = [ "libc", - "libloading 0.8.1", + "libloading", "pkg-config", ] @@ -2920,7 +2879,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd85a5776cd9500c2e2059c8c76c3b01528566b7fcbaf8098b55a33fc298849b" dependencies = [ "arrayvec", - "serde", ] [[package]] @@ -2934,8 +2892,19 @@ dependencies = [ ] [[package]] +name = "kurbo" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e5aa9f0f96a938266bdb12928a67169e8d22c6a786fda8ed984b85e6ba93c3c" +dependencies = [ + "arrayvec", + "serde", + "smallvec", +] + +[[package]] name = "lapce" -version = "0.4.0" +version = "0.4.2" dependencies = [ "lapce-app", "lapce-proxy", @@ -2943,7 +2912,7 @@ dependencies = [ [[package]] name = "lapce-app" -version = "0.4.0" +version = "0.4.2" dependencies = [ "Inflector", "alacritty_terminal", @@ -2956,7 +2925,6 @@ dependencies = [ "config", "criterion", "crossbeam-channel", - "directories", "dmg", "flate2", "floem", @@ -2977,10 +2945,12 @@ dependencies = [ "once_cell", "open", "parking_lot", + "percent-encoding", "pulldown-cmark", "rayon", "regex", "reqwest", + "semver", "serde", "serde_json", "sha2", @@ -2989,6 +2959,7 @@ dependencies = [ "strum", "strum_macros", "tar", + "tempfile", "thiserror", "toml", "toml_edit 0.20.2", @@ -3000,49 +2971,44 @@ dependencies = [ "url", "windows-sys 0.36.1", "zip", + "zstd", ] [[package]] name = "lapce-core" -version = "0.4.0" +version = "0.4.2" dependencies = [ + "ahash", "anyhow", "arc-swap", "directories", "floem-editor-core", + "git2", + "hashbrown", "include_dir", "itertools 0.12.1", "lapce-rpc", "lapce-xi-rope", - "libloading 0.8.1", + "libloading", "lsp-types", "once_cell", + "regex", + "remain", "slotmap", "strum", "strum_macros", "thiserror", "tracing 0.2.0", "tree-sitter", - "tree-sitter-bash", - "tree-sitter-c", - "tree-sitter-cpp", - "tree-sitter-javascript", - "tree-sitter-json", - "tree-sitter-md", - "tree-sitter-python", - "tree-sitter-rust", - "tree-sitter-toml", - "tree-sitter-yaml", ] [[package]] name = "lapce-proxy" -version = "0.4.0" +version = "0.4.2" dependencies = [ "alacritty_terminal", "anyhow", "clap", - "cocoa", "crossbeam-channel", "directories", "dyn-clone", @@ -3064,8 +3030,6 @@ dependencies = [ "locale_config", "lsp-types", "notify", - "objc", - "once_cell", "parking_lot", "polling", "psp-types", @@ -3073,11 +3037,8 @@ dependencies = [ "reqwest", "serde", "serde_json", - "strum", - "strum_macros", "tar", "toml", - "toml_edit 0.20.2", "tracing 0.2.0", "tracing-log", "trash", @@ -3092,7 +3053,7 @@ dependencies = [ [[package]] name = "lapce-rpc" -version = "0.4.0" +version = "0.4.2" dependencies = [ "anyhow", "crossbeam-channel", @@ -3140,15 +3101,15 @@ checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" [[package]] name = "libc" -version = "0.2.153" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libgit2-sys" -version = "0.16.2+1.7.2" +version = "0.17.0+1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee4126d8b4ee5c9d9ea891dd875cfdc1e9d0950437179104b183d7d8a74d24e8" +checksum = "10472326a8a6477c3c20a64547b0059e4b0d086869eee31e6d7da728a8eb7224" dependencies = [ "cc", "libc", @@ -3160,16 +3121,6 @@ dependencies = [ [[package]] name = "libloading" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" -dependencies = [ - "cfg-if", - "winapi", -] - -[[package]] -name = "libloading" version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161" @@ -3229,14 +3180,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0b5399f6804fbab912acbd8878ed3532d506b7c951b8f9f164ef90fef39e3f4" [[package]] -name = "locale_config" -version = "0.3.0" +name = "litrs" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d2c35b16f4483f6c26f0e4e9550717a2f6575bcd6f12a53ff0c490a94a6934" +checksum = "b4ce301924b7887e9d637144fdade93f9dfff9b60981d4ac161db09720d39aa5" + +[[package]] +name = "locale_config" +version = "0.3.1-alpha.0" +source = "git+https://github.com/lapce/locale_config.git?branch=lapce#54c9fe6a247c3618c224ec57e6c3a747bc3a96e4" dependencies = [ "lazy_static", - "objc", - "objc-foundation", + "objc2 0.5.2", + "objc2-foundation", "regex", "winapi", ] @@ -3310,15 +3266,6 @@ dependencies = [ [[package]] name = "memmap2" -version = "0.5.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327" -dependencies = [ - "libc", -] - -[[package]] -name = "memmap2" version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "deaba38d7abf1d4cca21cc89e932e542ba2b9258664d2a9ef0e61512039c9375" @@ -3337,15 +3284,6 @@ dependencies = [ [[package]] name = "memoffset" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" -dependencies = [ - "autocfg", -] - -[[package]] -name = "memoffset" version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" @@ -3355,11 +3293,11 @@ dependencies = [ [[package]] name = "metal" -version = "0.27.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c43f73953f8cbe511f021b58f18c3ce1c3d1ae13fe953293e13345bf83217f25" +checksum = "7ecfd3296f8c56b7c1f6fbac3c71cefa9d78ce009850c45000015f206dc7fa21" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "block", "core-graphics-types", "foreign-types 0.5.0", @@ -3413,17 +3351,18 @@ dependencies = [ [[package]] name = "naga" -version = "0.19.2" +version = "22.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50e3524642f53d9af419ab5e8dd29d3ba155708267667c2f3f06c88c9e130843" +checksum = "09eeccb9b50f4f7839b214aa3e08be467159506a986c18e0702170ccf720a453" dependencies = [ + "arrayvec", "bit-set", - "bitflags 2.5.0", + "bitflags 2.6.0", + "cfg_aliases 0.1.1", "codespan-reporting", "hexf-parse", "indexmap", "log", - "num-traits", "rustc-hash", "spirv", "termcolor", @@ -3455,7 +3394,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2076a31b7010b17a38c01907c45b945e8f11495ee4dd588309718901b1f7a5b7" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "jni-sys", "log", "ndk-sys", @@ -3482,23 +3421,11 @@ dependencies = [ [[package]] name = "nix" -version = "0.26.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" -dependencies = [ - "bitflags 1.3.2", - "cfg-if", - "libc", - "memoffset 0.7.1", -] - -[[package]] -name = "nix" version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cfg-if", "libc", "memoffset 0.9.0", @@ -3617,7 +3544,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" dependencies = [ "malloc_buf", - "objc_exception", ] [[package]] @@ -3633,9 +3559,9 @@ dependencies = [ [[package]] name = "objc-sys" -version = "0.3.1" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99e1d07c6eab1ce8b6382b8e3c7246fe117ff3f8b34be065f5ebace6749fe845" +checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310" [[package]] name = "objc2" @@ -3644,7 +3570,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "559c5a40fdd30eb5e344fbceacf7595a81e242529fb4e21cf5f43fb4f11ff98d" dependencies = [ "objc-sys", - "objc2-encode", + "objc2-encode 3.0.0", +] + +[[package]] +name = "objc2" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46a785d4eeff09c14c487497c162e92766fbb3e4059a71840cecc03d9a50b804" +dependencies = [ + "objc-sys", + "objc2-encode 4.0.3", ] [[package]] @@ -3654,12 +3590,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d079845b37af429bfe5dfa76e6d087d788031045b25cfc6fd898486fd9847666" [[package]] -name = "objc_exception" -version = "0.1.2" +name = "objc2-encode" +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 = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4" +checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8" dependencies = [ - "cc", + "bitflags 2.6.0", + "block2 0.5.1", + "libc", + "objc2 0.5.2", ] [[package]] @@ -3697,9 +3642,9 @@ checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" [[package]] name = "open" -version = "5.1.2" +version = "5.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "449f0ff855d85ddbf1edd5b646d65249ead3f5e422aaa86b7d2d0b049b103e32" +checksum = "b5ca541f22b1c46d4bb9801014f234758ab4297e7870b904b6a8415b980a7388" dependencies = [ "is-wsl", "libc", @@ -3712,7 +3657,7 @@ version = "0.10.63" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "15c9d69dd87a29568d4d017cfe8ec518706046a05184e5aea92d0af890b803c8" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cfg-if", "foreign-types 0.3.2", "libc", @@ -3780,31 +3725,6 @@ dependencies = [ ] [[package]] -name = "ouroboros" -version = "0.18.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b7be5a8a3462b752f4be3ff2b2bf2f7f1d00834902e46be2a4d68b87b0573c" -dependencies = [ - "aliasable", - "ouroboros_macro", - "static_assertions", -] - -[[package]] -name = "ouroboros_macro" -version = "0.18.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b645dcde5f119c2c454a92d0dfa271a2a3b205da92e4292a68ead4bdbfde1f33" -dependencies = [ - "heck", - "itertools 0.12.1", - "proc-macro2", - "proc-macro2-diagnostics", - "quote", - "syn 2.0.57", -] - -[[package]] name = "overload" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3827,9 +3747,9 @@ checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" [[package]] name = "parking_lot" -version = "0.12.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ "lock_api", "parking_lot_core", @@ -3861,6 +3781,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" [[package]] +name = "peniko" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c28d7294093837856bb80ad191cc46a2fcec8a30b43b7a3b0285325f0a917a9" +dependencies = [ + "kurbo 0.11.0", + "serde", + "serde_bytes", + "smallvec", +] + +[[package]] name = "percent-encoding" version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3891,7 +3823,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" dependencies = [ "atomic-waker", - "fastrand 2.0.1", + "fastrand", "futures-io", ] @@ -4005,12 +3937,6 @@ dependencies = [ ] [[package]] -name = "proc-macro-hack" -version = "0.5.20+deprecated" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" - -[[package]] name = "proc-macro2" version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4020,19 +3946,6 @@ dependencies = [ ] [[package]] -name = "proc-macro2-diagnostics" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.57", - "version_check", - "yansi", -] - -[[package]] name = "profiling" version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4059,11 +3972,11 @@ dependencies = [ [[package]] name = "pulldown-cmark" -version = "0.10.2" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f0530d13d87d1f549b66a3e8d0c688952abe5994e204ed62615baaf25dc029c" +checksum = "8746739f11d39ce5ad5c2520a9b75285310dbfe78c541ccf832d38615765aec0" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "getopts", "memchr", "pulldown-cmark-escape", @@ -4072,9 +3985,9 @@ dependencies = [ [[package]] name = "pulldown-cmark-escape" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5d8f9aa0e3cbcfaf8bf00300004ee3b72f74770f9cbac93f6928771f613276b" +checksum = "007d8adb5ddab6f8e3f491ac63566a7d5002cc7ed73901f72057943fa71ae1ae" [[package]] name = "quick-xml" @@ -4141,9 +4054,9 @@ checksum = "9c8a99fddc9f0ba0a85884b8d14e3592853e787d581ca1816c91349b10e4eeab" [[package]] name = "rangemap" -version = "1.3.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b9283c6b06096b47afc7109834fdedab891175bb5241ee5d4f7d2546549f263" +checksum = "f60fcc7d6849342eff22c4350c8b9a989ee8ceabc4b481253e8946b9fe83d684" [[package]] name = "raw-window-handle" @@ -4178,6 +4091,16 @@ dependencies = [ ] [[package]] +name = "read-fonts" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c141b9980e1150201b2a3a32879001c8f975fe313ec3df5471a9b5c79a880cd" +dependencies = [ + "bytemuck", + "font-types", +] + +[[package]] name = "rect_packer" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4203,11 +4126,11 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.4.1" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", ] [[package]] @@ -4235,14 +4158,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 1.1.2", + "aho-corasick", "memchr", "regex-automata", - "regex-syntax 0.8.2", + "regex-syntax", ] [[package]] @@ -4251,37 +4174,33 @@ version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" dependencies = [ - "aho-corasick 1.1.2", + "aho-corasick", "memchr", - "regex-syntax 0.8.2", + "regex-syntax", ] [[package]] name = "regex-syntax" -version = "0.6.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244" - -[[package]] -name = "regex-syntax" version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] -name = "remove_dir_all" -version = "0.5.3" +name = "remain" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" +checksum = "46aef80f842736de545ada6ec65b81ee91504efd6853f4b96de7414c42ae7443" dependencies = [ - "winapi", + "proc-macro2", + "quote", + "syn 2.0.57", ] [[package]] name = "renderdoc-sys" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "216080ab382b992234dda86873c18d4c48358f5cfcb70fd693d7f6f2131b628b" +checksum = "19b30a45b0cd0bcca8037f3d0dc3421eaf95327a17cad11964fb8179b4fc4832" [[package]] name = "reqwest" @@ -4375,15 +4294,6 @@ dependencies = [ [[package]] name = "roxmltree" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8f595a457b6b8c6cda66a48503e92ee8d19342f905948f29c383200ec9eb1d8" -dependencies = [ - "xmlparser", -] - -[[package]] -name = "roxmltree" version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3cd14fd5e3b777a7422cca79358c57a8f6e3a703d9ac187448d0daf220c2407f" @@ -4415,7 +4325,7 @@ version = "0.38.32" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "errno", "itoa", "libc", @@ -4456,13 +4366,29 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0ae5692c5beaad6a9e22830deeed7874eae8a4e3ba4076fb48e12c56856222c" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "bytemuck", - "libm", "smallvec", "ttf-parser 0.20.0", - "unicode-bidi-mirroring", - "unicode-ccc", + "unicode-bidi-mirroring 0.1.0", + "unicode-ccc 0.1.2", + "unicode-properties", + "unicode-script", +] + +[[package]] +name = "rustybuzz" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfb9cf8877777222e4a3bc7eb247e398b56baba500c38c1c46842431adc8b55c" +dependencies = [ + "bitflags 2.6.0", + "bytemuck", + "libm", + "smallvec", + "ttf-parser 0.21.1", + "unicode-bidi-mirroring 0.2.0", + "unicode-ccc 0.2.0", "unicode-properties", "unicode-script", ] @@ -4484,12 +4410,11 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.20" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88d6731146462ea25d9244b2ed5fd1d716d25c52e4d54aa4fb0f3c4e9854dbe2" +checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" dependencies = [ - "lazy_static", - "windows-sys 0.36.1", + "windows-sys 0.52.0", ] [[package]] @@ -4512,18 +4437,12 @@ checksum = "1729a30a469de249c6effc17ec8d039b0aa29b3af79b819b7f51cb6ab8046a90" dependencies = [ "ab_glyph", "log", - "memmap2 0.9.0", + "memmap2", "smithay-client-toolkit", "tiny-skia", ] [[package]] -name = "seahash" -version = "4.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" - -[[package]] name = "security-framework" version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4547,25 +4466,40 @@ dependencies = [ ] [[package]] +name = "self_cell" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d369a96f978623eb3dc28807c4852d6cc617fed53da5d3c400feff1ef34a714a" + +[[package]] name = "semver" -version = "1.0.20" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.197" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" dependencies = [ "serde_derive", ] [[package]] +name = "serde_bytes" +version = "0.11.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b8497c313fd43ab992087548117643f6fcd935cbf36f176ffda0aacf9591734" +dependencies = [ + "serde", +] + +[[package]] name = "serde_derive" -version = "1.0.197" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" +checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" dependencies = [ "proc-macro2", "quote", @@ -4574,11 +4508,12 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.107" +version = "1.0.122" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" +checksum = "784b6203951c57ff748476b126ccb5e8e2959a5c19e5c617ab1956be3dbc68da" dependencies = [ "itoa", + "memchr", "ryu", "serde", ] @@ -4706,6 +4641,16 @@ dependencies = [ ] [[package]] +name = "skrifa" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abea4738067b1e628c6ce28b2c216c19e9ea95715cdb332680e821c3bec2ef23" +dependencies = [ + "bytemuck", + "read-fonts", +] + +[[package]] name = "slab" version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4734,6 +4679,9 @@ name = "smallvec" version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" +dependencies = [ + "serde", +] [[package]] name = "smithay-client-toolkit" @@ -4741,13 +4689,13 @@ version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "60e3d9941fa3bacf7c2bf4b065304faa14164151254cd16ce1b1bc8fc381600f" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "calloop", "calloop-wayland-source", "cursor-icon", "libc", "log", - "memmap2 0.9.0", + "memmap2", "rustix", "thiserror", "wayland-backend", @@ -4782,29 +4730,19 @@ dependencies = [ [[package]] name = "socket2" -version = "0.4.7" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" dependencies = [ "libc", - "winapi", -] - -[[package]] -name = "socket2" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" -dependencies = [ - "libc", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "softbuffer" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071916a85d1db274b4ed57af3a14afb66bd836ae7f82ebb6f1fd3455107830d9" +checksum = "61d5d17f23326fe0d9b0af282f73f3af666699420fd5f42629efd9c6e7dc166f" dependencies = [ "as-raw-xcb-connection", "bytemuck", @@ -4812,14 +4750,14 @@ dependencies = [ "cocoa", "core-graphics", "drm", - "fastrand 2.0.1", + "fastrand", "foreign-types 0.5.0", "js-sys", "log", - "memmap2 0.9.0", + "memmap2", "objc", "raw-window-handle 0.6.0", - "redox_syscall 0.4.1", + "redox_syscall 0.5.1", "rustix", "tiny-xlib", "wasm-bindgen", @@ -4846,7 +4784,7 @@ version = "0.3.0+sdk-1.3.268.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eda41003dc44290527a59b13432d4a0379379fa074b70174882adfbdfd917844" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", ] [[package]] @@ -4868,23 +4806,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] -name = "stretto" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63eada6d62b660f5c1d4862c180ae70193de86df12386eee74da694ae2177583" -dependencies = [ - "atomic", - "crossbeam-channel", - "parking_lot", - "rand", - "seahash", - "thiserror", - "tracing 0.1.37", - "wg", - "xxhash-rust", -] - -[[package]] name = "strict-num" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4902,7 +4823,7 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "structdesc" version = "0.1.0" -source = "git+https://github.com/lapce/structdesc#47d8201fb13240166f4d842c718d63c1e24f0236" +source = "git+https://github.com/lapce/structdesc?rev=bb56969f22fdb2c2d6c03f158fd4a2bdc983b659#bb56969f22fdb2c2d6c03f158fd4a2bdc983b659" dependencies = [ "darling", "proc-macro2", @@ -4912,9 +4833,9 @@ dependencies = [ [[package]] name = "strum" -version = "0.26.2" +version = "0.26.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d8cec3501a5194c432b2b7976db6b7d10ec95c253208b45f83f7136aa985e29" +checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" [[package]] name = "strum_macros" @@ -4941,10 +4862,11 @@ dependencies = [ [[package]] name = "swash" -version = "0.1.8" +version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b7c73c813353c347272919aa1af2885068b05e625e5532b43049e4f641ae77f" +checksum = "93cdc334a50fcc2aa3f04761af3b28196280a6aaadb1ef11215c478ae32615ac" dependencies = [ + "skrifa", "yazi", "zeno", ] @@ -4979,15 +4901,11 @@ checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" [[package]] name = "sys-locale" -version = "0.2.4" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8a11bd9c338fdba09f7881ab41551932ad42e405f61d01e8406baea71c07aee" +checksum = "e801cf239ecd6ccd71f03d270d67dd53d13e90aab208bf4b8fe4ad957ea949b0" dependencies = [ - "js-sys", "libc", - "wasm-bindgen", - "web-sys", - "windows-sys 0.45.0", ] [[package]] @@ -5017,7 +4935,7 @@ version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "27ce32341b2c0b70c144bbf35627fdc1ef18c76ced5e5e7b3ee8b5ba6b2ab6a0" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cap-fs-ext", "cap-std", "fd-lock", @@ -5042,9 +4960,9 @@ dependencies = [ [[package]] name = "tar" -version = "0.4.40" +version = "0.4.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb" +checksum = "cb797dad5fb5b76fcf519e702f4a589483b5ef06567f160c392832c1f5e44909" dependencies = [ "filetime", "libc", @@ -5059,16 +4977,14 @@ checksum = "9d0e916b1148c8e263850e1ebcbd046f333e0683c724876bb0da63ea4373dc8a" [[package]] name = "tempfile" -version = "3.3.0" +version = "3.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" dependencies = [ "cfg-if", - "fastrand 1.8.0", - "libc", - "redox_syscall 0.2.16", - "remove_dir_all", - "winapi", + "fastrand", + "rustix", + "windows-sys 0.52.0", ] [[package]] @@ -5082,18 +4998,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.58" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.58" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", @@ -5111,9 +5027,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.34" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ "deranged", "itoa", @@ -5132,9 +5048,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.17" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" dependencies = [ "num-conv", "time-core", @@ -5174,7 +5090,7 @@ checksum = "d4098d49269baa034a8d1eae9bd63e9fa532148d772121dace3bcd6a6c98eb6d" dependencies = [ "as-raw-xcb-connection", "ctor", - "libloading 0.8.1", + "libloading", "tracing 0.1.37", ] @@ -5211,9 +5127,9 @@ checksum = "c7c4ceeeca15c8384bbc3e011dbd8fccb7f068a440b752b7d9b32ceb0ca0e2e8" [[package]] name = "tokio" -version = "1.36.0" +version = "1.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931" +checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a" dependencies = [ "backtrace", "bytes", @@ -5223,16 +5139,16 @@ dependencies = [ "parking_lot", "pin-project-lite", "signal-hook-registry", - "socket2 0.5.5", + "socket2", "tokio-macros", "windows-sys 0.48.0", ] [[package]] name = "tokio-macros" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" +checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" dependencies = [ "proc-macro2", "quote", @@ -5436,122 +5352,15 @@ dependencies = [ [[package]] name = "tree-sitter" -version = "0.20.10" +version = "0.22.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e747b1f9b7b931ed39a548c1fae149101497de3c1fc8d9e18c62c1a66c683d3d" +checksum = "df7cc499ceadd4dcdf7ec6d4cbc34ece92c3fa07821e287aedecd4416c516dca" dependencies = [ "cc", "regex", ] [[package]] -name = "tree-sitter-bash" -version = "0.19.0" -source = "git+https://github.com/tree-sitter/tree-sitter-bash?rev=4488aa41406547e478636a4fcfd24f5bbc3f2f74#4488aa41406547e478636a4fcfd24f5bbc3f2f74" -dependencies = [ - "cc", - "tree-sitter", -] - -[[package]] -name = "tree-sitter-c" -version = "0.20.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bbd5f3d8658c08581f8f2adac6c391c2e9fa00fe9246bf6c5f52213b9cc6b72" -dependencies = [ - "cc", - "tree-sitter", -] - -[[package]] -name = "tree-sitter-cpp" -version = "0.20.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46b04a5ada71059afb9895966a6cc1094acc8d2ea1971006db26573e7dfebb74" -dependencies = [ - "cc", - "tree-sitter", -] - -[[package]] -name = "tree-sitter-javascript" -version = "0.20.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d015c02ea98b62c806f7329ff71c383286dfc3a7a7da0cc484f6e42922f73c2c" -dependencies = [ - "cc", - "tree-sitter", -] - -[[package]] -name = "tree-sitter-json" -version = "0.20.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a9a38a9c679b55cc8d17350381ec08d69fa1a17a53fcf197f344516e485ed4d" -dependencies = [ - "cc", - "tree-sitter", -] - -[[package]] -name = "tree-sitter-md" -version = "0.1.2" -source = "git+https://github.com/MDeiml/tree-sitter-markdown.git?rev=272e080bca0efd19a06a7f4252d746417224959e#272e080bca0efd19a06a7f4252d746417224959e" -dependencies = [ - "cc", - "tree-sitter", -] - -[[package]] -name = "tree-sitter-python" -version = "0.20.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c93b1b1fbd0d399db3445f51fd3058e43d0b4dcff62ddbdb46e66550978aa5" -dependencies = [ - "cc", - "tree-sitter", -] - -[[package]] -name = "tree-sitter-rust" -version = "0.20.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0832309b0b2b6d33760ce5c0e818cb47e1d72b468516bfe4134408926fa7594" -dependencies = [ - "cc", - "tree-sitter", -] - -[[package]] -name = "tree-sitter-toml" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca517f578a98b23d20780247cc2688407fa81effad5b627a5a364ec3339b53e8" -dependencies = [ - "cc", - "tree-sitter", -] - -[[package]] -name = "tree-sitter-yaml" -version = "0.0.1" -source = "git+https://github.com/panekj/tree-sitter-yaml?rev=80c8d76847f03e772c5c524cf29bafb56858a8d1#80c8d76847f03e772c5c524cf29bafb56858a8d1" -dependencies = [ - "cc", - "tree-sitter", -] - -[[package]] -name = "triomphe" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0eee8098afad3fb0c54a9007aab6804558410503ad676d4633f9c2559a00ac0f" -dependencies = [ - "serde", - "stable_deref_trait", -] - -[[package]] name = "try-lock" version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5570,6 +5379,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "17f77d76d837a7830fe1d4f12b7b4ba4192c1888001c7164257e4bc6d21d96b4" [[package]] +name = "ttf-parser" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c591d83f69777866b9126b24c6dd9a18351f177e49d625920d19f989fd31cf8" + +[[package]] name = "typenum" version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5608,12 +5423,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56d12260fb92d52f9008be7e4bca09f584780eb2266dc8fecc6a192bec561694" [[package]] +name = "unicode-bidi-mirroring" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23cb788ffebc92c5948d0e997106233eeb1d8b9512f93f41651f52b6c5f5af86" + +[[package]] name = "unicode-ccc" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cc2520efa644f8268dce4dcd3050eaa7fc044fca03961e9998ac7e2e92b77cf1" [[package]] +name = "unicode-ccc" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1df77b101bcc4ea3d78dafc5ad7e4f58ceffe0b2b16bf446aeb50b6cb4157656" + +[[package]] name = "unicode-ident" version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5648,9 +5475,9 @@ checksum = "7d817255e1bed6dfd4ca47258685d14d2bdcfbc64fdc9e3819bd5848057b8ecc" [[package]] name = "unicode-segmentation" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fdbf052a0783de01e944a6ce7a8cb939e295b1e7be835a1112c3b9a7f047a5a" +checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" [[package]] name = "unicode-vo" @@ -5660,9 +5487,9 @@ checksum = "b1d386ff53b415b7fe27b50bb44679e2cc4660272694b7b6f3326d8480823a94" [[package]] name = "unicode-width" -version = "0.1.11" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" +checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" [[package]] name = "unicode-xid" @@ -5672,9 +5499,9 @@ checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" [[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", @@ -5702,8 +5529,8 @@ dependencies = [ "kurbo 0.9.5", "log", "pico-args", - "roxmltree 0.19.0", - "rustybuzz", + "roxmltree", + "rustybuzz 0.12.1", "simplecss", "siphasher", "strict-num", @@ -5745,7 +5572,7 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "40eb22ae96f050e0c0d6f7ce43feeae26c348fc4dea56928ca81537cfaa6188b" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cursor-icon", "log", "serde", @@ -5819,7 +5646,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6efb2e9d72c6a070d62cf7b698acebab6faca9aacf26412bdecb9fabab79fd09" dependencies = [ "anyhow", - "bitflags 2.5.0", + "bitflags 2.6.0", "cap-rand", "cap-std", "io-extras", @@ -6226,7 +6053,7 @@ checksum = "1022616613f6279243392b00990ac81135f0c46018eba620538392342fc93df9" dependencies = [ "anyhow", "async-trait", - "bitflags 2.5.0", + "bitflags 2.6.0", "bytes", "cap-fs-ext", "cap-net-ext", @@ -6320,13 +6147,13 @@ dependencies = [ [[package]] name = "wayland-backend" -version = "0.3.2" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19152ddd73f45f024ed4534d9ca2594e0ef252c1847695255dae47f34df9fbe4" +checksum = "34e9e6b6d4a2bb4e7e69433e0b35c7923b95d4dc8503a84d25ec917a4bbfdf07" dependencies = [ "cc", "downcast-rs", - "nix 0.26.4", + "rustix", "scoped-tls", "smallvec", "wayland-sys", @@ -6334,12 +6161,12 @@ dependencies = [ [[package]] name = "wayland-client" -version = "0.31.1" +version = "0.31.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ca7d52347346f5473bf2f56705f360e8440873052e575e55890c4fa57843ed3" +checksum = "1e63801c85358a431f986cffa74ba9599ff571fc5774ac113ed3b490c19a1133" dependencies = [ - "bitflags 2.5.0", - "nix 0.26.4", + "bitflags 2.6.0", + "rustix", "wayland-backend", "wayland-scanner", ] @@ -6350,18 +6177,18 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "625c5029dbd43d25e6aa9615e88b829a5cad13b2819c4ae129fdbb7c31ab4c7e" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cursor-icon", "wayland-backend", ] [[package]] name = "wayland-cursor" -version = "0.31.0" +version = "0.31.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44aa20ae986659d6c77d64d808a046996a932aa763913864dc40c359ef7ad5b" +checksum = "a206e8b2b53b1d3fcb9428fec72bc278ce539e2fa81fe2bfc1ab27703d5187b9" dependencies = [ - "nix 0.26.4", + "rustix", "wayland-client", "xcursor", ] @@ -6372,7 +6199,7 @@ version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e253d7107ba913923dc253967f35e8561a3c65f914543e46843c88ddd729e21c" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "wayland-backend", "wayland-client", "wayland-scanner", @@ -6384,7 +6211,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23803551115ff9ea9bce586860c5c5a971e360825a0309264102a9495a5ff479" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "wayland-backend", "wayland-client", "wayland-protocols", @@ -6397,7 +6224,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "wayland-backend", "wayland-client", "wayland-protocols", @@ -6406,9 +6233,9 @@ dependencies = [ [[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", @@ -6417,9 +6244,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", "log", @@ -6455,25 +6282,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" [[package]] -name = "wg" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f390449c16e0679435fc97a6b49d24e67f09dd05fea1de54db1b60902896d273" -dependencies = [ - "atomic-waker", - "parking_lot", - "triomphe", -] - -[[package]] name = "wgpu" -version = "0.19.3" +version = "22.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4b1213b52478a7631d6e387543ed8f642bc02c578ef4e3b49aca2a29a7df0cb" +checksum = "c87e07e87a179614940ad845397e03201847453a37b43a31a3b54eee2e6e32ce" dependencies = [ "arrayvec", - "cfg-if", "cfg_aliases 0.1.1", + "document-features", "js-sys", "log", "naga", @@ -6492,15 +6308,15 @@ dependencies = [ [[package]] name = "wgpu-core" -version = "0.19.3" +version = "22.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9f6b033c2f00ae0bc8ea872c5989777c60bc241aac4e58b24774faa8b391f78" +checksum = "e0f191908a21968991463fcf3b42cb6c9648c0fb7fa301b8fc733bc21a9ed9bd" dependencies = [ "arrayvec", "bit-vec", - "bitflags 2.5.0", + "bitflags 2.6.0", "cfg_aliases 0.1.1", - "codespan-reporting", + "document-features", "indexmap", "log", "naga", @@ -6511,22 +6327,21 @@ dependencies = [ "rustc-hash", "smallvec", "thiserror", - "web-sys", "wgpu-hal", "wgpu-types", ] [[package]] name = "wgpu-hal" -version = "0.19.3" +version = "22.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f972c280505ab52ffe17e94a7413d9d54b58af0114ab226b9fc4999a47082e" +checksum = "f6bbf4b4de8b2a83c0401d9e5ae0080a2792055f25859a02bf9be97952bbed4f" dependencies = [ "android_system_properties", "arrayvec", "ash", "bit-set", - "bitflags 2.5.0", + "bitflags 2.6.0", "block", "cfg_aliases 0.1.1", "core-graphics-types", @@ -6540,7 +6355,7 @@ dependencies = [ "js-sys", "khronos-egl", "libc", - "libloading 0.8.1", + "libloading", "log", "metal", "naga", @@ -6563,11 +6378,11 @@ dependencies = [ [[package]] name = "wgpu-types" -version = "0.19.2" +version = "22.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b671ff9fb03f78b46ff176494ee1ebe7d603393f42664be55b64dc8d53969805" +checksum = "bc9d91f0e2c4b51434dfa6db77846f2793149d8e73f800fa2e41f52b8eac3c5d" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "js-sys", "web-sys", ] @@ -6586,7 +6401,7 @@ checksum = "334709283558d9ebb0206cd1842c4fa619ff467d68c71eff982376d9c999d636" dependencies = [ "anyhow", "async-trait", - "bitflags 2.5.0", + "bitflags 2.6.0", "thiserror", "tracing 0.1.37", "wasmtime", @@ -6961,7 +6776,7 @@ version = "0.36.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "357bb8e2932df531f83b052264b050b81ba0df90ee5a59b2d1d3949f344f81e5" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "windows-sys 0.48.0", ] @@ -7024,7 +6839,7 @@ dependencies = [ "as-raw-xcb-connection", "gethostname", "libc", - "libloading 0.8.1", + "libloading", "once_cell", "rustix", "x11rb-protocol", @@ -7072,7 +6887,7 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6924668544c48c0133152e7eec86d644a056ca3d09275eb8d5cdb9855f9d8699" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "dlib", "log", "once_cell", @@ -7092,30 +6907,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a" [[package]] -name = "xmlparser" -version = "0.13.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d25c75bf9ea12c4040a97f829154768bbbce366287e2dc044af160cd79a13fd" - -[[package]] name = "xmlwriter" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec7a2a501ed189703dba8b08142f057e887dfc4b2cc4db2d343ac6376ba3e0b9" [[package]] -name = "xxhash-rust" -version = "0.8.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9828b178da53440fa9c766a3d2f73f7cf5d0ac1fe3980c1e5018d899fd19e07b" - -[[package]] -name = "yansi" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049" - -[[package]] name = "yazi" version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -7144,7 +6941,7 @@ dependencies = [ "futures-sink", "futures-util", "hex", - "nix 0.27.1", + "nix", "ordered-stream", "rand", "serde", diff --git a/pkgs/applications/editors/lapce/default.nix b/pkgs/applications/editors/lapce/default.nix index ad29e72fad159..68ff13a0212a1 100644 --- a/pkgs/applications/editors/lapce/default.nix +++ b/pkgs/applications/editors/lapce/default.nix @@ -25,7 +25,7 @@ , xorg }: let - rpathLibs = lib.optionals stdenv.isLinux [ + rpathLibs = lib.optionals stdenv.hostPlatform.isLinux [ libGL libxkbcommon xorg.libX11 @@ -39,28 +39,27 @@ let in rustPlatform.buildRustPackage rec { pname = "lapce"; - version = "0.4.0"; + version = "0.4.2"; src = fetchFromGitHub { owner = "lapce"; repo = "lapce"; rev = "refs/tags/v${version}"; - sha256 = "sha256-x/EObvrMZ3bkdHk5SbfQEarXA7jcQ9rEFZINQrHjcl4="; + sha256 = "sha256-vBBYNHgZiW5JfGeUG6YZObf4oK0hHxTbsZNTfnIX95Y="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "floem-0.1.1" = "sha256-/RUsi0LUJ/LjDj8xjoiF+f4MeUjFASL0TDS0eDUEHio="; + "alacritty_terminal-0.24.1-dev" = "sha256-aVB1CNOLjNh6AtvdbomODNrk00Md8yz8QzldzvDo1LI="; + "floem-0.1.1" = "sha256-/4Y38VXx7wFVVEzjqZ2D6+jiXCXPfzK44rDiNOR1lAk="; "human-sort-0.2.2" = "sha256-tebgIJGXOY7pwWRukboKAzXY47l4Cn//0xMKQTaGu8w="; + "locale_config-0.3.1-alpha.0" = "sha256-cCEO+dmU05TKkpH6wVK6tiH94b7k2686xyGxlhkcmAM="; "lsp-types-0.95.1" = "sha256-+tWqDBM5x/gvQOG7V3m2tFBZB7smgnnZHikf9ja2FfE="; "psp-types-0.1.0" = "sha256-/oFt/AXxCqBp21hTSYrokWsbFYTIDCrHMUBuA2Nj5UU="; "regalloc2-0.9.3" = "sha256-tzXFXs47LDoNBL1tSkLCqaiHDP5vZjvh250hz0pbEJs="; - "structdesc-0.1.0" = "sha256-gMTnRudc3Tp9JRa+Cob5Ke23aqajP8lSun5CnT13+eQ="; + "structdesc-0.1.0" = "sha256-KiR0R2YWZ7BucXIIeziu2FPJnbP7WNSQrxQhcNlpx2Q="; "tracing-0.2.0" = "sha256-31jmSvspNstOAh6VaWie+aozmGu4RpY9Gx2kbBVD+CI="; - "tree-sitter-bash-0.19.0" = "sha256-gTsA874qpCI/N5tmBI5eT8KDaM25gXM4VbcCbUU2EeI="; - "tree-sitter-md-0.1.2" = "sha256-gKbjAcY/x9sIxiG7edolAQp2JWrx78mEGeCpayxFOuE="; - "tree-sitter-yaml-0.0.1" = "sha256-bQ/APnFpes4hQLv37lpoADyjXDBY7J4Zg+rLyUtbra4="; "wasi-experimental-http-wasmtime-0.10.0" = "sha256-FuF3Ms1bT9bBasbLK+yQ2xggObm/lFDRyOvH21AZnQI="; }; }; @@ -90,9 +89,9 @@ rustPlatform.buildRustPackage rec { glib gtk3 openssl - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ fontconfig - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libobjc Security CoreServices @@ -101,7 +100,7 @@ rustPlatform.buildRustPackage rec { AppKit ]; - postInstall = if stdenv.isLinux then '' + postInstall = if stdenv.hostPlatform.isLinux then '' install -Dm0644 $src/extra/images/logo.svg $out/share/icons/hicolor/scalable/apps/dev.lapce.lapce.svg install -Dm0644 $src/extra/linux/dev.lapce.lapce.desktop $out/share/applications/lapce.desktop @@ -126,6 +125,6 @@ rustPlatform.buildRustPackage rec { maintainers = with maintainers; [ elliot ]; mainProgram = "lapce"; # Undefined symbols for architecture x86_64: "_NSPasteboardTypeFileURL" - broken = stdenv.isDarwin && stdenv.isx86_64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64; }; } diff --git a/pkgs/applications/editors/leo-editor/default.nix b/pkgs/applications/editors/leo-editor/default.nix index 2f0bfcaef7315..de4cd6e26dfe9 100644 --- a/pkgs/applications/editors/leo-editor/default.nix +++ b/pkgs/applications/editors/leo-editor/default.nix @@ -2,19 +2,19 @@ mkDerivation rec { pname = "leo-editor"; - version = "6.7.8"; + version = "6.8.1"; src = fetchFromGitHub { owner = "leo-editor"; repo = "leo-editor"; rev = version; - sha256 = "sha256-cawcfEz9QpsjfgJzG5oA5TY2EpT8hLDw5QIjwdKPW6Y="; + sha256 = "sha256-YhZSmk2n/Tg0zx1xuy0LtABNiBB3LmXYlhXoK7/b2tQ="; }; dontBuild = true; nativeBuildInputs = [ wrapQtAppsHook makeWrapper python3 ]; - propagatedBuildInputs = with python3.pkgs; [ pyqt5 docutils ]; + propagatedBuildInputs = with python3.pkgs; [ pyqt6 docutils ]; desktopItem = makeDesktopItem { name = "leo-editor"; diff --git a/pkgs/applications/editors/libresprite/default.nix b/pkgs/applications/editors/libresprite/default.nix index 70ce1fe48052c..5d4031b064ecc 100644 --- a/pkgs/applications/editors/libresprite/default.nix +++ b/pkgs/applications/editors/libresprite/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { repo = "LibreSprite"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - sha256 = "sha256-d8GmVHYomDb74iSeEhJEVTHvbiVXggXg7xSqIKCUSzY="; + hash = "sha256-d8GmVHYomDb74iSeEhJEVTHvbiVXggXg7xSqIKCUSzY="; }; # Backport GCC 13 build fix @@ -69,7 +69,7 @@ stdenv.mkDerivation (finalAttrs: { SDL2_image lua # no v8 due to missing libplatform and libbase - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit Cocoa Foundation @@ -80,7 +80,7 @@ stdenv.mkDerivation (finalAttrs: { "-DWITH_WEBP_SUPPORT=ON" ]; - hardeningDisable = lib.optional stdenv.isDarwin "format"; + hardeningDisable = lib.optional stdenv.hostPlatform.isDarwin "format"; # Install mime icons. Note that the mimetype is still "x-aseprite" postInstall = '' @@ -116,6 +116,6 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with maintainers; [ fgaz ]; platforms = platforms.all; # https://github.com/LibreSprite/LibreSprite/issues/308 - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; }) diff --git a/pkgs/applications/editors/lite-xl/default.nix b/pkgs/applications/editors/lite-xl/default.nix index 333968cb89604..ac13fc3bf5665 100644 --- a/pkgs/applications/editors/lite-xl/default.nix +++ b/pkgs/applications/editors/lite-xl/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "lite-xl"; - version = "2.1.4"; + version = "2.1.5"; src = fetchFromGitHub { owner = "lite-xl"; repo = "lite-xl"; rev = "v${version}"; - hash = "sha256-TqrFI5TFb2hnnlHYUjLDUTDK3/Wgg1gOxIP8owLi/yo="; + hash = "sha256-awXcmYAvQUdFUr2vFlnBt8WTLrACREfB7J8HoSyVPTs="; }; nativeBuildInputs = [ meson ninja pkg-config ]; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { lua5_4 pcre2 SDL2 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Foundation ]; diff --git a/pkgs/applications/editors/manuskript/default.nix b/pkgs/applications/editors/manuskript/default.nix index f598c686998d7..8fa589c13b5d4 100644 --- a/pkgs/applications/editors/manuskript/default.nix +++ b/pkgs/applications/editors/manuskript/default.nix @@ -24,7 +24,7 @@ python3Packages.buildPythonApplication rec { patchPhase = '' substituteInPlace manuskript/ui/welcome.py \ --replace sample-projects $out/share/${pname}/sample-projects - ''; + ''; buildPhase = ""; @@ -44,19 +44,19 @@ python3Packages.buildPythonApplication rec { description = "Open-source tool for writers"; homepage = "https://www.theologeek.ch/manuskript"; longDescription = '' - Manuskript is a tool for those writer who like to organize and - plan everything before writing. The snowflake method can help you - grow your idea into a book, by leading you step by step and asking - you questions to go deeper. While writing, keep track of notes - about every characters, plot, event, place in your story. - - Develop complex characters and keep track of all useful infos. - Create intricate plots, linked to your characters, and use them to - outline your story. Organize your ideas about the world your - characters live in. + Manuskript is a tool for those writer who like to organize and + plan everything before writing. The snowflake method can help you + grow your idea into a book, by leading you step by step and asking + you questions to go deeper. While writing, keep track of notes + about every characters, plot, event, place in your story. + + Develop complex characters and keep track of all useful infos. + Create intricate plots, linked to your characters, and use them to + outline your story. Organize your ideas about the world your + characters live in. ''; license = lib.licenses.gpl3; - maintainers = [ ]; + maintainers = with lib.maintainers; [ strawbee ]; platforms = lib.platforms.unix; mainProgram = "manuskript"; }; diff --git a/pkgs/applications/editors/marker/default.nix b/pkgs/applications/editors/marker/default.nix index 7e1d61a3b1725..aea005d7d9065 100644 --- a/pkgs/applications/editors/marker/default.nix +++ b/pkgs/applications/editors/marker/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { repo = "Marker"; rev = version; fetchSubmodules = true; - sha256 = "sha256-HhDhigQ6Aqo8R57Yrf1i69sM0feABB9El5R5OpzOyB0="; + hash = "sha256-HhDhigQ6Aqo8R57Yrf1i69sM0feABB9El5R5OpzOyB0="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/editors/mg/default.nix b/pkgs/applications/editors/mg/default.nix index c54cd01dbf281..121d62219db03 100644 --- a/pkgs/applications/editors/mg/default.nix +++ b/pkgs/applications/editors/mg/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "mg"; - version = "7.3"; + version = "7.3-unstable-2024-06-04"; src = fetchFromGitHub { owner = "ibara"; repo = "mg"; - rev = "mg-${version}"; - sha256 = "sha256-88FrXN7h5uRLY8YMKSzUjBF4n18DEiiiDyoYr+7qXdQ="; + rev = "4d4abcfc793554dbd4effdba8a3cc28ce2654c33"; + hash = "sha256-+sp8Edu5UWv73TCNVZTeH5rl2Q5XarYrlTYHuQsroVs="; }; postPatch = lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' diff --git a/pkgs/applications/editors/micro/default.nix b/pkgs/applications/editors/micro/default.nix deleted file mode 100644 index beaf6791f842d..0000000000000 --- a/pkgs/applications/editors/micro/default.nix +++ /dev/null @@ -1,67 +0,0 @@ -{ lib -, stdenv -, buildGoModule -, fetchFromGitHub -, installShellFiles -, callPackage -, wl-clipboard -, xclip -, makeWrapper -, withXclip ? true -, withWlclip ? true -}: -let - clipboardPkgs = if stdenv.isLinux then - lib.optional withXclip xclip ++ - lib.optional withWlclip wl-clipboard - else [ ]; -in -buildGoModule rec { - pname = "micro"; - version = "2.0.13"; - - src = fetchFromGitHub { - owner = "zyedidia"; - repo = pname; - rev = "v${version}"; - hash = "sha256-fe+7RkUwCveBk14bYzg5uLGOqTVVJsrqixBQhCS79hY="; - }; - - vendorHash = "sha256-ePhObvm3m/nT+7IyT0W6K+y+9UNkfd2kYjle2ffAd9Y="; - - nativeBuildInputs = [ installShellFiles makeWrapper ]; - - subPackages = [ "cmd/micro" ]; - - ldflags = let t = "github.com/zyedidia/micro/v2/internal"; in [ - "-s" - "-w" - "-X ${t}/util.Version=${version}" - "-X ${t}/util.CommitHash=${src.rev}" - ]; - - preBuild = '' - GOOS= GOARCH= go generate ./runtime - ''; - - postInstall = '' - installManPage assets/packaging/micro.1 - install -Dm444 -t $out/share/applications assets/packaging/micro.desktop - install -Dm644 assets/micro-logo-mark.svg $out/share/icons/hicolor/scalable/apps/micro.svg - ''; - - postFixup = '' - wrapProgram "$out/bin/micro" \ - --prefix PATH : "${lib.makeBinPath clipboardPkgs}" - ''; - - passthru.tests.expect = callPackage ./test-with-expect.nix { }; - - meta = with lib; { - homepage = "https://micro-editor.github.io"; - description = "Modern and intuitive terminal-based text editor"; - license = licenses.mit; - maintainers = with maintainers; [ dtzWill ]; - mainProgram = "micro"; - }; -} diff --git a/pkgs/applications/editors/micro/test-with-expect.nix b/pkgs/applications/editors/micro/test-with-expect.nix deleted file mode 100644 index d3e1d60e08748..0000000000000 --- a/pkgs/applications/editors/micro/test-with-expect.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ micro, expect, runCommand, writeScript, runtimeShell }: - -let expect-script = writeScript "expect-script" '' - #!${expect}/bin/expect -f - - spawn micro file.txt - expect "file.txt" - - send "Hello world!" - expect "Hello world!" - - # Send ctrl-q (exit) - send "\021" - - expect "Save changes to file.txt before closing?" - send "y" - - expect eof -''; in -runCommand "micro-test-expect" -{ - nativeBuildInputs = [ micro expect ]; - passthru = { inherit expect-script; }; -} '' - # Micro really wants a writable $HOME for its config directory. - export HOME=$(pwd) - expect -f ${expect-script} - grep "Hello world!" file.txt - touch $out -'' diff --git a/pkgs/applications/editors/mindforger/default.nix b/pkgs/applications/editors/mindforger/default.nix index bd8a4b0c648e6..db4d65de7959e 100644 --- a/pkgs/applications/editors/mindforger/default.nix +++ b/pkgs/applications/editors/mindforger/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { "CONFIG+=mfwebengine" ]; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir "$out"/Applications mv app/mindforger.app "$out"/Applications/ ''; diff --git a/pkgs/applications/editors/molsketch/default.nix b/pkgs/applications/editors/molsketch/default.nix index abbedff17c16f..dd3ee9bcdbb1c 100644 --- a/pkgs/applications/editors/molsketch/default.nix +++ b/pkgs/applications/editors/molsketch/default.nix @@ -33,9 +33,9 @@ stdenv.mkDerivation rec { --replace "CXX_STANDARD 14" "CXX_STANDARD 17" ''; - preConfigure = '' - cmakeFlags="$cmakeFlags -DMSK_PREFIX=$out" - ''; + cmakeFlags = [ + "-DMSK_PREFIX=${placeholder "out"}" + ]; postFixup = '' ln -s $out/lib/molsketch/* $out/lib/. diff --git a/pkgs/applications/editors/music/tuxguitar/default.nix b/pkgs/applications/editors/music/tuxguitar/default.nix index 47614b260b825..a602de8a37b71 100644 --- a/pkgs/applications/editors/music/tuxguitar/default.nix +++ b/pkgs/applications/editors/music/tuxguitar/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, swt, jre, makeWrapper, alsa-lib, jack2, fluidsynth, libpulseaudio }: +{ lib, stdenv, fetchurl, swt, jre, makeWrapper, alsa-lib, jack2, fluidsynth, libpulseaudio, nixosTests }: let metadata = assert stdenv.hostPlatform.system == "i686-linux" || stdenv.hostPlatform.system == "x86_64-linux"; if stdenv.hostPlatform.system == "i686-linux" then @@ -31,6 +31,8 @@ in stdenv.mkDerivation rec { --prefix CLASSPATH : "${swt}/jars/swt.jar:$out/lib/tuxguitar.jar:$out/lib/itext.jar" ''; + passthru.tests = { inherit (nixosTests) tuxguitar; }; + meta = with lib; { description = "Multitrack guitar tablature editor"; longDescription = '' diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix index 210b90e6990dd..432d297aea5e8 100644 --- a/pkgs/applications/editors/nano/default.nix +++ b/pkgs/applications/editors/nano/default.nix @@ -10,16 +10,16 @@ let owner = "seitz"; repo = "nanonix"; rev = "bf8d898efaa10dce3f7972ff765b58c353b4b4ab"; - sha256 = "0773s5iz8aw9npgyasb0r2ybp6gvy2s9sq51az8w7h52bzn5blnn"; + hash = "sha256-1tJV7F+iwMPRV6FgnbTw+5m7vMhgaeXftYkr9GPR4xw="; }; in stdenv.mkDerivation rec { pname = "nano"; - version = "8.0"; + version = "8.2"; src = fetchurl { url = "mirror://gnu/nano/${pname}-${version}.tar.xz"; - sha256 = "wX9D/A43M2sz7lCiCccB1b64CK3C2fCJyoMbQFOcmsQ="; + hash = "sha256-1a0H3YYvrK4DBRxUxlNeVMftdAcxh4P8rRrS1wdv/+s="; }; nativeBuildInputs = [ texinfo ] ++ lib.optional enableNls gettext; diff --git a/pkgs/applications/editors/nano/test-with-expect.nix b/pkgs/applications/editors/nano/test-with-expect.nix index bd48eba4324bd..60cd302045429 100644 --- a/pkgs/applications/editors/nano/test-with-expect.nix +++ b/pkgs/applications/editors/nano/test-with-expect.nix @@ -1,4 +1,4 @@ -{ nano, expect, runCommand, writeScriptBin, runtimeShell }: +{ nano, expect, runCommand, writeScriptBin }: let expect-script = writeScriptBin "expect-script" '' #!${expect}/bin/expect -f diff --git a/pkgs/applications/editors/nedit/default.nix b/pkgs/applications/editors/nedit/default.nix index 374c5ee28c84a..d329220409c3e 100644 --- a/pkgs/applications/editors/nedit/default.nix +++ b/pkgs/applications/editors/nedit/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ motif libXpm libXt ]; # the linux config works fine on darwin too! - buildFlags = lib.optional (stdenv.isLinux || stdenv.isDarwin) "linux"; + buildFlags = lib.optional (stdenv.hostPlatform.isLinux || stdenv.hostPlatform.isDarwin) "linux"; env.NIX_CFLAGS_COMPILE = "-DBUILD_UNTESTED_NEDIT -L${motif}/lib"; diff --git a/pkgs/applications/editors/neovim/build-neovim-plugin.nix b/pkgs/applications/editors/neovim/build-neovim-plugin.nix index 9d9778c1fe3b5..6f9bda5b108bd 100644 --- a/pkgs/applications/editors/neovim/build-neovim-plugin.nix +++ b/pkgs/applications/editors/neovim/build-neovim-plugin.nix @@ -11,13 +11,15 @@ in # function to create vim plugin from lua packages that are already packaged in # luaPackages { - # the lua attribute name that matches this vim plugin. Both should be equal - # in the majority of cases but we make it possible to have different attribute names - luaAttr ? (normalizeName attrs.pname) + # the lua derivation to convert into a neovim plugin + luaAttr ? (lua.pkgs.${normalizeName attrs.pname}) , ... }@attrs: let - originalLuaDrv = lua.pkgs.${luaAttr}; + originalLuaDrv = if (lib.typeOf luaAttr == "string") then + lib.warn "luaAttr as string is deprecated since September 2024. Pass a lua derivation directly ( e.g., `buildNeovimPlugin { luaAttr = lua.pkgs.plenary-nvim; }`)" lua.pkgs.${normalizeName luaAttr} + else luaAttr; + luaDrv = originalLuaDrv.overrideAttrs (oa: { version = attrs.version or oa.version; diff --git a/pkgs/applications/editors/neovim/gnvim/Cargo.lock b/pkgs/applications/editors/neovim/gnvim/Cargo.lock deleted file mode 100644 index 8b1a0a24364c8..0000000000000 --- a/pkgs/applications/editors/neovim/gnvim/Cargo.lock +++ /dev/null @@ -1,1264 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "ahash" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" -dependencies = [ - "getrandom", - "once_cell", - "version_check", -] - -[[package]] -name = "anyhow" -version = "1.0.70" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4" - -[[package]] -name = "async-trait" -version = "0.1.68" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.10", -] - -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi 0.1.19", - "libc", - "winapi", -] - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "byteorder" -version = "1.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" - -[[package]] -name = "bytes" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" - -[[package]] -name = "cairo-rs" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8af54f5d48af1226928adc1f57edd22f5df1349e7da1fc96ae15cf43db0e871" -dependencies = [ - "bitflags", - "cairo-sys-rs", - "glib", - "libc", - "once_cell", - "thiserror", -] - -[[package]] -name = "cairo-sys-rs" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f55382a01d30e5e53f185eee269124f5e21ab526595b872751278dfbb463594e" -dependencies = [ - "glib-sys", - "libc", - "system-deps", -] - -[[package]] -name = "cfg-expr" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a35b255461940a32985c627ce82900867c61db1659764d3675ea81963f72a4c6" -dependencies = [ - "smallvec", -] - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "clap" -version = "3.2.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5" -dependencies = [ - "atty", - "bitflags", - "clap_derive", - "clap_lex", - "indexmap", - "once_cell", - "strsim", - "termcolor", - "textwrap", -] - -[[package]] -name = "clap_derive" -version = "3.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea0c8bce528c4be4da13ea6fead8965e95b6073585a2f05204bd8f4119f82a65" -dependencies = [ - "heck", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "clap_lex" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" -dependencies = [ - "os_str_bytes", -] - -[[package]] -name = "field-offset" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3cf3a800ff6e860c863ca6d4b16fd999db8b752819c1606884047b73e468535" -dependencies = [ - "memoffset", - "rustc_version", -] - -[[package]] -name = "futures" -version = "0.3.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "531ac96c6ff5fd7c62263c5e3c67a603af4fcaee2e1a0ae5565ba3a11e69e549" -dependencies = [ - "futures-channel", - "futures-core", - "futures-executor", - "futures-io", - "futures-sink", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-channel" -version = "0.3.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "164713a5a0dcc3e7b4b1ed7d3b433cabc18025386f9339346e8daf15963cf7ac" -dependencies = [ - "futures-core", - "futures-sink", -] - -[[package]] -name = "futures-core" -version = "0.3.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86d7a0c1aa76363dac491de0ee99faf6941128376f1cf96f07db7603b7de69dd" - -[[package]] -name = "futures-executor" -version = "0.3.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1997dd9df74cdac935c76252744c1ed5794fac083242ea4fe77ef3ed60ba0f83" -dependencies = [ - "futures-core", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-io" -version = "0.3.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89d422fa3cbe3b40dca574ab087abb5bc98258ea57eea3fd6f1fa7162c778b91" - -[[package]] -name = "futures-macro" -version = "0.3.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3eb14ed937631bd8b8b8977f2c198443447a8355b6e3ca599f38c975e5a963b6" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "futures-sink" -version = "0.3.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec93083a4aecafb2a80a885c9de1f0ccae9dbd32c2bb54b0c3a65690e0b8d2f2" - -[[package]] -name = "futures-task" -version = "0.3.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd65540d33b37b16542a0438c12e6aeead10d4ac5d05bd3f805b8f35ab592879" - -[[package]] -name = "futures-util" -version = "0.3.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ef6b17e481503ec85211fed8f39d1970f128935ca1f814cd32ac4a6842e84ab" -dependencies = [ - "futures-channel", - "futures-core", - "futures-io", - "futures-macro", - "futures-sink", - "futures-task", - "memchr", - "pin-project-lite", - "pin-utils", - "slab", -] - -[[package]] -name = "gdk-pixbuf" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b023fbe0c6b407bd3d9805d107d9800da3829dc5a676653210f1d5f16d7f59bf" -dependencies = [ - "bitflags", - "gdk-pixbuf-sys", - "gio", - "glib", - "libc", - "once_cell", -] - -[[package]] -name = "gdk-pixbuf-sys" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b41bd2b44ed49d99277d3925652a163038bd5ed943ec9809338ffb2f4391e3b" -dependencies = [ - "gio-sys", - "glib-sys", - "gobject-sys", - "libc", - "system-deps", -] - -[[package]] -name = "gdk4" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3abf96408a26e3eddf881a7f893a1e111767137136e347745e8ea6ed12731ff" -dependencies = [ - "bitflags", - "cairo-rs", - "gdk-pixbuf", - "gdk4-sys", - "gio", - "glib", - "libc", - "pango", -] - -[[package]] -name = "gdk4-sys" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bc92aa1608c089c49393d014c38ac0390d01e4841e1fedaa75dbcef77aaed64" -dependencies = [ - "cairo-sys-rs", - "gdk-pixbuf-sys", - "gio-sys", - "glib-sys", - "gobject-sys", - "libc", - "pango-sys", - "pkg-config", - "system-deps", -] - -[[package]] -name = "getrandom" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" -dependencies = [ - "cfg-if", - "libc", - "wasi", -] - -[[package]] -name = "gio" -version = "0.17.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2261a3b4e922ec676d1c27ac466218c38cf5dcb49a759129e54bb5046e442125" -dependencies = [ - "bitflags", - "futures-channel", - "futures-core", - "futures-io", - "futures-util", - "gio-sys", - "glib", - "libc", - "once_cell", - "pin-project-lite", - "smallvec", - "thiserror", -] - -[[package]] -name = "gio-compat" -version = "0.1.0" -dependencies = [ - "futures", - "gio", -] - -[[package]] -name = "gio-sys" -version = "0.17.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b1d43b0d7968b48455244ecafe41192871257f5740aa6b095eb19db78e362a5" -dependencies = [ - "glib-sys", - "gobject-sys", - "libc", - "system-deps", - "winapi", -] - -[[package]] -name = "glib" -version = "0.17.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfb53061756195d76969292c2d2e329e01259276524a9bae6c9b73af62854773" -dependencies = [ - "bitflags", - "futures-channel", - "futures-core", - "futures-executor", - "futures-task", - "futures-util", - "gio-sys", - "glib-macros", - "glib-sys", - "gobject-sys", - "libc", - "log", - "memchr", - "once_cell", - "smallvec", - "thiserror", -] - -[[package]] -name = "glib-build-tools" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f8480c9ba9cc06aa8d5baf446037f8dc237bee127e9b62080c4db7e293d8ea0" - -[[package]] -name = "glib-macros" -version = "0.17.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32e73a9790e243f6d55d8e302426419f6084a1de7a84cd07f7268300408a19de" -dependencies = [ - "anyhow", - "heck", - "proc-macro-crate", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "glib-sys" -version = "0.17.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f00ad0a1bf548e61adfff15d83430941d9e1bb620e334f779edd1c745680a5" -dependencies = [ - "libc", - "system-deps", -] - -[[package]] -name = "gnvim" -version = "0.3.1" -dependencies = [ - "atty", - "cfg-if", - "clap", - "futures", - "gio-compat", - "glib", - "glib-build-tools", - "gtk4", - "libc", - "nvim-rs", - "once_cell", - "pango", - "rmpv", -] - -[[package]] -name = "gobject-sys" -version = "0.17.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15e75b0000a64632b2d8ca3cf856af9308e3a970844f6e9659bd197f026793d0" -dependencies = [ - "glib-sys", - "libc", - "system-deps", -] - -[[package]] -name = "graphene-rs" -version = "0.17.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21cf11565bb0e4dfc2f99d4775b6c329f0d40a2cff9c0066214d31a0e1b46256" -dependencies = [ - "glib", - "graphene-sys", - "libc", -] - -[[package]] -name = "graphene-sys" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf80a4849a8d9565410a8fec6fc3678e9c617f4ac7be182ca55ab75016e07af9" -dependencies = [ - "glib-sys", - "libc", - "pkg-config", - "system-deps", -] - -[[package]] -name = "gsk4" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f01ef44fa7cac15e2da9978529383e6bee03e570ba5bf7036b4c10a15cc3a3c" -dependencies = [ - "bitflags", - "cairo-rs", - "gdk4", - "glib", - "graphene-rs", - "gsk4-sys", - "libc", - "pango", -] - -[[package]] -name = "gsk4-sys" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c07a84fb4dcf1323d29435aa85e2f5f58bef564342bef06775ec7bd0da1f01b0" -dependencies = [ - "cairo-sys-rs", - "gdk4-sys", - "glib-sys", - "gobject-sys", - "graphene-sys", - "libc", - "pango-sys", - "system-deps", -] - -[[package]] -name = "gtk4" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e30e124b5a605f6f5513db13958bfcd51d746607b20bc7bb718b33e303274ed" -dependencies = [ - "bitflags", - "cairo-rs", - "field-offset", - "futures-channel", - "gdk-pixbuf", - "gdk4", - "gio", - "glib", - "graphene-rs", - "gsk4", - "gtk4-macros", - "gtk4-sys", - "libc", - "once_cell", - "pango", -] - -[[package]] -name = "gtk4-macros" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f041a797fb098bfb06e432c61738133604bfa3af57f13f1da3b9d46271422ef0" -dependencies = [ - "anyhow", - "proc-macro-crate", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "gtk4-sys" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f8283f707b07e019e76c7f2934bdd4180c277e08aa93f4c0d8dd07b7a34e22f" -dependencies = [ - "cairo-sys-rs", - "gdk-pixbuf-sys", - "gdk4-sys", - "gio-sys", - "glib-sys", - "gobject-sys", - "graphene-sys", - "gsk4-sys", - "libc", - "pango-sys", - "system-deps", -] - -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" -dependencies = [ - "ahash", -] - -[[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.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - -[[package]] -name = "hermit-abi" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" -dependencies = [ - "libc", -] - -[[package]] -name = "indexmap" -version = "1.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" -dependencies = [ - "autocfg", - "hashbrown", -] - -[[package]] -name = "libc" -version = "0.2.140" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c" - -[[package]] -name = "lock_api" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" -dependencies = [ - "autocfg", - "scopeguard", -] - -[[package]] -name = "log" -version = "0.4.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "memchr" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" - -[[package]] -name = "memoffset" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" -dependencies = [ - "autocfg", -] - -[[package]] -name = "mio" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9" -dependencies = [ - "libc", - "log", - "wasi", - "windows-sys", -] - -[[package]] -name = "num-traits" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" -dependencies = [ - "autocfg", -] - -[[package]] -name = "num_cpus" -version = "1.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" -dependencies = [ - "hermit-abi 0.2.6", - "libc", -] - -[[package]] -name = "nvim-rs" -version = "0.1.0" -dependencies = [ - "async-trait", - "futures", - "proc-macro2", - "quote", - "rmp-serde", - "rmpv", - "serde", - "syn 1.0.109", - "tokio", - "tokio-util", -] - -[[package]] -name = "once_cell" -version = "1.17.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" - -[[package]] -name = "os_str_bytes" -version = "6.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ceedf44fb00f2d1984b0bc98102627ce622e083e49a5bacdb3e514fa4238e267" - -[[package]] -name = "pango" -version = "0.17.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52c280b82a881e4208afb3359a8e7fde27a1b272280981f1f34610bed5770d37" -dependencies = [ - "bitflags", - "gio", - "glib", - "libc", - "once_cell", - "pango-sys", -] - -[[package]] -name = "pango-sys" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4293d0f0b5525eb5c24734d30b0ed02cd02aa734f216883f376b54de49625de8" -dependencies = [ - "glib-sys", - "gobject-sys", - "libc", - "system-deps", -] - -[[package]] -name = "parking_lot" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" -dependencies = [ - "lock_api", - "parking_lot_core", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall", - "smallvec", - "windows-sys", -] - -[[package]] -name = "paste" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79" - -[[package]] -name = "pin-project-lite" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" - -[[package]] -name = "pin-utils" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - -[[package]] -name = "pkg-config" -version = "0.3.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" - -[[package]] -name = "proc-macro-crate" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" -dependencies = [ - "once_cell", - "toml_edit", -] - -[[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.53" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba466839c78239c09faf015484e5cc04860f88242cff4d03eb038f04b4699b73" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "quote" -version = "1.0.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "redox_syscall" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "bitflags", -] - -[[package]] -name = "rmp" -version = "0.8.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44519172358fd6d58656c86ab8e7fbc9e1490c3e8f14d35ed78ca0dd07403c9f" -dependencies = [ - "byteorder", - "num-traits", - "paste", -] - -[[package]] -name = "rmp-serde" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5b13be192e0220b8afb7222aa5813cb62cc269ebb5cac346ca6487681d2913e" -dependencies = [ - "byteorder", - "rmp", - "serde", -] - -[[package]] -name = "rmpv" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de8813b3a2f95c5138fe5925bfb8784175d88d6bff059ba8ce090aa891319754" -dependencies = [ - "num-traits", - "rmp", - "serde", - "serde_bytes", -] - -[[package]] -name = "rustc_version" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" -dependencies = [ - "semver", -] - -[[package]] -name = "scopeguard" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" - -[[package]] -name = "semver" -version = "1.0.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" - -[[package]] -name = "serde" -version = "1.0.158" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "771d4d9c4163ee138805e12c710dd365e4f44be8be0503cb1bb9eb989425d9c9" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_bytes" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "416bda436f9aab92e02c8e10d49a15ddd339cea90b6e340fe51ed97abb548294" -dependencies = [ - "serde", -] - -[[package]] -name = "serde_derive" -version = "1.0.158" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e801c1712f48475582b7696ac71e0ca34ebb30e09338425384269d9717c62cad" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.10", -] - -[[package]] -name = "serde_spanned" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0efd8caf556a6cebd3b285caf480045fcc1ac04f6bd786b09a6f11af30c4fcf4" -dependencies = [ - "serde", -] - -[[package]] -name = "signal-hook-registry" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" -dependencies = [ - "libc", -] - -[[package]] -name = "slab" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" -dependencies = [ - "autocfg", -] - -[[package]] -name = "smallvec" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" - -[[package]] -name = "socket2" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - -[[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.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aad1363ed6d37b84299588d62d3a7d95b5a5c2d9aad5c85609fda12afaa1f40" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "system-deps" -version = "6.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "555fc8147af6256f3931a36bb83ad0023240ce9cf2b319dec8236fd1f220b05f" -dependencies = [ - "cfg-expr", - "heck", - "pkg-config", - "toml", - "version-compare", -] - -[[package]] -name = "termcolor" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "textwrap" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" - -[[package]] -name = "thiserror" -version = "1.0.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.10", -] - -[[package]] -name = "tokio" -version = "1.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03201d01c3c27a29c8a5cee5b55a93ddae1ccf6f08f65365c2c918f8c1b76f64" -dependencies = [ - "autocfg", - "bytes", - "libc", - "memchr", - "mio", - "num_cpus", - "parking_lot", - "pin-project-lite", - "signal-hook-registry", - "socket2", - "tokio-macros", - "windows-sys", -] - -[[package]] -name = "tokio-macros" -version = "1.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "tokio-util" -version = "0.7.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5427d89453009325de0d8f342c9490009f76e999cb7672d77e46267448f7e6b2" -dependencies = [ - "bytes", - "futures-core", - "futures-io", - "futures-sink", - "futures-util", - "hashbrown", - "pin-project-lite", - "slab", - "tokio", - "tracing", -] - -[[package]] -name = "toml" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b403acf6f2bb0859c93c7f0d967cb4a75a7ac552100f9322faf64dc047669b21" -dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit", -] - -[[package]] -name = "toml_datetime" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622" -dependencies = [ - "serde", -] - -[[package]] -name = "toml_edit" -version = "0.19.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13" -dependencies = [ - "indexmap", - "serde", - "serde_spanned", - "toml_datetime", - "winnow", -] - -[[package]] -name = "tracing" -version = "0.1.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" -dependencies = [ - "cfg-if", - "pin-project-lite", - "tracing-core", -] - -[[package]] -name = "tracing-core" -version = "0.1.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" -dependencies = [ - "once_cell", -] - -[[package]] -name = "unicode-ident" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" - -[[package]] -name = "version-compare" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "579a42fc0b8e0c63b76519a339be31bed574929511fa53c1a3acae26eb258f29" - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[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.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" -dependencies = [ - "winapi", -] - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "windows-sys" -version = "0.45.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" -dependencies = [ - "windows-targets", -] - -[[package]] -name = "windows-targets" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" -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.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" - -[[package]] -name = "windows_i686_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" - -[[package]] -name = "windows_i686_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" - -[[package]] -name = "winnow" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae8970b36c66498d8ff1d66685dc86b91b29db0c7739899012f63a63814b4b28" -dependencies = [ - "memchr", -] diff --git a/pkgs/applications/editors/neovim/gnvim/default.nix b/pkgs/applications/editors/neovim/gnvim/default.nix index fc39298321e92..e39a43a85863d 100644 --- a/pkgs/applications/editors/neovim/gnvim/default.nix +++ b/pkgs/applications/editors/neovim/gnvim/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { hash = "sha256-VyyHlyMW/9zYECobQwngFARQYqcoXmopyCHUwHolXfo="; }; - cargoLock.lockFile = ./Cargo.lock; + cargoHash = "sha256-uhObLKoQE+r0/ocWA26MpJsSt9RAzKG1XmZsXat+ohg="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/applications/editors/neovim/gnvim/wrapper.nix b/pkgs/applications/editors/neovim/gnvim/wrapper.nix index 1cf02746f9ae8..7869885d1b749 100644 --- a/pkgs/applications/editors/neovim/gnvim/wrapper.nix +++ b/pkgs/applications/editors/neovim/gnvim/wrapper.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { makeWrapper '${gnvim-unwrapped}/bin/gnvim' "$out/bin/gnvim" \ --prefix PATH : "${neovim}/bin" \ --set GNVIM_RUNTIME_PATH "${gnvim-unwrapped}/share/gnvim/runtime" - '' + lib.optionalString (!stdenv.isDarwin) '' + '' + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' mkdir -p "$out/share" ln -s '${gnvim-unwrapped}/share/icons' "$out/share/icons" diff --git a/pkgs/applications/editors/neovim/neovim-gtk.nix b/pkgs/applications/editors/neovim/neovim-gtk.nix deleted file mode 100644 index eebb980f85cb5..0000000000000 --- a/pkgs/applications/editors/neovim/neovim-gtk.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, wrapGAppsHook4 -, pkg-config -, gdk-pixbuf -, gtk4 -, pango -, vte-gtk4 -}: - -rustPlatform.buildRustPackage rec { - pname = "neovim-gtk"; - version = "1.0.4"; - - src = fetchFromGitHub { - owner = "Lyude"; - repo = pname; - rev = "v${version}"; - hash = "sha256-inva7pYwOw3bXvFeKZ4aKSQ65iCat5HxM+NME8jN4/I="; - }; - - cargoHash = "sha256-9eZwCOP4xQtFOieqVRBAdXZrXmzdnae6PexGJ/eCyYc="; - - nativeBuildInputs = [ wrapGAppsHook4 pkg-config ]; - - buildInputs = [ gdk-pixbuf gtk4 pango vte-gtk4 ]; - - postInstall = '' - make PREFIX=$out install-resources - ''; - - meta = with lib; { - description = "Gtk ui for neovim"; - homepage = "https://github.com/Lyude/neovim-gtk"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ aleksana ]; - mainProgram = "nvim-gtk"; - }; -} diff --git a/pkgs/applications/editors/neovim/neovim-remote.nix b/pkgs/applications/editors/neovim/neovim-remote.nix deleted file mode 100644 index f85d379faa85c..0000000000000 --- a/pkgs/applications/editors/neovim/neovim-remote.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ lib -, fetchFromGitHub -, python3 -, neovim -, fetchpatch -}: - -with python3.pkgs; buildPythonApplication rec { - pname = "neovim-remote"; - version = "2.5.1"; - - src = fetchFromGitHub { - owner = "mhinz"; - repo = "neovim-remote"; - rev = "v${version}"; - sha256 = "0lbz4w8hgxsw4k1pxafrl3rhydrvi5jc6vnsmkvnhh6l6rxlmvmq"; - }; - - patches = [ - # Fix a compatibility issue with neovim 0.8.0 - (fetchpatch { - url = "https://github.com/mhinz/neovim-remote/commit/56d2a4097f4b639a16902390d9bdd8d1350f948c.patch"; - hash = "sha256-/PjE+9yfHtOUEp3xBaobzRM8Eo2wqOhnF1Es7SIdxvM="; - }) - ]; - - propagatedBuildInputs = [ - pynvim - psutil - setuptools - ]; - - nativeCheckInputs = [ - neovim - pytestCheckHook - ]; - - doCheck = !stdenv.isDarwin; - - preCheck = '' - export HOME="$(mktemp -d)" - ''; - - meta = with lib; { - description = "Tool that helps controlling nvim processes from a terminal"; - homepage = "https://github.com/mhinz/neovim-remote/"; - license = licenses.mit; - maintainers = with maintainers; [ edanaher ]; - platforms = platforms.unix; - mainProgram = "nvr"; - }; -} diff --git a/pkgs/applications/editors/neovim/tests/default.nix b/pkgs/applications/editors/neovim/tests/default.nix index b07f517ea474a..14d682e14e431 100644 --- a/pkgs/applications/editors/neovim/tests/default.nix +++ b/pkgs/applications/editors/neovim/tests/default.nix @@ -1,6 +1,15 @@ -# run tests by building `neovim.tests` +/* +run tests with `nix-build -A neovim.tests` + +The attrset exposes both the wrapped neovim and the associated test for easier debugging + +Here are some common neovim flags used in the tests: +-e runs neovim in `:h Ex-mode` which returns an exit code != 0 when hitting an error +-i NONE gets rid of shada warnings + +*/ { vimUtils, writeText, neovim, vimPlugins -, lib, neovimUtils, wrapNeovimUnstable +, neovimUtils, wrapNeovimUnstable , neovim-unwrapped , fetchFromGitLab , runCommandLocal @@ -43,6 +52,14 @@ let ''; }; + nvim-with-luasnip = wrapNeovim2 "-with-luasnip" (makeNeovimConfig { + plugins = [ { + plugin = vimPlugins.luasnip; + + } + ]; + }); + nvimAutoDisableWrap = makeNeovimConfig { }; wrapNeovim2 = suffix: config: @@ -57,15 +74,6 @@ let sha256 = "1ykcvyx82nhdq167kbnpgwkgjib8ii7c92y3427v986n2s5lsskc"; }; - # this plugin checks that it's ftplugin/vim.tex is loaded before $VIMRUNTIME/ftplugin/vim.tex - # $VIMRUNTIME/ftplugin/vim.tex sources $VIMRUNTIME/ftplugin/initex.vim which sets b:did_ftplugin - # we save b:did_ftplugin's value in a `plugin_was_loaded_too_late` file - texFtplugin = (pkgs.runCommandLocal "tex-ftplugin" {} '' - mkdir -p $out/ftplugin - echo 'call system("echo ". exists("b:did_ftplugin") . " > plugin_was_loaded_too_late")' >> $out/ftplugin/tex.vim - echo ':q!' >> $out/ftplugin/tex.vim - '') // { pname = "test-ftplugin"; }; - # neovim-drv must be a wrapped neovim runTest = neovim-drv: buildCommand: runCommandLocal "test-${neovim-drv.name}" ({ @@ -73,18 +81,21 @@ let meta.platforms = neovim-drv.meta.platforms; }) ('' source ${nmt}/bash-lib/assertions.sh - vimrc="${writeText "init.vim" neovim-drv.initRc}" - luarc="${writeText "init.lua" neovim-drv.luaRcContent}" + vimrc="${writeText "test-${neovim-drv.name}-init.vim" neovim-drv.initRc}" + luarc="${writeText "test-${neovim-drv.name}-init.lua" neovim-drv.luaRcContent}" luarcGeneric="$out/patched.lua" vimrcGeneric="$out/patched.vim" mkdir $out + export HOME=$TMPDIR ${pkgs.perl}/bin/perl -pe "s|\Q$NIX_STORE\E/[a-z0-9]{32}-|$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-|g" < "$vimrc" > "$vimrcGeneric" ${pkgs.perl}/bin/perl -pe "s|\Q$NIX_STORE\E/[a-z0-9]{32}-|$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-|g" < "$luarc" > "$luarcGeneric" '' + buildCommand); in - pkgs.recurseIntoAttrs ( -rec { + pkgs.recurseIntoAttrs (rec { + + inherit nmt; + vim_empty_config = vimUtils.vimrcFile { beforePlugins = ""; customRC = ""; }; ### neovim tests @@ -130,11 +141,21 @@ rec { }; run_nvim_with_plug = runTest nvim_with_plug '' - export HOME=$TMPDIR - ${nvim_with_plug}/bin/nvim -i NONE -c 'color base16-tomorrow-night' +quit! -e + ${nvim_with_plug}/bin/nvim -V3log.txt -i NONE -c 'color base16-tomorrow-night' +quit! -e ''; - nvim_with_ftplugin = neovim.override { + nvim_with_ftplugin = let + # this plugin checks that it's ftplugin/vim.tex is loaded before $VIMRUNTIME/ftplugin/vim.tex + # $VIMRUNTIME/ftplugin/vim.tex sources $VIMRUNTIME/ftplugin/initex.vim which sets b:did_ftplugin + # we save b:did_ftplugin's value in a `plugin_was_loaded_too_late` file + texFtplugin = (pkgs.runCommandLocal "tex-ftplugin" {} '' + mkdir -p $out/ftplugin + echo 'call system("echo ". exists("b:did_ftplugin") . " > plugin_was_loaded_too_late")' >> $out/ftplugin/tex.vim + echo ':q!' >> $out/ftplugin/tex.vim + '') // { pname = "test-ftplugin"; }; + in + + neovim.override { extraName = "-with-ftplugin"; configure.packages.plugins = { start = [ @@ -146,13 +167,14 @@ rec { # regression test that ftplugin files from plugins are loaded before the ftplugin # files from $VIMRUNTIME run_nvim_with_ftplugin = runTest nvim_with_ftplugin '' - export HOME=$TMPDIR echo '\documentclass{article}' > main.tex - ${nvim_with_ftplugin}/bin/nvim main.tex -c "set ft?" -c quit + ${nvim_with_ftplugin}/bin/nvim -i NONE -V3log.txt main.tex -c "set ft?" -c quit ls -l $TMPDIR - # if the file exists, then our plugin has been loaded instead of neovim's - [ ! -f plugin_was_loaded_too_late ] + # check the saved value b:did_ftplugin then our plugin has been loaded instead of neovim's + result="$(cat plugin_was_loaded_too_late)" + echo $result + [ "$result" = 0 ] ''; @@ -183,8 +205,8 @@ rec { ]; }; }; + checkHelpLuaPackages = runTest nvim_with_gitsigns_plugin '' - export HOME=$TMPDIR ${nvim_with_gitsigns_plugin}/bin/nvim -i NONE -c 'help gitsigns' +quitall! -e ''; @@ -212,8 +234,8 @@ rec { checkAliases = runTest nvim_with_aliases '' folder=${nvim_with_aliases}/bin - assertFileExists "$folder/vi" - assertFileExists "$folder/vim" + assertFileIsExecutable "$folder/vi" + assertFileIsExecutable "$folder/vim" ''; # having no RC generated should autodisable init.vim wrapping @@ -239,8 +261,7 @@ rec { }); nvim_with_lua_packages = runTest nvimWithLuaPackages '' - export HOME=$TMPDIR - ${nvimWithLuaPackages}/bin/nvim -i NONE --noplugin -es + ${nvimWithLuaPackages}/bin/nvim -V3log.txt -i NONE --noplugin +quitall! -e ''; # nixpkgs should install optional packages in the opt folder @@ -278,7 +299,17 @@ rec { }; run_nvim_with_opt_plugin = runTest nvim_with_opt_plugin '' - export HOME=$TMPDIR ${nvim_with_opt_plugin}/bin/nvim -i NONE +quit! -e ''; + + inherit nvim-with-luasnip; + + # check that bringing in one plugin with lua deps makes those deps visible from wrapper + # for instance luasnip has a dependency on jsregexp + can_require_transitive_deps = + runTest nvim-with-luasnip '' + cat ${nvim-with-luasnip}/bin/nvim + ${nvim-with-luasnip}/bin/nvim -i NONE --cmd "lua require'jsregexp'" -e +quitall! + ''; + }) diff --git a/pkgs/applications/editors/neovim/utils.nix b/pkgs/applications/editors/neovim/utils.nix index 8f9a5b880032c..9f0aa86de48ca 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,16 +224,57 @@ 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 ''); + /* + Fork of vimUtils.packDir that additionnally generates a propagated-build-inputs-file that + can be used by the lua hooks to generate a proper LUA_PATH + + Generates a packpath folder as expected by vim + Example: + packDir ( {myVimPackage = { start = [ vimPlugins.vim-fugitive ]; opt = []; }; }) + => "/nix/store/xxxxx-pack-dir" + */ + packDir = packages: + let + rawPackDir = vimUtils.packDir packages; + + in + rawPackDir.override ({ + postBuild = '' + mkdir $out/nix-support + for i in $(find -L $out -name propagated-build-inputs ); do + cat "$i" >> $out/nix-support/propagated-build-inputs + done + '';}); + + in { inherit makeNeovimConfig; inherit generateProviderRc; inherit legacyWrapper; inherit grammarToPlugin; + inherit packDir; inherit buildNeovimPlugin; buildNeovimPluginFrom2Nix = lib.warn "buildNeovimPluginFrom2Nix was renamed to buildNeovimPlugin" buildNeovimPlugin; diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix index e877f1e1f764a..8bcd1b5ebbd66 100644 --- a/pkgs/applications/editors/neovim/wrapper.nix +++ b/pkgs/applications/editors/neovim/wrapper.nix @@ -2,10 +2,8 @@ , writeText , nodePackages , python3 -, python3Packages , callPackage , neovimUtils -, vimUtils , perl , lndir }: @@ -13,6 +11,9 @@ neovim-unwrapped: let + # inherit interpreter from neovim + lua = neovim-unwrapped.lua; + wrapper = { extraName ? "" # should contain all args but the binary. Can be either a string or list @@ -24,6 +25,8 @@ let , withNodeJs ? false , withPerl ? false , rubyEnv ? null + + # wether to create symlinks in $out/bin/vi(m) -> $out/bin/nvim , vimAlias ? false , viAlias ? false @@ -45,6 +48,8 @@ let stdenv.mkDerivation (finalAttrs: let + finalPackdir = neovimUtils.packDir packpathDirs; + rcContent = '' ${luaRcContent} '' + lib.optionalString (!isNull neovimRcContent) '' @@ -57,10 +62,10 @@ let # vim accepts a limited number of commands so we join them all [ "--add-flags" ''--cmd "lua ${providerLuaRc}"'' - # (lib.intersperse "|" hostProviderViml) - ] ++ lib.optionals (packpathDirs.myNeovimPackages.start != [] || packpathDirs.myNeovimPackages.opt != []) [ - "--add-flags" ''--cmd "set packpath^=${vimUtils.packDir packpathDirs}"'' - "--add-flags" ''--cmd "set rtp^=${vimUtils.packDir packpathDirs}"'' + ] + ++ lib.optionals (packpathDirs.myNeovimPackages.start != [] || packpathDirs.myNeovimPackages.opt != []) [ + "--add-flags" ''--cmd "set packpath^=${finalPackdir}"'' + "--add-flags" ''--cmd "set rtp^=${finalPackdir}"'' ] ; @@ -100,7 +105,7 @@ let luaRcContent = rcContent; # Remove the symlinks created by symlinkJoin which we need to perform # extra actions upon - postBuild = lib.optionalString stdenv.isLinux '' + postBuild = lib.optionalString stdenv.hostPlatform.isLinux '' rm $out/share/applications/nvim.desktop substitute ${neovim-unwrapped}/share/applications/nvim.desktop $out/share/applications/nvim.desktop \ --replace-warn 'Name=Neovim' 'Name=Neovim wrapper' @@ -160,7 +165,17 @@ let + '' rm $out/bin/nvim touch $out/rplugin.vim - makeWrapper ${lib.escapeShellArgs finalMakeWrapperArgs} ${wrapperArgsStr} + + echo "Looking for lua dependencies..." + source ${lua}/nix-support/utils.sh + + _addToLuaPath "${finalPackdir}" + + echo "LUA_PATH towards the end of packdir: $LUA_PATH" + + makeWrapper ${lib.escapeShellArgs finalMakeWrapperArgs} ${wrapperArgsStr} \ + --prefix LUA_PATH ';' "$LUA_PATH" \ + --prefix LUA_CPATH ';' "$LUA_CPATH" ''; buildPhase = '' @@ -184,11 +199,20 @@ let }; }; - meta = neovim-unwrapped.meta // { + meta = { + inherit (neovim-unwrapped.meta) + description + longDescription + homepage + mainProgram + license + maintainers + platforms; + # To prevent builds on hydra hydraPlatforms = []; # prefer wrapper over the package - priority = (neovim-unwrapped.meta.priority or 0) - 1; + priority = (neovim-unwrapped.meta.priority or lib.meta.defaultPriority) - 1; }; }); in diff --git a/pkgs/applications/editors/notepad-next/default.nix b/pkgs/applications/editors/notepad-next/default.nix index 837648a40d36f..2a20691351d10 100644 --- a/pkgs/applications/editors/notepad-next/default.nix +++ b/pkgs/applications/editors/notepad-next/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "notepad-next"; - version = "0.7"; + version = "0.8"; src = fetchFromGitHub { owner = "dail8859"; repo = "NotepadNext"; rev = "v${version}"; - sha256 = "sha256-I2bS8oT/TGf6fuXpTwOKo2MaUo0jLFIU/DfW9h1toOk="; + hash = "sha256-fwHTsTKcVaeIv0NQQBjzfXscGDfXr3X/yH07YnYh3fU="; # External dependencies - https://github.com/dail8859/NotepadNext/issues/135 fetchSubmodules = true; }; @@ -27,7 +27,7 @@ mkDerivation rec { --replace '$$[QT_INSTALL_TRANSLATIONS]/qt_zh_CN.qm' "" ''; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mv $out/bin $out/Applications rm -fr $out/share ''; @@ -38,7 +38,7 @@ mkDerivation rec { license = licenses.gpl3Plus; platforms = platforms.unix; maintainers = [ maintainers.sebtm ]; - broken = stdenv.isAarch64; + broken = stdenv.hostPlatform.isAarch64; mainProgram = "NotepadNext"; }; } diff --git a/pkgs/applications/editors/nvi/default.nix b/pkgs/applications/editors/nvi/default.nix index 2001ba2497d17..c5ef872bffff1 100644 --- a/pkgs/applications/editors/nvi/default.nix +++ b/pkgs/applications/editors/nvi/default.nix @@ -35,6 +35,6 @@ stdenv.mkDerivation rec { description = "Berkeley Vi Editor"; license = licenses.free; platforms = platforms.unix; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/nvi.x86_64-darwin + broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/nvi.x86_64-darwin }; } diff --git a/pkgs/applications/editors/ox/default.nix b/pkgs/applications/editors/ox/default.nix index 978f2b2aaa1a3..c752c62f120a0 100644 --- a/pkgs/applications/editors/ox/default.nix +++ b/pkgs/applications/editors/ox/default.nix @@ -1,17 +1,19 @@ -{ lib, fetchFromGitHub, rustPlatform }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, darwin }: rustPlatform.buildRustPackage rec { pname = "ox"; - version = "0.2.7"; + version = "0.6.1"; src = fetchFromGitHub { owner = "curlpipe"; repo = pname; rev = version; - hash = "sha256-4I6RjSCfNyeSQwGn6zX9AhePkqr+uOuhXdV0tat1LqI="; + hash = "sha256-37o8Ak+8LPeGny7JBLc2STpRjfWBCwOrRyP3HJbD25o="; }; - cargoHash = "sha256-VFrN58SRTRGH+RSc59RIdsysR3umnrU2KM5XVCp9u1Q="; + cargoHash = "sha256-c7XhMYfhMCxyidZJemnu5f9KwQmPmbun6mrI3v2EpZ4="; + + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit ]; meta = with lib; { description = "Independent Rust text editor that runs in your terminal"; diff --git a/pkgs/applications/editors/pixelorama/default.nix b/pkgs/applications/editors/pixelorama/default.nix deleted file mode 100644 index c82f3a703b223..0000000000000 --- a/pkgs/applications/editors/pixelorama/default.nix +++ /dev/null @@ -1,95 +0,0 @@ -{ lib -, stdenv -, alsa-lib -, autoPatchelfHook -, fetchFromGitHub -, godot3-headless -, godot3-export-templates -, libGLU -, libpulseaudio -, libX11 -, libXcursor -, libXi -, libXinerama -, libXrandr -, libXrender -, nix-update-script -, udev -}: - -let - preset = - if stdenv.isLinux then - if stdenv.is64bit then "Linux/X11 64-bit" - else "Linux/X11 32-bit" - else if stdenv.isDarwin then "Mac OSX" - else throw "unsupported platform"; -in stdenv.mkDerivation (finalAttrs: { - pname = "pixelorama"; - version = "0.11.4"; - - src = fetchFromGitHub { - owner = "Orama-Interactive"; - repo = "Pixelorama"; - rev = "v${finalAttrs.version}"; - sha256 = "sha256-VEQjZ9kDqXz1hoT4PrsBtzoi1TYWyN+YcPMyf9qJMRE="; - }; - - nativeBuildInputs = [ - autoPatchelfHook - godot3-headless - ]; - - buildInputs = [ - libGLU - libX11 - libXcursor - libXi - libXinerama - libXrandr - libXrender - ]; - - buildPhase = '' - runHook preBuild - - export HOME=$(mktemp -d) - mkdir -p $HOME/.local/share/godot/ - ln -s "${godot3-export-templates}/share/godot/templates" "$HOME/.local/share/godot/templates" - mkdir -p build - godot3-headless -v --export "${preset}" ./build/pixelorama - godot3-headless -v --export-pack "${preset}" ./build/pixelorama.pck - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - install -D -m 755 -t $out/libexec ./build/pixelorama - install -D -m 644 -t $out/libexec ./build/pixelorama.pck - install -D -m 644 -t $out/share/applications ./Misc/Linux/com.orama_interactive.Pixelorama.desktop - install -d -m 755 $out/bin - ln -s $out/libexec/pixelorama $out/bin/pixelorama - - runHook postInstall - ''; - - runtimeDependencies = map lib.getLib [ - alsa-lib - libpulseaudio - udev - ]; - - passthru.updateScript = nix-update-script { }; - - meta = with lib; { - homepage = "https://orama-interactive.itch.io/pixelorama"; - description = "Free & open-source 2D sprite editor, made with the Godot Engine!"; - changelog = "https://github.com/Orama-Interactive/Pixelorama/blob/${finalAttrs.src.rev}/CHANGELOG.md"; - license = licenses.mit; - platforms = [ "i686-linux" "x86_64-linux" ]; - maintainers = with maintainers; [ felschr ]; - mainProgram = "pixelorama"; - }; -}) diff --git a/pkgs/applications/editors/poke/default.nix b/pkgs/applications/editors/poke/default.nix deleted file mode 100644 index 604758d0df5ae..0000000000000 --- a/pkgs/applications/editors/poke/default.nix +++ /dev/null @@ -1,91 +0,0 @@ -{ lib -, stdenv -, fetchurl -, help2man -, pkg-config -, texinfo -, boehmgc -, readline -, nbdSupport ? !stdenv.isDarwin, libnbd -, textStylingSupport ? true, gettext -, dejagnu - - # update script only -, writeScript -}: - -let - isCross = stdenv.hostPlatform != stdenv.buildPlatform; -in -stdenv.mkDerivation (finalAttrs: { - pname = "poke"; - version = "4.1"; - - src = fetchurl { - url = "mirror://gnu/poke/poke-${finalAttrs.version}.tar.gz"; - hash = "sha256-COyupB9zdKzUI44Su/l+jNXlctWRfpVrc7nUMCbp10A="; - }; - - outputs = [ "out" "dev" "info" "lib" ] - # help2man can't cross compile because it runs `poke --help` to - # generate the man page - ++ lib.optional (!isCross) "man"; - - postPatch = '' - patchShebangs . - ''; - - strictDeps = true; - - nativeBuildInputs = [ - pkg-config - texinfo - ] ++ lib.optionals (!isCross) [ - help2man - ]; - - buildInputs = [ boehmgc readline ] - ++ lib.optional nbdSupport libnbd - ++ lib.optional textStylingSupport gettext - ++ lib.optional finalAttrs.finalPackage.doCheck dejagnu; - - configureFlags = [ - # libpoke depends on $datadir/poke, so we specify the datadir in - # $lib, and later move anything else it doesn't depend on to $out - "--datadir=${placeholder "lib"}/share" - ]; - - enableParallelBuilding = true; - - doCheck = true; - nativeCheckInputs = [ dejagnu ]; - - postInstall = '' - moveToOutput share/emacs "$out" - moveToOutput share/vim "$out" - ''; - - passthru = { - updateScript = writeScript "update-poke" '' - #!/usr/bin/env nix-shell - #!nix-shell -i bash -p curl pcre common-updater-scripts - - set -eu -o pipefail - - # Expect the text in format of '<a href="...">poke 2.0</a>' - new_version="$(curl -s https://www.jemarch.net/poke | - pcregrep -o1 '>poke ([0-9.]+)</a>')" - update-source-version poke "$new_version" - ''; - }; - - meta = { - description = "Interactive, extensible editor for binary data"; - homepage = "http://www.jemarch.net/poke"; - changelog = "https://git.savannah.gnu.org/cgit/poke.git/plain/ChangeLog?h=releases/poke-${finalAttrs.version}"; - license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ AndersonTorres kira-bruneau ]; - platforms = lib.platforms.unix; - broken = stdenv.isDarwin && stdenv.isAarch64; - }; -}) diff --git a/pkgs/applications/editors/quartus-prime/default.nix b/pkgs/applications/editors/quartus-prime/default.nix index dfe977876231b..a5d39818639eb 100644 --- a/pkgs/applications/editors/quartus-prime/default.nix +++ b/pkgs/applications/editors/quartus-prime/default.nix @@ -1,5 +1,5 @@ -{ lib, buildFHSEnv, callPackage, makeDesktopItem, writeScript, runtimeShell -, runCommand, unstick, quartus-prime-lite +{ lib, buildFHSEnv, callPackage, makeDesktopItem, runtimeShell +, runCommand, unstick, quartus-prime-lite, libfaketime, pkgsi686Linux , withQuesta ? true , supportedDevices ? [ "Arria II" "Cyclone V" "Cyclone IV" "Cyclone 10 LP" "MAX II/V" "MAX 10 FPGA" ] , unwrapped ? callPackage ./quartus.nix { inherit unstick supportedDevices withQuesta; } @@ -85,15 +85,28 @@ in buildFHSEnv rec { progs_wrapped=() for prog in ''${progs_to_wrap[@]}; do relname="''${prog#"${unwrapped}/"}" + bname="$(basename "$relname")" wrapped="$out/$relname" progs_wrapped+=("$wrapped") mkdir -p "$(dirname "$wrapped")" echo "#!${runtimeShell}" >> "$wrapped" + NIXPKGS_QUARTUS_THIS_PROG_SUPPORTS_FIXED_CLOCK=1 case "$relname" in questa_fse/*) echo "export NIXPKGS_IS_QUESTA_WRAPPER=1" >> "$wrapped" + # Any use of LD_PRELOAD breaks Questa, so disable the + # SOURCE_DATE_EPOCH code path. + NIXPKGS_QUARTUS_THIS_PROG_SUPPORTS_FIXED_CLOCK=0 ;; esac + # SOURCE_DATE_EPOCH blocklist for programs that are known to hang/break + # with fixed/static clock. + case "$bname" in + jtagd|quartus_pgm|quartus) + NIXPKGS_QUARTUS_THIS_PROG_SUPPORTS_FIXED_CLOCK=0 + ;; + esac + echo "export NIXPKGS_QUARTUS_THIS_PROG_SUPPORTS_FIXED_CLOCK=$NIXPKGS_QUARTUS_THIS_PROG_SUPPORTS_FIXED_CLOCK" >> "$wrapped" echo "exec $wrapper $prog \"\$@\"" >> "$wrapped" done @@ -116,6 +129,17 @@ in buildFHSEnv rec { if [ "$NIXPKGS_IS_QUESTA_WRAPPER" != 1 ]; then export LD_PRELOAD=''${LD_PRELOAD:+$LD_PRELOAD:}/usr/lib/libudev.so.0 fi + + # Implement the SOURCE_DATE_EPOCH specification for reproducible builds + # (https://reproducible-builds.org/specs/source-date-epoch). + # Require opt-in with NIXPKGS_QUARTUS_REPRODUCIBLE_BUILD=1 for now, in case + # the blocklist is incomplete. + if [ -n "$SOURCE_DATE_EPOCH" ] && [ "$NIXPKGS_QUARTUS_REPRODUCIBLE_BUILD" = 1 ] && [ "$NIXPKGS_QUARTUS_THIS_PROG_SUPPORTS_FIXED_CLOCK" = 1 ]; then + export LD_LIBRARY_PATH="${lib.makeLibraryPath [ libfaketime pkgsi686Linux.libfaketime ]}''${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" + export LD_PRELOAD=libfaketime.so.1''${LD_PRELOAD:+:$LD_PRELOAD} + export FAKETIME_FMT="%s" + export FAKETIME="$SOURCE_DATE_EPOCH" + fi '' + extraProfile; # Run the wrappers directly, instead of going via bash. @@ -126,6 +150,7 @@ in buildFHSEnv rec { tests = { buildSof = runCommand "quartus-prime-lite-test-build-sof" { nativeBuildInputs = [ quartus-prime-lite ]; + env.NIXPKGS_QUARTUS_REPRODUCIBLE_BUILD = "1"; } '' cat >mydesign.vhd <<EOF @@ -153,12 +178,15 @@ in buildFHSEnv rec { exit 1 fi - touch "$out" + sha1sum mydesign.sof > "$out" ''; - questaEncryptedModel = runCommand "quartus-prime-lite-test-questa-encrypted-model" {} '' - "${quartus-prime-lite}/bin/vlog" "${quartus-prime-lite.unwrapped}/questa_fse/intel/verilog/src/arriav_atoms_ncrypt.v" - touch "$out" - ''; + questaEncryptedModel = runCommand "quartus-prime-lite-test-questa-encrypted-model" + { env.NIXPKGS_QUARTUS_REPRODUCIBLE_BUILD = "1"; + } + '' + "${quartus-prime-lite}/bin/vlog" "${quartus-prime-lite.unwrapped}/questa_fse/intel/verilog/src/arriav_atoms_ncrypt.v" + touch "$out" + ''; }; }; diff --git a/pkgs/applications/editors/quartus-prime/quartus.nix b/pkgs/applications/editors/quartus-prime/quartus.nix index 12c7039563c1e..e668fe9e43fe6 100644 --- a/pkgs/applications/editors/quartus-prime/quartus.nix +++ b/pkgs/applications/editors/quartus-prime/quartus.nix @@ -102,6 +102,6 @@ in stdenv.mkDerivation rec { sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ kwohlfahrt ]; + maintainers = with maintainers; [ bjornfor kwohlfahrt ]; }; } diff --git a/pkgs/applications/editors/qxmledit/default.nix b/pkgs/applications/editors/qxmledit/default.nix index 1991b2a7bc77c..946a56917d630 100644 --- a/pkgs/applications/editors/qxmledit/default.nix +++ b/pkgs/applications/editors/qxmledit/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { dontWrapQtApps = true; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Simple XML editor based on qt libraries"; homepage = "https://sourceforge.net/projects/qxmledit"; license = licenses.lgpl2; diff --git a/pkgs/applications/editors/rednotebook/default.nix b/pkgs/applications/editors/rednotebook/default.nix index 8cf715c51f2e1..2fb1ca4d1333e 100644 --- a/pkgs/applications/editors/rednotebook/default.nix +++ b/pkgs/applications/editors/rednotebook/default.nix @@ -5,13 +5,13 @@ buildPythonApplication rec { pname = "rednotebook"; - version = "2.33"; + version = "2.34"; src = fetchFromGitHub { owner = "jendrikseipp"; repo = "rednotebook"; rev = "refs/tags/v${version}"; - sha256 = "sha256-K4uEZZZXU2mZ61t6Ak5mpiCsm/mcNhm+xJSzfJPiuwo="; + sha256 = "sha256-2Z9zYfMAJPcKN5eakooIv4lQ140yjgQuUVlaWcsEu28="; }; # We have not packaged tests. diff --git a/pkgs/applications/editors/rehex/default.nix b/pkgs/applications/editors/rehex/default.nix index 9a3ba2a4a59f4..f6f1bf2b28b1f 100644 --- a/pkgs/applications/editors/rehex/default.nix +++ b/pkgs/applications/editors/rehex/default.nix @@ -5,7 +5,7 @@ , which , zip , libicns -, botan2 +, botan3 , capstone , jansson , libunistring @@ -20,26 +20,29 @@ stdenv.mkDerivation rec { pname = "rehex"; - version = "0.61.1"; + version = "0.62.1"; src = fetchFromGitHub { owner = "solemnwarning"; repo = pname; rev = version; - hash = "sha256-/m4s5BW33I9g9hi5j3Vtui271w8Jv91+rQrI3qpO5Og="; + hash = "sha256-RlYpg3aon1d25n8K/bbHGVLn5/iOOUSlvjT8U0fp9hA="; }; nativeBuildInputs = [ pkg-config which zip ] - ++ lib.optionals stdenv.isDarwin [ libicns ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libicns ]; - buildInputs = [ botan2 capstone jansson libunistring wxGTK32 ] + buildInputs = [ botan3 capstone jansson libunistring wxGTK32 ] ++ (with lua53Packages; [ lua busted ]) ++ (with perlPackages; [ perl TemplateToolkit ]) - ++ lib.optionals stdenv.isLinux [ gtk3 ] - ++ lib.optionals stdenv.isDarwin [ Carbon Cocoa IOKit ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ gtk3 ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Carbon Cocoa IOKit ]; - makeFlags = [ "prefix=${placeholder "out"}" ] - ++ lib.optionals stdenv.isDarwin [ "-f Makefile.osx" ]; + makeFlags = [ + "prefix=${placeholder "out"}" + "BOTAN_PKG=botan-3" + "CXXSTD=-std=c++20" + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-f Makefile.osx" ]; enableParallelBuilding = true; 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/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix index 3278fc9ef158f..55998bcbe3c99 100644 --- a/pkgs/applications/editors/rstudio/default.nix +++ b/pkgs/applications/editors/rstudio/default.nix @@ -2,7 +2,6 @@ , stdenv , mkDerivation , fetchurl -, fetchpatch , fetchFromGitHub , makeDesktopItem , copyDesktopItems @@ -38,7 +37,7 @@ let pname = "RStudio"; - version = "2024.04.1+748"; + version = "2024.04.2+764"; RSTUDIO_VERSION_MAJOR = lib.versions.major version; RSTUDIO_VERSION_MINOR = lib.versions.minor version; RSTUDIO_VERSION_PATCH = lib.versions.patch version; @@ -50,7 +49,7 @@ let owner = "rstudio"; repo = "rstudio"; rev = "v" + version; - hash = "sha256-fzxbhN9NdM0E2rxezj2BMEZ8obUbX0Zw8haDNmfAkWs="; + hash = "sha256-j258eW1MYQrB6kkpjyolXdNuwQ3zSWv9so4q0QLsZuw="; }; mathJaxSrc = fetchurl { @@ -134,48 +133,38 @@ in ./pandoc-nix-path.patch ./use-system-quarto.patch ./ignore-etc-os-release.patch - - (fetchpatch { - name = "use-system-yaml-patch"; - url = "https://github.com/rstudio/rstudio/commit/04de8ca8b83dcc7fee9fd65e6ef58c372489d5ef.patch"; - hash = "sha256-FHSSOPsw6AAYBj/fgNT6idyxvRj3SG+fbla0UDjug1Y="; - }) - ]; postPatch = '' - substituteInPlace src/cpp/core/r_util/REnvironmentPosix.cpp --replace '@R@' ${R} - - substituteInPlace src/cpp/CMakeLists.txt \ - --replace 'SOCI_LIBRARY_DIR "/usr/lib"' 'SOCI_LIBRARY_DIR "${soci}/lib"' + substituteInPlace src/cpp/core/r_util/REnvironmentPosix.cpp --replace-fail '@R@' ${R} substituteInPlace src/gwt/build.xml \ - --replace '@node@' ${nodejs} \ - --replace './lib/quarto' ${quartoSrc} + --replace-fail '@node@' ${nodejs} \ + --replace-fail './lib/quarto' ${quartoSrc} substituteInPlace src/cpp/conf/rsession-dev.conf \ - --replace '@node@' ${nodejs} + --replace-fail '@node@' ${nodejs} substituteInPlace src/cpp/core/libclang/LibClang.cpp \ - --replace '@libclang@' ${llvmPackages.libclang.lib} \ - --replace '@libclang.so@' ${llvmPackages.libclang.lib}/lib/libclang.so + --replace-fail '@libclang@' ${llvmPackages.libclang.lib} \ + --replace-fail '@libclang.so@' ${llvmPackages.libclang.lib}/lib/libclang.so substituteInPlace src/cpp/session/CMakeLists.txt \ - --replace '@pandoc@' ${pandoc} \ - --replace '@quarto@' ${quarto} + --replace-fail '@pandoc@' ${pandoc} \ + --replace-fail '@quarto@' ${quarto} substituteInPlace src/cpp/session/include/session/SessionConstants.hpp \ - --replace '@pandoc@' ${pandoc}/bin \ - --replace '@quarto@' ${quarto} + --replace-fail '@pandoc@' ${pandoc}/bin \ + --replace-fail '@quarto@' ${quarto} ''; - hunspellDictionaries = with lib; filter isDerivation (unique (attrValues hunspellDicts)); + hunspellDictionaries = lib.filter lib.isDerivation (lib.unique (lib.attrValues hunspellDicts)); # These dicts contain identically-named dict files, so we only keep the # -large versions in case of clashes - largeDicts = with lib; filter (d: hasInfix "-large-wordlist" d.name) hunspellDictionaries; - otherDicts = with lib; filter - (d: !(hasAttr "dictFileName" d && - elem d.dictFileName (map (d: d.dictFileName) largeDicts))) + largeDicts = lib.filter (d: lib.hasInfix "-large-wordlist" d.name) hunspellDictionaries; + otherDicts = lib.filter + (d: !(lib.hasAttr "dictFileName" d && + lib.elem d.dictFileName (map (d: d.dictFileName) largeDicts))) hunspellDictionaries; dictionaries = largeDicts ++ otherDicts; @@ -189,10 +178,10 @@ in unzip -q ${mathJaxSrc} -d dependencies/mathjax-27 - # As of Chocolate Cosmos, node 18.19.1 is used for runtime + # As of Chocolate Cosmos, node 18.20.3 is used for runtime # 18.18.2 is still used for build # see https://github.com/rstudio/rstudio/commit/facb5cf1ab38fe77813aaf36590804e4f865d780 - mkdir -p dependencies/common/node/18.19.1 + mkdir -p dependencies/common/node/18.20.3 mkdir -p dependencies/pandoc/${pandoc.version} cp ${pandoc}/bin/pandoc dependencies/pandoc/${pandoc.version}/pandoc @@ -223,7 +212,7 @@ in ''; meta = { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); inherit description; homepage = "https://www.rstudio.com/"; license = lib.licenses.agpl3Only; diff --git a/pkgs/applications/editors/setzer/default.nix b/pkgs/applications/editors/setzer/default.nix deleted file mode 100644 index e331619d62668..0000000000000 --- a/pkgs/applications/editors/setzer/default.nix +++ /dev/null @@ -1,77 +0,0 @@ -{ lib -, python3 -, fetchFromGitHub -, meson -, ninja -, gettext -, appstream -, appstream-glib -, wrapGAppsHook4 -, desktop-file-utils -, gobject-introspection -, gtk4 -, gtksourceview5 -, libadwaita -, libportal -, librsvg -, poppler_gi -, webkitgtk_6_0 -}: - -python3.pkgs.buildPythonApplication rec { - pname = "setzer"; - version = "65"; - - src = fetchFromGitHub { - owner = "cvfosammmm"; - repo = "Setzer"; - rev = "v${version}"; - hash = "sha256-5Hpj/RkD11bNcr9/gQG0Y7BNMsh1BGZQiN4IMbI4osc="; - }; - - format = "other"; - - nativeBuildInputs = [ - meson - ninja - gettext - appstream # for appstreamcli - appstream-glib - wrapGAppsHook4 - desktop-file-utils - gobject-introspection - ]; - - buildInputs = [ - gtk4 - gtksourceview5 - libadwaita - libportal - librsvg - poppler_gi - webkitgtk_6_0 - ]; - - propagatedBuildInputs = with python3.pkgs; [ - bibtexparser - numpy - pdfminer-six - pexpect - pillow - pycairo - pygobject3 - pyxdg - ]; - - checkPhase = '' - meson test --print-errorlogs - ''; - - meta = with lib; { - description = "LaTeX editor written in Python with Gtk"; - mainProgram = "setzer"; - homepage = src.meta.homepage; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ dotlambda ]; - }; -} diff --git a/pkgs/applications/editors/sublime/2/default.nix b/pkgs/applications/editors/sublime/2/default.nix index 6c9a43779f763..a57fc8d7de906 100644 --- a/pkgs/applications/editors/sublime/2/default.nix +++ b/pkgs/applications/editors/sublime/2/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { echo ${libPath} patchelf \ --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${libPath}:${stdenv.cc.cc.lib}/lib${lib.optionalString stdenv.is64bit "64"} \ + --set-rpath ${libPath}:${stdenv.cc.cc.lib}/lib${lib.optionalString stdenv.hostPlatform.is64bit "64"} \ $out/sublime/sublime_text mkdir -p $out/share/icons diff --git a/pkgs/applications/editors/sublime/3/common.nix b/pkgs/applications/editors/sublime/3/common.nix index 65bbd65163283..7eff7d9bf4df7 100644 --- a/pkgs/applications/editors/sublime/3/common.nix +++ b/pkgs/applications/editors/sublime/3/common.nix @@ -27,7 +27,7 @@ let libPath = lib.makeLibraryPath [ xorg.libX11 glib gtk3 cairo pango ]; redirects = [ "/usr/bin/pkexec=${pkexecPath}" ]; -in let + binaryPackage = stdenv.mkDerivation { pname = "${pname}-bin"; version = buildVersion; @@ -65,7 +65,7 @@ in let for binary in ${ builtins.concatStringsSep " " binaries }; do patchelf \ --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${libPath}:${stdenv.cc.cc.lib}/lib${lib.optionalString stdenv.is64bit "64"} \ + --set-rpath ${libPath}:${stdenv.cc.cc.lib}/lib${lib.optionalString stdenv.hostPlatform.is64bit "64"} \ $binary done @@ -92,7 +92,7 @@ in let postFixup = '' wrapProgram $out/sublime_bash \ - --set LD_PRELOAD "${stdenv.cc.cc.lib}/lib${lib.optionalString stdenv.is64bit "64"}/libgcc_s.so.1" + --set LD_PRELOAD "${stdenv.cc.cc.lib}/lib${lib.optionalString stdenv.hostPlatform.is64bit "64"}/libgcc_s.so.1" wrapProgram $out/${primaryBinary} \ --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \ @@ -101,7 +101,7 @@ in let "''${gappsWrapperArgs[@]}" # Without this, plugin_host crashes, even though it has the rpath - wrapProgram $out/plugin_host --prefix LD_PRELOAD : ${stdenv.cc.cc.lib}/lib${lib.optionalString stdenv.is64bit "64"}/libgcc_s.so.1:${lib.getLib openssl}/lib/libssl.so:${bzip2.out}/lib/libbz2.so + wrapProgram $out/plugin_host --prefix LD_PRELOAD : ${stdenv.cc.cc.lib}/lib${lib.optionalString stdenv.hostPlatform.is64bit "64"}/libgcc_s.so.1:${lib.getLib openssl}/lib/libssl.so:${bzip2.out}/lib/libbz2.so ''; }; in stdenv.mkDerivation (rec { diff --git a/pkgs/applications/editors/sublime/4/common.nix b/pkgs/applications/editors/sublime/4/common.nix index 952194e0260c6..b594633ea3cb1 100644 --- a/pkgs/applications/editors/sublime/4/common.nix +++ b/pkgs/applications/editors/sublime/4/common.nix @@ -61,8 +61,7 @@ let ] ++ lib.optionals (lib.versionAtLeast buildVersion "4145") [ sqlite ]; -in -let + binaryPackage = stdenv.mkDerivation rec { pname = "${pnameBase}-bin"; version = buildVersion; @@ -89,7 +88,7 @@ let for binary in ${builtins.concatStringsSep " " binaries}; do patchelf \ --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${lib.makeLibraryPath neededLibraries}:${stdenv.cc.cc.lib}/lib${lib.optionalString stdenv.is64bit "64"} \ + --set-rpath ${lib.makeLibraryPath neededLibraries}:${stdenv.cc.cc.lib}/lib${lib.optionalString stdenv.hostPlatform.is64bit "64"} \ $binary done diff --git a/pkgs/applications/editors/sublime/4/packages.nix b/pkgs/applications/editors/sublime/4/packages.nix index 9bfbbd1c1d695..50588587f5996 100644 --- a/pkgs/applications/editors/sublime/4/packages.nix +++ b/pkgs/applications/editors/sublime/4/packages.nix @@ -5,15 +5,15 @@ let in { sublime4 = common { - buildVersion = "4169"; - x64sha256 = "jk9wKC0QgfhiHDYUcnDhsmgJsBPOUmCkyvQeI54IJJ4="; - aarch64sha256 = "/W/xGbE+8gGu1zNh6lERZrfG9Dh9QUGkYiqTzp216JI="; + buildVersion = "4180"; + x64sha256 = "pl42AR4zWF3vx3wPSZkfIP7Oksune5nsbmciyJUv8D4="; + aarch64sha256 = "zRg2jfhi+g6iLrMF1TGAYT+QQKSNI1W4Yv1bz9oEXHg="; } { }; sublime4-dev = common { - buildVersion = "4175"; + buildVersion = "4178"; dev = true; - x64sha256 = "xncyxAaFJLLMko/iF6fhnpkOEHzD3nzWWGQCRK9srq4="; - aarch64sha256 = "oqz1HASwmv0B1T3ZQBdIOZD9wYcHbni8tovW7jGp3KM="; + x64sha256 = "2eTdb5MzXK3QbAEzl1yxURj4m/PqGHPVnHZV2WzD6Jc="; + aarch64sha256 = "NLLOB4WnujMx3+wf6Evi+yBWM6463EZoNL2wEdJA8BA="; } { }; } diff --git a/pkgs/applications/editors/texmacs/default.nix b/pkgs/applications/editors/texmacs/default.nix index cf19ea5a8cca1..92d162cdc3003 100644 --- a/pkgs/applications/editors/texmacs/default.nix +++ b/pkgs/applications/editors/texmacs/default.nix @@ -21,7 +21,7 @@ let pname = "texmacs"; - version = "2.1.2"; + version = "2.1.4"; common = callPackage ./common.nix { inherit extraFonts chineseFonts japaneseFonts koreanFonts; tex = texliveSmall; @@ -32,7 +32,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.texmacs.org/Download/ftp/tmftp/source/TeXmacs-${version}-src.tar.gz"; - hash = "sha256-Ds9gxOwMYSttEWrawgxLHGxHyMBvt8WmyPIwBP2g/CM="; + hash = "sha256-h6aSLuDdrAtVzOnNVPqMEWX9WLDHtkCjPy9JXWnBgYY="; }; postPatch = common.postPatch + '' @@ -58,18 +58,18 @@ stdenv.mkDerivation { sqlite git python3 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ qtmacextras ]; - cmakeFlags = lib.optionals stdenv.isDarwin [ + cmakeFlags = lib.optionals stdenv.hostPlatform.isDarwin [ (lib.cmakeFeature "TEXMACS_GUI" "Qt") (lib.cmakeFeature "CMAKE_INSTALL_PREFIX" "./TeXmacs.app/Contents/Resources") ]; env.NIX_LDFLAGS = "-lz"; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/{Applications,bin} mv TeXmacs.app $out/Applications/ makeWrapper $out/Applications/TeXmacs.app/Contents/MacOS/TeXmacs $out/bin/texmacs @@ -87,7 +87,7 @@ stdenv.mkDerivation { ]) ]; - postFixup = lib.optionalString (!stdenv.isDarwin) '' + postFixup = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' wrapQtApp $out/bin/texmacs ''; diff --git a/pkgs/applications/editors/texmaker/default.nix b/pkgs/applications/editors/texmaker/default.nix index 427948822fbcf..57757746cba32 100644 --- a/pkgs/applications/editors/texmaker/default.nix +++ b/pkgs/applications/editors/texmaker/default.nix @@ -1,17 +1,40 @@ -{ lib, mkDerivation, fetchurl, qtbase, qtscript, qtwebengine, qmake, zlib, pkg-config, poppler, wrapGAppsHook3 }: +{ + lib, + stdenv, + fetchurl, + cmake, + pkg-config, + wrapQtAppsHook, + poppler, + qtbase, + qttools, + qtwebengine, + qt5compat, + zlib +}: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "texmaker"; - version = "5.1.4"; + version = "6.0.0"; src = fetchurl { - url = "http://www.xm1math.net/texmaker/${pname}-${version}.tar.bz2"; - sha256 = "sha256-MgUE1itxtZHAa30LEgKsdQoxEv4soyjjBYAFXrMI/qY="; + url = "http://www.xm1math.net/texmaker/texmaker-${version}.tar.bz2"; + hash = "sha256-l3zlgOJcGrbgvD2hA74LQ+v2C4zg0nJzEE/df1hhd/w="; }; - buildInputs = [ qtbase qtscript poppler zlib qtwebengine ]; - nativeBuildInputs = [ pkg-config poppler qmake wrapGAppsHook3 ]; - env.NIX_CFLAGS_COMPILE = "-I${poppler.dev}/include/poppler"; + buildInputs = [ + poppler + qtbase + qtwebengine + qt5compat + qttools + zlib + ]; + nativeBuildInputs = [ + cmake + pkg-config + wrapQtAppsHook + ]; qmakeFlags = [ "DESKTOPDIR=${placeholder "out"}/share/applications" @@ -19,15 +42,9 @@ mkDerivation rec { "METAINFODIR=${placeholder "out"}/share/metainfo" ]; - dontWrapGApps = true; - - preFixup = '' - qtWrapperArgs+=("''${gappsWrapperArgs[@]}") - ''; - meta = with lib; { description = "TeX and LaTeX editor"; - longDescription='' + longDescription = '' This editor is a full fledged IDE for TeX and LaTeX editing with completion, structure viewer, preview, spell checking and support of any compilation chain. @@ -35,7 +52,10 @@ mkDerivation rec { homepage = "http://www.xm1math.net/texmaker/"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = with maintainers; [ cfouche markuskowa ]; + maintainers = with maintainers; [ + cfouche + markuskowa + ]; mainProgram = "texmaker"; }; } diff --git a/pkgs/applications/editors/texstudio/default.nix b/pkgs/applications/editors/texstudio/default.nix index 9c31bcdebbce4..82c434ce13345 100644 --- a/pkgs/applications/editors/texstudio/default.nix +++ b/pkgs/applications/editors/texstudio/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "texstudio"; - version = "4.8.0"; + version = "4.8.3"; src = fetchFromGitHub { owner = "texstudio-org"; repo = "texstudio"; rev = finalAttrs.version; - hash = "sha256-oPC0HJgBWCAGZ1pVTiHyDO3NQ3u/+1fA2KrxuBCB+IY="; + hash = "sha256-/8Y8hz/rqKc5yZ/pdfy6gikufoSx0au3niv2r7o5cRc="; }; nativeBuildInputs = [ @@ -28,11 +28,11 @@ stdenv.mkDerivation (finalAttrs: { qttools quazip zlib - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ qtwayland ]; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p "$out/Applications" mv "$out/bin/texstudio.app" "$out/Applications" rm -d "$out/bin" @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { spell checking and support of any compilation chain. ''; homepage = "https://texstudio.org"; - changelog = "https://github.com/texstudio-org/texstudio/blob/${finalAttrs.version}/utilities/manual/CHANGELOG.txt"; + changelog = "https://github.com/texstudio-org/texstudio/blob/${finalAttrs.version}/utilities/manual/source/CHANGELOG.md"; license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = with maintainers; [ ajs124 cfouche ]; diff --git a/pkgs/applications/editors/texworks/default.nix b/pkgs/applications/editors/texworks/default.nix index 4ddd4c9cb6c11..a20bc426b3ca2 100644 --- a/pkgs/applications/editors/texworks/default.nix +++ b/pkgs/applications/editors/texworks/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { qttools ] ++ lib.optional withLua lua ++ lib.optional withPython python3 - ++ lib.optional stdenv.isLinux qtwayland; + ++ lib.optional stdenv.hostPlatform.isLinux qtwayland; cmakeFlags = [ "-DQT_DEFAULT_MAJOR_VERSION=6" diff --git a/pkgs/applications/editors/thiefmd/default.nix b/pkgs/applications/editors/thiefmd/default.nix index 59e28a75ad138..b626ca6fb8a62 100644 --- a/pkgs/applications/editors/thiefmd/default.nix +++ b/pkgs/applications/editors/thiefmd/default.nix @@ -66,6 +66,6 @@ stdenv.mkDerivation rec { mainProgram = "com.github.kmwallio.thiefmd"; license = licenses.gpl3Only; platforms = platforms.linux; - maintainers = [ ]; + maintainers = with maintainers; [ aleksana ]; }; } diff --git a/pkgs/applications/editors/thonny/default.nix b/pkgs/applications/editors/thonny/default.nix deleted file mode 100644 index fa29fae667131..0000000000000 --- a/pkgs/applications/editors/thonny/default.nix +++ /dev/null @@ -1,70 +0,0 @@ -{ lib, fetchFromGitHub, python3, tk, makeDesktopItem, copyDesktopItems }: - -with python3.pkgs; - -buildPythonApplication rec { - pname = "thonny"; - version = "4.1.4"; - - src = fetchFromGitHub { - owner = pname; - repo = pname; - rev = "refs/tags/v${version}"; - hash = "sha256-f4wR5OPzWbtSqE+hSW2zD8u3pPl5nPTtGvf2LzOXjI4="; - }; - - nativeBuildInputs = [ copyDesktopItems ]; - - desktopItems = [ (makeDesktopItem { - name = "Thonny"; - exec = "thonny"; - icon = "thonny"; - desktopName = "Thonny"; - comment = "Python IDE for beginners"; - categories = [ "Development" "IDE" ]; - }) ]; - - propagatedBuildInputs = with python3.pkgs; [ - jedi - pyserial - tkinter - docutils - pylint - mypy - pyperclip - asttokens - send2trash - dbus-next - ]; - - preInstall = '' - export HOME=$(mktemp -d) - ''; - - preFixup = '' - wrapProgram "$out/bin/thonny" \ - --prefix PYTHONPATH : $PYTHONPATH:$(toPythonPath ${python3.pkgs.jedi}) - ''; - - postInstall = '' - install -Dm644 ./packaging/icons/thonny-48x48.png $out/share/icons/hicolor/48x48/apps/thonny.png - ''; - - # Tests need a DISPLAY - doCheck = false; - - meta = with lib; { - description = "Python IDE for beginners"; - longDescription = '' - Thonny is a Python IDE for beginners. It supports different ways - of stepping through the code, step-by-step expression - evaluation, detailed visualization of the call stack and a mode - for explaining the concepts of references and heap. - ''; - homepage = "https://www.thonny.org/"; - license = licenses.mit; - maintainers = with maintainers; [ leenaars ]; - platforms = platforms.unix; - mainProgram = "thonny"; - }; -} diff --git a/pkgs/applications/editors/tijolo/default.nix b/pkgs/applications/editors/tijolo/default.nix index ff198df57fe82..54f0f154ab371 100644 --- a/pkgs/applications/editors/tijolo/default.nix +++ b/pkgs/applications/editors/tijolo/default.nix @@ -15,13 +15,13 @@ crystal.buildCrystalPackage rec { pname = "tijolo"; - version = "0.8.1"; + version = "0.9.0"; src = fetchFromGitHub { owner = "hugopl"; repo = "tijolo"; rev = "v${version}"; - hash = "sha256-+sRcS5bVH6WLmSDLiPw608OB6OjBVwLqWxGT5Y6caBc="; + hash = "sha256-RVdZce9csnhJx5p+jBANDCsz2eB/l3EHExwKMbKL9y0="; }; postPatch = '' @@ -38,7 +38,7 @@ crystal.buildCrystalPackage rec { ''; nativeBuildInputs = [ wrapGAppsHook4 gobject-introspection ] - ++ lib.optionals stdenv.isDarwin [ desktopToDarwinBundle ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ desktopToDarwinBundle ]; buildInputs = [ gtk4 libadwaita vte-gtk4 libgit2 gtksourceview5 editorconfig-core-c ]; buildTargets = [ "all" ]; diff --git a/pkgs/applications/editors/tiled/default.nix b/pkgs/applications/editors/tiled/default.nix index 4a57523f1b033..a93a25b886d67 100644 --- a/pkgs/applications/editors/tiled/default.nix +++ b/pkgs/applications/editors/tiled/default.nix @@ -20,13 +20,13 @@ in stdenv.mkDerivation rec { pname = "tiled"; - version = "1.10.2"; + version = "1.11.0"; src = fetchFromGitHub { owner = "mapeditor"; repo = pname; rev = "v${version}"; - sha256 = "sha256-4Ykr60u2t5cyIZdpFHiRirXg2FqSLCzJzsdvw6r/LK8="; + sha256 = "sha256-cFS1OSYfGMsnw+VkZD/HO4+D+pxNKuifWjNhy0FoxN0="; }; nativeBuildInputs = [ pkg-config qbs wrapQtAppsHook ]; diff --git a/pkgs/applications/editors/typora/default.nix b/pkgs/applications/editors/typora/default.nix index 9445f422def4d..43c655750db54 100644 --- a/pkgs/applications/editors/typora/default.nix +++ b/pkgs/applications/editors/typora/default.nix @@ -5,14 +5,12 @@ , glib , nss , nspr -, at-spi2-atk , cups , dbus , libdrm , gtk3 , pango , cairo -, xorg , libxkbcommon , mesa , expat @@ -22,10 +20,10 @@ let pname = "typora"; - version = "1.8.10"; + version = "1.9.3"; src = fetchurl { url = "https://download.typora.io/linux/typora_${version}_amd64.deb"; - hash = "sha256-5ZLSzDUcF0OZUuWVX/iG+4ccTlCPdYxy7zl0wDHlxNQ="; + hash = "sha256-3rR/CvFFjRPkz27mm1Wt5hwgRUnLL7lpLFKA2moILx8="; }; typoraBase = stdenv.mkDerivation { diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix index d2e3013a782d9..5b9cfec4cb326 100644 --- a/pkgs/applications/editors/vim/common.nix +++ b/pkgs/applications/editors/vim/common.nix @@ -1,6 +1,6 @@ { lib, fetchFromGitHub }: rec { - version = "9.1.0412"; + version = "9.1.0707"; outputs = [ "out" "xxd" ]; @@ -8,7 +8,7 @@ rec { owner = "vim"; repo = "vim"; rev = "v${version}"; - hash = "sha256-uLdXFZ8eW+iMXrvkaEkArZmRfAiyORaEZxFFPt0TrdI="; + hash = "sha256-iHOLABPk5B7Sh7EBYnM7wdxnK2Wv7q4WS3FEp780SV4="; }; enableParallelBuilding = true; diff --git a/pkgs/applications/editors/vim/full.nix b/pkgs/applications/editors/vim/full.nix index 0f3652a8a7ded..5183ee5d39f20 100644 --- a/pkgs/applications/editors/vim/full.nix +++ b/pkgs/applications/editors/vim/full.nix @@ -5,14 +5,13 @@ , vimPlugins , makeWrapper , wrapGAppsHook3 -, runtimeShell # apple frameworks , CoreServices, CoreData, Cocoa, Foundation, libobjc , features ? "huge" # One of tiny, small, normal, big or huge , wrapPythonDrv ? false -, guiSupport ? config.vim.gui or (if stdenv.isDarwin then "gtk2" else "gtk3") +, guiSupport ? config.vim.gui or (if stdenv.hostPlatform.isDarwin then "gtk2" else "gtk3") , luaSupport ? config.vim.lua or true , perlSupport ? config.vim.perl or false # Perl interpreter , pythonSupport ? config.vim.python or true # Python interpreter @@ -105,7 +104,7 @@ in stdenv.mkDerivation { "vim_cv_memmove_handles_overlap=yes" ] ++ lib.optional (guiSupport == "gtk2" || guiSupport == "gtk3") "--enable-gui=${guiSupport}" - ++ lib.optional stdenv.isDarwin + ++ lib.optional stdenv.hostPlatform.isDarwin (if darwinSupport then "--enable-darwin" else "--disable-darwin") ++ lib.optionals luaSupport [ "--with-lua-prefix=${lua}" @@ -164,7 +163,7 @@ in stdenv.mkDerivation { ++ lib.optional sodiumSupport libsodium; # error: '__declspec' attributes are not enabled; use '-fdeclspec' or '-fms-extensions' to enable support for __declspec attributes - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-fdeclspec"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-fdeclspec"; preConfigure = lib.optionalString ftNixSupport '' cp ${vimPlugins.vim-nix.src}/ftplugin/nix.vim runtime/ftplugin/nix.vim @@ -177,7 +176,7 @@ in stdenv.mkDerivation { postInstall = '' ln -s $out/bin/vim $out/bin/vi - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' ln -sfn '${nixosRuntimepath}' "$out"/share/vim/vimrc ''; 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..0cca3d97538fd 100644 --- a/pkgs/applications/editors/vim/macvim.nix +++ b/pkgs/applications/editors/vim/macvim.nix @@ -6,16 +6,22 @@ , 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; + # 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 # qlmanage) but some are used by Xcode itself and we have no choice but to put them in PATH. @@ -26,16 +32,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 +54,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 +84,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 +138,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 +157,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 +187,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 +201,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 = [ ]; + 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/aliases.nix b/pkgs/applications/editors/vim/plugins/aliases.nix index ff504416489e2..8a95ceb753e0d 100644 --- a/pkgs/applications/editors/vim/plugins/aliases.nix +++ b/pkgs/applications/editors/vim/plugins/aliases.nix @@ -6,16 +6,16 @@ final: prev: let # Removing recurseForDerivation prevents derivations of aliased attribute # set to appear while listing all the packages available. - removeRecurseForDerivations = alias: with lib; + removeRecurseForDerivations = alias: if alias.recurseForDerivations or false then - removeAttrs alias ["recurseForDerivations"] + lib.removeAttrs alias ["recurseForDerivations"] else alias; # Disabling distribution prevents top-level aliases for non-recursed package # sets from building on Hydra. - removeDistribute = alias: with lib; - if isDerivation alias then - dontDistribute alias + removeDistribute = alias: + if lib.isDerivation alias then + lib.dontDistribute alias else alias; # Make sure that we are not shadowing something from @@ -99,6 +99,7 @@ mapAliases (with prev; { The_NERD_tree = nerdtree; open-browser = open-browser-vim; pathogen = vim-pathogen; + peskcolor-vim = throw "peskcolor-vim has been removed: abandoned by upstream"; # Added 2024-08-23 polyglot = vim-polyglot; prettyprint = vim-prettyprint; quickrun = vim-quickrun; diff --git a/pkgs/applications/editors/vim/plugins/avante-nvim/Cargo.lock b/pkgs/applications/editors/vim/plugins/avante-nvim/Cargo.lock new file mode 100644 index 0000000000000..78470b2a31917 --- /dev/null +++ b/pkgs/applications/editors/vim/plugins/avante-nvim/Cargo.lock @@ -0,0 +1,1638 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "adler2" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" + +[[package]] +name = "aho-corasick" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +dependencies = [ + "memchr", +] + +[[package]] +name = "anyhow" +version = "1.0.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" + +[[package]] +name = "autocfg" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" + +[[package]] +name = "avante-templates" +version = "0.1.0" +dependencies = [ + "minijinja", + "mlua", + "serde", +] + +[[package]] +name = "avante-tokenizers" +version = "0.1.0" +dependencies = [ + "mlua", + "tiktoken-rs", + "tokenizers", +] + +[[package]] +name = "base64" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" + +[[package]] +name = "base64" +version = "0.21.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" + +[[package]] +name = "base64" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" + +[[package]] +name = "bit-set" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" +dependencies = [ + "bit-vec", +] + +[[package]] +name = "bit-vec" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" + +[[package]] +name = "bstr" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40723b8fb387abc38f4f4a37c09073622e41dd12327033091ef8950659e6dc0c" +dependencies = [ + "memchr", + "regex-automata", + "serde", +] + +[[package]] +name = "bumpalo" +version = "3.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "cc" +version = "1.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57b6a275aa2903740dc87da01c62040406b8812552e97129a63ea8850a17c6e6" +dependencies = [ + "shlex", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[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.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" + +[[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 = "darling" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" +dependencies = [ + "darling_core", + "darling_macro", +] + +[[package]] +name = "darling_core" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim", + "syn", +] + +[[package]] +name = "darling_macro" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" +dependencies = [ + "darling_core", + "quote", + "syn", +] + +[[package]] +name = "derive_builder" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd33f37ee6a119146a1781d3356a7c26028f83d779b2e04ecd45fdc75c76877b" +dependencies = [ + "derive_builder_macro", +] + +[[package]] +name = "derive_builder_core" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7431fa049613920234f22c47fdc33e6cf3ee83067091ea4277a3f8c4587aae38" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "derive_builder_macro" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4abae7035bf79b9877b779505d8cf3749285b80c43941eda66604841889451dc" +dependencies = [ + "derive_builder_core", + "syn", +] + +[[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 = "either" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" + +[[package]] +name = "encode_unicode" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" + +[[package]] +name = "erased-serde" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24e2389d65ab4fab27dc2a5de7b191e1f6617d1f1c8855c0dc569c94a4cbb18d" +dependencies = [ + "serde", + "typeid", +] + +[[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 = "fancy-regex" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7493d4c459da9f84325ad297371a6b2b8a162800873a22e3b6b6512e61d18c05" +dependencies = [ + "bit-set", + "regex", +] + +[[package]] +name = "fancy-regex" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "531e46835a22af56d1e3b66f04844bed63158bc094a628bec1d321d9b4c44bf2" +dependencies = [ + "bit-set", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "fastrand" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" + +[[package]] +name = "flate2" +version = "1.0.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + +[[package]] +name = "form_urlencoded" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "getrandom" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" +dependencies = [ + "cfg-if", + "js-sys", + "libc", + "wasi", + "wasm-bindgen", +] + +[[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 = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + +[[package]] +name = "idna" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[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", + "unicode-width", +] + +[[package]] +name = "instant" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" +dependencies = [ + "cfg-if", +] + +[[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 = "itoa" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" + +[[package]] +name = "js-sys" +version = "0.3.70" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "lazy_static" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" + +[[package]] +name = "libc" +version = "0.2.158" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" + +[[package]] +name = "libredox" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" +dependencies = [ + "bitflags 2.6.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 = "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.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" + +[[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 = "memchr" +version = "2.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" + +[[package]] +name = "memo-map" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38d1115007560874e373613744c6fba374c17688327a71c1476d1a5954cc857b" + +[[package]] +name = "minijinja" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d7d3e3a3eece1fa4618237ad41e1de855ced47eab705cec1c9a920e1d1c5aad" +dependencies = [ + "aho-corasick", + "memo-map", + "self_cell", + "serde", + "serde_json", + "unicase", + "unicode-ident", + "v_htmlescape", +] + +[[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.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" +dependencies = [ + "adler2", +] + +[[package]] +name = "mlua" +version = "0.10.0-beta.1" +source = "git+https://github.com/mlua-rs/mlua.git?branch=main#1634c43f0afaf7a71dc555cb6b3624250e5ff209" +dependencies = [ + "bstr", + "erased-serde", + "mlua-sys", + "mlua_derive", + "num-traits", + "parking_lot", + "rustc-hash 2.0.0", + "serde", + "serde-value", +] + +[[package]] +name = "mlua-sys" +version = "0.6.2" +source = "git+https://github.com/mlua-rs/mlua.git?branch=main#1634c43f0afaf7a71dc555cb6b3624250e5ff209" +dependencies = [ + "cc", + "cfg-if", + "pkg-config", +] + +[[package]] +name = "mlua_derive" +version = "0.9.3" +source = "git+https://github.com/mlua-rs/mlua.git?branch=main#1634c43f0afaf7a71dc555cb6b3624250e5ff209" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[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", +] + +[[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 = "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.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" +dependencies = [ + "autocfg", +] + +[[package]] +name = "number_prefix" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" + +[[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.66" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" +dependencies = [ + "bitflags 2.6.0", + "cfg-if", + "foreign-types", + "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", +] + +[[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.103" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" +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 = "ordered-float" +version = "2.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68f19d67e5a2795c94e73e0bb1cc1a7edeb2e28efd39e2e1c9b7a40c1108b11c" +dependencies = [ + "num-traits", +] + +[[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", + "smallvec", + "windows-targets 0.52.6", +] + +[[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 = "pkg-config" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" + +[[package]] +name = "portable-atomic" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265" + +[[package]] +name = "ppv-lite86" +version = "0.2.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +dependencies = [ + "zerocopy", +] + +[[package]] +name = "proc-macro2" +version = "1.0.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" +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 = "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 = "redox_syscall" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" +dependencies = [ + "bitflags 2.6.0", +] + +[[package]] +name = "redox_users" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" +dependencies = [ + "getrandom", + "libredox", + "thiserror", +] + +[[package]] +name = "regex" +version = "1.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[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", +] + +[[package]] +name = "regex-syntax" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" + +[[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 = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + +[[package]] +name = "rustc-hash" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152" + +[[package]] +name = "rustix" +version = "0.38.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a85d50532239da68e9addb745ba38ff4612a242c1c7ceea689c4bc7c2f43c36f" +dependencies = [ + "bitflags 2.6.0", + "errno", + "libc", + "linux-raw-sys", + "windows-sys 0.52.0", +] + +[[package]] +name = "rustls" +version = "0.23.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044" +dependencies = [ + "log", + "once_cell", + "ring", + "rustls-pki-types", + "rustls-webpki", + "subtle", + "zeroize", +] + +[[package]] +name = "rustls-pki-types" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0" + +[[package]] +name = "rustls-webpki" +version = "0.102.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84678086bd54edf2b415183ed7a94d0efb049f1b646a33e22a36f3794be6ae56" +dependencies = [ + "ring", + "rustls-pki-types", + "untrusted", +] + +[[package]] +name = "ryu" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" + +[[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.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" +dependencies = [ + "bitflags 2.6.0", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "self_cell" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d369a96f978623eb3dc28807c4852d6cc617fed53da5d3c400feff1ef34a714a" + +[[package]] +name = "serde" +version = "1.0.209" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde-value" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3a1a3341211875ef120e117ea7fd5228530ae7e7036a779fdc9117be6b3282c" +dependencies = [ + "ordered-float", + "serde", +] + +[[package]] +name = "serde_derive" +version = "1.0.209" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_json" +version = "1.0.127" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad" +dependencies = [ + "itoa", + "memchr", + "ryu", + "serde", +] + +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + +[[package]] +name = "smallvec" +version = "1.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" + +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" + +[[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 = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + +[[package]] +name = "subtle" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" + +[[package]] +name = "syn" +version = "2.0.77" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "tempfile" +version = "3.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" +dependencies = [ + "cfg-if", + "fastrand", + "once_cell", + "rustix", + "windows-sys 0.59.0", +] + +[[package]] +name = "thiserror" +version = "1.0.63" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.63" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "tiktoken-rs" +version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c314e7ce51440f9e8f5a497394682a57b7c323d0f4d0a6b1b13c429056e0e234" +dependencies = [ + "anyhow", + "base64 0.21.7", + "bstr", + "fancy-regex 0.12.0", + "lazy_static", + "parking_lot", + "rustc-hash 1.1.0", +] + +[[package]] +name = "tinyvec" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + +[[package]] +name = "tokenizers" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8a24d7f7d6be5b9d1377418b893ab1808af0074f5d1bb2c64784452ddd2aa70" +dependencies = [ + "aho-corasick", + "derive_builder", + "esaxx-rs", + "fancy-regex 0.13.0", + "getrandom", + "hf-hub", + "itertools 0.12.1", + "lazy_static", + "log", + "macro_rules_attribute", + "monostate", + "onig", + "paste", + "rand", + "rayon", + "rayon-cond", + "regex", + "regex-syntax", + "serde", + "serde_json", + "spm_precompiled", + "thiserror", + "unicode-normalization-alignments", + "unicode-segmentation", + "unicode_categories", +] + +[[package]] +name = "typeid" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e13db2e0ccd5e14a544e8a246ba2312cd25223f616442d7f2cb0e3db614236e" + +[[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-bidi" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" + +[[package]] +name = "unicode-ident" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + +[[package]] +name = "unicode-normalization" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" +dependencies = [ + "tinyvec", +] + +[[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 = "untrusted" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + +[[package]] +name = "ureq" +version = "2.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b74fc6b57825be3373f7054754755f03ac3a8f5d70015ccad699ba2029956f4a" +dependencies = [ + "base64 0.22.1", + "flate2", + "log", + "native-tls", + "once_cell", + "rustls", + "rustls-pki-types", + "serde", + "serde_json", + "url", + "webpki-roots", +] + +[[package]] +name = "url" +version = "2.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", +] + +[[package]] +name = "v_htmlescape" +version = "0.15.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e8257fbc510f0a46eb602c10215901938b5c2a7d5e70fc11483b1d3c9b5b18c" + +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[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.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" +dependencies = [ + "cfg-if", + "once_cell", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.93" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" + +[[package]] +name = "webpki-roots" +version = "0.26.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bd24728e5af82c6c4ec1b66ac4844bdf8156257fccda846ec58b42cd0cdbe6a" +dependencies = [ + "rustls-pki-types", +] + +[[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.6", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", +] + +[[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.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +dependencies = [ + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", +] + +[[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.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" + +[[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.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + +[[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.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" + +[[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.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + +[[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.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" + +[[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.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + +[[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.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" + +[[package]] +name = "zerocopy" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +dependencies = [ + "byteorder", + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "zeroize" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" diff --git a/pkgs/applications/editors/vim/plugins/avante-nvim/default.nix b/pkgs/applications/editors/vim/plugins/avante-nvim/default.nix new file mode 100644 index 0000000000000..f3218a0f2ea49 --- /dev/null +++ b/pkgs/applications/editors/vim/plugins/avante-nvim/default.nix @@ -0,0 +1,75 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + openssl, + stdenv, + vimUtils, + darwin, +}: + +let + version = "2024-09-15"; + + src = fetchFromGitHub { + owner = "yetone"; + repo = "avante.nvim"; + rev = "f9520c4fdfed08e9cc609d6cd319b358e4ea33a5"; + hash = "sha256-8zTDGPnhNI2rQA0uJc8gQRj4JCyg+IkO/D3oHYy4f9U="; + }; + + meta = with lib; { + description = "Neovim plugin designed to emulate the behaviour of the Cursor AI IDE"; + homepage = "https://github.com/yetone/avante.nvim"; + license = licenses.asl20; + maintainers = with lib.maintainers; [ + ttrei + aarnphm + ]; + }; + + avante-nvim-lib = rustPlatform.buildRustPackage { + pname = "avante-nvim-lib"; + inherit version src meta; + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "mlua-0.10.0-beta.1" = "sha256-ZEZFATVldwj0pmlmi0s5VT0eABA15qKhgjmganrhGBY="; + }; + }; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = + [ + openssl + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; + + buildFeatures = [ "luajit" ]; + }; +in + +vimUtils.buildVimPlugin { + pname = "avante.nvim"; + inherit version src meta; + + postInstall = + let + ext = stdenv.hostPlatform.extensions.sharedLibrary; + in + '' + mkdir -p $out/build + ln -s ${avante-nvim-lib}/lib/libavante_templates${ext} $out/build/avante_templates${ext} + ln -s ${avante-nvim-lib}/lib/libavante_tokenizers${ext} $out/build/avante_tokenizers${ext} + ''; + + doInstallCheck = true; + # TODO: enable after https://github.com/NixOS/nixpkgs/pull/342240 merged + # nvimRequireCheck = "avante"; +} diff --git a/pkgs/applications/editors/vim/plugins/default.nix b/pkgs/applications/editors/vim/plugins/default.nix index e557cd7effe3a..fd821bbec9701 100644 --- a/pkgs/applications/editors/vim/plugins/default.nix +++ b/pkgs/applications/editors/vim/plugins/default.nix @@ -1,7 +1,7 @@ # TODO check that no license information gets lost { callPackage, config, lib, vimUtils, vim, darwin, llvmPackages +, neovim-unwrapped , neovimUtils -, luaPackages }: let @@ -27,7 +27,7 @@ let overrides = callPackage ./overrides.nix { inherit (darwin.apple_sdk.frameworks) Cocoa CoreFoundation CoreServices; inherit buildVimPlugin; - inherit llvmPackages luaPackages; + inherit llvmPackages; }; aliases = if config.allowAliases then (import ./aliases.nix lib) else final: prev: {}; diff --git a/pkgs/applications/editors/vim/plugins/deprecated.json b/pkgs/applications/editors/vim/plugins/deprecated.json index d679dfed6db4c..05678e61362b5 100644 --- a/pkgs/applications/editors/vim/plugins/deprecated.json +++ b/pkgs/applications/editors/vim/plugins/deprecated.json @@ -1,18 +1,18 @@ { "TrueZen-nvim": { - "date": "2022-09-02", + "date": "2022-07-27", "new": "true-zen-nvim" }, "compe-tmux": { - "date": "2021-12-21", + "date": "2021-12-07", "new": "cmp-tmux" }, "fern-vim": { - "date": "2024-05-28", + "date": "2024-05-12", "new": "vim-fern" }, "gina-vim": { - "date": "2024-06-19", + "date": "2024-05-12", "new": "vim-gina" }, "gist-vim": { @@ -24,7 +24,7 @@ "new": "lspsaga-nvim" }, "lua-dev-nvim": { - "date": "2022-10-20", + "date": "2022-10-14", "new": "neodev-nvim" }, "nvchad-extensions": { @@ -32,7 +32,7 @@ "new": "nvchad-ui" }, "nvim-base16": { - "date": "2024-03-16", + "date": "2024-02-15", "new": "base16-nvim" }, "nvim-bufferline-lua": { @@ -51,6 +51,10 @@ "date": "2021-11-28", "new": "orgmode" }, + "render-markdown": { + "date": "2024-09-16", + "new": "render-markdown-nvim" + }, "sql-nvim": { "date": "2021-09-03", "new": "sqlite-lua" @@ -59,8 +63,12 @@ "date": "2024-05-12", "new": "vim-suda" }, + "taskwarrior": { + "date": "2024-08-13", + "new": "taskwarrior3 or taskwarrior2" + }, "vim-fsharp": { - "date": "2024-06-19", + "date": "2024-03-16", "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 1a5d3f50044e7..a474cdd1ac01b 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-08-26"; src = fetchFromGitHub { owner = "jackMort"; repo = "ChatGPT.nvim"; - rev = "df53728e05129278d6ea26271ec086aa013bed90"; - sha256 = "0yh7awf26cqfndhliizi0mfqj2111hicg3hlqjjiag96qq9csgdw"; + rev = "4d9d297c2409c8ebc715da7f1d7705a221564555"; + sha256 = "0i4ras7n66i4h64bb0v70v85b70d0rw33hy16kgyr20b6qkm53vm"; }; meta.homepage = "https://github.com/jackMort/ChatGPT.nvim/"; }; @@ -65,24 +65,24 @@ final: prev: CopilotChat-nvim = buildVimPlugin { pname = "CopilotChat.nvim"; - version = "2024-05-31"; + version = "2024-09-17"; src = fetchFromGitHub { owner = "CopilotC-Nvim"; repo = "CopilotChat.nvim"; - rev = "82923efe22b604cf9c0cad0bb2a74aa9247755ab"; - sha256 = "0dh4hy62xjd8kjnmcflrsdj02b6wrakzppcawfj8r7w1nnbsmlbd"; + rev = "2352cd3e7e980cd73594be05f96b2dc4c0dd4a74"; + sha256 = "0pwrrm2p2bdxsd622smvx5q6ppsi590s5vyqzrs6yzkb7n2pnik6"; }; meta.homepage = "https://github.com/CopilotC-Nvim/CopilotChat.nvim/"; }; Coqtail = buildVimPlugin { pname = "Coqtail"; - version = "2024-06-15"; + version = "2024-09-17"; src = fetchFromGitHub { owner = "whonore"; repo = "Coqtail"; - rev = "a36352930b5e5f8d33dda09eef0c9d7c96190a02"; - sha256 = "07vy515qgfc6f1y96dn0ykm0kh3ylkhf6igb23f4jv608ylz4f12"; + rev = "299d0acdb9b697fd951df81a5d67e3f5cb6ed4f9"; + sha256 = "1z7gwpy14h1icsxfz67nzj56fn2gwxa0bf49rw24kfwnr1zbw75r"; }; meta.homepage = "https://github.com/whonore/Coqtail/"; }; @@ -137,12 +137,12 @@ final: prev: Ionide-vim = buildVimPlugin { pname = "Ionide-vim"; - version = "2024-05-24"; + version = "2024-09-03"; src = fetchFromGitHub { owner = "ionide"; repo = "Ionide-vim"; - rev = "00099c3cf53cba28a1d8084ab8d21639c62bd747"; - sha256 = "1c3fzc87468zcl2fk6av0fl848sp82wpr9rdc4yc3l33p2mxqqy9"; + rev = "268955cc106f8328a232b160a7360cf331c0a323"; + sha256 = "0lyd719p621v0n9pm7c1nvrfccfmssdipn9fzxcds0hw4janhjml"; }; meta.homepage = "https://github.com/ionide/Ionide-vim/"; }; @@ -185,24 +185,24 @@ final: prev: LazyVim = buildVimPlugin { pname = "LazyVim"; - version = "2024-06-18"; + version = "2024-09-18"; src = fetchFromGitHub { owner = "LazyVim"; repo = "LazyVim"; - rev = "67eece6d74f071035ca7b934a753d71d1677dd9b"; - sha256 = "15r8n3ch609lifv8lvyis5kn663c6jjj4zkzhyn4v4cxcxj3lb5d"; + rev = "a1c3ec4cd43fe61e3b614237a46ac92771191c81"; + sha256 = "1d7iqdfyqg09m0mxixz4lya669ys4gvplls8x3k4a7c2rad93gp3"; }; meta.homepage = "https://github.com/LazyVim/LazyVim/"; }; LeaderF = buildVimPlugin { pname = "LeaderF"; - version = "2024-06-19"; + version = "2024-09-23"; src = fetchFromGitHub { owner = "Yggdroot"; repo = "LeaderF"; - rev = "11c08af2ae56fac83772d21aa5133913784ca2c4"; - sha256 = "1yld7h2s1yr5l65iagk51xx4znf1vh5m7c5c4gmmp5zr2px0bn8b"; + rev = "74f3042368b547d481fc08464e9f42c5ddc79b15"; + sha256 = "1qkhydsdzn9909yvyx1mqam91habdsbfxda0fwnnvv1437a214sg"; }; 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-09-23"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "35f36c50b9f1e1e916d0e3f004cb48dffd2bf737"; - sha256 = "0a3488c74hrykcmharzza5svy9c0smw9yzafpdsgw10adav2mxqb"; + rev = "efa0466f9f7971256ad5da010832180fc7d8996b"; + sha256 = "0lncv6w1bk7n3azibvdn6jnqif94mqsfs7rxfs9cqyvnpqkrda53"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -389,12 +401,12 @@ final: prev: SpaceVim = buildVimPlugin { pname = "SpaceVim"; - version = "2024-06-02"; + version = "2024-09-17"; src = fetchFromGitHub { owner = "SpaceVim"; repo = "SpaceVim"; - rev = "af055c0c73e4d49c57acbb40d9f6e248f2a38d52"; - sha256 = "1ngh7m1mkam8vavpzgym3nii25ivw2b557hj72mi2j1f18xgvf90"; + rev = "533c40395c2073340a613f9569b4d20ab84d498a"; + sha256 = "0750hgh193avdwlnm4k9sa2rg27vsirrn79dda48hbiss1x8sn69"; }; meta.homepage = "https://github.com/SpaceVim/SpaceVim/"; }; @@ -425,12 +437,12 @@ final: prev: Vundle-vim = buildVimPlugin { pname = "Vundle.vim"; - version = "2023-08-19"; + version = "2024-07-30"; src = fetchFromGitHub { owner = "VundleVim"; repo = "Vundle.vim"; - rev = "0765c5c4f485fa111f190e2d7dd89ec9f5b3f554"; - sha256 = "0km5kpv9zgnaw1dyxhcksll2snl95mb4sahj0ffx5id7x5j4sqkc"; + rev = "5548a1a937d4e72606520c7484cd384e6c76b565"; + sha256 = "0lfhsxp9h235rdj0wsn5fnwqmyjcciwqvv1l8ibfg75icmgjlwhf"; }; meta.homepage = "https://github.com/VundleVim/Vundle.vim/"; }; @@ -461,12 +473,12 @@ final: prev: YouCompleteMe = buildVimPlugin { pname = "YouCompleteMe"; - version = "2024-03-20"; + version = "2024-09-14"; src = fetchFromGitHub { owner = "ycm-core"; repo = "YouCompleteMe"; - rev = "4556062839aa2e86f2f4f1c0b4532697d607af23"; - sha256 = "14391a213340agjafvraw1az21vj940y7ddwqwbbsrj4q18si7av"; + rev = "63ab13e95141c252c545f9a6c7144ced6790d68f"; + sha256 = "0v7xb149q9wvmd7arin397415bl6rrscgipwcb46wmjm08qzwjyp"; fetchSubmodules = true; }; meta.homepage = "https://github.com/ycm-core/YouCompleteMe/"; @@ -520,6 +532,18 @@ final: prev: meta.homepage = "https://github.com/aznhe21/actions-preview.nvim/"; }; + advanced-git-search-nvim = buildVimPlugin { + pname = "advanced-git-search.nvim"; + version = "2024-09-02"; + src = fetchFromGitHub { + owner = "aaronhallaert"; + repo = "advanced-git-search.nvim"; + rev = "1c5a10f5c838cfad2c17d7464311d6fb416cb319"; + sha256 = "0yhp2szjm62x27iprz50pxfp048m71xj1pwdg41z07vhf4vxqpv0"; + }; + meta.homepage = "https://github.com/aaronhallaert/advanced-git-search.nvim/"; + }; + adwaita-nvim = buildVimPlugin { pname = "adwaita.nvim"; version = "2024-04-28"; @@ -534,12 +558,12 @@ final: prev: aerial-nvim = buildVimPlugin { pname = "aerial.nvim"; - version = "2024-06-17"; + version = "2024-09-17"; src = fetchFromGitHub { owner = "stevearc"; repo = "aerial.nvim"; - rev = "eb25396dae306cef5b8fffbe9ae98283d2f1c199"; - sha256 = "1byzkpcc77a2zwlypgmcmzik816i4qcaydb8ssy0vxrf3nsjx9s4"; + rev = "140f48fb068d21c02e753c63f7443649e55576f0"; + sha256 = "0ba4xd4jqn34vm5n2327awmxv2xz060mfi6zzwja89z5jrkzna7d"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/aerial.nvim/"; @@ -581,6 +605,18 @@ final: prev: meta.homepage = "https://github.com/aduros/ai.vim/"; }; + aider-nvim = buildVimPlugin { + pname = "aider.nvim"; + version = "2023-10-22"; + src = fetchFromGitHub { + owner = "joshuavial"; + repo = "aider.nvim"; + rev = "74a01227271d0ea211f2edafa82028b22d4c2022"; + sha256 = "jkco90IF948LuRILP3Bog3GelUGOQzsEw2jP4f9Ghbw="; + }; + meta.homepage = "https://github.com/joshuavial/aider.nvim/"; + }; + alchemist-vim = buildVimPlugin { pname = "alchemist.vim"; version = "2023-09-01"; @@ -595,12 +631,12 @@ final: prev: ale = buildVimPlugin { pname = "ale"; - version = "2024-06-02"; + version = "2024-09-05"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "c7c41e157478fc9d4f65e9f640bfce75fa211fd7"; - sha256 = "1g7q3nc0y0k1hwg22mqcwypsriss6q12bx1d653sg5jsm7l8lrck"; + rev = "a7ef1817b7aa06d0f80952ad530be87ad3c8f6e2"; + sha256 = "0sd8ygz6g1l80h108lhzjl6cmv5wl490z69ybzlxp9xywkhp5nah"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -619,12 +655,12 @@ final: prev: alpha-nvim = buildVimPlugin { pname = "alpha-nvim"; - version = "2024-02-25"; + version = "2024-08-19"; src = fetchFromGitHub { owner = "goolord"; repo = "alpha-nvim"; - rev = "41283fb402713fc8b327e60907f74e46166f4cfd"; - sha256 = "1a3spwcypcrjv9md58h4vxh4bjfz25fc1lkpp0zypmnykwllydci"; + rev = "b6f4129302db197a7249e67a90de3f2b676de13e"; + sha256 = "1zvzavhvpdf5xm4lcz43d7zqkpicam3gydxgy389xs9p6fdc9ww2"; }; meta.homepage = "https://github.com/goolord/alpha-nvim/"; }; @@ -643,12 +679,12 @@ final: prev: aniseed = buildVimPlugin { pname = "aniseed"; - version = "2023-07-06"; + version = "2024-08-09"; src = fetchFromGitHub { owner = "Olical"; repo = "aniseed"; - rev = "7bc09736f3651c10d29b82d1a465b7f540614be1"; - sha256 = "19r8kvrl8nghk9f5wdig26kj51p3dbp0g73gcvn07sjpchbb2fm0"; + rev = "d558a68329c465bced901adf3238a6f946d62483"; + sha256 = "0dwzxbf0xdlspwynx37y7zwfzi5ng09crlywpymbj9lpdpyfy14p"; }; meta.homepage = "https://github.com/Olical/aniseed/"; }; @@ -703,24 +739,24 @@ final: prev: arrow-nvim = buildVimPlugin { pname = "arrow.nvim"; - version = "2024-05-28"; + version = "2024-09-21"; src = fetchFromGitHub { owner = "otavioschwanck"; repo = "arrow.nvim"; - rev = "0b0191d967d9fd837a850f2ccaa95d5917239404"; - sha256 = "13brj1c482nag37wik4c61y2cb771yg9vkshqi3irqlzbyf1bhqb"; + rev = "5952360b09a6bcc01718d0d00655d3c17ee51783"; + sha256 = "1cglfx99qc2phylydqph4md02kfsi8rzq5dk1iny8b4sghq46zd6"; }; meta.homepage = "https://github.com/otavioschwanck/arrow.nvim/"; }; astrotheme = buildVimPlugin { pname = "astrotheme"; - version = "2024-06-17"; + version = "2024-09-16"; src = fetchFromGitHub { owner = "AstroNvim"; repo = "astrotheme"; - rev = "ab0cb19c32181126f92b8239700cec97ba81b0fd"; - sha256 = "187glbn1lysawl4rs9rzvzqwd26yl6kkc72sabx1hs9wn3xl3x0i"; + rev = "bc7e4407b553019a54dca4f8c4276d45ab349be8"; + sha256 = "1rcf3s1dhqfl4svvcx5kydfpynd01d8ac6c76phca6qph4622cmv"; }; meta.homepage = "https://github.com/AstroNvim/astrotheme/"; }; @@ -823,24 +859,24 @@ final: prev: asyncrun-vim = buildVimPlugin { pname = "asyncrun.vim"; - version = "2024-05-22"; + version = "2024-09-22"; src = fetchFromGitHub { owner = "skywind3000"; repo = "asyncrun.vim"; - rev = "182c636909cfd41e1d72e1278a7db6a4e5271b81"; - sha256 = "0mbr0abpwj45bnc3riv3mgfj9ic3xjbxkgwmkzjrr42zw208rki5"; + rev = "09b8117fe607941c0abff39b194074e40a3dee88"; + sha256 = "1ipq20nk1npx5krpjs2rf6fda9sc1lxr69pnm8afbjhfj1c7sqhj"; }; meta.homepage = "https://github.com/skywind3000/asyncrun.vim/"; }; asynctasks-vim = buildVimPlugin { pname = "asynctasks.vim"; - version = "2024-06-18"; + version = "2024-08-20"; src = fetchFromGitHub { owner = "skywind3000"; repo = "asynctasks.vim"; - rev = "2604a6dd7348cff5bbca869ba68170f67b48159a"; - sha256 = "033x1z1jr2s6cv0ff98qjqn62vz82isajbxbb4hbyihhk4d0zka5"; + rev = "f54112f6973f1e2b5027c4448888fd466bd3a1ed"; + sha256 = "06c102rnsfvwffpw3b9z1890nj9xa75cqmbf6d0wmknda7hfzgcl"; }; meta.homepage = "https://github.com/skywind3000/asynctasks.vim/"; }; @@ -859,12 +895,12 @@ final: prev: aurora = buildVimPlugin { pname = "aurora"; - version = "2024-06-14"; + version = "2024-07-21"; src = fetchFromGitHub { owner = "ray-x"; repo = "aurora"; - rev = "31fc4eb67afca6d88a98cb9a17c206d72224423e"; - sha256 = "13h8xf5f5ny2rc50z1v1kbrypx9xlbfg2l0pafkg9m05w70kmc93"; + rev = "af3e80a8ca4f9a6e3bd40e2ba12073c1d0041a81"; + sha256 = "0kg6v5jg3am5www5pawv4y5m2h40njsi7mk8407alix2z19kp27n"; }; meta.homepage = "https://github.com/ray-x/aurora/"; }; @@ -883,12 +919,12 @@ final: prev: auto-hlsearch-nvim = buildVimPlugin { pname = "auto-hlsearch.nvim"; - version = "2023-03-04"; + version = "2024-08-23"; src = fetchFromGitHub { owner = "asiryk"; repo = "auto-hlsearch.nvim"; - rev = "8f28246d53e9478717ca3b51c8112083fbebd7e3"; - sha256 = "1v6d15swvbxzq0rqx543bbpy64jm7w2vj6di8qad0a58s9v68aq2"; + rev = "77502069b22e48ab7736fe9cf53e1fdac1923bca"; + sha256 = "1lvr0129fgadjavw9nwmxfvba90sqim3np7nankrk7wb6rziwss9"; }; meta.homepage = "https://github.com/asiryk/auto-hlsearch.nvim/"; }; @@ -919,24 +955,24 @@ final: prev: auto-session = buildVimPlugin { pname = "auto-session"; - version = "2024-05-21"; + version = "2024-09-20"; src = fetchFromGitHub { owner = "rmagatti"; repo = "auto-session"; - rev = "af2219b9fa99c1d7ac409bd9eac094c459d3f52d"; - sha256 = "16qs3xqlfcdcrd9phyf180hhcp28cc4z2lsg68zr3jhdlyls6yxj"; + rev = "0caedb838e3cace2eaf52696ec7c8b6000f9ee30"; + sha256 = "1hrw70npsbikk38f58wz2sipsmhx4jn5g0s4k0l7vbl98ghvh7vk"; }; meta.homepage = "https://github.com/rmagatti/auto-session/"; }; autoclose-nvim = buildVimPlugin { pname = "autoclose.nvim"; - version = "2024-02-23"; + version = "2024-07-21"; src = fetchFromGitHub { owner = "m4xshen"; repo = "autoclose.nvim"; - rev = "dc42806540dcf448ecb2bad6b67204410cfbe629"; - sha256 = "03l4az5xccx941sbw2qx7s8aziydiad2pc75jki1mlbgs7sdbhwi"; + rev = "b2077aa2c83df7ebc19b2a20a3a0654b24ae9c8f"; + sha256 = "0qsaiwn3fznzzda9xw0v4ss6cyhladiwikslbnh0w29qz732g0lq"; }; meta.homepage = "https://github.com/m4xshen/autoclose.nvim/"; }; @@ -1003,12 +1039,12 @@ final: prev: ayu-vim = buildVimPlugin { pname = "ayu-vim"; - version = "2020-05-29"; + version = "2024-07-15"; src = fetchFromGitHub { owner = "ayu-theme"; repo = "ayu-vim"; - rev = "0745635421688ce777f663d13531996cb4da6514"; - sha256 = "0w7ixhz72g3lr1hkn450k6x8sdgv95pp6pxbykka3s01i506rzmj"; + rev = "01faacb4cb76e8cf72ad9858c581d80876260ab3"; + sha256 = "0z94mdjba5n3nva9qcv3ma4s1qdb8q39azd1ka014cyb62nnjnw4"; }; meta.homepage = "https://github.com/ayu-theme/ayu-vim/"; }; @@ -1027,12 +1063,12 @@ final: prev: baleia-nvim = buildVimPlugin { pname = "baleia.nvim"; - version = "2024-05-31"; + version = "2024-07-24"; src = fetchFromGitHub { owner = "m00qek"; repo = "baleia.nvim"; - rev = "4d3b27dbec65a44ceecd9306f605a980bcf4e9b1"; - sha256 = "095jjam8x5xpr2q8xnvl479i4hc2s7zz2vqcgfk5mv60f52k35h0"; + rev = "1b25eac3ac03659c3d3af75c7455e179e5f197f7"; + sha256 = "194hg3habfymcbv8sg8pzv8ajniwaqc77kf6a128hz81f11mskdp"; fetchSubmodules = true; }; meta.homepage = "https://github.com/m00qek/baleia.nvim/"; @@ -1040,36 +1076,36 @@ final: prev: bamboo-nvim = buildVimPlugin { pname = "bamboo.nvim"; - version = "2024-06-18"; + version = "2024-09-20"; src = fetchFromGitHub { owner = "ribru17"; repo = "bamboo.nvim"; - rev = "a1b2661f3cb248ae4fafc0cc50ca2588532e231d"; - sha256 = "0f004i98g6jvgnl561bmhzga09gdh1nizk95ahyyg6y5bkqkbrn8"; + rev = "c245d90c490c681470389e28782b161491bec97c"; + sha256 = "1nycgf8lrvjsswr0z60kbi6s1c14fgzmichmyymm4100ywyp4k6s"; }; meta.homepage = "https://github.com/ribru17/bamboo.nvim/"; }; barbar-nvim = buildVimPlugin { pname = "barbar.nvim"; - version = "2024-05-28"; + version = "2024-09-18"; src = fetchFromGitHub { owner = "romgrk"; repo = "barbar.nvim"; - rev = "d181f2cfd4b828f9c6f1e10e69c68241de59f54f"; - sha256 = "1qxhi60h5vy3ygm66i18122ib1xr01l8m6jn43bfav6x74jdr3si"; + rev = "a3ebfe0c382fc5393b3c0cef96d58c6c49492562"; + sha256 = "1ig2s8zglqkca934ikij17jbblfrzpsrfbjsxs46a3rdgf51pr18"; }; meta.homepage = "https://github.com/romgrk/barbar.nvim/"; }; barbecue-nvim = buildVimPlugin { pname = "barbecue.nvim"; - version = "2023-09-13"; + version = "2024-08-20"; src = fetchFromGitHub { owner = "utilyre"; repo = "barbecue.nvim"; - rev = "d38a2a023dfb1073dd0e8fee0c9be08855d3688f"; - sha256 = "0z1m3myl14g91nnamqa72yxq6pspaffn0zpfi78vy6y0ygzam51x"; + rev = "3e31404f0b93a2c30d151abf0648650ac811c664"; + sha256 = "0pw2jx616zanjrh0njw69l4x4xrgsdz4q5q0b4vi8nfl0lvqdvsi"; }; meta.homepage = "https://github.com/utilyre/barbecue.nvim/"; }; @@ -1100,12 +1136,12 @@ final: prev: base46 = buildVimPlugin { pname = "base46"; - version = "2024-06-02"; + version = "2024-09-21"; src = fetchFromGitHub { owner = "nvchad"; repo = "base46"; - rev = "87e09eb9e959966397bd9d8aab18d88ef349c913"; - sha256 = "1j2hm9400dlynkzxyxqzp4rz4kxjai5hiqv4b3lxg21g49lq5aa6"; + rev = "82d71bc6def6a752cbf5fbd0e496aea5f088d940"; + sha256 = "065zg8m7mlhv68145yf7ar3afj3p6q959b0jrb6j93lkvfrhdzwj"; }; meta.homepage = "https://github.com/nvchad/base46/"; }; @@ -1148,12 +1184,12 @@ final: prev: better-escape-nvim = buildVimPlugin { pname = "better-escape.nvim"; - version = "2024-01-21"; + version = "2024-08-31"; src = fetchFromGitHub { owner = "max397574"; repo = "better-escape.nvim"; - rev = "7e86edafb8c7e73699e0320f225464a298b96d12"; - sha256 = "14srra6hx5wpr4kcvfmg0bj5zljl7lr6ahq40wnwghdvy06ck5x2"; + rev = "bb197e51a91a635deb88630813c3bfc284413697"; + sha256 = "12nn87w12v9b2l86x2q55kqw5nqixyz6qqpcy8vb7d1rmj5v7j2j"; }; meta.homepage = "https://github.com/max397574/better-escape.nvim/"; }; @@ -1208,12 +1244,12 @@ final: prev: bluloco-nvim = buildVimPlugin { pname = "bluloco.nvim"; - version = "2024-06-14"; + version = "2024-07-18"; src = fetchFromGitHub { owner = "uloco"; repo = "bluloco.nvim"; - rev = "e7586def35c3584f1cc71fecf3e89e53dc4a40c6"; - sha256 = "030n232cbf5fhwddf59fv4jqqwsvbks7a0xksd14sccp8p1d92gc"; + rev = "07f4b5cca8cfe31aad69ab5c1be0f6a0715a8d2e"; + sha256 = "1z998g3b2gffbq1ykialcfc7w9giyljdnsxrm4ylifr0b0312sfg"; }; meta.homepage = "https://github.com/uloco/bluloco.nvim/"; }; @@ -1280,12 +1316,12 @@ final: prev: bufexplorer = buildVimPlugin { pname = "bufexplorer"; - version = "2024-05-30"; + version = "2024-08-13"; src = fetchFromGitHub { owner = "jlanzarotta"; repo = "bufexplorer"; - rev = "2308e87960c05bd8da7bbf62c903e1f42d6cc9b9"; - sha256 = "1ss3vshlsrfyrnn3fadhfp49zc0w70r6wzjaww2d8jqw7afwlx5x"; + rev = "fcf3a65a69020f0f54be8fa925f841874a5f3a01"; + sha256 = "0nbskarlk7byghv3w852hlsmc3rylw43x873a4n2nszywc50zahk"; }; meta.homepage = "https://github.com/jlanzarotta/bufexplorer/"; }; @@ -1304,12 +1340,12 @@ final: prev: bufferline-nvim = buildVimPlugin { pname = "bufferline.nvim"; - version = "2024-05-24"; + version = "2024-07-18"; src = fetchFromGitHub { owner = "akinsho"; repo = "bufferline.nvim"; - rev = "99337f63f0a3c3ab9519f3d1da7618ca4f91cffe"; - sha256 = "00rvijzj17449zmsiqwp8ybcsdd84frny3kl3b7wm57bbiis9w7h"; + rev = "0b2fd861eee7595015b6561dade52fb060be10c4"; + sha256 = "068gg98w88q0j3c1wrlggsp0986yppa8vlbnzy7wy4g7kn0aqfsn"; }; meta.homepage = "https://github.com/akinsho/bufferline.nvim/"; }; @@ -1328,12 +1364,12 @@ final: prev: bullets-vim = buildVimPlugin { pname = "bullets.vim"; - version = "2024-04-21"; + version = "2024-08-04"; src = fetchFromGitHub { owner = "bullets-vim"; repo = "bullets.vim"; - rev = "448ad2a159c5f2540f6c9738f3bb9e6f15a41734"; - sha256 = "19anlq6kjlbmhzr2sqqykxfksflkfij10kj82cxlj47r7nqzjgpf"; + rev = "2253f970e54320dbd76fd6bb4f5a0bf2436ce232"; + sha256 = "0yw83r4y774vldvycqa7knvvwmn0fpdjka4lvdfrz1m9laawpybc"; }; meta.homepage = "https://github.com/bullets-vim/bullets.vim/"; }; @@ -1376,24 +1412,36 @@ final: prev: ccc-nvim = buildVimPlugin { pname = "ccc.nvim"; - version = "2024-06-03"; + version = "2024-08-30"; src = fetchFromGitHub { owner = "uga-rosa"; repo = "ccc.nvim"; - rev = "22924b7bde685e1816140f17a897950ef82b969a"; - sha256 = "18np41as7j6axbfl5l1cv5b0xpsslfj6pcc8ih1sax4awnfbpf46"; + rev = "790aa881d7f47bc7cc07ad03f1216bb7caf9ef67"; + sha256 = "0xq64akzb1pl4cf1w73a73q1wg4d9b48k35lddg2kmm86abmsb62"; }; meta.homepage = "https://github.com/uga-rosa/ccc.nvim/"; }; + cellular-automaton-nvim = buildVimPlugin { + pname = "cellular-automaton.nvim"; + version = "2024-06-30"; + src = fetchFromGitHub { + owner = "Eandrju"; + repo = "cellular-automaton.nvim"; + rev = "11aea08aa084f9d523b0142c2cd9441b8ede09ed"; + sha256 = "0jvz2vnyhm6a2zyz93sh87n59vga2l016ijrfybfrlv44hhzp2ww"; + }; + meta.homepage = "https://github.com/Eandrju/cellular-automaton.nvim/"; + }; + chadtree = buildVimPlugin { pname = "chadtree"; - version = "2024-06-17"; + version = "2024-09-10"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "156372cb7485a49b02229bd1e3d07fccc5a1c089"; - sha256 = "1yrncyvfqa16vypdh7ay0nb7wzgidd3cxx81bc01jw4h3f1gfrx0"; + rev = "b1000e87298c31452fe9fa43397fd955daa70cd4"; + sha256 = "0gbw2i6989my9582ap79dfqiwkhlv5nm65sywvrz0sxr4nq4fsp2"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -1436,12 +1484,12 @@ final: prev: cinnamon-nvim = buildVimPlugin { pname = "cinnamon.nvim"; - version = "2024-06-19"; + version = "2024-08-07"; src = fetchFromGitHub { owner = "declancm"; repo = "cinnamon.nvim"; - rev = "513154670f9e174e0b5dc75dd0662c5da493c284"; - sha256 = "0apnz8qmj0173dw4nnxj3zjr5695f20za599pwlmfrld0nfgaqc2"; + rev = "450cb3247765fed7871b41ef4ce5fa492d834215"; + sha256 = "1vq0cab139gyix2qhmivp86fq6l4fhzn7qafphj0yjac47i11iwi"; }; meta.homepage = "https://github.com/declancm/cinnamon.nvim/"; }; @@ -1460,12 +1508,12 @@ final: prev: citruszest-nvim = buildVimPlugin { pname = "citruszest.nvim"; - version = "2024-05-28"; + version = "2024-08-28"; src = fetchFromGitHub { owner = "zootedb0t"; repo = "citruszest.nvim"; - rev = "665de14b9a61067a706a53c233e67126f7edf53e"; - sha256 = "11v9jxk4wln7i542mjswh964dsy8isanzhpy2px4pqnwaxq58cy7"; + rev = "d12c99f937114b908e935a9cda1953bb8f16bcc8"; + sha256 = "19ng4ig8jjllz8c8ji3b2qljbc53bnkrcilqpyk0rzyfpfcp81i6"; }; meta.homepage = "https://github.com/zootedb0t/citruszest.nvim/"; }; @@ -1484,12 +1532,12 @@ final: prev: clangd_extensions-nvim = buildVimPlugin { pname = "clangd_extensions.nvim"; - version = "2024-06-06"; + version = "2024-08-25"; src = fetchFromGitHub { owner = "p00f"; repo = "clangd_extensions.nvim"; - rev = "a8500531c4ed3a207e744a374ea038744a0f93eb"; - sha256 = "1y42abwy5ax64ccr90pk31gycja1yv3c6qgi0wmkfi6smmn25g0g"; + rev = "385a44f133f4145e3a3da1a2a557225dccc3e1f8"; + sha256 = "1fsc5ggzzf3gcgn87pv70wrlakl32dh5kz492m1djgr6c7gzpnnn"; }; meta.homepage = "https://github.com/p00f/clangd_extensions.nvim/"; }; @@ -1544,24 +1592,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-09-20"; src = fetchFromGitHub { owner = "Civitasv"; repo = "cmake-tools.nvim"; - rev = "09bd61415ecdba84f378fe734680f69375260985"; - sha256 = "1ygqn0qwmgq19c46aadrqb7kysmwh5igrdj5jwy79zc6f20zh3b7"; + rev = "f1f917b584127b673c25138233cebf1d61a19f35"; + sha256 = "1f7rg7ya307bpjnj7ymsj9q9m0pqhd3dql269hn1a3klpgh853f8"; }; meta.homepage = "https://github.com/Civitasv/cmake-tools.nvim/"; }; @@ -1580,35 +1628,35 @@ final: prev: cmp-ai = buildVimPlugin { pname = "cmp-ai"; - version = "2024-06-02"; + version = "2024-09-19"; src = fetchFromGitHub { owner = "tzachar"; repo = "cmp-ai"; - rev = "2b787129314c5fb8bfd41a6919d4889210e6b265"; - sha256 = "sha256-ul2X6kIdreJ9dCQERw7C3l2dss7Mtcwtm7CGhAxjjvY="; + rev = "4424e71bde8acc522ab68a122fa54b14dff3d408"; + sha256 = "0zljcdghyqwhkalir0fcy2q1zp3866qr9j2z9cj8v8z1b54rlax3"; }; meta.homepage = "https://github.com/tzachar/cmp-ai/"; }; cmp-async-path = buildVimPlugin { pname = "cmp-async-path"; - version = "2024-03-25"; + version = "2024-08-27"; src = fetchgit { url = "https://codeberg.org/FelipeLema/cmp-async-path/"; - rev = "7df7f3721c45aac26b6e0474087538f4681c9c7a"; - sha256 = "15k6q1hfv9bggzz8vh9pd5mz9vay2cr6xp7bb4iqhahsgyr9c99d"; + rev = "03fac5dfd6f7880be2c059d58bebe007f0d6d8ee"; + sha256 = "1dycqym1n4i5cxah2a151ih5k3h238vipf54d7jcr3jgx1ad8glv"; }; meta.homepage = "https://codeberg.org/FelipeLema/cmp-async-path/"; }; cmp-beancount = buildVimPlugin { pname = "cmp-beancount"; - version = "2024-06-03"; + version = "2024-07-16"; src = fetchFromGitHub { owner = "crispgm"; repo = "cmp-beancount"; - rev = "c8a2533828b84546ae279d60137aec92bd52dc72"; - sha256 = "0cc6xgy6awzjz49rmy74znrgjcq8lw6q9krz75fv9cywd7gw8r6p"; + rev = "29e23297c06b9d69771e4b14e0fb3b9d583a150e"; + sha256 = "12vh55n94klk2jc31mpgb1lap5ki4767lwrgv5zib4vs9y597pn8"; }; meta.homepage = "https://github.com/crispgm/cmp-beancount/"; }; @@ -1723,12 +1771,12 @@ final: prev: cmp-dictionary = buildVimPlugin { pname = "cmp-dictionary"; - version = "2024-03-03"; + version = "2024-07-24"; src = fetchFromGitHub { owner = "uga-rosa"; repo = "cmp-dictionary"; - rev = "3dab73d34a889eafdb57c666c3c2076b4c3e126b"; - sha256 = "08nyng2ykxnapih97m1wsj1fskjz7yb09g2mb3428l7zbvjjk3nq"; + rev = "c5ffc6afb7f3a68da981ed9c56f3d9d8f3d907b7"; + sha256 = "1shxx5h0y7rjh6bam1cckrrrqjhb2mwr85pja39p9s4zpvj0r0am"; }; meta.homepage = "https://github.com/uga-rosa/cmp-dictionary/"; }; @@ -1795,12 +1843,12 @@ final: prev: cmp-git = buildVimPlugin { pname = "cmp-git"; - version = "2024-05-28"; + version = "2024-08-20"; src = fetchFromGitHub { owner = "petertriho"; repo = "cmp-git"; - rev = "8dfbc33fb32c33e5c0be9dcc8176a4f4d395f95e"; - sha256 = "0n66skklf71sbnk2vbsx23nqhs5a920w6aphfa5f3i1vrch2rz5f"; + rev = "50d526dff0f6bc441b51fc269d9fdc99a50c76af"; + sha256 = "084mka6ar0bz7sqd8iv9nhz1y552fab6imjxzb4ak3aagzlml5r7"; }; meta.homepage = "https://github.com/petertriho/cmp-git/"; }; @@ -1927,12 +1975,12 @@ final: prev: cmp-nvim-ultisnips = buildVimPlugin { pname = "cmp-nvim-ultisnips"; - version = "2024-06-01"; + version = "2024-08-02"; src = fetchFromGitHub { owner = "quangnguyen30192"; repo = "cmp-nvim-ultisnips"; - rev = "404401792ec62d51ca2e8c279a81996082c2f937"; - sha256 = "004f53rj8037zgxf9jkkyszhsykmgdvy4mc003k7cpxsypv2gz3a"; + rev = "2be0eda0f7fbf47ebd9fbdace369cc45d57acf49"; + sha256 = "0p9jm8p1pcymahlak40bazvi6m32njn286d768pyqr342l0cw2bk"; }; meta.homepage = "https://github.com/quangnguyen30192/cmp-nvim-ultisnips/"; }; @@ -2035,12 +2083,12 @@ final: prev: cmp-tabnine = buildVimPlugin { pname = "cmp-tabnine"; - version = "2024-03-26"; + version = "2024-09-12"; src = fetchFromGitHub { owner = "tzachar"; repo = "cmp-tabnine"; - rev = "d52aae40ee86b62960c31a003352ddfc9e31c8d2"; - sha256 = "155v6pqwdvqnivbm23wx3a554sy5sryb14dd8v01kp3pjydbkqqz"; + rev = "c0167cdc86c15e782c5461ee62aebee89231c2ed"; + sha256 = "0z0p8n3nmykn05d7p0kcxir5w2wybkjf6dibinaq8zcjxxsgmcc3"; }; meta.homepage = "https://github.com/tzachar/cmp-tabnine/"; }; @@ -2143,24 +2191,24 @@ final: prev: cmp_yanky = buildVimPlugin { pname = "cmp_yanky"; - version = "2023-11-16"; + version = "2024-09-22"; src = fetchFromGitHub { owner = "chrisgrieser"; repo = "cmp_yanky"; - rev = "c3d089186ccead26eba01023502f3eeadd7a92d2"; - sha256 = "sha256-jWNoKzY0x5GPFP7JsQi4nqgg1YFJV4DqxwJRqsg6KaQ="; + rev = "c9cc4824327096ca9c78c275c722a42fd89062c9"; + sha256 = "0d9xmqj30lpgd6bgrkdnwvh3gg6l1hzn8mcxcxhgjk8fy1hl63nq"; }; meta.homepage = "https://github.com/chrisgrieser/cmp_yanky/"; }; cobalt2-nvim = buildVimPlugin { pname = "cobalt2.nvim"; - version = "2024-04-01"; + version = "2024-09-09"; src = fetchFromGitHub { owner = "lalitmee"; repo = "cobalt2.nvim"; - rev = "5ee85e0722ccdd8253b6119e7cdd9055010093d0"; - sha256 = "0vxkdys6af38shv75laya871jb3jinhrfsdjm5wdxbxyl4lp39bx"; + rev = "32a2b8d0742bc5d0fb778d25a23c59ce31589e75"; + sha256 = "045lg1r66qcq3cjlzl78042511ab5cip0wnw6wr7daknwj36nqzs"; }; meta.homepage = "https://github.com/lalitmee/cobalt2.nvim/"; }; @@ -2251,12 +2299,12 @@ final: prev: coc-nvim = buildVimPlugin { pname = "coc.nvim"; - version = "2024-05-29"; + version = "2024-09-02"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "f0ce9ae23d6ce9d0cbabe73bdb738e45accc6f08"; - sha256 = "1ddf0y0ixb9aqjwax7jsnji6yhnvs13caml47c39bgcq80s37zk5"; + rev = "69b16f8651b4d92d9ea5d6b000c084f275ed7928"; + sha256 = "1fw1jridm31gw41xq6cx2k51nkxk8jv3b26idbkynm4isr02g0ig"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -2275,28 +2323,40 @@ final: prev: codeium-nvim = buildVimPlugin { pname = "codeium.nvim"; - version = "2024-05-03"; + version = "2024-09-24"; src = fetchFromGitHub { owner = "Exafunction"; repo = "codeium.nvim"; - rev = "d3b88eb3aa1de6da33d325c196b8a41da2bcc825"; - sha256 = "0zssbn655hqxihmswbhih5w9k75gkhyqn9bm8n9vdqihygh5g9js"; + rev = "f74f999ec5b383dc7a67c0298051ec2be2b17cab"; + sha256 = "07cncgm5lryls213a8zxadkaxpl4j02a5hyxb9c21kwsqff66hzh"; }; meta.homepage = "https://github.com/Exafunction/codeium.nvim/"; }; codeium-vim = buildVimPlugin { pname = "codeium.vim"; - version = "2024-06-19"; + version = "2024-09-23"; src = fetchFromGitHub { owner = "Exafunction"; repo = "codeium.vim"; - rev = "625a5cf79443a532c81f9290b3344ed8f91d2e20"; - sha256 = "1i2l9ss9i39zdxmfzrpvwsp6lx49ly7synrr2bm6byywmpx1cp37"; + rev = "dfe75c688a8ee9c3d192c51b6e7d315a3ca37d74"; + sha256 = "0fh0ksd18b4zxbqsdnblvz852r4fm42ilpj33mnj2wmj4z43hpyb"; }; meta.homepage = "https://github.com/Exafunction/codeium.vim/"; }; + codesnap-nvim = buildVimPlugin { + pname = "codesnap.nvim"; + version = "2024-09-22"; + src = fetchFromGitHub { + owner = "mistricky"; + repo = "codesnap.nvim"; + rev = "6400480aa6cc366cbd931146c429aaa64680dab9"; + sha256 = "1kdqh5vn837pxygz141n01zw08apcxi39xzdn5a0zhddimqn16z1"; + }; + meta.homepage = "https://github.com/mistricky/codesnap.nvim/"; + }; + codewindow-nvim = buildVimPlugin { pname = "codewindow.nvim"; version = "2024-06-05"; @@ -2359,16 +2419,28 @@ final: prev: command-t = buildVimPlugin { pname = "command-t"; - version = "2024-03-28"; + version = "2024-08-15"; src = fetchFromGitHub { owner = "wincent"; repo = "command-t"; - rev = "e4618dc08695fbf3a1171f12e0fc803ac4a3a19b"; - sha256 = "0x1wh6v11nnmi1xfy6qk5bb3riindigxnmyi407pfpb14acvl51l"; + rev = "4ee21e27bd28f6d17ea620633c6f83830ee23570"; + sha256 = "06rba2hqfqc8cr0gp3f3lvdkbilglzjzfkr5jqnipiwkixl4lpj5"; }; meta.homepage = "https://github.com/wincent/command-t/"; }; + comment-box-nvim = buildVimPlugin { + pname = "comment-box.nvim"; + version = "2024-02-03"; + src = fetchFromGitHub { + owner = "LudoPinelli"; + repo = "comment-box.nvim"; + rev = "06bb771690bc9df0763d14769b779062d8f12bc5"; + sha256 = "182wfx8q30ingkkrr0xs4r9zf1rf0b8wp2l8pi8hds0cpzc8vfvx"; + }; + meta.homepage = "https://github.com/LudoPinelli/comment-box.nvim/"; + }; + comment-nvim = buildVimPlugin { pname = "comment.nvim"; version = "2024-06-09"; @@ -2443,12 +2515,12 @@ final: prev: competitest-nvim = buildVimPlugin { pname = "competitest.nvim"; - version = "2024-01-23"; + version = "2024-09-22"; src = fetchFromGitHub { owner = "xeluxee"; repo = "competitest.nvim"; - rev = "c3cb0e2b0916a879c4d3dcb5737e6c046dd0afc5"; - sha256 = "16mycxnxa425rnl1xdk740ng6mg693ywzx5wsa56xr8nvxkms700"; + rev = "4ef440c20eec0be407f455f5db4bfad4acb2641e"; + sha256 = "1s8akxwws2z2kvw6xw8qpmfdv5bryblfwbw32jri83dk6iijkir6"; }; meta.homepage = "https://github.com/xeluxee/competitest.nvim/"; }; @@ -2467,12 +2539,12 @@ final: prev: compiler-nvim = buildVimPlugin { pname = "compiler.nvim"; - version = "2024-06-14"; + version = "2024-09-23"; src = fetchFromGitHub { owner = "Zeioth"; repo = "compiler.nvim"; - rev = "520ca6e0bd924e3ca8bd26e036a3b830955cf52f"; - sha256 = "18086w0hawhf94xzbgrk2h5qsnxx58w9193v5ldwmx55l7dn9i16"; + rev = "ba9c511ff106d3ce077f679cac1c3ac8260700dc"; + sha256 = "0jcmbfq5i7vxr9rzb5k1sd4wh85h1q5sllmdzxcphc8ymw25abj9"; }; meta.homepage = "https://github.com/Zeioth/compiler.nvim/"; }; @@ -2551,12 +2623,12 @@ final: prev: conform-nvim = buildVimPlugin { pname = "conform.nvim"; - version = "2024-06-19"; + version = "2024-09-12"; src = fetchFromGitHub { owner = "stevearc"; repo = "conform.nvim"; - rev = "bde3bee1773c96212b6c49f009e05174f932c23a"; - sha256 = "083a6glk20zj1rxnajchi6v6mah9632qmbzrs270lmjplk6dc2qk"; + rev = "1a99fdc1d3aa9ccdf3021e67982a679a8c5c740c"; + sha256 = "0r6isycbgi6n55c5sn5kqbs35i11ib4yym2awxpgr1w1bvxhcs01"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/conform.nvim/"; @@ -2564,24 +2636,24 @@ final: prev: conjure = buildVimPlugin { pname = "conjure"; - version = "2024-05-31"; + version = "2024-08-09"; src = fetchFromGitHub { owner = "Olical"; repo = "conjure"; - rev = "934687860a71d1d03e569ce11f880a4d404e69aa"; - sha256 = "1j0rsyw37wc0sh3im1m20akriyj0fmwlhbwfpkzav25wk9c8kmf2"; + rev = "6d2bc7f7b24c2c43d54f263bee7b9b08aef5d1a1"; + sha256 = "0gfk2b4cz8wisp5lpjlncf79may4c0sykgn7n9ibrmd8729ks43k"; }; meta.homepage = "https://github.com/Olical/conjure/"; }; context-vim = buildVimPlugin { pname = "context.vim"; - version = "2023-06-13"; + version = "2024-07-19"; src = fetchFromGitHub { owner = "wellle"; repo = "context.vim"; - rev = "108644e146c864995288dee7dacf219267917ac1"; - sha256 = "0ss5yckz2yqgaxnd007bn5nfcwqx7ngbpmqbndrv6m8rl716jaxx"; + rev = "82eb26de265292808917b82f3eda2725b53d785c"; + sha256 = "0p4pwh3riyf5h57j05rkazzf5j2xd14mlsp3ifryw35irhm4ivwd"; }; meta.homepage = "https://github.com/wellle/context.vim/"; }; @@ -2612,48 +2684,48 @@ final: prev: copilot-lua = buildVimPlugin { pname = "copilot.lua"; - version = "2024-06-15"; + version = "2024-09-11"; src = fetchFromGitHub { owner = "zbirenbaum"; repo = "copilot.lua"; - rev = "86537b286f18783f8b67bccd78a4ef4345679625"; - sha256 = "13ri0rj0bgs3s5hkh0hc9blk9xv9knv8q97zrx0y90w4b9k50b8w"; + rev = "1a237cf50372830a61d92b0adf00d3b23882e0e1"; + sha256 = "0cjsygqvv2k8lrngln70x1ilb7fmsp812yayxvg3qhc7krc5cz4h"; }; meta.homepage = "https://github.com/zbirenbaum/copilot.lua/"; }; copilot-vim = buildVimPlugin { pname = "copilot.vim"; - version = "2024-06-14"; + version = "2024-08-29"; src = fetchFromGitHub { owner = "github"; repo = "copilot.vim"; - rev = "88d08cf54f623341adde4b18362bffc95174dcd5"; - sha256 = "1ih8f8bbivywlaj54jaxnz6i05770qss028fafqsvn3h9cindigi"; + rev = "782461159655b259cff10ecff05efa761e3d4764"; + sha256 = "0f0iszaphi1p411wgpn8r4slqrxlwdcy03raqypdg5f40jmiad9c"; }; meta.homepage = "https://github.com/github/copilot.vim/"; }; coq-artifacts = buildVimPlugin { pname = "coq.artifacts"; - version = "2024-03-01"; + version = "2024-08-31"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.artifacts"; - rev = "9c5067a471322c6bb866545e88e5b28c82511865"; - sha256 = "0c0l259qyywck43hgs09qznrw1wm72idprlfk4ddcdj8g99vny84"; + rev = "a1ffcee295905171d87b40ee456001d45b10329b"; + sha256 = "0ag8ryq7figzvf0693077ifwj38jwig09521v04h9jyivickiq6w"; }; meta.homepage = "https://github.com/ms-jpq/coq.artifacts/"; }; coq-thirdparty = buildVimPlugin { pname = "coq.thirdparty"; - version = "2024-04-18"; + version = "2024-08-26"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.thirdparty"; - rev = "5f45777bcb0c14266a7e07ed474cb70c4e8b6397"; - sha256 = "0h2rq7aqxrf58cgwh6iwm2gs2fghkipyz20gdwqcy5hqmy2l0mi1"; + rev = "a827c2ab76d7c803976765cac597c79a2a5b34f6"; + sha256 = "0f9r16kkqhm6pr78v0iq87g1jqkn2acz5ll90xjdi1qg6h16dmc8"; }; meta.homepage = "https://github.com/ms-jpq/coq.thirdparty/"; }; @@ -2672,12 +2744,12 @@ final: prev: coq_nvim = buildVimPlugin { pname = "coq_nvim"; - version = "2024-06-11"; + version = "2024-09-20"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq_nvim"; - rev = "83808cfdebca290c84808c85b73f4dbcf5cf981f"; - sha256 = "17l52gd96kfqq4nc0z8qprigvzzrbsa1vijx7kdvgr0qbw4mr5gy"; + rev = "1c93db92bac10609fe42dcf1b7962a9b037852b4"; + sha256 = "0799y1nj1271r93nnd1p0j77bwv0w0l03q2a6j0amdslswqfa9cn"; }; meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; }; @@ -2720,12 +2792,12 @@ final: prev: crates-nvim = buildVimPlugin { pname = "crates.nvim"; - version = "2024-06-19"; + version = "2024-09-13"; src = fetchFromGitHub { owner = "saecki"; repo = "crates.nvim"; - rev = "909d233a8a86fd5ca8ef9eb1e404e89b81e05c41"; - sha256 = "1gbksj75hpkxn5mvvqhyhwx9l2b5xrp2vgwplydxgp3ml4f66rv7"; + rev = "5a24e3ba60e28e0cfde540696630b3c5a4db6dfd"; + sha256 = "1aqigachc35j42656a229jdvyb7rihcrw2sxw2alljh165gnbapk"; }; meta.homepage = "https://github.com/saecki/crates.nvim/"; }; @@ -2744,24 +2816,24 @@ final: prev: csharpls-extended-lsp-nvim = buildVimPlugin { pname = "csharpls-extended-lsp.nvim"; - version = "2024-06-10"; + version = "2024-09-18"; src = fetchFromGitHub { owner = "Decodetalkers"; repo = "csharpls-extended-lsp.nvim"; - rev = "5a474b06743bb20a90191994457f5e62f444976b"; - sha256 = "0h98968hhd6zs3j6kpsycvgcvwkfp6bffr5114yr9i9j6s0hxcs9"; + rev = "15f885e1a92cc8abd3ba28c5984d9e5920f1603c"; + sha256 = "1xjvpzsifh6k9vvkrfgynngafcjg8nln1r3480bbl7sd1dmwm9lq"; }; meta.homepage = "https://github.com/Decodetalkers/csharpls-extended-lsp.nvim/"; }; csv-vim = buildVimPlugin { pname = "csv.vim"; - version = "2024-06-09"; + version = "2024-08-20"; src = fetchFromGitHub { owner = "chrisbra"; repo = "csv.vim"; - rev = "4d5255829afe3b6badb0c8a040116704c0d3213c"; - sha256 = "1zkiv887rajmidl8jrk2mz6qmdq1378ivklwam6hxfa027wwigi2"; + rev = "bddfcbadd788ab11eb3dbba4550a38a412fe3705"; + sha256 = "127kzcxxazmpaw5qni7nqh3n9q1qcnnv0svlpp9ad4wizpqvz8k8"; }; meta.homepage = "https://github.com/chrisbra/csv.vim/"; }; @@ -2804,36 +2876,48 @@ final: prev: ctrlp-vim = buildVimPlugin { pname = "ctrlp.vim"; - version = "2023-07-16"; + version = "2024-09-22"; src = fetchFromGitHub { owner = "ctrlpvim"; repo = "ctrlp.vim"; - rev = "7c972cb19c8544c681ca345c64ec39e04f4651cc"; - sha256 = "15li2j26xxa90z6ci675whljym2sc6br6jxs2x4in5m1gv3qj36x"; + rev = "31be4c36b713a9637c7b530ee52127000a05ea39"; + sha256 = "19jz2vbj4m95w4zdgbmx2c5prmflz3wpg3rf9glcfwi2j5zz1ynx"; }; meta.homepage = "https://github.com/ctrlpvim/ctrlp.vim/"; }; cyberdream-nvim = buildVimPlugin { pname = "cyberdream.nvim"; - version = "2024-06-18"; + version = "2024-09-18"; src = fetchFromGitHub { owner = "scottmckendry"; repo = "cyberdream.nvim"; - rev = "db76342d8dff74b9382bf1e9c9e648ee16869809"; - sha256 = "1vzhylvw54jsz3fnmbx85if1izkmzzzbpzmdzw6dvmyqiw4axj7i"; + rev = "57fc3af9a8adcf1655fa4e70164bddd2ed898f60"; + sha256 = "1dq7n30h1qqyipgickpcjwc4jzixdhb8bqsqpp16maq2rnjwd9xr"; }; meta.homepage = "https://github.com/scottmckendry/cyberdream.nvim/"; }; + darkearth-nvim = buildVimPlugin { + pname = "darkearth-nvim"; + version = "2024-09-06"; + src = fetchFromGitHub { + owner = "ptdewey"; + repo = "darkearth-nvim"; + rev = "14369f828f4b09ee89b18bfa3f58b02720e8e20a"; + sha256 = "0wccpw7hssb4nb28pcnl5565g4s8s24ibc5r9wv1byygxn80gwha"; + }; + meta.homepage = "https://github.com/ptdewey/darkearth-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,36 +2936,108 @@ final: prev: dashboard-nvim = buildVimPlugin { pname = "dashboard-nvim"; - version = "2024-06-12"; + version = "2024-07-14"; src = fetchFromGitHub { owner = "nvimdev"; repo = "dashboard-nvim"; - rev = "b88c997f468a1bacb1e9b13ff3b567638caa06e6"; - sha256 = "0q77lzd9ls62dc3fbzrc401aaxah2sh1p1g9zfsxvimb4y313b7c"; + rev = "fabf5feec96185817c732d47d363f34034212685"; + sha256 = "0lf1sxj6fjb6m5z0pf32yg5z70rvkx7s2nljm1r00zkfgqwys9s4"; }; meta.homepage = "https://github.com/nvimdev/dashboard-nvim/"; }; + ddc-filter-matcher_head = buildVimPlugin { + pname = "ddc-filter-matcher_head"; + version = "2024-09-03"; + src = fetchFromGitHub { + owner = "Shougo"; + repo = "ddc-filter-matcher_head"; + rev = "2be49f0c547fc224f70bd4a0b354b1c1dd9c9eac"; + sha256 = "0liglv3rlag29bivsx2m5m6xnqxc6d7z5ar88zyqmrwrzs20f83h"; + }; + meta.homepage = "https://github.com/Shougo/ddc-filter-matcher_head/"; + }; + + ddc-filter-sorter_rank = buildVimPlugin { + pname = "ddc-filter-sorter_rank"; + version = "2024-09-24"; + src = fetchFromGitHub { + owner = "Shougo"; + repo = "ddc-filter-sorter_rank"; + rev = "98d1beaa3a94c7a1198c1d6b0440bd9bde7be212"; + sha256 = "18y3bkifvww8g9jx650mazxjvdbng6264x39wlz8lqdmxv8k95ry"; + }; + meta.homepage = "https://github.com/Shougo/ddc-filter-sorter_rank/"; + }; + + ddc-source-lsp = buildVimPlugin { + pname = "ddc-source-lsp"; + version = "2024-09-15"; + src = fetchFromGitHub { + owner = "Shougo"; + repo = "ddc-source-lsp"; + rev = "23b69013f2948c80b3938165a0cb414f58e26ada"; + sha256 = "0h5f3i5v647ah1bxcwx6ap18qhb6b36jwi2mk89clnww6anaghh7"; + }; + meta.homepage = "https://github.com/Shougo/ddc-source-lsp/"; + }; + + ddc-ui-native = buildVimPlugin { + pname = "ddc-ui-native"; + version = "2024-09-03"; + src = fetchFromGitHub { + owner = "Shougo"; + repo = "ddc-ui-native"; + rev = "7169980a4beaa672b8e2c5fe38da542e37a16dc1"; + sha256 = "0yin7n0060f9zcahf3dkq9nfvsgznvbqhqf971r3xnbc9cl83gfa"; + }; + meta.homepage = "https://github.com/Shougo/ddc-ui-native/"; + }; + + ddc-ui-pum = buildVimPlugin { + pname = "ddc-ui-pum"; + version = "2024-09-03"; + src = fetchFromGitHub { + owner = "Shougo"; + repo = "ddc-ui-pum"; + rev = "7e568274b3c22ca8d1742ddec43ea3a63d6ab7e9"; + sha256 = "1h9q23pyha6mzllcd3pk9025gb35y0gxnwrj9g07hsxp8mics2jj"; + }; + meta.homepage = "https://github.com/Shougo/ddc-ui-pum/"; + }; + + ddc-vim = buildVimPlugin { + pname = "ddc.vim"; + version = "2024-09-24"; + src = fetchFromGitHub { + owner = "Shougo"; + repo = "ddc.vim"; + rev = "657e2365d2865e5774c095556098fb2a9aeace4a"; + sha256 = "1w78jigzv6g6nh9c38vhsm8q4h5d7kxb50rx0dbm090jjc0dxxwl"; + }; + meta.homepage = "https://github.com/Shougo/ddc.vim/"; + }; + debugprint-nvim = buildVimPlugin { pname = "debugprint.nvim"; - version = "2024-06-14"; + version = "2024-08-30"; src = fetchFromGitHub { owner = "andrewferrier"; repo = "debugprint.nvim"; - rev = "bc691e879a3c1c7b92f62e830d58ec3f40331fbd"; - sha256 = "0paylwmbs15vnj25nxcqn4dw7nzw3xqp7xdq2mr4p6xdhyw4akvx"; + rev = "6de2df56b505aaea35cb16d09a6bc208eebeeabe"; + sha256 = "05ybwnijrirkg4fi3fsdb115s7jgh9x74hwnlfvg6r3mxkqx149x"; }; meta.homepage = "https://github.com/andrewferrier/debugprint.nvim/"; }; deepwhite-nvim = buildVimPlugin { pname = "deepwhite.nvim"; - version = "2024-05-22"; + version = "2024-08-15"; src = fetchFromGitHub { owner = "Verf"; repo = "deepwhite.nvim"; - rev = "f1db7888f0a7cf84d6d802c17c074bccca0a72a5"; - sha256 = "1zjs2h6kln346sw2p7msrqv6h451i8b4n7kbmdjncvxmf8b9jw1l"; + rev = "eca39dec3d504412ab5efce0046b77f67ffe4640"; + sha256 = "039yxxpyy8n394a1lm2dy0c72vddicynpi8jfqy2zdq3zkkg5j09"; }; meta.homepage = "https://github.com/Verf/deepwhite.nvim/"; }; @@ -2924,12 +3080,12 @@ final: prev: delimitMate = buildVimPlugin { pname = "delimitMate"; - version = "2020-12-14"; + version = "2024-08-06"; src = fetchFromGitHub { owner = "Raimondi"; repo = "delimitMate"; - rev = "537a1da0fa5eeb88640425c37e545af933c56e1b"; - sha256 = "0vjs11bx5zp6xqny5fd3lhqqvqaz6xjgncyga7hb0x5v6zng7gaj"; + rev = "becbd2d353a2366171852387288ebb4b33a02487"; + sha256 = "0kyxfkb6mkxy3skip6lzgrczwxl5p749n3rrvdr6psvyj3732zmm"; }; meta.homepage = "https://github.com/Raimondi/delimitMate/"; }; @@ -2972,24 +3128,24 @@ final: prev: denops-vim = buildVimPlugin { pname = "denops.vim"; - version = "2024-06-18"; + version = "2024-09-18"; src = fetchFromGitHub { owner = "vim-denops"; repo = "denops.vim"; - rev = "c6fa7c615ea7209ece65b2322591f0dd0167358d"; - sha256 = "1qxnk06sxrs1i5rhraiid9v6jr2nw5psgj8f0n42jfbpiadb6m2h"; + rev = "f9ab988c870023c4f5542b3f17de3250bbfe43cc"; + sha256 = "1njkxiscmymn3akxfxn9m5r2hrvcq2ygccnh7p77n2v3hcmh0dn0"; }; meta.homepage = "https://github.com/vim-denops/denops.vim/"; }; deol-nvim = buildVimPlugin { pname = "deol.nvim"; - version = "2024-06-18"; + version = "2024-09-23"; src = fetchFromGitHub { owner = "Shougo"; repo = "deol.nvim"; - rev = "7fe1a74a1e9abba978e3a1e02f798bf04de71a5f"; - sha256 = "0s61cwhjacnj5rvg87l263pf8rrla6ym8z89pp43wqj875d8d8s5"; + rev = "e0123ab93325e20a0bdc1105d9879fd2afa6c0ee"; + sha256 = "0wjzr537lx6xydlfnhan3psaqhimzld3130mmcwqnvhb8grm8sps"; }; meta.homepage = "https://github.com/Shougo/deol.nvim/"; }; @@ -3260,14 +3416,26 @@ final: prev: meta.homepage = "https://github.com/nvim-lua/diagnostic-nvim/"; }; + diagram-nvim = buildVimPlugin { + pname = "diagram.nvim"; + version = "2024-09-22"; + src = fetchFromGitHub { + owner = "3rd"; + repo = "diagram.nvim"; + rev = "7e86bc292982db1a77ffb2a85912199476ea2712"; + sha256 = "1axcm67ggmrvipqdwhg3vqsa7nwfhx6s1g7xfkzymxichl6n1dm4"; + }; + meta.homepage = "https://github.com/3rd/diagram.nvim/"; + }; + dial-nvim = buildVimPlugin { pname = "dial.nvim"; - version = "2024-05-18"; + version = "2024-07-15"; src = fetchFromGitHub { owner = "monaqa"; repo = "dial.nvim"; - rev = "7af2daaaf933b0617ded0f78b49f4d5fc45f9f64"; - sha256 = "131h6qpnzdgq72z4wkf3pm1xm848iyhbkim3689l0x950z1f56n1"; + rev = "ed4d6a5bbd5e479b4c4a3019d148561a2e6c1490"; + sha256 = "15qh38igdi46id6y94w2ymx91n4gmfl1xv6i4am27g65l95fcfmm"; }; meta.homepage = "https://github.com/monaqa/dial.nvim/"; }; @@ -3346,40 +3514,52 @@ final: prev: dracula-nvim = buildVimPlugin { pname = "dracula.nvim"; - version = "2024-02-25"; + version = "2024-07-12"; src = fetchFromGitHub { owner = "Mofiqul"; repo = "dracula.nvim"; - rev = "8d8bddb8814c3e7e62d80dda65a9876f97eb699c"; - sha256 = "0jj60j09k1pdkjqdfj7akxrfwpaccvc2z2r3ksj3zm1gjrnfsyi3"; + rev = "fdf503e52ec1c8aae07353604d891fe5a3ed5201"; + sha256 = "1f032gwhr92w57mb5bfsgr14ayi7qg93rvjq04cy5kwdniqg92ij"; }; meta.homepage = "https://github.com/Mofiqul/dracula.nvim/"; }; dressing-nvim = buildVimPlugin { pname = "dressing.nvim"; - version = "2024-06-19"; + version = "2024-09-17"; src = fetchFromGitHub { owner = "stevearc"; repo = "dressing.nvim"; - rev = "6741f1062d3dc6e4755367a7e9b347b553623f04"; - sha256 = "0mwg7z7gns6gw3b6iq2xs0hynn846k7r4q4fzqba8ky8bzzh8mrf"; + rev = "1b7921eecc65af1baf8ac1dc06f0794934cbcfb2"; + sha256 = "04zjfisknbdaaydv9qhfr2lw53rgb02irar13br82ji81j2dilhj"; }; meta.homepage = "https://github.com/stevearc/dressing.nvim/"; }; dropbar-nvim = buildVimPlugin { pname = "dropbar.nvim"; - version = "2024-06-15"; + version = "2024-09-23"; src = fetchFromGitHub { owner = "Bekaboo"; repo = "dropbar.nvim"; - rev = "79847a78ec0c58f5e5c0360192b03d0cee803e95"; - sha256 = "0k92lqkqfah0xgl3yq85f1fr8pryp6cfcgglwdbsqw1jwsh37687"; + rev = "b7b0cd2670cfab298afc955f2531206218736766"; + sha256 = "1drcvhayc3knwm1cfmsx43ywfzyvs8g5vniy2sci8xg86vypbqmn"; }; meta.homepage = "https://github.com/Bekaboo/dropbar.nvim/"; }; + earthly-vim = buildVimPlugin { + pname = "earthly.vim"; + version = "2024-04-02"; + src = fetchFromGitHub { + owner = "earthly"; + repo = "earthly.vim"; + rev = "cb0440a357a09fb9234ece56a6b09e04d25c1b1d"; + sha256 = "038g9sjik2jn5la06k7i5xfnzc28faibskn2fikgrxwlx240c8wv"; + }; + meta.homepage = "https://github.com/earthly/earthly.vim/"; + }; + echodoc-vim = buildVimPlugin { pname = "echodoc.vim"; version = "2022-11-27"; @@ -3394,12 +3574,12 @@ final: prev: edge = buildVimPlugin { pname = "edge"; - version = "2024-06-03"; + version = "2024-09-02"; src = fetchFromGitHub { owner = "sainnhe"; repo = "edge"; - rev = "2153187e3ca56c11a7f35852bbaef6525c936b1c"; - sha256 = "17bjyn241iy7qflw8yqlzxi4536b9l6hnxcbgbxsj8a7s3f51iqd"; + rev = "3dcbdbd6942018bb30ddfbe9b99e3295ea8c7f0f"; + sha256 = "0m30fdkf4xwln662iyz6aylpvkrz5bys41ccxxa2rdyxmw33sanm"; }; meta.homepage = "https://github.com/sainnhe/edge/"; }; @@ -3418,12 +3598,12 @@ final: prev: edgy-nvim = buildVimPlugin { pname = "edgy.nvim"; - version = "2024-06-16"; + version = "2024-08-31"; src = fetchFromGitHub { owner = "folke"; repo = "edgy.nvim"; - rev = "a8bc1d24798c80a391f1a5d898a50c41a7f93883"; - sha256 = "066963g4jykzw5fg3mhv301ksc67vmjgzw0fm9izip9qrpb9i91h"; + rev = "7e8dedc39abebe40c289b8012cc89b11c69aa7a0"; + sha256 = "0f95wadg6dgkaj25vyq7nrzmpbkbmw9q38h3wrbippylw41jbzr8"; }; meta.homepage = "https://github.com/folke/edgy.nvim/"; }; @@ -3455,24 +3635,24 @@ final: prev: efmls-configs-nvim = buildVimPlugin { pname = "efmls-configs-nvim"; - version = "2024-05-21"; + version = "2024-09-05"; src = fetchFromGitHub { owner = "creativenull"; repo = "efmls-configs-nvim"; - rev = "eb2be5b24dbf7200a80bcd5c64bc63afbc8ae86f"; - sha256 = "1k7spx8iagmklrbb3l6dmj217j8110nja03dhpz52znzsir5vlpj"; + rev = "8474cdc5a8fc21091828487c3f7781d0b19c66fb"; + sha256 = "1b57l8b5m19p8bf5an67z595zcz9adandz5g4v0yj4b3kbw2azc3"; }; meta.homepage = "https://github.com/creativenull/efmls-configs-nvim/"; }; elixir-tools-nvim = buildVimPlugin { pname = "elixir-tools.nvim"; - version = "2024-06-14"; + version = "2024-07-10"; src = fetchFromGitHub { owner = "elixir-tools"; repo = "elixir-tools.nvim"; - rev = "ab10b425a4d4b34447b0699bd93aa42f97bdf4b5"; - sha256 = "180h1w5aka6kz9np5l2xr6kiyw9xkj238lqcgqqv2dx7chdssxsi"; + rev = "5e7596be469be0800e9cbe3415de971f7286c3d0"; + sha256 = "09k78g85mhhcr7sgv7rx7viznc2y4fv55c3h9rq5yr43axxjsasv"; }; meta.homepage = "https://github.com/elixir-tools/elixir-tools.nvim/"; }; @@ -3503,12 +3683,12 @@ final: prev: emmet-vim = buildVimPlugin { pname = "emmet-vim"; - version = "2024-06-14"; + version = "2024-08-10"; src = fetchFromGitHub { owner = "mattn"; repo = "emmet-vim"; - rev = "3fb2f63799e1922f7647ed9ff3b32154031a76ee"; - sha256 = "03rlfwfnghqp6bjnpi2mb4f0ki7fyj2im718f51mpfv6wr5c5gac"; + rev = "6c511a8d7d2863066f32e25543e2bb99d505172c"; + sha256 = "11mmk70xk5jlbbc1mpga7rxpjnhyjdz534yr41yndzvkq1gp72lb"; fetchSubmodules = true; }; meta.homepage = "https://github.com/mattn/emmet-vim/"; @@ -3552,36 +3732,36 @@ final: prev: everforest = buildVimPlugin { pname = "everforest"; - version = "2024-06-02"; + version = "2024-09-02"; src = fetchFromGitHub { owner = "sainnhe"; repo = "everforest"; - rev = "9dbd4d1c3255ed801e515f2ed388f4c6ceb62f6e"; - sha256 = "1ccawa3m5crqgwz30bm6pz6rdjdnqkp6w724qrbq5d053gss42jq"; + rev = "93b89630861a4c8a1be07bc54f6d53487acb2e57"; + sha256 = "0ckm5l1dhd5d81sk73k0py2jmhnm7ydwshnllhw40mnaffh65kwr"; }; meta.homepage = "https://github.com/sainnhe/everforest/"; }; executor-nvim = buildVimPlugin { pname = "executor.nvim"; - version = "2024-04-29"; + version = "2024-07-23"; src = fetchFromGitHub { owner = "google"; repo = "executor.nvim"; - rev = "cb60faf7486cd6edae884a58fb9c2793bc4e75ea"; - sha256 = "0ifzy31m11spjkdi3xc42r1zp9si38zgmp43a0bdxznbm6ka5hm5"; + rev = "5f3d7f9a986826f399128892f9519cc9507f419a"; + sha256 = "0r2pjlzv1xldxsf40bs94xlr4mvbgjcncx45sjqjdgfgfqkbir5v"; }; meta.homepage = "https://github.com/google/executor.nvim/"; }; eyeliner-nvim = buildVimPlugin { pname = "eyeliner.nvim"; - version = "2023-09-16"; + version = "2024-08-19"; src = fetchFromGitHub { owner = "jinh0"; repo = "eyeliner.nvim"; - rev = "c540d58bf52aa979d4cca639c60387ae0c0ccf88"; - sha256 = "1hd9ph3f56y01gd9ipbd5lw4ips6n9wcr4c9snc60c49z6xammlk"; + rev = "85e5a5a815651a434f327d0da3c2a33b9aa4f9ec"; + sha256 = "1qx082ipf9fyly972wya5ws0h0jff3xg27vgb21igxymyipbddym"; }; meta.homepage = "https://github.com/jinh0/eyeliner.nvim/"; }; @@ -3648,12 +3828,12 @@ final: prev: feline-nvim = buildVimPlugin { pname = "feline.nvim"; - version = "2024-05-25"; + version = "2024-07-13"; src = fetchFromGitHub { owner = "freddiehaddad"; repo = "feline.nvim"; - rev = "8bc28b94a16304aad2f53b8c3653b14803748c28"; - sha256 = "0xwzzcfbp9g7kxni5wpq621dfbv4cif9daz5brpcgh7nqd5zh76z"; + rev = "c97c17dc56ca3cf2b9b9192c3447fc59347e8c0d"; + sha256 = "0dbkjpc266j4605zp0hh4rq5sncca79s7056q6b43b971lagllcw"; }; meta.homepage = "https://github.com/freddiehaddad/feline.nvim/"; }; @@ -3684,12 +3864,12 @@ final: prev: fidget-nvim = buildNeovimPlugin { pname = "fidget.nvim"; - version = "2024-05-19"; + version = "2024-07-13"; src = fetchFromGitHub { owner = "j-hui"; repo = "fidget.nvim"; - rev = "ef99df04a1c53a453602421bc0f756997edc8289"; - sha256 = "1j0s31k8dszb0sq46c492hj27w0ag2zmxy75y8204f3j80dkz68s"; + rev = "d855eed8a06531a7e8fd0684889b2943f373c469"; + sha256 = "0lb8zbncdlq91f4x8jqijpqvaigjw7f8b79milxwa11wvm25sg3y"; }; meta.homepage = "https://github.com/j-hui/fidget.nvim/"; }; @@ -3720,12 +3900,12 @@ final: prev: firenvim = buildVimPlugin { pname = "firenvim"; - version = "2024-06-06"; + version = "2024-08-04"; src = fetchFromGitHub { owner = "glacambre"; repo = "firenvim"; - rev = "e412ab23c5b56b7eb3c361da8a1f8a2e94c51001"; - sha256 = "1prrmc41221f334b1cxhc7msxz5a83m0k7hg2hzspszggfgv49vh"; + rev = "bb70728c13c305ff35193586d5f6ce68668af063"; + sha256 = "0vfghlqaj9hy5q4hcjvyksqb45dfyvwmlz3ns63jmwn25hbzs9h3"; }; meta.homepage = "https://github.com/glacambre/firenvim/"; }; @@ -3745,12 +3925,12 @@ final: prev: flash-nvim = buildVimPlugin { pname = "flash.nvim"; - version = "2024-06-04"; + version = "2024-07-22"; src = fetchFromGitHub { owner = "folke"; repo = "flash.nvim"; - rev = "43f67935d388fbb540f8b40e8cbfd80de54f978a"; - sha256 = "0ib7cyk4dqnm0jyq21n3d0mqljwc4s3dyb5xpkrmw1kv6k9h3m2v"; + rev = "34c7be146a91fec3555c33fe89c7d643f6ef5cf1"; + sha256 = "04iqz3dlhpgqmnl31z8m4zpj6s2y51a2k8ji693s9d9fzj9y3kbl"; }; meta.homepage = "https://github.com/folke/flash.nvim/"; }; @@ -3781,12 +3961,12 @@ final: prev: flit-nvim = buildVimPlugin { pname = "flit.nvim"; - version = "2024-06-18"; + version = "2024-06-19"; src = fetchFromGitHub { owner = "ggandor"; repo = "flit.nvim"; - rev = "a9be4e76c30a128f1e51af448c8321bf8366bcd4"; - sha256 = "0fx2jrnfmr5bl537ha02w3wmkmx89n938h2a4vgc2771kwpb1cy5"; + rev = "1ef72de6a02458d31b10039372c8a15ab8989e0d"; + sha256 = "04v1idfwz5lh7hz456591bl3841jr7kcspf62c7krbhvz5vmmfcl"; }; meta.homepage = "https://github.com/ggandor/flit.nvim/"; }; @@ -3841,14 +4021,14 @@ final: prev: flutter-tools-nvim = buildVimPlugin { pname = "flutter-tools.nvim"; - version = "2024-05-19"; + version = "2024-09-23"; src = fetchFromGitHub { - owner = "akinsho"; + owner = "nvim-flutter"; repo = "flutter-tools.nvim"; - rev = "990a1349c29f7d474a0cd51355aba773ccc9deea"; - sha256 = "1qn6b6hmyscxiczwp1k530l1k165wlnqxjk820737d27l451c5vm"; + rev = "6610090a4e68d10fd73b68450004dafd26e7cc34"; + sha256 = "066wrrg4nwrgm1r9zc1g2i4rzqrqdbfcsh3kcqnz088j9r5kngi0"; }; - meta.homepage = "https://github.com/akinsho/flutter-tools.nvim/"; + meta.homepage = "https://github.com/nvim-flutter/flutter-tools.nvim/"; }; fold-preview-nvim = buildVimPlugin { @@ -3887,14 +4067,26 @@ final: prev: meta.homepage = "https://github.com/megaannum/forms/"; }; + fortune-nvim = buildVimPlugin { + pname = "fortune.nvim"; + version = "2024-07-18"; + src = fetchFromGitHub { + owner = "rubiin"; + repo = "fortune.nvim"; + rev = "29a99fbf887a2d48693f1eaa1893f84cde60af54"; + sha256 = "0kyi2pl5d1h7ycxsdvqdyg5zmjfxj7jpx7lk3bf2d14wvnvcwpb4"; + }; + meta.homepage = "https://github.com/rubiin/fortune.nvim/"; + }; + friendly-snippets = buildVimPlugin { pname = "friendly-snippets"; - version = "2024-06-17"; + version = "2024-09-23"; src = fetchFromGitHub { owner = "rafamadriz"; repo = "friendly-snippets"; - rev = "682157939e57bd6a2c86277dfd4d6fbfce63dbac"; - sha256 = "16fivgnm9vzsk0gqjg8xjp15lrfdlq0w9wa00344yifqvbfam9qi"; + rev = "00ba9dd3df89509f95437b8d595553707c46d5ea"; + sha256 = "0nc6pflj81qldg4yjywzww4md0315kdj0jv8sbcfi8m7kdbjwfy9"; }; meta.homepage = "https://github.com/rafamadriz/friendly-snippets/"; }; @@ -3913,12 +4105,12 @@ final: prev: fugitive-gitlab-vim = buildVimPlugin { pname = "fugitive-gitlab.vim"; - version = "2024-03-18"; + version = "2024-07-25"; src = fetchFromGitHub { owner = "shumphrey"; repo = "fugitive-gitlab.vim"; - rev = "e8dd4c9dfe8ce43503dd81286d4e80f65a978e71"; - sha256 = "0g0mq8k8014slh9326c37fkhyx5ajmm3gzlf7aln6krqb6nh8vj5"; + rev = "838d3a110836f511be099002ce1a71493c042615"; + sha256 = "0v7x5df4w95qpxshbv81dglnhqgw0ind3c9zxzxf75ir8ry94g5n"; }; meta.homepage = "https://github.com/shumphrey/fugitive-gitlab.vim/"; }; @@ -3997,24 +4189,24 @@ final: prev: fzf-lua = buildNeovimPlugin { pname = "fzf-lua"; - version = "2024-06-19"; + version = "2024-09-23"; src = fetchFromGitHub { owner = "ibhagwan"; repo = "fzf-lua"; - rev = "c56717d6833166adadd11cad05d979b1fb370c57"; - sha256 = "17cwiv25qg3lvlm6j5v95pdxd92470kb1495xvp2iaanzzmkl1h8"; + rev = "cf4f7e095f679856fa8fe74e1539fb60fa552bdd"; + sha256 = "04vsj928wm4q73v9jmp3ari5g2hl8m1bk03hm9bxlb879w95vjhb"; }; meta.homepage = "https://github.com/ibhagwan/fzf-lua/"; }; fzf-vim = buildVimPlugin { pname = "fzf.vim"; - version = "2024-06-06"; + version = "2024-08-28"; src = fetchFromGitHub { owner = "junegunn"; repo = "fzf.vim"; - rev = "279e1ec068f526e985ee7e3f62a71f083bbe0196"; - sha256 = "11gxry27alq4fzynmzw0h2q3vjx5jc2krj1pq9q9xs7yc5fj46y5"; + rev = "c5ce7908ee86af7d4090d2007086444afb6ec1c9"; + sha256 = "1vllxqnk8qvbyzqplh9ms7rpk36kwj2mc35r868rkjgg8z4mkbc3"; }; meta.homepage = "https://github.com/junegunn/fzf.vim/"; }; @@ -4079,50 +4271,38 @@ final: prev: meta.homepage = "https://github.com/eagletmt/ghcmod-vim/"; }; - gina-vim = buildVimPlugin { - pname = "gina.vim"; - version = "2022-03-30"; - src = fetchFromGitHub { - owner = "lambdalisue"; - repo = "vim-gina"; - rev = "ff6c2ddeca98f886b57fb42283c12e167d6ab575"; - sha256 = "09jlnpix2dy6kggiz96mrm5l1f9x1gl5afpdmfrxgkighn2rwpzq"; - }; - meta.homepage = "https://github.com/lambdalisue/vim-gina/"; - }; - git-blame-nvim = buildVimPlugin { pname = "git-blame.nvim"; - version = "2024-05-28"; + version = "2024-09-15"; src = fetchFromGitHub { owner = "f-person"; repo = "git-blame.nvim"; - rev = "408d5487d908dfe5d48e5645d8b27ddcc16b11e0"; - sha256 = "0m7rg9yn08c9c57dpyxqlswk19mgl8r8krwqhjj3l3n93mbxqym0"; + rev = "8c56e864d448e84e0162872c381dd2715824dce2"; + sha256 = "12l8pgm523r6cgfj73f9hzyq69205p8in8jvs6x9j7fwcv5y5jil"; }; meta.homepage = "https://github.com/f-person/git-blame.nvim/"; }; git-conflict-nvim = buildVimPlugin { pname = "git-conflict.nvim"; - version = "2024-06-03"; + version = "2024-09-10"; src = fetchFromGitHub { owner = "akinsho"; repo = "git-conflict.nvim"; - rev = "bfd9fe6fba9a161fc199771d85996236a0d0faad"; - sha256 = "1lwxnfa6scw64pxq1viqrbdcsn2gf8hysqkbnn66y5518b5rc5z4"; + rev = "ed1ca6dfd60bf609714f791cfa63aee33aef64ed"; + sha256 = "1qybpjynbmw341asjmc93mkc2k4jp054jh0zq620vc0vplhhx2wz"; }; meta.homepage = "https://github.com/akinsho/git-conflict.nvim/"; }; git-messenger-vim = buildVimPlugin { pname = "git-messenger.vim"; - version = "2022-08-30"; + version = "2024-09-05"; src = fetchFromGitHub { owner = "rhysd"; repo = "git-messenger.vim"; - rev = "8a61bdfa351d4df9a9118ee1d3f45edbed617072"; - sha256 = "0p4pj11sxl3bb2dqsnxwrpn0pf76df1r98wwj9lhjvy7514wc2a8"; + rev = "edc603d4cda7894a743e383e16c638e206d03148"; + sha256 = "0b9wkjxlc2d91wrjhqkpph9mcix3ndpqy3bdr1xajxnjz9lsy22a"; }; meta.homepage = "https://github.com/rhysd/git-messenger.vim/"; }; @@ -4189,12 +4369,12 @@ final: prev: gitsigns-nvim = buildNeovimPlugin { pname = "gitsigns.nvim"; - version = "2024-06-19"; + version = "2024-09-04"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "651d5ed082605f3ed96b0f037a768ca06ecf8fc3"; - sha256 = "0fllibgmp1sfargpkswg1h3kg667y0sdazc0z5midaq8skr9crz6"; + rev = "1ef74b546732f185d0f806860fa5404df7614f28"; + sha256 = "1i1frmz9i65ivkkvb5rawwlr74xhxby2pp1chs443lymw9kbqz5k"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -4213,24 +4393,24 @@ final: prev: glance-nvim = buildVimPlugin { pname = "glance.nvim"; - version = "2024-03-31"; + version = "2024-09-13"; src = fetchFromGitHub { owner = "DNLHC"; repo = "glance.nvim"; - rev = "51059bcf21016387b6233c89eed220cf47fca752"; - sha256 = "189si3pw3cri28lfkfs7p79wrkrnm043shx8k8frirpgsjz9slv6"; + rev = "cdf1ec8136cfbdf73edbe1163097223c763a84b7"; + sha256 = "0x2aiiy5h3wbg42gw6ahn1070ci6hzi6dv9g2ldk8h7xgbk1dc42"; }; meta.homepage = "https://github.com/DNLHC/glance.nvim/"; }; gleam-vim = buildVimPlugin { pname = "gleam.vim"; - version = "2024-04-10"; + version = "2024-07-30"; src = fetchFromGitHub { owner = "gleam-lang"; repo = "gleam.vim"; - rev = "f9e82b70425dc0726ee173ecddf176ffa364e30d"; - sha256 = "1z4vvrxddhncfnr14a7kqc2k6gwknx8ydvs6n4my0nkz9jxh3v6s"; + rev = "ad6c328d6460763ca6a338183f7f1bd54137ce80"; + sha256 = "1apvzg1l694vd9q9ip0d11yh7wkylz543smcwkwqpz6q8vs4qbb2"; }; meta.homepage = "https://github.com/gleam-lang/gleam.vim/"; }; @@ -4249,24 +4429,24 @@ final: prev: go-nvim = buildVimPlugin { pname = "go.nvim"; - version = "2024-06-19"; + version = "2024-09-23"; src = fetchFromGitHub { owner = "ray-x"; repo = "go.nvim"; - rev = "78c6d7b970a79c34dc0f35149f4bd845e09803d6"; - sha256 = "0pg14jml1n27imy4rdb1ri7wi7bnh2fp8q7rah5az8k80g26ghpg"; + rev = "2aa81c62bd58bb013f7b472297c2e8038de827d3"; + sha256 = "1bfgi8nkxsy0f86j2lqaijivp9mj0svwc5dgdlrmdclf10m3lxlw"; }; meta.homepage = "https://github.com/ray-x/go.nvim/"; }; godbolt-nvim = buildVimPlugin { pname = "godbolt.nvim"; - version = "2023-11-11"; + version = "2024-07-08"; src = fetchFromGitHub { owner = "p00f"; repo = "godbolt.nvim"; - rev = "09b78f294ea26af678a9ac363b7d5ce8e20b696e"; - sha256 = "0g9zp1p9rpx4bixm6hdpd7w9a483yrz73p6vfl9pn5ky0vavaz25"; + rev = "777a454e310a6b03c498727449eff3caabd70fa1"; + sha256 = "05p22qnvhspqi2vbbg8q5can36i5fyksm5x6ra2l83nv0g42fcql"; }; meta.homepage = "https://github.com/p00f/godbolt.nvim/"; }; @@ -4297,12 +4477,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/"; }; @@ -4367,6 +4547,18 @@ final: prev: meta.homepage = "https://github.com/blazkowolf/gruber-darker.nvim/"; }; + grug-far-nvim = buildVimPlugin { + pname = "grug-far.nvim"; + version = "2024-09-22"; + src = fetchFromGitHub { + owner = "MagicDuck"; + repo = "grug-far.nvim"; + rev = "27a502037da8657a8b2ab7e31a6439d7b7063af5"; + sha256 = "1dz5mcfnl2crsj8h4q69p6qs9n4vlz7rl7pxhs88xh5di1kp58r2"; + }; + meta.homepage = "https://github.com/MagicDuck/grug-far.nvim/"; + }; + gruvbox = buildVimPlugin { pname = "gruvbox"; version = "2023-08-14"; @@ -4405,72 +4597,72 @@ final: prev: gruvbox-material = buildVimPlugin { pname = "gruvbox-material"; - version = "2024-06-03"; + version = "2024-09-02"; src = fetchFromGitHub { owner = "sainnhe"; repo = "gruvbox-material"; - rev = "905a41c86dbfed42f89c13c36f0e3407e9318910"; - sha256 = "150lr7imib2wk3pjlp6jx0w2vz005q89f7r0vnvpw1gh2f6rjl5q"; + rev = "559b4a9abb6781699404dfd98fb7d6ec83113337"; + sha256 = "0i5ib1m5x63xiyy6slx3ma5hnhwvdzld1vm1yx2kpclb9jf5i8b5"; }; meta.homepage = "https://github.com/sainnhe/gruvbox-material/"; }; gruvbox-material-nvim = buildVimPlugin { pname = "gruvbox-material.nvim"; - version = "2024-06-16"; + version = "2024-08-16"; src = fetchFromGitHub { owner = "f4z3r"; repo = "gruvbox-material.nvim"; - rev = "0ab9d8c7a8b4cd26338ca0c816c4ca1a48f9d5d6"; - sha256 = "0il0rkj3yskfy591phdvyd8kdc14303m1g58hygvdd46ccsxj8kw"; + rev = "1f2b678743cc30540ee4736df11bc4b698a946ea"; + sha256 = "17xgnxhji8qhydf4aah344zm7mvj3r77zg60af6523ma7d8gjpyn"; }; meta.homepage = "https://github.com/f4z3r/gruvbox-material.nvim/"; }; gruvbox-nvim = buildVimPlugin { pname = "gruvbox.nvim"; - version = "2024-06-05"; + version = "2024-07-04"; src = fetchFromGitHub { owner = "ellisonleao"; repo = "gruvbox.nvim"; - rev = "d4cde3853a172485961b515c36d51d757728d6e6"; - sha256 = "0aqz3gybdl1sj92p53md63pwgfs1d60k8vjc0x69wqya81dl7cn3"; + rev = "7a1b23e4edf73a39642e77508ee6b9cbb8c60f9e"; + sha256 = "0hr9yf7cn6asq39szfr6nwvq40vcyz7hv9bph51z14gjkdv67pzs"; }; meta.homepage = "https://github.com/ellisonleao/gruvbox.nvim/"; }; guard-collection = buildVimPlugin { pname = "guard-collection"; - version = "2024-06-06"; + version = "2024-08-08"; src = fetchFromGitHub { owner = "nvimdev"; repo = "guard-collection"; - rev = "c1651e33a450279b76e6aa70d131472201ef930d"; - sha256 = "1axnx1wa32mh5s2vzhhc5y1471053y5ml9gnvmiiqax94m7acvzp"; + rev = "fe25ff07fa451112b0e47825e98e7b6b8b771680"; + sha256 = "1s0pdarlf6vpbyhxzjwn2yzh6bp44lsr05nw9s2684lwnr5g46bg"; }; meta.homepage = "https://github.com/nvimdev/guard-collection/"; }; guard-nvim = buildVimPlugin { pname = "guard.nvim"; - version = "2024-06-05"; + version = "2024-08-09"; src = fetchFromGitHub { owner = "nvimdev"; repo = "guard.nvim"; - rev = "b066152fe06122b047a6b3ce427a19d8b6e628ce"; - sha256 = "0qcq5acnq6hgxpi9f3qsixsgvlzlaq1nmizwbanzkqgcj6ac4bzj"; + rev = "8b34592089f56502a7757fd563f2743a446f6334"; + sha256 = "1z49ykazvm1kf6dk5d0agh0iliykdwqzz9ndpy4l7aya4gilmmn2"; }; meta.homepage = "https://github.com/nvimdev/guard.nvim/"; }; guess-indent-nvim = buildVimPlugin { pname = "guess-indent.nvim"; - version = "2024-06-19"; + version = "2024-07-06"; src = fetchFromGitHub { owner = "nmac427"; repo = "guess-indent.nvim"; - rev = "6c75506e71836f34fe5c5efa322dfce3e0494e7b"; - sha256 = "0pg2jbksvdh6sy1ygygiax5r1d93axmdg6n0jdk6iyfa1jlzdhrw"; + rev = "6cd61f7a600bb756e558627cd2e740302c58e32d"; + sha256 = "0gb9bgyirlgfbnfdfha7k31gfcyzc4k9a3skvaixdyxn04pgsdcv"; }; meta.homepage = "https://github.com/nmac427/guess-indent.nvim/"; }; @@ -4501,24 +4693,24 @@ final: prev: hardhat-nvim = buildVimPlugin { pname = "hardhat.nvim"; - version = "2024-06-14"; + version = "2024-09-22"; src = fetchFromGitHub { owner = "TheSnakeWitcher"; repo = "hardhat.nvim"; - rev = "9d5b241261904ae22429877c1459e7c632dba736"; - sha256 = "1xb93g4cxy3w4jjagaqmyvf2qfii4fm5biriadkmf4a08vdxg682"; + rev = "c096f5e6c8501b3b695e7e36642005f4de3a9a8e"; + sha256 = "0b07i9iawn3386kv04zv7q52ibkx8ag4w4aymd14gz313d4mmwwy"; }; meta.homepage = "https://github.com/TheSnakeWitcher/hardhat.nvim/"; }; hardtime-nvim = buildVimPlugin { pname = "hardtime.nvim"; - version = "2024-06-10"; + version = "2024-08-20"; src = fetchFromGitHub { owner = "m4xshen"; repo = "hardtime.nvim"; - rev = "9a4e24fb40482dc85a93bf6cf344a030b9bf9a39"; - sha256 = "01b34bmyw236xr8bcwwn40s6360ybmrd9lpbw0hnvkn4nsml6hi6"; + rev = "6513bf42cd9261669d1ee41ff8b4065dfdc53a09"; + sha256 = "0v522mzz7cp62hjf9bqnfrpnadapywb56r5d888kjvc4gcy9kzrv"; }; meta.homepage = "https://github.com/m4xshen/hardtime.nvim/"; }; @@ -4536,52 +4728,40 @@ final: prev: harpoon = buildVimPlugin { pname = "harpoon"; - version = "2023-12-26"; + version = "2024-08-29"; src = fetchFromGitHub { owner = "ThePrimeagen"; repo = "harpoon"; - rev = "ccae1b9bec717ae284906b0bf83d720e59d12b91"; - sha256 = "10ldyz368j3kh7h7r877wbsa2y88v191415ic4slr7ldzfrar2j8"; + rev = "1bc17e3e42ea3c46b33c0bbad6a880792692a1b3"; + sha256 = "0q7lcww2y1x8s6r5g6wbdlnv3dvc8pj1g7wq6yxvl5fsi40wvhwj"; }; meta.homepage = "https://github.com/ThePrimeagen/harpoon/"; }; 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-09-16"; src = fetchFromGitHub { owner = "mrcjkb"; repo = "haskell-snippets.nvim"; - rev = "46462fe142521bd5719412dc9d740c2e54a9186e"; - sha256 = "14cqvs09yk1b9dk8k0l322kxqahr5hzv7iiz72pjfjjk888dhdr2"; + rev = "efc74b75345151c8348a16f3e9f508b5bb7c3c92"; + sha256 = "1w347krahhqwycg04f58c3j1iba8fa61ih9jyy7rniksmfm01dz0"; }; meta.homepage = "https://github.com/mrcjkb/haskell-snippets.nvim/"; }; - haskell-tools-nvim = buildNeovimPlugin { - pname = "haskell-tools.nvim"; - version = "2024-06-16"; - src = fetchFromGitHub { - owner = "MrcJkb"; - repo = "haskell-tools.nvim"; - rev = "0223bf4b47ab517030f406617c153e7d1e4a7811"; - sha256 = "1ab3s6lrqh870qcphxjsvj5q8jg7lxv27119r5qyp60rf657q39a"; - }; - meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/"; - }; - haskell-vim = buildVimPlugin { pname = "haskell-vim"; version = "2021-01-19"; @@ -4620,36 +4800,49 @@ final: prev: headlines-nvim = buildVimPlugin { pname = "headlines.nvim"; - version = "2024-02-29"; + version = "2024-09-13"; src = fetchFromGitHub { owner = "lukas-reineke"; repo = "headlines.nvim"; - rev = "618ef1b2502c565c82254ef7d5b04402194d9ce3"; - sha256 = "1fq7f4i8pskj592lr0620j5chgczhlag6zph49zpm9zziqyak5ak"; + rev = "bf17c96a836ea27c0a7a2650ba385a7783ed322e"; + sha256 = "1y3hffh9kb5x35a0bjggjjgyhna14nvx5rzghj1hx0yrf9b1hrid"; }; meta.homepage = "https://github.com/lukas-reineke/headlines.nvim/"; }; heirline-nvim = buildVimPlugin { pname = "heirline.nvim"; - version = "2024-05-21"; + version = "2024-09-23"; src = fetchFromGitHub { owner = "rebelot"; repo = "heirline.nvim"; - rev = "0d797435e54645a5f98bad7ad6046aac1ef95c1e"; - sha256 = "0payyx0j0s4wgk5xvczdnjqkj5nymlhw4f7hcw3sl9m334vnxshb"; + rev = "7a79753c1a42c3f52e89a6c42429e7f871e560cd"; + sha256 = "065llk3pbmyrgapa2k835rcf2k7s7b8qfx94jcbqg8v30r6s6ah3"; }; meta.homepage = "https://github.com/rebelot/heirline.nvim/"; }; + helpview-nvim = buildVimPlugin { + pname = "helpview.nvim"; + version = "2024-08-26"; + src = fetchFromGitHub { + owner = "OXY2DEV"; + repo = "helpview.nvim"; + rev = "857aec1dab331252910da158ab6cbfbc65239c71"; + sha256 = "1n3n6zy61iplgffny2fylilvb7sdijfr83bqhchyi2f0hfmjcr8x"; + fetchSubmodules = true; + }; + meta.homepage = "https://github.com/OXY2DEV/helpview.nvim/"; + }; + hex-nvim = buildVimPlugin { pname = "hex.nvim"; - version = "2024-03-03"; + version = "2024-09-03"; src = fetchFromGitHub { owner = "RaafatTurki"; repo = "hex.nvim"; - rev = "cbffd2ce4b8be089360e3c95d5909cd511d8840c"; - sha256 = "0dvhgdab3f2w7irh164qglj44h4hqba15yq223ckhka7l9r8nggq"; + rev = "d0f553dcd2c08d226026d769119b2eb6b09b8dfd"; + sha256 = "0dqv23i08ng4g7mm35g484p39i4b3vr6xnz3m7ij7n3d6bpfc8c3"; }; meta.homepage = "https://github.com/RaafatTurki/hex.nvim/"; }; @@ -4680,13 +4873,14 @@ final: prev: himalaya-vim = buildVimPlugin { pname = "himalaya-vim"; - version = "2024-05-27"; - src = fetchgit { - url = "https://git.sr.ht/~soywod/himalaya-vim"; - rev = "cea041c927a04a841aea53abcedd4a0d153d4ca8"; - sha256 = "0yrilhvqklfbfknkdskywf95mfhbr9rfjs2gmppnzgfs7fg6jn63"; + version = "2024-09-10"; + src = fetchFromGitHub { + owner = "pimalaya"; + repo = "himalaya-vim"; + rev = "f25c003e8fe532348b4080bf8d738cfa1bbf1f5f"; + sha256 = "0dv6mxwq6yv6if1lfb45j49rl6bghyr1hn1xfbz9g9cbb7fna2x1"; }; - meta.homepage = "https://git.sr.ht/~soywod/himalaya-vim"; + meta.homepage = "https://github.com/pimalaya/himalaya-vim/"; }; hlint-refactor-vim = buildVimPlugin { @@ -4739,24 +4933,24 @@ final: prev: hop-nvim = buildVimPlugin { pname = "hop.nvim"; - version = "2024-05-26"; + version = "2024-08-08"; src = fetchFromGitHub { owner = "smoka7"; repo = "hop.nvim"; - rev = "036462a345792279c58f2f6445756efab706f04a"; - sha256 = "0das4rci4p3zfmjxkm8rax5pwp81bvssz0cnyzgjqjbzxfijd6px"; + rev = "8f51ef02700bb3cdcce94e92eff16170a6343c4f"; + sha256 = "07py0rhr6wx1nbq8i20a71iv0arp7ym75ffyb3d3n5icmf53inl4"; }; meta.homepage = "https://github.com/smoka7/hop.nvim/"; }; hotpot-nvim = buildVimPlugin { pname = "hotpot.nvim"; - version = "2024-05-19"; + version = "2024-09-19"; src = fetchFromGitHub { owner = "rktjmp"; repo = "hotpot.nvim"; - rev = "7f53e1d4fdc907e808999c83ad3592e336398add"; - sha256 = "0kn3jmzicpp2r6q3p1bdv2yw32b8rpilzafs25hpryanyngbswmk"; + rev = "8ffe314cc7d762983dc3690d8dab30342483548a"; + sha256 = "1azkh04zs6g6n0fpxb6qydk45iqllkngvxn2xkyxbjyk3zb5jls0"; }; meta.homepage = "https://github.com/rktjmp/hotpot.nvim/"; }; @@ -4787,12 +4981,12 @@ final: prev: hydra-nvim = buildVimPlugin { pname = "hydra.nvim"; - version = "2024-03-14"; + version = "2024-09-05"; src = fetchFromGitHub { owner = "nvimtools"; repo = "hydra.nvim"; - rev = "8578056a2226ed49fc608167edc143a87f75d809"; - sha256 = "sha256-Qxp2FigXlupAw/ZwZRVJ+hRKzVRtupV6L4a6jOslwI0="; + rev = "7f5341643107d05a8d7d4fdea00b29af28517380"; + sha256 = "0f9vxv0lxzd4qpikdjinh62vfxg55dm0drcm2ms17igsfjn4myd0"; }; meta.homepage = "https://github.com/nvimtools/hydra.nvim/"; }; @@ -4859,16 +5053,28 @@ final: prev: image-nvim = buildNeovimPlugin { pname = "image.nvim"; - version = "2024-06-16"; + version = "2024-09-22"; src = fetchFromGitHub { owner = "3rd"; repo = "image.nvim"; - rev = "bdd5506be7fb39668692e30141f1637b691379af"; - sha256 = "0dfvg393l0rwr8lm25fkw8gh1vx592jc1ccslal81jvyjnvgc237"; + rev = "f95cb9cca3a05033d5e94cfd760a48ec9a7d4719"; + sha256 = "0dhcgc79481p2v3k4mkw63l0ny5dybhppir6xlvq2mvgawwdh3nm"; }; meta.homepage = "https://github.com/3rd/image.nvim/"; }; + img-clip-nvim = buildVimPlugin { + pname = "img-clip.nvim"; + version = "2024-08-26"; + src = fetchFromGitHub { + owner = "HakonHarnes"; + repo = "img-clip.nvim"; + rev = "28a32d811d69042f4fa5c3d5fa35571df2bc1623"; + sha256 = "0yi94bsr3yja619lrh9npsqrzvbk2207j3wnzdvidbbb1nix2dsd"; + }; + meta.homepage = "https://github.com/HakonHarnes/img-clip.nvim/"; + }; + impatient-nvim = buildVimPlugin { pname = "impatient.nvim"; version = "2023-05-05"; @@ -4895,12 +5101,12 @@ final: prev: inc-rename-nvim = buildVimPlugin { pname = "inc-rename.nvim"; - version = "2024-06-06"; + version = "2024-07-03"; src = fetchFromGitHub { owner = "smjonas"; repo = "inc-rename.nvim"; - rev = "535b508c0cb14d00c1836ad901b3c531cb1152bb"; - sha256 = "0bng09gybbcm34xdj50m32s303ips319mdh0q7va99228zyf8nib"; + rev = "8ba77017ca468f3029bf88ef409c2d20476ea66b"; + sha256 = "01rapsr481ghxg4xr3qjnvrnnyk5hyh4bcv45a6vl9j2cnz83f59"; }; meta.homepage = "https://github.com/smjonas/inc-rename.nvim/"; }; @@ -4943,12 +5149,12 @@ final: prev: indent-blankline-nvim = buildVimPlugin { pname = "indent-blankline.nvim"; - version = "2024-05-23"; + version = "2024-09-03"; src = fetchFromGitHub { owner = "lukas-reineke"; repo = "indent-blankline.nvim"; - rev = "d98f537c3492e87b6dc6c2e3f66ac517528f406f"; - sha256 = "0zb52msar7hl38xmi3pvjsynjabqyv2rsajrzdx46wqp018v971b"; + rev = "18603eb949eba08300799f64027af11ef922283f"; + sha256 = "0jai4zh4xf9h981419k5k7dvvwkcippcyc6arfv06pqjy2b6xr77"; }; meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/"; }; @@ -5063,12 +5269,12 @@ final: prev: iron-nvim = buildVimPlugin { pname = "iron.nvim"; - version = "2024-05-17"; + version = "2024-07-10"; src = fetchFromGitHub { owner = "Vigemus"; repo = "iron.nvim"; - rev = "c993d018d11829528b0fe91eb9ba412e453071ea"; - sha256 = "04pc9m1zw02b1yz3j2ldw78asvcr9hfyx1sdx7zxb4pcx8l6i2p5"; + rev = "e6b78ec1bc56eab63b3a9112d348b3d79836b672"; + sha256 = "05qi8klifccrdl1pv9005hiz42n2w7if192qskgx6r88p6fspds8"; }; meta.homepage = "https://github.com/Vigemus/iron.nvim/"; }; @@ -5099,12 +5305,12 @@ final: prev: jedi-vim = buildVimPlugin { pname = "jedi-vim"; - version = "2023-12-30"; + version = "2024-07-06"; src = fetchFromGitHub { owner = "davidhalter"; repo = "jedi-vim"; - rev = "9bd79ee41ac59a33f5890fa50b6d6a446fcc38c7"; - sha256 = "04ikd9qhhjrm0ivzn79q45g53mxcsvgnxnpi3vma2v1z3rrz413g"; + rev = "130ce7fb7910b99b494b0d7ed665e40bfb6663bd"; + sha256 = "09x0pg9i509p68by29xbfw6ral59vdj7b4dz910zcwxqdnn0kjqz"; fetchSubmodules = true; }; meta.homepage = "https://github.com/davidhalter/jedi-vim/"; @@ -5136,12 +5342,13 @@ final: prev: jinja-vim = buildVimPlugin { pname = "jinja.vim"; - version = "2020-06-18"; + version = "2024-09-09"; src = fetchFromGitHub { owner = "HiPhish"; repo = "jinja.vim"; - rev = "51b8a2a504416c4959127c82eac26f14f3508975"; - sha256 = "15ax7v6crdzra4sqqmjpvl9q1p9dmsksrs4j68zqqrj6kka0zkgn"; + rev = "d112541c062122969c6c0bc3df7e3cab3595c253"; + sha256 = "0xcvzjnhgwjw42mm0j5ikw2yqsm4w7ibgmkfxf61fn23npzjalf7"; + fetchSubmodules = true; }; meta.homepage = "https://github.com/HiPhish/jinja.vim/"; }; @@ -5209,12 +5416,12 @@ final: prev: kanagawa-nvim = buildVimPlugin { pname = "kanagawa.nvim"; - version = "2024-06-12"; + version = "2024-08-27"; src = fetchFromGitHub { owner = "rebelot"; repo = "kanagawa.nvim"; - rev = "fe5b2c9e2549862c3dc3f3c8e9cf7ddece0f40c2"; - sha256 = "1ip8f9i822d6mmaxvzrvap19k5lr9mp8k6lgh2xyspszbgxi0nhg"; + rev = "f491b0fe68fffbece7030181073dfe51f45cda81"; + sha256 = "0zfgynkk2jpdkdh30zjazb2i32d2h3iz7xg3v2aviqfg4dcazqjj"; }; meta.homepage = "https://github.com/rebelot/kanagawa.nvim/"; }; @@ -5317,60 +5524,60 @@ final: prev: lazy-lsp-nvim = buildVimPlugin { pname = "lazy-lsp.nvim"; - version = "2024-05-01"; + version = "2024-09-10"; src = fetchFromGitHub { owner = "dundalek"; repo = "lazy-lsp.nvim"; - rev = "17deb64279389056b6edd4b0619d8dc391798b6a"; - sha256 = "0lzihyajpjmj8g0jqbm5mgdkafbpc061bwjrsryswvgan1j5y5bv"; + rev = "7c613c1a31262dd912300060f9887eed87048dc5"; + sha256 = "0j4256mz0zxbbz01qwzick4f0wakx58pv5d3wf7bpgk1fscylb9k"; }; meta.homepage = "https://github.com/dundalek/lazy-lsp.nvim/"; }; lazy-nvim = buildVimPlugin { pname = "lazy.nvim"; - version = "2024-06-18"; + version = "2024-09-16"; src = fetchFromGitHub { owner = "folke"; repo = "lazy.nvim"; - rev = "bc620783663ab09d16bff9fdecc07da65b2a1528"; - sha256 = "180rvpy9bv7c7gnimhwgzyxr2hml9v371ki8n73v726ssk4x1pzc"; + rev = "460e1cd8f24e364d54543a4b0e83f6f4ec1f65fb"; + sha256 = "0xgc39xir6i0z4i9hm8sp2ldfzza630rz1bk9vwh277v64cvgnq2"; }; meta.homepage = "https://github.com/folke/lazy.nvim/"; }; lazydev-nvim = buildVimPlugin { pname = "lazydev.nvim"; - version = "2024-06-15"; + version = "2024-07-25"; src = fetchFromGitHub { owner = "folke"; repo = "lazydev.nvim"; - rev = "6184ebbbc8045d70077659b7d30c705a588dc62f"; - sha256 = "1kj3p5x7h8k1xp8m5pxjkzbfigcbrschgm1kzlc3qkv0py3i5k5h"; + rev = "491452cf1ca6f029e90ad0d0368848fac717c6d2"; + sha256 = "1yc87wv6g19yj1gypfy4nl9irpb7zfqlw98vyaf8aqjgnpd0z60g"; }; meta.homepage = "https://github.com/folke/lazydev.nvim/"; }; lazygit-nvim = buildVimPlugin { pname = "lazygit.nvim"; - version = "2024-05-13"; + version = "2024-08-10"; src = fetchFromGitHub { owner = "kdheepak"; repo = "lazygit.nvim"; - rev = "ad3e1ea592f9d13e86e0d4e850224d9d78069508"; - sha256 = "19prmdslqjbk40wd60is27zwsspsvxi5lsk5wp9yry5s7wzjrw7x"; + rev = "2432b447483f42ff2e18b2d392cb2bb27e495c08"; + sha256 = "0mwx0vdsid6crzwv30wayhw2qszynr6xyrmkbpxik26ghgwcpzb0"; }; meta.homepage = "https://github.com/kdheepak/lazygit.nvim/"; }; lean-nvim = buildVimPlugin { pname = "lean.nvim"; - version = "2024-06-10"; + version = "2024-09-23"; src = fetchFromGitHub { owner = "Julian"; repo = "lean.nvim"; - rev = "3c0b48374146abd651da5623f3f73f96121a616f"; - sha256 = "145hpcg64pxxfqhryzs88q0yyw163a892npsra6rbdnca1jzlr8z"; + rev = "3476b940c4344c83db6350fae5c56c5911ffe7da"; + sha256 = "0hd47a4is10zpn3ggmkr7g63q0r0gpm5x832nm56v9wid73x3f69"; }; meta.homepage = "https://github.com/Julian/lean.nvim/"; }; @@ -5401,24 +5608,24 @@ final: prev: leap-nvim = buildVimPlugin { pname = "leap.nvim"; - version = "2024-06-18"; + version = "2024-07-30"; src = fetchFromGitHub { owner = "ggandor"; repo = "leap.nvim"; - rev = "2ec33f2a38974fe6997c42c5ce61ce84eab84cc8"; - sha256 = "0xavag2c5mq5ii14b5dvm7nm13cs97nhag28gpvjdzwgkzz3c21v"; + rev = "c6bfb191f1161fbabace1f36f578a20ac6c7642c"; + sha256 = "1dmy45czi3irjd5qb74yamjam4d1lvqsgfxgh4vaj740b19gyl1w"; }; meta.homepage = "https://github.com/ggandor/leap.nvim/"; }; legendary-nvim = buildVimPlugin { pname = "legendary.nvim"; - version = "2024-06-14"; + version = "2024-09-20"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "legendary.nvim"; - rev = "89e0d00c5aed623c1f29cf2a963fd1737358e92a"; - sha256 = "0i4xh66xydssvr4n2kknrg1qibj8ikfvy5m6ljbmhbvgxim74y48"; + rev = "38510be22198cded0ffc535d54368e2ee3b3accd"; + sha256 = "1g1lapjfs4v9xs69zscr3v5vrpvycbjnp0mpc84pwbridvihw3pq"; }; meta.homepage = "https://github.com/mrjones2014/legendary.nvim/"; }; @@ -5473,24 +5680,24 @@ final: prev: lh-brackets = buildVimPlugin { pname = "lh-brackets"; - version = "2024-02-08"; + version = "2024-08-29"; src = fetchFromGitHub { owner = "LucHermitte"; repo = "lh-brackets"; - rev = "4899ead266d99e0b9749b9e44f6a33ea83384a7d"; - sha256 = "0bg8p4g0v3y7sikcwb1g2n3kr4rcafskg1if6gh1xnr1g0czbckw"; + rev = "40af9b67424003a03e8384eab81256bfe535db0b"; + sha256 = "0sbxvmdrhjc85srl98gzn1gwllnjy8q50w5ryj49c94s9l2pj54l"; }; meta.homepage = "https://github.com/LucHermitte/lh-brackets/"; }; lh-vim-lib = buildVimPlugin { pname = "lh-vim-lib"; - version = "2024-02-28"; + version = "2024-08-18"; src = fetchFromGitHub { owner = "LucHermitte"; repo = "lh-vim-lib"; - rev = "612538b5dede34e1b4e1a152b6b50516ef658ae5"; - sha256 = "05d2n4hq7xfsw88abbi3b60407rxaf04za85zainw2xr2gvw4zsa"; + rev = "db1c7b4261be24a79f62dc22c8061b8bdd9f2333"; + sha256 = "1vfphkvkfydw69hp7rhm7h3nm2na75cq4vrlk8qxxqphxn51g9jr"; }; meta.homepage = "https://github.com/LucHermitte/lh-vim-lib/"; }; @@ -5569,12 +5776,12 @@ final: prev: limelight-vim = buildVimPlugin { pname = "limelight.vim"; - version = "2024-04-30"; + version = "2024-09-12"; src = fetchFromGitHub { owner = "junegunn"; repo = "limelight.vim"; - rev = "785c1e17fe90c587ebca88920baa3146cd6e30fa"; - sha256 = "0r97jh94r09a1c2vap7ybdn5kqpm24xwfsl9fxhvfhj6mlf1n2hm"; + rev = "0c8cc7f503a775c505dc9c67f1f5041ab4d5f1fd"; + sha256 = "0qdll4x01912ldlv9ixh5z4zn8fddybc9mv53c8dx2advkglb6cg"; }; meta.homepage = "https://github.com/junegunn/limelight.vim/"; }; @@ -5617,12 +5824,12 @@ final: prev: litee-calltree-nvim = buildVimPlugin { pname = "litee-calltree.nvim"; - version = "2024-04-02"; + version = "2024-09-05"; src = fetchFromGitHub { owner = "ldelossa"; repo = "litee-calltree.nvim"; - rev = "3908f52f2e69438cdeca32771d449f8ef3ee3bcc"; - sha256 = "1x1100r11k0g0nkc6a2l1hsjciav5df6k9qv8bxj051wkwawzg0g"; + rev = "89fd050e782328196520f5f1c0be85b25b065779"; + sha256 = "0l8mqz3jwr7mn1ij40vvpw0ng2h3bmahnxwg9v9v0f84wbp3813v"; }; meta.homepage = "https://github.com/ldelossa/litee-calltree.nvim/"; }; @@ -5665,12 +5872,12 @@ final: prev: live-command-nvim = buildVimPlugin { pname = "live-command.nvim"; - version = "2023-06-05"; + version = "2024-09-20"; src = fetchFromGitHub { owner = "smjonas"; repo = "live-command.nvim"; - rev = "d460067d47948725a6f25b20f31ea8bbfdfe4622"; - sha256 = "0l7g7yjx4hz35nnz04k7qpjkd9z1rrp2n047p2k7zifjihiqbf3v"; + rev = "b0723697bf60d89ede953c4a5fedce3157784c15"; + sha256 = "08fmcj5r1l80bi6gqsm8g6px4zfqr9sq4kck89y5rfs99j6janyk"; }; meta.homepage = "https://github.com/smjonas/live-command.nvim/"; }; @@ -5701,12 +5908,12 @@ final: prev: lsp-format-nvim = buildVimPlugin { pname = "lsp-format.nvim"; - version = "2024-04-03"; + version = "2024-08-29"; src = fetchFromGitHub { owner = "lukas-reineke"; repo = "lsp-format.nvim"; - rev = "3612642b0e2eb85015838df5dcfbacb61f15db98"; - sha256 = "1pizkn16ma7yfsy19g06f6l6zkqwsjkmzybqhhhp18xbbyj7m8cc"; + rev = "47de35b54ec95bb049f52016632394b914d4d9e9"; + sha256 = "1mvdgsbx1qls0iks87k9d7xrz2p06sc1vz8rz8q64s0gvfpc5n67"; }; meta.homepage = "https://github.com/lukas-reineke/lsp-format.nvim/"; }; @@ -5725,12 +5932,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 +5968,12 @@ final: prev: lsp-zero-nvim = buildVimPlugin { pname = "lsp-zero.nvim"; - version = "2024-05-26"; + version = "2024-07-21"; src = fetchFromGitHub { owner = "VonHeikemen"; repo = "lsp-zero.nvim"; - rev = "16de3b18c5f7b6230d89b8e64ce9a4801b6f8d08"; - sha256 = "1z39f3qagyhrm90hz4pilbqnbyncpxgzsx236yw9mdgfqni912ms"; + rev = "56db3d5ce5476b183783160e6045f7337ba12b83"; + sha256 = "0drk31bkws1bhjl0l2z7vmcqjn3y1bvhic78dr63j5j9wiyaxzvq"; }; meta.homepage = "https://github.com/VonHeikemen/lsp-zero.nvim/"; }; @@ -5796,48 +6003,48 @@ final: prev: lsp_signature-nvim = buildVimPlugin { pname = "lsp_signature.nvim"; - version = "2024-06-15"; + version = "2024-09-16"; src = fetchFromGitHub { owner = "ray-x"; repo = "lsp_signature.nvim"; - rev = "a38da0a61c172bb59e34befc12efe48359884793"; - sha256 = "1p6fznwg6pxr39x08lf9qhjkcvfysd58k1as6d4lwibkav7rfkki"; + rev = "fc38521ea4d9ec8dbd4c2819ba8126cea743943b"; + sha256 = "0ag79vvjz1dqyw9358ijdkckr1rqshxkpk5fl0kww1vl3pfwv9jv"; }; meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/"; }; lspcontainers-nvim = buildVimPlugin { pname = "lspcontainers.nvim"; - version = "2024-01-04"; + version = "2024-07-16"; src = fetchFromGitHub { owner = "lspcontainers"; repo = "lspcontainers.nvim"; - rev = "1b2ca8d4bdf2926c91ba49bb27d5f3111dac530d"; - sha256 = "15nfgz7759liwg6rw189k8acf10rl0xb69fc59pagldi4l7xngvx"; + rev = "a162fda7f703b40175dfbdf51f7f0ed9a5a92379"; + sha256 = "0vfs6p1nfby3k2azcbnvlw6z46a26l5a3j2civ1c5ncg7zsnqwfd"; }; meta.homepage = "https://github.com/lspcontainers/lspcontainers.nvim/"; }; lspkind-nvim = buildVimPlugin { - pname = "lspkind-nvim"; - version = "2024-01-11"; + pname = "lspkind.nvim"; + version = "2024-07-25"; src = fetchFromGitHub { owner = "onsails"; repo = "lspkind.nvim"; - rev = "1735dd5a5054c1fb7feaf8e8658dbab925f4f0cf"; - sha256 = "0sjd244122q7hs3xaxzxhfcfpnzjz082rbnishq6khnr9w2xs0px"; + rev = "cff4ae321a91ee3473a92ea1a8c637e3a9510aec"; + sha256 = "0l66zyawfjy0r7rhi80skk6x156ybr72jlh4qxk0xd0l2hkbm8nl"; }; meta.homepage = "https://github.com/onsails/lspkind.nvim/"; }; lspsaga-nvim = buildVimPlugin { pname = "lspsaga.nvim"; - version = "2024-06-11"; + version = "2024-09-10"; src = fetchFromGitHub { owner = "nvimdev"; repo = "lspsaga.nvim"; - rev = "6f920cfabddb9b7de5a3a4d0b7cd4f0774ae23e2"; - sha256 = "1zgc53kdc10k7pa67svjw9bndazblmjw1lrsmdprggsxvcd1x2n8"; + rev = "e64351d0e6335eadf089aa2b9f17221e54ca10a4"; + sha256 = "0n8jmfg7rg23skdd4qlqyx78acww6ahskd3j6l5k2lvh5jlxjc4r"; }; meta.homepage = "https://github.com/nvimdev/lspsaga.nvim/"; }; @@ -5868,24 +6075,24 @@ final: prev: lualine-nvim = buildVimPlugin { pname = "lualine.nvim"; - version = "2024-04-05"; + version = "2024-08-12"; src = fetchFromGitHub { owner = "nvim-lualine"; repo = "lualine.nvim"; - rev = "0a5a66803c7407767b799067986b4dc3036e1983"; - sha256 = "1llhfs5wgv87k5hv8mdyv4qjpw37zq27488lq0j063jicxszdhar"; + rev = "b431d228b7bbcdaea818bdc3e25b8cdbe861f056"; + sha256 = "1q8f0vl60hllxkmmras05cliklzqvi3yrb9rhamrr4cgvsdvnac0"; }; meta.homepage = "https://github.com/nvim-lualine/lualine.nvim/"; }; luasnip = buildNeovimPlugin { pname = "luasnip"; - version = "2024-06-07"; + version = "2024-09-12"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "50fcf17db7c75af80e6b6109acfbfb4504768780"; - sha256 = "0aa5imzbfz50d7vpmxixqjri147x7w7883p8qm6dp2m1ygijrx30"; + rev = "e808bee352d1a6fcf902ca1a71cee76e60e24071"; + sha256 = "1yf50bwcg94bprbczcki7c1n318m6ar99m8h1yrmn6m0w4cbvf8r"; fetchSubmodules = true; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; @@ -5893,24 +6100,24 @@ final: prev: luatab-nvim = buildVimPlugin { pname = "luatab.nvim"; - version = "2024-06-16"; + version = "2024-07-03"; src = fetchFromGitHub { owner = "alvarosevilla95"; repo = "luatab.nvim"; - rev = "93504f3eda13fc925834429d4caa419d65bc6a01"; - sha256 = "138wp7qm2w0p7y02hplnl6grgi49p9r9wbxfb6brx1zgyqqcxv09"; + rev = "7bc6e0f6957fbaa93c98529f2cf28052329002e0"; + sha256 = "106sl5c38ydjfzaa56cpzkqm0k5fyszxhqvyaax6rpkhv9q7xdds"; }; meta.homepage = "https://github.com/alvarosevilla95/luatab.nvim/"; }; lush-nvim = buildNeovimPlugin { pname = "lush.nvim"; - version = "2024-04-18"; + version = "2024-08-16"; src = fetchFromGitHub { owner = "rktjmp"; repo = "lush.nvim"; - rev = "7c0e27f50901481fe83b974493c4ea67a4296aeb"; - sha256 = "0cacfxrvm1fx73q5mch72gglrg6hvi39w78wgfb7dfkby1j8hl8r"; + rev = "45a79ec4acb5af783a6a29673a999ce37f00497e"; + sha256 = "0ac93sdhsi41hpwpshffpkvj5c3kklflsy0pln77743x69g05rcr"; }; meta.homepage = "https://github.com/rktjmp/lush.nvim/"; }; @@ -5927,16 +6134,16 @@ final: prev: meta.homepage = "https://github.com/mkasa/lushtags/"; }; - lz-n = buildNeovimPlugin { - pname = "lz.n"; - version = "2024-06-19"; + luvit-meta = buildVimPlugin { + pname = "luvit-meta"; + version = "2024-01-20"; src = fetchFromGitHub { - owner = "nvim-neorocks"; - repo = "lz.n"; - rev = "ed1dfca4c69ad84558bace90740b3ea2dd6ac842"; - sha256 = "122rx7khasj0liwrw07m4x7ysq86342b3q5fzg0gdkln7nn5pv4n"; + owner = "Bilal2453"; + repo = "luvit-meta"; + rev = "ce76f6f6cdc9201523a5875a4471dcfe0186eb60"; + sha256 = "0a0n67day3zpfxck7yiqb496bz79gwhcvdn60b0f4bp8bysjj06c"; }; - meta.homepage = "https://github.com/nvim-neorocks/lz.n/"; + meta.homepage = "https://github.com/Bilal2453/luvit-meta/"; }; magma-nvim-goose = buildVimPlugin { @@ -5977,12 +6184,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/"; }; @@ -6001,24 +6208,37 @@ final: prev: marks-nvim = buildVimPlugin { pname = "marks.nvim"; - version = "2024-01-07"; + version = "2024-09-02"; src = fetchFromGitHub { owner = "chentoast"; repo = "marks.nvim"; - rev = "74e8d01b2a2131b6e46354cffc553aa7f81bcf5b"; - sha256 = "0hi4sp39gxj62swm325a5s25qv310wxj9amkdghdqmrg6nlcwyz2"; + rev = "bb25ae3f65f504379e3d08c8a02560b76eaf91e8"; + sha256 = "0hf2w5js47sa67f23pkcgkgz4m1x96fwh460zs95sqk1yn9a2zfm"; }; meta.homepage = "https://github.com/chentoast/marks.nvim/"; }; + markview-nvim = buildVimPlugin { + pname = "markview.nvim"; + version = "2024-09-10"; + src = fetchFromGitHub { + owner = "OXY2DEV"; + repo = "markview.nvim"; + rev = "f16486e49561740f33b6773df43c9bc2c3c34c7b"; + sha256 = "1249agw6vfd2p3d3h5lm2ipyif3mgvmmzgix6mz08pipmvq2spx7"; + fetchSubmodules = true; + }; + meta.homepage = "https://github.com/OXY2DEV/markview.nvim/"; + }; + mason-lspconfig-nvim = buildVimPlugin { pname = "mason-lspconfig.nvim"; - version = "2024-06-12"; + version = "2024-09-08"; src = fetchFromGitHub { owner = "williamboman"; repo = "mason-lspconfig.nvim"; - rev = "37a336b653f8594df75c827ed589f1c91d91ff6c"; - sha256 = "1xiv4km5m3y8znqq2a5f31fqw5aygcdr11lwpg0xrvf359z41g7i"; + rev = "25c11854aa25558ee6c03432edfa0df0217324be"; + sha256 = "0wqbb6a6p5iq7h47snbcbrh1x7nqf9v959a2zq08pw5b9f7qclal"; }; meta.homepage = "https://github.com/williamboman/mason-lspconfig.nvim/"; }; @@ -6037,12 +6257,12 @@ final: prev: mason-nvim = buildVimPlugin { pname = "mason.nvim"; - version = "2024-06-01"; + version = "2024-07-16"; src = fetchFromGitHub { owner = "williamboman"; repo = "mason.nvim"; - rev = "0950b15060067f752fde13a779a994f59516ce3d"; - sha256 = "1g8wb8j0jn0pakskdcxif0n2gp92cl2qlrlfxphhvhixgy7kwzyg"; + rev = "e2f7f9044ec30067bc11800a9e266664b88cda22"; + sha256 = "0rnscicsvlcxcp5i3pzym8wqg0qv664j15b4vnm1rlhbq2bsqjhp"; }; meta.homepage = "https://github.com/williamboman/mason.nvim/"; }; @@ -6061,24 +6281,24 @@ final: prev: material-nvim = buildVimPlugin { pname = "material.nvim"; - version = "2024-06-15"; + version = "2024-09-03"; src = fetchFromGitHub { owner = "marko-cerovac"; repo = "material.nvim"; - rev = "173bde5eea25e73c5ece9448e19c3e30b5b21ae1"; - sha256 = "0smlnk3d5dv33ww1k96f7mbyy6xs3ma179f86kifv08k1wn7n4xq"; + rev = "ac8f02e97e359b7d258c0a00ec0949fe880790ad"; + sha256 = "1yjgl6rbcb90vghs3wq5rifws7n0caq12l3qfqxc7q2c8ap36ym6"; }; meta.homepage = "https://github.com/marko-cerovac/material.nvim/"; }; material-vim = buildVimPlugin { pname = "material.vim"; - version = "2024-03-04"; + version = "2024-08-02"; src = fetchFromGitHub { owner = "kaicataldo"; repo = "material.vim"; - rev = "07e70d5d675fadb1e81191b2d990b2a72edccf0d"; - sha256 = "1rv7hp3gvzvvvh2vifz8r9g12srbldysgnydljp71qs3pwbqpp2v"; + rev = "cecac931e8bd9e3d2cbb7c1e24ddb98887176f68"; + sha256 = "15yaahzva9vg87s2pbipwrkk2f0w7mjxwzmyrr8wb5f8rncxx01f"; }; meta.homepage = "https://github.com/kaicataldo/material.vim/"; }; @@ -6109,24 +6329,36 @@ final: prev: melange-nvim = buildVimPlugin { pname = "melange-nvim"; - version = "2024-05-29"; + version = "2024-09-21"; src = fetchFromGitHub { owner = "savq"; repo = "melange-nvim"; - rev = "b76b906cd6ed3c3152a47924a8eb5dcb35b326d8"; - sha256 = "0xy98wlbdljcf08wzl4hndwadmswb3a4jmf0ynnrrkczg73pbq2b"; + rev = "706a33f0a883fae9ec00ad648586792248a0575e"; + sha256 = "14jbkr4j4s2kg4b0bp0d2whjrj633dlhglqzg672aiyagcrbw7bm"; }; meta.homepage = "https://github.com/savq/melange-nvim/"; }; + messenger-nvim = buildVimPlugin { + pname = "messenger.nvim"; + version = "2024-07-18"; + src = fetchFromGitHub { + owner = "lsig"; + repo = "messenger.nvim"; + rev = "309fec2ddd3de55eba2781b676931b37ce8190af"; + sha256 = "1ycvxxcp04hh134nazdrzd9g98mkdipc2p0amvcphpqr9p9s3pcm"; + }; + meta.homepage = "https://github.com/lsig/messenger.nvim/"; + }; + miasma-nvim = buildVimPlugin { pname = "miasma.nvim"; - version = "2023-10-24"; + version = "2024-08-23"; src = fetchFromGitHub { owner = "xero"; repo = "miasma.nvim"; - rev = "c672feec07d4e77ac485ee58e3432a96ebe51953"; - sha256 = "187d35g6s53rs7zi3p8c4d8sy23qdpzy22i2vmr8apzgc2hirvx7"; + rev = "37818b190e291c75a2d78118dc7dd8d69d311a8c"; + sha256 = "12ng6y9c9a35gr2ak3fhwgxial53ryhkaspvby30kz31vr6p0a9m"; }; meta.homepage = "https://github.com/xero/miasma.nvim/"; }; @@ -6155,18 +6387,510 @@ final: prev: meta.homepage = "https://github.com/hadronized/mind.nvim/"; }; + mini-git = buildVimPlugin { + pname = "mini-git"; + version = "2024-09-07"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini-git"; + rev = "f75ae3855f595e55e1a8a96521ffa01012632b28"; + sha256 = "1d7yy9lbz5ysk5519j25y1gciyq1a2kidzppn7vg0bzwcf6302qg"; + }; + meta.homepage = "https://github.com/echasnovski/mini-git/"; + }; + + mini-ai = buildVimPlugin { + pname = "mini.ai"; + version = "2024-09-05"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.ai"; + rev = "40e380a589d07ec2c856940c6422aafe5d949a0d"; + sha256 = "0nm4sx5r7k9px46v3v7krrj8qnpxbqz15bxqk60f2pjds67vpv4y"; + }; + meta.homepage = "https://github.com/echasnovski/mini.ai/"; + }; + + mini-align = buildVimPlugin { + pname = "mini.align"; + version = "2024-09-05"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.align"; + rev = "26111a737494bc39576ad67b52bbc2638ca23553"; + sha256 = "1cx3xavcgna5x05mzjc254cv3cwhjckmg1j38vqn4dw9naadb6pb"; + }; + meta.homepage = "https://github.com/echasnovski/mini.align/"; + }; + + mini-animate = buildVimPlugin { + pname = "mini.animate"; + version = "2024-09-06"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.animate"; + rev = "d33ddf0eefee6338bbd95805c4595c1b34e6bfe2"; + sha256 = "1fn5vsz5m3v63gmg1i03zi9qbmlbbjgm24k3j9lmwlin75cnxizh"; + }; + meta.homepage = "https://github.com/echasnovski/mini.animate/"; + }; + + mini-base16 = buildVimPlugin { + pname = "mini.base16"; + version = "2024-09-10"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.base16"; + rev = "aaa564b9c6d34466d542494393ab51efc99b9d0b"; + sha256 = "1sj97196vi3qkfkxpdr4ajd3li42pvzmd1zpcr0ggab05rnpawrq"; + }; + meta.homepage = "https://github.com/echasnovski/mini.base16/"; + }; + + mini-basics = buildVimPlugin { + pname = "mini.basics"; + version = "2024-09-06"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.basics"; + rev = "7d4c6982be471e902c034bea6b3fe348058196d9"; + sha256 = "039jdbjjp713rh0yaa503khwxz6dya28h6arksyj52mfmzajnwrq"; + }; + meta.homepage = "https://github.com/echasnovski/mini.basics/"; + }; + + mini-bracketed = buildVimPlugin { + pname = "mini.bracketed"; + version = "2024-09-06"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.bracketed"; + rev = "833d66df6e0588222312a963780c6ec42ed7437d"; + sha256 = "00zlyj75y36g3kb15bxk2xf9hrnc7xc7nb7qx13vpbl8mp6wwbb2"; + }; + meta.homepage = "https://github.com/echasnovski/mini.bracketed/"; + }; + + mini-bufremove = buildVimPlugin { + pname = "mini.bufremove"; + version = "2024-07-01"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.bufremove"; + rev = "1ee294a97e091d3cf967974df622c0d887890dc2"; + sha256 = "0jhhh2f4zzbixcqbp7540bzgbzgwwipi37knqj1ykpf5py4kp0dm"; + }; + meta.homepage = "https://github.com/echasnovski/mini.bufremove/"; + }; + + mini-clue = buildVimPlugin { + pname = "mini.clue"; + version = "2024-09-06"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.clue"; + rev = "8e329f586a7cfd06085859066a4b60965fc4ecce"; + sha256 = "0s6n4bd5naq50pdyl3ibmk0788823iii6gapqqcnqkvsyi39rp5g"; + }; + meta.homepage = "https://github.com/echasnovski/mini.clue/"; + }; + + mini-colors = buildVimPlugin { + pname = "mini.colors"; + version = "2024-07-01"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.colors"; + rev = "9fa904dd46da5d84028478b9cc689be021732fab"; + sha256 = "1n81am3b3lphq75vs3fwwl14ajk58hqr5znjd4dbcdpr7mz94bzc"; + }; + meta.homepage = "https://github.com/echasnovski/mini.colors/"; + }; + + mini-comment = buildVimPlugin { + pname = "mini.comment"; + version = "2024-07-21"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.comment"; + rev = "03c13e37318bdb18481311c0ac1adc9ed731caf1"; + sha256 = "0hdi07c704jx5a7fbxziw8rqmzm5hx66gj04jpzwgqs1c3hchppf"; + }; + meta.homepage = "https://github.com/echasnovski/mini.comment/"; + }; + + mini-completion = buildVimPlugin { + pname = "mini.completion"; + version = "2024-09-06"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.completion"; + rev = "2b877876ec7c77973a512083e2aa3f13c61c2abe"; + sha256 = "1ryp0qjb82p93afk5rvsrzv6rajr70z9d32n5wxvm6hz2nryzzx3"; + }; + meta.homepage = "https://github.com/echasnovski/mini.completion/"; + }; + + mini-cursorword = buildVimPlugin { + pname = "mini.cursorword"; + version = "2024-09-06"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.cursorword"; + rev = "7d1b38a17834acbbc4feff8e42aedc4ed0c6ff06"; + sha256 = "0vqr4hkzq13ap6giyyp8asn5g6nnm406piq1a07a5nmkfxiskp9v"; + }; + meta.homepage = "https://github.com/echasnovski/mini.cursorword/"; + }; + + mini-deps = buildVimPlugin { + pname = "mini.deps"; + version = "2024-09-06"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.deps"; + rev = "203dd6d947e3415711c732530a82f9c3f2f046a4"; + sha256 = "1xydh3l41hifwmns6aqnrch545h1hqsq4a7mgk915wzp1g843qfs"; + }; + meta.homepage = "https://github.com/echasnovski/mini.deps/"; + }; + + mini-diff = buildVimPlugin { + pname = "mini.diff"; + version = "2024-09-06"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.diff"; + rev = "24d46798be8a358d38d3adc92c7ebcbb2d6f67e0"; + sha256 = "0hbr36s75aa6qhr0lhsqk6fwswd919ixd0jlrfj6paiynh00331r"; + }; + meta.homepage = "https://github.com/echasnovski/mini.diff/"; + }; + + mini-doc = buildVimPlugin { + pname = "mini.doc"; + version = "2024-08-10"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.doc"; + rev = "bb73a3d1ff390f7e2740027ea2567017099a237c"; + sha256 = "1jsamvgdk6zxaimn9v949gbghf92d0ii8jhn2sjjy7arbl8w0w23"; + }; + meta.homepage = "https://github.com/echasnovski/mini.doc/"; + }; + + mini-extra = buildVimPlugin { + pname = "mini.extra"; + version = "2024-08-26"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.extra"; + rev = "4a6ff25b188c318b99f24c2241465f61bbe0e235"; + sha256 = "1bnqlydmsk6jn5aqp8xgp7m7w26h70sbbdj5583n0maarnxylvhs"; + }; + meta.homepage = "https://github.com/echasnovski/mini.extra/"; + }; + + mini-files = buildVimPlugin { + pname = "mini.files"; + version = "2024-09-06"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.files"; + rev = "a3a9cce82115a69dba161ac45bda16f4e606f73b"; + sha256 = "0zzbcfn0bsqky0f2mwzv816fkgxg49aygj7qfp1qq5252c7x32n6"; + }; + meta.homepage = "https://github.com/echasnovski/mini.files/"; + }; + + mini-fuzzy = buildVimPlugin { + pname = "mini.fuzzy"; + version = "2024-07-01"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.fuzzy"; + rev = "ea9d1380ad925c4d0e890f68dbf830d2b19bae5d"; + sha256 = "10ng6rq4ig0ijvbj2bbm428dg3asf40x9b7dsvndk33ikfrlbazz"; + }; + meta.homepage = "https://github.com/echasnovski/mini.fuzzy/"; + }; + + mini-hipatterns = buildVimPlugin { + pname = "mini.hipatterns"; + version = "2024-09-06"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.hipatterns"; + rev = "fdad87bf545aec5210ca9a2c49fddf6284d72d1e"; + sha256 = "1avz4g22x5wc5q1cnppnfxays5wrf7iqjyhn3hsb93zb2895wack"; + }; + meta.homepage = "https://github.com/echasnovski/mini.hipatterns/"; + }; + + mini-hues = buildVimPlugin { + pname = "mini.hues"; + version = "2024-09-10"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.hues"; + rev = "221260589ab28c29af444a0809248a1369f733ca"; + sha256 = "1pi6wmvhbr89xgj2vhmy1rwlb5znwc20nr9c66c40lbabzvxa815"; + }; + meta.homepage = "https://github.com/echasnovski/mini.hues/"; + }; + + mini-icons = buildVimPlugin { + pname = "mini.icons"; + version = "2024-09-06"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.icons"; + rev = "2d89252993fec829b24720097a687412d10f6c85"; + sha256 = "1qg06xia1sm67b10sf6vdhmma9xmwkj7hzlk5dyfg25a7xmf2107"; + }; + meta.homepage = "https://github.com/echasnovski/mini.icons/"; + }; + + mini-indentscope = buildVimPlugin { + pname = "mini.indentscope"; + version = "2024-09-06"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.indentscope"; + rev = "da9af64649e114aa79480c238fd23f6524bc0903"; + sha256 = "1pbhic4q9ikbdgmmvlhpil4aykpf0ryx7dckb36q3xc0ai2gwc6g"; + }; + meta.homepage = "https://github.com/echasnovski/mini.indentscope/"; + }; + + mini-jump = buildVimPlugin { + pname = "mini.jump"; + version = "2024-09-06"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.jump"; + rev = "cd429d8d631a2fa766e60b72ee6fbff78afa3fda"; + sha256 = "1qxddzdnkhzj8dx7wrm3abf5h161l3drvbfpw4638vx3bz5v504q"; + }; + meta.homepage = "https://github.com/echasnovski/mini.jump/"; + }; + + mini-jump2d = buildVimPlugin { + pname = "mini.jump2d"; + version = "2024-09-06"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.jump2d"; + rev = "b0963aa2ec80b4b1ed1c7f93d9c969bb3f4b65b6"; + sha256 = "1r0vqpa803yqmb0s1phpm1lf5xm94qsrmjc8gghdspxpk5iszv4d"; + }; + meta.homepage = "https://github.com/echasnovski/mini.jump2d/"; + }; + + mini-map = buildVimPlugin { + pname = "mini.map"; + version = "2024-09-06"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.map"; + rev = "4c58e755d75f9999abcd3b3c6e934734b6a8b098"; + sha256 = "1407jgrzk0pvnhsssm3hdgjw3vd1n182adgh8c5h4b46dzvrvgvl"; + }; + meta.homepage = "https://github.com/echasnovski/mini.map/"; + }; + + mini-misc = buildVimPlugin { + pname = "mini.misc"; + version = "2024-09-09"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.misc"; + rev = "428da688126b320194a944233f9f8dfc46669307"; + sha256 = "1iiv5v3n7aynsk75bdp6b098n6ny6fg5iccdkw6psg0gyni6fq0r"; + }; + meta.homepage = "https://github.com/echasnovski/mini.misc/"; + }; + + mini-move = buildVimPlugin { + pname = "mini.move"; + version = "2024-08-15"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.move"; + rev = "4caa1c212f5ca3d1633d21cfb184808090ed74b1"; + sha256 = "0f4nrg9n8air507h6bd61dmb1rjjhykyl36qgr0ai72cb011wzcx"; + }; + meta.homepage = "https://github.com/echasnovski/mini.move/"; + }; + + mini-notify = buildVimPlugin { + pname = "mini.notify"; + version = "2024-09-06"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.notify"; + rev = "1c901d62581439f3d17382a5bf7001a282d6468b"; + sha256 = "1vi3nsclkx9myglb0mxizhmzil02pglh96jf4291cblkgycs6zil"; + }; + meta.homepage = "https://github.com/echasnovski/mini.notify/"; + }; + mini-nvim = buildVimPlugin { pname = "mini.nvim"; - version = "2024-06-14"; + version = "2024-09-13"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "ebc8cb0c1f73ee6c53e0560957a37a2307a70f98"; - sha256 = "0jvrqs9fmn8m1h5wdnl981dpjyp4w9b5q09ypblg6dp1f817c0nf"; + rev = "e50cf9de614500a20e47cfc50e30a100042f91c3"; + sha256 = "1jsll8d3s1glah9ig6041ikpvhcpncd671v8cn55gsacazj46g4h"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; }; + mini-operators = buildVimPlugin { + pname = "mini.operators"; + version = "2024-09-09"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.operators"; + rev = "35b12f54bd5acb860f4297fd6d12fd07b1b065e2"; + sha256 = "1h3kf7ri8ip8as7kcb86q5lq56v7iqz731g4pyn020ymyxmyp75n"; + }; + meta.homepage = "https://github.com/echasnovski/mini.operators/"; + }; + + mini-pairs = buildVimPlugin { + pname = "mini.pairs"; + version = "2024-09-06"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.pairs"; + rev = "e543c760edc5e746e5b6cbd02c066c17ead3ef16"; + sha256 = "0169nsad89ndv9js4zx3si28df8nk5qpjzvfkrks1yyh7k31fwdv"; + }; + meta.homepage = "https://github.com/echasnovski/mini.pairs/"; + }; + + mini-pick = buildVimPlugin { + pname = "mini.pick"; + version = "2024-09-13"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.pick"; + rev = "b87f4d4e75673f6e7b918408017833424ecaa245"; + sha256 = "09gyw1l5np515ldr9rlap01qaazvggg16im43ma7bws0i9nfkwd9"; + }; + meta.homepage = "https://github.com/echasnovski/mini.pick/"; + }; + + mini-sessions = buildVimPlugin { + pname = "mini.sessions"; + version = "2024-09-12"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.sessions"; + rev = "62f2e3823f98673fcf1b79322cc06d8a1f453d30"; + sha256 = "1js9ma0i7a4lil6h4bzbxjx6s63hj4z7qy5ixf737x34ba5d0ipr"; + }; + meta.homepage = "https://github.com/echasnovski/mini.sessions/"; + }; + + mini-splitjoin = buildVimPlugin { + pname = "mini.splitjoin"; + version = "2024-07-01"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.splitjoin"; + rev = "3e92f6764e770ba392325cad3a4497adcada695f"; + sha256 = "126z8rsyg3849ijix1siwq77f9slwr93l61rwg499flzja3incic"; + }; + meta.homepage = "https://github.com/echasnovski/mini.splitjoin/"; + }; + + mini-starter = buildVimPlugin { + pname = "mini.starter"; + version = "2024-09-06"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.starter"; + rev = "3e0af795938ee800846708bed92fbe4e8583141a"; + sha256 = "15353wihsk5fzfajidsqyrqpa6sy251kprzwd486v5wr1ww99nax"; + }; + meta.homepage = "https://github.com/echasnovski/mini.starter/"; + }; + + mini-statusline = buildVimPlugin { + pname = "mini.statusline"; + version = "2024-09-06"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.statusline"; + rev = "813854243156472c9d0bc9c64ea0af159b9b37ca"; + sha256 = "0c66wx3qvq4yd156j7n6x7iwyfggyxz4ss658a3n3rjnv35w3j5r"; + }; + meta.homepage = "https://github.com/echasnovski/mini.statusline/"; + }; + + mini-surround = buildVimPlugin { + pname = "mini.surround"; + version = "2024-09-06"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.surround"; + rev = "0e67c4bc147f2a15cee94e7c94dcc0e115b9f55e"; + sha256 = "1wz9vkb7idsmrgh5q5pyingzrmyr14xhjnk20b1va8hgqq27sm42"; + }; + meta.homepage = "https://github.com/echasnovski/mini.surround/"; + }; + + mini-tabline = buildVimPlugin { + pname = "mini.tabline"; + version = "2024-09-06"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.tabline"; + rev = "2316dd47e1e1f4a8e9255c9060acbee89bb26e59"; + sha256 = "1lbh0qzjdhx7vkycl799byjn3a62frrfgdczyzj2xdyfxv6823h9"; + }; + meta.homepage = "https://github.com/echasnovski/mini.tabline/"; + }; + + mini-test = buildVimPlugin { + pname = "mini.test"; + version = "2024-09-06"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.test"; + rev = "011e14293baa8ebdfde83b756b435403281153fb"; + sha256 = "07marlkan507bx1x71xqil4im644fy04ydy65ax2q6rihrzmgzvf"; + }; + meta.homepage = "https://github.com/echasnovski/mini.test/"; + }; + + mini-trailspace = buildVimPlugin { + pname = "mini.trailspace"; + version = "2024-09-06"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.trailspace"; + rev = "3a328e62559c33014e422fb9ae97afc4208208b1"; + sha256 = "1314bmb8zk3gdpg1wpr1935d0xd0f0cf2f0ipxclbwi07wbjz9i4"; + }; + meta.homepage = "https://github.com/echasnovski/mini.trailspace/"; + }; + + mini-visits = buildVimPlugin { + pname = "mini.visits"; + version = "2024-09-06"; + src = fetchFromGitHub { + owner = "echasnovski"; + repo = "mini.visits"; + rev = "ef2f388158f3651e4b45faac2897d1bacbb0c398"; + sha256 = "1rizwl2dyvj1iz7sqn5sfdaalcjpmhg4zklhjijvpmkylw3da4nh"; + }; + meta.homepage = "https://github.com/echasnovski/mini.visits/"; + }; + minimap-vim = buildVimPlugin { pname = "minimap.vim"; version = "2024-03-17"; @@ -6193,12 +6917,12 @@ final: prev: mkdnflow-nvim = buildVimPlugin { pname = "mkdnflow.nvim"; - version = "2024-06-14"; + version = "2024-08-25"; src = fetchFromGitHub { owner = "jakewvincent"; repo = "mkdnflow.nvim"; - rev = "e6179d25f7e696baa612aa35b951b5ca3f3e75b6"; - sha256 = "02mvgvdrq9p80gcgh668qajgc32pxhn5aahw0gkc40mc4f10lzlm"; + rev = "d459bd7ce68910272038ed037c028180161fd14d"; + sha256 = "1z41pb80dikww4mzvvjcdw97z9mk6x90r7k1pawp842lkkkjj658"; }; meta.homepage = "https://github.com/jakewvincent/mkdnflow.nvim/"; }; @@ -6229,12 +6953,12 @@ final: prev: modus-themes-nvim = buildVimPlugin { pname = "modus-themes.nvim"; - version = "2024-06-08"; + version = "2024-09-18"; src = fetchFromGitHub { owner = "miikanissi"; repo = "modus-themes.nvim"; - rev = "181dc38ddbcf9ad94d454cb06b13c859d4ff28d1"; - sha256 = "0q6r73irr5fk4z4garfx7h15bfxlacn2qynk0gg4jjrh6my0vdy8"; + rev = "162bc34b4d670fa4d8d1407924c0f855985fcc2c"; + sha256 = "0d6jf6041lwkm4saxmh0zlfd0427z1vcxj9xdfl138b082csnfds"; }; meta.homepage = "https://github.com/miikanissi/modus-themes.nvim/"; }; @@ -6253,24 +6977,24 @@ final: prev: molten-nvim = buildVimPlugin { pname = "molten-nvim"; - version = "2024-06-01"; + version = "2024-09-15"; src = fetchFromGitHub { owner = "benlubas"; repo = "molten-nvim"; - rev = "47b9a56d4bc0f877ff9469910b9653c46d462db4"; - sha256 = "09sarlw6zniph9kajvmfvxy3sjn5r7g02i4dncv9q3ybasjgqya7"; + rev = "92b2599ef813b188391d5f00f5f94ce22ecd2598"; + sha256 = "1m3ydc34r9a5md6bfrp6zvp67dlvqyg076mygifly2iqfvq43n5a"; }; meta.homepage = "https://github.com/benlubas/molten-nvim/"; }; monokai-pro-nvim = buildVimPlugin { pname = "monokai-pro.nvim"; - version = "2024-05-25"; + version = "2024-09-18"; src = fetchFromGitHub { owner = "loctvl842"; repo = "monokai-pro.nvim"; - rev = "2bad2a92fe0ff6c8581d33a853a1b17592b83239"; - sha256 = "0kbr165ifkn3g131chmn6c4ishfsjikninndscpcp8dq0gv81d4h"; + rev = "e9a19339d24f41aeeb3f749cdc9491ebd27ac553"; + sha256 = "1cys9ridacwflccyz9c5nhzsg8ykqmjmgp1xkcm286ylyx45635p"; }; meta.homepage = "https://github.com/loctvl842/monokai-pro.nvim/"; }; @@ -6301,12 +7025,12 @@ final: prev: multicursors-nvim = buildVimPlugin { pname = "multicursors.nvim"; - version = "2024-04-12"; + version = "2024-08-08"; src = fetchFromGitHub { owner = "smoka7"; repo = "multicursors.nvim"; - rev = "b959ad0f38881e81e757208c6adfc9e6dc24dfc7"; - sha256 = "0x4v0bpahwqcrwqv5nc0hnfc0qyc21sgd996h5nksnxykrxvf462"; + rev = "562809aaf203b4c65482a75199166d360f2b9298"; + sha256 = "1jxjksd341gs64kvsac0ir9n7idhfvy69s3nx0agpm3i0hzlm4dp"; }; meta.homepage = "https://github.com/smoka7/multicursors.nvim/"; }; @@ -6565,12 +7289,12 @@ final: prev: neo-tree-nvim = buildVimPlugin { pname = "neo-tree.nvim"; - version = "2024-06-11"; + version = "2024-09-17"; src = fetchFromGitHub { owner = "nvim-neo-tree"; repo = "neo-tree.nvim"; - rev = "206241e451c12f78969ff5ae53af45616ffc9b72"; - sha256 = "17l55gbsls8s2hp7a3hrmqzsclq9ckgc76ii8kpc6an0910axlbq"; + rev = "a77af2e764c5ed4038d27d1c463fa49cd4794e07"; + sha256 = "02ag3h40p5ga12y1fwbcd06nnl3rb0l5hs064ylpkx2kjcl79arf"; }; meta.homepage = "https://github.com/nvim-neo-tree/neo-tree.nvim/"; }; @@ -6589,12 +7313,12 @@ final: prev: neoconf-nvim = buildVimPlugin { pname = "neoconf.nvim"; - version = "2024-06-19"; + version = "2024-09-24"; src = fetchFromGitHub { owner = "folke"; repo = "neoconf.nvim"; - rev = "60f6dd6aa1006fa5c3ff4b7bf01586dcecbe9187"; - sha256 = "03hz05kpzrbwy2d9pdmi2yihg7svsh876fv3kk0276v9276hwi1s"; + rev = "c5516054f2342e6fe4d3befd56249d02d5eeb380"; + sha256 = "0a7w6hzrpzja5n4apqqpzzzx006cxmpgh4l156rpzh48rjmj8qdy"; }; meta.homepage = "https://github.com/folke/neoconf.nvim/"; }; @@ -6625,48 +7349,48 @@ final: prev: neodev-nvim = buildVimPlugin { pname = "neodev.nvim"; - version = "2024-06-04"; + version = "2024-07-06"; src = fetchFromGitHub { owner = "folke"; repo = "neodev.nvim"; - rev = "02893eeb9d6e8503817bd52385e111cba9a90500"; - sha256 = "0var4hv2wdbmh4fjrhiqm6mc89hv3sn5idwdjs7k7gwd1vdk4j5y"; + rev = "46aa467dca16cf3dfe27098042402066d2ae242d"; + sha256 = "0hyn02f8cpbnnhq4570nicfjdw88kkww3il8nmy6ban8iybg7s44"; }; meta.homepage = "https://github.com/folke/neodev.nvim/"; }; neoformat = buildVimPlugin { pname = "neoformat"; - version = "2024-05-30"; + version = "2024-08-03"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "82864d6c7926c4f3b535a2fd7eab919b116fc969"; - sha256 = "069bd2jh6z1yg14134s7rssnqhf5xii1knfzfn0jsd9riga5329h"; + rev = "b3b38589b39038dc12c2f5a59a828ed43439363a"; + sha256 = "07ci4sy7i7ni5cc03p89ffp73n02pl7xy2ssrc0909vk4ngbwwxb"; }; meta.homepage = "https://github.com/sbdchd/neoformat/"; }; neogen = buildVimPlugin { pname = "neogen"; - version = "2024-05-13"; + version = "2024-08-22"; src = fetchFromGitHub { owner = "danymat"; repo = "neogen"; - rev = "6de0add4805165317ab7d3d36b5cef48b1b865f3"; - sha256 = "080pwb0bwnd12ypwaa5hsy7sf8ha791gic5wnq8nm8pzyxz2nbiv"; + rev = "e932ba918b56723436b77aa3efb844a11b2851ab"; + sha256 = "1mwa20fvj6k7jzaw0lv0h2b9hr62i48i487mrxqf2nnwxiad7xfk"; }; meta.homepage = "https://github.com/danymat/neogen/"; }; neogit = buildVimPlugin { pname = "neogit"; - version = "2024-06-17"; + version = "2024-09-18"; src = fetchFromGitHub { owner = "NeogitOrg"; repo = "neogit"; - rev = "11dea1b67bb153cd5b4a2de348ceefa69508dfce"; - sha256 = "07d8kmn19hngl06ak2ch7p0mfjwlgyim0xkjfmnsdhxd0ksqdn49"; + rev = "9959b58a897036ce89d47385021db1f716613399"; + sha256 = "1sfknshkkb3dcjv1xzy97habpaxmhc4n1w76ls7hm3db252gn40l"; }; meta.homepage = "https://github.com/NeogitOrg/neogit/"; }; @@ -6731,38 +7455,26 @@ final: prev: meta.homepage = "https://github.com/ii14/neorepl.nvim/"; }; - neorg = buildVimPlugin { - pname = "neorg"; - version = "2024-06-13"; - src = fetchFromGitHub { - owner = "nvim-neorg"; - repo = "neorg"; - rev = "ebf75f57fa8dadd8747a678724b273b398143dc4"; - sha256 = "05zq8q88z14hd9y9ywp09kxjxpxfzb72yjm3gl7px8xxh18nqrds"; - }; - meta.homepage = "https://github.com/nvim-neorg/neorg/"; - }; - neorg-telescope = buildVimPlugin { pname = "neorg-telescope"; - version = "2024-06-19"; + version = "2024-07-30"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg-telescope"; - rev = "fe255a3432ce639de7a374ccfb8602f517244dcd"; - sha256 = "0w86sh0pfff7qipjwgfqhsvm95j0hlv1srn9p2fphg1jsixfd5jm"; + rev = "ddb2556644cae922699a239bbb0fe16e25b084b7"; + sha256 = "0p2s3n22fy1vkqc9n55x6kssqs4n0znwlszfrs532hj8m992wbks"; }; meta.homepage = "https://github.com/nvim-neorg/neorg-telescope/"; }; neoscroll-nvim = buildVimPlugin { pname = "neoscroll.nvim"; - version = "2024-05-27"; + version = "2024-09-07"; src = fetchFromGitHub { owner = "karb94"; repo = "neoscroll.nvim"; - rev = "a731f66f1d39ec6175fd201c5bf849e54abda99c"; - sha256 = "1f9f5gqn1kbrhwfblqcsjacm7y17qai931xmrlny7hqlv1c6a26i"; + rev = "4e0428a41c6ec191df543fc95349f6e1c598e53f"; + sha256 = "19aw68ci0wx0alv8w9j6qn4zj6s1bbf737xa4jbsxkhkwczm5689"; }; meta.homepage = "https://github.com/karb94/neoscroll.nvim/"; }; @@ -6805,12 +7517,12 @@ final: prev: neotest = buildNeovimPlugin { pname = "neotest"; - version = "2024-06-09"; + version = "2024-08-26"; src = fetchFromGitHub { owner = "nvim-neotest"; repo = "neotest"; - rev = "f30bab1faef13d47f3905e065215c96a42d075ad"; - sha256 = "04jsfxq9xs751wspqbi850bwykyzf0d4fw4ar5gqwij34zja19h7"; + rev = "6d6ad113f56edc7c3f2a77a0836ea8c1b955ebea"; + sha256 = "1v8y7jpwb0a6w5gcr6r17zcgrvdqs7y396c67xxpz5f2bibxzbxr"; }; meta.homepage = "https://github.com/nvim-neotest/neotest/"; }; @@ -6830,12 +7542,12 @@ final: prev: neotest-dart = buildVimPlugin { pname = "neotest-dart"; - version = "2024-02-28"; + version = "2024-09-16"; src = fetchFromGitHub { owner = "sidlatau"; repo = "neotest-dart"; - rev = "33b9335cd8c2be4dcf9dd8f196b24325e7c2e8e7"; - sha256 = "1g3xa33p2n5j3w1rpc8zf0dl7wkwnai2f9fs8dr8xanqp22vpl3i"; + rev = "ad0fbcd0bfb45999fb78f3d14f6b6ae7ee70b88c"; + sha256 = "1431b9izn4kr5rsc06kpwizd41nkkglcy3yl7p0wls3pfr0v1rxp"; }; meta.homepage = "https://github.com/sidlatau/neotest-dart/"; }; @@ -6854,24 +7566,24 @@ final: prev: neotest-dotnet = buildVimPlugin { pname = "neotest-dotnet"; - version = "2024-06-01"; + version = "2024-07-24"; src = fetchFromGitHub { owner = "Issafalcon"; repo = "neotest-dotnet"; - rev = "caeb52b602fa8a5855c5839c338fb65b50a40ab3"; - sha256 = "1w73kzljwkxdanvdqig96jmkfd2v2hjwbqn2h095dkwf71pygnbb"; + rev = "03509791912eaeac9f993f7cf49e170eca06a8bc"; + sha256 = "0kz7k26047mzyzsldm8ai1i4wyr7wx0rwpfqj3zh3nncns40b4nl"; }; meta.homepage = "https://github.com/Issafalcon/neotest-dotnet/"; }; 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/"; @@ -6901,6 +7613,18 @@ final: prev: meta.homepage = "https://github.com/nvim-neotest/neotest-go/"; }; + neotest-golang = buildVimPlugin { + pname = "neotest-golang"; + version = "2024-09-22"; + src = fetchFromGitHub { + owner = "fredrikaverpil"; + repo = "neotest-golang"; + rev = "824cc934f61e9af1e2273d1153dbe337090304f2"; + sha256 = "1j3kf82rlgcch7zi66d52qgx4hknd43zm8z4i28g5vsb0wsd5vdp"; + }; + meta.homepage = "https://github.com/fredrikaverpil/neotest-golang/"; + }; + neotest-gradle = buildVimPlugin { pname = "neotest-gradle"; version = "2023-12-05"; @@ -6928,24 +7652,24 @@ final: prev: neotest-haskell = buildVimPlugin { pname = "neotest-haskell"; - version = "2024-06-16"; + version = "2024-09-22"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "neotest-haskell"; - rev = "0481d2c79564d6658caa1a4962bdfba3a608b5d1"; - sha256 = "142j5s3fcyggkrx92w8k6d3vas2m7580k9vd6ca913adby5ys2cn"; + rev = "b9487ba185a3192937ffdb8f986e14d436174214"; + sha256 = "1b7mxi0fs878wkb621xnl0jl64lqnanr78d4pcqlffphnvwxkqrs"; }; meta.homepage = "https://github.com/MrcJkb/neotest-haskell/"; }; neotest-java = buildVimPlugin { pname = "neotest-java"; - version = "2024-06-15"; + version = "2024-09-22"; src = fetchFromGitHub { owner = "rcasia"; repo = "neotest-java"; - rev = "7b9e0419bd92f641f730e31a4236074e53a5ac99"; - sha256 = "1f9a0aa4q6c4armj9fjmbkpk2j2svgiyf1mlmq46g0mqcmhnnbbh"; + rev = "24d34fb00eb843cc2f1c9430ac93020bdc7e2f6a"; + sha256 = "0xd0jc5fwy8q8dr4zrpvis4zc73983qcxxzm6mpspbgzr4kyx1jv"; }; meta.homepage = "https://github.com/rcasia/neotest-java/"; }; @@ -6964,12 +7688,12 @@ final: prev: neotest-minitest = buildVimPlugin { pname = "neotest-minitest"; - version = "2024-04-29"; + version = "2024-09-19"; src = fetchFromGitHub { owner = "zidhuss"; repo = "neotest-minitest"; - rev = "0543bf4e997b2c970707cb297e2f74c438eb0653"; - sha256 = "053j4xm84i5z2a2qpka7vgq462928mg81gwkwvr2jbxjm4h4sk2r"; + rev = "5623b9a7b2b27314e5c336b385315d2ab7d4ccba"; + sha256 = "0rv4nhvlxl693d4q9jd9a6ym3ib1fwsjzl0911pqjwf9kmnqx4w7"; }; meta.homepage = "https://github.com/zidhuss/neotest-minitest/"; }; @@ -7000,48 +7724,48 @@ final: prev: neotest-playwright = buildVimPlugin { pname = "neotest-playwright"; - version = "2024-06-18"; + version = "2024-07-08"; src = fetchFromGitHub { owner = "thenbe"; repo = "neotest-playwright"; - rev = "f61463f5c74d53fc5975b7e086b7c6e9356d9215"; - sha256 = "18d9qqxqrgng373xlkiinxcp9s13zj40sjxsibhdccji75pr3ziy"; + rev = "6266945039dac27a354de33d2f2a66e75485d5e9"; + sha256 = "1gkiv2a9g80qh5h52pa6ysxjx7nxli4jvb1lcq5qyn4fnig0mrlk"; }; meta.homepage = "https://github.com/thenbe/neotest-playwright/"; }; neotest-plenary = buildVimPlugin { pname = "neotest-plenary"; - version = "2023-09-29"; + version = "2024-09-15"; src = fetchFromGitHub { owner = "nvim-neotest"; repo = "neotest-plenary"; - rev = "dcaf5ed67a9e28a246e9783319e5aa6c9ea1c584"; - sha256 = "01dg3n3bnhc1ppai24syq48n5xkm1a3vm731xrah2y0qi390q0l3"; + rev = "3523adcf9ffaad1911960c5813b0136c1b63a2ec"; + sha256 = "12nsn035npdz5hyc9w6jdhx3wv2ixvdbqr78w2znn1p2a6mqc09m"; }; meta.homepage = "https://github.com/nvim-neotest/neotest-plenary/"; }; neotest-python = buildVimPlugin { pname = "neotest-python"; - version = "2024-01-15"; + version = "2024-08-19"; src = fetchFromGitHub { owner = "nvim-neotest"; repo = "neotest-python"; - rev = "2e83d2bc00acbcc1fd529dbf0a0e677cabfe6b50"; - sha256 = "1xpd08mrw7jlgl7ciph9nxni98pa6x27va7ys7xapkkzc1bym1r2"; + rev = "72603dfdbaad5695160268cb10531a14cc37236e"; + sha256 = "1d8rcpvgr4x2p3bg37kzsnfydibhb7rpyqb10sgxsjz0ylgmv7jr"; }; meta.homepage = "https://github.com/nvim-neotest/neotest-python/"; }; neotest-rspec = buildVimPlugin { pname = "neotest-rspec"; - version = "2024-05-15"; + version = "2024-08-05"; src = fetchFromGitHub { owner = "olimorris"; repo = "neotest-rspec"; - rev = "48573d5882cbe8d8bcd3b735d9ee7705168b1b87"; - sha256 = "00l3v77d3zgq47gbsgjl916yp735kyr9s0jizi1sr5yg7wypx2cx"; + rev = "53fc108a06ae43d7f873d42ee5189c2301e33623"; + sha256 = "0z8vh5miw3ysn4y45i4ckyc7s1k104l4m4yrpf7rx2wbd5gmkshw"; }; meta.homepage = "https://github.com/olimorris/neotest-rspec/"; }; @@ -7084,36 +7808,36 @@ final: prev: neotest-vitest = buildVimPlugin { pname = "neotest-vitest"; - version = "2024-04-17"; + version = "2024-08-23"; src = fetchFromGitHub { owner = "marilari88"; repo = "neotest-vitest"; - rev = "6965a714793d9d156dadbe734c99b3a307f65c61"; - sha256 = "0dxcnkvhdlxlxa6vrjfgn5pfi3a2g78c3xz13sxggw559wmzp9lr"; + rev = "9e30dca989a2287cf3fde86b3e138ea7fa4de935"; + sha256 = "16l4i6jh8y2563062k2n5xcj4lxs9cyb2z8xvzb63il5n526mivi"; }; meta.homepage = "https://github.com/marilari88/neotest-vitest/"; }; neotest-zig = buildVimPlugin { pname = "neotest-zig"; - version = "2024-06-17"; + version = "2024-09-05"; src = fetchFromGitHub { owner = "lawrence-laz"; repo = "neotest-zig"; - rev = "7cc48ba642a6acb96f377054cc4439c6a135fb5d"; - sha256 = "0dlc2zd5qwak5gwv1pv1arbpj56scnaz4n1my50i97rvj4yf3vmh"; + rev = "fc160b277126cb21a1486d48fc298d06803c3f88"; + sha256 = "0xwzib7lf3n5v1a09rnwwl6ibd61kl33ppn13c0smzpkgnybi0wp"; }; meta.homepage = "https://github.com/lawrence-laz/neotest-zig/"; }; neovim-ayu = buildVimPlugin { pname = "neovim-ayu"; - version = "2024-06-08"; + version = "2024-09-08"; src = fetchFromGitHub { owner = "Shatur"; repo = "neovim-ayu"; - rev = "123dda90019215646700bfec70f178ad95820545"; - sha256 = "0g0nyasr7df7wsbfkcvkpwxyhsl93iq35q46fick8iq3mdf0mjl4"; + rev = "2839c88cd297a069e93df1aab542c087e8f6e8c0"; + sha256 = "1jzr8zfxblr92ipz0b02nvh7q44yba8f64c2lkq5qfn49cqx9lwh"; }; meta.homepage = "https://github.com/Shatur/neovim-ayu/"; }; @@ -7156,24 +7880,24 @@ final: prev: nerdcommenter = buildVimPlugin { pname = "nerdcommenter"; - version = "2024-05-13"; + version = "2024-08-08"; src = fetchFromGitHub { owner = "preservim"; repo = "nerdcommenter"; - rev = "7bb1f72e802a80e37bdda5f6906c69b5a93de1eb"; - sha256 = "0rjgriqfkikcbsns1ridd5kx3msaak2632zng8jajxlslbcga1r3"; + rev = "3f860f2d981547c18f2c9599e3c358ea488c3be4"; + sha256 = "0z5fbzyfplljjbzsj84xp323b0hgiz5asizgsny9kjzx0b4m96ns"; }; meta.homepage = "https://github.com/preservim/nerdcommenter/"; }; nerdtree = buildVimPlugin { pname = "nerdtree"; - version = "2024-05-14"; + version = "2024-07-20"; src = fetchFromGitHub { owner = "preservim"; repo = "nerdtree"; - rev = "fbb71fcd90602e3ec77f40b864b5f9b437c496c5"; - sha256 = "1x6gixsq9yn3afsj05wacxgh6ih00mdimjhlx8jn9cwjaxmg70v5"; + rev = "9b465acb2745beb988eff3c1e4aa75f349738230"; + sha256 = "1j9b7f1b1pdb2v7z0b4mnfvcir4z1ycs3l2xh4rvrl7gzhlc56y5"; }; meta.homepage = "https://github.com/preservim/nerdtree/"; }; @@ -7202,6 +7926,18 @@ final: prev: meta.homepage = "https://github.com/miversen33/netman.nvim/"; }; + netrw-nvim = buildVimPlugin { + pname = "netrw.nvim"; + version = "2024-07-23"; + src = fetchFromGitHub { + owner = "prichrd"; + repo = "netrw.nvim"; + rev = "90501c62b9b816ed3ed1e912ae9db9af5671a1b2"; + sha256 = "1m8pnhy9si734k0i95fyn0yn4swwmavpj1s22qp2ss75djibwhxl"; + }; + meta.homepage = "https://github.com/prichrd/netrw.nvim/"; + }; + neuron-nvim = buildVimPlugin { pname = "neuron.nvim"; version = "2022-02-27"; @@ -7228,12 +7964,12 @@ final: prev: nfnl = buildVimPlugin { pname = "nfnl"; - version = "2024-05-30"; + version = "2024-09-17"; src = fetchFromGitHub { owner = "Olical"; repo = "nfnl"; - rev = "7614d666eaea1674dc96184e0e3c1a8bc2c4a3b2"; - sha256 = "1wz7fwcycz6xwwnw0nqsgkxz4dgmabz8rr6574yvbvyjg3blr7s0"; + rev = "28677f1ccaf0ea636f07176ed69c6f4e7a07f244"; + sha256 = "1hflynf84x6g4sp97m0f80vqp3ypcj46w9s5065l44c9lfa5i894"; }; meta.homepage = "https://github.com/Olical/nfnl/"; }; @@ -7252,24 +7988,24 @@ final: prev: night-owl-nvim = buildVimPlugin { pname = "night-owl.nvim"; - version = "2024-05-28"; + version = "2024-09-12"; src = fetchFromGitHub { owner = "oxfist"; repo = "night-owl.nvim"; - rev = "9e95ff4bb6fa0e7dfd40472b9dde19fd0b75aa0e"; - sha256 = "1bps5cp7ahnhw7z6yrpv9fyxj7jlgxmzfjk949lrw3ryz6kgzry8"; + rev = "86ed124c2f7e118670649701288e024444bf91e5"; + sha256 = "1zgi9m85z5pnfsh7p3rdnyz7rvrn44lfg5p6l005g3411h32pgiv"; }; meta.homepage = "https://github.com/oxfist/night-owl.nvim/"; }; nightfox-nvim = buildVimPlugin { pname = "nightfox.nvim"; - version = "2024-04-28"; + version = "2024-09-08"; src = fetchFromGitHub { owner = "EdenEast"; repo = "nightfox.nvim"; - rev = "df75a6a94910ae47854341d6b5a6fd483192c0eb"; - sha256 = "0x58pn7lg2l1nm24ry3a42l6vpi6inf1srbanwya01x0yrm74bwp"; + rev = "7557f26defd093c4e9bc17f28b08403f706f5a44"; + sha256 = "14hzq2mvhl79121zqqy163sy9128ifcjlk0xnjc12yf6azfc4lbx"; }; meta.homepage = "https://github.com/EdenEast/nightfox.nvim/"; }; @@ -7312,12 +8048,12 @@ final: prev: nlsp-settings-nvim = buildVimPlugin { pname = "nlsp-settings.nvim"; - version = "2024-06-19"; + version = "2024-09-21"; src = fetchFromGitHub { owner = "tamago324"; repo = "nlsp-settings.nvim"; - rev = "4c068cf7a74d77cc405aedda875f3174f7eb9143"; - sha256 = "1q5wrryf5xp13lljjgm95aavn4s2cq0p52pbxcxykm97vm1zi9n7"; + rev = "d77312f267491aca24d69527538295b8376be864"; + sha256 = "15sfjf1q643d1bfx5d0f13jrav3jld2gpz20vvghbnh1kzfwaagm"; }; meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/"; }; @@ -7336,24 +8072,24 @@ final: prev: no-clown-fiesta-nvim = buildVimPlugin { pname = "no-clown-fiesta.nvim"; - version = "2024-05-30"; + version = "2024-09-18"; src = fetchFromGitHub { owner = "aktersnurra"; repo = "no-clown-fiesta.nvim"; - rev = "caf86fbc3cf390cac8c5fba599f1500f49f622d7"; - sha256 = "0kgcrsinb1lsla9y6yf4svnbay2s75zc5yhil2j149n64ff08gqa"; + rev = "1685bbb47a409253f9145db56dd83ae117f9c382"; + sha256 = "03k8z2r6csckfx193yzcqj83w8ykikihpx19zi6qb1m1qybjznca"; }; meta.homepage = "https://github.com/aktersnurra/no-clown-fiesta.nvim/"; }; no-neck-pain-nvim = buildVimPlugin { pname = "no-neck-pain.nvim"; - version = "2024-05-26"; + version = "2024-09-23"; src = fetchFromGitHub { owner = "shortcuts"; repo = "no-neck-pain.nvim"; - rev = "741ad26c4acc45f2164a3933f7825b0e555b724d"; - sha256 = "04yfraal84zin7gvhfrx9v5359m3s3gvrxydw7xp5rz2rvsraqn3"; + rev = "73494b365722cc14541b0d2ddde3b52d6c94a6e5"; + sha256 = "09d5i4jgk7ivnfka0bxi0kgk9qrkdx82zzwgldcnhaxsjm1cm91p"; }; meta.homepage = "https://github.com/shortcuts/no-neck-pain.nvim/"; }; @@ -7372,24 +8108,24 @@ final: prev: noice-nvim = buildVimPlugin { pname = "noice.nvim"; - version = "2024-06-18"; + version = "2024-09-18"; src = fetchFromGitHub { owner = "folke"; repo = "noice.nvim"; - rev = "88ac36864b5976a64b14a8f156c616f41b32f228"; - sha256 = "0qkm5g6mfaydgbsgkkng79j3zm0nfbnim30ibjpgby74fjpmzp09"; + rev = "c1ba80ccf6b3bd8c7fc88fe2e61085131d44ad65"; + sha256 = "0qq9rc8frviz96j1xb70pkdwhvynaz63pkwdh3jlkkmjk5iv0jm4"; }; meta.homepage = "https://github.com/folke/noice.nvim/"; }; none-ls-nvim = buildVimPlugin { pname = "none-ls.nvim"; - version = "2024-06-14"; + version = "2024-09-01"; src = fetchFromGitHub { owner = "nvimtools"; repo = "none-ls.nvim"; - rev = "cc0a3c45047e3daf85d07c1571d65476cfce6480"; - sha256 = "1aa2dcrrwmbh8dh8vccwz2jdwyfsy10jagvqbpmh7ax1mnmphnqv"; + rev = "9b98991e15dce8fc502993e23caac2528b8b667f"; + sha256 = "0lllsjn4vmyn563mg6sygybq1knvymjwjjg1az7kr2zi7i2q3gbh"; }; meta.homepage = "https://github.com/nvimtools/none-ls.nvim/"; }; @@ -7444,12 +8180,12 @@ final: prev: nui-nvim = buildNeovimPlugin { pname = "nui.nvim"; - version = "2024-06-05"; + version = "2024-09-15"; src = fetchFromGitHub { owner = "MunifTanjim"; repo = "nui.nvim"; - rev = "322978c734866996274467de084a95e4f9b5e0b1"; - sha256 = "1l1gzpza26pybg6fcjif5ypqmxl490wv82my13bwkc1v83a5x4xm"; + rev = "b58e2bfda5cea347c9d58b7f11cf3012c7b3953f"; + sha256 = "0klz9wy09jk74f39v6f7s5gn98nf3vq4lgv5d29mkszpykxaligp"; }; meta.homepage = "https://github.com/MunifTanjim/nui.nvim/"; }; @@ -7480,12 +8216,12 @@ final: prev: nvchad = buildVimPlugin { pname = "nvchad"; - version = "2024-06-06"; + version = "2024-09-15"; src = fetchFromGitHub { owner = "nvchad"; repo = "nvchad"; - rev = "164e8cc7fcb9006a1edd4ddfc98bf8c7f4fe2e0d"; - sha256 = "1qk0m5z5jqv875q96mavmbnpd8570d9xzr928izj807660r3b0p3"; + rev = "8d2bb359e47d816e67ff86b5ce2d8f5abfe2b631"; + sha256 = "0l1r7vsa02d9fb0fxkl6dn7nr1m4iflify6vh1ffdvcnlmri8ann"; }; meta.homepage = "https://github.com/nvchad/nvchad/"; }; @@ -7528,12 +8264,12 @@ final: prev: nvim-autopairs = buildVimPlugin { pname = "nvim-autopairs"; - version = "2024-05-19"; + version = "2024-09-18"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-autopairs"; - rev = "c15de7e7981f1111642e7e53799e1211d4606cb9"; - sha256 = "0nd175qdh4fr0qjvdj7fa89lxhzdrf6ilc5r5vajzbfmbj72lh30"; + rev = "f158dcb865c36f72c92358f87787dab2c272eaf3"; + sha256 = "0phizncx5kafr75nl0ii6nfb8jh8rmx052lw1x7cdfr6918vvxdj"; }; meta.homepage = "https://github.com/windwp/nvim-autopairs/"; }; @@ -7600,12 +8336,12 @@ final: prev: nvim-cmp = buildNeovimPlugin { pname = "nvim-cmp"; - version = "2024-06-08"; + version = "2024-08-01"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-cmp"; - rev = "a110e12d0b58eefcf5b771f533fc2cf3050680ac"; - sha256 = "0qn7yz2nqp1k5p337nys0d2sr34ybs52s8sx4gg9krl76l91zlgf"; + rev = "ae644feb7b67bf1ce4260c231d1d4300b19c6f30"; + sha256 = "0fk7s6apvq4r9h82jqm5azf1zg9aklyycgh7ivnb98bw9a0ivjim"; }; meta.homepage = "https://github.com/hrsh7th/nvim-cmp/"; }; @@ -7624,24 +8360,24 @@ final: prev: nvim-cokeline = buildVimPlugin { pname = "nvim-cokeline"; - version = "2024-05-18"; + version = "2024-07-12"; src = fetchFromGitHub { owner = "willothy"; repo = "nvim-cokeline"; - rev = "8145048ae68e05f31979c13b0adf7aa99f04f4c0"; - sha256 = "1wjsgqinfrhcgcpb6vgp03h9dsc2xwpdvfbmsrgdz5b1mvwy2x8m"; + rev = "adfd1eb87e0804b6b86126e03611db6f62bb2909"; + sha256 = "19acpgh3n0ma8idl2wbgf9mb2dw9j6xv5gzdb4ya3lmkq8k8ivsz"; }; meta.homepage = "https://github.com/willothy/nvim-cokeline/"; }; nvim-colorizer-lua = buildVimPlugin { pname = "nvim-colorizer.lua"; - version = "2023-12-23"; + version = "2024-09-11"; src = fetchFromGitHub { owner = "nvchad"; repo = "nvim-colorizer.lua"; - rev = "85855b38011114929f4058efc97af1059ab3e41d"; - sha256 = "1z88vp8a56blhm7s0p1s19i2pwa7dldaxxh86x7jj0dyc8vwbax0"; + rev = "0671e0eabc6842676d3310370e8fae4e1c51d7f9"; + sha256 = "1ilxfiq76a7wzh4nvhds5b7k6q2shrnfmyb4icnfc8w0kx1vby0m"; }; meta.homepage = "https://github.com/nvchad/nvim-colorizer.lua/"; }; @@ -7720,84 +8456,96 @@ final: prev: nvim-dap = buildVimPlugin { pname = "nvim-dap"; - version = "2024-06-03"; + version = "2024-09-12"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "6f79b822997f2e8a789c6034e147d42bc6706770"; - sha256 = "009aal7bljwrryb74c02jgmfzvhg7v2hcr5xy19r000whnjgh89i"; + rev = "90616ae6ae40053103dc66872886fc26b94c70c8"; + sha256 = "07x5qm7p6lidafm9kkpapwc7wwjh1k4zrcg3hdgra7sknprppjp0"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; nvim-dap-go = buildVimPlugin { pname = "nvim-dap-go"; - version = "2024-05-27"; + version = "2024-08-06"; src = fetchFromGitHub { owner = "leoluz"; repo = "nvim-dap-go"; - rev = "a0c5a2b991d7e9304a9a032cf177e22a4b0acda1"; - sha256 = "1msz8fiwsvjdda870k2y85plb4wg7xs3fh5w7hg8iwgmx6ykxh07"; + rev = "5511788255c92bdd845f8d9690f88e2e0f0ff9f2"; + sha256 = "08gmabyn7d5scqjicpjkp7h55fb8s1vwi8zyfcf7iwzzrpanm12m"; }; meta.homepage = "https://github.com/leoluz/nvim-dap-go/"; }; nvim-dap-python = buildVimPlugin { pname = "nvim-dap-python"; - version = "2024-06-03"; + version = "2024-09-08"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap-python"; - rev = "ae0225d0d4a46e18e6057ab3701ef87bbbd6aaad"; - sha256 = "1g0gn0rpdmypjay0dwd9iw64qvm63g78ig839ys4z2mnwqx6vsx2"; + rev = "db72bf6ab9f75fe841e8e11e772ee7fef6f484f1"; + sha256 = "1m2bs71l4wdk6kippwkmsvw4978qcqh8lnkx7h9sa82l87wb76mp"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap-python/"; }; + nvim-dap-rr = buildVimPlugin { + pname = "nvim-dap-rr"; + version = "2024-07-10"; + src = fetchFromGitHub { + owner = "jonboh"; + repo = "nvim-dap-rr"; + rev = "1682c13a2096a4a6394c803e14f009f121400acf"; + sha256 = "sha256-QtOY6gg2grsxF6KTn75hZ+BZGWK2ahzVu9k2SIIFeJU="; + }; + meta.homepage = "https://github.com/jonboh/nvim-dap-rr/"; + }; + nvim-dap-ui = buildVimPlugin { pname = "nvim-dap-ui"; - version = "2024-05-28"; + version = "2024-08-26"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-dap-ui"; - rev = "b7267003ba4dd860350be86f75b9d9ea287cedca"; - sha256 = "0sz6p8n58gw1mbvk6y6pjfz1pdp979msxy2za0b492wwxwqbhqln"; + rev = "1c351e4e417d4691da12948b6ecf966936a56d28"; + sha256 = "0hg95ws4b6hrjgp28bccbyimmizyijd9li2vhh8axszn4m70nayv"; }; meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/"; }; nvim-dap-virtual-text = buildVimPlugin { pname = "nvim-dap-virtual-text"; - version = "2024-05-22"; + version = "2024-09-10"; src = fetchFromGitHub { owner = "theHamsta"; repo = "nvim-dap-virtual-text"; - rev = "d7c695ea39542f6da94ee4d66176f5d660ab0a77"; - sha256 = "1hqnwq2hy7qn62qxp204c9mx6japjhd6q8sfac0kfvzgw49v3khi"; + rev = "3497eb39bf413a57ab5b7e7e2e192683e462148c"; + sha256 = "1nv58ds5cxkbwcip1kd7s6kzhn0h33869qmkmjhn3ibykszhz0d4"; }; meta.homepage = "https://github.com/theHamsta/nvim-dap-virtual-text/"; }; nvim-dbee = buildVimPlugin { pname = "nvim-dbee"; - version = "2024-04-24"; + version = "2024-07-26"; src = fetchFromGitHub { owner = "kndndrj"; repo = "nvim-dbee"; - rev = "85622c8d95b53f62329627fd461c52fca7cb612b"; - sha256 = "1nhbs8lniblx4cn9x232qlg6gj0vgmyzqqw49d0994ap9fx90dc2"; + rev = "21d2cc0844a16262bb6ea93ab3d0a0f20bd87853"; + sha256 = "10xplksglyd8af8q1cl2lxcpn52b766g87gva9fd3l66idxsds00"; }; meta.homepage = "https://github.com/kndndrj/nvim-dbee/"; }; nvim-docs-view = buildVimPlugin { pname = "nvim-docs-view"; - version = "2024-01-20"; + version = "2024-08-16"; src = fetchFromGitHub { owner = "amrbashir"; repo = "nvim-docs-view"; - rev = "78d88bca16f32a430572758677f9246f6d7f7b94"; - sha256 = "1sqg4bh6xkq5d2rg97g2350iil9mcl4wh12ygbj93sj5m0jfp4rp"; + rev = "365593534e0acd762bfddce6e8313315ffa4fa36"; + sha256 = "0k6w26jc5c6lmb1022d5nvs0lmvh42zw7dgagfc6gvq3dchpfiza"; }; meta.homepage = "https://github.com/amrbashir/nvim-docs-view/"; }; @@ -7840,24 +8588,24 @@ final: prev: nvim-gdb = buildVimPlugin { pname = "nvim-gdb"; - version = "2024-04-23"; + version = "2024-08-12"; src = fetchFromGitHub { owner = "sakhnik"; repo = "nvim-gdb"; - rev = "9b149e6d215870e31a3712de93152c5b4febe23f"; - sha256 = "0rnihq0dz8n60cii5hpd00xam51k5m5jj7lx5s6y4sa7v7dl7amc"; + rev = "2ab24b3ea99ff8a66490a1bb53a730eb7fafc14d"; + sha256 = "0qp0h2qk9zclcy989mg0sjgmjrqxvxsvfhi8cn378iz66wslb003"; }; meta.homepage = "https://github.com/sakhnik/nvim-gdb/"; }; nvim-genghis = buildVimPlugin { pname = "nvim-genghis"; - version = "2024-06-19"; + version = "2024-09-14"; src = fetchFromGitHub { owner = "chrisgrieser"; repo = "nvim-genghis"; - rev = "6077a6376f9a15eaf3d60a12caca57adb59028b5"; - sha256 = "1lm9mjjqwgf4cqgh4xkq9kfbx9bjz6p68dfimixm3rlsvrxz2wai"; + rev = "ca258b1e466d131e17eacf0c632abe932bce20ab"; + sha256 = "0l8qpj143s3csav39ixzhag6pyk6jfajvf469m9hg19m6wfbfg1v"; }; meta.homepage = "https://github.com/chrisgrieser/nvim-genghis/"; }; @@ -7876,36 +8624,36 @@ final: prev: nvim-highlight-colors = buildVimPlugin { pname = "nvim-highlight-colors"; - version = "2024-06-05"; + version = "2024-08-03"; src = fetchFromGitHub { owner = "brenoprata10"; repo = "nvim-highlight-colors"; - rev = "30f305d57d658615cd827146f5e56db8b6833475"; - sha256 = "0znm5am5xpz1i88fz0q6pjnvm5d41rban8wxkrxm5cyjxx1nrb3m"; + rev = "a411550ef85cae467b889ba7d1a96bd78332d90e"; + sha256 = "0m5kh6a7ywrkrsmy3cj4z2bdkb54pm3rl8rs1haj041zp6sa6y03"; }; meta.homepage = "https://github.com/brenoprata10/nvim-highlight-colors/"; }; nvim-highlite = buildVimPlugin { pname = "nvim-highlite"; - version = "2024-06-07"; + version = "2024-09-04"; src = fetchFromGitHub { owner = "Iron-E"; repo = "nvim-highlite"; - rev = "c6982939cdd0046a89d0849383476b69569d5462"; - sha256 = "1km15lghjs7v9b5dx9dnzqml4ay7w6s6dmidzk957i7n2j8wn1vw"; + rev = "0dd4a4ab5892b02661ad18ceb9071428c3391a89"; + sha256 = "0rn2crlih3wmxpq0c0c9j1cksvlzn687wx8v88jdn5a643jbaxvp"; }; meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; }; nvim-hlslens = buildVimPlugin { pname = "nvim-hlslens"; - version = "2024-06-14"; + version = "2024-09-21"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-hlslens"; - rev = "1db56afda3e85791a14b096e483dfda699dd9163"; - sha256 = "13mx0p3ia7wajvjk1gvyhnv2v5z900bjr4c82b1wbdpmv68z69yv"; + rev = "07afd4dd14405ad14b142a501a3abea6ae44b21b"; + sha256 = "12nf1jj7z4h7nqi6gmk768z8hcl4qdgi4rpwj0y8frawc2f75ixv"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-hlslens/"; }; @@ -7924,12 +8672,12 @@ final: prev: nvim-jdtls = buildVimPlugin { pname = "nvim-jdtls"; - version = "2024-06-06"; + version = "2024-08-05"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-jdtls"; - rev = "40e8494e04c1bcd5dd6c0d0bc187d2d10965017d"; - sha256 = "1abrx6a3d2yd6dlykhbjwfvqw18w126qkr4y4va9xv26k78p17gw"; + rev = "99e4b2081de1d9162666cc7b563cbeb01c26b66b"; + sha256 = "0gz37cf5rnmwkh9826dwr2jzqgz4fin2j1xd9r8n6xs7a3g2rzvk"; }; meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/"; }; @@ -7971,12 +8719,12 @@ final: prev: nvim-lightbulb = buildVimPlugin { pname = "nvim-lightbulb"; - version = "2023-07-20"; + version = "2024-08-16"; src = fetchFromGitHub { owner = "kosayoda"; repo = "nvim-lightbulb"; - rev = "8f00b89dd1b1dbde16872bee5fbcee2e58c9b8e9"; - sha256 = "0i0lppncxz7nmd683sz79063nr9yds46lyhkkxjxj853mskjisii"; + rev = "1cae7b7153ae98dcf1b11173a443ac1b6d8e3d49"; + sha256 = "1wf5pfjpvn7hvm9p9mc7w9j7wz2rr7ppdys8cx4jcqib9ja5vy99"; }; meta.homepage = "https://github.com/kosayoda/nvim-lightbulb/"; }; @@ -8007,12 +8755,12 @@ final: prev: nvim-lint = buildVimPlugin { pname = "nvim-lint"; - version = "2024-06-07"; + version = "2024-09-22"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-lint"; - rev = "941fa1220a61797a51f3af9ec6b7d74c8c7367ce"; - sha256 = "152j681hplib3vyizx1lcnkr3d411a4gi743716h759x0g20bmic"; + rev = "968a35d54b3a4c1ce66609cf80b14d4ae44fe77f"; + sha256 = "1fccdcrjsrszmfdin72kp3mk31mzd8liw166dak6hyf8sylch3cs"; }; meta.homepage = "https://github.com/mfussenegger/nvim-lint/"; }; @@ -8043,12 +8791,12 @@ final: prev: nvim-lspconfig = buildVimPlugin { pname = "nvim-lspconfig"; - version = "2024-06-18"; + version = "2024-09-23"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "5c33bf1f708ac8cb839469e1a03d45987fec305c"; - sha256 = "1mdqckjmk1hdxgipa2qwncwmbv6ad8mi5cqisinkz7610k55sxpm"; + rev = "dd329912c8d446240584a2dbcd3802af3a19105a"; + sha256 = "0bd8bk2r4cn9qz3psj3zbrdiqgbr94pjz43akawbybq88dj59yi0"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -8103,12 +8851,12 @@ final: prev: nvim-metals = buildVimPlugin { pname = "nvim-metals"; - version = "2024-05-25"; + version = "2024-09-16"; src = fetchFromGitHub { owner = "scalameta"; repo = "nvim-metals"; - rev = "1b87e6bfa4174b5fbaee9ca7ec79d8eae8df7f18"; - sha256 = "13yi6wby4ybdh536ghjsvp2svzszzc08wi2lxx9rsqcm22aah0sm"; + rev = "c2aed7519b93f4151b6dbb2378793c00096e1aa1"; + sha256 = "0rgjh62w2dpv78rzy41r70ckx83b98235qg3c42dxff2p1ix17mv"; }; meta.homepage = "https://github.com/scalameta/nvim-metals/"; }; @@ -8151,24 +8899,24 @@ final: prev: nvim-neoclip-lua = buildVimPlugin { pname = "nvim-neoclip.lua"; - version = "2024-06-01"; + version = "2024-09-10"; src = fetchFromGitHub { owner = "AckslD"; repo = "nvim-neoclip.lua"; - rev = "709c97fabec9da7d04f7d2f5e207423af8c02871"; - sha256 = "0sh5a680jr9390hdn7h6j72h2148089is506qk4khxrqag2yd4zi"; + rev = "32e05f2d23dc5b6a284a688c0535a83d1bfc633f"; + sha256 = "0z6rfbl02ddazfrmczb34hspgshqvxpi3ga4q7srhpz0cch16y8q"; }; meta.homepage = "https://github.com/AckslD/nvim-neoclip.lua/"; }; nvim-nio = buildNeovimPlugin { pname = "nvim-nio"; - version = "2024-06-09"; + version = "2024-07-11"; src = fetchFromGitHub { owner = "nvim-neotest"; repo = "nvim-nio"; - rev = "7969e0a8ffabdf210edd7978ec954a47a737bbcc"; - sha256 = "0ip31k5rnmv47rbka1v5mhljmff7friyj4gcqzz4hqj1yccfl1l0"; + rev = "a428f309119086dc78dd4b19306d2d67be884eee"; + sha256 = "0n40q6znpy1xzywd1hwyivx7y1n0i0fcp3m7jp0vgipm6qssda4b"; }; meta.homepage = "https://github.com/nvim-neotest/nvim-nio/"; }; @@ -8187,24 +8935,24 @@ final: prev: nvim-notify = buildVimPlugin { pname = "nvim-notify"; - version = "2024-05-17"; + version = "2024-09-22"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-notify"; - rev = "d333b6f167900f6d9d42a59005d82919830626bf"; - sha256 = "0000a56y6xp2hzb5pf0in9336s9r29w590kxqdxdl5gfpz08f763"; + rev = "fbef5d32be8466dd76544a257d3f3dce20082a07"; + sha256 = "0wbsib27kgrk632c094ivjbc8rw51kbalq9c8j576p78k93wipj9"; }; meta.homepage = "https://github.com/rcarriga/nvim-notify/"; }; nvim-nu = buildVimPlugin { pname = "nvim-nu"; - version = "2024-04-21"; + version = "2024-08-23"; src = fetchFromGitHub { owner = "LhKipp"; repo = "nvim-nu"; - rev = "64e1677db3319ec5900afa666a2c85c31adc0705"; - sha256 = "0cgdky2zai7mfshac2szfq346i0ql9c4miax10hz76kb2nq8v7wx"; + rev = "ca92d6defc08dbfa3b27ab36bfc99d97a259c3de"; + sha256 = "03nybdgdx7yswn5ybyhwdvjckdv4qz7pi8whgcqdlnqrpmh51sdm"; }; meta.homepage = "https://github.com/LhKipp/nvim-nu/"; }; @@ -8223,12 +8971,12 @@ final: prev: nvim-paredit = buildVimPlugin { pname = "nvim-paredit"; - version = "2024-03-30"; + version = "2024-07-11"; src = fetchFromGitHub { owner = "julienvincent"; repo = "nvim-paredit"; - rev = "8dd4ffd6ee0d798026f9ad6cf04344560207b9f1"; - sha256 = "0kqd87m58ya9faijs2ldzirps5ayillfmcdgd19b342jw0q393k6"; + rev = "dd851b3a17e393b6837c26ee14fc96db9ffdef82"; + sha256 = "084vc5rfqa8k9ir5pd5rwfssmkq8yi2ndg3gr8mj2fylr14lp9z7"; }; meta.homepage = "https://github.com/julienvincent/nvim-paredit/"; }; @@ -8293,6 +9041,18 @@ final: prev: meta.homepage = "https://github.com/olrtg/nvim-rename-state/"; }; + nvim-rip-substitute = buildVimPlugin { + pname = "nvim-rip-substitute"; + version = "2024-09-20"; + src = fetchFromGitHub { + owner = "chrisgrieser"; + repo = "nvim-rip-substitute"; + rev = "7a09242bf2cdc4f27326cc5f13c141110db62d46"; + sha256 = "166hsfszpc9kkhljwigb9bnhl9m85hlr36p7rbma06skf1cgms0i"; + }; + meta.homepage = "https://github.com/chrisgrieser/nvim-rip-substitute/"; + }; + nvim-scrollbar = buildVimPlugin { pname = "nvim-scrollbar"; version = "2024-06-03"; @@ -8307,12 +9067,12 @@ final: prev: nvim-scrollview = buildVimPlugin { pname = "nvim-scrollview"; - version = "2024-06-13"; + version = "2024-07-21"; src = fetchFromGitHub { owner = "dstein64"; repo = "nvim-scrollview"; - rev = "fd334e5ad0c616987d1b9114890a59c97165cf83"; - sha256 = "1s8dr79mnqw2ii54myi43fy3knd2i28c2k5g59fln2m8g90j21lg"; + rev = "401c0498689dcaa54b2e7483d823e33cdc051e72"; + sha256 = "1j6y0mv56ykip6cf9n4pragqxbcb73p3zmj6n7h3ppsncs5993ma"; }; meta.homepage = "https://github.com/dstein64/nvim-scrollview/"; }; @@ -8331,24 +9091,24 @@ final: prev: nvim-snippets = buildVimPlugin { pname = "nvim-snippets"; - version = "2024-06-10"; + version = "2024-07-10"; src = fetchFromGitHub { owner = "garymjr"; repo = "nvim-snippets"; - rev = "5c978b3ba0c504dc9f94ca93d17029f26064d229"; - sha256 = "1s8hdcwg92w0n24drknpndsjxdsy18xr3fbchdid8l002a7apnxy"; + rev = "56b4052f71220144689caaa2e5b66222ba5661eb"; + sha256 = "0a7s5rz3w8mm5gsq42g418rdhlas5ga3q5w81jix81xwkalllg6l"; }; meta.homepage = "https://github.com/garymjr/nvim-snippets/"; }; nvim-snippy = buildVimPlugin { pname = "nvim-snippy"; - version = "2024-06-10"; + version = "2024-09-13"; src = fetchFromGitHub { owner = "dcampos"; repo = "nvim-snippy"; - rev = "f25299bd83f4257d0e4d00bcb90578ddd248ae3a"; - sha256 = "0cww81nmw9wmqr9zyvkkfkagjg0v7lp1nqgnkz7m59gd2mj9szvc"; + rev = "87b9a4fc514a789fca833bf540484fbda6a946b3"; + sha256 = "1xj1i17685ck259psam0qzd5hrk4ywrz1dpmrzdxbyj9m6dh906d"; }; meta.homepage = "https://github.com/dcampos/nvim-snippy/"; }; @@ -8379,36 +9139,36 @@ final: prev: nvim-spectre = buildVimPlugin { pname = "nvim-spectre"; - version = "2024-06-04"; + version = "2024-07-30"; src = fetchFromGitHub { owner = "nvim-pack"; repo = "nvim-spectre"; - rev = "ec67d4b5370094b923dfcf6b09b39142f2964861"; - sha256 = "0b99x2cc18bny35l2njlfd6cv9ynxhbmlkbpkg2ikp0k3138jga3"; + rev = "ba7fb777edff6c1fbbeffd343e113af64c04e90a"; + sha256 = "024kndjny8h8669d63796c8fnksb3vi86w20bfplxi4vbsz4syhn"; }; meta.homepage = "https://github.com/nvim-pack/nvim-spectre/"; }; nvim-spider = buildVimPlugin { pname = "nvim-spider"; - version = "2024-06-04"; + version = "2024-09-14"; src = fetchFromGitHub { owner = "chrisgrieser"; repo = "nvim-spider"; - rev = "b17d85c086d963852b7e3f543e0cd187b5112bc5"; - sha256 = "0cnmmsiq3pknsa1kmh1i7qb5a97ysir86a1k10idzw3qfjffsjnz"; + rev = "b1c542a78522d59432a827f6ec2b28f9422c7e7f"; + sha256 = "1b9ccj6qycxlcy84fdd7n7b20bmfpwyc8x4wzcakj3xymrp469d9"; }; meta.homepage = "https://github.com/chrisgrieser/nvim-spider/"; }; 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 +9211,36 @@ final: prev: nvim-tree-lua = buildVimPlugin { pname = "nvim-tree.lua"; - version = "2024-06-09"; + version = "2024-09-22"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-tree.lua"; - rev = "2086e564c4d23fea714e8a6d63b881e551af2f41"; - sha256 = "0scmn05y9ya1lwz7ad7519bq1n3ha8hs7i28kgw83r5syp0bg8zc"; + rev = "8405ecfbd6bb08a94ffc9c68fef211eea56e8a3b"; + sha256 = "0yrpzhs6y73dsf29l29gvv4a3k1f4dzxf8qfmylpkw30vy75brg8"; }; meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/"; }; nvim-treesitter = buildVimPlugin { pname = "nvim-treesitter"; - version = "2024-06-19"; + version = "2024-09-23"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "66ae8748fd4e8550c8b17cf115c9739aea1e4067"; - sha256 = "0hll69cjhgjnbyh6xqvk9xk6pr8fna9h1rj4nz3fkmq57iwzs812"; + rev = "621f5901f0b3e762cc4c5ed0f9246cf1495193ad"; + sha256 = "004k18rz22cmwm1r29h2n595w8wynw9s2ksfskvblkhc53qbgkzs"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; nvim-treesitter-context = buildVimPlugin { pname = "nvim-treesitter-context"; - version = "2024-06-02"; + version = "2024-09-21"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-context"; - rev = "5efba33af0f39942e426340da7bc15d7dec16474"; - sha256 = "0dbw3d3d30yg79vp7008yi93n9y258imvr1baydpni571z8yinl6"; + rev = "3d5390c49e3f8fe457b376df2a49aa39d75b7911"; + sha256 = "1b4f9cnr1wxnbi3pvm6lmri3xc036lyhmi2c5jikma2j52zpz0z6"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-context/"; }; @@ -8511,72 +9271,72 @@ final: prev: nvim-treesitter-refactor = buildVimPlugin { pname = "nvim-treesitter-refactor"; - version = "2023-04-04"; + version = "2024-09-14"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-refactor"; - rev = "65ad2eca822dfaec2a3603119ec3cc8826a7859e"; - sha256 = "14vg4iykl56ii4m5jrbrw95yjzkqn53vyqpqm82a5lmxgsha8d6b"; + rev = "d8b74fa87afc6a1e97b18da23e762efb032dc270"; + sha256 = "0n5aygram7wfmhsy3sb68g4adpkx6z1z31cl0780zbdgs5k3785b"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-refactor/"; }; nvim-treesitter-textobjects = buildVimPlugin { pname = "nvim-treesitter-textobjects"; - version = "2024-06-05"; + version = "2024-09-08"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "34867c69838078df7d6919b130c0541c0b400c47"; - sha256 = "0c8f2y8glhsbd2nbb0iwjly8f07mjy55z3j53l0p360dgj23kmpw"; + rev = "bf8d2ad35d1d1a687eae6c065c3d524f7ab61b23"; + sha256 = "00bnih7l16ljliq386347731nbpj5f9k3a6lb6zy7xmbn7i3nfd8"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/"; }; 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-08-27"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-ts-autotag"; - rev = "06fe07d7523ba8c755fac7c913fceba43b1720ee"; - sha256 = "1k23jy33abcxc84qgkw68mzbcl8fxpvg8p5phh5pgvp5n32aspbz"; + rev = "e239a560f338be31337e7abc3ee42515daf23f5e"; + sha256 = "1qk3pij5m9hxksyyj9bk8a7x5vn3rc6wwy6idc91c2pyyhmd8k20"; }; 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-08-15"; src = fetchFromGitHub { owner = "joosepalviste"; repo = "nvim-ts-context-commentstring"; - rev = "cb064386e667def1d241317deed9fd1b38f0dc2e"; - sha256 = "13xyrzp9gfbnrxp6v7xxpiwyk18rnw5pn3vw01f0xvnpfsqfz3w4"; + rev = "375c2d86cee6674afd75b4f727ce3a80065552f7"; + sha256 = "0p7jdz3233dqz72rhkah2gasa855p15k6k6zrz3fw82fg94pd68a"; }; meta.homepage = "https://github.com/joosepalviste/nvim-ts-context-commentstring/"; }; nvim-ufo = buildVimPlugin { pname = "nvim-ufo"; - version = "2024-06-06"; + version = "2024-09-08"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-ufo"; - rev = "aa2e676af592b4e99c105d80d6eafd1afc215d99"; - sha256 = "1311x43lsfkkqa22xzqnas76p3qqhwnhz5xa77gkry5k43jnycyy"; + rev = "203c9f434feec57909ab4b1e028abeb3349b7847"; + sha256 = "1w4d7h53p4xpx8pz2shn253900xhqgw5r7y103y60ywf53cr2k03"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-ufo/"; }; @@ -8593,14 +9353,26 @@ final: prev: meta.homepage = "https://github.com/samjwill/nvim-unception/"; }; + nvim-various-textobjs = buildVimPlugin { + pname = "nvim-various-textobjs"; + version = "2024-09-14"; + src = fetchFromGitHub { + owner = "chrisgrieser"; + repo = "nvim-various-textobjs"; + rev = "fcdec45b3bf33d3b279d2c5fee06abf4ce152008"; + sha256 = "0si4wzlnj3anm4w6l8bmzki1zk0wlcgjjmz3rjkz0rm7mn3krq6z"; + }; + meta.homepage = "https://github.com/chrisgrieser/nvim-various-textobjs/"; + }; + nvim-web-devicons = buildVimPlugin { pname = "nvim-web-devicons"; - version = "2024-06-09"; + version = "2024-09-21"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-web-devicons"; - rev = "c0cfc1738361b5da1cd0a962dd6f774cc444f856"; - sha256 = "1fwc0xrg07cr7x8cgksckqlkwbjl3nh0qvailp89zd35al9pzw4g"; + rev = "26220156aafb198b2de6a4cf80c1b120a3768da0"; + sha256 = "11ndzzh43xhbb6gmjcqjyinb87ijsvwshmxbxinlpw712zdiyfpn"; }; meta.homepage = "https://github.com/nvim-tree/nvim-web-devicons/"; }; @@ -8643,12 +9415,12 @@ final: prev: nvim_context_vt = buildVimPlugin { pname = "nvim_context_vt"; - version = "2024-04-18"; + version = "2024-07-16"; src = fetchFromGitHub { owner = "andersevenrud"; repo = "nvim_context_vt"; - rev = "4b89241c19909f18d2f6b58777c413c027600fcc"; - sha256 = "116j5k4nznsldiv752rhxlsjzr2cha1zclxrffiqlnbldiyr5i8i"; + rev = "03fb506bbd5fdbb2b21ac6b0fe38ed40e339b143"; + sha256 = "1l0zi3pkhss3y5jpa7vgg4p0s0a15h4wdmkxz29mmljrpql2zhzs"; }; meta.homepage = "https://github.com/andersevenrud/nvim_context_vt/"; }; @@ -8679,12 +9451,12 @@ final: prev: obsidian-nvim = buildVimPlugin { pname = "obsidian.nvim"; - version = "2024-06-17"; + version = "2024-08-01"; src = fetchFromGitHub { owner = "epwalsh"; repo = "obsidian.nvim"; - rev = "7e087da48bd88fb3a6c6229a97713ac35694337a"; - sha256 = "1dgqm7qjnkgz9wm8fv5j6q2f46ip9hac1csbwxv7lqavi1xw9p0l"; + rev = "14e0427bef6c55da0d63f9a313fd9941be3a2479"; + sha256 = "15ycmhn48ryaqzch6w3w6llq2qgmjx8xwkb9dn0075z60dybpflr"; }; meta.homepage = "https://github.com/epwalsh/obsidian.nvim/"; }; @@ -8715,24 +9487,24 @@ final: prev: octo-nvim = buildVimPlugin { pname = "octo.nvim"; - version = "2024-06-15"; + version = "2024-09-14"; src = fetchFromGitHub { owner = "pwntester"; repo = "octo.nvim"; - rev = "1f0029d5283443bad9a818fd7d9db253404bf8aa"; - sha256 = "1il6jy83d56lxlgxyklvl76dxk7iikq2941jl6ihbf0v5lbig472"; + rev = "955f0fdd03b0da23ee1c3368d80bf806f0e36fa5"; + sha256 = "0lz2vvfs30bzqfv714m71vch89phyvyhh08qcfm07aix1pi24mf5"; }; meta.homepage = "https://github.com/pwntester/octo.nvim/"; }; oil-nvim = buildVimPlugin { pname = "oil.nvim"; - version = "2024-06-16"; + version = "2024-09-17"; src = fetchFromGitHub { owner = "stevearc"; repo = "oil.nvim"; - rev = "64a3a555b40d96faae488ed6cf5d0f8b38520891"; - sha256 = "1wmg72r6ydmrgiy4c8jv8fpgkf2wwxpyq7zv4a2bx4imhly4zccx"; + rev = "1360be5fda9c67338331abfcd80de2afbb395bcd"; + sha256 = "17jb7s7syzl2bwk6m888kibs88qb3hh13l2sksyxd733m7lnzb8f"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/oil.nvim/"; @@ -8764,12 +9536,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/"; }; @@ -8788,24 +9560,24 @@ final: prev: onedark-nvim = buildVimPlugin { pname = "onedark.nvim"; - version = "2024-05-11"; + version = "2024-07-05"; src = fetchFromGitHub { owner = "navarasu"; repo = "onedark.nvim"; - rev = "8e4b79b0e6495ddf29552178eceba1e147e6cecf"; - sha256 = "1xxa0q9val9hl5jby2zqn7wlh0vkibj3s8mbmj8vfba4afqlqi0q"; + rev = "fae34f7c635797f4bf62fb00e7d0516efa8abe37"; + sha256 = "1l5kvpnmp83mdm8xw28rgc26rzksywvbw978fsksxrdq0vils1ac"; }; meta.homepage = "https://github.com/navarasu/onedark.nvim/"; }; onedark-vim = buildVimPlugin { pname = "onedark.vim"; - version = "2023-07-19"; + version = "2024-07-16"; src = fetchFromGitHub { owner = "joshdick"; repo = "onedark.vim"; - rev = "57b77747694ea5676c3ca0eeaf9567dc499730c0"; - sha256 = "1yr3yywisqwdd3b7xbmcpc3dlq61mjcaspm30j2iqzs000ldbpxf"; + rev = "390b893d361c356ac1b00778d849815f2aa44ae4"; + sha256 = "0km3qrcqw01bjmnilcrjrmd2wjhhajvkni9z4qg0hci3xbn5g44z"; }; meta.homepage = "https://github.com/joshdick/onedark.vim/"; }; @@ -8824,12 +9596,12 @@ final: prev: onedarkpro-nvim = buildVimPlugin { pname = "onedarkpro.nvim"; - version = "2024-06-08"; + version = "2024-08-22"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedarkpro.nvim"; - rev = "308527d45efb9f2a0bd4b4004c1c02023557ed6b"; - sha256 = "0s0wm06ymagrax1lngz81p7bhk2f9k2ivxy6vx2a7fwam8yayrfs"; + rev = "ada0798b1bf6d0bde1fbf239c22de778bf5efbd1"; + sha256 = "065f1cvdkaphdpqnslyaj7bk4wqkwa5rk8a2xh39j00migqw9p09"; }; meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/"; }; @@ -8848,12 +9620,12 @@ final: prev: onenord-nvim = buildVimPlugin { pname = "onenord.nvim"; - version = "2024-06-01"; + version = "2024-09-21"; src = fetchFromGitHub { owner = "rmehri01"; repo = "onenord.nvim"; - rev = "70b716fd36a18284ad768402523b79ccdadafedf"; - sha256 = "18vrjaw60225q3phxm7lzf0fvfa3ii9gr2zdgyfvxa85iyzcfqqn"; + rev = "7f8a7482a1145c1286ee05d46ef4d028a4f7264a"; + sha256 = "17c1kvqkh483h7hxpxyn3xc0cwhxlmjs5pvav6gf5rbq88ddc2kk"; }; meta.homepage = "https://github.com/rmehri01/onenord.nvim/"; }; @@ -8908,60 +9680,60 @@ final: prev: orgmode = buildVimPlugin { pname = "orgmode"; - version = "2024-06-14"; + version = "2024-09-23"; src = fetchFromGitHub { owner = "nvim-orgmode"; repo = "orgmode"; - rev = "cc51c1914e3f0bf20bd543a7176df5bab12ec247"; - sha256 = "1pr5fh2pr3awmxvaw0n811165nf9p3n0pp2cg4f8qs15y6ncbkq7"; + rev = "08d763df12f4a03e704c25254ae0de0a95e26eaf"; + sha256 = "1gkpwyfvw9z92277q6311r924rmb9zidgmlr4xxkmn2xrj5qwl7x"; }; meta.homepage = "https://github.com/nvim-orgmode/orgmode/"; }; other-nvim = buildVimPlugin { pname = "other.nvim"; - version = "2024-06-10"; + version = "2024-08-26"; src = fetchFromGitHub { owner = "rgroli"; repo = "other.nvim"; - rev = "63f587dde62149bd2ed3e31edceb49d5c4097a26"; - sha256 = "0chlpvz1y1w52s3cqhf5f1pnj0h451qsylfhr33qvg1nf1qmxckg"; + rev = "252cc279eb3d76685ef48aaeced1c3cf9793581f"; + sha256 = "1jcibj2gdhzqwy6rsgv0x246qv2z4maxd6yawymbs9pmxr05lf3v"; }; meta.homepage = "https://github.com/rgroli/other.nvim/"; }; otter-nvim = buildVimPlugin { pname = "otter.nvim"; - version = "2024-06-09"; + version = "2024-08-25"; src = fetchFromGitHub { owner = "jmbuhr"; repo = "otter.nvim"; - rev = "cbb1be0586eae18cbea38ada46af428d2bebf81a"; - sha256 = "085lx5z7abbn7rq23pma5xmymzgjajp0slg0g42wafxpn7rby9kv"; + rev = "ca9ce67d0399380b659923381b58d174344c9ee7"; + sha256 = "1dlqb6ihif3s5w2pydw1iinwhsn8z1in7jxqhrzv274nmnhg1qbs"; }; meta.homepage = "https://github.com/jmbuhr/otter.nvim/"; }; outline-nvim = buildVimPlugin { pname = "outline.nvim"; - version = "2024-06-05"; + version = "2024-09-21"; src = fetchFromGitHub { owner = "hedyhli"; repo = "outline.nvim"; - rev = "028e0bc8ad3d511e9fc1f0678594a608eb908ee5"; - sha256 = "1ng8pg64cvgaagx8dri172z9qwv34ld4293amy48fddm9xxgmdqw"; + rev = "6c44527837ff7ac1cd054dc365a721e881020a2e"; + sha256 = "1nxcmdq04qqs57dy6wfjl81hkwcylvkpiqfx2k1176a86p8lldn3"; }; meta.homepage = "https://github.com/hedyhli/outline.nvim/"; }; overseer-nvim = buildVimPlugin { pname = "overseer.nvim"; - version = "2024-06-14"; + version = "2024-09-18"; src = fetchFromGitHub { owner = "stevearc"; repo = "overseer.nvim"; - rev = "d78fa84c06d37b1eb3bd42b4b5467c7476e74589"; - sha256 = "130y8gjbyr3bg9l24s0iiiv40wpqq48axzvbjpraalca181zkhcd"; + rev = "a2734d90c514eea27c4759c9f502adbcdfbce485"; + sha256 = "1fj4s0mnnr3hibm2jqkn6hmi8nvrs0bijr802cnmvwdzq1mzc54d"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/overseer.nvim/"; @@ -8969,24 +9741,24 @@ final: prev: oxocarbon-nvim = buildVimPlugin { pname = "oxocarbon.nvim"; - version = "2023-11-27"; + version = "2024-08-28"; src = fetchFromGitHub { owner = "nyoom-engineering"; repo = "oxocarbon.nvim"; - rev = "c5846d10cbe4131cc5e32c6d00beaf59cb60f6a2"; - sha256 = "1789b010h8yz0yg60xjssl6fz02dbpkq90ldalyqk5p4ncn41qpv"; + rev = "004777819ba294423b638a35a75c9f0c7be758ed"; + sha256 = "1qllk870nqc9nhkdgmqm8km2rar6dsmyhfhpcfx8crrg640yfbqy"; }; meta.homepage = "https://github.com/nyoom-engineering/oxocarbon.nvim/"; }; package-info-nvim = buildVimPlugin { pname = "package-info.nvim"; - version = "2024-02-18"; + version = "2024-08-12"; src = fetchFromGitHub { owner = "vuki656"; repo = "package-info.nvim"; - rev = "45acce5b12ce824332d8000cc2c91805b6710446"; - sha256 = "19aaswkjx7q85c091p80zypx6az0m5z2jccapng5clvh2j4qw7qf"; + rev = "268f4669fc29546726009ad665d26901dbf62c3b"; + sha256 = "16lj1x11lp1fiq9ncvcrn3r6mr3s5ailwxs4hgvyvydr4smv1giy"; }; meta.homepage = "https://github.com/vuki656/package-info.nvim/"; }; @@ -9089,40 +9861,28 @@ final: prev: persisted-nvim = buildVimPlugin { pname = "persisted.nvim"; - version = "2024-06-15"; + version = "2024-09-13"; src = fetchFromGitHub { owner = "olimorris"; repo = "persisted.nvim"; - rev = "0a9eebf5cc92b1113a382a660ee73f21ffd62ae7"; - sha256 = "0gyacxix6m9wpzlm6a5p1s2aa9916750fd8chgkga8m3q34bdq9a"; + rev = "3006e641e2892b58fe51511c31595515e1a7dc00"; + sha256 = "19zp691z8lbxyg1fisqz8lf3jgra4sww6c6qj270im8kqc4h2spp"; }; meta.homepage = "https://github.com/olimorris/persisted.nvim/"; }; persistence-nvim = buildVimPlugin { pname = "persistence.nvim"; - version = "2024-06-12"; + version = "2024-07-22"; src = fetchFromGitHub { owner = "folke"; repo = "persistence.nvim"; - rev = "95d03ad5450389ad7dc2a0fab14ebb3d46bc2c96"; - sha256 = "1hmwrr15w8ybvy8m2jrn34n5dq2svklf498k7j431mw9y1knj68v"; + rev = "f6aad7dde7fcf54148ccfc5f622c6d5badd0cc3d"; + sha256 = "01sm0dyq3k939qf91hx8nldpj9kik4s6s2z6mahmqjh5ghday6a1"; }; meta.homepage = "https://github.com/folke/persistence.nvim/"; }; - peskcolor-vim = buildVimPlugin { - pname = "peskcolor.vim"; - version = "2016-06-11"; - src = fetchFromGitHub { - owner = "andsild"; - repo = "peskcolor.vim"; - rev = "cba4fc739bbebacd503158f6509d9c226651f363"; - sha256 = "15hw3casr5y3ckgcn6aq8vhk6g2hym41w51nvgf34hbj9fx1nvkq"; - }; - meta.homepage = "https://github.com/andsild/peskcolor.vim/"; - }; - pest-vim = buildVimPlugin { pname = "pest.vim"; version = "2024-04-25"; @@ -9161,24 +9921,24 @@ final: prev: plantuml-previewer-vim = buildVimPlugin { pname = "plantuml-previewer.vim"; - version = "2023-03-07"; + version = "2024-09-23"; src = fetchFromGitHub { owner = "weirongxu"; repo = "plantuml-previewer.vim"; - rev = "1dd4d0f2b09cd80a217f76d82f93830dbbe689b3"; - sha256 = "0pvdiyyqd9j65q9wf3y6jxgry4lxvnbd2ah1761a4vbn02zdrr2v"; + rev = "555347700382c97b347bace57b7a9f764ed556b1"; + sha256 = "0vlx6zbdaw71vlwgs46274af60cazv6d9pa5dn9afm99vls57avq"; }; meta.homepage = "https://github.com/weirongxu/plantuml-previewer.vim/"; }; plantuml-syntax = buildVimPlugin { pname = "plantuml-syntax"; - version = "2024-05-10"; + version = "2024-08-25"; src = fetchFromGitHub { owner = "aklt"; repo = "plantuml-syntax"; - rev = "44054d6d2cbcf01a064858faa3364cd30d38057d"; - sha256 = "0kwk96y6cn7l7w151438sdjflfc6c6irysg00b1q4h1f4x3fcfvq"; + rev = "9d4900aa16674bf5bb8296a72b975317d573b547"; + sha256 = "13m41yyax1sfmg7kwpxmx06rrvlyixnlayazdrn0pfnmiv23jsma"; }; meta.homepage = "https://github.com/aklt/plantuml-syntax/"; }; @@ -9197,12 +9957,12 @@ final: prev: plenary-nvim = buildNeovimPlugin { pname = "plenary.nvim"; - version = "2024-05-20"; + version = "2024-09-17"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "plenary.nvim"; - rev = "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683"; - sha256 = "0n2p8krzwiw682f0yb6n8faamffpp336rjy50pbqf3jmc6czd5z4"; + rev = "2d9b06177a975543726ce5c73fca176cedbffe9d"; + sha256 = "1blmh0qr010jhydw61kiynll2m7q4xyrvrva8b5ipf1g81x8ysbf"; }; meta.homepage = "https://github.com/nvim-lua/plenary.nvim/"; }; @@ -9256,6 +10016,18 @@ final: prev: meta.homepage = "https://github.com/nvim-lua/popup.nvim/"; }; + precognition-nvim = buildVimPlugin { + pname = "precognition.nvim"; + version = "2024-08-13"; + src = fetchFromGitHub { + owner = "tris203"; + repo = "precognition.nvim"; + rev = "8a81c310b4e76b4884fc5350a5741cf683c645c7"; + sha256 = "1x6h94jcpyqdqg5ranrmsp2di4lh8kchi03bp80600r54f5sgqf3"; + }; + meta.homepage = "https://github.com/tris203/precognition.nvim/"; + }; + presence-nvim = buildVimPlugin { pname = "presence.nvim"; version = "2023-01-29"; @@ -9330,12 +10102,12 @@ final: prev: promise-async = buildVimPlugin { pname = "promise-async"; - version = "2024-06-10"; + version = "2024-08-04"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "promise-async"; - rev = "28c1d5a295eb5310afa2523d4ae9aa41ec5a9de2"; - sha256 = "11v2jqjil6l1i9rl93pcdn0b8nk8f0zg10fk3p3q4z641c8m8xjf"; + rev = "119e8961014c9bfaf1487bf3c2a393d254f337e2"; + sha256 = "0q4a0rmy09hka6zvydzjj2gcm2j5mlbrhbxfcdjj33ngpblkmqzm"; }; meta.homepage = "https://github.com/kevinhwang91/promise-async/"; }; @@ -9352,6 +10124,18 @@ final: prev: meta.homepage = "https://github.com/frigoeu/psc-ide-vim/"; }; + pum-vim = buildVimPlugin { + pname = "pum.vim"; + version = "2024-08-26"; + src = fetchFromGitHub { + owner = "Shougo"; + repo = "pum.vim"; + rev = "e18e30c02eae0463a5837e1ea692f02821fcae0e"; + sha256 = "0f9663prggvk36ilz2f96w1970hwb0mqj6v8wy0in24cjhlrchw3"; + }; + meta.homepage = "https://github.com/Shougo/pum.vim/"; + }; + purescript-vim = buildVimPlugin { pname = "purescript-vim"; version = "2023-02-06"; @@ -9403,36 +10187,36 @@ final: prev: qmk-nvim = buildVimPlugin { pname = "qmk.nvim"; - version = "2024-04-17"; + version = "2024-09-14"; src = fetchFromGitHub { owner = "codethread"; repo = "qmk.nvim"; - rev = "cfa6cecae362d23778cd97317d33ab12671e157c"; - sha256 = "0p44i25iyryrvy1sf3bp10as39mgd6da1gai332rv2ky3zgc3lbh"; + rev = "ad51cb15e607da0983fcf9882d38a2aafac32149"; + sha256 = "14b8mx7hxv06cnh6xb1z0nrkhlj7xaxdky6lcmajn9bp9spdzlmq"; }; meta.homepage = "https://github.com/codethread/qmk.nvim/"; }; quarto-nvim = buildVimPlugin { pname = "quarto-nvim"; - version = "2024-03-06"; + version = "2024-07-09"; src = fetchFromGitHub { owner = "quarto-dev"; repo = "quarto-nvim"; - rev = "67e09027b5d8bd948907734fc6fb15028ffdcd28"; - sha256 = "07p45qmxnc10kfn9syfqv5v5jm75rd8bs9gv90a246dxis4p0515"; + rev = "eed598983fa4040eed77191f69462c1348770b8a"; + sha256 = "0za72ishz4gbc43887r18n7qlzayx05i5apfix1v77pn0c8fwwnr"; }; meta.homepage = "https://github.com/quarto-dev/quarto-nvim/"; }; quick-scope = buildVimPlugin { pname = "quick-scope"; - version = "2023-08-08"; + version = "2024-07-05"; src = fetchFromGitHub { owner = "unblevable"; repo = "quick-scope"; - rev = "256d81e391a22eeb53791ff62ce65f870418fa71"; - sha256 = "037x5lrpgli46a71x05x35ig9jh8l9qsv2azx5s0g78xja6kih2d"; + rev = "4d35d3b2bc6794666353dcc241b2680bd560416f"; + sha256 = "1hllww9s2wzs7rjxi9pwi0wda8bxbhdyrf3dvxmdgfl5irv1gdlp"; }; meta.homepage = "https://github.com/unblevable/quick-scope/"; }; @@ -9475,23 +10259,23 @@ final: prev: rainbow = buildVimPlugin { pname = "rainbow"; - version = "2022-10-08"; + version = "2024-07-27"; src = fetchFromGitHub { owner = "luochen1990"; repo = "rainbow"; - rev = "61f719aebe0dc5c3048330c50db72cfee1afdd34"; - sha256 = "0q6ynkv08b4rlns6gzrkwxrihykpadcrln8ckbcwmsv97injhxws"; + rev = "76ca1a20aa42edb5c65c19029968aad4625790dc"; + sha256 = "0wa4ayv7j68mighx9gacqrmxv131c21cqngr4f0qffnxrl0y04bl"; }; meta.homepage = "https://github.com/luochen1990/rainbow/"; }; rainbow-delimiters-nvim = buildVimPlugin { pname = "rainbow-delimiters.nvim"; - version = "2024-06-14"; + version = "2024-09-03"; src = fetchgit { url = "https://gitlab.com/HiPhish/rainbow-delimiters.nvim"; - rev = "5c9660801ce345cd3835e1947c12b54290ab7e71"; - sha256 = "0jm02hp7g5pqfrv2jr93gd4zz8v33w4cb220m7akq07gwhj7fag8"; + rev = "5f73b24aeb94f5274c218955573153c69ce4d1ee"; + sha256 = "1clrcbjcg5iq5i1qnh9whrlhplq76hwxn0n6yi8r7zq51m00kji0"; }; meta.homepage = "https://gitlab.com/HiPhish/rainbow-delimiters.nvim"; }; @@ -9532,6 +10316,18 @@ final: prev: meta.homepage = "https://github.com/winston0410/range-highlight.nvim/"; }; + ranger-nvim = buildVimPlugin { + pname = "ranger.nvim"; + version = "2024-02-09"; + src = fetchFromGitHub { + owner = "kelly-lin"; + repo = "ranger.nvim"; + rev = "d3b032feee6b3b0cf923222f260523e2bd7f3ad3"; + sha256 = "07c0rri7v0z9hjdj3vqsqjms43y2a9kqqac2s5is7ksz2hqi5yzj"; + }; + meta.homepage = "https://github.com/kelly-lin/ranger.nvim/"; + }; + ranger-vim = buildVimPlugin { pname = "ranger.vim"; version = "2021-12-13"; @@ -9570,24 +10366,24 @@ final: prev: refactoring-nvim = buildVimPlugin { pname = "refactoring.nvim"; - version = "2024-06-15"; + version = "2024-07-28"; src = fetchFromGitHub { owner = "theprimeagen"; repo = "refactoring.nvim"; - rev = "e6b10b2346bd7e469a5f17099775ad906da153ae"; - sha256 = "1m0ah5f1w18g7y78ra78yczzpdb4giwk9hsig3379f26xz5fknp2"; + rev = "c406fc5fb4d7ba5fce7b668637075fad6e75e9f8"; + sha256 = "102h8gcf86540bzs0dgis25x3w9ap0an1v75hskj3y2pbyr7hyvk"; }; meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/"; }; registers-nvim = buildVimPlugin { pname = "registers.nvim"; - version = "2023-12-30"; + version = "2024-07-12"; src = fetchFromGitHub { owner = "tversteeg"; repo = "registers.nvim"; - rev = "22bb98f93a423252fffeb3531f7bc12a3e07b63f"; - sha256 = "0fjzbffrg2mlkll8djbl01cwxmc3431kkng2zq3rksf73qwhik7w"; + rev = "17df665d3fd8995b69a1a434cb285a25ab22cc49"; + sha256 = "0szlfn9prqx5v36wn7bqkcasdjxfgcr0vg7k6vfm1c9h4kxbrvd0"; }; meta.homepage = "https://github.com/tversteeg/registers.nvim/"; }; @@ -9616,6 +10412,18 @@ final: prev: meta.homepage = "https://github.com/filipdutescu/renamer.nvim/"; }; + render-markdown-nvim = buildVimPlugin { + pname = "render-markdown.nvim"; + version = "2024-09-23"; + src = fetchFromGitHub { + owner = "MeanderingProgrammer"; + repo = "render-markdown.nvim"; + rev = "75a0a9596a91130fae43d3b7c0d6c651645ef1df"; + sha256 = "04n0l0m1b5ls8afq8dizmiqlhcczzddmb9bgfp07vzxwjxk9iv5z"; + }; + meta.homepage = "https://github.com/MeanderingProgrammer/render-markdown.nvim/"; + }; + replacer-nvim = buildVimPlugin { pname = "replacer.nvim"; version = "2023-07-29"; @@ -9630,12 +10438,13 @@ final: prev: rest-nvim = buildNeovimPlugin { pname = "rest.nvim"; - version = "2024-06-10"; + version = "2024-09-24"; src = fetchFromGitHub { owner = "rest-nvim"; repo = "rest.nvim"; - rev = "c7944769dc489b9e4bc493e40820c2818eab2569"; - sha256 = "14afbxl60k2197zl8vs4rskb0rs09d00kvnr0zsnvzydv5gf38pn"; + rev = "d8ffdea1d501ab0bd3bce3b1eeb55d2bdf3dcc4f"; + sha256 = "0yg3zmm00m48ahcjvnnkxvz0xqjbwn46jf01rwqzhwrwb9v3323z"; + fetchSubmodules = true; }; meta.homepage = "https://github.com/rest-nvim/rest.nvim/"; }; @@ -9748,18 +10557,6 @@ final: prev: meta.homepage = "https://github.com/rust-lang/rust.vim/"; }; - rustaceanvim = buildNeovimPlugin { - pname = "rustaceanvim"; - version = "2024-06-18"; - src = fetchFromGitHub { - owner = "mrcjkb"; - repo = "rustaceanvim"; - rev = "14a5a4bdf23d1971d1a6386b73b89e57590a5e7d"; - sha256 = "098zlwlrdw5icvns5a7qp4bl2ly1imv2fm3981i9wqdvvvzqmn3k"; - }; - meta.homepage = "https://github.com/mrcjkb/rustaceanvim/"; - }; - sad-vim = buildVimPlugin { pname = "sad.vim"; version = "2019-02-18"; @@ -9786,48 +10583,48 @@ final: prev: satellite-nvim = buildVimPlugin { pname = "satellite.nvim"; - version = "2024-06-11"; + version = "2024-09-04"; src = fetchFromGitHub { owner = "lewis6991"; repo = "satellite.nvim"; - rev = "777ed56e1ef45ec808df701730b6597fc4fb0fbc"; - sha256 = "16byf6fa7amxad3gkwi2xyb2i5q5g7c6q0phmf15pqc1skxnr0nk"; + rev = "dfc2b220f4969ebc49b0f2a94ab6faae240705bd"; + sha256 = "1vw3r5mxqwr7imdjsa47kpzqcvr19yafcn99pg9xjyxxqh90lqz5"; }; meta.homepage = "https://github.com/lewis6991/satellite.nvim/"; }; scnvim = buildVimPlugin { pname = "scnvim"; - version = "2024-05-15"; + version = "2024-09-16"; src = fetchFromGitHub { owner = "davidgranstrom"; repo = "scnvim"; - rev = "de0fbc35ddbe023622371211f5cf599a4a960087"; - sha256 = "04gr03bpg6ja3hwfb68lhn3a7m6p2022k3138vcdazzy1gbw6r23"; + rev = "cb6a968b3de9b9a176f4012dd18efcb8d9d34f71"; + sha256 = "1z1jg201q0k6lkywkgl5phxkndklz3yw4cw4h0hp8v7whjh5yn9p"; }; meta.homepage = "https://github.com/davidgranstrom/scnvim/"; }; scope-nvim = buildVimPlugin { pname = "scope.nvim"; - version = "2024-03-31"; + version = "2024-09-17"; src = fetchFromGitHub { owner = "tiagovla"; repo = "scope.nvim"; - rev = "86a0f5b594b08b2ad65f470ffdee81654942b6ac"; - sha256 = "1fx4n8hvjm1yhbrf0dnh8pln4xr8sqkw0x1c9ij4rfd7iq67a5zh"; + rev = "932102696ead2b7ab9ff65017767b57e2722fdde"; + sha256 = "1ma6rrh8dhbm8wwky6pybczy19ziy98wsy55flfamsq5gclkxqyr"; }; meta.homepage = "https://github.com/tiagovla/scope.nvim/"; }; scrollbar-nvim = buildVimPlugin { pname = "scrollbar.nvim"; - version = "2022-06-16"; + version = "2024-08-18"; src = fetchFromGitHub { owner = "Xuyuanp"; repo = "scrollbar.nvim"; - rev = "bc97c132e8367efecb2ecb937d385e7dc04eb5a1"; - sha256 = "14g2q9nzdh9ffp2b8z3sdicrn4xq3ksq8mjxdi7cm44rlfyzfs04"; + rev = "d7e6966c258cb30c29f50012543d687aec707b9e"; + sha256 = "1va53c2l86qwy1cmv77hc8iki4734f760lm4m36hj71m0bdlwkwx"; }; meta.homepage = "https://github.com/Xuyuanp/scrollbar.nvim/"; }; @@ -9846,12 +10643,12 @@ final: prev: searchbox-nvim = buildVimPlugin { pname = "searchbox.nvim"; - version = "2024-05-17"; + version = "2024-09-04"; src = fetchFromGitHub { owner = "VonHeikemen"; repo = "searchbox.nvim"; - rev = "5cbf11fbaa24da8810f467736cef7dde2410dfb2"; - sha256 = "01nqlfw4l9zncqip5xwvlisqgmqxlkrz6pvgvgiv7p7vbj2kxg1n"; + rev = "8dde416cabb63f6d68c8755365dcd20c65b7b3b0"; + sha256 = "0q0wv2nlvrk8k46lm096sscljmrsj7ccch7il7dp1l4fs67dl1h4"; }; meta.homepage = "https://github.com/VonHeikemen/searchbox.nvim/"; }; @@ -9918,12 +10715,12 @@ final: prev: sg-nvim = buildVimPlugin { pname = "sg.nvim"; - version = "2024-05-25"; + version = "2024-09-17"; src = fetchFromGitHub { owner = "sourcegraph"; repo = "sg.nvim"; - rev = "8bdd4d19da2268072708d5fe18fda9c23e16509d"; - sha256 = "03qkd7xxi4q7mw1sgnsa9pmkk8012ndg9ij5ssw8l689v5dx6377"; + rev = "76c97d91f8d8818a4fcf14817fadd98412aa44c8"; + sha256 = "sha256-MxFr59crdc9WlYwydM1dI1NU+5qB06xh+hFnNUuBc4c="; }; meta.homepage = "https://github.com/sourcegraph/sg.nvim/"; }; @@ -9942,12 +10739,12 @@ final: prev: sideways-vim = buildVimPlugin { pname = "sideways.vim"; - version = "2023-11-18"; + version = "2024-08-30"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "sideways.vim"; - rev = "1cb0e4d7259dac8bef0dc12b4a7f8e842b32116b"; - sha256 = "1klybmikz4x2h3xk40m0jswa4b7nj243543kd0fzgvsmdk0hc38z"; + rev = "5eb971a030a1b5fac7c976582e6cfbe378181f6e"; + sha256 = "1bfdl6k8nfhqn885k7n3yamy17a54yh7qryc1p239li0mqpxa9rl"; fetchSubmodules = true; }; meta.homepage = "https://github.com/AndrewRadev/sideways.vim/"; @@ -9979,24 +10776,36 @@ final: prev: slimv = buildVimPlugin { pname = "slimv"; - version = "2024-06-17"; + version = "2024-08-31"; src = fetchFromGitHub { owner = "kovisoft"; repo = "slimv"; - rev = "e2c2bbb698c89de8c8aa91ad9ab1fd40ef6add00"; - sha256 = "0da4hcqb2936jby7zx84i0i2qxxg4wfkcfx4xx1fa92bgv79s0mx"; + rev = "c6df167f1073e5691d3da9f66632f127e17a128f"; + sha256 = "1zy2xxr6h0lfpcfg98v6jvmfly76hcyg0xrxxp979qz8fn1h20m4"; }; meta.homepage = "https://github.com/kovisoft/slimv/"; }; + smart-open-nvim = buildVimPlugin { + pname = "smart-open.nvim"; + version = "2024-04-23"; + src = fetchFromGitHub { + owner = "danielfalk"; + repo = "smart-open.nvim"; + rev = "87626ee8748b9bba22093adec7bb58c63e7214f0"; + sha256 = "sha256-ro4qFdEAnE5u8wt7NyIc7OHobvjRotVX+LZ0P5as8EU="; + }; + meta.homepage = "https://github.com/danielfalk/smart-open.nvim/"; + }; + smart-splits-nvim = buildVimPlugin { pname = "smart-splits.nvim"; - version = "2024-06-15"; + version = "2024-09-20"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "smart-splits.nvim"; - rev = "3d9fa9e4b31c30d6b328f2447a4dc7dceffbc2ea"; - sha256 = "1pvi03f98f6lys6l3jlra9l95dpavdc9y8ghl91mlwvlglrnwjrk"; + rev = "3737faa521d12a0c77d0d28bb15ad903a9e8cfe0"; + sha256 = "178cwqac71bd8rw5g0gw68dczzf1i0n0vp9skg7qlhaha9apchwk"; }; meta.homepage = "https://github.com/mrjones2014/smart-splits.nvim/"; }; @@ -10075,12 +10884,12 @@ final: prev: sonokai = buildVimPlugin { pname = "sonokai"; - version = "2024-06-03"; + version = "2024-09-02"; src = fetchFromGitHub { owner = "sainnhe"; repo = "sonokai"; - rev = "a90d437f1f4e48825150065987d175e2a45fa39e"; - sha256 = "0w7y53mdpb7xi26bm9xrhsszxngidcxfpwv7z9h5bdn1x53sb8i2"; + rev = "a9d4d398999b5f74a6dfe3af400f824e2cbddf6f"; + sha256 = "1sanxs6nb50gp15damc436c06vng53vdsrkfi5hlyzshzgn1rafc"; }; meta.homepage = "https://github.com/sainnhe/sonokai/"; }; @@ -10147,14 +10956,14 @@ final: prev: specs-nvim = buildVimPlugin { pname = "specs.nvim"; - version = "2022-09-20"; + version = "2024-05-19"; src = fetchFromGitHub { - owner = "edluffy"; + owner = "cxwx"; repo = "specs.nvim"; - rev = "2743e412bbe21c9d73954c403d01e8de7377890d"; - sha256 = "1ycqvxrn13bfimf9k03bmm1baml8gyq5lxqjxh1fya44s2bg714r"; + rev = "dd82496f538b688cedf98429f89fef47ecb0625e"; + sha256 = "0427fx6iw3i2y9ny3sz1na32bxcj8i93dbm93ckxf3bii8zqjs0s"; }; - meta.homepage = "https://github.com/edluffy/specs.nvim/"; + meta.homepage = "https://github.com/cxwx/specs.nvim/"; }; spellsitter-nvim = buildVimPlugin { @@ -10207,12 +11016,12 @@ final: prev: splitjoin-vim = buildVimPlugin { pname = "splitjoin.vim"; - version = "2024-03-17"; + version = "2024-08-19"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "splitjoin.vim"; - rev = "9b0c30f61f13ba4800a11107648bdd748ad511ba"; - sha256 = "15a3ib947yihdbc9i2i1a8ml4vhfff26lj5y0z7192g8qhw58qlh"; + rev = "f72d59c9f5d4c8b865e0abfeee98f85b47fe5a3a"; + sha256 = "1vi88nbchsrgwjkmc2a8lra8j0fs3w4g47fs82v5qra7rxikwqcl"; fetchSubmodules = true; }; meta.homepage = "https://github.com/AndrewRadev/splitjoin.vim/"; @@ -10232,12 +11041,12 @@ final: prev: srcery-vim = buildVimPlugin { pname = "srcery-vim"; - version = "2024-05-31"; + version = "2024-09-19"; src = fetchFromGitHub { owner = "srcery-colors"; repo = "srcery-vim"; - rev = "c7398b0b32009406cf3918a655c364c44d7ab99b"; - sha256 = "1bn5jbzs4rv3n8kz00mgvmkk6f9z7m7ki1ayynhlmkknqmf8izmq"; + rev = "fa2242a3dd81804468241c0a8ebb32266c33fa60"; + sha256 = "13qq617i6cv0kzr2hsz2qn2r9hvm4hyj7pq0bc5x3nq94g4kzaal"; }; meta.homepage = "https://github.com/srcery-colors/srcery-vim/"; }; @@ -10256,12 +11065,12 @@ final: prev: ssr-nvim = buildVimPlugin { pname = "ssr.nvim"; - version = "2023-10-28"; + version = "2024-09-07"; src = fetchFromGitHub { owner = "cshuaimin"; repo = "ssr.nvim"; - rev = "bb323ba621ac647b4ac5638b47666e3ef3c279e1"; - sha256 = "0w578iy0m0vvfyawjpfpi2yl51acay4alwm3g7pgf8h8rcya3pv8"; + rev = "7c95cfa5836508f08ae833a4b31d2ed265560f64"; + sha256 = "0dn6k7jd12ddgyrx580lygqv48xzn5pnh71xi7iaf1sr2f5r8ff2"; }; meta.homepage = "https://github.com/cshuaimin/ssr.nvim/"; }; @@ -10328,36 +11137,48 @@ final: prev: startup-nvim = buildVimPlugin { pname = "startup.nvim"; - version = "2023-12-20"; + version = "2024-09-06"; src = fetchFromGitHub { - owner = "startup-nvim"; + owner = "max397574"; repo = "startup.nvim"; - rev = "c6ba324f9eba0c23b675b53af431346aab893268"; - sha256 = "0vp4vfrlb39z4s4617v1xkzjkx6l5sxfravfj2wkkwzpjrqfs2bl"; + rev = "81222a9956148eebf10363726d8bccf8793aa41f"; + sha256 = "1z5gv2qr3q82hmk8vjdxk37q4nm928j3vbq91vw4nary90va8q46"; }; - meta.homepage = "https://github.com/startup-nvim/startup.nvim/"; + meta.homepage = "https://github.com/max397574/startup.nvim/"; }; statuscol-nvim = buildVimPlugin { pname = "statuscol.nvim"; - version = "2024-06-15"; + version = "2024-08-20"; src = fetchFromGitHub { owner = "luukvbaal"; repo = "statuscol.nvim"; - rev = "d6f7f5437c5404d958b88bb73e0721b1c0e09223"; - sha256 = "0qv4prxfgzn740jjhscafi7dgiirm1w4h2f4ph74j7x28yk94dlk"; + rev = "1022f922b77b44c36f8057ac29adbfd89ce86958"; + sha256 = "17pj9qlpigwdizrz62w36hndd1zr9iwmzxrr5whm2fz3dd1zwkg6"; }; meta.homepage = "https://github.com/luukvbaal/statuscol.nvim/"; }; + stay-centered-nvim = buildVimPlugin { + pname = "stay-centered.nvim"; + version = "2024-04-13"; + src = fetchFromGitHub { + owner = "arnamak"; + repo = "stay-centered.nvim"; + rev = "91113bd82ac34f25c53d53e7c1545cb5c022ade8"; + sha256 = "030xikkr06lslp77z1i1xn6pgndnc12z3q2i8xd9vv8jmzylaf0c"; + }; + meta.homepage = "https://github.com/arnamak/stay-centered.nvim/"; + }; + styler-nvim = buildVimPlugin { pname = "styler.nvim"; - version = "2024-01-19"; + version = "2024-07-22"; src = fetchFromGitHub { owner = "folke"; repo = "styler.nvim"; - rev = "2cd29996d08cec8b31270c6de64465f716ef9d71"; - sha256 = "0lml1hizypx26n80ghaibh3wkazd21phak0af5936y46c54xi2dk"; + rev = "cd616580f206d929a319987f8f9aa7e0bd6f11ef"; + sha256 = "1m2g22csdz89l1yz1wjralrd9dljmms0zjwvan9ib1dil54l82jg"; }; meta.homepage = "https://github.com/folke/styler.nvim/"; }; @@ -10376,12 +11197,12 @@ final: prev: substitute-nvim = buildVimPlugin { pname = "substitute.nvim"; - version = "2024-05-29"; + version = "2024-07-06"; src = fetchFromGitHub { owner = "gbprod"; repo = "substitute.nvim"; - rev = "8b93e792747520b6490237b5b32963e256fbde24"; - sha256 = "1ndi6s8w5kyyzk9cjk7vq70sg3cnmgi2inpm2gfnhmv8yqy8rqbg"; + rev = "97f49d16f8eea7967d41db4f657dd63af53eeba1"; + sha256 = "017g2y3hmwa5ar778djr86x9v2nc9lg84njx82rajs6lx28a8m94"; }; meta.homepage = "https://github.com/gbprod/substitute.nvim/"; }; @@ -10398,6 +11219,18 @@ final: prev: meta.homepage = "https://github.com/kvrohit/substrata.nvim/"; }; + supermaven-nvim = buildVimPlugin { + pname = "supermaven-nvim"; + version = "2024-09-23"; + src = fetchFromGitHub { + owner = "supermaven-inc"; + repo = "supermaven-nvim"; + rev = "074a83a74ad8a7b6f605df83e2583775aaeb4cfc"; + sha256 = "05lgf5vsbxhcdw5yxsiindl3cncqarjfrjdbg7zws764vhgyg7d7"; + }; + meta.homepage = "https://github.com/supermaven-inc/supermaven-nvim/"; + }; + supertab = buildVimPlugin { pname = "supertab"; version = "2024-06-07"; @@ -10448,12 +11281,12 @@ final: prev: swift-vim = buildVimPlugin { pname = "swift.vim"; - version = "2023-08-02"; + version = "2024-07-08"; src = fetchFromGitHub { owner = "keith"; repo = "swift.vim"; - rev = "bb62135c4364c84b56499f4b54e1a6b8eca72eec"; - sha256 = "1cgyr8hfp1dmrfxx7s0jvdrmw6cg9vw2yc4852ki3bdksmraqaj1"; + rev = "87ea6da902553c533b2916bd800ddabbfcd80973"; + sha256 = "0cbqmvliljil979w564plbvddhib1jmr8y8cin78i556317izjsv"; }; meta.homepage = "https://github.com/keith/swift.vim/"; }; @@ -10495,14 +11328,26 @@ final: prev: meta.homepage = "https://github.com/vim-syntastic/syntastic/"; }; + syntax-tree-surfer = buildVimPlugin { + pname = "syntax-tree-surfer"; + version = "2023-10-06"; + src = fetchFromGitHub { + owner = "ziontee113"; + repo = "syntax-tree-surfer"; + rev = "732ea6d0f868bcccd2f526be73afa46997d5a2fb"; + sha256 = "0x7kpmxq3n8531ca2bz506swww92wd3x16d125wrk54rxp1lv1cd"; + }; + meta.homepage = "https://github.com/ziontee113/syntax-tree-surfer/"; + }; + tabby-nvim = buildVimPlugin { pname = "tabby.nvim"; - version = "2024-06-10"; + version = "2024-09-16"; src = fetchFromGitHub { owner = "nanozuki"; repo = "tabby.nvim"; - rev = "229605a2ccf36798f77eb7d1b55b5905df487162"; - sha256 = "1pdzjxrd2938r2slb67dw1hrm23dsx9h8dvx288ian040prbpyf1"; + rev = "c58d9803f9526b0c8c8b7bfd43822764e33b30ba"; + sha256 = "1jx0z3hi9ic80l50a0qz8pffv258mdi6whlfy2x680qb5hm8p74h"; }; meta.homepage = "https://github.com/nanozuki/tabby.nvim/"; }; @@ -10558,12 +11403,12 @@ final: prev: tabout-nvim = buildVimPlugin { pname = "tabout.nvim"; - version = "2024-05-18"; + version = "2024-08-05"; src = fetchFromGitHub { owner = "abecodes"; repo = "tabout.nvim"; - rev = "3d7fbc7f5e91ef0f96b4d787c78ad9f8820de3ec"; - sha256 = "1v5bjy8d4y5yiyccijdqcsw61dvvbqdd7c54cvc5v0l5rlhbp20d"; + rev = "923aea2613c9e7abf81e099d46086f62c7e54896"; + sha256 = "0d6v5xqx3bck6h17cbnkllyyfflwjjz24vzcijjz6733igh48q22"; }; meta.homepage = "https://github.com/abecodes/tabout.nvim/"; }; @@ -10582,12 +11427,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 = "12437cd1b53488e24936ec4b091c9324cafee311"; + sha256 = "1cnh21yhcn2f4fajdr2b6hrclnhf1sz4abra4nw7b5yk1mvfjq5a"; }; meta.homepage = "https://github.com/godlygeek/tabular/"; }; @@ -10606,12 +11451,12 @@ final: prev: tagbar = buildVimPlugin { pname = "tagbar"; - version = "2024-06-06"; + version = "2024-08-05"; src = fetchFromGitHub { owner = "preservim"; repo = "tagbar"; - rev = "0815b5455c792a610d28ff3e7981642c9cf05d62"; - sha256 = "1vdj7ardgbmpj9qjfb5r2yp5avscny6v14p6552jphbyqkczd9pb"; + rev = "d55d454bd3d5b027ebf0e8c75b8f88e4eddad8d8"; + sha256 = "0yyscdzdh1mrgcr3w0727byqvvavd9r5a7728j717wvg139r0h9r"; }; meta.homepage = "https://github.com/preservim/tagbar/"; }; @@ -10628,6 +11473,18 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/taglist.vim/"; }; + tailwind-tools-nvim = buildVimPlugin { + pname = "tailwind-tools.nvim"; + version = "2024-09-23"; + src = fetchFromGitHub { + owner = "luckasRanarison"; + repo = "tailwind-tools.nvim"; + rev = "825ac68f3c3b364e30081089c6d78e8e51608a81"; + sha256 = "1gz7ch5ln8fc9axzjqvykwiqjif7c6srgqi68v7mvgjymp5qmyxx"; + }; + meta.homepage = "https://github.com/luckasRanarison/tailwind-tools.nvim/"; + }; + tailwindcss-colors-nvim = buildVimPlugin { pname = "tailwindcss-colors.nvim"; version = "2021-12-24"; @@ -10642,12 +11499,12 @@ final: prev: targets-vim = buildVimPlugin { pname = "targets.vim"; - version = "2023-02-22"; + version = "2024-07-10"; src = fetchFromGitHub { owner = "wellle"; repo = "targets.vim"; - rev = "642d3a4ce306264b05ea3219920b13ea80931767"; - sha256 = "0mwi2m75j8cxwa0nx53ivg53vc67v2ncq8gx86s8bvwyfl4249q7"; + rev = "6325416da8f89992b005db3e4517aaef0242602e"; + sha256 = "0kk80245vx544ydhdxlpaji2rj3b3q1574p9b7ywmw7bkzhcn5sf"; }; meta.homepage = "https://github.com/wellle/targets.vim/"; }; @@ -10678,12 +11535,12 @@ final: prev: telekasten-nvim = buildVimPlugin { pname = "telekasten.nvim"; - version = "2024-04-22"; + version = "2024-09-18"; src = fetchFromGitHub { owner = "nvim-telekasten"; repo = "telekasten.nvim"; - rev = "319276a7853ff996b7bb1ed4250d8047c84ad29d"; - sha256 = "05b8a9h8ni5pmj0x9r3pc8j4h77nbj2s6wmlx20w4h2vmwwp7k26"; + rev = "ae6473da3d7ee7ca5cd7df413d3934169a857a75"; + sha256 = "1sqgzhhqwvl6549rv97r2r75bw4k010jrwjj2d3p6ajk803m8yrg"; fetchSubmodules = true; }; meta.homepage = "https://github.com/nvim-telekasten/telekasten.nvim/"; @@ -10715,12 +11572,12 @@ final: prev: telescope-coc-nvim = buildVimPlugin { pname = "telescope-coc.nvim"; - version = "2024-05-18"; + version = "2024-07-31"; src = fetchFromGitHub { owner = "fannheyward"; repo = "telescope-coc.nvim"; - rev = "0819a790dc95336ce2a954513434a76bb76c41c7"; - sha256 = "06njpa3i8wp73snjgih04ba6mny2m7inkfivl9pic1izcp4r61a6"; + rev = "b305a2c4f5de45f93b94e1a72078edd6d62e8cc1"; + sha256 = "0q8h2njyh3fgasvxdhz40cmjns4n8ip3xgdl188kpaf6gk0vwnnv"; }; meta.homepage = "https://github.com/fannheyward/telescope-coc.nvim/"; }; @@ -10739,36 +11596,36 @@ final: prev: telescope-file-browser-nvim = buildVimPlugin { pname = "telescope-file-browser.nvim"; - version = "2024-06-09"; + version = "2024-09-21"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-file-browser.nvim"; - rev = "a7ab9a957b17199183388c6f357d614fcaa508e5"; - sha256 = "0g3wh4bspjwmzrd0gl5wwkm6lscbaih8jqzhxzlnbbxk8aky75fr"; + rev = "3b8a1e17187cfeedb31decbd625da62398a8ff34"; + sha256 = "1vll5da8k1a0wqs44f7kcn6i0iwrzisiyja2z44x48b3maqkr2p3"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-file-browser.nvim/"; }; telescope-frecency-nvim = buildVimPlugin { pname = "telescope-frecency.nvim"; - version = "2024-06-19"; + version = "2024-09-08"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-frecency.nvim"; - rev = "78570e237c8b2494dd74ffe196fbd01d0c9e5460"; - sha256 = "1vsfsi39i8f8x6cbsrq491s54p1gh8fh3a0vjgik7x07a9i21l6h"; + rev = "f67baca08423a6fd00167801a54db38e0b878063"; + sha256 = "197ijmyjqb27hfrxsa53x265qgfpka8997m1ndlql1wxgyz8as0g"; }; 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/"; }; @@ -10812,12 +11669,12 @@ final: prev: telescope-live-grep-args-nvim = buildVimPlugin { pname = "telescope-live-grep-args.nvim"; - version = "2024-06-09"; + version = "2024-07-28"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-live-grep-args.nvim"; - rev = "8ad632f793fd437865f99af5684f78300dac93fb"; - sha256 = "17spr5qii62g49w5ha9awyya8iqdj6gpv3bbs76pykg0rnyz4mix"; + rev = "649b662a8f476fd2c0289570764459e95ebaa3f3"; + sha256 = "1zg6iyk2n883rpk3v5g8vi5izg89hxrjwlnjfkkk6hkxbggd551a"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-live-grep-args.nvim/"; }; @@ -10836,12 +11693,12 @@ final: prev: telescope-manix = buildNeovimPlugin { pname = "telescope-manix"; - version = "2024-06-03"; + version = "2024-09-23"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "telescope-manix"; - rev = "da337930d3998fad976331155e789f8785543e68"; - sha256 = "0fhic35pnalxnlqnmq4xs4k4gcp7cs8j724chd0i3pvmbixk8b8y"; + rev = "f7aa1a18b1cb448d6607d81603172cd62e0e0e8e"; + sha256 = "0hi0rw1a0f7lk20v2i8rvdsbr8q3jy7nxghxjg0bm9hakd4y6dmd"; }; meta.homepage = "https://github.com/MrcJkb/telescope-manix/"; }; @@ -10860,12 +11717,12 @@ final: prev: telescope-project-nvim = buildVimPlugin { pname = "telescope-project.nvim"; - version = "2023-12-01"; + version = "2024-09-09"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-project.nvim"; - rev = "1aaf16580a614601a7f7077d9639aeb457dc5559"; - sha256 = "1g03lnl79245d0vn7ydda4aixd2qbv9kcxc584msk7jwbc58r2xn"; + rev = "796200876bb0fe8157b8eb1ce03d927d3827a052"; + sha256 = "1ib4i83x24xg1jmxbzk0h6d24if3pa75zhmz2qhvvm6kjfdxrvy0"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-project.nvim/"; }; @@ -10932,12 +11789,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 +11825,12 @@ final: prev: telescope-zf-native-nvim = buildVimPlugin { pname = "telescope-zf-native.nvim"; - version = "2024-05-08"; + version = "2024-09-15"; src = fetchFromGitHub { owner = "natecraddock"; repo = "telescope-zf-native.nvim"; - rev = "242ee15047e3400351982ef162301a898ec5cdda"; - sha256 = "1kdjqi046nr052q9m50814k2df0nnmylgk8lcragc2z8sdnj5f73"; + rev = "5721be27df11a19b9cd95e6a4887f16f26599802"; + sha256 = "1h4id0qb3b764y528hgf6a0mr9wm9vnl1yhw8kn8dc8qmg65wap5"; fetchSubmodules = true; }; meta.homepage = "https://github.com/natecraddock/telescope-zf-native.nvim/"; @@ -10981,24 +11838,24 @@ final: prev: telescope-zoxide = buildVimPlugin { pname = "telescope-zoxide"; - version = "2023-02-08"; + version = "2024-08-28"; src = fetchFromGitHub { owner = "jvgrootveld"; repo = "telescope-zoxide"; - rev = "68966349aa1b8e9ade403e18479ecf79447389a7"; - sha256 = "1ryc14kggh1qa6qcv5d0zfsxpfzf6jypf4c842cj5c9dm5385jqn"; + rev = "54bfe630bad08dc9891ec78c7cf8db38dd725c97"; + sha256 = "06rgpid2z8hwxmpwly9sz4p0g200fnf32sa3mdvh2060hq0g4rrc"; }; meta.homepage = "https://github.com/jvgrootveld/telescope-zoxide/"; }; telescope-nvim = buildNeovimPlugin { pname = "telescope.nvim"; - version = "2024-06-15"; + version = "2024-09-23"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "c392f1b78eaaf870ca584bd698e78076ed301b26"; - sha256 = "14k0z9k0d8krs50filg8d38fkcpxv4gy9lilgfj2wrvssd6c9vqy"; + rev = "b324469959908c1c7434eb65d80e87895e6828f7"; + sha256 = "1080z16b50xisq0zinbhnds43ch03bh5qljc1d7lhacryfwl1q4g"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -11015,6 +11872,18 @@ final: prev: meta.homepage = "https://github.com/luc-tielen/telescope_hoogle/"; }; + templ-vim = buildVimPlugin { + pname = "templ.vim"; + version = "2023-10-30"; + src = fetchFromGitHub { + owner = "joerdav"; + repo = "templ.vim"; + rev = "5cc48b93a4538adca0003c4bc27af844bb16ba24"; + sha256 = "12w1cplgz5f02c61v42acgsf11078xcwp46j2b3lzmq9hj57rmb1"; + }; + meta.homepage = "https://github.com/joerdav/templ.vim/"; + }; + template-string-nvim = buildVimPlugin { pname = "template-string.nvim"; version = "2023-12-26"; @@ -11029,36 +11898,36 @@ final: prev: tender-vim = buildVimPlugin { pname = "tender.vim"; - version = "2024-04-21"; + version = "2024-09-06"; src = fetchFromGitHub { owner = "jacoborus"; repo = "tender.vim"; - rev = "f361e9d907d2e5df703ee995f9032021ef674f2f"; - sha256 = "0fx7cc3xh5bpd1c6jlgp4qxlh6bfzgja7mf9mp84lhd6gj9mfqy6"; + rev = "a5b769250d5c62b6a794d5cd397998699278be57"; + sha256 = "1nkkqk8xm20alv60z7gl68j2qh3s4xmwfc7j074kv8yy9rpvk810"; }; meta.homepage = "https://github.com/jacoborus/tender.vim/"; }; 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/"; }; terminus = buildVimPlugin { pname = "terminus"; - version = "2023-10-08"; + version = "2024-07-30"; src = fetchFromGitHub { owner = "wincent"; repo = "terminus"; - rev = "51350e786d4bfcfc476abb015a3f90db3f81231f"; - sha256 = "0lvz87y22dc4jd6982r0k2d0bgyfwwjmcrcim78vvy6ymi58gmgw"; + rev = "47247474350e3c2cae12220ef06bed975b7be2dc"; + sha256 = "0bhjzvszzcn1whwxxzrc0fhxnbh06ah1v5wjmxkxy679vvgs68vr"; }; meta.homepage = "https://github.com/wincent/terminus/"; }; @@ -11113,16 +11982,28 @@ final: prev: text-case-nvim = buildVimPlugin { pname = "text-case.nvim"; - version = "2024-02-23"; + version = "2024-08-02"; src = fetchFromGitHub { owner = "johmsalas"; repo = "text-case.nvim"; - rev = "d62c63a4e9a996c7321885937ab89920fca2c1c8"; - sha256 = "027cgrh0xwnfgakzibzxj3wh8n8q0x5yqjsvhjgcg53pq0yfdss4"; + rev = "e898cfd46fa6cde0e83abb624a16e67d2ffc6457"; + sha256 = "0njcxdyn9x73s4axq01mrxi297xn1qldvnaws6wrbx1j4dyjx0yq"; }; meta.homepage = "https://github.com/johmsalas/text-case.nvim/"; }; + themed-tabs-nvim = buildVimPlugin { + pname = "themed-tabs.nvim"; + version = "2024-09-01"; + src = fetchFromGitHub { + owner = "vhsconnect"; + repo = "themed-tabs.nvim"; + rev = "90a967a4537bb4d13fd6fd33eb14b3cb3a8a1c4f"; + sha256 = "03bzrdyli84aa2qnj7a5haglq1vbvlpxz6scd0zjqwr1wlj8qgl3"; + }; + meta.homepage = "https://github.com/vhsconnect/themed-tabs.nvim/"; + }; + thesaurus_query-vim = buildVimPlugin { pname = "thesaurus_query.vim"; version = "2022-12-11"; @@ -11171,6 +12052,18 @@ final: prev: meta.homepage = "https://github.com/levouh/tint.nvim/"; }; + tiny-inline-diagnostic-nvim = buildVimPlugin { + pname = "tiny-inline-diagnostic.nvim"; + version = "2024-09-17"; + src = fetchFromGitHub { + owner = "rachartier"; + repo = "tiny-inline-diagnostic.nvim"; + rev = "1a83e7ce5c9d0ae4d89fc5c812b55ff8ed1d39e7"; + sha256 = "1bjf996ria9sghf51wmck7gn2x57vdabrzradpjn94x78iai85rl"; + }; + meta.homepage = "https://github.com/rachartier/tiny-inline-diagnostic.nvim/"; + }; + tlib_vim = buildVimPlugin { pname = "tlib_vim"; version = "2022-07-22"; @@ -11197,12 +12090,12 @@ final: prev: tmux-nvim = buildVimPlugin { pname = "tmux.nvim"; - version = "2024-06-17"; + version = "2024-07-30"; src = fetchFromGitHub { owner = "aserowy"; repo = "tmux.nvim"; - rev = "da618e075f42793400c3ee1e59ef3ebada2cb23c"; - sha256 = "00jbds0fg8aqdfq2swjlch22x6j2ispmj5q11jqgp0h99xdxmvr1"; + rev = "65ee9d6e6308afcd7d602e1320f727c5be63a947"; + sha256 = "063bcqwxlk18ygmr34jqnl0f0yhwy2zjkj4z8x7nl8bc07x2vnln"; }; meta.homepage = "https://github.com/aserowy/tmux.nvim/"; }; @@ -11221,12 +12114,12 @@ final: prev: todo-comments-nvim = buildVimPlugin { pname = "todo-comments.nvim"; - version = "2024-06-12"; + version = "2024-09-16"; src = fetchFromGitHub { owner = "folke"; repo = "todo-comments.nvim"; - rev = "51e10f838e84b4756c16311d0b1ef0972c6482d2"; - sha256 = "06kbz52ddr0nkvzm92c71wghm1kngwa3bnn329k6wl13qy2j7i09"; + rev = "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0"; + sha256 = "0v6vn3f9svj756ds8cp0skpw65xixlx1f3aj0fh374wdpb5i4zhh"; }; meta.homepage = "https://github.com/folke/todo-comments.nvim/"; }; @@ -11246,24 +12139,24 @@ final: prev: toggleterm-nvim = buildVimPlugin { pname = "toggleterm.nvim"; - version = "2024-05-19"; + version = "2024-08-08"; src = fetchFromGitHub { owner = "akinsho"; repo = "toggleterm.nvim"; - rev = "fee58a0473fd92b28c34f8f724e4918b15ba30a3"; - sha256 = "1iavy1182n0fwiv6rr6i9lb2kyqbw1fg49fy782nsbmkr25b7kc7"; + rev = "137d06fb103952a0fb567882bb8527e2f92d327d"; + sha256 = "1bmmz7ypzs4yfsky0z8d9pda8r3imlxf2f0k8n3fw327f7kc8lan"; }; meta.homepage = "https://github.com/akinsho/toggleterm.nvim/"; }; tokyonight-nvim = buildVimPlugin { pname = "tokyonight.nvim"; - version = "2024-06-13"; + version = "2024-09-16"; src = fetchFromGitHub { owner = "folke"; repo = "tokyonight.nvim"; - rev = "81c867c5f638597a82c82094dcb90ed42444dabc"; - sha256 = "0bq6yjzv7sza4f2mp5x7bv19pg0mj5j6xh3crz4q20l16f2i3hag"; + rev = "817bb6ffff1b9ce72cdd45d9fcfa8c9cd1ad3839"; + sha256 = "0xvdhq7400rh1450ybvw6pg4kdqfrs6k3408ibb9asw2l6mv6j3p"; }; meta.homepage = "https://github.com/folke/tokyonight.nvim/"; }; @@ -11294,24 +12187,24 @@ final: prev: transparent-nvim = buildVimPlugin { pname = "transparent.nvim"; - version = "2023-11-12"; + version = "2024-08-25"; src = fetchFromGitHub { owner = "xiyaowong"; repo = "transparent.nvim"; - rev = "fd35a46f4b7c1b244249266bdcb2da3814f01724"; - sha256 = "sha256-wT+7rmp08r0XYGp+MhjJX8dsFTar8+nf10CV9OdkOSk="; + rev = "8a2749a2fa74f97fe6557f61b89ac7fd873f3c21"; + sha256 = "14d9jy9lzybr49i287n9ijcphrppb3l0kgixdpd5r7daqn0qncza"; }; meta.homepage = "https://github.com/xiyaowong/transparent.nvim/"; }; treesj = buildVimPlugin { pname = "treesj"; - version = "2024-05-28"; + version = "2024-08-05"; src = fetchFromGitHub { owner = "Wansmer"; repo = "treesj"; - rev = "f98deb33805485b56a8d44d1a27d16874af00d7f"; - sha256 = "0w20crwgnf2l8hl71hq1drif2czc2yhbac2m50lgrf6nk8s7x4i9"; + rev = "0d81326b5afd36babe7dd480aabbb0b05f33e688"; + sha256 = "0r2njhwbvia4rw919ncblyf9rgq3n1mqlsyl76jqjwiw6bccvzmr"; }; meta.homepage = "https://github.com/Wansmer/treesj/"; }; @@ -11342,12 +12235,12 @@ final: prev: triptych-nvim = buildVimPlugin { pname = "triptych.nvim"; - version = "2024-06-02"; + version = "2024-09-21"; src = fetchFromGitHub { owner = "simonmclean"; repo = "triptych.nvim"; - rev = "d7ced78687c2ab203743edf0725761f6664f66cb"; - sha256 = "0ciz9j262z7ijarpyg1yxb3vcqvm8fhar6245fj7wliirnrs7jaz"; + rev = "cb87a21eeee10aea5fec12e8b8fec3f80b4b8164"; + sha256 = "197xj8i9l66zackvrgmx2cvrzycz4v19ifvsd6jmc7acmbjba4qi"; fetchSubmodules = true; }; meta.homepage = "https://github.com/simonmclean/triptych.nvim/"; @@ -11355,12 +12248,12 @@ final: prev: trouble-nvim = buildVimPlugin { pname = "trouble.nvim"; - version = "2024-06-14"; + version = "2024-07-22"; src = fetchFromGitHub { owner = "folke"; repo = "trouble.nvim"; - rev = "58a3acfc6d8d819324dab4c87068596319032e64"; - sha256 = "0vs7s7byz80mdww86icvgk7ksvbbgm67afiw8vn19ghf2hr78s8r"; + rev = "6efc446226679fda0547c0fd6a7892fd5f5b15d8"; + sha256 = "0s0b462qzhsamnhvxnzm9lj1fxp0q28w94aa34hf9ayarn4fpgvm"; }; meta.homepage = "https://github.com/folke/trouble.nvim/"; }; @@ -11391,12 +12284,12 @@ final: prev: ts-comments-nvim = buildVimPlugin { pname = "ts-comments.nvim"; - version = "2024-06-10"; + version = "2024-07-24"; src = fetchFromGitHub { owner = "folke"; repo = "ts-comments.nvim"; - rev = "c075b4ee00f6e111b44bf99a8cfd5a4cfce9258a"; - sha256 = "1w1lgd0hpslxa47iyqmfdri2agsra5sq1b7qwzpry5nidm2w81yi"; + rev = "98d7d4dec0af1312d38e288f800bbf6ff562b6ab"; + sha256 = "12g6rwrj67wk4fxxl31rsras5jw6a73xngrazlw095xhz6sd9l71"; }; meta.homepage = "https://github.com/folke/ts-comments.nvim/"; }; @@ -11413,6 +12306,18 @@ final: prev: meta.homepage = "https://github.com/jgdavey/tslime.vim/"; }; + tssorter-nvim = buildVimPlugin { + pname = "tssorter.nvim"; + version = "2024-08-16"; + src = fetchFromGitHub { + owner = "mtrajano"; + repo = "tssorter.nvim"; + rev = "74fa4102cb3272dcc8fd5696fd3240358f19c090"; + sha256 = "1y64w5aggh0k5xf0y8xsjbkzinn8gx2qhhqlww89k43dblq07pa4"; + }; + meta.homepage = "https://github.com/mtrajano/tssorter.nvim/"; + }; + tsuquyomi = buildVimPlugin { pname = "tsuquyomi"; version = "2023-10-03"; @@ -11427,24 +12332,24 @@ final: prev: twilight-nvim = buildVimPlugin { pname = "twilight.nvim"; - version = "2023-09-25"; + version = "2024-07-22"; src = fetchFromGitHub { owner = "folke"; repo = "twilight.nvim"; - rev = "8b7b50c0cb2dc781b2f4262a5ddd57571556d1e4"; - sha256 = "0j3vvj1hdsxj36pi4fnfcnj34hk26igicnvzk6xch4rwjlakqlaq"; + rev = "1584c0b0a979b71fd86b18d302ba84e9aba85b1b"; + sha256 = "16j4psdap33dlamnjn8895bqn92rlbzm1c9gpv3yihqh15546bxh"; }; meta.homepage = "https://github.com/folke/twilight.nvim/"; }; typescript-tools-nvim = buildVimPlugin { pname = "typescript-tools.nvim"; - version = "2024-06-18"; + version = "2024-07-18"; src = fetchFromGitHub { owner = "pmizio"; repo = "typescript-tools.nvim"; - rev = "3f942ec187523d1d82f813106ceea9be9dac5287"; - sha256 = "0yr8vmfq6rm7xd39jig1k6fjqhzb7pi0x9iy9mv5vvixj4drz21i"; + rev = "f8c2e0b36b651c85f52ad5c5373ff8b07adc15a7"; + sha256 = "1ha0mmzqhmhrs2y0llrqfnsq46p9xrdn9cx7an1mimnz4xwgyqgi"; }; meta.homepage = "https://github.com/pmizio/typescript-tools.nvim/"; }; @@ -11475,24 +12380,24 @@ 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/"; }; ultimate-autopair-nvim = buildVimPlugin { pname = "ultimate-autopair.nvim"; - version = "2024-06-10"; + version = "2024-09-13"; src = fetchFromGitHub { owner = "altermo"; repo = "ultimate-autopair.nvim"; - rev = "035d92eab05ac1390afef7204e3fcad9a50fa443"; - sha256 = "086lmfrllhnlx5c6ksi0lx287zfi86vlazy69sqb0876d0lfn2gs"; + rev = "ff21db642847840db183b9421ab3d89795a7fbba"; + sha256 = "0rkxfmacwwpzifpnqfbizla425b7gfay0jfgw84bfidspvc33vab"; }; meta.homepage = "https://github.com/altermo/ultimate-autopair.nvim/"; }; @@ -11511,36 +12416,36 @@ final: prev: undotree = buildVimPlugin { pname = "undotree"; - version = "2024-04-16"; + version = "2024-09-19"; src = fetchFromGitHub { owner = "mbbill"; repo = "undotree"; - rev = "56c684a805fe948936cda0d1b19505b84ad7e065"; - sha256 = "1yy7y344b906z04rrnvy2hkrgsrxjm6ij399qmfw8b20rxdyi2jh"; + rev = "78b5241191852ffa9bb5da5ff2ee033160798c3b"; + sha256 = "1w4sdbcvlicb3n4dpzv8l9g41xl3pqslni227lf88b4p5pjsfkax"; }; meta.homepage = "https://github.com/mbbill/undotree/"; }; unicode-vim = buildVimPlugin { pname = "unicode.vim"; - version = "2023-09-20"; + version = "2024-07-23"; src = fetchFromGitHub { owner = "chrisbra"; repo = "unicode.vim"; - rev = "bc20d0fb3331a7b41708388c56bb8221c2104da7"; - sha256 = "1nrx791gj66sky9bb039n7hwkvcic7wr1nrrb1vrx1sgqmwfpy6f"; + rev = "9da92ffe08b90200dcb499fdfecb234326f5514c"; + sha256 = "0bnnhbf006jwzzn9j08swgn16sd8qh669kzm7272mywl60s0q3hx"; }; meta.homepage = "https://github.com/chrisbra/unicode.vim/"; }; unison = buildVimPlugin { pname = "unison"; - version = "2024-06-18"; + version = "2024-09-23"; src = fetchFromGitHub { owner = "unisonweb"; repo = "unison"; - rev = "e354912fe85c39ae0b148562ddf31aa622e24638"; - sha256 = "1k17nkcdx5xlsw2r6izsyh1fjjfa9mj1v77yd00wznibczd9jnkq"; + rev = "c057942cf752b33f9945b2c42554b20d0cf2743c"; + sha256 = "0drlwml87hl8wxsqxv8inwy7q4v2xy2r1w22189k2sipb7kmlbb4"; }; meta.homepage = "https://github.com/unisonweb/unison/"; }; @@ -11557,6 +12462,18 @@ final: prev: meta.homepage = "https://github.com/Shougo/unite.vim/"; }; + url-open = buildVimPlugin { + pname = "url-open"; + version = "2024-02-03"; + src = fetchFromGitHub { + owner = "sontungexpt"; + repo = "url-open"; + rev = "9f8f4a56ac709f26aa17d8ef921b272bf2262a30"; + sha256 = "0caphlqkvz8labx54ap7nasvyx5kgsnp49zw98cvrd43hn60mrsa"; + }; + meta.homepage = "https://github.com/sontungexpt/url-open/"; + }; + urlview-nvim = buildVimPlugin { pname = "urlview.nvim"; version = "2024-06-04"; @@ -11631,48 +12548,48 @@ final: prev: vifm-vim = buildVimPlugin { pname = "vifm.vim"; - version = "2024-05-04"; + version = "2024-09-11"; src = fetchFromGitHub { owner = "vifm"; repo = "vifm.vim"; - rev = "41b6887ff6589228c7d4f213259d8e274b0f9ced"; - sha256 = "01whpq420w2ki00wpiz1dwbddxwzyq485rrw8mxbbsxsgq8plzfw"; + rev = "b1fe33e532aa360203e8015a557ba79dd38e07e4"; + sha256 = "0gwcn7r43143k95k5gzni6g9gj20kf5k4yy0gax8kdmdfc6660k1"; }; meta.homepage = "https://github.com/vifm/vifm.vim/"; }; vim-CtrlXA = buildVimPlugin { pname = "vim-CtrlXA"; - version = "2024-06-07"; + version = "2024-07-21"; src = fetchFromGitHub { owner = "Konfekt"; repo = "vim-CtrlXA"; - rev = "afab3d2479bcf97f4c4cadf72db7e28a4db56873"; - sha256 = "1bfwggqm33a9jg8q2yzljjcjypgwpwkf3v0ip96m7q4hg65wvbma"; + rev = "084d00284f532eab511a771f21a184d2024a9e46"; + sha256 = "197a13nnvq4w81l0c2bimfgwxdxxsqjzghmh901z1665y919fc5m"; }; meta.homepage = "https://github.com/Konfekt/vim-CtrlXA/"; }; vim-DetectSpellLang = buildVimPlugin { pname = "vim-DetectSpellLang"; - version = "2024-06-15"; + version = "2024-07-09"; src = fetchFromGitHub { owner = "konfekt"; repo = "vim-DetectSpellLang"; - rev = "c5ae86e2b010fc4e89d16ae0512b5f01a38dfb3c"; - sha256 = "1m0r0vazqrfg0ap4q4iirgf8j75d4hrn9xa3v75kq5ab0agcihgr"; + rev = "ba8fa4202ccdcfc89362bca37a3dcec2a84395b7"; + sha256 = "09929sx48nm2xc31wnih4hp5g9gm4gl92x8vkbzg6501yz3ajvmg"; }; meta.homepage = "https://github.com/konfekt/vim-DetectSpellLang/"; }; vim-LanguageTool = buildVimPlugin { pname = "vim-LanguageTool"; - version = "2021-02-08"; + version = "2024-09-08"; src = fetchFromGitHub { owner = "dpelle"; repo = "vim-LanguageTool"; - rev = "0372ffae78aa3eac3bfa48ba3bf2f4015a86385a"; - sha256 = "00476l49lczj1rw5gb6vs7s9r0zi1khw0g1v6bsfwl5r32699l7r"; + rev = "a1034c0d904217d4dd14479fee69dba09e77ef19"; + sha256 = "0ckin319m93v9mj4l63jhmk7gm3ssy7yk8dh595kagnc0ylj8jjr"; }; meta.homepage = "https://github.com/dpelle/vim-LanguageTool/"; }; @@ -11811,36 +12728,36 @@ final: prev: vim-addon-local-vimrc = buildVimPlugin { pname = "vim-addon-local-vimrc"; - version = "2024-01-22"; + version = "2024-07-14"; src = fetchFromGitHub { owner = "MarcWeber"; repo = "vim-addon-local-vimrc"; - rev = "5a3b61df34734127d9a1518879ecc06e550547db"; - sha256 = "13ysvhjafx7b5dz8fw672sssf69ayzwbkwpd22sj3rykwbyv3gh4"; + rev = "5430ada07e199aba932f9eab68399e624512596f"; + sha256 = "16mfr4y4swmyhh3jp7g15bbrv6ns7wlagk3lgsfv9x7la9vh9fkb"; }; meta.homepage = "https://github.com/MarcWeber/vim-addon-local-vimrc/"; }; vim-addon-manager = buildVimPlugin { pname = "vim-addon-manager"; - version = "2023-11-01"; + version = "2024-08-29"; src = fetchFromGitHub { owner = "MarcWeber"; repo = "vim-addon-manager"; - rev = "6b194728345dcd3e5eae9ee1f30e03c09c254d7f"; - sha256 = "11z1654h1pgndrykwjzll0f95pk9sx5cqad5dqpmfx66msxm9pff"; + rev = "585197500a4920c031467196e41335ca997aca6d"; + sha256 = "1g5la0qhimh8aqdnwgrr6hlvcjx8wy06hmvwydfidp0dn4ngh2mg"; }; meta.homepage = "https://github.com/MarcWeber/vim-addon-manager/"; }; vim-addon-mru = buildVimPlugin { pname = "vim-addon-mru"; - version = "2013-08-08"; + version = "2024-08-15"; src = fetchFromGitHub { owner = "MarcWeber"; repo = "vim-addon-mru"; - rev = "e41e39bd9d1bf78ccfd8d5e1bc05ae5e1026c2bb"; - sha256 = "0q6rxr9nrp63kidr3m3c2z5sda4g813pzshg0scxkjr8dxwhzdqm"; + rev = "d7e4fe31a882e4ad48b599b51f6a9cf671f77a05"; + sha256 = "17k943dw9rp8wdn3m6zp9zlq7l2l7kn6508xcx4bd3rr1wnddrij"; }; meta.homepage = "https://github.com/MarcWeber/vim-addon-mru/"; }; @@ -11931,12 +12848,12 @@ final: prev: vim-addon-toggle-buffer = buildVimPlugin { pname = "vim-addon-toggle-buffer"; - version = "2012-01-13"; + version = "2024-08-08"; src = fetchFromGitHub { owner = "MarcWeber"; repo = "vim-addon-toggle-buffer"; - rev = "a1b38b9c5709cba666ed2d84ef06548f675c6b0b"; - sha256 = "1xq38kfdm36c34ln66znw841q797w5gm8bpq1x64bsf2h6n3ml03"; + rev = "0cfeea3dbbfe181c16ddc51d91c79d28920789ae"; + sha256 = "04wpbkmd0pdmpwdm5fihs4l3ig0q7rj8fa8zn34a0h5168mf1w6x"; }; meta.homepage = "https://github.com/MarcWeber/vim-addon-toggle-buffer/"; }; @@ -11979,12 +12896,12 @@ final: prev: vim-airline = buildVimPlugin { pname = "vim-airline"; - version = "2024-06-16"; + version = "2024-09-10"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "02894b6ef4752afd8579fc837aec5fb4f62409f7"; - sha256 = "07jxqibg8zdir3w5lq2ibjvf6zw9b9386y9pwybgzg91c9pvd9xk"; + rev = "81eca994860645acbb58442285cdd70df5c71d2b"; + sha256 = "1q2wgavd2ff3iqkq8khzp1h5r651vjz5z90xlz7fyl10lmfm4j10"; }; meta.homepage = "https://github.com/vim-airline/vim-airline/"; }; @@ -12027,12 +12944,12 @@ final: prev: vim-android = buildVimPlugin { pname = "vim-android"; - version = "2023-09-30"; + version = "2024-09-05"; src = fetchFromGitHub { owner = "hsanson"; repo = "vim-android"; - rev = "26990f9fa27b23ca5faf83e14d56711c0fec40ea"; - sha256 = "1iy9ap2i9lmqcjaqb38syb240m834ifacv79cjiwzxcpr23vq4r1"; + rev = "62192c9079b942aa3c9f6d34a1bc312bf54d0301"; + sha256 = "0d1miihh7f7kghp88a8q38b19hfhlnwg821rd6yc2w7yvkzfh7bx"; }; meta.homepage = "https://github.com/hsanson/vim-android/"; }; @@ -12483,12 +13400,12 @@ final: prev: vim-codefmt = buildVimPlugin { pname = "vim-codefmt"; - version = "2024-01-13"; + version = "2024-08-31"; src = fetchFromGitHub { owner = "google"; repo = "vim-codefmt"; - rev = "6fa1616adebeffe26fadf5a1a61996ccdcbe46a1"; - sha256 = "0qjy8jr5d6kx880nj3vh5p769c2v729dy19pnw0dn57qzwvi142d"; + rev = "ff464a478202df40ae484e6e94a1d56587fcc69e"; + sha256 = "05hkn0vkaybrv6pz6xgvbyvzcc9hl0mpykfv32jamgwkdrfm9in1"; }; meta.homepage = "https://github.com/google/vim-codefmt/"; }; @@ -12699,24 +13616,24 @@ final: prev: vim-dadbod-completion = buildVimPlugin { pname = "vim-dadbod-completion"; - version = "2024-05-15"; + version = "2024-08-15"; src = fetchFromGitHub { owner = "kristijanhusak"; repo = "vim-dadbod-completion"; - rev = "5d5ad196fcde223509d7dabbade0148f7884c5e3"; - sha256 = "146zgn6cgzk1m9r09v3sdk3vzaan80jwq1zf0fskxk1c33jg1zpm"; + rev = "880f7e9f2959e567c718d52550f9fae1aa07aa81"; + sha256 = "046nia4fkgjyip2i5q6dz3023znn3avc7n04hy8zji0jr29brj4i"; }; meta.homepage = "https://github.com/kristijanhusak/vim-dadbod-completion/"; }; vim-dadbod-ui = buildVimPlugin { pname = "vim-dadbod-ui"; - version = "2024-05-27"; + version = "2024-09-23"; src = fetchFromGitHub { owner = "kristijanhusak"; repo = "vim-dadbod-ui"; - rev = "0dc68d9225a70d42f8645049482e090c1a8dce25"; - sha256 = "1wmx9wrcffik5b73q9g9gdhm4h84h62s5acwz9rxzwf24amdg1y3"; + rev = "f29c85ab42861c6ef683289b0c6a51e0d436dcf6"; + sha256 = "04k271jzbgfxfr3c88fgkpfrgwaxqzdy45yw9sximwpgbayky1ls"; }; meta.homepage = "https://github.com/kristijanhusak/vim-dadbod-ui/"; }; @@ -12795,12 +13712,12 @@ final: prev: vim-dirvish = buildVimPlugin { pname = "vim-dirvish"; - version = "2024-04-03"; + version = "2024-09-02"; src = fetchFromGitHub { owner = "justinmk"; repo = "vim-dirvish"; - rev = "3851bedb7f191b9a4a5531000b6fc0a8795cc9bb"; - sha256 = "1b5fg5d1rvnh9ipl4q1sh4xwgkn55hip303mm13h3ckmcy1cyilk"; + rev = "2ddd8ee63d6066ae910b29285d9786cbd0226657"; + sha256 = "0vjnr6rq27g9aamqdvyg4yszbs0jr4zlp3lvb0n109nbdma680rb"; }; meta.homepage = "https://github.com/justinmk/vim-dirvish/"; }; @@ -12819,12 +13736,12 @@ final: prev: vim-dispatch = buildVimPlugin { pname = "vim-dispatch"; - version = "2024-02-18"; + version = "2024-09-02"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-dispatch"; - rev = "4c695bc052cad2ae6b980aebbe48d046466e27ae"; - sha256 = "13c63n7gylny2s84k05cpl4cjn070d3qk6yagxny23yanz29hc15"; + rev = "a2ff28abdb2d89725192db5b8562977d392a4d3f"; + sha256 = "07z8vvsydl6p5ss6ipg2g0igihn92x4jyjmmb43z1d6vimra7pgv"; }; meta.homepage = "https://github.com/tpope/vim-dispatch/"; }; @@ -12939,12 +13856,12 @@ final: prev: vim-elixir = buildVimPlugin { pname = "vim-elixir"; - version = "2022-06-25"; + version = "2024-09-13"; src = fetchFromGitHub { owner = "elixir-editors"; repo = "vim-elixir"; - rev = "6dd03f87d825bf0a9f8611eb54076c7952d4f15c"; - sha256 = "0car62bg681al01bsf7k783m2927shdl5xjl2jlwry54l44b8hry"; + rev = "39cfaec9ea71c22a82c459ecd64860c8850f1215"; + sha256 = "12j1gqkm3dhcfx1axi8cl2zzj20z9a3xf5ggyqlr41f1bzpmprdh"; }; meta.homepage = "https://github.com/elixir-editors/vim-elixir/"; }; @@ -12961,6 +13878,18 @@ final: prev: meta.homepage = "https://github.com/andys8/vim-elm-syntax/"; }; + vim-emacs-bindings = buildVimPlugin { + pname = "vim-emacs-bindings"; + version = "2016-10-07"; + src = fetchFromGitHub { + owner = "kentarosasaki"; + repo = "vim-emacs-bindings"; + rev = "a8037ef1b0cc0eca9aca15d4e2cab6d462aa57ee"; + sha256 = "18bhcvs5vnrr394waz9mg2fdnrycsc2ng589s2jw892pap9zxq36"; + }; + meta.homepage = "https://github.com/kentarosasaki/vim-emacs-bindings/"; + }; + vim-emoji = buildVimPlugin { pname = "vim-emoji"; version = "2018-01-30"; @@ -13107,12 +14036,12 @@ final: prev: vim-fetch = buildVimPlugin { pname = "vim-fetch"; - version = "2023-05-29"; + version = "2024-07-26"; src = fetchFromGitHub { owner = "wsdjeg"; repo = "vim-fetch"; - rev = "bbb75c3172f766d1a62832df0ec7674c69a560ad"; - sha256 = "1mcn4a7n1318sgi3dd062sh1sy2b8sa4inwklcz2gh095lr9i323"; + rev = "db3fd95eb0cf7e7e9effa1338b286db33e4a36c1"; + sha256 = "1br13ih1ybx5dnj8aax6lf0s970vy43s9swwrxqn411ihcrclqz6"; }; meta.homepage = "https://github.com/wsdjeg/vim-fetch/"; }; @@ -13131,12 +14060,12 @@ final: prev: vim-fireplace = buildVimPlugin { pname = "vim-fireplace"; - version = "2023-03-26"; + version = "2024-07-07"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fireplace"; - rev = "f2be859ea48a761fd25a07efa037514f84abdf30"; - sha256 = "16rl00c3w7gsjqdk7irgd6cfvf75ws2ni4cnnr8c1bbadxiy1a34"; + rev = "fa1201dd55802e442e17e0fbd164cf546246dad1"; + sha256 = "1a9v6jmxbgxbmd4q4yf11mgdcvv1z83f0nf5zydqi310waw884fy"; }; meta.homepage = "https://github.com/tpope/vim-fireplace/"; }; @@ -13203,12 +14132,12 @@ final: prev: vim-flog = buildVimPlugin { pname = "vim-flog"; - version = "2024-06-13"; + version = "2024-09-23"; src = fetchFromGitHub { owner = "rbong"; repo = "vim-flog"; - rev = "255631abf7ea132393fc7dd745d6911c37ac6a4c"; - sha256 = "0k92fs7wq1yhbwgf29awv70k06nb36x375b4rjwc4sf559i223mc"; + rev = "bcc9b23cd7f20fb232664a8fed83bf17865d0a39"; + sha256 = "1dmcaa9zylmv3abwcdrpzflp89bhm76s4wrf8d7jswabf7vyd2jz"; }; meta.homepage = "https://github.com/rbong/vim-flog/"; }; @@ -13225,18 +14154,6 @@ final: prev: meta.homepage = "https://github.com/thosakwe/vim-flutter/"; }; - vim-fsharp = buildVimPlugin { - pname = "vim-fsharp"; - version = "2018-11-13"; - src = fetchFromGitHub { - owner = "fsharp"; - repo = "zarchive-vim-fsharp"; - rev = "012d98c981139976551a4d9779f5cce7f8d84d5c"; - sha256 = "0ds300kjhm352ni3fwivsrnc9ls021d2x29f4cdszillamcgs7pw"; - }; - meta.homepage = "https://github.com/fsharp/zarchive-vim-fsharp/"; - }; - vim-ft-diff_fold = buildVimPlugin { pname = "vim-ft-diff_fold"; version = "2013-02-10"; @@ -13263,12 +14180,12 @@ final: prev: vim-fugitive = buildVimPlugin { pname = "vim-fugitive"; - version = "2024-06-12"; + version = "2024-09-07"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "64d6cafb9dcbacce18c26d7daf617ebb96b273f3"; - sha256 = "1ddab7xflb08gy168042k8w35z84hdvrbz5kx37v96skayq30rni"; + rev = "d4877e54cef67f5af4f950935b1ade19ed6b7370"; + sha256 = "17cf21k77fwsl67m4f1ln17dadz5i5g8fjhsw1cc1y1c3jn1xdh2"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -13321,6 +14238,18 @@ final: prev: meta.homepage = "https://github.com/raghur/vim-ghost/"; }; + vim-gina = buildVimPlugin { + pname = "vim-gina"; + version = "2022-03-30"; + src = fetchFromGitHub { + owner = "lambdalisue"; + repo = "vim-gina"; + rev = "ff6c2ddeca98f886b57fb42283c12e167d6ab575"; + sha256 = "09jlnpix2dy6kggiz96mrm5l1f9x1gl5afpdmfrxgkighn2rwpzq"; + }; + meta.homepage = "https://github.com/lambdalisue/vim-gina/"; + }; + vim-gist = buildVimPlugin { pname = "vim-gist"; version = "2022-10-09"; @@ -13347,12 +14276,12 @@ final: prev: vim-git = buildVimPlugin { pname = "vim-git"; - version = "2023-03-26"; + version = "2024-07-05"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-git"; - rev = "105fd5559bd9df3f1204ecdcac2a587614e1a4be"; - sha256 = "1bgczw9i0p76cabkdfb1x11kmq59qaih1nz3q9hmqjd3964x92q0"; + rev = "55583e3d109a87b7f55b76643cf33150b7767e23"; + sha256 = "1yk6a6wcqgkfrgi4lysjhj8vy22b342zzcvlsy8w72kgvy7mp66b"; }; meta.homepage = "https://github.com/tpope/vim-git/"; }; @@ -13371,12 +14300,12 @@ final: prev: vim-gitgutter = buildVimPlugin { pname = "vim-gitgutter"; - version = "2024-04-29"; + version = "2024-07-16"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-gitgutter"; - rev = "e801371917e52805a4ceb1e93f55ed1fba712f82"; - sha256 = "0aa3fphgl0c0y3lmivvfmvrqrs5iqn5dkvdv2jhl1q73y6pnhxiz"; + rev = "7b0b5098e3e57be86bb96cfbf2b8902381eef57c"; + sha256 = "07k4dmdkyqz530wqa371avrh6r41fny6l1v22jicalmq38n49axv"; }; meta.homepage = "https://github.com/airblade/vim-gitgutter/"; }; @@ -13419,24 +14348,24 @@ final: prev: vim-go = buildVimPlugin { pname = "vim-go"; - version = "2024-06-11"; + version = "2024-09-24"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "665ef24144b748b842a0a27c237e63f3447f901a"; - sha256 = "1yh9phdrax4b5v9bb37n8bzxbi6a8ca422c90f73r9cwgvfx4i2v"; + rev = "ac1fb9611de435d80a6badcf8482cb1428449b10"; + sha256 = "199zz6b4yj757hy7vygsy9mjws00j0k8vgcy90ndcrl774jpjqfh"; }; meta.homepage = "https://github.com/fatih/vim-go/"; }; vim-godot = buildVimPlugin { pname = "vim-godot"; - version = "2024-02-17"; + version = "2024-08-05"; src = fetchFromGitHub { owner = "habamax"; repo = "vim-godot"; - rev = "f9c0b36b299efcc4aa4cb119a2be36a83fe10388"; - sha256 = "sha256-HKp3CQwAOs+7TL8MjWZ2EHLHMZ3Ss7AckAZ5eOjTDEg="; + rev = "d21e110ee09b5030e55adda660a4ff58db40a329"; + sha256 = "0fx6j7q9cyspghpnv9iy4ba99pcyjkq23rbyrd95i5dxlhzgj5q3"; }; meta.homepage = "https://github.com/habamax/vim-godot/"; }; @@ -13455,12 +14384,12 @@ final: prev: vim-graphql = buildVimPlugin { pname = "vim-graphql"; - version = "2023-12-11"; + version = "2024-08-06"; src = fetchFromGitHub { owner = "jparise"; repo = "vim-graphql"; - rev = "c1d6af3b93ec135e7e2fc182d4cae6cd0d9e20b1"; - sha256 = "1fm5rvvp7kh1lqfz6g9s8vjgbrbjqrdwysr573ymxacavbx8iri2"; + rev = "9caa247f88991ebfa45df21cbe1c8bec50039f6b"; + sha256 = "0903may6c1yna3nqjib9x9zapd3qpq7p9inaxkb9173a5laksgfv"; }; meta.homepage = "https://github.com/jparise/vim-graphql/"; }; @@ -13479,12 +14408,12 @@ final: prev: vim-gruvbox8 = buildVimPlugin { pname = "vim-gruvbox8"; - version = "2024-01-24"; + version = "2024-09-23"; src = fetchFromGitHub { owner = "lifepillar"; repo = "vim-gruvbox8"; - rev = "d1cf31e5215ad6f5544d9e631383aef4b6c35cb7"; - sha256 = "1bih86rm14788b73dkpfzv2ahrca3vxahd5pc39lx122ma31l639"; + rev = "60bb03df34fd6f22aed9dcb71f5cb297b6cceb3f"; + sha256 = "0xbjs441xx9sjvqfbp7nrfiw8cqgsbccy3xgq1rklkvxib9gdbyp"; }; meta.homepage = "https://github.com/lifepillar/vim-gruvbox8/"; }; @@ -13513,6 +14442,18 @@ final: prev: meta.homepage = "https://github.com/ludovicchabant/vim-gutentags/"; }; + vim-habamax = buildVimPlugin { + pname = "vim-habamax"; + version = "2024-01-22"; + src = fetchFromGitHub { + owner = "habamax"; + repo = "vim-habamax"; + rev = "8b4e045b711c7e90235a601ba2a923cdfacb2f46"; + sha256 = "02973qssq450d4411zjscsjvwz4fc2lpqvimah06k87skp8inp47"; + }; + meta.homepage = "https://github.com/habamax/vim-habamax/"; + }; + vim-hardtime = buildVimPlugin { pname = "vim-hardtime"; version = "2022-05-06"; @@ -13684,12 +14625,12 @@ final: prev: vim-html-template-literals = buildVimPlugin { pname = "vim-html-template-literals"; - version = "2021-06-03"; + version = "2024-09-13"; src = fetchFromGitHub { owner = "jonsmithers"; repo = "vim-html-template-literals"; - rev = "e6f3f8ffaae9c2f9deea2bbb596b64468041616c"; - sha256 = "1lrkby9m60ccgm35y1z82llgzjd5vmdwfscy7byjd5ycnkhyangi"; + rev = "54edc719402c08b409d192e97f77325c418fb12e"; + sha256 = "11pfzsizvkzkhjivlfgjjzajyr4cb93wqrhh6862q50ib6kxkv05"; }; meta.homepage = "https://github.com/jonsmithers/vim-html-template-literals/"; }; @@ -13840,12 +14781,12 @@ final: prev: vim-jack-in = buildVimPlugin { pname = "vim-jack-in"; - version = "2023-04-17"; + version = "2024-08-25"; src = fetchFromGitHub { owner = "clojure-vim"; repo = "vim-jack-in"; - rev = "4cefab20f02c44249499f43200442a3176315acd"; - sha256 = "1jvqfqf11gv8ww5gh4xxxdrpflaw1pw8f10p1y8slc63var5i8vd"; + rev = "7fed7961a8b59265dc34c27c4cdbc410b3c25a73"; + sha256 = "09x7n0xc9bigyxj2rnalqqsg1ajkvlx9nk4gl3kdp9qpcksdbabz"; }; meta.homepage = "https://github.com/clojure-vim/vim-jack-in/"; }; @@ -13922,6 +14863,18 @@ final: prev: meta.homepage = "https://github.com/seirl/vim-jinja-languages/"; }; + vim-jjdescription = buildVimPlugin { + pname = "vim-jjdescription"; + version = "2024-05-28"; + src = fetchFromGitHub { + owner = "avm99963"; + repo = "vim-jjdescription"; + rev = "ca14325202f3cd894d01ba833451017624249222"; + sha256 = "1y83fdih991ivlvgcwp0sx97icmf9k6px7mr26vb77izjlf011w2"; + }; + meta.homepage = "https://github.com/avm99963/vim-jjdescription/"; + }; + vim-jsbeautify = buildVimPlugin { pname = "vim-jsbeautify"; version = "2020-12-11"; @@ -14021,12 +14974,12 @@ final: prev: vim-just = buildVimPlugin { pname = "vim-just"; - version = "2024-06-17"; + version = "2024-09-02"; src = fetchFromGitHub { owner = "NoahTheDuke"; repo = "vim-just"; - rev = "5ad2c6b625d40d929d58cddeca9c459d5f380755"; - sha256 = "0bmm3z4njnajv1qzqam9i9lfsaxfw8n792wzdyg7yklp534zaxxn"; + rev = "8ed1e472b72b739bd852d2b9a2d688b3da015cf5"; + sha256 = "0946xpb35vl38bvbzn6dbqy22819qw0d5z1q5xacqqyh8sp9hqb4"; }; meta.homepage = "https://github.com/NoahTheDuke/vim-just/"; }; @@ -14117,12 +15070,12 @@ final: prev: vim-ledger = buildVimPlugin { pname = "vim-ledger"; - version = "2024-05-07"; + version = "2024-07-15"; src = fetchFromGitHub { owner = "ledger"; repo = "vim-ledger"; - rev = "7b97c8765bf920e92fd950a7a5bc37cb2b13a494"; - sha256 = "0g66k9rrvdw0pkh7sqsdcms9viybqsibp1wpscync29ign7y12fa"; + rev = "dbc683e24bd5338b8c12540227a58b2d247e097a"; + sha256 = "1c77vi92w1psai6h1a49raa50k7d8ybrr4l9iznyb2c08srz8ryb"; }; meta.homepage = "https://github.com/ledger/vim-ledger/"; }; @@ -14189,12 +15142,12 @@ final: prev: vim-llvm = buildVimPlugin { pname = "vim-llvm"; - version = "2023-05-31"; + version = "2024-09-19"; src = fetchFromGitHub { owner = "rhysd"; repo = "vim-llvm"; - rev = "c5d6c6a9ef21df2a32aad0f3b5ca5389f92d06d1"; - sha256 = "1gnamw4whrvw3qbs8bkr45akzwkzinnkyhjpwgzza90w8a99nds6"; + rev = "7bb02ef3c6c41aa5510d4aa9817fd40936be8209"; + sha256 = "0z61dx7x2g1mw6rs7vix0wgwm1bf5nhgnfr25vkgwwjbjd3d5dkh"; }; meta.homepage = "https://github.com/rhysd/vim-llvm/"; }; @@ -14249,12 +15202,12 @@ final: prev: vim-lsp = buildVimPlugin { pname = "vim-lsp"; - version = "2024-02-25"; + version = "2024-09-22"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "vim-lsp"; - rev = "f7ccf006df1aefd327c0e2c55cc8632a2db577c1"; - sha256 = "11hnym6gzvss1pwjxqsbg4f1h56hsnaypl35bd084lxhim7fz6zl"; + rev = "04428c920002ac7cfacbecacb070a8af57b455d0"; + sha256 = "18naarfr01ljlkl37x3l5y2sd9j9xxdz1gkcvz7ylvspyxjmx7fa"; }; meta.homepage = "https://github.com/prabirshrestha/vim-lsp/"; }; @@ -14285,12 +15238,12 @@ final: prev: vim-lsp-settings = buildVimPlugin { pname = "vim-lsp-settings"; - version = "2024-06-13"; + version = "2024-09-23"; src = fetchFromGitHub { owner = "mattn"; repo = "vim-lsp-settings"; - rev = "3debb34bf6fac8e1cb195d9e89a23b7ea98bee47"; - sha256 = "0pdw13m2xn4fih0kk9acbhlgq660a7p6c7ppp4jb310jf0l3xg3i"; + rev = "6dfdac0e5676f403299f496c0e69515ee7576fe5"; + sha256 = "0vmv264vjccby0mnjas12bab18wa780n0mygk3cqmyx95qdybixb"; }; meta.homepage = "https://github.com/mattn/vim-lsp-settings/"; }; @@ -14369,12 +15322,12 @@ final: prev: vim-markdown = buildVimPlugin { pname = "vim-markdown"; - version = "2024-03-01"; + version = "2024-09-20"; src = fetchFromGitHub { owner = "preservim"; repo = "vim-markdown"; - rev = "a657e697376909c41475a686eeef7fc7a4972d94"; - sha256 = "11f26n433fvsih2b31b7ffanxfhgjnjvdkjvviav2ryc5dvidb3q"; + rev = "8f6cb3a6ca4e3b6bcda0730145a0b700f3481b51"; + sha256 = "14x6jfla4921jyx4xxqng9vzmb0iaj2nn7wckhmlx8jpks6r4834"; }; meta.homepage = "https://github.com/preservim/vim-markdown/"; }; @@ -14394,12 +15347,12 @@ final: prev: vim-markdown-toc = buildVimPlugin { pname = "vim-markdown-toc"; - version = "2024-04-12"; + version = "2024-09-01"; src = fetchFromGitHub { owner = "mzlogin"; repo = "vim-markdown-toc"; - rev = "05d6538ccef1d33f2d26f2515c0eacaa93d2e061"; - sha256 = "0x9vq6qi7m532la56i9pnp9l4q1s7iy1g7w36451w4c03lsw39is"; + rev = "aa9cc3b07791db5cbe5f29d661763bc0eb4fb7c1"; + sha256 = "1pssg8idbzqln68qbr9z1fkiw7z2a5jjvpvl3q73hycfw5z5xm0l"; }; meta.homepage = "https://github.com/mzlogin/vim-markdown-toc/"; }; @@ -14418,12 +15371,12 @@ final: prev: vim-matchup = buildVimPlugin { pname = "vim-matchup"; - version = "2024-05-29"; + version = "2024-09-12"; src = fetchFromGitHub { owner = "andymass"; repo = "vim-matchup"; - rev = "1535a769d5dca851fe7d41b0be95f7c7203a4bef"; - sha256 = "0vw4fwyzkhg0fqavp90mq5smh95qcksjbld7cfpyrzqcj678h3fk"; + rev = "1975afe63198ab6a0dff7200919828e5cd4330b9"; + sha256 = "05gwlf5fmkvs4p92n7l397brb8g6g62pvxcd93kffv289vmx7rzk"; }; meta.homepage = "https://github.com/andymass/vim-matchup/"; }; @@ -14502,12 +15455,12 @@ final: prev: vim-monokai = buildVimPlugin { pname = "vim-monokai"; - version = "2022-12-09"; + version = "2024-09-03"; src = fetchFromGitHub { owner = "crusoexia"; repo = "vim-monokai"; - rev = "6b6c2b698e94d0af8d8f2307be01571ab8b7b74f"; - sha256 = "1pa1fylfzammcy7xvl2wlgg2qw8yzrzr7yf0vdalqfmxkakma1z8"; + rev = "73bf1188cd80aa049b5daab1ee26b33ecd26f604"; + sha256 = "10p5pa1yd3r9ffzvp3viigdh3zyafagwz29043r2w036krdsn5lc"; }; meta.homepage = "https://github.com/crusoexia/vim-monokai/"; }; @@ -14526,12 +15479,12 @@ final: prev: vim-monokai-tasty = buildVimPlugin { pname = "vim-monokai-tasty"; - version = "2024-05-23"; + version = "2024-07-17"; src = fetchFromGitHub { owner = "patstockwell"; repo = "vim-monokai-tasty"; - rev = "539c1784bf8e6ace2656885336eeb0fa47cf918a"; - sha256 = "0v355n4x4maf8ln8rbc8fnwlssdrn7a36d8jzpb4sn67brn3xqx6"; + rev = "c585c4ff0744315c6c03fd54afa7c8ca23b039c0"; + sha256 = "0cc1c8qqf76w77va0j1lhlvv0kfiaz5b5jri5sy6rcbpjinfg0kk"; }; meta.homepage = "https://github.com/patstockwell/vim-monokai-tasty/"; }; @@ -14910,12 +15863,12 @@ final: prev: vim-pandoc = buildVimPlugin { pname = "vim-pandoc"; - version = "2023-12-18"; + version = "2024-07-22"; src = fetchFromGitHub { owner = "vim-pandoc"; repo = "vim-pandoc"; - rev = "fae27ec62606b6b914de5270985a69d1b5da1287"; - sha256 = "139lg369mrh0zkk3bh1fgp2iz54m8fjp7rgyy3j25ivylna5lzn8"; + rev = "bd11902651edc18076f90ed291581d785be52311"; + sha256 = "0aj0gsn2q5dqx9faky7fpqz93h6yih46dn7mn9gm80sdlv575gix"; }; meta.homepage = "https://github.com/vim-pandoc/vim-pandoc/"; }; @@ -15016,6 +15969,18 @@ final: prev: meta.homepage = "https://github.com/preservim/vim-pencil/"; }; + vim-pets = buildVimPlugin { + pname = "vim-pets"; + version = "2024-09-23"; + src = fetchFromGitHub { + owner = "MeF0504"; + repo = "vim-pets"; + rev = "bc97ede44da9ce6551bbd57146ba4f98e5421b8b"; + sha256 = "1gcz58mrglxrd4cd1k1mr4xhys5l8qs4wg7a66q7m50j5rzz5nyc"; + }; + meta.homepage = "https://github.com/MeF0504/vim-pets/"; + }; + vim-phabricator = buildVimPlugin { pname = "vim-phabricator"; version = "2021-11-06"; @@ -15042,12 +16007,12 @@ final: prev: vim-plug = buildVimPlugin { pname = "vim-plug"; - version = "2024-06-19"; + version = "2024-07-09"; src = fetchFromGitHub { owner = "junegunn"; repo = "vim-plug"; - rev = "d863d0783236e1a46291f7791347740891186154"; - sha256 = "0h8np5gfqa1r2089sxmrpfg5rfggsms3d688c2d7fb9vsba8ghhi"; + rev = "d80f495fabff8446972b8695ba251ca636a047b0"; + sha256 = "01mlw9nl3yb4s90xd197is7wjagizjz2gm4531bfn03k49idkhkp"; }; meta.homepage = "https://github.com/junegunn/vim-plug/"; }; @@ -15150,12 +16115,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/"; }; @@ -15210,12 +16175,12 @@ final: prev: vim-puppet = buildVimPlugin { pname = "vim-puppet"; - version = "2022-05-21"; + version = "2024-09-15"; src = fetchFromGitHub { owner = "rodjek"; repo = "vim-puppet"; - rev = "81943d532dee24f8518f855dfb17160809abfdfb"; - sha256 = "0h2gxif4zmba7728p1w2yh1zakfj7phjnzaca5sv16aw9cihzq5g"; + rev = "10bf0b27c5be81ee26c3a0d32e39b270f95329ce"; + sha256 = "0a6gvzz27f2121hdnzszcs6haw8pysp1k1wzq3ygjq0nzrddnlk1"; }; meta.homepage = "https://github.com/rodjek/vim-puppet/"; }; @@ -15270,12 +16235,12 @@ final: prev: vim-quickrun = buildVimPlugin { pname = "vim-quickrun"; - version = "2024-06-02"; + version = "2024-07-12"; src = fetchFromGitHub { owner = "thinca"; repo = "vim-quickrun"; - rev = "c6c50a9926ca18605ae2472a343b8212f3a2af29"; - sha256 = "0zl3fh0b1s5p330p1fyz1mkwc3mag651a11mh1sa3gif1bxvg3sy"; + rev = "77b4d6ea9972a206f02c736882c2398c36d2983c"; + sha256 = "1dfpkvfzagv21ykbxgi6lzwlm34va3xas5wximqqlfifrnhkb08j"; }; meta.homepage = "https://github.com/thinca/vim-quickrun/"; }; @@ -15318,12 +16283,12 @@ final: prev: vim-rails = buildVimPlugin { pname = "vim-rails"; - version = "2024-04-12"; + version = "2024-09-08"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-rails"; - rev = "8972461e64c7c4bf049f2f86ea1bc571e8077b55"; - sha256 = "08lzlk2lhfcyp45sk90h3j6diwz78c8hx0dm1wb9fykmiiipsr0c"; + rev = "d3954dfe3946c9330dc91b4fbf79ccacb2c626c0"; + sha256 = "0b64a05vcw16amszl52whzm52wdclc42bg9wpaypd3j7fy97qxd7"; }; meta.homepage = "https://github.com/tpope/vim-rails/"; }; @@ -15342,12 +16307,12 @@ final: prev: vim-repeat = buildVimPlugin { pname = "vim-repeat"; - version = "2021-01-25"; + version = "2024-07-08"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-repeat"; - rev = "24afe922e6a05891756ecf331f39a1f6743d3d5a"; - sha256 = "0y18cy5wvkb4pv5qjsfndrpcvz0dg9v0r6ia8k9isp4agdmxkdzj"; + rev = "65846025c15494983dafe5e3b46c8f88ab2e9635"; + sha256 = "0n8sx6s2sbjb21dv9j6y5lyqda9vvxraffg2jz423daamn96dxqv"; }; meta.homepage = "https://github.com/tpope/vim-repeat/"; }; @@ -15366,12 +16331,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/"; }; @@ -15402,12 +16367,12 @@ final: prev: vim-salve = buildVimPlugin { pname = "vim-salve"; - version = "2022-04-15"; + version = "2024-07-07"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-salve"; - rev = "81f131b494cd7baa8e4e1f9242721e7107ea2f2b"; - sha256 = "0kl2nq1lqj2kgimz477xafnyh7z9fa44mwl2qajw5qchvx4f9h0a"; + rev = "92f6553654c3d2b6de0158fc4a59c4496dfc8105"; + sha256 = "0ixw0nrwqm2fjygx24jpn9lf5waw44alvzgz88vljd4wccpl4qp8"; }; meta.homepage = "https://github.com/tpope/vim-salve/"; }; @@ -15498,12 +16463,12 @@ final: prev: vim-sentence-chopper = buildVimPlugin { pname = "vim-sentence-chopper"; - version = "2024-03-08"; + version = "2024-07-23"; src = fetchFromGitHub { owner = "Konfekt"; repo = "vim-sentence-chopper"; - rev = "b1394d3dbc3675324b2735c12f0df99395d9d7ba"; - sha256 = "12llyn54qmbwzvn3m08r8k1fp6xwqp71sbbkp9j587kd4d6y5kps"; + rev = "0657aaa3f3b1acffde94f6eb6b08b106d8cf8162"; + sha256 = "1yk56gnljl7356m3vi6r0vvxzs0clpivdhs7kbc3x982jhm96vv2"; }; meta.homepage = "https://github.com/Konfekt/vim-sentence-chopper/"; }; @@ -15534,12 +16499,12 @@ final: prev: vim-shellcheck = buildVimPlugin { pname = "vim-shellcheck"; - version = "2024-06-04"; + version = "2024-09-12"; src = fetchFromGitHub { owner = "itspriddle"; repo = "vim-shellcheck"; - rev = "52aaa9c0d976756923ee8bd5f02f7d6a4a7f1bcc"; - sha256 = "1749wi96gj9qzkws3hs494mnmc9w99s8gcmi35qzwng77jp7jvqm"; + rev = "35bccea0c566f9f005679d02fed07e96092e100b"; + sha256 = "140r70q9dy7l2v7zxxrv45gswr5i3hbvbazaz2cgmj2g3if4d91h"; }; meta.homepage = "https://github.com/itspriddle/vim-shellcheck/"; }; @@ -15606,24 +16571,24 @@ final: prev: vim-sleuth = buildVimPlugin { pname = "vim-sleuth"; - version = "2023-01-10"; + version = "2024-09-19"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-sleuth"; - rev = "1cc4557420f215d02c4d2645a748a816c220e99b"; - sha256 = "0l8mw3r6lb6q1p3afvf5psp6cg8vdi84b5j8whmdm83f4mynsn8a"; + rev = "be69bff86754b1aa5adcbb527d7fcd1635a84080"; + sha256 = "0wqxdjgplf04nq428ialw1w03f8nh5vb629a17vl5gc9gf3zfanq"; }; meta.homepage = "https://github.com/tpope/vim-sleuth/"; }; vim-slime = buildVimPlugin { pname = "vim-slime"; - version = "2024-05-22"; + version = "2024-08-23"; src = fetchFromGitHub { owner = "jpalardy"; repo = "vim-slime"; - rev = "ca59df2570e1a12f9ddfa90b6118df4d87453fcd"; - sha256 = "06c2j7a97al2pyj2immjba3h7bv0ldlw7dly3halikxn01qdznr9"; + rev = "f6bbbeb8f18393f2177cdcef764f3e0e1d7e9328"; + sha256 = "186j2f4il5ayz3ff9d5ay94ff0kjmj03dzwsp3rj4v6wgacc1q46"; }; meta.homepage = "https://github.com/jpalardy/vim-slime/"; }; @@ -15714,36 +16679,36 @@ final: prev: vim-snipmate = buildVimPlugin { pname = "vim-snipmate"; - version = "2024-06-16"; + version = "2024-07-28"; src = fetchFromGitHub { owner = "garbas"; repo = "vim-snipmate"; - rev = "673e686c46149d947283620847ea64deb2a0be6c"; - sha256 = "08j897l9gpna5x969mgc137vy8ajdq7i8mvz2xwiaf5x13b8db4c"; + rev = "7d20a1e9faa9cdbffab67b4ab0fede3d4e4ceb97"; + sha256 = "1bf767vdv0xb8vz70sh9rwq49zs5gp9lnhbkm5l2zqyz3f3vg5a0"; }; meta.homepage = "https://github.com/garbas/vim-snipmate/"; }; vim-snippets = buildVimPlugin { pname = "vim-snippets"; - version = "2024-06-10"; + version = "2024-08-13"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "96d79529edc3dee1ccf2ce7b75a88cb546ec2501"; - sha256 = "0b23p9yqbix0b2vxsh9g9la369540b1281x4qb7ysddivmf2jp5p"; + rev = "f0a3184d9f90b96b044d5914625a25c554d7f301"; + sha256 = "19n9p1fzx0vb1l09gff50p8vzhp4bank9m8smrq1ngw1innrd9wc"; }; meta.homepage = "https://github.com/honza/vim-snippets/"; }; 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/"; }; @@ -15774,24 +16739,24 @@ final: prev: vim-speeddating = buildVimPlugin { pname = "vim-speeddating"; - version = "2022-10-10"; + version = "2024-08-14"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-speeddating"; - rev = "5a36fd29df63ea3f65562bd2bb837be48a5ec90b"; - sha256 = "0zwhynknkcf9zpsl7ddsrihh351fy9k75ylfrzzl222i88g17d14"; + rev = "c17eb01ebf5aaf766c53bab1f6592710e5ffb796"; + sha256 = "1pibhqvd5wicw20vxsrqzirmi0y8rzsgfzn4cmws1nvjf72gkh10"; }; meta.homepage = "https://github.com/tpope/vim-speeddating/"; }; vim-spirv = buildVimPlugin { pname = "vim-spirv"; - version = "2024-06-19"; + version = "2024-09-10"; src = fetchFromGitHub { owner = "kbenzie"; repo = "vim-spirv"; - rev = "64b8125fdca0e67cfe7c415f133809a4d23eb8b5"; - sha256 = "01r9wz4sc7qlaibi2hhrymcgzrfjchif3cn9w1q71prbvchjhpnm"; + rev = "57fc84b3631d034dc209c7ce75236586847cbaf3"; + sha256 = "0xsjmz2gjaxnbshjl06146lhrcdbj1qnf4nzyzrxa1qrkk6cfvs5"; }; meta.homepage = "https://github.com/kbenzie/vim-spirv/"; }; @@ -16027,12 +16992,12 @@ final: prev: vim-test = buildVimPlugin { pname = "vim-test"; - version = "2024-06-15"; + version = "2024-09-16"; src = fetchFromGitHub { owner = "vim-test"; repo = "vim-test"; - rev = "79c14672b0bfec6f92c626dc331326fdbed62b4f"; - sha256 = "0vbfnqggh2lwcpfx110phlasmdqq66fdjcgvanydj1vqpvfn8fsa"; + rev = "c090bfd93919888bb0b86e1ab707bc6a3095097f"; + sha256 = "1qkgzazxj6f94ivnrd3cjlvfa2pn4hsbkf6v64fanck4m68x1jpb"; }; meta.homepage = "https://github.com/vim-test/vim-test/"; }; @@ -16111,12 +17076,12 @@ final: prev: vim-textobj-variable-segment = buildVimPlugin { pname = "vim-textobj-variable-segment"; - version = "2022-07-16"; + version = "2024-09-06"; src = fetchFromGitHub { owner = "Julian"; repo = "vim-textobj-variable-segment"; - rev = "51c323dca5c44f7a8e5a689b9156ef818d02188e"; - sha256 = "1fvy3il883b7czwsai1pq80hslra23c7ff23ydhvzxgfip9qrkxc"; + rev = "12e07590db6c90586ae5b750d6123c0779f6b35b"; + sha256 = "0p8jaxd4vz5vzv9008cdhhmbb1hn5b382axnrazxixwalhd7pk23"; }; meta.homepage = "https://github.com/Julian/vim-textobj-variable-segment/"; }; @@ -16171,12 +17136,12 @@ final: prev: vim-tmux-navigator = buildVimPlugin { pname = "vim-tmux-navigator"; - version = "2024-05-26"; + version = "2024-09-14"; src = fetchFromGitHub { owner = "christoomey"; repo = "vim-tmux-navigator"; - rev = "5b3c701686fb4e6629c100ed32e827edf8dad01e"; - sha256 = "0kcrz2hlv672v0967n7zz1f5xl8vh41nmps0pvms9bplw1p5nzx3"; + rev = "a9b52e7d36114d40350099f254b5f299a35df978"; + sha256 = "0sfsyf2jk57511pba6g31zfp0qi6v02np78sq6pzgny8qv40rj11"; }; meta.homepage = "https://github.com/christoomey/vim-tmux-navigator/"; }; @@ -16207,12 +17172,12 @@ final: prev: vim-tpipeline = buildVimPlugin { pname = "vim-tpipeline"; - version = "2024-06-13"; + version = "2024-09-11"; src = fetchFromGitHub { owner = "vimpostor"; repo = "vim-tpipeline"; - rev = "f59f144b73e79aae7a73bb86bf527e79ad86de8f"; - sha256 = "0h16bs65ic5iwry8mq22v4xkn1wc2a6xin0vqn5qnlg38q7fgpn1"; + rev = "72a624f97730059bab359cb0b58a23433bfec308"; + sha256 = "1sz3mqsji14yrrrkvnx00dgaf908zkwq9m2myb5jk2gyj3z1dgib"; }; meta.homepage = "https://github.com/vimpostor/vim-tpipeline/"; }; @@ -16351,12 +17316,12 @@ final: prev: vim-visual-multi = buildVimPlugin { pname = "vim-visual-multi"; - version = "2024-04-26"; + version = "2024-09-01"; src = fetchFromGitHub { owner = "mg979"; repo = "vim-visual-multi"; - rev = "b84a6d42c1c10678928b0bf8327f378c8bc8af5a"; - sha256 = "1sj8nfn2yd1bsfqqf9kqpivxhfjcq1zq111ls9m6xh98ccxwcj7d"; + rev = "a6975e7c1ee157615bbc80fc25e4392f71c344d4"; + sha256 = "15jrxvaip6mncl8b8q8c1i82m20m1mld11gv75x9hqng3y85cc1b"; }; meta.homepage = "https://github.com/mg979/vim-visual-multi/"; }; @@ -16447,12 +17412,12 @@ final: prev: vim-wakatime = buildVimPlugin { pname = "vim-wakatime"; - version = "2024-04-29"; + version = "2024-09-17"; src = fetchFromGitHub { owner = "wakatime"; repo = "vim-wakatime"; - rev = "3cb40867cb5a3120f9bef76eff88edc7f1dc1a23"; - sha256 = "0cikyb55z31jnh3zvm3xf8skfqdvdg3ihhb1z8xc1cxhx9gyc4hz"; + rev = "f699e30ca1ba0c7f316847316fd0ba19d3ee51c1"; + sha256 = "0v21r1yj6s28vhqym200n33qgdrjwxjrpzjzkax81cbmmp6a6fbc"; }; meta.homepage = "https://github.com/wakatime/vim-wakatime/"; }; @@ -16543,12 +17508,12 @@ final: prev: vim-xkbswitch = buildVimPlugin { pname = "vim-xkbswitch"; - version = "2024-06-19"; + version = "2024-09-17"; src = fetchFromGitHub { owner = "lyokha"; repo = "vim-xkbswitch"; - rev = "bcd79dd6a1b74efe1a16c70fe6a06bfc6a99e543"; - sha256 = "1ym08zy9lbqakflbif48kvgirfd4fajpaynmx8wgp6q2xhks6xvd"; + rev = "39914ff3aa3a5678285ba4b740524351d9f5ae18"; + sha256 = "1v4q17wp2bifiz7pp379nizvskfy2fk87hhc4qd9fib81fvshf80"; }; meta.homepage = "https://github.com/lyokha/vim-xkbswitch/"; }; @@ -16591,16 +17556,28 @@ final: prev: vim-zettel = buildVimPlugin { pname = "vim-zettel"; - version = "2024-05-03"; + version = "2024-09-16"; src = fetchFromGitHub { owner = "michal-h21"; repo = "vim-zettel"; - rev = "96d3400598a95957062e42820cdeaa6ab22cba72"; - sha256 = "1q6wy7mzi4lqjy37l4rbnjbvy7a0cmm2cccd07ywfd2cx31m26w0"; + rev = "207290f8c60ca4f31e52f53e221e1e50aee7e5d7"; + sha256 = "15y6jjmmvrkqdrc1fa0p5nzi89hw8252gf3cywd3pa0d1a8lspi0"; }; meta.homepage = "https://github.com/michal-h21/vim-zettel/"; }; + vim-zscript = buildVimPlugin { + pname = "vim-zscript"; + version = "2023-10-02"; + src = fetchFromGitHub { + owner = "marrub--"; + repo = "vim-zscript"; + rev = "8c9352effb0847f838dbe32dc946ab38937b3d26"; + sha256 = "1q619ial566gbf93d8v13njkhqx6blmcp402cpa3may4npf3qric"; + }; + meta.homepage = "https://github.com/marrub--/vim-zscript/"; + }; + vim2hs = buildVimPlugin { pname = "vim2hs"; version = "2014-04-16"; @@ -16651,12 +17628,12 @@ final: prev: vimade = buildVimPlugin { pname = "vimade"; - version = "2023-12-12"; + version = "2024-09-23"; src = fetchFromGitHub { owner = "TaDaa"; repo = "vimade"; - rev = "31dd31c96fc03fb158e1f40f72f3661ef5a9152d"; - sha256 = "0wph29fkp5hcziy3ym9854dds9lrm0g7w4b98bx1ks05lgx6wxzq"; + rev = "f188cd7c069f41cdd9455fb24a3c34f7cd90d35e"; + sha256 = "1flgy85q6bfkd1cpzanclbkk4h30j5cxrhfskdwdj6ynqxnvxfpc"; }; meta.homepage = "https://github.com/TaDaa/vimade/"; }; @@ -16723,12 +17700,12 @@ final: prev: vimproc-vim = buildVimPlugin { pname = "vimproc.vim"; - version = "2023-01-05"; + version = "2024-09-04"; src = fetchFromGitHub { owner = "Shougo"; repo = "vimproc.vim"; - rev = "bf06f3f9bb1b60542fccde1ed7499798d1154db6"; - sha256 = "1nd6wrwwgz499inl42gih99da0nbpgwak6mswavs3ra906d3nsy3"; + rev = "63a4ce0768c7af434ac53d37bdc1e7ff7fd2bece"; + sha256 = "06ylhf544861far7sfkyngsn6hsnfp24ha2xhzqsh0q8qww9z3wk"; }; meta.homepage = "https://github.com/Shougo/vimproc.vim/"; }; @@ -16759,12 +17736,12 @@ final: prev: vimspector = buildVimPlugin { pname = "vimspector"; - version = "2024-06-09"; + version = "2024-08-17"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "ee3bd0120525978521168eda1c3a64ef24e3cb86"; - sha256 = "0g2zxgafxr90cmc8anvr0d5wkvzbpba8b6jblsdnq93648p38qx8"; + rev = "af13695a11816c73b92d76fd8721296907224f1d"; + sha256 = "01xcv73jxsjbjwba2cc6l7b9av26rzrg89l1n611r7ycf41zb5g0"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; @@ -16772,36 +17749,36 @@ final: prev: vimtex = buildVimPlugin { pname = "vimtex"; - version = "2024-06-13"; + version = "2024-09-23"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "8ed94566e6fe3f5b163131dc374d224d2d320db7"; - sha256 = "13na944xyy8cj6pck6af4p9hhrr3811pa43zmmj42bxrf5kpbqds"; + rev = "b9cc11536a4e726c58c4776e9bcecff26fc454cb"; + sha256 = "17fl1gyax3ia0jk15n0c5863njcprg3zjicw87kb95vkx0gy5wzw"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; vimux = buildVimPlugin { pname = "vimux"; - version = "2024-06-03"; + version = "2024-09-19"; src = fetchFromGitHub { owner = "preservim"; repo = "vimux"; - rev = "fa35410805b82ffabc29e3cb5cdf3ad0b8dc402d"; - sha256 = "0i47x15nzvy6xdgx8kfdbm000c33svanglnn77ilxrv19kjy6j3v"; + rev = "64df7ce47f16adaa5bc15d07f2d99197524961a9"; + sha256 = "1iaq8cbjhlpm3smcs7zq26qwv6a3rkmys6dsggph219cqx0cklm3"; }; meta.homepage = "https://github.com/preservim/vimux/"; }; 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 +17845,12 @@ final: prev: vscode-nvim = buildVimPlugin { pname = "vscode.nvim"; - version = "2024-05-19"; + version = "2024-08-08"; src = fetchFromGitHub { owner = "Mofiqul"; repo = "vscode.nvim"; - rev = "ff3926901d4160886f707a8a70b5c2e82979a7c4"; - sha256 = "0x8930yals2cwbyw4vssfhb39pvrwpq90ysh1aczcyivrajm24ir"; + rev = "7de58b7a6d55fe48475d0ba2fddbcec871717761"; + sha256 = "0daq565dmy027qlzfqx08gr9zwjcp4n1cppjpz2ri4gxbjhvgak4"; }; meta.homepage = "https://github.com/Mofiqul/vscode.nvim/"; }; @@ -16916,24 +17893,24 @@ final: prev: which-key-nvim = buildVimPlugin { pname = "which-key.nvim"; - version = "2024-06-07"; + version = "2024-09-18"; src = fetchFromGitHub { owner = "folke"; repo = "which-key.nvim"; - rev = "0099511294f16b81c696004fa6a403b0ae61f7a0"; - sha256 = "1n6cs9590n9r24yxm4yf74bqmk1ky6hc7i9c8n7sc4icjkagkz65"; + rev = "fb070344402cfc662299d9914f5546d840a22126"; + sha256 = "0p66gn3cxmkx6ldp38gnwqnwy3d3qdhhl1gr1xaw8gliry0jwx9z"; }; meta.homepage = "https://github.com/folke/which-key.nvim/"; }; whitespace-nvim = buildVimPlugin { pname = "whitespace.nvim"; - version = "2024-02-13"; + version = "2024-08-18"; src = fetchFromGitHub { owner = "johnfrankmorgan"; repo = "whitespace.nvim"; - rev = "34d319e07f86a628deeb237133088f01f8432bc0"; - sha256 = "1gkxw6zhkgjvwg4jcpfiv2xkg7vk0q1prj4sh5swiznmyswsr0ay"; + rev = "f7d14be0f23a9c1e8021aca70d280aea26649b68"; + sha256 = "0c2im0qjzxw6mflc23w3m00qwnsbyqxlqllmia5d4akhzagjsdy4"; }; meta.homepage = "https://github.com/johnfrankmorgan/whitespace.nvim/"; }; @@ -16952,12 +17929,12 @@ final: prev: wiki-vim = buildVimPlugin { pname = "wiki.vim"; - version = "2024-06-17"; + version = "2024-09-16"; src = fetchFromGitHub { owner = "lervag"; repo = "wiki.vim"; - rev = "da5f1e0a5acd70d4e44c54b4d6286fd8f97742ab"; - sha256 = "0aiy18yw2kkj1xb7ixlw86xlxpn1v1pqa19d05kr4jnbabdajcr4"; + rev = "8188ff7b62b7695eae44257bd6202d8494fee655"; + sha256 = "0w7h0xdhdxn7lniyx4qrxhfnq892z4p4p2pf2jgbsnhzj3dhhv87"; }; meta.homepage = "https://github.com/lervag/wiki.vim/"; }; @@ -17060,12 +18037,12 @@ final: prev: wrapping-nvim = buildVimPlugin { pname = "wrapping.nvim"; - version = "2024-05-25"; + version = "2024-08-25"; src = fetchFromGitHub { owner = "andrewferrier"; repo = "wrapping.nvim"; - rev = "3a823200c297885b70515fa8d974e1763c578e26"; - sha256 = "1srk34zppj7lyw69yh5w7014s1mh5bdn7k74yacifwrwnwwdxj5n"; + rev = "a5210c29be19ed736eb3333677e08a57efebce78"; + sha256 = "02fvg2rrbklr3dns2x726icgv6ilmdwkz25q4nf9mnwr4bbrd212"; }; meta.homepage = "https://github.com/andrewferrier/wrapping.nvim/"; }; @@ -17084,12 +18061,12 @@ final: prev: wtf-nvim = buildVimPlugin { pname = "wtf.nvim"; - version = "2024-03-23"; + version = "2024-09-19"; src = fetchFromGitHub { owner = "piersolenski"; repo = "wtf.nvim"; - rev = "8e7bec4d3cb2ea2e3d078b9af8c4cc68d1066c33"; - sha256 = "1q0j06lkkg60f62bjqxq7x6a8wxgcqdh1ldi6rp5sg6rkad8kzd7"; + rev = "16eec1f32c3608bd8519e9e520041fe34201abb0"; + sha256 = "1clpik3z79mvxxph5z4ghiwrq560jy0zdr0yxmp9byl2r0ggfa64"; }; meta.homepage = "https://github.com/piersolenski/wtf.nvim/"; }; @@ -17132,17 +18109,29 @@ final: prev: yats-vim = buildVimPlugin { pname = "yats.vim"; - version = "2024-05-31"; + version = "2024-08-17"; src = fetchFromGitHub { owner = "HerringtonDarkholme"; repo = "yats.vim"; - rev = "9b16b86f7be4603b416ab18a9e57a34e86e7bec2"; - sha256 = "0j9am39pdgl1swbxax1kjn57fni0z41y8gdw8m8hmmmqam9va6dh"; + rev = "b325c449a2db4d9ee38aa441afa850a815982e8b"; + sha256 = "1czjq0zf00jhfrq182diy3z7vpsb2w16jwbijinb1dpjgq6klh0h"; fetchSubmodules = true; }; meta.homepage = "https://github.com/HerringtonDarkholme/yats.vim/"; }; + yazi-nvim = buildVimPlugin { + pname = "yazi.nvim"; + version = "2024-09-22"; + src = fetchFromGitHub { + owner = "mikavilpas"; + repo = "yazi.nvim"; + rev = "1f8bcc422956e347d2fe5e2f1e323d45130ae399"; + sha256 = "1xwl3k5l40z2wz6frgr4bg5pi1v0107nhljz6mwbldzxpfzjakyh"; + }; + meta.homepage = "https://github.com/mikavilpas/yazi.nvim/"; + }; + yescapsquit-vim = buildVimPlugin { pname = "yescapsquit.vim"; version = "2022-08-31"; @@ -17167,6 +18156,18 @@ final: prev: meta.homepage = "https://github.com/elkowar/yuck.vim/"; }; + zarchive-vim-fsharp = buildVimPlugin { + pname = "zarchive-vim-fsharp"; + version = "2018-11-13"; + src = fetchFromGitHub { + owner = "fsharp"; + repo = "zarchive-vim-fsharp"; + rev = "012d98c981139976551a4d9779f5cce7f8d84d5c"; + sha256 = "0ds300kjhm352ni3fwivsrnc9ls021d2x29f4cdszillamcgs7pw"; + }; + meta.homepage = "https://github.com/fsharp/zarchive-vim-fsharp/"; + }; + zeavim-vim = buildVimPlugin { pname = "zeavim.vim"; version = "2019-06-07"; @@ -17179,6 +18180,18 @@ final: prev: meta.homepage = "https://github.com/KabbAmine/zeavim.vim/"; }; + zellij-nav-nvim = buildVimPlugin { + pname = "zellij-nav.nvim"; + version = "2024-09-03"; + src = fetchFromGitHub { + owner = "swaits"; + repo = "zellij-nav.nvim"; + rev = "511e9b7bb7165ef817dbfb40169cea9b4d3c3d44"; + sha256 = "0cvdxzbz45ac46s1i811l67g1hg5wgsb8hy7rrzbw52mq8qbkliw"; + }; + meta.homepage = "https://github.com/swaits/zellij-nav.nvim/"; + }; + zellij-nvim = buildVimPlugin { pname = "zellij.nvim"; version = "2024-05-03"; @@ -17193,24 +18206,24 @@ final: prev: zen-mode-nvim = buildVimPlugin { pname = "zen-mode.nvim"; - version = "2024-01-21"; + version = "2024-07-22"; src = fetchFromGitHub { owner = "folke"; repo = "zen-mode.nvim"; - rev = "78557d972b4bfbb7488e17b5703d25164ae64e6a"; - sha256 = "0sa7fykwi2qzb14xc8jwf7y8pygh8v1lg531ykjln0y48nrc17qv"; + rev = "29b292bdc58b76a6c8f294c961a8bf92c5a6ebd6"; + sha256 = "0cbdj5wwx582yqlpjdfg1snxxx3z2wn6v2gzvyling5ma6faqwc8"; }; meta.homepage = "https://github.com/folke/zen-mode.nvim/"; }; zenbones-nvim = buildVimPlugin { pname = "zenbones.nvim"; - version = "2024-06-16"; + version = "2024-09-12"; src = fetchFromGitHub { owner = "zenbones-theme"; repo = "zenbones.nvim"; - rev = "e9ba8305f65524f9355515cdd8704b2c6ba2def6"; - sha256 = "0bmj5b4n0rj7i1nh9lccszqv3jbcdcjw5gi6v010d3cf312rkda6"; + rev = "12daea796d5079a65dd7032bb85540443e8b30e8"; + sha256 = "1a4b1zr3kpf1mcqq9zssa9hs75l5v8f4x18abh20q4v0x0ad59mi"; }; meta.homepage = "https://github.com/zenbones-theme/zenbones.nvim/"; }; @@ -17241,24 +18254,24 @@ final: prev: zig-vim = buildVimPlugin { pname = "zig.vim"; - version = "2023-10-10"; + version = "2024-08-28"; src = fetchFromGitHub { owner = "ziglang"; repo = "zig.vim"; - rev = "54c216e5306a5c3878a60596aacb94dca8652ab9"; - sha256 = "1nxwjyn3ps3c2abffai5cql3czl4kah4cin0g30damy1k99ypncb"; + rev = "15d6510b77a4efbb6ffcb151ed7e2ce4de4d06f6"; + sha256 = "1f45d75df822djcsyxmg3v4ddh78nc1ii8mcwrjcwjqxlh6vm16y"; }; meta.homepage = "https://github.com/ziglang/zig.vim/"; }; zk-nvim = buildVimPlugin { pname = "zk-nvim"; - version = "2024-06-03"; + version = "2024-09-18"; src = fetchFromGitHub { owner = "zk-org"; repo = "zk-nvim"; - rev = "1f331d994d90f1dc93d023508951be437d19813e"; - sha256 = "0zq18axf849vv90nc5x3g2mr2wc6wphgwj3a8mmkr8q1rk16c9k4"; + rev = "8942fcc7ba2477e3e0d8097c806eec41cd844fd1"; + sha256 = "14psk650j0n39n5dnz14idxkwywls5dspbaz0bpsvq5qzfdxm0bq"; }; meta.homepage = "https://github.com/zk-org/zk-nvim/"; }; @@ -17289,60 +18302,60 @@ final: prev: catppuccin-nvim = buildVimPlugin { pname = "catppuccin-nvim"; - version = "2024-06-14"; + version = "2024-09-15"; src = fetchFromGitHub { owner = "catppuccin"; repo = "nvim"; - rev = "c0bea773a09e49e123136b099bce9ddc1bf395d2"; - sha256 = "15ccqv7r382rk8l50ims0a9m5kn4kzgd3bar5427w12skayp0d09"; + rev = "63685e1562ef53873c9764b483d7ac5c7a608922"; + sha256 = "1b283i43p1i49mql84s6njfnf4mdf9csknp9hdkjjagwfi509wgm"; }; meta.homepage = "https://github.com/catppuccin/nvim/"; }; catppuccin-vim = buildVimPlugin { pname = "catppuccin-vim"; - version = "2024-05-28"; + version = "2024-08-14"; src = fetchFromGitHub { owner = "catppuccin"; repo = "vim"; - rev = "43771ad2a9ee18b276fb2c388906b904be361dde"; - sha256 = "0bj1g4lliayia561gfxv6hk12hig68fq3vwi5n3brxi0li7gjm40"; + rev = "060000804cf50315ac6dd986bc4d84fbc40cbc9c"; + sha256 = "1faxniddq6zcsb93bsm93lkf01mc4jfzxls5vyxmac6rc5v2k1n4"; }; meta.homepage = "https://github.com/catppuccin/vim/"; }; dracula-vim = buildVimPlugin { pname = "dracula-vim"; - version = "2024-06-13"; + version = "2024-07-26"; src = fetchFromGitHub { owner = "dracula"; repo = "vim"; - rev = "ada471d684d4acfe803c4e033d7c3ae5d7252db6"; - sha256 = "1w1bxg532l1khgb285xs4y6l40bj4dq0kdh6iwfihw6x0mqsrv1j"; + rev = "65f4225e0526516a67d56c8ac09925a209138e53"; + sha256 = "0jp54l8k40mij0mkavsxzv2kipvzzvy211d6hyvq6ry9liqkl7b8"; }; meta.homepage = "https://github.com/dracula/vim/"; }; embark-vim = buildVimPlugin { pname = "embark-vim"; - version = "2024-06-17"; + version = "2024-09-21"; src = fetchFromGitHub { owner = "embark-theme"; repo = "vim"; - rev = "2ab955cb0b5eaf0b00cc5064234064f02822f458"; - sha256 = "0ncr3kf7s0j2ghr0321vajsfphs4cp710xxrwdhphfxdpzxjlsbw"; + rev = "530e361aa81a8665c3a909a787b918aaf7d702e2"; + sha256 = "1fyjri2i8cg4kykx64xf4i6xwyfdgzhimmr2mpwhjwgkjh8mhlph"; }; meta.homepage = "https://github.com/embark-theme/vim/"; }; gbprod-nord = buildVimPlugin { pname = "gbprod-nord"; - version = "2024-05-21"; + version = "2024-09-19"; src = fetchFromGitHub { owner = "gbprod"; repo = "nord.nvim"; - rev = "c707723cf0c0f19a409a6190209d51d6ec057943"; - sha256 = "14d1l8a6g0fflkqs2ks2fgawxl1qqhx36izxvz5yacz1yqz63dnb"; + rev = "b3d53bffd87a9aef6ff7e3976f6953f615c0d357"; + sha256 = "0ifa0vmk14isn9bj73gfxqhr2wfg7d0kd0z0k2607z9p0lm2qimw"; }; meta.homepage = "https://github.com/gbprod/nord.nvim/"; }; @@ -17385,12 +18398,12 @@ final: prev: nightfly = buildVimPlugin { pname = "nightfly"; - version = "2024-06-19"; + version = "2024-09-22"; src = fetchFromGitHub { owner = "bluz71"; repo = "vim-nightfly-colors"; - rev = "b20ee4855bd3cb9fbe0615cf0e27bbb8b04df13e"; - sha256 = "1wcvnx0s328md2zil1gwxqsl19jin5vmpxvzajjx52yxsrgm0qrm"; + rev = "3c0e3176d19ccd6ec301a43d0ebfc618c82928a4"; + sha256 = "0rnh5qakjk0k73xfk10bmxalsc82s6qlw27la7kgrkja1zy6f8q9"; }; meta.homepage = "https://github.com/bluz71/vim-nightfly-colors/"; }; @@ -17409,12 +18422,12 @@ final: prev: nvchad-ui = buildVimPlugin { pname = "nvchad-ui"; - version = "2024-06-15"; + version = "2024-09-21"; src = fetchFromGitHub { owner = "nvchad"; repo = "ui"; - rev = "75a0044e5f4d164d93557fd49863e088f0ecf749"; - sha256 = "1md8gsibb1224df6qi2vnyxp5ja51vfppdziply33zdlh7qa6ycc"; + rev = "62f6ede07573a04e7c1a76ec48e7ce19b43d39f3"; + sha256 = "18zs0gv7cwyv9qsq9rr5k7arl8kim08m769lrriw5wb32199lrni"; }; meta.homepage = "https://github.com/nvchad/ui/"; }; @@ -17457,12 +18470,12 @@ final: prev: rose-pine = buildVimPlugin { pname = "rose-pine"; - version = "2024-06-09"; + version = "2024-08-25"; src = fetchFromGitHub { owner = "rose-pine"; repo = "neovim"; - rev = "8c4660cfe697621bcc61d37b3651ffed94fe7fed"; - sha256 = "1gdjd9a3y2kgsjg5ivxwmqymibgzhhj1h6lg7hq811jlip3p0p63"; + rev = "8b1fd252255a7f2c41b4192a787ab62660b29f72"; + sha256 = "0djiabbm8c9kxwaz2awb5a9a20qiy5xap9r9prwiak4apk96v299"; }; meta.homepage = "https://github.com/rose-pine/neovim/"; }; @@ -17493,12 +18506,12 @@ final: prev: vim-advanced-sorters = buildVimPlugin { pname = "vim-advanced-sorters"; - version = "2021-11-21"; + version = "2024-08-16"; src = fetchFromGitHub { owner = "inkarkat"; repo = "vim-AdvancedSorters"; - rev = "079856080d42e5ea91fadabc39c2906b2d0a0a67"; - sha256 = "1phzragsq4pflvhjzqlxvdsmiyp7z5b68d2a0frn2rj07av0bn91"; + rev = "f6d29af8a2291895973bf98c2630cc68a8115068"; + sha256 = "09p0qmwvswz3hxca6nakqszplpb1mffv5y9bwnlxab1xm17id6df"; }; meta.homepage = "https://github.com/inkarkat/vim-AdvancedSorters/"; }; @@ -17515,5 +18528,4 @@ final: prev: meta.homepage = "https://github.com/jhradilek/vim-snippets/"; }; - } diff --git a/pkgs/applications/editors/vim/plugins/get-plugins.nix b/pkgs/applications/editors/vim/plugins/get-plugins.nix index 06ed71f379240..6c587a94821f4 100644 --- a/pkgs/applications/editors/vim/plugins/get-plugins.nix +++ b/pkgs/applications/editors/vim/plugins/get-plugins.nix @@ -1,19 +1,28 @@ -with import <localpkgs> {}; +with import <localpkgs> { }; let - inherit (vimUtils.override {inherit vim;}) buildVimPlugin; + inherit (vimUtils.override { inherit vim; }) buildVimPlugin; inherit (neovimUtils) buildNeovimPlugin; generated = callPackage <localpkgs/pkgs/applications/editors/vim/plugins/generated.nix> { inherit buildNeovimPlugin buildVimPlugin; - } {} {}; - hasChecksum = value: - lib.isAttrs value && lib.hasAttrByPath ["src" "outputHash"] value; - getChecksum = name: value: - if hasChecksum value then { - submodules = value.src.fetchSubmodules or false; - sha256 = value.src.outputHash; - rev = value.src.rev; - } else null; + } { } { }; + hasChecksum = + value: + lib.isAttrs value + && lib.hasAttrByPath [ + "src" + "outputHash" + ] value; + getChecksum = + name: value: + if hasChecksum value then + { + submodules = value.src.fetchSubmodules or false; + sha256 = value.src.outputHash; + rev = value.src.rev; + } + else + null; checksums = lib.mapAttrs getChecksum generated; in - lib.filterAttrs (n: v: v != null) checksums +lib.filterAttrs (n: v: v != null) checksums diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix index c4a0aea589992..235151a6caa81 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix @@ -27,46 +27,46 @@ }; angular = buildGrammar { language = "angular"; - version = "0.0.0+rev=10f21f3"; + version = "0.0.0+rev=c473dbc"; src = fetchFromGitHub { owner = "dlvandenberg"; repo = "tree-sitter-angular"; - rev = "10f21f3f1b10584e62ecc113ab3cda1196d0ceb8"; - hash = "sha256-hBvDFLIN4n0dbpH8FKe0sY8t4Jwa0GtrLt2GG04Qgn8="; + rev = "c473dbc54ca27f95d8928cfdb2a1a79300e16951"; + hash = "sha256-TEdHRcZKXeEbRPfyUJ9rZ6+OFZn24OvArSo4C31Pyl4="; }; meta.homepage = "https://github.com/dlvandenberg/tree-sitter-angular"; }; apex = buildGrammar { language = "apex"; - version = "0.0.0+rev=c99ad4b"; + version = "0.0.0+rev=69330ef"; src = fetchFromGitHub { owner = "aheber"; repo = "tree-sitter-sfapex"; - rev = "c99ad4b16d112fea91745e3f1b769754239fdaba"; - hash = "sha256-tl/MajAsdu7YxQcdFZmupZldhCl6QB//4FwiBR44nm4="; + rev = "69330ef89fb6b7b2dd16b639d86811e9262c7369"; + hash = "sha256-OO+KttgnPk18EtYmxNphn3if2p3QRNRrXQTYZOmmglc="; }; location = "apex"; meta.homepage = "https://github.com/aheber/tree-sitter-sfapex"; }; arduino = buildGrammar { language = "arduino"; - version = "0.0.0+rev=afb34b2"; + version = "0.0.0+rev=ce02903"; src = fetchFromGitHub { owner = "ObserverOfTime"; repo = "tree-sitter-arduino"; - rev = "afb34b2c65f507932c5c6ddbf0d5a9ca6a772f2f"; - hash = "sha256-iccyGSsbNDhvkrT20/bqx9s5tkghl6DONzJz5UEtTJ8="; + rev = "ce02903e3ae74c729e9415dc32c276447b1c8afd"; + hash = "sha256-16HGIOG0qPdxA4yNwwrMUQ59mzj3bH/PNu0dqjb5u2Q="; }; meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-arduino"; }; asm = buildGrammar { language = "asm"; - version = "0.0.0+rev=b0306e9"; + version = "0.0.0+rev=55b2b91"; src = fetchFromGitHub { owner = "RubixDev"; repo = "tree-sitter-asm"; - rev = "b0306e9bb2ebe01c6562f1aef265cc42ccc53070"; - hash = "sha256-xmuusYIDpttr97ZJrouW0VB02pZG8usQ9kMsARRHeJI="; + rev = "55b2b913f1e71136027d6fce8212e760c64f3532"; + hash = "sha256-DJhnC+kbKK6ibmg7DgkSCbZoTBnH7q7yYfSxI/flsHE="; }; meta.homepage = "https://github.com/RubixDev/tree-sitter-asm"; }; @@ -94,23 +94,23 @@ }; awk = buildGrammar { language = "awk"; - version = "0.0.0+rev=ba74721"; + version = "0.0.0+rev=553fdc4"; src = fetchFromGitHub { owner = "Beaglefoot"; repo = "tree-sitter-awk"; - rev = "ba7472152d79a8c916550c80fdbfd5724d07a0c9"; - hash = "sha256-ywrd9wCdrQ9UZPXvB8fUkelFaZzHxL+hDAPSecMueFs="; + rev = "553fdc4afb3b603332c3f4baf50c711506f4e797"; + hash = "sha256-LJ+jRomCepFH8QbHTgecaDZ3dlO1kgjs5i71kIWi1bg="; }; meta.homepage = "https://github.com/Beaglefoot/tree-sitter-awk"; }; bash = buildGrammar { language = "bash"; - version = "0.0.0+rev=2fbd860"; + version = "0.0.0+rev=c8713e5"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-bash"; - rev = "2fbd860f802802ca76a6661ce025b3a3bca2d3ed"; - hash = "sha256-rCuQbnQAOnQWKYreNH80nlL+0A1qbWbjMvtczcoWPrY="; + rev = "c8713e50f0bd77d080832fc61ad128bc8f2934e9"; + hash = "sha256-xqiUJhl7nfOlS6wBYWpmrGLCvWoJCA5fz8DCX85Lxog="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-bash"; }; @@ -127,12 +127,12 @@ }; beancount = buildGrammar { language = "beancount"; - version = "0.0.0+rev=c25f803"; + version = "0.0.0+rev=01c0da2"; src = fetchFromGitHub { owner = "polarmutex"; repo = "tree-sitter-beancount"; - rev = "c25f8034c977681653a8acd541c8b4877a58f474"; - hash = "sha256-j+TyGT5FycEj+E6si7GSKUauvXNvl1L2NEw98jU7jns="; + rev = "01c0da29e0fc7130420a09d939ecc524e09b6ba6"; + hash = "sha256-obIGlAXe+Y1vffXTGgFRpiqof+F9bSRLq9NJGZcvhVE="; }; meta.homepage = "https://github.com/polarmutex/tree-sitter-beancount"; }; @@ -182,34 +182,34 @@ }; 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"; }; c = buildGrammar { language = "c"; - version = "0.0.0+rev=deca017"; + version = "0.0.0+rev=f4c2115"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-c"; - rev = "deca017a554045b4c203e7ddff39ae64ff05e071"; - hash = "sha256-uvvARjD4729GO8vpmrhAzheEQ3oz7LYmF8awdyS2/Rw="; + rev = "f4c21152f1952a99f4744e8c41d3ffb8038ae78c"; + hash = "sha256-DcW6KZVTjJtPx0iNXvizeAXWW8iaShKGF4+sHrwXPvs="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-c"; }; c_sharp = buildGrammar { language = "c_sharp"; - version = "0.0.0+rev=82fa8f0"; + version = "0.0.0+rev=fd7f740"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-c-sharp"; - rev = "82fa8f05f41a33e9bc830f85d74a9548f0291738"; - hash = "sha256-5GkU3/yVMCnNvNssad3vEIN8PlbLeQsRBlwgH2KUrBo="; + rev = "fd7f7402db6e66afd70b402fb2e367b2d71c10d6"; + hash = "sha256-kj3YWtpitPgPas02I+FAZKtHBVqX7yAy8Ldi0b8IPqk="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-c-sharp"; }; @@ -259,23 +259,23 @@ }; 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"; }; comment = buildGrammar { language = "comment"; - version = "0.0.0+rev=5d8b29f"; + version = "0.0.0+rev=3555706"; src = fetchFromGitHub { owner = "stsewd"; repo = "tree-sitter-comment"; - rev = "5d8b29f6ef3bf64d59430dcfe76b31cc44b5abfd"; - hash = "sha256-19jxH6YK3Rn0fOGSiWen5/eNKPKUSXVsIYB/QAPEA1I="; + rev = "3555706cef8b98d3e4c7379d7260548ff03ad363"; + hash = "sha256-7iY7D7wz+rYRWhi+429a2pcF0mUMBCnnecIssxlqvt0="; }; meta.homepage = "https://github.com/stsewd/tree-sitter-comment"; }; @@ -325,23 +325,23 @@ }; cpp = buildGrammar { language = "cpp"; - version = "0.0.0+rev=7ce8946"; + version = "0.0.0+rev=30d2fa3"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-cpp"; - rev = "7ce8946cae4bb25adebe5b50394f702beb007026"; - hash = "sha256-haU0fXNwYh3YaP8VMY1krRHxrGvNkDV4hMcxp5z9TVA="; + rev = "30d2fa385735378388a55917e2910965fce19748"; + hash = "sha256-O7EVmGvkMCLTzoxNc+Qod6eCTWs6y8DYVpQqw+ziqGo="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-cpp"; }; css = buildGrammar { language = "css"; - version = "0.0.0+rev=f6be52c"; + version = "0.0.0+rev=a68fcd1"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-css"; - rev = "f6be52c3d1cdb1c5e4dd7d8bce0a57497f55d6af"; - hash = "sha256-V1KrNM5C03RcRYcRIPxxfyWlnQkbyAevTHuZINn3Bdc="; + rev = "a68fcd1e6b03118d1e92ffa45e7ab7a39d52d3f7"; + hash = "sha256-o78Od04Ss4S7hbJG41eTN7Mw/i6Dh+AVfENYnPO9/qo="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-css"; }; @@ -359,12 +359,12 @@ }; cuda = buildGrammar { language = "cuda"; - version = "0.0.0+rev=1f188ef"; + version = "0.0.0+rev=635e8aa"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-cuda"; - rev = "1f188eff83b562ffae36d13e1b804ec6f3b9f1d9"; - hash = "sha256-AZXk29yM21KOTVWWUKkr1+sr7gv7ViD6kDjwrJZoCzg="; + rev = "635e8aa3747823a0c4e9660c07cef76fe8d3ef93"; + hash = "sha256-+KHenEgo9wMncjEIJZoqS0x089hjdR3J1t+x663qy1M="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-cuda"; }; @@ -381,34 +381,34 @@ }; d = buildGrammar { language = "d"; - version = "0.0.0+rev=750dde9"; + version = "0.0.0+rev=45e5f1e"; src = fetchFromGitHub { owner = "gdamore"; repo = "tree-sitter-d"; - rev = "750dde90ed9cdbd82493bc28478d8ab1976b0e9f"; - hash = "sha256-Epw1QW4WS1le8OdQI0soO0VaDOgNveh7WTL4sol/cQU="; + rev = "45e5f1e9d6de2c68591bc8e5ec662cf18e950b4a"; + hash = "sha256-q96RgJWrMop2HBBsQloVTspe3EaMtUL3wmVuT9xnE/g="; }; meta.homepage = "https://github.com/gdamore/tree-sitter-d"; }; dart = buildGrammar { language = "dart"; - version = "0.0.0+rev=ac0bb84"; + version = "0.0.0+rev=9ac03bb"; src = fetchFromGitHub { owner = "UserNobody14"; repo = "tree-sitter-dart"; - rev = "ac0bb849ccd1a923963af47573b5e396736ff582"; - hash = "sha256-yEI0a+YlEdjlmSTWZFdVUr7lwuK4wNsE9WycOkXzoG4="; + rev = "9ac03bb2154316624fb4c41fe0f372a5f1597b43"; + hash = "sha256-8bSlsDi1QU0Z9sLxrTfqOi6aB1fe+jP9lHuIjIGNx1o="; }; meta.homepage = "https://github.com/UserNobody14/tree-sitter-dart"; }; devicetree = buildGrammar { language = "devicetree"; - version = "0.0.0+rev=fb07e60"; + version = "0.0.0+rev=296b3c2"; src = fetchFromGitHub { owner = "joelspadin"; repo = "tree-sitter-devicetree"; - rev = "fb07e6044ffd36932c57a5be01ba5d6b8a9337bb"; - hash = "sha256-DKC+aUkdz2eGrXCXzW751aleG4Fxwmjn2KetTCOQRDY="; + rev = "296b3c294a8bcfca6673296d99f9cd37049b8026"; + hash = "sha256-im3RhkaeG7cDd0FwkJzjrUZXjrpHR4q6sQH2waMumOI="; }; meta.homepage = "https://github.com/joelspadin/tree-sitter-devicetree"; }; @@ -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"; }; @@ -447,12 +447,12 @@ }; djot = buildGrammar { language = "djot"; - version = "0.0.0+rev=87bf828"; + version = "0.0.0+rev=886601b"; src = fetchFromGitHub { owner = "treeman"; repo = "tree-sitter-djot"; - rev = "87bf82874c86dcf563f5521069d603ed50e5f0cc"; - hash = "sha256-abAEVbS9hqc1uHx6NxXRBA2SLrCL3gBBPLgAK9Tz3G4="; + rev = "886601b67d1f4690173a4925c214343c30704d32"; + hash = "sha256-uh41umECO8mIgML4JV5yz2iaNy6h5uLQWodcXvhI/MM="; }; meta.homepage = "https://github.com/treeman/tree-sitter-djot"; }; @@ -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=1d637f2"; src = fetchFromGitHub { owner = "glehmann"; repo = "tree-sitter-earthfile"; - rev = "b5bdcb5813ce0e582fbd8e03eb42c80d3cc8984e"; - hash = "sha256-fhHu8kniYOLhrlHLgfP1NHtBxURrM7GNn51zmPNcTIU="; + rev = "1d637f2002bb8b22d4c08d26ad2bfbc22916f3ce"; + hash = "sha256-KzswtiuFyT1xFDDHGhQi+cT/VfGVOgHn7nfUm4ZB9M8="; }; meta.homepage = "https://github.com/glehmann/tree-sitter-earthfile"; }; @@ -524,6 +524,17 @@ location = "crates/tree-sitter-ebnf"; meta.homepage = "https://github.com/RubixDev/ebnf"; }; + editorconfig = buildGrammar { + language = "editorconfig"; + version = "0.0.0+rev=a761198"; + src = fetchFromGitHub { + owner = "ValdezFOmar"; + repo = "tree-sitter-editorconfig"; + rev = "a761198025448c77ea11bcf22505b395a77fc0d0"; + hash = "sha256-KuaXFJGp1kxn0hqssiAFYL36zb0HY22warBb/40Ftzg="; + }; + meta.homepage = "https://github.com/ValdezFOmar/tree-sitter-editorconfig"; + }; eds = buildGrammar { language = "eds"; version = "0.0.0+rev=0ad62cb"; @@ -548,23 +559,23 @@ }; elixir = buildGrammar { language = "elixir"; - version = "0.0.0+rev=c7ae8b7"; + version = "0.0.0+rev=2c6e931"; src = fetchFromGitHub { owner = "elixir-lang"; repo = "tree-sitter-elixir"; - rev = "c7ae8b77e2749826dcf23df6514f08fdd68c66a3"; - hash = "sha256-1B3jVMJs1WNU3K7t42mv9Ab85KEaa8vn8zURksNts+E="; + rev = "2c6e93171477973b38de4b1d2be427cc99f990a6"; + hash = "sha256-WBvpJ0r7cp/xWvnqSk6q4mpyfLAAdIR//2ju6Xri3EY="; }; meta.homepage = "https://github.com/elixir-lang/tree-sitter-elixir"; }; elm = buildGrammar { language = "elm"; - version = "0.0.0+rev=09dbf22"; + version = "0.0.0+rev=27f502e"; src = fetchFromGitHub { owner = "elm-tooling"; repo = "tree-sitter-elm"; - rev = "09dbf221d7491dc8d8839616b27c21b9c025c457"; - hash = "sha256-Bq2oWtqEAsKyV0iHNKC+hXW4fh4yUwbfUhPtZWg5pug="; + rev = "27f502ed0a1cbd3c5912d284cc7934ee0d4cdddc"; + hash = "sha256-o5ou/9/TCzc9HuGzvSSZE2iyWCOwYk0c28KEgGrOiiI="; }; meta.homepage = "https://github.com/elm-tooling/tree-sitter-elm"; }; @@ -592,34 +603,34 @@ }; embedded_template = buildGrammar { language = "embedded_template"; - version = "0.0.0+rev=38d5004"; + version = "0.0.0+rev=62b0a6e"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-embedded-template"; - rev = "38d5004a797298dc42c85e7706c5ceac46a3f29f"; - hash = "sha256-IPPCexaq42Em5A+kmrj5e/SFrXoKdWCTYAL/TWvbDJ0="; + rev = "62b0a6e45900a7dff7c37da95fec20a09968ba52"; + hash = "sha256-F0colhLIN7+1uPAa+z5kBaXIWx/ZxFB28uqNt24QyGo="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-embedded-template"; }; erlang = buildGrammar { language = "erlang"; - version = "0.0.0+rev=b8e44bc"; + version = "0.0.0+rev=0dfcdf1"; src = fetchFromGitHub { owner = "WhatsApp"; repo = "tree-sitter-erlang"; - rev = "b8e44bc0a3b2ce6bceea47c0b1c0f303a6b322b8"; - hash = "sha256-9sfucj3jx5KVt/okHyCZLIJUbYFHPO4Ld/IWWjVXKDA="; + rev = "0dfcdf18b35dd9cfcf92be42659794d07d819d88"; + hash = "sha256-vGJrlugqmDHKMQtoDoFIyPMzWWZE8kUySBKEMDd8Kw0="; }; meta.homepage = "https://github.com/WhatsApp/tree-sitter-erlang"; }; facility = buildGrammar { language = "facility"; - version = "0.0.0+rev=a525796"; + version = "0.0.0+rev=2d037f2"; src = fetchFromGitHub { owner = "FacilityApi"; repo = "tree-sitter-facility"; - rev = "a52579670e2b14ec03d410c3c980fafaf6d659c4"; - hash = "sha256-YHtKuR3AysJXV1JDEBmPCSPOpUxJSnxkbX3/y/tX8ws="; + rev = "2d037f2f2bf668737f72e6be6eda4b7918b68d86"; + hash = "sha256-NyYymlCPqbi4GA+FI/M5MiQUr6tkJTNPO8Pvcy02lqI="; }; meta.homepage = "https://github.com/FacilityApi/tree-sitter-facility"; }; @@ -702,12 +713,12 @@ }; fortran = buildGrammar { language = "fortran"; - version = "0.0.0+rev=f73d473"; + version = "0.0.0+rev=c52e978"; src = fetchFromGitHub { owner = "stadelmanma"; repo = "tree-sitter-fortran"; - rev = "f73d473e3530862dee7cbb38520f28824e7804f6"; - hash = "sha256-K9CnLhDKiWTxVM5OBZ80psV2oFDnlTgd+DDoP39ufds="; + rev = "c52e978afadf3faed52bb3c8082cc472c915f4e7"; + hash = "sha256-MQmS6IR/fyTo9qyYxt+g5kO4eToR6URrOHMN47rQ8kk="; }; meta.homepage = "https://github.com/stadelmanma/tree-sitter-fortran"; }; @@ -744,6 +755,28 @@ }; meta.homepage = "https://gitlab.com/jirgn/tree-sitter-fusion.git"; }; + gap = buildGrammar { + language = "gap"; + version = "0.0.0+rev=141b063"; + src = fetchFromGitHub { + owner = "gap-system"; + repo = "tree-sitter-gap"; + rev = "141b063335e85299bde3f61b4888d02d674a1abc"; + hash = "sha256-vl0bqJXTxpAfaMOIgQpX60I4dfPOJF6wpt10GiftuR0="; + }; + meta.homepage = "https://github.com/gap-system/tree-sitter-gap"; + }; + gaptst = buildGrammar { + language = "gaptst"; + version = "0.0.0+rev=e0723dc"; + src = fetchFromGitHub { + owner = "gap-system"; + repo = "tree-sitter-gaptst"; + rev = "e0723dc6136309b3d5904dad2c73ef71267428c1"; + hash = "sha256-m8lxSM/c99KLnu5hbxaTol645DFqFwjTSzdaRUtHDAI="; + }; + meta.homepage = "https://github.com/gap-system/tree-sitter-gaptst"; + }; gdscript = buildGrammar { language = "gdscript"; version = "0.0.0+rev=1f1e782"; @@ -779,12 +812,12 @@ }; git_rebase = buildGrammar { language = "git_rebase"; - version = "0.0.0+rev=d8a4207"; + version = "0.0.0+rev=bff4b66"; src = fetchFromGitHub { owner = "the-mikedavis"; repo = "tree-sitter-git-rebase"; - rev = "d8a4207ebbc47bd78bacdf48f883db58283f9fd8"; - hash = "sha256-mbRu2+wZVf5Nk3XlFvLSBOUg2QqmCR2tqO7gLpOJ45k="; + rev = "bff4b66b44b020d918d67e2828eada1974a966aa"; + hash = "sha256-k4C7dJUkvQxIxcaoVmG2cBs/CeYzVqrip2+2mRvHtZc="; }; meta.homepage = "https://github.com/the-mikedavis/tree-sitter-git-rebase"; }; @@ -801,12 +834,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"; }; @@ -823,34 +856,56 @@ }; gleam = buildGrammar { language = "gleam"; - version = "0.0.0+rev=02a17bf"; + version = "0.0.0+rev=9586f38"; src = fetchFromGitHub { owner = "gleam-lang"; repo = "tree-sitter-gleam"; - rev = "02a17bf9d0553406268cdbf466d57808ae712bf3"; - hash = "sha256-rZPe7rrnPa4QGnFUjwoaj/7HJzNDSigc7w4gJEFXZD4="; + rev = "9586f38658da115c90e2d01099c83479eb0eea99"; + hash = "sha256-EfuYnfz0E1I5F+9nFvp/uB+S4p6/9evlDlEEbWXCfBc="; }; meta.homepage = "https://github.com/gleam-lang/tree-sitter-gleam"; }; glimmer = buildGrammar { language = "glimmer"; - version = "0.0.0+rev=6b25d26"; + version = "0.0.0+rev=da605af"; src = fetchFromGitHub { - owner = "alexlafroscia"; + owner = "ember-tooling"; repo = "tree-sitter-glimmer"; - rev = "6b25d265c990139353e1f7f97baf84987ebb7bf0"; - hash = "sha256-azLagXPC659Ee0UwqtW0XgpxGLqMSrwmKZy8htsp4xU="; + rev = "da605af8c5999b43e6839b575eae5e6cafabb06f"; + hash = "sha256-2ofCBhp/Trj5ivZpMGFm6dvAGic+w8Tl0osRk+IRLL4="; }; - meta.homepage = "https://github.com/alexlafroscia/tree-sitter-glimmer"; + meta.homepage = "https://github.com/ember-tooling/tree-sitter-glimmer"; + }; + glimmer_javascript = buildGrammar { + language = "glimmer_javascript"; + version = "0.0.0+rev=a260911"; + src = fetchFromGitHub { + owner = "NullVoxPopuli"; + repo = "tree-sitter-glimmer-javascript"; + rev = "a260911201684f80cf815418b3771e6c39309f81"; + hash = "sha256-fpVlfYjVI1ricwNfuzI5AV3RV4ijFTYOf/2NhCirCvU="; + }; + meta.homepage = "https://github.com/NullVoxPopuli/tree-sitter-glimmer-javascript"; + }; + glimmer_typescript = buildGrammar { + language = "glimmer_typescript"; + version = "0.0.0+rev=9d018a0"; + src = fetchFromGitHub { + owner = "NullVoxPopuli"; + repo = "tree-sitter-glimmer-typescript"; + rev = "9d018a0f93417e6951264a26093b89ee63df7315"; + hash = "sha256-ZV6q4OEwj0ulGh5PO5XEMvT4WJQHkMmMXFJs8mcJqXk="; + }; + meta.homepage = "https://github.com/NullVoxPopuli/tree-sitter-glimmer-typescript"; }; glsl = buildGrammar { language = "glsl"; - version = "0.0.0+rev=7f91bf3"; + version = "0.0.0+rev=66aec57"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-glsl"; - rev = "7f91bf34cadc06a96efc475df501ffca4dda9410"; - hash = "sha256-M676GDkyUGosih5R77duEy4jUrIz3bGwD+G6n68gJX0="; + rev = "66aec57f7119c7e8e40665b723cd7af5594f15ee"; + hash = "sha256-EO8p3BhoyemCXlWq4BI5Y1KqU04F9KpEwbn8HoZd4z4="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-glsl"; }; @@ -878,15 +933,26 @@ }; go = buildGrammar { language = "go"; - version = "0.0.0+rev=7ee8d92"; + version = "0.0.0+rev=ecc2086"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-go"; - rev = "7ee8d928db5202f6831a78f8112fd693bf69f98b"; - hash = "sha256-ARfpfMSXy+DpvUMJvUgjgReoyvGbrVwYutZD91JA4qc="; + rev = "ecc20866d1bd4d80f3aef06456ed3014d4d598e6"; + hash = "sha256-elPqkvVYs0vADOuN/umDteWP5hqcXhQAoSkqYDtTxaU="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-go"; }; + goctl = buildGrammar { + language = "goctl"; + version = "0.0.0+rev=49c4353"; + src = fetchFromGitHub { + owner = "chaozwn"; + repo = "tree-sitter-goctl"; + rev = "49c43532689fe1f53e8b9e009d0521cab02c432b"; + hash = "sha256-HYPj95Kg+C5Ax++Z83yUnhrf2iIVTuwOBhVVLlYQaGs="; + }; + meta.homepage = "https://github.com/chaozwn/tree-sitter-goctl"; + }; godot_resource = buildGrammar { language = "godot_resource"; version = "0.0.0+rev=2ffb90d"; @@ -900,12 +966,12 @@ }; gomod = buildGrammar { language = "gomod"; - version = "0.0.0+rev=bbe2fe3"; + version = "0.0.0+rev=3b01edc"; src = fetchFromGitHub { owner = "camdencheek"; repo = "tree-sitter-go-mod"; - rev = "bbe2fe3be4b87e06a613e685250f473d2267f430"; - hash = "sha256-OPtqXe6OMC9c5dgFH8Msj+6DU01LvLKVbCzGLj0PnLI="; + rev = "3b01edce2b9ea6766ca19328d1850e456fde3103"; + hash = "sha256-C3pPBgm68mmaPmstyIpIvvDHsx29yZ0ZX/QoUqwjb+0="; }; meta.homepage = "https://github.com/camdencheek/tree-sitter-go-mod"; }; @@ -922,12 +988,12 @@ }; gotmpl = buildGrammar { language = "gotmpl"; - version = "0.0.0+rev=9d3f6e5"; + version = "0.0.0+rev=fd9e1c6"; src = fetchFromGitHub { owner = "ngalaiko"; repo = "tree-sitter-go-template"; - rev = "9d3f6e526dd074b9edae9070b7bb778f00e87a5b"; - hash = "sha256-ndd85YVO2brK7JVBFOg6bbKV66qVPjo4DVi7GaT/eZA="; + rev = "fd9e1c6647e5e9b23918d00d1e48710d0f703e19"; + hash = "sha256-DGeaKT1uqvXiYwL4g5kZNX6f5TwLPbb5qbhI4amdl98="; }; meta.homepage = "https://github.com/ngalaiko/tree-sitter-go-template"; }; @@ -966,12 +1032,12 @@ }; groovy = buildGrammar { language = "groovy"; - version = "0.0.0+rev=6c5c881"; + version = "0.0.0+rev=0d88845"; src = fetchFromGitHub { owner = "murtaza64"; repo = "tree-sitter-groovy"; - rev = "6c5c8813233fe326e24c5ef032858d13f8006a8d"; - hash = "sha256-NursRJ7DBmlbA7EOzC+WwoxDkjMUZYANcdX48DyjEIY="; + rev = "0d8884514fe10c4fa47527d9a0284d207f38ddea"; + hash = "sha256-Dv7FxfHA+2VM60iFZGaytmDVCUEoCJY3bpOJrw5Q8ik="; }; meta.homepage = "https://github.com/murtaza64/tree-sitter-groovy"; }; @@ -999,23 +1065,23 @@ }; hare = buildGrammar { language = "hare"; - version = "0.0.0+rev=0705249"; + version = "0.0.0+rev=4af5d82"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-hare"; - rev = "070524937539eb8bb4f10debd9c83b66c434f3a2"; - hash = "sha256-NUvbkMYA1nZmS84vLNguto/Fo7wdrDmRCBnveR88ry0="; + rev = "4af5d82cf9ec39f67cb1db5b7a9269d337406592"; + hash = "sha256-QEnE5IQJ60PXb6QjgEE5L4p7Fjy0p+N+dyDTMh3YsRg="; }; meta.homepage = "https://github.com/amaanq/tree-sitter-hare"; }; haskell = buildGrammar { language = "haskell"; - version = "0.0.0+rev=a50070d"; + version = "0.0.0+rev=558b997"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-haskell"; - rev = "a50070d5bb5bd5c1281740a6102ecf1f4b0c4f19"; - hash = "sha256-huO0Ly9JYQbT64o/AjdZrE9vghQ5vT+/iQl50o4TJ0I="; + rev = "558b997049fddcb07fc513528189c57d6129a260"; + hash = "sha256-BvnCHdHJwhCH3wQnA8JA2RgOUUpigJv7f88pRMW1U8o="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-haskell"; }; @@ -1032,34 +1098,34 @@ }; 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"; }; heex = buildGrammar { language = "heex"; - version = "0.0.0+rev=b5ad6e3"; + version = "0.0.0+rev=6dd0303"; src = fetchFromGitHub { owner = "connorlay"; repo = "tree-sitter-heex"; - rev = "b5ad6e34eea18a15bbd1466ca707a17f9bff7b93"; - hash = "sha256-o0ArFfBJTrEQVXVet+AIDPCB/b9KKvOYrrtMGyLgtM8="; + rev = "6dd0303acf7138dd2b9b432a229e16539581c701"; + hash = "sha256-VakMZtWQ/h7dNy5ehk2Bh14a5s878AUgwY3Ipq8tPec="; }; meta.homepage = "https://github.com/connorlay/tree-sitter-heex"; }; helm = buildGrammar { language = "helm"; - version = "0.0.0+rev=9d3f6e5"; + version = "0.0.0+rev=fd9e1c6"; src = fetchFromGitHub { owner = "ngalaiko"; repo = "tree-sitter-go-template"; - rev = "9d3f6e526dd074b9edae9070b7bb778f00e87a5b"; - hash = "sha256-ndd85YVO2brK7JVBFOg6bbKV66qVPjo4DVi7GaT/eZA="; + rev = "fd9e1c6647e5e9b23918d00d1e48710d0f703e19"; + hash = "sha256-DGeaKT1uqvXiYwL4g5kZNX6f5TwLPbb5qbhI4amdl98="; }; location = "dialects/helm"; meta.homepage = "https://github.com/ngalaiko/tree-sitter-go-template"; @@ -1077,23 +1143,23 @@ }; hlsl = buildGrammar { language = "hlsl"; - version = "0.0.0+rev=5e1225a"; + version = "0.0.0+rev=5439302"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-hlsl"; - rev = "5e1225a30712ca0a9040509806c7ba274a1bbcde"; - hash = "sha256-gBByrpw5iCGoOy1zrg0emuAd1Vd8KOKFeJLZOCWh9qU="; + rev = "543930235970a04c2f0d549c9e88815847c7a74a"; + hash = "sha256-MElmidivJtIywWm4dRslrmtc/vVwGDO1f6k/0P3gb4E="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-hlsl"; }; hlsplaylist = buildGrammar { language = "hlsplaylist"; - version = "0.0.0+rev=64f1902"; + version = "0.0.0+rev=3bfda92"; src = fetchFromGitHub { owner = "Freed-Wu"; repo = "tree-sitter-hlsplaylist"; - rev = "64f19029339e75d6762feae39e7878595860c980"; - hash = "sha256-rJZo17tAbDbnnx6PTOlzgJYClnGrRNfQ6fLJqIVMMCw="; + rev = "3bfda9271e3adb08d35f47a2102fe957009e1c55"; + hash = "sha256-BvLT+BbnJgM14a896p39dywYy/4S45xOBtBukYTbW6E="; }; meta.homepage = "https://github.com/Freed-Wu/tree-sitter-hlsplaylist"; }; @@ -1121,12 +1187,12 @@ }; html = buildGrammar { language = "html"; - version = "0.0.0+rev=e4d834e"; + version = "0.0.0+rev=14bdaf0"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-html"; - rev = "e4d834eb4918df01dcad5c27d1b15d56e3bd94cd"; - hash = "sha256-sHy3fVWemJod18HCQ8zBC/LpeCCPH0nzhI1wrkCg8nw="; + rev = "14bdaf0da9e26e2de9b30178c2242539d2b0b285"; + hash = "sha256-vSiIabzhhTpvt+1Zh+tCad2TR5hG572hRmX2fTjfC7s="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-html"; }; @@ -1143,67 +1209,67 @@ }; http = buildGrammar { language = "http"; - version = "0.0.0+rev=8d22f33"; + version = "0.0.0+rev=231f1b1"; src = fetchFromGitHub { owner = "rest-nvim"; repo = "tree-sitter-http"; - rev = "8d22f33faa5aa95c6526606fb656ada342e59e40"; - hash = "sha256-L+9cDLTmisZmdBXocK8u7fkJIlaZId9qeQxVWwFkdJg="; + rev = "231f1b1bafd12e46c8ed8c21dbbdd940d9f15e94"; + hash = "sha256-q8g7u3ctpfl0vq+RVBw7g7js/4SwAIkHg4CCRCuQ28w="; }; meta.homepage = "https://github.com/rest-nvim/tree-sitter-http"; }; hurl = buildGrammar { language = "hurl"; - version = "0.0.0+rev=ad705af"; + version = "0.0.0+rev=ff07a42"; src = fetchFromGitHub { owner = "pfeiferj"; repo = "tree-sitter-hurl"; - rev = "ad705af8c44c737bdb965fc081329c50716d2d03"; - hash = "sha256-Pdk7wGaTtQHola+Ek5a7pLBfRUEJfgx+nSunh7/c13I="; + rev = "ff07a42d9ec95443b5c1b57ed793414bf7b79be5"; + hash = "sha256-9uRRlJWT0knZ3vvzGEq9CjyffQnYF53rnoBnsQ68zyE="; }; meta.homepage = "https://github.com/pfeiferj/tree-sitter-hurl"; }; 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=5573b29"; src = fetchFromGitHub { owner = "cathaysia"; repo = "tree-sitter-idl"; - rev = "9f56001f8ed29b0ea9fa4f02813f3e83ab0a2aaa"; - hash = "sha256-L5O9pep1No4oWSM7nA71RYY2X688+rm/2pTETP7ifOA="; + rev = "5573b295410201ed22771776b34d636900eba368"; + hash = "sha256-Pf9Wtmza6bKQsZ54EzVhSnUFkEcHuTgPGNZuH8jh42o="; }; meta.homepage = "https://github.com/cathaysia/tree-sitter-idl"; }; ini = buildGrammar { language = "ini"; - version = "0.0.0+rev=87176e5"; + version = "0.0.0+rev=962568c"; src = fetchFromGitHub { owner = "justinmk"; repo = "tree-sitter-ini"; - rev = "87176e524f0a98f5be75fa44f4f0ff5c6eac069c"; - hash = "sha256-IyHrIxcmuzs60zUiJv4E3nSkhSkgbcaLDUdeDx5mlHk="; + rev = "962568c9efa71d25720ab42c5d36e222626ef3a6"; + hash = "sha256-G11Aynq2rnkRwdkhspjYqtBD/h5k4aD+NvuE0QfploU="; }; meta.homepage = "https://github.com/justinmk/tree-sitter-ini"; }; inko = buildGrammar { language = "inko"; - version = "0.0.0+rev=234c87b"; + version = "0.0.0+rev=3a8887c"; src = fetchFromGitHub { owner = "inko-lang"; repo = "tree-sitter-inko"; - rev = "234c87be1dac20f766ddf6f486a7bde2a4bc5594"; - hash = "sha256-7BADt6NjH9chOzCDtJSLjBZaRqeLvOH006q0hI4pZaI="; + rev = "3a8887ca16dd8add3905216ce63796d4097c7a6f"; + hash = "sha256-kJ3xJGlLdvvcJIOoooOMf0BGpk88etQJhRS74enVmNQ="; }; meta.homepage = "https://github.com/inko-lang/tree-sitter-inko"; }; @@ -1220,34 +1286,34 @@ }; janet_simple = buildGrammar { language = "janet_simple"; - version = "0.0.0+rev=2a05cab"; + version = "0.0.0+rev=12bfab7"; src = fetchFromGitHub { owner = "sogaiu"; repo = "tree-sitter-janet-simple"; - rev = "2a05cab838dfec52daa76f10920917d2e69a85bc"; - hash = "sha256-NOnm40FSzTX6Pf4NchH0hYcTwyxX/usEVKxz8KsIlk4="; + rev = "12bfab7db8a5f5b1d774ef84b5831acd34936071"; + hash = "sha256-ndxhGmfz0wYxsOeBJv/OJndj3pORQoWpRTfBuMcprhU="; }; meta.homepage = "https://github.com/sogaiu/tree-sitter-janet-simple"; }; java = buildGrammar { language = "java"; - version = "0.0.0+rev=953abfc"; + version = "0.0.0+rev=245b05c"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-java"; - rev = "953abfc8bb3eb2f578e1f461edba4a9885f974b8"; - hash = "sha256-COrEPsdTI6MJeb5iIZtyNHHe6nMsD/EnHDRVDTSKFTg="; + rev = "245b05c6ba900fa708242835f6168ef76f9d951e"; + hash = "sha256-C87uMEIoqXr6bYLCJAq6aiXsfH4+srVbNx7bMV9rseM="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-java"; }; javascript = buildGrammar { language = "javascript"; - version = "0.0.0+rev=391a8fc"; + version = "0.0.0+rev=b6f0624"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-javascript"; - rev = "391a8fcc48a11f63bf18ec9885f6f069e760949a"; - hash = "sha256-GOIhkoiiUhkTpUhDm/sfLtsNhOrVoGx2uiXEteruT2g="; + rev = "b6f0624c1447bc209830b195999b78a56b10a579"; + hash = "sha256-xen4zzDwlCXbvgYwckDE0Jw3rDpKUwmr4DHB47nGng4="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-javascript"; }; @@ -1264,23 +1330,23 @@ }; jsdoc = buildGrammar { language = "jsdoc"; - version = "0.0.0+rev=49fde20"; + version = "0.0.0+rev=bc09606"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-jsdoc"; - rev = "49fde205b59a1d9792efc21ee0b6d50bbd35ff14"; - hash = "sha256-Mfau8071UiotdSS+/W9kQWhKF7BCRI8WtRxss/U0GQw="; + rev = "bc09606fc786ead131a301e4b7524888f2d5c517"; + hash = "sha256-tVCYa2N3h+Wf1vPL7/C3rqY6WiR6n9b6VXofUk7+DSA="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-jsdoc"; }; json = buildGrammar { language = "json"; - version = "0.0.0+rev=94f5c52"; + version = "0.0.0+rev=8bfdb43"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-json"; - rev = "94f5c527b2965465956c2000ed6134dd24daf2a7"; - hash = "sha256-16/ZRjRolUC/iN7ASrNnXNSkfohBlSqyyYAz4nka6pM="; + rev = "8bfdb43f47ad805bb1ce093203cfcbaa8ed2c571"; + hash = "sha256-zEuPynGi11vr7UvxC+mgZ+zOJBEVDjxvMwx0dozANn0="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-json"; }; @@ -1308,34 +1374,34 @@ }; jsonnet = buildGrammar { language = "jsonnet"; - version = "0.0.0+rev=d34615f"; + version = "0.0.0+rev=ddd075f"; src = fetchFromGitHub { owner = "sourcegraph"; repo = "tree-sitter-jsonnet"; - rev = "d34615fa12cc1d1cfc1f1f1a80acc9db80ee4596"; - hash = "sha256-jjDjntNm0YAsG6Ec2n0eB8BjpgEQEAjV8LAZ3GGYhG8="; + rev = "ddd075f1939aed8147b7aa67f042eda3fce22790"; + hash = "sha256-ODGRkirfUG8DqV6ZcGRjKeCyEtsU0r+ICK0kCG6Xza0="; }; meta.homepage = "https://github.com/sourcegraph/tree-sitter-jsonnet"; }; julia = buildGrammar { language = "julia"; - version = "0.0.0+rev=f1baa5f"; + version = "0.0.0+rev=3520b57"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-julia"; - rev = "f1baa5f8e271109d01cc8ff7473c11df2d8a9aee"; - hash = "sha256-a0yLJMnXllHPij8fBjwqYgKRc6GxHHCQjSbPOKdLh9I="; + rev = "3520b57e418f734f582215181ecd926a6178c90f"; + hash = "sha256-IPtEDuYMMZ/0ARvO/Cs8RCofJJE9S/30StvV2oSW41I="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-julia"; }; just = buildGrammar { language = "just"; - version = "0.0.0+rev=fd814fc"; + version = "0.0.0+rev=6648ac1"; src = fetchFromGitHub { owner = "IndianBoy42"; repo = "tree-sitter-just"; - rev = "fd814fc6c579f68c2a642f5e0268cf69daae92d7"; - hash = "sha256-yuTcgNfF4oRNZkwwFpt5WLpWtTvgJJRDYo3CWnCNyiU="; + rev = "6648ac1c0cdadaec8ee8bcf9a4ca6ace5102cf21"; + hash = "sha256-EVISh9r+aJ6Og1UN8bGCLk4kVjS/cEOYyhqHF40ztqg="; }; meta.homepage = "https://github.com/IndianBoy42/tree-sitter-just"; }; @@ -1363,12 +1429,12 @@ }; kotlin = buildGrammar { language = "kotlin"; - version = "0.0.0+rev=c9cb850"; + version = "0.0.0+rev=ec98567"; src = fetchFromGitHub { owner = "fwcd"; repo = "tree-sitter-kotlin"; - rev = "c9cb8504b81684375e7beb8907517dbd6947a1be"; - hash = "sha256-fuEKCtCzaWOp0gKrsPMOW9oGOXnM2Qb652Nhn1lc1eA="; + rev = "ec985672ff21f7fd7f835869d8021e8f87304bb4"; + hash = "sha256-ThttqJxC3yaGufY2H9H5KgUu2bSTp+BKInyi0vucrS8="; }; meta.homepage = "https://github.com/fwcd/tree-sitter-kotlin"; }; @@ -1396,23 +1462,23 @@ }; lalrpop = buildGrammar { language = "lalrpop"; - version = "0.0.0+rev=854a40e"; + version = "0.0.0+rev=194c255"; src = fetchFromGitHub { owner = "traxys"; repo = "tree-sitter-lalrpop"; - rev = "854a40e99f7c70258e522bdb8ab584ede6196e2e"; - hash = "sha256-rVWmYF26DbPHoNRBv9FKEeacSbgw93PHy/wrQDGzlWk="; + rev = "194c25539f435de415ee0551a5f07058833da915"; + hash = "sha256-I2Kozd0N8R0CCOVl4xTAL4fhZ5BIzSzW+MRQOfZ3cMY="; }; meta.homepage = "https://github.com/traxys/tree-sitter-lalrpop"; }; latex = buildGrammar { language = "latex"; - version = "0.0.0+rev=cd82eb4"; + version = "0.0.0+rev=1e4e303"; src = fetchFromGitHub { owner = "latex-lsp"; repo = "tree-sitter-latex"; - rev = "cd82eb40d31bdfe65f846f4e06292d6c804b5e0e"; - hash = "sha256-ptUIi8cMQ4CrnqZgnzJ0rnByd78y8l607+CSPKNrLEk="; + rev = "1e4e30342b7a3b3a24886a632fbac53035d98871"; + hash = "sha256-A2uvHRoe9xtgsHSLYdZiztGLXdqXzsfw4BYeZ/Cmr4k="; }; generate = true; meta.homepage = "https://github.com/latex-lsp/tree-sitter-latex"; @@ -1430,12 +1496,12 @@ }; leo = buildGrammar { language = "leo"; - version = "0.0.0+rev=304611b"; + version = "0.0.0+rev=6ca11a9"; src = fetchFromGitHub { owner = "r001"; repo = "tree-sitter-leo"; - rev = "304611b5eaf53aca07459a0a03803b83b6dfd3b3"; - hash = "sha256-D3jtNBYLgN2/0TnbOMJrsuZrP+PMr835aDYlCwIPPrk="; + rev = "6ca11a96fc2cab51217e0cf4a2f9ed3ea63e28fb"; + hash = "sha256-ye2zzLNZC2ZJqnXtBl7fdSC78kph3rs7j4whIdfDYAE="; }; meta.homepage = "https://github.com/r001/tree-sitter-leo"; }; @@ -1452,12 +1518,12 @@ }; liquid = buildGrammar { language = "liquid"; - version = "0.0.0+rev=0419ac4"; + version = "0.0.0+rev=23ac814"; src = fetchFromGitHub { owner = "hankthetank27"; repo = "tree-sitter-liquid"; - rev = "0419ac4868585320eee8615c90b864a1b04ef433"; - hash = "sha256-1FPDsQSPM86NvMrmxIOVnIC65bUOFtKEwRuAtMDbw6M="; + rev = "23ac814111e2b4b4b083e2c92219af2d5b74d13d"; + hash = "sha256-WZSvUiX1bKEfzXHVHC0AvzHpgyPD9JL+NgsoBx9mktQ="; }; meta.homepage = "https://github.com/hankthetank27/tree-sitter-liquid"; }; @@ -1485,12 +1551,12 @@ }; lua = buildGrammar { language = "lua"; - version = "0.0.0+rev=a24dab1"; + version = "0.0.0+rev=99fc677"; src = fetchFromGitHub { owner = "MunifTanjim"; repo = "tree-sitter-lua"; - rev = "a24dab177e58c9c6832f96b9a73102a0cfbced4a"; - hash = "sha256-uFaEptW4wPrqgHfB1mYmVltf+4no61L2cPgpsr5qBIU="; + rev = "99fc677e6971c425e8d407f59c77ab897e585c92"; + hash = "sha256-Q2LtrifoKf16N1dRBf2xLi12kpMkcFncZL4jaVbtK3M="; }; meta.homepage = "https://github.com/MunifTanjim/tree-sitter-lua"; }; @@ -1518,23 +1584,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=e128454"; src = fetchFromGitHub { owner = "grahambates"; repo = "tree-sitter-m68k"; - rev = "d097b123f19c6eaba2bf181c05420d88b9fc489d"; - hash = "sha256-y1nioJ2R0YgGLH7dkJsTxIkejfMnh1CU+A++yTaQdb0="; + rev = "e128454c2210c0e0c10b68fe45ddb8fee80182a3"; + hash = "sha256-g7SZ/TrTaaeGDNOqId4eom9R/5gOyXcmmhWY4WW0fF4="; }; meta.homepage = "https://github.com/grahambates/tree-sitter-m68k"; }; @@ -1551,36 +1617,36 @@ }; markdown = buildGrammar { language = "markdown"; - version = "0.0.0+rev=7fe453b"; + version = "0.0.0+rev=d9287a6"; src = fetchFromGitHub { owner = "MDeiml"; repo = "tree-sitter-markdown"; - rev = "7fe453beacecf02c86f7736439f238f5bb8b5c9b"; - hash = "sha256-Ai8w5fVtN6NofEGG3VQNd8pNPVijYw6nDzrhedKMOe4="; + rev = "d9287a6f36347064e55c36858e9e522eb652c1ad"; + hash = "sha256-QFHPlvoJMTMepV1KxKXKjpiKMMmGzBO5mxxNcWKLO7s="; }; location = "tree-sitter-markdown"; meta.homepage = "https://github.com/MDeiml/tree-sitter-markdown"; }; markdown_inline = buildGrammar { language = "markdown_inline"; - version = "0.0.0+rev=7fe453b"; + version = "0.0.0+rev=d9287a6"; src = fetchFromGitHub { owner = "MDeiml"; repo = "tree-sitter-markdown"; - rev = "7fe453beacecf02c86f7736439f238f5bb8b5c9b"; - hash = "sha256-Ai8w5fVtN6NofEGG3VQNd8pNPVijYw6nDzrhedKMOe4="; + rev = "d9287a6f36347064e55c36858e9e522eb652c1ad"; + hash = "sha256-QFHPlvoJMTMepV1KxKXKjpiKMMmGzBO5mxxNcWKLO7s="; }; location = "tree-sitter-markdown-inline"; meta.homepage = "https://github.com/MDeiml/tree-sitter-markdown"; }; matlab = buildGrammar { language = "matlab"; - version = "0.0.0+rev=79d8b25"; + version = "0.0.0+rev=306c43a"; src = fetchFromGitHub { owner = "acristoffers"; repo = "tree-sitter-matlab"; - rev = "79d8b25f57b48f83ae1333aff6723b83c9532e37"; - hash = "sha256-DCAMxQqWHM54yzNzF1FjaU0+vETbLhfSZXNq+62DzhE="; + rev = "306c43ab28b7b8a4976e40ff0a7c26b019ad52df"; + hash = "sha256-hueZg7hoZb11+ukrZgK1+da0w9J22jsj1BexlF4USXY="; }; meta.homepage = "https://github.com/acristoffers/tree-sitter-matlab"; }; @@ -1619,24 +1685,24 @@ }; mlir = buildGrammar { language = "mlir"; - version = "0.0.0+rev=00c32d8"; + version = "0.0.0+rev=02af5a1"; src = fetchFromGitHub { owner = "artagnon"; repo = "tree-sitter-mlir"; - rev = "00c32d8562dc957b187da110a3443307962b8da8"; - hash = "sha256-cyd9n1ydIEoBL+hnRiCSEC2S9H1hrWZlMCxVbxWyazI="; + rev = "02af5a1a1cfa69a094e3136b10dfb602f968232e"; + hash = "sha256-zCv47UvUIzdoJwQwKMrFyR1eMdU6ScSGfODdXomBapY="; }; generate = true; meta.homepage = "https://github.com/artagnon/tree-sitter-mlir"; }; muttrc = buildGrammar { language = "muttrc"; - version = "0.0.0+rev=90ef608"; + version = "0.0.0+rev=173b0ab"; src = fetchFromGitHub { owner = "neomutt"; repo = "tree-sitter-muttrc"; - rev = "90ef60852c410bd964cd3b954366e4c403c17314"; - hash = "sha256-GiM9jXtaL/GEUmBuiMB7pZP0VnHVzRETwwCHQsHyaTM="; + rev = "173b0ab53a9c07962c9777189c4c70e90f1c1837"; + hash = "sha256-zma/oyMFI+r+/616yXV9b4ptC1FNYpHlpqY/Fez++n0="; }; meta.homepage = "https://github.com/neomutt/tree-sitter-muttrc"; }; @@ -1651,25 +1717,36 @@ }; meta.homepage = "https://github.com/naclsn/tree-sitter-nasm"; }; + nginx = buildGrammar { + language = "nginx"; + version = "0.0.0+rev=281d184"; + src = fetchFromGitHub { + owner = "opa-oz"; + repo = "tree-sitter-nginx"; + rev = "281d184b8240b2b22670b8907b57b6d6842db6f3"; + hash = "sha256-OsUCCtkaCwiKWKBduk9Ktc65LP1udKcKRmU4TAy8ayE="; + }; + meta.homepage = "https://github.com/opa-oz/tree-sitter-nginx"; + }; nickel = buildGrammar { language = "nickel"; - version = "0.0.0+rev=43433d8"; + version = "0.0.0+rev=88d836a"; src = fetchFromGitHub { owner = "nickel-lang"; repo = "tree-sitter-nickel"; - rev = "43433d8477b24cd13acaac20a66deda49b7e2547"; - hash = "sha256-9Ei0uy+eGK9oiH7y2KIhB1E88SRzGnZinqECT3kYTVE="; + rev = "88d836a24b3b11c8720874a1a9286b8ae838d30a"; + hash = "sha256-IvlUwNO/wLLPuqCZf0NtSxMdDx+4ASYYOobklY/97aQ="; }; meta.homepage = "https://github.com/nickel-lang/tree-sitter-nickel"; }; nim = buildGrammar { language = "nim"; - version = "0.0.0+rev=961c279"; + version = "0.0.0+rev=897e5d3"; src = fetchFromGitHub { owner = "alaviss"; repo = "tree-sitter-nim"; - rev = "961c2798cec9250c44f7d7225ddb33d47d25856a"; - hash = "sha256-zFT316pJwJvPRLJcBk4kvPmwNgdkYG5/10VktNBQwL8="; + rev = "897e5d346f0b59ed62b517cfb0f1a845ad8f0ab7"; + hash = "sha256-JwR5Og1pGDTHI49rFsnfStrTcZ7hOseK6YyFIVlQ1o4="; }; meta.homepage = "https://github.com/alaviss/tree-sitter-nim"; }; @@ -1697,23 +1774,23 @@ }; nix = buildGrammar { language = "nix"; - version = "0.0.0+rev=b3cda61"; + version = "0.0.0+rev=01bc5b1"; src = fetchFromGitHub { owner = "cstrahan"; repo = "tree-sitter-nix"; - rev = "b3cda619248e7dd0f216088bd152f59ce0bbe488"; - hash = "sha256-Ib83CECi3hvm2GfeAJXIkapeN8rrpFQxCWWFFsIvB/Y="; + rev = "01bc5b18693055aab7a863d7608f4b3f85843cf8"; + hash = "sha256-hzHCcKl3T+zEHhK5U4Ym+puvOjgr+etdDHNpuCbOSzU="; }; meta.homepage = "https://github.com/cstrahan/tree-sitter-nix"; }; norg = buildGrammar { language = "norg"; - version = "0.0.0+rev=aa1a1a7"; + version = "0.0.0+rev=d89d95a"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "tree-sitter-norg"; - rev = "aa1a1a7ded81a094cc3d5cb14bea6f34b86d8688"; - hash = "sha256-baJdvWfwUx1U2RX0G6ECaGPGZBFbWsVUhh3kYPaYeiE="; + rev = "d89d95af13d409f30a6c7676387bde311ec4a2c8"; + hash = "sha256-z3h5qMuNKnpQgV62xZ02F5vWEq4VEnm5lxwEnIFu+Rw="; }; meta.homepage = "https://github.com/nvim-neorg/tree-sitter-norg"; }; @@ -1752,24 +1829,24 @@ }; ocaml = buildGrammar { language = "ocaml"; - version = "0.0.0+rev=0b12614"; + version = "0.0.0+rev=45ddc92"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-ocaml"; - rev = "0b12614ded3ec7ed7ab7933a9ba4f695ba4c342e"; - hash = "sha256-ysMYLTIhU4jN24cPH0J8v9685ED+OQU6x/pLBeHXeYQ="; + rev = "45ddc92d18fa11b2ca1a18cd94de4e63feea0806"; + hash = "sha256-xeUb/x1PennKS5N5TMPG0F+jLgAeY8DuIUkkbQ79QYQ="; }; 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=45ddc92"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-ocaml"; - rev = "0b12614ded3ec7ed7ab7933a9ba4f695ba4c342e"; - hash = "sha256-ysMYLTIhU4jN24cPH0J8v9685ED+OQU6x/pLBeHXeYQ="; + rev = "45ddc92d18fa11b2ca1a18cd94de4e63feea0806"; + hash = "sha256-xeUb/x1PennKS5N5TMPG0F+jLgAeY8DuIUkkbQ79QYQ="; }; location = "grammars/interface"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-ocaml"; @@ -1810,14 +1887,14 @@ }; pascal = buildGrammar { language = "pascal"; - version = "0.0.0+rev=a9ee969"; + version = "0.0.0+rev=d0ebabe"; src = fetchFromGitHub { owner = "Isopod"; repo = "tree-sitter-pascal"; - rev = "a9ee969dec5b2e3b2ccccc5954fec04100c7619e"; - hash = "sha256-U45RkRpE1EdX2ijGyjTKVNRcSu6E6Dh9Z7G9bp24T80="; + rev = "d0ebabefaea9ac3f6fc3004cf08cd121b66da9e4"; + hash = "sha256-T47xDjEbcDLg1IOu2HsIGA7j/CFMCagfV4xKdFYYoec="; }; - meta.homepage = "https://github.com/Isopod/tree-sitter-pascal.git"; + meta.homepage = "https://github.com/Isopod/tree-sitter-pascal"; }; passwd = buildGrammar { language = "passwd"; @@ -1843,47 +1920,47 @@ }; perl = buildGrammar { language = "perl"; - version = "0.0.0+rev=309cb8d"; + version = "0.0.0+rev=81c57e2"; src = fetchFromGitHub { owner = "tree-sitter-perl"; repo = "tree-sitter-perl"; - rev = "309cb8d33bcfd0a81050b21be08f9eb3f2fe2138"; - hash = "sha256-eMmU6qkg9ZVjtxaW1tSPhqsPe2WX3/frPfqMxXCziyo="; + rev = "81c57e274c541c30d6c204c8dbceb90ec647ed8d"; + hash = "sha256-xtsLJx9tzj3KNhlCDuXnAGBz3EYnJ/J+EJ0UKHVN4g4="; }; meta.homepage = "https://github.com/tree-sitter-perl/tree-sitter-perl"; }; php = buildGrammar { language = "php"; - version = "0.0.0+rev=4f124bc"; + version = "0.0.0+rev=74c6b0d"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-php"; - rev = "4f124bc6075e1c3333e80190c1c170933ed72c95"; - hash = "sha256-qYfcJCcZ2s/z61aPhO/y+v32FnEwf0rBvtvPiQVtBOE="; + rev = "74c6b0d560c2660db4d9e8c76b681f538d494160"; + hash = "sha256-mJh8MILlVSjG3bOvYPw2Wc7XFhL+ozrdvcnr1qR6pZE="; }; location = "php"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-php"; }; php_only = buildGrammar { language = "php_only"; - version = "0.0.0+rev=4f124bc"; + version = "0.0.0+rev=74c6b0d"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-php"; - rev = "4f124bc6075e1c3333e80190c1c170933ed72c95"; - hash = "sha256-qYfcJCcZ2s/z61aPhO/y+v32FnEwf0rBvtvPiQVtBOE="; + rev = "74c6b0d560c2660db4d9e8c76b681f538d494160"; + hash = "sha256-mJh8MILlVSjG3bOvYPw2Wc7XFhL+ozrdvcnr1qR6pZE="; }; location = "php_only"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-php"; }; phpdoc = buildGrammar { language = "phpdoc"; - version = "0.0.0+rev=1d0e255"; + version = "0.0.0+rev=df5e7da"; src = fetchFromGitHub { owner = "claytonrcarter"; repo = "tree-sitter-phpdoc"; - rev = "1d0e255b37477d0ca46f1c9e9268c8fa76c0b3fc"; - hash = "sha256-EWj/Av8+Ri7KiC9LzH73ytufjkp3MxBPwfm6mF3IGD8="; + rev = "df5e7da4b83da072f99135079ac3436550b8d67d"; + hash = "sha256-LIqu5+DaybdxY57IPwVACtgrGTiCXIiIIqUK45ISzYw="; }; meta.homepage = "https://github.com/claytonrcarter/tree-sitter-phpdoc"; }; @@ -1911,12 +1988,12 @@ }; pod = buildGrammar { language = "pod"; - version = "0.0.0+rev=39da859"; + version = "0.0.0+rev=0bf8387"; src = fetchFromGitHub { owner = "tree-sitter-perl"; repo = "tree-sitter-pod"; - rev = "39da859947b94abdee43e431368e1ae975c0a424"; - hash = "sha256-sMUlAtl0IaykKlEhOiAkdrLNNJiCS0L7gj7+2WHwO5U="; + rev = "0bf8387987c21bf2f8ed41d2575a8f22b139687f"; + hash = "sha256-yV2kVAxWxdyIJ3g2oivDc01SAQF0lc7UMT2sfv9lKzI="; }; meta.homepage = "https://github.com/tree-sitter-perl/tree-sitter-pod"; }; @@ -1942,6 +2019,17 @@ }; meta.homepage = "https://github.com/amaanq/tree-sitter-pony"; }; + powershell = buildGrammar { + language = "powershell"; + version = "0.0.0+rev=fc15514"; + src = fetchFromGitHub { + owner = "airbus-cert"; + repo = "tree-sitter-powershell"; + rev = "fc15514b2f1dbba9c58528d15a3708f89eda6a01"; + hash = "sha256-StVnRNM0HPevLSRDIDr+Sakjo+NqXYWPPUFjI29Cowo="; + }; + meta.homepage = "https://github.com/airbus-cert/tree-sitter-powershell"; + }; printf = buildGrammar { language = "printf"; version = "0.0.0+rev=0e0acea"; @@ -1964,6 +2052,30 @@ }; meta.homepage = "https://github.com/victorhqc/tree-sitter-prisma"; }; + problog = buildGrammar { + language = "problog"; + version = "0.0.0+rev=93c69d2"; + src = fetchFromGitHub { + owner = "foxyseta"; + repo = "tree-sitter-prolog"; + rev = "93c69d2f84d8a167c0a3f4a8d51ccefe365a4dc8"; + hash = "sha256-NWB4PvnVE+L1A7QDKcQtc15YIf8Ik7hKIOUW8XT/pFY="; + }; + location = "grammars/problog"; + meta.homepage = "https://github.com/foxyseta/tree-sitter-prolog"; + }; + prolog = buildGrammar { + language = "prolog"; + version = "0.0.0+rev=93c69d2"; + src = fetchFromGitHub { + owner = "foxyseta"; + repo = "tree-sitter-prolog"; + rev = "93c69d2f84d8a167c0a3f4a8d51ccefe365a4dc8"; + hash = "sha256-NWB4PvnVE+L1A7QDKcQtc15YIf8Ik7hKIOUW8XT/pFY="; + }; + location = "grammars/prolog"; + meta.homepage = "https://github.com/foxyseta/tree-sitter-prolog"; + }; promql = buildGrammar { language = "promql"; version = "0.0.0+rev=77625d7"; @@ -2066,23 +2178,23 @@ }; python = buildGrammar { language = "python"; - version = "0.0.0+rev=71778c2"; + version = "0.0.0+rev=8c65e25"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-python"; - rev = "71778c2a472ed00a64abf4219544edbf8e4b86d7"; - hash = "sha256-hHQ5gK4dTRSdp0fLKarytU9vFhsBeQp7Ka61vFoIr7Y="; + rev = "8c65e256f971812276ff2a69a2f515c218ed7f82"; + hash = "sha256-8mdBN1vP64PJKxN2y0GoaObLs6j/lcsU47sr+8/8oTQ="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-python"; }; ql = buildGrammar { language = "ql"; - version = "0.0.0+rev=42becd6"; + version = "0.0.0+rev=c73c31c"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-ql"; - rev = "42becd6f8f7bae82c818fa3abb1b6ff34b552310"; - hash = "sha256-OFqBI9u5Ik6AoG88v7qTVnol5H9O/n1vaZhoxQ7Sj70="; + rev = "c73c31c89cb0019ef56fe8bc1723e7c36e0be607"; + hash = "sha256-C/FGCN1JAThAAyMgSt8o0yf+qfYKF98jPTitfXrUytI="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-ql"; }; @@ -2099,12 +2211,12 @@ }; qmljs = buildGrammar { language = "qmljs"; - version = "0.0.0+rev=febf48a"; + version = "0.0.0+rev=cc4186f"; src = fetchFromGitHub { owner = "yuja"; repo = "tree-sitter-qmljs"; - rev = "febf48a5b6928600cd8fb2a01254743af550780d"; - hash = "sha256-bRb5h6gBBxbzhxpCxJK8CsQ5BCtPTuKtuZesE/+mDY0="; + rev = "cc4186f15e2829385be33440561fdd17b1c40cf7"; + hash = "sha256-g05fmFG/+DiW8VOCfH+8//ksFNYZ8V9RAn7hGJ7Jl6w="; }; meta.homepage = "https://github.com/yuja/tree-sitter-qmljs"; }; @@ -2121,34 +2233,34 @@ }; r = buildGrammar { language = "r"; - version = "0.0.0+rev=3914005"; + version = "0.0.0+rev=2097fa5"; src = fetchFromGitHub { owner = "r-lib"; repo = "tree-sitter-r"; - rev = "391400572538ff9854341a175ed8ab4b1e45f44b"; - hash = "sha256-KM80Kud7fJzc0qIhd1y3sbdN0mH6b7L16VqOtbGxQBc="; + rev = "2097fa502efa21349d26af0ffee55d773015e481"; + hash = "sha256-a7vgmOY9K8w8vwMlOLBmUnXpWpVP+YlOilGODaI07y4="; }; meta.homepage = "https://github.com/r-lib/tree-sitter-r"; }; racket = buildGrammar { language = "racket"; - version = "0.0.0+rev=171f52a"; + version = "0.0.0+rev=5b211bf"; src = fetchFromGitHub { owner = "6cdh"; repo = "tree-sitter-racket"; - rev = "171f52a8c0ed635b85cd42d1e36d82f1066a03b4"; - hash = "sha256-iuigtcakpqm5vPuxsSV5PR32pwzyPMmldYXaJmzO3d0="; + rev = "5b211bf93021d1c45f39aa96898be9f794f087e4"; + hash = "sha256-ry9j5nEcXiSD+xJYzT0mY37hGeDlVRYq7egUeuw1PfU="; }; meta.homepage = "https://github.com/6cdh/tree-sitter-racket"; }; 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"; }; @@ -2165,12 +2277,12 @@ }; rbs = buildGrammar { language = "rbs"; - version = "0.0.0+rev=88d8ed4"; + version = "0.0.0+rev=8d8e65a"; src = fetchFromGitHub { owner = "joker1007"; repo = "tree-sitter-rbs"; - rev = "88d8ed487b5449ddda2fc0c4fe23b71cba29ca24"; - hash = "sha256-z7Ls0SXh18bRMX+FpVIzaeeuItyeCTOnGgQ3tDyrtSU="; + rev = "8d8e65ac3f77fbc9e15b1cdb9f980a3e0ac3ab99"; + hash = "sha256-M72rShapD813gpBbWUIil6UgcnoF1DVTffMSnTpejgg="; }; meta.homepage = "https://github.com/joker1007/tree-sitter-rbs"; }; @@ -2198,12 +2310,12 @@ }; regex = buildGrammar { language = "regex"; - version = "0.0.0+rev=47007f1"; + version = "0.0.0+rev=f70251e"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-regex"; - rev = "47007f195752d8e57bda80b0b6cdb2d173a9f7d7"; - hash = "sha256-X1CEk4nLxXY1a3PHG+4uSDKAXmsJIhd0nVYieTaHOkk="; + rev = "f70251e1f1d72bd6dc1f897f956f9112f8668441"; + hash = "sha256-G0I71WXSBHttsLfD18W/9RIrNAJN79kMPOcYt/k7KSI="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-regex"; }; @@ -2229,6 +2341,17 @@ }; meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-requirements"; }; + rescript = buildGrammar { + language = "rescript"; + version = "0.0.0+rev=4606cd8"; + src = fetchFromGitHub { + owner = "rescript-lang"; + repo = "tree-sitter-rescript"; + rev = "4606cd81c4c31d1d02390fee530858323410a74c"; + hash = "sha256-md3fgW+h99va2Rwxzub7nrsEe64fC52g6NPCaXGAaxg="; + }; + meta.homepage = "https://github.com/rescript-lang/tree-sitter-rescript"; + }; rnoweb = buildGrammar { language = "rnoweb"; version = "0.0.0+rev=1a74dc0"; @@ -2251,14 +2374,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=ef46edd"; src = fetchFromGitHub { owner = "faldor20"; repo = "tree-sitter-roc"; - rev = "df46a85abda9f948d38f5d4e3684cec49c42fef2"; - hash = "sha256-4E9ZnMizo+1wnnkYSPNKMkTTyDKRJT+JqtUWoJH45aA="; + rev = "ef46edd0c03ea30a22f7e92bc68628fb7231dc8a"; + hash = "sha256-H76cnMlBT1Z/9WXAdoVslImkyy38uCqum9qEnH+Ics8="; }; meta.homepage = "https://github.com/faldor20/tree-sitter-roc"; }; @@ -2286,57 +2420,57 @@ }; ruby = buildGrammar { language = "ruby"; - version = "0.0.0+rev=dc2d7d6"; + version = "0.0.0+rev=a66579f"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-ruby"; - rev = "dc2d7d6b50f9975bc3c35bbec0ba11b2617b736b"; - hash = "sha256-HV/hJwftBTCj9WomIcLB6n0LcQRHAzlQsJBNOxu6XJo="; + rev = "a66579f70d6f50ffd81a16fc3d3358e2ac173c88"; + hash = "sha256-ApuNco5q0hq4/36D7yWv87+d3h33Y9pKtdTUox4tIiw="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-ruby"; }; rust = buildGrammar { language = "rust"; - version = "0.0.0+rev=9c84af0"; + version = "0.0.0+rev=6b7d1fc"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-rust"; - rev = "9c84af007b0f144954adb26b3f336495cbb320a7"; - hash = "sha256-mwnikq3s7Ien68DYT3p9oVGy7xjBgtiJMHAwMj5HXHI="; + rev = "6b7d1fc73ded57f73b1619bcf4371618212208b1"; + hash = "sha256-cK3dswI0lgsuXp8CDOj/mjgnuWsCUvT3DX++kpWJoCI="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-rust"; }; scala = buildGrammar { language = "scala"; - version = "0.0.0+rev=b76db43"; + version = "0.0.0+rev=ec13dd6"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-scala"; - rev = "b76db435a7f876cf1ede837d66054c534783c72f"; - hash = "sha256-AZ1YIsnw3x84T2ubwWoekfy98L2GdgQP0R3tM8DEXLM="; + rev = "ec13dd674bb8dd89213e0d6b1fe45efb68d5878f"; + hash = "sha256-ireSo04kG2RMlCZD1hf6BJcjT7eXjYdOqOsoMtQAwKQ="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-scala"; }; scfg = buildGrammar { language = "scfg"; - version = "0.0.0+rev=6deae0c"; - src = fetchFromSourcehut { - owner = "~rockorager"; + version = "0.0.0+rev=a551280"; + src = fetchFromGitHub { + owner = "rockorager"; repo = "tree-sitter-scfg"; - rev = "6deae0cbb458c849a4d1e2985093e9c9c32d7fd0"; - hash = "sha256-2ubRvjpvRJEBZXpM7ZIkWAwSZARCzP/klydQ6IVpCSk="; + rev = "a5512800ea0220da4abbae61b8aea8423d1549aa"; + hash = "sha256-Je6taNzniyd1c+2NRCF7TOvnpeW4qhYYhdAEcgpDOAA="; }; generate = true; - meta.homepage = "https://git.sr.ht/~rockorager/tree-sitter-scfg"; + meta.homepage = "https://github.com/rockorager/tree-sitter-scfg"; }; scheme = buildGrammar { language = "scheme"; - version = "0.0.0+rev=8f9dff3"; + version = "0.0.0+rev=63e25a4"; src = fetchFromGitHub { owner = "6cdh"; repo = "tree-sitter-scheme"; - rev = "8f9dff3d038f09934db5ea113cebc59c74447743"; - hash = "sha256-QECZQVhWntN+3wnIA+U3JesuoLZiSU7pOrsKRdVPLtk="; + rev = "63e25a4a84142ae7ee0ee01fe3a32c985ca16745"; + hash = "sha256-FK3F7v2LqAtXZM/CKCijWfXTF6TUhLmiVXScZqt46Io="; }; meta.homepage = "https://github.com/6cdh/tree-sitter-scheme"; }; @@ -2351,25 +2485,37 @@ }; meta.homepage = "https://github.com/serenadeai/tree-sitter-scss"; }; + sflog = buildGrammar { + language = "sflog"; + version = "0.0.0+rev=69330ef"; + src = fetchFromGitHub { + owner = "aheber"; + repo = "tree-sitter-sfapex"; + rev = "69330ef89fb6b7b2dd16b639d86811e9262c7369"; + hash = "sha256-OO+KttgnPk18EtYmxNphn3if2p3QRNRrXQTYZOmmglc="; + }; + location = "sflog"; + meta.homepage = "https://github.com/aheber/tree-sitter-sfapex"; + }; slang = buildGrammar { language = "slang"; - version = "0.0.0+rev=865d79e"; + version = "0.0.0+rev=dd991eb"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-slang"; - rev = "865d79e236c7f0e04276c969453d021d1da4b15f"; - hash = "sha256-vZ+Av0lSJaSKUVdEGMtAtXwGIUaIUvS5CvWWfOei/30="; + rev = "dd991eb3b6957a33d9044e0f5914588f7f449a78"; + hash = "sha256-Kt396lw3O3X4I3sEadfhoRVi598UCknOmdCPIMpqgdA="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-slang"; }; slint = buildGrammar { language = "slint"; - version = "0.0.0+rev=d82ab8c"; + version = "0.0.0+rev=34ccfd5"; src = fetchFromGitHub { owner = "slint-ui"; repo = "tree-sitter-slint"; - rev = "d82ab8c19ea1b60ff570256eaef7d137cc5ecb63"; - hash = "sha256-NFKh3Z9vU1KImjU4Yd/Bnxq3E8kz8k/w2TzEvAtffnY="; + rev = "34ccfd58d3baee7636f62d9326f32092264e8407"; + hash = "sha256-2R+TxjM3Pd2a9pyr2SwZd9+YYj1o8KsS+4n5dFxEMMM="; }; meta.homepage = "https://github.com/slint-ui/tree-sitter-slint"; }; @@ -2397,12 +2543,12 @@ }; snakemake = buildGrammar { language = "snakemake"; - version = "0.0.0+rev=5a7b140"; + version = "0.0.0+rev=e909815"; src = fetchFromGitHub { owner = "osthomas"; repo = "tree-sitter-snakemake"; - rev = "5a7b14074bca95b25935e865ca8f1efad32317e4"; - hash = "sha256-mYqftgJOnlWgQZrXaNtFXvjRQgC14PXYyruTVw5J8Zg="; + rev = "e909815acdbe37e69440261ebb1091ed52e1dec6"; + hash = "sha256-d2n1fsdt4+1hv4In+o6GpGyfeyVHpn39Njm7tQ2zyYQ="; }; meta.homepage = "https://github.com/osthomas/tree-sitter-snakemake"; }; @@ -2419,69 +2565,69 @@ }; soql = buildGrammar { language = "soql"; - version = "0.0.0+rev=c99ad4b"; + version = "0.0.0+rev=69330ef"; src = fetchFromGitHub { owner = "aheber"; repo = "tree-sitter-sfapex"; - rev = "c99ad4b16d112fea91745e3f1b769754239fdaba"; - hash = "sha256-tl/MajAsdu7YxQcdFZmupZldhCl6QB//4FwiBR44nm4="; + rev = "69330ef89fb6b7b2dd16b639d86811e9262c7369"; + hash = "sha256-OO+KttgnPk18EtYmxNphn3if2p3QRNRrXQTYZOmmglc="; }; location = "soql"; meta.homepage = "https://github.com/aheber/tree-sitter-sfapex"; }; sosl = buildGrammar { language = "sosl"; - version = "0.0.0+rev=c99ad4b"; + version = "0.0.0+rev=69330ef"; src = fetchFromGitHub { owner = "aheber"; repo = "tree-sitter-sfapex"; - rev = "c99ad4b16d112fea91745e3f1b769754239fdaba"; - hash = "sha256-tl/MajAsdu7YxQcdFZmupZldhCl6QB//4FwiBR44nm4="; + rev = "69330ef89fb6b7b2dd16b639d86811e9262c7369"; + hash = "sha256-OO+KttgnPk18EtYmxNphn3if2p3QRNRrXQTYZOmmglc="; }; location = "sosl"; meta.homepage = "https://github.com/aheber/tree-sitter-sfapex"; }; sourcepawn = buildGrammar { language = "sourcepawn"; - version = "0.0.0+rev=645d093"; + version = "0.0.0+rev=6b9bf9c"; src = fetchFromGitHub { owner = "nilshelmig"; repo = "tree-sitter-sourcepawn"; - rev = "645d093763bcaaf7535edbdf6575a5c978b16491"; - hash = "sha256-P5l0jaDsPXFenVaoLeeGSp6firHpeNM4/v93eshd8l0="; + rev = "6b9bf9cbab91443380d2ca8a2f6c491cc7fac5bf"; + hash = "sha256-2DjGCZ701c2rMxQZM4YF61rZokZUov4ECb0gwAmyuVk="; }; meta.homepage = "https://github.com/nilshelmig/tree-sitter-sourcepawn"; }; sparql = buildGrammar { language = "sparql"; - version = "0.0.0+rev=05f949d"; + version = "0.0.0+rev=d853661"; src = fetchFromGitHub { - owner = "BonaBeavis"; + owner = "GordianDziwis"; 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"; + meta.homepage = "https://github.com/GordianDziwis/tree-sitter-sparql"; }; sql = buildGrammar { language = "sql"; - version = "0.0.0+rev=89fd00d"; + version = "0.0.0+rev=b817500"; src = fetchFromGitHub { owner = "derekstride"; repo = "tree-sitter-sql"; - rev = "89fd00d0aff3bc9985ac37caf362ec4fd9b2ba1d"; - hash = "sha256-QTKggsvVWhszlcYS/WOPkykUyTDgwV1yVJ7jADA/5SM="; + rev = "b8175006d9c8120d41cf40a4ef3711bbbbc08973"; + hash = "sha256-idQB8Wqw7lvU192y7+UgFvcwlmY71/mu9jJ4hRc4ud4="; }; meta.homepage = "https://github.com/derekstride/tree-sitter-sql"; }; squirrel = buildGrammar { language = "squirrel"; - version = "0.0.0+rev=0a50d31"; + version = "0.0.0+rev=072c969"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-squirrel"; - rev = "0a50d31098e83c668d34d1160a0f6c7d23b571cc"; - hash = "sha256-cLMAeDfZiHInA9+Td8FedRVSNv1vFE/bpCftRqV72d0="; + rev = "072c969749e66f000dba35a33c387650e203e96e"; + hash = "sha256-tJBmxTD4hi9zxXMEuAX+uslo45zEawh09+tgv56s/AU="; }; meta.homepage = "https://github.com/amaanq/tree-sitter-squirrel"; }; @@ -2520,23 +2666,23 @@ }; styled = buildGrammar { language = "styled"; - version = "0.0.0+rev=65835cc"; + version = "0.0.0+rev=b729198"; src = fetchFromGitHub { owner = "mskelton"; repo = "tree-sitter-styled"; - rev = "65835cca33a5f033bcde580ed66cde01c1fabbbe"; - hash = "sha256-pcvt3ow6rVYCYbcVzIz3FGWpqoVCPX7zuOj3vKpkOfU="; + rev = "b729198642b3058d4ea0f864d86efb271d594595"; + hash = "sha256-9hj6l3eI5p7q1XQihM19deb7+TdLVscIM31TbDRcqo8="; }; meta.homepage = "https://github.com/mskelton/tree-sitter-styled"; }; supercollider = buildGrammar { language = "supercollider"; - version = "0.0.0+rev=affa438"; + version = "0.0.0+rev=1a8ee0d"; src = fetchFromGitHub { owner = "madskjeldgaard"; repo = "tree-sitter-supercollider"; - rev = "affa4389186b6939d89673e1e9d2b28364f5ca6f"; - hash = "sha256-j4CTKkSdKnSGdgC3zGglmZ6uQvbC2ObQ+WWlY0afSwo="; + rev = "1a8ee0da9a4f2df5a8a22f4d637ac863623a78a7"; + hash = "sha256-G23AZO1zvTvRE9ciV7qMuSoaCYulhyOkwiRwgK06NRQ="; }; meta.homepage = "https://github.com/madskjeldgaard/tree-sitter-supercollider"; }; @@ -2553,23 +2699,23 @@ }; svelte = buildGrammar { language = "svelte"; - version = "0.0.0+rev=7218cf6"; + version = "0.0.0+rev=774a65a"; src = fetchFromGitHub { owner = "tree-sitter-grammars"; repo = "tree-sitter-svelte"; - rev = "7218cf622b057ae9c530e1f0a7a3ce49806ca55e"; - hash = "sha256-mS4KxJXXb/EzQB5H+Pj+/SEbCTerGFjKiJah8oAGA8c="; + rev = "774a65aea563accc35f5d45fafa4d96ec5761f57"; + hash = "sha256-mkw3s0pZQ6ry+fiTk2fJeKVA7Nqyv2Z2R1AFZknzpFM="; }; meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-svelte"; }; swift = buildGrammar { language = "swift"; - version = "0.0.0+rev=d657f98"; + version = "0.0.0+rev=032930d"; src = fetchFromGitHub { owner = "alex-pinkus"; repo = "tree-sitter-swift"; - rev = "d657f98dd6bbc34cb48438c9e5956f15a6d89f1d"; - hash = "sha256-KE+qjTP3UWKvcLJPYIJmEGeKBWAdpCzgW4/vIccueng="; + rev = "032930d6218d8ae23bde074cf29ce8d276b87533"; + hash = "sha256-VhQ+OwkqOVJH9/R2eDVkCJbmh50EmZjVGX8Pk4uMGBw="; }; generate = true; meta.homepage = "https://github.com/alex-pinkus/tree-sitter-swift"; @@ -2587,15 +2733,26 @@ }; systemtap = buildGrammar { language = "systemtap"; - version = "0.0.0+rev=1af543a"; + version = "0.0.0+rev=f2b378a"; src = fetchFromGitHub { owner = "ok-ryoko"; repo = "tree-sitter-systemtap"; - rev = "1af543a96d060b1f808982037bfc54cc02218edd"; - hash = "sha256-KCsISHv9yglW+63UY/9Dhb0yVz7Ha76EyHo65Si6SpY="; + rev = "f2b378a9af0b7e1192cff67a5fb45508c927205d"; + hash = "sha256-HzV6RZMTSa41Q5hMiM1FwiHLbho62fuywtKzqrwjNDQ="; }; meta.homepage = "https://github.com/ok-ryoko/tree-sitter-systemtap"; }; + systemverilog = buildGrammar { + language = "systemverilog"; + version = "0.0.0+rev=4f897d5"; + src = fetchFromGitHub { + owner = "zhangwwpeng"; + repo = "tree-sitter-systemverilog"; + rev = "4f897d5e3f0e38bf8fbb55e8f39dc97d2bc2229e"; + hash = "sha256-guNdS07QqbqegFICNHP1ECX9bc+ZCW9li3ILIZVHRwM="; + }; + meta.homepage = "https://github.com/zhangwwpeng/tree-sitter-systemverilog"; + }; t32 = buildGrammar { language = "t32"; version = "0.0.0+rev=6182836"; @@ -2620,23 +2777,23 @@ }; tact = buildGrammar { language = "tact"; - version = "0.0.0+rev=034df21"; + version = "0.0.0+rev=b3710fe"; src = fetchFromGitHub { owner = "tact-lang"; repo = "tree-sitter-tact"; - rev = "034df2162ed7b654efd999942e266be713c7cde0"; - hash = "sha256-2+MVrDPuhrM0HE9uRG5LpmyXYy73Pv3MY20UXwBXalM="; + rev = "b3710fe2723bd9b285de7f3d0c0717bebf3f17bd"; + hash = "sha256-FJj9kAPHyk0ZenwrwbPJJD+4rs5QTrh6KFIa4tmBr3w="; }; meta.homepage = "https://github.com/tact-lang/tree-sitter-tact"; }; tcl = buildGrammar { language = "tcl"; - version = "0.0.0+rev=8784024"; + version = "0.0.0+rev=cdba4ab"; src = fetchFromGitHub { owner = "tree-sitter-grammars"; repo = "tree-sitter-tcl"; - rev = "8784024358c233efd0f3a6fd9e7a3c5852e628bc"; - hash = "sha256-/uw+Nb5A+DklN+BxMpufSCMb/VOE/zqJNnLZVFwjWtc="; + rev = "cdba4ab96a9896492d0d5219b70300c8783ca4e7"; + hash = "sha256-NEaB52q2GEEy25JMZwbbyE1Aj4UkO17K9KBB2KqmVHQ="; }; meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-tcl"; }; @@ -2654,23 +2811,23 @@ }; templ = buildGrammar { language = "templ"; - version = "0.0.0+rev=cf84ea5"; + version = "0.0.0+rev=0524da9"; src = fetchFromGitHub { owner = "vrischmann"; repo = "tree-sitter-templ"; - rev = "cf84ea53e2e2531f23009d676ac206090c1e2392"; - hash = "sha256-CQ11t4beqkjhtZktrawuavgQPSFzbwJrU/aSbPsqBPA="; + rev = "0524da9e1f14b9b7d7d6d36608293f85a550b263"; + hash = "sha256-4KFJpMZfJP9I66HGMSP5MsZU9dYN95enz4cCoMytt9M="; }; 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"; @@ -2710,23 +2867,23 @@ }; tlaplus = buildGrammar { language = "tlaplus"; - version = "0.0.0+rev=200f9da"; + version = "0.0.0+rev=a9f9c13"; src = fetchFromGitHub { owner = "tlaplus-community"; repo = "tree-sitter-tlaplus"; - rev = "200f9dab6b23f3b9bb8f67fc811221517f56c373"; - hash = "sha256-oIyZ+x0bRnxVAQGiuPgFXjHwZ/MSdC9Ge52cG3oYS3E="; + rev = "a9f9c136baa9b73c63850be92301fb5f1fc9b2fd"; + hash = "sha256-BakN8qW6IyEK2GfSpPDogiJXTZXGjRiHN0LNyVH7Z2Q="; }; meta.homepage = "https://github.com/tlaplus-community/tree-sitter-tlaplus"; }; tmux = buildGrammar { language = "tmux"; - version = "0.0.0+rev=9138ea5"; + version = "0.0.0+rev=0252ecd"; src = fetchFromGitHub { owner = "Freed-Wu"; repo = "tree-sitter-tmux"; - rev = "9138ea508410e0f34da2666609f600f65e944f22"; - hash = "sha256-aoKrrDvOM4yOgE7rulGBoN1GeBBHN+dPfyNytC4oMC4="; + rev = "0252ecd080016e45e6305ef1a943388f5ae2f4b4"; + hash = "sha256-8f78qYxqoiOAnl3HzEbF4Rci3rFy0SnELoU+QP7pUlk="; }; meta.homepage = "https://github.com/Freed-Wu/tree-sitter-tmux"; }; @@ -2739,7 +2896,7 @@ rev = "3937c5cd105ec4127448651a21aef45f52d19609"; hash = "sha256-OeAh51rcFTiexAraRzIZUR/A8h9RPwKY7rmtc3ZzoRQ="; }; - meta.homepage = "https://github.com/arnarg/tree-sitter-todotxt.git"; + meta.homepage = "https://github.com/arnarg/tree-sitter-todotxt"; }; toml = buildGrammar { language = "toml"; @@ -2766,26 +2923,26 @@ }; tsx = buildGrammar { language = "tsx"; - version = "0.0.0+rev=4f3eb66"; + version = "0.0.0+rev=9951831"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-typescript"; - rev = "4f3eb6655a1cd1a1f87ef10201f8e22886dcd76e"; - hash = "sha256-f/xk4MdGVvkZv0642aOwA9UFZSb0GvoLu+jgXUp/bhw="; + rev = "9951831c5f05be434514dce38b30eef213667601"; + hash = "sha256-CFEYTfEqJdAQMaKRB1wThDTiqPcq5u53WAQhgI2+PN0="; }; location = "tsx"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-typescript"; }; turtle = buildGrammar { language = "turtle"; - version = "0.0.0+rev=085437f"; + version = "0.0.0+rev=7f789ea"; src = fetchFromGitHub { - owner = "BonaBeavis"; + owner = "GordianDziwis"; repo = "tree-sitter-turtle"; - rev = "085437f5cb117703b7f520dd92161140a684f092"; - hash = "sha256-ub777Pjody2SvP2EjW7IwWj8YnMuMzdJ4AlrkP6WrdA="; + rev = "7f789ea7ef765080f71a298fc96b7c957fa24422"; + hash = "sha256-z6f73euFAG9du5owz7V9WLbWK81Jg0DwxN1metKPbTA="; }; - meta.homepage = "https://github.com/BonaBeavis/tree-sitter-turtle"; + meta.homepage = "https://github.com/GordianDziwis/tree-sitter-turtle"; }; twig = buildGrammar { language = "twig"; @@ -2800,24 +2957,24 @@ }; typescript = buildGrammar { language = "typescript"; - version = "0.0.0+rev=4f3eb66"; + version = "0.0.0+rev=9951831"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-typescript"; - rev = "4f3eb6655a1cd1a1f87ef10201f8e22886dcd76e"; - hash = "sha256-f/xk4MdGVvkZv0642aOwA9UFZSb0GvoLu+jgXUp/bhw="; + rev = "9951831c5f05be434514dce38b30eef213667601"; + hash = "sha256-CFEYTfEqJdAQMaKRB1wThDTiqPcq5u53WAQhgI2+PN0="; }; location = "typescript"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-typescript"; }; typespec = buildGrammar { language = "typespec"; - version = "0.0.0+rev=28821d0"; + version = "0.0.0+rev=0ee0554"; src = fetchFromGitHub { owner = "happenslol"; repo = "tree-sitter-typespec"; - rev = "28821d0d6da5f0a6b5eb02b9bad953fecafd7248"; - hash = "sha256-MzUcz6vnsakszAMJtTOajniFC72sCREdrMhS/zDa3Ng="; + rev = "0ee05546d73d8eb64635ed8125de6f35c77759fe"; + hash = "sha256-qXA87soeEdlpzj8svEao8L0F5V14NSZc1WsX9z0PVB0="; }; meta.homepage = "https://github.com/happenslol/tree-sitter-typespec"; }; @@ -2834,12 +2991,12 @@ }; typst = buildGrammar { language = "typst"; - version = "0.0.0+rev=3924cb9"; + version = "0.0.0+rev=abe60cb"; src = fetchFromGitHub { owner = "uben0"; repo = "tree-sitter-typst"; - rev = "3924cb9ed9e0e62ce7df9c4fe0faa4c234795999"; - hash = "sha256-W8mNIASM85btE3XychvagVJofIb+CkNT4XeIhdQt8FU="; + rev = "abe60cbed7986ee475d93f816c1be287f220c5d8"; + hash = "sha256-hwM1oEzABe9sqY0mpDXSfwT+tQsLV5ZNSG8yJhES6Qg="; }; meta.homepage = "https://github.com/uben0/tree-sitter-typst"; }; @@ -2901,12 +3058,12 @@ }; v = buildGrammar { language = "v"; - version = "0.0.0+rev=e91f8a4"; + version = "0.0.0+rev=4f93826"; src = fetchFromGitHub { owner = "vlang"; repo = "v-analyzer"; - rev = "e91f8a42de7842f24f4ce600754f2b6651985fd4"; - hash = "sha256-38nerR7oZBwxXWd08QqEEMSxAZqXRHCRdLbMEbRhcQI="; + rev = "4f93826aeb31066eb241f4ccbca61f052239803f"; + hash = "sha256-Tl4q6QksNu7Pm0Pt8rJka6o55LNN2GN6zK732XmLXb8="; }; location = "tree_sitter_v"; meta.homepage = "https://github.com/vlang/v-analyzer"; @@ -2944,25 +3101,36 @@ }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-verilog"; }; + vhdl = buildGrammar { + language = "vhdl"; + version = "0.0.0+rev=3f13cd1"; + src = fetchFromGitHub { + owner = "jpt13653903"; + repo = "tree-sitter-vhdl"; + rev = "3f13cd14952b39ccf6817f58880834b84565ca54"; + hash = "sha256-bChHzBGWlfJpSUpUqQW8L1y4CiM1Qqen3MaGcUT9lh0="; + }; + meta.homepage = "https://github.com/jpt13653903/tree-sitter-vhdl"; + }; vhs = buildGrammar { language = "vhs"; - version = "0.0.0+rev=90028bb"; + version = "0.0.0+rev=09f8fbf"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "tree-sitter-vhs"; - rev = "90028bbadb267ead5b87830380f6a825147f0c0f"; - hash = "sha256-yxUVca44z4wtYsxQKaJQjMm0fFeKAOWFnIX+5k6+SJk="; + rev = "09f8fbfe40a3a699b200daca7d92e65fbbe9f9e6"; + hash = "sha256-TUA94sJVWGK0KdvMueyQDmU+AlhdCOg0mlwcfL0XG8E="; }; meta.homepage = "https://github.com/charmbracelet/tree-sitter-vhs"; }; vim = buildGrammar { language = "vim"; - version = "0.0.0+rev=b448ca6"; + version = "0.0.0+rev=f3cd62d"; src = fetchFromGitHub { owner = "neovim"; repo = "tree-sitter-vim"; - rev = "b448ca63f972ade12c373c808acdd2bf972937db"; - hash = "sha256-wQQSeDzcSY9qNVgeDhrELS1x1UoilRa7iHML9qSgchY="; + rev = "f3cd62d8bd043ef20507e84bb6b4b53731ccf3a7"; + hash = "sha256-KVaTJKU7r7zk57Fn9zl5s34oq8tsLkSRV3VHM6Q6F+s="; }; meta.homepage = "https://github.com/neovim/tree-sitter-vim"; }; @@ -2977,6 +3145,17 @@ }; meta.homepage = "https://github.com/neovim/tree-sitter-vimdoc"; }; + vrl = buildGrammar { + language = "vrl"; + version = "0.0.0+rev=274b3ce"; + src = fetchFromGitHub { + owner = "belltoy"; + repo = "tree-sitter-vrl"; + rev = "274b3ce63f72aa8ffea18e7fc280d3062d28f0ba"; + hash = "sha256-R+wuG8UkvGA11uTiiUAdzzgjRv1ik4W+qh3YwIREUd4="; + }; + meta.homepage = "https://github.com/belltoy/tree-sitter-vrl"; + }; vue = buildGrammar { language = "vue"; version = "0.0.0+rev=22bdfa6"; @@ -3001,56 +3180,56 @@ }; 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"; }; wing = buildGrammar { language = "wing"; - version = "0.0.0+rev=bd1d35c"; + version = "0.0.0+rev=76e0c25"; src = fetchFromGitHub { owner = "winglang"; repo = "tree-sitter-wing"; - rev = "bd1d35cf3e013dc7e189b46a593bdc2b281b0dd7"; - hash = "sha256-jygMTswZ8r4tUJQ0lUH8GHz56dyGd6rV1wL5i75Ni88="; + rev = "76e0c25844a66ebc6e866d690fcc5f4e90698947"; + hash = "sha256-N16cZK1dERqFd1FR35AfrsBy5EeeOPSp0FaZ83pMt7I="; }; meta.homepage = "https://github.com/winglang/tree-sitter-wing"; }; wit = buildGrammar { language = "wit"; - version = "0.0.0+rev=cab9479"; + version = "0.0.0+rev=c52f0b0"; src = fetchFromGitHub { owner = "liamwh"; repo = "tree-sitter-wit"; - rev = "cab94791450524a542324d8cbe8017d69c516d8e"; - hash = "sha256-R8b+UQmj+JtiIGDsvR5KBTGoX99m0k/HJx2bTGNxRH0="; + rev = "c52f0b07786603df17ad0197f6cef680f312eb2c"; + hash = "sha256-0MyRMippVOdb0RzyJQhPwX7GlWzFV9Z+/mghYuUW7NU="; }; meta.homepage = "https://github.com/liamwh/tree-sitter-wit"; }; 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"; @@ -3090,24 +3269,24 @@ }; zathurarc = buildGrammar { language = "zathurarc"; - version = "0.0.0+rev=6e7c8ed"; + version = "0.0.0+rev=0554b4a"; src = fetchFromGitHub { owner = "Freed-Wu"; repo = "tree-sitter-zathurarc"; - rev = "6e7c8edfcd6f5f7c12b2fa9ffc6d042f1b6d7068"; - hash = "sha256-tr9igIwfxXJJZAanRmDAhG3uu1vdT2nfW3Ng3EZ0094="; + rev = "0554b4a5d313244b7fc000cbb41c04afae4f4e31"; + hash = "sha256-edwLcz1WlcRJOoV2Unpho8wmi7TmcpwysBOAdRKprNw="; }; meta.homepage = "https://github.com/Freed-Wu/tree-sitter-zathurarc"; }; zig = buildGrammar { language = "zig"; - version = "0.0.0+rev=7c5a29b"; + version = "0.0.0+rev=eb7d58c"; src = fetchFromGitHub { - owner = "maxxnino"; + owner = "tree-sitter-grammars"; repo = "tree-sitter-zig"; - rev = "7c5a29b721d409be8842017351bf007d7e384401"; - hash = "sha256-UXJCh8GvXzn+sssTrIsLViXD3TiBZhLFABYCKM+fNMQ="; + rev = "eb7d58c2dc4fbeea4745019dee8df013034ae66b"; + hash = "sha256-iyb79SiMsV94RrWH/1Oi2aKBiX5io0Dp+zZf8qWZHwg="; }; - meta.homepage = "https://github.com/maxxnino/tree-sitter-zig"; + meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-zig"; }; } diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix index 8e3b39e6c1771..137d364e54729 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix @@ -4,9 +4,17 @@ self: super: let inherit (neovimUtils) grammarToPlugin; - generatedGrammars = callPackage ./generated.nix { + + initialGeneratedGrammars = callPackage ./generated.nix { inherit (tree-sitter) buildGrammar; }; + grammarOverrides = final: prev: { + nix = prev.nix.overrideAttrs { + # workaround for https://github.com/NixOS/nixpkgs/issues/332580 + prePatch = "rm queries/highlights.scm"; + }; + }; + generatedGrammars = lib.fix (lib.extends grammarOverrides (_: initialGeneratedGrammars)); generatedDerivations = lib.filterAttrs (_: lib.isDerivation) generatedGrammars; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 1eb32501131a8..46264c4622268 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -15,7 +15,11 @@ , python3 , rustPlatform , # Misc dependencies - Cocoa + arrow-cpp +, Cocoa +, coc-clangd +, coc-diagnostic +, coc-pyright , code-minimap , dasht , deno @@ -25,7 +29,6 @@ , fzf , gawk , git -, gnome , himalaya , htop , jq @@ -33,19 +36,22 @@ , languagetool , llvmPackages , meson +, neovim-unwrapped , nim1 , nodePackages , openscad , pandoc , parinfer-rust , phpactor +, ranger , ripgrep , skim , sqlite , statix , stylish-haskell , tabnine -, taskwarrior +, taskwarrior2 +, taskwarrior3 , tmux , tup , vim @@ -58,6 +64,7 @@ , xorg , xxd , zathura +, zenity , zsh , # codeium-nvim dependencies codeium @@ -79,12 +86,15 @@ , CoreServices , # nvim-treesitter dependencies callPackage +, # Preview-nvim dependencies + md-tui , # sg.nvim dependencies darwin , # sved dependencies glib , gobject-introspection , wrapGAppsHook3 +, writeText , # sniprun dependencies bashInteractive , coreutils @@ -120,24 +130,41 @@ , # hurl dependencies hurl , # must be lua51Packages - luaPackages -, luajitPackages + luajitPackages +, aider-chat , }: self: super: +let + luaPackages = neovim-unwrapped.lua.pkgs; +in { alpha-nvim = super.alpha-nvim.overrideAttrs { - dependencies = [ - self.nvim-web-devicons # required by the startify theme - ]; nvimRequireCheck = "alpha"; }; + advanced-git-search-nvim = super.advanced-git-search-nvim.overrideAttrs { + dependencies = with super; [ telescope-nvim vim-fugitive vim-rhubarb ]; + }; + + animation-nvim = super.animation-nvim.overrideAttrs { + dependencies = with self; [ middleclass ]; + nvimRequireCheck = "animation"; + }; + autosave-nvim = super.autosave-nvim.overrideAttrs { dependencies = with super; [ plenary-nvim ]; }; + avante-nvim = (callPackage ./avante-nvim { }).overrideAttrs { + dependencies = with self; [ + dressing-nvim + nui-nvim + plenary-nvim + ]; + }; + barbecue-nvim = super.barbecue-nvim.overrideAttrs { - dependencies = with self; [ nvim-lspconfig nvim-navic nvim-web-devicons ]; + dependencies = with self; [ nvim-lspconfig nvim-navic ]; meta = { description = "VS Code like winbar for Neovim"; homepage = "https://github.com/utilyre/barbecue.nvim"; @@ -219,6 +246,10 @@ ''; }; + cmake-tools-nvim = super.cmake-tools-nvim.overrideAttrs { + dependencies = with self; [ plenary-nvim ]; + }; + cmp-ai = super.cmp-ai.overrideAttrs { dependencies = with self; [ nvim-cmp plenary-nvim ]; }; @@ -324,6 +355,22 @@ dependencies = with self; [ nvim-cmp zsh ]; }; + coc-clangd = buildVimPlugin { + inherit (coc-clangd) pname version meta; + src = "${coc-clangd}/lib/node_modules/coc-clangd"; + }; + + coc-diagnostic = buildVimPlugin { + inherit (coc-diagnostic) pname version meta; + src = "${coc-diagnostic}/lib/node_modules/coc-diagnostic"; + }; + + coc-pyright = buildVimPlugin { + pname = "coc-pyright"; + inherit (coc-pyright) version meta; + src = "${coc-pyright}/lib/node_modules/coc-pyright"; + }; + coc-nginx = buildVimPlugin { pname = "coc-nginx"; inherit (nodePackages."@yaegassy/coc-nginx") version meta; @@ -332,12 +379,12 @@ codeium-nvim = let # Update according to https://github.com/Exafunction/codeium.nvim/blob/main/lua/codeium/versions.json - codeiumVersion = "1.8.25"; + codeiumVersion = "1.16.18"; codeiumHashes = { - x86_64-linux = "sha256-6sIYDI6+1/p54Af+E/GmRAFlfDYJVwxhn0qF47ZH+Zg="; - aarch64-linux = "sha256-1ImcjAqCZm5KZZYHWhG1eO7ipAdrP4Qjj2eBxTst++s="; - x86_64-darwin = "sha256-yHthItxZYFejJlwJJ7BrM2csnLsZXjy/IbzF1iaCCyI="; - aarch64-darwin = "sha256-GIx0yABISj/rH/yVkkx6NBs5qF0P8nhpMyvnzXJ92mA="; + x86_64-linux = "sha256-/m+t4abPgVWeGpfDkPm5DGCIXm1LoM5znHfES9lotAo="; + aarch64-linux = "sha256-0kR799yuxSFmyedJ14f5/EqOiFHs9cWjeJKvDIpIRl0="; + x86_64-darwin = "sha256-7Go5qZVAe2UHn547HZG4fmh84iF2r15+0IIlJK72Fqg="; + aarch64-darwin = "sha256-fe4GrgLRr66Qmme3p0X5BEwvKZhqG1aiE8xs5A1Dt6E="; }; codeium' = codeium.overrideAttrs rec { @@ -406,12 +453,12 @@ codesnap-nvim = let - version = "1.3.1"; + version = "1.6.1"; src = fetchFromGitHub { owner = "mistricky"; repo = "codesnap.nvim"; rev = "refs/tags/v${version}"; - hash = "sha256-nS/bAWsBQ1L4M9437Yp6FdmHoogzalKlLIAXnRZyMp0="; + hash = "sha256-OmSgrTYDtNb2plMyzjVvxGrfXB/lGKDpUQhpRqKfAMA="; }; codesnap-lib = rustPlatform.buildRustPackage { pname = "codesnap-lib"; @@ -419,7 +466,7 @@ sourceRoot = "${src.name}/generator"; - cargoHash = "sha256-FTQl5WIGEf+RQKYJ4BbIE3cCeN+NYUp7VXIrpxB05tU="; + cargoHash = "sha256-6n37n8oHIHrz3S1+40nuD0Ud3l0iNgXig1ZwrgsnYTI="; nativeBuildInputs = [ pkg-config @@ -428,7 +475,7 @@ buildInputs = [ libuv.dev - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit ]; }; @@ -442,7 +489,7 @@ # Note: the destination should be generator.so, even on darwin # https://github.com/mistricky/codesnap.nvim/blob/main/scripts/build_generator.sh postInstall = let - extension = if stdenv.isDarwin then "dylib" else "so"; + extension = if stdenv.hostPlatform.isDarwin then "dylib" else "so"; in '' rm -r $out/lua/*.so cp ${codesnap-lib}/lib/libgenerator.${extension} $out/lua/generator.so @@ -451,7 +498,10 @@ doInstallCheck = true; nvimRequireCheck = "codesnap"; - meta.homepage = "https://github.com/mistricky/codesnap.nvim/"; + meta = { + homepage = "https://github.com/mistricky/codesnap.nvim/"; + changelog = "https://github.com/mistricky/codesnap.nvim/releases/tag/v${version}"; + }; }; command-t = super.command-t.overrideAttrs { @@ -535,6 +585,53 @@ patches = [ ./patches/coq_nvim/emulate-venv.patch ]; }; + cord-nvim = + let + version = "2024-07-19"; + src = fetchFromGitHub { + owner = "vyfor"; + repo = "cord.nvim"; + rev = "cd97c25320fb0a672b11bcd95d8332bb3088ecce"; + hash = "sha256-66NtKteM1mvHP5wAU4e9JbsF+bq91lmCDcTh/6RPhoo="; + }; + extension = if stdenv.hostPlatform.isDarwin then "dylib" else "so"; + rustPackage = rustPlatform.buildRustPackage { + pname = "cord.nvim-rust"; + inherit version src; + + cargoHash = "sha256-6FYf4pHEPxvhKHHPmkjQ40zPxaiypnpDxF8kNH+h+tg="; + + installPhase = let + cargoTarget = stdenv.hostPlatform.rust.cargoShortTarget; + in '' + install -D target/${cargoTarget}/release/libcord.${extension} $out/lib/cord.${extension} + ''; + }; + in + buildVimPlugin { + pname = "cord.nvim"; + inherit version src; + + nativeBuildInputs = [ + rustPackage + ]; + + buildPhase = '' + install -D ${rustPackage}/lib/cord.${extension} cord.${extension} + ''; + + installPhase = '' + install -D cord $out/lua/cord.${extension} + ''; + + doInstallCheck = true; + nvimRequireCheck = "cord"; + + meta = { + homepage = "https://github.com/vyfor/cord.nvim"; + }; + }; + cornelis = super.cornelis.overrideAttrs { dependencies = with self; [ vim-textobj-user ]; opt = with self; [ vim-which-key ]; @@ -587,6 +684,30 @@ ''; }; + ddc-filter-matcher_head = super.ddc-filter-matcher_head.overrideAttrs { + dependencies = with self; [ ddc-vim ]; + }; + + ddc-source-lsp = super.ddc-source-lsp.overrideAttrs { + dependencies = with self; [ ddc-vim ]; + }; + + ddc-vim = super.ddc-vim.overrideAttrs { + dependencies = with self; [ denops-vim ]; + }; + + ddc-filter-sorter_rank = super.ddc-filter-sorter_rank.overrideAttrs { + dependencies = with self; [ ddc-vim ]; + }; + + ddc-ui-native = super.ddc-ui-native.overrideAttrs { + dependencies = with self; [ ddc-vim ]; + }; + + ddc-ui-pum = super.ddc-ui-pum.overrideAttrs { + dependencies = with self; [ ddc-vim pum-vim ]; + }; + defx-nvim = super.defx-nvim.overrideAttrs { dependencies = with self; [ nvim-yarp ]; }; @@ -603,7 +724,7 @@ }; deoplete-go = super.deoplete-go.overrideAttrs { - buildInputs = [ python3 ]; + nativeBuildInputs = [ (python3.withPackages (ps: with ps; [ setuptools ])) ]; buildPhase = '' pushd ./rplugin/python3/deoplete/ujson python3 setup.py build --build-base=$PWD/build --build-lib=$PWD/build @@ -623,6 +744,10 @@ }; }; + diagram-nvim = super.diagram-nvim.overrideAttrs { + dependencies = with self; [ image-nvim ]; + }; + diffview-nvim = super.diffview-nvim.overrideAttrs { dependencies = with self; [ plenary-nvim ]; @@ -714,7 +839,7 @@ ''; }; - fzf-hoogle-vim = super.fzf-hoogle-vim.overrideAttrs { + fzf-hoogle-vim = super.fzf-hoogle-vim.overrideAttrs (oa: { # add this to your lua config to prevent the plugin from trying to write in the # nix store: # vim.g.hoogle_fzf_cache_file = vim.fn.stdpath('cache')..'/hoogle_cache.json' @@ -723,7 +848,11 @@ gawk ]; dependencies = with self; [ fzf-vim ]; - }; + passthru = oa.passthru // { + + initLua = "vim.g.hoogle_fzf_cache_file = vim.fn.stdpath('cache')..'/hoogle_cache.json"; + }; + }); fzf-lua = super.fzf-lua.overrideAttrs { propagatedBuildInputs = [ fzf ]; @@ -756,6 +885,10 @@ dependencies = with self; [ plenary-nvim ]; }; + git-worktree-nvim = super.git-worktree-nvim.overrideAttrs { + dependencies = with super; [ plenary-nvim ]; + }; + guard-nvim = super.guard-nvim.overrideAttrs { dependencies = with self; [ guard-collection ]; }; @@ -783,6 +916,8 @@ dependencies = with self; [ nvim-treesitter ]; }; + haskell-tools-nvim = neovimUtils.buildNeovimPlugin { luaAttr = luaPackages.haskell-tools-nvim; }; + hex-nvim = super.hex-nvim.overrideAttrs { postPatch = '' substituteInPlace lua/hex.lua --replace xxd ${xxd}/bin/xxd @@ -864,12 +999,12 @@ inherit version; src = LanguageClient-neovim-src; - cargoSha256 = "H34UqJ6JOwuSABdOup5yKeIwFrGc83TUnw1ggJEx9o4="; - buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; + cargoHash = "sha256-H34UqJ6JOwuSABdOup5yKeIwFrGc83TUnw1ggJEx9o4="; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; # FIXME: Use impure version of CoreFoundation because of missing symbols. # Undefined symbols for architecture x86_64: "_CFURLResourceIsReachable" - preConfigure = lib.optionalString stdenv.isDarwin '' + preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin '' export NIX_LDFLAGS="-F${CoreFoundation}/Library/Frameworks -framework CoreFoundation $NIX_LDFLAGS" ''; }; @@ -923,10 +1058,21 @@ dependencies = with self; [ plenary-nvim ]; }; + lsp-progress-nvim = neovimUtils.buildNeovimPlugin { + luaAttr = luaPackages.lsp-progress-nvim; + nvimRequireCheck = "lsp-progress"; + }; + luasnip = super.luasnip.overrideAttrs { dependencies = with self; [ luaPackages.jsregexp ]; }; + lz-n = neovimUtils.buildNeovimPlugin { luaAttr = luaPackages.lz-n; }; + + lze = neovimUtils.buildNeovimPlugin { luaAttr = luaPackages.lze; }; + + lzn-auto-require = neovimUtils.buildNeovimPlugin { luaAttr = luaPackages.lzn-auto-require; }; + magma-nvim-goose = buildVimPlugin { pname = "magma-nvim-goose"; version = "2023-03-13"; @@ -996,6 +1142,11 @@ meta.maintainers = with lib.maintainers; [ vcunat ]; }; + middleclass = neovimUtils.buildNeovimPlugin { + luaAttr = luaPackages.middleclass; + nvimRequireCheck = "middleclass"; + }; + minimap-vim = super.minimap-vim.overrideAttrs { preFixup = '' substituteInPlace $out/plugin/minimap.vim \ @@ -1020,6 +1171,34 @@ meta.homepage = "https://github.com/jose-elias-alvarez/minsnip.nvim/"; }; + moveline-nvim = let + version = "2024-07-25"; + src = fetchFromGitHub { + owner = "willothy"; + repo = "moveline.nvim"; + rev = "9f67f4b9e752a87eea8205f0279f261a16c733d8"; + sha256 = "sha256-B4t5+Q4Urx5bGm8glNpYkHhpp/rAhz+lDd2EpWFUYoY="; + }; + moveline-lib = rustPlatform.buildRustPackage { + inherit src version; + pname = "moveline-lib"; + cargoHash = "sha256-e9QB4Rfm+tFNrLAHN/nYUQ5PiTET8knQQIQkMH3UFkU="; + }; + in buildVimPlugin { + inherit src version; + pname = "moveline-nvim"; + preInstall = '' + mkdir -p lua + ln -s ${moveline-lib}/lib/libmoveline.so lua/moveline.so + ''; + meta = { + description = "Neovim plugin for moving lines up and down"; + homepage = "https://github.com/willothy/moveline.nvim"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ redxtech ]; + }; + }; + multicursors-nvim = super.multicursors-nvim.overrideAttrs { dependencies = with self; [ nvim-treesitter hydra-nvim ]; }; @@ -1053,8 +1232,11 @@ dependencies = with self; [ plenary-nvim ]; }; - neorg = super.neorg.overrideAttrs { - dependencies = with self; [ plenary-nvim ]; + neorg = neovimUtils.buildNeovimPlugin { + luaAttr = luaPackages.neorg; + + doInstallCheck = true; + nvimRequireCheck = "neorg"; }; neotest = super.neotest.overrideAttrs { @@ -1073,6 +1255,10 @@ dependencies = [ self.telescope-nvim ]; }; + neotest-golang = super.neotest-golang.overrideAttrs { + dependencies = [ self.nvim-dap-go ]; + }; + neo-tree-nvim = super.neo-tree-nvim.overrideAttrs { dependencies = with self; [ plenary-nvim nui-nvim ]; }; @@ -1104,6 +1290,10 @@ nvimRequireCheck = "dapui"; }; + nvim-dap-rr = super.nvim-dap-rr.overrideAttrs { + dependencies = [ self.nvim-dap ]; + }; + nvim-genghis = super.nvim-genghis.overrideAttrs { dependencies = [ self.dressing-nvim ]; @@ -1131,8 +1321,11 @@ dbee-go = buildGoModule { name = "nvim-dbee"; src = "${oa.src}/dbee"; - vendorHash = "sha256-AItvgOehVskGLARJWDnJLtWM5YHKN/zn/FnZQ0evAtI="; - buildInputs = [ duckdb ]; + vendorHash = "sha256-U/3WZJ/+Bm0ghjeNUILsnlZnjIwk3ySaX3Rd4L9Z62A="; + buildInputs = [ + arrow-cpp + duckdb + ]; }; in { dependencies = [ self.nui-nvim ]; @@ -1162,11 +1355,16 @@ inherit (old) version src; sourceRoot = "${old.src.name}/spectre_oxi"; - cargoHash = "sha256-ZBlxJjkHb2buvXK6VGP6FMnSFk8RUX7IgHjNofnGDAs="; + cargoHash = "sha256-D7KUJ8q521WWgUqBBOgepGJ3NQ4DdKr+Bg/4k3Lf+mw="; preCheck = '' mkdir tests/tmp/ ''; + + checkFlags = [ + # Flaky test (https://github.com/nvim-pack/nvim-spectre/issues/244) + "--skip=tests::test_replace_simple" + ]; }; in { @@ -1229,6 +1427,10 @@ dependencies = with self; [ (nvim-treesitter.withPlugins (p: [ p.org ])) ]; }; + otter-nvim = super.otter-nvim.overrideAttrs { + dependencies = [ self.nvim-lspconfig ]; + }; + overseer-nvim = super.overseer-nvim.overrideAttrs { doCheck = true; checkPhase = '' @@ -1271,10 +1473,36 @@ 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 ]; }; + ranger-nvim = super.ranger-nvim.overrideAttrs { + patches = [ ./patches/ranger.nvim/fix-paths.patch ]; + + postPatch = '' + substituteInPlace lua/ranger-nvim.lua --replace '@ranger@' ${ranger}/bin/ranger + ''; + }; + + aider-nvim = super.aider-nvim.overrideAttrs { + patches = [ ./patches/aider.nvim/fix-paths.patch ]; + + postPatch = '' + substituteInPlace lua/aider.lua --replace '@aider@' ${aider-chat}/bin/aider + substituteInPlace lua/helpers.lua --replace '@aider@' ${aider-chat}/bin/aider + ''; + }; + refactoring-nvim = super.refactoring-nvim.overrideAttrs { dependencies = with self; [ nvim-treesitter plenary-nvim ]; }; @@ -1287,27 +1515,31 @@ ]; }; - rocks-nvim = neovimUtils.buildNeovimPlugin { luaAttr = "rocks-nvim"; }; + rocks-nvim = neovimUtils.buildNeovimPlugin { luaAttr = luaPackages.rocks-nvim; }; - rocks-config-nvim = neovimUtils.buildNeovimPlugin { luaAttr = "rocks-config-nvim"; }; + rocks-config-nvim = neovimUtils.buildNeovimPlugin { luaAttr = luaPackages.rocks-config-nvim; }; roslyn-nvim = super.roslyn-nvim.overrideAttrs { dependencies = with self; [ nvim-lspconfig ]; }; + rtp-nvim = neovimUtils.buildNeovimPlugin { luaAttr = luaPackages.rtp-nvim; }; + + rustaceanvim = neovimUtils.buildNeovimPlugin { luaAttr = luaPackages.rustaceanvim; }; + sg-nvim = super.sg-nvim.overrideAttrs (old: let sg-nvim-rust = rustPlatform.buildRustPackage { pname = "sg-nvim-rust"; inherit (old) version src; - cargoHash = "sha256-dqa5Rd3NeOSqv18F1QdkrWEypJ0bvVwIDwrMOyBVsDM="; + cargoHash = "sha256-7Bo0DSRqxA7kgNuyuWw24r3PsP92y9h98SHFtIhG+Gs="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.SystemConfiguration ]; @@ -1342,24 +1574,28 @@ dependencies = [ self.skim ]; }; + smart-open-nvim = super.smart-open-nvim.overrideAttrs { + dependencies = with self; [ telescope-nvim sqlite-lua ]; + }; + sniprun = let - version = "1.3.13"; + version = "1.3.16"; src = fetchFromGitHub { owner = "michaelb"; repo = "sniprun"; rev = "refs/tags/v${version}"; - hash = "sha256-PQ3nAZ+bMbHHJWD7cV6h1b3g3TzrakA/N8vVumIooMg="; + hash = "sha256-2rVeBUkdLXUiHkd8slyiLTYQBKwgMQvIi/uyCToVBYA="; }; sniprun-bin = rustPlatform.buildRustPackage { pname = "sniprun-bin"; inherit version src; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; - cargoHash = "sha256-I8R2V9zoLqiM4lu0D7URoVof68wtKHI+8T8fVrUg7i4="; + cargoHash = "sha256-eZcWS+DWec0V9G6hBnZRUNcb3uZeSiBhn4Ed9KodFV8="; nativeBuildInputs = [ makeWrapper ]; @@ -1381,6 +1617,12 @@ ''; propagatedBuildInputs = [ sniprun-bin ]; + + meta = { + homepage = "https://github.com/michaelb/sniprun/"; + changelog = "https://github.com/michaelb/sniprun/blob/v${version}/CHANGELOG.md"; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; }; # The GitHub repository returns 404, which breaks the update script @@ -1396,7 +1638,7 @@ meta.homepage = "https://github.com/ackyshake/Spacegray.vim/"; }; - sqlite-lua = super.sqlite-lua.overrideAttrs { + sqlite-lua = super.sqlite-lua.overrideAttrs (oa: { postPatch = let libsqlite = "${sqlite.out}/lib/libsqlite3${stdenv.hostPlatform.extensions.sharedLibrary}"; @@ -1405,7 +1647,11 @@ substituteInPlace lua/sqlite/defs.lua \ --replace "path = vim.g.sqlite_clib_path" "path = vim.g.sqlite_clib_path or ${lib.escapeShellArg libsqlite}" ''; - }; + + passthru = oa.passthru // { + initLua = ''vim.g.sqlite_clib_path = "${sqlite.out}/lib/libsqlite3${stdenv.hostPlatform.extensions.sharedLibrary}"''; + }; + }); ssr = super.ssr-nvim.overrideAttrs { dependencies = with self; [ nvim-treesitter ]; @@ -1453,21 +1699,38 @@ install -Dt $out/bin ftplugin/evinceSync.py ''; }; + # the vim plugin expects evinceSync.py to be a python file, but it is a C wrapper + pythonWrapper = writeText "evinceSync-wrapper.py" /* python */ '' + #!${python3}/bin/python3 + import os + import sys + os.execv("${svedbackend}/bin/evinceSync.py", sys.argv) + ''; in super.sved.overrideAttrs { preferLocalBuild = true; postPatch = '' rm ftplugin/evinceSync.py - ln -s ${svedbackend}/bin/evinceSync.py ftplugin/evinceSync.py + install -m 544 ${pythonWrapper} ftplugin/evinceSync.py ''; meta = { description = "synctex support between vim/neovim and evince"; }; }; - taskwarrior = buildVimPlugin { - inherit (taskwarrior) version pname; - src = "${taskwarrior.src}/scripts/vim"; + syntax-tree-surfer = super.syntax-tree-surfer.overrideAttrs { + dependencies = with self; [ nvim-treesitter ]; + meta.maintainers = with lib.maintainers; [ callumio ]; + }; + + taskwarrior3 = buildVimPlugin { + inherit (taskwarrior3) version pname; + src = "${taskwarrior3.src}/scripts/vim"; + }; + + taskwarrior2 = buildVimPlugin { + inherit (taskwarrior2) version pname; + src = "${taskwarrior2.src}/scripts/vim"; }; telescope-cheat-nvim = super.telescope-cheat-nvim.overrideAttrs { @@ -1548,6 +1811,10 @@ nvimRequireCheck = "todo-comments"; }; + tssorter-nvim = super.tssorter-nvim.overrideAttrs { + dependencies = with self; [ nvim-treesitter ]; + }; + tup = let # Based on the comment at the top of https://github.com/gittup/tup/blob/master/contrib/syntax/tup.vim @@ -1577,14 +1844,19 @@ sha256 = "16b0jzvvzarnlxdvs2izd5ia0ipbd87md143dc6lv6xpdqcs75s9"; }; in - super.unicode-vim.overrideAttrs { + super.unicode-vim.overrideAttrs (oa: { # redirect to /dev/null else changes terminal color buildPhase = '' cp "${unicode-data}" autoload/unicode/UnicodeData.txt echo "Building unicode cache" ${vim}/bin/vim --cmd ":set rtp^=$PWD" -c 'ru plugin/unicode.vim' -c 'UnicodeCache' -c ':echohl Normal' -c ':q' > /dev/null ''; - }; + + passthru = oa.passthru // { + + initLua = ''vim.g.Unicode_data_directory="${self.unicode-vim}/autoload/unicode"''; + }; + }); unison = super.unison.overrideAttrs { # Editor stuff isn't at top level @@ -1593,7 +1865,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; @@ -1621,7 +1893,7 @@ }; vim-addon-manager = super.vim-addon-manager.overrideAttrs { - buildInputs = lib.optional stdenv.isDarwin Cocoa; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin Cocoa; }; vim-addon-mru = super.vim-addon-mru.overrideAttrs { @@ -1682,7 +1954,7 @@ src = old.src.overrideAttrs (srcOld: { postFetch = (srcOld.postFetch or "") - + lib.optionalString (!stdenv.isDarwin) '' + + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' rm $out/colors/darkBlue.vim ''; }); @@ -1795,7 +2067,7 @@ vim-markdown-composer-bin = rustPlatform.buildRustPackage { pname = "vim-markdown-composer-bin"; inherit (super.vim-markdown-composer) src version; - cargoSha256 = "sha256-Vie8vLTplhaVU4E9IohvxERfz3eBpd62m8/1Ukzk8e4="; + cargoHash = "sha256-Vie8vLTplhaVU4E9IohvxERfz3eBpd62m8/1Ukzk8e4="; # tests require network access doCheck = false; }; @@ -1955,7 +2227,8 @@ }; windows-nvim = super.windows-nvim.overrideAttrs { - dependencies = with self; [ luaPackages.middleclass animation-nvim ]; + dependencies = with self; [ middleclass animation-nvim ]; + nvimRequireCheck = "windows"; }; wtf-nvim = super.wtf-nvim.overrideAttrs { @@ -1966,6 +2239,10 @@ sourceRoot = "."; }; + yazi-nvim = super.yazi-nvim.overrideAttrs { + dependencies = with self; [ plenary-nvim ]; + }; + YouCompleteMe = super.YouCompleteMe.overrideAttrs { buildPhase = '' substituteInPlace plugin/youcompleteme.vim \ @@ -1994,6 +2271,7 @@ ''; }; LeaderF = super.LeaderF.overrideAttrs { + nativeBuildInputs = [ python3.pkgs.setuptools ]; buildInputs = [ python3 ]; # rm */build/ to prevent dependencies on gcc # strip the *.so to keep files small @@ -2008,10 +2286,8 @@ // ( let nodePackageNames = [ - "coc-clangd" "coc-cmake" "coc-css" - "coc-diagnostic" "coc-docker" "coc-emmet" "coc-eslint" @@ -2031,7 +2307,6 @@ "coc-metals" "coc-pairs" "coc-prettier" - "coc-pyright" "coc-python" "coc-r-lsp" "coc-rls" diff --git a/pkgs/applications/editors/vim/plugins/patches/aider.nvim/fix-paths.patch b/pkgs/applications/editors/vim/plugins/patches/aider.nvim/fix-paths.patch new file mode 100644 index 0000000000000..63995f0636dd8 --- /dev/null +++ b/pkgs/applications/editors/vim/plugins/patches/aider.nvim/fix-paths.patch @@ -0,0 +1,26 @@ +diff --git a/lua/aider.lua b/lua/aider.lua +index 38db0d1..d1ad6d5 100644 +--- a/lua/aider.lua ++++ b/lua/aider.lua +@@ -26,7 +26,7 @@ function M.AiderOpen(args, window_type) + if M.aider_buf and vim.api.nvim_buf_is_valid(M.aider_buf) then + helpers.open_buffer_in_new_window(window_type, M.aider_buf) + else +- command = 'aider ' .. (args or '') ++ command = '@aider@ ' .. (args or '') + helpers.open_window(window_type) + command = helpers.add_buffers_to_command(command) + M.aider_job_id = vim.fn.termopen(command, {on_exit = OnExit}) +diff --git a/lua/helpers.lua b/lua/helpers.lua +index 152182b..aa21584 100644 +--- a/lua/helpers.lua ++++ b/lua/helpers.lua +@@ -63,7 +63,7 @@ end + + local function build_background_command(args, prompt) + prompt = prompt or "Complete as many todo items as you can and remove the comment for any item you complete." +- local command = 'aider --msg "' .. prompt .. '" ' .. (args or '') ++ local command = '@aider@ --msg "' .. prompt .. '" ' .. (args or '') + command = add_buffers_to_command(command) + return command + end 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/patches/ranger.nvim/fix-paths.patch b/pkgs/applications/editors/vim/plugins/patches/ranger.nvim/fix-paths.patch new file mode 100644 index 0000000000000..496df312b4c78 --- /dev/null +++ b/pkgs/applications/editors/vim/plugins/patches/ranger.nvim/fix-paths.patch @@ -0,0 +1,22 @@ +diff --git a/lua/ranger-nvim.lua b/lua/ranger-nvim.lua +index 3b18880..78eb9db 100644 +--- a/lua/ranger-nvim.lua ++++ b/lua/ranger-nvim.lua +@@ -109,7 +109,7 @@ local function build_ranger_cmd(select_current_file) + end + local selectfile_flag = select_current_file and " --selectfile=" .. selected_file or "" + return string.format( +- "ranger --choosefiles=%s %s %s", ++ "@ranger@ --choosefiles=%s %s %s", + SELECTED_FILEPATH, + selectfile_flag, + create_ranger_cmd_flags(create_cmd_values(opts.keybinds)) +@@ -182,7 +182,7 @@ end + ---Opens ranger and open selected files on exit. + ---@param select_current_file boolean|nil open ranger and select the current file. Defaults to true. + function M.open(select_current_file) +- if vim.fn.executable("ranger") ~= 1 then ++ if vim.fn.executable("@ranger@") ~= 1 then + vim.api.nvim_err_write( + "ranger executable not found, please check that ranger is installed and is in your path\n" + ) diff --git a/pkgs/applications/editors/vim/plugins/patches/sniprun/fix-paths.patch b/pkgs/applications/editors/vim/plugins/patches/sniprun/fix-paths.patch index 97f1824ea623b..f444a80437bc7 100644 --- a/pkgs/applications/editors/vim/plugins/patches/sniprun/fix-paths.patch +++ b/pkgs/applications/editors/vim/plugins/patches/sniprun/fix-paths.patch @@ -1,15 +1,15 @@ diff --git a/lua/sniprun.lua b/lua/sniprun.lua -index fe29d1e..92d4729 100644 +index 49be442..1834566 100644 --- a/lua/sniprun.lua +++ b/lua/sniprun.lua -@@ -4,9 +4,7 @@ M.custom_highlight=false +@@ -3,9 +3,7 @@ M.ping_anwsered = 0 M.info_floatwin = {} -- See https://github.com/tjdevries/rofl.nvim/blob/632c10f2ec7c56882a3f7eda8849904bcac6e8af/lua/rofl.lua -local binary_path = vim.fn.fnamemodify( -- vim.api.nvim_get_runtime_file("lua/sniprun.lua", false)[1], ":h:h") -- .. "/target/release/sniprun" +- vim.api.nvim_get_runtime_file("lua/sniprun.lua", false)[1], ":h:h") +- .. "/target/release/sniprun" +local binary_path = "@sniprun_bin@/bin/sniprun" - local sniprun_path = vim.fn.fnamemodify( vim.api.nvim_get_runtime_file("lua/sniprun.lua", false)[1], ":p:h") .. "/.." + local sniprun_path = vim.fn.fnamemodify(vim.api.nvim_get_runtime_file("lua/sniprun.lua", false)[1], ":p:h") .. "/.." diff --git a/pkgs/applications/editors/vim/plugins/update.py b/pkgs/applications/editors/vim/plugins/update.py index e7e50c21d475e..a8525b9018b57 100755 --- a/pkgs/applications/editors/vim/plugins/update.py +++ b/pkgs/applications/editors/vim/plugins/update.py @@ -40,7 +40,9 @@ ROOT = Path(os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe import pluginupdate import importlib from pluginupdate import run_nix_expr, PluginDesc -import treesitter + +treesitter = importlib.import_module('nvim-treesitter.update') + HEADER = ( @@ -54,14 +56,37 @@ class VimEditor(pluginupdate.Editor): nvim_treesitter_updated = False def generate_nix( - self, plugins: List[Tuple[PluginDesc, pluginupdate.Plugin]], outfile: str + self, + plugins: List[Tuple[PluginDesc, pluginupdate.Plugin]], + outfile: str ): + log.info("Generating nix code") sorted_plugins = sorted(plugins, key=lambda v: v[0].name.lower()) + log.debug("Loading nvim-treesitter revision from nix...") nvim_treesitter_rev = pluginupdate.run_nix_expr( - "(import <localpkgs> { }).vimPlugins.nvim-treesitter.src.rev", self.nixpkgs + "(import <localpkgs> { }).vimPlugins.nvim-treesitter.src.rev", + self.nixpkgs, + timeout=10 ) + GET_PLUGINS_LUA = """ + with import <localpkgs> {}; + lib.attrNames lua51Packages""" + log.debug("Loading list of lua plugins...") + luaPlugins = run_nix_expr(GET_PLUGINS_LUA, self.nixpkgs, timeout=30) + + def _isNeovimPlugin(plug: pluginupdate.Plugin) -> bool: + """ + Whether it's a neovim-only plugin + We can check if it's available in lua packages + """ + if plug.normalized_name in luaPlugins: + log.debug("%s is a neovim plugin", plug) + return True + return False + with open(outfile, "w+") as f: + log.debug("Writing to %s", outfile) f.write(HEADER) f.write( textwrap.dedent( @@ -74,7 +99,7 @@ class VimEditor(pluginupdate.Editor): ) ) for pdesc, plugin in sorted_plugins: - content = self.plugin2nix(pdesc, plugin) + content = self.plugin2nix(pdesc, plugin, _isNeovimPlugin(plugin)) f.write(content) if ( plugin.name == "nvim-treesitter" @@ -84,27 +109,10 @@ class VimEditor(pluginupdate.Editor): f.write("\n}\n") print(f"updated {outfile}") - def plugin2nix(self, pdesc: PluginDesc, plugin: pluginupdate.Plugin) -> str: - GET_PLUGINS_LUA = """ - with import <localpkgs> {}; - lib.attrNames lua51Packages""" - luaPlugins = run_nix_expr(GET_PLUGINS_LUA, self.nixpkgs) + def plugin2nix(self, pdesc: PluginDesc, plugin: pluginupdate.Plugin, isNeovim: bool) -> str: repo = pdesc.repo - def _isNeovimPlugin(plug: pluginupdate.Plugin) -> bool: - """ - Whether it's a neovim-only plugin - We can check if it's available in lua packages - """ - # global luaPlugins - if plug.normalized_name in luaPlugins: - log.debug("%s is a neovim plugin", plug) - return True - return False - - isNeovim = _isNeovimPlugin(plugin) - content = f" {plugin.normalized_name} = " src_nix = repo.as_nix(plugin) content += """{buildFn} {{ @@ -159,8 +167,8 @@ class VimEditor(pluginupdate.Editor): def main(): global luaPlugins - log.debug(f"Loading from {ROOT}/../get-plugins.nix") - with open(f"{ROOT}/../get-plugins.nix") as f: + log.debug(f"Loading from {ROOT}/get-plugins.nix") + with open(f"{ROOT}/get-plugins.nix") as f: GET_PLUGINS = f.read() editor = VimEditor( "vim", Path("pkgs/applications/editors/vim/plugins"), GET_PLUGINS diff --git a/pkgs/applications/editors/vim/plugins/updater.nix b/pkgs/applications/editors/vim/plugins/updater.nix index afa245d9be9e4..1a62f13a04086 100644 --- a/pkgs/applications/editors/vim/plugins/updater.nix +++ b/pkgs/applications/editors/vim/plugins/updater.nix @@ -7,14 +7,14 @@ , nurl # optional -, vimPlugins -, neovim +, neovim-unwrapped }: buildPythonApplication { - format = "other"; pname = "vim-plugins-updater"; version = "0.1"; + format = "other"; + nativeBuildInputs = [ makeWrapper python3Packages.wrapPython @@ -29,16 +29,18 @@ buildPythonApplication { installPhase = '' mkdir -p $out/bin $out/lib cp ${./update.py} $out/bin/vim-plugins-updater - cp ${./get-plugins.nix} $out/get-plugins.nix - cp ${./nvim-treesitter/update.py} $out/lib/treesitter.py - cp ${../../../../../maintainers/scripts/pluginupdate.py} $out/lib/pluginupdate.py + cp ${./get-plugins.nix} $out/bin/get-plugins.nix # wrap python scripts makeWrapperArgs+=( --prefix PATH : "${lib.makeBinPath [ - nix nix-prefetch-git neovim nurl ]}" --prefix PYTHONPATH : "$out/lib" ) + nix nix-prefetch-git neovim-unwrapped nurl ]}" --prefix PYTHONPATH : "${./.}:${../../../../../maintainers/scripts/pluginupdate-py}" ) wrapPythonPrograms ''; + shellHook = '' + export PYTHONPATH=pkgs/applications/editors/vim/plugins:maintainers/scripts/pluginupdate-py:$PYTHONPATH + ''; + meta.mainProgram = "vim-plugins-updater"; } diff --git a/pkgs/applications/editors/vim/plugins/vim-clap/Cargo.lock b/pkgs/applications/editors/vim/plugins/vim-clap/Cargo.lock index 85ce295754aa3..e089a2f24dcbb 100644 --- a/pkgs/applications/editors/vim/plugins/vim-clap/Cargo.lock +++ b/pkgs/applications/editors/vim/plugins/vim-clap/Cargo.lock @@ -2843,9 +2843,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.34" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ "deranged", "itoa", @@ -2864,9 +2864,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.17" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" dependencies = [ "num-conv", "time-core", diff --git a/pkgs/applications/editors/vim/plugins/vim-clap/default.nix b/pkgs/applications/editors/vim/plugins/vim-clap/default.nix index 4ace5711cd3d9..391370c54efda 100644 --- a/pkgs/applications/editors/vim/plugins/vim-clap/default.nix +++ b/pkgs/applications/editors/vim/plugins/vim-clap/default.nix @@ -11,13 +11,13 @@ }: let - version = "0.54"; + version = "0.54-unstable-2024-08-11"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "v${version}"; - hash = "sha256-rhCum59GCIAwdi5QgSaPfrALelAIMncNetu81i53Q8c="; + rev = "3e8d001f5c9be10e4bb680a1d409326902c96c10"; + hash = "sha256-7bgbKYjJX2Tfprb69/imyvhsCsurrmPWBXVVLX+ZMnM="; }; meta = with lib; { @@ -26,7 +26,7 @@ let homepage = "https://github.com/liuchengxu/vim-clap"; changelog = "https://github.com/liuchengxu/vim-clap/blob/${src.rev}/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; maple = rustPlatform.buildRustPackage { @@ -49,7 +49,7 @@ let buildInputs = [ libgit2 zlib - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit darwin.apple_sdk.frameworks.CoreServices darwin.apple_sdk.frameworks.SystemConfiguration diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index c31ea3ee4df14..b93ff96b984db 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/,, @@ -42,11 +43,13 @@ https://github.com/vim-scripts/a.vim/,, https://github.com/mileszs/ack.vim/,, https://github.com/eikenb/acp/,, https://github.com/aznhe21/actions-preview.nvim/,, +https://github.com/aaronhallaert/advanced-git-search.nvim/,HEAD, https://github.com/Mofiqul/adwaita.nvim/,HEAD, https://github.com/stevearc/aerial.nvim/,, https://github.com/Numkil/ag.nvim/,, https://github.com/derekelkins/agda-vim/,, https://github.com/aduros/ai.vim/,HEAD, +https://github.com/joshuavial/aider.nvim/,HEAD, https://github.com/slashmili/alchemist.vim/,, https://github.com/dense-analysis/ale/,, https://github.com/vim-scripts/align/,, @@ -109,12 +112,13 @@ https://github.com/jlanzarotta/bufexplorer/,, https://github.com/AndrewRadev/bufferize.vim/,HEAD, https://github.com/akinsho/bufferline.nvim/,, https://github.com/kwkarlwang/bufjump.nvim/,HEAD, -https://github.com/dkarter/bullets.vim/,, +https://github.com/bullets-vim/bullets.vim/,, https://github.com/mattn/calendar-vim/,,mattn-calendar-vim https://github.com/itchyny/calendar.vim/,, https://github.com/bkad/camelcasemotion/,, https://github.com/tyru/caw.vim/,, https://github.com/uga-rosa/ccc.nvim/,HEAD, +https://github.com/Eandrju/cellular-automaton.nvim/,HEAD, https://github.com/ms-jpq/chadtree/,HEAD, https://github.com/vim-scripts/changeColorScheme.vim/,, https://github.com/sudormrfbin/cheatsheet.nvim/,, @@ -198,6 +202,7 @@ https://github.com/tjdevries/colorbuddy.nvim/,, https://github.com/lilydjwg/colorizer/,, https://github.com/Domeee/com.cloudedmountain.ide.neovim/,HEAD, https://github.com/wincent/command-t/,, +https://github.com/LudoPinelli/comment-box.nvim/,HEAD, https://github.com/numtostr/comment.nvim/,, https://github.com/rhysd/committia.vim/,, https://github.com/hrsh7th/compe-conjure/,, @@ -236,9 +241,16 @@ https://github.com/FelikZ/ctrlp-py-matcher/,, https://github.com/amiorin/ctrlp-z/,, https://github.com/ctrlpvim/ctrlp.vim/,, https://github.com/scottmckendry/cyberdream.nvim/,, +https://github.com/ptdewey/darkearth-nvim/,HEAD, https://github.com/dart-lang/dart-vim-plugin/,, https://github.com/rizzatti/dash.vim/,HEAD, -https://github.com/glepnir/dashboard-nvim/,, +https://github.com/nvimdev/dashboard-nvim/,, +https://github.com/Shougo/ddc-filter-matcher_head/,HEAD, +https://github.com/Shougo/ddc-filter-sorter_rank/,HEAD, +https://github.com/Shougo/ddc-source-lsp/,HEAD, +https://github.com/Shougo/ddc-ui-native/,HEAD, +https://github.com/Shougo/ddc-ui-pum/,HEAD, +https://github.com/Shougo/ddc.vim/,HEAD, https://github.com/andrewferrier/debugprint.nvim/,HEAD, https://github.com/Verf/deepwhite.nvim/,, https://github.com/kristijanhusak/defx-git/,, @@ -272,6 +284,7 @@ https://github.com/rhysd/devdocs.vim/,, https://github.com/vmchale/dhall-vim/,, https://github.com/onsails/diaglist.nvim/,, https://github.com/nvim-lua/diagnostic-nvim/,, +https://github.com/3rd/diagram.nvim/,HEAD, https://github.com/monaqa/dial.nvim/,HEAD, https://github.com/sindrets/diffview.nvim/,, https://github.com/elihunter173/dirbuf.nvim/,HEAD, @@ -282,6 +295,7 @@ https://github.com/NTBBloodbath/doom-one.nvim/,, https://github.com/Mofiqul/dracula.nvim/,HEAD, https://github.com/stevearc/dressing.nvim/,, https://github.com/Bekaboo/dropbar.nvim/,HEAD, +https://github.com/earthly/earthly.vim/,HEAD, https://github.com/Shougo/echodoc.vim/,, https://github.com/sainnhe/edge/,, https://github.com/edgedb/edgedb-vim/,, @@ -324,6 +338,7 @@ https://github.com/akinsho/flutter-tools.nvim/,HEAD, https://github.com/anuvyklack/fold-preview.nvim/,HEAD, https://github.com/mhartington/formatter.nvim/,, https://github.com/megaannum/forms/,, +https://github.com/rubiin/fortune.nvim/,HEAD, https://github.com/rafamadriz/friendly-snippets/,, https://github.com/raghur/fruzzy/,, https://github.com/shumphrey/fugitive-gitlab.vim/,, @@ -340,7 +355,6 @@ https://github.com/jsfaint/gen_tags.vim/,, https://github.com/gentoo/gentoo-syntax/,, https://github.com/ndmitchell/ghcid/,, https://github.com/eagletmt/ghcmod-vim/,, -https://github.com/lambdalisue/gina.vim/,, https://github.com/f-person/git-blame.nvim/,, https://github.com/akinsho/git-conflict.nvim/,HEAD, https://github.com/rhysd/git-messenger.vim/,, @@ -364,6 +378,7 @@ https://github.com/brymer-meneses/grammar-guard.nvim/,HEAD, https://github.com/liuchengxu/graphviz.vim/,, https://github.com/cbochs/grapple.nvim/,HEAD, https://github.com/blazkowolf/gruber-darker.nvim/,, +https://github.com/MagicDuck/grug-far.nvim/,, https://github.com/gruvbox-community/gruvbox/,,gruvbox-community https://github.com/morhetz/gruvbox/,, https://github.com/luisiacc/gruvbox-baby/,HEAD, @@ -383,16 +398,16 @@ https://github.com/ThePrimeagen/harpoon/,master, https://github.com/ThePrimeagen/harpoon/,harpoon2,harpoon2 https://github.com/kiyoon/haskell-scope-highlighting.nvim/,HEAD, https://github.com/mrcjkb/haskell-snippets.nvim/,HEAD, -https://github.com/MrcJkb/haskell-tools.nvim/,HEAD, https://github.com/neovimhaskell/haskell-vim/,, https://github.com/wenzel-hoffman/haskell-with-unicode.vim/,HEAD, https://github.com/travitch/hasksyn/,, https://github.com/lukas-reineke/headlines.nvim/,HEAD, https://github.com/rebelot/heirline.nvim/,, +https://github.com/OXY2DEV/helpview.nvim/,HEAD, https://github.com/RaafatTurki/hex.nvim/,HEAD, https://github.com/Yggdroot/hiPairs/,, https://github.com/tzachar/highlight-undo.nvim/,HEAD, -https://git.sr.ht/~soywod/himalaya-vim,, +https://github.com/pimalaya/himalaya-vim/,, https://github.com/mpickering/hlint-refactor-vim/,, https://github.com/calops/hmts.nvim/,, https://github.com/edluffy/hologram.nvim/,, @@ -409,6 +424,7 @@ https://github.com/ShinKage/idris2-nvim/,, https://github.com/edwinb/idris2-vim/,, https://github.com/3rd/image.nvim/,HEAD, https://github.com/samodostal/image.nvim/,HEAD,samodostal-image-nvim +https://github.com/HakonHarnes/img-clip.nvim/,HEAD, https://github.com/lewis6991/impatient.nvim/,, https://github.com/backdround/improved-search.nvim/,HEAD, https://github.com/smjonas/inc-rename.nvim/,HEAD, @@ -470,7 +486,7 @@ https://github.com/ggandor/lightspeed.nvim/,, https://github.com/junegunn/limelight.vim/,, https://github.com/lf-lang/lingua-franca.vim/,, https://github.com/tamago324/lir.nvim/,, -https://github.com/tami5/lispdocs.nvim/,, +https://github.com/kkharji/lispdocs.nvim/,, https://github.com/ldelossa/litee-calltree.nvim/,, https://github.com/ldelossa/litee-filetree.nvim/,, https://github.com/ldelossa/litee-symboltree.nvim/,, @@ -488,7 +504,7 @@ https://github.com/nvim-lua/lsp_extensions.nvim/,, https://git.sr.ht/~whynothugo/lsp_lines.nvim,, https://github.com/ray-x/lsp_signature.nvim/,, https://github.com/lspcontainers/lspcontainers.nvim/,, -https://github.com/onsails/lspkind-nvim/,, +https://github.com/onsails/lspkind.nvim/,, https://github.com/nvimdev/lspsaga.nvim/,, https://github.com/barreiroleo/ltex_extra.nvim/,HEAD, https://github.com/arkav/lualine-lsp-progress/,, @@ -497,13 +513,14 @@ https://github.com/l3mon4d3/luasnip/,, https://github.com/alvarosevilla95/luatab.nvim/,, https://github.com/rktjmp/lush.nvim/,, https://github.com/mkasa/lushtags/,, -https://github.com/nvim-neorocks/lz.n/,, +https://github.com/Bilal2453/luvit-meta/,HEAD, https://github.com/WhiteBlackGoose/magma-nvim-goose/,HEAD, https://github.com/winston0410/mark-radar.nvim/,HEAD, https://github.com/iamcco/markdown-preview.nvim/,, https://github.com/tadmccorkle/markdown.nvim/,HEAD, https://github.com/David-Kunz/markid/,HEAD, https://github.com/chentoast/marks.nvim/,, +https://github.com/OXY2DEV/markview.nvim/,HEAD, https://github.com/williamboman/mason-lspconfig.nvim/,HEAD, https://github.com/WhoIsSethDaniel/mason-tool-installer.nvim/,HEAD, https://github.com/williamboman/mason.nvim/,HEAD, @@ -513,10 +530,52 @@ https://github.com/kaicataldo/material.vim/,HEAD, https://github.com/vim-scripts/mayansmoke/,, https://github.com/chikamichi/mediawiki.vim/,HEAD, https://github.com/savq/melange-nvim/,, +https://github.com/lsig/messenger.nvim/,HEAD, https://github.com/xero/miasma.nvim/,, https://github.com/dasupradyumna/midnight.nvim/,, -https://github.com/phaazon/mind.nvim/,HEAD, +https://github.com/hadronized/mind.nvim/,HEAD, +https://github.com/echasnovski/mini-git/,HEAD, +https://github.com/echasnovski/mini.ai/,HEAD, +https://github.com/echasnovski/mini.align/,HEAD, +https://github.com/echasnovski/mini.animate/,HEAD, +https://github.com/echasnovski/mini.base16/,HEAD, +https://github.com/echasnovski/mini.basics/,HEAD, +https://github.com/echasnovski/mini.bracketed/,HEAD, +https://github.com/echasnovski/mini.bufremove/,HEAD, +https://github.com/echasnovski/mini.clue/,HEAD, +https://github.com/echasnovski/mini.colors/,HEAD, +https://github.com/echasnovski/mini.comment/,HEAD, +https://github.com/echasnovski/mini.completion/,HEAD, +https://github.com/echasnovski/mini.cursorword/,HEAD, +https://github.com/echasnovski/mini.deps/,HEAD, +https://github.com/echasnovski/mini.diff/,HEAD, +https://github.com/echasnovski/mini.doc/,HEAD, +https://github.com/echasnovski/mini.extra/,HEAD, +https://github.com/echasnovski/mini.files/,HEAD, +https://github.com/echasnovski/mini.fuzzy/,HEAD, +https://github.com/echasnovski/mini.hipatterns/,HEAD, +https://github.com/echasnovski/mini.hues/,HEAD, +https://github.com/echasnovski/mini.icons/,HEAD, +https://github.com/echasnovski/mini.indentscope/,HEAD, +https://github.com/echasnovski/mini.jump/,HEAD, +https://github.com/echasnovski/mini.jump2d/,HEAD, +https://github.com/echasnovski/mini.map/,HEAD, +https://github.com/echasnovski/mini.misc/,HEAD, +https://github.com/echasnovski/mini.move/,HEAD, +https://github.com/echasnovski/mini.notify/,HEAD, https://github.com/echasnovski/mini.nvim/,, +https://github.com/echasnovski/mini.operators/,HEAD, +https://github.com/echasnovski/mini.pairs/,HEAD, +https://github.com/echasnovski/mini.pick/,HEAD, +https://github.com/echasnovski/mini.sessions/,HEAD, +https://github.com/echasnovski/mini.splitjoin/,HEAD, +https://github.com/echasnovski/mini.starter/,HEAD, +https://github.com/echasnovski/mini.statusline/,HEAD, +https://github.com/echasnovski/mini.surround/,HEAD, +https://github.com/echasnovski/mini.tabline/,HEAD, +https://github.com/echasnovski/mini.test/,HEAD, +https://github.com/echasnovski/mini.trailspace/,HEAD, +https://github.com/echasnovski/mini.visits/,HEAD, https://github.com/wfxr/minimap.vim/,, https://github.com/jghauser/mkdir.nvim/,main, https://github.com/jakewvincent/mkdnflow.nvim/,HEAD, @@ -565,7 +624,6 @@ https://github.com/neomake/neomake/,, https://github.com/Shougo/neomru.vim/,, https://github.com/rafamadriz/neon/,, https://github.com/ii14/neorepl.nvim/,HEAD, -https://github.com/nvim-neorg/neorg/,, https://github.com/nvim-neorg/neorg-telescope/,HEAD, https://github.com/karb94/neoscroll.nvim/,, https://github.com/Shougo/neosnippet-snippets/,, @@ -579,11 +637,12 @@ https://github.com/Issafalcon/neotest-dotnet/,HEAD, https://github.com/jfpedroza/neotest-elixir/,HEAD, https://github.com/llllvvuu/neotest-foundry/,HEAD, https://github.com/nvim-neotest/neotest-go/,HEAD, +https://github.com/fredrikaverpil/neotest-golang/,HEAD, https://github.com/weilbith/neotest-gradle/,HEAD, https://github.com/alfaix/neotest-gtest/,HEAD, https://github.com/MrcJkb/neotest-haskell/,HEAD, https://github.com/rcasia/neotest-java/,HEAD, -https://github.com/haydenmeade/neotest-jest/,HEAD, +https://github.com/nvim-neotest/neotest-jest/,HEAD, https://github.com/zidhuss/neotest-minitest/,HEAD, https://github.com/theutz/neotest-pest/,HEAD, https://github.com/olimorris/neotest-phpunit/,HEAD, @@ -605,6 +664,7 @@ https://github.com/preservim/nerdcommenter/,, https://github.com/preservim/nerdtree/,, https://github.com/Xuyuanp/nerdtree-git-plugin/,, https://github.com/miversen33/netman.nvim/,HEAD, +https://github.com/prichrd/netrw.nvim/,HEAD, https://github.com/oberblastmeister/neuron.nvim/,, https://github.com/fiatjaf/neuron.vim/,, https://github.com/Olical/nfnl/,main, @@ -642,7 +702,7 @@ https://github.com/ojroques/nvim-bufdel/,, https://github.com/roxma/nvim-cm-racer/,, https://github.com/hrsh7th/nvim-cmp/,, https://github.com/weilbith/nvim-code-action-menu/,, -https://github.com/noib3/nvim-cokeline/,HEAD, +https://github.com/willothy/nvim-cokeline/,HEAD, https://github.com/nvchad/nvim-colorizer.lua/,, https://github.com/terrortylor/nvim-comment/,, https://github.com/hrsh7th/nvim-compe/,, @@ -653,6 +713,7 @@ https://github.com/yamatsum/nvim-cursorline/,, https://github.com/mfussenegger/nvim-dap/,, https://github.com/leoluz/nvim-dap-go/,HEAD, https://github.com/mfussenegger/nvim-dap-python/,HEAD, +https://github.com/jonboh/nvim-dap-rr/,HEAD, https://github.com/rcarriga/nvim-dap-ui/,, https://github.com/theHamsta/nvim-dap-virtual-text/,, https://github.com/kndndrj/nvim-dbee/,HEAD, @@ -698,6 +759,7 @@ https://github.com/gennaro-tedesco/nvim-peekup/,, https://github.com/yorickpeterse/nvim-pqf/,HEAD, https://github.com/jamestthompson3/nvim-remote-containers/,HEAD, https://github.com/olrtg/nvim-rename-state/,HEAD, +https://github.com/chrisgrieser/nvim-rip-substitute/,, https://github.com/petertriho/nvim-scrollbar/,HEAD, https://github.com/dstein64/nvim-scrollview/,, https://github.com/s1n7ax/nvim-search-and-replace/,HEAD, @@ -711,7 +773,7 @@ https://github.com/kylechui/nvim-surround/,main, https://github.com/svermeulen/nvim-teal-maker/,HEAD, https://github.com/norcalli/nvim-terminal.lua/,, https://github.com/klen/nvim-test/,, -https://github.com/kyazdani42/nvim-tree.lua/,, +https://github.com/nvim-tree/nvim-tree.lua/,, https://github.com/nvim-treesitter/nvim-treesitter/,, https://github.com/nvim-treesitter/nvim-treesitter-context/,, https://github.com/RRethy/nvim-treesitter-endwise/,HEAD, @@ -723,15 +785,16 @@ https://github.com/windwp/nvim-ts-autotag/,, https://github.com/joosepalviste/nvim-ts-context-commentstring/,, https://github.com/kevinhwang91/nvim-ufo/,HEAD, https://github.com/samjwill/nvim-unception/,HEAD, -https://github.com/kyazdani42/nvim-web-devicons/,, +https://github.com/chrisgrieser/nvim-various-textobjs/,HEAD, +https://github.com/nvim-tree/nvim-web-devicons/,, https://github.com/AckslD/nvim-whichkey-setup.lua/,, https://github.com/s1n7ax/nvim-window-picker/,HEAD, https://github.com/roxma/nvim-yarp/,, -https://github.com/haringsrob/nvim_context_vt/,, +https://github.com/andersevenrud/nvim_context_vt/,, https://github.com/neovim/nvimdev.nvim/,, -https://github.com/nvchad/nvterm/,HEAD, +https://github.com/zbirenbaum/nvterm/,HEAD, https://github.com/epwalsh/obsidian.nvim/,HEAD, -https://github.com/glepnir/oceanic-material/,, +https://github.com/nvimdev/oceanic-material/,, https://github.com/mhartington/oceanic-next/,, https://github.com/pwntester/octo.nvim/,, https://github.com/stevearc/oil.nvim/,HEAD, @@ -766,7 +829,6 @@ https://github.com/tmsvg/pear-tree/,, https://github.com/steelsojka/pears.nvim/,, https://github.com/olimorris/persisted.nvim/,HEAD, https://github.com/folke/persistence.nvim/,, -https://github.com/andsild/peskcolor.vim/,, https://github.com/pest-parser/pest.vim/,HEAD, https://github.com/lifepillar/pgsql.vim/,, https://github.com/motus/pig.vim/,, @@ -778,6 +840,7 @@ https://github.com/olivercederborg/poimandres.nvim/,HEAD, https://github.com/dleonard0/pony-vim-syntax/,, https://github.com/RishabhRD/popfix/,, https://github.com/nvim-lua/popup.nvim/,, +https://github.com/tris203/precognition.nvim/,HEAD, https://github.com/andweeb/presence.nvim/,, https://github.com/sotte/presenting.vim/,, https://github.com/ewilazarus/preto/,HEAD, @@ -786,6 +849,7 @@ https://github.com/vim-scripts/prev_indent/,, https://github.com/ahmedkhalf/project.nvim/,, https://github.com/kevinhwang91/promise-async/,HEAD, https://github.com/frigoeu/psc-ide-vim/,, +https://github.com/Shougo/pum.vim/,HEAD, https://github.com/purescript-contrib/purescript-vim/,, https://github.com/python-mode/python-mode/,, https://github.com/vim-python/python-syntax/,, @@ -801,6 +865,7 @@ https://gitlab.com/HiPhish/rainbow-delimiters.nvim,HEAD, https://github.com/kien/rainbow_parentheses.vim/,, https://github.com/vim-scripts/random.vim/,, https://github.com/winston0410/range-highlight.nvim/,, +https://github.com/kelly-lin/ranger.nvim/,, https://github.com/rafaqz/ranger.vim/,, https://github.com/vim-scripts/rcshell.vim/,, https://github.com/ryvnf/readline.vim/,, @@ -808,6 +873,7 @@ https://github.com/theprimeagen/refactoring.nvim/,, https://github.com/tversteeg/registers.nvim/,, https://github.com/vladdoster/remember.nvim/,, https://github.com/filipdutescu/renamer.nvim/,, +https://github.com/MeanderingProgrammer/render-markdown.nvim/,, https://github.com/gabrielpoca/replacer.nvim/,HEAD, https://github.com/NTBBloodbath/rest.nvim/,, https://github.com/vim-scripts/restore_view.vim/,HEAD,restore-view-vim @@ -820,7 +886,6 @@ https://github.com/keith/rspec.vim/,, https://github.com/ccarpita/rtorrent-syntax-file/,, https://github.com/simrat39/rust-tools.nvim/,, https://github.com/rust-lang/rust.vim/,, -https://github.com/mrcjkb/rustaceanvim/,HEAD, https://github.com/hauleth/sad.vim/,, https://github.com/vmware-archive/salt-vim/,, https://github.com/lewis6991/satellite.nvim/,HEAD, @@ -834,12 +899,13 @@ https://github.com/megaannum/self/,, https://github.com/jaxbot/semantic-highlight.vim/,, https://github.com/numirias/semshi/,, https://github.com/junegunn/seoul256.vim/,, -https://github.com/tjdevries/sg.nvim/,HEAD, +https://github.com/sourcegraph/sg.nvim/,HEAD, https://github.com/osyo-manga/shabadou.vim/,, https://github.com/AndrewRadev/sideways.vim/,, https://github.com/lotabout/skim.vim/,, https://github.com/mopp/sky-color-clock.vim/,, https://github.com/kovisoft/slimv/,, +https://github.com/danielfalk/smart-open.nvim/,0.2.x, https://github.com/mrjones2014/smart-splits.nvim/,, https://github.com/m4xshen/smartcolumn.nvim/,, https://github.com/gorkunov/smartpairs.vim/,, @@ -853,13 +919,13 @@ https://github.com/chikatoike/sourcemap.vim/,, https://github.com/liuchengxu/space-vim/,, https://github.com/ctjhoa/spacevim/,, https://github.com/chrisgeo/sparkup/,, -https://github.com/edluffy/specs.nvim/,, +https://github.com/cxwx/specs.nvim/,HEAD, https://github.com/lewis6991/spellsitter.nvim/,HEAD, https://github.com/stsewd/sphinx.nvim/,, https://github.com/sjl/splice.vim/,, https://github.com/vimlab/split-term.vim/,, https://github.com/AndrewRadev/splitjoin.vim/,, -https://github.com/tami5/sqlite.lua/,, +https://github.com/kkharji/sqlite.lua/,, https://github.com/srcery-colors/srcery-vim/,, https://github.com/chr4/sslsecure.vim/,, https://github.com/cshuaimin/ssr.nvim/,HEAD, @@ -868,12 +934,14 @@ https://github.com/tamton-aquib/staline.nvim/,main, https://github.com/eigenfoo/stan-vim/,, https://github.com/josegamez82/starrynight/,HEAD, https://github.com/darfink/starsearch.vim/,, -https://github.com/startup-nvim/startup.nvim/,HEAD, +https://github.com/max397574/startup.nvim/,HEAD, https://github.com/luukvbaal/statuscol.nvim/,, +https://github.com/arnamak/stay-centered.nvim/,HEAD, https://github.com/folke/styler.nvim/,, https://github.com/teto/stylish.nvim/,HEAD, https://github.com/gbprod/substitute.nvim/,HEAD, https://github.com/kvrohit/substrata.nvim/,HEAD, +https://github.com/supermaven-inc/supermaven-nvim/,HEAD, https://github.com/ervandew/supertab/,, https://github.com/ur4ltz/surround.nvim/,, https://github.com/peterbjorgensen/sved/,, @@ -882,6 +950,7 @@ https://github.com/keith/swift.vim/,, https://github.com/AndrewRadev/switch.vim/,, https://github.com/simrat39/symbols-outline.nvim/,, https://github.com/vim-syntastic/syntastic/,, +https://github.com/ziontee113/syntax-tree-surfer/,HEAD, https://github.com/nanozuki/tabby.nvim/,HEAD, https://github.com/kdheepak/tabline.nvim/,, https://github.com/vim-scripts/tabmerge/,, @@ -893,11 +962,12 @@ https://github.com/godlygeek/tabular/,, https://github.com/AndrewRadev/tagalong.vim/,, https://github.com/preservim/tagbar/,, https://github.com/vim-scripts/taglist.vim/,, +https://github.com/luckasRanarison/tailwind-tools.nvim/,HEAD, https://github.com/themaxmarchuk/tailwindcss-colors.nvim/,HEAD, https://github.com/wellle/targets.vim/,, https://github.com/tools-life/taskwiki/,, https://github.com/tomtom/tcomment_vim/,, -https://github.com/renerocksai/telekasten.nvim/,, +https://github.com/nvim-telekasten/telekasten.nvim/,, https://github.com/GustavoKatel/telescope-asynctasks.nvim/,, https://github.com/nvim-telescope/telescope-cheat.nvim/,, https://github.com/fannheyward/telescope-coc.nvim/,, @@ -925,6 +995,7 @@ https://github.com/natecraddock/telescope-zf-native.nvim/,HEAD, https://github.com/jvgrootveld/telescope-zoxide/,, https://github.com/nvim-telescope/telescope.nvim/,, https://github.com/luc-tielen/telescope_hoogle/,HEAD, +https://github.com/joerdav/templ.vim/,HEAD, https://github.com/axelvc/template-string.nvim/,HEAD, https://github.com/jacoborus/tender.vim/,, https://github.com/chomosuke/term-edit.nvim/,HEAD, @@ -934,10 +1005,12 @@ https://github.com/ternjs/tern_for_vim/,, https://github.com/KeitaNakamura/tex-conceal.vim/,, https://github.com/let-def/texpresso.vim/,HEAD, https://github.com/johmsalas/text-case.nvim/,HEAD, +https://github.com/vhsconnect/themed-tabs.nvim/,HEAD, https://github.com/ron89/thesaurus_query.vim/,, https://github.com/itchyny/thumbnail.vim/,, https://github.com/vim-scripts/timestamp.vim/,, https://github.com/levouh/tint.nvim/,HEAD, +https://github.com/rachartier/tiny-inline-diagnostic.nvim/,HEAD, https://github.com/tomtom/tinykeymap_vim/,,tinykeymap https://github.com/tomtom/tlib_vim/,, https://github.com/wellle/tmux-complete.vim/,, @@ -959,6 +1032,7 @@ https://github.com/Pocco81/true-zen.nvim/,, https://github.com/tesaguri/trust.vim/,HEAD, https://github.com/folke/ts-comments.nvim/,HEAD, https://github.com/jgdavey/tslime.vim/,, +https://github.com/mtrajano/tssorter.nvim/,HEAD, https://github.com/Quramy/tsuquyomi/,, https://github.com/folke/twilight.nvim/,, https://github.com/pmizio/typescript-tools.nvim/,, @@ -972,6 +1046,7 @@ https://github.com/mbbill/undotree/,, https://github.com/chrisbra/unicode.vim/,, https://github.com/unisonweb/unison/,, https://github.com/Shougo/unite.vim/,, +https://github.com/sontungexpt/url-open/,HEAD, https://github.com/axieax/urlview.nvim/,, https://github.com/vim-scripts/utl.vim/,, https://github.com/KabbAmine/vCoolor.vim/,, @@ -1094,6 +1169,7 @@ https://github.com/xolox/vim-easytags/,, https://github.com/justincampbell/vim-eighties/,, https://github.com/elixir-editors/vim-elixir/,, https://github.com/andys8/vim-elm-syntax/,, +https://github.com/kentarosasaki/vim-emacs-bindings/,HEAD, https://github.com/junegunn/vim-emoji/,, https://github.com/tpope/vim-endwise/,, https://github.com/Olical/vim-enmasse/,HEAD, @@ -1116,14 +1192,14 @@ https://github.com/dcharbon/vim-flatbuffers/,, https://github.com/voldikss/vim-floaterm/,, https://github.com/rbong/vim-flog/,, https://github.com/thosakwe/vim-flutter/,, -https://github.com/fsharp/vim-fsharp/,, https://github.com/thinca/vim-ft-diff_fold/,, https://github.com/tommcdo/vim-fubitive/,, https://github.com/tpope/vim-fugitive/,, https://github.com/maxjacobson/vim-fzf-coauthorship/,, -https://github.com/Shirk/vim-gas/,, +https://github.com/HealsCodes/vim-gas/,, https://github.com/ruanyl/vim-gh-line/,, https://github.com/raghur/vim-ghost/,, +https://github.com/lambdalisue/vim-gina/,, https://github.com/mattn/vim-gist/,, https://github.com/lambdalisue/vim-gista/,, https://github.com/tpope/vim-git/,, @@ -1140,6 +1216,7 @@ https://github.com/mhinz/vim-grepper/,, https://github.com/lifepillar/vim-gruvbox8/,, https://github.com/brennanfee/vim-gui-position/,, https://github.com/ludovicchabant/vim-gutentags/,, +https://github.com/habamax/vim-habamax/,HEAD, https://github.com/takac/vim-hardtime/,, https://github.com/chkno/vim-haskell-module-name/,, https://github.com/enomsg/vim-haskellConcealPlus/,, @@ -1161,7 +1238,7 @@ https://github.com/w0ng/vim-hybrid/,, https://github.com/kristijanhusak/vim-hybrid-material/,, https://github.com/noc7c9/vim-iced-coffee-script/,, https://github.com/RRethy/vim-illuminate/,, -https://github.com/nathanaelkane/vim-indent-guides/,, +https://github.com/preservim/vim-indent-guides/,, https://github.com/michaeljsmith/vim-indent-object/,, https://github.com/jeetsukumaran/vim-indentwise/,, https://github.com/henrik/vim-indexed-search/,, @@ -1174,6 +1251,7 @@ https://github.com/pangloss/vim-javascript/,, https://github.com/jelera/vim-javascript-syntax/,, https://github.com/lepture/vim-jinja/,, https://github.com/seirl/vim-jinja-languages/,HEAD, +https://github.com/avm99963/vim-jjdescription/,HEAD, https://github.com/maksimr/vim-jsbeautify/,, https://github.com/heavenshell/vim-jsdoc/,, https://github.com/elzr/vim-json/,, @@ -1191,7 +1269,7 @@ https://github.com/ludovicchabant/vim-lawrencium/,, https://github.com/hecal3/vim-leader-guide/,, https://github.com/mk12/vim-lean/,, https://github.com/ledger/vim-ledger/,, -https://github.com/reedes/vim-lexical/,HEAD, +https://github.com/preservim/vim-lexical/,HEAD, https://github.com/lfe-support/vim-lfe/,, https://github.com/josa42/vim-lightline-coc/,, https://github.com/tommcdo/vim-lion/,, @@ -1262,10 +1340,11 @@ https://github.com/vim-pandoc/vim-pandoc-after/,, https://github.com/vim-pandoc/vim-pandoc-syntax/,, https://github.com/yorickpeterse/vim-paper/,HEAD, https://github.com/bhurlow/vim-parinfer/,, -https://github.com/sickill/vim-pasta/,, +https://github.com/ku1ik/vim-pasta/,, https://github.com/tpope/vim-pathogen/,, https://github.com/junegunn/vim-peekaboo/,, https://github.com/preservim/vim-pencil/,, +https://github.com/MeF0504/vim-pets/,HEAD, https://github.com/jparise/vim-phabricator/,, https://github.com/justinj/vim-pico8-syntax/,, https://github.com/junegunn/vim-plug/,, @@ -1276,7 +1355,7 @@ https://github.com/haya14busa/vim-poweryank/,, https://github.com/prettier/vim-prettier/,, https://github.com/thinca/vim-prettyprint/,, https://github.com/meain/vim-printer/,HEAD, -https://github.com/pantharshit00/vim-prisma/,, +https://github.com/prisma/vim-prisma/,, https://github.com/tpope/vim-projectionist/,, https://github.com/dhruvasagar/vim-prosession/,, https://github.com/uarun/vim-protobuf/,, @@ -1337,7 +1416,7 @@ https://github.com/dstein64/vim-startuptime/,, https://github.com/axelf4/vim-strip-trailing-whitespace/,, https://github.com/nbouscal/vim-stylish-haskell/,, https://github.com/alx741/vim-stylishask/,, -https://github.com/arzg/vim-substrata/,HEAD, +https://github.com/lunacookies/vim-substrata/,HEAD, https://github.com/svermeulen/vim-subversive/,, https://github.com/lambdalisue/vim-suda/,, https://github.com/tpope/vim-surround/,, @@ -1397,8 +1476,9 @@ https://github.com/joonty/vim-xdebug/,, https://github.com/lyokha/vim-xkbswitch/,, https://github.com/mg979/vim-xtabline/,, https://github.com/stephpy/vim-yaml/,, -https://github.com/mindriot101/vim-yapf/,, +https://github.com/simonrw/vim-yapf/,, https://github.com/michal-h21/vim-zettel/,HEAD, +https://github.com/marrub--/vim-zscript/,HEAD, https://github.com/dag/vim2hs/,, https://github.com/monkoose/vim9-stargate/,HEAD, https://github.com/dominikduda/vim_current_word/,, @@ -1444,16 +1524,19 @@ https://github.com/drmingdrmer/xptemplate/,, https://github.com/guns/xterm-color-table.vim/,, https://github.com/gbprod/yanky.nvim/,HEAD, https://github.com/HerringtonDarkholme/yats.vim/,, +https://github.com/mikavilpas/yazi.nvim/,HEAD, https://github.com/lucasew/yescapsquit.vim/,HEAD, https://github.com/elkowar/yuck.vim/,HEAD, +https://github.com/fsharp/zarchive-vim-fsharp/,, https://github.com/KabbAmine/zeavim.vim/,, +https://github.com/swaits/zellij-nav.nvim/,HEAD, https://github.com/Lilja/zellij.nvim/,HEAD, https://github.com/folke/zen-mode.nvim/,, -https://github.com/mcchrish/zenbones.nvim/,HEAD, +https://github.com/zenbones-theme/zenbones.nvim/,HEAD, https://github.com/jnurmine/zenburn/,, https://github.com/phha/zenburn.nvim/,,phha-zenburn -https://github.com/glepnir/zephyr-nvim/,, +https://github.com/nvimdev/zephyr-nvim/,, https://github.com/ziglang/zig.vim/,, -https://github.com/mickael-menu/zk-nvim/,HEAD, +https://github.com/zk-org/zk-nvim/,HEAD, https://github.com/troydm/zoomwintab.vim/,, https://github.com/nanotee/zoxide.vim/,, diff --git a/pkgs/applications/editors/vim/vimacs.nix b/pkgs/applications/editors/vim/vimacs.nix index e65439df5236e..e54ac39b2ae49 100644 --- a/pkgs/applications/editors/vim/vimacs.nix +++ b/pkgs/applications/editors/vim/vimacs.nix @@ -1,5 +1,5 @@ { lib, stdenv, config, vim-full, macvim, vimPlugins -, useMacvim ? stdenv.isDarwin && (config.vimacs.macvim or true) +, useMacvim ? stdenv.hostPlatform.isDarwin && (config.vimacs.macvim or true) , vimacsExtraArgs ? "" }: stdenv.mkDerivation rec { diff --git a/pkgs/applications/editors/viw/default.nix b/pkgs/applications/editors/viw/default.nix deleted file mode 100644 index ad47edfe83e4d..0000000000000 --- a/pkgs/applications/editors/viw/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, ncurses }: - -stdenv.mkDerivation rec { - pname = "viw"; - version = "unstable-20171029"; - - src = fetchFromGitHub { - owner = "lpan"; - repo = pname; - rev = "2cf317f6d82a6fa58f284074400297b6dc0f44c2"; - sha256 = "0bnkh57v01zay6ggk0rbddaf75i48h8z06xsv33wfbjldclaljp1"; - }; - - buildInputs = [ ncurses ]; - - makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; - checkFlags = [ "test-command" "test-buffer" "test-state" ]; - - installPhase = '' - install -Dm 755 -t $out/bin viw - install -Dm 644 -t $out/share/doc/${pname} README.md - ''; - - meta = with lib; { - description = "VI Worsened, a fun and light clone of VI"; - homepage = "https://github.com/lpan/viw"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ AndersonTorres ]; - mainProgram = "viw"; - }; -} diff --git a/pkgs/applications/editors/vscode/extensions/README.md b/pkgs/applications/editors/vscode/extensions/README.md index 12ac4f5f5bb2e..09de650067fc7 100644 --- a/pkgs/applications/editors/vscode/extensions/README.md +++ b/pkgs/applications/editors/vscode/extensions/README.md @@ -31,7 +31,7 @@ - Naming convention for: - Adding a new extension: - > vscode-extensions.publisher.extension-name: init 1.2.3 + > vscode-extensions.publisher.extension-name: init at 1.2.3 > > Release: https://github.com/owner/project/releases/tag/1.2.3 - Updating an extension: diff --git a/pkgs/applications/editors/vscode/extensions/charliermarsh.ruff/default.nix b/pkgs/applications/editors/vscode/extensions/charliermarsh.ruff/default.nix new file mode 100644 index 0000000000000..d54b702e5175c --- /dev/null +++ b/pkgs/applications/editors/vscode/extensions/charliermarsh.ruff/default.nix @@ -0,0 +1,44 @@ +{ + stdenvNoCC, + lib, + vscode-utils, +}: + +vscode-utils.buildVscodeMarketplaceExtension { + mktplcRef = + let + sources = { + "x86_64-linux" = { + arch = "linux-x64"; + hash = "sha256-KiCTJbLDut0Az7BmcYPQbFweT94RWnsE+JYvqVZ2P7s="; + }; + "x86_64-darwin" = { + arch = "darwin-x64"; + hash = "sha256-Szy+bE/42cNzcEa2yKCyvxr5OBqH2dPVgJnCS57z3nY="; + }; + "aarch64-linux" = { + arch = "linux-arm64"; + hash = "sha256-Bw1gdrb40baSXdrIgM0tlCLa18aGpRv1q7YN5wJRjNs="; + }; + "aarch64-darwin" = { + arch = "darwin-arm64"; + hash = "sha256-xcHL/2dliPD69mNEsbEpbtn5QLV1P3gqu9ftDOn58qM="; + }; + }; + in + { + name = "ruff"; + publisher = "charliermarsh"; + version = "2024.34.0"; + } + // sources.${stdenvNoCC.system} or (throw "Unsupported system ${stdenvNoCC.system}"); + + meta = { + license = lib.licenses.mit; + changelog = "https://marketplace.visualstudio.com/items/charliermarsh.ruff/changelog"; + description = "Visual Studio Code extension with support for the Ruff linter"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=charliermarsh.ruff"; + homepage = "https://github.com/astral-sh/ruff-vscode"; + maintainers = [ lib.maintainers.azd325 ]; + }; +} diff --git a/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/default.nix b/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/default.nix index d0b27457b68a0..508d2ce2c5a4c 100644 --- a/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/default.nix +++ b/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/default.nix @@ -5,12 +5,12 @@ callPackage, }: let - version = "1.54.0"; + version = "1.58.0"; rescript-editor-analysis = callPackage ./rescript-editor-analysis.nix { inherit version; }; arch = - if stdenv.isLinux then + if stdenv.hostPlatform.isLinux then "linux" - else if stdenv.isDarwin then + else if stdenv.hostPlatform.isDarwin then "darwin" else throw "Unsupported system: ${stdenv.system}"; @@ -21,7 +21,7 @@ vscode-utils.buildVscodeMarketplaceExtension rec { name = "rescript-vscode"; publisher = "chenglou92"; inherit version; - hash = "sha256-c7TJED5YpHRwn7Ooq8sG+N99b7tH6TOgeC9TTYdb4JA="; + hash = "sha256-EuEBbtdCaS4l8ykkxyLLMjEnUMs0IsXoc994a8Pw1Ws="; }; postPatch = '' rm -r ${analysisDir} diff --git a/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/rescript-editor-analysis.nix b/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/rescript-editor-analysis.nix index 9a00fb31cd41e..b4763dc417a18 100644 --- a/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/rescript-editor-analysis.nix +++ b/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/rescript-editor-analysis.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - bash, ocaml, ocamlPackages, dune_3, @@ -17,7 +16,7 @@ stdenv.mkDerivation { owner = "rescript-lang"; repo = "rescript-vscode"; rev = version; - hash = "sha256-+Ht8qWwxtFWHFMiV/aoZIs2S3SxkOWgdwSKN+akp/LU="; + hash = "sha256-v+qCVge57wvA97mtzbxAX9Fvi7ruo6ZyIC14O8uWl9Y="; }; nativeBuildInputs = [ @@ -26,16 +25,12 @@ stdenv.mkDerivation { ocamlPackages.cppo ]; - # Skip testing phases because they need to download and install node modules - postPatch = '' - cd analysis - substituteInPlace Makefile \ - --replace "build: build-analysis-binary build-reanalyze build-tests" "build: build-analysis-binary" \ - --replace "test: test-analysis-binary test-reanalyze" "test: test-analysis-binary" + buildPhase = '' + dune build -p analysis ''; installPhase = '' - install -D -m0555 rescript-editor-analysis.exe $out/bin/rescript-editor-analysis.exe + install -D -m0555 _build/default/analysis/bin/main.exe $out/bin/rescript-editor-analysis.exe ''; meta = { diff --git a/pkgs/applications/editors/vscode/extensions/contextmapper.context-mapper-vscode-extension/default.nix b/pkgs/applications/editors/vscode/extensions/contextmapper.context-mapper-vscode-extension/default.nix index 71d540fafd89e..2df0585c594cf 100644 --- a/pkgs/applications/editors/vscode/extensions/contextmapper.context-mapper-vscode-extension/default.nix +++ b/pkgs/applications/editors/vscode/extensions/contextmapper.context-mapper-vscode-extension/default.nix @@ -10,8 +10,8 @@ vscode-utils.buildVscodeMarketplaceExtension rec { mktplcRef = { name = "context-mapper-vscode-extension"; publisher = "contextmapper"; - version = "6.11.0"; - hash = "sha256-TvApcBBI+Egu7t4tJuEYTs6mhvABOY2eXVb57O4gWfs="; + version = "6.12.0"; + hash = "sha256-iGaVipNvx6J3NgZ2KbBJOSVCwG+lr25u7mfMCY4yB18="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 74e8c65102c32..5e10ed63cfafd 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -90,8 +90,8 @@ let mktplcRef = { publisher = "42Crunch"; name = "vscode-openapi"; - version = "4.25.3"; - hash = "sha256-1kz/M2od2gLSFgqW6LsPHgtm+BwXA+0+7z3HyqNmsOg="; + version = "4.27.0"; + hash = "sha256-urXGyHpIDWQ0Bc+8LODC0DcEo6jQ5tA/QptyxCej9yU="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/42Crunch.vscode-openapi/changelog"; @@ -313,8 +313,8 @@ let mktplcRef = { name = "vscode-apollo"; publisher = "apollographql"; - version = "1.19.11"; - hash = "sha256-EixefDuJiw/p5yAR/UQLK1a1RXJLXlTmOlD34qpAN+U="; + version = "2.3.2"; + hash = "sha256-5PAmyy4RX2hLgviWxgnxGZjgeFWZaJKNiYGNdCTL0IE="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/apollographql.vscode-apollo/changelog"; @@ -389,8 +389,8 @@ let mktplcRef = { name = "astro-vscode"; publisher = "astro-build"; - version = "2.8.3"; - hash = "sha256-A6m31eZMlOHF0yr9MjXmsFyXgH8zmq6WLRd/w85hGw0="; + version = "2.10.2"; + hash = "sha256-lmqbZnCpkNN+i877hURRkPuRtuxRKD29bDppGBAEMGs="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/astro-build.astro-vscode/changelog"; @@ -406,8 +406,8 @@ let mktplcRef = { name = "vscode-neovim"; publisher = "asvetliakov"; - version = "1.17.2"; - hash = "sha256-IA09vUleY7hazu65kadES4iq3XojyJ3sXOOGaw0vJnU="; + version = "1.18.12"; + hash = "sha256-3Nmk0MFIMFYQHrRyZ7ioFk9KfHSk0CSF7FwNaEJbsyg="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/asvetliakov.vscode-neovim/changelog"; @@ -664,10 +664,14 @@ let mktplcRef = { name = "markdown-mermaid"; publisher = "bierner"; - version = "1.17.7"; - hash = "sha256-WKe7XxBeYyzmjf/gnPH+5xNOHNhMPAKjtLorYyvT76U="; + version = "1.23.1"; + hash = "sha256-hYWSeBXhqMcMxs+Logl5zRs4MlzBeHgCC07Eghmp0OM="; }; meta = { + changelog = "https://marketplace.visualstudio.com/items/bierner.markdown-mermaid/changelog"; + description = "Adds Mermaid diagram and flowchart support to VS Code's builtin markdown preview"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=bierner.markdown-mermaid"; + homepage = "https://github.com/mjbvz/vscode-markdown-mermaid"; license = lib.licenses.mit; }; }; @@ -731,8 +735,8 @@ let mktplcRef = { name = "vscode-intelephense-client"; publisher = "bmewburn"; - version = "1.10.4"; - hash = "sha256-bD7AL4x0yL5S+MzQXMBrSZs1pVclfvsTfUbImP1oQok="; + version = "1.12.5"; + hash = "sha256-2Tamwag4KovIOKTe/g4qePVDFxm0mgsLtPNdWcKzigI="; }; meta = { description = "PHP code intelligence for Visual Studio Code"; @@ -767,7 +771,7 @@ let downloadPage = "https://marketplace.visualstudio.com/items?itemName=bradgashler.htmltagwrap"; homepage = "https://github.com/bgashler1/vscode-htmltagwrap"; license = lib.licenses.mit; - maintainers = [ lib.maintainers.superherointj ]; + maintainers = [ ]; }; }; @@ -775,8 +779,8 @@ let mktplcRef = { name = "vscode-tailwindcss"; publisher = "bradlc"; - version = "0.11.30"; - hash = "sha256-1CxyvQu7WQJw87sTcpnILztt1WeSpWOgij0dEIXebPU="; + version = "0.13.17"; + hash = "sha256-hcFBMYfexNB7NMf3C7BQVTps1CBesEOxU3mW2cKXDHc="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/bradlc.vscode-tailwindcss/changelog"; @@ -853,70 +857,37 @@ let mktplcRef = { name = "catppuccin-vsc"; publisher = "catppuccin"; - version = "2.6.1"; - hash = "sha256-B56b7PeuVnkxEqvd4vL9TYO7s8fuA+LOCTbJQD9e7wY="; + version = "3.14.0"; + hash = "sha256-kNQFR1ghdFJF4XLWCFgVpeXCZ/XiHGr/O1iJyWTT3Bg="; }; meta = { + changelog = "https://marketplace.visualstudio.com/items/Catppuccin.catppuccin-vsc/changelog"; description = "Soothing pastel theme for VSCode"; - license = lib.licenses.mit; downloadPage = "https://marketplace.visualstudio.com/items?itemName=Catppuccin.catppuccin-vsc"; - maintainers = [ lib.maintainers.nullx76 ]; + homepage = "https://github.com/catppuccin/vscode"; + license = lib.licenses.mit; + maintainers = [ ]; }; }; catppuccin-vsc-icons = buildVscodeMarketplaceExtension { mktplcRef = { name = "catppuccin-vsc-icons"; publisher = "catppuccin"; - version = "1.10.0"; - hash = "sha256-6klrnMHAIr+loz7jf7l5EZPLBhgkJODFHL9fzl1MqFI="; + version = "1.16.0"; + hash = "sha256-caIOQ2/NafUFp2J4odIM55kzOS3Of+WO84M5xNfkhf4="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/Catppuccin.catppuccin-vsc-icons/changelog"; description = "Soothing pastel icon theme for VSCode"; - license = lib.licenses.mit; downloadPage = "https://marketplace.visualstudio.com/items?itemName=Catppuccin.catppuccin-vsc-icons"; + homepage = "https://github.com/catppuccin/vscode-icons"; + license = lib.licenses.mit; maintainers = [ lib.maintainers.laurent-f1z1 ]; }; }; }; - charliermarsh.ruff = buildVscodeMarketplaceExtension { - mktplcRef = - let - sources = { - "x86_64-linux" = { - arch = "linux-x64"; - hash = "sha256-2c0tH/MlDOqeyffcV8ZCy4woogBTcf1GCuPPO8JXaWc="; - }; - "x86_64-darwin" = { - arch = "darwin-x64"; - hash = "sha256-euvGIlO7931N56R5BWKu3F9nSEoDgf+DXk7Hgl1qSUw="; - }; - "aarch64-linux" = { - arch = "linux-arm64"; - hash = "sha256-dGpIHChnfrQbxRZDuoAi4imgStyyPdxdvTQ3lknMYu0="; - }; - "aarch64-darwin" = { - arch = "darwin-arm64"; - hash = "sha256-tElX4C0I5AmpxSHMtqOsxSAUImD1tqArB5fnvhw4LFc="; - }; - }; - in - { - name = "ruff"; - publisher = "charliermarsh"; - version = "2024.4.0"; - } - // sources.${stdenv.system} or (throw "Unsupported system ${stdenv.system}"); - meta = { - license = lib.licenses.mit; - changelog = "https://marketplace.visualstudio.com/items/charliermarsh.ruff/changelog"; - description = "Visual Studio Code extension with support for the Ruff linter"; - downloadPage = "https://marketplace.visualstudio.com/items?itemName=charliermarsh.ruff"; - homepage = "https://github.com/astral-sh/ruff-vscode"; - maintainers = [ lib.maintainers.azd325 ]; - }; - }; + charliermarsh.ruff = callPackage ./charliermarsh.ruff { }; cameron.vscode-pytest = buildVscodeMarketplaceExtension { mktplcRef = { @@ -1076,29 +1047,29 @@ let sources = { "x86_64-linux" = { arch = "linux-x64"; - hash = "sha256-ZlbPRFQwvZNCp8K/rbHqVa3coXa2dT4nOrNChC9naC8="; + hash = "sha256-X6Oszc88F0ENABwX63uwxbJ4VPQOQzZbJA87znVg5d8="; }; "x86_64-darwin" = { arch = "darwin-x64"; - hash = "sha256-hSRdvno8VZNi48rckaqWbAgDXT6RXEcPnkNOT8DV1wA="; + hash = "sha256-NH3kGmNZpKofNplw+FRJFvV3m36HRuIqGR3zt6X5x60="; }; "aarch64-linux" = { arch = "linux-arm64"; - hash = "sha256-rimE7dKT6zajHo6E42z7IyfP35xBXThIwMHhZjaZwHk="; + hash = "sha256-hlFAMz17cl2/1CK7/dgrLktcPZYAcccIWIpkAVdwpkI="; }; "aarch64-darwin" = { arch = "darwin-arm64"; - hash = "sha256-7TeUAZLiEnqi5i5nHLhtv5aMxIcw7iiABOAkwP1YYqM="; + hash = "sha256-oVkmdw0sHv5Y+ysT4zWW6qFDh/h4/TcgSAauh1KrE1c="; }; }; in { name = "continue"; publisher = "Continue"; - version = "0.8.40"; + version = "0.8.44"; } // sources.${stdenv.system}; - nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ]; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; buildInputs = [ stdenv.cc.cc.lib ]; meta = { description = "Open-source autopilot for software development - bring the power of ChatGPT to your IDE"; @@ -1128,6 +1099,23 @@ let }; }; + csharpier.csharpier-vscode = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "csharpier-vscode"; + publisher = "csharpier"; + version = "1.7.3"; + hash = "sha256-/ZLjnlLl6xmgEazdCbnuE6UuuV1tDwAjpxz+vmBuYHE="; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/csharpier.csharpier-vscode/changelog"; + description = "CSharpier code formatter for Visual Studio Code"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=csharpier.csharpier-vscode"; + homepage = "https://github.com/belav/csharpier"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.magnouvean ]; + }; + }; + cweijan.dbclient-jdbc = buildVscodeMarketplaceExtension { mktplcRef = { name = "dbclient-jdbc"; @@ -1173,6 +1161,23 @@ let }; }; + danielsanmedium.dscodegpt = buildVscodeMarketplaceExtension { + mktplcRef = { + publisher = "DanielSanMedium"; + name = "dscodegpt"; + version = "3.4.10"; + hash = "sha256-zjaM9YME0wfBOwhJTacnQbQvw35QL5NvXIBAx5d/bjI="; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/DanielSanMedium.dscodegpt/changelog"; + description = "Easily connect to AI providers using their official APIs in VSCode"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=DanielSanMedium.dscodegpt"; + homepage = "https://codegpt.co"; + license = lib.licenses.unfree; + maintainers = [ lib.maintainers.onny ]; + }; + }; + daohong-emilio.yash = buildVscodeMarketplaceExtension { mktplcRef = { publisher = "daohong-emilio"; @@ -1208,12 +1213,29 @@ let meta.license = lib.licenses.mit; }; + databricks.databricks = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "databricks"; + publisher = "databricks"; + version = "2.3.1"; + hash = "sha256-Qa839ygG8Z3aD/ZSshe2hg0ee3ZFU8xRrJ5E0cUjfCU="; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/databricks.databricks/changelog"; + description = "Databricks extension for Visual Studio Code"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=databricks.databricks"; + homepage = "https://github.com/databricks/databricks-vscode"; + license = lib.licenses.databricks-license; + maintainers = [ lib.maintainers.softinio ]; + }; + }; + davidanson.vscode-markdownlint = buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-markdownlint"; publisher = "DavidAnson"; - version = "0.55.0"; - hash = "sha256-slfHfRPcuRu+649n6kAr2bv9H6J+DvYVN/ysq1QpPQM="; + version = "0.56.0"; + hash = "sha256-ITSpPe032XcGIlfRQtJSR0iNTizs85qwfRaTtKwNn50="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/DavidAnson.vscode-markdownlint/changelog"; @@ -1245,8 +1267,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"; @@ -1262,8 +1284,8 @@ let mktplcRef = { name = "vscode-deno"; publisher = "denoland"; - version = "3.17.0"; - hash = "sha256-ETwpUrYbPXHSkEBq2oM1aCBwt9ItLcXMYc3YWjHLiJE="; + version = "3.38.0"; + hash = "sha256-wmcMkX1gmFhE6JukvOI3fez05dP7ZFAZz1OxmV8uu4k="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/denoland.vscode-deno/changelog"; @@ -1523,8 +1545,8 @@ let # semver scheme, contrary to preview versions which are listed on # the VSCode Marketplace and use a calver scheme. We should avoid # using preview versions, because they expire after two weeks. - version = "14.9.0"; - hash = "sha256-Z6KeIUw1SLZ4tUgs7sU9IJO/6diozPxQuTbXr6DayHA="; + version = "15.1.0"; + hash = "sha256-xGgm/WNJDIh/Bs11fLYwHQ9ULiZBWbKw4QYl/l4KYJ4="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/eamodio.gitlens/changelog"; @@ -1620,8 +1642,8 @@ let mktplcRef = { name = "elixir-ls"; publisher = "JakeBecker"; - version = "0.22.0"; - hash = "sha256-pus5rOyVgheiblvWrkM3H/GZifBzUGR++JiHN4aU/3I="; + version = "0.23.1"; + hash = "sha256-rwpaixQbuxVkH4wlKPG4Qk69IylwjfCtyfUcqCuN/e8="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/JakeBecker.elixir-ls/changelog"; @@ -1790,6 +1812,23 @@ let }; }; + fill-labs.dependi = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "dependi"; + publisher = "fill-labs"; + version = "0.7.10"; + hash = "sha256-m8W21ztTmEOjDI1KCymeBgQzg9jdgKG9dCFp+U1D818="; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/fill-labs.dependi/changelog"; + description = "VSCode extension for managing dependencies and address vulnerabilities in Rust, Go, JavaScript, and Python projects"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=fill-labs.dependi"; + homepage = "https://github.com/filllabs/dependi"; + license = lib.licenses.unfree; + maintainers = [ lib.maintainers._21CSM ]; + }; + }; + firefox-devtools.vscode-firefox-debug = buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-firefox-debug"; @@ -1998,8 +2037,8 @@ let mktplcRef = { publisher = "github"; name = "copilot"; - version = "1.200.920"; - hash = "sha256-LMShW9GN/wsDBodVn33Ui4qW0619r13VO2rSTPVE9TQ="; + version = "1.219.1028"; # compatible with vscode ^1.92.0 + hash = "sha256-5f1P/CV6+Rp2kS9oSz5Ko5jMUt/Q6pWa9a+3nPyin6k="; }; meta = { @@ -2015,8 +2054,8 @@ let mktplcRef = { publisher = "github"; name = "copilot-chat"; - version = "0.16.2024060502"; # compatible with vscode 1.90.0 - hash = "sha256-SAydDc3JlJzfCtbJICy3rWx8psVPdRdPfOuzR9Dqtp8="; + version = "0.19.2024073102"; # compatible with vscode ^1.92.0 + hash = "sha256-ekRBmJiAav1gITWlqBOuWtZMt1YZeseF+3fw326db/s="; }; meta = { description = "GitHub Copilot Chat is a companion extension to GitHub Copilot that houses experimental chat features"; @@ -2047,8 +2086,8 @@ let mktplcRef = { name = "vscode-github-actions"; publisher = "github"; - version = "0.26.2"; - hash = "sha256-sEc6Fbn4XpK8vNK32R4fjnx/R+1xYOwcuhKlo7sPd5o="; + version = "0.26.3"; + hash = "sha256-tHUpYK6RmLl1s1J+N5sd9gyxTJSNGT1Md/CqapXs5J4="; }; meta = { description = "Visual Studio Code extension for GitHub Actions workflows and runs for github.com hosted repositories"; @@ -2080,8 +2119,8 @@ let mktplcRef = { name = "gitlab-workflow"; publisher = "gitlab"; - version = "3.60.0"; - hash = "sha256-rH0+6sQfBfI8SrKY9GGtTOONdzKus6Z62E8Qv5xY7Fw="; + version = "5.13.0"; + hash = "sha256-A9QFW6Vk+g0pJfpXmZdUWJ/+WJBFXG79NXpCBuTjjok="; }; meta = { description = "GitLab extension for Visual Studio Code"; @@ -2112,8 +2151,8 @@ let mktplcRef = { name = "Go"; publisher = "golang"; - version = "0.40.0"; - hash = "sha256-otAq6ul2l64zpRJdekCb7XZiE2vgpLUfM4NUdRPZX8w="; + version = "0.41.4"; + hash = "sha256-ntrEI/l+UjzqGJmtyfVf/+sZJstZy3fm/PSWKTd7/Q0="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/golang.Go/changelog"; @@ -2152,7 +2191,7 @@ let downloadPage = "https://marketplace.visualstudio.com/items?itemName=GraphQL.vscode-graphql"; homepage = "https://github.com/graphql/graphiql/tree/main/packages/vscode-graphql"; license = lib.licenses.mit; - maintainers = [ lib.maintainers.Enzime ]; + maintainers = [ ]; }; }; @@ -2160,15 +2199,15 @@ let mktplcRef = { name = "vscode-graphql-syntax"; publisher = "GraphQL"; - version = "1.1.0"; - hash = "sha256-qazU0UyZ9de6Huj2AYZqqBo4jVW/ZQmFJhV7XXAblxo="; + version = "1.3.6"; + hash = "sha256-74Y/LpOhAj3TSplohhJqBwJDT87nCAiKrWsF90bc8jU="; }; meta = { description = "Adds full GraphQL syntax highlighting and language support such as bracket matching"; downloadPage = "https://marketplace.visualstudio.com/items?itemName=GraphQL.vscode-graphql-syntax"; homepage = "https://github.com/graphql/graphiql/tree/main/packages/vscode-graphql-syntax"; license = lib.licenses.mit; - maintainers = [ lib.maintainers.Enzime ]; + maintainers = [ ]; }; }; @@ -2318,6 +2357,22 @@ let }; }; + huytd.nord-light = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "nord-light"; + publisher = "huytd"; + version = "0.1.1"; + hash = "sha256-q2GG3j5j3CLGF02J7/plywKLkhUmm2Gn3MiSVmiZ+48="; + }; + meta = { + description = "Light theme for VSCode based on the Nord color palette"; + license = lib.licenses.mit; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=huytd.nord-light"; + homepage = "https://github.com/huytd/vscode-nord-light"; + maintainers = [ lib.maintainers.Flameopathic ]; + }; + }; + ibm.output-colorizer = buildVscodeMarketplaceExtension { mktplcRef = { name = "output-colorizer"; @@ -2545,7 +2600,7 @@ let downloadPage = "https://marketplace.visualstudio.com/items?itemName=jeff-hykin.better-nix-syntax"; homepage = "https://github.com/jeff-hykin/better-nix-syntax"; license = lib.licenses.mit; - maintainers = [ lib.maintainers.superherointj ]; + maintainers = [ ]; }; }; @@ -2620,6 +2675,22 @@ let }; }; + jgclark.vscode-todo-highlight = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-todo-highlight"; + publisher = "jgclark"; + version = "2.0.8"; + hash = "sha256-/CctaLcG+dA2Cf69/ACeDKdRLsu/VUGbAxUbyhI0VyA="; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/wayou.vscode-todo-highlight/changelog"; + description = "highlight TODOs, FIXMEs, and any keywords, annotations..."; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=jgclark.vscode-todo-highlight"; + homepage = "https://github.com/jgclark/vscode-todo-highlight"; + license = lib.licenses.mit; + }; + }; + julialang.language-julia = buildVscodeMarketplaceExtension { mktplcRef = { name = "language-julia"; @@ -2762,8 +2833,8 @@ let mktplcRef = { name = "vscode-publint"; publisher = "Kravets"; - version = "0.0.1"; - hash = "sha256-6nG5Yqi8liumQ2K9ynV8mNXiXGaGo/cp4Cib1kqdp1c="; + version = "0.0.3"; + hash = "sha256-1KVqfCVyCn5LJOdazp3W6FECRGOviVC4+FHn6vTn5DI="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/Kravets.vscode-publint/changelog"; @@ -2807,13 +2878,14 @@ let mktplcRef = { name = "vscord"; publisher = "leonardssh"; - version = "5.2.12"; - hash = "sha256-WGDEizYG6UAqe1jnhvjfFouXDA9Yr5P+BjxPahAIsTE="; + version = "5.2.13"; + hash = "sha256-Jgm3ekXFLhylX7RM6tdfi+lRLrcl4UQGmRHbr27M59M="; }; meta = { description = "Highly customizable Discord Rich Presence extension for Visual Studio Code"; downloadPage = "https://marketplace.visualstudio.com/items?itemName=leonardssh.vscord"; homepage = "https://github.com/leonardssh/vscord"; + maintainers = [ lib.maintainers.ryand56 ]; license = lib.licenses.mit; }; }; @@ -2970,10 +3042,14 @@ let mktplcRef = { name = "rainbow-csv"; publisher = "mechatroner"; - version = "3.6.0"; - hash = "sha256-bvxMnT6oSjflAwWQZkNnEoEsVlVg86T0TMYi8tNsbdQ="; + version = "3.12.0"; + hash = "sha256-pnHaszLa4a4ptAubDUY+FQX3F6sQQUQ/sHAxyZsbhcQ="; }; meta = { + changelog = "https://marketplace.visualstudio.com/items/mechatroner.rainbow-csv/changelog"; + description = "Rainbow syntax higlighting for CSV and TSV files in Visual Studio Code"; + downloadPage = "https://marketplace.visualstudio.com/items?itemname=mechatroner.rainbow-csv"; + homepage = "https://github.com/mechatroner/vscode_rainbow_csv"; license = lib.licenses.mit; }; }; @@ -3012,8 +3088,6 @@ let }; }; - mgt19937.typst-preview = callPackage ./mgt19937.typst-preview { }; - mhutchie.git-graph = buildVscodeMarketplaceExtension { mktplcRef = { name = "git-graph"; @@ -3061,16 +3135,18 @@ let description = "direnv support for Visual Studio Code"; license = lib.licenses.bsd0; downloadPage = "https://marketplace.visualstudio.com/items?itemName=mkhl.direnv"; - maintainers = [ lib.maintainers.nullx76 ]; + maintainers = [ ]; }; }; + mongodb.mongodb-vscode = callPackage ./mongodb.mongodb-vscode { }; + moshfeu.compare-folders = buildVscodeMarketplaceExtension { mktplcRef = { name = "compare-folders"; publisher = "moshfeu"; - version = "0.24.2"; - hash = "sha256-EiGuYRMN8bXq+Cya38U+dCX2W0wzIeP0yb39WBJaX1U="; + version = "0.24.3"; + hash = "sha256-eaumF2BIqEYoyL7LQ0Wx3+gkkFGpWKQoN3AisI8wTQY="; }; meta = { @@ -3102,6 +3178,72 @@ let ms-dotnettools.csdevkit = callPackage ./ms-dotnettools.csdevkit { }; ms-dotnettools.csharp = callPackage ./ms-dotnettools.csharp { }; + ms-dotnettools.vscode-dotnet-runtime = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-dotnet-runtime"; + publisher = "ms-dotnettools"; + version = "2.1.1"; + hash = "sha256-k14bjWITPDduJi79W59SnMV2TFNRCeAymhs6u1Y0vzk="; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/ms-dotnettools.vscode-dotnet-runtime/changelog"; + description = "Provides a way for other Visual Studio Code extensions to install local versions of .NET SDK/Runtime"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=ms-dotnettools.vscode-dotnet-runtime"; + homepage = "https://github.com/dotnet/vscode-dotnet-runtime"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.magnouvean ]; + }; + }; + + ms-dotnettools.vscodeintellicode-csharp = buildVscodeMarketplaceExtension { + mktplcRef = + let + sources = { + "x86_64-linux" = { + arch = "linux-x64"; + hash = "sha256-oQMwzQuW5vjxtDboRCeiEO5aytsAY6rb14JDTmK3JPg="; + }; + "x86_64-darwin" = { + arch = "darwin-x64"; + hash = "sha256-/9+qtLDNYUFvdoehit3BihA38p6RqJ7na5Q27xxpZk0="; + }; + "aarch64-linux" = { + arch = "linux-arm64"; + hash = "sha256-JqLlYMKyTXaEzuTPPxVaO8WJiuCUN+9xBzyA6+aYdSc="; + }; + "aarch64-darwin" = { + arch = "darwin-arm64"; + hash = "sha256-dhiUePePkO3MxRQ5UP+lOxRax503JlERe/GWJ8pPUIg="; + }; + }; + in + { + name = "vscodeintellicode-csharp"; + publisher = "ms-dotnettools"; + version = "2.1.11"; + } + // sources.${stdenv.system}; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; + buildInputs = [ + stdenv.cc.cc.lib + zlib + ]; + meta = { + changelog = "https://marketplace.visualstudio.com/items/ms-dotnettools.vscodeintellicode-csharp/changelog"; + description = "AI-assisted development features for C# in Visual Studio Code"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=ms-dotnettools.vscodeintellicode-csharp"; + homepage = "https://github.com/MicrosoftDocs/intellicode"; + license = lib.licenses.unfree; + maintainers = [ lib.maintainers.magnouvean ]; + platforms = [ + "x86_64-linux" + "x86_64-darwin" + "aarch64-darwin" + "aarch64-linux" + ]; + }; + }; + ms-kubernetes-tools.vscode-kubernetes-tools = buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-kubernetes-tools"; @@ -3135,15 +3277,36 @@ let mktplcRef = { name = "black-formatter"; publisher = "ms-python"; - version = "2023.4.1"; - hash = "sha256-IJaLke0WF1rlKTiuwJHAXDQB1SS39AoQhc4iyqqlTyY="; + version = "2024.2.0"; + hash = "sha256-qIO+YqTXjwgznzUlnPSts1R2BM6iN8B9vESkelGPgZM="; }; - meta = with lib; { + meta = { + changelog = "https://marketplace.visualstudio.com/items/ms-python.black-formatter/changelog"; description = "Formatter extension for Visual Studio Code using black"; downloadPage = "https://marketplace.visualstudio.com/items?itemName=ms-python.black-formatter"; homepage = "https://github.com/microsoft/vscode-black-formatter"; - license = licenses.mit; - maintainers = with maintainers; [ sikmir ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + amadejkastelic + sikmir + ]; + }; + }; + + ms-python.flake8 = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "flake8"; + publisher = "ms-python"; + version = "2023.10.0"; + hash = "sha256-4Vjw8yJPrxLg0hcoTw8AEBEcmQ9sEUNqFaHLxICks0E="; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/ms-python.flake8/changelog"; + description = "Python linting support for VS Code using Flake8"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=ms-python.flake8"; + homepage = "https://github.com/microsoft/vscode-flake8"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.amadejkastelic ]; }; }; @@ -3163,6 +3326,23 @@ let }; }; + ms-python.pylint = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "pylint"; + publisher = "ms-python"; + version = "2023.10.1"; + hash = "sha256-1tI5u33c5CHFQxkJZ/OxW3ZA5qPr4RoCIf6dqIMPykQ="; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/ms-python.pylint/changelog"; + description = "Python linting support for VS Code using Pylint"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=ms-python.pylint"; + homepage = "https://github.com/microsoft/vscode-pylint"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.amadejkastelic ]; + }; + }; + ms-python.python = callPackage ./ms-python.python { }; ms-python.debugpy = buildVscodeMarketplaceExtension { @@ -3187,8 +3367,8 @@ let mktplcRef = { name = "datawrangler"; publisher = "ms-toolsai"; - version = "0.29.6"; - hash = "sha256-9MR2+hb9YdjIGDfUkdLW41HOxhjeS/San49C8QRZ/YY="; + version = "1.7.2"; + hash = "sha256-3UK87MhDBCT4La8jRgmkRJJQPZbgvOu0+VBea7ho9hs="; }; meta = { @@ -3380,8 +3560,8 @@ let mktplcRef = { name = "remote-containers"; publisher = "ms-vscode-remote"; - version = "0.347.0"; - hash = "sha256-E9H1nPWG5JuzBxbYc/yWd8Y3azEWrd9whGirl0GK7kU="; + version = "0.376.0"; + hash = "sha256-fJ8ZcwGFWXzJZ8UgnzTxR+842vjiU0qCjV/zWzbq/KQ="; }; meta = { description = "Open any folder or repository inside a Docker container"; @@ -3525,8 +3705,8 @@ let mktplcRef = { name = "vscode-just-syntax"; publisher = "nefrob"; - version = "0.3.0"; - hash = "sha256-WBoqH9TNco9lyjOJfP54DynjmYZmPUY+YrZ1rQlC518="; + version = "0.5.1"; + hash = "sha256-DacDGK8gqlt8u0ZKcVxZ7jiUFFEX3ixv3P7RKWJVluA="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/nefrob.vscode-just-syntax/changelog"; @@ -3602,8 +3782,8 @@ let mktplcRef = { name = "ocaml-platform"; publisher = "ocamllabs"; - version = "1.12.2"; - hash = "sha256-dj8UFbYgAl6dt/1MuIBawTVUbBDTTedZEcHtKZjEcew="; + version = "1.20.0"; + hash = "sha256-lHTnyObWWhMIXipqdII9GYLGQDFPMFP5y/L/ai9325o="; }; }; @@ -3639,8 +3819,8 @@ let mktplcRef = { name = "phind"; publisher = "phind"; - version = "0.22.2"; - hash = "sha256-nN/7IVa4WaA5V39CHx0nrvWBmBNtISvAINTQzk02x1w="; + version = "0.25.3"; + hash = "sha256-GPFeI7tVLfzlGyal2LbsyTgPkWY/nPWnXtS38S9pvxo="; }; meta = { description = "Using Phind AI service to provide answers based on the code context"; @@ -3893,8 +4073,8 @@ let mktplcRef = { name = "wikitext"; publisher = "RoweWilsonFrederiskHolme"; - version = "3.8.1"; - hash = "sha256-piwS3SPjx10nsjN5axC+EN0MEDf0r2lVFllqQzciOfc="; + version = "3.8.2"; + hash = "sha256-rWifSoJSN37xPIaCQgPyXRz9tCX2Akahl/3CuqzXq94="; }; meta = { description = "Extension that helps users view and write MediaWiki's Wikitext files"; @@ -3986,6 +4166,23 @@ let }; }; + sas.sas-lsp = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "sas-lsp"; + publisher = "SAS"; + version = "1.10.2"; + hash = "sha256-mf0q80UX4FxqHAHJBQlhkF/nqvTnfgTR8GuYBoWSswU="; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/SAS.sas-lsp/changelog"; + description = "Official SAS Language Extension"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=SAS.sas-lsp"; + homepage = "https://github.com/sassoftware/vscode-sas-extension"; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.scraptux ]; + }; + }; + scala-lang.scala = buildVscodeMarketplaceExtension { mktplcRef = { name = "scala"; @@ -4039,10 +4236,11 @@ let mktplcRef = { publisher = "seatonjiang"; name = "gitmoji-vscode"; - version = "1.2.2"; - hash = "sha256-+lwbCLV62y1IHrjCygBphQZJUu+ZApYTwBQld5uu12w="; + version = "1.2.5"; + hash = "sha256-lWd7SyYNxoDauMecJq11akTiwEKBeXuR4htDYCbb6n4="; }; meta = { + changelog = "https://marketplace.visualstudio.com/items/seatonjiang.gitmoji-vscode/changelog"; description = "Gitmoji tool for git commit messages in VSCode"; downloadPage = "https://marketplace.visualstudio.com/items?itemName=seatonjiang.gitmoji-vscode"; homepage = "https://github.com/seatonjiang/gitmoji-vscode/"; @@ -4081,8 +4279,8 @@ let mktplcRef = { publisher = "shd101wyy"; name = "markdown-preview-enhanced"; - version = "0.8.13"; - hash = "sha256-DxM7oWAbIonsKTvJjxX4oTaBwvRcxNT2y10ljYAzVeI="; + version = "0.8.14"; + hash = "sha256-vCuuPB/GTkM2xCBn1UF3CZwP49Ge/8eelHhg67EG7tQ="; }; meta = { description = "Provides a live preview of markdown using either markdown-it or pandoc"; @@ -4137,7 +4335,7 @@ let downloadPage = "https://marketplace.visualstudio.com/items?itemName=signageos.signageos-vscode-sops"; homepage = "https://github.com/signageos/vscode-sops"; license = lib.licenses.unfree; - maintainers = [ lib.maintainers.superherointj ]; + maintainers = [ ]; }; }; @@ -4240,6 +4438,23 @@ let }; }; + sswg.swift-lang = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "swift-lang"; + publisher = "sswg"; + version = "1.10.4"; + hash = "sha256-5NrWBuaNdDNF0ON0HUwdwPFsRO3Hfe0UW4AooJbjiA0="; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/sswg.swift-lang/changelog"; + description = "Swift Language Support for Visual Studio Code"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=sswg.swift-lang"; + homepage = "https://github.com/swiftlang/vscode-swift"; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.uncenter ]; + }; + }; + stefanjarina.vscode-eex-snippets = buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-eex-snippets"; @@ -4294,8 +4509,8 @@ let mktplcRef = { name = "code-spell-checker"; publisher = "streetsidesoftware"; - version = "4.0.3"; - hash = "sha256-CEGwbw5RpFsfB/g2inScIqWB7/3oxgxz7Yuc6V3OiHg="; + version = "4.0.7"; + hash = "sha256-y+xD8rOa/ljavAF7tdEpaOKEd4gUzfH15WBwMHyW7z4="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/streetsidesoftware.code-spell-checker/changelog"; @@ -4670,8 +4885,8 @@ let mktplcRef = { name = "uiua-vscode"; publisher = "uiua-lang"; - version = "0.0.44"; - hash = "sha256-lumK7gcj/NIhiZKT6F++ZsTFKWw7ZVaKZgIsQvZAGs4="; + version = "0.0.54"; + hash = "sha256-oY8z3q4LOLhiTttm9Rtcy/CnhaSHkjyCBjwqYnuNBQA="; }; meta = { description = "VSCode language extension for Uiua"; @@ -5164,8 +5379,8 @@ let mktplcRef = { name = "pretty-ts-errors"; publisher = "yoavbls"; - version = "0.5.3"; - hash = "sha256-JSCyTzz10eoUNu76wNUuvPVVKq4KaVKobS1CAPqgXUA="; + version = "0.5.4"; + hash = "sha256-SMEqbpKYNck23zgULsdnsw4PS20XMPUpJ5kYh1fpd14="; }; meta = { description = "Make TypeScript errors prettier and human-readable in VSCode"; @@ -5336,6 +5551,7 @@ let jakebecker.elixir-ls = throw "jakebecker.elixir-ls is deprecated in favor of elixir-lsp.vscode-elixir-ls"; # Added 2024-05-29 jpoissonnier.vscode-styled-components = throw "jpoissonnier.vscode-styled-components is deprecated in favor of styled-components.vscode-styled-components"; # Added 2024-05-29 matklad.rust-analyzer = throw "matklad.rust-analyzer is deprecated in favor of rust-lang.rust-analyzer"; # Added 2024-05-29 + mgt19937.typst-preview = throw "The features of 'typst-preview' have been consolidated to 'tinymist', an all-in-one language server for typst"; # Added 2024-07-07 ms-vscode.go = throw "ms-vscode.go is deprecated in favor of golang.go"; # Added 2024-05-29 ms-vscode.PowerShell = throw "ms-vscode.PowerShell is deprecated in favor of super.ms-vscode.powershell"; # Added 2024-05-29 rioj7.commandOnAllFiles = throw "rioj7.commandOnAllFiles is deprecated in favor of rioj7.commandonallfiles"; # Added 2024-05-29 diff --git a/pkgs/applications/editors/vscode/extensions/jebbs.plantuml/default.nix b/pkgs/applications/editors/vscode/extensions/jebbs.plantuml/default.nix index eb6b5ab49626c..8abf052323b22 100644 --- a/pkgs/applications/editors/vscode/extensions/jebbs.plantuml/default.nix +++ b/pkgs/applications/editors/vscode/extensions/jebbs.plantuml/default.nix @@ -28,6 +28,6 @@ vscode-utils.buildVscodeMarketplaceExtension { homepage = "https://github.com/qjebbs/vscode-plantuml"; changelog = "https://marketplace.visualstudio.com/items/jebbs.plantuml/changelog"; license = lib.licenses.mit; - maintainers = [ lib.maintainers.victormignot ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/editors/vscode/extensions/mgt19937.typst-preview/default.nix b/pkgs/applications/editors/vscode/extensions/mgt19937.typst-preview/default.nix deleted file mode 100644 index c3319e375d094..0000000000000 --- a/pkgs/applications/editors/vscode/extensions/mgt19937.typst-preview/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -# Keep pkgs/by-name/ty/typst-preview/package.nix in sync with this extension - -{ - vscode-utils, - lib, - jq, - moreutils, - typst-preview, -}: - -vscode-utils.buildVscodeMarketplaceExtension { - mktplcRef = { - name = "typst-preview"; - publisher = "mgt19937"; - version = "0.11.7"; - hash = "sha256-70dVGoSBDKCtvn7xiC/gAh4OQ8nNDiI/M900r2zlOfU="; - }; - - buildInputs = [ typst-preview ]; - - nativeBuildInputs = [ - jq - moreutils - ]; - - postInstall = '' - cd "$out/$installPrefix" - jq '.contributes.configuration.properties."typst-preview.executable".default = "${lib.getExe typst-preview}"' package.json | sponge package.json - ''; - - meta = { - description = "Typst Preview is an extension for previewing your Typst files in vscode instantly"; - downloadPage = "https://marketplace.visualstudio.com/items?itemName=mgt19937.typst-preview"; - homepage = "https://github.com/Enter-tainer/typst-preview-vscode"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.drupol ]; - }; -} diff --git a/pkgs/applications/editors/vscode/extensions/mongodb.mongodb-vscode/default.nix b/pkgs/applications/editors/vscode/extensions/mongodb.mongodb-vscode/default.nix new file mode 100644 index 0000000000000..d9ab51bb69553 --- /dev/null +++ b/pkgs/applications/editors/vscode/extensions/mongodb.mongodb-vscode/default.nix @@ -0,0 +1,19 @@ +{ lib, vscode-utils }: + +vscode-utils.buildVscodeMarketplaceExtension { + mktplcRef = { + name = "mongodb-vscode"; + publisher = "mongodb"; + version = "1.8.1"; + hash = "sha256-dHvYl3bg5OB/HYBoHQnUODhAob/ZylFNGLAuUQByvdM="; + }; + + meta = { + changelog = "https://github.com/mongodb-js/vscode/blob/main/CHANGELOG.md"; + description = "An extension for VS Code that makes it easy to work with your data in MongoDB"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=mongodb.mongodb-vscode"; + homepage = "https://github.com/mongodb-js/vscode"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ drupol ]; + }; +} diff --git a/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/default.nix b/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/default.nix index b98c35a3f078b..68a3673134ce4 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/default.nix @@ -14,7 +14,7 @@ let { x86_64-linux = { arch = "linux-x64"; - hash = "sha256-7m85Zl9oV40le3nkNPzoKu/AAf8XhQpI8sBMsQXmBg8="; + hash = "sha256-yPenOk2sKt3DGmb69Ewbz8YT5KU371wizLdqfHCxBfg="; binaries = [ "components/vs-green-server/platforms/linux-x64/node_modules/@microsoft/servicehub-controller-net60.linux-x64/Microsoft.ServiceHub.Controller" "components/vs-green-server/platforms/linux-x64/node_modules/@microsoft/visualstudio-code-servicehost.linux-x64/Microsoft.VisualStudio.Code.ServiceHost" @@ -24,7 +24,7 @@ let }; aarch64-linux = { arch = "linux-arm64"; - hash = "sha256-39D55EdwE4baDYbHc9GD/1XoxGbQkUkS1H2uysJHlxw="; + hash = "sha256-zjGyewO5Ss0kBr2GyWa/sBPy1K21MrNsIwzDBjGKlCc="; binaries = [ "components/vs-green-server/platforms/linux-arm64/node_modules/@microsoft/servicehub-controller-net60.linux-arm64/Microsoft.ServiceHub.Controller" "components/vs-green-server/platforms/linux-arm64/node_modules/@microsoft/visualstudio-code-servicehost.linux-arm64/Microsoft.VisualStudio.Code.ServiceHost" @@ -34,7 +34,7 @@ let }; x86_64-darwin = { arch = "darwin-x64"; - hash = "sha256-gfhJX07R+DIw9FbzaEE0JZwEmDeifiq4vHyMHZZ1udM="; + hash = "sha256-nhX04v+r8IbUJ5Uoryuxvthn07MAoncDr5dxptlv9GM="; binaries = [ "components/vs-green-server/platforms/darwin-x64/node_modules/@microsoft/servicehub-controller-net60.darwin-x64/Microsoft.ServiceHub.Controller" "components/vs-green-server/platforms/darwin-x64/node_modules/@microsoft/visualstudio-code-servicehost.darwin-x64/Microsoft.VisualStudio.Code.ServiceHost" @@ -44,7 +44,7 @@ let }; aarch64-darwin = { arch = "darwin-arm64"; - hash = "sha256-vogstgCWvI9csNF9JfJ41XPR1POy842g2yhWqIDoHLw="; + hash = "sha256-IvH2wmaiw/TAMzuaFg+5gsKxjnp+Hi3PQnGLXp1KEHM="; binaries = [ "components/vs-green-server/platforms/darwin-arm64/node_modules/@microsoft/servicehub-controller-net60.darwin-arm64/Microsoft.ServiceHub.Controller" "components/vs-green-server/platforms/darwin-arm64/node_modules/@microsoft/visualstudio-code-servicehost.darwin-arm64/Microsoft.VisualStudio.Code.ServiceHost" @@ -59,7 +59,7 @@ buildVscodeMarketplaceExtension { mktplcRef = { name = "csdevkit"; publisher = "ms-dotnettools"; - version = "1.4.28"; + version = "1.8.14"; inherit (extInfo) hash arch; }; sourceRoot = "extension"; # This has more than one folder. @@ -106,7 +106,7 @@ buildVscodeMarketplaceExtension { chmod +x "${bin}" '') extInfo.binaries )) - + lib.optionalString stdenv.isLinux ( + + lib.optionalString stdenv.hostPlatform.isLinux ( lib.concatStringsSep "\n" ( map (bin: '' patchelf_common "${bin}" diff --git a/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix b/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix index 189804e981781..3e988c6272192 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix @@ -29,22 +29,22 @@ let { x86_64-linux = { arch = "linux-x64"; - hash = "sha256-si4HKGVIHu44QNlNI2WEnMff9+QZOMWiBfWQaaFGyQE="; + hash = "sha256-uCayu7WU+qqiCDxxfO4j1aOypP+O49uNZMnfwq+hO4k="; binaries = linuxBins; }; aarch64-linux = { arch = "linux-arm64"; - hash = "sha256-1IXkSRgCHOLD4VeCdqyy54MXCBUX5RDDb3pf7GQH5jA="; + hash = "sha256-b4Q3JWNdZtLlgxMUBpu+5ppJDILxjPHBZeMxsQHiDa0="; binaries = linuxBins; }; x86_64-darwin = { arch = "darwin-x64"; - hash = "sha256-AAbYjZ+YYyGEXSLkiFfluLf7P4OzPhmHzK44N5XT9UI="; + hash = "sha256-uVI2PmHfhmuQMTCbwrGuLamC1DyjeLCZf41pjT891GE="; binaries = darwinBins; }; aarch64-darwin = { arch = "darwin-arm64"; - hash = "sha256-1m47kX0Jo+UvthNfgdoPdBBOcDyCA8DfP+zRk3SicR0="; + hash = "sha256-zNSvznX7nYTBexlkD49t3Ne66/u3paecZJZwMuPmSf4="; binaries = darwinBins ++ [ ".debugger/arm64/vsdbg-ui" ".debugger/arm64/vsdbg" @@ -57,7 +57,7 @@ buildVscodeMarketplaceExtension { mktplcRef = { name = "csharp"; publisher = "ms-dotnettools"; - version = "2.22.3"; + version = "2.39.29"; inherit (extInfo) hash arch; }; @@ -99,7 +99,7 @@ buildVscodeMarketplaceExtension { chmod +x "${bin}" '') extInfo.binaries )) - + lib.optionalString stdenv.isLinux ( + + lib.optionalString stdenv.hostPlatform.isLinux ( lib.concatStringsSep "\n" ( map (bin: '' patchelf_common "${bin}" diff --git a/pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix b/pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix index 5d56759f08615..ae836457db1e3 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix @@ -21,8 +21,8 @@ vscode-utils.buildVscodeMarketplaceExtension rec { mktplcRef = { name = "python"; publisher = "ms-python"; - version = "2024.5.11021008"; - hash = "sha256-UnI0leRKqCtFLBdGS/UvLuCcxQhibyY0ChmzQ9uytoY="; + version = "2024.15.2024091301"; + hash = "sha256-MB8Vq2rjO37yW3Zh+f8ek/yz0qT+ZYHn/JnF5ZA6CXQ="; }; buildInputs = [ icu ]; diff --git a/pkgs/applications/editors/vscode/extensions/ms-python.vscode-pylance/default.nix b/pkgs/applications/editors/vscode/extensions/ms-python.vscode-pylance/default.nix index 780b0e12896ea..9fc9a29c1b229 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-python.vscode-pylance/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-python.vscode-pylance/default.nix @@ -8,8 +8,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-pylance"; publisher = "MS-python"; - version = "2024.6.1"; - hash = "sha256-NOx0WJC32MUm6TmLkiN67FHKwBmB0S3feFVIQNxR2PQ="; + version = "2024.8.2"; + hash = "sha256-EwxQjCBSmJ78L06EtKB8twIz5x51Jo/DHNlpD31pIKA="; }; buildInputs = [ pyright ]; diff --git a/pkgs/applications/editors/vscode/extensions/ms-toolsai.jupyter/default.nix b/pkgs/applications/editors/vscode/extensions/ms-toolsai.jupyter/default.nix index 25dcb68952141..6d393833277de 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-toolsai.jupyter/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-toolsai.jupyter/default.nix @@ -9,8 +9,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "jupyter"; publisher = "ms-toolsai"; - version = "2024.5.0"; - hash = "sha256-bGHXbqv+YXC8NUXIY+bxFsMvoV6h8E2/2F6Ku4bJwT0="; + version = "2024.9.0"; + hash = "sha256-44L7K8JGpmKmH3aoNCalse8QRKJ/2wvA76gs0Z18zpc="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix b/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix index 13684518a302c..fd3358e99f6d4 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix @@ -1,8 +1,6 @@ { lib, vscode-utils, - writeScript, - runtimeShell, jq, clang-tools, gdbUseFixed ? true, @@ -40,24 +38,27 @@ let gdbDefaultsTo = if gdbUseFixed then "${gdb}/bin/gdb" else "gdb"; + isx86Linux = stdenv.hostPlatform.system == "x86_64-linux"; supported = { x86_64-linux = { - hash = "sha256-arTBt3UWA5zoo0dL044Sx/NT1LUS76XfGIS96NOMvJk="; + hash = "sha256-ek4WBr9ZJ87TXlKQowA68YNt3WNOXymLcVfz1g+Be2o="; arch = "linux-x64"; }; aarch64-linux = { - hash = "sha256-oVuDxx117bVd/jDqn9KivTwR5T2X5UZMHk/nZ/e/IOg="; + hash = "sha256-2+JqosgyoMRFnl8fnCrKljkdF3eU72mXy30ZUnaIerA="; arch = "linux-arm64"; }; }; - base = supported.${stdenv.system} or (throw "unsupported platform ${stdenv.system}"); + base = + supported.${stdenv.hostPlatform.system} + or (throw "unsupported platform ${stdenv.hostPlatform.system}"); in vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = base // { name = "cpptools"; publisher = "ms-vscode"; - version = "1.20.5"; + version = "1.22.2"; }; nativeBuildInputs = [ @@ -73,35 +74,40 @@ vscode-utils.buildVscodeMarketplaceExtension { stdenv.cc.cc.lib ]; - dontAutoPatchelf = true; + dontAutoPatchelf = isx86Linux; - postPatch = '' - mv ./package.json ./package_orig.json - - # 1. Add activation events so that the extension is functional. This listing is empty when unpacking the extension but is filled at runtime. - # 2. Patch `package.json` so that nix's *gdb* is used as default value for `miDebuggerPath`. - cat ./package_orig.json | \ - jq --slurpfile actEvts ${./package-activation-events.json} '(.activationEvents) = $actEvts[0]' | \ - jq '(.contributes.debuggers[].configurationAttributes | .attach , .launch | .properties.miDebuggerPath | select(. != null) | select(.default == "/usr/bin/gdb") | .default) = "${gdbDefaultsTo}"' > \ - ./package.json - - # Prevent download/install of extensions - touch "./install.lock" - - # Clang-format from nix package. - rm -rf ./LLVM - mkdir "./LLVM/" - find "${clang-tools}" -mindepth 1 -maxdepth 1 | xargs ln -s -t "./LLVM" - - # Patching binaries - chmod +x bin/cpptools bin/cpptools-srv bin/cpptools-wordexp bin/libc.so debugAdapters/bin/OpenDebugAD7 - patchelf --replace-needed liblttng-ust.so.0 liblttng-ust.so.1 ./debugAdapters/bin/libcoreclrtraceptprovider.so - ''; + postPatch = + '' + mv ./package.json ./package_orig.json + + # 1. Add activation events so that the extension is functional. This listing is empty when unpacking the extension but is filled at runtime. + # 2. Patch `package.json` so that nix's *gdb* is used as default value for `miDebuggerPath`. + cat ./package_orig.json | \ + jq --slurpfile actEvts ${./package-activation-events.json} '(.activationEvents) = $actEvts[0]' | \ + jq '(.contributes.debuggers[].configurationAttributes | .attach , .launch | .properties.miDebuggerPath | select(. != null) | select(.default == "/usr/bin/gdb") | .default) = "${gdbDefaultsTo}"' > \ + ./package.json + + # Prevent download/install of extensions + touch "./install.lock" + + # Clang-format from nix package. + rm -rf ./LLVM + mkdir "./LLVM/" + find "${clang-tools}" -mindepth 1 -maxdepth 1 | xargs ln -s -t "./LLVM" + + # Patching binaries + chmod +x bin/cpptools bin/cpptools-srv bin/cpptools-wordexp debugAdapters/bin/OpenDebugAD7 + patchelf --replace-needed liblttng-ust.so.0 liblttng-ust.so.1 ./debugAdapters/bin/libcoreclrtraceptprovider.so + '' + + lib.optionalString isx86Linux '' + chmod +x bin/libc.so + ''; + # On aarch64 the binaries are statically linked + # but on x86 they are not. postFixup = - '' + lib.optionalString isx86Linux '' autoPatchelf $out/share/vscode/extensions/ms-vscode.cpptools/debugAdapters - # cpptools* are distributed by the extension and need to be run through the distributed musl interpretter patchelf --set-interpreter $out/share/vscode/extensions/ms-vscode.cpptools/bin/libc.so $out/share/vscode/extensions/ms-vscode.cpptools/bin/cpptools patchelf --set-interpreter $out/share/vscode/extensions/ms-vscode.cpptools/bin/libc.so $out/share/vscode/extensions/ms-vscode.cpptools/bin/cpptools-srv diff --git a/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/update_helper.sh b/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/update_helper.sh index a5d8d6d1d263a..9541700a28b83 100755 --- a/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/update_helper.sh +++ b/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/update_helper.sh @@ -121,8 +121,6 @@ make_trapped_tmpdir find "$monoRuntimeBinaries_storePath" -mindepth 1 -maxdepth 1 | xargs -d '\n' cp -rp -t "$tmpDir" chmod -R a+rwx "$tmpDir" -ls -la "$tmpDir/debugAdapters" - patchelf_mono "$tmpDir/debugAdapters/mono.linux-x86_64" chmod a+x "$tmpDir/debugAdapters/mono.linux-x86_64" @@ -141,8 +139,6 @@ make_trapped_tmpdir find "$clanFormatBinaries_storePath" -mindepth 1 -maxdepth 1 | xargs -d '\n' cp -rp -t "$tmpDir" chmod -R a+rwx "$tmpDir" -ls -la "$tmpDir/bin" - patchelf_clangformat "$tmpDir/bin/clang-format" chmod a+x "$tmpDir/bin/clang-format" 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 99878c88568e7..17cd91ea752e1 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-Oama8FkRhEY4yza77RpWHg0Aeo9WFhveucJqJvCYMJQ="; + hash = "sha256-XkpoSf2UO3OoEMMpXBMkY1peQPR/4QoQ4LrY81IsHT0="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/build-deps/package.json b/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/build-deps/package.json index c7fb097b2d77c..3e7688f0e068c 100644 --- a/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/build-deps/package.json +++ b/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/build-deps/package.json @@ -1,6 +1,6 @@ { "name": "rust-analyzer", - "version": "0.3.1850", + "version": "0.3.2029", "dependencies": { "@hpcc-js/wasm": "^2.13.0", "anser": "^2.1.1", diff --git a/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/default.nix b/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/default.nix index dcdbf3dd2cbf6..e937da9c44b32 100644 --- a/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/default.nix +++ b/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/default.nix @@ -21,13 +21,13 @@ let # Use the plugin version as in vscode marketplace, updated by update script. inherit (vsix) version; - releaseTag = "2024-02-19"; + releaseTag = "2024-07-08"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust-analyzer"; rev = releaseTag; - hash = "sha256-Oj/RPMridKpYt3eRqUIPg9YNrj6npG8THIGuWjsamnE="; + hash = "sha256-STmaV9Zu74QtkGGrbr9uMhskwagfCjJqOAYapXabiuk="; }; build-deps = @@ -52,7 +52,7 @@ let pkg-config libsecret ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit darwin.apple_sdk.frameworks.Security ]; @@ -67,9 +67,7 @@ let ' package.json | sponge package.json mkdir -p $vsix - # vsce ask for continue due to missing LICENSE.md - # Should be removed after https://github.com/rust-lang/rust-analyzer/commit/acd5c1f19bf7246107aaae7b6fe3f676a516c6d2 - echo y | npx vsce package -o $vsix/${pname}.zip + npx vsce package -o $vsix/${pname}.zip ''; }; in @@ -87,7 +85,7 @@ vscode-utils.buildVscodeExtension { ]; preInstall = lib.optionalString setDefaultServerPath '' - jq '.contributes.configuration.properties."rust-analyzer.server.path".default = $s' \ + jq '(.contributes.configuration[] | select(.title == "server") | .properties."rust-analyzer.server.path".default) = $s' \ --arg s "${rust-analyzer}/bin/rust-analyzer" \ package.json | sponge package.json ''; diff --git a/pkgs/applications/editors/vscode/extensions/sourcery.sourcery/default.nix b/pkgs/applications/editors/vscode/extensions/sourcery.sourcery/default.nix index 07616924d18a0..c6b0f26aa5c65 100644 --- a/pkgs/applications/editors/vscode/extensions/sourcery.sourcery/default.nix +++ b/pkgs/applications/editors/vscode/extensions/sourcery.sourcery/default.nix @@ -10,17 +10,17 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "sourcery"; publisher = "sourcery"; - version = "1.19.0"; - hash = "sha256-Wit2ozgaVwINL3PvPfmZWQ4WN7seQMWfXwXGgEKecn0="; + version = "1.23.0"; + hash = "sha256-wMky9whajltZYD3PUG+LCzuK9S5t55+3tRjTyA8kFcY="; }; postPatch = '' pushd sourcery_binaries/install - rm -r win ${if stdenv.isLinux then "mac" else "linux"} + rm -r win ${if stdenv.hostPlatform.isLinux then "mac" else "linux"} popd ''; - nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ]; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; buildInputs = [ stdenv.cc.cc.lib diff --git a/pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix b/pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix index f56f477c8560d..8f3ba7cfad613 100644 --- a/pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix +++ b/pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix @@ -13,19 +13,19 @@ let { x86_64-linux = { arch = "linux-x64"; - hash = "sha256-fvDzsFOG1pdmpC3RDY8zGP0yL/TzX6i00LnIX+yceVU="; + hash = "sha256-NdVSQQ5OeBPGSLbynUArNbfm+a2HCc/gwJMKfEDgzDM="; }; aarch64-linux = { arch = "linux-arm64"; - hash = "sha256-3yRZzOTuiTbkUUz1D3mZo7G5vayM6W9YBbJxTiVou9g="; + hash = "sha256-4FjA3mUz+DVBiMUJAlGkUbpDtZuDYuUHPWA4QUiqd5w="; }; x86_64-darwin = { arch = "darwin-x64"; - hash = "sha256-fKvR2bea4UxvnZ+LlWR/ahpKe8mk5f4mZrjqTFpsC5A="; + hash = "sha256-aexe9hrUxb3ZnrgJrvEXu2PZPmxOGdkk9exrfDaXA7s="; }; aarch64-darwin = { arch = "darwin-arm64"; - hash = "sha256-nkK3BH+MRi6KdThq4kYR9ZAfnuSkC2r/lKWpEtmD7Ak="; + hash = "sha256-ijmKU+eU3R3mxeFxFr5AtVwGYVBuYWecD8W+0gHzP5w="; }; } .${system} or (throw "Unsupported system: ${system}"); @@ -37,7 +37,7 @@ vscode-utils.buildVscodeMarketplaceExtension { # Please update the corresponding binary (typos-lsp) # when updating this extension. # See pkgs/by-name/ty/typos-lsp/package.nix - version = "0.1.19"; + version = "0.1.26"; inherit (extInfo) hash arch; }; diff --git a/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix index 6f14d1e918215..20b81c3c70cdf 100644 --- a/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix +++ b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix @@ -1,5 +1,4 @@ { - pkgs, lib, stdenv, fetchFromGitHub, @@ -42,11 +41,11 @@ let cargoHash = "sha256-e/Jki/4pCs0qzaBVR4iiUhdBFmWlTZYREQkuFSoWYFo="; - buildInputs = lib.optionals stdenv.isDarwin [ lldb ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ lldb ]; nativeBuildInputs = [ makeWrapper ]; - env = lib.optionalAttrs stdenv.isDarwin { NIX_LDFLAGS = "-llldb -lc++abi"; }; + env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { NIX_LDFLAGS = "-llldb -lc++abi"; }; buildAndTestSubdir = "adapter"; @@ -91,7 +90,7 @@ let buildInputs = [ libsecret ] - ++ lib.optionals stdenv.isDarwin ( + ++ lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; [ Security @@ -115,7 +114,7 @@ let # entitlement which nixpkgs' lldb-server does not yet provide; see # <https://github.com/NixOS/nixpkgs/pull/38624> for details lldbServer = - if stdenv.isDarwin then + if stdenv.hostPlatform.isDarwin then "/Applications/Xcode.app/Contents/SharedFrameworks/LLDB.framework/Versions/A/Resources/debugserver" else "${lldb.out}/bin/lldb-server"; @@ -151,7 +150,7 @@ stdenv.mkDerivation { '' cp -r ${nodeDeps}/lib/node_modules . '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' export HOME="$TMPDIR/home" mkdir $HOME ''; @@ -162,7 +161,7 @@ stdenv.mkDerivation { ]; makeFlags = [ "vsix_bootstrap" ]; - preBuild = lib.optionalString stdenv.isDarwin '' + preBuild = lib.optionalString stdenv.hostPlatform.isDarwin '' export HOME=$TMPDIR ''; diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix index 5ed75a0ce32e1..1c5fe1a56a424 100644 --- a/pkgs/applications/editors/vscode/generic.nix +++ b/pkgs/applications/editors/vscode/generic.nix @@ -1,5 +1,6 @@ { stdenv , lib +, copyDesktopItems , makeDesktopItem , unzip , libsecret @@ -122,50 +123,52 @@ in inherit rev vscodeServer; }; - desktopItem = makeDesktopItem { - name = executableName; - desktopName = longName; - comment = "Code Editing. Redefined."; - genericName = "Text Editor"; - exec = "${executableName} %F"; - icon = "vs${executableName}"; - startupNotify = true; - startupWMClass = shortName; - categories = [ "Utility" "TextEditor" "Development" "IDE" ]; - mimeTypes = [ "text/plain" "inode/directory" ]; - keywords = [ "vscode" ]; - actions.new-empty-window = { - name = "New Empty Window"; - exec = "${executableName} --new-window %F"; + desktopItems = [ + (makeDesktopItem { + name = executableName; + desktopName = longName; + comment = "Code Editing. Redefined."; + genericName = "Text Editor"; + exec = "${executableName} %F"; icon = "vs${executableName}"; - }; - }; - - urlHandlerDesktopItem = makeDesktopItem { - name = executableName + "-url-handler"; - desktopName = longName + " - URL Handler"; - comment = "Code Editing. Redefined."; - genericName = "Text Editor"; - exec = executableName + " --open-url %U"; - icon = "vs${executableName}"; - startupNotify = true; - categories = [ "Utility" "TextEditor" "Development" "IDE" ]; - mimeTypes = [ "x-scheme-handler/vs${executableName}" ]; - keywords = [ "vscode" ]; - noDisplay = true; - }; + startupNotify = true; + startupWMClass = shortName; + categories = [ "Utility" "TextEditor" "Development" "IDE" ]; + keywords = [ "vscode" ]; + actions.new-empty-window = { + name = "New Empty Window"; + exec = "${executableName} --new-window %F"; + icon = "vs${executableName}"; + }; + }) + (makeDesktopItem { + name = executableName + "-url-handler"; + desktopName = longName + " - URL Handler"; + comment = "Code Editing. Redefined."; + genericName = "Text Editor"; + exec = executableName + " --open-url %U"; + icon = "vs${executableName}"; + startupNotify = true; + categories = [ "Utility" "TextEditor" "Development" "IDE" ]; + mimeTypes = [ "x-scheme-handler/vs${executableName}" ]; + keywords = [ "vscode" ]; + noDisplay = true; + }) + ]; buildInputs = [ libsecret libXScrnSaver libxshmfence ] - ++ lib.optionals (!stdenv.isDarwin) [ alsa-lib at-spi2-atk libkrb5 mesa nss nspr systemd xorg.libxkbfile ]; + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ alsa-lib at-spi2-atk libkrb5 mesa nss nspr systemd xorg.libxkbfile ]; - runtimeDependencies = lib.optionals stdenv.isLinux [ (lib.getLib systemd) fontconfig.lib libdbusmenu wayland libsecret ]; + runtimeDependencies = lib.optionals stdenv.hostPlatform.isLinux [ (lib.getLib systemd) fontconfig.lib libdbusmenu wayland libsecret ]; nativeBuildInputs = [ unzip ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook asar + copyDesktopItems # override doesn't preserve splicing https://github.com/NixOS/nixpkgs/issues/132651 - (buildPackages.wrapGAppsHook3.override { inherit (buildPackages) makeWrapper; }) + # Has to use `makeShellWrapper` from `buildPackages` even though `makeShellWrapper` from the inputs is spliced because `propagatedBuildInputs` would pick the wrong one because of a different offset. + (buildPackages.wrapGAppsHook3.override { makeWrapper = buildPackages.makeShellWrapper; }) ]; dontBuild = true; @@ -174,7 +177,7 @@ in installPhase = '' runHook preInstall - '' + (if stdenv.isDarwin then '' + '' + (if stdenv.hostPlatform.isDarwin then '' mkdir -p "$out/Applications/${longName}.app" "$out/bin" cp -r ./* "$out/Applications/${longName}.app" ln -s "$out/Applications/${longName}.app/Contents/Resources/app/bin/${sourceExecutableName}" "$out/bin/${executableName}" @@ -184,10 +187,6 @@ in ln -s "$out/lib/vscode/bin/${sourceExecutableName}" "$out/bin/${executableName}" - mkdir -p "$out/share/applications" - ln -s "$desktopItem/share/applications/${executableName}.desktop" "$out/share/applications/${executableName}.desktop" - ln -s "$urlHandlerDesktopItem/share/applications/${executableName}-url-handler.desktop" "$out/share/applications/${executableName}-url-handler.desktop" - # These are named vscode.png, vscode-insiders.png, etc to match the name in upstream *.deb packages. mkdir -p "$out/share/pixmaps" cp "$out/lib/vscode/resources/app/resources/linux/code.png" "$out/share/pixmaps/vs${executableName}.png" @@ -206,6 +205,9 @@ in preFixup = '' gappsWrapperArgs+=( + ${ # we cannot use runtimeDependencies otherwise libdbusmenu do not work on kde + lib.optionalString stdenv.hostPlatform.isLinux + "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libdbusmenu ]}"} # Add gio to PATH so that moving files to the trash works when not using a desktop environment --prefix PATH : ${glib.bin}/bin --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" @@ -215,7 +217,7 @@ in # See https://github.com/NixOS/nixpkgs/issues/49643#issuecomment-873853897 # linux only because of https://github.com/NixOS/nixpkgs/issues/138729 - postPatch = lib.optionalString stdenv.isLinux '' + postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' # this is a fix for "save as root" functionality packed="resources/app/node_modules.asar" unpacked="resources/app/node_modules" @@ -233,7 +235,7 @@ in '' + ( let vscodeRipgrep = - if stdenv.isDarwin then + if stdenv.hostPlatform.isDarwin then "Contents/Resources/app/node_modules.asar.unpacked/@vscode/ripgrep/bin/rg" else "resources/app/node_modules/@vscode/ripgrep/bin/rg"; @@ -246,7 +248,7 @@ in '' ); - postFixup = lib.optionalString stdenv.isLinux '' + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' patchelf \ --add-needed ${libglvnd}/lib/libGLESv2.so.2 \ --add-needed ${libglvnd}/lib/libGL.so.1 \ diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index ac4d1d69795bb..35f6601d60be0 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -10,9 +10,9 @@ # documented in https://wiki.nixos.org/wiki/Visual_Studio_Code#Insiders_Build # On MacOS the insider binary is still called code instead of code-insiders as # of 2023-08-06. -, sourceExecutableName ? "code" + lib.optionalString (isInsiders && stdenv.isLinux) "-insiders" +, sourceExecutableName ? "code" + lib.optionalString (isInsiders && stdenv.hostPlatform.isLinux) "-insiders" , commandLineArgs ? "" -, useVSCodeRipgrep ? stdenv.isDarwin +, useVSCodeRipgrep ? stdenv.hostPlatform.isDarwin }: let @@ -27,24 +27,24 @@ let armv7l-linux = "linux-armhf"; }.${system} or throwSystem; - archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; + archive_fmt = if stdenv.hostPlatform.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "0d0cgsiafmr1wmxqji7mi4hmms7zqql868bcfbq9lmkw96zw85dw"; - x86_64-darwin = "1zga9zm25h33m42cdnbkpzx5vbcwm9n7036qapq8pgrb23mals7f"; - aarch64-linux = "0wsdcny0y8xfvdf62qh792ifcq1am8i8xkchh5rscjc3xli6r86s"; - aarch64-darwin = "13jd39lm667206ga8fqbdb7mdqbkmbgq1l7wid3h4yanz87zbm99"; - armv7l-linux = "1xpvcypm0xnwjmbj2c1a245yav3nwi0g2k564x91vazfw4nmi7mv"; + x86_64-linux = "0475kwa3ym14l9ggaf2hg4lcrc0lpi9vchzj4sgj4c3606l9i1aa"; + x86_64-darwin = "15sz42p7khzxpxii4zx14770kzyk4a3g1kwxjwvd46nxqjqciys4"; + aarch64-linux = "14d5p764vx1ppi5f6b6v0wrn1wr3qqyfr6mpncjhnzr2pdss9fz0"; + aarch64-darwin = "0kdh7a0nfpadhyn6cj89vw76hhbab4fg5wifbzdrjikwfg8jbd4b"; + armv7l-linux = "1aqlpxyzjrf6qm0znyqbl7srn251f7ra5lj594b7906lxhirin3c"; }.${system} or throwSystem; in callPackage ./generic.nix rec { # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.90.2"; + version = "1.93.1"; pname = "vscode" + lib.optionalString isInsiders "-insiders"; # This is used for VS Code - Remote SSH test - rev = "5437499feb04f7a586f677b155b039bc2b3669eb"; + rev = "38c31bc77e0dd6ae88a4e9cc93428cc27a56ba40"; executableName = "code" + lib.optionalString isInsiders "-insiders"; longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders"; @@ -68,7 +68,7 @@ in src = fetchurl { name = "vscode-server-${rev}.tar.gz"; url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable"; - sha256 = "18npvj29g9xwjyxv3a0fxipk30hgm487cfr3d91dvp5hxhl4dwwr"; + sha256 = "0cxpv9q681nk7gjcs1msn2rnj8i86hlrkb0x4ja1id42aj4xwrqy"; }; }; @@ -79,7 +79,7 @@ in # Editing the `code` binary within the app bundle causes the bundle's signature # to be invalidated, which prevents launching starting with macOS Ventura, because VS Code is notarized. # See https://eclecticlight.co/2022/06/17/app-security-changes-coming-in-ventura/ for more information. - dontFixup = stdenv.isDarwin; + dontFixup = stdenv.hostPlatform.isDarwin; meta = with lib; { description = '' @@ -97,7 +97,7 @@ in homepage = "https://code.visualstudio.com/"; downloadPage = "https://code.visualstudio.com/Updates"; license = licenses.unfree; - maintainers = with maintainers; [ eadwu synthetica bobby285271 Enzime ]; + maintainers = with maintainers; [ eadwu synthetica bobby285271 johnrtitor ]; platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" "aarch64-linux" "armv7l-linux" ]; }; } diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index c1f275b6911e6..54a1a98ad7c6d 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, callPackage, fetchurl, nixosTests, commandLineArgs ? "", useVSCodeRipgrep ? stdenv.isDarwin }: +{ lib, stdenv, callPackage, fetchurl, nixosTests, commandLineArgs ? "", useVSCodeRipgrep ? stdenv.hostPlatform.isDarwin }: let inherit (stdenv.hostPlatform) system; @@ -12,24 +12,24 @@ let armv7l-linux = "linux-armhf"; }.${system} or throwSystem; - archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; + archive_fmt = if stdenv.hostPlatform.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "01riva442l78d8dyh0wb9iqhjfa1bd48bpc7zfvd4zpz6fwhlkqr"; - x86_64-darwin = "1pmvjxagbfrp25i4s66j892xiskrld5z25mkvlsdkddqlvnhanc9"; - aarch64-linux = "1lk1p45ibph3arbb5vgkgxlip2jafgmpq40ldpfrh55k6v83zd2q"; - aarch64-darwin = "17cd0grmplvk8s5wrcd1v172irrddjcc9drfp7qpvszd3kiy09a7"; - armv7l-linux = "1636i9b4fxh2jvakjag38ij6kmj1cf0nlfzyk5rfl06i06gfd6jr"; + x86_64-linux = "14pqi5l7zbkhpsl8hd7mqss4xkqnxf0f0h5bs710iadpcscgpndf"; + x86_64-darwin = "10k4qgck48xh12xq80y8x3jf9qp5fn15n995mn8gbid39907ars0"; + aarch64-linux = "0jk33jw5rj98qr6fhi4r3vz5f1673m5v1g28jdyn3prs20hp0msg"; + aarch64-darwin = "1sw39iyz5m0hdy875b3ygzvpl7vz9j3d1w6fpmf30a3iyl3ndh66"; + armv7l-linux = "1rjv5c85ffy5szxhf71kjmvxiahyyvx2dl6183v5q7apv9pa64hj"; }.${system} or throwSystem; - sourceRoot = lib.optionalString (!stdenv.isDarwin) "."; + sourceRoot = lib.optionalString (!stdenv.hostPlatform.isDarwin) "."; in callPackage ./generic.nix rec { inherit sourceRoot commandLineArgs useVSCodeRipgrep; # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.90.2.24171"; + version = "1.93.1.24256"; pname = "vscodium"; executableName = "codium"; diff --git a/pkgs/applications/editors/vscode/with-extensions.nix b/pkgs/applications/editors/vscode/with-extensions.nix index bbe5fec19d91d..25c97f52d765e 100644 --- a/pkgs/applications/editors/vscode/with-extensions.nix +++ b/pkgs/applications/editors/vscode/with-extensions.nix @@ -68,7 +68,7 @@ runCommand "${wrappedPkgName}-with-extensions-${wrappedPkgVersion}" { dontPatchELF = true; dontStrip = true; meta = vscode.meta; -} (if stdenv.isDarwin then '' +} (if stdenv.hostPlatform.isDarwin then '' mkdir -p $out/bin/ mkdir -p "$out/Applications/${longName}.app/Contents/MacOS" diff --git a/pkgs/applications/editors/wily/default.nix b/pkgs/applications/editors/wily/default.nix index 5c6eb5dc5ba3a..a344f93bf241f 100644 --- a/pkgs/applications/editors/wily/default.nix +++ b/pkgs/applications/editors/wily/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { description = "Emulation of ACME"; homepage = "http://wily.sourceforge.net"; license = licenses.artistic1; - maintainers = [ maintainers.vrthra ]; + maintainers = [ ]; platforms = platforms.unix; mainProgram = "wily"; }; diff --git a/pkgs/applications/editors/wxhexeditor/default.nix b/pkgs/applications/editors/wxhexeditor/default.nix index 23ef7a0ef567a..eee370d174e02 100644 --- a/pkgs/applications/editors/wxhexeditor/default.nix +++ b/pkgs/applications/editors/wxhexeditor/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { buildInputs = lib.optionals stdenv.cc.isClang [ openmp - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ]; diff --git a/pkgs/applications/editors/xed-editor/correct-gir-lib-path.patch b/pkgs/applications/editors/xed-editor/correct-gir-lib-path.patch deleted file mode 100644 index fa530e9a12afa..0000000000000 --- a/pkgs/applications/editors/xed-editor/correct-gir-lib-path.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/xed/meson.build b/xed/meson.build -index 7525bad..ae0814e 100644 ---- a/xed/meson.build -+++ b/xed/meson.build -@@ -143,7 +143,7 @@ libxed = library( - dependencies: xed_deps, - include_directories: include_dirs, - install: true, -- install_dir: join_paths(libdir, 'xed') -+ install_dir: join_paths(prefix, libdir, 'xed') - ) - - install_headers( diff --git a/pkgs/applications/editors/xed-editor/default.nix b/pkgs/applications/editors/xed-editor/default.nix deleted file mode 100644 index 7458618a1e143..0000000000000 --- a/pkgs/applications/editors/xed-editor/default.nix +++ /dev/null @@ -1,75 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, libxml2 -, libpeas -, glib -, gtk3 -, gtksourceview4 -, gspell -, xapp -, pkg-config -, python3 -, meson -, ninja -, wrapGAppsHook3 -, intltool -, itstool -}: - -stdenv.mkDerivation rec { - pname = "xed-editor"; - version = "3.6.3"; - - src = fetchFromGitHub { - owner = "linuxmint"; - repo = "xed"; - rev = version; - sha256 = "sha256-xsNqzicI11dM/DjY00pXaPpQdHA0ltP23g34fMWUoUA="; - }; - - patches = [ - # We patch gobject-introspection and meson to store absolute paths to libraries in typelibs - # but that requires the install_dir is an absolute path. - ./correct-gir-lib-path.patch - ]; - - nativeBuildInputs = [ - meson - pkg-config - intltool - itstool - ninja - python3 - wrapGAppsHook3 - ]; - - buildInputs = [ - libxml2 - glib - gtk3 - gtksourceview4 - libpeas - gspell - xapp - ]; - - doInstallCheck = true; - installCheckPhase = '' - if [[ "$($out/bin/xed --version)" == "xed - Version ${version}" ]] ; then - echo "${pname} smoke test passed" - else - echo "${pname} smoke test failed" - return 1 - fi - ''; - - meta = with lib; { - description = "Light weight text editor from Linux Mint"; - homepage = "https://github.com/linuxmint/xed"; - license = licenses.gpl2Only; - platforms = platforms.linux; - maintainers = with maintainers; [ tu-maurice bobby285271 ]; - mainProgram = "xed"; - }; -} diff --git a/pkgs/applications/editors/xedit/default.nix b/pkgs/applications/editors/xedit/default.nix index 6fa4a67dfd6bc..eb8f2ee925926 100644 --- a/pkgs/applications/editors/xedit/default.nix +++ b/pkgs/applications/editors/xedit/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { }; # ./lisp/mathimp.c:493:10: error: implicitly declaring library function 'finite' with type 'int (double)' - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' for i in $(find . -type f -name "*.c"); do substituteInPlace $i --replace "finite" "isfinite" done @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ shamilton ]; platforms = platforms.unix; # never built on aarch64-darwin, x86_64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; mainProgram = "xedit"; }; } diff --git a/pkgs/applications/editors/xmlcopyeditor/default.nix b/pkgs/applications/editors/xmlcopyeditor/default.nix index fe3a12a37c20f..0c58d35042aea 100644 --- a/pkgs/applications/editors/xmlcopyeditor/default.nix +++ b/pkgs/applications/editors/xmlcopyeditor/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { pcre2 wxGTK32 xercesc - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ]; diff --git a/pkgs/applications/editors/your-editor/default.nix b/pkgs/applications/editors/your-editor/default.nix index aa4e5eef3c927..7ca6cd4b4fc5a 100644 --- a/pkgs/applications/editors/your-editor/default.nix +++ b/pkgs/applications/editors/your-editor/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "your-editor"; - version = "1506"; + version = "1601"; src = fetchFromGitHub { owner = "your-editor"; repo = "yed"; rev = version; - sha256 = "sha256-QmUquXoDGhoan+Y1kdkTirdkIvYPBkeAEkMLkaE9QKk="; + sha256 = "sha256-pa9ibXyuWq7jRYsn3bGdqvLWbwQO2VYsP6Bk+BayQ8o="; }; installPhase = '' diff --git a/pkgs/applications/editors/zee/default.nix b/pkgs/applications/editors/zee/default.nix index 38ca48ee4056a..cea97686072c5 100644 --- a/pkgs/applications/editors/zee/default.nix +++ b/pkgs/applications/editors/zee/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; + buildInputs = [ openssl ] ++ lib.optional stdenv.hostPlatform.isDarwin Security; # disable downloading and building the tree-sitter grammars at build time # grammars can be configured in a config file and installed with `zee --build` diff --git a/pkgs/applications/editors/zile/default.nix b/pkgs/applications/editors/zile/default.nix deleted file mode 100644 index bafb1aa303853..0000000000000 --- a/pkgs/applications/editors/zile/default.nix +++ /dev/null @@ -1,81 +0,0 @@ -{ lib -, stdenv -, fetchurl -, boehmgc -, glib -, help2man -, libgee -, ncurses -, perl -, pkg-config -, vala -}: - -stdenv.mkDerivation rec { - pname = "zile"; - version = "2.6.2"; - - src = fetchurl { - url = "mirror://gnu/zile/${pname}-${version}.tar.gz"; - hash = "sha256-d+t9r/PJi9yI2qGsBA3MynK4HcMvwxZuB53Xpj5Cx0E="; - }; - - buildInputs = [ - boehmgc - glib - libgee - ncurses - ]; - nativeBuildInputs = [ - perl - pkg-config - vala - ] - # `help2man' wants to run Zile, which won't work when the - # newly-produced binary can't be run at build-time. - ++ lib.optional (stdenv.hostPlatform == stdenv.buildPlatform) help2man; - - # Tests can't be run because most of them rely on the ability to - # fiddle with the terminal. - doCheck = false; - - # XXX: Work around cross-compilation-unfriendly `gl_FUNC_FSTATAT' macro. - gl_cv_func_fstatat_zero_flag="yes"; - - meta = with lib; { - homepage = "https://www.gnu.org/software/zile/"; - description = "Zile Implements Lua Editors"; - longDescription = '' - GNU Zile is a text editor development kit, so that you can (relatively) - quickly develop your own ideal text editor without reinventing the wheel - for many of the common algorithms and data-structures needed to do so. - - It comes with an example implementation of a lightweight Emacs clone, - called Zemacs. Every Emacs user should feel at home with Zemacs. Zemacs is - aimed at small footprint systems and quick editing sessions (it starts up - and shuts down instantly). - - More editors implemented over the Zile frameworks are forthcoming as the - data-structures and interfaces improve: Zz an emacs inspired editor using - Lua as an extension language; Zee a minimalist non-modal editor; Zi a - lightweight vi clone; and more... - - Zile is a collection of algorithms and data-structures that currently - support all basic Emacs-like editing features: it is 8-bit clean (though - Unicode support is not ready yet), and the number of editing buffers and - windows is only limited by available memoryand screen space - respectively. Registers, minibuffer completion and auto fill are - available. - - Zemacs implements a subset of Emacs with identical function and variable - names, continuing the spirit of the earlier Zile editor implemented in C. - GNU Zile, which is a lightweight Emacs clone. Zile is short for Zile Is - Lossy Emacs. Zile has been written to be as similar as possible to Emacs; - every Emacs user should feel at home. - ''; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ pSub AndersonTorres ]; - platforms = platforms.unix; - mainProgram = "zile"; - }; -} diff --git a/pkgs/applications/emulators/86box/darwin.patch b/pkgs/applications/emulators/86box/darwin.patch new file mode 100644 index 0000000000000..b63649c19d122 --- /dev/null +++ b/pkgs/applications/emulators/86box/darwin.patch @@ -0,0 +1,15 @@ +diff --git a/src/qt/qt_platform.cpp b/src/qt/qt_platform.cpp +index 824f71023..1f38e4b5f 100644 +--- a/src/qt/qt_platform.cpp ++++ b/src/qt/qt_platform.cpp +@@ -673,6 +673,10 @@ plat_init_rom_paths(void) + rom_add_path(QDir(path).filePath("86Box/roms").toUtf8().constData()); + #endif + } ++ ++ #ifdef __APPLE__ ++ rom_add_path("@out@/share/86Box/roms/"); ++ #endif + } + + void diff --git a/pkgs/applications/emulators/86box/default.nix b/pkgs/applications/emulators/86box/default.nix index 0e543fa8d821f..ac306cf5cdec1 100644 --- a/pkgs/applications/emulators/86box/default.nix +++ b/pkgs/applications/emulators/86box/default.nix @@ -1,8 +1,10 @@ { stdenv, + darwin, lib, fetchFromGitHub, cmake, + extra-cmake-modules, pkg-config, makeWrapper, freetype, @@ -19,56 +21,87 @@ discord-gamesdk, libpcap, libslirp, + wayland, + wayland-scanner, + libsndfile, + flac, + libogg, + libvorbis, + libopus, + libmpg123, enableDynarec ? with stdenv.hostPlatform; isx86 || isAarch, enableNewDynarec ? enableDynarec && stdenv.hostPlatform.isAarch, enableVncRenderer ? false, + enableWayland ? stdenv.hostPlatform.isLinux, unfreeEnableDiscord ? false, unfreeEnableRoms ? false, }: stdenv.mkDerivation (finalAttrs: { pname = "86Box"; - version = "4.1.1"; + version = "4.2.1"; src = fetchFromGitHub { owner = "86Box"; repo = "86Box"; rev = "v${finalAttrs.version}"; - hash = "sha256-ioE0EVIXv/biXXvLqwhmtZ/RJM0nLqcE+i+CU+WXBY4="; + hash = "sha256-ue5Coy2MpP7Iwl81KJPQPC7eD53/Db5a0PGIR+DdPYI="; }; - nativeBuildInputs = [ - cmake - pkg-config - makeWrapper - qt5.wrapQtAppsHook - ]; + patches = [ ./darwin.patch ]; - buildInputs = [ - freetype - fluidsynth - SDL2 - glib - openal - rtmidi - pcre2 - jack2 - libpcap - libslirp - qt5.qtbase - qt5.qttools - ] ++ lib.optional stdenv.isLinux alsa-lib ++ lib.optional enableVncRenderer libvncserver; + postPatch = '' + substituteAllInPlace src/qt/qt_platform.cpp + ''; + + nativeBuildInputs = + [ + cmake + pkg-config + makeWrapper + qt5.wrapQtAppsHook + ] + ++ lib.optionals enableWayland [ + extra-cmake-modules + wayland-scanner + ]; + + buildInputs = + [ + freetype + fluidsynth + SDL2 + glib + openal + rtmidi + pcre2 + jack2 + libpcap + libslirp + qt5.qtbase + qt5.qttools + libsndfile + flac.dev + libogg.dev + libvorbis.dev + libopus.dev + libmpg123.dev + ] + ++ lib.optional stdenv.hostPlatform.isLinux alsa-lib + ++ lib.optional enableWayland wayland + ++ lib.optional enableVncRenderer libvncserver + ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk_11_0.libs.xpc; cmakeFlags = - lib.optional stdenv.isDarwin "-DCMAKE_MACOSX_BUNDLE=OFF" + lib.optional stdenv.hostPlatform.isDarwin "-DCMAKE_MACOSX_BUNDLE=OFF" ++ lib.optional enableNewDynarec "-DNEW_DYNAREC=ON" ++ lib.optional enableVncRenderer "-DVNC=ON" ++ lib.optional (!enableDynarec) "-DDYNAREC=OFF" ++ lib.optional (!unfreeEnableDiscord) "-DDISCORD=OFF"; postInstall = - lib.optionalString stdenv.isLinux '' + lib.optionalString stdenv.hostPlatform.isLinux '' install -Dm644 -t $out/share/applications $src/src/unix/assets/net.86box.86Box.desktop for size in 48 64 72 96 128 192 256 512; do @@ -86,7 +119,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "86Box"; repo = "roms"; rev = "v${finalAttrs.version}"; - hash = "sha256-58nNTOLund/KeDlNwzwwihjFVigs/P0K8SN07zExE2c="; + hash = "sha256-p3djn950mTUIchFCEg56JbJtIsUuxmqRdYFRl50kI5Y="; }; updateScript = ./update.sh; }; @@ -96,18 +129,23 @@ stdenv.mkDerivation (finalAttrs: { preFixup = let libPath = lib.makeLibraryPath ([ libpcap ] ++ lib.optional unfreeEnableDiscord discord-gamesdk); - libPathVar = if stdenv.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"; + libPathVar = if stdenv.hostPlatform.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"; in '' makeWrapperArgs+=(--prefix ${libPathVar} : "${libPath}") ''; - meta = with lib; { + meta = { description = "Emulator of x86-based machines based on PCem"; mainProgram = "86Box"; homepage = "https://86box.net/"; - license = with licenses; [ gpl2Only ] ++ optional (unfreeEnableDiscord || unfreeEnableRoms) unfree; - maintainers = [ maintainers.jchw ]; - platforms = platforms.linux; + license = + with lib.licenses; + [ gpl2Only ] ++ lib.optional (unfreeEnableDiscord || unfreeEnableRoms) unfree; + maintainers = with lib.maintainers; [ + jchw + matteopacini + ]; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; }) diff --git a/pkgs/applications/emulators/attract-mode/default.nix b/pkgs/applications/emulators/attract-mode/default.nix deleted file mode 100644 index 53765e927a0d6..0000000000000 --- a/pkgs/applications/emulators/attract-mode/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ expat, fetchFromGitHub, ffmpeg_4, fontconfig, freetype, libarchive, libjpeg -, libGLU, libGL, openal, pkg-config, sfml, lib, stdenv, zlib -}: - -stdenv.mkDerivation rec { - pname = "attract-mode"; - version = "2.6.2"; - - src = fetchFromGitHub { - owner = "mickelson"; - repo = "attract"; - rev = "v${version}"; - sha256 = "sha256-gKxUU2y6Gtm5a/tXYw/fsaTBrriNh5vouPGICs3Ph3c="; - }; - - nativeBuildInputs = [ pkg-config ]; - - patchPhase = '' - sed -i "s|prefix=/usr/local|prefix=$out|" Makefile - ''; - - buildInputs = [ - expat ffmpeg_4 fontconfig freetype libarchive libjpeg libGLU libGL openal sfml zlib - ]; - - meta = with lib; { - description = "Frontend for arcade cabinets and media PCs"; - homepage = "http://attractmode.org"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ hrdinka ]; - platforms = with platforms; linux; - mainProgram = "attract"; - }; -} diff --git a/pkgs/applications/emulators/box64/default.nix b/pkgs/applications/emulators/box64/default.nix index 5a6e87b0644aa..7a9c22999b3ee 100644 --- a/pkgs/applications/emulators/box64/default.nix +++ b/pkgs/applications/emulators/box64/default.nix @@ -21,13 +21,13 @@ assert stdenv.mkDerivation (finalAttrs: { pname = "box64"; - version = "0.2.8"; + version = "0.3.0"; src = fetchFromGitHub { owner = "ptitSeb"; repo = "box64"; rev = "v${finalAttrs.version}"; - hash = "sha256-P+m+JS3THh3LWMZYW6BQ7QyNWlBuL+hMcUtUbpMHzis="; + hash = "sha256-8PpTN7lUjpmSowbaRsfSRWJQRDZICFhVvn05tQYC4PQ="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/emulators/box86/default.nix b/pkgs/applications/emulators/box86/default.nix new file mode 100644 index 0000000000000..d5db0f3d4966f --- /dev/null +++ b/pkgs/applications/emulators/box86/default.nix @@ -0,0 +1,103 @@ +{ + buildPackages, + lib, + stdenv, + fetchFromGitHub, + cmake, + python3, + withDynarec ? stdenv.hostPlatform.isAarch32, + runCommand, + hello-x86_32, +}: + +# Currently only supported on specific archs +assert withDynarec -> stdenv.hostPlatform.isAarch32; + +stdenv.mkDerivation (finalAttrs: { + pname = "box86"; + version = "0.3.6"; + + src = fetchFromGitHub { + owner = "ptitSeb"; + repo = "box86"; + rev = "v${finalAttrs.version}"; + hash = "sha256-Ywsf+q7tWcAbrwbE/KvM6AJFNMJvqHKWD6tuANxrUt8="; + }; + + nativeBuildInputs = [ + cmake + python3 + ]; + + cmakeFlags = + [ + (lib.cmakeBool "NOGIT" true) + + # Arch mega-option + (lib.cmakeBool "POWERPCLE" (stdenv.hostPlatform.isPower && stdenv.hostPlatform.isLittleEndian)) + ] + ++ lib.optionals stdenv.hostPlatform.isi686 [ + # x86 has no arch-specific mega-option, manually enable the options that apply to it + (lib.cmakeBool "LD80BITS" true) + (lib.cmakeBool "NOALIGN" true) + ] + ++ [ + # Arch dynarec + (lib.cmakeBool "ARM_DYNAREC" (withDynarec && stdenv.hostPlatform.isAarch)) + ]; + + installPhase = '' + runHook preInstall + + install -Dm 0755 box86 "$out/bin/box86" + + runHook postInstall + ''; + + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; + + doInstallCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; + + installCheckPhase = '' + runHook preInstallCheck + + echo Checking if it works + $out/bin/box86 -v + + echo Checking if Dynarec option was respected + $out/bin/box86 -v | grep ${lib.optionalString (!withDynarec) "-v"} Dynarec + + runHook postInstallCheck + ''; + + passthru = { + # gitUpdater for local system, otherwise we're cross-compiling gitUpdater + updateScript = buildPackages.gitUpdater { rev-prefix = "v"; }; + tests.hello = + runCommand "box86-test-hello" { nativeBuildInputs = [ finalAttrs.finalPackage ]; } + # There is no actual "Hello, world!" with any of the logging enabled, and with all logging disabled it's hard to + # tell what problems the emulator has run into. + '' + BOX86_NOBANNER=0 BOX86_LOG=1 box86 ${lib.getExe hello-x86_32} --version | tee $out + ''; + }; + + meta = { + homepage = "https://box86.org/"; + description = "Lets you run x86 Linux programs on non-x86 Linux systems"; + changelog = "https://github.com/ptitSeb/box86/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + gador + OPNA2608 + ]; + mainProgram = "box86"; + platforms = [ + "i686-linux" + "armv7l-linux" + "powerpcle-linux" + "loongarch64-linux" + "mipsel-linux" + ]; + }; +}) diff --git a/pkgs/applications/emulators/bsnes/ares/default.nix b/pkgs/applications/emulators/bsnes/ares/default.nix index f7fd332c7a336..df08235529e5a 100644 --- a/pkgs/applications/emulators/bsnes/ares/default.nix +++ b/pkgs/applications/emulators/bsnes/ares/default.nix @@ -44,14 +44,14 @@ stdenv.mkDerivation (finalAttrs: { pkg-config which wrapGAppsHook3 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libicns ]; buildInputs = [ SDL2 libao - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib gtk3 gtksourceview3 @@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: { libpulseaudio openal udev - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk_11_0.frameworks.Cocoa darwin.apple_sdk_11_0.frameworks.OpenAL ]; @@ -71,9 +71,9 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; - makeFlags = lib.optionals stdenv.isLinux [ + makeFlags = lib.optionals stdenv.hostPlatform.isLinux [ "hiro=gtk3" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "hiro=cocoa" "lto=false" "vulkan=false" @@ -83,7 +83,7 @@ stdenv.mkDerivation (finalAttrs: { "prefix=$(out)" ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-mmacosx-version-min=10.14"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-mmacosx-version-min=10.14"; meta = { homepage = "https://ares-emu.net"; @@ -92,7 +92,7 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.isc; maintainers = with lib.maintainers; [ Madouura AndersonTorres ]; platforms = lib.platforms.unix; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; }) # TODO: select between Qt and GTK3 diff --git a/pkgs/applications/emulators/bsnes/bsnes-hd/default.nix b/pkgs/applications/emulators/bsnes/bsnes-hd/default.nix index 354437e7c7b0b..046192df920f4 100644 --- a/pkgs/applications/emulators/bsnes/bsnes-hd/default.nix +++ b/pkgs/applications/emulators/bsnes/bsnes-hd/default.nix @@ -47,26 +47,26 @@ stdenv.mkDerivation { ]; nativeBuildInputs = [ pkg-config ] - ++ lib.optionals stdenv.isLinux [ wrapGAppsHook3 ] - ++ lib.optionals stdenv.isDarwin [ libicns makeWrapper ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ wrapGAppsHook3 ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libicns makeWrapper ]; buildInputs = [ SDL2 libao ] - ++ lib.optionals stdenv.isLinux [ libX11 libXv udev gtk3 gtksourceview3 alsa-lib openal libpulseaudio ] - ++ lib.optionals stdenv.isDarwin [ Cocoa OpenAL ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ libX11 libXv udev gtk3 gtksourceview3 alsa-lib openal libpulseaudio ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa OpenAL ]; enableParallelBuilding = true; makeFlags = [ "-C" "bsnes" "prefix=$(out)" ] - ++ lib.optionals stdenv.isLinux [ "hiro=gtk3" ] - ++ lib.optionals stdenv.isDarwin [ "hiro=cocoa" ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ "hiro=gtk3" ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "hiro=cocoa" ]; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/bin makeWrapper $out/{Applications/bsnes.app/Contents/MacOS,bin}/bsnes ''; # https://github.com/bsnes-emu/bsnes/issues/107 - preFixup = lib.optionalString stdenv.isLinux '' + preFixup = lib.optionalString stdenv.hostPlatform.isLinux '' gappsWrapperArgs+=( --prefix GDK_BACKEND : x11 ) diff --git a/pkgs/applications/emulators/bsnes/higan/default.nix b/pkgs/applications/emulators/bsnes/higan/default.nix index 17700859ca3a4..3eb9a9a310ecf 100644 --- a/pkgs/applications/emulators/bsnes/higan/default.nix +++ b/pkgs/applications/emulators/bsnes/higan/default.nix @@ -33,14 +33,14 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ pkg-config - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libicns ]; buildInputs = [ SDL2 libao - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib gtk3 gtksourceview3 @@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { openal udev ] - ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ Carbon Cocoa OpenAL @@ -72,13 +72,13 @@ stdenv.mkDerivation (finalAttrs: { buildPhase = let platform = - if stdenv.isLinux + if stdenv.hostPlatform.isLinux then "linux" - else if stdenv.isDarwin + else if stdenv.hostPlatform.isDarwin then "macos" - else if stdenv.isBSD + else if stdenv.hostPlatform.isBSD then "bsd" - else if stdenv.isWindows + else if stdenv.hostPlatform.isWindows then "windows" else throw "Unknown platform for higan: ${stdenv.hostPlatform.system}"; in '' @@ -105,7 +105,7 @@ stdenv.mkDerivation (finalAttrs: { installPhase = '' runHook preInstall - '' + (if stdenv.isDarwin then '' + '' + (if stdenv.hostPlatform.isDarwin then '' mkdir ${placeholder "out"} mv higan/out/higan.app ${placeholder "out"}/ mv icarus/out/icarus.app ${placeholder "out"}/ @@ -134,7 +134,7 @@ stdenv.mkDerivation (finalAttrs: { # we create a first-run script to populate # $HOME with all the stuff needed at runtime let - dest = if stdenv.isDarwin + dest = if stdenv.hostPlatform.isDarwin then "\\$HOME/Library/Application Support/higan" else "\\$HOME/higan"; in '' @@ -171,7 +171,7 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.gpl3Plus; maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.unix; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; }) # TODO: select between Qt and GTK3 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/daemon.nix b/pkgs/applications/emulators/cdemu/daemon.nix index 5382efbff2376..0100ea5321d63 100644 --- a/pkgs/applications/emulators/cdemu/daemon.nix +++ b/pkgs/applications/emulators/cdemu/daemon.nix @@ -1,11 +1,14 @@ { stdenv, callPackage, cmake, pkg-config, glib, libao, intltool, libmirage, coreutils }: -stdenv.mkDerivation { +let inherit (callPackage ./common-drv-attrs.nix { - version = "3.2.6"; + version = "3.2.7"; pname = "cdemu-daemon"; - hash = "sha256-puQE4+91xhRuNjVPZYgN/WO0uO8fVAOdxQWOGQ+FfY8="; + hash = "sha256-EKh2G6RA9Yq46BpTAqN2s6TpLJb8gwDuEpGiwdGcelc="; }) pname version src meta; +in +stdenv.mkDerivation { + inherit pname version src; nativeBuildInputs = [ cmake pkg-config intltool ]; buildInputs = [ glib libao libmirage ]; @@ -17,4 +20,16 @@ stdenv.mkDerivation { $out/share/dbus-1/services/net.sf.cdemu.CDEmuDaemon.service \ --replace /bin/true ${coreutils}/bin/true ''; + + meta = { + inherit (meta) + description + license + longDescription + maintainers + platforms + ; + homepage = "https://cdemu.sourceforge.io/about/daemon/"; + mainProgram = "cdemu-daemon"; + }; } 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/cdemu/libmirage.nix b/pkgs/applications/emulators/cdemu/libmirage.nix index bbc013be18a0d..2cad367259978 100644 --- a/pkgs/applications/emulators/cdemu/libmirage.nix +++ b/pkgs/applications/emulators/cdemu/libmirage.nix @@ -2,13 +2,15 @@ , glib, libsndfile, zlib, bzip2, xz, libsamplerate, intltool , pcre, util-linux, libselinux, libsepol }: -stdenv.mkDerivation { - +let inherit (callPackage ./common-drv-attrs.nix { - version = "3.2.7"; + version = "3.2.9"; pname = "libmirage"; - hash = "sha256-+okkgNeVS8yoKSrQDy4It7PiPlTSiOsUoFxQ1FS9s9M="; + hash = "sha256-JBd+wHSZRyRW1SZsaAaRO2dNUFkpwRCr3s1f39KyWIs="; }) pname version src meta; +in +stdenv.mkDerivation { + inherit pname version src; PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "${placeholder "out"}/share/gir-1.0"; PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "${placeholder "out"}/lib/girepository-1.0"; @@ -16,4 +18,13 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake pkg-config intltool gobject-introspection ]; propagatedBuildInputs = [ pcre util-linux libselinux libsepol ]; + meta = { + inherit (meta) + maintainers + license + platforms + ; + description = "CD-ROM image access library"; + homepage = "https://cdemu.sourceforge.io/about/libmirage/"; + }; } diff --git a/pkgs/applications/emulators/cdemu/vhba.nix b/pkgs/applications/emulators/cdemu/vhba.nix index 15b69500f3d20..e1d251a763923 100644 --- a/pkgs/applications/emulators/cdemu/vhba.nix +++ b/pkgs/applications/emulators/cdemu/vhba.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "vhba"; - version = "20240202"; + version = "20240917"; src = fetchurl { url = "mirror://sourceforge/cdemu/vhba-module-${version}.tar.xz"; - hash = "sha256-v1hQ1Lj1AiHKh9c0OpKe2oexkfb1roxhQXRUO1ut3oM="; + hash = "sha256-zjTLriw2zvjX0Jxfa9QtaHG5tTC7cLTKEA+WSCP+Dpg="; }; makeFlags = kernel.makeFlags ++ [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "INSTALL_MOD_PATH=$(out)" ]; diff --git a/pkgs/applications/emulators/craftos-pc/default.nix b/pkgs/applications/emulators/craftos-pc/default.nix index 1952bd6e6bd32..535b50b0f138b 100644 --- a/pkgs/applications/emulators/craftos-pc/default.nix +++ b/pkgs/applications/emulators/craftos-pc/default.nix @@ -15,18 +15,18 @@ }: let - version = "2.8.2"; + version = "2.8.3"; craftos2-lua = fetchFromGitHub { owner = "MCJack123"; repo = "craftos2-lua"; rev = "v${version}"; - hash = "sha256-Kv0supnYKWLaVqOeZAzQNd3tQRP2KJugZqytyoj8QtY="; + hash = "sha256-OCHN/ef83X4r5hZcPfFFvNJHjINCTiK+COf369/WPsA="; }; craftos2-rom = fetchFromGitHub { owner = "McJack123"; repo = "craftos2-rom"; rev = "v${version}"; - hash = "sha256-5ZsLsqrkO02NLJCzsgf0k/ifsqNybTi4DcB9GLmWDHw="; + hash = "sha256-YidLt/JLwBMW0LMo5Q5PV6wGhF0J72FGX+iWYn6v0Z4="; }; in @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { owner = "MCJack123"; repo = "craftos2"; rev = "v${version}"; - hash = "sha256-ozebHgUgwdqYtWAyL+EdwpjEvZC+PkWcLYCPWz2FjSw="; + hash = "sha256-DbxAsXxpsa42dF6DaLmgIa+Hs/PPqJ4dE97PoKxG2Ig="; }; nativeBuildInputs = [ patchelf unzip ]; diff --git a/pkgs/applications/emulators/darling/default.nix b/pkgs/applications/emulators/darling/default.nix index a5fe1021e9171..23e01e583148c 100644 --- a/pkgs/applications/emulators/darling/default.nix +++ b/pkgs/applications/emulators/darling/default.nix @@ -3,6 +3,7 @@ , runCommandWith , writeShellScript , fetchFromGitHub +, fetchpatch , nixosTests , freetype @@ -38,7 +39,7 @@ , xdg-user-dirs -, addOpenGLRunpath +, addDriverRunpath # Whether to pre-compile Python 2 bytecode for performance. , compilePy2Bytecode ? false @@ -114,11 +115,27 @@ in stdenv.mkDerivation { repo = "darling"; rev = "25afbc76428c39c3909e9efcf5caef1140425211"; fetchSubmodules = true; - hash = "sha256-T0g38loUFv3jHvUu3R3QH9hwP8JVe2al4g4VhXnBDMc="; + hash = "sha256-z9IMgc5hH2Upn8wHl1OgP42q9HTSkeHnxB3N812A+Kc="; + # Remove 500MB of dependency test files to get under Hydra output limit + postFetch = '' + rm -r $out/src/external/openjdk/test + rm -r $out/src/external/libmalloc/tests + rm -r $out/src/external/libarchive/libarchive/tar/test + ''; }; outputs = [ "out" "sdk" ]; + patches = [ + # Fix 'clang: error: no such file or directory: .../signal/mach_excUser.c' + # https://github.com/darlinghq/darling/issues/1511 + # https://github.com/darlinghq/darling/commit/f46eb721c11d32addd807f092f4b3a6ea515bb6d + (fetchpatch { + url = "https://github.com/darlinghq/darling/commit/f46eb721c11d32addd807f092f4b3a6ea515bb6d.patch?full_index=1"; + hash = "sha256-FnLcHnK4cNto+E3OQSxE3iK+FHSU8y459FcpMvrzd6o="; + }) + ]; + postPatch = '' # We have to be careful - Patching everything indiscriminately # would affect Darwin scripts as well @@ -217,7 +234,7 @@ in stdenv.mkDerivation { exit 1 fi - patchelf --add-rpath "${lib.makeLibraryPath wrappedLibs}:${addOpenGLRunpath.driverLink}/lib" \ + patchelf --add-rpath "${lib.makeLibraryPath wrappedLibs}:${addDriverRunpath.driverLink}/lib" \ $out/libexec/darling/usr/libexec/darling/mldr ''; diff --git a/pkgs/applications/emulators/desmume/default.nix b/pkgs/applications/emulators/desmume/default.nix deleted file mode 100644 index 19f28f7962f65..0000000000000 --- a/pkgs/applications/emulators/desmume/default.nix +++ /dev/null @@ -1,96 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, fetchpatch -, SDL2 -, agg -, alsa-lib -, desktop-file-utils -, wrapGAppsHook3 -, gtk3 -, intltool -, libGLU -, libXmu -, libpcap -, libtool -, lua -, meson -, ninja -, openal -, pkg-config -, soundtouch -, tinyxml -, zlib -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "desmume"; - version = "0.9.13"; - - src = fetchFromGitHub { - owner = "TASVideos"; - repo = "desmume"; - rev = "release_${lib.replaceStrings ["."] ["_"] finalAttrs.version}"; - hash = "sha256-vmjKXa/iXLTwtqnG+ZUvOnOQPZROeMpfM5J3Jh/Ynfo="; - }; - - patches = [ - # Fix compiling on GCC for AArch64 - (fetchpatch { - url = "https://github.com/TASEmulators/desmume/commit/24eb5ed95c6cbdaba8b3c63a99e95e899e8a5061.patch"; - hash = "sha256-J3ZRU1tPTl+4/jg0DBo6ro6DTUZkpQCey+QGF2EugCQ="; - }) - ]; - - nativeBuildInputs = [ - wrapGAppsHook3 - desktop-file-utils - intltool - libtool - lua - meson - ninja - pkg-config - ]; - - buildInputs = [ - SDL2 - agg - alsa-lib - gtk3 - libGLU - libXmu - libpcap - openal - soundtouch - tinyxml - zlib - ]; - - hardeningDisable = [ "format" ]; - - preConfigure = '' - cd desmume/src/frontend/posix - ''; - - mesonFlags = [ - "-Db_pie=true" - "-Dopenal=true" - "-Dwifi=true" - ]; - - meta = with lib; { - homepage = "https://www.github.com/TASVideos/desmume/"; - description = "Open-source Nintendo DS emulator"; - longDescription = '' - DeSmuME is a freeware emulator for the NDS roms & Nintendo DS Lite games - created by YopYop156 and now maintained by the TASvideos team. It supports - many homebrew nds rom demoes as well as a handful of Wireless Multiboot - demo nds roms. DeSmuME is also able to emulate nearly all of the - commercial nds rom titles which other DS Emulators aren't. - ''; - license = licenses.gpl2Plus; - maintainers = [ maintainers.AndersonTorres ]; - platforms = platforms.unix; - }; -}) diff --git a/pkgs/applications/emulators/dgen-sdl/default.nix b/pkgs/applications/emulators/dgen-sdl/default.nix deleted file mode 100644 index a501139ff47bd..0000000000000 --- a/pkgs/applications/emulators/dgen-sdl/default.nix +++ /dev/null @@ -1,71 +0,0 @@ -{ lib -, stdenv -, fetchurl -, libarchive -, SDL -}: - -stdenv.mkDerivation rec { - pname = "dgen-sdl"; - version = "1.33"; - - src = fetchurl { - url = "https://sourceforge.net/projects/dgen/files/dgen/${version}/${pname}-${version}.tar.gz"; - hash = "sha256-meLAYBfCKHPHf4gYbrzAmGckTrbgQsdjuwlLArje9h4="; - }; - - buildInputs = [ - SDL - libarchive - ]; - - configureFlags = [ - "--enable-debug-vdp" - "--enable-debugger" - "--enable-joystick" - "--enable-pico" # experimental - "--enable-vgmdump" - "--with-cyclone=no" # Needs ASM support - "--with-cz80" - "--with-drz80=no" # Needs ASM support - "--with-dz80" - "--with-musa" - "--with-mz80" - "--with-star=no" # Needs ASM support - ]; - - meta = with lib; { - homepage = "https://dgen.sourceforge.net/"; - description = "Sega Genesis/Mega Drive emulator"; - longDescription = '' - DGen/SDL is a free, open source emulator for Sega Genesis/Mega Drive - systems. DGen was originally written by Dave, then ported to SDL by Joe - Groff and Phil K. Hornung in 1998. - - It features: - - - Game Genie/Hex codes support - - PAL/NTSC, fullscreen modes - - Joypad/joystick support - - Mouse support - - Highly configurable controls - - OpenGL textured video output - - Portable (64‐bit, endian safe), runs in Windows using MinGW - - Screenshots, demos recording and playback - - Musashi (generic) and StarScream (x86‐only) CPU cores - - Cyclone 68000 and DrZ80 (both ARM‐only) CPU cores - - CZ80 (generic) and MZ80 (generic and x86‐only versions) - - 16‐bit, 8000 to 48000Hz sound output - - Support for 8, 15, 16, 24 and 32 bpp modes - - Archived/compressed ROMs support - - M68K debugger (contributed by Edd Barrett) - - Z80 debugger - - hqx and scale2x upscaling filters - - VGM dumping - ''; - license = licenses.mit; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = with platforms; unix; - }; -} -# TODO: implement configure options diff --git a/pkgs/applications/emulators/dolphin-emu/default.nix b/pkgs/applications/emulators/dolphin-emu/default.nix index c9f1e1572ab13..91ad4b876eb9a 100644 --- a/pkgs/applications/emulators/dolphin-emu/default.nix +++ b/pkgs/applications/emulators/dolphin-emu/default.nix @@ -40,11 +40,7 @@ , xz # Used in passthru -, common-updater-scripts -, dolphin-emu -, jq , testers -, writeShellScript # Darwin-only dependencies , CoreBluetooth @@ -54,31 +50,29 @@ , moltenvk , OpenGL , VideoToolbox +, xcbuild }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dolphin-emu"; - version = "5.0-21460"; + version = "2409"; src = fetchFromGitHub { owner = "dolphin-emu"; repo = "dolphin"; - rev = "a9544510468740b77cf06ef28daaa65fe247fd32"; - hash = "sha256-mhD7Uaqi8GzHdR7Y81TspvCnrZH2evWuWFgXMQ2c8g0="; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-x4ZtV/5bwUjcmdYneG7n7uFVyPmYj0sD8TXEqsqbUFU="; fetchSubmodules = true; }; - patches = [ - # TODO: Remove when merged https://github.com/dolphin-emu/dolphin/pull/12736 - ./find-minizip-ng.patch - ]; - strictDeps = true; nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + xcbuild # for plutil ]; buildInputs = [ @@ -110,7 +104,7 @@ stdenv.mkDerivation rec { xz # Causes linker errors with minizip-ng, prefer vendored. Possible reason why: https://github.com/dolphin-emu/dolphin/pull/12070#issuecomment-1677311838 #zlib-ng - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib bluez libevdev @@ -121,7 +115,7 @@ stdenv.mkDerivation rec { #mgba # Derivation doesn't support Darwin udev vulkan-loader - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreBluetooth ForceFeedback IOBluetooth @@ -133,10 +127,10 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DDISTRIBUTOR=NixOS" - "-DDOLPHIN_WC_REVISION=${src.rev}" - "-DDOLPHIN_WC_DESCRIBE=${version}" + "-DDOLPHIN_WC_REVISION=${finalAttrs.src.rev}" + "-DDOLPHIN_WC_DESCRIBE=${finalAttrs.version}" "-DDOLPHIN_WC_BRANCH=master" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DOSX_USE_DEFAULT_SEARCH_PATH=True" "-DUSE_BUNDLED_MOLTENVK=OFF" "-DMACOS_CODE_SIGNING=OFF" @@ -147,7 +141,7 @@ stdenv.mkDerivation rec { "-DENABLE_AUTOUPDATE=OFF" ]; - qtWrapperArgs = lib.optionals stdenv.isLinux [ + qtWrapperArgs = lib.optionals stdenv.hostPlatform.isLinux [ "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ vulkan-loader ]}" # https://bugs.dolphin-emu.org/issues/11807 # The .desktop file should already set this, but Dolphin may be launched in other ways @@ -165,20 +159,10 @@ stdenv.mkDerivation rec { passthru = { tests.version = testers.testVersion { - package = dolphin-emu; + package = finalAttrs.finalPackage; command = "dolphin-emu-nogui --version"; - version = if stdenv.hostPlatform.isDarwin then "Dolphin 5.0" else version; + inherit (finalAttrs) version; }; - - updateScript = writeShellScript "dolphin-update-script" '' - set -eou pipefail - export PATH=${lib.makeBinPath [ curl jq common-updater-scripts ]} - - json="$(curl -s https://dolphin-emu.org/update/latest/beta)" - version="$(jq -r '.shortrev' <<< "$json")" - rev="$(jq -r '.hash' <<< "$json")" - update-source-version dolphin-emu "$version" --rev="$rev" - ''; }; meta = with lib; { @@ -188,9 +172,6 @@ stdenv.mkDerivation rec { branch = "master"; license = licenses.gpl2Plus; platforms = platforms.unix; - maintainers = with maintainers; [ - ashkitten - ivar - ]; + maintainers = with maintainers; [ pbsds ]; }; -} +}) diff --git a/pkgs/applications/emulators/dolphin-emu/find-minizip-ng.patch b/pkgs/applications/emulators/dolphin-emu/find-minizip-ng.patch deleted file mode 100644 index b8a6d81aed554..0000000000000 --- a/pkgs/applications/emulators/dolphin-emu/find-minizip-ng.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index fb37788513..289a25fa57 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -676,7 +676,7 @@ dolphin_find_optional_system_library_pkgconfig(ZLIB zlib-ng ZLIB::ZLIB Externals - - # https://github.com/zlib-ng/minizip-ng/commit/6c5f265a55f1a12a7a016cd2962feff91cff5d2e - add_definitions(-DMZ_COMPAT_VERSION=110) # This macro is for forwards compatibility with 4.0.4+ --dolphin_find_optional_system_library_pkgconfig(MINIZIP minizip>=3.0.0 minizip::minizip Externals/minizip) -+dolphin_find_optional_system_library_pkgconfig(MINIZIP minizip-ng>=3.0.0 minizip::minizip Externals/minizip) - - dolphin_find_optional_system_library(LZO Externals/LZO) - diff --git a/pkgs/applications/emulators/dolphin-emu/primehack.nix b/pkgs/applications/emulators/dolphin-emu/primehack.nix index b4698480a962d..c35700856b60e 100644 --- a/pkgs/applications/emulators/dolphin-emu/primehack.nix +++ b/pkgs/applications/emulators/dolphin-emu/primehack.nix @@ -54,14 +54,14 @@ stdenv.mkDerivation rec { owner = "shiiion"; repo = "dolphin"; rev = version; - sha256 = "sha256-gc4+ofoLKR+cvm+SaWEnGaKrSjWMKq7pF6pEIi75Rtk="; + hash = "sha256-gc4+ofoLKR+cvm+SaWEnGaKrSjWMKq7pF6pEIi75Rtk="; fetchSubmodules = true; }; nativeBuildInputs = [ pkg-config cmake - ] ++ lib.optional stdenv.isLinux wrapQtAppsHook; + ] ++ lib.optional stdenv.hostPlatform.isLinux wrapQtAppsHook; buildInputs = [ curl @@ -93,13 +93,13 @@ stdenv.mkDerivation rec { fmt xz qtbase - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ bluez udev libevdev alsa-lib vulkan-loader - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreBluetooth OpenGL ForceFeedback @@ -109,11 +109,11 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DUSE_SHARED_ENET=ON" "-DENABLE_LTO=ON" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DOSX_USE_DEFAULT_SEARCH_PATH=True" ]; - qtWrapperArgs = lib.optionals stdenv.isLinux [ + qtWrapperArgs = lib.optionals stdenv.hostPlatform.isLinux [ "--prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib" # https://bugs.dolphin-emu.org/issues/11807 # The .desktop file should already set this, but Dolphin may be launched in other ways @@ -123,7 +123,7 @@ stdenv.mkDerivation rec { # - Allow Dolphin to use nix-provided libraries instead of building them postPatch = '' substituteInPlace CMakeLists.txt --replace 'DISTRIBUTOR "None"' 'DISTRIBUTOR "NixOS"' - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace CMakeLists.txt --replace 'if(NOT APPLE)' 'if(true)' substituteInPlace CMakeLists.txt --replace 'if(LIBUSB_FOUND AND NOT APPLE)' 'if(LIBUSB_FOUND)' ''; @@ -143,8 +143,8 @@ 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 ]; - broken = stdenv.isDarwin; + maintainers = with maintainers; [ Madouura ]; + broken = stdenv.hostPlatform.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/dosbox/default.nix b/pkgs/applications/emulators/dosbox/default.nix index 2a1171ccf3b78..50805ae20dbb7 100644 --- a/pkgs/applications/emulators/dosbox/default.nix +++ b/pkgs/applications/emulators/dosbox/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - configureFlags = lib.optional stdenv.isDarwin "--disable-sdltest"; + configureFlags = lib.optional stdenv.hostPlatform.isDarwin "--disable-sdltest"; desktopItems = [ (makeDesktopItem { diff --git a/pkgs/applications/emulators/dynamips/default.nix b/pkgs/applications/emulators/dynamips/default.nix deleted file mode 100644 index 1abc0dcf52365..0000000000000 --- a/pkgs/applications/emulators/dynamips/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, libelf -, libpcap -, nix-update-script -}: - -stdenv.mkDerivation rec { - pname = "dynamips"; - version = "0.2.23"; - - src = fetchFromGitHub { - owner = "GNS3"; - repo = pname; - rev = "v${version}"; - hash = "sha256-+h+WsZ/QrDd+dNrR6CJb2uMG+vbUvK8GTxFJZOxknL0="; - }; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ libelf libpcap ]; - - cmakeFlags = [ "-DDYNAMIPS_CODE=stable" ]; - - passthru = { - updateScript = nix-update-script { }; - }; - - meta = with lib; { - inherit (src.meta) homepage; - description = "Cisco router emulator"; - longDescription = '' - Dynamips is an emulator computer program that was written to emulate Cisco - routers. - ''; - license = licenses.gpl2Plus; - mainProgram = "dynamips"; - maintainers = with maintainers; [ primeos ]; - platforms = platforms.linux ++ platforms.darwin; - }; -} diff --git a/pkgs/applications/emulators/emu2/default.nix b/pkgs/applications/emulators/emu2/default.nix deleted file mode 100644 index 22f2e17902e84..0000000000000 --- a/pkgs/applications/emulators/emu2/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -}: - -stdenv.mkDerivation rec { - pname = "emu2"; - version = "0.pre+unstable=2021-09-22"; - - src = fetchFromGitHub { - owner = "dmsc"; - repo = "emu2"; - rev = "8d01b53f154d6bfc9561a44b9c281b46e00a4e87"; - hash = "sha256-Jafl0Pw2k5RCF9GgpdAWcQ+HBTsiX7dOKSMCWPHQ+2E="; - }; - - makeFlags = [ "PREFIX=$(out)" ]; - - meta = with lib; { - homepage = "https://github.com/dmsc/emu2/"; - description = "Simple text-mode x86 + DOS emulator"; - platforms = platforms.linux; - maintainers = with maintainers; [ AndersonTorres ]; - license = licenses.gpl2Plus; - mainProgram = "emu2"; - }; -} diff --git a/pkgs/applications/emulators/firebird-emu/default.nix b/pkgs/applications/emulators/firebird-emu/default.nix index 9fd9901461617..48f3647514271 100644 --- a/pkgs/applications/emulators/firebird-emu/default.nix +++ b/pkgs/applications/emulators/firebird-emu/default.nix @@ -19,9 +19,6 @@ stdenv.mkDerivation rec { hash = "sha256-ZptjlnOiF+hKuKYvBFJL95H5YQuR99d4biOco/MVEmE="; }; - # work around https://github.com/NixOS/nixpkgs/issues/19098 - env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.cc.isClang && stdenv.isDarwin) "-fno-lto"; - nativeBuildInputs = [ wrapQtAppsHook qmake ]; buildInputs = [ qtbase qtdeclarative qtquickcontrols ]; diff --git a/pkgs/applications/emulators/flycast/default.nix b/pkgs/applications/emulators/flycast/default.nix index 8f426f9c52651..18406054b2803 100644 --- a/pkgs/applications/emulators/flycast/default.nix +++ b/pkgs/applications/emulators/flycast/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch2 , cmake , pkg-config , makeWrapper @@ -23,10 +24,18 @@ stdenv.mkDerivation rec { owner = "flyinghead"; repo = "flycast"; rev = "v${version}"; - sha256 = "sha256-YFLSUaEikwLPglHh3t8sHiKHRn5cchKzzkJlZDdgVsU="; + hash = "sha256-YFLSUaEikwLPglHh3t8sHiKHRn5cchKzzkJlZDdgVsU="; fetchSubmodules = true; }; + patches = [ + # miniupnp: add support for api version 18 + (fetchpatch2 { + url = "https://github.com/flyinghead/flycast/commit/71982eda7a038e24942921e558845103b6c12326.patch?full_index=1"; + hash = "sha256-5fFCgX7MfCqW7zxXJuHt9js+VTZZKEQHRYuWh7MTKzI="; + }) + ]; + nativeBuildInputs = [ cmake pkg-config @@ -59,6 +68,6 @@ stdenv.mkDerivation rec { mainProgram = "flycast"; license = licenses.gpl2Only; platforms = platforms.unix; - maintainers = [ maintainers.ivar ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/emulators/gens-gs/default.nix b/pkgs/applications/emulators/gens-gs/default.nix index 9699d24be6a76..7665d324971a0 100644 --- a/pkgs/applications/emulators/gens-gs/default.nix +++ b/pkgs/applications/emulators/gens-gs/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { description = "Genesis/Mega Drive emulator"; platforms = [ "i686-linux" ]; license = licenses.gpl2Plus; - maintainers = [ maintainers.eelco ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/emulators/goldberg-emu/default.nix b/pkgs/applications/emulators/goldberg-emu/default.nix index 7e00ad6a5d681..e165a36b317b9 100644 --- a/pkgs/applications/emulators/goldberg-emu/default.nix +++ b/pkgs/applications/emulators/goldberg-emu/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { owner = "mr_goldberg"; repo = "goldberg_emulator"; rev = version; - sha256 = "sha256-goOgMNjtDmIKOAv9sZwnPOY0WqTN90LFJ5iEp3Vkzog="; + hash = "sha256-goOgMNjtDmIKOAv9sZwnPOY0WqTN90LFJ5iEp3Vkzog="; }; # It attempts to install windows-only libraries which we never build @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; homepage = "https://gitlab.com/Mr_Goldberg/goldberg_emulator"; changelog = "https://gitlab.com/Mr_Goldberg/goldberg_emulator/-/releases"; description = "Program that emulates steam online features"; @@ -53,6 +53,6 @@ stdenv.mkDerivation rec { mainProgram = "lobby_connect"; license = licenses.lgpl3Only; platforms = platforms.unix; - maintainers = [ maintainers.ivar ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/emulators/gxemul/0001-fix-attributes.patch b/pkgs/applications/emulators/gxemul/0001-fix-attributes.patch deleted file mode 100644 index 3ed9cabc7ad26..0000000000000 --- a/pkgs/applications/emulators/gxemul/0001-fix-attributes.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -Naur gxemul-0.7.0-old/src/include/thirdparty/pcireg.h gxemul-0.7.0/src/include/thirdparty/pcireg.h ---- gxemul-0.7.0-old/src/include/thirdparty/pcireg.h 2021-04-22 15:04:14.000000000 -0300 -+++ gxemul-0.7.0-new/src/include/thirdparty/pcireg.h 2021-06-28 18:41:13.063065322 -0300 -@@ -12,9 +12,6 @@ - #undef __noreturn__ - #endif - --#define __attribute__(x) /* */ --#define __noreturn__ /* */ -- - /* - * Copyright (c) 1995, 1996, 1999, 2000 - * Christopher G. Demetriou. All rights reserved. -diff -Naur gxemul-0.7.0-old/src/include/thirdparty/sgi_arcbios.h gxemul-0.7.0/src/include/thirdparty/sgi_arcbios.h ---- gxemul-0.7.0-old/src/include/thirdparty/sgi_arcbios.h 2021-04-22 15:04:14.000000000 -0300 -+++ gxemul-0.7.0-new/src/include/thirdparty/sgi_arcbios.h 2021-06-28 18:41:33.549981505 -0300 -@@ -14,9 +14,6 @@ - #undef __noreturn__ - #endif - --#define __attribute__(x) /* */ --#define __noreturn__ /* */ -- - /* $NetBSD: arcbios.h,v 1.3 2001/12/06 14:59:02 rafal Exp $ */ - - /*- diff --git a/pkgs/applications/emulators/gxemul/default.nix b/pkgs/applications/emulators/gxemul/default.nix deleted file mode 100644 index 88ea01f9d76ef..0000000000000 --- a/pkgs/applications/emulators/gxemul/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ lib -, stdenv -, fetchurl -, libX11 -}: - -stdenv.mkDerivation rec { - pname = "gxemul"; - version = "0.7.0"; - - src = fetchurl { - url = "https://gavare.se/gxemul/src/${pname}-${version}.tar.gz"; - sha256 = "sha256-ecRDfG+MqQT0bTOsNgYqZf3PSpKiSEeOQIqxEpXPjoM="; - }; - - buildInputs = [ - libX11 - ]; - - patches = [ - # Fix compilation; remove when next release arrives - ./0001-fix-attributes.patch - ]; - - dontAddPrefix = true; - - preConfigure = '' - export PREFIX=${placeholder "out"} - ''; - - meta = with lib; { - homepage = "https://gavare.se/gxemul/"; - description = "Gavare's experimental emulator"; - longDescription = '' - GXemul is a framework for full-system computer architecture - emulation. Several real machines have been implemented within the - framework, consisting of processors (ARM, MIPS, Motorola 88K, PowerPC, and - SuperH) and surrounding hardware components such as framebuffers, - interrupt controllers, busses, disk controllers, and serial - controllers. The emulation is working well enough to allow several - unmodified "guest" operating systems to run. - ''; - license = licenses.bsd3; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.unix; - mainProgram = "gxemul"; - }; -} diff --git a/pkgs/applications/emulators/hatari/default.nix b/pkgs/applications/emulators/hatari/default.nix index de98278b83251..a7519eb49ecf1 100644 --- a/pkgs/applications/emulators/hatari/default.nix +++ b/pkgs/applications/emulators/hatari/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { description = "Atari ST/STE/TT/Falcon emulator"; license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/emulators/mame/default.nix b/pkgs/applications/emulators/mame/default.nix index 804c5b1cceeed..25018c56aa663 100644 --- a/pkgs/applications/emulators/mame/default.nix +++ b/pkgs/applications/emulators/mame/default.nix @@ -38,14 +38,14 @@ let in stdenv.mkDerivation rec { pname = "mame"; - version = "0.266"; + version = "0.269"; srcVersion = builtins.replaceStrings [ "." ] [ "" ] version; src = fetchFromGitHub { owner = "mamedev"; repo = "mame"; rev = "mame${srcVersion}"; - hash = "sha256-nggpDKcZURwC4SQHiRnF7lJNaAWSniVHvsF/IjAPd9E="; + hash = "sha256-ECOPohrfAVz0Rx/oYBFJvo91FoS76RJuBzadfXoXB4c="; }; outputs = [ "out" "tools" ]; @@ -90,8 +90,8 @@ stdenv.mkDerivation rec { sqlite qtbase ] - ++ lib.optionals stdenv.isLinux [ alsa-lib libpulseaudio libXinerama libXi fontconfig ] - ++ lib.optionals stdenv.isDarwin [ libpcap CoreAudioKit ForceFeedback ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib libpulseaudio libXinerama libXi fontconfig ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libpcap CoreAudioKit ForceFeedback ]; nativeBuildInputs = [ copyDesktopItems @@ -195,7 +195,7 @@ stdenv.mkDerivation rec { license = with licenses; [ bsd3 gpl2Plus ]; maintainers = with maintainers; [ thiagokokada ]; platforms = platforms.unix; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; mainProgram = "mame"; }; } diff --git a/pkgs/applications/emulators/openmsx/custom-nix.mk b/pkgs/applications/emulators/openmsx/custom-nix.mk deleted file mode 100644 index 9098762e40d5d..0000000000000 --- a/pkgs/applications/emulators/openmsx/custom-nix.mk +++ /dev/null @@ -1,9 +0,0 @@ -# This file substitutes $sourceRoot/build/custom.mk - -VERSION_EXEC:=false -SYMLINK_FOR_BINARY:=false -INSTALL_CONTRIB:=true -INSTALL_BASE:=${out} -INSTALL_DOC_DIR:=${INSTALL_BASE}/share/doc/openmsx -INSTALL_SHARE_DIR:=${INSTALL_BASE}/share/openmsx -INSTALL_BINARY_DIR:=${INSTALL_BASE}/bin diff --git a/pkgs/applications/emulators/openmsx/default.nix b/pkgs/applications/emulators/openmsx/default.nix deleted file mode 100644 index cc6992f7bcccb..0000000000000 --- a/pkgs/applications/emulators/openmsx/default.nix +++ /dev/null @@ -1,76 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, pkg-config -, SDL2 -, SDL2_image -, SDL2_ttf -, alsa-lib -, freetype -, glew -, libGL -, libogg -, libpng -, libtheora -, libvorbis -, python3 -, tcl -, zlib -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "openmsx"; - version = "19.1"; - - src = fetchFromGitHub { - owner = "openMSX"; - repo = "openMSX"; - rev = "RELEASE_${builtins.replaceStrings ["."] ["_"] finalAttrs.version}"; - sha256 = "sha256-5ULljLmEDGFp32rnrXKLfL6P3ad2STJUNngBuWlRCbc="; - fetchSubmodules = true; - }; - - nativeBuildInputs = [ - pkg-config - python3 - ]; - - buildInputs = [ - SDL2 - SDL2_image - SDL2_ttf - alsa-lib - freetype - glew - libGL - libogg - libpng - libtheora - libvorbis - tcl - zlib - ]; - - postPatch = '' - cp ${./custom-nix.mk} build/custom.mk - ''; - - dontAddPrefix = true; - - # Many thanks @mthuurne from OpenMSX project for providing support to - # Nixpkgs! :) - TCL_CONFIG="${tcl}/lib/"; - - meta = with lib; { - homepage = "https://openmsx.org"; - description = "MSX emulator that aims for perfection"; - longDescription = '' - OpenMSX is an emulator for the MSX home computer system. Its goal is - to emulate all aspects of the MSX with 100% accuracy. - ''; - license = with licenses; [ bsd2 boost gpl2Plus ]; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.unix; - mainProgram = "openmsx"; - }; -}) diff --git a/pkgs/applications/emulators/pcsxr/0001-libpcsxcore-fix-build-with-ffmpeg-4.patch b/pkgs/applications/emulators/pcsxr/0001-libpcsxcore-fix-build-with-ffmpeg-4.patch deleted file mode 100644 index 0edc6281a7efb..0000000000000 --- a/pkgs/applications/emulators/pcsxr/0001-libpcsxcore-fix-build-with-ffmpeg-4.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 351be6b3f2ad10d86ec4ae711db5a1067acc592a Mon Sep 17 00:00:00 2001 -From: Zane van Iperen <zane@zanevaniperen.com> -Date: Sun, 7 Nov 2021 15:17:07 +1000 -Subject: [PATCH] libpcsxcore: fix build with ffmpeg 4 - ---- - libpcsxcore/cdriso.c | 16 ++++++++-------- - 1 file changed, 8 insertions(+), 8 deletions(-) - -diff --git a/libpcsxcore/cdriso.c b/libpcsxcore/cdriso.c -index f89678e..6314482 100644 ---- a/libpcsxcore/cdriso.c -+++ b/libpcsxcore/cdriso.c -@@ -266,14 +266,14 @@ static int decode_compressed_cdda_track(FILE* outfile, const char* infilepath, s - } - - if (!decoded_frame) { -- if (!(decoded_frame = avcodec_alloc_frame())) { -+ if (!(decoded_frame = av_frame_alloc())) { - SysMessage(_(" -> Error allocating audio frame buffer. This track will not be available.")); - avformat_close_input(&inAudioFormat); -- avcodec_free_frame(&decoded_frame); -+ av_frame_free(&decoded_frame); - return 1; // error decoding frame - } - } else { -- avcodec_get_frame_defaults(decoded_frame); -+ av_frame_unref(decoded_frame); - } - len = avcodec_decode_audio4(c, decoded_frame, &got_frame, &avpkt); - if (len > 0 && got_frame) { -@@ -285,7 +285,7 @@ static int decode_compressed_cdda_track(FILE* outfile, const char* infilepath, s - fwrite(decoded_frame->data[0], 1, data_size, outfile); - } - av_free_packet(&avpkt); -- //avcodec_free_frame(&decoded_frame); -+ //av_frame_free(&decoded_frame); - } while (moreFrames >= 0); // TODO: check for possible leaks - - // file will be closed later on, now just flush it -@@ -294,7 +294,7 @@ static int decode_compressed_cdda_track(FILE* outfile, const char* infilepath, s - avformat_close_input(&inAudioFormat); - //avcodec_close(c); - //av_free(c); -- avcodec_free_frame(&decoded_frame); -+ av_frame_free(&decoded_frame); - return 0; - } - #endif -@@ -340,12 +340,12 @@ static int decode_compressed_cdda_track(FILE* outfile, FILE* infile, enum AVCode - while (avpkt.size > 0) { - int got_frame = 0; - if (!decoded_frame) { -- if (!(decoded_frame = avcodec_alloc_frame())) { -+ if (!(decoded_frame = av_frame_alloc())) { - SysPrintf(" -> Error allocating audio frame buffer. Track will not be available."); - return 1; // error decoding frame - } - } else { -- avcodec_get_frame_defaults(decoded_frame); -+ av_frame_unref(decoded_frame); - } - - len = avcodec_decode_audio4(c, decoded_frame, &got_frame, &avpkt); -@@ -383,7 +383,7 @@ static int decode_compressed_cdda_track(FILE* outfile, FILE* infile, enum AVCode - - avcodec_close(c); - av_free(c); -- avcodec_free_frame(&decoded_frame); -+ av_frame_free(&decoded_frame); - return 0; - } - #endif --- -2.31.1 - diff --git a/pkgs/applications/emulators/pcsxr/default.nix b/pkgs/applications/emulators/pcsxr/default.nix deleted file mode 100644 index 06559af0e7328..0000000000000 --- a/pkgs/applications/emulators/pcsxr/default.nix +++ /dev/null @@ -1,97 +0,0 @@ -{ lib, stdenv, fetchurl, autoreconfHook, intltool, pkg-config, gtk3, SDL2, xorg -, wrapGAppsHook3, libcdio, nasm, ffmpeg_4, file -, fetchpatch }: - -stdenv.mkDerivation rec { - pname = "pcsxr"; - version = "1.9.94"; - - # codeplex does not support direct downloading - src = fetchurl { - url = "mirror://debian/pool/main/p/pcsxr/pcsxr_${version}.orig.tar.xz"; - sha256 = "0q7nj0z687lmss7sgr93ij6my4dmhkm2nhjvlwx48dn2lxl6ndla"; - }; - - patches = [ - ( fetchpatch { - url = "https://salsa.debian.org/games-team/pcsxr/raw/315e56d16e36ef3011f72d0fe86190728d2ba596/debian/patches/01_fix-i386-exec-stack.patch"; - sha256 = "17497wjxd6b92bj458s2769d9bpp68ydbvmfs9gp51yhnq4zl81x"; - }) - ( fetchpatch { - url = "https://salsa.debian.org/games-team/pcsxr/raw/315e56d16e36ef3011f72d0fe86190728d2ba596/debian/patches/02_disable-ppc-auto-dynarec.patch"; - sha256 = "0v8n79z034w6cqdrzhgd9fkdpri42mzvkdjm19x4asz94gg2i2kf"; - }) - ( fetchpatch { - url = "https://salsa.debian.org/games-team/pcsxr/raw/315e56d16e36ef3011f72d0fe86190728d2ba596/debian/patches/03_fix-plugin-dir.patch"; - sha256 = "0vkl0mv6whqaz79kvvvlmlmjpynyq4lh352j3bbxcr0vjqffxvsy"; - }) - ( fetchpatch { - url = "https://salsa.debian.org/games-team/pcsxr/raw/315e56d16e36ef3011f72d0fe86190728d2ba596/debian/patches/04_update-homedir-symlinks.patch"; - sha256 = "18r6n025ybr8fljfsaqm4ap31wp8838j73lrsffi49fkis60dp4j"; - }) - ( fetchpatch { - url = "https://salsa.debian.org/games-team/pcsxr/raw/315e56d16e36ef3011f72d0fe86190728d2ba596/debian/patches/05_format-security.patch"; - sha256 = "03m4kfc9bk5669hf7ji1anild08diliapx634f9cigyxh72jcvni"; - }) - ( fetchpatch { - url = "https://salsa.debian.org/games-team/pcsxr/raw/315e56d16e36ef3011f72d0fe86190728d2ba596/debian/patches/06_warnings.patch"; - sha256 = "0iz3g9ihnhisfgrzma9l74y4lhh57na9h41bmiam1millb796g71"; - }) - ( fetchpatch { - url = "https://salsa.debian.org/games-team/pcsxr/raw/315e56d16e36ef3011f72d0fe86190728d2ba596/debian/patches/07_non-linux-ip-addr.patch"; - sha256 = "14vb9l0l4nzxcymhjjs4q57nmsncmby9qpdr7c19rly5wavm4k77"; - }) - ( fetchpatch { - url = "https://salsa.debian.org/games-team/pcsxr/raw/315e56d16e36ef3011f72d0fe86190728d2ba596/debian/patches/08_reproducible.patch"; - sha256 = "1cx9q59drsk9h6l31097lg4aanaj93ysdz5p88pg9c7wvxk1qz06"; - }) - - ./uncompress2.patch - ./0001-libpcsxcore-fix-build-with-ffmpeg-4.patch - ]; - - nativeBuildInputs = [ autoreconfHook intltool pkg-config wrapGAppsHook3 ]; - buildInputs = [ - gtk3 SDL2 xorg.libXv xorg.libXtst libcdio nasm ffmpeg_4 file - xorg.libXxf86vm - ]; - - # Workaround build failure on -fno-common toolchains like upstream - # gcc-10. Otherwise build fails as: - # ld: AboutDlg.o:/build/pcsxr/gui/Linux.h:42: multiple definition of `cfgfile'; - # LnxMain.o:/build/pcsxr/gui/Linux.h:42: first defined here - env.NIX_CFLAGS_COMPILE = "-fcommon"; - - dynarecTarget = - if stdenv.isx86_64 then "x86_64" - else if stdenv.isi686 then "x86" - else "no"; #debian patch 2 says ppc doesn't work - - configureFlags = [ - "--enable-opengl" - "--enable-ccdda" - "--enable-libcdio" - "--enable-dynarec=${dynarecTarget}" - ]; - - postInstall = '' - mkdir -p "$out/share/doc/${pname}-${version}" - cp README \ - AUTHORS \ - doc/keys.txt \ - doc/tweaks.txt \ - ChangeLog.df \ - ChangeLog \ - "$out/share/doc/${pname}-${version}" - ''; - - meta = with lib; { - broken = stdenv.isDarwin; - description = "Playstation 1 emulator"; - homepage = "https://github.com/iCatButler/pcsxr"; - maintainers = with maintainers; [ rardiol ]; - license = licenses.gpl2Plus; - platforms = platforms.all; - mainProgram = "pcsxr"; - }; -} diff --git a/pkgs/applications/emulators/pcsxr/uncompress2.patch b/pkgs/applications/emulators/pcsxr/uncompress2.patch deleted file mode 100644 index 356868ce7a8b6..0000000000000 --- a/pkgs/applications/emulators/pcsxr/uncompress2.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/libpcsxcore/cdriso.c -+++ b/libpcsxcore/cdriso.c -@@ -1219,7 +1219,7 @@ - return ret; - } - --static int uncompress2(void *out, unsigned long *out_size, void *in, unsigned long in_size) -+static int uncompress3(void *out, unsigned long *out_size, void *in, unsigned long in_size) - { - static z_stream z; - int ret = 0; -@@ -1298,7 +1298,7 @@ - if (is_compressed) { - cdbuffer_size_expect = sizeof(compr_img->buff_raw[0]) << compr_img->block_shift; - cdbuffer_size = cdbuffer_size_expect; -- ret = uncompress2(compr_img->buff_raw[0], &cdbuffer_size, compr_img->buff_compressed, size); -+ ret = uncompress3(compr_img->buff_raw[0], &cdbuffer_size, compr_img->buff_compressed, size); - if (ret != 0) { - SysPrintf("uncompress failed with %d for block %d, sector %d\n", - ret, block, sector); diff --git a/pkgs/applications/emulators/retroarch/README.md b/pkgs/applications/emulators/retroarch/README.md new file mode 100644 index 0000000000000..74b600e069bd8 --- /dev/null +++ b/pkgs/applications/emulators/retroarch/README.md @@ -0,0 +1,68 @@ +# RetroArch + +This directory includes [RetroArch](https://www.retroarch.com/), [libretro +cores](https://docs.libretro.com/guides/core-list/) and related packages. + +## Adding new cores + +The basic steps to add a new core are: + +1. Add the core repository to [update_cores.py](./update_cores.py) inside the + `CORES` map. + - The minimum required parameter is `repo` + - If the repository owner is not `libretro`, set `owner` parameter + - If the core needs submodules, set `fetch_submodules` parameter to `True` + - To pin the core to a specific release, set `rev` parameter +2. Run `./pkgs/applications/emulators/retroarch/update_cores.py <emulator>` to + generate [`hashes.json`](./hashes.json) file +3. Add your new core to [`cores.nix`](./cores.nix) file, using + [`mkLibretroCore`](./mkLibretroCore.nix) function + - In general, the attribute name should be the same as the repo name, unless + there is a good reason not to + - Check the core repo and [Libretro + documentation](https://docs.libretro.com/) for the core you're trying to add + for instructions on how to build + - Also check the examples inside [`cores.nix`](./cores.nix) + - If your core is recently released, there is a good chance that you may + need to update [`libretro-core-info`](./libretro-core-info.nix) for things + to work inside RetroArch +4. Try to build your core with `nix-build -A libretro.<core>` + +## Updating cores + +Just run: + +```console +# From the root of your nixpkgs directory +./pkgs/applications/emulators/retroarch/update_cores.nix +``` + +Keep in mind that because of the huge amount of cores that we package here, it +is recommended to set `GITHUB_TOKEN` to your GitHub's [Personal Access +Token](https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/managing-your-personal-access-tokens) +(PAT), otherwise the update will probably fail due to GitHub's API rate limit. + +## Using RetroArch with cores + +To create a custom RetroArch derivation with the cores you want (instead of +using `retroarchFull` that includes all cores), you can use `.override` like +this: + +```nix +{ pkgs, ... }: + +let + retroarchWithCores = (pkgs.retroarch.override { + cores = with pkgs.libretro; [ + bsnes + mgba + quicknes + ]; + }); +in +{ + environment.systemPackages = [ + retroarchWithCores + ]; +} +``` diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 532109eefa6d8..18c510b8465b2 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -267,7 +267,7 @@ in let # linux = bsd # https://github.com/DerKoun/bsnes-hd/blob/f0b6cf34e9780d53516977ed2de64137a8bcc3c5/bsnes/GNUmakefile#L37 - platform = if stdenv.isDarwin then "macos" else "linux"; + platform = if stdenv.hostPlatform.isDarwin then "macos" else "linux"; in [ "-C" diff --git a/pkgs/applications/emulators/retroarch/default.nix b/pkgs/applications/emulators/retroarch/default.nix index 7e7090a87a640..b23a5e3c9bb3a 100644 --- a/pkgs/applications/emulators/retroarch/default.nix +++ b/pkgs/applications/emulators/retroarch/default.nix @@ -2,13 +2,13 @@ , stdenv , nixosTests , enableNvidiaCgToolkit ? false -, withGamemode ? stdenv.isLinux -, withVulkan ? stdenv.isLinux -, withWayland ? stdenv.isLinux +, withGamemode ? stdenv.hostPlatform.isLinux +, withVulkan ? stdenv.hostPlatform.isLinux +, withWayland ? stdenv.hostPlatform.isLinux , alsa-lib , dbus , fetchFromGitHub -, ffmpeg_4 +, ffmpeg_7 , flac , freetype , gamemode @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { lib.optional (runtimeLibs != [ ]) makeWrapper; buildInputs = [ - ffmpeg_4 + ffmpeg_7 flac freetype libGL @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { lib.optional enableNvidiaCgToolkit nvidia_cg_toolkit ++ lib.optional withVulkan vulkan-loader ++ lib.optional withWayland wayland ++ - lib.optionals stdenv.isLinux [ + lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib dbus libX11 @@ -103,7 +103,7 @@ stdenv.mkDerivation rec { "--disable-update_assets" "--disable-update_core_info" ] ++ - lib.optionals stdenv.isLinux [ + lib.optionals stdenv.hostPlatform.isLinux [ "--enable-dbus" "--enable-egl" "--enable-kms" @@ -142,6 +142,6 @@ stdenv.mkDerivation rec { # https://docs.libretro.com/development/retroarch/compilation/osx/ # and # https://github.com/libretro/RetroArch/blob/71eb74d256cb4dc5b8b43991aec74980547c5069/.gitlab-ci.yml#L330 - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index 708c8db9d3e64..7bddba7537e85 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -5,20 +5,20 @@ "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", "src": { "owner": "libretro", "repo": "libretro-atari800", - "rev": "8bfa3b80f6a2db365dfd1e8a6c06b7b0844327cf", - "hash": "sha256-sUv1NT5aOwULOCC9vCrlRXcvVdlfZk9dmPMZg2NGAPg=" + "rev": "39380a6e028589e850ecdfd2a5a19307b475d667", + "hash": "sha256-Rw6eTaKHZaCEgvnIqctaKCYQ+W8cHLtckLK8U5Ugck4=" }, - "version": "unstable-2024-05-18" + "version": "unstable-2024-09-24" }, "beetle-gba": { "fetcher": "fetchFromGitHub", @@ -35,60 +35,60 @@ "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", "src": { "owner": "libretro", "repo": "beetle-pce-libretro", - "rev": "3d91a940b3a48254152a8789b79616ceefe4067f", - "hash": "sha256-6zXl49Rns6wCZmcEUWkWqYeSH6W1+qs6Sb998pQ/+Lo=" + "rev": "e6c21fdf7d1aeae411f08272121213fa4de96bbc", + "hash": "sha256-ZeBoLTsr1A+IPQJ+oIGNADrgKySDHczXY6uriLmeHV4=" }, - "version": "unstable-2024-06-14" + "version": "unstable-2024-09-27" }, "beetle-pce-fast": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "beetle-pce-fast-libretro", - "rev": "a653bbbdc5cf2bf960e614efdcf9446a9aa8cdf9", - "hash": "sha256-ty4Uluo8D8x+jB7fOqI/AgpTxdttzpbeARiICd3oh9c=" + "rev": "6aaabc8e18279ac8a7c6facf26aa67e58375d177", + "hash": "sha256-lhpAnDofOLqyr8j43zTjzbPbcbntEt0DMY6aGtckDmc=" }, - "version": "unstable-2024-06-14" + "version": "unstable-2024-09-20" }, "beetle-pcfx": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "beetle-pcfx-libretro", - "rev": "47c355b6a515aef6dc57f57df1535570108a0e21", - "hash": "sha256-ylFo/wmLQpQGYSrv9PF2DBmr/8rklmHF9R+3y8v93Rs=" + "rev": "3a4e8d3665816a2938ea5029f05bc1537f0cbe40", + "hash": "sha256-IbFZHMqLH6T2kelNInbGcKIfdn/9li+Lo8BKbYRdEAU=" }, - "version": "unstable-2023-05-28" + "version": "unstable-2024-08-07" }, "beetle-psx": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "beetle-psx-libretro", - "rev": "6e881f9939dd9b33fb5f5587745524a0828c9ef4", - "hash": "sha256-mFIqsybkpSF17HmrfReazYUqVLzuDGwCjzaV7BTLKJ8=" + "rev": "261e52b7dd35e8fd2c8b1f760a3ba4cf7fce60c5", + "hash": "sha256-HV/O7zJscLJAzhAoch44kKwBKavasdvf1VDvudLU2q0=" }, - "version": "unstable-2024-06-14" + "version": "unstable-2024-09-16" }, "beetle-saturn": { "fetcher": "fetchFromGitHub", @@ -115,30 +115,30 @@ "src": { "owner": "libretro", "repo": "beetle-supergrafx-libretro", - "rev": "29b2a6e12c13d623ad94dcb64e1cb341d93ff02d", - "hash": "sha256-sbpCG3QsSn8NOjWC0snvsd7jZYClSbKI79QUnigQwzc=" + "rev": "6c76ef9e83f7f3bed3aa747b01fd2d6c54687c65", + "hash": "sha256-LapGHFPSM/I+73oRhxW+gfc1SrEZ1MxscmpGujr6p9Y=" }, - "version": "unstable-2024-06-14" + "version": "unstable-2024-09-06" }, "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", @@ -155,20 +155,20 @@ "src": { "owner": "libretro", "repo": "bluemsx-libretro", - "rev": "df29d437204af0a5158b6ecb2d6b68296f8d979a", - "hash": "sha256-ULDnLHbEQ1+VR3axfbVaH4Kkuq/UDBA9JGuW9beraZ4=" + "rev": "824690b5ac997ec9694e8db1595186459bb3b652", + "hash": "sha256-8UgVUTKGjSt2HwVgE6a/cs1npsOR8j9TxWBH/RA9VNk=" }, - "version": "unstable-2024-05-20" + "version": "unstable-2024-08-08" }, "bsnes": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "bsnes-libretro", - "rev": "c5963607b59c8d56d28bb4de3f7ac555e004c69e", - "hash": "sha256-YmOy2iaQYqaIp4u4cIQx8Z8jUqaIhPdJZTFgSETQprs=" + "rev": "20c55eb6333a11395ba637df8583066483e58cb2", + "hash": "sha256-IP00xtxS3wwnQSmYltrX8GEHZX/65xnx2EsmQlE1VZM=" }, - "version": "unstable-2024-06-21" + "version": "unstable-2024-09-06" }, "bsnes-hd": { "fetcher": "fetchFromGitHub", @@ -246,10 +246,10 @@ "src": { "owner": "schellingb", "repo": "dosbox-pure", - "rev": "1e3cb35355769467ca7be192e740eb9728ecc88c", - "hash": "sha256-svVpHUOPPAFMypmeaHLCQfwTAVOZajTMKyeKvWLZlcc=" + "rev": "ea7b947a8ed156a1ce2ce49329a5686c69f80075", + "hash": "sha256-aqNyYG7H+YBLhQlnkfBfmX3PkBF8GeYXc+KHkvkxlRo=" }, - "version": "unstable-2024-06-03" + "version": "unstable-2024-09-16" }, "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", @@ -287,162 +287,162 @@ "src": { "owner": "libretro", "repo": "fbneo", - "rev": "634d207adade213bbe83684be2a183d158f56e52", - "hash": "sha256-hmnb7euH2VfGnF8ztGFhXYmqaCY49APDG0Y3s4ku7Ac=" + "rev": "3d69bc5519c4382b3d5da2763ae42e3b6a3d019e", + "hash": "sha256-Tf5nLy9G9h/qBrwdBFO3OUYl3n81NPw4slEeCfLzMjI=" }, - "version": "unstable-2024-06-02" + "version": "unstable-2024-09-26" }, "fceumm": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "libretro-fceumm", - "rev": "fe4a4f8a53cc7f91278f393710abb4f32c4e0a8f", - "hash": "sha256-/rZoARZf3SfN8E0o0qm34FYCYscqeEcLg3eYSXenK8s=" + "rev": "e226068f979cd8fbfc3be9780d16cfb1405095b0", + "hash": "sha256-2G5EzcDJkEhaN+nXi/wu3+Ejim04ZzOr+LW69cLAEuM=" }, - "version": "unstable-2024-06-15" + "version": "unstable-2024-09-23" }, "flycast": { "fetcher": "fetchFromGitHub", "src": { "owner": "flyinghead", "repo": "flycast", - "rev": "7d645541f8f8b7f4550eabe9157d8fb82b43c1a7", - "hash": "sha256-/RLh6FO3lk6L1yhTMGLt7sjY/vwlb1y2XxmtgO5+uOk=", + "rev": "343021a8c507f4723b3f56a3bb817206912fcb36", + "hash": "sha256-DMbhCHW2VHEle0oihaz1GEPOGDCXxfdZoL8MdPZT4d0=", "fetchSubmodules": true }, - "version": "unstable-2024-06-23" + "version": "unstable-2024-09-27" }, "fmsx": { "fetcher": "fetchFromGitHub", "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", "src": { "owner": "libretro", "repo": "freeintv", - "rev": "85bf25a39a34bbc39fe36677175d87c2b597dbe7", - "hash": "sha256-4cU/YRZZb7EWNBJX8M91Lb+bCCIlks6xX2Cf6Iq/g9g=" + "rev": "6bd91d0d83d896e66b9fd7e5e239f93f00e4ad87", + "hash": "sha256-P3devj/aAa0e/QpV68kQkLAvhrVGO8O8ijkUAobgUb0=" }, - "version": "unstable-2023-04-17" + "version": "unstable-2024-06-28" }, "fuse": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "fuse-libretro", - "rev": "9fc41a5f153e1f2fa2dbcfdd215c7ec97d98a29c", - "hash": "sha256-eEgPnSIpKC7s+4JoEHDGPlwYPa5Y8EpoxmNhyOIIcU8=" + "rev": "6fd07d90acc38a1b8835bf16539b833f21aaa38f", + "hash": "sha256-q5vcFNr1RBeTaw1R2LDY9xLU1oGeWtPemTdliWR+39s=" }, - "version": "unstable-2024-06-16" + "version": "unstable-2024-09-20" }, "gambatte": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "gambatte-libretro", - "rev": "594422484170a0a075d02d702d3367819c9d4e1a", - "hash": "sha256-pCoQ+9Sx4dBhbnJTQ00nJAb8ooUp/6pVxTdGtL2tX0c=" + "rev": "e9a1941276e932813dc742796ffd1d0939c5d1d5", + "hash": "sha256-4FFYocOa2fuBT8UFKM87Fn5E6pjkfe4tUVDtpEchtJo=" }, - "version": "unstable-2024-06-21" + "version": "unstable-2024-09-27" }, "genesis-plus-gx": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "Genesis-Plus-GX", - "rev": "3bf89541aca5768cda7f834e5c5a6041fd4a5f27", - "hash": "sha256-s8MmlcPdnS6esSWS3GD53X7UzwP2RNjtL3QYnPbgStQ=" + "rev": "7de0f0b6cde9bda1235b448aa607044b3f80ab3c", + "hash": "sha256-W06vSrGKbXMcXIouW9/fD93sBfwREqIL8HvB3kan0tM=" }, - "version": "unstable-2024-06-21" + "version": "unstable-2024-09-18" }, "gpsp": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "gpsp", - "rev": "4caf7a167d159866479ea94d6b2d13c26ceb3e72", - "hash": "sha256-1hkxeTjY52YuphQuDMCITn/dIcNx/8w4FkhQjL8DWz8=" + "rev": "f2837be54aa680c4ec0c7be0669cdcd65582cc66", + "hash": "sha256-Kfw4KYNH/K3y6Iy/eYu/OlInibv9JLQvOSDh429G2zg=" }, - "version": "unstable-2024-02-10" + "version": "unstable-2024-08-24" }, "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", "src": { "owner": "libretro", "repo": "hatari", - "rev": "a4c9eb0bb79e47a2870c12b04566c1f8d25e4bf3", - "hash": "sha256-mHz2nB9Vr/PVifd6w+kz7ZCH+N8igmcS8InvevZoSpE=" + "rev": "c10a21dbe99277b06ccf7de10eceb74f5d57e921", + "hash": "sha256-R5N7EUVUKJ1GXQtnlCCE33DlDsxMzpPp6pYUHJJ/5Ig=" }, - "version": "unstable-2023-09-29" + "version": "unstable-2024-06-28" }, "mame": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "mame", - "rev": "db65a583bd2da39514a544c58362a6ac170179ac", - "hash": "sha256-FTsoLsx7IhyAw/pdaGAeNzysc7vZ3CcyXKWcBJ0pOb8=", + "rev": "231b5e6d621ed93168ad19eed6c0e3390d4e81ff", + "hash": "sha256-UD1kNQ6KXEa60ZA+65XXqgihLu/XJxTLvbM4Wt9y2vs=", "fetchSubmodules": true }, - "version": "unstable-2024-06-13" + "version": "unstable-2024-09-27" }, "mame2000": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "mame2000-libretro", - "rev": "905808fbcc3adf8c610c1c60f0e41ce4b35db1c5", - "hash": "sha256-2J3QGlSb4YhDZND4T0wmt9zzDjOuNiscsMxn9zA1TtI=" + "rev": "2ec60f6e1078cf9ba173e80432cc28fd4eea200f", + "hash": "sha256-AYZj7bvO9oc7wmEBbj6DPRzpQFHl8diIcunSSpD4Vok=" }, - "version": "unstable-2024-05-07" + "version": "unstable-2024-07-01" }, "mame2003": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "mame2003-libretro", - "rev": "ce82eaa30932c988e9d9abc0ac5d6d637fb88cc6", - "hash": "sha256-vCqv2EhgYtJwNE2sRcs8KTg0cGlRSmhykRLkt8mUKlg=" + "rev": "1a268a709d611f6a84d473754ee2dbcaf1c37a2e", + "hash": "sha256-jFzFQVB0uiSRa82sq1fiMEXyzzDJqRANNgq5hj/ZAl4=" }, - "version": "unstable-2024-06-07" + "version": "unstable-2024-09-04" }, "mame2003-plus": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "mame2003-plus-libretro", - "rev": "ecd00b18187c7fff75b6d9a70ac1b349e79652bb", - "hash": "sha256-1dVNNlDKDJwGHou/bY/grj/p9BJmfUwDxEiw2zQ7gSg=" + "rev": "9221b2f66dbc7a08b22a7365e2431e027e382322", + "hash": "sha256-mm4g1JX98yW/6Us1k5DwaYQQbhmfiBSxxXFvwgvB5yE=" }, - "version": "unstable-2024-06-08" + "version": "unstable-2024-09-26" }, "mame2010": { "fetcher": "fetchFromGitHub", @@ -519,31 +519,31 @@ "src": { "owner": "libretro", "repo": "mgba", - "rev": "b2564482c86378581a7a43ef4e254b2a75167bc7", - "hash": "sha256-9qHk4V7wb9YISpZ2xO2NWCGCFMRWpE8lAKTzIldsC9M=" + "rev": "3e349d52f42151085639aed9550967b88cde4f43", + "hash": "sha256-gTviFmJF+7n0SFUL6PZovLTMyrEeQyAyAJY2i40GEao=" }, - "version": "unstable-2024-02-28" + "version": "unstable-2024-09-24" }, "mrboom": { "fetcher": "fetchFromGitHub", "src": { "owner": "Javanaise", "repo": "mrboom-libretro", - "rev": "a7af125dc9ef65c9a1b43136a75374bbac5458ee", - "hash": "sha256-hPJ8MpJOPGkckB0rj1uQ9BmY+0//Lj9jfNA9hfpdu3o=", + "rev": "22765ce7176d236d846f504318a51c448d2b469b", + "hash": "sha256-hzdc4PM/EARNEtpeATo4VohXtkeBra6rCz3tdIgBfVw=", "fetchSubmodules": true }, - "version": "unstable-2024-05-19" + "version": "unstable-2024-07-01" }, "mupen64plus": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "mupen64plus-libretro-nx", - "rev": "5d2ac21adb784ad72d6101290117702eef0411dd", - "hash": "sha256-PKjnoTioAvCYv2JBiPMXR4QZUgPeSQ3V4cB7mp2fqeI=" + "rev": "c2f6acfe3b7b07ab86c3e4cd89f61a9911191793", + "hash": "sha256-yV67rr0eIBdBU/quTCXasnFXy5MCO77rtvdd8DuVWIY=" }, - "version": "unstable-2024-05-21" + "version": "unstable-2024-08-21" }, "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", @@ -611,10 +611,10 @@ "src": { "owner": "libretro", "repo": "parallel-n64", - "rev": "dfc8d55686a364cad85411dabb76c7fb94acd730", + "rev": "334998e6129debe50f7ef9c5cd1e995460ae2da8", "hash": "sha256-ngENgmBQFHUYRp9DBnQLWapvfhnFra/B+jeegm8+rtE=" }, - "version": "unstable-2024-06-18" + "version": "unstable-2024-06-29" }, "pcsx2": { "fetcher": "fetchFromGitHub", @@ -631,83 +631,83 @@ "src": { "owner": "libretro", "repo": "pcsx_rearmed", - "rev": "1cdeae2b66fc3ef486ec8016ed5fad437f1a4409", - "hash": "sha256-Zw5CWDeAy3pUV4qXFIfs6kFlEaYhNhl+6pu5fOx34j0=" + "rev": "237887e817e23800997466632deb8ba63797a4cb", + "hash": "sha256-AhyCkQzgppCnwcX+qpKcSEJ58hosJwL9wwn80HOHpvg=" }, - "version": "unstable-2024-06-17" + "version": "unstable-2024-09-03" }, "picodrive": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "picodrive", - "rev": "535217f16bc2848ec70985c41e1d131709352641", - "hash": "sha256-K96eN3Erw1G+vQa8pag72hrtgf+tttoNIMXdgCGNy6k=", + "rev": "6508730c524420e05626b0b06dbc603e02d3af64", + "hash": "sha256-iL6eKG2O6ePYo6NK0VsTVLaRKgwuapXotvSOy7KipgI=", "fetchSubmodules": true }, - "version": "unstable-2024-06-15" + "version": "unstable-2024-09-06" }, "play": { "fetcher": "fetchFromGitHub", "src": { "owner": "jpd002", "repo": "Play-", - "rev": "a5753e582963e8555985abdfe6b5692bac52d701", - "hash": "sha256-OabW7OYitDzMh2bbAokfM+HwMaLo2cY3/FB78/ouvrY=", + "rev": "e70ee1608f9bc3a075c85ce1aab0cf9074201f12", + "hash": "sha256-hD+QgvPXPJ4cVqkk15bY9lZIytCiiuSwNK1MYJzP9T0=", "fetchSubmodules": true }, - "version": "unstable-2024-06-10" + "version": "unstable-2024-09-23" }, "ppsspp": { "fetcher": "fetchFromGitHub", "src": { "owner": "hrydgard", "repo": "ppsspp", - "rev": "2a3aaed71135d9574f002073ceae74356b29c900", - "hash": "sha256-WU48YrRUWaJi1xcHRxP7JigaJZ8Vbm/v4w9LdD5TvLo=", + "rev": "64ce72e81df48f78db5d5b192bd68eca218bd0a1", + "hash": "sha256-DRodUtFcHt+t8GAHI+3+WDltbUzkWZ/ahunOPELabTI=", "fetchSubmodules": true }, - "version": "unstable-2024-06-24" + "version": "unstable-2024-09-28" }, "prboom": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "libretro-prboom", - "rev": "9d412db570d3291829b308e6d1ac17f04acdda17", - "hash": "sha256-50Nl8IyaQRLOQtTRYhJFwTH8ojMxNVVn/c+oGCeJts0=" + "rev": "0b43954c75760d00737120db9d5009813778c7ae", + "hash": "sha256-mb7hggdwOjWgKNykeOv+0IDYpKLHy9dJqA4+c/8R6Ss=" }, - "version": "unstable-2024-05-23" + "version": "unstable-2024-09-07" }, "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", "src": { "owner": "libretro", "repo": "libretro-uae", - "rev": "4493a194dd42e593914c26952ee8cb4ba750f596", - "hash": "sha256-uSnxx85+AX/15UvyOOiVApKT5I9SjKITfi5Osd4nBSE=" + "rev": "527564f2748901068a5fef891c5073a4d6cd089b", + "hash": "sha256-tzZVG4B+rzHqhw28cmvjMFiyFfbrU3xOOEU+OCUaa+M=" }, - "version": "unstable-2024-05-25" + "version": "unstable-2024-09-25" }, "quicknes": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "QuickNES_Core", - "rev": "cd73f021be7dd5b1a21b71155a320364c02de4ac", - "hash": "sha256-fmTAK32ASA8M5nxUUUilm/yMNkmqSAG/gauB7fy1Kbc=" + "rev": "89d649a544e7d37a5cdbc77c811e88753fa23131", + "hash": "sha256-OPZVYQVbtIfmmKmuLQ5eVqZf+41ovyoa17YHvjKgd6w=" }, - "version": "unstable-2024-02-01" + "version": "unstable-2024-06-28" }, "same_cdi": { "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", @@ -744,60 +744,60 @@ "src": { "owner": "libretro", "repo": "smsplus-gx", - "rev": "96fa9bc65aa27a5ab2779f9f2ff0439fec7cf513", - "hash": "sha256-tlxlI0+5QFgu2IRB4Cpz9XItbhprLNlq1YdCFGXGyIE=" + "rev": "978d977119eff1bd7214c0095eb91b15b859bb61", + "hash": "sha256-GEzeyp6cuvWTuvRBuExamyqJfJW/PEU+2tB2lm+g6K0=" }, - "version": "unstable-2023-10-31" + "version": "unstable-2024-08-07" }, "snes9x": { "fetcher": "fetchFromGitHub", "src": { "owner": "snes9xgit", "repo": "snes9x", - "rev": "d514d135a7d3521e16e9ea599690e36e95c5c1aa", - "hash": "sha256-qk73jA8J6QD9Fp1tjqEf3eDLhJxp206gsku42ICjqPY=" + "rev": "72e4946410bff2a09ff327599f014e9f6e855c54", + "hash": "sha256-srPtEMIjsaFdmOkymGhb6vMuY5EBnTVhzJnpsCE/fMQ=" }, - "version": "unstable-2024-06-18" + "version": "unstable-2024-09-27" }, "snes9x2002": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "snes9x2002", - "rev": "540baad622d9833bba7e0696193cb06f5f02f564", - "hash": "sha256-WJh8Qf1/uFaL9f9d28qXsbpeAZfYGPgjoty3G6XAKSs=" + "rev": "2790d03b2266c58444429b4f7d76ba298e0bde87", + "hash": "sha256-kTZrEeZcaFey7gmLbPEG82T6n3cxxZkKminRP543oZA=" }, - "version": "unstable-2022-08-06" + "version": "unstable-2024-06-28" }, "snes9x2005": { "fetcher": "fetchFromGitHub", "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", "src": { "owner": "libretro", "repo": "snes9x2010", - "rev": "d8b10c4cd7606ed58f9c562864c986bc960faaaf", - "hash": "sha256-7FmteYrAYr+pGNXGg9CBC4NFlijGRf7GdtJfiNjmonU=" + "rev": "84b963a2f627bbc41198e357430619f34bbebc8a", + "hash": "sha256-s358pyMH4vIQt1f0Mgw1U5gwUW0aSqVtwyeyoL/4Ok8=" }, - "version": "unstable-2023-02-20" + "version": "unstable-2024-06-28" }, "stella": { "fetcher": "fetchFromGitHub", "src": { "owner": "stella-emu", "repo": "stella", - "rev": "9381a67604a81a5ddfc931581ba7ba53bc7680cb", - "hash": "sha256-TLLUCRYy6G0ylQKZEiaUPBCkjOAEJRmTI3s7xWPGgiA=" + "rev": "cb61f676ec78cd3f76cbd233bfd91575abde13be", + "hash": "sha256-t+QBWIE5+rEzdv4bbk6MqIQh3XsUgviX69RKe/zMb4Q=" }, - "version": "unstable-2024-06-23" + "version": "unstable-2024-09-26" }, "stella2014": { "fetcher": "fetchFromGitHub", @@ -814,20 +814,20 @@ "src": { "owner": "libretro", "repo": "swanstation", - "rev": "7a27436548128c00e70b08dde63c52118e2a6228", - "hash": "sha256-u7D044lKNAH4aAaY/Ol7BR3dNeusX4wirIMdUEGw2oM=" + "rev": "37cd87e14ca09ac1b558e5b2c7db4ad256865bbb", + "hash": "sha256-dNIxlTPoY4S6VMtTN22ti3DE4aU/8XN/XhAo3DMNR/E=" }, - "version": "unstable-2024-05-30" + "version": "unstable-2024-07-24" }, "tgbdual": { "fetcher": "fetchFromGitHub", "src": { "owner": "libretro", "repo": "tgbdual-libretro", - "rev": "a6f3018e6a23030afc1873845ee54d4b2d8ec9d3", - "hash": "sha256-MBUgYXX/Pc+TkwoS7OwbXSPssKUf6lwWx/bKhvwDkHs=" + "rev": "fba7d50b136abef0692b434091a9d735f7ad28b2", + "hash": "sha256-f6PGtUkIOyUHQbbJdgQiWmw2armjyuP1CTcWfRbx9uE=" }, - "version": "unstable-2022-08-06" + "version": "unstable-2024-07-01" }, "thepowdertoy": { "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/retroarch/retroarch-assets.nix b/pkgs/applications/emulators/retroarch/retroarch-assets.nix index f1d34f9f5ac1f..e9f2cb9379f2a 100644 --- a/pkgs/applications/emulators/retroarch/retroarch-assets.nix +++ b/pkgs/applications/emulators/retroarch/retroarch-assets.nix @@ -6,13 +6,13 @@ stdenvNoCC.mkDerivation { pname = "retroarch-assets"; - version = "1.19.0-unstable-2024-05-30"; + version = "1.19.0-unstable-2024-09-22"; src = fetchFromGitHub { owner = "libretro"; repo = "retroarch-assets"; - rev = "771e60b1eacd4edc57c19b61ab2c713200af0a3f"; - hash = "sha256-304xYXY5cESjSxepb5xpfMeJBnG+EJBiaVnhSUE3icQ="; + rev = "1b138de1023272b039273d7bbc8f57573073bd25"; + hash = "sha256-ZePPjNQtzO3e7d9ZqbkfXX+0saus2X77It2l1e7WDWc="; }; makeFlags = [ diff --git a/pkgs/applications/emulators/ripes/default.nix b/pkgs/applications/emulators/ripes/default.nix index 92b7aca0a1444..312c25a020076 100644 --- a/pkgs/applications/emulators/ripes/default.nix +++ b/pkgs/applications/emulators/ripes/default.nix @@ -39,11 +39,11 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications cp -r Ripes.app $out/Applications/ makeBinaryWrapper $out/Applications/Ripes.app/Contents/MacOS/Ripes $out/bin/Ripes - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' install -D Ripes $out/bin/Ripes '' + '' cp -r ${src}/appdir/usr/share $out/share diff --git a/pkgs/applications/emulators/rpcemu/default.nix b/pkgs/applications/emulators/rpcemu/default.nix deleted file mode 100644 index 25930470412af..0000000000000 --- a/pkgs/applications/emulators/rpcemu/default.nix +++ /dev/null @@ -1,66 +0,0 @@ -{ lib -, stdenv -, fetchhg -, qt5 -}: - -let - inherit (qt5) qtbase qtmultimedia wrapQtAppsHook; -in -stdenv.mkDerivation (finalAttrs: { - pname = "rpcemu"; - version = "0.9.4"; - - src = fetchhg { - url = "http://www.home.marutan.net/hg/rpcemu"; - rev = "release_${finalAttrs.version}"; - sha256 = "sha256-UyjfTfUpSvJNFPkQWPKppxp/kO0hVGo5cE9RuCU8GJI="; - }; - - nativeBuildInputs = [ - wrapQtAppsHook - ]; - - buildInputs = [ - qtbase - qtmultimedia - ]; - - configurePhase = '' - runHook preConfigure - - cd src/qt5 - qmake - - runHook postConfigure - ''; - - installPhase = '' - runHook preInstall - - cd ../.. - install -Dm755 rpcemu-interpreter -t $out/bin - - runHook postInstall - ''; - - meta = { - homepage = "https://www.marutan.net/rpcemu/index.php"; - description = "Risc PC Emulator"; - mainProgram = "rpcemu-interpreter"; - longDescription = '' - RPCEmu is an emulator of classic Acorn computer systems, such as the Risc - PC and A7000. It runs on multiple platforms including Windows, Linux and - Mac OS X. - - RPCEmu should be considered Alpha Quality code. It has many known and - unknown bugs, and all files used with it should be well backed up before - using them with RPCEmu. - ''; - license = lib.licenses.gpl2Plus; - maintainers = builtins.attrValues { - inherit (lib.maintainers) AndersonTorres; - }; - platforms = lib.platforms.linux; - }; -}) diff --git a/pkgs/applications/emulators/ruffle/Cargo.lock b/pkgs/applications/emulators/ruffle/Cargo.lock index 434b93688151a..1c52ff074d547 100644 --- a/pkgs/applications/emulators/ruffle/Cargo.lock +++ b/pkgs/applications/emulators/ruffle/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "ab_glyph" -version = "0.2.25" +version = "0.2.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f90148830dac590fac7ccfe78ec4a8ea404c60f75a24e16407a71f0f40de775" +checksum = "79faae4620f45232f599d9bc7b290f88247a0834162c4495ab2f02d60004adfb" dependencies = [ "ab_glyph_rasterizer", "owned_ttf_parser", @@ -19,20 +19,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046" [[package]] -name = "accesskit" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74a4b14f3d99c1255dcba8f45621ab1a2e7540a0009652d33989005a4d0bfc6b" -dependencies = [ - "enumn", - "serde", -] - -[[package]] name = "addr2line" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" dependencies = [ "gimli", ] @@ -44,10 +34,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] -name = "adler32" -version = "1.2.0" +name = "adler2" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" [[package]] name = "ahash" @@ -58,7 +48,6 @@ dependencies = [ "cfg-if", "getrandom", "once_cell", - "serde", "version_check", "zerocopy", ] @@ -80,12 +69,13 @@ checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" [[package]] name = "alsa" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37fe60779335388a88c01ac6c3be40304d1e349de3ada3b15f7808bb90fa9dce" +checksum = "ed7572b7ba83a31e20d1b48970ee402d2e3e0537dcfe0a3ff4d6eb7508617d43" dependencies = [ "alsa-sys", - "bitflags 2.5.0", + "bitflags 2.6.0", + "cfg-if", "libc", ] @@ -101,21 +91,21 @@ dependencies = [ [[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", + "bitflags 2.6.0", "cc", "cesu8", "jni", "jni-sys", "libc", "log", - "ndk", + "ndk 0.9.0", "ndk-context", - "ndk-sys", + "ndk-sys 0.6.0+11769913", "num_enum", "thiserror", ] @@ -143,47 +133,48 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.13" +version = "0.6.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" +checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526" dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", "anstyle-wincon", "colorchoice", + "is_terminal_polyfill", "utf8parse", ] [[package]] name = "anstyle" -version = "1.0.6" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" +checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" [[package]] name = "anstyle-parse" -version = "0.2.3" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" +checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.0.2" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" +checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a" dependencies = [ "windows-sys 0.52.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.2" +version = "3.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" +checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8" dependencies = [ "anstyle", "windows-sys 0.52.0", @@ -191,9 +182,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.82" +version = "1.0.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519" +checksum = "10f00e1f6e58a40e807377c75c6a7f97bf9044fab57816f2414e6f5f4499d7b8" [[package]] name = "approx" @@ -215,40 +206,30 @@ dependencies = [ [[package]] name = "arboard" -version = "3.3.2" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2041f1943049c7978768d84e6d0fd95de98b76d6c4727b09e78ec253d29fa58" +checksum = "9fb4009533e8ff8f1450a5bcbc30f4242a1d34442221f72314bea1f5dc9c7f89" dependencies = [ "clipboard-win", "log", - "objc", - "objc-foundation", - "objc_id", + "objc2", + "objc2-app-kit", + "objc2-foundation", "parking_lot", - "thiserror", "x11rb", ] [[package]] -name = "arc-swap" -version = "1.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" - -[[package]] name = "arrayref" -version = "0.3.7" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" +checksum = "9d151e35f61089500b617991b791fc8bfd237ae50cd5950803758a179b41e67a" [[package]] name = "arrayvec" -version = "0.7.4" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" -dependencies = [ - "serde", -] +checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" [[package]] name = "as-raw-xcb-connection" @@ -258,18 +239,18 @@ checksum = "175571dd1d178ced59193a6fc02dde1b972eb0bc56c892cde9beeceac5bf0f6b" [[package]] name = "ash" -version = "0.37.3+1.3.251" +version = "0.38.0+1.3.281" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e9c3835d686b0a6084ab4234fcd1b07dbf6e4767dce60874b12356a25ecd4a" +checksum = "0bb44936d800fea8f016d7f2311c6a4f97aebd5dc86f09906139ec848cf3a46f" dependencies = [ - "libloading 0.7.4", + "libloading", ] [[package]] name = "ashpd" -version = "0.8.1" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd884d7c72877a94102c3715f3b1cd09ff4fac28221add3e57cfbe25c236d093" +checksum = "bfe7e0dd0ac5a401dc116ed9f9119cf9decc625600474cb41f0fc0a0050abc9a" dependencies = [ "async-fs", "async-net", @@ -277,42 +258,45 @@ dependencies = [ "futures-channel", "futures-util", "rand", + "raw-window-handle", "serde", "serde_repr", "url", + "wayland-backend", + "wayland-client", + "wayland-protocols", "zbus", ] [[package]] name = "async-broadcast" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "258b52a1aa741b9f09783b2d86cf0aeeb617bbf847f6933340a39644227acbdb" +checksum = "20cd0e2e25ea8e5f7e9df04578dc6cf5c83577fd09b1a46aaf5c85e1c33f2a7e" dependencies = [ - "event-listener 5.3.0", - "event-listener-strategy 0.5.1", + "event-listener", + "event-listener-strategy", "futures-core", "pin-project-lite", ] [[package]] name = "async-channel" -version = "2.2.1" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "136d4d23bcc79e27423727b36823d86233aad06dfea531837b038394d11e9928" +checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a" dependencies = [ "concurrent-queue", - "event-listener 5.3.0", - "event-listener-strategy 0.5.1", + "event-listener-strategy", "futures-core", "pin-project-lite", ] [[package]] name = "async-executor" -version = "1.11.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b10202063978b3351199d68f8b22c4e47e4b1b822f8d43fd862d5ea8c006b29a" +checksum = "d7ebdfa2ebdab6b1760375fa7d6f382b9f486eac35fc994625a00e89280bdbb7" dependencies = [ "async-task", "concurrent-queue", @@ -323,9 +307,9 @@ dependencies = [ [[package]] name = "async-fs" -version = "2.1.1" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc19683171f287921f2405677dd2ed2549c3b3bda697a563ebc3a121ace2aba1" +checksum = "ebcd09b382f40fcd159c2d695175b2ae620ffa5f3bd6f664131efff4e8b9e04a" dependencies = [ "async-lock", "blocking", @@ -334,9 +318,9 @@ dependencies = [ [[package]] name = "async-io" -version = "2.3.2" +version = "2.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcccb0f599cfa2f8ace422d3555572f47424da5648a4382a9dd0310ff8210884" +checksum = "444b0228950ee6501b3568d3c93bf1176a1fdbc3b758dcd9475046d30f4dc7e8" dependencies = [ "async-lock", "cfg-if", @@ -348,17 +332,17 @@ dependencies = [ "rustix", "slab", "tracing", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[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", + "event-listener-strategy", "pin-project-lite", ] @@ -375,9 +359,9 @@ dependencies = [ [[package]] name = "async-process" -version = "2.2.2" +version = "2.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a53fc6301894e04a92cb2584fedde80cb25ba8e02d9dc39d4a87d036e22f397d" +checksum = "a8a07789659a4d385b79b18b9127fc27e1a59e1e89117c78c5ea3b806f016374" dependencies = [ "async-channel", "async-io", @@ -386,29 +370,29 @@ dependencies = [ "async-task", "blocking", "cfg-if", - "event-listener 5.3.0", + "event-listener", "futures-lite", "rustix", "tracing", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] name = "async-recursion" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30c5ef0ede93efbf733c1a727f3b6b5a1060bbedd5600183e66f6e4be4af0ec5" +checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.77", ] [[package]] name = "async-signal" -version = "0.2.6" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afe66191c335039c7bb78f99dc7520b0cbb166b3a1cb33a03f53d8a1c6f2afda" +checksum = "637e00349800c0bdf8bfc21ebbc0b6524abea702b0da4168ac00d070d0c0b9f3" dependencies = [ "async-io", "async-lock", @@ -419,24 +403,24 @@ dependencies = [ "rustix", "signal-hook-registry", "slab", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] name = "async-task" -version = "4.7.0" +version = "4.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbb36e985947064623dbd357f727af08ffd077f93d696782f3c56365fa2e2799" +checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" [[package]] name = "async-trait" -version = "0.1.80" +version = "0.1.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" +checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.77", ] [[package]] @@ -447,36 +431,30 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] name = "autocfg" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "backtrace" -version = "0.3.71" +version = "0.3.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" +checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" dependencies = [ "addr2line", "cc", "cfg-if", "libc", - "miniz_oxide", + "miniz_oxide 0.7.4", "object", "rustc-demangle", ] [[package]] name = "base64" -version = "0.21.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" - -[[package]] -name = "base64" -version = "0.22.0" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "bindgen" @@ -484,10 +462,10 @@ version = "0.69.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cexpr", "clang-sys", - "itertools", + "itertools 0.12.1", "lazy_static", "lazycell", "log", @@ -495,26 +473,26 @@ dependencies = [ "proc-macro2", "quote", "regex", - "rustc-hash", + "rustc-hash 1.1.0", "shlex", - "syn 2.0.60", + "syn 2.0.77", "which", ] [[package]] name = "bit-set" -version = "0.5.3" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" +checksum = "f0481a0e032742109b1133a095184ee93d88f3dc9e0d28a5d033dc77a073f44f" dependencies = [ "bit-vec", ] [[package]] name = "bit-vec" -version = "0.6.3" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" +checksum = "d2c54ff287cfc0a34f38a6b832ea1bd8e448a330b3e40a50859e6488bee07f22" [[package]] name = "bitflags" @@ -524,18 +502,15 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" -dependencies = [ - "serde", -] +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" [[package]] name = "bitstream-io" -version = "2.2.0" +version = "2.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06c9989a51171e2e81038ab168b6ae22886fe9ded214430dbb4f41c28cf176da" +checksum = "b81e1519b0d82120d2fd469d5bfb2919a9361c48b02d82d04befc1cdd2002452" [[package]] name = "block" @@ -553,45 +528,32 @@ 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.5.1" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118" +checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea" dependencies = [ "async-channel", - "async-lock", "async-task", - "fastrand", "futures-io", "futures-lite", "piper", - "tracing", ] [[package]] name = "bstr" -version = "1.9.1" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706" +checksum = "40723b8fb387abc38f4f4a37c09073622e41dd12327033091ef8950659e6dc0c" dependencies = [ "memchr", "serde", @@ -618,22 +580,22 @@ checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "bytemuck" -version = "1.15.0" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15" +checksum = "94bbb0ad554ad961ddc5da507a12a29b14e4ae5bda06b19f575a3e6079d2e2ae" dependencies = [ "bytemuck_derive", ] [[package]] name = "bytemuck_derive" -version = "1.6.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4da9a32f3fed317401fa3c862968128267c3106685286e15d5aaa3d7389c2f60" +checksum = "0cc8b54b395f2fcfbb3d90c47b01c7f444d94d05bdeb775811dec868ac3bbc26" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.77", ] [[package]] @@ -643,18 +605,45 @@ 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" +version = "1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" + +[[package]] +name = "bzip2" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bdb116a6ef3f6c3698828873ad02c3014b3c85cadb88496095628e3ef1e347f8" +dependencies = [ + "bzip2-sys", + "libc", +] + +[[package]] +name = "bzip2-sys" +version = "0.1.11+1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" +checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc" +dependencies = [ + "cc", + "libc", + "pkg-config", +] [[package]] name = "calloop" -version = "0.12.4" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fba7adb4dd5aa98e5553510223000e7148f621165ec5f9acd7113f6ca4995298" +checksum = "b99da2f8558ca23c71f4fd15dc57c906239752dd27ff3c00a1d56b685b7cbfec" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "log", "polling", "rustix", @@ -664,9 +653,9 @@ dependencies = [ [[package]] name = "calloop-wayland-source" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f0ea9b9476c7fad82841a8dbb380e2eae480c21910feba80725b46931ed8f02" +checksum = "95a66a987056935f7efce4ab5668920b5d0dac4a7c99991a67395f13702ddd20" dependencies = [ "calloop", "rustix", @@ -676,9 +665,9 @@ dependencies = [ [[package]] name = "camino" -version = "1.1.6" +version = "1.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c59e92b5a388f549b863a7bea62612c09f24c8393560709a54558a9abdfb3b9c" +checksum = "8b96ec4966b5813e2c0507c1f86115c8c5abaadc3980879c3424042a02fd1ad3" dependencies = [ "serde", ] @@ -708,13 +697,13 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.95" +version = "1.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d32a725bc159af97c3e629873bb9f88fb8cf8a4867175f76dc987815ea07c83b" +checksum = "57b6a275aa2903740dc87da01c62040406b8812552e97129a63ea8850a17c6e6" dependencies = [ "jobserver", "libc", - "once_cell", + "shlex", ] [[package]] @@ -745,6 +734,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" [[package]] +name = "cfg_aliases" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" + +[[package]] +name = "chardetng" +version = "0.1.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14b8f0b65b7b08ae3c8187e8d77174de20cb6777864c6b832d8ad365999cf1ea" +dependencies = [ + "cfg-if", + "encoding_rs", + "memchr", +] + +[[package]] name = "chrono" version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -755,25 +761,25 @@ dependencies = [ "js-sys", "num-traits", "wasm-bindgen", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[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", - "libloading 0.8.3", + "libloading", ] [[package]] name = "clap" -version = "4.5.4" +version = "4.5.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0" +checksum = "3e5a21b8495e732f1b3c364c9949b201ca7bae518c502c80256c96ad79eaf6ac" dependencies = [ "clap_builder", "clap_derive", @@ -781,9 +787,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.2" +version = "4.5.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" +checksum = "8cf2dd12af7a047ad9d6da2b6b249759a22a7abc0f474c1dae1777afa4b21a73" dependencies = [ "anstream", "anstyle", @@ -793,27 +799,27 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.4" +version = "4.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64" +checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0" dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.77", ] [[package]] name = "clap_lex" -version = "0.7.0" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" +checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" [[package]] name = "clipboard-win" -version = "5.3.1" +version = "5.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79f4473f5144e20d9aceaf2972478f06ddf687831eafeeb434fbaf0acc4144ad" +checksum = "15efe7a882b08f34e38556b14f2fb3daa98769d06c7f0c1b076dfd0d983bc892" dependencies = [ "error-code", ] @@ -836,9 +842,9 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" [[package]] name = "colorchoice" -version = "1.0.0" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" +checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0" [[package]] name = "com" @@ -883,9 +889,9 @@ dependencies = [ [[package]] name = "concurrent-queue" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" dependencies = [ "crossbeam-utils", ] @@ -924,9 +930,9 @@ dependencies = [ [[package]] name = "cookie" -version = "0.17.0" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7efb37c3e1ccb1ff97164ad95ac1606e8ccd35b3fa0a7d99a304c7f4a428cc24" +checksum = "4ddef33a339a91ea89fb53151bd0a4689cfce27055c291dfa69945475d22c747" dependencies = [ "percent-encoding", "time", @@ -934,22 +940,13 @@ dependencies = [ ] [[package]] -name = "cookie-factory" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9885fa71e26b8ab7855e2ec7cae6e9b380edff76cd052e07c683a0319d51b3a2" -dependencies = [ - "futures", -] - -[[package]] name = "cookie_store" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "387461abbc748185c3a6e1673d826918b450b87ff22639429c694619a83b6cf6" +checksum = "4934e6b7e8419148b6ef56950d277af8561060b56afd59e2aadf98b59fce6baa" dependencies = [ "cookie", - "idna 0.3.0", + "idna 0.5.0", "log", "publicsuffix", "serde", @@ -971,9 +968,9 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.6" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "core-graphics" @@ -1000,12 +997,12 @@ dependencies = [ ] [[package]] -name = "core2" -version = "0.4.0" +name = "core_maths" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b49ba7ef1ad6107f8824dbe97de947cbaac53c44e7f9756a1fba0d37c1eec505" +checksum = "e3b02505ccb8c50b0aa21ace0fc08c3e53adebd4e58caa18a36152803c7709a3" dependencies = [ - "memchr", + "libm", ] [[package]] @@ -1042,7 +1039,7 @@ dependencies = [ "js-sys", "libc", "mach2", - "ndk", + "ndk 0.8.0", "ndk-context", "oboe", "wasm-bindgen", @@ -1053,9 +1050,9 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.12" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +checksum = "51e852e6dc9a5bed1fae92dd2375037bf2b768725bf3be87811edee3249d09ad" dependencies = [ "libc", ] @@ -1077,18 +1074,18 @@ checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" [[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-channel" -version = "0.5.12" +version = "0.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95" +checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" dependencies = [ "crossbeam-utils", ] @@ -1114,9 +1111,9 @@ dependencies = [ [[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" @@ -1157,20 +1154,20 @@ checksum = "96a6ac251f4a2aca6b3f91340350eab87ae57c3f127ffeb585e92bd336717991" [[package]] name = "d3d12" -version = "0.19.0" +version = "22.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e3d747f100290a1ca24b752186f61f6637e1deffe3bf6320de6fcb29510a307" +checksum = "bdbd1f579714e3c809ebd822c81ef148b1ceaeb3d535352afc73fd0c4c6a0017" dependencies = [ - "bitflags 2.5.0", - "libloading 0.8.3", + "bitflags 2.6.0", + "libloading", "winapi", ] [[package]] name = "darling" -version = "0.20.8" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391" +checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" dependencies = [ "darling_core", "darling_macro", @@ -1178,35 +1175,29 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.8" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f" +checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.77", ] [[package]] name = "darling_macro" -version = "0.20.8" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" +checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core", "quote", - "syn 2.0.60", + "syn 2.0.77", ] [[package]] -name = "dary_heap" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7762d17f1241643615821a8455a0b2c3e803784b058693d990b11f2dce25a0ca" - -[[package]] name = "dasp" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1326,12 +1317,6 @@ dependencies = [ ] [[package]] -name = "data-encoding" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" - -[[package]] name = "deranged" version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1341,17 +1326,6 @@ dependencies = [ ] [[package]] -name = "derivative" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] name = "derive_arbitrary" version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1359,7 +1333,7 @@ checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.77", ] [[package]] @@ -1407,13 +1381,13 @@ checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" [[package]] name = "displaydoc" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.77", ] [[package]] @@ -1422,14 +1396,14 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" dependencies = [ - "libloading 0.8.3", + "libloading", ] [[package]] name = "document-features" -version = "0.2.8" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef5282ad69563b5fc40319526ba27e0e7363d552a896f0297d54f767717f9b95" +checksum = "cb6969eaabd2421f8a2775cfd2471a2b634372b4a25d41e3bd647b79912850a0" dependencies = [ "litrs", ] @@ -1441,98 +1415,97 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" [[package]] -name = "ecolor" -version = "0.27.2" +name = "dpi" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20930a432bbd57a6d55e07976089708d4893f3d556cf42a0d79e9e321fa73b10" +checksum = "f25c0e292a7ca6d6498557ff1df68f32c99850012b6ea401cf8daf771f22ff53" + +[[package]] +name = "ecolor" +version = "0.28.1" +source = "git+https://github.com/emilk/egui.git?rev=f4697bc007447c6c2674beb4e25f599fb7afa093#f4697bc007447c6c2674beb4e25f599fb7afa093" dependencies = [ "bytemuck", - "serde", + "emath", ] [[package]] name = "egui" -version = "0.27.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "584c5d1bf9a67b25778a3323af222dbe1a1feb532190e103901187f92c7fe29a" +version = "0.28.1" +source = "git+https://github.com/emilk/egui.git?rev=f4697bc007447c6c2674beb4e25f599fb7afa093#f4697bc007447c6c2674beb4e25f599fb7afa093" dependencies = [ - "accesskit", "ahash", + "emath", "epaint", "log", "nohash-hasher", - "serde", ] [[package]] name = "egui-wgpu" -version = "0.27.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "469ff65843f88a702b731a1532b7d03b0e8e96d283e70f3a22b0e06c46cb9b37" +version = "0.28.1" +source = "git+https://github.com/emilk/egui.git?rev=f4697bc007447c6c2674beb4e25f599fb7afa093#f4697bc007447c6c2674beb4e25f599fb7afa093" dependencies = [ + "ahash", "bytemuck", "document-features", "egui", "epaint", "log", "thiserror", - "type-map 0.5.0", - "web-time 0.2.4", + "type-map", + "web-time", "wgpu", "winit", ] [[package]] name = "egui-winit" -version = "0.27.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e3da0cbe020f341450c599b35b92de4af7b00abde85624fd16f09c885573609" +version = "0.28.1" +source = "git+https://github.com/emilk/egui.git?rev=f4697bc007447c6c2674beb4e25f599fb7afa093#f4697bc007447c6c2674beb4e25f599fb7afa093" dependencies = [ + "ahash", "arboard", "egui", "log", - "raw-window-handle 0.6.1", + "raw-window-handle", "smithay-clipboard", - "web-time 0.2.4", + "web-time", "webbrowser", "winit", ] [[package]] name = "egui_extras" -version = "0.27.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b78779f35ded1a853786c9ce0b43fe1053e10a21ea3b23ebea411805ce41593" +version = "0.28.1" +source = "git+https://github.com/emilk/egui.git?rev=f4697bc007447c6c2674beb4e25f599fb7afa093#f4697bc007447c6c2674beb4e25f599fb7afa093" dependencies = [ + "ahash", "egui", "enum-map", - "image 0.24.9", + "image", "log", - "mime_guess2", - "serde", ] [[package]] name = "either" -version = "1.11.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "emath" -version = "0.27.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4c3a552cfca14630702449d35f41c84a0d15963273771c6059175a803620f3f" +version = "0.28.1" +source = "git+https://github.com/emilk/egui.git?rev=f4697bc007447c6c2674beb4e25f599fb7afa093#f4697bc007447c6c2674beb4e25f599fb7afa093" dependencies = [ "bytemuck", - "serde", ] [[package]] name = "embed-resource" -version = "2.4.2" +version = "2.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6985554d0688b687c5cb73898a34fbe3ad6c24c58c238a4d91d5e840670ee9d" +checksum = "4edcacde9351c33139a41e3c97eb2334351a81a2791bebb0b243df837128f602" dependencies = [ "cc", "memchr", @@ -1581,14 +1554,14 @@ checksum = "f282cfdfe92516eb26c2af8589c274c7c17681f5ecc03c18255fe741c6aa64eb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.77", ] [[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", @@ -1596,52 +1569,41 @@ dependencies = [ [[package]] name = "enumflags2_derive" -version = "0.7.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c785274071b1b420972453b306eeca06acf4633829db4223b58a2a8c5953bc4" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.60", -] - -[[package]] -name = "enumn" -version = "0.1.13" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fd000fd6988e73bbe993ea3db9b1aa64906ab88766d654973924340c8cddb42" +checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.77", ] [[package]] name = "enumset" -version = "1.1.3" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "226c0da7462c13fb57e5cc9e0dc8f0635e7d27f276a3a7fd30054647f669007d" +checksum = "d07a4b049558765cef5f0c1a273c3fc57084d768b44d2f98127aef4cceb17293" dependencies = [ "enumset_derive", ] [[package]] name = "enumset_derive" -version = "0.8.1" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08b6c6ab82d70f08844964ba10c7babb716de2ecaeab9be5717918a5177d3af" +checksum = "59c3b24c345d8c314966bdc1832f6c2635bfcce8e7cf363bd115987bba2ee242" dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.77", ] [[package]] name = "env_filter" -version = "0.1.0" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a009aa4810eb158359dda09d0c87378e4bbb89b5a801f016885a4707ba24f7ea" +checksum = "4f2c92ceda6ceec50f43169f9ee8424fe2db276791afde7b2cd8bc084cb376ab" dependencies = [ "log", "regex", @@ -1649,9 +1611,9 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.11.3" +version = "0.11.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b35839ba51819680ba087cd351788c9a3c476841207e0b8cee0b04722343b9" +checksum = "e13fa619b91fb2381732789fc5de83b45675e882f66623b7d8cb4f643017018d" dependencies = [ "anstream", "anstyle", @@ -1662,22 +1624,26 @@ dependencies = [ [[package]] name = "epaint" -version = "0.27.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b381f8b149657a4acf837095351839f32cd5c4aec1817fc4df84e18d76334176" +version = "0.28.1" +source = "git+https://github.com/emilk/egui.git?rev=f4697bc007447c6c2674beb4e25f599fb7afa093#f4697bc007447c6c2674beb4e25f599fb7afa093" dependencies = [ "ab_glyph", "ahash", "bytemuck", "ecolor", "emath", + "epaint_default_fonts", "log", "nohash-hasher", "parking_lot", - "serde", ] [[package]] +name = "epaint_default_fonts" +version = "0.28.1" +source = "git+https://github.com/emilk/egui.git?rev=f4697bc007447c6c2674beb4e25f599fb7afa093#f4697bc007447c6c2674beb4e25f599fb7afa093" + +[[package]] name = "equivalent" version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1685,9 +1651,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" dependencies = [ "libc", "windows-sys 0.52.0", @@ -1701,38 +1667,24 @@ checksum = "a0474425d51df81997e2f90a21591180b38eccf27292d755f3e30750225c175b" [[package]] name = "escape8259" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba4f4911e3666fcd7826997b4745c8224295a6f3072f1418c3067b97a67557ee" -dependencies = [ - "rustversion", -] +checksum = "5692dd7b5a1978a5aeb0ce83b7655c58ca8efdcb79d21036ea249da95afec2c6" [[package]] name = "euclid" -version = "0.22.9" +version = "0.22.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f253bc5c813ca05792837a0ff4b3a580336b224512d48f7eda1d7dd9210787" +checksum = "e0f0eb73b934648cd7a4a61f1b15391cd95dab0b4da6e2e66c2a072c144b4a20" dependencies = [ "num-traits", ] [[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", @@ -1741,21 +1693,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.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "332f51cb23d20b0de8458b86580878211da09bcd4503cb579c225b3d124cabb3" +checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" dependencies = [ - "event-listener 5.3.0", + "event-listener", "pin-project-lite", ] @@ -1766,7 +1708,7 @@ dependencies = [ "anyhow", "clap", "futures", - "image 0.25.1", + "image", "indicatif", "rayon", "ruffle_core", @@ -1776,9 +1718,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.0.2" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984" +checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" [[package]] name = "fdeflate" @@ -1791,22 +1733,21 @@ dependencies = [ [[package]] name = "filetime" -version = "0.2.23" +version = "0.2.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" +checksum = "bf401df4a4e3872c4fe8151134cf483738e74b67fc934d6532c882b3d24a4550" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.4.1", - "windows-sys 0.52.0", + "libredox 0.1.3", + "windows-sys 0.59.0", ] [[package]] name = "flash-lso" version = "0.6.0" -source = "git+https://github.com/ruffle-rs/rust-flash-lso?rev=2f770555ea49c6db49c57c1dd46c7cc686e8dacc#2f770555ea49c6db49c57c1dd46c7cc686e8dacc" +source = "git+https://github.com/ruffle-rs/rust-flash-lso?rev=98679aa0cdcad5fecc5c7321b2eac35b69dbcd5f#98679aa0cdcad5fecc5c7321b2eac35b69dbcd5f" dependencies = [ - "cookie-factory", "enumset", "nom", "thiserror", @@ -1814,12 +1755,12 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.30" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" +checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253" dependencies = [ "crc32fast", - "miniz_oxide", + "miniz_oxide 0.8.0", ] [[package]] @@ -1838,26 +1779,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8bf7cc16383c4b8d58b9905a8509f02926ce3058053c056376248d958c9df1e8" [[package]] -name = "fluent" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61f69378194459db76abd2ce3952b790db103ceb003008d3d50d97c41ff847a7" -dependencies = [ - "fluent-bundle", - "unic-langid", -] - -[[package]] name = "fluent-bundle" -version = "0.15.2" +version = "0.15.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e242c601dec9711505f6d5bbff5bedd4b61b2469f2e8bb8e57ee7c9747a87ffd" +checksum = "7fe0a21ee80050c678013f82edf4b705fe2f26f1f9877593d13198612503f493" dependencies = [ "fluent-langneg", "fluent-syntax", "intl-memoizer", "intl_pluralrules", - "rustc-hash", + "rustc-hash 1.1.0", "self_cell 0.10.3", "smallvec", "unic-langid", @@ -1874,47 +1805,43 @@ dependencies = [ [[package]] name = "fluent-syntax" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0abed97648395c902868fee9026de96483933faa54ea3b40d652f7dfe61ca78" +checksum = "2a530c4694a6a8d528794ee9bbd8ba0122e779629ac908d15ad5a7ae7763a33d" dependencies = [ "thiserror", ] [[package]] name = "fluent-template-macros" -version = "0.9.4" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77d2bcae1f3ec390c50161fcf130d3228750e9ecf965618584e046d884199b83" +checksum = "b86ebacac709a063f57ee83d37c451d60dc873554f9bd828531fd1ec43209c80" dependencies = [ "flume", "ignore", "once_cell", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.77", "unic-langid", ] [[package]] name = "fluent-templates" -version = "0.9.4" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "197feb1e37209c6b3d29f0754b11fc070890efb2b1d761caac4e5287a200e9db" +checksum = "f339cc149c01ba2f7b0feba2acde6dd6e4a48472daffe2ddfdd6073e564c60b3" dependencies = [ - "arc-swap", - "fluent", "fluent-bundle", "fluent-langneg", "fluent-syntax", "fluent-template-macros", "flume", - "heck", "ignore", "intl-memoizer", "log", "once_cell", - "serde_json", "thiserror", "unic-langid", ] @@ -1932,7 +1859,7 @@ dependencies = [ name = "flv-rs" version = "0.1.0" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "thiserror", ] @@ -1944,18 +1871,18 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fontconfig-parser" -version = "0.5.6" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a595cb550439a117696039dfc69830492058211b771a2a165379f2a1a53d84d" +checksum = "c1fcfcd44ca6e90c921fee9fa665d530b21ef1327a4c1a6c5250ea44b776ada7" dependencies = [ "roxmltree", ] [[package]] name = "fontdb" -version = "0.16.2" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0299020c3ef3f60f526a4f64ab4a3d4ce116b1acbf24cdd22da0068e5d81dc3" +checksum = "37be9fc20d966be438cd57a45767f73349477fb0f85ce86e000557f787298afb" dependencies = [ "fontconfig-parser", "log", @@ -1983,7 +1910,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.77", ] [[package]] @@ -2070,7 +1997,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.77", ] [[package]] @@ -2105,9 +2032,9 @@ dependencies = [ [[package]] name = "gc-arena" -version = "0.5.1" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24d4a9d8c3c1ef4301b8afc383e53e102a13f9947da2181bf82828480dcc5165" +checksum = "3cd70cf88a32937834aae9614ff2569b5d9467fa0c42c5d7762fd94a8de88266" dependencies = [ "gc-arena-derive", "hashbrown", @@ -2116,13 +2043,13 @@ dependencies = [ [[package]] name = "gc-arena-derive" -version = "0.5.1" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c952d28a64896b1c4ac382dcd7beeaeaabc13e8c7c7f800ea2938abd828ed30" +checksum = "c612a69f5557a11046b77a7408d2836fe77077f842171cd211c5ef504bd3cddd" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.77", "synstructure", ] @@ -2162,9 +2089,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "js-sys", @@ -2185,9 +2112,9 @@ dependencies = [ [[package]] name = "gilrs" -version = "0.10.7" +version = "0.10.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b54e5e39844ab5cddaf3bbbdfdc2923a6cb34e36818b95618da4e3f26302c24c" +checksum = "dfb8c78963a8856a5b10015c9349176ff5edbc8095384d52aada467a848bc03a" dependencies = [ "fnv", "gilrs-core", @@ -2198,9 +2125,9 @@ dependencies = [ [[package]] name = "gilrs-core" -version = "0.5.11" +version = "0.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85c132270a155f2548e67d66e731075c336c39098afc555752f3df8f882c720e" +checksum = "732dadc05170599ddec9a89653f10d7a2af54da9181b3fa6e2bd49907ec8f7e4" dependencies = [ "core-foundation", "inotify", @@ -2219,9 +2146,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.28.1" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" +checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" [[package]] name = "gl_generator" @@ -2249,21 +2176,21 @@ dependencies = [ "aho-corasick", "bstr", "log", - "regex-automata 0.4.6", - "regex-syntax 0.8.3", + "regex-automata 0.4.7", + "regex-syntax 0.8.4", ] [[package]] name = "gloo-net" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43aaa242d1239a8822c15c645f02166398da4f8b5c4bae795c1f5b44e9eee173" +checksum = "c06f627b1a58ca3d42b45d6104bf1e1a03799df472df00988b6ba21accc10580" dependencies = [ "futures-channel", "futures-core", "futures-sink", "gloo-utils", - "http 0.2.12", + "http", "js-sys", "pin-project", "thiserror", @@ -2297,9 +2224,9 @@ dependencies = [ [[package]] name = "glutin_wgl_sys" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8098adac955faa2d31079b65dc48841251f69efd3ac25477903fc424362ead" +checksum = "0a4e1951bbd9434a81aa496fe59ccc2235af3820d27b85f9314e279609211e2c" dependencies = [ "gl_generator", ] @@ -2310,7 +2237,7 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fbcd2dba93594b227a1f57ee09b8b9da8892c34d55aa332e034a228d0fe6a171" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "gpu-alloc-types", ] @@ -2320,14 +2247,14 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "98ff03b468aa837d70984d55f5d3f846f6ec31fe34bbb97c4f85219caeee1ca4" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", ] [[package]] name = "gpu-allocator" -version = "0.25.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f56f6318968d03c18e1bcf4857ff88c61157e9da8e47c5f29055d60e1228884" +checksum = "fdd4240fc91d3433d5e5b0fc5b67672d771850dc19bbee03c1381e19322803d7" dependencies = [ "log", "presser", @@ -2338,36 +2265,36 @@ dependencies = [ [[package]] name = "gpu-descriptor" -version = "0.2.4" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc11df1ace8e7e564511f53af41f3e42ddc95b56fd07b3f4445d2a6048bc682c" +checksum = "9c08c1f623a8d0b722b8b99f821eb0ba672a1618f0d3b16ddbee1cedd2dd8557" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "gpu-descriptor-types", "hashbrown", ] [[package]] name = "gpu-descriptor-types" -version = "0.1.2" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bf0b36e6f090b7e1d8a4b49c0cb81c1f8376f72198c65dd3ad9ff3556b8b78c" +checksum = "fdf242682df893b86f33a73828fb09ca4b2d3bb6cc95249707fc684d27484b91" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", ] [[package]] name = "h2" -version = "0.4.4" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "816ec7294445779408f36fe57bc5b7fc1cf59664059096c65f905c1c61f58069" +checksum = "524e8ac6999421f49a846c2d4411f337e53497d8ec55d67753beffa43c5d9205" dependencies = [ + "atomic-waker", "bytes", "fnv", "futures-core", "futures-sink", - "futures-util", - "http 1.1.0", + "http", "indexmap", "slab", "tokio", @@ -2378,9 +2305,9 @@ dependencies = [ [[package]] name = "h263-rs" version = "0.1.0" -source = "git+https://github.com/ruffle-rs/h263-rs?rev=5c8d9d7d86f62b70ca484df006a75a9c8ff1985c#5c8d9d7d86f62b70ca484df006a75a9c8ff1985c" +source = "git+https://github.com/ruffle-rs/h263-rs?rev=f0fa94c366a1d0383df99aa835add175658d6bad#f0fa94c366a1d0383df99aa835add175658d6bad" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "lazy_static", "num-traits", "thiserror", @@ -2389,16 +2316,16 @@ dependencies = [ [[package]] name = "h263-rs-deblock" version = "0.1.0" -source = "git+https://github.com/ruffle-rs/h263-rs?rev=5c8d9d7d86f62b70ca484df006a75a9c8ff1985c#5c8d9d7d86f62b70ca484df006a75a9c8ff1985c" +source = "git+https://github.com/ruffle-rs/h263-rs?rev=f0fa94c366a1d0383df99aa835add175658d6bad#f0fa94c366a1d0383df99aa835add175658d6bad" dependencies = [ - "itertools", + "itertools 0.13.0", "wide", ] [[package]] name = "h263-rs-yuv" version = "0.1.0" -source = "git+https://github.com/ruffle-rs/h263-rs?rev=5c8d9d7d86f62b70ca484df006a75a9c8ff1985c#5c8d9d7d86f62b70ca484df006a75a9c8ff1985c" +source = "git+https://github.com/ruffle-rs/h263-rs?rev=f0fa94c366a1d0383df99aa835add175658d6bad#f0fa94c366a1d0383df99aa835add175658d6bad" dependencies = [ "bytemuck", "wide", @@ -2420,10 +2347,10 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af2a7e73e1f34c48da31fb668a907f250794837e08faa144fd24f0b8b741e890" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "com", "libc", - "libloading 0.8.3", + "libloading", "thiserror", "widestring", "winapi", @@ -2464,17 +2391,6 @@ dependencies = [ [[package]] name = "http" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" -dependencies = [ - "bytes", - "fnv", - "itoa", -] - -[[package]] -name = "http" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" @@ -2486,32 +2402,32 @@ dependencies = [ [[package]] name = "http-body" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" +checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" dependencies = [ "bytes", - "http 1.1.0", + "http", ] [[package]] name = "http-body-util" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0475f8b2ac86659c21b64320d5d653f9efe42acd2a4e560073ec61a155a34f1d" +checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" dependencies = [ "bytes", - "futures-core", - "http 1.1.0", + "futures-util", + "http", "http-body", "pin-project-lite", ] [[package]] name = "httparse" -version = "1.8.0" +version = "1.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" +checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" [[package]] name = "humantime" @@ -2521,15 +2437,15 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "1.3.1" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe575dd17d0862a9a33781c8c4696a55c320909004a67a00fb286ba8b1bc496d" +checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" dependencies = [ "bytes", "futures-channel", "futures-util", "h2", - "http 1.1.0", + "http", "http-body", "httparse", "itoa", @@ -2541,12 +2457,12 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.26.0" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0bea761b46ae2b24eb4aef630d8d1c398157b6fc29e6350ecf090a0b70c952c" +checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155" dependencies = [ "futures-util", - "http 1.1.0", + "http", "hyper", "hyper-util", "rustls", @@ -2554,18 +2470,19 @@ dependencies = [ "tokio", "tokio-rustls", "tower-service", + "webpki-roots", ] [[package]] name = "hyper-util" -version = "0.1.3" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa" +checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9" dependencies = [ "bytes", "futures-channel", "futures-util", - "http 1.1.0", + "http", "http-body", "hyper", "pin-project-lite", @@ -2600,23 +2517,12 @@ dependencies = [ ] [[package]] -name = "icrate" -version = "0.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99d3aaff8a54577104bafdf686ff18565c3b6903ca5782a2026ef06e2c7aa319" -dependencies = [ - "block2", - "dispatch", - "objc2", -] - -[[package]] name = "id3" -version = "1.13.1" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79f41f7e5ad125c63d55b112a98afb753742fa7f97692bfbbc52544b89e1ff1f" +checksum = "55f4e785f2c700217ee82a1c727c720449421742abd5fcb2f1df04e1244760e9" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "byteorder", "flate2", ] @@ -2657,7 +2563,7 @@ dependencies = [ "globset", "log", "memchr", - "regex-automata 0.4.6", + "regex-automata 0.4.7", "same-file", "walkdir", "winapi-util", @@ -2665,24 +2571,12 @@ dependencies = [ [[package]] name = "image" -version = "0.24.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d" -dependencies = [ - "bytemuck", - "byteorder", - "color_quant", - "num-traits", -] - -[[package]] -name = "image" -version = "0.25.1" +version = "0.25.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd54d660e773627692c524beaad361aca785a4f9f5730ce91f42aabe5bce3d11" +checksum = "99314c8a2152b8ddb211f924cdae532d8c5e4c8bb54728e12fff1b0cd5963a10" dependencies = [ "bytemuck", - "byteorder", + "byteorder-lite", "num-traits", "png", "tiff", @@ -2690,13 +2584,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.2.6" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" +checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5" dependencies = [ "equivalent", "hashbrown", - "serde", ] [[package]] @@ -2734,9 +2627,9 @@ dependencies = [ [[package]] name = "insta" -version = "1.38.0" +version = "1.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3eab73f58e59ca6526037208f0e98851159ec1633cf17b6cd2e1f2c3fd5d53cc" +checksum = "6593a41c7a73841868772495db7dc1e8ecab43bb5c0b6da2059246c4b506ab60" dependencies = [ "console", "lazy_static", @@ -2746,20 +2639,20 @@ dependencies = [ [[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", ] [[package]] name = "intl-memoizer" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c310433e4a310918d6ed9243542a6b83ec1183df95dff8f23f87bb88a264a66f" +checksum = "fe22e020fce238ae18a6d5d8c502ee76a52a6e880d99477657e6acc30ec57bda" dependencies = [ - "type-map 0.4.0", + "type-map", "unic-langid", ] @@ -2789,6 +2682,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" [[package]] +name = "is_terminal_polyfill" +version = "1.70.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" + +[[package]] name = "itertools" version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2798,6 +2697,15 @@ dependencies = [ ] [[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" @@ -2827,9 +2735,9 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" [[package]] name = "jobserver" -version = "0.1.31" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" +checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" dependencies = [ "libc", ] @@ -2843,7 +2751,7 @@ checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" [[package]] name = "jpegxr" version = "0.3.1" -source = "git+https://github.com/ruffle-rs/jpegxr?branch=ruffle#688021cb0a4935295f9aa8b488ca05bb4f1e9b34" +source = "git+https://github.com/ruffle-rs/jpegxr?rev=db88651220688d2883a90d5477048071507b0493#db88651220688d2883a90d5477048071507b0493" dependencies = [ "bindgen", "cc", @@ -2853,9 +2761,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.69" +version = "0.3.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" +checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" dependencies = [ "wasm-bindgen", ] @@ -2867,7 +2775,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6aae1df220ece3c0ada96b8153459b67eebe9ae9212258bb0134ae60416fdf76" dependencies = [ "libc", - "libloading 0.8.3", + "libloading", "pkg-config", ] @@ -2879,9 +2787,9 @@ checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc" [[package]] name = "lazy_static" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "lazycell" @@ -2891,52 +2799,18 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.153" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" - -[[package]] -name = "libflate" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45d9dfdc14ea4ef0900c1cddbc8dcd553fbaacd8a4a282cf4018ae9dd04fb21e" -dependencies = [ - "adler32", - "core2", - "crc32fast", - "dary_heap", - "libflate_lz77", -] - -[[package]] -name = "libflate_lz77" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6e0d73b369f386f1c44abd9c570d5318f55ccde816ff4b562fa452e5182863d" -dependencies = [ - "core2", - "hashbrown", - "rle-decode-fast", -] - -[[package]] -name = "libloading" -version = "0.7.4" +version = "0.2.158" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" -dependencies = [ - "cfg-if", - "winapi", -] +checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" [[package]] name = "libloading" -version = "0.8.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" +checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" dependencies = [ "cfg-if", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -2951,7 +2825,7 @@ version = "0.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3af92c55d7d839293953fcd0fda5ecfe93297cfde6ffbdec13b41d99c0ba6607" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "libc", "redox_syscall 0.4.1", ] @@ -2962,15 +2836,16 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "libc", + "redox_syscall 0.5.1", ] [[package]] name = "libtest-mimic" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fefdf21230d6143476a28adbee3d930e2b68a3d56443c777cae3fe9340eebff9" +checksum = "cc0bda45ed5b3a2904262c1bb91e526127aa70e7ef3758aba2ef93cf896b9b58" dependencies = [ "clap", "escape8259", @@ -2996,29 +2871,29 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "linkme" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb2cfee0de9bd869589fb9a015e155946d1be5ff415cb844c2caccc6cc4b5db9" +checksum = "3c943daedff228392b791b33bba32e75737756e80a613e32e246c6ce9cbab20a" dependencies = [ "linkme-impl", ] [[package]] name = "linkme-impl" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adf157a4dc5a29b7b464aa8fe7edeff30076e07e13646a1c3874f58477dc99f8" +checksum = "cb26336e6dc7cc76e7927d2c9e7e3bb376d7af65a6f56a0b16c47d18a9b1abc5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.77", ] [[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 = "litrs" @@ -3028,19 +2903,25 @@ checksum = "b4ce301924b7887e9d637144fdade93f9dfff9b60981d4ac161db09720d39aa5" [[package]] name = "lock_api" -version = "0.4.11" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" dependencies = [ "autocfg", "scopeguard", ] [[package]] +name = "lockfree-object-pool" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9374ef4228402d4b7e403e5838cb880d9ee663314b0a900d5a6aabf0c213552e" + +[[package]] name = "log" -version = "0.4.21" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "loom" @@ -3057,9 +2938,9 @@ dependencies = [ [[package]] name = "lru" -version = "0.12.3" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc" +checksum = "37ee39891760e7d94734f6f63fedc29a2e4a152f836120753a72503f09fcf904" dependencies = [ "hashbrown", ] @@ -3097,9 +2978,9 @@ dependencies = [ [[package]] name = "lyon_path" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca507745ba7ccbc76e5c44e7b63b1a29d2b0d6126f375806a5bbaf657c7d6c45" +checksum = "9c08a606c7a59638d6c6aa18ac91a06aa9fb5f765a7efb27e6a4da58700740d7" dependencies = [ "lyon_geom", "num-traits", @@ -3107,9 +2988,9 @@ dependencies = [ [[package]] name = "lyon_tessellation" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4470bd0b1f29eda66068ab1fd47719facda0a136b829bcca69287ed0ac40a134" +checksum = "579d42360a4b09846eff2feef28f538696c7d6c7439bfa65874ff3cbe0951b2c" dependencies = [ "float_next_after", "lyon_path", @@ -3171,9 +3052,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" @@ -3195,11 +3076,11 @@ dependencies = [ [[package]] name = "metal" -version = "0.27.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c43f73953f8cbe511f021b58f18c3ce1c3d1ae13fe953293e13345bf83217f25" +checksum = "7ecfd3296f8c56b7c1f6fbac3c71cefa9d78ce009850c45000015f206dc7fa21" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "block", "core-graphics-types", "foreign-types", @@ -3215,16 +3096,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] -name = "mime_guess2" -version = "2.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25a3333bb1609500601edc766a39b4c1772874a4ce26022f4d866854dc020c41" -dependencies = [ - "mime", - "unicase", -] - -[[package]] name = "minimal-lexical" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3232,23 +3103,33 @@ 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", ] [[package]] +name = "miniz_oxide" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" +dependencies = [ + "adler2", +] + +[[package]] name = "mio" -version = "0.8.11" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" +checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" dependencies = [ + "hermit-abi", "libc", "wasi", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -3264,20 +3145,19 @@ dependencies = [ [[package]] name = "naga" -version = "0.19.2" +version = "22.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50e3524642f53d9af419ab5e8dd29d3ba155708267667c2f3f06c88c9e130843" +checksum = "8bd5a652b6faf21496f2cfd88fc49989c8db0825d1f6746b1a71a6ede24a63ad" dependencies = [ + "arrayvec", "bit-set", - "bitflags 2.5.0", + "bitflags 2.6.0", + "cfg_aliases 0.1.1", "codespan-reporting", "hexf-parse", "indexmap", "log", - "num-traits", - "pp-rs", - "rustc-hash", - "serde", + "rustc-hash 1.1.0", "spirv", "termcolor", "thiserror", @@ -3288,7 +3168,7 @@ dependencies = [ name = "naga-agal" version = "0.1.0" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "insta", "naga", "num-derive", @@ -3301,42 +3181,35 @@ version = "0.1.0" dependencies = [ "anyhow", "naga", - "naga_oil", "ruffle_render", ] [[package]] -name = "naga_oil" -version = "0.13.0" +name = "ndk" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0ea62ae0f2787456afca7209ca180522b41f00cbe159ee369eba1e07d365cd1" +checksum = "2076a31b7010b17a38c01907c45b945e8f11495ee4dd588309718901b1f7a5b7" dependencies = [ - "bit-set", - "codespan-reporting", - "data-encoding", - "indexmap", - "naga", - "once_cell", - "regex", - "regex-syntax 0.8.3", - "rustc-hash", + "bitflags 2.6.0", + "jni-sys", + "log", + "ndk-sys 0.5.0+25.2.9519653", + "num_enum", "thiserror", - "tracing", - "unicode-ident", ] [[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", + "bitflags 2.6.0", "jni-sys", "log", - "ndk-sys", + "ndk-sys 0.6.0+11769913", "num_enum", - "raw-window-handle 0.6.1", + "raw-window-handle", "thiserror", ] @@ -3356,6 +3229,15 @@ dependencies = [ ] [[package]] +name = "ndk-sys" +version = "0.6.0+11769913" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee6cda3051665f1fb8d9e08fc35c96d5a244fb1be711a03b71118828afc9a873" +dependencies = [ + "jni-sys", +] + +[[package]] name = "nellymoser-rs" version = "0.1.2" source = "git+https://github.com/ruffle-rs/nellymoser?rev=754b1184037aa9952a907107284fb73897e26adc#754b1184037aa9952a907107284fb73897e26adc" @@ -3389,13 +3271,13 @@ dependencies = [ [[package]] name = "nix" -version = "0.28.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" +checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cfg-if", - "cfg_aliases", + "cfg_aliases 0.2.1", "libc", "memoffset", ] @@ -3428,20 +3310,19 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.4.4" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" dependencies = [ - "autocfg", "num-integer", "num-traits", ] [[package]] name = "num-complex" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23c6602fda94a57c990fe0df199a035d83576b496aa29f4e634a8ac6004e68a6" +checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495" dependencies = [ "num-traits", ] @@ -3460,7 +3341,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.77", ] [[package]] @@ -3474,9 +3355,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.18" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", "libm", @@ -3494,23 +3375,23 @@ dependencies = [ [[package]] name = "num_enum" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845" +checksum = "4e613fc340b2220f734a8595782c551f1250e969d87d3be1ae0579e8d4065179" dependencies = [ "num_enum_derive", ] [[package]] name = "num_enum_derive" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" +checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.77", ] [[package]] @@ -3535,65 +3416,216 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" dependencies = [ "malloc_buf", - "objc_exception", ] [[package]] -name = "objc-foundation" -version = "0.1.1" +name = "objc-sys" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9" +checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310" + +[[package]] +name = "objc2" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46a785d4eeff09c14c487497c162e92766fbb3e4059a71840cecc03d9a50b804" dependencies = [ - "block", - "objc", - "objc_id", + "objc-sys", + "objc2-encode", ] [[package]] -name = "objc-sys" -version = "0.3.3" +name = "objc2-app-kit" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da284c198fb9b7b0603f8635185e85fbd5b64ee154b1ed406d489077de2d6d60" +checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff" +dependencies = [ + "bitflags 2.6.0", + "block2", + "libc", + "objc2", + "objc2-core-data", + "objc2-core-image", + "objc2-foundation", + "objc2-quartz-core", +] [[package]] -name = "objc2" -version = "0.4.1" +name = "objc2-cloud-kit" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "559c5a40fdd30eb5e344fbceacf7595a81e242529fb4e21cf5f43fb4f11ff98d" +checksum = "74dd3b56391c7a0596a295029734d3c1c5e7e510a4cb30245f8221ccea96b009" dependencies = [ - "objc-sys", - "objc2-encode", + "bitflags 2.6.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.6.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 = "d079845b37af429bfe5dfa76e6d087d788031045b25cfc6fd898486fd9847666" +checksum = "7891e71393cd1f227313c9379a26a584ff3d7e6e7159e988851f0934c993f0f8" [[package]] -name = "objc_exception" -version = "0.1.2" +name = "objc2-foundation" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4" +checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8" dependencies = [ - "cc", + "bitflags 2.6.0", + "block2", + "dispatch", + "libc", + "objc2", ] [[package]] -name = "objc_id" -version = "0.1.1" +name = "objc2-link-presentation" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b" +checksum = "a1a1ae721c5e35be65f01a03b6d2ac13a54cb4fa70d8a5da293d7b0020261398" dependencies = [ - "objc", + "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.6.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.6.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 = "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.6.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.6.0", + "block2", + "objc2", + "objc2-core-location", + "objc2-foundation", ] [[package]] name = "object" -version = "0.32.2" +version = "0.36.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +checksum = "27b64972346851a39438c60b341ebc01bba47464ae329e55cf343eb93964efd9" dependencies = [ "memchr", ] @@ -3605,7 +3637,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8b61bebd49e5d43f5f8cc7ee2891c16e0f41ec7954d36bcb6c14c5e0de867fb" dependencies = [ "jni", - "ndk", + "ndk 0.8.0", "ndk-context", "num-derive", "num-traits", @@ -3670,9 +3702,9 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "owned_ttf_parser" -version = "0.20.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4586edfe4c648c71797a74c84bacb32b52b212eff5dfe2bb9f2c599844023e7" +checksum = "490d3a563d3122bf7c911a59b0add9389e5ec0f5f0c3ac6b91ff235a0e6a7f90" dependencies = [ "ttf-parser", ] @@ -3685,9 +3717,9 @@ checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" [[package]] name = "parking_lot" -version = "0.12.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ "lock_api", "parking_lot_core", @@ -3695,22 +3727,22 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.9" +version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.4.1", + "redox_syscall 0.5.1", "smallvec", - "windows-targets 0.48.5", + "windows-targets 0.52.6", ] [[package]] name = "paste" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "path-slash" @@ -3741,7 +3773,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.77", ] [[package]] @@ -3758,9 +3790,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "piper" -version = "0.2.1" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" +checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066" dependencies = [ "atomic-waker", "fastrand", @@ -3783,14 +3815,14 @@ dependencies = [ "crc32fast", "fdeflate", "flate2", - "miniz_oxide", + "miniz_oxide 0.7.4", ] [[package]] name = "polling" -version = "3.7.0" +version = "3.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "645493cf344456ef24219d02a768cf1fb92ddf8c92161679ae3d91b91a637be3" +checksum = "5e6a007746f34ed64099e88783b0ae369eaa3da6392868ba262e2af9b8fbaea1" dependencies = [ "cfg-if", "concurrent-queue", @@ -3809,9 +3841,9 @@ checksum = "22686f4785f02a4fcc856d3b3bb19bf6c8160d103f7a99cc258bddd0251dc7f2" [[package]] name = "portable-atomic" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" +checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265" [[package]] name = "powerfmt" @@ -3820,21 +3852,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" [[package]] -name = "pp-rs" -version = "0.2.1" +name = "ppv-lite86" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb458bb7f6e250e6eb79d5026badc10a3ebb8f9a15d1fff0f13d17c71f4d6dee" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" dependencies = [ - "unicode-xid", + "zerocopy", ] [[package]] -name = "ppv-lite86" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" - -[[package]] name = "presser" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3852,30 +3878,30 @@ dependencies = [ [[package]] name = "prettyplease" -version = "0.2.19" +version = "0.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ac2cf0f2e4f42b49f5ffd07dae8d746508ef7526c13940e5f524012ae6c6550" +checksum = "479cf940fbbb3426c32c5d5176f62ad57549a0bb84773423ba8be9d089f5faba" dependencies = [ "proc-macro2", - "syn 2.0.60", + "syn 2.0.77", ] [[package]] name = "primal-check" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9df7f93fd637f083201473dab4fee2db4c429d32e55e3299980ab3957ab916a0" +checksum = "dc0d895b311e3af9902528fbb8f928688abbd95872819320517cc24ca6b2bd08" dependencies = [ "num-integer", ] [[package]] name = "proc-macro-crate" -version = "3.1.0" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b" dependencies = [ - "toml_edit 0.21.1", + "toml_edit", ] [[package]] @@ -3886,18 +3912,18 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" [[package]] name = "proc-macro2" -version = "1.0.81" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] [[package]] name = "profiling" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f0f7f43585c34e4fdd7497d746bc32e14458cf11c69341cc0587b1d825dde42" +checksum = "43d84d1d7a6ac92673717f9f6d1518374ef257669c24ebc5ac25d5033828be58" dependencies = [ "profiling-procmacros", "tracy-client", @@ -3905,12 +3931,12 @@ dependencies = [ [[package]] name = "profiling-procmacros" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce97fecd27bc49296e5e20518b5a1bb54a14f7d5fe6228bc9686ee2a74915cc8" +checksum = "8021cf59c8ec9c432cfc2526ac6b8aa508ecaf29cd415f271b8406c1b851c3fd" dependencies = [ "quote", - "syn 2.0.60", + "syn 2.0.77", ] [[package]] @@ -3931,18 +3957,65 @@ dependencies = [ [[package]] name = "quick-xml" -version = "0.31.0" +version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" +checksum = "96a05e2e8efddfa51a84ca47cec303fac86c8541b686d37cac5efc0e094417bc" dependencies = [ "memchr", ] [[package]] +name = "quinn" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4ceeeeabace7857413798eb1ffa1e9c905a9946a57d81fb69b4b71c4d8eb3ad" +dependencies = [ + "bytes", + "pin-project-lite", + "quinn-proto", + "quinn-udp", + "rustc-hash 1.1.0", + "rustls", + "thiserror", + "tokio", + "tracing", +] + +[[package]] +name = "quinn-proto" +version = "0.11.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fadfaed2cd7f389d0161bb73eeb07b7b78f8691047a6f3e73caaeae55310a4a6" +dependencies = [ + "bytes", + "rand", + "ring", + "rustc-hash 2.0.0", + "rustls", + "slab", + "thiserror", + "tinyvec", + "tracing", +] + +[[package]] +name = "quinn-udp" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9096629c45860fc7fb143e125eb826b5e721e10be3263160c7d60ca832cf8c46" +dependencies = [ + "libc", + "once_cell", + "socket2", + "tracing", + "windows-sys 0.52.0", +] + +[[package]] name = "quote" -version = "1.0.36" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" dependencies = [ "proc-macro2", ] @@ -3985,15 +4058,9 @@ checksum = "9c8a99fddc9f0ba0a85884b8d14e3592853e787d581ca1816c91349b10e4eeab" [[package]] name = "raw-window-handle" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" - -[[package]] -name = "raw-window-handle" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cc3bcbdb1ddfc11e700e62968e6b4cc9c75bb466464ad28fb61c5b2c964418b" +checksum = "20675572f6f24e9e76ef639bc5552774ed45f1c30e2951e1e99c59888861c539" [[package]] name = "rayon" @@ -4026,20 +4093,20 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.3.5" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" dependencies = [ "bitflags 1.3.2", ] [[package]] name = "redox_syscall" -version = "0.4.1" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", ] [[package]] @@ -4055,14 +4122,14 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.4" +version = "1.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" +checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" 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]] @@ -4076,13 +4143,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]] @@ -4093,15 +4160,15 @@ 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 = "regress" -version = "0.9.1" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0eae2a1ebfecc58aff952ef8ccd364329abe627762f5bf09ff42eb9d98522479" +checksum = "1541daf4e4ed43a0922b7969bdc2170178bcacc5dabf7e39bc508a9fa3953a7a" dependencies = [ "hashbrown", "memchr", @@ -4113,9 +4180,9 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac633a08f39bf3268714799bd8c4a1a19c19c203d817d3448bb8b91c97817cf0" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "float-cmp", - "libloading 0.8.3", + "libloading", "once_cell", "renderdoc-sys", "winapi", @@ -4130,19 +4197,20 @@ checksum = "19b30a45b0cd0bcca8037f3d0dc3421eaf95327a17cad11964fb8179b4fc4832" [[package]] name = "reqwest" -version = "0.12.4" +version = "0.12.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "566cafdd92868e0939d3fb961bd0dc25fcfaaed179291093b3d43e6b3150ea10" +checksum = "f8f4955649ef5c38cc7f9e8aa41761d48fb9677197daea9984dc54f56aad5e63" dependencies = [ - "base64 0.22.0", + "base64", "bytes", "cookie", "cookie_store", "encoding_rs", + "futures-channel", "futures-core", "futures-util", "h2", - "http 1.1.0", + "http", "http-body", "http-body-util", "hyper", @@ -4155,6 +4223,7 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", + "quinn", "rustls", "rustls-pemfile", "rustls-pki-types", @@ -4171,25 +4240,23 @@ dependencies = [ "wasm-bindgen-futures", "web-sys", "webpki-roots", - "winreg", + "windows-registry", ] [[package]] name = "rfd" version = "0.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25a73a7337fc24366edfca76ec521f51877b114e42dab584008209cca6719251" +source = "git+https://github.com/PolyMeilex/rfd.git?rev=e0e725ec9a426acf7c93d9877c41e230fcee3fac#e0e725ec9a426acf7c93d9877c41e230fcee3fac" dependencies = [ "ashpd", - "block", - "dispatch", + "block2", "js-sys", "log", - "objc", - "objc-foundation", - "objc_id", + "objc2", + "objc2-app-kit", + "objc2-foundation", "pollster", - "raw-window-handle 0.6.1", + "raw-window-handle", "urlencoding", "wasm-bindgen", "wasm-bindgen-futures", @@ -4213,39 +4280,22 @@ dependencies = [ ] [[package]] -name = "rle-decode-fast" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3582f63211428f83597b51b2ddb88e2a91a9d52d12831f9d08f5e624e8977422" - -[[package]] -name = "ron" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94" -dependencies = [ - "base64 0.21.7", - "bitflags 2.5.0", - "serde", - "serde_derive", -] - -[[package]] name = "roxmltree" -version = "0.19.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cd14fd5e3b777a7422cca79358c57a8f6e3a703d9ac187448d0daf220c2407f" +checksum = "6c20b6793b5c2fa6553b250154b78d6d0db37e72700ae35fad9387a46f487c97" [[package]] name = "ruffle_core" version = "0.1.0" dependencies = [ "async-channel", - "bitflags 2.5.0", + "bitflags 2.6.0", "bitstream-io", "build_playerglobal", "bytemuck", "byteorder", + "chardetng", "chrono", "clap", "dasp", @@ -4264,7 +4314,7 @@ dependencies = [ "futures", "hashbrown", "id3", - "image 0.25.1", + "image", "indexmap", "jpegxr", "linkme", @@ -4293,12 +4343,13 @@ dependencies = [ "symphonia", "thiserror", "tracing", + "tracy-client", "ttf-parser", "unic-segment", "url", "wasm-bindgen-futures", "weak-table", - "web-time 1.1.0", + "web-time", ] [[package]] @@ -4320,17 +4371,20 @@ dependencies = [ "fontdb", "futures", "gilrs", - "image 0.25.1", + "image", "os_info", + "rand", "rfd", "ruffle_core", "ruffle_frontend_utils", "ruffle_render", "ruffle_render_wgpu", + "ruffle_video_external", "ruffle_video_software", "sys-locale", + "thiserror", "tokio", - "toml_edit 0.22.12", + "toml_edit", "tracing", "tracing-appender", "tracing-subscriber", @@ -4342,6 +4396,7 @@ dependencies = [ "wgpu", "winapi", "winit", + "zbus", ] [[package]] @@ -4350,21 +4405,19 @@ version = "0.1.0" dependencies = [ "async-channel", "async-io", - "async-net", - "futures", "futures-lite", "macro_rules_attribute", "reqwest", "ruffle_core", + "ruffle_render", "slotmap", "tempfile", "thiserror", "tokio", - "toml_edit 0.22.12", + "toml_edit", "tracing", "url", "urlencoding", - "webbrowser", "zip", ] @@ -4379,7 +4432,7 @@ dependencies = [ name = "ruffle_input_format" version = "0.1.0" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "serde", "serde_json", ] @@ -4389,7 +4442,7 @@ name = "ruffle_macros" version = "0.1.0" dependencies = [ "quote", - "syn 2.0.60", + "syn 2.0.77", ] [[package]] @@ -4459,13 +4512,12 @@ dependencies = [ "enum-map", "fnv", "futures", - "image 0.25.1", + "image", "indexmap", "lru", "naga", "naga-agal", "naga-pixelbender", - "naga_oil", "profiling", "ruffle_render", "swf", @@ -4508,7 +4560,7 @@ dependencies = [ "approx", "async-channel", "chrono", - "image 0.25.1", + "image", "percent-encoding", "pretty_assertions", "regex", @@ -4516,6 +4568,7 @@ dependencies = [ "ruffle_input_format", "ruffle_render", "ruffle_socket_format", + "ruffle_video_external", "ruffle_video_software", "serde", "toml", @@ -4534,6 +4587,24 @@ dependencies = [ ] [[package]] +name = "ruffle_video_external" +version = "0.1.0" +dependencies = [ + "bzip2", + "hex", + "libloading", + "reqwest", + "ruffle_render", + "ruffle_video", + "ruffle_video_software", + "sha2", + "slotmap", + "swf", + "tempfile", + "tracing", +] + +[[package]] name = "ruffle_video_software" version = "0.1.0" dependencies = [ @@ -4556,7 +4627,7 @@ name = "ruffle_web" version = "0.1.0" dependencies = [ "async-channel", - "base64 0.22.0", + "base64", "chrono", "console_error_panic_hook", "futures", @@ -4585,16 +4656,15 @@ dependencies = [ "wasm-bindgen-futures", "wasm-streams", "web-sys", + "zip", ] [[package]] name = "ruffle_web_common" version = "0.1.0" dependencies = [ - "js-sys", "tracing", "wasm-bindgen", - "web-sys", ] [[package]] @@ -4610,9 +4680,9 @@ version = "0.1.0" [[package]] name = "rustc-demangle" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustc-hash" @@ -4621,6 +4691,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] +name = "rustc-hash" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152" + +[[package]] name = "rustc_version" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4659,7 +4735,7 @@ version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "errno", "libc", "linux-raw-sys", @@ -4668,11 +4744,11 @@ dependencies = [ [[package]] name = "rustls" -version = "0.22.4" +version = "0.23.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" +checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044" dependencies = [ - "log", + "once_cell", "ring", "rustls-pki-types", "rustls-webpki", @@ -4682,25 +4758,25 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "2.1.2" +version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d" +checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425" dependencies = [ - "base64 0.22.0", + "base64", "rustls-pki-types", ] [[package]] name = "rustls-pki-types" -version = "1.5.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "beb461507cee2c2ff151784c52762cf4d9ff6a61f3e80968600ed24fa837fa54" +checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0" [[package]] name = "rustls-webpki" -version = "0.102.3" +version = "0.102.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3bce581c0dd41bce533ce695a1437fa16a7ab5ac3ccfa99fe1a620a7885eabf" +checksum = "8e6b52d4fda176fd835fdc55a835d4a89b8499cad995885a21149d5ad62f852e" dependencies = [ "ring", "rustls-pki-types", @@ -4709,21 +4785,21 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.15" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80af6f9131f277a45a3fba6ce8e2258037bb0477a67e610d3c1fe046ab31de47" +checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" [[package]] name = "ryu" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "safe_arch" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f398075ce1e6a179b46f51bd88d0598b92b00d3551f1a2d4ac49e771b56ac354" +checksum = "c3460605018fdc9612bce72735cba0d27efbcd9904780d44c7e3a9948f96148a" dependencies = [ "bytemuck", ] @@ -4751,9 +4827,9 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "sctk-adwaita" -version = "0.8.1" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82b2eaf3a5b264a521b988b2e73042e742df700c4f962cde845d1541adb46550" +checksum = "b6277f0217056f77f1d8f49f2950ac6c278c0d607c45f5ee99328d792ede24ec" dependencies = [ "ab_glyph", "log", @@ -4768,29 +4844,29 @@ version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e14e4d63b804dc0c7ec4a1e52bcb63f02c7ac94476755aa579edac21e01f915d" dependencies = [ - "self_cell 1.0.3", + "self_cell 1.0.4", ] [[package]] name = "self_cell" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58bf37232d3bb9a2c4e641ca2a11d83b5062066f88df7fed36c28772046d65ba" +checksum = "d369a96f978623eb3dc28807c4852d6cc617fed53da5d3c400feff1ef34a714a" [[package]] name = "semver" -version = "1.0.22" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" dependencies = [ "serde", ] [[package]] name = "serde" -version = "1.0.199" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c9f6e76df036c77cd94996771fb40db98187f096dd0b9af39c6c6e452ba966a" +checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" dependencies = [ "serde_derive", ] @@ -4808,23 +4884,24 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.199" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11bd257a6541e141e42ca6d24ae26f7714887b47e89aa739099104c7e4d3b7fc" +checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.77", ] [[package]] name = "serde_json" -version = "1.0.116" +version = "1.0.128" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813" +checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" dependencies = [ "indexmap", "itoa", + "memchr", "ryu", "serde", ] @@ -4837,14 +4914,14 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.77", ] [[package]] name = "serde_spanned" -version = "0.6.5" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" +checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" dependencies = [ "serde", ] @@ -4915,9 +4992,9 @@ checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" [[package]] name = "similar" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa42c91313f1d05da9b26f267f931cf178d4aba455b4c4622dd7355eb80c6640" +checksum = "1de1d4f81173b03af4c0cbed3c898f6bff5b870e4a7f5d6f4057d62a7a4b686e" [[package]] name = "simple_asn1" @@ -4957,11 +5034,11 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "smithay-client-toolkit" -version = "0.18.1" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "922fd3eeab3bd820d76537ce8f582b1cf951eceb5475c28500c7457d9d17f53a" +checksum = "3457dea1f0eb631b4034d61d4d8c32074caa6cd1ab2d59f2327bd8461e2c0016" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "calloop", "calloop-wayland-source", "cursor-icon", @@ -4982,9 +5059,9 @@ dependencies = [ [[package]] name = "smithay-clipboard" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c091e7354ea8059d6ad99eace06dd13ddeedbb0ac72d40a9a6e7ff790525882d" +checksum = "cc8216eec463674a0e90f29e0ae41a4db573ec5b56b1c6c1c71615d249b6d846" dependencies = [ "libc", "smithay-client-toolkit", @@ -4993,18 +5070,18 @@ dependencies = [ [[package]] name = "smol_str" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6845563ada680337a52d43bb0b29f396f2d911616f6573012645b9e3d048a49" +checksum = "dd538fb6910ac1099850255cf94a94df6551fbdd602454387d0adb2d1ca6dead" dependencies = [ "serde", ] [[package]] name = "socket2" -version = "0.5.6" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" dependencies = [ "libc", "windows-sys 0.52.0", @@ -5025,7 +5102,7 @@ version = "0.3.0+sdk-1.3.268.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eda41003dc44290527a59b13432d4a0379379fa074b70174882adfbdfd917844" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", ] [[package]] @@ -5069,21 +5146,20 @@ dependencies = [ [[package]] name = "subtle" -version = "2.5.0" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "swf" -version = "0.2.0" +version = "0.2.1" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "bitstream-io", "byteorder", "encoding_rs", "enum-map", "flate2", - "libflate", "log", "lzma-rs", "num-derive", @@ -5153,9 +5229,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.60" +version = "2.0.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3" +checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" dependencies = [ "proc-macro2", "quote", @@ -5164,9 +5240,12 @@ dependencies = [ [[package]] name = "sync_wrapper" -version = "0.1.2" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" +checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" +dependencies = [ + "futures-core", +] [[package]] name = "synstructure" @@ -5176,7 +5255,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.77", ] [[package]] @@ -5190,20 +5269,20 @@ dependencies = [ [[package]] name = "system-configuration" -version = "0.5.1" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" +checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", "core-foundation", "system-configuration-sys", ] [[package]] name = "system-configuration-sys" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" +checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4" dependencies = [ "core-foundation-sys", "libc", @@ -5211,14 +5290,15 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.10.1" +version = "3.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" dependencies = [ "cfg-if", "fastrand", + "once_cell", "rustix", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -5237,7 +5317,7 @@ dependencies = [ "anyhow", "env_logger", "futures", - "image 0.25.1", + "image", "libtest-mimic", "regex", "ruffle_core", @@ -5250,22 +5330,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.59" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0126ad08bff79f29fc3ae6a55cc72352056dfff61e3ff8bb7129476d44b23aa" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.59" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1cd413b5d558b4c5bf3680e324a6fa5014e7b7c067a51e69dbdf47eb7148b66" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.77", ] [[package]] @@ -5358,18 +5438,18 @@ dependencies = [ [[package]] name = "tinystr" -version = "0.7.5" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83c02bf3c538ab32ba913408224323915f4ef9a6d61c0e85d493f355921c0ece" +checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" dependencies = [ "displaydoc", ] [[package]] name = "tinyvec" -version = "1.6.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" dependencies = [ "tinyvec_macros", ] @@ -5382,37 +5462,36 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.37.0" +version = "1.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" +checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" dependencies = [ "backtrace", "bytes", "libc", "mio", - "num_cpus", "pin-project-lite", "socket2", "tokio-macros", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "tokio-macros" -version = "2.2.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" +checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.77", ] [[package]] name = "tokio-rustls" -version = "0.25.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" +checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" dependencies = [ "rustls", "rustls-pki-types", @@ -5421,61 +5500,49 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.10" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" +checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" dependencies = [ "bytes", "futures-core", "futures-sink", "pin-project-lite", "tokio", - "tracing", ] [[package]] name = "toml" -version = "0.8.12" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3" +checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.12", + "toml_edit", ] [[package]] name = "toml_datetime" -version = "0.6.5" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" 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.12" +version = "0.22.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3328d4f68a705b2a4498da1d580585d39a6510f98318a2cec3018a7ec61ddef" +checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d" dependencies = [ "indexmap", "serde", "serde_spanned", "toml_datetime", - "winnow 0.6.6", + "winnow", ] [[package]] @@ -5491,20 +5558,19 @@ dependencies = [ "tokio", "tower-layer", "tower-service", - "tracing", ] [[package]] name = "tower-layer" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" +checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" [[package]] name = "tower-service" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tracing" @@ -5538,7 +5604,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.77", ] [[package]] @@ -5582,9 +5648,9 @@ dependencies = [ [[package]] name = "tracing-tracy" -version = "0.10.4" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc6c7bf057d67aa107e076129a4f331aaac47ec379952d9f0775c6b1d838ee97" +checksum = "9be7f8874d6438e4263f9874c84eded5095bda795d9c7da6ea0192e1750d3ffe" dependencies = [ "tracing-core", "tracing-subscriber", @@ -5604,20 +5670,21 @@ dependencies = [ [[package]] name = "tracy-client" -version = "0.16.5" +version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "307e6b7030112fe9640fdd87988a40795549ba75c355f59485d14e6b444d2987" +checksum = "63de1e1d4115534008d8fd5788b39324d6f58fc707849090533828619351d855" dependencies = [ "loom", "once_cell", + "rustc-demangle", "tracy-client-sys", ] [[package]] name = "tracy-client-sys" -version = "0.22.2" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d104d610dfa9dd154535102cc9c6164ae1fa37842bc2d9e83f9ac82b0ae0882" +checksum = "98b98232a2447ce0a58f9a0bfb5f5e39647b5c597c994b63945fcccd1306fafb" dependencies = [ "cc", ] @@ -5640,17 +5707,11 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "ttf-parser" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17f77d76d837a7830fe1d4f12b7b4ba4192c1888001c7164257e4bc6d21d96b4" - -[[package]] -name = "type-map" -version = "0.4.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6d3364c5e96cb2ad1603037ab253ddd34d7fb72a58bdddf4b7350760fc69a46" +checksum = "5be21190ff5d38e8b4a2d3b6a3ae57f612cc39c96e83cedeaf7abc338a8bac4a" dependencies = [ - "rustc-hash", + "core_maths", ] [[package]] @@ -5659,7 +5720,7 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "deb68604048ff8fa93347f02441e4487594adc20bb8a084f9e564d2b827a0a9f" dependencies = [ - "rustc-hash", + "rustc-hash 1.1.0", ] [[package]] @@ -5702,9 +5763,9 @@ checksum = "80d7ff825a6a654ee85a63e80f92f054f904f21e7d12da4e22f9834a4aaa35bc" [[package]] name = "unic-langid" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "238722e6d794ed130f91f4ea33e01fcff4f188d92337a21297892521c72df516" +checksum = "23dd9d1e72a73b25e07123a80776aae3e7b0ec461ef94f9151eed6ec88005a44" dependencies = [ "unic-langid-impl", "unic-langid-macros", @@ -5712,18 +5773,18 @@ dependencies = [ [[package]] name = "unic-langid-impl" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bd55a2063fdea4ef1f8633243a7b0524cbeef1905ae04c31a1c9b9775c55bc6" +checksum = "0a5422c1f65949306c99240b81de9f3f15929f5a8bfe05bb44b034cc8bf593e5" dependencies = [ "tinystr", ] [[package]] name = "unic-langid-macros" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c854cefb82ff2816410ce606acbad1b3af065140907b29be9229040752b83ec" +checksum = "0da1cd2c042d3c7569a1008806b02039e7a4a2bdf8f8e96bd3c792434a0e275e" dependencies = [ "proc-macro-hack", "tinystr", @@ -5733,13 +5794,13 @@ dependencies = [ [[package]] name = "unic-langid-macros-impl" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea2a4c80deb4fb3ca51f66b5e2dd91e3642bbce52234bcf22e41668281208e4" +checksum = "1ed7f4237ba393424195053097c1516bd4590dc82b84f2f97c5c69e12704555b" dependencies = [ "proc-macro-hack", "quote", - "syn 2.0.60", + "syn 2.0.77", "unic-langid-impl", ] @@ -5773,15 +5834,6 @@ dependencies = [ ] [[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-bidi" version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5810,15 +5862,15 @@ checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" [[package]] name = "unicode-width" -version = "0.1.11" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" +checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" [[package]] name = "unicode-xid" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" +checksum = "229730647fbc343e3a80e463c1db7f78f3855d3f3739bee0dda773c9a037c90a" [[package]] name = "untrusted" @@ -5828,9 +5880,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[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 0.5.0", @@ -5846,15 +5898,15 @@ checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" [[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 = "uuid" -version = "1.8.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" +checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" [[package]] name = "valuable" @@ -5870,9 +5922,9 @@ checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" [[package]] name = "vergen" -version = "8.3.1" +version = "8.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e27d6bdd219887a9eadd19e1c34f32e47fa332301184935c6d9bca26f3cca525" +checksum = "2990d9ea5967266ea0ccf413a4aa5c42a93dbcfda9cb49a97de6931726b12566" dependencies = [ "anyhow", "cargo_metadata", @@ -5884,9 +5936,9 @@ dependencies = [ [[package]] name = "version_check" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" [[package]] name = "vfs" @@ -5944,34 +5996,35 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" +checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" dependencies = [ "cfg-if", + "once_cell", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" +checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.77", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.42" +version = "0.4.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" +checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed" dependencies = [ "cfg-if", "js-sys", @@ -5981,9 +6034,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" +checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -5991,22 +6044,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" +checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.77", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" +checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" [[package]] name = "wasm-streams" @@ -6023,9 +6076,9 @@ dependencies = [ [[package]] name = "wayland-backend" -version = "0.3.3" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d50fa61ce90d76474c87f5fc002828d81b32677340112b4ef08079a9d459a40" +checksum = "056535ced7a150d45159d3a8dc30f91a2e2d588ca0b23f70e56033622b8016f6" dependencies = [ "cc", "downcast-rs", @@ -6037,11 +6090,11 @@ dependencies = [ [[package]] name = "wayland-client" -version = "0.31.2" +version = "0.31.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82fb96ee935c2cea6668ccb470fb7771f6215d1691746c2d896b447a00ad3f1f" +checksum = "e3f45d1222915ef1fd2057220c1d9d9624b7654443ea35c3877f7a52bd0a5a2d" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "rustix", "wayland-backend", "wayland-scanner", @@ -6053,16 +6106,16 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "625c5029dbd43d25e6aa9615e88b829a5cad13b2819c4ae129fdbb7c31ab4c7e" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cursor-icon", "wayland-backend", ] [[package]] name = "wayland-cursor" -version = "0.31.1" +version = "0.31.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71ce5fa868dd13d11a0d04c5e2e65726d0897be8de247c0c5a65886e283231ba" +checksum = "3a94697e66e76c85923b0d28a0c251e8f0666f58fc47d316c0f4da6da75d37cb" dependencies = [ "rustix", "wayland-client", @@ -6071,11 +6124,11 @@ dependencies = [ [[package]] name = "wayland-protocols" -version = "0.31.2" +version = "0.32.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f81f365b8b4a97f422ac0e8737c438024b5951734506b0e1d775c73030561f4" +checksum = "2b5755d77ae9040bb872a25026555ce4cb0ae75fd923e90d25fba07d81057de0" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "wayland-backend", "wayland-client", "wayland-scanner", @@ -6083,11 +6136,11 @@ dependencies = [ [[package]] name = "wayland-protocols-plasma" -version = "0.2.0" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23803551115ff9ea9bce586860c5c5a971e360825a0309264102a9495a5ff479" +checksum = "8a0a41a6875e585172495f7a96dfa42ca7e0213868f4f15c313f7c33221a7eff" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "wayland-backend", "wayland-client", "wayland-protocols", @@ -6096,11 +6149,11 @@ dependencies = [ [[package]] name = "wayland-protocols-wlr" -version = "0.2.0" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6" +checksum = "dad87b5fd1b1d3ca2f792df8f686a2a11e3fe1077b71096f7a175ab699f89109" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "wayland-backend", "wayland-client", "wayland-protocols", @@ -6109,9 +6162,9 @@ dependencies = [ [[package]] name = "wayland-scanner" -version = "0.31.1" +version = "0.31.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63b3a62929287001986fb58c789dce9b67604a397c15c611ad9f747300b6c283" +checksum = "597f2001b2e5fc1121e3d5b9791d3e78f05ba6bfa4641053846248e3a13661c3" dependencies = [ "proc-macro2", "quick-xml", @@ -6120,9 +6173,9 @@ dependencies = [ [[package]] name = "wayland-sys" -version = "0.31.1" +version = "0.31.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15a0c8eaff5216d07f226cb7a549159267f3467b289d9a2e52fd3ef5aae2b7af" +checksum = "efa8ac0d8e8ed3e3b5c9fc92c7881406a268e11555abe36493efabe649a29e09" dependencies = [ "dlib", "log", @@ -6138,19 +6191,9 @@ checksum = "323f4da9523e9a669e1eaf9c6e763892769b1d38c623913647bfdc1532fe4549" [[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 = "web-time" -version = "0.2.4" +version = "0.3.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa30049b1c872b72c89866d458eae9f20380ab280ffd1b1e18df2d3e2d98cfe0" +checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" dependencies = [ "js-sys", "wasm-bindgen", @@ -6168,26 +6211,27 @@ dependencies = [ [[package]] name = "webbrowser" -version = "0.8.15" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db67ae75a9405634f5882791678772c94ff5f16a66535aae186e26aa0841fc8b" +checksum = "425ba64c1e13b1c6e8c5d2541c8fac10022ca584f33da781db01b5756aef1f4e" dependencies = [ + "block2", "core-foundation", "home", "jni", "log", "ndk-context", - "objc", - "raw-window-handle 0.5.2", + "objc2", + "objc2-foundation", "url", "web-sys", ] [[package]] name = "webpki-roots" -version = "0.26.1" +version = "0.26.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3de34ae270483955a94f4b21bdaaeb83d508bb84a01435f393818edb0012009" +checksum = "bd7c23921eeb1713a4e851530e9b9756e4fb0e89978582942612524cf09f01cd" dependencies = [ "rustls-pki-types", ] @@ -6200,20 +6244,19 @@ checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" [[package]] name = "wgpu" -version = "0.19.4" +version = "22.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbd7311dbd2abcfebaabf1841a2824ed7c8be443a0f29166e5d3c6a53a762c01" +checksum = "e1d1c4ba43f80542cf63a0a6ed3134629ae73e8ab51e4b765a67f3aa062eb433" dependencies = [ "arrayvec", - "cfg-if", - "cfg_aliases", + "cfg_aliases 0.1.1", + "document-features", "js-sys", "log", "naga", "parking_lot", "profiling", - "raw-window-handle 0.6.1", - "serde", + "raw-window-handle", "smallvec", "static_assertions", "wasm-bindgen", @@ -6226,45 +6269,42 @@ dependencies = [ [[package]] name = "wgpu-core" -version = "0.19.4" +version = "22.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28b94525fc99ba9e5c9a9e24764f2bc29bad0911a7446c12f446a8277369bf3a" +checksum = "0348c840d1051b8e86c3bcd31206080c5e71e5933dabd79be1ce732b0b2f089a" dependencies = [ "arrayvec", "bit-vec", - "bitflags 2.5.0", - "cfg_aliases", - "codespan-reporting", + "bitflags 2.6.0", + "cfg_aliases 0.1.1", + "document-features", "indexmap", "log", "naga", "once_cell", "parking_lot", "profiling", - "raw-window-handle 0.6.1", - "ron", - "rustc-hash", - "serde", + "raw-window-handle", + "rustc-hash 1.1.0", "smallvec", "thiserror", - "web-sys", "wgpu-hal", "wgpu-types", ] [[package]] name = "wgpu-hal" -version = "0.19.4" +version = "22.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc1a4924366df7ab41a5d8546d6534f1f33231aa5b3f72b9930e300f254e39c3" +checksum = "f6bbf4b4de8b2a83c0401d9e5ae0080a2792055f25859a02bf9be97952bbed4f" dependencies = [ "android_system_properties", "arrayvec", "ash", "bit-set", - "bitflags 2.5.0", + "bitflags 2.6.0", "block", - "cfg_aliases", + "cfg_aliases 0.1.1", "core-graphics-types", "d3d12", "glow", @@ -6276,19 +6316,19 @@ dependencies = [ "js-sys", "khronos-egl", "libc", - "libloading 0.8.3", + "libloading", "log", "metal", "naga", - "ndk-sys", + "ndk-sys 0.5.0+25.2.9519653", "objc", "once_cell", "parking_lot", "profiling", "range-alloc", - "raw-window-handle 0.6.1", + "raw-window-handle", "renderdoc-sys", - "rustc-hash", + "rustc-hash 1.1.0", "smallvec", "thiserror", "wasm-bindgen", @@ -6299,13 +6339,12 @@ dependencies = [ [[package]] name = "wgpu-types" -version = "0.19.2" +version = "22.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b671ff9fb03f78b46ff176494ee1ebe7d603393f42664be55b64dc8d53969805" +checksum = "bc9d91f0e2c4b51434dfa6db77846f2793149d8e73f800fa2e41f52b8eac3c5d" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "js-sys", - "serde", "web-sys", ] @@ -6323,9 +6362,9 @@ dependencies = [ [[package]] name = "wide" -version = "0.7.16" +version = "0.7.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81a1851a719f11d1d2fea40e15c72f6c00de8c142d7ac47c1441cc7e4d0d5bc6" +checksum = "b828f995bf1e9622031f8009f8481a85406ce1f4d4588ff746d872043e855690" dependencies = [ "bytemuck", "safe_arch", @@ -6355,9 +6394,9 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.7" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "134306a13c5647ad6453e8deaec55d3a44d6021970129e6188735e74bf546697" +checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" dependencies = [ "windows-sys 0.52.0", ] @@ -6375,7 +6414,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" dependencies = [ "windows-core 0.52.0", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -6385,7 +6424,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9252e5725dbed82865af151df558e754e4a3c2c30818359eb17465f1346a1b49" dependencies = [ "windows-core 0.54.0", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -6394,7 +6433,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -6403,17 +6442,47 @@ version = "0.54.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "12661b9c89351d684a50a8a643ce5f608e20243b9fb84687800163429f161d65" dependencies = [ - "windows-result", - "windows-targets 0.52.5", + "windows-result 0.1.2", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-registry" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0" +dependencies = [ + "windows-result 0.2.0", + "windows-strings", + "windows-targets 0.52.6", ] [[package]] name = "windows-result" -version = "0.1.1" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-result" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-strings" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "749f0da9cc72d82e600d8d2e44cadd0b9eedb9038f71a1c58556ac1c5791813b" +checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" dependencies = [ - "windows-targets 0.52.5", + "windows-result 0.2.0", + "windows-targets 0.52.6", ] [[package]] @@ -6440,7 +6509,16 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", ] [[package]] @@ -6475,18 +6553,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.5", - "windows_aarch64_msvc 0.52.5", - "windows_i686_gnu 0.52.5", + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", "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", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", ] [[package]] @@ -6503,9 +6581,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" @@ -6521,9 +6599,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" @@ -6539,15 +6617,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" [[package]] name = "windows_i686_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" @@ -6563,9 +6641,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" @@ -6581,9 +6659,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" @@ -6599,9 +6677,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" @@ -6617,43 +6695,47 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winit" -version = "0.29.15" +version = "0.30.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d59ad965a635657faf09c8f062badd885748428933dad8e8bdd64064d92e5ca" +checksum = "0be9e76a1f1077e04a411f0b989cbd3c93339e1771cb41e71ac4aee95bfd2c67" dependencies = [ "ahash", "android-activity", "atomic-waker", - "bitflags 2.5.0", + "bitflags 2.6.0", + "block2", "bytemuck", "calloop", - "cfg_aliases", + "cfg_aliases 0.2.1", + "concurrent-queue", "core-foundation", "core-graphics", "cursor-icon", - "icrate", + "dpi", "js-sys", "libc", - "log", "memmap2", - "ndk", - "ndk-sys", + "ndk 0.9.0", "objc2", - "once_cell", + "objc2-app-kit", + "objc2-foundation", + "objc2-ui-kit", "orbclient", "percent-encoding", - "raw-window-handle 0.6.1", - "redox_syscall 0.3.5", + "pin-project", + "raw-window-handle", + "redox_syscall 0.4.1", "rustix", "sctk-adwaita", "smithay-client-toolkit", "smol_str", + "tracing", "unicode-segmentation", "wasm-bindgen", "wasm-bindgen-futures", @@ -6662,8 +6744,8 @@ dependencies = [ "wayland-protocols", "wayland-protocols-plasma", "web-sys", - "web-time 0.2.4", - "windows-sys 0.48.0", + "web-time", + "windows-sys 0.52.0", "x11-dl", "x11rb", "xkbcommon-dl", @@ -6671,18 +6753,9 @@ dependencies = [ [[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.6" +version = "0.6.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0c976aaaa0e1f90dbb21e9587cdaf1d9679a1cde8875c0d6bd83ab96a208352" +checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f" dependencies = [ "memchr", ] @@ -6719,14 +6792,14 @@ dependencies = [ [[package]] name = "x11rb" -version = "0.13.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8f25ead8c7e4cba123243a6367da5d3990e0d3affa708ea19dce96356bd9f1a" +checksum = "5d91ffca73ee7f68ce055750bf9f6eca0780b8c85eff9bc046a3b0da41755e12" dependencies = [ "as-raw-xcb-connection", "gethostname", "libc", - "libloading 0.8.3", + "libloading", "once_cell", "rustix", "x11rb-protocol", @@ -6734,24 +6807,24 @@ dependencies = [ [[package]] name = "x11rb-protocol" -version = "0.13.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e63e71c4b8bd9ffec2c963173a4dc4cbde9ee96961d4fcb4429db9929b606c34" +checksum = "ec107c4503ea0b4a98ef47356329af139c0a4f7750e621cf2973cd3385ebcb3d" [[package]] name = "xcursor" -version = "0.3.5" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a0ccd7b4a5345edfcd0c3535718a4e9ff7798ffc536bb5b5a0e26ff84732911" +checksum = "0ef33da6b1660b4ddbfb3aef0ade110c8b8a781a3b6382fa5f2b5b040fd55f61" [[package]] name = "xdg-home" -version = "1.1.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21e5a325c3cb8398ad6cf859c1135b25dd29e186679cf2da7581d9679f63b38e" +checksum = "ec1cdab258fb55c0da61328dc52c8764709b249011b2cad0454c72f0bf10a1f6" dependencies = [ "libc", - "winapi", + "windows-sys 0.59.0", ] [[package]] @@ -6760,7 +6833,7 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d039de8032a9a8856a6be89cea3e5d12fdd82306ab7c94d74e6deab2460651c5" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "dlib", "log", "once_cell", @@ -6769,15 +6842,15 @@ 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" -version = "0.8.20" +version = "0.8.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "791978798f0597cfc70478424c2b4fdc2b7a8024aaff78497ef00f24ef674193" +checksum = "539a77ee7c0de333dcc6da69b177380a0b81e0dacfa4f7344c465a36871ee601" [[package]] name = "yansi" @@ -6787,9 +6860,9 @@ checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" [[package]] name = "zbus" -version = "4.1.2" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9ff46f2a25abd690ed072054733e0bc3157e3d4c45f41bd183dce09c2ff8ab9" +checksum = "bb97012beadd29e654708a0fdb4c84bc046f537aecfde2c3ee0a9e4b4d48c725" dependencies = [ "async-broadcast", "async-executor", @@ -6801,9 +6874,8 @@ dependencies = [ "async-task", "async-trait", "blocking", - "derivative", "enumflags2", - "event-listener 5.3.0", + "event-listener", "futures-core", "futures-sink", "futures-util", @@ -6826,15 +6898,14 @@ dependencies = [ [[package]] name = "zbus_macros" -version = "4.1.2" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e0e3852c93dcdb49c9462afe67a2a468f7bd464150d866e861eaf06208633e0" +checksum = "267db9407081e90bbfa46d841d3cbc60f59c0351838c4bc65199ecd79ab1983e" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "regex", - "syn 1.0.109", + "syn 2.0.77", "zvariant_utils", ] @@ -6851,48 +6922,67 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.7.32" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" dependencies = [ + "byteorder", "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.32" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.77", ] [[package]] name = "zeroize" -version = "1.7.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" [[package]] name = "zip" -version = "1.1.2" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a23468b4a7a4e9e1e62812f8d1dd614f67f148e2b3faa72f4843bf00b573fd7" +checksum = "dc5e4288ea4057ae23afc69a4472434a87a2495cafce6632fd1c4ec9f5cf3494" dependencies = [ "arbitrary", - "byteorder", "crc32fast", "crossbeam-utils", + "displaydoc", "flate2", + "indexmap", + "memchr", + "thiserror", + "zopfli", +] + +[[package]] +name = "zopfli" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5019f391bac5cf252e93bbcc53d039ffd62c7bfb7c150414d61369afe57e946" +dependencies = [ + "bumpalo", + "crc32fast", + "lockfree-object-pool", + "log", + "once_cell", + "simd-adler32", ] [[package]] name = "zvariant" -version = "4.0.2" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c1b3ca6db667bfada0f1ebfc94b2b1759ba25472ee5373d4551bb892616389a" +checksum = "2084290ab9a1c471c38fc524945837734fbf124487e105daec2bb57fd48c81fe" dependencies = [ "endi", "enumflags2", @@ -6904,24 +6994,24 @@ dependencies = [ [[package]] name = "zvariant_derive" -version = "4.0.2" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7a4b236063316163b69039f77ce3117accb41a09567fd24c168e43491e521bc" +checksum = "73e2ba546bda683a90652bac4a279bc146adad1386f25379cf73200d2002c449" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.77", "zvariant_utils", ] [[package]] name = "zvariant_utils" -version = "1.1.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00bedb16a193cc12451873fee2a1bc6550225acece0e36f333e68326c73c8172" +checksum = "c51bcff7cc3dbb5055396bcf774748c3dab426b4b8659046963523cee4808340" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.77", ] diff --git a/pkgs/applications/emulators/ruffle/default.nix b/pkgs/applications/emulators/ruffle/default.nix index 0d9e05dc2e86d..55b2ce67fc9b6 100644 --- a/pkgs/applications/emulators/ruffle/default.nix +++ b/pkgs/applications/emulators/ruffle/default.nix @@ -23,7 +23,7 @@ }: let - version = "nightly-2024-05-01"; + version = "nightly-2024-09-12"; in rustPlatform.buildRustPackage { pname = "ruffle"; @@ -33,12 +33,12 @@ rustPlatform.buildRustPackage { owner = "ruffle-rs"; repo = "ruffle"; rev = version; - hash = "sha256-WfoYQku1NFhvWyqeSVKtsMMEyUA97YFD7cvdn4XYIPI="; + hash = "sha256-wvgx6581vvUPb9evvJl328oTP/F8+LhpeHX3vCsHXCc="; }; nativeBuildInputs = [ jre_minimal ] - ++ lib.optionals stdenv.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ glib gsettings-desktop-schemas makeWrapper @@ -46,10 +46,10 @@ rustPlatform.buildRustPackage { python3 wrapGAppsHook3 ] - ++ lib.optionals stdenv.isDarwin [ rustPlatform.bindgenHook ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ rustPlatform.bindgenHook ]; buildInputs = - lib.optionals stdenv.isLinux [ + lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib cairo gtk3 @@ -64,11 +64,11 @@ rustPlatform.buildRustPackage { vulkan-loader udev ] - ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.AppKit ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit ]; dontWrapGApps = true; - preFixup = lib.optionalString stdenv.isLinux '' + preFixup = lib.optionalString stdenv.hostPlatform.isLinux '' patchelf $out/bin/ruffle_desktop \ --add-needed libxkbcommon-x11.so \ --add-needed libwayland-client.so \ @@ -80,7 +80,7 @@ rustPlatform.buildRustPackage { # This name is too generic mv $out/bin/exporter $out/bin/ruffle_exporter '' - + lib.optionalString stdenv.isLinux '' + + lib.optionalString stdenv.hostPlatform.isLinux '' vulkanWrapperArgs+=( --prefix LD_LIBRARY_PATH ':' ${vulkan-loader}/lib ) @@ -98,11 +98,13 @@ rustPlatform.buildRustPackage { cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "flash-lso-0.6.0" = "sha256-sVe53VRtBEEI6eERWRv6aG6BBT31sSLvJ6CSCcif2Lo="; - "h263-rs-0.1.0" = "sha256-EBYZ00axaILGc2CtJoPQpewlf6+jlmml+cXZFyoxhHQ="; - "jpegxr-0.3.1" = "sha256-YbQMi86DXqdi7o0s5ajAv7/vFaxNpShz19cNa9MpOsA="; + "ecolor-0.28.1" = "sha256-X1prQIc3jzmWyEmpfQMgowW2qM1r+2T12Nd7HCsPtpc="; + "flash-lso-0.6.0" = "sha256-X9XYj88GmkPRy+RxvGM6vFdBxif2XYesKtqwwW2DTw4="; + "h263-rs-0.1.0" = "sha256-dyQHnCe7LwwZYlF57sbRzir9vUavN3K8wLhwPIWlmik="; + "jpegxr-0.3.1" = "sha256-03gbXA5T02ofgfRaanaixqfrFpxw/UOOftgKZ7hPHY4="; "nellymoser-rs-0.1.2" = "sha256-66yt+CKaw/QFIPeNkZA2mb9ke64rKcAw/6k/pjNYY04="; "nihav_codec_support-0.1.0" = "sha256-HAJS4I6yyzQzCf+vmaFp1MWXpcUgFAHPxLhfMVXmN1c="; + "rfd-0.14.1" = "sha256-eq4OONgYrtWCogIpjws/1uRxmv3oyIdrimDVaLJ9IMo="; }; }; diff --git a/pkgs/applications/emulators/simh/default.nix b/pkgs/applications/emulators/simh/default.nix deleted file mode 100644 index 74419d500a53e..0000000000000 --- a/pkgs/applications/emulators/simh/default.nix +++ /dev/null @@ -1,67 +0,0 @@ -{ lib, stdenv -, fetchFromGitHub -, SDL2 -, SDL2_ttf -, libpcap -, vde2 -, pcre -}: - -stdenv.mkDerivation rec { - pname = "simh"; - version = "3.11-1"; - - src = fetchFromGitHub { - owner = "simh"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-65+YfOWpVXPeT64TZcSaWJY+ODQ0q/pwF9jb8xGdpIs="; - }; - - buildInputs = [ SDL2 SDL2_ttf libpcap vde2 pcre ]; - - dontConfigure = true; - - # Workaround to build against upstream gcc-10 and clang-11. - # Can be removed when next release contains - # https://github.com/simh/simh/issues/794 - env.NIX_CFLAGS_COMPILE = toString [ "-fcommon" ]; - - makeFlags = [ "GCC=${stdenv.cc.targetPrefix}cc" "CC_STD=-std=c99" "LDFLAGS=-lm" ]; - - preInstall = '' - install -d ${placeholder "out"}/bin - install -d ${placeholder "out"}/share/simh - ''; - - installPhase = '' - runHook preInstall - for i in BIN/*; do - install -D $i ${placeholder "out"}/bin - done - for i in VAX/*bin; do - install -D $i ${placeholder "out"}/share/simh - done - runHook postInstall - ''; - - postInstall = '' - (cd $out/bin; for i in *; do ln -s $i simh-$i; done) - ''; - - meta = with lib; { - homepage = "http://simh.trailing-edge.com/"; - description = "Collection of simulators of historic hardware"; - longDescription = '' - SimH (History Simulator) is a collection of simulators for historically - significant or just plain interesting computer hardware and software from - the past. The goal of the project is to create highly portable system - simulators and to publish them as freeware on the Internet, with freely - available copies of significant or representative software. - ''; - license = with licenses; mit; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = with platforms; unix; - }; -} -# TODO: install documentation diff --git a/pkgs/applications/emulators/simplenes/default.nix b/pkgs/applications/emulators/simplenes/default.nix index 5fba8b5376e92..061717d5c6560 100644 --- a/pkgs/applications/emulators/simplenes/default.nix +++ b/pkgs/applications/emulators/simplenes/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/amhndu/SimpleNES"; description = "NES emulator written in C++"; license = licenses.gpl3; - maintainers = with maintainers; [ ivar ]; + maintainers = [ ]; platforms = platforms.linux; mainProgram = "SimpleNES"; }; diff --git a/pkgs/applications/emulators/tamatool/default.nix b/pkgs/applications/emulators/tamatool/default.nix index 04e5452bf72d5..82cd8e9a25289 100644 --- a/pkgs/applications/emulators/tamatool/default.nix +++ b/pkgs/applications/emulators/tamatool/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { libpng SDL2 SDL2_image - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation ]; diff --git a/pkgs/applications/emulators/tiny8086/default.nix b/pkgs/applications/emulators/tiny8086/default.nix deleted file mode 100644 index a3dc3c07265c8..0000000000000 --- a/pkgs/applications/emulators/tiny8086/default.nix +++ /dev/null @@ -1,69 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, localBios ? true -, nasm -, sdlSupport ? true -, SDL -}: - -stdenv.mkDerivation rec { - pname = "8086tiny"; - version = "1.25"; - - src = fetchFromGitHub { - owner = "adriancable"; - repo = pname; - rev = "c79ca2a34d96931d55ef724c815b289d0767ae3a"; - sha256 = "00aydg8f28sgy8l3rd2a7jvp56lx3b63hhak43p7g7vjdikv495w"; - }; - - buildInputs = lib.optional localBios nasm - ++ lib.optional sdlSupport SDL; - - makeFlags = [ "8086tiny" ]; - - postBuild = lib.optionalString localBios '' - pushd bios_source - nasm -f bin bios.asm -o bios - popd - ''; - - installPhase = '' - runHook preInstall - - mkdir -p $out/bin $out/share/8086tiny $out/share/doc/8086tiny/images - install -m 755 8086tiny $out/bin - install -m 644 fd.img $out/share/8086tiny/8086tiny-floppy.img - install -m 644 bios_source/bios.asm $out/share/8086tiny/8086tiny-bios-src.asm - install -m 644 docs/8086tiny.css $out/share/doc/8086tiny - install -m 644 docs/doc.html $out/share/doc/$name - - for image in docs/images/\*.gif; do - install -m 644 $image $out/share/doc/8086tiny/images - done - - install -m 644 ${lib.optionalString localBios "bios_source/"}bios \ - $out/share/8086tiny/8086tiny-bios - - runHook postInstall - ''; - - meta = with lib; { - homepage = "https://github.com/adriancable/8086tiny"; - description = "Open-source small 8086 emulator"; - longDescription = '' - 8086tiny is a tiny, open-source (MIT), portable (little-endian hosts) - Intel PC emulator, powerful enough to run DOS, Windows 3.0, Excel, MS - Flight Simulator, AutoCAD, Lotus 1-2-3, and similar applications. 8086tiny - emulates a "late 80's era" PC XT-type machine. - - 8086tiny is based on an IOCCC 2013 winning entry. In fact that is the - "unobfuscated" version :) - ''; - license = licenses.mit; - maintainers = [ maintainers.AndersonTorres ]; - platforms = platforms.linux; - mainProgram = "8086tiny"; - }; -} diff --git a/pkgs/applications/emulators/tinyemu/default.nix b/pkgs/applications/emulators/tinyemu/default.nix deleted file mode 100644 index 31dbfc9c23db6..0000000000000 --- a/pkgs/applications/emulators/tinyemu/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ lib -, stdenv -, fetchurl -, SDL -, curl -, openssl -}: - -stdenv.mkDerivation rec { - pname = "tinyemu"; - version = "2019-12-21"; - - src = fetchurl { - url = "https://bellard.org/tinyemu/${pname}-${version}.tar.gz"; - hash = "sha256-voNR8hIYGbMXL87c5csYJvoSyH2ht+2Y8mnT6AKgVVU="; - }; - - buildInputs = [ - SDL - curl - openssl - ]; - - makeFlags = [ - "CC:=$(CC)" - "STRIP:=$(STRIP)" - "DESTDIR=$(out)" - "bindir=/bin" - ]; - - preInstall = '' - mkdir -p "$out/bin" - ''; - - meta = with lib; { - homepage = "https://bellard.org/tinyemu/"; - description = "System emulator for the RISC-V and x86 architectures"; - longDescription = '' - TinyEMU is a system emulator for the RISC-V and x86 architectures. Its - purpose is to be small and simple while being complete. - ''; - license = with licenses; [ mit bsd2 ]; - maintainers = with maintainers; [ jhhuh AndersonTorres ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/emulators/vbam/default.nix b/pkgs/applications/emulators/vbam/default.nix index b5141c59f91ea..b1916a86867a6 100644 --- a/pkgs/applications/emulators/vbam/default.nix +++ b/pkgs/applications/emulators/vbam/default.nix @@ -19,12 +19,12 @@ stdenv.mkDerivation rec { pname = "visualboyadvance-m"; - version = "2.1.9"; + version = "2.1.11"; src = fetchFromGitHub { owner = "visualboyadvance-m"; repo = "visualboyadvance-m"; rev = "v${version}"; - sha256 = "sha256-t5/CM5KXDG0OCByu7mUyuC5NkYmB3BFmEHHgnMY05nE="; + sha256 = "sha256-OtJ632H449kPRY1i4Ydlcc1tgG00Mv622KrCyJ80OF4="; }; nativeBuildInputs = [ cmake pkg-config wrapGAppsHook3 ]; diff --git a/pkgs/applications/emulators/wine/base.nix b/pkgs/applications/emulators/wine/base.nix index dfc72683d7d3b..cff069a2e75c9 100644 --- a/pkgs/applications/emulators/wine/base.nix +++ b/pkgs/applications/emulators/wine/base.nix @@ -23,7 +23,7 @@ let }; } ./setup-hook-darwin.sh; - darwinFrameworks = lib.optionals stdenv.isDarwin ( + darwinFrameworks = lib.optionals stdenv.hostPlatform.isDarwin ( toBuildInputs pkgArches (pkgs: with pkgs.buildPackages.darwin.apple_sdk.frameworks; [ CoreServices Foundation ForceFeedback AppKit OpenGL IOKit DiskArbitration PCSC Security ApplicationServices AudioToolbox CoreAudio AudioUnit CoreMIDI OpenCL Cocoa Carbon @@ -40,7 +40,7 @@ let in stdenv.mkDerivation (finalAttrs: lib.optionalAttrs (buildScript != null) { builder = buildScript; } -// lib.optionalAttrs stdenv.isDarwin { +// lib.optionalAttrs stdenv.hostPlatform.isDarwin { postBuild = '' # The Wine preloader must _not_ be linked to any system libraries, but `NIX_LDFLAGS` will link # to libintl, libiconv, and CoreFoundation no matter what. Delete the one that was built and @@ -68,12 +68,12 @@ lib.optionalAttrs (buildScript != null) { builder = buildScript; } pkg-config ] ++ lib.optionals supportFlags.mingwSupport (mingwGccs - ++ lib.optional stdenv.isDarwin setupHookDarwin); + ++ lib.optional stdenv.hostPlatform.isDarwin setupHookDarwin); buildInputs = toBuildInputs pkgArches (with supportFlags; (pkgs: [ pkgs.freetype pkgs.perl pkgs.libunwind ] - ++ lib.optional stdenv.isLinux pkgs.libcap - ++ lib.optional stdenv.isDarwin pkgs.libinotify-kqueue + ++ lib.optional stdenv.hostPlatform.isLinux pkgs.libcap + ++ lib.optional stdenv.hostPlatform.isDarwin pkgs.libinotify-kqueue ++ lib.optional cupsSupport pkgs.cups ++ lib.optional gettextSupport pkgs.gettext ++ lib.optional dbusSupport pkgs.dbus @@ -92,7 +92,7 @@ lib.optionalAttrs (buildScript != null) { builder = buildScript; } ++ lib.optional pulseaudioSupport pkgs.libpulseaudio ++ lib.optional (xineramaSupport && x11Support) pkgs.xorg.libXinerama ++ lib.optional udevSupport pkgs.udev - ++ lib.optional vulkanSupport (if stdenv.isDarwin then moltenvk else pkgs.vulkan-loader) + ++ lib.optional vulkanSupport (if stdenv.hostPlatform.isDarwin then moltenvk else pkgs.vulkan-loader) ++ lib.optional sdlSupport pkgs.SDL2 ++ lib.optional usbSupport pkgs.libusb1 ++ lib.optionals gstreamerSupport (with pkgs.gst_all_1; @@ -100,13 +100,13 @@ lib.optionalAttrs (buildScript != null) { builder = buildScript; } ++ lib.optionals gtkSupport [ pkgs.gtk3 pkgs.glib ] ++ lib.optionals openclSupport [ pkgs.opencl-headers pkgs.ocl-icd ] ++ lib.optionals tlsSupport [ pkgs.openssl pkgs.gnutls ] - ++ lib.optionals (openglSupport && !stdenv.isDarwin) [ pkgs.libGLU pkgs.libGL pkgs.mesa.osmesa pkgs.libdrm ] - ++ lib.optionals stdenv.isDarwin darwinFrameworks + ++ lib.optionals (openglSupport && !stdenv.hostPlatform.isDarwin) [ pkgs.libGLU pkgs.libGL pkgs.mesa.osmesa pkgs.libdrm ] + ++ lib.optionals stdenv.hostPlatform.isDarwin darwinFrameworks ++ lib.optionals (x11Support) (with pkgs.xorg; [ libX11 libXcomposite libXcursor libXext libXfixes libXi libXrandr libXrender libXxf86vm ]) ++ lib.optionals waylandSupport (with pkgs; [ - wayland libxkbcommon wayland-protocols wayland.dev libxkbcommon.dev + wayland wayland-scanner libxkbcommon wayland-protocols wayland.dev libxkbcommon.dev mesa # for libgbm ]))); @@ -115,7 +115,7 @@ lib.optionalAttrs (buildScript != null) { builder = buildScript; } configureFlags = prevConfigFlags ++ lib.optionals supportFlags.waylandSupport [ "--with-wayland" ] ++ lib.optionals supportFlags.vulkanSupport [ "--with-vulkan" ] - ++ lib.optionals ((stdenv.isDarwin && !supportFlags.xineramaSupport) || !supportFlags.x11Support) [ "--without-x" ]; + ++ lib.optionals ((stdenv.hostPlatform.isDarwin && !supportFlags.xineramaSupport) || !supportFlags.x11Support) [ "--without-x" ]; # Wine locates a lot of libraries dynamically through dlopen(). Add # them to the RPATH so that the user doesn't have to set them in @@ -176,7 +176,7 @@ lib.optionalAttrs (buildScript != null) { builder = buildScript; } # https://bugs.winehq.org/show_bug.cgi?id=43530 # https://github.com/NixOS/nixpkgs/issues/31989 - hardeningDisable = [ "bindnow" ] + hardeningDisable = [ "bindnow" "stackclashprotection" ] ++ lib.optional (stdenv.hostPlatform.isDarwin) "fortify" ++ lib.optional (supportFlags.mingwSupport) "format"; diff --git a/pkgs/applications/emulators/wine/default.nix b/pkgs/applications/emulators/wine/default.nix index 69706dcfd7206..8c8ebdea5878c 100644 --- a/pkgs/applications/emulators/wine/default.nix +++ b/pkgs/applications/emulators/wine/default.nix @@ -35,7 +35,7 @@ vulkanSupport ? false, sdlSupport ? false, usbSupport ? false, - mingwSupport ? false, + mingwSupport ? stdenv.hostPlatform.isDarwin, waylandSupport ? false, x11Support ? false, embedInstallers ? false, # The Mono and Gecko MSI installers diff --git a/pkgs/applications/emulators/wine/sources.nix b/pkgs/applications/emulators/wine/sources.nix index 9abb44fd61a4e..cf517bfc0f1a6 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.18"; url = "https://dl.winehq.org/wine/source/9.x/wine-${version}.tar.xz"; - hash = "sha256-36AMJk6nEWnQKoSagz5Iyudh+whCKgDfhkTr1nv4ckA="; + hash = "sha256-ZSb1IRwIVFO8tkKUbrLOjR1CqKSmgWi/Kg1z8yYS3Rw="; 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.3.0"; url = "https://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}-x86.msi"; - hash = "sha256-igoeaDe0lN9Jkn5ddZscaQjom4ovjjrQJeHCiBiCR24="; + hash = "sha256-bKLArtCW/57CD69et2xrfX3oLZqIdax92fB5O/nD/TA="; }; 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-m3tuwb6OFcgZ/NATixIH1j3YgrzsREJNpnVbevN/9FY="; domain = "gitlab.winehq.org"; owner = "wine"; repo = "wine-staging"; diff --git a/pkgs/applications/emulators/wine/staging.nix b/pkgs/applications/emulators/wine/staging.nix index 56525d4fa0674..634964fb75330 100644 --- a/pkgs/applications/emulators/wine/staging.nix +++ b/pkgs/applications/emulators/wine/staging.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, callPackage, autoconf, hexdump, perl, python3, wineUnstable }: +{ lib, stdenv, callPackage, autoconf, hexdump, perl, python3, wineUnstable, gitMinimal }: with callPackage ./util.nix {}; @@ -8,8 +8,8 @@ let patch = (callPackage ./sources.nix {}).staging; in assert lib.versions.majorMinor wineUnstable.version == lib.versions.majorMinor patch.version; (wineUnstable.override { wineRelease = "staging"; }).overrideAttrs (self: { - buildInputs = build-inputs ([ "perl" "autoconf" "gitMinimal" ] ++ lib.optional stdenv.isLinux "util-linux") self.buildInputs; - nativeBuildInputs = [ autoconf hexdump perl python3 ] ++ self.nativeBuildInputs; + buildInputs = build-inputs ([ "perl" "autoconf" "gitMinimal" ] ++ lib.optional stdenv.hostPlatform.isLinux "util-linux") self.buildInputs; + nativeBuildInputs = [ autoconf hexdump perl python3 gitMinimal ] ++ self.nativeBuildInputs; prePatch = self.prePatch or "" + '' patchShebangs tools diff --git a/pkgs/applications/emulators/xcpc/default.nix b/pkgs/applications/emulators/xcpc/default.nix index d2d946c400fd1..d5a2a6a50fe1f 100644 --- a/pkgs/applications/emulators/xcpc/default.nix +++ b/pkgs/applications/emulators/xcpc/default.nix @@ -3,7 +3,6 @@ , motifSupport ? false, lesstif }: -with lib; stdenv.mkDerivation rec { version = "20070122"; pname = "xcpc"; @@ -16,10 +15,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib libdsk libXaw libX11 libXext ] - ++ optional libDSKSupport libdsk - ++ optional motifSupport lesstif; + ++ lib.optional libDSKSupport libdsk + ++ lib.optional motifSupport lesstif; - meta = { + meta = with lib; { description = "Portable Amstrad CPC 464/664/6128 emulator written in C"; homepage = "https://www.xcpc-emulator.net"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/emulators/yabause/default.nix b/pkgs/applications/emulators/yabause/default.nix index 53fcc870f1a16..7623cc49efb9a 100644 --- a/pkgs/applications/emulators/yabause/default.nix +++ b/pkgs/applications/emulators/yabause/default.nix @@ -1,5 +1,5 @@ { mkDerivation, lib, fetchurl, cmake, pkg-config, qtbase, qt5, libGLU, libGL -, freeglut ? null, openal ? null, SDL2 ? null }: +, libglut ? null, openal ? null, SDL2 ? null }: mkDerivation rec { pname = "yabause"; @@ -11,7 +11,7 @@ mkDerivation rec { }; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ qtbase qt5.qtmultimedia libGLU libGL freeglut openal SDL2 ]; + buildInputs = [ qtbase qt5.qtmultimedia libGLU libGL libglut openal SDL2 ]; patches = [ ./linkage-rwx-linux-elf.patch diff --git a/pkgs/applications/emulators/yapesdl/default.nix b/pkgs/applications/emulators/yapesdl/default.nix deleted file mode 100644 index 652b2cff3488e..0000000000000 --- a/pkgs/applications/emulators/yapesdl/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, pkg-config -, SDL2 -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "yapesdl"; - version = "0.71.2"; - - src = fetchFromGitHub { - owner = "calmopyrin"; - repo = "yapesdl"; - rev = "v${finalAttrs.version}"; - hash = "sha256-QGF3aS/YSzdGxHONKyA/iTewEVYsjBAsKARVMXkFV2k="; - }; - - nativeBuildInputs = [ - pkg-config - ]; - - buildInputs = [ - SDL2 - ]; - - makeFlags = [ "CC=${stdenv.cc.targetPrefix}c++" ]; - - installPhase = '' - runHook preInstall - install -Dm755 yapesdl -t $out/bin/ - install -Dm755 README.SDL -t $out/share/doc/yapesdl/ - runHook postInstall - ''; - - meta = { - homepage = "http://yape.plus4.net/"; - description = "Multiplatform Commodore 64 and 264 family emulator"; - license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ AndersonTorres ]; - platforms = lib.platforms.unix; - broken = stdenv.isDarwin; - mainProgram = "yapesdl"; - }; -}) diff --git a/pkgs/applications/file-managers/browsr/default.nix b/pkgs/applications/file-managers/browsr/default.nix index ba88f782ef657..435577aa567b8 100644 --- a/pkgs/applications/file-managers/browsr/default.nix +++ b/pkgs/applications/file-managers/browsr/default.nix @@ -6,19 +6,18 @@ python3.pkgs.buildPythonApplication rec { pname = "browsr"; - version = "1.19.0"; + version = "1.21.0"; pyproject = true; src = fetchFromGitHub { owner = "juftin"; repo = "browsr"; rev = "refs/tags/v${version}"; - hash = "sha256-V5B+/zfUlpF0TMTHqzyjapW93/DoJKgbJkTMX2NZyIQ="; + hash = "sha256-76OzJOunZRVSGalQiyX+TSukD8rRIFHxA713NqOn3PY="; }; nativeBuildInputs = with python3.pkgs; [ hatchling - pythonRelaxDepsHook ]; propagatedBuildInputs = with python3.pkgs; [ @@ -33,9 +32,9 @@ python3.pkgs.buildPythonApplication rec { rich-pixels textual textual-universal-directorytree - ] ++ lib.attrVals extras passthru.optional-dependencies; + ] ++ lib.attrVals extras optional-dependencies; - passthru.optional-dependencies = with python3.pkgs; { + optional-dependencies = with python3.pkgs; { all = [ pyarrow textual-universal-directorytree.optional-dependencies.remote @@ -57,6 +56,7 @@ python3.pkgs.buildPythonApplication rec { "art" "pandas" "pymupdf" + "pyperclip" "rich-click" "rich-pixels" "rich" @@ -85,7 +85,7 @@ python3.pkgs.buildPythonApplication rec { description = "File explorer in your terminal"; mainProgram = "browsr"; homepage = "https://juftin.com/browsr"; - changelog = "https://github.com/juftin/browsr/releases/tag/${src.rev}"; + changelog = "https://github.com/juftin/browsr/releases/tag/${lib.removePrefix "refs/tags/" src.rev}"; license = licenses.mit; maintainers = with maintainers; [ figsoda ]; }; diff --git a/pkgs/applications/file-managers/clifm/default.nix b/pkgs/applications/file-managers/clifm/default.nix index cd263dd2e851a..f24445f2a6d23 100644 --- a/pkgs/applications/file-managers/clifm/default.nix +++ b/pkgs/applications/file-managers/clifm/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "clifm"; - version = "1.19"; + version = "1.20"; src = fetchFromGitHub { owner = "leo-arch"; repo = pname; rev = "v${version}"; - hash = "sha256-QNxEvFZ5e4jQV2Tv2/D9KPRDoCoQlrqStFnbKVgcXxg="; + hash = "sha256-TKQxNl+RTPQAE7mMALugm3rg8mPZq3eD/uW23DLws8I="; }; buildInputs = [ diff --git a/pkgs/applications/file-managers/lf/default.nix b/pkgs/applications/file-managers/lf/default.nix index 5e6c09b89c89e..9bbe32fd298e2 100644 --- a/pkgs/applications/file-managers/lf/default.nix +++ b/pkgs/applications/file-managers/lf/default.nix @@ -24,7 +24,7 @@ buildGoModule rec { # Force the use of the pure-go implementation of the os/user library. # Relevant issue: https://github.com/gokcehan/lf/issues/191 - tags = lib.optionals (!stdenv.isDarwin) [ "osusergo" ]; + tags = lib.optionals (!stdenv.hostPlatform.isDarwin) [ "osusergo" ]; postInstall = '' install -D --mode=444 lf.desktop $out/share/applications/lf.desktop diff --git a/pkgs/applications/file-managers/mc/default.nix b/pkgs/applications/file-managers/mc/default.nix index 08bfe6205fdef..1644da02ed2fd 100644 --- a/pkgs/applications/file-managers/mc/default.nix +++ b/pkgs/applications/file-managers/mc/default.nix @@ -24,11 +24,11 @@ stdenv.mkDerivation rec { pname = "mc"; - version = "4.8.31"; + version = "4.8.32"; src = fetchurl { url = "https://www.midnight-commander.org/downloads/${pname}-${version}.tar.xz"; - sha256 = "sha256-JBkc+GZ2dbjjH8Sp0YoKZb3AWYwsXE6gkklM0Tq0qxo="; + hash = "sha256-TdyD0e3pryNjs+q5h/VLh89mGTJBEM4tOg5wlE0TWf4="; }; nativeBuildInputs = [ pkg-config unzip ] @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { slang zip ] ++ lib.optionals x11Support [ libX11 ] - ++ lib.optionals (!stdenv.isDarwin) [ e2fsprogs gpm ]; + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ e2fsprogs gpm ]; enableParallelBuilding = true; @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { --replace /bin/rm ${coreutils}/bin/rm ''; - postFixup = lib.optionalString ((!stdenv.isDarwin) && x11Support) '' + postFixup = lib.optionalString ((!stdenv.hostPlatform.isDarwin) && x11Support) '' # libX11.so is loaded dynamically so autopatch doesn't detect it patchelf \ --add-needed ${libX11}/lib/libX11.so \ diff --git a/pkgs/applications/file-managers/mucommander/default.nix b/pkgs/applications/file-managers/mucommander/default.nix index 308035b094a17..0a6ca746caee7 100644 --- a/pkgs/applications/file-managers/mucommander/default.nix +++ b/pkgs/applications/file-managers/mucommander/default.nix @@ -2,20 +2,22 @@ , stdenv , fetchFromGitHub , gradle_7 -, perl , makeWrapper -, writeText , jdk , gsettings-desktop-schemas }: let + gradle = gradle_7; +in +stdenv.mkDerivation (finalAttrs: { + pname = "mucommander"; version = "1.3.0-1"; src = fetchFromGitHub { owner = "mucommander"; repo = "mucommander"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-rSHHv96L2EHQuKBSAdpfi1XGP2u9o2y4g1+65FHWFMw="; }; @@ -23,72 +25,19 @@ let # there is no .git anyway substituteInPlace build.gradle \ --replace "git = grgit.open(dir: project.rootDir)" "" \ - --replace "id 'org.ajoberstar.grgit' version '3.1.1'" "" \ - --replace "revision = git.head().id" "revision = '${version}'" + --replace "revision = git.head().id" "revision = '${finalAttrs.version}'" ''; - # fake build to pre-download deps into fixed-output derivation - deps = stdenv.mkDerivation { - pname = "mucommander-deps"; - inherit version src postPatch; - nativeBuildInputs = [ gradle_7 perl ]; - buildPhase = '' - export GRADLE_USER_HOME=$(mktemp -d) - gradle --no-daemon tgz - ''; - # perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar) - # reproducible by sorting - installPhase = '' - find $GRADLE_USER_HOME/caches/modules-2 -type f -regex '.*\.\(jar\|pom\)' \ - | LC_ALL=C sort \ - | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \ - | sh - # copy maven-metadata.xml for commons-codec - # thankfully there is only one xml - cp $GRADLE_USER_HOME/caches/modules-2/resources-2.1/*/*/maven-metadata.xml $out/commons-codec/commons-codec/maven-metadata.xml - ''; - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = "sha256-9tCcUg7hDNbkZiQEWtVRsUUfms73aU+vt5tQsfknM+E="; - }; + nativeBuildInputs = [ gradle makeWrapper ]; -in -stdenv.mkDerivation rec { - pname = "mucommander"; - inherit version src postPatch; - nativeBuildInputs = [ gradle_7 perl makeWrapper ]; - - # Point to our local deps repo - gradleInit = writeText "init.gradle" '' - logger.lifecycle 'Replacing Maven repositories with ${deps}...' - gradle.projectsLoaded { - rootProject.allprojects { - buildscript { - repositories { - clear() - maven { url '${deps}' } - } - } - repositories { - clear() - maven { url '${deps}' } - } - } - } - settingsEvaluated { settings -> - settings.pluginManagement { - repositories { - maven { url '${deps}' } - } - } - } - ''; + mitmCache = gradle.fetchDeps { + inherit (finalAttrs) pname; + data = ./deps.json; + }; - buildPhase = '' - export GRADLE_USER_HOME=$(mktemp -d) + __darwinAllowLocalNetworking = true; - gradle --offline --init-script ${gradleInit} --no-daemon tgz - ''; + gradleBuildTask = "tgz"; installPhase = '' mkdir -p $out/share/mucommander @@ -107,4 +56,4 @@ stdenv.mkDerivation rec { platforms = platforms.all; mainProgram = "mucommander"; }; -} +}) diff --git a/pkgs/applications/file-managers/mucommander/deps.json b/pkgs/applications/file-managers/mucommander/deps.json new file mode 100644 index 0000000000000..264328bca01d8 --- /dev/null +++ b/pkgs/applications/file-managers/mucommander/deps.json @@ -0,0 +1,1064 @@ +{ + "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", + "!version": 1, + "https://packages.jetbrains.team/maven/p/ij/intellij-dependencies/org/jetbrains": { + "jediterm#jediterm-core/3.17": { + "jar": "sha256-H+W44u9O07KMjsN6RQeX4X/XrD55JPlo7x1It5dvja8=", + "pom": "sha256-Q90WihOSMfQwY4TrVl5a6t9m23kKyvs8ZdF/clKpcug=" + }, + "jediterm#jediterm-ui/3.17": { + "jar": "sha256-7NUda5rQJjnDi+xq60mXwZKHj3i2/DCoBzzQSFT2Vhw=", + "pom": "sha256-Cc/AVJs6u5eNfJiBkAk4+/reuzup4Xl1LjvOtLXf3cg=" + }, + "pty4j#purejavacomm/0.0.11.1": { + "jar": "sha256-McBIqGBX4HJyQpqibpBxPtvelq+XRzYvJ0cNjoajmKM=", + "pom": "sha256-x/2ePzjDduHwyb3HGm+NWKz6ytqK/sF99dbjjadR02s=" + } + }, + "https://plugins.gradle.org/m2": { + "com/athaydes/osgi-run#com.athaydes.osgi-run.gradle.plugin/1.6.0": { + "pom": "sha256-+xykaSPbBh7wPQYefKAvJmXT/HIz/B/NDrsFqpZPDLk=" + }, + "edu/sc/seis/launch4j#edu.sc.seis.launch4j.gradle.plugin/2.5.4": { + "pom": "sha256-0kiTtasyoeS0aMK/2OoTMqA9qBFFhgpuz3e/bM6fE6c=" + }, + "edu/sc/seis/launch4j#launch4j/2.5.4": { + "jar": "sha256-ItJxFUklmcsCnJcoo1nKPuEHXuoMVNMCLP9l8CNB734=", + "module": "sha256-36qMMXxT12p0b8RM8T8onfxF/6dx1e9gRkinCOMv8bA=", + "pom": "sha256-x3C0urW9xQxP3xKUkCBdFmfYKEwGLK5wS7vGy2xXKv8=" + }, + "gradle/plugin/com/athaydes/gradle/osgi#osgi-run-core/1.6.0": { + "jar": "sha256-aL4xq5FzCujxcNdLADLLdjwNGLRrInpyGfcA3NXJIig=", + "pom": "sha256-WrXeDFsFM5qb4YtafXw/nW/ubTYi+uYoMmM3qvntAsc=" + }, + "org/ajoberstar/grgit#org.ajoberstar.grgit.gradle.plugin/5.0.0": { + "pom": "sha256-cszQAN0OuVBwDurgtOkLouUb/LdE6FZiggM0cuVqqyA=" + } + }, + "https://repo.maven.apache.org/maven2": { + "ant#ant/1.6.5": { + "jar": "sha256-8GpgHHGKfJJi10t+w7qtFMglhOiSNQibT4IdakTZ4eQ=", + "pom": "sha256-b83RPYGzLw7byJCBHS9z1HU7ZebkKe3QByxBYP4Hd0A=" + }, + "avalon-framework#avalon-framework/4.1.5": { + "jar": "sha256-gz8eUN+mKPE9SkIGs+xtj0LpYoSjXXbActiAgEt0egQ=", + "pom": "sha256-WsHHwtsp/rJWj1xxlZpsCKbEHgZZsSa/owisdCHyysg=" + }, + "biz/aQute/bnd#biz.aQute.bnd.embedded-repo/6.4.0": { + "jar": "sha256-G9LIOa4YEoDsBrXCBRuE+sf1mZagUZQOGk24RtvG828=", + "pom": "sha256-677wPInYJxwp7I2b7oZWCG+D5M273AKTUtcBWk/mMNk=" + }, + "biz/aQute/bnd#biz.aQute.bnd.gradle/6.4.0": { + "jar": "sha256-lakUFc2tA0LJJb97sDgwVye9TU1+MSLScClC/zWbCTo=", + "pom": "sha256-IhATjNEm8dfAKe0waawigmXckZfw3XSjyESPKwoXIpQ=" + }, + "biz/aQute/bnd#biz.aQute.bnd.util/6.4.0": { + "jar": "sha256-ZbW9Sg+rFoEvGADJj/dKA483o4v+iZrzgu/tTv3B4+E=", + "pom": "sha256-o9QfkwNfFvSai1AFrNPQlrfzJoagUVMNmhiuzT25DCE=" + }, + "biz/aQute/bnd#biz.aQute.bndlib/6.4.0": { + "jar": "sha256-NXFFB0hy+dv2fmKfzSN+YVJwflddc130U1KC+fWI0tg=", + "pom": "sha256-6jk7yLU4PHFhu+XjqqjPvQCzZkR1GiI4VaTJAEumrZw=" + }, + "biz/aQute/bnd#biz.aQute.repository/6.4.0": { + "jar": "sha256-0k3V0QvZ5gZ2FlJzpq6NWsYS4d/Mm4w0kSCWeciBL/U=", + "pom": "sha256-++slSN+o3ttLLtBwWu6vImqbriDrDwJdxHuKb366iXo=" + }, + "biz/aQute/bnd#biz.aQute.resolve/6.4.0": { + "jar": "sha256-wxf5KC5I2FlOK5d0mYbS2WX7vaYMO4MModjDcS14p+g=", + "pom": "sha256-290Wg307M+k0i/9KhTgPuiee4UapzAI6Ch9zm2y0FY4=" + }, + "ch/qos/logback#logback-classic/1.2.3": { + "jar": "sha256-+1P4U55/y48JOlbhOBEgVuwdyAnrsCC1nYo2peusN+A=", + "pom": "sha256-oFHrGiVIuTyZq8qOtx1cddL/BpdmgpYDSBJLxJAaUxU=" + }, + "ch/qos/logback#logback-core/1.2.3": { + "jar": "sha256-WUbYN/5vlgwCpT7aemkm7MPHWLvdaapFPuQp+FghfyI=", + "pom": "sha256-301xgexRZVuqqrBnlxGA12gWQ93SdBOfDDB426FOl+A=" + }, + "ch/qos/logback#logback-parent/1.2.3": { + "pom": "sha256-ec0CHa/HsCVdPN0/1wy6pjjfc5lXSaNI7oLEVjXqsmo=" + }, + "com/athaydes/osgiaas#osgiaas-cli-api/0.7": { + "jar": "sha256-/5g6U3a4GDCkAx8njhnvjSVd9MvFWDeaMUk/p0EGMMI=", + "pom": "sha256-LniyokqUSW72hNIUFWrGA0dLheNWLd1nW78X3PiJpLE=" + }, + "com/athaydes/osgiaas#osgiaas-cli-core/0.7": { + "jar": "sha256-+29PYDq4B/TjvN0XF7w9+GAcFlu7aY0pOuEvDogMIYU=", + "pom": "sha256-6dAawLpzKBVYwK74apiVGiC5PLnJUcdx44BPf+yWGgY=" + }, + "com/athaydes/osgiaas#osgiaas-common/0.7": { + "jar": "sha256-IAZKBz8SHtQkqOCKDUdjquTTQLK+alIGhjGz3Q4/uGw=", + "pom": "sha256-aN9UOc4DQls8eDzZ4qQTt96gJmIes2WReU5kgJXArK8=" + }, + "com/beust#jcommander/1.64": { + "jar": "sha256-FWvnNhmcmQMh2f93CQsZlinPyYZeLWwT980pG7FkGBc=", + "pom": "sha256-F84MMunPlTZ4+CCuXyrZLu85bYQPZn/JnyOtwK0l0yg=" + }, + "com/beust#jcommander/1.82": { + "jar": "sha256-3urBV8jeaCKHjYXQx7yEZ6GcyEhNN3iPeATwOd3igLE=", + "module": "sha256-k2oti84PhNoYUA9OEZSIuTEG26qDuEYv6Za80OHDixY=", + "pom": "sha256-JGNEFwtRO4Acz4EiNNThMkoPbtKoHpCqYYkTtmucwXM=" + }, + "com/dropbox/core#dropbox-core-sdk/5.2.0": { + "jar": "sha256-uo+xxTATiLSzM6JgT4hlVLJ/ATFdRsRhMfoSifMMfYA=", + "module": "sha256-U7JRv2oYUiiMl7Qzr2BdyIjmOf/EgK4jkrdhMAHaA1A=", + "pom": "sha256-MirGoEbZW6GKmqjZidQ74DYgM1JPVz+b5wiQ6oop4Bc=" + }, + "com/fasterxml#oss-parent/25": { + "pom": "sha256-3EFgl7m8Tv6JbcJWewbKuGqTZ4bSNuyyhM4t2GBymkA=" + }, + "com/fasterxml#oss-parent/33": { + "pom": "sha256-xUNwlkz8ziMZvZqF9eFPUAyFGJia5WsbR13xs0i3MQg=" + }, + "com/fasterxml#oss-parent/38": { + "pom": "sha256-yD+PRd/cqNC2s2YcYLP4R4D2cbEuBvka1dHBodH5Zug=" + }, + "com/fasterxml/jackson#jackson-base/2.10.0": { + "pom": "sha256-r5dC9EUhQ/GySYSfgioZ84drb40wyufDVeu0oopIPQ4=" + }, + "com/fasterxml/jackson#jackson-base/2.9.6": { + "pom": "sha256-+81gnH4GPoOzDc5YVVsj3uPlGdwAqqx0ceUrQUCRcyk=" + }, + "com/fasterxml/jackson#jackson-bom/2.10.0": { + "pom": "sha256-LDGTpqe7yfycHmh8jwWtuWM7q8qAd6puqu4ZDYbhTVk=" + }, + "com/fasterxml/jackson#jackson-bom/2.9.6": { + "pom": "sha256-9BOCmOts2HKgOORiRoAxqGA6p4SC6aIjnJFy81ci8Pg=" + }, + "com/fasterxml/jackson#jackson-parent/2.10": { + "pom": "sha256-pQ24CCnE+JfG0OfpVHLLtDsOvs4TWmjjnCe4pv4z5IE=" + }, + "com/fasterxml/jackson#jackson-parent/2.7": { + "pom": "sha256-OJQmHGTKZDJFHjNRM9UCFgwRtXwqaVqyEgmg7113+Hs=" + }, + "com/fasterxml/jackson#jackson-parent/2.9.1.1": { + "pom": "sha256-IlykrxyJWrSEXPLSn9WsUOU4s1OAXnW7K3Shs7nYa8U=" + }, + "com/fasterxml/jackson/core#jackson-annotations/2.10.0": { + "jar": "sha256-d6CEYhl3SoJpvBs4zAApSQjTTnf4qdo02XZzmC91hT0=", + "pom": "sha256-FLGqxIj74H7Oqug/X8ppId8ETUX8hejG7DsW5zQ42tg=" + }, + "com/fasterxml/jackson/core#jackson-core/2.10.0": { + "jar": "sha256-aedpWx5Ag0+hJC/DKKQBBgeRHO03Bqt5q8dp1FEZdRM=", + "pom": "sha256-rZo5sYeQgaVlVuUCd2742RD5BHMfhlXFJoH/882kr54=" + }, + "com/fasterxml/jackson/core#jackson-core/2.7.9": { + "jar": "sha256-vZByFCC7iZqXTtCaEH/vQsqMx8jgVXYvbIFXYTLlu8U=", + "pom": "sha256-Y5RpKyntD9jelAX/5gr0cCz0JLMkcSXqyxUxv6olHWw=" + }, + "com/fasterxml/jackson/core#jackson-core/2.9.6": { + "jar": "sha256-+rh0au3WQneI7jkOoE1DjsFBv/frNHb4vdXZEQ+ycYo=", + "pom": "sha256-fd0tyP0KY04n4wapqoVJWczEckV5dijFC8g3F3WkLjI=" + }, + "com/fasterxml/jackson/core#jackson-databind/2.10.0": { + "jar": "sha256-jmxWbGf8YalsXfxKcdQw8lZXZXeOyabvIWxUYKmRG2A=", + "pom": "sha256-kAdHbEZ6U59DnFEiWw9s1MTiNNZ93pKaICEYZhAmkic=" + }, + "com/fifesoft#rsyntaxtextarea/3.3.3": { + "jar": "sha256-BtzbujMTN/g1cBWAYe9JdFMTG6yAyFbscRQs1d1WSfo=", + "module": "sha256-gyR4XKxJ1K0GLZU5wpS+WGeWO9uhkazgLqsFGiuSEQU=", + "pom": "sha256-vPdSvzOppTP6qTd0XtOOdhbbVWWV7Doqsbeny0P5e8I=" + }, + "com/formdev#flatlaf/1.0": { + "jar": "sha256-E12NWsOf7CnZs/9SyzBybT+XawaYYVvjJTT9eSTynsc=", + "module": "sha256-dStur7AL/wRCGXCYLcqvz1l7SajJE64M73XkKHYKC68=", + "pom": "sha256-ylkCGnUHptHH0ZM+DN+hxKlpqgTsaMYsMdYTMtMAlpo=" + }, + "com/formdev#flatlaf/2.2": { + "jar": "sha256-CRiJizWqeFWfPJiWsUKKlo58Zp1e6LBFm61Q4ZLks18=", + "module": "sha256-FVtOnXOuoXXbX9Cwp7zbDgUurJRXZkpS10bqR1aGzJU=", + "pom": "sha256-iDEsV9UfzoVt4O4wSl3U2LI7wNOICiteBGprhOofGTo=" + }, + "com/formdev#flatlaf/2.6": { + "jar": "sha256-aol8rBnE9IsiiEohp93L+kfH/aJm26aYBKb4R6uel8g=", + "module": "sha256-bI6NyWonUOIHu1jOAV6LV4fEZiOxCves4Hg1zz6c8uA=", + "pom": "sha256-LyBWRSdf3po/+KaqsTgf29k7T67QfiDqkCujsUaVSuQ=" + }, + "com/github/junrar#junrar/7.5.4": { + "jar": "sha256-xZRJh80HDROp+9UVJi9LomPHLm3T+Yak1/EOrhtusM4=", + "module": "sha256-dl/GX7jryzhbcCG3J95RAAypDNMKcQm9Ed8QYv94lGk=", + "pom": "sha256-puop94MBMKrQQOMFjwNC4UBybts1QtXoDn1qZcmbAc8=" + }, + "com/github/mwiede#jsch/0.2.8": { + "jar": "sha256-0vgM9unIlvl/6UgT03ofW0zcGOF9oDFGxuFGMasb6bs=", + "pom": "sha256-CyRCnDntCWozUfpmflRNcg+M559/cRcRmTqzGHsQQGA=" + }, + "com/github/pcorless/icepdf#icepdf-core/7.0.1": { + "jar": "sha256-RBAMICxzxmPzHJ7TgHg/0G0mr9HdJAX7YL49R3r7f9g=", + "pom": "sha256-MwixlyFAVBbfn1xS+cyBUywXnlaZRaMpoleRHyxSc/o=" + }, + "com/github/pcorless/icepdf#icepdf-viewer/7.0.1": { + "jar": "sha256-cUQ/NKc4sbq51CwZnZGFZQetc+Fp2UuF8Hw5HKF27Hc=", + "pom": "sha256-ZRY98Xd643d1jG63i6nddkac8zxWBjU1vnhTvXx5Ahc=" + }, + "com/google/api-client#google-api-client-parent/1.25.0": { + "pom": "sha256-NElJWTWT7Wp7YMFmdQcr4lO3PMOAxyC5yWiT/KVhzUc=" + }, + "com/google/api-client#google-api-client/1.25.0": { + "jar": "sha256-JOGmnWwE5ucuPhZ1fUbTLap91DyzLDiV+DLyU1i+FAI=", + "pom": "sha256-xyaAUSeQpZObOW/XaPC2GXWGQj4QW4962fsetrNYTZg=" + }, + "com/google/apis#google-api-services-drive/v3-rev197-1.25.0": { + "jar": "sha256-lvAOQzAcToTxHvGJZyrOxVegIUhtcoSHvakWXqPs1L8=", + "pom": "sha256-g9+53Y56ucZWRyJcIuo3eGxFPcMTvn5Kp27ZWqRw3Ak=" + }, + "com/google/code/findbugs#jsr305/1.3.9": { + "jar": "sha256-kFchoO6pCoFTSrt+5u9OouXmRfod7wpc2IQC3xtGye0=", + "pom": "sha256-/quRkTEcPXru8rZtYGSvyA09HVLZgPsHrkPHjJh7qTo=" + }, + "com/google/code/findbugs#jsr305/3.0.2": { + "jar": "sha256-dmrSoHg/JoeWLIrXTO7MOKKLn3Ki0IXuQ4t4E+ko0Mc=", + "pom": "sha256-GYidvfGyVLJgGl7mRbgUepdGRIgil2hMeYr+XWPXjf4=" + }, + "com/google/code/gson#gson-parent/2.9.0": { + "pom": "sha256-r3gcmldm/+oxGg3wU2V2pk3sxmGqEQxN5cc6yL9DRCQ=" + }, + "com/google/code/gson#gson/2.9.0": { + "jar": "sha256-yW1gVRMxoZbaxUt0WqZCzQeO+JtvJnFGtwXywsvvBS0=", + "pom": "sha256-cZDQsH8njp9MYD9E5UOUD4HPGiVZ+FHG8pjJuyvil4w=" + }, + "com/google/errorprone#error_prone_annotations/2.11.0": { + "jar": "sha256-chy5GEK0b6BWhH0QTVIlyLjh6LYiY7mTBR4eWgE3t+w=", + "pom": "sha256-AmHKAfLS6awq4uznXULFYyOzhfspS2vJQ/Yu9Okt3wg=" + }, + "com/google/errorprone#error_prone_parent/2.11.0": { + "pom": "sha256-goPwy0TGJKedMwtv2AuLinFaaLNoXJqVHD3oN9RUBVE=" + }, + "com/google/guava#failureaccess/1.0.1": { + "jar": "sha256-oXHuTHNN0tqDfksWvp30Zhr6typBra8x64Tf2vk2yiY=", + "pom": "sha256-6WBCznj+y6DaK+lkUilHyHtAopG1/TzWcqQ0kkEDxLk=" + }, + "com/google/guava#guava-parent/26.0-android": { + "pom": "sha256-+GmKtGypls6InBr8jKTyXrisawNNyJjUWDdCNgAWzAQ=" + }, + "com/google/guava#guava-parent/30.1.1-android": { + "pom": "sha256-2Oaw8PpL9r4hc03FMPdNhpbp0Kw60n+8eSi6PY9k12E=" + }, + "com/google/guava#guava-parent/31.1-android": { + "pom": "sha256-chYh8BUxLnop8NtXDQi7NjJ/vUpTo+6T3zIUNjzlOXE=" + }, + "com/google/guava#guava-parent/31.1-jre": { + "pom": "sha256-RDliZ4O0StJe8F/wdiHdS7eWzE608pZqSkYf6kEw4Pw=" + }, + "com/google/guava#guava/30.1.1-android": { + "pom": "sha256-shjebjRaeYP+/OSaBLrxn2rONZytHISXMZDNbE2gWEY=" + }, + "com/google/guava#guava/31.1-android": { + "jar": "sha256-Mqwu1wnZbSeLXS4+XOoXj6STmTnFJftkdTLwEzCNswk=", + "pom": "sha256-ZikplWROlVN+6XqJ6JkBcdjzwmrPmEgwp3kZlwc9RR0=" + }, + "com/google/guava#guava/31.1-jre": { + "jar": "sha256-pC7cnKt5Ljn+ObuU8/ymVe0Vf/h6iveOHWulsHxKAKs=", + "pom": "sha256-kZPQe/T2YBCNc1jliyfSG0TjToDWc06Y4hkWN28nDeI=" + }, + "com/google/guava#listenablefuture/9999.0-empty-to-avoid-conflict-with-guava": { + "jar": "sha256-s3KgN9QjCqV/vv/e8w/WEj+cDC24XQrO0AyRuXTzP5k=", + "pom": "sha256-GNSx2yYVPU5VB5zh92ux/gXNuGLvmVSojLzE/zi4Z5s=" + }, + "com/google/http-client#google-http-client-bom/1.41.8": { + "pom": "sha256-yVh1SDQDTW6bV19FDYAINuQYkW1vNIOXqwpMmzfLhKA=" + }, + "com/google/http-client#google-http-client-gson/1.41.8": { + "jar": "sha256-FRKmpkILWW8UJXXvBFDQK7XQbo9Y4RRAT1Tfg1NfO1g=", + "pom": "sha256-MytVQtfeavHdJZ4UvOGcpfVpX18apBVC/KvtqGtYRRk=" + }, + "com/google/http-client#google-http-client-jackson2/1.25.0": { + "jar": "sha256-+efg0xiGCiCS1wtWMxl2KAxOk0igZe3juZySqgMv2FM=", + "pom": "sha256-kJ9uCYAW/9nOnr83IN+2YbxKF6qTLLTCIYNpl9whWF8=" + }, + "com/google/http-client#google-http-client-parent/1.25.0": { + "pom": "sha256-BinHEZjqaXXv6PEi72pbyqcvvtbPMMO4PMPLtkcI/as=" + }, + "com/google/http-client#google-http-client-parent/1.41.8": { + "pom": "sha256-HKVBMLDXTBxWaWEdPp9+XCXtxsSKMJCcMjDi4Jld7Vw=" + }, + "com/google/http-client#google-http-client/1.41.8": { + "jar": "sha256-mfps8okNuo1yUIo/1wEhHlXaZsgSBZGXcibkTVf18Bc=", + "pom": "sha256-3tTlt+Us2xmGB+rfh6huKKmSbEC/fKao9UZ5kWyfdvI=" + }, + "com/google/j2objc#j2objc-annotations/1.3": { + "jar": "sha256-Ia8wySJnvWEiwOC00gzMtmQaN+r5VsZUDsRx1YTmSns=", + "pom": "sha256-X6yoJLoRW+5FhzAzff2y/OpGui/XdNQwTtvzD6aj8FU=" + }, + "com/google/oauth-client#google-oauth-client-java6/1.34.0": { + "jar": "sha256-zWbH9vnIzmFFPRL05/iComFqAyOeqTf9D86G7bUWKMU=", + "pom": "sha256-+WIvkogQedMf7W2DjC4eyR3DmOqKots9y60o6JDxYk8=" + }, + "com/google/oauth-client#google-oauth-client-jetty/1.34.0": { + "jar": "sha256-p97u4NDKLERAyRI95uV6jznV4ZglyYrscgSatE7EIs4=", + "pom": "sha256-hz/FGUgZeoSiBbUpQ/KoWYiJdJV/awRxaJYrlpobZqA=" + }, + "com/google/oauth-client#google-oauth-client-parent/1.34.0": { + "pom": "sha256-Pq1EPY3oIipV15kAq6aeIhnL7GhRmlelqmOzdMS4FqA=" + }, + "com/google/oauth-client#google-oauth-client/1.34.0": { + "jar": "sha256-QCDi9jQvFR55cYfoQzuS0ZpAs6SAHyKrg4nXBhXRcNI=", + "pom": "sha256-DJ03VEuUcRXdzOoUiV0ZpgmEEKcrDD1FGy2KWzkDGDg=" + }, + "com/googlecode/javaewah#JavaEWAH/1.1.13": { + "jar": "sha256-TA/aKx0xd1DX6jJONscLK8SDEMCqrme5jfCRXWltcRE=", + "pom": "sha256-lyWx/pxoENl3dQu4RBXqEILEtIjUqDn5cEu09ej8F/Q=" + }, + "com/googlecode/json-simple#json-simple/1.1.1": { + "jar": "sha256-TmlpaJK4i0HFXUmrL9zCHurZK/VKzFiMAFBZbDt1GZw=", + "pom": "sha256-Zl9jWQ3vtj1irdIdNSU2LPk3z2ocBeSwFFuujailf4M=" + }, + "com/googlecode/plist#dd-plist/1.23": { + "jar": "sha256-PXlPKAjQ6Qx+yIlljoQ/kqJEFL1N8Y7PnxR4cmrxI4w=", + "pom": "sha256-irwhpc7IBIMPGpXg6ePumjP+vuugYUoKC39r1Q2sNoM=" + }, + "com/ibm/icu#icu4j/59.2": { + "jar": "sha256-S+43qfIsCzNv6Km/6Lp+8XL6FBO+1Nfyb9Q1EQzIl5s=", + "pom": "sha256-rULdMCtmkeYiiWFf01Xd8XDArSvqYRG55SF1swkKmS0=" + }, + "com/jamesmurty/utils#java-xmlbuilder/1.1": { + "jar": "sha256-Ulf963GblQOfxs81ASUnk5hWsvLJ12PVk8wMtk6IqyQ=", + "pom": "sha256-CPvh/9g2Z7fusWo3U/WqwQ1aUqwt3Dvu/aqA9q3oSt4=" + }, + "com/sun/activation#all/1.2.0": { + "pom": "sha256-HYUY46x1MqEE5Pe+d97zfJguUwcjxr2z1ncIzOKwwsQ=" + }, + "com/sun/activation#javax.activation/1.2.0": { + "jar": "sha256-mTMCsWzXBW8h53nMV30XWoELtJAO9zzY+/K1D5KLqc4=", + "pom": "sha256-+Hm26UWFTGkAsNvuHIOE16s95+FX/XrISTdAXEFtKl4=" + }, + "com/thoughtworks/xstream#xstream-parent/1.4.19": { + "pom": "sha256-DUgSxOMREJtuOk5gZvgh10kZgTl25P6p5CfPNi8vBYM=" + }, + "com/thoughtworks/xstream#xstream/1.4.19": { + "jar": "sha256-yayTUnlCGJron8kSBnY1jxHqj3E8Y1qfLHAGP+ZxZjQ=", + "pom": "sha256-7odNIUDKTox3TojfZW7svJZT9bjLmAapq4UFwmm3s34=" + }, + "com/twelvemonkeys#twelvemonkeys/3.9.4": { + "pom": "sha256-gOzTBd8tVuolgm89azuQc6gopH6WUu8FZKOPHzt3VSc=" + }, + "com/twelvemonkeys/common#common-image/3.9.4": { + "jar": "sha256-pfQZkdJJLyjOTwS4Kr//uJ9f+p38h/TljxDVJuW6SoM=", + "pom": "sha256-8e4RuOVYMAMujk1Zi2EoHjXnZ0+N2adwFGpxOaDOPkE=" + }, + "com/twelvemonkeys/common#common-io/3.9.4": { + "jar": "sha256-zHwnlHvyGnX7w9YT55vdhhmQjme4jMfXMJGlWHbk/Tg=", + "pom": "sha256-CsHg6dQkTPzshRxVmIXUi4RZGGEQh63lSc3V1e6rsWI=" + }, + "com/twelvemonkeys/common#common-lang/3.9.4": { + "jar": "sha256-pSG3l9WPZbgPqMo2XZWRFiJAjKsiD9XYUhaYBfZArL0=", + "pom": "sha256-mS8V1Ni9Bv+g5GYY7FV5wqvSizgmDLPljY3wGJ4YjJM=" + }, + "com/twelvemonkeys/common#common/3.9.4": { + "pom": "sha256-eMLMiO9JfTKBbZrtHWZ0YYWwk4ANvICJDFJqweuwWQE=" + }, + "com/twelvemonkeys/imageio#imageio-core/3.9.4": { + "jar": "sha256-JEhDp7yOz277IKpfgX6Xet2vs/awznA5Oz5tEQlZH64=", + "pom": "sha256-bkmhULWKTlKRmufie0l2KCI1JF44gdqMTuPipOj7eBc=" + }, + "com/twelvemonkeys/imageio#imageio-metadata/3.9.4": { + "jar": "sha256-WAozT44gyZ/5En+psAIrDwKpgbRuazjg3zkwUjKaYyQ=", + "pom": "sha256-VmIGSg5hQybZFjeDeRi/kdT9MiDN7yN5N/xQojyZLtU=" + }, + "com/twelvemonkeys/imageio#imageio-psd/3.9.4": { + "jar": "sha256-LB+jMxlkYUDbQw/PNohyRIO+0Asd4Ze3ZGs29aFu1ok=", + "pom": "sha256-smU8jX25W0PnzV94pCx18xJTGHNMsofkXDMHztIu3IU=" + }, + "com/twelvemonkeys/imageio#imageio-tiff/3.9.4": { + "jar": "sha256-RfOfSeOnDS2yzlSTtpp4nYACwSKqTk5gTZv6LfQmyDw=", + "pom": "sha256-yS09aeR3Rl6A44DDllbGypQmFyD3Xdxd/HYl9KVaGFo=" + }, + "com/twelvemonkeys/imageio#imageio/3.9.4": { + "pom": "sha256-q24dY2m5UtPiKwv8mmZYbKRhYX3oMEjDVQBp398INyo=" + }, + "commons-beanutils#commons-beanutils/1.9.4": { + "jar": "sha256-fZOMgXiQKARcCMBl6UvnX8KAUnYg1b1itRnVg4UyNoo=", + "pom": "sha256-w1zKe2HUZ42VeMvAuQG4cXtTmr+SVEQdp4uP5g3gZNA=" + }, + "commons-cli#commons-cli/1.2": { + "jar": "sha256-582JUZVtNJtWi3zP1PWyUpqMET5nwysCj1L/2jcSWdk=", + "pom": "sha256-GPPpIHbgjC/eSDFwJQmOn2uqqF9pEutD8tfmjVcORWE=" + }, + "commons-codec#commons-codec/1.11": { + "jar": "sha256-5ZnVMY6Xqkj0ITaikn5t+k6Igd/w5sjjEJ3bv/Ude30=", + "pom": "sha256-wecUDR3qj981KLwePFRErAtUEpcxH0X5gGwhPsPumhA=" + }, + "commons-codec#commons-codec/1.17.0": { + "pom": "sha256-wBxM2l5Aj0HtHYPkoKFwz1OAG2M4q6SfD5BHhrwSFPw=" + }, + "commons-codec#commons-codec/1.3": { + "jar": "sha256-G6/S7OLojbTN+DWn+PDeZfq1sRR5d6XcxZt8G4xvUIA=", + "pom": "sha256-0VfjQkTohN2R+gGSHKhDcuEfe7CP7bXUVsBnDCgFRjY=" + }, + "commons-codec#commons-codec/1.9": { + "jar": "sha256-rRnSYBw6vwuUa1w6QRPiJqjB4zBeOVuQATt43ZSnI84=", + "pom": "sha256-5e/PA5zZCWiMIB3FR5sUT9bwHw5AJSt/xefS4bXAeZA=" + }, + "commons-codec/commons-codec/maven-metadata": { + "xml": { + "groupId": "commons-codec", + "lastUpdated": "20240427124755", + "release": "1.17.0" + } + }, + "commons-collections#commons-collections/3.2.2": { + "jar": "sha256-7urpF5FxRKaKdB1MDf9mqlxcX9hVk/8he87T/Iyng7g=", + "pom": "sha256-1dgfzCiMDYxxHDAgB8raSqmiJu0aES1LqmTLHWMiFws=" + }, + "commons-el#commons-el/1.0": { + "jar": "sha256-DWdVDsACK2U0U8dZ8GOmQ8L+ZLxI+qiyX5WiIOKiguI=", + "pom": "sha256-CvMQHgSH7l4LJ/6GusL2gvoSo6KSuzvRm58n1e2ArsQ=" + }, + "commons-httpclient#commons-httpclient/3.0.1": { + "pom": "sha256-prCLPpblcaY7vWHEYzsfRrA4Y1JQ1uYn3TSkSjYetB4=" + }, + "commons-httpclient#commons-httpclient/3.1": { + "jar": "sha256-29SVPQE+EOfBzDcBo+bM2MlQyJLwjYBPq/rCFwWTBEM=", + "pom": "sha256-ipsH1FjT5zAiHb7N+vpzU+wbq9O5TIQyJ8RxBKkMbWw=" + }, + "commons-logging#commons-logging/1.2": { + "jar": "sha256-2t3qHqC+D1aXirMAa4rJKDSv7vvZt+TmMW/KV98PpjY=", + "pom": "sha256-yRq1qlcNhvb9B8wVjsa8LFAIBAKXLukXn+JBAHOfuyA=" + }, + "commons-net#commons-net/1.4.1": { + "jar": "sha256-BaNhHe35DQqz6O2D3sTuSSABSMCUJUN+uTSFYv3n2Dw=", + "pom": "sha256-1REvVdum8eRbaz00zlvhox9BBFkwbbksME/spDBP7Ko=" + }, + "commons-net#commons-net/3.8.0": { + "jar": "sha256-NSsLocZX2JMAY6m4OHj7cX3u8tKe4l0TlDvpvszGTUk=", + "pom": "sha256-WKIkqJs9YGMxCzm5riRAluoyPCMTH58YShS6d6CZ08k=" + }, + "eu/agno3/jcifs#jcifs-ng/2.1.7": { + "jar": "sha256-6mlza+XKjx9l8dputipQaz/iX/SY/0uO2eWdpFBGqRU=", + "pom": "sha256-QWCb9JaBLTeupRJrjd65GD0tRWCMZr6h0FvIDLpe7ZI=" + }, + "hsqldb#hsqldb/1.8.0.10": { + "jar": "sha256-sEs7OsKV1JfIcjDutPiIMnpaFbnDwVZ9sgKlHYOsnkE=", + "pom": "sha256-2QDYa4u/4/bugeqfIgbwd5Myu8pYjmo1/Rh4agoRkzE=" + }, + "io/github/x-stream#mxparser/1.2.2": { + "jar": "sha256-ru7iOjMD2BG8qHkOp/JbU0MUhhwDz/Ntr9zCGAlp65c=", + "pom": "sha256-I1AiQk4S8zGB9iraGcxEKAGbaXZXw8OSzjVxYKQi+qg=" + }, + "io/grpc#grpc-context/1.27.2": { + "jar": "sha256-vL+QVd/0U/1lCL18yioKotXwWanJS+7R9f2h3AFWB7g=", + "pom": "sha256-DyErFOvYNMvtm9iGml1snBeY7OtRLH/MKNqJ9vik7dg=" + }, + "io/opencensus#opencensus-api/0.31.0": { + "jar": "sha256-cCulXXjznVUZXc8EH9+qt6dJCprEUBNUJIftnk06TSM=", + "pom": "sha256-m0eVkefD4KtFOB+gQ6kWV4Fb3Yw1k68BDHrDb0yQWRk=" + }, + "io/opencensus#opencensus-contrib-http-util/0.31.0": { + "jar": "sha256-vMbNebAMLCqln8KgLUCUEIMAWFDrtS2X1jkI0253r9M=", + "pom": "sha256-fvy/lNXcYnWCw/4LjEgz5N08vF0vEvpx7yko9MOoWgg=" + }, + "javax/activation#activation/1.1.1": { + "jar": "sha256-rkdRIOn82ZtLALODKb1hzcXrdU7uA/5mwB9Q4TdyT5k=", + "pom": "sha256-I4FJ4En7vEM06sjt1ZzKVlp1COKDmEHn02zSaBFY//A=" + }, + "javax/jws#javax.jws-api/1.1": { + "jar": "sha256-nyCrH+o/lXHtUqnZjjxlHMfATIpwmt3yODErYJh8byw=", + "pom": "sha256-2MBdp0oEuZfbN+I8xFBokVMZkJXfvn5eR9HMRJT1zXM=" + }, + "javax/xml#jaxrpc-api/1.1": { + "jar": "sha256-dF1OFvbzNlIC5VR4D9AFyri/XMDyjjceeAkw24pc9Yc=", + "pom": "sha256-7l6D/wZZh4dIA7uRJ5r8zC8dP526odNX2f1X6Ls7xUY=" + }, + "javax/xml/bind#jaxb-api/2.2.9": { + "jar": "sha256-FmXRK8xopBjKJNOJ3OPFhs0W/J1XHfIdQkn/Hjj8uZI=", + "pom": "sha256-IfsrIZfYZypJLBrgGN18cxgwQeptHMmYSKSdYu7cHL0=" + }, + "javax/xml/soap#javax.xml.soap-api/1.3.5": { + "jar": "sha256-/Ne06NLZVpWtonmH3TXVJGgkiAHK3zpgPZaawpqZ3Yw=", + "pom": "sha256-a8CULqgG3xhh/DZ966JAKEXbh8nXcImhIPfoipqRIdU=" + }, + "javax/xml/ws#jaxws-api/2.2.12": { + "jar": "sha256-fnbOOvYwVFkrEUHe7THpb8SzhQK4bfSNU3bQALAwLJQ=", + "pom": "sha256-nlweszqLecaX7vPaFugWk9bBAsyq4q65UqaidYHfPco=" + }, + "jline#jline/2.14.2": { + "jar": "sha256-c3wEwqrwkAlyMygUYICvrnhp1AViWLQjg0pUeHkhOGw=", + "pom": "sha256-VOIz9HwTd6tBH7ZNJuMhULzZkEUTecWZUCeIeGO4p6c=" + }, + "junit#junit/4.10": { + "jar": "sha256-NqdHyh4LhvbqiAVbhyO7hwMNYndm2mKIvwd6/e6w91o=", + "pom": "sha256-IqG/C6rothBretgCbs8nxZ5+R920nWKXUDa+rbLGLrU=" + }, + "junit#junit/4.12": { + "jar": "sha256-WXIfCAXiI9hLkGd4h9n/Vn3FNNfFAsqQPAwrF/BcEWo=", + "pom": "sha256-kPFj944/+28cetl96efrpO6iWAcUG4XW0SvmfKJUScQ=" + }, + "junit#junit/4.5": { + "jar": "sha256-kjurxR22dfOSN3fDn/fYaOenbmmkU0C6Ts84zlMa3w4=", + "pom": "sha256-dS6JNTrcfSfLat1xKija1YKK5zDhAuusLTSa9uLvda4=" + }, + "log4j#log4j/1.2.17": { + "jar": "sha256-HTFpZEVpdyBScJF1Q2kIKmZRvUl4G2AF3rlOVnU0Bvk=", + "pom": "sha256-O5Wj083TqkuRqzJ921ob/gPYHic3lONqoUQEcdXXDl4=" + }, + "net/iharder#base64/2.3.8": { + "jar": "sha256-u/Qf2iKHelOPa8LVrQqjcqfd9KdWrzOGqgnT1O6oT38=", + "pom": "sha256-GztOxlWgmYGaS9QCKQBNP14Y0kz1Iy/rOS4faUoENzA=" + }, + "net/java#jvnet-parent/1": { + "pom": "sha256-KBRAgRJo5l2eJms8yJgpfiFOBPCXQNA4bO60qJI9Y78=" + }, + "net/java#jvnet-parent/3": { + "pom": "sha256-MPV4nvo53b+WCVqto/wSYMRWH68vcUaGcXyy3FBJR1o=" + }, + "net/java#jvnet-parent/4": { + "pom": "sha256-RxOVc1VJSVKXyP+Tm5oy4IuRMCAg/3c1htJ+SXq7j7s=" + }, + "net/java#jvnet-parent/5": { + "pom": "sha256-GvaZ+Nndq2f5oNIC+9eRXrA2Klpt/V/8VMr6NGXJywo=" + }, + "net/java/dev/jets3t#jets3t/0.7.1": { + "jar": "sha256-zzwEdXFHFoKn9Z31SAinFD14xrj2gmgJ7pWi+WN7fmA=", + "pom": "sha256-Ll4uq1m1a8DqquHRTgulO+6sYjvXK14c9UdcpcvR4Hs=" + }, + "net/java/dev/jets3t#jets3t/0.9.4": { + "jar": "sha256-oD8NJegQ7P8wE34NMUjRv5r9z2I1fr0bGvM49/YRW7s=", + "pom": "sha256-nqFHD161gt9fJa+pteIFPCy2GPJjlqG/IQ3m6T2XZGI=" + }, + "net/java/dev/jna#jna-platform/5.10.0": { + "jar": "sha256-H3Gv2XcFG/AQnvXjdn1OKv13e+iU2JeIzA84rWj2oW8=", + "pom": "sha256-5Kho919p2VQvw5nczcs5mxDB/8hJUlUJvoJOM7IbApU=" + }, + "net/java/dev/jna#jna-platform/5.12.1": { + "jar": "sha256-jOlpEWyslb1hsHqNXgcXSzUuYzAUc8qscsOV48CEiNI=", + "pom": "sha256-wnn/o7UWjiIDCHIxxjiRmnzsdFgAaxzaZpWXR4YPtFc=" + }, + "net/java/dev/jna#jna-platform/5.5.0": { + "jar": "sha256-JNgWIfgqwp/N2adBFgMfWQeiNDFY5hb0Vzu/okNK4NU=", + "pom": "sha256-EFaeNiLpdNPmYlW6hZI8El2E+iV+8lQ9isHGWNnrzRA=" + }, + "net/java/dev/jna#jna/5.10.0": { + "jar": "sha256-4zXBBnn3QyB9gixfeUjpMDGYNUkldanbprlPijuW/Mg=", + "pom": "sha256-B3PdO7r1MF5MDIL+NFzF1Mjp+tYjAqVVEYAj9ePq4xY=" + }, + "net/java/dev/jna#jna/5.12.1": { + "jar": "sha256-kagUrE9A1g3ukdhC4aith0xiGXmEQD0OPDDTnlXPU7M=", + "pom": "sha256-Zf8lhJuthZVUtQMXeS9Wia20UprkAx6aUkYxnLK4U1Y=" + }, + "net/java/dev/jna#jna/5.5.0": { + "jar": "sha256-swj66/5O1AnehBDgpjLRZLISawNfbqz/lo05CMr7TZ4=", + "pom": "sha256-pRrZTj90+Fo8362XU5KCkxZFJmn1iCA8e0nl+Beb5Tk=" + }, + "net/sf/kosmosfs#kfs/0.3": { + "jar": "sha256-GAfL/7bIh2z0QLj310j/9JzqQN3S0EK7tiuuPIe6iEI=", + "pom": "sha256-vh1i+xebfsSFJ1HqBmd9ZgUt9fwBwur8eUUudaXBZfg=" + }, + "net/sf/launch4j#launch4j/3.14": { + "pom": "sha256-xEYpdod2nJWyb2Qg9zsr0qKd90TYllTAdKhVb2Is+Vs=" + }, + "net/sf/launch4j#launch4j/3.14/core": { + "jar": "sha256-pGVAv4Nrz3s1AHM9n6f1muzYyDeUJz5zZlWrLKdXYjA=" + }, + "net/sf/launch4j#launch4j/3.14/workdir-linux64": { + "jar": "sha256-mphFGb9E6CWlsEFZfgVPi/qy+Tpm+na30aM79JIcNUY=" + }, + "net/sf/sevenzipjbinding#sevenzipjbinding-all-platforms/16.02-2.01": { + "jar": "sha256-cvq1Op0x4W1lP+H0AAEdAqf2vGqR6GNLXPrVzhXUZ7s=", + "pom": "sha256-u3FCxepITF/phCbcFezhuYu/3UZTRWqI2idCHXJnAmU=" + }, + "net/sf/sevenzipjbinding#sevenzipjbinding/16.02-2.01": { + "jar": "sha256-Ezyj9pyMc12Jl8CUd1BPSKny5h6ntwSzcUqQZrHvuI4=", + "pom": "sha256-pdF4WGwNvc4V3cKlKBaE04ek8jW10bklWzls7TaWhcE=" + }, + "org/ajoberstar/grgit#grgit-core/5.0.0": { + "jar": "sha256-euHeUDb2pP8sTyHULuJ53LvKcOYDpEtP6zBZK0eu8G8=", + "module": "sha256-fuADv+5+8bNRyxV2GAXUs5HI7CUAwxdax1o1MgM7KjU=", + "pom": "sha256-wmURBGMEd98+Iig8ChGyIiwm3184m+t2G2ACnGXiGpw=" + }, + "org/ajoberstar/grgit#grgit-gradle/5.0.0": { + "jar": "sha256-aa8WiXAg1WPHBtYBRNgBpnrSS2cd4GA5j8rJho7aPCw=", + "module": "sha256-RJ+Wog22yCYvNtpsLZWdEkJb3LY6ki6Ikit50KC+VJk=", + "pom": "sha256-D6nV84E9yjIz2f2rjUWtaJ7nQ+qPxJVUVYbK6Ufw0pY=" + }, + "org/ajoberstar/grgit#org.ajoberstar.grgit.gradle.plugin/5.0.0": { + "pom": "sha256-cszQAN0OuVBwDurgtOkLouUb/LdE6FZiggM0cuVqqyA=" + }, + "org/apache#apache/13": { + "pom": "sha256-/1E9sDYf1BI3vvR4SWi8FarkeNTsCpSW+BEHLMrzhB0=" + }, + "org/apache#apache/16": { + "pom": "sha256-n4X/L9fWyzCXqkf7QZ7n8OvoaRCfmKup9Oyj9J50pA4=" + }, + "org/apache#apache/17": { + "pom": "sha256-OYBEt0tacZMmviGK4IEk5eLzMYq114/hmdUE78Lg1D8=" + }, + "org/apache#apache/18": { + "pom": "sha256-eDEwcoX9R1u8NrIK4454gvEcMVOx1ZMPhS1E7ajzPBc=" + }, + "org/apache#apache/19": { + "pom": "sha256-kfejMJbqabrCy69tAf65NMrAAsSNjIz6nCQLQPHsId8=" + }, + "org/apache#apache/21": { + "pom": "sha256-rxDBCNoBTxfK+se1KytLWjocGCZfoq+XoyXZFDU3s4A=" + }, + "org/apache#apache/23": { + "pom": "sha256-vBBiTgYj82V3+sVjnKKTbTJA7RUvttjVM6tNJwVDSRw=" + }, + "org/apache#apache/31": { + "pom": "sha256-VV0MnqppwEKv+SSSe5OB6PgXQTbTVe6tRFIkRS5ikcw=" + }, + "org/apache#apache/4": { + "pom": "sha256-npMjomuo6yOU7+8MltMbcN9XCAhjDcFHyrHnNUHMUZQ=" + }, + "org/apache#apache/9": { + "pom": "sha256-SUbmClR8jtpp87wjxbbw2tz4Rp6kmx0dp940rs/PGN0=" + }, + "org/apache/commons#commons-compress/1.20": { + "jar": "sha256-CutiXJSMaX6nsgUVbhEjY7We1eJVEhLNTkYL23LHwG4=", + "pom": "sha256-2VZ4469WsXx9ts/5ZF761etZvp88HKqvXwFG7fBGkdc=" + }, + "org/apache/commons#commons-lang3/3.12.0": { + "jar": "sha256-2RnZBEhsA3+NGTQS2gyS4iqfokIwudZ6V4VcXDHH6U4=", + "pom": "sha256-gtMfHcxFg+/9dE6XkWWxbaZL+GvKYj/F0bA+2U9FyFo=" + }, + "org/apache/commons#commons-parent/11": { + "pom": "sha256-ueAwbzk0YBBbij+lEFJQxSkbHvqpmVSs4OwceDEJoCo=" + }, + "org/apache/commons#commons-parent/32": { + "pom": "sha256-5NJYr4sv9AMhSNQVN53veHB4mmAD6AV28VBLEPJrS+g=" + }, + "org/apache/commons#commons-parent/34": { + "pom": "sha256-Oi5p0G1kHR87KTEm3J4uTqZWO/jDbIfgq2+kKS0Et5w=" + }, + "org/apache/commons#commons-parent/39": { + "pom": "sha256-h80n4aAqXD622FBZzphpa7G0TCuLZQ8FZ8ht9g+mHac=" + }, + "org/apache/commons#commons-parent/42": { + "pom": "sha256-zTE0lMZwtIPsJWlyrxaYszDlmPgHACNU63ZUefYEsJw=" + }, + "org/apache/commons#commons-parent/47": { + "pom": "sha256-io7LVwVTv58f+uIRqNTKnuYwwXr+WSkzaPunvZtC/Lc=" + }, + "org/apache/commons#commons-parent/48": { + "pom": "sha256-Hh996TcKe3kB8Sjx2s0UIr504/R/lViw954EwGN8oLQ=" + }, + "org/apache/commons#commons-parent/52": { + "pom": "sha256-ddvo806Y5MP/QtquSi+etMvNO18QR9VEYKzpBtu0UC4=" + }, + "org/apache/commons#commons-parent/69": { + "pom": "sha256-1Q2pw5vcqCPWGNG0oDtz8ZZJf8uGFv0NpyfIYjWSqbs=" + }, + "org/apache/commons#commons-vfs2-project/2.3": { + "pom": "sha256-esuoQCmKFoMHNgZkPcGX0+XwIoOrIMuUyLbjB18pU7E=" + }, + "org/apache/commons#commons-vfs2/2.3": { + "jar": "sha256-VtHuk/pi7VJzsUQDwZwAlV7vN5JgUwfksQa0GuXYOmY=", + "pom": "sha256-HAjXM3vPvbo1PJKIYKRlE8A95kp4mTCs1rwQIE4pHjY=" + }, + "org/apache/felix#felix-parent/2.1": { + "pom": "sha256-xVKlZDq0Z8MSJeB8tVsdwq5agR5WdIGnOiVKOJgThzY=" + }, + "org/apache/felix#felix-parent/4": { + "pom": "sha256-XM0w8s5e1T09oZGiPs71mxWw/Q5JSgGu60AmRBQn5Gg=" + }, + "org/apache/felix#felix-parent/6": { + "pom": "sha256-Ngi2sgD2yPSIx3zBWYR9UV5pZugzO4XY4E45Sgk7VZU=" + }, + "org/apache/felix#org.apache.felix.framework/7.0.5": { + "jar": "sha256-q6cpMsX/5S0a6ftzVBVHS8gwX9BPBQ6FHzqPZ9oYNP0=", + "pom": "sha256-CBAm1JP4dt+OsPPxyPhdpyy+N99VeDPpaLQMMNrL/Kk=" + }, + "org/apache/felix#org.apache.felix.main/7.0.5": { + "jar": "sha256-IIUtVR3jJ4BKU7IOUPL7v3e2KwP0JubpXnYG06WPjpg=", + "pom": "sha256-p5ct/DzTQrxR5G2PMD5avTzjDhgOi1cVLAnxiUpTLv0=" + }, + "org/apache/felix#org.apache.felix.scr/2.0.12": { + "jar": "sha256-jaF57ceJ4SYH+x7pCNuEkJkh6A4JO9Sdm648LCDsqQ0=", + "pom": "sha256-Tj7MhctREnNZO/4c7/RpZAkzjs0+2wvv05oie/2iZaI=" + }, + "org/apache/felix#org.apache.felix.shell/1.4.3": { + "jar": "sha256-xT4vgt58Qntj27+RG4uJA4b0qxI41s/olFsQ8B3YqgQ=", + "pom": "sha256-E3gqgSD8OX+Fxl5jdRrxQhrWjxbqQ9etxpjI9wDJUeY=" + }, + "org/apache/hadoop#hadoop-core/0.20.2": { + "jar": "sha256-NpnQfjXPWJgtIovrrzBz70z4Tg9PgtyRY2EYyrEy5PY=", + "pom": "sha256-8IygIDOByE19sy1x1giwIWt2NY8BBLLBcJ1uyCHs4A4=" + }, + "org/apache/httpcomponents#httpclient/4.5": { + "jar": "sha256-o8FVmR3h416FHoKKZ/iU0QEVjEEkzA8d9fEtJ8+kd3I=", + "pom": "sha256-KXbd8fDEATUubMf0kmbH+D/h+hEwhlB1Ik/DfJAr28s=" + }, + "org/apache/httpcomponents#httpclient/4.5.13": { + "jar": "sha256-b+kCalZsalABYIzz/DIZZkH2weXhmG0QN8zb1fMe90M=", + "pom": "sha256-eOua2nSSn81j0HrcT0kjaEGkXMKdX4F79FgB9RP9fmw=" + }, + "org/apache/httpcomponents#httpcomponents-client/4.5": { + "pom": "sha256-VPLVLc8b3fp7AEvsk8fmDjLyU6Rkj9ee8t/gOL1KrhM=" + }, + "org/apache/httpcomponents#httpcomponents-client/4.5.13": { + "pom": "sha256-nLpZTAjbcnHQwg6YRdYiuznmlYORC0Xn1d+C9gWNTdk=" + }, + "org/apache/httpcomponents#httpcomponents-core/4.4.1": { + "pom": "sha256-QSBuBZ8samqOylrk4YC0C5P2+raJ65tcCTa3K2K3GNI=" + }, + "org/apache/httpcomponents#httpcomponents-core/4.4.15": { + "pom": "sha256-YNQ3J6YXSATIrhf5PpzGMuR/PEEQpMVLn6/IzZqMpQk=" + }, + "org/apache/httpcomponents#httpcomponents-parent/11": { + "pom": "sha256-qQH4exFcVQcMfuQ+//Y+IOewLTCvJEOuKSvx9OUy06o=" + }, + "org/apache/httpcomponents#httpcore/4.4.1": { + "jar": "sha256-3ROQwX1A92D35RuyBSOo1j3raelLq+r1Z+t27NLK1CI=", + "pom": "sha256-uBpinKyR8Q4siiRfd0tvCIlQOerWifqITHj0csdSxIM=" + }, + "org/apache/httpcomponents#httpcore/4.4.15": { + "jar": "sha256-PLrtCIxJmhD5bd5Y853A55hRcavYgTjKFlWocgEbsUI=", + "pom": "sha256-Kaz+qoqIu2IPw0Nxows9QDKNxaecx0kCz0RsCUPBvms=" + }, + "org/apache/httpcomponents#project/7": { + "pom": "sha256-PW66QoVVpVjeBGtddurMH1pUtPXyC4TWNu16/xiqSMM=" + }, + "org/apache/pdfbox#fontbox/2.0.27": { + "jar": "sha256-3HQphoqvPTE8Ukuaq4RqQF6Jykkn81diyk0aYLzh1/Q=", + "pom": "sha256-q/mNDGhURYJaBs5q6wDrs1qRkgrhnO1GEl1afhAoMQY=" + }, + "org/apache/pdfbox#jbig2-imageio/3.0.4": { + "jar": "sha256-KcspUWIvEKz2H9BlbE5vpVYhlKkJX3odJqpCbi9rF+s=", + "pom": "sha256-KOp8SskuCYX3lqi8aJCnvviSZwetrf0eLIVsmwvho4s=" + }, + "org/apache/pdfbox#pdfbox-parent/2.0.27": { + "pom": "sha256-4mbfDSSS71+JopUQrkv35b0RW82duwFn+bZaPZzB3Po=" + }, + "org/bouncycastle#bcpkix-jdk15on/1.70": { + "jar": "sha256-5bnLgh31f3CwWTNY6JwOjXJmUV2p0IivbGRvY9QzwHw=", + "pom": "sha256-bqVQK37r7HAYJxu4qCy4Gb9MHytlQ1ScXP2E1qE5lr8=" + }, + "org/bouncycastle#bcprov-ext-jdk15on/1.70": { + "jar": "sha256-XYGfO4hZfsaAyUFRoLoKOv/wwMHJmbWwZaZ8mYo+Phs=", + "pom": "sha256-349vD7+aZoBvsV+M/E40S1fEdgoiYpAIbKuLkb4X4m8=" + }, + "org/bouncycastle#bcprov-jdk15on/1.52": { + "jar": "sha256-DcTRgeTTR4k8LdvS5s1dcof8ZRwDZI+mSyNBxzZrF3M=", + "pom": "sha256-fko0x7Y9h5xc7EVOLkfrHmHicaWGcuflSGWfTyN0JQA=" + }, + "org/bouncycastle#bcprov-jdk15on/1.69": { + "jar": "sha256-5Gm9Ofk2mZ8lYAJjEAP/AioilR2p1b2Xicer+pdjopI=", + "pom": "sha256-/YHicUSVvOeeauazAp2s0kzyz/NAJB2lgQVYlae6eN4=" + }, + "org/bouncycastle#bcprov-jdk15on/1.70": { + "jar": "sha256-jzwg4+LVZdJvM+jUhXo30Nf4rDm2KnAmSW/Ksb2sMNQ=", + "pom": "sha256-bfS1t22QYgF2ZK0MooXlcVSugDYHy4nJcLOcwOAWq7A=" + }, + "org/bouncycastle#bcutil-jdk15on/1.70": { + "jar": "sha256-UtxVUbAldmZSbFCVQkVn/tfcewDSsbp71SKYQRESsdA=", + "pom": "sha256-nrrnHCXgyfLNdWADwB8a0Pw5jKBvvNoNF15xysWECq0=" + }, + "org/checkerframework#checker-qual/3.12.0": { + "jar": "sha256-/xB4WsKjV+xd6cKTy5gqLLtgXAMJ6kzBy5ubxtvn88s=", + "module": "sha256-0EeUnBuBCRwsORN3H6wvMqL6VJuj1dVIzIwLbfpJN3c=", + "pom": "sha256-d1t6425iggs7htwao5rzfArEuF/0j3/khakionkPRrk=" + }, + "org/checkerframework#checker-qual/3.24.0": { + "jar": "sha256-2tGJ1OO0he3wI6niC7yEeDA9yM3clX5oij9ZTV5zu3s=", + "module": "sha256-EC7EgMhtWlEqb6BEgroCeX+kiwiSJ3cRBLgsRFGapDw=", + "pom": "sha256-70TDGulmr9RNMXge4m7zviQm1UITPeVC10lBGOagAjE=" + }, + "org/codehaus#codehaus-parent/3": { + "pom": "sha256-UOslOs0LbuBI9DLZ/Do7NiZO+z2h/6f7B/bE1LeoyjE=" + }, + "org/codehaus/jackson#jackson-core-asl/1.9.13": { + "jar": "sha256-RAqctcqVshX5U9OiCmsaENofCbUpqd3qX4pJBd2rT1o=", + "pom": "sha256-95Xcr5QSdPZanVRaSSanQtCygttPLrGUADBgyvvv2QA=" + }, + "org/codehaus/jackson#jackson-mapper-asl/1.9.13": { + "jar": "sha256-dOegenby7breKTEqWi68z6AZEovAIezjhW12GX6b4MI=", + "pom": "sha256-MPLZHeJHhRcjaODaGKh5cQLHWZqJdmuhf+YzDCQMy/4=" + }, + "org/codehaus/mojo#animal-sniffer-annotations/1.9": { + "jar": "sha256-zZb+60fzSyVZcEcV23sXmgOjch+dxAksNFxxjim0LeQ=", + "pom": "sha256-/nEJDiNXjdGapqj+9Rhvz6WPSPgHBnKprIlFhis7fz0=" + }, + "org/codehaus/mojo#animal-sniffer-parent/1.9": { + "pom": "sha256-nyDSRN5e5OZQmbJ3tpiE7xr4EROcAJcl3TzPqPsaxjs=" + }, + "org/codehaus/mojo#mojo-parent/28": { + "pom": "sha256-WrbfH5JfxhOX3y0XNSu8mK8UZOhT7SF+CeU9IKMm9wc=" + }, + "org/eclipse/jdt#core/3.1.1": { + "jar": "sha256-+eOc9zJrYNHTAW7ZD63ASfcdMSyXqpfLqvhR1jdnMLo=", + "pom": "sha256-thSFD4+KUKt1m1nJIZqv+xxbzz7yQMbE0eFjN/9ZJao=" + }, + "org/eclipse/jgit#org.eclipse.jgit-parent/6.0.0.202111291000-r": { + "pom": "sha256-KlNYEM2GhoEaaT0au4sQGRE1bfRlhdxpD0TNNGx3vwU=" + }, + "org/eclipse/jgit#org.eclipse.jgit/6.0.0.202111291000-r": { + "jar": "sha256-NSkKqsxiVhMEzQLvjPpbKXqIAHVdfXQk5SlU/MUqEgM=", + "pom": "sha256-pRCLLHNdZ7Zfh7f+77kxAUhCax4dAfHdY04zLB2mJUs=" + }, + "org/exbin/bined#bined-core/0.2.0": { + "jar": "sha256-V+URrCaEsKKGtEI5NrX6Itc2UJ/MqRLLgFmvYGKktAM=", + "pom": "sha256-Jl0xEBR+SbRNns8W4cQdbQMItCvteFcuhav7DPWQiwM=" + }, + "org/exbin/bined#bined-extended/0.2.0": { + "jar": "sha256-zSqJKG0pQ09mz7/mYXWT8CG8QE7xqOUqwpF8QtBhYA8=", + "pom": "sha256-zWZRTzYvH/3JLQPSf4dL+2hmD2lx+5d79jO4LLz1MLY=" + }, + "org/exbin/bined#bined-highlight-swing/0.2.0": { + "jar": "sha256-mInT2MV+iH3NP063uXwjAb5TKumnNnqZa7lv8nutGG8=", + "pom": "sha256-yS9O78KNIZ5Z1GsxQCimeidtrHwmMHOP1YybD81FznA=" + }, + "org/exbin/bined#bined-operation-swing/0.2.0": { + "jar": "sha256-RTyGSbiv+h2dTmC7ob/Y0gKa9/IWweTZhiBH3sWFQC0=", + "pom": "sha256-VX1ftIJE/Jr4ld421jJvS0f5t6gHDUMode6l/9bdTyc=" + }, + "org/exbin/bined#bined-operation/0.2.0": { + "jar": "sha256-rFVLd5DdXoFzEoGkohFvYk902VQNs5hq/AT07EQppag=", + "pom": "sha256-o1y6AYkmzfs0pveozWSz8idrPNDHU2Nr7O8CyD2PxU0=" + }, + "org/exbin/bined#bined-swing-extended/0.2.0": { + "jar": "sha256-FslY+vbzPtW+OytscgHfI1FHIdIl1X4CubCd1yyXIys=", + "pom": "sha256-h/WxZiFbKaoAZH2uVaC8P8b8SmcLpCqlHe3Djtz5YA8=" + }, + "org/exbin/bined#bined-swing/0.2.0": { + "jar": "sha256-9az+O66PgOCt3LGWTDqdRfjk7njp+6/z+bNIvAKA8NY=", + "pom": "sha256-EcPobxsauuBDTGvaia9bDEBHyNzGYEsfN6QK4UNs+ho=" + }, + "org/glassfish#glassfish-parent/10.0-b28": { + "pom": "sha256-2DdvCwd5g3hYi0THaFhNWgg2IC/r1bthQV69NHlUhJw=" + }, + "org/glassfish#javaee-api/10.0-b28": { + "pom": "sha256-iSXwgLFPb32MSS0nNzfJ8XlliH6T2e6jHUI7Dbkv1mU=" + }, + "org/glassfish#javax.xml.soap/10.0-b28": { + "jar": "sha256-DngfntIbAM+gZvD+wATSRGsRDOAATSMW5CDPEa8AF70=", + "pom": "sha256-Oxqk3Tss+B5WJo/d5jAG76V2FeDcfv7dYNwOlws8CuI=" + }, + "org/glassfish#pom/2": { + "pom": "sha256-vjuPfQ8bH3mTTBvDAd133tVZpj8H+cBiEM1LTslohi4=" + }, + "org/hamcrest#hamcrest-core/1.1": { + "jar": "sha256-A2HRST/w2U+GE1nv6pEgByBjUHITR5LvtyF/bgnVz/s=", + "pom": "sha256-OXOH9AbGjMtAP0d8y+wcgYz8a4/0+tpaM+Jhg6hBfIM=" + }, + "org/hamcrest#hamcrest-core/1.3": { + "jar": "sha256-Zv3vkelzk0jfeglqo4SlaF9Oh1WEzOiThqekclHE2Ok=", + "pom": "sha256-/eOGp5BRc6GxA95quCBydYS1DQ4yKC4nl3h8IKZP+pM=" + }, + "org/hamcrest#hamcrest-parent/1.1": { + "pom": "sha256-FOaVChpimMvLg8+UKcrEFf8nMWf28Vh2hZQTsNbAfjo=" + }, + "org/hamcrest#hamcrest-parent/1.3": { + "pom": "sha256-bVNflO+2Y722gsnyelAzU5RogAlkK6epZ3UEvBvkEps=" + }, + "org/jetbrains#annotations/20.1.0": { + "jar": "sha256-7cjj7JeWpfQcGuRLLTGFB+5qwSEvEh2T0zaZs9Cv9jg=", + "pom": "sha256-RKoM0kV47KB8dgMdQsQv+8rmHOwxMFdeIxlparBUgQQ=" + }, + "org/jetbrains#annotations/23.0.0": { + "jar": "sha256-ew8ZckCCy/y8ZuWr6iubySzwih6hHhkZM+1DgB6zzQU=", + "pom": "sha256-yUkPZVEyMo3yz7z990P1P8ORbWwdEENxdabKbjpndxw=" + }, + "org/jetbrains/intellij/deps#trove4j/1.0.20200330": { + "jar": "sha256-xf1yW/+rUYRr88d9sTg8YKquv+G3/i8A0j/ht98KQ50=", + "pom": "sha256-h3IcuqZaPJfYsbqdIHhA8WTJ/jh1n8nqEP/iZWX40+k=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-common/1.7.10": { + "jar": "sha256-GfEC7+lin46rxjhTrRXFM+R8R/kfygkoXFvehuWfkdQ=", + "pom": "sha256-EBHGO4julM3/XVlpNzB1WbxVA3tzPMAM5jzaPPrgqOs=" + }, + "org/jetbrains/kotlin#kotlin-stdlib/1.7.10": { + "jar": "sha256-53H+dCUKlD6PY0ZxMgH/HYy5XDpdGpGiK2Wp4E9qiQE=", + "pom": "sha256-bMDPWivALe4GDruQw1Nfw929ejurIQrOPhQqr4F2TYE=" + }, + "org/jetbrains/pty4j#pty4j/0.12.3": { + "jar": "sha256-j0VqkehguhKfPlwOlM6/WEmqN8pAEanXSYOaZjL6xrs=", + "module": "sha256-G7L2GjoEPAQaUDGEZOrzptK+J/JkNTeK/F1My2uZlb0=", + "pom": "sha256-GValtB7ec6dC0Tu8vBFZXaZdQJaAleM342qSi4vjbb4=" + }, + "org/jmdns#jmdns/3.5.5": { + "jar": "sha256-iUyFKyYAHjuxrQ9pFec3BqpZBjftXXMbZSoUYYZQRzc=", + "pom": "sha256-bQIQbpkKWGMuq2ujjSce09Gei6OubT8uM113G2FW8hY=" + }, + "org/junit#junit-bom/5.10.2": { + "module": "sha256-3iOxFLPkEZqP5usXvtWjhSgWaYus5nBxV51tkn67CAo=", + "pom": "sha256-Fp3ZBKSw9lIM/+ZYzGIpK/6fPBSpifqSEgckzeQ6mWg=" + }, + "org/junit#junit-bom/5.7.1": { + "module": "sha256-mFTjiU1kskhSB+AEa8oHs9QtFp54L0+oyc4imnj67gQ=", + "pom": "sha256-C5sUo9YhBvr+jGinF7h7h60YaFiZRRt1PAT6QbaFd4Q=" + }, + "org/mortbay/jetty#jetty-parent/7": { + "pom": "sha256-AXPY2/7SuKsqWza2CKnFCeoKP7tPrKZ85wZ2gMiVBmo=" + }, + "org/mortbay/jetty#jetty-util/6.1.14": { + "jar": "sha256-8mY5/R7P2Dpm+dilkyQvpavXW7R2TP2siLQHmpP+Mvk=", + "pom": "sha256-h1IR/PM+77cX+/94uqGmC+XJc/4gbP9HshlcUDN9hYQ=" + }, + "org/mortbay/jetty#jetty/6.1.14": { + "jar": "sha256-IwGVcKiM3lf3z572YuVvZssXnc9+KMvg0WKedk0Iw0M=", + "pom": "sha256-LYNk1QxMmFO2kNaGdQ5MnbRioQt/rfP0TpdOJJCtGRU=" + }, + "org/mortbay/jetty#jsp-2.1/6.1.14": { + "jar": "sha256-2VTa2Kpx8mmfNZAzPoybjY/B6ixZ12A1GTuP8q8F1j8=", + "pom": "sha256-OFFKit71HajPrD79tZosDfYiXBnUszHJy3bYeYXy+5Y=" + }, + "org/mortbay/jetty#jsp-api-2.1/6.1.14": { + "jar": "sha256-2+YHBuGi8+PjeFsofXi1J7b0GqY37M2k48OEF2w1pAU=", + "pom": "sha256-jWdSNsVPkhg4bzacfuxMSLNHS7Kh1vT89VYzLyoyVwk=" + }, + "org/mortbay/jetty#project/6.1.14": { + "pom": "sha256-3LefygsrOTGr0/WwJYLF0jyeu9LnoN2Mk+/j0a0++l4=" + }, + "org/mortbay/jetty#servlet-api-2.5/6.1.14": { + "jar": "sha256-DtM+4wUYZqOmMxl2zfUJijau/RbsH6LYNusGfjfUbUc=", + "pom": "sha256-i3Fd2/c7vaY0TCI8E5hnWSLkF7o5ntPH+NepSVnA/4E=" + }, + "org/osgi#org.osgi.dto/1.0.0": { + "jar": "sha256-y3Xzx+SOWjGjHfIuJoczRvW/ZZ4tyrI2ngMeSFDS/0M=", + "pom": "sha256-XDHfk5LAR5tfgS9/hIDPsvcrbUmu8oVLfZFuBrCxDKw=" + }, + "org/osgi#org.osgi.framework/1.8.0": { + "jar": "sha256-7BlLeHGvJ2gXFv8FJZMZpcPJuXJ+gADp6DJJm5NIS04=", + "pom": "sha256-Z9tZJwa+xs7fS932a6ZJrVEkDN8SnjSQXm78j5AhCTM=" + }, + "org/osgi#org.osgi.resource/1.0.0": { + "jar": "sha256-gfxQ8fHTikryjhMZB9Sv4hMkmqsFBgSE7coOYMSvm0o=", + "pom": "sha256-g6zfIl/7mkp7xYL1OkFFofLDvbtCjgM8AJZvY8YQ6CA=" + }, + "org/osgi#org.osgi.service.coordinator/1.0.2": { + "jar": "sha256-sA3LUHuCQ/vlTubn+FNEmoRa+OfYQxPH1JdJSf2qsis=", + "pom": "sha256-DR2KkKB+CBsBIewegopVu51NRK7SK9qUKZEqIQFGi2o=" + }, + "org/osgi#org.osgi.service.log/1.3.0": { + "jar": "sha256-/2cQxIVtMmhM8+vcRSSPQQNv9zTysDu8CMRgmmH+z6A=", + "pom": "sha256-IcKVDBCS/bOOwIRYa471pU5dHQSV9UqCR+Auuu1EMos=" + }, + "org/osgi#org.osgi.service.repository/1.1.0": { + "jar": "sha256-xVU+lbRZUpGSQzSG1MTMIv9FourkloSE+fcXMZJkpTI=", + "pom": "sha256-QGb8pxWqwy/jzgvHv4Epe/1xMOu2CQzJZSrfeyqAfxk=" + }, + "org/osgi#org.osgi.service.resolver/1.1.1": { + "jar": "sha256-0hLyvLRc++yQcxDXj1MNmJjeDM97B5Os8Ys4bwPH3jk=", + "pom": "sha256-uPMUllLomdnRY/zyBKSD1Cq79OoT/+zI2aMyLIF84cI=" + }, + "org/osgi#org.osgi.util.function/1.2.0": { + "jar": "sha256-IIgZx8cWkMFaa7ixh0dOf50BR5RraAGCpiufIirgFOw=", + "pom": "sha256-9O3YQYEVfUNoGNRlZdSAN5wbBwAdXLEwtAZxlykRXqg=" + }, + "org/osgi#org.osgi.util.promise/1.2.0": { + "jar": "sha256-/vhuZPWE0BKhagMGFgdk9heWY7kJiKImxGQbkg86SzY=", + "pom": "sha256-m6aVb+n6Frge8Q6O8UED4WwEuKACQVC20DKfkX7y4hY=" + }, + "org/osgi#org.osgi.util.tracker/1.5.4": { + "jar": "sha256-fXjCzJvLZCHCTxeqCXhmzo2RFcIZpPjWzHU7xN+5fvo=", + "pom": "sha256-L3oSGrysdT5csPguP+4NpHlZV5hp4wTYwvtuh2PkMSk=" + }, + "org/osgi#osgi.annotation/8.0.1": { + "jar": "sha256-oOikw2K9NgCBLzew6kX7qWbHvASdAf7Vagnsx0CCdZ4=", + "pom": "sha256-iC0Hao4lypIH95ywk4DEcvazxBUIFivSuqBpF74d7XM=" + }, + "org/osgi#osgi.core/8.0.0": { + "jar": "sha256-QcJNGH9nqq9HRfq3j9HaZt5/N92CWB27vJuolkW6AWY=", + "pom": "sha256-ZR92uim7Q5LTaupW99CwyC/EkXAk2eaoQ3dLulAV61M=" + }, + "org/ovirt/engine/api#java-sdk-parent/4.4.5": { + "pom": "sha256-0yDbSWA1kRnOQhG3+R1Y+regNqra7Uo+feiehoO/PIw=" + }, + "org/ovirt/engine/api#sdk/4.4.5": { + "jar": "sha256-ch6stVl0/BuFz+GfRtjgRgTUDYNr1lxxoKpHf/RLumI=", + "pom": "sha256-w6qSGYiYuDuLy3mWDXJSX+uMKiOI1lfjBw/iW8yZSCM=" + }, + "org/slf4j#slf4j-api/1.7.25": { + "pom": "sha256-fNnXoLXZPf1GGhSIkbQ1Cc9AOpx/n7SQYNNVTfHIHh4=" + }, + "org/slf4j#slf4j-api/1.7.30": { + "jar": "sha256-zboHlk0btAoHYUhcax6ML4/Z6x0ZxTkorA1/lRAQXFc=", + "pom": "sha256-fgdHdR6bZ+Gdy1IG8E6iLMA9JQxCJCZALq3QNRPywxQ=" + }, + "org/slf4j#slf4j-api/1.7.36": { + "jar": "sha256-0+9XXj5JeWeNwBvx3M5RAhSTtNEft/G+itmCh3wWocA=", + "pom": "sha256-+wRqnCKUN5KLsRwtJ8i113PriiXmDL0lPZhSEN7cJoQ=" + }, + "org/slf4j#slf4j-parent/1.7.25": { + "pom": "sha256-GPXFISDbA26I1hNviDnIMtB0vdqVx1bG9CkknS21SsY=" + }, + "org/slf4j#slf4j-parent/1.7.30": { + "pom": "sha256-EWR5VuSKDFv7OsM/bafoPzQQAraFfv0zWlBbaHvjS3U=" + }, + "org/slf4j#slf4j-parent/1.7.36": { + "pom": "sha256-uziNN/vN083mTDzt4hg4aTIY3EUfBAQMXfNgp47X6BI=" + }, + "org/sonatype/oss#oss-parent/5": { + "pom": "sha256-FnjUEgpYXYpjATGu7ExSTZKDmFg7fqthbufVqH9SDT0=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/sonatype/oss#oss-parent/9": { + "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" + }, + "org/testng#testng/6.11": { + "jar": "sha256-VdWJesCTOQEO7SBREkMJpxJ5iNgv8GNCKJJtUdo1QPY=", + "pom": "sha256-mLAN2VtnH6U7TZjnzR5+/I2CfNdrEPW0uZjk07XN9JE=" + }, + "org/tukaani#xz/1.9": { + "jar": "sha256-IRswbPxE+Plt86Cj3a91uoxSie7XfWDXL4ibuFX1NeU=", + "pom": "sha256-CTvhsDMxvOKTLWglw36YJy12Ieap6fuTKJoAJRi43Vo=" + }, + "org/unix4j#unix4j-base/0.6": { + "jar": "sha256-dOiHClT3oLNDIz6ZcSnyg9uvBIud6/H1aOalwH3LbYw=", + "pom": "sha256-4aXxzU2oD7pYfvCwWGO83MnDQ/GtWg+8YlTgs0J+40U=" + }, + "org/unix4j#unix4j-command/0.6": { + "jar": "sha256-UumRX7DzERvMtdoxvqVX/MeV7xH1bs6KrI5QJzELVjk=", + "pom": "sha256-X14lknDlCSul+cwDnBQpL69xh9FCHk9Y8/QXyuVQ/Ko=" + }, + "org/unix4j#unix4j-core/0.6": { + "pom": "sha256-1XgPLlf1TdsnKUGgOcblb3Xo7HG6/CvYeTzDcOgy9HM=" + }, + "org/unix4j#unix4j/0.6": { + "pom": "sha256-WDiqu1K7nH+Tu0GfQHWBJpMXKV9KrHMbtXvZSmKu4Uw=" + }, + "org/violetlib#jnr/11": { + "jar": "sha256-IQjDFWiGB4PxMJdEk1balFUEuSpir84hmFWAlLW5ZZ4=", + "pom": "sha256-TMlmvQeIgGZMQY00YpzUlOXvWTch92oyei8VgiDIaI4=" + }, + "org/violetlib#vappearances/3": { + "jar": "sha256-+OWyHWPDX3DkMaEY9EbQTqZSTZxmd+SgOJ3Iy3L9K7E=", + "pom": "sha256-dex3tlNLtJZvMCSKaCDBnSQOZpGrGcYMO9nlr0FtvSk=" + }, + "org/violetlib#vaqua/10": { + "jar": "sha256-e4ZgbF9Mdls2MoUwvdJ/nHmW0NK3a1ZjKFEAE8x4cxI=", + "pom": "sha256-ANTlWsGt0lnrbokL0oa3cQKjLtuXbou7qglQFLCztns=" + }, + "org/yaml#snakeyaml/1.17": { + "jar": "sha256-Vmazb520bwbdWhnXO7/ztYjVlpwPS4hI/eD17ISUMKU=", + "pom": "sha256-2sbaZNJ6+/QXByGGcQTLB3iRGMR9YjhXLP9F1mmNMbc=" + }, + "oro#oro/2.0.8": { + "jar": "sha256-4AzNrV3360P97kQjLvZGAr9jgHwtEzp76Dugn9Sa8m4=", + "pom": "sha256-mqnf6y6F4dXnkyyHFAaXzswrD63ZM9Z5/UIKLkODGoI=" + }, + "tomcat#jasper-compiler/5.5.12": { + "jar": "sha256-V2Z7FKEPkc7Y9uw4iBcIuJghH9D6ull8MS/R0cjGwKM=", + "pom": "sha256-eZ+lAPzpBrou6E+9mt409mN1p4oUgehMyuSgwdo+pWQ=" + }, + "tomcat#jasper-runtime/5.5.12": { + "jar": "sha256-EoqikuUM2Vbox7vakLfiINBECXdx7V1i671dNyU+vvQ=", + "pom": "sha256-Supxo2hAM7WFhsp6oMh6LOzgtN3LglNF8vOQz1lfYlA=" + }, + "xmlenc#xmlenc/0.52": { + "jar": "sha256-KCrhhfwv8n2ncUr5liiXwJz++vuIByIZxKL5xzYWwCY=", + "pom": "sha256-vSLwW83TfiJr9kJvIv73dI1y42TJ7xQAT3t7b4qC+EQ=" + }, + "xmlpull#xmlpull/1.1.3.1": { + "jar": "sha256-NOCO5iEWBxy7acDtcNFaelsgjWJ5jFnyEgu4kpMky2M=", + "pom": "sha256-jxD/2N8NPpgZyMyEAnCcaySLxTqVTvbkVHDZrjpXNfs=" + } + }, + "https://repository.jboss.org/maven2/javax": { + "activation#activation/1.1.1": { + "jar": "sha256-rkdRIOn82ZtLALODKb1hzcXrdU7uA/5mwB9Q4TdyT5k=", + "pom": "sha256-D8ky5fICygzkukU/sdrMUoxhi76//h4igSYUrbcaU5Q=" + }, + "xml#jaxrpc-api/1.1": { + "jar": "sha256-dF1OFvbzNlIC5VR4D9AFyri/XMDyjjceeAkw24pc9Yc=", + "pom": "sha256-UDMEHgq0M92KL9K+HpQ4k+qBYBN5ynMLdWYbfj5aIto=" + }, + "xml/soap#saaj-api/1.3": { + "jar": "sha256-02J4xJxQ8f5BwmRBSh9XKmV41US4yokFNZfsucqH9j4=", + "pom": "sha256-mVi9bmvcCAJ60U1ztgWICaUTidM0mUiv2d+N7CUu5vk=" + } + } +} diff --git a/pkgs/applications/file-managers/nnn/default.nix b/pkgs/applications/file-managers/nnn/default.nix index d8c10d7830239..6ad01c1563388 100644 --- a/pkgs/applications/file-managers/nnn/default.nix +++ b/pkgs/applications/file-managers/nnn/default.nix @@ -20,19 +20,19 @@ }: # Mutually exclusive options -assert withIcons -> (withNerdIcons == false && withEmojis == false); -assert withNerdIcons -> (withIcons == false && withEmojis == false); -assert withEmojis -> (withIcons == false && withNerdIcons == false); +assert withIcons -> (!withNerdIcons && !withEmojis); +assert withNerdIcons -> (!withIcons && !withEmojis); +assert withEmojis -> (!withIcons && !withNerdIcons); stdenv.mkDerivation (finalAttrs: { pname = "nnn"; - version = "4.9"; + version = "5.0"; src = fetchFromGitHub { owner = "jarun"; repo = "nnn"; rev = "v${finalAttrs.version}"; - hash = "sha256-g19uI36HyzTF2YUQKFP4DE2ZBsArGryVHhX79Y0XzhU="; + hash = "sha256-HShHSjqD0zeE1/St1Y2dUeHfac6HQnPFfjmFvSuEXUA="; }; patches = [ diff --git a/pkgs/applications/file-managers/noice/default.nix b/pkgs/applications/file-managers/noice/default.nix index d41c12faad8d1..7421a3816d292 100644 --- a/pkgs/applications/file-managers/noice/default.nix +++ b/pkgs/applications/file-managers/noice/default.nix @@ -1,7 +1,5 @@ { lib, stdenv, fetchgit, ncurses, conf ? null }: -with lib; - stdenv.mkDerivation rec { pname = "noice"; version = "0.8"; @@ -18,8 +16,8 @@ stdenv.mkDerivation rec { substituteInPlace noice.c --replace 'printw(str);' 'printw("%s", str);' ''; - configFile = optionalString (conf!=null) (builtins.toFile "config.def.h" conf); - preBuild = optionalString (conf!=null) "cp ${configFile} config.def.h"; + configFile = lib.optionalString (conf!=null) (builtins.toFile "config.def.h" conf); + preBuild = lib.optionalString (conf!=null) "cp ${configFile} config.def.h"; buildInputs = [ ncurses ]; @@ -27,7 +25,7 @@ stdenv.mkDerivation rec { installFlags = [ "DESTDIR=$(out)" "PREFIX=" ]; - meta = { + meta = with lib; { description = "Small ncurses-based file browser"; homepage = "https://git.2f30.org/noice/"; license = licenses.bsd2; 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/file-managers/portfolio-filemanager/default.nix b/pkgs/applications/file-managers/portfolio-filemanager/default.nix index 8375e18634b08..6b19d9564f682 100644 --- a/pkgs/applications/file-managers/portfolio-filemanager/default.nix +++ b/pkgs/applications/file-managers/portfolio-filemanager/default.nix @@ -4,7 +4,6 @@ , appstream-glib , desktop-file-utils , gettext -, glib , gobject-introspection , gtk3 , gtk4 diff --git a/pkgs/applications/file-managers/projectable/default.nix b/pkgs/applications/file-managers/projectable/default.nix index 207ea0d0ba0a7..b296e6a7ff1cf 100644 --- a/pkgs/applications/file-managers/projectable/default.nix +++ b/pkgs/applications/file-managers/projectable/default.nix @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { libgit2 openssl zlib - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ]; diff --git a/pkgs/applications/file-managers/ranger/default.nix b/pkgs/applications/file-managers/ranger/default.nix index ee2df2a60f693..48d161e22d5de 100644 --- a/pkgs/applications/file-managers/ranger/default.nix +++ b/pkgs/applications/file-managers/ranger/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, python3Packages, file, less, highlight, w3m, ranger, imagemagick, testers +{ lib, fetchFromGitHub, python3Packages, file, less, highlight, w3m, imagemagick , imagePreviewSupport ? true , sixelPreviewSupport ? true , neoVimSupport ? true diff --git a/pkgs/applications/file-managers/shfm/default.nix b/pkgs/applications/file-managers/shfm/default.nix deleted file mode 100644 index 47bb6dfdbe8c8..0000000000000 --- a/pkgs/applications/file-managers/shfm/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -}: - -stdenv.mkDerivation rec { - pname = "shfm"; - version = "0.4.2"; - - src = fetchFromGitHub { - owner = "dylanaraps"; - repo = pname; - rev = version; - hash = "sha256-ilVrUFfyzOZgjbBTqlHA9hLaTHw1xHFo1Y/tjXygNEs="; - }; - - postPatch = '' - patchShebangs ./shfm - ''; - - dontConfigure = true; - dontBuild = true; - - installPhase = '' - runHook preInstall - install -D shfm --target-directory $out/bin/ - install -D README --target-directory $out/share/doc/${pname}/ - runHook postInstall - ''; - - meta = with lib; { - homepage = "https://github.com/dylanaraps/shfm"; - description = "POSIX-shell based file manager"; - license = licenses.mit; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.all; - mainProgram = "shfm"; - }; -} diff --git a/pkgs/applications/file-managers/walk/default.nix b/pkgs/applications/file-managers/walk/default.nix index fab06bd8da96b..6e5e69a106226 100644 --- a/pkgs/applications/file-managers/walk/default.nix +++ b/pkgs/applications/file-managers/walk/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "walk"; - version = "1.8.0"; + version = "1.10.0"; src = fetchFromGitHub { owner = "antonmedv"; repo = "walk"; rev = "v${version}"; - hash = "sha256-xs9K8WrckkpyzHnjYlzRsicMW+o7nTMYCIZVWOwx4PU="; + hash = "sha256-wGiRMNgp5NZVj8ILyQ2C/iqpjv4XgphRfWcF/CSMj48="; }; - vendorHash = "sha256-p92H4JqklrV0c4vp9puAgDzBzMpwI40WPz9ix0e77l8="; + vendorHash = "sha256-MTM7zR5OYHbzAm07FTLvXVnESARg50/BZrB2bl+LtXM="; meta = with lib; { description = "Terminal file manager"; diff --git a/pkgs/applications/file-managers/xfe/default.nix b/pkgs/applications/file-managers/xfe/default.nix index 3853119126d1f..0b09d6ea9ed58 100644 --- a/pkgs/applications/file-managers/xfe/default.nix +++ b/pkgs/applications/file-managers/xfe/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "xfe"; - version = "1.46.1"; + version = "1.46.2"; src = fetchurl { url = "mirror://sourceforge/xfe/xfe-${version}.tar.xz"; - sha256 = "sha256-NTpowZCl4OTWrK2txh7f7t9WxGRdfM0M3KIyHq3nJUg="; + sha256 = "sha256-6hNNda4BKCY9E02uFYJnt0JySNp/is1ZqjFlOwQcRWs="; }; nativeBuildInputs = [ pkg-config intltool ]; @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://sourceforge.net/projects/xfe/"; license = licenses.gpl2; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/file-managers/xplorer/default.nix b/pkgs/applications/file-managers/xplorer/default.nix index 027c051fef79a..9c3a04e8dde3b 100644 --- a/pkgs/applications/file-managers/xplorer/default.nix +++ b/pkgs/applications/file-managers/xplorer/default.nix @@ -6,7 +6,10 @@ , freetype , gtk3 , libsoup -, mkYarnPackage +, stdenvNoCC +, yarnConfigHook +, yarnBuildHook +, nodejs , openssl , pkg-config , rustPlatform @@ -25,7 +28,7 @@ let sha256 = "sha256-VFRdkSfe2mERaYYtZlg9dvH1loGWVBGwiTRj4AoNEAo="; }; - frontend-build = mkYarnPackage { + frontend-build = stdenvNoCC.mkDerivation (finalAttrs: { inherit version src; pname = "xplorer-ui"; @@ -33,19 +36,16 @@ let yarnLock = src + "/yarn.lock"; sha256 = "sha256-H37vD0GTSsWV5UH7C6UANDWnExTGh8yqajLn3y7P2T8="; }; - - packageJSON = ./package.json; - - buildPhase = '' - export HOME=$(mktemp -d) - yarn --offline run prebuild - - cp -r deps/xplorer/out $out + nativeBuildInputs = [ + yarnConfigHook + yarnBuildHook + nodejs + ]; + yarnBuildScript = "prebuild"; + installPhase = '' + cp -r out $out ''; - - distPhase = "true"; - dontInstall = true; - }; + }); in rustPlatform.buildRustPackage { diff --git a/pkgs/applications/file-managers/xplorer/package.json b/pkgs/applications/file-managers/xplorer/package.json deleted file mode 100644 index fd381eb347d9d..0000000000000 --- a/pkgs/applications/file-managers/xplorer/package.json +++ /dev/null @@ -1,88 +0,0 @@ -{ - "name": "xplorer", - "description": "Xplorer, a customizable, modern file manager", - "version": "0.3.1", - "author": "Justin Maximillian Kimlim <kimlimjustin@gmail.com>", - "icon": "build/icon.icns", - "private": true, - "homepage": "https://xplorer.space", - "repository": { - "type": "git", - "url": "https://github.com/kimlimjustin/xplorer.git" - }, - "os": ["darwin", "win32", "linux"], - "scripts": { - "start": "yarn dev", - "web": "concurrently \"cd api/web && cargo run\" \"live-server ./out/src --no-browser\"", - "dev": "yarn compile && concurrently --kill-others \"yarn compile:watch\" \"yarn sass:watch\" \"yarn web\" \"tauri dev\"", - "clean": "rimraf out", - "sass": "sass src/Public/style.scss out/src/Public/style.css", - "sass:watch": "node scripts/sass-watcher.js", - "docs": "yarn --cwd ./docs start", - "pretest": "yarn compile", - "test": "jest", - "copyfiles": "node scripts/copyfiles", - "compile": "webpack && yarn sass && yarn copyfiles", - "compile:watch": "webpack --watch", - "crowdin": "crowdin", - "crowdin:pull": "crowdin pull", - "postcrowdin:pull": "node scripts/post_crowdin_pull.js", - "crowdin:sync": "yarn --cwd ./docs write-translations && crowdin upload && crowdin download", - "lint": "eslint -c .eslintrc.yml --ext .ts ./src", - "prettier": "prettier --write src", - "grunt": "grunt", - "css:minify": "cleancss --batch --batch-suffix \"\" out/**/*.css ", - "prebuild": "yarn compile && yarn grunt && yarn css:minify", - "build": "tauri build", - "postinstall": "husky install", - "fakefiles": "python scripts/generate-fake-files.py 1000" - }, - "workspaces": ["packages/*"], - "keywords": [ - "Xplorer", - "File explorer", - "File", - "File manager", - "Folders", - "Directory" - ], - "license": "Apache-2.0", - "devDependencies": { - "@crowdin/cli": "^3.6.5", - "@tauri-apps/cli": "^1.1.1", - "@types/jest": "^27.0.2", - "@types/marked": "^4.0.1", - "@typescript-eslint/eslint-plugin": "^5.4.0", - "@typescript-eslint/parser": "^5.4.0", - "buffer": "^6.0.3", - "clean-css-cli": "^5.3.3", - "concurrently": "^6.2.1", - "cpy": "^8.1.2", - "eslint": "^8.2.0", - "grunt": "^1.4.1", - "grunt-cli": "^1.4.3", - "grunt-contrib-uglify": "^5.0.1", - "grunt-contrib-watch": "^1.1.0", - "husky": "^7.0.2", - "jest": "^27.1.0", - "live-server": "^1.2.1", - "node-watch": "^0.7.1", - "postinstall-postinstall": "^2.1.0", - "prettier": "2.5.1", - "rimraf": "^3.0.2", - "sass": "1.45.2", - "ts-jest": "^27.0.7", - "ts-loader": "^9.2.6", - "typescript": "^4.4.2", - "webpack": "^5.58.2", - "webpack-cli": "^4.9.0" - }, - "dependencies": { - "@tauri-apps/api": "^1.1.0", - "highlight.js": "^11.2.0", - "mammoth": "^1.4.18", - "marked": "^4.0.15", - "xlsx": "^0.17.1" - }, - "optionalDependencies": {} -} diff --git a/pkgs/applications/finance/irpf/default.nix b/pkgs/applications/finance/irpf/default.nix deleted file mode 100644 index 9bf9c1f2d0cc5..0000000000000 --- a/pkgs/applications/finance/irpf/default.nix +++ /dev/null @@ -1,77 +0,0 @@ -{ lib -, stdenvNoCC -, fetchzip -, copyDesktopItems -, jdk11 -, makeDesktopItem -, makeWrapper -, unzip -, xdg-utils -}: - -stdenvNoCC.mkDerivation rec { - pname = "irpf"; - version = "2024-1.1"; - - # https://www.gov.br/receitafederal/pt-br/centrais-de-conteudo/download/pgd/dirpf - # Para outros sistemas operacionais -> Multi - src = let - year = lib.head (lib.splitVersion version); - in fetchzip { - url = "https://downloadirpf.receita.fazenda.gov.br/irpf/${year}/irpf/arquivos/IRPF${version}.zip"; - hash = "sha256-7Eh5XhZKs2DAQC33ICUG+mgjEU7H3jdYZSeiHNJ6I6Q="; - }; - - nativeBuildInputs = [ unzip makeWrapper copyDesktopItems ]; - - desktopItems = [ - (makeDesktopItem { - name = pname; - exec = pname; - icon = "rfb64"; - desktopName = "Imposto de Renda Pessoa Física"; - comment = "Programa Oficial da Receita para elaboração do IRPF"; - categories = [ "Office" ]; - }) - ]; - - installPhase = '' - runHook preInstall - - BASEDIR="$out/share/${pname}" - mkdir -p "$BASEDIR" - - cp --no-preserve=mode -r help lib lib-modulos "$BASEDIR" - - install -Dm644 irpf.jar Leia-me.htm offline.png online.png pgd-updater.jar "$BASEDIR" - - # make xdg-open overrideable at runtime - makeWrapper ${jdk11}/bin/java $out/bin/${pname} \ - --add-flags "-Dawt.useSystemAAFontSettings=on" \ - --add-flags "-Dswing.aatext=true" \ - --add-flags "-jar $BASEDIR/${pname}.jar" \ - --suffix PATH : ${lib.makeBinPath [ xdg-utils ]} \ - --set _JAVA_AWT_WM_NONREPARENTING 1 \ - --set AWT_TOOLKIT MToolkit - - mkdir -p $out/share/pixmaps - unzip -j lib/ppgd-icones-4.0.jar icones/rfb64.png -d $out/share/pixmaps - - runHook postInstall - ''; - - meta = with lib; { - description = "Brazillian government application for reporting income tax"; - longDescription = '' - Brazillian government application for reporting income tax. - - IRFP - Imposto de Renda Pessoa Física - Receita Federal do Brasil. - ''; - homepage = "https://www.gov.br/receitafederal/pt-br"; - license = licenses.unfree; - platforms = platforms.all; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; - maintainers = with maintainers; [ atila bryanasdev000 ]; - mainProgram = "irpf"; - }; -} diff --git a/pkgs/applications/gis/gmt/default.nix b/pkgs/applications/gis/gmt/default.nix index 3cc04e3744400..9eb1bde4266d3 100644 --- a/pkgs/applications/gis/gmt/default.nix +++ b/pkgs/applications/gis/gmt/default.nix @@ -1,59 +1,98 @@ -{ lib, stdenv, fetchurl, cmake, curl, Accelerate, CoreGraphics, CoreVideo -, fftwSinglePrec, netcdf, pcre, gdal, blas, lapack, glibc, ghostscript, dcw-gmt -, gshhg-gmt }: +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + curl, + Accelerate, + CoreGraphics, + CoreVideo, + fftwSinglePrec, + netcdf, + libxml2, + pcre, + gdal, + blas, + lapack, + glibc, + ghostscript, + dcw-gmt, + gshhg-gmt, +}: -/* The onus is on the user to also install: - - ffmpeg for webm or mp4 output - - graphicsmagick for gif output +/* + The onus is on the user to also install: + - ffmpeg for webm or mp4 output + - graphicsmagick for gif output */ -stdenv.mkDerivation rec { +let + # Certainly not an ideal situation, See: + # https://github.com/NixOS/nixpkgs/pull/340707#issuecomment-2361894717 + netcdf' = netcdf.override { + libxml2 = libxml2.override { + enableHttp = true; + }; + }; +in stdenv.mkDerivation (finalAttrs: { pname = "gmt"; - version = "6.4.0"; - src = fetchurl { - url = "https://github.com/GenericMappingTools/gmt/releases/download/${version}/gmt-${version}-src.tar.gz"; - sha256 = "sha256-0mfAx9b7MMnqfgKe8n2tsm/9e5LLS0cD+aO6Do85Ohs="; + version = "6.5.0"; + src = fetchFromGitHub { + owner = "GenericMappingTools"; + repo = "gmt"; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-KKIYhljCtk9t9CuvTLsSGvUkUwazWTm9ymBB3wLwSoI="; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + ]; - buildInputs = [ curl gdal netcdf pcre dcw-gmt gshhg-gmt ] - ++ (if stdenv.isDarwin then [ - Accelerate - CoreGraphics - CoreVideo - ] else [ - glibc - fftwSinglePrec - blas - lapack - ]); + buildInputs = + [ + curl + gdal + netcdf' + pcre + dcw-gmt + gshhg-gmt + ] + ++ ( + if stdenv.hostPlatform.isDarwin then + [ + Accelerate + CoreGraphics + CoreVideo + ] + else + [ + glibc + fftwSinglePrec + blas + lapack + ] + ); - propagatedBuildInputs = [ ghostscript ]; + propagatedBuildInputs = [ + ghostscript + ]; - cmakeFlags = [ - "-DGMT_DOCDIR=share/doc/gmt" - "-DGMT_MANDIR=share/man" - "-DGMT_LIBDIR=lib" - "-DCOPY_GSHHG:BOOL=FALSE" - "-DGSHHG_ROOT=${gshhg-gmt.out}/share/gshhg-gmt" - "-DCOPY_DCW:BOOL=FALSE" - "-DDCW_ROOT=${dcw-gmt.out}/share/dcw-gmt" - "-DGDAL_ROOT=${gdal.out}" - "-DNETCDF_ROOT=${netcdf.out}" - "-DPCRE_ROOT=${pcre.out}" - "-DGMT_INSTALL_TRADITIONAL_FOLDERNAMES:BOOL=FALSE" - "-DGMT_ENABLE_OPENMP:BOOL=TRUE" - "-DGMT_INSTALL_MODULE_LINKS:BOOL=FALSE" - "-DLICENSE_RESTRICTED=LGPL" # "GPL" and "no" also valid - ] ++ (with stdenv; - lib.optionals (!isDarwin) [ - "-DFFTW3_ROOT=${fftwSinglePrec.dev}" - "-DLAPACK_LIBRARY=${lapack}/lib/liblapack.so" - "-DBLAS_LIBRARY=${blas}/lib/libblas.so" - ]); + cmakeFlags = + [ + "-DGMT_DOCDIR=share/doc/gmt" + "-DGMT_MANDIR=share/man" + "-DGMT_LIBDIR=lib" + "-DCOPY_GSHHG:BOOL=FALSE" + "-DGSHHG_ROOT=${gshhg-gmt.out}/share/gshhg-gmt" + "-DCOPY_DCW:BOOL=FALSE" + "-DDCW_ROOT=${dcw-gmt.out}/share/dcw-gmt" + "-DGMT_INSTALL_TRADITIONAL_FOLDERNAMES:BOOL=FALSE" + "-DGMT_ENABLE_OPENMP:BOOL=TRUE" + "-DGMT_INSTALL_MODULE_LINKS:BOOL=FALSE" + "-DLICENSE_RESTRICTED=LGPL" # "GPL" and "no" also valid + ]; - meta = with lib; { + meta = { homepage = "https://www.generic-mapping-tools.org"; description = "Tools for manipulating geographic and cartesian data sets"; longDescription = '' @@ -65,9 +104,9 @@ stdenv.mkDerivation rec { transformations and includes supporting data such as coastlines, rivers, and political boundaries and optionally country polygons. ''; - platforms = [ "x86_64-linux" "x86_64-darwin" ]; - license = licenses.lgpl3Plus; - maintainers = with maintainers; [ tviti ]; + platforms = lib.platforms.unix; + license = lib.licenses.lgpl3Plus; + maintainers = with lib.maintainers; [ tviti ]; }; -} +}) diff --git a/pkgs/applications/gis/grass/clang-integer-conversion.patch b/pkgs/applications/gis/grass/clang-integer-conversion.patch deleted file mode 100644 index 85145f45c37d0..0000000000000 --- a/pkgs/applications/gis/grass/clang-integer-conversion.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -ur a/db/drivers/mysql/db.c b/db/drivers/mysql/db.c ---- a/db/drivers/mysql/db.c 1969-12-31 19:00:01.000000000 -0500 -+++ b/db/drivers/mysql/db.c 2023-11-09 23:26:25.329700495 -0500 -@@ -52,9 +52,16 @@ - - db_get_login2("mysql", name, &user, &password, &host, &port); - -+ const char* errstr; -+ unsigned int port_number = (unsigned int)strtonum(port, 0, 65536, &errstr); -+ if (errstr != NULL) { -+ db_d_append_error("%s", errstr); -+ return DB_FAILED; -+ } -+ - connection = mysql_init(NULL); - res = mysql_real_connect(connection, host, user, password, -- connpar.dbname, port, NULL, 0); -+ connpar.dbname, port_number, NULL, 0); - - if (res == NULL) { - db_d_append_error("%s\n%s", _("Connection failed."), diff --git a/pkgs/applications/gis/grass/default.nix b/pkgs/applications/gis/grass/default.nix index 4eb10a34d2e24..68bbcb46b5260 100644 --- a/pkgs/applications/gis/grass/default.nix +++ b/pkgs/applications/gis/grass/default.nix @@ -5,25 +5,31 @@ , makeWrapper , wrapGAppsHook3 +, withOpenGL ? !stdenv.hostPlatform.isDarwin + , bison , blas , cairo , ffmpeg , fftw , flex +, freetype , gdal , geos +, lapack +, libGLU , libiconv -, libmysqlclient , libpng +, libsvm , libtiff , libxml2 +, llvmPackages , netcdf , pdal , pkg-config , postgresql , proj -, python3Packages +, python311Packages , readline , sqlite , wxGTK32 @@ -31,15 +37,19 @@ , zstd }: +let + pyPackages = python311Packages; + +in stdenv.mkDerivation (finalAttrs: { pname = "grass"; - version = "8.3.2"; + version = "8.4.0"; src = fetchFromGitHub { owner = "OSGeo"; repo = "grass"; rev = finalAttrs.version; - hash = "sha256-loeg+7h676d2WdYOMcJFyzeEZcxjBynir6Hz0J/GBns="; + hash = "sha256-NKMshd6pr2O62ZjmQ/oPttmeVBYVD0Nqhh3SwQrhZf8="; }; nativeBuildInputs = [ @@ -50,22 +60,23 @@ stdenv.mkDerivation (finalAttrs: { flex gdal # for `gdal-config` geos # for `geos-config` - libmysqlclient # for `mysql_config` netcdf # for `nc-config` pkg-config - ] ++ (with python3Packages; [ python-dateutil numpy wxpython ]); + ] ++ (with pyPackages; [ python-dateutil numpy wxpython ]); buildInputs = [ blas cairo ffmpeg fftw + freetype gdal geos - libmysqlclient + lapack libpng + libsvm libtiff - libxml2 + (libxml2.override { enableHttp = true; }) netcdf pdal postgresql @@ -75,44 +86,45 @@ stdenv.mkDerivation (finalAttrs: { wxGTK32 zlib zstd - ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; + ] ++ lib.optionals withOpenGL [ libGLU ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ] + ++ lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ]; strictDeps = true; - patches = lib.optionals stdenv.isDarwin [ - # Fix conversion of const char* to unsigned int. - ./clang-integer-conversion.patch - ]; - - # Correct mysql_config query - postPatch = '' - substituteInPlace configure --replace "--libmysqld-libs" "--libs" - ''; - configureFlags = [ "--with-blas" + "--with-cairo-ldflags=-lfontconfig" + "--with-cxx" + "--with-fftw" + "--with-freetype" "--with-geos" - # It complains about missing libmysqld but doesn't really seem to need it - "--with-mysql" - "--with-mysql-includes=${lib.getDev libmysqlclient}/include/mysql" - "--with-mysql-libs=${libmysqlclient}/lib/mysql" - "--with-netcdf" + "--with-gdal" + "--with-lapack" + "--with-libsvm" + "--with-nls" + "--with-openmp" + "--with-pdal" "--with-postgres" "--with-postgres-libs=${postgresql.lib}/lib/" "--with-proj-includes=${proj.dev}/include" "--with-proj-libs=${proj}/lib" "--with-proj-share=${proj}/share/proj" - "--with-pthread" - "--with-readline" + "--with-sqlite" + "--with-zstd" + "--without-bzlib" + "--without-mysql" + "--without-odbc" + ] ++ lib.optionals (! withOpenGL) [ "--without-opengl" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "--without-cairo" "--without-freetype" "--without-x" ]; # Otherwise a very confusing "Can't load GDAL library" error - makeFlags = lib.optional stdenv.isDarwin "GDAL_DYNAMIC="; + makeFlags = lib.optional stdenv.hostPlatform.isDarwin "GDAL_DYNAMIC="; /* Ensures that the python script run at build time are actually executable; * otherwise, patchShebangs ignores them. */ @@ -127,7 +139,7 @@ stdenv.mkDerivation (finalAttrs: { postInstall = '' wrapProgram $out/bin/grass \ --set PYTHONPATH $PYTHONPATH \ - --set GRASS_PYTHON ${python3Packages.python.interpreter} \ + --set GRASS_PYTHON ${pyPackages.python.interpreter} \ --suffix LD_LIBRARY_PATH ':' '${gdal}/lib' ln -s $out/grass*/lib $out/lib ln -s $out/grass*/include $out/include diff --git a/pkgs/applications/gis/qgis/default.nix b/pkgs/applications/gis/qgis/default.nix index 8b19c70c3b4d0..5e22cc9aa0161 100644 --- a/pkgs/applications/gis/qgis/default.nix +++ b/pkgs/applications/gis/qgis/default.nix @@ -1,5 +1,4 @@ -{ lib -, makeWrapper +{ makeWrapper , nixosTests , symlinkJoin @@ -25,13 +24,13 @@ in symlinkJoin rec { pythonInputs = qgis-unwrapped.pythonBuildInputs ++ (extraPythonPackages qgis-unwrapped.py.pkgs); postBuild = '' - # unpackPhase - buildPythonPath "$pythonInputs" - wrapProgram $out/bin/qgis \ - --prefix PATH : $program_PATH \ - --set PYTHONPATH $program_PYTHONPATH + for program in $out/bin/*; do + wrapProgram $program \ + --prefix PATH : $program_PATH \ + --set PYTHONPATH $program_PYTHONPATH + done ''; passthru = { diff --git a/pkgs/applications/gis/qgis/ltr.nix b/pkgs/applications/gis/qgis/ltr.nix index b551fe0a1e44d..53e6069e87071 100644 --- a/pkgs/applications/gis/qgis/ltr.nix +++ b/pkgs/applications/gis/qgis/ltr.nix @@ -1,5 +1,4 @@ -{ lib -, makeWrapper +{ makeWrapper , nixosTests , symlinkJoin @@ -25,13 +24,13 @@ in symlinkJoin rec { pythonInputs = qgis-ltr-unwrapped.pythonBuildInputs ++ (extraPythonPackages qgis-ltr-unwrapped.py.pkgs); postBuild = '' - # unpackPhase - buildPythonPath "$pythonInputs" - wrapProgram $out/bin/qgis \ - --prefix PATH : $program_PATH \ - --set PYTHONPATH $program_PYTHONPATH + for program in $out/bin/*; do + wrapProgram $program \ + --prefix PATH : $program_PATH \ + --set PYTHONPATH $program_PYTHONPATH + done ''; passthru = { diff --git a/pkgs/applications/gis/qgis/set-pyqt-package-dirs-ltr.patch b/pkgs/applications/gis/qgis/set-pyqt-package-dirs-ltr.patch new file mode 100644 index 0000000000000..725c0b350e824 --- /dev/null +++ b/pkgs/applications/gis/qgis/set-pyqt-package-dirs-ltr.patch @@ -0,0 +1,59 @@ +diff --git a/cmake/FindPyQt5.cmake b/cmake/FindPyQt5.cmake +index b51fd0075e..87ee317e05 100644 +--- a/cmake/FindPyQt5.cmake ++++ b/cmake/FindPyQt5.cmake +@@ -25,7 +25,7 @@ ELSE(EXISTS PYQT5_VERSION_STR) + IF(SIP_BUILD_EXECUTABLE) + # SIP >= 5.0 path + +- FILE(GLOB _pyqt5_metadata "${Python_SITEARCH}/PyQt5-*.dist-info/METADATA") ++ FILE(GLOB _pyqt5_metadata "@pyQt5PackageDir@/PyQt5-*.dist-info/METADATA") + IF(_pyqt5_metadata) + FILE(READ ${_pyqt5_metadata} _pyqt5_metadata_contents) + STRING(REGEX REPLACE ".*\nVersion: ([^\n]+).*$" "\\1" PYQT5_VERSION_STR ${_pyqt5_metadata_contents}) +@@ -34,8 +34,8 @@ ELSE(EXISTS PYQT5_VERSION_STR) + ENDIF(_pyqt5_metadata) + + IF(PYQT5_VERSION_STR) +- SET(PYQT5_MOD_DIR "${Python_SITEARCH}/PyQt5") +- SET(PYQT5_SIP_DIR "${Python_SITEARCH}/PyQt5/bindings") ++ SET(PYQT5_MOD_DIR "@pyQt5PackageDir@/PyQt5") ++ SET(PYQT5_SIP_DIR "@pyQt5PackageDir@/PyQt5/bindings") + FIND_PROGRAM(__pyuic5 "pyuic5") + GET_FILENAME_COMPONENT(PYQT5_BIN_DIR ${__pyuic5} DIRECTORY) + +diff --git a/cmake/FindQsci.cmake b/cmake/FindQsci.cmake +index 69e41c1fe9..5456c3d59b 100644 +--- a/cmake/FindQsci.cmake ++++ b/cmake/FindQsci.cmake +@@ -24,7 +24,7 @@ ELSE(QSCI_MOD_VERSION_STR) + IF(SIP_BUILD_EXECUTABLE) + # SIP >= 5.0 path + +- FILE(GLOB _qsci_metadata "${Python_SITEARCH}/QScintilla*.dist-info/METADATA") ++ FILE(GLOB _qsci_metadata "@qsciPackageDir@/QScintilla*.dist-info/METADATA") + IF(_qsci_metadata) + FILE(READ ${_qsci_metadata} _qsci_metadata_contents) + STRING(REGEX REPLACE ".*\nVersion: ([^\n]+).*$" "\\1" QSCI_MOD_VERSION_STR ${_qsci_metadata_contents}) +@@ -33,7 +33,7 @@ ELSE(QSCI_MOD_VERSION_STR) + ENDIF(_qsci_metadata) + + IF(QSCI_MOD_VERSION_STR) +- SET(QSCI_SIP_DIR "${PYQT_SIP_DIR}") ++ SET(QSCI_SIP_DIR "@qsciPackageDir@/PyQt5/bindings") + SET(QSCI_FOUND TRUE) + ENDIF(QSCI_MOD_VERSION_STR) + +diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt +index 4cd19c3af4..668cc6a5e6 100644 +--- a/python/CMakeLists.txt ++++ b/python/CMakeLists.txt +@@ -212,7 +212,7 @@ if (WITH_GUI) + install(FILES ${QGIS_PYTHON_OUTPUT_DIRECTORY}/_gui.pyi DESTINATION ${QGIS_PYTHON_DIR}) + endif() + if(QSCI_SIP_DIR) +- set(SIP_EXTRA_OPTIONS ${SIP_EXTRA_OPTIONS} -I ${QSCI_SIP_DIR}) ++ set(SIP_BUILD_EXTRA_OPTIONS ${SIP_BUILD_EXTRA_OPTIONS} --include-dir=${QSCI_SIP_DIR}) + else() + message(STATUS "Qsci sip file not found - disabling bindings for derived classes") + set(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} HAVE_QSCI_SIP) diff --git a/pkgs/applications/gis/qgis/set-pyqt-package-dirs.patch b/pkgs/applications/gis/qgis/set-pyqt-package-dirs.patch index 725c0b350e824..a1771d9f03d39 100644 --- a/pkgs/applications/gis/qgis/set-pyqt-package-dirs.patch +++ b/pkgs/applications/gis/qgis/set-pyqt-package-dirs.patch @@ -11,16 +11,6 @@ index b51fd0075e..87ee317e05 100644 IF(_pyqt5_metadata) FILE(READ ${_pyqt5_metadata} _pyqt5_metadata_contents) STRING(REGEX REPLACE ".*\nVersion: ([^\n]+).*$" "\\1" PYQT5_VERSION_STR ${_pyqt5_metadata_contents}) -@@ -34,8 +34,8 @@ ELSE(EXISTS PYQT5_VERSION_STR) - ENDIF(_pyqt5_metadata) - - IF(PYQT5_VERSION_STR) -- SET(PYQT5_MOD_DIR "${Python_SITEARCH}/PyQt5") -- SET(PYQT5_SIP_DIR "${Python_SITEARCH}/PyQt5/bindings") -+ SET(PYQT5_MOD_DIR "@pyQt5PackageDir@/PyQt5") -+ SET(PYQT5_SIP_DIR "@pyQt5PackageDir@/PyQt5/bindings") - FIND_PROGRAM(__pyuic5 "pyuic5") - GET_FILENAME_COMPONENT(PYQT5_BIN_DIR ${__pyuic5} DIRECTORY) diff --git a/cmake/FindQsci.cmake b/cmake/FindQsci.cmake index 69e41c1fe9..5456c3d59b 100644 diff --git a/pkgs/applications/gis/qgis/unwrapped-ltr.nix b/pkgs/applications/gis/qgis/unwrapped-ltr.nix index aa313fef857cc..17af854eabda0 100644 --- a/pkgs/applications/gis/qgis/unwrapped-ltr.nix +++ b/pkgs/applications/gis/qgis/unwrapped-ltr.nix @@ -29,7 +29,7 @@ , postgresql , proj , protobuf -, python3 +, python311 , qca-qt5 , qscintilla , qt3d @@ -48,7 +48,8 @@ }: let - py = python3.override { + py = python311.override { + self = py; packageOverrides = self: super: { pyqt5 = super.pyqt5.override { withLocation = true; @@ -77,14 +78,14 @@ let urllib3 ]; in mkDerivation rec { - version = "3.34.7"; + version = "3.34.11"; pname = "qgis-ltr-unwrapped"; src = fetchFromGitHub { owner = "qgis"; repo = "QGIS"; rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-6fIBmIoCVo0AtkjC4Vn3jMjz93gZmvkFAgo+KnasyXo="; + hash = "sha256-VNgUMEA7VKZXsLG1ZYUIlYvjwRrH8LsliGiVRMnXOM0="; }; passthru = { @@ -139,7 +140,7 @@ in mkDerivation rec { patches = [ (substituteAll { - src = ./set-pyqt-package-dirs.patch; + src = ./set-pyqt-package-dirs-ltr.patch; pyQt5PackageDir = "${py.pkgs.pyqt5}/${py.pkgs.python.sitePackages}"; qsciPackageDir = "${py.pkgs.qscintilla-qt5}/${py.pkgs.python.sitePackages}"; }) @@ -147,12 +148,9 @@ in mkDerivation rec { # Add path to Qt platform plugins # (offscreen is needed by "${APIS_SRC_DIR}/generate_console_pap.py") - preBuild = '' - export QT_QPA_PLATFORM_PLUGIN_PATH=${qtbase.bin}/lib/qt-${qtbase.version}/plugins/platforms - ''; + env.QT_QPA_PLATFORM_PLUGIN_PATH="${qtbase}/${qtbase.qtPluginPrefix}/platforms"; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" "-DWITH_3D=True" "-DWITH_PDAL=True" "-DENABLE_TESTS=False" @@ -164,7 +162,7 @@ in mkDerivation rec { ); qtWrapperArgs = [ - "--set QT_QPA_PLATFORM_PLUGIN_PATH ${qtbase.bin}/lib/qt-${qtbase.version}/plugins/platforms" + "--set QT_QPA_PLATFORM_PLUGIN_PATH ${qtbase}/${qtbase.qtPluginPrefix}/platforms" ]; dontWrapGApps = true; # wrapper params passed below @@ -174,9 +172,11 @@ in mkDerivation rec { # the path at build time using GRASS_PREFIX. # Using wrapGAppsHook also prevents file dialogs from crashing the program # on non-NixOS. - wrapProgram $out/bin/qgis \ - "''${gappsWrapperArgs[@]}" \ - --prefix PATH : ${lib.makeBinPath [ grass ]} + for program in $out/bin/*; do + wrapProgram $program \ + "''${gappsWrapperArgs[@]}" \ + --prefix PATH : ${lib.makeBinPath [ grass ]} + done ''; meta = with lib; { diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix index c20e9209f0746..97349b31845b1 100644 --- a/pkgs/applications/gis/qgis/unwrapped.nix +++ b/pkgs/applications/gis/qgis/unwrapped.nix @@ -29,7 +29,7 @@ , postgresql , proj , protobuf -, python3 +, python311 , qca-qt5 , qscintilla , qt3d @@ -48,7 +48,8 @@ }: let - py = python3.override { + py = python311.override { + self = py; packageOverrides = self: super: { pyqt5 = super.pyqt5.override { withLocation = true; @@ -78,14 +79,14 @@ let urllib3 ]; in mkDerivation rec { - version = "3.36.3"; + version = "3.38.3"; pname = "qgis-unwrapped"; src = fetchFromGitHub { owner = "qgis"; repo = "QGIS"; rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-uPyW/zzoyyd3SXvP+h9joJEv9DjRNJSaorx1rNmAaFQ="; + hash = "sha256-yJFYq4t0LzBr+O2bmtBSeehQ2vfUaZIQfOY68WZcHG4="; }; passthru = { @@ -148,15 +149,13 @@ in mkDerivation rec { # Add path to Qt platform plugins # (offscreen is needed by "${APIS_SRC_DIR}/generate_console_pap.py") - preBuild = '' - export QT_QPA_PLATFORM_PLUGIN_PATH=${qtbase.bin}/lib/qt-${qtbase.version}/plugins/platforms - ''; + env.QT_QPA_PLATFORM_PLUGIN_PATH="${qtbase}/${qtbase.qtPluginPrefix}/platforms"; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" "-DWITH_3D=True" "-DWITH_PDAL=True" "-DENABLE_TESTS=False" + "-DQT_PLUGINS_DIR=${qtbase}/${qtbase.qtPluginPrefix}" ] ++ lib.optional (!withWebKit) "-DWITH_QTWEBKIT=OFF" ++ lib.optional withGrass (let gmajor = lib.versions.major grass.version; @@ -165,7 +164,7 @@ in mkDerivation rec { ); qtWrapperArgs = [ - "--set QT_QPA_PLATFORM_PLUGIN_PATH ${qtbase.bin}/lib/qt-${qtbase.version}/plugins/platforms" + "--set QT_QPA_PLATFORM_PLUGIN_PATH ${qtbase}/${qtbase.qtPluginPrefix}/platforms" ]; dontWrapGApps = true; # wrapper params passed below @@ -175,9 +174,11 @@ in mkDerivation rec { # the path at build time using GRASS_PREFIX. # Using wrapGAppsHook also prevents file dialogs from crashing the program # on non-NixOS. - wrapProgram $out/bin/qgis \ - "''${gappsWrapperArgs[@]}" \ - --prefix PATH : ${lib.makeBinPath [ grass ]} + for program in $out/bin/*; do + wrapProgram $program \ + "''${gappsWrapperArgs[@]}" \ + --prefix PATH : ${lib.makeBinPath [ grass ]} + done ''; meta = with lib; { diff --git a/pkgs/applications/gis/spatialite-gui/default.nix b/pkgs/applications/gis/spatialite-gui/default.nix index b33818e354867..a8bdedabaa374 100644 --- a/pkgs/applications/gis/spatialite-gui/default.nix +++ b/pkgs/applications/gis/spatialite-gui/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config ] - ++ lib.optional stdenv.isDarwin desktopToDarwinBundle; + ++ lib.optional stdenv.hostPlatform.isDarwin desktopToDarwinBundle; buildInputs = [ curl @@ -59,11 +59,11 @@ stdenv.mkDerivation rec { wxGTK xz zstd - ] ++ lib.optionals stdenv.isDarwin [ Carbon Cocoa IOKit ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Carbon Cocoa IOKit ]; enableParallelBuilding = true; - postFixup = lib.optionalString stdenv.isDarwin '' + postFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' rm -fr $out/share ''; diff --git a/pkgs/applications/gis/spatialite-tools/default.nix b/pkgs/applications/gis/spatialite-tools/default.nix index cdd7911a5d3fa..0b3f7f498f777 100644 --- a/pkgs/applications/gis/spatialite-tools/default.nix +++ b/pkgs/applications/gis/spatialite-tools/default.nix @@ -8,6 +8,7 @@ , librttopo , libspatialite , libxml2 +, libz , minizip , proj , readosm @@ -34,6 +35,7 @@ stdenv.mkDerivation rec { librttopo libspatialite libxml2 + libz minizip proj readosm diff --git a/pkgs/applications/gis/udig/default.nix b/pkgs/applications/gis/udig/default.nix index 264445336cd3d..04740f55b0654 100644 --- a/pkgs/applications/gis/udig/default.nix +++ b/pkgs/applications/gis/udig/default.nix @@ -63,6 +63,6 @@ let ''; }; in -if stdenv.isDarwin +if stdenv.hostPlatform.isDarwin then darwin else linux diff --git a/pkgs/applications/gis/whitebox-tools/default.nix b/pkgs/applications/gis/whitebox-tools/default.nix index df2343d8813e5..199595a658385 100644 --- a/pkgs/applications/gis/whitebox-tools/default.nix +++ b/pkgs/applications/gis/whitebox-tools/default.nix @@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec { glib gtk3 openssl - ] ++ lib.optional stdenv.isDarwin Security; + ] ++ lib.optional stdenv.hostPlatform.isDarwin Security; nativeBuildInputs = [ cmake diff --git a/pkgs/applications/gis/zombietrackergps/default.nix b/pkgs/applications/gis/zombietrackergps/default.nix index 4acedbac2a2f8..762777bf8acf5 100644 --- a/pkgs/applications/gis/zombietrackergps/default.nix +++ b/pkgs/applications/gis/zombietrackergps/default.nix @@ -18,7 +18,7 @@ mkDerivation rec { # latest revision is not tagged upstream, use commit sha in the meantime #rev = "v_${version}"; rev = "cc75d5744965cc6973323f5bb77f00b0b0153dce"; - sha256 = "sha256-z/LFNRFdQQFxEWyAjcuGezRbTsv8z6Q6fK8NLjP4HNM="; + hash = "sha256-z/LFNRFdQQFxEWyAjcuGezRbTsv8z6Q6fK8NLjP4HNM="; }; buildInputs = diff --git a/pkgs/applications/graphics/ImageMagick/6.x.nix b/pkgs/applications/graphics/ImageMagick/6.x.nix index 99810a8d496f4..e0834055e7163 100644 --- a/pkgs/applications/graphics/ImageMagick/6.x.nix +++ b/pkgs/applications/graphics/ImageMagick/6.x.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.withFeatureAs (arch != null) "gcc-arch" arch) (lib.withFeature librsvgSupport "rsvg") (lib.withFeature liblqr1Support "lqr") - (lib.withFeatureAs ghostscriptSupport "gs-font-dir" "${ghostscript}/share/ghostscript/fonts") + (lib.withFeatureAs ghostscriptSupport "gs-font-dir" "${ghostscript.fonts}/share/fonts") (lib.withFeature ghostscriptSupport "gslib") ] ++ lib.optionals stdenv.hostPlatform.isMinGW [ # due to libxml2 being without DLLs ATM @@ -78,7 +78,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional openexrSupport openexr ++ lib.optional librsvgSupport librsvg ++ lib.optional openjpegSupport openjpeg - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ ApplicationServices Foundation ]; @@ -118,7 +118,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Software suite to create, edit, compose, or convert bitmap images"; pkgConfigModules = [ "ImageMagick" "MagickWand" ]; platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ ]; + maintainers = [ ]; license = licenses.asl20; knownVulnerabilities = [ "CVE-2019-13136" diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 671affec32d53..27abada541193 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -30,11 +30,9 @@ , ApplicationServices , Foundation , testers -, imagemagick , nixos-icons , perlPackages , python3 -, fetchpatch }: assert libXtSupport -> libX11Support; @@ -51,13 +49,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "imagemagick"; - version = "7.1.1-34"; + version = "7.1.1-38"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick"; rev = finalAttrs.version; - hash = "sha256-rECU/dp8HQKFs1PW6QeTZIMxCIzzh1w7CckapnxdzxU="; + hash = "sha256-dyk9kCH1w76Jhy/yBhVFLthTKYaMgXLBn7QGWAFS0XU="; }; outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big @@ -76,7 +74,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.withFeature librsvgSupport "pango") (lib.withFeature liblqr1Support "lqr") (lib.withFeature libjxlSupport "jxl") - (lib.withFeatureAs ghostscriptSupport "gs-font-dir" "${ghostscript}/share/ghostscript/fonts") + (lib.withFeatureAs ghostscriptSupport "gs-font-dir" "${ghostscript.fonts}/share/fonts") (lib.withFeature ghostscriptSupport "gslib") ] ++ lib.optionals stdenv.hostPlatform.isMinGW [ # due to libxml2 being without DLLs ATM @@ -103,7 +101,7 @@ stdenv.mkDerivation (finalAttrs: { pango ] ++ lib.optional openjpegSupport openjpeg - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ ApplicationServices Foundation ]; @@ -135,7 +133,7 @@ stdenv.mkDerivation (finalAttrs: { version = testers.testVersion { package = finalAttrs.finalPackage; }; inherit nixos-icons; inherit (perlPackages) ImageMagick; - inherit (python3.pkgs) img2pdf; + inherit (python3.pkgs) img2pdf willow; pkg-config = testers.hasPkgConfigModules { package = finalAttrs.finalPackage; version = lib.head (lib.splitString "-" finalAttrs.version); diff --git a/pkgs/applications/graphics/antimony/default.nix b/pkgs/applications/graphics/antimony/default.nix index d39961da9077c..b55e6a8a5bb00 100644 --- a/pkgs/applications/graphics/antimony/default.nix +++ b/pkgs/applications/graphics/antimony/default.nix @@ -28,7 +28,7 @@ in sed -i "s,python3,${python3.executable}," CMakeLists.txt ''; - postInstall = lib.optionalString stdenv.isLinux '' + postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' install -Dm644 $src/deploy/icon.svg $out/share/icons/hicolor/scalable/apps/antimony.svg install -Dm644 ${./mimetype.xml} $out/share/mime/packages/antimony.xml ''; diff --git a/pkgs/applications/graphics/artem/default.nix b/pkgs/applications/graphics/artem/default.nix index 8b391f104d83c..8f6d27b176a3c 100644 --- a/pkgs/applications/graphics/artem/default.nix +++ b/pkgs/applications/graphics/artem/default.nix @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { installShellFiles ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/applications/graphics/autotrace/default.nix b/pkgs/applications/graphics/autotrace/default.nix index 30cf116fed14d..82bba3c3fc53d 100644 --- a/pkgs/applications/graphics/autotrace/default.nix +++ b/pkgs/applications/graphics/autotrace/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { imagemagick libpng pstoedit - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Foundation ]; 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/awesomebump/default.nix b/pkgs/applications/graphics/awesomebump/default.nix index 8f5b4c0c659cd..a096a14ec4f7d 100644 --- a/pkgs/applications/graphics/awesomebump/default.nix +++ b/pkgs/applications/graphics/awesomebump/default.nix @@ -57,7 +57,7 @@ in mkDerivation { homepage = "https://github.com/kmkolasinski/AwesomeBump"; description = "Program to generate normal, height, specular or ambient occlusion textures from a single image"; license = lib.licenses.gpl3Plus; - maintainers = [ lib.maintainers.eelco ]; + maintainers = [ ]; platforms = lib.platforms.linux; mainProgram = "AwesomeBump"; }; diff --git a/pkgs/applications/graphics/azpainter/default.nix b/pkgs/applications/graphics/azpainter/default.nix index 05fb56bb5d7d7..b1493b94ce67e 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 = [ @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { freetype fontconfig libjpeg libpng libtiff libwebp zlib - ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; preBuild = '' cd build diff --git a/pkgs/applications/graphics/batik/default.nix b/pkgs/applications/graphics/batik/default.nix deleted file mode 100644 index 1ff914c2740d4..0000000000000 --- a/pkgs/applications/graphics/batik/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{lib, stdenv, fetchurl}: - -stdenv.mkDerivation rec { - pname = "batik"; - version = "1.17"; - - src = fetchurl { - url = "mirror://apache/xmlgraphics/batik/binaries/batik-bin-${version}.tar.gz"; - sha256 = "sha256-sEJphF3grlwZCEt3gHHm4JF8RpvKKBLLvKXf2lu/dhA="; - }; - - meta = with lib; { - description = "Java based toolkit for handling SVG"; - homepage = "https://xmlgraphics.apache.org/batik"; - license = licenses.asl20; - platforms = platforms.unix; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; - }; - - installPhase = '' - mkdir $out - cp -r * $out/ - ''; -} diff --git a/pkgs/applications/graphics/brlcad/default.nix b/pkgs/applications/graphics/brlcad/default.nix index 91b063f8fc935..031b15baf0bae 100644 --- a/pkgs/applications/graphics/brlcad/default.nix +++ b/pkgs/applications/graphics/brlcad/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://brlcad.org"; description = "BRL-CAD is a powerful cross-platform open source combinatorial solid modeling system"; - changelog = "https://github.com/BRL-CAD/brlcad/releases/tag/${src.rev}"; + changelog = "https://github.com/BRL-CAD/brlcad/releases/tag/${lib.removePrefix "refs/tags/" src.rev}"; license = with licenses; [ lgpl21 bsd2 ]; maintainers = with maintainers; [ GaetanLepage ]; platforms = platforms.linux; diff --git a/pkgs/applications/graphics/c3d/default.nix b/pkgs/applications/graphics/c3d/default.nix index 58af10640484a..dac235b9995e3 100644 --- a/pkgs/applications/graphics/c3d/default.nix +++ b/pkgs/applications/graphics/c3d/default.nix @@ -1,19 +1,25 @@ -{ lib, stdenv, fetchFromGitHub, cmake, itk_5_2, Cocoa }: +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + itk, + Cocoa, +}: stdenv.mkDerivation rec { - pname = "c3d"; - version = "unstable-2021-09-14"; + pname = "c3d"; + version = "1.4.1-unstable-2024-08-07"; src = fetchFromGitHub { owner = "pyushkevich"; - repo = pname; - rev = "cc06e6e2f04acd3d6faa3d8c9a66b499f02d4388"; - sha256 = "sha256:1ql1y6694njsmdapywhppb54viyw8wdpaxxr1b3hm2rqhvwmhn52"; + repo = "c3d"; + rev = "9e6174153ab87eae014f5b802413478c8fbc9a1a"; + hash = "sha256-s2/XRyKoiMnF6cRsxxNUSlNtksbOyKSlk8hAGxJELqw="; }; nativeBuildInputs = [ cmake ]; - buildInputs = [ itk_5_2 ] - ++ lib.optional stdenv.isDarwin Cocoa; + buildInputs = [ itk ] ++ lib.optional stdenv.hostPlatform.isDarwin Cocoa; cmakeFlags = [ "-DCONVERT3D_USE_ITK_REMOTE_MODULES=OFF" ]; @@ -23,7 +29,7 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ bcdarwin ]; platforms = platforms.unix; license = licenses.gpl3; - broken = stdenv.isAarch64; + broken = stdenv.hostPlatform.isAarch64; # /build/source/itkextras/OneDimensionalInPlaceAccumulateFilter.txx:312:10: fatal error: xmmintrin.h: No such file or directory }; } diff --git a/pkgs/applications/graphics/cloudcompare/default.nix b/pkgs/applications/graphics/cloudcompare/default.nix index eac82182f61dc..738ce255a4cf7 100644 --- a/pkgs/applications/graphics/cloudcompare/default.nix +++ b/pkgs/applications/graphics/cloudcompare/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , mkDerivation , fetchFromGitHub , makeDesktopItem @@ -13,7 +12,6 @@ , gmp , laszip , mpfr -, pdal , pcl , qtbase , qtsvg @@ -25,13 +23,13 @@ mkDerivation rec { pname = "cloudcompare"; - version = "2.13.1"; + version = "2.13.2"; src = fetchFromGitHub { owner = "CloudCompare"; repo = "CloudCompare"; rev = "v${version}"; - hash = "sha256-QQwQt63tXxJnGaBLu+GvWkEazumYPhXnDe+giSu7wjk="; + hash = "sha256-a/0lf3Mt5ZpLFRM8jAoqZer8pY1ROgPRY4dPt34Bk3E="; fetchSubmodules = true; }; @@ -50,7 +48,6 @@ mkDerivation rec { gmp laszip mpfr - pdal pcl qtbase qtsvg @@ -73,7 +70,7 @@ mkDerivation rec { "-DPLUGIN_IO_QCSV_MATRIX=ON" "-DPLUGIN_IO_QE57=ON" "-DPLUGIN_IO_QFBX=OFF" # Autodesk FBX SDK is gratis+proprietary; not packaged in nixpkgs - "-DPLUGIN_IO_QPDAL=ON" # required for .las/.laz support + "-DPLUGIN_IO_QLAS=ON" # required for .las/.laz support "-DPLUGIN_IO_QPHOTOSCAN=ON" "-DPLUGIN_IO_QRDB=OFF" # Riegl rdblib is proprietary; not packaged in nixpkgs diff --git a/pkgs/applications/graphics/comical/default.nix b/pkgs/applications/graphics/comical/default.nix index 208c0ea821cd1..f25259e5ebf40 100644 --- a/pkgs/applications/graphics/comical/default.nix +++ b/pkgs/applications/graphics/comical/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { buildInputs = [ wxGTK32 zlib - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ]; @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { description = "Viewer of CBR and CBZ files, often used to store scanned comics"; homepage = "https://comical.sourceforge.net/"; license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ viric wegank ]; + maintainers = with lib.maintainers; [ wegank ]; platforms = with lib.platforms; unix; mainProgram = "comical"; }; diff --git a/pkgs/applications/graphics/cq-editor/spyder4.patch b/pkgs/applications/graphics/cq-editor/spyder4.patch deleted file mode 100644 index 49813b18a0c02..0000000000000 --- a/pkgs/applications/graphics/cq-editor/spyder4.patch +++ /dev/null @@ -1,58 +0,0 @@ -diff --git a/cq_editor/widgets/debugger.py b/cq_editor/widgets/debugger.py -index b7398fb..d039db5 100644 ---- a/cq_editor/widgets/debugger.py -+++ b/cq_editor/widgets/debugger.py -@@ -162,7 +162,7 @@ class Debugger(QObject,ComponentMixin): - - def get_breakpoints(self): - -- return self.parent().components['editor'].get_breakpoints() -+ return self.parent().components['editor'].debugger.get_breakpoints() - - def compile_code(self,cq_script): - -@@ -178,12 +178,14 @@ class Debugger(QObject,ComponentMixin): - def _exec(self, code, locals_dict, globals_dict): - - with ExitStack() as stack: -- p = Path(self.parent().components['editor'].filename).dirname() -- if self.preferences['Add script dir to path'] and p: -+ fname = self.parent().components['editor'].filename -+ p = Path(fname if fname else '').abspath().dirname() -+ if self.preferences['Add script dir to path'] and p.exists(): - sys.path.append(p) - stack.callback(sys.path.remove, p) -- if self.preferences['Change working dir to script dir'] and p: -+ if self.preferences['Change working dir to script dir'] and p.exists(): - stack.enter_context(p) -+ - exec(code, locals_dict, globals_dict) - - def _inject_locals(self,module): -diff --git a/cq_editor/widgets/editor.py b/cq_editor/widgets/editor.py -index 45aa048..2763469 100644 ---- a/cq_editor/widgets/editor.py -+++ b/cq_editor/widgets/editor.py -@@ -1,4 +1,4 @@ --from spyder.widgets.sourcecode.codeeditor import CodeEditor -+from spyder.plugins.editor.widgets.codeeditor import CodeEditor - from PyQt5.QtCore import pyqtSignal, QFileSystemWatcher, QTimer - from PyQt5.QtWidgets import QAction, QFileDialog - from PyQt5.QtGui import QFontDatabase -@@ -32,6 +32,8 @@ class Editor(CodeEditor,ComponentMixin): - - def __init__(self,parent=None): - -+ self._watched_file = None -+ - super(Editor,self).__init__(parent) - ComponentMixin.__init__(self) - -@@ -83,7 +85,6 @@ class Editor(CodeEditor,ComponentMixin): - - # autoreload support - self._file_watcher = QFileSystemWatcher(self) -- self._watched_file = None - # we wait for 50ms after a file change for the file to be written completely - self._file_watch_timer = QTimer(self) - self._file_watch_timer.setInterval(50) diff --git a/pkgs/applications/graphics/curtail/default.nix b/pkgs/applications/graphics/curtail/default.nix index 6ff083d08f02e..7c9d4298cb7bd 100644 --- a/pkgs/applications/graphics/curtail/default.nix +++ b/pkgs/applications/graphics/curtail/default.nix @@ -72,6 +72,6 @@ python3.pkgs.buildPythonApplication rec { mainProgram = "curtail"; homepage = "https://github.com/Huluti/Curtail"; license = licenses.gpl3Only; - maintainers = with maintainers; [ anselmschueler ]; + maintainers = with maintainers; [ aleksana ]; }; } diff --git a/pkgs/applications/graphics/curv/default.nix b/pkgs/applications/graphics/curv/default.nix index 7113437245a38..f1f66784aa510 100644 --- a/pkgs/applications/graphics/curv/default.nix +++ b/pkgs/applications/graphics/curv/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { xorg.libXi xorg.libXinerama xorg.libXrandr - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ ilmbase llvmPackages.openmp ]; @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/curv3d/curv"; license = licenses.asl20; platforms = platforms.all; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; maintainers = with maintainers; [ pbsds ]; mainProgram = "curv"; }; diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix deleted file mode 100644 index 362de3633ab25..0000000000000 --- a/pkgs/applications/graphics/darktable/default.nix +++ /dev/null @@ -1,150 +0,0 @@ -{ lib -, stdenv -, fetchurl -, libsoup -, graphicsmagick -, json-glib -, wrapGAppsHook3 -, cairo -, cmake -, ninja -, curl -, perl -, desktop-file-utils -, exiv2 -, glib -, glib-networking -, ilmbase -, gtk3 -, intltool -, lcms2 -, lensfun -, libX11 -, libexif -, libgphoto2 -, libjpeg -, libpng -, librsvg -, libtiff -, libjxl -, openexr_3 -, osm-gps-map -, pkg-config -, sqlite -, libxslt -, openjpeg -, pugixml -, colord -, colord-gtk -, libwebp -, libsecret -, gnome -, SDL2 -, ocl-icd -, pcre -, gtk-mac-integration -, isocodes -, llvmPackages -, gmic -, libavif -, icu -, jasper -, libheif -, libaom -, portmidi -, lua -}: - -stdenv.mkDerivation rec { - version = "4.8.0"; - pname = "darktable"; - - src = fetchurl { - url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz"; - sha256 = "sha256-QZhJ6QFScOQHXyNBxrVTLT0czMz6jxlZLLLqOtF/klU="; - }; - - nativeBuildInputs = [ cmake ninja llvmPackages.llvm pkg-config intltool perl desktop-file-utils wrapGAppsHook3 ]; - - buildInputs = [ - cairo - curl - exiv2 - glib - glib-networking - gtk3 - ilmbase - lcms2 - lensfun - libexif - libgphoto2 - libjpeg - libpng - librsvg - libtiff - libjxl - openexr_3 - sqlite - libxslt - libsoup - graphicsmagick - json-glib - openjpeg - pugixml - libwebp - libsecret - SDL2 - gnome.adwaita-icon-theme - osm-gps-map - pcre - isocodes - gmic - libavif - icu - jasper - libheif - libaom - portmidi - lua - ] ++ lib.optionals stdenv.isLinux [ - colord - colord-gtk - libX11 - ocl-icd - ] ++ lib.optional stdenv.isDarwin gtk-mac-integration - ++ lib.optional stdenv.cc.isClang llvmPackages.openmp; - - cmakeFlags = [ - "-DBUILD_USERMANUAL=False" - ] ++ lib.optionals stdenv.isDarwin [ - "-DUSE_COLORD=OFF" - "-DUSE_KWALLET=OFF" - ]; - - # darktable changed its rpath handling in commit - # 83c70b876af6484506901e6b381304ae0d073d3c and as a result the - # binaries can't find libdarktable.so, so change LD_LIBRARY_PATH in - # the wrappers: - preFixup = - let - libPathEnvVar = if stdenv.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"; - libPathPrefix = "$out/lib/darktable" + lib.optionalString stdenv.isLinux ":${ocl-icd}/lib"; - in - '' - for f in $out/share/darktable/kernels/*.cl; do - sed -r "s|#include \"(.*)\"|#include \"$out/share/darktable/kernels/\1\"|g" -i "$f" - done - - gappsWrapperArgs+=( - --prefix ${libPathEnvVar} ":" "${libPathPrefix}" - ) - ''; - - meta = with lib; { - description = "Virtual lighttable and darkroom for photographers"; - homepage = "https://www.darktable.org"; - license = licenses.gpl3Plus; - platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ goibhniu flosse mrVanDalo paperdigits freyacodes ]; - }; -} diff --git a/pkgs/applications/graphics/dia/default.nix b/pkgs/applications/graphics/dia/default.nix index 534d1f5884b92..9977224dd761c 100644 --- a/pkgs/applications/graphics/dia/default.nix +++ b/pkgs/applications/graphics/dia/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation { lib.optionals withDocs [ libxslt ] ++ - lib.optionals stdenv.isDarwin [ + lib.optionals stdenv.hostPlatform.isDarwin [ gtk-mac-integration-gtk3 ]; diff --git a/pkgs/applications/graphics/djview/default.nix b/pkgs/applications/graphics/djview/default.nix index 3678b9760c812..99af85a12b8d6 100644 --- a/pkgs/applications/graphics/djview/default.nix +++ b/pkgs/applications/graphics/djview/default.nix @@ -37,7 +37,7 @@ mkDerivation rec { qtbase xorg.libXt libtiff - ] ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.AGL; + ] ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.AGL; preConfigure = '' NOCONFIGURE=1 ./autogen.sh @@ -49,10 +49,10 @@ mkDerivation rec { "--with-x" "--with-tiff" "--disable-nsdejavu" # 2023-11-14: modern browsers have dropped support for NPAPI - ] ++ lib.optional stdenv.isDarwin "--enable-mac"; + ] ++ lib.optional stdenv.hostPlatform.isDarwin "--enable-mac"; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Portable DjVu viewer (Qt5) and browser (nsdejavu) plugin"; mainProgram = "djview"; homepage = "https://djvu.sourceforge.net/djview4.html"; diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix index 448b371d2ca91..d6b6bb8e9e607 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.7.8"; src = fetchFromGitHub { owner = "jgraph"; repo = "drawio-desktop"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-trBSNE5OBBNq18Dn/IwhHpD3ZQ7C5venwsBtyZxv+2k="; + hash = "sha256-mpFmUPdgK9S6HcoO5wc6onUkmS6tRbFwLAsMhvIQ8sU="; }; # `@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-/3Dn4l5Bao01pcSXuPhq/AbH+gxZzHILP8TiHvplJpw="; }; nativeBuildInputs = [ @@ -39,9 +39,9 @@ stdenv.mkDerivation rec { makeWrapper nodejs yarn - ] ++ lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ copyDesktopItems - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ autoSignDarwinBinariesHook ]; @@ -62,15 +62,15 @@ stdenv.mkDerivation rec { buildPhase = '' runHook preBuild - '' + lib.optionalString stdenv.isDarwin '' - cp -R ${electron}/Applications/Electron.app Electron.app + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' + cp -R ${electron.dist}/Electron.app Electron.app chmod -R u+w Electron.app export CSC_IDENTITY_AUTO_DISCOVERY=false sed -i "/afterSign/d" electron-builder-linux-mac.json '' + '' yarn --offline run electron-builder --dir \ - ${if stdenv.isDarwin then "--config electron-builder-linux-mac.json" else ""} \ - -c.electronDist=${if stdenv.isDarwin then "." else "${electron}/libexec/electron"} \ + ${lib.optionalString stdenv.hostPlatform.isDarwin "--config electron-builder-linux-mac.json"} \ + -c.electronDist=${if stdenv.hostPlatform.isDarwin then "." else electron.dist} \ -c.electronVersion=${electron.version} runHook postBuild @@ -79,13 +79,13 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/{Applications,bin} mv dist/mac*/draw.io.app $out/Applications # Symlinking `draw.io` doesn't work; seems to look for files in the wrong place. makeWrapper $out/Applications/draw.io.app/Contents/MacOS/draw.io $out/bin/drawio - '' + lib.optionalString (!stdenv.isDarwin) '' + '' + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' mkdir -p "$out/share/lib/drawio" cp -r dist/*-unpacked/{locales,resources{,.pak}} "$out/share/lib/drawio" diff --git a/pkgs/applications/graphics/drawpile/default.nix b/pkgs/applications/graphics/drawpile/default.nix index 0522879d9d3e1..ad76e0e92b7cc 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; - broken = stdenv.isDarwin; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ fgaz ]; + platforms = lib.platforms.unix; + broken = stdenv.hostPlatform.isDarwin; + } // lib.optionalAttrs buildServer { + mainProgram = "drawpile-srv"; + } // lib.optionalAttrs buildClient { + mainProgram = "drawpile"; }; } - diff --git a/pkgs/applications/graphics/emblem/Cargo.lock b/pkgs/applications/graphics/emblem/Cargo.lock deleted file mode 100644 index 6bedc746b2f50..0000000000000 --- a/pkgs/applications/graphics/emblem/Cargo.lock +++ /dev/null @@ -1,1915 +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.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea5d730647d4fadd988536d06fecce94b7b4f2a7efdae548f1cf4b63205518ab" -dependencies = [ - "memchr", -] - -[[package]] -name = "anyhow" -version = "1.0.75" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" - -[[package]] -name = "approx" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6" -dependencies = [ - "num-traits", -] - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[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.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" - -[[package]] -name = "block" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" - -[[package]] -name = "bytemuck" -version = "1.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" - -[[package]] -name = "byteorder" -version = "1.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" - -[[package]] -name = "cairo-rs" -version = "0.18.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c0466dfa8c0ee78deef390c274ad756801e0a6dbb86c5ef0924a298c5761c4d" -dependencies = [ - "bitflags 2.4.0", - "cairo-sys-rs", - "glib", - "libc", - "once_cell", - "thiserror", -] - -[[package]] -name = "cairo-sys-rs" -version = "0.18.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "685c9fa8e590b8b3d678873528d83411db17242a73fccaed827770ea0fedda51" -dependencies = [ - "glib-sys", - "libc", - "system-deps", -] - -[[package]] -name = "cast" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" - -[[package]] -name = "cc" -version = "1.0.83" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" -dependencies = [ - "libc", -] - -[[package]] -name = "cfg-expr" -version = "0.15.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03915af431787e6ffdcc74c645077518c6b6e01f80b761e0fbbfa288536311b3" -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 = "crossbeam-channel" -version = "0.5.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" -dependencies = [ - "cfg-if", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-deque" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" -dependencies = [ - "cfg-if", - "crossbeam-epoch", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.9.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" -dependencies = [ - "autocfg", - "cfg-if", - "crossbeam-utils", - "memoffset", - "scopeguard", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "cssparser" -version = "0.31.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b3df4f93e5fbbe73ec01ec8d3f68bba73107993a5b1e7519273c32db9b0d5be" -dependencies = [ - "cssparser-macros", - "dtoa-short", - "itoa", - "phf 0.11.2", - "smallvec", -] - -[[package]] -name = "cssparser-macros" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331" -dependencies = [ - "quote", - "syn 2.0.37", -] - -[[package]] -name = "data-url" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41b319d1b62ffbd002e057f36bebd1f42b9f97927c9577461d855f3513c4289f" - -[[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 = "dtoa" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcbb2bf8e87535c23f7a8a321e364ce21462d0ff10cb6407820e8e96dfff6653" - -[[package]] -name = "dtoa-short" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbaceec3c6e4211c79e7b1800fb9680527106beb2f9c51904a3210c03a448c74" -dependencies = [ - "dtoa", -] - -[[package]] -name = "either" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" - -[[package]] -name = "emblem" -version = "1.3.0" -dependencies = [ - "anyhow", - "futures-channel", - "gettext-rs", - "gtk4", - "libadwaita", - "librsvg", - "log", - "once_cell", - "pretty_env_logger", - "regex", - "xml-rs", -] - -[[package]] -name = "encoding_rs" -version = "0.8.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "env_logger" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" -dependencies = [ - "humantime", - "is-terminal", - "log", - "regex", - "termcolor", -] - -[[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.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd" -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 = "field-offset" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f" -dependencies = [ - "memoffset", - "rustc_version", -] - -[[package]] -name = "float-cmp" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" -dependencies = [ - "num-traits", -] - -[[package]] -name = "form_urlencoded" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" -dependencies = [ - "percent-encoding", -] - -[[package]] -name = "futf" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df420e2e84819663797d1ec6544b13c5be84629e7bb00dc960d6917db2987843" -dependencies = [ - "mac", - "new_debug_unreachable", -] - -[[package]] -name = "futures-channel" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" -dependencies = [ - "futures-core", -] - -[[package]] -name = "futures-core" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" - -[[package]] -name = "futures-executor" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" -dependencies = [ - "futures-core", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-io" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" - -[[package]] -name = "futures-macro" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.37", -] - -[[package]] -name = "futures-task" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" - -[[package]] -name = "futures-util" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" -dependencies = [ - "futures-core", - "futures-macro", - "futures-task", - "pin-project-lite", - "pin-utils", - "slab", -] - -[[package]] -name = "fxhash" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" -dependencies = [ - "byteorder", -] - -[[package]] -name = "gdk-pixbuf" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbc9c2ed73a81d556b65d08879ba4ee58808a6b1927ce915262185d6d547c6f3" -dependencies = [ - "gdk-pixbuf-sys", - "gio", - "glib", - "libc", - "once_cell", -] - -[[package]] -name = "gdk-pixbuf-sys" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9839ea644ed9c97a34d129ad56d38a25e6756f99f3a88e15cd39c20629caf7" -dependencies = [ - "gio-sys", - "glib-sys", - "gobject-sys", - "libc", - "system-deps", -] - -[[package]] -name = "gdk4" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6982d9815ed6ac95b0467b189e81f29dea26d08a732926ec113e65744ed3f96c" -dependencies = [ - "cairo-rs", - "gdk-pixbuf", - "gdk4-sys", - "gio", - "glib", - "libc", - "pango", -] - -[[package]] -name = "gdk4-sys" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbab43f332a3cf1df9974da690b5bb0e26720ed09a228178ce52175372dcfef0" -dependencies = [ - "cairo-sys-rs", - "gdk-pixbuf-sys", - "gio-sys", - "glib-sys", - "gobject-sys", - "libc", - "pango-sys", - "pkg-config", - "system-deps", -] - -[[package]] -name = "getrandom" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" -dependencies = [ - "cfg-if", - "libc", - "wasi", -] - -[[package]] -name = "gettext-rs" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e49ea8a8fad198aaa1f9655a2524b64b70eb06b2f3ff37da407566c93054f364" -dependencies = [ - "gettext-sys", - "locale_config", -] - -[[package]] -name = "gettext-sys" -version = "0.21.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c63ce2e00f56a206778276704bbe38564c8695249fdc8f354b4ef71c57c3839d" -dependencies = [ - "cc", - "temp-dir", -] - -[[package]] -name = "gio" -version = "0.18.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57052f84e8e5999b258e8adf8f5f2af0ac69033864936b8b6838321db2f759b1" -dependencies = [ - "futures-channel", - "futures-core", - "futures-io", - "futures-util", - "gio-sys", - "glib", - "libc", - "once_cell", - "pin-project-lite", - "smallvec", - "thiserror", -] - -[[package]] -name = "gio-sys" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37566df850baf5e4cb0dfb78af2e4b9898d817ed9263d1090a2df958c64737d2" -dependencies = [ - "glib-sys", - "gobject-sys", - "libc", - "system-deps", - "winapi", -] - -[[package]] -name = "glib" -version = "0.18.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c316afb01ce8067c5eaab1fc4f2cd47dc21ce7b6296358605e2ffab23ccbd19" -dependencies = [ - "bitflags 2.4.0", - "futures-channel", - "futures-core", - "futures-executor", - "futures-task", - "futures-util", - "gio-sys", - "glib-macros", - "glib-sys", - "gobject-sys", - "libc", - "memchr", - "once_cell", - "smallvec", - "thiserror", -] - -[[package]] -name = "glib-macros" -version = "0.18.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8da903822b136d42360518653fcf154455defc437d3e7a81475bf9a95ff1e47" -dependencies = [ - "heck", - "proc-macro-crate", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 2.0.37", -] - -[[package]] -name = "glib-sys" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "063ce2eb6a8d0ea93d2bf8ba1957e78dbab6be1c2220dd3daca57d5a9d869898" -dependencies = [ - "libc", - "system-deps", -] - -[[package]] -name = "gobject-sys" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0850127b514d1c4a4654ead6dedadb18198999985908e6ffe4436f53c785ce44" -dependencies = [ - "glib-sys", - "libc", - "system-deps", -] - -[[package]] -name = "graphene-rs" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b2228cda1505613a7a956cca69076892cfbda84fc2b7a62b94a41a272c0c401" -dependencies = [ - "glib", - "graphene-sys", - "libc", -] - -[[package]] -name = "graphene-sys" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc4144cee8fc8788f2a9b73dc5f1d4e1189d1f95305c4cb7bd9c1af1cfa31f59" -dependencies = [ - "glib-sys", - "libc", - "pkg-config", - "system-deps", -] - -[[package]] -name = "gsk4" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc25855255120f294d874acd6eaf4fbed7ce1cdc550e2d8415ea57fafbe816d5" -dependencies = [ - "cairo-rs", - "gdk4", - "glib", - "graphene-rs", - "gsk4-sys", - "libc", - "pango", -] - -[[package]] -name = "gsk4-sys" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1ecf3a63bf1223d68f80f72cc896c4d8c80482fbce1c9a12c66d3de7290ee46" -dependencies = [ - "cairo-sys-rs", - "gdk4-sys", - "glib-sys", - "gobject-sys", - "graphene-sys", - "libc", - "pango-sys", - "system-deps", -] - -[[package]] -name = "gtk4" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3b095b26f2a2df70be1805d3590eeb9d7a05ecb5be9649b82defc72dc56228c" -dependencies = [ - "cairo-rs", - "field-offset", - "futures-channel", - "gdk-pixbuf", - "gdk4", - "gio", - "glib", - "graphene-rs", - "gsk4", - "gtk4-macros", - "gtk4-sys", - "libc", - "pango", -] - -[[package]] -name = "gtk4-macros" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d57ec49cf9b657f69a05bca8027cff0a8dfd0c49e812be026fc7311f2163832f" -dependencies = [ - "anyhow", - "proc-macro-crate", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "gtk4-sys" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b0bdde87c50317b4f355bcbb4a9c2c414ece1b7c824fb4ad4ba8f3bdb2c6603" -dependencies = [ - "cairo-sys-rs", - "gdk-pixbuf-sys", - "gdk4-sys", - "gio-sys", - "glib-sys", - "gobject-sys", - "graphene-sys", - "gsk4-sys", - "libc", - "pango-sys", - "system-deps", -] - -[[package]] -name = "hashbrown" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" - -[[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 = "humantime" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" - -[[package]] -name = "idna" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "indexmap" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" -dependencies = [ - "equivalent", - "hashbrown", -] - -[[package]] -name = "is-terminal" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" -dependencies = [ - "hermit-abi", - "rustix", - "windows-sys", -] - -[[package]] -name = "itertools" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" -dependencies = [ - "either", -] - -[[package]] -name = "itoa" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" - -[[package]] -name = "language-tags" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4345964bb142484797b161f473a503a434de77149dd8c7427788c6e13379388" - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "libadwaita" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06444f4ca05a60693da6e9e2b591bd40a298e65a118a8d5e830771718b3e0253" -dependencies = [ - "gdk-pixbuf", - "gdk4", - "gio", - "glib", - "gtk4", - "libadwaita-sys", - "libc", - "pango", -] - -[[package]] -name = "libadwaita-sys" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "021cfe3d1fcfa82411765a791f7e9b32f35dd98ce88d2e3fa10e7320f5cc8ce7" -dependencies = [ - "gdk4-sys", - "gio-sys", - "glib-sys", - "gobject-sys", - "gtk4-sys", - "libc", - "pango-sys", - "system-deps", -] - -[[package]] -name = "libc" -version = "0.2.148" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b" - -[[package]] -name = "librsvg" -version = "2.57.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4b6285fca2e4de40d61e398408a4cd261d475a960da58ae28d94d6352088078" -dependencies = [ - "cairo-rs", - "cast", - "cssparser", - "data-url", - "encoding_rs", - "float-cmp", - "gdk-pixbuf", - "gio", - "glib", - "itertools", - "language-tags", - "libc", - "locale_config", - "markup5ever", - "nalgebra", - "num-traits", - "once_cell", - "pango", - "pangocairo", - "rayon", - "rctree", - "regex", - "rgb", - "selectors", - "string_cache", - "system-deps", - "tinyvec", - "url", - "xml5ever", -] - -[[package]] -name = "linux-raw-sys" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a9bad9f94746442c783ca431b22403b519cd7fbeed0533fdd6328b2f2212128" - -[[package]] -name = "locale_config" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d2c35b16f4483f6c26f0e4e9550717a2f6575bcd6f12a53ff0c490a94a6934" -dependencies = [ - "lazy_static", - "objc", - "objc-foundation", - "regex", - "winapi", -] - -[[package]] -name = "lock_api" -version = "0.4.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" -dependencies = [ - "autocfg", - "scopeguard", -] - -[[package]] -name = "log" -version = "0.4.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" - -[[package]] -name = "mac" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4" - -[[package]] -name = "malloc_buf" -version = "0.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" -dependencies = [ - "libc", -] - -[[package]] -name = "markup5ever" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a2629bb1404f3d34c2e921f21fd34ba00b206124c81f65c50b43b6aaefeb016" -dependencies = [ - "log", - "phf 0.10.1", - "phf_codegen", - "string_cache", - "string_cache_codegen", - "tendril", -] - -[[package]] -name = "matrixmultiply" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "090126dc04f95dc0d1c1c91f61bdd474b3930ca064c1edc8a849da2c6cbe1e77" -dependencies = [ - "autocfg", - "rawpointer", -] - -[[package]] -name = "memchr" -version = "2.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" - -[[package]] -name = "memoffset" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" -dependencies = [ - "autocfg", -] - -[[package]] -name = "nalgebra" -version = "0.32.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "307ed9b18cc2423f29e83f84fd23a8e73628727990181f18641a8b5dc2ab1caa" -dependencies = [ - "approx", - "matrixmultiply", - "nalgebra-macros", - "num-complex", - "num-rational", - "num-traits", - "simba", - "typenum", -] - -[[package]] -name = "nalgebra-macros" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91761aed67d03ad966ef783ae962ef9bbaca728d2dd7ceb7939ec110fffad998" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "new_debug_unreachable" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" - -[[package]] -name = "num-complex" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214" -dependencies = [ - "num-traits", -] - -[[package]] -name = "num-integer" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" -dependencies = [ - "autocfg", - "num-traits", -] - -[[package]] -name = "num-rational" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-traits" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" -dependencies = [ - "autocfg", -] - -[[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 = "objc" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" -dependencies = [ - "malloc_buf", -] - -[[package]] -name = "objc-foundation" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9" -dependencies = [ - "block", - "objc", - "objc_id", -] - -[[package]] -name = "objc_id" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b" -dependencies = [ - "objc", -] - -[[package]] -name = "once_cell" -version = "1.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" - -[[package]] -name = "pango" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06a9e54b831d033206160096b825f2070cf5fda7e35167b1c01e9e774f9202d1" -dependencies = [ - "gio", - "glib", - "libc", - "once_cell", - "pango-sys", -] - -[[package]] -name = "pango-sys" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "436737e391a843e5933d6d9aa102cb126d501e815b83601365a948a518555dc5" -dependencies = [ - "glib-sys", - "gobject-sys", - "libc", - "system-deps", -] - -[[package]] -name = "pangocairo" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57036589a9cfcacf83f9e606d15813fc6bf03f0e9e69aa2b5e3bb85af86b38a5" -dependencies = [ - "cairo-rs", - "glib", - "libc", - "pango", - "pangocairo-sys", -] - -[[package]] -name = "pangocairo-sys" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc3c8ff676a37e7a72ec1d5fc029f91c407278083d2752784ff9f5188c108833" -dependencies = [ - "cairo-sys-rs", - "glib-sys", - "libc", - "pango-sys", - "system-deps", -] - -[[package]] -name = "parking_lot" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" -dependencies = [ - "lock_api", - "parking_lot_core", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall", - "smallvec", - "windows-targets", -] - -[[package]] -name = "paste" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" - -[[package]] -name = "percent-encoding" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" - -[[package]] -name = "phf" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259" -dependencies = [ - "phf_shared 0.10.0", -] - -[[package]] -name = "phf" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" -dependencies = [ - "phf_macros", - "phf_shared 0.11.2", -] - -[[package]] -name = "phf_codegen" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb1c3a8bc4dd4e5cfce29b44ffc14bedd2ee294559a294e2a4d4c9e9a6a13cd" -dependencies = [ - "phf_generator 0.10.0", - "phf_shared 0.10.0", -] - -[[package]] -name = "phf_generator" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6" -dependencies = [ - "phf_shared 0.10.0", - "rand", -] - -[[package]] -name = "phf_generator" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" -dependencies = [ - "phf_shared 0.11.2", - "rand", -] - -[[package]] -name = "phf_macros" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" -dependencies = [ - "phf_generator 0.11.2", - "phf_shared 0.11.2", - "proc-macro2", - "quote", - "syn 2.0.37", -] - -[[package]] -name = "phf_shared" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" -dependencies = [ - "siphasher", -] - -[[package]] -name = "phf_shared" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" -dependencies = [ - "siphasher", -] - -[[package]] -name = "pin-project-lite" -version = "0.2.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" - -[[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.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" - -[[package]] -name = "ppv-lite86" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" - -[[package]] -name = "precomputed-hash" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" - -[[package]] -name = "pretty_env_logger" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "865724d4dbe39d9f3dd3b52b88d859d66bcb2d6a0acfd5ea68a65fb66d4bdc1c" -dependencies = [ - "env_logger", - "log", -] - -[[package]] -name = "proc-macro-crate" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" -dependencies = [ - "once_cell", - "toml_edit", -] - -[[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.67" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328" -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 = "rawpointer" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3" - -[[package]] -name = "rayon" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" -dependencies = [ - "either", - "rayon-core", -] - -[[package]] -name = "rayon-core" -version = "1.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" -dependencies = [ - "crossbeam-channel", - "crossbeam-deque", - "crossbeam-utils", - "num_cpus", -] - -[[package]] -name = "rctree" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b42e27ef78c35d3998403c1d26f3efd9e135d3e5121b0a4845cc5cc27547f4f" - -[[package]] -name = "redox_syscall" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "regex" -version = "1.9.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata", - "regex-syntax", -] - -[[package]] -name = "regex-automata" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" - -[[package]] -name = "rgb" -version = "0.8.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20ec2d3e3fc7a92ced357df9cebd5a10b6fb2aa1ee797bf7e9ce2f17dffc8f59" -dependencies = [ - "bytemuck", -] - -[[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.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "747c788e9ce8e92b12cd485c49ddf90723550b654b32508f979b71a7b1ecda4f" -dependencies = [ - "bitflags 2.4.0", - "errno", - "libc", - "linux-raw-sys", - "windows-sys", -] - -[[package]] -name = "safe_arch" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f398075ce1e6a179b46f51bd88d0598b92b00d3551f1a2d4ac49e771b56ac354" -dependencies = [ - "bytemuck", -] - -[[package]] -name = "scopeguard" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" - -[[package]] -name = "selectors" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eb30575f3638fc8f6815f448d50cb1a2e255b0897985c8c59f4d37b72a07b06" -dependencies = [ - "bitflags 2.4.0", - "cssparser", - "derive_more", - "fxhash", - "log", - "new_debug_unreachable", - "phf 0.10.1", - "phf_codegen", - "precomputed-hash", - "servo_arc", - "smallvec", -] - -[[package]] -name = "semver" -version = "1.0.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" - -[[package]] -name = "serde" -version = "1.0.188" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.188" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.37", -] - -[[package]] -name = "serde_spanned" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" -dependencies = [ - "serde", -] - -[[package]] -name = "servo_arc" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d036d71a959e00c77a63538b90a6c2390969f9772b096ea837205c6bd0491a44" -dependencies = [ - "stable_deref_trait", -] - -[[package]] -name = "simba" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "061507c94fc6ab4ba1c9a0305018408e312e17c041eb63bef8aa726fa33aceae" -dependencies = [ - "approx", - "num-complex", - "num-traits", - "paste", - "wide", -] - -[[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.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" - -[[package]] -name = "stable_deref_trait" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" - -[[package]] -name = "string_cache" -version = "0.8.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b" -dependencies = [ - "new_debug_unreachable", - "once_cell", - "parking_lot", - "phf_shared 0.10.0", - "precomputed-hash", - "serde", -] - -[[package]] -name = "string_cache_codegen" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bb30289b722be4ff74a408c3cc27edeaad656e06cb1fe8fa9231fa59c728988" -dependencies = [ - "phf_generator 0.10.0", - "phf_shared 0.10.0", - "proc-macro2", - "quote", -] - -[[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.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7303ef2c05cd654186cb250d29049a24840ca25d2747c25c0381c8d9e2f582e8" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "system-deps" -version = "6.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30c2de8a4d8f4b823d634affc9cd2a74ec98c53a756f317e529a48046cbf71f3" -dependencies = [ - "cfg-expr", - "heck", - "pkg-config", - "toml", - "version-compare", -] - -[[package]] -name = "target-lexicon" -version = "0.12.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d0e916b1148c8e263850e1ebcbd046f333e0683c724876bb0da63ea4373dc8a" - -[[package]] -name = "temp-dir" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af547b166dd1ea4b472165569fc456cfb6818116f854690b0ff205e636523dab" - -[[package]] -name = "tendril" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d24a120c5fc464a3458240ee02c299ebcb9d67b5249c8848b09d639dca8d7bb0" -dependencies = [ - "futf", - "mac", - "utf-8", -] - -[[package]] -name = "termcolor" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6093bad37da69aab9d123a8091e4be0aa4a03e4d601ec641c327398315f62b64" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "thiserror" -version = "1.0.48" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d6d7a740b8a666a7e828dd00da9c0dc290dff53154ea77ac109281de90589b7" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.48" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.37", -] - -[[package]] -name = "tinyvec" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" -dependencies = [ - "tinyvec_macros", -] - -[[package]] -name = "tinyvec_macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" - -[[package]] -name = "toml" -version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" -dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit", -] - -[[package]] -name = "toml_datetime" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" -dependencies = [ - "serde", -] - -[[package]] -name = "toml_edit" -version = "0.19.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" -dependencies = [ - "indexmap", - "serde", - "serde_spanned", - "toml_datetime", - "winnow", -] - -[[package]] -name = "typenum" -version = "1.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" - -[[package]] -name = "unicode-bidi" -version = "0.3.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" - -[[package]] -name = "unicode-ident" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" - -[[package]] -name = "unicode-normalization" -version = "0.1.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "url" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" -dependencies = [ - "form_urlencoded", - "idna", - "percent-encoding", -] - -[[package]] -name = "utf-8" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" - -[[package]] -name = "version-compare" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "579a42fc0b8e0c63b76519a339be31bed574929511fa53c1a3acae26eb258f29" - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] -name = "wide" -version = "0.7.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa469ffa65ef7e0ba0f164183697b89b854253fd31aeb92358b7b6155177d62f" -dependencies = [ - "bytemuck", - "safe_arch", -] - -[[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.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" -dependencies = [ - "winapi", -] - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "windows-sys" -version = "0.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" - -[[package]] -name = "winnow" -version = "0.5.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc" -dependencies = [ - "memchr", -] - -[[package]] -name = "xml-rs" -version = "0.8.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bab77e97b50aee93da431f2cee7cd0f43b4d1da3c408042f2d7d164187774f0a" - -[[package]] -name = "xml5ever" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4034e1d05af98b51ad7214527730626f019682d797ba38b51689212118d8e650" -dependencies = [ - "log", - "mac", - "markup5ever", -] diff --git a/pkgs/applications/graphics/emblem/default.nix b/pkgs/applications/graphics/emblem/default.nix index 6d490fc24141e..c0f9046fa9c82 100644 --- a/pkgs/applications/graphics/emblem/default.nix +++ b/pkgs/applications/graphics/emblem/default.nix @@ -2,7 +2,6 @@ , stdenv , fetchFromGitLab , rustPlatform -, appstream-glib , cargo , desktop-file-utils , glib @@ -11,7 +10,6 @@ , pkg-config , rustc , wrapGAppsHook4 -, gtk4 , libadwaita , libxml2 , darwin @@ -19,7 +17,7 @@ stdenv.mkDerivation rec { pname = "emblem"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; @@ -27,15 +25,16 @@ stdenv.mkDerivation rec { owner = "design"; repo = "emblem"; rev = version; - sha256 = "sha256-VA4KZ8x/MMAA/g/x59h1CyHhlj0vbZqwAFdsfTPA2Ds="; + sha256 = "sha256-pW+2kQANZ9M1f0jMoBqCxMjLCu0xAnuEE2EdzDq4ZCE="; }; - cargoDeps = rustPlatform.importCargoLock { - lockFile = ./Cargo.lock; + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + hash = "sha256-2mxDXDGQA2YB+gnGwy6VSZP/RRBKg0RiR1GlXIkio9E="; }; nativeBuildInputs = [ - appstream-glib desktop-file-utils glib meson @@ -48,19 +47,22 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gtk4 libadwaita libxml2 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Foundation ]; - meta = with lib; { + env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.hostPlatform.isDarwin [ + "-Wno-error=incompatible-function-pointer-types" + ]); + + meta = { description = "Generate project icons and avatars from a symbolic icon"; mainProgram = "emblem"; homepage = "https://gitlab.gnome.org/World/design/emblem"; - license = licenses.gpl3Plus; - platforms = platforms.unix; - maintainers = with maintainers; [ figsoda foo-dogsquared ]; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ figsoda foo-dogsquared aleksana ]; }; } diff --git a/pkgs/applications/graphics/emulsion/default.nix b/pkgs/applications/graphics/emulsion/default.nix index a57a33e11b51b..0db2a75721ec0 100644 --- a/pkgs/applications/graphics/emulsion/default.nix +++ b/pkgs/applications/graphics/emulsion/default.nix @@ -30,7 +30,7 @@ let libXrandr libXxf86vm libxcb - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libxkbcommon wayland ]; @@ -55,7 +55,7 @@ rustPlatform.buildRustPackage rec { python3 ]; - buildInputs = rpathLibs ++ lib.optionals stdenv.isDarwin [ + buildInputs = rpathLibs ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit CoreGraphics CoreServices @@ -63,7 +63,7 @@ rustPlatform.buildRustPackage rec { OpenGL ]; - postFixup = lib.optionalString stdenv.isLinux '' + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' patchelf --set-rpath "${lib.makeLibraryPath rpathLibs}" $out/bin/emulsion ''; diff --git a/pkgs/applications/graphics/entwine/default.nix b/pkgs/applications/graphics/entwine/default.nix index 5a79bc38c553c..0ab59737cd61c 100644 --- a/pkgs/applications/graphics/entwine/default.nix +++ b/pkgs/applications/graphics/entwine/default.nix @@ -1,21 +1,22 @@ { lib , stdenv , fetchFromGitHub +, gitUpdater , cmake , pdal , curl , openssl }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "entwine"; - version = "unstable-2023-04-27"; + version = "3.1.1"; src = fetchFromGitHub { owner = "connormanning"; repo = "entwine"; - rev = "8bd179c38e6da1688f42376b88ff30427672c4e3"; - sha256 = "sha256-RlNxTtqxQoniI1Ugj5ot0weu7ji3WqDJZpMu2n8vBkw="; + rev = version; + sha256 = "sha256-1dy5NafKX0E4MwFIggnr7bQIeB1KvqnNaQQUUAs6Bq8="; }; buildInputs = [ @@ -28,11 +29,13 @@ stdenv.mkDerivation { cmake ]; + passthru.updateScript = gitUpdater {}; + meta = with lib; { description = "Point cloud organization for massive datasets"; homepage = "https://entwine.io/"; license = licenses.lgpl2Only; - maintainers = with maintainers; [ matthewcroughan ]; + maintainers = with maintainers; teams.geospatial.members ++ [ matthewcroughan ]; platforms = platforms.linux; mainProgram = "entwine"; }; diff --git a/pkgs/applications/graphics/epick/default.nix b/pkgs/applications/graphics/epick/default.nix index dee31abdd29d2..939232197eeb3 100644 --- a/pkgs/applications/graphics/epick/default.nix +++ b/pkgs/applications/graphics/epick/default.nix @@ -8,7 +8,6 @@ , freetype , libGL , xorg -, darwin , AppKit }: @@ -23,13 +22,13 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-k0WQu1n1sAHVor58jr060vD5/2rDrt1k5zzJlrK9WrU="; }; - cargoSha256 = "sha256-OQZPOiMTpoWabxHa3TJG8L3zq8WxMeFttw8xggSXsMA="; + cargoHash = "sha256-OQZPOiMTpoWabxHa3TJG8L3zq8WxMeFttw8xggSXsMA="; - nativeBuildInputs = lib.optionals stdenv.isLinux [ + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; - buildInputs = lib.optionals stdenv.isLinux [ + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ expat fontconfig freetype @@ -37,7 +36,7 @@ rustPlatform.buildRustPackage rec { xorg.libXcursor xorg.libXi xorg.libXrandr - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit ]; @@ -47,7 +46,7 @@ rustPlatform.buildRustPackage rec { install -Dm444 assets/icon.png $out/share/icons/hicolor/48x48/apps/epick.png ''; - postFixup = lib.optionalString stdenv.isLinux '' + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' patchelf $out/bin/epick --add-rpath ${lib.makeLibraryPath [ libGL ]} ''; diff --git a/pkgs/applications/graphics/evilpixie/default.nix b/pkgs/applications/graphics/evilpixie/default.nix index fb397239849b1..9c5c7e81c3a76 100644 --- a/pkgs/applications/graphics/evilpixie/default.nix +++ b/pkgs/applications/graphics/evilpixie/default.nix @@ -48,8 +48,8 @@ stdenv.mkDerivation (finalAttrs: { platforms = platforms.all; # Undefined symbols for architecture x86_64: # "_bundle_path", referenced from: App::SetupPaths() in src_app.cpp.o - broken = stdenv.isDarwin || + broken = stdenv.hostPlatform.isDarwin || # https://github.com/bcampbell/evilpixie/issues/28 - stdenv.isAarch64; + stdenv.hostPlatform.isAarch64; }; }) diff --git a/pkgs/applications/graphics/f3d/default.nix b/pkgs/applications/graphics/f3d/default.nix index dc3b9e4b3a61b..3ce4095162495 100644 --- a/pkgs/applications/graphics/f3d/default.nix +++ b/pkgs/applications/graphics/f3d/default.nix @@ -4,18 +4,24 @@ , cmake , help2man , gzip +# There is a f3d overriden with EGL enabled vtk in top-level/all-packages.nix +# compiling with EGL enabled vtk will result in f3d running in headless mode +# See https://github.com/NixOS/nixpkgs/pull/324022. This may change later. , vtk_9 , autoPatchelfHook , Cocoa , OpenGL , python3Packages -, withManual ? !stdenv.isDarwin +, opencascade-occt +, assimp +, fontconfig +, withManual ? !stdenv.hostPlatform.isDarwin , withPythonBinding ? false }: stdenv.mkDerivation rec { pname = "f3d"; - version = "2.4.0"; + version = "2.5.0"; outputs = [ "out" ] ++ lib.optionals withManual [ "man" ]; @@ -23,7 +29,7 @@ stdenv.mkDerivation rec { owner = "f3d-app"; repo = "f3d"; rev = "refs/tags/v${version}"; - hash = "sha256-mqkPegbGos38S50CoV4Qse9Z4wZ327UmIwmSrrP35uI="; + hash = "sha256-Mw40JyXZj+Q4a9dD5UnkUSdUfQGaV92gor8ynn86VJ8="; }; nativeBuildInputs = [ @@ -39,7 +45,10 @@ stdenv.mkDerivation rec { buildInputs = [ vtk_9 - ] ++ lib.optionals stdenv.isDarwin [ + opencascade-occt + assimp + fontconfig + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa OpenGL ] ++ lib.optionals withPythonBinding [ @@ -55,6 +64,8 @@ stdenv.mkDerivation rec { "-DCMAKE_INSTALL_INCLUDEDIR=include" "-DCMAKE_INSTALL_BINDIR=bin" "-DF3D_MODULE_EXTERNAL_RENDERING=ON" + "-DF3D_PLUGIN_BUILD_ASSIMP=ON" + "-DF3D_PLUGIN_BUILD_OCCT=ON" ] ++ lib.optionals withManual [ "-DF3D_LINUX_GENERATE_MAN=ON" ] ++ lib.optionals withPythonBinding [ diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix index f4adcace1ec43..e7d144579afdf 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" ]; @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { makeFlags = [ "PREFIX=${placeholder "out"}" "exif=1" - ] ++ lib.optional stdenv.isDarwin "verscmp=0" + ] ++ lib.optional stdenv.hostPlatform.isDarwin "verscmp=0" ++ lib.optional enableAutoreload "inotify=1"; installTargets = [ "install" ]; @@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { # released under a variant of the MIT license # https://spdx.org/licenses/MIT-feh.html license = licenses.mit-feh; - maintainers = with maintainers; [ gepbird globin viric willibutz ]; + maintainers = with maintainers; [ gepbird globin willibutz ]; platforms = platforms.unix; mainProgram = "feh"; }; diff --git a/pkgs/applications/graphics/figma-linux/default.nix b/pkgs/applications/graphics/figma-linux/default.nix index 72f5ed882c401..159dcd85b8010 100644 --- a/pkgs/applications/graphics/figma-linux/default.nix +++ b/pkgs/applications/graphics/figma-linux/default.nix @@ -8,7 +8,6 @@ , wrapGAppsHook3 , ... }: -with lib; stdenv.mkDerivation (finalAttrs: { pname = "figma-linux"; version = "0.11.4"; @@ -82,7 +81,7 @@ stdenv.mkDerivation (finalAttrs: { --replace "Exec=/opt/figma-linux/figma-linux" "Exec=$out/bin/${finalAttrs.pname}" ''; - meta = { + meta = with lib; { description = "Unofficial Electron-based Figma desktop app for Linux"; homepage = "https://github.com/Figma-Linux/figma-linux"; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/graphics/fiji/default.nix b/pkgs/applications/graphics/fiji/default.nix index c5f4d08f30e4a..3d8cf49711c8c 100644 --- a/pkgs/applications/graphics/fiji/default.nix +++ b/pkgs/applications/graphics/fiji/default.nix @@ -7,19 +7,21 @@ , makeDesktopItem , copyDesktopItems , runtimeShell +, unzip }: + stdenv.mkDerivation rec { pname = "fiji"; - version = "20201104-1356"; + version = "20240614-2117"; src = fetchurl { - url = "https://downloads.imagej.net/${pname}/archive/${version}/${pname}-nojre.tar.gz"; - sha256 = "1jv4wjjkpid5spr2nk5xlvq3hg687qx1n5zh8zlw48y1y09c4q7a"; + url = "https://downloads.imagej.net/fiji/archive/${version}/fiji-nojre.zip"; + sha256 = "sha256-OCNnN8CYniNEIfKRHRBoJ3Fo+u5AwXoPJAzUCc4P+f0="; }; dontBuild = true; - nativeBuildInputs = [ autoPatchelfHook makeWrapper copyDesktopItems ]; + nativeBuildInputs = [ autoPatchelfHook makeWrapper copyDesktopItems unzip ]; buildInputs = [ stdenv.cc.cc.lib ]; desktopItems = [ @@ -46,10 +48,11 @@ stdenv.mkDerivation rec { cp -R * $out/fiji rm -f $out/fiji/jars/imagej-updater-*.jar - # Disgusting hack to stop a local desktop entry being created + # Don't create a local desktop entry and avoid deprecated garbage + # collection option cat <<EOF > $out/bin/.fiji-launcher-hack #!${runtimeShell} - exec \$($out/fiji/ImageJ-linux64 --dry-run "\$@") + exec \$($out/fiji/ImageJ-linux64 --default-gc --dry-run "\$@") EOF chmod +x $out/bin/.fiji-launcher-hack @@ -72,6 +75,6 @@ stdenv.mkDerivation rec { binaryNativeCode ]; license = with lib.licenses; [ gpl2Plus gpl3Plus bsd2 publicDomain ]; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ davisrichard437 ]; }; } diff --git a/pkgs/applications/graphics/flaca/default.nix b/pkgs/applications/graphics/flaca/default.nix deleted file mode 100644 index b2d82b458b495..0000000000000 --- a/pkgs/applications/graphics/flaca/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ lib -, fetchFromGitHub -, rustPlatform -, fetchurl -, runCommand -, lndir -}: - -rustPlatform.buildRustPackage rec { - pname = "flaca"; - version = "2.4.6"; - - src = - let - source = fetchFromGitHub { - owner = "Blobfolio"; - repo = pname; - rev = "v${version}"; - hash = "sha256-uybEo098+Y92b2P9CniKFmaV8hQZFuOSthgQRGZ/ncc="; - }; - lockFile = fetchurl { - url = "https://github.com/Blobfolio/flaca/releases/download/v${version}/Cargo.lock"; - hash = "sha256-xAjpw71HgS6fILg5zNuc43s0fIqYcoUMMbCH65xrlww="; - }; - in - runCommand "source-with-lock" { nativeBuildInputs = [ lndir ]; } '' - mkdir -p $out - ln -s ${lockFile} $out/Cargo.lock - lndir -silent ${source} $out - ''; - - cargoHash = "sha256-w+PeuH6VFIu3iH5EXF6gEwyYoGeqXX0yd5jJs2NqisQ="; - - meta = with lib; { - description = "CLI tool to losslessly compress JPEG and PNG images"; - longDescription = "A CLI tool for x86-64 Linux machines that simplifies the task of maximally, losslessly compressing JPEG and PNG images for use in production web environments"; - homepage = "https://github.com/Blobfolio/flaca"; - maintainers = with maintainers; [ zzzsy ]; - platforms = platforms.linux; - license = licenses.wtfpl; - mainProgram = "flaca"; - }; -} diff --git a/pkgs/applications/graphics/fluxus/default.nix b/pkgs/applications/graphics/fluxus/default.nix index 5491305fad2c8..dfa518c5c5741 100644 --- a/pkgs/applications/graphics/fluxus/default.nix +++ b/pkgs/applications/graphics/fluxus/default.nix @@ -3,7 +3,7 @@ , fetchFromGitLab , alsa-lib , fftw -, freeglut +, libglut , freetype , glew , libjack2 @@ -33,17 +33,17 @@ stdenv.mkDerivation { buildInputs = [ alsa-lib fftw - freeglut.dev + libglut freetype glew libjack2 - libjpeg.dev + libjpeg liblo - libsndfile.dev - libtiff.dev + libsndfile + libtiff ode openal - openssl.dev + openssl racket_7_9 ]; nativeBuildInputs = [ scons ]; diff --git a/pkgs/applications/graphics/fondo/default.nix b/pkgs/applications/graphics/fondo/default.nix deleted file mode 100644 index 46c2c72d91ad3..0000000000000 --- a/pkgs/applications/graphics/fondo/default.nix +++ /dev/null @@ -1,71 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, nix-update-script -, pantheon -, vala -, pkg-config -, meson -, ninja -, python3 -, glib -, gsettings-desktop-schemas -, gtk3 -, libgee -, libhandy -, libsoup -, json-glib -, glib-networking -, desktop-file-utils -, wrapGAppsHook3 -}: - -stdenv.mkDerivation rec { - pname = "fondo"; - version = "1.6.1"; - - src = fetchFromGitHub { - owner = "calo001"; - repo = pname; - rev = version; - sha256 = "sha256-JiDbkVs+EZRWRohSiuh8xFFgEhbnMYZfnZtz5Z4Wdb0="; - }; - - nativeBuildInputs = [ - desktop-file-utils - meson - ninja - pkg-config - python3 - vala - wrapGAppsHook3 - ]; - - buildInputs = [ - glib - glib-networking - gsettings-desktop-schemas - gtk3 - json-glib - libgee - libhandy - libsoup - pantheon.granite - ]; - - postPatch = '' - chmod +x meson/post_install.py - patchShebangs meson/post_install.py - ''; - - passthru.updateScript = nix-update-script { }; - - meta = with lib; { - homepage = "https://github.com/calo001/fondo"; - description = "Find the most beautiful wallpapers for your desktop"; - license = licenses.agpl3Plus; - maintainers = with maintainers; [ AndersonTorres ] ++ teams.pantheon.members; - platforms = platforms.linux; - mainProgram = "com.github.calo001.fondo"; - }; -} diff --git a/pkgs/applications/graphics/foxotron/default.nix b/pkgs/applications/graphics/foxotron/default.nix index c5f2d9c26fccf..d71c1999fa55a 100644 --- a/pkgs/applications/graphics/foxotron/default.nix +++ b/pkgs/applications/graphics/foxotron/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { repo = "Foxotron"; rev = version; fetchSubmodules = true; - sha256 = "sha256-s1eWZMVitVSP7nJJ5wXvnV8uI6yto7LmvlvocOwVAxw="; + hash = "sha256-s1eWZMVitVSP7nJJ5wXvnV8uI6yto7LmvlvocOwVAxw="; }; patches = [ diff --git a/pkgs/applications/graphics/freepv/default.nix b/pkgs/applications/graphics/freepv/default.nix index def7e3e9dd867..1ff0fd5146df0 100644 --- a/pkgs/applications/graphics/freepv/default.nix +++ b/pkgs/applications/graphics/freepv/default.nix @@ -4,7 +4,7 @@ , libjpeg , libGLU , libGL -, freeglut +, libglut , zlib , cmake , libX11 @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ]; - buildInputs = [ libjpeg libGLU libGL freeglut zlib libX11 libxml2 libpng libXxf86vm ]; + buildInputs = [ libjpeg libGLU libGL libglut zlib libX11 libxml2 libpng libXxf86vm ]; postPatch = '' sed -i -e '/GECKO/d' CMakeLists.txt diff --git a/pkgs/applications/graphics/fstl/default.nix b/pkgs/applications/graphics/fstl/default.nix index c3d1f5eb655ee..f902776fb58b3 100644 --- a/pkgs/applications/graphics/fstl/default.nix +++ b/pkgs/applications/graphics/fstl/default.nix @@ -6,7 +6,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake ]; - installPhase = lib.optionalString stdenv.isDarwin '' + installPhase = lib.optionalString stdenv.hostPlatform.isDarwin '' runHook preInstall mkdir -p $out/Applications diff --git a/pkgs/applications/graphics/gcolor2/default.nix b/pkgs/applications/graphics/gcolor2/default.nix deleted file mode 100644 index 4ee7b869eea07..0000000000000 --- a/pkgs/applications/graphics/gcolor2/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{lib, stdenv, fetchurl, fetchpatch, gtk2, perlPackages, pkg-config } : - -let version = "0.4"; in -stdenv.mkDerivation { - pname = "gcolor2"; - inherit version; - arch = if stdenv.hostPlatform.system == "x86_64-linux" then "amd64" else "386"; - - src = fetchurl { - url = "mirror://sourceforge/project/gcolor2/gcolor2/${version}/gcolor2-${version}.tar.bz2"; - sha256 = "1siv54vwx9dbfcflklvf7pkp5lk6h3nn63flg6jzifz9wp0c84q6"; - }; - - preConfigure = '' - sed -i 's/\[:space:\]/[&]/g' configure - ''; - - # from https://github.com/PhantomX/slackbuilds/tree/master/gcolor2/patches - patches = (if stdenv.hostPlatform.system == "x86_64-linux" then - [ ./gcolor2-amd64.patch ] else - [ ]) - ++ [ - # Pull patch pending upstream inclusion for -fno-common toolchains: - # https://sourceforge.net/p/gcolor2/patches/8/ - (fetchpatch { - name = "fno-common.patch"; - url = "https://sourceforge.net/p/gcolor2/patches/8/attachment/0001-gcolor2-fix-build-on-gcc-10-fno-common.patch"; - sha256 = "0187zc8as9g3d6mpm3isg87jfpryj0hajb4inwvii8gxrzbi5l5f"; - }) - ]; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ gtk2 ] - ++ (with perlPackages; [ perl XMLParser ]); - - meta = { - description = "Simple GTK 2 color selector"; - homepage = "https://gcolor2.sourceforge.net/"; - license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ notthemessiah ]; - platforms = with lib.platforms; unix; - mainProgram = "gcolor2"; - }; -} diff --git a/pkgs/applications/graphics/gcolor2/gcolor2-amd64.patch b/pkgs/applications/graphics/gcolor2/gcolor2-amd64.patch deleted file mode 100644 index cd06a8315f984..0000000000000 --- a/pkgs/applications/graphics/gcolor2/gcolor2-amd64.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff --exclude-from=/home/dang/bin/scripts/diffrc -up -ruN gcolor2-0.4.orig/src/callbacks.c gcolor2-0.4/src/callbacks.c ---- gcolor2-0.4.orig/src/callbacks.c 2005-07-12 14:06:12.000000000 -0400 -+++ gcolor2-0.4/src/callbacks.c 2007-02-17 19:19:38.000000000 -0500 -@@ -4,6 +4,9 @@ - - #include <gtk/gtk.h> - #include <stdio.h> -+#include <string.h> -+#include <glib.h> -+#include <glib/gprintf.h> - - #include "callbacks.h" - #include "interface.h" -@@ -172,6 +175,9 @@ void on_copy_color_to_clipboard_activate - gtk_clipboard_set_text (cb, hex, strlen (hex)); - } - -+void add_rgb_file (gchar *filename, gchar *type); -+gchar* get_system_file (void); -+ - void on_show_system_colors_activate (GtkMenuItem *menuitem, gpointer user_data) - { - if (gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (menuitem))) -@@ -266,6 +272,8 @@ void on_save_button_clicked (GtkButton * - gtk_widget_destroy (savedialog); - } - -+void add_list_color (gchar *spec, gchar *name, gchar *type, gboolean is_new_color); -+ - void add_color_to_treeview () - { - GtkTreeView *treeview; -diff --exclude-from=/home/dang/bin/scripts/diffrc -up -ruN gcolor2-0.4.orig/src/main.c gcolor2-0.4/src/main.c ---- gcolor2-0.4.orig/src/main.c 2005-07-11 10:55:49.000000000 -0400 -+++ gcolor2-0.4/src/main.c 2007-02-17 19:18:23.000000000 -0500 -@@ -4,6 +4,10 @@ - - #include <gtk/gtk.h> - #include <stdio.h> -+#include <stdlib.h> -+#include <string.h> -+#include <glib.h> -+#include <glib/gprintf.h> - - #include "interface.h" - #include "support.h" diff --git a/pkgs/applications/graphics/gcolor3/default.nix b/pkgs/applications/graphics/gcolor3/default.nix index 38c38143ff9ff..cf823398a446f 100644 --- a/pkgs/applications/graphics/gcolor3/default.nix +++ b/pkgs/applications/graphics/gcolor3/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { mainProgram = "gcolor3"; homepage = "https://gitlab.gnome.org/World/gcolor3"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/graphics/geeqie/default.nix b/pkgs/applications/graphics/geeqie/default.nix index 4eeb330f6d27e..2d07fbb8633d7 100644 --- a/pkgs/applications/graphics/geeqie/default.nix +++ b/pkgs/applications/graphics/geeqie/default.nix @@ -2,20 +2,20 @@ , 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 }: stdenv.mkDerivation rec { pname = "geeqie"; - version = "2.4"; + version = "2.5"; src = fetchFromGitHub { owner = "BestImageViewer"; repo = "geeqie"; rev = "v${version}"; - hash = "sha256-MVBKaiKcKknU0rChUYJ+N4oX4tVm145s+NqGQuDHY2g="; + hash = "sha256-k2FXj2ZKZzB5XpCcWzEv7Q1ozATfU3221XKcOFdWOGU="; }; patches = [ @@ -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/default.nix b/pkgs/applications/graphics/gimp/default.nix index fe89869809e99..5270b708486d1 100644 --- a/pkgs/applications/graphics/gimp/default.nix +++ b/pkgs/applications/graphics/gimp/default.nix @@ -42,6 +42,7 @@ , mypaint-brushes1 , libwebp , libheif +, libxslt , libgudev , openexr , desktopToDarwinBundle @@ -76,6 +77,14 @@ in stdenv.mkDerivation (finalAttrs: { # Use absolute paths instead of relying on PATH # to make sure plug-ins are loaded by the correct interpreter. ./hardcode-plugin-interpreters.patch + + # GIMP queries libheif.pc for builtin encoder/decoder support to determine if AVIF/HEIC files are supported + # (see https://gitlab.gnome.org/GNOME/gimp/-/blob/a8b1173ca441283971ee48f4778e2ffd1cca7284/configure.ac?page=2#L1846-1852) + # These variables have been removed since libheif 1.18.0 + # (see https://github.com/strukturag/libheif/commit/cf0d89c6e0809427427583290547a7757428cf5a) + # This has already been fixed for the upcoming GIMP 3, but the fix has not been backported to 2.x yet + # (see https://gitlab.gnome.org/GNOME/gimp/-/issues/9080) + ./force-enable-libheif.patch ]; nativeBuildInputs = [ @@ -85,7 +94,8 @@ in stdenv.mkDerivation (finalAttrs: { gettext makeWrapper gtk-doc - ] ++ lib.optionals stdenv.isDarwin [ + libxslt + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ desktopToDarwinBundle ]; @@ -125,11 +135,11 @@ in stdenv.mkDerivation (finalAttrs: { glib-networking libmypaint mypaint-brushes1 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit Cocoa gtk-mac-integration-gtk2 - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libgudev ] ++ lib.optionals withPython [ python @@ -158,7 +168,7 @@ in stdenv.mkDerivation (finalAttrs: { doCheck = true; env = { - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-DGDK_OSX_BIG_SUR=16"; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-DGDK_OSX_BIG_SUR=16"; # Check if librsvg was built with --disable-pixbuf-loader. PKG_CONFIG_GDK_PIXBUF_2_0_GDK_PIXBUF_MODULEDIR = "${librsvg}/${gdk-pixbuf.moduleDir}"; diff --git a/pkgs/applications/graphics/gimp/force-enable-libheif.patch b/pkgs/applications/graphics/gimp/force-enable-libheif.patch new file mode 100644 index 0000000000000..de3dfb09b95e8 --- /dev/null +++ b/pkgs/applications/graphics/gimp/force-enable-libheif.patch @@ -0,0 +1,22 @@ +diff --git a/configure.ac b/configure.ac +index 48c3c77892..3189781817 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1843,13 +1843,13 @@ can_export_heic=no + can_import_avif=no + can_export_avif=no + if test "x$have_libheif" = xyes; then +- can_import_heic=`$PKG_CONFIG --variable=builtin_h265_decoder libheif` +- can_export_heic=`$PKG_CONFIG --variable=builtin_h265_encoder libheif` ++ can_import_heic=yes ++ can_export_heic=yes + if test "x$can_import_heic" = xyes; then + MIME_TYPES="$MIME_TYPES;image/heif;image/heic" + fi +- can_import_avif=`$PKG_CONFIG --variable=builtin_avif_decoder libheif` +- can_export_avif=`$PKG_CONFIG --variable=builtin_avif_encoder libheif` ++ can_import_avif=yes ++ can_export_avif=yes + if test "x$can_import_avif" = xyes; then + MIME_TYPES="$MIME_TYPES;image/avif" + fi diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index fe4904ee254a4..f5c9266b571df 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -2,7 +2,7 @@ # If you just want a subset of plug-ins, you can specify them explicitly: # `gimp-with-plugins.override { plugins = with gimpPlugins; [ gap ]; }`. -{ config, lib, pkgs }: +{ lib, pkgs }: let inherit (pkgs) stdenv fetchurl fetchpatch fetchpatch2 pkg-config intltool glib fetchFromGitHub fetchFromGitLab; @@ -102,7 +102,7 @@ in description = "Batch Image Manipulation Plugin for GIMP"; homepage = "https://github.com/alessandrofrancesconi/gimp-plugin-bimp"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; }; @@ -155,7 +155,7 @@ in }; }; - farbfeld = pluginDerivation rec { + farbfeld = pluginDerivation { pname = "farbfeld"; version = "unstable-2019-08-12"; @@ -309,7 +309,7 @@ in variant = "gimp"; }; - gimplensfun = pluginDerivation rec { + gimplensfun = pluginDerivation { version = "unstable-2018-10-21"; pname = "gimplensfun"; 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/gnome-obfuscate/default.nix b/pkgs/applications/graphics/gnome-obfuscate/default.nix index 1a091929b3e49..db173f58b54e6 100644 --- a/pkgs/applications/graphics/gnome-obfuscate/default.nix +++ b/pkgs/applications/graphics/gnome-obfuscate/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchFromGitLab +, buildPackages , cargo , gettext , meson @@ -36,6 +37,14 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-9lrxK2psdIPGsOC6p8T+3AGPrX6PjrK9mFirdJqBSMM="; }; + env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { + # Set the location to gettext to ensure the nixpkgs one on Darwin instead of the vendored one. + # The vendored gettext does not build with clang 16. + GETTEXT_BIN_DIR = "${lib.getBin buildPackages.gettext}/bin"; + GETTEXT_INCLUDE_DIR = "${lib.getDev gettext}/include"; + GETTEXT_LIB_DIR = "${lib.getLib gettext}/lib"; + }; + nativeBuildInputs = [ gettext meson @@ -54,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: { gtk4 gdk-pixbuf libadwaita - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Foundation ]; diff --git a/pkgs/applications/graphics/goxel/default.nix b/pkgs/applications/graphics/goxel/default.nix index 2ffa57280eaa8..404a42959038f 100644 --- a/pkgs/applications/graphics/goxel/default.nix +++ b/pkgs/applications/graphics/goxel/default.nix @@ -3,33 +3,24 @@ stdenv.mkDerivation (finalAttrs: { pname = "goxel"; - version = "0.14.0"; + version = "0.15.1"; src = fetchFromGitHub { owner = "guillaumechereau"; repo = "goxel"; rev = "v${finalAttrs.version}"; - hash = "sha256-ueA0YW2n/DXd9AytDzfPtvtXbvuUm4VDwcdvHWObKxc="; + hash = "sha256-mNSkQisWL3wXb+IsClWFTMbpeiRC4xteePXNP+GkUnU="; }; nativeBuildInputs = [ scons pkg-config wrapGAppsHook3 ]; buildInputs = [ glfw3 gtk3 libpng ]; - buildPhase = '' - make release - ''; + dontUseSconsBuild = true; + dontUseSconsInstall = true; - installPhase = '' - install -D ./goxel $out/bin/goxel + makeFlags = [ "PREFIX=$(out)" ]; - for res in $(ls data/icons | sed -e 's/icon//g' -e 's/.png//g'); do - install -Dm444 data/icons/icon$res.png $out/share/icons/hicolor/''${res}x''${res}/apps/goxel.png - done - - install -Dm444 snap/gui/goxel.desktop -t $out/share/applications - substituteInPlace $out/share/applications/goxel.desktop \ - --replace 'Icon=''${SNAP}/icon.png' 'Icon=goxel' - ''; + buildFlags = [ "release" ]; meta = with lib; { description = "Open Source 3D voxel editor"; diff --git a/pkgs/applications/graphics/gpicview/default.nix b/pkgs/applications/graphics/gpicview/default.nix deleted file mode 100644 index 9015677843545..0000000000000 --- a/pkgs/applications/graphics/gpicview/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, stdenv, fetchurl, intltool, pkg-config, gtk2, fetchpatch }: - -stdenv.mkDerivation rec { - pname = "gpicview"; - version = "0.2.4"; - - src = fetchurl { - url = "mirror://sourceforge/lxde/gpicview-${version}.tar.gz"; - sha256 = "1svcy1c8bgk0pl12yhyv16h2fl52x5vzzcv57z6qdcv5czgvgglr"; - }; - - patches = [ - (fetchpatch { - url = "https://raw.githubusercontent.com/nonas/debian-clang/master/buildlogs/gpicview/gpicview-0.2.4/debian/patches/clang_FTBFS_Wreturn-type.patch"; - sha256 = "02dm966bplnv10knpdx7rlpjipk884156ggd9ij05zhza0jl8xcs"; - }) - ]; - - nativeBuildInputs = [ pkg-config intltool ]; - - buildInputs = [ gtk2 ]; - - meta = with lib; { - description = "Simple and fast image viewer for X"; - homepage = "https://lxde.sourceforge.net/gpicview/"; - license = licenses.gpl2; - maintainers = with maintainers; [ lovek323 ]; - platforms = platforms.unix; - mainProgram = "gpicview"; - }; -} diff --git a/pkgs/applications/graphics/gqview/default.nix b/pkgs/applications/graphics/gqview/default.nix deleted file mode 100644 index 89b86bf24b206..0000000000000 --- a/pkgs/applications/graphics/gqview/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, gtk2, libpng }: - -stdenv.mkDerivation rec { - pname = "gqview"; - version = "2.1.5"; - - src = fetchurl { - url = "mirror://sourceforge/gqview/gqview-${version}.tar.gz"; - sha256 = "0ilm5s7ps9kg4f5hzgjhg0xhn6zg0v9i7jnd67zrx9h7wsaa9zhj"; - }; - - nativeBuildInputs = [ pkg-config ]; - - buildInputs = [ gtk2 libpng ]; - - hardeningDisable = [ "format" ]; - - env.NIX_CFLAGS_COMPILE = "-fcommon"; - NIX_LDFLAGS = "-lm"; - - meta = with lib; { - description = "Fast image viewer"; - homepage = "https://gqview.sourceforge.net"; - license = licenses.gpl2; - platforms = platforms.unix; - maintainers = with maintainers; [ ]; - mainProgram = "gqview"; - }; -} diff --git a/pkgs/applications/graphics/grafx2/default.nix b/pkgs/applications/graphics/grafx2/default.nix deleted file mode 100644 index fa80fe718ce4f..0000000000000 --- a/pkgs/applications/graphics/grafx2/default.nix +++ /dev/null @@ -1,76 +0,0 @@ -{ lib -, stdenv -, fetchurl -, SDL -, SDL_image -, SDL_ttf -, installShellFiles -, fontconfig -, libpng -, libtiff -, lua5 -, pkg-config -, zlib -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "grafx2"; - version = "2.8.3091"; - - outputs = [ "out" "man" ]; - - src = fetchurl { - name = "grafx2-${finalAttrs.version}.tar.gz"; - url = "https://pulkomandy.tk/projects/GrafX2/downloads/65"; - hash = "sha256-KdY7GUhQp/Q7t/ktLPGxI66ZHy2gDAffn2yB5pmcJCM="; - }; - - postPatch = '' - substituteInPlace misc/unix/grafx2.desktop \ - --replace "Exec=grafx2" "Exec=grafx2-sdl" - ''; - - nativeBuildInputs = [ - installShellFiles - pkg-config - ]; - - buildInputs = [ - SDL - SDL_image - SDL_ttf - fontconfig - libpng - libtiff - lua5 - zlib - ]; - - strictDeps = false; # Why?? - - makeFlags = [ "-C src" ]; - installFlags = [ "-C src" "PREFIX=$(out)" ]; - - postInstall = '' - installManPage misc/unix/grafx2.1 - ''; - - meta = { - homepage = "http://grafx2.eu/"; - description = "Ultimate 256-color painting program"; - longDescription = '' - GrafX2 is a bitmap paint program inspired by the Amiga programs Deluxe - Paint and Brilliance. Specialized in 256-color drawing, it includes a very - large number of tools and effects that make it particularly suitable for - pixel art, game graphics, and generally any detailed graphics painted with - a mouse. - - The program is mostly developed on Haiku, Linux and Windows, but is also - portable on many other platforms. - ''; - license = with lib.licenses; [ gpl2Plus ]; - mainProgram = "grafx2-sdl"; - maintainers = with lib.maintainers; [ AndersonTorres ]; - platforms = lib.platforms.unix; - }; -}) diff --git a/pkgs/applications/graphics/gscan2pdf/default.nix b/pkgs/applications/graphics/gscan2pdf/default.nix index 6aaf257496cd9..62acb1713c170 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 @@ -6,24 +6,16 @@ # test dependencies xvfb-run, liberation_ttf, file, tesseract }: -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 +105,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,17 +115,22 @@ 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 ''; - meta = { + meta = with lib; { description = "GUI to produce PDFs or DjVus from scanned documents"; homepage = "https://gscan2pdf.sourceforge.net/"; license = licenses.gpl3; diff --git a/pkgs/applications/graphics/gscreenshot/default.nix b/pkgs/applications/graphics/gscreenshot/default.nix index c3468f65dcab6..4d6b724ee8223 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.6.2"; src = fetchFromGitHub { owner = "thenaterhood"; repo = "${pname}"; rev = "refs/tags/v${version}"; - sha256 = "sha256-BA118PwMslqvnlRES2fEgTjzfNvKNVae7GzWSyuaqYM="; + sha256 = "sha256-dYmdM9QtemVKggEmMMcprVIM1fe02jQOyBPniy7p9ns="; }; # needed for wrapGAppsHook3 to function diff --git a/pkgs/applications/graphics/gthumb/default.nix b/pkgs/applications/graphics/gthumb/default.nix index fc59139694515..5b56ce7585614 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 @@ -21,7 +22,6 @@ , libwebp , libX11 , json-glib -, webkitgtk , lcms2 , bison , flex @@ -31,6 +31,7 @@ , python3 , desktop-file-utils , itstool +, withWebservices ? true, webkitgtk }: stdenv.mkDerivation rec { @@ -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; }) @@ -78,11 +79,11 @@ stdenv.mkDerivation rec { libtiff libwebp libX11 - webkitgtk - ]; + ] ++ lib.optional withWebservices webkitgtk; mesonFlags = [ "-Dlibchamplain=true" + (lib.mesonBool "webservices" withWebservices) ]; postPatch = '' diff --git a/pkgs/applications/graphics/hello-wayland/default.nix b/pkgs/applications/graphics/hello-wayland/default.nix index 79326a6a700f6..97b7da3e0f092 100644 --- a/pkgs/applications/graphics/hello-wayland/default.nix +++ b/pkgs/applications/graphics/hello-wayland/default.nix @@ -15,7 +15,6 @@ stdenv.mkDerivation { }; separateDebugInfo = true; - depsBuildBuild = [ pkg-config ]; nativeBuildInputs = [ imagemagick pkg-config wayland-scanner ]; buildInputs = [ wayland wayland-protocols ]; diff --git a/pkgs/applications/graphics/hugin/default.nix b/pkgs/applications/graphics/hugin/default.nix index e7c3d7f8972dd..3ef74acca7d66 100644 --- a/pkgs/applications/graphics/hugin/default.nix +++ b/pkgs/applications/graphics/hugin/default.nix @@ -13,7 +13,7 @@ , fftw , flann , gettext -, glew-egl +, glew , ilmbase , lcms2 , lensfun @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { fftw flann gettext - glew-egl + glew ilmbase lcms2 lensfun diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix index 03d7be3dfad1e..f4740c7d9d236 100644 --- a/pkgs/applications/graphics/hydrus/default.nix +++ b/pkgs/applications/graphics/hydrus/default.nix @@ -6,6 +6,7 @@ , enableSwftools ? false , swftools , python3Packages +, pythonOlder , qtbase , qtcharts , makeDesktopItem @@ -14,14 +15,14 @@ python3Packages.buildPythonPackage rec { pname = "hydrus"; - version = "578"; + version = "591"; format = "other"; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; rev = "refs/tags/v${version}"; - hash = "sha256-u2SXhL57iNVjRFqerzc/TByB9ArAJx81mxOjTBVBMkg="; + hash = "sha256-JhCnSNmCOEJdM5aEPpYWLpKy/EQ9BoN1A/aUAaILWtQ="; }; nativeBuildInputs = [ @@ -60,6 +61,7 @@ python3Packages.buildPythonPackage rec { lz4 numpy opencv4 + olefile pillow pillow-heif psutil @@ -74,50 +76,17 @@ python3Packages.buildPythonPackage rec { pyyaml qtpy requests + show-in-file-manager send2trash service-identity twisted ]; nativeCheckInputs = with python3Packages; [ - nose mock httmock ]; - # most tests are failing, presumably because we are not using test.py - checkPhase = '' - runHook preCheck - - nosetests $src/hydrus/test \ - -e TestClientAPI \ - -e TestClientConstants \ - -e TestClientDaemons \ - -e TestClientData \ - -e TestClientDB \ - -e TestClientDBDuplicates \ - -e TestClientDBTags \ - -e TestClientImageHandling \ - -e TestClientImportOptions \ - -e TestClientListBoxes \ - -e TestClientMigration \ - -e TestClientNetworking \ - -e TestClientTags \ - -e TestClientThreading \ - -e TestDialogs \ - -e TestFunctions \ - -e TestHydrusNetwork \ - -e TestHydrusNATPunch \ - -e TestHydrusSerialisable \ - -e TestHydrusServer \ - -e TestHydrusSessions \ - -e TestServer \ - -e TestClientMetadataMigration \ - -e TestClientFileStorage \ - - runHook postCheck - ''; - outputs = [ "out" "doc" ]; installPhase = '' @@ -137,6 +106,7 @@ python3Packages.buildPythonPackage rec { mkdir -p $out/bin install -m0755 hydrus_server.py $out/bin/hydrus-server install -m0755 hydrus_client.py $out/bin/hydrus-client + install -m0755 hydrus_test.py $out/bin/hydrus-test # desktop item mkdir -p "$out/share/icons/hicolor/scalable/apps" @@ -151,6 +121,16 @@ python3Packages.buildPythonPackage rec { runHook postInstall ''; + checkPhase = '' + runHook preCheck + + export QT_QPA_PLATFORM=offscreen + export HOME=$(mktemp -d) + $out/bin/hydrus-test + + runHook postCheck + ''; + dontWrapQtApps = true; preFixup = '' makeWrapperArgs+=("''${qtWrapperArgs[@]}") diff --git a/pkgs/applications/graphics/icon-library/default.nix b/pkgs/applications/graphics/icon-library/default.nix index 2f4aae6dc2619..2b2c3e19825ab 100644 --- a/pkgs/applications/graphics/icon-library/default.nix +++ b/pkgs/applications/graphics/icon-library/default.nix @@ -2,12 +2,14 @@ , stdenv , fetchurl , wrapGAppsHook4 +, buildPackages , cargo , desktop-file-utils , meson , ninja , pkg-config , rustc +, gettext , gdk-pixbuf , glib , gtk4 @@ -25,6 +27,14 @@ stdenv.mkDerivation rec { hash = "sha256-nWGTYoSa0/fxnD0Mb2132LkeB1oa/gj/oIXBbI+FDw8="; }; + env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { + # Set the location to gettext to ensure the nixpkgs one on Darwin instead of the vendored one. + # The vendored gettext does not build with clang 16. + GETTEXT_BIN_DIR = "${lib.getBin buildPackages.gettext}/bin"; + GETTEXT_INCLUDE_DIR = "${lib.getDev gettext}/include"; + GETTEXT_LIB_DIR = "${lib.getLib gettext}/lib"; + }; + nativeBuildInputs = [ cargo desktop-file-utils @@ -40,7 +50,7 @@ stdenv.mkDerivation rec { gtk4 gtksourceview5 libadwaita - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Foundation ]; diff --git a/pkgs/applications/graphics/identity/Cargo.lock b/pkgs/applications/graphics/identity/Cargo.lock deleted file mode 100644 index 75e811d9266c4..0000000000000 --- a/pkgs/applications/graphics/identity/Cargo.lock +++ /dev/null @@ -1,2728 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "aho-corasick" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6748e8def348ed4d14996fa801f4122cd763fff530258cdc03f64b25f89d3a5a" -dependencies = [ - "memchr", -] - -[[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 = "anyhow" -version = "1.0.75" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" - -[[package]] -name = "ashpd" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3affe251686bd936a0afb74b9693e8bf2f193d51da1b9a45d3f1303a9bd2cc7" -dependencies = [ - "async-std", - "enumflags2", - "futures-channel", - "futures-util", - "gdk4-wayland", - "gdk4-x11", - "gtk4", - "once_cell", - "rand", - "serde", - "serde_repr", - "url", - "zbus", -] - -[[package]] -name = "async-broadcast" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c48ccdbf6ca6b121e0f586cbc0e73ae440e56c67c30fa0873b4e110d9c26d2b" -dependencies = [ - "event-listener", - "futures-core", -] - -[[package]] -name = "async-channel" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" -dependencies = [ - "concurrent-queue", - "event-listener", - "futures-core", -] - -[[package]] -name = "async-executor" -version = "1.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fa3dc5f2a8564f07759c008b9109dc0d39de92a88d5588b8a5036d286383afb" -dependencies = [ - "async-lock", - "async-task", - "concurrent-queue", - "fastrand 1.9.0", - "futures-lite", - "slab", -] - -[[package]] -name = "async-fs" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06" -dependencies = [ - "async-lock", - "autocfg", - "blocking", - "futures-lite", -] - -[[package]] -name = "async-global-executor" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1b6f5d7df27bd294849f8eec66ecfc63d11814df7a4f5d74168a2394467b776" -dependencies = [ - "async-channel", - "async-executor", - "async-io", - "async-lock", - "blocking", - "futures-lite", - "once_cell", -] - -[[package]] -name = "async-io" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" -dependencies = [ - "async-lock", - "autocfg", - "cfg-if", - "concurrent-queue", - "futures-lite", - "log", - "parking", - "polling", - "rustix 0.37.23", - "slab", - "socket2", - "waker-fn", -] - -[[package]] -name = "async-lock" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" -dependencies = [ - "event-listener", -] - -[[package]] -name = "async-process" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a9d28b1d97e08915212e2e45310d47854eafa69600756fc735fb788f75199c9" -dependencies = [ - "async-io", - "async-lock", - "autocfg", - "blocking", - "cfg-if", - "event-listener", - "futures-lite", - "rustix 0.37.23", - "signal-hook", - "windows-sys", -] - -[[package]] -name = "async-recursion" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.29", -] - -[[package]] -name = "async-std" -version = "1.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62565bb4402e926b29953c785397c6dc0391b7b446e45008b0049eb43cec6f5d" -dependencies = [ - "async-channel", - "async-global-executor", - "async-io", - "async-lock", - "crossbeam-utils", - "futures-channel", - "futures-core", - "futures-io", - "futures-lite", - "gloo-timers", - "kv-log-macro", - "log", - "memchr", - "once_cell", - "pin-project-lite", - "pin-utils", - "slab", - "wasm-bindgen-futures", -] - -[[package]] -name = "async-task" -version = "4.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae" - -[[package]] -name = "async-trait" -version = "0.1.73" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.29", -] - -[[package]] -name = "atomic-waker" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1181e1e0d1fce796a03db1ae795d67167da795f9cf4a39c37589e85ef57f26d3" - -[[package]] -name = "atomic_refcell" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "112ef6b3f6cb3cb6fc5b6b494ef7a848492cff1ab0ef4de10b0f7d572861c905" - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[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.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" - -[[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 = "blocking" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77231a1c8f801696fc0123ec6150ce92cffb8e164a02afb9c8ddee0e9b65ad65" -dependencies = [ - "async-channel", - "async-lock", - "async-task", - "atomic-waker", - "fastrand 1.9.0", - "futures-lite", - "log", -] - -[[package]] -name = "bumpalo" -version = "3.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" - -[[package]] -name = "byteorder" -version = "1.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" - -[[package]] -name = "cairo-rs" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d859b656775a6b1dd078d3e5924884e6ea88aa649a7fdde03d5b2ec56ffcc10b" -dependencies = [ - "bitflags 2.4.0", - "cairo-sys-rs", - "glib", - "libc", - "once_cell", - "thiserror", -] - -[[package]] -name = "cairo-sys-rs" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd4d115132e01c0165e3bf5f56aedee8980b0b96ede4eb000b693c05a8adb8ff" -dependencies = [ - "glib-sys", - "libc", - "system-deps", -] - -[[package]] -name = "cc" -version = "1.0.83" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" -dependencies = [ - "libc", -] - -[[package]] -name = "cfg-expr" -version = "0.15.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b40ccee03b5175c18cde8f37e7d2a33bcef6f8ec8f7cc0d81090d1bb380949c9" -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 = "chrono" -version = "0.4.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" -dependencies = [ - "android-tzdata", - "iana-time-zone", - "num-traits", - "winapi", -] - -[[package]] -name = "concurrent-queue" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c" -dependencies = [ - "crossbeam-utils", -] - -[[package]] -name = "core-foundation-sys" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" - -[[package]] -name = "cpufeatures" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" -dependencies = [ - "libc", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" -dependencies = [ - "cfg-if", -] - -[[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 = "dav1d" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87ca43c8e58ee931086b5fd9a4b6a8cc40c1346592246c4fe3d299eca1684c75" -dependencies = [ - "bitflags 2.4.0", - "dav1d-sys", -] - -[[package]] -name = "dav1d-sys" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "615542bb14c18b795f46aba92258902168218d714090f5fff47e68c9a352ea2d" -dependencies = [ - "libc", - "system-deps", -] - -[[package]] -name = "derivative" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" -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 = "either" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" - -[[package]] -name = "enumflags2" -version = "0.7.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c041f5090df68b32bcd905365fd51769c8b9d553fe87fde0b683534f10c01bd2" -dependencies = [ - "enumflags2_derive", - "serde", -] - -[[package]] -name = "enumflags2_derive" -version = "0.7.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e9a1f9f7d83e59740248a6e14ecf93929ade55027844dfcea78beafccc15745" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.29", -] - -[[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.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f" -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 = "event-listener" -version = "2.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" - -[[package]] -name = "fastrand" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" -dependencies = [ - "instant", -] - -[[package]] -name = "fastrand" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" - -[[package]] -name = "field-offset" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f" -dependencies = [ - "memoffset 0.9.0", - "rustc_version", -] - -[[package]] -name = "form_urlencoded" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" -dependencies = [ - "percent-encoding", -] - -[[package]] -name = "futures-channel" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" -dependencies = [ - "futures-core", -] - -[[package]] -name = "futures-core" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" - -[[package]] -name = "futures-executor" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" -dependencies = [ - "futures-core", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-io" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" - -[[package]] -name = "futures-lite" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" -dependencies = [ - "fastrand 1.9.0", - "futures-core", - "futures-io", - "memchr", - "parking", - "pin-project-lite", - "waker-fn", -] - -[[package]] -name = "futures-macro" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.29", -] - -[[package]] -name = "futures-sink" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" - -[[package]] -name = "futures-task" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" - -[[package]] -name = "futures-util" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" -dependencies = [ - "futures-core", - "futures-io", - "futures-macro", - "futures-sink", - "futures-task", - "memchr", - "pin-project-lite", - "pin-utils", - "slab", -] - -[[package]] -name = "gdk-pixbuf" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbc9c2ed73a81d556b65d08879ba4ee58808a6b1927ce915262185d6d547c6f3" -dependencies = [ - "gdk-pixbuf-sys", - "gio", - "glib", - "libc", - "once_cell", -] - -[[package]] -name = "gdk-pixbuf-sys" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9839ea644ed9c97a34d129ad56d38a25e6756f99f3a88e15cd39c20629caf7" -dependencies = [ - "gio-sys", - "glib-sys", - "gobject-sys", - "libc", - "system-deps", -] - -[[package]] -name = "gdk4" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6982d9815ed6ac95b0467b189e81f29dea26d08a732926ec113e65744ed3f96c" -dependencies = [ - "cairo-rs", - "gdk-pixbuf", - "gdk4-sys", - "gio", - "glib", - "libc", - "pango", -] - -[[package]] -name = "gdk4-sys" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbab43f332a3cf1df9974da690b5bb0e26720ed09a228178ce52175372dcfef0" -dependencies = [ - "cairo-sys-rs", - "gdk-pixbuf-sys", - "gio-sys", - "glib-sys", - "gobject-sys", - "libc", - "pango-sys", - "pkg-config", - "system-deps", -] - -[[package]] -name = "gdk4-wayland" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0db9102ff11e55bd65e153c1192abc21ddfa45ede90622e423d4e4a0e5d5f313" -dependencies = [ - "gdk4", - "gdk4-wayland-sys", - "gio", - "glib", - "libc", -] - -[[package]] -name = "gdk4-wayland-sys" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d48159be256ae0212d5a2b9884627197d08082c7168b28775b53a0f9885d5624" -dependencies = [ - "glib-sys", - "libc", - "system-deps", -] - -[[package]] -name = "gdk4-win32" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe66650c41f64e41ada9f85c4bdb96e5549c669e594892240dfb147a63256057" -dependencies = [ - "gdk4", - "gdk4-win32-sys", - "gio", - "glib", - "libc", - "system-deps", -] - -[[package]] -name = "gdk4-win32-sys" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b5c187546cd3ad9f1787b46c66272d8fcdf8197bfe4f6e2647fe910c39e396d" -dependencies = [ - "gdk-pixbuf-sys", - "gdk4-sys", - "glib-sys", - "libc", - "system-deps", -] - -[[package]] -name = "gdk4-x11" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28c9bbf8ea1ea8469e74c3fdfafc142c9e14810a27f89ddb01b5e9076a60a450" -dependencies = [ - "gdk4", - "gdk4-x11-sys", - "gio", - "glib", - "libc", -] - -[[package]] -name = "gdk4-x11-sys" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3de1709370758192369f5329aa593847797f1c693c95e8a261e9b2e06a5f125" -dependencies = [ - "gdk4-sys", - "glib-sys", - "libc", - "system-deps", -] - -[[package]] -name = "generator" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cc16584ff22b460a382b7feec54b23d2908d858152e5739a120b949293bd74e" -dependencies = [ - "cc", - "libc", - "log", - "rustversion", - "windows", -] - -[[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.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" -dependencies = [ - "cfg-if", - "libc", - "wasi", -] - -[[package]] -name = "gettext-rs" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e49ea8a8fad198aaa1f9655a2524b64b70eb06b2f3ff37da407566c93054f364" -dependencies = [ - "gettext-sys", - "locale_config", -] - -[[package]] -name = "gettext-sys" -version = "0.21.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c63ce2e00f56a206778276704bbe38564c8695249fdc8f354b4ef71c57c3839d" -dependencies = [ - "cc", - "temp-dir", -] - -[[package]] -name = "gio" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7884cba6b1c5db1607d970cadf44b14a43913d42bc68766eea6a5e2fe0891524" -dependencies = [ - "futures-channel", - "futures-core", - "futures-io", - "futures-util", - "gio-sys", - "glib", - "libc", - "once_cell", - "pin-project-lite", - "smallvec", - "thiserror", -] - -[[package]] -name = "gio-sys" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37566df850baf5e4cb0dfb78af2e4b9898d817ed9263d1090a2df958c64737d2" -dependencies = [ - "glib-sys", - "gobject-sys", - "libc", - "system-deps", - "winapi", -] - -[[package]] -name = "glib" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "331156127e8166dd815cf8d2db3a5beb492610c716c03ee6db4f2d07092af0a7" -dependencies = [ - "bitflags 2.4.0", - "futures-channel", - "futures-core", - "futures-executor", - "futures-task", - "futures-util", - "gio-sys", - "glib-macros", - "glib-sys", - "gobject-sys", - "libc", - "log", - "memchr", - "once_cell", - "smallvec", - "thiserror", -] - -[[package]] -name = "glib-macros" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "179643c50bf28d20d2f6eacd2531a88f2f5d9747dd0b86b8af1e8bb5dd0de3c0" -dependencies = [ - "heck", - "proc-macro-crate", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 2.0.29", -] - -[[package]] -name = "glib-sys" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "063ce2eb6a8d0ea93d2bf8ba1957e78dbab6be1c2220dd3daca57d5a9d869898" -dependencies = [ - "libc", - "system-deps", -] - -[[package]] -name = "gloo-timers" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b995a66bb87bebce9a0f4a95aed01daca4872c050bfcb21653361c03bc35e5c" -dependencies = [ - "futures-channel", - "futures-core", - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "gobject-sys" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0850127b514d1c4a4654ead6dedadb18198999985908e6ffe4436f53c785ce44" -dependencies = [ - "glib-sys", - "libc", - "system-deps", -] - -[[package]] -name = "graphene-rs" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b2228cda1505613a7a956cca69076892cfbda84fc2b7a62b94a41a272c0c401" -dependencies = [ - "glib", - "graphene-sys", - "libc", -] - -[[package]] -name = "graphene-sys" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc4144cee8fc8788f2a9b73dc5f1d4e1189d1f95305c4cb7bd9c1af1cfa31f59" -dependencies = [ - "glib-sys", - "libc", - "pkg-config", - "system-deps", -] - -[[package]] -name = "gsk4" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc25855255120f294d874acd6eaf4fbed7ce1cdc550e2d8415ea57fafbe816d5" -dependencies = [ - "cairo-rs", - "gdk4", - "glib", - "graphene-rs", - "gsk4-sys", - "libc", - "pango", -] - -[[package]] -name = "gsk4-sys" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1ecf3a63bf1223d68f80f72cc896c4d8c80482fbce1c9a12c66d3de7290ee46" -dependencies = [ - "cairo-sys-rs", - "gdk4-sys", - "glib-sys", - "gobject-sys", - "graphene-sys", - "libc", - "pango-sys", - "system-deps", -] - -[[package]] -name = "gst-plugin-dav1d" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8c337439958259aa248798efee09afeb5bd57d87af1c207a4be17e5234074fa" -dependencies = [ - "dav1d", - "gst-plugin-version-helper 0.7.5", - "gstreamer", - "gstreamer-base", - "gstreamer-video", - "num_cpus", -] - -[[package]] -name = "gst-plugin-gtk4" -version = "0.12.0-alpha.1" -source = "git+https://gitlab.freedesktop.org/YaLTeR/gst-plugins-rs.git?branch=gtk4-scaling-filter-stable#ca6bc179606c0ba4f07db7136468744b47952dc9" -dependencies = [ - "gdk4-wayland", - "gdk4-win32", - "gdk4-x11", - "gst-plugin-version-helper 0.12.0-alpha.1", - "gstreamer", - "gstreamer-base", - "gstreamer-gl", - "gstreamer-gl-egl", - "gstreamer-gl-wayland", - "gstreamer-gl-x11", - "gstreamer-video", - "gtk4", - "windows-sys", -] - -[[package]] -name = "gst-plugin-version-helper" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87921209945e5dc809848a100115fad65bd127671896f0206f45e272080cc4c9" -dependencies = [ - "chrono", -] - -[[package]] -name = "gst-plugin-version-helper" -version = "0.12.0-alpha.1" -source = "git+https://gitlab.freedesktop.org/YaLTeR/gst-plugins-rs.git?branch=gtk4-scaling-filter-stable#ca6bc179606c0ba4f07db7136468744b47952dc9" -dependencies = [ - "chrono", -] - -[[package]] -name = "gst-plugin-webp" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07dd5a10468f04ae4d987ba754d4b81772260b3bb9e72ee26b0ca4d1ef850a38" -dependencies = [ - "gst-plugin-version-helper 0.7.5", - "gstreamer", - "gstreamer-video", - "libwebp-sys2", -] - -[[package]] -name = "gstreamer" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8cdb86791dc39a5443f7d08cf3e7ae9c88a94991aba620d177cb5804838201f" -dependencies = [ - "cfg-if", - "futures-channel", - "futures-core", - "futures-util", - "glib", - "gstreamer-sys", - "itertools", - "libc", - "muldiv", - "num-integer", - "num-rational", - "option-operations", - "paste", - "pretty-hex", - "smallvec", - "thiserror", -] - -[[package]] -name = "gstreamer-base" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fe38a6d5c1e516ce3fd6069e972a540d315448ed69fdadad739e6c6c6eb2a01" -dependencies = [ - "atomic_refcell", - "cfg-if", - "glib", - "gstreamer", - "gstreamer-base-sys", - "libc", -] - -[[package]] -name = "gstreamer-base-sys" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88b9c029583ed61fa5258076a42df91732dc7f5582044ea7ee66a721641e6af4" -dependencies = [ - "glib-sys", - "gobject-sys", - "gstreamer-sys", - "libc", - "system-deps", -] - -[[package]] -name = "gstreamer-gl" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e616c363a79424bae3623d85b5f71542ef5cad318da9fe4e887e78992a4239d3" -dependencies = [ - "glib", - "gstreamer", - "gstreamer-base", - "gstreamer-gl-sys", - "gstreamer-video", - "libc", -] - -[[package]] -name = "gstreamer-gl-egl" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e69e5a572616ea36387b39dcfec370d35d3c0e29efeb41e5da91540d9f163cec" -dependencies = [ - "glib", - "gstreamer", - "gstreamer-gl", - "gstreamer-gl-egl-sys", - "libc", -] - -[[package]] -name = "gstreamer-gl-egl-sys" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8fc720bf2e17be334c70def3be390b549a390608234d06e70e7f7a373e7dbd2" -dependencies = [ - "glib-sys", - "gstreamer-gl-sys", - "libc", - "system-deps", -] - -[[package]] -name = "gstreamer-gl-sys" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5e3e2f33ecd2d4e410a63ccad18d0e3692dac69b9752286e66a006fa57c952d" -dependencies = [ - "glib-sys", - "gobject-sys", - "gstreamer-base-sys", - "gstreamer-sys", - "gstreamer-video-sys", - "libc", - "system-deps", -] - -[[package]] -name = "gstreamer-gl-wayland" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7850180c0021d690073697b22a6f1492dcba0ddccd2111d5ae043f6a65f9e9f3" -dependencies = [ - "glib", - "gstreamer", - "gstreamer-gl", - "gstreamer-gl-wayland-sys", - "libc", -] - -[[package]] -name = "gstreamer-gl-wayland-sys" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f4abcee01a58ddfa299360fd9bc1b3f96a02fee2f81149c6f3129b3258a03cc" -dependencies = [ - "glib-sys", - "gstreamer-gl-sys", - "libc", - "system-deps", -] - -[[package]] -name = "gstreamer-gl-x11" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d62204eaef32be3228b8749dcf3d18e350910308fc84c05c416a6f29b80df34" -dependencies = [ - "glib", - "gstreamer", - "gstreamer-gl", - "gstreamer-gl-x11-sys", - "libc", -] - -[[package]] -name = "gstreamer-gl-x11-sys" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e472da0b77e877765d171e2d151cd5b4b8865d44bb18cedc61409dbe0ca5f1b" -dependencies = [ - "glib-sys", - "gstreamer-gl-sys", - "libc", - "system-deps", -] - -[[package]] -name = "gstreamer-sys" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a70e3a99118bcd1221f8a62d7a905bae5e5cc2cda678bb46bf3cd36e0f899d33" -dependencies = [ - "glib-sys", - "gobject-sys", - "libc", - "system-deps", -] - -[[package]] -name = "gstreamer-video" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0db8adfc000cd58f8ece0fe6b4beb79e19e4a6135cfb81138fdb016b603f7d60" -dependencies = [ - "cfg-if", - "futures-channel", - "glib", - "gstreamer", - "gstreamer-base", - "gstreamer-video-sys", - "libc", -] - -[[package]] -name = "gstreamer-video-sys" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0284250a09fa824b21df1a21967eef4a5d85b5e0c1e335ed2ba9b9be1424dae" -dependencies = [ - "glib-sys", - "gobject-sys", - "gstreamer-base-sys", - "gstreamer-sys", - "libc", - "system-deps", -] - -[[package]] -name = "gtk4" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3b095b26f2a2df70be1805d3590eeb9d7a05ecb5be9649b82defc72dc56228c" -dependencies = [ - "cairo-rs", - "field-offset", - "futures-channel", - "gdk-pixbuf", - "gdk4", - "gio", - "glib", - "graphene-rs", - "gsk4", - "gtk4-macros", - "gtk4-sys", - "libc", - "pango", -] - -[[package]] -name = "gtk4-macros" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d57ec49cf9b657f69a05bca8027cff0a8dfd0c49e812be026fc7311f2163832f" -dependencies = [ - "anyhow", - "proc-macro-crate", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "gtk4-sys" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b0bdde87c50317b4f355bcbb4a9c2c414ece1b7c824fb4ad4ba8f3bdb2c6603" -dependencies = [ - "cairo-sys-rs", - "gdk-pixbuf-sys", - "gdk4-sys", - "gio-sys", - "glib-sys", - "gobject-sys", - "graphene-sys", - "gsk4-sys", - "libc", - "pango-sys", - "system-deps", -] - -[[package]] -name = "hashbrown" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" - -[[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.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" - -[[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.57" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" -dependencies = [ - "android_system_properties", - "core-foundation-sys", - "iana-time-zone-haiku", - "js-sys", - "wasm-bindgen", - "windows", -] - -[[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 = "identity" -version = "0.1.0" -dependencies = [ - "ashpd", - "futures-util", - "gettext-rs", - "glib", - "gst-plugin-dav1d", - "gst-plugin-gtk4", - "gst-plugin-webp", - "gstreamer", - "gstreamer-video", - "gtk4", - "libadwaita", - "once_cell", - "tracing", - "tracing-chrome", - "tracing-log", - "tracing-subscriber", - "tracing-tracy", -] - -[[package]] -name = "idna" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "indexmap" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" -dependencies = [ - "equivalent", - "hashbrown", -] - -[[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if", -] - -[[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 = "itertools" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" -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.64" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "kv-log-macro" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0de8b303297635ad57c9f5059fd9cee7a47f8e8daa09df0fcd07dd39fb22977f" -dependencies = [ - "log", -] - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "libadwaita" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06444f4ca05a60693da6e9e2b591bd40a298e65a118a8d5e830771718b3e0253" -dependencies = [ - "gdk-pixbuf", - "gdk4", - "gio", - "glib", - "gtk4", - "libadwaita-sys", - "libc", - "pango", -] - -[[package]] -name = "libadwaita-sys" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "021cfe3d1fcfa82411765a791f7e9b32f35dd98ce88d2e3fa10e7320f5cc8ce7" -dependencies = [ - "gdk4-sys", - "gio-sys", - "glib-sys", - "gobject-sys", - "gtk4-sys", - "libc", - "pango-sys", - "system-deps", -] - -[[package]] -name = "libc" -version = "0.2.147" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" - -[[package]] -name = "libwebp-sys2" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74f9c6964201c51319f16a796dc947a73961646eba49f584187b12de9970d077" -dependencies = [ - "cc", - "cfg-if", - "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.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" - -[[package]] -name = "locale_config" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d2c35b16f4483f6c26f0e4e9550717a2f6575bcd6f12a53ff0c490a94a6934" -dependencies = [ - "lazy_static", - "objc", - "objc-foundation", - "regex", - "winapi", -] - -[[package]] -name = "log" -version = "0.4.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" -dependencies = [ - "value-bag", -] - -[[package]] -name = "loom" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff50ecb28bb86013e935fb6683ab1f6d3a20016f123c76fd4c27470076ac30f5" -dependencies = [ - "cfg-if", - "generator", - "scoped-tls", - "tracing", - "tracing-subscriber", -] - -[[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 = "memchr" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" - -[[package]] -name = "memoffset" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" -dependencies = [ - "autocfg", -] - -[[package]] -name = "memoffset" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" -dependencies = [ - "autocfg", -] - -[[package]] -name = "muldiv" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "956787520e75e9bd233246045d19f42fb73242759cc57fba9611d940ae96d4b0" - -[[package]] -name = "nix" -version = "0.26.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" -dependencies = [ - "bitflags 1.3.2", - "cfg-if", - "libc", - "memoffset 0.7.1", - "static_assertions", -] - -[[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-integer" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" -dependencies = [ - "autocfg", - "num-traits", -] - -[[package]] -name = "num-rational" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-traits" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" -dependencies = [ - "autocfg", -] - -[[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 = "objc" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" -dependencies = [ - "malloc_buf", -] - -[[package]] -name = "objc-foundation" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9" -dependencies = [ - "block", - "objc", - "objc_id", -] - -[[package]] -name = "objc_id" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b" -dependencies = [ - "objc", -] - -[[package]] -name = "once_cell" -version = "1.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" - -[[package]] -name = "option-operations" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c26d27bb1aeab65138e4bf7666045169d1717febcc9ff870166be8348b223d0" -dependencies = [ - "paste", -] - -[[package]] -name = "ordered-stream" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aa2b01e1d916879f73a53d01d1d6cee68adbb31d6d9177a8cfce093cced1d50" -dependencies = [ - "futures-core", - "pin-project-lite", -] - -[[package]] -name = "overload" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" - -[[package]] -name = "pango" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06a9e54b831d033206160096b825f2070cf5fda7e35167b1c01e9e774f9202d1" -dependencies = [ - "gio", - "glib", - "libc", - "once_cell", - "pango-sys", -] - -[[package]] -name = "pango-sys" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "436737e391a843e5933d6d9aa102cb126d501e815b83601365a948a518555dc5" -dependencies = [ - "glib-sys", - "gobject-sys", - "libc", - "system-deps", -] - -[[package]] -name = "parking" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e" - -[[package]] -name = "paste" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" - -[[package]] -name = "percent-encoding" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" - -[[package]] -name = "pin-project-lite" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12cc1b0bf1727a77a54b6654e7b5f1af8604923edc8b81885f8ec92f9e3f0a05" - -[[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.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" - -[[package]] -name = "polling" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" -dependencies = [ - "autocfg", - "bitflags 1.3.2", - "cfg-if", - "concurrent-queue", - "libc", - "log", - "pin-project-lite", - "windows-sys", -] - -[[package]] -name = "ppv-lite86" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" - -[[package]] -name = "pretty-hex" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6fa0831dd7cc608c38a5e323422a0077678fa5744aa2be4ad91c4ece8eec8d5" - -[[package]] -name = "proc-macro-crate" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" -dependencies = [ - "once_cell", - "toml_edit", -] - -[[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.66" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" -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.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "regex" -version = "1.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81bc1d4caf89fac26a70747fe603c130093b53c773888797a6329091246d651a" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata 0.3.6", - "regex-syntax 0.7.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.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax 0.7.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.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" - -[[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.37.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06" -dependencies = [ - "bitflags 1.3.2", - "errno", - "io-lifetimes", - "libc", - "linux-raw-sys 0.3.8", - "windows-sys", -] - -[[package]] -name = "rustix" -version = "0.38.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19ed4fa021d81c8392ce04db050a3da9a60299050b7ae1cf482d862b54a7218f" -dependencies = [ - "bitflags 2.4.0", - "errno", - "libc", - "linux-raw-sys 0.4.5", - "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 = "scoped-tls" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" - -[[package]] -name = "semver" -version = "1.0.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" - -[[package]] -name = "serde" -version = "1.0.186" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f5db24220c009de9bd45e69fb2938f4b6d2df856aa9304ce377b3180f83b7c1" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.186" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ad697f7e0b65af4983a4ce8f56ed5b357e8d3c36651bf6a7e13639c17b8e670" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.29", -] - -[[package]] -name = "serde_json" -version = "1.0.105" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360" -dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "serde_repr" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.29", -] - -[[package]] -name = "serde_spanned" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" -dependencies = [ - "serde", -] - -[[package]] -name = "sha1" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest", -] - -[[package]] -name = "sharded-slab" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31" -dependencies = [ - "lazy_static", -] - -[[package]] -name = "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-registry" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" -dependencies = [ - "libc", -] - -[[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.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" - -[[package]] -name = "socket2" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - -[[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.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "system-deps" -version = "6.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30c2de8a4d8f4b823d634affc9cd2a74ec98c53a756f317e529a48046cbf71f3" -dependencies = [ - "cfg-expr", - "heck", - "pkg-config", - "toml", - "version-compare", -] - -[[package]] -name = "target-lexicon" -version = "0.12.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d0e916b1148c8e263850e1ebcbd046f333e0683c724876bb0da63ea4373dc8a" - -[[package]] -name = "temp-dir" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af547b166dd1ea4b472165569fc456cfb6818116f854690b0ff205e636523dab" - -[[package]] -name = "tempfile" -version = "3.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" -dependencies = [ - "cfg-if", - "fastrand 2.0.0", - "redox_syscall", - "rustix 0.38.8", - "windows-sys", -] - -[[package]] -name = "thiserror" -version = "1.0.47" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.47" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.29", -] - -[[package]] -name = "thread_local" -version = "1.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" -dependencies = [ - "cfg-if", - "once_cell", -] - -[[package]] -name = "tinyvec" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" -dependencies = [ - "tinyvec_macros", -] - -[[package]] -name = "tinyvec_macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" - -[[package]] -name = "toml" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542" -dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit", -] - -[[package]] -name = "toml_datetime" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" -dependencies = [ - "serde", -] - -[[package]] -name = "toml_edit" -version = "0.19.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a" -dependencies = [ - "indexmap", - "serde", - "serde_spanned", - "toml_datetime", - "winnow", -] - -[[package]] -name = "tracing" -version = "0.1.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" -dependencies = [ - "cfg-if", - "pin-project-lite", - "tracing-attributes", - "tracing-core", -] - -[[package]] -name = "tracing-attributes" -version = "0.1.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.29", -] - -[[package]] -name = "tracing-chrome" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "496b3cd5447f7ff527bbbf19b071ad542a000adf297d4127078b4dfdb931f41a" -dependencies = [ - "serde_json", - "tracing-core", - "tracing-subscriber", -] - -[[package]] -name = "tracing-core" -version = "0.1.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" -dependencies = [ - "once_cell", - "valuable", -] - -[[package]] -name = "tracing-log" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" -dependencies = [ - "lazy_static", - "log", - "tracing-core", -] - -[[package]] -name = "tracing-subscriber" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" -dependencies = [ - "matchers", - "nu-ansi-term", - "once_cell", - "regex", - "sharded-slab", - "smallvec", - "thread_local", - "tracing", - "tracing-core", - "tracing-log", -] - -[[package]] -name = "tracing-tracy" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f3edd27f53bc0e55aefa9223f68eb44354060103d3e34635f6e27627fe0227f" -dependencies = [ - "tracing-core", - "tracing-subscriber", - "tracy-client", -] - -[[package]] -name = "tracy-client" -version = "0.16.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c78458aa3759647e0399e959a06f9f6dc61450a1caaa4f1632a3df8e8c55af7" -dependencies = [ - "loom", - "once_cell", - "tracy-client-sys", -] - -[[package]] -name = "tracy-client-sys" -version = "0.21.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90e764693ea5a090fb9b0a33fe9d32aa52656ae7ccd9f820719d2d998677c2eb" -dependencies = [ - "cc", -] - -[[package]] -name = "typenum" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" - -[[package]] -name = "uds_windows" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce65604324d3cce9b966701489fbd0cf318cb1f7bd9dd07ac9a4ee6fb791930d" -dependencies = [ - "tempfile", - "winapi", -] - -[[package]] -name = "unicode-bidi" -version = "0.3.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" - -[[package]] -name = "unicode-ident" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" - -[[package]] -name = "unicode-normalization" -version = "0.1.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "url" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" -dependencies = [ - "form_urlencoded", - "idna", - "percent-encoding", - "serde", -] - -[[package]] -name = "valuable" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" - -[[package]] -name = "value-bag" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d92ccd67fb88503048c01b59152a04effd0782d035a83a6d256ce6085f08f4a3" - -[[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.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "579a42fc0b8e0c63b76519a339be31bed574929511fa53c1a3acae26eb258f29" - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "waker-fn" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" - -[[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.87" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" -dependencies = [ - "cfg-if", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.87" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" -dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2", - "quote", - "syn 2.0.29", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-futures" -version = "0.4.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" -dependencies = [ - "cfg-if", - "js-sys", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.87" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.87" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.29", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.87" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" - -[[package]] -name = "web-sys" -version = "0.3.64" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[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" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" -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" - -[[package]] -name = "winnow" -version = "0.5.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d09770118a7eb1ccaf4a594a221334119a44a814fcb0d31c5b85e83e97227a97" -dependencies = [ - "memchr", -] - -[[package]] -name = "xdg-home" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2769203cd13a0c6015d515be729c526d041e9cf2c0cc478d57faee85f40c6dcd" -dependencies = [ - "nix", - "winapi", -] - -[[package]] -name = "zbus" -version = "3.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31de390a2d872e4cd04edd71b425e29853f786dc99317ed72d73d6fcf5ebb948" -dependencies = [ - "async-broadcast", - "async-executor", - "async-fs", - "async-io", - "async-lock", - "async-process", - "async-recursion", - "async-task", - "async-trait", - "blocking", - "byteorder", - "derivative", - "enumflags2", - "event-listener", - "futures-core", - "futures-sink", - "futures-util", - "hex", - "nix", - "once_cell", - "ordered-stream", - "rand", - "serde", - "serde_repr", - "sha1", - "static_assertions", - "tracing", - "uds_windows", - "winapi", - "xdg-home", - "zbus_macros", - "zbus_names", - "zvariant", -] - -[[package]] -name = "zbus_macros" -version = "3.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41d1794a946878c0e807f55a397187c11fc7a038ba5d868e7db4f3bd7760bc9d" -dependencies = [ - "proc-macro-crate", - "proc-macro2", - "quote", - "regex", - "syn 1.0.109", - "zvariant_utils", -] - -[[package]] -name = "zbus_names" -version = "2.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb80bb776dbda6e23d705cf0123c3b95df99c4ebeaec6c2599d4a5419902b4a9" -dependencies = [ - "serde", - "static_assertions", - "zvariant", -] - -[[package]] -name = "zvariant" -version = "3.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44b291bee0d960c53170780af148dca5fa260a63cdd24f1962fa82e03e53338c" -dependencies = [ - "byteorder", - "enumflags2", - "libc", - "serde", - "static_assertions", - "url", - "zvariant_derive", -] - -[[package]] -name = "zvariant_derive" -version = "3.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "934d7a7dfc310d6ee06c87ffe88ef4eca7d3e37bb251dece2ef93da8f17d8ecd" -dependencies = [ - "proc-macro-crate", - "proc-macro2", - "quote", - "syn 1.0.109", - "zvariant_utils", -] - -[[package]] -name = "zvariant_utils" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7234f0d811589db492d16893e3f21e8e2fd282e6d01b0cddee310322062cc200" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] diff --git a/pkgs/applications/graphics/identity/default.nix b/pkgs/applications/graphics/identity/default.nix deleted file mode 100644 index debc7e2f423b0..0000000000000 --- a/pkgs/applications/graphics/identity/default.nix +++ /dev/null @@ -1,78 +0,0 @@ -{ lib -, stdenv -, fetchFromGitLab -, rustPlatform -, nix-update-script - -, appstream -, blueprint-compiler -, cargo -, desktop-file-utils -, meson -, ninja -, pkg-config -, rustc -, wrapGAppsHook4 - -, dav1d -, gst_all_1 -, gtk4 -, libadwaita -, libwebp -}: - -stdenv.mkDerivation rec { - pname = "identity"; - version = "0.6.0"; - - src = fetchFromGitLab { - domain = "gitlab.gnome.org"; - owner = "YaLTeR"; - repo = "identity"; - rev = "v${version}"; - hash = "sha256-AiOaTjYOc7Eo+9kl1H91TKAkCKNUJNWobmBENZlHBhQ="; - }; - - cargoDeps = rustPlatform.importCargoLock { - lockFile = ./Cargo.lock; - outputHashes = { - "gst-plugin-gtk4-0.12.0-alpha.1" = "sha256-JSw9yZ4oy7m6c9pqOT+fnYEbTlneLTtWQf3/Jbek/ps="; - }; - }; - - nativeBuildInputs = [ - appstream - blueprint-compiler - cargo - desktop-file-utils - meson - ninja - pkg-config - rustc - rustPlatform.cargoSetupHook - wrapGAppsHook4 - ]; - - buildInputs = [ - dav1d - gst_all_1.gst-libav - gst_all_1.gst-plugins-bad - gst_all_1.gst-plugins-base - gst_all_1.gst-plugins-good - gst_all_1.gstreamer - gtk4 - libadwaita - libwebp - ]; - - passthru.updateScript = nix-update-script { }; - - meta = with lib; { - description = "Program for comparing multiple versions of an image or video"; - mainProgram = "identity"; - homepage = "https://gitlab.gnome.org/YaLTeR/identity"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ ]; - }; -} diff --git a/pkgs/applications/graphics/image-roll/default.nix b/pkgs/applications/graphics/image-roll/default.nix index 2c142b7bbb803..2c1e86f22c7cd 100644 --- a/pkgs/applications/graphics/image-roll/default.nix +++ b/pkgs/applications/graphics/image-roll/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-CC40TU38bJFnbJl2EHqeB9RBvbVUrBmRdZVS2GxqGu4="; }; - cargoSha256 = "sha256-cUE2IZOunR/NIo/qytORRfNqCsf87LfpKA8o/v4Nkhk="; + cargoHash = "sha256-cUE2IZOunR/NIo/qytORRfNqCsf87LfpKA8o/v4Nkhk="; nativeBuildInputs = [ glib pkg-config wrapGAppsHook4 ]; diff --git a/pkgs/applications/graphics/image_optim/default.nix b/pkgs/applications/graphics/image_optim/default.nix index 1d9048cafaa66..feceb00c31e84 100644 --- a/pkgs/applications/graphics/image_optim/default.nix +++ b/pkgs/applications/graphics/image_optim/default.nix @@ -13,34 +13,32 @@ withSvgo ? true, svgo }: -with lib; - let - optionalDepsPath = optional withPngcrush pngcrush - ++ optional withPngout pngout - ++ optional withAdvpng advancecomp - ++ optional withOptipng optipng - ++ optional withPngquant pngquant - ++ optional withOxipng oxipng - ++ optional withJhead jhead - ++ optional withJpegoptim jpegoptim - ++ optional withJpegrecompress jpeg-archive - ++ optional withJpegtran libjpeg - ++ optional withGifsicle gifsicle - ++ optional withSvgo svgo; + optionalDepsPath = lib.optional withPngcrush pngcrush + ++ lib.optional withPngout pngout + ++ lib.optional withAdvpng advancecomp + ++ lib.optional withOptipng optipng + ++ lib.optional withPngquant pngquant + ++ lib.optional withOxipng oxipng + ++ lib.optional withJhead jhead + ++ lib.optional withJpegoptim jpegoptim + ++ lib.optional withJpegrecompress jpeg-archive + ++ lib.optional withJpegtran libjpeg + ++ lib.optional withGifsicle gifsicle + ++ lib.optional withSvgo svgo; - disabledWorkersFlags = optional (!withPngcrush) "--no-pngcrush" - ++ optional (!withPngout) "--no-pngout" - ++ optional (!withAdvpng) "--no-advpng" - ++ optional (!withOptipng) "--no-optipng" - ++ optional (!withPngquant) "--no-pngquant" - ++ optional (!withOxipng) "--no-oxipng" - ++ optional (!withJhead) "--no-jhead" - ++ optional (!withJpegoptim) "--no-jpegoptim" - ++ optional (!withJpegrecompress) "--no-jpegrecompress" - ++ optional (!withJpegtran) "--no-jpegtran" - ++ optional (!withGifsicle) "--no-gifsicle" - ++ optional (!withSvgo) "--no-svgo"; + disabledWorkersFlags = lib.optional (!withPngcrush) "--no-pngcrush" + ++ lib.optional (!withPngout) "--no-pngout" + ++ lib.optional (!withAdvpng) "--no-advpng" + ++ lib.optional (!withOptipng) "--no-optipng" + ++ lib.optional (!withPngquant) "--no-pngquant" + ++ lib.optional (!withOxipng) "--no-oxipng" + ++ lib.optional (!withJhead) "--no-jhead" + ++ lib.optional (!withJpegoptim) "--no-jpegoptim" + ++ lib.optional (!withJpegrecompress) "--no-jpegrecompress" + ++ lib.optional (!withJpegtran) "--no-jpegtran" + ++ lib.optional (!withGifsicle) "--no-gifsicle" + ++ lib.optional (!withSvgo) "--no-svgo"; in bundlerApp { @@ -53,7 +51,7 @@ bundlerApp { postBuild = '' wrapProgram $out/bin/image_optim \ - --prefix PATH : ${lib.escapeShellArg (makeBinPath optionalDepsPath)} \ + --prefix PATH : ${lib.escapeShellArg (lib.makeBinPath optionalDepsPath)} \ --add-flags "${lib.concatStringsSep " " disabledWorkersFlags}" ''; diff --git a/pkgs/applications/graphics/imagej/default.nix b/pkgs/applications/graphics/imagej/default.nix index 2398a61f2134b..37fed43765ea6 100644 --- a/pkgs/applications/graphics/imagej/default.nix +++ b/pkgs/applications/graphics/imagej/default.nix @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { buildInputs = [ glib ]; dontWrapGApps = true; - desktopItems = lib.optionals stdenv.isLinux [ + desktopItems = lib.optionals stdenv.hostPlatform.isLinux [ (makeDesktopItem { name = "ImageJ"; desktopName = "ImageJ"; @@ -56,7 +56,7 @@ in stdenv.mkDerivation rec { runHook postInstall ''; - postFixup = lib.optionalString stdenv.isLinux '' + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' makeWrapper ${jre}/bin/java $out/bin/imagej \ ''${gappsWrapperArgs[@]} \ --add-flags "-jar $out/share/java/ij.jar -ijpath $out/share" diff --git a/pkgs/applications/graphics/imv/default.nix b/pkgs/applications/graphics/imv/default.nix index 077979096cd73..178bdfcae3fb4 100644 --- a/pkgs/applications/graphics/imv/default.nix +++ b/pkgs/applications/graphics/imv/default.nix @@ -32,7 +32,7 @@ let # default value of withWindowSystem withWindowSystem' = if withWindowSystem != null then withWindowSystem - else if stdenv.isLinux then "all" + else if stdenv.hostPlatform.isLinux then "all" else "x11"; windowSystems = { @@ -124,5 +124,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ rnhmjoj markus1189 ]; platforms = platforms.all; badPlatforms = platforms.darwin; + mainProgram = "imv"; }; } diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index c285fc3116401..62f485ff916ee 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -101,6 +101,15 @@ stdenv.mkDerivation rec { url = "https://gitlab.com/inkscape/inkscape/-/commit/694d8ae43d06efff21adebf377ce614d660b24cd.patch"; hash = "sha256-9IXJzpZbNU5fnt7XKgqCzUDrwr08qxGwo8TqnL+xc6E="; }) + + # Improve distribute along path precision + # https://gitlab.com/inkscape/extensions/-/issues/580 + (fetchpatch { + url = "https://gitlab.com/inkscape/extensions/-/commit/c576043c195cd044bdfc975e6367afb9b655eb14.patch"; + extraPrefix = "share/extensions/"; + stripLen = 1; + hash = "sha256-D9HxBx8RNkD7hHuExJqdu3oqlrXX6IOUw9m9Gx6+Dr8="; + }) ]; postPatch = '' @@ -125,7 +134,7 @@ stdenv.mkDerivation rec { ] ++ (with perlPackages; [ perl XMLParser - ]) ++ lib.optionals stdenv.isDarwin [ + ]) ++ lib.optionals stdenv.hostPlatform.isDarwin [ desktopToDarwinBundle ]; @@ -159,15 +168,15 @@ stdenv.mkDerivation rec { python3Env zlib libepoxy - ] ++ lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ gspell - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ cairo gtk-mac-integration ]; # Make sure PyXML modules can be found at run-time. - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' for f in $out/lib/inkscape/*.dylib; do ln -s $f $out/lib/$(basename $f) done diff --git a/pkgs/applications/graphics/kgraphviewer/default.nix b/pkgs/applications/graphics/kgraphviewer/default.nix index 3758c091a831b..c7cbf22e013eb 100644 --- a/pkgs/applications/graphics/kgraphviewer/default.nix +++ b/pkgs/applications/graphics/kgraphviewer/default.nix @@ -31,7 +31,7 @@ mkDerivation rec { description = "Graphviz dot graph viewer for KDE"; mainProgram = "kgraphviewer"; license = licenses.gpl2; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = platforms.linux; }; } 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/komikku/default.nix b/pkgs/applications/graphics/komikku/default.nix index 6d938fe4bddc9..53fa2a64350a5 100644 --- a/pkgs/applications/graphics/komikku/default.nix +++ b/pkgs/applications/graphics/komikku/default.nix @@ -19,7 +19,7 @@ python3.pkgs.buildPythonApplication rec { pname = "komikku"; - version = "1.48.1"; + version = "1.57.0"; format = "other"; @@ -28,7 +28,7 @@ python3.pkgs.buildPythonApplication rec { owner = "valos"; repo = "Komikku"; rev = "v${version}"; - hash = "sha256-U4MmVK75tPYJStJ0RRjfbzSbpGLJ07rJg6ClHI+tAfM="; + hash = "sha256-b2XoywPnrYnuehR6xHH8BvhbMZFB1AeBN0khFfaLGn0="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/komorebi/default.nix b/pkgs/applications/graphics/komorebi/default.nix index 4d60cde30cd38..f98549cb14ffb 100644 --- a/pkgs/applications/graphics/komorebi/default.nix +++ b/pkgs/applications/graphics/komorebi/default.nix @@ -13,17 +13,16 @@ , ninja , wrapGAppsHook3 , testers -, komorebi }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "komorebi"; version = "2.2.1"; src = fetchFromGitHub { owner = "Komorebi-Fork"; repo = "komorebi"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-vER69dSxu4JuWNAADpkxHE/zjOMhQp+Fc21J+JHQ8xk="; }; @@ -44,7 +43,7 @@ stdenv.mkDerivation rec { clutter-gst ]; - passthru.tests.version = testers.testVersion { package = komorebi; }; + passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; }; meta = with lib; { description = "Beautiful and customizable wallpaper manager for Linux"; @@ -53,4 +52,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ kranzes ]; platforms = platforms.linux; }; -} +}) 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/lazpaint/default.nix b/pkgs/applications/graphics/lazpaint/default.nix index 1f6a9460a6a48..18f4e8de7fed4 100644 --- a/pkgs/applications/graphics/lazpaint/default.nix +++ b/pkgs/applications/graphics/lazpaint/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, lazarus, fpc, pango, cairo, glib -, atk, gtk2, libX11, gdk-pixbuf, busybox, python3 +, atk, gtk2, libX11, gdk-pixbuf, python3 , makeWrapper }: @@ -61,7 +61,7 @@ in stdenv.mkDerivation rec { downloadPage = "https://github.com/bgrabitmap/lazpaint/"; license = licenses.gpl3; platforms = platforms.linux; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ aleksana ]; mainProgram = "lazpaint"; }; } diff --git a/pkgs/applications/graphics/lightburn/default.nix b/pkgs/applications/graphics/lightburn/default.nix index 19455d89c930b..5877d6a013d5a 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.04"; 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-3dvLUfOczysRC8Ou6aQHzzmJs2rwtKAvfrwpQ4VMB/M="; }; buildInputs = [ diff --git a/pkgs/applications/graphics/lorien/default.nix b/pkgs/applications/graphics/lorien/default.nix index 8105e3682b591..1f86c6dd2ed07 100644 --- a/pkgs/applications/graphics/lorien/default.nix +++ b/pkgs/applications/graphics/lorien/default.nix @@ -27,8 +27,8 @@ let preset = - if stdenv.isLinux then "Linux/X11" - else if stdenv.isDarwin then "Mac OSX" + if stdenv.hostPlatform.isLinux then "Linux/X11" + else if stdenv.hostPlatform.isDarwin then "Mac OSX" else throw "unsupported platform"; in stdenv.mkDerivation rec { diff --git a/pkgs/applications/graphics/mandelbulber/default.nix b/pkgs/applications/graphics/mandelbulber/default.nix index af6dffd249393..d66f4a5044641 100644 --- a/pkgs/applications/graphics/mandelbulber/default.nix +++ b/pkgs/applications/graphics/mandelbulber/default.nix @@ -19,13 +19,13 @@ assert withOpenCL -> ocl-icd != null; mkDerivation rec { pname = "mandelbulber"; - version = "2.31-1"; + version = "2.32"; src = fetchFromGitHub { owner = "buddhi1980"; repo = "mandelbulber2"; rev = version; - sha256 = "sha256-nyIFvFe86C2ciBDSNWn1yrBYTCm1dR7sZ5RFGoTPqvQ="; + sha256 = "sha256-amNNRuuk7qtcyXUVLEW71yEETExgKw48HeQQyxbi8BE="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/menyoki/default.nix b/pkgs/applications/graphics/menyoki/default.nix index 800ede30be429..e8ae4e7f25558 100644 --- a/pkgs/applications/graphics/menyoki/default.nix +++ b/pkgs/applications/graphics/menyoki/default.nix @@ -22,14 +22,14 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-owP3G1Rygraifdc4iPURQ1Es0msNhYZIlfrtj0CSU6Y="; }; - cargoSha256 = "sha256-NtXjlGkX8AzSw98xHPymzdnTipMIunyDbpSr4eVowa0="; + cargoHash = "sha256-NtXjlGkX8AzSw98xHPymzdnTipMIunyDbpSr4eVowa0="; nativeBuildInputs = [ installShellFiles ] - ++ lib.optional stdenv.isLinux pkg-config; + ++ lib.optional stdenv.hostPlatform.isLinux pkg-config; buildInputs = lib.optional withSixel libsixel - ++ lib.optionals stdenv.isLinux (with xorg; [ libX11 libXrandr ]) - ++ lib.optional stdenv.isDarwin AppKit; + ++ lib.optionals stdenv.hostPlatform.isLinux (with xorg; [ libX11 libXrandr ]) + ++ lib.optional stdenv.hostPlatform.isDarwin AppKit; buildNoDefaultFeatures = !withSki; buildFeatures = lib.optional withSixel "sixel"; diff --git a/pkgs/applications/graphics/meshlab/default.nix b/pkgs/applications/graphics/meshlab/default.nix index 549780a8acb70..658e4b4e9c704 100644 --- a/pkgs/applications/graphics/meshlab/default.nix +++ b/pkgs/applications/graphics/meshlab/default.nix @@ -95,7 +95,7 @@ mkDerivation rec { mainProgram = "meshlab"; homepage = "https://www.meshlab.net/"; license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ viric ]; + maintainers = [ ]; platforms = with lib.platforms; linux; }; } diff --git a/pkgs/applications/graphics/minidjvu/default.nix b/pkgs/applications/graphics/minidjvu/default.nix index ca9e77391eb39..a8d3db4d0a943 100644 --- a/pkgs/applications/graphics/minidjvu/default.nix +++ b/pkgs/applications/graphics/minidjvu/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { homepage = "https://djvu.sourceforge.net/djview4.html"; description = "Black-and-white djvu page encoder and decoder that use interpage information"; license = lib.licenses.gpl2Plus; - maintainers = [ lib.maintainers.viric ]; + maintainers = [ ]; platforms = lib.platforms.unix; mainProgram = "minidjvu"; }; diff --git a/pkgs/applications/graphics/monado/default.nix b/pkgs/applications/graphics/monado/default.nix deleted file mode 100644 index 4cbd7a8f00c9b..0000000000000 --- a/pkgs/applications/graphics/monado/default.nix +++ /dev/null @@ -1,158 +0,0 @@ -{ lib -, stdenv -, fetchFromGitLab -, writeText -, bluez -, cjson -, cmake -, dbus -, doxygen -, eigen -, elfutils -, ffmpeg -, glslang -, gst-plugins-base -, gstreamer -, hidapi -, libbsd -, libdrm -, libffi -, libGL -, libjpeg -, librealsense -, libsurvive -, libunwind -, libusb1 -, libuv -, libuvc -, libv4l -, libXau -, libxcb -, libXdmcp -, libXext -, libXrandr -, onnxruntime -, opencv4 -, openhmd -, openvr -, orc -, pcre2 -, pkg-config -, python3 -, SDL2 -, shaderc -, tracy -, udev -, vulkan-headers -, vulkan-loader -, wayland -, wayland-protocols -, wayland-scanner -, 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 -, serviceSupport ? true -}: - -stdenv.mkDerivation { - pname = "monado"; - version = "unstable-2024-01-02"; - - src = fetchFromGitLab { - domain = "gitlab.freedesktop.org"; - owner = "monado"; - repo = "monado"; - rev = "bfa1c16ff9fc759327ca251a5d086b958b1a3b8a"; - hash = "sha256-wXRwOs9MkDre/VeW686DzmvKjX0qCSS13MILbYQD6OY="; - }; - - nativeBuildInputs = [ - cmake - doxygen - glslang - pkg-config - python3 - ]; - - cmakeFlags = [ - (lib.cmakeBool "XRT_FEATURE_SERVICE" serviceSupport) - (lib.cmakeBool "XRT_OPENXR_INSTALL_ABSOLUTE_RUNTIME_PATH" true) - (lib.cmakeBool "XRT_HAVE_TRACY" true) - (lib.cmakeBool "XRT_FEATURE_TRACING" true) - (lib.cmakeBool "XRT_HAVE_STEAM" true) - ]; - - buildInputs = [ - bluez - cjson - dbus - eigen - elfutils - ffmpeg - gst-plugins-base - gstreamer - hidapi - libbsd - libdrm - libffi - libGL - libjpeg - librealsense - libsurvive - libunwind - libusb1 - libuv - libuvc - libv4l - libXau - libxcb - libXdmcp - libXext - libXrandr - onnxruntime - opencv4 - openhmd - openvr - orc - pcre2 - SDL2 - shaderc - tracy - udev - vulkan-headers - vulkan-loader - wayland - wayland-protocols - wayland-scanner - zlib - zstd - ]; - - # known disabled drivers/features: - # - DRIVER_DEPTHAI - Needs depthai-core https://github.com/luxonis/depthai-core (See https://github.com/NixOS/nixpkgs/issues/292618) - # - DRIVER_ILLIXR - needs ILLIXR headers https://github.com/ILLIXR/ILLIXR (See https://github.com/NixOS/nixpkgs/issues/292661) - # - DRIVER_ULV2 - Needs proprietary Leapmotion SDK https://api.leapmotion.com/documentation/v2/unity/devguide/Leap_SDK_Overview.html (See https://github.com/NixOS/nixpkgs/issues/292624) - # - DRIVER_ULV5 - Needs proprietary Leapmotion SDK https://api.leapmotion.com/documentation/v2/unity/devguide/Leap_SDK_Overview.html (See https://github.com/NixOS/nixpkgs/issues/292624) - - # Help openxr-loader find this runtime - setupHook = writeText "setup-hook" '' - export XDG_CONFIG_DIRS=@out@/etc/xdg''${XDG_CONFIG_DIRS:+:''${XDG_CONFIG_DIRS}} - ''; - - passthru.tests = { - basic-service = nixosTests.monado; - }; - - meta = with lib; { - description = "Open source XR runtime"; - homepage = "https://monado.freedesktop.org/"; - license = licenses.boost; - maintainers = with maintainers; [ Scrumplex expipiplus1 prusnak ]; - platforms = platforms.linux; - mainProgram = "monado-cli"; - }; -} diff --git a/pkgs/applications/graphics/mypaint/default.nix b/pkgs/applications/graphics/mypaint/default.nix index 8abd4cba4846f..10a19431dbfca 100644 --- a/pkgs/applications/graphics/mypaint/default.nix +++ b/pkgs/applications/graphics/mypaint/default.nix @@ -136,6 +136,6 @@ in buildPythonApplication rec { homepage = "http://mypaint.org/"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = with maintainers; [ goibhniu jtojnar ]; + maintainers = with maintainers; [ jtojnar ]; }; } diff --git a/pkgs/applications/graphics/ocrfeeder/default.nix b/pkgs/applications/graphics/ocrfeeder/default.nix index 7c30e81ab3e2d..05d157c2d9b4c 100644 --- a/pkgs/applications/graphics/ocrfeeder/default.nix +++ b/pkgs/applications/graphics/ocrfeeder/default.nix @@ -10,7 +10,6 @@ , goocanvas2 , gtkspell3 , isocodes -, gnome , python3 , tesseract4 , extraOcrEngines ? [] # other supported engines are: ocrad gocr cuneiform @@ -21,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { version = "0.8.5"; src = fetchurl { - url = "mirror://gnome/sources/${finalAttrs.pname}/${lib.versions.majorMinor finalAttrs.version}/${finalAttrs.pname}-${finalAttrs.version}.tar.xz"; + url = "mirror://gnome/sources/ocrfeeder/${lib.versions.majorMinor finalAttrs.version}/ocrfeeder-${finalAttrs.version}.tar.xz"; sha256 = "sha256-sD0qWUndguJzTw0uy0FIqupFf4OX6dTFvcd+Mz+8Su0="; }; diff --git a/pkgs/applications/graphics/oculante/default.nix b/pkgs/applications/graphics/oculante/default.nix index 3f3d39769f811..f2c7aa843dbcd 100644 --- a/pkgs/applications/graphics/oculante/default.nix +++ b/pkgs/applications/graphics/oculante/default.nix @@ -22,16 +22,16 @@ rustPlatform.buildRustPackage rec { pname = "oculante"; - version = "0.8.22"; + version = "0.8.23"; src = fetchFromGitHub { owner = "woelper"; repo = "oculante"; rev = version; - hash = "sha256-hsXrpHT+B1Oev+ygXj/2Ma3zszMuW6csgQGJGeYCiAM="; + hash = "sha256-Dg1FFB9WVB4SWInSyOYb1TCPAtCa9gwsFLUX+UhL4DY="; }; - cargoHash = "sha256-X6KR+h+f/mdazqxo8xQK5geeZC12h8uQ3ENMKyaw7aw="; + cargoHash = "sha256-Ze3ACs9WyoxNsaeJlZWhR0g+aFsntwNLLYbw2RnmwfE="; nativeBuildInputs = [ cmake @@ -41,12 +41,10 @@ rustPlatform.buildRustPackage rec { wrapGAppsHook3 ]; - checkFlagsArray = [ "--skip=tests::net" ]; # requires network access - buildInputs = [ openssl fontconfig - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libGL libX11 libXcursor @@ -56,12 +54,13 @@ rustPlatform.buildRustPackage rec { libxkbcommon wayland - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.libobjc ]; checkFlags = [ "--skip=bench" + "--skip=tests::net" # requires network access ]; postInstall = '' @@ -72,7 +71,7 @@ rustPlatform.buildRustPackage rec { ''; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Minimalistic crossplatform image viewer written in Rust"; homepage = "https://github.com/woelper/oculante"; changelog = "https://github.com/woelper/oculante/blob/${version}/CHANGELOG.md"; diff --git a/pkgs/applications/graphics/openboard/default.nix b/pkgs/applications/graphics/openboard/default.nix index 9eacdc642ce56..a02ae20d9f036 100644 --- a/pkgs/applications/graphics/openboard/default.nix +++ b/pkgs/applications/graphics/openboard/default.nix @@ -1,6 +1,6 @@ -{ stdenv, lib, fetchFromGitHub, copyDesktopItems, makeDesktopItem, qmake +{ stdenv, lib, fetchFromGitHub, fetchpatch2, copyDesktopItems, makeDesktopItem, qmake , qtbase, qtxmlpatterns, qttools, qtwebengine, libGL, fontconfig, openssl, poppler, wrapQtAppsHook -, ffmpeg, libva, alsa-lib, SDL, x264, libvpx, libvorbis, libtheora, libogg +, ffmpeg_7, libva, alsa-lib, SDL, x264, libvpx, libvorbis, libtheora, libogg , libopus, lame, fdk_aac, libass, quazip, libXext, libXfixes }: let @@ -25,20 +25,41 @@ let }; in stdenv.mkDerivation (finalAttrs: { pname = "openboard"; - version = "1.7.0"; + version = "1.7.1"; src = fetchFromGitHub { owner = "OpenBoard-org"; repo = "OpenBoard"; rev = "v${finalAttrs.version}"; - hash = "sha256-OSAogtZoMisyRziv63ag9w8HQaaRdz0J28jQZR7cTMM="; + hash = "sha256-gXxxlAEuzMCvFu5oSQayNW191XAC/YKvldItYEFxvNM="; }; + patches = [ + # fix: Support FFmpeg 7.0 + # https://github.com/OpenBoard-org/OpenBoard/pull/1017 + (fetchpatch2 { + url = "https://github.com/OpenBoard-org/OpenBoard/commit/4f45b6c4016972cf5835f9188bda6197b1b4ed2f.patch?full_index=1"; + hash = "sha256-MUJbHfOCMlRO4pg5scm+DrBsngZwB7UPuDJZss5x9Zs="; + }) + + # fix: Resolve FFmpeg 7.0 warnings + # https://github.com/OpenBoard-org/OpenBoard/pull/1017 + (fetchpatch2 { + url = "https://github.com/OpenBoard-org/OpenBoard/commit/315bcac782e10cc6ceef1fc8b78fff40541ea38f.patch?full_index=1"; + hash = "sha256-736eX+uXuZwHJxOXAgxs2/vjjD1JY9mMyj3rR45/7xk="; + }) + ]; + postPatch = '' substituteInPlace OpenBoard.pro \ - --replace '/usr/include/quazip5' '${lib.getDev quazip}/include/QuaZip-Qt5-${quazip.version}/quazip' \ - --replace '-lquazip5' '-lquazip1-qt5' \ - --replace '/usr/include/poppler' '${lib.getDev poppler}/include/poppler' + --replace-fail '/usr/include/quazip5' '${lib.getDev quazip}/include/QuaZip-Qt5-${quazip.version}/quazip' \ + --replace-fail '-lquazip5' '-lquazip1-qt5' \ + --replace-fail '/usr/include/poppler' '${lib.getDev poppler}/include/poppler' + + substituteInPlace resources/etc/OpenBoard.config \ + --replace-fail 'EnableAutomaticSoftwareUpdates=true' 'EnableAutomaticSoftwareUpdates=false' \ + --replace-fail 'EnableSoftwareUpdates=true' 'EnableAutomaticSoftwareUpdates=false' \ + --replace-fail 'HideCheckForSoftwareUpdate=false' 'HideCheckForSoftwareUpdate=true' ''; nativeBuildInputs = [ qmake copyDesktopItems wrapQtAppsHook ]; @@ -52,7 +73,7 @@ in stdenv.mkDerivation (finalAttrs: { fontconfig openssl poppler - ffmpeg + ffmpeg_7 libva alsa-lib SDL diff --git a/pkgs/applications/graphics/openscad/default.nix b/pkgs/applications/graphics/openscad/default.nix index d72994e008b0b..26e19eec33f8d 100644 --- a/pkgs/applications/graphics/openscad/default.nix +++ b/pkgs/applications/graphics/openscad/default.nix @@ -26,12 +26,14 @@ , mkDerivation , qtmacextras , qmake -, spacenavSupport ? stdenv.isLinux, libspnav +, spacenavSupport ? stdenv.hostPlatform.isLinux, libspnav , wayland , wayland-protocols , wrapGAppsHook3 , qtwayland , cairo +, openscad +, runCommand }: mkDerivation rec { @@ -64,12 +66,16 @@ mkDerivation rec { eigen boost glew opencsg cgal_4 mpfr gmp glib harfbuzz lib3mf libzip double-conversion freetype fontconfig qtbase qtmultimedia qscintilla cairo - ] ++ lib.optionals stdenv.isLinux [ libGLU libGL wayland wayland-protocols qtwayland ] - ++ lib.optional stdenv.isDarwin qtmacextras + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libGLU libGL wayland wayland-protocols qtwayland ] + ++ lib.optional stdenv.hostPlatform.isDarwin qtmacextras ++ lib.optional spacenavSupport libspnav ; - qmakeFlags = [ "VERSION=${version}" ] ++ + qmakeFlags = [ + "VERSION=${version}" + "LIB3MF_INCLUDEPATH=${lib3mf.dev}/include/lib3mf/Bindings/Cpp" + "LIB3MF_LIBPATH=${lib3mf}/lib" + ] ++ lib.optionals spacenavSupport [ "ENABLE_SPNAV=1" "SPNAV_INCLUDEPATH=${libspnav}/include" @@ -82,7 +88,7 @@ mkDerivation rec { make objects/parser.cxx ''; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir $out/Applications mv $out/bin/*.app $out/Applications rmdir $out/bin || true @@ -112,4 +118,14 @@ mkDerivation rec { maintainers = with lib.maintainers; [ bjornfor raskin gebner ]; mainProgram = "openscad"; }; + + passthru.tests = { + lib3mf_support = runCommand "${pname}-lib3mf-support-test" { + nativeBuildInputs = [ openscad ]; + } '' + echo "cube([1, 1, 1]);" | openscad -o cube.3mf - + echo "import(\"cube.3mf\");" | openscad -o cube-import.3mf - + mv cube-import.3mf $out + ''; + }; } diff --git a/pkgs/applications/graphics/opentoonz/default.nix b/pkgs/applications/graphics/opentoonz/default.nix index 1dd460c2e1d2b..a474550820ba3 100644 --- a/pkgs/applications/graphics/opentoonz/default.nix +++ b/pkgs/applications/graphics/opentoonz/default.nix @@ -1,7 +1,7 @@ { boost , cmake , fetchFromGitHub -, freeglut +, libglut , freetype , glew , libjpeg @@ -93,7 +93,7 @@ stdenv.mkDerivation { buildInputs = [ boost - freeglut + libglut freetype glew libjpeg diff --git a/pkgs/applications/graphics/ovito/default.nix b/pkgs/applications/graphics/ovito/default.nix index 81ce2518cea76..710460054586c 100644 --- a/pkgs/applications/graphics/ovito/default.nix +++ b/pkgs/applications/graphics/ovito/default.nix @@ -27,7 +27,7 @@ mkDerivation rec { owner = "stuko"; repo = "ovito"; rev = "v${version}"; - sha256 = "sha256-Z3uwjOYJ7di/LLllbzdKjzUE7m119i03bA8dJPqhxWA="; + hash = "sha256-Z3uwjOYJ7di/LLllbzdKjzUE7m119i03bA8dJPqhxWA="; }; nativeBuildInputs = [ @@ -48,7 +48,7 @@ mkDerivation rec { qtbase qtsvg qttools - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ VideoDecodeAcceleration ]; @@ -58,6 +58,6 @@ mkDerivation rec { homepage = "https://ovito.org"; license = with licenses; [ gpl3Only mit ]; maintainers = with maintainers; [ twhitehead ]; - broken = stdenv.isDarwin; # clang-11: error: no such file or directory: '$-DOVITO_COPYRIGHT_NOTICE=... + broken = stdenv.hostPlatform.isDarwin; # clang-11: error: no such file or directory: '$-DOVITO_COPYRIGHT_NOTICE=... }; } diff --git a/pkgs/applications/graphics/panotools/default.nix b/pkgs/applications/graphics/panotools/default.nix index 365996aaf5917..494fd093ac4ad 100644 --- a/pkgs/applications/graphics/panotools/default.nix +++ b/pkgs/applications/graphics/panotools/default.nix @@ -22,14 +22,14 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake + perl ]; buildInputs = [ libjpeg libpng libtiff - perl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Carbon ]; diff --git a/pkgs/applications/graphics/paraview/default.nix b/pkgs/applications/graphics/paraview/default.nix index 3394fc6825c75..4ff64094af804 100644 --- a/pkgs/applications/graphics/paraview/default.nix +++ b/pkgs/applications/graphics/paraview/default.nix @@ -1,18 +1,38 @@ -{ lib, stdenv, fetchFromGitLab, fetchurl -, boost, cmake, ffmpeg, wrapQtAppsHook, qtbase, qtx11extras -, qttools, qtxmlpatterns, qtsvg, gdal, gfortran, libXt, makeWrapper -, ninja, mpi, python3, tbb, libGLU, libGL -, withDocs ? true +{ + lib, + stdenv, + fetchFromGitLab, + fetchurl, + boost, + cmake, + ffmpeg, + wrapQtAppsHook, + qtbase, + qtx11extras, + qttools, + qtxmlpatterns, + qtsvg, + gdal, + gfortran, + libXt, + makeWrapper, + ninja, + mpi, + python3, + tbb, + libGLU, + libGL, + withDocs ? true, }: let - version = "5.12.0"; + version = "5.13.0"; docFiles = [ (fetchurl { url = "https://www.paraview.org/paraview-downloads/download.php?submit=Download&version=v${lib.versions.majorMinor version}&type=data&os=Sources&downloadFile=ParaViewTutorial-${version}.pdf"; name = "Tutorial.pdf"; - hash = "sha256-ETA799peqP9RAjcqPBwVb8egKfQJAuIXNgso+k8o50Q="; + hash = "sha256-hoCa/aTy2mmsPHP3Zm0hLZlZKbtUMpjUlc2rFKKChco="; }) (fetchurl { url = "https://www.paraview.org/paraview-downloads/download.php?submit=Download&version=v${lib.versions.majorMinor version}&type=data&os=Sources&downloadFile=ParaViewGettingStarted-${version}.pdf"; @@ -22,11 +42,12 @@ let (fetchurl { url = "https://www.paraview.org/paraview-downloads/download.php?submit=Download&version=v${lib.versions.majorMinor version}&type=data&os=Sources&downloadFile=ParaViewCatalystGuide-${version}.pdf"; name = "CatalystGuide.pdf"; - hash = "sha256-imRW70lGQX7Gy0AavIHQMVhnn9E2FPpiCdCKt7Jje4w="; + hash = "sha256-t1lJ1Wiswhdxovt2O4sXTXfFxshDiZZVdnkXt/+BQn8="; }) ]; -in stdenv.mkDerivation rec { +in +stdenv.mkDerivation rec { pname = "paraview"; inherit version; @@ -35,7 +56,7 @@ in stdenv.mkDerivation rec { owner = "paraview"; repo = "paraview"; rev = "v${version}"; - hash = "sha256-PAD48IlOU39TosjfTiDz7IjEeYEP/7F75M+8dYBIUxI="; + hash = "sha256-JRSuvBON2n0UnbrFia4Qmf6eYb1Mc+Z7dIcXSeUhpIc="; fetchSubmodules = true; }; @@ -86,7 +107,10 @@ in stdenv.mkDerivation rec { qtsvg ]; - postInstall = let docDir = "$out/share/paraview-${lib.versions.majorMinor version}/doc"; in + postInstall = + let + docDir = "$out/share/paraview-${lib.versions.majorMinor version}/doc"; + in lib.optionalString withDocs '' mkdir -p ${docDir}; for docFile in ${lib.concatStringsSep " " docFiles}; do @@ -95,14 +119,21 @@ in stdenv.mkDerivation rec { ''; propagatedBuildInputs = [ - (python3.withPackages (ps: with ps; [ numpy matplotlib mpi4py ])) + (python3.withPackages ( + ps: with ps; [ + numpy + matplotlib + mpi4py + ] + )) ]; - meta = with lib; { - homepage = "https://www.paraview.org/"; + meta = { + homepage = "https://www.paraview.org"; description = "3D Data analysis and visualization application"; - license = licenses.bsd3; - maintainers = with maintainers; [ guibert ]; - platforms = platforms.linux; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ guibert ]; + changelog = "https://www.kitware.com/paraview-${lib.concatStringsSep "-" (lib.versions.splitVersion version)}-release-notes"; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/graphics/pdfcpu/default.nix b/pkgs/applications/graphics/pdfcpu/default.nix index d8ca4fbcabf10..5d3e2d6abcc2e 100644 --- a/pkgs/applications/graphics/pdfcpu/default.nix +++ b/pkgs/applications/graphics/pdfcpu/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "pdfcpu"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "pdfcpu"; repo = pname; rev = "v${version}"; - hash = "sha256-E1D2DvwwrtlY06kvCZkoAO5VcdtkBJYLcxuqGsulFUA="; + hash = "sha256-NrR7qjVlac4on3pUde6Au8xlnU0wxWrRRh4QdviNPt4="; # Apparently upstream requires that the compiled executable will know the # commit hash and the date of the commit. This information is also presented # in the output of `pdfcpu version` which we use as a sanity check in the @@ -31,7 +31,7 @@ buildGoModule rec { ''; }; - vendorHash = "sha256-4k4aZnQ9SjcGr/ziCacfcVfVk7w4Qhli2rOeYE76Qs0="; + vendorHash = "sha256-EGQd2hMf3eWswQ6a2GMqbkf7bE8HVMEqjY6fmWNHmBo="; ldflags = [ "-s" diff --git a/pkgs/applications/graphics/photoqt/default.nix b/pkgs/applications/graphics/photoqt/default.nix deleted file mode 100644 index e3c8ce53bbd2e..0000000000000 --- a/pkgs/applications/graphics/photoqt/default.nix +++ /dev/null @@ -1,87 +0,0 @@ -{ lib -, stdenv -, fetchurl -, cmake -, extra-cmake-modules -, qttools -, wrapQtAppsHook -, exiv2 -, graphicsmagick -, libarchive -, libraw -, mpv -, poppler -, pugixml -, qtbase -, qtcharts -, qtdeclarative -, qtimageformats -, qtlocation -, qtmultimedia -, qtpositioning -, qtsvg -, zxing-cpp -, qtwayland -}: - -stdenv.mkDerivation rec { - pname = "photoqt"; - version = "4.5"; - - src = fetchurl { - url = "https://photoqt.org/pkgs/photoqt-${version}.tar.gz"; - hash = "sha256-QFziMNRhiM4LaNJ8RkJ0iCq/8J82wn0F594qJeSN3Lw="; - }; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - qttools - wrapQtAppsHook - ]; - - buildInputs = [ - exiv2 - graphicsmagick - libarchive - libraw - mpv - poppler - pugixml - qtbase - qtcharts - qtdeclarative - qtimageformats - qtlocation - qtmultimedia - qtpositioning - qtsvg - zxing-cpp - ] ++ lib.optionals stdenv.isLinux [ - qtwayland - ]; - - cmakeFlags = [ - (lib.cmakeBool "DEVIL" false) - (lib.cmakeBool "CHROMECAST" false) - (lib.cmakeBool "FREEIMAGE" false) - (lib.cmakeBool "IMAGEMAGICK" false) - ]; - - env.MAGICK_LOCATION = "${graphicsmagick}/include/GraphicsMagick"; - - postInstall = lib.optionalString stdenv.isDarwin '' - mkdir -p $out/Applications - mv $out/bin/photoqt.app $out/Applications - makeWrapper $out/{Applications/photoqt.app/Contents/MacOS,bin}/photoqt - ''; - - meta = { - description = "Simple, yet powerful and good looking image viewer"; - homepage = "https://photoqt.org/"; - license = lib.licenses.gpl2Plus; - mainProgram = "photoqt"; - maintainers = with lib.maintainers; [ wegank ]; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/applications/graphics/pick-colour-picker/default.nix b/pkgs/applications/graphics/pick-colour-picker/default.nix index 98980ed7fd462..b255db3362564 100644 --- a/pkgs/applications/graphics/pick-colour-picker/default.nix +++ b/pkgs/applications/graphics/pick-colour-picker/default.nix @@ -7,7 +7,6 @@ , gtk3 , gobject-introspection , wrapGAppsHook3 -, python }: buildPythonPackage rec { diff --git a/pkgs/applications/graphics/pineapple-pictures/default.nix b/pkgs/applications/graphics/pineapple-pictures/default.nix index 86e85e0efad2f..9c465c32c3782 100644 --- a/pkgs/applications/graphics/pineapple-pictures/default.nix +++ b/pkgs/applications/graphics/pineapple-pictures/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "pineapple-pictures"; - version = "0.7.4"; + version = "0.8.1"; src = fetchFromGitHub { owner = "BLumia"; repo = "pineapple-pictures"; rev = finalAttrs.version; - hash = "sha256-aiQlcTID8mfrT4MEx4s5K+QmMHBlHOu2HfsValiH5qU="; + hash = "sha256-7X0A3tjdr8hnnovkbgIOLx5h/eWy0gkM8SEB2/bpwkQ="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/pinta/default.nix b/pkgs/applications/graphics/pinta/default.nix deleted file mode 100644 index 7f9c815eff1f6..0000000000000 --- a/pkgs/applications/graphics/pinta/default.nix +++ /dev/null @@ -1,90 +0,0 @@ -{ lib -, buildDotnetModule -, dotnetCorePackages -, fetchFromGitHub -, glibcLocales -, gtk3 -, intltool -, wrapGAppsHook3 -}: - -buildDotnetModule rec { - pname = "Pinta"; - version = "2.1.1"; - - nativeBuildInputs = [ - intltool - wrapGAppsHook3 - ]; - - dotnet-sdk = dotnetCorePackages.sdk_7_0; - dotnet-runtime = dotnetCorePackages.runtime_7_0; - - runtimeDeps = [ gtk3 ]; - buildInputs = runtimeDeps; - - # How-to update deps: - # $ nix-build -A pinta.fetch-deps - # $ ./result - # TODO: create update script - nugetDeps = ./deps.nix; - - projectFile = "Pinta"; - - src = fetchFromGitHub { - owner = "PintaProject"; - repo = "Pinta"; - rev = version; - hash = "sha256-sdSGBf/dk+3Oy/aCfmIDuymwXQZwnth923Wdggir/Q0="; - }; - - # https://github.com/NixOS/nixpkgs/issues/38991 - # bash: warning: setlocale: LC_ALL: cannot change locale (en_US.UTF-8) - LOCALE_ARCHIVE = "${glibcLocales}/lib/locale/locale-archive"; - - # Do the autoreconf/Makefile job manually - # TODO: use upstream build system - postBuild = '' - # Substitute translation placeholders - intltool-merge -x po/ xdg/pinta.appdata.xml.in xdg/pinta.appdata.xml - intltool-merge -d po/ xdg/pinta.desktop.in xdg/pinta.desktop - - # Build translations - dotnet build Pinta \ - -p:ContinuousIntegrationBuild=true \ - -p:Deterministic=true \ - -target:CompileTranslations,PublishTranslations \ - -p:BuildTranslations=true \ - -p:PublishDir="$NIX_BUILD_TOP/source/publish" - ''; - - postFixup = '' - # Rename the binary - mv "$out/bin/Pinta" "$out/bin/pinta" - - # Copy runtime icons - for i in "Pinta.Resources/icons/hicolor/"*; do - res="$(basename $i)" - mkdir -p "$out/share/icons/hicolor/$res" - cp -rv "Pinta.Resources/icons/hicolor/$res/"* "$out/share/icons/hicolor/$res/" - done - - # Install - dotnet build installer/linux/install.proj \ - -target:Install \ - -p:ContinuousIntegrationBuild=true \ - -p:Deterministic=true \ - -p:SourceDir="$NIX_BUILD_TOP/source" \ - -p:PublishDir="$NIX_BUILD_TOP/source/publish" \ - -p:InstallPrefix="$out" - ''; - - meta = with lib; { - homepage = "https://www.pinta-project.com/"; - description = "Drawing/editing program modeled after Paint.NET"; - license = licenses.mit; - maintainers = with maintainers; [ thiagokokada ]; - platforms = with platforms; linux; - mainProgram = "pinta"; - }; -} diff --git a/pkgs/applications/graphics/pinta/deps.nix b/pkgs/applications/graphics/pinta/deps.nix deleted file mode 100644 index 5f637d347f5ce..0000000000000 --- a/pkgs/applications/graphics/pinta/deps.nix +++ /dev/null @@ -1,19 +0,0 @@ -# This file was automatically generated by passthru.fetch-deps. -# Please dont edit it manually, your changes might get overwritten! - -{ fetchNuGet }: [ - (fetchNuGet { pname = "AtkSharp"; version = "3.24.24.38"; sha256 = "12dv3j8nzhjb5c0093djajdnv8n7m0q7vq2d5ry2v4xk9wqzxpr7"; }) - (fetchNuGet { pname = "CairoSharp"; version = "3.24.24.38"; sha256 = "0n3y5w088k81apxik9amfvjdwcic4k2ixxvnrk9cw6d2wh1d5r8d"; }) - (fetchNuGet { pname = "GdkSharp"; version = "3.24.24.38"; sha256 = "0c5gzg106bnnc4wwwhch6lja68623a9hk8r2sjcv35hl5dh21616"; }) - (fetchNuGet { pname = "GioSharp"; version = "3.24.24.38"; sha256 = "1b3irarxjbbpf24fw2avdglcslb5653gn6m829yhlcm5ay37pds4"; }) - (fetchNuGet { pname = "GLibSharp"; version = "3.24.24.38"; sha256 = "1a0ixdq1gdb46gkb2nnlydsi10bjrbd3risfyaphsy8fbsyzrzvm"; }) - (fetchNuGet { pname = "GtkSharp"; version = "3.24.24.38"; sha256 = "0cn8aggci6n088y5giiaxmyzv01rcz37r8pm738q2bsb57zppz2j"; }) - (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; sha256 = "15gqy2m14fdlvy1g59207h5kisznm355kbw010gy19vh47z8gpz3"; }) - (fetchNuGet { pname = "NGettext"; version = "0.6.7"; sha256 = "1lnq1lgd80xqn80qwq5ipfjnd7nl1ghinjc3krnd546r0c7hwqky"; }) - (fetchNuGet { pname = "PangoSharp"; version = "3.24.24.38"; sha256 = "0cma8j4cy4j3fw0nvsxlqi0azjkvfjsw0wb6k6b2k21rdpy5rbbn"; }) - (fetchNuGet { pname = "ParagonClipper"; version = "6.4.2"; sha256 = "0pam44f7iayqjz8nh1x29gxdd4dj00i7m5883cpa64i192pgl94c"; }) - (fetchNuGet { pname = "SharpZipLib"; version = "1.4.1"; sha256 = "1dh1jhgzc9bzd2hvyjp2nblavf0619djniyzalx7kvrbsxhrdjb6"; }) - (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.7.0"; sha256 = "121l1z2ypwg02yz84dy6gr82phpys0njk7yask3sihgy214w43qp"; }) - (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.7.0"; sha256 = "1a56ls5a9sr3ya0nr086sdpa9qv0abv31dd6fp27maqa9zclqq5d"; }) - (fetchNuGet { pname = "Tmds.DBus"; version = "0.11.0"; sha256 = "067s9i5mjxlmw0nid3fblr9d0hy1b6zrjzhhi48rf4cs2j72pl64"; }) -] diff --git a/pkgs/applications/graphics/pixinsight/default.nix b/pkgs/applications/graphics/pixinsight/default.nix index f29e1e06ab251..c034e23d4a78b 100644 --- a/pkgs/applications/graphics/pixinsight/default.nix +++ b/pkgs/applications/graphics/pixinsight/default.nix @@ -3,7 +3,6 @@ , requireFile , wrapQtAppsHook , autoPatchelfHook -, makeWrapper , unixtools , fakeroot , mailcap @@ -49,12 +48,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "pixinsight"; - version = "1.8.9-3"; + version = "1.8.9-3-20240625"; src = requireFile rec { - name = "PI-linux-x64-${finalAttrs.version}-20240619-c.tar.xz"; + name = "PI-linux-x64-${finalAttrs.version}-c.tar.xz"; url = "https://pixinsight.com/"; - hash = "sha256-WZrD+X7zE1i29+YsGJ+wbIXmlVon9bczHvvRAkQXz6M="; + hash = "sha256-jqp5pt+fC7QvENCwRjr7ENQiCZpwNhC5q76YdzRBJis="; message = '' PixInsight is available from ${url} and requires a commercial (or trial) license. After a license has been obtained, PixInsight can be downloaded from the software distribution diff --git a/pkgs/applications/graphics/pizarra/default.nix b/pkgs/applications/graphics/pizarra/default.nix index c636637763d7d..2167eb3a9caf4 100644 --- a/pkgs/applications/graphics/pizarra/default.nix +++ b/pkgs/applications/graphics/pizarra/default.nix @@ -1,9 +1,7 @@ { lib , fetchFromGitLab , rustPlatform -, cargo , pkg-config -, binutils-unwrapped , gtk3-x11 , atk , glib @@ -21,7 +19,7 @@ rustPlatform.buildRustPackage rec { repo = "pizarra-gtk"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-vnjhveX3EVIfJLiHWhlvhoPcRx1a8Nnjj7hIaPgU3Zw="; + hash = "sha256-vnjhveX3EVIfJLiHWhlvhoPcRx1a8Nnjj7hIaPgU3Zw="; }; cargoHash = "sha256-btvMUKADGHlXLmeKF1K9Js44SljZ0MejGId8aDwPhVU="; diff --git a/pkgs/applications/graphics/processing/default.nix b/pkgs/applications/graphics/processing/default.nix index 9ea148323cde0..59ab93c1867db 100644 --- a/pkgs/applications/graphics/processing/default.nix +++ b/pkgs/applications/graphics/processing/default.nix @@ -1,4 +1,20 @@ -{ lib, stdenv, fetchFromGitHub, fetchurl, ant, unzip, makeWrapper, jdk, jogl, rsync, ffmpeg, batik, stripJavaArchivesHook, wrapGAppsHook3, libGL }: +{ + lib, + stdenv, + fetchFromGitHub, + fetchurl, + ant, + unzip, + makeWrapper, + jdk, + jogl, + rsync, + ffmpeg, + batik, + stripJavaArchivesHook, + wrapGAppsHook3, + libGL, +}: let buildNumber = "1293"; vaqua = fetchurl { @@ -37,9 +53,11 @@ let sha256 = "sha256-N4U04znm5tULFzb7Ort28cFdG+P0wTzsbVNkEuI9pgM="; }; - arch = { - x86_64 = "amd64"; - }.${stdenv.hostPlatform.parsed.cpu.name} or stdenv.hostPlatform.parsed.cpu.name; + arch = + { + x86_64 = "amd64"; + } + .${stdenv.hostPlatform.parsed.cpu.name} or stdenv.hostPlatform.parsed.cpu.name; in stdenv.mkDerivation rec { pname = "processing"; @@ -52,8 +70,21 @@ stdenv.mkDerivation rec { sha256 = "sha256-SzQemZ6iZ9o89/doV8YMv7DmyPSDyckJl3oyxJyfrm0="; }; - nativeBuildInputs = [ ant unzip makeWrapper stripJavaArchivesHook wrapGAppsHook3 ]; - buildInputs = [ jdk jogl ant rsync ffmpeg batik ]; + nativeBuildInputs = [ + ant + unzip + makeWrapper + stripJavaArchivesHook + wrapGAppsHook3 + ]; + buildInputs = [ + jdk + jogl + ant + rsync + ffmpeg + batik + ]; dontWrapGApps = true; @@ -74,7 +105,7 @@ stdenv.mkDerivation rec { mv app/lib/{jna-5.10.0/dist/jna.jar,} mv app/lib/{jna-5.10.0/dist/jna-platform.jar,} ln -sf ${batik}/* java/libraries/svg/library/ - cp java/libraries/svg/library/lib/batik-all-${batik.version}.jar java/libraries/svg/library/batik.jar + cp java/libraries/svg/library/share/java/batik-all-${batik.version}.jar java/libraries/svg/library/batik.jar echo "tarring ffmpeg" tar --checkpoint=10000 -czf build/shared/tools/MovieMaker/ffmpeg-5.0.1.gz ${ffmpeg} cd build @@ -108,7 +139,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Language and IDE for electronic arts"; homepage = "https://processing.org"; - license = with licenses; [ gpl2Only lgpl21Only ]; + license = with licenses; [ + gpl2Only + lgpl21Only + ]; platforms = platforms.linux; maintainers = with maintainers; [ evan-goode ]; }; diff --git a/pkgs/applications/graphics/pureref/default.nix b/pkgs/applications/graphics/pureref/default.nix index 552f56a6b5c42..3d54b41290f77 100644 --- a/pkgs/applications/graphics/pureref/default.nix +++ b/pkgs/applications/graphics/pureref/default.nix @@ -2,14 +2,14 @@ appimageTools.wrapType1 rec { pname = "pureref"; - version = "1.11.1"; + version = "2.0.3"; src = runCommand "PureRef-${version}_x64.Appimage" { nativeBuildInputs = [ curl gnugrep cacert ]; - outputHash = "sha256-da/dH0ruI562JylpvE9f2zMUSJ56+T7Y0xlP/xr3yhY="; + outputHash = "sha256-0iR1cP2sZvWWqKwRAwq6L/bmIBSYHKrlI8u8V2hANfM="; } '' key="$(curl "https://www.pureref.com/download.php" --silent | grep '%3D%3D' | cut -d '"' -f2)" - curl "https://www.pureref.com/files/build.php?build=LINUX64.Appimage&version=${version}&downloadKey=$key" --output $out + curl -L "https://www.pureref.com/files/build.php?build=LINUX64.Appimage&version=${version}&downloadKey=$key" --output $out ''; meta = with lib; { diff --git a/pkgs/applications/graphics/pymeshlab/default.nix b/pkgs/applications/graphics/pymeshlab/default.nix index 255b14f09211e..4a4653b452272 100644 --- a/pkgs/applications/graphics/pymeshlab/default.nix +++ b/pkgs/applications/graphics/pymeshlab/default.nix @@ -88,12 +88,10 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace src/meshlab/src/external/ssynth.cmake \ --replace-fail '$'{SSYNTH_LINK} ${structuresynth.src} \ --replace-warn "MD5 ''${SSYNTH_MD5}" "" - export cmakeFlags="cmakeFlags - -DCMAKE_INSTALL_PREFIX=$out/${python3Packages.python.sitePackages}/pymeshlab - " ''; cmakeFlags = [ + "-DCMAKE_INSTALL_PREFIX=${placeholder "out"}/${python3Packages.python.sitePackages}/pymeshlab" "-DVCGDIR=${vcg.src}" ]; diff --git a/pkgs/applications/graphics/qosmic/default.nix b/pkgs/applications/graphics/qosmic/default.nix index ebee900cf9d6a..eab80b018ccc8 100644 --- a/pkgs/applications/graphics/qosmic/default.nix +++ b/pkgs/applications/graphics/qosmic/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { }) ]; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace qosmic.pro \ --replace "/share" "/Applications/qosmic.app/Contents/Resources" \ --replace "/qosmic/scripts" "/scripts" \ @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { "CONFIG+=link_pkgconfig" ]; - preInstall = lib.optionalString stdenv.isDarwin '' + preInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications mv qosmic.app $out/Applications ''; diff --git a/pkgs/applications/graphics/qscreenshot/default.nix b/pkgs/applications/graphics/qscreenshot/default.nix index 761bd69d35209..d8ed2a14e925a 100644 --- a/pkgs/applications/graphics/qscreenshot/default.nix +++ b/pkgs/applications/graphics/qscreenshot/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchgit -, dos2unix , qtbase , qttools , qtx11extras diff --git a/pkgs/applications/graphics/qvge/default.nix b/pkgs/applications/graphics/qvge/default.nix index e7c6def43b91f..ef4e17fcce812 100644 --- a/pkgs/applications/graphics/qvge/default.nix +++ b/pkgs/applications/graphics/qvge/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ wrapQtAppsHook qmake ]; - buildInputs = if stdenv.isDarwin then [ qtsvg ] else [ qtx11extras ]; + buildInputs = if stdenv.hostPlatform.isDarwin then [ qtsvg ] else [ qtx11extras ]; meta = with lib; { description = "Qt Visual Graph Editor"; diff --git a/pkgs/applications/graphics/rapid-photo-downloader/default.nix b/pkgs/applications/graphics/rapid-photo-downloader/default.nix index 494815ac930b0..8b952ab79d840 100644 --- a/pkgs/applications/graphics/rapid-photo-downloader/default.nix +++ b/pkgs/applications/graphics/rapid-photo-downloader/default.nix @@ -101,6 +101,6 @@ mkDerivationWith python3Packages.buildPythonApplication rec { homepage = "https://www.damonlynch.net/rapid/"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/graphics/rawtherapee/default.nix b/pkgs/applications/graphics/rawtherapee/default.nix index 14c3a0dc7ef2d..deb45b06d19f1 100644 --- a/pkgs/applications/graphics/rawtherapee/default.nix +++ b/pkgs/applications/graphics/rawtherapee/default.nix @@ -1,9 +1,17 @@ { lib , stdenv , fetchFromGitHub -, fetchurl , cmake , pkg-config +, util-linux +, libselinux +, libsepol +, lerc +, libthai +, libdatrie +, libxkbcommon +, libepoxy +, libXtst , wrapGAppsHook3 , makeWrapper , pixman @@ -15,37 +23,31 @@ , libiptcdata , fftw , expat -, pcre +, pcre2 , libsigcxx , lensfun , librsvg , libcanberra-gtk3 , gtk-mac-integration , exiv2 +, libraw + , libjxl }: stdenv.mkDerivation rec { pname = "rawtherapee"; - version = "5.10"; + version = "5.11"; src = fetchFromGitHub { owner = "Beep6581"; repo = "RawTherapee"; rev = version; - hash = "sha256-rIwwKNm7l7oPEt95sHyRj4aF3mtnvM4KAu8oVaIMwyE="; + hash = "sha256-jIAbguwF2aqRTk72ro5oHNTawA7biPSFC41YHgRR730="; # The developpers ask not to use the tarball from Github releases, see # https://www.rawtherapee.com/downloads/5.10/#news-relevant-to-package-maintainers forceFetchGit = true; }; - # https://github.com/Beep6581/RawTherapee/issues/7074 - patches = [ - (fetchurl { - url = "https://github.com/Beep6581/RawTherapee/commit/6b9f45c69c1ddfc3607d3d9c1206dcf1def30295.diff"; - hash = "sha256-3Rti9HV8N1ueUm5B9qxEZL7Lb9bBb+iy2AGKMpJ9YOM="; - }) - ]; - postPatch = '' echo "set(HG_VERSION ${version})" > ReleaseInfo.cmake substituteInPlace tools/osx/Info.plist.in rtgui/config.h.in \ @@ -56,11 +58,20 @@ stdenv.mkDerivation rec { cmake pkg-config wrapGAppsHook3 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ makeWrapper ]; buildInputs = [ + util-linux + libselinux + libsepol + lerc + libthai + libdatrie + libxkbcommon + libepoxy + libXtst pixman libpthreadstubs gtkmm3 @@ -70,21 +81,25 @@ stdenv.mkDerivation rec { libiptcdata fftw expat - pcre + pcre2 libsigcxx lensfun librsvg exiv2 - ] ++ lib.optionals stdenv.isLinux [ + libraw + libjxl + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libcanberra-gtk3 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ gtk-mac-integration ]; cmakeFlags = [ "-DPROC_TARGET_NUMBER=2" "-DCACHE_NAME_SUFFIX=\"\"" - ] ++ lib.optionals stdenv.isDarwin [ + "-DWITH_SYSTEM_LIBRAW=\"ON\"" + "-DWITH_JXL=\"ON\"" + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DCMAKE_OSX_DEPLOYMENT_TARGET=${stdenv.hostPlatform.darwinMinVersion}" ]; @@ -95,7 +110,7 @@ stdenv.mkDerivation rec { ]; env.CXXFLAGS = "-include cstdint"; # needed at least with gcc13 on aarch64-linux - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications/RawTherapee.app $out/bin cp -R Release $out/Applications/RawTherapee.app/Contents for f in $out/Applications/RawTherapee.app/Contents/MacOS/*; do diff --git a/pkgs/applications/graphics/rnote/Cargo.lock b/pkgs/applications/graphics/rnote/Cargo.lock deleted file mode 100644 index 0cbd1de820423..0000000000000 --- a/pkgs/applications/graphics/rnote/Cargo.lock +++ /dev/null @@ -1,5110 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "addr2line" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" -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 = "allocator-api2" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" - -[[package]] -name = "alsa" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37fe60779335388a88c01ac6c3be40304d1e349de3ada3b15f7808bb90fa9dce" -dependencies = [ - "alsa-sys", - "bitflags 2.5.0", - "libc", -] - -[[package]] -name = "alsa-sys" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db8fee663d06c4e303404ef5f40488a53e062f89ba8bfed81f42325aafad1527" -dependencies = [ - "libc", - "pkg-config", -] - -[[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.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" -dependencies = [ - "anstyle", - "anstyle-parse", - "anstyle-query", - "anstyle-wincon", - "colorchoice", - "utf8parse", -] - -[[package]] -name = "anstyle" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" - -[[package]] -name = "anstyle-parse" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" -dependencies = [ - "utf8parse", -] - -[[package]] -name = "anstyle-query" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" -dependencies = [ - "windows-sys 0.52.0", -] - -[[package]] -name = "anstyle-wincon" -version = "3.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" -dependencies = [ - "anstyle", - "windows-sys 0.52.0", -] - -[[package]] -name = "anyhow" -version = "1.0.81" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247" - -[[package]] -name = "approx" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6" -dependencies = [ - "num-traits", -] - -[[package]] -name = "aquamarine" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a941c39708478e8eea39243b5983f1c42d2717b3620ee91f4a52115fd02ac43f" -dependencies = [ - "itertools 0.9.0", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "arrayref" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" - -[[package]] -name = "arrayvec" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" -dependencies = [ - "serde", -] - -[[package]] -name = "async-channel" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f28243a43d821d11341ab73c80bed182dc015c514b951616cf79bd4af39af0c3" -dependencies = [ - "concurrent-queue", - "event-listener 5.3.0", - "event-listener-strategy 0.5.1", - "futures-core", - "pin-project-lite", -] - -[[package]] -name = "async-executor" -version = "1.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10b3e585719c2358d2660232671ca8ca4ddb4be4ce8a1842d6c2dc8685303316" -dependencies = [ - "async-lock 3.3.0", - "async-task", - "concurrent-queue", - "fastrand", - "futures-lite", - "slab", -] - -[[package]] -name = "async-fs" -version = "2.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc19683171f287921f2405677dd2ed2549c3b3bda697a563ebc3a121ace2aba1" -dependencies = [ - "async-lock 3.3.0", - "blocking", - "futures-lite", -] - -[[package]] -name = "async-io" -version = "2.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcccb0f599cfa2f8ace422d3555572f47424da5648a4382a9dd0310ff8210884" -dependencies = [ - "async-lock 3.3.0", - "cfg-if", - "concurrent-queue", - "futures-io", - "futures-lite", - "parking", - "polling", - "rustix", - "slab", - "tracing", - "windows-sys 0.52.0", -] - -[[package]] -name = "async-lock" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" -dependencies = [ - "event-listener 2.5.3", -] - -[[package]] -name = "async-lock" -version = "3.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b" -dependencies = [ - "event-listener 4.0.3", - "event-listener-strategy 0.4.0", - "pin-project-lite", -] - -[[package]] -name = "async-net" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b948000fad4873c1c9339d60f2623323a0cfd3816e5181033c6a5cb68b2accf7" -dependencies = [ - "async-io", - "blocking", - "futures-lite", -] - -[[package]] -name = "async-process" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d999d925640d51b662b7b4e404224dd81de70f4aa4a199383c2c5e5b86885fa3" -dependencies = [ - "async-channel", - "async-io", - "async-lock 3.3.0", - "async-signal", - "async-task", - "blocking", - "cfg-if", - "event-listener 5.3.0", - "futures-lite", - "rustix", - "tracing", - "windows-sys 0.52.0", -] - -[[package]] -name = "async-signal" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5" -dependencies = [ - "async-io", - "async-lock 2.8.0", - "atomic-waker", - "cfg-if", - "futures-core", - "futures-io", - "rustix", - "signal-hook-registry", - "slab", - "windows-sys 0.48.0", -] - -[[package]] -name = "async-task" -version = "4.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbb36e985947064623dbd357f727af08ffd077f93d696782f3c56365fa2e2799" - -[[package]] -name = "atomic-waker" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" - -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi 0.1.19", - "libc", - "winapi", -] - -[[package]] -name = "autocfg" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" - -[[package]] -name = "autocxx" -version = "0.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ba64dd33efd8f09724143d45ab91b48aebcee52f4fb11add3464c998fab47dc" -dependencies = [ - "aquamarine", - "autocxx-macro", - "cxx", - "moveit", -] - -[[package]] -name = "autocxx-bindgen" -version = "0.65.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c9fb7b8dd83a582e12157367773d8d1195f2dea54d4250aaf3426abae3237aa" -dependencies = [ - "bitflags 1.3.2", - "cexpr", - "clang-sys", - "itertools 0.10.5", - "lazy_static", - "lazycell", - "log", - "peeking_take_while", - "prettyplease", - "proc-macro2", - "quote", - "regex", - "rustc-hash", - "shlex", - "syn 2.0.58", - "which", -] - -[[package]] -name = "autocxx-build" -version = "0.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955e602d2d68b79ca5d674984259234fad2c8d869ad99011699e0a3cd76f38cd" -dependencies = [ - "autocxx-engine", - "env_logger", - "indexmap 1.9.3", - "syn 2.0.58", -] - -[[package]] -name = "autocxx-engine" -version = "0.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5918896fc1d44a647345fd5e8c74208424e394a76bdd2942398f4aff81ec7ab1" -dependencies = [ - "aquamarine", - "autocxx-bindgen", - "autocxx-parser", - "cc", - "cxx-gen", - "indexmap 1.9.3", - "indoc", - "itertools 0.10.5", - "log", - "miette", - "once_cell", - "prettyplease", - "proc-macro2", - "quote", - "regex", - "rustversion", - "serde_json", - "strum_macros", - "syn 2.0.58", - "tempfile", - "thiserror", - "version_check", -] - -[[package]] -name = "autocxx-macro" -version = "0.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e594e68d030b6eb1ce7e2b40958f4f4ae7150c588c76d76b9f8178d41c47d80" -dependencies = [ - "autocxx-parser", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 2.0.58", -] - -[[package]] -name = "autocxx-parser" -version = "0.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ef00b2fc378804c31c4fbd693a7fea93f8a90467dce331dae1e4ce41e542953" -dependencies = [ - "indexmap 1.9.3", - "itertools 0.10.5", - "log", - "once_cell", - "proc-macro2", - "quote", - "serde", - "serde_json", - "syn 2.0.58", - "thiserror", -] - -[[package]] -name = "backtrace" -version = "0.3.71" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" -dependencies = [ - "addr2line", - "cc", - "cfg-if", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", -] - -[[package]] -name = "backtrace-ext" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "537beee3be4a18fb023b570f80e3ae28003db9167a751266b259926e25539d50" -dependencies = [ - "backtrace", -] - -[[package]] -name = "base64" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51" - -[[package]] -name = "bindgen" -version = "0.69.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" -dependencies = [ - "bitflags 2.5.0", - "cexpr", - "clang-sys", - "itertools 0.12.1", - "lazy_static", - "lazycell", - "proc-macro2", - "quote", - "regex", - "rustc-hash", - "shlex", - "syn 2.0.58", -] - -[[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 = "block" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" - -[[package]] -name = "blocking" -version = "1.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118" -dependencies = [ - "async-channel", - "async-lock 3.3.0", - "async-task", - "fastrand", - "futures-io", - "futures-lite", - "piper", - "tracing", -] - -[[package]] -name = "bumpalo" -version = "3.15.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa" - -[[package]] -name = "bytemuck" -version = "1.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15" - -[[package]] -name = "byteorder" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" - -[[package]] -name = "bytes" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" - -[[package]] -name = "cairo-rs" -version = "0.19.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2650f66005301bd33cc486dec076e1293c4cecf768bc7ba9bf5d2b1be339b99c" -dependencies = [ - "bitflags 2.5.0", - "cairo-sys-rs", - "glib", - "libc", - "thiserror", -] - -[[package]] -name = "cairo-sys-rs" -version = "0.19.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd3bb3119664efbd78b5e6c93957447944f16bdbced84c17a9f41c7829b81e64" -dependencies = [ - "glib-sys", - "libc", - "system-deps", -] - -[[package]] -name = "cast" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" - -[[package]] -name = "cc" -version = "1.0.90" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5" -dependencies = [ - "jobserver", - "libc", -] - -[[package]] -name = "cesu8" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" - -[[package]] -name = "cexpr" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" -dependencies = [ - "nom", -] - -[[package]] -name = "cfg-expr" -version = "0.15.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa50868b64a9a6fda9d593ce778849ea8715cd2a3d2cc17ffdb4a2f2f2f1961d" -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 = "chrono" -version = "0.4.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a0d04d43504c61aa6c7531f1871dd0d418d91130162063b789da00fd7057a5e" -dependencies = [ - "android-tzdata", - "iana-time-zone", - "js-sys", - "num-traits", - "wasm-bindgen", - "windows-targets 0.52.4", -] - -[[package]] -name = "clang-sys" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67523a3b4be3ce1989d607a828d036249522dd9c1c8de7f4dd2dae43a37369d1" -dependencies = [ - "glob", - "libc", - "libloading", -] - -[[package]] -name = "clap" -version = "4.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0" -dependencies = [ - "clap_builder", - "clap_derive", -] - -[[package]] -name = "clap_builder" -version = "4.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" -dependencies = [ - "anstream", - "anstyle", - "clap_lex", - "strsim 0.11.1", -] - -[[package]] -name = "clap_derive" -version = "4.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64" -dependencies = [ - "heck 0.5.0", - "proc-macro2", - "quote", - "syn 2.0.58", -] - -[[package]] -name = "clap_lex" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" - -[[package]] -name = "cmake" -version = "0.1.50" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31c789563b815f77f4250caee12365734369f942439b7defd71e18a48197130" -dependencies = [ - "cc", -] - -[[package]] -name = "codespan-reporting" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" -dependencies = [ - "termcolor", - "unicode-width", -] - -[[package]] -name = "color_quant" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" - -[[package]] -name = "colorchoice" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" - -[[package]] -name = "combine" -version = "4.6.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4" -dependencies = [ - "bytes", - "memchr", -] - -[[package]] -name = "concurrent-queue" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363" -dependencies = [ - "crossbeam-utils", -] - -[[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-sys" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" - -[[package]] -name = "coreaudio-rs" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "321077172d79c662f64f5071a03120748d5bb652f5231570141be24cfcd2bace" -dependencies = [ - "bitflags 1.3.2", - "core-foundation-sys", - "coreaudio-sys", -] - -[[package]] -name = "coreaudio-sys" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f01585027057ff5f0a5bf276174ae4c1594a2c5bde93d5f46a016d76270f5a9" -dependencies = [ - "bindgen", -] - -[[package]] -name = "cpal" -version = "0.15.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "873dab07c8f743075e57f524c583985fbaf745602acbe916a01539364369a779" -dependencies = [ - "alsa", - "core-foundation-sys", - "coreaudio-rs", - "dasp_sample", - "jni", - "js-sys", - "libc", - "mach2", - "ndk", - "ndk-context", - "oboe", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "windows", -] - -[[package]] -name = "crc32fast" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "crossbeam-channel" -version = "0.5.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95" -dependencies = [ - "crossbeam-utils", -] - -[[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.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" - -[[package]] -name = "crunchy" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" - -[[package]] -name = "cssparser" -version = "0.31.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b3df4f93e5fbbe73ec01ec8d3f68bba73107993a5b1e7519273c32db9b0d5be" -dependencies = [ - "cssparser-macros", - "dtoa-short", - "itoa", - "phf 0.11.2", - "smallvec", -] - -[[package]] -name = "cssparser-macros" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331" -dependencies = [ - "quote", - "syn 2.0.58", -] - -[[package]] -name = "cxx" -version = "1.0.120" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff4dc7287237dd438b926a81a1a5605dad33d286870e5eee2db17bf2bcd9e92a" -dependencies = [ - "cc", - "cxxbridge-flags", - "cxxbridge-macro", - "link-cplusplus", -] - -[[package]] -name = "cxx-gen" -version = "0.7.120" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9e305d914e15a8eefd7972a3b658d876d91a22681d555219feda30a9f5ea2b" -dependencies = [ - "codespan-reporting", - "proc-macro2", - "quote", - "syn 2.0.58", -] - -[[package]] -name = "cxxbridge-flags" -version = "1.0.120" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "701a1ac7a697e249cdd8dc026d7a7dafbfd0dbcd8bd24ec55889f2bc13dd6287" - -[[package]] -name = "cxxbridge-macro" -version = "1.0.120" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b404f596046b0bb2d903a9c786b875a126261b52b7c3a64bbb66382c41c771df" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.58", -] - -[[package]] -name = "darling" -version = "0.14.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850" -dependencies = [ - "darling_core", - "darling_macro", -] - -[[package]] -name = "darling_core" -version = "0.14.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim 0.10.0", - "syn 1.0.109", -] - -[[package]] -name = "darling_macro" -version = "0.14.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" -dependencies = [ - "darling_core", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "dashmap" -version = "4.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e77a43b28d0668df09411cb0bc9a8c2adc40f9a048afe863e05fd43251e8e39c" -dependencies = [ - "cfg-if", - "num_cpus", -] - -[[package]] -name = "dasp_sample" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c87e182de0887fd5361989c677c4e8f5000cd9491d6d563161a8f3a5519fc7f" - -[[package]] -name = "data-url" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c297a1c74b71ae29df00c3e22dd9534821d60eb9af5a0192823fa2acea70c2a" - -[[package]] -name = "derive_builder" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d07adf7be193b71cc36b193d0f5fe60b918a3a9db4dad0449f57bcfd519704a3" -dependencies = [ - "derive_builder_macro", -] - -[[package]] -name = "derive_builder_core" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f91d4cfa921f1c05904dc3c57b4a32c38aed3340cce209f3a6fd1478babafc4" -dependencies = [ - "darling", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "derive_builder_macro" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f0314b72bed045f3a68671b3c86328386762c93f82d98c65c3cb5e5f573dd68" -dependencies = [ - "derive_builder_core", - "syn 1.0.109", -] - -[[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 = "dialoguer" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "658bce805d770f407bc62102fca7c2c64ceef2fbcb2b8bd19d2765ce093980de" -dependencies = [ - "console", - "shell-words", - "tempfile", - "thiserror", - "zeroize", -] - -[[package]] -name = "downcast-rs" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" - -[[package]] -name = "dtoa" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcbb2bf8e87535c23f7a8a321e364ce21462d0ff10cb6407820e8e96dfff6653" - -[[package]] -name = "dtoa-short" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbaceec3c6e4211c79e7b1800fb9680527106beb2f9c51904a3210c03a448c74" -dependencies = [ - "dtoa", -] - -[[package]] -name = "earcutr" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79127ed59a85d7687c409e9978547cffb7dc79675355ed22da6b66fd5f6ead01" -dependencies = [ - "itertools 0.11.0", - "num-traits", -] - -[[package]] -name = "either" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" - -[[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.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "env_logger" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7" -dependencies = [ - "atty", - "humantime", - "log", - "regex", - "termcolor", -] - -[[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.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "euclid" -version = "0.22.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f253bc5c813ca05792837a0ff4b3a580336b224512d48f7eda1d7dd9210787" -dependencies = [ - "num-traits", -] - -[[package]] -name = "event-listener" -version = "2.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" - -[[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" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d9944b8ca13534cdfb2800775f8dd4902ff3fc75a50101466decadfdf322a24" -dependencies = [ - "concurrent-queue", - "parking", - "pin-project-lite", -] - -[[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.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "332f51cb23d20b0de8458b86580878211da09bcd4503cb579c225b3d124cabb3" -dependencies = [ - "event-listener 5.3.0", - "pin-project-lite", -] - -[[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 = "extended" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af9673d8203fcb076b19dfd17e38b3d4ae9f44959416ea532ce72415a6020365" - -[[package]] -name = "fast-srgb8" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd2e7510819d6fbf51a5545c8f922716ecfb14df168a3242f7d33e0239efe6a1" - -[[package]] -name = "fastrand" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984" - -[[package]] -name = "fdeflate" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645" -dependencies = [ - "simd-adler32", -] - -[[package]] -name = "field-offset" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f" -dependencies = [ - "memoffset", - "rustc_version", -] - -[[package]] -name = "file-id" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6584280525fb2059cba3db2c04abf947a1a29a45ddae89f3870f8281704fafc9" -dependencies = [ - "windows-sys 0.48.0", -] - -[[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", - "windows-sys 0.52.0", -] - -[[package]] -name = "flate2" -version = "1.0.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" -dependencies = [ - "crc32fast", - "miniz_oxide", -] - -[[package]] -name = "float-cmp" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" -dependencies = [ - "num-traits", -] - -[[package]] -name = "float_next_after" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bf7cc16383c4b8d58b9905a8509f02926ce3058053c056376248d958c9df1e8" - -[[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 = "fontconfig-parser" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a595cb550439a117696039dfc69830492058211b771a2a165379f2a1a53d84d" -dependencies = [ - "roxmltree", -] - -[[package]] -name = "fontdb" -version = "0.16.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0299020c3ef3f60f526a4f64ab4a3d4ce116b1acbf24cdd22da0068e5d81dc3" -dependencies = [ - "fontconfig-parser", - "log", - "memmap2", - "slotmap", - "tinyvec", - "ttf-parser", -] - -[[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 = "fs_extra" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" - -[[package]] -name = "fsevent-sys" -version = "4.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76ee7a02da4d231650c7cea31349b889be2f45ddb3ef3032d2ec8185f6313fd2" -dependencies = [ - "libc", -] - -[[package]] -name = "futf" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df420e2e84819663797d1ec6544b13c5be84629e7bb00dc960d6917db2987843" -dependencies = [ - "mac", - "new_debug_unreachable", -] - -[[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-lite" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" -dependencies = [ - "fastrand", - "futures-core", - "futures-io", - "parking", - "pin-project-lite", -] - -[[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.58", -] - -[[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 = "fxhash" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" -dependencies = [ - "byteorder", -] - -[[package]] -name = "gdk-pixbuf" -version = "0.19.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6a23f8a0b5090494fd04924662d463f8386cc678dd3915015a838c1a3679b92" -dependencies = [ - "gdk-pixbuf-sys", - "gio", - "glib", - "libc", -] - -[[package]] -name = "gdk-pixbuf-sys" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dcbd04c1b2c4834cc008b4828bc917d062483b88d26effde6342e5622028f96" -dependencies = [ - "gio-sys", - "glib-sys", - "gobject-sys", - "libc", - "system-deps", -] - -[[package]] -name = "gdk4" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9100b25604183f2fd97f55ef087fae96ab4934d7215118a35303e422688e6e4b" -dependencies = [ - "cairo-rs", - "gdk-pixbuf", - "gdk4-sys", - "gio", - "glib", - "libc", - "pango", -] - -[[package]] -name = "gdk4-sys" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0b76874c40bb8d1c7d03a7231e23ac75fa577a456cd53af32ec17ec8f121626" -dependencies = [ - "cairo-sys-rs", - "gdk-pixbuf-sys", - "gio-sys", - "glib-sys", - "gobject-sys", - "libc", - "pango-sys", - "pkg-config", - "system-deps", -] - -[[package]] -name = "geo" -version = "0.28.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f811f663912a69249fa620dcd2a005db7254529da2d8a0b23942e81f47084501" -dependencies = [ - "earcutr", - "float_next_after", - "geo-types", - "geographiclib-rs", - "log", - "num-traits", - "robust", - "rstar", - "spade", -] - -[[package]] -name = "geo-types" -version = "0.7.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ff16065e5720f376fbced200a5ae0f47ace85fd70b7e54269790281353b6d61" -dependencies = [ - "approx", - "num-traits", - "rstar", - "serde", -] - -[[package]] -name = "geographiclib-rs" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6e5ed84f8089c70234b0a8e0aedb6dc733671612ddc0d37c6066052f9781960" -dependencies = [ - "libm", -] - -[[package]] -name = "getrandom" -version = "0.2.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a06fddc2749e0528d2813f95e050e87e52c8cbbae56223b9babf73b3e53b0cc6" -dependencies = [ - "cfg-if", - "libc", - "wasi", -] - -[[package]] -name = "gettext-rs" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e49ea8a8fad198aaa1f9655a2524b64b70eb06b2f3ff37da407566c93054f364" -dependencies = [ - "gettext-sys", - "locale_config", -] - -[[package]] -name = "gettext-sys" -version = "0.21.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c63ce2e00f56a206778276704bbe38564c8695249fdc8f354b4ef71c57c3839d" -dependencies = [ - "cc", - "temp-dir", -] - -[[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.28.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" - -[[package]] -name = "gio" -version = "0.19.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c64947d08d7fbb03bf8ad1f25a8ac6cf4329bc772c9b7e5abe7bf9493c81194f" -dependencies = [ - "futures-channel", - "futures-core", - "futures-io", - "futures-util", - "gio-sys", - "glib", - "libc", - "pin-project-lite", - "smallvec", - "thiserror", -] - -[[package]] -name = "gio-sys" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcf8e1d9219bb294636753d307b030c1e8a032062cba74f493c431a5c8b81ce4" -dependencies = [ - "glib-sys", - "gobject-sys", - "libc", - "system-deps", - "windows-sys 0.52.0", -] - -[[package]] -name = "glib" -version = "0.19.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01e191cc1af1f35b9699213107068cd3fe05d9816275ac118dc785a0dd8faebf" -dependencies = [ - "bitflags 2.5.0", - "futures-channel", - "futures-core", - "futures-executor", - "futures-task", - "futures-util", - "gio-sys", - "glib-macros", - "glib-sys", - "gobject-sys", - "libc", - "memchr", - "smallvec", - "thiserror", -] - -[[package]] -name = "glib-build-tools" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "108f374fff60efd14b0d70d8916e7213aed18d7dd071ba3e9334ed2dac1dc86a" -dependencies = [ - "gio", -] - -[[package]] -name = "glib-macros" -version = "0.19.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9972bb91643d589c889654693a4f1d07697fdcb5d104b5c44fb68649ba1bf68d" -dependencies = [ - "heck 0.5.0", - "proc-macro-crate", - "proc-macro2", - "quote", - "syn 2.0.58", -] - -[[package]] -name = "glib-sys" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630f097773d7c7a0bb3258df4e8157b47dc98bbfa0e60ad9ab56174813feced4" -dependencies = [ - "libc", - "system-deps", -] - -[[package]] -name = "glob" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" - -[[package]] -name = "gobject-sys" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c85e2b1080b9418dd0c58b498da3a5c826030343e0ef07bde6a955d28de54979" -dependencies = [ - "glib-sys", - "libc", - "system-deps", -] - -[[package]] -name = "graphene-rs" -version = "0.19.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99e4d388e96c5f29e2b2f67045d229ddf826d0a8d6d282f94ed3b34452222c91" -dependencies = [ - "glib", - "graphene-sys", - "libc", -] - -[[package]] -name = "graphene-sys" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "236ed66cc9b18d8adf233716f75de803d0bf6fc806f60d14d948974a12e240d0" -dependencies = [ - "glib-sys", - "libc", - "pkg-config", - "system-deps", -] - -[[package]] -name = "gsk4" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c65036fc8f99579e8cb37b12487969b707ab23ec8ab953682ff347cbd15d396e" -dependencies = [ - "cairo-rs", - "gdk4", - "glib", - "graphene-rs", - "gsk4-sys", - "libc", - "pango", -] - -[[package]] -name = "gsk4-sys" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd24c814379f9c3199dc53e52253ee8d0f657eae389ab282c330505289d24738" -dependencies = [ - "cairo-sys-rs", - "gdk4-sys", - "glib-sys", - "gobject-sys", - "graphene-sys", - "libc", - "pango-sys", - "system-deps", -] - -[[package]] -name = "gtk4" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa82753b8c26277e4af1446c70e35b19aad4fb794a7b143859e7eeb9a4025d83" -dependencies = [ - "cairo-rs", - "field-offset", - "futures-channel", - "gdk-pixbuf", - "gdk4", - "gio", - "glib", - "graphene-rs", - "gsk4", - "gtk4-macros", - "gtk4-sys", - "libc", - "pango", -] - -[[package]] -name = "gtk4-macros" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40300bf071d2fcd4c94eacc09e84ec6fe73129d2ceb635cf7e55b026b5443567" -dependencies = [ - "anyhow", - "proc-macro-crate", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "gtk4-sys" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0db1b104138f087ccdc81d2c332de5dd049b89de3d384437cc1093b17cd2da18" -dependencies = [ - "cairo-sys-rs", - "gdk-pixbuf-sys", - "gdk4-sys", - "gio-sys", - "glib-sys", - "gobject-sys", - "graphene-sys", - "gsk4-sys", - "libc", - "pango-sys", - "system-deps", -] - -[[package]] -name = "half" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5eceaaeec696539ddaf7b333340f1af35a5aa87ae3e4f3ead0532f72affab2e" -dependencies = [ - "cfg-if", - "crunchy", -] - -[[package]] -name = "hash32" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47d60b12902ba28e2730cd37e95b8c9223af2808df9e902d4df49588d1470606" -dependencies = [ - "byteorder", -] - -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" - -[[package]] -name = "hashbrown" -version = "0.14.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" -dependencies = [ - "ahash", - "allocator-api2", -] - -[[package]] -name = "heapless" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bfb9eb618601c89945a70e254898da93b13be0388091d42117462b265bb3fad" -dependencies = [ - "hash32", - "stable_deref_trait", -] - -[[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.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - -[[package]] -name = "hermit-abi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" - -[[package]] -name = "home" -version = "0.5.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" -dependencies = [ - "windows-sys 0.52.0", -] - -[[package]] -name = "humantime" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" - -[[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 0.52.0", -] - -[[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 = "idna" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "ijson" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b96214564d1f12875bd9661b183d8494dd10e373cb693629536fe2f3125e254b" -dependencies = [ - "dashmap", - "lazy_static", - "serde", - "serde_json", -] - -[[package]] -name = "image" -version = "0.24.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d" -dependencies = [ - "bytemuck", - "byteorder", - "color_quant", - "exr", - "gif", - "jpeg-decoder", - "num-traits", - "png", - "qoi", - "tiff", -] - -[[package]] -name = "imagesize" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "029d73f573d8e8d63e6d5020011d3255b28c3ba85d6cf870a07184ed23de9284" - -[[package]] -name = "indexmap" -version = "1.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" -dependencies = [ - "autocfg", - "hashbrown 0.12.3", - "serde", -] - -[[package]] -name = "indexmap" -version = "2.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" -dependencies = [ - "equivalent", - "hashbrown 0.14.3", -] - -[[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", - "unicode-width", -] - -[[package]] -name = "indoc" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa799dd5ed20a7e349f3b4639aa80d74549c81716d9ec4f994c9b5815598306" - -[[package]] -name = "ink-stroke-modeler-rs" -version = "0.1.0" -source = "git+https://github.com/flxzt/ink-stroke-modeler-rs?rev=b67f11b2c174a9ae4a54c22313cf8c218ff0946a#b67f11b2c174a9ae4a54c22313cf8c218ff0946a" -dependencies = [ - "autocxx", - "autocxx-build", - "cmake", - "cxx", - "miette", - "path-slash", - "thiserror", -] - -[[package]] -name = "inotify" -version = "0.9.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff" -dependencies = [ - "bitflags 1.3.2", - "inotify-sys", - "libc", -] - -[[package]] -name = "inotify-sys" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb" -dependencies = [ - "libc", -] - -[[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if", -] - -[[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-terminal" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" -dependencies = [ - "hermit-abi 0.3.9", - "libc", - "windows-sys 0.52.0", -] - -[[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 = "is_ci" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7655c9839580ee829dfacba1d1278c2b7883e50a277ff7541299489d6bdfdc45" - -[[package]] -name = "itertools" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b" -dependencies = [ - "either", -] - -[[package]] -name = "itertools" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" -dependencies = [ - "either", -] - -[[package]] -name = "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 = "itoa" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" - -[[package]] -name = "jni" -version = "0.21.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97" -dependencies = [ - "cesu8", - "cfg-if", - "combine", - "jni-sys", - "log", - "thiserror", - "walkdir", - "windows-sys 0.45.0", -] - -[[package]] -name = "jni-sys" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" - -[[package]] -name = "jobserver" -version = "0.1.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab46a6e9526ddef3ae7f787c06f0f2600639ba80ea3eade3d8e670a2230f51d6" -dependencies = [ - "libc", -] - -[[package]] -name = "jpeg-decoder" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" -dependencies = [ - "rayon", -] - -[[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 = "kqueue" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7447f1ca1b7b563588a205fe93dea8df60fd981423a768bc1c0ded35ed147d0c" -dependencies = [ - "kqueue-sys", - "libc", -] - -[[package]] -name = "kqueue-sys" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b" -dependencies = [ - "bitflags 1.3.2", - "libc", -] - -[[package]] -name = "kurbo" -version = "0.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1618d4ebd923e97d67e7cd363d80aef35fe961005cbbbb3d2dad8bdd1bc63440" -dependencies = [ - "arrayvec", - "smallvec", -] - -[[package]] -name = "kurbo" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e5aa9f0f96a938266bdb12928a67169e8d22c6a786fda8ed984b85e6ba93c3c" -dependencies = [ - "arrayvec", - "smallvec", -] - -[[package]] -name = "language-tags" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4345964bb142484797b161f473a503a434de77149dd8c7427788c6e13379388" - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "lazycell" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" - -[[package]] -name = "lebe" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" - -[[package]] -name = "libadwaita" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91b4990248b9e1ec5e72094a2ccaea70ec3809f88f6fd52192f2af306b87c5d9" -dependencies = [ - "gdk-pixbuf", - "gdk4", - "gio", - "glib", - "gtk4", - "libadwaita-sys", - "libc", - "pango", -] - -[[package]] -name = "libadwaita-sys" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23a748e4e92be1265cd9e93d569c0b5dfc7814107985aa6743d670ab281ea1a8" -dependencies = [ - "gdk4-sys", - "gio-sys", - "glib-sys", - "gobject-sys", - "gtk4-sys", - "libc", - "pango-sys", - "system-deps", -] - -[[package]] -name = "libc" -version = "0.2.153" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" - -[[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.4", -] - -[[package]] -name = "libm" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" - -[[package]] -name = "librsvg" -version = "2.58.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de005d9589235493d0e2b62d055c0d8e368db4fb33e746dafc9400fb67b9c817" -dependencies = [ - "cairo-rs", - "cast", - "cssparser", - "data-url", - "encoding_rs", - "float-cmp", - "gio", - "glib", - "image", - "itertools 0.12.1", - "language-tags", - "libc", - "locale_config", - "markup5ever", - "nalgebra", - "num-traits", - "pango", - "pangocairo", - "rayon", - "rctree", - "regex", - "rgb", - "selectors", - "string_cache", - "system-deps", - "tinyvec", - "url", - "xml5ever", -] - -[[package]] -name = "link-cplusplus" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d240c6f7e1ba3a28b0249f774e6a9dd0175054b52dfbb61b16eb8505c3785c9" -dependencies = [ - "cc", -] - -[[package]] -name = "linux-raw-sys" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" - -[[package]] -name = "locale_config" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d2c35b16f4483f6c26f0e4e9550717a2f6575bcd6f12a53ff0c490a94a6934" -dependencies = [ - "lazy_static", - "objc", - "objc-foundation", - "regex", - "winapi", -] - -[[package]] -name = "lock_api" -version = "0.4.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" -dependencies = [ - "autocfg", - "scopeguard", -] - -[[package]] -name = "log" -version = "0.4.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" - -[[package]] -name = "mac" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4" - -[[package]] -name = "mach2" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b955cdeb2a02b9117f121ce63aa52d08ade45de53e48fe6a38b39c10f6f709" -dependencies = [ - "libc", -] - -[[package]] -name = "malloc_buf" -version = "0.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" -dependencies = [ - "libc", -] - -[[package]] -name = "markup5ever" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a2629bb1404f3d34c2e921f21fd34ba00b206124c81f65c50b43b6aaefeb016" -dependencies = [ - "log", - "phf 0.10.1", - "phf_codegen", - "string_cache", - "string_cache_codegen", - "tendril", -] - -[[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 = "matches" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" - -[[package]] -name = "matrixmultiply" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7574c1cf36da4798ab73da5b215bbf444f50718207754cb522201d78d1cd0ff2" -dependencies = [ - "autocfg", - "rawpointer", -] - -[[package]] -name = "memchr" -version = "2.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" - -[[package]] -name = "memmap2" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322" -dependencies = [ - "libc", -] - -[[package]] -name = "memoffset" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" -dependencies = [ - "autocfg", -] - -[[package]] -name = "miette" -version = "5.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59bb584eaeeab6bd0226ccf3509a69d7936d148cf3d036ad350abe35e8c6856e" -dependencies = [ - "backtrace", - "backtrace-ext", - "is-terminal", - "miette-derive", - "once_cell", - "owo-colors", - "supports-color", - "supports-hyperlinks", - "supports-unicode", - "terminal_size", - "textwrap", - "thiserror", - "unicode-width", -] - -[[package]] -name = "miette-derive" -version = "5.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49e7bc1560b95a3c4a25d03de42fe76ca718ab92d1a22a55b9b4cf67b3ae635c" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.58", -] - -[[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.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" -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 = "moveit" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87d7335204cb6ef7bd647fa6db0be3e4d7aa25b5823a7aa030027ddf512cefba" -dependencies = [ - "cxx", -] - -[[package]] -name = "nalgebra" -version = "0.32.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ea4908d4f23254adda3daa60ffef0f1ac7b8c3e9a864cf3cc154b251908a2ef" -dependencies = [ - "approx", - "matrixmultiply", - "nalgebra-macros", - "num-complex", - "num-rational", - "num-traits", - "serde", - "simba", - "typenum", -] - -[[package]] -name = "nalgebra-macros" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91761aed67d03ad966ef783ae962ef9bbaca728d2dd7ceb7939ec110fffad998" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "ndk" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2076a31b7010b17a38c01907c45b945e8f11495ee4dd588309718901b1f7a5b7" -dependencies = [ - "bitflags 2.5.0", - "jni-sys", - "log", - "ndk-sys", - "num_enum", - "thiserror", -] - -[[package]] -name = "ndk-context" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" - -[[package]] -name = "ndk-sys" -version = "0.5.0+25.2.9519653" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c196769dd60fd4f363e11d948139556a344e79d451aeb2fa2fd040738ef7691" -dependencies = [ - "jni-sys", -] - -[[package]] -name = "new_debug_unreachable" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" - -[[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 = "notify" -version = "6.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d" -dependencies = [ - "bitflags 2.5.0", - "crossbeam-channel", - "filetime", - "fsevent-sys", - "inotify", - "kqueue", - "libc", - "log", - "mio", - "walkdir", - "windows-sys 0.48.0", -] - -[[package]] -name = "notify-debouncer-full" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f5dab59c348b9b50cf7f261960a20e389feb2713636399cd9082cd4b536154" -dependencies = [ - "crossbeam-channel", - "file-id", - "log", - "notify", - "parking_lot", - "walkdir", -] - -[[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-complex" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23c6602fda94a57c990fe0df199a035d83576b496aa29f4e634a8ac6004e68a6" -dependencies = [ - "num-traits", - "serde", -] - -[[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.58", -] - -[[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.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-traits" -version = "0.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" -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 0.3.9", - "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.58", -] - -[[package]] -name = "number_prefix" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" - -[[package]] -name = "numeric-sort" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5180ed575d2ae6100dc63813e3810aba273c291608cf019aa58f76784ecc331b" - -[[package]] -name = "objc" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" -dependencies = [ - "malloc_buf", -] - -[[package]] -name = "objc-foundation" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9" -dependencies = [ - "block", - "objc", - "objc_id", -] - -[[package]] -name = "objc_id" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b" -dependencies = [ - "objc", -] - -[[package]] -name = "object" -version = "0.32.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" -dependencies = [ - "memchr", -] - -[[package]] -name = "oboe" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8b61bebd49e5d43f5f8cc7ee2891c16e0f41ec7954d36bcb6c14c5e0de867fb" -dependencies = [ - "jni", - "ndk", - "ndk-context", - "num-derive", - "num-traits", - "oboe-sys", -] - -[[package]] -name = "oboe-sys" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8bb09a4a2b1d668170cfe0a7d5bc103f8999fb316c98099b6a9939c9f2e79d" -dependencies = [ - "cc", -] - -[[package]] -name = "once_cell" -version = "1.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" - -[[package]] -name = "open" -version = "5.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "449f0ff855d85ddbf1edd5b646d65249ead3f5e422aaa86b7d2d0b049b103e32" -dependencies = [ - "is-wsl", - "libc", - "pathdiff", -] - -[[package]] -name = "overload" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" - -[[package]] -name = "owo-colors" -version = "3.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" - -[[package]] -name = "palette" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebfc23a4b76642983d57e4ad00bb4504eb30a8ce3c70f4aee1f725610e36d97a" -dependencies = [ - "approx", - "fast-srgb8", - "palette_derive", - "phf 0.11.2", -] - -[[package]] -name = "palette_derive" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8890702dbec0bad9116041ae586f84805b13eecd1d8b1df27c29998a9969d6d" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.58", -] - -[[package]] -name = "pango" -version = "0.19.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1264d13deb823cc652f26cfe59afb1ec4b9db2a5bd27c41b738c879cc1bfaa1" -dependencies = [ - "gio", - "glib", - "libc", - "pango-sys", -] - -[[package]] -name = "pango-sys" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f52ef6a881c19fbfe3b1484df5cad411acaaba29dbec843941c3110d19f340ea" -dependencies = [ - "glib-sys", - "gobject-sys", - "libc", - "system-deps", -] - -[[package]] -name = "pangocairo" -version = "0.19.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6620c77967c62c7a84c6ca15ab855e8eecb248beb8ee43bc0eeaadd39123f687" -dependencies = [ - "cairo-rs", - "glib", - "libc", - "pango", - "pangocairo-sys", -] - -[[package]] -name = "pangocairo-sys" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01bd0597ae45983f9e8b7f73afc42238426cd3fbb44a9cf14fd881a4ae08f1e4" -dependencies = [ - "cairo-sys-rs", - "glib-sys", - "libc", - "pango-sys", - "system-deps", -] - -[[package]] -name = "parking" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" - -[[package]] -name = "parking_lot" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" -dependencies = [ - "lock_api", - "parking_lot_core", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall", - "smallvec", - "windows-targets 0.48.5", -] - -[[package]] -name = "parry2d-f64" -version = "0.13.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5565e2f28bad470868b5e5c146fd0e2716345b67d8b9f27e0fc147a1dd4790b5" -dependencies = [ - "approx", - "arrayvec", - "bitflags 1.3.2", - "downcast-rs", - "either", - "nalgebra", - "num-derive", - "num-traits", - "rustc-hash", - "serde", - "simba", - "slab", - "smallvec", - "spade", -] - -[[package]] -name = "paste" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" - -[[package]] -name = "path-absolutize" -version = "3.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4af381fe79fa195b4909485d99f73a80792331df0625188e707854f0b3383f5" -dependencies = [ - "path-dedot", -] - -[[package]] -name = "path-dedot" -version = "3.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07ba0ad7e047712414213ff67533e6dd477af0a4e1d14fb52343e53d30ea9397" -dependencies = [ - "once_cell", -] - -[[package]] -name = "path-slash" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e91099d4268b0e11973f036e885d652fb0b21fedcf69738c627f94db6a44f42" - -[[package]] -name = "pathdiff" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" - -[[package]] -name = "peeking_take_while" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" - -[[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.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259" -dependencies = [ - "phf_shared 0.10.0", -] - -[[package]] -name = "phf" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" -dependencies = [ - "phf_macros", - "phf_shared 0.11.2", -] - -[[package]] -name = "phf_codegen" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb1c3a8bc4dd4e5cfce29b44ffc14bedd2ee294559a294e2a4d4c9e9a6a13cd" -dependencies = [ - "phf_generator 0.10.0", - "phf_shared 0.10.0", -] - -[[package]] -name = "phf_generator" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6" -dependencies = [ - "phf_shared 0.10.0", - "rand", -] - -[[package]] -name = "phf_generator" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" -dependencies = [ - "phf_shared 0.11.2", - "rand", -] - -[[package]] -name = "phf_macros" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" -dependencies = [ - "phf_generator 0.11.2", - "phf_shared 0.11.2", - "proc-macro2", - "quote", - "syn 2.0.58", -] - -[[package]] -name = "phf_shared" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" -dependencies = [ - "siphasher 0.3.11", -] - -[[package]] -name = "phf_shared" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" -dependencies = [ - "siphasher 0.3.11", -] - -[[package]] -name = "pico-args" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315" - -[[package]] -name = "piet" -version = "0.6.2" -source = "git+https://github.com/linebender/piet?rev=02eb5f0152e893626c43980bf37eeb0ccb1acb46#02eb5f0152e893626c43980bf37eeb0ccb1acb46" -dependencies = [ - "kurbo 0.10.4", - "unic-bidi", -] - -[[package]] -name = "piet-cairo" -version = "0.6.2" -source = "git+https://github.com/linebender/piet?rev=02eb5f0152e893626c43980bf37eeb0ccb1acb46#02eb5f0152e893626c43980bf37eeb0ccb1acb46" -dependencies = [ - "cairo-rs", - "pango", - "pangocairo", - "piet", - "unicode-segmentation", - "xi-unicode", -] - -[[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 = "piper" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" -dependencies = [ - "atomic-waker", - "fastrand", - "futures-io", -] - -[[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 = "points_on_curve" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbd55aaa619ef3e710ba6515663cb9afdf54ab4b09b2b3d069622f3a71736295" -dependencies = [ - "euclid", - "num-traits", -] - -[[package]] -name = "polling" -version = "3.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0c976a60b2d7e99d6f229e414670a9b85d13ac305cc6d1e9c134de58c5aaaf6" -dependencies = [ - "cfg-if", - "concurrent-queue", - "hermit-abi 0.3.9", - "pin-project-lite", - "rustix", - "tracing", - "windows-sys 0.52.0", -] - -[[package]] -name = "poppler-rs" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9421853a6cc8dfaea2e31bd751fb037abdc3a727f04d0eb10fcf7061f6eff562" -dependencies = [ - "cairo-rs", - "gio", - "glib", - "libc", - "poppler-sys-rs", -] - -[[package]] -name = "poppler-sys-rs" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10f6737da38a7bb0126931c4a7b23b7bea517410bd48676f18af6b38c5f88d51" -dependencies = [ - "cairo-sys-rs", - "gio-sys", - "glib-sys", - "gobject-sys", - "libc", - "system-deps", -] - -[[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 = "precomputed-hash" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" - -[[package]] -name = "prettyplease" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d3928fb5db768cb86f891ff014f0144589297e3c6a1aba6ed7cecfdace270c7" -dependencies = [ - "proc-macro2", - "syn 2.0.58", -] - -[[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.79" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "qoi" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f6d64c71eb498fe9eae14ce4ec935c555749aef511cca85b5568910d6e48001" -dependencies = [ - "bytemuck", -] - -[[package]] -name = "quote" -version = "1.0.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" -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 = "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_pcg" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59cad018caf63deb318e5a4586d99a24424a364f40f1e5778c29aca23f4fc73e" -dependencies = [ - "rand_core", -] - -[[package]] -name = "rawpointer" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3" - -[[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-core" -version = "1.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" -dependencies = [ - "crossbeam-deque", - "crossbeam-utils", -] - -[[package]] -name = "rctree" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e03e7866abec1101869ffa8e2c8355c4c2419d0214ece0cc3e428e5b94dea6e9" - -[[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 = "regex" -version = "1.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata 0.4.6", - "regex-syntax 0.8.3", -] - -[[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.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax 0.8.3", -] - -[[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.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" - -[[package]] -name = "rgb" -version = "0.8.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05aaa8004b64fd573fc9d002f4e632d51ad4f026c2b5ba95fcb6c2f32c2c47d8" -dependencies = [ - "bytemuck", -] - -[[package]] -name = "rnote" -version = "0.10.2" -dependencies = [ - "anyhow", - "async-fs", - "base64", - "cairo-rs", - "fs_extra", - "futures", - "gettext-rs", - "glib-build-tools", - "gtk4", - "ijson", - "image", - "itertools 0.12.1", - "kurbo 0.10.4", - "libadwaita", - "nalgebra", - "notify-debouncer-full", - "num-derive", - "num-traits", - "numeric-sort", - "once_cell", - "open", - "parry2d-f64", - "path-absolutize", - "piet", - "piet-cairo", - "poppler-rs", - "rand", - "rand_distr", - "rand_pcg", - "rayon", - "regex", - "rnote-compose", - "rnote-engine", - "rough_piet", - "roughr", - "serde", - "serde_json", - "svg", - "thiserror", - "tracing", - "tracing-subscriber", - "unicode-segmentation", - "url", - "winresource", -] - -[[package]] -name = "rnote-cli" -version = "0.10.2" -dependencies = [ - "anyhow", - "atty", - "clap", - "dialoguer", - "indicatif", - "nalgebra", - "open", - "parry2d-f64", - "rnote-compose", - "rnote-engine", - "smol", - "tracing", - "tracing-subscriber", -] - -[[package]] -name = "rnote-compose" -version = "0.10.2" -dependencies = [ - "anyhow", - "approx", - "base64", - "clap", - "ink-stroke-modeler-rs", - "kurbo 0.10.4", - "nalgebra", - "num-derive", - "num-traits", - "once_cell", - "palette", - "parry2d-f64", - "piet", - "piet-cairo", - "rand", - "rand_distr", - "rand_pcg", - "regex", - "rough_piet", - "roughr", - "serde", - "svg", - "tracing", -] - -[[package]] -name = "rnote-engine" -version = "0.10.2" -dependencies = [ - "anyhow", - "approx", - "base64", - "cairo-rs", - "chrono", - "clap", - "flate2", - "futures", - "geo", - "gio", - "glib", - "gtk4", - "ijson", - "image", - "itertools 0.12.1", - "kurbo 0.10.4", - "librsvg", - "nalgebra", - "num-derive", - "num-traits", - "once_cell", - "parry2d-f64", - "piet", - "piet-cairo", - "poppler-rs", - "rand", - "rand_distr", - "rand_pcg", - "rayon", - "regex", - "rnote-compose", - "rodio", - "rough_piet", - "roughr", - "roxmltree", - "rstar", - "semver", - "serde", - "serde_json", - "slotmap", - "svg", - "thiserror", - "tracing", - "unicode-segmentation", - "usvg", - "xmlwriter", -] - -[[package]] -name = "robust" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbf4a6aa5f6d6888f39e980649f3ad6b666acdce1d78e95b8a2cb076e687ae30" - -[[package]] -name = "rodio" -version = "0.17.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b1bb7b48ee48471f55da122c0044fcc7600cfcc85db88240b89cb832935e611" -dependencies = [ - "cpal", - "symphonia", -] - -[[package]] -name = "rough_piet" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfe58846983e22ea4e24f4340733df25c4788f74333d6afb92fa0611b0616557" -dependencies = [ - "euclid", - "num-traits", - "palette", - "piet", - "roughr", -] - -[[package]] -name = "roughr" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d622b5059d31ffa6aae33cd2e58b2e7f4c44c607af50731bb36ff4e39109cac" -dependencies = [ - "derive_builder", - "euclid", - "num-traits", - "palette", - "points_on_curve", - "rand", - "svg_path_ops", - "svgtypes 0.8.2", -] - -[[package]] -name = "roxmltree" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cd14fd5e3b777a7422cca79358c57a8f6e3a703d9ac187448d0daf220c2407f" - -[[package]] -name = "rstar" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "133315eb94c7b1e8d0cb097e5a710d850263372fd028fff18969de708afc7008" -dependencies = [ - "heapless", - "num-traits", - "smallvec", -] - -[[package]] -name = "rustc-demangle" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" - -[[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.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89" -dependencies = [ - "bitflags 2.5.0", - "errno", - "libc", - "linux-raw-sys", - "windows-sys 0.52.0", -] - -[[package]] -name = "rustversion" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" - -[[package]] -name = "rustybuzz" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88117946aa1bfb53c2ae0643ceac6506337f44887f8c9fbfb43587b1cc52ba49" -dependencies = [ - "bitflags 2.5.0", - "bytemuck", - "smallvec", - "ttf-parser", - "unicode-bidi-mirroring", - "unicode-ccc", - "unicode-properties", - "unicode-script", -] - -[[package]] -name = "ryu" -version = "1.0.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" - -[[package]] -name = "safe_arch" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f398075ce1e6a179b46f51bd88d0598b92b00d3551f1a2d4ac49e771b56ac354" -dependencies = [ - "bytemuck", -] - -[[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 = "scopeguard" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" - -[[package]] -name = "selectors" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eb30575f3638fc8f6815f448d50cb1a2e255b0897985c8c59f4d37b72a07b06" -dependencies = [ - "bitflags 2.5.0", - "cssparser", - "derive_more", - "fxhash", - "log", - "new_debug_unreachable", - "phf 0.10.1", - "phf_codegen", - "precomputed-hash", - "servo_arc", - "smallvec", -] - -[[package]] -name = "semver" -version = "1.0.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" -dependencies = [ - "serde", -] - -[[package]] -name = "serde" -version = "1.0.197" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.197" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.58", -] - -[[package]] -name = "serde_json" -version = "1.0.115" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd" -dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "serde_spanned" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" -dependencies = [ - "serde", -] - -[[package]] -name = "servo_arc" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d036d71a959e00c77a63538b90a6c2390969f9772b096ea837205c6bd0491a44" -dependencies = [ - "stable_deref_trait", -] - -[[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 = "shell-words" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde" - -[[package]] -name = "shlex" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" - -[[package]] -name = "signal-hook-registry" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" -dependencies = [ - "libc", -] - -[[package]] -name = "simba" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "061507c94fc6ab4ba1c9a0305018408e312e17c041eb63bef8aa726fa33aceae" -dependencies = [ - "approx", - "num-complex", - "num-traits", - "paste", - "wide", -] - -[[package]] -name = "simd-adler32" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" - -[[package]] -name = "simplecss" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a11be7c62927d9427e9f40f3444d5499d868648e2edbc4e2116de69e7ec0e89d" -dependencies = [ - "log", -] - -[[package]] -name = "siphasher" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" - -[[package]] -name = "siphasher" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d" - -[[package]] -name = "slab" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" -dependencies = [ - "autocfg", -] - -[[package]] -name = "slotmap" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbff4acf519f630b3a3ddcfaea6c06b42174d9a44bc70c620e9ed1649d58b82a" -dependencies = [ - "serde", - "version_check", -] - -[[package]] -name = "smallvec" -version = "1.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" - -[[package]] -name = "smawk" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7c388c1b5e93756d0c740965c41e8822f866621d41acbdf6336a6a168f8840c" - -[[package]] -name = "smol" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e635339259e51ef85ac7aa29a1cd991b957047507288697a690e80ab97d07cad" -dependencies = [ - "async-channel", - "async-executor", - "async-fs", - "async-io", - "async-lock 3.3.0", - "async-net", - "async-process", - "blocking", - "futures-lite", -] - -[[package]] -name = "spade" -version = "2.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61addf9117b11d1f5b4bf6fe94242ba25f59d2d4b2080544b771bd647024fd00" -dependencies = [ - "hashbrown 0.14.3", - "num-traits", - "robust", - "smallvec", -] - -[[package]] -name = "spin" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" -dependencies = [ - "lock_api", -] - -[[package]] -name = "stable_deref_trait" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" - -[[package]] -name = "strict-num" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6637bab7722d379c8b41ba849228d680cc12d0a45ba1fa2b48f2a30577a06731" -dependencies = [ - "float-cmp", -] - -[[package]] -name = "string_cache" -version = "0.8.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b" -dependencies = [ - "new_debug_unreachable", - "once_cell", - "parking_lot", - "phf_shared 0.10.0", - "precomputed-hash", - "serde", -] - -[[package]] -name = "string_cache_codegen" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bb30289b722be4ff74a408c3cc27edeaad656e06cb1fe8fa9231fa59c728988" -dependencies = [ - "phf_generator 0.10.0", - "phf_shared 0.10.0", - "proc-macro2", - "quote", -] - -[[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_macros" -version = "0.24.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" -dependencies = [ - "heck 0.4.1", - "proc-macro2", - "quote", - "rustversion", - "syn 1.0.109", -] - -[[package]] -name = "supports-color" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6398cde53adc3c4557306a96ce67b302968513830a77a95b2b17305d9719a89" -dependencies = [ - "is-terminal", - "is_ci", -] - -[[package]] -name = "supports-hyperlinks" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f84231692eb0d4d41e4cdd0cabfdd2e6cd9e255e65f80c9aa7c98dd502b4233d" -dependencies = [ - "is-terminal", -] - -[[package]] -name = "supports-unicode" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f850c19edd184a205e883199a261ed44471c81e39bd95b1357f5febbef00e77a" -dependencies = [ - "is-terminal", -] - -[[package]] -name = "svg" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "583e1c5c326fd6fede8797006de3b95ad6bcd60a592952952c5ba7ddd7e84c83" - -[[package]] -name = "svg_path_ops" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9f934257a2a95c29314aceebc68a34b201e9c1fc875fc1c5d63e96895ace8cd" -dependencies = [ - "svgtypes 0.8.2", -] - -[[package]] -name = "svgtypes" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22975e8a2bac6a76bb54f898a6b18764633b00e780330f0b689f65afb3975564" -dependencies = [ - "siphasher 0.3.11", -] - -[[package]] -name = "svgtypes" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d97ca9a891c9c70da8139ac9d8e8ea36a210fa21bb50eccd75d4a9561c83e87f" -dependencies = [ - "kurbo 0.11.0", - "siphasher 1.0.1", -] - -[[package]] -name = "symphonia" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "815c942ae7ee74737bb00f965fa5b5a2ac2ce7b6c01c0cc169bbeaf7abd5f5a9" -dependencies = [ - "lazy_static", - "symphonia-codec-adpcm", - "symphonia-codec-pcm", - "symphonia-core", - "symphonia-format-riff", - "symphonia-metadata", -] - -[[package]] -name = "symphonia-codec-adpcm" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c94e1feac3327cd616e973d5be69ad36b3945f16b06f19c6773fc3ac0b426a0f" -dependencies = [ - "log", - "symphonia-core", -] - -[[package]] -name = "symphonia-codec-pcm" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f395a67057c2ebc5e84d7bb1be71cce1a7ba99f64e0f0f0e303a03f79116f89b" -dependencies = [ - "log", - "symphonia-core", -] - -[[package]] -name = "symphonia-core" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "798306779e3dc7d5231bd5691f5a813496dc79d3f56bf82e25789f2094e022c3" -dependencies = [ - "arrayvec", - "bitflags 1.3.2", - "bytemuck", - "lazy_static", - "log", -] - -[[package]] -name = "symphonia-format-riff" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05f7be232f962f937f4b7115cbe62c330929345434c834359425e043bfd15f50" -dependencies = [ - "extended", - "log", - "symphonia-core", - "symphonia-metadata", -] - -[[package]] -name = "symphonia-metadata" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc622b9841a10089c5b18e99eb904f4341615d5aa55bbf4eedde1be721a4023c" -dependencies = [ - "encoding_rs", - "lazy_static", - "log", - "symphonia-core", -] - -[[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.58" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44cfb93f38070beee36b3fef7d4f5a16f27751d94b187b666a5cc5e9b0d30687" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[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 0.8.12", - "version-compare", -] - -[[package]] -name = "target-lexicon" -version = "0.12.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" - -[[package]] -name = "temp-dir" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f227968ec00f0e5322f9b8173c7a0cbcff6181a0a5b28e9892491c286277231" - -[[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 = "tendril" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d24a120c5fc464a3458240ee02c299ebcb9d67b5249c8848b09d639dca8d7bb0" -dependencies = [ - "futf", - "mac", - "utf-8", -] - -[[package]] -name = "termcolor" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "terminal_size" -version = "0.1.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "633c1a546cee861a1a6d0dc69ebeca693bf4296661ba7852b9d21d159e0506df" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "textwrap" -version = "0.15.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7b3e525a49ec206798b40326a44121291b530c963cfb01018f63e135bac543d" -dependencies = [ - "smawk", - "unicode-linebreak", - "unicode-width", -] - -[[package]] -name = "thiserror" -version = "1.0.58" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.58" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.58", -] - -[[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 = "tiny-skia-path" -version = "0.11.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c9e7fc0c2e86a30b117d0462aa261b72b7a99b7ebd7deb3a14ceda95c5bdc93" -dependencies = [ - "arrayref", - "bytemuck", - "strict-num", -] - -[[package]] -name = "tinyvec" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" -dependencies = [ - "tinyvec_macros", -] - -[[package]] -name = "tinyvec_macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" - -[[package]] -name = "toml" -version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" -dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit 0.19.15", -] - -[[package]] -name = "toml" -version = "0.8.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3" -dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit 0.22.9", -] - -[[package]] -name = "toml_datetime" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" -dependencies = [ - "serde", -] - -[[package]] -name = "toml_edit" -version = "0.19.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" -dependencies = [ - "indexmap 2.2.6", - "serde", - "serde_spanned", - "toml_datetime", - "winnow 0.5.40", -] - -[[package]] -name = "toml_edit" -version = "0.21.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" -dependencies = [ - "indexmap 2.2.6", - "toml_datetime", - "winnow 0.5.40", -] - -[[package]] -name = "toml_edit" -version = "0.22.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e40bb779c5187258fd7aad0eb68cb8706a0a81fa712fbea808ab43c4b8374c4" -dependencies = [ - "indexmap 2.2.6", - "serde", - "serde_spanned", - "toml_datetime", - "winnow 0.6.5", -] - -[[package]] -name = "tracing" -version = "0.1.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" -dependencies = [ - "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.58", -] - -[[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 = "ttf-parser" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17f77d76d837a7830fe1d4f12b7b4ba4192c1888001c7164257e4bc6d21d96b4" - -[[package]] -name = "typenum" -version = "1.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" - -[[package]] -name = "unic-bidi" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1356b759fb6a82050666f11dce4b6fe3571781f1449f3ef78074e408d468ec09" -dependencies = [ - "matches", - "unic-ucd-bidi", -] - -[[package]] -name = "unic-char-property" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8c57a407d9b6fa02b4795eb81c5b6652060a15a7903ea981f3d723e6c0be221" -dependencies = [ - "unic-char-range", -] - -[[package]] -name = "unic-char-range" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0398022d5f700414f6b899e10b8348231abf9173fa93144cbc1a43b9793c1fbc" - -[[package]] -name = "unic-common" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80d7ff825a6a654ee85a63e80f92f054f904f21e7d12da4e22f9834a4aaa35bc" - -[[package]] -name = "unic-ucd-bidi" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1d568b51222484e1f8209ce48caa6b430bf352962b877d592c29ab31fb53d8c" -dependencies = [ - "unic-char-property", - "unic-char-range", - "unic-ucd-version", -] - -[[package]] -name = "unic-ucd-version" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96bd2f2237fe450fcd0a1d2f5f4e91711124f7857ba2e964247776ebeeb7b0c4" -dependencies = [ - "unic-common", -] - -[[package]] -name = "unicode-bidi" -version = "0.3.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" - -[[package]] -name = "unicode-bidi-mirroring" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23cb788ffebc92c5948d0e997106233eeb1d8b9512f93f41651f52b6c5f5af86" - -[[package]] -name = "unicode-ccc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1df77b101bcc4ea3d78dafc5ad7e4f58ceffe0b2b16bf446aeb50b6cb4157656" - -[[package]] -name = "unicode-ident" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" - -[[package]] -name = "unicode-linebreak" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f" - -[[package]] -name = "unicode-normalization" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "unicode-properties" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4259d9d4425d9f0661581b804cb85fe66a4c631cadd8f490d1c13a35d5d9291" - -[[package]] -name = "unicode-script" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad8d71f5726e5f285a935e9fe8edfd53f0491eb6e9a5774097fdabee7cd8c9cd" - -[[package]] -name = "unicode-segmentation" -version = "1.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" - -[[package]] -name = "unicode-vo" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1d386ff53b415b7fe27b50bb44679e2cc4660272694b7b6f3326d8480823a94" - -[[package]] -name = "unicode-width" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" - -[[package]] -name = "url" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" -dependencies = [ - "form_urlencoded", - "idna", - "percent-encoding", -] - -[[package]] -name = "usvg" -version = "0.41.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c704361d822337cfc00387672c7b59eaa72a1f0744f62b2a68aa228a0c6927d" -dependencies = [ - "base64", - "data-url", - "flate2", - "fontdb", - "imagesize", - "kurbo 0.11.0", - "log", - "pico-args", - "roxmltree", - "rustybuzz", - "simplecss", - "siphasher 1.0.1", - "strict-num", - "svgtypes 0.15.0", - "tiny-skia-path", - "unicode-bidi", - "unicode-script", - "unicode-vo", - "xmlwriter", -] - -[[package]] -name = "utf-8" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" - -[[package]] -name = "utf8parse" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" - -[[package]] -name = "valuable" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" - -[[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 = "walkdir" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" -dependencies = [ - "same-file", - "winapi-util", -] - -[[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.58", - "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.58", - "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 = "weezl" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" - -[[package]] -name = "which" -version = "4.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" -dependencies = [ - "either", - "home", - "once_cell", - "rustix", -] - -[[package]] -name = "wide" -version = "0.7.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89beec544f246e679fc25490e3f8e08003bc4bf612068f325120dad4cea02c1c" -dependencies = [ - "bytemuck", - "safe_arch", -] - -[[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.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" -dependencies = [ - "winapi", -] - -[[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" -version = "0.54.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9252e5725dbed82865af151df558e754e4a3c2c30818359eb17465f1346a1b49" -dependencies = [ - "windows-core 0.54.0", - "windows-targets 0.52.4", -] - -[[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.4", -] - -[[package]] -name = "windows-core" -version = "0.54.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12661b9c89351d684a50a8a643ce5f608e20243b9fb84687800163429f161d65" -dependencies = [ - "windows-result", - "windows-targets 0.52.4", -] - -[[package]] -name = "windows-result" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd19df78e5168dfb0aedc343d1d1b8d422ab2db6756d2dc3fef75035402a3f64" -dependencies = [ - "windows-targets 0.52.4", -] - -[[package]] -name = "windows-sys" -version = "0.45.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" -dependencies = [ - "windows-targets 0.42.2", -] - -[[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.4", -] - -[[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.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" -dependencies = [ - "windows_aarch64_gnullvm 0.52.4", - "windows_aarch64_msvc 0.52.4", - "windows_i686_gnu 0.52.4", - "windows_i686_msvc 0.52.4", - "windows_x86_64_gnu 0.52.4", - "windows_x86_64_gnullvm 0.52.4", - "windows_x86_64_msvc 0.52.4", -] - -[[package]] -name = "windows_aarch64_gnullvm" -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 = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.52.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" - -[[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.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" - -[[package]] -name = "windows_i686_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" - -[[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.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" - -[[package]] -name = "windows_i686_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" - -[[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.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" - -[[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.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -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.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" - -[[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.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" - -[[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.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dffa400e67ed5a4dd237983829e66475f0a4a26938c4b04c21baede6262215b8" -dependencies = [ - "memchr", -] - -[[package]] -name = "winresource" -version = "0.1.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77e2aaaf8cfa92078c0c0375423d631f82f2f57979c2884fdd5f604a11e45329" -dependencies = [ - "toml 0.7.8", - "version_check", -] - -[[package]] -name = "xi-unicode" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a67300977d3dc3f8034dae89778f502b6ba20b269527b3223ba59c0cf393bb8a" - -[[package]] -name = "xml5ever" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4034e1d05af98b51ad7214527730626f019682d797ba38b51689212118d8e650" -dependencies = [ - "log", - "mac", - "markup5ever", -] - -[[package]] -name = "xmlwriter" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec7a2a501ed189703dba8b08142f057e887dfc4b2cc4db2d343ac6376ba3e0b9" - -[[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.58", -] - -[[package]] -name = "zeroize" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" - -[[package]] -name = "zune-inflate" -version = "0.2.54" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02" -dependencies = [ - "simd-adler32", -] diff --git a/pkgs/applications/graphics/rnote/default.nix b/pkgs/applications/graphics/rnote/default.nix deleted file mode 100644 index 1e189138eba22..0000000000000 --- a/pkgs/applications/graphics/rnote/default.nix +++ /dev/null @@ -1,99 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, alsa-lib -, appstream -, appstream-glib -, cargo -, cmake -, desktop-file-utils -, dos2unix -, glib -, gstreamer -, gtk4 -, libadwaita -, libxml2 -, meson -, ninja -, pkg-config -, poppler -, python3 -, rustPlatform -, rustc -, shared-mime-info -, wrapGAppsHook4 -, AudioUnit -}: - -stdenv.mkDerivation rec { - pname = "rnote"; - version = "0.10.2"; - - src = fetchFromGitHub { - owner = "flxzt"; - repo = "rnote"; - rev = "v${version}"; - hash = "sha256-SqT8bJfJM+d5fewso3C22M4Qo7wY2g2QmEot/gCpwT4="; - }; - - cargoDeps = rustPlatform.importCargoLock { - lockFile = ./Cargo.lock; - outputHashes = { - "ink-stroke-modeler-rs-0.1.0" = "sha256-WfZwezohm8+ZXiKZlssTX+b/Izk1M4jFwxQejeTfc6M="; - "piet-0.6.2" = "sha256-3juXzuKwoLuxia6MoVwbcBJ3jXBQ9QRNVoxo3yFp2Iw="; - }; - }; - - nativeBuildInputs = [ - appstream-glib # For appstream-util - cmake - desktop-file-utils # For update-desktop-database - dos2unix - meson - ninja - pkg-config - python3 # For the postinstall script - rustPlatform.bindgenHook - rustPlatform.cargoSetupHook - cargo - rustc - shared-mime-info # For update-mime-database - wrapGAppsHook4 - ]; - - dontUseCmakeConfigure = true; - - mesonFlags = [ - (lib.mesonBool "cli" true) - ]; - - buildInputs = [ - appstream - glib - gstreamer - gtk4 - libadwaita - libxml2 - poppler - ] ++ lib.optionals stdenv.isLinux [ - alsa-lib - ] ++ lib.optionals stdenv.isDarwin [ - AudioUnit - ]; - - postPatch = '' - chmod +x build-aux/*.py - patchShebangs build-aux - ''; - - meta = with lib; { - homepage = "https://github.com/flxzt/rnote"; - changelog = "https://github.com/flxzt/rnote/releases/tag/${src.rev}"; - description = "Simple drawing application to create handwritten notes"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ dotlambda gepbird yrd ]; - platforms = platforms.unix; - # compiler error since 2023-11-17 - broken = stdenv.isDarwin; - }; -} diff --git a/pkgs/applications/graphics/rx/default.nix b/pkgs/applications/graphics/rx/default.nix index 77ed3f49117c5..943f46fab649c 100644 --- a/pkgs/applications/graphics/rx/default.nix +++ b/pkgs/applications/graphics/rx/default.nix @@ -3,8 +3,6 @@ , xorg ? null , libGL ? null }: -with lib; - rustPlatform.buildRustPackage rec { pname = "rx"; version = "0.5.2"; @@ -16,11 +14,11 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-LTpaV/fgYUgA2M6Wz5qLHnTNywh13900g+umhgLvciM="; }; - cargoSha256 = "sha256-4hi1U4jl6QA7H8AKHlU+Hqz5iKGYHRXHDsrcqY7imkU="; + cargoHash = "sha256-4hi1U4jl6QA7H8AKHlU+Hqz5iKGYHRXHDsrcqY7imkU="; nativeBuildInputs = [ cmake pkg-config makeWrapper ]; - buildInputs = optionals stdenv.isLinux + buildInputs = lib.optionals stdenv.hostPlatform.isLinux (with xorg; [ # glfw-sys dependencies: libX11 libXrandr libXinerama libXcursor libXi libXext @@ -29,13 +27,13 @@ rustPlatform.buildRustPackage rec { # FIXME: GLFW (X11) requires DISPLAY env variable for all tests doCheck = false; - postInstall = optionalString stdenv.isLinux '' + postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' mkdir -p $out/share/applications cp $src/rx.desktop $out/share/applications wrapProgram $out/bin/rx --prefix LD_LIBRARY_PATH : ${libGL}/lib ''; - meta = { + meta = with lib; { description = "Modern and extensible pixel editor implemented in Rust"; mainProgram = "rx"; homepage = "https://rx.cloudhead.io/"; diff --git a/pkgs/applications/graphics/sane/backends/brscan4/default.nix b/pkgs/applications/graphics/sane/backends/brscan4/default.nix index c15b3033a2651..f4c516ef56981 100644 --- a/pkgs/applications/graphics/sane/backends/brscan4/default.nix +++ b/pkgs/applications/graphics/sane/backends/brscan4/default.nix @@ -1,8 +1,8 @@ { stdenv, lib, fetchurl, callPackage, patchelf, makeWrapper, libusb-compat-0_1 }: let - myPatchElf = file: with lib; '' + myPatchElf = file: '' patchelf --set-interpreter \ - ${stdenv.cc.libc}/lib/ld-linux${optionalString stdenv.is64bit "-x86-64"}.so.2 \ + ${stdenv.cc.libc}/lib/ld-linux${lib.optionalString stdenv.hostPlatform.is64bit "-x86-64"}.so.2 \ ${file} ''; @@ -43,13 +43,13 @@ stdenv.mkDerivation rec { done ''; - installPhase = with lib; '' + installPhase = '' runHook preInstall PATH_TO_BRSCAN4="opt/brother/scanner/brscan4" mkdir -p $out/$PATH_TO_BRSCAN4 cp -rp $PATH_TO_BRSCAN4/* $out/$PATH_TO_BRSCAN4 mkdir -p $out/lib/sane - cp -rp usr/lib${optionalString stdenv.is64bit "64"}/sane/* $out/lib/sane + cp -rp usr/lib${lib.optionalString stdenv.hostPlatform.is64bit "64"}/sane/* $out/lib/sane # Symbolic links were absolute. Fix them so that they point to $out. pushd "$out/lib/sane" > /dev/null diff --git a/pkgs/applications/graphics/sane/backends/brscan5/default.nix b/pkgs/applications/graphics/sane/backends/brscan5/default.nix index c15599ec66bbb..91be20f3abbce 100644 --- a/pkgs/applications/graphics/sane/backends/brscan5/default.nix +++ b/pkgs/applications/graphics/sane/backends/brscan5/default.nix @@ -1,8 +1,8 @@ -{ stdenv, lib, fetchurl, callPackage, patchelf, makeWrapper, libusb1, avahi-compat, glib, libredirect, nixosTests }: +{ stdenv, lib, fetchurl, patchelf, makeWrapper, libusb1, avahi-compat, glib, libredirect, nixosTests }: let - myPatchElf = file: with lib; '' + myPatchElf = file: '' patchelf --set-interpreter \ - ${stdenv.cc.libc}/lib/ld-linux${optionalString stdenv.is64bit "-x86-64"}.so.2 \ + ${stdenv.cc.libc}/lib/ld-linux${lib.optionalString stdenv.hostPlatform.is64bit "-x86-64"}.so.2 \ ${file} ''; system = stdenv.hostPlatform.system; @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { printf '/etc/opt/brother/scanner/models\x00' | dd of=opt/brother/scanner/brscan5/libsane-brother5.so.1.0.7 bs=1 seek=${toString patchOffsetBytes} conv=notrunc ''; - installPhase = with lib; '' + installPhase = '' runHook preInstall PATH_TO_BRSCAN5="opt/brother/scanner/brscan5" mkdir -p $out/$PATH_TO_BRSCAN5 diff --git a/pkgs/applications/graphics/sane/backends/default.nix b/pkgs/applications/graphics/sane/backends/default.nix index 3038d2be21232..55fbc9a3616a7 100644 --- a/pkgs/applications/graphics/sane/backends/default.nix +++ b/pkgs/applications/graphics/sane/backends/default.nix @@ -1,49 +1,77 @@ -{ stdenv, lib, fetchurl, fetchpatch, runtimeShell, buildPackages -, gettext, pkg-config, python3 -, avahi, libgphoto2, libieee1284, libjpeg, libpng, libtiff, libusb1, libv4l, net-snmp -, curl, systemd, libxml2, poppler, gawk -, sane-drivers -, nixosTests +{ + stdenv, + lib, + fetchFromGitLab, + runtimeShell, + buildPackages, + gettext, + pkg-config, + python3, + avahi, + libgphoto2, + libieee1284, + libjpeg, + libpng, + libtiff, + libusb1, + libv4l, + net-snmp, + curl, + systemd, + libxml2, + poppler, + gawk, + sane-drivers, + nixosTests, + autoconf, + automake, + libtool, + autoconf-archive, # List of { src name backend } attibute sets - see installFirmware below: -, extraFirmware ? [] + extraFirmware ? [], # For backwards compatibility with older setups; use extraFirmware instead: -, gt68xxFirmware ? null, snapscanFirmware ? null + gt68xxFirmware ? null, snapscanFirmware ? null, # Not included by default, scan snap drivers require fetching of unfree binaries. -, scanSnapDriversUnfree ? false, scanSnapDriversPackage ? sane-drivers.epjitsu + scanSnapDriversUnfree ? false, scanSnapDriversPackage ? sane-drivers.epjitsu, }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "sane-backends"; - version = "1.2.1"; + version = "1.3.1"; - src = fetchurl { - # raw checkouts of the repo do not work because, the configure script is - # only functional in manually uploaded release tarballs. - # https://gitlab.com/sane-project/backends/-/issues/440 - # unfortunately this make the url unpredictable on update, to find the link - # go to https://gitlab.com/sane-project/backends/-/releases and choose - # the link under the heading "Other". - url = "https://gitlab.com/sane-project/backends/uploads/110fc43336d0fb5e514f1fdc7360dd87/sane-backends-1.2.1.tar.gz"; - sha256 = "f832395efcb90bb5ea8acd367a820c393dda7e0dd578b16f48928b8f5bdd0524"; + src = fetchFromGitLab { + owner = "sane-project"; + repo = "backends"; + rev = "refs/tags/${version}"; + hash = "sha256-4mwPGeRsyzngDxBQ8/48mK+VR9LYV6082xr8lTrUZrk="; }; - patches = [ - # sane-desc will be used in postInstall so compile it for build - # https://github.com/void-linux/void-packages/blob/master/srcpkgs/sane/patches/sane-desc-cross.patch - (fetchpatch { - name = "compile-sane-desc-for-build.patch"; - url = "https://raw.githubusercontent.com/void-linux/void-packages/4b97cd2fb4ec38712544438c2491b6d7d5ab334a/srcpkgs/sane/patches/sane-desc-cross.patch"; - sha256 = "sha256-y6BOXnOJBSTqvRp6LwAucqaqv+OLLyhCS/tXfLpnAPI="; - }) - ]; - postPatch = '' + # Do not create lock dir in install phase + sed -i '/^install-lockpath:/!b;n;c\ # pass' backend/Makefile.am + ''; + + preConfigure = '' + # create version files, so that autotools macros can use them: + # https://gitlab.com/sane-project/backends/-/issues/440 + printf "%s\n" "$version" > .tarball-version + printf "%s\n" "$version" > .version + + autoreconf -fiv + + # Fixes for cross compilation + # https://github.com/NixOS/nixpkgs/issues/308283 + # related to the compile-sane-desc-for-build substituteInPlace tools/Makefile.in \ --replace 'cc -I' '$(CC_FOR_BUILD) -I' + + # sane-desc will be used in postInstall so compile it for build + # https://github.com/void-linux/void-packages/blob/master/srcpkgs/sane/patches/sane-desc-cross.patch + patch -p1 -i ${./sane-desc-cross.patch} ''; outputs = [ "out" "doc" "man" ]; @@ -51,7 +79,11 @@ stdenv.mkDerivation { depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ + autoconf + autoconf-archive + automake gettext + libtool pkg-config python3 ]; @@ -67,7 +99,7 @@ stdenv.mkDerivation { libxml2 poppler gawk - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libieee1284 libv4l net-snmp @@ -76,14 +108,15 @@ stdenv.mkDerivation { enableParallelBuilding = true; - configureFlags = - lib.optional (avahi != null) "--with-avahi" - ++ lib.optional (libusb1 != null) "--with-usb" - ; + configureFlags = [ "--with-lockdir=/var/lock/sane" ] + ++ lib.optional (avahi != null) "--with-avahi" + ++ lib.optional (libusb1 != null) "--with-usb"; # autoconf check for HAVE_MMAP is never set on cross compilation. # The pieusb backend fails compilation if HAVE_MMAP is not set. - buildFlags = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "CFLAGS=-DHAVE_MMAP=${if stdenv.hostPlatform.isLinux then "1" else "0"}" ]; + buildFlags = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + "CFLAGS=-DHAVE_MMAP=${if stdenv.hostPlatform.isLinux then "1" else "0"}" + ]; postInstall = let @@ -134,7 +167,7 @@ stdenv.mkDerivation { inherit (nixosTests) sane; }; - meta = with lib; { + meta = { description = "SANE (Scanner Access Now Easy) backends"; longDescription = '' Collection of open-source SANE backends (device drivers). @@ -144,8 +177,8 @@ stdenv.mkDerivation { scanners, see http://www.sane-project.org/sane-backends.html. ''; homepage = "http://www.sane-project.org/"; - license = licenses.gpl2Plus; - platforms = platforms.linux ++ platforms.darwin; - maintainers = [ maintainers.symphorien ]; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux ++ lib.platforms.darwin; + maintainers = [ lib.maintainers.symphorien ]; }; } diff --git a/pkgs/applications/graphics/sane/backends/sane-desc-cross.patch b/pkgs/applications/graphics/sane/backends/sane-desc-cross.patch new file mode 100644 index 0000000000000..6acee77c0e7ab --- /dev/null +++ b/pkgs/applications/graphics/sane/backends/sane-desc-cross.patch @@ -0,0 +1,12 @@ +--- a/tools/Makefile.in ++++ b/tools/Makefile.in +@@ -586,7 +586,7 @@ gamma4scanimage$(EXEEXT): $(gamma4scanimage_OBJECTS) $(gamma4scanimage_DEPENDENC + + sane-desc$(EXEEXT): $(sane_desc_OBJECTS) $(sane_desc_DEPENDENCIES) $(EXTRA_sane_desc_DEPENDENCIES) + @rm -f sane-desc$(EXEEXT) +- $(AM_V_CCLD)$(LINK) $(sane_desc_OBJECTS) $(sane_desc_LDADD) $(LIBS) ++ cc -I. sane-desc.c -I../include ../sanei/sanei_config.c ../sanei/sanei_init_debug.c ../sanei/sanei_constrain_value.c -o $@ + + sane-find-scanner$(EXEEXT): $(sane_find_scanner_OBJECTS) $(sane_find_scanner_DEPENDENCIES) $(EXTRA_sane_find_scanner_DEPENDENCIES) + @rm -f sane-find-scanner$(EXEEXT) + diff --git a/pkgs/applications/graphics/sane/config.nix b/pkgs/applications/graphics/sane/config.nix index 0405eeb05c2c4..c637ff3cfcd32 100644 --- a/pkgs/applications/graphics/sane/config.nix +++ b/pkgs/applications/graphics/sane/config.nix @@ -2,7 +2,7 @@ { paths, disabledDefaultBackends ? [] }: -with lib; + let installSanePath = path: '' if [ -e "${path}/lib/sane" ]; then @@ -48,6 +48,6 @@ stdenv.mkDerivation { mkdir -p $out/etc/sane.d $out/etc/sane.d/dll.d $out/lib/sane '' - + (concatMapStrings installSanePath paths) - + (concatMapStrings disableBackend disabledDefaultBackends); + + (lib.concatMapStrings installSanePath paths) + + (lib.concatMapStrings disableBackend disabledDefaultBackends); } diff --git a/pkgs/applications/graphics/scantailor/advanced.nix b/pkgs/applications/graphics/scantailor/advanced.nix index b83b9df83b018..b85e0bdc6042d 100644 --- a/pkgs/applications/graphics/scantailor/advanced.nix +++ b/pkgs/applications/graphics/scantailor/advanced.nix @@ -21,7 +21,7 @@ mkDerivation rec { description = "Interactive post-processing tool for scanned pages (vigri's fork)"; mainProgram = "scantailor"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = with platforms; gnu ++ linux ++ darwin; }; } diff --git a/pkgs/applications/graphics/seamly2d/default.nix b/pkgs/applications/graphics/seamly2d/default.nix index bd8316b953f02..b25c9b6dacfe8 100644 --- a/pkgs/applications/graphics/seamly2d/default.nix +++ b/pkgs/applications/graphics/seamly2d/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, qtbase, wrapQtAppsHook, fetchFromGitHub, - addOpenGLRunpath, poppler_utils, qtxmlpatterns, qtsvg, mesa, gcc, xvfb-run, - fontconfig, freetype, xorg, ccache, qmake, python3, qttools, git + addDriverRunpath, poppler_utils, qtxmlpatterns, qtsvg, mesa, xvfb-run, + fontconfig, freetype, xorg, qmake, python3, qttools, git }: let qtPython = python3.withPackages (pkgs: with pkgs; [ pyqt5 ]); @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - addOpenGLRunpath + addDriverRunpath xvfb-run fontconfig wrapQtAppsHook diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix index 844878a34959d..eb6c6839bc5b1 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.9"; src = fetchurl { url = "mirror://gnome/sources/shotwell/${lib.versions.majorMinor finalAttrs.version}/shotwell-${finalAttrs.version}.tar.xz"; - sha256 = "sha256-dZek/6yR4YzYFEsS8tCDE6P0Bbs2gkOnMmgm99kqcLY="; + sha256 = "sha256-EjKjPcnBftI6oA2P8lUA5xC73JiZ1VtEFbaLdCnlYOs="; }; 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/smartdeblur/default.nix b/pkgs/applications/graphics/smartdeblur/default.nix index 592244455e981..db2dd60214a2a 100644 --- a/pkgs/applications/graphics/smartdeblur/default.nix +++ b/pkgs/applications/graphics/smartdeblur/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { description = "Tool for restoring blurry and defocused images"; mainProgram = "SmartDeblur"; license = licenses.gpl3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/graphics/sxiv/default.nix b/pkgs/applications/graphics/sxiv/default.nix index f3d7086d4a098..09855af551fe7 100644 --- a/pkgs/applications/graphics/sxiv/default.nix +++ b/pkgs/applications/graphics/sxiv/default.nix @@ -1,7 +1,5 @@ { lib, stdenv, fetchFromGitHub, libXft, imlib2, giflib, libexif, conf ? null }: -with lib; - stdenv.mkDerivation rec { pname = "sxiv"; version = "26"; @@ -13,8 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0xaawlfdy7b277m38mgg4423kd7p1ffn0dq4hciqs6ivbb3q9c4f"; }; - configFile = optionalString (conf!=null) (builtins.toFile "config.def.h" conf); - preBuild = optionalString (conf!=null) "cp ${configFile} config.def.h"; + configFile = lib.optionalString (conf!=null) (builtins.toFile "config.def.h" conf); + preBuild = lib.optionalString (conf!=null) "cp ${configFile} config.def.h"; buildInputs = [ libXft imlib2 giflib libexif ]; @@ -24,7 +22,7 @@ stdenv.mkDerivation rec { install -Dt $out/share/applications sxiv.desktop ''; - meta = { + meta = with lib; { description = "Simple X Image Viewer"; homepage = "https://github.com/muennich/sxiv"; license = lib.licenses.gpl2Plus; diff --git a/pkgs/applications/graphics/symbolic-preview/default.nix b/pkgs/applications/graphics/symbolic-preview/default.nix index 5d8ef439f0130..46f654b95600e 100644 --- a/pkgs/applications/graphics/symbolic-preview/default.nix +++ b/pkgs/applications/graphics/symbolic-preview/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; platforms = platforms.unix; # never built on aarch64-darwin, x86_64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/applications/graphics/synfigstudio/default.nix b/pkgs/applications/graphics/synfigstudio/default.nix index f1edfe81fb638..e19da3fa15fe0 100644 --- a/pkgs/applications/graphics/synfigstudio/default.nix +++ b/pkgs/applications/graphics/synfigstudio/default.nix @@ -8,6 +8,7 @@ , boost , cairo +, darwin , gettext , glibmm , gtk3 @@ -19,7 +20,7 @@ , pango , imagemagick , intltool -, gnome +, adwaita-icon-theme , harfbuzz , freetype , fribidi @@ -71,6 +72,10 @@ let configureFlags = [ "--with-boost=${boost.dev}" "--with-boost-libdir=${boost.out}/lib" + ] ++ lib.optionals stdenv.cc.isClang [ + # Newer versions of clang default to C++17, but synfig and some of its dependencies use deprecated APIs that + # are removed in C++17. Setting the language version to C++14 allows it to build. + "CXXFLAGS=-std=c++14" ]; nativeBuildInputs = [ @@ -94,6 +99,8 @@ let fribidi openexr fftw + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + darwin.apple_sdk.frameworks.Foundation ]; }; in @@ -111,6 +118,12 @@ stdenv.mkDerivation { ./bootstrap.sh ''; + configureFlags = lib.optionals stdenv.cc.isClang [ + # Newer versions of clang default to C++17, but synfig and some of its dependencies use deprecated APIs that + # are removed in C++17. Setting the language version to C++14 allows it to build. + "CXXFLAGS=-std=c++14" + ]; + nativeBuildInputs = [ pkg-config autoreconfHook @@ -131,7 +144,7 @@ stdenv.mkDerivation { libsigcxx libxmlxx mlt - gnome.adwaita-icon-theme + adwaita-icon-theme openexr fftw ]; @@ -147,7 +160,7 @@ stdenv.mkDerivation { description = "2D animation program"; homepage = "http://www.synfig.org"; license = licenses.gpl2Plus; - maintainers = [ maintainers.goibhniu ]; - platforms = platforms.linux; + maintainers = [ ]; + platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/applications/graphics/tesseract/tesseract3.nix b/pkgs/applications/graphics/tesseract/tesseract3.nix index d796e506a8772..5ee965a25e09f 100644 --- a/pkgs/applications/graphics/tesseract/tesseract3.nix +++ b/pkgs/applications/graphics/tesseract/tesseract3.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { description = "OCR engine"; homepage = "https://github.com/tesseract-ocr/tesseract"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ viric erikarvstedt ]; + maintainers = with lib.maintainers; [ erikarvstedt ]; platforms = with lib.platforms; linux ++ darwin; mainProgram = "tesseract"; }; diff --git a/pkgs/applications/graphics/tesseract/tesseract4.nix b/pkgs/applications/graphics/tesseract/tesseract4.nix index bfee4bdb2774c..e73e237cfea53 100644 --- a/pkgs/applications/graphics/tesseract/tesseract4.nix +++ b/pkgs/applications/graphics/tesseract/tesseract4.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { description = "OCR engine"; homepage = "https://github.com/tesseract-ocr/tesseract"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ viric erikarvstedt ]; + maintainers = with lib.maintainers; [ erikarvstedt ]; platforms = with lib.platforms; linux ++ darwin; mainProgram = "tesseract"; }; diff --git a/pkgs/applications/graphics/tesseract/tesseract5.nix b/pkgs/applications/graphics/tesseract/tesseract5.nix index be81a3dd21c92..a8563a09e4c09 100644 --- a/pkgs/applications/graphics/tesseract/tesseract5.nix +++ b/pkgs/applications/graphics/tesseract/tesseract5.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { icu pango opencl-headers - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Accelerate CoreGraphics CoreVideo @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { description = "OCR engine"; homepage = "https://github.com/tesseract-ocr/tesseract"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ anselmschueler ]; + maintainers = [ ]; platforms = lib.platforms.unix; mainProgram = "tesseract"; }; diff --git a/pkgs/applications/graphics/tev/default.nix b/pkgs/applications/graphics/tev/default.nix index 288eb7aef6ca6..e026db40e8ed7 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 { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { repo = pname; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-+qCRHP0AbYOQBAE4zK2cmWPHZGWjjxC3DZPNm8sgBzs="; + hash = "sha256-+qCRHP0AbYOQBAE4zK2cmWPHZGWjjxC3DZPNm8sgBzs="; }; nativeBuildInputs = [ cmake wrapGAppsHook3 ]; @@ -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"; @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { changelog = "https://github.com/Tom94/tev/releases/tag/v${version}"; license = licenses.bsd3; platforms = platforms.unix; - broken = stdenv.isDarwin; # needs apple frameworks + SDK fix? see #205247 - maintainers = with maintainers; [ ]; + broken = stdenv.hostPlatform.isDarwin; # needs apple frameworks + SDK fix? see #205247 + maintainers = [ ]; }; } diff --git a/pkgs/applications/graphics/textual-paint/default.nix b/pkgs/applications/graphics/textual-paint/default.nix index c11a5cd632d75..c59ac7b8140e5 100644 --- a/pkgs/applications/graphics/textual-paint/default.nix +++ b/pkgs/applications/graphics/textual-paint/default.nix @@ -7,6 +7,7 @@ let python = python3.override { + self = python; packageOverrides = _: super: { pillow = super.pillow.overridePythonAttrs rec { version = "9.5.0"; diff --git a/pkgs/applications/graphics/trimage/default.nix b/pkgs/applications/graphics/trimage/default.nix index 4a0bf082c10ac..6f38e22de14f6 100644 --- a/pkgs/applications/graphics/trimage/default.nix +++ b/pkgs/applications/graphics/trimage/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, substituteAll , python3 , installShellFiles diff --git a/pkgs/applications/graphics/unigine-valley/default.nix b/pkgs/applications/graphics/unigine-valley/default.nix index ff6f30b6c5e9c..b64f136629edd 100644 --- a/pkgs/applications/graphics/unigine-valley/default.nix +++ b/pkgs/applications/graphics/unigine-valley/default.nix @@ -130,7 +130,7 @@ stdenv.mkDerivation rec { homepage = "https://unigine.com/products/benchmarks/valley/"; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; # see also: $out/$instPath/documentation/License.pdf - maintainers = [ lib.maintainers.kierdavis ]; + maintainers = [ ]; platforms = [ "x86_64-linux" "i686-linux" ]; mainProgram = "valley"; }; diff --git a/pkgs/applications/graphics/vengi-tools/default.nix b/pkgs/applications/graphics/vengi-tools/default.nix index 21a0389949046..be14ad6c63e9b 100644 --- a/pkgs/applications/graphics/vengi-tools/default.nix +++ b/pkgs/applications/graphics/vengi-tools/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, writeText , cmake , pkg-config @@ -9,18 +8,25 @@ , python3 , makeWrapper +, backward-cpp +, curl +, enet +, freetype , glm +, gtest +, libbfd +, libdwarf +, libjpeg +, libuuid +, libuv , lua5_4 +, lzfse +, opencl-headers , SDL2 , SDL2_mixer -, enet -, libuv -, libuuid , wayland-protocols , Carbon , CoreServices -# optionals -, opencl-headers , OpenCL , callPackage @@ -29,13 +35,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "vengi-tools"; - version = "0.0.32"; + version = "0.0.33"; src = fetchFromGitHub { owner = "mgerhardy"; repo = "vengi"; rev = "v${finalAttrs.version}"; - hash = "sha256-3oL+hRFATdJmBmZK55Ui2blj8LTqt/zJWJ85kSUFCY4="; + hash = "sha256-ljB36A5b8K1KBBuQVISb1fkWxb/tTTwojE31KPMg1xQ="; }; nativeBuildInputs = [ @@ -47,39 +53,40 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ + libbfd + libdwarf + backward-cpp + curl + enet + freetype glm + libjpeg + libuuid + libuv lua5_4 + lzfse SDL2 SDL2_mixer - enet - libuv - libuuid - # Only needed for the game - #postgresql - #libpqxx - #mosquitto - ] ++ lib.optional stdenv.isLinux wayland-protocols - ++ lib.optionals stdenv.isDarwin [ Carbon CoreServices OpenCL ] - ++ lib.optional (!stdenv.isDarwin) opencl-headers; + ] ++ lib.optional stdenv.hostPlatform.isLinux wayland-protocols + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Carbon CoreServices OpenCL ] + ++ lib.optional (!stdenv.hostPlatform.isDarwin) opencl-headers; + + cmakeFlags = + lib.optional stdenv.hostPlatform.isDarwin "-DCORESERVICES_LIB=${CoreServices}"; - cmakeFlags = [ - # Disable tests due to a problem in linking gtest: - # ld: /build/vengi-tests-core.LDHlV1.ltrans0.ltrans.o: in function `main': - # <artificial>:(.text.startup+0x3f): undefined reference to `testing::InitGoogleMock(int*, char**)' - "-DUNITTESTS=OFF" - "-DVISUALTESTS=OFF" - # We're only interested in the generic tools - "-DGAMES=OFF" - "-DMAPVIEW=OFF" - "-DAIDEBUG=OFF" - ] ++ lib.optional stdenv.isDarwin "-DCORESERVICES_LIB=${CoreServices}"; + # error: "The plain signature for target_link_libraries has already been used" + doCheck = false; + + checkInputs = [ + gtest + ]; # Set the data directory for each executable. We cannot set it at build time # with the PKGDATADIR cmake variable because each executable needs a specific # one. # This is not needed on darwin, since on that platform data files are saved # in *.app/Contents/Resources/ too, and are picked up automatically. - postInstall = lib.optionalString (!stdenv.isDarwin) '' + postInstall = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' for prog in $out/bin/*; do wrapProgram "$prog" \ --set CORE_PATH $out/share/$(basename "$prog")/ @@ -106,5 +113,6 @@ stdenv.mkDerivation (finalAttrs: { license = [ licenses.mit licenses.cc-by-sa-30 ]; maintainers = with maintainers; [ fgaz ]; platforms = platforms.all; + broken = stdenv.hostPlatform.isDarwin; }; }) diff --git a/pkgs/applications/graphics/vimiv-qt/default.nix b/pkgs/applications/graphics/vimiv-qt/default.nix index 83bbbecdc65ba..75a0b88fba4e4 100644 --- a/pkgs/applications/graphics/vimiv-qt/default.nix +++ b/pkgs/applications/graphics/vimiv-qt/default.nix @@ -21,7 +21,7 @@ python3.pkgs.buildPythonApplication rec { propagatedBuildInputs = with python3.pkgs; [ pyqt5 py3exiv2 ]; - buildInputs = [ qt5.qtsvg ] ++ lib.optionals stdenv.isLinux [ qt5.qtwayland ]; + buildInputs = [ qt5.qtsvg ] ++ lib.optionals stdenv.hostPlatform.isLinux [ qt5.qtwayland ]; postInstall = '' install -Dm644 misc/vimiv.desktop $out/share/applications/vimiv.desktop diff --git a/pkgs/applications/graphics/vipsdisp/default.nix b/pkgs/applications/graphics/vipsdisp/default.nix index 9d0a757672890..fdfb17d205426 100644 --- a/pkgs/applications/graphics/vipsdisp/default.nix +++ b/pkgs/applications/graphics/vipsdisp/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchFromGitHub +, fetchpatch2 , meson , ninja , pkg-config @@ -21,6 +22,14 @@ stdenv.mkDerivation rec { hash = "sha256-a8wqDTVZnhqk0zHAuGvwjtJTM0irN2tkRIjx6sIteV0="; }; + patches = [ + # Fixes build with clang + (fetchpatch2 { + url = "https://github.com/jcupitt/vipsdisp/commit/e95888153838d6e58d5b9fd7c08e3d03db38e8b1.patch?full_index=1"; + hash = "sha256-MtQ9AMvl2MkHSLyOuwFVbmNiCEoPPnrK3EoUdvqEtOo="; + }) + ]; + postPatch = '' chmod +x ./meson_post_install.py patchShebangs ./meson_post_install.py diff --git a/pkgs/applications/graphics/vpv/default.nix b/pkgs/applications/graphics/vpv/default.nix index 1bbdbd4a35e7a..7f80ff24a3ce1 100644 --- a/pkgs/applications/graphics/vpv/default.nix +++ b/pkgs/applications/graphics/vpv/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Image viewer for image processing experts"; maintainers = [ lib.maintainers.kidanger ]; license = lib.licenses.gpl3; - broken = stdenv.isDarwin; # the CMake expects the SDL2::SDL2main target for darwin + broken = stdenv.hostPlatform.isDarwin; # the CMake expects the SDL2::SDL2main target for darwin mainProgram = "vpv"; }; }) diff --git a/pkgs/applications/graphics/weylus/default.nix b/pkgs/applications/graphics/weylus/default.nix index 36647a62aef23..61b40006b3865 100644 --- a/pkgs/applications/graphics/weylus/default.nix +++ b/pkgs/applications/graphics/weylus/default.nix @@ -38,12 +38,12 @@ rustPlatform.buildRustPackage rec { buildInputs = [ ffmpeg x264 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ ApplicationServices Carbon Cocoa VideoToolbox - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ dbus libva gst_all_1.gst-plugins-base @@ -67,7 +67,7 @@ rustPlatform.buildRustPackage rec { git typescript makeWrapper - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ pkg-config autoconf libtool @@ -88,7 +88,7 @@ rustPlatform.buildRustPackage rec { gst_all_1.gst-plugins-base pipewire ]; - in lib.optionalString stdenv.isLinux '' + in lib.optionalString stdenv.hostPlatform.isLinux '' wrapProgram $out/bin/weylus --prefix GST_PLUGIN_PATH : ${GST_PLUGIN_PATH} ''; @@ -97,7 +97,7 @@ rustPlatform.buildRustPackage rec { ''; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Use your tablet as graphic tablet/touch screen on your computer"; mainProgram = "weylus"; homepage = "https://github.com/H-M-H/Weylus"; diff --git a/pkgs/applications/graphics/wings/default.nix b/pkgs/applications/graphics/wings/default.nix index 87e0a47cc5ae1..85237c94846a0 100644 --- a/pkgs/applications/graphics/wings/default.nix +++ b/pkgs/applications/graphics/wings/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { homepage = "http://www.wings3d.com/"; description = "Subdivision modeler inspired by Nendo and Mirai from Izware"; license = lib.licenses.tcltk; - maintainers = with lib.maintainers; [ viric ]; + maintainers = [ ]; platforms = with lib.platforms; linux; mainProgram = "wings"; }; diff --git a/pkgs/applications/graphics/xournalpp/default.nix b/pkgs/applications/graphics/xournalpp/default.nix index 2c61584dae5ad..921fef456289c 100644 --- a/pkgs/applications/graphics/xournalpp/default.nix +++ b/pkgs/applications/graphics/xournalpp/default.nix @@ -6,6 +6,7 @@ , wrapGAppsHook3 , pkg-config +, adwaita-icon-theme , alsa-lib , binutils , glib @@ -43,7 +44,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake gettext pkg-config wrapGAppsHook3 ]; buildInputs = - lib.optionals stdenv.isLinux [ + lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib ] ++ [ glib @@ -63,6 +64,12 @@ stdenv.mkDerivation rec { buildFlags = [ "translations" ]; + preFixup = '' + gappsWrapperArgs+=( + --prefix XDG_DATA_DIRS : "${adwaita-icon-theme}/share" + ) + ''; + meta = with lib; { description = "Xournal++ is a handwriting Notetaking software with PDF annotation support"; homepage = "https://xournalpp.github.io/"; diff --git a/pkgs/applications/graphics/xpano/default.nix b/pkgs/applications/graphics/xpano/default.nix index cd6f5ff850345..01501e9757efd 100644 --- a/pkgs/applications/graphics/xpano/default.nix +++ b/pkgs/applications/graphics/xpano/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "xpano"; - version = "0.18.1"; + version = "0.19.0"; src = fetchFromGitHub { owner = "krupkat"; repo = pname; rev = "v${version}"; - sha256 = "iPGvCJz2iywpSePBZ3c8OiccKfwaGAToGaJfRhruUPk="; + sha256 = "sha256-cb6BJg0wdfhqEFLbQ27NpjJU/cc4SZSk94UHzJfzn5U="; fetchSubmodules = true; }; diff --git a/pkgs/applications/graphics/xv/default.nix b/pkgs/applications/graphics/xv/default.nix index d3708dd0c4a10..86103e75067cd 100644 --- a/pkgs/applications/graphics/xv/default.nix +++ b/pkgs/applications/graphics/xv/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "xv"; - version = "5.0.0"; + version = "6.0.1"; src = fetchFromGitHub { owner = "jasper-software"; repo = "xv"; rev = "v${version}"; - sha256 = "sha256-ATV/LxXQNJB6rjBmurx6a1gRPR8zNuILstvEJoQJhUs="; + sha256 = "sha256-IFbR/1oksRkpJvvu+7TwLFtDujuAmV+sX8Njn6gpgBg="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/graphics/yacreader/default.nix b/pkgs/applications/graphics/yacreader/default.nix index d3cead3671694..e0fa8cc64da49 100644 --- a/pkgs/applications/graphics/yacreader/default.nix +++ b/pkgs/applications/graphics/yacreader/default.nix @@ -23,6 +23,6 @@ mkDerivation rec { homepage = "http://www.yacreader.com"; license = lib.licenses.gpl3; mainProgram = "YACReader"; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; }; } 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/graphics/zgv/default.nix b/pkgs/applications/graphics/zgv/default.nix index 0b63f46731902..8df5e82622494 100644 --- a/pkgs/applications/graphics/zgv/default.nix +++ b/pkgs/applications/graphics/zgv/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { homepage = "http://www.svgalib.org/rus/zgv/"; description = "Picture viewer with a thumbnail-based selector"; license = licenses.gpl2; - maintainers = [ maintainers.vrthra ]; + maintainers = [ ]; platforms = platforms.linux; mainProgram = "zgv"; }; diff --git a/pkgs/applications/kde/alligator.nix b/pkgs/applications/kde/alligator.nix index 78263cb73be57..cf178e3fe4a7b 100644 --- a/pkgs/applications/kde/alligator.nix +++ b/pkgs/applications/kde/alligator.nix @@ -38,6 +38,6 @@ mkDerivation rec { # https://invent.kde.org/plasma-mobile/alligator/-/commit/db30f159c4700244532b17a260deb95551045b7a # * SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL license = with licenses; [ gpl2Only gpl3Only ]; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/kde/audiotube.nix b/pkgs/applications/kde/audiotube.nix index 58d188d486fbb..2f9937f106b61 100644 --- a/pkgs/applications/kde/audiotube.nix +++ b/pkgs/applications/kde/audiotube.nix @@ -66,6 +66,6 @@ mkDerivation rec { homepage = "https://invent.kde.org/plasma-mobile/audiotube"; # https://invent.kde.org/plasma-mobile/audiotube/-/tree/c503d0607a3386112beaa9cf990ab85fe33ef115/LICENSES license = with licenses; [ bsd2 cc0 gpl2Only gpl3Only ]; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/kde/calindori.nix b/pkgs/applications/kde/calindori.nix index c1e9f4d59b18b..d7d508f55bcd0 100644 --- a/pkgs/applications/kde/calindori.nix +++ b/pkgs/applications/kde/calindori.nix @@ -41,6 +41,6 @@ mkDerivation rec { description = "Calendar for Plasma Mobile"; homepage = "https://invent.kde.org/plasma-mobile/calindori"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/kde/falkon.nix b/pkgs/applications/kde/falkon.nix index b24375e750055..85c4d113fb139 100644 --- a/pkgs/applications/kde/falkon.nix +++ b/pkgs/applications/kde/falkon.nix @@ -20,7 +20,7 @@ mkDerivation rec { libpthreadstubs libxcb libXdmcp qtsvg qttools qtwebengine qtx11extras kwallet kpurpose karchive kio - ] ++ lib.optionals stdenv.isLinux [ qtwayland ]; + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ qtwayland ]; nativeBuildInputs = [ cmake diff --git a/pkgs/applications/kde/ffmpegthumbs.nix b/pkgs/applications/kde/ffmpegthumbs.nix index b8695a3015473..9b0da69d71fa3 100644 --- a/pkgs/applications/kde/ffmpegthumbs.nix +++ b/pkgs/applications/kde/ffmpegthumbs.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, - ffmpeg_4, kio, taglib + ffmpeg_7, kio, taglib }: mkDerivation { @@ -11,5 +11,5 @@ mkDerivation { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ ffmpeg_4 kio taglib ]; + buildInputs = [ ffmpeg_7 kio taglib ]; } diff --git a/pkgs/applications/kde/gwenview/default.nix b/pkgs/applications/kde/gwenview/default.nix index d697778f47267..883620904ee47 100644 --- a/pkgs/applications/kde/gwenview/default.nix +++ b/pkgs/applications/kde/gwenview/default.nix @@ -4,7 +4,7 @@ exiv2, lcms2, cfitsio, baloo, kactivities, kio, kipi-plugins, kitemmodels, kparts, libkdcraw, libkipi, phonon, qtimageformats, qtsvg, qtx11extras, kinit, kpurpose, kcolorpicker, kimageannotator, - wayland, wayland-protocols + wayland, wayland-protocols, wayland-scanner }: mkDerivation { @@ -20,7 +20,7 @@ mkDerivation { # Fix build with versioned kImageAnnotator patches = [./kimageannotator.patch]; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools wayland-scanner ]; buildInputs = [ baloo kactivities kio kitemmodels kparts libkdcraw libkipi phonon exiv2 lcms2 cfitsio diff --git a/pkgs/applications/kde/kalk.nix b/pkgs/applications/kde/kalk.nix index d88741d179bb7..dd4be365d7be3 100644 --- a/pkgs/applications/kde/kalk.nix +++ b/pkgs/applications/kde/kalk.nix @@ -46,6 +46,6 @@ mkDerivation rec { mainProgram = "kalk"; homepage = "https://invent.kde.org/plasma-mobile/kalk"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/kde/kasts.nix b/pkgs/applications/kde/kasts.nix index 87136676df40b..00e87c05a4866 100644 --- a/pkgs/applications/kde/kasts.nix +++ b/pkgs/applications/kde/kasts.nix @@ -63,6 +63,6 @@ mkDerivation rec { homepage = "https://apps.kde.org/kasts/"; # https://invent.kde.org/plasma-mobile/kasts/-/tree/master/LICENSES license = with licenses; [ bsd2 cc-by-sa-40 cc0 gpl2Only gpl2Plus gpl3Only gpl3Plus lgpl3Plus ]; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/kde/kclock.nix b/pkgs/applications/kde/kclock.nix index d97ad54177448..678c5ad6285e5 100644 --- a/pkgs/applications/kde/kclock.nix +++ b/pkgs/applications/kde/kclock.nix @@ -41,6 +41,6 @@ mkDerivation rec { description = "Clock app for plasma mobile"; homepage = "https://invent.kde.org/plasma-mobile/kclock"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/kde/kde-inotify-survey.nix b/pkgs/applications/kde/kde-inotify-survey.nix index 470e225ea0abd..9adbbe3a08c1e 100644 --- a/pkgs/applications/kde/kde-inotify-survey.nix +++ b/pkgs/applications/kde/kde-inotify-survey.nix @@ -26,6 +26,6 @@ mkDerivation { mainProgram = "kde-inotify-survey"; homepage = "https://invent.kde.org/system/kde-inotify-survey"; license = lib.licenses.gpl2Plus; - maintainers = []; + maintainers = [ ]; }; } diff --git a/pkgs/applications/kde/kdenlive/default.nix b/pkgs/applications/kde/kdenlive/default.nix index 85ccfb0f74083..13a208fd99718 100644 --- a/pkgs/applications/kde/kdenlive/default.nix +++ b/pkgs/applications/kde/kdenlive/default.nix @@ -1,4 +1,5 @@ { mkDerivation +, substituteAll , lib , extra-cmake-modules , breeze-icons @@ -34,6 +35,7 @@ , kpurpose , kdeclarative , wrapGAppsHook3 +, glaxnimate }: let @@ -81,20 +83,25 @@ mkDerivation { kdeclarative wrapGAppsHook3 ]; + # Both MLT and FFMpeg paths must be set or Kdenlive will complain that it # doesn't find them. See: # https://github.com/NixOS/nixpkgs/issues/83885 - patches = [ ./dependency-paths.patch ]; - - inherit mediainfo; - ffmpeg = ffmpeg-full; - mlt = mlt-full; + patches = [ + ( + substituteAll { + src = ./dependency-paths.patch; + inherit mediainfo glaxnimate; + ffmpeg = ffmpeg-full; + mlt = mlt-full; + } + ) + ]; postPatch = # Module Qt5::Concurrent must be included in `find_package` before it is used. '' sed -i CMakeLists.txt -e '/find_package(Qt5 REQUIRED/ s|)| Concurrent)|' - substituteAllInPlace src/kdenlivesettings.kcfg ''; dontWrapGApps = true; diff --git a/pkgs/applications/kde/kdenlive/dependency-paths.patch b/pkgs/applications/kde/kdenlive/dependency-paths.patch index ba3f7e6c8de98..0139603772687 100644 --- a/pkgs/applications/kde/kdenlive/dependency-paths.patch +++ b/pkgs/applications/kde/kdenlive/dependency-paths.patch @@ -1,6 +1,5 @@ -diff --git a/src/kdenlivesettings.kcfg b/src/kdenlivesettings.kcfg -index 029849e5f..8befe4888 100644 ---- a/src/kdenlivesettings.kcfg +diff -u b/src/kdenlivesettings.kcfg b/src/kdenlivesettings.kcfg +--- b/src/kdenlivesettings.kcfg +++ b/src/kdenlivesettings.kcfg @@ -517,7 +517,7 @@ <group name="env"> @@ -44,3 +43,10 @@ index 029849e5f..8befe4888 100644 </entry> <entry name="processingthreads" type="Int"> +@@ -657,5 +657,5 @@ + <entry name="glaxnimatePath" type="String"> + <label>Path to the Glaxnimate application.</label> +- <default></default> ++ <default>@glaxnimate@/bin/glaxnimate</default> + </entry> + <entry name="nice_tasks" type="Bool"> diff --git a/pkgs/applications/kde/kdevelop/kdevelop.nix b/pkgs/applications/kde/kdevelop/kdevelop.nix index c5e3fcf6b2f84..3c7be8d6172a0 100644 --- a/pkgs/applications/kde/kdevelop/kdevelop.nix +++ b/pkgs/applications/kde/kdevelop/kdevelop.nix @@ -1,5 +1,5 @@ { mkDerivation, lib, cmake, gettext, pkg-config, extra-cmake-modules -, qtquickcontrols, qttools, kde-cli-tools, qtbase +, qtquickcontrols, qttools, kde-cli-tools , kconfig, kdeclarative, kdoctools, kiconthemes, ki18n, kitemmodels, kitemviews , kjobwidgets, kcmutils, kio, knewstuff, knotifyconfig, kparts, ktexteditor , threadweaver, kxmlgui, kwindowsystem, grantlee, kcrash, karchive, kguiaddons diff --git a/pkgs/applications/kde/keysmith.nix b/pkgs/applications/kde/keysmith.nix index 6dd8e3505b537..08327151b580a 100644 --- a/pkgs/applications/kde/keysmith.nix +++ b/pkgs/applications/kde/keysmith.nix @@ -7,6 +7,7 @@ , kdbusaddons , ki18n , kirigami2 +, kirigami-addons , kwindowsystem , libsodium , qtquickcontrols2 @@ -24,6 +25,7 @@ mkDerivation rec { kdbusaddons ki18n kirigami2 + kirigami-addons kwindowsystem libsodium qtquickcontrols2 diff --git a/pkgs/applications/kde/kmahjongg.nix b/pkgs/applications/kde/kmahjongg.nix index 1c2e46c211242..6b089aa156acd 100644 --- a/pkgs/applications/kde/kmahjongg.nix +++ b/pkgs/applications/kde/kmahjongg.nix @@ -17,6 +17,6 @@ mkDerivation { mainProgram = "kmahjongg"; homepage = "https://apps.kde.org/kmahjongg/"; license = with lib.licenses; [ gpl2 ]; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/kde/koko.nix b/pkgs/applications/kde/koko.nix index d47734b94e1f9..4ea96c995bd20 100644 --- a/pkgs/applications/kde/koko.nix +++ b/pkgs/applications/kde/koko.nix @@ -77,6 +77,6 @@ mkDerivation rec { homepage = "https://apps.kde.org/koko/"; # LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL license = [ licenses.lgpl3Only licenses.lgpl21Only ]; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/kde/kongress.nix b/pkgs/applications/kde/kongress.nix index 5738569bae900..f5bfa9f919d11 100644 --- a/pkgs/applications/kde/kongress.nix +++ b/pkgs/applications/kde/kongress.nix @@ -31,6 +31,6 @@ mkDerivation { description = "Companion application for conferences"; homepage = "https://apps.kde.org/kongress/"; license = lib.licenses.gpl3; - maintainers = []; + maintainers = [ ]; }; } diff --git a/pkgs/applications/kde/konquest.nix b/pkgs/applications/kde/konquest.nix index 41ca056f8a96b..ca5be592af141 100644 --- a/pkgs/applications/kde/konquest.nix +++ b/pkgs/applications/kde/konquest.nix @@ -26,6 +26,6 @@ mkDerivation { description = "Galactic strategy game"; mainProgram = "konquest"; license = with lib.licenses; [ gpl2 ]; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/kde/krecorder.nix b/pkgs/applications/kde/krecorder.nix index d6bdfcc4d38cb..78c8e9ebb7fdb 100644 --- a/pkgs/applications/kde/krecorder.nix +++ b/pkgs/applications/kde/krecorder.nix @@ -38,6 +38,6 @@ mkDerivation rec { mainProgram = "krecorder"; homepage = "https://invent.kde.org/plasma-mobile/krecorder"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/kde/krfb.nix b/pkgs/applications/kde/krfb.nix index 367e9ab010812..c1294e1f1e3bb 100644 --- a/pkgs/applications/kde/krfb.nix +++ b/pkgs/applications/kde/krfb.nix @@ -1,5 +1,5 @@ { mkDerivation, lib -, extra-cmake-modules, kdoctools +, extra-cmake-modules, kdoctools, wayland-scanner , kconfig, kcoreaddons, kcrash, kdbusaddons, kdnssd, knotifications, kwallet , kwidgetsaddons, kwindowsystem, kxmlgui, kwayland, kpipewire , libvncserver, libXtst, libXdamage @@ -14,7 +14,7 @@ mkDerivation { license = with lib.licenses; [ gpl2Plus fdl12Plus ]; maintainers = with lib.maintainers; [ jerith666 ]; }; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools wayland-scanner ]; buildInputs = [ libvncserver libXtst libXdamage kconfig kcoreaddons kcrash kdbusaddons knotifications kwallet kwidgetsaddons diff --git a/pkgs/applications/kde/ksudoku.nix b/pkgs/applications/kde/ksudoku.nix index 64567ad9d88f4..8771c878323f7 100644 --- a/pkgs/applications/kde/ksudoku.nix +++ b/pkgs/applications/kde/ksudoku.nix @@ -16,6 +16,6 @@ mkDerivation { description = "Suduko game"; mainProgram = "ksudoku"; license = with lib.licenses; [ gpl2 ]; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/kde/ktorrent.nix b/pkgs/applications/kde/ktorrent.nix index f63865d303035..b33cc3bc541b4 100644 --- a/pkgs/applications/kde/ktorrent.nix +++ b/pkgs/applications/kde/ktorrent.nix @@ -11,7 +11,7 @@ mkDerivation { description = "KDE integrated BtTorrent client"; homepage = "https://apps.kde.org/ktorrent/"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ eelco ]; + maintainers = [ ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; diff --git a/pkgs/applications/kde/ktrip.nix b/pkgs/applications/kde/ktrip.nix index 8780a64d51a98..fd30379465d53 100644 --- a/pkgs/applications/kde/ktrip.nix +++ b/pkgs/applications/kde/ktrip.nix @@ -43,6 +43,6 @@ mkDerivation rec { homepage = "https://apps.kde.org/ktrip/"; # GPL-2.0-or-later license = licenses.gpl2Plus; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/kde/kweather.nix b/pkgs/applications/kde/kweather.nix index 5c2f244fae60e..6e2d3047d0251 100644 --- a/pkgs/applications/kde/kweather.nix +++ b/pkgs/applications/kde/kweather.nix @@ -44,6 +44,6 @@ mkDerivation rec { mainProgram = "kweather"; homepage = "https://invent.kde.org/plasma-mobile/kweather"; license = with licenses; [ gpl2Plus cc-by-40 ]; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/kde/libkdegames.nix b/pkgs/applications/kde/libkdegames.nix index ec53fa9b0507d..89d9626363ea4 100644 --- a/pkgs/applications/kde/libkdegames.nix +++ b/pkgs/applications/kde/libkdegames.nix @@ -20,6 +20,6 @@ mkDerivation { ]; meta = { license = with lib.licenses; [ gpl2 ]; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/kde/libkmahjongg.nix b/pkgs/applications/kde/libkmahjongg.nix index 6fe8c55004c2d..1b202b614880e 100644 --- a/pkgs/applications/kde/libkmahjongg.nix +++ b/pkgs/applications/kde/libkmahjongg.nix @@ -9,7 +9,7 @@ mkDerivation { pname = "libkmahjongg"; meta = { license = with lib.licenses; [ gpl2 ]; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kcompletion kconfig kconfigwidgets kcoreaddons ki18n diff --git a/pkgs/applications/kde/libktorrent.nix b/pkgs/applications/kde/libktorrent.nix index 20975c7eb0ee2..63732bb8dcdf3 100644 --- a/pkgs/applications/kde/libktorrent.nix +++ b/pkgs/applications/kde/libktorrent.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, + mkDerivation, extra-cmake-modules, karchive, kcrash, ki18n, kio, libgcrypt, qca-qt5, solid, boost, gmp @@ -7,10 +7,10 @@ mkDerivation { pname = "libktorrent"; - meta = with lib; { + meta = { description = "BitTorrent library used by KTorrent"; homepage = "https://apps.kde.org/ktorrent/"; - maintainers = with maintainers; [ eelco ]; + maintainers = [ ]; }; nativeBuildInputs = [ extra-cmake-modules ]; diff --git a/pkgs/applications/kde/okular.nix b/pkgs/applications/kde/okular.nix index 927cdb737b98f..bd2794af24212 100644 --- a/pkgs/applications/kde/okular.nix +++ b/pkgs/applications/kde/okular.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivation, lib +{ mkDerivation, lib , extra-cmake-modules, kdoctools , breeze-icons, chmlib, discount, djvulibre, ebook_tools, kactivities , karchive, kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons diff --git a/pkgs/applications/kde/palapeli.nix b/pkgs/applications/kde/palapeli.nix index 37a387af0a3d7..1db865942fd25 100644 --- a/pkgs/applications/kde/palapeli.nix +++ b/pkgs/applications/kde/palapeli.nix @@ -2,7 +2,6 @@ , mkDerivation , extra-cmake-modules , shared-mime-info -, kconfig , kdoctools , kio , ktextwidgets diff --git a/pkgs/applications/kde/spectacle.nix b/pkgs/applications/kde/spectacle.nix index e628a49b81c5c..528c15eb8b734 100644 --- a/pkgs/applications/kde/spectacle.nix +++ b/pkgs/applications/kde/spectacle.nix @@ -5,13 +5,13 @@ , knotifications, kscreen, kwidgetsaddons, kwindowsystem, kxmlgui, libkipi , qtx11extras, knewstuff, kwayland, qttools, kcolorpicker, kimageannotator , qcoro, qtquickcontrols2, wayland, plasma-wayland-protocols, kpurpose, kpipewire -, wrapGAppsHook3 +, wrapGAppsHook3, wayland-scanner }: mkDerivation { pname = "spectacle"; - nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook3 ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook3 wayland-scanner ]; buildInputs = [ kconfig kcoreaddons kdbusaddons kdeclarative ki18n kio knotifications kscreen kwidgetsaddons kwindowsystem kxmlgui libkipi qtx11extras xcb-util-cursor diff --git a/pkgs/applications/kde/telly-skout.nix b/pkgs/applications/kde/telly-skout.nix index 7c249c99f9aa2..00df33583f5c1 100644 --- a/pkgs/applications/kde/telly-skout.nix +++ b/pkgs/applications/kde/telly-skout.nix @@ -20,6 +20,6 @@ mkDerivation { mainProgram = "telly-skout"; homepage = "https://apps.kde.org/telly-skout/"; license = lib.licenses.gpl2Plus; - maintainers = []; + maintainers = [ ]; }; } diff --git a/pkgs/applications/logging/sosreport/default.nix b/pkgs/applications/logging/sosreport/default.nix index 53c071dcc4cb1..2e8e7e4d1f78e 100644 --- a/pkgs/applications/logging/sosreport/default.nix +++ b/pkgs/applications/logging/sosreport/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "sosreport"; - version = "4.7.2"; + version = "4.8.0"; src = fetchFromGitHub { owner = "sosreport"; repo = "sos"; rev = "refs/tags/${version}"; - sha256 = "sha256-67YRmD3kaJbRR7g3w57EwFg7duhcI6zov7gQ4H1MkR8="; + sha256 = "sha256-8laOHFBvlSo70filTd84vMiivcZ9hE8rgFThVVrMwtE="; }; nativeBuildInputs = [ @@ -43,6 +43,6 @@ buildPythonPackage rec { description = "Unified tool for collecting system logs and other debug information"; homepage = "https://github.com/sosreport/sos"; license = licenses.gpl2Only; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/maui/mauikit.nix b/pkgs/applications/maui/mauikit.nix index fcba0fbdf547f..71d148685e7ee 100644 --- a/pkgs/applications/maui/mauikit.nix +++ b/pkgs/applications/maui/mauikit.nix @@ -7,7 +7,6 @@ , ki18n , knotifications , mauiman -, qtbase , qtquickcontrols2 , qtx11extras }: diff --git a/pkgs/applications/misc/1password-gui/darwin.nix b/pkgs/applications/misc/1password-gui/darwin.nix index 6f3d86f51c34c..66af74630c34d 100644 --- a/pkgs/applications/misc/1password-gui/darwin.nix +++ b/pkgs/applications/misc/1password-gui/darwin.nix @@ -1,16 +1,25 @@ -{ stdenv -, pname -, version -, src -, meta -, unzip -, undmg +{ + stdenv, + pname, + version, + src, + meta, + unzip, + undmg, }: stdenv.mkDerivation { - inherit pname version src meta; + inherit + pname + version + src + meta + ; - nativeBuildInputs = [ unzip undmg ]; + nativeBuildInputs = [ + unzip + undmg + ]; sourceRoot = "."; diff --git a/pkgs/applications/misc/1password-gui/default.nix b/pkgs/applications/misc/1password-gui/default.nix index 965d6b487a057..cecb229ce13f2 100644 --- a/pkgs/applications/misc/1password-gui/default.nix +++ b/pkgs/applications/misc/1password-gui/default.nix @@ -1,69 +1,97 @@ -{ stdenv -, callPackage -, channel ? "stable" -, fetchurl -, lib -# This is only relevant for Linux, so we need to pass it through -, polkitPolicyOwners ? [ ] }: +{ + stdenv, + callPackage, + channel ? "stable", + fetchurl, + lib, + # This is only relevant for Linux, so we need to pass it through + polkitPolicyOwners ? [ ], +}: let - pname = "1password"; - version = if channel == "stable" then "8.10.33" else "8.10.34-10.BETA"; + version = if channel == "stable" then "8.10.40" else "8.10.44-21.BETA"; sources = { stable = { x86_64-linux = { url = "https://downloads.1password.com/linux/tar/stable/x86_64/1password-${version}.x64.tar.gz"; - hash = "sha256-njSvRi/sA7l5+XxfCpv3FY9SmCv5oPix9l2EZewZg1M="; + hash = "sha256-viY0SOUhrOvmue6Nolau356rIqwDo2nLzMilFFmNb9g="; }; aarch64-linux = { url = "https://downloads.1password.com/linux/tar/stable/aarch64/1password-${version}.arm64.tar.gz"; - hash = "sha256-g4RMTlBQvJQaPD/6scYjpe7NWrL6gkjvh5b9LubTWaE="; + hash = "sha256-7lUZiS3TSsIVqPoN5A6YqyVaaaRI9BliT51FHkwOPyw="; }; x86_64-darwin = { url = "https://downloads.1password.com/mac/1Password-${version}-x86_64.zip"; - hash = "sha256-YzAYMk3SR+paIQYAZCx840u/k77soy17F15owpqRAU0="; + hash = "sha256-xK/B8J3VP8y1xw3KorzZzPf/LjYmYdOIjDECMJnVv6I="; }; aarch64-darwin = { url = "https://downloads.1password.com/mac/1Password-${version}-aarch64.zip"; - hash = "sha256-FlJnPMIv7mWh3dSACq01f16mB9EkVD2LOg3IIpvjwdY="; + hash = "sha256-iqdK6K7dcypZFGseYal2KjOaqJtUjXeCzbDdx7pDv8A="; }; }; beta = { x86_64-linux = { url = "https://downloads.1password.com/linux/tar/beta/x86_64/1password-${version}.x64.tar.gz"; - hash = "sha256-eX7D8D5KErFIQtyvg4oT+lR3A7sfRFpDMT7duigZTz0="; + hash = "sha256-enorJfbn+xJVy1fG3wjhO3LkSsMncHA9/yA13kG+h4Y="; }; aarch64-linux = { url = "https://downloads.1password.com/linux/tar/beta/aarch64/1password-${version}.arm64.tar.gz"; - hash = "sha256-dajdeU8TtD9Dbnp2MFedAl8tuQr275cUqGAnm/VF+OE="; + hash = "sha256-EUnIIi6DB5kBVid9ExBpNApKItHnRKQziBy/GFt0xag="; }; x86_64-darwin = { url = "https://downloads.1password.com/mac/1Password-${version}-x86_64.zip"; - hash = "sha256-Dm8v7B8qDSBe1i7OJKQFn7YDPkw3Qj8YVtQkaQmdKuc="; + hash = "sha256-U14CjoUJUpd4wWidZz6xGErhHI/VPChqG8cwBTBYoYc="; }; aarch64-darwin = { url = "https://downloads.1password.com/mac/1Password-${version}-aarch64.zip"; - hash = "sha256-QSxJoVPlOQU7hbvbuVcB/kf5umRjJQuygMkXq6lE1CQ="; + hash = "sha256-DD1M2EFSHqG9OHX5Q/CmZLZIKYrBMS4cnX/6tLVi7H0="; }; }; }; src = fetchurl { - inherit (sources.${channel}.${stdenv.system} or (throw "unsupported system ${stdenv.hostPlatform.system}")) url hash; + inherit + (sources.${channel}.${stdenv.system} or (throw "unsupported system ${stdenv.hostPlatform.system}")) + url + hash + ; }; - meta = with lib; { + meta = { + # Requires to be installed in "/Application" which is not possible for now (https://github.com/NixOS/nixpkgs/issues/254944) + broken = stdenv.hostPlatform.isDarwin; description = "Multi-platform password manager"; homepage = "https://1password.com/"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.unfree; - maintainers = with maintainers; [ timstott savannidgerinel sebtm ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + license = lib.licenses.unfree; + maintainers = with lib.maintainers; [ + timstott + savannidgerinel + sebtm + ]; platforms = builtins.attrNames sources.${channel}; mainProgram = "1password"; }; -in if stdenv.isDarwin -then callPackage ./darwin.nix { inherit pname version src meta; } -else callPackage ./linux.nix { inherit pname version src meta polkitPolicyOwners; } +in +if stdenv.hostPlatform.isDarwin then + callPackage ./darwin.nix { + inherit + pname + version + src + meta + ; + } +else + callPackage ./linux.nix { + inherit + pname + version + src + meta + polkitPolicyOwners + ; + } diff --git a/pkgs/applications/misc/1password-gui/linux.nix b/pkgs/applications/misc/1password-gui/linux.nix index bfd9df01dbfac..3361d4e92d9c3 100644 --- a/pkgs/applications/misc/1password-gui/linux.nix +++ b/pkgs/applications/misc/1password-gui/linux.nix @@ -1,55 +1,65 @@ -{ lib -, stdenv -, pname -, version -, src -, meta -, makeShellWrapper -, wrapGAppsHook3 -, alsa-lib -, at-spi2-atk -, at-spi2-core -, atk -, cairo -, cups -, dbus -, expat -, gdk-pixbuf -, glib -, gtk3 -, libX11 -, libXcomposite -, libXdamage -, libXext -, libXfixes -, libXrandr -, libdrm -, libxcb -, libxkbcommon -, libxshmfence -, libGL -, libappindicator-gtk3 -, mesa -, nspr -, nss -, pango -, systemd -, udev -, xdg-utils +{ + lib, + stdenv, + pname, + version, + src, + meta, + makeShellWrapper, + wrapGAppsHook3, + alsa-lib, + at-spi2-atk, + at-spi2-core, + atk, + cairo, + cups, + dbus, + expat, + gdk-pixbuf, + glib, + gtk3, + libX11, + libXcomposite, + libXdamage, + libXext, + libXfixes, + libXrandr, + libdrm, + libxcb, + libxkbcommon, + libxshmfence, + libGL, + libappindicator-gtk3, + mesa, + nspr, + nss, + pango, + systemd, + udev, + xdg-utils, # The 1Password polkit file requires a list of users for whom polkit # integrations should be enabled. This should be a list of strings that # correspond to usernames. -, polkitPolicyOwners ? [] + polkitPolicyOwners ? [ ], }: let # Convert the polkitPolicyOwners variable to a polkit-compatible string for the polkit file. policyOwners = lib.concatStringsSep " " (map (user: "unix-user:${user}") polkitPolicyOwners); -in stdenv.mkDerivation { - inherit pname version src meta; +in +stdenv.mkDerivation { + inherit + pname + version + src + meta + ; - nativeBuildInputs = [ makeShellWrapper wrapGAppsHook3 ]; + nativeBuildInputs = [ + makeShellWrapper + wrapGAppsHook3 + ]; buildInputs = [ glib ]; dontConfigure = true; @@ -58,37 +68,41 @@ in stdenv.mkDerivation { dontWrapGApps = true; installPhase = - let rpath = lib.makeLibraryPath [ - alsa-lib - at-spi2-atk - at-spi2-core - atk - cairo - cups - dbus - expat - gdk-pixbuf - glib - gtk3 - libX11 - libXcomposite - libXdamage - libXext - libXfixes - libXrandr - libdrm - libxcb - libxkbcommon - libxshmfence - libGL - libappindicator-gtk3 - mesa - nspr - nss - pango - systemd - ] + ":${stdenv.cc.cc.lib}/lib64"; - in '' + let + rpath = + lib.makeLibraryPath [ + alsa-lib + at-spi2-atk + at-spi2-core + atk + cairo + cups + dbus + expat + gdk-pixbuf + glib + gtk3 + libX11 + libXcomposite + libXdamage + libXext + libXfixes + libXrandr + libdrm + libxcb + libxkbcommon + libxshmfence + libGL + libappindicator-gtk3 + mesa + nspr + nss + pango + systemd + ] + + ":${stdenv.cc.cc.lib}/lib64"; + in + '' runHook preInstall mkdir -p $out/bin $out/share/1password @@ -99,12 +113,13 @@ in stdenv.mkDerivation { substituteInPlace $out/share/applications/${pname}.desktop \ --replace 'Exec=/opt/1Password/${pname}' 'Exec=${pname}' - '' + (lib.optionalString (polkitPolicyOwners != [ ]) - '' + '' + + (lib.optionalString (polkitPolicyOwners != [ ]) '' # Polkit file mkdir -p $out/share/polkit-1/actions substitute com.1password.1Password.policy.tpl $out/share/polkit-1/actions/com.1password.1Password.policy --replace "\''${POLICY_OWNERS}" "${policyOwners}" - '') + '' + '') + + '' # Icons cp -a resources/icons $out/share diff --git a/pkgs/applications/misc/1password/default.nix b/pkgs/applications/misc/1password/default.nix index 9ecc38a9abbbc..cbc05d27b8780 100644 --- a/pkgs/applications/misc/1password/default.nix +++ b/pkgs/applications/misc/1password/default.nix @@ -32,11 +32,11 @@ stdenv.mkDerivation { else throw "Source for ${pname} is not available for ${system}"; - nativeBuildInputs = [ installShellFiles ] ++ lib.optional stdenv.isLinux autoPatchelfHook; + nativeBuildInputs = [ installShellFiles ] ++ lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook; - buildInputs = lib.optionals stdenv.isDarwin [ xar cpio ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ xar cpio ]; - unpackPhase = lib.optionalString stdenv.isDarwin '' + unpackPhase = lib.optionalString stdenv.hostPlatform.isDarwin '' xar -xf $src zcat op.pkg/Payload | cpio -i ''; @@ -55,7 +55,7 @@ stdenv.mkDerivation { --zsh <($out/bin/${mainProgram} completion zsh) ''; - dontStrip = stdenv.isDarwin; + dontStrip = stdenv.hostPlatform.isDarwin; doInstallCheck = true; diff --git a/pkgs/applications/misc/9menu/default.nix b/pkgs/applications/misc/9menu/default.nix deleted file mode 100644 index e383a2eb6b6fc..0000000000000 --- a/pkgs/applications/misc/9menu/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, pkg-config -, meson -, ninja -, libX11 -, libXext -}: - -stdenv.mkDerivation rec { - pname = "9menu"; - version = "unstable-2021-02-24"; - - src = fetchFromGitHub { - owner = "arnoldrobbins"; - repo = pname; - rev = "00cbf99c48dc580ca28f81ed66c89a98b7a182c8"; - sha256 = "arca8Gbr4ytiCk43cifmNj7SUrDgn1XB26zAhZrVDs0="; - }; - - nativeBuildInputs = [ pkg-config meson ninja ]; - buildInputs = [ libX11 libXext ]; - - meta = with lib; { - homepage = "https://github.com/arnoldrobbins/9menu"; - description = "Simple X11 menu program for running commands"; - mainProgram = "9menu"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = libX11.meta.platforms; - }; -} diff --git a/pkgs/applications/misc/ArchiSteamFarm/default.nix b/pkgs/applications/misc/ArchiSteamFarm/default.nix index ce23bd8ee3f18..efeb82110cf0d 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/default.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/default.nix @@ -11,13 +11,13 @@ buildDotnetModule rec { pname = "ArchiSteamFarm"; # nixpkgs-update: no auto update - version = "6.0.3.4"; + version = "6.0.6.4"; src = fetchFromGitHub { owner = "JustArchiNET"; repo = "ArchiSteamFarm"; rev = version; - hash = "sha256-qYB94SJYCwcUrXdKtD+ZdiPRpwXg3rOHVmFWD+Y1ZXg="; + hash = "sha256-U4RApOUtrZ9su4O1jamjDbVrjozujW+vYRI1R7rSzpc="; }; dotnet-runtime = dotnetCorePackages.aspnetcore_8_0; @@ -27,22 +27,28 @@ buildDotnetModule rec { projectFile = "ArchiSteamFarm.sln"; executable = "ArchiSteamFarm"; + + enableParallelBuilding = false; + + useAppHost = false; dotnetFlags = [ + # useAppHost doesn't explicitly disable this "-p:UseAppHost=false" - ]; - dotnetInstallFlags = [ + "-p:RuntimeIdentifiers=" + ] + ; + dotnetBuildFlags = [ "--framework=net8.0" ]; + dotnetInstallFlags = dotnetBuildFlags; runtimeDeps = [ libkrb5 zlib openssl ]; doCheck = true; - preBuild = '' + preInstall = '' dotnetProjectFiles=(ArchiSteamFarm) - ''; - preInstall = '' # A mutable path, with this directory tree must be set. By default, this would point at the nix store causing errors. makeWrapperArgs+=( --run 'mkdir -p ~/.config/archisteamfarm/{config,logs,plugins}' @@ -55,7 +61,7 @@ buildDotnetModule rec { echo "Publishing plugin $1" dotnet publish $1 -p:ContinuousIntegrationBuild=true -p:Deterministic=true \ --output $out/lib/ArchiSteamFarm/plugins/$1 --configuration Release \ - -p:UseAppHost=false + $dotnetFlags $dotnetInstallFlags } buildPlugin ArchiSteamFarm.OfficialPlugins.ItemsMatcher diff --git a/pkgs/applications/misc/ArchiSteamFarm/deps.nix b/pkgs/applications/misc/ArchiSteamFarm/deps.nix index 79ed6cdf624a5..d33bed6722a47 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/deps.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/deps.nix @@ -2,153 +2,142 @@ # Please dont edit it manually, your changes might get overwritten! { fetchNuGet }: [ - (fetchNuGet { pname = "AngleSharp"; version = "1.1.2"; sha256 = "0rfild46lmqhxkfh6nhy7a9m8zzv25lj29riav5j6dmzw07l7wif"; }) - (fetchNuGet { pname = "AngleSharp.XPath"; version = "2.0.4"; sha256 = "0cqgabpjc7pwhlix5j43x6ppj21qnsc7nswn3zm6z004vcggfwf3"; }) - (fetchNuGet { pname = "ConfigureAwaitChecker.Analyzer"; version = "5.0.0.1"; sha256 = "01llfwhra5m3jj1qpa4rj1hbh01drirakzjc2963vkl9iwrzscyl"; }) - (fetchNuGet { pname = "CryptSharpStandard"; version = "1.0.0"; sha256 = "0nikzb92z4a2n969sz747ginwxsbrap5741bcwwxr4r6m2na9jz7"; }) - (fetchNuGet { pname = "Humanizer"; version = "2.14.1"; sha256 = "18cycx9gvbc3735chdi2r583x73m2fkz1ws03yi3g640j9zv00fp"; }) - (fetchNuGet { pname = "Humanizer.Core"; version = "2.14.1"; sha256 = "1ai7hgr0qwd7xlqfd92immddyi41j3ag91h3594yzfsgsy6yhyqi"; }) - (fetchNuGet { pname = "Humanizer.Core.af"; version = "2.14.1"; sha256 = "197lsky6chbmrixgsg6dvxbdbbpis0an8mn6vnwjcydhncis087h"; }) - (fetchNuGet { pname = "Humanizer.Core.ar"; version = "2.14.1"; sha256 = "03rz12mxrjv5afm1hn4rrpimkkb8wdzp17634dcq10fhpbwhy6i5"; }) - (fetchNuGet { pname = "Humanizer.Core.az"; version = "2.14.1"; sha256 = "138kdhy86afy5n72wy12qlb25q4034z73lz5nbibmkixxdnj9g5r"; }) - (fetchNuGet { pname = "Humanizer.Core.bg"; version = "2.14.1"; sha256 = "0scwzrvv8332prijkbp4y11n172smjb4sf7ygia6bi3ibhzq7zjy"; }) - (fetchNuGet { pname = "Humanizer.Core.bn-BD"; version = "2.14.1"; sha256 = "1322kn7ym46mslh32sgwkv07l3jkkx7cw5wjphql2ziphxw536p8"; }) - (fetchNuGet { pname = "Humanizer.Core.cs"; version = "2.14.1"; sha256 = "1zl3vsdd2pw3nm05qpnr6c75y7gacgaghg9sj07ksvsjmklgqqih"; }) - (fetchNuGet { pname = "Humanizer.Core.da"; version = "2.14.1"; sha256 = "10rmrvzwp212fpxv0sdq8f0sjymccsdn71k99f845kz0js83r70s"; }) - (fetchNuGet { pname = "Humanizer.Core.de"; version = "2.14.1"; sha256 = "0j7kld0jdiqwin83arais9gzjj85mpshmxls64yi58qhl7qjzk0j"; }) - (fetchNuGet { pname = "Humanizer.Core.el"; version = "2.14.1"; sha256 = "143q1321qh5506wwvcpy0fj7hpbd9i1k75247mqs2my05x9vc8n0"; }) - (fetchNuGet { pname = "Humanizer.Core.es"; version = "2.14.1"; sha256 = "011kscy671mgyx412h55b0x9a1ngmdsgqzqq1w0l10xhf90y4hc8"; }) - (fetchNuGet { pname = "Humanizer.Core.fa"; version = "2.14.1"; sha256 = "184dxwkf251c27h7gg9y5zciixgcwy1cmdrs0bqrph7gg69kp6yq"; }) - (fetchNuGet { pname = "Humanizer.Core.fi-FI"; version = "2.14.1"; sha256 = "144jlnlipr3pnbcyhbgrd2lxibx8vy00lp2zn60ihxppgbisircc"; }) - (fetchNuGet { pname = "Humanizer.Core.fr"; version = "2.14.1"; sha256 = "0klnfy8n659sp8zngd87gy7qakd56dwr1axjjzk0zph1zvww09jq"; }) - (fetchNuGet { pname = "Humanizer.Core.fr-BE"; version = "2.14.1"; sha256 = "0b70illi4m58xvlqwcvar0smh6292zadzk2r8c25ryijh6d5a9qv"; }) - (fetchNuGet { pname = "Humanizer.Core.he"; version = "2.14.1"; sha256 = "08xkiv88qqd1b0frpalb2npq9rvz2q1yz48k6dikrjvy6amggirh"; }) - (fetchNuGet { pname = "Humanizer.Core.hr"; version = "2.14.1"; sha256 = "12djmwxfg03018j2bqq5ikwkllyma8k7zmvpw61vxs7cv4izc6wh"; }) - (fetchNuGet { pname = "Humanizer.Core.hu"; version = "2.14.1"; sha256 = "0lw13p9b2kbqf96lif5kx59axxiahd617h154iswjfka9kxdw65x"; }) - (fetchNuGet { pname = "Humanizer.Core.hy"; version = "2.14.1"; sha256 = "1bgm0yabhvsv70amzmkvf3mls32lvd7yyr59yxf3xc96msqczgjh"; }) - (fetchNuGet { pname = "Humanizer.Core.id"; version = "2.14.1"; sha256 = "1w0bnyac46f2321l09ckb6vz66s1bxl27skfww1iwrmf03i7m2cw"; }) - (fetchNuGet { pname = "Humanizer.Core.is"; version = "2.14.1"; sha256 = "10w1fprlhxm1qy3rh0qf6z86ahrv8fcza3wrsx55idlmar1x9jyz"; }) - (fetchNuGet { pname = "Humanizer.Core.it"; version = "2.14.1"; sha256 = "1msrmih8cp7r4yj7r85kr0l5h4yln80450mivliy1x322dav8xz2"; }) - (fetchNuGet { pname = "Humanizer.Core.ja"; version = "2.14.1"; sha256 = "04ry6z0v85y4y5vzbqlbxppfdm04i02dxbxaaykbps09rwqaa250"; }) - (fetchNuGet { pname = "Humanizer.Core.ko-KR"; version = "2.14.1"; sha256 = "156641v0ilrpbzprscvbzfha57pri4y1i66n9v056nc8bm10ggbg"; }) - (fetchNuGet { pname = "Humanizer.Core.ku"; version = "2.14.1"; sha256 = "1scz21vgclbm1xhaw89f0v8s0vx46yv8yk3ij0nr6shsncgq9f7h"; }) - (fetchNuGet { pname = "Humanizer.Core.lv"; version = "2.14.1"; sha256 = "1909dsbxiv2sgj6myfhn8lbbmvkp2hjahj0knawypyq3jw9sq86g"; }) - (fetchNuGet { pname = "Humanizer.Core.ms-MY"; version = "2.14.1"; sha256 = "1dmjrxb0kb297ycr8xf7ni3l7y4wdqrdhqbhy8xnm8dx90nmj9x5"; }) - (fetchNuGet { pname = "Humanizer.Core.mt"; version = "2.14.1"; sha256 = "0b183r1apzfa1hasimp2f27yfjkfp87nfbd8qdyrqdigw6nzcics"; }) - (fetchNuGet { pname = "Humanizer.Core.nb"; version = "2.14.1"; sha256 = "12rd75f83lv6z12b5hbwnarv3dkk29pvc836jpg2mzffm0g0kxj2"; }) - (fetchNuGet { pname = "Humanizer.Core.nb-NO"; version = "2.14.1"; sha256 = "1n033yfw44sjf99mv51c53wggjdffz8b9wv7gwm3q7i6g7ck4vv1"; }) - (fetchNuGet { pname = "Humanizer.Core.nl"; version = "2.14.1"; sha256 = "0q4231by40bsr6mjy93n0zs365pz6da32pwkxcz1cc2hfdlkn0vd"; }) - (fetchNuGet { pname = "Humanizer.Core.pl"; version = "2.14.1"; sha256 = "0h2wbwrlcmjk8b2mryyd8rbb1qmripvg0zyg61gg0hifiqfg3cr2"; }) - (fetchNuGet { pname = "Humanizer.Core.pt"; version = "2.14.1"; sha256 = "0pg260zvyhqz8h1c96px1vs9q5ywvd0j2ixsq21mj96dj7bl5fay"; }) - (fetchNuGet { pname = "Humanizer.Core.ro"; version = "2.14.1"; sha256 = "04mr28bjcb9hs0wmpb4nk2v178i0fjr0ymc78dv9bbqkmrzfsmcn"; }) - (fetchNuGet { pname = "Humanizer.Core.ru"; version = "2.14.1"; sha256 = "060abvk7mrgawipjgw0h4hrvizby7acmj58w2g35fv54g43isgcl"; }) - (fetchNuGet { pname = "Humanizer.Core.sk"; version = "2.14.1"; sha256 = "182xiqf71kiqp42b8yqrag6z57wzqraqi10bnhx0crrc1gxq8v0j"; }) - (fetchNuGet { pname = "Humanizer.Core.sl"; version = "2.14.1"; sha256 = "12ygvzyqa0km7a0wz42zssq8qqakvghh96x1ng7qvwcrna3v2rdi"; }) - (fetchNuGet { pname = "Humanizer.Core.sr"; version = "2.14.1"; sha256 = "1ggj15qksyr16rilq2w76x38bxp6a6z75b30c9b7w5ni88nkgc7x"; }) - (fetchNuGet { pname = "Humanizer.Core.sr-Latn"; version = "2.14.1"; sha256 = "0lwr0gnashirny8lgaw0qnbb7x0qrjg8fs11594x8l7li3mahzz3"; }) - (fetchNuGet { pname = "Humanizer.Core.sv"; version = "2.14.1"; sha256 = "1c7yx59haikdqx7k7vqll6223jjmikgwbl3dzmrcs3laywgfnmgn"; }) - (fetchNuGet { pname = "Humanizer.Core.th-TH"; version = "2.14.1"; sha256 = "0kyyi5wc23i2lcag3zvrhga9gsnba3ahl4kdlaqvvg2jhdfarl4m"; }) - (fetchNuGet { pname = "Humanizer.Core.tr"; version = "2.14.1"; sha256 = "0rdvp0an263b2nj3c5v11hvdwgmj86ljf2m1h3g1x28pygbcx6am"; }) - (fetchNuGet { pname = "Humanizer.Core.uk"; version = "2.14.1"; sha256 = "0a2p6mhh0ajn0y7x98zbfasln1l04iiknd50sgf3svna99wybnxd"; }) - (fetchNuGet { pname = "Humanizer.Core.uz-Cyrl-UZ"; version = "2.14.1"; sha256 = "1jfzfgnk6wz5na2md800vq0djm6z194x618yvwxbnk2c7wikbjj2"; }) - (fetchNuGet { pname = "Humanizer.Core.uz-Latn-UZ"; version = "2.14.1"; sha256 = "0vimhw500rq60naxfari8qm6gjmjm8h9j6c04k67fs447djy8ndi"; }) - (fetchNuGet { pname = "Humanizer.Core.vi"; version = "2.14.1"; sha256 = "1yr0l73cy2qypkssmmjwfbbqgdplam62dqnzk9vx6x47dzpys077"; }) - (fetchNuGet { pname = "Humanizer.Core.zh-CN"; version = "2.14.1"; sha256 = "1k6nnawd016xpwgzdzy84z1lcv2vc1cygcksw19wbgd8dharyyk7"; }) - (fetchNuGet { pname = "Humanizer.Core.zh-Hans"; version = "2.14.1"; sha256 = "0zn99311zfn602phxyskfjq9vly0w5712z6fly8r4q0h94qa8c85"; }) - (fetchNuGet { pname = "Humanizer.Core.zh-Hant"; version = "2.14.1"; sha256 = "0qxjnbdj645l5sd6y3100yyrq1jy5misswg6xcch06x8jv7zaw1p"; }) - (fetchNuGet { pname = "JetBrains.Annotations"; version = "2023.3.0"; sha256 = "0vp4mpn6gfckn8grzjm1jxlbqiq2fglm2rk9wq787adw7rxs8k7w"; }) - (fetchNuGet { pname = "Markdig.Signed"; version = "0.37.0"; sha256 = "0pcysg74pvhqs13087dh5r90xnixklmnz7bwv02304927mkv5345"; }) - (fetchNuGet { pname = "Microsoft.ApplicationInsights"; version = "2.22.0"; sha256 = "0h5qkhmazlvwvjmxxj9pp2404rmvk55yf6npwcmlskv9mgfkli4r"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "8.0.0"; sha256 = "05y1xb5fw8lzvb4si77a5qwfwfz1855crqbphrwky6x9llivbhkx"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "8.0.0"; sha256 = "18zdbcb2bn7wy1dp14z5jyqiiwr9rkad1lcb158r5ikjfq1rg5iw"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "8.0.0"; sha256 = "1nbxzmj6cnccylxis67c54c0ik38ma4rwdvgg6sxd6r04219maqm"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "8.0.0"; sha256 = "1wqkbjd1ywv9w397l7rsb89mijc5n0hv7jq9h09xfz6wn9qsp152"; }) - (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; sha256 = "15gqy2m14fdlvy1g59207h5kisznm355kbw010gy19vh47z8gpz3"; }) - (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.10.0"; sha256 = "0s0v7jmrq85n356xv7zixvwa4z94fszjcr5vll8x4im1a2lp00f9"; }) - (fetchNuGet { pname = "Microsoft.Extensions.ApiDescription.Server"; version = "6.0.5"; sha256 = "1pi2bm3cm0a7jzqzmfc2r7bpcdkmk3hhjfvb2c81j7wl7xdw3624"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "8.0.0"; sha256 = "080kab87qgq2kh0ijry5kfdiq9afyzb8s0k3jqi5zbbi540yq4zl"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "8.0.0"; sha256 = "1jlpa4ggl1gr5fs7fdcw04li3y3iy05w3klr9lrrlc7v8w76kq71"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "8.0.0"; sha256 = "1m0gawiz8f5hc3li9vd5psddlygwgkiw13d7div87kmkf4idza8r"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "8.0.0"; sha256 = "0i7qziz0iqmbk8zzln7kx9vd0lbx1x3va0yi3j1bgkjir13h78ps"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "8.0.0"; sha256 = "1zw0bpp5742jzx03wvqc8csnvsbgdqi0ls9jfc5i2vd3cl8b74pg"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Diagnostics.Abstractions"; version = "8.0.0"; sha256 = "15m4j6w9n8h0mj7hlfzb83hd3wn7aq1s7fxbicm16slsjfwzj82i"; }) - (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Abstractions"; version = "8.0.0"; sha256 = "1idq65fxwcn882c06yci7nscy9i0rgw6mqjrl7362prvvsd9f15r"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Hosting.Abstractions"; version = "8.0.0"; sha256 = "00d5dwmzw76iy8z40ly01hy9gly49a7rpf7k7m99vrid1kxp346h"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "8.0.0"; sha256 = "0nppj34nmq25gnrg0wh1q22y4wdqbih4ax493f226azv8mkp9s1i"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "8.0.0"; sha256 = "1klcqhg3hk55hb6vmjiq2wgqidsl81aldw0li2z98lrwx26msrr6"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.Configuration"; version = "8.0.0"; sha256 = "1d9b734vnll935661wqkgl7ry60rlh5p876l2bsa930mvfsaqfcv"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "8.0.0"; sha256 = "0p50qn6zhinzyhq9sy5svnmqqwhw2jajs2pbjh9sah504wjvhscz"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Options.ConfigurationExtensions"; version = "8.0.0"; sha256 = "04nm8v5a3zp0ill7hjnwnja3s2676b4wffdri8hdk2341p7mp403"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "8.0.0"; sha256 = "0aldaz5aapngchgdr7dax9jw5wy7k7hmjgjpfgfv1wfif27jlkqm"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "7.6.0"; sha256 = "18g4j9n47387k4ym3kl2dzhhhs6fs5rq96757fc4lcdql2rpkmp0"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "7.6.0"; sha256 = "11znwbbg44hhz3ly6j6q81qz83yqf97jj5zhpldng5zq0h791srl"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "7.6.0"; sha256 = "1slkzygcn4abpqip4rmi73h9096ihjkkaiwgmkaiba9pidn9lzlx"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "7.6.0"; sha256 = "1blj1ayw9qpjpsnb4k95s03pdkin0032mxgznfaw1z1qhhiqdnsi"; }) - (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.10.0"; sha256 = "13g8fwl09li8fc71nk13dgkb7gahd4qhamyg2xby7am63nlchhdf"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "8.0.0"; sha256 = "0gwqmkmr7jy3sjh9gha82amlry41gp8nwswy2iqfw54f28db63n7"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "8.0.0"; sha256 = "042cjvnwrrjs3mw5q8q5kinh0cwkks33i3n1vyifaid2jbr3wlc0"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "8.0.0"; sha256 = "06ndp4wh1cap01dql3nixka4g56bf6ipmqys7xaxvg4xisf79x8d"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "8.0.0"; sha256 = "1kh5bnaf6h9mr4swcalrp304625frjiw6mlz1052rxwzsdq98a96"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; }) - (fetchNuGet { pname = "Microsoft.OpenApi"; version = "1.6.14"; sha256 = "1wr8crmjg4gznm3jqgz9s9p285vrwb8a6baqc6gz3b58rn4m88km"; }) - (fetchNuGet { pname = "Microsoft.Testing.Extensions.Telemetry"; version = "1.2.1"; sha256 = "1a6hyd3szjjpjkbr0ncfria0x2qijv3lwr4drhxm15xamfy23azw"; }) - (fetchNuGet { pname = "Microsoft.Testing.Extensions.TrxReport.Abstractions"; version = "1.2.1"; sha256 = "19309m0b9cjy1642m99ipjvr6gxq6qb008bam3l10m1mz8m81j31"; }) - (fetchNuGet { pname = "Microsoft.Testing.Extensions.VSTestBridge"; version = "1.2.1"; sha256 = "1bly8375zng21yjbfdi08c14lgapngv06p1dlzbryimxicqzxixx"; }) - (fetchNuGet { pname = "Microsoft.Testing.Platform"; version = "1.2.1"; sha256 = "0zlbqmvdb1vxnvmxh6lk65mz57c7mz6dqb1s8in0cfww8kxg058k"; }) - (fetchNuGet { pname = "Microsoft.Testing.Platform.MSBuild"; version = "1.2.1"; sha256 = "07674xnhc84h36pvzswx6ibjy0bgfi2bxhqm1zyq9fidmim0ch07"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.10.0"; sha256 = "07j69cw8r39533w4p39mnj00kahazz38760in3jfc45kmlcdb26x"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.5.0"; sha256 = "0qkjyf3ky6xpjg5is2sdsawm99ka7fzgid2bvpglwmmawqgm8gls"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.10.0"; sha256 = "1bl471s7fx9jycr0cc8rylwf34mrvlg9qn1an6l86nisavfcyb7v"; }) - (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; sha256 = "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n"; }) - (fetchNuGet { pname = "MSTest"; version = "3.4.3"; sha256 = "070avma2zdxdpn23a9chgz9n1kglxh8nbb1g2ggzk3xxi5sdjj0n"; }) - (fetchNuGet { pname = "MSTest.Analyzers"; version = "3.4.3"; sha256 = "14a6rzh4cvaf9bw63qlxw242fbmk4agyx9qgl19swpciqcaq7pxi"; }) - (fetchNuGet { pname = "MSTest.TestAdapter"; version = "3.4.3"; sha256 = "0hsslndnfyb6shgkmgy10f1c9p6b47ry20zr2l1msagmkrk49s5q"; }) - (fetchNuGet { pname = "MSTest.TestFramework"; version = "3.4.3"; sha256 = "0hviglzfv16dd3aczny455sy1k0rikzd5w34smfpjyxc0wqx6xvp"; }) - (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; }) - (fetchNuGet { pname = "Nito.AsyncEx.Coordination"; version = "5.1.2"; sha256 = "0sxvmqnv8a94k3pq1w3lh1vgjb8l62h1qamxcjl3pkq634h2fwrl"; }) - (fetchNuGet { pname = "Nito.AsyncEx.Tasks"; version = "5.1.2"; sha256 = "11wp47kc69sjdxrbg5pgx0wlffqlp0x5kr54ggnz2v19kmjz362v"; }) - (fetchNuGet { pname = "Nito.Collections.Deque"; version = "1.1.1"; sha256 = "152564q3s0n5swfv5p5rx0ghn2sm0g2xsnbd7gv8vb9yfklv7yg8"; }) - (fetchNuGet { pname = "Nito.Disposables"; version = "2.2.1"; sha256 = "1hx5k8497j34kxxgh060bvij0vfnraw90dmm3h9bmamcdi8wp80l"; }) - (fetchNuGet { pname = "NLog"; version = "5.3.2"; sha256 = "01qnzmwvc93yywhvy5g29fb8jnalfi82az7296nblyqjalhbzz3g"; }) - (fetchNuGet { pname = "NLog.Extensions.Logging"; version = "5.3.11"; sha256 = "0j276q0a14qk9nc3f03265jl5wp38bnm7dyyx0s4kxkyb3kx3z8c"; }) - (fetchNuGet { pname = "NLog.Web.AspNetCore"; version = "5.3.11"; sha256 = "17xvaj54liyk9zq0f80z1ai6wq4rgj6xy93znvsdcnldmin1icz9"; }) - (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.11.0"; sha256 = "0wv26gq39hfqw9md32amr5771s73f5zn1z9vs4y77cgynxr73s4z"; }) - (fetchNuGet { pname = "OpenTelemetry"; version = "1.7.0-rc.1"; sha256 = "0y16qp3xrypk48f27pfvccic47p9wpl4qx8mar4rf2b78ca21c9p"; }) - (fetchNuGet { pname = "OpenTelemetry"; version = "1.8.1"; sha256 = "1slyjdzbiv179sq91bq6bhbqw20jmk6j9x1g5fhvnqsymfqmnmq2"; }) - (fetchNuGet { pname = "OpenTelemetry.Api"; version = "1.7.0-rc.1"; sha256 = "1i09vjjrimg0bwraamsjdqx886apscwj72skds3ysvc9c7n0hpl2"; }) - (fetchNuGet { pname = "OpenTelemetry.Api"; version = "1.8.0"; sha256 = "0s402mz4gz1chlg29159awawpi6ms4ln5gdds01y38wx6cia6lb9"; }) - (fetchNuGet { pname = "OpenTelemetry.Api"; version = "1.8.1"; sha256 = "0c2dvnnnizn5g50js336lkgfxh6klcdb0h8pppf68v3liwlhxly5"; }) - (fetchNuGet { pname = "OpenTelemetry.Api.ProviderBuilderExtensions"; version = "1.7.0-rc.1"; sha256 = "1ayy2q9cg6482ahvz3cx7a3cikjrnmr5kr7yk9qnbbwy0wfmb6gw"; }) - (fetchNuGet { pname = "OpenTelemetry.Api.ProviderBuilderExtensions"; version = "1.8.0"; sha256 = "1vhl02w068ynhpak0pyjn2xmrnisl9m73lmsckwkncrhinplw7hz"; }) - (fetchNuGet { pname = "OpenTelemetry.Api.ProviderBuilderExtensions"; version = "1.8.1"; sha256 = "0lys1l0qsna2h82j2rbxi5fc8barrq43fs0lradr85r7sy3x91cg"; }) - (fetchNuGet { pname = "OpenTelemetry.Exporter.Prometheus.AspNetCore"; version = "1.7.0-rc.1"; sha256 = "1777nbj78yppmqmwvv0bsl4l0vp8lfc5fpsdmknf6wl354f0z1f8"; }) - (fetchNuGet { pname = "OpenTelemetry.Extensions.Hosting"; version = "1.8.1"; sha256 = "01vi9sqb2j25i6926c581w067nadf4q4hs0hkwjg8wpzhxz0n3xq"; }) - (fetchNuGet { pname = "OpenTelemetry.Instrumentation.AspNetCore"; version = "1.8.1"; sha256 = "0s5kxqjhmwm2p2sblmmsavvmknqb8yr0b07ngq8hk0w8b48kyc0h"; }) - (fetchNuGet { pname = "OpenTelemetry.Instrumentation.Http"; version = "1.8.1"; sha256 = "0p3mw08vi9ljf06239n8b1hfj0cqqb198qn89sf39mdjsy13ca95"; }) - (fetchNuGet { pname = "OpenTelemetry.Instrumentation.Runtime"; version = "1.8.1"; sha256 = "0j2i01378848nvib1krk948lp74x8ykgspka05g37a3s284p1nyd"; }) - (fetchNuGet { pname = "protobuf-net"; version = "3.2.30"; sha256 = "08bjdn8dbqpzn5c9fw89y5766irwplgyzhyxcrjzpywkwpj75r4i"; }) - (fetchNuGet { pname = "protobuf-net.Core"; version = "3.2.30"; sha256 = "01mgw4s0b2vxf55v6fa3n5l9jwk6bkl60aaqv7azl198wwslkjhq"; }) - (fetchNuGet { pname = "SteamKit2"; version = "3.0.0-alpha.1"; sha256 = "01lrbkbpfqdkhba9hsfg9fqyh1sa9r2cp54r2wlb83zfr3f5q8l8"; }) - (fetchNuGet { pname = "Swashbuckle.AspNetCore"; version = "6.6.2"; sha256 = "0lq774iggpvsmykbrplvv2a5z2ylsslv5wynmvpnlznd4lvgxb4h"; }) - (fetchNuGet { pname = "Swashbuckle.AspNetCore.Annotations"; version = "6.6.2"; sha256 = "1snz71ws87kr8pz4c3zcla51mqbly015ib6b0y20xvkj25qx7gl8"; }) - (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.Collections.Immutable"; version = "1.7.1"; sha256 = "1nh4nlxfc7lbnbl86wwk1a3jwl6myz5j6hvgh5sp4krim9901hsq"; }) - (fetchNuGet { pname = "System.Collections.Immutable"; version = "7.0.0"; sha256 = "1n9122cy6v3qhsisc9lzwa1m1j62b8pi2678nsmnlyvfpk0zdagm"; }) - (fetchNuGet { pname = "System.Composition"; version = "8.0.0"; sha256 = "0y7rp5qwwvh430nr0r15zljw01gny8yvr0gg6w5cmsk3q7q7a3dc"; }) - (fetchNuGet { pname = "System.Composition.AttributedModel"; version = "8.0.0"; sha256 = "16j61piz1jf8hbh14i1i4m2r9vw79gdqhjr4f4i588h52249fxlz"; }) - (fetchNuGet { pname = "System.Composition.Convention"; version = "8.0.0"; sha256 = "10fwp7692a6yyw1p8b923k061zh95a6xs3vzfdmdv5pmf41cxlb7"; }) - (fetchNuGet { pname = "System.Composition.Hosting"; version = "8.0.0"; sha256 = "1gbfimhxx6v6073pblv4rl5shz3kgx8lvfif5db26ak8pl5qj4kb"; }) - (fetchNuGet { pname = "System.Composition.Runtime"; version = "8.0.0"; sha256 = "0snljpgfmg0wlkwilkvn9qjjghq1pjdfgdpnwhvl2qw6vzdij703"; }) - (fetchNuGet { pname = "System.Composition.TypedParts"; version = "8.0.0"; sha256 = "0skwla26d8clfz3alr8m42qbzsrbi7dhg74z6ha832b6730mm4pr"; }) - (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "5.0.0"; sha256 = "0phd2qizshjvglhzws1jd0cq4m54gscz4ychzr3x6wbgl4vvfrga"; }) - (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "8.0.0"; sha256 = "0nzra1i0mljvmnj1qqqg37xs7bl71fnpl68nwmdajchh65l878zr"; }) - (fetchNuGet { pname = "System.IO.Hashing"; version = "8.0.0"; sha256 = "1hg5i9hiihj9x4d0mlvhfddmivzrhzz83dyh26fqw1nd8jvqccxk"; }) - (fetchNuGet { pname = "System.Linq.Async"; version = "6.0.1"; sha256 = "10ira8hmv0i54yp9ggrrdm1c06j538sijfjpn1kmnh9j2xk5yzmq"; }) - (fetchNuGet { pname = "System.Reflection.Metadata"; version = "1.6.0"; sha256 = "1wdbavrrkajy7qbdblpbpbalbdl48q3h34cchz24gvdgyrlf15r4"; }) - (fetchNuGet { pname = "System.Security.AccessControl"; version = "5.0.0"; sha256 = "17n3lrrl6vahkqmhlpn3w20afgz09n7i6rv0r3qypngwi7wqdr5r"; }) - (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "8.0.0"; sha256 = "1ysjx3b5ips41s32zacf4vs7ig41906mxrsbmykdzi0hvdmjkgbx"; }) - (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "5.0.0"; sha256 = "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8"; }) - (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "8.0.0"; sha256 = "1lgdd78cik4qyvp2fggaa0kzxasw6kc9a6cjqw46siagrm0qnc3y"; }) + (fetchNuGet { pname = "AngleSharp"; version = "1.1.2"; hash = "sha256-LvJDD+C/NiPLVjEnIWkR+39UkzoeWgPd7BBXakij0WU="; }) + (fetchNuGet { pname = "AngleSharp.XPath"; version = "2.0.4"; hash = "sha256-w3H3HtsEgG/qH5Zre5i2OAh5r+mDyNIjhfweJu9SDzM="; }) + (fetchNuGet { pname = "CryptSharpStandard"; version = "1.0.0"; hash = "sha256-58ukrKgmk9w5ZyuQU67KS3du4zvkfJ1MskKRL9L6M1o="; }) + (fetchNuGet { pname = "Humanizer"; version = "3.0.0-beta.54"; hash = "sha256-QIQFZYsW58l1xi9iw5VyAzo9bCCAojHQKXi0+dMH86Y="; }) + (fetchNuGet { pname = "Humanizer.Core"; version = "3.0.0-beta.54"; hash = "sha256-KQdtkJ1uqstncqPmvWNW/PwMenyw1bW54P9unDVtO0Y="; }) + (fetchNuGet { pname = "Humanizer.Core.af"; version = "3.0.0-beta.54"; hash = "sha256-b2F23Ntez1spMh+H90P1yIMzTghyLSw6SoQgSoH7MGI="; }) + (fetchNuGet { pname = "Humanizer.Core.ar"; version = "3.0.0-beta.54"; hash = "sha256-deIHuegZjN178w9bHU3QgG5wUSm3ZeepyHihBdiXbtQ="; }) + (fetchNuGet { pname = "Humanizer.Core.az"; version = "3.0.0-beta.54"; hash = "sha256-jFMlxjSVIz2Qiv4DSHK2U8OqyBWL9juQOlB2xrC84YE="; }) + (fetchNuGet { pname = "Humanizer.Core.bg"; version = "3.0.0-beta.54"; hash = "sha256-MfCHFo3SjU3QScfD/TQuV7FdR18i6EQVb/ophQY/6Yk="; }) + (fetchNuGet { pname = "Humanizer.Core.bn-BD"; version = "3.0.0-beta.54"; hash = "sha256-lBSo0VFbuIagbznWWK7U+ecr3jz7dBGwFvCx3ligXsk="; }) + (fetchNuGet { pname = "Humanizer.Core.cs"; version = "3.0.0-beta.54"; hash = "sha256-mhD6davLTy+v1tatG7wBYQdpo204hTKureuVpx8E7MA="; }) + (fetchNuGet { pname = "Humanizer.Core.da"; version = "3.0.0-beta.54"; hash = "sha256-5mE9JXGhBichj39Ds8ue4NOymzUQIjjJnSO84fZKK+c="; }) + (fetchNuGet { pname = "Humanizer.Core.de"; version = "3.0.0-beta.54"; hash = "sha256-AknBQzk94LVu2NY2QYJqjCI11pfpLXi2pLgelZCpvds="; }) + (fetchNuGet { pname = "Humanizer.Core.el"; version = "3.0.0-beta.54"; hash = "sha256-O8XR1zUP1lk3OFFI1vtwvzXOoLQfN7LxQlR6MEumPKM="; }) + (fetchNuGet { pname = "Humanizer.Core.es"; version = "3.0.0-beta.54"; hash = "sha256-Mp5SZwO5TOhK+wghOxEoKySlH19xx2Vs80pD8zJuWQU="; }) + (fetchNuGet { pname = "Humanizer.Core.fa"; version = "3.0.0-beta.54"; hash = "sha256-ONY2tAvoVpGbR3rFUsNfN3ldkjb9okH6GNTN72P983Y="; }) + (fetchNuGet { pname = "Humanizer.Core.fi-FI"; version = "3.0.0-beta.54"; hash = "sha256-NgdDNR8qtQYFx8qBcy3ybPqWRBqKy4w7xrL4F/79SvI="; }) + (fetchNuGet { pname = "Humanizer.Core.fr"; version = "3.0.0-beta.54"; hash = "sha256-/aGQGAB4FIZ9P6ah+weq39XOC0MZMGOvhgainLIYvk4="; }) + (fetchNuGet { pname = "Humanizer.Core.fr-BE"; version = "3.0.0-beta.54"; hash = "sha256-bLNidoLR5tZASSP85DCX2QjTPTgqoFZDLsZXov3ec8Q="; }) + (fetchNuGet { pname = "Humanizer.Core.he"; version = "3.0.0-beta.54"; hash = "sha256-Ef0yaO9mbcHqpUhruZpWZgGcLtEZEu4yRC0nvujTOKQ="; }) + (fetchNuGet { pname = "Humanizer.Core.hr"; version = "3.0.0-beta.54"; hash = "sha256-Loifax8U+8ho/Gyw2NcwNFywleKYNB1Hr9waTHGjmrg="; }) + (fetchNuGet { pname = "Humanizer.Core.hu"; version = "3.0.0-beta.54"; hash = "sha256-tPgZGD2AE68c67Rrpo5PK15q9ZXP7RwttaGwGfUp4lU="; }) + (fetchNuGet { pname = "Humanizer.Core.hy"; version = "3.0.0-beta.54"; hash = "sha256-YWwDuwrilm22gzCMui+u71Q+FVg/kMxVa8xCX2v+isU="; }) + (fetchNuGet { pname = "Humanizer.Core.id"; version = "3.0.0-beta.54"; hash = "sha256-SZYleWmQ10OguOylRlgct7TVN8Sc2vrs4g492fteghM="; }) + (fetchNuGet { pname = "Humanizer.Core.is"; version = "3.0.0-beta.54"; hash = "sha256-7xIFwbQqqcFZhJFgQGgcDj0aS9GCkzk5hoxpUSPVfG0="; }) + (fetchNuGet { pname = "Humanizer.Core.it"; version = "3.0.0-beta.54"; hash = "sha256-ckKN4D4Ae/TsxytAeqznNMgzT+Jv82x2MQSnZJMios4="; }) + (fetchNuGet { pname = "Humanizer.Core.ja"; version = "3.0.0-beta.54"; hash = "sha256-kHZAfhn8FXJTND/09ue7wpD7WpGxCWHHpn0CgypJLqw="; }) + (fetchNuGet { pname = "Humanizer.Core.ko-KR"; version = "3.0.0-beta.54"; hash = "sha256-zLT2nlRba85r85s2Bt9WSJwuueYSr3xLwJHOW8Soy20="; }) + (fetchNuGet { pname = "Humanizer.Core.ku"; version = "3.0.0-beta.54"; hash = "sha256-Ef+QUC0b3kE6HmTa8CQinsHyd+ehpFlFxtmr5A/E9dE="; }) + (fetchNuGet { pname = "Humanizer.Core.lb"; version = "3.0.0-beta.54"; hash = "sha256-5hP1M9H+6uo7inDJMYNAjo0r/V3lIPb3mnmUKFe+CCw="; }) + (fetchNuGet { pname = "Humanizer.Core.lt"; version = "3.0.0-beta.54"; hash = "sha256-SVDSW5CLqGL0SzqIJF+LbPuKmD/92CA/xjgsDXucNc8="; }) + (fetchNuGet { pname = "Humanizer.Core.lv"; version = "3.0.0-beta.54"; hash = "sha256-idNNH20jP++HlWli9FAcNoDsGz4Tc5UST4gxlb/ZvJA="; }) + (fetchNuGet { pname = "Humanizer.Core.ms-MY"; version = "3.0.0-beta.54"; hash = "sha256-aOrRmEDXCbN9Fmf0uUFn2zFePDT1uC6/gvqEThH4Frg="; }) + (fetchNuGet { pname = "Humanizer.Core.mt"; version = "3.0.0-beta.54"; hash = "sha256-B5mZrT0iTnfcxAOWNXt+SOXYi1klCqjPiP58p05gfFs="; }) + (fetchNuGet { pname = "Humanizer.Core.nb"; version = "3.0.0-beta.54"; hash = "sha256-+vGxff/C9l6P40MCy24ZEcS+GwlYQoBCjOv1TgX7ZZ0="; }) + (fetchNuGet { pname = "Humanizer.Core.nb-NO"; version = "3.0.0-beta.54"; hash = "sha256-PdAieSuOp883+5fQY4OQYhMXgclTaX7RYSRQgmJcuWM="; }) + (fetchNuGet { pname = "Humanizer.Core.nl"; version = "3.0.0-beta.54"; hash = "sha256-hwpUHNioWLXOAPePZ6atdfm9B2mrv3YDUinxtp5l5cQ="; }) + (fetchNuGet { pname = "Humanizer.Core.pl"; version = "3.0.0-beta.54"; hash = "sha256-MTxJ+XGfR/ShDV5HlI5iOQ8fJpwhLuk+ELwipgz/SYM="; }) + (fetchNuGet { pname = "Humanizer.Core.pt"; version = "3.0.0-beta.54"; hash = "sha256-cshgIqnIU+28cIKiGX4aojdDdAVu0Y3oTo9LPfuuxmk="; }) + (fetchNuGet { pname = "Humanizer.Core.ro"; version = "3.0.0-beta.54"; hash = "sha256-1RsFju1P3XCi+12zWH9jVhp3iQ1htPCq4A3DIE/dErI="; }) + (fetchNuGet { pname = "Humanizer.Core.ru"; version = "3.0.0-beta.54"; hash = "sha256-c5Ll2kUZm1vhDfkIblW2yi+MmQTSCrDmjaS9FkC63nc="; }) + (fetchNuGet { pname = "Humanizer.Core.sk"; version = "3.0.0-beta.54"; hash = "sha256-MeFFOBinomAJ1aooldh2BfFi2jKl4gsf3rF6sqHiRRE="; }) + (fetchNuGet { pname = "Humanizer.Core.sl"; version = "3.0.0-beta.54"; hash = "sha256-ggOLhhI8RcjmG4nG6vJVK4EbubN/Mw1l1n8CchgMZJc="; }) + (fetchNuGet { pname = "Humanizer.Core.sr"; version = "3.0.0-beta.54"; hash = "sha256-05yA3P0VMmRFfq0v0hCItNuYt++LDkBCk7ScYa3UOXw="; }) + (fetchNuGet { pname = "Humanizer.Core.sr-Latn"; version = "3.0.0-beta.54"; hash = "sha256-62kozBOCEdLM1W1AzqsoMHGtU3S3msK2uGTm7qxCf5Q="; }) + (fetchNuGet { pname = "Humanizer.Core.sv"; version = "3.0.0-beta.54"; hash = "sha256-g+t6p+0AqyptEHkc+a1HKm77vBggMTNeqQf6KjeuygU="; }) + (fetchNuGet { pname = "Humanizer.Core.th-TH"; version = "3.0.0-beta.54"; hash = "sha256-mGYaSb8TaThiJc+iJ1mj6zjzQOjQSbTlaGs4mZyAiQA="; }) + (fetchNuGet { pname = "Humanizer.Core.tr"; version = "3.0.0-beta.54"; hash = "sha256-NOeZorj9vNpsImBcUjqlc7bN1bugS1rS1/4QVV8oYMk="; }) + (fetchNuGet { pname = "Humanizer.Core.uk"; version = "3.0.0-beta.54"; hash = "sha256-fY/xIRXhIWofcCQg3aBJ9Jue0A8p1K7qEZjwGsJKpQ4="; }) + (fetchNuGet { pname = "Humanizer.Core.uz-Cyrl-UZ"; version = "3.0.0-beta.54"; hash = "sha256-vnFy9SKfYZXM0o824X1/bgoux+r0zCbblcYx7yj0PQU="; }) + (fetchNuGet { pname = "Humanizer.Core.uz-Latn-UZ"; version = "3.0.0-beta.54"; hash = "sha256-5xUO7jqWUeq5OSNiiORBf/5Wa9faV8e0D0NQahGn4S4="; }) + (fetchNuGet { pname = "Humanizer.Core.vi"; version = "3.0.0-beta.54"; hash = "sha256-rcCMfEmpjuUTF5rOG0mAoq8JtV5Rk4QNxAvaW+TD9O4="; }) + (fetchNuGet { pname = "Humanizer.Core.zh-CN"; version = "3.0.0-beta.54"; hash = "sha256-fh4CRrhOAkuY89dtwHCkbclG8AxjizRQSJCLJvpRGyo="; }) + (fetchNuGet { pname = "Humanizer.Core.zh-Hans"; version = "3.0.0-beta.54"; hash = "sha256-0BXsdNBRWTqaloHdCCpVjAyU9IHz5FtweHjqvzpwW4Q="; }) + (fetchNuGet { pname = "Humanizer.Core.zh-Hant"; version = "3.0.0-beta.54"; hash = "sha256-lemSDWy2Jz6gg8+ObqC3uyw846yghzmVUeakNZj7prg="; }) + (fetchNuGet { pname = "JetBrains.Annotations"; version = "2024.2.0"; hash = "sha256-OgtW4wIqo5d3q6NSiYrUm4KkUdUHEWFyvlbtoQJjDwU="; }) + (fetchNuGet { pname = "Markdig.Signed"; version = "0.37.0"; hash = "sha256-hYyyZz0iETAE2HydbyudPdoOUi6wHQRG0BjuS87Tnl0="; }) + (fetchNuGet { pname = "Microsoft.ApplicationInsights"; version = "2.22.0"; hash = "sha256-mUQ63atpT00r49ca50uZu2YCiLg3yd6r3HzTryqcuEA="; }) + (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; hash = "sha256-49+H/iFwp+AfCICvWcqo9us4CzxApPKC37Q5Eqrw+JU="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.ResxSourceGenerator"; version = "3.11.0-beta1.24324.1"; hash = "sha256-+YEdFt4em1e8SMC3PnRAwOfyMZLwWPJo7/loTt7l9kQ="; }) + (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.10.0"; hash = "sha256-yQFwqVChRtIRpbtkJr92JH2i+O7xn91NGbYgnKs8G2g="; }) + (fetchNuGet { pname = "Microsoft.Extensions.ApiDescription.Server"; version = "6.0.5"; hash = "sha256-RJjBWz+UHxkQE2s7CeGYdTZ218mCufrxl0eBykZdIt4="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "8.0.0"; hash = "sha256-9BPsASlxrV8ilmMCjdb3TiUcm5vFZxkBnAI/fNBSEyA="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "8.0.0"; hash = "sha256-4eBpDkf7MJozTZnOwQvwcfgRKQGcNXe0K/kF+h5Rl8o="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "8.0.0"; hash = "sha256-GanfInGzzoN2bKeNwON8/Hnamr6l7RTpYLA49CNXD9Q="; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "8.0.0"; hash = "sha256-+qIDR8hRzreCHNEDtUcPfVHQdurzWPo/mqviCH78+EQ="; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "8.0.0"; hash = "sha256-75KzEGWjbRELczJpCiJub+ltNUMMbz5A/1KQU+5dgP8="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Diagnostics.Abstractions"; version = "8.0.0"; hash = "sha256-USD5uZOaahMqi6u7owNWx/LR4EDrOwqPrAAim7iRpJY="; }) + (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Abstractions"; version = "8.0.0"; hash = "sha256-uQSXmt47X2HGoVniavjLICbPtD2ReQOYQMgy3l0xuMU="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Hosting.Abstractions"; version = "8.0.0"; hash = "sha256-0JBx+wwt5p1SPfO4m49KxNOXPAzAU0A+8tEc/itvpQE="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "8.0.0"; hash = "sha256-Meh0Z0X7KyOEG4l0RWBcuHHihcABcvCyfUXgasmQ91o="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "8.0.0"; hash = "sha256-Jmddjeg8U5S+iBTwRlVAVLeIHxc4yrrNgqVMOB7EjM4="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Configuration"; version = "8.0.0"; hash = "sha256-mzmstNsVjKT0EtQcdAukGRifD30T82BMGYlSu8k4K7U="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "8.0.0"; hash = "sha256-n2m4JSegQKUTlOsKLZUUHHKMq926eJ0w9N9G+I3FoFw="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Options.ConfigurationExtensions"; version = "8.0.0"; hash = "sha256-A5Bbzw1kiNkgirk5x8kyxwg9lLTcSngojeD+ocpG1RI="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "8.0.0"; hash = "sha256-FU8qj3DR8bDdc1c+WeGZx/PCZeqqndweZM9epcpXjSo="; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "8.0.2"; hash = "sha256-j37WWYrYgINKVn5eWhytGad7k2GwQPCemumJXU7cHsw="; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "8.0.2"; hash = "sha256-siKloYOZKBRV//apM/O+A+KwhAWTZ0ZnnCI7Pq+pxMs="; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "8.0.2"; hash = "sha256-Ref5E5JXHXDAdog/Yix25fsYO7R4eCHP8L/GIJz70p8="; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "8.0.2"; hash = "sha256-VM5Tw4lS1XxVajmA8PB4yn8J+Abi388U//5//0aNOHo="; }) + (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.10.0"; hash = "sha256-rkHIqB2mquNXF89XBTFpUL2z5msjTBsOcyjSBCh36I0="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; hash = "sha256-LIcg1StDcQLPOABp4JRXIs837d7z0ia6+++3SF3jl1c="; }) + (fetchNuGet { pname = "Microsoft.OpenApi"; version = "1.6.14"; hash = "sha256-dSJUic2orPGfYVgto9DieRckbtLpPyxHtf+RJ2tmKPM="; }) + (fetchNuGet { pname = "Microsoft.Testing.Extensions.Telemetry"; version = "1.3.2"; hash = "sha256-q6ZGafMpM3HunHtjVATcIa+gPUM1ef4y3Do8Syf2pa4="; }) + (fetchNuGet { pname = "Microsoft.Testing.Extensions.TrxReport.Abstractions"; version = "1.3.2"; hash = "sha256-0+O40vygEoX0K2NDMSv1zFB4H10su0FAA1QTqzi1KcA="; }) + (fetchNuGet { pname = "Microsoft.Testing.Extensions.VSTestBridge"; version = "1.3.2"; hash = "sha256-H8dK/+S39mXZWnM9dB0CQhu23vQD9JRAaHivnutUDEY="; }) + (fetchNuGet { pname = "Microsoft.Testing.Platform"; version = "1.3.2"; hash = "sha256-1H34nSpdSL+P91F5Ynjr8590eNFcm+1Rp27vYclx2Xc="; }) + (fetchNuGet { pname = "Microsoft.Testing.Platform.MSBuild"; version = "1.3.2"; hash = "sha256-1SVTVvrFqStKoxuQSqaKBuKp+qDHZkCTpIECPuEEdQI="; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.10.0"; hash = "sha256-3YjVGK2zEObksBGYg8b/CqoJgLQ1jUv4GCWNjDhLRh4="; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.10.0"; hash = "sha256-+yzP3FY6WoOosSpYnB7duZLhOPUZMQYy8zJ1d3Q4hK4="; }) + (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; hash = "sha256-9kylPGfKZc58yFqNKa77stomcoNnMeERXozWJzDcUIA="; }) + (fetchNuGet { pname = "MSTest"; version = "3.5.2"; hash = "sha256-BZLyxq2WtJL338s9cIVlpodvVInsrjZ6L7vYalIFk5Y="; }) + (fetchNuGet { pname = "MSTest.Analyzers"; version = "3.5.2"; hash = "sha256-Jwmtm/+yk8DoPnjOqauDXknVtmVzsrmqJwZuP6QfHvw="; }) + (fetchNuGet { pname = "MSTest.TestAdapter"; version = "3.5.2"; hash = "sha256-tbKREqe9w5Tkhib4AfWR9vB7DYLmvAjEov8UM2D2gA0="; }) + (fetchNuGet { pname = "MSTest.TestFramework"; version = "3.5.2"; hash = "sha256-ZudwTMNhxbxehLz9hCOgrhTzegVs4P6avUpFiez+u10="; }) + (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; hash = "sha256-K2tSVW4n4beRPzPu3rlVaBEMdGvWSv/3Q1fxaDh4Mjo="; }) + (fetchNuGet { pname = "Nito.AsyncEx.Coordination"; version = "5.1.2"; hash = "sha256-NHMnIBkGzzuoZL0qHKAwFC35doB08IDvmCQptC2uu2s="; }) + (fetchNuGet { pname = "Nito.AsyncEx.Tasks"; version = "5.1.2"; hash = "sha256-W5jxZZ0pbPHte6TkWTq4FDtHOejvlrdyb1Inw+Yhl4c="; }) + (fetchNuGet { pname = "Nito.Collections.Deque"; version = "1.1.1"; hash = "sha256-6Pmz6XQ+rY32O21Z3cUDVQsLH+i53LId18UCPTAxRZQ="; }) + (fetchNuGet { pname = "Nito.Disposables"; version = "2.2.1"; hash = "sha256-FKDLUWysqroSHLU2kLjK1m0g417AAPh6n2TIkwiapcM="; }) + (fetchNuGet { pname = "NLog"; version = "5.3.3"; hash = "sha256-M6IbNKj4cUplxS7vi54m2SZe4bQdmMusDTMmsjqmZKg="; }) + (fetchNuGet { pname = "NLog.Extensions.Logging"; version = "5.3.12"; hash = "sha256-KAqPPDIXrqM85yb1TfhqHUhBYrHug/bOlrEepV+0BEc="; }) + (fetchNuGet { pname = "NLog.Web.AspNetCore"; version = "5.3.12"; hash = "sha256-ZnPQeBLrGkP4EqfoJtDjJuuPqCZW5AMv/3XJaB0o0L0="; }) + (fetchNuGet { pname = "OpenTelemetry"; version = "1.9.0"; hash = "sha256-QVV6ecnVk73bvi4Lw1RnTsaEUH/6CT0/zIJkYdg6CGg="; }) + (fetchNuGet { pname = "OpenTelemetry.Api"; version = "1.9.0"; hash = "sha256-raXpHi2DZ3mSLn9dnJYF64XaP23epdfu8zgagSpm8+4="; }) + (fetchNuGet { pname = "OpenTelemetry.Api.ProviderBuilderExtensions"; version = "1.9.0"; hash = "sha256-Yy3EcKBW7XH7nhLcvwQB0NIfxiGChuy6UPc7MJpxEbE="; }) + (fetchNuGet { pname = "OpenTelemetry.Exporter.Prometheus.AspNetCore"; version = "1.9.0-beta.2"; hash = "sha256-zV4sKZ3v2uSPPy0HLbAE6XwGt6r8R5UVdFJ/tVDiKWg="; }) + (fetchNuGet { pname = "OpenTelemetry.Extensions.Hosting"; version = "1.9.0"; hash = "sha256-vvIrTeDGzgz8dI7/SkLL0ZrV+9u3e9uhvW6VVdsd6Ps="; }) + (fetchNuGet { pname = "OpenTelemetry.Instrumentation.AspNetCore"; version = "1.9.0"; hash = "sha256-XYqa7kV4rhHPCgHsjQtMvyKCemW1OvQd/23QhjquYR4="; }) + (fetchNuGet { pname = "OpenTelemetry.Instrumentation.Http"; version = "1.9.0"; hash = "sha256-y/UbDt6n6heD+ayzv0xPurXLFNL+eSldwqoyGpvCg7o="; }) + (fetchNuGet { pname = "OpenTelemetry.Instrumentation.Runtime"; version = "1.9.0"; hash = "sha256-Xov89h4Py7MCz6SAOjV0tjtZvvjHbx7NyPXZsY1PZhk="; }) + (fetchNuGet { pname = "protobuf-net"; version = "3.2.30"; hash = "sha256-keRy5OWT+/tlZt3D7x+9PEdjTvEJcZdYsf/i1ZBtciE="; }) + (fetchNuGet { pname = "protobuf-net.Core"; version = "3.2.30"; hash = "sha256-GMpJNecoBfrV2VgpYOhcZnKZaLFDObNLcX2LBTThrwY="; }) + (fetchNuGet { pname = "SteamKit2"; version = "3.0.0-beta.2"; hash = "sha256-aQ1zMyWPOvGFcDYYscn/qTpnWS4HfK/k1NLk37zeVAE="; }) + (fetchNuGet { pname = "Swashbuckle.AspNetCore"; version = "6.7.2"; hash = "sha256-clFYZAy7v6mbWr1a+yy0BVbqoQGlqDvzXGlVMXzqg9s="; }) + (fetchNuGet { pname = "Swashbuckle.AspNetCore.Annotations"; version = "6.7.2"; hash = "sha256-tBsLIRSWAknFWvNu524sSFmOB4aIKuYX9I3Wp9AHxwE="; }) + (fetchNuGet { pname = "Swashbuckle.AspNetCore.Swagger"; version = "6.7.2"; hash = "sha256-cH+/13iri7PMxlymzLUT+YEoJKxlXNNK56x8oQAkuAs="; }) + (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerGen"; version = "6.7.2"; hash = "sha256-EzHxMjlwAsyNOFdHZTiQ7Wk6ZEWpRJqwoQGSe/eFoJE="; }) + (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerUI"; version = "6.7.2"; hash = "sha256-4+aBYecxcA/Et8sAxoJ2+e86WO7s3rYT6xd9MOaQIxQ="; }) + (fetchNuGet { pname = "System.Collections.Immutable"; version = "1.7.1"; hash = "sha256-WMMAUqoxT3J1gW9DI8v31VAuhwqTc4Posose5jq1BNo="; }) + (fetchNuGet { pname = "System.Collections.Immutable"; version = "7.0.0"; hash = "sha256-9an2wbxue2qrtugYES9awshQg+KfJqajhnhs45kQIdk="; }) + (fetchNuGet { pname = "System.Composition"; version = "8.0.0"; hash = "sha256-rA118MFj6soKN++BvD3y9gXAJf0lZJAtGARuznG5+Xg="; }) + (fetchNuGet { pname = "System.Composition.AttributedModel"; version = "8.0.0"; hash = "sha256-n3aXiBAFIlQicSRLiNtLh++URSUxRBLggsjJ8OMNRpo="; }) + (fetchNuGet { pname = "System.Composition.Convention"; version = "8.0.0"; hash = "sha256-Z9HOAnH1lt1qc38P3Y0qCf5gwBwiLXQD994okcy53IE="; }) + (fetchNuGet { pname = "System.Composition.Hosting"; version = "8.0.0"; hash = "sha256-axKJC71oKiNWKy66TVF/c3yoC81k03XHAWab3mGNbr0="; }) + (fetchNuGet { pname = "System.Composition.Runtime"; version = "8.0.0"; hash = "sha256-AxwZ29+GY0E35Pa255q8AcMnJU52Txr5pBy86t6V1Go="; }) + (fetchNuGet { pname = "System.Composition.TypedParts"; version = "8.0.0"; hash = "sha256-+ZJawThmiYEUNJ+cB9uJK+u/sCAVZarGd5ShZoSifGo="; }) + (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "5.0.0"; hash = "sha256-6mW3N6FvcdNH/pB58pl+pFSCGWgyaP4hfVtC/SMWDV4="; }) + (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "8.0.0"; hash = "sha256-+aODaDEQMqla5RYZeq0Lh66j+xkPYxykrVvSCmJQ+Vs="; }) + (fetchNuGet { pname = "System.IO.Hashing"; version = "8.0.0"; hash = "sha256-szOGt0TNBo6dEdC3gf6H+e9YW3Nw0woa6UnCGGGK5cE="; }) + (fetchNuGet { pname = "System.Linq.Async"; version = "6.0.1"; hash = "sha256-uH5fZhcyQVtnsFc6GTUaRRrAQm05v5euJyWCXSFSOYI="; }) + (fetchNuGet { pname = "System.Memory"; version = "4.5.5"; hash = "sha256-EPQ9o1Kin7KzGI5O3U3PUQAZTItSbk9h/i4rViN3WiI="; }) + (fetchNuGet { pname = "System.Reflection.Metadata"; version = "1.6.0"; hash = "sha256-JJfgaPav7UfEh4yRAQdGhLZF1brr0tUWPl6qmfNWq/E="; }) + (fetchNuGet { pname = "System.Security.AccessControl"; version = "5.0.0"; hash = "sha256-ueSG+Yn82evxyGBnE49N4D+ngODDXgornlBtQ3Omw54="; }) + (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "8.0.0"; hash = "sha256-fb0pa9sQxN+mr0vnXg1Igbx49CaOqS+GDkTfWNboUvs="; }) + (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "5.0.0"; hash = "sha256-CBOQwl9veFkrKK2oU8JFFEiKIh/p+aJO+q9Tc2Q/89Y="; }) + (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "8.0.0"; hash = "sha256-fjCLQc1PRW0Ix5IZldg0XKv+J1DqPSfu9pjMyNBp7dE="; }) + (fetchNuGet { pname = "System.ValueTuple"; version = "4.5.0"; hash = "sha256-niH6l2fU52vAzuBlwdQMw0OEoRS/7E1w5smBFoqSaAI="; }) ] diff --git a/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix b/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix index 004aadbe781ea..8231e831b4fe7 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix @@ -2,7 +2,7 @@ buildNpmPackage rec { pname = "asf-ui"; - version = "78188871dfce90fb04096e9fd0b6ce2411312dae"; + version = "1641151b9f430908bc63bbe9927fa8414538e7f1"; src = fetchFromGitHub { owner = "JustArchiNET"; @@ -10,10 +10,10 @@ buildNpmPackage rec { # updated by the update script # this is always the commit that should be used with asf-ui from the latest asf version rev = version; - hash = "sha256-NBxN3pQFiDsRYp2Ro0WwWdGzKVjPTKx4/xWQrMNuv0M="; + hash = "sha256-0qfX0vHaDY4Mv9N6nXcn2/9DgRAAl07c8eNHBC3rX6I="; }; - npmDepsHash = "sha256-9pLbSOMfKwkWtzmKNmeKNrgdtzh3riWWJlrbuoDRUrw="; + npmDepsHash = "sha256-/DRkzwU32RgXR+58MrD2KbxF55nJJxnMAnU3kafqtXg="; installPhase = '' runHook preInstall diff --git a/pkgs/applications/misc/OSCAR/default.nix b/pkgs/applications/misc/OSCAR/default.nix index 223fff1080e55..fab17cb0737dc 100644 --- a/pkgs/applications/misc/OSCAR/default.nix +++ b/pkgs/applications/misc/OSCAR/default.nix @@ -7,7 +7,7 @@ mkDerivation rec { owner = "pholy"; repo = "OSCAR-code"; rev = "v${version}"; - sha256 = "sha256-FBHbPtMZeIgcR1pQflfEWK2FS8bquctXaeY/yaZofHg="; + hash = "sha256-FBHbPtMZeIgcR1pQflfEWK2FS8bquctXaeY/yaZofHg="; }; buildInputs = [ qtbase qttools qtserialport libGLU ]; diff --git a/pkgs/applications/misc/albert/default.nix b/pkgs/applications/misc/albert/default.nix deleted file mode 100644 index 5b1e1aac20c1a..0000000000000 --- a/pkgs/applications/misc/albert/default.nix +++ /dev/null @@ -1,84 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, libqalculate -, muparser -, libarchive -, python3Packages -, qtbase -, qtscxml -, qtsvg -, qtdeclarative -, qtwayland -, qt5compat -, qttools -, wrapQtAppsHook -, nix-update-script -, pkg-config -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "albert"; - version = "0.23.0"; - - src = fetchFromGitHub { - owner = "albertlauncher"; - repo = "albert"; - rev = "v${finalAttrs.version}"; - sha256 = "sha256-L6qHaksArgwySk6J7N5zamUDWh5qa6zTtPFdpxU2NTM="; - fetchSubmodules = true; - }; - - nativeBuildInputs = [ - cmake - pkg-config - wrapQtAppsHook - ]; - - buildInputs = [ - libqalculate - libarchive - muparser - qtbase - qtscxml - qtsvg - qtdeclarative - qtwayland - qt5compat - qttools - ] ++ (with python3Packages; [ python pybind11 ]); - - postPatch = '' - find -type f -name CMakeLists.txt -exec sed -i {} -e '/INSTALL_RPATH/d' \; - - sed -i src/qtpluginprovider.cpp \ - -e "/QStringList dirs = {/a QFileInfo(\"$out/lib\").canonicalFilePath()," - ''; - - postFixup = '' - for i in $out/{bin/.albert-wrapped,lib/albert/plugins/*.so}; do - patchelf $i --add-rpath $out/lib/albert - done - ''; - - passthru = { - updateScript = nix-update-script { }; - }; - - meta = with lib; { - description = "Fast and flexible keyboard launcher"; - longDescription = '' - Albert is a desktop agnostic launcher. Its goals are usability and beauty, - performance and extensibility. It is written in C++ and based on the Qt - framework. - ''; - homepage = "https://albertlauncher.github.io"; - changelog = "https://github.com/albertlauncher/albert/blob/${finalAttrs.src.rev}/CHANGELOG.md"; - # See: https://github.com/NixOS/nixpkgs/issues/279226 - license = licenses.unfree; - maintainers = with maintainers; [ ericsagnes synthetica ]; - mainProgram = "albert"; - platforms = platforms.linux; - }; -}) diff --git a/pkgs/applications/misc/anup/default.nix b/pkgs/applications/misc/anup/default.nix index 91cf5c9540a5b..a72ba17eb6b4a 100644 --- a/pkgs/applications/misc/anup/default.nix +++ b/pkgs/applications/misc/anup/default.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ sqlite xdg-utils - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; diff --git a/pkgs/applications/misc/ape/apeclex.nix b/pkgs/applications/misc/ape/apeclex.nix index 81096d9877f76..7f0523270f283 100644 --- a/pkgs/applications/misc/ape/apeclex.nix +++ b/pkgs/applications/misc/ape/apeclex.nix @@ -4,5 +4,5 @@ callPackage ./. { pname = "ape-clex"; lexiconPath = "${attemptoClex}/clex_lexicon.pl"; description = "Parser for Attempto Controlled English (ACE) with a large lexicon (~100,000 entries)"; - license = with lib; [ licenses.lgpl3 licenses.gpl3 ]; + license = with lib.licenses; [ lgpl3 gpl3 ]; } diff --git a/pkgs/applications/misc/ape/default.nix b/pkgs/applications/misc/ape/default.nix index e50d766a88b2b..598ad82c1e35f 100644 --- a/pkgs/applications/misc/ape/default.nix +++ b/pkgs/applications/misc/ape/default.nix @@ -1,9 +1,9 @@ -{ lib, stdenv, swiProlog, makeWrapper, +{ lib, stdenv, swi-prolog, makeWrapper, fetchFromGitHub, lexiconPath ? "prolog/lexicon/clex_lexicon.pl", pname ? "ape", description ? "Parser for Attempto Controlled English (ACE)", - license ? with lib; licenses.lgpl3 + license ? lib.licenses.lgpl3 }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { version = "2019-08-10"; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ swiProlog ]; + buildInputs = [ swi-prolog ]; src = fetchFromGitHub { owner = "Attempto"; diff --git a/pkgs/applications/misc/appcleaner/default.nix b/pkgs/applications/misc/appcleaner/default.nix index eff32c76f988a..62d9e2b1116fa 100644 --- a/pkgs/applications/misc/appcleaner/default.nix +++ b/pkgs/applications/misc/appcleaner/default.nix @@ -29,7 +29,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { homepage = "https://freemacsoft.net/appcleaner"; license = licenses.unfree; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - maintainers = with maintainers; [ emilytrau Enzime ]; + maintainers = with maintainers; [ emilytrau ]; platforms = platforms.darwin; }; }) diff --git a/pkgs/applications/misc/archivebox/default.nix b/pkgs/applications/misc/archivebox/default.nix index 996c11292ab10..4344c6e7e91d8 100644 --- a/pkgs/applications/misc/archivebox/default.nix +++ b/pkgs/applications/misc/archivebox/default.nix @@ -15,6 +15,7 @@ let python = python3.override { + self = python; packageOverrides = self: super: { django = super.django_3.overridePythonAttrs (old: rec { version = "3.1.14"; diff --git a/pkgs/applications/misc/archivy/default.nix b/pkgs/applications/misc/archivy/default.nix index c81d4f65d785e..902bc903bf467 100644 --- a/pkgs/applications/misc/archivy/default.nix +++ b/pkgs/applications/misc/archivy/default.nix @@ -5,6 +5,7 @@ let py = python3.override { + self = py; packageOverrides = self: super: { wtforms = super.wtforms.overridePythonAttrs (oldAttrs: rec { version = "2.3.1"; @@ -32,7 +33,6 @@ buildPythonApplication rec { hash = "sha256-ns1Y0DqqnTAQMEt+oBJ/P2gqKqPsX9P3/Z4561qzuns"; }; - nativeBuildInputs = [ pythonRelaxDepsHook ]; pythonRelaxDeps = true; diff --git a/pkgs/applications/misc/artha/default.nix b/pkgs/applications/misc/artha/default.nix index ee22c2776c5a1..e3f42c153ebb7 100644 --- a/pkgs/applications/misc/artha/default.nix +++ b/pkgs/applications/misc/artha/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { description = "Offline thesaurus based on WordNet"; homepage = "https://artha.sourceforge.net"; license = licenses.gpl2; - maintainers = [ maintainers.goibhniu ]; + maintainers = [ ]; platforms = platforms.linux; mainProgram = "artha"; }; diff --git a/pkgs/applications/misc/audio/sox/default.nix b/pkgs/applications/misc/audio/sox/default.nix index 44e1f0992ad73..621fca6feb2d7 100644 --- a/pkgs/applications/misc/audio/sox/default.nix +++ b/pkgs/applications/misc/audio/sox/default.nix @@ -31,7 +31,7 @@ , enableAMR ? false , amrnb , amrwb -, enableLibpulseaudio ? stdenv.isLinux && lib.meta.availableOn stdenv.hostPlatform libpulseaudio +, enableLibpulseaudio ? stdenv.hostPlatform.isLinux && lib.meta.availableOn stdenv.hostPlatform libpulseaudio , libpulseaudio }: @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { patches = [ ./0001-musl-rewind-pipe-workaround.patch ]; buildInputs = - lib.optional (enableAlsa && stdenv.isLinux) alsa-lib + lib.optional (enableAlsa && stdenv.hostPlatform.isLinux) alsa-lib ++ lib.optional enableLibao libao ++ lib.optional enableLame lame ++ lib.optional enableLibmad libmad @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { ++ lib.optional enableWavpack wavpack ++ lib.optionals enableAMR [ amrnb amrwb ] ++ lib.optional enableLibpulseaudio libpulseaudio - ++ lib.optional stdenv.isDarwin CoreAudio; + ++ lib.optional stdenv.hostPlatform.isDarwin CoreAudio; enableParallelBuilding = true; diff --git a/pkgs/applications/misc/audio/soxr/default.nix b/pkgs/applications/misc/audio/soxr/default.nix index f469ef5f0fed8..a76b30492ab18 100644 --- a/pkgs/applications/misc/audio/soxr/default.nix +++ b/pkgs/applications/misc/audio/soxr/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation rec { homepage = "https://soxr.sourceforge.net"; license = licenses.lgpl21Plus; platforms = platforms.unix ++ platforms.windows; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/misc/ausweisapp/default.nix b/pkgs/applications/misc/ausweisapp/default.nix index a3dc7b737d4b4..ab5cda688562e 100644 --- a/pkgs/applications/misc/ausweisapp/default.nix +++ b/pkgs/applications/misc/ausweisapp/default.nix @@ -15,13 +15,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "ausweisapp"; - version = "2.1.1"; + version = "2.2.1"; src = fetchFromGitHub { owner = "Governikus"; repo = "AusweisApp2"; rev = finalAttrs.version; - hash = "sha256-YRRm8/yDwQIUjzqYzlqij8h2ri39Q7L8jVh5fgrZbGs="; + hash = "sha256-+hkbtxw1Bj/lMgyf3OkwmRXyZL6CS3bTHUlGH9xxe/E="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/auto-multiple-choice/default.nix b/pkgs/applications/misc/auto-multiple-choice/default.nix index 33a4edbdbe579..96fd8e8c5f490 100644 --- a/pkgs/applications/misc/auto-multiple-choice/default.nix +++ b/pkgs/applications/misc/auto-multiple-choice/default.nix @@ -21,7 +21,6 @@ , perl , pkg-config , poppler -, auto-multiple-choice }: stdenv.mkDerivation (finalAttrs: rec { pname = "auto-multiple-choice"; diff --git a/pkgs/applications/misc/avrdudess/default.nix b/pkgs/applications/misc/avrdudess/default.nix index af12e6b2f4b84..01dbf16f00781 100644 --- a/pkgs/applications/misc/avrdudess/default.nix +++ b/pkgs/applications/misc/avrdudess/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation { pname = "avrdudess"; - version = "2.17"; + version = "2.18"; src = fetchurl { - url = "https://github.com/ZakKemble/AVRDUDESS/releases/download/v2.17/AVRDUDESS-2.17-portable.zip"; - sha256 = "sha256-TcXXGDs75Q2ew+m2B/p00Y24O5aJQlp+3FcAn7GSVyI="; + url = "https://github.com/ZakKemble/AVRDUDESS/releases/download/v2.18/AVRDUDESS-2.18-portable.zip"; + sha256 = "sha256-N93FLiXp1WwhI5KwH6sho2wyFtkbODwCHOpEVbVnYdc="; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/misc/azuredatastudio/default.nix b/pkgs/applications/misc/azuredatastudio/default.nix index 2c2c00d8b24ab..86d50c030e172 100644 --- a/pkgs/applications/misc/azuredatastudio/default.nix +++ b/pkgs/applications/misc/azuredatastudio/default.nix @@ -72,14 +72,19 @@ in stdenv.mkDerivation rec { pname = "azuredatastudio"; - version = "1.44.1"; + version = "1.49.1"; desktopItems = [ desktopItem urlHandlerDesktopItem ]; src = fetchurl { name = "${pname}-${version}.tar.gz"; - url = "https://azuredatastudio-update.azurewebsites.net/${version}/linux-x64/stable"; - sha256 = "sha256-6kEV331kt+/7/uWKZmTTkJX4P06CfxC8Ogq052qlUEg="; + + # Url can be found at: https://github.com/microsoft/azuredatastudio/releases + # In the downloads table for Linux .tar.gz + # This will give a go.microsoft redirect link, I think it's better to use the direct link to which the redirect points. + # You can do so by using curl: curl -I <go.microsoft link> + url = "https://download.microsoft.com/download/7/8/3/783c2037-8607-43c4-a593-0936e965d38b/azuredatastudio-linux-1.49.1.tar.gz"; + sha256 = "sha256-0LCrRUTTe8UEDgtGLvxVQL8pA5dwA6SvZEZSDILr7jo="; }; nativeBuildInputs = [ @@ -122,7 +127,7 @@ stdenv.mkDerivation rec { ]; # this will most likely need to be updated when azuredatastudio's version changes - sqltoolsservicePath = "${targetPath}/resources/app/extensions/mssql/sqltoolsservice/Linux/4.7.1.6"; + sqltoolsservicePath = "${targetPath}/resources/app/extensions/mssql/sqltoolsservice/Linux/5.0.20240724.1"; rpath = lib.concatStringsSep ":" [ (lib.makeLibraryPath [ diff --git a/pkgs/applications/misc/bambu-studio/0002-fix-build-for-gcc-13.diff b/pkgs/applications/misc/bambu-studio/0002-fix-build-for-gcc-13.diff new file mode 100644 index 0000000000000..cc832bb107291 --- /dev/null +++ b/pkgs/applications/misc/bambu-studio/0002-fix-build-for-gcc-13.diff @@ -0,0 +1,38 @@ +diff --git a/src/slic3r/Utils/Http.cpp b/src/slic3r/Utils/Http.cpp +index 11a36dfabc..77a44e699b 100644 +--- a/src/slic3r/Utils/Http.cpp ++++ b/src/slic3r/Utils/Http.cpp +@@ -88,9 +88,13 @@ std::mutex g_mutex; + + struct form_file + { +- fs::ifstream ifs; ++ fs::ifstream ifs; + boost::filesystem::ifstream::off_type init_offset; + size_t content_length; ++ ++ form_file(fs::path const& p, const boost::filesystem::ifstream::off_type offset, const size_t content_length) ++ : ifs(p, std::ios::in | std::ios::binary), init_offset(offset), content_length(content_length) ++ {} + }; + + struct Http::priv +@@ -314,7 +318,7 @@ void Http::priv::form_add_file(const char *name, const fs::path &path, const cha + filename = path.string().c_str(); + } + +- form_files.emplace_back(form_file{{path, std::ios::in | std::ios::binary}, offset, length}); ++ form_files.emplace_back(path, offset, length); + auto &f = form_files.back(); + size_t size = length; + if (length == 0) { +@@ -381,7 +385,7 @@ void Http::priv::set_put_body(const fs::path &path) + boost::system::error_code ec; + boost::uintmax_t filesize = file_size(path, ec); + if (!ec) { +- putFile = std::make_unique<form_file>(form_file{{path, std::ios_base::binary | std::ios_base::in}, 0, 0}); ++ putFile = std::make_unique<form_file>(path, 0, 0); + ::curl_easy_setopt(curl, CURLOPT_UPLOAD, 1L); + ::curl_easy_setopt(curl, CURLOPT_READDATA, (void *) (putFile.get())); + ::curl_easy_setopt(curl, CURLOPT_INFILESIZE, filesize); + diff --git a/pkgs/applications/misc/bambu-studio/default.nix b/pkgs/applications/misc/bambu-studio/default.nix index 57ad17ea48774..b1ff6eb0a2f58 100644 --- a/pkgs/applications/misc/bambu-studio/default.nix +++ b/pkgs/applications/misc/bambu-studio/default.nix @@ -37,13 +37,12 @@ opencascade-occt_7_6, openvdb, pcre, - qhull, systemd, tbb_2021_11, webkitgtk, wxGTK31, xorg, - withSystemd ? stdenv.isLinux, + withSystemd ? stdenv.hostPlatform.isLinux, }: let opencascade-occt = opencascade-occt_7_6; @@ -53,7 +52,7 @@ let "--enable-debug=no" ]; }); - openvdb_tbb_2021_8 = openvdb.overrideAttrs (old: rec { + openvdb_tbb_2021_8 = openvdb.overrideAttrs (old: { buildInputs = [ openexr boost179 diff --git a/pkgs/applications/misc/bambu-studio/dont-link-opencv-world.patch b/pkgs/applications/misc/bambu-studio/dont-link-opencv-world.patch new file mode 100644 index 0000000000000..f558b3099ac3b --- /dev/null +++ b/pkgs/applications/misc/bambu-studio/dont-link-opencv-world.patch @@ -0,0 +1,14 @@ +diff --git a/src/libslic3r/CMakeLists.txt b/src/libslic3r/CMakeLists.txt +index 38a1b2499..00c9060b3 100644 +--- a/src/libslic3r/CMakeLists.txt ++++ b/src/libslic3r/CMakeLists.txt +@@ -573,7 +573,8 @@ target_link_libraries(libslic3r + mcut + JPEG::JPEG + qoi +- opencv_world ++ opencv_core ++ opencv_imgproc + ) + + if(NOT WIN32) diff --git a/pkgs/applications/misc/bambu-studio/orca-slicer.nix b/pkgs/applications/misc/bambu-studio/orca-slicer.nix index af89be65246d3..353252dfea175 100644 --- a/pkgs/applications/misc/bambu-studio/orca-slicer.nix +++ b/pkgs/applications/misc/bambu-studio/orca-slicer.nix @@ -2,23 +2,42 @@ lib, fetchFromGitHub, bambu-studio, + opencv, }: - bambu-studio.overrideAttrs ( finalAttrs: previousAttrs: { - version = "2.0.0"; + version = "2.1.1"; pname = "orca-slicer"; - # Don't inherit patches from bambu-studio - patches = [ ./0001-not-for-upstream-CMakeLists-Link-against-webkit2gtk-.patch ]; - src = fetchFromGitHub { owner = "SoftFever"; repo = "OrcaSlicer"; rev = "v${finalAttrs.version}"; - hash = "sha256-YlLDUH3ODIfax5QwnsVJi1JjZ9WtxP3ssqRP1C4d4bw="; + hash = "sha256-7fusdSYpZb4sYl5L/+81PzMd42Nsejj+kCZsq0f7eIk="; }; + patches = + previousAttrs.patches + ++ [ + # FIXME: only required for 2.1.1, can be removed in the next version + ./0002-fix-build-for-gcc-13.diff + + ./dont-link-opencv-world.patch + ]; + + buildInputs = + previousAttrs.buildInputs + ++ [ + opencv + ]; + + preFixup = '' + gappsWrapperArgs+=( + # Fixes blackscreen dialogs + --set WEBKIT_DISABLE_COMPOSITING_MODE 1 + ) + ''; + # needed to prevent collisions between the LICENSE.txt files of # bambu-studio and orca-slicer. postInstall = '' @@ -26,7 +45,7 @@ bambu-studio.overrideAttrs ( ''; meta = with lib; { - description = "G-code generator for 3D printers (Bambu, Prusa, Voron, VzBot, RatRig, Creality, etc"; + description = "G-code generator for 3D printers (Bambu, Prusa, Voron, VzBot, RatRig, Creality, etc.)"; homepage = "https://github.com/SoftFever/OrcaSlicer"; license = licenses.agpl3Only; maintainers = with maintainers; [ diff --git a/pkgs/applications/misc/barrier/default.nix b/pkgs/applications/misc/barrier/default.nix index ee988b79f8219..6c483c02f3c78 100644 --- a/pkgs/applications/misc/barrier/default.nix +++ b/pkgs/applications/misc/barrier/default.nix @@ -12,7 +12,7 @@ mkDerivation rec { owner = "debauchee"; repo = pname; rev = "v${version}"; - sha256 = "sha256-2tHqLF3zS3C4UnOVIZfpcuzaemC9++nC7lXgFnFSfKU="; + hash = "sha256-2tHqLF3zS3C4UnOVIZfpcuzaemC9++nC7lXgFnFSfKU="; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/bazecor/10-dygma.rules b/pkgs/applications/misc/bazecor/10-dygma.rules deleted file mode 100644 index 6805e68c06446..0000000000000 --- a/pkgs/applications/misc/bazecor/10-dygma.rules +++ /dev/null @@ -1,4 +0,0 @@ -SUBSYSTEMS=="usb", ATTRS{idVendor}=="1209", ATTRS{idProduct}=="2201", MODE="0666" -SUBSYSTEMS=="usb", ATTRS{idVendor}=="1209", ATTRS{idProduct}=="2200", MODE="0666" -SUBSYSTEMS=="usb", ATTRS{idVendor}=="35ef", MODE="0666" -KERNEL=="hidraw*", ATTRS{idVendor}=="35ef", MODE="0666" diff --git a/pkgs/applications/misc/bazecor/default.nix b/pkgs/applications/misc/bazecor/default.nix deleted file mode 100644 index ed1900836fccc..0000000000000 --- a/pkgs/applications/misc/bazecor/default.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ lib -, appimageTools -, fetchurl -}: - -appimageTools.wrapAppImage rec { - pname = "bazecor"; - version = "1.3.11"; - - src = appimageTools.extract { - inherit pname version; - src = fetchurl { - url = "https://github.com/Dygmalab/Bazecor/releases/download/v${version}/Bazecor-${version}-x64.AppImage"; - hash = "sha256-iMurQDF0CBMnJnjmEgNIKYd8C5B4FguMi4Jqa3dHr3o="; - }; - - # Workaround for https://github.com/Dygmalab/Bazecor/issues/370 - postExtract = '' - substituteInPlace \ - $out/usr/lib/bazecor/resources/app/.webpack/main/index.js \ - --replace \ - '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}' - ''; - }; - - # also make sure to update the udev rules in ./10-dygma.rules; most recently - # taken from - # https://github.com/Dygmalab/Bazecor/blob/v1.3.11/src/main/utils/udev.ts#L6 - - extraPkgs = pkgs: [ pkgs.glib ]; - - # Also expose the udev rules here, so it can be used as: - # services.udev.packages = [ pkgs.bazecor ]; - # 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' - - 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} - ''; - - meta = { - description = "Graphical configurator for Dygma Products"; - homepage = "https://github.com/Dygmalab/Bazecor"; - changelog = "https://github.com/Dygmalab/Bazecor/releases/tag/v${version}"; - sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; - license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ amesgen ]; - platforms = [ "x86_64-linux" ]; - mainProgram = "bazecor"; - }; -} diff --git a/pkgs/applications/misc/bb/default.nix b/pkgs/applications/misc/bb/default.nix index 89a0d75fc2b5b..16f4c0bd2d6f9 100644 --- a/pkgs/applications/misc/bb/default.nix +++ b/pkgs/applications/misc/bb/default.nix @@ -12,14 +12,14 @@ stdenv.mkDerivation rec { buildInputs = [ aalib ncurses libmikmod xorg.libXau xorg.libXdmcp xorg.libX11 - ] ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.CoreAudio; + ] ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.CoreAudio; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' sed -i -e '/^#include <malloc.h>$/d' *.c ''; # error: 'regparm' is not valid on this platform - env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) + env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) "-D__STRICT_ANSI__"; meta = with lib; { diff --git a/pkgs/applications/misc/bemenu/default.nix b/pkgs/applications/misc/bemenu/default.nix index d017f4306fe73..7c4cd0f935424 100644 --- a/pkgs/applications/misc/bemenu/default.nix +++ b/pkgs/applications/misc/bemenu/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, cairo, libxkbcommon -, pango, fribidi, harfbuzz, pcre, pkg-config, scdoc +, pango, fribidi, harfbuzz, pkg-config, scdoc , ncursesSupport ? true, ncurses , waylandSupport ? true, wayland, wayland-protocols, wayland-scanner , x11Support ? true, xorg @@ -7,28 +7,28 @@ stdenv.mkDerivation (finalAttrs: { pname = "bemenu"; - version = "0.6.21"; + version = "0.6.23"; src = fetchFromGitHub { owner = "Cloudef"; - repo = finalAttrs.pname; + repo = "bemenu"; rev = finalAttrs.version; - hash = "sha256-E/5wN7HpdBt//jFe9yAB8fuHKiFJ7D1UAJEvG8KBJ6k="; + hash = "sha256-0vpqJ2jydTt6aVni0ma0g+80PFz+C4xJ5M77sMODkSg="; }; strictDeps = true; nativeBuildInputs = [ pkg-config scdoc ] ++ lib.optionals waylandSupport [ wayland-scanner ]; - buildInputs = with lib; [ + buildInputs = [ cairo fribidi harfbuzz libxkbcommon pango - ] ++ optional ncursesSupport ncurses - ++ optionals waylandSupport [ wayland wayland-protocols ] - ++ optionals x11Support [ + ] ++ lib.optional ncursesSupport ncurses + ++ lib.optionals waylandSupport [ wayland wayland-protocols ] + ++ lib.optionals x11Support [ xorg.libX11 xorg.libXinerama xorg.libXft xorg.libXdmcp xorg.libpthreadstubs xorg.libxcb ]; @@ -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/bibletime/default.nix b/pkgs/applications/misc/bibletime/default.nix index aa24399dbde84..1b7fde5d7de84 100644 --- a/pkgs/applications/misc/bibletime/default.nix +++ b/pkgs/applications/misc/bibletime/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "bibletime"; - repo = finalAttrs.pname; + repo = "bibletime"; rev = "v${finalAttrs.version}"; hash = "sha256-4O8F5/EyoJFJBEWOAs9lzN3TKuu/CEdKfPaOF8gNqps="; }; diff --git a/pkgs/applications/misc/bikeshed/default.nix b/pkgs/applications/misc/bikeshed/default.nix index 21c6ac8c523d3..244632521bac2 100644 --- a/pkgs/applications/misc/bikeshed/default.nix +++ b/pkgs/applications/misc/bikeshed/default.nix @@ -26,7 +26,7 @@ buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-3fVo+B71SsJs+XF4+FWH2nz0ouTnpC/02fXYr1C9Jrk="; + hash = "sha256-3fVo+B71SsJs+XF4+FWH2nz0ouTnpC/02fXYr1C9Jrk="; }; # Relax requirements from "==" to ">=" @@ -73,6 +73,6 @@ buildPythonApplication rec { ''; homepage = "https://tabatkins.github.io/bikeshed/"; license = licenses.cc0; - maintainers = []; + maintainers = [ ]; }; } diff --git a/pkgs/applications/misc/binocle/default.nix b/pkgs/applications/misc/binocle/default.nix index 92ccc4112993a..da77d6c693df7 100644 --- a/pkgs/applications/misc/binocle/default.nix +++ b/pkgs/applications/misc/binocle/default.nix @@ -31,11 +31,11 @@ rustPlatform.buildRustPackage rec { makeWrapper ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ AppKit CoreFoundation CoreGraphics CoreVideo Foundation Metal QuartzCore ]; - postInstall = lib.optionalString (!stdenv.isDarwin) '' + postInstall = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' wrapProgram $out/bin/binocle \ --suffix LD_LIBRARY_PATH : ${lib.makeLibraryPath (with xorg; [ libX11 libXcursor libXi libXrandr ] ++ [ vulkan-loader ])} ''; diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 3d044abaad6d9..a2ac2a81c8b60 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -5,7 +5,7 @@ OpenAL, OpenGL, SDL, - addOpenGLRunpath, + addDriverRunpath, alembic, blender, boost, @@ -16,10 +16,9 @@ config, cudaPackages, cudaSupport ? config.cudaSupport, - darwin, dbus, embree, - fetchurl, + fetchgit, fetchzip, ffmpeg, fftw, @@ -54,9 +53,7 @@ libxkbcommon, llvmPackages, makeWrapper, - materialx, mesa, - ocl-icd, openal, opencollada, opencolorio, @@ -71,22 +68,28 @@ pkg-config, potrace, pugixml, - python311Packages, # must use instead of python3.pkgs, see https://github.com/NixOS/nixpkgs/issues/211340 + python3Packages, # must use instead of python3.pkgs, see https://github.com/NixOS/nixpkgs/issues/211340 rocmPackages, # comes with a significantly larger closure size runCommand, - spaceNavSupport ? stdenv.isLinux, + spaceNavSupport ? stdenv.hostPlatform.isLinux, sse2neon, stdenv, tbb, wayland, wayland-protocols, - waylandSupport ? stdenv.isLinux, + wayland-scanner, + waylandSupport ? stdenv.hostPlatform.isLinux, zlib, zstd, }: let - python3Packages = python311Packages; + embreeSupport = + (!stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux) || stdenv.hostPlatform.isDarwin; + openImageDenoiseSupport = + (!stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux) || stdenv.hostPlatform.isDarwin; + openUsdSupport = !stdenv.hostPlatform.isDarwin; + python3 = python3Packages.python; pyPkgsOpenusd = python3Packages.openusd.override { withOsl = false; }; @@ -104,35 +107,46 @@ in stdenv.mkDerivation (finalAttrs: { pname = "blender"; - version = "4.1.1"; + version = "4.2.2"; - src = fetchurl { - url = "https://download.blender.org/source/${finalAttrs.pname}-${finalAttrs.version}.tar.xz"; - hash = "sha256-T7s69k0/hN9ccQN0hFQibBiFwawu1Tc9DOoegOgsCEg="; - }; + srcs = [ + (fetchzip { + name = "source"; + url = "https://download.blender.org/source/blender-${finalAttrs.version}.tar.xz"; + hash = "sha256-wv9EwB4DXSVS5K+lb+7gU3pTrMDO/ELeV2eErivfsWU="; + }) + (fetchgit { + name = "assets"; + url = "https://projects.blender.org/blender/blender-assets.git"; + rev = "v${finalAttrs.version}"; + fetchLFS = true; + hash = "sha256-vepK0inPMuleAJBSipwoI99nMBBiFaK/eSMHDetEtjY="; + }) + ]; + + postUnpack = '' + chmod -R u+w * + rm -r assets/working + mv assets --target-directory source/release/datafiles/ + ''; + + sourceRoot = "source"; - patches = [ ./draco.patch ] ++ lib.optional stdenv.isDarwin ./darwin.patch; + patches = [ ./draco.patch ] ++ lib.optional stdenv.hostPlatform.isDarwin ./darwin.patch; postPatch = - ( - if stdenv.isDarwin then - '' - : > build_files/cmake/platform/platform_apple_xcode.cmake - substituteInPlace source/creator/CMakeLists.txt \ - --replace-fail '${"$"}{LIBDIR}/python' \ - '${python3}' \ - --replace-fail '${"$"}{LIBDIR}/materialx/' '${materialx}/' - substituteInPlace build_files/cmake/platform/platform_apple.cmake \ - --replace-fail '${"$"}{LIBDIR}/brotli/lib/libbrotlicommon-static.a' \ - '${lib.getLib brotli}/lib/libbrotlicommon.dylib' \ - --replace-fail '${"$"}{LIBDIR}/brotli/lib/libbrotlidec-static.a' \ - '${lib.getLib brotli}/lib/libbrotlidec.dylib' - '' - else - '' - substituteInPlace extern/clew/src/clew.c --replace '"libOpenCL.so"' '"${ocl-icd}/lib/libOpenCL.so"' - '' - ) + (lib.optionalString stdenv.hostPlatform.isDarwin '' + : > build_files/cmake/platform/platform_apple_xcode.cmake + substituteInPlace source/creator/CMakeLists.txt \ + --replace-fail '${"$"}{LIBDIR}/python' \ + '${python3}' \ + --replace-fail '${"$"}{LIBDIR}/materialx/' '${python3Packages.materialx}/' + substituteInPlace build_files/cmake/platform/platform_apple.cmake \ + --replace-fail '${"$"}{LIBDIR}/brotli/lib/libbrotlicommon-static.a' \ + '${lib.getLib brotli}/lib/libbrotlicommon.dylib' \ + --replace-fail '${"$"}{LIBDIR}/brotli/lib/libbrotlidec-static.a' \ + '${lib.getLib brotli}/lib/libbrotlidec.dylib' + '') + (lib.optionalString hipSupport '' substituteInPlace extern/hipew/src/hipew.c --replace '"/opt/rocm/hip/lib/libamdhip64.so"' '"${rocmPackages.clr}/lib/libamdhip64.so"' substituteInPlace extern/hipew/src/hipew.c --replace '"opt/rocm/hip/bin"' '"${rocmPackages.clr}/bin"' @@ -142,6 +156,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ + "-DMaterialX_DIR=${python3Packages.materialx}/lib/cmake/MaterialX" "-DPYTHON_INCLUDE_DIR=${python3}/include/${python3.libPrefix}" "-DPYTHON_LIBPATH=${python3}/lib" "-DPYTHON_LIBRARY=${python3.libPrefix}" @@ -149,23 +164,33 @@ stdenv.mkDerivation (finalAttrs: { "-DPYTHON_NUMPY_PATH=${python3Packages.numpy}/${python3.sitePackages}" "-DPYTHON_VERSION=${python3.pythonVersion}" "-DWITH_ALEMBIC=ON" + "-DWITH_BUILDINFO=OFF" "-DWITH_CODEC_FFMPEG=ON" "-DWITH_CODEC_SNDFILE=ON" + "-DWITH_CPU_CHECK=OFF" + "-DWITH_CYCLES_DEVICE_OPTIX=${if cudaSupport then "ON" else "OFF"}" + "-DWITH_CYCLES_EMBREE=${if embreeSupport then "ON" else "OFF"}" + "-DWITH_CYCLES_OSL=OFF" "-DWITH_FFTW3=ON" + "-DWITH_HYDRA=${if openUsdSupport then "ON" else "OFF"}" "-DWITH_IMAGE_OPENJPEG=ON" "-DWITH_INSTALL_PORTABLE=OFF" - "-DMaterialX_DIR=${materialx}/lib/cmake/MaterialX" + "-DWITH_JACK=${if jackaudioSupport then "ON" else "OFF"}" + "-DWITH_LIBS_PRECOMPILED=OFF" "-DWITH_MOD_OCEANSIM=ON" "-DWITH_OPENCOLLADA=${if colladaSupport then "ON" else "OFF"}" "-DWITH_OPENCOLORIO=ON" + "-DWITH_OPENIMAGEDENOISE=${if openImageDenoiseSupport then "ON" else "OFF"}" "-DWITH_OPENSUBDIV=ON" "-DWITH_OPENVDB=ON" + "-DWITH_PULSEAUDIO=OFF" "-DWITH_PYTHON_INSTALL=OFF" "-DWITH_PYTHON_INSTALL_NUMPY=OFF" "-DWITH_PYTHON_INSTALL_REQUESTS=OFF" "-DWITH_SDL=OFF" + "-DWITH_STRICT_BUILD_OPTIONS=ON" "-DWITH_TBB=ON" - "-DWITH_USD=ON" + "-DWITH_USD=${if openUsdSupport then "ON" else "OFF"}" # Blender supplies its own FindAlembic.cmake (incompatible with the Alembic-supplied config file) "-DALEMBIC_INCLUDE_DIR=${lib.getDev alembic}/include" @@ -177,21 +202,27 @@ stdenv.mkDerivation (finalAttrs: { "-DWITH_GHOST_WAYLAND_DYNLOAD=OFF" "-DWITH_GHOST_WAYLAND_LIBDECOR=ON" ] - ++ lib.optionals (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux) [ "-DWITH_CYCLES_EMBREE=OFF" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DLIBDIR=/does-not-exist" - "-DWITH_CYCLES_OSL=OFF" # causes segfault on aarch64-darwin "-DSSE2NEON_INCLUDE_DIR=${sse2neon}/lib" - "-DWITH_USD=OFF" # currently fails on darwin ] ++ lib.optional stdenv.cc.isClang "-DPYTHON_LINKFLAGS=" # Clang doesn't support "-export-dynamic" - ++ lib.optional jackaudioSupport "-DWITH_JACK=ON" ++ lib.optionals cudaSupport [ "-DOPTIX_ROOT_DIR=${optix}" "-DWITH_CYCLES_CUDA_BINARIES=ON" - "-DWITH_CYCLES_DEVICE_OPTIX=ON" ]; + preConfigure = '' + ( + expected_python_version=$(grep -E --only-matching 'set\(_PYTHON_VERSION_SUPPORTED [0-9.]+\)' build_files/cmake/Modules/FindPythonLibsUnix.cmake | grep -E --only-matching '[0-9.]+') + actual_python_version=$(python -c 'import sys; print(".".join(map(str, sys.version_info[0:2])))') + if ! [[ "$actual_python_version" = "$expected_python_version" ]]; then + echo "wrong Python version, expected '$expected_python_version', got '$actual_python_version'" >&2 + exit 1 + fi + ) + ''; + nativeBuildInputs = [ cmake @@ -200,10 +231,13 @@ stdenv.mkDerivation (finalAttrs: { python3Packages.wrapPython ] ++ lib.optionals cudaSupport [ - addOpenGLRunpath + addDriverRunpath cudaPackages.cuda_nvcc ] - ++ lib.optionals waylandSupport [ pkg-config ]; + ++ lib.optionals waylandSupport [ + pkg-config + wayland-scanner + ]; buildInputs = [ @@ -225,7 +259,6 @@ stdenv.mkDerivation (finalAttrs: { libsndfile libtiff libwebp - materialx opencolorio openexr openimageio @@ -236,16 +269,15 @@ stdenv.mkDerivation (finalAttrs: { potrace pugixml python3 + python3Packages.materialx tbb zlib zstd ] - ++ lib.optionals (!stdenv.isAarch64 && stdenv.isLinux) [ - embree - (openimagedenoise.override { inherit cudaSupport; }) - ] + ++ lib.optional embreeSupport embree + ++ lib.optional openImageDenoiseSupport (openimagedenoise.override { inherit cudaSupport; }) ++ ( - if (!stdenv.isDarwin) then + if (!stdenv.hostPlatform.isDarwin) then [ libGL libGLU @@ -256,7 +288,6 @@ stdenv.mkDerivation (finalAttrs: { libXxf86vm openal openxr-loader - pyPkgsOpenusd ] else [ @@ -267,13 +298,12 @@ stdenv.mkDerivation (finalAttrs: { OpenGL SDL brotli - embree llvmPackages.openmp - (openimagedenoise.override { inherit cudaSupport; }) sse2neon ] ) ++ lib.optionals cudaSupport [ cudaPackages.cuda_cudart ] + ++ lib.optionals openUsdSupport [ pyPkgsOpenusd ] ++ lib.optionals waylandSupport [ dbus libdecor' @@ -291,23 +321,28 @@ stdenv.mkDerivation (finalAttrs: { ps = python3Packages; in [ - materialx + ps.materialx ps.numpy ps.requests ps.zstandard ] - ++ lib.optionals (!stdenv.isDarwin) [ pyPkgsOpenusd ]; + ++ lib.optional openUsdSupport [ pyPkgsOpenusd ]; blenderExecutable = placeholder "out" - + (if stdenv.isDarwin then "/Applications/Blender.app/Contents/MacOS/Blender" else "/bin/blender"); + + ( + if stdenv.hostPlatform.isDarwin then + "/Applications/Blender.app/Contents/MacOS/Blender" + else + "/bin/blender" + ); postInstall = - lib.optionalString stdenv.isDarwin '' + lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir $out/Applications mv $out/Blender.app $out/Applications '' - + lib.optionalString stdenv.isLinux '' + + lib.optionalString stdenv.hostPlatform.isLinux '' mv $out/share/blender/${lib.versions.majorMinor finalAttrs.version}/python{,-ext} '' + '' @@ -320,15 +355,16 @@ stdenv.mkDerivation (finalAttrs: { # Set RUNPATH so that libcuda and libnvrtc in /run/opengl-driver(-32)/lib can be # found. See the explanation in libglvnd. - postFixup = lib.optionalString cudaSupport '' - for program in $out/bin/blender $out/bin/.blender-wrapped; do - isELF "$program" || continue - addOpenGLRunpath "$program" - done - '' - + lib.optionalString stdenv.isDarwin '' - makeWrapper $out/Applications/Blender.app/Contents/MacOS/Blender $out/bin/blender - ''; + postFixup = + lib.optionalString cudaSupport '' + for program in $out/bin/blender $out/bin/.blender-wrapped; do + isELF "$program" || continue + addDriverRunpath "$program" + done + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + makeWrapper $out/Applications/Blender.app/Contents/MacOS/Blender $out/bin/blender + ''; passthru = { python = python3; @@ -342,15 +378,13 @@ stdenv.mkDerivation (finalAttrs: { }; tests = { - render = runCommand "${finalAttrs.pname}-test" { } '' + render = runCommand "${finalAttrs.pname}-test" { nativeBuildInputs = [ mesa.llvmpipeHook ]; } '' set -euo pipefail - export LIBGL_DRIVERS_PATH=${mesa.drivers}/lib/dri - export __EGL_VENDOR_LIBRARY_FILENAMES=${mesa.drivers}/share/glvnd/egl_vendor.d/50_mesa.json cat <<'PYTHON' > scene-config.py import bpy bpy.context.scene.eevee.taa_render_samples = 32 bpy.context.scene.cycles.samples = 32 - if ${if (stdenv.isAarch64 && stdenv.isLinux) then "True" else "False"}: + if ${if (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux) then "True" else "False"}: bpy.context.scene.cycles.use_denoising = False bpy.context.scene.render.resolution_x = 100 bpy.context.scene.render.resolution_y = 100 @@ -359,7 +393,7 @@ stdenv.mkDerivation (finalAttrs: { PYTHON mkdir $out - for engine in BLENDER_EEVEE CYCLES; do + for engine in BLENDER_EEVEE_NEXT CYCLES; do echo "Rendering with $engine..." # Beware that argument order matters ${lib.getExe finalAttrs.finalPackage} \ @@ -396,7 +430,9 @@ stdenv.mkDerivation (finalAttrs: { # They comment two licenses: GPLv2 and Blender License, but they # say: "We've decided to cancel the BL offering for an indefinite period." # OptiX, enabled with cudaSupport, is non-free. - license = with lib.licenses; [ gpl2Plus ] ++ lib.optional cudaSupport (unfree // { shortName = "NVidia OptiX EULA"; }); + license = + with lib.licenses; + [ gpl2Plus ] ++ lib.optional cudaSupport (unfree // { shortName = "NVidia OptiX EULA"; }); platforms = [ "aarch64-linux" @@ -404,10 +440,9 @@ stdenv.mkDerivation (finalAttrs: { "x86_64-linux" "aarch64-darwin" ]; - # the current apple sdk is too old (currently 11_0) and fails to build "metal" on x86_64-darwin - broken = stdenv.hostPlatform.system == "x86_64-darwin"; + broken = stdenv.hostPlatform.isDarwin; # fails due to too-old SDK, using newer SDK fails to compile maintainers = with lib.maintainers; [ - goibhniu + amarshall veprbl ]; mainProgram = "blender"; diff --git a/pkgs/applications/misc/blender/draco.patch b/pkgs/applications/misc/blender/draco.patch index 2a856a0638aee..df6729c445cca 100644 --- a/pkgs/applications/misc/blender/draco.patch +++ b/pkgs/applications/misc/blender/draco.patch @@ -12,8 +12,8 @@ # enable boost for cycles, audaspace or i18n # otherwise if the user disabled ---- a/scripts/addons/io_scene_gltf2/io/com/gltf2_io_draco_compression_extension.py -+++ b/scripts/addons/io_scene_gltf2/io/com/gltf2_io_draco_compression_extension.py +--- a/scripts/addons_core/io_scene_gltf2/io/com/gltf2_io_draco_compression_extension.py ++++ b/scripts/addons_core/io_scene_gltf2/io/com/gltf2_io_draco_compression_extension.py @@ -17,7 +17,7 @@ def dll_path() -> Path: """ lib_name = 'extern_draco' diff --git a/pkgs/applications/misc/blender/wrapper.nix b/pkgs/applications/misc/blender/wrapper.nix index 7450827a8fa92..8b5e8916a1388 100644 --- a/pkgs/applications/misc/blender/wrapper.nix +++ b/pkgs/applications/misc/blender/wrapper.nix @@ -1,5 +1,4 @@ { stdenv -, lib , blender , makeWrapper , extraModules ? [] diff --git a/pkgs/applications/misc/boatswain/default.nix b/pkgs/applications/misc/boatswain/default.nix index 5d2b1540aebe7..fc2842ebe52fc 100644 --- a/pkgs/applications/misc/boatswain/default.nix +++ b/pkgs/applications/misc/boatswain/default.nix @@ -62,6 +62,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; platforms = platforms.unix; maintainers = with maintainers; [ _0xMRTT ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/applications/misc/bottles/default.nix b/pkgs/applications/misc/bottles/default.nix index 495a945d32d3c..bc9d3cb2e444e 100644 --- a/pkgs/applications/misc/bottles/default.nix +++ b/pkgs/applications/misc/bottles/default.nix @@ -1,45 +1,44 @@ -{ lib -, fetchFromGitHub -, gitUpdater -, python3Packages -, blueprint-compiler -, meson -, ninja -, pkg-config -, wrapGAppsHook4 -, appstream-glib -, desktop-file-utils -, librsvg -, gtk4 -, gtksourceview5 -, libadwaita -, cabextract -, p7zip -, xdpyinfo -, imagemagick -, lsb-release -, pciutils -, procps -, gamescope -, mangohud -, vkbasalt-cli -, vmtouch +{ + lib, + fetchFromGitHub, + gitUpdater, + python3Packages, + blueprint-compiler, + meson, + ninja, + pkg-config, + wrapGAppsHook4, + appstream-glib, + desktop-file-utils, + librsvg, + gtk4, + gtksourceview5, + libadwaita, + cabextract, + p7zip, + xdpyinfo, + imagemagick, + lsb-release, + pciutils, + procps, + gamescope, + mangohud, + vkbasalt-cli, + vmtouch, }: python3Packages.buildPythonApplication rec { pname = "bottles-unwrapped"; - version = "51.11"; + version = "51.13"; src = fetchFromGitHub { owner = "bottlesdevs"; repo = "bottles"; rev = version; - sha256 = "sha256-uS3xmTu+LrVFX93bYcJvYjl6179d3IjpxLKrOXn8Z8Y="; + hash = "sha256-ZcUevGY81H3ATTk390ojBp/4zBE2Lui7Qa+Qe8B0XL4="; }; - patches = [ - ./vulkan_icd.patch - ]; + patches = [ ./vulkan_icd.patch ]; # https://github.com/bottlesdevs/Bottles/wiki/Packaging nativeBuildInputs = [ @@ -60,38 +59,41 @@ python3Packages.buildPythonApplication rec { libadwaita ]; - propagatedBuildInputs = with python3Packages; [ - pathvalidate - pycurl - pyyaml - requests - pygobject3 - patool - markdown - fvs - pefile - urllib3 - chardet - certifi - idna - orjson - icoextract - ] ++ [ - cabextract - p7zip - xdpyinfo - imagemagick - vkbasalt-cli + propagatedBuildInputs = + with python3Packages; + [ + pathvalidate + pycurl + pyyaml + requests + pygobject3 + patool + markdown + fvs + pefile + urllib3 + chardet + certifi + idna + orjson + icoextract + ] + ++ [ + cabextract + p7zip + xdpyinfo + imagemagick + vkbasalt-cli - gamescope - mangohud - vmtouch + gamescope + mangohud + vmtouch - # Undocumented (subprocess.Popen()) - lsb-release - pciutils - procps - ]; + # Undocumented (subprocess.Popen()) + lsb-release + pciutils + procps + ]; format = "other"; dontWrapGApps = true; # prevent double wrapping @@ -107,7 +109,10 @@ python3Packages.buildPythonApplication rec { homepage = "https://usebottles.com/"; downloadPage = "https://github.com/bottlesdevs/Bottles/releases"; license = licenses.gpl3Only; - maintainers = with maintainers; [ psydvl shamilton ]; + maintainers = with maintainers; [ + psydvl + shamilton + ]; platforms = platforms.linux; mainProgram = "bottles"; }; diff --git a/pkgs/applications/misc/bottles/fhsenv.nix b/pkgs/applications/misc/bottles/fhsenv.nix index fd0d38f69892e..1bd476a136c64 100644 --- a/pkgs/applications/misc/bottles/fhsenv.nix +++ b/pkgs/applications/misc/bottles/fhsenv.nix @@ -1,106 +1,129 @@ -{ buildFHSEnv -, symlinkJoin -, bottles-unwrapped -, extraPkgs ? pkgs: [ ] -, extraLibraries ? pkgs: [ ] +{ + buildFHSEnv, + symlinkJoin, + bottles-unwrapped, + extraPkgs ? pkgs: [ ], + extraLibraries ? pkgs: [ ], }: -let fhsEnv = { - # Many WINE games need 32bit - multiArch = true; +let + fhsEnv = { + # Many WINE games need 32bit + multiArch = true; - targetPkgs = pkgs: with pkgs; [ - bottles-unwrapped - # This only allows to enable the toggle, vkBasalt won't work if not installed with environment.systemPackages (or nix-env) - # See https://github.com/bottlesdevs/Bottles/issues/2401 - vkbasalt - ] ++ extraPkgs pkgs; + targetPkgs = + pkgs: + with pkgs; + [ + bottles-unwrapped + # This only allows to enable the toggle, vkBasalt won't work if not installed with environment.systemPackages (or nix-env) + # See https://github.com/bottlesdevs/Bottles/issues/2401 + vkbasalt + ] + ++ extraPkgs pkgs; - multiPkgs = - let - xorgDeps = pkgs: with pkgs.xorg; [ - libpthreadstubs - libSM - libX11 - libXaw - libxcb - libXcomposite - libXcursor - libXdmcp - libXext - libXi - libXinerama - libXmu - libXrandr - libXrender - libXv - libXxf86vm - ]; - gstreamerDeps = pkgs: with pkgs.gst_all_1; [ - gstreamer - gst-plugins-base - gst-plugins-good - gst-plugins-ugly - gst-plugins-bad - gst-libav - ]; - in - pkgs: with pkgs; [ - # https://wiki.winehq.org/Building_Wine - alsa-lib - cups - dbus - fontconfig - freetype - glib - gnutls - libglvnd - gsm - libgphoto2 - libjpeg_turbo - libkrb5 - libpcap - libpng - libpulseaudio - libtiff - libunwind - libusb1 - libv4l - libxml2 - mpg123 - ocl-icd - openldap - samba4 - sane-backends - SDL2 - udev - vulkan-loader + multiPkgs = + let + xorgDeps = + pkgs: with pkgs.xorg; [ + libpthreadstubs + libSM + libX11 + libXaw + libxcb + libXcomposite + libXcursor + libXdmcp + libXext + libXi + libXinerama + libXmu + libXrandr + libXrender + libXv + libXxf86vm + ]; + gstreamerDeps = + pkgs: with pkgs.gst_all_1; [ + gstreamer + gst-plugins-base + gst-plugins-good + gst-plugins-ugly + gst-plugins-bad + gst-libav + ]; + in + pkgs: + with pkgs; + [ + # https://wiki.winehq.org/Building_Wine + alsa-lib + cups + dbus + fontconfig + freetype + glib + gnutls + libglvnd + gsm + libgphoto2 + libjpeg_turbo + libkrb5 + libpcap + libpng + libpulseaudio + libtiff + libunwind + libusb1 + libv4l + libxml2 + mpg123 + ocl-icd + openldap + samba4 + sane-backends + SDL2 + udev + vulkan-loader - # https://www.gloriouseggroll.tv/how-to-get-out-of-wine-dependency-hell/ - alsa-plugins - dosbox - giflib - gtk3 - libva - libxslt - ncurses - openal + # https://www.gloriouseggroll.tv/how-to-get-out-of-wine-dependency-hell/ + alsa-plugins + dosbox + giflib + gtk3 + libva + libxslt + ncurses + openal - # Steam runtime - libgcrypt - libgpg-error - p11-kit - zlib # Freetype - ] ++ xorgDeps pkgs - ++ gstreamerDeps pkgs - ++ extraLibraries pkgs; -}; + # Steam runtime + libgcrypt + libgpg-error + p11-kit + zlib # Freetype + ] + ++ xorgDeps pkgs + ++ gstreamerDeps pkgs + ++ extraLibraries pkgs; + }; in symlinkJoin { name = "bottles"; paths = [ - (buildFHSEnv (fhsEnv // { name = "bottles"; runScript = "bottles"; })) - (buildFHSEnv (fhsEnv // { name = "bottles-cli"; runScript = "bottles-cli"; })) + (buildFHSEnv ( + fhsEnv + // { + name = "bottles"; + runScript = "bottles"; + } + )) + (buildFHSEnv ( + fhsEnv + // { + name = "bottles-cli"; + runScript = "bottles-cli"; + } + )) ]; postBuild = '' mkdir -p $out/share diff --git a/pkgs/applications/misc/bottles/vulkan_icd.patch b/pkgs/applications/misc/bottles/vulkan_icd.patch index ff376e136bb24..e1c402727d893 100644 --- a/pkgs/applications/misc/bottles/vulkan_icd.patch +++ b/pkgs/applications/misc/bottles/vulkan_icd.patch @@ -6,7 +6,7 @@ index 6673493..9191004 100644 "/usr/share/vulkan", "/etc/vulkan", "/usr/local/share/vulkan", -- "/usr/local/etc/vulkan" +- "/usr/local/etc/vulkan", + "/usr/local/etc/vulkan", + "/run/opengl-driver/share/vulkan", + "/run/opengl-driver-32/share/vulkan", diff --git a/pkgs/applications/misc/calcoo/default.nix b/pkgs/applications/misc/calcoo/default.nix deleted file mode 100644 index 462b56d50ce09..0000000000000 --- a/pkgs/applications/misc/calcoo/default.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ lib -, stdenv -, fetchzip -, ant -, stripJavaArchivesHook -, jdk -, makeWrapper -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "calcoo"; - version = "2.1.0"; - - src = fetchzip { - url = "mirror://sourceforge/calcoo/calcoo-${finalAttrs.version}.zip"; - hash = "sha256-Bdavj7RaI5CkWiOJY+TPRIRfNelfW5qdl/74J1KZPI0="; - }; - - nativeBuildInputs = [ - ant - stripJavaArchivesHook - jdk - makeWrapper - ]; - - dontConfigure = true; - - env.JAVA_TOOL_OPTIONS = "-Dfile.encoding=iso-8859-1"; - - buildPhase = '' - runHook preBuild - ant - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - install -Dm644 dist/lib/calcoo.jar -t $out/share/calcoo - - makeWrapper ${jdk}/bin/java $out/bin/calcoo \ - --add-flags "-jar $out/share/calcoo/calcoo.jar" - - runHook postInstall - ''; - - meta = { - changelog = "https://calcoo.sourceforge.net/changelog.html"; - description = "RPN and algebraic scientific calculator"; - homepage = "https://calcoo.sourceforge.net/"; - license = lib.licenses.gpl2Plus; - mainProgram = "calcoo"; - maintainers = with lib.maintainers; [ AndersonTorres ]; - inherit (jdk.meta) platforms; - }; -}) diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 0e19d15973651..b5e8c469b408d 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -21,22 +21,23 @@ , qmake , qtbase , qtwayland -, removeReferencesTo -, speechd +, speechd-minimal , sqlite , wrapQtAppsHook , xdg-utils , wrapGAppsHook3 +, popplerSupport ? true +, speechSupport ? true , unrarSupport ? false }: stdenv.mkDerivation (finalAttrs: { pname = "calibre"; - version = "7.12.0"; + version = "7.16.0"; src = fetchurl { url = "https://download.calibre-ebook.com/${finalAttrs.version}/calibre-${finalAttrs.version}.tar.xz"; - hash = "sha256-XHkORTUx3+O+i2vbTiZAHI/0hY3xPIXvvNAVuXy4wzk="; + hash = "sha256-EWQfaoTwO9BdZQgJQrxfj6b8tmtukvlW5hFo/USjNhU="; }; patches = [ @@ -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-minimal; 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,41 @@ 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 - ''; + 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 + ''; - disallowedReferences = [ podofo.dev ]; + doInstallCheck = true; + installCheckInputs = with python3Packages; [ + fonttools + psutil + ]; + installCheckPhase = '' + runHook preInstallCheck + + ETN='--exclude-test-name' + EXCLUDED_FLAGS=( + $ETN 'test_7z' # we don't include 7z support + $ETN 'test_zstd' # we don't include zstd support + $ETN 'test_qt' # we don't include svg or webp support + $ETN 'test_import_of_all_python_modules' # explores actual file paths, gets confused + $ETN 'test_websocket_basic' # flakey + ${lib.optionalString (!unrarSupport) "$ETN 'test_unrar'"} + ) + + python setup.py test ''${EXCLUDED_FLAGS[@]} + + runHook postInstallCheck + ''; meta = { homepage = "https://calibre-ebook.com"; @@ -206,6 +224,6 @@ stdenv.mkDerivation (finalAttrs: { else lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ pSub ]; platforms = lib.platforms.unix; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; }) diff --git a/pkgs/applications/misc/camunda-modeler/default.nix b/pkgs/applications/misc/camunda-modeler/default.nix index ce23411258420..3dce538aa007f 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.26.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-jtTlqVsd+EGBkh05O+fRn6e6Q+Gw68uGruQqaTfsolM="; }; sourceRoot = "camunda-modeler-${version}-linux-x64"; diff --git a/pkgs/applications/misc/cardpeek/default.nix b/pkgs/applications/misc/cardpeek/default.nix index 0b7630b53f099..6122607bc4dc2 100644 --- a/pkgs/applications/misc/cardpeek/default.nix +++ b/pkgs/applications/misc/cardpeek/default.nix @@ -10,7 +10,6 @@ , curl , readline , PCSC -, xcbuild }: let version = "0.8.4"; @@ -26,7 +25,7 @@ stdenv.mkDerivation { sha256 = "1ighpl7nvcvwnsd6r5h5n9p95kclwrq99hq7bry7s53yr57l6588"; }; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' # replace xcode check and hard-coded PCSC framework path substituteInPlace configure.ac \ --replace 'if test ! -e "/Applications/Xcode.app/"; then' 'if test yes != yes; then' \ @@ -35,8 +34,8 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ glib gtk3 lua5_2 curl readline ] - ++ lib.optional stdenv.isDarwin PCSC - ++ lib.optional stdenv.isLinux pcsclite; + ++ lib.optional stdenv.hostPlatform.isDarwin PCSC + ++ lib.optional stdenv.hostPlatform.isLinux pcsclite; enableParallelBuilding = true; diff --git a/pkgs/applications/misc/cartridges/default.nix b/pkgs/applications/misc/cartridges/default.nix deleted file mode 100644 index 3674d61fafcae..0000000000000 --- a/pkgs/applications/misc/cartridges/default.nix +++ /dev/null @@ -1,75 +0,0 @@ -{ blueprint-compiler -, desktop-file-utils -, fetchFromGitHub -, gobject-introspection -, lib -, libadwaita -, meson -, ninja -, python3Packages -, stdenv -, wrapGAppsHook4 -, nix-update-script -}: -stdenv.mkDerivation (finalAttrs: { - pname = "cartridges"; - version = "2.8.5"; - - src = fetchFromGitHub { - owner = "kra-mo"; - repo = "cartridges"; - rev = "v${finalAttrs.version}"; - hash = "sha256-7T+q3T8z8SCpAn3ayodZeETOsTwL+hhVWzY2JyBEoi4="; - }; - - pythonPath = with python3Packages; [ - pillow - pygobject3 - pyyaml - requests - ]; - - # TODO: remove this when #286814 hits master - mesonFlags = [ "-Dtiff_compression=jpeg" ]; - - buildInputs = [ - libadwaita - (python3Packages.python.withPackages (_: finalAttrs.pythonPath)) - ]; - - nativeBuildInputs = [ - blueprint-compiler - desktop-file-utils - gobject-introspection - meson - ninja - python3Packages.wrapPython - wrapGAppsHook4 - ]; - - dontWrapGApps = true; - - postFixup = '' - makeWrapperArgs+=("''${gappsWrapperArgs[@]}") - wrapPythonPrograms "$out/bin" "$out" "$pythonPath" - ''; - - passthru = { - updateScript = nix-update-script { }; - }; - - meta = with lib; { - description = "GTK4 + Libadwaita game launcher"; - mainProgram = "cartridges"; - longDescription = '' - A simple game launcher for all of your games. - It has support for importing games from Steam, Lutris, Heroic - and more with no login necessary. - You can sort and hide games or download cover art from SteamGridDB. - ''; - homepage = "https://apps.gnome.org/Cartridges/"; - license = licenses.gpl3Plus; - maintainers = [ maintainers.getchoo ]; - platforms = platforms.linux; - }; -}) diff --git a/pkgs/applications/misc/cask-server/default.nix b/pkgs/applications/misc/cask-server/default.nix index 4626963488399..2cb52a2b2cc8c 100644 --- a/pkgs/applications/misc/cask-server/default.nix +++ b/pkgs/applications/misc/cask-server/default.nix @@ -1,5 +1,4 @@ { lib -, pkgs , mkDerivation , fetchFromGitHub , cmake diff --git a/pkgs/applications/misc/chatblade/default.nix b/pkgs/applications/misc/chatblade/default.nix index 7310b1c7f19d8..696cf52ba4146 100644 --- a/pkgs/applications/misc/chatblade/default.nix +++ b/pkgs/applications/misc/chatblade/default.nix @@ -2,40 +2,24 @@ python3Packages.buildPythonApplication rec { pname = "chatblade"; - version = "0.4.0"; + version = "0.6.4"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-AjE+1MkSkZOtEUPKEPBKQ3n+aOB8cwsorBpL5skNskU="; + hash = "sha256-d8XavZBuWsuIUxraC2XaWM6tgo2JmsPZwzyl9Rj5wWM="; }; doCheck = false; # there are no tests pythonImportsCheck = [ "chatblade" ]; propagatedBuildInputs = with python3Packages; [ - aiohttp - aiosignal - async-timeout - attrs - certifi - charset-normalizer - frozenlist - idna - markdown-it-py - mdurl - multidict openai platformdirs - pygments + pylatexenc pyyaml - regex - requests rich tiktoken - tqdm - urllib3 - yarl ]; meta = with lib; { diff --git a/pkgs/applications/misc/cherrytree/default.nix b/pkgs/applications/misc/cherrytree/default.nix index d3c1ac3506528..69b457a4f0703 100644 --- a/pkgs/applications/misc/cherrytree/default.nix +++ b/pkgs/applications/misc/cherrytree/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "cherrytree"; - version = "1.1.3"; + version = "1.1.4"; src = fetchFromGitHub { owner = "giuspen"; repo = "cherrytree"; rev = "refs/tags/v${version}"; - hash = "sha256-Xtm+SFJOSb04WlooRhTopYtyiXEOkOmiPojM8E7l5vY="; + hash = "sha256-JiSGoEVGotaPqEKFHjTagi+sZPgdX+tKI0FIHRmJKHE="; }; nativeBuildInputs = [ @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { homepage = "https://www.giuspen.com/cherrytree"; changelog = "https://raw.githubusercontent.com/giuspen/cherrytree/${version}/changelog.txt"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/misc/citations/default.nix b/pkgs/applications/misc/citations/default.nix index ae50a584e0a03..178a0e25cbf6a 100644 --- a/pkgs/applications/misc/citations/default.nix +++ b/pkgs/applications/misc/citations/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; - repo = finalAttrs.pname; + repo = "citations"; rev = finalAttrs.version; hash = "sha256-RV9oQcXzRsNcvZc/8Xt7qZ/88DvHofC2Av0ftxzeF6Q="; }; @@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: { gtksourceview5 libadwaita poppler - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Foundation ]; diff --git a/pkgs/applications/misc/clight/clightd.nix b/pkgs/applications/misc/clight/clightd.nix index b6958d86bbd03..14fba10232bbf 100644 --- a/pkgs/applications/misc/clight/clightd.nix +++ b/pkgs/applications/misc/clight/clightd.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub -, dbus, cmake, pkg-config +, dbus, cmake, pkg-config, wayland-scanner , glib, udev, polkit, libusb1, libjpeg, libmodule , pcre, libXdmcp, util-linux, libpthreadstubs , enableDdc ? true, ddcutil @@ -29,24 +29,29 @@ stdenv.mkDerivation rec { sed -i "s@pkg_get_variable(POLKIT_ACTION_DIR.*@set(POLKIT_ACTION_DIR $POLKIT_ACTION_DIR)@" CMakeLists.txt ''; - cmakeFlags = with lib; + cmakeFlags = [ "-DSYSTEMD_SERVICE_DIR=${placeholder "out"}/lib/systemd/system" "-DDBUS_CONFIG_DIR=${placeholder "out"}/etc/dbus-1/system.d" # systemd.pc has prefix=${systemd.out} "-DMODULE_LOAD_DIR=${placeholder "out"}/lib/modules-load.d" - ] ++ optional enableDdc "-DENABLE_DDC=1" - ++ optional enableDpms "-DENABLE_DPMS=1" - ++ optional enableGamma "-DENABLE_GAMMA=1" - ++ optional enableScreen "-DENABLE_SCREEN=1" - ++ optional enableYoctolight "-DENABLE_YOCTOLIGHT=1"; + ] ++ lib.optional enableDdc "-DENABLE_DDC=1" + ++ lib.optional enableDpms "-DENABLE_DPMS=1" + ++ lib.optional enableGamma "-DENABLE_GAMMA=1" + ++ lib.optional enableScreen "-DENABLE_SCREEN=1" + ++ lib.optional enableYoctolight "-DENABLE_YOCTOLIGHT=1"; + + depsBuildBuild = [ + pkg-config + ]; nativeBuildInputs = [ - dbus cmake pkg-config + wayland-scanner ]; - buildInputs = with lib; [ + buildInputs = [ + dbus glib udev polkit @@ -58,10 +63,10 @@ stdenv.mkDerivation rec { libXdmcp util-linux libpthreadstubs - ] ++ optionals enableDdc [ ddcutil ] - ++ optionals enableDpms [ libXext ] - ++ optionals enableGamma [ libXrandr ] - ++ optionals (enableDpms || enableGamma || enableScreen) [ libdrm wayland ]; + ] ++ lib.optionals enableDdc [ ddcutil ] + ++ lib.optionals enableDpms [ libXext ] + ++ lib.optionals enableGamma [ libXrandr ] + ++ lib.optionals (enableDpms || enableGamma || enableScreen) [ libdrm wayland ]; postInstall = '' mkdir -p $out/bin diff --git a/pkgs/applications/misc/clight/default.nix b/pkgs/applications/misc/clight/default.nix index 882c29f4b36e4..3f3ea2416d893 100644 --- a/pkgs/applications/misc/clight/default.nix +++ b/pkgs/applications/misc/clight/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { bash-completion ]; - buildInputs = with lib; [ + buildInputs = [ gsl popt upower @@ -31,8 +31,8 @@ stdenv.mkDerivation rec { geoclue2 libconfig libmodule - ] ++ optional withGeoclue geoclue2 - ++ optional withUpower upower; + ] ++ lib.optional withGeoclue geoclue2 + ++ lib.optional withUpower upower; cmakeFlags = [ "-DSESSION_BUS_DIR=${placeholder "out"}/share/dbus-1/services" diff --git a/pkgs/applications/misc/clipmenu/default.nix b/pkgs/applications/misc/clipmenu/default.nix index c47dd972ccfd6..b12dc7f04c36f 100644 --- a/pkgs/applications/misc/clipmenu/default.nix +++ b/pkgs/applications/misc/clipmenu/default.nix @@ -4,7 +4,6 @@ , makeWrapper , clipnotify , coreutils -, dmenu , gawk , util-linux , xdotool diff --git a/pkgs/applications/misc/clipqr/default.nix b/pkgs/applications/misc/clipqr/default.nix index 8bbfcc6d42094..90d4e0b66b525 100644 --- a/pkgs/applications/misc/clipqr/default.nix +++ b/pkgs/applications/misc/clipqr/default.nix @@ -9,6 +9,7 @@ , libXi , libXinerama , libXrandr +, libXxf86vm , makeDesktopItem , mesa , pkg-config @@ -17,13 +18,13 @@ buildGoModule rec { pname = "clipqr"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitLab { owner = "imatt-foss"; repo = "clipqr"; rev = "v${version}"; - hash = "sha256-gfKCuTZY9VsiXMlw6XX6YylMO4xGoLQU/5QvnDV7GbE="; + hash = "sha256-iuA6RqclMm1CWaiM1kpOpgfYvKaYGOIwFQkLr/nCL5M="; }; vendorHash = null; @@ -38,6 +39,7 @@ buildGoModule rec { libXi libXinerama libXrandr + libXxf86vm mesa ]; @@ -67,7 +69,7 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ MatthieuBarthel ]; homepage = "https://gitlab.com/imatt-foss/clipqr"; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; mainProgram = "clipqr"; }; } diff --git a/pkgs/applications/misc/cloak/default.nix b/pkgs/applications/misc/cloak/default.nix index bf3dd3c4a0818..61f307edd5554 100644 --- a/pkgs/applications/misc/cloak/default.nix +++ b/pkgs/applications/misc/cloak/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-m11A5fcJzWoDZglrr2Es1V5ZJNepEkGeIRVhexJ7jws="; - buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; meta = with lib; { homepage = "https://github.com/evansmurithi/cloak"; diff --git a/pkgs/applications/misc/cmatrix/default.nix b/pkgs/applications/misc/cmatrix/default.nix deleted file mode 100644 index 7aca6851df217..0000000000000 --- a/pkgs/applications/misc/cmatrix/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, ncurses }: - -stdenv.mkDerivation rec { - pname = "cmatrix"; - version = "2.0"; - - src = fetchFromGitHub { - owner = "abishekvashok"; - repo = "cmatrix"; - rev = "v${version}"; - sha256 = "1h9jz4m4s5l8c3figaq46ja0km1gimrkfxm4dg7mf4s84icmasbm"; - }; - - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ ncurses ]; - - meta = with lib; { - description = "Simulates the falling characters theme from The Matrix movie"; - license = licenses.gpl3; - longDescription = '' - CMatrix simulates the display from "The Matrix" and is based - on the screensaver from the movie's website. - ''; - homepage = "https://github.com/abishekvashok/cmatrix"; - platforms = ncurses.meta.platforms; - maintainers = [ maintainers.AndersonTorres ]; - mainProgram = "cmatrix"; - }; -} diff --git a/pkgs/applications/misc/cobalt/default.nix b/pkgs/applications/misc/cobalt/default.nix index 1fda517675416..a5dd6a8d9ef40 100644 --- a/pkgs/applications/misc/cobalt/default.nix +++ b/pkgs/applications/misc/cobalt/default.nix @@ -2,18 +2,18 @@ rustPlatform.buildRustPackage rec { pname = "cobalt"; - version = "0.19.3"; + version = "0.19.6"; src = fetchFromGitHub { owner = "cobalt-org"; repo = "cobalt.rs"; rev = "v${version}"; - sha256 = "sha256-aAhceExz5SENL+FhPHyx8HmaNOWjNsynv81Rj2cS5M8="; + sha256 = "sha256-6fsKEIgcBu0SE/f0TNfvTdpZX3zc5Bd0F1T82COOqVQ="; }; - cargoHash = "sha256-vw7fGsTSEVO8s1LzilKJN5lGzOfQcms1h7rnTOyE4Kw="; + cargoHash = "sha256-g25Pw3BlRbuaGjsQav6mU9zVyS1mVUKkgKDOILm8R6U="; - buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; meta = with lib; { description = "Static site generator written in Rust"; diff --git a/pkgs/applications/misc/cobang/default.nix b/pkgs/applications/misc/cobang/default.nix index 49e3f13b6d2e5..e20bf9b818adc 100644 --- a/pkgs/applications/misc/cobang/default.nix +++ b/pkgs/applications/misc/cobang/default.nix @@ -24,14 +24,14 @@ buildPythonApplication rec { pname = "cobang"; - version = "0.12.0"; + version = "0.14.1"; pyproject = true; src = fetchFromGitHub { owner = "hongquan"; repo = "CoBang"; rev = "refs/tags/v${version}"; - hash = "sha256-4INScFnYSwVnGjaohgDL3Sv/NeIwiiyLux8c9/Y/Wq4="; + hash = "sha256-/8JtDoXFQGlM7tlwKd+WRIKpnKCD6OnMmbvElg7LbzU="; }; postPatch = '' @@ -97,8 +97,8 @@ buildPythonApplication rec { description = "QR code scanner desktop app for Linux"; homepage = "https://github.com/hongquan/CoBang"; license = licenses.gpl3Only; - maintainers = [ ]; + maintainers = with maintainers; [ aleksana dvaerum ]; mainProgram = "cobang"; - platforms = [ "x86_64-linux" ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/misc/collision/default.nix b/pkgs/applications/misc/collision/default.nix index 8fd8ad8f33ba9..392bf98af62fd 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 @@ -20,13 +20,13 @@ crystal.buildCrystalPackage rec { pname = "Collision"; - version = "3.8.0"; + version = "3.8.1"; src = fetchFromGitHub { owner = "GeopJr"; repo = "Collision"; rev = "v${version}"; - hash = "sha256-Bo/u0UYM/N7tLqdCs2OU5pdj2s9LXPooSR1PCGk9dSc="; + hash = "sha256-55qCHc+snMAUFAT31Z8EPtJ/HLrnv1BveCEzjkn7N5g="; }; postPatch = '' @@ -48,13 +48,13 @@ crystal.buildCrystalPackage rec { # Shortly, adding pkg-config to buildInputs along with openssl fixes the issue. nativeBuildInputs = [ wrapGAppsHook4 pkg-config gobject-introspection ] - ++ lib.optionals stdenv.isDarwin [ desktopToDarwinBundle ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ desktopToDarwinBundle ]; buildInputs = [ libadwaita openssl libxml2 - gnome.nautilus-python + nautilus-python python3.pkgs.pygobject3 ]; diff --git a/pkgs/applications/misc/collision/shards.nix b/pkgs/applications/misc/collision/shards.nix index e1b6032d5932d..0fe9fac03eb9c 100644 --- a/pkgs/applications/misc/collision/shards.nix +++ b/pkgs/applications/misc/collision/shards.nix @@ -11,8 +11,8 @@ }; gi-crystal = { url = "https://github.com/hugopl/gi-crystal.git"; - rev = "v0.22.2"; - sha256 = "0bpa1f8iaf97z2kbgjc7nc8km7nd7bppiwna319lm2hvm8m5pw15"; + rev = "v0.22.3"; + sha256 = "1xyj5bf3l2i1yzqxb8yyj0fc3kwi9nnd57n5dhs5xm9jxzcvw1kk"; }; gtk4 = { url = "https://github.com/hugopl/gtk4.cr.git"; diff --git a/pkgs/applications/misc/colorstorm/default.nix b/pkgs/applications/misc/colorstorm/default.nix index 63014eb51e60f..da612b33c2baf 100644 --- a/pkgs/applications/misc/colorstorm/default.nix +++ b/pkgs/applications/misc/colorstorm/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Color theme generator for editors and terminal emulators"; homepage = "https://github.com/benbusby/colorstorm"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; inherit (zig_0_9.meta) platforms; mainProgram = "colorstorm"; }; diff --git a/pkgs/applications/misc/comodoro/default.nix b/pkgs/applications/misc/comodoro/default.nix index b9fd5ea28ba9a..01836f5830666 100644 --- a/pkgs/applications/misc/comodoro/default.nix +++ b/pkgs/applications/misc/comodoro/default.nix @@ -3,8 +3,8 @@ , fetchFromGitHub , stdenv , installShellFiles -, installShellCompletions ? stdenv.hostPlatform == stdenv.buildPlatform -, installManPages ? stdenv.hostPlatform == stdenv.buildPlatform +, installShellCompletions ? stdenv.buildPlatform.canExecute stdenv.hostPlatform +, installManPages ? stdenv.buildPlatform.canExecute stdenv.hostPlatform , withTcp ? true }: diff --git a/pkgs/applications/misc/conceal/Cargo.lock b/pkgs/applications/misc/conceal/Cargo.lock deleted file mode 100644 index 05ab253d4ca83..0000000000000 --- a/pkgs/applications/misc/conceal/Cargo.lock +++ /dev/null @@ -1,853 +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.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163" -dependencies = [ - "anstyle", - "anstyle-parse", - "anstyle-query", - "anstyle-wincon", - "colorchoice", - "is-terminal", - "utf8parse", -] - -[[package]] -name = "anstyle" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd" - -[[package]] -name = "anstyle-parse" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333" -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 = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188" -dependencies = [ - "anstyle", - "windows-sys", -] - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bitflags" -version = "2.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42" - -[[package]] -name = "bumpalo" -version = "3.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" - -[[package]] -name = "cc" -version = "1.0.79" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" - -[[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.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" -dependencies = [ - "android-tzdata", - "iana-time-zone", - "js-sys", - "num-traits", - "time 0.1.45", - "wasm-bindgen", - "winapi", -] - -[[package]] -name = "clap" -version = "4.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1640e5cc7fb47dbb8338fd471b105e7ed6c3cb2aeb00c2e067127ffd3764a05d" -dependencies = [ - "clap_builder", - "clap_derive", - "once_cell", -] - -[[package]] -name = "clap_builder" -version = "4.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98c59138d527eeaf9b53f35a77fcc1fad9d883116070c63d5de1c7dc7b00c72b" -dependencies = [ - "anstream", - "anstyle", - "clap_lex", - "strsim", -] - -[[package]] -name = "clap_complete" -version = "4.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fc443334c81a804575546c5a8a79b4913b50e28d69232903604cada1de817ce" -dependencies = [ - "clap", -] - -[[package]] -name = "clap_complete_nushell" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d02bc8b1a18ee47c4d2eec3fb5ac034dc68ebea6125b1509e9ccdffcddce66e" -dependencies = [ - "clap", - "clap_complete", -] - -[[package]] -name = "clap_derive" -version = "4.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8cd2b2a819ad6eec39e8f1d6b53001af1e5469f8c177579cdaeb313115b825f" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "clap_lex" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" - -[[package]] -name = "colorchoice" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" - -[[package]] -name = "conceal" -version = "0.4.1" -dependencies = [ - "clap", - "clap_complete", - "clap_complete_nushell", - "dirs", - "owo-colors", - "thiserror", - "time 0.3.23", - "trash", -] - -[[package]] -name = "core-foundation-sys" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" - -[[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", -] - -[[package]] -name = "errno" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" -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 = "form_urlencoded" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" -dependencies = [ - "percent-encoding", -] - -[[package]] -name = "getrandom" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" -dependencies = [ - "cfg-if", - "libc", - "wasi 0.11.0+wasi-snapshot-preview1", -] - -[[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.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" - -[[package]] -name = "iana-time-zone" -version = "0.1.57" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" -dependencies = [ - "android_system_properties", - "core-foundation-sys", - "iana-time-zone-haiku", - "js-sys", - "wasm-bindgen", - "windows 0.48.0", -] - -[[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.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "is-terminal" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" -dependencies = [ - "hermit-abi", - "rustix", - "windows-sys", -] - -[[package]] -name = "itoa" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b02a5381cc465bd3041d84623d0fa3b66738b52b8e2fc3bab8ad63ab032f4a" - -[[package]] -name = "js-sys" -version = "0.3.64" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "libc" -version = "0.2.147" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" - -[[package]] -name = "linux-raw-sys" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0" - -[[package]] -name = "log" -version = "0.4.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" - -[[package]] -name = "malloc_buf" -version = "0.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" -dependencies = [ - "libc", -] - -[[package]] -name = "num-traits" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" -dependencies = [ - "autocfg", -] - -[[package]] -name = "num_threads" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" -dependencies = [ - "libc", -] - -[[package]] -name = "objc" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" -dependencies = [ - "malloc_buf", -] - -[[package]] -name = "once_cell" -version = "1.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" - -[[package]] -name = "option-ext" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" - -[[package]] -name = "owo-colors" -version = "3.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" - -[[package]] -name = "percent-encoding" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" - -[[package]] -name = "proc-macro2" -version = "1.0.64" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78803b62cbf1f46fde80d7c0e803111524b9877184cfe7c3033659490ac7a7da" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "quote" -version = "1.0.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "573015e8ab27661678357f27dc26460738fd2b6c86e46f386fde94cb5d913105" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "redox_syscall" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "redox_users" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" -dependencies = [ - "getrandom", - "redox_syscall", - "thiserror", -] - -[[package]] -name = "rustix" -version = "0.38.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac5ffa1efe7548069688cd7028f32591853cd7b5b756d41bcffd2353e4fc75b4" -dependencies = [ - "bitflags 2.3.3", - "errno", - "libc", - "linux-raw-sys", - "windows-sys", -] - -[[package]] -name = "scopeguard" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" - -[[package]] -name = "serde" -version = "1.0.171" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30e27d1e4fd7659406c492fd6cfaf2066ba8773de45ca75e855590f856dc34a9" - -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - -[[package]] -name = "syn" -version = "2.0.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15e3fc8c0c74267e2df136e5e5fb656a464158aa57624053375eb9c8c6e25ae2" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "thiserror" -version = "1.0.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a35fc5b8971143ca348fa6df4f024d4d55264f3468c71ad1c2f365b0a4d58c42" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "463fe12d7993d3b327787537ce8dd4dfa058de32fc2b195ef3cde03dc4771e8f" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "time" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" -dependencies = [ - "libc", - "wasi 0.10.0+wasi-snapshot-preview1", - "winapi", -] - -[[package]] -name = "time" -version = "0.3.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59e399c068f43a5d116fedaf73b203fa4f9c519f17e2b34f63221d3792f81446" -dependencies = [ - "itoa", - "libc", - "num_threads", - "serde", - "time-core", - "time-macros", -] - -[[package]] -name = "time-core" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" - -[[package]] -name = "time-macros" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96ba15a897f3c86766b757e5ac7221554c6750054d74d5b28844fce5fb36a6c4" -dependencies = [ - "time-core", -] - -[[package]] -name = "tinyvec" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" -dependencies = [ - "tinyvec_macros", -] - -[[package]] -name = "tinyvec_macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" - -[[package]] -name = "trash" -version = "3.0.1" -source = "git+https://github.com/TD-Sky/trash-rs?branch=conceal#7c698eeff381472fd3a253aa8b0dd2782d3d68db" -dependencies = [ - "chrono", - "libc", - "log", - "objc", - "once_cell", - "scopeguard", - "thiserror", - "url", - "windows 0.44.0", -] - -[[package]] -name = "unicode-bidi" -version = "0.3.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" - -[[package]] -name = "unicode-ident" -version = "1.0.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22049a19f4a68748a168c0fc439f9516686aa045927ff767eca0a85101fb6e73" - -[[package]] -name = "unicode-normalization" -version = "0.1.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "url" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" -dependencies = [ - "form_urlencoded", - "idna", - "percent-encoding", -] - -[[package]] -name = "utf8parse" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" - -[[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.87" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" -dependencies = [ - "cfg-if", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.87" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" -dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2", - "quote", - "syn", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.87" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.87" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.87" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" - -[[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" -version = "0.44.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e745dab35a0c4c77aa3ce42d595e13d2003d6902d6b08c9ef5fc326d08da12b" -dependencies = [ - "windows-targets 0.42.2", -] - -[[package]] -name = "windows" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" -dependencies = [ - "windows-targets 0.48.1", -] - -[[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.1", -] - -[[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.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" -dependencies = [ - "windows_aarch64_gnullvm 0.48.0", - "windows_aarch64_msvc 0.48.0", - "windows_i686_gnu 0.48.0", - "windows_i686_msvc 0.48.0", - "windows_x86_64_gnu 0.48.0", - "windows_x86_64_gnullvm 0.48.0", - "windows_x86_64_msvc 0.48.0", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" - -[[package]] -name = "windows_i686_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" - -[[package]] -name = "windows_i686_gnu" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" - -[[package]] -name = "windows_i686_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" - -[[package]] -name = "windows_i686_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" diff --git a/pkgs/applications/misc/conceal/default.nix b/pkgs/applications/misc/conceal/default.nix index 8579e54f33fd2..5ce8d147fbbfc 100644 --- a/pkgs/applications/misc/conceal/default.nix +++ b/pkgs/applications/misc/conceal/default.nix @@ -2,21 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "conceal"; - version = "0.4.1"; + version = "0.5.4"; src = fetchFromGitHub { owner = "TD-Sky"; repo = pname; rev = "v${version}"; - sha256 = "sha256-zrG4AE8I1nVvEGNvi7tOsqn6yNOqpRmhJzbuJINnJBw="; + sha256 = "sha256-N/KlxtxzEDwUvQMpgf2S6u7MaYiF0eXnMrGoowc08J0="; }; - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "trash-3.0.1" = "sha256-6GTdT7pVy9yVMeZglPUS4kub2xVLW1h1uynE6zX3w98="; - }; - }; + cargoHash = "sha256-50EHc8ZHzbl5IFpi5k3/Katc3FaxBgnpf8COrpPHZWk="; nativeBuildInputs = [ installShellFiles ]; @@ -40,6 +35,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/TD-Sky/conceal"; license = licenses.mit; maintainers = with maintainers; [ jedsek kashw2 ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/applications/misc/conduktor/default.nix b/pkgs/applications/misc/conduktor/default.nix index 6eb0e832bc951..574bd3bf922ea 100644 --- a/pkgs/applications/misc/conduktor/default.nix +++ b/pkgs/applications/misc/conduktor/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, fetchzip, jdk11, unzip, makeWrapper, makeDesktopItem, copyDesktopItems }: +{ stdenv, lib, fetchurl, fetchzip, jdk11, makeWrapper, makeDesktopItem, copyDesktopItems }: stdenv.mkDerivation rec { pname = "conduktor"; diff --git a/pkgs/applications/misc/coolreader/default.nix b/pkgs/applications/misc/coolreader/default.nix index d75cdd4843fab..22e9906db561d 100644 --- a/pkgs/applications/misc/coolreader/default.nix +++ b/pkgs/applications/misc/coolreader/default.nix @@ -17,7 +17,7 @@ mkDerivation rec { buildInputs = [ qttools fribidi libunibreak ]; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; homepage = "https://github.com/buggins/coolreader"; description = "Cross platform open source e-book reader"; mainProgram = "cr3"; diff --git a/pkgs/applications/misc/corectrl/default.nix b/pkgs/applications/misc/corectrl/default.nix index 9240635aa5421..eb0f2359cc291 100644 --- a/pkgs/applications/misc/corectrl/default.nix +++ b/pkgs/applications/misc/corectrl/default.nix @@ -1,12 +1,12 @@ { lib, stdenv , fetchFromGitLab , extra-cmake-modules -, botan2 +, botan3 , karchive , kauth , libdrm , hwdata -, glxinfo +, mesa-demos , polkit , procps , pugixml @@ -31,7 +31,7 @@ stdenv.mkDerivation rec{ owner = "corectrl"; repo = "corectrl"; rev = "v${version}"; - sha256 = "sha256-E2Dqe1IYXjFb/nShQX+ARZW/AWpNonRimb3yQ6/2CFw="; + hash = "sha256-E2Dqe1IYXjFb/nShQX+ARZW/AWpNonRimb3yQ6/2CFw="; }; patches = [ ./polkit-dir.patch @@ -42,11 +42,11 @@ stdenv.mkDerivation rec{ wrapQtAppsHook ]; buildInputs = [ - botan2 + botan3 karchive kauth libdrm - glxinfo + mesa-demos polkit procps pugixml @@ -68,7 +68,7 @@ stdenv.mkDerivation rec{ "-DPOLKIT_POLICY_INSTALL_DIR=${placeholder "out"}/share/polkit-1/actions" ]; - runtimeDeps = [ hwdata glxinfo vulkan-tools util-linux procps ]; + runtimeDeps = [ hwdata mesa-demos vulkan-tools util-linux procps ]; binPath = lib.makeBinPath runtimeDeps; dontWrapQtApps = true; diff --git a/pkgs/applications/misc/cotp/default.nix b/pkgs/applications/misc/cotp/default.nix index 14c8ee0edd4e2..e2f5cffdfbad0 100644 --- a/pkgs/applications/misc/cotp/default.nix +++ b/pkgs/applications/misc/cotp/default.nix @@ -8,19 +8,19 @@ rustPlatform.buildRustPackage rec { pname = "cotp"; - version = "1.7.1"; + version = "1.9.1"; src = fetchFromGitHub { owner = "replydev"; repo = "cotp"; rev = "v${version}"; - hash = "sha256-6FriNAwxo+YnJWmCrScyafUEkJvEJz3O9Zoj9yerpSI="; + hash = "sha256-U5x8szvouoxJ+DZUlrn5wtXt+6vs62tzcWICQW3B21U="; }; - cargoHash = "sha256-/CW0CGhPjKd5oU2LYW4lPWKMATn9aJdjIy44yZJyU/E="; + cargoHash = "sha256-o9LRXbx77EXXO7rEmpBrx2nommJgG0ikw1YzdeB0Gug="; - buildInputs = lib.optionals stdenv.isLinux [ libxcb ] - ++ lib.optionals stdenv.isDarwin [ AppKit ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libxcb ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit ]; meta = with lib; { homepage = "https://github.com/replydev/cotp"; diff --git a/pkgs/applications/misc/coursera-dl/default.nix b/pkgs/applications/misc/coursera-dl/default.nix index 67848ea9354e5..63aaf33f7f42f 100644 --- a/pkgs/applications/misc/coursera-dl/default.nix +++ b/pkgs/applications/misc/coursera-dl/default.nix @@ -1,15 +1,15 @@ -{ lib -, fetchFromGitHub -, fetchpatch -, glibcLocales -, pandoc -, python3 +{ + fetchFromGitHub, + fetchpatch, + lib, + pandoc, + python3, }: python3.pkgs.buildPythonApplication rec { pname = "coursera-dl"; version = "0.11.5"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "coursera-dl"; @@ -35,27 +35,17 @@ python3.pkgs.buildPythonApplication rec { }) ]; - postPatch = '' - substituteInPlace requirements.txt \ - --replace '==' '>=' - ''; + build-system = with python3.pkgs; [ setuptools ]; - preConfigure = '' - export LC_ALL=en_US.utf-8 - ''; + nativeBuildInputs = [ pandoc ]; - nativeBuildInputs = with python3.pkgs; [ - pandoc - ]; - - buildInputs = with python3.pkgs; [ - glibcLocales - ]; + pythonRelaxDeps = true; - propagatedBuildInputs = with python3.pkgs; [ + dependencies = with python3.pkgs; [ attrs beautifulsoup4 configargparse + distutils keyring pyasn1 requests @@ -77,7 +67,7 @@ python3.pkgs.buildPythonApplication rec { description = "CLI for downloading Coursera.org videos and naming them"; mainProgram = "coursera-dl"; homepage = "https://github.com/coursera-dl/coursera-dl"; - changelog = "https://github.com/coursera-dl/coursera-dl/blob/0.11.5/CHANGELOG.md"; + changelog = "https://github.com/coursera-dl/coursera-dl/blob/${src.rev}/CHANGELOG.md"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ alexfmpe ]; platforms = platforms.darwin ++ platforms.linux; diff --git a/pkgs/applications/misc/crow-translate/default.nix b/pkgs/applications/misc/crow-translate/default.nix index 8f6bc27438faf..84263380f11ae 100644 --- a/pkgs/applications/misc/crow-translate/default.nix +++ b/pkgs/applications/misc/crow-translate/default.nix @@ -1,6 +1,6 @@ { lib , stdenv -, fetchzip +, fetchFromGitLab , cmake , extra-cmake-modules , qttools @@ -12,21 +12,24 @@ , wrapQtAppsHook , gst_all_1 , testers -, crow-translate }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "crow-translate"; - version = "2.11.1"; + version = "3.0.0"; - src = fetchzip { - url = "https://github.com/${pname}/${pname}/releases/download/${version}/${pname}-${version}-source.tar.gz"; - hash = "sha256-1rq1pF4tOaZNEaHflxlBuHta80EzD9m3O99geR1EPxE="; + src = fetchFromGitLab { + domain = "invent.kde.org"; + owner = "office"; + repo = "crow-translate"; + rev = "v${finalAttrs.version}"; + hash = "sha256-hdrhxbv44DlxoF1JU1d2auP/vR8a3IJI+hN7PhdPMaY="; + fetchSubmodules = true; }; postPatch = '' - substituteInPlace data/io.crow_translate.CrowTranslate.desktop \ - --replace "Exec=qdbus" "Exec=${lib.getBin qttools}/bin/qdbus" + substituteInPlace data/org.kde.CrowTranslate.desktop.in \ + --subst-var-by QT_BIN_DIR ${lib.getBin qttools}/bin ''; nativeBuildInputs = [ @@ -54,15 +57,15 @@ stdenv.mkDerivation rec { ''; passthru.tests.version = testers.testVersion { - package = crow-translate; + package = finalAttrs.finalPackage; }; - meta = with lib; { + meta = { description = "Simple and lightweight translator that allows to translate and speak text using Google, Yandex and Bing"; - homepage = "https://crow-translate.github.io/"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ sikmir ]; - platforms = platforms.linux; + homepage = "https://invent.kde.org/office/crow-translate"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ sikmir ]; + platforms = lib.platforms.linux; mainProgram = "crow"; }; -} +}) diff --git a/pkgs/applications/misc/cubiomes-viewer/default.nix b/pkgs/applications/misc/cubiomes-viewer/default.nix index 35d2ab7117947..f75ddf0c108de 100644 --- a/pkgs/applications/misc/cubiomes-viewer/default.nix +++ b/pkgs/applications/misc/cubiomes-viewer/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { owner = "Cubitect"; repo = pname; rev = version; - sha256 = "sha256-UUvNSTM98r8D/Q+/pPTXwGzW4Sl1qhgem4WsFRfybuo="; + hash = "sha256-UUvNSTM98r8D/Q+/pPTXwGzW4Sl1qhgem4WsFRfybuo="; fetchSubmodules = true; }; @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; homepage = "https://github.com/Cubitect/cubiomes-viewer"; description = "Graphical Minecraft seed finder and map viewer"; mainProgram = "cubiomes-viewer"; diff --git a/pkgs/applications/misc/cum/default.nix b/pkgs/applications/misc/cum/default.nix index b06f77787ac0e..e1ea239b43fc4 100644 --- a/pkgs/applications/misc/cum/default.nix +++ b/pkgs/applications/misc/cum/default.nix @@ -31,7 +31,7 @@ buildPythonApplication rec { mainProgram = "cum"; homepage = "https://github.com/Hamuko/cum"; license = licenses.asl20; - maintainers = with maintainers; [ tadeokondrak ]; + maintainers = [ ]; platforms = platforms.all; }; } diff --git a/pkgs/applications/misc/darkman/default.nix b/pkgs/applications/misc/darkman/default.nix index 33918b41329ba..66b67be5b6075 100644 --- a/pkgs/applications/misc/darkman/default.nix +++ b/pkgs/applications/misc/darkman/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { owner = "WhyNotHugo"; repo = "darkman"; rev = "v${version}"; - sha256 = "sha256-FaEpVy/0PqY5Bmw00hMyFZb9wcwYwEuCKMatYN8Xk3o="; + hash = "sha256-FaEpVy/0PqY5Bmw00hMyFZb9wcwYwEuCKMatYN8Xk3o="; }; patches = [ diff --git a/pkgs/applications/misc/dasel/default.nix b/pkgs/applications/misc/dasel/default.nix index 56bd8bce5bc09..f135a39a41e62 100644 --- a/pkgs/applications/misc/dasel/default.nix +++ b/pkgs/applications/misc/dasel/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildGoModule , fetchFromGitHub , installShellFiles @@ -6,16 +7,16 @@ buildGoModule rec { pname = "dasel"; - version = "2.7.0"; + version = "2.8.1"; src = fetchFromGitHub { owner = "TomWright"; repo = "dasel"; rev = "v${version}"; - hash = "sha256-N3WeU+8KJwYKvuN4I1ZNEtIgLTmh/XgnhwATwV7dsvY="; + hash = "sha256-vq4lRCsqD2hmQw0yH84Wji5LeJ/aiMGJJIyCDvATA+I="; }; - vendorHash = "sha256-G9IdTMF5Lnwq38rdJtuvUjD4RBaSmCYs3g+ETz29Mec="; + vendorHash = "sha256-edyFs5oURklkqsTF7JA1in3XteSBx/6YEVu4MjIcGN4="; ldflags = [ "-s" "-w" "-X github.com/tomwright/dasel/v2/internal.Version=${version}" @@ -23,14 +24,14 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles ]; - postInstall = '' + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd dasel \ --bash <($out/bin/dasel completion bash) \ --fish <($out/bin/dasel completion fish) \ --zsh <($out/bin/dasel completion zsh) ''; - doInstallCheck = true; + doInstallCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; installCheckPhase = '' runHook preInstallCheck if [[ $($out/bin/dasel --version) == "dasel version ${version}" ]]; then diff --git a/pkgs/applications/misc/databricks-sql-cli/default.nix b/pkgs/applications/misc/databricks-sql-cli/default.nix index ae118501f47de..75b5529187296 100644 --- a/pkgs/applications/misc/databricks-sql-cli/default.nix +++ b/pkgs/applications/misc/databricks-sql-cli/default.nix @@ -1,39 +1,31 @@ { lib , fetchFromGitHub -, fetchpatch , python3 }: python3.pkgs.buildPythonApplication rec { pname = "databricks-sql-cli"; - version = "0.1.4"; - format = "pyproject"; + version = "0.3.3"; + pyproject = true; src = fetchFromGitHub { owner = "databricks"; repo = "databricks-sql-cli"; rev = "refs/tags/v${version}"; - hash = "sha256-gr7LJfnvIu2Jf1XgILqfZoi8CbXeQyq0g1wLEBa5TPM="; + hash = "sha256-wmwXw1o+pRsRjA7ai9x5o1el7mNBqM6xlGrvw0IqfMo="; }; - patches = [ - # https://github.com/databricks/databricks-sql-cli/pull/38 - (fetchpatch { - url = "https://github.com/databricks/databricks-sql-cli/commit/fc294e00819b6966f1605e5c1ce654473510aefe.patch"; - sha256 = "sha256-QVrb7mD0fVbHrbrDywI6tsFNYM19x74LY8rhqqC8szE="; - }) - ]; - - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'python = ">=3.7.1,<4.0"' 'python = ">=3.8,<4.0"' \ - --replace 'pandas = "1.3.4"' 'pandas = "~1.5"' - ''; - nativeBuildInputs = with python3.pkgs; [ poetry-core ]; + pythonRelaxDeps = [ + "pandas" + "databricks-sql-connector" + "sqlparse" + "numpy" + ]; + propagatedBuildInputs = with python3.pkgs; [ cli-helpers click @@ -51,6 +43,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "CLI for querying Databricks SQL"; + mainProgram = "dbsqlcli"; homepage = "https://github.com/databricks/databricks-sql-cli"; changelog = "https://github.com/databricks/databricks-sql-cli/releases/tag/v${version}"; license = licenses.databricks; diff --git a/pkgs/applications/misc/dbx/default.nix b/pkgs/applications/misc/dbx/default.nix index 9dc19941a0720..f3f3409434415 100644 --- a/pkgs/applications/misc/dbx/default.nix +++ b/pkgs/applications/misc/dbx/default.nix @@ -5,7 +5,7 @@ python3, }: let - python = python3.override { packageOverrides = self: super: { pydantic = super.pydantic_1; }; }; + python = python3.override { self = python; packageOverrides = self: super: { pydantic = super.pydantic_1; }; }; in python.pkgs.buildPythonApplication rec { pname = "dbx"; @@ -30,7 +30,6 @@ python.pkgs.buildPythonApplication rec { build-system = with python.pkgs; [ setuptools ]; - nativeBuildInputs = with python.pkgs; [ pythonRelaxDepsHook ]; propagatedBuildInputs = with python.pkgs; @@ -51,10 +50,9 @@ python.pkgs.buildPythonApplication rec { tenacity typer watchdog - ] - ++ typer.optional-dependencies.all; + ]; - passthru.optional-dependencies = with python3.pkgs; { + optional-dependencies = with python3.pkgs; { aws = [ boto3 ]; azure = [ azure-storage-blob diff --git a/pkgs/applications/misc/deckmaster/default.nix b/pkgs/applications/misc/deckmaster/default.nix index 2261b7c516bc9..5574b645d6ae1 100644 --- a/pkgs/applications/misc/deckmaster/default.nix +++ b/pkgs/applications/misc/deckmaster/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , buildGoModule , fetchFromGitHub , makeWrapper diff --git a/pkgs/applications/misc/dialect/default.nix b/pkgs/applications/misc/dialect/default.nix index 8ce0a162174bc..929fe77cd9718 100644 --- a/pkgs/applications/misc/dialect/default.nix +++ b/pkgs/applications/misc/dialect/default.nix @@ -20,7 +20,7 @@ python3.pkgs.buildPythonApplication rec { pname = "dialect"; - version = "2.4.1"; + version = "2.4.2"; pyproject = false; # built with meson src = fetchFromGitHub { @@ -28,7 +28,7 @@ python3.pkgs.buildPythonApplication rec { repo = "dialect"; rev = version; fetchSubmodules = true; - hash = "sha256-WEeTdUdhDSfStu+rBYcuk6miuh5e0AsodbyF93Mg4mo="; + hash = "sha256-DAhzvia5ut806rTc2iMuMrVKyYBSaAiMyC4rEOyU4x0="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/dict-cc-py/default.nix b/pkgs/applications/misc/dict-cc-py/default.nix index 9d4c40084f7f0..6742d020cd98c 100644 --- a/pkgs/applications/misc/dict-cc-py/default.nix +++ b/pkgs/applications/misc/dict-cc-py/default.nix @@ -28,6 +28,6 @@ python3.pkgs.buildPythonPackage rec { mainProgram = "dict.cc.py"; homepage = "https://github.com/rbaron/dict.cc.py"; license = with licenses; [ cc0 ]; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/misc/diebahn/default.nix b/pkgs/applications/misc/diebahn/default.nix index 3bf71ddab71cb..0212547a75a61 100644 --- a/pkgs/applications/misc/diebahn/default.nix +++ b/pkgs/applications/misc/diebahn/default.nix @@ -21,19 +21,19 @@ stdenv.mkDerivation rec { pname = "diebahn"; - version = "2.6.0"; + version = "2.7.0"; src = fetchFromGitLab { owner = "schmiddi-on-mobile"; repo = "railway"; rev = version; - hash = "sha256-cVCq7iVurX5SlCs7A5FSds6KaxMW3Qv/JIhhO69FTrk="; + hash = "sha256-ps55DiAsetmdcItZKcfyYDD0q0w1Tkf/U48UR/zQx1g="; }; cargoDeps = rustPlatform.fetchCargoTarball { name = "${pname}-${src}"; inherit src; - hash = "sha256-J8KOmvSiUNBpt4qSFnNEwSKFJMSaTFd14G2INDYwPUE="; + hash = "sha256-StJxWasUMj9kh9rLs4LFI3XaZ1Z5pvFBjEjtp79WZjg="; }; nativeBuildInputs = [ @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { gtk4 libadwaita pango - ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ CoreFoundation Foundation Security @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { # Darwin needs to link against gettext from nixpkgs instead of the one vendored by gettext-sys # because the vendored copy does not build with newer versions of clang. - env = lib.optionalAttrs stdenv.isDarwin { + env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { GETTEXT_BIN_DIR = "${lib.getBin gettext}/bin"; GETTEXT_INCLUDE_DIR = "${lib.getDev gettext}/include"; GETTEXT_LIB_DIR = "${lib.getLib gettext}/lib"; diff --git a/pkgs/applications/misc/diff-pdf/default.nix b/pkgs/applications/misc/diff-pdf/default.nix index 1d54b57c9b2f1..d64d8f6ab9be1 100644 --- a/pkgs/applications/misc/diff-pdf/default.nix +++ b/pkgs/applications/misc/diff-pdf/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf automake pkg-config ]; buildInputs = [ cairo poppler wxGTK ] - ++ lib.optionals stdenv.isDarwin [ Cocoa ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ]; preConfigure = "./bootstrap"; diff --git a/pkgs/applications/misc/diffpdf/default.nix b/pkgs/applications/misc/diffpdf/default.nix index 4792003b792e7..98f85807806d9 100644 --- a/pkgs/applications/misc/diffpdf/default.nix +++ b/pkgs/applications/misc/diffpdf/default.nix @@ -53,7 +53,7 @@ mkDerivation rec { description = "Tool for diffing pdf files visually or textually"; mainProgram = "diffpdf"; license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; platforms = with lib.platforms; linux; }; } diff --git a/pkgs/applications/misc/digitalbitbox/default.nix b/pkgs/applications/misc/digitalbitbox/default.nix index 418c4996eb3b3..93802ee8682c4 100644 --- a/pkgs/applications/misc/digitalbitbox/default.nix +++ b/pkgs/applications/misc/digitalbitbox/default.nix @@ -58,7 +58,7 @@ in mkDerivation rec { sha256 = "ig3+TdYv277D9GVnkRSX6nc6D6qruUOw/IQdQCK6FoA="; }; - nativeBuildInputs = with lib; [ + nativeBuildInputs = [ autoreconfHook curl git diff --git a/pkgs/applications/misc/dmenu-rs/default.nix b/pkgs/applications/misc/dmenu-rs/default.nix index 37ddb8922a830..4b15eae9e6140 100644 --- a/pkgs/applications/misc/dmenu-rs/default.nix +++ b/pkgs/applications/misc/dmenu-rs/default.nix @@ -18,13 +18,13 @@ # See: https://github.com/Shizcow/dmenu-rs#plugins stdenv.mkDerivation rec { pname = "dmenu-rs"; - version = "5.5.3"; + version = "5.5.4"; src = fetchFromGitHub { owner = "Shizcow"; repo = "dmenu-rs"; rev = version; - hash = "sha256-05Ia+GHeL8PzOwR7H+NEVhKJVMPhlIaQLwGfvwOAl0g="; + hash = "sha256-LdbTvuq1IbzWEoASscIh3j3VAHm+W3UekJNiMHTxSQI="; }; nativeBuildInputs = [ @@ -71,6 +71,6 @@ stdenv.mkDerivation rec { license = with licenses; [ gpl3Only ]; maintainers = with maintainers; [ benjaminedwardwebb ]; platforms = platforms.linux; - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); }; } diff --git a/pkgs/applications/misc/dmenu/default.nix b/pkgs/applications/misc/dmenu/default.nix index 109befe7594ce..089a421ccc151 100644 --- a/pkgs/applications/misc/dmenu/default.nix +++ b/pkgs/applications/misc/dmenu/default.nix @@ -1,7 +1,7 @@ -{ lib, stdenv, fetchurl, libX11, libXinerama, libXft, zlib, patches ? null -# update script dependencies -, gitUpdater -}: +{ lib, stdenv, fetchurl, libX11, libXinerama, libXft, zlib, writeText +, conf ? null, patches ? null + # update script dependencies +, gitUpdater }: stdenv.mkDerivation rec { pname = "dmenu"; @@ -16,9 +16,15 @@ stdenv.mkDerivation rec { inherit patches; - postPatch = '' + postPatch = let + configFile = if lib.isDerivation conf || builtins.isPath conf then + conf + else + writeText "config.def.h" conf; + in '' sed -ri -e 's!\<(dmenu|dmenu_path|stest)\>!'"$out/bin"'/&!g' dmenu_run sed -ri -e 's!\<stest\>!'"$out/bin"'/&!g' dmenu_path + ${lib.optionalString (conf != null) "cp ${configFile} config.def.h"} ''; preConfigure = '' @@ -27,15 +33,14 @@ stdenv.mkDerivation rec { makeFlags = [ "CC:=$(CC)" ]; - passthru.updateScript = gitUpdater { - url = "git://git.suckless.org/dmenu"; - }; + passthru.updateScript = gitUpdater { url = "git://git.suckless.org/dmenu"; }; meta = with lib; { - description = "Generic, highly customizable, and efficient menu for the X Window System"; + description = + "Generic, highly customizable, and efficient menu for the X Window System"; homepage = "https://tools.suckless.org/dmenu"; license = licenses.mit; - maintainers = with maintainers; [ pSub globin qusic ]; + maintainers = with maintainers; [ pSub globin qusic _0david0mp ]; platforms = platforms.all; mainProgram = "dmenu"; }; diff --git a/pkgs/applications/misc/dockbarx/default.nix b/pkgs/applications/misc/dockbarx/default.nix index 815a482a216f3..a3cccb9f859f9 100644 --- a/pkgs/applications/misc/dockbarx/default.nix +++ b/pkgs/applications/misc/dockbarx/default.nix @@ -11,13 +11,13 @@ python3Packages.buildPythonApplication rec { pname = "dockbarx"; - version = "1.0-beta2"; + version = "1.0-beta4"; src = fetchFromGitHub { owner = "xuzhen"; repo = "dockbarx"; rev = version; - sha256 = "sha256-WMRTtprDHUbOOYVHshx7WpBlYshbiDjI12Rw3tQQuPI="; + sha256 = "sha256-J/5KpHptGzgRF1qIGrgjkRR3in5pE0ffkiYVTR3iZKY="; }; nativeBuildInputs = [ @@ -46,23 +46,6 @@ python3Packages.buildPythonApplication rec { dontWrapGApps = true; - postPatch = '' - substituteInPlace setup.py \ - --replace /usr/ "" \ - --replace '"/", "usr", "share",' '"share",' - - for f in \ - dbx_preference \ - dockbarx/applets.py \ - dockbarx/dockbar.py \ - dockbarx/iconfactory.py \ - dockbarx/theme.py \ - mate_panel_applet/dockbarx_mate_applet - do - substituteInPlace $f --replace /usr/share/ $out/share/ - done - ''; - postInstall = '' glib-compile-schemas $out/share/glib-2.0/schemas ''; diff --git a/pkgs/applications/misc/doctave/default.nix b/pkgs/applications/misc/doctave/default.nix index 487d8340265de..8ddbe3a126e1b 100644 --- a/pkgs/applications/misc/doctave/default.nix +++ b/pkgs/applications/misc/doctave/default.nix @@ -14,9 +14,9 @@ rustPlatform.buildRustPackage rec { # Cargo.lock is outdated cargoPatches = [ ./cargo-lock.patch ]; - cargoSha256 = "sha256-keLcNttdM9JUnn3qi/bWkcObIHl3MRACDHKPSZuScOc="; + cargoHash = "sha256-keLcNttdM9JUnn3qi/bWkcObIHl3MRACDHKPSZuScOc="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; diff --git a/pkgs/applications/misc/done/default.nix b/pkgs/applications/misc/done/default.nix index 47238cd9cb9cf..095d77b1ee835 100644 --- a/pkgs/applications/misc/done/default.nix +++ b/pkgs/applications/misc/done/default.nix @@ -54,11 +54,11 @@ stdenv.mkDerivation rec { libsecret openssl sqlite - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit ]; - env = lib.optionalAttrs stdenv.isDarwin { + env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { GETTEXT_DIR = gettext; }; diff --git a/pkgs/applications/misc/dotfiles/default.nix b/pkgs/applications/misc/dotfiles/default.nix index 017d18b0bce80..655aa60b27cc1 100644 --- a/pkgs/applications/misc/dotfiles/default.nix +++ b/pkgs/applications/misc/dotfiles/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "dotfiles"; - version = "0.6.4"; + version = "0.6.5"; src = fetchPypi { inherit version pname; - sha256 = "03qis6m9r2qh00sqbgwsm883s4bj1ibwpgk86yh4l235mdw8jywv"; + sha256 = "sha256-fke8lNjyYts6cIrONAFd5r2wAlpWqJhd+usFAPCO5J4="; }; # No tests in archive diff --git a/pkgs/applications/misc/dupeguru/default.nix b/pkgs/applications/misc/dupeguru/default.nix index c514c2177369b..8ec9dfc35033b 100644 --- a/pkgs/applications/misc/dupeguru/default.nix +++ b/pkgs/applications/misc/dupeguru/default.nix @@ -60,7 +60,7 @@ python3Packages.buildPythonApplication rec { ''; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "GUI tool to find duplicate files in a system"; homepage = "https://github.com/arsenetar/dupeguru"; license = licenses.bsd3; diff --git a/pkgs/applications/misc/eaglemode/default.nix b/pkgs/applications/misc/eaglemode/default.nix index 414995f0c5453..17de44cc027e2 100644 --- a/pkgs/applications/misc/eaglemode/default.nix +++ b/pkgs/applications/misc/eaglemode/default.nix @@ -1,15 +1,44 @@ -{ lib, stdenv, fetchurl, perl, libX11, libXinerama, libjpeg, libpng, libtiff -, libwebp, pkg-config, librsvg, glib, gtk2, libXext, libXxf86vm, poppler, vlc -, ghostscript, makeWrapper, tzdata, makeDesktopItem, copyDesktopItems -, directoryListingUpdater }: +{ + lib, + stdenv, + fetchurl, + perl, + libX11, + libXinerama, + libjpeg, + libpng, + libtiff, + libwebp, + pkg-config, + librsvg, + glib, + gtk2, + libXext, + libXxf86vm, + poppler, + vlc, + ghostscript, + makeWrapper, + tzdata, + makeDesktopItem, + copyDesktopItems, + directoryListingUpdater, + htmldoc, + binutils, + gzip, + p7zip, + xz, + zip, + extraRuntimeDeps ? [ ], +}: stdenv.mkDerivation rec { pname = "eaglemode"; - version = "0.96.1"; + version = "0.96.2"; src = fetchurl { url = "mirror://sourceforge/eaglemode/${pname}-${version}.tar.bz2"; - hash = "sha256-FIhCcMghzLg7Odcsou9hBw7kIaqLVUFEAKUk9uwRNNw="; + hash = "sha256:1al5n2mcjp0hmsvi4hsdmzd7i0id5i3255xplk0il1nmzydh312a"; }; # Fixes "Error: No time zones found." on the clock @@ -17,9 +46,28 @@ stdenv.mkDerivation rec { substituteInPlace src/emClock/emTimeZonesModel.cpp --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo" ''; - nativeBuildInputs = [ pkg-config makeWrapper copyDesktopItems ]; - buildInputs = [ perl libX11 libXinerama libjpeg libpng libtiff libwebp - librsvg glib gtk2 libXxf86vm libXext poppler vlc ghostscript ]; + nativeBuildInputs = [ + pkg-config + makeWrapper + copyDesktopItems + ]; + buildInputs = [ + perl + libX11 + libXinerama + libjpeg + libpng + libtiff + libwebp + librsvg + glib + gtk2 + libXxf86vm + libXext + poppler + vlc + ghostscript + ]; # The program tries to dlopen Xxf86vm, Xext and Xinerama, so we use the # trick on NIX_LDFLAGS and dontPatchELF to make it find them. @@ -32,18 +80,39 @@ stdenv.mkDerivation rec { dontPatchELF = true; # eaglemode expects doc to be in the root directory - forceShare = [ "man" "info" ]; + forceShare = [ + "man" + "info" + ]; - installPhase = '' - runHook preInstall - perl make.pl install dir=$out - wrapProgram $out/bin/eaglemode --set EM_DIR "$out" --prefix LD_LIBRARY_PATH : "$out/lib" --prefix PATH : "${ghostscript}/bin" - for i in 32 48 96; do - mkdir -p $out/share/icons/hicolor/''${i}x''${i}/apps - ln -s $out/res/icons/${pname}$i.png $out/share/icons/hicolor/''${i}x''${i}/apps/${pname}.png - done - runHook postInstall - ''; + installPhase = + let + runtimeDeps = lib.makeBinPath ( + [ + ghostscript # renders the manual + htmldoc # renders HTML files in file browser + perl # various display scripts use Perl + + # archive formats in the file browser: + binutils + gzip + p7zip + xz + zip + ] + ++ extraRuntimeDeps + ); + in + '' + runHook preInstall + perl make.pl install dir=$out + wrapProgram $out/bin/eaglemode --set EM_DIR "$out" --prefix LD_LIBRARY_PATH : "$out/lib" --prefix PATH : "${runtimeDeps}" + for i in 32 48 96; do + mkdir -p $out/share/icons/hicolor/''${i}x''${i}/apps + ln -s $out/res/icons/${pname}$i.png $out/share/icons/hicolor/''${i}x''${i}/apps/${pname}.png + done + runHook postInstall + ''; desktopItems = [ (makeDesktopItem { @@ -52,7 +121,12 @@ stdenv.mkDerivation rec { icon = pname; desktopName = "Eagle Mode"; genericName = meta.description; - categories = [ "Game" "Graphics" "System" "Utility" ]; + categories = [ + "Game" + "Graphics" + "System" + "Utility" + ]; }) ]; @@ -66,7 +140,10 @@ stdenv.mkDerivation rec { description = "Zoomable User Interface"; changelog = "https://eaglemode.sourceforge.net/ChangeLog.html"; license = licenses.gpl3; - maintainers = with maintainers; [ chuangzhu ehmry ]; + maintainers = with maintainers; [ + chuangzhu + ehmry + ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/edgetx/default.nix b/pkgs/applications/misc/edgetx/default.nix index 9e7cf60af1a19..186ad4be05c11 100644 --- a/pkgs/applications/misc/edgetx/default.nix +++ b/pkgs/applications/misc/edgetx/default.nix @@ -13,7 +13,7 @@ mkDerivation rec { repo = pname; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-bKMAyONy1Udd+2nDVEMrtIsnfqrNuBVMWU7nCqvZ+3E="; + hash = "sha256-bKMAyONy1Udd+2nDVEMrtIsnfqrNuBVMWU7nCqvZ+3E="; }; nativeBuildInputs = [ cmake gcc-arm-embedded python3Packages.pillow qttools ]; diff --git a/pkgs/applications/misc/elastic/default.nix b/pkgs/applications/misc/elastic/default.nix index ae614d35a4e05..d9d7681b36c82 100644 --- a/pkgs/applications/misc/elastic/default.nix +++ b/pkgs/applications/misc/elastic/default.nix @@ -11,21 +11,20 @@ , gtksourceview5 , blueprint-compiler , wrapGAppsHook4 -, appstream-glib , desktop-file-utils , template-glib }: stdenv.mkDerivation rec { pname = "elastic"; - version = "0.1.4"; + version = "0.1.5"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "elastic"; rev = version; - hash = "sha256-EExVhf71SEWVcAOAt+IuQH3umNOY4hzzkFVIqnESppo="; + hash = "sha256-y/XBXN5RIqnFmxnmkThBGW0B5owgy/1Q/6jmkBCi+rk="; }; nativeBuildInputs = [ @@ -34,7 +33,6 @@ stdenv.mkDerivation rec { vala pkg-config wrapGAppsHook4 - appstream-glib desktop-file-utils blueprint-compiler ]; diff --git a/pkgs/applications/misc/electron-cash/default.nix b/pkgs/applications/misc/electron-cash/default.nix index 910e21528eb51..e9854ac3ef94d 100644 --- a/pkgs/applications/misc/electron-cash/default.nix +++ b/pkgs/applications/misc/electron-cash/default.nix @@ -51,7 +51,7 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ wrapQtAppsHook ]; - buildInputs = [ ] ++ lib.optional stdenv.isLinux qtwayland; + buildInputs = [ ] ++ lib.optional stdenv.hostPlatform.isLinux qtwayland; postPatch = '' substituteInPlace contrib/requirements/requirements.txt \ @@ -61,7 +61,7 @@ python3Packages.buildPythonApplication rec { --replace "(share_dir" "(\"share\"" ''; - postInstall = lib.optionalString stdenv.isLinux '' + postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace $out/share/applications/electron-cash.desktop \ --replace "Exec=electron-cash" "Exec=$out/bin/electron-cash" ''; diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index 96afa4d39a1b1..0faaf369125d7 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -32,13 +32,13 @@ let }; libsecp256k1_name = - if stdenv.isLinux then "libsecp256k1.so.{v}" - else if stdenv.isDarwin then "libsecp256k1.{v}.dylib" + if stdenv.hostPlatform.isLinux then "libsecp256k1.so.{v}" + else if stdenv.hostPlatform.isDarwin then "libsecp256k1.{v}.dylib" else "libsecp256k1${stdenv.hostPlatform.extensions.sharedLibrary}"; libzbar_name = - if stdenv.isLinux then "libzbar.so.0" - else if stdenv.isDarwin then "libzbar.0.dylib" + if stdenv.hostPlatform.isLinux then "libzbar.so.0" + else if stdenv.hostPlatform.isDarwin then "libzbar.0.dylib" else "libzbar${stdenv.hostPlatform.extensions.sharedLibrary}"; # Not provided in official source releases, which are what upstream signs. @@ -71,7 +71,7 @@ python.pkgs.buildPythonApplication { ''; nativeBuildInputs = lib.optionals enableQt [ wrapQtAppsHook ]; - buildInputs = lib.optional (stdenv.isLinux && enableQt) qtwayland; + buildInputs = lib.optional (stdenv.hostPlatform.isLinux && enableQt) qtwayland; propagatedBuildInputs = with python.pkgs; [ aiohttp @@ -88,7 +88,6 @@ python.pkgs.buildPythonApplication { pysocks qrcode requests - tlslite-ng certifi jsonpatch # plugins @@ -125,7 +124,7 @@ python.pkgs.buildPythonApplication { sed -i '/qdarkstyle/d' contrib/requirements/requirements.txt ''); - postInstall = lib.optionalString stdenv.isLinux '' + postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace $out/share/applications/electrum.desktop \ --replace 'Exec=sh -c "PATH=\"\\$HOME/.local/bin:\\$PATH\"; electrum %u"' \ "Exec=$out/bin/electrum %u" \ diff --git a/pkgs/applications/misc/electrum/grs.nix b/pkgs/applications/misc/electrum/grs.nix index 4ca911126c5ba..cd0b89f94f05e 100644 --- a/pkgs/applications/misc/electrum/grs.nix +++ b/pkgs/applications/misc/electrum/grs.nix @@ -13,13 +13,13 @@ let version = "4.5.4"; libsecp256k1_name = - if stdenv.isLinux then "libsecp256k1.so.{v}" - else if stdenv.isDarwin then "libsecp256k1.{v}.dylib" + if stdenv.hostPlatform.isLinux then "libsecp256k1.so.{v}" + else if stdenv.hostPlatform.isDarwin then "libsecp256k1.{v}.dylib" else "libsecp256k1${stdenv.hostPlatform.extensions.sharedLibrary}"; libzbar_name = - if stdenv.isLinux then "libzbar.so.0" - else if stdenv.isDarwin then "libzbar.0.dylib" + if stdenv.hostPlatform.isLinux then "libzbar.so.0" + else if stdenv.hostPlatform.isDarwin then "libzbar.0.dylib" else "libzbar${stdenv.hostPlatform.extensions.sharedLibrary}"; in @@ -36,7 +36,7 @@ python3.pkgs.buildPythonApplication { }; nativeBuildInputs = lib.optionals enableQt [ wrapQtAppsHook ]; - buildInputs = lib.optional (stdenv.isLinux && enableQt) qtwayland; + buildInputs = lib.optional (stdenv.hostPlatform.isLinux && enableQt) qtwayland; propagatedBuildInputs = with python3.pkgs; [ aiohttp @@ -54,7 +54,6 @@ python3.pkgs.buildPythonApplication { pysocks qrcode requests - tlslite-ng certifi jsonpatch # plugins @@ -91,7 +90,7 @@ python3.pkgs.buildPythonApplication { sed -i '/qdarkstyle/d' contrib/requirements/requirements.txt ''); - postInstall = lib.optionalString stdenv.isLinux '' + postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace $out/share/applications/electrum-grs.desktop \ --replace 'Exec=sh -c "PATH=\"\\$HOME/.local/bin:\\$PATH\"; electrum-grs %u"' \ "Exec=$out/bin/electrum-grs %u" \ diff --git a/pkgs/applications/misc/electrum/ltc.nix b/pkgs/applications/misc/electrum/ltc.nix index ef52f6211fdaa..e0aaf139cd65e 100644 --- a/pkgs/applications/misc/electrum/ltc.nix +++ b/pkgs/applications/misc/electrum/ltc.nix @@ -14,13 +14,13 @@ let version = "4.2.2.1"; libsecp256k1_name = - if stdenv.isLinux then "libsecp256k1.so.0" - else if stdenv.isDarwin then "libsecp256k1.0.dylib" + if stdenv.hostPlatform.isLinux then "libsecp256k1.so.0" + else if stdenv.hostPlatform.isDarwin then "libsecp256k1.0.dylib" else "libsecp256k1${stdenv.hostPlatform.extensions.sharedLibrary}"; libzbar_name = - if stdenv.isLinux then "libzbar.so.0" - else if stdenv.isDarwin then "libzbar.0.dylib" + if stdenv.hostPlatform.isLinux then "libzbar.so.0" + else if stdenv.hostPlatform.isDarwin then "libzbar.0.dylib" else "libzbar${stdenv.hostPlatform.extensions.sharedLibrary}"; # Not provided in official source releases, which are what upstream signs. @@ -70,7 +70,6 @@ python3.pkgs.buildPythonApplication { pysocks qrcode requests - tlslite-ng certifi # plugins btchip-python @@ -113,7 +112,7 @@ python3.pkgs.buildPythonApplication { sed -i '/qdarkstyle/d' contrib/requirements/requirements.txt ''); - postInstall = lib.optionalString stdenv.isLinux '' + postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' # Despite setting usr_share above, these files are installed under # $out/nix ... mv $out/${python3.sitePackages}/nix/store"/"*/share $out @@ -132,13 +131,18 @@ python3.pkgs.buildPythonApplication { ''; nativeCheckInputs = with python3.pkgs; [ pytestCheckHook pyaes pycryptodomex ]; - buildInputs = lib.optional stdenv.isLinux qtwayland; + buildInputs = lib.optional stdenv.hostPlatform.isLinux qtwayland; pytestFlagsArray = [ "electrum_ltc/tests" ]; disabledTests = [ "test_loop" # test tries to bind 127.0.0.1 causing permission error "test_is_ip_address" # fails spuriously https://github.com/spesmilo/electrum/issues/7307 + # electrum_ltc.lnutil.RemoteMisbehaving: received commitment_signed without pending changes + "test_reestablish_replay_messages_rev_then_sig" + "test_reestablish_replay_messages_sig_then_rev" + # stuck on hydra + "test_reestablish_with_old_state" ]; postCheck = '' diff --git a/pkgs/applications/misc/elogind/0001-Remove-outdated-musl-hack-in-rlimit_nofile_safe.patch b/pkgs/applications/misc/elogind/0001-Remove-outdated-musl-hack-in-rlimit_nofile_safe.patch new file mode 100644 index 0000000000000..d7de78b4a6cdc --- /dev/null +++ b/pkgs/applications/misc/elogind/0001-Remove-outdated-musl-hack-in-rlimit_nofile_safe.patch @@ -0,0 +1,35 @@ +From 3a0181ab0fb6c40f613894e65009e148c6e652c9 Mon Sep 17 00:00:00 2001 +From: Alyssa Ross <hi@alyssa.is> +Date: Mon, 16 Sep 2024 10:24:08 +0200 +Subject: [PATCH] Remove outdated musl hack in rlimit_nofile_safe + +This was incorrect, because RLIM_FMT is not the format specifier for uintmax_t. + +Since 53e84063a ("Change RLIM_FMT to '%llu' for non-glibc builds (#269)"), +RLIM_FMT is correct for musl, so there's no longer any need for this casting +version. + +Link: https://github.com/elogind/elogind/pull/288 +--- + src/basic/rlimit-util.c | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/src/basic/rlimit-util.c b/src/basic/rlimit-util.c +index 091c111df..59bdc35a0 100644 +--- a/src/basic/rlimit-util.c ++++ b/src/basic/rlimit-util.c +@@ -428,11 +428,7 @@ int rlimit_nofile_safe(void) { + rl.rlim_max = MIN(rl.rlim_max, (rlim_t) read_nr_open()); + rl.rlim_cur = MIN((rlim_t) FD_SETSIZE, rl.rlim_max); + if (setrlimit(RLIMIT_NOFILE, &rl) < 0) +-#ifdef __GLIBC__ /// To be compatible with musl-libc, elogind uses an (uintmax_t) cast. + return log_debug_errno(errno, "Failed to lower RLIMIT_NOFILE's soft limit to " RLIM_FMT ": %m", rl.rlim_cur); +-#else // __GLIBC__ +- return log_debug_errno(errno, "Failed to lower RLIMIT_NOFILE's soft limit to " RLIM_FMT ": %m", (uintmax_t)rl.rlim_cur); +-#endif // __GLIBC__ + + return 1; + } +-- +2.45.2 + diff --git a/pkgs/applications/misc/elogind/default.nix b/pkgs/applications/misc/elogind/default.nix index a8b71f34ede56..985d821837ec3 100644 --- a/pkgs/applications/misc/elogind/default.nix +++ b/pkgs/applications/misc/elogind/default.nix @@ -1,16 +1,24 @@ { stdenv , lib , fetchFromGitHub +, fetchurl +, fetchpatch , meson , ninja , m4 , gperf , getent +, acl +, audit +, dbus , libcap +, libselinux +, pam , gettext , pkg-config , udev , eudev +, util-linux , libxslt , python3Packages , docbook5 @@ -27,13 +35,13 @@ stdenv.mkDerivation rec { pname = "elogind"; - version = "246.10"; + version = "255.5"; src = fetchFromGitHub { owner = "elogind"; repo = pname; rev = "v${version}"; - sha256 = "sha256-+Nv6FL9Yjmfxs24+2mUTP//wbjzGUq4ftgJLfuEqBJg="; + hash = "sha256-4KZr/NiiGVwzdDROhiX3GEQTUyIGva6ezb+xC2U3bkg="; }; nativeBuildInputs = [ @@ -48,12 +56,63 @@ stdenv.mkDerivation rec { libxslt.bin # xsltproc docbook5 docbook_xsl docbook_xsl_ns docbook_xml_dtd_42 docbook_xml_dtd_45 # needed for docbook without Internet - # fixes: man/meson.build:111:0: ERROR: Could not execute command "/build/source/tools/xml_helper.py". python3Packages.python - python3Packages.lxml + python3Packages.jinja2 ]; - buildInputs = [ libcap ] ++ (if enableSystemd then [ udev ] else [ eudev ]); + buildInputs = [ acl audit dbus libcap libselinux pam util-linux ] + ++ (if enableSystemd then [ udev ] else [ eudev ]); + + postPatch = '' + substituteInPlace meson.build --replace-fail "install_emptydir(elogindstatedir)" "" + ''; + + patches = [ + (fetchurl { + url = "https://github.com/chimera-linux/cports/raw/49d65fe38be815b9918a15ac2d2ff2b123fc559a/main/elogind/patches/strerror_r.patch"; + hash = "sha256-amqXP12mLtrkWuAURb3/aoQeeTSRYlYqL2q2zrKbhxk="; + }) + (fetchurl { + url = "https://github.com/chimera-linux/cports/raw/49d65fe38be815b9918a15ac2d2ff2b123fc559a/main/elogind/patches/strerror_r_1.patch"; + hash = "sha256-tVUlmPValUPApqRX+Cqkzn7bkIILYSuCouvgRsdl9XE="; + }) + (fetchpatch { + url = "https://github.com/chimera-linux/cports/raw/49d65fe38be815b9918a15ac2d2ff2b123fc559a/main/elogind/patches/xxx-musl-fixes.patch"; + includes = [ + "src/basic/cgroup-util.c" + "src/basic/missing_prctl.h" + "src/libelogind/sd-journal/journal-file.h" + ]; + hash = "sha256-kY+B1t87E/TtWa83r0VoiojhRrrB667ZhUAHtHE7m28="; + }) + (fetchurl { + url = "https://github.com/chimera-linux/cports/raw/49d65fe38be815b9918a15ac2d2ff2b123fc559a/main/elogind/patches/gshadow.patch"; + hash = "sha256-YBy1OeWD1EluLTeUvqUvZKyrZyoUbGg1mxwqG5+VNO0="; + }) + (fetchurl { + name = "FTW.patch"; + url = "https://git.openembedded.org/openembedded-core/plain/meta/recipes-core/systemd/systemd/0005-add-missing-FTW_-macros-for-musl.patch?id=6bc5e3f3cd882c81c972dbd27aacc1ce00e5e59a"; + hash = "sha256-SGvP0GT43vfyHxrmvl4AbsWQz8CPmNGyH001s3lTxng="; + }) + (fetchurl { + name = "malloc_info.patch"; + url = "https://git.openembedded.org/openembedded-core/plain/meta/recipes-core/systemd/systemd/0016-pass-correct-parameters-to-getdents64.patch?id=6bc5e3f3cd882c81c972dbd27aacc1ce00e5e59a"; + hash = "sha256-8aOw+BTtl5Qta8aqLmliKSHEirTjp1xLM195EmBdEDI="; + }) + (fetchpatch { + name = "malloc_trim.patch"; + url = "https://git.openembedded.org/openembedded-core/plain/meta/recipes-core/systemd/systemd/0020-sd-event-Make-malloc_trim-conditional-on-glibc.patch?id=6bc5e3f3cd882c81c972dbd27aacc1ce00e5e59a"; + stripLen = 3; + extraPrefix = [ "src/libelogind/" ]; + hash = "sha256-rtSnCEK+frhnlwl/UW3YHxB8MUCAq48jEzQRURpxdXk="; + }) + (fetchurl { + name = "malloc_info.patch"; + url = "https://git.openembedded.org/openembedded-core/plain/meta/recipes-core/systemd/systemd/0021-shared-Do-not-use-malloc_info-on-musl.patch?id=6bc5e3f3cd882c81c972dbd27aacc1ce00e5e59a"; + hash = "sha256-ZyOCmM5LcwJ7mHiZr0lQjV4G+XMxjhsUm7g7L3OzDDM="; + }) + ./0001-Remove-outdated-musl-hack-in-rlimit_nofile_safe.patch + ]; # Inspired by the systemd `preConfigure`. # Conceptually we should patch all files required during the build, but not scripts @@ -68,8 +127,11 @@ stdenv.mkDerivation rec { ''; mesonFlags = [ - "-Drootprefix=${placeholder "out"}" - "-Dsysconfdir=${placeholder "out"}/etc" + (lib.mesonOption "dbuspolicydir" "${placeholder "out"}/share/dbus-1/system.d") + (lib.mesonOption "dbussystemservicedir" "${placeholder "out"}/share/dbus-1/system-services") + (lib.mesonOption "sysconfdir" "${placeholder "out"}/etc") + (lib.mesonBool "utmp" (!stdenv.hostPlatform.isMusl)) + (lib.mesonEnable "xenctrl" false) ]; meta = with lib; { diff --git a/pkgs/applications/misc/etesync-dav/default.nix b/pkgs/applications/misc/etesync-dav/default.nix index 85ff399ac83f9..1758dde546eac 100644 --- a/pkgs/applications/misc/etesync-dav/default.nix +++ b/pkgs/applications/misc/etesync-dav/default.nix @@ -1,29 +1,22 @@ { lib , stdenv -, fetchpatch , nixosTests , python3 -, fetchPypi +, fetchFromGitHub , radicale3 }: -python3.pkgs.buildPythonApplication rec { +python3.pkgs.buildPythonApplication { pname = "etesync-dav"; - version = "0.32.1"; + version = "0.32.1-unstable-2024-09-02"; - src = fetchPypi { - inherit pname version; - hash = "sha256-pOLug5MnVdKaw5wedABewomID9LU0hZPCf4kZKKU1yA="; + src = fetchFromGitHub { + owner = "etesync"; + repo = "etesync-dav"; + rev = "b9b23bf6fba60d42012008ba06023bccd9109c08"; + hash = "sha256-wWhwnOlwE1rFgROTSj90hlSw4k48fIEdk5CJOXoecuQ="; }; - patches = [ - (fetchpatch { - name = "add-missing-comma-in-setup.py.patch"; - url = "https://github.com/etesync/etesync-dav/commit/040cb7b57205e70515019fb356e508a6414da11e.patch"; - hash = "sha256-87IpIQ87rgpinvbRwUlWd0xeegn0zfVSiDFYNUqPerg="; - }) - ]; - propagatedBuildInputs = with python3.pkgs; [ appdirs etebase @@ -49,6 +42,6 @@ python3.pkgs.buildPythonApplication rec { mainProgram = "etesync-dav"; license = licenses.gpl3; maintainers = with maintainers; [ thyol valodim ]; - broken = stdenv.isDarwin; # pyobjc-framework-Cocoa is missing + broken = stdenv.hostPlatform.isDarwin; # pyobjc-framework-Cocoa is missing }; } diff --git a/pkgs/applications/misc/eureka-ideas/default.nix b/pkgs/applications/misc/eureka-ideas/default.nix index 45e36010906b6..f9a911a1c1190 100644 --- a/pkgs/applications/misc/eureka-ideas/default.nix +++ b/pkgs/applications/misc/eureka-ideas/default.nix @@ -19,14 +19,14 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-NJ1O8+NBG0y39bMOZeah2jSZlvnPrtpCtXrgAYmVrAc="; }; - cargoSha256 = "sha256-tNUWW0HgXl+tM9uciApLSkLDDkzrvAiWmiYs2y/dEOM="; + cargoHash = "sha256-tNUWW0HgXl+tM9uciApLSkLDDkzrvAiWmiYs2y/dEOM="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libgit2 openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; diff --git a/pkgs/applications/misc/exercism/default.nix b/pkgs/applications/misc/exercism/default.nix index 4473fbdbe78d4..f61de362ac7ab 100644 --- a/pkgs/applications/misc/exercism/default.nix +++ b/pkgs/applications/misc/exercism/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "exercism"; - version = "3.4.0"; + version = "3.5.1"; src = fetchFromGitHub { owner = "exercism"; repo = "cli"; rev = "refs/tags/v${version}"; - hash = "sha256-+Tg9b7JZtriF5b+mnLgOeTTLiswH/dSGg3Mj1TBt4Wk="; + hash = "sha256-AqGSwHQdY/m6aJYbjJdt+IYr5n1Jf7LW4paCOxjptjA="; }; vendorHash = "sha256-xY3C3emqtPIKyxIN9aEkrLXhTxWNmo0EJXNZVtbtIvs="; diff --git a/pkgs/applications/misc/faircamp/Cargo.lock b/pkgs/applications/misc/faircamp/Cargo.lock index deeaca6b86be1..741e486cbf00b 100644 --- a/pkgs/applications/misc/faircamp/Cargo.lock +++ b/pkgs/applications/misc/faircamp/Cargo.lock @@ -4,11 +4,11 @@ version = 3 [[package]] name = "actix-codec" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "617a8268e3537fe1d8c9ead925fca49ef6400927ee7bc26750e90ecee14ce4b8" +checksum = "5f7b0a21988c1bf877cf4759ef5ddaac04c1c9fe808c9142ecb78ba97d97a28a" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.5.0", "bytes", "futures-core", "futures-sink", @@ -21,15 +21,15 @@ dependencies = [ [[package]] name = "actix-files" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf0bdd6ff79de7c9a021f5d9ea79ce23e108d8bfc9b49b5b4a2cf6fad5a35212" +checksum = "0773d59061dedb49a8aed04c67291b9d8cf2fe0b60130a381aab53c6dd86e9be" dependencies = [ "actix-http", "actix-service", "actix-utils", "actix-web", - "bitflags 2.4.1", + "bitflags 2.5.0", "bytes", "derive_more", "futures-core", @@ -44,17 +44,17 @@ dependencies = [ [[package]] name = "actix-http" -version = "3.6.0" +version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d223b13fd481fc0d1f83bb12659ae774d9e3601814c68a0bc539731698cca743" +checksum = "4eb9843d84c775696c37d9a418bbb01b932629d01870722c0f13eb3f95e2536d" dependencies = [ "actix-codec", "actix-rt", "actix-service", "actix-utils", "ahash", - "base64 0.21.7", - "bitflags 2.4.1", + "base64", + "bitflags 2.5.0", "brotli", "bytes", "bytestring", @@ -78,7 +78,7 @@ dependencies = [ "tokio", "tokio-util", "tracing", - "zstd 0.13.0", + "zstd", ] [[package]] @@ -88,18 +88,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e01ed3140b2f8d422c68afa1ed2e85d996ea619c988ac834d255db32138655cb" dependencies = [ "quote", - "syn 2.0.48", + "syn 2.0.66", ] [[package]] name = "actix-router" -version = "0.5.1" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d66ff4d247d2b160861fa2866457e85706833527840e4133f8f49aa423a38799" +checksum = "13d324164c51f63867b57e73ba5936ea151b8a41a1d23d1031eeb9f70d0236f8" dependencies = [ "bytestring", + "cfg-if", "http", "regex", + "regex-lite", "serde", "tracing", ] @@ -154,9 +156,9 @@ dependencies = [ [[package]] name = "actix-web" -version = "4.5.1" +version = "4.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43a6556ddebb638c2358714d853257ed226ece6023ef9364f23f0c70737ea984" +checksum = "1988c02af8d2b718c05bc4aeb6a66395b7cdf32858c2c71131e5637a8c05a9ff" dependencies = [ "actix-codec", "actix-http", @@ -183,6 +185,7 @@ dependencies = [ "once_cell", "pin-project-lite", "regex", + "regex-lite", "serde", "serde_json", "serde_urlencoded", @@ -194,21 +197,21 @@ dependencies = [ [[package]] name = "actix-web-codegen" -version = "4.2.2" +version = "4.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb1f50ebbb30eca122b188319a4398b3f7bb4a8cdf50ecfb73bfc6a3c3ce54f5" +checksum = "f591380e2e68490b5dfaf1dd1aa0ebe78d84ba7067078512b4ea6e4492d622b8" dependencies = [ "actix-router", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.66", ] [[package]] name = "addr2line" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" dependencies = [ "gimli", ] @@ -221,9 +224,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "aes" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2" +checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" dependencies = [ "cfg-if", "cipher", @@ -232,9 +235,9 @@ dependencies = [ [[package]] name = "ahash" -version = "0.8.6" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ "cfg-if", "getrandom", @@ -245,9 +248,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ "memchr", ] @@ -299,69 +302,73 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.11" +version = "0.6.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e2e1ebcb11de5c03c67de28a7df593d32191b44939c482e97702baaaa6ab6a5" +checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b" dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", "anstyle-wincon", "colorchoice", + "is_terminal_polyfill", "utf8parse", ] [[package]] name = "anstyle" -version = "1.0.4" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" +checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b" [[package]] name = "anstyle-parse" -version = "0.2.2" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "317b9a89c1868f5ea6ff1d9539a69f45dffc21ce321ac1fd1160dfa48c8e2140" +checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.0.0" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +checksum = "a64c907d4e79225ac72e2a354c9ce84d50ebb4586dee56c82b3ee73004f537f5" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.1" +version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628" +checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19" dependencies = [ "anstyle", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "anyhow" -version = "1.0.75" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" [[package]] name = "arbitrary" version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" +dependencies = [ + "derive_arbitrary", +] [[package]] name = "arbitrary-int" -version = "1.2.6" +version = "1.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe8e2a586ecd6eb29477a0c25b19742acca4fa5e39c92e127656616810c20579" +checksum = "c84fc003e338a6f69fbd4f7fe9f92b535ff13e9af8997f3b14b6ddff8b1df46d" [[package]] name = "arg_enum_proc_macro" @@ -371,7 +378,7 @@ checksum = "0ae92a5119aa49cdbcf6b9f893fe4e1d98b04ccbf82ee0584ad948a44a734dea" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.66", ] [[package]] @@ -382,9 +389,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" [[package]] name = "atomic-polyfill" -version = "0.1.11" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3ff7eb3f316534d83a8a2c3d1674ace8a5a71198eba31e2e2b597833f699b28" +checksum = "8cf2bce30dfe09ef0bfaef228b9d414faaf7e563035494d7fe092dba54b300f4" dependencies = [ "critical-section", ] @@ -402,9 +409,9 @@ dependencies = [ [[package]] name = "autocfg" -version = "1.1.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "av1-grain" @@ -437,9 +444,9 @@ checksum = "7b7e4c2464d97fe331d41de9d5db0def0a96f4d823b8b32a2efd503578988973" [[package]] name = "backtrace" -version = "0.3.69" +version = "0.3.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +checksum = "17c6a35df3749d2e8bb1b7b21a976d82b15548788d2735b9d82f329268f71a11" dependencies = [ "addr2line", "cc", @@ -452,21 +459,9 @@ dependencies = [ [[package]] name = "base64" -version = "0.21.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" - -[[package]] -name = "base64" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51" - -[[package]] -name = "base64ct" -version = "1.6.0" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "bincode" @@ -491,9 +486,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" [[package]] name = "bitreader" @@ -506,9 +501,9 @@ dependencies = [ [[package]] name = "bitstream-io" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06c9989a51171e2e81038ab168b6ae22886fe9ded214430dbb4f41c28cf176da" +checksum = "7c12d1856e42f0d817a835fe55853957c85c8c8a470114029143d3f12671446e" [[package]] name = "block-buffer" @@ -520,10 +515,19 @@ dependencies = [ ] [[package]] +name = "block2" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c132eebf10f5cad5289222520a4a058514204aed6d791f1cf4fe8088b82d15f" +dependencies = [ + "objc2", +] + +[[package]] name = "brotli" -version = "3.4.0" +version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "516074a47ef4bce09577a3b379392300159ce5b1ba2e501ff1c819950066100f" +checksum = "74f7971dbd9326d58187408ab83117d8ac1bb9c17b085fdacd1cf2f598719b6b" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -532,9 +536,9 @@ dependencies = [ [[package]] name = "brotli-decompressor" -version = "2.5.1" +version = "4.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e2e4afe60d7dd600fdd3de8d0f08c2b7ec039712e3b6137ff98b7004e82de4f" +checksum = "9a45bd2e4095a8b518033b128020dd4a55aab1c0a381ba4404a472630f4bc362" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -542,21 +546,21 @@ dependencies = [ [[package]] name = "built" -version = "0.7.1" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38d17f4d6e4dc36d1a02fbedc2753a096848e7c1b0772f7654eab8e2c927dd53" +checksum = "c6a6c0b39c38fd754ac338b00a88066436389c0f029da5d37d1e01091d9b7c17" [[package]] name = "bumpalo" -version = "3.14.0" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "bytemuck" -version = "1.14.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" +checksum = "78834c15cb5d5efe3452d58b1e8ba890dd62d21907f867f383358198e56ebca5" [[package]] name = "byteorder" @@ -565,10 +569,16 @@ 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.5.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" +checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" [[package]] name = "bytestring" @@ -602,12 +612,13 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.83" +version = "1.0.98" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f" dependencies = [ "jobserver", "libc", + "once_cell", ] [[package]] @@ -618,9 +629,9 @@ checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" [[package]] name = "cfg-expr" -version = "0.15.7" +version = "0.15.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa50868b64a9a6fda9d593ce778849ea8715cd2a3d2cc17ffdb4a2f2f2f1961d" +checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02" dependencies = [ "smallvec", "target-lexicon", @@ -634,9 +645,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.37" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a0d04d43504c61aa6c7531f1871dd0d418d91130162063b789da00fd7057a5e" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" dependencies = [ "android-tzdata", "iana-time-zone", @@ -644,7 +655,7 @@ dependencies = [ "num-traits", "serde", "wasm-bindgen", - "windows-targets 0.52.0", + "windows-targets 0.52.5", ] [[package]] @@ -659,9 +670,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.4" +version = "4.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0" +checksum = "84b3edb18336f4df585bc9aa31dd99c036dfa5dc5e9a2939a722a188f3a8970d" dependencies = [ "clap_builder", "clap_derive", @@ -669,9 +680,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.2" +version = "4.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" +checksum = "c1c09dd5ada6c6c78075d6fd0da3f90d8080651e2d6cc8eb2f1aaa4034ced708" dependencies = [ "anstream", "anstyle", @@ -681,14 +692,14 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.4" +version = "4.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64" +checksum = "2bac35c6dafb060fd4d275d9a4ffae97917c13a6327903a8be2153cd964f7085" dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.66", ] [[package]] @@ -720,15 +731,15 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" [[package]] name = "colorchoice" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" +checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" [[package]] name = "combine" -version = "4.6.6" +version = "4.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4" +checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" dependencies = [ "bytes", "memchr", @@ -736,9 +747,9 @@ dependencies = [ [[package]] name = "constant_time_eq" -version = "0.1.5" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" +checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" [[package]] name = "convert_case" @@ -775,18 +786,33 @@ checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "cpufeatures" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" dependencies = [ "libc", ] [[package]] +name = "crc" +version = "3.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69e6e4d7b33a94f0991c26729976b10ebde1d34c3ee82408fb536164fa10d636" +dependencies = [ + "crc-catalog", +] + +[[package]] +name = "crc-catalog" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" + +[[package]] name = "crc32fast" -version = "1.3.2" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" dependencies = [ "cfg-if", ] @@ -799,36 +825,28 @@ checksum = "7059fff8937831a9ae6f0fe4d658ffabf58f2ca96aa9dec1c889f936f705f216" [[package]] name = "crossbeam-deque" -version = "0.8.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" dependencies = [ - "cfg-if", "crossbeam-epoch", "crossbeam-utils", ] [[package]] name = "crossbeam-epoch" -version = "0.9.15" +version = "0.9.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" dependencies = [ - "autocfg", - "cfg-if", "crossbeam-utils", - "memoffset", - "scopeguard", ] [[package]] name = "crossbeam-utils" -version = "0.8.16" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" -dependencies = [ - "cfg-if", -] +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" [[package]] name = "crunchy" @@ -847,15 +865,32 @@ dependencies = [ ] [[package]] +name = "deflate64" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83ace6c86376be0b6cdcf3fb41882e81d94b31587573d1cfa9d01cd06bba210d" + +[[package]] name = "deranged" -version = "0.3.9" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" dependencies = [ "powerfmt", ] [[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_more" version = "0.99.17" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -870,9 +905,9 @@ dependencies = [ [[package]] name = "deunicode" -version = "1.4.1" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a1abaf4d861455be59f64fd2b55606cb151fce304ede7165f410243ce96bde6" +checksum = "339544cc9e2c4dc3fc7149fd630c5f22263a4fdf18a98afd0075784968b5cf00" [[package]] name = "digest" @@ -886,16 +921,27 @@ dependencies = [ ] [[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 = "either" -version = "1.9.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" +checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b" [[package]] name = "encoding_rs" -version = "0.8.33" +version = "0.8.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" +checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" dependencies = [ "cfg-if", ] @@ -913,9 +959,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "exr" -version = "1.6.4" +version = "1.72.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "279d3efcc55e19917fff7ab3ddd6c14afb6a90881a0078465196fe2f99d08c56" +checksum = "887d93f60543e9a9362ef8a21beedd0a833c5d9610e18c67abe15a5963dcb1a4" dependencies = [ "bit_field", "flume", @@ -929,12 +975,12 @@ dependencies = [ [[package]] name = "faircamp" -version = "0.14.0" +version = "0.15.1" dependencies = [ "actix-files", "actix-web", "alac", - "base64 0.22.0", + "base64", "bincode", "chrono", "clap", @@ -957,6 +1003,7 @@ dependencies = [ "pulldown-cmark", "rmp3", "sanitize-filename", + "seahash", "serde", "serde_derive", "slug", @@ -978,18 +1025,18 @@ dependencies = [ [[package]] name = "fdeflate" -version = "0.3.1" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64d6dafc854908ff5da46ff3f8f473c6984119a2876a383a860246dd7841a868" +checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645" dependencies = [ "simd-adler32", ] [[package]] name = "fixed" -version = "1.24.0" +version = "1.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02c69ce7e7c0f17aa18fdd9d0de39727adb9c6281f2ad12f57cbe54ae6e76e7d" +checksum = "2fc715d38bea7b5bf487fcd79bcf8c209f0b58014f3018a7a19c2b855f472048" dependencies = [ "az", "bytemuck", @@ -999,9 +1046,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.28" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" dependencies = [ "crc32fast", "miniz_oxide", @@ -1009,14 +1056,10 @@ dependencies = [ [[package]] name = "flume" -version = "0.10.14" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1657b4441c3403d9f7b3409e47575237dac27b1b5726df654a6ecbf92f0f7577" +checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" dependencies = [ - "futures-core", - "futures-sink", - "nanorand", - "pin-project", "spin", ] @@ -1037,27 +1080,27 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" [[package]] name = "futures-sink" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" [[package]] name = "futures-task" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" [[package]] name = "futures-util" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" dependencies = [ "futures-core", "futures-task", @@ -1077,15 +1120,13 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.11" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", - "js-sys", "libc", "wasi", - "wasm-bindgen", ] [[package]] @@ -1100,15 +1141,15 @@ dependencies = [ [[package]] name = "gimli" -version = "0.28.1" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" +checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" [[package]] name = "h2" -version = "0.3.24" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9" +checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" dependencies = [ "bytes", "fnv", @@ -1125,9 +1166,9 @@ dependencies = [ [[package]] name = "half" -version = "2.3.1" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc52e53916c08643f1b56ec082790d1e86a32e58dc5268f897f313fbae7b4872" +checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888" dependencies = [ "cfg-if", "crunchy", @@ -1153,15 +1194,15 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.14.3" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" [[package]] name = "heapless" -version = "0.7.16" +version = "0.7.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db04bc24a18b9ea980628ecf00e6c0264f3c1426dac36c00cb49b6fbad8b0743" +checksum = "cdc6457c0eb62c71aac4bc17216026d8410337c4126773b9c5daba343f17964f" dependencies = [ "atomic-polyfill", "hash32", @@ -1178,9 +1219,9 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "hermit-abi" -version = "0.3.3" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" [[package]] name = "hex" @@ -1199,11 +1240,11 @@ dependencies = [ [[package]] name = "home" -version = "0.5.5" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" +checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -1214,9 +1255,9 @@ checksum = "62adaabb884c94955b19907d60019f4e145d091c75345379e70d1ee696f7854f" [[package]] name = "http" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" +checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" dependencies = [ "bytes", "fnv", @@ -1243,9 +1284,9 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "iana-time-zone" -version = "0.1.58" +version = "0.1.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -1266,11 +1307,11 @@ dependencies = [ [[package]] name = "id3" -version = "1.13.1" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79f41f7e5ad125c63d55b112a98afb753742fa7f97692bfbbc52544b89e1ff1f" +checksum = "55f4e785f2c700217ee82a1c727c720449421742abd5fcb2f1df04e1244760e9" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.5.0", "byteorder", "flate2", ] @@ -1310,11 +1351,11 @@ dependencies = [ [[package]] name = "image-webp" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a84a25dcae3ac487bc24ef280f9e20c79c9b1a3e5e32cbed3041d1c514aa87c" +checksum = "d730b085583c4d789dfd07fdcf185be59501666a90c97c40162b37e4fdad272d" dependencies = [ - "byteorder", + "byteorder-lite", "thiserror", ] @@ -1326,12 +1367,12 @@ checksum = "44feda355f4159a7c757171a77de25daf6411e217b4cabd03bd6650690468126" [[package]] name = "indexmap" -version = "2.1.0" +version = "2.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", - "hashbrown 0.14.3", + "hashbrown 0.14.5", ] [[package]] @@ -1357,10 +1398,16 @@ checksum = "c34819042dc3d3971c46c2190835914dfbe0c3c13f61449b2997f4e9722dfa60" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.66", ] [[package]] +name = "is_terminal_polyfill" +version = "1.70.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" + +[[package]] name = "iso_country" version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1389,9 +1436,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.9" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "jni" @@ -1417,24 +1464,24 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" [[package]] name = "jobserver" -version = "0.1.27" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" +checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" dependencies = [ "libc", ] [[package]] name = "jpeg-decoder" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e" +checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" [[package]] name = "js-sys" -version = "0.3.66" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" dependencies = [ "wasm-bindgen", ] @@ -1470,9 +1517,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.150" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libfuzzer-sys" @@ -1514,19 +1561,25 @@ checksum = "4d873d7c67ce09b42110d801813efbc9364414e356be9935700d368351657487" [[package]] name = "lock_api" -version = "0.4.11" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" dependencies = [ "autocfg", "scopeguard", ] [[package]] +name = "lockfree-object-pool" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9374ef4228402d4b7e403e5838cb880d9ee663314b0a900d5a6aabf0c213552e" + +[[package]] name = "log" -version = "0.4.20" +version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" [[package]] name = "loop9" @@ -1538,12 +1591,13 @@ dependencies = [ ] [[package]] -name = "malloc_buf" -version = "0.0.6" +name = "lzma-rs" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" +checksum = "297e814c836ae64db86b36cf2a557ba54368d03f6afcd7d947c266692f71115e" dependencies = [ - "libc", + "byteorder", + "crc", ] [[package]] @@ -1558,28 +1612,18 @@ dependencies = [ [[package]] name = "memchr" -version = "2.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" - -[[package]] -name = "memoffset" -version = "0.9.0" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" -dependencies = [ - "autocfg", -] +checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" [[package]] name = "metaflac" -version = "0.2.5" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1470d3cc1bb0d692af5eb3afb594330b8ba09fd91c32c4e1c6322172a5ba750" +checksum = "d0f083edae4a21f5acb1fda8220d1c14fa31f725bfd4e21005a14c2d8944db9b" dependencies = [ "byteorder", "hex", - "log", ] [[package]] @@ -1606,9 +1650,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.7.1" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae" dependencies = [ "adler", "simd-adler32", @@ -1616,9 +1660,9 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.9" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" dependencies = [ "libc", "log", @@ -1662,15 +1706,6 @@ dependencies = [ ] [[package]] -name = "nanorand" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3" -dependencies = [ - "getrandom", -] - -[[package]] name = "ndk-context" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1700,16 +1735,21 @@ checksum = "0676bb32a98c1a483ce53e500a81ad9c3d5b3f7c920c28c24e9cb0980d0b5bc8" [[package]] name = "num-bigint" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" +checksum = "c165a9ab64cf766f73521c0dd2cfdff64f488b8f0b3e621face3462d3db536d7" dependencies = [ - "autocfg", "num-integer", "num-traits", ] [[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + +[[package]] name = "num-derive" version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1728,7 +1768,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.66", ] [[package]] @@ -1742,11 +1782,10 @@ dependencies = [ [[package]] name = "num-rational" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" +checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824" dependencies = [ - "autocfg", "num-bigint", "num-integer", "num-traits", @@ -1754,9 +1793,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.17" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", ] @@ -1772,19 +1811,44 @@ dependencies = [ ] [[package]] -name = "objc" -version = "0.2.7" +name = "objc-sys" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310" + +[[package]] +name = "objc2" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" +checksum = "46a785d4eeff09c14c487497c162e92766fbb3e4059a71840cecc03d9a50b804" dependencies = [ - "malloc_buf", + "objc-sys", + "objc2-encode", +] + +[[package]] +name = "objc2-encode" +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", + "libc", + "objc2", ] [[package]] name = "object" -version = "0.32.1" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" +checksum = "b8ec7ab813848ba4522158d5517a6093db1ded27575b070f4177b8d12b41db5e" dependencies = [ "memchr", ] @@ -1844,9 +1908,9 @@ dependencies = [ [[package]] name = "parking_lot" -version = "0.12.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ "lock_api", "parking_lot_core", @@ -1854,44 +1918,31 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.9" +version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", "redox_syscall", "smallvec", - "windows-targets 0.48.5", -] - -[[package]] -name = "password-hash" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7676374caaee8a325c9e7a2ae557f216c5563a171d6997b0ef8a65af35147700" -dependencies = [ - "base64ct", - "rand_core", - "subtle", + "windows-targets 0.52.5", ] [[package]] name = "paste" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "pbkdf2" -version = "0.11.0" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" +checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2" dependencies = [ "digest", "hmac", - "password-hash", - "sha2", ] [[package]] @@ -1901,30 +1952,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] -name = "pin-project" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" -dependencies = [ - "pin-project-internal", -] - -[[package]] -name = "pin-project-internal" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.48", -] - -[[package]] name = "pin-project-lite" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" [[package]] name = "pin-utils" @@ -1934,15 +1965,15 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkg-config" -version = "0.3.27" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] name = "png" -version = "0.17.10" +version = "0.17.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd75bf2d8dd3702b9707cdbc56a5b9ef42cec752eb8b3bafc01234558442aa64" +checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1" dependencies = [ "bitflags 1.3.2", "crc32fast", @@ -1965,9 +1996,9 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "proc-macro2" -version = "1.0.78" +version = "1.0.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" +checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23" dependencies = [ "unicode-ident", ] @@ -1988,16 +2019,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8021cf59c8ec9c432cfc2526ac6b8aa508ecaf29cd415f271b8406c1b851c3fd" dependencies = [ "quote", - "syn 2.0.48", + "syn 2.0.66", ] [[package]] name = "pulldown-cmark" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dce76ce678ffc8e5675b22aa1405de0b7037e2fdf8913fea40d1926c6fe1e6e7" +checksum = "8746739f11d39ce5ad5c2520a9b75285310dbfe78c541ccf832d38615765aec0" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.5.0", "memchr", "pulldown-cmark-escape", "unicase", @@ -2005,9 +2036,9 @@ dependencies = [ [[package]] name = "pulldown-cmark-escape" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5d8f9aa0e3cbcfaf8bf00300004ee3b72f74770f9cbac93f6928771f613276b" +checksum = "007d8adb5ddab6f8e3f491ac63566a7d5002cc7ed73901f72057943fa71ae1ae" [[package]] name = "qoi" @@ -2026,9 +2057,9 @@ checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" [[package]] name = "quote" -version = "1.0.35" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] @@ -2114,16 +2145,10 @@ dependencies = [ ] [[package]] -name = "raw-window-handle" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" - -[[package]] name = "rayon" -version = "1.8.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" dependencies = [ "either", "rayon-core", @@ -2131,9 +2156,9 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.12.0" +version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" dependencies = [ "crossbeam-deque", "crossbeam-utils", @@ -2141,18 +2166,18 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.4.1" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.5.0", ] [[package]] name = "regex" -version = "1.10.2" +version = "1.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" dependencies = [ "aho-corasick", "memchr", @@ -2162,9 +2187,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.3" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" dependencies = [ "aho-corasick", "memchr", @@ -2172,10 +2197,16 @@ dependencies = [ ] [[package]] +name = "regex-lite" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30b661b2f27137bdbc16f00eda72866a92bb28af1753ffbd56744fb6e2e9cd8e" + +[[package]] name = "regex-syntax" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" +checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" [[package]] name = "rgb" @@ -2198,9 +2229,9 @@ dependencies = [ [[package]] name = "rustc-demangle" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustc_version" @@ -2213,9 +2244,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.15" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "same-file" @@ -2243,36 +2274,42 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] +name = "seahash" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" + +[[package]] name = "semver" -version = "1.0.20" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.197" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.197" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" +checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.66", ] [[package]] name = "serde_json" -version = "1.0.108" +version = "1.0.117" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" +checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" dependencies = [ "itoa", "ryu", @@ -2281,9 +2318,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" +checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" dependencies = [ "serde", ] @@ -2312,21 +2349,10 @@ dependencies = [ ] [[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 = "signal-hook-registry" -version = "1.4.1" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" dependencies = [ "libc", ] @@ -2367,18 +2393,18 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "socket2" -version = "0.5.5" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" dependencies = [ "libc", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -2404,9 +2430,9 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "strsim" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "subtle" @@ -2427,9 +2453,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.48" +version = "2.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" +checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" dependencies = [ "proc-macro2", "quote", @@ -2457,29 +2483,29 @@ checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" [[package]] name = "thiserror" -version = "1.0.50" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" +checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.50" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" +checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.66", ] [[package]] name = "tiff" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d172b0f4d3fba17ba89811858b9d3d97f928aece846475bbda076ca46736211" +checksum = "ba1310fcea54c6a9a4fd1aad794ecc02c31682f6bfbecdf460bf19533eed1e3e" dependencies = [ "flate2", "jpeg-decoder", @@ -2488,12 +2514,13 @@ dependencies = [ [[package]] name = "time" -version = "0.3.30" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ "deranged", "itoa", + "num-conv", "powerfmt", "serde", "time-core", @@ -2508,10 +2535,11 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.15" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" dependencies = [ + "num-conv", "time-core", ] @@ -2532,9 +2560,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.37.0" +version = "1.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" +checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a" dependencies = [ "backtrace", "bytes", @@ -2551,34 +2579,33 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" +checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.66", ] [[package]] name = "tokio-util" -version = "0.7.10" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" +checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" dependencies = [ "bytes", "futures-core", "futures-sink", "pin-project-lite", "tokio", - "tracing", ] [[package]] name = "toml" -version = "0.8.12" +version = "0.8.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3" +checksum = "a4e43f8cc456c9704c851ae29c67e17ef65d2c30017c17a9765b89c382dc8bba" dependencies = [ "serde", "serde_spanned", @@ -2588,18 +2615,18 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.22.9" +version = "0.22.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e40bb779c5187258fd7aad0eb68cb8706a0a81fa712fbea808ab43c4b8374c4" +checksum = "c127785850e8c20836d49732ae6abfa47616e60bf9d9f57c43c250361a9db96c" dependencies = [ "indexmap", "serde", @@ -2645,9 +2672,9 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.13" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" [[package]] name = "unicode-ident" @@ -2657,18 +2684,18 @@ checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" dependencies = [ "tinyvec", ] [[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", @@ -2718,9 +2745,9 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "walkdir" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" dependencies = [ "same-file", "winapi-util", @@ -2734,9 +2761,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -2744,24 +2771,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.66", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -2769,28 +2796,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.66", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "web-sys" -version = "0.3.66" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50c24a44ec86bb68fbecd1b3efed7e85ea5621b39b35ef2766b66cd984f8010f" +checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" dependencies = [ "js-sys", "wasm-bindgen", @@ -2798,17 +2825,18 @@ dependencies = [ [[package]] name = "webbrowser" -version = "0.8.13" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1b04c569c83a9bb971dd47ec6fd48753315f4bf989b9b04a2e7ca4d7f0dc950" +checksum = "425ba64c1e13b1c6e8c5d2541c8fac10022ca584f33da781db01b5756aef1f4e" dependencies = [ + "block2", "core-foundation", "home", "jni", "log", "ndk-context", - "objc", - "raw-window-handle", + "objc2", + "objc2-foundation", "url", "web-sys", ] @@ -2820,43 +2848,21 @@ 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.6" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" dependencies = [ - "winapi", + "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.51.1" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.48.5", + "windows-targets 0.52.5", ] [[package]] @@ -2878,6 +2884,15 @@ dependencies = [ ] [[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.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2909,17 +2924,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" dependencies = [ - "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", + "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]] @@ -2936,9 +2952,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" +checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" [[package]] name = "windows_aarch64_msvc" @@ -2954,9 +2970,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" +checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" [[package]] name = "windows_i686_gnu" @@ -2972,9 +2988,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.0" +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 = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" +checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" [[package]] name = "windows_i686_msvc" @@ -2990,9 +3012,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" +checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" [[package]] name = "windows_x86_64_gnu" @@ -3008,9 +3030,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" +checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" [[package]] name = "windows_x86_64_gnullvm" @@ -3026,9 +3048,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" +checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" [[package]] name = "windows_x86_64_msvc" @@ -3044,101 +3066,125 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" +checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" [[package]] name = "winnow" -version = "0.6.5" +version = "0.6.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dffa400e67ed5a4dd237983829e66475f0a4a26938c4b04c21baede6262215b8" +checksum = "86c949fede1d13936a99f14fafd3e76fd642b556dd2ce96287fbe2e0151bfac6" dependencies = [ "memchr", ] [[package]] name = "zerocopy" -version = "0.7.27" +version = "0.7.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43de342578a3a14a9314a2dab1942cbfcbe5686e1f91acdc513058063eafe18" +checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.27" +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 = "zeroize" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" +dependencies = [ + "zeroize_derive", +] + +[[package]] +name = "zeroize_derive" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1012d89e3acb79fad7a799ce96866cfb8098b74638465ea1b1533d35900ca90" +checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.66", ] [[package]] name = "zip" -version = "0.6.6" +version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261" +checksum = "775a2b471036342aa69bc5a602bc889cb0a06cda00477d0c69566757d5553d39" dependencies = [ "aes", - "byteorder", + "arbitrary", "bzip2", "constant_time_eq", "crc32fast", "crossbeam-utils", + "deflate64", + "displaydoc", "flate2", "hmac", + "indexmap", + "lzma-rs", + "memchr", "pbkdf2", + "rand", "sha1", + "thiserror", "time", - "zstd 0.11.2+zstd.1.5.2", + "zeroize", + "zopfli", + "zstd", ] [[package]] -name = "zstd" -version = "0.11.2+zstd.1.5.2" +name = "zopfli" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4" +checksum = "e5019f391bac5cf252e93bbcc53d039ffd62c7bfb7c150414d61369afe57e946" dependencies = [ - "zstd-safe 5.0.2+zstd.1.5.2", + "bumpalo", + "crc32fast", + "lockfree-object-pool", + "log", + "once_cell", + "simd-adler32", ] [[package]] name = "zstd" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bffb3309596d527cfcba7dfc6ed6052f1d39dfbd7c867aa2e865e4a449c10110" -dependencies = [ - "zstd-safe 7.0.0", -] - -[[package]] -name = "zstd-safe" -version = "5.0.2+zstd.1.5.2" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db" +checksum = "2d789b1514203a1120ad2429eae43a7bd32b90976a7bb8a05f7ec02fa88cc23a" dependencies = [ - "libc", - "zstd-sys", + "zstd-safe", ] [[package]] name = "zstd-safe" -version = "7.0.0" +version = "7.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43747c7422e2924c11144d5229878b98180ef8b06cca4ab5af37afc8a8d8ea3e" +checksum = "1cd99b45c6bc03a018c8b8a86025678c87e55526064e38f9df301989dce7ec0a" dependencies = [ "zstd-sys", ] [[package]] name = "zstd-sys" -version = "2.0.9+zstd.1.5.5" +version = "2.0.10+zstd.1.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e16efa8a874a0481a574084d34cc26fdb3b99627480f785888deb6386506656" +checksum = "c253a4914af5bafc8fa8c86ee400827e83cf6ec01195ec1f1ed8441bf00d65aa" dependencies = [ "cc", "pkg-config", diff --git a/pkgs/applications/misc/faircamp/default.nix b/pkgs/applications/misc/faircamp/default.nix index b243dccf9734c..0f9155fe1b89e 100644 --- a/pkgs/applications/misc/faircamp/default.nix +++ b/pkgs/applications/misc/faircamp/default.nix @@ -2,6 +2,7 @@ , stdenv , rustPlatform , fetchFromGitea +, fetchpatch , makeWrapper , pkg-config , glib @@ -16,16 +17,24 @@ rustPlatform.buildRustPackage rec { pname = "faircamp"; - version = "0.14.0"; + version = "0.15.1"; src = fetchFromGitea { domain = "codeberg.org"; owner = "simonrepp"; repo = "faircamp"; rev = version; - hash = "sha256-gHlm5ZQ5u+gOSBERlg6iYJxGTfs/+L4y2TY+ZOsVYh8="; + hash = "sha256-TMN4DLur61bJAPp2kahBAAjf2lto62X/7rhC88nhISg="; }; + patches = [ + # Fix build error in tests + (fetchpatch { + url = "https://codeberg.org/simonrepp/faircamp/commit/7240dd707f3669d49e755088393d27369ca368c2.patch"; + hash = "sha256-Ec75Gte2zUp/q912keLdYXUse60QirTQ+DkSaCwEboQ="; + }) + ]; + cargoLock = { lockFile = ./Cargo.lock; outputHashes = { @@ -44,7 +53,7 @@ rustPlatform.buildRustPackage rec { glib libopus vips - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ]; diff --git a/pkgs/applications/misc/far2l/default.nix b/pkgs/applications/misc/far2l/default.nix index 656db72846300..7508bc53e6578 100644 --- a/pkgs/applications/misc/far2l/default.nix +++ b/pkgs/applications/misc/far2l/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "far2l"; - version = "2.6.1"; + version = "2.6.3"; src = fetchFromGitHub { owner = "elfmz"; repo = "far2l"; rev = "v_${version}"; - sha256 = "sha256-fFwO06edv2f/remnKc5snAjgmqveVNqxHiUcTlfe+4Y="; + sha256 = "sha256-iWZQpLe+shdepCVOHZDp7QEQoqelbHGRJh09KWb6aD0="; }; nativeBuildInputs = [ cmake ninja pkg-config m4 perl makeWrapper ]; @@ -31,9 +31,9 @@ stdenv.mkDerivation rec { ++ lib.optionals withColorer [ spdlog xercesc ] ++ lib.optionals withMultiArc [ libarchive pcre ] ++ lib.optionals withNetRocks [ openssl libssh libnfs neon ] - ++ lib.optional (withNetRocks && !stdenv.isDarwin) samba # broken on darwin + ++ lib.optional (withNetRocks && !stdenv.hostPlatform.isDarwin) samba # broken on darwin ++ lib.optionals withPython (with python3Packages; [ python cffi debugpy pcpp ]) - ++ lib.optionals stdenv.isDarwin [ IOKit Carbon Cocoa AudioToolbox OpenGL System ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ IOKit Carbon Cocoa AudioToolbox OpenGL System ]; postPatch = '' patchShebangs python/src/prebuild.sh diff --git a/pkgs/applications/misc/feedbackd/default.nix b/pkgs/applications/misc/feedbackd/default.nix index 813869496cb9b..256892aa0c994 100644 --- a/pkgs/applications/misc/feedbackd/default.nix +++ b/pkgs/applications/misc/feedbackd/default.nix @@ -17,6 +17,8 @@ , json-glib , libgudev , dbus +, gmobile +, umockdev }: let @@ -24,13 +26,13 @@ let domain = "source.puri.sm"; owner = "Librem5"; repo = "feedbackd-device-themes"; - rev = "v0.1.0"; - sha256 = "sha256-YK9fJ3awmhf1FAhdz95T/POivSO93jsNApm+u4OOZ80="; + rev = "v0.4.0"; + hash = "sha256-kY/+DyRxKEUzq7ctl6Va14AKUCpWU7NRQhJOwhtkJp8="; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "feedbackd"; - version = "0.2.0"; + version = "0.4.1"; outputs = [ "out" "dev" "devdoc" ]; @@ -38,9 +40,8 @@ stdenv.mkDerivation rec { domain = "source.puri.sm"; owner = "Librem5"; repo = "feedbackd"; - rev = "v${version}"; - hash = "sha256-l5rfMx3ElW25A5WVqzfKBp57ebaNC9msqV7mvnwv10s="; - fetchSubmodules = true; + rev = "v${finalAttrs.version}"; + hash = "sha256-ta14DYqkid8Cp8fx9ZMGOOJroCBszN9/VrTN6mrpTZg="; }; depsBuildBuild = [ @@ -66,22 +67,26 @@ stdenv.mkDerivation rec { gsound json-glib libgudev + gmobile ]; mesonFlags = [ "-Dgtk_doc=true" "-Dman=true" + # Make compiling work when doCheck = false + "-Dtests=${lib.boolToString finalAttrs.finalPackage.doCheck}" ]; nativeCheckInputs = [ dbus + umockdev ]; doCheck = true; postInstall = '' mkdir -p $out/lib/udev/rules.d - sed "s|/usr/libexec/|$out/libexec/|" < $src/debian/feedbackd.udev > $out/lib/udev/rules.d/90-feedbackd.rules + sed "s|/usr/libexec/|$out/libexec/|" < $src/data/90-feedbackd.rules > $out/lib/udev/rules.d/90-feedbackd.rules cp ${themes}/data/* $out/share/feedbackd/themes/ ''; @@ -103,4 +108,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ pacman99 ]; platforms = platforms.linux; }; -} +}) diff --git a/pkgs/applications/misc/fetchmail/default.nix b/pkgs/applications/misc/fetchmail/default.nix index fb2548f26a951..a949d492b29f3 100644 --- a/pkgs/applications/misc/fetchmail/default.nix +++ b/pkgs/applications/misc/fetchmail/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "fetchmail"; - version = "6.4.38"; + version = "6.4.39"; src = fetchurl { url = "mirror://sourceforge/fetchmail/fetchmail-${version}.tar.xz"; - sha256 = "sha256-pstOqGOsYdJC/7LbVko5EjdhV40+QNcc57bykFvmCdk="; + sha256 = "sha256-dRCaHzB7U4FV+gX17ymOgpjLTerpWu0kwWs402/woYY="; }; buildInputs = [ openssl python3 ]; diff --git a/pkgs/applications/misc/fetchmail/v7.nix b/pkgs/applications/misc/fetchmail/v7.nix index 9fa51a34d5965..69235f4541331 100644 --- a/pkgs/applications/misc/fetchmail/v7.nix +++ b/pkgs/applications/misc/fetchmail/v7.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { owner = "fetchmail"; repo = "fetchmail"; rev = "30b368fb8660d8fec08be1cdf2606c160b4bcb80"; - sha256 = "sha256-83D2YlFCODK2YD+oLICdim2NtNkkJU67S3YLi8Q6ga8="; + hash = "sha256-83D2YlFCODK2YD+oLICdim2NtNkkJU67S3YLi8Q6ga8="; }; buildInputs = with pkgs; [ openssl python3 ]; diff --git a/pkgs/applications/misc/ff2mpv/default.nix b/pkgs/applications/misc/ff2mpv/default.nix index 3efadca5f3a88..27fd0ce892f7e 100644 --- a/pkgs/applications/misc/ff2mpv/default.nix +++ b/pkgs/applications/misc/ff2mpv/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { description = "Native Messaging Host for ff2mpv firefox addon"; homepage = "https://github.com/woodruffw/ff2mpv"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ Enzime ]; + maintainers = [ ]; mainProgram = "ff2mpv.py"; }; } diff --git a/pkgs/applications/misc/fff/default.nix b/pkgs/applications/misc/fff/default.nix index 351796a036d26..d7bb50f59e43f 100644 --- a/pkgs/applications/misc/fff/default.nix +++ b/pkgs/applications/misc/fff/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { mainProgram = "fff"; homepage = "https://github.com/dylanaraps/fff"; license = licenses.mit; - maintainers = [ maintainers.tadeokondrak ]; + maintainers = [ ]; platforms = platforms.all; }; } diff --git a/pkgs/applications/misc/filet/default.nix b/pkgs/applications/misc/filet/default.nix index 2c03c6e76ea24..4ced9fc7b00dd 100644 --- a/pkgs/applications/misc/filet/default.nix +++ b/pkgs/applications/misc/filet/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/buffet/filet"; license = licenses.mpl20; platforms = platforms.all; - maintainers = with maintainers; [ buffet ]; + maintainers = [ ]; mainProgram = "filet"; }; } diff --git a/pkgs/applications/misc/findex/default.nix b/pkgs/applications/misc/findex/default.nix index 891ac664149ff..20187d526337b 100644 --- a/pkgs/applications/misc/findex/default.nix +++ b/pkgs/applications/misc/findex/default.nix @@ -39,6 +39,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/mdgaziur/findex"; license = licenses.gpl3Only; platforms = platforms.linux; - maintainers = []; + maintainers = [ ]; }; } diff --git a/pkgs/applications/misc/firestarter/default.nix b/pkgs/applications/misc/firestarter/default.nix index a8372b643bd36..55e1700c5c858 100644 --- a/pkgs/applications/misc/firestarter/default.nix +++ b/pkgs/applications/misc/firestarter/default.nix @@ -2,7 +2,7 @@ , lib , fetchFromGitHub , fetchzip -, addOpenGLRunpath +, addDriverRunpath , cmake , glibc_multi , glibc @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { git pkg-config ] ++ lib.optionals withCuda [ - addOpenGLRunpath + addDriverRunpath ]; buildInputs = [ hwloc ] ++ (if withCuda then @@ -95,11 +95,11 @@ stdenv.mkDerivation rec { ''; postFixup = lib.optionalString withCuda '' - addOpenGLRunpath $out/bin/FIRESTARTER_CUDA + addDriverRunpath $out/bin/FIRESTARTER_CUDA ''; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); homepage = "https://tu-dresden.de/zih/forschung/projekte/firestarter"; description = "Processor Stress Test Utility"; platforms = platforms.linux; diff --git a/pkgs/applications/misc/flashprint/default.nix b/pkgs/applications/misc/flashprint/default.nix index 182e219d0e57f..96f1db7df91b6 100644 --- a/pkgs/applications/misc/flashprint/default.nix +++ b/pkgs/applications/misc/flashprint/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "flashprint"; - version = "5.8.4"; + version = "5.8.6"; src = fetchurl { url = "http://www.ishare3d.com/3dapp/public/FlashPrint-5/FlashPrint/flashprint5_${finalAttrs.version}_amd64.deb"; - hash = "sha256-Gr76yG3Qz7bnbm5YerHbpb+yzqhw1LthUb4qIH03VQw="; + hash = "sha256-oi/nEdOjhbYf9IZmppfKiEmlNGXdc907LS2x8jUck+M="; }; nativeBuildInputs = [ dpkg autoPatchelfHook wrapQtAppsHook ]; diff --git a/pkgs/applications/misc/flavours/default.nix b/pkgs/applications/misc/flavours/default.nix index ffb329129d8e8..c2cb20ef5b746 100644 --- a/pkgs/applications/misc/flavours/default.nix +++ b/pkgs/applications/misc/flavours/default.nix @@ -11,13 +11,13 @@ rustPlatform.buildRustPackage rec { hash = "sha256-SOsHvcfDdUpb0x5VZ1vZJnGaIiWWOPgnAwKYNXzfUfI="; }; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; cargoHash = "sha256-aimPeGIE5jP0pdrqwnzUzBqW0jz9+kcfpLdCN0r30xU="; nativeBuildInputs = [ installShellFiles ]; - postInstall = '' + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd flavours \ --zsh <($out/bin/flavours --completions zsh) \ --fish <($out/bin/flavours --completions fish) \ diff --git a/pkgs/applications/misc/fluidd/default.nix b/pkgs/applications/misc/fluidd/default.nix index 3694f8e232201..0a6e43f9e17a9 100644 --- a/pkgs/applications/misc/fluidd/default.nix +++ b/pkgs/applications/misc/fluidd/default.nix @@ -1,13 +1,13 @@ -{ lib, stdenvNoCC, fetchurl, unzip }: +{ lib, stdenvNoCC, fetchurl, unzip, nixosTests }: stdenvNoCC.mkDerivation rec { pname = "fluidd"; - version = "1.30.0"; + version = "1.30.4"; src = fetchurl { name = "fluidd-v${version}.zip"; url = "https://github.com/cadriel/fluidd/releases/download/v${version}/fluidd.zip"; - sha256 = "sha256-+nPVnKuZtYGFtqC48XNISSjay3lDAYR3l50kq026H3Q="; + sha256 = "sha256-r9RYNfbMa0axxS5kVBsFmvnuznsZz4s0ZfsIJVczHlI="; }; nativeBuildInputs = [ unzip ]; @@ -25,6 +25,8 @@ stdenvNoCC.mkDerivation rec { cp -r fluidd $out/share/fluidd/htdocs ''; + passthru.tests = { inherit (nixosTests) fluidd; }; + meta = with lib; { description = "Klipper web interface"; homepage = "https://docs.fluidd.xyz"; diff --git a/pkgs/applications/misc/fuzzel/default.nix b/pkgs/applications/misc/fuzzel/default.nix index afe2f188363e7..96c363f6cf925 100644 --- a/pkgs/applications/misc/fuzzel/default.nix +++ b/pkgs/applications/misc/fuzzel/default.nix @@ -24,14 +24,14 @@ assert svgSupport -> enableCairo; stdenv.mkDerivation (finalAttrs: { pname = "fuzzel"; - version = "1.10.2"; + version = "1.11.1"; src = fetchFromGitea { domain = "codeberg.org"; owner = "dnkl"; repo = "fuzzel"; rev = finalAttrs.version; - hash = "sha256-I+h93/I1Kra2S5QSi2XgICAVrcUmO9cmb8UttVuzjwg="; + hash = "sha256-FM5HvPfLVmuKpS3/0m2QM/lSRcWsVpnwtJ++L3Uo5Dc="; }; depsBuildBuild = [ @@ -70,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://codeberg.org/dnkl/fuzzel"; license = with licenses; [ mit zlib ]; mainProgram = "fuzzel"; - maintainers = with maintainers; [ fionera polykernel rodrgz ]; + maintainers = with maintainers; [ fionera rodrgz ]; platforms = with platforms; linux; }; }) diff --git a/pkgs/applications/misc/gallery-dl/default.nix b/pkgs/applications/misc/gallery-dl/default.nix index 1172571488838..b235cabde9981 100644 --- a/pkgs/applications/misc/gallery-dl/default.nix +++ b/pkgs/applications/misc/gallery-dl/default.nix @@ -5,17 +5,18 @@ requests, yt-dlp, pytestCheckHook, + nix-update-script, }: buildPythonApplication rec { pname = "gallery-dl"; - version = "1.27.0"; + version = "1.27.5"; format = "setuptools"; src = fetchPypi { inherit version; pname = "gallery_dl"; - hash = "sha256-zMimHjaXgwOSt8HbSec4o0y3e9Xf6tFFiI4KzsrP850="; + hash = "sha256-q/byWRvbzrV6KjPIDjJJWl0fkrluGEcvrISPKz8SJ+4="; }; propagatedBuildInputs = [ @@ -36,6 +37,8 @@ buildPythonApplication rec { pythonImportsCheck = [ "gallery_dl" ]; + passthru.updateScript = nix-update-script { }; + meta = { description = "Command-line program to download image-galleries and -collections from several image hosting sites"; homepage = "https://github.com/mikf/gallery-dl"; diff --git a/pkgs/applications/misc/gcal/default.nix b/pkgs/applications/misc/gcal/default.nix index a6b98ccccf08e..f07a18c0edae4 100644 --- a/pkgs/applications/misc/gcal/default.nix +++ b/pkgs/applications/misc/gcal/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - buildInputs = [ ncurses ] ++ lib.optional stdenv.isDarwin gettext; + buildInputs = [ ncurses ] ++ lib.optional stdenv.hostPlatform.isDarwin gettext; meta = { description = "Program for calculating and printing calendars"; @@ -34,5 +34,6 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Plus; platforms = lib.platforms.unix; maintainers = [ lib.maintainers.romildo ]; + mainProgram = "gcal"; }; } diff --git a/pkgs/applications/misc/gcalcli/default.nix b/pkgs/applications/misc/gcalcli/default.nix index 47950616578ed..c9c29cd8e007f 100644 --- a/pkgs/applications/misc/gcalcli/default.nix +++ b/pkgs/applications/misc/gcalcli/default.nix @@ -1,38 +1,59 @@ -{ stdenv, lib, fetchFromGitHub, python3 -, libnotify ? null }: +{ + stdenv, + lib, + fetchFromGitHub, + python3Packages, + libnotify, +}: -with python3.pkgs; - -buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "gcalcli"; - version = "4.3.0"; + version = "4.4.0"; + pyproject = true; src = fetchFromGitHub { - owner = "insanum"; - repo = pname; - rev = "v${version}"; - sha256 = "0s5fhcmz3n0dwh3vkqr4aigi59q43v03ch5jhh6v75149icwr0df"; + owner = "insanum"; + repo = "gcalcli"; + rev = "refs/tags/v${version}"; + hash = "sha256-X9sgnujHMbmrt7cpcBOvTycIKFz3G2QzNDt3me5GUrQ="; }; - postPatch = lib.optionalString stdenv.isLinux '' - substituteInPlace gcalcli/argparsers.py \ - --replace "'notify-send" "'${libnotify}/bin/notify-send" - ''; + postPatch = + '' + # dev dependencies + substituteInPlace pyproject.toml \ + --replace-fail "\"google-api-python-client-stubs\"," "" \ + --replace-fail "\"types-python-dateutil\"," "" \ + --replace-fail "\"types-requests\"," "" \ + --replace-fail "\"types-vobject\"," "" + '' + + lib.optionalString stdenv.hostPlatform.isLinux '' + substituteInPlace gcalcli/argparsers.py \ + --replace-fail "'notify-send" "'${lib.getExe libnotify}" + ''; + + build-system = with python3Packages; [ setuptools ]; - propagatedBuildInputs = [ - python-dateutil gflags httplib2 parsedatetime six vobject - google-api-python-client oauth2client uritemplate + dependencies = with python3Packages; [ + argcomplete + python-dateutil + gflags + httplib2 + parsedatetime + vobject + google-api-python-client + google-auth-oauthlib + uritemplate libnotify ]; - # There are no tests as of 4.0.0a4 - doCheck = false; + nativeCheckInputs = with python3Packages; [ pytestCheckHook ]; - meta = with lib; { + meta = { description = "CLI for Google Calendar"; mainProgram = "gcalcli"; homepage = "https://github.com/insanum/gcalcli"; - license = licenses.mit; - maintainers = with maintainers; [ nocoolnametom ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ nocoolnametom ]; }; } diff --git a/pkgs/applications/misc/gcfflasher/default.nix b/pkgs/applications/misc/gcfflasher/default.nix index b9a49e1723299..01a071dc68f4e 100644 --- a/pkgs/applications/misc/gcfflasher/default.nix +++ b/pkgs/applications/misc/gcfflasher/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { cmake ]; - buildInputs = lib.optionals stdenv.isLinux [ + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libgpiod ]; diff --git a/pkgs/applications/misc/gcstar/default.nix b/pkgs/applications/misc/gcstar/default.nix index 02662f11f96b4..fbc730121f021 100644 --- a/pkgs/applications/misc/gcstar/default.nix +++ b/pkgs/applications/misc/gcstar/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { owner = "Kerenoc"; repo = "GCstar"; rev = "v${version}"; - sha256 = "sha256-37yjKI4l/nUzDnra1AGxDQxNafMsLi1bSifG6pz33zg="; + hash = "sha256-37yjKI4l/nUzDnra1AGxDQxNafMsLi1bSifG6pz33zg="; }; nativeBuildInputs = [ wrapGAppsHook3 ]; diff --git a/pkgs/applications/misc/genact/default.nix b/pkgs/applications/misc/genact/default.nix index 8591b749a4068..d2abfc02ba770 100644 --- a/pkgs/applications/misc/genact/default.nix +++ b/pkgs/applications/misc/genact/default.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, fetchFromGitHub, installShellFiles }: +{ lib, rustPlatform, fetchFromGitHub, installShellFiles, stdenv }: rustPlatform.buildRustPackage rec { pname = "genact"; @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - postInstall = '' + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' $out/bin/genact --print-manpage > genact.1 installManPage genact.1 diff --git a/pkgs/applications/misc/genesys/default.nix b/pkgs/applications/misc/genesys/default.nix index 9624111b5707d..69fb2630e9da2 100644 --- a/pkgs/applications/misc/genesys/default.nix +++ b/pkgs/applications/misc/genesys/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation (finalAttrs: { version = "1.0.7"; src = fetchurl { - url = "https://github.com/mrlem/genesys/releases/download/v${finalAttrs.version}/${finalAttrs.pname}-${finalAttrs.version}.tar.gz"; + url = "https://github.com/mrlem/genesys/releases/download/v${finalAttrs.version}/genesys-${finalAttrs.version}.tar.gz"; hash = "sha256-I1lEVvwRiGf1f4zUtqKhSb+it/nC8WAmw5S6edquOj8="; }; diff --git a/pkgs/applications/misc/get_iplayer/default.nix b/pkgs/applications/misc/get_iplayer/default.nix index 4f455d901c2d7..c807438aaa43d 100644 --- a/pkgs/applications/misc/get_iplayer/default.nix +++ b/pkgs/applications/misc/get_iplayer/default.nix @@ -20,7 +20,7 @@ perlPackages.buildPerlPackage rec { hash = "sha256-fqzrgmtqy7dlmGEaTXAqpdt9HqZCVooJ0Vf6/JUKihw="; }; - nativeBuildInputs = [ makeWrapper ] ++ lib.optional stdenv.isDarwin shortenPerlShebang; + nativeBuildInputs = [ makeWrapper ] ++ lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang; buildInputs = [ perl ]; propagatedBuildInputs = with perlPackages; [ LWP LWPProtocolHttps XMLLibXML Mojolicious @@ -40,7 +40,7 @@ perlPackages.buildPerlPackage rec { runHook postInstall ''; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' shortenPerlShebang $out/bin/.get_iplayer-wrapped ''; diff --git a/pkgs/applications/misc/gimoji/default.nix b/pkgs/applications/misc/gimoji/default.nix index 71582e3acc399..802c03489b117 100644 --- a/pkgs/applications/misc/gimoji/default.nix +++ b/pkgs/applications/misc/gimoji/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-pKHhYWEF9L0UX9hc2Ga3WOUWzISA8ONwn3rcI9u2/n0="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit ]; diff --git a/pkgs/applications/misc/girara/default.nix b/pkgs/applications/misc/girara/default.nix index d33560c4f16a4..37f12a266c684 100644 --- a/pkgs/applications/misc/girara/default.nix +++ b/pkgs/applications/misc/girara/default.nix @@ -55,11 +55,11 @@ stdenv.mkDerivation rec { xvfb-run ]; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; mesonFlags = [ "-Ddocs=disabled" # docs do not seem to be installed - (lib.mesonEnable "tests" ((stdenv.buildPlatform.canExecute stdenv.hostPlatform) && (!stdenv.isDarwin))) + (lib.mesonEnable "tests" ((stdenv.buildPlatform.canExecute stdenv.hostPlatform) && (!stdenv.hostPlatform.isDarwin))) ]; checkPhase = '' diff --git a/pkgs/applications/misc/gkrellm/default.nix b/pkgs/applications/misc/gkrellm/default.nix index 218110f6d17de..e6d8dfc31f5ab 100644 --- a/pkgs/applications/misc/gkrellm/default.nix +++ b/pkgs/applications/misc/gkrellm/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ copyDesktopItems pkg-config which wrapGAppsHook3 ]; buildInputs = [ gettext glib gtk2 libX11 libSM libICE ] - ++ lib.optionals stdenv.isDarwin [ IOKit ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ IOKit ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/misc/globe-cli/default.nix b/pkgs/applications/misc/globe-cli/default.nix index 9d2a5bbc786f8..fdc53e74b0783 100644 --- a/pkgs/applications/misc/globe-cli/default.nix +++ b/pkgs/applications/misc/globe-cli/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, rustPlatform, fetchCrate }: +{ lib, rustPlatform, fetchCrate }: rustPlatform.buildRustPackage rec { pname = "globe-cli"; @@ -6,7 +6,7 @@ rustPlatform.buildRustPackage rec { src = fetchCrate { inherit pname version; - sha256 = "sha256-Np1f/mSMIMZU3hE0Fur8bOHhOH3rZyroGiVAqfiIs7g="; + hash = "sha256-Np1f/mSMIMZU3hE0Fur8bOHhOH3rZyroGiVAqfiIs7g="; }; cargoHash = "sha256-qoCOYk7hyjMx07l48IkxE6zsG58NkF72E3OvoZHz5d0="; diff --git a/pkgs/applications/misc/gmrun/default.nix b/pkgs/applications/misc/gmrun/default.nix index e71b1a6484d38..aa1a3cd46b693 100644 --- a/pkgs/applications/misc/gmrun/default.nix +++ b/pkgs/applications/misc/gmrun/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://sourceforge.net/projects/gmrun/"; license = licenses.gpl2; - maintainers = []; + maintainers = [ ]; platforms = platforms.all; mainProgram = "gmrun"; }; diff --git a/pkgs/applications/misc/gmtp/default.nix b/pkgs/applications/misc/gmtp/default.nix deleted file mode 100644 index e3a33cace9cb0..0000000000000 --- a/pkgs/applications/misc/gmtp/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, libmtp, libid3tag, flac, libvorbis, gtk3 -, gsettings-desktop-schemas, wrapGAppsHook3 -}: - -let version = "1.3.11"; in - -stdenv.mkDerivation { - pname = "gmtp"; - inherit version; - - src = fetchurl { - url = "mirror://sourceforge/gmtp/gMTP-${version}/gmtp-${version}.tar.gz"; - sha256 = "04q6byyq002fhzkc2rkkahwh5b6272xakaj4m3vwm8la8jf0r0ss"; - }; - - nativeBuildInputs = [ pkg-config wrapGAppsHook3 ]; - buildInputs = [ libmtp libid3tag flac libvorbis gtk3 gsettings-desktop-schemas ]; - - enableParallelBuilding = true; - - # Workaround build failure on -fno-common toolchains: - # ld: gmtp-preferences.o:src/main.h:72: multiple definition of - # `scrolledwindowMain'; gmtp-about.o:src/main.h:72: first defined here - # TODO: can be removed when 1.4.0 is released. - env.NIX_CFLAGS_COMPILE = "-fcommon"; - - preFixup = '' - gappsWrapperArgs+=(--add-flags "--datapath $out/share"); - ''; - - meta = { - description = "Simple MP3 and Media player client for UNIX and UNIX like systems"; - mainProgram = "gmtp"; - homepage = "https://gmtp.sourceforge.io"; - platforms = lib.platforms.linux; - maintainers = [ ]; - license = lib.licenses.bsd3; - }; -} diff --git a/pkgs/applications/misc/gnome-epub-thumbnailer/default.nix b/pkgs/applications/misc/gnome-epub-thumbnailer/default.nix index 3553dd118da03..3e0a8978b5e5c 100644 --- a/pkgs/applications/misc/gnome-epub-thumbnailer/default.nix +++ b/pkgs/applications/misc/gnome-epub-thumbnailer/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "gnome-epub-thumbnailer"; - version = "1.7"; + version = "1.8"; src = fetchurl { url = "mirror://gnome/sources/gnome-epub-thumbnailer/${lib.versions.majorMinor version}/gnome-epub-thumbnailer-${version}.tar.xz"; - sha256 = "sha256-S7Ah++RCgNuY3xTBH6XkMgsWe4GpG9e6WGvqDE+il1I="; + sha256 = "sha256-+QYZ1YxpkC8u/1e58AQrRzeGEIP0dZIaMQ/sxhL8oBc="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/gnome-frog/default.nix b/pkgs/applications/misc/gnome-frog/default.nix index 85dde662becd0..0facc24ce44cc 100644 --- a/pkgs/applications/misc/gnome-frog/default.nix +++ b/pkgs/applications/misc/gnome-frog/default.nix @@ -1,9 +1,7 @@ -{ stdenv -, lib +{ lib , fetchFromGitHub , python3Packages , wrapGAppsHook4 -, gtk4 , meson , ninja , pkg-config @@ -25,13 +23,13 @@ python3Packages.buildPythonApplication rec { pname = "gnome-frog"; - version = "1.5.1"; + version = "1.5.2"; src = fetchFromGitHub { owner = "TenderOwl"; repo = "Frog"; rev = "refs/tags/${version}"; - sha256 = "sha256-zL6zuqHF1pTXT3l1mAFx2EL+0ThzjXfst/nEyNVorZg="; + sha256 = "sha256-Zu1xUGpjqpFiPQAAgaVYtnXI4jMtyywrJqn+38K5VHo="; }; format = "other"; diff --git a/pkgs/applications/misc/gnome-secrets/default.nix b/pkgs/applications/misc/gnome-secrets/default.nix index 046e296489b6f..cdf030b6e7236 100644 --- a/pkgs/applications/misc/gnome-secrets/default.nix +++ b/pkgs/applications/misc/gnome-secrets/default.nix @@ -17,7 +17,7 @@ python3Packages.buildPythonApplication rec { pname = "gnome-secrets"; - version = "8.0"; + version = "9.6"; format = "other"; src = fetchFromGitLab { @@ -25,7 +25,7 @@ python3Packages.buildPythonApplication rec { owner = "World"; repo = "secrets"; rev = version; - hash = "sha256-SEPQjl6hd8IBs0c0LBEYaqn2n8CGQmYSEMJp5yoL/PA="; + hash = "sha256-iF2AQYAwwIr/sCZUz1pdqEa74DH4y4Nts6aJj3mS2f4="; }; nativeBuildInputs = [ @@ -49,9 +49,11 @@ python3Packages.buildPythonApplication rec { propagatedBuildInputs = with python3Packages; [ pygobject3 construct + pykcs11 pykeepass pyotp validators + yubico zxcvbn ]; diff --git a/pkgs/applications/misc/golden-cheetah-bin/default.nix b/pkgs/applications/misc/golden-cheetah-bin/default.nix index 3fcd77f8f4b78..c37e7dc72fff1 100644 --- a/pkgs/applications/misc/golden-cheetah-bin/default.nix +++ b/pkgs/applications/misc/golden-cheetah-bin/default.nix @@ -29,7 +29,7 @@ appimageTools.wrapType2 { meta = { description = "Performance software for cyclists, runners and triathletes. This version includes the API Tokens for e.g. Strava"; platforms = lib.platforms.linux; - broken = !stdenv.isx86_64; + broken = !stdenv.hostPlatform.isx86_64; maintainers = with lib.maintainers; [ gador adamcstephens ]; license = lib.licenses.gpl2Plus; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; diff --git a/pkgs/applications/misc/golden-cheetah/default.nix b/pkgs/applications/misc/golden-cheetah/default.nix index ce8a0888ffc9b..a39f5d7f78b24 100644 --- a/pkgs/applications/misc/golden-cheetah/default.nix +++ b/pkgs/applications/misc/golden-cheetah/default.nix @@ -16,13 +16,13 @@ let }; in mkDerivation rec { pname = "golden-cheetah"; - version = "3.7-DEV2404"; + version = "3.7-DEV2408"; src = fetchFromGitHub { owner = "GoldenCheetah"; repo = "GoldenCheetah"; rev = "refs/tags/v${version}"; - hash = "sha256-u2igcnOulgJGZT46/Z3vSsce9mr3VsxkD3mTeQPvUOg="; + hash = "sha256-6JAdnYaKULJsc/zdcTMbCkbOCbiVtnJivEazDKL721c="; }; buildInputs = [ diff --git a/pkgs/applications/misc/goldendict-ng/default.nix b/pkgs/applications/misc/goldendict-ng/default.nix index 356059d1d9bde..4d7c70e8bddb4 100644 --- a/pkgs/applications/misc/goldendict-ng/default.nix +++ b/pkgs/applications/misc/goldendict-ng/default.nix @@ -4,7 +4,6 @@ , pkg-config , cmake , libvorbis -, ffmpeg , libeb , hunspell , opencc @@ -31,13 +30,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "goldendict-ng"; - version = "24.05.05"; + version = "24.09.0"; src = fetchFromGitHub { owner = "xiaoyifang"; repo = "goldendict-ng"; - rev = "v${finalAttrs.version}-LiXia.ecd1138c"; - hash = "sha256-C/0FUFLE3R+tZyCL88BiSFOHPTanILD/fIIQ/OQBSfk="; + rev = "v${finalAttrs.version}-Release.316ec900"; + hash = "sha256-LriKJLjqEuD0v8yjoE35O+V6oUX2jhWGFguqlXaDlQA="; }; nativeBuildInputs = [ pkg-config cmake wrapQtAppsHook wrapGAppsHook3 ]; @@ -48,7 +47,6 @@ stdenv.mkDerivation (finalAttrs: { qtwebengine qt5compat qtmultimedia - qtspeech qtwayland libvorbis tomlplusplus @@ -61,7 +59,6 @@ stdenv.mkDerivation (finalAttrs: { libiconv opencc libeb - ffmpeg xapian libzim ]; @@ -76,7 +73,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ "-DWITH_XAPIAN=ON" "-DWITH_ZIM=ON" - "-DWITH_FFMPEG_PLAYER=ON" + "-DWITH_FFMPEG_PLAYER=OFF" "-DWITH_EPWING_SUPPORT=ON" "-DUSE_SYSTEM_FMT=ON" "-DUSE_SYSTEM_TOML=ON" diff --git a/pkgs/applications/misc/goldendict/default.nix b/pkgs/applications/misc/goldendict/default.nix index 328f1f7343208..9c8edf3c774ec 100644 --- a/pkgs/applications/misc/goldendict/default.nix +++ b/pkgs/applications/misc/goldendict/default.nix @@ -36,26 +36,26 @@ stdenv.mkDerivation rec { buildInputs = [ qtbase qtsvg qtwebkit qttools libvorbis hunspell xz lzo - ] ++ lib.optionals stdenv.isLinux [ qtx11extras libXtst ] - ++ lib.optionals stdenv.isDarwin [ bzip2 libiconv ] + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ qtx11extras libXtst ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ bzip2 libiconv ] ++ lib.optional withCC opencc ++ lib.optional withEpwing libeb ++ lib.optional withExtraTiff libtiff ++ lib.optionals withFFmpeg [ libao ffmpeg ] ++ lib.optional withZim zstd; - qmakeFlags = with lib; [ + qmakeFlags = [ "goldendict.pro" - (optional withCC "CONFIG+=chinese_conversion_support") - (optional (!withCC) "CONFIG+=no_chinese_conversion_support") - (optional (!withEpwing) "CONFIG+=no_epwing_support") - (optional (!withExtraTiff) "CONFIG+=no_extra_tiff_handler") - (optional (!withFFmpeg) "CONFIG+=no_ffmpeg_player") - (optional (!withMultimedia)"CONFIG+=no_qtmultimedia_player") - (optional withZim "CONFIG+=zim_support") + (lib.optional withCC "CONFIG+=chinese_conversion_support") + (lib.optional (!withCC) "CONFIG+=no_chinese_conversion_support") + (lib.optional (!withEpwing) "CONFIG+=no_epwing_support") + (lib.optional (!withExtraTiff) "CONFIG+=no_extra_tiff_handler") + (lib.optional (!withFFmpeg) "CONFIG+=no_ffmpeg_player") + (lib.optional (!withMultimedia)"CONFIG+=no_qtmultimedia_player") + (lib.optional withZim "CONFIG+=zim_support") ]; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications mv GoldenDict.app $out/Applications ''; diff --git a/pkgs/applications/misc/gollum/Gemfile.lock b/pkgs/applications/misc/gollum/Gemfile.lock index 7619d5f84ec82..302c0b17727a2 100644 --- a/pkgs/applications/misc/gollum/Gemfile.lock +++ b/pkgs/applications/misc/gollum/Gemfile.lock @@ -2,51 +2,48 @@ GEM remote: https://rubygems.org/ specs: RedCloth (4.3.4) - asciidoctor (2.0.22) + asciidoctor (2.0.23) base64 (0.2.0) - builder (3.2.4) - concurrent-ruby (1.2.3) + builder (3.3.0) + concurrent-ruby (1.3.3) crass (1.0.6) creole (0.5.0) - execjs (2.9.1) expression_parser (0.9.0) - ffi (1.16.3) gemojione (4.3.3) json github-markup (4.0.2) - gollum (5.3.3) + gollum (6.0.1) gemojione (~> 4.1) - gollum-lib (>= 5.2.3, < 6.0) + gollum-lib (~> 6.0) i18n (~> 1.8) kramdown (~> 2.3) kramdown-parser-gfm (~> 1.1.0) mustache-sinatra (~> 2.0) - octicons (~> 12.0) + octicons (~> 19.0) + rack (>= 3.0) + rackup (~> 2.1) rdoc (~> 6) - rss (~> 0.2.9) - sass (~> 3.5) - sinatra (~> 2.0) - sinatra-contrib (~> 2.0) - sprockets (~> 3.7) + rss (~> 0.3) + sinatra (~> 4.0) + sinatra-contrib (~> 4.0) + sprockets (~> 4.1) sprockets-helpers (~> 1.2) therubyrhino (~> 2.1.0) - uglifier (~> 4.2) useragent (~> 0.16.2) webrick (~> 1.7) - gollum-lib (5.2.4) + gollum-lib (6.0) gemojione (~> 4.1) github-markup (~> 4.0) - gollum-rugged_adapter (~> 2.0) + gollum-rugged_adapter (~> 3.0) loofah (~> 2.3) nokogiri (~> 1.8) - octicons (~> 12.0) rouge (~> 3.1) twitter-text (= 1.14.7) - gollum-rugged_adapter (2.1.0) + gollum-rugged_adapter (3.0) mime-types (~> 3.4) rugged (~> 1.5) htmlentities (4.3.4) - i18n (1.14.4) + i18n (1.14.5) concurrent-ruby (~> 1.0) json (2.7.2) kramdown (2.4.0) @@ -58,70 +55,67 @@ GEM nokogiri (>= 1.12.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0305) - mini_portile2 (2.8.6) + mime-types-data (3.2024.0702) + mini_portile2 (2.8.7) multi_json (1.15.0) mustache (1.1.1) mustache-sinatra (2.0.0) mustache (~> 1.0) - mustermann (2.0.2) + mustermann (3.0.0) ruby2_keywords (~> 0.0.1) - nokogiri (1.16.4) + nokogiri (1.16.7) mini_portile2 (~> 2.8.2) racc (~> 1.4) - octicons (12.1.0) - nokogiri (>= 1.6.3.1) + octicons (19.11.0) org-ruby (0.9.12) rubypants (~> 0.2) psych (5.1.2) stringio - racc (1.7.3) - rack (2.2.9) - rack-protection (2.2.4) - rack - rb-fsevent (0.11.2) - rb-inotify (0.10.1) - ffi (~> 1.0) - rdoc (6.6.3.1) + racc (1.8.0) + rack (3.1.7) + rack-protection (4.0.0) + base64 (>= 0.1.0) + rack (>= 3.0.0, < 4) + rack-session (2.0.0) + rack (>= 3.0.0) + rackup (2.1.0) + rack (>= 3) + webrick (~> 1.8) + rdoc (6.7.0) psych (>= 4.0.0) - rexml (3.2.6) + rexml (3.3.2) + strscan rouge (3.30.0) - rss (0.2.9) + rss (0.3.0) rexml ruby2_keywords (0.0.5) rubypants (0.7.1) rugged (1.7.2) - sass (3.7.4) - sass-listen (~> 4.0.0) - sass-listen (4.0.0) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) - sinatra (2.2.4) - mustermann (~> 2.0) - rack (~> 2.2) - rack-protection (= 2.2.4) + sinatra (4.0.0) + mustermann (~> 3.0) + rack (>= 3.0.0, < 4) + rack-protection (= 4.0.0) + rack-session (>= 2.0.0, < 3) tilt (~> 2.0) - sinatra-contrib (2.2.4) - multi_json - mustermann (~> 2.0) - rack-protection (= 2.2.4) - sinatra (= 2.2.4) + sinatra-contrib (4.0.0) + multi_json (>= 0.0.2) + mustermann (~> 3.0) + rack-protection (= 4.0.0) + sinatra (= 4.0.0) tilt (~> 2.0) - sprockets (3.7.3) - base64 + sprockets (4.2.1) concurrent-ruby (~> 1.0) - rack (> 1, < 3) + rack (>= 2.2.4, < 4) sprockets-helpers (1.4.0) sprockets (>= 2.2) - stringio (3.1.0) + stringio (3.1.1) + strscan (3.1.0) therubyrhino (2.1.2) therubyrhino_jar (>= 1.7.4, < 1.7.9) therubyrhino_jar (1.7.8) - tilt (2.3.0) + tilt (2.4.0) twitter-text (1.14.7) unf (~> 0.1.0) - uglifier (4.2.0) - execjs (>= 0.3.0, < 3) unf (0.1.4) unf_ext unf_ext (0.0.9.1) @@ -146,4 +140,4 @@ DEPENDENCIES wikicloth BUNDLED WITH - 2.5.7 + 2.5.16 diff --git a/pkgs/applications/misc/gollum/default.nix b/pkgs/applications/misc/gollum/default.nix index cb39fbd3964ea..9625236193616 100644 --- a/pkgs/applications/misc/gollum/default.nix +++ b/pkgs/applications/misc/gollum/default.nix @@ -1,4 +1,4 @@ -{ lib, bundlerApp, bundlerUpdateScript, ruby, makeWrapper, git, docutils, nixosTests }: +{ lib, bundlerApp, bundlerUpdateScript, ruby, makeWrapper, nixosTests }: bundlerApp rec { pname = "gollum"; diff --git a/pkgs/applications/misc/gollum/gemset.nix b/pkgs/applications/misc/gollum/gemset.nix index 9a613ab689de6..e9948188e149d 100644 --- a/pkgs/applications/misc/gollum/gemset.nix +++ b/pkgs/applications/misc/gollum/gemset.nix @@ -4,10 +4,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mnan6dxw4aqii9kcmp1s3sc91jiwaqkdpsg6g01fdisb6xz3n56"; + sha256 = "1wyxgwmnz9bw377r3lba26b090hbsq9qnbw8575a1prpy83qh82j"; type = "gem"; }; - version = "2.0.22"; + version = "2.0.23"; }; base64 = { groups = ["default"]; @@ -24,20 +24,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "045wzckxpwcqzrjr353cxnyaxgf0qg22jh00dcx7z38cys5g1jlr"; + sha256 = "0pw3r2lyagsxkm71bf44v5b74f7l9r7di22brbyji9fwz791hya9"; type = "gem"; }; - version = "3.2.4"; + version = "3.3.0"; }; concurrent-ruby = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qh1b14jwbbj242klkyz5fc7npd4j0mvndz62gajhvl1l3wd7zc2"; + sha256 = "0skwdasxq7mnlcccn6aqabl7n9r3jd7k19ryzlzzip64cn4x572g"; type = "gem"; }; - version = "1.2.3"; + version = "1.3.3"; }; crass = { groups = ["default"]; @@ -59,16 +59,6 @@ }; version = "0.5.0"; }; - execjs = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1yywajqlpjhrj1m43s3lfg3i4lkb6pxwccmwps7qw37ndmphdzg8"; - type = "gem"; - }; - version = "2.9.1"; - }; expression_parser = { groups = ["default"]; platforms = []; @@ -79,16 +69,6 @@ }; version = "0.9.0"; }; - ffi = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1yvii03hcgqj30maavddqamqy50h7y6xcn2wcyq72wn823zl4ckd"; - type = "gem"; - }; - version = "1.16.3"; - }; gemojione = { dependencies = ["json"]; groups = ["default"]; @@ -111,26 +91,26 @@ version = "4.0.2"; }; gollum = { - dependencies = ["gemojione" "gollum-lib" "i18n" "kramdown" "kramdown-parser-gfm" "mustache-sinatra" "octicons" "rdoc" "rss" "sass" "sinatra" "sinatra-contrib" "sprockets" "sprockets-helpers" "therubyrhino" "uglifier" "useragent" "webrick"]; + dependencies = ["gemojione" "gollum-lib" "i18n" "kramdown" "kramdown-parser-gfm" "mustache-sinatra" "octicons" "rack" "rackup" "rdoc" "rss" "sinatra" "sinatra-contrib" "sprockets" "sprockets-helpers" "therubyrhino" "useragent" "webrick"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0k94yba33ccvx3h7vl3d4jkx8j8y45a7qy3angf8094b0hy2p1fi"; + sha256 = "01gk8zb1mfr7ypspbg765fn3m6rdh0b6jpyxfninabl9dzazyvpi"; type = "gem"; }; - version = "5.3.3"; + version = "6.0.1"; }; gollum-lib = { - dependencies = ["gemojione" "github-markup" "gollum-rugged_adapter" "loofah" "nokogiri" "octicons" "rouge" "twitter-text"]; + dependencies = ["gemojione" "github-markup" "gollum-rugged_adapter" "loofah" "nokogiri" "rouge" "twitter-text"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15nkslf8vm4gr8wbicm5xwsmgqy22zy3gb6pgdzdm78vyqva055d"; + sha256 = "1vgvdmz5rh3ciww95llwax7pz93n4iljsz2q5f2hhynx6csvhriw"; type = "gem"; }; - version = "5.2.4"; + version = "6.0"; }; gollum-rugged_adapter = { dependencies = ["mime-types" "rugged"]; @@ -138,10 +118,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05v24lpkssn1k07n28bw4yh7w1ygsv4cfwz046jn9lmrh3v8q4d1"; + sha256 = "00l1fmgjv3sq97c5lw7qcrf37v970yz89dm6b73ah2y4qn8zd7qk"; type = "gem"; }; - version = "2.1.0"; + version = "3.0"; }; htmlentities = { groups = ["default"]; @@ -159,10 +139,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lbm33fpb3w06wd2231sg58dwlwgjsvym93m548ajvl6s3mfvpn7"; + sha256 = "1ffix518y7976qih9k1lgnc17i3v6yrlh0a3mckpxdb4wc2vrp16"; type = "gem"; }; - version = "1.14.4"; + version = "1.14.5"; }; json = { groups = ["default"]; @@ -223,20 +203,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00x7w5xqsj9m33v3vkmy23wipkkysafksib53ypzn27p5g81w455"; + sha256 = "104r7glqjal9fgvnv49wjzp4ssai9hmyn3npkari51s2ska3jnr0"; type = "gem"; }; - version = "3.2024.0305"; + version = "3.2024.0702"; }; mini_portile2 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "149r94xi6b3jbp6bv72f8383b95ndn0p5sxnq11gs1j9jadv0ajf"; + sha256 = "1q1f2sdw3y3y9mnym9dhjgsjr72sq975cfg5c4yx7gwv8nmzbvhk"; type = "gem"; }; - version = "2.8.6"; + version = "2.8.7"; }; multi_json = { groups = ["default"]; @@ -275,10 +255,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0m70qz27mlv2rhk4j1li6pw797gmiwwqg02vcgxcxr1rq2v53rnb"; + sha256 = "0rwbq20s2gdh8dljjsgj5s6wqqfmnbclhvv2c2608brv7jm6jdbd"; type = "gem"; }; - version = "2.0.2"; + version = "3.0.0"; }; nokogiri = { dependencies = ["mini_portile2" "racc"]; @@ -286,21 +266,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0i8g0i370jhn2sclml0bg9qlrgf4csi6sy7czbhx8kjbl71idhb2"; + sha256 = "15gysw8rassqgdq3kwgl4mhqmrgh7nk2qvrcqp4ijyqazgywn6gq"; type = "gem"; }; - version = "1.16.4"; + version = "1.16.7"; }; octicons = { - dependencies = ["nokogiri"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kpy7h7pffjqb2xbmld7nwnb2x6rll3yz5ccr7nrqnrk2d3cmpmn"; + sha256 = "07nb9i9yl3xk6dr7aacxx3dfrrslrw9cn9a55gn9rrhgckb3pymy"; type = "gem"; }; - version = "12.1.0"; + version = "19.11.0"; }; org-ruby = { dependencies = ["rubypants"]; @@ -329,52 +308,53 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01b9662zd2x9bp4rdjfid07h09zxj7kvn7f5fghbqhzc625ap1dp"; + sha256 = "021s7maw0c4d9a6s07vbmllrzqsj2sgmrwimlh8ffkvwqdjrld09"; type = "gem"; }; - version = "1.7.3"; + version = "1.8.0"; }; rack = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hj0rkw2z9r1lcg2wlrcld2n3phwrcgqcp7qd1g9a7hwgalh2qzx"; + sha256 = "12z55b90vvr4sh93az2yfr3fg91jivsag8lcg0k360d99vdq568f"; type = "gem"; }; - version = "2.2.9"; + version = "3.1.7"; }; rack-protection = { - dependencies = ["rack"]; + dependencies = ["base64" "rack"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1d6irsigm0i4ig1m47c94kixi3wb8jnxwvwkl8qxvyngmb73srl2"; + sha256 = "1xmvcxgm1jq92hqxm119gfk95wzl0d46nb2c2c6qqsm4ra2n3nyh"; type = "gem"; }; - version = "2.2.4"; + version = "4.0.0"; }; - rb-fsevent = { + rack-session = { + dependencies = ["rack"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zmf31rnpm8553lqwibvv3kkx0v7majm1f341xbxc0bk5sbhp423"; + sha256 = "10afdpmy9kh0qva96slcyc59j4gkk9av8ilh58cnj0qq7q3b416v"; type = "gem"; }; - version = "0.11.2"; + version = "2.0.0"; }; - rb-inotify = { - dependencies = ["ffi"]; + rackup = { + dependencies = ["rack" "webrick"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jm76h8f8hji38z3ggf4bzi8vps6p7sagxn3ab57qc0xyga64005"; + sha256 = "0kbcka30g681cqasw47pq93fxjscq7yvs5zf8lp3740rb158ijvf"; type = "gem"; }; - version = "0.10.1"; + version = "2.1.0"; }; rdoc = { dependencies = ["psych"]; @@ -382,10 +362,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ib3cnf4yllvw070gr4bz94sbmqx3haqc5f846fsvdcs494vgxrr"; + sha256 = "0ygk2zk0ky3d88v3ll7qh6xqvbvw5jin0hqdi1xkv1dhaw7myzdi"; type = "gem"; }; - version = "6.6.3.1"; + version = "6.7.0"; }; RedCloth = { groups = ["default"]; @@ -398,14 +378,15 @@ version = "4.3.4"; }; rexml = { + dependencies = ["strscan"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05i8518ay14kjbma550mv0jm8a6di8yp5phzrd8rj44z9qnrlrp0"; + sha256 = "0zr5qpa8lampaqzhdcjcvyqnrqcjl7439mqjlkjz43wdhmpnh4s5"; type = "gem"; }; - version = "3.2.6"; + version = "3.3.2"; }; rouge = { groups = ["default"]; @@ -423,10 +404,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1b1zx07kr64kkpm4lssd4r1a1qyr829ppmfl85i4adcvx9mqfid0"; + sha256 = "1wv27axi39hhr0nmaffdl5bdjqiafcvp9xhfgnsgfczsblja50sn"; type = "gem"; }; - version = "0.2.9"; + version = "0.3.0"; }; ruby2_keywords = { groups = ["default"]; @@ -458,38 +439,16 @@ }; version = "1.7.2"; }; - sass = { - dependencies = ["sass-listen"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0p95lhs0jza5l7hqci1isflxakz83xkj97lkvxl919is0lwhv2w0"; - type = "gem"; - }; - version = "3.7.4"; - }; - sass-listen = { - dependencies = ["rb-fsevent" "rb-inotify"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0xw3q46cmahkgyldid5hwyiwacp590zj2vmswlll68ryvmvcp7df"; - type = "gem"; - }; - version = "4.0.0"; - }; sinatra = { - dependencies = ["mustermann" "rack" "rack-protection" "tilt"]; + dependencies = ["mustermann" "rack" "rack-protection" "rack-session" "tilt"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wkc079h6hzq737j4wycpnv7c38mhd0rl33pszyy7768zzvyjc9y"; + sha256 = "0za92lv4s7xhgkkm6xxf7ib0b3bsyj8drxgkrskgsb5g3mxnixjl"; type = "gem"; }; - version = "2.2.4"; + version = "4.0.0"; }; sinatra-contrib = { dependencies = ["multi_json" "mustermann" "rack-protection" "sinatra" "tilt"]; @@ -497,21 +456,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0s6c1k3zzxp3xa7libvlpqaby27124rccyyxcsly04ih904cxk33"; + sha256 = "0r9khg85m60w0i77jpnm2irh9m4k0ia4mlicapj8dr7s6ykqd9dh"; type = "gem"; }; - version = "2.2.4"; + version = "4.0.0"; }; sprockets = { - dependencies = ["base64" "concurrent-ruby" "rack"]; + dependencies = ["concurrent-ruby" "rack"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lyc6mx4yalsnxc9yp4a5xra4nz1nwwbk5634wlfncml0ll1bnnw"; + sha256 = "15rzfzd9dca4v0mr0bbhsbwhygl0k9l24iqqlx0fijig5zfi66wm"; type = "gem"; }; - version = "3.7.3"; + version = "4.2.1"; }; sprockets-helpers = { dependencies = ["sprockets"]; @@ -529,7 +488,17 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "063psvsn1aq6digpznxfranhcpmi0sdv2jhra5g0459sw0x2dxn1"; + sha256 = "07mfqb40b2wh53k33h91zva78f9zwcdnl85jiq74wnaw2wa6wiak"; + type = "gem"; + }; + version = "3.1.1"; + }; + strscan = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0mamrl7pxacbc79ny5hzmakc9grbjysm3yy6119ppgsg44fsif01"; type = "gem"; }; version = "3.1.0"; @@ -560,10 +529,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0p3l7v619hwfi781l3r7ypyv1l8hivp09r18kmkn6g11c4yr1pc2"; + sha256 = "0kds7wkxmb038cwp6ravnwn8k65ixc68wpm8j5jx5bhx8ndg4x6z"; type = "gem"; }; - version = "2.3.0"; + version = "2.4.0"; }; twitter-text = { dependencies = ["unf"]; @@ -576,17 +545,6 @@ }; version = "1.14.7"; }; - uglifier = { - dependencies = ["execjs"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0wgh7bzy68vhv9v68061519dd8samcy8sazzz0w3k8kqpy3g4s5f"; - type = "gem"; - }; - version = "4.2.0"; - }; unf = { dependencies = ["unf_ext"]; groups = ["default"]; diff --git a/pkgs/applications/misc/googleearth-pro/default.nix b/pkgs/applications/misc/googleearth-pro/default.nix index 4da7bd97ec2f4..8532afdfce1ec 100644 --- a/pkgs/applications/misc/googleearth-pro/default.nix +++ b/pkgs/applications/misc/googleearth-pro/default.nix @@ -35,11 +35,11 @@ let in mkDerivation rec { pname = "googleearth-pro"; - version = "7.3.4.8248"; + version = "7.3.6.9796"; src = fetchurl { url = "https://dl.google.com/linux/earth/deb/pool/main/g/google-earth-pro-stable/google-earth-pro-stable_${version}-r0_${arch}.deb"; - sha256 = "1pbapi267snlrjari5k93y6kbrjsqhqxgkxxqaqv4r25az00dx6d"; + sha256 = "sha256-Wv2jPGN7LC5T32WdX3W1BfGYrcXTNWTI1Wv+PmD0gNM="; }; nativeBuildInputs = [ dpkg makeWrapper autoPatchelfHook ]; @@ -72,7 +72,7 @@ mkDerivation rec { unpackPhase = '' # deb file contains a setuid binary, so 'dpkg -x' doesn't work here mkdir deb - dpkg --fsys-tarfile ${src} | tar --extract -C deb + dpkg --fsys-tarfile $src | tar --extract -C deb ''; installPhase ='' @@ -118,7 +118,7 @@ mkDerivation rec { homepage = "https://www.google.com/earth/"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; - maintainers = with maintainers; [ shamilton ]; + maintainers = with maintainers; [ shamilton xddxdd ]; platforms = platforms.linux; knownVulnerabilities = [ "Includes vulnerable versions of bundled libraries: openssl, ffmpeg, gdal, and proj." ]; }; diff --git a/pkgs/applications/misc/gopacked/default.nix b/pkgs/applications/misc/gopacked/default.nix index 6b0eaeff65f5e..1ce8d1cb4e178 100644 --- a/pkgs/applications/misc/gopacked/default.nix +++ b/pkgs/applications/misc/gopacked/default.nix @@ -19,6 +19,6 @@ buildGoModule rec { description = "Simple text-based Minecraft modpack manager"; license = licenses.agpl3Plus; homepage = src.meta.homepage; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/misc/gpsbabel/default.nix b/pkgs/applications/misc/gpsbabel/default.nix index fbacfb6984c6e..e1cfb556891af 100644 --- a/pkgs/applications/misc/gpsbabel/default.nix +++ b/pkgs/applications/misc/gpsbabel/default.nix @@ -2,7 +2,7 @@ , qmake, qttools, wrapQtAppsHook , libusb1, shapelib, zlib , withGUI ? false, qtserialport -, withMapPreview ? (!stdenv.isDarwin), qtwebengine +, withMapPreview ? (!stdenv.hostPlatform.isDarwin), qtwebengine , withDoc ? false, docbook_xml_dtd_45, docbook_xsl, expat, fop, libxml2, libxslt, perl }: @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { # Floating point behavior on i686 causes nmea.test failures. Preventing # extended precision fixes this problem. - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isi686 "-ffloat-store"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isi686 "-ffloat-store"; doCheck = true; @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { installPhase = '' install -Dm755 gpsbabel -t $out/bin - '' + lib.optionalString withGUI (if stdenv.isDarwin then '' + '' + lib.optionalString withGUI (if stdenv.hostPlatform.isDarwin then '' mkdir -p $out/Applications mv gui/GPSBabelFE.app $out/Applications install -Dm644 gui/*.qm gui/coretool/*.qm -t $out/Applications/GPSBabelFE.app/Contents/Resources/translations @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { cp -r html $doc/share/doc/gpsbabel ''; - postFixup = lib.optionalString withGUI (if stdenv.isDarwin then '' + postFixup = lib.optionalString withGUI (if stdenv.hostPlatform.isDarwin then '' wrapQtApp "$out/Applications/GPSBabelFE.app/Contents/MacOS/GPSBabelFE" '' else '' wrapQtApp "$out/bin/gpsbabelfe" diff --git a/pkgs/applications/misc/gpu-burn/default.nix b/pkgs/applications/misc/gpu-burn/default.nix deleted file mode 100644 index eaf0fc44d29dd..0000000000000 --- a/pkgs/applications/misc/gpu-burn/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, addOpenGLRunpath, cudatoolkit }: - -stdenv.mkDerivation { - pname = "gpu-burn"; - version = "unstable-2023-11-10"; - - src = fetchFromGitHub { - owner = "wilicc"; - repo = "gpu-burn"; - rev = "b99aedce3e020d2ca419832ee27b7f29dfa6373e"; - sha256 = "sha256-cLO0GXvujZ+g64j+OY31n43MsVER3ljo8Qrt+EzSKjc="; - }; - - postPatch = '' - substituteInPlace gpu_burn-drv.cpp \ - --replace "#define COMPARE_KERNEL \"compare.ptx\"" \ - "#define COMPARE_KERNEL \"$out/share/compare.ptx\"" - ''; - - buildInputs = [ cudatoolkit ]; - - nativeBuildInputs = [ addOpenGLRunpath ]; - - makeFlags = [ "CUDAPATH=${cudatoolkit}" ]; - - LDFLAGS = "-L${cudatoolkit}/lib/stubs"; - - installPhase = '' - mkdir -p $out/{bin,share} - cp gpu_burn $out/bin/ - cp compare.ptx $out/share/ - ''; - - postFixup = '' - addOpenGLRunpath $out/bin/gpu_burn - ''; - - meta = with lib; { - homepage = "http://wili.cc/blog/gpu-burn.html"; - description = "Multi-GPU CUDA stress test"; - platforms = platforms.linux; - license = licenses.bsd2; - mainProgram = "gpu_burn"; - }; -} diff --git a/pkgs/applications/misc/gpu-viewer/default.nix b/pkgs/applications/misc/gpu-viewer/default.nix index 71dd7a091e603..24255bccde190 100644 --- a/pkgs/applications/misc/gpu-viewer/default.nix +++ b/pkgs/applications/misc/gpu-viewer/default.nix @@ -12,7 +12,7 @@ , wrapGAppsHook4 , gdk-pixbuf , lsb-release -, glxinfo +, mesa-demos , vdpauinfo , clinfo }: @@ -55,7 +55,7 @@ python3.pkgs.buildPythonApplication rec { postFixup = '' makeWrapper ${python3.interpreter} $out/bin/gpu-viewer \ - --prefix PATH : "${lib.makeBinPath [ clinfo glxinfo lsb-release vdpauinfo vulkan-tools ]}" \ + --prefix PATH : "${lib.makeBinPath [ clinfo lsb-release mesa-demos vdpauinfo vulkan-tools ]}" \ --add-flags "$out/share/gpu-viewer/Files/GPUViewer.py" \ --prefix PYTHONPATH : "$PYTHONPATH" \ --chdir "$out/share/gpu-viewer/Files" \ 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/gpxlab/default.nix b/pkgs/applications/misc/gpxlab/default.nix index 18c31afef6b52..c3002104256c8 100644 --- a/pkgs/applications/misc/gpxlab/default.nix +++ b/pkgs/applications/misc/gpxlab/default.nix @@ -19,7 +19,7 @@ mkDerivation rec { lrelease GPXLab/locale/*.ts ''; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications mv GPXLab/GPXLab.app $out/Applications ''; diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix index 0501d9f707e69..60bc8b5792371 100644 --- a/pkgs/applications/misc/gpxsee/default.nix +++ b/pkgs/applications/misc/gpxsee/default.nix @@ -9,7 +9,6 @@ , qtpositioning ? null # qt6 only , qtserialport , qtsvg -, qt5compat ? null # qt6 only , wrapQtAppsHook }: @@ -18,13 +17,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "gpxsee"; - version = "13.22"; + version = "13.26"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = finalAttrs.version; - hash = "sha256-5YoFO1NHduV8qKZ8GPaFnKfRQRlhlG5swZo74SfOpZY="; + hash = "sha256-EIeUcSHJXpd1/90fAPrP9F/DVyZhkcZk8MJd9VO1D70="; }; buildInputs = [ @@ -33,7 +32,6 @@ stdenv.mkDerivation (finalAttrs: { qtbase qtpositioning qtsvg - qt5compat ] else [ qtlocation ]); @@ -48,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { lrelease gpxsee.pro ''; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications mv GPXSee.app $out/Applications mkdir -p $out/bin @@ -60,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = { - broken = isQt6 && stdenv.isDarwin; + broken = isQt6 && stdenv.hostPlatform.isDarwin; changelog = "https://build.opensuse.org/package/view_file/home:tumic:GPXSee/gpxsee/gpxsee.changes"; description = "GPS log file viewer and analyzer"; mainProgram = "gpxsee"; diff --git a/pkgs/applications/misc/gradience/default.nix b/pkgs/applications/misc/gradience/default.nix index 3ddbe86cd78b7..d4b4965aea87b 100644 --- a/pkgs/applications/misc/gradience/default.nix +++ b/pkgs/applications/misc/gradience/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , fetchFromGitHub , wrapGAppsHook4 , meson diff --git a/pkgs/applications/misc/gramps/default.nix b/pkgs/applications/misc/gramps/default.nix index 5ecab79226c8c..ba5bce3a0edbe 100644 --- a/pkgs/applications/misc/gramps/default.nix +++ b/pkgs/applications/misc/gramps/default.nix @@ -23,7 +23,7 @@ let inherit (pythonPackages) buildPythonApplication pythonOlder; in buildPythonApplication rec { - version = "5.2.2"; + version = "5.2.3"; pname = "gramps"; pyproject = true; @@ -33,7 +33,7 @@ buildPythonApplication rec { owner = "gramps-project"; repo = "gramps"; rev = "refs/tags/v${version}"; - hash = "sha256-umyc5G4p0GSEQEtq6sPUgtq1waNL1OW7iLxnf5dGcLc="; + hash = "sha256-DfKKB+rgMGQ8HTqhCp11UTYLj3Fdd0B0v4a922GJ8L8="; }; patches = [ diff --git a/pkgs/applications/misc/green-pdfviewer/default.nix b/pkgs/applications/misc/green-pdfviewer/default.nix index 9f649b07ff8cc..9c3c8c95872ee 100644 --- a/pkgs/applications/misc/green-pdfviewer/default.nix +++ b/pkgs/applications/misc/green-pdfviewer/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { platforms = platforms.unix; license = licenses.gpl3; - maintainers = [ maintainers.vrthra ]; + maintainers = [ ]; mainProgram = "green"; }; } diff --git a/pkgs/applications/misc/gsctl/default.nix b/pkgs/applications/misc/gsctl/default.nix index b2b9c7b67b06c..bb30f7d1b6320 100644 --- a/pkgs/applications/misc/gsctl/default.nix +++ b/pkgs/applications/misc/gsctl/default.nix @@ -31,7 +31,7 @@ buildGoModule rec { kubectl ]; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = with lib; { description = "Giant Swarm command line interface"; diff --git a/pkgs/applications/misc/gum/default.nix b/pkgs/applications/misc/gum/default.nix index d4a67e5f8a87d..3870851655038 100644 --- a/pkgs/applications/misc/gum/default.nix +++ b/pkgs/applications/misc/gum/default.nix @@ -1,17 +1,17 @@ -{ lib, buildGoModule, installShellFiles, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, installShellFiles, fetchFromGitHub }: buildGoModule rec { pname = "gum"; - version = "0.14.1"; + version = "0.14.5"; src = fetchFromGitHub { owner = "charmbracelet"; repo = pname; rev = "v${version}"; - hash = "sha256-rQSSbDHMSWJDSxn/SNNMaOrdZJUhQPnZutmpY9828t0="; + hash = "sha256-moKirTXziVo6ESOsnTUmPkcdBYL/VHaG226+UfM0xAk="; }; - vendorHash = "sha256-pkQ8UvWLIWH8gXux/dd0HLdiz7RDrmFJ8SX63Q+nNyw="; + vendorHash = "sha256-wjM2ld4go7OQu6XqsSGurjN09Fd5t9FNLvIzgrZEZ1k="; nativeBuildInputs = [ installShellFiles @@ -22,6 +22,7 @@ buildGoModule rec { postInstall = '' $out/bin/gum man > gum.1 installManPage gum.1 + '' + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd gum \ --bash <($out/bin/gum completion bash) \ --fish <($out/bin/gum completion fish) \ diff --git a/pkgs/applications/misc/gv/default.nix b/pkgs/applications/misc/gv/default.nix index ca12e3bc77a9c..b812e56073804 100644 --- a/pkgs/applications/misc/gv/default.nix +++ b/pkgs/applications/misc/gv/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0q8s43z14vxm41pfa8s5h9kyyzk1fkwjhkiwbf2x70alm6rv6qi1"; }; - configureFlags = lib.optionals stdenv.isDarwin [ + configureFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "--enable-SIGCHLD-fallback" ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { Xaw3d ghostscriptX perl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; diff --git a/pkgs/applications/misc/harsh/default.nix b/pkgs/applications/misc/harsh/default.nix index cc576b7a0acf7..a2ba9a1bfd0f7 100644 --- a/pkgs/applications/misc/harsh/default.nix +++ b/pkgs/applications/misc/harsh/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "harsh"; - version = "0.10.0"; + version = "0.10.2"; src = fetchFromGitHub { owner = "wakatara"; repo = pname; rev = "v${version}"; - hash = "sha256-SF5SvVllAXaALSasVt+wqiywYltAuzaPoc9IohwYmss="; + hash = "sha256-XkOdW6ewout69A1ovth1iQR36nRtkdsbDI9CWibSHXs="; }; vendorHash = "sha256-4Sa8/mVD7t4uR8Wq4n+fvot7LZfraphFobrG6rteQeI="; @@ -21,7 +21,7 @@ buildGoModule rec { homepage = "https://github.com/wakatara/harsh"; changelog = "https://github.com/wakatara/harsh/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; mainProgram = "harsh"; }; } diff --git a/pkgs/applications/misc/haxor-news/default.nix b/pkgs/applications/misc/haxor-news/default.nix index d5ea27c9d50b9..8eedf7bc47b53 100644 --- a/pkgs/applications/misc/haxor-news/default.nix +++ b/pkgs/applications/misc/haxor-news/default.nix @@ -3,9 +3,8 @@ let py = python3.override { + self = py; packageOverrides = self: super: { - self = py; - # not compatible with prompt_toolkit >=2.0 prompt-toolkit = super.prompt-toolkit.overridePythonAttrs (oldAttrs: rec { name = "${oldAttrs.pname}-${version}"; diff --git a/pkgs/applications/misc/hcl2json/default.nix b/pkgs/applications/misc/hcl2json/default.nix index e8d90c9e16974..08dfd67d25116 100644 --- a/pkgs/applications/misc/hcl2json/default.nix +++ b/pkgs/applications/misc/hcl2json/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "hcl2json"; - version = "0.6.3"; + version = "0.6.4"; src = fetchFromGitHub { owner = "tmccombs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-RBzx6TxkR6GwMGHIpkJeswZ3zV4hRf38rTGUO6u2OI4="; + sha256 = "sha256-aYsE4Tmi2h+XiLZH0faoB17UA7xHht8bec5Kud+NLIk="; }; - vendorHash = "sha256-G/2bSFCXbph0bVjmWmcFgv4i/pCOQHhYxsVRVkpHPo4="; + vendorHash = "sha256-Rjpru0SfGm9hdMQwvk8yM/E65YFB0NicaJ7a56/uwLE="; subPackages = [ "." ]; @@ -22,7 +22,7 @@ buildGoModule rec { description = "Convert hcl2 to json"; homepage = "https://github.com/tmccombs/hcl2json"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; mainProgram = "hcl2json"; }; } diff --git a/pkgs/applications/misc/health/default.nix b/pkgs/applications/misc/health/default.nix index 8a2972e99a3a5..8ff79b36a5155 100644 --- a/pkgs/applications/misc/health/default.nix +++ b/pkgs/applications/misc/health/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { libadwaita libsecret tracker - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.Foundation ]; diff --git a/pkgs/applications/misc/heimer/default.nix b/pkgs/applications/misc/heimer/default.nix index 8672169d02abc..ada6d8cdc6b8a 100644 --- a/pkgs/applications/misc/heimer/default.nix +++ b/pkgs/applications/misc/heimer/default.nix @@ -32,7 +32,7 @@ mkDerivation rec { homepage = "https://github.com/juzzlin/Heimer"; changelog = "https://github.com/juzzlin/Heimer/blob/${version}/CHANGELOG"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ dtzWill ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/hollywood/default.nix b/pkgs/applications/misc/hollywood/default.nix index 1b655e5afacc7..0609660a85d53 100644 --- a/pkgs/applications/misc/hollywood/default.nix +++ b/pkgs/applications/misc/hollywood/default.nix @@ -19,13 +19,6 @@ , findutils , ccze , ncurses -, python3 -, wget -, libcaca -, newsboat -, rsstail -, w3m -, ticker , tmux }: @@ -90,6 +83,6 @@ stdenv.mkDerivation { mainProgram = "hollywood"; homepage = "https://a.hollywood.computer/"; license = lib.licenses.asl20; - maintainers = [ lib.maintainers.anselmschueler ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/misc/holochain-launcher/default.nix b/pkgs/applications/misc/holochain-launcher/default.nix index 23b12f032bd9f..b438f6c6d5dfc 100644 --- a/pkgs/applications/misc/holochain-launcher/default.nix +++ b/pkgs/applications/misc/holochain-launcher/default.nix @@ -2,7 +2,6 @@ , lib , fetchurl , autoPatchelfHook -, pkg-config , dpkg , openssl , webkitgtk diff --git a/pkgs/applications/misc/houdini/default.nix b/pkgs/applications/misc/houdini/default.nix index 64536177aaff5..4a0a24239a0bd 100644 --- a/pkgs/applications/misc/houdini/default.nix +++ b/pkgs/applications/misc/houdini/default.nix @@ -100,4 +100,14 @@ buildFHSEnv rec { export LD_LIBRARY_PATH=${lib.makeLibraryPath [ncurses5]}:$LD_LIBRARY_PATH exec "$@" ''; + + meta = { + description = "3D animation application software"; + homepage = "https://www.sidefx.com"; + license = lib.licenses.unfree; + platforms = [ "x86_64-linux" ]; + mainProgram = "houdini"; + hydraPlatforms = [ ]; # requireFile src's should be excluded + maintainers = with lib.maintainers; [ canndrew kwohlfahrt pedohorse ]; + }; } diff --git a/pkgs/applications/misc/houdini/runtime-build.nix b/pkgs/applications/misc/houdini/runtime-build.nix index 60f27c1949642..1c3083ebb7389 100644 --- a/pkgs/applications/misc/houdini/runtime-build.nix +++ b/pkgs/applications/misc/houdini/runtime-build.nix @@ -1,9 +1,5 @@ -{ lib, stdenv, requireFile, bc, version, src, eulaDate }: - -let - license_dir = "~/.config/houdini"; -in -stdenv.mkDerivation rec { +{ stdenv, bc, version, src, eulaDate }: +stdenv.mkDerivation { inherit version src; pname = "houdini-runtime"; @@ -23,13 +19,4 @@ stdenv.mkDerivation rec { ''; dontFixup = true; - - meta = with lib; { - description = "3D animation application software"; - homepage = "https://www.sidefx.com"; - license = licenses.unfree; - platforms = platforms.linux; - hydraPlatforms = [ ]; # requireFile src's should be excluded - maintainers = with maintainers; [ canndrew kwohlfahrt ]; - }; } diff --git a/pkgs/applications/misc/houdini/runtime.nix b/pkgs/applications/misc/houdini/runtime.nix index ef96a689b291a..a660ee2a5d838 100644 --- a/pkgs/applications/misc/houdini/runtime.nix +++ b/pkgs/applications/misc/houdini/runtime.nix @@ -1,11 +1,11 @@ -{ lib, stdenv, requireFile, callPackage}: +{ requireFile, callPackage }: callPackage ./runtime-build.nix rec { - version = "20.0.688"; + version = "20.5.332"; eulaDate = "2021-10-13"; - src = requireFile rec { + src = requireFile { name = "houdini-${version}-linux_x86_64_gcc11.2.tar.gz"; - sha256 = "99f9088824c328de9d351f037f26ff1cba960fbd9b4e2ed1d52601680d3512a6"; + hash = "sha256-ZqbLCWfPUo0fXS9liKOXsUEpm1d60bHIkbx+K98gFtU="; url = "https://www.sidefx.com/download/daily-builds/?production=true"; }; } diff --git a/pkgs/applications/misc/hovercraft/default.nix b/pkgs/applications/misc/hovercraft/default.nix index c5623d2dac169..e06cc850568d0 100644 --- a/pkgs/applications/misc/hovercraft/default.nix +++ b/pkgs/applications/misc/hovercraft/default.nix @@ -39,6 +39,6 @@ buildPythonApplication rec { mainProgram = "hovercraft"; homepage = "https://github.com/regebro/hovercraft"; license = licenses.mit; - maintainers = with maintainers; [ goibhniu makefu ]; + maintainers = with maintainers; [ makefu ]; }; } diff --git a/pkgs/applications/misc/hubstaff/default.nix b/pkgs/applications/misc/hubstaff/default.nix index e6b384904b704..0c457655c44c4 100644 --- a/pkgs/applications/misc/hubstaff/default.nix +++ b/pkgs/applications/misc/hubstaff/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, unzip, makeWrapper, libX11, zlib, libSM, libICE , libXext , freetype, libXrender, fontconfig, libXft, libXinerama , libXfixes, libXScrnSaver, libnotify, glib , gtk3, libappindicator-gtk3 -, curl, writeShellScript, common-updater-scripts }: +, curl, writeShellScript, common-updater-scripts, xmlstarlet }: let - url = "https://hubstaff-production.s3.amazonaws.com/downloads/HubstaffClient/Builds/Release/1.6.13-269829b4/Hubstaff-1.6.13-269829b4.sh"; - version = "1.6.13-269829b4"; - sha256 = "0i05d8kivm09hqsc1z6vn7w0bbc3l9dawssqpqsm7kqdyaq0l304"; + url = "https://app.hubstaff.com/download/8099-standard-linux-1-6-26-release"; + version = "1.6.26-95441346"; + sha256 = "sha256:0xxw2za1hmqff5y0vyrvccgldsgyb808dql548c2xqsc1qi9gbn9"; rpath = lib.makeLibraryPath [ libX11 zlib libSM libICE libXext freetype libXrender fontconfig libXft @@ -36,9 +36,9 @@ stdenv.mkDerivation { dontBuild = true; installPhase = '' - # TODO: handle 32-bit arch? - rm -r x86 - rm -r x86_64/lib64 + # remove files for 32-bit arch to skip building for this arch + # but add -f flag to not fail if files were not found (new versions dont provide 32-bit arch) + rm -rf x86 x86_64/lib64 opt=$out/opt/hubstaff mkdir -p $out/bin $opt @@ -55,16 +55,25 @@ stdenv.mkDerivation { ln -s $opt/data/resources $opt/x86_64/resources ''; + # to test run: + # nix-shell maintainers/scripts/update.nix --argstr package hubstaff + # nix-build -A pkgs.hubstaff passthru.updateScript = writeShellScript "hubstaff-updater" '' set -eu -o pipefail - installation_script_url=$(curl --fail --head --location --silent --output /dev/null --write-out %{url_effective} https://app.hubstaff.com/download/linux) + # Create a temporary file + temp_file=$(mktemp) - version=$(echo "$installation_script_url" | sed -r 's/^https:\/\/hubstaff\-production\.s3\.amazonaws\.com\/downloads\/HubstaffClient\/Builds\/Release\/([^\/]+)\/Hubstaff.+$/\1/') + # Fetch the appcast.xml and save it to the temporary file + curl --silent --output "$temp_file" https://app.hubstaff.com/appcast.xml + + # Extract the latest release URL for Linux using xmlstarlet + installation_script_url=$(${xmlstarlet}/bin/xmlstarlet sel -t -v '//enclosure[@sparkle:os="linux"]/@url' "$temp_file") + version=$(${xmlstarlet}/bin/xmlstarlet sel -t -v '//enclosure[@sparkle:os="linux"]/@sparkle:version' "$temp_file") sha256=$(nix-prefetch-url "$installation_script_url") - ${common-updater-scripts}/bin/update-source-version hubstaff "$version" "$sha256" "$installation_script_url" + ${common-updater-scripts}/bin/update-source-version hubstaff "$version" "sha256:$sha256" "$installation_script_url" ''; meta = with lib; { diff --git a/pkgs/applications/misc/huggle/default.nix b/pkgs/applications/misc/huggle/default.nix index 37d43a90d05df..381804c2b8ded 100644 --- a/pkgs/applications/misc/huggle/default.nix +++ b/pkgs/applications/misc/huggle/default.nix @@ -5,7 +5,6 @@ , ncurses , which , cmake -, unzip , wrapQtAppsHook , qtwebengine , yaml-cpp diff --git a/pkgs/applications/misc/hyprland-autoname-workspaces/default.nix b/pkgs/applications/misc/hyprland-autoname-workspaces/default.nix index 1bec06a38c99d..9655ad5c23087 100644 --- a/pkgs/applications/misc/hyprland-autoname-workspaces/default.nix +++ b/pkgs/applications/misc/hyprland-autoname-workspaces/default.nix @@ -5,16 +5,18 @@ rustPlatform.buildRustPackage rec { pname = "hyprland-autoname-workspaces"; - version = "1.1.14"; + version = "1.1.15"; src = fetchFromGitHub { owner = "hyprland-community"; repo = "hyprland-autoname-workspaces"; rev = version; - hash = "sha256-RTx4fmamjydrQzC1CpgbuvV6kg0S6Jyj/0Q9FrfrMlU="; + hash = "sha256-oXVKee3YAMXtVJBqJGt1SpH0KFzvIB278EN69A2OeXY="; }; - cargoHash = "sha256-Te3nBgr3uq8km8lX3AkCAS28leolZLXEF68phIEpg5k="; + cargoHash = "sha256-Ub7jU9c0I/w4h1DBFvimP7SjkabkP9EF+qtHAPtdPFI="; + + doCheck = false; meta = with lib; { description = "Automatically rename workspaces with icons of started applications"; diff --git a/pkgs/applications/misc/icesl/default.nix b/pkgs/applications/misc/icesl/default.nix index 1a079ab8274c3..aeeb82ba581fb 100644 --- a/pkgs/applications/misc/icesl/default.nix +++ b/pkgs/applications/misc/icesl/default.nix @@ -1,8 +1,8 @@ -{ stdenv, lib, fetchzip, freeglut, libXmu, libXi, libX11, libICE, libGLU, libGL, libSM +{ stdenv, lib, fetchzip, libglut, libXmu, libXi, libX11, libICE, libGLU, libGL, libSM , libXext, glibc, lua, luabind, glfw, libgccjit, dialog, makeWrapper }: let - lpath = lib.makeLibraryPath [ libXmu libXi libX11 freeglut libICE libGLU libGL libSM libXext glibc lua glfw luabind libgccjit ]; + lpath = lib.makeLibraryPath [ libXmu libXi libX11 libglut libICE libGLU libGL libSM libXext glibc lua glfw luabind libgccjit ]; in stdenv.mkDerivation rec { pname = "iceSL"; diff --git a/pkgs/applications/misc/imaginer/default.nix b/pkgs/applications/misc/imaginer/default.nix index 1b00bd0614bdf..374815cd4279c 100644 --- a/pkgs/applications/misc/imaginer/default.nix +++ b/pkgs/applications/misc/imaginer/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , appstream-glib , blueprint-compiler , desktop-file-utils diff --git a/pkgs/applications/misc/inherd-quake/default.nix b/pkgs/applications/misc/inherd-quake/default.nix index df47036b2d009..c71dae3b27e1b 100644 --- a/pkgs/applications/misc/inherd-quake/default.nix +++ b/pkgs/applications/misc/inherd-quake/default.nix @@ -19,13 +19,13 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-HKAR4LJm0lrQgTOCqtYIRFbO3qHtPbr4Fpx2ek1oJ4Q="; }; - cargoSha256 = "sha256-svvtZyfN91OT3yqxH6TgFhGYg9drpXsts4p2WqSHG8w="; + cargoHash = "sha256-svvtZyfN91OT3yqxH6TgFhGYg9drpXsts4p2WqSHG8w="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices Security ]; diff --git a/pkgs/applications/misc/inlyne/default.nix b/pkgs/applications/misc/inlyne/default.nix index a37f965dd5306..9f10136042293 100644 --- a/pkgs/applications/misc/inlyne/default.nix +++ b/pkgs/applications/misc/inlyne/default.nix @@ -15,24 +15,24 @@ rustPlatform.buildRustPackage rec { pname = "inlyne"; - version = "0.4.2"; + version = "0.4.3"; src = fetchFromGitHub { - owner = "trimental"; + owner = "Inlyne-Project"; repo = pname; rev = "v${version}"; - hash = "sha256-Kae8WnahA/6k6QT5htYU2+diAFkmxVsbVaxRUlhf39o="; + hash = "sha256-j4DEau7LZxIoVIIYwCUgqmkSgdRxWzF5/vOS0lvjgUk="; }; - cargoHash = "sha256-M6daK2y9HBRDV2wQjw87g1QYOqiJBfRf9uW1Eg6z6C8="; + cargoHash = "sha256-fMovzaP+R0CUwJy1HKATH2tPrIPwzGtubF1WHUoQDRY="; nativeBuildInputs = [ installShellFiles - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; - buildInputs = lib.optionals stdenv.isLinux [ + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ fontconfig xorg.libXcursor xorg.libXi @@ -41,32 +41,32 @@ rustPlatform.buildRustPackage rec { wayland libxkbcommon openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk_11_0.frameworks.AppKit ]; - checkFlags = lib.optionals stdenv.isDarwin [ + checkFlags = lib.optionals stdenv.hostPlatform.isDarwin [ # time out on darwin "--skip=interpreter::tests::centered_image_with_size_align_and_link" "--skip=watcher::tests::the_gauntlet" ]; - postInstall = '' + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd inlyne \ - --bash <($out/bin/inlyne --gen-completions bash) \ - --fish <($out/bin/inlyne --gen-completions fish) \ - --zsh <($out/bin/inlyne --gen-completions zsh) + --bash completions/inlyne.bash \ + --fish completions/inlyne.fish \ + --zsh completions/_inlyne ''; - postFixup = lib.optionalString stdenv.isLinux '' + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' patchelf $out/bin/inlyne \ --add-rpath ${lib.makeLibraryPath [ libGL xorg.libX11 ]} ''; meta = with lib; { description = "GPU powered browserless markdown viewer"; - homepage = "https://github.com/trimental/inlyne"; - changelog = "https://github.com/trimental/inlyne/releases/tag/${src.rev}"; + homepage = "https://github.com/Inlyne-Project/inlyne"; + changelog = "https://github.com/Inlyne-Project/inlyne/releases/tag/${src.rev}"; license = licenses.mit; maintainers = with maintainers; [ figsoda ]; mainProgram = "inlyne"; diff --git a/pkgs/applications/misc/inochi2d/default.nix b/pkgs/applications/misc/inochi2d/default.nix index 44a98ee40339b..a88c58d38555d 100644 --- a/pkgs/applications/misc/inochi2d/default.nix +++ b/pkgs/applications/misc/inochi2d/default.nix @@ -45,7 +45,7 @@ in meta = { # darwin has slightly different build steps - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; changelog = "https://github.com/Inochi2D/inochi-creator/releases/tag/${src.rev}"; description = "An open source editor for the Inochi2D puppet format"; }; @@ -73,7 +73,7 @@ in meta = { # darwin has slightly different build steps, aarch fails to build because of some lua related error - broken = stdenv.isDarwin || stdenv.isAarch64; + broken = stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isAarch64; changelog = "https://github.com/Inochi2D/inochi-session/releases/tag/${src.rev}"; description = "An application that allows streaming with Inochi2D puppets"; }; 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/insulator2/default.nix b/pkgs/applications/misc/insulator2/default.nix index b69a3c7fe88df..2fb8b15e3e947 100644 --- a/pkgs/applications/misc/insulator2/default.nix +++ b/pkgs/applications/misc/insulator2/default.nix @@ -1,5 +1,4 @@ { lib -, cmake , dbus , fetchFromGitHub , fetchYarnDeps @@ -13,12 +12,14 @@ , cyrus_sasl , stdenv , fixup_yarn_lock -, yarn +, yarnConfigHook , nodejs-slim , cargo-tauri , cargo , rustPlatform , rustc +, jq +, moreutils }: stdenv.mkDerivation rec { @@ -32,6 +33,11 @@ stdenv.mkDerivation rec { hash = "sha256-Bi9GCQr7yox5Plc7o0svRKYi1XoK/HDGj1VbW1z4jac="; }; + # Yarn *really* wants us to use corepack if this is set + postPatch = '' + jq 'del(.packageManager)' package.json | sponge package.json + ''; + yarnOfflineCache = fetchYarnDeps { yarnLock = "${src}/yarn.lock"; hash = "sha256-ih5NSOvYje981SkVfPHm/u2sS1B36kgxpfe9LmQaxdo="; @@ -47,37 +53,22 @@ stdenv.mkDerivation rec { }; }; - configurePhase = '' - export HOME=$(mktemp -d) - yarn config --offline set yarn-offline-mirror ${yarnOfflineCache} - fixup_yarn_lock yarn.lock - yarn install --offline --frozen-lockfile --ignore-scripts --no-progress --non-interactive - patchShebangs node_modules/ - yarn run postinstall --offline - ''; - - preBuild = '' - yarn tauri build -b deb - ''; - cargoRoot = "backend/"; - - preInstall = '' - mv backend/target/release/bundle/deb/*/data/usr/ "$out" - ''; + buildAndTestDir = cargoRoot; nativeBuildInputs = [ - cmake pkg-config perl rustPlatform.cargoSetupHook cargo rustc - cargo-tauri + cargo-tauri.hook fixup_yarn_lock - yarn + yarnConfigHook nodejs-slim cyrus_sasl + jq + moreutils # for sponge ]; buildInputs = [ diff --git a/pkgs/applications/misc/iptsd/default.nix b/pkgs/applications/misc/iptsd/default.nix index b6885374ef061..d4294a985a70f 100644 --- a/pkgs/applications/misc/iptsd/default.nix +++ b/pkgs/applications/misc/iptsd/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "iptsd"; - version = "2"; + version = "3"; src = fetchFromGitHub { owner = "linux-surface"; - repo = pname; - rev = "v${version}"; - hash = "sha256-zTXTyDgSa1akViDZlYLtJk1yCREGCSJKxzF+HZAWx0c="; + repo = "iptsd"; + rev = "refs/tags/v${version}"; + hash = "sha256-3z3A9qywmsSW1tlJ6LePC5wudM/FITTAFyuPkbHlid0="; }; nativeBuildInputs = [ @@ -47,13 +47,12 @@ stdenv.mkDerivation rec { # Original installs udev rules and service config into global paths postPatch = '' substituteInPlace etc/meson.build \ - --replace "install_dir: unitdir" "install_dir: '$out/etc/systemd/system'" \ - --replace "install_dir: rulesdir" "install_dir: '$out/etc/udev/rules.d'" - substituteInPlace etc/systemd/iptsd-find-service \ - --replace "iptsd-find-hidraw" "$out/bin/iptsd-find-hidraw" \ - --replace "systemd-escape" "${lib.getExe' systemd "systemd-escape"}" + --replace-fail "install_dir: unitdir" "install_dir: '$out/etc/systemd/system'" \ + --replace-fail "install_dir: rulesdir" "install_dir: '$out/etc/udev/rules.d'" + substituteInPlace etc/scripts/iptsd-find-service \ + --replace-fail "systemd-escape" "${lib.getExe' systemd "systemd-escape"}" substituteInPlace etc/udev/50-iptsd.rules.in \ - --replace "/bin/systemd-escape" "${lib.getExe' systemd "systemd-escape"}" + --replace-fail "/bin/systemd-escape" "${lib.getExe' systemd "systemd-escape"}" ''; mesonFlags = [ diff --git a/pkgs/applications/misc/itd/default.nix b/pkgs/applications/misc/itd/default.nix index ce95eb69bc4fc..772ebfc90d6cd 100644 --- a/pkgs/applications/misc/itd/default.nix +++ b/pkgs/applications/misc/itd/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , buildGoModule , fetchFromGitea }: 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/jekyll/basic/Gemfile.lock b/pkgs/applications/misc/jekyll/basic/Gemfile.lock index 2c7a76e29991f..4957ce2261733 100644 --- a/pkgs/applications/misc/jekyll/basic/Gemfile.lock +++ b/pkgs/applications/misc/jekyll/basic/Gemfile.lock @@ -1,7 +1,7 @@ GEM remote: https://rubygems.org/ specs: - activesupport (7.1.3.2) + activesupport (7.1.3.4) base64 bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) @@ -11,28 +11,29 @@ GEM minitest (>= 5.1) mutex_m tzinfo (~> 2.0) - addressable (2.8.6) - public_suffix (>= 2.0.2, < 6.0) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) base64 (0.2.0) - bigdecimal (3.1.7) + bigdecimal (3.1.8) colorator (1.1.0) - concurrent-ruby (1.2.3) + concurrent-ruby (1.3.3) connection_pool (2.4.1) drb (2.2.1) em-websocket (0.5.3) eventmachine (>= 0.12.9) http_parser.rb (~> 0) eventmachine (1.2.7) - ffi (1.16.3) + ffi (1.17.0) forwardable-extended (2.6.0) gemoji (4.1.0) - google-protobuf (4.26.1) + google-protobuf (4.27.2) + bigdecimal rake (>= 13) html-pipeline (2.14.3) activesupport (>= 2) nokogiri (>= 1.4) http_parser.rb (0.8.0) - i18n (1.14.4) + i18n (1.14.5) concurrent-ruby (~> 1.0) jekyll (4.3.3) addressable (~> 2.4) @@ -76,26 +77,28 @@ GEM rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) mercenary (0.4.0) - mini_portile2 (2.8.5) - minitest (5.22.3) + mini_portile2 (2.8.7) + minitest (5.24.0) mutex_m (0.2.0) - nokogiri (1.16.3) + nokogiri (1.16.6) mini_portile2 (~> 2.8.2) racc (~> 1.4) pathutil (0.16.2) forwardable-extended (~> 2.6) - public_suffix (5.0.4) - racc (1.7.3) - rake (13.1.0) + public_suffix (6.0.0) + racc (1.8.0) + rake (13.2.1) rb-fsevent (0.11.2) - rb-inotify (0.10.1) + rb-inotify (0.11.1) ffi (~> 1.0) - rexml (3.2.6) - rouge (4.2.1) + rexml (3.3.1) + strscan + rouge (4.3.0) safe_yaml (1.0.5) - sass-embedded (1.72.0) + sass-embedded (1.77.5) google-protobuf (>= 3.25, < 5.0) - rake (>= 13.0.0) + rake (>= 13) + strscan (3.1.0) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) tzinfo (2.0.6) @@ -115,4 +118,4 @@ DEPENDENCIES jemoji BUNDLED WITH - 2.5.6 + 2.5.11 diff --git a/pkgs/applications/misc/jekyll/basic/gemset.nix b/pkgs/applications/misc/jekyll/basic/gemset.nix index fc049e314e54a..f135bf6ccdef6 100644 --- a/pkgs/applications/misc/jekyll/basic/gemset.nix +++ b/pkgs/applications/misc/jekyll/basic/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0blbbf2x7dn7ar4g9aij403582zb6zscbj48bz63lvaamsvlb15d"; + sha256 = "0283wk1zxb76lg79dk501kcf5xy9h25qiw15m86s4nrfv11vqns5"; type = "gem"; }; - version = "7.1.3.2"; + version = "7.1.3.4"; }; addressable = { dependencies = ["public_suffix"]; @@ -16,10 +16,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0irbdwkkjwzajq1ip6ba46q49sxnrl2cw7ddkdhsfhb6aprnm3vr"; + sha256 = "0cl2qpvwiffym62z991ynks7imsm87qmgxf0yfsmlwzkgi9qcaa6"; type = "gem"; }; - version = "2.8.6"; + version = "2.8.7"; }; base64 = { groups = ["default"]; @@ -36,10 +36,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cq1c29zbkcxgdihqisirhcw76xc768z2zpd5vbccpq0l1lv76g7"; + sha256 = "1gi7zqgmqwi5lizggs1jhc3zlwaqayy9rx2ah80sxy24bbnng558"; type = "gem"; }; - version = "3.1.7"; + version = "3.1.8"; }; colorator = { groups = ["default"]; @@ -56,10 +56,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qh1b14jwbbj242klkyz5fc7npd4j0mvndz62gajhvl1l3wd7zc2"; + sha256 = "0skwdasxq7mnlcccn6aqabl7n9r3jd7k19ryzlzzip64cn4x572g"; type = "gem"; }; - version = "1.2.3"; + version = "1.3.3"; }; connection_pool = { groups = ["default"]; @@ -107,10 +107,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yvii03hcgqj30maavddqamqy50h7y6xcn2wcyq72wn823zl4ckd"; + sha256 = "07139870npj59jnl8vmk39ja3gdk3fb5z9vc0lf32y2h891hwqsi"; type = "gem"; }; - version = "1.16.3"; + version = "1.17.0"; }; forwardable-extended = { groups = ["default"]; @@ -133,15 +133,15 @@ version = "4.1.0"; }; google-protobuf = { - dependencies = ["rake"]; + dependencies = ["bigdecimal" "rake"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14s40yxj35vixx9pvpnbrkz9z7ga3m7vcy72yll1flnn3cirl1aj"; + sha256 = "0vwnr6fmxig4pkag86yzbznpxk8ii7rhjz0rrprkqvnymhhfnscz"; type = "gem"; }; - version = "4.26.1"; + version = "4.27.2"; }; html-pipeline = { dependencies = ["activesupport" "nokogiri"]; @@ -170,10 +170,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lbm33fpb3w06wd2231sg58dwlwgjsvym93m548ajvl6s3mfvpn7"; + sha256 = "1ffix518y7976qih9k1lgnc17i3v6yrlh0a3mckpxdb4wc2vrp16"; type = "gem"; }; - version = "1.14.4"; + version = "1.14.5"; }; jekyll = { dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "kramdown-parser-gfm" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml" "terminal-table" "webrick"]; @@ -321,20 +321,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1kl9c3kdchjabrihdqfmcplk3lq4cw1rr9f378y6q22qwy5dndvs"; + sha256 = "1q1f2sdw3y3y9mnym9dhjgsjr72sq975cfg5c4yx7gwv8nmzbvhk"; type = "gem"; }; - version = "2.8.5"; + version = "2.8.7"; }; minitest = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07lq26b86giy3ha3fhrywk9r1ajhc2pm2mzj657jnpnbj1i6g17a"; + sha256 = "0zgq31wa0ygqnmpqh3plsig32xc8k4l99r49ncmidfg91kfagymg"; type = "gem"; }; - version = "5.22.3"; + version = "5.24.0"; }; mutex_m = { groups = ["default"]; @@ -352,10 +352,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0j72sg8n8834vbw2x8glcp46y5r2dls2pj64ll7rmf6mri9s52j9"; + sha256 = "1vz1ychq2fhfqjgqdrx8bqkaxg5dzcgwnah00m57ydylczfy8pwk"; type = "gem"; }; - version = "1.16.3"; + version = "1.16.6"; }; pathutil = { dependencies = ["forwardable-extended"]; @@ -373,30 +373,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bni4qjrsh2q49pnmmd6if4iv3ak36bd2cckrs6npl111n769k9m"; + sha256 = "17m8q2dzm7a74amnab5rf3f3m466i300awihl3ygh4v80wpf3j6j"; type = "gem"; }; - version = "5.0.4"; + version = "6.0.0"; }; racc = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01b9662zd2x9bp4rdjfid07h09zxj7kvn7f5fghbqhzc625ap1dp"; + sha256 = "021s7maw0c4d9a6s07vbmllrzqsj2sgmrwimlh8ffkvwqdjrld09"; type = "gem"; }; - version = "1.7.3"; + version = "1.8.0"; }; rake = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ilr853hawi09626axx0mps4rkkmxcs54mapz9jnqvpnlwd3wsmy"; + sha256 = "17850wcwkgi30p7yqh60960ypn7yibacjjha0av78zaxwvd3ijs6"; type = "gem"; }; - version = "13.1.0"; + version = "13.2.1"; }; rb-fsevent = { groups = ["default"]; @@ -414,30 +414,31 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jm76h8f8hji38z3ggf4bzi8vps6p7sagxn3ab57qc0xyga64005"; + sha256 = "0vmy8xgahixcz6hzwy4zdcyn2y6d6ri8dqv5xccgzc1r292019x0"; type = "gem"; }; - version = "0.10.1"; + version = "0.11.1"; }; rexml = { + dependencies = ["strscan"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05i8518ay14kjbma550mv0jm8a6di8yp5phzrd8rj44z9qnrlrp0"; + sha256 = "09f3sw7f846fpcpwdm362ylqldwqxpym6z0qpld4av7zisrrzbrl"; type = "gem"; }; - version = "3.2.6"; + version = "3.3.1"; }; rouge = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zd1pdldi6h8x27dqim7cy8m69xr01aw5c8k1zhkz497n4np6wgk"; + sha256 = "072qvvrcqj0yfr3b0j932mlhvn41i38bq37z7z07i3ikagndkqwy"; type = "gem"; }; - version = "4.2.1"; + version = "4.3.0"; }; safe_yaml = { groups = ["default"]; @@ -455,10 +456,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bixk8c02dhflvhi4s5hxzjg8akzgicvjxjvxx74nah2j8qfblq5"; + sha256 = "1nmy052pm46781s7ca6x3l4yb5p3glh8sf201xwcwpk9rv2av9m2"; type = "gem"; }; - version = "1.72.0"; + version = "1.77.5"; + }; + strscan = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0mamrl7pxacbc79ny5hzmakc9grbjysm3yy6119ppgsg44fsif01"; + type = "gem"; + }; + version = "3.1.0"; }; terminal-table = { dependencies = ["unicode-display_width"]; diff --git a/pkgs/applications/misc/jekyll/default.nix b/pkgs/applications/misc/jekyll/default.nix index 8eaf05298e892..263acefe7cb6d 100644 --- a/pkgs/applications/misc/jekyll/default.nix +++ b/pkgs/applications/misc/jekyll/default.nix @@ -51,7 +51,7 @@ in bundlerApp { homepage = "https://jekyllrb.com/"; #changelog = "https://raw.githubusercontent.com/jekyll/jekyll/v${version}/History.markdown"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = platforms.unix; mainProgram = "jekyll"; }; diff --git a/pkgs/applications/misc/jekyll/full/Gemfile b/pkgs/applications/misc/jekyll/full/Gemfile index 5e7e2d9032a37..5f095debe6d66 100644 --- a/pkgs/applications/misc/jekyll/full/Gemfile +++ b/pkgs/applications/misc/jekyll/full/Gemfile @@ -10,6 +10,7 @@ gem "jemoji" # Optional dependencies: gem "jekyll-coffeescript" +gem "jekyll-compose" #gem "jekyll-docs" gem "jekyll-favicon" gem "jekyll-feed", "~> 0.9" diff --git a/pkgs/applications/misc/jekyll/full/Gemfile.lock b/pkgs/applications/misc/jekyll/full/Gemfile.lock index c9cae601691ac..de800bfeb75d8 100644 --- a/pkgs/applications/misc/jekyll/full/Gemfile.lock +++ b/pkgs/applications/misc/jekyll/full/Gemfile.lock @@ -1,7 +1,7 @@ GEM remote: https://rubygems.org/ specs: - activesupport (7.1.3.2) + activesupport (7.1.3.4) base64 bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) @@ -11,10 +11,10 @@ GEM minitest (>= 5.1) mutex_m tzinfo (~> 2.0) - addressable (2.8.6) - public_suffix (>= 2.0.2, < 6.0) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) base64 (0.2.0) - bigdecimal (3.1.7) + bigdecimal (3.1.8) classifier-reborn (2.3.0) fast-stemmer (~> 1.0) matrix (~> 0.4) @@ -24,7 +24,7 @@ GEM execjs coffee-script-source (1.12.2) colorator (1.1.0) - concurrent-ruby (1.2.3) + concurrent-ruby (1.3.3) connection_pool (2.4.1) drb (2.2.1) em-websocket (0.5.3) @@ -32,21 +32,22 @@ GEM http_parser.rb (~> 0) eventmachine (1.2.7) execjs (2.9.1) - faraday (2.9.0) + faraday (2.9.2) faraday-net_http (>= 2.0, < 3.2) faraday-net_http (3.1.0) net-http fast-stemmer (1.0.2) - ffi (1.16.3) + ffi (1.17.0) forwardable-extended (2.6.0) gemoji (4.1.0) - google-protobuf (4.26.1) + google-protobuf (4.27.2) + bigdecimal rake (>= 13) html-pipeline (2.14.3) activesupport (>= 2) nokogiri (>= 1.4) http_parser.rb (0.8.0) - i18n (1.14.4) + i18n (1.14.5) concurrent-ruby (~> 1.0) jekyll (4.3.3) addressable (~> 2.4) @@ -69,6 +70,8 @@ GEM jekyll-coffeescript (2.0.0) coffee-script (~> 2.2) coffee-script-source (~> 1.12) + jekyll-compose (0.12.0) + jekyll (>= 3.7, < 5.0) jekyll-favicon (1.1.0) jekyll (>= 3.0, < 5.0) mini_magick (~> 4.11) @@ -114,14 +117,14 @@ GEM mercenary (0.4.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0305) - mini_magick (4.12.0) - mini_portile2 (2.8.5) - minitest (5.22.3) + mime-types-data (3.2024.0604) + mini_magick (4.13.1) + mini_portile2 (2.8.7) + minitest (5.24.0) mutex_m (0.2.0) net-http (0.4.1) uri - nokogiri (1.16.3) + nokogiri (1.16.6) mini_portile2 (~> 2.8.2) racc (~> 1.4) octokit (4.25.1) @@ -131,24 +134,26 @@ GEM forwardable-extended (~> 2.6) psych (5.1.2) stringio - public_suffix (5.0.4) - racc (1.7.3) - rake (13.1.0) + public_suffix (6.0.0) + racc (1.8.0) + rake (13.2.1) rb-fsevent (0.11.2) - rb-inotify (0.10.1) + rb-inotify (0.11.1) ffi (~> 1.0) - rdoc (6.6.3.1) + rdoc (6.7.0) psych (>= 4.0.0) - rexml (3.2.6) - rouge (4.2.1) + rexml (3.3.1) + strscan + rouge (4.3.0) safe_yaml (1.0.5) - sass-embedded (1.72.0) + sass-embedded (1.77.5) google-protobuf (>= 3.25, < 5.0) - rake (>= 13.0.0) + rake (>= 13) sawyer (0.9.2) addressable (>= 2.3.5) faraday (>= 0.17.3, < 3) - stringio (3.1.0) + stringio (3.1.1) + strscan (3.1.0) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) tomlrb (1.3.0) @@ -167,6 +172,7 @@ DEPENDENCIES jekyll jekyll-avatar jekyll-coffeescript + jekyll-compose jekyll-favicon jekyll-feed (~> 0.9) jekyll-gist @@ -185,4 +191,4 @@ DEPENDENCIES yajl-ruby (~> 1.4) BUNDLED WITH - 2.5.6 + 2.5.11 diff --git a/pkgs/applications/misc/jekyll/full/gemset.nix b/pkgs/applications/misc/jekyll/full/gemset.nix index d81dee1136a0d..4260c081f19c4 100644 --- a/pkgs/applications/misc/jekyll/full/gemset.nix +++ b/pkgs/applications/misc/jekyll/full/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0blbbf2x7dn7ar4g9aij403582zb6zscbj48bz63lvaamsvlb15d"; + sha256 = "0283wk1zxb76lg79dk501kcf5xy9h25qiw15m86s4nrfv11vqns5"; type = "gem"; }; - version = "7.1.3.2"; + version = "7.1.3.4"; }; addressable = { dependencies = ["public_suffix"]; @@ -16,10 +16,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0irbdwkkjwzajq1ip6ba46q49sxnrl2cw7ddkdhsfhb6aprnm3vr"; + sha256 = "0cl2qpvwiffym62z991ynks7imsm87qmgxf0yfsmlwzkgi9qcaa6"; type = "gem"; }; - version = "2.8.6"; + version = "2.8.7"; }; base64 = { groups = ["default"]; @@ -36,10 +36,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cq1c29zbkcxgdihqisirhcw76xc768z2zpd5vbccpq0l1lv76g7"; + sha256 = "1gi7zqgmqwi5lizggs1jhc3zlwaqayy9rx2ah80sxy24bbnng558"; type = "gem"; }; - version = "3.1.7"; + version = "3.1.8"; }; classifier-reborn = { dependencies = ["fast-stemmer" "matrix"]; @@ -110,10 +110,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qh1b14jwbbj242klkyz5fc7npd4j0mvndz62gajhvl1l3wd7zc2"; + sha256 = "0skwdasxq7mnlcccn6aqabl7n9r3jd7k19ryzlzzip64cn4x572g"; type = "gem"; }; - version = "1.2.3"; + version = "1.3.3"; }; connection_pool = { groups = ["default"]; @@ -172,10 +172,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qqb1rmk0f9m82iijjlqadh5yby1bhnr6svjk9vxdvh6f181988s"; + sha256 = "1913fk7szy3bj8mf1dxs4waym5ya5fzzc5d3a8z24qs67fzfv5b5"; type = "gem"; }; - version = "2.9.0"; + version = "2.9.2"; }; faraday-net_http = { dependencies = ["net-http"]; @@ -215,10 +215,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yvii03hcgqj30maavddqamqy50h7y6xcn2wcyq72wn823zl4ckd"; + sha256 = "07139870npj59jnl8vmk39ja3gdk3fb5z9vc0lf32y2h891hwqsi"; type = "gem"; }; - version = "1.16.3"; + version = "1.17.0"; }; forwardable-extended = { groups = ["default"]; @@ -241,15 +241,15 @@ version = "4.1.0"; }; google-protobuf = { - dependencies = ["rake"]; + dependencies = ["bigdecimal" "rake"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14s40yxj35vixx9pvpnbrkz9z7ga3m7vcy72yll1flnn3cirl1aj"; + sha256 = "0vwnr6fmxig4pkag86yzbznpxk8ii7rhjz0rrprkqvnymhhfnscz"; type = "gem"; }; - version = "4.26.1"; + version = "4.27.2"; }; html-pipeline = { dependencies = ["activesupport" "nokogiri"]; @@ -278,10 +278,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lbm33fpb3w06wd2231sg58dwlwgjsvym93m548ajvl6s3mfvpn7"; + sha256 = "1ffix518y7976qih9k1lgnc17i3v6yrlh0a3mckpxdb4wc2vrp16"; type = "gem"; }; - version = "1.14.4"; + version = "1.14.5"; }; jekyll = { dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "kramdown-parser-gfm" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml" "terminal-table" "webrick"]; @@ -316,6 +316,17 @@ }; version = "2.0.0"; }; + jekyll-compose = { + dependencies = ["jekyll"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ny8xps0mrmx2w0xxc9rwa15ch1wkxvdrzxiwnqramqwja566y04"; + type = "gem"; + }; + version = "0.12.0"; + }; jekyll-favicon = { dependencies = ["jekyll" "mini_magick" "rexml"]; groups = ["default"]; @@ -584,40 +595,40 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00x7w5xqsj9m33v3vkmy23wipkkysafksib53ypzn27p5g81w455"; + sha256 = "0rri45lldyk3bsg4yqpxcl1xrnxnqasnw94x03w5arq3yy7kff65"; type = "gem"; }; - version = "3.2024.0305"; + version = "3.2024.0604"; }; mini_magick = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0slh78f9z6n0l1i2km7m48yz7l4fjrk88sj1f4mh1wb39sl2yc37"; + sha256 = "1zbfldqc3dp9fiyz9d4hkkabkvsmx5649bs78j5008i5gzr0x6zg"; type = "gem"; }; - version = "4.12.0"; + version = "4.13.1"; }; mini_portile2 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1kl9c3kdchjabrihdqfmcplk3lq4cw1rr9f378y6q22qwy5dndvs"; + sha256 = "1q1f2sdw3y3y9mnym9dhjgsjr72sq975cfg5c4yx7gwv8nmzbvhk"; type = "gem"; }; - version = "2.8.5"; + version = "2.8.7"; }; minitest = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07lq26b86giy3ha3fhrywk9r1ajhc2pm2mzj657jnpnbj1i6g17a"; + sha256 = "0zgq31wa0ygqnmpqh3plsig32xc8k4l99r49ncmidfg91kfagymg"; type = "gem"; }; - version = "5.22.3"; + version = "5.24.0"; }; mutex_m = { groups = ["default"]; @@ -646,10 +657,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0j72sg8n8834vbw2x8glcp46y5r2dls2pj64ll7rmf6mri9s52j9"; + sha256 = "1vz1ychq2fhfqjgqdrx8bqkaxg5dzcgwnah00m57ydylczfy8pwk"; type = "gem"; }; - version = "1.16.3"; + version = "1.16.6"; }; octokit = { dependencies = ["faraday" "sawyer"]; @@ -689,30 +700,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bni4qjrsh2q49pnmmd6if4iv3ak36bd2cckrs6npl111n769k9m"; + sha256 = "17m8q2dzm7a74amnab5rf3f3m466i300awihl3ygh4v80wpf3j6j"; type = "gem"; }; - version = "5.0.4"; + version = "6.0.0"; }; racc = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01b9662zd2x9bp4rdjfid07h09zxj7kvn7f5fghbqhzc625ap1dp"; + sha256 = "021s7maw0c4d9a6s07vbmllrzqsj2sgmrwimlh8ffkvwqdjrld09"; type = "gem"; }; - version = "1.7.3"; + version = "1.8.0"; }; rake = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ilr853hawi09626axx0mps4rkkmxcs54mapz9jnqvpnlwd3wsmy"; + sha256 = "17850wcwkgi30p7yqh60960ypn7yibacjjha0av78zaxwvd3ijs6"; type = "gem"; }; - version = "13.1.0"; + version = "13.2.1"; }; rb-fsevent = { groups = ["default"]; @@ -730,10 +741,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jm76h8f8hji38z3ggf4bzi8vps6p7sagxn3ab57qc0xyga64005"; + sha256 = "0vmy8xgahixcz6hzwy4zdcyn2y6d6ri8dqv5xccgzc1r292019x0"; type = "gem"; }; - version = "0.10.1"; + version = "0.11.1"; }; rdoc = { dependencies = ["psych"]; @@ -741,30 +752,31 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ib3cnf4yllvw070gr4bz94sbmqx3haqc5f846fsvdcs494vgxrr"; + sha256 = "0ygk2zk0ky3d88v3ll7qh6xqvbvw5jin0hqdi1xkv1dhaw7myzdi"; type = "gem"; }; - version = "6.6.3.1"; + version = "6.7.0"; }; rexml = { + dependencies = ["strscan"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05i8518ay14kjbma550mv0jm8a6di8yp5phzrd8rj44z9qnrlrp0"; + sha256 = "09f3sw7f846fpcpwdm362ylqldwqxpym6z0qpld4av7zisrrzbrl"; type = "gem"; }; - version = "3.2.6"; + version = "3.3.1"; }; rouge = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zd1pdldi6h8x27dqim7cy8m69xr01aw5c8k1zhkz497n4np6wgk"; + sha256 = "072qvvrcqj0yfr3b0j932mlhvn41i38bq37z7z07i3ikagndkqwy"; type = "gem"; }; - version = "4.2.1"; + version = "4.3.0"; }; safe_yaml = { groups = ["default"]; @@ -782,10 +794,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bixk8c02dhflvhi4s5hxzjg8akzgicvjxjvxx74nah2j8qfblq5"; + sha256 = "1nmy052pm46781s7ca6x3l4yb5p3glh8sf201xwcwpk9rv2av9m2"; type = "gem"; }; - version = "1.72.0"; + version = "1.77.5"; }; sawyer = { dependencies = ["addressable" "faraday"]; @@ -803,7 +815,17 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "063psvsn1aq6digpznxfranhcpmi0sdv2jhra5g0459sw0x2dxn1"; + sha256 = "07mfqb40b2wh53k33h91zva78f9zwcdnl85jiq74wnaw2wa6wiak"; + type = "gem"; + }; + version = "3.1.1"; + }; + strscan = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0mamrl7pxacbc79ny5hzmakc9grbjysm3yy6119ppgsg44fsif01"; type = "gem"; }; version = "3.1.0"; diff --git a/pkgs/applications/misc/jekyll/update.sh b/pkgs/applications/misc/jekyll/update.sh index 650f3993f51e3..6d97872e2bf64 100755 --- a/pkgs/applications/misc/jekyll/update.sh +++ b/pkgs/applications/misc/jekyll/update.sh @@ -1,13 +1,12 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p bundix zlib libyaml -set -o errexit -set -o nounset +set -o errexit -o nounset -readonly BASEDIR="$(dirname $(readlink -f $0))" +script_dir=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd) for directory in "basic" "full"; do - pushd "$BASEDIR/$directory" + pushd "$script_dir/$directory" rm -f Gemfile.lock gemset.nix BUNDLE_FORCE_RUBY_PLATFORM=true bundix --magic rm -rf .bundle vendor diff --git a/pkgs/applications/misc/joplin-desktop/default.nix b/pkgs/applications/misc/joplin-desktop/default.nix index 219f15936fb9b..7f85685679e14 100644 --- a/pkgs/applications/misc/joplin-desktop/default.nix +++ b/pkgs/applications/misc/joplin-desktop/default.nix @@ -1,8 +1,8 @@ -{ lib, stdenv, appimageTools, fetchurl, makeWrapper, undmg }: +{ lib, stdenv, appimageTools, fetchurl, makeWrapper, _7zz }: let pname = "joplin-desktop"; - version = "2.14.17"; + version = "3.0.15"; inherit (stdenv.hostPlatform) system; throwSystem = throw "Unsupported system: ${system}"; @@ -16,9 +16,9 @@ let src = fetchurl { url = "https://github.com/laurent22/joplin/releases/download/v${version}/Joplin-${version}${suffix}"; sha256 = { - x86_64-linux = "sha256-u4wEchyljurmwVZsRnmUBITZUR6SxDxyGczZjXNsJkg="; - x86_64-darwin = "sha256-KjNwAnJZGX/DvHDPw15vGlSbJ47s6YT59EalARt1mx4="; - aarch64-darwin = "sha256-OYpsHPI+7riMVNAp2JpBlmdFdJUSNqNvBmeYHDw6yzY="; + x86_64-linux = "sha256-rNKYihIbdfGZEIGURyty+hS82ftHsqV1YjqM8VYB6RU="; + x86_64-darwin = "sha256-s7gZSr/5VOg8bqxGPckK7UxDpvmsNgdhjDg+lxnO/lU="; + aarch64-darwin = "sha256-UzAGYIKd5swtl6XNFVTPeg0nqwKKtu0e36+LA0Qiusw="; }.${system} or throwSystem; }; @@ -39,18 +39,18 @@ let homepage = "https://joplinapp.org"; license = licenses.agpl3Plus; maintainers = with maintainers; [ hugoreeves qjoly ]; - platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin"]; + platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ]; }; linux = appimageTools.wrapType2 rec { inherit pname version src meta; + nativeBuildInputs = [ makeWrapper ]; profile = '' export LC_ALL=C.UTF-8 ''; extraInstallCommands = '' - source "${makeWrapper}/nix-support/setup-hook" wrapProgram $out/bin/${pname} \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations}}" install -Dm444 ${appimageContents}/@joplinapp-desktop.desktop -t $out/share/applications @@ -64,7 +64,7 @@ let darwin = stdenv.mkDerivation { inherit pname version src meta; - nativeBuildInputs = [ undmg ]; + nativeBuildInputs = [ _7zz ]; sourceRoot = "Joplin.app"; @@ -74,6 +74,6 @@ let ''; }; in -if stdenv.isDarwin +if stdenv.hostPlatform.isDarwin then darwin else linux diff --git a/pkgs/applications/misc/jotta-cli/default.nix b/pkgs/applications/misc/jotta-cli/default.nix index b2239298d1a29..4130f7867a75f 100644 --- a/pkgs/applications/misc/jotta-cli/default.nix +++ b/pkgs/applications/misc/jotta-cli/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip }: +{ lib, stdenv, fetchzip, nixosTests }: let arch = "amd64"; @@ -23,6 +23,8 @@ stdenv.mkDerivation rec { $out/bin/jotta-cli completion bash > $out/share/bash-completion/completions/jotta-cli.bash ''; + passthru.tests = { inherit (nixosTests) jotta-cli; }; + meta = with lib; { description = "Jottacloud CLI"; homepage = "https://www.jottacloud.com/"; diff --git a/pkgs/applications/misc/jp2a/default.nix b/pkgs/applications/misc/jp2a/default.nix index 7702468768167..f55b435a4b613 100644 --- a/pkgs/applications/misc/jp2a/default.nix +++ b/pkgs/applications/misc/jp2a/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { installFlags = [ "bashcompdir=\${out}/share/bash-completion/completions" ]; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; homepage = "https://csl.name/jp2a/"; description = "Small utility that converts JPG images to ASCII"; license = licenses.gpl2Only; diff --git a/pkgs/applications/misc/junction/default.nix b/pkgs/applications/misc/junction/default.nix index c59b8067b26ca..cf03a315b2cfa 100644 --- a/pkgs/applications/misc/junction/default.nix +++ b/pkgs/applications/misc/junction/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "junction"; - version = "1.7"; + version = "1.8"; src = fetchFromGitHub { owner = "sonnyp"; repo = "junction"; rev = "v${version}"; - sha256 = "sha256-qPseu2rzK6xp7eb/SrWK6fML/6xh4raP0MEreyZgqVI="; + hash = "sha256-0zY6Dp0aKHtBHSTiGbI5o6876BsARbo8/BbArl0RaMY="; fetchSubmodules = true; }; @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { meta = with lib; { mainProgram = "re.sonny.Junction"; description = "Choose the application to open files and links"; - homepage = "https://apps.gnome.org/en/app/re.sonny.Junction/"; + homepage = "https://apps.gnome.org/Junction/"; license = licenses.gpl3Only; maintainers = with maintainers; [ hqurve ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/kbt/default.nix b/pkgs/applications/misc/kbt/default.nix index c59b5e62c4339..8a7e91ba3c7dd 100644 --- a/pkgs/applications/misc/kbt/default.nix +++ b/pkgs/applications/misc/kbt/default.nix @@ -20,13 +20,13 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-6zD9WRPWEt0ubppaMRTOusy0zm3z6SGB/5/kMxcJ/Ag="; - nativeBuildInputs = lib.optionals stdenv.isLinux [ + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ xorg.libX11 ]; diff --git a/pkgs/applications/misc/keepassxc/default.nix b/pkgs/applications/misc/keepassxc/default.nix index ec633ac7514b9..914884a9aa2b6 100644 --- a/pkgs/applications/misc/keepassxc/default.nix +++ b/pkgs/applications/misc/keepassxc/default.nix @@ -5,8 +5,9 @@ , qttools , asciidoctor -, botan2 +, botan3 , curl +, kio , libXi , libXtst , libargon2 @@ -53,10 +54,10 @@ stdenv.mkDerivation rec { env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang (toString [ "-Wno-old-style-cast" "-Wno-error" - "-D__BIG_ENDIAN__=${if stdenv.isBigEndian then "1" else "0"}" + "-D__BIG_ENDIAN__=${if stdenv.hostPlatform.isBigEndian then "1" else "0"}" ]); - NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-rpath ${libargon2}/lib"; + NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-rpath ${libargon2}/lib"; patches = [ ./darwin.patch @@ -68,8 +69,8 @@ stdenv.mkDerivation rec { "-DWITH_XC_UPDATECHECK=OFF" ] ++ (lib.optional (!withKeePassX11) "-DWITH_XC_X11=OFF") - ++ (lib.optional (withKeePassFDOSecrets && stdenv.isLinux) "-DWITH_XC_FDOSECRETS=ON") - ++ (lib.optional (withKeePassYubiKey && stdenv.isLinux) "-DWITH_XC_YUBIKEY=ON") + ++ (lib.optional (withKeePassFDOSecrets && stdenv.hostPlatform.isLinux) "-DWITH_XC_FDOSECRETS=ON") + ++ (lib.optional (withKeePassYubiKey && stdenv.hostPlatform.isLinux) "-DWITH_XC_YUBIKEY=ON") ++ (lib.optional withKeePassBrowser "-DWITH_XC_BROWSER=ON") ++ (lib.optional withKeePassBrowserPasskeys "-DWITH_XC_BROWSER_PASSKEYS=ON") ++ (lib.optional withKeePassKeeShare "-DWITH_XC_KEESHARE=ON") @@ -85,7 +86,7 @@ stdenv.mkDerivation rec { export QT_PLUGIN_PATH="${qtbase.bin}/${qtbase.qtPluginPrefix}" # testcli, testgui and testkdbx4 are flaky - skip them all # testautotype on darwin throws "QWidget: Cannot create a QWidget without QApplication" - make test ARGS+="-E 'testcli|testgui${lib.optionalString stdenv.isDarwin "|testautotype|testkdbx4"}' --output-on-failure" + make test ARGS+="-E 'testcli|testgui${lib.optionalString stdenv.hostPlatform.isDarwin "|testautotype|testkdbx4"}' --output-on-failure" runHook postCheck ''; @@ -97,12 +98,12 @@ stdenv.mkDerivation rec { qttools pkg-config ] - ++ lib.optional (!stdenv.isDarwin) wrapGAppsHook3; + ++ lib.optional (!stdenv.hostPlatform.isDarwin) wrapGAppsHook3; dontWrapGApps = true; preFixup = '' qtWrapperArgs+=("''${gappsWrapperArgs[@]}") - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' wrapQtApp "$out/Applications/KeePassXC.app/Contents/MacOS/KeePassXC" ''; @@ -114,7 +115,8 @@ stdenv.mkDerivation rec { buildInputs = [ curl - botan2 + botan3 + kio libXi libXtst libargon2 @@ -126,9 +128,9 @@ stdenv.mkDerivation rec { readline zlib ] - ++ lib.optional (stdenv.isDarwin && withKeePassTouchID) LocalAuthentication - ++ lib.optional stdenv.isDarwin qtmacextras - ++ lib.optional stdenv.isLinux libusb1 + ++ lib.optional (stdenv.hostPlatform.isDarwin && withKeePassTouchID) LocalAuthentication + ++ lib.optional stdenv.hostPlatform.isDarwin qtmacextras + ++ lib.optional stdenv.hostPlatform.isLinux libusb1 ++ lib.optional withKeePassX11 qtx11extras; passthru.tests = nixosTests.keepassxc; @@ -144,7 +146,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://keepassxc.org/"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ jonafato blankparticle ]; + maintainers = with maintainers; [ blankparticle ]; platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/applications/misc/keeweb/default.nix b/pkgs/applications/misc/keeweb/default.nix deleted file mode 100644 index a7260dc509b72..0000000000000 --- a/pkgs/applications/misc/keeweb/default.nix +++ /dev/null @@ -1,118 +0,0 @@ -{ lib -, stdenv -, fetchurl -, undmg -, dpkg -, autoPatchelfHook -, wrapGAppsHook3 -, makeWrapper -, alsa-lib -, at-spi2-atk -, gdk-pixbuf -, glibc -, nss -, udev -, xorg -, gnome -, mesa -, gtk3 -, libusb1 -, libsecret -, libappindicator -, xdotool -}: -let - pname = "keeweb"; - version = "1.18.7"; - - srcs = { - x86_64-linux = fetchurl { - url = "https://github.com/keeweb/keeweb/releases/download/v${version}/KeeWeb-${version}.linux.x64.deb"; - hash = "sha256-/U+vn5TLIU9/J6cRFjuAdyGzlwC04mp4L2X2ETp+ZSE="; - }; - x86_64-darwin = fetchurl { - url = "https://github.com/keeweb/keeweb/releases/download/v${version}/KeeWeb-${version}.mac.x64.dmg"; - hash = "sha256-+ZFGrrw0tZ7F6lb/3iBIyGD+tp1puVhkPv10hfp6ATU="; - }; - aarch64-darwin = fetchurl { - url = "https://github.com/keeweb/keeweb/releases/download/v${version}/KeeWeb-${version}.mac.arm64.dmg"; - hash = "sha256-bkhwsWYLkec16vMOfXUce7jfrmI9W2xHiZvU1asebK4="; - }; - }; - src = srcs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - - libraries = [ - alsa-lib - at-spi2-atk - gdk-pixbuf - nss - udev - xorg.libX11 - xorg.libXcomposite - xorg.libXext - xorg.libXrandr - xorg.libXScrnSaver - xorg.libXtst - xorg.libxshmfence - gnome.gnome-keyring - mesa - gtk3 - libusb1 - libsecret - libappindicator - xdotool - ]; - - meta = with lib; { - description = "Free cross-platform password manager compatible with KeePass"; - mainProgram = "keeweb"; - homepage = "https://keeweb.info/"; - changelog = "https://github.com/keeweb/keeweb/blob/v${version}/release-notes.md"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.mit; - maintainers = with maintainers; [ sikmir ]; - platforms = builtins.attrNames srcs; - }; -in -if stdenv.isDarwin -then stdenv.mkDerivation { - inherit pname version src meta; - - nativeBuildInputs = [ undmg ]; - - sourceRoot = "."; - - installPhase = '' - mkdir -p $out/Applications - cp -r *.app $out/Applications - ''; -} -else stdenv.mkDerivation { - inherit pname version src meta; - - nativeBuildInputs = [ - autoPatchelfHook - wrapGAppsHook3 - makeWrapper - ]; - - buildInputs = libraries; - - unpackPhase = '' - ${dpkg}/bin/dpkg-deb --fsys-tarfile $src | tar --extract - ''; - - installPhase = '' - runHook preInstall - - mkdir -p $out/bin - cp -r usr/share $out/share - - makeWrapper $out/share/keeweb-desktop/keeweb $out/bin/keeweb \ - --argv0 "keeweb" \ - --add-flags "$out/share/keeweb-desktop/resources/app.asar" \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath libraries}" - - runHook postInstall - ''; -} diff --git a/pkgs/applications/misc/kemai/default.nix b/pkgs/applications/misc/kemai/default.nix index 70941045ce368..7ad3afc16ce57 100644 --- a/pkgs/applications/misc/kemai/default.nix +++ b/pkgs/applications/misc/kemai/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ poelzi ]; platforms = platforms.unix; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; mainProgram = "Kemai"; }; } diff --git a/pkgs/applications/misc/keylight-controller-mschneider82/default.nix b/pkgs/applications/misc/keylight-controller-mschneider82/default.nix index 0ae96fcf6115d..bbccddbadbad3 100644 --- a/pkgs/applications/misc/keylight-controller-mschneider82/default.nix +++ b/pkgs/applications/misc/keylight-controller-mschneider82/default.nix @@ -41,7 +41,7 @@ buildGoModule rec { ''; license = licenses.mit; homepage = "https://github.com/mschneider82/keylight-control"; - maintainers = with maintainers; [ ]; + maintainers = [ ]; mainProgram = "keylight-control"; }; } diff --git a/pkgs/applications/misc/keymapp/default.nix b/pkgs/applications/misc/keymapp/default.nix deleted file mode 100644 index 59dae9589fa7a..0000000000000 --- a/pkgs/applications/misc/keymapp/default.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ stdenv -, lib -, fetchurl -, autoPatchelfHook -, wrapGAppsHook3 -, libusb1 -, webkitgtk -, gtk3 -, writeShellScript -, makeDesktopItem -, copyDesktopItems -}: -let - desktopItem = makeDesktopItem { - name = "keymapp"; - icon = "keymapp"; - desktopName = "Keymapp"; - categories = [ "Settings" "HardwareSettings" ]; - type = "Application"; - exec = "keymapp"; - }; -in -stdenv.mkDerivation rec { - pname = "keymapp"; - version = "1.1.1"; - - src = fetchurl { - url = "https://oryx.nyc3.cdn.digitaloceanspaces.com/keymapp/keymapp-${version}.tar.gz"; - hash = "sha256-tbRlJ65hHPBDwoXAXf++OdcW67RcqR1x1vfhbPCo1Ls="; - }; - - nativeBuildInputs = [ - copyDesktopItems - autoPatchelfHook - wrapGAppsHook3 - ]; - - buildInputs = [ - libusb1 - webkitgtk - gtk3 - ]; - - sourceRoot = "."; - - installPhase = '' - runHook preInstall - - install -m755 -D keymapp "$out/bin/${pname}" - install -Dm644 icon.png "$out/share/pixmaps/${pname}.png" - - runHook postInstall - ''; - - preFixup = '' - gappsWrapperArgs+=(--set-default '__NV_PRIME_RENDER_OFFLOAD' 1) - ''; - - desktopItems = [ desktopItem ]; - - meta = with lib; { - homepage = "https://www.zsa.io/flash/"; - description = "Application for ZSA keyboards"; - maintainers = with lib.maintainers; [ jankaifer shawn8901 ]; - platforms = platforms.linux; - license = lib.licenses.unfree; - }; -} diff --git a/pkgs/applications/misc/khal/default.nix b/pkgs/applications/misc/khal/default.nix index 83de3e517d78b..32c307af60257 100644 --- a/pkgs/applications/misc/khal/default.nix +++ b/pkgs/applications/misc/khal/default.nix @@ -69,7 +69,7 @@ python3.pkgs.buildPythonApplication rec { install -Dm755 misc/khal.desktop -t $out/share/applications ''; - doCheck = !stdenv.isAarch64; + doCheck = !stdenv.hostPlatform.isAarch64; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/applications/misc/khard/default.nix b/pkgs/applications/misc/khard/default.nix index 6bd9b2089f18e..bcb00ebdbb2e8 100644 --- a/pkgs/applications/misc/khard/default.nix +++ b/pkgs/applications/misc/khard/default.nix @@ -6,7 +6,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-WfMKDaPD2j6wT02+GO5HY5E7aF2Z7IQY/VdKiMSRxJA="; + hash = "sha256-WfMKDaPD2j6wT02+GO5HY5E7aF2Z7IQY/VdKiMSRxJA="; }; nativeBuildInputs = with python3.pkgs; [ diff --git a/pkgs/applications/misc/kickoff/default.nix b/pkgs/applications/misc/kickoff/default.nix index 497d64a17aa42..c5be63917a822 100644 --- a/pkgs/applications/misc/kickoff/default.nix +++ b/pkgs/applications/misc/kickoff/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "kickoff"; - version = "0.7.3"; + version = "0.7.4"; src = fetchFromGitHub { owner = "j0ru"; repo = pname; rev = "v${version}"; - hash = "sha256-ha1pRViiOH0U0djUq1x8TIpVoUMn8l+2pA//YP70jdk="; + hash = "sha256-q/+Ik8L58LxOllpEosYyvD38RJb+NIQHslYpgGSwjKc="; }; - cargoHash = "sha256-pdncUUGSfsn35VpwuNWZ/0DAIImBLAm0LyPbqQ06Xho="; + cargoHash = "sha256-8LSz/YeqdbtFXpWq2MMhEI9+8mxsLdE4LUyQHcgLkZY="; libPath = lib.makeLibraryPath [ wayland diff --git a/pkgs/applications/misc/kile-wl/default.nix b/pkgs/applications/misc/kile-wl/default.nix index 582509db4184b..a5f05c473f389 100644 --- a/pkgs/applications/misc/kile-wl/default.nix +++ b/pkgs/applications/misc/kile-wl/default.nix @@ -8,7 +8,7 @@ rustPlatform.buildRustPackage rec { owner = "snakedye"; repo = "kile"; rev = "c24208761d04e0a74d203fc1dcd2f7fed68da388"; - sha256 = "sha256-4iclNVd7nm6LkgvsHwWaWyi1bZL/A+bbT5OSXn70bLs="; + hash = "sha256-4iclNVd7nm6LkgvsHwWaWyi1bZL/A+bbT5OSXn70bLs="; }; passthru.updateScript = unstableGitUpdater { diff --git a/pkgs/applications/misc/kiwix/default.nix b/pkgs/applications/misc/kiwix/default.nix index 1c338a7f58a61..3b9d4f83f5743 100644 --- a/pkgs/applications/misc/kiwix/default.nix +++ b/pkgs/applications/misc/kiwix/default.nix @@ -43,6 +43,6 @@ mkDerivation { homepage = "https://kiwix.org"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/misc/klayout/default.nix b/pkgs/applications/misc/klayout/default.nix index 0b1bc647917a7..afff0cd683684 100644 --- a/pkgs/applications/misc/klayout/default.nix +++ b/pkgs/applications/misc/klayout/default.nix @@ -1,17 +1,17 @@ { lib, mkDerivation, fetchFromGitHub , python3, ruby, qtbase, qtmultimedia, qttools, qtxmlpatterns -, which, perl +, which, perl, libgit2 }: mkDerivation rec { pname = "klayout"; - version = "0.28.12"; + version = "0.29.6"; src = fetchFromGitHub { owner = "KLayout"; repo = "klayout"; rev = "v${version}"; - hash = "sha256-QvEoXKJ9sH5WIarYPsYEWwoFwA/pZa2etegA+AD8rPo="; + hash = "sha256-gbbes8CPh+Z9wCeQaAaObZjQvBTMe06z8oR12i6e12M="; }; postPatch = '' @@ -31,6 +31,7 @@ mkDerivation rec { qtmultimedia qttools qtxmlpatterns + libgit2 ]; buildPhase = '' diff --git a/pkgs/applications/misc/klipper-estimator/default.nix b/pkgs/applications/misc/klipper-estimator/default.nix index 136ad6115d786..e7a511769a8eb 100644 --- a/pkgs/applications/misc/klipper-estimator/default.nix +++ b/pkgs/applications/misc/klipper-estimator/default.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ libgit2 Security SystemConfiguration ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libgit2 Security SystemConfiguration ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/misc/klipperscreen/default.nix b/pkgs/applications/misc/klipperscreen/default.nix index 5364d090f75d2..0ef76edd42629 100644 --- a/pkgs/applications/misc/klipperscreen/default.nix +++ b/pkgs/applications/misc/klipperscreen/default.nix @@ -6,14 +6,14 @@ , gitUpdater }: python3.pkgs.buildPythonApplication rec { pname = "KlipperScreen"; - version = "0.3.2"; + version = "0.4.4"; format = "other"; src = fetchFromGitHub { - owner = "jordanruthe"; + owner = "KlipperScreen"; repo = "KlipperScreen"; rev = "v${version}"; - hash = "sha256-LweO5EVWr3OxziHrjtQDdWyUBCVUJ17afkw7RCZWgcg="; + hash = "sha256-MxuUmkuEnfFC0iPwNUc0Wh8bIEl1J1FMgGEYMjHePZ8="; }; nativeBuildInputs = [ @@ -49,7 +49,7 @@ description = "Touchscreen GUI for the Klipper 3D printer firmware"; homepage = "https://github.com/jordanruthe/KlipperScreen"; license = licenses.agpl3Only; - maintainers = with maintainers; [ cab404 ]; + maintainers = with maintainers; [ cab404 saturn745 ]; mainProgram = "KlipperScreen"; }; } diff --git a/pkgs/applications/misc/kondo/default.nix b/pkgs/applications/misc/kondo/default.nix index eba5799a91727..03fc56ceb016e 100644 --- a/pkgs/applications/misc/kondo/default.nix +++ b/pkgs/applications/misc/kondo/default.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, fetchFromGitHub }: +{ lib, stdenv, rustPlatform, fetchFromGitHub, installShellFiles }: rustPlatform.buildRustPackage rec { pname = "kondo"; @@ -13,6 +13,15 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-WF4GHj/5VYrTUh1E3t29zbpSLjJ6g7RWVpLYqg9msZg="; + nativeBuildInputs = [ installShellFiles ]; + + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd kondo \ + --bash <($out/bin/kondo --completions bash) \ + --fish <($out/bin/kondo --completions fish) \ + --zsh <($out/bin/kondo --completions zsh) + ''; + meta = with lib; { description = "Save disk space by cleaning unneeded files from software projects"; homepage = "https://github.com/tbillington/kondo"; diff --git a/pkgs/applications/misc/kord/default.nix b/pkgs/applications/misc/kord/default.nix index 65337780469a6..4cbd5f38e19a4 100644 --- a/pkgs/applications/misc/kord/default.nix +++ b/pkgs/applications/misc/kord/default.nix @@ -40,11 +40,11 @@ rustPlatform.buildRustPackage rec { }) ]; - nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ] - ++ lib.optionals stdenv.isDarwin [ rustPlatform.bindgenHook ]; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ rustPlatform.bindgenHook ]; - buildInputs = lib.optionals stdenv.isLinux [ alsa-lib ] - ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.AudioUnit ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AudioUnit ]; meta = with lib; { description = "Music theory binary and library for Rust"; diff --git a/pkgs/applications/misc/koreader/default.nix b/pkgs/applications/misc/koreader/default.nix index d03b005d0b468..014bc216b40bc 100644 --- a/pkgs/applications/misc/koreader/default.nix +++ b/pkgs/applications/misc/koreader/default.nix @@ -17,13 +17,20 @@ stdenv.mkDerivation rec { version = "2024.04"; - src = if stdenv.isAarch64 then fetchurl { - url = "https://github.com/koreader/koreader/releases/download/v${version}/koreader-${version}-arm64.deb"; - hash = "sha256-FwwB9slKOiYQ3eud2tiqov6yGNxmIicIe6nFpsH28Vk="; - } else fetchurl { - url = "https://github.com/koreader/koreader/releases/download/v${version}/koreader-${version}-amd64.deb"; - hash = "sha256-hqJRZDZqzPNLK/8Bb+Oay70JqKAMKB0Epbbzeu5npLw="; - }; + src = { + aarch64-linux = fetchurl { + url = "https://github.com/koreader/koreader/releases/download/v${version}/koreader-${version}-arm64.deb"; + hash = "sha256-FwwB9slKOiYQ3eud2tiqov6yGNxmIicIe6nFpsH28Vk="; + }; + armv7l-linux = fetchurl { + url = "https://github.com/koreader/koreader/releases/download/v${version}/koreader-${version}-armhf.deb"; + hash = "sha256-LgeWQcHm5Qq/7MUuidjily0WsOFZAWGWeO52jNHWKMw="; + }; + x86_64-linux = fetchurl { + url = "https://github.com/koreader/koreader/releases/download/v${version}/koreader-${version}-amd64.deb"; + hash = "sha256-hqJRZDZqzPNLK/8Bb+Oay70JqKAMKB0Epbbzeu5npLw="; + }; + }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); src_repo = fetchFromGitHub { repo = "koreader"; @@ -68,7 +75,7 @@ stdenv.mkDerivation rec { "An ebook reader application supporting PDF, DjVu, EPUB, FB2 and many more formats, running on Cervantes, Kindle, Kobo, PocketBook and Android devices"; mainProgram = "koreader"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - platforms = [ "aarch64-linux" "x86_64-linux" ]; + platforms = [ "aarch64-linux" "armv7l-linux" "x86_64-linux" ]; license = licenses.agpl3Only; maintainers = with maintainers; [ contrun neonfuz]; }; diff --git a/pkgs/applications/misc/krabby/default.nix b/pkgs/applications/misc/krabby/default.nix index d006ec00b918f..e6edfd9c4ab13 100644 --- a/pkgs/applications/misc/krabby/default.nix +++ b/pkgs/applications/misc/krabby/default.nix @@ -8,7 +8,7 @@ rustPlatform.buildRustPackage rec { src = fetchCrate { inherit pname version; - sha256 = "sha256-pqLk05hDPMvbrDG3xatAP0licaJszBSujo1fqsEtpRI="; + hash = "sha256-pqLk05hDPMvbrDG3xatAP0licaJszBSujo1fqsEtpRI="; }; cargoHash = "sha256-/wXfdH9ObKGOw8EXHG/3Gvhm66v632lpDp/V3zFIzh4="; diff --git a/pkgs/applications/misc/kuro/default.nix b/pkgs/applications/misc/kuro/default.nix index 55a2e04c93269..e0240b38afecc 100644 --- a/pkgs/applications/misc/kuro/default.nix +++ b/pkgs/applications/misc/kuro/default.nix @@ -1,17 +1,20 @@ { lib +, stdenv , fetchFromGitHub , fetchYarnDeps +, yarnConfigHook +, yarnBuildHook +, nodejs , makeWrapper , makeDesktopItem , copyDesktopItems -, mkYarnPackage , electron_29 }: let electron = electron_29; in -mkYarnPackage rec { +stdenv.mkDerivation rec { pname = "kuro"; version = "9.0.0"; @@ -22,8 +25,6 @@ mkYarnPackage rec { hash = "sha256-9Z/r5T5ZI5aBghHmwiJcft/x/wTRzDlbIupujN2RFfU="; }; - packageJSON = ./package.json; - offlineCache = fetchYarnDeps { yarnLock = "${src}/yarn.lock"; hash = "sha256-GTiNv7u1QK/wjQgpka7REuoLn2wjZG59kYJQaZZPycI="; @@ -32,30 +33,29 @@ mkYarnPackage rec { env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; nativeBuildInputs = [ + yarnConfigHook + yarnBuildHook + nodejs makeWrapper copyDesktopItems ]; - postBuild = '' - pushd deps/kuro - - yarn --offline run electron-builder \ - --dir \ - -c.electronDist=${electron}/libexec/electron \ - -c.electronVersion=${electron.version} - - popd - ''; + yarnBuildScript = "electron-builder"; + yarnBuildFlags = [ + "--dir" + "-c.electronDist=${electron.dist}" + "-c.electronVersion=${electron.version}" + ]; installPhase = '' runHook preInstall # resources mkdir -p "$out/share/lib/kuro" - cp -r ./deps/kuro/dist/*-unpacked/{locales,resources{,.pak}} "$out/share/lib/kuro" + cp -r ./dist/*-unpacked/{locales,resources{,.pak}} "$out/share/lib/kuro" # icons - install -Dm644 ./deps/kuro/static/Icon.png $out/share/icons/hicolor/1024x1024/apps/kuro.png + install -Dm644 ./static/Icon.png $out/share/icons/hicolor/1024x1024/apps/kuro.png # executable wrapper makeWrapper '${electron}/bin/electron' "$out/bin/kuro" \ @@ -65,9 +65,6 @@ mkYarnPackage rec { runHook postInstall ''; - # Do not attempt generating a tarball for contents again. - # note: `doDist = false;` does not work. - distPhase = "true"; desktopItems = [ (makeDesktopItem { diff --git a/pkgs/applications/misc/kuro/package.json b/pkgs/applications/misc/kuro/package.json deleted file mode 100644 index 0ae2f22c08db2..0000000000000 --- a/pkgs/applications/misc/kuro/package.json +++ /dev/null @@ -1,149 +0,0 @@ -{ - "name": "kuro", - "productName": "Kuro", - "version": "9.0.0", - "description": "Elegant Microsoft To-Do desktop app (Ao fork)", - "license": "MIT", - "repository": "davidsmorais/kuro", - "author": { - "name": "davidsmorais", - "email": "david@dsmorais.com", - "url": "https://github.com/davidsmorais" - }, - "maintainers": [ - { - "name": "davidsmorais", - "email": "david@dsmorais.com", - "url": "https://github.com/davidsmorais" - } - ], - "scripts": { - "postinstall": "electron-builder install-app-deps", - "icons": "electron-icon-maker --input=./static/Icon.png --output=./build/", - "test": "xo && stylelint 'src/style/*.css'", - "release": "yarn version && rm -rf dist build && yarn icons && electron-builder --publish never", - "build-snap": "electron-builder --linux snap", - "build-win": "electron-builder --win", - "start": "electron ." - }, - "dependencies": { - "auto-launch": "^5.0.1", - "electron-context-menu": "^3.6.1", - "electron-debug": "^1.4.0", - "electron-dl": "^2.0.0", - "electron-store": "^8.1.0", - "lodash": "^4.17.21" - }, - "devDependencies": { - "electron": "^22.1.0", - "electron-builder": "^23.6.0", - "electron-icon-maker": "^0.0.5", - "stylelint": "^14.9.1", - "xo": "^0.53.1" - }, - "xo": { - "envs": [ - "browser", - "node" - ], - "rules": { - "n/prefer-global/process": 0, - "unicorn/prefer-module": 0, - "unicorn/no-for-loop": 0, - "unicorn/no-array-for-each": 0, - "import/extensions": 0, - "object-curly-spacing": 0, - "quote-props": 0, - "unicorn/prefer-query-selector": 0, - "quotes": [ - "error", - "double" - ] - }, - "space": 2 - }, - "stylelint": { - "rules": { - "block-closing-brace-empty-line-before": "never", - "block-closing-brace-newline-after": "always", - "block-no-empty": true, - "block-opening-brace-space-before": "always", - "color-hex-case": "upper", - "color-hex-length": "long", - "color-no-invalid-hex": true, - "comment-no-empty": true, - "declaration-block-semicolon-space-before": "never", - "indentation": 2, - "max-empty-lines": 0, - "no-duplicate-selectors": true - } - }, - "build": { - "appId": "com.davidsmorais.kuro", - "snap": { - "title": "Kuro" - }, - "files": [ - "**/*", - "!media${/*}", - "!docs${/*}" - ], - "win": { - "target": [ - { - "target": "nsis", - "arch": [ - "x64" - ] - } - ], - "icon": "icons/win/icon.ico", - "publish": { - "provider": "github", - "releaseType": "release" - } - }, - "linux": { - "category": "Office", - "icon": "icons/png", - "description": "Kuro is an unofficial, featureful, open source, community-driven, free Microsoft To-Do app, used by people in more than 120 countries. (Ao fork)", - "synopsis": "Elegant Microsoft To-Do desktop app (Ao fork)", - "publish": { - "provider": "github", - "releaseType": "release" - }, - "target": [ - { - "target": "AppImage", - "arch": [ - "x64" - ] - }, - { - "target": "deb", - "arch": [ - "x64" - ] - }, - { - "target": "pacman", - "arch": [ - "x64" - ] - }, - { - "target": "rpm", - "arch": [ - "x64" - ] - }, - { - "target": "snap", - "arch": [ - "x64" - ] - } - ] - } - } -} diff --git a/pkgs/applications/misc/latte-dock/default.nix b/pkgs/applications/misc/latte-dock/default.nix index 0d17b129ac7a4..a870a7fec3b01 100644 --- a/pkgs/applications/misc/latte-dock/default.nix +++ b/pkgs/applications/misc/latte-dock/default.nix @@ -1,6 +1,9 @@ -{ mkDerivation, lib, cmake, xorg, plasma-framework, plasma-wayland-protocols, fetchFromGitLab -, extra-cmake-modules, karchive, kwindowsystem, qtx11extras, qtwayland, kcrash, knewstuff -, wayland, plasma-workspace, plasma-desktop }: +{ lib, mkDerivation, fetchFromGitLab +, cmake, extra-cmake-modules, karchive, kwindowsystem, qtx11extras, kcrash +, knewstuff, wayland-scanner +, plasma-framework, plasma-wayland-protocols, plasma-workspace, plasma-desktop, qtwayland +, wayland, xorg +}: mkDerivation rec { pname = "latte-dock"; @@ -17,7 +20,7 @@ mkDerivation rec { buildInputs = [ plasma-framework plasma-wayland-protocols qtwayland xorg.libpthreadstubs xorg.libXdmcp xorg.libSM wayland plasma-workspace plasma-desktop ]; nativeBuildInputs = [ extra-cmake-modules cmake karchive kwindowsystem - qtx11extras kcrash knewstuff ]; + qtx11extras kcrash knewstuff wayland-scanner ]; patches = [ ./0001-Disable-autostart.patch diff --git a/pkgs/applications/misc/lavalauncher/default.nix b/pkgs/applications/misc/lavalauncher/default.nix deleted file mode 100644 index 77ad5e5901a94..0000000000000 --- a/pkgs/applications/misc/lavalauncher/default.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ lib -, stdenv -, fetchgit -, meson -, ninja -, pkg-config -, scdoc -, wayland-scanner -, cairo -, librsvg -, libxkbcommon -, wayland -, wayland-protocols -}: - -stdenv.mkDerivation rec { - pname = "lavalauncher"; - version = "2.1.1"; - - src = fetchgit { - url = "https://git.sr.ht/~leon_plickat/lavalauncher"; - rev = "v${version}"; - sha256 = "hobhZ6s9m2xCdAurdj0EF1BeS88j96133zu+2jb1FMM="; - }; - - depsBuildBuild = [ pkg-config ]; - nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-scanner ]; - buildInputs = [ - cairo - librsvg - libxkbcommon - wayland - wayland-protocols - ]; - - meta = with lib; { - homepage = "https://git.sr.ht/~leon_plickat/lavalauncher"; - description = "Simple launcher panel for Wayland desktops"; - longDescription = '' - LavaLauncher is a simple launcher panel for Wayland desktops. - - It displays a dynamically sized bar with user defined buttons. Buttons - consist of an image, which is displayed as the button icon on the bar, and - at least one shell command, which is executed when the user activates the - button. - - Buttons can be activated with pointer and touch events. - - A single LavaLauncher instance can provide multiple such bars, across - multiple outputs. - - The Wayland compositor must implement the Layer-Shell and XDG-Output for - LavaLauncher to work. - ''; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = with platforms; unix; - mainProgram = "lavalauncher"; - }; -} diff --git a/pkgs/applications/misc/leetcode-cli/default.nix b/pkgs/applications/misc/leetcode-cli/default.nix index 0784ff3ddc941..24d7faf407220 100644 --- a/pkgs/applications/misc/leetcode-cli/default.nix +++ b/pkgs/applications/misc/leetcode-cli/default.nix @@ -14,14 +14,14 @@ rustPlatform.buildRustPackage rec { pname = "leetcode-cli"; - version = "0.4.3"; + version = "0.4.5"; src = fetchCrate { inherit pname version; - sha256 = "sha256-y5zh93WPWSMDXqYangqrxav+sC0b0zpFIp6ZIew6KMo="; + hash = "sha256-Jc0akHj2DHbkF7sjslOwdeI1piW2gnhoalBz18lpQdQ="; }; - cargoHash = "sha256-VktDiLsU+GOsa6ba9JJZGEPTavSKp+aSZm2dfhPEqMs="; + cargoHash = "sha256-t3u82bjO1Qv32TwpZNCaaEqOVajXIgM7VBNQ4UjMcl8="; nativeBuildInputs = [ pkg-config @@ -32,9 +32,9 @@ rustPlatform.buildRustPackage rec { openssl dbus sqlite - ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; - postInstall = '' + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd leetcode \ --bash <($out/bin/leetcode completions bash) \ --fish <($out/bin/leetcode completions fish) \ diff --git a/pkgs/applications/misc/lemonade/default.nix b/pkgs/applications/misc/lemonade/default.nix index c9ca92d364e13..012020c1768e5 100644 --- a/pkgs/applications/misc/lemonade/default.nix +++ b/pkgs/applications/misc/lemonade/default.nix @@ -30,7 +30,7 @@ buildGoModule rec { description = "Remote utility tool that to copy, paste and open browsers over TCP"; homepage = "https://github.com/lemonade-command/lemonade/"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; mainProgram = "lemonade"; }; } diff --git a/pkgs/applications/misc/lenmus/default.nix b/pkgs/applications/misc/lenmus/default.nix index 7dc018e087146..c7a1ce9f5d2f1 100644 --- a/pkgs/applications/misc/lenmus/default.nix +++ b/pkgs/applications/misc/lenmus/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ makeWrapper ]; @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { wxsqlite3 fluidsynth fontconfig - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ]; @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { "-DMAN_INSTALL_DIR=${placeholder "out"}/share/man" ]; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/{Applications,bin} mv $out/lenmus.app $out/Applications mv $out/Resources $out/Applications/lenmus.app/Contents diff --git a/pkgs/applications/misc/liberasurecode/default.nix b/pkgs/applications/misc/liberasurecode/default.nix deleted file mode 100644 index f94496d0b125e..0000000000000 --- a/pkgs/applications/misc/liberasurecode/default.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, autoreconfHook -, doxygen -, installShellFiles -, zlib -}: - -stdenv.mkDerivation rec { - pname = "liberasurecode"; - version = "1.6.3"; - - outputs = [ "out" "dev" "doc" ]; - - src = fetchFromGitHub { - owner = "openstack"; - repo = pname; - rev = version; - sha256 = "sha256-HCp+FQ9nq4twk6FtfKhzT80wXXJbvG+clrDO2/9ATpU="; - }; - - postPatch = '' - substituteInPlace doc/doxygen.cfg.in \ - --replace "GENERATE_MAN = NO" "GENERATE_MAN = YES" - - substituteInPlace Makefile.am src/Makefile.am \ - --replace "-Werror" "" - ''; - - nativeBuildInputs = [ autoreconfHook doxygen installShellFiles ]; - - buildInputs = [ zlib ]; - - configureFlags = [ - "--disable-werror" - "--enable-doxygen" - ]; - - postInstall = '' - # remove useless man pages about directories - rm doc/man/man*/_* - installManPage doc/man/man*/* - - moveToOutput share/liberasurecode/ $doc - ''; - - checkTarget = "test"; - - meta = with lib; { - description = "Erasure Code API library written in C with pluggable Erasure Code backends"; - homepage = "https://github.com/openstack/liberasurecode"; - license = licenses.bsd2; - maintainers = teams.openstack.members; - }; -} diff --git a/pkgs/applications/misc/librecad/default.nix b/pkgs/applications/misc/librecad/default.nix index 3ce387c410d9f..ae1f5c9813ac6 100644 --- a/pkgs/applications/misc/librecad/default.nix +++ b/pkgs/applications/misc/librecad/default.nix @@ -72,7 +72,7 @@ mkDerivation rec { description = "2D CAD package based on Qt"; homepage = "https://librecad.org"; license = licenses.gpl2Only; - maintainers = with maintainers; [ viric ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/livecaptions/default.nix b/pkgs/applications/misc/livecaptions/default.nix deleted file mode 100644 index 2d52e96fe3597..0000000000000 --- a/pkgs/applications/misc/livecaptions/default.nix +++ /dev/null @@ -1,77 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - fetchurl, - meson, - ninja, - pkg-config, - cmake, - desktop-file-utils, - wrapGAppsHook4, - onnxruntime, - libadwaita, - libpulseaudio, - xorg, -}: let - aprilAsr = fetchFromGitHub { - name = "april-asr"; - owner = "abb128"; - repo = "april-asr"; - rev = "3308e68442664552de593957cad0fa443ea183dd"; - hash = "sha256-/cOZ2EcZu/Br9v0ComxnOegcEtlC9e8FYt3XHfah7mE="; - }; - - aprilModel = fetchurl { - name = "april-english-dev-01110_en.april"; - url = "https://april.sapples.net/april-english-dev-01110_en.april"; - hash = "sha256-d+uV0PpPdwijfoaMImUwHubELcsl5jymPuo9nLrbwfM="; - }; -in - stdenv.mkDerivation (finalAttrs: { - pname = "livecaptions"; - version = "0.4.1"; - - src = fetchFromGitHub { - owner = "abb128"; - repo = "LiveCaptions"; - rev = "v${finalAttrs.version}"; - hash = "sha256-x8NetSooIBlOKzKUMvDkPFtpD6EVGYECnaqWurySUDU="; - }; - - nativeBuildInputs = [ - meson - ninja - pkg-config - cmake - desktop-file-utils # update-desktop-database - wrapGAppsHook4 - ]; - - buildInputs = [ - onnxruntime - libadwaita - libpulseaudio - xorg.libX11 - ]; - - postUnpack = '' - rm -r source/subprojects/april-asr - ln -sf ${aprilAsr} source/subprojects/april-asr - ''; - - preFixup = '' - gappsWrapperArgs+=( - --set APRIL_MODEL_PATH ${aprilModel} - ) - ''; - - meta = with lib; { - description = "Linux Desktop application that provides live captioning"; - homepage = "https://github.com/abb128/LiveCaptions"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = with maintainers; [Scrumplex]; - mainProgram = "livecaptions"; - }; - }) diff --git a/pkgs/applications/misc/llpp/default.nix b/pkgs/applications/misc/llpp/default.nix index db089796222cb..ff5d34e8224a1 100644 --- a/pkgs/applications/misc/llpp/default.nix +++ b/pkgs/applications/misc/llpp/default.nix @@ -43,8 +43,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ocaml pkg-config ]; buildInputs = [ mupdf libX11 freetype zlib gumbo jbig2dec openjpeg libjpeg lcms2 harfbuzz ] - ++ lib.optionals stdenv.isLinux [ libGLU libGL ] - ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.OpenGL darwin.apple_sdk.frameworks.Cocoa ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ libGLU libGL ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.OpenGL darwin.apple_sdk.frameworks.Cocoa ]; dontStrip = true; @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { install build/llpp $out/bin install misc/llpp.inotify $out/bin/llpp.inotify install -Dm444 misc/llpp.desktop -t $out/share/applications - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' wrapProgram $out/bin/llpp \ --prefix PATH ":" "${xclip}/bin" diff --git a/pkgs/applications/misc/loxodo/default.nix b/pkgs/applications/misc/loxodo/default.nix index 2623b9f027ccc..34612e6dd3a3b 100644 --- a/pkgs/applications/misc/loxodo/default.nix +++ b/pkgs/applications/misc/loxodo/default.nix @@ -37,6 +37,6 @@ python3.pkgs.buildPythonApplication { homepage = "https://www.christoph-sommer.de/loxodo/"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/misc/lscolors/default.nix b/pkgs/applications/misc/lscolors/default.nix index 2778db3ca8b25..263ac29eaed29 100644 --- a/pkgs/applications/misc/lscolors/default.nix +++ b/pkgs/applications/misc/lscolors/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "lscolors"; - version = "0.18.0"; + version = "0.19.0"; src = fetchCrate { inherit version pname; - hash = "sha256-m9S8fG0c+67/msdWaN8noazEdsdLk1aswUJ+8hkjhxo="; + hash = "sha256-9xYWjpeXg646JEW7faRLE1Au6LRVU6QQ7zfAwmYffT0="; }; - cargoHash = "sha256-6d/v89Yqn9FioWQTb5513kPbO9lnzBxaubfcdCzwUP4="; + cargoHash = "sha256-gtcznStbuYWcBPKZ/hdH15cwRQL0+Q0fZHe+YW5Rek0="; buildFeatures = [ "nu-ansi-term" ]; diff --git a/pkgs/applications/misc/lunatask/default.nix b/pkgs/applications/misc/lunatask/default.nix index 573d0311887a6..7471d7ce5e97d 100644 --- a/pkgs/applications/misc/lunatask/default.nix +++ b/pkgs/applications/misc/lunatask/default.nix @@ -1,12 +1,12 @@ { lib, appimageTools, fetchurl }: let - version = "2.0.0"; + version = "2.0.9"; pname = "lunatask"; src = fetchurl { url = "https://lunatask.app/download/Lunatask-${version}.AppImage"; - sha256 = "sha256-rRE7VE6Fugqbbv/fTIZGuWDQmTP1tRDiKrb6VcpsBjk="; + sha256 = "sha256-tV3giMBF3DN8Aop1B1D7pGp3HYPMQlcZ52JrOhxFrEE="; }; appimageContents = appimageTools.extractType2 { @@ -24,6 +24,8 @@ appimageTools.wrapType2 rec { --replace 'Exec=AppRun' 'Exec=${pname}' ''; + passthru.updateScript = ./update.py; + meta = with lib; { description = "All-in-one encrypted todo list, notebook, habit and mood tracker, pomodoro timer, and journaling app"; longDescription = '' @@ -31,6 +33,7 @@ appimageTools.wrapType2 rec { ''; homepage = "https://lunatask.app"; downloadPage = "https://lunatask.app/download"; + changelog = "https://lunatask.app/releases/${version}"; license = licenses.unfree; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; maintainers = with maintainers; [ henkery ]; diff --git a/pkgs/applications/misc/lunatask/update.py b/pkgs/applications/misc/lunatask/update.py new file mode 100755 index 0000000000000..128b7e78fbaf7 --- /dev/null +++ b/pkgs/applications/misc/lunatask/update.py @@ -0,0 +1,18 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i python --packages python3 python3Packages.feedparser common-updater-scripts +""" +Parses the latest version from atom feed and runs update-source-version +""" + +import subprocess +import feedparser + +URL = "https://lunatask.app/releases/atom.xml" + +feed = feedparser.parse(URL) + +latest_entry = feed.entries[0] + +latest_version = latest_entry.title.split()[-1].lstrip("v") + +subprocess.run(["update-source-version", "lunatask", latest_version], check=True) diff --git a/pkgs/applications/misc/lutris/default.nix b/pkgs/applications/misc/lutris/default.nix index 299ac3a9e2d4e..2583663fb6f86 100644 --- a/pkgs/applications/misc/lutris/default.nix +++ b/pkgs/applications/misc/lutris/default.nix @@ -39,7 +39,7 @@ , xrandr , pciutils , psmisc -, glxinfo +, mesa-demos , vulkan-tools , xboxdrv , pulseaudio @@ -58,7 +58,7 @@ let xrandr pciutils psmisc - glxinfo + mesa-demos vulkan-tools xboxdrv pulseaudio @@ -75,13 +75,13 @@ let in buildPythonApplication rec { pname = "lutris-unwrapped"; - version = "0.5.16"; + version = "0.5.17"; src = fetchFromGitHub { owner = "lutris"; repo = "lutris"; rev = "v${version}"; - hash = "sha256-Ed1bhugBe97XmY050A5jCPcnLj0Fd7qPX2p/Ab+YbOE="; + hash = "sha256-Tr5k5LU0s75+1B17oK8tlgA6SlS1SHyyLS6UBKadUmw="; }; nativeBuildInputs = [ wrapGAppsHook3 gobject-introspection ]; @@ -121,7 +121,7 @@ buildPythonApplication rec { postPatch = '' substituteInPlace lutris/util/magic.py \ - --replace "'libmagic.so.1'" "'${lib.getLib file}/lib/libmagic.so.1'" + --replace '"libmagic.so.1"' "'${lib.getLib file}/lib/libmagic.so.1'" ''; nativeCheckInputs = [ xvfb-run nose2 flake8 ] ++ requiredTools; diff --git a/pkgs/applications/misc/lutris/fhsenv.nix b/pkgs/applications/misc/lutris/fhsenv.nix index acdbf8835e31f..0f2f1e9c08602 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 @@ -62,7 +62,7 @@ in buildFHSEnv { fontconfig SDL2_ttf # Mednafen - freeglut mesa_glu + libglut mesa_glu # MESS expat diff --git a/pkgs/applications/misc/lyx/default.nix b/pkgs/applications/misc/lyx/default.nix index dc79cc5922fb9..bf3c3b06dc836 100644 --- a/pkgs/applications/misc/lyx/default.nix +++ b/pkgs/applications/misc/lyx/default.nix @@ -1,34 +1,48 @@ -{ fetchurl, lib, mkDerivation, pkg-config, python3, file, bc -, qtbase, qtsvg, hunspell, makeWrapper #, mythes, boost +{ + fetchurl, + lib, + mkDerivation, + pkg-config, + python3, + file, + bc, + qtbase, + qtsvg, + hunspell, + makeWrapper, # , mythes, boost }: mkDerivation rec { - version = "2.3.7-1"; + version = "2.4.1"; pname = "lyx"; src = fetchurl { - url = "ftp://ftp.lyx.org/pub/lyx/stable/2.3.x/${pname}-${version}.tar.xz"; - sha256 = "sha256-Ob6IZPuGs06IMQ5w+4Dl6eKWYB8IVs8WGqCUFxcY2O0="; + url = "ftp://ftp.lyx.org/pub/lyx/stable/2.4.x/${pname}-${version}.tar.xz"; + hash = "sha256-dN4ooH7zeqlHG8mWLbGCFSolMQx9H0f2drubxj2XE8U="; }; - # Needed with GCC 12 - postPatch = '' - sed '1i#include <iterator>' -i src/lyxfind.cpp - sed '1i#include <cstring>' -i src/insets/InsetListings.cpp - ''; - # LaTeX is used from $PATH, as people often want to have it with extra pkgs - nativeBuildInputs = [ pkg-config makeWrapper python3 qtbase ]; + nativeBuildInputs = [ + pkg-config + makeWrapper + python3 + qtbase + ]; buildInputs = [ - qtbase qtsvg file/*for libmagic*/ bc + qtbase + qtsvg + file # for libmagic + bc hunspell # enchant ]; configureFlags = [ "--enable-qt5" #"--without-included-boost" - /* Boost is a huge dependency from which 1.4 MB of libs would be used. - Using internal boost stuff only increases executable by around 0.2 MB. */ + /* + Boost is a huge dependency from which 1.4 MB of libs would be used. + Using internal boost stuff only increases executable by around 0.2 MB. + */ #"--without-included-mythes" # such a small library isn't worth a separate package ]; @@ -36,9 +50,7 @@ mkDerivation rec { doCheck = true; # python is run during runtime to do various tasks - qtWrapperArgs = [ - " --prefix PATH : ${python3}/bin" - ]; + qtWrapperArgs = [ " --prefix PATH : ${python3}/bin" ]; meta = with lib; { description = "WYSIWYM frontend for LaTeX, DocBook"; @@ -48,4 +60,3 @@ mkDerivation rec { platforms = platforms.linux; }; } - diff --git a/pkgs/applications/misc/madonctl/default.nix b/pkgs/applications/misc/madonctl/default.nix index 203d71a6cc48f..775bff23c15a8 100644 --- a/pkgs/applications/misc/madonctl/default.nix +++ b/pkgs/applications/misc/madonctl/default.nix @@ -32,7 +32,7 @@ buildGoModule rec { description = "CLI for the Mastodon social network API"; homepage = "https://github.com/McKael/madonctl"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; mainProgram = "madonctl"; }; } diff --git a/pkgs/applications/misc/mainsail/default.nix b/pkgs/applications/misc/mainsail/default.nix index 9ffdc79f04cb8..e57d286318a69 100644 --- a/pkgs/applications/misc/mainsail/default.nix +++ b/pkgs/applications/misc/mainsail/default.nix @@ -5,16 +5,16 @@ buildNpmPackage rec { pname = "mainsail"; - version = "2.11.2"; + version = "2.12.0"; src = fetchFromGitHub { owner = "mainsail-crew"; repo = "mainsail"; rev = "v${version}"; - hash = "sha256-N0tm36YMRRrkyuIwzcYbDo1DHesAnJ2s2g0KCms3h5I="; + hash = "sha256-ZRs+KhHNQIGXy/3MUNM5OUuWSntfjYsW3d0OOvuvdAQ="; }; - npmDepsHash = "sha256-z6Fo0XAds/F0Ig+nUE3O16gmH0EVcpML3K8cdKhkJzg="; + npmDepsHash = "sha256-du1X58wUTelgJO/0JYwxfHjjNpu1e4M1GDvx6tgz8Zw="; # Prevent Cypress binary download. CYPRESS_INSTALL_BINARY = 0; diff --git a/pkgs/applications/misc/makehuman/default.nix b/pkgs/applications/misc/makehuman/default.nix index 70cb33643ee67..005a97c1e5c97 100644 --- a/pkgs/applications/misc/makehuman/default.nix +++ b/pkgs/applications/misc/makehuman/default.nix @@ -4,7 +4,6 @@ , fetchFromGitHub , python3 , qtbase -, qttools , git-lfs , wrapQtAppsHook }: diff --git a/pkgs/applications/misc/makeself/default.nix b/pkgs/applications/misc/makeself/default.nix index 91a2e11b3666d..a516febc8ee14 100644 --- a/pkgs/applications/misc/makeself/default.nix +++ b/pkgs/applications/misc/makeself/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { repo = "makeself"; rev = "release-${version}"; fetchSubmodules = true; - sha256 = "sha256-15lUtErGsbXF2Gn0f0rvA18mMuVMmkKrGO2poeYZU9g="; + hash = "sha256-15lUtErGsbXF2Gn0f0rvA18mMuVMmkKrGO2poeYZU9g="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/misc/maliit-framework/default.nix b/pkgs/applications/misc/maliit-framework/default.nix index f730e9265d257..7093524fc04df 100644 --- a/pkgs/applications/misc/maliit-framework/default.nix +++ b/pkgs/applications/misc/maliit-framework/default.nix @@ -20,6 +20,7 @@ , doxygen , pkg-config , wayland-protocols +, wayland-scanner }: mkDerivation rec { @@ -62,6 +63,7 @@ mkDerivation rec { doxygen pkg-config wayland-protocols + wayland-scanner ]; preConfigure = '' @@ -73,6 +75,6 @@ mkDerivation rec { mainProgram = "maliit-server"; homepage = "http://maliit.github.io/"; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/misc/maliit-keyboard/default.nix b/pkgs/applications/misc/maliit-keyboard/default.nix index c315b5251cea0..108137188b226 100644 --- a/pkgs/applications/misc/maliit-keyboard/default.nix +++ b/pkgs/applications/misc/maliit-keyboard/default.nix @@ -69,6 +69,6 @@ mkDerivation rec { mainProgram = "maliit-keyboard"; homepage = "http://maliit.github.io/"; license = with licenses; [ lgpl3Only bsd3 cc-by-30 ]; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/misc/mangal/default.nix b/pkgs/applications/misc/mangal/default.nix deleted file mode 100644 index cc485d84e8e08..0000000000000 --- a/pkgs/applications/misc/mangal/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles }: - -buildGoModule rec { - pname = "mangal"; - version = "4.0.6"; - - src = fetchFromGitHub { - owner = "metafates"; - repo = pname; - rev = "v${version}"; - hash = "sha256-nbJdePlzZFM2ihbvFIMKyYZ9C0uKjU3TE5VLduLvtKE="; - }; - - proxyVendor = true; - vendorHash = null; - - ldflags = [ "-s" "-w" ]; - - nativeBuildInputs = [ installShellFiles ]; - - postInstall = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' - # Mangal creates a config file in the folder ~/.config/mangal and fails if not possible - export MANGAL_CONFIG_PATH=`mktemp -d` - installShellCompletion --cmd mangal \ - --bash <($out/bin/mangal completion bash) \ - --zsh <($out/bin/mangal completion zsh) \ - --fish <($out/bin/mangal completion fish) - ''; - - doCheck = false; # test fail because of sandbox - - meta = with lib; { - description = - "A fancy CLI app written in Go which scrapes, downloads and packs manga into different formats"; - homepage = "https://github.com/metafates/mangal"; - license = licenses.mit; - maintainers = [ maintainers.bertof ]; - mainProgram = "mangal"; - }; -} diff --git a/pkgs/applications/misc/matcha-rss-digest/default.nix b/pkgs/applications/misc/matcha-rss-digest/default.nix index d25824fefc15a..72e599c3a699a 100644 --- a/pkgs/applications/misc/matcha-rss-digest/default.nix +++ b/pkgs/applications/misc/matcha-rss-digest/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , buildGoModule , fetchFromGitHub }: diff --git a/pkgs/applications/misc/mbutil/default.nix b/pkgs/applications/misc/mbutil/default.nix index a33fe7d07cffa..962df1d4dfb9d 100644 --- a/pkgs/applications/misc/mbutil/default.nix +++ b/pkgs/applications/misc/mbutil/default.nix @@ -1,25 +1,36 @@ -{ lib, buildPythonApplication, fetchFromGitHub, nose }: +{ + lib, + buildPythonApplication, + fetchFromGitHub, + setuptools, + pytestCheckHook, +}: buildPythonApplication rec { pname = "mbutil"; version = "0.3.0"; + pyproject = true; src = fetchFromGitHub { owner = "mapbox"; - repo = pname; - rev = "v${version}"; - sha256 = "06d62r89h026asaa4ryzb23m86j0cmbvy54kf4zl5f35sgiha45z"; + repo = "mbutil"; + rev = "refs/tags/v${version}"; + hash = "sha256-vxAF49NluEI/cZMUv1dlQBpUh1jfZ6KUVkYAmFAWphk="; }; - nativeCheckInputs = [ nose ]; - checkPhase = "nosetests"; + patches = [ ./migrate_to_pytest.patch ]; - meta = with lib; { + build-system = [ setuptools ]; + + nativeCheckInputs = [ pytestCheckHook ]; + pytestFlagsArray = [ "test/test.py" ]; + + meta = { description = "Importer and exporter for MBTiles"; mainProgram = "mb-util"; homepage = "https://github.com/mapbox/mbutil"; - license = licenses.bsd3; - platforms = platforms.unix; - maintainers = with maintainers; [ sikmir ]; + license = lib.licenses.bsd3; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ sikmir ]; }; } diff --git a/pkgs/applications/misc/mbutil/migrate_to_pytest.patch b/pkgs/applications/misc/mbutil/migrate_to_pytest.patch new file mode 100644 index 0000000000000..dd47f777b928c --- /dev/null +++ b/pkgs/applications/misc/mbutil/migrate_to_pytest.patch @@ -0,0 +1,30 @@ +diff --git a/test/test.py b/test/test.py +index e02e259..1452fda 100644 +--- a/test/test.py ++++ b/test/test.py +@@ -1,13 +1,24 @@ + import os, shutil + import sys + import json +-from nose import with_setup + from mbutil import mbtiles_to_disk, disk_to_mbtiles + + def clear_data(): + try: shutil.rmtree('test/output') + except Exception: pass + ++ ++def with_setup(setup_func, teardown_func): ++ def wrapper(func): ++ def wrapped(*args, **kwargs): ++ setup_func() ++ func(*args, **kwargs) ++ teardown_func() ++ ++ return wrapped ++ return wrapper ++ ++ + @with_setup(clear_data, clear_data) + def test_mbtiles_to_disk(): + mbtiles_to_disk('test/data/one_tile.mbtiles', 'test/output') diff --git a/pkgs/applications/misc/mdp/default.nix b/pkgs/applications/misc/mdp/default.nix index 13d34b66801fc..51fe1adfac2ae 100644 --- a/pkgs/applications/misc/mdp/default.nix +++ b/pkgs/applications/misc/mdp/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/visit1985/mdp"; description = "Command-line based markdown presentation tool"; - maintainers = with maintainers; [ matthiasbeyer vrthra ]; + maintainers = with maintainers; [ matthiasbeyer ]; license = licenses.gpl3; platforms = with platforms; unix; mainProgram = "mdp"; diff --git a/pkgs/applications/misc/mdzk/default.nix b/pkgs/applications/misc/mdzk/default.nix index e4093295df682..92498cc92612d 100644 --- a/pkgs/applications/misc/mdzk/default.nix +++ b/pkgs/applications/misc/mdzk/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-5zGUBvmf68tCk5jGrNn+ukgYbiKzrlmZvWrYgoJf2zk="; - buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; meta = with lib; { description = "Plain text Zettelkasten based on mdBook"; diff --git a/pkgs/applications/misc/meerk40t/default.nix b/pkgs/applications/misc/meerk40t/default.nix index e0a3921824de2..18b4b0b9d2b28 100644 --- a/pkgs/applications/misc/meerk40t/default.nix +++ b/pkgs/applications/misc/meerk40t/default.nix @@ -36,9 +36,9 @@ python3Packages.buildPythonApplication rec { setuptools wxpython ] - ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ++ lib.flatten (lib.attrValues optional-dependencies); - passthru.optional-dependencies = with python3Packages; { + optional-dependencies = with python3Packages; { cam = [ opencv4 ]; diff --git a/pkgs/applications/misc/megacmd/default.nix b/pkgs/applications/misc/megacmd/default.nix index 07cc3eb0df1af..3e2625e9a7a89 100644 --- a/pkgs/applications/misc/megacmd/default.nix +++ b/pkgs/applications/misc/megacmd/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { owner = "meganz"; repo = "MEGAcmd"; rev = "${version}_Linux"; - sha256 = "sha256-UlSqwM8GQKeG8/K0t5DbM034NQOeBg+ujNi/MMsVCuM="; + hash = "sha256-UlSqwM8GQKeG8/K0t5DbM034NQOeBg+ujNi/MMsVCuM="; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/megasync/default.nix b/pkgs/applications/misc/megasync/default.nix index cb97ca6723089..ef35db7030877 100644 --- a/pkgs/applications/misc/megasync/default.nix +++ b/pkgs/applications/misc/megasync/default.nix @@ -33,7 +33,7 @@ mkDerivation rec { owner = "meganz"; repo = "MEGAsync"; rev = "v${version}_Linux"; - sha256 = "sha256-Y1nfY5iP64iSCYwzqxbjZAQNHyj4yVbSudSInm+yJzY="; + hash = "sha256-Y1nfY5iP64iSCYwzqxbjZAQNHyj4yVbSudSInm+yJzY="; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/merkaartor/default.nix b/pkgs/applications/misc/merkaartor/default.nix deleted file mode 100644 index ce6cbc2a3b76d..0000000000000 --- a/pkgs/applications/misc/merkaartor/default.nix +++ /dev/null @@ -1,79 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, fetchpatch -, cmake -, pkg-config -, qttools -, wrapQtAppsHook -, gdal -, proj -, qtsvg -, qtwebengine -, withGeoimage ? true, exiv2 -, withGpsdlib ? (!stdenv.isDarwin), gpsd -, withLibproxy ? false, libproxy -, withZbar ? false, zbar -}: - -stdenv.mkDerivation rec { - pname = "merkaartor"; - version = "0.19.0"; - - src = fetchFromGitHub { - owner = "openstreetmap"; - repo = "merkaartor"; - rev = version; - hash = "sha256-I3QNCXzwhEFa8aOdwl3UJV8MLZ9caN9wuaaVrGFRvbQ="; - }; - - patches = [ - (fetchpatch { - name = "exiv2-0.28.patch"; - url = "https://github.com/openstreetmap/merkaartor/commit/1e20d2ccd743ea5f8c2358e4ae36fead8b9390fd.patch"; - hash = "sha256-aHjJLKYvqz7V0QwUIg0SbentBe+DaCJusVqy4xRBVWo="; - }) - # https://github.com/openstreetmap/merkaartor/pull/290 - (fetchpatch { - url = "https://github.com/openstreetmap/merkaartor/commit/7dede77370d89e8e7586f6ed5af225f9b5bde6cf.patch"; - hash = "sha256-3oDRPysVNvA50t/b9xOcVQgac3U1lDPrencanl4c6Zk="; - }) - ]; - - nativeBuildInputs = [ cmake pkg-config qttools wrapQtAppsHook ]; - - buildInputs = [ gdal proj qtsvg qtwebengine ] - ++ lib.optional withGeoimage exiv2 - ++ lib.optional withGpsdlib gpsd - ++ lib.optional withLibproxy libproxy - ++ lib.optional withZbar zbar; - - cmakeFlags = [ - (lib.cmakeBool "GEOIMAGE" withGeoimage) - (lib.cmakeBool "GPSD" withGpsdlib) - (lib.cmakeBool "LIBPROXY" withLibproxy) - (lib.cmakeBool "WEBENGINE" true) - (lib.cmakeBool "ZBAR" withZbar) - ]; - - postInstall = '' - # Binary is looking for .qm files in share/merkaartor - mv $out/share/merkaartor/{translations/*.qm,} - rm -r $out/share/merkaartor/translations - '' + lib.optionalString stdenv.isDarwin '' - mkdir -p $out/{Applications,bin} - mv $out/merkaartor.app $out/Applications - # Prevent wrapping, otherwise plugins will not be loaded - chmod -x $out/Applications/merkaartor.app/Contents/plugins/background/*.dylib - makeWrapper $out/{Applications/merkaartor.app/Contents/MacOS,bin}/merkaartor - ''; - - meta = with lib; { - description = "OpenStreetMap editor"; - homepage = "http://merkaartor.be/"; - license = licenses.gpl2Plus; - mainProgram = "merkaartor"; - maintainers = with maintainers; [ sikmir ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/applications/misc/metadata-cleaner/default.nix b/pkgs/applications/misc/metadata-cleaner/default.nix index df172cdb1502c..9c596eef9cd48 100644 --- a/pkgs/applications/misc/metadata-cleaner/default.nix +++ b/pkgs/applications/misc/metadata-cleaner/default.nix @@ -18,15 +18,15 @@ python3.pkgs.buildPythonApplication rec { pname = "metadata-cleaner"; - version = "2.5.5"; + version = "2.5.6"; format = "other"; src = fetchFromGitLab { owner = "rmnvgr"; - repo = pname; + repo = "metadata-cleaner"; rev = "v${version}"; - hash = "sha256-0DaQvVG19X9mMYZeYBz0t/DEx4MACLMjTOGMkUv9OQg="; + hash = "sha256-J+nwgLbAFoh1gq3J4cqQEShZJCSZesyCjT9DfkCWIHs="; }; nativeBuildInputs = [ @@ -50,7 +50,7 @@ python3.pkgs.buildPythonApplication rec { poppler_gi ]; - propagatedBuildInputs = with python3.pkgs; [ + dependencies = with python3.pkgs; [ mat2 pygobject3 ]; diff --git a/pkgs/applications/misc/milu/default.nix b/pkgs/applications/misc/milu/default.nix index b05a1c815baad..333d58d500c83 100644 --- a/pkgs/applications/misc/milu/default.nix +++ b/pkgs/applications/misc/milu/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { homepage = "https://github.com/yuejia/Milu"; license = lib.licenses.bsd2; platforms = lib.platforms.linux; - maintainers = [ lib.maintainers.vrthra ]; + maintainers = [ ]; mainProgram = "milu"; }; } diff --git a/pkgs/applications/misc/minder/default.nix b/pkgs/applications/misc/minder/default.nix index e4e58d9bf6c3e..d3e931116e778 100644 --- a/pkgs/applications/misc/minder/default.nix +++ b/pkgs/applications/misc/minder/default.nix @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/phase1geo/Minder"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ dtzWill ] ++ teams.pantheon.members; + maintainers = with maintainers; [ ] ++ teams.pantheon.members; mainProgram = "com.github.phase1geo.minder"; }; } diff --git a/pkgs/applications/misc/minigalaxy/default.nix b/pkgs/applications/misc/minigalaxy/default.nix index b8cdab22e8247..d98ecb21daafb 100644 --- a/pkgs/applications/misc/minigalaxy/default.nix +++ b/pkgs/applications/misc/minigalaxy/default.nix @@ -1,14 +1,13 @@ { lib , fetchFromGitHub -, docutils -, gettext , glibcLocales , glib-networking , gobject-introspection , gtk3 -, python3 +, libnotify , python3Packages , steam-run +, substituteAll , unzip , webkitgtk , wrapGAppsHook3 @@ -16,23 +15,29 @@ python3Packages.buildPythonApplication rec { pname = "minigalaxy"; - version = "1.2.2"; + version = "1.3.0"; src = fetchFromGitHub { owner = "sharkwouter"; - repo = pname; + repo = "minigalaxy"; rev = "refs/tags/${version}"; - sha256 = "sha256-bpNtdMYBl2dJ4PQsxkhm/Y+3A0dD/Y2XC0VaUYyRhvM="; + hash = "sha256-CMPBKnNrcjHVpsbBjY97FiygEJNG9jKHR/LoVMfuxG4="; }; - checkPhase = '' - runHook preCheck - env HOME=$PWD LC_ALL=en_US.UTF-8 pytest - runHook postCheck + patches = [ + (substituteAll { + src = ./inject-launcher-steam-run.diff; + steamrun = lib.getExe steam-run; + }) + ]; + + postPatch = '' + substituteInPlace minigalaxy/installer.py \ + --replace-fail '"unzip"' "\"${lib.getExe unzip}\"" \ + --replace-fail "'unzip'" "\"${lib.getExe unzip}\"" ''; nativeBuildInputs = [ - gettext wrapGAppsHook3 gobject-introspection ]; @@ -40,29 +45,29 @@ python3Packages.buildPythonApplication rec { buildInputs = [ glib-networking gtk3 + libnotify ]; nativeCheckInputs = with python3Packages; [ glibcLocales - pytest - tox + pytestCheckHook + simplejson ]; + preCheck = '' + export HOME=$(mktemp -d) + ''; + pythonPath = [ - docutils - python3.pkgs.pygobject3 - python3.pkgs.requests - python3.pkgs.setuptools - python3.pkgs.simplejson - steam-run - unzip + python3Packages.pygobject3 + python3Packages.requests webkitgtk ]; - # Run Linux games using the Steam Runtime by using steam-run in the wrapper - # FIXME: not working with makeBinaryWrapper - postFixup = '' - sed -e 's#exec -a "$0"#exec -a "$0" ${steam-run}/bin/steam-run#' -i $out/bin/minigalaxy + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; meta = with lib; { @@ -71,7 +76,7 @@ python3Packages.buildPythonApplication rec { downloadPage = "https://github.com/sharkwouter/minigalaxy/releases"; description = "Simple GOG client for Linux"; license = licenses.gpl3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/minigalaxy/inject-launcher-steam-run.diff b/pkgs/applications/misc/minigalaxy/inject-launcher-steam-run.diff new file mode 100644 index 0000000000000..44850e9fbceab --- /dev/null +++ b/pkgs/applications/misc/minigalaxy/inject-launcher-steam-run.diff @@ -0,0 +1,32 @@ +diff --git a/minigalaxy/launcher.py b/minigalaxy/launcher.py +index 641db77..712c55b 100644 +--- a/minigalaxy/launcher.py ++++ b/minigalaxy/launcher.py +@@ -77,6 +77,7 @@ def get_execute_command(game) -> list: + if game.get_info("use_mangohud") is True: + exe_cmd.insert(0, "mangohud") + exe_cmd.insert(1, "--dlsym") ++ exe_cmd.insert(0, "@steamrun@") + exe_cmd = get_exe_cmd_with_var_command(game, exe_cmd) + logger.info("Launch command for %s: %s", game.name, " ".join(exe_cmd)) + return exe_cmd +diff --git a/tests/test_installer.py b/tests/test_installer.py +index 8e6cb76..a9d9f46 100644 +--- a/tests/test_installer.py ++++ b/tests/test_installer.py +@@ -296,13 +296,13 @@ def test_get_exec_line(self, mock_list_dir, mock_which): + mock_list_dir.return_value = ["data", "docs", "scummvm", "support", "beneath.ini", "gameinfo", "start.sh"] + + result1 = installer.get_exec_line(game1) +- self.assertEqual(result1, "scummvm -c beneath.ini") ++ self.assertEqual(result1, "@steamrun@ scummvm -c beneath.ini") + + game2 = Game("Blocks That Matter", install_dir="/home/test/GOG Games/Blocks That Matter", platform="linux") + mock_list_dir.return_value = ["data", "docs", "support", "gameinfo", "start.sh"] + + result2 = installer.get_exec_line(game2) +- self.assertEqual(result2, "./start.sh") ++ self.assertEqual(result2, "@steamrun@ ./start.sh") + + @mock.patch('os.path.getsize') + @mock.patch('os.listdir') diff --git a/pkgs/applications/misc/mission-center/Cargo.lock b/pkgs/applications/misc/mission-center/Cargo.lock deleted file mode 100644 index 554a818901516..0000000000000 --- a/pkgs/applications/misc/mission-center/Cargo.lock +++ /dev/null @@ -1,1230 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[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 = "allocator-api2" -version = "0.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" - -[[package]] -name = "autocfg" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" - -[[package]] -name = "bitflags" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" - -[[package]] -name = "block" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" - -[[package]] -name = "cairo-rs" -version = "0.19.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ac2a4d0e69036cf0062976f6efcba1aaee3e448594e6514bb2ddf87acce562" -dependencies = [ - "bitflags", - "cairo-sys-rs", - "glib", - "libc", - "thiserror", -] - -[[package]] -name = "cairo-sys-rs" -version = "0.19.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd3bb3119664efbd78b5e6c93957447944f16bdbced84c17a9f41c7829b81e64" -dependencies = [ - "glib-sys", - "libc", - "system-deps", -] - -[[package]] -name = "cc" -version = "1.0.96" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "065a29261d53ba54260972629f9ca6bffa69bac13cd1fed61420f7fa68b9f8bd" - -[[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 = "const-random" -version = "0.1.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87e00182fe74b066627d63b85fd550ac2998d4b0bd86bfed477a0ae4c7c71359" -dependencies = [ - "const-random-macro", -] - -[[package]] -name = "const-random-macro" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e" -dependencies = [ - "getrandom", - "once_cell", - "tiny-keccak", -] - -[[package]] -name = "crunchy" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" - -[[package]] -name = "dbus" -version = "0.9.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bb21987b9fb1613058ba3843121dd18b163b254d8a6e797e144cbac14d96d1b" -dependencies = [ - "libc", - "libdbus-sys", - "winapi", -] - -[[package]] -name = "dlv-list" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "442039f5147480ba31067cb00ada1adae6892028e40e45fc5de7b7df6dcc1b5f" -dependencies = [ - "const-random", -] - -[[package]] -name = "equivalent" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" - -[[package]] -name = "errno-sys" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f7083207e75d4435df450dc6413612d97fe5a441477aba02484f9f7f77057e" -dependencies = [ - "cc", - "libc", -] - -[[package]] -name = "fallible-iterator" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649" - -[[package]] -name = "fallible-streaming-iterator" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a" - -[[package]] -name = "field-offset" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f" -dependencies = [ - "memoffset", - "rustc_version", -] - -[[package]] -name = "futures-channel" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" -dependencies = [ - "futures-core", -] - -[[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", -] - -[[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-core", - "futures-macro", - "futures-task", - "pin-project-lite", - "pin-utils", - "slab", -] - -[[package]] -name = "gdk-pixbuf" -version = "0.19.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6a23f8a0b5090494fd04924662d463f8386cc678dd3915015a838c1a3679b92" -dependencies = [ - "gdk-pixbuf-sys", - "gio", - "glib", - "libc", -] - -[[package]] -name = "gdk-pixbuf-sys" -version = "0.19.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fdbf021f8b9d19e30fb9ea6d6e5f2b6a712fe4645417c69f86f6ff1e1444a8f" -dependencies = [ - "gio-sys", - "glib-sys", - "gobject-sys", - "libc", - "system-deps", -] - -[[package]] -name = "gdk4" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db265c9dd42d6a371e09e52deab3a84808427198b86ac792d75fd35c07990a07" -dependencies = [ - "cairo-rs", - "gdk-pixbuf", - "gdk4-sys", - "gio", - "glib", - "libc", - "pango", -] - -[[package]] -name = "gdk4-sys" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9418fb4e8a67074919fe7604429c45aa74eb9df82e7ca529767c6d4e9dc66dd" -dependencies = [ - "cairo-sys-rs", - "gdk-pixbuf-sys", - "gio-sys", - "glib-sys", - "gobject-sys", - "libc", - "pango-sys", - "pkg-config", - "system-deps", -] - -[[package]] -name = "getrandom" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c" -dependencies = [ - "cfg-if", - "libc", - "wasi", -] - -[[package]] -name = "gettext-rs" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e49ea8a8fad198aaa1f9655a2524b64b70eb06b2f3ff37da407566c93054f364" -dependencies = [ - "gettext-sys", - "locale_config", -] - -[[package]] -name = "gettext-sys" -version = "0.21.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c63ce2e00f56a206778276704bbe38564c8695249fdc8f354b4ef71c57c3839d" -dependencies = [ - "cc", - "temp-dir", -] - -[[package]] -name = "gio" -version = "0.19.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be548be810e45dd31d3bbb89c6210980bb7af9bca3ea1292b5f16b75f8e394a7" -dependencies = [ - "futures-channel", - "futures-core", - "futures-io", - "futures-util", - "gio-sys", - "glib", - "libc", - "pin-project-lite", - "smallvec", - "thiserror", -] - -[[package]] -name = "gio-sys" -version = "0.19.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4bdbef451b0f0361e7f762987cc6bebd5facab1d535e85a3cf1115dfb08db40" -dependencies = [ - "glib-sys", - "gobject-sys", - "libc", - "system-deps", - "windows-sys", -] - -[[package]] -name = "glib" -version = "0.19.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be682de2914107f591efdbe2debf05d9ad70726310ee2b6a3802a697649fcc55" -dependencies = [ - "bitflags", - "futures-channel", - "futures-core", - "futures-executor", - "futures-task", - "futures-util", - "gio-sys", - "glib-macros", - "glib-sys", - "gobject-sys", - "libc", - "memchr", - "smallvec", - "thiserror", -] - -[[package]] -name = "glib-macros" -version = "0.19.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ed782fa3e949c31146671da6e7a227a5e7d354660df1db6d0aac4974dc82a3c" -dependencies = [ - "heck", - "proc-macro-crate", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "glib-sys" -version = "0.19.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "767d23ead9bbdfcbb1c2242c155c8128a7d13dde7bf69c176f809546135e2282" -dependencies = [ - "libc", - "system-deps", -] - -[[package]] -name = "gobject-sys" -version = "0.19.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3787b0bfacca12bb25f8f822b0dbee9f7e4a86e6469a29976d332d2c14c945b" -dependencies = [ - "glib-sys", - "libc", - "system-deps", -] - -[[package]] -name = "graphene-rs" -version = "0.19.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99e4d388e96c5f29e2b2f67045d229ddf826d0a8d6d282f94ed3b34452222c91" -dependencies = [ - "glib", - "graphene-sys", - "libc", -] - -[[package]] -name = "graphene-sys" -version = "0.19.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a60e7381afdd7be43bd10a89d3b6741d162aabbca3a8db73505afb6a3aea59d" -dependencies = [ - "glib-sys", - "libc", - "pkg-config", - "system-deps", -] - -[[package]] -name = "gsk4" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7563884bf6939f4468e5d94654945bdd9afcaf8c3ba4c5dd17b5342b747221be" -dependencies = [ - "cairo-rs", - "gdk4", - "glib", - "graphene-rs", - "gsk4-sys", - "libc", - "pango", -] - -[[package]] -name = "gsk4-sys" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23024bf2636c38bbd1f822f58acc9d1c25b28da896ff0f291a1a232d4272b3dc" -dependencies = [ - "cairo-sys-rs", - "gdk4-sys", - "glib-sys", - "gobject-sys", - "graphene-sys", - "libc", - "pango-sys", - "system-deps", -] - -[[package]] -name = "gtk4" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b04e11319b08af11358ab543105a9e49b0c491faca35e2b8e7e36bfba8b671ab" -dependencies = [ - "cairo-rs", - "field-offset", - "futures-channel", - "gdk-pixbuf", - "gdk4", - "gio", - "glib", - "graphene-rs", - "gsk4", - "gtk4-macros", - "gtk4-sys", - "libc", - "pango", -] - -[[package]] -name = "gtk4-macros" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec655a7ef88d8ce9592899deb8b2d0fa50bab1e6dd69182deb764e643c522408" -dependencies = [ - "proc-macro-crate", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "gtk4-sys" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c8aa86b7f85ea71d66ea88c1d4bae1cfacf51ca4856274565133838d77e57b5" -dependencies = [ - "cairo-sys-rs", - "gdk-pixbuf-sys", - "gdk4-sys", - "gio-sys", - "glib-sys", - "gobject-sys", - "graphene-sys", - "gsk4-sys", - "libc", - "pango-sys", - "system-deps", -] - -[[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 = "hashlink" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "692eaaf7f7607518dd3cef090f1474b61edc5301d8012f09579920df68b725ee" -dependencies = [ - "hashbrown", -] - -[[package]] -name = "heck" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" - -[[package]] -name = "indexmap" -version = "2.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" -dependencies = [ - "equivalent", - "hashbrown", -] - -[[package]] -name = "itoa" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "libadwaita" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91b4990248b9e1ec5e72094a2ccaea70ec3809f88f6fd52192f2af306b87c5d9" -dependencies = [ - "gdk-pixbuf", - "gdk4", - "gio", - "glib", - "gtk4", - "libadwaita-sys", - "libc", - "pango", -] - -[[package]] -name = "libadwaita-sys" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23a748e4e92be1265cd9e93d569c0b5dfc7814107985aa6743d670ab281ea1a8" -dependencies = [ - "gdk4-sys", - "gio-sys", - "glib-sys", - "gobject-sys", - "gtk4-sys", - "libc", - "pango-sys", - "system-deps", -] - -[[package]] -name = "libc" -version = "0.2.154" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346" - -[[package]] -name = "libdbus-sys" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06085512b750d640299b79be4bad3d2fa90a9c00b1fd9e1b46364f66f0485c72" -dependencies = [ - "pkg-config", -] - -[[package]] -name = "libsqlite3-sys" -version = "0.28.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c10584274047cb335c23d3e61bcef8e323adae7c5c8c760540f73610177fc3f" -dependencies = [ - "cc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "libudev-sys" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c8469b4a23b962c1396b9b451dda50ef5b283e8dd309d69033475fa9b334324" -dependencies = [ - "libc", - "pkg-config", -] - -[[package]] -name = "locale_config" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d2c35b16f4483f6c26f0e4e9550717a2f6575bcd6f12a53ff0c490a94a6934" -dependencies = [ - "lazy_static", - "objc", - "objc-foundation", - "regex", - "winapi", -] - -[[package]] -name = "malloc_buf" -version = "0.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" -dependencies = [ - "libc", -] - -[[package]] -name = "memchr" -version = "2.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" - -[[package]] -name = "memoffset" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" -dependencies = [ - "autocfg", -] - -[[package]] -name = "missioncenter" -version = "0.5.2" -dependencies = [ - "dbus", - "errno-sys", - "gettext-rs", - "gtk4", - "lazy_static", - "libadwaita", - "libc", - "libudev-sys", - "regex", - "rusqlite", - "rust-ini", - "serde", - "serde_json", - "static_assertions", - "textdistance", -] - -[[package]] -name = "objc" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" -dependencies = [ - "malloc_buf", -] - -[[package]] -name = "objc-foundation" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9" -dependencies = [ - "block", - "objc", - "objc_id", -] - -[[package]] -name = "objc_id" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b" -dependencies = [ - "objc", -] - -[[package]] -name = "once_cell" -version = "1.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" - -[[package]] -name = "ordered-multimap" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49203cdcae0030493bad186b28da2fa25645fa276a51b6fec8010d281e02ef79" -dependencies = [ - "dlv-list", - "hashbrown", -] - -[[package]] -name = "pango" -version = "0.19.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "504ce6e805439ea2c6791168fe7ef8e3da0c1b2ef82c44bc450dbc330592920d" -dependencies = [ - "gio", - "glib", - "libc", - "pango-sys", -] - -[[package]] -name = "pango-sys" -version = "0.19.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4829555bdbb83692ddeaf5a6927fb2d025c8131e5ecaa4f7619fff6985d3505" -dependencies = [ - "glib-sys", - "gobject-sys", - "libc", - "system-deps", -] - -[[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 = "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-macro2" -version = "1.0.81" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "quote" -version = "1.0.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" -dependencies = [ - "proc-macro2", -] - -[[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 = "rusqlite" -version = "0.31.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b838eba278d213a8beaf485bd313fd580ca4505a00d5871caeb1457c55322cae" -dependencies = [ - "bitflags", - "fallible-iterator", - "fallible-streaming-iterator", - "hashlink", - "libsqlite3-sys", - "smallvec", -] - -[[package]] -name = "rust-ini" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d625ed57d8f49af6cfa514c42e1a71fadcff60eb0b1c517ff82fe41aa025b41" -dependencies = [ - "cfg-if", - "ordered-multimap", - "trim-in-place", -] - -[[package]] -name = "rustc_version" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" -dependencies = [ - "semver", -] - -[[package]] -name = "ryu" -version = "1.0.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" - -[[package]] -name = "semver" -version = "1.0.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" - -[[package]] -name = "serde" -version = "1.0.200" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddc6f9cc94d67c0e21aaf7eda3a010fd3af78ebf6e096aa6e2e13c79749cce4f" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.200" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "856f046b9400cee3c8c94ed572ecdb752444c24528c035cd35882aad6f492bcb" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "serde_json" -version = "1.0.116" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813" -dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "serde_spanned" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" -dependencies = [ - "serde", -] - -[[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 = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - -[[package]] -name = "syn" -version = "2.0.60" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "system-deps" -version = "6.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349" -dependencies = [ - "cfg-expr", - "heck", - "pkg-config", - "toml", - "version-compare", -] - -[[package]] -name = "target-lexicon" -version = "0.12.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" - -[[package]] -name = "temp-dir" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f227968ec00f0e5322f9b8173c7a0cbcff6181a0a5b28e9892491c286277231" - -[[package]] -name = "textdistance" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d321c8576c2b47e43953e9cce236550d4cd6af0a6ce518fe084340082ca6037b" - -[[package]] -name = "thiserror" -version = "1.0.59" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0126ad08bff79f29fc3ae6a55cc72352056dfff61e3ff8bb7129476d44b23aa" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.59" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1cd413b5d558b4c5bf3680e324a6fa5014e7b7c067a51e69dbdf47eb7148b66" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "tiny-keccak" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" -dependencies = [ - "crunchy", -] - -[[package]] -name = "toml" -version = "0.8.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3" -dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit 0.22.12", -] - -[[package]] -name = "toml_datetime" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" -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.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3328d4f68a705b2a4498da1d580585d39a6510f98318a2cec3018a7ec61ddef" -dependencies = [ - "indexmap", - "serde", - "serde_spanned", - "toml_datetime", - "winnow 0.6.7", -] - -[[package]] -name = "trim-in-place" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "343e926fc669bc8cde4fa3129ab681c63671bae288b1f1081ceee6d9d37904fc" - -[[package]] -name = "unicode-ident" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" - -[[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 = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[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-sys" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" -dependencies = [ - "windows-targets", -] - -[[package]] -name = "windows-targets" -version = "0.52.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" -dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_gnullvm", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", -] - -[[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.52.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" - -[[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.52.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" - -[[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.52.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" - -[[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.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14b9415ee827af173ebb3f15f9083df5a122eb93572ec28741fb153356ea2578" -dependencies = [ - "memchr", -] - -[[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", -] diff --git a/pkgs/applications/misc/mission-center/default.nix b/pkgs/applications/misc/mission-center/default.nix deleted file mode 100644 index 9188df9e5b3b4..0000000000000 --- a/pkgs/applications/misc/mission-center/default.nix +++ /dev/null @@ -1,144 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitLab, - fetchFromGitHub, - cargo, - libxml2, - meson, - ninja, - pkg-config, - python311, - rustPlatform, - symlinkJoin, - rustc, - wrapGAppsHook4, - appstream-glib, - blueprint-compiler, - cairo, - cmake, - dbus, - desktop-file-utils, - gdk-pixbuf, - gettext, - glib, - graphene, - gtk4, - libGL, - libadwaita, - libdrm, - mesa, - pango, - sqlite, - udev, - wayland, - dmidecode, - vulkan-loader, -}: - -let - nvtop = fetchFromGitHub { - owner = "Syllo"; - repo = "nvtop"; - rev = "45a1796375cd617d16167869bb88e5e69c809468"; - hash = "sha256-1P9pWXhgTHogO0DztxOsFKNwvTRRfDL3nzGmMANMC9w="; - }; -in -stdenv.mkDerivation rec { - pname = "mission-center"; - version = "0.5.2"; - - src = fetchFromGitLab { - owner = "mission-center-devs"; - repo = "mission-center"; - rev = "v${version}"; - hash = "sha256-84D+CttolY5hleCJbDiN3mlk0+nlwwJUJhGoKGVT/lw="; - }; - - cargoDeps = symlinkJoin { - name = "cargo-vendor-dir"; - paths = [ - (rustPlatform.importCargoLock { lockFile = ./Cargo.lock; }) - (rustPlatform.importCargoLock { lockFile = ./gatherer-Cargo.lock; }) - ]; - }; - - nativeBuildInputs = [ - blueprint-compiler - cargo - libxml2 - meson - ninja - pkg-config - python311 - rustPlatform.cargoSetupHook - rustc - wrapGAppsHook4 - ]; - - buildInputs = [ - appstream-glib - blueprint-compiler - cairo - cmake - dbus - desktop-file-utils - gdk-pixbuf - gettext - glib - graphene - gtk4 - libGL - libadwaita - libdrm - mesa - pango - sqlite - udev - wayland - ]; - - postPatch = '' - substituteInPlace src/sys_info_v2/gatherer.rs \ - --replace '"missioncenter-gatherer"' '"${placeholder "out"}/bin/missioncenter-gatherer"' - - substituteInPlace src/sys_info_v2/mem_info.rs \ - --replace '"dmidecode"' '"${dmidecode}/bin/dmidecode"' - - substituteInPlace $cargoDepsCopy/gl_loader-*/src/glad.c \ - --replace "libGL.so.1" "${libGL}/lib/libGL.so.1" - - substituteInPlace $cargoDepsCopy/ash-*/src/entry.rs \ - --replace '"libvulkan.so.1"' '"${vulkan-loader}/lib/libvulkan.so.1"' - - SRC_GATHERER=$NIX_BUILD_TOP/source/src/sys_info_v2/gatherer - SRC_GATHERER_NVTOP=$SRC_GATHERER/3rdparty/nvtop - - substituteInPlace $SRC_GATHERER_NVTOP/nvtop.json \ - --replace "nvtop-45a1796375cd617d16167869bb88e5e69c809468" "nvtop-src" - - GATHERER_BUILD_DEST=$NIX_BUILD_TOP/source/build/src/sys_info_v2/gatherer/src/debug/build/native - mkdir -p $GATHERER_BUILD_DEST - NVTOP_SRC=$GATHERER_BUILD_DEST/nvtop-src - - cp -r --no-preserve=mode,ownership "${nvtop}" $NVTOP_SRC - pushd $NVTOP_SRC - mkdir -p include/libdrm - for patchfile in $(ls $SRC_GATHERER_NVTOP/patches/nvtop*.patch); do - patch -p1 < $patchfile - done - popd - - patchShebangs data/hwdb/generate_hwdb.py - ''; - - meta = { - description = "Monitor your CPU, Memory, Disk, Network and GPU usage"; - homepage = "https://gitlab.com/mission-center-devs/mission-center"; - changelog = "https://gitlab.com/mission-center-devs/mission-center/-/releases/v${version}"; - license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ GaetanLepage ]; - platforms = lib.platforms.linux; - mainProgram = "missioncenter"; - }; -} diff --git a/pkgs/applications/misc/mission-center/gatherer-Cargo.lock b/pkgs/applications/misc/mission-center/gatherer-Cargo.lock deleted file mode 100644 index d6ad543585a4f..0000000000000 --- a/pkgs/applications/misc/mission-center/gatherer-Cargo.lock +++ /dev/null @@ -1,1268 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "aho-corasick" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" -dependencies = [ - "memchr", -] - -[[package]] -name = "anyhow" -version = "1.0.86" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" - -[[package]] -name = "arrayvec" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" - -[[package]] -name = "ash" -version = "0.38.0+1.3.281" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bb44936d800fea8f016d7f2311c6a4f97aebd5dc86f09906139ec848cf3a46f" -dependencies = [ - "libloading", -] - -[[package]] -name = "base64" -version = "0.22.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" - -[[package]] -name = "bincode" -version = "1.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" -dependencies = [ - "serde", -] - -[[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 = "block-buffer" -version = "0.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" -dependencies = [ - "generic-array", -] - -[[package]] -name = "bstr" -version = "1.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706" -dependencies = [ - "memchr", - "serde", -] - -[[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.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "369cfaf2a5bed5d8f8202073b2e093c9f508251de1551a0deb4253e4c7d80909" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "cargo-util" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6e977de2867ec90a1654882ff95ca5849a526e893bab588f84664cfcdb11c0a" -dependencies = [ - "anyhow", - "core-foundation", - "filetime", - "hex", - "ignore", - "jobserver", - "libc 0.2.155", - "miow", - "same-file", - "sha2", - "shell-escape", - "tempfile", - "tracing", - "walkdir", - "windows-sys 0.52.0", -] - -[[package]] -name = "cc" -version = "1.0.98" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f" - -[[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.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" - -[[package]] -name = "const-random" -version = "0.1.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87e00182fe74b066627d63b85fd550ac2998d4b0bd86bfed477a0ae4c7c71359" -dependencies = [ - "const-random-macro", -] - -[[package]] -name = "const-random-macro" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e" -dependencies = [ - "getrandom", - "once_cell", - "tiny-keccak", -] - -[[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 0.2.155", -] - -[[package]] -name = "core-foundation-sys" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" - -[[package]] -name = "cpufeatures" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" -dependencies = [ - "libc 0.2.155", -] - -[[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 = "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 = "dbus" -version = "0.9.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bb21987b9fb1613058ba3843121dd18b163b254d8a6e797e144cbac14d96d1b" -dependencies = [ - "libc 0.2.155", - "libdbus-sys", - "winapi", -] - -[[package]] -name = "dbus-crossroads" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a4c83437187544ba5142427746835061b330446ca8902eabd70e4afb8f76de0" -dependencies = [ - "dbus", -] - -[[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 = "dlv-list" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "442039f5147480ba31067cb00ada1adae6892028e40e45fc5de7b7df6dcc1b5f" -dependencies = [ - "const-random", -] - -[[package]] -name = "drm" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98888c4bbd601524c11a7ed63f814b8825f420514f78e96f752c437ae9cbb5d1" -dependencies = [ - "bitflags 2.5.0", - "bytemuck", - "drm-ffi", - "drm-fourcc", - "rustix", -] - -[[package]] -name = "drm-ffi" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97c98727e48b7ccb4f4aea8cfe881e5b07f702d17b7875991881b41af7278d53" -dependencies = [ - "drm-sys", - "rustix", -] - -[[package]] -name = "drm-fourcc" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0aafbcdb8afc29c1a7ee5fbe53b5d62f4565b35a042a662ca9fecd0b54dae6f4" - -[[package]] -name = "drm-sys" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd39dde40b6e196c2e8763f23d119ddb1a8714534bf7d77fa97a65b0feda3986" -dependencies = [ - "libc 0.2.155", - "linux-raw-sys 0.6.4", -] - -[[package]] -name = "egl" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a373bc9844200b1ff15bd1b245931d1c20d09d06e4ec09f361171f29a4b0752d" -dependencies = [ - "khronos", - "libc 0.2.155", -] - -[[package]] -name = "either" -version = "1.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b" - -[[package]] -name = "errno" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" -dependencies = [ - "libc 0.2.155", - "windows-sys 0.52.0", -] - -[[package]] -name = "fastrand" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" - -[[package]] -name = "filetime" -version = "0.2.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" -dependencies = [ - "cfg-if", - "libc 0.2.155", - "redox_syscall", - "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 = "form_urlencoded" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" -dependencies = [ - "percent-encoding", -] - -[[package]] -name = "gatherer" -version = "0.5.2" -dependencies = [ - "anyhow", - "arrayvec", - "ash", - "bincode", - "cargo-util", - "cc", - "dbus", - "dbus-crossroads", - "drm", - "egl", - "flate2", - "gbm", - "lazy_static", - "libc 0.2.155", - "libloading", - "log", - "nix", - "pkg-config", - "rayon", - "rust-ini", - "serde", - "serde_json", - "sha2", - "static_assertions", - "tar", - "thiserror", - "ureq", -] - -[[package]] -name = "gbm" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45bf55ba6dd53ad0ac115046ff999c5324c283444ee6e0be82454c4e8eb2f36a" -dependencies = [ - "bitflags 2.5.0", - "drm", - "drm-fourcc", - "gbm-sys", - "libc 0.2.155", -] - -[[package]] -name = "gbm-sys" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fd2d6bf7c0143b38beece05f9a5c4c851a49a8434f62bf58ff28da92b0ddc58" -dependencies = [ - "libc 0.2.155", -] - -[[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 0.2.155", - "wasi", -] - -[[package]] -name = "globset" -version = "0.4.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1" -dependencies = [ - "aho-corasick", - "bstr", - "log", - "regex-automata", - "regex-syntax", -] - -[[package]] -name = "hashbrown" -version = "0.14.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" - -[[package]] -name = "hex" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" - -[[package]] -name = "idna" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "ignore" -version = "0.4.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b46810df39e66e925525d6e38ce1e7f6e1d208f72dc39757880fcb66e2c58af1" -dependencies = [ - "crossbeam-deque", - "globset", - "log", - "memchr", - "regex-automata", - "same-file", - "walkdir", - "winapi-util", -] - -[[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 0.2.155", -] - -[[package]] -name = "khronos" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0711aaa80e6ba6eb1fa8978f1f46bfcb38ceb2f3f33f3736efbff39dac89f50" -dependencies = [ - "libc 0.1.12", -] - -[[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.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e32a70cf75e5846d53a673923498228bbec6a8624708a9ea5645f075d6276122" - -[[package]] -name = "libc" -version = "0.2.155" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" - -[[package]] -name = "libdbus-sys" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06085512b750d640299b79be4bad3d2fa90a9c00b1fd9e1b46364f66f0485c72" -dependencies = [ - "cc", - "pkg-config", -] - -[[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 = "linux-raw-sys" -version = "0.4.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" - -[[package]] -name = "linux-raw-sys" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0b5399f6804fbab912acbd8878ed3532d506b7c951b8f9f164ef90fef39e3f4" - -[[package]] -name = "log" -version = "0.4.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" - -[[package]] -name = "memchr" -version = "2.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" - -[[package]] -name = "miniz_oxide" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae" -dependencies = [ - "adler", -] - -[[package]] -name = "miow" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "359f76430b20a79f9e20e115b3428614e654f04fab314482fc0fda0ebd3c6044" -dependencies = [ - "windows-sys 0.48.0", -] - -[[package]] -name = "nix" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" -dependencies = [ - "bitflags 2.5.0", - "cfg-if", - "cfg_aliases", - "libc 0.2.155", -] - -[[package]] -name = "once_cell" -version = "1.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" - -[[package]] -name = "ordered-multimap" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49203cdcae0030493bad186b28da2fa25645fa276a51b6fec8010d281e02ef79" -dependencies = [ - "dlv-list", - "hashbrown", -] - -[[package]] -name = "percent-encoding" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" - -[[package]] -name = "pin-project-lite" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" - -[[package]] -name = "pkg-config" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" - -[[package]] -name = "proc-macro2" -version = "1.0.83" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b33eb56c327dec362a9e55b3ad14f9d2f0904fb5a5b03b513ab5465399e9f43" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "quote" -version = "1.0.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" -dependencies = [ - "proc-macro2", -] - -[[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-core" -version = "1.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" -dependencies = [ - "crossbeam-deque", - "crossbeam-utils", -] - -[[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 = "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 = "ring" -version = "0.17.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" -dependencies = [ - "cc", - "cfg-if", - "getrandom", - "libc 0.2.155", - "spin", - "untrusted", - "windows-sys 0.52.0", -] - -[[package]] -name = "rust-ini" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d625ed57d8f49af6cfa514c42e1a71fadcff60eb0b1c517ff82fe41aa025b41" -dependencies = [ - "cfg-if", - "ordered-multimap", - "trim-in-place", -] - -[[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 0.2.155", - "linux-raw-sys 0.4.14", - "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-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 = "ryu" -version = "1.0.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" - -[[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 = "serde" -version = "1.0.202" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "226b61a0d411b2ba5ff6d7f73a476ac4f8bb900373459cd00fab8512828ba395" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.202" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6048858004bcff69094cd972ed40a32500f153bd3be9f716b2eed2e8217c4838" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[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 = "sha2" -version = "0.10.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest", -] - -[[package]] -name = "shell-escape" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45bb67a18fa91266cc7807181f62f9178a6873bfad7dc788c42e6430db40184f" - -[[package]] -name = "spin" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" - -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - -[[package]] -name = "subtle" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" - -[[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 = "tar" -version = "0.4.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb" -dependencies = [ - "filetime", - "libc 0.2.155", - "xattr", -] - -[[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 = "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", -] - -[[package]] -name = "tiny-keccak" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" -dependencies = [ - "crunchy", -] - -[[package]] -name = "tinyvec" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" -dependencies = [ - "tinyvec_macros", -] - -[[package]] -name = "tinyvec_macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" - -[[package]] -name = "tracing" -version = "0.1.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" -dependencies = [ - "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", -] - -[[package]] -name = "tracing-core" -version = "0.1.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" -dependencies = [ - "once_cell", -] - -[[package]] -name = "trim-in-place" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "343e926fc669bc8cde4fa3129ab681c63671bae288b1f1081ceee6d9d37904fc" - -[[package]] -name = "typenum" -version = "1.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" - -[[package]] -name = "unicode-bidi" -version = "0.3.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" - -[[package]] -name = "unicode-ident" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" - -[[package]] -name = "unicode-normalization" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" -dependencies = [ - "tinyvec", -] - -[[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", - "flate2", - "log", - "once_cell", - "rustls", - "rustls-pki-types", - "rustls-webpki", - "url", - "webpki-roots", -] - -[[package]] -name = "url" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" -dependencies = [ - "form_urlencoded", - "idna", - "percent-encoding", -] - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[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 = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] -name = "webpki-roots" -version = "0.26.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3de34ae270483955a94f4b21bdaaeb83d508bb84a01435f393818edb0012009" -dependencies = [ - "rustls-pki-types", -] - -[[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-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 = "xattr" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" -dependencies = [ - "libc 0.2.155", - "linux-raw-sys 0.4.14", - "rustix", -] - -[[package]] -name = "zeroize" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" diff --git a/pkgs/applications/misc/mkgmap/default.nix b/pkgs/applications/misc/mkgmap/default.nix index a73767492f3fe..f475359a86cb3 100644 --- a/pkgs/applications/misc/mkgmap/default.nix +++ b/pkgs/applications/misc/mkgmap/default.nix @@ -16,12 +16,12 @@ let in stdenv.mkDerivation rec { pname = "mkgmap"; - version = "4921"; + version = "4922"; src = fetchsvn { url = "https://svn.mkgmap.org.uk/mkgmap/mkgmap/trunk"; rev = version; - sha256 = "sha256-s7EKHXh3UNMDzBmWUTZaLR1P21e27cWJNYRlFcpJu50="; + sha256 = "sha256-LgGdV6l9tjRR4BpGTDTm0MeAq2uiOe7Pv0qv87nbbWw="; }; patches = [ diff --git a/pkgs/applications/misc/mob/default.nix b/pkgs/applications/misc/mob/default.nix index 7fb218266fa10..d09a02a172520 100644 --- a/pkgs/applications/misc/mob/default.nix +++ b/pkgs/applications/misc/mob/default.nix @@ -2,20 +2,20 @@ , buildGoModule , fetchFromGitHub , stdenv -, withSpeech ? !stdenv.isDarwin +, withSpeech ? !stdenv.hostPlatform.isDarwin , makeWrapper , espeak-ng }: buildGoModule rec { pname = "mob"; - version = "4.5.0"; + version = "5.3.1"; src = fetchFromGitHub { owner = "remotemobprogramming"; - repo = pname; + repo = "mob"; rev = "v${version}"; - sha256 = "sha256-uFtE7AprM/ye2sBQeszYy07RV7RmmqD9TGcTTuZwOfY="; + hash = "sha256-+zNlxIvIvPyz0vA9IPaMzP8wfEXwNyRcvp45ohzoxQQ="; }; vendorHash = null; diff --git a/pkgs/applications/misc/mobilecoin-wallet/default.nix b/pkgs/applications/misc/mobilecoin-wallet/default.nix index 42bbae72af5ae..91c59315ba6a9 100644 --- a/pkgs/applications/misc/mobilecoin-wallet/default.nix +++ b/pkgs/applications/misc/mobilecoin-wallet/default.nix @@ -2,22 +2,19 @@ let pname = "mobilecoin-wallet"; - version = "1.8.0"; - name = "${pname}-${version}"; + 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 name src; }; + appimageContents = appimageTools.extractType2 { inherit pname version src; }; in appimageTools.wrapType2 { - inherit name src; + inherit pname version src; extraPkgs = pkgs: [ pkgs.libsecret ]; extraInstallCommands = '' - mv $out/bin/${name} $out/bin/${pname} - mkdir -p $out/share/${pname} cp -a ${appimageContents}/locales $out/share/${pname} cp -a ${appimageContents}/resources $out/share/${pname} diff --git a/pkgs/applications/misc/moonlight-embedded/default.nix b/pkgs/applications/misc/moonlight-embedded/default.nix index e22923e2423fa..e00be02e6f067 100644 --- a/pkgs/applications/misc/moonlight-embedded/default.nix +++ b/pkgs/applications/misc/moonlight-embedded/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { owner = "moonlight-stream"; repo = "moonlight-embedded"; rev = "v${version}"; - sha256 = "sha256-Jc706BjIT3rS9zwntNOdgszP4CHuX+qxvPvWeU68Amg="; + hash = "sha256-Jc706BjIT3rS9zwntNOdgszP4CHuX+qxvPvWeU68Amg="; fetchSubmodules = true; }; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { description = "Open source implementation of NVIDIA's GameStream"; homepage = "https://github.com/moonlight-stream/moonlight-embedded"; license = licenses.gpl3Plus; - maintainers = []; + maintainers = [ ]; mainProgram = "moonlight"; platforms = platforms.linux; }; diff --git a/pkgs/applications/misc/moonlight-qt/darwin.diff b/pkgs/applications/misc/moonlight-qt/darwin.diff deleted file mode 100644 index 0c137fa0774c2..0000000000000 --- a/pkgs/applications/misc/moonlight-qt/darwin.diff +++ /dev/null @@ -1,38 +0,0 @@ ---- a/app/app.pro 2023-06-24 19:10:00.653377668 +0800 -+++ b/app/app.pro 2023-06-24 19:20:06.632188299 +0800 -@@ -49,19 +49,8 @@ - INCLUDEPATH += $$PWD/../libs/windows/include - LIBS += ws2_32.lib winmm.lib dxva2.lib ole32.lib gdi32.lib user32.lib d3d9.lib dwmapi.lib dbghelp.lib - } --macx { -- INCLUDEPATH += $$PWD/../libs/mac/include -- INCLUDEPATH += $$PWD/../libs/mac/Frameworks/SDL2.framework/Versions/A/Headers -- INCLUDEPATH += $$PWD/../libs/mac/Frameworks/SDL2_ttf.framework/Versions/A/Headers -- LIBS += -L$$PWD/../libs/mac/lib -F$$PWD/../libs/mac/Frameworks -- -- # QMake doesn't handle framework-style includes correctly on its own -- QMAKE_CFLAGS += -F$$PWD/../libs/mac/Frameworks -- QMAKE_CXXFLAGS += -F$$PWD/../libs/mac/Frameworks -- QMAKE_OBJECTIVE_CFLAGS += -F$$PWD/../libs/mac/Frameworks --} - --unix:!macx { -+unix { - CONFIG += link_pkgconfig - PKGCONFIG += openssl sdl2 SDL2_ttf opus - -@@ -120,13 +109,12 @@ - CONFIG += soundio discord-rpc - } - macx { -- LIBS += -lssl -lcrypto -lavcodec.60 -lavutil.58 -lopus -framework SDL2 -framework SDL2_ttf - LIBS += -lobjc -framework VideoToolbox -framework AVFoundation -framework CoreVideo -framework CoreGraphics -framework CoreMedia -framework AppKit -framework Metal - - # For libsoundio - LIBS += -framework CoreAudio -framework AudioUnit - -- CONFIG += ffmpeg soundio discord-rpc -+ CONFIG += ffmpeg soundio - } - - SOURCES += \ diff --git a/pkgs/applications/misc/moonlight-qt/default.nix b/pkgs/applications/misc/moonlight-qt/default.nix deleted file mode 100644 index 59c0b6eb8fbad..0000000000000 --- a/pkgs/applications/misc/moonlight-qt/default.nix +++ /dev/null @@ -1,82 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, wrapQtAppsHook -, pkg-config -, qmake -, qtquickcontrols2 -, SDL2 -, SDL2_ttf -, libva -, libvdpau -, libxkbcommon -, alsa-lib -, libpulseaudio -, openssl -, libopus -, ffmpeg -, wayland -, darwin -}: - -let - inherit (darwin.apple_sdk_11_0.frameworks) AVFoundation AppKit AudioUnit VideoToolbox; -in - -stdenv.mkDerivation rec { - pname = "moonlight-qt"; - version = "5.0.1"; - - src = fetchFromGitHub { - owner = "moonlight-stream"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-0ONjUqpM1tUnyaEnMgVl7ff6pND7kyqouv2mpgteZP0="; - fetchSubmodules = true; - }; - - patches = [ ./darwin.diff ]; - - nativeBuildInputs = [ - wrapQtAppsHook - pkg-config - qmake - ]; - - buildInputs = [ - qtquickcontrols2 - SDL2 - SDL2_ttf - openssl - libopus - ffmpeg - ] ++ lib.optionals stdenv.isLinux [ - libva - libvdpau - libxkbcommon - alsa-lib - libpulseaudio - wayland - ] ++ lib.optionals stdenv.isDarwin [ - AVFoundation - AppKit - AudioUnit - VideoToolbox - ]; - - postInstall = lib.optionalString stdenv.isDarwin '' - mkdir $out/Applications $out/bin - mv app/Moonlight.app $out/Applications - rm -r $out/Applications/Moonlight.app/Contents/Frameworks - ln -s $out/Applications/Moonlight.app/Contents/MacOS/Moonlight $out/bin/moonlight - ''; - - meta = with lib; { - description = "Play your PC games on almost any device"; - homepage = "https://moonlight-stream.org"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ luc65r ]; - platforms = platforms.all; - mainProgram = "moonlight"; - }; -} diff --git a/pkgs/applications/misc/mozphab/default.nix b/pkgs/applications/misc/mozphab/default.nix index a19297acbc856..6a08104129821 100644 --- a/pkgs/applications/misc/mozphab/default.nix +++ b/pkgs/applications/misc/mozphab/default.nix @@ -57,6 +57,14 @@ python3.pkgs.buildPythonApplication rec { export HOME=$(mktemp -d) ''; + disabledTests = [ + # AttributeError: 'called_once' is not a valid assertion. + "test_commit" + # AttributeError: 'not_called' is not a valid assertion. + "test_finalize_no_evolve" + "test_patch" + ]; + disabledTestPaths = [ # codestyle doesn't matter to us "tests/test_style.py" @@ -79,7 +87,7 @@ python3.pkgs.buildPythonApplication rec { ''; homepage = "https://moz-conduit.readthedocs.io/en/latest/phabricator-user.html"; license = licenses.mpl20; - maintainers = with maintainers; []; + maintainers = [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/misc/mpvc/default.nix b/pkgs/applications/misc/mpvc/default.nix deleted file mode 100644 index 5182b53faa9a4..0000000000000 --- a/pkgs/applications/misc/mpvc/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, stdenv, socat, fetchFromGitHub, makeWrapper }: - -stdenv.mkDerivation rec { - pname = "mpvc"; - version = "1.3"; - - src = fetchFromGitHub { - owner = "lwilletts"; - repo = "mpvc"; - rev = version; - sha256 = "sha256-wPETEG0BtNBEj3ZyP70byLzIP+NMUKbnjQ+kdvrvK3s="; - }; - - makeFlags = [ "PREFIX=$(out)" ]; - installFlags = [ "PREFIX=$(out)" ]; - - postInstall = '' - wrapProgram $out/bin/mpvc --prefix PATH : "${socat}/bin/" - ''; - - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ socat ]; - - meta = with lib; { - description = "Mpc-like control interface for mpv"; - mainProgram = "mpvc"; - homepage = "https://github.com/lwilletts/mpvc"; - license = licenses.mit; - maintainers = [ maintainers.neeasade ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/misc/mupdf/0001-Use-command-v-in-favor-of-which.patch b/pkgs/applications/misc/mupdf/0001-Use-command-v-in-favor-of-which.patch deleted file mode 100644 index 771ad05835283..0000000000000 --- a/pkgs/applications/misc/mupdf/0001-Use-command-v-in-favor-of-which.patch +++ /dev/null @@ -1,13 +0,0 @@ -Use command -v in favor of which - ---- a/Makerules -+++ b/Makerules -@@ -170,7 +170,7 @@ - ifneq ($(ARCHFLAGS),) - $(warning "MacOS with ARCHFLAGS set. Assuming we are building for arm64, and setting HAVE_LIBCRYPTO to no.") - HAVE_LIBCRYPTO := no -- else ifeq (, $(shell which pkg-config)) -+ else ifeq (, $(shell command -v pkg-config)) - $(warning "No pkg-config found, install it for proper integration of libcrypto") - else - HAVE_LIBCRYPTO := $(shell pkg-config --exists 'libcrypto >= 1.1.0' && echo yes) diff --git a/pkgs/applications/misc/mupdf/1.17/darwin.patch b/pkgs/applications/misc/mupdf/1.17/darwin.patch deleted file mode 100644 index be1b84b0012fb..0000000000000 --- a/pkgs/applications/misc/mupdf/1.17/darwin.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -ruN mupdf-1.14.0-source.orig/Makerules mupdf-1.14.0-source/Makerules ---- mupdf-1.14.0-source.orig/Makerules 2018-11-02 06:57:12.114012496 +0100 -+++ mupdf-1.14.0-source/Makerules 2018-11-02 10:11:56.717232992 +0100 -@@ -80,13 +80,6 @@ - HAVE_GLUT := yes - SYS_GLUT_CFLAGS := -Wno-deprecated-declarations - SYS_GLUT_LIBS := -framework GLUT -framework OpenGL -- CC = xcrun cc -- AR = xcrun ar -- LD = xcrun ld -- RANLIB = xcrun ranlib -- --else ifeq ($(OS),Linux) -- HAVE_OBJCOPY := yes - - ifeq ($(shell pkg-config --exists freetype2 && echo yes),yes) - SYS_FREETYPE_CFLAGS := $(shell pkg-config --cflags freetype2) -@@ -119,12 +112,6 @@ - SYS_CURL_LIBS := $(shell pkg-config --libs libcurl) - endif - -- HAVE_GLUT := yes -- ifeq ($(HAVE_GLUT),yes) -- SYS_GLUT_CFLAGS := -- SYS_GLUT_LIBS := -lglut -lGL -- endif -- - HAVE_X11 := $(shell pkg-config --exists x11 xext && echo yes) - ifeq ($(HAVE_X11),yes) - X11_CFLAGS := $(shell pkg-config --cflags x11 xext) diff --git a/pkgs/applications/misc/mupdf/1.17/default.nix b/pkgs/applications/misc/mupdf/1.17/default.nix deleted file mode 100644 index b8cb75b057fd1..0000000000000 --- a/pkgs/applications/misc/mupdf/1.17/default.nix +++ /dev/null @@ -1,94 +0,0 @@ -{ stdenv, lib, fetchurl, pkg-config, freetype, harfbuzz, openjpeg -, jbig2dec, libjpeg , darwin -, enableX11 ? true, libX11, libXext, libXi, libXrandr -, enableCurl ? true, curl, openssl -, enableGL ? true, freeglut, libGLU -}: - -let - - # OpenJPEG version is hardcoded in package source - openJpegVersion = with stdenv; - lib.versions.majorMinor (lib.getVersion openjpeg); - - -in stdenv.mkDerivation rec { - version = "1.17.0"; - pname = "mupdf"; - - src = fetchurl { - url = "https://mupdf.com/downloads/archive/${pname}-${version}-source.tar.gz"; - sha256 = "13nl9nrcx2awz9l83mlv2psi1lmn3hdnfwxvwgwiwbxlkjl3zqq0"; - }; - - patches = - # Use shared libraries to decrease size - lib.optional (!stdenv.isDarwin) ./mupdf-1.14-shared_libs.patch - ++ lib.optional stdenv.isDarwin ./darwin.patch - ; - - postPatch = '' - sed -i "s/__OPENJPEG__VERSION__/${openJpegVersion}/" source/fitz/load-jpx.c - ''; - - makeFlags = [ "prefix=$(out) USE_SYSTEM_LIBS=yes" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ freetype harfbuzz openjpeg jbig2dec libjpeg freeglut libGLU ] - ++ lib.optionals enableX11 [ libX11 libXext libXi libXrandr ] - ++ lib.optionals enableCurl [ curl openssl ] - ++ lib.optionals enableGL ( - if stdenv.isDarwin then - with darwin.apple_sdk.frameworks; [ GLUT OpenGL ] - else - [ freeglut libGLU ]) - ; - outputs = [ "bin" "dev" "out" "man" "doc" ]; - - preConfigure = '' - # Don't remove mujs because upstream version is incompatible - rm -rf thirdparty/{curl,freetype,glfw,harfbuzz,jbig2dec,libjpeg,openjpeg,zlib} - ''; - - postInstall = '' - mkdir -p "$out/lib/pkgconfig" - cat >"$out/lib/pkgconfig/mupdf.pc" <<EOF - prefix=$out - libdir=$out/lib - includedir=$out/include - - Name: mupdf - Description: Library for rendering PDF documents - Version: ${version} - Libs: -L$out/lib -lmupdf -lmupdf-third - Cflags: -I$dev/include - EOF - - moveToOutput "bin" "$bin" - ln -s "$bin/bin/mupdf-x11" "$bin/bin/mupdf" - mkdir -p $bin/share/applications - cat > $bin/share/applications/mupdf.desktop <<EOF - [Desktop Entry] - Type=Application - Version=1.0 - Name=mupdf - Comment=PDF viewer - Exec=$bin/bin/mupdf-x11 %f - Terminal=false - MimeType=application/pdf;application/x-pdf;application/x-cbz;application/oxps;application/vnd.ms-xpsdocument;application/epub+zip - EOF - ''; - - enableParallelBuilding = true; - - meta = with lib; { - homepage = "https://mupdf.com"; - description = "Lightweight PDF, XPS, and E-book viewer and toolkit written in portable C"; - license = licenses.agpl3Plus; - maintainers = with maintainers; [ vrthra fpletz ]; - platforms = platforms.unix; - knownVulnerabilities = [ - "CVE-2020-26519: denial of service when parsing JBIG2" - "CVE-2017-5991: NULL pointer dereference" - ]; - }; -} diff --git a/pkgs/applications/misc/mupdf/1.17/mupdf-1.14-shared_libs.patch b/pkgs/applications/misc/mupdf/1.17/mupdf-1.14-shared_libs.patch deleted file mode 100644 index 131a1bbbf6bdc..0000000000000 --- a/pkgs/applications/misc/mupdf/1.17/mupdf-1.14-shared_libs.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- mupdf-1.14.0-source.orig/Makefile 2018-11-02 06:57:12.114012496 +0100 -+++ mupdf-1.14.0-source/Makefile 2018-11-02 09:57:10.067945307 +0100 -@@ -20,7 +20,7 @@ - # Do not specify CFLAGS or LIBS on the make invocation line - specify - # XCFLAGS or XLIBS instead. Make ignores any lines in the makefile that - # set a variable that was set on the command line. --CFLAGS += $(XCFLAGS) -Iinclude -+CFLAGS += $(XCFLAGS) -Iinclude -fPIC - LIBS += $(XLIBS) -lm - - ifneq ($(threading),no) -@@ -190,17 +190,21 @@ - - # --- Library --- - --MUPDF_LIB = $(OUT)/libmupdf.a --THIRD_LIB = $(OUT)/libmupdf-third.a --THREAD_LIB = $(OUT)/libmupdf-threads.a --PKCS7_LIB = $(OUT)/libmupdf-pkcs7.a -+MUPDF_LIB = $(OUT)/libmupdf.so -+THIRD_LIB = $(OUT)/libmupdf-third.so -+THREAD_LIB = $(OUT)/libmupdf-threads.so -+PKCS7_LIB = $(OUT)/libmupdf-pkcs7.so - --$(MUPDF_LIB) : $(MUPDF_OBJ) -+$(MUPDF_LIB) : $(MUPDF_OBJ) $(THIRD_LIB) $(THREAD_LIB) -+ $(LINK_CMD) $(THIRD_LIBS) -shared -Wl,-soname -Wl,libmupdf.so -Wl,--no-undefined - $(THIRD_LIB) : $(THIRD_OBJ) -+ $(LINK_CMD) -shared -Wl,-soname -Wl,libmupdf-third.so -Wl,--no-undefined - $(THREAD_LIB) : $(THREAD_OBJ) -+ $(LINK_CMD) -shared -Wl,-soname -Wl,libmupdf-threads.so -Wl,--no-undefined -lpthread - $(PKCS7_LIB) : $(PKCS7_OBJ) -+ $(LINK_CMD) -shared -Wl,-soname -Wl,libmupdf-pkcs7.so - --INSTALL_LIBS := $(MUPDF_LIB) $(THIRD_LIB) -+INSTALL_LIBS := $(MUPDF_LIB) $(THIRD_LIB) $(THREAD_LIB) $(PKCS7_LIB) - - # --- Main tools and viewers --- - diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index 492722d33f49a..0a242d50e3e63 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -15,7 +15,7 @@ , libjpeg , darwin , gumbo -, enableX11 ? (!stdenv.isDarwin) +, enableX11 ? (!stdenv.hostPlatform.isDarwin) , libX11 , libXext , libXi @@ -60,18 +60,18 @@ let in stdenv.mkDerivation rec { - version = "1.23.6"; + version = "1.24.8"; pname = "mupdf"; src = fetchurl { url = "https://mupdf.com/downloads/archive/${pname}-${version}-source.tar.gz"; - sha256 = "sha256-rBHrhZ3UBEiOUVPNyWUbtDQeW6r007Pyfir8gvmq3Ck="; + hash = "sha256-pRjZvpds2yAG1FOC1/+xubjWS8P9PLc8picNdS+n9Eg="; }; - patches = [ ./0001-Use-command-v-in-favor-of-which.patch - ./0002-Add-Darwin-deps.patch - ./0003-Fix-cpp-build.patch - ]; + patches = [ + ./0002-Add-Darwin-deps.patch + ./0003-Fix-cpp-build.patch + ]; postPatch = '' substituteInPlace Makerules --replace "(shell pkg-config" "(shell $PKG_CONFIG" @@ -98,16 +98,16 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ] ++ lib.optional (enableGL || enableX11) copyDesktopItems - ++ lib.optional (stdenv.isDarwin && (enableGL || enableX11)) desktopToDarwinBundle + ++ lib.optional (stdenv.hostPlatform.isDarwin && (enableGL || enableX11)) desktopToDarwinBundle ++ lib.optionals (enableCxx || enablePython) [ python3 python3.pkgs.setuptools python3.pkgs.libclang ] ++ lib.optionals (enablePython) [ which swig ] - ++ lib.optionals stdenv.isDarwin [ fixDarwinDylibNames xcbuild ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames xcbuild ]; buildInputs = [ freetype harfbuzz openjpeg jbig2dec libjpeg gumbo ] ++ lib.optionals enableX11 [ libX11 libXext libXi libXrandr ] ++ lib.optionals enableCurl [ curl openssl ] ++ lib.optionals enableGL ( - if stdenv.isDarwin then + if stdenv.hostPlatform.isDarwin then with darwin.apple_sdk.frameworks; [ GLUT OpenGL ] else [ freeglut-mupdf libGLU ] @@ -166,25 +166,26 @@ stdenv.mkDerivation rec { EOF moveToOutput "bin" "$bin" - '' + (lib.optionalString (stdenv.isDarwin) '' + cp ./build/shared-release/libmupdf${stdenv.hostPlatform.extensions.sharedLibrary}* $out/lib + '' + (lib.optionalString (stdenv.hostPlatform.isDarwin) '' for exe in $bin/bin/*; do install_name_tool -change build/shared-release/libmupdf.dylib $out/lib/libmupdf.dylib "$exe" done '') + (lib.optionalString (enableX11 || enableGL) '' mkdir -p $bin/share/icons/hicolor/48x48/apps - cp docs/logo/mupdf.png $bin/share/icons/hicolor/48x48/apps + cp docs/logo/mupdf-icon-48.png $bin/share/icons/hicolor/48x48/apps '') + (if enableGL then '' ln -s "$bin/bin/mupdf-gl" "$bin/bin/mupdf" '' else lib.optionalString (enableX11) '' ln -s "$bin/bin/mupdf-x11" "$bin/bin/mupdf" '') + (lib.optionalString (enableCxx) '' cp platform/c++/include/mupdf/*.h $out/include/mupdf - cp build/*/libmupdfcpp.so $out/lib + cp build/*/libmupdfcpp.so* $out/lib '') + (lib.optionalString (enablePython) ('' mkdir -p $out/${python3.sitePackages}/mupdf cp build/*/_mupdf.so $out/${python3.sitePackages} cp build/*/mupdf.py $out/${python3.sitePackages}/mupdf/__init__.py - '' + lib.optionalString (stdenv.isDarwin) '' + '' + lib.optionalString (stdenv.hostPlatform.isDarwin) '' install_name_tool -add_rpath $out/lib $out/${python3.sitePackages}/_mupdf.so '')); @@ -208,8 +209,11 @@ 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; [ fpletz ]; platforms = platforms.unix; mainProgram = "mupdf"; + # ImportError: cannot import name '_mupdf' from partially initialized module 'mupdf' + # (most likely due to a circular import) + broken = enablePython; }; } diff --git a/pkgs/applications/misc/mysql-workbench/default.nix b/pkgs/applications/misc/mysql-workbench/default.nix index caecc46d5432c..01df4df5d1c75 100644 --- a/pkgs/applications/misc/mysql-workbench/default.nix +++ b/pkgs/applications/misc/mysql-workbench/default.nix @@ -48,11 +48,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "mysql-workbench"; - version = "8.0.36"; + version = "8.0.38"; src = fetchurl { url = "https://cdn.mysql.com/Downloads/MySQLGUITools/mysql-workbench-community-${finalAttrs.version}-src.tar.gz"; - hash = "sha256-Y02KZrbCd3SRBYpgq6gYfpR+TEmg566D3zEvpwcUY3w="; + hash = "sha256-W2RsA2hIRUaNRK0Q5pN1YODbEiw6HE3cfeisPdUcYPY="; }; patches = [ @@ -78,9 +78,6 @@ stdenv.mkDerivation (finalAttrs: { cairoDev = "${cairo.dev}"; }) - # a newer libxml2 version has changed some interfaces - ./fix-xml2.patch - # Don't try to override the ANTLR_JAR_PATH specified in cmakeFlags ./dont-search-for-antlr-jar.patch ]; @@ -108,7 +105,7 @@ stdenv.mkDerivation (finalAttrs: { antlr4_12.runtime.cpp python3 mysql - libxml2 + (libxml2.override { enableHttp = true; }) libmysqlconnectorcpp vsqlite gdal @@ -141,14 +138,10 @@ stdenv.mkDerivation (finalAttrs: { zstd ]; - # GCC 13: error: 'int64_t' in namespace 'std' does not name a type - # when updating the version make sure this is still needed - env.CXXFLAGS = "-include cstdint"; - env.NIX_CFLAGS_COMPILE = toString ([ # error: 'OGRErr OGRSpatialReference::importFromWkt(char**)' is deprecated "-Wno-error=deprecated-declarations" - ] ++ lib.optionals stdenv.isAarch64 [ + ] ++ lib.optionals stdenv.hostPlatform.isAarch64 [ # error: narrowing conversion of '-1' from 'int' to 'char' "-Wno-error=narrowing" ] ++ lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "12") [ diff --git a/pkgs/applications/misc/mysql-workbench/fix-xml2.patch b/pkgs/applications/misc/mysql-workbench/fix-xml2.patch deleted file mode 100644 index 857c3f9add4ca..0000000000000 --- a/pkgs/applications/misc/mysql-workbench/fix-xml2.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/library/grt/src/grt.h b/library/grt/src/grt.h -index 47bfd63..59e664b 100644 ---- a/library/grt/src/grt.h -+++ b/library/grt/src/grt.h -@@ -35,6 +35,7 @@ - #include <stdexcept> - #include <boost/function.hpp> - #include <libxml/xmlmemory.h> -+#include <libxml/tree.h> - #include "base/threading.h" - #include <string> - #include <gmodule.h> -diff --git a/library/grt/src/unserializer.cpp b/library/grt/src/unserializer.cpp -index 6dda76d..a6f6a3c 100644 ---- a/library/grt/src/unserializer.cpp -+++ b/library/grt/src/unserializer.cpp -@@ -401,7 +401,7 @@ ValueRef internal::Unserializer::unserialize_xmldata(const char *data, size_t si - xmlDocPtr doc = xmlReadMemory(data, (int)size, NULL, NULL, XML_PARSE_NOENT); - - if (!doc) { -- xmlErrorPtr error = xmlGetLastError(); -+ const xmlError* error = xmlGetLastError(); - - if (error) - throw std::runtime_error(base::strfmt("Could not parse XML data. Line %d, %s", error->line, error->message)); diff --git a/pkgs/applications/misc/mysql-workbench/hardcode-paths.patch b/pkgs/applications/misc/mysql-workbench/hardcode-paths.patch index a90075210cf69..8f7b317fb6ca7 100644 --- a/pkgs/applications/misc/mysql-workbench/hardcode-paths.patch +++ b/pkgs/applications/misc/mysql-workbench/hardcode-paths.patch @@ -1,7 +1,8 @@ -diff -u -r a/frontend/linux/workbench/mysql-workbench.in b/frontend/linux/workbench/mysql-workbench.in ---- a/frontend/linux/workbench/mysql-workbench.in 2022-03-25 09:06:06.000000000 +0200 -+++ b/frontend/linux/workbench/mysql-workbench.in 2022-06-17 00:22:51.290117109 +0300 -@@ -100,8 +100,8 @@ +diff --git a/frontend/linux/workbench/mysql-workbench.in b/frontend/linux/workbench/mysql-workbench.in +index cbecde4..ea5d3cc 100755 +--- a/frontend/linux/workbench/mysql-workbench.in ++++ b/frontend/linux/workbench/mysql-workbench.in +@@ -100,8 +100,8 @@ fi if test "$WB_DEBUG" != ""; then $WB_DEBUG $MWB_BINARIES_DIR/mysql-workbench-bin "$@" else @@ -12,28 +13,29 @@ diff -u -r a/frontend/linux/workbench/mysql-workbench.in b/frontend/linux/workbe else $MWB_BINARIES_DIR/mysql-workbench-bin "$@" fi -diff -u -r a/plugins/migration/frontend/migration_bulk_copy_data.py b/plugins/migration/frontend/migration_bulk_copy_data.py ---- a/plugins/migration/frontend/migration_bulk_copy_data.py 2022-03-25 09:06:06.000000000 +0200 -+++ b/plugins/migration/frontend/migration_bulk_copy_data.py 2022-06-17 00:13:29.430055453 +0300 -@@ -110,7 +110,7 @@ +diff --git a/plugins/migration/frontend/migration_bulk_copy_data.py b/plugins/migration/frontend/migration_bulk_copy_data.py +index da6aa9f..9f4fe78 100644 +--- a/plugins/migration/frontend/migration_bulk_copy_data.py ++++ b/plugins/migration/frontend/migration_bulk_copy_data.py +@@ -111,7 +111,7 @@ class ImportScriptLinux(ImportScript): return 'sh' def generate_import_script(self, connection_args, path_to_file, schema_name): - output = ['#!/bin/bash'] + output = ['#!/usr/bin/env bash'] - output.append('MYPATH=\`pwd\`') + output.append(r'MYPATH=\`pwd\`') - output.append('if [ -f \$MYPATH/%s ] ; then' % self.error_log_name) -@@ -164,7 +164,7 @@ + output.append(r'if [ -f \$MYPATH/%s ] ; then' % self.error_log_name) +@@ -165,7 +165,7 @@ class ImportScriptDarwin(ImportScript): return 'sh' def generate_import_script(self, connection_args, path_to_file, schema_name): - output = ['#!/bin/bash'] + output = ['#!/usr/bin/env bash'] - output.append('MYPATH=\`pwd\`') + output.append(r'MYPATH=\`pwd\`') - output.append('if [ -f \$MYPATH/%s ] ; then' % self.error_log_name) -@@ -417,7 +417,7 @@ + output.append(r'if [ -f \$MYPATH/%s ] ; then' % self.error_log_name) +@@ -418,7 +418,7 @@ class DataCopyScriptLinux(DataCopyScript): with open(script_path, 'w+') as f: os.chmod(script_path, 0o700) @@ -42,7 +44,7 @@ diff -u -r a/plugins/migration/frontend/migration_bulk_copy_data.py b/plugins/mi f.write('MYPATH=`pwd`\n') f.write("arg_source_password=\"<put source password here>\"\n") -@@ -521,7 +521,7 @@ +@@ -522,7 +522,7 @@ class DataCopyScriptDarwin(DataCopyScript): with open(script_path, 'w+') as f: os.chmod(script_path, 0o700) @@ -51,10 +53,11 @@ diff -u -r a/plugins/migration/frontend/migration_bulk_copy_data.py b/plugins/mi f.write('MYPATH=`pwd`\n') f.write("arg_source_password=\"<put source password here>\"\n") -diff -u -r a/plugins/wb.admin/backend/wb_server_control.py b/plugins/wb.admin/backend/wb_server_control.py ---- a/plugins/wb.admin/backend/wb_server_control.py 2022-03-25 09:06:06.000000000 +0200 -+++ b/plugins/wb.admin/backend/wb_server_control.py 2022-06-17 00:14:26.937905324 +0300 -@@ -39,7 +39,7 @@ +diff --git a/plugins/wb.admin/backend/wb_server_control.py b/plugins/wb.admin/backend/wb_server_control.py +index 353f461..f7daa9e 100644 +--- a/plugins/wb.admin/backend/wb_server_control.py ++++ b/plugins/wb.admin/backend/wb_server_control.py +@@ -40,7 +40,7 @@ import re UnixVariant = { "" : { @@ -63,10 +66,11 @@ diff -u -r a/plugins/wb.admin/backend/wb_server_control.py b/plugins/wb.admin/ba } } -diff -u -r a/plugins/wb.admin/backend/wb_server_management.py b/plugins/wb.admin/backend/wb_server_management.py ---- a/plugins/wb.admin/backend/wb_server_management.py 2022-03-25 09:06:06.000000000 +0200 -+++ b/plugins/wb.admin/backend/wb_server_management.py 2022-06-17 00:18:58.034028354 +0300 -@@ -40,7 +40,7 @@ +diff --git a/plugins/wb.admin/backend/wb_server_management.py b/plugins/wb.admin/backend/wb_server_management.py +index 40ed515..00da327 100644 +--- a/plugins/wb.admin/backend/wb_server_management.py ++++ b/plugins/wb.admin/backend/wb_server_management.py +@@ -41,7 +41,7 @@ default_sudo_prefix = '' def reset_sudo_prefix(): global default_sudo_prefix @@ -75,7 +79,7 @@ diff -u -r a/plugins/wb.admin/backend/wb_server_management.py b/plugins/wb.admin reset_sudo_prefix() -@@ -100,7 +100,7 @@ +@@ -101,7 +101,7 @@ def wrap_for_sudo(command, sudo_prefix, as_user = Users.ADMIN, to_spawn = False) if to_spawn: command += ' &' @@ -84,7 +88,7 @@ diff -u -r a/plugins/wb.admin/backend/wb_server_management.py b/plugins/wb.admin # If as_user is the CURRENT then there's no need to sudo if as_user != Users.CURRENT: -@@ -111,7 +111,7 @@ +@@ -112,7 +112,7 @@ def wrap_for_sudo(command, sudo_prefix, as_user = Users.ADMIN, to_spawn = False) if '/bin/sh' in sudo_prefix or '/bin/bash' in sudo_prefix: command = "LANG=C " + sudo_prefix + " \"" + command.replace('\\', '\\\\').replace('"', r'\"').replace('$','\\$') + "\"" else: @@ -93,7 +97,7 @@ diff -u -r a/plugins/wb.admin/backend/wb_server_management.py b/plugins/wb.admin return command -@@ -878,9 +878,9 @@ +@@ -879,9 +879,9 @@ class FileOpsLinuxBase(object): @useAbsPath("path") def get_file_owner(self, path, as_user = Users.CURRENT, user_password = None): if self.target_os == wbaOS.linux: @@ -105,7 +109,7 @@ diff -u -r a/plugins/wb.admin/backend/wb_server_management.py b/plugins/wb.admin output = io.StringIO() command = command + quote_path(path) -@@ -904,9 +904,9 @@ +@@ -905,9 +905,9 @@ class FileOpsLinuxBase(object): if as_user == Users.CURRENT: raise PermissionDeniedError("Cannot set owner of directory %s" % path) else: @@ -117,7 +121,7 @@ diff -u -r a/plugins/wb.admin/backend/wb_server_management.py b/plugins/wb.admin res = self.process_ops.exec_cmd(command, as_user = as_user, -@@ -935,7 +935,7 @@ +@@ -936,7 +936,7 @@ class FileOpsLinuxBase(object): @useAbsPath("path") def remove_directory(self, path, as_user = Users.CURRENT, user_password = None): output = io.StringIO() @@ -126,7 +130,7 @@ diff -u -r a/plugins/wb.admin/backend/wb_server_management.py b/plugins/wb.admin as_user = as_user, user_password = user_password, output_handler = output.write, -@@ -948,7 +948,7 @@ +@@ -949,7 +949,7 @@ class FileOpsLinuxBase(object): @useAbsPath("path") def remove_directory_recursive(self, path, as_user = Users.CURRENT, user_password = None): output = io.StringIO() @@ -135,7 +139,7 @@ diff -u -r a/plugins/wb.admin/backend/wb_server_management.py b/plugins/wb.admin as_user = as_user, user_password = user_password, output_handler = output.write, -@@ -961,7 +961,7 @@ +@@ -962,7 +962,7 @@ class FileOpsLinuxBase(object): @useAbsPath("path") def delete_file(self, path, as_user = Users.CURRENT, user_password = None): output = io.StringIO() @@ -144,7 +148,7 @@ diff -u -r a/plugins/wb.admin/backend/wb_server_management.py b/plugins/wb.admin as_user = as_user, user_password = user_password, output_handler = output.write, -@@ -1009,7 +1009,7 @@ +@@ -1010,7 +1010,7 @@ class FileOpsLinuxBase(object): def _copy_file(self, source, dest, as_user = Users.CURRENT, user_password = None): output = io.StringIO() @@ -153,7 +157,7 @@ diff -u -r a/plugins/wb.admin/backend/wb_server_management.py b/plugins/wb.admin as_user = as_user, user_password = user_password, output_handler = output.write, -@@ -1085,9 +1085,9 @@ +@@ -1086,9 +1086,9 @@ class FileOpsLinuxBase(object): # for ls -l, the output format changes depending on stdout being a terminal or not # since both cases are possible, we need to handle both at the same time (1st line being total <nnnn> or not) # the good news is that if the line is there, then it will always start with total, regardless of the locale @@ -165,7 +169,7 @@ diff -u -r a/plugins/wb.admin/backend/wb_server_management.py b/plugins/wb.admin output = io.StringIO() res = self.process_ops.exec_cmd(command, -@@ -2163,9 +2163,9 @@ +@@ -2164,9 +2164,9 @@ class SudoTailInputFile(object): def get_range(self, start, end): f = io.StringIO() if not self._need_sudo: @@ -177,7 +181,7 @@ diff -u -r a/plugins/wb.admin/backend/wb_server_management.py b/plugins/wb.admin if ret != 0: raise RuntimeError("Could not get data from file %s" % self.path) -@@ -2173,9 +2173,9 @@ +@@ -2174,9 +2174,9 @@ class SudoTailInputFile(object): def read_task(self, offset, file): if not self._need_sudo: @@ -189,7 +193,7 @@ diff -u -r a/plugins/wb.admin/backend/wb_server_management.py b/plugins/wb.admin # this will signal the reader end that there's no more data file.close() -@@ -2202,9 +2202,9 @@ +@@ -2203,9 +2203,9 @@ class SudoTailInputFile(object): self._pos = offset f = io.StringIO() if not self._need_sudo: diff --git a/pkgs/applications/misc/navi/default.nix b/pkgs/applications/misc/navi/default.nix index 23abf6a3546e3..2d634e99dd157 100644 --- a/pkgs/applications/misc/navi/default.nix +++ b/pkgs/applications/misc/navi/default.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ makeWrapper ]; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; postInstall = '' wrapProgram $out/bin/navi \ diff --git a/pkgs/applications/misc/nix-tour/default.nix b/pkgs/applications/misc/nix-tour/default.nix index bff2a40e5370b..bde9e099a7276 100644 --- a/pkgs/applications/misc/nix-tour/default.nix +++ b/pkgs/applications/misc/nix-tour/default.nix @@ -2,7 +2,6 @@ , stdenv , fetchFromGitHub , electron -, runtimeShell , makeWrapper , copyDesktopItems , makeDesktopItem diff --git a/pkgs/applications/misc/notable/default.nix b/pkgs/applications/misc/notable/default.nix index 0021cc7221250..9d1c4a246627c 100644 --- a/pkgs/applications/misc/notable/default.nix +++ b/pkgs/applications/misc/notable/default.nix @@ -22,6 +22,8 @@ appimageTools.wrapType2 rec { export LC_ALL=C.UTF-8 ''; + nativeBuildInputs = [ makeWrapper ]; + extraPkgs = pkgs: [ pkgs.at-spi2-atk pkgs.at-spi2-core ]; extraInstallCommands = '' @@ -30,7 +32,6 @@ appimageTools.wrapType2 rec { $out/share/icons/hicolor/1024x1024/apps/notable.png substituteInPlace $out/share/applications/notable.desktop \ --replace 'Exec=AppRun' 'Exec=${pname}' - source "${makeWrapper}/nix-support/setup-hook" wrapProgram "$out/bin/${pname}" \ --add-flags "--disable-seccomp-filter-sandbox" ''; @@ -40,6 +41,6 @@ appimageTools.wrapType2 rec { homepage = "https://github.com/notable/notable"; license = licenses.unfree; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ dtzWill ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/misc/notejot/default.nix b/pkgs/applications/misc/notejot/default.nix deleted file mode 100644 index a2882e16f93ef..0000000000000 --- a/pkgs/applications/misc/notejot/default.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, gtk4 -, json-glib -, libadwaita -, libgee -, desktop-file-utils -, meson -, ninja -, nix-update-script -, pkg-config -, vala -, wrapGAppsHook4 -, fetchpatch -}: - -stdenv.mkDerivation rec { - pname = "notejot"; - version = "3.5.1"; - - src = fetchFromGitHub { - owner = "lainsce"; - repo = pname; - rev = version; - hash = "sha256-p5F0OITgfZyvHwndI5r5BE524+nft7A2XfR3BJZFamU="; - }; - - nativeBuildInputs = [ - desktop-file-utils - meson - ninja - pkg-config - vala - wrapGAppsHook4 - ]; - - buildInputs = [ - gtk4 - json-glib - libadwaita - libgee - ]; - - - patches = [ - # Fixes the compilation error with new Vala compiler. Remove in the next version. - (fetchpatch { - url = "https://github.com/musicinmybrain/notejot/commit/c6a7cfcb792de63fb51eb174f9f3d4e02f6a2ce1.patch"; - hash = "sha256-dexPKIpUaAu/p0K2WQpElhPNt86CS+jD0dPL5+CTl4I="; - }) - ]; - - passthru.updateScript = nix-update-script { }; - - meta = with lib; { - homepage = "https://github.com/lainsce/notejot"; - description = "Stupidly-simple notes app"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.linux; - mainProgram = "io.github.lainsce.Notejot"; - }; -} diff --git a/pkgs/applications/misc/notesnook/default.nix b/pkgs/applications/misc/notesnook/default.nix index ebac30c58a6cf..8f3cb528722d4 100644 --- a/pkgs/applications/misc/notesnook/default.nix +++ b/pkgs/applications/misc/notesnook/default.nix @@ -2,7 +2,7 @@ let pname = "notesnook"; - version = "3.0.8"; + version = "3.0.16"; inherit (stdenv.hostPlatform) system; throwSystem = throw "Unsupported system: ${system}"; @@ -16,9 +16,9 @@ let src = fetchurl { url = "https://github.com/streetwriters/notesnook/releases/download/v${version}/notesnook_${suffix}"; hash = { - x86_64-linux = "sha256-H25PGhCD5uqh2BHMMjb7GyftinBsRs2O5+9xNNV+5m4="; - x86_64-darwin = "sha256-uT4xo4LT70jq7bHmiYu4FL8Fldppc2ai8yEZzGMzM6Q="; - aarch64-darwin = "sha256-D5KIXHhzXXBOEcoOn2QKKUbVGMWhRW+L7fgxRxLpX/0="; + x86_64-linux = "sha256-HywWk3MAWdRVaQyimlQJCFsgydXdE0VSLWliZT7f8w0="; + x86_64-darwin = "sha256-GgZVVt1Gm95/kyI/q99fZ9BIN+5kpxumcSJ9BexfARc="; + aarch64-darwin = "sha256-ldg+bVROm/XzACCmiMapMQf3f6le9FHzt18QcaH8TxA="; }.${system} or throwSystem; }; @@ -74,6 +74,6 @@ let ''; }; in -if stdenv.isDarwin +if stdenv.hostPlatform.isDarwin then darwin else linux 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/nut/default.nix b/pkgs/applications/misc/nut/default.nix index a574520a5af6b..cded819dbb5be 100644 --- a/pkgs/applications/misc/nut/default.nix +++ b/pkgs/applications/misc/nut/default.nix @@ -7,6 +7,7 @@ , freeipmi , gd , i2c-tools +, libgpiod_1 , libmodbus , libtool , libusb1 @@ -23,11 +24,11 @@ stdenv.mkDerivation rec { pname = "nut"; - version = "2.8.0"; + version = "2.8.2"; src = fetchurl { url = "https://networkupstools.org/source/${lib.versions.majorMinor version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-w+WnCNp5e3xwtlPTexIGoAD8tQO4VRn+TN9jU/eSv+U="; + sha256 = "sha256-5LSwy+fdObqQl75/fXh7sv/74132Tf9Ttf45PWWcWX0="; }; patches = [ @@ -42,6 +43,7 @@ stdenv.mkDerivation rec { src = ./hardcode-paths.patch; avahi = "${avahi}/lib"; freeipmi = "${freeipmi}/lib"; + libgpiod = "${libgpiod_1}/lib"; libusb = "${libusb1}/lib"; neon = "${neon}/lib"; libmodbus = "${libmodbus}/lib"; @@ -49,7 +51,7 @@ stdenv.mkDerivation rec { }) ]; - buildInputs = [ neon libusb1 openssl udev avahi freeipmi libmodbus libtool i2c-tools net-snmp gd ]; + buildInputs = [ neon libusb1 openssl udev avahi freeipmi libgpiod_1 libmodbus libtool i2c-tools net-snmp gd ]; nativeBuildInputs = [ autoreconfHook pkg-config makeWrapper ]; @@ -83,9 +85,6 @@ stdenv.mkDerivation rec { substituteInPlace $out/lib/systemd/system/nut-driver-enumerator.path \ --replace "$out/etc/ups.conf" "/etc/nut/ups.conf" - # we don't need init.d scripts - rm -r $out/share/solaris-init - # Suspicious/overly broad rule, remove it until we know better rm $out/etc/udev/rules.d/52-nut-ipmipsu.rules ''; diff --git a/pkgs/applications/misc/nut/hardcode-paths.patch b/pkgs/applications/misc/nut/hardcode-paths.patch index a58d402a20589..2a85644358c97 100644 --- a/pkgs/applications/misc/nut/hardcode-paths.patch +++ b/pkgs/applications/misc/nut/hardcode-paths.patch @@ -1,15 +1,16 @@ --- a/common/common.c +++ b/common/common.c -@@ -991,6 +991,12 @@ ssize_t select_write(const int fd, const void *buf, const size_t buflen, const t +@@ -1990,6 +1990,13 @@ ssize_t select_write(serial_handler_t *fd, const void *buf, const size_t buflen, * communications media and/or vendor protocol. */ - static const char * search_paths[] = { + static const char * search_paths_builtin[] = { + "@avahi@", + "@freeipmi@", ++ "@libgpiod@", + "@libusb@", + "@neon@", + "@libmodbus@", + "@netsnmp@", /* Use the library path (and bitness) provided during ./configure first */ LIBDIR, - "/usr"LIBDIR, + "/usr"LIBDIR, /* Note: this can lead to bogus strings like */ diff --git a/pkgs/applications/misc/nwg-displays/default.nix b/pkgs/applications/misc/nwg-displays/default.nix index 9f59da0f9c12c..9f3b685cd06c9 100644 --- a/pkgs/applications/misc/nwg-displays/default.nix +++ b/pkgs/applications/misc/nwg-displays/default.nix @@ -14,13 +14,13 @@ python310Packages.buildPythonApplication rec { pname = "nwg-displays"; - version = "0.3.20"; + version = "0.3.21"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = "nwg-displays"; rev = "refs/tags/v${version}"; - hash = "sha256-lpXcH45BFgfRjkEHqimnHonDenm5YA6oahe4sN2wpY4="; + hash = "sha256-aVQSWvQTRdz5R9uEXU4CvveRaPdehcL7hrXwFoPCEyI="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/nwg-dock-hyprland/default.nix b/pkgs/applications/misc/nwg-dock-hyprland/default.nix index a029b481eeec6..34bbf45e8ebd2 100644 --- a/pkgs/applications/misc/nwg-dock-hyprland/default.nix +++ b/pkgs/applications/misc/nwg-dock-hyprland/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "nwg-dock-hyprland"; - version = "0.1.9"; + version = "0.2.2"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = "nwg-dock-hyprland"; rev = "v${version}"; - hash = "sha256-pzOdWv98tHZg6Xn58z5DlM1H0IOQ+ohfXEZRLZr8mz0="; + hash = "sha256-iamDOQcQJRdFVnwffWPIXHlY0J4orfrEbfLzaoeV+KM="; }; - vendorHash = "sha256-bK3SpydIO943e7zti6yWQ+JqmdF4NkAAtelNBt4Q/+s="; + vendorHash = "sha256-cZ5w7B8bi0faOVWoQ6eeW5ejCZJgnNB91DQalC75mPo="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/applications/misc/nwg-dock/default.nix b/pkgs/applications/misc/nwg-dock/default.nix index f32873e21a06a..29880d734000f 100644 --- a/pkgs/applications/misc/nwg-dock/default.nix +++ b/pkgs/applications/misc/nwg-dock/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "nwg-dock"; - version = "0.3.9"; + version = "0.4.1"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-/iUtVym+fNnbBeLlrYIiO5tV9eeAVBh6Nw+d3GCJ/F8="; + sha256 = "sha256-ZR72QMftR6bWCieJHW3k46Ujdn/W5fulGxYKoNPiPfE="; }; - vendorHash = "sha256-GW+shKOCwU8yprEfBeAPx1RDgjA7cZZzXDG112bdZ6k="; + vendorHash = "sha256-paRcBQwg2uGouMRX5XF++OyN8Y0JyucXLN0G5O0j3qA="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/applications/misc/nwg-launchers/default.nix b/pkgs/applications/misc/nwg-launchers/default.nix index d3e11493fad80..4e2447379bdda 100644 --- a/pkgs/applications/misc/nwg-launchers/default.nix +++ b/pkgs/applications/misc/nwg-launchers/default.nix @@ -46,6 +46,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/nwg-piotr/nwg-launchers"; license = licenses.gpl3; platforms = platforms.linux; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/misc/nwg-look/default.nix b/pkgs/applications/misc/nwg-look/default.nix index ceaf6ce1a2959..b4f272454591a 100644 --- a/pkgs/applications/misc/nwg-look/default.nix +++ b/pkgs/applications/misc/nwg-look/default.nix @@ -1,9 +1,7 @@ { lib -, stdenv , fetchFromGitHub , wrapGAppsHook3 , buildGoModule -, go , glib , pkg-config , cairo diff --git a/pkgs/applications/misc/nwg-look/go.mod b/pkgs/applications/misc/nwg-look/go.mod deleted file mode 100644 index 1f40d0a94fbd0..0000000000000 --- a/pkgs/applications/misc/nwg-look/go.mod +++ /dev/null @@ -1,10 +0,0 @@ -module github.com/nwg-piotr/nwg-look - -go 1.22 - -require ( - github.com/gotk3/gotk3 v0.6.3 - github.com/sirupsen/logrus v1.9.3 -) - -require golang.org/x/sys v0.17.0 // indirect diff --git a/pkgs/applications/misc/obs-cli/default.nix b/pkgs/applications/misc/obs-cli/default.nix index 8ff7e7a48157a..03a984f82b462 100644 --- a/pkgs/applications/misc/obs-cli/default.nix +++ b/pkgs/applications/misc/obs-cli/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , buildGoModule , fetchFromGitHub , makeWrapper diff --git a/pkgs/applications/misc/obsidian/default.nix b/pkgs/applications/misc/obsidian/default.nix index 000d94bbeec39..e8ffe9f3b8778 100644 --- a/pkgs/applications/misc/obsidian/default.nix +++ b/pkgs/applications/misc/obsidian/default.nix @@ -11,22 +11,22 @@ , commandLineArgs ? "" }: let - inherit (stdenv.hostPlatform) system; pname = "obsidian"; - version = "1.6.3"; + version = "1.6.7"; appname = "Obsidian"; meta = with lib; { description = "Powerful knowledge base that works on top of a local folder of plain text Markdown files"; homepage = "https://obsidian.md"; downloadPage = "https://github.com/obsidianmd/obsidian-releases/releases"; + mainProgram = "obsidian"; license = licenses.obsidian; maintainers = with maintainers; [ atila conradmearns zaninime qbit kashw2 w-lfchen ]; }; - filename = if stdenv.isDarwin then "Obsidian-${version}-universal.dmg" else "obsidian-${version}.tar.gz"; + filename = if stdenv.hostPlatform.isDarwin then "Obsidian-${version}.dmg" else "obsidian-${version}.tar.gz"; src = fetchurl { url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/${filename}"; - hash = if stdenv.isDarwin then "sha256-o5ELpG82mJgcd9Pil6A99BPK6Hoa0OKJJkYpyfGJR9I=" else "sha256-ho8E2Iq+s/w8NjmxzZo/y5aj3MNgbyvIGjk3nSKPLDw="; + hash = if stdenv.hostPlatform.isDarwin then "sha256-rFXmhlxXlVz5nCrXMmfYGaxe4/wnBRdFxsfiwiIDHgw=" else "sha256-ok1fedN8+OXBisFpVXbKRW2OhE4o9MC9lJmtMMST6V8="; }; icon = fetchurl { @@ -89,4 +89,4 @@ let ''; }; in -if stdenv.isDarwin then darwin else linux +if stdenv.hostPlatform.isDarwin then darwin else linux diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix index 9857865478a0e..a241a109091ee 100644 --- a/pkgs/applications/misc/octoprint/default.nix +++ b/pkgs/applications/misc/octoprint/default.nix @@ -1,273 +1,278 @@ -{ pkgs -, stdenv -, callPackage -, lib -, fetchFromGitHub -, fetchPypi -, python3 -, substituteAll -, nix-update-script -, nixosTests +{ + pkgs, + stdenv, + callPackage, + lib, + fetchFromGitHub, + fetchPypi, + python3, + substituteAll, + nix-update-script, + nixosTests, # To include additional plugins, pass them here as an overlay. -, packageOverrides ? self: super: { } + packageOverrides ? self: super: { }, }: let py = python3.override { self = py; - packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) ( - [ - ( - # Due to flask > 2.3 the login will not work - self: super: { - werkzeug = super.werkzeug.overridePythonAttrs (oldAttrs: rec { - version = "2.2.3"; - format = "setuptools"; - src = fetchPypi { - pname = "Werkzeug"; - inherit version; - hash = "sha256-LhzMlBfU2jWLnebxdOOsCUOR6h1PvvLWZ4ZdgZ39Cv4="; - }; - doCheck = false; - }); - flask = super.flask.overridePythonAttrs (oldAttrs: rec { - version = "2.2.5"; - format = "setuptools"; - src = fetchPypi { - pname = "Flask"; - inherit version; - hash = "sha256-7e6bCn/yZiG9WowQ/0hK4oc3okENmbC7mmhQx/uXeqA="; - }; - }); - - netaddr = super.netaddr.overridePythonAttrs (oldAttrs: rec { - version = "0.9.0"; - - src = fetchPypi { - pname = "netaddr"; - inherit version; - hash = "sha256-e0b6mxotcf1d6eSjeE7zOXAKU6CMgEDwi69fEZTaASg="; - }; - }); - } - ) - - # Built-in dependency - ( - self: super: { - octoprint-filecheck = self.buildPythonPackage rec { - pname = "OctoPrint-FileCheck"; - version = "2021.2.23"; - - src = fetchFromGitHub { - owner = "OctoPrint"; - repo = "OctoPrint-FileCheck"; - rev = version; - sha256 = "sha256-e/QGEBa9+pjOdrZq3Zc6ifbSMClIyeTOi0Tji0YdVmI="; - }; - doCheck = false; + packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) ([ + ( + # Due to flask > 2.3 the login will not work + self: super: { + werkzeug = super.werkzeug.overridePythonAttrs (oldAttrs: rec { + version = "2.2.3"; + format = "setuptools"; + src = fetchPypi { + pname = "Werkzeug"; + inherit version; + hash = "sha256-LhzMlBfU2jWLnebxdOOsCUOR6h1PvvLWZ4ZdgZ39Cv4="; }; - } - ) + doCheck = false; + }); + flask = super.flask.overridePythonAttrs (oldAttrs: rec { + version = "2.2.5"; + format = "setuptools"; + src = fetchPypi { + pname = "Flask"; + inherit version; + hash = "sha256-7e6bCn/yZiG9WowQ/0hK4oc3okENmbC7mmhQx/uXeqA="; + }; + doCheck = false; + }); + flask-login = super.flask-login.overridePythonAttrs (oldAttrs: rec { + version = "0.6.3"; + src = fetchPypi { + pname = "Flask-Login"; + inherit version; + hash = "sha256-XiPRSmB+8SgGxplZC4nQ8ODWe67sWZ11lHv5wUczAzM="; + }; + build-system = [ self.setuptools ]; + doCheck = false; # DeprecationWarnings + }); - # Built-in dependency - ( - self: super: { - octoprint-firmwarecheck = self.buildPythonPackage rec { - pname = "OctoPrint-FirmwareCheck"; - version = "2021.10.11"; + netaddr = super.netaddr.overridePythonAttrs (oldAttrs: rec { + version = "0.9.0"; - src = fetchFromGitHub { - owner = "OctoPrint"; - repo = "OctoPrint-FirmwareCheck"; - rev = version; - hash = "sha256-wqbD82bhJDrDawJ+X9kZkoA6eqGxqJc1Z5dA0EUwgEI="; - }; - doCheck = false; + src = fetchPypi { + pname = "netaddr"; + inherit version; + hash = "sha256-e0b6mxotcf1d6eSjeE7zOXAKU6CMgEDwi69fEZTaASg="; }; - } - ) + }); + }) - ( - self: super: { - octoprint-pisupport = self.buildPythonPackage rec { - pname = "OctoPrint-PiSupport"; - version = "2023.5.24"; - format = "setuptools"; + # Built-in dependency + (self: super: { + octoprint-filecheck = self.buildPythonPackage rec { + pname = "OctoPrint-FileCheck"; + version = "2021.2.23"; - src = fetchFromGitHub { - owner = "OctoPrint"; - repo = "OctoPrint-PiSupport"; - rev = version; - hash = "sha256-KfkZXJ2f02G2ee+J1w+YQRKz+LSWwxVIIwmdevDGhew="; - }; + src = fetchFromGitHub { + owner = "OctoPrint"; + repo = "OctoPrint-FileCheck"; + rev = version; + sha256 = "sha256-e/QGEBa9+pjOdrZq3Zc6ifbSMClIyeTOi0Tji0YdVmI="; + }; + doCheck = false; + }; + }) - # requires octoprint itself during tests - doCheck = false; - postPatch = '' - substituteInPlace octoprint_pi_support/__init__.py \ - --replace /usr/bin/vcgencmd ${self.pkgs.libraspberrypi}/bin/vcgencmd - ''; - }; - } - ) + # Built-in dependency + (self: super: { + octoprint-firmwarecheck = self.buildPythonPackage rec { + pname = "OctoPrint-FirmwareCheck"; + version = "2021.10.11"; - ( - self: super: { - octoprint = self.buildPythonPackage rec { - pname = "OctoPrint"; - version = "1.10.1"; + src = fetchFromGitHub { + owner = "OctoPrint"; + repo = "OctoPrint-FirmwareCheck"; + rev = version; + hash = "sha256-wqbD82bhJDrDawJ+X9kZkoA6eqGxqJc1Z5dA0EUwgEI="; + }; + doCheck = false; + }; + }) - src = fetchFromGitHub { - owner = "OctoPrint"; - repo = "OctoPrint"; - rev = version; - hash = "sha256-kJTYIsbNr6cLzti8yg+IlXjbKwXuwumE3Wydy+oTeK4="; - }; + (self: super: { + octoprint-pisupport = self.buildPythonPackage rec { + pname = "OctoPrint-PiSupport"; + version = "2023.5.24"; + format = "setuptools"; - propagatedBuildInputs = with self; [ - argon2-cffi - blinker - cachelib - click - colorlog - emoji - feedparser - filetype - flask - flask-babel - flask-assets - flask-login - flask-limiter - frozendict - future - itsdangerous - immutabledict - jinja2 - markdown - markupsafe - netaddr - netifaces - octoprint-filecheck - octoprint-firmwarecheck - passlib - pathvalidate - pkginfo - pip - psutil - pylru - pyserial - pyyaml - regex - requests - rsa - sarge - semantic-version - sentry-sdk - setuptools - tornado - unidecode - watchdog - websocket-client - werkzeug - wrapt - zeroconf - zipstream-ng - class-doc - pydantic_1 - ] ++ lib.optionals stdenv.isDarwin [ - py.pkgs.appdirs - ] ++ lib.optionals (!stdenv.isDarwin) [ - octoprint-pisupport - ]; + src = fetchFromGitHub { + owner = "OctoPrint"; + repo = "OctoPrint-PiSupport"; + rev = version; + hash = "sha256-KfkZXJ2f02G2ee+J1w+YQRKz+LSWwxVIIwmdevDGhew="; + }; - nativeCheckInputs = with self; [ - ddt - mock - pytestCheckHook - ]; + # requires octoprint itself during tests + doCheck = false; + postPatch = '' + substituteInPlace octoprint_pi_support/__init__.py \ + --replace /usr/bin/vcgencmd ${self.pkgs.libraspberrypi}/bin/vcgencmd + ''; + }; + }) - patches = [ - # substitute pip and let it find out, that it can't write anywhere - (substituteAll { - src = ./pip-path.patch; - pip = "${self.pip}/bin/pip"; - }) + (self: super: { + octoprint = self.buildPythonPackage rec { + pname = "OctoPrint"; + version = "1.10.2"; - # hardcore path to ffmpeg and hide related settings - (substituteAll { - src = ./ffmpeg-path.patch; - ffmpeg = "${pkgs.ffmpeg}/bin/ffmpeg"; - }) - ]; + src = fetchFromGitHub { + owner = "OctoPrint"; + repo = "OctoPrint"; + rev = version; + hash = "sha256-vISMps2v18A7MkF24SyIcK5yOQsTxBQLnKybVd8R2FU="; + }; + + propagatedBuildInputs = + with self; + [ + argon2-cffi + blinker + cachelib + click + colorlog + emoji + feedparser + filetype + flask + flask-babel + flask-assets + flask-login + flask-limiter + frozendict + future + itsdangerous + immutabledict + jinja2 + markdown + markupsafe + netaddr + netifaces + octoprint-filecheck + octoprint-firmwarecheck + passlib + pathvalidate + pkginfo + pip + psutil + pylru + pyserial + pyyaml + regex + requests + rsa + sarge + semantic-version + sentry-sdk + setuptools + tornado + unidecode + watchdog + websocket-client + werkzeug + wrapt + zeroconf + zipstream-ng + class-doc + pydantic_1 + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ py.pkgs.appdirs ] + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ octoprint-pisupport ]; - postPatch = - let - ignoreVersionConstraints = [ - "cachelib" - "colorlog" - "emoji" - "immutabledict" - "PyYAML" - "sarge" - "sentry-sdk" - "watchdog" - "wrapt" - "zeroconf" - "Flask-Login" - "werkzeug" - "flask" - "Flask-Limiter" - "blinker" - ]; - in - '' - sed -r -i \ - ${lib.concatStringsSep "\n" ( - map ( - e: - ''-e 's@${e}[<>=]+.*@${e}",@g' \'' - ) ignoreVersionConstraints - )} - setup.py - ''; + nativeCheckInputs = with self; [ + ddt + mock + pytestCheckHook + ]; - dontUseSetuptoolsCheck = true; + patches = [ + # substitute pip and let it find out, that it can't write anywhere + (substituteAll { + src = ./pip-path.patch; + pip = "${self.pip}/bin/pip"; + }) - preCheck = '' - export HOME=$(mktemp -d) - rm pytest.ini - ''; + # hardcore path to ffmpeg and hide related settings + (substituteAll { + src = ./ffmpeg-path.patch; + ffmpeg = "${pkgs.ffmpeg}/bin/ffmpeg"; + }) + ]; - disabledTests = [ - "test_check_setup" # Why should it be able to call pip? - ] ++ lib.optionals stdenv.isDarwin [ - "test_set_external_modification" + postPatch = + let + ignoreVersionConstraints = [ + "cachelib" + "colorlog" + "emoji" + "immutabledict" + "PyYAML" + "sarge" + "sentry-sdk" + "watchdog" + "wrapt" + "zeroconf" + "Flask-Login" + "werkzeug" + "flask" + "Flask-Limiter" + "blinker" ]; + in + '' + sed -r -i \ + ${ + lib.concatStringsSep "\n" (map (e: ''-e 's@${e}[<>=]+.*@${e}",@g' \'') ignoreVersionConstraints) + } + setup.py + ''; - passthru = { - inherit (self) python; - updateScript = nix-update-script { }; - tests = { - plugins = (callPackage ./plugins.nix { }) super self; - inherit (nixosTests) octoprint; - }; - }; + dontUseSetuptoolsCheck = true; - meta = with lib; { - homepage = "https://octoprint.org/"; - description = "Snappy web interface for your 3D printer"; - mainProgram = "octoprint"; - license = licenses.agpl3Only; - maintainers = with maintainers; [ abbradar gebner WhittlesJr gador ]; - }; + preCheck = '' + export HOME=$(mktemp -d) + rm pytest.ini + ''; + + disabledTests = [ + "test_check_setup" # Why should it be able to call pip? + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_set_external_modification" ]; + disabledTestPaths = [ + "tests/test_octoprint_setuptools.py" # fails due to distutils and python3.12 + ]; + + passthru = { + inherit (self) python; + updateScript = nix-update-script { }; + tests = { + plugins = (callPackage ./plugins.nix { }) super self; + inherit (nixosTests) octoprint; }; - } - ) - (callPackage ./plugins.nix { }) - packageOverrides - ] - ); + }; + + meta = with lib; { + homepage = "https://octoprint.org/"; + description = "Snappy web interface for your 3D printer"; + mainProgram = "octoprint"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ + abbradar + gebner + WhittlesJr + gador + ]; + }; + }; + }) + (callPackage ./plugins.nix { }) + packageOverrides + ]); }; in -with py.pkgs; toPythonApplication octoprint +with py.pkgs; +toPythonApplication octoprint diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix index 090c4e0e852d9..626ed3438a88a 100644 --- a/pkgs/applications/misc/octoprint/plugins.nix +++ b/pkgs/applications/misc/octoprint/plugins.nix @@ -172,6 +172,46 @@ in }; }; + firmwareupdater = buildPlugin rec { + pname = "firmwareupdater"; + version = "1.14.0"; + + src = fetchFromGitHub { + owner = "OctoPrint"; + repo = "OctoPrint-FirmwareUpdater"; + rev = version; + sha256 = "sha256-CUNjM/IJJS/lqccZ2B0mDOzv3k8AgmDreA/X9wNJ7iY="; + }; + + propagatedBuildInputs = with super; [ pyserial ]; + + meta = with lib; { + description = "Printer Firmware Updater"; + homepage = "https://github.com/OctoPrint/OctoPrint-FirmwareUpdater"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ tri-ler ]; + }; + }; + + fullscreen = buildPlugin rec { + pname = "fullscreen"; + version = "0.0.6"; + + src = fetchFromGitHub { + owner = "BillyBlaze"; + repo = "OctoPrint-FullScreen"; + rev = version; + sha256 = "sha256-Z8twpj+gqgbiWWxNd9I9qflEAln5Obpb3cn34KwSc5A="; + }; + + meta = with lib; { + description = "Open webcam in fullscreen mode"; + homepage = "https://github.com/BillyBlaze/OctoPrint-FullScreen"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ tri-ler ]; + }; + }; + gcodeeditor = buildPlugin rec { pname = "gcodeeditor"; version = "0.2.12"; @@ -231,15 +271,102 @@ in }; }; + mqttchambertemperature = buildPlugin rec { + pname = "mqttchambertemperature"; + version = "0.0.3"; + + src = fetchFromGitHub { + owner = "synman"; + repo = "OctoPrint-MqttChamberTemperature"; + rev = version; + sha256 = "sha256-CvNpi8HcBBUfCs3X8yflbhe0YCU0kW3u2ADSro/qnuI="; + }; + + propagatedBuildInputs = with super; [ jsonpath-ng ]; + + meta = with lib; { + description = "Enables Chamber temperature reporting via subscribing to an MQTT topic"; + homepage = "https://github.com/synman/OctoPrint-MqttChamberTemperature"; + license = licenses.wtfpl; + maintainers = with maintainers; [ tri-ler ]; + }; + }; + + navbartemp = buildPlugin rec { + pname = "navbartemp"; + version = "0.15"; + + src = fetchFromGitHub { + owner = "imrahil"; + repo = "OctoPrint-NavbarTemp"; + rev = version; + sha256 = "sha256-ZPpTx+AadRffUb53sZbMUbCZa7xYGQW/5si7UB8mnVI="; + }; + + meta = with lib; { + description = "Displays temperatures on navbar"; + homepage = "https://github.com/imrahil/OctoPrint-NavbarTemp"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ tri-ler ]; + }; + }; + + obico = buildPlugin rec { + pname = "obico"; + version = "2.5.0"; + + src = fetchFromGitHub { + owner = "TheSpaghettiDetective"; + repo = "OctoPrint-Obico"; + rev = version; + sha256 = "sha256-cAUXe/lRTqYuWnrRiNDuDjcayL5yV9/PtTd9oeSC8KA="; + }; + + propagatedBuildInputs = with super; [ + backoff + sentry-sdk + bson + distro + ]; + + meta = with lib; { + description = "Monitor Octoprint-connected printers with Obico"; + homepage = "https://www.obico.io/"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ tri-ler ]; + }; + }; + + octopod = buildPlugin rec { + pname = "octopod"; + version = "0.3.16"; + + src = fetchFromGitHub { + owner = "gdombiak"; + repo = "OctoPrint-OctoPod"; + rev = version; + sha256 = "sha256-9QKC1MsYO3XihOTAijJUv5i20iMSQHOHPfLiYPV5y8s="; + }; + + propagatedBuildInputs = with super; [ pillow ]; + + meta = with lib; { + description = "OctoPod extension for OctoPrint"; + homepage = "https://github.com/gdombiak/OctoPrint-OctoPod"; + license = licenses.asl20; + maintainers = with maintainers; [ tri-ler ]; + }; + }; + printtimegenius = buildPlugin rec { pname = "printtimegenius"; - version = "2.3.1"; + version = "2.3.3"; src = fetchFromGitHub { owner = "eyal0"; repo = "OctoPrint-PrintTimeGenius"; rev = version; - sha256 = "sha256-2lxaTcmPBSdfMmViIfLEbeYWfXZpNVAO4i5Z678gWy0="; + sha256 = "sha256-hqm8RShCNpsVbrVXquat5VXqcVc7q5tn5+7Ipqmaw4U="; }; propagatedBuildInputs = with super; [ @@ -261,6 +388,27 @@ in }; }; + prusaslicerthumbnails = buildPlugin rec { + pname = "prusaslicerthumbnails"; + version = "1.0.7"; + + src = fetchFromGitHub { + owner = "jneilliii"; + repo = "OctoPrint-PrusaSlicerThumbnails"; + rev = version; + sha256 = "sha256-waNCTjAZwdBfhHyJCG2La7KTnJ8MDVuX1JLetFB5bS4="; + }; + + propagatedBuildInputs = with super; [ psutil ]; + + meta = with lib; { + description = "Plugin that extracts thumbnails from uploaded gcode files sliced by PrusaSlicer"; + homepage = "https://github.com/jneilliii/OctoPrint-PrusaSlicerThumbnails"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ tri-ler ]; + }; + }; + psucontrol = buildPlugin rec { pname = "psucontrol"; version = "1.0.6"; @@ -289,6 +437,27 @@ in }; }; + resource-monitor = buildPlugin rec { + pname = "resource-monitor"; + version = "0.3.16"; + + src = fetchFromGitHub { + owner = "Renaud11232"; + repo = "OctoPrint-Resource-Monitor"; + rev = version; + sha256 = "sha256-w1PBxO+Qf7cSSNocu7BiulZE7kesSa+LGV3uJlmd0ao="; + }; + + propagatedBuildInputs = with super; [ psutil ]; + + meta = with lib; { + description = "Plugin to view the current CPU and RAM usage on your system"; + homepage = "https://github.com/Renaud11232/OctoPrint-Resource-Monitor"; + license = licenses.mit; + maintainers = with maintainers; [ tri-ler ]; + }; + }; + simpleemergencystop = buildPlugin rec { pname = "simpleemergencystop"; version = "1.0.5"; @@ -367,6 +536,25 @@ in }; }; + timelapsepurger = buildPlugin rec { + pname = "firmwareupdater"; + version = "0.1.4"; + + src = fetchFromGitHub { + owner = "jneilliii"; + repo = "OctoPrint-TimelapsePurger"; + rev = version; + sha256 = "sha256-XS4m4KByScGTPfVE4kuRLw829gNE2CdM0RyhRqGGxyw="; + }; + + meta = with lib; { + description = "Automatically deletes timelapses that are older than configured timeframe"; + homepage = "https://github.com/jneilliii/OctoPrint-TimelapsePurger"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ tri-ler ]; + }; + }; + titlestatus = buildPlugin rec { pname = "titlestatus"; version = "0.0.5"; diff --git a/pkgs/applications/misc/ola/default.nix b/pkgs/applications/misc/ola/default.nix index 2d28d8138c289..b02a63301fee2 100644 --- a/pkgs/applications/misc/ola/default.nix +++ b/pkgs/applications/misc/ola/default.nix @@ -48,10 +48,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Framework for controlling entertainment lighting equipment"; homepage = "https://www.openlighting.org/ola/"; - maintainers = with maintainers; [ ]; + maintainers = [ ]; license = with licenses; [ lgpl21 gpl2Plus ]; platforms = platforms.all; }; diff --git a/pkgs/applications/misc/onboard/default.nix b/pkgs/applications/misc/onboard/default.nix index 6f210791ce9af..0ebe02881003b 100644 --- a/pkgs/applications/misc/onboard/default.nix +++ b/pkgs/applications/misc/onboard/default.nix @@ -1,4 +1,5 @@ { fetchurl +, fetchpatch , lib , substituteAll , aspellWithDicts @@ -54,6 +55,22 @@ python3.pkgs.buildPythonApplication rec { }) # Allow loading hunspell dictionaries installed in NixOS system path ./hunspell-use-xdg-datadirs.patch + + # Python 3.12 fixes (otherwise crashes at startup) + (fetchpatch { + url = "https://github.com/void-linux/void-packages/raw/1be95325d320122efd5dedf7437839cfcca01f7a/srcpkgs/onboard/patches/python-3.12.patch"; + hash = "sha256-Lw5wlaWFlP5rFlEWmlPo5Ux8idrmhET/X9yiu+2Akkk="; + }) + (fetchpatch { + url = "https://github.com/void-linux/void-packages/raw/1be95325d320122efd5dedf7437839cfcca01f7a/srcpkgs/onboard/patches/thread-state.patch"; + hash = "sha256-fJfxD7HshroiEVkaKVBGV7py8tdOhbcprcmBQNuxR9U="; + }) + + # Fix for https://bugs.launchpad.net/onboard/+bug/1948723 + (fetchpatch { + url = "https://github.com/void-linux/void-packages/raw/9ef46bf26ac5acc1af5809f11c97b19c5e2233ed/srcpkgs/onboard/patches/fix-brokenformat.patch"; + hash = "sha256-r9mvJNWpPR1gsayuSSLpzIuafEKqtADYklre0Ju+KOM="; + }) ]; nativeBuildInputs = [ @@ -104,10 +121,10 @@ python3.pkgs.buildPythonApplication rec { hunspellDicts.en-us hunspellDicts.es-es hunspellDicts.it-it - - python3.pkgs.nose ]; + # Tests have never been enabled, and upstream uses nose as a test + # runner (though not as a library). doCheck = false; preBuild = '' @@ -157,8 +174,9 @@ python3.pkgs.buildPythonApplication rec { --replace '"killall",' '"${procps}/bin/pkill", "-x",' ''; + # setuptools to get distutils with python 3.12 installPhase = '' - ${python3.interpreter} setup.py install --prefix="$out" + ${(python3.withPackages (p: [ p.setuptools ])).interpreter} setup.py install --prefix="$out" cp onboard-default-settings.gschema.override.example $out/share/glib-2.0/schemas/10_onboard-default-settings.gschema.override glib-compile-schemas $out/share/glib-2.0/schemas/ diff --git a/pkgs/applications/misc/openbangla-keyboard/default.nix b/pkgs/applications/misc/openbangla-keyboard/default.nix index da1f2dc629d2c..04a9fffcb083b 100644 --- a/pkgs/applications/misc/openbangla-keyboard/default.nix +++ b/pkgs/applications/misc/openbangla-keyboard/default.nix @@ -83,9 +83,9 @@ stdenv.mkDerivation rec { mainProgram = "openbangla-gui"; homepage = "https://openbangla.github.io/"; license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ eclairevoyant hqurve ]; + maintainers = with lib.maintainers; [ hqurve ]; platforms = lib.platforms.linux; # never built on aarch64-linux since first introduction in nixpkgs - broken = stdenv.isLinux && stdenv.isAarch64; + broken = stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64; }; } diff --git a/pkgs/applications/misc/openbox-menu/default.nix b/pkgs/applications/misc/openbox-menu/default.nix index de3fc6cd0accc..7a9fd06cc295c 100644 --- a/pkgs/applications/misc/openbox-menu/default.nix +++ b/pkgs/applications/misc/openbox-menu/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { patches = [ ./000-enable-svg.patch ]; # The strip options are not recognized by Darwin. - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' sed -i -e '/strip -s/d' Makefile ''; diff --git a/pkgs/applications/misc/opencpn/default.nix b/pkgs/applications/misc/opencpn/default.nix index 84aff125aac2b..479fe1bcb0763 100644 --- a/pkgs/applications/misc/opencpn/default.nix +++ b/pkgs/applications/misc/opencpn/default.nix @@ -41,7 +41,6 @@ , rapidjson , sqlite , tinyxml -, udev , util-linux , wxGTK32 , xorg @@ -58,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-axRI3sssj2Q6IBfIeyvOa494b0EgKFP+lFL/QrGIybQ="; }; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' sed -i '/fixup_bundle/d; /NO_DEFAULT_PATH/d' CMakeLists.txt ''; @@ -66,9 +65,9 @@ stdenv.mkDerivation (finalAttrs: { cmake pkg-config gtest - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ lsb-release - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ DarwinTools makeWrapper ]; @@ -78,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: { curl dbus flac - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ AppKit ] ++ [ gtk3 @@ -106,7 +105,7 @@ stdenv.mkDerivation (finalAttrs: { sqlite tinyxml wxGTK32 - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-utils libselinux libsepol @@ -115,7 +114,7 @@ stdenv.mkDerivation (finalAttrs: { xorg.libXtst ] ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform elfutils) [ elfutils - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ lame ]; @@ -125,7 +124,7 @@ stdenv.mkDerivation (finalAttrs: { "-DSQUISH_USE_SSE=0" ]); - postInstall = lib.optionals stdenv.isDarwin '' + postInstall = lib.optionals stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications mv $out/bin/OpenCPN.app $out/Applications makeWrapper $out/Applications/OpenCPN.app/Contents/MacOS/OpenCPN $out/bin/opencpn diff --git a/pkgs/applications/misc/openlp/default.nix b/pkgs/applications/misc/openlp/default.nix deleted file mode 100644 index c77b494f08cac..0000000000000 --- a/pkgs/applications/misc/openlp/default.nix +++ /dev/null @@ -1,87 +0,0 @@ -# This file contains all runtime glue: Bindings to optional runtime dependencies -# for pdfSupport, presentationSupport, and media playback. -{ lib, mkDerivation, wrapGAppsHook3, python3Packages - -# qt deps -, qtbase, qtmultimedia - -# optional deps -, pdfSupport ? false, mupdf # alternatively could use ghostscript -, presentationSupport ? false, libreoffice-unwrapped -, vlcSupport ? false -, gstreamerSupport ? false, gst_all_1, gstPlugins ? (gst: [ - gst.gst-plugins-base - gst.gst-plugins-good - gst.gst-plugins-bad - gst.gst-plugins-ugly - ]) - -#, enableMySql ? false # Untested. If interested, contact maintainer. -#, enablePostgreSql ? false # Untested. If interested, contact maintainer. -#, enableJenkinsApi ? false # Untested. If interested, contact maintainer. -}: - -let p = gstPlugins gst_all_1; -# If gstreamer is activated but no plugins are given, it will at runtime -# create the false illusion of being usable. -in assert gstreamerSupport -> (builtins.isList p && builtins.length p > 0); - -let - # optional packages - libreofficePath = "${libreoffice-unwrapped}/lib/libreoffice/program"; - - # lib functions - inherit (lib.lists) optional optionals; - wrapSetVar = var: ''--set ${var} "''$${var}"''; - - # base pkg/lib - baseLib = python3Packages.callPackage ./lib.nix { }; -in mkDerivation { - pname = baseLib.pname + lib.optionalString (pdfSupport && presentationSupport && vlcSupport && gstreamerSupport) "-full"; - inherit (baseLib) version src; - - nativeBuildInputs = [ python3Packages.wrapPython wrapGAppsHook3 ]; - buildInputs = [ qtbase ] ++ optionals gstreamerSupport - ([ qtmultimedia.bin gst_all_1.gstreamer ] ++ gstPlugins gst_all_1); - propagatedBuildInputs = optional pdfSupport mupdf - ++ optional presentationSupport libreoffice-unwrapped; - pythonPath = [ baseLib ] ++ optional vlcSupport python3Packages.python-vlc; - # ++ optional enableMySql mysql-connector # Untested. If interested, contact maintainer. - # ++ optional enablePostgreSql psycopg2 # Untested. If interested, contact maintainer. - # ++ optional enableJenkinsApi jenkinsapi # Untested. If interested, contact maintainer. - - PYTHONPATH = libreofficePath; - URE_BOOTSTRAP = "vnd.sun.star.pathname:${libreofficePath}/fundamentalrc"; - UNO_PATH = libreofficePath; - LD_LIBRARY_PATH = libreofficePath; - JAVA_HOME = "${libreoffice-unwrapped.jdk.home}"; - - dontWrapQtApps = true; - dontWrapGApps = true; - - # defined in gappsWrapperHook - wrapPrefixVariables = optionals presentationSupport - [ "PYTHONPATH" "LD_LIBRARY_PATH" "JAVA_HOME" ]; - makeWrapperArgs = [ - "\${gappsWrapperArgs[@]}" - "\${qtWrapperArgs[@]}" - ] ++ optionals presentationSupport - ([ "--prefix PATH : ${libreoffice-unwrapped}/bin" ] - ++ map wrapSetVar [ "URE_BOOTSTRAP" "UNO_PATH" ]); - - installPhase = '' - install -D openlp.py $out/bin/openlp - ''; - - preFixup = '' - wrapPythonPrograms - ''; - - meta = baseLib.meta // { - hydraPlatforms = [ ]; # this is only the wrapper; baseLib gets built - }; - - passthru = { - inherit baseLib; - }; -} diff --git a/pkgs/applications/misc/openlp/lib.nix b/pkgs/applications/misc/openlp/lib.nix deleted file mode 100644 index ea22f54ac022e..0000000000000 --- a/pkgs/applications/misc/openlp/lib.nix +++ /dev/null @@ -1,103 +0,0 @@ -# This file contains the base package, some of which is compiled. -# Runtime glue to optinal runtime dependencies is in 'default.nix'. -{ fetchurl, lib, qt5 - -# python deps -, python, buildPythonPackage -, alembic, beautifulsoup4, chardet, lxml, mako, pyenchant -, pyqt5-webkit, pyxdg, sip4, sqlalchemy, sqlalchemy-migrate -}: - -buildPythonPackage rec { - pname = "openlp"; - version = "2.4.6"; - - src = fetchurl { - url = "https://get.openlp.org/${version}/OpenLP-${version}.tar.gz"; - sha256 = "f63dcf5f1f8a8199bf55e806b44066ad920d26c9cf67ae432eb8cdd1e761fc30"; - }; - - doCheck = false; - # FIXME: checks must be disabled because they are lacking the qt env. - # They fail like this, even if built and wrapped with all Qt and - # runtime dependencies: - # - # running install tests - # qt.qpa.plugin: Could not find the Qt platform plugin "xcb" in "" - # This application failed to start because no Qt platform plugin could be initialized. Reinstalling the application may fix this problem. - # - # Available platform plugins are: wayland-egl, wayland, wayland-xcomposite-egl, wayland-xcomposite-glx. - # - # See also https://discourse.nixos.org/t/qt-plugin-path-unset-in-test-phase/ - - #nativeCheckInputs = [ mock nose ]; - nativeBuildInputs = [ qt5.qttools ]; - propagatedBuildInputs = [ - alembic - beautifulsoup4 - chardet - lxml - mako - pyenchant - pyqt5-webkit - pyxdg - sip4 - sqlalchemy - sqlalchemy-migrate - ]; - - prePatch = '' - echo 'from vlc import *' > openlp/core/ui/media/vendor/vlc.py - ''; - - dontWrapQtApps = true; - dontWrapGApps = true; - postInstall = '' - ( # use subshell because of cd - tdestdir="$out/i18n" - mkdir -p "$tdestdir" - cd ./resources/i18n - for file in *.ts; do - lconvert -i "$file" -o "$tdestdir/''${file%%ts}qm" - done - ) - ''; - - preFixup = '' - rm -r $out/${python.sitePackages}/tests - rm -r $out/bin - ''; - - meta = with lib; { - description = "Free church presentation software"; - homepage = "https://openlp.org/"; - downloadPage = "https://openlp.org/#downloads"; - platforms = platforms.unix; - license = licenses.gpl2Only; - maintainers = [ maintainers.jorsn ]; - - longDescription = '' - OpenLP is a free church presentation software. - - Features: - - * Cross platform between Linux, Windows, OS X and FreeBSD - * Display songs, Bible verses, presentations, images, audio and video - * Control OpenLP remotely via the Android remote, iOS remote or mobile web browser - * Quickly and easily import songs from other popular presentation packages - * Easy enough to use to get up and running in less than 10 minutes - - Remark: This pkg only supports sqlite dbs. If you wish to have support for - mysql or postgresql dbs, or Jenkins, please contact the maintainer. - - Bugs which affect this software packaged in Nixpkgs: - - 1. The package must disable checks, because they are lacking the qt env. - (see pkg source and https://discourse.nixos.org/t/qt-plugin-path-unset-in-test-phase/) - 2. There is a segfault on exit. Not a real problem, according to debug log, everything - shuts down correctly. Maybe related to https://forums.openlp.org/discussion/3620/crash-on-exit. - Plan: Wait for OpenLP-3, since it is already in beta 1 - (2021-02-09; news: https://openlp.org/blog/). - ''; - }; -} diff --git a/pkgs/applications/misc/openrgb/default.nix b/pkgs/applications/misc/openrgb/default.nix index ce92193727357..5c158d7ab7679 100644 --- a/pkgs/applications/misc/openrgb/default.nix +++ b/pkgs/applications/misc/openrgb/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "CalcProgrammer1"; repo = "OpenRGB"; rev = "release_${version}"; - sha256 = "sha256-XBLj4EfupyeVHRc0pVI7hrXFoCNJ7ak2yO0QSfhBsGU="; + hash = "sha256-XBLj4EfupyeVHRc0pVI7hrXFoCNJ7ak2yO0QSfhBsGU="; }; nativeBuildInputs = [ qmake pkg-config wrapQtAppsHook ]; @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Open source RGB lighting control"; homepage = "https://gitlab.com/CalcProgrammer1/OpenRGB"; - maintainers = with maintainers; [ ]; + maintainers = [ ]; license = licenses.gpl2Plus; platforms = platforms.linux; mainProgram = "openrgb"; diff --git a/pkgs/applications/misc/oranda/default.nix b/pkgs/applications/misc/oranda/default.nix index db3103ea42497..0c5e55efe0eff 100644 --- a/pkgs/applications/misc/oranda/default.nix +++ b/pkgs/applications/misc/oranda/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "oranda"; - version = "0.6.3"; + version = "0.6.5"; src = fetchFromGitHub { owner = "axodotdev"; repo = "oranda"; rev = "v${version}"; - hash = "sha256-PECM0HLomMzNWnERgvYSfSh+XQAjGLxybZAJcaAzEBo="; + hash = "sha256-FVd8NQVtzlZsDY40ZMJDdaX+6Q5jUxZHUq2v+kDFVOk="; }; - cargoHash = "sha256-qO48oR3RtyCbhdGn+VZPceZX/RMqS+5LacSASYRboMo="; + cargoHash = "sha256-48qDAgHf1tGUwhQWqEi4LQQmSi9PplTlgjVd7/yxZZc="; nativeBuildInputs = [ pkg-config @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ oniguruma - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices darwin.apple_sdk.frameworks.SystemConfiguration ]; @@ -42,7 +42,7 @@ rustPlatform.buildRustPackage rec { env = { RUSTONIG_SYSTEM_LIBONIG = true; ORANDA_USE_TAILWIND_BINARY = true; - } // lib.optionalAttrs stdenv.isDarwin { + } // lib.optionalAttrs stdenv.hostPlatform.isDarwin { # without this, tailwindcss fails with OpenSSL configuration error OPENSSL_CONF = ""; }; diff --git a/pkgs/applications/misc/organicmaps/default.nix b/pkgs/applications/misc/organicmaps/default.nix index 5388b7b7485eb..b81f09e1c3015 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 @@ -29,13 +30,13 @@ let }; in stdenv.mkDerivation rec { pname = "organicmaps"; - version = "2024.06.19-3"; + version = "2024.09.08-7"; src = fetchFromGitHub { owner = "organicmaps"; repo = "organicmaps"; rev = "${version}-android"; - hash = "sha256-LB3yLBoO6nXRvfuWWB2JofeAgQQFtEgqNo2QFQ3k/vc="; + hash = "sha256-X1dmk1IBjqM2AUVkvSDNZyVtV5Ens9ninZvMvsRc334="; fetchSubmodules = true; }; @@ -68,6 +69,7 @@ in stdenv.mkDerivation rec { qtbase qtpositioning qtsvg + qtwayland libGLU libGL zlib @@ -89,7 +91,7 @@ in stdenv.mkDerivation rec { meta = with lib; { # darwin: "invalid application of 'sizeof' to a function type" - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; homepage = "https://organicmaps.app/"; description = "Detailed Offline Maps for Travellers, Tourists, Hikers and Cyclists"; license = licenses.asl20; diff --git a/pkgs/applications/misc/otpclient/default.nix b/pkgs/applications/misc/otpclient/default.nix index 0ab84ea083720..d850da3b58f8a 100644 --- a/pkgs/applications/misc/otpclient/default.nix +++ b/pkgs/applications/misc/otpclient/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "otpclient"; - version = "3.6.0"; + version = "4.0.2"; src = fetchFromGitHub { owner = "paolostivanin"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-3Nv2ci8MBjvWc7gF5UOJnyfSV8XK0REN1XwI8RUYgWI="; + hash = "sha256-lSGXxwtys3V8dDTAW7l7+9VlF9tZQnWqNaV8neBvMRg="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/oxker/default.nix b/pkgs/applications/misc/oxker/default.nix index bfa2278e8b866..ca2b0c033ee91 100644 --- a/pkgs/applications/misc/oxker/default.nix +++ b/pkgs/applications/misc/oxker/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "oxker"; - version = "0.6.4"; + version = "0.7.2"; src = fetchCrate { inherit pname version; - sha256 = "sha256-dBehxqr/UCXIQDMrGFN6ID+v0NYi50JTHuML3su2O0A="; + hash = "sha256-Qh/mUEfCvrOrUHJ1kEWb3BLBmMyP/MzUyfFoB+eYj9w="; }; - cargoHash = "sha256-wI7yqRvaszBP4OtlWbWIZ9RLf5y7dx2KufYLaK+PWps="; + cargoHash = "sha256-VYA5Y6CjhKx3MgQ0pyOO7vw44cKykRjlgUZopgR9pYo="; meta = with lib; { description = "Simple tui to view & control docker containers"; diff --git a/pkgs/applications/misc/p2pool/default.nix b/pkgs/applications/misc/p2pool/default.nix index 9265543ff8f5c..b8ca97d298ac3 100644 --- a/pkgs/applications/misc/p2pool/default.nix +++ b/pkgs/applications/misc/p2pool/default.nix @@ -19,22 +19,26 @@ let in stdenv.mkDerivation rec { pname = "p2pool"; - version = "3.10"; + version = "4.1"; src = fetchFromGitHub { owner = "SChernykh"; repo = "p2pool"; rev = "v${version}"; - sha256 = "sha256-IDOtwrIKzP/pbwqIespvZtNS1VdR3246uXxgxR3V6VI="; + hash = "sha256-eMg8DXFtVfYhl6vpg/KRUZUgMU/XsCS29Af1CSIbUsY="; fetchSubmodules = true; }; nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ libuv zeromq libsodium gss hwloc openssl curl ] - ++ lib.optionals stdenv.isDarwin [ Foundation ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Foundation ]; cmakeFlags = ["-DWITH_LTO=OFF"]; + env.NIX_CFLAGS_COMPILE = toString (lib.optionals (stdenv.hostPlatform.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "10.13") [ + "-faligned-allocation" + ]); + installPhase = '' runHook preInstall @@ -53,5 +57,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Only; maintainers = with maintainers; [ ratsclub ]; mainProgram = "p2pool"; + platforms = platforms.all; }; } diff --git a/pkgs/applications/misc/pagefind/default.nix b/pkgs/applications/misc/pagefind/default.nix index aa0fb08984edc..66ebad25ec361 100644 --- a/pkgs/applications/misc/pagefind/default.nix +++ b/pkgs/applications/misc/pagefind/default.nix @@ -1,5 +1,4 @@ { lib -, callPackage , rustPlatform , fetchFromGitHub , fetchNpmDeps @@ -8,9 +7,9 @@ , gzip , nodejs , rustc -, stdenv , wasm-bindgen-cli , wasm-pack +, fetchpatch }: let @@ -34,7 +33,15 @@ rustPlatform.buildRustPackage rec { hash = "sha256-pcgcu9zylSTjj5rxNff+afFBWVpN5sGtlpadG1wb93M="; }; - cargoHash = "sha256-E4gjG5GrVWkMKgjQiAvEiSy2/tx/yHKe+5isveMZ9tU="; + cargoPatches = [ + (fetchpatch { # https://github.com/CloudCannon/pagefind/pull/680 + name = "cargo-update-time.patch"; + url = "https://github.com/CloudCannon/pagefind/commit/e6778572d225316803180db822f5cc12a936acd2.patch"; + hash = "sha256-XHpHA1hPIe+wjDQ6LE9hn2jn3eMBOK9Yoo920jfH9do="; + }) + ]; + + cargoHash = "sha256-KWWln7QCRo02cOgHy5JNERGS0CvvgsPISwkTZeeNEkg="; env.npmDeps_web_js = fetchNpmDeps { name = "npm-deps-web-js"; @@ -121,9 +128,6 @@ rustPlatform.buildRustPackage rec { license = licenses.mit; maintainers = with maintainers; [ pbsds ]; platforms = platforms.unix; - # See comment about wasm32-unknown-unknown in rustc.nix. - broken = lib.any (a: lib.hasAttr a stdenv.hostPlatform.gcc) [ "cpu" "float-abi" "fpu" ] || - !stdenv.hostPlatform.gcc.thumb or true; mainProgram = "pagefind"; }; } diff --git a/pkgs/applications/misc/parsec/bin.nix b/pkgs/applications/misc/parsec/bin.nix index e6c250afc321b..f85e6acbd1f00 100644 --- a/pkgs/applications/misc/parsec/bin.nix +++ b/pkgs/applications/misc/parsec/bin.nix @@ -16,22 +16,21 @@ , libXfixes , libpulseaudio , libva -, ffmpeg_5 +, ffmpeg_6 , libpng , libjpeg8 , curl , vulkan-loader -, gnome -, zenity ? gnome.zenity +, zenity }: stdenvNoCC.mkDerivation { pname = "parsec-bin"; - version = "150_93b"; + version = "150_95"; src = fetchurl { - url = "https://web.archive.org/web/20240329180120/https://builds.parsec.app/package/parsec-linux.deb"; - sha256 = "sha256-wfsauQMubnGKGfL9c0Zee5g3nn0eEnOFalQNL3d4weE="; + url = "https://web.archive.org/web/20240725203323/https://builds.parsec.app/package/parsec-linux.deb"; + sha256 = "sha256-9F56u+jYj2CClhbnGlLi65FxS1Vq00coxwu7mjVTY1w="; }; unpackPhase = '' @@ -58,7 +57,7 @@ stdenvNoCC.mkDerivation { alsa-lib libpulseaudio libva - ffmpeg_5 + ffmpeg_6 libpng libjpeg8 curl 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/pastel/default.nix b/pkgs/applications/misc/pastel/default.nix index 69e6a53758a4f..5164e294a89bc 100644 --- a/pkgs/applications/misc/pastel/default.nix +++ b/pkgs/applications/misc/pastel/default.nix @@ -2,18 +2,18 @@ rustPlatform.buildRustPackage rec { pname = "pastel"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "sharkdp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-uK4HWC+uGiey+K0p8+Wi+Pi+U7b4k09b8iKF9BmTPcc="; + sha256 = "sha256-kr2aLRd143ksVx42ZDO/NILydObinn3AwPCniXVVmY0="; }; - cargoSha256 = "sha256-5paHSrqU8tItD/CAbauj6KcW/mKsveOAfXjD/NUuFAc="; + cargoHash = "sha256-+Cw/aAXkSbYLqc7TGWsMUJNo88v0s1Cq1m4V84j3gXE="; - buildInputs = lib.optional stdenv.isDarwin Security; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin Security; meta = with lib; { description = "Command-line tool to generate, analyze, convert and manipulate colors"; diff --git a/pkgs/applications/misc/pdfarranger/default.nix b/pkgs/applications/misc/pdfarranger/default.nix deleted file mode 100644 index 7e0dc4c2fdb2c..0000000000000 --- a/pkgs/applications/misc/pdfarranger/default.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ fetchFromGitHub -, lib -, wrapGAppsHook3 -, python3Packages -, gtk3 -, poppler_gi -, libhandy -}: - -python3Packages.buildPythonApplication rec { - pname = "pdfarranger"; - version = "1.10.1"; - pyproject = true; - - src = fetchFromGitHub { - owner = "pdfarranger"; - repo = "pdfarranger"; - rev = "refs/tags/${version}"; - hash = "sha256-l//DeaIqUl6FdGFxM8yTKcTjVNvYMllorcoXoK33Iy4="; - }; - - nativeBuildInputs = [ - wrapGAppsHook3 - ] ++ (with python3Packages; [ - setuptools - ]); - - buildInputs = [ - gtk3 - poppler_gi - libhandy - ]; - - propagatedBuildInputs = with python3Packages; [ - pygobject3 - pikepdf - img2pdf - setuptools - python-dateutil - ]; - - # incompatible with wrapGAppsHook3 - strictDeps = false; - dontWrapGApps = true; - preFixup = '' - makeWrapperArgs+=("''${gappsWrapperArgs[@]}") - ''; - - doCheck = false; # no tests - - meta = with lib; { - inherit (src.meta) homepage; - description = "Merge or split pdf documents and rotate, crop and rearrange their pages using an interactive and intuitive graphical interface"; - mainProgram = "pdfarranger"; - platforms = platforms.linux; - maintainers = with maintainers; [ symphorien ]; - license = licenses.gpl3Plus; - changelog = "https://github.com/pdfarranger/pdfarranger/releases/tag/${version}"; - }; -} diff --git a/pkgs/applications/misc/pdfpc/default.nix b/pkgs/applications/misc/pdfpc/default.nix index 2b6e7a0ed88cb..cae71f785978d 100644 --- a/pkgs/applications/misc/pdfpc/default.nix +++ b/pkgs/applications/misc/pdfpc/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { }) ]; - cmakeFlags = lib.optional stdenv.isDarwin (lib.cmakeBool "MOVIES" false); + cmakeFlags = lib.optional stdenv.hostPlatform.isDarwin (lib.cmakeBool "MOVIES" false); meta = with lib; { description = "Presenter console with multi-monitor support for PDF files"; diff --git a/pkgs/applications/misc/pdfsam-basic/default.nix b/pkgs/applications/misc/pdfsam-basic/default.nix index ce3ce1a740120..68dce0ee1484f 100644 --- a/pkgs/applications/misc/pdfsam-basic/default.nix +++ b/pkgs/applications/misc/pdfsam-basic/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pdfsam-basic"; - version = "5.2.3"; + version = "5.2.6"; src = fetchurl { url = "https://github.com/torakiki/pdfsam/releases/download/v${version}/pdfsam_${version}-1_amd64.deb"; - hash = "sha256-ai1UHMeLvCba6WV6f6dGc53CxPP7bJaPgo8Tm7ddkOM="; + hash = "sha256-u9ldHJkY3/VfykBFgVY8Ah/uYNpTIkLyvPY7zfLWN38="; }; unpackPhase = '' diff --git a/pkgs/applications/misc/pe-bear/default.nix b/pkgs/applications/misc/pe-bear/default.nix index 9a71d8add70e1..7ee5f3167434f 100644 --- a/pkgs/applications/misc/pe-bear/default.nix +++ b/pkgs/applications/misc/pe-bear/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "pe-bear"; - version = "0.6.7.3"; + version = "0.7.0"; src = fetchFromGitHub { owner = "hasherezade"; repo = "pe-bear"; rev = "v${version}"; - sha256 = "sha256-We3XxSsGL1mTK5DgI2wgRm7OaziI/cZRiLd+qrvZ7SE="; + hash = "sha256-jHFH1GAbAtOzUh+Gma89YCU5r/yuwekv/bqiyy8VmRk="; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/pgmodeler/default.nix b/pkgs/applications/misc/pgmodeler/default.nix index c3b5491387cd4..35777a0b25635 100644 --- a/pkgs/applications/misc/pgmodeler/default.nix +++ b/pkgs/applications/misc/pgmodeler/default.nix @@ -13,19 +13,19 @@ stdenv.mkDerivation rec { pname = "pgmodeler"; - version = "1.1.3"; + version = "1.1.4"; src = fetchFromGitHub { owner = "pgmodeler"; repo = "pgmodeler"; rev = "v${version}"; - sha256 = "sha256-LDgRv7Todyy2pnE21Z0O5JQ6mE4ZO3THv6rfEWU66Cc="; + sha256 = "sha256-axw0/QFQfnEc2P8tFRtSY5vVUJTqv+kRn68GXdZ5SeQ="; }; nativeBuildInputs = [ pkg-config qmake wrapQtAppsHook ]; - qmakeFlags = [ "pgmodeler.pro" "CONFIG+=release" ] ++ lib.optionals stdenv.isDarwin [ - "PGSQL_INC=${postgresql}/include" - "PGSQL_LIB=${postgresql.lib}/lib/libpq.dylib" + qmakeFlags = [ "pgmodeler.pro" "CONFIG+=release" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + "PGSQL_INC=${lib.getDev postgresql}/include" + "PGSQL_LIB=${lib.getLib postgresql}/lib/libpq.dylib" "XML_INC=${libxml2.dev}/include/libxml2" "XML_LIB=${libxml2.out}/lib/libxml2.dylib" "PREFIX=${placeholder "out"}/Applications/pgModeler.app/Contents" @@ -33,10 +33,10 @@ stdenv.mkDerivation rec { # todo: libpq would suffice here. Unfortunately this won't work, if one uses only postgresql.lib here. buildInputs = [ postgresql qtsvg ] - ++ lib.optionals stdenv.isLinux [ qtwayland ] - ++ lib.optionals stdenv.isDarwin [ cups libxml2 ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ qtwayland ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ cups libxml2 ]; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/bin for item in pgmodeler pgmodeler-{cli,se,ch} do @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { done ''; - dontWrapQtApps = stdenv.isDarwin; + dontWrapQtApps = stdenv.hostPlatform.isDarwin; meta = with lib; { description = "Database modeling tool for PostgreSQL"; diff --git a/pkgs/applications/misc/phoc/default.nix b/pkgs/applications/misc/phoc/default.nix index 9d76649687570..494d287364c2b 100644 --- a/pkgs/applications/misc/phoc/default.nix +++ b/pkgs/applications/misc/phoc/default.nix @@ -1,15 +1,16 @@ { lib , stdenv , stdenvNoCC -, fetchurl +, fetchFromGitLab , meson , ninja , pkg-config , python3 +, wayland-scanner , wrapGAppsHook3 , libinput , gobject-introspection -, gnome +, mutter , gnome-desktop , glib , gtk3 @@ -22,16 +23,20 @@ , directoryListingUpdater , nixosTests , testers +, gmobile }: stdenv.mkDerivation (finalAttrs: { pname = "phoc"; - version = "0.38.0"; + version = "0.41.0"; - src = fetchurl { - # This tarball includes the meson wrapped subproject 'gmobile'. - url = with finalAttrs; "https://sources.phosh.mobi/releases/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-OcRUnw1Fck9bMSgfMMcWqqR6a6yzyKjY8P3nqcwVULc="; + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + group = "World"; + owner = "Phosh"; + repo = "phoc"; + rev = "v${finalAttrs.version}"; + hash = "sha256-T2gKvP3WyrGNOiCwiX93UjMuSTnnZ+nykEAFhq0BF4U="; }; nativeBuildInputs = [ @@ -40,6 +45,7 @@ stdenv.mkDerivation (finalAttrs: { ninja pkg-config python3 + wayland-scanner wrapGAppsHook3 ]; @@ -51,11 +57,12 @@ stdenv.mkDerivation (finalAttrs: { gtk3 gnome-desktop # For keybindings settings schemas - gnome.mutter + mutter json-glib wayland finalAttrs.wlroots xorg.xcbutilwm + gmobile ]; mesonFlags = ["-Dembed-wlroots=disabled"]; diff --git a/pkgs/applications/misc/pipr/default.nix b/pkgs/applications/misc/pipr/default.nix index f7aeb09b1f9be..466451443e470 100644 --- a/pkgs/applications/misc/pipr/default.nix +++ b/pkgs/applications/misc/pipr/default.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-6jtUNhib6iveuZ7qUKK7AllyMKFpZ8OUUaIieFqseY8="; }; - cargoSha256 = "sha256-SLOiX8z8LuQ9VA/lg0lOhqs85MGs0vmeP74cS6sgghI="; + cargoHash = "sha256-SLOiX8z8LuQ9VA/lg0lOhqs85MGs0vmeP74cS6sgghI="; nativeBuildInputs = [ makeWrapper ]; postFixup = '' 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/playonlinux/default.nix b/pkgs/applications/misc/playonlinux/default.nix index 4f12fb470671e..92b29ee717368 100644 --- a/pkgs/applications/misc/playonlinux/default.nix +++ b/pkgs/applications/misc/playonlinux/default.nix @@ -3,10 +3,10 @@ , fetchurl , cabextract , gettext -, glxinfo , gnupg , icoutils , imagemagick +, mesa-demos , netcat-gnu , p7zip , python3 @@ -37,10 +37,10 @@ let cabextract python gettext - glxinfo gnupg icoutils imagemagick + mesa-demos netcat-gnu p7zip unzip diff --git a/pkgs/applications/misc/plover/default.nix b/pkgs/applications/misc/plover/default.nix index 3f4e82d2e4d9d..65161d713f29a 100644 --- a/pkgs/applications/misc/plover/default.nix +++ b/pkgs/applications/misc/plover/default.nix @@ -8,7 +8,7 @@ version = "4.0.0.dev10"; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "OpenSteno Plover stenography software"; maintainers = with maintainers; [ twey kovirobi ]; license = licenses.gpl2; diff --git a/pkgs/applications/misc/polychromatic/default.nix b/pkgs/applications/misc/polychromatic/default.nix index 24ff669e4f22a..ad0736c8bc4b6 100644 --- a/pkgs/applications/misc/polychromatic/default.nix +++ b/pkgs/applications/misc/polychromatic/default.nix @@ -18,14 +18,14 @@ python3Packages.buildPythonApplication rec { pname = "polychromatic"; - version = "0.9.1"; + version = "0.9.2"; format = "other"; src = fetchFromGitHub { owner = "polychromatic"; repo = "polychromatic"; - rev = "v${version}"; - hash = "sha256-3Pt1Z8G0xDWlFD7LxJILPUifMBTN4OvPNHZv80umO1s="; + rev = "refs/tags/v${version}"; + hash = "sha256-eSfyoEu4qQv+R17wgTfATOE1uHkksNxo17btR6swuZo="; }; postPatch = '' diff --git a/pkgs/applications/misc/pomodoro/default.nix b/pkgs/applications/misc/pomodoro/default.nix index 35244bf041a77..d9f76a75451b8 100644 --- a/pkgs/applications/misc/pomodoro/default.nix +++ b/pkgs/applications/misc/pomodoro/default.nix @@ -11,8 +11,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-ZA1q1YVJcdSUF9NTikyT3vrRnqbsu5plzRI2gMu+qnQ="; }; - cargoSha256 = "sha256-6ZhWStZebXSwrej36DXifrsrmR1SWW3PwGUX0hqPwE4="; - buildInputs = lib.optionals stdenv.isDarwin [ Foundation ]; + cargoHash = "sha256-6ZhWStZebXSwrej36DXifrsrmR1SWW3PwGUX0hqPwE4="; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Foundation ]; meta = with lib; { description = "Simple CLI pomodoro timer using desktop notifications written in Rust"; @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { license = licenses.mit; maintainers = with maintainers; [ annaaurora ]; # error: redefinition of module 'ObjectiveC' - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; mainProgram = "pomodoro"; }; } diff --git a/pkgs/applications/misc/pop-launcher/default.nix b/pkgs/applications/misc/pop-launcher/default.nix deleted file mode 100644 index b8ba5133904b2..0000000000000 --- a/pkgs/applications/misc/pop-launcher/default.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ rustPlatform -, fetchFromGitHub -, lib -, fd -, libqalculate -}: - -rustPlatform.buildRustPackage rec { - pname = "pop-launcher"; - version = "1.2.1"; - - src = fetchFromGitHub { - owner = "pop-os"; - repo = "launcher"; - rev = version; - sha256 = "sha256-BQAO9IodZxGgV8iBmUaOF0yDbAMVDFslKCqlh3pBnb0="; - }; - - postPatch = '' - substituteInPlace src/lib.rs \ - --replace '/usr/lib/pop-launcher' "$out/share/pop-launcher" - substituteInPlace plugins/src/scripts/mod.rs \ - --replace '/usr/lib/pop-launcher' "$out/share/pop-launcher" - substituteInPlace plugins/src/calc/mod.rs \ - --replace 'Command::new("qalc")' 'Command::new("${libqalculate}/bin/qalc")' - substituteInPlace plugins/src/find/mod.rs \ - --replace 'spawn("fd")' 'spawn("${fd}/bin/fd")' - substituteInPlace plugins/src/terminal/mod.rs \ - --replace '/usr/bin/gnome-terminal' 'gnome-terminal' - ''; - - cargoSha256 = "sha256-cTvrq0fH057UIx/O9u8zHMsg+psMGg1q9klV5OMxtok="; - - cargoBuildFlags = [ "--package" "pop-launcher-bin" ]; - - postInstall = '' - mv $out/bin/pop-launcher{-bin,} - - plugins_dir=$out/share/pop-launcher/plugins - scripts_dir=$out/share/pop-launcher/scripts - mkdir -p $plugins_dir $scripts_dir - - for plugin in $(find plugins/src -mindepth 1 -maxdepth 1 -type d -printf '%f\n'); do - mkdir $plugins_dir/$plugin - cp plugins/src/$plugin/*.ron $plugins_dir/$plugin - ln -sf $out/bin/pop-launcher $plugins_dir/$plugin/$(echo $plugin | sed 's/_/-/') - done - - for script in scripts/*; do - cp -r $script $scripts_dir - done - ''; - - meta = with lib; { - description = "Modular IPC-based desktop launcher service"; - homepage = "https://github.com/pop-os/launcher"; - platforms = platforms.linux; - license = licenses.mpl20; - maintainers = with maintainers; [ samhug ]; - mainProgram = "pop-launcher"; - }; -} diff --git a/pkgs/applications/misc/porsmo/default.nix b/pkgs/applications/misc/porsmo/default.nix index f741ad2d6b482..6d9ed5ee2c98e 100644 --- a/pkgs/applications/misc/porsmo/default.nix +++ b/pkgs/applications/misc/porsmo/default.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ alsa-lib - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreAudio darwin.apple_sdk.frameworks.CoreFoundation ]; diff --git a/pkgs/applications/misc/process-compose/default.nix b/pkgs/applications/misc/process-compose/default.nix index dad288ef47595..2d37a68683100 100644 --- a/pkgs/applications/misc/process-compose/default.nix +++ b/pkgs/applications/misc/process-compose/default.nix @@ -8,13 +8,13 @@ let config-module = "github.com/f1bonacc1/process-compose/src/config"; in buildGoModule rec { pname = "process-compose"; - version = "1.6.1"; + version = "1.27.0"; src = fetchFromGitHub { owner = "F1bonacc1"; repo = pname; rev = "v${version}"; - hash = "sha256-yFKqdUlfiMQbx3yJLD5/BJ8pecg5NRr64+HbUwsEOE4="; + hash = "sha256-v8tcnndAP4+1cRWW2LmAsmSIvALdeESuuv2QmRQhq/s="; # 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; @@ -43,7 +43,7 @@ buildGoModule rec { installShellFiles ]; - vendorHash = "sha256-c53Af0X/TUFsxpV4YE525uh+yLG/t2tSmQkr9ElziBM="; + vendorHash = "sha256-G4ar+9ARBwR77t/6NswUDXpUw38rYnLy9lIep302mNI="; doCheck = false; diff --git a/pkgs/applications/misc/process-viewer/default.nix b/pkgs/applications/misc/process-viewer/default.nix index 94327ef3e4db9..10f55aced9ead 100644 --- a/pkgs/applications/misc/process-viewer/default.nix +++ b/pkgs/applications/misc/process-viewer/default.nix @@ -13,14 +13,14 @@ rustPlatform.buildRustPackage rec { src = fetchCrate { inherit pname version; - sha256 = "sha256-mEmtLCtHlrCurjKKJ3vEtEkLBik4LwuUED5UeQ1QLws="; + hash = "sha256-mEmtLCtHlrCurjKKJ3vEtEkLBik4LwuUED5UeQ1QLws="; }; - cargoSha256 = "sha256-lgVByl+mpCDbhwlC1Eiw9ZkHIDYJsOR06Ds790pXOMc="; + cargoHash = "sha256-lgVByl+mpCDbhwlC1Eiw9ZkHIDYJsOR06Ds790pXOMc="; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ gtk4 ] ++ lib.optionals stdenv.isDarwin [ + buildInputs = [ gtk4 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk_11_0.frameworks.Foundation ]; diff --git a/pkgs/applications/misc/protonup-qt/default.nix b/pkgs/applications/misc/protonup-qt/default.nix index c6c2df56f2283..f5c47507893a2 100644 --- a/pkgs/applications/misc/protonup-qt/default.nix +++ b/pkgs/applications/misc/protonup-qt/default.nix @@ -1,10 +1,10 @@ { appimageTools, fetchurl, lib }: let pname = "protonup-qt"; - version = "2.9.2"; + version = "2.10.2"; src = fetchurl { url = "https://github.com/DavidoTek/ProtonUp-Qt/releases/download/v${version}/ProtonUp-Qt-${version}-x86_64.AppImage"; - hash = "sha256-d1UjyhU7BezOoQZBnmrk96gD0MbYST0XR+PWVYmvGFQ="; + hash = "sha256-WWLAA5FryvqwgEQysnE1w2k9Wq4y7yNJ4Drojg1SKYg="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; in diff --git a/pkgs/applications/misc/prusa-slicer/default.nix b/pkgs/applications/misc/prusa-slicer/default.nix index 96fc551595b5a..ecce3066ed5b2 100644 --- a/pkgs/applications/misc/prusa-slicer/default.nix +++ b/pkgs/applications/misc/prusa-slicer/default.nix @@ -2,6 +2,7 @@ , lib , binutils , fetchFromGitHub +, fetchpatch , cmake , pkg-config , wrapGAppsHook3 @@ -15,6 +16,7 @@ , expat , glew , glib +, glib-networking , gmp , gtk3 , hicolor-icon-theme @@ -64,15 +66,27 @@ let }); openvdb_tbb_2021_8 = openvdb.override { tbb = tbb_2021_11; }; wxGTK-override' = if wxGTK-override == null then wxGTK-prusa else wxGTK-override; + + patches = [ + (fetchpatch { + url = "https://raw.githubusercontent.com/gentoo/gentoo/master/media-gfx/prusaslicer/files/prusaslicer-2.8.0-missing-includes.patch"; + hash = "sha256-/R9jv9zSP1lDW6IltZ8V06xyLdxfaYrk3zD6JRFUxHg="; + }) + (fetchpatch { + url = "https://raw.githubusercontent.com/gentoo/gentoo/master/media-gfx/prusaslicer/files/prusaslicer-2.8.0-fixed-linking.patch"; + hash = "sha256-G1JNdVH+goBelag9aX0NctHFVqtoYFnqjwK/43FVgvM="; + }) + ]; in stdenv.mkDerivation (finalAttrs: { pname = "prusa-slicer"; - version = "2.7.4"; + version = "2.8.0"; + inherit patches; src = fetchFromGitHub { owner = "prusa3d"; repo = "PrusaSlicer"; - hash = "sha256-g2I2l6i/8p8werDs4mDI/lGeDQsma4WSB9vT6OB2LGg="; + hash = "sha256-A/uxNIEXCchLw3t5erWdhqFAeh6nudcMfASi+RoJkFg="; rev = "version_${finalAttrs.version}"; }; @@ -93,6 +107,7 @@ stdenv.mkDerivation (finalAttrs: { expat glew glib + glib-networking gmp gtk3 hicolor-icon-theme @@ -113,7 +128,7 @@ stdenv.mkDerivation (finalAttrs: { catch2 ] ++ lib.optionals withSystemd [ systemd - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk_11_0.frameworks.CoreWLAN ]; @@ -195,7 +210,7 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.agpl3Plus; maintainers = with maintainers; [ moredread tweber tmarkus ]; platforms = platforms.unix; - } // lib.optionalAttrs (stdenv.isDarwin) { + } // lib.optionalAttrs (stdenv.hostPlatform.isDarwin) { mainProgram = "PrusaSlicer"; }; }) diff --git a/pkgs/applications/misc/prusa-slicer/super-slicer.nix b/pkgs/applications/misc/prusa-slicer/super-slicer.nix index 218fe6f96bf38..50dcd18d738ab 100644 --- a/pkgs/applications/misc/prusa-slicer/super-slicer.nix +++ b/pkgs/applications/misc/prusa-slicer/super-slicer.nix @@ -14,7 +14,7 @@ let "src/slic3r/GUI/Tab.cpp" "src/slic3r/Utils/Http.cpp" ]; - sha256 = "sha256-v0q2MhySayij7+qBTE5q01IOq/DyUcWnjpbzB/AV34c="; + hash = "sha256-v0q2MhySayij7+qBTE5q01IOq/DyUcWnjpbzB/AV34c="; }) ./meshboolean-const.patch ]; @@ -22,28 +22,28 @@ let versions = { stable = { version = "2.3.57.12"; - sha256 = "sha256-lePhDRHI++9zs54bTt2/Lu6ZQ7egjJCWb752aI0s7Mw=="; + hash = "sha256-lePhDRHI++9zs54bTt2/Lu6ZQ7egjJCWb752aI0s7Mw=="; patches = null; }; latest = { version = "2.4.58.5"; - sha256 = "sha256-UywxEGedXaBUTKojEkbkuejI6SdPSkPxTJMwUDNW6W0="; + hash = "sha256-UywxEGedXaBUTKojEkbkuejI6SdPSkPxTJMwUDNW6W0="; inherit patches; }; beta = { version = "2.5.59.6"; - sha256 = "sha256-4ivhkcvVw5NlPsDz3J840aWc0qnp/XzCnTTCICwi3/c="; + hash = "sha256-4ivhkcvVw5NlPsDz3J840aWc0qnp/XzCnTTCICwi3/c="; inherit patches; }; }; - override = { version, sha256, patches }: super: { + override = { version, hash, patches }: super: { inherit version pname patches; src = fetchFromGitHub { owner = "supermerill"; repo = "SuperSlicer"; - inherit sha256; + inherit hash; rev = version; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/ptask/default.nix b/pkgs/applications/misc/ptask/default.nix index 67a4bca94cf89..fc2432fcabdf4 100644 --- a/pkgs/applications/misc/ptask/default.nix +++ b/pkgs/applications/misc/ptask/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, makeWrapper, gtk3, json_c, taskwarrior }: +{ lib, stdenv, fetchurl, pkg-config, makeWrapper, gtk3, json_c, taskwarrior2 }: stdenv.mkDerivation rec { pname = "ptask"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { preFixup = '' wrapProgram "$out/bin/ptask" \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ - --prefix PATH : "${taskwarrior}/bin" + --prefix PATH : "${taskwarrior2}/bin" ''; meta = with lib; { diff --git a/pkgs/applications/misc/pueue/default.nix b/pkgs/applications/misc/pueue/default.nix index 173323f589751..1eff0355412c5 100644 --- a/pkgs/applications/misc/pueue/default.nix +++ b/pkgs/applications/misc/pueue/default.nix @@ -23,11 +23,11 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ rustPlatform.bindgenHook ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Libsystem SystemConfiguration libiconv diff --git a/pkgs/applications/misc/pw-viz/Cargo.lock b/pkgs/applications/misc/pw-viz/Cargo.lock index aa97cc770b7b5..f4d1de269cc37 100644 --- a/pkgs/applications/misc/pw-viz/Cargo.lock +++ b/pkgs/applications/misc/pw-viz/Cargo.lock @@ -92,28 +92,20 @@ version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bf6ccdb167abbf410dcb915cabd428929d7f6a04980b54a11f26a39f1c7f7107" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "once_cell", "serde", "version_check", ] [[package]] -name = "aho-corasick" -version = "0.7.20" +name = "annotate-snippets" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" +checksum = "ccaf7e9dfbb6ab22c82e473cd1a8a7bd313c19a5b7e40970f3d89ef5a5c9e81e" dependencies = [ - "memchr", -] - -[[package]] -name = "ansi_term" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" -dependencies = [ - "winapi", + "unicode-width", + "yansi-term", ] [[package]] @@ -189,25 +181,23 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "bindgen" -version = "0.59.2" +version = "0.69.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bd2a9a458e8f4304c52c43ebb0cfbd520289f8379a52e329a38afda99bf8eb8" +checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" dependencies = [ - "bitflags", + "annotate-snippets", + "bitflags 2.5.0", "cexpr", "clang-sys", - "clap", - "env_logger", + "itertools", "lazy_static", "lazycell", - "log", - "peeking_take_while", "proc-macro2", "quote", "regex", "rustc-hash", "shlex", - "which", + "syn 2.0.66", ] [[package]] @@ -217,6 +207,12 @@ 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 = "block" version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -264,7 +260,7 @@ checksum = "5fe233b960f12f8007e3db2d136e3cb1c291bfd7396e384ee76025fc1a3932b4" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -318,12 +314,6 @@ dependencies = [ [[package]] name = "cfg-if" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" - -[[package]] -name = "cfg-if" version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" @@ -355,21 +345,6 @@ dependencies = [ ] [[package]] -name = "clap" -version = "2.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" -dependencies = [ - "ansi_term", - "atty", - "bitflags", - "strsim 0.8.0", - "textwrap", - "unicode-width", - "vec_map", -] - -[[package]] name = "clipboard-win" version = "4.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -395,7 +370,7 @@ version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f425db7937052c684daec3bd6375c8abe2d146dca4b8b143d6db777c39138f3a" dependencies = [ - "bitflags", + "bitflags 1.3.2", "block", "cocoa-foundation", "core-foundation", @@ -411,7 +386,7 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ade49b65d560ca58c403a479bb396592b155c0185eada742ee323d1d68d6318" dependencies = [ - "bitflags", + "bitflags 1.3.2", "block", "core-foundation", "core-graphics-types", @@ -442,6 +417,15 @@ dependencies = [ ] [[package]] +name = "convert_case" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca" +dependencies = [ + "unicode-segmentation", +] + +[[package]] name = "cookie-factory" version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -469,7 +453,7 @@ version = "0.22.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb" dependencies = [ - "bitflags", + "bitflags 1.3.2", "core-foundation", "core-graphics-types", "foreign-types 0.3.2", @@ -482,7 +466,7 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3a68b68b3446082644c91ac778bf50cd4104bfb002b5a6a7c44cca5a2c70788b" dependencies = [ - "bitflags", + "bitflags 1.3.2", "core-foundation", "foreign-types 0.3.2", "libc", @@ -506,7 +490,7 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", ] [[package]] @@ -568,8 +552,8 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "strsim 0.10.0", - "syn", + "strsim", + "syn 1.0.107", ] [[package]] @@ -582,7 +566,7 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -593,7 +577,7 @@ checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" dependencies = [ "darling_core 0.13.4", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -604,7 +588,7 @@ checksum = "7618812407e9402654622dd402b0a89dff9ba93badd6540781526117b92aab7e" dependencies = [ "darling_core 0.14.2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -615,7 +599,7 @@ checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -624,7 +608,7 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "339ee130d97a610ea5a5872d2bbb130fdf68884ff09d3028b81bec8a1ac23bbc" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "dirs-sys-next", ] @@ -820,20 +804,7 @@ dependencies = [ "darling 0.14.2", "proc-macro2", "quote", - "syn", -] - -[[package]] -name = "env_logger" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7" -dependencies = [ - "atty", - "humantime", - "log", - "regex", - "termcolor", + "syn 1.0.107", ] [[package]] @@ -854,27 +825,6 @@ dependencies = [ ] [[package]] -name = "errno" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" -dependencies = [ - "errno-dragonfly", - "libc", - "winapi", -] - -[[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 = "error-code" version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -937,7 +887,7 @@ checksum = "c8469d0d40519bc608ec6863f1cc88f3f1deee15913f2f3b3e573d81ed38cccc" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -967,7 +917,7 @@ version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "74eadec9d0a5c28c54bb9882e54787275152a4e36ce206b45d7451384e5bf5fb" dependencies = [ - "bitflags", + "bitflags 1.3.2", "freetype-sys", "libc", ] @@ -999,7 +949,7 @@ version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "libc", "wasi", ] @@ -1039,7 +989,7 @@ version = "0.30.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "524d807cd49a0c56a53ef9a6738cd15e7c8c4e9d37a3b7fdb3c250c1cd5bf7a3" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cfg_aliases", "cgl", "cocoa", @@ -1101,12 +1051,6 @@ dependencies = [ ] [[package]] -name = "humantime" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" - -[[package]] name = "ident_case" version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1128,13 +1072,22 @@ version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "js-sys", "wasm-bindgen", "web-sys", ] [[package]] +name = "itertools" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +dependencies = [ + "either", +] + +[[package]] name = "itoa" version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1199,9 +1152,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.139" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libloading" @@ -1209,33 +1162,35 @@ version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "winapi", ] [[package]] name = "libspa" -version = "0.5.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8bb02bbc8d550e2f0a31989c61e1ac3c883bab2edee49ffcb5d5ca18266786d" +checksum = "65f3a4b81b2a2d8c7f300643676202debd1b7c929dbf5c9bb89402ea11d19810" dependencies = [ - "bitflags", + "bitflags 2.5.0", "cc", + "convert_case", "cookie-factory", - "errno", "libc", "libspa-sys", + "nix 0.27.1", "nom", "system-deps", ] [[package]] name = "libspa-sys" -version = "0.5.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e8d2e38d6cdd10d7d78eb0cb409c127cf16da2c296d9623375551e309616d4d" +checksum = "bf0d9716420364790e85cbb9d3ac2c950bde16a7dd36f3209b7dfdfc4a24d01f" dependencies = [ "bindgen", + "cc", "system-deps", ] @@ -1255,7 +1210,7 @@ version = "0.4.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", ] [[package]] @@ -1330,7 +1285,7 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "451422b7e4718271c8b5b3aadf5adedba43dc76312454b387e98fae0fc951aa0" dependencies = [ - "bitflags", + "bitflags 1.3.2", "jni-sys", "ndk-sys", "num_enum", @@ -1370,7 +1325,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -1384,40 +1339,38 @@ dependencies = [ [[package]] name = "nix" -version = "0.14.1" +version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c722bee1037d430d0f8e687bbdbf222f27cc6e4e68d5caf630857bb2b6dbdce" +checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" dependencies = [ - "bitflags", - "cc", - "cfg-if 0.1.10", + "bitflags 1.3.2", + "cfg-if", "libc", - "void", + "memoffset", ] [[package]] name = "nix" -version = "0.24.3" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" +checksum = "f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4" dependencies = [ - "bitflags", - "cfg-if 1.0.0", + "autocfg", + "bitflags 1.3.2", + "cfg-if", "libc", "memoffset", ] [[package]] name = "nix" -version = "0.25.1" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4" +checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" dependencies = [ - "autocfg", - "bitflags", - "cfg-if 1.0.0", + "bitflags 2.5.0", + "cfg-if", "libc", - "memoffset", ] [[package]] @@ -1454,7 +1407,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -1552,7 +1505,7 @@ version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ff9f3fef3968a3ec5945535ed654cb38ff72d7495a25619e2247fb15a2ed9ba" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "libc", "redox_syscall", "smallvec", @@ -1566,12 +1519,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d01a5bd0424d00070b0098dd17ebca6f961a959dead1dbcbbbc1d1cd8d3deeba" [[package]] -name = "peeking_take_while" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" - -[[package]] name = "percent-encoding" version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1585,27 +1532,26 @@ checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" [[package]] name = "pipewire" -version = "0.5.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d80fef8219c37f479f3d62d70167f3daaa90b71a083f7fd88d69e49f05f0ecdc" +checksum = "08e645ba5c45109106d56610b3ee60eb13a6f2beb8b74f8dc8186cf261788dda" dependencies = [ "anyhow", - "bitflags", - "errno", + "bitflags 2.5.0", "libc", "libspa", "libspa-sys", + "nix 0.27.1", "once_cell", "pipewire-sys", - "signal", "thiserror", ] [[package]] name = "pipewire-sys" -version = "0.5.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f6d4262ea1fd3b01786046d1892cc49e9578d872faf8723d95dc7affc810ee4" +checksum = "849e188f90b1dda88fe2bfe1ad31fe5f158af2c98f80fb5d13726c44f3f01112" dependencies = [ "bindgen", "libspa-sys", @@ -1624,7 +1570,7 @@ version = "0.17.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5d708eaf860a19b19ce538740d2b4bdeeb8337fa53f7738455e706623ad5c638" dependencies = [ - "bitflags", + "bitflags 1.3.2", "crc32fast", "flate2", "miniz_oxide", @@ -1649,16 +1595,16 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.49" +version = "1.0.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57a8eca9f9c4ffde41714334dee777596264c7825420f521abc92b5b5deb63a5" +checksum = "ec96c6a92621310b51366f1e28d05ef11489516e93be030060e5fc12024a49d6" dependencies = [ "unicode-ident", ] [[package]] name = "pw-viz" -version = "0.2.0" +version = "0.3.0" dependencies = [ "eframe", "egui", @@ -1673,9 +1619,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.23" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] @@ -1734,7 +1680,7 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -1754,8 +1700,6 @@ version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a" dependencies = [ - "aho-corasick", - "memchr", "regex-syntax", ] @@ -1772,7 +1716,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "300a51053b1cb55c80b7a9fde4120726ddf25ca241a1cbb926626f62fb136bff" dependencies = [ "base64", - "bitflags", + "bitflags 1.3.2", "serde", ] @@ -1841,7 +1785,7 @@ checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -1872,16 +1816,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" [[package]] -name = "signal" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f6ce83b159ab6984d2419f495134972b48754d13ff2e3f8c998339942b56ed9" -dependencies = [ - "libc", - "nix 0.14.1", -] - -[[package]] name = "simple_logger" version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1915,7 +1849,7 @@ version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f307c47d32d2715eb2e0ece5589057820e0e5e70d07c247d1063e844e107f454" dependencies = [ - "bitflags", + "bitflags 1.3.2", "calloop", "dlib", "lazy_static", @@ -1946,12 +1880,6 @@ checksum = "9e08d8363704e6c71fc928674353e6b7c23dcea9d82d7012c8faf2a3a025f8d0" [[package]] name = "strsim" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" - -[[package]] -name = "strsim" version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" @@ -1968,6 +1896,17 @@ dependencies = [ ] [[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 = "system-deps" version = "6.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1981,24 +1920,6 @@ dependencies = [ ] [[package]] -name = "termcolor" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "textwrap" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -dependencies = [ - "unicode-width", -] - -[[package]] name = "thiserror" version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2015,7 +1936,7 @@ checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -2056,7 +1977,7 @@ dependencies = [ "arrayref", "arrayvec 0.5.2", "bytemuck", - "cfg-if 1.0.0", + "cfg-if", "png", "safe_arch", "tiny-skia-path", @@ -2102,7 +2023,7 @@ version = "0.1.37" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "pin-project-lite", "tracing-core", ] @@ -2144,6 +2065,12 @@ dependencies = [ ] [[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.10" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2179,12 +2106,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] -name = "void" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" - -[[package]] name = "walkdir" version = "2.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2207,7 +2128,7 @@ version = "0.2.83" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "wasm-bindgen-macro", ] @@ -2222,7 +2143,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn", + "syn 1.0.107", "wasm-bindgen-shared", ] @@ -2232,7 +2153,7 @@ version = "0.4.33" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23639446165ca5a5de86ae1d8896b737ae80319560fbaa4c2887b7da6e7ebd7d" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "js-sys", "wasm-bindgen", "web-sys", @@ -2256,7 +2177,7 @@ checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -2273,7 +2194,7 @@ version = "0.29.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f3b068c05a039c9f755f881dc50f01732214f5685e379829759088967c46715" dependencies = [ - "bitflags", + "bitflags 1.3.2", "downcast-rs", "libc", "nix 0.24.3", @@ -2312,7 +2233,7 @@ version = "0.29.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b950621f9354b322ee817a23474e479b34be96c2e909c14f7bc0100e9a970bc6" dependencies = [ - "bitflags", + "bitflags 1.3.2", "wayland-client", "wayland-commons", "wayland-scanner", @@ -2381,17 +2302,6 @@ dependencies = [ ] [[package]] -name = "which" -version = "4.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c831fbbee9e129a8cf93e7747a82da9d95ba8e16621cae60ec2cdc849bacb7b" -dependencies = [ - "either", - "libc", - "once_cell", -] - -[[package]] name = "winapi" version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2470,7 +2380,7 @@ checksum = "9539b6bd3eadbd9de66c9666b22d802b833da7e996bc06896142e09854a61767" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.107", ] [[package]] @@ -2579,7 +2489,7 @@ version = "0.27.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bb796d6fbd86b2fd896c9471e6f04d39d750076ebe5680a3958f00f5ab97657c" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cocoa", "core-foundation", "core-graphics", @@ -2662,3 +2572,12 @@ name = "xml-rs" version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2d7d3948613f75c98fd9328cfdcc45acc4d360655289d0a7d4ec931392200a3" + +[[package]] +name = "yansi-term" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe5c30ade05e61656247b2e334a031dfd0cc466fadef865bdcdea8d537951bf1" +dependencies = [ + "winapi", +] diff --git a/pkgs/applications/misc/pw-viz/default.nix b/pkgs/applications/misc/pw-viz/default.nix index 0242164be79c1..25a4978d9885c 100644 --- a/pkgs/applications/misc/pw-viz/default.nix +++ b/pkgs/applications/misc/pw-viz/default.nix @@ -14,13 +14,13 @@ rustPlatform.buildRustPackage rec { pname = "pw-viz"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "ax9d"; repo = pname; rev = "v${version}"; - sha256 = "sha256-lw4whdh8tNoS5XUlamQCq8f8z8K59uD90PSSo3skeyo="; + sha256 = "sha256-fB7PnWWahCMKhGREg6neLmOZjh2OWLu61Vpmfsl03wA="; }; cargoLock = { @@ -57,7 +57,7 @@ rustPlatform.buildRustPackage rec { env.NIX_CFLAGS_COMPILE = toString [ "-DPW_ENABLE_DEPRECATED" ]; meta = with lib; { - description = "Simple and elegant pipewire graph editor "; + description = "Simple and elegant pipewire graph editor"; homepage = "https://github.com/ax9d/pw-viz"; license = licenses.gpl3Only; maintainers = with maintainers; [ figsoda ]; diff --git a/pkgs/applications/misc/pwsafe/default.nix b/pkgs/applications/misc/pwsafe/default.nix index 4dd5a5e2d280b..b2856cb7978e1 100644 --- a/pkgs/applications/misc/pwsafe/default.nix +++ b/pkgs/applications/misc/pwsafe/default.nix @@ -44,6 +44,7 @@ stdenv.mkDerivation rec { gettext perl pkg-config + wxGTK32 zip ]; @@ -54,7 +55,7 @@ stdenv.mkDerivation rec { openssl xercesc file - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libXext libXi libXt @@ -62,14 +63,14 @@ stdenv.mkDerivation rec { libuuid libyubikey yubikey-personalization - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ]; cmakeFlags = [ "-DNO_GTEST=ON" "-DCMAKE_CXX_FLAGS=-I${yubikey-personalization}/include/ykpers-1" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DNO_YUBI=ON" ]; @@ -90,14 +91,14 @@ stdenv.mkDerivation rec { for f in $(grep -Rl /usr/bin/ .) ; do substituteInPlace $f --replace /usr/bin/ "" done - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace src/ui/cli/CMakeLists.txt --replace "uuid" "" ''; installFlags = [ "PREFIX=${placeholder "out"}" ]; passthru.updateScript = gitUpdater { - ignoredVersions = "^([^1]|1[^.])"; # ignore anything other than 1.x + allowedVersions = "^1\\."; url = src.gitRepoUrl; }; diff --git a/pkgs/applications/misc/pysentation/default.nix b/pkgs/applications/misc/pysentation/default.nix index ad2d9c02e683a..41568d0295b32 100644 --- a/pkgs/applications/misc/pysentation/default.nix +++ b/pkgs/applications/misc/pysentation/default.nix @@ -17,7 +17,6 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = with python3.pkgs; [ setuptools - pythonRelaxDepsHook ]; pythonRelaxDeps = [ diff --git a/pkgs/applications/misc/pytrainer/default.nix b/pkgs/applications/misc/pytrainer/default.nix index 57d5ae394381f..d2340b15f1b71 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 @@ -18,6 +18,7 @@ let python = python310.override { + self = python; packageOverrides = (self: super: { matplotlib = super.matplotlib.override { enableGtk3 = true; @@ -55,7 +56,7 @@ in python.pkgs.buildPythonApplication rec { gtk3 webkitgtk glib-networking - gnome.adwaita-icon-theme + adwaita-icon-theme gdk-pixbuf ]; @@ -84,7 +85,7 @@ in python.pkgs.buildPythonApplication rec { TZ=Europe/Kaliningrad \ LC_TIME=C \ xvfb-run -s '-screen 0 800x600x24' \ - ${python.interpreter} setup.py test + ${python.interpreter} -m unittest ''; meta = with lib; { diff --git a/pkgs/applications/misc/q4wine/default.nix b/pkgs/applications/misc/q4wine/default.nix index f56e4455becda..a06dbc8f47fc5 100644 --- a/pkgs/applications/misc/q4wine/default.nix +++ b/pkgs/applications/misc/q4wine/default.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub, mkDerivation, cmake, sqlite , qtbase, qtsvg, qttools, wrapQtAppsHook , icoutils # build and runtime deps. -, wget, fuseiso, wine, sudo, which # runtime deps. +, wget, fuseiso, wine, which # runtime deps. }: mkDerivation rec { diff --git a/pkgs/applications/misc/qMasterPassword/default.nix b/pkgs/applications/misc/qMasterPassword/default.nix index e6a672040824b..806d1df05fc44 100644 --- a/pkgs/applications/misc/qMasterPassword/default.nix +++ b/pkgs/applications/misc/qMasterPassword/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { # Upstream install is mostly defunct. It hardcodes target.path and doesn't # install anything but the binary. - installPhase = if stdenv.isDarwin then '' + installPhase = if stdenv.hostPlatform.isDarwin then '' mkdir -p "$out"/{Applications,bin} mv qMasterPassword.app "$out"/Applications/ ln -s ../Applications/qMasterPassword.app/Contents/MacOS/qMasterPassword "$out"/bin/qMasterPassword @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://github.com/bkueng/qMasterPassword"; license = licenses.gpl3; - maintainers = with lib.maintainers; [ tadeokondrak teutat3s ]; + maintainers = with lib.maintainers; [ teutat3s ]; platforms = platforms.all; }; } diff --git a/pkgs/applications/misc/qcad/default.nix b/pkgs/applications/misc/qcad/default.nix index 14b2f19ccd4bb..6bffbda0a01b1 100644 --- a/pkgs/applications/misc/qcad/default.nix +++ b/pkgs/applications/misc/qcad/default.nix @@ -18,14 +18,14 @@ mkDerivation rec { pname = "qcad"; - version = "3.30.0.0"; + version = "3.30.1.3"; src = fetchFromGitHub { name = "qcad-${version}-src"; owner = "qcad"; repo = "qcad"; rev = "v${version}"; - hash = "sha256-KpY/GjagRx0XkH18dDJcf6JfkT/0V8ZHJ5DHtAEUaF4="; + hash = "sha256-bGSXFX1LuNZzs981t0GZxnMPzyJ+bddB4m/wkLMsfg0="; }; patches = [ @@ -57,7 +57,7 @@ mkDerivation rec { qtscript qtsvg qtxmlpatterns - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ qtmacextras ]; @@ -68,17 +68,17 @@ mkDerivation rec { "QMAKE_CXXFLAGS=-std=c++14" ]; - qtWrapperArgs = lib.optionals stdenv.isLinux [ + qtWrapperArgs = lib.optionals stdenv.hostPlatform.isLinux [ "--prefix LD_LIBRARY_PATH : ${placeholder "out"}/lib" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "--prefix DYLD_LIBRARY_PATH : ${placeholder "out"}/lib" ]; installPhase = '' runHook preInstall - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' install -Dm555 release/qcad-bin $out/bin/qcad - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' install -Dm555 release/QCAD.app/Contents/MacOS/QCAD $out/bin/qcad mkdir -p $out/lib '' + '' diff --git a/pkgs/applications/misc/qelectrotech/default.nix b/pkgs/applications/misc/qelectrotech/default.nix index b4d8bd3ab182b..705618bd2f01c 100644 --- a/pkgs/applications/misc/qelectrotech/default.nix +++ b/pkgs/applications/misc/qelectrotech/default.nix @@ -74,6 +74,6 @@ mkDerivation rec { license = licenses.gpl2; maintainers = with maintainers; [ yvesf ]; platforms = qtbase.meta.platforms; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/applications/misc/qolibri/default.nix b/pkgs/applications/misc/qolibri/default.nix index 0439e212d1122..4b8213d46d607 100644 --- a/pkgs/applications/misc/qolibri/default.nix +++ b/pkgs/applications/misc/qolibri/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation { license = licenses.gpl2; maintainers = with maintainers; [ azahi ]; platforms = platforms.unix; - broken = stdenv.isDarwin && stdenv.isx86_64; # Looks like a libcxx version mismatch problem. + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64; # Looks like a libcxx version mismatch problem. mainProgram = "qolibri"; }; } diff --git a/pkgs/applications/misc/qsyncthingtray/default.nix b/pkgs/applications/misc/qsyncthingtray/default.nix index 2fa22cf732211..68baf5e08ebb3 100644 --- a/pkgs/applications/misc/qsyncthingtray/default.nix +++ b/pkgs/applications/misc/qsyncthingtray/default.nix @@ -31,13 +31,13 @@ mkDerivation rec { }) ] ++ lib.optional (!preferQWebView && !preferNative) ./qsyncthingtray-0.5.8-qt-5.6.3.patch; postPatch = '' - ${lib.optionalString stdenv.isLinux '' + ${lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace includes/platforms/linux/posixUtils.hpp \ --replace '"/usr/local/bin/syncthing"' '"${syncthing}/bin/syncthing"' \ --replace '"pgrep -x' '"${procps}/bin/pgrep -x' ''} - ${lib.optionalString stdenv.isDarwin '' + ${lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace includes/platforms/darwin/macUtils.hpp \ --replace '"/usr/local/bin/syncthing"' '"${syncthing}/bin/syncthing"' ''} @@ -64,6 +64,6 @@ mkDerivation rec { license = licenses.lgpl3; maintainers = with maintainers; [ zraexy peterhoeg ]; platforms = platforms.all; - broken = !preferNative || stdenv.isDarwin; + broken = !preferNative || stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/applications/misc/qt-video-wlr/default.nix b/pkgs/applications/misc/qt-video-wlr/default.nix index 4ebd059c9274c..dc634a8f2ad8b 100644 --- a/pkgs/applications/misc/qt-video-wlr/default.nix +++ b/pkgs/applications/misc/qt-video-wlr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, pkg-config, meson, cmake, ninja, gst_all_1, wrapQtAppsHook, qtbase, qtmultimedia, layer-shell-qt }: +{ stdenv, lib, fetchFromGitHub, pkg-config, meson, cmake, ninja, gst_all_1, wrapQtAppsHook, qtbase, qtmultimedia, layer-shell-qt, wayland-scanner }: let gstreamerPath = with gst_all_1; lib.makeSearchPathOutput "lib" "lib/gstreamer-1.0" [ gstreamer @@ -24,6 +24,7 @@ in stdenv.mkDerivation rec { cmake # only used for find layer-shell-qt ninja wrapQtAppsHook + wayland-scanner ]; buildInputs = [ diff --git a/pkgs/applications/misc/raider/default.nix b/pkgs/applications/misc/raider/default.nix index 6b15176a686e8..b205e1521c5ae 100644 --- a/pkgs/applications/misc/raider/default.nix +++ b/pkgs/applications/misc/raider/default.nix @@ -2,8 +2,6 @@ , blueprint-compiler , desktop-file-utils , fetchFromGitHub -, gettext -, glib , gtk4 , lib , libadwaita @@ -17,13 +15,13 @@ stdenv.mkDerivation rec { pname = "raider"; - version = "3.0.0"; + version = "3.0.1"; src = fetchFromGitHub { owner = "ADBeveridge"; repo = "raider"; rev = "v${version}"; - hash = "sha256-zqM2B1M7E4CRupd09rvFYG7H7wBd2hTWnjN3xadS36w="; + hash = "sha256-LkGSEUoruWfEq/ttM3LkA/UjHc3ZrlvGF44HsJLntAo="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/raiseorlaunch/default.nix b/pkgs/applications/misc/raiseorlaunch/default.nix index 925bc9bdcb3f7..22eddd71bd11a 100644 --- a/pkgs/applications/misc/raiseorlaunch/default.nix +++ b/pkgs/applications/misc/raiseorlaunch/default.nix @@ -6,7 +6,7 @@ python3Packages.buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-L/hu0mYCAxHkp5me96a6HlEY6QsuJDESpTNhlzVRHWs="; + hash = "sha256-L/hu0mYCAxHkp5me96a6HlEY6QsuJDESpTNhlzVRHWs="; }; nativeBuildInputs = [ python3Packages.setuptools-scm ]; diff --git a/pkgs/applications/misc/reddsaver/default.nix b/pkgs/applications/misc/reddsaver/default.nix index 1c6202eb0deeb..c544dc44888f0 100644 --- a/pkgs/applications/misc/reddsaver/default.nix +++ b/pkgs/applications/misc/reddsaver/default.nix @@ -17,11 +17,11 @@ rustPlatform.buildRustPackage rec { sha256 = "07xsrc0w0z7w2w0q44aqnn1ybf9vqry01v3xr96l1xzzc5mkqdzf"; }; - cargoSha256 = "0y94dywligcsqs01d228w454ssrzg31p4j8mni9flcr4v29z3rwp"; + cargoHash = "sha256-l+fxk9gkM+pStBVJcsN4P2tNCuFIiBaAxpq9SLlvJHk="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] - ++ lib.optional stdenv.isDarwin Security; + ++ lib.optional stdenv.hostPlatform.isDarwin Security; # package does not contain tests as of v0.3.3 docCheck = false; diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix index f0c46f8c207a8..6451fa2c7acf9 100644 --- a/pkgs/applications/misc/redshift/default.nix +++ b/pkgs/applications/misc/redshift/default.nix @@ -1,16 +1,17 @@ { lib, stdenv, fetchFromGitHub, fetchFromGitLab , autoconf, automake, gettext, intltool -, libtool, pkg-config, wrapGAppsHook3, wrapPython, gobject-introspection +, libtool, pkg-config, wrapGAppsHook3, wrapPython, gobject-introspection, wayland-scanner , gtk3, python, pygobject3, pyxdg -, withQuartz ? stdenv.isDarwin, ApplicationServices -, withRandr ? stdenv.isLinux, libxcb -, withDrm ? stdenv.isLinux, libdrm +, withQuartz ? stdenv.hostPlatform.isDarwin, ApplicationServices +, withRandr ? stdenv.hostPlatform.isLinux, libxcb +, withDrm ? stdenv.hostPlatform.isLinux, libdrm +, withVidmode ? stdenv.hostPlatform.isLinux, libXxf86vm , withGeolocation ? true -, withCoreLocation ? withGeolocation && stdenv.isDarwin, CoreLocation, Foundation, Cocoa -, withGeoclue ? withGeolocation && stdenv.isLinux, geoclue -, withAppIndicator ? stdenv.isLinux, libappindicator, libayatana-appindicator +, withCoreLocation ? withGeolocation && stdenv.hostPlatform.isDarwin, CoreLocation, Foundation, Cocoa +, withGeoclue ? withGeolocation && stdenv.hostPlatform.isLinux, geoclue +, withAppIndicator ? stdenv.hostPlatform.isLinux, libappindicator, libayatana-appindicator }: let @@ -26,6 +27,8 @@ let strictDeps = true; + depsBuildBuild = [ pkg-config ]; + nativeBuildInputs = [ autoconf automake @@ -37,12 +40,13 @@ let wrapPython gobject-introspection python - ]; + ] ++ lib.optionals (pname == "gammastep") [ wayland-scanner ]; configureFlags = [ "--enable-randr=${if withRandr then "yes" else "no"}" "--enable-geoclue2=${if withGeoclue then "yes" else "no"}" "--enable-drm=${if withDrm then "yes" else "no"}" + "--enable-vidmode=${if withVidmode then "yes" else "no"}" "--enable-quartz=${if withQuartz then "yes" else "no"}" "--enable-corelocation=${if withCoreLocation then "yes" else "no"}" ] ++ lib.optionals (pname == "gammastep") [ @@ -55,6 +59,7 @@ let ] ++ lib.optional withRandr libxcb ++ lib.optional withGeoclue geoclue ++ lib.optional withDrm libdrm + ++ lib.optional withVidmode libXxf86vm ++ lib.optional withQuartz ApplicationServices ++ lib.optionals withCoreLocation [ CoreLocation Foundation Cocoa ] ++ lib.optional withAppIndicator (if (pname != "gammastep") @@ -120,7 +125,7 @@ rec { homepage = "http://jonls.dk/redshift"; platforms = platforms.unix; mainProgram = "redshift"; - maintainers = with maintainers; [ yana ]; + maintainers = [ ]; }; }; @@ -132,7 +137,7 @@ rec { owner = "chinstrap"; repo = pname; rev = "v${version}"; - sha256 = "sha256-EdVLBBIEjMu+yy9rmcxQf4zdW47spUz5SbBDbhmLjOU="; + hash = "sha256-EdVLBBIEjMu+yy9rmcxQf4zdW47spUz5SbBDbhmLjOU="; }; meta = redshift.meta // { @@ -141,7 +146,7 @@ rec { + lib.removePrefix "Redshift" redshift.meta.longDescription; homepage = "https://gitlab.com/chinstrap/gammastep"; mainProgram = "gammastep"; - maintainers = (with lib.maintainers; [ eclairevoyant primeos ]) ++ redshift.meta.maintainers; + maintainers = (with lib.maintainers; [ primeos ]) ++ redshift.meta.maintainers; }; }; } diff --git a/pkgs/applications/misc/remarkable/remarkable-mouse/default.nix b/pkgs/applications/misc/remarkable/remarkable-mouse/default.nix index c953d5e6299a1..8d59f0ae99f66 100644 --- a/pkgs/applications/misc/remarkable/remarkable-mouse/default.nix +++ b/pkgs/applications/misc/remarkable/remarkable-mouse/default.nix @@ -6,7 +6,7 @@ buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-82P9tE3jiUlKBGZCiWDoL+9VJ06Bc+If+aMfcEEU90U="; + hash = "sha256-82P9tE3jiUlKBGZCiWDoL+9VJ06Bc+If+aMfcEEU90U="; }; propagatedBuildInputs = with python3Packages; [ screeninfo paramiko pynput libevdev ]; diff --git a/pkgs/applications/misc/remarkable/restream/default.nix b/pkgs/applications/misc/remarkable/restream/default.nix index c9a60d4ce2e8a..b5e808339f99d 100644 --- a/pkgs/applications/misc/remarkable/restream/default.nix +++ b/pkgs/applications/misc/remarkable/restream/default.nix @@ -5,7 +5,6 @@ , fetchFromGitHub , openssh , netcat -, makeWrapper }: stdenv.mkDerivation rec { diff --git a/pkgs/applications/misc/remnote/default.nix b/pkgs/applications/misc/remnote/default.nix deleted file mode 100644 index b86a69ea2794c..0000000000000 --- a/pkgs/applications/misc/remnote/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ - lib, - fetchurl, - appimageTools, - writeScript, -}: -let - pname = "remnote"; - version = "1.16.48"; - src = fetchurl { - url = "https://download2.remnote.io/remnote-desktop2/RemNote-${version}.AppImage"; - hash = "sha256-tECIn43fTr+Enkp63S7INUjOrs8Ni7Nmhxsr/p6kPzo="; - }; - appimageContents = appimageTools.extractType2 { inherit pname version src; }; -in -appimageTools.wrapType2 { - inherit pname version src; - - extraInstallCommands = '' - install -Dm444 ${appimageContents}/remnote.desktop -t $out/share/applications - substituteInPlace $out/share/applications/remnote.desktop \ - --replace-fail 'Exec=AppRun --no-sandbox %U' 'Exec=remnote %u' - install -Dm444 ${appimageContents}/remnote.png -t $out/share/pixmaps - ''; - - passthru.updateScript = writeScript "update.sh" '' - #!/usr/bin/env nix-shell - #!nix-shell -i bash -p curl coreutils gnused common-updater-scripts - set -eu -o pipefail - url="$(curl -ILs -w %{url_effective} -o /dev/null https://backend.remnote.com/desktop/linux)" - version="$(echo $url | sed -n 's/.*RemNote-\([0-9]\+\.[0-9]\+\.[0-9]\+\).*/\1/p')" - currentVersion=$(nix-instantiate --eval -E "with import ./. {}; remnote.version or (lib.getVersion remnote)" | tr -d '"') - if [[ "$version" != "$currentVersion" ]]; then - hash=$(nix-hash --to-sri --type sha256 "$(nix-prefetch-url "$url")") - update-source-version remnote "$version" "$hash" --print-changes - fi - ''; - - meta = with lib; { - description = "Note-taking application focused on learning and productivity"; - homepage = "https://remnote.com/"; - maintainers = with maintainers; [ chewblacka ]; - license = licenses.unfree; - platforms = [ "x86_64-linux" ]; - mainProgram = "remnote"; - }; -} diff --git a/pkgs/applications/misc/remontoire/default.nix b/pkgs/applications/misc/remontoire/default.nix index 05eb16abaf21b..95e3fecef272c 100644 --- a/pkgs/applications/misc/remontoire/default.nix +++ b/pkgs/applications/misc/remontoire/default.nix @@ -7,7 +7,6 @@ , gtk3 , json-glib , libgee -, librsvg , meson , ninja , pkg-config diff --git a/pkgs/applications/misc/rescuetime/default.nix b/pkgs/applications/misc/rescuetime/default.nix index 615fa2c10faeb..41988c2829578 100644 --- a/pkgs/applications/misc/rescuetime/default.nix +++ b/pkgs/applications/misc/rescuetime/default.nix @@ -49,7 +49,7 @@ in mkDerivation rec { meta = with lib; { description = "Helps you understand your daily habits so you can focus and be more productive"; homepage = "https://www.rescuetime.com"; - maintainers = with maintainers; [ ]; + maintainers = [ ]; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "i686-linux" "x86_64-linux" ]; diff --git a/pkgs/applications/misc/resp-app/default.nix b/pkgs/applications/misc/resp-app/default.nix index efd279189351e..18e7a1c722417 100644 --- a/pkgs/applications/misc/resp-app/default.nix +++ b/pkgs/applications/misc/resp-app/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, mkDerivation +{ mkDerivation , lib , fetchFromGitHub , fetchpatch @@ -39,7 +38,7 @@ mkDerivation rec { repo = "RedisDesktopManager"; fetchSubmodules = true; rev = version; - sha256 = "sha256-5eI3J2RsYE5Ejb1r8YkgzmGX2FyaCLFD0lc10J+fOT4="; + hash = "sha256-5eI3J2RsYE5Ejb1r8YkgzmGX2FyaCLFD0lc10J+fOT4="; }; nativeBuildInputs = [ @@ -100,6 +99,6 @@ mkDerivation rec { homepage = "https://resp.app/"; license = licenses.gpl3Only; platforms = platforms.linux; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/misc/resumed/default.nix b/pkgs/applications/misc/resumed/default.nix index e1f6928dcdbb7..81550925368e2 100644 --- a/pkgs/applications/misc/resumed/default.nix +++ b/pkgs/applications/misc/resumed/default.nix @@ -2,16 +2,16 @@ buildNpmPackage rec { pname = "resumed"; - version = "3.0.1"; + version = "4.0.0"; src = fetchFromGitHub { owner = "rbardini"; repo = "resumed"; rev = "v${version}"; - hash = "sha256-X1efWl0CjbEbhNfDUNvb5SCc2exfI8v95gzqcaKU5eU="; + hash = "sha256-XaEK41UBKUldjRlxTzc42K/RwZ9D8kueU/6dm8n1W1U="; }; - npmDepsHash = "sha256-b8NeO0w2UH1wEifDCkl8L48LoJM0jLStE0fO9G438dU="; + npmDepsHash = "sha256-r0wq1KGZA5b4eIQsp+dz8Inw8AQA62BK7vgfYlViIrY="; meta = with lib; { description = "Lightweight JSON Resume builder, no-frills alternative to resume-cli"; diff --git a/pkgs/applications/misc/river-tag-overlay/default.nix b/pkgs/applications/misc/river-tag-overlay/default.nix index 63092e3586f90..af78bab02eac2 100644 --- a/pkgs/applications/misc/river-tag-overlay/default.nix +++ b/pkgs/applications/misc/river-tag-overlay/default.nix @@ -1,5 +1,11 @@ -{ lib, stdenv, fetchFromSourcehut, fetchpatch -, wayland, pixman, pkg-config, wayland-scanner +{ lib +, stdenv +, fetchFromSourcehut +, fetchpatch +, wayland +, pixman +, pkg-config +, wayland-scanner }: stdenv.mkDerivation rec { diff --git a/pkgs/applications/misc/rivercarro/default.nix b/pkgs/applications/misc/rivercarro/default.nix index fa99e88f87a67..747bf3ec16f6b 100644 --- a/pkgs/applications/misc/rivercarro/default.nix +++ b/pkgs/applications/misc/rivercarro/default.nix @@ -1,23 +1,25 @@ { lib , stdenv +, callPackage , fetchFromSourcehut , pkg-config , river , wayland , wayland-protocols -, zig_0_11 +, wayland-scanner +, zig_0_12 }: stdenv.mkDerivation (finalAttrs: { pname = "rivercarro"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromSourcehut { owner = "~novakane"; repo = "rivercarro"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-lucwn9MmyVd4pynuG/ZAXnZ384wdS0gi7JN44vNQA1I="; + hash = "sha256-nDKPv/roweW7ynEROsipUJPvs6VMmz3E4JzEFRBzE6s="; }; nativeBuildInputs = [ @@ -25,9 +27,14 @@ stdenv.mkDerivation (finalAttrs: { river wayland wayland-protocols - zig_0_11.hook + wayland-scanner + zig_0_12.hook ]; + postPatch = '' + ln -s ${callPackage ./deps.nix { }} $ZIG_GLOBAL_CACHE_DIR/p + ''; + meta = with lib; { homepage = "https://git.sr.ht/~novakane/rivercarro"; description = "Layout generator for river Wayland compositor, fork of rivertile"; @@ -44,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://git.sr.ht/~novakane/rivercarro/refs/v${finalAttrs.version}"; license = licenses.gpl3Plus; maintainers = with maintainers; [ kraem ]; - inherit (zig_0_11.meta) platforms; + inherit (zig_0_12.meta) platforms; mainProgram = "rivercarro"; }; }) diff --git a/pkgs/applications/misc/rivercarro/deps.nix b/pkgs/applications/misc/rivercarro/deps.nix new file mode 100644 index 0000000000000..682e0e75542ab --- /dev/null +++ b/pkgs/applications/misc/rivercarro/deps.nix @@ -0,0 +1,13 @@ +# generated by zon2nix (https://github.com/nix-community/zon2nix) + +{ linkFarm, fetchzip }: + +linkFarm "zig-packages" [ + { + name = "1220b0f8f822c1625af7aae4cb3ab2c4ec1a4c0e99ef32867b2a8d88bb070b3e7f6d"; + path = fetchzip { + url = "https://codeberg.org/ifreund/zig-wayland/archive/v0.1.0.tar.gz"; + hash = "sha256-VLEx8nRgmJZWgLNBRqrR7bZEkW0m5HTRv984HKwoIfA="; + }; + } +] diff --git a/pkgs/applications/misc/rofi-bluetooth/default.nix b/pkgs/applications/misc/rofi-bluetooth/default.nix index 01307494340cf..4eb757422ae72 100644 --- a/pkgs/applications/misc/rofi-bluetooth/default.nix +++ b/pkgs/applications/misc/rofi-bluetooth/default.nix @@ -2,16 +2,17 @@ , stdenv , fetchFromGitHub , makeWrapper +, bc , bluez }: -stdenv.mkDerivation (finalAttrs: { +stdenv.mkDerivation { pname = "rofi-bluetooth"; version = "unstable-2023-02-03"; src = fetchFromGitHub { owner = "nickclyde"; - repo = finalAttrs.pname; + repo = "rofi-bluetooth"; # https://github.com/nickclyde/rofi-bluetooth/issues/19 rev = "9d91c048ff129819f4c6e9e48a17bd54343bbffb"; sha256 = "sha256-1Xe3QFThIvJDCUznDP5ZBzwZEMuqmxpDIV+BcVvQDG8="; @@ -25,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { install -D --target-directory=$out/bin/ ./rofi-bluetooth wrapProgram $out/bin/rofi-bluetooth \ - --prefix PATH ":" ${lib.makeBinPath [ bluez ] } + --prefix PATH ":" ${lib.makeBinPath [ bc bluez ] } runHook postInstall ''; @@ -38,4 +39,4 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "rofi-bluetooth"; platforms = platforms.linux; }; -}) +} diff --git a/pkgs/applications/misc/rofi-emoji/default.nix b/pkgs/applications/misc/rofi-emoji/default.nix index 3b0aaefc83c28..39004f04945ec 100644 --- a/pkgs/applications/misc/rofi-emoji/default.nix +++ b/pkgs/applications/misc/rofi-emoji/default.nix @@ -15,61 +15,58 @@ , rofi-unwrapped , wl-clipboard , xclip -, xsel , xdotool , wtype }: -stdenv.mkDerivation rec { - pname = "rofi-emoji"; - version = "3.3.0"; +import ./versions.nix ({ version, hash, patches}: + stdenv.mkDerivation rec { + pname = "rofi-emoji"; + inherit version; - src = fetchFromGitHub { - owner = "Mange"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-Y+E5TViKFVtqXMLVEcq1VMLPzG04vfZyThUM7a/fFGM="; - }; + src = fetchFromGitHub { + owner = "Mange"; + repo = "rofi-emoji"; + rev = "v${version}"; + inherit hash; + }; - patches = [ - # Look for plugin-related files in $out/lib/rofi - ./0001-Patch-plugindir-to-output.patch - ]; + inherit patches; - postPatch = '' - patchShebangs clipboard-adapter.sh - ''; + postPatch = '' + patchShebangs clipboard-adapter.sh + ''; - postFixup = '' - chmod +x $out/share/rofi-emoji/clipboard-adapter.sh - wrapProgram $out/share/rofi-emoji/clipboard-adapter.sh \ - --prefix PATH ":" ${lib.makeBinPath ([ libnotify wl-clipboard xclip xsel ] - ++ lib.optionals waylandSupport [ wtype ] - ++ lib.optionals x11Support [ xdotool ])} - ''; + postFixup = '' + chmod +x $out/share/rofi-emoji/clipboard-adapter.sh + wrapProgram $out/share/rofi-emoji/clipboard-adapter.sh \ + --prefix PATH ":" ${lib.makeBinPath ([ libnotify ] + ++ lib.optionals waylandSupport [ wl-clipboard wtype ] + ++ lib.optionals x11Support [ xclip xdotool ])} + ''; - nativeBuildInputs = [ - autoreconfHook - pkg-config - makeWrapper - ]; + nativeBuildInputs = [ + autoreconfHook + pkg-config + makeWrapper + ]; - buildInputs = [ - cairo - glib - libnotify - rofi-unwrapped - wl-clipboard - xclip - xsel - ]; + buildInputs = [ + cairo + glib + libnotify + rofi-unwrapped + ] + ++ lib.optionals waylandSupport [ wl-clipboard wtype ] + ++ lib.optionals x11Support [ xclip ]; - meta = with lib; { - description = "Emoji selector plugin for Rofi"; - homepage = "https://github.com/Mange/rofi-emoji"; - license = licenses.mit; - maintainers = with maintainers; [ cole-h ]; - platforms = platforms.linux; - }; -} + meta = with lib; { + description = "Emoji selector plugin for Rofi (built against ${rofi-unwrapped.pname})"; + homepage = "https://github.com/Mange/rofi-emoji"; + license = licenses.mit; + maintainers = with maintainers; [ cole-h Mange ]; + platforms = platforms.linux; + }; + } +) diff --git a/pkgs/applications/misc/rofi-emoji/versions.nix b/pkgs/applications/misc/rofi-emoji/versions.nix new file mode 100644 index 0000000000000..20b79d584634c --- /dev/null +++ b/pkgs/applications/misc/rofi-emoji/versions.nix @@ -0,0 +1,18 @@ +generic: { + v4 = generic { + version = "4.0.0"; + hash = "sha256-864Mohxfc3EchBKtSNifxy8g8T8YBUQ/H7+8Ti6TiFo="; + patches = [ + # Look for plugin-related files in $out/lib/rofi + ./0001-Patch-plugindir-to-output.patch + ]; + }; + v3 = generic { + version = "3.4.1"; + hash = "sha256-ZHhgYytPB14zj2MS8kChRD+LTqXzHRrz7YIikuQD6i0="; + patches = [ + # Look for plugin-related files in $out/lib/rofi + ./0001-Patch-plugindir-to-output.patch + ]; + }; +} diff --git a/pkgs/applications/misc/rofi-file-browser/default.nix b/pkgs/applications/misc/rofi-file-browser/default.nix index 0dff62cca2295..95eb5c77ca3a7 100644 --- a/pkgs/applications/misc/rofi-file-browser/default.nix +++ b/pkgs/applications/misc/rofi-file-browser/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "marvinkreis"; repo = pname; rev = version; - sha256 = "sha256-UEFv0skFzWhgFkmz1h8uV1ygW977zNq1Dw8VAawqUgw="; + hash = "sha256-UEFv0skFzWhgFkmz1h8uV1ygW977zNq1Dw8VAawqUgw="; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/rofi-menugen/default.nix b/pkgs/applications/misc/rofi-menugen/default.nix index 569ae6ef4cd88..7d5cb9f3eb89e 100644 --- a/pkgs/applications/misc/rofi-menugen/default.nix +++ b/pkgs/applications/misc/rofi-menugen/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Generates menu based applications using rofi"; homepage = "https://github.com/octotep/menugen"; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = platforms.all; }; } diff --git a/pkgs/applications/misc/rofi/default.nix b/pkgs/applications/misc/rofi/default.nix index edd0120341159..cad73779a85e6 100644 --- a/pkgs/applications/misc/rofi/default.nix +++ b/pkgs/applications/misc/rofi/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { repo = "rofi"; rev = version; fetchSubmodules = true; - sha256 = "sha256-3XFusKeckagEPfbLtt1xAVTEfn1Qebdi/Iq1AYbHCR4="; + hash = "sha256-3XFusKeckagEPfbLtt1xAVTEfn1Qebdi/Iq1AYbHCR4="; }; preConfigure = '' diff --git a/pkgs/applications/misc/rofi/wayland.nix b/pkgs/applications/misc/rofi/wayland.nix index 51702e521e81e..ee0a183f6b5d3 100644 --- a/pkgs/applications/misc/rofi/wayland.nix +++ b/pkgs/applications/misc/rofi/wayland.nix @@ -1,8 +1,8 @@ -{ stdenv -, lib +{ lib , fetchFromGitHub , rofi-unwrapped , wayland-scanner +, pkg-config , wayland-protocols , wayland }: @@ -16,10 +16,11 @@ rofi-unwrapped.overrideAttrs (oldAttrs: rec { repo = "rofi"; rev = version; fetchSubmodules = true; - sha256 = "sha256-pKxraG3fhBh53m+bLPzCigRr6dBcH/A9vbdf67CO2d8="; + hash = "sha256-pKxraG3fhBh53m+bLPzCigRr6dBcH/A9vbdf67CO2d8="; }; - nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ wayland-scanner ]; + depsBuildBuild = oldAttrs.depsBuildBuild ++ [ pkg-config ]; + nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ wayland-protocols wayland-scanner ]; buildInputs = oldAttrs.buildInputs ++ [ wayland wayland-protocols ]; meta = with lib; { diff --git a/pkgs/applications/misc/rofi/wrapper.nix b/pkgs/applications/misc/rofi/wrapper.nix index f8da5074b52aa..3f08a50475904 100644 --- a/pkgs/applications/misc/rofi/wrapper.nix +++ b/pkgs/applications/misc/rofi/wrapper.nix @@ -37,6 +37,6 @@ symlinkJoin { ''; meta = rofi-unwrapped.meta // { - priority = (rofi-unwrapped.meta.priority or 0) - 1; + priority = (rofi-unwrapped.meta.priority or lib.meta.defaultPriority) - 1; }; } diff --git a/pkgs/applications/misc/rootbar/default.nix b/pkgs/applications/misc/rootbar/default.nix deleted file mode 100644 index a528cd4a94ade..0000000000000 --- a/pkgs/applications/misc/rootbar/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ lib, stdenv -, fetchhg -, pkg-config -, meson -, ninja -, gtk3 -, json_c -, libpulseaudio -, wayland -, wrapGAppsHook3 -}: - -stdenv.mkDerivation rec { - pname = "rootbar"; - version = "unstable-2020-11-13"; - - src = fetchhg { - url = "https://hg.sr.ht/~scoopta/rootbar"; - rev = "a018e10cfc5e"; - sha256 = "sha256-t6oDIYCVaCxaYy4bS1vxESaFDNxsx5JQLQK77eVuafE="; - }; - - nativeBuildInputs = [ - meson ninja pkg-config wrapGAppsHook3 - ]; - - buildInputs = [ - gtk3 - json_c - libpulseaudio - wayland - ]; - - meta = with lib; { - homepage = "https://hg.sr.ht/~scoopta/rootbar"; - description = "Bar for Wayland WMs"; - mainProgram = "rootbar"; - longDescription = '' - Root Bar is a bar for wlroots based wayland compositors such as sway and - was designed to address the lack of good bars for wayland. - ''; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.unix; - broken = stdenv.isDarwin; - }; -} diff --git a/pkgs/applications/misc/rtfm/default.nix b/pkgs/applications/misc/rtfm/default.nix index 256ed98f9a8cd..655dd90fdb342 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 = [ @@ -52,7 +52,7 @@ crystal.buildCrystalPackage rec { nativeBuildInputs = [ wrapGAppsHook4 gobject-introspection - ] ++ lib.optionals stdenv.isDarwin [ desktopToDarwinBundle ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ desktopToDarwinBundle ]; buildInputs = [ webkitgtk_6_0 diff --git a/pkgs/applications/misc/rust-traverse/default.nix b/pkgs/applications/misc/rust-traverse/default.nix index 7d0e072ee36b7..ffe1018471059 100644 --- a/pkgs/applications/misc/rust-traverse/default.nix +++ b/pkgs/applications/misc/rust-traverse/default.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ bzip2 zstd - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk_11_0.frameworks.Foundation ]; diff --git a/pkgs/applications/misc/rusty-psn/default.nix b/pkgs/applications/misc/rusty-psn/default.nix index 058e4a9c028a9..ecd5948b4d9ca 100644 --- a/pkgs/applications/misc/rusty-psn/default.nix +++ b/pkgs/applications/misc/rusty-psn/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , rustPlatform , fetchFromGitHub , makeDesktopItem @@ -29,7 +28,7 @@ rustPlatform.buildRustPackage rec { cargoPatches = [ ./fix-cargo-lock.patch ]; - cargoSha256 = "sha256-8J92WtMmCTnghPqSmNYhG3IVdmpHsHEH7Fkod0UYKJU="; + cargoHash = "sha256-8J92WtMmCTnghPqSmNYhG3IVdmpHsHEH7Fkod0UYKJU="; # Tests require network access doCheck = false; @@ -56,7 +55,6 @@ rustPlatform.buildRustPackage rec { xorg.libXi xorg.libxcb libGL - libGL.dev ]; buildNoDefaultFeatures = true; diff --git a/pkgs/applications/misc/safecloset/default.nix b/pkgs/applications/misc/safecloset/default.nix index ce774e5a668f1..d173777bc3bcf 100644 --- a/pkgs/applications/misc/safecloset/default.nix +++ b/pkgs/applications/misc/safecloset/default.nix @@ -19,9 +19,9 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-rxNp9dOvy/UTx6Q9pzZGccEKmIiWxzWVYyMxb+h5bqw="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ xorg.libxcb ]; diff --git a/pkgs/applications/misc/safeeyes/default.nix b/pkgs/applications/misc/safeeyes/default.nix index 19ba418521766..8d83b3c3bb02f 100644 --- a/pkgs/applications/misc/safeeyes/default.nix +++ b/pkgs/applications/misc/safeeyes/default.nix @@ -3,7 +3,6 @@ , fetchPypi , alsa-utils , gobject-introspection -, libappindicator-gtk3 , libnotify , wlrctl , gtk3 @@ -18,11 +17,11 @@ with python3.pkgs; buildPythonApplication rec { pname = "safeeyes"; - version = "2.1.9"; + version = "2.2.2"; src = fetchPypi { inherit pname version; - hash = "sha256-Z1c1DVwCwPiOPvCYNsoXJBMfVzIQA+/6wStV8BShahc="; + hash = "sha256-k/CNxLScZDCXiwJhP5qh5HD5VUKlOLaYV8ICYgz6NKI="; }; postPatch = '' @@ -36,7 +35,6 @@ buildPythonApplication rec { buildInputs = [ gtk3 - libappindicator-gtk3 libnotify ]; @@ -47,6 +45,8 @@ buildPythonApplication rec { pygobject3 dbus-python croniter + setuptools + packaging ]; # Prevent double wrapping, let the Python wrapper use the args in preFixup. diff --git a/pkgs/applications/misc/sampler/default.nix b/pkgs/applications/misc/sampler/default.nix index a111142bbde4b..7ee3d4573d9aa 100644 --- a/pkgs/applications/misc/sampler/default.nix +++ b/pkgs/applications/misc/sampler/default.nix @@ -25,8 +25,8 @@ buildGoModule rec { subPackages = [ "." ]; - buildInputs = lib.optional stdenv.isLinux alsa-lib - ++ lib.optionals stdenv.isDarwin [ + buildInputs = lib.optional stdenv.hostPlatform.isLinux alsa-lib + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.OpenAL ]; diff --git a/pkgs/applications/misc/sc-im/default.nix b/pkgs/applications/misc/sc-im/default.nix index 2ec7f35a219b4..c8d90823863f9 100644 --- a/pkgs/applications/misc/sc-im/default.nix +++ b/pkgs/applications/misc/sc-im/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "sc-im"; - version = "0.8.3"; + version = "0.8.4"; src = fetchFromGitHub { owner = "andmarti1424"; repo = "sc-im"; rev = "v${version}"; - sha256 = "sha256-QlnxMe0WsRX9J2xzpf2Udcf9+N3MvQWqmYl2YKsGpYM="; + sha256 = "sha256-nNOifSYbmJjuw6c8TerIQRlhCwbs7GnzD2J7O3vs0gI="; }; sourceRoot = "${src.name}/src"; @@ -46,6 +46,8 @@ stdenv.mkDerivation rec { makeFlags = [ "prefix=${placeholder "out"}" ]; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=implicit-function-declaration"; + postInstall = '' wrapProgram "$out/bin/sc-im" --prefix PATH : "${lib.makeBinPath [ gnuplot ]}" ''; diff --git a/pkgs/applications/misc/schemes/default.nix b/pkgs/applications/misc/schemes/default.nix index bead03c4c7c8b..acf3cd8cf1027 100644 --- a/pkgs/applications/misc/schemes/default.nix +++ b/pkgs/applications/misc/schemes/default.nix @@ -7,7 +7,6 @@ , gtk4 , gtksourceview5 , libadwaita -, libgee , libpanel , meson , ninja diff --git a/pkgs/applications/misc/scli/default.nix b/pkgs/applications/misc/scli/default.nix index 4c11333a4a01b..a16770df8611d 100644 --- a/pkgs/applications/misc/scli/default.nix +++ b/pkgs/applications/misc/scli/default.nix @@ -10,13 +10,13 @@ python3.pkgs.buildPythonApplication rec { pname = "scli"; - version = "0.7.4"; + version = "0.7.5"; src = fetchFromGitHub { owner = "isamert"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-GC19iJYdNUdC4UEBWWdlzl0Ha6Y3knB1dG+6spwdYQ0="; + sha256 = "sha256-pp3uVABsncXXL2PZvTymHPKGAFvB24tnX+3K+C0VW8g="; }; propagatedBuildInputs = with python3.pkgs; [ @@ -54,6 +54,6 @@ python3.pkgs.buildPythonApplication rec { mainProgram = "scli"; homepage = "https://github.com/isamert/scli"; license = licenses.gpl3Only; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/misc/seashells/default.nix b/pkgs/applications/misc/seashells/default.nix index 37a90478710ca..c928bca8cefbd 100644 --- a/pkgs/applications/misc/seashells/default.nix +++ b/pkgs/applications/misc/seashells/default.nix @@ -7,7 +7,7 @@ python3Packages.buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-RBs28FC7f82DrxRcmvTP9nljVpm7tjrGuvr05l32hDM="; + hash = "sha256-RBs28FC7f82DrxRcmvTP9nljVpm7tjrGuvr05l32hDM="; }; doCheck = false; # there are no tests diff --git a/pkgs/applications/misc/senv/default.nix b/pkgs/applications/misc/senv/default.nix index b542966e828a6..999b140c5fe2a 100644 --- a/pkgs/applications/misc/senv/default.nix +++ b/pkgs/applications/misc/senv/default.nix @@ -20,7 +20,7 @@ buildGoModule rec { homepage = "https://github.com/SpectralOps/senv"; license = licenses.mit; maintainers = with maintainers; [ SuperSandro2000 ]; - broken = stdenv.isDarwin; # needs golang.org/x/sys bump + broken = stdenv.hostPlatform.isDarwin; # needs golang.org/x/sys bump mainProgram = "senv"; }; } diff --git a/pkgs/applications/misc/shavee/default.nix b/pkgs/applications/misc/shavee/default.nix index 1e4dadcf786b3..6b6864669622a 100644 --- a/pkgs/applications/misc/shavee/default.nix +++ b/pkgs/applications/misc/shavee/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , rustPlatform , fetchFromGitHub , pam diff --git a/pkgs/applications/misc/shell-genie/default.nix b/pkgs/applications/misc/shell-genie/default.nix index 728a4aabed381..60b3ce9548ce8 100644 --- a/pkgs/applications/misc/shell-genie/default.nix +++ b/pkgs/applications/misc/shell-genie/default.nix @@ -25,10 +25,6 @@ buildPythonPackage rec { poetry-core ]; - nativeBuildInputs = [ - pythonRelaxDepsHook - ]; - dependencies = [ colorama openai @@ -36,7 +32,7 @@ buildPythonPackage rec { rich shellingham typer - ] ++ typer.optional-dependencies.all; + ]; # No tests available doCheck = false; diff --git a/pkgs/applications/misc/sigal/default.nix b/pkgs/applications/misc/sigal/default.nix index 1e82fce078986..d9b4c4cfd53bc 100644 --- a/pkgs/applications/misc/sigal/default.nix +++ b/pkgs/applications/misc/sigal/default.nix @@ -41,7 +41,7 @@ python3.pkgs.buildPythonApplication rec { pytestCheckHook ]); - disabledTests = lib.optionals stdenv.isDarwin [ + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ "test_nonmedia_files" ]; diff --git a/pkgs/applications/misc/siglo/default.nix b/pkgs/applications/misc/siglo/default.nix index 2aeedcc25b2b6..4825b00c89596 100644 --- a/pkgs/applications/misc/siglo/default.nix +++ b/pkgs/applications/misc/siglo/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/theironrobin/siglo"; changelog = "https://github.com/theironrobin/siglo/tags/v${version}"; license = licenses.mpl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/sioyek/default.nix b/pkgs/applications/misc/sioyek/default.nix index ab853d4dc1f4d..64faccf6811c5 100644 --- a/pkgs/applications/misc/sioyek/default.nix +++ b/pkgs/applications/misc/sioyek/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { qt3d qtbase ] - ++ lib.optionals stdenv.isDarwin [ freetype ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ freetype ]; nativeBuildInputs = [ installShellFiles @@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { wrapQtAppsHook ]; - qmakeFlags = lib.optionals stdenv.isDarwin [ "CONFIG+=non_portable" ]; + qmakeFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "CONFIG+=non_portable" ]; postPatch = '' substituteInPlace pdf_viewer_build_config.pro \ @@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: { --replace "/etc/sioyek" "$out/etc" ''; - postInstall = if stdenv.isDarwin then '' + postInstall = if stdenv.hostPlatform.isDarwin then '' cp -r pdf_viewer/shaders sioyek.app/Contents/MacOS/shaders cp pdf_viewer/prefs.config sioyek.app/Contents/MacOS/ cp pdf_viewer/prefs_user.config sioyek.app/Contents/MacOS/ diff --git a/pkgs/applications/misc/skate/default.nix b/pkgs/applications/misc/skate/default.nix index 6ea198adc0332..af420e27e21a9 100644 --- a/pkgs/applications/misc/skate/default.nix +++ b/pkgs/applications/misc/skate/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "skate"; - version = "0.2.2"; + version = "1.0.0"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "skate"; rev = "v${version}"; - hash = "sha256-Kum8IdgvRC75RLafCac0fkNn/VKvWFW48IK5tqLH/ME="; + hash = "sha256-HwtBY4rtqyY+DMNq2Fu30/CsTlhhGOuJRrdM5zHUAIg="; }; proxyVendor = true; - vendorHash = "sha256-/qZB/GGEkoqRoNhEmZw9Q2lsUPZRg5/xVxWgdBZTMLk="; + vendorHash = "sha256-nCT9PsRPxefjC4q4cr5UigTITUkx0JmQtdv7/ZXbXVI="; ldflags = [ "-s" "-w" "-X=main.Version=${version}" ]; diff --git a/pkgs/applications/misc/skytemple/default.nix b/pkgs/applications/misc/skytemple/default.nix index 4442e79944ac1..c510e88537083 100644 --- a/pkgs/applications/misc/skytemple/default.nix +++ b/pkgs/applications/misc/skytemple/default.nix @@ -15,11 +15,13 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "SkyTemple"; - repo = pname; + repo = "skytemple"; rev = "refs/tags/${version}"; hash = "sha256-yfXu1sboKi8STPiX5FUD9q+1U9GfhOyEKDRvU9rgdfI="; }; + build-system = with python3Packages; [ setuptools ]; + buildInputs = [ gtk3 gtksourceview4 @@ -34,7 +36,12 @@ python3Packages.buildPythonApplication rec { wrapGAppsHook3 ]; - propagatedBuildInputs = with python3Packages; [ + pythonRelaxDeps = [ + "skytemple-files" + "skytemple-ssb-debugger" + ]; + + dependencies = with python3Packages; [ cairosvg natsort ndspy diff --git a/pkgs/applications/misc/slippy/default.nix b/pkgs/applications/misc/slippy/default.nix index cf5cd1ff0b3db..a7e6a75a7a7ea 100644 --- a/pkgs/applications/misc/slippy/default.nix +++ b/pkgs/applications/misc/slippy/default.nix @@ -49,7 +49,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/applications/misc/snagboot/default.nix b/pkgs/applications/misc/snagboot/default.nix index 353712d5ba896..3a663443513c8 100644 --- a/pkgs/applications/misc/snagboot/default.nix +++ b/pkgs/applications/misc/snagboot/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, pythonRelaxDepsHook , python3 , snagboot , testers @@ -21,7 +20,6 @@ python3.pkgs.buildPythonApplication rec { }; nativeBuildInputs = [ - pythonRelaxDepsHook ]; pythonRemoveDeps = [ @@ -41,7 +39,7 @@ python3.pkgs.buildPythonApplication rec { tftpy ]; - postInstall = lib.optionalString stdenv.isLinux '' + postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' rules="src/snagrecover/50-snagboot.rules" if [ ! -f "$rules" ]; then echo "$rules is missing, must update the Nix file." diff --git a/pkgs/applications/misc/snapmaker-luban/default.nix b/pkgs/applications/misc/snapmaker-luban/default.nix index dc5fe5993f4f7..eaa2fe15a7435 100644 --- a/pkgs/applications/misc/snapmaker-luban/default.nix +++ b/pkgs/applications/misc/snapmaker-luban/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, autoPatchelfHook, makeDesktopItem, copyDesktopItems, wrapGAppsHook3, fetchurl , alsa-lib, at-spi2-atk, at-spi2-core, atk, cairo, cups -, gtk3, nss, glib, dbus, nspr, gdk-pixbuf, libdrm, mesa +, gtk3, nss, glib, nspr, gdk-pixbuf, libdrm, mesa , libX11, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext , libXfixes, libXi, libXrandr, libXrender, libXtst, libxcb, libxshmfence, pango , gcc-unwrapped, udev 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/spotify-tray/default.nix b/pkgs/applications/misc/spotify-tray/default.nix index 107424e4e836d..7eb84702be0cd 100644 --- a/pkgs/applications/misc/spotify-tray/default.nix +++ b/pkgs/applications/misc/spotify-tray/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkg-config, gtk3 }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkg-config, gtk3, makeWrapper }: stdenv.mkDerivation rec { pname = "spotify-tray"; @@ -19,16 +19,20 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ autoreconfHook pkg-config ]; + nativeBuildInputs = [ autoreconfHook pkg-config makeWrapper ]; buildInputs = [ gtk3 ]; + postFixup = '' + wrapProgram $out/bin/spotify-tray --set GDK_BACKEND x11 + ''; + meta = with lib; { homepage = "https://github.com/tsmetana/spotify-tray"; description = "Adds a tray icon to the Spotify Linux client application"; license = licenses.gpl3Only; platforms = platforms.linux; - maintainers = with maintainers; [ Enzime ]; + maintainers = [ ]; mainProgram = "spotify-tray"; }; } diff --git a/pkgs/applications/misc/ssh-tools/default.nix b/pkgs/applications/misc/ssh-tools/default.nix index 2e79f69656f9b..3e0b7e50d93ee 100644 --- a/pkgs/applications/misc/ssh-tools/default.nix +++ b/pkgs/applications/misc/ssh-tools/default.nix @@ -1,24 +1,36 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitea, installShellFiles, perl }: -stdenv.mkDerivation rec { +buildGoModule rec { pname = "ssh-tools"; - version = "1.7"; + version = "1.8-unstable-2024-03-18"; - src = fetchFromGitHub { + src = fetchFromGitea { + domain = "codeberg.org"; owner = "vaporup"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-PDoljR/e/qraPhG9RRjHx1gBIMtTJ815TZDJws8Qg6o="; + repo = "ssh-tools"; + rev = "69c73844b2498c46f1293b129808bfdce8822c28"; + hash = "sha256-cG75Jn331G0HZZyrE+JWC05f6DgYBz6sx8MTCxsG/vw="; }; - installPhase = '' - mkdir -p $out/bin - cp ssh-* $out/bin/ + vendorHash = "sha256-GSFhz3cIRl4XUA18HUeUkrw+AJyOkU3ZrZKYTGsWbug="; + + subPackages = [ + "cmd/go/ssh-authorized-keys" + "cmd/go/ssh-sig" + ]; + + nativeBuildInputs = [ installShellFiles ]; + + buildInputs = [ perl ]; + + postInstall = '' + install cmd/{bash,perl}/ssh-*/ssh-* -t $out/bin + installManPage man/*.1 ''; meta = with lib; { - description = "Collection of various tools using ssh"; - homepage = "https://github.com/vaporup/ssh-tools/"; + description = "Making SSH more convenient"; + homepage = "https://codeberg.org/vaporup/ssh-tools"; license = licenses.gpl3Only; maintainers = with maintainers; [ SuperSandro2000 ]; }; 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/stepreduce/default.nix b/pkgs/applications/misc/stepreduce/default.nix index 40e0986c5d01c..d6122ec0bbb31 100644 --- a/pkgs/applications/misc/stepreduce/default.nix +++ b/pkgs/applications/misc/stepreduce/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { install -Dm755 stepreduce $out/bin/stepreduce - runHook prostInstall + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/applications/misc/sticky/default.nix b/pkgs/applications/misc/sticky/default.nix index 5d9cf35957829..dd54d9c645918 100644 --- a/pkgs/applications/misc/sticky/default.nix +++ b/pkgs/applications/misc/sticky/default.nix @@ -6,7 +6,7 @@ , ninja , python3 , wrapGAppsHook3 -, cinnamon +, xapp , glib , gspell , gtk3 @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "sticky"; - version = "1.21"; + version = "1.22"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-EH5EyvI3iAZr+aSV3DKM9RLkPmUcwKKXlOXSU0ECsPI="; + hash = "sha256-JrzBME1d4qvGjF2zdiqCX7h+sFadLsRQqZKnQj7elHs="; }; postPatch = '' @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - cinnamon.xapp + xapp glib gspell gtk3 @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { pythonPath = with python3.pkgs; [ pygobject3 - xapp + python-xapp ]; dontWrapGApps = true; diff --git a/pkgs/applications/misc/stork/default.nix b/pkgs/applications/misc/stork/default.nix index ab851363d381b..4441508e0be88 100644 --- a/pkgs/applications/misc/stork/default.nix +++ b/pkgs/applications/misc/stork/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-qGcEhoytkCkcaA5eHc8GVgWvbOIyrO6BCp+EHva6wTw="; }; - cargoSha256 = "sha256-a7ADTJ0VmKiZBr951JIAOSPWucsBl5JnM8eQHWssRM4="; + cargoHash = "sha256-a7ADTJ0VmKiZBr951JIAOSPWucsBl5JnM8eQHWssRM4="; checkFlags = [ # Fails for 1.6.0, but binary works fine @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ Security ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; meta = with lib; { description = "Impossibly fast web search, made for static sites"; diff --git a/pkgs/applications/misc/stretchly/default.nix b/pkgs/applications/misc/stretchly/default.nix index ab7ae6fff5997..da0c492850180 100644 --- a/pkgs/applications/misc/stretchly/default.nix +++ b/pkgs/applications/misc/stretchly/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "stretchly"; - version = "1.15.1"; + version = "1.16.0"; src = fetchurl { url = "https://github.com/hovancik/stretchly/releases/download/v${finalAttrs.version}/stretchly-${finalAttrs.version}.tar.xz"; - hash = "sha256-suTH6o7vtUr2DidPXAwqrya5/WukQOFmS/34LaiWDBs="; + hash = "sha256-gOMUXGldtZUfqLABJHfbToYe0pcAn8dRWEFxCi/gY9Y="; }; icon = fetchurl { diff --git a/pkgs/applications/misc/stw/default.nix b/pkgs/applications/misc/stw/default.nix index 689fc9e81ce7f..5f36e1e1126c2 100644 --- a/pkgs/applications/misc/stw/default.nix +++ b/pkgs/applications/misc/stw/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ somasis ]; platforms = platforms.unix; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; mainProgram = "stw"; }; } diff --git a/pkgs/applications/misc/sunwait/default.nix b/pkgs/applications/misc/sunwait/default.nix index f824011f1b868..2f369c1eb9ce2 100644 --- a/pkgs/applications/misc/sunwait/default.nix +++ b/pkgs/applications/misc/sunwait/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Calculates sunrise or sunset times with civil, nautical, astronomical and custom twilights"; homepage = "https://github.com/risacher/sunwait"; license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ eclairevoyant ]; + maintainers = with lib.maintainers; [ ]; mainProgram = "sunwait"; platforms = lib.platforms.all; }; diff --git a/pkgs/applications/misc/surface-control/default.nix b/pkgs/applications/misc/surface-control/default.nix index 77f3954ed0597..6c82c6efe96e3 100644 --- a/pkgs/applications/misc/surface-control/default.nix +++ b/pkgs/applications/misc/surface-control/default.nix @@ -37,7 +37,7 @@ rustPlatform.buildRustPackage rec { "Control various aspects of Microsoft Surface devices on Linux from the Command-Line"; homepage = "https://github.com/linux-surface/surface-control"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = platforms.linux; mainProgram = "surface"; }; diff --git a/pkgs/applications/misc/survex/default.nix b/pkgs/applications/misc/survex/default.nix index 2bb4184b4353b..bfb79fd10b930 100644 --- a/pkgs/applications/misc/survex/default.nix +++ b/pkgs/applications/misc/survex/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { ''; enableParallelBuilding = true; - doCheck = (!stdenv.isDarwin); # times out + doCheck = (!stdenv.hostPlatform.isDarwin); # times out enableParallelChecking = false; meta = with lib; { diff --git a/pkgs/applications/misc/sway-launcher-desktop/default.nix b/pkgs/applications/misc/sway-launcher-desktop/default.nix index 09dafdbac154c..7dd660dddb163 100644 --- a/pkgs/applications/misc/sway-launcher-desktop/default.nix +++ b/pkgs/applications/misc/sway-launcher-desktop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, pkgs, fzf, gawk, fetchFromGitHub, makeWrapper }: +{ stdenv, lib, fzf, gawk, fetchFromGitHub, makeWrapper }: stdenv.mkDerivation rec { pname = "sway-launcher-desktop"; diff --git a/pkgs/applications/misc/swaynag-battery/default.nix b/pkgs/applications/misc/swaynag-battery/default.nix index 8dc99ca012e92..cbcb5d90261f1 100644 --- a/pkgs/applications/misc/swaynag-battery/default.nix +++ b/pkgs/applications/misc/swaynag-battery/default.nix @@ -15,8 +15,8 @@ buildGoModule rec { meta = with lib; { homepage = "https://github.com/m00qek/swaynag-battery"; - description = "Shows a message when your battery is discharging "; - maintainers = with maintainers; [ ]; + description = "Shows a message when your battery is discharging"; + maintainers = [ ]; license = licenses.mit; mainProgram = "swaynag-battery"; }; diff --git a/pkgs/applications/misc/swaysettings/default.nix b/pkgs/applications/misc/swaysettings/default.nix index 5b13954c63f34..419695d2e7d8c 100644 --- a/pkgs/applications/misc/swaysettings/default.nix +++ b/pkgs/applications/misc/swaysettings/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { ]; postPatch = '' - patchShebangs /build/source/build-aux/meson/postinstall.py + patchShebangs build-aux/meson/postinstall.py ''; meta = with lib; { diff --git a/pkgs/applications/misc/sweethome3d/default.nix b/pkgs/applications/misc/sweethome3d/default.nix index 4745a942304ad..c441ca300858b 100644 --- a/pkgs/applications/misc/sweethome3d/default.nix +++ b/pkgs/applications/misc/sweethome3d/default.nix @@ -12,7 +12,6 @@ , p7zip , autoPatchelfHook , libXxf86vm -, unzip , libGL }: diff --git a/pkgs/applications/misc/sweethome3d/editors.nix b/pkgs/applications/misc/sweethome3d/editors.nix index a426494b61f64..9d37423f568db 100644 --- a/pkgs/applications/misc/sweethome3d/editors.nix +++ b/pkgs/applications/misc/sweethome3d/editors.nix @@ -14,10 +14,7 @@ let - sweetExec = with lib; - m: "sweethome3d-" - + removeSuffix "libraryeditor" (toLower m) - + "-editor"; + sweetExec = m: "sweethome3d-" + lib.removeSuffix "libraryeditor" (lib.toLower m) + "-editor"; mkEditorProject = { pname, module, version, src, license, description, desktopName }: diff --git a/pkgs/applications/misc/syncthingtray/default.nix b/pkgs/applications/misc/syncthingtray/default.nix index b5bf0696f7645..3d0cbe7198c23 100644 --- a/pkgs/applications/misc/syncthingtray/default.nix +++ b/pkgs/applications/misc/syncthingtray/default.nix @@ -22,26 +22,27 @@ , xdg-utils , webviewSupport ? true , jsSupport ? true -, kioPluginSupport ? stdenv.isLinux -, plasmoidSupport ? stdenv.isLinux -, systemdSupport ? stdenv.isLinux +, kioPluginSupport ? stdenv.hostPlatform.isLinux +, plasmoidSupport ? stdenv.hostPlatform.isLinux +, systemdSupport ? stdenv.hostPlatform.isLinux /* It is possible to set via this option an absolute exec path that will be written to the `~/.config/autostart/syncthingtray.desktop` file generated 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: { - version = "1.5.4"; + version = "1.6.2"; pname = "syncthingtray"; src = fetchFromGitHub { owner = "Martchus"; repo = "syncthingtray"; rev = "v${finalAttrs.version}"; - hash = "sha256-3Z9heiQiuYzWtReKs/XeA+ENRKgxHR74ANzrDcdyjh4="; + hash = "sha256-L56aX5UFFodSR2YHWt6Y+s83q3YoAuYvyqXP/XVMp20="; }; buildInputs = [ @@ -51,8 +52,8 @@ stdenv.mkDerivation (finalAttrs: { qtutilities boost qtforkawesome - ] ++ lib.optionals stdenv.isDarwin [ iconv ] - ++ lib.optionals stdenv.isLinux [ qtwayland ] + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ iconv ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ qtwayland ] ++ lib.optionals webviewSupport [ qtwebengine ] ++ lib.optionals jsSupport [ qtdeclarative ] ++ lib.optionals kioPluginSupport [ kio ] @@ -73,21 +74,22 @@ stdenv.mkDerivation (finalAttrs: { ; # syncthing server seems to hang on darwin, causing tests to fail. - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; preCheck = '' export QT_QPA_PLATFORM=offscreen export QT_PLUGIN_PATH="${lib.getBin qtbase}/${qtbase.qtPluginPrefix}" ''; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' # put the app bundle into the proper place /Applications instead of /bin mkdir -p $out/Applications mv $out/bin/syncthingtray.app $out/Applications # 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/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix index ef361fc6f14e1..7db338b16897f 100644 --- a/pkgs/applications/misc/synergy/default.nix +++ b/pkgs/applications/misc/synergy/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { owner = "symless"; repo = "synergy-core"; rev = version; - sha256 = "sha256-0QqklfSsvcXh7I2jaHk82k0nY8gQOj9haA4WOjGqBqY="; + hash = "sha256-0QqklfSsvcXh7I2jaHk82k0nY8gQOj9haA4WOjGqBqY="; fetchSubmodules = true; }; @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace src/gui/src/SslCertificate.cpp \ --replace 'kUnixOpenSslCommand[] = "openssl";' 'kUnixOpenSslCommand[] = "${openssl}/bin/openssl";' - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace src/lib/synergy/unix/AppUtilUnix.cpp \ --replace "/usr/share/X11/xkb/rules/evdev.xml" "${xkeyboardconfig}/share/X11/xkb/rules/evdev.xml" ''; @@ -69,14 +69,14 @@ stdenv.mkDerivation rec { qttools # Used for translations even when not building the GUI openssl pcre - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ ApplicationServices Carbon Cocoa CoreServices ScreenSaver UserNotifications - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ util-linux libselinux libsepol @@ -95,17 +95,17 @@ stdenv.mkDerivation rec { ]; # Silences many warnings - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-inconsistent-missing-override"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-Wno-inconsistent-missing-override"; cmakeFlags = lib.optional (!withGUI) "-DSYNERGY_BUILD_LEGACY_GUI=OFF" # NSFilenamesPboardType is deprecated in 10.14+ - ++ lib.optional stdenv.isDarwin "-DCMAKE_OSX_DEPLOYMENT_TARGET=${if stdenv.isAarch64 then "10.13" else stdenv.hostPlatform.darwinSdkVersion}"; + ++ lib.optional stdenv.hostPlatform.isDarwin "-DCMAKE_OSX_DEPLOYMENT_TARGET=${if stdenv.hostPlatform.isAarch64 then "10.13" else stdenv.hostPlatform.darwinSdkVersion}"; doCheck = true; checkPhase = '' runHook preCheck - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' # filter out tests failing with sandboxing on darwin export GTEST_FILTER=-ServerConfigTests.serverconfig_will_deem_equal_configs_with_same_cell_names:NetworkAddress.hostname_valid_parsing '' + '' @@ -120,12 +120,12 @@ stdenv.mkDerivation rec { cp bin/{synergyc,synergys,synergyd,syntool} $out/bin/ '' + lib.optionalString withGUI '' cp bin/synergy $out/bin/ - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' mkdir -p $out/share/{applications,icons/hicolor/scalable/apps} cp ../res/synergy.svg $out/share/icons/hicolor/scalable/apps/ substitute ../res/synergy.desktop $out/share/applications/synergy.desktop \ --replace "/usr/bin" "$out/bin" - '' + lib.optionalString (stdenv.isDarwin && withGUI) '' + '' + lib.optionalString (stdenv.hostPlatform.isDarwin && withGUI) '' mkdir -p $out/Applications cp -r bundle/Synergy.app $out/Applications ln -s $out/bin $out/Applications/Synergy.app/Contents/MacOS @@ -141,7 +141,7 @@ stdenv.mkDerivation rec { changelog = "https://github.com/symless/synergy-core/blob/${version}/ChangeLog"; mainProgram = lib.optionalString (!withGUI) "synergyc"; license = licenses.gpl2Only; - maintainers = with maintainers; [ talyz ivar ]; + maintainers = with maintainers; [ talyz ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/misc/system76-keyboard-configurator/default.nix b/pkgs/applications/misc/system76-keyboard-configurator/default.nix index 096f0589baedf..e9831de3ed00d 100644 --- a/pkgs/applications/misc/system76-keyboard-configurator/default.nix +++ b/pkgs/applications/misc/system76-keyboard-configurator/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, gtk3, glib, wrapGAppsHook3, libusb1, hidapi, udev, pkg-config }: +{ lib, fetchFromGitHub, rustPlatform, gtk3, glib, wrapGAppsHook3, libusb1, hidapi, udev, pkg-config }: # system76-keyboard-configurator tries to spawn a daemon as root via pkexec, so # your system needs a PolicyKit authentication agent running for the @@ -6,13 +6,13 @@ rustPlatform.buildRustPackage rec { pname = "system76-keyboard-configurator"; - version = "1.3.10"; + version = "1.3.12"; src = fetchFromGitHub { owner = "pop-os"; repo = "keyboard-configurator"; rev = "v${version}"; - sha256 = "sha256-5U9LWFaCwszvT1reu6NflPKQUrsQkP/NdSO4LBHWm2g="; + sha256 = "sha256-rnKWzct2k/ObjBnf90uwMar7fjZAUvQ2RPPZVZQsWEA="; }; nativeBuildInputs = [ @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { udev ]; - cargoHash = "sha256-S4+cS4m69nqDN2h0vwyO35fFFBEa0Rcxx0XDBfSNLp0="; + cargoHash = "sha256-3FUcJHuMOSbtE0sL6N2AvedyseJ7RiUbo8jtY/nWAW0="; postInstall = '' install -Dm444 linux/com.system76.keyboardconfigurator.desktop -t $out/share/applications diff --git a/pkgs/applications/misc/tabula-java/default.nix b/pkgs/applications/misc/tabula-java/default.nix index 4c437ea6df5de..011f92362a313 100644 --- a/pkgs/applications/misc/tabula-java/default.nix +++ b/pkgs/applications/misc/tabula-java/default.nix @@ -16,7 +16,7 @@ maven.buildMavenPackage rec { hash = "sha256-lg8/diyGhfkUU0w7PEOlxb1WNpJZVDDllxMMsTIU/Cw="; }; - mvnHash = "sha256-yULCBHgctZZU3Deod+nQujssmUy+kgdFdgE3NUuFhOw="; + mvnHash = "sha256-CXJm9YlYsYViChFcH9e2P9pxK0q/tLWODOzZPXZ8hK0="; mvnParameters = "compile assembly:single -Dmaven.test.skip=true"; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/misc/tabula/default.nix b/pkgs/applications/misc/tabula/default.nix deleted file mode 100644 index c4b7749b5304c..0000000000000 --- a/pkgs/applications/misc/tabula/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib, stdenv, fetchzip, jre, makeWrapper }: - - -stdenv.mkDerivation rec { - pname = "tabula"; - version = "1.2.1"; - - - src = fetchzip { - url = "https://github.com/tabulapdf/tabula/releases/download/v${version}/tabula-jar-${version}.zip"; - sha256 = "0lkpv8hkji81fanyxm7ph8421fr9a6phqc3pbhw2bc4gljg7sgxi"; - }; - - - nativeBuildInputs = [ makeWrapper ]; - - - installPhase = '' - mkdir -pv $out/share/tabula - cp -v * $out/share/tabula - - makeWrapper ${jre}/bin/java $out/bin/tabula --add-flags "-jar $out/share/tabula/tabula.jar" - ''; - - - meta = with lib; { - description = "Tool for liberating data tables locked inside PDF files"; - longDescription = '' - If you’ve ever tried to do anything with data provided to you in PDFs, you - know how painful it is — there's no easy way to copy-and-paste rows of data - out of PDF files. Tabula allows you to extract that data into a CSV or - Microsoft Excel spreadsheet using a simple, easy-to-use interface. - ''; - homepage = "https://tabula.technology/"; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; - license = licenses.mit; - maintainers = [ maintainers.dpaetzel ]; - platforms = platforms.all; - broken = true; # on 2022-11-23 this package builds, but produces an executable that fails immediately - }; -} diff --git a/pkgs/applications/misc/taizen/default.nix b/pkgs/applications/misc/taizen/default.nix index 903de3c05c1d4..30bb445089f5b 100644 --- a/pkgs/applications/misc/taizen/default.nix +++ b/pkgs/applications/misc/taizen/default.nix @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ ncurses openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/applications/misc/tandoor-recipes/common.nix b/pkgs/applications/misc/tandoor-recipes/common.nix index 7b0c1f3897d4a..9d177a87d9042 100644 --- a/pkgs/applications/misc/tandoor-recipes/common.nix +++ b/pkgs/applications/misc/tandoor-recipes/common.nix @@ -1,15 +1,15 @@ { lib, fetchFromGitHub }: rec { - version = "1.5.16"; + version = "1.5.19"; src = fetchFromGitHub { owner = "TandoorRecipes"; repo = "recipes"; rev = version; - hash = "sha256-A5cPO3uybTmAV8zWY90S9vtU/tLgbh1Iqhi+ty0RLhM="; + hash = "sha256-HsBy2HzxBpnwh2RqFQJG0HYReWI0a7E7KsJ5TD+GokY="; }; - yarnHash = "sha256-OAgVaXWTVlKqIgDgKNT1MWN3dYzTqrAGgNAnXLDHE+I="; + yarnHash = "sha256-BnOw9QRXRRoM+CW6OGbjWhLo4h6JX3ZR1kJd8Z/w02M="; meta = with lib; { homepage = "https://tandoor.dev/"; diff --git a/pkgs/applications/misc/tandoor-recipes/default.nix b/pkgs/applications/misc/tandoor-recipes/default.nix index b2bda05d54964..b6d99325f1205 100644 --- a/pkgs/applications/misc/tandoor-recipes/default.nix +++ b/pkgs/applications/misc/tandoor-recipes/default.nix @@ -1,10 +1,12 @@ { callPackage , nixosTests -, python3 +, python311 , fetchFromGitHub }: let - python = python3.override { + # python-ldap-3.4.4 does not work with python3(12) + python = python311.override { + self = python; packageOverrides = self: super: { validators = super.validators.overridePythonAttrs (_: rec { version = "0.20.0"; @@ -28,6 +30,15 @@ let pytest-django ]; }); + + # python3.11-extruct-0.16.0 doesn't work with lxml-5.2.2 + lxml = super.lxml.overridePythonAttrs (oldAttrs: rec { + version = "5.1.0"; + src = oldAttrs.src.override { + rev = version; + hash = "sha256-eWLYzZWatYDmhuBTZynsdytlNFKKmtWQ1XIyzVD8sDY="; + }; + }); }; }; @@ -154,8 +165,11 @@ python.pkgs.pythonPackages.buildPythonPackage rec { # flaky disabledTests = [ + "test_add_duplicate" + "test_reset_inherit_space_fields" "test_search_count" "test_url_import_regex_replace" + "test_url_validator" "test_delete" ]; diff --git a/pkgs/applications/misc/tandoor-recipes/frontend.nix b/pkgs/applications/misc/tandoor-recipes/frontend.nix index 2b53e1efa9305..76867f67a2cc1 100644 --- a/pkgs/applications/misc/tandoor-recipes/frontend.nix +++ b/pkgs/applications/misc/tandoor-recipes/frontend.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchYarnDeps, fixup-yarn-lock, callPackage, nodejs }: +{ stdenv, fetchYarnDeps, fixup-yarn-lock, callPackage, nodejs, yarn }: let common = callPackage ./common.nix { }; in @@ -16,7 +16,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ fixup-yarn-lock nodejs - nodejs.pkgs.yarn + yarn ]; configurePhase = '' diff --git a/pkgs/applications/misc/tasknc/default.nix b/pkgs/applications/misc/tasknc/default.nix index 2b3decab36b58..ff478d1415a42 100644 --- a/pkgs/applications/misc/tasknc/default.nix +++ b/pkgs/applications/misc/tasknc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, makeWrapper, perl, ncurses5, taskwarrior }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, makeWrapper, perl, ncurses5, taskwarrior2 }: stdenv.mkDerivation rec { version = "2020-12-17"; @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { DESTDIR=$out PREFIX= MANPREFIX=/share/man make install - wrapProgram $out/bin/tasknc --prefix PATH : ${taskwarrior}/bin + wrapProgram $out/bin/tasknc --prefix PATH : ${taskwarrior2}/bin ''; diff --git a/pkgs/applications/misc/taskwarrior-tui/default.nix b/pkgs/applications/misc/taskwarrior-tui/default.nix index 88a8e99f26a02..f313d3d1f0ffe 100644 --- a/pkgs/applications/misc/taskwarrior-tui/default.nix +++ b/pkgs/applications/misc/taskwarrior-tui/default.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { ''; meta = with lib; { - description = "Terminal user interface for taskwarrior "; + description = "Terminal user interface for taskwarrior"; homepage = "https://github.com/kdheepak/taskwarrior-tui"; license = with licenses; [ mit ]; maintainers = with maintainers; [ matthiasbeyer ]; diff --git a/pkgs/applications/misc/taskwarrior/default.nix b/pkgs/applications/misc/taskwarrior/default.nix deleted file mode 100644 index 105d470d13580..0000000000000 --- a/pkgs/applications/misc/taskwarrior/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, libuuid, gnutls, python3, xdg-utils, installShellFiles }: - -stdenv.mkDerivation rec { - pname = "taskwarrior"; - version = "2.6.2"; - - src = fetchFromGitHub { - owner = "GothenburgBitFactory"; - repo = "taskwarrior"; - rev = "v${version}"; - sha256 = "sha256-0YveqiylXJi4cdDCfnPtwCVOJbQrZYsxnXES+9B4Yfw="; - fetchSubmodules = true; - }; - - postPatch = '' - substituteInPlace src/commands/CmdNews.cpp \ - --replace "xdg-open" "${lib.getBin xdg-utils}/bin/xdg-open" - ''; - - nativeBuildInputs = [ cmake libuuid gnutls python3 installShellFiles ]; - - doCheck = true; - preCheck = '' - patchShebangs --build test - ''; - checkTarget = "test"; - - postInstall = '' - # ZSH is installed automatically from some reason, only bash and fish need - # manual installation - installShellCompletion --cmd task \ - --bash $out/share/doc/task/scripts/bash/task.sh \ - --fish $out/share/doc/task/scripts/fish/task.fish - rm -r $out/share/doc/task/scripts/bash - rm -r $out/share/doc/task/scripts/fish - # Install vim and neovim plugin - mkdir -p $out/share/vim-plugins - mv $out/share/doc/task/scripts/vim $out/share/vim-plugins/task - mkdir -p $out/share/nvim - ln -s $out/share/vim-plugins/task $out/share/nvim/site - ''; - - meta = with lib; { - description = "Highly flexible command-line tool to manage TODO lists"; - homepage = "https://taskwarrior.org"; - license = licenses.mit; - maintainers = with maintainers; [ marcweber oxalica ]; - mainProgram = "task"; - platforms = platforms.unix; - }; -} diff --git a/pkgs/applications/misc/tdrop/default.nix b/pkgs/applications/misc/tdrop/default.nix index 5f43956d8ae6b..bc9966ab2b769 100644 --- a/pkgs/applications/misc/tdrop/default.nix +++ b/pkgs/applications/misc/tdrop/default.nix @@ -39,6 +39,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/noctuid/tdrop"; license = licenses.bsd2; platforms = platforms.linux; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/misc/tellico/default.nix b/pkgs/applications/misc/tellico/default.nix index b990f0ddb0d23..824f7b1356f92 100644 --- a/pkgs/applications/misc/tellico/default.nix +++ b/pkgs/applications/misc/tellico/default.nix @@ -24,14 +24,14 @@ mkDerivation rec { pname = "tellico"; - version = "3.5.3"; + version = "3.5.5"; src = fetchFromGitLab { domain = "invent.kde.org"; owner = "office"; repo = pname; rev = "v${version}"; - hash = "sha256-hg2sfBEh3jjVwMFmkgu9nXuXARsPqvlxzxX7kjSI/JU="; + hash = "sha256-0I4oDMLYWomAF+wpPeA1NQk4nnhUV1RT6IYKJdOUcas="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/terminal-notifier/default.nix b/pkgs/applications/misc/terminal-notifier/default.nix index 19370fae01333..e2bd8dd2f9c56 100644 --- a/pkgs/applications/misc/terminal-notifier/default.nix +++ b/pkgs/applications/misc/terminal-notifier/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - maintainers = with maintainers; [ ]; + maintainers = [ ]; homepage = "https://github.com/julienXX/terminal-notifier"; license = licenses.mit; platforms = platforms.darwin; diff --git a/pkgs/applications/misc/terminal-parrot/default.nix b/pkgs/applications/misc/terminal-parrot/default.nix index 802588e8ef64a..3d114302031ab 100644 --- a/pkgs/applications/misc/terminal-parrot/default.nix +++ b/pkgs/applications/misc/terminal-parrot/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "terminal-parrot"; - version = "1.1.1"; + version = "1.2.0"; src = fetchFromGitHub { owner = "jmhobbs"; repo = "terminal-parrot"; rev = version; - hash = "sha256-Qhy5nCbuC9MmegXA48LFCDk4Lm1T5MBmcXfeHzTJm6w="; + hash = "sha256-LI67DDcK3M084r9JPx8NcBWthaiBOCEL4lQJhuUJSok="; }; - vendorHash = "sha256-DJEoJjItusN1LTOOX1Ep+frF03yF/QmB/L66gSG0VOE="; + vendorHash = "sha256-EhnmOpT+rx4RVpmqgEQ4qO+Uca1W9uhx4fcExXG9LOI="; doCheck = false; diff --git a/pkgs/applications/misc/terminal-typeracer/default.nix b/pkgs/applications/misc/terminal-typeracer/default.nix index 80ece5bded7a5..ec2cda0c164c9 100644 --- a/pkgs/applications/misc/terminal-typeracer/default.nix +++ b/pkgs/applications/misc/terminal-typeracer/default.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libgit2 openssl sqlite ] ++ lib.optionals stdenv.isDarwin [ libiconv Security ]; + buildInputs = [ libgit2 openssl sqlite ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv Security ]; OPENSSL_NO_VENDOR = 1; LIBGIT2_NO_VENDOR = 1; 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/themechanger/default.nix b/pkgs/applications/misc/themechanger/default.nix index 98f6b6183a339..2f569b4dc90b9 100644 --- a/pkgs/applications/misc/themechanger/default.nix +++ b/pkgs/applications/misc/themechanger/default.nix @@ -15,14 +15,14 @@ python3Packages.buildPythonApplication rec { pname = "themechanger"; - version = "0.11.1"; + version = "0.12.0"; format = "other"; src = fetchFromGitHub { owner = "ALEX11BR"; repo = "ThemeChanger"; rev = "v${version}"; - sha256 = "sha256-zSbh+mqCKquOyQASwVUW6hghmUc37nTuoa8pWCHM/a8="; + hash = "sha256-/quCi2srn9XlhJQKYNkOaZDHTwdciB9SAlF/RML0q+M="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/thokr/default.nix b/pkgs/applications/misc/thokr/default.nix index 94363083ab9e4..a0045ffb51529 100644 --- a/pkgs/applications/misc/thokr/default.nix +++ b/pkgs/applications/misc/thokr/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0aryfx9qlnjdq3iq2d823c82fhkafvibmbz58g48b8ah5x5fv3ir"; }; - cargoSha256 = "sha256-gEpmXyLmw6bX3enA3gNVtXNMlkQl6J/8AwJQSY0RtFw="; + cargoHash = "sha256-gEpmXyLmw6bX3enA3gNVtXNMlkQl6J/8AwJQSY0RtFw="; meta = with lib; { description = "Typing tui with visualized results and historical logging"; diff --git a/pkgs/applications/misc/tickrs/default.nix b/pkgs/applications/misc/tickrs/default.nix index 29587be9bcde2..4e789f2f8ec7a 100644 --- a/pkgs/applications/misc/tickrs/default.nix +++ b/pkgs/applications/misc/tickrs/default.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl zlib - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; @@ -41,7 +41,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/tarkah/tickrs"; changelog = "https://github.com/tarkah/tickrs/blob/v${version}/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ mredaelli ]; + maintainers = with maintainers; [ ]; mainProgram = "tickrs"; }; } diff --git a/pkgs/applications/misc/timewarrior/default.nix b/pkgs/applications/misc/timewarrior/default.nix index beaf36465efeb..f0cca927f753d 100644 --- a/pkgs/applications/misc/timewarrior/default.nix +++ b/pkgs/applications/misc/timewarrior/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "GothenburgBitFactory"; repo = "timewarrior"; rev = "v${version}"; - sha256 = "sha256-sc4AfdXLuA9evoGU6Z97+Hq7zj9nx093+nPALRkhziQ="; + hash = "sha256-sc4AfdXLuA9evoGU6Z97+Hq7zj9nx093+nPALRkhziQ="; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/tipp10/default.nix b/pkgs/applications/misc/tipp10/default.nix index dd3c2ab4fe1a1..09a38a501e5e2 100644 --- a/pkgs/applications/misc/tipp10/default.nix +++ b/pkgs/applications/misc/tipp10/default.nix @@ -9,18 +9,18 @@ stdenv.mkDerivation rec { owner = "tipp10"; repo = "tipp10"; rev = "v${version}"; - sha256 = "sha256-e0sWH4pT7ej9XGK/Sg9XMX2bMqcXqtSaYI7KBZTXvp4="; + hash = "sha256-e0sWH4pT7ej9XGK/Sg9XMX2bMqcXqtSaYI7KBZTXvp4="; }; nativeBuildInputs = [ cmake qttools wrapQtAppsHook ]; buildInputs = [ qtmultimedia ]; - meta = with lib; { + meta = { description = "Learn and train typing with the ten-finger system"; mainProgram = "tipp10"; homepage = "https://gitlab.com/tipp10/tipp10"; - license = licenses.gpl2Only; - maintainers = with maintainers; [ sigmanificient ]; - platforms = platforms.all; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ sigmanificient ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/applications/misc/tofi/default.nix b/pkgs/applications/misc/tofi/default.nix index 076a5af3cf1c8..c501c7acb5737 100644 --- a/pkgs/applications/misc/tofi/default.nix +++ b/pkgs/applications/misc/tofi/default.nix @@ -28,7 +28,12 @@ stdenv.mkDerivation rec { depsBuildBuild = [ pkg-config ]; nativeBuildInputs = [ - meson ninja pkg-config scdoc wayland-protocols wayland-scanner + meson + ninja + pkg-config + scdoc + wayland-protocols + wayland-scanner ]; buildInputs = [ freetype harfbuzz cairo pango wayland libxkbcommon ]; diff --git a/pkgs/applications/misc/toipe/default.nix b/pkgs/applications/misc/toipe/default.nix index 31a468b3bc495..32e8825239f2a 100644 --- a/pkgs/applications/misc/toipe/default.nix +++ b/pkgs/applications/misc/toipe/default.nix @@ -6,7 +6,7 @@ rustPlatform.buildRustPackage rec { src = fetchCrate { inherit pname version; - sha256 = "sha256-L4JemOxpynGYsA8FgHnMv/hrogLSRaaiIzDjxzZDqjM="; + hash = "sha256-L4JemOxpynGYsA8FgHnMv/hrogLSRaaiIzDjxzZDqjM="; }; cargoHash = "sha256-ShJ7dbd3oNo3qZJ5+ut+NfLF9j8kPPZy9yC2zl/s56k="; diff --git a/pkgs/applications/misc/tomato-c/default.nix b/pkgs/applications/misc/tomato-c/default.nix deleted file mode 100644 index 243b21b574efa..0000000000000 --- a/pkgs/applications/misc/tomato-c/default.nix +++ /dev/null @@ -1,82 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, fetchpatch -, libnotify -, makeWrapper -, mpv -, ncurses -, pkg-config -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "tomato-c"; - version = "unstable-2023-08-21"; - - src = fetchFromGitHub { - owner = "gabrielzschmitz"; - repo = "Tomato.C"; - rev = "6e43e85aa15f3d96811311a3950eba8ce9715634"; - hash = "sha256-RpKkQ7xhM2XqfZdXra0ju0cTBL3Al9NMVQ/oleFydDs="; - }; - - patches = [ - # Adds missing function declarations required by newer versions of clang. - (fetchpatch { - url = "https://github.com/gabrielzschmitz/Tomato.C/commit/ad6d4c385ae39d655a716850653cd92431c1f31e.patch"; - hash = "sha256-3ormv59Ce4rOmeyL30QET3CCUIOrRYMquub+eIQsMW8="; - }) - ]; - - postPatch = '' - substituteInPlace Makefile \ - --replace-fail "sudo " "" - # Need to define _ISOC99_SOURCE to use `snprintf` on Darwin - substituteInPlace config.mk \ - --replace-fail -D_POSIX_C_SOURCE -D_ISOC99_SOURCE - substituteInPlace notify.c \ - --replace-fail "/usr/local" "${placeholder "out"}" - substituteInPlace util.c \ - --replace-fail "/usr/local" "${placeholder "out"}" - substituteInPlace tomato.desktop \ - --replace-fail "/usr/local" "${placeholder "out"}" - ''; - - nativeBuildInputs = [ - makeWrapper - pkg-config - ]; - - buildInputs = [ - libnotify - mpv - ncurses - ]; - - makeFlags = [ - "PREFIX=${placeholder "out"}" - ]; - - installFlags = [ - "CPPFLAGS=$NIX_CFLAGS_COMPILE" - "LDFLAGS=$NIX_LDFLAGS" - ]; - - postFixup = '' - for file in $out/bin/*; do - wrapProgram $file \ - --prefix PATH : ${lib.makeBinPath [ libnotify mpv ]} - done - ''; - - strictDeps = true; - - meta = { - homepage = "https://github.com/gabrielzschmitz/Tomato.C"; - description = " A pomodoro timer written in pure C"; - license = with lib.licenses; [ gpl3Plus ]; - maintainers = with lib.maintainers; [ AndersonTorres ]; - mainProgram = "tomato"; - platforms = lib.platforms.unix; - }; -}) diff --git a/pkgs/applications/misc/topydo/default.nix b/pkgs/applications/misc/topydo/default.nix index 39a3c7013b0a1..92411687ac9c8 100644 --- a/pkgs/applications/misc/topydo/default.nix +++ b/pkgs/applications/misc/topydo/default.nix @@ -48,6 +48,6 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://github.com/topydo/topydo"; changelog = "https://github.com/topydo/topydo/blob/${src.rev}/CHANGES.md"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/misc/tpmmanager/default.nix b/pkgs/applications/misc/tpmmanager/default.nix index 90d1cc01ffb46..763cd75ffdbfa 100644 --- a/pkgs/applications/misc/tpmmanager/default.nix +++ b/pkgs/applications/misc/tpmmanager/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { description = "Tool for managing the TPM"; mainProgram = "tpmmanager"; license = lib.licenses.gpl2; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; platforms = with lib.platforms; linux; }; } diff --git a/pkgs/applications/misc/transifex-cli/default.nix b/pkgs/applications/misc/transifex-cli/default.nix index 1be49361f5b5d..da06ce3929184 100644 --- a/pkgs/applications/misc/transifex-cli/default.nix +++ b/pkgs/applications/misc/transifex-cli/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "transifex-cli"; - version = "1.6.14"; + version = "1.6.17"; src = fetchFromGitHub { owner = "transifex"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-yKkRoeq0hPYMjZcoL9h3l8FimnCjjVSlk9whliEnkzE="; + sha256 = "sha256-jzAt/SalItGG0KI3GZb4/pT4T7oHwCji2bjNR1BTJXI="; }; - vendorHash = "sha256-rcimaHr3fFeHSjZXw1w23cKISCT+9t8SgtPnY/uYGAU="; + vendorHash = "sha256-3gi2ysIb5256CdmtX38oIfeDwNCQojK+YB9aEm8H01Q="; ldflags = [ "-s" "-w" "-X 'github.com/transifex/cli/internal/txlib.Version=${version}'" diff --git a/pkgs/applications/misc/translatelocally/default.nix b/pkgs/applications/misc/translatelocally/default.nix index c4fd6378ccefe..d99579a5f2a6d 100644 --- a/pkgs/applications/misc/translatelocally/default.nix +++ b/pkgs/applications/misc/translatelocally/default.nix @@ -4,17 +4,17 @@ }: let - rev = "a210037760ca3ca9016ca1831c97531318df70fe"; + rev = "27771d884d3607cf6331da16b15e27aba819573d"; in stdenv.mkDerivation (finalAttrs: { pname = "translatelocally"; - version = "unstable-2023-09-20"; + version = "0-unstable-2024-05-12"; src = fetchFromGitHub { owner = "XapaJIaMnu"; repo = "translateLocally"; inherit rev; - hash = "sha256-T7cZdR09yDrPTwYxvDIaKTdV4mrB+gTHYVfch5BQ+PE="; + hash = "sha256-oPtiyONqkZ5xOIhDezk8mkmi9O8gNYwHo0gcqSa89qI="; fetchSubmodules = true; }; @@ -28,7 +28,7 @@ in stdenv.mkDerivation (finalAttrs: { ''; # https://github.com/XapaJIaMnu/translateLocally/blob/81ed8b9/.github/workflows/build.yml#L330 - postConfigure = lib.optionalString stdenv.isAarch64 '' + postConfigure = lib.optionalString stdenv.hostPlatform.isAarch64 '' bash ../cmake/fix_ruy_build.sh .. . ''; @@ -42,6 +42,7 @@ in stdenv.mkDerivation (finalAttrs: { qt6.qttools qt6.qtbase qt6.qtsvg + qt6.qtwayland libarchive pcre2 protobuf diff --git a/pkgs/applications/misc/ttdl/default.nix b/pkgs/applications/misc/ttdl/default.nix index e1e1ccd1cd59a..3999489625cf1 100644 --- a/pkgs/applications/misc/ttdl/default.nix +++ b/pkgs/applications/misc/ttdl/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "ttdl"; - version = "4.3.0"; + version = "4.4.1"; src = fetchFromGitHub { owner = "VladimirMarkelov"; repo = "ttdl"; rev = "v${version}"; - sha256 = "sha256-5v3Eu85x3xNvTRgfxhlDz4hiJ4UO010pZPY7UPHk7mQ="; + sha256 = "sha256-pcZ/8eM8JN+DKJKdVKJEl775QUXC4CFeMAaiBN0j+zo="; }; - cargoHash = "sha256-+jYl/oUeJaABgDX/OBTyeo/B7RYc2MUTreU1ySLG0XQ="; + cargoHash = "sha256-+caVo53gf7ZUMr0w/yoXfBaZ5MPe73s7vwoOdZVUcNY="; meta = with lib; { description = "CLI tool to manage todo lists in todo.txt format"; diff --git a/pkgs/applications/misc/tthsum/default.nix b/pkgs/applications/misc/tthsum/default.nix index 603ddeca4fd7a..e2b9d2e570414 100644 --- a/pkgs/applications/misc/tthsum/default.nix +++ b/pkgs/applications/misc/tthsum/default.nix @@ -15,10 +15,10 @@ stdenv.mkDerivation rec { cp obj-unix/tthsum $out/bin ''; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Md5sum-alike program that works with Tiger/THEX hashes"; longDescription = '' tthsum generates or checks TTH checksums (root of the THEX hash diff --git a/pkgs/applications/misc/tty-solitaire/default.nix b/pkgs/applications/misc/tty-solitaire/default.nix deleted file mode 100644 index 137e5653d74f9..0000000000000 --- a/pkgs/applications/misc/tty-solitaire/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, ncurses }: - -stdenv.mkDerivation rec { - pname = "tty-solitaire"; - version = "1.3.1"; - - src = fetchFromGitHub { - owner = "mpereira"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-zMLNWJieHxHALFQoSkdAxGbUBGuZnznLX86lI3P21F0="; - }; - - patches = [ - # Patch pending upstream inclusion to support ncurses-6.3: - # https://github.com/mpereira/tty-solitaire/pull/61 - (fetchpatch { - name = "ncurses-6.3.patch"; - url = "https://github.com/mpereira/tty-solitaire/commit/4d066c564d086ce272b78cb8f80717a7fb83c261.patch"; - sha256 = "sha256-E1XVG0be6JH3K1y7UPap93s8xk8Nk0dKLdKHcJ7mA8E="; - }) - ]; - - postPatch = '' - sed -i -e '/^CFLAGS *?= *-g *$/d' Makefile - ''; - - buildInputs = [ ncurses ]; - - makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" "PREFIX=${placeholder "out"}" ]; - - meta = with lib; { - description = "Klondike Solitaire in your ncurses terminal"; - license = licenses.mit; - homepage = "https://github.com/mpereira/tty-solitaire"; - platforms = ncurses.meta.platforms; - maintainers = [ maintainers.AndersonTorres ]; - mainProgram = "ttysolitaire"; - }; -} diff --git a/pkgs/applications/misc/ttyper/default.nix b/pkgs/applications/misc/ttyper/default.nix index 180b09771ce3e..aec5b9f083004 100644 --- a/pkgs/applications/misc/ttyper/default.nix +++ b/pkgs/applications/misc/ttyper/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "ttyper"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "max-niederman"; repo = pname; rev = "v${version}"; - hash = "sha256-L6xdJ659ZWKNg9CGQs+5TQIKoIAZ5KHdFSk7NCp9a2Q="; + hash = "sha256-g4OD4Mc3KHN9rrzM+9JvN2xTnSojGQy6yptdGj3zgW4="; }; - cargoHash = "sha256-iOeyn4oXk6y/NqZeBwkStBjt3hVVw4s2L5Lm58tq1BY="; + cargoHash = "sha256-EXBs73651lP2B/1lAGHLcc9F1Xi+Bj6+c9wv2uX56Lg="; meta = with lib; { description = "Terminal-based typing test"; diff --git a/pkgs/applications/misc/tuba/default.nix b/pkgs/applications/misc/tuba/default.nix index a3033bcd07dbb..9eeac726a83fc 100644 --- a/pkgs/applications/misc/tuba/default.nix +++ b/pkgs/applications/misc/tuba/default.nix @@ -13,14 +13,17 @@ , json-glib , glib , glib-networking +, gnome , gobject-introspection , gtksourceview5 , libxml2 , libgee +, librsvg , libsoup_3 , libsecret , libwebp , libspelling +, webp-pixbuf-loader , icu , gst_all_1 , clapper @@ -32,13 +35,13 @@ stdenv.mkDerivation rec { pname = "tuba"; - version = "0.8.1"; + version = "0.8.4"; src = fetchFromGitHub { owner = "GeopJr"; repo = "Tuba"; rev = "v${version}"; - hash = "sha256-dN915sPBttnrcOuhUJjEtdojOQi9VRLmc+t1RvWmx64="; + hash = "sha256-PRzLTlq8XfI5dYZhJ8YBtYi4H3883S2olp9jrn1Q5CQ="; }; nativeBuildInputs = [ @@ -86,12 +89,23 @@ stdenv.mkDerivation rec { updateScript = nix-update-script { }; }; + # Pull in WebP support for avatars from Misskey instances. + # In postInstall to run before gappsWrapperArgsHook. + postInstall = '' + export GDK_PIXBUF_MODULE_FILE="${gnome._gdkPixbufCacheBuilder_DO_NOT_USE { + extraLoaders = [ + librsvg + webp-pixbuf-loader + ]; + }}" + ''; + meta = { description = "Browse the Fediverse"; homepage = "https://tuba.geopjr.dev/"; mainProgram = "dev.geopjr.Tuba"; license = lib.licenses.gpl3Only; changelog = "https://github.com/GeopJr/Tuba/releases/tag/v${version}"; - maintainers = with lib.maintainers; [ chuangzhu aleksana ]; + maintainers = with lib.maintainers; [ chuangzhu aleksana donovanglover ]; }; } diff --git a/pkgs/applications/misc/tuckr/default.nix b/pkgs/applications/misc/tuckr/default.nix index d660248deef88..952f79a393252 100644 --- a/pkgs/applications/misc/tuckr/default.nix +++ b/pkgs/applications/misc/tuckr/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "tuckr"; - version = "0.8.1"; + version = "0.9.1"; src = fetchFromGitHub { owner = "RaphGL"; repo = "Tuckr"; rev = version; - hash = "sha256-oQSuR0Zt1T8YU3O2Dq/qHl4ysVDl+3EVvp9r2mD3hRA="; + hash = "sha256-5KDBtbovs3tPuLNJqHyMM9mGV8cNgJFv3QqAtLVOhns="; }; - cargoHash = "sha256-ESDfUZsoqwBurXuwNIRSqxoDWnA2VpDZ9Q9GGaV8B4Y="; + cargoHash = "sha256-LvvC60CNl/y1rx4UTKVLFeiaJBNpou5JrCdsmZvTccU="; doCheck = false; # test result: FAILED. 5 passed; 3 failed; diff --git a/pkgs/applications/misc/tui-journal/default.nix b/pkgs/applications/misc/tui-journal/default.nix index 4af9f8e2559a2..a4305dbd1769a 100644 --- a/pkgs/applications/misc/tui-journal/default.nix +++ b/pkgs/applications/misc/tui-journal/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "tui-journal"; - version = "0.9.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "AmmarAbouZor"; repo = "tui-journal"; rev = "v${version}"; - hash = "sha256-FAN0F54cCEfqoSr1La+X+et5MGTzB2Wb466Xr8eyeiI="; + hash = "sha256-2tl2jL/ikBAziwjgpP4JIDnAvpFGjm/U0etz+SC8xHk="; }; - cargoHash = "sha256-y6gAv4Xf0yxpbOAdYhp3nDBH8skiyAI10+Ylz/uxf7w="; + cargoHash = "sha256-rZVIlKK9TdIUabzmuRAzAnybz8mgDpto0nkImb8Mx8A="; nativeBuildInputs = [ pkg-config @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { libgit2 openssl zlib - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/applications/misc/tuir/default.nix b/pkgs/applications/misc/tuir/default.nix index a1c4f60c4e65a..3cc36bf8ae3c7 100644 --- a/pkgs/applications/misc/tuir/default.nix +++ b/pkgs/applications/misc/tuir/default.nix @@ -3,13 +3,13 @@ with python3Packages; buildPythonApplication rec { pname = "tuir"; - version = "1.29.0"; + version = "1.31.0"; src = fetchFromGitLab { - owner = "ajak"; + owner = "Chocimier"; repo = pname; rev = "v${version}"; - sha256 = "1fqp6bvq8kzdsf3nna4mn1phdcixpx76bya43xrivxjbzsfl59ib"; + hash = "sha256-VYBtD3Ex6+iIRNvX6jF0b0iPvno41/58xCRydiyssvk="; }; # Tests try to access network @@ -21,13 +21,13 @@ buildPythonApplication rec { nativeCheckInputs = [ coverage coveralls docopt mock pylint pytest vcrpy ]; - propagatedBuildInputs = [ beautifulsoup4 decorator kitchen requests six ]; + propagatedBuildInputs = [ beautifulsoup4 decorator kitchen mailcap-fix requests six ]; meta = with lib; { description = "Browse Reddit from your Terminal (fork of rtv)"; mainProgram = "tuir"; - homepage = "https://gitlab.com/ajak/tuir/"; + homepage = "https://gitlab.com/Chocimier/tuir"; license = licenses.mit; - maintainers = with maintainers; [ Br1ght0ne matthiasbeyer ]; + maintainers = with maintainers; [ Br1ght0ne matthiasbeyer brokenpip3 ]; }; } diff --git a/pkgs/applications/misc/tumpa/default.nix b/pkgs/applications/misc/tumpa/default.nix deleted file mode 100644 index cc73b7fa6901e..0000000000000 --- a/pkgs/applications/misc/tumpa/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ lib -, python3 -, fetchFromGitHub -, wrapQtAppsHook -}: - -python3.pkgs.buildPythonApplication rec { - pname = "tumpa"; - version = "0.1.2"; - - src = fetchFromGitHub { - owner = "kushaldas"; - repo = "tumpa"; - rev = "v${version}"; - hash = "sha256-sT+IasupBxkfYoOULRvG429ZHA94uAJoYfFd1Whs0J4="; - }; - - propagatedBuildInputs = with python3.pkgs; [ - setuptools - johnnycanencrypt - pyside2 - ]; - - nativeBuildInputs = [ - wrapQtAppsHook - ]; - - dontWrapQtApps = true; - preFixup = '' - makeWrapperArgs+=("''${qtWrapperArgs[@]}") - ''; - - doCheck = false; - - meta = with lib; { - description = "OpenPGP key creation and smartcard access"; - homepage = "https://github.com/kushaldas/tumpa"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ _0x4A6F ]; - broken = true; - }; -} diff --git a/pkgs/applications/misc/tuxclocker/default.nix b/pkgs/applications/misc/tuxclocker/default.nix index 7a47e571cee05..8f1cdde3d703f 100644 --- a/pkgs/applications/misc/tuxclocker/default.nix +++ b/pkgs/applications/misc/tuxclocker/default.nix @@ -27,10 +27,6 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-QLKLqTCpVMWxlDINa8Bo1vgCDcjwovoaXUs/PdMnxv0="; }; - # Meson doesn't find boost without these - BOOST_INCLUDEDIR = "${lib.getDev boost}/include"; - BOOST_LIBRARYDIR = "${lib.getLib boost}/lib"; - nativeBuildInputs = [ git makeWrapper diff --git a/pkgs/applications/misc/twitch-chat-downloader/default.nix b/pkgs/applications/misc/twitch-chat-downloader/default.nix index 922c925cbb0c3..ffe1ddc9c220a 100644 --- a/pkgs/applications/misc/twitch-chat-downloader/default.nix +++ b/pkgs/applications/misc/twitch-chat-downloader/default.nix @@ -20,6 +20,13 @@ buildPythonApplication rec { hash = "sha256-mV60ygrtQa9ZkJ2CImhAV59ckCJ7vJSA9cWkYE2xo1M="; }; + postPatch = '' + # Update client ID for Twitch changes + # See: <https://github.com/TheDrHax/Twitch-Chat-Downloader/pull/16> + substituteInPlace tcd/example.settings.json \ + --replace-fail jzkbprff40iqj646a697cyrvl0zt2m6 kd1unb4b3q4t58fwlpcbzcbnm76a8fp + ''; + propagatedBuildInputs = [ iso8601 progressbar2 diff --git a/pkgs/applications/misc/typioca/default.nix b/pkgs/applications/misc/typioca/default.nix index cb7f92d08f36e..dcd93636706f8 100644 --- a/pkgs/applications/misc/typioca/default.nix +++ b/pkgs/applications/misc/typioca/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "typioca"; - version = "2.11.2"; + version = "3.0.0"; src = fetchFromGitHub { owner = "bloznelis"; repo = "typioca"; rev = version; - hash = "sha256-LpQHdqvqAj3gqyvsD58Jhu4GkeJ/R7EjKo7YG7/mmJk="; + hash = "sha256-pYHEi1J8i8AeRM62TNrklivcmiv4Kq0a5Z7Fn1RB/Jk="; }; - vendorHash = "sha256-lpeceY6ErcxCGKrwVuW19ofsXyfXsJgKGThWKswRTis="; + vendorHash = "sha256-4T5xbCvzYn1bOKz0WCCiFojoQztOQ66SH4+WDI3Sn5g="; ldflags = [ "-s" diff --git a/pkgs/applications/misc/tzupdate/default.nix b/pkgs/applications/misc/tzupdate/default.nix index c991a71e9c0ae..adfb93fb0246d 100644 --- a/pkgs/applications/misc/tzupdate/default.nix +++ b/pkgs/applications/misc/tzupdate/default.nix @@ -11,18 +11,21 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "cdown"; repo = "tzupdate"; - rev = version; + rev = "refs/tags/${version}"; hash = "sha256-eod4yFzX7pATNQmG7jU+r9mnC9nprJ55ufMXpKjw/YI="; }; cargoHash = "sha256-5+lp5xlwJxFDqzVxptJPX7z0iLoMkgdwHxvRVIXHF7Y="; - meta = with lib; { + meta = { description = "Set the system timezone based on IP geolocation"; homepage = "https://github.com/cdown/tzupdate"; - license = licenses.mit; - maintainers = with maintainers; [ camillemndn ]; - platforms = platforms.linux; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + camillemndn + doronbehar + ]; + platforms = lib.platforms.linux; mainProgram = "tzupdate"; }; } diff --git a/pkgs/applications/misc/ubpm/default.nix b/pkgs/applications/misc/ubpm/default.nix index f2c0a9aa02e88..883850f10b133 100644 --- a/pkgs/applications/misc/ubpm/default.nix +++ b/pkgs/applications/misc/ubpm/default.nix @@ -43,6 +43,6 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "ubpm"; license = licenses.gpl3Only; maintainers = with maintainers; [ kurnevsky ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; }) diff --git a/pkgs/applications/misc/udevil/default.nix b/pkgs/applications/misc/udevil/default.nix deleted file mode 100644 index 9c50b189cc150..0000000000000 --- a/pkgs/applications/misc/udevil/default.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, acl -, glib -, intltool -, pkg-config -, udev -, util-linux -}: - -stdenv.mkDerivation rec { - pname = "udevil"; - version = "0.4.4"; - - src = fetchFromGitHub { - owner = "IgnorantGuru"; - repo = "udevil"; - rev = version; - sha256 = "0nd44r8rbxifx4x4m24z5aji1c6k1fhw8cmf5s43wd5qys0bcdad"; - }; - - nativeBuildInputs = [ pkg-config intltool ]; - - buildInputs = [ - glib - udev - ]; - - preConfigure = '' - substituteInPlace src/Makefile.in --replace "-o root -g root" "" - # do not set setuid bit in nix store - substituteInPlace src/Makefile.in --replace 4755 0755 - ''; - - configureFlags = [ - "--with-mount-prog=${util-linux}/bin/mount" - "--with-umount-prog=${util-linux}/bin/umount" - "--with-losetup-prog=${util-linux}/bin/losetup" - "--with-setfacl-prog=${acl.bin}/bin/setfacl" - "--sysconfdir=${placeholder "out"}/etc" - ]; - - postInstall = '' - substituteInPlace $out/lib/systemd/system/devmon@.service \ - --replace /usr/bin/devmon "$out/bin/devmon" - ''; - - patches = [ - # sys/stat.h header missing on src/device-info.h - ./device-info-sys-stat.patch - ]; - - meta = with lib; { - homepage = "https://ignorantguru.github.io/udevil/"; - description = "Mount without password"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/misc/udevil/device-info-sys-stat.patch b/pkgs/applications/misc/udevil/device-info-sys-stat.patch deleted file mode 100644 index 554682108e39a..0000000000000 --- a/pkgs/applications/misc/udevil/device-info-sys-stat.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/src/device-info.h b/src/device-info.h -index 6cb3683..ddac24c 100644 ---- a/src/device-info.h -+++ b/src/device-info.h -@@ -18,7 +18,8 @@ - // intltool - #include <glib/gi18n.h> - -- -+// stat -+#include <sys/stat.h> - - typedef struct device_t { - struct udev_device *udevice; diff --git a/pkgs/applications/misc/udict/default.nix b/pkgs/applications/misc/udict/default.nix index 62d698cc3a360..42f2585ec439b 100644 --- a/pkgs/applications/misc/udict/default.nix +++ b/pkgs/applications/misc/udict/default.nix @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation darwin.apple_sdk.frameworks.Security ]; @@ -39,7 +39,7 @@ rustPlatform.buildRustPackage rec { description = "Urban Dictionary CLI - written in Rust"; homepage = "https://github.com/lsmb/udict"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; mainProgram = "udict"; }; } diff --git a/pkgs/applications/misc/udiskie/default.nix b/pkgs/applications/misc/udiskie/default.nix deleted file mode 100644 index 7df3f1d23b9cc..0000000000000 --- a/pkgs/applications/misc/udiskie/default.nix +++ /dev/null @@ -1,108 +0,0 @@ -{ lib -, asciidoc -, fetchFromGitHub -, gobject-introspection -, gtk3 -, installShellFiles -, libappindicator-gtk3 -, libnotify -, librsvg -, python3 -, udisks2 -, wrapGAppsHook3 -, testers -, udiskie -}: - -python3.pkgs.buildPythonApplication rec { - pname = "udiskie"; - version = "2.5.2"; - - pyproject = true; - - src = fetchFromGitHub { - owner = "coldfix"; - repo = "udiskie"; - rev = "v${version}"; - hash = "sha256-r9ppuWYY3e2thsfFh4ooOgfqNvmCVw7fS0SpJCJcysQ="; - }; - - patches = [ - ./locale-path.patch - ]; - - postPatch = '' - substituteInPlace udiskie/locale.py --subst-var out - ''; - - nativeBuildInputs = [ - asciidoc # Man page - gobject-introspection - installShellFiles - python3.pkgs.setuptools - wrapGAppsHook3 - ]; - - dontWrapGApps = true; - - buildInputs = [ - gtk3 - libappindicator-gtk3 - libnotify - librsvg # SVG icons - udisks2 - ]; - - propagatedBuildInputs = with python3.pkgs; [ - docopt - keyutils - pygobject3 - pyyaml - ]; - - postBuild = '' - make -C doc - ''; - - postInstall = '' - installManPage doc/udiskie.8 - - installShellCompletion \ - --bash completions/bash/* \ - --zsh completions/zsh/* - ''; - - preFixup = '' - makeWrapperArgs+=("''${gappsWrapperArgs[@]}") - ''; - - nativeCheckInputs = with python3.pkgs; [ - pytestCheckHook - ]; - - passthru.tests.version = testers.testVersion { - package = udiskie; - }; - - meta = with lib; { - homepage = "https://github.com/coldfix/udiskie"; - changelog = "https://github.com/coldfix/udiskie/blob/${src.rev}/CHANGES.rst"; - description = "Removable disk automounter for udisks"; - longDescription = '' - udiskie is a udisks2 front-end that allows to manage removeable media such - as CDs or flash drives from userspace. - - Its features include: - - automount removable media - - notifications - - tray icon - - command line tools for manual un-/mounting - - LUKS encrypted devices - - unlocking with keyfiles (requires udisks 2.6.4) - - loop devices (mounting iso archives) - - password caching (requires python keyutils 0.3) - ''; - license = licenses.mit; - maintainers = with maintainers; [ AndersonTorres dotlambda ]; - }; -} diff --git a/pkgs/applications/misc/udiskie/locale-path.patch b/pkgs/applications/misc/udiskie/locale-path.patch deleted file mode 100644 index f454bee467dba..0000000000000 --- a/pkgs/applications/misc/udiskie/locale-path.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/udiskie/locale.py b/udiskie/locale.py -index f12bea9..450e38b 100644 ---- a/udiskie/locale.py -+++ b/udiskie/locale.py -@@ -10,10 +10,8 @@ from gettext import translation - testdirs = [ - # manual override: - os.environ.get('TEXTDOMAINDIR'), -- # editable installation: -- os.path.join(os.path.dirname(__file__), '../build/locale'), -- # user or virtualenv installation: -- os.path.join(sys.prefix, 'share/locale'), -+ # Nix installation: -+ os.path.join('@out@', 'share/locale'), - ] - testfile = 'en_US/LC_MESSAGES/udiskie.mo' - localedir = next( diff --git a/pkgs/applications/misc/ulauncher/default.nix b/pkgs/applications/misc/ulauncher/default.nix index 92d93b5095d13..cf3a6a46f9dec 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 @@ -121,6 +121,7 @@ python3Packages.buildPythonApplication rec { homepage = "https://ulauncher.io/"; license = licenses.gpl3; platforms = platforms.linux; + mainProgram = "ulauncher"; maintainers = with maintainers; [ aaronjanse sebtm ]; }; } diff --git a/pkgs/applications/misc/uni/default.nix b/pkgs/applications/misc/uni/default.nix index 5773c13ae68e8..04ffa390d4b39 100644 --- a/pkgs/applications/misc/uni/default.nix +++ b/pkgs/applications/misc/uni/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "uni"; - version = "2.7.0"; + version = "2.8.0"; src = fetchFromGitHub { owner = "arp242"; repo = "uni"; rev = "refs/tags/v${version}"; - hash = "sha256-ociPkuRtpBS+x1zSVNYk8oqAsJZGv31/TUUUlBOYhJA="; + hash = "sha256-LSmQtndWBc7wCYBnyaeDb4Le4PQPcSO8lTp+CSC2jbc="; }; - vendorHash = "sha256-/PvBn2RRYuVpjnrIL1xAcVqAKZuIV2KTSyVtBW1kqj4="; + vendorHash = "sha256-4w5L5Zg0LJX2v4mqLLjAvEdh3Ad69MLa97SR6RY3fT4="; ldflags = [ "-s" diff --git a/pkgs/applications/misc/urlscan/default.nix b/pkgs/applications/misc/urlscan/default.nix index 2247344ba765a..d0e9e90db89f5 100644 --- a/pkgs/applications/misc/urlscan/default.nix +++ b/pkgs/applications/misc/urlscan/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "urlscan"; - version = "1.0.2"; + version = "1.0.3"; format = "pyproject"; src = fetchFromGitHub { owner = "firecat53"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-nyq4BrpfbZwK/nOnB8ZEN1wlM8CssYVRvV7ytpX7k40="; + hash = "sha256-aAfsGsgCZwWcFkYaJsKjRroAZjW7b/vnX1oL/Mg0kgY="; }; nativeBuildInputs = with python3.pkgs; [ diff --git a/pkgs/applications/misc/usb-reset/default.nix b/pkgs/applications/misc/usb-reset/default.nix index 0e924ba5ee671..a5bb2061ed502 100644 --- a/pkgs/applications/misc/usb-reset/default.nix +++ b/pkgs/applications/misc/usb-reset/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Perform a bus reset on a USB device using its vendor and product ID"; homepage = "https://github.com/ralight/usb-reset"; changelog = "https://github.com/ralight/usb-reset/blob/master/ChangeLog.txt"; diff --git a/pkgs/applications/misc/valent/default.nix b/pkgs/applications/misc/valent/default.nix index 1071f39d43d20..224e105e51e7f 100644 --- a/pkgs/applications/misc/valent/default.nix +++ b/pkgs/applications/misc/valent/default.nix @@ -15,20 +15,21 @@ , libadwaita , libpeas2 , libportal-gtk4 +, pipewire , pulseaudio , sqlite }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "valent"; - version = "0-unstable-2024-02-12"; + version = "1.0.0.alpha.45"; src = fetchFromGitHub { owner = "andyholmes"; repo = "valent"; - rev = "70ef1aa42eb2df5e9c3aa4faa014c8d539450018"; + rev = "v${finalAttrs.version}"; + hash = "sha256-hOVWvk4U6VoWAvXNHK1vTm/am69EFqDmSb0NofWVQj8="; fetchSubmodules = true; - hash = "sha256-JdrkAtn21NoX+SI6PNWMdE8HLKhLc3HKFhwKydENkvg="; }; nativeBuildInputs = [ @@ -50,6 +51,7 @@ stdenv.mkDerivation rec { libadwaita libpeas2 libportal-gtk4 + pipewire pulseaudio sqlite ]; @@ -81,9 +83,9 @@ stdenv.mkDerivation rec { ``` ''; homepage = "https://valent.andyholmes.ca"; - changelog = "https://github.com/andyholmes/valent/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/andyholmes/valent/blob/${finalAttrs.src.rev}/CHANGELOG.md"; license = with lib.licenses; [ gpl3Plus cc0 cc-by-sa-30 ]; maintainers = with lib.maintainers; [ aleksana ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/applications/misc/valentina/default.nix b/pkgs/applications/misc/valentina/default.nix index 525a3a5399df1..18109f96917ec 100644 --- a/pkgs/applications/misc/valentina/default.nix +++ b/pkgs/applications/misc/valentina/default.nix @@ -45,6 +45,6 @@ stdenv.mkDerivation rec { changelog = "https://gitlab.com/smart-pattern/valentina/-/blob/v${version}/ChangeLog.txt"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/misc/variety/default.nix b/pkgs/applications/misc/variety/default.nix deleted file mode 100644 index 3a4d6ac760856..0000000000000 --- a/pkgs/applications/misc/variety/default.nix +++ /dev/null @@ -1,101 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, gexiv2 -, gobject-introspection -, gtk3 -, hicolor-icon-theme -, intltool -, libnotify -, librsvg -, python3 -, runtimeShell -, wrapGAppsHook3 -, fehSupport ? false -, feh -, imagemagickSupport ? true -, imagemagick -, appindicatorSupport ? true -, libayatana-appindicator -}: - -python3.pkgs.buildPythonApplication rec { - pname = "variety"; - version = "0.8.12"; - - src = fetchFromGitHub { - owner = "varietywalls"; - repo = "variety"; - rev = "refs/tags/${version}"; - hash = "sha256-FjnhV7vzRPVDCgUNK8CHo3arKXuwe+3xH/5AxCVgeIY="; - }; - - nativeBuildInputs = [ - intltool - wrapGAppsHook3 - gobject-introspection - ]; - - buildInputs = [ - gexiv2 - gtk3 - hicolor-icon-theme - libnotify - librsvg - ] - ++ lib.optional appindicatorSupport libayatana-appindicator; - - propagatedBuildInputs = with python3.pkgs; [ - beautifulsoup4 - configobj - dbus-python - distutils-extra - httplib2 - lxml - pillow - pycairo - pygobject3 - requests - setuptools - ] - ++ lib.optional fehSupport feh - ++ lib.optional imagemagickSupport imagemagick; - - doCheck = false; - - # Prevent double wrapping, let the Python wrapper use the args in preFixup. - dontWrapGApps = true; - - preFixup = '' - makeWrapperArgs+=("''${gappsWrapperArgs[@]}") - ''; - - prePatch = '' - substituteInPlace variety_lib/varietyconfig.py \ - --replace "__variety_data_directory__ = \"../data\"" \ - "__variety_data_directory__ = \"$out/share/variety\"" - substituteInPlace variety/VarietyWindow.py \ - --replace '[script,' '["${runtimeShell}", script,' \ - --replace 'check_output(script)' 'check_output(["${runtimeShell}", script])' - ''; - - meta = with lib; { - homepage = "https://github.com/varietywalls/variety"; - description = "Wallpaper manager for Linux systems"; - mainProgram = "variety"; - longDescription = '' - Variety is a wallpaper manager for Linux systems. It supports numerous - desktops and wallpaper sources, including local files and online services: - Flickr, Wallhaven, Unsplash, and more. - - Where supported, Variety sits as a tray icon to allow easy pausing and - resuming. Otherwise, its desktop entry menu provides a similar set of - options. - - Variety also includes a range of image effects, such as oil painting and - blur, as well as options to layer quotes and a clock onto the background. - ''; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ p3psi AndersonTorres zfnmxt ]; - }; -} diff --git a/pkgs/applications/misc/veracrypt/default.nix b/pkgs/applications/misc/veracrypt/default.nix deleted file mode 100644 index a7b0eed9037b0..0000000000000 --- a/pkgs/applications/misc/veracrypt/default.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ lib -, stdenv -, fetchurl -, pkg-config -, makeself -, yasm -, fuse -, wxGTK -, lvm2 -, substituteAll -, e2fsprogs -, exfat -, ntfs3g -, btrfs-progs -, pcsclite -, wrapGAppsHook3 -}: - -stdenv.mkDerivation rec { - pname = "veracrypt"; - version = "1.26.7"; - - src = fetchurl { - url = "https://launchpad.net/${pname}/trunk/${lib.toLower version}/+download/VeraCrypt_${version}_Source.tar.bz2"; - sha256 = "sha256-920nsYJBTg1P2ba1n76iiyXbb6afK7z/ouwmmxqGX2U="; - }; - - patches = [ - (substituteAll { - src = ./fix-paths.patch; - ext2 = "${e2fsprogs}/bin/mkfs.ext2"; - ext3 = "${e2fsprogs}/bin/mkfs.ext3"; - ext4 = "${e2fsprogs}/bin/mkfs.ext4"; - exfat = "${exfat}/bin/mkfs.exfat"; - ntfs = "${ntfs3g}/bin/mkfs.ntfs"; - btrfs = "${btrfs-progs}/bin/mkfs.btrfs"; - }) - ]; - - sourceRoot = "src"; - - nativeBuildInputs = [ makeself pkg-config yasm wrapGAppsHook3 ]; - buildInputs = [ fuse lvm2 wxGTK pcsclite ]; - - enableParallelBuilding = true; - - installPhase = '' - install -Dm 755 Main/${pname} "$out/bin/${pname}" - install -Dm 444 Resources/Icons/VeraCrypt-256x256.xpm "$out/share/pixmaps/${pname}.xpm" - install -Dm 444 License.txt -t "$out/share/doc/${pname}/" - install -d $out/share/applications - substitute Setup/Linux/${pname}.desktop $out/share/applications/${pname}.desktop \ - --replace "Exec=/usr/bin/veracrypt" "Exec=$out/bin/veracrypt" \ - --replace "Icon=veracrypt" "Icon=veracrypt.xpm" - ''; - - meta = with lib; { - description = "Free Open-Source filesystem on-the-fly encryption"; - homepage = "https://www.veracrypt.fr/"; - license = with licenses; [ asl20 /* and */ unfree /* TrueCrypt License version 3.0 */ ]; - maintainers = with maintainers; [ dsferruzza ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/misc/veracrypt/fix-paths.patch b/pkgs/applications/misc/veracrypt/fix-paths.patch deleted file mode 100644 index 56b4fc483804a..0000000000000 --- a/pkgs/applications/misc/veracrypt/fix-paths.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --color --unified --recursive --text a/Core/VolumeCreator.h b/Core/VolumeCreator.h ---- a/Core/VolumeCreator.h 2021-06-20 20:54:50.725210056 +0300 -+++ b/Core/VolumeCreator.h 2021-06-20 20:58:46.117742419 +0300 -@@ -77,12 +77,12 @@ - switch (fsType) - { - #if defined (TC_LINUX) -- case VolumeCreationOptions::FilesystemType::Ext2: return "mkfs.ext2"; -- case VolumeCreationOptions::FilesystemType::Ext3: return "mkfs.ext3"; -- case VolumeCreationOptions::FilesystemType::Ext4: return "mkfs.ext4"; -- case VolumeCreationOptions::FilesystemType::NTFS: return "mkfs.ntfs"; -- case VolumeCreationOptions::FilesystemType::exFAT: return "mkfs.exfat"; -- case VolumeCreationOptions::FilesystemType::Btrfs: return "mkfs.btrfs"; -+ case VolumeCreationOptions::FilesystemType::Ext2: return "@ext2@"; -+ case VolumeCreationOptions::FilesystemType::Ext3: return "@ext3@"; -+ case VolumeCreationOptions::FilesystemType::Ext4: return "@ext4@"; -+ case VolumeCreationOptions::FilesystemType::NTFS: return "@ntfs@"; -+ case VolumeCreationOptions::FilesystemType::exFAT: return "@exfat@"; -+ case VolumeCreationOptions::FilesystemType::Btrfs: return "@btrfs@"; - #elif defined (TC_MACOSX) - case VolumeCreationOptions::FilesystemType::MacOsExt: return "newfs_hfs"; - case VolumeCreationOptions::FilesystemType::exFAT: return "newfs_exfat"; 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/vhs/default.nix b/pkgs/applications/misc/vhs/default.nix index 82633111c33c2..12e14f212f7d7 100644 --- a/pkgs/applications/misc/vhs/default.nix +++ b/pkgs/applications/misc/vhs/default.nix @@ -2,23 +2,23 @@ buildGoModule rec { pname = "vhs"; - version = "0.7.2"; + version = "0.8.0"; src = fetchFromGitHub { owner = "charmbracelet"; repo = pname; rev = "v${version}"; - hash = "sha256-CWurSAxEXAquWXEOyBWBF6JN9Pesm5hBS3jVNv56dvE="; + hash = "sha256-kUsh+jy4dXYW1uAUfFv/HKBqIIyVogLKUYNjBhIKlls="; }; - vendorHash = "sha256-Kh5Sy7URmhsyBF35I0TaDdpSLD96MnkwIS+96+tSyO0="; + vendorHash = "sha256-1UBhiRemJ+dQNm20+8pbOJus5abvTwVcuzxNMzrniN8="; nativeBuildInputs = [ installShellFiles makeWrapper ]; ldflags = [ "-s" "-w" "-X=main.Version=${version}" ]; postInstall = '' - wrapProgram $out/bin/vhs --prefix PATH : ${lib.makeBinPath (lib.optionals stdenv.isLinux [ chromium ] ++ [ ffmpeg ttyd ])} + wrapProgram $out/bin/vhs --prefix PATH : ${lib.makeBinPath (lib.optionals stdenv.hostPlatform.isLinux [ chromium ] ++ [ ffmpeg ttyd ])} $out/bin/vhs man > vhs.1 installManPage vhs.1 installShellCompletion --cmd vhs \ diff --git a/pkgs/applications/misc/viking/default.nix b/pkgs/applications/misc/viking/default.nix index 1335d950405fb..cb3ab09e31bcb 100644 --- a/pkgs/applications/misc/viking/default.nix +++ b/pkgs/applications/misc/viking/default.nix @@ -10,7 +10,7 @@ , withMBTiles ? true, sqlite , withMd5Hash ? true, nettle , withOAuth ? true, liboauth -, withRealtimeGPSTracking ? (!stdenv.isDarwin), gpsd +, withRealtimeGPSTracking ? (!stdenv.hostPlatform.isDarwin), gpsd }: stdenv.mkDerivation rec { @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ docbook_xml_dtd_45 docbook_xsl intltool itstool libxslt pkg-config wrapGAppsHook3 yelp-tools ] - ++ lib.optional stdenv.isDarwin desktopToDarwinBundle; + ++ lib.optional stdenv.hostPlatform.isDarwin desktopToDarwinBundle; buildInputs = [ curl gdk-pixbuf gtk3 json-glib libxml2 ] ++ lib.optional withGeoClue geoclue2 diff --git a/pkgs/applications/misc/visidata/default.nix b/pkgs/applications/misc/visidata/default.nix index 2e7189dc484b3..d7a7c4d9f75f4 100644 --- a/pkgs/applications/misc/visidata/default.nix +++ b/pkgs/applications/misc/visidata/default.nix @@ -2,7 +2,8 @@ , lib , buildPythonApplication , fetchFromGitHub -# python requirements +, fetchpatch + # python requirements , beautifulsoup4 , boto3 , faker @@ -39,7 +40,7 @@ # other , git , withPcap ? true, dpkt, dnslib -, withXclip ? stdenv.isLinux, xclip +, withXclip ? stdenv.hostPlatform.isLinux, xclip , testers , visidata }: @@ -54,6 +55,20 @@ buildPythonApplication rec { hash = "sha256-gplrkrFTIP6TLvk1YazD5roDzsPvDtOXLlTOmTio52s="; }; + patches = [ + # Drop when next release is out + (fetchpatch { + name = "drop-support-for-python-37.patch"; + url = "https://github.com/saulpw/visidata/commit/738bb8b43814c14b1b8a1f1f60397c1520c5ef4a.patch"; + hash = "sha256-5jDAzKMuW3s7BCGpWyLcS4Lw8GUbjNxVhF5mUKbR1YY="; + }) + (fetchpatch { + name = "update-tests-for-python-312.patch"; + url = "https://github.com/saulpw/visidata/commit/627f6f126cdd49bcdda0bbc16fab42eb5bd42103.patch"; + hash = "sha256-3FHgjLrzMHObEheJoRY8VlnDUtDZ68FqCqAyhP7333E="; + }) + ]; + propagatedBuildInputs = [ # from visidata/requirements.txt # packages not (yet) present in nixpkgs are commented diff --git a/pkgs/applications/misc/vit/default.nix b/pkgs/applications/misc/vit/default.nix index 7bd7501f2296e..020be3eabf262 100644 --- a/pkgs/applications/misc/vit/default.nix +++ b/pkgs/applications/misc/vit/default.nix @@ -1,7 +1,7 @@ { lib , python3Packages , fetchPypi -, taskwarrior +, taskwarrior2 , glibcLocales }: @@ -14,7 +14,7 @@ buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-qDfY6GWnDQ44Sh540xQzDwANEI+mLjpy2a7G3sfKIzw="; + hash = "sha256-qDfY6GWnDQ44Sh540xQzDwANEI+mLjpy2a7G3sfKIzw="; }; propagatedBuildInputs = [ @@ -24,7 +24,7 @@ buildPythonApplication rec { nativeCheckInputs = [ glibcLocales ]; - makeWrapperArgs = [ "--suffix" "PATH" ":" "${taskwarrior}/bin" ]; + makeWrapperArgs = [ "--suffix" "PATH" ":" "${taskwarrior2}/bin" ]; preCheck = '' export TERM=''${TERM-linux} @@ -34,7 +34,7 @@ buildPythonApplication rec { homepage = "https://github.com/scottkosty/vit"; description = "Visual Interactive Taskwarrior"; mainProgram = "vit"; - maintainers = with maintainers; [ dtzWill arcnmx ]; + maintainers = with maintainers; [ arcnmx ]; platforms = platforms.all; license = licenses.mit; }; diff --git a/pkgs/applications/misc/volnoti/default.nix b/pkgs/applications/misc/volnoti/default.nix index f03de6d9e658e..560b9cce3fd40 100644 --- a/pkgs/applications/misc/volnoti/default.nix +++ b/pkgs/applications/misc/volnoti/default.nix @@ -33,6 +33,6 @@ stdenv.mkDerivation { homepage = "https://github.com/davidbrazdil/volnoti"; license = licenses.gpl3; platforms = platforms.linux; - maintainers = []; + maintainers = [ ]; }; } diff --git a/pkgs/applications/misc/wallust/default.nix b/pkgs/applications/misc/wallust/default.nix index e92d5517026f5..e7db47b118edd 100644 --- a/pkgs/applications/misc/wallust/default.nix +++ b/pkgs/applications/misc/wallust/default.nix @@ -4,9 +4,10 @@ , nix-update-script , imagemagick , makeWrapper +, installShellFiles }: let - version = "2.10.0"; + version = "3.0.0"; in rustPlatform.buildRustPackage { pname = "wallust"; @@ -17,12 +18,20 @@ rustPlatform.buildRustPackage { owner = "explosion-mental"; repo = "wallust"; rev = version; - hash = "sha256-0kPmr7/2uVncpCGVOeIkYlm2M0n9+ypVl7bQ9HnqLb4="; + hash = "sha256-vZTHlonepK1cyxHhGu3bVBuOmExPtRFrAnYp71Jfs8c="; }; - cargoHash = "sha256-p1NKEppBYLdCsTY7FHPzaGladLv5HqIVNJxSoFJOx50="; + cargoHash = "sha256-o6VRekazqbKTef6SLjHqs9/z/Q70auvunP+yFDkclpg="; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper installShellFiles ]; + + postInstall = '' + installManPage man/wallust* + installShellCompletion --cmd wallust \ + --bash completions/wallust.bash \ + --zsh completions/_wallust \ + --fish completions/wallust.fish + ''; postFixup = '' wrapProgram $out/bin/wallust \ diff --git a/pkgs/applications/misc/watchmate/Cargo.lock b/pkgs/applications/misc/watchmate/Cargo.lock index df3bf599d496a..d5c1b017d1d1f 100644 --- a/pkgs/applications/misc/watchmate/Cargo.lock +++ b/pkgs/applications/misc/watchmate/Cargo.lock @@ -3,6 +3,15 @@ version = 3 [[package]] +name = "addr2line" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +dependencies = [ + "gimli", +] + +[[package]] name = "adler" version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -10,26 +19,31 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "aes" -version = "0.7.5" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8" +checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" dependencies = [ "cfg-if", "cipher", "cpufeatures", - "opaque-debug", ] [[package]] name = "aho-corasick" -version = "0.7.20" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" dependencies = [ "memchr", ] [[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" @@ -39,10 +53,79 @@ dependencies = [ ] [[package]] +name = "anstream" +version = "0.6.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" + +[[package]] +name = "anstyle-parse" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" +dependencies = [ + "anstyle", + "windows-sys 0.52.0", +] + +[[package]] name = "anyhow" -version = "1.0.69" +version = "1.0.80" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1" + +[[package]] +name = "ashpd" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "224afbd727c3d6e4b90103ece64b8d1b67fbb1973b1046c2281eed3f3803f800" +checksum = "4ac22eda5891cc086690cb6fa10121c0390de0e3b04eb269f2d766b00d3f2d81" +dependencies = [ + "enumflags2", + "futures-channel", + "futures-util", + "gdk4-wayland", + "gdk4-x11", + "gtk4", + "once_cell", + "rand", + "serde", + "serde_repr", + "tokio", + "url", + "zbus", +] [[package]] name = "async-broadcast" @@ -50,32 +133,34 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c48ccdbf6ca6b121e0f586cbc0e73ae440e56c67c30fa0873b4e110d9c26d2b" dependencies = [ - "event-listener", + "event-listener 2.5.3", "futures-core", ] [[package]] name = "async-channel" -version = "1.8.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf46fee83e5ccffc220104713af3292ff9bc7c64c7de289f66dae8e38d826833" +checksum = "f28243a43d821d11341ab73c80bed182dc015c514b951616cf79bd4af39af0c3" dependencies = [ "concurrent-queue", - "event-listener", + "event-listener 5.2.0", + "event-listener-strategy 0.5.0", "futures-core", + "pin-project-lite", ] [[package]] name = "async-executor" -version = "1.5.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17adb73da160dfb475c183343c8cccd80721ea5a605d3eb57125f0a7b7a92d0b" +checksum = "17ae5ebefcc48e7452b4987947920dac9450be1110cadf34d1b8c116bdbaf97c" dependencies = [ - "async-lock", + "async-lock 3.3.0", "async-task", "concurrent-queue", - "fastrand", - "futures-lite", + "fastrand 2.0.1", + "futures-lite 2.2.0", "slab", ] @@ -85,74 +170,139 @@ version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06" dependencies = [ - "async-lock", + "async-lock 2.8.0", "autocfg", "blocking", - "futures-lite", + "futures-lite 1.13.0", ] [[package]] name = "async-io" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c374dda1ed3e7d8f0d9ba58715f924862c63eae6849c92d3a18e7fbde9e2794" +checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" dependencies = [ - "async-lock", + "async-lock 2.8.0", "autocfg", + "cfg-if", "concurrent-queue", - "futures-lite", - "libc", + "futures-lite 1.13.0", "log", "parking", - "polling", + "polling 2.8.0", + "rustix 0.37.27", "slab", - "socket2", + "socket2 0.4.10", "waker-fn", - "windows-sys 0.42.0", +] + +[[package]] +name = "async-io" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f97ab0c5b00a7cdbe5a371b9a782ee7be1316095885c8a4ea1daf490eb0ef65" +dependencies = [ + "async-lock 3.3.0", + "cfg-if", + "concurrent-queue", + "futures-io", + "futures-lite 2.2.0", + "parking", + "polling 3.5.0", + "rustix 0.38.31", + "slab", + "tracing", + "windows-sys 0.52.0", ] [[package]] name = "async-lock" -version = "2.7.0" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" +dependencies = [ + "event-listener 2.5.3", +] + +[[package]] +name = "async-lock" +version = "3.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b" +dependencies = [ + "event-listener 4.0.3", + "event-listener-strategy 0.4.0", + "pin-project-lite", +] + +[[package]] +name = "async-process" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa24f727524730b077666307f2734b4a1a1c57acb79193127dcc8914d5242dd7" +checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88" dependencies = [ - "event-listener", + "async-io 1.13.0", + "async-lock 2.8.0", + "async-signal", + "blocking", + "cfg-if", + "event-listener 3.1.0", + "futures-lite 1.13.0", + "rustix 0.38.31", + "windows-sys 0.48.0", ] [[package]] name = "async-recursion" -version = "1.0.2" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b015a331cc64ebd1774ba119538573603427eaace0a1950c423ab971f903796" +checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.52", +] + +[[package]] +name = "async-signal" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5" +dependencies = [ + "async-io 2.3.1", + "async-lock 2.8.0", + "atomic-waker", + "cfg-if", + "futures-core", + "futures-io", + "rustix 0.38.31", + "signal-hook-registry", + "slab", + "windows-sys 0.48.0", ] [[package]] name = "async-task" -version = "4.3.0" +version = "4.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a40729d2133846d9ed0ea60a8b9541bccddab49cd30f0715a1da672fe9a2524" +checksum = "fbb36e985947064623dbd357f727af08ffd077f93d696782f3c56365fa2e2799" [[package]] name = "async-trait" -version = "0.1.66" +version = "0.1.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b84f9ebcc6c1f5b8cb160f6990096a5c127f423fcb6e1ccc46c370cbdfb75dfc" +checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.52", ] [[package]] name = "atomic-waker" -version = "1.1.0" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "debc29dde2e69f9e47506b525f639ed42300fc014a3e007832592448fa8e4599" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] name = "autocfg" @@ -161,10 +311,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] +name = "backtrace" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] name = "base64" -version = "0.21.0" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" [[package]] name = "base64ct" @@ -179,6 +344,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] +name = "bitflags" +version = "2.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" + +[[package]] name = "block-buffer" version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -189,23 +360,25 @@ dependencies = [ [[package]] name = "blocking" -version = "1.3.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c67b173a56acffd6d2326fb7ab938ba0b00a71480e14902b2591c87bc5741e8" +checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118" dependencies = [ "async-channel", - "async-lock", + "async-lock 3.3.0", "async-task", - "atomic-waker", - "fastrand", - "futures-lite", + "fastrand 2.0.1", + "futures-io", + "futures-lite 2.2.0", + "piper", + "tracing", ] [[package]] name = "bluer" -version = "0.15.7" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d76ba39a871348200bbbf7dbff9fbaec30f0b988420f7391bfd9fdc5f8b5144" +checksum = "108df43a349f623b6fc6b190b08a0e05720872bba4e2333d7fa7dd102dd80912" dependencies = [ "custom_debug", "dbus", @@ -218,7 +391,7 @@ dependencies = [ "libc", "log", "macaddr", - "nix", + "nix 0.27.1", "num-derive", "num-traits", "pin-project", @@ -232,21 +405,21 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.12.0" +version = "3.15.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" +checksum = "8ea184aa71bb362a1157c896979544cc23974e08fd265f29ea96b59f0b4a555b" [[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 = "bytes" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" [[package]] name = "bzip2" @@ -271,11 +444,11 @@ dependencies = [ [[package]] name = "cairo-rs" -version = "0.17.0" +version = "0.18.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8af54f5d48af1226928adc1f57edd22f5df1349e7da1fc96ae15cf43db0e871" +checksum = "8ca26ef0159422fb77631dc9d17b102f253b876fe1586b03b803e63a309b4ee2" dependencies = [ - "bitflags", + "bitflags 2.4.2", "cairo-sys-rs", "glib", "libc", @@ -285,9 +458,9 @@ dependencies = [ [[package]] name = "cairo-sys-rs" -version = "0.17.0" +version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f55382a01d30e5e53f185eee269124f5e21ab526595b872751278dfbb463594e" +checksum = "685c9fa8e590b8b3d678873528d83411db17242a73fccaed827770ea0fedda51" dependencies = [ "glib-sys", "libc", @@ -296,20 +469,21 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.79" +version = "1.0.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +checksum = "02f341c093d19155a6e41631ce5971aac4e9a868262212153124c15fa22d1cdc" dependencies = [ - "jobserver", + "libc", ] [[package]] name = "cfg-expr" -version = "0.11.0" +version = "0.15.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0357a6402b295ca3a86bc148e84df46c02e41f41fef186bda662557ef6328aa" +checksum = "fa50868b64a9a6fda9d593ce778849ea8715cd2a3d2cc17ffdb4a2f2f2f1961d" dependencies = [ "smallvec", + "target-lexicon", ] [[package]] @@ -320,43 +494,39 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.24" +version = "0.4.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e3c5919066adf22df73762e50cffcde3a758f2a848b113b586d1f86728b673b" +checksum = "5bc015644b92d5890fab7489e49d21f879d5c990186827d42ec511919404f38b" dependencies = [ + "android-tzdata", "iana-time-zone", "js-sys", - "num-integer", "num-traits", - "time 0.1.45", "wasm-bindgen", - "winapi", + "windows-targets 0.52.4", ] [[package]] name = "cipher" -version = "0.3.0" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7" +checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" dependencies = [ - "generic-array", + "crypto-common", + "inout", ] [[package]] -name = "codespan-reporting" -version = "0.11.1" +name = "colorchoice" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" -dependencies = [ - "termcolor", - "unicode-width", -] +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" [[package]] name = "concurrent-queue" -version = "2.1.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c278839b831783b70278b14df4d45e1beb1aad306c07bb796637de9a0e323e8e" +checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363" dependencies = [ "crossbeam-utils", ] @@ -369,9 +539,9 @@ checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" [[package]] name = "core-foundation" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" dependencies = [ "core-foundation-sys", "libc", @@ -379,36 +549,33 @@ dependencies = [ [[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.5" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" dependencies = [ "libc", ] [[package]] name = "crc32fast" -version = "1.3.2" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" dependencies = [ "cfg-if", ] [[package]] name = "crossbeam-utils" -version = "0.8.15" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b" -dependencies = [ - "cfg-if", -] +checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" [[package]] name = "crypto-common" @@ -422,66 +589,60 @@ dependencies = [ [[package]] name = "custom_debug" -version = "0.5.1" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89e0ae2c2a42be29595d05c50e3ce6096c0698a97e021c3289790f0750cc8e2" +checksum = "14e715bf0e503e909c7076c052e39dd215202e8edeb32f1c194fd630c314d256" dependencies = [ "custom_debug_derive", ] [[package]] name = "custom_debug_derive" -version = "0.5.1" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08a9f3941234c9f62ceaa2782974827749de9b0a8a6487275a278da068e1baf7" +checksum = "f731440b39c73910e253cb465ec1fac97732b3c7af215639881ec0c2a38f4f69" dependencies = [ + "darling", + "itertools", "proc-macro2", - "syn", + "quote", + "syn 2.0.52", "synstructure", ] [[package]] -name = "cxx" -version = "1.0.92" +name = "darling" +version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a140f260e6f3f79013b8bfc65e7ce630c9ab4388c6a89c71e07226f49487b72" +checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391" dependencies = [ - "cc", - "cxxbridge-flags", - "cxxbridge-macro", - "link-cplusplus", + "darling_core", + "darling_macro", ] [[package]] -name = "cxx-build" -version = "1.0.92" +name = "darling_core" +version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da6383f459341ea689374bf0a42979739dc421874f112ff26f829b8040b8e613" +checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f" dependencies = [ - "cc", - "codespan-reporting", - "once_cell", + "fnv", + "ident_case", "proc-macro2", "quote", - "scratch", - "syn", + "strsim", + "syn 2.0.52", ] [[package]] -name = "cxxbridge-flags" -version = "1.0.92" +name = "darling_macro" +version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90201c1a650e95ccff1c8c0bb5a343213bdd317c6e600a93075bca2eff54ec97" - -[[package]] -name = "cxxbridge-macro" -version = "1.0.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b75aed41bb2e6367cae39e6326ef817a851db13c13e4f3263714ca3cfb8de56" +checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" dependencies = [ - "proc-macro2", + "darling_core", "quote", - "syn", + "syn 2.0.52", ] [[package]] @@ -518,6 +679,15 @@ dependencies = [ ] [[package]] +name = "deranged" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +dependencies = [ + "powerfmt", +] + +[[package]] name = "derivative" version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -525,14 +695,14 @@ checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "digest" -version = "0.10.6" +version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ "block-buffer", "crypto-common", @@ -540,50 +710,36 @@ dependencies = [ ] [[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 = "displaydoc" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bf95dc3f046b9da4f2d51833c0d3547d8564ef6910f5c1ed130306a75b92886" +checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.52", ] [[package]] +name = "either" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" + +[[package]] name = "encoding_rs" -version = "0.8.32" +version = "0.8.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" +checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" dependencies = [ "cfg-if", ] [[package]] name = "enumflags2" -version = "0.7.5" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e75d4cd21b95383444831539909fbb14b9dc3fdceb2a6f5d36577329a1f55ccb" +checksum = "3278c9d5fb675e0a51dabcf4c0d355f692b064171535ba72361be1528a9d8e8d" dependencies = [ "enumflags2_derive", "serde", @@ -591,47 +747,52 @@ dependencies = [ [[package]] name = "enumflags2_derive" -version = "0.7.4" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f58dc3c5e468259f19f2d46304a6b28f1c3d034442e14b322d2b850e36f6d5ae" +checksum = "5c785274071b1b420972453b306eeca06acf4633829db4223b58a2a8c5953bc4" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.52", ] [[package]] -name = "env_logger" -version = "0.10.0" +name = "env_filter" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" +checksum = "a009aa4810eb158359dda09d0c87378e4bbb89b5a801f016885a4707ba24f7ea" dependencies = [ - "humantime", - "is-terminal", "log", "regex", - "termcolor", ] [[package]] -name = "errno" -version = "0.2.8" +name = "env_logger" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" +checksum = "6c012a26a7f605efc424dd53697843a72be7dc86ad2d01f7814337794a12231d" dependencies = [ - "errno-dragonfly", - "libc", - "winapi", + "anstream", + "anstyle", + "env_filter", + "humantime", + "log", ] [[package]] -name = "errno-dragonfly" -version = "0.1.2" +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "errno" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" dependencies = [ - "cc", "libc", + "windows-sys 0.52.0", ] [[package]] @@ -641,6 +802,59 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] +name = "event-listener" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d93877bcde0eb80ca09131a08d23f0a5c18a620b01db137dba666d18cd9b30c2" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[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.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b5fb89194fa3cad959b833185b3063ba881dbfc7030680b314250779fb4cc91" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[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.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "feedafcaa9b749175d5ac357452a9d41ea2911da598fde46ce1fe02c37751291" +dependencies = [ + "event-listener 5.2.0", + "pin-project-lite", +] + +[[package]] name = "fastrand" version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -650,20 +864,26 @@ dependencies = [ ] [[package]] +name = "fastrand" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" + +[[package]] name = "field-offset" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3cf3a800ff6e860c863ca6d4b16fd999db8b752819c1606884047b73e468535" +checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f" dependencies = [ - "memoffset 0.8.0", + "memoffset 0.9.0", "rustc_version", ] [[package]] name = "flate2" -version = "1.0.25" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" dependencies = [ "crc32fast", "miniz_oxide", @@ -671,14 +891,13 @@ dependencies = [ [[package]] name = "flume" -version = "0.10.14" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1657b4441c3403d9f7b3409e47575237dac27b1b5726df654a6ecbf92f0f7577" +checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" dependencies = [ "futures-core", "futures-sink", "nanorand", - "pin-project", "spin", ] @@ -705,9 +924,9 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "form_urlencoded" -version = "1.1.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" dependencies = [ "percent-encoding", ] @@ -720,9 +939,9 @@ checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" [[package]] name = "futures" -version = "0.3.27" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "531ac96c6ff5fd7c62263c5e3c67a603af4fcaee2e1a0ae5565ba3a11e69e549" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" dependencies = [ "futures-channel", "futures-core", @@ -735,9 +954,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.27" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "164713a5a0dcc3e7b4b1ed7d3b433cabc18025386f9339346e8daf15963cf7ac" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" dependencies = [ "futures-core", "futures-sink", @@ -745,15 +964,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.27" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86d7a0c1aa76363dac491de0ee99faf6941128376f1cf96f07db7603b7de69dd" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" [[package]] name = "futures-executor" -version = "0.3.27" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1997dd9df74cdac935c76252744c1ed5794fac083242ea4fe77ef3ed60ba0f83" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" dependencies = [ "futures-core", "futures-task", @@ -762,17 +981,17 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.27" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89d422fa3cbe3b40dca574ab087abb5bc98258ea57eea3fd6f1fa7162c778b91" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" [[package]] name = "futures-lite" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7694489acd39452c77daa48516b894c153f192c3578d5a839b62c58099fcbf48" +checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" dependencies = [ - "fastrand", + "fastrand 1.9.0", "futures-core", "futures-io", "memchr", @@ -782,33 +1001,46 @@ dependencies = [ ] [[package]] +name = "futures-lite" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "445ba825b27408685aaecefd65178908c36c6e96aaf6d8599419d46e624192ba" +dependencies = [ + "fastrand 2.0.1", + "futures-core", + "futures-io", + "parking", + "pin-project-lite", +] + +[[package]] name = "futures-macro" -version = "0.3.27" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3eb14ed937631bd8b8b8977f2c198443447a8355b6e3ca599f38c975e5a963b6" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.52", ] [[package]] name = "futures-sink" -version = "0.3.27" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec93083a4aecafb2a80a885c9de1f0ccae9dbd32c2bb54b0c3a65690e0b8d2f2" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" [[package]] name = "futures-task" -version = "0.3.27" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd65540d33b37b16542a0438c12e6aeead10d4ac5d05bd3f805b8f35ab592879" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" [[package]] name = "futures-util" -version = "0.3.27" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ef6b17e481503ec85211fed8f39d1970f128935ca1f814cd32ac4a6842e84ab" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" dependencies = [ "futures-channel", "futures-core", @@ -824,11 +1056,10 @@ dependencies = [ [[package]] name = "gdk-pixbuf" -version = "0.17.0" +version = "0.18.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b023fbe0c6b407bd3d9805d107d9800da3829dc5a676653210f1d5f16d7f59bf" +checksum = "50e1f5f1b0bfb830d6ccc8066d18db35c487b1b2b1e8589b5dfe9f07e8defaec" dependencies = [ - "bitflags", "gdk-pixbuf-sys", "gio", "glib", @@ -838,9 +1069,9 @@ dependencies = [ [[package]] name = "gdk-pixbuf-sys" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b41bd2b44ed49d99277d3925652a163038bd5ed943ec9809338ffb2f4391e3b" +checksum = "3f9839ea644ed9c97a34d129ad56d38a25e6756f99f3a88e15cd39c20629caf7" dependencies = [ "gio-sys", "glib-sys", @@ -851,11 +1082,10 @@ dependencies = [ [[package]] name = "gdk4" -version = "0.6.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5042053ee765aeef08d9d7e3f0f1e36a4d37f1659b3f93ad3d6997515dbb64a" +checksum = "7edb019ad581f8ecf8ea8e4baa6df7c483a95b5a59be3140be6a9c3b0c632af6" dependencies = [ - "bitflags", "cairo-rs", "gdk-pixbuf", "gdk4-sys", @@ -867,9 +1097,9 @@ dependencies = [ [[package]] name = "gdk4-sys" -version = "0.6.2" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14f0fb00507af1e9299681dd09965f720e2b5ea95536d49a5681e8994ef10c7a" +checksum = "dbab43f332a3cf1df9974da690b5bb0e26720ed09a228178ce52175372dcfef0" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -883,10 +1113,59 @@ dependencies = [ ] [[package]] +name = "gdk4-wayland" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0db9102ff11e55bd65e153c1192abc21ddfa45ede90622e423d4e4a0e5d5f313" +dependencies = [ + "gdk4", + "gdk4-wayland-sys", + "gio", + "glib", + "libc", +] + +[[package]] +name = "gdk4-wayland-sys" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d48159be256ae0212d5a2b9884627197d08082c7168b28775b53a0f9885d5624" +dependencies = [ + "glib-sys", + "libc", + "system-deps", +] + +[[package]] +name = "gdk4-x11" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28c9bbf8ea1ea8469e74c3fdfafc142c9e14810a27f89ddb01b5e9076a60a450" +dependencies = [ + "gdk4", + "gdk4-x11-sys", + "gio", + "glib", + "libc", +] + +[[package]] +name = "gdk4-x11-sys" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3de1709370758192369f5329aa593847797f1c693c95e8a261e9b2e06a5f125" +dependencies = [ + "gdk4-sys", + "glib-sys", + "libc", + "system-deps", +] + +[[package]] name = "generic-array" -version = "0.14.6" +version = "0.14.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" dependencies = [ "typenum", "version_check", @@ -894,24 +1173,29 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.8" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" +checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" dependencies = [ "cfg-if", "js-sys", "libc", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", "wasm-bindgen", ] [[package]] +name = "gimli" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" + +[[package]] name = "gio" -version = "0.17.4" +version = "0.18.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2261a3b4e922ec676d1c27ac466218c38cf5dcb49a759129e54bb5046e442125" +checksum = "d4fc8f532f87b79cbc51a79748f16a6828fb784be93145a322fa14d06d354c73" dependencies = [ - "bitflags", "futures-channel", "futures-core", "futures-io", @@ -927,9 +1211,9 @@ dependencies = [ [[package]] name = "gio-sys" -version = "0.17.4" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b1d43b0d7968b48455244ecafe41192871257f5740aa6b095eb19db78e362a5" +checksum = "37566df850baf5e4cb0dfb78af2e4b9898d817ed9263d1090a2df958c64737d2" dependencies = [ "glib-sys", "gobject-sys", @@ -940,11 +1224,11 @@ dependencies = [ [[package]] name = "glib" -version = "0.17.5" +version = "0.18.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfb53061756195d76969292c2d2e329e01259276524a9bae6c9b73af62854773" +checksum = "233daaf6e83ae6a12a52055f568f9d7cf4671dabb78ff9560ab6da230ce00ee5" dependencies = [ - "bitflags", + "bitflags 2.4.2", "futures-channel", "futures-core", "futures-executor", @@ -963,24 +1247,23 @@ dependencies = [ [[package]] name = "glib-macros" -version = "0.17.5" +version = "0.18.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "454924cafe58d9174dc32972261fe271d6cd3c10f5e9ff505522a28dcf601a40" +checksum = "0bb0228f477c0900c880fd78c8759b95c7636dbd7842707f49e132378aa2acdc" dependencies = [ - "anyhow", "heck", - "proc-macro-crate", + "proc-macro-crate 2.0.2", "proc-macro-error", "proc-macro2", "quote", - "syn", + "syn 2.0.52", ] [[package]] name = "glib-sys" -version = "0.17.4" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f00ad0a1bf548e61adfff15d83430941d9e1bb620e334f779edd1c745680a5" +checksum = "063ce2eb6a8d0ea93d2bf8ba1957e78dbab6be1c2220dd3daca57d5a9d869898" dependencies = [ "libc", "system-deps", @@ -988,9 +1271,9 @@ dependencies = [ [[package]] name = "gobject-sys" -version = "0.17.4" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15e75b0000a64632b2d8ca3cf856af9308e3a970844f6e9659bd197f026793d0" +checksum = "0850127b514d1c4a4654ead6dedadb18198999985908e6ffe4436f53c785ce44" dependencies = [ "glib-sys", "libc", @@ -999,9 +1282,9 @@ dependencies = [ [[package]] name = "graphene-rs" -version = "0.17.1" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21cf11565bb0e4dfc2f99d4775b6c329f0d40a2cff9c0066214d31a0e1b46256" +checksum = "3b2228cda1505613a7a956cca69076892cfbda84fc2b7a62b94a41a272c0c401" dependencies = [ "glib", "graphene-sys", @@ -1010,9 +1293,9 @@ dependencies = [ [[package]] name = "graphene-sys" -version = "0.17.0" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf80a4849a8d9565410a8fec6fc3678e9c617f4ac7be182ca55ab75016e07af9" +checksum = "cc4144cee8fc8788f2a9b73dc5f1d4e1189d1f95305c4cb7bd9c1af1cfa31f59" dependencies = [ "glib-sys", "libc", @@ -1022,11 +1305,10 @@ dependencies = [ [[package]] name = "gsk4" -version = "0.6.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fa9cd285a72a95124b65c069a9cb1b8fb8e310be71783404c39fccf3bf7774c" +checksum = "0d958e351d2f210309b32d081c832d7de0aca0b077aa10d88336c6379bd01f7e" dependencies = [ - "bitflags", "cairo-rs", "gdk4", "glib", @@ -1038,9 +1320,9 @@ dependencies = [ [[package]] name = "gsk4-sys" -version = "0.6.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a445ae1e50cbf181a1d5c61b920a7e7e8657b96e0ecdbbf8911a86fad462a32" +checksum = "12bd9e3effea989f020e8f1ff3fa3b8c63ba93d43b899c11a118868853a56d55" dependencies = [ "cairo-sys-rs", "gdk4-sys", @@ -1054,11 +1336,10 @@ dependencies = [ [[package]] name = "gtk4" -version = "0.6.6" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b28a32a04cd75cef14a0983f8b0c669e0fe152a0a7725accdeb594e2c764c88b" +checksum = "5aeb51aa3e9728575a053e1f43543cd9992ac2477e1b186ad824fd4adfb70842" dependencies = [ - "bitflags", "cairo-rs", "field-offset", "futures-channel", @@ -1071,29 +1352,28 @@ dependencies = [ "gtk4-macros", "gtk4-sys", "libc", - "once_cell", "pango", ] [[package]] name = "gtk4-macros" -version = "0.6.0" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db4676c4f90d8b010e88cb4558f61f47d76d6f6b8e6f6b89e62640f443907f61" +checksum = "d57ec49cf9b657f69a05bca8027cff0a8dfd0c49e812be026fc7311f2163832f" dependencies = [ "anyhow", - "proc-macro-crate", + "proc-macro-crate 1.3.1", "proc-macro-error", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "gtk4-sys" -version = "0.6.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65463dc801460e498d5e7ffa6e9ae2cfbed7d05fabd1ca5a8d024adbc89eeda6" +checksum = "54d8c4aa23638ce9faa2caf7e2a27d4a1295af2155c8e8d28c4d4eeca7a65eb8" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -1110,14 +1390,12 @@ dependencies = [ [[package]] name = "gvdb" -version = "0.4.0" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6fc5915836ff1779eb9455810dad729811334b1026d4316eaf89c3a415e32ea" +checksum = "0bb9136c388a1e7b3017d18fe7c2f263b0a2b13f215c48e8eb44935d413ce0f9" dependencies = [ "byteorder", "flate2", - "lazy_static", - "memmap2", "quick-xml", "safe-transmute", "serde", @@ -1128,9 +1406,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.16" +version = "0.3.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5be7b54589b581f624f566bf5d8eb2bab1db736c51528720b6bd36b96b55924d" +checksum = "bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9" dependencies = [ "bytes", "fnv", @@ -1147,9 +1425,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.12.3" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" [[package]] name = "heck" @@ -1159,18 +1437,9 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" -dependencies = [ - "libc", -] - -[[package]] -name = "hermit-abi" -version = "0.3.1" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" [[package]] name = "hex" @@ -1189,9 +1458,9 @@ dependencies = [ [[package]] name = "http" -version = "0.2.9" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" +checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" dependencies = [ "bytes", "fnv", @@ -1200,9 +1469,9 @@ dependencies = [ [[package]] name = "http-body" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" +checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" dependencies = [ "bytes", "http", @@ -1217,9 +1486,9 @@ checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" [[package]] name = "httpdate" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "humantime" @@ -1229,9 +1498,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.25" +version = "0.14.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc5e554ff619822309ffd57d8734d77cd5ce6238bc956f037ea06c58238c9899" +checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" dependencies = [ "bytes", "futures-channel", @@ -1244,7 +1513,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2", + "socket2 0.5.6", "tokio", "tower-service", "tracing", @@ -1266,33 +1535,38 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.53" +version = "0.1.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "winapi", + "windows-core", ] [[package]] name = "iana-time-zone-haiku" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" dependencies = [ - "cxx", - "cxx-build", + "cc", ] [[package]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + +[[package]] name = "idna" -version = "0.3.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" dependencies = [ "unicode-bidi", "unicode-normalization", @@ -1300,11 +1574,11 @@ dependencies = [ [[package]] name = "indexmap" -version = "1.9.2" +version = "2.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" +checksum = "7b0b929d511467233429c45a44ac1dcaa21ba0f5ba11e4879e6ed28ddb4f9df4" dependencies = [ - "autocfg", + "equivalent", "hashbrown", ] @@ -1329,6 +1603,15 @@ dependencies = [ ] [[package]] +name = "inout" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" +dependencies = [ + "generic-array", +] + +[[package]] name = "instant" version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1339,52 +1622,41 @@ dependencies = [ [[package]] name = "io-lifetimes" -version = "1.0.6" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfa919a82ea574332e2de6e74b4c36e74d41982b335080fa59d4ef31be20fdf3" +checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ + "hermit-abi", "libc", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] name = "ipnet" -version = "2.7.1" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30e22bd8629359895450b59ea7a776c850561b96a3b1d31321c1949d9e6c9146" +checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" [[package]] -name = "is-terminal" -version = "0.4.4" +name = "itertools" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21b6b32576413a8e69b90e952e4a026476040d81017b80445deda5f2d3921857" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" dependencies = [ - "hermit-abi 0.3.1", - "io-lifetimes", - "rustix", - "windows-sys 0.45.0", + "either", ] [[package]] name = "itoa" -version = "1.0.6" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" - -[[package]] -name = "jobserver" -version = "0.1.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" -dependencies = [ - "libc", -] +checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" [[package]] name = "js-sys" -version = "0.3.61" +version = "0.3.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" +checksum = "406cda4b368d531c842222cf9d2600a9a4acce8d29423695379c6868a143a9ee" dependencies = [ "wasm-bindgen", ] @@ -1397,12 +1669,10 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libadwaita" -version = "0.3.1" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1c4efd2020a4fcedbad2c4a97de97bf6045e5dc49d61d5a5d0cfd753db60700" +checksum = "2fe7e70c06507ed10a16cda707f358fbe60fe0dc237498f78c686ade92fd979c" dependencies = [ - "bitflags", - "futures-channel", "gdk-pixbuf", "gdk4", "gio", @@ -1410,15 +1680,14 @@ dependencies = [ "gtk4", "libadwaita-sys", "libc", - "once_cell", "pango", ] [[package]] name = "libadwaita-sys" -version = "0.3.0" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0727b85b4fe2b1bed5ac90df6343de15cbf8118bfb96d7c3cc1512681a4b34ac" +checksum = "5e10aaa38de1d53374f90deeb4535209adc40cc5dba37f9704724169bceec69a" dependencies = [ "gdk4-sys", "gio-sys", @@ -1432,39 +1701,36 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.140" +version = "0.2.153" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c" +checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" [[package]] name = "libdbus-sys" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f8d7ae751e1cb825c840ae5e682f59b098cdfd213c350ac268b61449a5f58a0" +checksum = "06085512b750d640299b79be4bad3d2fa90a9c00b1fd9e1b46364f66f0485c72" dependencies = [ "pkg-config", ] [[package]] -name = "link-cplusplus" -version = "1.0.8" +name = "linux-raw-sys" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5" -dependencies = [ - "cc", -] +checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "linux-raw-sys" -version = "0.1.4" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" +checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" [[package]] name = "lock_api" -version = "0.4.9" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" dependencies = [ "autocfg", "scopeguard", @@ -1472,12 +1738,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.17" +version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if", -] +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" [[package]] name = "macaddr" @@ -1487,18 +1750,9 @@ checksum = "baee0bbc17ce759db233beb01648088061bf678383130602a298e6998eedb2d8" [[package]] name = "memchr" -version = "2.5.0" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" - -[[package]] -name = "memmap2" -version = "0.5.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327" -dependencies = [ - "libc", -] +checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" [[package]] name = "memoffset" @@ -1511,48 +1765,47 @@ dependencies = [ [[package]] name = "memoffset" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" dependencies = [ "autocfg", ] [[package]] name = "mime" -version = "0.3.16" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] name = "miniz_oxide" -version = "0.6.2" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" +checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" dependencies = [ "adler", ] [[package]] name = "mio" -version = "0.8.6" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" dependencies = [ "libc", - "log", - "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.45.0", + "wasi", + "windows-sys 0.48.0", ] [[package]] name = "mpris2-zbus" version = "0.1.0" -source = "git+https://github.com/pop-os/mpris2-zbus#a41a9b994a901cb2bb7a83424c8c21a78ba658c6" +source = "git+https://github.com/pop-os/dbus-settings-bindings#8b9767f6cedede2def12941ce89e14bfcd913aeb" dependencies = [ "serde", "thiserror", - "time 0.3.20", + "time", "zbus", "zvariant", ] @@ -1586,77 +1839,85 @@ dependencies = [ [[package]] name = "nix" -version = "0.26.2" +version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" +checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cfg-if", "libc", "memoffset 0.7.1", - "pin-utils", - "static_assertions", ] [[package]] -name = "num-derive" -version = "0.3.3" +name = "nix" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" +checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" dependencies = [ - "proc-macro2", - "quote", - "syn", + "bitflags 2.4.2", + "cfg-if", + "libc", ] [[package]] -name = "num-integer" -version = "0.1.45" +name = "num-conv" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + +[[package]] +name = "num-derive" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ - "autocfg", - "num-traits", + "proc-macro2", + "quote", + "syn 2.0.52", ] [[package]] name = "num-traits" -version = "0.2.15" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" dependencies = [ "autocfg", ] [[package]] name = "num_cpus" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.2.6", + "hermit-abi", "libc", ] [[package]] -name = "once_cell" -version = "1.17.1" +name = "object" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" +checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +dependencies = [ + "memchr", +] [[package]] -name = "opaque-debug" -version = "0.3.0" +name = "once_cell" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "openssl" -version = "0.10.46" +version = "0.10.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd2523381e46256e40930512c7fd25562b9eae4812cb52078f155e87217c9d1e" +checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" dependencies = [ - "bitflags", + "bitflags 2.4.2", "cfg-if", "foreign-types", "libc", @@ -1667,13 +1928,13 @@ dependencies = [ [[package]] name = "openssl-macros" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" +checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.52", ] [[package]] @@ -1684,11 +1945,10 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.81" +version = "0.9.101" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "176be2629957c157240f68f61f2d0053ad3a4ecfdd9ebf1e6521d18d9635cf67" +checksum = "dda2b0f344e78efc2facf7d195d098df0dd72151b26ab98da807afc26c198dff" dependencies = [ - "autocfg", "cc", "libc", "pkg-config", @@ -1707,11 +1967,10 @@ dependencies = [ [[package]] name = "pango" -version = "0.17.4" +version = "0.18.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52c280b82a881e4208afb3359a8e7fde27a1b272280981f1f34610bed5770d37" +checksum = "7ca27ec1eb0457ab26f3036ea52229edbdb74dee1edd29063f5b9b010e7ebee4" dependencies = [ - "bitflags", "gio", "glib", "libc", @@ -1721,9 +1980,9 @@ dependencies = [ [[package]] name = "pango-sys" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4293d0f0b5525eb5c24734d30b0ed02cd02aa734f216883f376b54de49625de8" +checksum = "436737e391a843e5933d6d9aa102cb126d501e815b83601365a948a518555dc5" dependencies = [ "glib-sys", "gobject-sys", @@ -1733,9 +1992,9 @@ dependencies = [ [[package]] name = "parking" -version = "2.0.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72" +checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" [[package]] name = "password-hash" @@ -1762,35 +2021,35 @@ dependencies = [ [[package]] name = "percent-encoding" -version = "2.2.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pin-project" -version = "1.0.12" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc" +checksum = "0302c4a0442c456bd56f841aee5c3bfd17967563f6fadc9ceb9f9c23cf3807e0" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.0.12" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" +checksum = "266c042b60c9c76b8d53061e52b2e0d1116abc57cefc8c5cd671619a56ac3690" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.52", ] [[package]] name = "pin-project-lite" -version = "0.2.9" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" [[package]] name = "pin-utils" @@ -1799,28 +2058,59 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] +name = "piper" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" +dependencies = [ + "atomic-waker", + "fastrand 2.0.1", + "futures-io", +] + +[[package]] name = "pkg-config" -version = "0.3.26" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] name = "polling" -version = "2.6.0" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e1f879b2998099c2d69ab9605d145d5b661195627eccc680002c4918a7fb6fa" +checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" dependencies = [ "autocfg", - "bitflags", + "bitflags 1.3.2", "cfg-if", "concurrent-queue", "libc", "log", "pin-project-lite", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] +name = "polling" +version = "3.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24f040dee2588b4963afb4e420540439d126f73fdacf4a9c486a96d840bac3c9" +dependencies = [ + "cfg-if", + "concurrent-queue", + "pin-project-lite", + "rustix 0.38.31", + "tracing", + "windows-sys 0.52.0", +] + +[[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" @@ -1833,7 +2123,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" dependencies = [ "once_cell", - "toml_edit", + "toml_edit 0.19.15", +] + +[[package]] +name = "proc-macro-crate" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b00f26d3400549137f92511a46ac1cd8ce37cb5598a96d382381458b992a5d24" +dependencies = [ + "toml_datetime", + "toml_edit 0.20.2", ] [[package]] @@ -1845,7 +2145,7 @@ dependencies = [ "proc-macro-error-attr", "proc-macro2", "quote", - "syn", + "syn 1.0.109", "version_check", ] @@ -1862,18 +2162,18 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.52" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d0e1ae9e836cc3beddd63db0df682593d7e2d3d891ae8c9083d2113e1744224" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] [[package]] name = "quick-xml" -version = "0.27.1" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffc053f057dd768a56f62cd7e434c42c831d296968997e9ac1f76ea7c2d14c41" +checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" dependencies = [ "memchr", "serde", @@ -1881,9 +2181,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.26" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" dependencies = [ "proc-macro2", ] @@ -1919,30 +2219,22 @@ dependencies = [ ] [[package]] -name = "redox_syscall" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "bitflags", -] - -[[package]] -name = "redox_users" -version = "0.4.3" +name = "regex" +version = "1.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" dependencies = [ - "getrandom", - "redox_syscall", - "thiserror", + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", ] [[package]] -name = "regex" -version = "1.7.1" +name = "regex-automata" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733" +checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd" dependencies = [ "aho-corasick", "memchr", @@ -1951,15 +2243,15 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.6.28" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "relm4" -version = "0.6.0-beta.1" +version = "0.7.0-rc.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f169f698ce2e487eed2306898fcf262224a287d0e81480db4190e74cfec412cf" +checksum = "b7497b6d4d07b10f8d5384a657d40fb814de5fc900785322129ec459527c7af1" dependencies = [ "async-trait", "flume", @@ -1975,9 +2267,9 @@ dependencies = [ [[package]] name = "relm4-components" -version = "0.6.0-beta.1" +version = "0.7.0-rc.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "734838f188ee58954351c75175cb5ba6e9e67f90576b7fb90b928b2cb6043e1d" +checksum = "d8fbe20184f217314e9f034db0f01267407de3887892252015861d6a207384e8" dependencies = [ "once_cell", "relm4", @@ -1986,9 +2278,9 @@ dependencies = [ [[package]] name = "relm4-icons" -version = "0.6.0-beta.6" +version = "0.7.0-alpha.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7123701f31271a2e33a53270a6e73010356d99cff1b97c89276299609af3303" +checksum = "f0d2413577ec528e0a4de8d05e7b1f6840e60f2cf14a70b16dfd8d862654c06c" dependencies = [ "gtk4", "gvdb", @@ -1996,20 +2288,20 @@ dependencies = [ [[package]] name = "relm4-macros" -version = "0.6.0-beta.1" +version = "0.7.0-rc.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fa06febb3685960e7c1c44e21e44a3829325940b31d1e91391a43c32020c201" +checksum = "830b999c06b80fc53dac4e1b20382fde949b15cfd3342e71f53fed5346237a4f" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.52", ] [[package]] name = "reqwest" -version = "0.11.14" +version = "0.11.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21eed90ec8570952d53b772ecf8f206aa1ec9a3d76b2521c56c42973f2d91ee9" +checksum = "c6920094eb85afde5e4a138be3f2de8bbdf28000f0029e72c45025a56b042251" dependencies = [ "base64", "bytes", @@ -2029,9 +2321,12 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", + "rustls-pemfile", "serde", "serde_json", "serde_urlencoded", + "sync_wrapper", + "system-configuration", "tokio", "tokio-native-tls", "tower-service", @@ -2043,6 +2338,12 @@ dependencies = [ ] [[package]] +name = "rustc-demangle" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" + +[[package]] name = "rustc_version" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2053,29 +2354,51 @@ dependencies = [ [[package]] name = "rustix" -version = "0.36.9" +version = "0.37.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd5c6ff11fecd55b40746d1995a02f2eb375bf8c00d192d521ee09f42bef37bc" +checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" dependencies = [ - "bitflags", + "bitflags 1.3.2", "errno", "io-lifetimes", "libc", - "linux-raw-sys", - "windows-sys 0.45.0", + "linux-raw-sys 0.3.8", + "windows-sys 0.48.0", +] + +[[package]] +name = "rustix" +version = "0.38.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" +dependencies = [ + "bitflags 2.4.2", + "errno", + "libc", + "linux-raw-sys 0.4.13", + "windows-sys 0.52.0", +] + +[[package]] +name = "rustls-pemfile" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" +dependencies = [ + "base64", ] [[package]] name = "rustversion" -version = "1.0.12" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06" +checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" [[package]] name = "ryu" -version = "1.0.13" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" +checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" [[package]] name = "safe-transmute" @@ -2094,32 +2417,26 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.21" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" +checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" dependencies = [ - "windows-sys 0.42.0", + "windows-sys 0.52.0", ] [[package]] name = "scopeguard" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" - -[[package]] -name = "scratch" -version = "1.0.5" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "security-framework" -version = "2.8.2" +version = "2.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a332be01508d814fed64bf28f798a146d73792121129962fdf335bb3c49a4254" +checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" dependencies = [ - "bitflags", + "bitflags 1.3.2", "core-foundation", "core-foundation-sys", "libc", @@ -2128,9 +2445,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.8.0" +version = "2.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31c9bb296072e961fcbd8853511dd39c2d8be2deb1e17c6860b1d30732b323b4" +checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" dependencies = [ "core-foundation-sys", "libc", @@ -2138,35 +2455,35 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.17" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" +checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" [[package]] name = "serde" -version = "1.0.156" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "314b5b092c0ade17c00142951e50ced110ec27cea304b1037c6969246c2469a4" +checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.156" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7e29c4601e36bcec74a223228dce795f4cd3616341a4af93520ca1a837c087d" +checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.52", ] [[package]] name = "serde_json" -version = "1.0.94" +version = "1.0.114" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c533a59c9d8a93a09c6ab31f0fd5e5f4dd1b8fc9434804029839884765d04ea" +checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" dependencies = [ "itoa", "ryu", @@ -2175,13 +2492,22 @@ dependencies = [ [[package]] name = "serde_repr" -version = "0.1.11" +version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "395627de918015623b32e7669714206363a7fc00382bf477e72c1f7533e8eafc" +checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.52", +] + +[[package]] +name = "serde_spanned" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" +dependencies = [ + "serde", ] [[package]] @@ -2198,9 +2524,9 @@ dependencies = [ [[package]] name = "sha1" -version = "0.10.5" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" dependencies = [ "cfg-if", "cpufeatures", @@ -2209,9 +2535,9 @@ dependencies = [ [[package]] name = "sha2" -version = "0.10.6" +version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" dependencies = [ "cfg-if", "cpufeatures", @@ -2219,35 +2545,54 @@ dependencies = [ ] [[package]] +name = "signal-hook-registry" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +dependencies = [ + "libc", +] + +[[package]] name = "slab" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" dependencies = [ "autocfg", ] [[package]] name = "smallvec" -version = "1.10.0" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "socket2" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" +checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" dependencies = [ "libc", "winapi", ] [[package]] +name = "socket2" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] name = "spin" -version = "0.9.6" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5d6e0250b93c8427a177b849d144a96d5acc57006149479403d7861ab721e34" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" dependencies = [ "lock_api", ] @@ -2259,32 +2604,38 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[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" +version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f" +checksum = "723b93e8addf9aa965ebe2d11da6d7540fa2283fcea14b3371ff055f7ba13f5f" dependencies = [ "strum_macros", ] [[package]] name = "strum_macros" -version = "0.24.3" +version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" +checksum = "7a3417fc93d76740d974a01654a09777cb500428cc874ca9f45edfe0c4d4cd18" dependencies = [ "heck", "proc-macro2", "quote", "rustversion", - "syn", + "syn 2.0.52", ] [[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" @@ -2298,22 +2649,59 @@ dependencies = [ ] [[package]] +name = "syn" +version = "2.0.52" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b699d15b36d1f02c3e7c69f8ffef53de37aefae075d8488d4ba1a7788d574a07" +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 = "synstructure" -version = "0.12.6" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" +checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn", - "unicode-xid", + "syn 2.0.52", +] + +[[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.0.3" +version = "6.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2955b1fe31e1fa2fbd1976b71cc69a606d7d4da16f6de3333d0c92d51419aeff" +checksum = "2a2d580ff6a20c55dfb86be5f9c238f67835d0e81cbdea8bf5680e0897320331" dependencies = [ "cfg-expr", "heck", @@ -2323,64 +2711,52 @@ dependencies = [ ] [[package]] -name = "tempfile" -version = "3.4.0" +name = "target-lexicon" +version = "0.12.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af18f7ae1acd354b992402e9ec5864359d693cd8a79dcbef59f76891701c1e95" -dependencies = [ - "cfg-if", - "fastrand", - "redox_syscall", - "rustix", - "windows-sys 0.42.0", -] +checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" [[package]] -name = "termcolor" -version = "1.2.0" +name = "tempfile" +version = "3.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" dependencies = [ - "winapi-util", + "cfg-if", + "fastrand 2.0.1", + "rustix 0.38.31", + "windows-sys 0.52.0", ] [[package]] name = "thiserror" -version = "1.0.39" +version = "1.0.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5ab016db510546d856297882807df8da66a16fb8c4101cb8b30054b0d5b2d9c" +checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.39" +version = "1.0.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5420d42e90af0c38c3290abcca25b9b3bdf379fc9f55c528f53a269d9c9a267e" +checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.52", ] [[package]] name = "time" -version = "0.1.45" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" -dependencies = [ - "libc", - "wasi 0.10.0+wasi-snapshot-preview1", - "winapi", -] - -[[package]] -name = "time" -version = "0.3.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd0cbfecb4d19b5ea75bb31ad904eb5b9fa13f21079c3b92017ebdf4999a5890" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ + "deranged", + "num-conv", + "powerfmt", "serde", "time-core", "time-macros", @@ -2388,16 +2764,17 @@ dependencies = [ [[package]] name = "time-core" -version = "0.1.0" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.8" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd80a657e71da814b8e5d60d3374fc6d35045062245d80224748ae522dd76f36" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" dependencies = [ + "num-conv", "time-core", ] @@ -2418,32 +2795,32 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.26.0" +version = "1.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03201d01c3c27a29c8a5cee5b55a93ddae1ccf6f08f65365c2c918f8c1b76f64" +checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931" dependencies = [ - "autocfg", + "backtrace", "bytes", "libc", - "memchr", "mio", "num_cpus", "pin-project-lite", - "socket2", + "signal-hook-registry", + "socket2 0.5.6", "tokio-macros", "tracing", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] name = "tokio-macros" -version = "1.8.2" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8" +checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.52", ] [[package]] @@ -2458,9 +2835,9 @@ dependencies = [ [[package]] name = "tokio-stream" -version = "0.1.12" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fb52b74f05dbf495a8fba459fdc331812b96aa086d9eb78101fa0d4569c3313" +checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" dependencies = [ "futures-core", "pin-project-lite", @@ -2469,9 +2846,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.7" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5427d89453009325de0d8f342c9490009f76e999cb7672d77e46267448f7e6b2" +checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" dependencies = [ "bytes", "futures-core", @@ -2483,26 +2860,45 @@ dependencies = [ [[package]] name = "toml" -version = "0.5.11" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" +checksum = "185d8ab0dfbb35cf1399a6344d8484209c088f75f8f68230da55d48d95d43e3d" dependencies = [ "serde", + "serde_spanned", + "toml_datetime", + "toml_edit 0.20.2", ] [[package]] name = "toml_datetime" -version = "0.6.1" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +dependencies = [ + "indexmap", + "toml_datetime", + "winnow", +] [[package]] name = "toml_edit" -version = "0.19.7" +version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc18466501acd8ac6a3f615dd29a3438f8ca6bb3b19537138b3106e575621274" +checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338" dependencies = [ "indexmap", + "serde", + "serde_spanned", "toml_datetime", "winnow", ] @@ -2515,11 +2911,10 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" [[package]] name = "tracing" -version = "0.1.37" +version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ - "cfg-if", "pin-project-lite", "tracing-attributes", "tracing-core", @@ -2527,115 +2922,111 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.23" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.52", ] [[package]] name = "tracing-core" -version = "0.1.30" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" dependencies = [ "once_cell", ] [[package]] name = "tracker" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4948dd579c7facd8b583a8838956177740021c7bbcc1074ff49f7a5e76a150fd" +checksum = "ff9636d15e370187f6bf55b79ce62ebf4221998bc0ba1774d7fa208b007f6bf8" dependencies = [ "tracker-macros", ] [[package]] name = "tracker-macros" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32b086e6cb7f65c79bc0b132db4e468c4159133c917da44e1b97594101e9e7e0" +checksum = "ca029746fbe0efda3298205de77bf759d7fef23ac97902641e0b49a623b0455f" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.52", ] [[package]] name = "try-lock" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "typenum" -version = "1.16.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "uds_windows" -version = "1.0.2" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce65604324d3cce9b966701489fbd0cf318cb1f7bd9dd07ac9a4ee6fb791930d" +checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9" dependencies = [ + "memoffset 0.9.0", "tempfile", "winapi", ] [[package]] name = "unicode-bidi" -version = "0.3.11" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524b68aca1d05e03fdf03fcdce2c6c94b6daf6d16861ddaa7e4f2b6638a9052c" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" [[package]] name = "unicode-ident" -version = "1.0.8" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" dependencies = [ "tinyvec", ] [[package]] -name = "unicode-width" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" - -[[package]] -name = "unicode-xid" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" - -[[package]] name = "url" -version = "2.3.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" +checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" dependencies = [ "form_urlencoded", "idna", "percent-encoding", + "serde", ] [[package]] +name = "utf8parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + +[[package]] name = "uuid" -version = "1.3.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1674845326ee10d37ca60470760d4288a6f80f304007d92e5c53bab78c9cfd79" +checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a" dependencies = [ "getrandom", ] @@ -2660,15 +3051,15 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "waker-fn" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" +checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" [[package]] name = "walkdir" -version = "2.3.3" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" dependencies = [ "same-file", "winapi-util", @@ -2676,31 +3067,24 @@ dependencies = [ [[package]] name = "want" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" dependencies = [ - "log", "try-lock", ] [[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.84" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" +checksum = "c1e124130aee3fb58c5bdd6b639a0509486b0338acaaae0c84a5124b0f588b7f" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -2708,24 +3092,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.84" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" +checksum = "c9e7e1900c352b609c8488ad12639a311045f40a35491fb69ba8c12f758af70b" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn", + "syn 2.0.52", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.34" +version = "0.4.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f219e0d211ba40266969f6dbdd90636da12f75bee4fc9d6c23d1260dadb51454" +checksum = "877b9c3f61ceea0e56331985743b13f3d25c406a7098d45180fb5f09bc19ed97" dependencies = [ "cfg-if", "js-sys", @@ -2735,9 +3119,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.84" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" +checksum = "b30af9e2d358182b5c7449424f017eba305ed32a7010509ede96cdc4696c46ed" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -2745,28 +3129,29 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.84" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" +checksum = "642f325be6301eb8107a83d12a8ac6c1e1c54345a7ef1a9261962dfefda09e66" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.52", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.84" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" +checksum = "4f186bd2dcf04330886ce82d6f33dd75a7bfcf69ecf5763b89fcde53b6ac9838" [[package]] name = "watchmate" -version = "0.4.4" +version = "0.5.2" dependencies = [ "anyhow", + "ashpd", "env_logger", "futures", "infinitime", @@ -2779,9 +3164,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.61" +version = "0.3.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97" +checksum = "96565907687f7aceb35bc5fc03770a8a0471d82e479f25832f54a0e3f4b28446" dependencies = [ "js-sys", "wasm-bindgen", @@ -2805,9 +3190,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", ] @@ -2819,129 +3204,200 @@ 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.4", +] + +[[package]] name = "windows-sys" -version = "0.42.0" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" 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", + "windows-targets 0.48.5", ] [[package]] name = "windows-sys" -version = "0.45.0" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets", + "windows-targets 0.52.4", ] [[package]] name = "windows-targets" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +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", + "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.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" +dependencies = [ + "windows_aarch64_gnullvm 0.52.4", + "windows_aarch64_msvc 0.52.4", + "windows_i686_gnu 0.52.4", + "windows_i686_msvc 0.52.4", + "windows_x86_64_gnu 0.52.4", + "windows_x86_64_gnullvm 0.52.4", + "windows_x86_64_msvc 0.52.4", ] [[package]] name = "windows_aarch64_gnullvm" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" [[package]] name = "windows_aarch64_msvc" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" [[package]] name = "windows_i686_gnu" -version = "0.42.2" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.42.2" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" +checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" [[package]] name = "windows_x86_64_gnu" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" + +[[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.42.2" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" +checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" [[package]] name = "windows_x86_64_msvc" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" [[package]] name = "winnow" -version = "0.3.6" +version = "0.5.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23d020b441f92996c80d94ae9166e8501e59c7bb56121189dc9eab3bd8216966" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" dependencies = [ "memchr", ] [[package]] name = "winreg" -version = "0.10.1" +version = "0.50.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + +[[package]] +name = "xdg-home" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" +checksum = "21e5a325c3cb8398ad6cf859c1135b25dd29e186679cf2da7581d9679f63b38e" dependencies = [ + "libc", "winapi", ] [[package]] name = "zbus" -version = "3.11.0" +version = "3.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20aae5dd5b051971cd2f49f9f3b860e57b2b495ba5ba254eaec42d34ede57e97" +checksum = "675d170b632a6ad49804c8cf2105d7c31eddd3312555cffd4b740e08e97c25e6" dependencies = [ "async-broadcast", "async-executor", "async-fs", - "async-io", - "async-lock", + "async-io 1.13.0", + "async-lock 2.8.0", + "async-process", "async-recursion", "async-task", "async-trait", + "blocking", "byteorder", "derivative", - "dirs", "enumflags2", - "event-listener", + "event-listener 2.5.3", "futures-core", "futures-sink", "futures-util", "hex", - "lazy_static", - "nix", + "nix 0.26.4", "once_cell", "ordered-stream", "rand", @@ -2953,6 +3409,7 @@ dependencies = [ "tracing", "uds_windows", "winapi", + "xdg-home", "zbus_macros", "zbus_names", "zvariant", @@ -2960,23 +3417,23 @@ dependencies = [ [[package]] name = "zbus_macros" -version = "3.11.0" +version = "3.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9264b3a1bcf5503d4e0348b6e7efe1da58d4f92a913c15ed9e63b52de85faaa1" +checksum = "7131497b0f887e8061b430c530240063d33bf9455fa34438f388a245da69e0a5" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 1.3.1", "proc-macro2", "quote", "regex", - "syn", + "syn 1.0.109", "zvariant_utils", ] [[package]] name = "zbus_names" -version = "2.5.0" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f34f314916bd89bdb9934154627fab152f4f28acdda03e7c4c68181b214fe7e3" +checksum = "437d738d3750bed6ca9b8d423ccc7a8eb284f6b1d6d4e225a0e4e6258d864c8d" dependencies = [ "serde", "static_assertions", @@ -2985,9 +3442,9 @@ dependencies = [ [[package]] name = "zip" -version = "0.6.4" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0445d0fbc924bb93539b4316c11afb121ea39296f99a3c4c9edad09e3658cdef" +checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261" dependencies = [ "aes", "byteorder", @@ -2999,7 +3456,7 @@ dependencies = [ "hmac", "pbkdf2", "sha1", - "time 0.3.20", + "time", "zstd", ] @@ -3024,49 +3481,49 @@ dependencies = [ [[package]] name = "zstd-sys" -version = "2.0.7+zstd.1.5.4" +version = "2.0.9+zstd.1.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94509c3ba2fe55294d752b79842c530ccfab760192521df74a081a78d2b3c7f5" +checksum = "9e16efa8a874a0481a574084d34cc26fdb3b99627480f785888deb6386506656" dependencies = [ "cc", - "libc", "pkg-config", ] [[package]] name = "zvariant" -version = "3.12.0" +version = "3.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46fe4914a985446d6fd287019b5fceccce38303d71407d9e6e711d44954a05d8" +checksum = "4eef2be88ba09b358d3b58aca6e41cd853631d44787f319a1383ca83424fb2db" dependencies = [ "byteorder", "enumflags2", "libc", "serde", "static_assertions", + "url", "zvariant_derive", ] [[package]] name = "zvariant_derive" -version = "3.12.0" +version = "3.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34c20260af4b28b3275d6676c7e2a6be0d4332e8e0aba4616d34007fd84e462a" +checksum = "37c24dc0bed72f5f90d1f8bb5b07228cbf63b3c6e9f82d82559d4bae666e7ed9" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 1.3.1", "proc-macro2", "quote", - "syn", + "syn 1.0.109", "zvariant_utils", ] [[package]] name = "zvariant_utils" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53b22993dbc4d128a17a3b6c92f1c63872dd67198537ee728d8b5d7c40640a8b" +checksum = "7234f0d811589db492d16893e3f21e8e2fd282e6d01b0cddee310322062cc200" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] diff --git a/pkgs/applications/misc/watchmate/default.nix b/pkgs/applications/misc/watchmate/default.nix index c668aea455317..eebcc3cce0118 100644 --- a/pkgs/applications/misc/watchmate/default.nix +++ b/pkgs/applications/misc/watchmate/default.nix @@ -1,61 +1,66 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, pkg-config -, gtk4 -, libadwaita -, bluez -, dbus -, openssl -, wrapGAppsHook4 -, glib -}: +{ + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + gtk4, + libadwaita, + bluez, + dbus, + openssl, + wrapGAppsHook4, + glib, +}: let + releaseVersion = "0.5.2"; +in + rustPlatform.buildRustPackage rec { + pname = "watchmate"; + version = "${releaseVersion}-unstable-2024-08-13"; -rustPlatform.buildRustPackage rec { - pname = "watchmate"; - version = "0.4.5"; - - src = fetchFromGitHub { - owner = "azymohliad"; - repo = "watchmate"; - rev = "v${version}"; - hash = "sha256-4L9mfZWphwXON8VgRcGrz+k62wyPzd1phtRu9HQnVdE="; - }; + src = fetchFromGitHub { + owner = "azymohliad"; + repo = "watchmate"; + rev = "e05edfae94a1973110c6f40f25133d5979f485ab"; + hash = "sha256-fHWxn7hFx/9cnLlCHIC6hIJaLd1U3Ii9mJgTJ+Hw63M="; + }; - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "mpris2-zbus-0.1.0" = "sha256-f2hth7TnA14I4UPyp0u4IfMi9WY4G3M1sEc4xNtnbr0="; + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "mpris2-zbus-0.1.0" = "sha256-a/cvbB0M9cUd8RP5XxgHRbJ/i/UKAEK4DTwwUU69IuY="; + }; }; - }; - nativeBuildInputs = [ - pkg-config - wrapGAppsHook4 - glib - ]; - buildInputs = [ - gtk4 - libadwaita - bluez - dbus - openssl - ]; + nativeBuildInputs = [ + pkg-config + wrapGAppsHook4 + glib + ]; - postInstall = '' - install -Dm444 assets/io.gitlab.azymohliad.WatchMate.desktop -t $out/share/applications/ - install -Dm444 assets/io.gitlab.azymohliad.WatchMate.metainfo.xml -t $out/share/metainfo/ - install -Dm444 assets/icons/io.gitlab.azymohliad.WatchMate.svg -t $out/share/icons/hicolor/scalable/apps/ - install -Dm444 assets/icons/io.gitlab.azymohliad.WatchMate-symbolic.svg -t $out/share/icons/hicolor/scalable/apps/ - ''; + buildInputs = [ + gtk4 + libadwaita + bluez + dbus + openssl + ]; - meta = with lib; { - description = "PineTime smart watch companion app for Linux phone and desktop"; - mainProgram = "watchmate"; - homepage = "https://github.com/azymohliad/watchmate"; - changelog = "https://github.com/azymohliad/watchmate/raw/v${version}/CHANGELOG.md"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ chuangzhu ]; - platforms = platforms.linux; - }; -} + postInstall = '' + install -Dm444 assets/io.gitlab.azymohliad.WatchMate.desktop -t $out/share/applications/ + install -Dm444 assets/io.gitlab.azymohliad.WatchMate.metainfo.xml -t $out/share/metainfo/ + install -Dm444 assets/io.gitlab.azymohliad.WatchMate.gschema.xml -t $out/share/glib-2.0/schemas/ + glib-compile-schemas $out/share/glib-2.0/schemas/ + install -Dm444 assets/icons/io.gitlab.azymohliad.WatchMate.svg -t $out/share/icons/hicolor/scalable/apps/ + install -Dm444 assets/icons/io.gitlab.azymohliad.WatchMate-symbolic.svg -t $out/share/icons/hicolor/scalable/apps/ + ''; + + meta = with lib; { + description = "PineTime smart watch companion app for Linux phone and desktop"; + mainProgram = "watchmate"; + homepage = "https://github.com/azymohliad/watchmate"; + changelog = "https://github.com/azymohliad/watchmate/raw/v${releaseVersion}/CHANGELOG.md"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [chuangzhu]; + platforms = platforms.linux; + }; + } diff --git a/pkgs/applications/misc/waypaper/default.nix b/pkgs/applications/misc/waypaper/default.nix index a8dae9664264b..924a7e766a70d 100644 --- a/pkgs/applications/misc/waypaper/default.nix +++ b/pkgs/applications/misc/waypaper/default.nix @@ -8,13 +8,14 @@ python3.pkgs.buildPythonApplication rec { pname = "waypaper"; - version = "2.1.2"; + version = "2.3"; + pyproject = true; src = fetchFromGitHub { owner = "anufrievroman"; repo = "waypaper"; rev = "refs/tags/${version}"; - hash = "sha256-GB+H2kZr1+UhhGFpfXc3V4DPXjvHBdg6EKNEFhjKEHk="; + hash = "sha256-ty3KiKkIyv6aqTua3YUB2smYJv7dXGPP5k3lXoxDzI0="; }; nativeBuildInputs = [ @@ -22,14 +23,17 @@ python3.pkgs.buildPythonApplication rec { wrapGAppsHook3 ]; - propagatedBuildInputs = [ + build-system = [ python3.pkgs.setuptools ]; + + dependencies = [ python3.pkgs.pygobject3 python3.pkgs.platformdirs python3.pkgs.importlib-metadata python3.pkgs.pillow - killall ]; + propagatedBuildInputs = [ killall ]; + # has no tests doCheck = false; diff --git a/pkgs/applications/misc/webfontkitgenerator/default.nix b/pkgs/applications/misc/webfontkitgenerator/default.nix index c4a3a7b86e98d..0849227180867 100644 --- a/pkgs/applications/misc/webfontkitgenerator/default.nix +++ b/pkgs/applications/misc/webfontkitgenerator/default.nix @@ -1,4 +1,5 @@ { appstream-glib +, blueprint-compiler , desktop-file-utils , fetchFromGitHub , gettext @@ -13,22 +14,24 @@ , ninja , pkg-config , python3 +, python3Packages , stdenv , wrapGAppsHook4 }: stdenv.mkDerivation (finalAttrs: { pname = "webfont-kit-generator"; - version = "1.0.3"; + version = "1.1.1"; src = fetchFromGitHub { owner = "rafaelmardojai"; repo = "webfont-kit-generator"; rev = finalAttrs.version; - hash = "sha256-aD/1moWIiU4zpLTW+VHH9n/sj10vCZ8UzB2ey3mR0/k="; + hash = "sha256-RrmzHgRnpgQUNECgYA/AJfoxKpX1HQ5I1Pqjb3MK+P4="; }; nativeBuildInputs = [ appstream-glib + blueprint-compiler desktop-file-utils gettext gobject-introspection @@ -46,11 +49,17 @@ stdenv.mkDerivation (finalAttrs: { libadwaita libsoup_3 (python3.withPackages (ps: with ps; [ + brotli fonttools pygobject3 ])) ]; + propagatedBuildInputs = [ + python3Packages.pygobject3 + python3Packages.brotli + ]; + meta = with lib; { description = "Webfont Kit Generator is a simple utility that allows you to generate woff, woff2 and the necessary CSS boilerplate from non-web font formats (otf & ttf)"; mainProgram = "webfontkitgenerator"; diff --git a/pkgs/applications/misc/wego/default.nix b/pkgs/applications/misc/wego/default.nix index 3ff6a7279ad63..ab7debc5d22e7 100644 --- a/pkgs/applications/misc/wego/default.nix +++ b/pkgs/applications/misc/wego/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "wego"; - version = "2.2"; + version = "2.3"; src = fetchFromGitHub { owner = "schachmat"; repo = pname; rev = version; - sha256 = "sha256-bkbH3RewlYYNamAhAZGWQmzNdGB06K3m/D8ScsQP9ic="; + sha256 = "sha256-YGUll0Wi/oulNMXSrSFeAVe+aGpyFeyXRZTW4ngC3Zk="; }; vendorHash = "sha256-aXrXw/7ZtSZXIKDMZuWPV2zAf0e0lU0QCBhua7tHGEY="; diff --git a/pkgs/applications/misc/whalebird/default.nix b/pkgs/applications/misc/whalebird/default.nix index 15bd937506ee0..e46a1af85c82b 100644 --- a/pkgs/applications/misc/whalebird/default.nix +++ b/pkgs/applications/misc/whalebird/default.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { yarn run nextron build --no-pack yarn run electron-builder --dir \ --config electron-builder.yml \ - -c.electronDist="${electron}/libexec/electron" \ + -c.electronDist="${electron.dist}" \ -c.electronVersion=${electron.version} runHook postBuild diff --git a/pkgs/applications/misc/with-shell/default.nix b/pkgs/applications/misc/with-shell/default.nix deleted file mode 100644 index acfe547f1470a..0000000000000 --- a/pkgs/applications/misc/with-shell/default.nix +++ /dev/null @@ -1,77 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, installShellFiles -}: - -stdenv.mkDerivation rec { - pname = "with"; - version = "unstable-2018-03-20"; - - src = fetchFromGitHub { - owner = "mchav"; - repo = "With"; - rev = "28eb40bbc08d171daabf0210f420477ad75e16d6"; - hash = "sha256-mKHsLHs9/I+NUdb1t9wZWkPxXcsBlVWSj8fgZckXFXk="; - }; - - nativeBuildInputs = [ installShellFiles ]; - - installPhase = '' - runHook preInstall - install -D with $out/bin/with - installShellCompletion --bash --name with.bash with.bash-completion - runHook postInstall - ''; - - meta = with lib; { - homepage = "https://github.com/mchav/With"; - description = "Command prefixing for continuous workflow using a single tool"; - longDescription = '' - with is a Bash script that starts an interactive shell with where every - command is prefixed using <program>. - - For example: - - $ with git - git> add . - git> commit -a -m "Committed" - git> push - - Can also be used for compound commands. - - $ with java Primes - java Primes> 1 - 2 - java Primes> 4 - 7 - - And to repeat commands: - - $ with gcc -o output input.c - gcc -o -output input.c> - <enter> - Compiling... - gcc -o -output input.c> - - To execute a shell command proper prefix line with :. - - git> :ls - - You can also drop, add, and replace different commands. - - git> +add - git add> <some file> - git add> !commit - git commit> <arguments and message> - git commit> - - git> - - To exit use either :q or :exit. - ''; - license = licenses.asl20; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.unix; - mainProgram = "with"; - }; -} diff --git a/pkgs/applications/misc/wmenu/default.nix b/pkgs/applications/misc/wmenu/default.nix index c443791848621..ada289ad49614 100644 --- a/pkgs/applications/misc/wmenu/default.nix +++ b/pkgs/applications/misc/wmenu/default.nix @@ -1,6 +1,6 @@ { lib , stdenv -, fetchFromSourcehut +, fetchFromGitea , pkg-config , meson , ninja @@ -15,15 +15,16 @@ stdenv.mkDerivation rec { pname = "wmenu"; - version = "0.1.8"; + version = "0.1.9"; strictDeps = true; - src = fetchFromSourcehut { - owner = "~adnano"; + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "adnano"; repo = "wmenu"; rev = version; - hash = "sha256-gVoqRHQ5bcY58LTgKxpPM1PnZJrLRoSOJUiYYqc/vRI="; + hash = "sha256-TF5BvgThvTOqxyfz5Zt/Z1cqjFJwvla+dgdyvz7Zhrg="; }; nativeBuildInputs = [ pkg-config meson ninja wayland-scanner ]; @@ -31,7 +32,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Efficient dynamic menu for Sway and wlroots based Wayland compositors"; - homepage = "https://git.sr.ht/~adnano/wmenu"; + homepage = "https://codeberg.org/adnano/wmenu"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ eken ]; diff --git a/pkgs/applications/misc/wofi/default.nix b/pkgs/applications/misc/wofi/default.nix index c6ad0199e51fb..2884f0072a08c 100644 --- a/pkgs/applications/misc/wofi/default.nix +++ b/pkgs/applications/misc/wofi/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { description = "Launcher/menu program for wlroots based wayland compositors such as sway"; homepage = "https://hg.sr.ht/~scoopta/wofi"; license = licenses.gpl3Only; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ aleksana ]; platforms = with platforms; linux; mainProgram = "wofi"; }; diff --git a/pkgs/applications/misc/wordnet/default.nix b/pkgs/applications/misc/wordnet/default.nix index fccd7585e41e3..5ed42ab1fc298 100644 --- a/pkgs/applications/misc/wordnet/default.nix +++ b/pkgs/applications/misc/wordnet/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ tcl tk ] - ++ lib.optionals stdenv.isDarwin [ Cocoa ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/misc/workrave/default.nix b/pkgs/applications/misc/workrave/default.nix index 1235b22b8aba1..869f7c63712c7 100644 --- a/pkgs/applications/misc/workrave/default.nix +++ b/pkgs/applications/misc/workrave/default.nix @@ -40,8 +40,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { repo = "workrave"; owner = "rcaelers"; - rev = with lib; - "v" + concatStringsSep "_" (splitVersion version); + rev = "v" + lib.concatStringsSep "_" (lib.splitVersion version); sha256 = "sha256-U39zr8XGIDbyY480bla2yTaRQLP3wMrL8RLWjlTa5uY="; }; @@ -86,7 +85,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); description = "Program to help prevent Repetitive Strain Injury"; mainProgram = "workrave"; longDescription = '' diff --git a/pkgs/applications/misc/writefreely/default.nix b/pkgs/applications/misc/writefreely/default.nix index d505ae2e380a0..0f8d3b6fac292 100644 --- a/pkgs/applications/misc/writefreely/default.nix +++ b/pkgs/applications/misc/writefreely/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: buildGoModule rec { pname = "writefreely"; @@ -23,6 +23,8 @@ buildGoModule rec { subPackages = [ "cmd/writefreely" ]; + passthru.tests = { inherit (nixosTests) writefreely; }; + meta = with lib; { description = "Build a digital writing community"; homepage = "https://github.com/writefreely/writefreely"; diff --git a/pkgs/applications/misc/wtf/default.nix b/pkgs/applications/misc/wtf/default.nix index 5c130bb069821..e75ae315a557c 100644 --- a/pkgs/applications/misc/wtf/default.nix +++ b/pkgs/applications/misc/wtf/default.nix @@ -3,7 +3,6 @@ , lib , makeWrapper , ncurses -, stdenv }: buildGoModule rec { diff --git a/pkgs/applications/misc/wthrr/default.nix b/pkgs/applications/misc/wthrr/default.nix index 5b3c6d2cd17ab..df95d41738e45 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 @@ -26,9 +26,10 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.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/xca/default.nix b/pkgs/applications/misc/xca/default.nix index fb0bf3063bbcf..2ddb36a87de80 100644 --- a/pkgs/applications/misc/xca/default.nix +++ b/pkgs/applications/misc/xca/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "xca"; - version = "2.6.0"; + version = "2.7.0"; src = fetchFromGitHub { owner = "chris2511"; repo = "xca"; rev = "RELEASE.${finalAttrs.version}"; - hash = "sha256-E0Ap+JDK/oYTG+uaRHsdOxyLIywlYJ01T4ANQhNH220="; + hash = "sha256-Ty6j0Fl2smMGxp+1nnD3Fu83bn19gqtRKSA1wDgNZes="; }; buildInputs = [ openssl qtbase ]; diff --git a/pkgs/applications/misc/xdgmenumaker/default.nix b/pkgs/applications/misc/xdgmenumaker/default.nix index f2953805ff29c..52a7b95bb8039 100644 --- a/pkgs/applications/misc/xdgmenumaker/default.nix +++ b/pkgs/applications/misc/xdgmenumaker/default.nix @@ -12,13 +12,13 @@ python3Packages.buildPythonApplication rec { pname = "xdgmenumaker"; - version = "2.1"; + version = "2.3"; src = fetchFromGitHub { owner = "gapan"; repo = pname; rev = version; - sha256 = "K+IecWWRjnY/5TBJydTuEPqNRSg1OIE1t0u6HkLS9uI="; + sha256 = "uSSKiceHurk+qGVnaYa4uJEuq9FQROdhcotQxPBgPIs="; }; format = "other"; diff --git a/pkgs/applications/misc/xfontsel/default.nix b/pkgs/applications/misc/xfontsel/default.nix index 5bfdb209c1ff1..203b94b0845fa 100644 --- a/pkgs/applications/misc/xfontsel/default.nix +++ b/pkgs/applications/misc/xfontsel/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { description = "Allows testing the fonts available in an X server"; mainProgram = "xfontsel"; license = with licenses; [ x11 smlnj mit ]; - maintainers = with maintainers; [ viric ]; + maintainers = [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/misc/xiphos/0001-Add-dbus-glib-dependency-to-main.patch b/pkgs/applications/misc/xiphos/0001-Add-dbus-glib-dependency-to-main.patch deleted file mode 100644 index 71cb57ccef188..0000000000000 --- a/pkgs/applications/misc/xiphos/0001-Add-dbus-glib-dependency-to-main.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 0e9e686c902935c0f00afdf9d0d45f9635995988 Mon Sep 17 00:00:00 2001 -From: Jan Tojnar <jtojnar@gmail.com> -Date: Sat, 15 Jan 2022 05:00:37 +0100 -Subject: [PATCH] Add dbus-glib dependency to main - -It is required through the ipc header and the build will fail without it on Nix: - - In file included from /build/source/src/main/search_sidebar.cc:48: - /build/source/src/gui/ipc.h:26:10: fatal error: dbus/dbus-glib.h: No such file or directory - 26 | #include <dbus/dbus-glib.h> - | ^~~~~~~~~~~~~~~~~~ - compilation terminated. ---- - src/main/CMakeLists.txt | 11 +++++++++++ - 1 file changed, 11 insertions(+) - -diff --git a/src/main/CMakeLists.txt b/src/main/CMakeLists.txt -index 49b86371..bb8e4bb6 100644 ---- a/src/main/CMakeLists.txt -+++ b/src/main/CMakeLists.txt -@@ -74,3 +74,14 @@ target_link_libraries(main - PkgConfig::Sword - PkgConfig::Biblesync - ) -+ -+IF (DBUS) -+ target_include_directories (main -+ PRIVATE ${CMAKE_CURRENT_BINARY_DIR} -+ PkgConfig::DBus -+ ) -+ target_link_libraries(main -+ PRIVATE -+ PkgConfig::DBus -+ ) -+ENDIF (DBUS) --- -2.34.1 - diff --git a/pkgs/applications/misc/xiphos/default.nix b/pkgs/applications/misc/xiphos/default.nix deleted file mode 100644 index d3aaa70fc9af1..0000000000000 --- a/pkgs/applications/misc/xiphos/default.nix +++ /dev/null @@ -1,112 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, fetchpatch -, appstream-glib -, biblesync -, cmake -, dbus-glib -, desktop-file-utils -, docbook2x -, docbook_xml_dtd_412 -, enchant2 -, glib -, gtk3 -, gtkhtml -, icu -, intltool -, isocodes -, itstool -, libuuid -, libxslt -, minizip -, pkg-config -, sword -, webkitgtk -, wrapGAppsHook3 -, yelp-tools -, zip -}: - -stdenv.mkDerivation rec { - pname = "xiphos"; - version = "4.2.1"; - - src = fetchFromGitHub { - owner = "crosswire"; - repo = "xiphos"; - rev = version; - hash = "sha256-H5Q+azE2t3fgu77C9DxrkeUCJ7iJz3Cc91Ln4dqLvD8="; - }; - - patches = [ - # GLIB_VERSION_MIN_REQUIRED is not defined. - # https://github.com/crosswire/xiphos/issues/1083#issuecomment-820304874 - (fetchpatch { - name ="xiphos-glibc.patch"; - url = "https://aur.archlinux.org/cgit/aur.git/plain/xiphos-glibc.patch?h=xiphos&id=bb816f43ba764ffac1287ab1e2a649c2443e3ce8"; - sha256 = "he3U7phU2/QCrZidHviupA7YwzudnQ9Jbb8eMZw6/ck="; - extraPrefix = ""; - }) - - # Fix D-Bus build - # https://github.com/crosswire/xiphos/pull/1103 - ./0001-Add-dbus-glib-dependency-to-main.patch - ]; - - nativeBuildInputs = [ - appstream-glib # for appstream-util - cmake - desktop-file-utils # for desktop-file-validate - docbook2x - docbook_xml_dtd_412 - intltool - itstool - libxslt - pkg-config - wrapGAppsHook3 - yelp-tools # for yelp-build - zip # for building help epubs - ]; - - buildInputs = [ - biblesync - dbus-glib - enchant2 - glib - gtk3 - gtkhtml - icu - isocodes - libuuid - minizip - sword - webkitgtk - ]; - - cmakeFlags = [ - # WebKit-based editor does not build. - "-DGTKHTML=ON" - ]; - - preConfigure = '' - # The build script won't continue without the version saved locally. - echo "${version}" > cmake/source_version.txt - - export SWORD_HOME=${sword}; - ''; - - meta = with lib; { - description = "GTK Bible study tool"; - longDescription = '' - Xiphos (formerly known as GnomeSword) is a Bible study tool - written for Linux, UNIX, and Windows using GTK, offering a rich - and featureful environment for reading, study, and research using - modules from The SWORD Project and elsewhere. - ''; - homepage = "https://www.xiphos.org/"; - license = licenses.gpl2Plus; - maintainers = [ maintainers.AndersonTorres ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/misc/xmr-stak/default.nix b/pkgs/applications/misc/xmr-stak/default.nix deleted file mode 100644 index 81f35447863cf..0000000000000 --- a/pkgs/applications/misc/xmr-stak/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ stdenv, lib, fetchpatch -, fetchFromGitHub, cmake, libmicrohttpd, openssl -, opencl-headers, ocl-icd, hwloc -, devDonationLevel ? "0.0" -, openclSupport ? true -}: - -stdenv.mkDerivation rec { - pname = "xmr-stak"; - version = "2.10.8"; - - src = fetchFromGitHub { - owner = "fireice-uk"; - repo = "xmr-stak"; - rev = version; - sha256 = "0ilx5mhh91ks7dwvykfyynh53l6vkkignjpwkkss8ss6b2k8gdbj"; - }; - - env.NIX_CFLAGS_COMPILE = "-O3"; - - patches = [ (fetchpatch { - name = "fix-libmicrohttpd-0-9-71.patch"; - url = "https://github.com/fireice-uk/xmr-stak/compare/06e08780eab54dbc025ce3f38c948e4eef2726a0...8adb208987f5881946992ab9cd9a45e4e2a4b870.patch"; - excludes = [ "CMakeLists.txt.user" ]; - hash = "sha256-Yv0U5EO1P5eikn1fKvUXEwemoUIjjeTjpP9p5J8pbC0="; - }) ]; - - cmakeFlags = [ "-DCUDA_ENABLE=OFF" ] - ++ lib.optional (!openclSupport) "-DOpenCL_ENABLE=OFF"; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ libmicrohttpd openssl hwloc ] - ++ lib.optionals openclSupport [ opencl-headers ocl-icd ]; - - postPatch = '' - substituteInPlace xmrstak/donate-level.hpp \ - --replace 'fDevDonationLevel = 2.0' 'fDevDonationLevel = ${devDonationLevel}' - ''; - - meta = with lib; { - # Does not build against gcc-13. No development activity upstream - # for past few years. - broken = true; - description = "Unified All-in-one Monero miner"; - homepage = "https://github.com/fireice-uk/xmr-stak"; - license = licenses.gpl3Plus; - platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ bfortz ]; - }; -} diff --git a/pkgs/applications/misc/xmrig/default.nix b/pkgs/applications/misc/xmrig/default.nix index ff9965c3403db..9b46c65b80033 100644 --- a/pkgs/applications/misc/xmrig/default.nix +++ b/pkgs/applications/misc/xmrig/default.nix @@ -15,13 +15,13 @@ let in stdenv.mkDerivation rec { pname = "xmrig"; - version = "6.21.3"; + version = "6.22.0"; src = fetchFromGitHub { owner = "xmrig"; repo = "xmrig"; rev = "v${version}"; - hash = "sha256-1lIrxJ1Y5YRoXbZn77Msah5lSVW71gDczYUlXQjf01s="; + hash = "sha256-kFjUAOs92xExCV/ph81TFvgRXC6ZRi1m0G51c4JmeMA="; }; patches = [ @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { libmicrohttpd openssl hwloc - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Carbon CoreServices OpenCL diff --git a/pkgs/applications/misc/xmrig/moneroocean.nix b/pkgs/applications/misc/xmrig/moneroocean.nix index 47aee945971b5..34629c9fef727 100644 --- a/pkgs/applications/misc/xmrig/moneroocean.nix +++ b/pkgs/applications/misc/xmrig/moneroocean.nix @@ -1,37 +1,25 @@ { lib -, stdenv , fetchFromGitHub -, fetchpatch , xmrig }: xmrig.overrideAttrs (oldAttrs: rec { pname = "xmrig-mo"; - version = "6.21.0-mo2"; + version = "6.22.0-mo3"; src = fetchFromGitHub { owner = "MoneroOcean"; repo = "xmrig"; rev = "v${version}"; - hash = "sha256-OKyJcmhlY8gfDKyBf83KHhokp4qA8EDyessTwKReaD8="; + hash = "sha256-3KFyCs9Kf0i7IkG1piP/DRj1jTj1VmXbAk/U3Wt4jh0="; }; - patches = [ - # Fix build against gcc-13 due to missing <stdexcept> include - # https://github.com/MoneroOcean/xmrig/pull/123 - (fetchpatch { - name = "gcc-13.patch"; - url = "https://github.com/MoneroOcean/xmrig/commit/7d3ea51d68049c35e9d4c75732c751eefbc5ab29.patch"; - hash = "sha256-iNrtZ8LxNJMzn8kXLhYGEFAy0ughfOZobDVRImpVPC0="; - }) - ]; - meta = with lib; { description = "Fork of the XMRig CPU miner with support for algorithm switching"; homepage = "https://github.com/MoneroOcean/xmrig"; license = licenses.gpl3Plus; mainProgram = "xmrig"; platforms = platforms.unix; - maintainers = with maintainers; [ j0hax ]; + maintainers = with maintainers; [ j0hax redhawk ]; }; }) diff --git a/pkgs/applications/misc/xmrig/proxy.nix b/pkgs/applications/misc/xmrig/proxy.nix index 20d79d6c4ac0c..9efdbc700a646 100644 --- a/pkgs/applications/misc/xmrig/proxy.nix +++ b/pkgs/applications/misc/xmrig/proxy.nix @@ -13,13 +13,13 @@ let in stdenv.mkDerivation rec { pname = "xmrig-proxy"; - version = "6.21.1"; + version = "6.22.0"; src = fetchFromGitHub { owner = "xmrig"; repo = "xmrig-proxy"; rev = "v${version}"; - hash = "sha256-70SYdO3uyPINanAoARd2lDwyiuc2f/gg4QuoDgoXjjs="; + hash = "sha256-qRn/FiYvogGFUIUj3CojtfO6fXRZghH+bgRP+ysI6mc="; }; postPatch = '' @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { libuv libmicrohttpd openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices IOKit ]; diff --git a/pkgs/applications/misc/xpdf/default.nix b/pkgs/applications/misc/xpdf/default.nix index 38b92eb77b9f0..13b4097f8cdf2 100644 --- a/pkgs/applications/misc/xpdf/default.nix +++ b/pkgs/applications/misc/xpdf/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { # Fix "No known features for CXX compiler", see # https://cmake.org/pipermail/cmake/2016-December/064733.html and the note at # https://cmake.org/cmake/help/v3.10/command/cmake_minimum_required.html - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace CMakeLists.txt --replace \ 'cmake_minimum_required(VERSION 2.8.12)' 'cmake_minimum_required(VERSION 3.1.0)' ''; @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { categories = [ "Office" ]; }; - postInstall = lib.optionalString (!stdenv.isDarwin) '' + postInstall = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' install -Dm644 ${desktopItem}/share/applications/xpdf.desktop -t $out/share/applications install -Dm644 $src/xpdf-qt/xpdf-icon.svg $out/share/pixmaps/xpdf.svg ''; @@ -76,26 +76,14 @@ stdenv.mkDerivation rec { platforms = platforms.unix; maintainers = with maintainers; [ sikmir ]; knownVulnerabilities = [ - "CVE-2019-9587: loop in PDF objects" - "CVE-2019-9588: loop in PDF objects" - "CVE-2019-16088: loop in PDF objects" - "CVE-2022-38334" - "CVE-2022-38928" - "CVE-2022-41842" - "CVE-2022-41843" - "CVE-2022-43071" - "CVE-2022-43295" - "CVE-2022-45586" - "CVE-2022-45587" "CVE-2023-26930" - "CVE-2023-26931" - "CVE-2023-26934" - "CVE-2023-26935" - "CVE-2023-26936" - "CVE-2023-26937" - "CVE-2023-26938" - "CVE-2023-27655" - "CVE-2023-31557" + "CVE-2024-2971" + "CVE-2024-3247" + "CVE-2024-3248" + "CVE-2024-3900" + "CVE-2024-4141" + "CVE-2024-4568" + "CVE-2024-4976" ]; }; } 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/xsw/default.nix b/pkgs/applications/misc/xsw/default.nix index 0e68a1769025b..0baf0dc47a4e0 100644 --- a/pkgs/applications/misc/xsw/default.nix +++ b/pkgs/applications/misc/xsw/default.nix @@ -30,7 +30,7 @@ in stdenv.mkDerivation rec { platforms = platforms.unix; license = licenses.gpl3; - maintainers = [ maintainers.vrthra ]; + maintainers = [ ]; mainProgram = "xsw"; }; } diff --git a/pkgs/applications/misc/xygrib/default.nix b/pkgs/applications/misc/xygrib/default.nix index 4ce68f77e25be..32605747399a3 100644 --- a/pkgs/applications/misc/xygrib/default.nix +++ b/pkgs/applications/misc/xygrib/default.nix @@ -14,10 +14,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake qttools wrapQtAppsHook ]; buildInputs = [ bzip2 qtbase libnova proj_7 openjpeg libpng ]; cmakeFlags = [ "-DOPENJPEG_INCLUDE_DIR=${openjpeg.dev}/include/openjpeg-${lib.versions.majorMinor openjpeg.version}" ] - ++ lib.optionals stdenv.isDarwin [ "-DLIBNOVA_LIBRARY=${libnova}/lib/libnova.dylib" ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DLIBNOVA_LIBRARY=${libnova}/lib/libnova.dylib" ]; postInstall = - if stdenv.isDarwin then '' + if stdenv.hostPlatform.isDarwin then '' mkdir -p "$out/Applications" "$out/XyGrib/XyGrib.app/Contents/Resources" cp "../data/img/xyGrib.icns" "$out/XyGrib/XyGrib.app/Contents/Resources/xyGrib.icns" mv $out/XyGrib/XyGrib.app $out/Applications diff --git a/pkgs/applications/misc/yambar/default.nix b/pkgs/applications/misc/yambar/default.nix deleted file mode 100644 index 378db968c9bb2..0000000000000 --- a/pkgs/applications/misc/yambar/default.nix +++ /dev/null @@ -1,124 +0,0 @@ -{ lib -, stdenv -, fetchFromGitea -, alsa-lib -, bison -, fcft -, flex -, json_c -, libmpdclient -, libxcb -, libyaml -, meson -, ninja -, pipewire -, pixman -, pkg-config -, pulseaudio -, scdoc -, tllist -, udev -, wayland -, wayland-protocols -, wayland-scanner -, xcbutil -, xcbutilcursor -, xcbutilerrors -, xcbutilwm -, waylandSupport ? true -, x11Support ? true -}: - -assert (x11Support || waylandSupport); -stdenv.mkDerivation (finalAttrs: { - pname = "yambar"; - version = "1.11.0"; - - src = fetchFromGitea { - domain = "codeberg.org"; - owner = "dnkl"; - repo = "yambar"; - rev = finalAttrs.version; - hash = "sha256-QCwwMpBYuMWYqxE2ugPFpG/QtZDW7VsSBYs5EqKYejA="; - }; - - outputs = [ "out" "man" ]; - - depsBuildBuild = [ pkg-config ]; - - nativeBuildInputs = [ - bison - flex - meson - ninja - pkg-config - scdoc - wayland-scanner - ]; - - buildInputs = [ - alsa-lib - fcft - json_c - libmpdclient - libyaml - pipewire - pixman - pulseaudio - tllist - udev - ] ++ lib.optionals (waylandSupport) [ - wayland - wayland-protocols - ] ++ lib.optionals (x11Support) [ - xcbutil - xcbutilcursor - xcbutilerrors - xcbutilwm - ]; - - strictDeps = true; - - mesonBuildType = "release"; - - mesonFlags = [ - (lib.mesonBool "werror" false) - (lib.mesonEnable "backend-x11" x11Support) - (lib.mesonEnable "backend-wayland" waylandSupport) - ]; - - meta = { - homepage = "https://codeberg.org/dnkl/yambar"; - description = "Modular status panel for X11 and Wayland"; - longDescription = '' - yambar is a lightweight and configurable status panel (bar, for short) for - X11 and Wayland, that goes to great lengths to be both CPU and battery - efficient - polling is only done when absolutely necessary. - - It has a number of modules that provide information in the form of tags. - For example, the clock module has a date tag that contains the current - date. - - The modules do not know how to present the information though. This is - instead done by particles. And the user, you, decides which particles (and - thus how to present the data) to use. - - Furthermore, each particle can have a decoration - a background color or a - graphical underline, for example. - - There is no support for images or icons. use an icon font (e.g. Font - Awesome, or Material Icons) if you want a graphical representation. - - There are a number of modules and particles builtin. More can be added as - plugins. You can even write your own! - - To summarize: a bar displays information provided by modules, using - particles and decorations. How is configured by you. - ''; - changelog = "https://codeberg.org/dnkl/yambar/releases/tag/${finalAttrs.version}"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ AndersonTorres ]; - platforms = lib.platforms.linux; - mainProgram = "yambar"; - }; -}) diff --git a/pkgs/applications/misc/yewtube/default.nix b/pkgs/applications/misc/yewtube/default.nix index 26ce9f8f64a27..b9ec7f323b370 100644 --- a/pkgs/applications/misc/yewtube/default.nix +++ b/pkgs/applications/misc/yewtube/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "yewtube"; - version = "2.10.5"; + version = "2.12.0"; src = fetchFromGitHub { owner = "mps-youtube"; repo = "yewtube"; rev = "refs/tags/v${version}"; - hash = "sha256-a7ySRHSRHmQePaVV7HnCk8QsiAQfN4nCVRdamPMUHGo="; + hash = "sha256-66cGnEEISC+lZAYhFXuVdDtwh1TgwvCP6nBD84z2z0I="; }; postPatch = '' diff --git a/pkgs/applications/misc/yubioath-flutter/default.nix b/pkgs/applications/misc/yubioath-flutter/default.nix index da5cb37a978b0..1bd757557132e 100644 --- a/pkgs/applications/misc/yubioath-flutter/default.nix +++ b/pkgs/applications/misc/yubioath-flutter/default.nix @@ -1,25 +1,25 @@ { lib -, flutter319 +, flutter322 , python3 , fetchFromGitHub , pcre2 , libnotify , libappindicator , pkg-config -, gnome +, gnome-screenshot , makeWrapper , removeReferencesTo }: -flutter319.buildFlutterApplication rec { +flutter322.buildFlutterApplication rec { pname = "yubioath-flutter"; - version = "6.4.0"; + version = "7.0.1"; src = fetchFromGitHub { owner = "Yubico"; repo = "yubioath-flutter"; rev = version; - hash = "sha256-aXUnmKEUCi0rsVr3HVhEk6xa1z9HMsH+0AIY531hqiU="; + hash = "sha256-7FgZZCaafjNUaniPWVtba57zFABIJnLOw4GpyMsegKQ="; }; passthru.helper = python3.pkgs.callPackage ./helper.nix { inherit src version meta; }; @@ -34,6 +34,9 @@ flutter319.buildFlutterApplication rec { substituteInPlace linux/CMakeLists.txt \ --replace-fail "../build/linux/helper" "${passthru.helper}/libexec/helper" + + substituteInPlace linux/my_application.cc \ + --replace-fail "gtk_widget_realize(GTK_WIDGET(window));" "gtk_widget_show(GTK_WIDGET(window));" ''; preInstall = '' @@ -67,7 +70,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/misc/yubioath-flutter/helper.nix b/pkgs/applications/misc/yubioath-flutter/helper.nix index 2fe6bd7904d7e..378981ae84107 100644 --- a/pkgs/applications/misc/yubioath-flutter/helper.nix +++ b/pkgs/applications/misc/yubioath-flutter/helper.nix @@ -4,7 +4,6 @@ , zxing-cpp , pillow , poetry-core -, pythonRelaxDepsHook , src , version @@ -21,7 +20,6 @@ buildPythonApplication { nativeBuildInputs = [ poetry-core - pythonRelaxDepsHook ]; pythonRelaxDeps = true; diff --git a/pkgs/applications/misc/yubioath-flutter/pubspec.lock.json b/pkgs/applications/misc/yubioath-flutter/pubspec.lock.json index c83c6ffb1caf3..0f837ddbb5e54 100644 --- a/pkgs/applications/misc/yubioath-flutter/pubspec.lock.json +++ b/pkgs/applications/misc/yubioath-flutter/pubspec.lock.json @@ -4,21 +4,21 @@ "dependency": "transitive", "description": { "name": "_fe_analyzer_shared", - "sha256": "eb376e9acf6938204f90eb3b1f00b578640d3188b4c8a8ec054f9f479af8d051", + "sha256": "0b2f2bd91ba804e53a61d757b986f89f1f9eaed5b11e4b2f5a2468d86d6c9fc7", "url": "https://pub.dev" }, "source": "hosted", - "version": "64.0.0" + "version": "67.0.0" }, "analyzer": { "dependency": "direct dev", "description": { "name": "analyzer", - "sha256": "69f54f967773f6c26c7dcb13e93d7ccee8b17a641689da39e878d5cf13b06893", + "sha256": "37577842a27e4338429a1cbc32679d508836510b056f1eedf0c8d20e39c1383d", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.2.0" + "version": "6.4.1" }, "analyzer_plugin": { "dependency": "direct dev", @@ -34,21 +34,21 @@ "dependency": "direct main", "description": { "name": "archive", - "sha256": "22600aa1e926be775fa5fe7e6894e7fb3df9efda8891c73f70fb3262399a432d", + "sha256": "cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.4.10" + "version": "3.6.1" }, "args": { "dependency": "direct main", "description": { "name": "args", - "sha256": "eef6c46b622e0494a36c5a12d10d77fb4e855501a91c1b9ef9339326e58f0596", + "sha256": "7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.2" + "version": "2.5.0" }, "async": { "dependency": "direct main", @@ -104,11 +104,11 @@ "dependency": "transitive", "description": { "name": "build_daemon", - "sha256": "0343061a33da9c5810b2d6cee51945127d8f4c060b7fbdd9d54917f0a3feaaa1", + "sha256": "79b2aef6ac2ed00046867ed354c88778c9c0f029df8a20fe10b5436826721ef9", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.0.1" + "version": "4.0.2" }, "build_resolvers": { "dependency": "transitive", @@ -124,21 +124,21 @@ "dependency": "direct dev", "description": { "name": "build_runner", - "sha256": "581bacf68f89ec8792f5e5a0b2c4decd1c948e97ce659dc783688c8a88fbec21", + "sha256": "644dc98a0f179b872f612d3eb627924b578897c629788e858157fa5e704ca0c7", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.8" + "version": "2.4.11" }, "build_runner_core": { "dependency": "transitive", "description": { "name": "build_runner_core", - "sha256": "4ae8ffe5ac758da294ecf1802f2aff01558d8b1b00616aa7538ea9a8a5d50799", + "sha256": "e3c79f69a64bdfcd8a776a3c28db4eb6e3fb5356d013ae5eb2e52007706d5dbe", "url": "https://pub.dev" }, "source": "hosted", - "version": "7.3.0" + "version": "7.3.1" }, "built_collection": { "dependency": "transitive", @@ -154,11 +154,11 @@ "dependency": "transitive", "description": { "name": "built_value", - "sha256": "a3ec2e0f967bc47f69f95009bb93db936288d61d5343b9436e378b28a2f830c6", + "sha256": "c7913a9737ee4007efedaffc968c049fd0f3d0e49109e778edc10de9426005cb", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.9.0" + "version": "8.9.2" }, "characters": { "dependency": "transitive", @@ -244,11 +244,11 @@ "dependency": "transitive", "description": { "name": "cross_file", - "sha256": "fedaadfa3a6996f75211d835aaeb8fede285dae94262485698afd832371b9a5e", + "sha256": "55d7b444feb71301ef6b8838dbc1ae02e63dd48c8773f3810ff53bb1e2945b32", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.3.3+8" + "version": "0.3.4+1" }, "crypto": { "dependency": "direct main", @@ -264,41 +264,41 @@ "dependency": "direct dev", "description": { "name": "custom_lint", - "sha256": "f89ff83efdba7c8996e86bb3bad0b759d58f9b19ae4d0e277a386ddd8b481217", + "sha256": "7c0aec12df22f9082146c354692056677f1e70bc43471644d1fdb36c6fdda799", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.6.0" + "version": "0.6.4" }, "custom_lint_builder": { "dependency": "direct dev", "description": { "name": "custom_lint_builder", - "sha256": "9cdd9987feaa6925ec5f98d64de4fbbb5d94248ff77bbf2489366efad6c4baef", + "sha256": "d7dc41e709dde223806660268678be7993559e523eb3164e2a1425fd6f7615a9", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.6.0" + "version": "0.6.4" }, "custom_lint_core": { "dependency": "transitive", "description": { "name": "custom_lint_core", - "sha256": "9003a91409c9f1db6e2e50b4870d1d5e802e5923b25f7261bf3cb3e11ea9d4fb", + "sha256": "a85e8f78f4c52f6c63cdaf8c872eb573db0231dcdf3c3a5906d493c1f8bc20e6", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.6.0" + "version": "0.6.3" }, "dart_style": { "dependency": "transitive", "description": { "name": "dart_style", - "sha256": "40ae61a5d43feea6d24bd22c0537a6629db858963b99b4bc1c3db80676f32368", + "sha256": "99e066ce75c89d6b29903d788a7bb9369cf754f7b24bf70bf4b6d6d6b26853b9", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.3.4" + "version": "2.3.6" }, "desktop_drop": { "dependency": "direct main", @@ -324,31 +324,31 @@ "dependency": "transitive", "description": { "name": "ffi", - "sha256": "7bf0adc28a23d395f19f3f1eb21dd7cfd1dd9f8e1c50051c069122e6853bc878", + "sha256": "493f37e7df1804778ff3a53bd691d8692ddf69702cf4c1c1096a2e41b4779e21", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.0" + "version": "2.1.2" }, "file": { "dependency": "transitive", "description": { "name": "file", - "sha256": "1b92bec4fc2a72f59a8e15af5f52cd441e4a7860b49499d69dfa817af20e925d", + "sha256": "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.1.4" + "version": "7.0.0" }, "file_picker": { "dependency": "direct main", "description": { "name": "file_picker", - "sha256": "4e42aacde3b993c5947467ab640882c56947d9d27342a5b6f2895b23956954a6", + "sha256": "824f5b9f389bfc4dddac3dea76cd70c51092d9dff0b2ece7ef4f53db8547d258", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.1.1" + "version": "8.0.6" }, "fixnum": { "dependency": "transitive", @@ -376,11 +376,11 @@ "dependency": "direct dev", "description": { "name": "flutter_lints", - "sha256": "e2a421b7e59244faef694ba7b30562e489c2b489866e505074eb005cd7060db7", + "sha256": "3f41d009ba7172d5ff9be5f6e6e6abb4300e263aab8866d2a0842ed2a70f8f0c", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.1" + "version": "4.0.0" }, "flutter_localizations": { "dependency": "direct main", @@ -392,21 +392,21 @@ "dependency": "transitive", "description": { "name": "flutter_plugin_android_lifecycle", - "sha256": "b068ffc46f82a55844acfa4fdbb61fad72fa2aef0905548419d97f0f95c456da", + "sha256": "c6b0b4c05c458e1c01ad9bcc14041dd7b1f6783d487be4386f793f47a8a4d03e", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.17" + "version": "2.0.20" }, "flutter_riverpod": { "dependency": "direct main", "description": { "name": "flutter_riverpod", - "sha256": "4bce556b7ecbfea26109638d5237684538d4abc509d253e6c5c4c5733b360098", + "sha256": "0f1974eff5bbe774bf1d870e406fc6f29e3d6f1c46bd9c58e7172ff68a785d7d", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.10" + "version": "2.5.1" }, "flutter_test": { "dependency": "direct dev", @@ -424,31 +424,31 @@ "dependency": "direct dev", "description": { "name": "freezed", - "sha256": "57247f692f35f068cae297549a46a9a097100685c6780fe67177503eea5ed4e5", + "sha256": "a434911f643466d78462625df76fd9eb13e57348ff43fe1f77bbe909522c67a1", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.7" + "version": "2.5.2" }, "freezed_annotation": { "dependency": "direct main", "description": { "name": "freezed_annotation", - "sha256": "c3fd9336eb55a38cc1bbd79ab17573113a8deccd0ecbbf926cca3c62803b5c2d", + "sha256": "f54946fdb1fa7b01f780841937b1a80783a20b393485f3f6cdf336fd6f4705f2", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.1" + "version": "2.4.2" }, "frontend_server_client": { "dependency": "transitive", "description": { "name": "frontend_server_client", - "sha256": "408e3ca148b31c20282ad6f37ebfa6f4bdc8fede5b74bc2f08d9d92b55db3612", + "sha256": "f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.2.0" + "version": "4.0.0" }, "fuchsia_remote_debug_protocol": { "dependency": "transitive", @@ -480,11 +480,21 @@ "dependency": "transitive", "description": { "name": "hotreloader", - "sha256": "94ee21a60ea2836500799f3af035dc3212b1562027f1e0031c14e087f0231449", + "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": "4.1.0" + "version": "1.2.1" }, "http_multi_server": { "dependency": "transitive", @@ -516,11 +526,11 @@ "dependency": "direct main", "description": { "name": "intl", - "sha256": "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d", + "sha256": "d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.18.1" + "version": "0.19.0" }, "io": { "dependency": "direct main", @@ -536,31 +546,61 @@ "dependency": "transitive", "description": { "name": "js", - "sha256": "4186c61b32f99e60f011f7160e32c89a758ae9b1d0c6d28e2c02ef0382300e2b", + "sha256": "c1b2e9b5ea78c45e1a0788d29606ba27dc5f71f019f32ca5140f61ef071838cf", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.0" + "version": "0.7.1" }, "json_annotation": { "dependency": "direct main", "description": { "name": "json_annotation", - "sha256": "b10a7b2ff83d83c777edba3c6a0f97045ddadd56c944e1a23a3fdf43a1bf4467", + "sha256": "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.8.1" + "version": "4.9.0" }, "json_serializable": { "dependency": "direct dev", "description": { "name": "json_serializable", - "sha256": "aa1f5a8912615733e0fdc7a02af03308933c93235bdc8d50d0b0c8a8ccb0b969", + "sha256": "ea1432d167339ea9b5bb153f0571d0039607a873d6e04e0117af043f14a1fd4b", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.7.1" + "version": "6.8.0" + }, + "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" }, "lint": { "dependency": "direct dev", @@ -575,21 +615,21 @@ "dependency": "transitive", "description": { "name": "lints", - "sha256": "cbf8d4b858bb0134ef3ef87841abdf8d63bfc255c266b7bf6b39daa1085c4290", + "sha256": "976c774dd944a42e83e2467f4cc670daef7eed6295b10b36ae8c85bcbf828235", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.0" + "version": "4.0.0" }, "local_notifier": { "dependency": "direct main", "description": { "name": "local_notifier", - "sha256": "cc855aa6362c8840e3d3b35b1c3b058a3a8becdb2b03d5a9aa3f3a1e861f0a03", + "sha256": "f6cfc933c6fbc961f4e52b5c880f68e41b2d3cd29aad557cc654fd211093a025", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.1.5" + "version": "0.1.6" }, "logging": { "dependency": "direct main", @@ -605,21 +645,31 @@ "dependency": "transitive", "description": { "name": "matcher", - "sha256": "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e", + "sha256": "d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.12.16" + "version": "0.12.16+1" }, "material_color_utilities": { "dependency": "transitive", "description": { "name": "material_color_utilities", - "sha256": "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41", + "sha256": "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.8.0" + }, + "material_symbols_icons": { + "dependency": "direct main", + "description": { + "name": "material_symbols_icons", + "sha256": "a2c78726048c755f0f90fd2b7c8799cd94338e2e9b7ab6498ae56503262c14bc", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.5.0" + "version": "4.2762.0" }, "menu_base": { "dependency": "transitive", @@ -635,11 +685,11 @@ "dependency": "transitive", "description": { "name": "meta", - "sha256": "a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e", + "sha256": "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.10.0" + "version": "1.12.0" }, "mime": { "dependency": "transitive", @@ -665,11 +715,11 @@ "dependency": "direct main", "description": { "name": "path", - "sha256": "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917", + "sha256": "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.8.3" + "version": "1.9.0" }, "path_parsing": { "dependency": "transitive", @@ -685,31 +735,31 @@ "dependency": "direct main", "description": { "name": "path_provider", - "sha256": "b27217933eeeba8ff24845c34003b003b2b22151de3c908d0e679e8fe1aa078b", + "sha256": "c9e7d3a4cd1410877472158bee69963a4579f78b68c65a2b7d40d1a7a88bb161", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.2" + "version": "2.1.3" }, "path_provider_android": { "dependency": "transitive", "description": { "name": "path_provider_android", - "sha256": "477184d672607c0a3bf68fbbf601805f92ef79c82b64b4d6eb318cbca4c48668", + "sha256": "bca87b0165ffd7cdb9cad8edd22d18d2201e886d9a9f19b4fb3452ea7df3a72a", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.2.2" + "version": "2.2.6" }, "path_provider_foundation": { "dependency": "transitive", "description": { "name": "path_provider_foundation", - "sha256": "5a7999be66e000916500be4f15a3633ebceb8302719b47b9cc49ce924125350f", + "sha256": "f234384a3fdd67f989b4d54a5d73ca2a6c422fa55ae694381ae0f4375cd1ea16", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.3.2" + "version": "2.4.0" }, "path_provider_linux": { "dependency": "transitive", @@ -755,11 +805,11 @@ "dependency": "transitive", "description": { "name": "platform", - "sha256": "ae68c7bfcd7383af3629daafb32fb4e8681c7154428da4febcff06200585f102", + "sha256": "12220bb4b65720483f8fa9450b4332347737cf8213dd2840d8b2c823e47243ec", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.2" + "version": "3.1.4" }, "plugin_platform_interface": { "dependency": "transitive", @@ -771,16 +821,6 @@ "source": "hosted", "version": "2.1.8" }, - "pointycastle": { - "dependency": "transitive", - "description": { - "name": "pointycastle", - "sha256": "43ac87de6e10afabc85c445745a7b799e04de84cebaa4fd7bf55a5e1e9604d29", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.7.4" - }, "pool": { "dependency": "transitive", "description": { @@ -795,11 +835,11 @@ "dependency": "transitive", "description": { "name": "process", - "sha256": "53fd8db9cec1d37b0574e12f07520d582019cb6c44abf5479a01505099a34a09", + "sha256": "21e54fd2faf1b5bdd5102afd25012184a6793927648ea81eea80552ac9405b32", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.2.4" + "version": "5.0.2" }, "pub_semver": { "dependency": "transitive", @@ -815,11 +855,11 @@ "dependency": "transitive", "description": { "name": "pubspec_parse", - "sha256": "c63b2876e58e194e4b0828fcb080ad0e06d051cb607a6be51a9e084f47cb9367", + "sha256": "c799b721d79eb6ee6fa56f00c04b472dcd44a30d258fac2174a6ec57302678f8", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.3" + "version": "1.3.0" }, "qrscanner_zxing": { "dependency": "direct main", @@ -834,11 +874,11 @@ "dependency": "transitive", "description": { "name": "riverpod", - "sha256": "548e2192eb7aeb826eb89387f814edb76594f3363e2c0bb99dd733d795ba3589", + "sha256": "f21b32ffd26a36555e501b04f4a5dca43ed59e16343f1a30c13632b2351dfa4d", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.5.0" + "version": "2.5.1" }, "rxdart": { "dependency": "transitive", @@ -864,31 +904,31 @@ "dependency": "direct main", "description": { "name": "shared_preferences", - "sha256": "81429e4481e1ccfb51ede496e916348668fd0921627779233bd24cc3ff6abd02", + "sha256": "d3bbe5553a986e83980916ded2f0b435ef2e1893dfaa29d5a7a790d0eca12180", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.2.2" + "version": "2.2.3" }, "shared_preferences_android": { "dependency": "transitive", "description": { "name": "shared_preferences_android", - "sha256": "8568a389334b6e83415b6aae55378e158fbc2314e074983362d20c562780fb06", + "sha256": "93d0ec9dd902d85f326068e6a899487d1f65ffcd5798721a95330b26c8131577", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.2.1" + "version": "2.2.3" }, "shared_preferences_foundation": { "dependency": "transitive", "description": { "name": "shared_preferences_foundation", - "sha256": "7708d83064f38060c7b39db12aefe449cb8cdc031d6062280087bc4cdb988f5c", + "sha256": "0a8a893bf4fd1152f93fec03a415d11c27c74454d96e2318a7ac38dd18683ab7", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.3.5" + "version": "2.4.0" }, "shared_preferences_linux": { "dependency": "transitive", @@ -914,11 +954,11 @@ "dependency": "transitive", "description": { "name": "shared_preferences_web", - "sha256": "7b15ffb9387ea3e237bb7a66b8a23d2147663d391cafc5c8f37b2e7b4bde5d21", + "sha256": "9aee1089b36bd2aafe06582b7d7817fd317ef05fc30e6ba14bff247d0933042a", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.2.2" + "version": "2.3.0" }, "shared_preferences_windows": { "dependency": "transitive", @@ -944,11 +984,11 @@ "dependency": "transitive", "description": { "name": "shelf_web_socket", - "sha256": "9ca081be41c60190ebcb4766b2486a7d50261db7bd0f5d9615f2d653637a84c1", + "sha256": "073c147238594ecd0d193f3456a5fe91c4b0abbcc68bf5cd95b36c4e194ac611", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.4" + "version": "2.0.0" }, "shortid": { "dependency": "transitive", @@ -996,6 +1036,16 @@ "source": "hosted", "version": "1.10.0" }, + "sprintf": { + "dependency": "transitive", + "description": { + "name": "sprintf", + "sha256": "1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.0.0" + }, "stack_trace": { "dependency": "transitive", "description": { @@ -1070,11 +1120,11 @@ "dependency": "transitive", "description": { "name": "test_api", - "sha256": "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b", + "sha256": "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.6.1" + "version": "0.7.0" }, "test_res": { "dependency": "direct dev", @@ -1099,11 +1149,11 @@ "dependency": "direct main", "description": { "name": "tray_manager", - "sha256": "4ab709d70a4374af172f8c39e018db33a4271265549c6fc9d269a65e5f4b0225", + "sha256": "c9a63fd88bd3546287a7eb8ccc978d707eef82c775397af17dda3a4f4c039e64", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.2.1" + "version": "0.2.3" }, "typed_data": { "dependency": "transitive", @@ -1119,31 +1169,31 @@ "dependency": "direct main", "description": { "name": "url_launcher", - "sha256": "c512655380d241a337521703af62d2c122bf7b77a46ff7dd750092aa9433499c", + "sha256": "21b704ce5fa560ea9f3b525b43601c678728ba46725bab9b01187b4831377ed3", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.2.4" + "version": "6.3.0" }, "url_launcher_android": { "dependency": "transitive", "description": { "name": "url_launcher_android", - "sha256": "507dc655b1d9cb5ebc756032eb785f114e415f91557b73bf60b7e201dfedeb2f", + "sha256": "ceb2625f0c24ade6ef6778d1de0b2e44f2db71fded235eb52295247feba8c5cf", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.2.2" + "version": "6.3.3" }, "url_launcher_ios": { "dependency": "transitive", "description": { "name": "url_launcher_ios", - "sha256": "75bb6fe3f60070407704282a2d295630cab232991eb52542b18347a8a941df03", + "sha256": "7068716403343f6ba4969b4173cbf3b84fc768042124bc2c011e5d782b24fe89", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.2.4" + "version": "6.3.0" }, "url_launcher_linux": { "dependency": "transitive", @@ -1159,31 +1209,31 @@ "dependency": "transitive", "description": { "name": "url_launcher_macos", - "sha256": "b7244901ea3cf489c5335bdacda07264a6e960b1c1b1a9f91e4bc371d9e68234", + "sha256": "9a1a42d5d2d95400c795b2914c36fdcb525870c752569438e4ebb09a2b5d90de", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.0" + "version": "3.2.0" }, "url_launcher_platform_interface": { "dependency": "transitive", "description": { "name": "url_launcher_platform_interface", - "sha256": "a932c3a8082e118f80a475ce692fde89dc20fddb24c57360b96bc56f7035de1f", + "sha256": "552f8a1e663569be95a8190206a38187b531910283c3e982193e4f2733f01029", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.3.1" + "version": "2.3.2" }, "url_launcher_web": { "dependency": "transitive", "description": { "name": "url_launcher_web", - "sha256": "fff0932192afeedf63cdd50ecbb1bc825d31aed259f02bb8dba0f3b729a5e88b", + "sha256": "8d9e750d8c9338601e709cd0885f95825086bd8b642547f26bda435aade95d8a", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.2.3" + "version": "2.3.1" }, "url_launcher_windows": { "dependency": "transitive", @@ -1199,41 +1249,41 @@ "dependency": "transitive", "description": { "name": "uuid", - "sha256": "648e103079f7c64a36dc7d39369cabb358d377078a051d6ae2ad3aa539519313", + "sha256": "814e9e88f21a176ae1359149021870e87f7cddaf633ab678a5d2b0bff7fd1ba8", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.7" + "version": "4.4.0" }, "vector_graphics": { "dependency": "direct main", "description": { "name": "vector_graphics", - "sha256": "18f6690295af52d081f6808f2f7c69f0eed6d7e23a71539d75f4aeb8f0062172", + "sha256": "32c3c684e02f9bc0afb0ae0aa653337a2fe022e8ab064bcd7ffda27a74e288e3", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.9+2" + "version": "1.1.11+1" }, "vector_graphics_codec": { "dependency": "transitive", "description": { "name": "vector_graphics_codec", - "sha256": "531d20465c10dfac7f5cd90b60bbe4dd9921f1ec4ca54c83ebb176dbacb7bb2d", + "sha256": "c86987475f162fadff579e7320c7ddda04cd2fdeffbe1129227a85d9ac9e03da", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.9+2" + "version": "1.1.11+1" }, "vector_graphics_compiler": { "dependency": "direct main", "description": { "name": "vector_graphics_compiler", - "sha256": "03012b0a33775c5530576b70240308080e1d5050f0faf000118c20e6463bc0ad", + "sha256": "12faff3f73b1741a36ca7e31b292ddeb629af819ca9efe9953b70bd63fc8cd81", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.9+2" + "version": "1.1.11+1" }, "vector_math": { "dependency": "transitive", @@ -1249,11 +1299,11 @@ "dependency": "transitive", "description": { "name": "vm_service", - "sha256": "c538be99af830f478718b51630ec1b6bee5e74e52c8a802d328d9e71d35d2583", + "sha256": "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec", "url": "https://pub.dev" }, "source": "hosted", - "version": "11.10.0" + "version": "14.2.1" }, "watcher": { "dependency": "transitive", @@ -1269,41 +1319,51 @@ "dependency": "transitive", "description": { "name": "web", - "sha256": "afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152", + "sha256": "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.3.0" + "version": "0.5.1" + }, + "web_socket": { + "dependency": "transitive", + "description": { + "name": "web_socket", + "sha256": "24301d8c293ce6fe327ffe6f59d8fd8834735f0ec36e4fd383ec7ff8a64aa078", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.5" }, "web_socket_channel": { "dependency": "transitive", "description": { "name": "web_socket_channel", - "sha256": "d88238e5eac9a42bb43ca4e721edba3c08c6354d4a53063afaa568516217621b", + "sha256": "a2d56211ee4d35d9b344d9d4ce60f362e4f5d1aafb988302906bd732bc731276", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.0" + "version": "3.0.0" }, "webdriver": { "dependency": "transitive", "description": { "name": "webdriver", - "sha256": "3c923e918918feeb90c4c9fdf1fe39220fa4c0e8e2c0fffaded174498ef86c49", + "sha256": "003d7da9519e1e5f329422b36c4dcdf18d7d2978d1ba099ea4e45ba490ed845e", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.2" + "version": "3.0.3" }, "win32": { "dependency": "transitive", "description": { "name": "win32", - "sha256": "464f5674532865248444b4c3daca12bd9bf2d7c47f759ce2617986e7229494a8", + "sha256": "a79dbe579cb51ecd6d30b17e0cae4e0ea15e2c0e66f69ad4198f22a6789e94f4", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.2.0" + "version": "5.5.1" }, "window_manager": { "dependency": "direct main", @@ -1348,7 +1408,7 @@ } }, "sdks": { - "dart": ">=3.2.0 <4.0.0", - "flutter": ">=3.16.0" + "dart": ">=3.4.3 <4.0.0", + "flutter": ">=3.22.0" } } diff --git a/pkgs/applications/misc/zathura/cb/default.nix b/pkgs/applications/misc/zathura/cb/default.nix index 2c4dc76abb477..8da351b480691 100644 --- a/pkgs/applications/misc/zathura/cb/default.nix +++ b/pkgs/applications/misc/zathura/cb/default.nix @@ -9,15 +9,17 @@ girara, gettext, libarchive, + desktop-file-utils, + appstream-glib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "zathura-cb"; - version = "0.1.10"; + version = "0.1.11"; src = fetchurl { - url = "https://pwmt.org/projects/${pname}/download/${pname}-${version}.tar.xz"; - hash = "sha256-ibDKF6gMuh6p/Rs7cvOnFz8KrToGqMNk2GXEmZwYu8g="; + url = "https://pwmt.org/projects/zathura-cb/download/zathura-cb-${finalAttrs.version}.tar.xz"; + hash = "sha256-TiAepUzcIKkyWMQ1VvY4lEGvmXQN59ymyh/1JBcvvUc="; }; nativeBuildInputs = [ @@ -25,23 +27,26 @@ stdenv.mkDerivation rec { ninja pkg-config gettext + desktop-file-utils + appstream-glib ]; + buildInputs = [ libarchive zathura_core girara ]; - PKG_CONFIG_ZATHURA_PLUGINDIR = "lib/zathura"; + env.PKG_CONFIG_ZATHURA_PLUGINDIR = "lib/zathura"; - meta = with lib; { + meta = { homepage = "https://pwmt.org/projects/zathura-cb/"; description = "Zathura CB plugin"; longDescription = '' The zathura-cb plugin adds comic book support to zathura. ''; - license = licenses.zlib; - platforms = platforms.unix; - maintainers = with maintainers; [ jlesquembre ]; + license = lib.licenses.zlib; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ jlesquembre ]; }; -} +}) diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix index b7b7a517310b7..0ed21d76888e8 100644 --- a/pkgs/applications/misc/zathura/core/default.nix +++ b/pkgs/applications/misc/zathura/core/default.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, meson, ninja, wrapGAppsHook3, @@ -28,15 +29,24 @@ stdenv.mkDerivation (finalAttrs: { pname = "zathura"; - version = "0.5.6"; + version = "0.5.8"; src = fetchFromGitHub { owner = "pwmt"; repo = "zathura"; rev = finalAttrs.version; - hash = "sha256-lTEBIZ3lkzjJ+L1qecrcL8iseo8AvSIo3Wh65/ikwac="; + hash = "sha256-k6DEJpUA3s0mGxE38aYnX7uea98LrzevJhWW1abHo/c="; }; + patches = [ + # https://github.com/pwmt/zathura/issues/664 + (fetchpatch { + name = "fix-build-on-macos.patch"; + url = "https://github.com/pwmt/zathura/commit/53f151f775091abec55ccc4b63893a8f9a668588.patch"; + hash = "sha256-d8lRdlBN1Kfw/aTjz8x0gvTKy+SqSYWHLQCjV7hF5MI="; + }) + ]; + outputs = [ "bin" "man" @@ -54,6 +64,7 @@ stdenv.mkDerivation (finalAttrs: { # Make sure tests are enabled for doCheck # (lib.mesonEnable "tests" finalAttrs.finalPackage.doCheck) (lib.mesonEnable "seccomp" stdenv.hostPlatform.isLinux) + (lib.mesonEnable "landlock" stdenv.hostPlatform.isLinux) ]; nativeBuildInputs = [ @@ -68,28 +79,31 @@ stdenv.mkDerivation (finalAttrs: { appstream-glib ]; - buildInputs = [ - gtk - girara - libintl - sqlite - glib - file - librsvg - check - json-glib - texlive.bin.core - ] ++ lib.optional stdenv.isLinux libseccomp ++ lib.optional stdenv.isDarwin gtk-mac-integration; + buildInputs = + [ + gtk + girara + libintl + sqlite + glib + file + librsvg + check + json-glib + texlive.bin.core + ] + ++ lib.optional stdenv.hostPlatform.isLinux libseccomp + ++ lib.optional stdenv.hostPlatform.isDarwin gtk-mac-integration; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; passthru.updateScript = gitUpdater { }; - meta = with lib; { + meta = { homepage = "https://pwmt.org/projects/zathura"; description = "Core component for zathura PDF viewer"; - license = licenses.zlib; - platforms = platforms.unix; - maintainers = with maintainers; [ globin ]; + license = lib.licenses.zlib; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ globin ]; }; }) diff --git a/pkgs/applications/misc/zathura/default.nix b/pkgs/applications/misc/zathura/default.nix index 23b5ce0198e19..88241856632dc 100644 --- a/pkgs/applications/misc/zathura/default.nix +++ b/pkgs/applications/misc/zathura/default.nix @@ -1,15 +1,21 @@ { config, - pkgs, - # zathura_pdf_mupdf fails to load _opj_create_decompress at runtime on Darwin (https://github.com/NixOS/nixpkgs/pull/61295#issue-277982980) - useMupdf ? config.zathura.useMupdf or (!pkgs.stdenv.isDarwin), + lib, + stdenv, + newScope, + gtk3, + useMupdf ? true, }: -let - callPackage = pkgs.newScope self; +lib.makeScope newScope ( + self: + let + callPackage = self.callPackage; + in + { + inherit useMupdf; - self = rec { - gtk = pkgs.gtk3; + gtk = gtk3; zathura_core = callPackage ./core { }; @@ -23,14 +29,6 @@ let zathura_cb = callPackage ./cb { }; - zathuraWrapper = callPackage ./wrapper.nix { - plugins = [ - zathura_djvu - zathura_ps - zathura_cb - (if useMupdf then zathura_pdf_mupdf else zathura_pdf_poppler) - ]; - }; - }; -in -self + zathuraWrapper = callPackage ./wrapper.nix { }; + } +) diff --git a/pkgs/applications/misc/zathura/djvu/default.nix b/pkgs/applications/misc/zathura/djvu/default.nix index c7b3c3e52c940..87ac40d1b2045 100644 --- a/pkgs/applications/misc/zathura/djvu/default.nix +++ b/pkgs/applications/misc/zathura/djvu/default.nix @@ -10,22 +10,27 @@ girara, djvulibre, gettext, + desktop-file-utils, + appstream-glib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "zathura-djvu"; - version = "0.2.9"; + version = "0.2.10"; src = fetchurl { - url = "https://pwmt.org/projects/${pname}/download/${pname}-${version}.tar.xz"; - hash = "sha256-lub4pu5TIxBzsvcAMmSHL4RQHmPD2nvwWY0EYoawwgA="; + url = "https://pwmt.org/projects/zathura-djvu/download/zathura-djvu-${finalAttrs.version}.tar.xz"; + hash = "sha256-MunYmSmnbNfT/Lr3n0QYaL2r7fFzF9HRhD+qHxkzjZU="; }; nativeBuildInputs = [ meson ninja pkg-config + desktop-file-utils + appstream-glib ]; + buildInputs = [ djvulibre gettext @@ -34,17 +39,17 @@ stdenv.mkDerivation rec { girara ]; - PKG_CONFIG_ZATHURA_PLUGINDIR = "lib/zathura"; + env.PKG_CONFIG_ZATHURA_PLUGINDIR = "lib/zathura"; - meta = with lib; { + meta = { homepage = "https://pwmt.org/projects/zathura-djvu/"; description = "Zathura DJVU plugin"; longDescription = '' The zathura-djvu plugin adds DjVu support to zathura by using the djvulibre library. ''; - license = licenses.zlib; - platforms = platforms.unix; - maintainers = with maintainers; [ ]; + license = lib.licenses.zlib; + platforms = lib.platforms.unix; + maintainers = [ ]; }; -} +}) diff --git a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix index b7eff35913c3b..f0fd28d4a444b 100644 --- a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix +++ b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix @@ -17,22 +17,26 @@ tesseract, leptonica, mujs, + desktop-file-utils, + appstream-glib, gitUpdater, }: -stdenv.mkDerivation rec { - version = "0.4.2"; +stdenv.mkDerivation (finalAttrs: { + version = "0.4.4"; pname = "zathura-pdf-mupdf"; src = fetchurl { - url = "https://pwmt.org/projects/${pname}/download/${pname}-${version}.tar.xz"; - hash = "sha256-fFC+z9mJX9ccExsV336Ut+zJJa8UdfUz/qVp9YgcnhM="; + url = "https://pwmt.org/projects/zathura-pdf-mupdf/download/zathura-pdf-mupdf-${finalAttrs.version}.tar.xz"; + hash = "sha256-ASViSQHKvjov5jMVpG59lmoyPAKP9TiQ3694Vq2x9Pw="; }; nativeBuildInputs = [ meson ninja pkg-config + desktop-file-utils + appstream-glib ]; buildInputs = [ @@ -47,9 +51,9 @@ stdenv.mkDerivation rec { tesseract leptonica mujs - ] ++ lib.optional stdenv.isDarwin gtk-mac-integration; + ] ++ lib.optional stdenv.hostPlatform.isDarwin gtk-mac-integration; - PKG_CONFIG_ZATHURA_PLUGINDIR = "lib/zathura"; + env.PKG_CONFIG_ZATHURA_PLUGINDIR = "lib/zathura"; postPatch = '' sed -i -e '/^mupdfthird =/d' -e 's/, mupdfthird//g' meson.build @@ -57,15 +61,15 @@ stdenv.mkDerivation rec { passthru.updateScript = gitUpdater { url = "https://git.pwmt.org/pwmt/zathura-pdf-mupdf.git"; }; - meta = with lib; { + meta = { homepage = "https://pwmt.org/projects/zathura-pdf-mupdf/"; description = "Zathura PDF plugin (mupdf)"; longDescription = '' The zathura-pdf-mupdf plugin adds PDF support to zathura by using the mupdf rendering library. ''; - license = licenses.zlib; - platforms = platforms.unix; - maintainers = with maintainers; [ ]; + license = lib.licenses.zlib; + platforms = lib.platforms.unix; + maintainers = [ ]; }; -} +}) diff --git a/pkgs/applications/misc/zathura/pdf-poppler/default.nix b/pkgs/applications/misc/zathura/pdf-poppler/default.nix index 1c4ba79ee91b7..37941f2689831 100644 --- a/pkgs/applications/misc/zathura/pdf-poppler/default.nix +++ b/pkgs/applications/misc/zathura/pdf-poppler/default.nix @@ -8,39 +8,44 @@ zathura_core, girara, poppler, + desktop-file-utils, + appstream-glib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "zathura-pdf-poppler"; - version = "0.3.2"; + version = "0.3.3"; src = fetchurl { - url = "https://pwmt.org/projects/${pname}/download/${pname}-${version}.tar.xz"; - hash = "sha256-cavu1RzR0YjO89vUwWR1jjw3FgR1aWeyOtF2rlNFMBE="; + url = "https://pwmt.org/projects/zathura-pdf-poppler/download/zathura-pdf-poppler-${finalAttrs.version}.tar.xz"; + hash = "sha256-yBLy9ERv1d4Wc04TwC6pqiW6Tjup9ytzLA/5D5ujSTU="; }; nativeBuildInputs = [ meson ninja pkg-config + desktop-file-utils + appstream-glib zathura_core ]; + buildInputs = [ poppler girara ]; - PKG_CONFIG_ZATHURA_PLUGINDIR = "lib/zathura"; + env.PKG_CONFIG_ZATHURA_PLUGINDIR = "lib/zathura"; - meta = with lib; { + meta = { homepage = "https://pwmt.org/projects/zathura-pdf-poppler/"; description = "Zathura PDF plugin (poppler)"; longDescription = '' The zathura-pdf-poppler plugin adds PDF support to zathura by using the poppler rendering library. ''; - license = licenses.zlib; - platforms = platforms.unix; - maintainers = with maintainers; [ ]; + license = lib.licenses.zlib; + platforms = lib.platforms.unix; + maintainers = [ ]; }; -} +}) diff --git a/pkgs/applications/misc/zathura/ps/default.nix b/pkgs/applications/misc/zathura/ps/default.nix index 63b9cedd7a299..3978668991c30 100644 --- a/pkgs/applications/misc/zathura/ps/default.nix +++ b/pkgs/applications/misc/zathura/ps/default.nix @@ -9,15 +9,17 @@ girara, libspectre, gettext, + desktop-file-utils, + appstream-glib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "zathura-ps"; - version = "0.2.7"; + version = "0.2.8"; src = fetchurl { - url = "https://pwmt.org/projects/${pname}/download/${pname}-${version}.tar.xz"; - hash = "sha256-WJf5IEz1+Xi5QTvnzn/r3oQxV69I41GTjt8H2/kwjkY="; + url = "https://pwmt.org/projects/zathura-ps/download/zathura-ps-${finalAttrs.version}.tar.xz"; + hash = "sha256-B8pZT3J3+YdtADgEhBg0PqKWQCjpPJD5Vp7/NqiTLko="; }; nativeBuildInputs = [ @@ -25,24 +27,27 @@ stdenv.mkDerivation rec { ninja pkg-config gettext + desktop-file-utils + appstream-glib ]; + buildInputs = [ libspectre zathura_core girara ]; - PKG_CONFIG_ZATHURA_PLUGINDIR = "lib/zathura"; + env.PKG_CONFIG_ZATHURA_PLUGINDIR = "lib/zathura"; - meta = with lib; { + meta = { homepage = "https://pwmt.org/projects/zathura-ps/"; description = "Zathura PS plugin"; longDescription = '' The zathura-ps plugin adds PS support to zathura by using the libspectre library. ''; - license = licenses.zlib; - platforms = platforms.unix; - maintainers = with maintainers; [ ]; + license = lib.licenses.zlib; + platforms = lib.platforms.unix; + maintainers = [ ]; }; -} +}) diff --git a/pkgs/applications/misc/zathura/wrapper.nix b/pkgs/applications/misc/zathura/wrapper.nix index 5d60c48222123..4290fff26bcf6 100644 --- a/pkgs/applications/misc/zathura/wrapper.nix +++ b/pkgs/applications/misc/zathura/wrapper.nix @@ -3,8 +3,19 @@ lib, makeWrapper, zathura_core, + zathura_djvu, + zathura_ps, + zathura_cb, + zathura_pdf_mupdf, + zathura_pdf_poppler, file, - plugins ? [ ], + useMupdf, + plugins ? [ + zathura_djvu + zathura_ps + zathura_cb + (if useMupdf then zathura_pdf_mupdf else zathura_pdf_poppler) + ], }: symlinkJoin { name = "zathura-with-plugins-${zathura_core.version}"; diff --git a/pkgs/applications/misc/zettlr/default.nix b/pkgs/applications/misc/zettlr/default.nix index 593ca13f9fee2..7ac5133d11b9a 100644 --- a/pkgs/applications/misc/zettlr/default.nix +++ b/pkgs/applications/misc/zettlr/default.nix @@ -2,7 +2,7 @@ builtins.mapAttrs (pname: attrs: callPackage ./generic.nix (attrs // { inherit pname; })) { zettlr = { - version = "3.0.2"; - hash = "sha256-xwBq+kLmTth15uLiYWJOhi/YSPZVJNO6JTrKFojSDXA="; + version = "3.2.0"; + hash = "sha256-gttDGWFJ/VmOyqgOSKnCqqPtNTKJd1fmDpa0ZAX3xc8="; }; } diff --git a/pkgs/applications/misc/zettlr/generic.nix b/pkgs/applications/misc/zettlr/generic.nix index 777c74a5dffe5..65e9f03de642b 100644 --- a/pkgs/applications/misc/zettlr/generic.nix +++ b/pkgs/applications/misc/zettlr/generic.nix @@ -1,9 +1,11 @@ -{ pname -, version -, hash -, appimageTools -, lib -, fetchurl +{ + pname, + version, + hash, + appimageTools, + lib, + fetchurl, + makeWrapper, }: # Based on https://gist.github.com/msteen/96cb7df66a359b827497c5269ccbbf94 and joplin-desktop nixpkgs. @@ -19,21 +21,28 @@ in appimageTools.wrapType2 rec { inherit pname version src; - extraPkgs = pkgs: [ pkgs.texliveMedium pkgs.pandoc ]; + extraPkgs = pkgs: [ + pkgs.texliveMedium + pkgs.pandoc + ]; + + nativeBuildInputs = [ makeWrapper ]; extraInstallCommands = '' + wrapProgram $out/bin/zettlr \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" install -m 444 -D ${appimageContents}/Zettlr.desktop $out/share/applications/Zettlr.desktop install -m 444 -D ${appimageContents}/Zettlr.png $out/share/icons/hicolor/512x512/apps/Zettlr.png substituteInPlace $out/share/applications/Zettlr.desktop \ - --replace 'Exec=AppRun' 'Exec=${pname}' + --replace-fail 'Exec=AppRun' 'Exec=${pname}' ''; - meta = with lib; { + meta = { description = "Markdown editor for writing academic texts and taking notes"; homepage = "https://www.zettlr.com"; platforms = [ "x86_64-linux" ]; - license = licenses.gpl3; - maintainers = with maintainers; [ tfmoraes ]; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ tfmoraes ]; mainProgram = "zettlr"; }; } diff --git a/pkgs/applications/misc/zine/default.nix b/pkgs/applications/misc/zine/default.nix index c7fb80e8318b1..40d8b61603655 100644 --- a/pkgs/applications/misc/zine/default.nix +++ b/pkgs/applications/misc/zine/default.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ]; diff --git a/pkgs/applications/misc/zk-shell/default.nix b/pkgs/applications/misc/zk-shell/default.nix deleted file mode 100644 index b05c12227fc0c..0000000000000 --- a/pkgs/applications/misc/zk-shell/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, fetchFromGitHub, python3Packages }: - -python3Packages.buildPythonApplication rec { - pname = "zk-shell"; - version = "1.0.0"; - - src = fetchFromGitHub { - owner = "rgs1"; - repo = "zk_shell"; - rev = "v${version}"; - sha256 = "0zisvvlclsf4sdh7dpqcl1149xbxw6pi1aqcwjbqblgf8m4nm0c7"; - }; - - propagatedBuildInputs = with python3Packages; [ - ansi - kazoo - nose - six - tabulate - twitter - ]; - - # requires a running zookeeper, don't know how to fix that for the moment - doCheck = false; - - meta = with lib; { - description = "Powerful & scriptable shell for Apache ZooKeeper"; - mainProgram = "zk-shell"; - homepage = "https://github.com/rgs1/zk_shell"; - license = licenses.asl20; - maintainers = [ maintainers.mahe ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/applications/misc/zktree/default.nix b/pkgs/applications/misc/zktree/default.nix index 82b93763ed821..71b8806ae070d 100644 --- a/pkgs/applications/misc/zktree/default.nix +++ b/pkgs/applications/misc/zktree/default.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { sha256 = "11w86k1w5zryiq6bqr98pjhffd3l76377yz53qx0n76vc5374fk9"; }; - cargoSha256 = "18v7agm39acnblc703278cn8py5971hm8p5kxmznpw119fjp36s5"; + cargoHash = "sha256-RZtxpUsh8Gt/7bNcVGE4qfiLLENHDHAYXZapNOpTZ6M="; meta = with lib; { description = "Small tool to display Znodes in Zookeeper in tree structure"; diff --git a/pkgs/applications/networking/adguardian/default.nix b/pkgs/applications/networking/adguardian/default.nix index 21123d47e5d1b..425974fee511e 100644 --- a/pkgs/applications/networking/adguardian/default.nix +++ b/pkgs/applications/networking/adguardian/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-IPkKiXuFN0KFlcrrSjLmML+O5zCrVRKEqdyV2xBsCsg="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/applications/networking/appgate-sdp/default.nix b/pkgs/applications/networking/appgate-sdp/default.nix index fc32fb97f58b9..ed77e32e00144 100644 --- a/pkgs/applications/networking/appgate-sdp/default.nix +++ b/pkgs/applications/networking/appgate-sdp/default.nix @@ -86,11 +86,11 @@ let in stdenv.mkDerivation rec { pname = "appgate-sdp"; - version = "6.2.3"; + version = "6.3.2"; src = fetchurl { url = "https://bin.appgate-sdp.com/${lib.versions.majorMinor version}/client/appgate-sdp_${version}_amd64.deb"; - sha256 = "sha256-W6P83+DPd2VRz52UKPJp+D1WcjgDwyXYcx6rViHbmlk="; + sha256 = "sha256-7W2iUilSK4awrtgZc/c40oivzlyz3RN5U5TUicqavsc="; }; # just patch interpreter diff --git a/pkgs/applications/networking/avalanchego/default.nix b/pkgs/applications/networking/avalanchego/default.nix index 51be31c4db5e2..97bf552604d45 100644 --- a/pkgs/applications/networking/avalanchego/default.nix +++ b/pkgs/applications/networking/avalanchego/default.nix @@ -7,20 +7,20 @@ buildGoModule rec { pname = "avalanchego"; - version = "1.11.7"; + version = "1.11.11"; src = fetchFromGitHub { owner = "ava-labs"; repo = pname; rev = "v${version}"; - hash = "sha256-pdfZMKsNKmQVUfYobaOdUqGgP99fatEpgn0AHt0bIBQ="; + hash = "sha256-9NhwxB5AeGvQgZbjNu5WWHiP194ws7s1WDtCntLr//g="; }; - vendorHash = "sha256-CN+2+aOOPF7gouvp7lCfRIKA1quNCcrvzHg8lF6J4f8="; + vendorHash = "sha256-A8Bf/KzTFvC/hFLU1k6M89649wjoqnIXRQ1uJaTj9YA="; # go mod vendor has a bug, see: https://github.com/golang/go/issues/57529 proxyVendor = true; - buildInputs = lib.optionals stdenv.isDarwin [ IOKit ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ IOKit ]; subPackages = [ "main" ]; diff --git a/pkgs/applications/networking/brig/default.nix b/pkgs/applications/networking/brig/default.nix index e7204a68d14cb..b20543c0c58a4 100644 --- a/pkgs/applications/networking/brig/default.nix +++ b/pkgs/applications/networking/brig/default.nix @@ -21,16 +21,16 @@ buildGoModule rec { subPackages = [ "." ]; - ldflags = [ "-s" "-w" ] ++ (with lib; - mapAttrsToList (n: v: "-X github.com/sahib/brig/version.${n}=${v}") - (with versions; { - Major = major version; - Minor = minor version; - Patch = patch version; + ldflags = [ "-s" "-w" ] ++ + lib.mapAttrsToList (n: v: "-X github.com/sahib/brig/version.${n}=${v}") + { + Major = lib.versions.major version; + Minor = lib.versions.minor version; + Patch = lib.versions.patch version; ReleaseType = ""; BuildTime = "1970-01-01T00:00:00+0000"; GitRev = src.rev; - })); + }; postInstall = '' installShellCompletion --cmd brig \ diff --git a/pkgs/applications/networking/browsers/asuka/default.nix b/pkgs/applications/networking/browsers/asuka/default.nix index f36cf28b2d05e..786f11d2d743c 100644 --- a/pkgs/applications/networking/browsers/asuka/default.nix +++ b/pkgs/applications/networking/browsers/asuka/default.nix @@ -11,12 +11,12 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-+rj6P3ejc4Qb/uqbf3N9MqyqDT7yg9JFE0yfW/uzd6M="; }; - cargoSha256 = "sha256-XrFpvH3qiMvpgbH7Q+KC1zFAqJT4rjxux6Q5KLY2ufI="; + cargoHash = "sha256-XrFpvH3qiMvpgbH7Q+KC1zFAqJT4rjxux6Q5KLY2ufI="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ ncurses openssl ] - ++ lib.optional stdenv.isDarwin Security; + ++ lib.optional stdenv.hostPlatform.isDarwin Security; meta = with lib; { description = "Gemini Project client written in Rust with NCurses"; diff --git a/pkgs/applications/networking/browsers/bombadillo/default.nix b/pkgs/applications/networking/browsers/bombadillo/default.nix index f96d6014b5bcc..bd39100aab38b 100644 --- a/pkgs/applications/networking/browsers/bombadillo/default.nix +++ b/pkgs/applications/networking/browsers/bombadillo/default.nix @@ -7,7 +7,7 @@ buildGoModule rec { src = fetchgit { url = "https://tildegit.org/sloum/bombadillo.git"; rev = version; - sha256 = "sha256-FjU9AyRAdGFr1bVpkmj5STkbzCXvpxOaOj7WNQJq7A0="; + hash = "sha256-FjU9AyRAdGFr1bVpkmj5STkbzCXvpxOaOj7WNQJq7A0="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index 59b753192a2ae..32a7ab2440546 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -3,20 +3,20 @@ callPackage ./make-brave.nix (removeAttrs args [ "callPackage" ]) ( - if stdenv.isAarch64 then - { + if stdenv.hostPlatform.isAarch64 then + rec { 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.70.119"; + url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb"; + hash = "sha256-we/M1/hMdnxxKfhS6q+Lc3G2OCj+wyBpoC6pfd0Ta08="; platform = "aarch64-linux"; } - else if stdenv.isx86_64 then - { + else if stdenv.hostPlatform.isx86_64 then + rec { 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.70.119"; + url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; + hash = "sha256-GtFkE0R4s0G9pO2Omt1V+YvBv0kvyJrcPc41ba07TTQ="; 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..2ea95693a9aed 100644 --- a/pkgs/applications/networking/browsers/brave/make-brave.nix +++ b/pkgs/applications/networking/browsers/brave/make-brave.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, wrapGAppsHook3, makeWrapper +{ lib, stdenv, fetchurl, buildPackages , alsa-lib , at-spi2-atk , at-spi2-core @@ -12,7 +12,7 @@ , freetype , gdk-pixbuf , glib -, gnome +, adwaita-icon-theme , gsettings-desktop-schemas , gtk3 , gtk4 @@ -49,20 +49,20 @@ , commandLineArgs ? "" # Necessary for USB audio devices. -, pulseSupport ? stdenv.isLinux +, pulseSupport ? stdenv.hostPlatform.isLinux , libpulseaudio # For GPU acceleration support on Wayland (without the lib it doesn't seem to work) , libGL # For video acceleration via VA-API (--enable-features=VaapiVideoDecoder,VaapiVideoEncoder) -, libvaSupport ? stdenv.isLinux +, libvaSupport ? stdenv.hostPlatform.isLinux , libva , enableVideoAcceleration ? libvaSupport # For Vulkan support (--enable-features=Vulkan); disabled by default as it seems to break VA-API , vulkanSupport ? false -, addOpenGLRunpath +, addDriverRunpath , enableVulkan ? vulkanSupport }: @@ -112,7 +112,9 @@ stdenv.mkDerivation { nativeBuildInputs = [ dpkg - (wrapGAppsHook3.override { inherit makeWrapper; }) + # override doesn't preserve splicing https://github.com/NixOS/nixpkgs/issues/132651 + # Has to use `makeShellWrapper` from `buildPackages` even though `makeShellWrapper` from the inputs is spliced because `propagatedBuildInputs` would pick the wrong one because of a different offset. + (buildPackages.wrapGAppsHook3.override { makeWrapper = buildPackages.makeShellWrapper; }) ]; buildInputs = [ @@ -120,7 +122,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"; @@ -187,7 +189,7 @@ stdenv.mkDerivation { ''} --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto}}" ${optionalString vulkanSupport '' - --prefix XDG_DATA_DIRS : "${addOpenGLRunpath.driverLink}/share" + --prefix XDG_DATA_DIRS : "${addDriverRunpath.driverLink}/share" ''} --add-flags ${escapeShellArg commandLineArgs} ) diff --git a/pkgs/applications/networking/browsers/brave/update.sh b/pkgs/applications/networking/browsers/brave/update.sh index c0b8d7cff415b..d08c1559d0a44 100755 --- a/pkgs/applications/networking/browsers/brave/update.sh +++ b/pkgs/applications/networking/browsers/brave/update.sh @@ -23,19 +23,19 @@ cat > $SCRIPT_DIR/default.nix << EOF callPackage ./make-brave.nix (removeAttrs args [ "callPackage" ]) ( - if stdenv.isAarch64 then - { + if stdenv.hostPlatform.isAarch64 then + rec { pname = "brave"; version = "${latestVersionAarch64}"; - url = "https://github.com/brave/brave-browser/releases/download/v${latestVersionAarch64}/brave-browser_${latestVersionAmd64}_arm64.deb"; + url = "https://github.com/brave/brave-browser/releases/download/v\${version}/brave-browser_\${version}_arm64.deb"; hash = "${hashAarch64}"; platform = "aarch64-linux"; } - else if stdenv.isx86_64 then - { + else if stdenv.hostPlatform.isx86_64 then + rec { pname = "brave"; version = "${latestVersionAmd64}"; - url = "https://github.com/brave/brave-browser/releases/download/v${latestVersionAmd64}/brave-browser_${latestVersionAmd64}_amd64.deb"; + url = "https://github.com/brave/brave-browser/releases/download/v\${version}/brave-browser_\${version}_amd64.deb"; hash = "${hashAmd64}"; platform = "x86_64-linux"; } diff --git a/pkgs/applications/networking/browsers/castor/default.nix b/pkgs/applications/networking/browsers/castor/default.nix index 78e2791c1bb45..b3f7abedba965 100644 --- a/pkgs/applications/networking/browsers/castor/default.nix +++ b/pkgs/applications/networking/browsers/castor/default.nix @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-yYLDbxmUR86fdpbHQQTiHVUbicnOD75cl3Vhofw5qr0="; }; - cargoSha256 = "sha256-AHhKfy2AAcDBcknzNb8DAzm51RQqFQDuWN+Hp5731Yk="; + cargoHash = "sha256-AHhKfy2AAcDBcknzNb8DAzm51RQqFQDuWN+Hp5731Yk="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 3616189374d30..1ef2e9d153825 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, fetchpatch +{ stdenv, lib, fetchpatch , recompressTarball , buildPackages , buildPlatform @@ -35,7 +35,7 @@ , glib, gtk3, dbus-glib , libXScrnSaver, libXcursor, libXtst, libxshmfence, libGLU, libGL , mesa -, pciutils, protobuf, speechd, libXdamage, at-spi2-core +, pciutils, protobuf, speechd-minimal, libXdamage, at-spi2-core , pipewire , libva , libdrm, wayland, libxkbcommon # Ozone @@ -65,10 +65,6 @@ let python3WithPackages = python3.pythonOnBuildForHost.withPackages(ps: with ps; [ ply jinja2 setuptools ]); - clangFormatPython3 = fetchurl { - url = "https://chromium.googlesource.com/chromium/tools/build/+/e77882e0dde52c2ccf33c5570929b75b4a2a2522/recipes/recipe_modules/chromium/resources/clang-format?format=TEXT"; - hash = "sha256-1BRxXP+0QgejAWdFHJzGrLMhk/MsRDoVdK/GVoyFg0U="; - }; # The additional attributes for creating derivations based on the chromium # source tree. @@ -102,14 +98,12 @@ let "flac" "libjpeg" "libpng" - ] ++ lib.optionals (!chromiumVersionAtLeast "124") [ # Use the vendored libwebp for M124+ until we figure out how to solve: # Running phase: configurePhase # ERROR Unresolved dependencies. # //third_party/libavif:libavif_enc(//build/toolchain/linux/unbundle:default) # needs //third_party/libwebp:libwebp_sharpyuv(//build/toolchain/linux/unbundle:default) - "libwebp" - ] ++ [ + # "libwebp" "libxslt" # "opus" ]; @@ -196,10 +190,10 @@ let glib gtk3 dbus-glib libXScrnSaver libXcursor libXtst libxshmfence libGLU libGL mesa # required for libgbm - pciutils protobuf speechd libXdamage at-spi2-core + pciutils protobuf speechd-minimal libXdamage at-spi2-core pipewire libva - libdrm wayland mesa.drivers libxkbcommon + libdrm wayland libxkbcommon curl libepoxy libffi @@ -224,10 +218,10 @@ let glib gtk3 dbus-glib libXScrnSaver libXcursor libXtst libxshmfence libGLU libGL mesa # required for libgbm - pciutils protobuf speechd libXdamage at-spi2-core + pciutils protobuf speechd-minimal libXdamage at-spi2-core pipewire libva - libdrm wayland mesa.drivers libxkbcommon + libdrm wayland libxkbcommon curl libepoxy libffi @@ -267,6 +261,31 @@ let commit = "a976cb05b4024b7a6452d1541378d718cdfe33e6"; hash = "sha256-K2PSeJAvhGH2/Yp63/4mJ85NyqXqDDkMWY+ptrpgmOI="; }) + ] ++ lib.optionals (versionRange "127" "128") [ + # Fix missing chrome/browser/ui/webui_name_variants.h dependency + # and ninja 1.12 compat in M127. + # https://issues.chromium.org/issues/345645751 + # https://issues.chromium.org/issues/40253918 + # https://chromium-review.googlesource.com/c/chromium/src/+/5641516 + (githubPatch { + commit = "2c101186b60ed50f2ba4feaa2e963bd841bcca47"; + hash = "sha256-luu3ggo6XoeeECld1cKZ6Eh8x/qQYmmKI/ThEhuutuY="; + }) + # https://chromium-review.googlesource.com/c/chromium/src/+/5644627 + (githubPatch { + commit = "f2b43c18b8ecfc3ddc49c42c062d796c8b563984"; + hash = "sha256-uxXxSsiS8R0827Oi3xsG2gtT0X+jJXziwZ1y8+7K+Qg="; + }) + # https://chromium-review.googlesource.com/c/chromium/src/+/5646245 + (githubPatch { + commit = "4ca70656fde83d2db6ed5a8ac9ec9e7443846924"; + hash = "sha256-iQuRRZjDDtJfr+B7MV+TvUDDX3bvpCnv8OpSLJ1WqCE="; + }) + # https://chromium-review.googlesource.com/c/chromium/src/+/5647662 + (githubPatch { + commit = "50d63ffee3f7f1b1b9303363742ad8ebbfec31fa"; + hash = "sha256-H+dv+lgXSdry3NkygpbCdTAWWdTVdKdVD3Aa62w091E="; + }) ] ++ [ # Required to fix the build with a more recent wayland-protocols version # (we currently package 1.26 in Nixpkgs while Chromium bundles 1.21): @@ -289,9 +308,12 @@ let # Partial revert of https://github.com/chromium/chromium/commit/3687976b0c6d36cf4157419a24a39f6770098d61 # allowing us to use our rustc and our clang. ./patches/chromium-121-rust.patch - ] ++ lib.optionals (chromiumVersionAtLeast "126") [ + ] ++ lib.optionals (versionRange "126" "129") [ # Rebased variant of patch right above to build M126+ with our rust and our clang. ./patches/chromium-126-rust.patch + ] ++ lib.optionals (chromiumVersionAtLeast "129") [ + # Rebased variant of patch right above to build M129+ with our rust and our clang. + ./patches/chromium-129-rust.patch ]; postPatch = '' @@ -353,9 +375,6 @@ let # Allow to put extensions into the system-path. sed -i -e 's,/usr,/run/current-system/sw,' chrome/common/chrome_paths.cc - # We need the fix for https://bugs.chromium.org/p/chromium/issues/detail?id=1254408: - base64 --decode ${clangFormatPython3} > buildtools/linux64/clang-format - # Add final newlines to scripts that do not end with one. # This is a temporary workaround until https://github.com/NixOS/nixpkgs/pull/255463 (or similar) has been merged, # as patchShebangs hard-crashes when it encounters files that contain only a shebang and do not end with a final @@ -363,9 +382,13 @@ let find . -type f -perm -0100 -exec sed -i -e '$a\' {} + patchShebangs . + '' + lib.optionalString (ungoogled) '' + # Prune binaries (ungoogled only) *before* linking our own binaries: + ${ungoogler}/utils/prune_binaries.py . ${ungoogler}/pruning.list || echo "some errors" + '' + '' # Link to our own Node.js and Java (required during the build): mkdir -p third_party/node/linux/node-linux-x64/bin - ln -s "${pkgsBuildHost.nodejs}/bin/node" third_party/node/linux/node-linux-x64/bin/node + ln -s${lib.optionalString (chromiumVersionAtLeast "127") "f"} "${pkgsBuildHost.nodejs}/bin/node" third_party/node/linux/node-linux-x64/bin/node ln -s "${pkgsBuildHost.jdk17_headless}/bin/java" third_party/jdk/current/bin/ # Allow building against system libraries in official builds @@ -375,7 +398,6 @@ let substituteInPlace build/toolchain/linux/BUILD.gn \ --replace 'toolprefix = "aarch64-linux-gnu-"' 'toolprefix = ""' '' + lib.optionalString ungoogled '' - ${ungoogler}/utils/prune_binaries.py . ${ungoogler}/pruning.list || echo "some errors" ${ungoogler}/utils/patches.py . ${ungoogler}/patches ${ungoogler}/utils/domain_substitution.py apply -r ${ungoogler}/domain_regex.list -f ${ungoogler}/domain_substitution.list -c ./ungoogled-domsubcache.tar.gz . ''; @@ -462,6 +484,9 @@ let use_system_libffi = true; # Use nixpkgs Rust compiler instead of the one shipped by Chromium. rust_sysroot_absolute = "${buildPackages.rustc}"; + } // lib.optionalAttrs (chromiumVersionAtLeast "127") { + rust_bindgen_root = "${buildPackages.rust-bindgen}"; + } // { enable_rust = true; # While we technically don't need the cache-invalidation rustc_version provides, rustc_version # is still used in some scripts (e.g. build/rust/std/find_std_rlibs.py). diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 095fe13f9197a..484cc0e4f1940 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 @@ -16,7 +16,7 @@ , enableWideVine ? false , ungoogled ? false # Whether to build chromium or ungoogled-chromium , cupsSupport ? true -, pulseSupport ? config.pulseaudio or stdenv.isLinux +, pulseSupport ? config.pulseaudio or stdenv.hostPlatform.isLinux , commandLineArgs ? "" , pkgsBuildBuild , pkgs @@ -54,8 +54,12 @@ let src = fetchgit { inherit (upstream-info.deps.gn) url rev hash; }; + } // lib.optionalAttrs (chromiumVersionAtLeast "127") { + # Relax hardening as otherwise gn unstable 2024-06-06 and later fail with: + # cc1plus: error: '-Wformat-security' ignored without '-Wformat' [-Werror=format-security] + hardeningDisable = [ "format" ]; }); - recompressTarball = callPackage ./recompress-tarball.nix { }; + recompressTarball = callPackage ./recompress-tarball.nix { inherit chromiumVersionAtLeast; }; }); browser = callPackage ./browser.nix { @@ -101,7 +105,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 @@ -113,12 +117,12 @@ in stdenv.mkDerivation { browserBinary = "${chromiumWV}/libexec/chromium/chromium"; libPath = lib.makeLibraryPath [ libva pipewire wayland gtk3 gtk4 libkrb5 ]; - in with lib; '' + in '' mkdir -p "$out/bin" makeWrapper "${browserBinary}" "$out/bin/chromium" \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ - --add-flags ${escapeShellArg commandLineArgs} + --add-flags ${lib.escapeShellArg commandLineArgs} ed -v -s "$out/bin/chromium" << EOF 2i diff --git a/pkgs/applications/networking/browsers/chromium/get-commit-message.py b/pkgs/applications/networking/browsers/chromium/get-commit-message.py index 437b82d3a777e..0a8ed0a60a49b 100755 --- a/pkgs/applications/networking/browsers/chromium/get-commit-message.py +++ b/pkgs/applications/networking/browsers/chromium/get-commit-message.py @@ -20,7 +20,7 @@ target_version = sys.argv[1] if len(sys.argv) == 2 else None for entry in feed.entries: url = requests.get(entry.link).url.split('?')[0] - if entry.title != 'Stable Channel Update for Desktop': + if entry.title.lower() != 'Stable Channel Update for Desktop'.lower(): if target_version and entry.title == '': # Workaround for a special case (Chrome Releases bug?): if not 'the-stable-channel-has-been-updated-to' in url: diff --git a/pkgs/applications/networking/browsers/chromium/patches/chromium-129-rust.patch b/pkgs/applications/networking/browsers/chromium/patches/chromium-129-rust.patch new file mode 100644 index 0000000000000..1fe0c7f87324d --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/patches/chromium-129-rust.patch @@ -0,0 +1,21 @@ +diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn +index 45086d6838cac..81132ad8ecb31 100644 +--- a/build/config/compiler/BUILD.gn ++++ b/build/config/compiler/BUILD.gn +@@ -1727,16 +1727,6 @@ config("runtime_library") { + configs += [ "//build/config/c++:runtime_library" ] + } + +- # Rust and C++ both provide intrinsics for LLVM to call for math operations. We +- # want to use the C++ intrinsics, not the ones in the Rust compiler_builtins +- # library. The Rust symbols are marked as weak, so that they can be replaced by +- # the C++ symbols. This config ensures the C++ symbols exist and are strong in +- # order to cause that replacement to occur by explicitly linking in clang's +- # compiler-rt library. +- if (is_clang && !is_nacl && !is_cronet_build) { +- configs += [ "//build/config/clang:compiler_builtins" ] +- } +- + # TODO(crbug.com/40570904): Come up with a better name for is POSIX + Fuchsia + # configuration. + if (is_posix || is_fuchsia) { diff --git a/pkgs/applications/networking/browsers/chromium/recompress-tarball.nix b/pkgs/applications/networking/browsers/chromium/recompress-tarball.nix index e663c393d8dc4..ab1c81338f97f 100644 --- a/pkgs/applications/networking/browsers/chromium/recompress-tarball.nix +++ b/pkgs/applications/networking/browsers/chromium/recompress-tarball.nix @@ -1,10 +1,11 @@ { zstd , fetchurl +, lib +, chromiumVersionAtLeast }: { version , hash ? "" -, ... } @ args: fetchurl ({ @@ -35,6 +36,13 @@ fetchurl ({ --exclude=third_party/llvm \ --exclude=third_party/rust-src \ --exclude='build/linux/debian_*-sysroot' \ + '' + lib.optionalString (chromiumVersionAtLeast "127") '' + --exclude='*.tar.[a-zA-Z0-9][a-zA-Z0-9]' \ + --exclude='*.tar.[a-zA-Z0-9][a-zA-Z0-9][a-zA-Z0-9]' \ + --exclude=third_party/llvm-build \ + --exclude=third_party/rust-toolchain \ + --exclude=third_party/instrumented_libs \ + '' + '' --strip-components=1 tar \ diff --git a/pkgs/applications/networking/browsers/chromium/update.py b/pkgs/applications/networking/browsers/chromium/update.py index d92a9dae8a8ce..17bd20c1a794b 100755 --- a/pkgs/applications/networking/browsers/chromium/update.py +++ b/pkgs/applications/networking/browsers/chromium/update.py @@ -1,5 +1,5 @@ #! /usr/bin/env nix-shell -#! nix-shell -i python -p python3 nix nixfmt-classic nix-prefetch-git +#! nix-shell -i python -p python3Packages.looseversion nix nixfmt-classic nix-prefetch-git """This script automatically updates chromium, google-chrome, chromedriver, and ungoogled-chromium via upstream-info.nix.""" @@ -15,7 +15,7 @@ import sys from codecs import iterdecode from collections import OrderedDict from datetime import datetime -from distutils.version import LooseVersion +from looseversion import LooseVersion from os.path import abspath, dirname from urllib.request import urlopen @@ -214,7 +214,7 @@ with urlopen(RELEASES_URL) as resp: releases.append(get_latest_ungoogled_chromium_build(linux_stable_versions)) for release in releases: - channel_name = re.findall("chrome\/platforms\/linux\/channels\/(.*)\/versions\/", release['name'])[0] + channel_name = re.findall("chrome/platforms/linux/channels/(.*)/versions/", release['name'])[0] # If we've already found a newer release for this channel, we're # no longer interested in it. diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 7a6ad1abca4d4..f1c25264abca6 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,37 +1,37 @@ { stable = { chromedriver = { - hash_darwin = "sha256-154JPXP5qCM94zQRkRSvPKk6RGIhani7FUwOXgIwUZ0="; + hash_darwin = "sha256-m5kuSeaK4v8GtjlqJOP3isN/o+9uOxPuSEegi0nYaOM="; hash_darwin_aarch64 = - "sha256-HButB8+2DRiaazyBiT3643sBLaauRAZ1rvmEtt8Whac="; - hash_linux = "sha256-6P9K6XTByonHaZYvOP+jTGizkmVdS8Ryn8UwV4BMGdQ="; - version = "126.0.6478.126"; + "sha256-9WQH8Z7v3PtFKHA6bsrXgCJDWevh1YPjPyDp7M/xhlI="; + hash_linux = "sha256-dp060EKhFI4aRTBGLB8PyqeOj25Ov5Bd29KyESUDcwQ="; + version = "129.0.6668.70"; }; deps = { gn = { - hash = "sha256-mNoQeHSSM+rhR0UHrpbyzLJC9vFqfxK1SD0X8GiRsqw="; - rev = "df98b86690c83b81aedc909ded18857296406159"; + hash = "sha256-8o3rDdojqVHMQCxI2T3MdJOXKlW3XX7lqpy3zWhJiaA="; + rev = "d010e218ca7077928ad7c9e9cc02fe43b5a8a0ad"; url = "https://gn.googlesource.com/gn"; - version = "2024-05-13"; + version = "2024-08-19"; }; }; - hash = "sha256-Z0QeUG4ykNqdlxXYgLteJQ0jS8apC5kwW5hwlUnhod0="; - version = "126.0.6478.126"; + hash = "sha256-L9h9jbwEMcUi/cu7FP2O/6wD0Br/3SzWCazu7m9ua+o="; + version = "129.0.6668.70"; }; ungoogled-chromium = { deps = { gn = { - hash = "sha256-mNoQeHSSM+rhR0UHrpbyzLJC9vFqfxK1SD0X8GiRsqw="; - rev = "df98b86690c83b81aedc909ded18857296406159"; + hash = "sha256-8o3rDdojqVHMQCxI2T3MdJOXKlW3XX7lqpy3zWhJiaA="; + rev = "d010e218ca7077928ad7c9e9cc02fe43b5a8a0ad"; url = "https://gn.googlesource.com/gn"; - version = "2024-05-13"; + version = "2024-08-19"; }; ungoogled-patches = { - hash = "sha256-DLxtXcm4gPVzBeGxjD4harmdQWoH8LKn6GBlhtq/MVM="; - rev = "126.0.6478.126-1"; + hash = "sha256-LKtkNFb0y1v+p6hInulR7CrRO5pPk5J5Jd4nlAwZRwI="; + rev = "129.0.6668.70-1"; }; }; - hash = "sha256-Z0QeUG4ykNqdlxXYgLteJQ0jS8apC5kwW5hwlUnhod0="; - version = "126.0.6478.126"; + hash = "sha256-L9h9jbwEMcUi/cu7FP2O/6wD0Br/3SzWCazu7m9ua+o="; + version = "129.0.6668.70"; }; } diff --git a/pkgs/applications/networking/browsers/elinks/default.nix b/pkgs/applications/networking/browsers/elinks/default.nix index 8a129f2fdab8f..3dd71ab810e75 100644 --- a/pkgs/applications/networking/browsers/elinks/default.nix +++ b/pkgs/applications/networking/browsers/elinks/default.nix @@ -4,7 +4,7 @@ , # Incompatible licenses, LGPLv3 - GPLv2 enableGuile ? false, guile ? null , enablePython ? false, python ? null -, enablePerl ? (!stdenv.isDarwin) && (stdenv.hostPlatform == stdenv.buildPlatform), perl ? null +, enablePerl ? (!stdenv.hostPlatform.isDarwin) && (stdenv.hostPlatform == stdenv.buildPlatform), perl ? null # re-add javascript support when upstream supports modern spidermonkey }: @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ncurses libX11 bzip2 zlib brotli zstd xz openssl libidn tre expat libev ] - ++ lib.optional stdenv.isLinux gpm + ++ lib.optional stdenv.hostPlatform.isLinux gpm ++ lib.optional enableGuile guile ++ lib.optional enablePython python ++ lib.optional enablePerl perl diff --git a/pkgs/applications/networking/browsers/eolie/default.nix b/pkgs/applications/networking/browsers/eolie/default.nix index 69c3fdbfbca0c..1c82fa7d8612e 100644 --- a/pkgs/applications/networking/browsers/eolie/default.nix +++ b/pkgs/applications/networking/browsers/eolie/default.nix @@ -1,7 +1,7 @@ { lib, fetchgit, meson, ninja, pkg-config, nix-update-script , python3, gtk3, libsecret, gst_all_1, webkitgtk, glib , glib-networking, gtkspell3, hunspell, desktop-file-utils -, gobject-introspection, wrapGAppsHook3, gnome }: +, gobject-introspection, wrapGAppsHook3, gnome-settings-daemon }: python3.pkgs.buildPythonApplication rec { pname = "eolie"; @@ -32,7 +32,7 @@ python3.pkgs.buildPythonApplication rec { gst-plugins-base gst-plugins-ugly gstreamer - gnome.gnome-settings-daemon + gnome-settings-daemon gtk3 gtkspell3 hunspell diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index df8d45d50f1e6..4be907711c295 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,1035 +1,1035 @@ { - version = "128.0b3"; + version = "131.0b9"; sources = [ - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/ach/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/ach/firefox-131.0b9.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "91b9fcf837ffe54df7712f71b608b636464c8222e96d39f6714db4939848e47f"; + sha256 = "4763bf000a15940affeccfe6e3cd468a9a8cd89db8d790292272f2819c980c07"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/af/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/af/firefox-131.0b9.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "ccafcb76d6f4635edef530be87d8dd4762c81726b5cad9c2cc3662bd65360ba3"; + sha256 = "85046ad1fb678e95ca835435aa0722552a774e2c71f0b38cb9d15ba711d37c10"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/an/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/an/firefox-131.0b9.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "d45a54fbf050485a3513ed4420d6d79912146fe6255e1bb9d0c8438222d20899"; + sha256 = "353952993afb71045c68f373b590ba3a496981a365d2f4f0c33300f82750a87f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/ar/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/ar/firefox-131.0b9.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "f0304395c3c4e8d8be8dbc5664dffee5c2f788d4bafe304d1ab4db82e76077ce"; + sha256 = "9965c0c302662f0863bce753d538950f0f5425575633f299188850505b9ca1cf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/ast/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/ast/firefox-131.0b9.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "fbd5d17af1d32899de32d5e76f0da6bc9cc232b524f08ed1592eea3f03138e67"; + sha256 = "b8bf592307c2719a448f9203471e3e71e90e1bacc41509d54a50307c3ac3920c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/az/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/az/firefox-131.0b9.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "cc41ca3a46ace0c4e5bd2e0d503ddbbf92730dbaf24bb4c32b15481a51331ea5"; + sha256 = "4a58014662c43072ae6616ff98c28ca8f54fd883329789c41248bf5d63c7404d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/be/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/be/firefox-131.0b9.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "1aea189544651679d4d590d7eb9de7b59290df85d738dd1e97575f863352ef7b"; + sha256 = "f6845ab9a4715d92841973723c1126ffe10bf45a911c12cd74e3a09bdc1ad2b6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/bg/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/bg/firefox-131.0b9.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "0c191744aac8dcbea9e7047adba99fca2f44eb2456884ced55daefaaa947e14a"; + sha256 = "9d180594754fe68366fb37ae22c9a1fc20ee429ae997ef482f7bd192f1ece760"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/bn/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/bn/firefox-131.0b9.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "83c7fc7558574813a920d3f9fe07bdd7163585eb82a09d77e889cdac6e684b81"; + sha256 = "8281a1f5577892eeba43c761c66c26d0304faab55d5e4579a6f977e26f3fd6ae"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/br/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/br/firefox-131.0b9.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "2cc6397f3c67a46c01f9bc0d891c781239312277d60be79bd3152156fcccaf9a"; + sha256 = "188e8f62ef978a7113b648caccf581055f64925a170351169d193d8635492b97"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/bs/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/bs/firefox-131.0b9.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "b75ea133c0237d67ae6480a3754d7edb8757e4bfc3517fb04e3d143f0abe70ef"; + sha256 = "b3ec4dd38cc6efdee0bea477f3cf804304d4b36b34b124cd969b7f5925009e30"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/ca-valencia/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/ca-valencia/firefox-131.0b9.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "658cdcb9fb3b12dae8b8f11458c36955afebd60cc2578b544a02c975ff8522c3"; + sha256 = "f2519beaa589ee54f69e0a5d35c583fdabe80df247aa83f7915e2370c457d8f6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/ca/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/ca/firefox-131.0b9.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "b4c12e3a8d4ceab2eed6f29ac27f3e38ee8410ea49f809021f30915357a237a0"; + sha256 = "22dd974392d30780b1a233406153082d292a7ad9ea3920f0afd315c6c9d7796f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/cak/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/cak/firefox-131.0b9.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "496fb9b680714e84895c1d88a56443a9c85fd983d3a95c647a9fdff348db9145"; + sha256 = "6afb592800ed07337b807a6bd925c4c0db40c9d18a28b7976a88f349e0dc46d7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/cs/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/cs/firefox-131.0b9.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "e9a9859fae4b699ea2ede1646f49cfc2663519850f58ddd72c97e8d82dc8b04a"; + sha256 = "5975de9356392c335c37136be59c157a0364238eada296d356429f3c9a3c232f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/cy/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/cy/firefox-131.0b9.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "806f6d644c8c3dbb7c150ba4b984185ed669ade7841240b2c4135f18b6808923"; + sha256 = "ff96ef11edde597f1c8c4dce2da4d6b9c72e3652c911d7e34368a9dbdf5fe1ba"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/da/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/da/firefox-131.0b9.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "bea3bd58f51c4e1041e2d4694f56ea27efb7e31b2df24fca43c77c7b5e07e966"; + sha256 = "620e6b7f7398e9942b67e41c6c850739a753ed46bcf82ce504c8e9912c46cd97"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/de/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/de/firefox-131.0b9.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "fce8aedc5386ce726be545ecd6e8ee9aca700fada5b366786a85e48e7e1e477d"; + sha256 = "1bf2006d6c8c2275eab203ba2d6a0d8aefea199e7276c4a33019400b2557fe2c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/dsb/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/dsb/firefox-131.0b9.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "660553433ef3117f0caef5029e13e9edaa2b7800dd01e3f1f408a34cf5970d5c"; + sha256 = "600f9fd28335e4a86a79d3e0a8a83d8037e439426ea514c4257316230092d2bd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/el/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/el/firefox-131.0b9.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "edfdac7737acf7f3d63a1a65900b16f640b788fd127df19b9796d05c1e6ca630"; + sha256 = "d14fce952540ab83fcea14b8318817138b93d4ade2fc95c38211e3888fcb152b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/en-CA/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/en-CA/firefox-131.0b9.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "ac420dea854ea1e7ac5e408a54fc5590f341edd3d7a2632b56a6b77edab80ba3"; + sha256 = "f54ee4901ce8d26f812f97f5a1aa803d46c3b79e9db85fec7d5d49ae78b2d3b5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/en-GB/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/en-GB/firefox-131.0b9.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "44efa47918922d1883c7844b91ff03ff756eb5bdd726d35db92875048bf7381d"; + sha256 = "cbc631160a71849b8f104a8e3486b750b1d1e614bd763c6f4aa67b2a8b804680"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/en-US/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/en-US/firefox-131.0b9.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "a44bd8e6c0cbdf28e270190f5dcaab0b803103509f556619047990551b7bea2d"; + sha256 = "6b8b2aead8f8ad4ad979277e2af621ae27d6a2dc11781abf85f11e1a867411f4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/eo/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/eo/firefox-131.0b9.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "2128ff79b43fdc1e8f61135a83c77d2413250a24900c349e520147eaf7bc9152"; + sha256 = "ab1c46580ab975f9a1318e23b8d8269b485c9ffd82696d2579efbce6d41a7c67"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/es-AR/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/es-AR/firefox-131.0b9.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "0b4c2cc2a8256665284e3dda0ddb9170fb688ddb5eb02ed0d1e377cef2632b22"; + sha256 = "00e238aa562c1700d8faa26b0233e17f6185a2cc2599e7842c34870d9e0227e5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/es-CL/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/es-CL/firefox-131.0b9.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "10be1cdf825a91f337704e4ca5cb94bbf6f1c2d50719a13dc97c24b8f65a129e"; + sha256 = "d6a1d8734908c47e5392670f68ee6bd413bb2d81635da5e244e9ccd7bdbbd0d8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/es-ES/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/es-ES/firefox-131.0b9.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "29cfd6972bc67dfa4e9bf4e57a0c28cba229f35c54457819fc0ce1f661f73ee0"; + sha256 = "ef25296096196e03c4d73156b0915e15bf5de0a3beca46693902e0bbdc276152"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/es-MX/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/es-MX/firefox-131.0b9.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "e652e6f9a61a21f992cc81adfdbe506dbd1fafb91da6519e870d65e5356a3951"; + sha256 = "c41c0c851eee771d4c12a0296979837efc33730448d03a34565c326311efee4e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/et/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/et/firefox-131.0b9.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "086736332b848acd6a8c010596331fdd468e59835c202ede90bcbf66a326fb7b"; + sha256 = "810668f7056a9e025bf48f0e1dd07ca588b1e159bac5c406460f18372c8a126d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/eu/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/eu/firefox-131.0b9.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "817eafa8d1c57a99a2e51dcb813d9d4032bc17ae67e6e48cf1b141e87899049b"; + sha256 = "f9a7f2caba22a34d7363ef3e0fe2097ae577fffb8f410b5e4544ea4e158fd7c4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/fa/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/fa/firefox-131.0b9.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "9d09bc0b7f3f32b483890d67b9991a72b9492e1ad8be3418064f41fde5bcd5be"; + sha256 = "9ea0945da1a54c10bec5ae2c459963ae6b87ae2958b35a352ea2e7c7aca86e48"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/ff/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/ff/firefox-131.0b9.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "e6221fe30617ff74633292ddf5b0108e3a2fb7f3dd96b33df53eccb46ba4bd8b"; + sha256 = "103b3246e2411b27caf160379581b33ed1b749444903a4194b0d33f1b2ea3c1a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/fi/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/fi/firefox-131.0b9.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "5dfef84c2c997de1da02cb3eed105babc3d981d34649747eb10ee73fc63fa32b"; + sha256 = "2a25aa1fc5bc4126b93a47acb8554c4e337ab40faa5631b729b8f4b8b1278199"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/fr/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/fr/firefox-131.0b9.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "e6bbe850823430b63b8a9815e2dbab02cc1eb470a9d5c88aa1a079fa3ea12f9c"; + sha256 = "57e5b8cb7ff457f22c40d75cd6f4b997afdd0b195f9d627bbdb08542c8bc0c84"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/fur/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/fur/firefox-131.0b9.tar.bz2"; locale = "fur"; arch = "linux-x86_64"; - sha256 = "1c0e9148fcc302bb29993b0bfb21b330ba6a1b319acb51b7fabc8fb20d0af3cf"; + sha256 = "3e6025dacc114d5798a74816d5b688f1b35fcd8e43664c53b2ae250790fdaa31"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/fy-NL/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/fy-NL/firefox-131.0b9.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "3953327d4bfd475ca743b51cf2613c21362fa48241d9e720dce61c10c6d07a02"; + sha256 = "94868a793e8f2f4d6489832d2f8f775f41a1e75cc1c2cadbfc9aec7bb490ea44"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/ga-IE/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/ga-IE/firefox-131.0b9.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "08a258714e5077881ffdc1f3e2fabdcba46d8eb035c2e45cc5cdf9b78255b698"; + sha256 = "1122f87064c7d34664a2c357ed572326b4722f2070d9ffb215a911dd4dee10e0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/gd/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/gd/firefox-131.0b9.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "a8cfed3eba163eb7d83da7d752752e50a66f763e7bc96947d28c843707e6a815"; + sha256 = "271b9616e87ae48d0a0f10cb354e4757762b8a6fd70d47c7eaf36f8175948f2c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/gl/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/gl/firefox-131.0b9.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "96c78ad70db34895c9b0de2f282818c8a8be9c328ccb86ab4b34a05f7e884756"; + sha256 = "383a27b1a3811dd920cca825eff6d73546df6cc43c91090a3b2802d18e6356c0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/gn/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/gn/firefox-131.0b9.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "9ca592bf9d78aedf2bf20213ab1494c6b5c0dc668dcc2a3d1b1291a6cf198468"; + sha256 = "3d91aa02daec75a4f46365fd2e01e2d8384b980de87a7c332e38f96b16ad40ee"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/gu-IN/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/gu-IN/firefox-131.0b9.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "ce4bb8c67dfdde7a0f6ade7af2408dfa29af687807e257b756235e8f0ce873cb"; + sha256 = "4bb2617124583eaa98d78747eb815c0fded49567b0322f12691b0d9d92b1ac3c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/he/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/he/firefox-131.0b9.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "9ba5ab6c7f2802f70098ce8aa01d575eeb7b0f58dacc10db1c4c99ede96de5b3"; + sha256 = "6cd73d1ed9d9b4a6e3b3f42eb2326e934bc63d8b65847bb86f2485203a984546"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/hi-IN/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/hi-IN/firefox-131.0b9.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "f9a9f3da6cfbeb6aa4a8f1f7865e7283b4870f4540789fbf944143b700686c95"; + sha256 = "b58ede5f65661ae777ae357f5da1e07915e52a649421772bb5dd8b9194afc386"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/hr/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/hr/firefox-131.0b9.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "b49e9f643ba870955b696994c552331453a84861f124f37014883c9cb6a544cb"; + sha256 = "540b9e4bb100ba1498e39f4fdfa40d7d3f6607054c679527c2e2fdf679c73dc2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/hsb/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/hsb/firefox-131.0b9.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "23ffe338d1aa10d63c577013d393ab6b13cba618affef5d7771712fd0596e51b"; + sha256 = "b77d277e46d2c4f855d3aa000da4e9664c93b734c679afe16b059e3b348df05b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/hu/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/hu/firefox-131.0b9.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "6dfbca5bd230abf413a0a149a6cd6cd21a61eae43be69f5402a9ce4baba48620"; + sha256 = "ef5519a39296a517876092ea902ba93bea1915a0d32f664e9a5c86e8933cf49c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/hy-AM/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/hy-AM/firefox-131.0b9.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "27c5564db6989ab00ea76734f375ca795472571d7f4b6fedc5135b071d58d97b"; + sha256 = "4f50d666cdd26affa0da647af3df72b8d960bdb3697c5efc6b8537fb26813704"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/ia/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/ia/firefox-131.0b9.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "8bdfd372040d0e2b2800eb9c66782334875b119f13dff164aa7320ff39856bce"; + sha256 = "5437999fcac257a3d7d83b2ee8267fe142583a39e0ffd80b8abe69a78bbca57f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/id/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/id/firefox-131.0b9.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "c9c2fc719b5502812ba5ee64351b48c10917880625667f0a0f00e02703cd77a1"; + sha256 = "2527e3f497eaa25bbe0650c249c3f07f9b1c451c74d58a7b47fbc542bf4fc01a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/is/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/is/firefox-131.0b9.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "fae14a04c6625a07bc73956ba990dd7e488e130a60770c89175eca6ac86cd387"; + sha256 = "565db2c30fa3d51dc6061c134e4c428e7d65bf1d99ebe8c936e0f13b14e9ba31"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/it/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/it/firefox-131.0b9.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "4a28824f54e51f24ced026f78ee980e2e36802dddc800d1a0b02517a250f7ada"; + sha256 = "cbfb895d5e01e2b4c80592dcf9a6a8a67fff3fdd926ca418066b52c5cf8af486"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/ja/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/ja/firefox-131.0b9.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "30401649d210eb1caf484548de20c260a6a767018135502068cbdea202eebcf6"; + sha256 = "afe3aad601e339f649596754620a6cb41178e0580e2e04dfc3525921177ec2f9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/ka/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/ka/firefox-131.0b9.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "6355e66d1428fb69d1c900d42440d73b0d59bee89146dffb7af457ca411b2aa1"; + sha256 = "037ac18be525fd286e58d3cca21a83a92962df5b5317f561f014536e71eaf2a5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/kab/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/kab/firefox-131.0b9.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "52d5431b2d7d5b0b3f0b1bd67251f65146ee653bc78fb16c84f99571c01e6bd6"; + sha256 = "e26ad34373517016e32b6e1901f0b1a310870f2ce269e7273e4f3d5859c164aa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/kk/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/kk/firefox-131.0b9.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "03d0e5f8a5b60389448aa74fb94b865237778da749dda7819fc23a585e121b37"; + sha256 = "ff379878de875600ec9c229153a37500f6f1b4e2ff0a61916698e18da0235b3d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/km/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/km/firefox-131.0b9.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "e049a895091f181e91288ab79750d9972e22afb45b5b64c61832a654f9972c57"; + sha256 = "abac0d85952087d33c02880c689ab47a8b51ff421e6e7d1f2703250005662e21"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/kn/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/kn/firefox-131.0b9.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "705aa81ae0963aaf689fd5cafa60e293f7d281422d6ad127dbc7c9ddfa0dcfad"; + sha256 = "a4fa0dbe1d51351c8ab54cc44bf4a3810a6919049e174d93c7dd64a86838c0c7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/ko/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/ko/firefox-131.0b9.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "82e2cf3543a48a0678338200309730fc3a699f7a984f1014c0ba8c5945bea518"; + sha256 = "02901a60da1e4ac3b8b70579ae003270dccefc72c112f4bbac1e3ba38a391a9a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/lij/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/lij/firefox-131.0b9.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "4cfed1c937cfb45b1ac05c4ccbde72275644ab95d4d6bab2943ada5ba81f5b68"; + sha256 = "2f4d71e54f56426651218df43cffae83d4a0da4f775f9e540d21f9e4e059d6c9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/lt/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/lt/firefox-131.0b9.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "24f865bb38ad0c2d02e51840649b4d827836edd1f706393d16bb43b63f76a835"; + sha256 = "d27567298bdd12f95089983413d3379987b2842fd94e29761aa83c89908ab3d3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/lv/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/lv/firefox-131.0b9.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "fbba425695890a2be1736653dc4c49c94efc17d09cd883f5e137afe212fdb25a"; + sha256 = "781792bdd0f5169bda104c1bce61d80e3dfe854a98dc469d5fd89145e7480c16"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/mk/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/mk/firefox-131.0b9.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "e8773525b7f2c0fc82afe01457c7074899d968675e9bd293264e22403b4be8b3"; + sha256 = "441acc04a7796fdd9a693049ac2a2a99e19ca26d5433158a649dc9054cc78bfd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/mr/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/mr/firefox-131.0b9.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "7a790e94ea8cb0019d72f11d1110e1035799b9e9d2e6ebfc5cac502c94db8f68"; + sha256 = "a45c4c84a08f969821f060d81e6537600d4c6f7be4bcb7967e0a1e4df8057985"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/ms/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/ms/firefox-131.0b9.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "b2c32fa4c9d4eeebefea7b235b91a56e2ca3279c02f64520fd8e68048d190acf"; + sha256 = "9a1f96989aa5b0f5f40bd9b89f813b586334165d28ce68d0ea811bf4b4377a12"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/my/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/my/firefox-131.0b9.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "e247dd90ffed9fd6dd8a7cf8667a934f211fdac32ae853b3eea803cb490caa9d"; + sha256 = "3622b5b8c9af179a8a536f3ce616132ebd8d3dc13f67a0368c7190c579cf9dbd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/nb-NO/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/nb-NO/firefox-131.0b9.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "843e3303bd29807c2c4f27368173e0f9c32fdb16bb2c151d47c5b5099b92dcb7"; + sha256 = "062a00dec6f88988674e0b79f3c53215dc1dcfd270f04f9dc24fc0c69cbcc3bd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/ne-NP/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/ne-NP/firefox-131.0b9.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "f88683ca97cc178aad54d921aedad7ba6207f9320a5fbbc2ba0d6d7d7ef8f46e"; + sha256 = "9a83d84d258cd1ad43dda913423825aeaa3e77f7c51fff699cbed4932b2fccac"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/nl/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/nl/firefox-131.0b9.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "4d06e59feb4b38fa08197ba3aa4e57d97265f04c8d7c5f8de31fefccb4b38601"; + sha256 = "88f5a6ef96cb7aaff5903085988a43a0f5bd38c85e353076d150434986d571b3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/nn-NO/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/nn-NO/firefox-131.0b9.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "91d60aa0cf396e2f332c2c215c92d0dee58cf484c46ff3e2148e974faed843d4"; + sha256 = "0c226da7a894a8d13e6442b49ea60712afb95409fc0f8c786915594142fada35"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/oc/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/oc/firefox-131.0b9.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "e51325109a7d1a4e5277abc42e1bcce67e6872210f46412fda78c56ea0a5ed48"; + sha256 = "54e231943cd9766431635429ba349590a9a80bfecf66eaad597d7c72cf4dcb0a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/pa-IN/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/pa-IN/firefox-131.0b9.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "c2d0844b1e1dff71ff68498e8a8ed95efb058ff2e9938950d198fca0f01b2465"; + sha256 = "c9dc7e8f3c8dce9ca52f033928e7bbcc955e06afbb2d1322c6e4156d2b079d76"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/pl/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/pl/firefox-131.0b9.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "417a7f871b5a5ad8292d732382e945fbb5cd52cc114659e78e305dffd532d98a"; + sha256 = "b310f3ea397ab1c84c0e4481a6a8d95f026766ab757faa412e5963a883c01fb9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/pt-BR/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/pt-BR/firefox-131.0b9.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "f9cc05d47834d2cae826b72efc2c66b7d78fee9d0e1a49ebca4c95f7d15d6efc"; + sha256 = "aa2881ab9553305e96544a534f42a476c26cbc206658ec2fe2b4927085e74481"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/pt-PT/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/pt-PT/firefox-131.0b9.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "ac12dc95c8558f67dd648d383d6f71d66fd01b408fdbab01f63a4d80e64f4945"; + sha256 = "a8b171efe5ea76a3dacf02931f4bc4373aee947c9c326a514618fc827a0c2fcd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/rm/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/rm/firefox-131.0b9.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "727ba61e6d215858c92a9242ff2826d8ca1d63acb92fe9807bc9896495a47e42"; + sha256 = "8a05a553e9e0a35db3e871604c6921441d1eb859d9d05a2de8ac5e65ac3fb2d4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/ro/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/ro/firefox-131.0b9.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "c53ba875f108a47f0c19e1956f988b1dc2882ae9fd28321c81254b4861b0169a"; + sha256 = "1873afb93447fc534b18370f8349e871dac5c8aa2f7380fec998a95259585d4f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/ru/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/ru/firefox-131.0b9.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "015278da272c3c91fd566aec8d7f7d155cd1e38406049b136cc4656fc2a23629"; + sha256 = "dc4c06cc1440b014a85a889ba019e4ef1a5feb89e870f4dd7ac687114f6cd3ee"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/sat/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/sat/firefox-131.0b9.tar.bz2"; locale = "sat"; arch = "linux-x86_64"; - sha256 = "5954a27e1dbe063dd3959a93d472e73e9b609cf57e3638e0332b354ea3628bfe"; + sha256 = "562d52bbcbb8883bf4a790960dcd91f090b3c2f8899c03d0440edbe4a30a0eff"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/sc/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/sc/firefox-131.0b9.tar.bz2"; locale = "sc"; arch = "linux-x86_64"; - sha256 = "4e8435a0716f906830ac75c9573ecb36279cdc1f6321795a45f75daf08c4b41b"; + sha256 = "e75d71ba560a52a50c8032bf4d7df8da27c8cf8eb7cf4e9016e56a6377df1b5f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/sco/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/sco/firefox-131.0b9.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "ec1bfbeba046492deaf3d42cfeede879413f85b7eb4e85c9ddc064660c088860"; + sha256 = "e94f83e68516732fbbe00ad6caea44ae166c996ddd05fd2a7049c187143ea277"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/si/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/si/firefox-131.0b9.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "8fcbd1ef4c1dee115d60649c2c47439e9799ccf8a34d9aa09d6bf0d5d62e143f"; + sha256 = "6883130e8537d9d4d8213103a75b9bc31b95535449ddbef258a602c11bfe144e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/sk/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/sk/firefox-131.0b9.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "695616f84bbfe2c7a4dae8d9d30068419fedc5448a26733e4f5f35fd1c5c4002"; + sha256 = "6343a3fb3b7c8ab39c87c5abccc4eceb9105c9f59e6dc8944e2a2dc7b23ac073"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/skr/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/skr/firefox-131.0b9.tar.bz2"; locale = "skr"; arch = "linux-x86_64"; - sha256 = "0c53f9fcbda34c8df1d3495e447835fc6a6b7e1ef41c1b65c3ffb3f6e92060b1"; + sha256 = "f74f73fda01b36deed700f0b089bd3688f60b76b61aa1444a1d092d7d54599f8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/sl/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/sl/firefox-131.0b9.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "8d9b8253d25bc88667c3123a2d4c134a9e8fa4078f992b41ce8b3b8abc192393"; + sha256 = "5c5a2ced7e9236d0cdbfb566105128307bd0012cbdd39af705e48b262e85aea2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/son/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/son/firefox-131.0b9.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "ac4706045196b94245466b8ca8ce71215ba23937d675d883ad926c8cf6a3be90"; + sha256 = "7e1bed00b5d0daa360a0a0b019cd9d4130006cd269c5e092ff48ef3288da21f7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/sq/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/sq/firefox-131.0b9.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "0d40ee306d601eba916d19cf89241e7a7dcf3101d33e3834c4fc39f37f06119a"; + sha256 = "d49e5c8bc7d2be60ae98b4a9f07579ddec4b153b300e35c6d1aea2d9f66ccc8d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/sr/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/sr/firefox-131.0b9.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "c27e8606ae5dac9a957b3dedb453e1dc9bf560b73bde942d84b20ffa51d49339"; + sha256 = "363a6c7cffa7e5088d7253dce1e4981752a43a57c57d2183471644415776ce32"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/sv-SE/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/sv-SE/firefox-131.0b9.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "81f2fa7b349b207482a013a4f693bf05be6ea0baddbc6f5ba0659e6b72fb4f9a"; + sha256 = "5a5e86dacac51bc734078575bbb394690ddb479830c95ace2520403249f4d386"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/szl/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/szl/firefox-131.0b9.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "7f6186f6936d343feac7eaa0de4c3e1359011d7a7785c241d56757db9926b186"; + sha256 = "cd8d6559dfef4999094775ccc7499170d5f41304215094e02a30b4c63017c7e9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/ta/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/ta/firefox-131.0b9.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "59414f762f5f5de1e172f71204cd21bc3861c3fac65fb7eee64c1dec1617ecae"; + sha256 = "a83ff685e9a0b45c32ebec720382ab696f1135457369a44917ec34ebda26db8f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/te/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/te/firefox-131.0b9.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "511c1d35bb3caade5771e060ada9674a0bc4917d4da806618678b04618ba17c0"; + sha256 = "5a2d5f05b95044bdd40f89ba7110b74902295b51a9ac59ef3e645b241bb90622"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/tg/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/tg/firefox-131.0b9.tar.bz2"; locale = "tg"; arch = "linux-x86_64"; - sha256 = "4bd660b137d7240f4ae6ccb15ac750556edcbfe47e6a65e1c29d8ee599b953f5"; + sha256 = "0ef5be4109ba6caafa91edc5ad32149fd76ed045258b045f30c1aa9b024428ba"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/th/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/th/firefox-131.0b9.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "19d1641e4904bc4ea993dbd4d8a84538a4b88294721883e27df8db649a7993e9"; + sha256 = "5ac6d03de6aab2c5280fa880a13eec2cb228c02fe307e4bcd2e460cbe2f10ae7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/tl/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/tl/firefox-131.0b9.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "4dbdb2c35ab40bcdf43ebfdd51848115dd617306f44878d8b2d0c2f562da8095"; + sha256 = "6518de1b4deb40cacfca830333b6909f451e54d087fe6badfcd1c7dc6a32876e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/tr/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/tr/firefox-131.0b9.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "6f267217aec01eacf239957079a792119bdf9ecd988835b4efee68d757db682b"; + sha256 = "652367b86b180d5f9aa2fc2175069df9f00f270a9a526f6db3033df1e4ecf7ba"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/trs/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/trs/firefox-131.0b9.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "a0a1c980dcff845c2aa858e1a44a50b00fa0378443736abb3438fc86f9826d7c"; + sha256 = "c949531be0a24259947c66581cb30c7e8ff0e046cdd5b80616ce32c24d4b394c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/uk/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/uk/firefox-131.0b9.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "d0fdd0b81afb141faff7605d302d1934788968ef3dcff38e1078d3c4e14851c7"; + sha256 = "9b705eb1ae999334bb3a652aed2a69b1112f7bde18b2463aa609f6ca82237304"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/ur/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/ur/firefox-131.0b9.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "a680e79a663a58fd96e2d103b686efc252d3d9427808c7e760307862be1d145e"; + sha256 = "f9543650db97d04106eac07897faea7115e1ee6180996c3c94dfae3a5d34363e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/uz/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/uz/firefox-131.0b9.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "15588e3d356f2bc8adbb69bd53ca9ca38b0304703bbe7a6e16879d334af766d0"; + sha256 = "aedadfeb84a3efe02eae59f806d827edb36271aa3c5ebf46e4e264ab937c6ab7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/vi/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/vi/firefox-131.0b9.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "44ee2da45fe203fe8f890c0e6ce8af05accd3f1cf02c97ae3f2f7a49da3aee37"; + sha256 = "87dfc6ea7811478111a426ec5bd71bf13f30f7d8161c49570124e23092fedc6d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/xh/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/xh/firefox-131.0b9.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "70a378569879d37fecda5be44e88335fd156a15ed4fc52393956952a914f9744"; + sha256 = "95ecc4eb6b769de9b2d30cbb04484f3845d79f6f097ed3d4a61ea5e231faa93e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/zh-CN/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/zh-CN/firefox-131.0b9.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "453f1d607d2584386d91c16d69cb8ccbe752b3017fd472f2370b081baab87949"; + sha256 = "15475cf50d40b86141c1e870e24d280d79678885977ffcb417239d3948ac3d3c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-x86_64/zh-TW/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-x86_64/zh-TW/firefox-131.0b9.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "3ca21ae9b1b1ea51cc0d3bb1afce4f394752fa957a0f7d8d4fb047c9127d31ae"; + sha256 = "d3e80bda223fbe9ee08bf1f6e094793ebb0ef1a16fe56ba58362e6c62a22e546"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/ach/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/ach/firefox-131.0b9.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "f52c6e81e51c03463dc74fca1623c16917ee429fb916f5ce71aac557b7030a3c"; + sha256 = "69eb32eb9819bb9d01b77d10e5429a8770cc2970df5c460747dd7335ad0877d8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/af/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/af/firefox-131.0b9.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "8bda42497ef0919306ca305b295cd9a85c9344c6be3a4d6b168b7f419bc76cbf"; + sha256 = "8e2d978913ab8b2e8b8bec9ae3b64906ba1cf0f71bfb79e5f942239659f6a5a2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/an/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/an/firefox-131.0b9.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "5090a3fdb62a77eadbd50722c3be9f56bb407240ea47e248ac56550e3a3b061c"; + sha256 = "5d361f9a5720a958e58757e23ca8fd9852bf6187c3ae9a90b8c0457991e6847f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/ar/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/ar/firefox-131.0b9.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "64f61f7e9838aeb571170d54b69c239855db32c4410d490275aab16df0c57276"; + sha256 = "614b31438e1027d427fcbd2cc49fdc149c407c7c7b58f2ebb711fe152e0a6620"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/ast/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/ast/firefox-131.0b9.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "816ac6fba66a0f8e185108e8338d59e675bf1262477b416dd76b026ed1ef5f9d"; + sha256 = "f9a7ea4bcd928db80b1abf8bfaa375fc685e142ff70dfe892e414672af2312f1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/az/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/az/firefox-131.0b9.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "cef18031c260d7c00ab43473c1072e7310702df92e40ecacb560a077dc56200f"; + sha256 = "5cc255cbe0df8bd7441f16cd6337e64f335aa06dfd0cb1a38d541a2e2e4d9499"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/be/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/be/firefox-131.0b9.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "229a9504c02d632a611216f0b64662122aab2618aee4400cb44c162710087548"; + sha256 = "a4724722a484dbf404897f0c9f387d1485f50032f28560826445a11d35c4059d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/bg/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/bg/firefox-131.0b9.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "6de9441655c9256b96b38b0c2318237ef7fdc4079d9a0a17370a4b63949f8952"; + sha256 = "084c33231412d7e6770cc730b3f33db1588889bf64108cacb19f7dfacc6694e9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/bn/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/bn/firefox-131.0b9.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "0fa84544a40e254e3b5d363a5fd48e6f00a2bca65e71662ba3bc874db844373c"; + sha256 = "94cb150193c6f5ead5d7c06fff92ebe5c51291037f10b5e9e3d9d51cf910883c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/br/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/br/firefox-131.0b9.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "3c3553966e4b2ebe1ca9fb0a4625f58644fadf660dc38f053c898bba8cd9652f"; + sha256 = "78e05cf9b8a735a28ca2593a2e729883478245579f32d6e8b11b247c5dfae586"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/bs/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/bs/firefox-131.0b9.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "1a7b0f5fd82dc2e0efe782d87e442c56c7ce3cc4c3c4ff2118bf11356134aec1"; + sha256 = "06f1ef247527e3d421bac33e34fb4e46c97a866f14c7688517dee7189eb3267f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/ca-valencia/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/ca-valencia/firefox-131.0b9.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "73ed405344bbe118a1351834c1e73b0811d76db8e5ab17f59f17425da6e80284"; + sha256 = "3ff3279d3adfa248b650f57a4f6fe094ab75d3ef0daf4b93a55f17685341e896"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/ca/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/ca/firefox-131.0b9.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "f1d9e5e3ec259b3f860988c96b6c28430346ff91909f6ee4a4de64562d9cf632"; + sha256 = "ce26536d2db9581f9b92c1e386cb172546df4e0f7cd40cb54116b7bc66cfcf36"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/cak/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/cak/firefox-131.0b9.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "85d8e7f0e98b3a0f6c19102cea11d4be590204ab27a5bc801028918aeda7d903"; + sha256 = "61629cda585866b87d0047adc52b733df91f5ac46b161e955cf3c8b7962750f7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/cs/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/cs/firefox-131.0b9.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "5552ca41e906180741330360c1875e7d14a6c8ffa436a45440377c4e734a1d66"; + sha256 = "8d365f87da2d7c2b396e1bdb8fdafaa4daa2c7421cffad935e24e40636fc4036"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/cy/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/cy/firefox-131.0b9.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "e7a1796463195e31a7a8caa1f09344780deab06c9a3840fe7ed5a6316ff0052f"; + sha256 = "69d62b9ca499d51c99f796a91b58d9bc52bb73c4883ffe48982b74c1011a1d94"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/da/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/da/firefox-131.0b9.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "3042716cb2af826d563047e6881ff01eebb9e13c32799c5e64f0a2d9207ef673"; + sha256 = "6f8231de644fe6ece3e5d8765585aaa2f781a2d0502895be840503600d173c51"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/de/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/de/firefox-131.0b9.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "952c3133123b81382544f454a76d52b8c42fe42e6a16630c5e7a60e5af004dbb"; + sha256 = "0af79c076391c3e809d88c53f017059ce673b16c91dae44fe314550f99f1621b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/dsb/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/dsb/firefox-131.0b9.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "f7d6e3ef16b75fcb51dbfd940beae3baeb8522b21bebefd56d0916ae79b32efd"; + sha256 = "584be70610e13bc2236cbb6c8e3ac22ea487b8dbc0edac9c05e74bf3171558f8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/el/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/el/firefox-131.0b9.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "57ec8938ac22aec300177f6399aab3f96a54ce6090017531b89a559e374f17f6"; + sha256 = "cbd65e86e40673e20fa15cc487cb34b17bb07a5346f25c4822b7037b3ac3fd5c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/en-CA/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/en-CA/firefox-131.0b9.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "77cd20e4daa94667e040ee418d76abd11fc8927ae667fb15da78d7ae9712b82e"; + sha256 = "b0136e885b4562b74dfe89e92b9c2f4db85693b218031e7fc5540baef6c44e78"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/en-GB/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/en-GB/firefox-131.0b9.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "376231eedf5d4804109b6ef5363d77fa6f27ea59e56dd1374c3c499596be6cdc"; + sha256 = "52e04c5559b439f51cfb128a9e2e3fc9167912162bc945da81f6be2355f50e64"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/en-US/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/en-US/firefox-131.0b9.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "263a12886beb8db84e7a5af38ad99061a0de6abd35da3ab186a46c31bb35b222"; + sha256 = "93f50d0f65931e966fce4efc049967ad413a9eaa6a3a0b73bdd160bb11cca7e2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/eo/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/eo/firefox-131.0b9.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "14be7e2ce4b24d218eeb58b0fa84b92097a9f3c271814d890f8d5eec93954d53"; + sha256 = "63ecb54b5c8640b3cf4302fa61639d25dd8d273e758ccc0d43c832a67320e240"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/es-AR/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/es-AR/firefox-131.0b9.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "7436d4d5be4d05fddc5e172b42a2722c89d38277b0fa425a691d95561870e979"; + sha256 = "76a371441d463f40f676b6333b5e041908ae1b53cd584268941232f57784d4fe"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/es-CL/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/es-CL/firefox-131.0b9.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "11c157f2a52b28812b6c0a81b56d9383ae1401dd1c066c9f940f5ab256bd1a8e"; + sha256 = "1272fea50d52e07512d86468f55c79222d8d10fab989326e7cb26596d60694f1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/es-ES/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/es-ES/firefox-131.0b9.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "6cd4b9d8b073cf43d249130475f17fbfb2bbfe29017eb5d2d8bd53845213d362"; + sha256 = "7080509303a493851c8519533f95394c97f4e48cb9edf4c71ba8015fcfab2db2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/es-MX/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/es-MX/firefox-131.0b9.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "56f5ff72178597ba5e5d20aa296046340e2563364cd3ab00a0292c9fbef48e42"; + sha256 = "5a8d79d8e90caff7607852d2516fe46984f3301e863ea676f6df0426458a39d6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/et/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/et/firefox-131.0b9.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "6e452e1b70d3d00b21b81b0738e1a7b61a8b2b54b41993b3c55737acad63e519"; + sha256 = "51bf97a75d98e0229712b5089514ef98ef9418cb2f81b0aa417b35b93a91b238"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/eu/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/eu/firefox-131.0b9.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "32a67b26a26affb5fe294dd07e660e046c1318ea84ccbbf7ce3461c60727fa19"; + sha256 = "ae4cb5677424112ca885b9e685bbff7973ab5abd2346978f1df4d04a5ec9da67"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/fa/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/fa/firefox-131.0b9.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "1bd6f9eb6e427cb4e6d2b11ef0634084dbe496f28753057157d23d05837f6ca7"; + sha256 = "6b2285a462be10594c197bf77443f3adf74282d9476c7b61d105f1e56faf274e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/ff/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/ff/firefox-131.0b9.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "7995c4aac2b688cd52ff5f9bd358c3f12199c95beed9626c24cade384a3a3fbd"; + sha256 = "63d7966b3f3888f94c2572a782f542a0c8d0459070a980cc10ce6596e19de55d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/fi/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/fi/firefox-131.0b9.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "26703afd150a9f78c8d6f36c7cce38a2add81c79b66f11d21f998d7db198cce6"; + sha256 = "9fda1052b11868a54132c45791e608da9198a394ead4cdccc4c33641fbd99639"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/fr/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/fr/firefox-131.0b9.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "e7ae04d4a77857cd6775e466625d75983d600cc016d4629e353d5e8d280a1b09"; + sha256 = "e05ac7d8b58060da27f51a54e9a42602b9c703a4ecea3f5516ba3bef5729f78a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/fur/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/fur/firefox-131.0b9.tar.bz2"; locale = "fur"; arch = "linux-i686"; - sha256 = "96b35eb88709069b9b18533045576435af1f900ee7b0f00c92c502852b4dc5c5"; + sha256 = "84f48f7f053bc954c6e3a0f49d6037d87eaebad140442e24ec004cf570f4e04d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/fy-NL/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/fy-NL/firefox-131.0b9.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "999dd239352f0fd6e57029aa8d5308bc9deb25d05d63680255f6019696285ce8"; + sha256 = "bee16b840dd96e1717d847dc9f0a21f39bbd1a0e3dd7d1e44c6abe570c2d3e11"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/ga-IE/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/ga-IE/firefox-131.0b9.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "0fb4d4fcd39d5a853c0e6fbb0521917d17c04e57d848610cd189d0846dc0869b"; + sha256 = "3cc432fc0616bc6a25efcd7b8fb7ca531a46bfa6daecfd1f9e6fd8c8e6de1567"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/gd/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/gd/firefox-131.0b9.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "1c19fd18a531671dd85d8d0ca0c797033dffdb23bef0771c4a828114ca9a80ee"; + sha256 = "b2e82175ac46f60330091ae4988431ca99589b5e29ce2164831374201231002e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/gl/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/gl/firefox-131.0b9.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "bbb1eeb336638d898ecb34ff69bfca6f68bb5629584e9cd90af36fb22d3adcdc"; + sha256 = "652ecc427d7db1959cbd13b8a6b3eac5bf460d75615318b3e33899c09e2c318c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/gn/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/gn/firefox-131.0b9.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "340b80fc5aa46093c4f901058e35eafdc42233e99fc5fcc1473e3fd6dd60b99f"; + sha256 = "af1b79fd7cf0ed1f2694065c5ee1f8fb87d34a472524ddee78757d30c2bf6583"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/gu-IN/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/gu-IN/firefox-131.0b9.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "487bdd9bb5b6c25d8052a3dc21325f21a51c4581aed7b51f38e5e459c9ce8ae1"; + sha256 = "a88d70e37ad783bfec45f5f3546df2c2ebbe42020bde496dba49aa2621079e44"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/he/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/he/firefox-131.0b9.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "93144b3cc3e7a7b6e929b928446223be25c21ff5faed04f9216f2e7ca716bba3"; + sha256 = "f3b4435ae00f6be336dc0c7278250f4b8c53a19ece0b32148314aa3ac3350efc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/hi-IN/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/hi-IN/firefox-131.0b9.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "1256ec465f672194c759ed16acb45ead09965a65ad277bca1cc7ae0ad7c811d7"; + sha256 = "41c595a8811d5f27775d99acd340a9aa8aa0678e8e4da525e0df68bb084d73fa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/hr/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/hr/firefox-131.0b9.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "5fa927c1f64d60cc050377a3d03af7fc49abe13239cbc36f78798f171895aac2"; + sha256 = "71dc76bb7b7f363b30821ef1ceee50df8063e50c55e922233843a3830bf00753"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/hsb/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/hsb/firefox-131.0b9.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "f806bb7d0ae916fdb9bb38feb77950c649a9c6312908aa5128f24a0e0690d2b1"; + sha256 = "eb19898c2578257846f822837848aa5a58cadb2e384e3bc1279f283872bba988"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/hu/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/hu/firefox-131.0b9.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "be3a162af629186655464d3c560a7b2b84df17239cb140d42feb23876f320899"; + sha256 = "c99dfa4470841565a60263940e697ea6068627ff6a382895a5b6644cc05d5485"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/hy-AM/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/hy-AM/firefox-131.0b9.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "1b343636f58cc56c388a698fcffdb024ccda95b191e0ae6901b093021113d1a7"; + sha256 = "717a9d71f0c4e9f458c7743ebc2653ed804c21808bbe33e24df46734d76c2929"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/ia/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/ia/firefox-131.0b9.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "05ddf494a749b007d34a450e4204bc12e60c7b549e86496d7b4768df4c0cf71b"; + sha256 = "66bdcbd7b27e71d26274614863586364cab5362a1a4e408da922f72fb5859fd0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/id/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/id/firefox-131.0b9.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "9119141c2a2a4ff814657a6f24ca3c1d62b3e5e607b5ef2913ab494630458794"; + sha256 = "916eb11604936e14fe256adfea3904d385282d470cfe7b822d6d24826b4f5923"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/is/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/is/firefox-131.0b9.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "8b91f199fd4905bb8fe9e1d3f745640975aa58761731fa54b1a24a7e40c5e0d5"; + sha256 = "c7922e665f9b382ccef7f3a9e50303ccc6cff61976f70a2dd8f176dc6efcc208"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/it/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/it/firefox-131.0b9.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "aa09600d53681b3a2bf512e287d051a2d3306a010835eb677ed754ffd4817d98"; + sha256 = "f4f7542197a31773045c365c3cebb432b272c1b0ebac49bbbf2ff2c39bfcd91c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/ja/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/ja/firefox-131.0b9.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "70fb659b22c26f7ee43113fced3aa98fd66f581227c8d56a5d8bc4c6bf9df863"; + sha256 = "5ba99b8a6904ff53cc4488824ae3f32c708752cb35df030e6973fed9ac9bc6be"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/ka/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/ka/firefox-131.0b9.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "652ccc32864b397adcd4b15d2c0da86287004ec7229aa92b65084f1f351c3d2b"; + sha256 = "f02989fce1be1761be71aa960b3f70327d747bc8d71e8ceb10da06f2599f8a2c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/kab/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/kab/firefox-131.0b9.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "e91014eaff857b5fc002c45f723e2cbe83b1701cbe9661c6ba0b52a19b621ac6"; + sha256 = "02b6b5c873c2f2a68071beb86df22e25b7b2aed1e2d1f4db955db534e6867c56"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/kk/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/kk/firefox-131.0b9.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "92bc97e900fc9d742d182b51f5f08ee39cf40e6875c7a2b9f1aeefc56adb96d6"; + sha256 = "57305885fc575780f61b244747ad99d694204051ee0a6812c5d46d43afc1f4e5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/km/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/km/firefox-131.0b9.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "f06d799edaaefef5277a76537c1f0dffb55416d3733579d9bffd2d658d4c16b8"; + sha256 = "ca423f1155bd45bb60d84bdb257b1c223e847735725a780d64c16d05b599dbc7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/kn/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/kn/firefox-131.0b9.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "73b00c3ce8795930afb41cc7b714c0601fe6a56fc760b91befa82c490a25ac4a"; + sha256 = "d3834fbbb1f9441a377bd78bbb6a1433fca18ef67215bf4bba17642354aa465e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/ko/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/ko/firefox-131.0b9.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "3b391cd22e89814ffa99aa4cc71902fbe13944f61b216ac1fadc60ef465cebb7"; + sha256 = "f57b61412b00d9942691405691b0c4ab71eefabcd8a2440a4a1207aee913da78"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/lij/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/lij/firefox-131.0b9.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "847b13a12d7adacf149047dc19b1d55991113b35a1cf506248d6360e25aa1c90"; + sha256 = "3786385aa819c46d4d2403c313e172ff5548f5ef41a8f8cab9cec0de2661e3a3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/lt/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/lt/firefox-131.0b9.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "550aa459d8a47c4ad1c33cfc555414d3e7dbaea052b0395972ebd43930db6399"; + sha256 = "8c9d2b0f829947046d5707437e53e98b56c36811bb4afd081a214de543c90e1a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/lv/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/lv/firefox-131.0b9.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "8f3b8a06e4f192591a0ede2ae19f91a4ed914e07e1e4a81bdcb5c279ab0353d8"; + sha256 = "25fa85bf802cba0358f01e9098306611baa047bbd796b9c1486179c4e181d4d0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/mk/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/mk/firefox-131.0b9.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "441a3e5186c8179c2bc969499f98e9e2858fb03883aced701b5940d9eb9f5096"; + sha256 = "1b5bc7720849a702206d07439adede9f06a3dc36df1aaedec87b11bd464cc950"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/mr/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/mr/firefox-131.0b9.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "8d79dd19e2940e92e98352d6a3bbb1b24e2ac288081b5ff27a8800c2158b61d7"; + sha256 = "8d75634cfab7c5398c5dbb1d198d80f3a530ca6be9492fe161b103d67fa3120f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/ms/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/ms/firefox-131.0b9.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "42f28f18a690c919c8d24632891eba9be4d76f68d4851f272e6be698b25779ad"; + sha256 = "b255028a855792af9c669b2a12e80dc6b6962a2fb64c29bc9b46e39b1a7ef83f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/my/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/my/firefox-131.0b9.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "a0457857e88c8333fef4a0eb6778868fc9c8b20e5019ea8e9503f32aa3d4cc45"; + sha256 = "ef1dc83a189e514c3cc446724bdb2325ccc806c7389acc85f751bb7356ccb9c4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/nb-NO/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/nb-NO/firefox-131.0b9.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "5329741c2dba6e06099036fd929098a161fd7840156217fafbd51f2563be7f72"; + sha256 = "7ff5c535300d391d5db869189876b2ba6c7fd8692d8acb32b23dbed587e5d404"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/ne-NP/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/ne-NP/firefox-131.0b9.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "3d38141d0bd291577e5f2a4d50ce0cdb7dd102aeb36ab9e54e01bea20f5ad58e"; + sha256 = "645e5f730f0678cce48e727b7d425b16197e45f259fa73ab2bdfb8d29ea0acf4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/nl/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/nl/firefox-131.0b9.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "00521293ada2395463ab4ef44cc6269e7a3635c84e3a1a44e598b47ea4d8bd06"; + sha256 = "38fb818029706b30dfdb3a133190a13b7c30ee62472a17cc2591ddf3403ae945"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/nn-NO/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/nn-NO/firefox-131.0b9.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "f0f4e97fe329841b763a3f4860b3e34764bad64f667455234e3aed77ec577e24"; + sha256 = "bcb08b084bc0c785ccbdbe7106896b81f77e1ebfd1652752780abd9b83390a70"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/oc/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/oc/firefox-131.0b9.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "a7bc839606bdc91fdef9ad18f574263579437fa3ea260d6f88df62cdbfe2eff0"; + sha256 = "79e27d2a621ce64315cce6c38599e6d12c3b18de06c594dd33090947daaa6c43"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/pa-IN/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/pa-IN/firefox-131.0b9.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "5067a3e713640b3864292cfba5f7a181f3aa4183aea98c488072b6f03ca58aa5"; + sha256 = "bde16ef9afdcc989827e0e014d69abec3200ae07d138df5c69a6e7c9787722b6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/pl/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/pl/firefox-131.0b9.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "c1a19f825218448546cca180631b7684d72152cf172f8d15339c9a477575631f"; + sha256 = "9e8665b37b0256e5ac0b62a88967ee337a5ff5d4625f7ae43cb13da7e51ad162"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/pt-BR/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/pt-BR/firefox-131.0b9.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "b62e837f2a504f804d9b09aaf98010d90080d1ff4747dfa9a992c72da3f82a18"; + sha256 = "66fa6a0361d64b6d2bec784671c77e42e0fb70db3a724fb57d5e4349ef1a4f06"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/pt-PT/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/pt-PT/firefox-131.0b9.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "92abdcc28b0bf51eb3a8ab5e43dc9638f26e8692ed69470d97bf45fe5e31ff6a"; + sha256 = "5c3b2f9f8589fee3214b3458c716214675b22608a76974ee154a0a3794ad4fb0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/rm/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/rm/firefox-131.0b9.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "3588083df4f708ec937f7eda20da77249aa6fd1ef4e2f6fc86d785756c458da9"; + sha256 = "0338c62aa70a83c6782065db6196850e7d1a8e7c13475aa2971c2ca0995fcaf5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/ro/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/ro/firefox-131.0b9.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "aefec65b1f06bcc23454621e55d9b44de1d3e13afcb170ceef40512f1f1ed7ea"; + sha256 = "545a96ae03334282d9e915ad3970cb655346600c3cc87f5a610ea56ba56fe859"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/ru/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/ru/firefox-131.0b9.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "4324d205829c7a697bd83695ac4b4d9b776989c4a5b904e809f67db6bc829f18"; + sha256 = "774a98da6ecfc67e350499bbdca10e694734e77049d6813f3a11102ef2786b88"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/sat/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/sat/firefox-131.0b9.tar.bz2"; locale = "sat"; arch = "linux-i686"; - sha256 = "8556dd9b387da18fe3f3408a6df175d704d476967520cbb7899acfd79328f250"; + sha256 = "3fc563859c2bb701e955646b03d5f8a3ce2d0a492e247416c7ea826f608b2831"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/sc/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/sc/firefox-131.0b9.tar.bz2"; locale = "sc"; arch = "linux-i686"; - sha256 = "34e9a7e8a81a2cff22e3e131ae1733c25ccba6563f5e42a25c790f2435ff4a89"; + sha256 = "256844a0a7e79bc42978c599caf07def4e7b56bdf0b6d62dad6304d27089fbb3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/sco/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/sco/firefox-131.0b9.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "6dbdeda295ca37758d4a531694e995f2bdaba4642ea004d58da0dba5492997ac"; + sha256 = "55d6b8153cb07c56bac006a0180ff5ae52e3da539c907fa6fe15dd6f950a284f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/si/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/si/firefox-131.0b9.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "c2ea2b2b67ecb74635cc6bf218f3f7cac739d1f98fce7c7b1e4941b8613e67dc"; + sha256 = "5aadfe21cdb8a6f8d590e98905b9a17ac5730825efcca007ccab8912cf25108a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/sk/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/sk/firefox-131.0b9.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "9e59b962cccd43f5c600258df7719a7433367018c13637d1e84a09af4a05c60d"; + sha256 = "a73b49d89cb5118f4e20ea7b14d90b5edc20371cc15356197a10c1f3b41745a9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/skr/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/skr/firefox-131.0b9.tar.bz2"; locale = "skr"; arch = "linux-i686"; - sha256 = "1c1a1435a7ae19216a100a346737a60650ee1a25024b77dfef1a09c0fb3836bf"; + sha256 = "0d0c1ed8d9386207385a76466aca1d177d4a516149b844ce84a8b132dc862529"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/sl/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/sl/firefox-131.0b9.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "9222bd4ff0b4c09b36a0e6cce1fa51ea7a9414651ff9f50c05d227347806ca0e"; + sha256 = "b4ba523ae509389b0889fe4e68ebd4d1ac5b2f08ebc625e16f9dd6a836ea72e3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/son/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/son/firefox-131.0b9.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "8f326cd87ade070d719c78f5e9c25f75fc5b1e03256c8b27c296f0bcc62388b0"; + sha256 = "795d063b0f00c2d5926642347faaa9ad422f75f1f4b241b617b8c52426b0b128"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/sq/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/sq/firefox-131.0b9.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "6618c0d3414a61720606e1599387871ad3f872f12042a5c0117d6181608c2be1"; + sha256 = "126cea5bf67d1acdd1067c2b58e358a9390857cbf9ca16248efe936809bdf36f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/sr/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/sr/firefox-131.0b9.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "b2a6c5ce023552ea357c442591157b2293c298b96cb19a1d7638f10205c3426b"; + sha256 = "36d6b5b278c15f4e127a70554a2705c7058915379bf1ff3fe9badd14132425b2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/sv-SE/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/sv-SE/firefox-131.0b9.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "0a879700cee518c51853631bab1eda501833fcee87cba41603a3299897119f11"; + sha256 = "3fd7c4a21d6ab6784bbe9b0c01ef736347bb72e7f9565a97bc5ee7ee1eed461f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/szl/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/szl/firefox-131.0b9.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "880e10a03b2feff02642a630c1a5c2d8d2ae7eddc2ac8a53337d63f925b62862"; + sha256 = "9edc91448587a79b753df4a9e7feaed68311a49fad49c5789c3041a8f4d4b972"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/ta/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/ta/firefox-131.0b9.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "077e3166898dffa838726a55ca2dad043c671a9c9d4aa75b6a6fd4854379dec7"; + sha256 = "4b39cd843483758060b930362a30de1b7adde0a302c77391d41486df87c69fdf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/te/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/te/firefox-131.0b9.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "b6b17ac1598959b7e0aaaa18e3154d4328a31f520ebba7110fca44b7cc8b4a39"; + sha256 = "80f4fa70c6346e9f652d8b3c3aa95cb3a20944ee221a06c82ea071368bcc3f52"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/tg/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/tg/firefox-131.0b9.tar.bz2"; locale = "tg"; arch = "linux-i686"; - sha256 = "3279b5bd1a1f3bc4d4ef1461fa9fd8b1132f8dff0cf6c385291b1329b3b5f962"; + sha256 = "c7de592f571c993eef41bab4b119a268ef0dc65b869b5fb66cfe822aef2c8a06"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/th/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/th/firefox-131.0b9.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "9d6c24c604934c4162281799c11904cc17cb5e8295c5ed7484e6432ffc0d17e2"; + sha256 = "6c1d86bc94fa30f43886b1738ec3461d89b7a86b9d092cc5196a2deb4e7376e7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/tl/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/tl/firefox-131.0b9.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "a5792ce6dcaa5bc002454700dc2abcbc6f9de580f0a70ec2919c9599e3858ac0"; + sha256 = "d878d17dc8a81b374cafe3859bfcef1d2a9fe7db63a274119c4193020948de8b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/tr/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/tr/firefox-131.0b9.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "05685a83407f94e15c08a75aa46bf45bfdab1b2ae7626a078848b392586c05c7"; + sha256 = "6648c0cca250c0cda65d2aab1a3f6499c8c6f3b1e4b02f718b241dcc301ddad7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/trs/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/trs/firefox-131.0b9.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "d7f1cad2b4772ff42c954bf6f8eb78d8787f5aa86be1314cc4b56fcf261159f7"; + sha256 = "b6f00626c19e71f33f1f36cf08725925092e96fead027299d3490951e034e352"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/uk/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/uk/firefox-131.0b9.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "da0d0c57358ae2bbe196d06358a5f410f814eaad236fbaea1127d2131eb0d054"; + sha256 = "646fc4c5329f9105141227ef69012a1e6cae85013e036cfece228a54b6877b18"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/ur/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/ur/firefox-131.0b9.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "ea70560d84141403a242c3a7fe4b0a50999bc5845a7a239291e1b2a27e0a0aa3"; + sha256 = "bea7087f797cfcdb18329f0c86aafce64fdd73fba2229ec22685af49b595f4ea"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/uz/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/uz/firefox-131.0b9.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "8578a45c8f97e3138a7109e8cd2969e036ef08e935ec1e530be823ec3de12d9f"; + sha256 = "7fecca7f57d7491e106f9e278f01b21d970a7ef69dcc8a24d32d18813b52751c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/vi/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/vi/firefox-131.0b9.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "6f77bfc640398d00b136dde75f72156d3f4025a916bf16063bc06dcb3e3e1529"; + sha256 = "9fa33db48f39195c7b7f285ae8586f8683d919e4f2e716e6a5f6b54850a93f7c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/xh/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/xh/firefox-131.0b9.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "7f74a0f56e6746a105298de72143597f978f59873071a871748f33e54078f368"; + sha256 = "3fac756c551fb0dda8227f0ecaf9822c18782ba809abd3b0234c59e192756da4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/zh-CN/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/zh-CN/firefox-131.0b9.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "a6708b44fa15dff14ee33f4cc4bbb2e5e550f663d179ecf0e3e4e7d44fc68ef5"; + sha256 = "df4cd8674914d5d79908a8d1cd2456b5bfe5b334118bc366e360c0216c93a79f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/128.0b3/linux-i686/zh-TW/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/131.0b9/linux-i686/zh-TW/firefox-131.0b9.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "333605566d2c3aae9e411a7fefe08ae6f339ff91fbc6e84a0b3b166a19c5ba90"; + sha256 = "d5cad971712572a8e1377c3cecfb8365f5ecc4f313e5101b89191b2e55f8c69f"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/developer-edition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/developer-edition_sources.nix index d31488ace0bd3..6e28001ac23a4 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/developer-edition_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/developer-edition_sources.nix @@ -1,1035 +1,1035 @@ { - version = "128.0b3"; + version = "131.0b9"; sources = [ - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/ach/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/ach/firefox-131.0b9.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "c90f792f6522e27ba1b104e77bc0826556f4ca1184a7b65ef02cb8900586f857"; + sha256 = "5d23fc3bbc20283397d0cbda4a92e15e872e6b2775a40c7449fa2e181c53d622"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/af/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/af/firefox-131.0b9.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "c7c7ea2b9ae48a867806679de41097ef4459e7d35eafc05e0c44f2bbf984c481"; + sha256 = "dae4aa08599af741296083bb6684e0afb7b07dbcaa57b13461c2fa7fe293b1fd"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/an/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/an/firefox-131.0b9.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "8ce747dd2bfa52d02d2d2bc80df7cee6a0def973afc39d23724d4873c54e014e"; + sha256 = "8cc59a067ffdd783c959765d1b766e0fa7a3944a3df9a0512a7f75164800151e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/ar/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/ar/firefox-131.0b9.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "7c344d960f8670aac4e45a2fd89f136763950d659cb24f16c9d21bbb096eff42"; + sha256 = "46a7ebface84fa533e02efba45ba3f79903c6dcf245c8bc83e94b4d764559cfc"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/ast/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/ast/firefox-131.0b9.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "d21fcb8e549cefae78d69196d8c415372baf6844d462d4398790b67dde313977"; + sha256 = "01c8d108820f3dc05c6a20bbd4b4393ea790e902d7e862b313de5ee5f753a8e7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/az/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/az/firefox-131.0b9.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "060539f7cbd3170d17ce0e0d5e2a0850223c27766392632d69a1dcf284b1d48d"; + sha256 = "62d852e798a9afadbd1071988121264e6f2edd535da26b6dced2f25046f62821"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/be/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/be/firefox-131.0b9.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "b287afc5502c0b6752b6fb2f9d179c135321ebc7af9fe73cf288256add2ccbee"; + sha256 = "6731243528fdb724cfc4b7c0788c36382566a0433680e90ba2fa2c3c72bca0ff"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/bg/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/bg/firefox-131.0b9.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "b9beca129129a7f271c5c0274e5923d24fb4704167fbe8d33273cd815d80fbf6"; + sha256 = "21a5b548853da294e6611306f8d1cf37aa423a1942a8916ed27c718f73f65389"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/bn/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/bn/firefox-131.0b9.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "0d32e670d5fe67648eae6ae2656e930f0c39f3e9fbea13ecbd8d2b53ff244e3a"; + sha256 = "e0bbff5dee6e723709f1a6b00a6eb3a65087f86a55d2ad332dc04a97c9d1ef5a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/br/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/br/firefox-131.0b9.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "603bc328de6ca1e265df6cb0c876a9eca355ddfa6cff1cdc9c315322422c5935"; + sha256 = "46123ea811833fcbdfa8c829d35807bda86aa87135ee62786bdf56619de390f9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/bs/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/bs/firefox-131.0b9.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "78a67e705a9a1f8a5ee8321c7184bd9c15eba5e6d67b3e77bd52cc6339e230f8"; + sha256 = "c9dcd5a31aec57425584613da9e1d681b42a9d2304582d215914694ec515edcd"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/ca-valencia/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/ca-valencia/firefox-131.0b9.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "9f9739c31f56a42caab55be23946be49e90bce001ad9b633b286f23b791c8abe"; + sha256 = "bfbd17e8ee5bb1f0357c22b4f2b8ef6441199d1cdeabbf1d5609b66b5ce3e52c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/ca/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/ca/firefox-131.0b9.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "6e3103a530a8916967e55e90edd0730497243183144715cbb0d604c63c1e7505"; + sha256 = "63fd254507c9020d439105afe577b2d1b98686f3a2bd30d1bf822cd48b81a991"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/cak/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/cak/firefox-131.0b9.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "60e6ba8337350b02097a637042516bc2c8bf5a95f23997ac41d89f875cde5af8"; + sha256 = "fd5605b3c0509ed82750c392bc4d63d58549a6a098519e464fd75e770e5a8043"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/cs/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/cs/firefox-131.0b9.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "8ac4c0042e24ce4bf079b0de43c8263d93b9be35be70cda2f1f037091cf808ad"; + sha256 = "4d654ce1bddcfbf9753f718f8babec3764a9f004d1e3313c1d313777f16b2e6d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/cy/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/cy/firefox-131.0b9.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "3b89ba108fc6a0bcce9ab36eb392861cd8b3eed8466b5b68eb5d37c1f29aea5c"; + sha256 = "35290ca239b98a9d3a8a7e3c8663713510d6f408a6f3f3fa0176b803be562cac"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/da/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/da/firefox-131.0b9.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "eca9420742f9d0522d82b5c9e0bfcba1dc9ff131c72c3fb8e37a34332b2123be"; + sha256 = "df722d1f24f74a68197d11a05ed0fde3171fd58c62f8866748190ca8723bffba"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/de/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/de/firefox-131.0b9.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "c411fcb204511dc6a2d381e2522722d9cd67262be71f9ceedc4207463c3425de"; + sha256 = "bdcb5f662d993041ac07e3f8df43f12182625b530e16a8ffb8a93afc1438b550"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/dsb/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/dsb/firefox-131.0b9.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "0b285d2c3aedb8a0c8b139ed453d45418394fd6fd02e5e15f9f495edc739a8ed"; + sha256 = "13dfae0e4209179d65ca6a5f34362a3d24a0845f8360c99efd832e29d0903493"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/el/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/el/firefox-131.0b9.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "227efe5a5c2939c896881298f97f7e0651b647c5c87362319dfb41ccc7c5565a"; + sha256 = "91efa139db7bcb46958fe804d2c4b6e043310a0425c14b5d75b39f75b9a558a2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/en-CA/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/en-CA/firefox-131.0b9.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "acb1f56d76ac68c4b45c9580708c68917f3e318eb6685a8bede22c6adb2d5de5"; + sha256 = "5b43cf25b3f333267071048c09f5fcd23a8847193a21ed8e1cf6c18c03b8e8e3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/en-GB/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/en-GB/firefox-131.0b9.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "d9d4692e153e08cc7a7caf04c119c072fc0cd37061efd1f21f0cef9480135c2b"; + sha256 = "17f4a3ecf88b33c38e0e2e71244c4e3e31006b8d4bab5344608ff7b9be7bc11f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/en-US/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/en-US/firefox-131.0b9.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "0a8bde14893cff97e60303fd081103612d6121747cd6329040f7fbf7e8304a5f"; + sha256 = "215b879b59ad0ea3dc40f13a97d3cf15abb98893f6b4c6e130c5f2a5cf91d2e5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/eo/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/eo/firefox-131.0b9.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "4376258e69edcf6a2a9eb6cdb5ad38c8eac5547daf894406cfc22c59729d6a37"; + sha256 = "3684b84ffb7285d9d8cd50466b138533ba7ca24d64fade2f1ac6dd9b67fd6176"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/es-AR/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/es-AR/firefox-131.0b9.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "9d194fb49e2ee6055b809c61d53aea877b9bdfe62ca2afcf57b564259253c46d"; + sha256 = "c1af34c2593df1aab4fa0aef07f05e28592fa45077f0dd6bd07193e04f40e448"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/es-CL/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/es-CL/firefox-131.0b9.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "e6acdb9f6a4807b355187e4cbe06fd8b1def9e2315ae09b4e5a2d429f9512a83"; + sha256 = "36d1b0301608898a9a44175f5c96476f75a56e238e1ba21efbaf17ba76d1dc93"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/es-ES/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/es-ES/firefox-131.0b9.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "a0511e68583e10f1a126a0a4db6d8f443e105d9dfcd21fb9d19d7f57b5300426"; + sha256 = "831cba83275db5a854bf466597a65959042b4508a8e7a3f2e15766b02a4076b2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/es-MX/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/es-MX/firefox-131.0b9.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "3da7f89ee01e2a602a3975aaa51f4a0adb666f741b25a078e69611d92b68287c"; + sha256 = "9a237406b8b3d5ba31a2ed0cf37eee73a94f6dbb8eac5388f1be125ba7991d36"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/et/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/et/firefox-131.0b9.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "4895e2432c615b7a1bb573dfd82ed9788bed5b4d94af1877aaf923e9e87f09c5"; + sha256 = "ede90675c7b60b1119393f0bb44f43a66bcede102179a66ebcc3b2ee3fb003f4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/eu/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/eu/firefox-131.0b9.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "2e315bfd1098bc3f45c0668241ee69124210a2f4c5b0cc1520e61de7ee74cc98"; + sha256 = "c5137ee601179644776e011a8556997336fa0e30269999bcd4a669c775343009"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/fa/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/fa/firefox-131.0b9.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "bb36ca2cd19780b3435a0a12b544dddea820df9d71b0767f3b58721897275067"; + sha256 = "10b9248d3cf3fa2047ef33c77d66af15be77db5b8d8a9ac3915d6873bd0a1096"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/ff/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/ff/firefox-131.0b9.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "b4b11971a848044706f9a8e2f2cd96b9affcdd05ea3f0616a9754488ef27846d"; + sha256 = "e3f8473b8a630d634b1bfc7394d2c19419154e9d9aae4d98aee415b5c4c677f7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/fi/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/fi/firefox-131.0b9.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "24e64273a0b29fa68ecb95e3a9fdf88a9b4fa6917441d7218c4a66d48e9e5724"; + sha256 = "e37afad7d7adac7b752e9a2cb5747b37151bc8b750166950b97e583c5788276c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/fr/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/fr/firefox-131.0b9.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "19ffdf60a868070f1bf887133643d7e7de62b3000f2d22b4140e0d1564b4f01d"; + sha256 = "44cc3c181c8d43614e23c2c604869187ae5d4c42e2417d0279701159953b7e43"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/fur/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/fur/firefox-131.0b9.tar.bz2"; locale = "fur"; arch = "linux-x86_64"; - sha256 = "d73b3be736513b702ce22e0924e86166b1b479338aa8f26ee460e648a01f0307"; + sha256 = "a77eea411bbde78c913e154f9203411759ccdb9d4f5817b2f0b1c5363b6c110b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/fy-NL/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/fy-NL/firefox-131.0b9.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "8063ea3e08c6b495f3274c8b2937a3651ed2f788e6e32d503938b533582f9022"; + sha256 = "57c5020319ca48d7ce3d4d4d641ff4c331de7e945790ecf66b9ca8bc74083d33"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/ga-IE/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/ga-IE/firefox-131.0b9.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "7603f6d03855709224d36f3516b265db2d01caf2c56669435f3c8f67df430a5f"; + sha256 = "7d52078700bba3faf5b61c9f8abcef8d0a43c3dfc634f2f586a6f18694118565"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/gd/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/gd/firefox-131.0b9.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "fc84ae08d0d17ddafa879149eecf62fd9e22fa61f529a38345b49783fa093556"; + sha256 = "90df77b9b18eef8d8edd9297b14262d08e04aea580c28755a9197c08766fb79a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/gl/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/gl/firefox-131.0b9.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "ba87ac94b237e7e1ac2817f1074c807d97fdbbfd34e7ab9c4f268826296636c8"; + sha256 = "02f4408e5b740f22fd46cff693cb10027fabf3dbeca45323bdea971394a98f73"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/gn/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/gn/firefox-131.0b9.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "47c1226cba2c9462c904307756ea9829bd7ced15669c9b479dd8db7f07a78ddc"; + sha256 = "5f3ce545a399088846c4be2944137caf651839485c5010c75e1a2e15e6d59ad8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/gu-IN/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/gu-IN/firefox-131.0b9.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "0cb12dffb0436b3bf2a1fd6047b710bc70fa53cb243892944990c6b802fc16a4"; + sha256 = "0c33796cf29d3d3e3dc98816d1423456ebd4ae2a278ca8fc93651345538557db"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/he/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/he/firefox-131.0b9.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "4762e1729f632e78040ecf6101b1d80e0733ea72bdb800081df4829447aca256"; + sha256 = "c341666c31e7398e878bdba16acced6430abd872797b39eddb6d26e536bdf845"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/hi-IN/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/hi-IN/firefox-131.0b9.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "4fde18223d92ce6bbe5736daa20a44629aba864cf0dccde255fed72bd138f12b"; + sha256 = "be681b246e18d59046560c2852094794ea5261d6c05d0c8fcca6b0f2f807abcf"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/hr/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/hr/firefox-131.0b9.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "646fb42e3733cdd1236387b9a6a93709ce7c6439f1b9549194e09014e759c744"; + sha256 = "8b6c52bbfe03b134d57f6c70c1015803e02be668a146d9d46772fc9af9692ca5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/hsb/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/hsb/firefox-131.0b9.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "b1b23002a706ffec926a51655332972c4a25fe3981fe085ac028419f72b8b67a"; + sha256 = "efe5afcbc5c08948e45b741f7fecb39ebf849038212cdb0b15138b1df633d973"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/hu/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/hu/firefox-131.0b9.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "8e22776d798cabb7beb11198f57b2c482aa605159b0ba309d930a94a25253fe9"; + sha256 = "53511396b0b54237623e058755df8402ca2f9763dff3d0e72f2081f600c089a8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/hy-AM/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/hy-AM/firefox-131.0b9.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "c8270908cb4eb5b7affd11c1d760d858374f4faa0d6e9a53bc983e7ce8b6ba1b"; + sha256 = "ad74cb9d1aed355cce15604ffb0ddbf6b3a7beb08730a6b4b02d8d35308ba32f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/ia/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/ia/firefox-131.0b9.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "daed408de1230aa6cca0d5ffec077eee5f4e744d862004c7e81f65161414069f"; + sha256 = "6eff25d61aef2e236097ba73b2f061376d48247ac58a6afd1cc274a032a4b4f9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/id/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/id/firefox-131.0b9.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "f38562edee02f984d072117a86f2134ae232bdb4b2a352bbc1e362fcb67fec73"; + sha256 = "1f5f7b6daf3d56107e2c2a21a4ee550e21adda704bc6bcf97a42ed6b100795e2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/is/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/is/firefox-131.0b9.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "c53a562a99e749ea51728361834ce867e84fcff89ec16e771e86124a091b5fe1"; + sha256 = "39a639d414920e56ea15d1a4ef4d07669c1564d4592fc4f18b7ec32a6244e757"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/it/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/it/firefox-131.0b9.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "40b057389706897fafc685c9fb3444f7dffe09bf55393fc0f039224377280d78"; + sha256 = "1b2b683ee7891e9f80435a2907ed7e56fc2181924ce3ceea2bd117a0623a29a0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/ja/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/ja/firefox-131.0b9.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "f956f07837670d725d1549366df1c2cba96491b7419662a85658d789bb7b4443"; + sha256 = "bf4613f48cbc4babe62da9db153fab829a56d45e487e5a84aa8b893e43a2a320"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/ka/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/ka/firefox-131.0b9.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "20126e640f5152688a9116b4a7a0295b53a04a29bcb5161d9cce7824de5e4d40"; + sha256 = "a0b4ae597421b37dd05ac425df62b66b1c332d6570c7164fcc491bf783487348"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/kab/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/kab/firefox-131.0b9.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "03ef7295fba8b50bbe2004da259660bf28d74d2cf3fa5d55d407639fd7e18da3"; + sha256 = "ec40e0ad8dce0ca44e586d9729121494c3d0335cf7d2a49e780b0863ac8e940c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/kk/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/kk/firefox-131.0b9.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "ce67136dcc37edf39c734d0ea74c1216defa9e127f0e2f87a4ef4e97db4cb7e6"; + sha256 = "15be145c49e78a637a56b947ff40238b0a8dacf7c0fa740d0376399fd8a9e4d5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/km/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/km/firefox-131.0b9.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "2a40245ccd8c76f755ed2147ad6fd9cfebe16fcde38dd3431580802c9e65c9bd"; + sha256 = "f07dcc06f9924664f761fa7964a16faa5cb49f610a2300ce78e592ddd1ed241c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/kn/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/kn/firefox-131.0b9.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "8444c74edab27f66c24cda2acbd1068c3ae399b74a6a4806fcec73bfa4c5da80"; + sha256 = "3ba0c688d9994d1787b08781277b62b5a7f20c7211820532f8308b5914b32398"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/ko/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/ko/firefox-131.0b9.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "3457ee728c2fdd095864dc0db63241862de40a4797add713fae302ee04992c47"; + sha256 = "f827cefa00ab62f98a7eb4ea0465a1512afde10c46a44a090adc8e81af15b893"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/lij/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/lij/firefox-131.0b9.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "fffb5026f93d06012de8a5fd8ae8ba1c270490c3ba6208e6e6352193e6731252"; + sha256 = "f36747a714c88e5493739a7d466c2cfe09bd4d19b091433b944308271d97dd40"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/lt/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/lt/firefox-131.0b9.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "efeefab433f8b1316b9ca44917b7970876117bedaf307aaaca3314012834e431"; + sha256 = "f1e295669af7a2ba813312702c537d3c29f87fb0c08a0505fd0bc3cd16df5892"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/lv/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/lv/firefox-131.0b9.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "03da80d47d995cd7e1a2168bfadaa33da7e7906bf181030d69dded6658e78180"; + sha256 = "b0b0842d8df5652feb8f05abe9da0f6ee2e0c97284bff212c1f0f21eb22a308c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/mk/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/mk/firefox-131.0b9.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "09df6b9e332dacd722943b1b59c33197881712ad1b3031b14eca2448598b43e0"; + sha256 = "1cbc64f7677b16f1b97c4075656c16444ebbc5ee51127b53c9537a672ba3f9f0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/mr/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/mr/firefox-131.0b9.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "ba823b31499aa6704e0625ca4ec0697019fce1da5ccfb1623c7aa4008375bdf9"; + sha256 = "75f76a10b49db491fd6602d6b8079e5781529d0b53a3cddbcd8a31c390825592"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/ms/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/ms/firefox-131.0b9.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "e2c56799d0e3d05559f83e1f158857420035ba019d35d01c6e3f826b084fc0c7"; + sha256 = "2eca2edc3867dc8360149a1437370127f394ea6065b44fae22ea4016effe84fd"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/my/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/my/firefox-131.0b9.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "7f375265916ba71f118deea04ef45f9630e63c66a5c37a5f0523ac732ede2472"; + sha256 = "c6b56c8ad919462b543987e486a8f60c1636e8e2a1b3cdf1465db9cde5501d1a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/nb-NO/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/nb-NO/firefox-131.0b9.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "315c1b0a5fe50831e25e696ed88301b2ee1021c87c253c807d9f80487b918f98"; + sha256 = "9312201d3b6e828161802a790cc04e0426c68d9fa943fc8dd95704bf91fd1a5a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/ne-NP/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/ne-NP/firefox-131.0b9.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "64ff1ed8a9a6af9e2380984627a32462714930c57ec407a10232972749c09e92"; + sha256 = "151c1d81c4f9faea32900eb2ddca5ecd565e09be04f300c26c8210fe4a92bde6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/nl/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/nl/firefox-131.0b9.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "74f41cd79775efcc9e46f302cc4deca589873ccec79793da327fcb6795d29b73"; + sha256 = "4dd12d7ae84478954f2a9f35f7d7c4ea0cdc99614cba6230c9a278ca04981989"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/nn-NO/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/nn-NO/firefox-131.0b9.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "384475fbec200477f7fcac6f50ee6ced939a655874dccf97e7fe06dbdd17b040"; + sha256 = "9f3362d620af4311bf9b349903ad0b61320f4ecf4d4ca5d0326de5190d48f7d1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/oc/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/oc/firefox-131.0b9.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "a35de74c3dbc0393d8ef16b26b385029aef7455e8a5086076f44cb6de184b225"; + sha256 = "2ee6e4ca52eed0ecca2464095e53f0688fa0522e44000d3ed47ade39115b129e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/pa-IN/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/pa-IN/firefox-131.0b9.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "5a7440fc60c97646c5be3d54325a1186bfbc76e0240c5952478fedc315e990d6"; + sha256 = "5457d47b7af9d2f7d819e5702d23df6128e10d38c74101928b58353bce9afe8b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/pl/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/pl/firefox-131.0b9.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "d9c32935c78163ae3515a25600050b5b36dca71fe3725f9c750f7a42257a0e0a"; + sha256 = "3bcff5f278d492a88c5b0b975d6c0c3d70bebff3a61b04a7fbc1e6fd332bac77"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/pt-BR/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/pt-BR/firefox-131.0b9.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "2753107d60854f1d5fcbb2f5b9e9851ea63715530251e10a22c3d3c2dfcfe78c"; + sha256 = "183e23db5fb34ef93b05b7462a877f654462ebc56abd7e2c9314118978df80a3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/pt-PT/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/pt-PT/firefox-131.0b9.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "b244e5453043f6090dcfaf9065938ce94da523b5bd6101127236027ccbd24165"; + sha256 = "4014365d5231361d68e7e4959e12827345c0b80dd948e25eb3df2355e0943525"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/rm/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/rm/firefox-131.0b9.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "38e59a74daa2384b15ff052b711f93986072413b78553e578861ba468ed05baa"; + sha256 = "4ae1c4d6fd687b7d0327e734476a922a4b6520d25ee87ae3284a32a12f870279"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/ro/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/ro/firefox-131.0b9.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "c6ebb19d78728bc4da1a3f5ad1815fa476125ec56be3d52a2181aca3c563cea0"; + sha256 = "1f42f2438b54dd695d3672fb097adf6855c400c980c4329bc53bca9d80c12c22"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/ru/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/ru/firefox-131.0b9.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "5fbede90845e1e9b7174f20df05dad0b50d3b5d7cacb94f9639910de0f2e7a12"; + sha256 = "345ee0426d557861b8b4c1be02b3429f77615eea3e66fd6bca455819c21d1058"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/sat/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/sat/firefox-131.0b9.tar.bz2"; locale = "sat"; arch = "linux-x86_64"; - sha256 = "ca311eac3bca2a02c7e8f66ba964f5015c548d2a287969dbea93b0fdee567641"; + sha256 = "4d92c4a392be6012ddc9a5c815e066e4918e74f1ddc3d00ea1433b3f1bae52b3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/sc/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/sc/firefox-131.0b9.tar.bz2"; locale = "sc"; arch = "linux-x86_64"; - sha256 = "f34fa641a957195bb73c1f4168801e020fa9be368fc77eafed6dc8c6254a5fdf"; + sha256 = "5c92a730192ff70822ea02bd0a1ecf3e9df0ecbc15c3b85da6150880fafd2e7a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/sco/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/sco/firefox-131.0b9.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "22a9b137f752267d7f08faa8256832dc16a6599d7036d8134dbf0bebed625ec5"; + sha256 = "464335c80b3fc31fd418f2c58088af114d50d49f80b7bbebeeb24963387bc3a1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/si/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/si/firefox-131.0b9.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "1f692a1632c70e61077b8520d1caaf2adb2460d7350befb342fe14dde45b30a5"; + sha256 = "ff7b9c7607d4991e8bf78a3e1010760c090867a8c0ebcdc4dfbfd726ec820a3f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/sk/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/sk/firefox-131.0b9.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "ed469631fa261e6839bd7fb41934a0ecb694bb5e5cb8e745f567ff6b9d3a09c1"; + sha256 = "015d7fc92041f3cc64a63d0ac1090c00cc0ccaab77af4268f986cda4a790260d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/skr/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/skr/firefox-131.0b9.tar.bz2"; locale = "skr"; arch = "linux-x86_64"; - sha256 = "29f93b1c9852ee969207cb38ed9caa773866b69a8309fdd9d67680e6bfb824db"; + sha256 = "3b78cfa124aa7d22737c0d7c3e4b076ca10bcf6f50ade071f41d2ffb7bbd54bc"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/sl/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/sl/firefox-131.0b9.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "4f5e98d7d6c1d68a9aea0673492b2440e7dcc9b2b6d502e94c5ec5ab10d2d244"; + sha256 = "1e4d45ffa94185fda9f83228820ac2624455ac1b41b16975b81497c9b8b019b6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/son/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/son/firefox-131.0b9.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "f042cf22fe86e3b3a4d23884c6ddea3a8ff08bbb24f7295cc618f0ebea8dbde2"; + sha256 = "9a57563e84acf0815d1ba359e0b4d1c0d942456b2275a90c43fafd36aaf158b5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/sq/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/sq/firefox-131.0b9.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "c8908b4df6a785f968a3ee3a5d1605f37c54954cb8badb10dceac3a5412db6f1"; + sha256 = "e17129b474e50f6cb8d378f79b7c130ecfdc9d367601a01e65eae1a5540c1dff"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/sr/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/sr/firefox-131.0b9.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "c4788512b4c5695dfcb020c897a81817b14a32c3132115dc840c9ebe8c19e016"; + sha256 = "5f0c52f956d17e194dc9da90ca1c7c034c6227ca7caa382057547ca048b71328"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/sv-SE/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/sv-SE/firefox-131.0b9.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "b7851e5104fce808dac901788e0da55b7c513a8cf544bc5917513139d5b7b63e"; + sha256 = "086b7dbf44bb89dc41a3c71d59f5bb4becb9cc07db98ea8dbd9966113ec1fae4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/szl/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/szl/firefox-131.0b9.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "ab4a5b7ebf094ffd9b58a5c86fe67fa5ec46d8ff835531b105fcdb4714269572"; + sha256 = "6e7b7660e050b19ef15626f472a9b50af497ffbc306ffe6bca959c10e68f3b68"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/ta/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/ta/firefox-131.0b9.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "a572ea53f4fe7f69bc6e87260bb790be0a5dcf95ce1f163443e1e6b0acfb6386"; + sha256 = "8c9075ec945fa0c4b7a096116f9e5b3f286b5d16afc8476f2592676f65308461"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/te/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/te/firefox-131.0b9.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "c8b75f3840bdd7171b09972294a2c3f0d65fa6fa409acf70e261c071d0a46b46"; + sha256 = "962cea48a963d71d5f629f26f847713149d05f81ed2fd79b0e7615208e652f0e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/tg/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/tg/firefox-131.0b9.tar.bz2"; locale = "tg"; arch = "linux-x86_64"; - sha256 = "076bc82bedd5839d2adb544fb46c8896785453adb9ad28e930db4e649ea057b3"; + sha256 = "09c8afe3bb1d0d3e8bf071d52795700ce4ce0e6f1c124f4e5a972929ed358d90"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/th/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/th/firefox-131.0b9.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "b50a958a94de094ae9b68f69a6cfdafaa1404befb8651d8ec642a5725d61349d"; + sha256 = "c4caf317e1312b71ead7ebf0b21d2cfa1678164d9b248a79484912e783e2f271"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/tl/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/tl/firefox-131.0b9.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "f65155bde32d3b2ccdb68fac209bae375d07912c299273a7d24aca62f5d7cd74"; + sha256 = "51bb699925ead8433d377b53d0de721ee32eecff70552b6ab61fdd957cf862b2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/tr/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/tr/firefox-131.0b9.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "17e0d6b2ff623ff8abee10e13aec566b6fc8135b7e87ba6012c8f53f661c1436"; + sha256 = "f7826876af8917cf652df4009ca6dc22884ce4d40247d3506bee90a7bd4687d8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/trs/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/trs/firefox-131.0b9.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "c10d567b9d315df88df4b75f27baf0a5338418ec64747f9d9ba12916a2847839"; + sha256 = "5fb6ae81bc8c1941ffc0ef38b06b31b78b186c426f394d4a67f9be4d63d050fd"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/uk/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/uk/firefox-131.0b9.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "cffff196e1ec88c2bed876b47d370a2d02dcfb305ddb6774f24ada40c3b2045c"; + sha256 = "eefd6322c99a3ba93a4fa786d31f0f776eca34c9e63d0174318f1ba1a3f0d9d4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/ur/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/ur/firefox-131.0b9.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "4a7ef86a445f717838b0ac24e3f7e453785d2d36e955c007e79065e3dbb11c0c"; + sha256 = "8636ef350c3f91c8e69caa2b8470c16cdef28d578c2a6938db0ab8b456f174c6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/uz/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/uz/firefox-131.0b9.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "793b0393fbbde9b03cc48f4b67470e9238941f890ce109a4e2f6dee7c4ce9285"; + sha256 = "2dfe1c15b9080bd8779eba2e0eea8c4e04231aa7e0608151b8bd17c40dd20c0f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/vi/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/vi/firefox-131.0b9.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "6c471538a27c9587e0015f214a53a35fd308758f468bb3dcf8398a826b2019f1"; + sha256 = "2f1784e6c2ecee4b1633e3ea76df75514bd6b16e4f4fafcbdf3777598a2f2c77"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/xh/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/xh/firefox-131.0b9.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "e7c602469379c7337ec29a41da891c2d603c30e7e2f5d1027b362dfdd818b00f"; + sha256 = "ed6fbbebef7c75c3816413bef61a580a663b8d37e38b519facb26ed4b77cf53f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/zh-CN/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/zh-CN/firefox-131.0b9.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "9dec174d1c885a3e9e3b3aaecd64ab6e63c3111787c62338d58bbdafa447345f"; + sha256 = "3a637f025f932a7e5101901d16c8e216d3db8015924c5abcb50d019c5c21bc47"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-x86_64/zh-TW/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-x86_64/zh-TW/firefox-131.0b9.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "ba8d50d3fed019c9e800812e80cc32ace24776c5a07abcfc7d6c2c5829fed857"; + sha256 = "6eea1f043278ede18f67308566e2dd642504700be6c16a7259225de5a604505b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/ach/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/ach/firefox-131.0b9.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "b5378932b59e633e838873c1fde0b7f08cf1f5ce9bab4b93bc8d82a7c3338806"; + sha256 = "50fc2e2a82193e3268084a03d6498bf9b5e7c1d20479fc40efb251e879c06b22"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/af/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/af/firefox-131.0b9.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "d8fe6fe723921447d9d1ae68c6cf403e6ce4673e7f7918a48f1bcaf3c575893d"; + sha256 = "5f9bc2c288b8bb864aa211b0d2f49814a99c3a098726e5ae6ce1b0b42fd5eb6b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/an/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/an/firefox-131.0b9.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "cc1aa23852f5ce598eaab6af0b041cbc39d87959508c8e300e6bfb49f3a6a6cd"; + sha256 = "76a0c952bc1c8365645011a19fd1c75e825766f3c40c46c2fc743c10b9a0eb7a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/ar/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/ar/firefox-131.0b9.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "abe568b67dd04fb2d44527ff24c76a3cd3993071160f0f2a18dfcf5bfba15250"; + sha256 = "09ac88d33dd97c815fd39010e7dbcacb24a509879401fa2f91ca0e79f54fb238"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/ast/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/ast/firefox-131.0b9.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "e7d422c3fc62fc80d60aa9ea492b5713065cc646a3499b27f67549abbbe7c9ae"; + sha256 = "fadcc3d4873885a5c93c0f4c861b4ece2148696a5dc8997110a782008b922048"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/az/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/az/firefox-131.0b9.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "4bdde11382946be34fb0693024deb49762fbd80bbe52e0b3aa79231642a02512"; + sha256 = "4cdf4e03d5d9b731769fca3ccb1eab680ca662407f4375bc2c9b152001ea242a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/be/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/be/firefox-131.0b9.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "9c4b8814876dce2d7104ff0c14a22cd147435144cdacb30629237c3e20eb1038"; + sha256 = "ced88b8e0c8850d0c4452a199a6716061380d22596e4e24e6511be176c7181f3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/bg/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/bg/firefox-131.0b9.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "06292b301d1aa4c5785796f9785e30a3659b7a4219e02ebba4bf1870823d6f0b"; + sha256 = "034377422b59cf060c8bb7bddaa196f16917f4b70c11c1a566f0bf4fc5fcb40c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/bn/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/bn/firefox-131.0b9.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "0f918d2b4e26c49a725792ffe01f8e1bdf9b3960ba1e2cf6b304c00937984536"; + sha256 = "af909704445b29982a81a34d5bb0cba22edb464905cad4c92e77489913fc32a5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/br/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/br/firefox-131.0b9.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "cec99e4f2f0a2b111637e0d8fadd0aacb400727bbccef462d16db0f4805ad971"; + sha256 = "54cc7cd3b036d57c9a5c0e5fc0ab225585a80bf787bfec394acdf63849715bbb"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/bs/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/bs/firefox-131.0b9.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "0cacc56ee3d17220a3327639de3e107c4e8e574c94fdc8da29ca6770dfdaf7a4"; + sha256 = "5840cb0fd187509740d69939419cc44a3e25ec567cf92355c4cefc2ff209d135"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/ca-valencia/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/ca-valencia/firefox-131.0b9.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "afed8d6c7751af833cbba0f12e548bedcae1ccf5a3ced5d551db56d79866b1ef"; + sha256 = "cbd42bb1ecc25d4ffbcb8d8cba9953cc0d55358f76d13ce1db7691953e6c1f68"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/ca/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/ca/firefox-131.0b9.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "1b3b89346b66eb2126ee628b68f3fa3fba8c625ac333ae87a6482176f867dd71"; + sha256 = "d8edea663dd8452b9fad221430d6ab71305d28734ece2ee79d8e8b29c875114a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/cak/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/cak/firefox-131.0b9.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "a78c2e9799efb987cf44a4ceee61933432f9979bfdd82fce0de373cf016fe37b"; + sha256 = "fb08af9b0ac43b2cc8aedfcef69996f80fcab1664fa4031ac52bf9236bcf9c59"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/cs/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/cs/firefox-131.0b9.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "bfa3ad2a4778ff6ab52ab7eba6f5219dcc6f7311fd466c68940d92779774467d"; + sha256 = "6369dfe17841c9de4b3b5a93032c559d35e67c137cde1e4181aad414e06c5723"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/cy/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/cy/firefox-131.0b9.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "7682e913a6bba419cebf21de044dea7c3fe4e2187529d5523373bc1cfb0c7956"; + sha256 = "0bf424ed838344a98f81933de64b033726cf66ed9c8eb3142c21a10c8fb01f0e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/da/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/da/firefox-131.0b9.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "d133d535195a293dd3a63162d479086ecc451104f62090e2cfd439f590d75fa9"; + sha256 = "1bdb66957a5540f3768ffea9c0c23c2293fd0fd3a66aa72a2fd47768854015fd"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/de/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/de/firefox-131.0b9.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "4b186c5e4e5a6c32ee7f71b25ad68c75973739c1e10541cb79131940efe3fdeb"; + sha256 = "88a3d26cd16051096179b93d3e048e6fdb07a66453e037ede38ce7b4ddc63c47"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/dsb/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/dsb/firefox-131.0b9.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "96e9a434fa9ad495a0e337683fd2988177843e3b7d59458d19f0a97a758fd00b"; + sha256 = "bc33daf72d1f2f53baa59cc247ad7ec81fbed391f310bade3a944378b48d712d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/el/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/el/firefox-131.0b9.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "76fed2fe453f5f85185e84c5fab08f46b47e097865a43004bb2dc6a4b43c64f5"; + sha256 = "6e67db3cc25ea6524d27d061802fd927cfa30161fb7a6fbe0e0503be6ba90073"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/en-CA/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/en-CA/firefox-131.0b9.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "9d7f2c2c4db876c164e1c95d33011cf2e1d09550d6df43fa58fa3c9fc1619981"; + sha256 = "74080ce1da63f5597e2bcb2cec2aa293e514dcf80832188c2ea38e0c9b247dd3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/en-GB/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/en-GB/firefox-131.0b9.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "b433bbd479360ac9624722ec70f1e97fa0d5e25f955244dc5bf03b4fe4554239"; + sha256 = "71f04becacd320bf673342a72de1f68136048c489ced4a31afee8ebeab2e0db9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/en-US/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/en-US/firefox-131.0b9.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "631469743fed440b332af0d16d806795cff7f30b3e7265b2eac98d4bf98db2a8"; + sha256 = "ff0ae00d7685165a47ca2e6c29980d3fd24a2889a36c066993a86930022f8d0c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/eo/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/eo/firefox-131.0b9.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "cfab9b835f572713b767dfc89327c0371da38fe5106843d88e9b012baf0afb29"; + sha256 = "b3bf81f117985d8baddd5b14529c139eaca9a9a7473526aa89f63465fae63689"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/es-AR/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/es-AR/firefox-131.0b9.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "e0e8c77819aace0322f1fa36a57dde503c19a7104a9660f7179b9cd9ae8f1262"; + sha256 = "a45a2fb851b0f5cc16abb0a8db6cbc24f63c5670e00bdc03197d42c3700aeb4d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/es-CL/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/es-CL/firefox-131.0b9.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "7a58a042a064184a4146da4e29b8063d0a588b64699be180f8e061752bf3c4ee"; + sha256 = "f6b399aeaae4afd02ff9ef1470c4ac643f35ec291e63da1d0bca35ee80441838"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/es-ES/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/es-ES/firefox-131.0b9.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "90f55ac2c19aadbed48cc9b8f475896b5bcc3527ed27b5dc75a57e00a1b1eff6"; + sha256 = "1cf8e064fbe3018a46083120d7a0ed54273a50608c2f3c4f193d5454128668db"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/es-MX/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/es-MX/firefox-131.0b9.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "fdf59175bccb34442af1cb5f50a6c2c1e8621523922e6e6a438377f797b8dafa"; + sha256 = "47771d5c6a450babe2df7392edaf3db890e74cc0ff2a840fa3073f147b00b692"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/et/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/et/firefox-131.0b9.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "b81f13c82bc73367d51155a03bb2b81712a62192785ded86796788578e3ff681"; + sha256 = "c945c1707ecb99efe28f1c954e8b24a30d7ced8efef70e12aafc27573ffb8eba"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/eu/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/eu/firefox-131.0b9.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "f5edb24a1ad14037ea08d778050f8da3b825bdb8d8a76f57e278acf54a10a5b9"; + sha256 = "a7dfd698b4ddb847190e5433be60c2f4e439eca168a4069f772f258f741f52b2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/fa/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/fa/firefox-131.0b9.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "ae33ddc1a4d1ac5837fb138f0b56eb83a4b185eec8417bf19dcba5e1238a21a8"; + sha256 = "45240bf84f0f36ba76eacd45eaaa50764dc31b50024516a108bc7a0874ed7fd2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/ff/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/ff/firefox-131.0b9.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "6f76ddfe3379324650e32452df1f7407a3105ce02bae6ade173a51cf1d478046"; + sha256 = "4c7437671123c8166010004550c4f537b7781a7f0cb613b2d410c8f22b9e9e69"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/fi/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/fi/firefox-131.0b9.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "cdc69c23e92616147d43eaf29aec2e5df0079e8721cab027f9651ab34abe2988"; + sha256 = "0deeec3c2641dcf2fae91ab2ca9f7bfc2baa4da60e17d4f3222f771d9e164da9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/fr/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/fr/firefox-131.0b9.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "aeea885a3243c723f0b1cc21e991c8505e2d1aafa58ae0c9bfe1123d24a95ead"; + sha256 = "21c640f55ab1eadebce4d95126362dbc133f4354dc8eca23cf77041bcfd8f621"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/fur/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/fur/firefox-131.0b9.tar.bz2"; locale = "fur"; arch = "linux-i686"; - sha256 = "85537ea245f24b25b110ea968eae5ac6f72605d3bcfd43a445e97410b729925b"; + sha256 = "60ceaeb0cba8de73fad46fc8804f1f53fc332824636de54fc25860385f332e8e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/fy-NL/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/fy-NL/firefox-131.0b9.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "e007bd725f02de520b5371cfe8056f11ff037b9b5e49525a649087b9f5e8dd6f"; + sha256 = "9c3d979d24bde8a5b942243144c2e99efbf49dbc0b53f467646f4ada4d95beb8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/ga-IE/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/ga-IE/firefox-131.0b9.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "32e1fbe009bac79b7fed9125291e9550608328cf9edf2c4ce652d2e762027670"; + sha256 = "aaedb9933a1d01338d4d22f907948b00c9a88fa83e80530e709bcd3272c5aaec"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/gd/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/gd/firefox-131.0b9.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "1e90d4d5a6236e31fa76ed773760bab8f76d3ad9a13ca89b77c67fe62f367c9d"; + sha256 = "85ffbc7193f6957c07173c8522e70fe313dd116bee3da52588f61bf3cddff1e7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/gl/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/gl/firefox-131.0b9.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "55472c87702c35df3b6511b364ea64eaaea628483d8c214dc2299ee9159148bf"; + sha256 = "54a8bb50e9d497728bc455285ff40b53c7ac663e6b12531e17dbe18019bce19d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/gn/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/gn/firefox-131.0b9.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "c30bbc39d3c99f5b5b66f8e91afb91e6c4539658da8a0bed1e025acb26329c9a"; + sha256 = "348a0de7fa8d1a8a44d0a4b3de48e7f377e5af3a6ee1a6c5c87d5f3e67e394f0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/gu-IN/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/gu-IN/firefox-131.0b9.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "9000f9f5501bfcca41e1b76207e559bf160485ecd1370b559d471b1883f06b30"; + sha256 = "4c5bec0040ba7c7c86327da0936fb82873986535be12aa61085b5fe2fd292a83"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/he/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/he/firefox-131.0b9.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "1a579627acf37865e1e354c8e2bdbd5222ab3add1a18bd79a869ea237380855d"; + sha256 = "2706293c91fd55de743916430cf4bc410a53efbe563f5c8794b6fa212b767870"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/hi-IN/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/hi-IN/firefox-131.0b9.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "06e2f8449087b8466739ae2c1e3623d7e6424f7b49a4feb77e4696336079e871"; + sha256 = "620034e178aa1688c851bf618ed05c238e89a4611652d8907bb56858b0a88874"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/hr/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/hr/firefox-131.0b9.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "fb4bcfa65aa2c4e250109f98ec2da08270910707d1ce3c150ef5d125ce84731c"; + sha256 = "b168e24590ae4e74620ac279982d3277105f01e57b4c7b014965e941596960fa"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/hsb/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/hsb/firefox-131.0b9.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "ecec8874f29c42691e991e0e35f29bbdf52e66f63a7eadcd1d14904ff97019ec"; + sha256 = "6a1b831ca8b7400962a051e2308c67b231dad5f331daf371440b73f02f15e305"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/hu/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/hu/firefox-131.0b9.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "097fa497377efd34cafb30fbf7bf309f0ad70f6b37d6ffd1e0ab12e8534747c3"; + sha256 = "c2db40b3fa0759bae7fcde219b91cb8c9d80548fd8f58ef006ed58696b0272f5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/hy-AM/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/hy-AM/firefox-131.0b9.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "8d721e9f622eaa2e34a6a1e371e27a8a5f52fc14006124e7f1c04ed4ef061bf8"; + sha256 = "e59f4ab6b761122b271f600ce3e3b2045b3264793ef4ba0a5f786f90de227a7e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/ia/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/ia/firefox-131.0b9.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "e080b7c91a3d14218dacdcfacac95a8e69688e84215110b313dd6b4f9103bb34"; + sha256 = "cf212e24c3be50a4a82f4e85a4363b1c9561441a98e2711eba4035f3d70e37a3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/id/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/id/firefox-131.0b9.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "a895763ae3b2376bc7d6475832d6b5a3c7fd489f69714e44c654cc6f1b020689"; + sha256 = "1ac9397f213d1563840b1644c93cac4e9fbabce5d64d34d0d26cb2ad9cfb4e5a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/is/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/is/firefox-131.0b9.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "b924d52d0f875d11a5fdb82014d1f3bd6f4dacf59991fab768e3870ebb7d7e15"; + sha256 = "4b35afb37dd26bcfb2d1085ed52729624522c71d28429266896234be6d4f4c01"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/it/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/it/firefox-131.0b9.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "5af7bb832f155cd3932fa41407befc15842da3c4faf69740e364a5299683a67f"; + sha256 = "49cfd104dfb6990e0d710e5f00b0a2261e219306ba79ec4c0c781a7c7434e7c3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/ja/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/ja/firefox-131.0b9.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "ab2abf989843d52fbc958922d607e7107928f19aa8e346717e7b0afe0e8c041d"; + sha256 = "f22221daeaedae3617119c7f20967fa4da9d31e3dafcaa7caaef2373a3aa6c9e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/ka/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/ka/firefox-131.0b9.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "f281e820191256a778e60b99e3ab21ee0c6a001d19dfdf66f0997d66ae2068a7"; + sha256 = "fc2f5b3f2d5ce8ca01e8a99dcee1711d1ee4023abb8731de5ea46692c4a61290"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/kab/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/kab/firefox-131.0b9.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "e7f36ddf2bfba93f0eaea2091f9d19059e469dfb6392059e25c94f3ca6b76c13"; + sha256 = "055280c45f00288396d36c256526a5dd64adebcf3bfe440e9c9ab2202e55ab5c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/kk/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/kk/firefox-131.0b9.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "5b950ddcbd0b0d1d35ccfe513fa75c97c4f03c9492f284aaccb8448913975f17"; + sha256 = "0a5317894efdd746f0e8d40707b0c0f33b8b84edc05df0c4f9002c884902e081"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/km/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/km/firefox-131.0b9.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "ed151e02a9e6023584b039c563eaaf5687a0cce2e524d112fd8d0b842ddc5edd"; + sha256 = "8c60941a34c898b3856ea187e975a7d6dbbb73a505d5ebaeece645d35106ca59"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/kn/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/kn/firefox-131.0b9.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "4eba588e48a099b017525b53fc999a0bbd4414e61299e2bd91c4bc451eeefeec"; + sha256 = "93513224080c9949528812a3da30f0a6e178240214fde3c97d1fd9cabbf08598"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/ko/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/ko/firefox-131.0b9.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "b2ae712b38398a1b8c3fd8174a4ae76901f419c4610ab85d9dafbfc92a1e233e"; + sha256 = "5dd5a0d16fc17f9e4cd252f2ab18a12c457a224b2acd163329cb1bd705f05bc4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/lij/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/lij/firefox-131.0b9.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "7bd8e5afe6e8bef9ee917a16c0014153944baad3d4df07604dc67ea21ac2b065"; + sha256 = "c54c0e099ec3dfb6355a79e1ae2ffa1298a21d786e6b5e04fa9a428872a4f717"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/lt/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/lt/firefox-131.0b9.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "f9aafb27d854e8ae6eb6e2ff85cf7d14320fa7e2aaca5836be0e7a09dd4df415"; + sha256 = "c955b89c4d53075394cbb4d1a68e3864522e7e2fb24422917828079ae431f216"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/lv/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/lv/firefox-131.0b9.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "0b0d7e0837f0d9e3f0e9f628df717500079850a69e065f4a6cd3771975b96c59"; + sha256 = "21b15d4bc68237c8ca60b7fcbbe166c2bc31330b5d77d333e25066e671f545ee"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/mk/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/mk/firefox-131.0b9.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "3541015f658ad5275ea503708f4a4daefa66742a011eed36d943ba49e377b278"; + sha256 = "1ce9a53f0dba2c1f93a31c72228c6df2ef70e74cfa155058f764ec2ce05d3e91"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/mr/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/mr/firefox-131.0b9.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "d8cd2c6d7be07c0a0d7686917c2c16f4d7620392616d985405aefac36880d68d"; + sha256 = "b2a70628f72f662edaee06a767fba449a91af37387f0aac0d5c8b40a7c61571e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/ms/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/ms/firefox-131.0b9.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "0150da21fec66c1da911d1968ff281a97c2d7421b7c3e423066f091bd040c357"; + sha256 = "c4b7453d3606d8a92acd7848e9e8e9f6aa2e54db11942a09b004b5017a50ef2d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/my/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/my/firefox-131.0b9.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "0fe17f9023928bbf8845aa476b27513954380e8096fe7cb206be9633cfa3cf19"; + sha256 = "c7d0ad3715681816ed5466640315d50fbbd841516c56c6828e8e1a777207f967"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/nb-NO/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/nb-NO/firefox-131.0b9.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "4010fb76776bebf6037ce0788946e6098a7bface36c1281f14a7d9a69acb1be1"; + sha256 = "2d2d14fc9a898ffbc755ac2b8d7cc67e006fce444c28785adf65f2663deb0815"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/ne-NP/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/ne-NP/firefox-131.0b9.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "675cf87d896a9441e3f8ee2bb72853fb261a552766dc49f3422d04c537ab0485"; + sha256 = "4b3da73c884d15c4ab8be803ce8fdc6048e5c64def9f4dc9364b5df49774b67b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/nl/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/nl/firefox-131.0b9.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "28caebb6df719979af3cab55730b5b0445b6d855667e06dd235725263aa8c5bd"; + sha256 = "a240f5ec34f358af7f0c5e1d15f6a9626d9a3e2a39cf75b2427f594be5045fa2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/nn-NO/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/nn-NO/firefox-131.0b9.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "31ece43a2f1810d7bed9130bd7ca5f81d8b35781bce1555a10f3c80c4a1b562b"; + sha256 = "b4cecd431906789f1a1fbbd617ab332a6a007573c1c5ba5210af4a7de7262ba9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/oc/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/oc/firefox-131.0b9.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "51c81489325ceb3f17fb48a493247eadc977f53aa82809fbf46240b582d04e3a"; + sha256 = "71230c3129a6ede7cd78fa9bbcd5868aaa1e43747a901645daedd0792aad3b39"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/pa-IN/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/pa-IN/firefox-131.0b9.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "2cb5df6e97c3dfbecee309380b61438c2dd8c1101eed829d72e81a2b3e6d1e83"; + sha256 = "fdc719499aca5931cafb78b12b779d744239e9321e4b7cedeebec3a86ddcc4ba"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/pl/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/pl/firefox-131.0b9.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "ab03983056df8b9f86369d60fed694f62d8435913bdd4c9263056744be1f25bb"; + sha256 = "c0d2437eb209648346e69b674482b7f3d5e95ac3ccb012ec1ecddc7ebb9bd203"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/pt-BR/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/pt-BR/firefox-131.0b9.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "cbdd4c98cb163b2f2855d6a9d1044ea58c011bfa635c0dae366e864b4faae805"; + sha256 = "07a5dae4cbdfcf6d2b8d5e34eb0cc95f55884e58a7f6cb3d8183f95225f53c66"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/pt-PT/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/pt-PT/firefox-131.0b9.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "7aea218fe428795abe12d23cf1c5253aeab4382c5bdfbec0ca575e2045ef46ed"; + sha256 = "4701a683a54da5ad32765979155a5115e9b4a8310029bdba587650255cc911d4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/rm/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/rm/firefox-131.0b9.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "6d62a4552a59300f4c72c418a6fd386ca89ff8eb2cd43a10b01271a168c057db"; + sha256 = "004a519addc3af848ad71f4d4b85afff5787104006f650748bdaaf3fed861f81"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/ro/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/ro/firefox-131.0b9.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "11bd2b72830e876895ba9a53d804641cae08f4ac1c0691f5b75bd8c50627576d"; + sha256 = "2c65bd5d604b3e3f4e431911a4f38ef903060c7cd5d79882287c027b4696e04d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/ru/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/ru/firefox-131.0b9.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "8eb355d2482252bb668dccda8afe3ec4e9416f0ce8b1a7d1bc0b3b1e614bb53d"; + sha256 = "b4ac9db58806c4a2f636a912663007268234a9d2c86dcf4be565b194e8ff7aa4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/sat/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/sat/firefox-131.0b9.tar.bz2"; locale = "sat"; arch = "linux-i686"; - sha256 = "56fdfd81f33a17897831e6fbc960ee72b6d4bc5ccdbe0f499bb7040c467d5c98"; + sha256 = "4fd9453ad511871ed46ae1c5890071945724e7876fcd1ea818b3aa34360a4260"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/sc/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/sc/firefox-131.0b9.tar.bz2"; locale = "sc"; arch = "linux-i686"; - sha256 = "79f9d2dac687d4ebe5c3d89fc142e0fabbb744fe13968e81014e12687f54482c"; + sha256 = "1e2d3dfe585ce3c4472055ea644b75eb4ece0b60c8b5c05781a122d4c2958ae5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/sco/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/sco/firefox-131.0b9.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "f9676a196a76a269aad93d9960759ff179e21fbacac3957117010fd231b4c49d"; + sha256 = "7e697b48056401689864604fb64f1344fb2e5be303a09f5e2a35fc1cc665d6a3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/si/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/si/firefox-131.0b9.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "4c0e4ca10911b46888b1f88ed8922375354c2d6ad549023f7f5150752ef61f68"; + sha256 = "a4b8095c01c86f30049085a68631372a563de6941b4af7b31a5ba9502ae49b49"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/sk/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/sk/firefox-131.0b9.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "643cfa0f3c65ff2051aadd235042fafd52c5b10ef32d4be79c76e1b02da62bfb"; + sha256 = "1c915b7b06aea488410bb1d0b466ca77c204123f83988cd1466f7f33c77b6165"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/skr/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/skr/firefox-131.0b9.tar.bz2"; locale = "skr"; arch = "linux-i686"; - sha256 = "e8a80a7d5dae201e4590ad644dbd9add83a1c4bcf8f592165c6dc87765f17361"; + sha256 = "4e0d908d97ddb16722b16226982fb1c3593ddb4d1ef2c89530da6a6822333522"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/sl/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/sl/firefox-131.0b9.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "32ab4d5e6df6095aa80184b92fce6bfbe575bd3ebb4c2f9200519c31b67db6c0"; + sha256 = "64f294228a9df9540bf2669a13aeeedb1591ee5371513819096fe7c7a04efb6b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/son/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/son/firefox-131.0b9.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "edf2f00e87e992121721fb2b948637650845169dce0a2f98c708489c8f6f0fb2"; + sha256 = "fb28e25eaf88766f9b52a6bfdff1e918b443a62e128536c6b20ef4b2792f208b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/sq/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/sq/firefox-131.0b9.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "2317f12916cb73037322c9e8c350b4fb2b1f1e9f035337eb4dd7c6acff35ec95"; + sha256 = "778718548b29c64c6282a2a4ffd3686b0f059e7e32eb54bee2392c34fef5d7e2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/sr/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/sr/firefox-131.0b9.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "660fe43de82ddd20b7e8ee3090cebd02c3a78a6b42693be19599fc818662c08a"; + sha256 = "63ee43ca2eb024f95da7d4305b725131a5370f35815e18fcb0892bae864c42e9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/sv-SE/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/sv-SE/firefox-131.0b9.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "1479aaba440418cd9763e1b7a7b6c10c05871c69c27a9d5bcbf19c5956eeffb2"; + sha256 = "987541c3b2aa680c095bd8c2d7d638bb2d64212da2bbebe3efa2125f966264ec"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/szl/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/szl/firefox-131.0b9.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "f0b7b11b448222416e7f8ab46e658727060dedd2fa4114a857800cc6750aefde"; + sha256 = "2b0d0e51c4c060e0e9a3b9b3e1fda018ade61b37054b06953440bd3627af476c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/ta/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/ta/firefox-131.0b9.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "f8bb68b199e450945ef262ee364ed6677998f24242e196d04d45b0209469d96e"; + sha256 = "95ca89286b0845f752d2dd1da6ee87b3f7b4167099a369652b31ecb831d8d407"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/te/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/te/firefox-131.0b9.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "14db538c4ce10af0c635f7ad05447b104b35d5b8aa2504331b1e3a388b2bb6f2"; + sha256 = "21087362b9b7f82cbbe094ee1dd1744a379759dcd7400f423dfc5482bb2922f4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/tg/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/tg/firefox-131.0b9.tar.bz2"; locale = "tg"; arch = "linux-i686"; - sha256 = "32035ea4399a294509a939501f5cf8d5e9e5bdac24662fd6e5054adddafe843f"; + sha256 = "af3d65fe8cc61128e0fec89eedac704733beb47ce9d4db71f9ffe07019f90f1b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/th/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/th/firefox-131.0b9.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "b09e831b65829f63325354bdaa0aa40097a035bedcdf8890464f2cfba1b4bd86"; + sha256 = "3f198213cb7c8221d858c1c824d3fe10dd4d8835b237c0740d46510f0c95df14"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/tl/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/tl/firefox-131.0b9.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "a7d024c484ab97f4138d6468a60ad0aea86427ba955db0522fd3c93d89becac4"; + sha256 = "f8615bc06132b22c170a0ba552c9412ccd6c4c9f3b6a760a77e26208d03c5cc1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/tr/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/tr/firefox-131.0b9.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "95ea9fe51952c17f66171420e42daf69653f50586e50f52794df20ed6dc294f3"; + sha256 = "e1362f8b285d082ef2299be9af67bcb65fb58f9620ed19b8f2eb97d902733409"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/trs/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/trs/firefox-131.0b9.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "727afcc04a981d7a29c97ea2776a519817d69deea0c90a2e692169a1aa363af4"; + sha256 = "6cb91ad15348984db6bf9bb11259640ea0beaf36bf06afcf82a7d90d66587776"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/uk/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/uk/firefox-131.0b9.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "e23ab0495d135ce16f959c06e5eb497c6589b3398c2b9971d94513feb65b54b1"; + sha256 = "0acc83a27be732fbf9e6d94650fcc0c467b7d653fd6dd65f34668831c43fa16b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/ur/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/ur/firefox-131.0b9.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "d7f3a250bdc65e5bd15bac830025d62dadff4f889505abe9778998136b675c3e"; + sha256 = "c99a6852c0840f36fd6cde0de174ccbb6516672ea5cf556e40c622a8381e49ab"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/uz/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/uz/firefox-131.0b9.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "23422bf0985202b1e64435f1202b81b0a5f11e5c4bd3dd206fa124b3c2ae5aeb"; + sha256 = "6172ea33ceb1fb782a47f014a64b1cd71050e05e4d8dddcf6270575acae422af"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/vi/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/vi/firefox-131.0b9.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "a2fe9e8d70e8251e88280cc741292b830d10ed8144713d3a0ea1874e6871927b"; + sha256 = "08880e6ef6d4e967d24ead60208830b61c1ae193ffe8908d1b8e09381e369d81"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/xh/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/xh/firefox-131.0b9.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "d1a06a53bc6f3676fdd0a8f45730209c2bae1bf5729da35b0347197183b9aaca"; + sha256 = "e74fd0ec0f1779a26a57b410c95e1e25c52828cf0bac4467815583cd6c426ea4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/zh-CN/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/zh-CN/firefox-131.0b9.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "c3c41c73da2ce5bbdc237d53cde700899ea070d4614e2a7eb3c23aff38ba6e83"; + sha256 = "cf169eaed6e207160ee5ae11d3e9c7f6d61eb4bcc827b0d56bd6216a5e45d5c2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/128.0b3/linux-i686/zh-TW/firefox-128.0b3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/131.0b9/linux-i686/zh-TW/firefox-131.0b9.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "9500a28218045d816828becc5f5b77cda638145e6c3e2e08f848d673d8e77ff0"; + sha256 = "e8bd7755a146032ec5c5dcc816b355fe40da168008570316dd04161767043cce"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 7aa9e82430b9c..6235491b27d13 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,1025 +1,1035 @@ { - version = "127.0.2"; + version = "130.0.1"; sources = [ - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/ach/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/ach/firefox-130.0.1.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "4dfae5ad421dd82245663acde11aa82f10fbd073f45729c9c026bb67864f5158"; + sha256 = "75c9cb604a7c16040bdbcc71fb63673da367b8d612dcf1e4fc8dfdac7d29dc3e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/af/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/af/firefox-130.0.1.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "b3b74ee172d8692d0f6e2a09df097f360c726e66687479b5629e5f3825ec59a2"; + sha256 = "3f77bd5056cce5d0cbc847d8cf4556434a9688fe471ff47a501525d2680bdc6c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/an/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/an/firefox-130.0.1.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "36f54f2a806593130608a24ad46269045410a64f6b0f03a626c5493d9ef45c5c"; + sha256 = "2b395ae966577774cd54498ba1196dc853c037f00834bd3339fdeda2af5e4129"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/ar/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/ar/firefox-130.0.1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "19a33b4b6d2c9628d9f46a3ea54ad265524be6734c5b4941c3b10ee54905bd2c"; + sha256 = "44737896fc8b5a25941e6e764232d422d49e37cb89295bd97a3d0bcc32e1c9a8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/ast/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/ast/firefox-130.0.1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "4f38bae88ccdf64c6b01006b89a28f59ac4b4cd56a1bf4a9652de96618cbdf7a"; + sha256 = "90962190b750519aa295ba33f91a0bb8dd7817b371377fa44bf6ff637d3ed9fc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/az/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/az/firefox-130.0.1.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "dd27539fca8bb7f96bcf3e427d0ce24d4e4c0e85f480ee3d88582edfb9f87e9e"; + sha256 = "e3e68f5181de8e129ca955742d8a78ce9abbcc3c7d460205c186ea024a149549"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/be/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/be/firefox-130.0.1.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "edade0529527a7244d35952cd0a321e55da0df7bd5f0ed9abfe420381a15c60a"; + sha256 = "8ba8916163f940bab5543305654d27e6811723848e8247be2a521abc592d3982"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/bg/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/bg/firefox-130.0.1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "2878112dad9743ed79df6412c1504ce2df74815bf6a94f3e3d7e8e82fe5661b9"; + sha256 = "7742fb6ed71e97c110164722d3e9f62b56c74bf4dffa97cba4b418601df54da0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/bn/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/bn/firefox-130.0.1.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "a6ea19219ee6aaf02aa5957a91a9687f5775fbf8b560457bc36bb27e58251e90"; + sha256 = "4dd8d44964e6e214e23e8b113818ec78ebd7b832c7c2929be5c988a63947be67"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/br/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/br/firefox-130.0.1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "c98bd781a092e33e223322b5f1b758c96cf6ef2560ce6738a14004701266715c"; + sha256 = "0c388c5e442dab48f04b521506a280c285efc18fd381f053ed9a40c31942070e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/bs/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/bs/firefox-130.0.1.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "0082d6d4004ab6aaf0a212b2aaab5e71a199296b718f2cd854b019d775505cd0"; + sha256 = "1c25d079d81d816207eefd8d4cdd762b266223091cd588745f6bb8116ad17a2c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/ca-valencia/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/ca-valencia/firefox-130.0.1.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "f3344a8ec525b945d2d28f7cca7c85b0259a3c74913ae3fca92b4ac3956e6386"; + sha256 = "2ff0f9c005efa96c425d3910aa1218cb8ed31109990268b58c9600a9407a21fd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/ca/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/ca/firefox-130.0.1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "d001c54e02d9ad4f050b0b278a06c21f407f3b2857b5d9857d98effcbc565254"; + sha256 = "ffd0077ecc8115ed7330f0eb93d5cf082333efd07fb34f5966556ddd31e590ed"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/cak/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/cak/firefox-130.0.1.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "cd9192d363f75d01e91198e8b3099118551865a09acfce3bf3b3faa3d10271c2"; + sha256 = "804010785c24e0020e81f19b8e6a4df838cbb620eadf84e9870406dc4c76551d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/cs/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/cs/firefox-130.0.1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "d9c1318224e2cff169a91c149d31365e1b4d1281373aa7fa2b580e7c96d416cf"; + sha256 = "a87f19bd1ffae419af329089be50a25e59adaa77c731843ebbab52061b156de0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/cy/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/cy/firefox-130.0.1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "88f4f8f626f9506af309b7330e51354de96e0cdae323f140a5ed2585ce0bb64f"; + sha256 = "b0ea0a4959c05249d3afc19ded0e22cbe0753a677efe40f8a7f8fd37ae147e12"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/da/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/da/firefox-130.0.1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "8dce8aaa01be56cf2862c3aff05fb36bbff26ef6ac6d879499385df57c0fb1ef"; + sha256 = "27e0961bac128e29441961f73bdf53f171946a8ac214e393f71a43ada8ce987b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/de/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/de/firefox-130.0.1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "ec9a45975a649a2bf851b2e28cb36098a5df28fc4ef6bd78ec576e25b6b56148"; + sha256 = "64f0d066b0d1bdab956679554ed351b344d2b9d0a01c2a1b4daaa19fb9d20ea5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/dsb/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/dsb/firefox-130.0.1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "8a633651937fcd2370d1b92414d92f40e7bc3b24d8b5fe706a1bfcf0dd7ab784"; + sha256 = "caca4af3f10920c7a5240ad5f1293bfb71af2a25be1a8c5ea26c1670984b2a7b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/el/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/el/firefox-130.0.1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "ae236ab979107d8872473ace4e0613f348aa6e253d7f9ecc3324151ae8b0d68c"; + sha256 = "bf6f55b5fce66819c9f9ae1cbc80e141b3e4b666bfd7ca079730406707d79fae"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/en-CA/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/en-CA/firefox-130.0.1.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "1a0b556ee830faf468424a9ae4f6674ca9d3c7e543a8a96645add085f6cd973a"; + sha256 = "b679f0240b3d1535f9373f39b16b36e923e617291401eb07e2ac10581a7646fd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/en-GB/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/en-GB/firefox-130.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "dc0b55ddf32c5ac9dddf252099f76befbd8ca5155e734299187857a5fb18fadc"; + sha256 = "bcbc013dfee5b526e1973557e29e9a44ed5a4f435667394567f4aa46c3c167d4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/en-US/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/en-US/firefox-130.0.1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "9e200146236e2403d4be088b49a6c8de3294ff1aa000ebf385d42c593207954b"; + sha256 = "3b9cd7fe7d22f0960ee5a058e3c9e6b507814958ec5a9ac691cbd5ebd0895c93"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/eo/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/eo/firefox-130.0.1.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "c50d34862367350aa694ac8b5ad97873db38f3fb8a2350c7b509cee85d90f417"; + sha256 = "9749369a1c623aa644c498d8668f47a793c6fa226eacd360a5e270d870615173"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/es-AR/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/es-AR/firefox-130.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "10f171448d215525df0bfce6032ae1526e1386307c563c672c333421b9a602e7"; + sha256 = "7a6ed7afacc50a7d10ae5befb559c849ab68aa194be5e0acd003c6c5cd9f59a0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/es-CL/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/es-CL/firefox-130.0.1.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "b5d9e56e9b814df519e169bb238d8777a56aa6564b21688f9a6cdeedf1196471"; + sha256 = "b8fa5d24f8ad928c704cf720b75d538da63212e9579de1e84474133e3548ef59"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/es-ES/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/es-ES/firefox-130.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "2ce2327cd3fee48bc33b04f142fcf208aa4bf1fe5a3153e5516b28d6a8d09822"; + sha256 = "0d2d0bac9b3f191579d31d6c69eaa384f11b8a0c3feed2cb6f811d00f0addf9c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/es-MX/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/es-MX/firefox-130.0.1.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "8c28e006fd14a56c64c56c1582495dfaa50059d339a2ffecc8f026e85cd473ae"; + sha256 = "a4858421fb5efcf5fc6b03fdd9c265eb3575f48ae31565c186af92329da294f7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/et/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/et/firefox-130.0.1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "1cde2e22e944213cf66f81b339a07bf6b51934597c95839e7b1fe9177c0eaf05"; + sha256 = "afb3cf51ebc592be17f3a57db277014092338ea39a8944ec8d6a9d6ebe6c8919"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/eu/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/eu/firefox-130.0.1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "a2963d61444576b3ec18af5c0562d1348049e86e0419d046bb9d08ea17e5d463"; + sha256 = "45666a4bb058b5284276dd3953607c4174530191c2ae38d7edf84ceec230faa2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/fa/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/fa/firefox-130.0.1.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "9d3a3d49c64f9c71b504d8ddfb7134dbca5e4be516c4918a93e6fc27b23d0c3c"; + sha256 = "000c3fa4dcd7194a89f32759b3a60d7314170a535a52d1dff96f5a0d44e53b0e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/ff/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/ff/firefox-130.0.1.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "63b1e31fc5eb80156ce506069e34c8cb746ef0fd9e862372b70af51f84b96a88"; + sha256 = "179aeca43505fc09c06e99bec7fd0624da318d989531188b85498d04e395e7d8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/fi/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/fi/firefox-130.0.1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "0dc5a2af7f7b5232172f35ab830c50e922f03faeb1d145811d3dcfd929ff207f"; + sha256 = "d0eacceac59cb50d198ac6029fd35a77ea6933f11580bb2a343f18f5c101c530"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/fr/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/fr/firefox-130.0.1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "774d6d7377e8681fbf41098d4b97c8b2a6fa5733a16e82fa30281ca910c9158b"; + sha256 = "cfcccda257189411ee2b462cac3ce6cf88a29e93a17284400e07c7aa6ec60985"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/fur/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/fur/firefox-130.0.1.tar.bz2"; locale = "fur"; arch = "linux-x86_64"; - sha256 = "cc6f207e654aabbf98b62eb35037b382faef0f20a0579900c294dcd04d8e672c"; + sha256 = "435e5cb2f76c172742bd7c303f6adefeccdc0f776c385b3f10da90e131a29199"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/fy-NL/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/fy-NL/firefox-130.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "bee7bb15e83fcbd301814c6fa5af00e981ff411ce8f5e54d7f7ca1e0ac702b7a"; + sha256 = "f9b474e950efe6e1d46dcf7c29a254de5bf63d46f6977b7d5c66346f43b05de6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/ga-IE/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/ga-IE/firefox-130.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "84d2a4286f25871773c77ed74644e88a7a32c03fa65102d583727a9a63442c57"; + sha256 = "6d4aebf9eb334c1c02c3bba36d7b42bd388faaf605bfac5b59a26dc20892bca0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/gd/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/gd/firefox-130.0.1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "f42aef7cf706b73b0e4f9228513b9d5c6f0e94416facabf16d516e41980fe4ce"; + sha256 = "f140ea4f4ffb6d5942680fd3aae2d97be1d581510a8e0093792df9cdc4afe69d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/gl/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/gl/firefox-130.0.1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "9ef6d0ab0f038d61a0eebf6306522705b86657b0e453c3883a3ff282ed0ecdd9"; + sha256 = "ac3d20c642f1822b3ee4ecc42cd23a5c148f698c3bbde19d3d857fdcd8186818"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/gn/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/gn/firefox-130.0.1.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "74a1933f6a3e32aa7bc5ddcf7cf6cb8a6d213f251bd996413db26e30136d0ef2"; + sha256 = "dbda1334a1d44c5a3e46dc5f7244ac27e4429ad0ee796a21bd3bfb30bb2e032c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/gu-IN/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/gu-IN/firefox-130.0.1.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "5be06369f5db552e0e74b8533c0d594695d0e9b1beb2a13e882085981c2f734a"; + sha256 = "e0590e806095192472c98dcaa70d460faff53ca715c8cc6f163ecd193870ebf1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/he/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/he/firefox-130.0.1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "6f02e9268fdcc0c328279df1113cd886fb640ac14f883d46500542284beea134"; + sha256 = "04e5b40a4835655eaf03a3651a404fcd443300a9b9e7bb3f212c517216feef00"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/hi-IN/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/hi-IN/firefox-130.0.1.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "a1530fd469d553ed332f685d5688efac2a5766039f42a889475333b13f05d016"; + sha256 = "5e171f6eb5cff927c28eac34e052354bf699761b490301273eb95bacbd579c8b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/hr/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/hr/firefox-130.0.1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "60ab0be6f32c8c27336eaa1d40e92f750381a527178ae3ca98540b5f1fc39b2b"; + sha256 = "96c0e9e1c6d036a5ca25a2039b68d075b6fe139c97990785032cf60bedf28a97"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/hsb/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/hsb/firefox-130.0.1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "5dd37ab66bd3aeb0aa82eb0f92ec82b24f15e3ef418b5b03d5c57846b9657f71"; + sha256 = "b777a174d14e7f99d428da8811f544a3b1fccd75dac6b8519df07a71676bd0af"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/hu/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/hu/firefox-130.0.1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "97ff3ab5dd865c4f550bfb710212083df39d82c47a053d603bf75022a9f1ff2b"; + sha256 = "00e00b71173992f0afd83c0b13ef68733e3c6c42b6e6113248720977aa75526d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/hy-AM/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/hy-AM/firefox-130.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "c13f704a3231f35ef4944c5140a6ed89b2b88638a61c92a76d6460bf167a38ed"; + sha256 = "dd2dce3c16401652308f1b3c3ff6020daf60b07e54fcfd959fef33d8ecb07999"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/ia/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/ia/firefox-130.0.1.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "a70dfaf92b39fc33dffc8f5c95b62c2783ff5c68d10e04c1f37dceb372b9aaf8"; + sha256 = "32731f851776ea6b8d3bfc1798717d4d87c86c64e5729badf23457a426043a60"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/id/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/id/firefox-130.0.1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "507c9b6d80def4fa180c666f9da7c7910b954d794a2b8ee56cef160cd1bd1092"; + sha256 = "a2d99f609828dcff17b7cfb5f5886a88450d915d929c5e1df3d93284cbc9e03b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/is/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/is/firefox-130.0.1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "3c12b24d32d1629dad830575a391be0518e3f44940173760527827328d402059"; + sha256 = "abe7065ef5b0062d208c872cc54b148051a2af3ebc9ec30705dde66c93e128c0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/it/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/it/firefox-130.0.1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "7b3fc208e75079e2f01de115f613db7e96d2e5f4122eeeee63db2f022eed60e9"; + sha256 = "d366547cd018afa7a2ad6cbaea2ba9fed3b4b0dbdc40abef86eb532b81137b57"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/ja/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/ja/firefox-130.0.1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "881e83cdf8effeb5e9f27f64c0ceebd522e56041d34ca3786a2801641dbbd3fc"; + sha256 = "0f6e5212a2d18698c2c141d551406e1b9755931b0d39b5e787e2a72fd5a1efee"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/ka/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/ka/firefox-130.0.1.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "edafa57a48cd4b1935e851701c8b197adf601b50d6514edc9e6b41f390bf13f2"; + sha256 = "c12c8f9c43959b58208163ee2c7453bcccf1e1d78e49c070e42614758a37e2ef"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/kab/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/kab/firefox-130.0.1.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "0735d2b6243f167f61ec272b2cdf4ee0c3bb2b176ed184d54f48233946d2e4e6"; + sha256 = "e3f04b0e3a49b4cdc0a275ac76c08b01fa5087d8b772690ff2a0821137ab7a89"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/kk/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/kk/firefox-130.0.1.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "e54e825997ae813d6fe2cea24ca19513d40e332dc5d8b95b86777caf95ca5d80"; + sha256 = "2a9834d53c95041308952386081e5667890471d011dba248167f5d458082e835"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/km/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/km/firefox-130.0.1.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "43f2fa9985241a9b1472804af44c7719166dc122ecc42ea5ba34846a1564bc71"; + sha256 = "36a9eec88a475e4979a61e6a2c6ee735429f8ac7142e96f14afa11cd6a930b86"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/kn/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/kn/firefox-130.0.1.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "ced0e62b4055403d0b78c36ab01d9a5242b627aa9132f5028d8ca756270dc65f"; + sha256 = "cbe7d2a9391c7f57c632fb554ce2fb00ec18540819bb9993a8d9d539cdbca1fb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/ko/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/ko/firefox-130.0.1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "c645c840d9a7c1ae65ee52b3639b850ca461acd6cfed6935257a11868572e42e"; + sha256 = "d05bde8b6620102c8ce2e5a7054ffacc6058385eb003e782a1fcf95faceb51f1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/lij/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/lij/firefox-130.0.1.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "328ca467ce2bfa6fa8c3d21c4c2c44853cd2def892cdbde309fdc49121868d78"; + sha256 = "24120aef5d15de287ffaac116acc48b855677ce640890808bbd06fcbb52c1e3b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/lt/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/lt/firefox-130.0.1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "6e7d5279c77f91f4c0cb2e47b74dea071f0f80d7fc23453a1aeeb06e3b2d2990"; + sha256 = "c31eca623d0f66419f941dc59065a5e7499d713083d63f710a3b8fc801400499"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/lv/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/lv/firefox-130.0.1.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "ff1baf65721034c4f0fbcc85b4de21f30abb696dc4bd42c379183abaf2d7ce8c"; + sha256 = "f3127019c3b2d0623bece4a113d6347ba7a9bbb4d9b26750bc5c24aadd01283a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/mk/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/mk/firefox-130.0.1.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "256dcd6ee20c4b979b62060115d37123da404566a0bd2a2e676fb1e9533358e2"; + sha256 = "7d43691141595c2bda66331e22c2c4f90d9efb4f399f1a157a94e7f81926631e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/mr/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/mr/firefox-130.0.1.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "084480eb31de920f8188a3eb0543322760924128c34b7667ed442bedf0c1b47d"; + sha256 = "05b7ef7b28856b95af02aef3062ab7cfd553aec7cccb01ad837552d14b8b64be"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/ms/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/ms/firefox-130.0.1.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "4e8aaecd56f83c7d611ebb91f3693f4aae8a8d39ba6bb8b5e096eab1e18b923f"; + sha256 = "2ac03b66b00c2573a63895e8e67273c8cf9e13fbbe3d60942c9bffeee701daa0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/my/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/my/firefox-130.0.1.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "5d5a9dea125a06fda41111ac750e6e80483ec69d2db035b38bf449a1e8a964ed"; + sha256 = "c32daaf07a5d65609fc8a74e924a87f927c633f4ff0997d36e7bda7cba7e03b9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/nb-NO/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/nb-NO/firefox-130.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "6c6c20020c2e7163ba5f164ac5a65ac7a39c636921a5104702e59b228773bd41"; + sha256 = "c4ca2aabe1f728f6c71f75419c4a515d7f39d4d00b79248d72c1694d07d207d1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/ne-NP/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/ne-NP/firefox-130.0.1.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "64a0476a467475606d93b01776c5f312203f2c890a1c46e57200db97fd2bade1"; + sha256 = "d67387b667d8af34fe4d0115cbb0823fa55d4cbc645c5325f8046e230fcbb420"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/nl/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/nl/firefox-130.0.1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "ac9a3d91a2c990040e9087eb2efc1162bd63f0d75b2932c0db7acf81d059f898"; + sha256 = "fbd04495157778a63e3b42b0f6f57aee59d6f3abd054df4d941fa571da9df60d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/nn-NO/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/nn-NO/firefox-130.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "beca6cbf60ef413d5467a6cdd934fd338c510d9d350919acd6b86fe7fdd21df2"; + sha256 = "6b44d501081b5cf3f97aebc9ef443cb044174bef031a57b6d528068839cc6f8b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/oc/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/oc/firefox-130.0.1.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "c3b69394a0bf611f95a046f474a0bbd1a31f59bb57f1ffc7752a82e61a856240"; + sha256 = "598fb38e1223e38955f073df14cdd6843cd37f5f48dff9fbae0b7b31f1c2b328"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/pa-IN/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/pa-IN/firefox-130.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "ce6a5d86485002aafdde6e8d5b77683b595dce9b20e07bc0525cd3f508e3b516"; + sha256 = "251801dd9e71f4b4eb4e55495f56b93fca899ba86b7547c3fd3d7bde5403fb87"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/pl/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/pl/firefox-130.0.1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "773b984d1b091ddc839c2f1d123723be38a759e12536f874bbbdc1bb4e54dc2c"; + sha256 = "4fb4aeea80cb89c113ed3bae7b0cece31013301e86eb17f7c573da492e488b4c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/pt-BR/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/pt-BR/firefox-130.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "6d84e766c36fe3501a47f862fd7ed74c68ed12b334d42473db2b10ce8cd0bbbe"; + sha256 = "85a71a60dd43a7d25235cca7284244b81c72693337b0e25ea6c3f99aaa5be9bb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/pt-PT/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/pt-PT/firefox-130.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "7e3e7af33b02149724008270b32c60b96da2b973716918c1dbbf677f93c5abae"; + sha256 = "3d9c0dff410ff114827911cf6503f2a799538cbcff8a63d5a62300272f3e1f7e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/rm/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/rm/firefox-130.0.1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "f8158f3bb19a27cfff9759a541187e764ca5462656f01c007ad4a2f665316f80"; + sha256 = "fa4cab855af47b990036e4935e41174c240063d100e71fb4d55e3fce5f5fedc8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/ro/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/ro/firefox-130.0.1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "b34bc93ea8417c84bc549ac889f06537ab7c14a384fe2de6b11965822daf178c"; + sha256 = "cfd094d5ef3395efdcbb2ce5df933a2c8770513513b75584f3a7fa23cccbc982"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/ru/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/ru/firefox-130.0.1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "3317259104bf35c1063411c61c24012c603dde4639e4cc1738746594ebd541d0"; + sha256 = "04b5f688bc1025c28a9b8094a12b1238b2170ce643b841b8d6fad149f3264eea"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/sat/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/sat/firefox-130.0.1.tar.bz2"; locale = "sat"; arch = "linux-x86_64"; - sha256 = "8554b21b9f4e47ad8d55bed298fa23ff615358a2f4af9e3e747fd1633f26a535"; + sha256 = "24f3ae4b197f1161772801a786696427bdbe34967fd5b4ebdb122468427559c6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/sc/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/sc/firefox-130.0.1.tar.bz2"; locale = "sc"; arch = "linux-x86_64"; - sha256 = "c5a430c37a1904d6c12360dd653d215397ac1c37ff3360ca905df0f10fc63eb8"; + sha256 = "c36770c3992251cb6f3f1aacfafffc2b33c9110a46c6690d7748798058b5db61"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/sco/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/sco/firefox-130.0.1.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "5eeef923d89ffe4ff1d3c059d9e793c599159e541dd553e5e7be367879faeeaa"; + sha256 = "3c632caf75be574fe67a5e8ae828fc2e83a5989ed6ed5c6a5e0437e204aee229"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/si/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/si/firefox-130.0.1.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "a4f73e9a5cded4b81678d5da752443428659e64124365243d39397dd53a7a1d6"; + sha256 = "0c57a8bdb77d98685f1567542f3b3df1ee0d0040d7bfcd69f856d5ca2a262a99"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/sk/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/sk/firefox-130.0.1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "c068e5fb31a5b55ca3c42cfac286275584239349d3210942b66d8cbfaffdc4dd"; + sha256 = "8d8e738a0a0e292509212360ded5f5e58873adafaecebe61869fc2b570b6ee89"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/sl/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/skr/firefox-130.0.1.tar.bz2"; + locale = "skr"; + arch = "linux-x86_64"; + sha256 = "7fbc8f9f0ffa69e16ea5857ed3cac09d979c3963907aa4d58cdf50be5392b81e"; + } + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/sl/firefox-130.0.1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "7f22b8cde10c11aca641f7c14176c59d86b79a654e68bafadeadd4fb7e1ff3ac"; + sha256 = "a977c311dc01a7339f51e649d8823bfafed2589b4c4a835189af08840f1b1f38"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/son/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/son/firefox-130.0.1.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "80523ddb2925d2252b839a0caacaab95770b86835385b7b58cb0b18b522065e3"; + sha256 = "9fcdf9c25eef650a45932855fe5bab78c83635a9aa01528ca06621eed009f641"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/sq/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/sq/firefox-130.0.1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "a8532d02deef7e88bd1a9e5a7a906718994418c231c12109400ddb675f347fa6"; + sha256 = "dc7a2150976e54cb8bb6cc24af79225a0aaebb21b72f3e683a7004a22732c9c5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/sr/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/sr/firefox-130.0.1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "462c47d4ebffbc6864be452b3fc00fed2c7cc14c26f28a6d0de3acf7ef817e3b"; + sha256 = "613bb61f90b1f1258552c447c333df8fa91c603c24b7e60267c12d29c7963327"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/sv-SE/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/sv-SE/firefox-130.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "6ed60502aa9c7b976b7c2bd8daa6c7f112afac6391db69b7538e2d8ccd1b084c"; + sha256 = "a37d2052d88d424b3fe895d8996fa916bf551716fdb4fef679ab83f204f0df01"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/szl/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/szl/firefox-130.0.1.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "dc4caf3f2c931ca69d742afd807c9d1f62fa751bf94a15f2e3c9d06b45ab8878"; + sha256 = "f0c4e6a877466a1278a441981778a2f6ff9d04d15a3509f995cb528da0e8a526"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/ta/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/ta/firefox-130.0.1.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "2d60ac71d827cc6dbcd09432c23af4ce2f6ba1095cb3ec19f0f9d9e4a3cbb6dc"; + sha256 = "f599910e2501517e5471a84afa69f19f13583fbda93136039dc4713d9c0ba6c5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/te/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/te/firefox-130.0.1.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "dff77f564ece7beb32830c7bf7862d80f6b606fdc31a9fd369912b813f139536"; + sha256 = "79fe15dbbc627a7a66e810b97c8c1002ae8382f35e0529ceea035d644b6544d8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/tg/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/tg/firefox-130.0.1.tar.bz2"; locale = "tg"; arch = "linux-x86_64"; - sha256 = "b9241d728186d4f369e94fecab46d653853eb1408166e56f7cb435ff52ccdaf2"; + sha256 = "df7dece31f772e1c99cdc2022155411842c4ef2fa05fd4c23a1dbc5688308808"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/th/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/th/firefox-130.0.1.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "3e87332bcc8c998758eb9493393e91979c12204787efdc450cf480841e11ef31"; + sha256 = "1920b228e39de818f4d252bbc07c62d85b6064126cc299c0996e6ccf5f14ada5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/tl/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/tl/firefox-130.0.1.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "9aa9ad4d4ff39cc06eb8180521124503238ec809e3c621ab037a0d0953448950"; + sha256 = "6c6f598d524db8ab22da11b40782da29283b4a998d4877e4ea6420d720e2f1b7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/tr/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/tr/firefox-130.0.1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "fea0de874ceb3b1febdf0af171bb8e2a77807b4be968ba843950980f61aa1bf9"; + sha256 = "f72dff83c65d08d965b6077d8fa2dba1a3316449fd87d1191073ac2ae717ad07"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/trs/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/trs/firefox-130.0.1.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "b5e1ab4ee7050b903c99549329dbae45ccda6389c2db850925621e4d3ba9da21"; + sha256 = "d64868b3747be0e0d53f723e624883626254494789555a86217c3d7c00f12ee4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/uk/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/uk/firefox-130.0.1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "61c1ac45be55258e45533aae32b9a95c55fac81820445d0e464768c48509fec1"; + sha256 = "d234b14db7e149686f610db14ae6888613e6a894162f4e3d5d42f52f42615dcd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/ur/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/ur/firefox-130.0.1.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "5dc29c0ba5a0368d09f73675633d7110b64b8ff9233ace5a0769e04b9c7eed7a"; + sha256 = "89d4b0dd62729f9a94a9758cbd9f22ae97b920533f52885921436cee6a992897"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/uz/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/uz/firefox-130.0.1.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "39698fa62f4361805c5a41f81853d44e082dedf78cfc5aefc58ddf5a00823ecd"; + sha256 = "b70ce2ac4756354b6791f1199a1b7f0a23a3d765b7a835a7e2e22aa16c4b93f3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/vi/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/vi/firefox-130.0.1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "5372cc16c0128005f282018185ad725ab65b5c04140a10a014efc2cb1fd59943"; + sha256 = "546c912810a2d265a82160bc909be1f2d4e66a48614bffecfb8fcf1200957bf6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/xh/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/xh/firefox-130.0.1.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "5d4ed46c1fccdea8ad2be40aedd0ccb2d3608473cd450005a0dc6da356ae7c43"; + sha256 = "0f4bbdbe66ac44de030c8c54620b2a920208f98d348cbd5540514b57ba0e61ee"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/zh-CN/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/zh-CN/firefox-130.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "a7762c58e6839f764c10fedd2da38477be15817c00070b234af4f59495ab22f7"; + sha256 = "f2f84928414b7a0a86fcf6f90e4a45a04c33861a193e851e22a1344d5410080c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-x86_64/zh-TW/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-x86_64/zh-TW/firefox-130.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "55f6df7a2cba4b4a317de9285f9c6108267a3624790ebc6eabc0d497ca165d01"; + sha256 = "59e51bb6f0aadf1f4dff88fc074b3440a62504f6cd205e5a1961e8a99860e6f0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/ach/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/ach/firefox-130.0.1.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "4262826552bf7012483cfb5a61c4cb3d99cc267ac84dd4eaa3fad4cb144910c0"; + sha256 = "d0a8df5690b0e4c843ad159df9ac9173f1a761b990828da320da6fd4fe7d98b0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/af/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/af/firefox-130.0.1.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "da855058e17f89360708f658fccbfe1a099b5a82e1071227661c9a7bc1a96b4d"; + sha256 = "d16956047b544b99bfc4c33448d033ab5a9a4dc5a2845c16d07d6a12a07c1c22"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/an/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/an/firefox-130.0.1.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "20a8e588bc34e47582d815772129e6c77dca40d7bfece63493dee9a003c21671"; + sha256 = "a1ba502fb3ee547a91f04c60280f5143fccf52c6c0daaf7bf5060a1de8f39d0e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/ar/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/ar/firefox-130.0.1.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "3326c461896dae10a4c2ce300d58f36f38e2a6bb4bb2277579f73923eaa5e14e"; + sha256 = "6b4739f1108e8e5c6821099d17186929d6d624a96cf9fbaea60c83b381b59c88"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/ast/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/ast/firefox-130.0.1.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "af90ec9c53be0e0d885f781ea90db3995c7b0e323e91d793aeabfa995733ef91"; + sha256 = "658df66afaa2e371ca734328ba3b16c3722a1c1abc62e808f125b1c070685c4d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/az/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/az/firefox-130.0.1.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "7a9c0ac72f90b44528f88be35bb5c18c7dc02819cb2cc9cc3b42628ce59a54bc"; + sha256 = "34476903ca20fddb6cba0236080d0117acbefd89580ee280aade1c71202c06ff"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/be/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/be/firefox-130.0.1.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "734fdceff2b722617e1aacd817ce823c076032481a731bf73b9184fca19fd035"; + sha256 = "18484534c64e0b7953735bf94258a309a8714241f02bf81552a3fbeaa1f0c04d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/bg/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/bg/firefox-130.0.1.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "eb58480cf5a0291a40e8b95bc3083bbb7d251d9d82cf84ccc400bf3b60665993"; + sha256 = "2780a582e59eb23f30adf7243398b33210a114fbc7a6c2ceb26b751b2c041dfd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/bn/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/bn/firefox-130.0.1.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "678a0603ad497544b1bdc68181fc5ac9e2acae0eebd9946fb44315668ba78ec9"; + sha256 = "fcccc86a611a46cc35082a9ca175c64bb49f605a37793605b1bb9e1db7174ea5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/br/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/br/firefox-130.0.1.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "6871ecd32da428ba9c9c8fd6c28401f1c77a79fc617304f330c42a57d866010c"; + sha256 = "a466fda7d6fe2939a3785e347e29015ea9d93851b12d3e8f11f8fbd73f569389"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/bs/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/bs/firefox-130.0.1.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "e3fcff0fd7f5354a080c222c8002497255040b19f5294d9e68a08379aa6ffadd"; + sha256 = "c4a78377106dfa4be35d603faa9ef9665449b78ee5673b278ee2f067ff857f09"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/ca-valencia/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/ca-valencia/firefox-130.0.1.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "e50fa7f62356438911b2bb09753891eba70d5339367707cddeb72734f912f0a3"; + sha256 = "613283eb3058ebc2b696a9979c1332e7f569155a7a4e4b74e7a6e238d13868bb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/ca/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/ca/firefox-130.0.1.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "2eaaaa67d02e15ae63e629ee51c0eea1fb305a7a58d0493e08bd780bdc532488"; + sha256 = "9c6cde222489f6f181d7f9f326d7b86ec3e19519f1a6639e6dd89455658f459d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/cak/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/cak/firefox-130.0.1.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "bbec0e259064cdf9337a160176b336ff27e1b28757cd862e6da92dcf2752d84a"; + sha256 = "d096305980893967e5172856e440667f39fbe18aa9be83973303291029a643ae"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/cs/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/cs/firefox-130.0.1.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "7b5fa6fb597ab7e2e226258e97480c6426478e774925098719135fcae93caf18"; + sha256 = "317bd4a0d62fb46c0c59de2a5d985ac873d35442084197b68cc75043f3049747"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/cy/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/cy/firefox-130.0.1.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "be3f396e41fd49660dc739da888a472cebbfb2604a73d297d1f0e227a545631c"; + sha256 = "4c17d63a133bd58b8874af1cc9c06157d0cc4e02594e308ea9f7f3962fe8f6b9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/da/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/da/firefox-130.0.1.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "ce41505935ab911282d2f2e3b94c55b08622dac3c7f0f28d982217f30664c678"; + sha256 = "753d8c50cb670826b7c611c6c3f085e241720951e0e53d2d565bb77051c932e6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/de/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/de/firefox-130.0.1.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "53d38a12dd1bcd2f9c2be3c705dff59a431eb83b67f99183f62277a03d08ea68"; + sha256 = "c1fb1c44db4c82e4e91d94201d99adf75a5c72adf5944edcb4ed53d48e5e1709"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/dsb/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/dsb/firefox-130.0.1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "ce1ef936bcf93eb5068d35a6c9bbecab34c6f013319dd81c6197e02dcc4a0a35"; + sha256 = "9276344352c7b354c946f59bea7bb004c12064a6c7bc777e206191e8afa668b9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/el/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/el/firefox-130.0.1.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "ee2623c0dcd6419bc8e306b4e31d73bc554ac85ac0e71236d390d9c199f996f7"; + sha256 = "d5c23287bfcee8547e1d6a49925abe6e3d9caa426fa8cc9f3881a5499d6f4b11"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/en-CA/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/en-CA/firefox-130.0.1.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "d0b56528926ac55de06f7210dda2af604d0f2b59d632c54cd12b0a061d4660e7"; + sha256 = "f29c1d554cf0278efd95036d9d5d01db8cc2483c510a31183684763943409783"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/en-GB/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/en-GB/firefox-130.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "e860d7a7a66e2b8ccc8f8a31b1bd6c9fe80762e1e15c99918100504411fe41df"; + sha256 = "937fa4b265929bda1b61f672fea89cecdf1c8494cac298a9ba3eabda51ba4a4d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/en-US/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/en-US/firefox-130.0.1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "825248c30801f7b8cb271cd9725a699c0b3d68bdc176d58a46af5032ede4dcc5"; + sha256 = "f02e06f9b63d0f29d8384af8ed43b453bd14e5babc8399b50e399163da219a54"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/eo/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/eo/firefox-130.0.1.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "965369b3eb67330f3a8dbda2e20811f7236a0ffddad2a742235368fa995237e9"; + sha256 = "fb59ef2d60d057d606a2fef5f7c15cf610da24e87e2ef6d23f52c14a60665f86"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/es-AR/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/es-AR/firefox-130.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "0a1d0dfc416b8eeef96b79df5a4b5443763d728cf13eaad8cc3a070149068545"; + sha256 = "0ab1733c1e4ee830aebde7d542cfbe6dccb4992dc9c5665841561dacd6b28633"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/es-CL/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/es-CL/firefox-130.0.1.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "4cb753e847f4c677faaa6683ec78f2de59ffd14e1ce2a67f2b09ca8710126910"; + sha256 = "e621fed31cb3d6c1a1daff65213f31c9f8fb7a3c085ea571fc487479bc109359"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/es-ES/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/es-ES/firefox-130.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "affd43cef6f9620220274af159c510d63b0bd86a7aa0bd856c8f4e33a822b0d1"; + sha256 = "54eaebdfd4361af096fd511d675bacb5b7951143eaf976f5ad2370e44beb3aad"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/es-MX/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/es-MX/firefox-130.0.1.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "689e02820959797262a7a66044f0af9119c20aafb7373409cbd8846fa79e7a88"; + sha256 = "9e1c1e16c7a306113b72e69999ece716ef39118c2bba71378588c5e6f3d17236"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/et/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/et/firefox-130.0.1.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "0323c8ecc0c39cf71e1d3e8ef9624ddeb6d8f9d65f1758b7e274309a40d5fd9d"; + sha256 = "10122fd5709a6dc5a74a54fb504bf9c7c4631dee7bca26bfdb42785215229e2f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/eu/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/eu/firefox-130.0.1.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "3838fddba1cf529fe02dc7261194c083112fbc9344c8804611d9e24a7d4172d7"; + sha256 = "4c32abf0b98d1bf2622332f915312e5f717532dec84d90dbe65b8c41cf355f5f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/fa/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/fa/firefox-130.0.1.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "6e6fa470798f9a048a12624f8ebfda5a174c3bc86f76552965c5bebf22d6b803"; + sha256 = "dd422ecbbf116e5ff12ab72f038c46e74810d678e14c7367bb87e6625f822e8b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/ff/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/ff/firefox-130.0.1.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "051b1b02423188025cb916e68c61deefb02b0588e0630784411a9d5c3d36365e"; + sha256 = "0ba37f34d5d5ba78a12463cc909e468d7405a437e0f660d8b0cdf39eb09355c1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/fi/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/fi/firefox-130.0.1.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "087d6b66e48b50c5d13385ce850614324a857cbf2439cf29c4ef9730fc4cf3da"; + sha256 = "cbce7c32c7fa6780a85c6217ad245b018cb01ea5ece9c3e484ce5f23be510d6d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/fr/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/fr/firefox-130.0.1.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "463bd8478a07ec397c678614c3a80a762170a3dd0b5a378a4fab77931b0c0144"; + sha256 = "59a2bc82ea064c806cf44dccd5d7fb90d0b8f8b3a2b7f407844d26d9caf5a53e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/fur/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/fur/firefox-130.0.1.tar.bz2"; locale = "fur"; arch = "linux-i686"; - sha256 = "960dc76265a02dabdf84a660d6fad6486eac1aeaa1f60bcddc97a0e138f462fc"; + sha256 = "4170ab542895a23b71e3f9d064b1d0c42be5fbb34f3992b3fc17959e18a9bdda"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/fy-NL/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/fy-NL/firefox-130.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "3aa004f2114f24c435f53231f48a4e294ee43a4211909c0160c377d20d9e0e2c"; + sha256 = "2b204aa10331e0dc09e54fe8e07f0f34e22be5ab872402c3378fe375b23d2541"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/ga-IE/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/ga-IE/firefox-130.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "d8b3829c838ba4374f044b477e7c5f3b569fdd4211266a8530dae2a571496967"; + sha256 = "cc0b327505c2c9902042529a53fceb6a844c172591d59e7067dba73e7196b279"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/gd/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/gd/firefox-130.0.1.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "290030ddc0271faacf82e9c28a6b39b04f5ec3a1a2f3d6ab9500043760eb1d8d"; + sha256 = "57cfa8fb7db17fce664fa688f51698d2f869749e412e869452792c0337802bec"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/gl/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/gl/firefox-130.0.1.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "d1b185fdeba1bb8a8001deebd4b1901b8c2bedbe6f83ab7a62afdea0812a73f4"; + sha256 = "f4e27857ced29eef3a42296a06b4cf51423b3f78458c895db49a4a2c0a201729"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/gn/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/gn/firefox-130.0.1.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "876e0b5a5cf938af23249491cbda56cdda4f41bf9094be6e509805d96b8885d6"; + sha256 = "53460973370eb1c9647cc86f5fa732193764fbddc856d7d8a78efb31868c6fa7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/gu-IN/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/gu-IN/firefox-130.0.1.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "034dd128c5d5b1bbb341dcc65b6a575623ee544f5d7319b0b257cd3554ce2cd5"; + sha256 = "ab646956c079a35bca9f035155134171ac2defc609b404696e4d4d1f04a7178a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/he/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/he/firefox-130.0.1.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "68636a8d11c9abc1c24e621a966e4f00a7064e2b9793c9f6ecb09c36781c28da"; + sha256 = "363fad0b806829ca52e945b54557b5ee48ee3c859d5afec808ebe4460ad1b0e8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/hi-IN/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/hi-IN/firefox-130.0.1.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "8219e7cbeece71af3c87ccc92bfac707d4e97041e3dc0360d816b47b2490b1cc"; + sha256 = "4d5a9358833bb5430ffa9125eb29f819dcd80b5db94581dd0f7796aae4805b77"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/hr/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/hr/firefox-130.0.1.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "b7245d5b926be172976d66815676bc44489f45797b3080966690c3eecfde22eb"; + sha256 = "0906822d059699694c82f9be210c76ff09747b1232f88a859fd88874249dbb84"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/hsb/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/hsb/firefox-130.0.1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "7e76beca927640092ae2bcd58b7fd6bd0174dc07dcd847335d40a7c5a831b99c"; + sha256 = "82668fd4e948974e994c3fb6fa5e0bb262b930618b32f2324e291a4c23e22fce"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/hu/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/hu/firefox-130.0.1.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "077fd0c025277e2fcf64a673e5ef32732f2c1d6c44ab1ffa02e7a542466b8807"; + sha256 = "43ce11b054450884c1ab7d281ba9e9b6a1dfe8f93420738d2bf944a782c57f3b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/hy-AM/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/hy-AM/firefox-130.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "ae478b9d6cb6cb028f5644d15a95c1b495699e9d1db31c9165f8787c40bdd2a6"; + sha256 = "65cbb814126e407e42dd1e58efb720e67736058c48def442874d489d39f7fc43"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/ia/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/ia/firefox-130.0.1.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "9b4fb99f9447ba2712edb296f35deaea72371406fa592a8937d14c8cca1c015e"; + sha256 = "66dd38b0c2aeb2f744b6e0b20f1ef75bfd5d38d9e83e79d4dca0f655c7c7e0d3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/id/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/id/firefox-130.0.1.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "849ae2d09de46a7f959af6b98d4de49aabfcc40fa8a672832f15509f8e0c0627"; + sha256 = "e8f0a1ade237e0f628d71b0534b39ed7966b3a9685dc4834707049b05797302d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/is/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/is/firefox-130.0.1.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "4ab5465ebf5d6eff987ce883146ee40ec8dfb45aebf7a8801cf938335776acf0"; + sha256 = "152cc67e5f05bd52800fff4e7bc1a692ac6d2903b27e8f17cdc2b4baad00e58d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/it/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/it/firefox-130.0.1.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "de70b14a007dbe09888a824f0e71ca3951f557a00a4b377f7ca4bd80558b22f1"; + sha256 = "66e34edc74c7c0cab26f079a2735ed735adfca5a31c3780bed623e3720de7344"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/ja/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/ja/firefox-130.0.1.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "c8ff213cc59f0bca39c89d0a8167db48603a86623e6204f288c613acc6aaf71f"; + sha256 = "9072a6a1fddf13ec09d4dad63b2ecffa60fc750d797d1c92b750ea10cac8885c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/ka/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/ka/firefox-130.0.1.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "f9d04949766ce80414059f7c8dbe0782c77b81e2b37b6ea8d906dce1a41be5b0"; + sha256 = "321bdd3e9bbc9d9fa3465d218ed6b93de0952e445323cb73b43cf8e4ae6bec7e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/kab/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/kab/firefox-130.0.1.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "f393d8df2412edce4713abcc0aab4d43b4d15e146f83956ee2c180757d0843e8"; + sha256 = "9f76066105d69dd0b1fb72183490f17d0c361206119f3d2033f750a55da8bbb4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/kk/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/kk/firefox-130.0.1.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "8805bb373f8325479976817ce50431e01371a1ec436d74194d6677d168539656"; + sha256 = "4b41c2a6c49932135e6f6cbe46a29bf8c6a368fa04ca3228acdbfbff3bfef5b0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/km/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/km/firefox-130.0.1.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "adf07e405ebe47f7f3d0033ac9660f28331a63b90fc5d909134be53f771e0a4a"; + sha256 = "bd795ce4f569350354321a9a8251808a8a534fafe9cc8b6a4c4de901f09e486e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/kn/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/kn/firefox-130.0.1.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "2950df4ec7f7aded583b696779313ea94fc0b718c3b10ec4f754adfc0f65471e"; + sha256 = "d6cd41901a18057ff0125b62e36a7dd11a239eee77d1ec2c3d6ed0bba07321a7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/ko/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/ko/firefox-130.0.1.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "6eedea929d7d73dce79c8f79632efce1e0591bd52948bbed468bc5240baef05d"; + sha256 = "09f995301bb315e4edcafd9b0522ff111092782ac623739447bc6e00d7ca643d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/lij/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/lij/firefox-130.0.1.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "f0f20a048c694f8bdeb70783476fc6f91b4f7d2881093cdc5d0f9f3a12d698e6"; + sha256 = "8b8e9e7437de5c92cfb26cd55161d638cfb9fef9928d861fa0ea75153f82ee8a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/lt/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/lt/firefox-130.0.1.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "6762ac48b93aaf619f3e1c16d1b2e5d75596b3c8fe4d374e563f44d377de4127"; + sha256 = "f1b0d85016e639a036a3de7dd6c30983e21748a0dc2f3954b8c1ca7929998834"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/lv/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/lv/firefox-130.0.1.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "5a3fd3b8afc54c4659194ca479b71bd19371e3fceda827c1d93e4f86f7b69156"; + sha256 = "61573d2c0bce3cdbd795be6c069d3776cbf150e69432a7eabb652c3439506bcc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/mk/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/mk/firefox-130.0.1.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "370271f309ab7512ddec0b20e4be5765c5ef664680ef98d89fb2e263ac304f73"; + sha256 = "5b4a34356f94e0225f082a86a8c64e47f9be921700c4e46f592f38cbad332fd3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/mr/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/mr/firefox-130.0.1.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "9d0b181157bce40bb76e34ba8c555b1aacdf86e286124a5fbfbfc678bc58cf66"; + sha256 = "2602ab762b3a97941ddde5f9adc0c2bd0ded08e8025af8f44af5798c8dbbc32c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/ms/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/ms/firefox-130.0.1.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "d9749603debebeaa7df69ad2826df95ed1fc9389fff53f1e362d33b1578e31da"; + sha256 = "604e05d8117cb6b431af1f5870d12c45fccd0226688786c2ae4c688968ba5209"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/my/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/my/firefox-130.0.1.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "4a2211461b601c37f3e8ca7babed6ac421cf49604146ed5bc5877cf60e0591bc"; + sha256 = "c71809a0adc7a018f57f535e13352401e0cf4dc1c637d2e04f72ca1bb269b7e9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/nb-NO/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/nb-NO/firefox-130.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "ae5261b7c1e1075af26077012291a90614c75c56e044e409a10d84c50e145c6c"; + sha256 = "c53ef7cb2bdfc336c26147a8dc838fc61d7f714065a09b3e7a3a0b5031ae41c8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/ne-NP/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/ne-NP/firefox-130.0.1.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "ccee7bffdf331b7d35f2f14c18c4652f41f52fdcdb8e5fe1b5650ce65469ddc2"; + sha256 = "a9a10a800753914f669730249a97735a6ab0cb32af4ac17cc1cb9344f4e8b1d3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/nl/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/nl/firefox-130.0.1.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "04fbe94b04a688d732235cd1dcef1f7e1087d3b85f04699153f80a4c44c8ad9d"; + sha256 = "32d604df57f8c71bca400121755b6c36e4f55363d5003da939b9080adcd36c9a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/nn-NO/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/nn-NO/firefox-130.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "59796010366cb0ef66a1a59bdb40383abdd8f921c60f6b998f38db8c86255dfc"; + sha256 = "ea821827c1ef5d96ddbfd4ff9f8fb3f8a10d9517089a3ac67b06301e48182b97"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/oc/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/oc/firefox-130.0.1.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "3356edba3d3a324d4dc331bc3bef240d5245fc9a91b6dadda84c365a86b3457f"; + sha256 = "05d40d35aac0120c3c4d18a77e2f5c8c0f17b5c88d064dcc46f505e948081ffe"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/pa-IN/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/pa-IN/firefox-130.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "d7bdc84b081f91aee7db9161904d7c6ff0a1a8897d419aac804eb9d3a753ec7e"; + sha256 = "d10a37d230077dc830f9663b4f7e588752023ab706a0ee1f3fa3393fdda30814"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/pl/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/pl/firefox-130.0.1.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "ee0c317681a149912381f8914acef222c643f47f35fd239ef495395622d2f605"; + sha256 = "4d9e4e3f2e3c32fd0e135513c2db3d4802f287b5623415298f1fd1833dec8da9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/pt-BR/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/pt-BR/firefox-130.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "18201b51d0f954713e5b2179dd3b934f46a0fb14d5b8decad4c9413814c33eeb"; + sha256 = "0660c82a6865ee612773ae3677d824abbef61d39c2e93d1912f8184b88600226"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/pt-PT/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/pt-PT/firefox-130.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "10281f85b6683b87a1a30cd4048929099ae7783755d15748a8fa71dfaa488760"; + sha256 = "48a947f2dd0027167d6559eb5fb622c2f41e3392b8fe0d15ec7991d525305c60"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/rm/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/rm/firefox-130.0.1.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "af7b78a46c9cd7320a240c78323c1e08c6619c280a4ba607647e357ae764ddb2"; + sha256 = "129ae6b2290e5660506d635367b9b85757ff82d1dbdd98f238fe62a5211cfea4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/ro/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/ro/firefox-130.0.1.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "dd1062119e93cdeedd2872165344146960ac7d84bba456edeaf1628bfa75beeb"; + sha256 = "0b63b7e559563fa71e33b0a2bb29658cdf08c143f4e46515835f315322b651fe"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/ru/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/ru/firefox-130.0.1.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "817b50cdec921e3b1f11726bb10ee3e1e53b40b748085fcdf589df76ba95ac5d"; + sha256 = "60084648b5ee8293a265aca9200dc991159cf1eec7519b39233c6637c5faa875"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/sat/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/sat/firefox-130.0.1.tar.bz2"; locale = "sat"; arch = "linux-i686"; - sha256 = "f09b47829fd36bd80f3c4d564a6a4b96d8f8db4a86ba96818d44f432908a96fc"; + sha256 = "e0ea6a503a6f38bad80d5892ebbad01c02e60c7f04c6d6987608b97929f9f2ce"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/sc/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/sc/firefox-130.0.1.tar.bz2"; locale = "sc"; arch = "linux-i686"; - sha256 = "6fd2c2c3ba7c28548de56c7cb29737635d16b7f1b8d8f45fd9a7e98bf5f244ba"; + sha256 = "611369cd0a9002955e330c7f32551a635d261f7840d6b4d3e88a41d6ec23dcbc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/sco/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/sco/firefox-130.0.1.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "02cc81f6abc80db0ce09c9010974193786f0199be95e64c6cf510c02934eada8"; + sha256 = "4d551a7386cf7d8a6899c763d0da5fa68f1ab1c032931ba4d9a5017bce9fc30b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/si/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/si/firefox-130.0.1.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "0c11a867e5aa9092d021b89543bfb0b73dce6253bd9dd3e9db57b924048ae81f"; + sha256 = "a8a33765d1a290d9eed09810c01cfde66ebc7692968d4706cf57e17ed2cd72a1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/sk/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/sk/firefox-130.0.1.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "b4352e3d8ae1782c0ed93118168626d17a7b259d9b6c52010240a651468208bc"; + sha256 = "73c7ccd0009fcbcc87e1e79e086627e36311b435deb160b9b40431e36d69bc97"; + } + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/skr/firefox-130.0.1.tar.bz2"; + locale = "skr"; + arch = "linux-i686"; + sha256 = "3a2e8976f2e5348de81c665be464f157f1aacec041d021c1cc29bada8bb1fe22"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/sl/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/sl/firefox-130.0.1.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "b77650ba96f576b2cf3de2477915cf3b5806a75950fc3e5f65265eaf06c6326f"; + sha256 = "acdfe713b01e5af442a5b8658df9063417f653ae21580f9f3bf8f0aacb132fd0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/son/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/son/firefox-130.0.1.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "5f5c0ec8e746094845fe3fec3577003ca20670a4e0b3fc66cf6b4df81d8b3b21"; + sha256 = "519273f28d0dd0fe46d3e36b9d06ce6b219cab04018eb269859f80af3c279eed"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/sq/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/sq/firefox-130.0.1.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "cada2c2e6a9b3c7f1042030443bc89ba50a2ca11b20bd2f11ba51c360aa97dc8"; + sha256 = "6916949ea0ced4e08c063de8d804ab890874916581afc9dd18c901dab5ad7f49"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/sr/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/sr/firefox-130.0.1.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "fe0d9aa1bcb3533eec8d5b1bf16da65077a5878cdcb9e305436622ee7bf7314b"; + sha256 = "4c9fcb4cc4ddf153ec41090dd1280588aa81b5e505309a7f48336dea2cdcabb2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/sv-SE/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/sv-SE/firefox-130.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "b485b5d2c7ea7a6447457062defe528aa3ebe719c58449e16e96f7f1d1a08727"; + sha256 = "d20452377ecc4b078b491575d3ce7f82f8446796c82578bc27ead17f40f91827"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/szl/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/szl/firefox-130.0.1.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "eeae99cd1f2f4f34c90e384697a3853d10c09343d2325f97fd71534a9e0abb70"; + sha256 = "3e8388925bf93e085474234479d38151931ffdd4787222cb9406829d9e1fc8ed"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/ta/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/ta/firefox-130.0.1.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "b094294592daeeb1f44aed69ce3c3f1eb30bee87448c18f6c7b40d56bf0f817e"; + sha256 = "d98b8576826b389cb0166410414514dc1260bb0b8a65ceb29a820ab5e24834c6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/te/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/te/firefox-130.0.1.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "8900d8ea91871843d5b2af4ec6ce375ef7929e7922cc33dea1c18454f9aa461e"; + sha256 = "27749770e7f973370d78a624f7b80c66954370d5bf72d4e2c9396f155e638912"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/tg/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/tg/firefox-130.0.1.tar.bz2"; locale = "tg"; arch = "linux-i686"; - sha256 = "6e5c773d4153dc4a712fed7ef36b174caef3ff3f11a387da55455b19aa42c85e"; + sha256 = "61a57d7cb6955d17ffe1d15f28c371f0d90721da6fa5876846ef305198e89263"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/th/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/th/firefox-130.0.1.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "c6df131d396ddd81b200720eaf2033f5555089762e9307388c0796ca1904cdc7"; + sha256 = "b29e95954704765ffc8097b66f83179eaf0356c4f514096d95023784325d35f9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/tl/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/tl/firefox-130.0.1.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "c48c82424d10ffd93fc39f30b6c286931f5c892fd24fec1b988e7255c2d61192"; + sha256 = "82134cc55cf7afd00046729ef8d158fe0a5450d4203be1be5c15252af3429c1c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/tr/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/tr/firefox-130.0.1.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "b1d43c2921a0bc9771e3a202d14b2d6cfef6d3a0617d72a2dc866c4d08c9cc07"; + sha256 = "358a4b57160935a8d99e026244a227834229b035e4b31938a7c697fb6350dd25"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/trs/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/trs/firefox-130.0.1.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "9b93f3bae0d3288c46a69adaf24c028e69c819e81f402b3cb3cd119297bcec88"; + sha256 = "76fe09a6f13bbd779682e1ed9bc1e44076b9e23f4f026141f2ef932bda7543a2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/uk/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/uk/firefox-130.0.1.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "2f535154137303050fc6d1f29d61e28d7156c0b41d1feb0b3df3cb4e0ff66cbb"; + sha256 = "402abc1e0cc54bbde912875624c93c20c660823b066812f03281a39dc4eb8669"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/ur/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/ur/firefox-130.0.1.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "2607a196623e8b58e74930bb5f4cd188d105957441078e32a8273d6edc872a19"; + sha256 = "59ba12c8b1bae5df3ada83d8535ac25f6da52402d21467f97e8b86bef1a7f458"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/uz/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/uz/firefox-130.0.1.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "a1ee778cd7fc6ed36888252279cd33ef354a9dad725e35a5929ca1a6d457c2e2"; + sha256 = "a8c3b35933cd0b2db711b9f5ad62e8248a2bda0ba497eabe5ab0dd39b65ba8cb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/vi/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/vi/firefox-130.0.1.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "4e587db961e4269a5de47e81603effab87dc5adecfb2b61cb442c520e066d068"; + sha256 = "0984d91b1d36b1552f4bab543369071f44f3292092fd006f7a13c82bf5bfc794"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/xh/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/xh/firefox-130.0.1.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "5c550ba6a8b7e9b518f3e538d6e9d87cbde3799fd1e8d1d4bcc293f740a9b422"; + sha256 = "f5995cef5deb634f88c42701253d2b52abf8e632890d9d67a7f9d2420ac63bc1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/zh-CN/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/zh-CN/firefox-130.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "30fabea5d68f18b4818bdd5ae2290f4630d95218fbbf34e1799f321e35f978f4"; + sha256 = "8e3738c05dd2e06709f6334aca98168e4a4c90a39c510079f375916f87f7a908"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/127.0.2/linux-i686/zh-TW/firefox-127.0.2.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/130.0.1/linux-i686/zh-TW/firefox-130.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "77d96850c2cc6fa3ceff3d8b8c01d06969c2b71df4cf3b417e7e5519db78b40b"; + sha256 = "8aabcb427fcb82cb5301e2c699f701a0fe64f3deb8c7bdd5f556a72b78a26c59"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/update.nix b/pkgs/applications/networking/browsers/firefox-bin/update.nix index bdef9b125d071..0e1c6241aae41 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/update.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/update.nix @@ -12,6 +12,7 @@ , baseName ? "firefox" , basePath ? "pkgs/applications/networking/browsers/firefox-bin" , baseUrl +, versionSuffix ? "" }: let @@ -27,7 +28,7 @@ in writeScript "update-${pname}" '' HOME=`mktemp -d` export GNUPGHOME=`mktemp -d` - gpg --receive-keys ADD7079479700DCADFDD5337E36D3B13F3D93274 + curl https://keys.openpgp.org/vks/v1/by-fingerprint/14F26682D0916CDD81E37B6D61B7B526D98F0353 | gpg --import - tmpfile=`mktemp` url=${baseUrl} @@ -47,7 +48,7 @@ in writeScript "update-${pname}" '' grep "^[0-9]" | \ sort --version-sort | \ grep -v "funnelcake" | \ - grep -e "${lib.optionalString isBeta "b"}\([[:digit:]]\|[[:digit:]][[:digit:]]\)$" | ${lib.optionalString (!isBeta) "grep -v \"b\" |"} \ + grep -e "${lib.optionalString isBeta "b"}\([[:digit:]]\|[[:digit:]][[:digit:]]\)${versionSuffix}$" | ${lib.optionalString (!isBeta) "grep -v \"b\" |"} \ tail -1` curl --silent -o $HOME/shasums "$url$version/SHA256SUMS" diff --git a/pkgs/applications/networking/browsers/firefox/122.0-libvpx-mozbz1875201.patch b/pkgs/applications/networking/browsers/firefox/122.0-libvpx-mozbz1875201.patch deleted file mode 100644 index 4acf0fa6a7fce..0000000000000 --- a/pkgs/applications/networking/browsers/firefox/122.0-libvpx-mozbz1875201.patch +++ /dev/null @@ -1,80 +0,0 @@ -This patch is a rebase of https://bugzilla.mozilla.org/attachment.cgi?id=9377318 -on top of Firefox 122.0. - -Fixes: https://bugzilla.mozilla.org/show_bug.cgi?id=1875201 - -diff --git a/third_party/libwebrtc/modules/video_coding/webrtc_libvpx_interface_gn/moz.build b/third_party/libwebrtc/modules/video_coding/webrtc_libvpx_interface_gn/moz.build -index c5dabce8b0..e325905282 100644 ---- a/third_party/libwebrtc/modules/video_coding/webrtc_libvpx_interface_gn/moz.build -+++ b/third_party/libwebrtc/modules/video_coding/webrtc_libvpx_interface_gn/moz.build -@@ -5,6 +5,8 @@ - - ### This moz.build was AUTOMATICALLY GENERATED from a GN config, ### - ### DO NOT edit it by hand. ### -+if not CONFIG["MOZ_SYSTEM_LIBVPX"]: -+ LOCAL_INCLUDES += [ "/media/libvpx/libvpx/" ] - - COMPILE_FLAGS["OS_INCLUDES"] = [] - AllowCompilerWarnings() -@@ -25,7 +27,6 @@ LOCAL_INCLUDES += [ - "!/ipc/ipdl/_ipdlheaders", - "!/third_party/libwebrtc/gen", - "/ipc/chromium/src", -- "/media/libvpx/libvpx/", - "/third_party/libwebrtc/", - "/third_party/libwebrtc/third_party/abseil-cpp/", - "/tools/profiler/public" -diff --git a/third_party/libwebrtc/modules/video_coding/webrtc_vp8_gn/moz.build b/third_party/libwebrtc/modules/video_coding/webrtc_vp8_gn/moz.build -index 77a6b3870b..d515bc0595 100644 ---- a/third_party/libwebrtc/modules/video_coding/webrtc_vp8_gn/moz.build -+++ b/third_party/libwebrtc/modules/video_coding/webrtc_vp8_gn/moz.build -@@ -5,6 +5,8 @@ - - ### This moz.build was AUTOMATICALLY GENERATED from a GN config, ### - ### DO NOT edit it by hand. ### -+if not CONFIG["MOZ_SYSTEM_LIBVPX"]: -+ LOCAL_INCLUDES += [ "/media/libvpx/libvpx/" ] - - COMPILE_FLAGS["OS_INCLUDES"] = [] - AllowCompilerWarnings() -@@ -25,7 +27,6 @@ LOCAL_INCLUDES += [ - "!/ipc/ipdl/_ipdlheaders", - "!/third_party/libwebrtc/gen", - "/ipc/chromium/src", -- "/media/libvpx/libvpx/", - "/media/libyuv/", - "/media/libyuv/libyuv/include/", - "/third_party/libwebrtc/", -diff --git a/third_party/libwebrtc/modules/video_coding/webrtc_vp9_gn/moz.build b/third_party/libwebrtc/modules/video_coding/webrtc_vp9_gn/moz.build -index 4bece72807..5cc8d30e1a 100644 ---- a/third_party/libwebrtc/modules/video_coding/webrtc_vp9_gn/moz.build -+++ b/third_party/libwebrtc/modules/video_coding/webrtc_vp9_gn/moz.build -@@ -5,6 +5,8 @@ - - ### This moz.build was AUTOMATICALLY GENERATED from a GN config, ### - ### DO NOT edit it by hand. ### -+if not CONFIG["MOZ_SYSTEM_LIBVPX"]: -+ LOCAL_INCLUDES += [ "/media/libvpx/libvpx/" ] - - COMPILE_FLAGS["OS_INCLUDES"] = [] - AllowCompilerWarnings() -@@ -25,7 +27,6 @@ LOCAL_INCLUDES += [ - "!/ipc/ipdl/_ipdlheaders", - "!/third_party/libwebrtc/gen", - "/ipc/chromium/src", -- "/media/libvpx/libvpx/", - "/media/libyuv/", - "/media/libyuv/libyuv/include/", - "/third_party/libwebrtc/", -diff --git a/third_party/libwebrtc/moz.build b/third_party/libwebrtc/moz.build -index 7baea55b7e..86d4f0f288 100644 ---- a/third_party/libwebrtc/moz.build -+++ b/third_party/libwebrtc/moz.build -@@ -436,7 +436,6 @@ DIRS += [ - "/third_party/libwebrtc/third_party/abseil-cpp/absl/types/span_gn", - "/third_party/libwebrtc/third_party/abseil-cpp/absl/types/variant_gn", - "/third_party/libwebrtc/third_party/abseil-cpp/absl/utility/utility_gn", -- "/third_party/libwebrtc/third_party/libvpx/libvpx_gn", - "/third_party/libwebrtc/third_party/libyuv/libyuv_gn", - "/third_party/libwebrtc/third_party/pffft/pffft_gn", - "/third_party/libwebrtc/third_party/rnnoise/rnn_vad_gn", diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 81ab6cd1fa17e..77e020ff0cea6 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -62,8 +62,8 @@ in , glib , gnum4 , gtk3 -, icu , icu72 +, icu73 , libGL , libGLU , libevent @@ -94,20 +94,20 @@ in , debugBuild ? false # On 32bit platforms, we disable adding "-g" for easier linking. -, enableDebugSymbols ? !stdenv.is32bit +, enableDebugSymbols ? !stdenv.hostPlatform.is32bit ## optional libraries -, alsaSupport ? stdenv.isLinux, alsa-lib +, alsaSupport ? stdenv.hostPlatform.isLinux, alsa-lib , ffmpegSupport ? true , gssSupport ? true, libkrb5 -, jackSupport ? stdenv.isLinux, libjack2 +, jackSupport ? stdenv.hostPlatform.isLinux, libjack2 , jemallocSupport ? !stdenv.hostPlatform.isMusl, jemalloc -, ltoSupport ? (stdenv.isLinux && stdenv.is64bit && !stdenv.hostPlatform.isRiscV), overrideCC, buildPackages -, pgoSupport ? (stdenv.isLinux && stdenv.hostPlatform == stdenv.buildPlatform), xvfb-run +, ltoSupport ? (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.is64bit && !stdenv.hostPlatform.isRiscV), overrideCC, buildPackages +, pgoSupport ? (stdenv.hostPlatform.isLinux && stdenv.hostPlatform == stdenv.buildPlatform), xvfb-run , pipewireSupport ? waylandSupport && webrtcSupport -, pulseaudioSupport ? stdenv.isLinux, libpulseaudio -, sndioSupport ? stdenv.isLinux, sndio +, pulseaudioSupport ? stdenv.hostPlatform.isLinux, libpulseaudio +, sndioSupport ? stdenv.hostPlatform.isLinux, sndio , waylandSupport ? true, libxkbcommon, libdrm ## privacy-related options @@ -234,32 +234,18 @@ buildStdenv.mkDerivation { "profilingPhase" ]; - patches = lib.optionals (lib.versionAtLeast version "120" && lib.versionOlder version "122") [ - # dbus cflags regression fix - # https://bugzilla.mozilla.org/show_bug.cgi?id=1864083 + patches = lib.optionals (lib.versionAtLeast version "111") [ ./env_var_for_system_dir-ff111.patch ] + ++ lib.optionals (lib.versionAtLeast version "96" && lib.versionOlder version "121") [ ./no-buildconfig-ffx96.patch ] + ++ lib.optionals (lib.versionAtLeast version "121") [ ./no-buildconfig-ffx121.patch ] + ++ lib.optionals (lib.versionOlder version "128.2" || (lib.versionAtLeast version "129" && lib.versionOlder version "130")) [ (fetchpatch { - url = "https://hg.mozilla.org/mozilla-central/raw-rev/f1f5f98290b3"; - hash = "sha256-5PzVNJvPNX8irCqj1H38SFDydNJZuBHx167e1TQehaI="; + # https://bugzilla.mozilla.org/show_bug.cgi?id=1912663 + name = "cbindgen-0.27.0-compat.patch"; + url = "https://hg.mozilla.org/integration/autoland/raw-rev/98cd34c7ff57"; + hash = "sha256-MqgWHgbDedVzDOqY2/fvCCp+bGwFBHqmaJLi/mllZug="; }) ] - ++ lib.optional (lib.versionAtLeast version "111") ./env_var_for_system_dir-ff111.patch - ++ lib.optional (lib.versionAtLeast version "96" && lib.versionOlder version "121") ./no-buildconfig-ffx96.patch - ++ lib.optional (lib.versionAtLeast version "121") ./no-buildconfig-ffx121.patch - ++ lib.optionals (lib.versionAtLeast version "120" && lib.versionOlder version "120.0.1") [ - (fetchpatch { - # Do not crash on systems without an expected statically assumed page size. - # https://phabricator.services.mozilla.com/D194458 - name = "mozbz1866025.patch"; - url = "https://hg.mozilla.org/mozilla-central/raw-rev/42c80086da4468f407648f2f57a7222aab2e9951"; - hash = "sha256-cWOyvjIPUU1tavPRqg61xJ53XE4EJTdsFzadfVxyTyM="; - }) - ] - ++ lib.optionals (lib.versionOlder version "122") [ - ./bindgen-0.64-clang-18.patch - ] - ++ lib.optionals (lib.versionAtLeast version "122" && lib.versionOlder version "123") [ - ./122.0-libvpx-mozbz1875201.patch - ] + ++ lib.optionals (lib.versionOlder version "122") [ ./bindgen-0.64-clang-18.patch ] ++ lib.optionals (lib.versionOlder version "123") [ (fetchpatch { name = "clang-18.patch"; @@ -267,9 +253,6 @@ buildStdenv.mkDerivation { hash = "sha256-2IpdSyye3VT4VB95WurnyRFtdN1lfVtYpgEiUVhfNjw="; }) ] - ++ lib.optionals (lib.versionOlder version "115.12") [ - ./rust-1.78.patch - ] ++ extraPatches; postPatch = '' @@ -380,7 +363,7 @@ buildStdenv.mkDerivation { # please get your own set of keys at https://location.services.mozilla.com/api. echo "dfd7836c-d458-4917-98bb-421c82d3c8a0" > $TMPDIR/mls-api-key configureFlagsArray+=("--with-mozilla-api-keyfile=$TMPDIR/mls-api-key") - '' + lib.optionalString (enableOfficialBranding && !stdenv.is32bit) '' + '' + lib.optionalString (enableOfficialBranding && !stdenv.hostPlatform.is32bit) '' export MOZILLA_OFFICIAL=1 '' + lib.optionalString (!requireSigning) '' export MOZ_REQUIRE_SIGNING= @@ -423,7 +406,7 @@ buildStdenv.mkDerivation { ] # elf-hack is broken when using clang+lld: # https://bugzilla.mozilla.org/show_bug.cgi?id=1482204 - ++ lib.optional (ltoSupport && (buildStdenv.isAarch32 || buildStdenv.isi686 || buildStdenv.isx86_64)) "--disable-elf-hack" + ++ lib.optional (ltoSupport && (buildStdenv.hostPlatform.isAarch32 || buildStdenv.hostPlatform.isi686 || buildStdenv.hostPlatform.isx86_64)) "--disable-elf-hack" ++ lib.optional (!drmSupport) "--disable-eme" ++ lib.optional (allowAddonSideload) "--allow-addon-sideload" ++ [ @@ -441,7 +424,7 @@ buildStdenv.mkDerivation { (if debugBuild then "--enable-profiling" else "--enable-optimize") # --enable-release adds -ffunction-sections & LTO that require a big amount # of RAM, and the 32-bit memory space cannot handle that linking - (enableFeature (!debugBuild && !stdenv.is32bit) "release") + (enableFeature (!debugBuild && !stdenv.hostPlatform.is32bit) "release") (enableFeature enableDebugSymbols "debug-symbols") ] ++ lib.optionals enableDebugSymbols [ "--disable-strip" "--disable-install-strip" ] @@ -487,7 +470,9 @@ buildStdenv.mkDerivation { ] # icu73 changed how it follows symlinks which breaks in the firefox sandbox # https://bugzilla.mozilla.org/show_bug.cgi?id=1839287 - ++ [ (if (lib.versionAtLeast version "115") then icu else icu72) ] + # icu74 fails to build on 127 and older + # https://bugzilla.mozilla.org/show_bug.cgi?id=1862601 + ++ [ (if (lib.versionAtLeast version "115") then icu73 else icu72) ] ++ [ (if (lib.versionAtLeast version "116") then nss_latest else nss_esr/*3.90*/) ] ++ lib.optional alsaSupport alsa-lib ++ lib.optional jackSupport libjack2 @@ -555,7 +540,7 @@ buildStdenv.mkDerivation { install -Dvm644 ${distributionIni} $out/lib/${binaryName}/distribution/distribution.ini install -Dvm644 ${defaultPrefsFile} $out/lib/${binaryName}/browser/defaults/preferences/nixos-default-prefs.js - '' + lib.optionalString buildStdenv.isLinux '' + '' + lib.optionalString buildStdenv.hostPlatform.isLinux '' # Remove SDK cruft. FIXME: move to a separate output? rm -rf $out/share/idl $out/include $out/lib/${binaryName}-devel-* diff --git a/pkgs/applications/networking/browsers/firefox/mobile-config.nix b/pkgs/applications/networking/browsers/firefox/mobile-config.nix index 6e43295697ea3..7d97a2e97d684 100644 --- a/pkgs/applications/networking/browsers/firefox/mobile-config.nix +++ b/pkgs/applications/networking/browsers/firefox/mobile-config.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, runCommand, fetchFromGitLab, wrapFirefox, firefox-unwrapped }: +{ runCommand, fetchFromGitLab, wrapFirefox, firefox-unwrapped }: let pkg = fetchFromGitLab { diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 1207a7f02404e..ba7bf76eae0e0 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -1,12 +1,14 @@ -{ stdenv, lib, callPackage, fetchurl, fetchpatch, nixosTests, buildMozillaMach }: +{ stdenv, lib, callPackage, fetchurl, fetchpatch, nixosTests, buildMozillaMach +, python311 +}: { firefox = buildMozillaMach rec { pname = "firefox"; - version = "127.0.2"; + version = "130.0.1"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "d5a959a032309b8a42690b7f5afd5110c2e6ca7de426e1529d50f59cf065e67623ed98bf3aab39ce4d345ccfad2a273b24ce4f87c7ba7e6eccf2e9dfe3008d8b"; + sha512 = "163d1ce9f671a4716686955c43ff23d9f200f6c52dfdabcbb93af6a326c24aa5096404f42447b02b5a3ad02e2f60d17271783638fe027d24865aebb3e70e97fe"; }; extraPatches = [ @@ -33,11 +35,11 @@ firefox-beta = buildMozillaMach rec { pname = "firefox-beta"; - version = "128.0b3"; + version = "131.0b9"; applicationName = "Mozilla Firefox Beta"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "d2519052244dd6d5cad39afcf78e86b17e5f1520f3f182db123997f8d126b048cd6862e92558c8f112224c951f706ccf1ccb2cb19b5221d4a47bc7154f562ab2"; + sha512 = "043f983a295fa27d3641f6db231da2e3a88d43609f9c1f4fbd0d98356ab902e802b20a81ae8bbf3812d8ae6776fd6ea557f19cc083f09aae42b8cd98424430dc"; }; meta = { @@ -62,13 +64,13 @@ firefox-devedition = buildMozillaMach rec { pname = "firefox-devedition"; - version = "128.0b3"; + version = "131.0b9"; applicationName = "Mozilla Firefox Developer Edition"; requireSigning = false; branding = "browser/branding/aurora"; src = fetchurl { url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "b1313d35218adac5b81059f605b788188454f064c3192a6bb91a7c7b361fb2e087ac49177c48f23de517551b563489adfc7486bc4e6b95e5ae4aeac49aa5ac97"; + sha512 = "f1f56bd121ecdf1f659ce85ea77a9b1abe983583081f6cadaaf4c57695148b481eed1ecfa7ac2d3449fbc1a0c8560a8a5665e309722a5fc5455df740cf639989"; }; meta = { @@ -92,13 +94,42 @@ }; }; - firefox-esr-115 = buildMozillaMach rec { + firefox-esr-128 = buildMozillaMach rec { + pname = "firefox"; + version = "128.2.0esr"; + src = fetchurl { + url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; + sha512 = "9a689929f6f86d795ea2c0318bb78f77f72a552f40715a1108dbd6361b0dedc3aaf049f1883424012459899607067d5a8374d895564591ec6679a1ce80708d7d"; + }; + + meta = { + changelog = "https://www.mozilla.org/en-US/firefox/${lib.removeSuffix "esr" version}/releasenotes/"; + description = "Web browser built from Firefox source tree"; + homepage = "http://www.mozilla.com/en-US/firefox/"; + maintainers = with lib.maintainers; [ hexa ]; + platforms = lib.platforms.unix; + badPlatforms = lib.platforms.darwin; + broken = stdenv.buildPlatform.is32bit; # since Firefox 60, build on 32-bit platforms fails with "out of memory". + # not in `badPlatforms` because cross-compilation on 64-bit machine might work. + maxSilent = 14400; # 4h, double the default of 7200s (c.f. #129212, #129115) + license = lib.licenses.mpl20; + mainProgram = "firefox"; + }; + tests = [ nixosTests.firefox-esr-128 ]; + updateScript = callPackage ./update.nix { + attrPath = "firefox-esr-128-unwrapped"; + versionPrefix = "128"; + versionSuffix = "esr"; + }; + }; + + firefox-esr-115 = (buildMozillaMach rec { pname = "firefox-esr-115"; - version = "115.12.0esr"; + version = "115.15.0esr"; applicationName = "Mozilla Firefox ESR"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "d98475061d870e0f3aa920b7c0b9b0c1cbdb3f4102f760f1d1c5ea3e45e216c673c8d3662501e7e78af4950a003a519e94b57e9b1eda8d615c159cdf62130e89"; + sha512 = "0df4c498c99cce08903004d2e0f9e977a19f7de86240aa82dba179b60f1d67ca3021eb474f56bddc38035e773eeb5d99bb3e1b0756d9f7583dc8e1f747f477ba"; }; meta = { @@ -119,5 +150,6 @@ versionPrefix = "115"; versionSuffix = "esr"; }; - }; + }) + .override { python3 = python311; }; } diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 15c8ffc3b22d6..6a34a531c7f12 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 @@ -17,7 +17,7 @@ , pciutils , sndio , libjack2 -, speechd +, speechd-minimal , removeReferencesTo }: @@ -86,7 +86,7 @@ let else []) ); - libs = lib.optionals stdenv.isLinux [ udev libva mesa libnotify xorg.libXScrnSaver cups pciutils ] + libs = lib.optionals stdenv.hostPlatform.isLinux [ udev libva mesa libnotify xorg.libXScrnSaver cups pciutils ] ++ lib.optional pipewireSupport pipewire ++ lib.optional ffmpegSupport ffmpeg ++ lib.optional gssSupport libkrb5 @@ -98,7 +98,7 @@ let ++ lib.optional sndioSupport sndio ++ lib.optional jackSupport libjack2 ++ lib.optional smartcardSupport opensc - ++ lib.optional (cfg.speechSynthesisSupport or true) speechd + ++ lib.optional (cfg.speechSynthesisSupport or true) speechd-minimal ++ pkcs11Modules ++ gtk_modules; gtk_modules = [ libcanberra-gtk3 ]; @@ -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[@]}" ############################# @@ -421,7 +421,7 @@ let inherit (browser.meta) description; mainProgram = launcherName; hydraPlatforms = []; - priority = (browser.meta.priority or 0) - 1; # prefer wrapper over the package + priority = (browser.meta.priority or lib.meta.defaultPriority) - 1; # prefer wrapper over the package }; }; in lib.makeOverridable wrapper diff --git a/pkgs/applications/networking/browsers/floorp/default.nix b/pkgs/applications/networking/browsers/floorp/default.nix index ff36607709bc3..eef6c3a2abfc8 100644 --- a/pkgs/applications/networking/browsers/floorp/default.nix +++ b/pkgs/applications/networking/browsers/floorp/default.nix @@ -1,67 +1,84 @@ -{ stdenv -, lib -, fetchFromGitHub -, buildMozillaMach -, nixosTests +{ + stdenv, + lib, + fetchFromGitHub, + buildMozillaMach, + nixosTests, }: -((buildMozillaMach rec { - pname = "floorp"; - packageVersion = "11.14.1"; - applicationName = "Floorp"; - binaryName = "floorp"; - branding = "browser/branding/official"; - requireSigning = false; - allowAddonSideload = true; +( + (buildMozillaMach rec { + pname = "floorp"; + packageVersion = "11.18.1"; + applicationName = "Floorp"; + binaryName = "floorp"; + branding = "browser/branding/official"; + requireSigning = false; + allowAddonSideload = true; - # Must match the contents of `browser/config/version.txt` in the source tree - version = "115.13.0"; + # Must match the contents of `browser/config/version.txt` in the source tree + version = "128.3.0"; - src = fetchFromGitHub { - owner = "Floorp-Projects"; - repo = "Floorp"; - fetchSubmodules = true; - rev = "v${packageVersion}"; - hash = "sha256-PhI+hIypPF6W5RJIXhCAXblSJNwgYavfCgdQozDSXG0="; - }; + src = fetchFromGitHub { + owner = "Floorp-Projects"; + repo = "Floorp"; + fetchSubmodules = true; + rev = "v${packageVersion}"; + hash = "sha256-w7b3s8/ekDzGbjbdqK/9W9S5e79fbE9ftJkSsz2sQtA="; + }; - extraConfigureFlags = [ - "--with-app-name=${pname}" - "--with-app-basename=${applicationName}" - "--with-unsigned-addon-scopes=app,system" - ]; + extraConfigureFlags = [ + "--with-app-name=${pname}" + "--with-app-basename=${applicationName}" + "--with-unsigned-addon-scopes=app,system" + "--enable-proxy-bypass-protection" + ]; - extraPostPatch = '' - # Fix .desktop files for PWAs generated by Floorp; they hardcode /usr/bin - # https://github.com/NixOS/nixpkgs/issues/314115 - substituteInPlace floorp/browser/base/content/modules/ssb/LinuxSupport.mjs \ - --replace-fail /usr/bin/floorp floorp - ''; + extraPostPatch = '' + # Fix .desktop files for PWAs generated by Floorp + # The executable path returned by Services.dirsvc.get() is absolute and + # thus is the full /nix/store/[..] path. To avoid breaking PWAs with each + # update, rely on `floorp` being in $PATH, as before. + substituteInPlace floorp/browser/base/content/modules/ssb/LinuxSupport.mjs \ + --replace-fail 'Services.dirsvc.get("XREExeF",Ci.nsIFile).path' '"floorp"' + ''; - updateScript = ./update.sh; + updateScript = ./update.sh; - meta = { - description = "Fork of Firefox, focused on keeping the Open, Private and Sustainable Web alive, built in Japan"; - homepage = "https://floorp.app/"; - maintainers = with lib.maintainers; [ christoph-heiss ]; - platforms = lib.platforms.unix; - badPlatforms = lib.platforms.darwin; - broken = stdenv.buildPlatform.is32bit; # since Firefox 60, build on 32-bit platforms fails with "out of memory". - # not in `badPlatforms` because cross-compilation on 64-bit machine might work. - maxSilent = 14400; # 4h, double the default of 7200s (c.f. #129212, #129115) - license = lib.licenses.mpl20; - mainProgram = "floorp"; - }; - tests = [ nixosTests.floorp ]; -}).override { - # Upstream build configuration can be found at - # .github/workflows/src/linux/shared/mozconfig_linux_base - privacySupport = true; - webrtcSupport = true; - enableOfficialBranding = false; - googleAPISupport = true; - mlsAPISupport = true; -}).overrideAttrs (prev: { - MOZ_DATA_REPORTING = ""; - MOZ_TELEMETRY_REPORTING = ""; -}) + meta = { + description = "Fork of Firefox, focused on keeping the Open, Private and Sustainable Web alive, built in Japan"; + homepage = "https://floorp.app/"; + maintainers = with lib.maintainers; [ christoph-heiss ]; + platforms = lib.platforms.unix; + badPlatforms = lib.platforms.darwin; + broken = stdenv.buildPlatform.is32bit; + # since Firefox 60, build on 32-bit platforms fails with "out of memory". + # not in `badPlatforms` because cross-compilation on 64-bit machine might work. + maxSilent = 14400; # 4h, double the default of 7200s (c.f. #129212, #129115) + license = lib.licenses.mpl20; + mainProgram = "floorp"; + }; + tests = [ nixosTests.floorp ]; + }).override + { + # Upstream build configuration can be found at + # .github/workflows/src/linux/shared/mozconfig_linux_base + privacySupport = true; + webrtcSupport = true; + enableOfficialBranding = false; + googleAPISupport = true; + mlsAPISupport = true; + } +).overrideAttrs + (prev: { + MOZ_DATA_REPORTING = ""; + MOZ_TELEMETRY_REPORTING = ""; + + # Upstream already includes some of the bugfix patches that are applied by + # `buildMozillaMach`. Pick out only the relevant ones for Floorp and override + # the list here. + patches = [ + ../firefox/env_var_for_system_dir-ff111.patch + ../firefox/no-buildconfig-ffx121.patch + ]; + }) diff --git a/pkgs/applications/networking/browsers/kristall/default.nix b/pkgs/applications/networking/browsers/kristall/default.nix index 3515f0e30e01d..f228c97306840 100644 --- a/pkgs/applications/networking/browsers/kristall/default.nix +++ b/pkgs/applications/networking/browsers/kristall/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { qmakeFlags = [ "src/kristall.pro" ]; - installPhase = if stdenv.isDarwin then '' + installPhase = if stdenv.hostPlatform.isDarwin then '' mkdir -p $out/Applications mv kristall.app $out/Applications '' else '' diff --git a/pkgs/applications/networking/browsers/ladybird/default.nix b/pkgs/applications/networking/browsers/ladybird/default.nix index 85d85ba2476b1..60157ca262826 100644 --- a/pkgs/applications/networking/browsers/ladybird/default.nix +++ b/pkgs/applications/networking/browsers/ladybird/default.nix @@ -7,12 +7,20 @@ , tzdata , unicode-emoji , unicode-character-database -, darwin , cmake , ninja +, pkg-config +, curl +, libavif +, libjxl +, libwebp , libxcrypt , python3 , qt6Packages +, woff2 +, ffmpeg +, simdutf +, skia , nixosTests , AppKit , Cocoa @@ -50,19 +58,15 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "ladybird"; - version = "0-unstable-2024-06-04"; + version = "0-unstable-2024-09-21"; src = fetchFromGitHub { owner = "LadybirdWebBrowser"; repo = "ladybird"; - rev = "c6e9f0e7b5b050ddbb5d735ca9c65458add9b4a5"; - hash = "sha256-+NDrd0kO9bqXFcCEJFmNwNu5jmf+wT+uUVlmbmCYLw4="; + rev = "44f672bacf6779f6bbe5972d84e210f953f14598"; + hash = "sha256-Qku6W1kETOXQh8Kxn0wabe0Xc4gkpxrGbDFwIik34eY="; }; - patches = [ - ./nixos-font-path.patch - ]; - postPatch = '' sed -i '/iconutil/d' Ladybird/CMakeLists.txt @@ -70,6 +74,18 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace Meta/CMake/lagom_install_options.cmake \ --replace-fail "\''${CMAKE_INSTALL_BINDIR}" "bin" \ --replace-fail "\''${CMAKE_INSTALL_LIBDIR}" "lib" + + # libwebp is not built with cmake support yet + # https://github.com/NixOS/nixpkgs/issues/334148 + cat > Meta/CMake/FindWebP.cmake <<'EOF' + find_package(PkgConfig) + pkg_check_modules(WEBP libwebp REQUIRED) + include_directories(''${WEBP_INCLUDE_DIRS}) + link_directories(''${WEBP_LIBRARY_DIRS}) + EOF + substituteInPlace Userland/Libraries/LibGfx/CMakeLists.txt \ + --replace-fail 'WebP::' "" \ + --replace-fail libwebpmux webpmux ''; preConfigure = '' @@ -78,8 +94,8 @@ stdenv.mkDerivation (finalAttrs: { # expected version in the package's CMake. # Check that the versions match - grep -F 'set(CLDR_VERSION "${cldr_version}")' Meta/CMake/locale_data.cmake || (echo cldr_version mismatch && exit 1) - grep -F 'set(TZDB_VERSION "${tzdata.version}")' Meta/CMake/time_zone_data.cmake || (echo tzdata.version mismatch && exit 1) + grep -F 'locale_version = "${cldr_version}"' Meta/gn/secondary/Userland/Libraries/LibLocale/BUILD.gn || (echo cldr_version mismatch && exit 1) + grep -F 'tzdb_version = "${tzdata.version}"' Meta/gn/secondary/Userland/Libraries/LibTimeZone/BUILD.gn || (echo tzdata.version mismatch && exit 1) grep -F 'set(CACERT_VERSION "${cacert_version}")' Meta/CMake/ca_certificates_data.cmake || (echo cacert_version mismatch && exit 1) mkdir -p build/Caches @@ -112,15 +128,26 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = with qt6Packages; [ cmake ninja + pkg-config python3 wrapQtAppsHook ]; buildInputs = with qt6Packages; [ + curl + ffmpeg + libavif + libjxl + libwebp libxcrypt qtbase qtmultimedia - ] ++ lib.optionals stdenv.isDarwin [ + simdutf + skia + woff2 + ] ++ lib.optional stdenv.hostPlatform.isLinux [ + qtwayland + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit Cocoa Foundation @@ -131,11 +158,8 @@ stdenv.mkDerivation (finalAttrs: { # Disable network operations "-DSERENITY_CACHE_DIR=Caches" "-DENABLE_NETWORK_DOWNLOADS=OFF" - "-DENABLE_COMMONMARK_SPEC_DOWNLOAD=OFF" - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "-DCMAKE_INSTALL_LIBEXECDIR=libexec" - # FIXME: Enable this when launching with the commandline flag --enable-gpu-painting doesn't fail calling eglBindAPI on GNU/Linux - "-DENABLE_ACCELERATED_GRAPHICS=OFF" ]; # FIXME: Add an option to -DENABLE_QT=ON on macOS to use Qt rather than Cocoa for the GUI @@ -143,14 +167,14 @@ stdenv.mkDerivation (finalAttrs: { env.NIX_CFLAGS_COMPILE = "-Wno-error"; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications $out/bin mv $out/bundle/Ladybird.app $out/Applications ''; # Only Ladybird and WebContent need wrapped, if Qt is enabled. # On linux we end up wraping some non-Qt apps, like headless-browser. - dontWrapQtApps = stdenv.isDarwin; + dontWrapQtApps = stdenv.hostPlatform.isDarwin; passthru.tests = { nixosTest = nixosTests.ladybird; @@ -163,5 +187,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.hostPlatform.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/lagrange/default.nix b/pkgs/applications/networking/browsers/lagrange/default.nix index 7a486ec65fe93..d6770a85138eb 100644 --- a/pkgs/applications/networking/browsers/lagrange/default.nix +++ b/pkgs/applications/networking/browsers/lagrange/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ the-foundation ] ++ lib.optionals (!enableTUI) [ fribidi harfbuzz libwebp mpg123 SDL2 ] ++ lib.optionals enableTUI [ ncurses sealcurses ] - ++ lib.optional stdenv.isDarwin AppKit; + ++ lib.optional stdenv.hostPlatform.isDarwin AppKit; cmakeFlags = lib.optionals enableTUI [ "-DENABLE_TUI=YES" @@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { "-DCMAKE_INSTALL_DATADIR=${placeholder "out"}/share" ]; - installPhase = lib.optionalString (stdenv.isDarwin && !enableTUI) '' + installPhase = lib.optionalString (stdenv.hostPlatform.isDarwin && !enableTUI) '' mkdir -p $out/Applications mv Lagrange.app $out/Applications ''; diff --git a/pkgs/applications/networking/browsers/librewolf/librewolf.nix b/pkgs/applications/networking/browsers/librewolf/librewolf.nix index bb35d92a3d627..46e9b1f77dd23 100644 --- a/pkgs/applications/networking/browsers/librewolf/librewolf.nix +++ b/pkgs/applications/networking/browsers/librewolf/librewolf.nix @@ -6,33 +6,41 @@ rec { inherit (src) packageVersion firefox source; - extraPatches = [ ]; + extraPatches = [ "${source}/patches/pref-pane/pref-pane-small.patch" ]; extraConfigureFlags = [ "--with-app-name=librewolf" - "--with-app-basename=LibreWolf" "--with-unsigned-addon-scopes=app,system" ]; extraPostPatch = '' while read patch_name; do - echo "applying LibreWolf patch: $patch_name" - patch -p1 < ${source}/$patch_name + if ! sed -n '/nvidia-wayland-backported-fixes-.*-Bug-1898476/p'; then + echo "applying LibreWolf patch: $patch_name" + patch -p1 < ${source}/$patch_name + fi done <${source}/assets/patches.txt cp -r ${source}/themes/browser . cp ${source}/assets/search-config.json services/settings/dumps/main/search-config.json sed -i '/MOZ_SERVICES_HEALTHREPORT/ s/True/False/' browser/moz.configure sed -i '/MOZ_NORMANDY/ s/True/False/' browser/moz.configure + + cp ${source}/patches/pref-pane/category-librewolf.svg browser/themes/shared/preferences + cp ${source}/patches/pref-pane/librewolf.css browser/themes/shared/preferences + cp ${source}/patches/pref-pane/librewolf.inc.xhtml browser/components/preferences + cp ${source}/patches/pref-pane/librewolf.js browser/components/preferences + cat ${source}/patches/pref-pane/preferences.ftl >> browser/locales/en-US/browser/preferences/preferences.ftl ''; - extraPrefsFiles = [ "${src.settings}/librewolf.cfg" ]; + extraPrefsFiles = [ "${source}/settings/librewolf.cfg" ]; - extraPoliciesFiles = [ "${src.settings}/distribution/policies.json" ]; + extraPoliciesFiles = [ "${source}/settings/distribution/policies.json" ]; extraPassthru = { - librewolf = { inherit src extraPatches; }; + librewolf = { + inherit src extraPatches; + }; inherit extraPrefsFiles extraPoliciesFiles; }; } - diff --git a/pkgs/applications/networking/browsers/librewolf/src.json b/pkgs/applications/networking/browsers/librewolf/src.json index 67fed12e16538..575b936513127 100644 --- a/pkgs/applications/networking/browsers/librewolf/src.json +++ b/pkgs/applications/networking/browsers/librewolf/src.json @@ -1,15 +1,11 @@ { - "packageVersion": "127.0-1", + "packageVersion": "130.0-3", "source": { - "rev": "127.0-1", - "sha256": "0zif9b7ky423bg3cf3njyxl465hrbsha1f1hxpdgccql0id5qr7r" - }, - "settings": { - "rev": "1debc2d30949baff2d1e7df23e87900f1987a8ae", - "sha256": "12xgjv40mihbyfsah26vvdyb4yirydc1a884v2chnca4f5q00lc2" + "rev": "130.0-3", + "sha256": "0ah6k4637fg3v3l13rk6bw6wxsx0mc41hvi9sld5psbl8l2kyk29" }, "firefox": { - "version": "127.0", - "sha512": "5a17bce357e7f445c37540115f2c131ad5a055c0cf04f20bc2eaca18f8d241a99ac76739d172b38f2ad2681633f901a0a15893801082ac5db9e20e31fc8b8291" + "version": "130.0", + "sha512": "d0d11b38d9e02fa15298ec13336bb086668b4f36b3ce9ced218a265327fd4822b9fea4303402631947ea3c20490c414de87f8df3e7c23d2e02b70f0456b9af40" } } diff --git a/pkgs/applications/networking/browsers/librewolf/src.nix b/pkgs/applications/networking/browsers/librewolf/src.nix index 89e36dca8933b..fd5b1aaa1f210 100644 --- a/pkgs/applications/networking/browsers/librewolf/src.nix +++ b/pkgs/applications/networking/browsers/librewolf/src.nix @@ -10,12 +10,6 @@ in fetchSubmodules = true; inherit (src.source) rev sha256; }; - settings = fetchFromGitea { - domain = "codeberg.org"; - owner = "librewolf"; - repo = "settings"; - inherit (src.settings) rev sha256; - }; firefox = fetchurl { url = "mirror://mozilla/firefox/releases/${src.firefox.version}/source/firefox-${src.firefox.version}.source.tar.xz"; diff --git a/pkgs/applications/networking/browsers/librewolf/update.nix b/pkgs/applications/networking/browsers/librewolf/update.nix index 147d7558dccdf..f614509fba286 100644 --- a/pkgs/applications/networking/browsers/librewolf/update.nix +++ b/pkgs/applications/networking/browsers/librewolf/update.nix @@ -57,18 +57,9 @@ writeScript "update-librewolf" '' ffHash=$(grep '\.source\.tar\.xz$' "$HOME"/shasums | grep '^[^ ]*' -o) echo "ffHash=$ffHash" - # upstream does not specify settings rev, so just get the latest. see https://github.com/NixOS/nixpkgs/issues/252276 - settingsRev=$(curl 'https://codeberg.org/api/v1/repos/librewolf/settings/commits?sha=master&limit=1' | jq -r .[0].sha) - echo "settingsRev=$settingsRev" - repoUrl=https://codeberg.org/librewolf/settings - nix-prefetch-git $repoUrl --quiet --rev $settingsRev > $prefetchOut - settingsSha256=$(jq -r .sha256 < $prefetchOut) - jq ".source.rev = \"$latestTag\"" $srcJson | sponge $srcJson jq ".source.sha256 = \"$srcHash\"" $srcJson | sponge $srcJson jq ".firefox.version = \"$ffVersion\"" $srcJson | sponge $srcJson jq ".firefox.sha512 = \"$ffHash\"" $srcJson | sponge $srcJson jq ".packageVersion = \"$lwVersion\"" $srcJson | sponge $srcJson - jq ".settings.rev = \"$settingsRev\"" $srcJson | sponge $srcJson - jq ".settings.sha256 = \"$settingsSha256\"" $srcJson | sponge $srcJson '' diff --git a/pkgs/applications/networking/browsers/links2/default.nix b/pkgs/applications/networking/browsers/links2/default.nix index cbf4f538c4286..12968f2f56cf6 100644 --- a/pkgs/applications/networking/browsers/links2/default.nix +++ b/pkgs/applications/networking/browsers/links2/default.nix @@ -2,9 +2,9 @@ , gpm, openssl, pkg-config, libev # Misc. , libpng, libjpeg, libtiff, librsvg, libavif # graphic formats , bzip2, zlib, xz # Transfer encodings -, enableFB ? (!stdenv.isDarwin) +, enableFB ? (!stdenv.hostPlatform.isDarwin) , enableDirectFB ? false, directfb -, enableX11 ? (!stdenv.isDarwin), libX11, libXt, libXau # GUI support +, enableX11 ? (!stdenv.hostPlatform.isDarwin), libX11, libXt, libXau # GUI support }: stdenv.mkDerivation (finalAttrs: { @@ -16,11 +16,11 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-IqqWwLOOGm+PftnXpBZ6R/w3JGCXdZ72BZ7Pj56teZg="; }; - buildInputs = with lib; + buildInputs = [ libev librsvg libpng libjpeg libtiff libavif openssl xz bzip2 zlib ] - ++ optionals stdenv.isLinux [ gpm ] - ++ optionals enableX11 [ libX11 libXau libXt ] - ++ optionals enableDirectFB [ directfb ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ gpm ] + ++ lib.optionals enableX11 [ libX11 libXau libXt ] + ++ lib.optionals enableDirectFB [ directfb ]; nativeBuildInputs = [ pkg-config bzip2 ]; diff --git a/pkgs/applications/networking/browsers/lynx/default.nix b/pkgs/applications/networking/browsers/lynx/default.nix index 88eb19146e8f8..1cad8d577710d 100644 --- a/pkgs/applications/networking/browsers/lynx/default.nix +++ b/pkgs/applications/networking/browsers/lynx/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { description = "Text-mode web browser"; homepage = "https://lynx.invisible-island.net/"; mainProgram = "lynx"; - maintainers = with maintainers; [ ]; + maintainers = [ ]; license = licenses.gpl2Plus; platforms = platforms.unix; }; diff --git a/pkgs/applications/networking/browsers/microsoft-edge/default.nix b/pkgs/applications/networking/browsers/microsoft-edge/default.nix index c52cb3f44fad7..5721c6e616b9c 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 = "130.0.2849.5"; revision = "1"; - hash = "sha256-d1zqZUhk5C/jrdZngQQlGplrSssE/LUR3/AybStNavE="; + hash = "sha256-chvB84+zu6/xgRHyUk33aicc44QJLxxdOOu0ngqmsFM="; }; dev = import ./browser.nix { channel = "dev"; - version = "127.0.2638.2"; + version = "130.0.2849.1"; revision = "1"; - hash = "sha256-Bv0X30ilcNBI9pblnrO1QA7ElTPMO5/JmIZIjhldO7Y="; + hash = "sha256-JObqtaaUR6J4rZ90WWw7Ku5Ntl/QBWHo23T7Ohu5p1s="; }; stable = import ./browser.nix { channel = "stable"; - version = "125.0.2535.92"; + version = "129.0.2792.65"; revision = "1"; - hash = "sha256-DuVz6+BzGTWZJ4smizIK2dV1OTmv0uTIQpD+yclHDN8="; + hash = "sha256-xuCtHptE2CG4aiY7gu2sWW3Km4qfB0E/L/PBACIaKOc="; }; } diff --git a/pkgs/applications/networking/browsers/mullvad-browser/default.nix b/pkgs/applications/networking/browsers/mullvad-browser/default.nix deleted file mode 100644 index b9a0b49bab2ba..0000000000000 --- a/pkgs/applications/networking/browsers/mullvad-browser/default.nix +++ /dev/null @@ -1,269 +0,0 @@ -{ lib -, stdenv -, fetchurl -, makeDesktopItem -, copyDesktopItems -, makeWrapper -, writeText -, wrapGAppsHook3 -, autoPatchelfHook -, callPackage - -, atk -, cairo -, dbus -, dbus-glib -, fontconfig -, freetype -, gdk-pixbuf -, glib -, gtk3 -, libxcb -, libX11 -, libXext -, libXrender -, libXt -, libXtst -, mesa -, pango -, pciutils -, zlib - -, libnotifySupport ? stdenv.isLinux -, libnotify - -, waylandSupport ? stdenv.isLinux -, libxkbcommon -, libdrm -, libGL - -, mediaSupport ? true -, ffmpeg - -, audioSupport ? mediaSupport - -, pipewireSupport ? audioSupport -, pipewire - -, pulseaudioSupport ? audioSupport -, libpulseaudio -, apulse -, alsa-lib - -, libvaSupport ? mediaSupport -, libva - -# Extra preferences -, extraPrefs ? "" -}: - -let - libPath = lib.makeLibraryPath ( - [ - alsa-lib - atk - cairo - dbus - dbus-glib - fontconfig - freetype - gdk-pixbuf - glib - gtk3 - libxcb - libX11 - libXext - libXrender - libXt - libXtst - mesa # for libgbm - pango - pciutils - stdenv.cc.cc - stdenv.cc.libc - zlib - ] ++ lib.optionals libnotifySupport [ libnotify ] - ++ lib.optionals waylandSupport [ libxkbcommon libdrm libGL ] - ++ lib.optionals pipewireSupport [ pipewire ] - ++ lib.optionals pulseaudioSupport [ libpulseaudio ] - ++ lib.optionals libvaSupport [ libva ] - ++ lib.optionals mediaSupport [ ffmpeg ] - ); - - version = "13.5"; - - sources = { - x86_64-linux = fetchurl { - urls = [ - "https://cdn.mullvad.net/browser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz" - "https://github.com/mullvad/mullvad-browser/releases/download/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz" - "https://archive.torproject.org/tor-package-archive/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz" - "https://dist.torproject.org/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz" - "https://tor.eff.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz" - "https://tor.calyxinstitute.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz" - ]; - hash = "sha256-Wz1gYK1CqfK4aa7K2PR8wKx7VcvALquYKA2vetUAdeU="; - }; - }; - - distributionIni = writeText "distribution.ini" (lib.generators.toINI {} { - # Some light branding indicating this build uses our distro preferences - Global = { - id = "nixos"; - version = "1.0"; - about = "Mullvad Browser for NixOS"; - }; - }); - - policiesJson = writeText "policies.json" (builtins.toJSON { - policies.DisableAppUpdate = true; - }); -in -stdenv.mkDerivation rec { - pname = "mullvad-browser"; - inherit version; - - src = sources.${stdenv.hostPlatform.system} or (throw "unsupported system: ${stdenv.hostPlatform.system}"); - - nativeBuildInputs = [ copyDesktopItems makeWrapper wrapGAppsHook3 autoPatchelfHook ]; - buildInputs = [ - gtk3 - alsa-lib - dbus-glib - libXtst - ]; - - preferLocalBuild = true; - allowSubstitutes = false; - - desktopItems = [(makeDesktopItem { - name = "mullvad-browser"; - exec = "mullvad-browser %U"; - icon = "mullvad-browser"; - desktopName = "Mullvad Browser"; - genericName = "Web Browser"; - comment = meta.description; - categories = [ "Network" "WebBrowser" "Security" ]; - })]; - - buildPhase = '' - runHook preBuild - - # For convenience ... - MB_IN_STORE=$out/share/mullvad-browser - - # Unpack & enter - mkdir -p "$MB_IN_STORE" - tar xf "$src" -C "$MB_IN_STORE" --strip-components=2 - pushd "$MB_IN_STORE" - - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "mullvadbrowser.real" - - # mullvadbrowser is a wrapper that checks for a more recent libstdc++ & appends it to the ld path - mv mullvadbrowser.real mullvadbrowser - - # store state at `~/.mullvad` instead of relative to executable - touch "$MB_IN_STORE/system-install" - - # Add bundled libraries to libPath. - libPath=${libPath}:$MB_IN_STORE - - # apulse uses a non-standard library path. For now special-case it. - ${lib.optionalString (audioSupport && !pulseaudioSupport) '' - libPath=${apulse}/lib/apulse:$libPath - ''} - - # Prepare for autoconfig. - # - # See https://developer.mozilla.org/en-US/Firefox/Enterprise_deployment - cat >defaults/pref/autoconfig.js <<EOF - // - pref("general.config.filename", "mozilla.cfg"); - pref("general.config.obscure_value", 0); - EOF - - # Hard-coded Firefox preferences. - cat >mozilla.cfg <<EOF - // First line must be a comment - - // Reset pref that captures store paths. - clearPref("extensions.xpiState"); - - // Stop obnoxious first-run redirection. - lockPref("noscript.firstRunRedirection", false); - - // Allow sandbox access to sound devices if using ALSA directly - ${if (audioSupport && !pulseaudioSupport) then '' - pref("security.sandbox.content.write_path_whitelist", "/dev/snd/"); - '' else '' - clearPref("security.sandbox.content.write_path_whitelist"); - ''} - - ${lib.optionalString (extraPrefs != "") '' - ${extraPrefs} - ''} - EOF - - # FONTCONFIG_FILE is required to make fontconfig read the MB - # fonts.conf; upstream uses FONTCONFIG_PATH, but FC_DEBUG=1024 - # indicates the system fonts.conf being used instead. - FONTCONFIG_FILE=$MB_IN_STORE/fontconfig/fonts.conf - substituteInPlace "$FONTCONFIG_FILE" \ - --replace-fail '<dir prefix="cwd">fonts</dir>' "<dir>$MB_IN_STORE/fonts</dir>" - - mkdir -p $out/bin - - makeWrapper "$MB_IN_STORE/mullvadbrowser" "$out/bin/mullvad-browser" \ - --prefix LD_LIBRARY_PATH : "$libPath" \ - --set FONTCONFIG_FILE "$FONTCONFIG_FILE" \ - --set-default MOZ_ENABLE_WAYLAND 1 - - # Easier access to docs - mkdir -p $out/share/doc - ln -s $MB_IN_STORE/Data/Docs $out/share/doc/mullvad-browser - - # Install icons - for i in 16 32 48 64 128; do - mkdir -p $out/share/icons/hicolor/''${i}x''${i}/apps/ - ln -s $out/share/mullvad-browser/browser/chrome/icons/default/default$i.png $out/share/icons/hicolor/''${i}x''${i}/apps/mullvad-browser.png - done - - # Check installed apps - echo "Checking mullvad-browser wrapper ..." - $out/bin/mullvad-browser --version >/dev/null - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - # Install distribution customizations - install -Dvm644 ${distributionIni} $out/share/mullvad-browser/distribution/distribution.ini - install -Dvm644 ${policiesJson} $out/share/mullvad-browser/distribution/policies.json - - runHook postInstall - ''; - - passthru = { - inherit sources; - updateScript = callPackage ../tor-browser/update.nix { - inherit pname version meta; - baseUrl = "https://cdn.mullvad.net/browser/"; - name = "mullvad-browser"; - }; - }; - - meta = with lib; { - description = "Privacy-focused browser made in a collaboration between The Tor Project and Mullvad"; - mainProgram = "mullvad-browser"; - homepage = "https://mullvad.net/en/browser"; - platforms = attrNames sources; - maintainers = with maintainers; [ felschr panicgh ]; - # MPL2.0+, GPL+, &c. While it's not entirely clear whether - # the compound is "libre" in a strict sense (some components place certain - # restrictions on redistribution), it's free enough for our purposes. - license = with licenses; [ mpl20 lgpl21Plus lgpl3Plus free ]; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - }; -} diff --git a/pkgs/applications/networking/browsers/netsurf/browser.nix b/pkgs/applications/networking/browsers/netsurf/browser.nix index cd1b78fc2980f..2397145a21c43 100644 --- a/pkgs/applications/networking/browsers/netsurf/browser.nix +++ b/pkgs/applications/networking/browsers/netsurf/browser.nix @@ -107,7 +107,7 @@ stdenv.mkDerivation (finalAttrs: { env.NIX_CFLAGS_COMPILE = "-fcommon"; - env.CFLAGS = lib.optionalString stdenv.isDarwin "-D_DARWIN_C_SOURCE"; + env.CFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-D_DARWIN_C_SOURCE"; patchPhase = lib.optionalString stdenv.cc.isClang '' runHook prePatch diff --git a/pkgs/applications/networking/browsers/netsurf/buildsystem.nix b/pkgs/applications/networking/browsers/netsurf/buildsystem.nix index d08ffda76b497..489bf7cd7e029 100644 --- a/pkgs/applications/networking/browsers/netsurf/buildsystem.nix +++ b/pkgs/applications/networking/browsers/netsurf/buildsystem.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://www.netsurf-browser.org/"; description = "NetSurf browser shared build system"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ vrthra AndersonTorres ]; + maintainers = with lib.maintainers; [ AndersonTorres ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/applications/networking/browsers/nyxt/default.nix b/pkgs/applications/networking/browsers/nyxt/default.nix index d0a040748dc87..16231815c426a 100644 --- a/pkgs/applications/networking/browsers/nyxt/default.nix +++ b/pkgs/applications/networking/browsers/nyxt/default.nix @@ -1,56 +1,104 @@ -{ stdenv, lib, sbclPackages -, makeWrapper, wrapGAppsHook3, gst_all_1 -, glib, gdk-pixbuf, cairo -, mailcap, pango, gtk3 -, glib-networking, gsettings-desktop-schemas -, xclip, wl-clipboard, notify-osd, enchant +{ stdenv +, lib +, testers +, wrapGAppsHook3 +, fetchzip +, sbcl +, pkg-config +, libfixposix +, gobject-introspection +, gsettings-desktop-schemas +, glib-networking +, notify-osd +, gtk3 +, glib +, gdk-pixbuf +, cairo +, pango +, webkitgtk +, openssl +, gstreamer +, gst-libav +, gst-plugins-base +, gst-plugins-good +, gst-plugins-bad +, gst-plugins-ugly +, xdg-utils +, xclip +, wl-clipboard }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "nyxt"; - inherit (sbclPackages.nyxt) version; + version = "3.11.8"; - src = sbclPackages.nyxt; + src = fetchzip { + url = "https://github.com/atlas-engineer/nyxt/releases/download/${finalAttrs.version}/nyxt-${finalAttrs.version}-source-with-submodules.tar.xz"; + hash = "sha256-mLf2dvnXYUwPEB3QkoB/O3m/e96t6ISUZNfh+y1ArX4="; + stripRoot = false; + }; + + # for sbcl 2.4.3 + postPatch = '' + substituteInPlace _build/cl-gobject-introspection/src/init.lisp \ + --replace-warn sb-ext::set-floating-point-modes sb-int:set-floating-point-modes + substituteInPlace _build/fset/Code/port.lisp \ + --replace-warn sb-ext::once-only sb-int:once-only + ''; - nativeBuildInputs = [ makeWrapper wrapGAppsHook3 ]; - gstBuildInputs = with gst_all_1; [ - gstreamer gst-libav + nativeBuildInputs = [ wrapGAppsHook3 ]; + + buildInputs = [ + sbcl + # for groveller + pkg-config libfixposix + # for gappsWrapper + gobject-introspection + gsettings-desktop-schemas + glib-networking + notify-osd + gtk3 + gstreamer + gst-libav gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly ]; - buildInputs = [ - glib gdk-pixbuf cairo - mailcap pango gtk3 - glib-networking gsettings-desktop-schemas - notify-osd enchant - ] ++ gstBuildInputs; - - GST_PLUGIN_SYSTEM_PATH_1_0 = lib.makeSearchPathOutput "lib" "lib/gstreamer-1.0" gstBuildInputs; - - # The executable is already built in sbclPackages.nyxt, buildPhase tries to build using the makefile which we ignore - dontBuild = true; - - dontWrapGApps = true; - installPhase = '' - mkdir -p $out/share/applications/ - sed "s/VERSION/$version/" $src/assets/nyxt.desktop > $out/share/applications/nyxt.desktop - for i in 16 32 128 256 512; do - mkdir -p "$out/share/icons/hicolor/''${i}x''${i}/apps/" - cp -f $src/assets/nyxt_''${i}x''${i}.png "$out/share/icons/hicolor/''${i}x''${i}/apps/nyxt.png" - done - - mkdir -p $out/bin && makeWrapper $src/bin/nyxt $out/bin/nyxt \ - --prefix PATH : ${lib.makeBinPath [ xclip wl-clipboard ]} \ - --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "${GST_PLUGIN_SYSTEM_PATH_1_0}" \ - --argv0 nyxt "''${gappsWrapperArgs[@]}" + + # for cffi + LD_LIBRARY_PATH = lib.makeLibraryPath [ + glib + gobject-introspection + gdk-pixbuf + cairo + pango + gtk3 + webkitgtk + openssl + libfixposix + ]; + + postConfigure = '' + export CL_SOURCE_REGISTRY="$(pwd)/_build//" + export ASDF_OUTPUT_TRANSLATIONS="$(pwd):$(pwd)" + export PREFIX="$out" + export NYXT_VERSION="$version" ''; - checkPhase = '' - $out/bin/nyxt -h + # don't refresh from git + makeFlags = [ "all" "NYXT_SUBMODULES=false" ]; + + preFixup = '' + gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : "$LD_LIBRARY_PATH") + gappsWrapperArgs+=(--prefix PATH : "${lib.makeBinPath [ xdg-utils xclip wl-clipboard ]}") ''; + # prevent corrupting core in exe + dontStrip = true; + + passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; }; + meta = with lib; { description = "Infinitely extensible web-browser (with Lisp development files using WebKitGTK platform port)"; mainProgram = "nyxt"; @@ -59,4 +107,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ lewo dariof4 ]; platforms = platforms.all; }; -} +}) diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix index d5bd6a3e34b98..429923f6268ae 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 = "113.0.5230.47"; src = fetchurl { url = "${mirror}/${version}/linux/${pname}-stable_${version}_amd64.deb"; - hash = "sha256-ge2ne11BrODlvbu17G6xaLd4w2mIEsErtIaqlLY4os8="; + hash = "sha256-0RQTcROUv85yE6ceLkyF09/++WrvK828h5hoN1QYpCE="; }; unpackPhase = "dpkg-deb -x $src ."; diff --git a/pkgs/applications/networking/browsers/palemoon/bin.nix b/pkgs/applications/networking/browsers/palemoon/bin.nix index fcd3b82f50922..e6bb9e887c4f4 100644 --- a/pkgs/applications/networking/browsers/palemoon/bin.nix +++ b/pkgs/applications/networking/browsers/palemoon/bin.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "palemoon-bin"; - version = "33.2.0"; + version = "33.3.1"; src = finalAttrs.passthru.sources."gtk${if withGTK3 then "3" else "2"}"; @@ -158,11 +158,11 @@ stdenv.mkDerivation (finalAttrs: { in { gtk3 = fetchzip { urls = urlRegionVariants "gtk3"; - hash = "sha256-h6ohLm9I6esvVa9bek/j2s/jiIcEOwjd8/dCyUvqyLw="; + hash = "sha256-auo45tzMY6bKahSEmUrkcYnz7v+GFbsrG+ePAKRC00U="; }; gtk2 = fetchzip { urls = urlRegionVariants "gtk2"; - hash = "sha256-To/41og5hxFL6efJhNfRNJw/fOXZA5Le16DZsSJrXfc="; + hash = "sha256-7qrT5fSfwcEAkbq8g/HRoUiDv5+qrzpiysjHTdZVgLc="; }; }; diff --git a/pkgs/applications/networking/browsers/polypane/default.nix b/pkgs/applications/networking/browsers/polypane/default.nix index 06391355dbfdf..693b1e8f0f50e 100644 --- a/pkgs/applications/networking/browsers/polypane/default.nix +++ b/pkgs/applications/networking/browsers/polypane/default.nix @@ -2,12 +2,12 @@ let pname = "polypane"; - version = "20.0.0"; + version = "21.1.0"; src = fetchurl { url = "https://github.com/firstversionist/${pname}/releases/download/v${version}/${pname}-${version}.AppImage"; name = "${pname}-${version}.AppImage"; - sha256 = "sha256-2fzxEqOGPZnA+nizLUq73f18bKDpDNglUt4RIz+VnS8="; + sha256 = "sha256-MVBxKJeqIFAkSOajo1q/062BGBF6Fm2sUA6GYZIBoKQ="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index bfb40dc9bc2d6..64fee95385cc6 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -3,7 +3,7 @@ , asciidoc, docbook_xml_dtd_45, docbook_xsl, libxml2 , libxslt , withPdfReader ? true -, pipewireSupport ? stdenv.isLinux +, pipewireSupport ? stdenv.hostPlatform.isLinux , pipewire , qtwayland , qtbase @@ -26,7 +26,7 @@ let stripRoot = false; }; - version = "3.2.0"; + version = "3.2.1"; in python3.pkgs.buildPythonApplication { @@ -34,7 +34,7 @@ python3.pkgs.buildPythonApplication { inherit version; src = fetchurl { url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/qutebrowser-${version}.tar.gz"; - hash = "sha256-4eGRG5VWI2rKpZ0NGYbWFHlvs2Zz0TljwhZYzWSh8DM="; + hash = "sha256-AqevKmxds42HsiWwuEEsgNmDgzXzLQ6KOPbX+804iX0="; }; # Needs tox @@ -43,15 +43,17 @@ python3.pkgs.buildPythonApplication { buildInputs = [ qtbase glib-networking + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ + qtwayland ]; nativeBuildInputs = [ wrapQtAppsHook asciidoc docbook_xml_dtd_45 docbook_xsl libxml2 libxslt - python3.pkgs.pygments ]; - propagatedBuildInputs = with python3.pkgs; ([ + dependencies = with python3.pkgs; [ + colorama pyyaml (if isQt6 then pyqt6-webengine else pyqtwebengine) jinja2 pygments # scripts and userscripts libs tldextract beautifulsoup4 @@ -62,8 +64,8 @@ python3.pkgs.buildPythonApplication { adblock # for the qute-bitwarden user script to be able to copy the TOTP token to clipboard pyperclip - ] ++ lib.optional stdenv.isLinux qtwayland - ); + ]; + patches = [ ./fix-restart.patch @@ -83,7 +85,7 @@ python3.pkgs.buildPythonApplication { runHook preInstall make -f misc/Makefile \ - PYTHON=${python3.pythonOnBuildForHost.interpreter} \ + PYTHON=${(python3.pythonOnBuildForHost.withPackages (ps: with ps; [ setuptools ])).interpreter} \ PREFIX=. \ DESTDIR="$out" \ DATAROOTDIR=/share \ diff --git a/pkgs/applications/networking/browsers/tor-browser/default.nix b/pkgs/applications/networking/browsers/tor-browser/default.nix deleted file mode 100644 index f19da4505789b..0000000000000 --- a/pkgs/applications/networking/browsers/tor-browser/default.nix +++ /dev/null @@ -1,337 +0,0 @@ -{ lib -, stdenv -, fetchurl -, makeDesktopItem -, copyDesktopItems -, makeWrapper -, writeText -, autoPatchelfHook -, wrapGAppsHook3 -, callPackage - -, atk -, cairo -, dbus -, dbus-glib -, fontconfig -, freetype -, gdk-pixbuf -, glib -, gtk3 -, libxcb -, libX11 -, libXext -, libXrender -, libXt -, libXtst -, mesa -, pango -, pciutils -, zlib - -, libnotifySupport ? stdenv.isLinux -, libnotify - -, waylandSupport ? stdenv.isLinux -, libxkbcommon -, libdrm -, libGL - -, mediaSupport ? true -, ffmpeg - -, audioSupport ? mediaSupport - -, pipewireSupport ? audioSupport -, pipewire - -, pulseaudioSupport ? audioSupport -, libpulseaudio -, apulse -, alsa-lib - -, libvaSupport ? mediaSupport -, libva - -# Hardening -, graphene-hardened-malloc -# Whether to use graphene-hardened-malloc -, useHardenedMalloc ? null - -# Whether to disable multiprocess support -, disableContentSandbox ? false - -# Extra preferences -, extraPrefs ? "" -}: - -lib.warnIf (useHardenedMalloc != null) - "tor-browser: useHardenedMalloc is deprecated and enabling it can cause issues" - -(let - libPath = lib.makeLibraryPath ( - [ - alsa-lib - atk - cairo - dbus - dbus-glib - fontconfig - freetype - gdk-pixbuf - glib - gtk3 - libxcb - libX11 - libXext - libXrender - libXt - libXtst - mesa # for libgbm - pango - pciutils - stdenv.cc.cc - stdenv.cc.libc - zlib - ] ++ lib.optionals libnotifySupport [ libnotify ] - ++ lib.optionals waylandSupport [ libxkbcommon libdrm libGL ] - ++ lib.optionals pipewireSupport [ pipewire ] - ++ lib.optionals pulseaudioSupport [ libpulseaudio ] - ++ lib.optionals libvaSupport [ libva ] - ++ lib.optionals mediaSupport [ ffmpeg ] - ); - - version = "13.5"; - - sources = { - x86_64-linux = fetchurl { - urls = [ - "https://archive.torproject.org/tor-package-archive/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz" - "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz" - "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz" - "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz" - ]; - hash = "sha256-npqrGyCwqMeZ8JssR/EpvDClkLQ3K0xEfE19fHn+GDs="; - }; - - i686-linux = fetchurl { - urls = [ - "https://archive.torproject.org/tor-package-archive/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz" - "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz" - "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz" - "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz" - ]; - hash = "sha256-qeXLBFhcCPDWRuCZiLL1wOY6BRWsk0h36jWe5U6eCJ8="; - }; - }; - - distributionIni = writeText "distribution.ini" (lib.generators.toINI {} { - # Some light branding indicating this build uses our distro preferences - Global = { - id = "nixos"; - version = "1.0"; - about = "Tor Browser for NixOS"; - }; - }); - - policiesJson = writeText "policies.json" (builtins.toJSON { - policies.DisableAppUpdate = true; - }); -in -stdenv.mkDerivation rec { - pname = "tor-browser"; - inherit version; - - src = sources.${stdenv.hostPlatform.system} or (throw "unsupported system: ${stdenv.hostPlatform.system}"); - - nativeBuildInputs = [ autoPatchelfHook copyDesktopItems makeWrapper wrapGAppsHook3 ]; - buildInputs = [ - gtk3 - alsa-lib - dbus-glib - libXtst - ]; - - preferLocalBuild = true; - allowSubstitutes = false; - - desktopItems = [(makeDesktopItem { - name = "torbrowser"; - exec = "tor-browser %U"; - icon = "tor-browser"; - desktopName = "Tor Browser"; - genericName = "Web Browser"; - comment = meta.description; - categories = [ "Network" "WebBrowser" "Security" ]; - })]; - - buildPhase = '' - runHook preBuild - - # For convenience ... - TBB_IN_STORE=$out/share/tor-browser - interp=$(< $NIX_CC/nix-support/dynamic-linker) - - # Unpack & enter - mkdir -p "$TBB_IN_STORE" - tar xf "$src" -C "$TBB_IN_STORE" --strip-components=2 - pushd "$TBB_IN_STORE" - - # Set ELF interpreter - for exe in firefox.real TorBrowser/Tor/tor ; do - echo "Setting ELF interpreter on $exe ..." >&2 - patchelf --set-interpreter "$interp" "$exe" - done - - # firefox is a wrapper that checks for a more recent libstdc++ & appends it to the ld path - mv firefox.real firefox - - # store state at `~/.tor browser` instead of relative to executable - touch "$TBB_IN_STORE/system-install" - - # The final libPath. Note, we could split this into firefoxLibPath - # and torLibPath for accuracy, but this is more convenient ... - libPath=${libPath}:$TBB_IN_STORE:$TBB_IN_STORE/TorBrowser/Tor - - # apulse uses a non-standard library path. For now special-case it. - ${lib.optionalString (audioSupport && !pulseaudioSupport) '' - libPath=${apulse}/lib/apulse:$libPath - ''} - - # Fixup paths to pluggable transports. - substituteInPlace TorBrowser/Data/Tor/torrc-defaults \ - --replace-fail './TorBrowser' "$TBB_IN_STORE/TorBrowser" - - # Fixup obfs transport. Work around patchelf failing to set - # interpreter for pre-compiled Go binaries by invoking the interpreter - # directly. - sed -i TorBrowser/Data/Tor/torrc-defaults \ - -e "s|\(ClientTransportPlugin meek_lite,obfs2,obfs3,obfs4,scramblesuit\) exec|\1 exec $interp|" - - # Similarly fixup snowflake - sed -i TorBrowser/Data/Tor/torrc-defaults \ - -e "s|\(ClientTransportPlugin snowflake\) exec|\1 exec $interp|" - - # Prepare for autoconfig. - # - # See https://developer.mozilla.org/en-US/Firefox/Enterprise_deployment - cat >defaults/pref/autoconfig.js <<EOF - // - pref("general.config.filename", "mozilla.cfg"); - pref("general.config.obscure_value", 0); - EOF - - # Hard-coded Firefox preferences. - cat >mozilla.cfg <<EOF - // First line must be a comment - - // Reset pref that captures store paths. - clearPref("extensions.xpiState"); - - // Stop obnoxious first-run redirection. - lockPref("noscript.firstRunRedirection", false); - - // User should never change these. Locking prevents these - // values from being written to prefs.js, avoiding Store - // path capture. - lockPref("extensions.torlauncher.torrc-defaults_path", "$TBB_IN_STORE/TorBrowser/Data/Tor/torrc-defaults"); - lockPref("extensions.torlauncher.tor_path", "$TBB_IN_STORE/TorBrowser/Tor/tor"); - - // Insist on using IPC for communicating with Tor - // - // Defaults to creating \$XDG_RUNTIME_DIR/Tor/{socks,control}.socket - lockPref("extensions.torlauncher.control_port_use_ipc", true); - lockPref("extensions.torlauncher.socks_port_use_ipc", true); - - // Optionally disable multiprocess support. We always set this to ensure that - // toggling the pref takes effect. - lockPref("browser.tabs.remote.autostart.2", ${if disableContentSandbox then "false" else "true"}); - - // Allow sandbox access to sound devices if using ALSA directly - ${if (audioSupport && !pulseaudioSupport) then '' - pref("security.sandbox.content.write_path_whitelist", "/dev/snd/"); - '' else '' - clearPref("security.sandbox.content.write_path_whitelist"); - ''} - - ${lib.optionalString (extraPrefs != "") '' - ${extraPrefs} - ''} - EOF - - # FONTCONFIG_FILE is required to make fontconfig read the TBB - # fonts.conf; upstream uses FONTCONFIG_PATH, but FC_DEBUG=1024 - # indicates the system fonts.conf being used instead. - FONTCONFIG_FILE=$TBB_IN_STORE/fontconfig/fonts.conf - substituteInPlace "$FONTCONFIG_FILE" \ - --replace-fail '<dir prefix="cwd">fonts</dir>' "<dir>$TBB_IN_STORE/fonts</dir>" - - # Hard-code paths to geoip data files. TBB resolves the geoip files - # relative to torrc-defaults_path but if we do not hard-code them - # here, these paths end up being written to the torrc in the user's - # state dir. - cat >>TorBrowser/Data/Tor/torrc-defaults <<EOF - GeoIPFile $TBB_IN_STORE/TorBrowser/Data/Tor/geoip - GeoIPv6File $TBB_IN_STORE/TorBrowser/Data/Tor/geoip6 - EOF - - mkdir -p $out/bin - - makeWrapper "$TBB_IN_STORE/firefox" "$out/bin/tor-browser" \ - --prefix LD_PRELOAD : "${lib.optionalString (useHardenedMalloc == true) - "${graphene-hardened-malloc}/lib/libhardened_malloc.so"}" \ - --prefix LD_LIBRARY_PATH : "$libPath" \ - --set FONTCONFIG_FILE "$FONTCONFIG_FILE" \ - --set-default MOZ_ENABLE_WAYLAND 1 - - # Easier access to docs - mkdir -p $out/share/doc - ln -s $TBB_IN_STORE/TorBrowser/Docs $out/share/doc/tor-browser - - # Install icons - for i in 16 32 48 64 128; do - mkdir -p $out/share/icons/hicolor/''${i}x''${i}/apps/ - ln -s $out/share/tor-browser/browser/chrome/icons/default/default$i.png $out/share/icons/hicolor/''${i}x''${i}/apps/tor-browser.png - done - - # Check installed apps - echo "Checking bundled Tor ..." - LD_LIBRARY_PATH=$libPath $TBB_IN_STORE/TorBrowser/Tor/tor --version >/dev/null - - echo "Checking tor-browser wrapper ..." - $out/bin/tor-browser --version >/dev/null - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - # Install distribution customizations - install -Dvm644 ${distributionIni} $out/share/tor-browser/distribution/distribution.ini - install -Dvm644 ${policiesJson} $out/share/tor-browser/distribution/policies.json - - runHook postInstall - ''; - - passthru = { - inherit sources; - updateScript = callPackage ./update.nix { - inherit pname version meta; - }; - }; - - meta = with lib; { - description = "Privacy-focused browser routing traffic through the Tor network"; - mainProgram = "tor-browser"; - homepage = "https://www.torproject.org/"; - changelog = "https://gitweb.torproject.org/builders/tor-browser-build.git/plain/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt?h=maint-${version}"; - platforms = attrNames sources; - maintainers = with maintainers; [ felschr panicgh joachifm hax404 ]; - # MPL2.0+, GPL+, &c. While it's not entirely clear whether - # the compound is "libre" in a strict sense (some components place certain - # restrictions on redistribution), it's free enough for our purposes. - license = with licenses; [ mpl20 lgpl21Plus lgpl3Plus free ]; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - }; -}) diff --git a/pkgs/applications/networking/browsers/tor-browser/update.nix b/pkgs/applications/networking/browsers/tor-browser/update.nix deleted file mode 100644 index 04b69d8ce208c..0000000000000 --- a/pkgs/applications/networking/browsers/tor-browser/update.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ lib -, writeShellScript -, coreutils -, gnused -, gnugrep -, curl -, gnupg -, nix -, common-updater-scripts - -# options -, pname -, version -, meta -, baseUrl ? "https://dist.torproject.org/torbrowser/" -# name used to match published archive -, name ? "tor-browser" -, prerelease ? false -}: - -let - versionMatch = if prerelease - then ''[0-9]+(\.[0-9]+)*.*'' - else ''[0-9]+(\.[0-9]+)*''; -in writeShellScript "update-${pname}" '' - PATH="${lib.makeBinPath [ coreutils curl gnugrep gnused gnupg nix common-updater-scripts ]}" - set -euo pipefail - - trap - - url=${baseUrl} - version=$(curl -s $url \ - | sed -rne 's,^.*href="(${versionMatch})/".*,\1,p' \ - | sort --version-sort | tail -1) - - if [[ "${version}" = "$version" ]]; then - echo "The new version same as the old version." - exit 0 - fi - - HOME=$(mktemp -d) - export GNUPGHOME=$(mktemp -d) - trap 'rm -rf "$HOME" "$GNUPGHOME"' EXIT - - gpg --auto-key-locate nodefault,wkd --locate-keys torbrowser@torproject.org - gpg --output $HOME/tor.keyring --export 0xEF6E286DDA85EA2A4BA7DE684E2C6E8793298290 - - curl --silent --show-error --fail -o $HOME/shasums "$url$version/sha256sums-signed-build.txt" - curl --silent --show-error --fail -o $HOME/shasums.asc "$url$version/sha256sums-signed-build.txt.asc" - gpgv --keyring=$HOME/tor.keyring $HOME/shasums.asc $HOME/shasums - - declare -A platforms=( - ['x86_64-linux']='linux-x86_64' - ['i686-linux']='linux-i686' - ) - - for platform in ${lib.escapeShellArgs meta.platforms}; do - arch="''${platforms[$platform]}" - sha256=$(grep "${name}-$arch-$version.tar.xz" "$HOME/shasums" | cut -d" " -f1) - hash=$(nix hash to-sri --type sha256 "$sha256") - - update-source-version "${pname}" "$version" "$hash" --ignore-same-version --source-key="sources.$platform" - done -'' diff --git a/pkgs/applications/networking/browsers/vimb/default.nix b/pkgs/applications/networking/browsers/vimb/default.nix index 1c15d89eded59..e76b79f9d09ff 100644 --- a/pkgs/applications/networking/browsers/vimb/default.nix +++ b/pkgs/applications/networking/browsers/vimb/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://fanglingsu.github.io/vimb/"; license = lib.licenses.gpl3; - maintainers = []; + maintainers = [ ]; platforms = with lib.platforms; linux; }; } diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index 4b97d01e9d4b2..d0a27d8252116 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -15,7 +15,7 @@ , proprietaryCodecs ? false, vivaldi-ffmpeg-codecs ? null , enableWidevine ? false, widevine-cdm ? null , commandLineArgs ? "" -, pulseSupport ? stdenv.isLinux, libpulseaudio +, pulseSupport ? stdenv.hostPlatform.isLinux, libpulseaudio , kerberosSupport ? true, libkrb5 }: @@ -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.9.3447.48"; 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-pl6vZwIPqfYi/nO/PDEwUyi4CdVP9ciTAbVg0d+DX1w="; + x86_64-linux = "sha256-mhJCCYXP9eyA8YquSZsnm5o04VmY5NRwVM5vKqbdkZs="; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; @@ -62,7 +62,7 @@ in stdenv.mkDerivation rec { ++ lib.optional kerberosSupport libkrb5; libPath = lib.makeLibraryPath buildInputs - + lib.optionalString (stdenv.is64bit) + + lib.optionalString (stdenv.hostPlatform.is64bit) (":" + lib.makeSearchPathOutput "lib" "lib64" buildInputs) + ":$out/opt/${vivaldiName}/lib"; 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/browsers/w3m/default.nix b/pkgs/applications/networking/browsers/w3m/default.nix index acfd83f560867..8ea48ffbad994 100644 --- a/pkgs/applications/networking/browsers/w3m/default.nix +++ b/pkgs/applications/networking/browsers/w3m/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchFromGitHub, fetchpatch , ncurses, boehmgc, gettext, zlib , sslSupport ? true, openssl -, graphicsSupport ? !stdenv.isDarwin, imlib2 +, graphicsSupport ? !stdenv.hostPlatform.isDarwin, imlib2 , x11Support ? graphicsSupport, libX11 -, mouseSupport ? !stdenv.isDarwin, gpm-ncurses +, mouseSupport ? !stdenv.hostPlatform.isDarwin, gpm-ncurses , perl, man, pkg-config, buildPackages, w3m -, testers +, testers, updateAutotoolsGnuConfigScriptsHook }: let @@ -29,7 +29,7 @@ in stdenv.mkDerivation rec { hash = "sha256-upb5lWqhC1jRegzTncIz5e21v4Pw912FyVn217HucFs="; }; - NIX_LDFLAGS = lib.optionalString stdenv.isSunOS "-lsocket -lnsl"; + NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isSunOS "-lsocket -lnsl"; # we must set these so that the generated files (e.g. w3mhelp.cgi) contain # the correct paths. @@ -53,7 +53,9 @@ in stdenv.mkDerivation rec { sed -ie 's!mktable.*:.*!mktable:!' Makefile.in ''; - nativeBuildInputs = [ pkg-config gettext ]; + # updateAutotoolsGnuConfigScriptsHook necessary to build on FreeBSD native pending inclusion of + # https://git.savannah.gnu.org/cgit/config.git/commit/?id=e4786449e1c26716e3f9ea182caf472e4dbc96e0 + nativeBuildInputs = [ pkg-config gettext updateAutotoolsGnuConfigScriptsHook ]; buildInputs = [ ncurses boehmgc zlib ] ++ lib.optional sslSupport openssl ++ lib.optional mouseSupport gpm-ncurses diff --git a/pkgs/applications/networking/browsers/yandex-browser/default.nix b/pkgs/applications/networking/browsers/yandex-browser/default.nix index d4fa55f266763..06d4251b9faab 100644 --- a/pkgs/applications/networking/browsers/yandex-browser/default.nix +++ b/pkgs/applications/networking/browsers/yandex-browser/default.nix @@ -54,15 +54,15 @@ let version = { - corporate = "24.4.3.1073-1"; - beta = "24.4.1.952-1"; - stable = "24.4.1.951-1"; + corporate = "24.7.1.1195-1"; + beta = "24.7.1.1124-1"; + stable = "24.7.1.1120-1"; }.${edition}; hash = { - corporate = "sha256-f2Q6q3rL+RcVYX46RHRAageF2JKPxmBaV6KHYl5XtN8="; - beta = "sha256-WCyjgb5uj9guqyge6giP0wavndorlMG6yacG134xWjw="; - stable = "sha256-4AsMpANtMXUS2NCPKI+Ut0tWGurRIpWCmS3PhEi1CGo="; + corporate = "sha256-HPEUeIZl9nRhMzrMv4MzIOnbF8mJ789vCtTWf9TcCH4="; + beta = "sha256-vcX/9MWqeUd/YlczHivcL6+TignE8Nk6rO5DaCjf2SQ="; + stable = "sha256-wrYPQ8WrttF/tlafA0+e3eDZMq9SFmLk5NOIeHQr14U="; }.${edition}; app = { diff --git a/pkgs/applications/networking/calls/default.nix b/pkgs/applications/networking/calls/default.nix index cc9b60558e2c7..c0a23c6528760 100644 --- a/pkgs/applications/networking/calls/default.nix +++ b/pkgs/applications/networking/calls/default.nix @@ -18,7 +18,6 @@ , desktop-file-utils , appstream-glib , libpeas -, libgdata , dbus , vala , wrapGAppsHook3 @@ -27,14 +26,13 @@ , docbook-xsl-nons , docbook_xml_dtd_43 , docutils -, gobject-introspection , gst_all_1 , sofia_sip }: stdenv.mkDerivation rec { pname = "calls"; - version = "46.0"; + version = "46.3"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; @@ -42,7 +40,7 @@ stdenv.mkDerivation rec { repo = pname; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-ZUVMK0Ex77EQKTGM0gBDHt8W9l4rHspihYduMcwMGho="; + hash = "sha256-J1wuhAXPCvLWzPqMU4alVFFpHoCAzX3wVOP3Bw0wW/o="; }; outputs = [ "out" "devdoc" ]; diff --git a/pkgs/applications/networking/circumflex/default.nix b/pkgs/applications/networking/circumflex/default.nix index 8fce759acff69..354bc383271ad 100644 --- a/pkgs/applications/networking/circumflex/default.nix +++ b/pkgs/applications/networking/circumflex/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "circumflex"; - version = "3.6"; + version = "3.7"; src = fetchFromGitHub { owner = "bensadeh"; repo = "circumflex"; rev = version; - hash = "sha256-FzJUmF2X4Iyf83cIEa8b8EFCcWUyYEZBVyvXuhiaaWM="; + hash = "sha256-jjtjOT8lFPsk300Q9EtsX/w8Bck0pwrS/GyouoBsZ+0="; }; - vendorHash = "sha256-x/NgcodS/hirXJHxBHeUP9MgOBHq1yQWHprMrlpqsas="; + vendorHash = "sha256-Nlv8H5YqHrqACW2kEXg+mkc3bCgXVudrSNfyu+xeFBA="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/networking/cloudflared/default.nix b/pkgs/applications/networking/cloudflared/default.nix index 59e0f843648ed..4cd54559fb055 100644 --- a/pkgs/applications/networking/cloudflared/default.nix +++ b/pkgs/applications/networking/cloudflared/default.nix @@ -3,17 +3,18 @@ , buildGoModule , fetchFromGitHub , callPackage +, gitUpdater }: buildGoModule rec { pname = "cloudflared"; - version = "2024.4.1"; + version = "2024.9.1"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cloudflared"; rev = "refs/tags/${version}"; - hash = "sha256-rDw25kFiD16xma/LozGjlc/Tm6hoRYzHs8spTk6HU6Y="; + hash = "sha256-PFe58tdLc6RtLFrGuL9y+FWNGIASXCDawxSG2He2IQ0="; }; vendorHash = null; @@ -68,9 +69,12 @@ buildGoModule rec { --replace "TestManagerCtxDoneCloseSessions" "SkipManagerCtxDoneCloseSessions" ''; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; - passthru.tests.simple = callPackage ./tests.nix { inherit version; }; + passthru = { + tests.simple = callPackage ./tests.nix { inherit version; }; + updateScript = gitUpdater { }; + }; meta = with lib; { description = "Cloudflare Tunnel daemon, Cloudflare Access toolkit, and DNS-over-HTTPS client"; diff --git a/pkgs/applications/networking/cluster/aiac/default.nix b/pkgs/applications/networking/cluster/aiac/default.nix index 32207bcd05b05..ac1d51ecee3a3 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.2.1"; excludedPackages = [".ci"]; src = fetchFromGitHub { owner = "gofireflyio"; repo = pname; rev = "v${version}"; - hash = "sha256-6u/TVCLFtcNzmchYw8dhedNRm7Lpl9oi8MpYkLYzFdg="; + hash = "sha256-8LMuhUeH/KNOf3IPYMSwZDxeY8M7oDYF4Q7X7ImQSMw="; }; - 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/argo-rollouts/default.nix b/pkgs/applications/networking/cluster/argo-rollouts/default.nix index aad4e6807f50d..b09e8af264eb4 100644 --- a/pkgs/applications/networking/cluster/argo-rollouts/default.nix +++ b/pkgs/applications/networking/cluster/argo-rollouts/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "argo-rollouts"; - version = "1.7.1"; + version = "1.7.2"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-rollouts"; rev = "v${version}"; - sha256 = "sha256-5ly5VJSXIo9s2ilWYhf5FJij+tcITd+rmYEKFdFrq44="; + sha256 = "sha256-KljhBI7vNqQVV0UeFRXfdan1gEiwS1CwokgWnJ1RR5Q="; }; vendorHash = "sha256-38BLPNc6en70+UxlldmrwtRTMRLh/fCPL6FtuA2ODGM="; diff --git a/pkgs/applications/networking/cluster/argo/default.nix b/pkgs/applications/networking/cluster/argo/default.nix index 61bd14cdc45b7..815ac16a8573e 100644 --- a/pkgs/applications/networking/cluster/argo/default.nix +++ b/pkgs/applications/networking/cluster/argo/default.nix @@ -34,16 +34,16 @@ let in buildGoModule rec { pname = "argo"; - version = "3.5.8"; + version = "3.5.11"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo"; rev = "refs/tags/v${version}"; - hash = "sha256-BYUP/Gu+N8KK9mfjRAXupXqrwfZMZlYPxxuZCmUDFfE="; + hash = "sha256-Yw61BCcMLl/zkmPm79SI0AdT6Nj2bxQkt6IKRBu0FmQ="; }; - vendorHash = "sha256-pVOTeH6fq4Gqarjvi7w2wYJ3FSqV6yNZERmOmbVGxLM="; + vendorHash = "sha256-QwQasJMSEnHvBxyxCjLuinPt47XAhERch3j60KXGxa4="; doCheck = false; diff --git a/pkgs/applications/networking/cluster/argocd-autopilot/default.nix b/pkgs/applications/networking/cluster/argocd-autopilot/default.nix index 63466a3efdbfa..a5cb5ac1bfb49 100644 --- a/pkgs/applications/networking/cluster/argocd-autopilot/default.nix +++ b/pkgs/applications/networking/cluster/argocd-autopilot/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "argocd-autopilot"; diff --git a/pkgs/applications/networking/cluster/argocd/default.nix b/pkgs/applications/networking/cluster/argocd/default.nix index 6e860d2318c41..985c0e3bebdc4 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.12.4"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-cd"; rev = "v${version}"; - hash = "sha256-qSrMqByhOitRltYaVjIeubuoTR74x/pQ1Ad+uTPdpJU="; + hash = "sha256-CxxaNm6O0wGvh1V0RmU4eA654u2ooL41EmlNX49KEE0="; }; proxyVendor = true; # darwin/linux hash mismatch - vendorHash = "sha256-atgNLlHoX+KBtJcYZNqNsYBK0cVGI/k2mXvmcr6wWN4="; + vendorHash = "sha256-8BX0QErfe2mxTbIToNgZ3U9OtpIy887936U68Qr+3W0="; # Set target as ./cmd per cli-local # https://github.com/argoproj/argo-cd/blob/master/Makefile#L227 diff --git a/pkgs/applications/networking/cluster/arkade/default.nix b/pkgs/applications/networking/cluster/arkade/default.nix index b3f3dd21b9e17..a484da72b6fbb 100644 --- a/pkgs/applications/networking/cluster/arkade/default.nix +++ b/pkgs/applications/networking/cluster/arkade/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , buildGoModule , fetchFromGitHub , installShellFiles @@ -7,13 +6,13 @@ buildGoModule rec { pname = "arkade"; - version = "0.11.16"; + version = "0.11.26"; src = fetchFromGitHub { owner = "alexellis"; repo = "arkade"; rev = version; - hash = "sha256-i/wEgUK4NxFonZXJKuhLHBgCXQ25A/UDyavhJdjuJ+M="; + hash = "sha256-p3rLQQwuJ/5AUzsQfGA9JSoifYaG4vAE2NaNfTf6/uk="; }; CGO_ENABLED = 0; diff --git a/pkgs/applications/networking/cluster/atlantis/default.nix b/pkgs/applications/networking/cluster/atlantis/default.nix index 02621add1b8d5..c621d042bb242 100644 --- a/pkgs/applications/networking/cluster/atlantis/default.nix +++ b/pkgs/applications/networking/cluster/atlantis/default.nix @@ -2,20 +2,20 @@ buildGoModule rec { pname = "atlantis"; - version = "0.28.1"; + version = "0.28.5"; src = fetchFromGitHub { owner = "runatlantis"; repo = "atlantis"; rev = "v${version}"; - hash = "sha256-c9+LPQVgS/nM/SADwTzULEvuB3dAjyAR2VVPQAEHBy0="; + hash = "sha256-oyECtP/YeEhvsltWZq52YNq+Gbbpko9bbbUTh5NA/9c="; }; ldflags = [ "-X=main.version=${version}" "-X=main.date=1970-01-01T00:00:00Z" ]; - vendorHash = "sha256-eYS7dO9BCnn9p1HgDOt4vliPYLsR0TaNwSpUoMO6eAk="; + vendorHash = "sha256-oiRpmGfuc37s3ZD8R7L9EFieqJP7mYvDsiJBzruCSkA="; subPackages = [ "." ]; diff --git a/pkgs/applications/networking/cluster/atmos/default.nix b/pkgs/applications/networking/cluster/atmos/default.nix index 3e9dbe040c305..82bbd7b202bb1 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.86.0"; src = fetchFromGitHub { owner = "cloudposse"; repo = pname; rev = "v${version}"; - sha256 = "sha256-drreGXCYpjF1UD1OUzuGh2rezEhHw7Zq0Y6JujLsMMk="; + sha256 = "sha256-IlvIZMfsANw6+BrVObn0pBcoEcSKXVcN1V3B0f4BDno="; }; - vendorHash = "sha256-ojl+dGrj+zmE2lqlclq3jA0K6AXdi9Ofhd4GA6nVrDo="; + vendorHash = "sha256-87C3MPKlYVnpNJvPJY9eCrSy8qfP8Kj36a9vi+kiP44="; ldflags = [ "-s" "-w" "-X github.com/cloudposse/atmos/cmd.Version=v${version}" ]; diff --git a/pkgs/applications/networking/cluster/bosh-cli/default.nix b/pkgs/applications/networking/cluster/bosh-cli/default.nix index aa1e18fd5cd88..d4788c80bafc4 100644 --- a/pkgs/applications/networking/cluster/bosh-cli/default.nix +++ b/pkgs/applications/networking/cluster/bosh-cli/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "bosh-cli"; - version = "7.6.0"; + version = "7.7.2"; src = fetchFromGitHub { owner = "cloudfoundry"; repo = pname; rev = "v${version}"; - sha256 = "sha256-buhRRgwCOVTnlVLzAL4T9ymgMTIcvelHyv6mfPK61eM="; + sha256 = "sha256-orn1pxHefYCp0vPsZ4TI5Y76tpR8dOcEmxA3cHwfYQU="; }; vendorHash = null; diff --git a/pkgs/applications/networking/cluster/calico/default.nix b/pkgs/applications/networking/cluster/calico/default.nix index 7bce32ce2c0a6..509a0385c8500 100644 --- a/pkgs/applications/networking/cluster/calico/default.nix +++ b/pkgs/applications/networking/cluster/calico/default.nix @@ -2,16 +2,16 @@ builtins.mapAttrs (pname: { doCheck ? true, mainProgram ? pname, subPackages }: buildGoModule rec { inherit pname; - version = "3.28.0"; + version = "3.28.2"; src = fetchFromGitHub { owner = "projectcalico"; repo = "calico"; rev = "v${version}"; - hash = "sha256-CiLapG5/J+oKDgoRyZmWkfA1NWJ9Cchp4yiE6bV4Wt4="; + hash = "sha256-ZENlUmSLI+aY33a69LNsfer/TLz8gmzxEv8Gddz6faU="; }; - vendorHash = "sha256-3BH7FZFfH63Z8d4U7y4S5wpiVG2Vcr9wqdzkoUnwsrM="; + vendorHash = "sha256-6ZHb4SUa22/KfN4B2hg710FOSpg69rlT9FbZ/wCjpDc="; inherit doCheck subPackages; diff --git a/pkgs/applications/networking/cluster/cilium/default.nix b/pkgs/applications/networking/cluster/cilium/default.nix index 7ea0c3c6905b7..fb097191cb585 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.15"; src = fetchFromGitHub { owner = "cilium"; repo = pname; rev = "v${version}"; - hash = "sha256-SgAqq9tT4Rtg1AvoUsDvR5cCLIOuHwNUFN2NOheciYw="; + hash = "sha256-5LqRHa0ytprwAAIl7iNZQ9zKnn5wNtFubQdvLuX9qGM="; }; vendorHash = null; @@ -42,7 +42,7 @@ buildGoModule rec { description = "CLI to install, manage & troubleshoot Kubernetes clusters running Cilium"; license = lib.licenses.asl20; homepage = "https://www.cilium.io/"; - maintainers = with lib.maintainers; [ bryanasdev000 humancalico qjoly superherointj ]; + maintainers = with lib.maintainers; [ bryanasdev000 humancalico qjoly ]; mainProgram = "cilium"; }; } diff --git a/pkgs/applications/networking/cluster/civo/default.nix b/pkgs/applications/networking/cluster/civo/default.nix deleted file mode 100644 index 6e4bfdf1afe22..0000000000000 --- a/pkgs/applications/networking/cluster/civo/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: - -buildGoModule rec { - pname = "civo"; - version = "1.0.87"; - - src = fetchFromGitHub { - owner = "civo"; - repo = "cli"; - rev = "v${version}"; - sha256 = "sha256-9uoh0rdBgIONqiGwak9Hvrf3davqcvuB6KbhmyU16fk="; - }; - - vendorHash = "sha256-bEyknQc7TCxbWj7VsjJ2WGz65BG8HaP8ldL2kb+bbtc="; - - nativeBuildInputs = [ installShellFiles ]; - - CGO_ENABLED = 0; - - # Some lint checks fail - doCheck = false; - - ldflags = [ - "-s" - "-X github.com/civo/cli/common.VersionCli=${version}" - "-X github.com/civo/cli/common.CommitCli=${src.rev}" - "-X github.com/civo/cli/common.DateCli=unknown" - ]; - - doInstallCheck = false; - - postInstall = '' - mv $out/bin/cli $out/bin/civo - installShellCompletion --cmd civo \ - --bash <($out/bin/civo completion bash) \ - --fish <($out/bin/civo completion fish) \ - --zsh <($out/bin/civo completion zsh) - ''; - - meta = with lib; { - description = "CLI for interacting with Civo resources"; - mainProgram = "civo"; - homepage = "https://github.com/civo/cli"; - license = licenses.asl20; - maintainers = with maintainers; [ berryp ]; - }; -} diff --git a/pkgs/applications/networking/cluster/click/default.nix b/pkgs/applications/networking/cluster/click/default.nix index de8e4b38754cb..a471c5827c762 100644 --- a/pkgs/applications/networking/cluster/click/default.nix +++ b/pkgs/applications/networking/cluster/click/default.nix @@ -13,10 +13,10 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-fcJTxZX9mdF4oFl/Cn1egczRy+yhWt2zLKsdLKz6Q+s="; - nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; - buildInputs = lib.optionals stdenv.isLinux [ openssl ] - ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ openssl ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; meta = with lib; { description = ''The "Command Line Interactive Controller for Kubernetes"''; diff --git a/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix b/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix index e1bbb48ea9655..b927703748049 100644 --- a/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix +++ b/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "cloudfoundry-cli"; - version = "8.7.10"; + version = "8.8.1"; src = fetchFromGitHub { owner = "cloudfoundry"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-hzXNaaL6CLVRIy88lCJ87q0V6A+ld1GPDcUagsvMXY0="; + sha256 = "sha256-0SVz97XjFeXaj56ssqFK2jTUQfL0rSc72HAdK9mikUc="; }; - vendorHash = "sha256-zDE+9OsnX3S7SPTVW3hR1rO++6Wdk00zy2msu+jUNlw="; + vendorHash = "sha256-WI4yg+r8zGLZI10/kNFkdbzXk0hZ6CCXvXLOd8l7AWo="; subPackages = [ "." ]; diff --git a/pkgs/applications/networking/cluster/clusterctl/default.nix b/pkgs/applications/networking/cluster/clusterctl/default.nix index 6026cf02905ba..1e9183adbaaa6 100644 --- a/pkgs/applications/networking/cluster/clusterctl/default.nix +++ b/pkgs/applications/networking/cluster/clusterctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "clusterctl"; - version = "1.7.2"; + version = "1.8.3"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = "cluster-api"; rev = "v${version}"; - hash = "sha256-ZZkDc5INjUoNc9zcwbOa9WRIkkLr9bm3mohsSe3tKI4="; + hash = "sha256-zvMjfaEq6EOWVqjVOoS2nb1fuGyEljcNVfTpAWUsiL8="; }; - vendorHash = "sha256-ALRnccGjPGuAITtuz79Cao95NhvSczAzspSMXytlw+A="; + vendorHash = "sha256-0VVaD1vGIGezgkVCvIhNHmZqVFxFu4UcUUh0wuX2viw="; subPackages = [ "cmd/clusterctl" ]; diff --git a/pkgs/applications/networking/cluster/cmctl/default.nix b/pkgs/applications/networking/cluster/cmctl/default.nix index 98fb309942ea9..b103450942c75 100644 --- a/pkgs/applications/networking/cluster/cmctl/default.nix +++ b/pkgs/applications/networking/cluster/cmctl/default.nix @@ -35,7 +35,7 @@ buildGoModule rec { ]; # Trusted by this computer: no: x509: “cert-manager” certificate is not trusted - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; postInstall = '' mv $out/bin/ctl $out/bin/cmctl diff --git a/pkgs/applications/networking/cluster/cni/default.nix b/pkgs/applications/networking/cluster/cni/default.nix index 3cc2673508725..7710490816e7e 100644 --- a/pkgs/applications/networking/cluster/cni/default.nix +++ b/pkgs/applications/networking/cluster/cni/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cni"; - version = "1.2.2"; + version = "1.2.3"; src = fetchFromGitHub { owner = "containernetworking"; repo = pname; rev = "v${version}"; - hash = "sha256-yM4opOrHH0NQz26yHuzQfiXdWc8LbxAaqxXQDFdUb60="; + hash = "sha256-ocSc1fhbBB8YRxVVOvYMombOOkLMdfv9V4GYbf8kwIE="; }; vendorHash = "sha256-/aPx8NgGkJ1irU0LGzmYTlsiX2U5or24Vl1PGHWuDyE="; diff --git a/pkgs/applications/networking/cluster/fetchit/default.nix b/pkgs/applications/networking/cluster/fetchit/default.nix index 263e52fc7c455..d772ba5f5ad68 100644 --- a/pkgs/applications/networking/cluster/fetchit/default.nix +++ b/pkgs/applications/networking/cluster/fetchit/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , buildGoModule , fetchFromGitHub , installShellFiles diff --git a/pkgs/applications/networking/cluster/flink/default.nix b/pkgs/applications/networking/cluster/flink/default.nix index 65b4ddd2a7a98..43cf4d047b450 100644 --- a/pkgs/applications/networking/cluster/flink/default.nix +++ b/pkgs/applications/networking/cluster/flink/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "flink"; - version = "1.19.1"; + version = "1.20.0"; src = fetchurl { url = "mirror://apache/flink/${pname}-${version}/${pname}-${version}-bin-scala_2.12.tgz"; - sha256 = "sha256-WWFp8+/KcdQZMvA/krWJsTf3we3+KFARcibXOeeZvc4="; + sha256 = "sha256-cI/VRMz53cDUsZL+A1eXzhbeLCbx12TFWQcwXv4UCvA="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/networking/cluster/fn-cli/default.nix b/pkgs/applications/networking/cluster/fn-cli/default.nix index ea32ad32ce13f..f699a53552aed 100644 --- a/pkgs/applications/networking/cluster/fn-cli/default.nix +++ b/pkgs/applications/networking/cluster/fn-cli/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, docker }: +{ lib, buildGoModule, fetchFromGitHub, docker }: buildGoModule rec { pname = "fn"; diff --git a/pkgs/applications/networking/cluster/gatekeeper/default.nix b/pkgs/applications/networking/cluster/gatekeeper/default.nix index 604ee8d30010e..2b8ef8c1f1766 100644 --- a/pkgs/applications/networking/cluster/gatekeeper/default.nix +++ b/pkgs/applications/networking/cluster/gatekeeper/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "gatekeeper"; - version = "3.16.3"; + version = "3.17.1"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "gatekeeper"; rev = "v${version}"; - hash = "sha256-G/ELuaUSlyeNcN6v1/xubF+VjvltdLKYmwlYWKzQiuw="; + hash = "sha256-Tu4p0kY0UdU0++zLpj+6A5ky5OXEEN5iivHbiyvghw4="; }; vendorHash = null; diff --git a/pkgs/applications/networking/cluster/glooctl/default.nix b/pkgs/applications/networking/cluster/glooctl/default.nix index c492db4688ea0..65009e7d4de68 100644 --- a/pkgs/applications/networking/cluster/glooctl/default.nix +++ b/pkgs/applications/networking/cluster/glooctl/default.nix @@ -1,21 +1,22 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, installShellFiles +{ + lib, + buildGoModule, + fetchFromGitHub, + installShellFiles, }: buildGoModule rec { pname = "glooctl"; - version = "1.16.16"; + version = "1.17.10"; src = fetchFromGitHub { owner = "solo-io"; repo = "gloo"; rev = "v${version}"; - hash = "sha256-N7Yao/lRyzmbFDIqfvQoZXKGbYPxlA8HCD3tPkl8RKk="; + hash = "sha256-p917jiPvWjLRoH2y81TvILc9WYZ6n1y1UQy8hIO93jM="; }; - vendorHash = "sha256-wLB+sUaSOBb1VLx/iwlU4U6LKakUP+GbhdWfjlvCu84="; + vendorHash = "sha256-rAObw4J0ATle1gq5Z1MsrGy/iqQDHjnMPAEIPBgtY3g="; subPackages = [ "projects/gloo/cli/cmd" ]; @@ -25,10 +26,13 @@ buildGoModule rec { ldflags = [ "-s" - "-w" "-X github.com/solo-io/gloo/pkg/version.Version=${version}" ]; + preCheck = '' + export HOME=$TMPDIR + ''; + postInstall = '' mv $out/bin/cmd $out/bin/glooctl installShellCompletion --cmd glooctl \ @@ -37,10 +41,11 @@ buildGoModule rec { ''; meta = { - description = "glooctl is the unified CLI for Gloo"; + description = "Unified CLI for Gloo, the feature-rich, Kubernetes-native, next-generation API gateway built on Envoy"; mainProgram = "glooctl"; homepage = "https://docs.solo.io/gloo-edge/latest/reference/cli/glooctl/"; + changelog = "https://github.com/solo-io/gloo/releases/tag/v${version}"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/networking/cluster/hadoop/default.nix b/pkgs/applications/networking/cluster/hadoop/default.nix index 5f44e39d008cf..02acad93a3156 100644 --- a/pkgs/applications/networking/cluster/hadoop/default.nix +++ b/pkgs/applications/networking/cluster/hadoop/default.nix @@ -15,7 +15,6 @@ , zlib , zstd , openssl -, glibc , nixosTests , sparkSupport ? true , spark @@ -23,9 +22,7 @@ , callPackage }: -with lib; - -assert elem stdenv.system [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ]; +assert lib.elem stdenv.system [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ]; let common = { pname, platformAttrs, jdk, tests }: @@ -34,37 +31,37 @@ let version = platformAttrs.${stdenv.system}.version or (throw "Unsupported system: ${stdenv.system}"); src = fetchurl { url = "mirror://apache/hadoop/common/hadoop-${finalAttrs.version}/hadoop-${finalAttrs.version}" - + optionalString stdenv.isAarch64 "-aarch64" + ".tar.gz"; + + lib.optionalString stdenv.hostPlatform.isAarch64 "-aarch64" + ".tar.gz"; inherit (platformAttrs.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}")) hash; }; doCheck = true; # Build the container executor binary from source # InstallPhase is not lazily evaluating containerExecutor for some reason - containerExecutor = if stdenv.isLinux then (callPackage ./containerExecutor.nix { + containerExecutor = if stdenv.hostPlatform.isLinux then (callPackage ./containerExecutor.nix { inherit (finalAttrs) version; inherit platformAttrs; }) else ""; nativeBuildInputs = [ makeWrapper ] - ++ optionals stdenv.isLinux [ autoPatchelfHook ]; - buildInputs = optionals stdenv.isLinux [ stdenv.cc.cc.lib openssl protobuf zlib snappy libtirpc ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ stdenv.cc.cc.lib openssl protobuf zlib snappy libtirpc ]; installPhase = '' mkdir $out mv * $out/ - '' + optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' for n in $(find ${finalAttrs.containerExecutor}/bin -type f); do ln -sf "$n" $out/bin done # these libraries are loaded at runtime by the JVM - ln -s ${getLib cyrus_sasl}/lib/libsasl2.so $out/lib/native/libsasl2.so.2 - ln -s ${getLib openssl}/lib/libcrypto.so $out/lib/native/ - ln -s ${getLib zlib}/lib/libz.so.1 $out/lib/native/ - ln -s ${getLib zstd}/lib/libzstd.so.1 $out/lib/native/ - ln -s ${getLib bzip2}/lib/libbz2.so.1 $out/lib/native/ - ln -s ${getLib snappy}/lib/libsnappy.so.1 $out/lib/native/ + ln -s ${lib.getLib cyrus_sasl}/lib/libsasl2.so $out/lib/native/libsasl2.so.2 + ln -s ${lib.getLib openssl}/lib/libcrypto.so $out/lib/native/ + ln -s ${lib.getLib zlib}/lib/libz.so.1 $out/lib/native/ + ln -s ${lib.getLib zstd}/lib/libzstd.so.1 $out/lib/native/ + ln -s ${lib.getLib bzip2}/lib/libbz2.so.1 $out/lib/native/ + ln -s ${lib.getLib snappy}/lib/libsnappy.so.1 $out/lib/native/ # libjvm.so is in different paths for java 8 and 11 # libnativetask.so in hadooop 3 and libhdfs.so in hadoop 2 depend on it @@ -76,7 +73,7 @@ let # hadoop 3.3+ depends on protobuf 3.18, 3.2 depends on 3.8 find $out/lib/native -name 'libhdfspp.so*' | \ xargs -r -n1 patchelf --replace-needed libprotobuf.so.${ - if (versionAtLeast finalAttrs.version "3.3") then "18" + if (lib.versionAtLeast finalAttrs.version "3.3") then "18" else "8" } libprotobuf.so @@ -90,17 +87,17 @@ let --set-default HADOOP_HOME $out/\ --run "test -d /etc/hadoop-conf && export HADOOP_CONF_DIR=\''${HADOOP_CONF_DIR-'/etc/hadoop-conf/'}"\ --set-default HADOOP_CONF_DIR $out/etc/hadoop/\ - --prefix PATH : "${makeBinPath [ bash coreutils which]}"\ - --prefix JAVA_LIBRARY_PATH : "${makeLibraryPath finalAttrs.buildInputs}" + --prefix PATH : "${lib.makeBinPath [ bash coreutils which]}"\ + --prefix JAVA_LIBRARY_PATH : "${lib.makeLibraryPath finalAttrs.buildInputs}" done - '' + (optionalString sparkSupport '' + '' + (lib.optionalString sparkSupport '' # Add the spark shuffle service jar to YARN cp ${spark.src}/yarn/spark-${spark.version}-yarn-shuffle.jar $out/share/hadoop/yarn/ ''); passthru = { inherit tests; }; - meta = recursiveUpdate { + meta = with lib; recursiveUpdate { homepage = "https://hadoop.apache.org/"; description = "Framework for distributed processing of large data sets across clusters of computers"; license = licenses.asl20; @@ -125,6 +122,24 @@ in { # Different version of hadoop support different java runtime versions # https://cwiki.apache.org/confluence/display/HADOOP/Hadoop+Java+Versions + hadoop_3_4 = common rec { + pname = "hadoop"; + platformAttrs = rec { + x86_64-linux = { + version = "3.4.0"; + hash = "sha256-4xGnhIBBQDD57GNUml1oXmnibyBxA9mr8hpIud0DyGw="; + srcHash = "sha256-viDF3LdRCZHqFycOYfN7nUQBPHiMCIjmu7jgIAaaK9E="; + }; + x86_64-darwin = x86_64-linux; + aarch64-linux = x86_64-linux // { + hash = "sha256-QWxzKtNyw/AzcHMv0v7kj91pw1HO7VAN9MHO84caFk8="; + }; + aarch64-darwin = aarch64-linux; + }; + jdk = jdk11_headless; + # TODO: Package and add Intel Storage Acceleration Library + tests = nixosTests.hadoop; + }; hadoop_3_3 = common rec { pname = "hadoop"; platformAttrs = rec { @@ -141,17 +156,7 @@ in }; jdk = jdk11_headless; # TODO: Package and add Intel Storage Acceleration Library - tests = nixosTests.hadoop; - }; - hadoop_3_2 = common { - pname = "hadoop"; - platformAttrs.x86_64-linux = { - version = "3.2.4"; - hash = "sha256-qt2gpMr+NHuiVR+/zFRzRyRKG725/ZNBIM69z9J9wNw="; - srcHash = "sha256-F9nGD3mZZ1eJf3Ec3AJGE9YBcL/HiagskcdKQhCn/sw="; - }; - jdk = jdk8_headless; - tests = nixosTests.hadoop_3_2; + tests = nixosTests.hadoop_3_3; }; hadoop2 = common rec { pname = "hadoop"; diff --git a/pkgs/applications/networking/cluster/helm-docs/default.nix b/pkgs/applications/networking/cluster/helm-docs/default.nix index a087fb84fe6b5..e60d34669b91f 100644 --- a/pkgs/applications/networking/cluster/helm-docs/default.nix +++ b/pkgs/applications/networking/cluster/helm-docs/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "helm-docs"; - version = "1.13.1"; + version = "1.14.2"; src = fetchFromGitHub { owner = "norwoodj"; repo = "helm-docs"; rev = "v${version}"; - hash = "sha256-lSGgT+aWp4NgiIoCnR4TNdecEqIZVnKMmGtEingq05o="; + hash = "sha256-a7alzjh+vjJPw/g9yaYkOUvwpgiqCrtKTBkV1EuGYtk="; }; - vendorHash = "sha256-LpARmDupT+vUPqUwFnvOGKOaBQbTuTvQnWc5Q2bGBaY="; + vendorHash = "sha256-9VSjxnc804A+PTMy0ZoNWNkHAjh3/kMK0XoEfI/LgEY="; subPackages = [ "cmd/helm-docs" ]; ldflags = [ diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix index 23f40df6e4fae..c5f161db09149 100644 --- a/pkgs/applications/networking/cluster/helm/default.nix +++ b/pkgs/applications/networking/cluster/helm/default.nix @@ -1,16 +1,23 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles, testers, kubernetes-helm }: +{ + lib, + buildGoModule, + fetchFromGitHub, + installShellFiles, + testers, + kubernetes-helm, +}: buildGoModule rec { pname = "kubernetes-helm"; - version = "3.15.2"; + version = "3.16.1"; src = fetchFromGitHub { owner = "helm"; repo = "helm"; rev = "v${version}"; - sha256 = "sha256-gZfL9ejW9Md5X1S8Zvlc4OpywJfU2rlT+p78imgPjpw="; + sha256 = "sha256-OTG4xPgK1WT/HUWjQZ1a7X126+PUo02yFnEAnd6MTU8="; }; - vendorHash = "sha256-2q5IziYSW2FFfRZvWKz6dVnJfauRlE9lRrb4/l2EGC0="; + vendorHash = "sha256-rNp2aah6lAMZd07HXF2w0h7wfPc+TuRHl/jQpgqY5Sk="; subPackages = [ "cmd/helm" ]; ldflags = [ @@ -68,6 +75,13 @@ buildGoModule rec { description = "Package manager for kubernetes"; mainProgram = "helm"; license = licenses.asl20; - maintainers = with maintainers; [ rlupton20 edude03 saschagrunert Frostman Chili-Man techknowlogick ]; + maintainers = with maintainers; [ + rlupton20 + edude03 + saschagrunert + Frostman + Chili-Man + techknowlogick + ]; }; } diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix index e0bf652558dee..94828973bd1fe 100644 --- a/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix +++ b/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix @@ -1,17 +1,17 @@ -{ buildGo122Module, fetchFromGitHub, lib }: +{ buildGoModule, fetchFromGitHub, lib }: -buildGo122Module rec { +buildGoModule rec { pname = "helm-diff"; - version = "3.9.5"; + version = "3.9.11"; src = fetchFromGitHub { owner = "databus23"; repo = pname; rev = "v${version}"; - hash = "sha256-6XkiGSbZzkYnqaHcoZQckADGVcWmSWL87MVzqb98lMQ="; + hash = "sha256-DwZZi7A6/UsKiFJSgMdo/zqlsRFz9RkFy8+s8RTumXg="; }; - vendorHash = "sha256-E0ERop/TBr36sfTKCD+DdZwHSkhYdGmvKoJF2gl3gwE="; + vendorHash = "sha256-3TtUpwg8HLHp/fILH5/qBnMKFmBlALOGSSYoEg3s1h0="; ldflags = [ "-s" "-w" "-X github.com/databus23/helm-diff/v3/cmd.Version=${version}" ]; diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-git.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-git.nix index 2619e8bd40788..ab4a912aab299 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 = "1.3.0"; src = fetchFromGitHub { owner = "aslafy-z"; repo = pname; rev = "v${version}"; - sha256 = "sha256-/kUKi2BI6LMMUiy6AaYhpPIXU428Or352xYoDYdym8A="; + sha256 = "sha256-o9y1C4O1uG2Z7f3kCEoK1tSmSuQh1zJxB/CZBv/GPus="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-mapkubeapis.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-mapkubeapis.nix index 364cea36b3ea2..4dc5619079444 100644 --- a/pkgs/applications/networking/cluster/helm/plugins/helm-mapkubeapis.nix +++ b/pkgs/applications/networking/cluster/helm/plugins/helm-mapkubeapis.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "helm-mapkubeapis"; - version = "0.4.1"; + version = "0.5.2"; src = fetchFromGitHub { owner = "helm"; repo = "helm-mapkubeapis"; rev = "v${version}"; - hash = "sha256-6NeePXTdp5vlBLfIlWeXQZMZ0Uz/e1ZCgZmJvBJfaFw="; + hash = "sha256-0DIBdSi/WIHVF8O7OtJOaFnIfpObsUXzgpj25kJuS6E="; }; - vendorHash = "sha256-rVrQqeakPQl3rjzmqzHw74ffreLEVzP153wWJ8TEOIM="; + vendorHash = "sha256-G3Q8XCwKLgHeWLF46C5lWfvuynr/cJbkq7xdydfTHZ4="; # NOTE: Remove the install and upgrade hooks. postPatch = '' diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-s3.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-s3.nix index a3b622fc889d3..d56d850d3bb7c 100644 --- a/pkgs/applications/networking/cluster/helm/plugins/helm-s3.nix +++ b/pkgs/applications/networking/cluster/helm/plugins/helm-s3.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "helm-s3"; - version = "0.16.0"; + version = "0.16.2"; src = fetchFromGitHub { owner = "hypnoglow"; repo = pname; rev = "v${version}"; - hash = "sha256-0wx8q93y8goXNh2x/XI3FQEXImVTpONURiDW2dCAi6o="; + hash = "sha256-hQuZd0VI+JspIjR7Dax/LXUZ9Rqflc6RQG9X80BkfeY="; }; - vendorHash = "sha256-i+rWg0/EUes5soFVRu9M5/iktbtudII7Ly5pcnOU2hU="; + vendorHash = "sha256-CXlZazpsHasjHPNHzXIsrbtWgQs/lVRqGsoqRvl2MHw="; # NOTE: Remove the install and upgrade hooks. postPatch = '' diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix index 4b215f7f0c1ff..2ff96adaac190 100644 --- a/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix +++ b/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper, coreutils, findutils, getopt, gnugrep, gnused, sops, vault }: +{ lib, stdenv, fetchFromGitHub, makeWrapper, coreutils, findutils, getopt, gnugrep, gnused, sops }: stdenv.mkDerivation rec { pname = "helm-secrets"; - version = "4.6.0"; + version = "4.6.1"; src = fetchFromGitHub { owner = "jkroepke"; repo = pname; rev = "v${version}"; - hash = "sha256-j4mOkPHJKiRWGTZloPBXwbHKOj2Hg44dspySa/KxPT4="; + hash = "sha256-AAc680STuXiGEw9ibFRHMrOxGs/c5pS0iEoymNHu+c8="; }; nativeBuildInputs = [ makeWrapper ]; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { install -m644 -Dt $out/${pname} plugin.yaml cp -r scripts/* $out/${pname}/scripts wrapProgram $out/${pname}/scripts/run.sh \ - --prefix PATH : ${lib.makeBinPath [ coreutils findutils getopt gnugrep gnused sops vault ]} + --prefix PATH : ${lib.makeBinPath [ coreutils findutils getopt gnugrep gnused sops ]} runHook postInstall ''; diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-unittest.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-unittest.nix index bd93089ee3063..8e0d04907b54f 100644 --- a/pkgs/applications/networking/cluster/helm/plugins/helm-unittest.nix +++ b/pkgs/applications/networking/cluster/helm/plugins/helm-unittest.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "helm-unittest"; - version = "0.5.1"; + version = "0.5.2"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-YWzjv1/I+LX3AMeQenI36AsNJkZ6IzbMhM/f5/Kxs2M="; + hash = "sha256-xA0dA8q7ZDQk35VjyIsJFbm3OlagnIbJ/iz5z2KsxjU="; }; - vendorHash = "sha256-A2izHBh58yPd2XPm4GKVosPtahUtQ35GbyBdr/L13CQ="; + vendorHash = "sha256-hSnTjEvi1Lexp7wAogqeoXWDCg/bvblw0bt1/lX9iR0="; # NOTE: Remove the install and upgrade hooks. postPatch = '' diff --git a/pkgs/applications/networking/cluster/helm/wrapper.nix b/pkgs/applications/networking/cluster/helm/wrapper.nix index 3b13668abf682..d933d84db3368 100644 --- a/pkgs/applications/networking/cluster/helm/wrapper.nix +++ b/pkgs/applications/networking/cluster/helm/wrapper.nix @@ -40,7 +40,7 @@ in # To prevent builds on hydra hydraPlatforms = []; # prefer wrapper over the package - priority = (helm.meta.priority or 0) - 1; + priority = (helm.meta.priority or lib.meta.defaultPriority) - 1; }; }; in diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix index a541f60a18ed5..1aceae0b31823 100644 --- a/pkgs/applications/networking/cluster/helmfile/default.nix +++ b/pkgs/applications/networking/cluster/helmfile/default.nix @@ -1,23 +1,25 @@ { lib -, buildGo122Module +, buildGoModule , fetchFromGitHub , installShellFiles , makeWrapper , pluginsDir ? null }: -buildGo122Module rec { +buildGoModule rec { pname = "helmfile"; - version = "0.165.0"; + version = "0.168.0"; src = fetchFromGitHub { owner = "helmfile"; repo = "helmfile"; rev = "v${version}"; - hash = "sha256-fXrfthjWaCo0p7NwP9EWa0uFeCCHInzi7h2tgawHlh0="; + hash = "sha256-qpYTYOzQWhjuVANOPpLDsYZyhvRl6FnNQz5ssDZHohw="; }; - vendorHash = "sha256-nWfj/E3Lg58wZ27LEI91+Ns9lj+unK6xYTEcxdAFOXI="; + vendorHash = "sha256-pCP5PxxOLlqQBmqufpo6G69v4M+NxMpTlIUY6TnclVA="; + + proxyVendor = true; # darwin/linux hash mismatch doCheck = false; diff --git a/pkgs/applications/networking/cluster/hubble/default.nix b/pkgs/applications/networking/cluster/hubble/default.nix index f678343834d45..eba0454425812 100644 --- a/pkgs/applications/networking/cluster/hubble/default.nix +++ b/pkgs/applications/networking/cluster/hubble/default.nix @@ -1,14 +1,14 @@ -{ stdenv, lib, buildGoModule, fetchFromGitHub, installShellFiles }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "hubble"; - version = "0.13.5"; + version = "0.13.6"; src = fetchFromGitHub { owner = "cilium"; repo = pname; rev = "v${version}"; - sha256 = "sha256-0NApMqLjeYOMxEI8tY2zLxccuSD5nHUGNsya+26ghDY="; + sha256 = "sha256-evtXuVcaKKuAW+04S+IADKf+wJ1MrnGpHLNUbxWd9ZM="; }; vendorHash = null; diff --git a/pkgs/applications/networking/cluster/istioctl/default.nix b/pkgs/applications/networking/cluster/istioctl/default.nix index a4cba0629e6b2..c624489084180 100644 --- a/pkgs/applications/networking/cluster/istioctl/default.nix +++ b/pkgs/applications/networking/cluster/istioctl/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "istioctl"; - version = "1.22.1"; + version = "1.23.1"; src = fetchFromGitHub { owner = "istio"; repo = "istio"; rev = version; - hash = "sha256-KU0AvGecEvbkQ6PSjCMxpisx5UsFr1gLYXL4GzJ6zrU="; + hash = "sha256-ksTtjPzEY//JMLKzTMqkeqZqD92euvqV0iXziYQvFGg="; }; - vendorHash = "sha256-arY8RLlHCPgRWnk6LLXlORiLr7afJj4OhfPMA+9UQ0M="; + vendorHash = "sha256-4zNPI5tefOgLwbzxRM9NS/szlUjGo2BiruqP92qmwBU="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/jx/default.nix b/pkgs/applications/networking/cluster/jx/default.nix index 7fe23d3709200..9bb95b36dad0c 100644 --- a/pkgs/applications/networking/cluster/jx/default.nix +++ b/pkgs/applications/networking/cluster/jx/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "jx"; - version = "3.10.150"; + version = "3.10.155"; src = fetchFromGitHub { owner = "jenkins-x"; repo = "jx"; rev = "v${version}"; - sha256 = "sha256-Zck06wbe+hLbecFnfY/udi1s712ilt7j0EdoumohOEI="; + sha256 = "sha256-9dRYPeVWwJCbxkjPVI0B4FLaFNHRyGIdKd/ubJbP9tI="; }; vendorHash = "sha256-AIaZVkWdNj1Vsrv2k4B5lLE0lOFuiTD7lwS/DikmC14="; @@ -33,7 +33,7 @@ buildGoModule rec { passthru.updateScript = nix-update-script { }; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Command line tool for installing and using Jenkins X"; mainProgram = "jx"; homepage = "https://jenkins-x.io"; diff --git a/pkgs/applications/networking/cluster/k0sctl/default.nix b/pkgs/applications/networking/cluster/k0sctl/default.nix index 86516de274192..94667e40d3a48 100644 --- a/pkgs/applications/networking/cluster/k0sctl/default.nix +++ b/pkgs/applications/networking/cluster/k0sctl/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "k0sctl"; - version = "0.18.0"; + version = "0.19.0"; src = fetchFromGitHub { owner = "k0sproject"; repo = pname; rev = "v${version}"; - hash = "sha256-bFNlNNc5PGim2yCX8YmWzPp1EzMrsSF3d/E+mf9Pw20="; + hash = "sha256-86MLQdXc10bvDFeq3ImD19ytjVPVD19eJzicIo6oJZc="; }; - vendorHash = "sha256-pKvb7pKuGfa8Y+FvLwyWcYuuSszLin2+jFCQ7cPkkwQ="; + vendorHash = "sha256-eKim5F8bKC1UOY+lOo0NSHOzXuMOcnBjkjm3/vDkGEM="; ldflags = [ "-s" diff --git a/pkgs/applications/networking/cluster/k3d/default.nix b/pkgs/applications/networking/cluster/k3d/default.nix index 2731e237d45fa..37c256b714b07 100644 --- a/pkgs/applications/networking/cluster/k3d/default.nix +++ b/pkgs/applications/networking/cluster/k3d/default.nix @@ -15,16 +15,17 @@ let in buildGoModule rec { pname = "k3d"; - version = "5.6.0"; + version = "5.7.4"; src = fetchFromGitHub { owner = "k3d-io"; repo = "k3d"; rev = "refs/tags/v${version}"; - hash = "sha256-KIYwuDPkxhtQy989XW+DcI5NJPhfLP07mYUFc180Sdw="; + hash = "sha256-z+7yeX0ea/6+4aWbA5NYW/HzvVcJiSkewOvo+oXp9bE="; }; - vendorHash = null; + vendorHash = "sha256-lFmIRtkUiohva2Vtg4AqHaB5McVOWW5+SFShkNqYVZ8="; + deleteVendor = true; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/k3s/1_28/images-versions.json b/pkgs/applications/networking/cluster/k3s/1_28/images-versions.json new file mode 100644 index 0000000000000..04c0f6616107f --- /dev/null +++ b/pkgs/applications/networking/cluster/k3s/1_28/images-versions.json @@ -0,0 +1,18 @@ +{ + "airgap-images-amd64": { + "url": "https://github.com/k3s-io/k3s/releases/download/v1.28.13%2Bk3s1/k3s-airgap-images-amd64.tar.zst", + "sha256": "1v3vyrb86xijyvljs0s0skhxpjbarjqg2sx9m40332dfq9din7xq" + }, + "airgap-images-arm": { + "url": "https://github.com/k3s-io/k3s/releases/download/v1.28.13%2Bk3s1/k3s-airgap-images-arm.tar.zst", + "sha256": "0yifpx6vix5bjzkz81i5rsn89hkpp0rhk77ndl1lgy66pq4csbmm" + }, + "airgap-images-arm64": { + "url": "https://github.com/k3s-io/k3s/releases/download/v1.28.13%2Bk3s1/k3s-airgap-images-arm64.tar.zst", + "sha256": "1p8zf47pghhjqhrcvmzdbcfxxy78pjpqwvmhm3wdidsa8xyy375a" + }, + "images-list": { + "url": "https://github.com/k3s-io/k3s/releases/download/v1.28.13%2Bk3s1/k3s-images.txt", + "sha256": "1f1d33jn4g5b6zmzdzzm4ffwfrmjwh60v9gnph0ysxjwsq1k0pxp" + } +} diff --git a/pkgs/applications/networking/cluster/k3s/1_28/versions.nix b/pkgs/applications/networking/cluster/k3s/1_28/versions.nix index 1778aa32efa90..9128fbda8dfbd 100644 --- a/pkgs/applications/networking/cluster/k3s/1_28/versions.nix +++ b/pkgs/applications/networking/cluster/k3s/1_28/versions.nix @@ -1,14 +1,15 @@ { - k3sVersion = "1.28.10+k3s1"; - k3sCommit = "a4c5612ea3dd202135e7c691c534c671a7d43690"; - k3sRepoSha256 = "00r06kc98nvbmaai8m2pbqsl0v6y3kbc3rz3l7lb9wy4qhiyxrww"; - k3sVendorHash = "sha256-8PbpjPVX+Yimhwbydu9YOTIMRTf/iLG21Ee/QMowp5Y="; + k3sVersion = "1.28.13+k3s1"; + k3sCommit = "47737e1c4c941325574e8aa14e4a3af2e596f696"; + k3sRepoSha256 = "1x66n36lxcvi5d9bdz0f1w2p24493rh3vbk1pskqd1f3v3fbv7kn"; + k3sVendorHash = "sha256-/knBr0l7dZ6lX9QpohyPNrFEi4WQpNM01zOE5bCIB2E="; chartVersions = import ./chart-versions.nix; - k3sRootVersion = "0.12.2"; - k3sRootSha256 = "1gjynvr350qni5mskgm7pcc7alss4gms4jmkiv453vs8mmma9c9k"; + imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json); + k3sRootVersion = "0.14.0"; + k3sRootSha256 = "15cs9faw3jishsb5nhgmb5ldjc47hkwf7hz2126fp8ahf80m0fcl"; k3sCNIVersion = "1.4.0-k3s2"; k3sCNISha256 = "17dg6jgjx18nrlyfmkv14dhzxsljz4774zgwz5dchxcf38bvarqa"; - containerdVersion = "1.7.15-k3s1"; - containerdSha256 = "18hlj4ixjk7wvamfd66xyc0cax2hs9s7yjvlx52afxdc73194y0f"; + containerdVersion = "1.7.20-k3s2.28"; + containerdSha256 = "0jqqa9202d94qd7g8d5zy161snlsc42cdjpmp50w4j3pnp2i1cki"; criCtlVersion = "1.26.0-rc.0-k3s1"; } diff --git a/pkgs/applications/networking/cluster/k3s/1_29/images-versions.json b/pkgs/applications/networking/cluster/k3s/1_29/images-versions.json new file mode 100644 index 0000000000000..ac4b6556128dd --- /dev/null +++ b/pkgs/applications/networking/cluster/k3s/1_29/images-versions.json @@ -0,0 +1,18 @@ +{ + "airgap-images-amd64": { + "url": "https://github.com/k3s-io/k3s/releases/download/v1.29.8%2Bk3s1/k3s-airgap-images-amd64.tar.zst", + "sha256": "1v3vyrb86xijyvljs0s0skhxpjbarjqg2sx9m40332dfq9din7xq" + }, + "airgap-images-arm": { + "url": "https://github.com/k3s-io/k3s/releases/download/v1.29.8%2Bk3s1/k3s-airgap-images-arm.tar.zst", + "sha256": "0yifpx6vix5bjzkz81i5rsn89hkpp0rhk77ndl1lgy66pq4csbmm" + }, + "airgap-images-arm64": { + "url": "https://github.com/k3s-io/k3s/releases/download/v1.29.8%2Bk3s1/k3s-airgap-images-arm64.tar.zst", + "sha256": "1p8zf47pghhjqhrcvmzdbcfxxy78pjpqwvmhm3wdidsa8xyy375a" + }, + "images-list": { + "url": "https://github.com/k3s-io/k3s/releases/download/v1.29.8%2Bk3s1/k3s-images.txt", + "sha256": "1f1d33jn4g5b6zmzdzzm4ffwfrmjwh60v9gnph0ysxjwsq1k0pxp" + } +} diff --git a/pkgs/applications/networking/cluster/k3s/1_29/versions.nix b/pkgs/applications/networking/cluster/k3s/1_29/versions.nix index e06f394df94a0..fd5654980afd8 100644 --- a/pkgs/applications/networking/cluster/k3s/1_29/versions.nix +++ b/pkgs/applications/networking/cluster/k3s/1_29/versions.nix @@ -1,14 +1,15 @@ { - k3sVersion = "1.29.5+k3s1"; - k3sCommit = "4e53a32306759581f4ed938bcd18b6fa20b83230"; - k3sRepoSha256 = "169hzl23chs4qblicmqj3j10jg1xdq8s9717bd3pzx7wzz9s9mqw"; - k3sVendorHash = "sha256-QreiB4JMtfBjHlkAyflQAW2rnfgay62UD6emx8TgUpM="; + k3sVersion = "1.29.8+k3s1"; + k3sCommit = "33fdc35dd67cf6c07989327e992fd26ed89b2449"; + k3sRepoSha256 = "0ky5f039nkhdj6y5v9yr6lk875l29c67j6kqc2dzdb3iqbwskcbr"; + k3sVendorHash = "sha256-VxVGBvpeKf/nuw09Llf85d4P8oCD2GvD1f0Mxt6fMj8="; chartVersions = import ./chart-versions.nix; - k3sRootVersion = "0.13.0"; - k3sRootSha256 = "1jq5f0lm08abx5ikarf92z56fvx4kjpy2nmzaazblb34lajw87vj"; + imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json); + k3sRootVersion = "0.14.0"; + k3sRootSha256 = "15cs9faw3jishsb5nhgmb5ldjc47hkwf7hz2126fp8ahf80m0fcl"; k3sCNIVersion = "1.4.0-k3s2"; k3sCNISha256 = "17dg6jgjx18nrlyfmkv14dhzxsljz4774zgwz5dchxcf38bvarqa"; - containerdVersion = "1.7.15-k3s1"; - containerdSha256 = "18hlj4ixjk7wvamfd66xyc0cax2hs9s7yjvlx52afxdc73194y0f"; + containerdVersion = "1.7.20-k3s1"; + containerdSha256 = "12ihr3z8vcglv5b0v9ris29zkkkdvjbcp3bf7ym71a0xdbg83s8i"; criCtlVersion = "1.29.0-k3s1"; } diff --git a/pkgs/applications/networking/cluster/k3s/1_30/images-versions.json b/pkgs/applications/networking/cluster/k3s/1_30/images-versions.json new file mode 100644 index 0000000000000..cc2e2498d6443 --- /dev/null +++ b/pkgs/applications/networking/cluster/k3s/1_30/images-versions.json @@ -0,0 +1,18 @@ +{ + "airgap-images-amd64": { + "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.4%2Bk3s1/k3s-airgap-images-amd64.tar.zst", + "sha256": "145sj4gpwdjvfv3bphpdg6db1d83bbwl0shbnsqpjizsm3ifvmm9" + }, + "airgap-images-arm": { + "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.4%2Bk3s1/k3s-airgap-images-arm.tar.zst", + "sha256": "0sdkfsjxxi5sq0nxjw7g7r1p7711l74r39y5ss12q85q4sla0m7l" + }, + "airgap-images-arm64": { + "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.4%2Bk3s1/k3s-airgap-images-arm64.tar.zst", + "sha256": "1kw85g79rywk6n3wda7ffvjhf030wwj8g3x8n73rgiprvksw4p7j" + }, + "images-list": { + "url": "https://github.com/k3s-io/k3s/releases/download/v1.30.4%2Bk3s1/k3s-images.txt", + "sha256": "1f1d33jn4g5b6zmzdzzm4ffwfrmjwh60v9gnph0ysxjwsq1k0pxp" + } +} diff --git a/pkgs/applications/networking/cluster/k3s/1_30/versions.nix b/pkgs/applications/networking/cluster/k3s/1_30/versions.nix index 23a3021875752..40e7386b38b2c 100644 --- a/pkgs/applications/networking/cluster/k3s/1_30/versions.nix +++ b/pkgs/applications/networking/cluster/k3s/1_30/versions.nix @@ -1,14 +1,15 @@ { - k3sVersion = "1.30.1+k3s1"; - k3sCommit = "80978b5b9a97908c5520c5ee51984e544e168859"; - k3sRepoSha256 = "085dmq49iwvlxpj9c528nfrvd67snkgpm5drj8ahfjv1nkjp0yy1"; - k3sVendorHash = "sha256-XtTahFaWnuHzKDI/U4d/j4C4gRxH163MCGEEM4hu/WM="; + k3sVersion = "1.30.4+k3s1"; + k3sCommit = "98262b5dee29fe5ac849a0cef90b5d50292b020b"; + k3sRepoSha256 = "1iwg7j0divbh41dx40kz69qkvscvppqb37dqvxayw3ha1yja4sq6"; + k3sVendorHash = "sha256-EovTZ3DvDqWFR9vxhtjgcZcPXVk1C0PYNCxEV5XA6wg="; chartVersions = import ./chart-versions.nix; - k3sRootVersion = "0.13.0"; - k3sRootSha256 = "1jq5f0lm08abx5ikarf92z56fvx4kjpy2nmzaazblb34lajw87vj"; + imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json); + k3sRootVersion = "0.14.0"; + k3sRootSha256 = "15cs9faw3jishsb5nhgmb5ldjc47hkwf7hz2126fp8ahf80m0fcl"; k3sCNIVersion = "1.4.0-k3s2"; k3sCNISha256 = "17dg6jgjx18nrlyfmkv14dhzxsljz4774zgwz5dchxcf38bvarqa"; - containerdVersion = "1.7.15-k3s1"; - containerdSha256 = "18hlj4ixjk7wvamfd66xyc0cax2hs9s7yjvlx52afxdc73194y0f"; + containerdVersion = "1.7.20-k3s1"; + containerdSha256 = "12ihr3z8vcglv5b0v9ris29zkkkdvjbcp3bf7ym71a0xdbg83s8i"; criCtlVersion = "1.29.0-k3s1"; } diff --git a/pkgs/applications/networking/cluster/k3s/1_31/chart-versions.nix b/pkgs/applications/networking/cluster/k3s/1_31/chart-versions.nix new file mode 100644 index 0000000000000..aaaa3d4c29700 --- /dev/null +++ b/pkgs/applications/networking/cluster/k3s/1_31/chart-versions.nix @@ -0,0 +1,10 @@ +{ + traefik-crd = { + url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-25.0.3+up25.0.0.tgz"; + sha256 = "1z693i4kd3jyf26ccnb0sxjyxadipl6k13n7jyg5v4y93fv1rpdw"; + }; + traefik = { + url = "https://k3s.io/k3s-charts/assets/traefik/traefik-25.0.3+up25.0.0.tgz"; + sha256 = "1a24qlp7c6iri72ka1i37l1lzn13xibrd26dy295z2wzr55gg7if"; + }; +} diff --git a/pkgs/applications/networking/cluster/k3s/1_31/images-versions.json b/pkgs/applications/networking/cluster/k3s/1_31/images-versions.json new file mode 100644 index 0000000000000..099ff7e3609b2 --- /dev/null +++ b/pkgs/applications/networking/cluster/k3s/1_31/images-versions.json @@ -0,0 +1,18 @@ +{ + "airgap-images-amd64": { + "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.0%2Bk3s1/k3s-airgap-images-amd64.tar.zst", + "sha256": "13pakr8nxlbqhqcz40gyjncw4bghk7x7ryb2ynmr5airspqcdrl6" + }, + "airgap-images-arm": { + "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.0%2Bk3s1/k3s-airgap-images-arm.tar.zst", + "sha256": "0vc2v89qy9gbzfbmfrdb0l5yzyprk7yma5ps0yfj60jd9av07qvh" + }, + "airgap-images-arm64": { + "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.0%2Bk3s1/k3s-airgap-images-arm64.tar.zst", + "sha256": "10ffa45pm1scavcd5cimdaw29rlc55c9i40qzh3n3451g1yqlmmk" + }, + "images-list": { + "url": "https://github.com/k3s-io/k3s/releases/download/v1.31.0%2Bk3s1/k3s-images.txt", + "sha256": "0y4x02fj1iysghq6s88wsiqfpsajrrwrg89m59qk431cii23nrza" + } +} diff --git a/pkgs/applications/networking/cluster/k3s/1_31/versions.nix b/pkgs/applications/networking/cluster/k3s/1_31/versions.nix new file mode 100644 index 0000000000000..74f2f1de05699 --- /dev/null +++ b/pkgs/applications/networking/cluster/k3s/1_31/versions.nix @@ -0,0 +1,15 @@ +{ + k3sVersion = "1.31.0+k3s1"; + k3sCommit = "34be6d96d17d8d65fda86272b62b752cb0e9c45e"; + k3sRepoSha256 = "16yzsx56jmca07jdnzjvy4pcfrvvibv987l1mzdaws1vkm3xqfnw"; + k3sVendorHash = "sha256-1uYlvGkW6n4aiUVX/2OjppczdobY/fk1ZaK6j3AEwvM="; + chartVersions = import ./chart-versions.nix; + imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json); + k3sRootVersion = "0.14.0"; + k3sRootSha256 = "15cs9faw3jishsb5nhgmb5ldjc47hkwf7hz2126fp8ahf80m0fcl"; + k3sCNIVersion = "1.4.0-k3s2"; + k3sCNISha256 = "17dg6jgjx18nrlyfmkv14dhzxsljz4774zgwz5dchxcf38bvarqa"; + containerdVersion = "1.7.20-k3s1"; + containerdSha256 = "12ihr3z8vcglv5b0v9ris29zkkkdvjbcp3bf7ym71a0xdbg83s8i"; + criCtlVersion = "1.31.0-k3s2"; +} diff --git a/pkgs/applications/networking/cluster/k3s/builder.nix b/pkgs/applications/networking/cluster/k3s/builder.nix index 52754219efbfd..8d66882a8a97a 100644 --- a/pkgs/applications/networking/cluster/k3s/builder.nix +++ b/pkgs/applications/networking/cluster/k3s/builder.nix @@ -12,6 +12,8 @@ lib: # Based on the traefik charts here: https://github.com/k3s-io/k3s/blob/d71ab6317e22dd34673faa307a412a37a16767f6/scripts/download#L29-L32 # see also https://github.com/k3s-io/k3s/blob/d71ab6317e22dd34673faa307a412a37a16767f6/manifests/traefik.yaml#L8 chartVersions, + # Air gap container images that are released as assets with every k3s release + imagesVersions, # taken from ./scripts/version.sh VERSION_CNIPLUGINS https://github.com/k3s-io/k3s/blob/v1.23.3%2Bk3s1/scripts/version.sh#L45 k3sCNIVersion, k3sCNISha256 ? lib.fakeHash, @@ -30,41 +32,42 @@ lib: # It is likely we will have to split out additional builders for additional # versions in the future, or customize this one further. { - lib, - makeWrapper, - socat, - iptables, - iproute2, - ipset, + bash, bridge-utils, btrfs-progs, - conntrack-tools, buildGoModule, - runc, - rsync, - kmod, - libseccomp, - pkg-config, + conntrack-tools, + coreutils, ethtool, - util-linux, fetchFromGitHub, + fetchgit, fetchurl, fetchzip, - fetchgit, - zstd, - yq-go, - sqlite, + findutils, + gnugrep, + gnused, + go, + iproute2, + ipset, + iptables, + kmod, + lib, + libseccomp, + makeWrapper, nixosTests, + pkg-config, pkgsBuildBuild, - go, - runCommand, - bash, procps, - coreutils, - gnugrep, - findutils, - gnused, + rsync, + runc, + runCommand, + socat, + sqlite, + stdenv, systemd, + util-linux, + yq-go, + zstd, }: # k3s is a kinda weird derivation. One of the main points of k3s is the @@ -88,18 +91,12 @@ lib: # make sure they're in the path if desired. let - baseMeta = with lib; { + baseMeta = { description = "Lightweight Kubernetes distribution"; - license = licenses.asl20; + license = lib.licenses.asl20; homepage = "https://k3s.io"; - maintainers = with maintainers; [ - euank - mic92 - superherointj - wrmilling - yajo - ]; - platforms = platforms.linux; + maintainers = lib.teams.k3s.members; + platforms = lib.platforms.linux; # resolves collisions with other installations of kubectl, crictl, ctr # prefer non-k3s versions @@ -128,6 +125,39 @@ let traefikChart = fetchurl chartVersions.traefik; traefik-crdChart = fetchurl chartVersions.traefik-crd; + mutFirstChar = + f: s: + let + firstChar = f (lib.substring 0 1 s); + rest = lib.substring 1 (-1) s; + in + firstChar + rest; + + kebabToCamel = + s: + mutFirstChar lib.toLower (lib.concatMapStrings (mutFirstChar lib.toUpper) (lib.splitString "-" s)); + + # finds the images archive for the desired architecture, aborts in case no suitable archive is found + findImagesArchive = + arch: + let + imagesVersionsNames = builtins.attrNames imagesVersions; + in + lib.findFirst ( + n: lib.hasInfix arch n + ) (abort "k3s: no airgap images for ${arch} available") imagesVersionsNames; + + # a shortcut that provides the images archive for the host platform. Currently only supports + # aarch64 (arm64) and x86_64 (amd64), aborts on other architectures. + airgapImages = fetchurl ( + if stdenv.hostPlatform.isAarch64 then + imagesVersions.${findImagesArchive "arm64"} + else if stdenv.hostPlatform.isx86_64 then + imagesVersions.${findImagesArchive "amd64"} + else + abort "k3s: airgap images cannot be found automatically for architecture ${stdenv.hostPlatform.linuxArch}, consider using an image archive with an explicit architecture." + ); + # so, k3s is a complicated thing to package # This derivation attempts to avoid including any random binaries from the # internet. k3s-root is _mostly_ binaries built to be bundled in k3s (which @@ -181,7 +211,7 @@ let sed --quiet '/# --- run the install process --/q;p' ${k3sRepo}/install.sh > install.sh # Let killall expect "containerd-shim" in the Nix store - to_replace="k3s/data/\[\^/\]\*/bin/containerd-shim" + to_replace="/data/\[\^/\]\*/bin/containerd-shim" replacement="/nix/store/.*k3s-containerd.*/bin/containerd-shim" changes=$(sed -i "s|$to_replace|$replacement| w /dev/stdout" install.sh) if [ -z "$changes" ]; then @@ -373,6 +403,7 @@ buildGoModule rec { # https://github.com/NixOS/nixpkgs/pull/158089#discussion_r799965694 # So, why do we use buildGoModule at all? For the `vendorHash` / `go mod download` stuff primarily. buildPhase = '' + runHook preBuild patchShebangs ./scripts/package-cli ./scripts/download ./scripts/build-upload # copy needed 'go generate' inputs into place @@ -393,12 +424,14 @@ buildGoModule rec { ./scripts/package-cli mkdir -p $out/bin + runHook postBuild ''; # Otherwise it depends on 'getGoDirs', which is normally set in buildPhase doCheck = false; installPhase = '' + runHook preInstall # wildcard to match the arm64 build too install -m 0755 dist/artifacts/k3s* -D $out/bin/k3s wrapProgram $out/bin/k3s \ @@ -410,26 +443,36 @@ buildGoModule rec { install -m 0755 ${k3sKillallSh} -D $out/bin/k3s-killall.sh wrapProgram $out/bin/k3s-killall.sh \ --prefix PATH : ${lib.makeBinPath (k3sRuntimeDeps ++ k3sKillallDeps)} + runHook postInstall ''; doInstallCheck = true; installCheckPhase = '' + runHook preInstallCheck $out/bin/k3s --version | grep -F "v${k3sVersion}" >/dev/null + runHook postInstallCheck ''; - passthru.updateScript = updateScript; - - passthru.mkTests = - version: - let - k3s_version = "k3s_" + lib.replaceStrings [ "." ] [ "_" ] (lib.versions.majorMinor version); - in + passthru = { - etcd = nixosTests.k3s.etcd.${k3s_version}; - single-node = nixosTests.k3s.single-node.${k3s_version}; - multi-node = nixosTests.k3s.multi-node.${k3s_version}; - }; - passthru.tests = passthru.mkTests k3sVersion; + inherit airgapImages; + k3sCNIPlugins = k3sCNIPlugins; + k3sContainerd = k3sContainerd; + k3sRepo = k3sRepo; + k3sRoot = k3sRoot; + k3sServer = k3sServer; + mkTests = + version: + let + k3s_version = "k3s_" + lib.replaceStrings [ "." ] [ "_" ] (lib.versions.majorMinor version); + in + lib.mapAttrs (name: value: nixosTests.k3s.${name}.${k3s_version}) nixosTests.k3s; + tests = passthru.mkTests k3sVersion; + updateScript = updateScript; + } + // (lib.mapAttrs' ( + name: _: lib.nameValuePair (kebabToCamel name) (fetchurl imagesVersions.${name}) + ) imagesVersions); meta = baseMeta; } diff --git a/pkgs/applications/networking/cluster/k3s/default.nix b/pkgs/applications/networking/cluster/k3s/default.nix index c8e3fbc926961..59fd6b1be344e 100644 --- a/pkgs/applications/networking/cluster/k3s/default.nix +++ b/pkgs/applications/networking/cluster/k3s/default.nix @@ -43,4 +43,14 @@ in ]; } ) extraArgs; + + k3s_1_31 = common ( + (import ./1_31/versions.nix) + // { + updateScript = [ + ./update-script.sh + "31" + ]; + } + ) extraArgs; } diff --git a/pkgs/applications/networking/cluster/k3s/docs/ONBOARDING_MAINTAINER.md b/pkgs/applications/networking/cluster/k3s/docs/ONBOARDING_MAINTAINER.md new file mode 100644 index 0000000000000..1b43e4d5712a9 --- /dev/null +++ b/pkgs/applications/networking/cluster/k3s/docs/ONBOARDING_MAINTAINER.md @@ -0,0 +1,45 @@ +# Onboarding Maintainer + +Anyone willing can become a maintainer, no pre-requisite knowledge is required. Willingness to learn is enough. + +A K3s maintainer, maintains K3s's: + +- [documentation](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/networking/cluster/k3s/README.md) +- [issues](https://github.com/NixOS/nixpkgs/issues?q=is%3Aissue+is%3Aopen+k3s) +- [pull requests](https://github.com/NixOS/nixpkgs/pulls?q=is%3Aopen+is%3Apr+label%3A%226.topic%3A+k3s%22) +- [NixOS tests](https://github.com/NixOS/nixpkgs/tree/master/nixos/tests/k3s) +- [NixOS service module](https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/services/cluster/k3s/default.nix) +- [update script](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/networking/cluster/k3s/update-script.sh) (the process of updating) +- updates (the act of updating) and [r-ryantm bot logs](https://r.ryantm.com/log/k3s/) +- deprecations +- CVEs +- NixOS releases +- dependencies (runc, containerd, ipset) + +Anything that is due, basically. + +As a maintainer, feel free to improve anything and everything at your discretion. Meaning, at your pace and according to your capabilities and interests. + +Only consensus is required to move forward any proposal. Consensus meaning the approval of others. + +If you cause a regression (we've all been there), you are responsible for fixing it, but in case you can't fix it (it happens), feel free to ask for help. That's fine, just let us know. + +To merge code, you need to be a committer, or use the merge-bot, but currently the merge-bot only works for packages located at `pkgs/by-name/`, which means, K3s still need to be migrated there before you can use merge-bot for merging. As a non-committer, once you have approved a PR you need to forward the request to a committer. For deciding which committer, give preference initially to K3s committers, but any committer can commit. A committer usually has a green approval in PRs. + +K3s's committers currently are: marcusramberg, Mic92. + +@euank is often silent but still active and has always handled anything dreadful, internal parts of K3s/Kubernetes or architecture things, he initially packaged K3s for nixpkgs, think of him as a last resort, when we fail to accomplish a fix, he comes to rescue us from ourselves. + +@mic92 stepped up when @superherointj stepped down a time ago, as Mic92 has a broad responsibility in nixpkgs (he is responsible for far too many things already, nixpkgs-reviews, sops-nix, release manager, bot-whatever), we avoid giving him chore work for `nixos-unstable`, only pick him as committer last. As Mic92 runs K3s in a `nixos-stable` setting, he might help in testing stable backports. + +On how to handle requests, it's the usual basics, such as, when reviewing PRs, issues, be welcoming, helpful, provide hints whenever possible, try to move things forward, assume good will, ignore [as don't react to] any negativity [since it spirals badly], delay and sort any (severe) disagreement in private. Even on disagrements, be thankful to people for their dedicated time, no matter what happens. In essence, on any unfortunate event, **always put people over code**. + +Dumbshit happens, we make mistakes, the CI, reviews, fellow maintainers are there to nudge us on a better direction, no need to over think interactions, if a problem happens, we'll handle it. + +We should optimize for maintainers satisfaction, because it is maintainers that make the service great. The best kind of win we have is when someone new steps up for being a maintainer. This multiplies our capabilities of doing meaningful work and increases our knowledge pool. + +Know that your participation matters most for us. And we thank you for stepping up. It's good to have you here! + +We welcome you and wish you the best in this new journey! + +K3s Maintainers diff --git a/pkgs/applications/networking/cluster/k3s/docs/USAGE.md b/pkgs/applications/networking/cluster/k3s/docs/USAGE.md index 27c5963bd0b8f..326118e1712ae 100644 --- a/pkgs/applications/networking/cluster/k3s/docs/USAGE.md +++ b/pkgs/applications/networking/cluster/k3s/docs/USAGE.md @@ -15,7 +15,7 @@ services.k3s.enable = true; services.k3s.role = "server"; services.k3s.extraFlags = toString [ - # "--kubelet-arg=v=4" # Optionally add additional args to k3s + # "--debug" # Optionally add additional args to k3s ]; } ``` diff --git a/pkgs/applications/networking/cluster/k3s/docs/VERSIONING.md b/pkgs/applications/networking/cluster/k3s/docs/VERSIONING.md index c1347b1f861e3..191af0058453a 100644 --- a/pkgs/applications/networking/cluster/k3s/docs/VERSIONING.md +++ b/pkgs/applications/networking/cluster/k3s/docs/VERSIONING.md @@ -11,7 +11,7 @@ afoul of the upstream version skew policy. ## Patch Release Support Lifecycle -K3s is built on top of K8s and typically provides a similar release cadence and support window (simply by cherry-picking over k8s patches). As such, we assume k3s's support lifecycle is identical to upstream K8s. The upstream K8s release and support lifecycle, including maintenance and end-of-life dates for current releases, is documented [on their suppport site](https://kubernetes.io/releases/patch-releases/#support-period). A more tabular view of the current support timeline can also be found on [endoflife.date](https://endoflife.date/kubernetes). +K3s is built on top of K8s and typically provides a similar release cadence and support window (simply by cherry-picking over k8s patches). As such, we assume k3s's support lifecycle is identical to upstream K8s. The upstream K8s release and support lifecycle, including maintenance and end-of-life dates for current releases, is documented [on their support site](https://kubernetes.io/releases/patch-releases/#support-period). A more tabular view of the current support timeline can also be found on [endoflife.date](https://endoflife.date/kubernetes). In short, a new Kubernetes version is released roughly every 4 months and each release is supported for a little over 1 year. diff --git a/pkgs/applications/networking/cluster/k3s/update-script.sh b/pkgs/applications/networking/cluster/k3s/update-script.sh index ca7d21bff4781..ac451806ff663 100755 --- a/pkgs/applications/networking/cluster/k3s/update-script.sh +++ b/pkgs/applications/networking/cluster/k3s/update-script.sh @@ -69,6 +69,24 @@ cat > chart-versions.nix.update <<EOF EOF mv chart-versions.nix.update chart-versions.nix +# Get all airgap images files associated with this release +IMAGES_ARCHIVES=$(curl "https://api.github.com/repos/k3s-io/k3s/releases/tags/v${K3S_VERSION}" | \ + # Filter the assets so that only zstd archives and text files that have "images" in their name remain + # Modify the name and write the modified name and download URL to a string + jq -r '.assets[] | select(.name | contains("images")) | + select(.content_type == "application/zstd" or .content_type == "text/plain; charset=utf-8") | + .name = (.name | sub("k3s-"; "") | sub(".tar.zst"; "") | sub(".txt"; "-list")) | + "\(.name) \(.browser_download_url)"') + +# Create a JSON object for each airgap images file and prefetch all download URLs in the process +# Combine all JSON objects and write the result to images-versions.json +while read -r name url; do + jq --null-input --arg name "$name" \ + --arg url "$url" \ + --arg sha256 "$(nix-prefetch-url --quiet "${url}")" \ + '{$name: {"url": $url, "sha256": $sha256}}' +done <<<"${IMAGES_ARCHIVES}" | jq --slurp 'reduce .[] as $item ({}; . * $item)' > images-versions.json + FILE_GO_MOD=${WORKDIR}/go.mod curl --silent https://raw.githubusercontent.com/k3s-io/k3s/${K3S_COMMIT}/go.mod > $FILE_GO_MOD @@ -89,7 +107,13 @@ CONTAINERD_VERSION=$(grep github.com/containerd/containerd ${FILE_GO_MOD} \ CONTAINERD_SHA256=$(nix-prefetch-url --quiet --unpack \ "https://github.com/k3s-io/containerd/archive/refs/tags/v${CONTAINERD_VERSION}.tar.gz") -CRI_CTL_VERSION=$(grep github.com/kubernetes-sigs/cri-tools ${FILE_GO_MOD} \ +# The repository of "cri-tools" changes for 1.31.x, this can likely be removed in future releases +if [ "$MINOR_VERSION" -gt 30 ]; then + CRI_CTL_REPO=sigs.k8s.io +else + CRI_CTL_REPO=github.com/kubernetes-sigs +fi +CRI_CTL_VERSION=$(grep "$CRI_CTL_REPO/cri-tools" ${FILE_GO_MOD} \ | head -n1 | awk '{print $4}' | sed -e 's/"//g' -e 's/^v//') setKV () { @@ -105,6 +129,7 @@ cat >versions.nix <<EOF k3sRepoSha256 = "${K3S_REPO_SHA256}"; k3sVendorHash = "${FAKE_HASH}"; chartVersions = import ./chart-versions.nix; + imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json); k3sRootVersion = "${K3S_ROOT_VERSION}"; k3sRootSha256 = "${K3S_ROOT_SHA256}"; k3sCNIVersion = "${CNIPLUGINS_VERSION}"; diff --git a/pkgs/applications/networking/cluster/k9s/default.nix b/pkgs/applications/networking/cluster/k9s/default.nix index c83566170d0f3..5bd085f2bb59d 100644 --- a/pkgs/applications/networking/cluster/k9s/default.nix +++ b/pkgs/applications/networking/cluster/k9s/default.nix @@ -19,14 +19,14 @@ buildGoModule rec { "-X github.com/derailed/k9s/cmd.date=1970-01-01T00:00:00Z" ]; - tags = [ "netgo" ]; + tags = [ "netcgo" ]; proxyVendor = true; vendorHash = "sha256-U/tIsYpoog3S8V2yQGGqaQ+Av7TfvCYt3zn74qWuQKs="; # TODO investigate why some config tests are failing - doCheck = !(stdenv.isDarwin && stdenv.isAarch64); + doCheck = !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64); # Required to workaround test check error: preCheck = "export HOME=$(mktemp -d)"; # For arch != x86 diff --git a/pkgs/applications/networking/cluster/kaniko/default.nix b/pkgs/applications/networking/cluster/kaniko/default.nix index 22875f86c161c..2d9136484e220 100644 --- a/pkgs/applications/networking/cluster/kaniko/default.nix +++ b/pkgs/applications/networking/cluster/kaniko/default.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "kaniko"; - version = "1.23.1"; + version = "1.23.2"; src = fetchFromGitHub { owner = "GoogleContainerTools"; repo = "kaniko"; rev = "v${version}"; - hash = "sha256-0FHhyUPZFddruZ3YV5SYB0b/bb0C+IVQpgIRaCoA1z8="; + hash = "sha256-8SLE9s+P6Xh4PzrvTwUtIAtkG9Gor/fGBwrqq/fz0UM="; }; vendorHash = null; diff --git a/pkgs/applications/networking/cluster/kluctl/default.nix b/pkgs/applications/networking/cluster/kluctl/default.nix deleted file mode 100644 index 7f8664fd81741..0000000000000 --- a/pkgs/applications/networking/cluster/kluctl/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, testers, kluctl }: - -buildGoModule rec { - pname = "kluctl"; - version = "2.22.1"; - - src = fetchFromGitHub { - owner = "kluctl"; - repo = "kluctl"; - rev = "v${version}"; - hash = "sha256-s7ADEWy3wx2hGeJzfXPVSBv+bAOoOQPsF75Sq02T/AI="; - }; - - subPackages = [ "cmd" ]; - - vendorHash = "sha256-EEOVd15f1SK8InSIG+TuVwWibkf+ePJ5AGZpiMD+RaQ="; - - ldflags = [ "-s" "-w" "-X main.version=v${version}" ]; - - # Depends on docker - doCheck = false; - - passthru.tests.version = testers.testVersion { - package = kluctl; - version = "v${version}"; - }; - - postInstall = '' - mv $out/bin/{cmd,kluctl} - ''; - - meta = with lib; { - description = "Missing glue to put together large Kubernetes deployments"; - mainProgram = "kluctl"; - homepage = "https://kluctl.io/"; - license = licenses.asl20; - maintainers = with maintainers; [ sikmir netthier ]; - }; -} diff --git a/pkgs/applications/networking/cluster/kn/default.nix b/pkgs/applications/networking/cluster/kn/default.nix index 5f7f7ad160b99..8fbf21bb2d94c 100644 --- a/pkgs/applications/networking/cluster/kn/default.nix +++ b/pkgs/applications/networking/cluster/kn/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kn"; - version = "1.14.0"; + version = "1.15.0"; src = fetchFromGitHub { owner = "knative"; repo = "client"; rev = "knative-v${version}"; - sha256 = "sha256-sUMQrBAOhpMxMawOdvLFSUrcU9od6pmT7NabSywoQn8="; + sha256 = "sha256-bXICU1UBNPVIumzRPSOWa1I5hUYWEvo6orBpUvbPEvg="; }; vendorHash = null; diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix index 5fa09dcb2ce41..fd19982b9502a 100644 --- a/pkgs/applications/networking/cluster/kops/default.nix +++ b/pkgs/applications/networking/cluster/kops/default.nix @@ -49,12 +49,6 @@ in rec { mkKops = generic; - kops_1_26 = mkKops rec { - version = "1.26.6"; - sha256 = "sha256-qaehvPgB3phZl/K577hig4G4RxAUi6Im94vXP5ctnWM="; - rev = "v${version}"; - }; - kops_1_27 = mkKops rec { version = "1.27.1"; sha256 = "sha256-WV+0380yj8GHckY4PDM3WspbZ/YuYZOAQEMd2ygEOjo="; @@ -62,14 +56,20 @@ rec { }; kops_1_28 = mkKops rec { - version = "1.28.5"; - sha256 = "sha256-spw3lTrp6RlxkTNoZ/3Yz/U2tdvBnwiYORS2QtOSX9k="; + version = "1.28.7"; + sha256 = "sha256-rTf7+w/o8MGSBKV9wCzZOEI0v31exZhOJpRABeF/KyI="; rev = "v${version}"; }; kops_1_29 = mkKops rec { - version = "1.29.0"; - sha256 = "sha256-YneB9pc4IR+tYPRFE5CS+4JK/kPOHMo5/70A3k1x1tg="; + version = "1.29.2"; + sha256 = "sha256-SRj0x9N+yfTG/UL/hu1ds46Zt6d5SUYU0PA9lPHO6jQ="; + rev = "v${version}"; + }; + + kops_1_30 = mkKops rec { + version = "1.30.1"; + sha256 = "sha256-aj2OnjkXlBEH830RoJiAlhiFfS1zjVoX38PrsgAaB7A="; rev = "v${version}"; }; } diff --git a/pkgs/applications/networking/cluster/kpt/default.nix b/pkgs/applications/networking/cluster/kpt/default.nix index d7aa86fd7d39e..ccccec1c8562a 100644 --- a/pkgs/applications/networking/cluster/kpt/default.nix +++ b/pkgs/applications/networking/cluster/kpt/default.nix @@ -23,6 +23,6 @@ buildGoModule rec { homepage = "https://googlecontainertools.github.io/kpt/"; license = licenses.asl20; maintainers = with maintainers; [ mikefaille ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/applications/networking/cluster/krane/Gemfile.lock b/pkgs/applications/networking/cluster/krane/Gemfile.lock index 748de3d620c8b..a1912256547da 100644 --- a/pkgs/applications/networking/cluster/krane/Gemfile.lock +++ b/pkgs/applications/networking/cluster/krane/Gemfile.lock @@ -1,35 +1,37 @@ GEM remote: https://rubygems.org/ specs: - activesupport (7.1.3.3) + activesupport (7.2.1) base64 bigdecimal - concurrent-ruby (~> 1.0, >= 1.0.2) + concurrent-ruby (~> 1.0, >= 1.3.1) connection_pool (>= 2.2.5) drb i18n (>= 1.6, < 2) + logger (>= 1.4.2) minitest (>= 5.1) - mutex_m - tzinfo (~> 2.0) - addressable (2.8.6) - public_suffix (>= 2.0.2, < 6.0) + securerandom (>= 0.3) + tzinfo (~> 2.0, >= 2.0.5) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) base64 (0.2.0) bigdecimal (3.1.8) colorize (0.8.1) - concurrent-ruby (1.2.3) + concurrent-ruby (1.3.4) connection_pool (2.4.1) domain_name (0.6.20240107) drb (2.2.1) ejson (1.4.1) - faraday (2.9.0) - faraday-net_http (>= 2.0, < 3.2) - faraday-net_http (3.1.0) + faraday (2.11.0) + faraday-net_http (>= 2.0, < 3.4) + logger + faraday-net_http (3.3.0) net-http - ffi (1.16.3) + ffi (1.17.0) ffi-compiler (1.3.2) ffi (>= 1.15.5) rake - google-cloud-env (2.1.1) + google-cloud-env (2.2.0) faraday (>= 1.0, < 3.a) googleauth (1.11.0) faraday (>= 1.0, < 3.a) @@ -45,16 +47,16 @@ GEM http-form_data (~> 2.2) llhttp-ffi (~> 0.5.0) http-accept (1.7.0) - http-cookie (1.0.5) + http-cookie (1.0.7) domain_name (~> 0.5) http-form_data (2.3.0) i18n (1.14.5) concurrent-ruby (~> 1.0) jsonpath (1.1.5) multi_json - jwt (2.8.1) + jwt (2.8.2) base64 - krane (3.6.0) + krane (3.6.2) activesupport (>= 5.0) colorize (~> 0.8) concurrent-ruby (~> 1.1) @@ -63,9 +65,9 @@ GEM jsonpath (~> 1.0) kubeclient (~> 4.9) multi_json - statsd-instrument (>= 2.8, < 4) + statsd-instrument (>= 2.8, < 3.9) thor (>= 1.0, < 2.0) - kubeclient (4.11.0) + kubeclient (4.12.0) http (>= 3.0, < 6.0) jsonpath (~> 1.0) recursive-open-struct (~> 1.1, >= 1.1.1) @@ -73,34 +75,35 @@ GEM llhttp-ffi (0.5.0) ffi-compiler (~> 1.0) rake (~> 13.0) + logger (1.6.1) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0507) - minitest (5.23.1) + mime-types-data (3.2024.0903) + minitest (5.25.1) multi_json (1.15.0) - mutex_m (0.2.0) net-http (0.4.1) uri netrc (0.11.0) os (1.1.4) - public_suffix (5.0.5) + public_suffix (6.0.1) rake (13.2.1) - recursive-open-struct (1.1.3) + recursive-open-struct (1.2.2) rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) + securerandom (0.3.1) signet (0.19.0) addressable (~> 2.8) faraday (>= 0.17.5, < 3.a) jwt (>= 1.5, < 3.0) multi_json (~> 1.10) - statsd-instrument (3.7.0) - thor (1.3.1) + statsd-instrument (3.8.0) + thor (1.3.2) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - uri (0.13.0) + uri (0.13.1) PLATFORMS ruby @@ -109,4 +112,4 @@ DEPENDENCIES krane BUNDLED WITH - 2.5.9 + 2.5.16 diff --git a/pkgs/applications/networking/cluster/krane/gemset.nix b/pkgs/applications/networking/cluster/krane/gemset.nix index b3e79d317efb0..39b8783c3a539 100644 --- a/pkgs/applications/networking/cluster/krane/gemset.nix +++ b/pkgs/applications/networking/cluster/krane/gemset.nix @@ -1,14 +1,14 @@ { activesupport = { - dependencies = ["base64" "bigdecimal" "concurrent-ruby" "connection_pool" "drb" "i18n" "minitest" "mutex_m" "tzinfo"]; + dependencies = ["base64" "bigdecimal" "concurrent-ruby" "connection_pool" "drb" "i18n" "logger" "minitest" "securerandom" "tzinfo"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0z8kygxmz99krz9pwp947znkzf0jr64sml28df0vf1gzxlg7y57i"; + sha256 = "094cv9kxa8hwlsw3c0njkvvayd0wszcz9b6xywv4yajrg83zlmvm"; type = "gem"; }; - version = "7.1.3.3"; + version = "7.2.1"; }; addressable = { dependencies = ["public_suffix"]; @@ -16,10 +16,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0irbdwkkjwzajq1ip6ba46q49sxnrl2cw7ddkdhsfhb6aprnm3vr"; + sha256 = "0cl2qpvwiffym62z991ynks7imsm87qmgxf0yfsmlwzkgi9qcaa6"; type = "gem"; }; - version = "2.8.6"; + version = "2.8.7"; }; base64 = { groups = ["default"]; @@ -56,10 +56,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qh1b14jwbbj242klkyz5fc7npd4j0mvndz62gajhvl1l3wd7zc2"; + sha256 = "0chwfdq2a6kbj6xz9l6zrdfnyghnh32si82la1dnpa5h75ir5anl"; type = "gem"; }; - version = "1.2.3"; + version = "1.3.4"; }; connection_pool = { groups = ["default"]; @@ -102,15 +102,15 @@ version = "1.4.1"; }; faraday = { - dependencies = ["faraday-net_http"]; + dependencies = ["faraday-net_http" "logger"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qqb1rmk0f9m82iijjlqadh5yby1bhnr6svjk9vxdvh6f181988s"; + sha256 = "00pd34pnfmij5iw1xv73f6d68zng63wyjhmk7dyi010kmb4x5sp6"; type = "gem"; }; - version = "2.9.0"; + version = "2.11.0"; }; faraday-net_http = { dependencies = ["net-http"]; @@ -118,20 +118,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17w51yk4rrm9rpnbc3x509s619kba0jga3qrj4b17l30950vw9qn"; + sha256 = "0rg54k4skaz8z7j358p6pdzc9pr84fjq7sdlpicf7s5ig7vb1rlk"; type = "gem"; }; - version = "3.1.0"; + version = "3.3.0"; }; ffi = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yvii03hcgqj30maavddqamqy50h7y6xcn2wcyq72wn823zl4ckd"; + sha256 = "07139870npj59jnl8vmk39ja3gdk3fb5z9vc0lf32y2h891hwqsi"; type = "gem"; }; - version = "1.16.3"; + version = "1.17.0"; }; ffi-compiler = { dependencies = ["ffi" "rake"]; @@ -150,10 +150,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "16b9yjbrzal1cjkdbn29fl06ikjn1dpg1vdsjak1xvhpsp3vhjyg"; + sha256 = "0vlwifnhih8nq5441pfbnzc7w4z8rmy7j54pfixpm9yvlq11428j"; type = "gem"; }; - version = "2.1.1"; + version = "2.2.0"; }; googleauth = { dependencies = ["faraday" "google-cloud-env" "jwt" "multi_json" "os" "signet"]; @@ -193,10 +193,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13rilvlv8kwbzqfb644qp6hrbsj82cbqmnzcvqip1p6vqx36sxbk"; + sha256 = "0lr2yk5g5vvf9nzlmkn3p7mhh9mn55gpdc7kl2w21xs46fgkjynb"; type = "gem"; }; - version = "1.0.5"; + version = "1.0.7"; }; http-form_data = { groups = ["default"]; @@ -236,10 +236,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02m3vza49pb9dirwpn8vmzbcypi3fc6l3a9dh253jwm1121g7ajb"; + sha256 = "04mw326i9vsdcqwm4bf0zvnqw237f8l7022nhlbmak92bqqpg62s"; type = "gem"; }; - version = "2.8.1"; + version = "2.8.2"; }; krane = { dependencies = ["activesupport" "colorize" "concurrent-ruby" "ejson" "googleauth" "jsonpath" "kubeclient" "multi_json" "statsd-instrument" "thor"]; @@ -247,10 +247,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08dkvcmxa869pk6qdpsvljy16lb1kj94cgr4w9bhg93gx3m642v6"; + sha256 = "07f87rzlr0yamji5ns2isf5f554jal5b9v62lijhsafmq9545f42"; type = "gem"; }; - version = "3.6.0"; + version = "3.6.2"; }; kubeclient = { dependencies = ["http" "jsonpath" "recursive-open-struct" "rest-client"]; @@ -258,10 +258,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1k1zi27fnasqpinfxnajm81pyr11k2j510wacr53d37v97bzr1a9"; + sha256 = "1g89qd1hhf111zy9djlzblzz06pnv59zmamh6fk06wvnih7vj446"; type = "gem"; }; - version = "4.11.0"; + version = "4.12.0"; }; llhttp-ffi = { dependencies = ["ffi-compiler" "rake"]; @@ -274,6 +274,16 @@ }; version = "0.5.0"; }; + logger = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0lwncq2rf8gm79g2rcnnyzs26ma1f4wnfjm6gs4zf2wlsdz5in9s"; + type = "gem"; + }; + version = "1.6.1"; + }; mime-types = { dependencies = ["mime-types-data"]; groups = ["default"]; @@ -290,20 +300,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kybw1a6f7d1ipyawnpi5cwiy05rkz9qwglgfvhmd1z0l2gcigmm"; + sha256 = "0d5bmxcq87nj6h5rx6b1fkdzq8256yba97s2vlkszpwhc47m9rfs"; type = "gem"; }; - version = "3.2024.0507"; + version = "3.2024.0903"; }; minitest = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gkslxvkhh44s21rbjvka3zsvfxxrf5pcl6f75rv2vyrzzbgis7i"; + sha256 = "1n1akmc6bibkbxkzm1p1wmfb4n9vv397knkgz0ffykb3h1d7kdix"; type = "gem"; }; - version = "5.23.1"; + version = "5.25.1"; }; multi_json = { groups = ["default"]; @@ -315,16 +325,6 @@ }; version = "1.15.0"; }; - mutex_m = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1ma093ayps1m92q845hmpk0dmadicvifkbf05rpq9pifhin0rvxn"; - type = "gem"; - }; - version = "0.2.0"; - }; net-http = { dependencies = ["uri"]; groups = ["default"]; @@ -361,10 +361,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14y4vzjwf5gp0mqgs880kis0k7n2biq8i6ci6q2n315kichl1hvj"; + sha256 = "0vqcw3iwby3yc6avs1vb3gfd0vcp2v7q310665dvxfswmcf4xm31"; type = "gem"; }; - version = "5.0.5"; + version = "6.0.1"; }; rake = { groups = ["default"]; @@ -381,10 +381,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nnyr6qsqrcszf6c10n4zfjs8h9n67zvsmx6mp8brkigamr8llx3"; + sha256 = "1rjs8804zn5v39mklmqy65xwdji7iq598lkw876zspclziy4h2c3"; type = "gem"; }; - version = "1.1.3"; + version = "1.2.2"; }; rest-client = { dependencies = ["http-accept" "http-cookie" "mime-types" "netrc"]; @@ -397,6 +397,16 @@ }; version = "2.1.0"; }; + securerandom = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1phv6kh417vkanhssbjr960c0gfqvf8z7d3d9fd2yvd41q64bw4q"; + type = "gem"; + }; + version = "0.3.1"; + }; signet = { dependencies = ["addressable" "faraday" "jwt" "multi_json"]; groups = ["default"]; @@ -413,20 +423,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14blk2vvcmr0xycd3bzlr36nz5wn7m7ana2mljfm4zxgwx5vj7h7"; + sha256 = "1kd75axvmyq866nan18n9ys5bd140h0mka2kz9s5m86r8m42jbhj"; type = "gem"; }; - version = "3.7.0"; + version = "3.8.0"; }; thor = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vq1fjp45az9hfp6fxljhdrkv75cvbab1jfrwcw738pnsiqk8zps"; + sha256 = "1nmymd86a0vb39pzj2cwv57avdrl6pl3lf5bsz58q594kqxjkw7f"; type = "gem"; }; - version = "1.3.1"; + version = "1.3.2"; }; tzinfo = { dependencies = ["concurrent-ruby"]; @@ -444,9 +454,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "094gk72ckazf495qc76gk09b5i318d5l9m7bicg2wxlrjcm3qm96"; + sha256 = "07ndgxyhzd02cg94s6rnfhkb9rwx9z72lzk368sa9j78wc9qnbfz"; type = "gem"; }; - version = "0.13.0"; + version = "0.13.1"; }; } diff --git a/pkgs/applications/networking/cluster/krelay/default.nix b/pkgs/applications/networking/cluster/krelay/default.nix index 6c61899e7d5be..fdf8e90c0477c 100644 --- a/pkgs/applications/networking/cluster/krelay/default.nix +++ b/pkgs/applications/networking/cluster/krelay/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "krelay"; - version = "0.0.10"; + version = "0.1.2"; src = fetchFromGitHub { owner = "knight42"; repo = pname; rev = "v${version}"; - hash = "sha256-1sAkNueP8qGwPwdX0oSJfB/oGvna6+G8Cay+3vGJ2IE="; + hash = "sha256-TonkGh4j+xLGgSpspCedg6c2NpIZIzp5pv8VtWFssPk="; }; - vendorHash = "sha256-iv0OJLhIZpdem2/JFirJnvmU44ylTomgB8UqCGqHbwA="; + vendorHash = "sha256-Qz3q/503A5QmsgEaDqChxS2tcUEJGmeT6YE6R3LBbcY="; subPackages = [ "cmd/client" ]; diff --git a/pkgs/applications/networking/cluster/ktop/default.nix b/pkgs/applications/networking/cluster/ktop/default.nix index 9bc630b9ccc5f..5dce126d5057e 100644 --- a/pkgs/applications/networking/cluster/ktop/default.nix +++ b/pkgs/applications/networking/cluster/ktop/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "ktop"; - version = "0.3.5"; + version = "0.3.7"; excludedPackages = [".ci"]; src = fetchFromGitHub { owner = "vladimirvivien"; repo = pname; rev = "v${version}"; - hash = "sha256-nkIRVt2kqsE9QBYvvHmupohnzH+OBcwWwV16rMePw4I="; + hash = "sha256-oxyEkDY53HjBgjWRajlcg+8Kx092lyLkPgOJleioO7o="; }; - vendorHash = "sha256-IiAMmHOq69WMT2B1q9ZV2fGDnLr7AbRm1P7ACSde2FE="; + vendorHash = "sha256-MLIcTHWo7lsqtAqH8naSvpS013t8KBVPRbch+CfeUNk="; ldflags = [ "-s" "-w" "-X github.com/vladimirvivien/ktop/buildinfo.Version=v${version}" ]; postInstall = '' diff --git a/pkgs/applications/networking/cluster/ktunnel/default.nix b/pkgs/applications/networking/cluster/ktunnel/default.nix index f193e4d38e90c..79510ae103ce1 100644 --- a/pkgs/applications/networking/cluster/ktunnel/default.nix +++ b/pkgs/applications/networking/cluster/ktunnel/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: let version = "1.6.1"; in @@ -31,7 +31,7 @@ buildGoModule { ''; meta = with lib; { - description = "Cli that exposes your local resources to kubernetes "; + description = "Cli that exposes your local resources to kubernetes"; mainProgram = "ktunnel"; homepage = "https://github.com/omrikiei/ktunnel"; license = licenses.asl20; diff --git a/pkgs/applications/networking/cluster/kube-router/default.nix b/pkgs/applications/networking/cluster/kube-router/default.nix index 275db6bd244b6..b0219b25ca320 100644 --- a/pkgs/applications/networking/cluster/kube-router/default.nix +++ b/pkgs/applications/networking/cluster/kube-router/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kube-router"; - version = "2.1.3"; + version = "2.2.1"; src = fetchFromGitHub { owner = "cloudnativelabs"; repo = pname; rev = "v${version}"; - hash = "sha256-H+jPHf7sMrMlqLWa3L34U8nbBgqeX+MqChiuSsVdx6A="; + hash = "sha256-Pm/CrB/RxCvEhNdCyfI7kF62cxpx96Cj2zWmW0wl5wM="; }; - vendorHash = "sha256-BrpjG9DhDQSsbeJ+1MRAwXyKVULK3KHjvLydduTb024="; + vendorHash = "sha256-sIWRODIV3iJ5FdVjVwesqfbYivOlqZAvPSYa38vhCMA="; CGO_ENABLED = 0; diff --git a/pkgs/applications/networking/cluster/kubebuilder/default.nix b/pkgs/applications/networking/cluster/kubebuilder/default.nix index 284c63e23262b..3ec9e7f791137 100644 --- a/pkgs/applications/networking/cluster/kubebuilder/default.nix +++ b/pkgs/applications/networking/cluster/kubebuilder/default.nix @@ -12,16 +12,16 @@ buildGoModule rec { pname = "kubebuilder"; - version = "4.0.0"; + version = "4.2.0"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = "kubebuilder"; rev = "v${version}"; - hash = "sha256-JG2Wrq6fCE1zJmM7kXcEHIQVxv9eKV0Zy3ev5eY7Dv4="; + hash = "sha256-iWu3HnfjT9hiDyl9Ni0xJa/e+E9fbh3bnfrdE1ChaWc="; }; - vendorHash = "sha256-g9QjalRLc2NUsyd7Do1PWw9oD9ATuJGMRaqSaC6AcD0="; + vendorHash = "sha256-dMzDKYjPBAiNFwzaBML76tMylHtBs9Tb2Ulj/WovVJ4="; subPackages = ["cmd"]; diff --git a/pkgs/applications/networking/cluster/kubecm/default.nix b/pkgs/applications/networking/cluster/kubecm/default.nix index 22863c3ac14f2..494d5e5e1b2e2 100644 --- a/pkgs/applications/networking/cluster/kubecm/default.nix +++ b/pkgs/applications/networking/cluster/kubecm/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubecm"; - version = "0.29.1"; + version = "0.31.0"; src = fetchFromGitHub { owner = "sunny0826"; repo = "kubecm"; rev = "v${version}"; - hash = "sha256-Lz7mCbEEiCmNPmJ8RkxJLEOOdyvLZl3pT3qL2/kHYuA="; + hash = "sha256-Go2lroa8lq1XjIzvdA5ZL/lOjTAyDKopBepqgWzsUII="; }; - vendorHash = "sha256-JJ2B9sUrfo4fiRsxA8mBjvKP0mduIZMaGN8gFC1cTA4="; + vendorHash = "sha256-BrSYfxftrnNOcPgG/rsTF3OukDd+VlOvE7OJcos7vW4="; ldflags = [ "-s" "-w" "-X github.com/sunny0826/kubecm/version.Version=${version}"]; doCheck = false; diff --git a/pkgs/applications/networking/cluster/kubecolor/default.nix b/pkgs/applications/networking/cluster/kubecolor/default.nix index ecd24e4afbe83..f51d0a8a6af1a 100644 --- a/pkgs/applications/networking/cluster/kubecolor/default.nix +++ b/pkgs/applications/networking/cluster/kubecolor/default.nix @@ -1,20 +1,44 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub, kubectl, installShellFiles }: buildGoModule rec { pname = "kubecolor"; - version = "0.3.3"; + version = "0.4.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-VGpyYc6YmRr58OSRQvWTo4f8ku8L1/gn0ilbQSotO2k="; + sha256 = "sha256-jOFeTAfV7X8+z+DBOBOFVcspxZ8QssKFWRGK9HnqBO0="; }; - vendorHash = "sha256-Gzz+mCEMQCcLwTiGMB8/nXk7HDAEGkEapC/VOyXrn/Q="; + vendorHash = "sha256-b99HAM1vsncq9Q5XJiHZHyv7bjQs6GGyNAMONmGpxms="; ldflags = [ "-s" "-w" "-X main.Version=${version}" ]; + subPackages = [ + "." + ]; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + # kubecolor re-uses the completions of kubectl for its own executable + + installShellCompletion --cmd kubecolor \ + --bash <(${lib.getExe kubectl} completion bash) \ + --fish <(${lib.getExe kubectl} completion fish) \ + --zsh <(${lib.getExe kubectl} completion zsh) + + # https://kubecolor.github.io/setup/shells/bash/ + echo 'complete -o default -F __start_kubectl kubecolor' >> $out/share/bash-completion/completions/kubecolor.bash + + # https://kubecolor.github.io/setup/shells/fish/ + echo -e 'function kubecolor --wraps kubectl\n command kubecolor $argv\nend' >> $out/share/fish/vendor_completions.d/kubecolor.fish + + # https://kubecolor.github.io/setup/shells/zsh/ + echo 'compdef kubecolor=kubectl' >> $out/share/zsh/site-functions/_kubecolor + ''; + meta = with lib; { description = "Colorizes kubectl output"; mainProgram = "kubecolor"; diff --git a/pkgs/applications/networking/cluster/kubeconform/default.nix b/pkgs/applications/networking/cluster/kubeconform/default.nix index 4d02d170afef8..3a5b900588ae5 100644 --- a/pkgs/applications/networking/cluster/kubeconform/default.nix +++ b/pkgs/applications/networking/cluster/kubeconform/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubeconform"; - version = "0.6.6"; + version = "0.6.7"; src = fetchFromGitHub { owner = "yannh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-pE5DDtraN5ubEsM+QfY5y/dqM31VsQ3FeM/c56AJ648="; + sha256 = "sha256-Yq9lJ3rSG8v/PeofkZrnO2nzEgtyB5vtNafKabp8hnQ="; }; vendorHash = null; diff --git a/pkgs/applications/networking/cluster/kubectl-cnpg/default.nix b/pkgs/applications/networking/cluster/kubectl-cnpg/default.nix index 6aae2f8089695..157ff1358ce0b 100644 --- a/pkgs/applications/networking/cluster/kubectl-cnpg/default.nix +++ b/pkgs/applications/networking/cluster/kubectl-cnpg/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "kubectl-cnpg"; - version = "1.23.2"; + version = "1.24.0"; src = fetchFromGitHub { owner = "cloudnative-pg"; repo = "cloudnative-pg"; rev = "v${version}"; - hash = "sha256-/h2hvyjC/rHOkyZbt0kYn0TcQeXutU4rxYBD7Mh948Q="; + hash = "sha256-/BUrUksNT6KuVLxJxnBfkU9OEeQU3u7WA6pKqcGnuSU="; }; - vendorHash = "sha256-MY4yU0UpN3V3RxsFWqxZOsZZA1kma3NNTHE9e/gquno="; + vendorHash = "sha256-s1fKwWfOSgRw6eOPc1aZzf1VzaTVHXBjQWd1132vAS0="; subPackages = [ "cmd/kubectl-cnpg" ]; diff --git a/pkgs/applications/networking/cluster/kubectl-doctor/default.nix b/pkgs/applications/networking/cluster/kubectl-doctor/default.nix deleted file mode 100644 index 050192b86c9f4..0000000000000 --- a/pkgs/applications/networking/cluster/kubectl-doctor/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub, fetchpatch }: - -buildGoModule rec { - pname = "kubectl-doctor"; - version = "0.3.1"; - - src = fetchFromGitHub { - owner = "emirozer"; - repo = pname; - rev = version; - sha256 = "sha256-yp5OfSDxIASiCgISUVNxfe3dsLukgIoHARVPALIaQfY="; - }; - - patches = [ - (fetchpatch { - # https://github.com/emirozer/kubectl-doctor/pull/21 - name = "go-1.19-client-go-0.25.patch"; - url = "https://github.com/emirozer/kubectl-doctor/commit/a987ef58063e305409034af280d688a11682dbb9.patch"; - sha256 = "sha256-NQd/WxUfYwBDowhnoUWaOV8k7msiOhff3Bjux+a9R9E="; - }) - ]; - - vendorHash = "sha256-qhffg/s1RZFNW0nHLbJ89yqLzdC72ARXdbSfMLJK2pQ="; - - postInstall = '' - mv $out/bin/{cmd,kubectl-doctor} - ''; - - meta = with lib; { - description = "kubectl cluster triage plugin for k8s"; - mainProgram = "kubectl-doctor"; - homepage = "https://github.com/emirozer/kubectl-doctor"; - changelog = "https://github.com/emirozer/kubectl-doctor/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = [ maintainers.zimbatm ]; - }; -} diff --git a/pkgs/applications/networking/cluster/kubectl-evict-pod/default.nix b/pkgs/applications/networking/cluster/kubectl-evict-pod/default.nix index 46bf4cb14eeff..ac1f1cbf0b681 100644 --- a/pkgs/applications/networking/cluster/kubectl-evict-pod/default.nix +++ b/pkgs/applications/networking/cluster/kubectl-evict-pod/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubectl-evict-pod"; - version = "0.0.12"; + version = "0.0.14"; src = fetchFromGitHub { owner = "rajatjindal"; repo = pname; rev = "v${version}"; - sha256 = "sha256-alU1c1ppn4cQi582kcA/PIAJJt73i3uG02cQvSYij1A="; + sha256 = "sha256-Z1NIueonjyO2GHulBbXbsQtX7V/Z95GUoZv9AqjLIR0="; }; vendorHash = null; diff --git a/pkgs/applications/networking/cluster/kubectl-gadget/default.nix b/pkgs/applications/networking/cluster/kubectl-gadget/default.nix deleted file mode 100644 index 739413144965c..0000000000000 --- a/pkgs/applications/networking/cluster/kubectl-gadget/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "kubectl-gadget"; - version = "0.29.0"; - - src = fetchFromGitHub { - owner = "inspektor-gadget"; - repo = "inspektor-gadget"; - rev = "v${version}"; - hash = "sha256-5lXM7SuQvjQYWWbtRVJrdYBRbHFs1Ha9hQLDweaTKQ4="; - }; - - vendorHash = "sha256-Fc3WLeEqH2CK6b4jWqcxCBYl2ST6scjjNA1/Rl3Go1o="; - - CGO_ENABLED = 0; - - ldflags = [ - "-s" "-w" - "-X github.com/inspektor-gadget/inspektor-gadget/internal/version.version=v${version}" - "-X main.gadgetimage=ghcr.io/inspektor-gadget/inspektor-gadget:v${version}" - "-extldflags=-static" - ]; - - tags = [ - "withoutebpf" - ]; - - subPackages = [ "cmd/kubectl-gadget" ]; - - meta = with lib; { - description = "Collection of gadgets for troubleshooting Kubernetes applications using eBPF"; - mainProgram = "kubectl-gadget"; - homepage = "https://inspektor-gadget.io"; - license = licenses.asl20; - maintainers = with maintainers; [ kranurag7 devusb ]; - }; -} diff --git a/pkgs/applications/networking/cluster/kubectl-ktop/default.nix b/pkgs/applications/networking/cluster/kubectl-ktop/default.nix index 289d5bc77d4b3..eda9ee79f1f0e 100644 --- a/pkgs/applications/networking/cluster/kubectl-ktop/default.nix +++ b/pkgs/applications/networking/cluster/kubectl-ktop/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubectl-ktop"; - version = "0.3.5"; + version = "0.3.7"; src = fetchFromGitHub { owner = "vladimirvivien"; repo = "ktop"; rev = "v${version}"; - sha256 = "sha256-nkIRVt2kqsE9QBYvvHmupohnzH+OBcwWwV16rMePw4I="; + sha256 = "sha256-oxyEkDY53HjBgjWRajlcg+8Kx092lyLkPgOJleioO7o="; }; - vendorHash = "sha256-IiAMmHOq69WMT2B1q9ZV2fGDnLr7AbRm1P7ACSde2FE="; + vendorHash = "sha256-MLIcTHWo7lsqtAqH8naSvpS013t8KBVPRbch+CfeUNk="; subPackages = [ "." ]; diff --git a/pkgs/applications/networking/cluster/kubectl-node-shell/default.nix b/pkgs/applications/networking/cluster/kubectl-node-shell/default.nix index 934d1c9151dc1..06c64497747af 100644 --- a/pkgs/applications/networking/cluster/kubectl-node-shell/default.nix +++ b/pkgs/applications/networking/cluster/kubectl-node-shell/default.nix @@ -28,6 +28,6 @@ stdenvNoCC.mkDerivation rec { homepage = "https://github.com/kvaps/kubectl-node-shell"; license = licenses.asl20; maintainers = with maintainers; [ jocelynthode ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/cluster/kubectl-view-allocations/default.nix b/pkgs/applications/networking/cluster/kubectl-view-allocations/default.nix index 4d67c3786bdd5..8f912c2670194 100644 --- a/pkgs/applications/networking/cluster/kubectl-view-allocations/default.nix +++ b/pkgs/applications/networking/cluster/kubectl-view-allocations/default.nix @@ -2,7 +2,6 @@ , stdenv , rustPlatform , fetchFromGitHub -, perl , Security ? null }: @@ -25,8 +24,7 @@ rustPlatform.buildRustPackage rec { lockFile = ./Cargo.lock; }; - nativeBuildInputs = [ perl ]; - buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; meta = with lib; { description = "kubectl plugin to list allocations (cpu, memory, gpu,... X utilization, requested, limit, allocatable,...)"; diff --git a/pkgs/applications/networking/cluster/kubectl-view-secret/default.nix b/pkgs/applications/networking/cluster/kubectl-view-secret/default.nix index 7f22523e46bcd..ddeb05573e0ef 100644 --- a/pkgs/applications/networking/cluster/kubectl-view-secret/default.nix +++ b/pkgs/applications/networking/cluster/kubectl-view-secret/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubectl-view-secret"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "elsesiy"; repo = pname; rev = "v${version}"; - hash = "sha256-5X5rOoERx6HoG3cOBpYm12anMXXDjTtHZzQOOlJeJSs="; + hash = "sha256-mdooeKlwoPxiAHaOuhMF+Zx1l0uZ1OYMgDADI7JbYDc="; }; - vendorHash = "sha256-oQvmS05nev+ypfkKAlTN+JbzPux5iAzHsojW8SxtB70="; + vendorHash = "sha256-5mSS7UWfdk28oXk/ONnnjj4OMGJAtH26xGES4NGZuTc="; subPackages = [ "./cmd/" ]; diff --git a/pkgs/applications/networking/cluster/kubedb-cli/default.nix b/pkgs/applications/networking/cluster/kubedb-cli/default.nix index cba85cb19e3e4..f70dcee4682d9 100644 --- a/pkgs/applications/networking/cluster/kubedb-cli/default.nix +++ b/pkgs/applications/networking/cluster/kubedb-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubedb-cli"; - version = "0.46.0"; + version = "0.48.0"; src = fetchFromGitHub { owner = "kubedb"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-U5BRkH0jqTEBYtiT93YP/UpQYekPjAHEGl59HPk7TfQ="; + sha256 = "sha256-xqupDfcjCSP7uomBCuFlhCAOetZrvSiKehOgCqZKLLg="; }; vendorHash = null; diff --git a/pkgs/applications/networking/cluster/kubedog/default.nix b/pkgs/applications/networking/cluster/kubedog/default.nix index 5d31bc8e33505..9b9b5666bbb3c 100644 --- a/pkgs/applications/networking/cluster/kubedog/default.nix +++ b/pkgs/applications/networking/cluster/kubedog/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , buildGoModule , fetchFromGitHub , testers diff --git a/pkgs/applications/networking/cluster/kubefirst/default.nix b/pkgs/applications/networking/cluster/kubefirst/default.nix index 7183fb8885b25..54d7adb9bfb77 100644 --- a/pkgs/applications/networking/cluster/kubefirst/default.nix +++ b/pkgs/applications/networking/cluster/kubefirst/default.nix @@ -5,21 +5,21 @@ buildGoModule rec { pname = "kubefirst"; - version = "2.4.10"; + version = "2.5.11"; src = fetchFromGitHub { - owner = "kubefirst"; + owner = "konstructio"; repo = "kubefirst"; rev = "refs/tags/v${version}"; - hash = "sha256-EgJ+ymddMsB37ygREwdF6qmGcgJKPz06//dwwa1pXd0="; + hash = "sha256-paGb/Ifslj2XsXhY99ETXs72s3vSXAUqTeGPg+Nviho="; }; - vendorHash = "sha256-5UdKjxs0f8dHTzWvHpMbYSCcIqTU5aT5anNVk0O94tw="; + vendorHash = "sha256-tOCVDp9oClfeBsyZ6gv6HoGPjZByoxxAceV/wxQeBSA="; ldflags = [ "-s" "-w" - "-X=github.com/kubefirst/runtime/configs.K1Version=v${version}" + "-X=github.com/konstructio/kubefirst-api/configs.K1Version=v${version}" ]; doCheck = false; @@ -27,8 +27,8 @@ buildGoModule rec { meta = with lib; { description = "Tool to create instant GitOps platforms that integrate some of the best tools in cloud native from scratch"; mainProgram = "kubefirst"; - homepage = "https://github.com/kubefirst/kubefirst/"; - changelog = "https://github.com/kubefirst/kubefirst/releases/tag/v${version}"; + homepage = "https://github.com/konstructio/kubefirst/"; + changelog = "https://github.com/konstructio/kubefirst/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ qjoly ]; }; diff --git a/pkgs/applications/networking/cluster/kubelogin-oidc/default.nix b/pkgs/applications/networking/cluster/kubelogin-oidc/default.nix index 6a96666829615..e7d879a83aac1 100644 --- a/pkgs/applications/networking/cluster/kubelogin-oidc/default.nix +++ b/pkgs/applications/networking/cluster/kubelogin-oidc/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "kubelogin"; - version = "1.28.1"; + version = "1.30.0"; src = fetchFromGitHub { owner = "int128"; repo = pname; rev = "v${version}"; - sha256 = "sha256-sFEFvWizQeQp9VE1guO9xMZl9+cFk6jV43TVCbD8pas="; + sha256 = "sha256-DHg46t0gMypK6Nj428gpOMtPuA+XcW4IJU39CHTVGPw="; }; subPackages = ["."]; - vendorHash = "sha256-Mel9fH13iXSpB2kClJsH0SM+/gIzu2rPt2q0fjQwumw="; + vendorHash = "sha256-gr+SsC7MiLj/MZ8kca5Hcfge+7Pm4y963TfwyKHEhBY="; # Rename the binary instead of symlinking to avoid conflict with the # Azure version of kubelogin diff --git a/pkgs/applications/networking/cluster/kubelogin/default.nix b/pkgs/applications/networking/cluster/kubelogin/default.nix index f3b4a96404a9d..243495dd6a2ca 100644 --- a/pkgs/applications/networking/cluster/kubelogin/default.nix +++ b/pkgs/applications/networking/cluster/kubelogin/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubelogin"; - version = "0.1.3"; + version = "0.1.4"; src = fetchFromGitHub { owner = "Azure"; repo = pname; rev = "v${version}"; - sha256 = "sha256-5Y+xu84iNVFkrBc1qoTg8vMswvlflF9SobMy/Aw4mCA="; + sha256 = "sha256-DRXvnIOETNlZ50oa8PbLSwmq6VJJcerUe1Ir7s4/7Kw="; }; - vendorHash = "sha256-sVySHSj8vJEarQlhAR3vLdgysJNbmA2IAZ3ET2zRyAM="; + vendorHash = "sha256-K/GfRJ0KbizsVmKa6V3/ZLDKivJttEsqA3Q84S0S4KI="; ldflags = [ "-X main.version=${version}" @@ -23,6 +23,6 @@ buildGoModule rec { mainProgram = "kubelogin"; inherit (src.meta) homepage; license = licenses.mit; - maintainers = []; + maintainers = [ ]; }; } diff --git a/pkgs/applications/networking/cluster/kubeone/default.nix b/pkgs/applications/networking/cluster/kubeone/default.nix index d1629de368a40..d888cdfe5d6ce 100644 --- a/pkgs/applications/networking/cluster/kubeone/default.nix +++ b/pkgs/applications/networking/cluster/kubeone/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "kubeone"; - version = "1.8.0"; + version = "1.8.3"; src = fetchFromGitHub { owner = "kubermatic"; repo = "kubeone"; rev = "v${version}"; - hash = "sha256-BYfnHgTiHMmKdW25XymP2nDYQDOEHSIUOjrtwaoc1JU="; + hash = "sha256-+9Dw6W/Tbg7zRC/ARuuXqZGTcMeSrtdoTvHtsQevigg="; }; - vendorHash = "sha256-tAThtZJ5DRzveJRG58VPxJWrZjB+dnXhX/50lZEHUGc="; + vendorHash = "sha256-z1BBE+PH2s7VxWNxneu5y2ZerfzCZNPJowZJVq821Kk="; ldflags = [ "-s" diff --git a/pkgs/applications/networking/cluster/kubergrunt/default.nix b/pkgs/applications/networking/cluster/kubergrunt/default.nix index 3c5cf3ee52d27..b6262cf857003 100644 --- a/pkgs/applications/networking/cluster/kubergrunt/default.nix +++ b/pkgs/applications/networking/cluster/kubergrunt/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubergrunt"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = "kubergrunt"; rev = "v${version}"; - sha256 = "sha256-yN5tpe3ayQPhTlBvxlt7CD6mSURCB4lxGatEK9OThzs="; + sha256 = "sha256-FOXnerB6qmUUotWLlTTsR5x0+A0Q9D8PVDTMG8j8b9o="; }; - vendorHash = "sha256-VJkqg2cnpYHuEYOv5+spoyRWFAdFWE7YIVYaN9OmIZM="; + vendorHash = "sha256-rgU6Yv+gmKShWfpPaWtK2VIBPgFSsPVOnUzIp2+V7oI="; # Disable tests since it requires network access and relies on the # presence of certain AWS infrastructure diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index 08823ff29b0ba..8fbeda219ad63 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -20,13 +20,13 @@ buildGoModule rec { pname = "kubernetes"; - version = "1.30.2"; + version = "1.31.0"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - hash = "sha256-cxWltHCwb01QsIRSieXwYtImrSfvJLBhN3VIJkxOzX8="; + hash = "sha256-Oy638nIuz2xWVvMGWHUeI4T7eycXIfT+XHp0U7h8G9w="; }; vendorHash = null; diff --git a/pkgs/applications/networking/cluster/kubernetes/kubectl.nix b/pkgs/applications/networking/cluster/kubernetes/kubectl.nix index 1176f0f28f684..b7036251b77ab 100644 --- a/pkgs/applications/networking/cluster/kubernetes/kubectl.nix +++ b/pkgs/applications/networking/cluster/kubernetes/kubectl.nix @@ -27,6 +27,7 @@ kubernetes.overrideAttrs (_: rec { meta = kubernetes.meta // { description = "Kubernetes CLI"; homepage = "https://github.com/kubernetes/kubectl"; + mainProgram = "kubectl"; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/applications/networking/cluster/kubeseal/default.nix b/pkgs/applications/networking/cluster/kubeseal/default.nix index 10dc9cecfbfc6..3d9dac0295ff5 100644 --- a/pkgs/applications/networking/cluster/kubeseal/default.nix +++ b/pkgs/applications/networking/cluster/kubeseal/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubeseal"; - version = "0.27.0"; + version = "0.27.1"; src = fetchFromGitHub { owner = "bitnami-labs"; repo = "sealed-secrets"; rev = "v${version}"; - sha256 = "sha256-Ja+z+QmdU37RC9WIczlmzJWN6enhks3jDJLQMV+kfCY="; + sha256 = "sha256-JMYTtEq+I2B1WqEvYQcuUXLtu62KDdR2AtrGS3EupiI="; }; - vendorHash = "sha256-QSF6/8FLXJrM5LAWW0NgDP6U0om2lXsOGP9qDasz+2c="; + vendorHash = "sha256-1Oh+x21RohydebrgKmv5sCDVTJiF/d5A7KWiptEGSiE="; subPackages = [ "cmd/kubeseal" ]; diff --git a/pkgs/applications/networking/cluster/kubeshark/default.nix b/pkgs/applications/networking/cluster/kubeshark/default.nix index b888cecc927c2..27eb93f118249 100644 --- a/pkgs/applications/networking/cluster/kubeshark/default.nix +++ b/pkgs/applications/networking/cluster/kubeshark/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubeshark"; - version = "52.3.68"; + version = "52.3.82"; src = fetchFromGitHub { owner = "kubeshark"; repo = "kubeshark"; rev = "v${version}"; - hash = "sha256-GDK+GR3MUYUgfY3cgaxWIYSE3uiEscp9DeeY36/zOYo="; + hash = "sha256-PjQX+OAE2UujGc+XHn2izrHgjvGbSK84IU9z5aBM+VM="; }; - vendorHash = "sha256-0WRmAqslZj63m+kCFKIBgoRX47ZyRuU7ZihmF6wmZy4="; + vendorHash = "sha256-fjkuDX6SC23An0zZW0ocoFJ/K6JKsyVUQdxzfHCUFJs="; ldflags = let t = "github.com/kubeshark/kubeshark"; in [ "-s" "-w" diff --git a/pkgs/applications/networking/cluster/kubevela/default.nix b/pkgs/applications/networking/cluster/kubevela/default.nix index caa2519af57aa..1c8b618518702 100644 --- a/pkgs/applications/networking/cluster/kubevela/default.nix +++ b/pkgs/applications/networking/cluster/kubevela/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "kubevela"; - version = "1.9.11"; + version = "1.9.12"; src = fetchFromGitHub { owner = "kubevela"; repo = "kubevela"; rev = "v${version}"; - hash = "sha256-u9UGV1UwZoj4eSqqMLf8BvsfTFIYagoslN5pflDKm8c="; + hash = "sha256-AltyaV4tFW/3nOzEgWwlIqFXVaEtcpN5IxdFScZ7Nes="; }; - vendorHash = "sha256-NnUZnlvVb2VmNx4HM8lkbTNcQA3/pctkg1UVpOY8Acs="; + vendorHash = "sha256-Ethbor1nZRYuemBL03QdnExNJtdOJ4w76sjLrBDW9Aw="; ldflags = [ "-s" "-w" diff --git a/pkgs/applications/networking/cluster/kuma/default.nix b/pkgs/applications/networking/cluster/kuma/default.nix index 66164211131fd..54c014fb4e684 100644 --- a/pkgs/applications/networking/cluster/kuma/default.nix +++ b/pkgs/applications/networking/cluster/kuma/default.nix @@ -15,17 +15,17 @@ buildGoModule rec { inherit pname; - version = "2.7.3"; + version = "2.8.3"; tags = lib.optionals enableGateway [ "gateway" ]; src = fetchFromGitHub { owner = "kumahq"; repo = "kuma"; rev = version; - hash = "sha256-b3qQ3lFaQvkmP3HYPwQi2TxSeKmWzGbp01OCnjULJ4k="; + hash = "sha256-wGEO7DJLWy/d6SYsTb8EZhF9c1ptYBXDL/Owter4nfo="; }; - vendorHash = "sha256-ne62twZXac5GfQ8JcWElIMqc+Vpvn0Y9XSNgAtF62q0="; + vendorHash = "sha256-PAW2Byzz6Ky4I51QrJoNoyn1QH/i0SeU2dDHvj2BqXM="; # no test files doCheck = false; diff --git a/pkgs/applications/networking/cluster/kuttl/default.nix b/pkgs/applications/networking/cluster/kuttl/default.nix index 3e5b25a16faa7..88b8cfc73a338 100644 --- a/pkgs/applications/networking/cluster/kuttl/default.nix +++ b/pkgs/applications/networking/cluster/kuttl/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "kuttl"; - version = "0.16.0"; + version = "0.19.0"; cli = "kubectl-kuttl"; src = fetchFromGitHub { owner = "kudobuilder"; repo = "kuttl"; rev = "v${version}"; - sha256 = "sha256-Kz8+RsLpKwXk4f3k/kBqSFGB9AvA/D6kYBtPEl6aSH8="; + sha256 = "sha256-7fcVmLvRbKYuWuqwqZWlQf08YEyowcTxrp5RteV8qyU="; }; - vendorHash = "sha256-IgfPXT4BhfZZVOa7eO1wKUKiDVMcN8vmH11qdWfvFww="; + vendorHash = "sha256-E6gzr9gCLbRaoJU/pYA2cAy0rv5SUVmwf0m34lchF+M="; subPackages = [ "cmd/kubectl-kuttl" ]; diff --git a/pkgs/applications/networking/cluster/kyverno/default.nix b/pkgs/applications/networking/cluster/kyverno/default.nix index f9becbdf5bad2..0e4b11a8f9187 100644 --- a/pkgs/applications/networking/cluster/kyverno/default.nix +++ b/pkgs/applications/networking/cluster/kyverno/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kyverno"; - version = "1.12.4"; + version = "1.12.5"; src = fetchFromGitHub { owner = "kyverno"; repo = "kyverno"; rev = "v${version}"; - hash = "sha256-TVtE1mdOai2G2+KCp9r5G+E9QhGQ5TmUFCN9x5EKM7o="; + hash = "sha256-j6/x0fITP6FbI7LvaaB+Dwg9ewFjZ/eqjG0TzQeDsmI="; }; ldflags = [ diff --git a/pkgs/applications/networking/cluster/lens/default.nix b/pkgs/applications/networking/cluster/lens/default.nix index 3e59a1fc23df7..98c9ca2d1758d 100644 --- a/pkgs/applications/networking/cluster/lens/default.nix +++ b/pkgs/applications/networking/cluster/lens/default.nix @@ -35,7 +35,7 @@ let platforms = builtins.attrNames sources; }; -in if stdenv.isDarwin then +in if stdenv.hostPlatform.isDarwin then callPackage ./darwin.nix { inherit pname version src meta; } else callPackage ./linux.nix { inherit pname version src meta; } diff --git a/pkgs/applications/networking/cluster/lens/linux.nix b/pkgs/applications/networking/cluster/lens/linux.nix index c76a1607760da..5b43a6c962107 100644 --- a/pkgs/applications/networking/cluster/lens/linux.nix +++ b/pkgs/applications/networking/cluster/lens/linux.nix @@ -1,21 +1,18 @@ { pname, version, src, meta, appimageTools, makeWrapper }: let - - name = "${pname}-${version}"; - appimageContents = appimageTools.extractType2 { - inherit name src; + inherit pname version src; }; in appimageTools.wrapType2 { - inherit name src meta; + inherit pname version src meta; + + nativeBuildInputs = [ makeWrapper ]; extraInstallCommands = '' - mv $out/bin/${name} $out/bin/${pname} - source "${makeWrapper}/nix-support/setup-hook" wrapProgram $out/bin/${pname} \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" install -m 444 -D ${appimageContents}/${pname}.desktop $out/share/applications/${pname}.desktop diff --git a/pkgs/applications/networking/cluster/linkerd/edge.nix b/pkgs/applications/networking/cluster/linkerd/edge.nix index e82cde01ec20f..e857ba183899d 100644 --- a/pkgs/applications/networking/cluster/linkerd/edge.nix +++ b/pkgs/applications/networking/cluster/linkerd/edge.nix @@ -2,7 +2,7 @@ (callPackage ./generic.nix { }) { channel = "edge"; - version = "24.6.3"; - sha256 = "1mlbb8qkx71anwqi027p9lv10kfck811ikfvc5gpnavfaaiwrrd1"; - vendorHash = "sha256-nIDbwUvu1e/1ImVQMj4eOaPeFHM7HCcJMFk/ackdJSE="; + version = "24.9.2"; + sha256 = "0bac5pwh741z7ly8abz92mydrhps2rlp4nkf3a4yxm7gj25gbqb1"; + vendorHash = "sha256-zKKgMcuHowU3Sft8QX0VJF+zXCVRyNC10k8nXwzTfYs="; } diff --git a/pkgs/applications/networking/cluster/luigi/default.nix b/pkgs/applications/networking/cluster/luigi/default.nix index bb57bae66021d..8c145ef6393f0 100644 --- a/pkgs/applications/networking/cluster/luigi/default.nix +++ b/pkgs/applications/networking/cluster/luigi/default.nix @@ -2,14 +2,19 @@ python3.pkgs.buildPythonApplication rec { pname = "luigi"; - version = "3.5.1"; + version = "3.5.2"; + pyproject = true; src = fetchPypi { inherit pname version; - sha256 = "sha256-/HkLJ0dRXdGcZz77uOTJrOX0xc3DH45/k9xmfesuxsg="; + hash = "sha256-0AD+am6nfJN2Z0/oegRawAw/z36+hBRlWgZjCqnbURE="; }; - propagatedBuildInputs = with python3.pkgs; [ python-dateutil tornado python-daemon boto3 tenacity ]; + build-system = [ python3.pkgs.setuptools ]; + + dependencies = with python3.pkgs; [ python-dateutil tornado python-daemon tenacity ]; + + pythonImportsCheck = [ "luigi" ]; # Requires tox, hadoop, and google cloud doCheck = false; diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix index 90f94c459742d..a367c8bc3aab3 100644 --- a/pkgs/applications/networking/cluster/minikube/default.nix +++ b/pkgs/applications/networking/cluster/minikube/default.nix @@ -15,9 +15,9 @@ buildGoModule rec { pname = "minikube"; - version = "1.33.1"; + version = "1.34.0"; - vendorHash = "sha256-VHl6CKPWqahX70GHbZE6SVa8XPfiC912DvsOteH2B0w="; + vendorHash = "sha256-gw5Ol7Gp26KyIaiMvwik8FJpABpMT86vpFnZnAJ6hhs="; doCheck = false; @@ -25,18 +25,18 @@ buildGoModule rec { owner = "kubernetes"; repo = "minikube"; rev = "v${version}"; - sha256 = "sha256-z0wNngEzddxpeeLyQVA2yRC5SfYvU5G66V95sVmW6bA="; + sha256 = "sha256-Z7x3MOQUF3a19X4SSiIUfSJ3xl3482eKH700m/9pqcU="; }; postPatch = ( - lib.optionalString (withQemu && stdenv.isDarwin) '' + lib.optionalString (withQemu && stdenv.hostPlatform.isDarwin) '' substituteInPlace \ pkg/minikube/registry/drvs/qemu2/qemu2.go \ --replace "/usr/local/opt/qemu/share/qemu" "${qemu}/share/qemu" \ --replace "/opt/homebrew/opt/qemu/share/qemu" "${qemu}/share/qemu" '' ) + ( - lib.optionalString (withQemu && stdenv.isLinux) '' + lib.optionalString (withQemu && stdenv.hostPlatform.isLinux) '' substituteInPlace \ pkg/minikube/registry/drvs/qemu2/qemu2.go \ --replace "/usr/share/OVMF/OVMF_CODE.fd" "${OVMF.firmware}" \ @@ -46,7 +46,7 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles pkg-config which makeWrapper ]; - buildInputs = if stdenv.isDarwin then [ vmnet ] else if stdenv.isLinux then [ libvirt ] else null; + buildInputs = if stdenv.hostPlatform.isDarwin then [ vmnet ] else if stdenv.hostPlatform.isLinux then [ libvirt ] else null; buildPhase = '' make COMMIT=${src.rev} diff --git a/pkgs/applications/networking/cluster/nerdctl/default.nix b/pkgs/applications/networking/cluster/nerdctl/default.nix index af9c96c6c5eb1..7d27205855c4a 100644 --- a/pkgs/applications/networking/cluster/nerdctl/default.nix +++ b/pkgs/applications/networking/cluster/nerdctl/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "nerdctl"; - version = "1.7.6"; + version = "1.7.7"; src = fetchFromGitHub { owner = "containerd"; repo = pname; rev = "v${version}"; - hash = "sha256-z83c8Ji0zSM1QDwjB4FwhHW6XCqG0Hb5crM3jjK46jk="; + hash = "sha256-GHFs8QvLcXu+DZ851TCLI7EVc9wMS5fRC4TYBXzyv3Q="; }; - vendorHash = "sha256-KqWmwwQRrWoyRehuSJBnlyPQgwk5hUGk2/d0Ue/reVc="; + vendorHash = "sha256-5LRsT04T/CKv+YHaiM2g6giimWWXyzPju3iZuj2DfAY="; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/nixops/default.nix b/pkgs/applications/networking/cluster/nixops/default.nix index 75902de1b9f6b..88c426565fc4e 100644 --- a/pkgs/applications/networking/cluster/nixops/default.nix +++ b/pkgs/applications/networking/cluster/nixops/default.nix @@ -12,25 +12,26 @@ let nixopsContextBase = this: { python = python3.override { + self = this.python; packageOverrides = self: super: { nixops = self.callPackage ./unwrapped.nix { }; } // (this.plugins self super); }; plugins = ps: _super: with ps; rec { - nixops-aws = callPackage ./plugins/nixops-aws.nix { }; nixops-digitalocean = callPackage ./plugins/nixops-digitalocean.nix { }; nixops-encrypted-links = callPackage ./plugins/nixops-encrypted-links.nix { }; - nixops-gce = callPackage ./plugins/nixops-gce.nix { }; nixops-hercules-ci = callPackage ./plugins/nixops-hercules-ci.nix { }; - nixops-hetzner = callPackage ./plugins/nixops-hetzner.nix { }; - nixops-hetznercloud = callPackage ./plugins/nixops-hetznercloud.nix { }; - nixops-libvirtd = callPackage ./plugins/nixops-libvirtd.nix { }; nixops-vbox = callPackage ./plugins/nixops-vbox.nix { }; nixos-modules-contrib = callPackage ./plugins/nixos-modules-contrib.nix { }; + nixops-aws = throw "nixops-aws was broken and was removed from nixpkgs"; + nixops-gce = throw "nixops-gce was broken and was removed from nixpkgs"; + nixops-libvirtd = throw "nixops-libvirtd was broken and was removed from nixpkgs"; + nixops-hetzner = throw "nixops-hetzner was broken and was removed from nixpkgs"; + nixops-hetznercloud = throw "nixops-hetznercloud was broken and was removed from nixpkgs"; + # aliases for backwards compatibility - nixops-gcp = nixops-gce; nixops-virtd = nixops-libvirtd; nixopsvbox = nixops-vbox; }; @@ -41,7 +42,7 @@ let selectedPlugins = []; # selector is a function mapping pythonPackages to a list of plugins - # e.g. nixops_unstable.withPlugins (ps: with ps; [ nixops-aws ]) + # e.g. nixops_unstable.withPlugins (ps: with ps; [ nixops-digitalocean ]) withPlugins = selector: this.extend (this: _old: { selectedPlugins = selector this.availablePlugins; @@ -108,14 +109,9 @@ in # Not recommended; too fragile. nixops_unstable_full = minimal.withPlugins (ps: [ - ps.nixops-aws ps.nixops-digitalocean ps.nixops-encrypted-links - ps.nixops-gce ps.nixops-hercules-ci - ps.nixops-hetzner - ps.nixops-hetznercloud - ps.nixops-libvirtd ps.nixops-vbox ]); } diff --git a/pkgs/applications/networking/cluster/nixops/plugins/nixops-aws.nix b/pkgs/applications/networking/cluster/nixops/plugins/nixops-aws.nix deleted file mode 100644 index 44671b0809edc..0000000000000 --- a/pkgs/applications/networking/cluster/nixops/plugins/nixops-aws.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, unstableGitUpdater -, poetry-core -, boto -, boto3 -, nixops -, nixos-modules-contrib -, typing-extensions -}: - -buildPythonPackage { - pname = "nixops-aws"; - version = "1.0.0-unstable-2024-02-29"; - pyproject = true; - - src = fetchFromGitHub { - owner = "NixOS"; - repo = "nixops-aws"; - rev = "d173b2f14ec767d782ceab45fb22b32fe3b5a1f7"; - hash = "sha256-ocTtc7POt1bugb9Bki2ew2Eh5uc933GftNw1twoOJsc="; - }; - - postPatch = '' - substituteInPlace pyproject.toml \ - --replace poetry.masonry.api poetry.core.masonry.api \ - --replace "poetry>=" "poetry-core>=" - ''; - - nativeBuildInputs = [ - poetry-core - ]; - - buildInputs = [ - nixops - ]; - - propagatedBuildInputs = [ - boto - boto3 - nixos-modules-contrib - typing-extensions - ]; - - pythonImportsCheck = [ "nixops_aws" ]; - - passthru.updateScript = unstableGitUpdater { - tagPrefix = "v"; - }; - - meta = with lib; { - description = "AWS plugin for NixOps"; - homepage = "https://github.com/NixOS/nixops-aws"; - license = licenses.lgpl3Only; - maintainers = nixops.meta.maintainers; - }; -} diff --git a/pkgs/applications/networking/cluster/nixops/plugins/nixops-digitalocean.nix b/pkgs/applications/networking/cluster/nixops/plugins/nixops-digitalocean.nix index 8a0d2d4c49338..a78d4d2cfd997 100644 --- a/pkgs/applications/networking/cluster/nixops/plugins/nixops-digitalocean.nix +++ b/pkgs/applications/networking/cluster/nixops/plugins/nixops-digitalocean.nix @@ -48,6 +48,6 @@ buildPythonPackage { description = "NixOps Digitalocean plugin"; homepage = "https://github.com/nix-community/nixops-digitalocean"; license = licenses.lgpl3Only; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/networking/cluster/nixops/plugins/nixops-encrypted-links.nix b/pkgs/applications/networking/cluster/nixops/plugins/nixops-encrypted-links.nix index 817da055d6342..8b890157a2221 100644 --- a/pkgs/applications/networking/cluster/nixops/plugins/nixops-encrypted-links.nix +++ b/pkgs/applications/networking/cluster/nixops/plugins/nixops-encrypted-links.nix @@ -40,6 +40,6 @@ buildPythonPackage { description = "EncryptedLinksTo from Nixops 1 module port"; homepage = "https://github.com/nix-community/nixops-encrypted-links"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/networking/cluster/nixops/plugins/nixops-gce.nix b/pkgs/applications/networking/cluster/nixops/plugins/nixops-gce.nix deleted file mode 100644 index 8f179e6755b46..0000000000000 --- a/pkgs/applications/networking/cluster/nixops/plugins/nixops-gce.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, unstableGitUpdater -, poetry-core -, cryptography -, libcloud -, nixops -, nixos-modules-contrib -}: - -buildPythonPackage { - pname = "nixops-gce"; - version = "0-unstable-2023-05-26"; - pyproject = true; - - src = fetchFromGitHub { - owner = "nix-community"; - repo = "nixops-gce"; - rev = "d13cb794aef763338f544010ceb1816fe31d7f42"; - hash = "sha256-UkYf6CoUrr8yuQoe/ik6vu+UCi3ByJd0BdkS9SLEp0Q="; - }; - - postPatch = '' - substituteInPlace pyproject.toml \ - --replace poetry.masonry.api poetry.core.masonry.api \ - --replace "poetry>=" "poetry-core>=" - ''; - - nativeBuildInputs = [ - poetry-core - ]; - - buildInputs = [ - nixops - ]; - - propagatedBuildInputs = [ - cryptography - libcloud - nixos-modules-contrib - ]; - - pythonImportsCheck = [ "nixops_gcp" ]; - - passthru.updateScript = unstableGitUpdater {}; - - meta = with lib; { - description = "NixOps Google Cloud Backend"; - homepage = "https://github.com/nix-community/nixops-gce"; - license = licenses.mit; - maintainers = nixops.meta.maintainers; - broken = true; # never built on Hydra - }; -} diff --git a/pkgs/applications/networking/cluster/nixops/plugins/nixops-hetzner.nix b/pkgs/applications/networking/cluster/nixops/plugins/nixops-hetzner.nix deleted file mode 100644 index 092a932a47cca..0000000000000 --- a/pkgs/applications/networking/cluster/nixops/plugins/nixops-hetzner.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, unstableGitUpdater -, poetry-core -, hetzner -, nixops -, nixos-modules-contrib -, typing-extensions -}: - -buildPythonPackage { - pname = "nixops-hetzner"; - version = "1.0.1-unstable-2022-04-24"; - pyproject = true; - - src = fetchFromGitHub { - owner = "NixOS"; - repo = "nixops-hetzner"; - rev = "bc7a68070c7371468bcc8bf6e36baebc6bd2da35"; - hash = "sha256-duK1Ui4VpbGSgGvfjTOddHSqHZ1FSy4L9Egg+FvZv04="; - }; - - postPatch = '' - substituteInPlace pyproject.toml \ - --replace poetry.masonry.api poetry.core.masonry.api \ - --replace "poetry>=" "poetry-core>=" - ''; - - nativeBuildInputs = [ - poetry-core - ]; - - buildInputs = [ - nixops - ]; - - propagatedBuildInputs = [ - hetzner - nixos-modules-contrib - typing-extensions - ]; - - pythonImportsCheck = [ "nixops_hetzner" ]; - - passthru.updateScript = unstableGitUpdater { - tagPrefix = "v"; - }; - - meta = with lib; { - description = "Hetzner bare metal NixOps plugin"; - homepage = "https://github.com/NixOS/nixops-hetzner"; - license = licenses.mit; - maintainers = nixops.meta.maintainers; - broken = true; # never built on Hydra - }; -} diff --git a/pkgs/applications/networking/cluster/nixops/plugins/nixops-hetznercloud.nix b/pkgs/applications/networking/cluster/nixops/plugins/nixops-hetznercloud.nix deleted file mode 100644 index 6e9a4b742e302..0000000000000 --- a/pkgs/applications/networking/cluster/nixops/plugins/nixops-hetznercloud.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, unstableGitUpdater -, poetry-core -, hcloud -, nixops -, typing-extensions -}: - -buildPythonPackage { - pname = "nixops-hetznercloud"; - version = "0-unstable-2023-02-19"; - pyproject = true; - - src = fetchFromGitHub { - owner = "lukebfox"; - repo = "nixops-hetznercloud"; - rev = "e14f340f7ffe9e2aa7ffbaac0b8a2e3b4cc116b3"; - hash = "sha256-IsRJUUAfN6YXcue80qlcunkawUtgMiMU8mM6DP+7Cm4="; - }; - - postPatch = '' - substituteInPlace pyproject.toml \ - --replace poetry.masonry.api poetry.core.masonry.api \ - --replace "poetry>=" "poetry-core>=" - ''; - - nativeBuildInputs = [ - poetry-core - ]; - - buildInputs = [ - nixops - ]; - - propagatedBuildInputs = [ - hcloud - typing-extensions - ]; - - pythonImportsCheck = [ "nixops_hetznercloud" ]; - - passthru.updateScript = unstableGitUpdater {}; - - meta = with lib; { - description = "NixOps plugin supporting Hetzner Cloud deployments"; - homepage = "https://github.com/lukebfox/nixops-hetznercloud"; - license = licenses.lgpl3Only; - maintainers = with maintainers; [ lukebfox ]; - broken = true; # never built on Hydra - }; -} diff --git a/pkgs/applications/networking/cluster/nixops/plugins/nixops-libvirtd.nix b/pkgs/applications/networking/cluster/nixops/plugins/nixops-libvirtd.nix deleted file mode 100644 index a315a7e2ae9b8..0000000000000 --- a/pkgs/applications/networking/cluster/nixops/plugins/nixops-libvirtd.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, unstableGitUpdater -, poetry-core -, libvirt -, nixops -}: - -buildPythonPackage { - pname = "nixops-libvirtd"; - version = "1.0.0-unstable-2023-09-01"; - pyproject = true; - - src = fetchFromGitHub { - owner = "nix-community"; - repo = "nixops-libvirtd"; - rev = "b59424bf53e74200d684a4bce1ae64d276e793a0"; - hash = "sha256-HxJu8/hOPI5aCddTpna0mf+emESYN3ZxpTkitfKcfVQ="; - }; - - postPatch = '' - substituteInPlace pyproject.toml \ - --replace poetry.masonry.api poetry.core.masonry.api \ - --replace "poetry>=" "poetry-core>=" - ''; - - nativeBuildInputs = [ - poetry-core - ]; - - buildInputs = [ - nixops - ]; - - propagatedBuildInputs = [ - libvirt - ]; - - pythonImportsCheck = [ "nixops_virtd" ]; - - passthru.updateScript = unstableGitUpdater { - tagPrefix = "v"; - }; - - meta = with lib; { - description = "NixOps libvirtd backend plugin"; - homepage = "https://github.com/nix-community/nixops-libvirtd"; - license = licenses.lgpl3Only; - maintainers = with maintainers; [ aminechikhaoui ]; - broken = true; # never built on Hydra - }; -} diff --git a/pkgs/applications/networking/cluster/nixops/plugins/nixos-modules-contrib.nix b/pkgs/applications/networking/cluster/nixops/plugins/nixos-modules-contrib.nix index 494208d347f0d..a3039482c8f1a 100644 --- a/pkgs/applications/networking/cluster/nixops/plugins/nixos-modules-contrib.nix +++ b/pkgs/applications/networking/cluster/nixops/plugins/nixos-modules-contrib.nix @@ -40,6 +40,6 @@ buildPythonPackage { description = "Useful NixOS modules which may not belong in the Nixpkgs repository itself"; homepage = "https://github.com/nix-community/nixos-modules-contrib"; license = licenses.lgpl3; - maintainers = []; + maintainers = [ ]; }; } diff --git a/pkgs/applications/networking/cluster/node-problem-detector/default.nix b/pkgs/applications/networking/cluster/node-problem-detector/default.nix index 4daed56dd9d37..e30d89a9a34c4 100644 --- a/pkgs/applications/networking/cluster/node-problem-detector/default.nix +++ b/pkgs/applications/networking/cluster/node-problem-detector/default.nix @@ -20,15 +20,15 @@ buildGoModule rec { # Linux-only feature. See 'ENABLE_JOURNALD' upstream: # https://github.com/kubernetes/node-problem-detector/blob/master/Makefile subPackages = [ "cmd/nodeproblemdetector" ] ++ - lib.optionals stdenv.isLinux [ "cmd/logcounter" ]; + lib.optionals stdenv.hostPlatform.isLinux [ "cmd/logcounter" ]; preBuild = '' - export CGO_ENABLED=${if stdenv.isLinux then "1" else "0"} + export CGO_ENABLED=${if stdenv.hostPlatform.isLinux then "1" else "0"} ''; - buildInputs = lib.optionals stdenv.isLinux [ systemd ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ systemd ]; - tags = lib.optionals stdenv.isLinux [ "journald" ]; + tags = lib.optionals stdenv.hostPlatform.isLinux [ "journald" ]; ldflags = [ "-X k8s.io/${pname}/pkg/version.version=v${version}" diff --git a/pkgs/applications/networking/cluster/nomad-autoscaler/default.nix b/pkgs/applications/networking/cluster/nomad-autoscaler/default.nix index 5199400cae9eb..6a232472f6cd5 100644 --- a/pkgs/applications/networking/cluster/nomad-autoscaler/default.nix +++ b/pkgs/applications/networking/cluster/nomad-autoscaler/default.nix @@ -94,7 +94,7 @@ let mainProgram = "nomad-autoscaler"; homepage = "https://github.com/hashicorp/nomad-autoscaler"; license = licenses.mpl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; }; diff --git a/pkgs/applications/networking/cluster/nomad-driver-podman/default.nix b/pkgs/applications/networking/cluster/nomad-driver-podman/default.nix index 8eb6a46563181..4b3f6a2b8e82b 100644 --- a/pkgs/applications/networking/cluster/nomad-driver-podman/default.nix +++ b/pkgs/applications/networking/cluster/nomad-driver-podman/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "nomad-driver-podman"; - version = "0.5.2"; + version = "0.6.1"; src = fetchFromGitHub { owner = "hashicorp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-L2OnnSTrr49THE2ZQpuHagTjcg3/pt/ydivGmWZSvas="; + sha256 = "sha256-aD5Sh2/4juHzeB64Sl0Zpioq9TLIA9PUOf6Gk98W+Js="; }; - vendorHash = "sha256-0a8wnwyquDrEnPlR337uCxMzuc/9MjgGUsDd+xIfPhw="; + vendorHash = "sha256-ILfH2QXQIM/ybSAXqmRYe99HmgZ18wuCHQUrZf1GS2Y="; subPackages = [ "." ]; diff --git a/pkgs/applications/networking/cluster/nomad-pack/default.nix b/pkgs/applications/networking/cluster/nomad-pack/default.nix index 83b7cae25189c..c5c7cdb08efb7 100644 --- a/pkgs/applications/networking/cluster/nomad-pack/default.nix +++ b/pkgs/applications/networking/cluster/nomad-pack/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "nomad-pack"; - version = "0.1.1"; + version = "0.1.2"; src = fetchFromGitHub { owner = "hashicorp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-b7M2I+R39txtTdk/FOYvKfZxXbGEtDrzgpB64594Gqc="; + sha256 = "sha256-5OTGBO2EMGPJ4J2Eu3pIlZmYGXYxgL/6uGQgdB+8nPk="; }; - vendorHash = "sha256-bhWySn5p1aPbYSCY7GqFteYmm22Jeq/Rf/a2ZTjyZQ4="; + vendorHash = "sha256-8hWiVtya/TlVLUlYVJSjOzZUI8vsPm355ksIRPhB2rA="; # skip running go tests as they require network access doCheck = false; diff --git a/pkgs/applications/networking/cluster/nomad/default.nix b/pkgs/applications/networking/cluster/nomad/default.nix index e170919495d3f..320fecc215748 100644 --- a/pkgs/applications/networking/cluster/nomad/default.nix +++ b/pkgs/applications/networking/cluster/nomad/default.nix @@ -1,6 +1,7 @@ { lib , buildGoModule , buildGo121Module +, buildGo122Module , fetchFromGitHub , nixosTests , installShellFiles @@ -44,6 +45,8 @@ let maintainers = with maintainers; [ rushmorem pradeepchhetri techknowlogick cottand ]; }; } // attrs'); + + throwUnsupportaed = version: "${version} is no longer supported upstream. You can switch to using a newer version of the nomad package, or revert to older nixpkgs if you cannot upgrade"; in rec { # Nomad never updates major go versions within a release series and is unsupported @@ -54,19 +57,9 @@ rec { nomad = nomad_1_7; - nomad_1_4 = throw "nomad_1_4 is no longer supported upstream. You can switch to using a newer version of the nomad package, or revert to older nixpkgs if you cannot upgrade"; + nomad_1_4 = throwUnsupportaed "nomad_1_4"; - nomad_1_5 = generic { - buildGoModule = buildGo121Module; - version = "1.5.15"; - sha256 = "sha256-OFmGOU+ObA0+BS48y0ZyyxR+VI5DYL39peVKcyVHgGI="; - vendorHash = "sha256-Ds94lB43cyMNyRJZti0mZDWGTtSdwY31dDijfAUxR0I="; - license = lib.licenses.mpl20; - passthru.tests.nomad = nixosTests.nomad; - preCheck = '' - export PATH="$PATH:$NIX_BUILD_TOP/go/bin" - ''; - }; + nomad_1_5 = throwUnsupportaed "nomad_1_5"; nomad_1_6 = generic { buildGoModule = buildGo121Module; @@ -81,7 +74,7 @@ rec { }; nomad_1_7 = generic { - buildGoModule = buildGo121Module; + buildGoModule = buildGo122Module; version = "1.7.7"; sha256 = "sha256-4nuRheidR6rIoytrnDQdIP69f+sBLJ3Ias5DvqVaLFc="; vendorHash = "sha256-ZuaD8iDsT+/eW0QUavf485R804Jtjl76NcQWYHA8QII="; @@ -93,10 +86,10 @@ rec { }; nomad_1_8 = generic { - buildGoModule = buildGo121Module; - version = "1.8.0"; - sha256 = "sha256-j/9wvnxYhv6h344904cO2Fi6pNeSV5IfcqS4mSjDqpo="; - vendorHash = "sha256-jNdLLs/mfARl5Uk9RalwSDFLAKqIISEkek3l1wV8EYE="; + buildGoModule = buildGo122Module; + version = "1.8.4"; + sha256 = "sha256-BzLvALD65VqWNB9gx4BgI/mYWLNeHzp6WSXD/1Xf0Wk="; + vendorHash = "sha256-0mnhZeiCLAWvwAoNBJtwss85vhYCrf/5I1AhyXTFnWk="; license = lib.licenses.bsl11; passthru.tests.nomad = nixosTests.nomad; preCheck = '' diff --git a/pkgs/applications/networking/cluster/nova/default.nix b/pkgs/applications/networking/cluster/nova/default.nix index 1e8ab2402d9b9..b4607b50fbf30 100644 --- a/pkgs/applications/networking/cluster/nova/default.nix +++ b/pkgs/applications/networking/cluster/nova/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "nova"; - version = "3.9.0"; + version = "3.10.1"; src = fetchFromGitHub { owner = "FairwindsOps"; repo = pname; rev = "v${version}"; - hash = "sha256-9ccWH0bh67LCwzKmyaE32j+qeKfNauclSMjpRwdblH8="; + hash = "sha256-V7cUXzXvixONqL71f8hpJbGS+PyJgz+8LSwOlmXm+Po="; }; - vendorHash = "sha256-Vt2yUYm2i1NHzW7GxDRqBpaFS4dLfODNEMPO+CTwrLY="; + vendorHash = "sha256-xhpE+KDEf36kAw1HVm3WhiOwyWkFxkD5S+3mx0Sytv4="; ldflags = [ "-X main.version=${version}" "-s" "-w" ]; diff --git a/pkgs/applications/networking/cluster/ocm/default.nix b/pkgs/applications/networking/cluster/ocm/default.nix index f83347d0538e6..1b2b5568cdd1f 100644 --- a/pkgs/applications/networking/cluster/ocm/default.nix +++ b/pkgs/applications/networking/cluster/ocm/default.nix @@ -24,7 +24,7 @@ buildGoModule rec { ''; # Tests fail in Darwin sandbox. - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; postInstall = '' installShellCompletion --cmd ocm \ diff --git a/pkgs/applications/networking/cluster/openlens/default.nix b/pkgs/applications/networking/cluster/openlens/default.nix deleted file mode 100644 index 4581aef00e2d3..0000000000000 --- a/pkgs/applications/networking/cluster/openlens/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib, fetchurl, appimageTools }: - -let - pname = "openlens"; - version = "6.5.2-366"; - - src = fetchurl { - url = "https://github.com/MuhammedKalkan/OpenLens/releases/download/v${version}/OpenLens-${version}.x86_64.AppImage"; - sha256 = "sha256-ZAltAS/U/xh4kCT7vQ+NHAzWV7z0uE5GMQICHKSdj8k="; - }; - - appimageContents = appimageTools.extractType2 { - inherit pname version src; - }; - -in -appimageTools.wrapType2 { - inherit pname version src; - unshareIpc = false; - - extraInstallCommands = '' - install -m 444 -D ${appimageContents}/open-lens.desktop $out/share/applications/${pname}.desktop - install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/512x512/apps/open-lens.png \ - $out/share/icons/hicolor/512x512/apps/${pname}.png - - substituteInPlace $out/share/applications/${pname}.desktop \ - --replace 'Icon=open-lens' 'Icon=${pname}' \ - --replace 'Exec=AppRun' 'Exec=${pname}' - ''; - - meta = with lib; { - description = "Kubernetes IDE"; - homepage = "https://github.com/MuhammedKalkan/OpenLens"; - license = licenses.mit; - maintainers = with maintainers; [ benwbooth sebtm ]; - mainProgram = "openlens"; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/pkgs/applications/networking/cluster/openshift/default.nix b/pkgs/applications/networking/cluster/openshift/default.nix index 39020d87d9991..ea67231bfcc81 100644 --- a/pkgs/applications/networking/cluster/openshift/default.nix +++ b/pkgs/applications/networking/cluster/openshift/default.nix @@ -9,14 +9,14 @@ }: buildGoModule rec { pname = "openshift"; - version = "4.14.0"; - gitCommit = "0c63f9d"; + version = "4.16.0"; + gitCommit = "fa84651"; src = fetchFromGitHub { owner = "openshift"; repo = "oc"; - rev = "0c63f9da2694c080257111616c60005f32a5bf47"; - hash = "sha256-viNSRwGNB0TGgw501cQuj4ajmAgvqk4vj2RmW8/DCB8="; + rev = "fa846511dbeb7e08cf77265056397283c6c896f9"; + hash = "sha256-mGItCpZQqQOKoNm2amwpHrEIcZdVNirQFa7DGvmnR9s="; }; vendorHash = null; @@ -60,7 +60,7 @@ buildGoModule rec { description = "Build, deploy, and manage your applications with Docker and Kubernetes"; homepage = "http://www.openshift.org"; license = licenses.asl20; - maintainers = with maintainers; [ offline bachp moretea stehessel ]; + maintainers = with maintainers; [ offline moretea stehessel ]; mainProgram = "oc"; }; } diff --git a/pkgs/applications/networking/cluster/opentofu/default.nix b/pkgs/applications/networking/cluster/opentofu/default.nix index 5125f318ee007..d37167b37c60c 100644 --- a/pkgs/applications/networking/cluster/opentofu/default.nix +++ b/pkgs/applications/networking/cluster/opentofu/default.nix @@ -14,16 +14,16 @@ let package = buildGoModule rec { pname = "opentofu"; - version = "1.7.2"; + version = "1.8.2"; src = fetchFromGitHub { owner = "opentofu"; repo = "opentofu"; rev = "v${version}"; - hash = "sha256-g0aMpSENMKHCyKyB2Lhq9XjH9GIx7l4/Sz9GDXmzUqU="; + hash = "sha256-kBI3Jgi4fDOx5bknTMlcI2K3LxKj6Q4dunbG9N33Ps0="; }; - vendorHash = "sha256-cML742FfWFNIwGyIdRd3JWcfDlOXnJVgUXz4j5fa74Q="; + vendorHash = "sha256-cM2DSP2ss3vleUhPBIdyxKeWJxtHpdjL5b5HVS/iC6o="; ldflags = [ "-s" "-w" "-X" "github.com/opentofu/opentofu/version.dev=no" ]; postConfigure = '' diff --git a/pkgs/applications/networking/cluster/pachyderm/default.nix b/pkgs/applications/networking/cluster/pachyderm/default.nix index b3c24f5851764..56bad49da759d 100644 --- a/pkgs/applications/networking/cluster/pachyderm/default.nix +++ b/pkgs/applications/networking/cluster/pachyderm/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pachyderm"; - version = "2.10.2"; + version = "2.11.3"; src = fetchFromGitHub { owner = "pachyderm"; repo = "pachyderm"; rev = "v${version}"; - hash = "sha256-5Q3T4yusnJVHU8QdXxbDuePToGp+hu+GnwqD7TG/0Rw="; + hash = "sha256-tn+wOd01zClMcANYTolXHTEMGohXGNnKbsZ5NA4kELc="; }; - vendorHash = "sha256-NShVyjNyG06cLmt8rd71lFLvkd8KRWQjj6xUCx7NgSk="; + vendorHash = "sha256-d2MSMucGMGGPLE0wh8Y27AUVPkeyOCkCa0JSPawYQmc="; subPackages = [ "src/server/cmd/pachctl" ]; diff --git a/pkgs/applications/networking/cluster/pinniped/default.nix b/pkgs/applications/networking/cluster/pinniped/default.nix index c8152edce3354..0e1307a897c24 100644 --- a/pkgs/applications/networking/cluster/pinniped/default.nix +++ b/pkgs/applications/networking/cluster/pinniped/default.nix @@ -2,18 +2,18 @@ buildGoModule rec{ pname = "pinniped"; - version = "0.30.0"; + version = "0.33.0"; src = fetchFromGitHub { owner = "vmware-tanzu"; repo = "pinniped"; rev = "v${version}"; - sha256 = "sha256-tF4MIWHn9NvuZ94mwEujUNs34lvbnmH7oc7ur/jbd9c="; + sha256 = "sha256-BcDUXu/p5BYPrisJJBcaAGHL0k7FHMRKj1/z6Bz9hLU="; }; subPackages = "cmd/pinniped"; - vendorHash = "sha256-vqchVDAw63QyG8ZL2n+YGcMjVt8IUxkFUPHpWt0d/Qk="; + vendorHash = "sha256-quGhv2JpMseQps9qPvuJ6Jit8CxcSCOWYHG684whwl4="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/applications/networking/cluster/pluto/default.nix b/pkgs/applications/networking/cluster/pluto/default.nix index 9936580f3cc22..66bd0f480bdb5 100644 --- a/pkgs/applications/networking/cluster/pluto/default.nix +++ b/pkgs/applications/networking/cluster/pluto/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pluto"; - version = "5.19.4"; + version = "5.20.3"; src = fetchFromGitHub { owner = "FairwindsOps"; repo = "pluto"; rev = "v${version}"; - hash = "sha256-PhP3ILOYv+7gmxOJLCgIYp+1FIJirZo7TZJoZv8A1WM="; + hash = "sha256-WbXIg453VewOejX/hyGi1DEi0cSwcQ+hKUFG8Ne4cPE="; }; - vendorHash = "sha256-EVlYhlEXwgUfRaxAJ3dBTz6MJ2QITZtnHVcQQN1cHbk="; + vendorHash = "sha256-VkaFANSzKOpmHWUwFp7YjwvsJegcJOrvJOBNNAIxOak="; ldflags = [ "-w" "-s" diff --git a/pkgs/applications/networking/cluster/prow/default.nix b/pkgs/applications/networking/cluster/prow/default.nix deleted file mode 100644 index 1ef34b011ef80..0000000000000 --- a/pkgs/applications/networking/cluster/prow/default.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ buildGoModule, fetchFromGitHub, lib }: - -buildGoModule rec { - pname = "prow-unstable"; - version = "2020-04-01"; - rev = "32e3b5ce7695fb622381421653db436cb57b47c5"; - - src = fetchFromGitHub { - inherit rev; - - owner = "kubernetes"; - repo = "test-infra"; - hash = "sha256-ZNa7iAcN1qlBFT/UfziivW4q+9hjIt9WbHEOt6r1g1U="; - }; - - vendorHash = "sha256-FJO8KVCZLehaN1Eku6uQpj/vgwOyO+Irqs0qJHJhzZk="; - - doCheck = false; - - subPackages = [ - "prow/cmd/admission" - "prow/cmd/branchprotector" - "prow/cmd/checkconfig" - "prow/cmd/clonerefs" - "prow/cmd/cm2kc" - "prow/cmd/config-bootstrapper" - "prow/cmd/crier" - "prow/cmd/deck" - "prow/cmd/entrypoint" - "prow/cmd/exporter" - "prow/cmd/gcsupload" - "prow/cmd/gerrit" - "prow/cmd/hook" - "prow/cmd/horologium" - "prow/cmd/initupload" - "prow/cmd/jenkins-operator" - "prow/cmd/mkbuild-cluster" - "prow/cmd/mkpj" - "prow/cmd/mkpod" - "prow/cmd/peribolos" - "prow/cmd/phaino" - "prow/cmd/phony" - "prow/cmd/pipeline" - "prow/cmd/plank" - "prow/cmd/sidecar" - "prow/cmd/sinker" - "prow/cmd/status-reconciler" - "prow/cmd/sub" - "prow/cmd/tackle" - "prow/cmd/tide" - "prow/cmd/tot" - ]; - - meta = with lib; { - description = "Kubernetes based CI/CD system"; - longDescription = '' - Prow is a Kubernetes based CI/CD system. Jobs can be triggered by various - types of events and report their status to many different services. In - addition to job execution, Prow provides GitHub automation in the form of - policy enforcement, chat-ops via /foo style commands, and automatic PR - merging. - ''; - homepage = "https://github.com/kubernetes/test-infra/tree/master/prow"; - license = licenses.asl20; - maintainers = with maintainers; [ kalbasit ]; - platforms = platforms.linux ++ platforms.darwin; - }; -} diff --git a/pkgs/applications/networking/cluster/pv-migrate/default.nix b/pkgs/applications/networking/cluster/pv-migrate/default.nix index 0d7b6db8a7064..ebb00206586d7 100644 --- a/pkgs/applications/networking/cluster/pv-migrate/default.nix +++ b/pkgs/applications/networking/cluster/pv-migrate/default.nix @@ -35,7 +35,7 @@ buildGoModule rec { ''; meta = with lib; { - description = "CLI tool to easily migrate Kubernetes persistent volumes "; + description = "CLI tool to easily migrate Kubernetes persistent volumes"; mainProgram = "pv-migrate"; homepage = "https://github.com/utkuozdemir/pv-migrate"; changelog = "https://github.com/utkuozdemir/pv-migrate/releases/tag/${version}"; diff --git a/pkgs/applications/networking/cluster/rancher/default.nix b/pkgs/applications/networking/cluster/rancher/default.nix index ab781a71ec7e5..820cc94d93133 100644 --- a/pkgs/applications/networking/cluster/rancher/default.nix +++ b/pkgs/applications/networking/cluster/rancher/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "rancher"; - version = "2.7.7"; + version = "2.9.0"; src = fetchFromGitHub { owner = "rancher"; repo = "cli"; rev = "v${version}"; - hash = "sha256-HgLV4iuZXkL6BOKtUul1pFuIWv09VnUSPbdrtFd6Khk="; + hash = "sha256-YyNzqihoQNMmROLeD7/KOU6mTe/UMKgRwGPxCjIglDM="; }; ldflags = [ @@ -19,7 +19,7 @@ buildGoModule rec { "-static" ]; - vendorHash = "sha256-mXLZMnGJ1m5gFroJcSoE4SbVvsyuS73hfXFeWBRtUdI="; + vendorHash = "sha256-BvT5Awn4o8AbCSaUPLuAIsayC2oj2to4VSZpxQlKKSM="; postInstall = '' mv $out/bin/cli $out/bin/rancher diff --git a/pkgs/applications/networking/cluster/rke/default.nix b/pkgs/applications/networking/cluster/rke/default.nix index cea0610f144ed..6dc8052967643 100644 --- a/pkgs/applications/networking/cluster/rke/default.nix +++ b/pkgs/applications/networking/cluster/rke/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "rke"; - version = "1.5.10"; + version = "1.6.2"; src = fetchFromGitHub { owner = "rancher"; repo = pname; rev = "v${version}"; - hash = "sha256-e4YR3vYpaRVhwvBY8VwLp3XNXxnwYlS14VP0gSyLvJA="; + hash = "sha256-KBN7QFjH9wr5G40/224BcTz59aHu+HZISU+LMr54b9c="; }; - vendorHash = "sha256-++4d87ARL1czjL9I/AuodIP2PmbjjAQ5jf5x2bP16yQ="; + vendorHash = "sha256-Rr2BXCpliv9KF9wkXQLy6LxKxyPo1pO5SHUTcy2wETM="; subPackages = [ "." ]; diff --git a/pkgs/applications/networking/cluster/rke2/builder.nix b/pkgs/applications/networking/cluster/rke2/builder.nix index 285108834c1e7..21941ad8ee0a2 100644 --- a/pkgs/applications/networking/cluster/rke2/builder.nix +++ b/pkgs/applications/networking/cluster/rke2/builder.nix @@ -7,6 +7,9 @@ lib: { rke2Version, rke2RepoSha256, rke2VendorHash, updateScript # Runtime dependencies , procps, coreutils, util-linux, ethtool, socat, iptables, bridge-utils, iproute2, kmod, lvm2 +# Killall Script dependencies +, systemd, gnugrep, gnused + # Testing dependencies , nixosTests, testers, rke2 }: @@ -72,6 +75,11 @@ buildGoModule rec { install -D $GOPATH/bin/rke2 $out/bin/rke2 wrapProgram $out/bin/rke2 \ --prefix PATH : ${lib.makeBinPath buildInputs} + + install -D ./bundle/bin/rke2-killall.sh $out/bin/rke2-killall.sh + wrapProgram $out/bin/rke2-killall.sh \ + --prefix PATH : ${lib.makeBinPath [ systemd gnugrep gnused ]} \ + --prefix PATH : ${lib.makeBinPath buildInputs} ''; doCheck = false; @@ -83,7 +91,7 @@ buildGoModule rec { package = rke2; version = "v${version}"; }; - } // lib.optionalAttrs stdenv.isLinux { + } // lib.optionalAttrs stdenv.hostPlatform.isLinux { inherit (nixosTests) rke2; }; diff --git a/pkgs/applications/networking/cluster/rke2/latest/versions.nix b/pkgs/applications/networking/cluster/rke2/latest/versions.nix index c1b2695fd9d7a..f04ea8df2eb01 100644 --- a/pkgs/applications/networking/cluster/rke2/latest/versions.nix +++ b/pkgs/applications/networking/cluster/rke2/latest/versions.nix @@ -1,14 +1,14 @@ { - rke2Version = "1.30.1+rke2r1"; - rke2RepoSha256 = "0jrvvpj9fnlbykyr06w1f92ay708xzaizg8dhg1z4bsq1cdgs33k"; - rke2Commit = "e7f87c6dd56fdd76a7dab58900aeea8946b2c008"; - rke2VendorHash = "sha256-QqV8mSbqa8A5zABHQoVB2jht/eYCoqTZ/WoAqIl9oZY="; - k8sVersion = "v1.30.1"; - k8sImageTag = "v1.30.1-rke2r1-build20240515"; - etcdVersion = "v3.5.9-k3s1"; + rke2Version = "1.31.0+rke2r1"; + rke2RepoSha256 = "1xf7yhpfwiydhl31dd8wc2bhq0j470ad8vazjzzsl76skcy07rbc"; + rke2Commit = "4bf1156f41631dc0e81d66a6834a53d14b48aaef"; + rke2VendorHash = "sha256-/ALzC2fYYI+DbF+2TSNBiMy57T8wfXGPpdyKtbqdrtE="; + k8sVersion = "v1.31.0"; + k8sImageTag = "v1.31.0-rke2r1-build20240815"; + etcdVersion = "v3.5.13-k3s1"; pauseVersion = "3.6"; - ccmVersion = "v1.29.3-build20240412"; - dockerizedVersion = "v1.30.1-rke2r1"; - golangVersion = "go1.22.2"; - eol = "2025-06-28"; + ccmVersion = "v1.29.3-build20240515"; + dockerizedVersion = "v1.31.0-dev."; + golangVersion = "go1.22.5"; + eol = "2025-10-28"; } diff --git a/pkgs/applications/networking/cluster/rke2/stable/versions.nix b/pkgs/applications/networking/cluster/rke2/stable/versions.nix index 0fd4279226fef..ee2c9ceebc1f0 100644 --- a/pkgs/applications/networking/cluster/rke2/stable/versions.nix +++ b/pkgs/applications/networking/cluster/rke2/stable/versions.nix @@ -1,14 +1,14 @@ { - rke2Version = "1.28.10+rke2r1"; - rke2RepoSha256 = "1pbanikvrl6rqrplrpvjc9ym8qq1yrs621gwy99shp0prfw5zvsx"; - rke2Commit = "b0d0d687d98f4fa015e7b30aaf2807b50edcc5d7"; - rke2VendorHash = "sha256-iidkTSrrHyW5ZEouzHAWUwCC9nplGz1v/E9bM2lMPeM="; - k8sVersion = "v1.28.10"; - k8sImageTag = "v1.28.10-rke2r1-build20240514"; - etcdVersion = "v3.5.9-k3s1"; + rke2Version = "1.30.4+rke2r1"; + rke2RepoSha256 = "1daxs8gxy775qn1yrf7zh77cyaj3nn3qlwj0vjqfpbv1gpkimfyi"; + rke2Commit = "9517eea519b780e154dd791c555c698e84a0e5cd"; + rke2VendorHash = "sha256-Q+Wt4Hyp6VyxfCXNsRQMyAo0QCGWhnY9tcV/NQrrSEY="; + k8sVersion = "v1.30.4"; + k8sImageTag = "v1.30.4-rke2r1-build20240815"; + etcdVersion = "v3.5.13-k3s1"; pauseVersion = "3.6"; - ccmVersion = "v1.29.3-build20240412"; - dockerizedVersion = "v1.28.10-rke2r1"; - golangVersion = "go1.21.9"; - eol = "2024-10-28"; + ccmVersion = "v1.29.3-build20240515"; + dockerizedVersion = "v1.30.4-dev.877838a0-dirty"; + golangVersion = "go1.22.5"; + eol = "2025-06-28"; } diff --git a/pkgs/applications/networking/cluster/rke2/testing/versions.nix b/pkgs/applications/networking/cluster/rke2/testing/versions.nix index c0447324a1122..5cf0039d5abd8 100644 --- a/pkgs/applications/networking/cluster/rke2/testing/versions.nix +++ b/pkgs/applications/networking/cluster/rke2/testing/versions.nix @@ -1,14 +1,14 @@ { - rke2Version = "1.30.1-rc3+rke2r1"; - rke2RepoSha256 = "0jrvvpj9fnlbykyr06w1f92ay708xzaizg8dhg1z4bsq1cdgs33k"; - rke2Commit = "e7f87c6dd56fdd76a7dab58900aeea8946b2c008"; - rke2VendorHash = "sha256-QqV8mSbqa8A5zABHQoVB2jht/eYCoqTZ/WoAqIl9oZY="; - k8sVersion = "v1.30.1"; - k8sImageTag = "v1.30.1-rke2r1-build20240515"; - etcdVersion = "v3.5.9-k3s1"; + rke2Version = "1.31.1-rc3+rke2r1"; + rke2RepoSha256 = "1j09f95d99xk1jbsy08cl1rw5y1ljnrmq3nv1rixlc4hgqwz56pm"; + rke2Commit = "909d20d6a28cd7656b7177190f06f69f57927613"; + rke2VendorHash = "sha256-7nWbWi4oJTOWZ5iZr9ptECDJJakPg4qZ7hW+tU7LBsI="; + k8sVersion = "v1.31.1"; + k8sImageTag = "v1.31.1-rke2r1-build20240912"; + etcdVersion = "v3.5.13-k3s1"; pauseVersion = "3.6"; - ccmVersion = "v1.29.3-build20240412"; - dockerizedVersion = "v1.30.1-rc3-rke2r1"; - golangVersion = "go1.22.2"; - eol = "2025-06-28"; + ccmVersion = "v1.31.0-build20240910"; + dockerizedVersion = "v1.31.1-dev."; + golangVersion = "go1.22.6"; + eol = "2025-10-28"; } diff --git a/pkgs/applications/networking/cluster/rke2/update-script.sh b/pkgs/applications/networking/cluster/rke2/update-script.sh index 608f49bb64903..029933b8f8028 100755 --- a/pkgs/applications/networking/cluster/rke2/update-script.sh +++ b/pkgs/applications/networking/cluster/rke2/update-script.sh @@ -5,7 +5,9 @@ set -x -eu -o pipefail CHANNEL_NAME="${1:?Must provide a release channel, like 'stable', as the only argument}" -mkdir --parents --verbose ./${CHANNEL_NAME} +WORKDIR=$(cd $(dirname ${BASH_SOURCE[0]}) && pwd -P) + +mkdir --parents --verbose "${WORKDIR}/${CHANNEL_NAME}" LATEST_TAG_NAME=$(curl --silent --fail https://update.rke2.io/v1-release/channels | \ yq eval ".data[] | select(.id == \"${CHANNEL_NAME}\").latest" - | \ @@ -35,9 +37,9 @@ KUBERNETES_EOL=$(curl --silent --fail \ https://endoflife.date/api/kubernetes/${KUBERNETES_CYCLES}.json | \ yq eval ".eol" -) -FAKE_HASH="sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="; +FAKE_HASH="sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=" -cat > ./${CHANNEL_NAME}/versions.nix << EOF +cat << EOF > "${WORKDIR}/${CHANNEL_NAME}/versions.nix" { rke2Version = "${RKE2_VERSION}"; rke2RepoSha256 = "${RKE2_REPO_SHA256}"; @@ -54,15 +56,13 @@ cat > ./${CHANNEL_NAME}/versions.nix << EOF } EOF -NIXPKGS_ROOT=$(git rev-parse --show-toplevel) - set +e -RKE2_VENDOR_HASH=$(nix-prefetch -I nixpkgs=${NIXPKGS_ROOT} \ - "{ sha256 }: (import ${NIXPKGS_ROOT}/. {}).rke2_${CHANNEL_NAME}.goModules.overrideAttrs (_: { vendorHash = sha256; })") +RKE2_VENDOR_HASH=$(nix-prefetch -I nixpkgs=$(git rev-parse --show-toplevel) \ + "{ sha256 }: rke2_${CHANNEL_NAME}.goModules.overrideAttrs (_: { vendorHash = sha256; })") set -e if [ -n "${RKE2_VENDOR_HASH:-}" ]; then - sed -i "s#${FAKE_HASH}#${RKE2_VENDOR_HASH}#g" ./${CHANNEL_NAME}/versions.nix + sed -i "s#${FAKE_HASH}#${RKE2_VENDOR_HASH}#g" ${WORKDIR}/${CHANNEL_NAME}/versions.nix else echo "Update failed. 'RKE2_VENDOR_HASH' is empty." exit 1 @@ -70,17 +70,15 @@ fi # Implement commit # See: https://nixos.org/manual/nixpkgs/stable/#var-passthru-updateScript-commit -OLD_VERSION=$(nix-instantiate --eval -E \ - "with import ${NIXPKGS_ROOT}/. {}; rke2.version or (builtins.parseDrvName rke2.name).version" | \ - tr -d '"') - cat << EOF -[{ - "attrPath": "rke2_${CHANNEL_NAME}", - "oldVersion": "${OLD_VERSION}", - "newVersion": "${RKE2_VERSION}", - "files": [ - "${PWD}/${CHANNEL_NAME}/versions.nix" - ] -}] +[ + { + "attrPath": "rke2_${CHANNEL_NAME}", + "oldVersion": "${UPDATE_NIX_OLD_VERSION}", + "newVersion": "${RKE2_VERSION}", + "files": [ + "${WORKDIR}/${CHANNEL_NAME}/versions.nix" + ] + } +] EOF diff --git a/pkgs/applications/networking/cluster/roxctl/default.nix b/pkgs/applications/networking/cluster/roxctl/default.nix index b710fe68b3ec4..95156944b8c72 100644 --- a/pkgs/applications/networking/cluster/roxctl/default.nix +++ b/pkgs/applications/networking/cluster/roxctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "roxctl"; - version = "4.4.3"; + version = "4.5.2"; src = fetchFromGitHub { owner = "stackrox"; repo = "stackrox"; rev = version; - sha256 = "sha256-sQUX2Ou+fL4G2u/Mdnl9SwdwRkogiyq3tkauUeW//dU="; + sha256 = "sha256-H6pgPo2/RIpYnNOxP6PgIZhij1I45bm9DVkV2sNcW3A="; }; - vendorHash = "sha256-j/ouxh4nMg5hyzT2RuP+hJrAeK7+PleT2W0DWxxjOfA="; + vendorHash = "sha256-qDSi1Jk6erSCwPiLubdVlqOT6PQygMQghS8leieJ78s="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/sonobuoy/default.nix b/pkgs/applications/networking/cluster/sonobuoy/default.nix index a62efd6833fb2..e86d9c920c3a6 100644 --- a/pkgs/applications/networking/cluster/sonobuoy/default.nix +++ b/pkgs/applications/networking/cluster/sonobuoy/default.nix @@ -2,11 +2,11 @@ # SHA of ${version} for the tool's help output. Unfortunately this is needed in build flags. # The update script can update this automatically, the comment is used to find the line. -let rev = "6f9e27f1795f10475c9f6f5decdff692e1e228da"; # update-commit-sha +let rev = "cc22d58f4c8b5a155bd1778cd3702eca5ad43e05"; # update-commit-sha in buildGoModule rec { pname = "sonobuoy"; - version = "0.57.1"; # Do not forget to update `rev` above + version = "0.57.2"; # Do not forget to update `rev` above ldflags = let t = "github.com/vmware-tanzu/sonobuoy"; @@ -21,10 +21,10 @@ buildGoModule rec { owner = "vmware-tanzu"; repo = "sonobuoy"; rev = "v${version}"; - hash = "sha256-e9C5ZwKqT3Fiko2HqrIpONVvjhT8KBBO7rQc3BJhl+A="; + hash = "sha256-QRHCAnZwz90ZVaZUbg7Jv1VlobbcY5mbFQbMQJfHsfU="; }; - vendorHash = "sha256-HE53eIEyhOI9ksEx1EKmv/txaTa7KDrNUMEVRMi4Wuo="; + vendorHash = "sha256-QUKdCsbxobusyaPWLMJujPgmWIT3mBajgy98BUAgPyk="; subPackages = [ "." ]; diff --git a/pkgs/applications/networking/cluster/spark/default.nix b/pkgs/applications/networking/cluster/spark/default.nix index d3c0e1fd3f202..86e98c3a419d0 100644 --- a/pkgs/applications/networking/cluster/spark/default.nix +++ b/pkgs/applications/networking/cluster/spark/default.nix @@ -2,9 +2,7 @@ , stdenv , fetchzip , makeWrapper -, jdk8 , python3 -, coreutils , hadoop , RSupport ? true , R @@ -77,7 +75,7 @@ in }; spark_3_4 = spark rec { pname = "spark"; - version = "3.4.2"; - hash = "sha256-qr0tRuzzEcarJznrQYkaQzGqI7tugp/XJpoZxL7tJwk="; + version = "3.4.3"; + hash = "sha256-ifeytk08oaEyiEawwWbUWWuoynGTJNvnrkOW/CjeaSk="; }; } diff --git a/pkgs/applications/networking/cluster/ssm-session-manager-plugin/default.nix b/pkgs/applications/networking/cluster/ssm-session-manager-plugin/default.nix deleted file mode 100644 index ecc353a178ef1..0000000000000 --- a/pkgs/applications/networking/cluster/ssm-session-manager-plugin/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ lib -, fetchFromGitHub -, buildGoPackage -}: - -buildGoPackage rec { - pname = "ssm-session-manager-plugin"; - version = "1.2.633.0"; - - goPackagePath = "github.com/aws/session-manager-plugin"; - - src = fetchFromGitHub { - owner = "aws"; - repo = "session-manager-plugin"; - rev = version; - hash = "sha256-dwNCTJOxpothAcJSfch2jkxdgXg6xDd/fDQCQo2Xd+8="; - }; - - postPatch = '' - mv vendor{,-old} - mv vendor-old/src vendor - rm -r vendor-old - ''; - - preBuild = '' - pushd go/src/${lib.escapeShellArg goPackagePath} - echo -n ${lib.escapeShellArg version} > VERSION - go run src/version/versiongenerator/version-gen.go - popd - ''; - - doCheck = true; - checkFlags = [ "-skip=TestSetSessionHandlers" ]; - - preCheck = '' - if ! [[ $(go/bin/sessionmanagerplugin-main --version) = ${lib.escapeShellArg version} ]]; then - echo 'wrong version' - exit 1 - fi - ''; - - installPhase = '' - runHook preInstall - install -Dm555 go/bin/sessionmanagerplugin-main "$out/bin/session-manager-plugin" - runHook postInstall - ''; - - meta = with lib; { - homepage = "https://docs.aws.amazon.com/systems-manager/latest/userguide/session-manager-working-with-install-plugin.html"; - description = "Amazon SSM Session Manager Plugin"; - mainProgram = "session-manager-plugin"; - license = licenses.asl20; - maintainers = with maintainers; [ amarshall mbaillie ]; - }; -} diff --git a/pkgs/applications/networking/cluster/starboard/default.nix b/pkgs/applications/networking/cluster/starboard/default.nix index 59b3a9de41e67..ea4f3a80adb40 100644 --- a/pkgs/applications/networking/cluster/starboard/default.nix +++ b/pkgs/applications/networking/cluster/starboard/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "starboard"; - version = "0.15.20"; + version = "0.15.21"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-oOz7Dt+j2EmBL/aJUjqRST90wYpXkyREnKCcmNBQX18="; + hash = "sha256-XSxmF3dDTKVnZI4yt686LA0E3mIVdamGMX5EqIQ2qQE="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -20,7 +20,7 @@ buildGoModule rec { find "$out" -name .git -print0 | xargs -0 rm -rf ''; }; - vendorHash = "sha256-6qz0nFqdo/ympxuJDy2gD4kr5G5j0DbhUxl+7ocDdO4="; + vendorHash = "sha256-eDAJyOj3P1dJ0h/Y0O+8JrHw2S+8MPj4NikzrI7eDrk="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/talosctl/default.nix b/pkgs/applications/networking/cluster/talosctl/default.nix index 067df7c8952f5..d7b73979dfb80 100644 --- a/pkgs/applications/networking/cluster/talosctl/default.nix +++ b/pkgs/applications/networking/cluster/talosctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "talosctl"; - version = "1.7.4"; + version = "1.7.6"; src = fetchFromGitHub { owner = "siderolabs"; repo = "talos"; rev = "v${version}"; - hash = "sha256-TVRWcgBt6MmHOh3LYSjJtp5qf/+ar+LWDGfHKQhDFZ8="; + hash = "sha256-uyPnln1Cj4j1oPVERBIHMJXJWR+jPUq6AE7rZXr2yQo="; }; - vendorHash = "sha256-30fMLczb4+BVSxZSbhQ2S1MrQ2+Ykyqf+Dio8n0LGE0="; + vendorHash = "sha256-ZJGhPT2KYYIMKmRWqdOppvXSD2W8kYtxK/900TdVdUg="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/applications/networking/cluster/tanka/default.nix b/pkgs/applications/networking/cluster/tanka/default.nix index fd805916ab03b..1a734bc0eb91d 100644 --- a/pkgs/applications/networking/cluster/tanka/default.nix +++ b/pkgs/applications/networking/cluster/tanka/default.nix @@ -2,18 +2,20 @@ buildGoModule rec { pname = "tanka"; - version = "0.27.1"; + version = "0.28.2"; src = fetchFromGitHub { owner = "grafana"; repo = pname; rev = "v${version}"; - sha256 = "sha256-4ChTYwRp9R8U97hH1Bgrxr5a/5IoWRAmFgJbD7oJpO4="; + sha256 = "sha256-KXOH2CSGG0esgpgU85mszoYnYHc9XhdYoAtr3DFR30g="; }; - vendorHash = "sha256-u2l3cX8PKHUCPkHuCOyED2LLWygYCDJEhfTjycEBzHI="; + vendorHash = "sha256-MJwizWd2X4YE0QhwCxw3FX7+Z5HxakYjBttu8KGLsWo="; doCheck = false; + # Required for versions >= 0.28 as they introduce a gowork.sum file. This is only used for tests so we can safely disable GOWORK + env.GOWORK = "off"; subPackages = [ "cmd/tk" ]; diff --git a/pkgs/applications/networking/cluster/tektoncd-cli/default.nix b/pkgs/applications/networking/cluster/tektoncd-cli/default.nix index e4c85248360aa..84cc60af542d2 100644 --- a/pkgs/applications/networking/cluster/tektoncd-cli/default.nix +++ b/pkgs/applications/networking/cluster/tektoncd-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tektoncd-cli"; - version = "0.37.0"; + version = "0.38.1"; src = fetchFromGitHub { owner = "tektoncd"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-PoWpNuv3Tw3vjuMRZGcpy6R6OeSYSHy1DMmzE7P2LLY="; + sha256 = "sha256-FZbuYKYT/LJ9php66N2RYGGYDJxDI9fWfIZAI8X+iRk="; }; vendorHash = null; diff --git a/pkgs/applications/networking/cluster/temporal-cli/default.nix b/pkgs/applications/networking/cluster/temporal-cli/default.nix index 4bf6a34f1c0bd..101d3baa6c5df 100644 --- a/pkgs/applications/networking/cluster/temporal-cli/default.nix +++ b/pkgs/applications/networking/cluster/temporal-cli/default.nix @@ -17,16 +17,16 @@ let tctl-next = buildGoModule rec { pname = "tctl-next"; - version = "0.13.0"; + version = "1.0.0"; src = fetchFromGitHub { owner = "temporalio"; repo = "cli"; rev = "v${version}"; - hash = "sha256-2zk+B+GomLZwep5LNRpWJj8JjFC0OxAl1XhAv+8b2kc="; + hash = "sha256-y0C2z2iMMQSG5+xGngZ98+ixIgbvaQxPdAWuPbEbBAY="; }; - vendorHash = "sha256-NLteuVOswIw2ModdE0Ak4XmApkHLoYDt6SDAZGsgwBk="; + vendorHash = "sha256-zhGqDHdVGg7eGnw5L3eSyXKBTjp85ir5zrtf7HbXmC0="; inherit overrideModAttrs; @@ -37,11 +37,11 @@ let ldflags = [ "-s" "-w" - "-X github.com/temporalio/cli/headers.Version=${version}" + "-X github.com/temporalio/cli/temporalcli.Version=${version}" ]; # Tests fail with x86 on macOS Rosetta 2 - doCheck = !(stdenv.isDarwin && stdenv.hostPlatform.isx86_64); + doCheck = !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64); preCheck = '' export HOME="$(mktemp -d)" diff --git a/pkgs/applications/networking/cluster/temporal/default.nix b/pkgs/applications/networking/cluster/temporal/default.nix index 3b23b750864cf..93f71492b2bec 100644 --- a/pkgs/applications/networking/cluster/temporal/default.nix +++ b/pkgs/applications/networking/cluster/temporal/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "temporal"; - version = "1.24.2"; + version = "1.25.0"; src = fetchFromGitHub { owner = "temporalio"; repo = "temporal"; rev = "v${version}"; - hash = "sha256-hQkus8BZvtR2ObCJbtP2SZST9tRxuPjFwR+jKDYH8Bs="; + hash = "sha256-H/kHPS43h+MQgOpKIHoM6hJQxCYq8Yo1GzOQeLFRoNw="; }; - vendorHash = "sha256-u9xQFTwVKEGRPhBwcBgexCQhlNO91yP4m4vchCdBt9E="; + vendorHash = "sha256-RhWeIT1i86wxAALNhhpWZjWo1v+82vTrGBWCaryE3Ws="; excludedPackages = [ "./build" ]; @@ -45,7 +45,7 @@ buildGoModule rec { homepage = "https://temporal.io"; changelog = "https://github.com/temporalio/temporal/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; mainProgram = "temporal-server"; }; } diff --git a/pkgs/applications/networking/cluster/terraform-docs/default.nix b/pkgs/applications/networking/cluster/terraform-docs/default.nix deleted file mode 100644 index 1890a26d99c16..0000000000000 --- a/pkgs/applications/networking/cluster/terraform-docs/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub, go_1_21 }: -buildGoModule rec { - pname = "terraform-docs"; - version = "0.17.0"; - - go = go_1_21; - - src = fetchFromGitHub { - owner = "terraform-docs"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-HkkW6JX5wcGElmr6CiSukyeS/8rz4CUThy8rZfx4hbo="; - }; - - patches = [ ./update-to-go-1.21.patch ]; - - vendorHash = "sha256-ZHWAiXJG8vCmUkf6GNxoIJbIEjEWukLdrmdIb64QleI="; - - subPackages = [ "." ]; - - meta = with lib; { - description = "Utility to generate documentation from Terraform modules in various output formats"; - mainProgram = "terraform-docs"; - homepage = "https://github.com/terraform-docs/terraform-docs/"; - license = licenses.mit; - maintainers = with maintainers; [ zimbatm ]; - }; -} diff --git a/pkgs/applications/networking/cluster/terraform-docs/update-to-go-1.21.patch b/pkgs/applications/networking/cluster/terraform-docs/update-to-go-1.21.patch deleted file mode 100644 index 2397082ca0015..0000000000000 --- a/pkgs/applications/networking/cluster/terraform-docs/update-to-go-1.21.patch +++ /dev/null @@ -1,2698 +0,0 @@ -diff --git a/go.mod b/go.mod -index b3035e3..701d299 100644 ---- a/go.mod -+++ b/go.mod -@@ -1,6 +1,6 @@ - module github.com/terraform-docs/terraform-docs - --go 1.16 -+go 1.21 - - require ( - github.com/BurntSushi/toml v1.3.2 -@@ -23,18 +23,50 @@ require ( - ) - - require ( -+ github.com/Masterminds/goutils v1.1.1 // indirect - github.com/Masterminds/semver/v3 v3.2.1 // indirect - github.com/agext/levenshtein v1.2.3 // indirect -+ github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect -+ github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect - github.com/fatih/color v1.16.0 // indirect -+ github.com/fsnotify/fsnotify v1.7.0 // indirect -+ github.com/golang/protobuf v1.5.3 // indirect -+ github.com/google/go-cmp v0.5.9 // indirect -+ github.com/google/uuid v1.4.0 // indirect -+ github.com/hashicorp/hcl v1.0.0 // indirect -+ github.com/hashicorp/yamux v0.1.1 // indirect - github.com/huandu/xstrings v1.4.0 // indirect -+ github.com/inconshreveable/mousetrap v1.1.0 // indirect -+ github.com/magiconair/properties v1.8.7 // indirect -+ github.com/mattn/go-colorable v0.1.13 // indirect -+ github.com/mattn/go-isatty v0.0.20 // indirect - github.com/mitchellh/copystructure v1.2.0 // indirect - github.com/mitchellh/go-testing-interface v1.14.1 // indirect - github.com/mitchellh/go-wordwrap v1.0.1 // indirect -+ github.com/mitchellh/mapstructure v1.5.0 // indirect -+ github.com/mitchellh/reflectwalk v1.0.2 // indirect - github.com/oklog/run v1.1.0 // indirect -+ github.com/pelletier/go-toml/v2 v2.1.0 // indirect -+ github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect -+ github.com/sagikazarmark/locafero v0.4.0 // indirect -+ github.com/sagikazarmark/slog-shim v0.1.0 // indirect - github.com/shopspring/decimal v1.3.1 // indirect -+ github.com/sourcegraph/conc v0.3.0 // indirect -+ github.com/spf13/afero v1.11.0 // indirect -+ github.com/spf13/cast v1.6.0 // indirect -+ github.com/subosito/gotenv v1.6.0 // indirect - github.com/zclconf/go-cty v1.14.1 // indirect - go.uber.org/multierr v1.11.0 // indirect -+ golang.org/x/crypto v0.16.0 // indirect - golang.org/x/exp v0.0.0-20231206192017-f3f8817b8deb // indirect - golang.org/x/exp/typeparams v0.0.0-20220722155223-a9213eeb770e // indirect -+ golang.org/x/mod v0.14.0 // indirect -+ golang.org/x/net v0.19.0 // indirect -+ golang.org/x/sys v0.15.0 // indirect -+ golang.org/x/text v0.14.0 // indirect -+ golang.org/x/tools v0.16.0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20231127180814-3a041ad873d4 // indirect -+ google.golang.org/grpc v1.59.0 // indirect -+ google.golang.org/protobuf v1.31.0 // indirect -+ gopkg.in/ini.v1 v1.67.0 // indirect - ) -diff --git a/go.sum b/go.sum -index 8bd57a4..3fc860d 100644 ---- a/go.sum -+++ b/go.sum -@@ -1,1161 +1,5 @@ --cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= --cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= --cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= --cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU= --cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= --cloud.google.com/go v0.44.3/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= --cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc= --cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0= --cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To= --cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4= --cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M= --cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc= --cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk= --cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs= --cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc= --cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY= --cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI= --cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmWk= --cloud.google.com/go v0.75.0/go.mod h1:VGuuCn7PG0dwsd5XPVm2Mm3wlh3EL55/79EKB6hlPTY= --cloud.google.com/go v0.78.0/go.mod h1:QjdrLG0uq+YwhjoVOLsS1t7TW8fs36kLs4XO5R5ECHg= --cloud.google.com/go v0.79.0/go.mod h1:3bzgcEeQlzbuEAYu4mrWhKqWjmpprinYgKJLgKHnbb8= --cloud.google.com/go v0.81.0/go.mod h1:mk/AM35KwGk/Nm2YSeZbxXdrNK3KZOYHmLkOqC2V6E0= --cloud.google.com/go v0.83.0/go.mod h1:Z7MJUsANfY0pYPdw0lbnivPx4/vhy/e2FEkSkF7vAVY= --cloud.google.com/go v0.84.0/go.mod h1:RazrYuxIK6Kb7YrzzhPoLmCVzl7Sup4NrbKPg8KHSUM= --cloud.google.com/go v0.87.0/go.mod h1:TpDYlFy7vuLzZMMZ+B6iRiELaY7z/gJPaqbMx6mlWcY= --cloud.google.com/go v0.90.0/go.mod h1:kRX0mNRHe0e2rC6oNakvwQqzyDmg57xJ+SZU1eT2aDQ= --cloud.google.com/go v0.93.3/go.mod h1:8utlLll2EF5XMAV15woO4lSbWQlk8rer9aLOfLh7+YI= --cloud.google.com/go v0.94.1/go.mod h1:qAlAugsXlC+JWO+Bke5vCtc9ONxjQT3drlTTnAplMW4= --cloud.google.com/go v0.97.0/go.mod h1:GF7l59pYBVlXQIBLx3a761cZ41F9bBH3JUlihCt2Udc= --cloud.google.com/go v0.99.0/go.mod h1:w0Xx2nLzqWJPuozYQX+hFfCSI8WioryfRDzkoI/Y2ZA= --cloud.google.com/go v0.100.1/go.mod h1:fs4QogzfH5n2pBXBP9vRiU+eCny7lD2vmFZy79Iuw1U= --cloud.google.com/go v0.100.2/go.mod h1:4Xra9TjzAeYHrl5+oeLlzbM2k3mjVhZh4UqTZ//w99A= --cloud.google.com/go v0.102.0/go.mod h1:oWcCzKlqJ5zgHQt9YsaeTY9KzIvjyy0ArmiBUgpQ+nc= --cloud.google.com/go v0.102.1/go.mod h1:XZ77E9qnTEnrgEOvr4xzfdX5TRo7fB4T2F4O6+34hIU= --cloud.google.com/go v0.104.0/go.mod h1:OO6xxXdJyvuJPcEPBLN9BJPD+jep5G1+2U5B5gkRYtA= --cloud.google.com/go v0.105.0/go.mod h1:PrLgOJNe5nfE9UMxKxgXj4mD3voiP+YQ6gdt6KMFOKM= --cloud.google.com/go v0.107.0/go.mod h1:wpc2eNrD7hXUTy8EKS10jkxpZBjASrORK7goS+3YX2I= --cloud.google.com/go v0.110.0/go.mod h1:SJnCLqQ0FCFGSZMUNUf84MV3Aia54kn7pi8st7tMzaY= --cloud.google.com/go v0.110.2/go.mod h1:k04UEeEtb6ZBRTv3dZz4CeJC3jKGxyhl0sAiVVquxiw= --cloud.google.com/go v0.110.4/go.mod h1:+EYjdK8e5RME/VY/qLCAtuyALQ9q67dvuum8i+H5xsI= --cloud.google.com/go v0.110.6/go.mod h1:+EYjdK8e5RME/VY/qLCAtuyALQ9q67dvuum8i+H5xsI= --cloud.google.com/go v0.110.7/go.mod h1:+EYjdK8e5RME/VY/qLCAtuyALQ9q67dvuum8i+H5xsI= --cloud.google.com/go v0.110.8/go.mod h1:Iz8AkXJf1qmxC3Oxoep8R1T36w8B92yU29PcBhHO5fk= --cloud.google.com/go v0.110.9/go.mod h1:rpxevX/0Lqvlbc88b7Sc1SPNdyK1riNBTUU6JXhYNpM= --cloud.google.com/go v0.110.10/go.mod h1:v1OoFqYxiBkUrruItNM3eT4lLByNjxmJSV/xDKJNnic= --cloud.google.com/go/accessapproval v1.4.0/go.mod h1:zybIuC3KpDOvotz59lFe5qxRZx6C75OtwbisN56xYB4= --cloud.google.com/go/accessapproval v1.5.0/go.mod h1:HFy3tuiGvMdcd/u+Cu5b9NkO1pEICJ46IR82PoUdplw= --cloud.google.com/go/accessapproval v1.6.0/go.mod h1:R0EiYnwV5fsRFiKZkPHr6mwyk2wxUJ30nL4j2pcFY2E= --cloud.google.com/go/accessapproval v1.7.1/go.mod h1:JYczztsHRMK7NTXb6Xw+dwbs/WnOJxbo/2mTI+Kgg68= --cloud.google.com/go/accessapproval v1.7.2/go.mod h1:/gShiq9/kK/h8T/eEn1BTzalDvk0mZxJlhfw0p+Xuc0= --cloud.google.com/go/accessapproval v1.7.3/go.mod h1:4l8+pwIxGTNqSf4T3ds8nLO94NQf0W/KnMNuQ9PbnP8= --cloud.google.com/go/accessapproval v1.7.4/go.mod h1:/aTEh45LzplQgFYdQdwPMR9YdX0UlhBmvB84uAmQKUc= --cloud.google.com/go/accesscontextmanager v1.3.0/go.mod h1:TgCBehyr5gNMz7ZaH9xubp+CE8dkrszb4oK9CWyvD4o= --cloud.google.com/go/accesscontextmanager v1.4.0/go.mod h1:/Kjh7BBu/Gh83sv+K60vN9QE5NJcd80sU33vIe2IFPE= --cloud.google.com/go/accesscontextmanager v1.6.0/go.mod h1:8XCvZWfYw3K/ji0iVnp+6pu7huxoQTLmxAbVjbloTtM= --cloud.google.com/go/accesscontextmanager v1.7.0/go.mod h1:CEGLewx8dwa33aDAZQujl7Dx+uYhS0eay198wB/VumQ= --cloud.google.com/go/accesscontextmanager v1.8.0/go.mod h1:uI+AI/r1oyWK99NN8cQ3UK76AMelMzgZCvJfsi2c+ps= --cloud.google.com/go/accesscontextmanager v1.8.1/go.mod h1:JFJHfvuaTC+++1iL1coPiG1eu5D24db2wXCDWDjIrxo= --cloud.google.com/go/accesscontextmanager v1.8.2/go.mod h1:E6/SCRM30elQJ2PKtFMs2YhfJpZSNcJyejhuzoId4Zk= --cloud.google.com/go/accesscontextmanager v1.8.3/go.mod h1:4i/JkF2JiFbhLnnpnfoTX5vRXfhf9ukhU1ANOTALTOQ= --cloud.google.com/go/accesscontextmanager v1.8.4/go.mod h1:ParU+WbMpD34s5JFEnGAnPBYAgUHozaTmDJU7aCU9+M= --cloud.google.com/go/aiplatform v1.22.0/go.mod h1:ig5Nct50bZlzV6NvKaTwmplLLddFx0YReh9WfTO5jKw= --cloud.google.com/go/aiplatform v1.24.0/go.mod h1:67UUvRBKG6GTayHKV8DBv2RtR1t93YRu5B1P3x99mYY= --cloud.google.com/go/aiplatform v1.27.0/go.mod h1:Bvxqtl40l0WImSb04d0hXFU7gDOiq9jQmorivIiWcKg= --cloud.google.com/go/aiplatform v1.35.0/go.mod h1:7MFT/vCaOyZT/4IIFfxH4ErVg/4ku6lKv3w0+tFTgXQ= --cloud.google.com/go/aiplatform v1.36.1/go.mod h1:WTm12vJRPARNvJ+v6P52RDHCNe4AhvjcIZ/9/RRHy/k= --cloud.google.com/go/aiplatform v1.37.0/go.mod h1:IU2Cv29Lv9oCn/9LkFiiuKfwrRTq+QQMbW+hPCxJGZw= --cloud.google.com/go/aiplatform v1.45.0/go.mod h1:Iu2Q7sC7QGhXUeOhAj/oCK9a+ULz1O4AotZiqjQ8MYA= --cloud.google.com/go/aiplatform v1.48.0/go.mod h1:Iu2Q7sC7QGhXUeOhAj/oCK9a+ULz1O4AotZiqjQ8MYA= --cloud.google.com/go/aiplatform v1.50.0/go.mod h1:IRc2b8XAMTa9ZmfJV1BCCQbieWWvDnP1A8znyz5N7y4= --cloud.google.com/go/aiplatform v1.51.0/go.mod h1:IRc2b8XAMTa9ZmfJV1BCCQbieWWvDnP1A8znyz5N7y4= --cloud.google.com/go/aiplatform v1.51.1/go.mod h1:kY3nIMAVQOK2XDqDPHaOuD9e+FdMA6OOpfBjsvaFSOo= --cloud.google.com/go/aiplatform v1.51.2/go.mod h1:hCqVYB3mY45w99TmetEoe8eCQEwZEp9WHxeZdcv9phw= --cloud.google.com/go/aiplatform v1.52.0/go.mod h1:pwZMGvqe0JRkI1GWSZCtnAfrR4K1bv65IHILGA//VEU= --cloud.google.com/go/aiplatform v1.54.0/go.mod h1:pwZMGvqe0JRkI1GWSZCtnAfrR4K1bv65IHILGA//VEU= --cloud.google.com/go/analytics v0.11.0/go.mod h1:DjEWCu41bVbYcKyvlws9Er60YE4a//bK6mnhWvQeFNI= --cloud.google.com/go/analytics v0.12.0/go.mod h1:gkfj9h6XRf9+TS4bmuhPEShsh3hH8PAZzm/41OOhQd4= --cloud.google.com/go/analytics v0.17.0/go.mod h1:WXFa3WSym4IZ+JiKmavYdJwGG/CvpqiqczmL59bTD9M= --cloud.google.com/go/analytics v0.18.0/go.mod h1:ZkeHGQlcIPkw0R/GW+boWHhCOR43xz9RN/jn7WcqfIE= --cloud.google.com/go/analytics v0.19.0/go.mod h1:k8liqf5/HCnOUkbawNtrWWc+UAzyDlW89doe8TtoDsE= --cloud.google.com/go/analytics v0.21.2/go.mod h1:U8dcUtmDmjrmUTnnnRnI4m6zKn/yaA5N9RlEkYFHpQo= --cloud.google.com/go/analytics v0.21.3/go.mod h1:U8dcUtmDmjrmUTnnnRnI4m6zKn/yaA5N9RlEkYFHpQo= --cloud.google.com/go/analytics v0.21.4/go.mod h1:zZgNCxLCy8b2rKKVfC1YkC2vTrpfZmeRCySM3aUbskA= --cloud.google.com/go/analytics v0.21.5/go.mod h1:BQtOBHWTlJ96axpPPnw5CvGJ6i3Ve/qX2fTxR8qWyr8= --cloud.google.com/go/analytics v0.21.6/go.mod h1:eiROFQKosh4hMaNhF85Oc9WO97Cpa7RggD40e/RBy8w= --cloud.google.com/go/apigateway v1.3.0/go.mod h1:89Z8Bhpmxu6AmUxuVRg/ECRGReEdiP3vQtk4Z1J9rJk= --cloud.google.com/go/apigateway v1.4.0/go.mod h1:pHVY9MKGaH9PQ3pJ4YLzoj6U5FUDeDFBllIz7WmzJoc= --cloud.google.com/go/apigateway v1.5.0/go.mod h1:GpnZR3Q4rR7LVu5951qfXPJCHquZt02jf7xQx7kpqN8= --cloud.google.com/go/apigateway v1.6.1/go.mod h1:ufAS3wpbRjqfZrzpvLC2oh0MFlpRJm2E/ts25yyqmXA= --cloud.google.com/go/apigateway v1.6.2/go.mod h1:CwMC90nnZElorCW63P2pAYm25AtQrHfuOkbRSHj0bT8= --cloud.google.com/go/apigateway v1.6.3/go.mod h1:k68PXWpEs6BVDTtnLQAyG606Q3mz8pshItwPXjgv44Y= --cloud.google.com/go/apigateway v1.6.4/go.mod h1:0EpJlVGH5HwAN4VF4Iec8TAzGN1aQgbxAWGJsnPCGGY= --cloud.google.com/go/apigeeconnect v1.3.0/go.mod h1:G/AwXFAKo0gIXkPTVfZDd2qA1TxBXJ3MgMRBQkIi9jc= --cloud.google.com/go/apigeeconnect v1.4.0/go.mod h1:kV4NwOKqjvt2JYR0AoIWo2QGfoRtn/pkS3QlHp0Ni04= --cloud.google.com/go/apigeeconnect v1.5.0/go.mod h1:KFaCqvBRU6idyhSNyn3vlHXc8VMDJdRmwDF6JyFRqZ8= --cloud.google.com/go/apigeeconnect v1.6.1/go.mod h1:C4awq7x0JpLtrlQCr8AzVIzAaYgngRqWf9S5Uhg+wWs= --cloud.google.com/go/apigeeconnect v1.6.2/go.mod h1:s6O0CgXT9RgAxlq3DLXvG8riw8PYYbU/v25jqP3Dy18= --cloud.google.com/go/apigeeconnect v1.6.3/go.mod h1:peG0HFQ0si2bN15M6QSjEW/W7Gy3NYkWGz7pFz13cbo= --cloud.google.com/go/apigeeconnect v1.6.4/go.mod h1:CapQCWZ8TCjnU0d7PobxhpOdVz/OVJ2Hr/Zcuu1xFx0= --cloud.google.com/go/apigeeregistry v0.4.0/go.mod h1:EUG4PGcsZvxOXAdyEghIdXwAEi/4MEaoqLMLDMIwKXY= --cloud.google.com/go/apigeeregistry v0.5.0/go.mod h1:YR5+s0BVNZfVOUkMa5pAR2xGd0A473vA5M7j247o1wM= --cloud.google.com/go/apigeeregistry v0.6.0/go.mod h1:BFNzW7yQVLZ3yj0TKcwzb8n25CFBri51GVGOEUcgQsc= --cloud.google.com/go/apigeeregistry v0.7.1/go.mod h1:1XgyjZye4Mqtw7T9TsY4NW10U7BojBvG4RMD+vRDrIw= --cloud.google.com/go/apigeeregistry v0.7.2/go.mod h1:9CA2B2+TGsPKtfi3F7/1ncCCsL62NXBRfM6iPoGSM+8= --cloud.google.com/go/apigeeregistry v0.8.1/go.mod h1:MW4ig1N4JZQsXmBSwH4rwpgDonocz7FPBSw6XPGHmYw= --cloud.google.com/go/apigeeregistry v0.8.2/go.mod h1:h4v11TDGdeXJDJvImtgK2AFVvMIgGWjSb0HRnBSjcX8= --cloud.google.com/go/apikeys v0.4.0/go.mod h1:XATS/yqZbaBK0HOssf+ALHp8jAlNHUgyfprvNcBIszU= --cloud.google.com/go/apikeys v0.5.0/go.mod h1:5aQfwY4D+ewMMWScd3hm2en3hCj+BROlyrt3ytS7KLI= --cloud.google.com/go/apikeys v0.6.0/go.mod h1:kbpXu5upyiAlGkKrJgQl8A0rKNNJ7dQ377pdroRSSi8= --cloud.google.com/go/appengine v1.4.0/go.mod h1:CS2NhuBuDXM9f+qscZ6V86m1MIIqPj3WC/UoEuR1Sno= --cloud.google.com/go/appengine v1.5.0/go.mod h1:TfasSozdkFI0zeoxW3PTBLiNqRmzraodCWatWI9Dmak= --cloud.google.com/go/appengine v1.6.0/go.mod h1:hg6i0J/BD2cKmDJbaFSYHFyZkgBEfQrDg/X0V5fJn84= --cloud.google.com/go/appengine v1.7.0/go.mod h1:eZqpbHFCqRGa2aCdope7eC0SWLV1j0neb/QnMJVWx6A= --cloud.google.com/go/appengine v1.7.1/go.mod h1:IHLToyb/3fKutRysUlFO0BPt5j7RiQ45nrzEJmKTo6E= --cloud.google.com/go/appengine v1.8.1/go.mod h1:6NJXGLVhZCN9aQ/AEDvmfzKEfoYBlfB80/BHiKVputY= --cloud.google.com/go/appengine v1.8.2/go.mod h1:WMeJV9oZ51pvclqFN2PqHoGnys7rK0rz6s3Mp6yMvDo= --cloud.google.com/go/appengine v1.8.3/go.mod h1:2oUPZ1LVZ5EXi+AF1ihNAF+S8JrzQ3till5m9VQkrsk= --cloud.google.com/go/appengine v1.8.4/go.mod h1:TZ24v+wXBujtkK77CXCpjZbnuTvsFNT41MUaZ28D6vg= --cloud.google.com/go/area120 v0.5.0/go.mod h1:DE/n4mp+iqVyvxHN41Vf1CR602GiHQjFPusMFW6bGR4= --cloud.google.com/go/area120 v0.6.0/go.mod h1:39yFJqWVgm0UZqWTOdqkLhjoC7uFfgXRC8g/ZegeAh0= --cloud.google.com/go/area120 v0.7.0/go.mod h1:a3+8EUD1SX5RUcCs3MY5YasiO1z6yLiNLRiFrykbynY= --cloud.google.com/go/area120 v0.7.1/go.mod h1:j84i4E1RboTWjKtZVWXPqvK5VHQFJRF2c1Nm69pWm9k= --cloud.google.com/go/area120 v0.8.1/go.mod h1:BVfZpGpB7KFVNxPiQBuHkX6Ed0rS51xIgmGyjrAfzsg= --cloud.google.com/go/area120 v0.8.2/go.mod h1:a5qfo+x77SRLXnCynFWPUZhnZGeSgvQ+Y0v1kSItkh4= --cloud.google.com/go/area120 v0.8.3/go.mod h1:5zj6pMzVTH+SVHljdSKC35sriR/CVvQZzG/Icdyriw0= --cloud.google.com/go/area120 v0.8.4/go.mod h1:jfawXjxf29wyBXr48+W+GyX/f8fflxp642D/bb9v68M= --cloud.google.com/go/artifactregistry v1.6.0/go.mod h1:IYt0oBPSAGYj/kprzsBjZ/4LnG/zOcHyFHjWPCi6SAQ= --cloud.google.com/go/artifactregistry v1.7.0/go.mod h1:mqTOFOnGZx8EtSqK/ZWcsm/4U8B77rbcLP6ruDU2Ixk= --cloud.google.com/go/artifactregistry v1.8.0/go.mod h1:w3GQXkJX8hiKN0v+at4b0qotwijQbYUqF2GWkZzAhC0= --cloud.google.com/go/artifactregistry v1.9.0/go.mod h1:2K2RqvA2CYvAeARHRkLDhMDJ3OXy26h3XW+3/Jh2uYc= --cloud.google.com/go/artifactregistry v1.11.1/go.mod h1:lLYghw+Itq9SONbCa1YWBoWs1nOucMH0pwXN1rOBZFI= --cloud.google.com/go/artifactregistry v1.11.2/go.mod h1:nLZns771ZGAwVLzTX/7Al6R9ehma4WUEhZGWV6CeQNQ= --cloud.google.com/go/artifactregistry v1.12.0/go.mod h1:o6P3MIvtzTOnmvGagO9v/rOjjA0HmhJ+/6KAXrmYDCI= --cloud.google.com/go/artifactregistry v1.13.0/go.mod h1:uy/LNfoOIivepGhooAUpL1i30Hgee3Cu0l4VTWHUC08= --cloud.google.com/go/artifactregistry v1.14.1/go.mod h1:nxVdG19jTaSTu7yA7+VbWL346r3rIdkZ142BSQqhn5E= --cloud.google.com/go/artifactregistry v1.14.2/go.mod h1:Xk+QbsKEb0ElmyeMfdHAey41B+qBq3q5R5f5xD4XT3U= --cloud.google.com/go/artifactregistry v1.14.3/go.mod h1:A2/E9GXnsyXl7GUvQ/2CjHA+mVRoWAXC0brg2os+kNI= --cloud.google.com/go/artifactregistry v1.14.4/go.mod h1:SJJcZTMv6ce0LDMUnihCN7WSrI+kBSFV0KIKo8S8aYU= --cloud.google.com/go/artifactregistry v1.14.6/go.mod h1:np9LSFotNWHcjnOgh8UVK0RFPCTUGbO0ve3384xyHfE= --cloud.google.com/go/asset v1.5.0/go.mod h1:5mfs8UvcM5wHhqtSv8J1CtxxaQq3AdBxxQi2jGW/K4o= --cloud.google.com/go/asset v1.7.0/go.mod h1:YbENsRK4+xTiL+Ofoj5Ckf+O17kJtgp3Y3nn4uzZz5s= --cloud.google.com/go/asset v1.8.0/go.mod h1:mUNGKhiqIdbr8X7KNayoYvyc4HbbFO9URsjbytpUaW0= --cloud.google.com/go/asset v1.9.0/go.mod h1:83MOE6jEJBMqFKadM9NLRcs80Gdw76qGuHn8m3h8oHQ= --cloud.google.com/go/asset v1.10.0/go.mod h1:pLz7uokL80qKhzKr4xXGvBQXnzHn5evJAEAtZiIb0wY= --cloud.google.com/go/asset v1.11.1/go.mod h1:fSwLhbRvC9p9CXQHJ3BgFeQNM4c9x10lqlrdEUYXlJo= --cloud.google.com/go/asset v1.12.0/go.mod h1:h9/sFOa4eDIyKmH6QMpm4eUK3pDojWnUhTgJlk762Hg= --cloud.google.com/go/asset v1.13.0/go.mod h1:WQAMyYek/b7NBpYq/K4KJWcRqzoalEsxz/t/dTk4THw= --cloud.google.com/go/asset v1.14.1/go.mod h1:4bEJ3dnHCqWCDbWJ/6Vn7GVI9LerSi7Rfdi03hd+WTQ= --cloud.google.com/go/asset v1.15.0/go.mod h1:tpKafV6mEut3+vN9ScGvCHXHj7FALFVta+okxFECHcg= --cloud.google.com/go/asset v1.15.1/go.mod h1:yX/amTvFWRpp5rcFq6XbCxzKT8RJUam1UoboE179jU4= --cloud.google.com/go/asset v1.15.2/go.mod h1:B6H5tclkXvXz7PD22qCA2TDxSVQfasa3iDlM89O2NXs= --cloud.google.com/go/asset v1.15.3/go.mod h1:yYLfUD4wL4X589A9tYrv4rFrba0QlDeag0CMcM5ggXU= --cloud.google.com/go/assuredworkloads v1.5.0/go.mod h1:n8HOZ6pff6re5KYfBXcFvSViQjDwxFkAkmUFffJRbbY= --cloud.google.com/go/assuredworkloads v1.6.0/go.mod h1:yo2YOk37Yc89Rsd5QMVECvjaMKymF9OP+QXWlKXUkXw= --cloud.google.com/go/assuredworkloads v1.7.0/go.mod h1:z/736/oNmtGAyU47reJgGN+KVoYoxeLBoj4XkKYscNI= --cloud.google.com/go/assuredworkloads v1.8.0/go.mod h1:AsX2cqyNCOvEQC8RMPnoc0yEarXQk6WEKkxYfL6kGIo= --cloud.google.com/go/assuredworkloads v1.9.0/go.mod h1:kFuI1P78bplYtT77Tb1hi0FMxM0vVpRC7VVoJC3ZoT0= --cloud.google.com/go/assuredworkloads v1.10.0/go.mod h1:kwdUQuXcedVdsIaKgKTp9t0UJkE5+PAVNhdQm4ZVq2E= --cloud.google.com/go/assuredworkloads v1.11.1/go.mod h1:+F04I52Pgn5nmPG36CWFtxmav6+7Q+c5QyJoL18Lry0= --cloud.google.com/go/assuredworkloads v1.11.2/go.mod h1:O1dfr+oZJMlE6mw0Bp0P1KZSlj5SghMBvTpZqIcUAW4= --cloud.google.com/go/assuredworkloads v1.11.3/go.mod h1:vEjfTKYyRUaIeA0bsGJceFV2JKpVRgyG2op3jfa59Zs= --cloud.google.com/go/assuredworkloads v1.11.4/go.mod h1:4pwwGNwy1RP0m+y12ef3Q/8PaiWrIDQ6nD2E8kvWI9U= --cloud.google.com/go/automl v1.5.0/go.mod h1:34EjfoFGMZ5sgJ9EoLsRtdPSNZLcfflJR39VbVNS2M0= --cloud.google.com/go/automl v1.6.0/go.mod h1:ugf8a6Fx+zP0D59WLhqgTDsQI9w07o64uf/Is3Nh5p8= --cloud.google.com/go/automl v1.7.0/go.mod h1:RL9MYCCsJEOmt0Wf3z9uzG0a7adTT1fe+aObgSpkCt8= --cloud.google.com/go/automl v1.8.0/go.mod h1:xWx7G/aPEe/NP+qzYXktoBSDfjO+vnKMGgsApGJJquM= --cloud.google.com/go/automl v1.12.0/go.mod h1:tWDcHDp86aMIuHmyvjuKeeHEGq76lD7ZqfGLN6B0NuU= --cloud.google.com/go/automl v1.13.1/go.mod h1:1aowgAHWYZU27MybSCFiukPO7xnyawv7pt3zK4bheQE= --cloud.google.com/go/automl v1.13.2/go.mod h1:gNY/fUmDEN40sP8amAX3MaXkxcqPIn7F1UIIPZpy4Mg= --cloud.google.com/go/automl v1.13.3/go.mod h1:Y8KwvyAZFOsMAPqUCfNu1AyclbC6ivCUF/MTwORymyY= --cloud.google.com/go/automl v1.13.4/go.mod h1:ULqwX/OLZ4hBVfKQaMtxMSTlPx0GqGbWN8uA/1EqCP8= --cloud.google.com/go/baremetalsolution v0.3.0/go.mod h1:XOrocE+pvK1xFfleEnShBlNAXf+j5blPPxrhjKgnIFc= --cloud.google.com/go/baremetalsolution v0.4.0/go.mod h1:BymplhAadOO/eBa7KewQ0Ppg4A4Wplbn+PsFKRLo0uI= --cloud.google.com/go/baremetalsolution v0.5.0/go.mod h1:dXGxEkmR9BMwxhzBhV0AioD0ULBmuLZI8CdwalUxuss= --cloud.google.com/go/baremetalsolution v1.1.1/go.mod h1:D1AV6xwOksJMV4OSlWHtWuFNZZYujJknMAP4Qa27QIA= --cloud.google.com/go/baremetalsolution v1.2.0/go.mod h1:68wi9AwPYkEWIUT4SvSGS9UJwKzNpshjHsH4lzk8iOw= --cloud.google.com/go/baremetalsolution v1.2.1/go.mod h1:3qKpKIw12RPXStwQXcbhfxVj1dqQGEvcmA+SX/mUR88= --cloud.google.com/go/baremetalsolution v1.2.2/go.mod h1:O5V6Uu1vzVelYahKfwEWRMaS3AbCkeYHy3145s1FkhM= --cloud.google.com/go/baremetalsolution v1.2.3/go.mod h1:/UAQ5xG3faDdy180rCUv47e0jvpp3BFxT+Cl0PFjw5g= --cloud.google.com/go/batch v0.3.0/go.mod h1:TR18ZoAekj1GuirsUsR1ZTKN3FC/4UDnScjT8NXImFE= --cloud.google.com/go/batch v0.4.0/go.mod h1:WZkHnP43R/QCGQsZ+0JyG4i79ranE2u8xvjq/9+STPE= --cloud.google.com/go/batch v0.7.0/go.mod h1:vLZN95s6teRUqRQ4s3RLDsH8PvboqBK+rn1oevL159g= --cloud.google.com/go/batch v1.3.1/go.mod h1:VguXeQKXIYaeeIYbuozUmBR13AfL4SJP7IltNPS+A4A= --cloud.google.com/go/batch v1.4.1/go.mod h1:KdBmDD61K0ovcxoRHGrN6GmOBWeAOyCgKD0Mugx4Fkk= --cloud.google.com/go/batch v1.5.0/go.mod h1:KdBmDD61K0ovcxoRHGrN6GmOBWeAOyCgKD0Mugx4Fkk= --cloud.google.com/go/batch v1.5.1/go.mod h1:RpBuIYLkQu8+CWDk3dFD/t/jOCGuUpkpX+Y0n1Xccs8= --cloud.google.com/go/batch v1.6.1/go.mod h1:urdpD13zPe6YOK+6iZs/8/x2VBRofvblLpx0t57vM98= --cloud.google.com/go/batch v1.6.3/go.mod h1:J64gD4vsNSA2O5TtDB5AAux3nJ9iV8U3ilg3JDBYejU= --cloud.google.com/go/beyondcorp v0.2.0/go.mod h1:TB7Bd+EEtcw9PCPQhCJtJGjk/7TC6ckmnSFS+xwTfm4= --cloud.google.com/go/beyondcorp v0.3.0/go.mod h1:E5U5lcrcXMsCuoDNyGrpyTm/hn7ne941Jz2vmksAxW8= --cloud.google.com/go/beyondcorp v0.4.0/go.mod h1:3ApA0mbhHx6YImmuubf5pyW8srKnCEPON32/5hj+RmM= --cloud.google.com/go/beyondcorp v0.5.0/go.mod h1:uFqj9X+dSfrheVp7ssLTaRHd2EHqSL4QZmH4e8WXGGU= --cloud.google.com/go/beyondcorp v0.6.1/go.mod h1:YhxDWw946SCbmcWo3fAhw3V4XZMSpQ/VYfcKGAEU8/4= --cloud.google.com/go/beyondcorp v1.0.0/go.mod h1:YhxDWw946SCbmcWo3fAhw3V4XZMSpQ/VYfcKGAEU8/4= --cloud.google.com/go/beyondcorp v1.0.1/go.mod h1:zl/rWWAFVeV+kx+X2Javly7o1EIQThU4WlkynffL/lk= --cloud.google.com/go/beyondcorp v1.0.2/go.mod h1:m8cpG7caD+5su+1eZr+TSvF6r21NdLJk4f9u4SP2Ntc= --cloud.google.com/go/beyondcorp v1.0.3/go.mod h1:HcBvnEd7eYr+HGDd5ZbuVmBYX019C6CEXBonXbCVwJo= --cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= --cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= --cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= --cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg= --cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc= --cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= --cloud.google.com/go/bigquery v1.42.0/go.mod h1:8dRTJxhtG+vwBKzE5OseQn/hiydoQN3EedCaOdYmxRA= --cloud.google.com/go/bigquery v1.43.0/go.mod h1:ZMQcXHsl+xmU1z36G2jNGZmKp9zNY5BUua5wDgmNCfw= --cloud.google.com/go/bigquery v1.44.0/go.mod h1:0Y33VqXTEsbamHJvJHdFmtqHvMIY28aK1+dFsvaChGc= --cloud.google.com/go/bigquery v1.47.0/go.mod h1:sA9XOgy0A8vQK9+MWhEQTY6Tix87M/ZurWFIxmF9I/E= --cloud.google.com/go/bigquery v1.48.0/go.mod h1:QAwSz+ipNgfL5jxiaK7weyOhzdoAy1zFm0Nf1fysJac= --cloud.google.com/go/bigquery v1.49.0/go.mod h1:Sv8hMmTFFYBlt/ftw2uN6dFdQPzBlREY9yBh7Oy7/4Q= --cloud.google.com/go/bigquery v1.50.0/go.mod h1:YrleYEh2pSEbgTBZYMJ5SuSr0ML3ypjRB1zgf7pvQLU= --cloud.google.com/go/bigquery v1.52.0/go.mod h1:3b/iXjRQGU4nKa87cXeg6/gogLjO8C6PmuM8i5Bi/u4= --cloud.google.com/go/bigquery v1.53.0/go.mod h1:3b/iXjRQGU4nKa87cXeg6/gogLjO8C6PmuM8i5Bi/u4= --cloud.google.com/go/bigquery v1.55.0/go.mod h1:9Y5I3PN9kQWuid6183JFhOGOW3GcirA5LpsKCUn+2ec= --cloud.google.com/go/bigquery v1.56.0/go.mod h1:KDcsploXTEY7XT3fDQzMUZlpQLHzE4itubHrnmhUrZA= --cloud.google.com/go/bigquery v1.57.1/go.mod h1:iYzC0tGVWt1jqSzBHqCr3lrRn0u13E8e+AqowBsDgug= --cloud.google.com/go/billing v1.4.0/go.mod h1:g9IdKBEFlItS8bTtlrZdVLWSSdSyFUZKXNS02zKMOZY= --cloud.google.com/go/billing v1.5.0/go.mod h1:mztb1tBc3QekhjSgmpf/CV4LzWXLzCArwpLmP2Gm88s= --cloud.google.com/go/billing v1.6.0/go.mod h1:WoXzguj+BeHXPbKfNWkqVtDdzORazmCjraY+vrxcyvI= --cloud.google.com/go/billing v1.7.0/go.mod h1:q457N3Hbj9lYwwRbnlD7vUpyjq6u5U1RAOArInEiD5Y= --cloud.google.com/go/billing v1.12.0/go.mod h1:yKrZio/eu+okO/2McZEbch17O5CB5NpZhhXG6Z766ss= --cloud.google.com/go/billing v1.13.0/go.mod h1:7kB2W9Xf98hP9Sr12KfECgfGclsH3CQR0R08tnRlRbc= --cloud.google.com/go/billing v1.16.0/go.mod h1:y8vx09JSSJG02k5QxbycNRrN7FGZB6F3CAcgum7jvGA= --cloud.google.com/go/billing v1.17.0/go.mod h1:Z9+vZXEq+HwH7bhJkyI4OQcR6TSbeMrjlpEjO2vzY64= --cloud.google.com/go/billing v1.17.1/go.mod h1:Z9+vZXEq+HwH7bhJkyI4OQcR6TSbeMrjlpEjO2vzY64= --cloud.google.com/go/billing v1.17.2/go.mod h1:u/AdV/3wr3xoRBk5xvUzYMS1IawOAPwQMuHgHMdljDg= --cloud.google.com/go/billing v1.17.3/go.mod h1:z83AkoZ7mZwBGT3yTnt6rSGI1OOsHSIi6a5M3mJ8NaU= --cloud.google.com/go/billing v1.17.4/go.mod h1:5DOYQStCxquGprqfuid/7haD7th74kyMBHkjO/OvDtk= --cloud.google.com/go/binaryauthorization v1.1.0/go.mod h1:xwnoWu3Y84jbuHa0zd526MJYmtnVXn0syOjaJgy4+dM= --cloud.google.com/go/binaryauthorization v1.2.0/go.mod h1:86WKkJHtRcv5ViNABtYMhhNWRrD1Vpi//uKEy7aYEfI= --cloud.google.com/go/binaryauthorization v1.3.0/go.mod h1:lRZbKgjDIIQvzYQS1p99A7/U1JqvqeZg0wiI5tp6tg0= --cloud.google.com/go/binaryauthorization v1.4.0/go.mod h1:tsSPQrBd77VLplV70GUhBf/Zm3FsKmgSqgm4UmiDItk= --cloud.google.com/go/binaryauthorization v1.5.0/go.mod h1:OSe4OU1nN/VswXKRBmciKpo9LulY41gch5c68htf3/Q= --cloud.google.com/go/binaryauthorization v1.6.1/go.mod h1:TKt4pa8xhowwffiBmbrbcxijJRZED4zrqnwZ1lKH51U= --cloud.google.com/go/binaryauthorization v1.7.0/go.mod h1:Zn+S6QqTMn6odcMU1zDZCJxPjU2tZPV1oDl45lWY154= --cloud.google.com/go/binaryauthorization v1.7.1/go.mod h1:GTAyfRWYgcbsP3NJogpV3yeunbUIjx2T9xVeYovtURE= --cloud.google.com/go/binaryauthorization v1.7.2/go.mod h1:kFK5fQtxEp97m92ziy+hbu+uKocka1qRRL8MVJIgjv0= --cloud.google.com/go/binaryauthorization v1.7.3/go.mod h1:VQ/nUGRKhrStlGr+8GMS8f6/vznYLkdK5vaKfdCIpvU= --cloud.google.com/go/certificatemanager v1.3.0/go.mod h1:n6twGDvcUBFu9uBgt4eYvvf3sQ6My8jADcOVwHmzadg= --cloud.google.com/go/certificatemanager v1.4.0/go.mod h1:vowpercVFyqs8ABSmrdV+GiFf2H/ch3KyudYQEMM590= --cloud.google.com/go/certificatemanager v1.6.0/go.mod h1:3Hh64rCKjRAX8dXgRAyOcY5vQ/fE1sh8o+Mdd6KPgY8= --cloud.google.com/go/certificatemanager v1.7.1/go.mod h1:iW8J3nG6SaRYImIa+wXQ0g8IgoofDFRp5UMzaNk1UqI= --cloud.google.com/go/certificatemanager v1.7.2/go.mod h1:15SYTDQMd00kdoW0+XY5d9e+JbOPjp24AvF48D8BbcQ= --cloud.google.com/go/certificatemanager v1.7.3/go.mod h1:T/sZYuC30PTag0TLo28VedIRIj1KPGcOQzjWAptHa00= --cloud.google.com/go/certificatemanager v1.7.4/go.mod h1:FHAylPe/6IIKuaRmHbjbdLhGhVQ+CWHSD5Jq0k4+cCE= --cloud.google.com/go/channel v1.8.0/go.mod h1:W5SwCXDJsq/rg3tn3oG0LOxpAo6IMxNa09ngphpSlnk= --cloud.google.com/go/channel v1.9.0/go.mod h1:jcu05W0my9Vx4mt3/rEHpfxc9eKi9XwsdDL8yBMbKUk= --cloud.google.com/go/channel v1.11.0/go.mod h1:IdtI0uWGqhEeatSB62VOoJ8FSUhJ9/+iGkJVqp74CGE= --cloud.google.com/go/channel v1.12.0/go.mod h1:VkxCGKASi4Cq7TbXxlaBezonAYpp1GCnKMY6tnMQnLU= --cloud.google.com/go/channel v1.16.0/go.mod h1:eN/q1PFSl5gyu0dYdmxNXscY/4Fi7ABmeHCJNf/oHmc= --cloud.google.com/go/channel v1.17.0/go.mod h1:RpbhJsGi/lXWAUM1eF4IbQGbsfVlg2o8Iiy2/YLfVT0= --cloud.google.com/go/channel v1.17.1/go.mod h1:xqfzcOZAcP4b/hUDH0GkGg1Sd5to6di1HOJn/pi5uBQ= --cloud.google.com/go/channel v1.17.2/go.mod h1:aT2LhnftnyfQceFql5I/mP8mIbiiJS4lWqgXA815zMk= --cloud.google.com/go/channel v1.17.3/go.mod h1:QcEBuZLGGrUMm7kNj9IbU1ZfmJq2apotsV83hbxX7eE= --cloud.google.com/go/cloudbuild v1.3.0/go.mod h1:WequR4ULxlqvMsjDEEEFnOG5ZSRSgWOywXYDb1vPE6U= --cloud.google.com/go/cloudbuild v1.4.0/go.mod h1:5Qwa40LHiOXmz3386FrjrYM93rM/hdRr7b53sySrTqA= --cloud.google.com/go/cloudbuild v1.6.0/go.mod h1:UIbc/w9QCbH12xX+ezUsgblrWv+Cv4Tw83GiSMHOn9M= --cloud.google.com/go/cloudbuild v1.7.0/go.mod h1:zb5tWh2XI6lR9zQmsm1VRA+7OCuve5d8S+zJUul8KTg= --cloud.google.com/go/cloudbuild v1.9.0/go.mod h1:qK1d7s4QlO0VwfYn5YuClDGg2hfmLZEb4wQGAbIgL1s= --cloud.google.com/go/cloudbuild v1.10.1/go.mod h1:lyJg7v97SUIPq4RC2sGsz/9tNczhyv2AjML/ci4ulzU= --cloud.google.com/go/cloudbuild v1.13.0/go.mod h1:lyJg7v97SUIPq4RC2sGsz/9tNczhyv2AjML/ci4ulzU= --cloud.google.com/go/cloudbuild v1.14.0/go.mod h1:lyJg7v97SUIPq4RC2sGsz/9tNczhyv2AjML/ci4ulzU= --cloud.google.com/go/cloudbuild v1.14.1/go.mod h1:K7wGc/3zfvmYWOWwYTgF/d/UVJhS4pu+HAy7PL7mCsU= --cloud.google.com/go/cloudbuild v1.14.2/go.mod h1:Bn6RO0mBYk8Vlrt+8NLrru7WXlQ9/RDWz2uo5KG1/sg= --cloud.google.com/go/cloudbuild v1.14.3/go.mod h1:eIXYWmRt3UtggLnFGx4JvXcMj4kShhVzGndL1LwleEM= --cloud.google.com/go/cloudbuild v1.15.0/go.mod h1:eIXYWmRt3UtggLnFGx4JvXcMj4kShhVzGndL1LwleEM= --cloud.google.com/go/clouddms v1.3.0/go.mod h1:oK6XsCDdW4Ib3jCCBugx+gVjevp2TMXFtgxvPSee3OM= --cloud.google.com/go/clouddms v1.4.0/go.mod h1:Eh7sUGCC+aKry14O1NRljhjyrr0NFC0G2cjwX0cByRk= --cloud.google.com/go/clouddms v1.5.0/go.mod h1:QSxQnhikCLUw13iAbffF2CZxAER3xDGNHjsTAkQJcQA= --cloud.google.com/go/clouddms v1.6.1/go.mod h1:Ygo1vL52Ov4TBZQquhz5fiw2CQ58gvu+PlS6PVXCpZI= --cloud.google.com/go/clouddms v1.7.0/go.mod h1:MW1dC6SOtI/tPNCciTsXtsGNEM0i0OccykPvv3hiYeM= --cloud.google.com/go/clouddms v1.7.1/go.mod h1:o4SR8U95+P7gZ/TX+YbJxehOCsM+fe6/brlrFquiszk= --cloud.google.com/go/clouddms v1.7.2/go.mod h1:Rk32TmWmHo64XqDvW7jgkFQet1tUKNVzs7oajtJT3jU= --cloud.google.com/go/clouddms v1.7.3/go.mod h1:fkN2HQQNUYInAU3NQ3vRLkV2iWs8lIdmBKOx4nrL6Hc= --cloud.google.com/go/cloudtasks v1.5.0/go.mod h1:fD92REy1x5woxkKEkLdvavGnPJGEn8Uic9nWuLzqCpY= --cloud.google.com/go/cloudtasks v1.6.0/go.mod h1:C6Io+sxuke9/KNRkbQpihnW93SWDU3uXt92nu85HkYI= --cloud.google.com/go/cloudtasks v1.7.0/go.mod h1:ImsfdYWwlWNJbdgPIIGJWC+gemEGTBK/SunNQQNCAb4= --cloud.google.com/go/cloudtasks v1.8.0/go.mod h1:gQXUIwCSOI4yPVK7DgTVFiiP0ZW/eQkydWzwVMdHxrI= --cloud.google.com/go/cloudtasks v1.9.0/go.mod h1:w+EyLsVkLWHcOaqNEyvcKAsWp9p29dL6uL9Nst1cI7Y= --cloud.google.com/go/cloudtasks v1.10.0/go.mod h1:NDSoTLkZ3+vExFEWu2UJV1arUyzVDAiZtdWcsUyNwBs= --cloud.google.com/go/cloudtasks v1.11.1/go.mod h1:a9udmnou9KO2iulGscKR0qBYjreuX8oHwpmFsKspEvM= --cloud.google.com/go/cloudtasks v1.12.1/go.mod h1:a9udmnou9KO2iulGscKR0qBYjreuX8oHwpmFsKspEvM= --cloud.google.com/go/cloudtasks v1.12.2/go.mod h1:A7nYkjNlW2gUoROg1kvJrQGhJP/38UaWwsnuBDOBVUk= --cloud.google.com/go/cloudtasks v1.12.3/go.mod h1:GPVXhIOSGEaR+3xT4Fp72ScI+HjHffSS4B8+BaBB5Ys= --cloud.google.com/go/cloudtasks v1.12.4/go.mod h1:BEPu0Gtt2dU6FxZHNqqNdGqIG86qyWKBPGnsb7udGY0= --cloud.google.com/go/compute v0.1.0/go.mod h1:GAesmwr110a34z04OlxYkATPBEfVhkymfTBXtfbBFow= --cloud.google.com/go/compute v1.3.0/go.mod h1:cCZiE1NHEtai4wiufUhW8I8S1JKkAnhnQJWM7YD99wM= --cloud.google.com/go/compute v1.5.0/go.mod h1:9SMHyhJlzhlkJqrPAc839t2BZFTSk6Jdj6mkzQJeu0M= --cloud.google.com/go/compute v1.6.0/go.mod h1:T29tfhtVbq1wvAPo0E3+7vhgmkOYeXjhFvz/FMzPu0s= --cloud.google.com/go/compute v1.6.1/go.mod h1:g85FgpzFvNULZ+S8AYq87axRKuf2Kh7deLqV/jJ3thU= --cloud.google.com/go/compute v1.7.0/go.mod h1:435lt8av5oL9P3fv1OEzSbSUe+ybHXGMPQHHZWZxy9U= --cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU= --cloud.google.com/go/compute v1.12.0/go.mod h1:e8yNOBcBONZU1vJKCvCoDw/4JQsA0dpM4x/6PIIOocU= --cloud.google.com/go/compute v1.12.1/go.mod h1:e8yNOBcBONZU1vJKCvCoDw/4JQsA0dpM4x/6PIIOocU= --cloud.google.com/go/compute v1.13.0/go.mod h1:5aPTS0cUNMIc1CE546K+Th6weJUNQErARyZtRXDJ8GE= --cloud.google.com/go/compute v1.14.0/go.mod h1:YfLtxrj9sU4Yxv+sXzZkyPjEyPBZfXHUvjxega5vAdo= --cloud.google.com/go/compute v1.15.1/go.mod h1:bjjoF/NtFUrkD/urWfdHaKuOPDR5nWIs63rR+SXhcpA= --cloud.google.com/go/compute v1.18.0/go.mod h1:1X7yHxec2Ga+Ss6jPyjxRxpu2uu7PLgsOVXvgU0yacs= --cloud.google.com/go/compute v1.19.0/go.mod h1:rikpw2y+UMidAe9tISo04EHNOIf42RLYF/q8Bs93scU= --cloud.google.com/go/compute v1.19.1/go.mod h1:6ylj3a05WF8leseCdIf77NK0g1ey+nj5IKd5/kvShxE= --cloud.google.com/go/compute v1.19.3/go.mod h1:qxvISKp/gYnXkSAD1ppcSOveRAmzxicEv/JlizULFrI= --cloud.google.com/go/compute v1.20.1/go.mod h1:4tCnrn48xsqlwSAiLf1HXMQk8CONslYbdiEZc9FEIbM= --cloud.google.com/go/compute v1.21.0/go.mod h1:4tCnrn48xsqlwSAiLf1HXMQk8CONslYbdiEZc9FEIbM= --cloud.google.com/go/compute v1.23.0/go.mod h1:4tCnrn48xsqlwSAiLf1HXMQk8CONslYbdiEZc9FEIbM= --cloud.google.com/go/compute v1.23.1/go.mod h1:CqB3xpmPKKt3OJpW2ndFIXnA9A4xAy/F3Xp1ixncW78= --cloud.google.com/go/compute v1.23.2/go.mod h1:JJ0atRC0J/oWYiiVBmsSsrRnh92DhZPG4hFDcR04Rns= --cloud.google.com/go/compute v1.23.3/go.mod h1:VCgBUoMnIVIR0CscqQiPJLAG25E3ZRZMzcFZeQ+h8CI= --cloud.google.com/go/compute/metadata v0.1.0/go.mod h1:Z1VN+bulIf6bt4P/C37K4DyZYZEXYonfTBHHFPO/4UU= --cloud.google.com/go/compute/metadata v0.2.0/go.mod h1:zFmK7XCadkQkj6TtorcaGlCW1hT1fIilQDwofLpJ20k= --cloud.google.com/go/compute/metadata v0.2.1/go.mod h1:jgHgmJd2RKBGzXqF5LR2EZMGxBkeanZ9wwa75XHJgOM= --cloud.google.com/go/compute/metadata v0.2.3/go.mod h1:VAV5nSsACxMJvgaAuX6Pk2AawlZn8kiOGuCv6gTkwuA= --cloud.google.com/go/contactcenterinsights v1.3.0/go.mod h1:Eu2oemoePuEFc/xKFPjbTuPSj0fYJcPls9TFlPNnHHY= --cloud.google.com/go/contactcenterinsights v1.4.0/go.mod h1:L2YzkGbPsv+vMQMCADxJoT9YiTTnSEd6fEvCeHTYVck= --cloud.google.com/go/contactcenterinsights v1.6.0/go.mod h1:IIDlT6CLcDoyv79kDv8iWxMSTZhLxSCofVV5W6YFM/w= --cloud.google.com/go/contactcenterinsights v1.9.1/go.mod h1:bsg/R7zGLYMVxFFzfh9ooLTruLRCG9fnzhH9KznHhbM= --cloud.google.com/go/contactcenterinsights v1.10.0/go.mod h1:bsg/R7zGLYMVxFFzfh9ooLTruLRCG9fnzhH9KznHhbM= --cloud.google.com/go/contactcenterinsights v1.11.0/go.mod h1:hutBdImE4XNZ1NV4vbPJKSFOnQruhC5Lj9bZqWMTKiU= --cloud.google.com/go/contactcenterinsights v1.11.1/go.mod h1:FeNP3Kg8iteKM80lMwSk3zZZKVxr+PGnAId6soKuXwE= --cloud.google.com/go/contactcenterinsights v1.11.2/go.mod h1:A9PIR5ov5cRcd28KlDbmmXE8Aay+Gccer2h4wzkYFso= --cloud.google.com/go/contactcenterinsights v1.11.3/go.mod h1:HHX5wrz5LHVAwfI2smIotQG9x8Qd6gYilaHcLLLmNis= --cloud.google.com/go/contactcenterinsights v1.12.0/go.mod h1:HHX5wrz5LHVAwfI2smIotQG9x8Qd6gYilaHcLLLmNis= --cloud.google.com/go/container v1.6.0/go.mod h1:Xazp7GjJSeUYo688S+6J5V+n/t+G5sKBTFkKNudGRxg= --cloud.google.com/go/container v1.7.0/go.mod h1:Dp5AHtmothHGX3DwwIHPgq45Y8KmNsgN3amoYfxVkLo= --cloud.google.com/go/container v1.13.1/go.mod h1:6wgbMPeQRw9rSnKBCAJXnds3Pzj03C4JHamr8asWKy4= --cloud.google.com/go/container v1.14.0/go.mod h1:3AoJMPhHfLDxLvrlVWaK57IXzaPnLaZq63WX59aQBfM= --cloud.google.com/go/container v1.15.0/go.mod h1:ft+9S0WGjAyjDggg5S06DXj+fHJICWg8L7isCQe9pQA= --cloud.google.com/go/container v1.22.1/go.mod h1:lTNExE2R7f+DLbAN+rJiKTisauFCaoDq6NURZ83eVH4= --cloud.google.com/go/container v1.24.0/go.mod h1:lTNExE2R7f+DLbAN+rJiKTisauFCaoDq6NURZ83eVH4= --cloud.google.com/go/container v1.26.0/go.mod h1:YJCmRet6+6jnYYRS000T6k0D0xUXQgBSaJ7VwI8FBj4= --cloud.google.com/go/container v1.26.1/go.mod h1:5smONjPRUxeEpDG7bMKWfDL4sauswqEtnBK1/KKpR04= --cloud.google.com/go/container v1.26.2/go.mod h1:YlO84xCt5xupVbLaMY4s3XNE79MUJ+49VmkInr6HvF4= --cloud.google.com/go/container v1.27.1/go.mod h1:b1A1gJeTBXVLQ6GGw9/9M4FG94BEGsqJ5+t4d/3N7O4= --cloud.google.com/go/container v1.28.0/go.mod h1:b1A1gJeTBXVLQ6GGw9/9M4FG94BEGsqJ5+t4d/3N7O4= --cloud.google.com/go/containeranalysis v0.5.1/go.mod h1:1D92jd8gRR/c0fGMlymRgxWD3Qw9C1ff6/T7mLgVL8I= --cloud.google.com/go/containeranalysis v0.6.0/go.mod h1:HEJoiEIu+lEXM+k7+qLCci0h33lX3ZqoYFdmPcoO7s4= --cloud.google.com/go/containeranalysis v0.7.0/go.mod h1:9aUL+/vZ55P2CXfuZjS4UjQ9AgXoSw8Ts6lemfmxBxI= --cloud.google.com/go/containeranalysis v0.9.0/go.mod h1:orbOANbwk5Ejoom+s+DUCTTJ7IBdBQJDcSylAx/on9s= --cloud.google.com/go/containeranalysis v0.10.1/go.mod h1:Ya2jiILITMY68ZLPaogjmOMNkwsDrWBSTyBubGXO7j0= --cloud.google.com/go/containeranalysis v0.11.0/go.mod h1:4n2e99ZwpGxpNcz+YsFT1dfOHPQFGcAC8FN2M2/ne/U= --cloud.google.com/go/containeranalysis v0.11.1/go.mod h1:rYlUOM7nem1OJMKwE1SadufX0JP3wnXj844EtZAwWLY= --cloud.google.com/go/containeranalysis v0.11.2/go.mod h1:xibioGBC1MD2j4reTyV1xY1/MvKaz+fyM9ENWhmIeP8= --cloud.google.com/go/containeranalysis v0.11.3/go.mod h1:kMeST7yWFQMGjiG9K7Eov+fPNQcGhb8mXj/UcTiWw9U= --cloud.google.com/go/datacatalog v1.3.0/go.mod h1:g9svFY6tuR+j+hrTw3J2dNcmI0dzmSiyOzm8kpLq0a0= --cloud.google.com/go/datacatalog v1.5.0/go.mod h1:M7GPLNQeLfWqeIm3iuiruhPzkt65+Bx8dAKvScX8jvs= --cloud.google.com/go/datacatalog v1.6.0/go.mod h1:+aEyF8JKg+uXcIdAmmaMUmZ3q1b/lKLtXCmXdnc0lbc= --cloud.google.com/go/datacatalog v1.7.0/go.mod h1:9mEl4AuDYWw81UGc41HonIHH7/sn52H0/tc8f8ZbZIE= --cloud.google.com/go/datacatalog v1.8.0/go.mod h1:KYuoVOv9BM8EYz/4eMFxrr4DUKhGIOXxZoKYF5wdISM= --cloud.google.com/go/datacatalog v1.8.1/go.mod h1:RJ58z4rMp3gvETA465Vg+ag8BGgBdnRPEMMSTr5Uv+M= --cloud.google.com/go/datacatalog v1.12.0/go.mod h1:CWae8rFkfp6LzLumKOnmVh4+Zle4A3NXLzVJ1d1mRm0= --cloud.google.com/go/datacatalog v1.13.0/go.mod h1:E4Rj9a5ZtAxcQJlEBTLgMTphfP11/lNaAshpoBgemX8= --cloud.google.com/go/datacatalog v1.14.0/go.mod h1:h0PrGtlihoutNMp/uvwhawLQ9+c63Kz65UFqh49Yo+E= --cloud.google.com/go/datacatalog v1.14.1/go.mod h1:d2CevwTG4yedZilwe+v3E3ZBDRMobQfSG/a6cCCN5R4= --cloud.google.com/go/datacatalog v1.16.0/go.mod h1:d2CevwTG4yedZilwe+v3E3ZBDRMobQfSG/a6cCCN5R4= --cloud.google.com/go/datacatalog v1.17.1/go.mod h1:nCSYFHgtxh2MiEktWIz71s/X+7ds/UT9kp0PC7waCzE= --cloud.google.com/go/datacatalog v1.18.0/go.mod h1:nCSYFHgtxh2MiEktWIz71s/X+7ds/UT9kp0PC7waCzE= --cloud.google.com/go/datacatalog v1.18.1/go.mod h1:TzAWaz+ON1tkNr4MOcak8EBHX7wIRX/gZKM+yTVsv+A= --cloud.google.com/go/datacatalog v1.18.2/go.mod h1:SPVgWW2WEMuWHA+fHodYjmxPiMqcOiWfhc9OD5msigk= --cloud.google.com/go/datacatalog v1.18.3/go.mod h1:5FR6ZIF8RZrtml0VUao22FxhdjkoG+a0866rEnObryM= --cloud.google.com/go/datacatalog v1.19.0/go.mod h1:5FR6ZIF8RZrtml0VUao22FxhdjkoG+a0866rEnObryM= --cloud.google.com/go/dataflow v0.6.0/go.mod h1:9QwV89cGoxjjSR9/r7eFDqqjtvbKxAK2BaYU6PVk9UM= --cloud.google.com/go/dataflow v0.7.0/go.mod h1:PX526vb4ijFMesO1o202EaUmouZKBpjHsTlCtB4parQ= --cloud.google.com/go/dataflow v0.8.0/go.mod h1:Rcf5YgTKPtQyYz8bLYhFoIV/vP39eL7fWNcSOyFfLJE= --cloud.google.com/go/dataflow v0.9.1/go.mod h1:Wp7s32QjYuQDWqJPFFlnBKhkAtiFpMTdg00qGbnIHVw= --cloud.google.com/go/dataflow v0.9.2/go.mod h1:vBfdBZ/ejlTaYIGB3zB4T08UshH70vbtZeMD+urnUSo= --cloud.google.com/go/dataflow v0.9.3/go.mod h1:HI4kMVjcHGTs3jTHW/kv3501YW+eloiJSLxkJa/vqFE= --cloud.google.com/go/dataflow v0.9.4/go.mod h1:4G8vAkHYCSzU8b/kmsoR2lWyHJD85oMJPHMtan40K8w= --cloud.google.com/go/dataform v0.3.0/go.mod h1:cj8uNliRlHpa6L3yVhDOBrUXH+BPAO1+KFMQQNSThKo= --cloud.google.com/go/dataform v0.4.0/go.mod h1:fwV6Y4Ty2yIFL89huYlEkwUPtS7YZinZbzzj5S9FzCE= --cloud.google.com/go/dataform v0.5.0/go.mod h1:GFUYRe8IBa2hcomWplodVmUx/iTL0FrsauObOM3Ipr0= --cloud.google.com/go/dataform v0.6.0/go.mod h1:QPflImQy33e29VuapFdf19oPbE4aYTJxr31OAPV+ulA= --cloud.google.com/go/dataform v0.7.0/go.mod h1:7NulqnVozfHvWUBpMDfKMUESr+85aJsC/2O0o3jWPDE= --cloud.google.com/go/dataform v0.8.1/go.mod h1:3BhPSiw8xmppbgzeBbmDvmSWlwouuJkXsXsb8UBih9M= --cloud.google.com/go/dataform v0.8.2/go.mod h1:X9RIqDs6NbGPLR80tnYoPNiO1w0wenKTb8PxxlhTMKM= --cloud.google.com/go/dataform v0.8.3/go.mod h1:8nI/tvv5Fso0drO3pEjtowz58lodx8MVkdV2q0aPlqg= --cloud.google.com/go/dataform v0.9.1/go.mod h1:pWTg+zGQ7i16pyn0bS1ruqIE91SdL2FDMvEYu/8oQxs= --cloud.google.com/go/datafusion v1.4.0/go.mod h1:1Zb6VN+W6ALo85cXnM1IKiPw+yQMKMhB9TsTSRDo/38= --cloud.google.com/go/datafusion v1.5.0/go.mod h1:Kz+l1FGHB0J+4XF2fud96WMmRiq/wj8N9u007vyXZ2w= --cloud.google.com/go/datafusion v1.6.0/go.mod h1:WBsMF8F1RhSXvVM8rCV3AeyWVxcC2xY6vith3iw3S+8= --cloud.google.com/go/datafusion v1.7.1/go.mod h1:KpoTBbFmoToDExJUso/fcCiguGDk7MEzOWXUsJo0wsI= --cloud.google.com/go/datafusion v1.7.2/go.mod h1:62K2NEC6DRlpNmI43WHMWf9Vg/YvN6QVi8EVwifElI0= --cloud.google.com/go/datafusion v1.7.3/go.mod h1:eoLt1uFXKGBq48jy9LZ+Is8EAVLnmn50lNncLzwYokE= --cloud.google.com/go/datafusion v1.7.4/go.mod h1:BBs78WTOLYkT4GVZIXQCZT3GFpkpDN4aBY4NDX/jVlM= --cloud.google.com/go/datalabeling v0.5.0/go.mod h1:TGcJ0G2NzcsXSE/97yWjIZO0bXj0KbVlINXMG9ud42I= --cloud.google.com/go/datalabeling v0.6.0/go.mod h1:WqdISuk/+WIGeMkpw/1q7bK/tFEZxsrFJOJdY2bXvTQ= --cloud.google.com/go/datalabeling v0.7.0/go.mod h1:WPQb1y08RJbmpM3ww0CSUAGweL0SxByuW2E+FU+wXcM= --cloud.google.com/go/datalabeling v0.8.1/go.mod h1:XS62LBSVPbYR54GfYQsPXZjTW8UxCK2fkDciSrpRFdY= --cloud.google.com/go/datalabeling v0.8.2/go.mod h1:cyDvGHuJWu9U/cLDA7d8sb9a0tWLEletStu2sTmg3BE= --cloud.google.com/go/datalabeling v0.8.3/go.mod h1:tvPhpGyS/V7lqjmb3V0TaDdGvhzgR1JoW7G2bpi2UTI= --cloud.google.com/go/datalabeling v0.8.4/go.mod h1:Z1z3E6LHtffBGrNUkKwbwbDxTiXEApLzIgmymj8A3S8= --cloud.google.com/go/dataplex v1.3.0/go.mod h1:hQuRtDg+fCiFgC8j0zV222HvzFQdRd+SVX8gdmFcZzA= --cloud.google.com/go/dataplex v1.4.0/go.mod h1:X51GfLXEMVJ6UN47ESVqvlsRplbLhcsAt0kZCCKsU0A= --cloud.google.com/go/dataplex v1.5.2/go.mod h1:cVMgQHsmfRoI5KFYq4JtIBEUbYwc3c7tXmIDhRmNNVQ= --cloud.google.com/go/dataplex v1.6.0/go.mod h1:bMsomC/aEJOSpHXdFKFGQ1b0TDPIeL28nJObeO1ppRs= --cloud.google.com/go/dataplex v1.8.1/go.mod h1:7TyrDT6BCdI8/38Uvp0/ZxBslOslP2X2MPDucliyvSE= --cloud.google.com/go/dataplex v1.9.0/go.mod h1:7TyrDT6BCdI8/38Uvp0/ZxBslOslP2X2MPDucliyvSE= --cloud.google.com/go/dataplex v1.9.1/go.mod h1:7TyrDT6BCdI8/38Uvp0/ZxBslOslP2X2MPDucliyvSE= --cloud.google.com/go/dataplex v1.10.1/go.mod h1:1MzmBv8FvjYfc7vDdxhnLFNskikkB+3vl475/XdCDhs= --cloud.google.com/go/dataplex v1.10.2/go.mod h1:xdC8URdTrCrZMW6keY779ZT1cTOfV8KEPNsw+LTRT1Y= --cloud.google.com/go/dataplex v1.11.1/go.mod h1:mHJYQQ2VEJHsyoC0OdNyy988DvEbPhqFs5OOLffLX0c= --cloud.google.com/go/dataplex v1.11.2/go.mod h1:mHJYQQ2VEJHsyoC0OdNyy988DvEbPhqFs5OOLffLX0c= --cloud.google.com/go/dataproc v1.7.0/go.mod h1:CKAlMjII9H90RXaMpSxQ8EU6dQx6iAYNPcYPOkSbi8s= --cloud.google.com/go/dataproc v1.8.0/go.mod h1:5OW+zNAH0pMpw14JVrPONsxMQYMBqJuzORhIBfBn9uI= --cloud.google.com/go/dataproc v1.12.0/go.mod h1:zrF3aX0uV3ikkMz6z4uBbIKyhRITnxvr4i3IjKsKrw4= --cloud.google.com/go/dataproc/v2 v2.0.1/go.mod h1:7Ez3KRHdFGcfY7GcevBbvozX+zyWGcwLJvvAMwCaoZ4= --cloud.google.com/go/dataproc/v2 v2.2.0/go.mod h1:lZR7AQtwZPvmINx5J87DSOOpTfof9LVZju6/Qo4lmcY= --cloud.google.com/go/dataproc/v2 v2.2.1/go.mod h1:QdAJLaBjh+l4PVlVZcmrmhGccosY/omC1qwfQ61Zv/o= --cloud.google.com/go/dataproc/v2 v2.2.2/go.mod h1:aocQywVmQVF4i8CL740rNI/ZRpsaaC1Wh2++BJ7HEJ4= --cloud.google.com/go/dataproc/v2 v2.2.3/go.mod h1:G5R6GBc9r36SXv/RtZIVfB8SipI+xVn0bX5SxUzVYbY= --cloud.google.com/go/dataproc/v2 v2.3.0/go.mod h1:G5R6GBc9r36SXv/RtZIVfB8SipI+xVn0bX5SxUzVYbY= --cloud.google.com/go/dataqna v0.5.0/go.mod h1:90Hyk596ft3zUQ8NkFfvICSIfHFh1Bc7C4cK3vbhkeo= --cloud.google.com/go/dataqna v0.6.0/go.mod h1:1lqNpM7rqNLVgWBJyk5NF6Uen2PHym0jtVJonplVsDA= --cloud.google.com/go/dataqna v0.7.0/go.mod h1:Lx9OcIIeqCrw1a6KdO3/5KMP1wAmTc0slZWwP12Qq3c= --cloud.google.com/go/dataqna v0.8.1/go.mod h1:zxZM0Bl6liMePWsHA8RMGAfmTG34vJMapbHAxQ5+WA8= --cloud.google.com/go/dataqna v0.8.2/go.mod h1:KNEqgx8TTmUipnQsScOoDpq/VlXVptUqVMZnt30WAPs= --cloud.google.com/go/dataqna v0.8.3/go.mod h1:wXNBW2uvc9e7Gl5k8adyAMnLush1KVV6lZUhB+rqNu4= --cloud.google.com/go/dataqna v0.8.4/go.mod h1:mySRKjKg5Lz784P6sCov3p1QD+RZQONRMRjzGNcFd0c= --cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= --cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= --cloud.google.com/go/datastore v1.10.0/go.mod h1:PC5UzAmDEkAmkfaknstTYbNpgE49HAgW2J1gcgUfmdM= --cloud.google.com/go/datastore v1.11.0/go.mod h1:TvGxBIHCS50u8jzG+AW/ppf87v1of8nwzFNgEZU1D3c= --cloud.google.com/go/datastore v1.12.0/go.mod h1:KjdB88W897MRITkvWWJrg2OUtrR5XVj1EoLgSp6/N70= --cloud.google.com/go/datastore v1.12.1/go.mod h1:KjdB88W897MRITkvWWJrg2OUtrR5XVj1EoLgSp6/N70= --cloud.google.com/go/datastore v1.13.0/go.mod h1:KjdB88W897MRITkvWWJrg2OUtrR5XVj1EoLgSp6/N70= --cloud.google.com/go/datastore v1.14.0/go.mod h1:GAeStMBIt9bPS7jMJA85kgkpsMkvseWWXiaHya9Jes8= --cloud.google.com/go/datastore v1.15.0/go.mod h1:GAeStMBIt9bPS7jMJA85kgkpsMkvseWWXiaHya9Jes8= --cloud.google.com/go/datastream v1.2.0/go.mod h1:i/uTP8/fZwgATHS/XFu0TcNUhuA0twZxxQ3EyCUQMwo= --cloud.google.com/go/datastream v1.3.0/go.mod h1:cqlOX8xlyYF/uxhiKn6Hbv6WjwPPuI9W2M9SAXwaLLQ= --cloud.google.com/go/datastream v1.4.0/go.mod h1:h9dpzScPhDTs5noEMQVWP8Wx8AFBRyS0s8KWPx/9r0g= --cloud.google.com/go/datastream v1.5.0/go.mod h1:6TZMMNPwjUqZHBKPQ1wwXpb0d5VDVPl2/XoS5yi88q4= --cloud.google.com/go/datastream v1.6.0/go.mod h1:6LQSuswqLa7S4rPAOZFVjHIG3wJIjZcZrw8JDEDJuIs= --cloud.google.com/go/datastream v1.7.0/go.mod h1:uxVRMm2elUSPuh65IbZpzJNMbuzkcvu5CjMqVIUHrww= --cloud.google.com/go/datastream v1.9.1/go.mod h1:hqnmr8kdUBmrnk65k5wNRoHSCYksvpdZIcZIEl8h43Q= --cloud.google.com/go/datastream v1.10.0/go.mod h1:hqnmr8kdUBmrnk65k5wNRoHSCYksvpdZIcZIEl8h43Q= --cloud.google.com/go/datastream v1.10.1/go.mod h1:7ngSYwnw95YFyTd5tOGBxHlOZiL+OtpjheqU7t2/s/c= --cloud.google.com/go/datastream v1.10.2/go.mod h1:W42TFgKAs/om6x/CdXX5E4oiAsKlH+e8MTGy81zdYt0= --cloud.google.com/go/datastream v1.10.3/go.mod h1:YR0USzgjhqA/Id0Ycu1VvZe8hEWwrkjuXrGbzeDOSEA= --cloud.google.com/go/deploy v1.4.0/go.mod h1:5Xghikd4VrmMLNaF6FiRFDlHb59VM59YoDQnOUdsH/c= --cloud.google.com/go/deploy v1.5.0/go.mod h1:ffgdD0B89tToyW/U/D2eL0jN2+IEV/3EMuXHA0l4r+s= --cloud.google.com/go/deploy v1.6.0/go.mod h1:f9PTHehG/DjCom3QH0cntOVRm93uGBDt2vKzAPwpXQI= --cloud.google.com/go/deploy v1.8.0/go.mod h1:z3myEJnA/2wnB4sgjqdMfgxCA0EqC3RBTNcVPs93mtQ= --cloud.google.com/go/deploy v1.11.0/go.mod h1:tKuSUV5pXbn67KiubiUNUejqLs4f5cxxiCNCeyl0F2g= --cloud.google.com/go/deploy v1.13.0/go.mod h1:tKuSUV5pXbn67KiubiUNUejqLs4f5cxxiCNCeyl0F2g= --cloud.google.com/go/deploy v1.13.1/go.mod h1:8jeadyLkH9qu9xgO3hVWw8jVr29N1mnW42gRJT8GY6g= --cloud.google.com/go/deploy v1.14.1/go.mod h1:N8S0b+aIHSEeSr5ORVoC0+/mOPUysVt8ae4QkZYolAw= --cloud.google.com/go/deploy v1.14.2/go.mod h1:e5XOUI5D+YGldyLNZ21wbp9S8otJbBE4i88PtO9x/2g= --cloud.google.com/go/deploy v1.15.0/go.mod h1:e5XOUI5D+YGldyLNZ21wbp9S8otJbBE4i88PtO9x/2g= --cloud.google.com/go/dialogflow v1.15.0/go.mod h1:HbHDWs33WOGJgn6rfzBW1Kv807BE3O1+xGbn59zZWI4= --cloud.google.com/go/dialogflow v1.16.1/go.mod h1:po6LlzGfK+smoSmTBnbkIZY2w8ffjz/RcGSS+sh1el0= --cloud.google.com/go/dialogflow v1.17.0/go.mod h1:YNP09C/kXA1aZdBgC/VtXX74G/TKn7XVCcVumTflA+8= --cloud.google.com/go/dialogflow v1.18.0/go.mod h1:trO7Zu5YdyEuR+BhSNOqJezyFQ3aUzz0njv7sMx/iek= --cloud.google.com/go/dialogflow v1.19.0/go.mod h1:JVmlG1TwykZDtxtTXujec4tQ+D8SBFMoosgy+6Gn0s0= --cloud.google.com/go/dialogflow v1.29.0/go.mod h1:b+2bzMe+k1s9V+F2jbJwpHPzrnIyHihAdRFMtn2WXuM= --cloud.google.com/go/dialogflow v1.31.0/go.mod h1:cuoUccuL1Z+HADhyIA7dci3N5zUssgpBJmCzI6fNRB4= --cloud.google.com/go/dialogflow v1.32.0/go.mod h1:jG9TRJl8CKrDhMEcvfcfFkkpp8ZhgPz3sBGmAUYJ2qE= --cloud.google.com/go/dialogflow v1.38.0/go.mod h1:L7jnH+JL2mtmdChzAIcXQHXMvQkE3U4hTaNltEuxXn4= --cloud.google.com/go/dialogflow v1.40.0/go.mod h1:L7jnH+JL2mtmdChzAIcXQHXMvQkE3U4hTaNltEuxXn4= --cloud.google.com/go/dialogflow v1.43.0/go.mod h1:pDUJdi4elL0MFmt1REMvFkdsUTYSHq+rTCS8wg0S3+M= --cloud.google.com/go/dialogflow v1.44.0/go.mod h1:pDUJdi4elL0MFmt1REMvFkdsUTYSHq+rTCS8wg0S3+M= --cloud.google.com/go/dialogflow v1.44.1/go.mod h1:n/h+/N2ouKOO+rbe/ZnI186xImpqvCVj2DdsWS/0EAk= --cloud.google.com/go/dialogflow v1.44.2/go.mod h1:QzFYndeJhpVPElnFkUXxdlptx0wPnBWLCBT9BvtC3/c= --cloud.google.com/go/dialogflow v1.44.3/go.mod h1:mHly4vU7cPXVweuB5R0zsYKPMzy240aQdAu06SqBbAQ= --cloud.google.com/go/dlp v1.6.0/go.mod h1:9eyB2xIhpU0sVwUixfBubDoRwP+GjeUoxxeueZmqvmM= --cloud.google.com/go/dlp v1.7.0/go.mod h1:68ak9vCiMBjbasxeVD17hVPxDEck+ExiHavX8kiHG+Q= --cloud.google.com/go/dlp v1.9.0/go.mod h1:qdgmqgTyReTz5/YNSSuueR8pl7hO0o9bQ39ZhtgkWp4= --cloud.google.com/go/dlp v1.10.1/go.mod h1:IM8BWz1iJd8njcNcG0+Kyd9OPnqnRNkDV8j42VT5KOI= --cloud.google.com/go/dlp v1.10.2/go.mod h1:ZbdKIhcnyhILgccwVDzkwqybthh7+MplGC3kZVZsIOQ= --cloud.google.com/go/dlp v1.10.3/go.mod h1:iUaTc/ln8I+QT6Ai5vmuwfw8fqTk2kaz0FvCwhLCom0= --cloud.google.com/go/dlp v1.11.1/go.mod h1:/PA2EnioBeXTL/0hInwgj0rfsQb3lpE3R8XUJxqUNKI= --cloud.google.com/go/documentai v1.7.0/go.mod h1:lJvftZB5NRiFSX4moiye1SMxHx0Bc3x1+p9e/RfXYiU= --cloud.google.com/go/documentai v1.8.0/go.mod h1:xGHNEB7CtsnySCNrCFdCyyMz44RhFEEX2Q7UD0c5IhU= --cloud.google.com/go/documentai v1.9.0/go.mod h1:FS5485S8R00U10GhgBC0aNGrJxBP8ZVpEeJ7PQDZd6k= --cloud.google.com/go/documentai v1.10.0/go.mod h1:vod47hKQIPeCfN2QS/jULIvQTugbmdc0ZvxxfQY1bg4= --cloud.google.com/go/documentai v1.16.0/go.mod h1:o0o0DLTEZ+YnJZ+J4wNfTxmDVyrkzFvttBXXtYRMHkM= --cloud.google.com/go/documentai v1.18.0/go.mod h1:F6CK6iUH8J81FehpskRmhLq/3VlwQvb7TvwOceQ2tbs= --cloud.google.com/go/documentai v1.20.0/go.mod h1:yJkInoMcK0qNAEdRnqY/D5asy73tnPe88I1YTZT+a8E= --cloud.google.com/go/documentai v1.22.0/go.mod h1:yJkInoMcK0qNAEdRnqY/D5asy73tnPe88I1YTZT+a8E= --cloud.google.com/go/documentai v1.22.1/go.mod h1:LKs22aDHbJv7ufXuPypzRO7rG3ALLJxzdCXDPutw4Qc= --cloud.google.com/go/documentai v1.23.0/go.mod h1:LKs22aDHbJv7ufXuPypzRO7rG3ALLJxzdCXDPutw4Qc= --cloud.google.com/go/documentai v1.23.2/go.mod h1:Q/wcRT+qnuXOpjAkvOV4A+IeQl04q2/ReT7SSbytLSo= --cloud.google.com/go/documentai v1.23.4/go.mod h1:4MYAaEMnADPN1LPN5xboDR5QVB6AgsaxgFdJhitlE2Y= --cloud.google.com/go/documentai v1.23.5/go.mod h1:ghzBsyVTiVdkfKaUCum/9bGBEyBjDO4GfooEcYKhN+g= --cloud.google.com/go/domains v0.6.0/go.mod h1:T9Rz3GasrpYk6mEGHh4rymIhjlnIuB4ofT1wTxDeT4Y= --cloud.google.com/go/domains v0.7.0/go.mod h1:PtZeqS1xjnXuRPKE/88Iru/LdfoRyEHYA9nFQf4UKpg= --cloud.google.com/go/domains v0.8.0/go.mod h1:M9i3MMDzGFXsydri9/vW+EWz9sWb4I6WyHqdlAk0idE= --cloud.google.com/go/domains v0.9.1/go.mod h1:aOp1c0MbejQQ2Pjf1iJvnVyT+z6R6s8pX66KaCSDYfE= --cloud.google.com/go/domains v0.9.2/go.mod h1:3YvXGYzZG1Temjbk7EyGCuGGiXHJwVNmwIf+E/cUp5I= --cloud.google.com/go/domains v0.9.3/go.mod h1:29k66YNDLDY9LCFKpGFeh6Nj9r62ZKm5EsUJxAl84KU= --cloud.google.com/go/domains v0.9.4/go.mod h1:27jmJGShuXYdUNjyDG0SodTfT5RwLi7xmH334Gvi3fY= --cloud.google.com/go/edgecontainer v0.1.0/go.mod h1:WgkZ9tp10bFxqO8BLPqv2LlfmQF1X8lZqwW4r1BTajk= --cloud.google.com/go/edgecontainer v0.2.0/go.mod h1:RTmLijy+lGpQ7BXuTDa4C4ssxyXT34NIuHIgKuP4s5w= --cloud.google.com/go/edgecontainer v0.3.0/go.mod h1:FLDpP4nykgwwIfcLt6zInhprzw0lEi2P1fjO6Ie0qbc= --cloud.google.com/go/edgecontainer v1.0.0/go.mod h1:cttArqZpBB2q58W/upSG++ooo6EsblxDIolxa3jSjbY= --cloud.google.com/go/edgecontainer v1.1.1/go.mod h1:O5bYcS//7MELQZs3+7mabRqoWQhXCzenBu0R8bz2rwk= --cloud.google.com/go/edgecontainer v1.1.2/go.mod h1:wQRjIzqxEs9e9wrtle4hQPSR1Y51kqN75dgF7UllZZ4= --cloud.google.com/go/edgecontainer v1.1.3/go.mod h1:Ll2DtIABzEfaxaVSbwj3QHFaOOovlDFiWVDu349jSsA= --cloud.google.com/go/edgecontainer v1.1.4/go.mod h1:AvFdVuZuVGdgaE5YvlL1faAoa1ndRR/5XhXZvPBHbsE= --cloud.google.com/go/errorreporting v0.3.0/go.mod h1:xsP2yaAp+OAW4OIm60An2bbLpqIhKXdWR/tawvl7QzU= --cloud.google.com/go/essentialcontacts v1.3.0/go.mod h1:r+OnHa5jfj90qIfZDO/VztSFqbQan7HV75p8sA+mdGI= --cloud.google.com/go/essentialcontacts v1.4.0/go.mod h1:8tRldvHYsmnBCHdFpvU+GL75oWiBKl80BiqlFh9tp+8= --cloud.google.com/go/essentialcontacts v1.5.0/go.mod h1:ay29Z4zODTuwliK7SnX8E86aUF2CTzdNtvv42niCX0M= --cloud.google.com/go/essentialcontacts v1.6.2/go.mod h1:T2tB6tX+TRak7i88Fb2N9Ok3PvY3UNbUsMag9/BARh4= --cloud.google.com/go/essentialcontacts v1.6.3/go.mod h1:yiPCD7f2TkP82oJEFXFTou8Jl8L6LBRPeBEkTaO0Ggo= --cloud.google.com/go/essentialcontacts v1.6.4/go.mod h1:iju5Vy3d9tJUg0PYMd1nHhjV7xoCXaOAVabrwLaPBEM= --cloud.google.com/go/essentialcontacts v1.6.5/go.mod h1:jjYbPzw0x+yglXC890l6ECJWdYeZ5dlYACTFL0U/VuM= --cloud.google.com/go/eventarc v1.7.0/go.mod h1:6ctpF3zTnaQCxUjHUdcfgcA1A2T309+omHZth7gDfmc= --cloud.google.com/go/eventarc v1.8.0/go.mod h1:imbzxkyAU4ubfsaKYdQg04WS1NvncblHEup4kvF+4gw= --cloud.google.com/go/eventarc v1.10.0/go.mod h1:u3R35tmZ9HvswGRBnF48IlYgYeBcPUCjkr4BTdem2Kw= --cloud.google.com/go/eventarc v1.11.0/go.mod h1:PyUjsUKPWoRBCHeOxZd/lbOOjahV41icXyUY5kSTvVY= --cloud.google.com/go/eventarc v1.12.1/go.mod h1:mAFCW6lukH5+IZjkvrEss+jmt2kOdYlN8aMx3sRJiAI= --cloud.google.com/go/eventarc v1.13.0/go.mod h1:mAFCW6lukH5+IZjkvrEss+jmt2kOdYlN8aMx3sRJiAI= --cloud.google.com/go/eventarc v1.13.1/go.mod h1:EqBxmGHFrruIara4FUQ3RHlgfCn7yo1HYsu2Hpt/C3Y= --cloud.google.com/go/eventarc v1.13.2/go.mod h1:X9A80ShVu19fb4e5sc/OLV7mpFUKZMwfJFeeWhcIObM= --cloud.google.com/go/eventarc v1.13.3/go.mod h1:RWH10IAZIRcj1s/vClXkBgMHwh59ts7hSWcqD3kaclg= --cloud.google.com/go/filestore v1.3.0/go.mod h1:+qbvHGvXU1HaKX2nD0WEPo92TP/8AQuCVEBXNY9z0+w= --cloud.google.com/go/filestore v1.4.0/go.mod h1:PaG5oDfo9r224f8OYXURtAsY+Fbyq/bLYoINEK8XQAI= --cloud.google.com/go/filestore v1.5.0/go.mod h1:FqBXDWBp4YLHqRnVGveOkHDf8svj9r5+mUDLupOWEDs= --cloud.google.com/go/filestore v1.6.0/go.mod h1:di5unNuss/qfZTw2U9nhFqo8/ZDSc466dre85Kydllg= --cloud.google.com/go/filestore v1.7.1/go.mod h1:y10jsorq40JJnjR/lQ8AfFbbcGlw3g+Dp8oN7i7FjV4= --cloud.google.com/go/filestore v1.7.2/go.mod h1:TYOlyJs25f/omgj+vY7/tIG/E7BX369triSPzE4LdgE= --cloud.google.com/go/filestore v1.7.3/go.mod h1:Qp8WaEERR3cSkxToxFPHh/b8AACkSut+4qlCjAmKTV0= --cloud.google.com/go/filestore v1.7.4/go.mod h1:S5JCxIbFjeBhWMTfIYH2Jx24J6BqjwpkkPl+nBA5DlI= --cloud.google.com/go/filestore v1.8.0/go.mod h1:S5JCxIbFjeBhWMTfIYH2Jx24J6BqjwpkkPl+nBA5DlI= --cloud.google.com/go/firestore v1.9.0/go.mod h1:HMkjKHNTtRyZNiMzu7YAsLr9K3X2udY2AMwDaMEQiiE= --cloud.google.com/go/firestore v1.11.0/go.mod h1:b38dKhgzlmNNGTNZZwe7ZRFEuRab1Hay3/DBsIGKKy4= --cloud.google.com/go/firestore v1.12.0/go.mod h1:b38dKhgzlmNNGTNZZwe7ZRFEuRab1Hay3/DBsIGKKy4= --cloud.google.com/go/firestore v1.13.0/go.mod h1:QojqqOh8IntInDUSTAh0c8ZsPYAr68Ma8c5DWOy8xb8= --cloud.google.com/go/firestore v1.14.0/go.mod h1:96MVaHLsEhbvkBEdZgfN+AS/GIkco1LRpH9Xp9YZfzQ= --cloud.google.com/go/functions v1.6.0/go.mod h1:3H1UA3qiIPRWD7PeZKLvHZ9SaQhR26XIJcC0A5GbvAk= --cloud.google.com/go/functions v1.7.0/go.mod h1:+d+QBcWM+RsrgZfV9xo6KfA1GlzJfxcfZcRPEhDDfzg= --cloud.google.com/go/functions v1.8.0/go.mod h1:RTZ4/HsQjIqIYP9a9YPbU+QFoQsAlYgrwOXJWHn1POY= --cloud.google.com/go/functions v1.9.0/go.mod h1:Y+Dz8yGguzO3PpIjhLTbnqV1CWmgQ5UwtlpzoyquQ08= --cloud.google.com/go/functions v1.10.0/go.mod h1:0D3hEOe3DbEvCXtYOZHQZmD+SzYsi1YbI7dGvHfldXw= --cloud.google.com/go/functions v1.12.0/go.mod h1:AXWGrF3e2C/5ehvwYo/GH6O5s09tOPksiKhz+hH8WkA= --cloud.google.com/go/functions v1.13.0/go.mod h1:EU4O007sQm6Ef/PwRsI8N2umygGqPBS/IZQKBQBcJ3c= --cloud.google.com/go/functions v1.15.1/go.mod h1:P5yNWUTkyU+LvW/S9O6V+V423VZooALQlqoXdoPz5AE= --cloud.google.com/go/functions v1.15.2/go.mod h1:CHAjtcR6OU4XF2HuiVeriEdELNcnvRZSk1Q8RMqy4lE= --cloud.google.com/go/functions v1.15.3/go.mod h1:r/AMHwBheapkkySEhiZYLDBwVJCdlRwsm4ieJu35/Ug= --cloud.google.com/go/functions v1.15.4/go.mod h1:CAsTc3VlRMVvx+XqXxKqVevguqJpnVip4DdonFsX28I= --cloud.google.com/go/gaming v1.5.0/go.mod h1:ol7rGcxP/qHTRQE/RO4bxkXq+Fix0j6D4LFPzYTIrDM= --cloud.google.com/go/gaming v1.6.0/go.mod h1:YMU1GEvA39Qt3zWGyAVA9bpYz/yAhTvaQ1t2sK4KPUA= --cloud.google.com/go/gaming v1.7.0/go.mod h1:LrB8U7MHdGgFG851iHAfqUdLcKBdQ55hzXy9xBJz0+w= --cloud.google.com/go/gaming v1.8.0/go.mod h1:xAqjS8b7jAVW0KFYeRUxngo9My3f33kFmua++Pi+ggM= --cloud.google.com/go/gaming v1.9.0/go.mod h1:Fc7kEmCObylSWLO334NcO+O9QMDyz+TKC4v1D7X+Bc0= --cloud.google.com/go/gaming v1.10.1/go.mod h1:XQQvtfP8Rb9Rxnxm5wFVpAp9zCQkJi2bLIb7iHGwB3s= --cloud.google.com/go/gkebackup v0.2.0/go.mod h1:XKvv/4LfG829/B8B7xRkk8zRrOEbKtEam6yNfuQNH60= --cloud.google.com/go/gkebackup v0.3.0/go.mod h1:n/E671i1aOQvUxT541aTkCwExO/bTer2HDlj4TsBRAo= --cloud.google.com/go/gkebackup v0.4.0/go.mod h1:byAyBGUwYGEEww7xsbnUTBHIYcOPy/PgUWUtOeRm9Vg= --cloud.google.com/go/gkebackup v1.3.0/go.mod h1:vUDOu++N0U5qs4IhG1pcOnD1Mac79xWy6GoBFlWCWBU= --cloud.google.com/go/gkebackup v1.3.1/go.mod h1:vUDOu++N0U5qs4IhG1pcOnD1Mac79xWy6GoBFlWCWBU= --cloud.google.com/go/gkebackup v1.3.2/go.mod h1:OMZbXzEJloyXMC7gqdSB+EOEQ1AKcpGYvO3s1ec5ixk= --cloud.google.com/go/gkebackup v1.3.3/go.mod h1:eMk7/wVV5P22KBakhQnJxWSVftL1p4VBFLpv0kIft7I= --cloud.google.com/go/gkebackup v1.3.4/go.mod h1:gLVlbM8h/nHIs09ns1qx3q3eaXcGSELgNu1DWXYz1HI= --cloud.google.com/go/gkeconnect v0.5.0/go.mod h1:c5lsNAg5EwAy7fkqX/+goqFsU1Da/jQFqArp+wGNr/o= --cloud.google.com/go/gkeconnect v0.6.0/go.mod h1:Mln67KyU/sHJEBY8kFZ0xTeyPtzbq9StAVvEULYK16A= --cloud.google.com/go/gkeconnect v0.7.0/go.mod h1:SNfmVqPkaEi3bF/B3CNZOAYPYdg7sU+obZ+QTky2Myw= --cloud.google.com/go/gkeconnect v0.8.1/go.mod h1:KWiK1g9sDLZqhxB2xEuPV8V9NYzrqTUmQR9shJHpOZw= --cloud.google.com/go/gkeconnect v0.8.2/go.mod h1:6nAVhwchBJYgQCXD2pHBFQNiJNyAd/wyxljpaa6ZPrY= --cloud.google.com/go/gkeconnect v0.8.3/go.mod h1:i9GDTrfzBSUZGCe98qSu1B8YB8qfapT57PenIb820Jo= --cloud.google.com/go/gkeconnect v0.8.4/go.mod h1:84hZz4UMlDCKl8ifVW8layK4WHlMAFeq8vbzjU0yJkw= --cloud.google.com/go/gkehub v0.9.0/go.mod h1:WYHN6WG8w9bXU0hqNxt8rm5uxnk8IH+lPY9J2TV7BK0= --cloud.google.com/go/gkehub v0.10.0/go.mod h1:UIPwxI0DsrpsVoWpLB0stwKCP+WFVG9+y977wO+hBH0= --cloud.google.com/go/gkehub v0.11.0/go.mod h1:JOWHlmN+GHyIbuWQPl47/C2RFhnFKH38jH9Ascu3n0E= --cloud.google.com/go/gkehub v0.12.0/go.mod h1:djiIwwzTTBrF5NaXCGv3mf7klpEMcST17VBTVVDcuaw= --cloud.google.com/go/gkehub v0.14.1/go.mod h1:VEXKIJZ2avzrbd7u+zeMtW00Y8ddk/4V9511C9CQGTY= --cloud.google.com/go/gkehub v0.14.2/go.mod h1:iyjYH23XzAxSdhrbmfoQdePnlMj2EWcvnR+tHdBQsCY= --cloud.google.com/go/gkehub v0.14.3/go.mod h1:jAl6WafkHHW18qgq7kqcrXYzN08hXeK/Va3utN8VKg8= --cloud.google.com/go/gkehub v0.14.4/go.mod h1:Xispfu2MqnnFt8rV/2/3o73SK1snL8s9dYJ9G2oQMfc= --cloud.google.com/go/gkemulticloud v0.3.0/go.mod h1:7orzy7O0S+5kq95e4Hpn7RysVA7dPs8W/GgfUtsPbrA= --cloud.google.com/go/gkemulticloud v0.4.0/go.mod h1:E9gxVBnseLWCk24ch+P9+B2CoDFJZTyIgLKSalC7tuI= --cloud.google.com/go/gkemulticloud v0.5.0/go.mod h1:W0JDkiyi3Tqh0TJr//y19wyb1yf8llHVto2Htf2Ja3Y= --cloud.google.com/go/gkemulticloud v0.6.1/go.mod h1:kbZ3HKyTsiwqKX7Yw56+wUGwwNZViRnxWK2DVknXWfw= --cloud.google.com/go/gkemulticloud v1.0.0/go.mod h1:kbZ3HKyTsiwqKX7Yw56+wUGwwNZViRnxWK2DVknXWfw= --cloud.google.com/go/gkemulticloud v1.0.1/go.mod h1:AcrGoin6VLKT/fwZEYuqvVominLriQBCKmbjtnbMjG8= --cloud.google.com/go/gkemulticloud v1.0.2/go.mod h1:+ee5VXxKb3H1l4LZAcgWB/rvI16VTNTrInWxDjAGsGo= --cloud.google.com/go/gkemulticloud v1.0.3/go.mod h1:7NpJBN94U6DY1xHIbsDqB2+TFZUfjLUKLjUX8NGLor0= --cloud.google.com/go/grafeas v0.2.0/go.mod h1:KhxgtF2hb0P191HlY5besjYm6MqTSTj3LSI+M+ByZHc= --cloud.google.com/go/grafeas v0.3.0/go.mod h1:P7hgN24EyONOTMyeJH6DxG4zD7fwiYa5Q6GUgyFSOU8= --cloud.google.com/go/gsuiteaddons v1.3.0/go.mod h1:EUNK/J1lZEZO8yPtykKxLXI6JSVN2rg9bN8SXOa0bgM= --cloud.google.com/go/gsuiteaddons v1.4.0/go.mod h1:rZK5I8hht7u7HxFQcFei0+AtfS9uSushomRlg+3ua1o= --cloud.google.com/go/gsuiteaddons v1.5.0/go.mod h1:TFCClYLd64Eaa12sFVmUyG62tk4mdIsI7pAnSXRkcFo= --cloud.google.com/go/gsuiteaddons v1.6.1/go.mod h1:CodrdOqRZcLp5WOwejHWYBjZvfY0kOphkAKpF/3qdZY= --cloud.google.com/go/gsuiteaddons v1.6.2/go.mod h1:K65m9XSgs8hTF3X9nNTPi8IQueljSdYo9F+Mi+s4MyU= --cloud.google.com/go/gsuiteaddons v1.6.3/go.mod h1:sCFJkZoMrLZT3JTb8uJqgKPNshH2tfXeCwTFRebTq48= --cloud.google.com/go/gsuiteaddons v1.6.4/go.mod h1:rxtstw7Fx22uLOXBpsvb9DUbC+fiXs7rF4U29KHM/pE= --cloud.google.com/go/iam v0.1.0/go.mod h1:vcUNEa0pEm0qRVpmWepWaFMIAI8/hjB9mO8rNCJtF6c= --cloud.google.com/go/iam v0.3.0/go.mod h1:XzJPvDayI+9zsASAFO68Hk07u3z+f+JrT2xXNdp4bnY= --cloud.google.com/go/iam v0.5.0/go.mod h1:wPU9Vt0P4UmCux7mqtRu6jcpPAb74cP1fh50J3QpkUc= --cloud.google.com/go/iam v0.6.0/go.mod h1:+1AH33ueBne5MzYccyMHtEKqLE4/kJOibtffMHDMFMc= --cloud.google.com/go/iam v0.7.0/go.mod h1:H5Br8wRaDGNc8XP3keLc4unfUUZeyH3Sfl9XpQEYOeg= --cloud.google.com/go/iam v0.8.0/go.mod h1:lga0/y3iH6CX7sYqypWJ33hf7kkfXJag67naqGESjkE= --cloud.google.com/go/iam v0.11.0/go.mod h1:9PiLDanza5D+oWFZiH1uG+RnRCfEGKoyl6yo4cgWZGY= --cloud.google.com/go/iam v0.12.0/go.mod h1:knyHGviacl11zrtZUoDuYpDgLjvr28sLQaG0YB2GYAY= --cloud.google.com/go/iam v0.13.0/go.mod h1:ljOg+rcNfzZ5d6f1nAUJ8ZIxOaZUVoS14bKCtaLZ/D0= --cloud.google.com/go/iam v1.0.1/go.mod h1:yR3tmSL8BcZB4bxByRv2jkSIahVmCtfKZwLYGBalRE8= --cloud.google.com/go/iam v1.1.0/go.mod h1:nxdHjaKfCr7fNYx/HJMM8LgiMugmveWlkatear5gVyk= --cloud.google.com/go/iam v1.1.1/go.mod h1:A5avdyVL2tCppe4unb0951eI9jreack+RJ0/d+KUZOU= --cloud.google.com/go/iam v1.1.2/go.mod h1:A5avdyVL2tCppe4unb0951eI9jreack+RJ0/d+KUZOU= --cloud.google.com/go/iam v1.1.3/go.mod h1:3khUlaBXfPKKe7huYgEpDn6FtgRyMEqbkvBxrQyY5SE= --cloud.google.com/go/iam v1.1.4/go.mod h1:l/rg8l1AaA+VFMho/HYx2Vv6xinPSLMF8qfhRPIZ0L8= --cloud.google.com/go/iam v1.1.5/go.mod h1:rB6P/Ic3mykPbFio+vo7403drjlgvoWfYpJhMXEbzv8= --cloud.google.com/go/iap v1.4.0/go.mod h1:RGFwRJdihTINIe4wZ2iCP0zF/qu18ZwyKxrhMhygBEc= --cloud.google.com/go/iap v1.5.0/go.mod h1:UH/CGgKd4KyohZL5Pt0jSKE4m3FR51qg6FKQ/z/Ix9A= --cloud.google.com/go/iap v1.6.0/go.mod h1:NSuvI9C/j7UdjGjIde7t7HBz+QTwBcapPE07+sSRcLk= --cloud.google.com/go/iap v1.7.0/go.mod h1:beqQx56T9O1G1yNPph+spKpNibDlYIiIixiqsQXxLIo= --cloud.google.com/go/iap v1.7.1/go.mod h1:WapEwPc7ZxGt2jFGB/C/bm+hP0Y6NXzOYGjpPnmMS74= --cloud.google.com/go/iap v1.8.1/go.mod h1:sJCbeqg3mvWLqjZNsI6dfAtbbV1DL2Rl7e1mTyXYREQ= --cloud.google.com/go/iap v1.9.0/go.mod h1:01OFxd1R+NFrg78S+hoPV5PxEzv22HXaNqUUlmNHFuY= --cloud.google.com/go/iap v1.9.1/go.mod h1:SIAkY7cGMLohLSdBR25BuIxO+I4fXJiL06IBL7cy/5Q= --cloud.google.com/go/iap v1.9.2/go.mod h1:GwDTOs047PPSnwRD0Us5FKf4WDRcVvHg1q9WVkKBhdI= --cloud.google.com/go/iap v1.9.3/go.mod h1:DTdutSZBqkkOm2HEOTBzhZxh2mwwxshfD/h3yofAiCw= --cloud.google.com/go/ids v1.1.0/go.mod h1:WIuwCaYVOzHIj2OhN9HAwvW+DBdmUAdcWlFxRl+KubM= --cloud.google.com/go/ids v1.2.0/go.mod h1:5WXvp4n25S0rA/mQWAg1YEEBBq6/s+7ml1RDCW1IrcY= --cloud.google.com/go/ids v1.3.0/go.mod h1:JBdTYwANikFKaDP6LtW5JAi4gubs57SVNQjemdt6xV4= --cloud.google.com/go/ids v1.4.1/go.mod h1:np41ed8YMU8zOgv53MMMoCntLTn2lF+SUzlM+O3u/jw= --cloud.google.com/go/ids v1.4.2/go.mod h1:3vw8DX6YddRu9BncxuzMyWn0g8+ooUjI2gslJ7FH3vk= --cloud.google.com/go/ids v1.4.3/go.mod h1:9CXPqI3GedjmkjbMWCUhMZ2P2N7TUMzAkVXYEH2orYU= --cloud.google.com/go/ids v1.4.4/go.mod h1:z+WUc2eEl6S/1aZWzwtVNWoSZslgzPxAboS0lZX0HjI= --cloud.google.com/go/iot v1.3.0/go.mod h1:r7RGh2B61+B8oz0AGE+J72AhA0G7tdXItODWsaA2oLs= --cloud.google.com/go/iot v1.4.0/go.mod h1:dIDxPOn0UvNDUMD8Ger7FIaTuvMkj+aGk94RPP0iV+g= --cloud.google.com/go/iot v1.5.0/go.mod h1:mpz5259PDl3XJthEmh9+ap0affn/MqNSP4My77Qql9o= --cloud.google.com/go/iot v1.6.0/go.mod h1:IqdAsmE2cTYYNO1Fvjfzo9po179rAtJeVGUvkLN3rLE= --cloud.google.com/go/iot v1.7.1/go.mod h1:46Mgw7ev1k9KqK1ao0ayW9h0lI+3hxeanz+L1zmbbbk= --cloud.google.com/go/iot v1.7.2/go.mod h1:q+0P5zr1wRFpw7/MOgDXrG/HVA+l+cSwdObffkrpnSg= --cloud.google.com/go/iot v1.7.3/go.mod h1:t8itFchkol4VgNbHnIq9lXoOOtHNR3uAACQMYbN9N4I= --cloud.google.com/go/iot v1.7.4/go.mod h1:3TWqDVvsddYBG++nHSZmluoCAVGr1hAcabbWZNKEZLk= --cloud.google.com/go/kms v1.4.0/go.mod h1:fajBHndQ+6ubNw6Ss2sSd+SWvjL26RNo/dr7uxsnnOA= --cloud.google.com/go/kms v1.5.0/go.mod h1:QJS2YY0eJGBg3mnDfuaCyLauWwBJiHRboYxJ++1xJNg= --cloud.google.com/go/kms v1.6.0/go.mod h1:Jjy850yySiasBUDi6KFUwUv2n1+o7QZFyuUJg6OgjA0= --cloud.google.com/go/kms v1.8.0/go.mod h1:4xFEhYFqvW+4VMELtZyxomGSYtSQKzM178ylFW4jMAg= --cloud.google.com/go/kms v1.9.0/go.mod h1:qb1tPTgfF9RQP8e1wq4cLFErVuTJv7UsSC915J8dh3w= --cloud.google.com/go/kms v1.10.0/go.mod h1:ng3KTUtQQU9bPX3+QGLsflZIHlkbn8amFAMY63m8d24= --cloud.google.com/go/kms v1.10.1/go.mod h1:rIWk/TryCkR59GMC3YtHtXeLzd634lBbKenvyySAyYI= --cloud.google.com/go/kms v1.11.0/go.mod h1:hwdiYC0xjnWsKQQCQQmIQnS9asjYVSK6jtXm+zFqXLM= --cloud.google.com/go/kms v1.12.1/go.mod h1:c9J991h5DTl+kg7gi3MYomh12YEENGrf48ee/N/2CDM= --cloud.google.com/go/kms v1.15.0/go.mod h1:c9J991h5DTl+kg7gi3MYomh12YEENGrf48ee/N/2CDM= --cloud.google.com/go/kms v1.15.2/go.mod h1:3hopT4+7ooWRCjc2DxgnpESFxhIraaI2IpAVUEhbT/w= --cloud.google.com/go/kms v1.15.3/go.mod h1:AJdXqHxS2GlPyduM99s9iGqi2nwbviBbhV/hdmt4iOQ= --cloud.google.com/go/kms v1.15.4/go.mod h1:L3Sdj6QTHK8dfwK5D1JLsAyELsNMnd3tAIwGS4ltKpc= --cloud.google.com/go/kms v1.15.5/go.mod h1:cU2H5jnp6G2TDpUGZyqTCoy1n16fbubHZjmVXSMtwDI= --cloud.google.com/go/language v1.4.0/go.mod h1:F9dRpNFQmJbkaop6g0JhSBXCNlO90e1KWx5iDdxbWic= --cloud.google.com/go/language v1.6.0/go.mod h1:6dJ8t3B+lUYfStgls25GusK04NLh3eDLQnWM3mdEbhI= --cloud.google.com/go/language v1.7.0/go.mod h1:DJ6dYN/W+SQOjF8e1hLQXMF21AkH2w9wiPzPCJa2MIE= --cloud.google.com/go/language v1.8.0/go.mod h1:qYPVHf7SPoNNiCL2Dr0FfEFNil1qi3pQEyygwpgVKB8= --cloud.google.com/go/language v1.9.0/go.mod h1:Ns15WooPM5Ad/5no/0n81yUetis74g3zrbeJBE+ptUY= --cloud.google.com/go/language v1.10.1/go.mod h1:CPp94nsdVNiQEt1CNjF5WkTcisLiHPyIbMhvR8H2AW0= --cloud.google.com/go/language v1.11.0/go.mod h1:uDx+pFDdAKTY8ehpWbiXyQdz8tDSYLJbQcXsCkjYyvQ= --cloud.google.com/go/language v1.11.1/go.mod h1:Xyid9MG9WOX3utvDbpX7j3tXDmmDooMyMDqgUVpH17U= --cloud.google.com/go/language v1.12.1/go.mod h1:zQhalE2QlQIxbKIZt54IASBzmZpN/aDASea5zl1l+J4= --cloud.google.com/go/language v1.12.2/go.mod h1:9idWapzr/JKXBBQ4lWqVX/hcadxB194ry20m/bTrhWc= --cloud.google.com/go/lifesciences v0.5.0/go.mod h1:3oIKy8ycWGPUyZDR/8RNnTOYevhaMLqh5vLUXs9zvT8= --cloud.google.com/go/lifesciences v0.6.0/go.mod h1:ddj6tSX/7BOnhxCSd3ZcETvtNr8NZ6t/iPhY2Tyfu08= --cloud.google.com/go/lifesciences v0.8.0/go.mod h1:lFxiEOMqII6XggGbOnKiyZ7IBwoIqA84ClvoezaA/bo= --cloud.google.com/go/lifesciences v0.9.1/go.mod h1:hACAOd1fFbCGLr/+weUKRAJas82Y4vrL3O5326N//Wc= --cloud.google.com/go/lifesciences v0.9.2/go.mod h1:QHEOO4tDzcSAzeJg7s2qwnLM2ji8IRpQl4p6m5Z9yTA= --cloud.google.com/go/lifesciences v0.9.3/go.mod h1:gNGBOJV80IWZdkd+xz4GQj4mbqaz737SCLHn2aRhQKM= --cloud.google.com/go/lifesciences v0.9.4/go.mod h1:bhm64duKhMi7s9jR9WYJYvjAFJwRqNj+Nia7hF0Z7JA= --cloud.google.com/go/logging v1.6.1/go.mod h1:5ZO0mHHbvm8gEmeEUHrmDlTDSu5imF6MUP9OfilNXBw= --cloud.google.com/go/logging v1.7.0/go.mod h1:3xjP2CjkM3ZkO73aj4ASA5wRPGGCRrPIAeNqVNkzY8M= --cloud.google.com/go/logging v1.8.1/go.mod h1:TJjR+SimHwuC8MZ9cjByQulAMgni+RkXeI3wwctHJEI= --cloud.google.com/go/longrunning v0.1.1/go.mod h1:UUFxuDWkv22EuY93jjmDMFT5GPQKeFVJBIF6QlTqdsE= --cloud.google.com/go/longrunning v0.3.0/go.mod h1:qth9Y41RRSUE69rDcOn6DdK3HfQfsUI0YSmW3iIlLJc= --cloud.google.com/go/longrunning v0.4.1/go.mod h1:4iWDqhBZ70CvZ6BfETbvam3T8FMvLK+eFj0E6AaRQTo= --cloud.google.com/go/longrunning v0.4.2/go.mod h1:OHrnaYyLUV6oqwh0xiS7e5sLQhP1m0QU9R+WhGDMgIQ= --cloud.google.com/go/longrunning v0.5.0/go.mod h1:0JNuqRShmscVAhIACGtskSAWtqtOoPkwP0YF1oVEchc= --cloud.google.com/go/longrunning v0.5.1/go.mod h1:spvimkwdz6SPWKEt/XBij79E9fiTkHSQl/fRUUQJYJc= --cloud.google.com/go/longrunning v0.5.2/go.mod h1:nqo6DQbNV2pXhGDbDMoN2bWz68MjZUzqv2YttZiveCs= --cloud.google.com/go/longrunning v0.5.3/go.mod h1:y/0ga59EYu58J6SHmmQOvekvND2qODbu8ywBBW7EK7Y= --cloud.google.com/go/longrunning v0.5.4/go.mod h1:zqNVncI0BOP8ST6XQD1+VcvuShMmq7+xFSzOL++V0dI= --cloud.google.com/go/managedidentities v1.3.0/go.mod h1:UzlW3cBOiPrzucO5qWkNkh0w33KFtBJU281hacNvsdE= --cloud.google.com/go/managedidentities v1.4.0/go.mod h1:NWSBYbEMgqmbZsLIyKvxrYbtqOsxY1ZrGM+9RgDqInM= --cloud.google.com/go/managedidentities v1.5.0/go.mod h1:+dWcZ0JlUmpuxpIDfyP5pP5y0bLdRwOS4Lp7gMni/LA= --cloud.google.com/go/managedidentities v1.6.1/go.mod h1:h/irGhTN2SkZ64F43tfGPMbHnypMbu4RB3yl8YcuEak= --cloud.google.com/go/managedidentities v1.6.2/go.mod h1:5c2VG66eCa0WIq6IylRk3TBW83l161zkFvCj28X7jn8= --cloud.google.com/go/managedidentities v1.6.3/go.mod h1:tewiat9WLyFN0Fi7q1fDD5+0N4VUoL0SCX0OTCthZq4= --cloud.google.com/go/managedidentities v1.6.4/go.mod h1:WgyaECfHmF00t/1Uk8Oun3CQ2PGUtjc3e9Alh79wyiM= --cloud.google.com/go/maps v0.1.0/go.mod h1:BQM97WGyfw9FWEmQMpZ5T6cpovXXSd1cGmFma94eubI= --cloud.google.com/go/maps v0.6.0/go.mod h1:o6DAMMfb+aINHz/p/jbcY+mYeXBoZoxTfdSQ8VAJaCw= --cloud.google.com/go/maps v0.7.0/go.mod h1:3GnvVl3cqeSvgMcpRlQidXsPYuDGQ8naBis7MVzpXsY= --cloud.google.com/go/maps v1.3.0/go.mod h1:6mWTUv+WhnOwAgjVsSW2QPPECmW+s3PcRyOa9vgG/5s= --cloud.google.com/go/maps v1.4.0/go.mod h1:6mWTUv+WhnOwAgjVsSW2QPPECmW+s3PcRyOa9vgG/5s= --cloud.google.com/go/maps v1.4.1/go.mod h1:BxSa0BnW1g2U2gNdbq5zikLlHUuHW0GFWh7sgML2kIY= --cloud.google.com/go/maps v1.5.1/go.mod h1:NPMZw1LJwQZYCfz4y+EIw+SI+24A4bpdFJqdKVr0lt4= --cloud.google.com/go/maps v1.6.1/go.mod h1:4+buOHhYXFBp58Zj/K+Lc1rCmJssxxF4pJ5CJnhdz18= --cloud.google.com/go/mediatranslation v0.5.0/go.mod h1:jGPUhGTybqsPQn91pNXw0xVHfuJ3leR1wj37oU3y1f4= --cloud.google.com/go/mediatranslation v0.6.0/go.mod h1:hHdBCTYNigsBxshbznuIMFNe5QXEowAuNmmC7h8pu5w= --cloud.google.com/go/mediatranslation v0.7.0/go.mod h1:LCnB/gZr90ONOIQLgSXagp8XUW1ODs2UmUMvcgMfI2I= --cloud.google.com/go/mediatranslation v0.8.1/go.mod h1:L/7hBdEYbYHQJhX2sldtTO5SZZ1C1vkapubj0T2aGig= --cloud.google.com/go/mediatranslation v0.8.2/go.mod h1:c9pUaDRLkgHRx3irYE5ZC8tfXGrMYwNZdmDqKMSfFp8= --cloud.google.com/go/mediatranslation v0.8.3/go.mod h1:F9OnXTy336rteOEywtY7FOqCk+J43o2RF638hkOQl4Y= --cloud.google.com/go/mediatranslation v0.8.4/go.mod h1:9WstgtNVAdN53m6TQa5GjIjLqKQPXe74hwSCxUP6nj4= --cloud.google.com/go/memcache v1.4.0/go.mod h1:rTOfiGZtJX1AaFUrOgsMHX5kAzaTQ8azHiuDoTPzNsE= --cloud.google.com/go/memcache v1.5.0/go.mod h1:dk3fCK7dVo0cUU2c36jKb4VqKPS22BTkf81Xq617aWM= --cloud.google.com/go/memcache v1.6.0/go.mod h1:XS5xB0eQZdHtTuTF9Hf8eJkKtR3pVRCcvJwtm68T3rA= --cloud.google.com/go/memcache v1.7.0/go.mod h1:ywMKfjWhNtkQTxrWxCkCFkoPjLHPW6A7WOTVI8xy3LY= --cloud.google.com/go/memcache v1.9.0/go.mod h1:8oEyzXCu+zo9RzlEaEjHl4KkgjlNDaXbCQeQWlzNFJM= --cloud.google.com/go/memcache v1.10.1/go.mod h1:47YRQIarv4I3QS5+hoETgKO40InqzLP6kpNLvyXuyaA= --cloud.google.com/go/memcache v1.10.2/go.mod h1:f9ZzJHLBrmd4BkguIAa/l/Vle6uTHzHokdnzSWOdQ6A= --cloud.google.com/go/memcache v1.10.3/go.mod h1:6z89A41MT2DVAW0P4iIRdu5cmRTsbsFn4cyiIx8gbwo= --cloud.google.com/go/memcache v1.10.4/go.mod h1:v/d8PuC8d1gD6Yn5+I3INzLR01IDn0N4Ym56RgikSI0= --cloud.google.com/go/metastore v1.5.0/go.mod h1:2ZNrDcQwghfdtCwJ33nM0+GrBGlVuh8rakL3vdPY3XY= --cloud.google.com/go/metastore v1.6.0/go.mod h1:6cyQTls8CWXzk45G55x57DVQ9gWg7RiH65+YgPsNh9s= --cloud.google.com/go/metastore v1.7.0/go.mod h1:s45D0B4IlsINu87/AsWiEVYbLaIMeUSoxlKKDqBGFS8= --cloud.google.com/go/metastore v1.8.0/go.mod h1:zHiMc4ZUpBiM7twCIFQmJ9JMEkDSyZS9U12uf7wHqSI= --cloud.google.com/go/metastore v1.10.0/go.mod h1:fPEnH3g4JJAk+gMRnrAnoqyv2lpUCqJPWOodSaf45Eo= --cloud.google.com/go/metastore v1.11.1/go.mod h1:uZuSo80U3Wd4zi6C22ZZliOUJ3XeM/MlYi/z5OAOWRA= --cloud.google.com/go/metastore v1.12.0/go.mod h1:uZuSo80U3Wd4zi6C22ZZliOUJ3XeM/MlYi/z5OAOWRA= --cloud.google.com/go/metastore v1.13.0/go.mod h1:URDhpG6XLeh5K+Glq0NOt74OfrPKTwS62gEPZzb5SOk= --cloud.google.com/go/metastore v1.13.1/go.mod h1:IbF62JLxuZmhItCppcIfzBBfUFq0DIB9HPDoLgWrVOU= --cloud.google.com/go/metastore v1.13.2/go.mod h1:KS59dD+unBji/kFebVp8XU/quNSyo8b6N6tPGspKszA= --cloud.google.com/go/metastore v1.13.3/go.mod h1:K+wdjXdtkdk7AQg4+sXS8bRrQa9gcOr+foOMF2tqINE= --cloud.google.com/go/monitoring v1.7.0/go.mod h1:HpYse6kkGo//7p6sT0wsIC6IBDET0RhIsnmlA53dvEk= --cloud.google.com/go/monitoring v1.8.0/go.mod h1:E7PtoMJ1kQXWxPjB6mv2fhC5/15jInuulFdYYtlcvT4= --cloud.google.com/go/monitoring v1.12.0/go.mod h1:yx8Jj2fZNEkL/GYZyTLS4ZtZEZN8WtDEiEqG4kLK50w= --cloud.google.com/go/monitoring v1.13.0/go.mod h1:k2yMBAB1H9JT/QETjNkgdCGD9bPF712XiLTVr+cBrpw= --cloud.google.com/go/monitoring v1.15.1/go.mod h1:lADlSAlFdbqQuwwpaImhsJXu1QSdd3ojypXrFSMr2rM= --cloud.google.com/go/monitoring v1.16.0/go.mod h1:Ptp15HgAyM1fNICAojDMoNc/wUmn67mLHQfyqbw+poY= --cloud.google.com/go/monitoring v1.16.1/go.mod h1:6HsxddR+3y9j+o/cMJH6q/KJ/CBTvM/38L/1m7bTRJ4= --cloud.google.com/go/monitoring v1.16.2/go.mod h1:B44KGwi4ZCF8Rk/5n+FWeispDXoKSk9oss2QNlXJBgc= --cloud.google.com/go/monitoring v1.16.3/go.mod h1:KwSsX5+8PnXv5NJnICZzW2R8pWTis8ypC4zmdRD63Tw= --cloud.google.com/go/networkconnectivity v1.4.0/go.mod h1:nOl7YL8odKyAOtzNX73/M5/mGZgqqMeryi6UPZTk/rA= --cloud.google.com/go/networkconnectivity v1.5.0/go.mod h1:3GzqJx7uhtlM3kln0+x5wyFvuVH1pIBJjhCpjzSt75o= --cloud.google.com/go/networkconnectivity v1.6.0/go.mod h1:OJOoEXW+0LAxHh89nXd64uGG+FbQoeH8DtxCHVOMlaM= --cloud.google.com/go/networkconnectivity v1.7.0/go.mod h1:RMuSbkdbPwNMQjB5HBWD5MpTBnNm39iAVpC3TmsExt8= --cloud.google.com/go/networkconnectivity v1.10.0/go.mod h1:UP4O4sWXJG13AqrTdQCD9TnLGEbtNRqjuaaA7bNjF5E= --cloud.google.com/go/networkconnectivity v1.11.0/go.mod h1:iWmDD4QF16VCDLXUqvyspJjIEtBR/4zq5hwnY2X3scM= --cloud.google.com/go/networkconnectivity v1.12.1/go.mod h1:PelxSWYM7Sh9/guf8CFhi6vIqf19Ir/sbfZRUwXh92E= --cloud.google.com/go/networkconnectivity v1.13.0/go.mod h1:SAnGPes88pl7QRLUen2HmcBSE9AowVAcdug8c0RSBFk= --cloud.google.com/go/networkconnectivity v1.14.0/go.mod h1:SAnGPes88pl7QRLUen2HmcBSE9AowVAcdug8c0RSBFk= --cloud.google.com/go/networkconnectivity v1.14.1/go.mod h1:LyGPXR742uQcDxZ/wv4EI0Vu5N6NKJ77ZYVnDe69Zug= --cloud.google.com/go/networkconnectivity v1.14.2/go.mod h1:5UFlwIisZylSkGG1AdwK/WZUaoz12PKu6wODwIbFzJo= --cloud.google.com/go/networkconnectivity v1.14.3/go.mod h1:4aoeFdrJpYEXNvrnfyD5kIzs8YtHg945Og4koAjHQek= --cloud.google.com/go/networkmanagement v1.4.0/go.mod h1:Q9mdLLRn60AsOrPc8rs8iNV6OHXaGcDdsIQe1ohekq8= --cloud.google.com/go/networkmanagement v1.5.0/go.mod h1:ZnOeZ/evzUdUsnvRt792H0uYEnHQEMaz+REhhzJRcf4= --cloud.google.com/go/networkmanagement v1.6.0/go.mod h1:5pKPqyXjB/sgtvB5xqOemumoQNB7y95Q7S+4rjSOPYY= --cloud.google.com/go/networkmanagement v1.8.0/go.mod h1:Ho/BUGmtyEqrttTgWEe7m+8vDdK74ibQc+Be0q7Fof0= --cloud.google.com/go/networkmanagement v1.9.0/go.mod h1:UTUaEU9YwbCAhhz3jEOHr+2/K/MrBk2XxOLS89LQzFw= --cloud.google.com/go/networkmanagement v1.9.1/go.mod h1:CCSYgrQQvW73EJawO2QamemYcOb57LvrDdDU51F0mcI= --cloud.google.com/go/networkmanagement v1.9.2/go.mod h1:iDGvGzAoYRghhp4j2Cji7sF899GnfGQcQRQwgVOWnDw= --cloud.google.com/go/networkmanagement v1.9.3/go.mod h1:y7WMO1bRLaP5h3Obm4tey+NquUvB93Co1oh4wpL+XcU= --cloud.google.com/go/networksecurity v0.5.0/go.mod h1:xS6fOCoqpVC5zx15Z/MqkfDwH4+m/61A3ODiDV1xmiQ= --cloud.google.com/go/networksecurity v0.6.0/go.mod h1:Q5fjhTr9WMI5mbpRYEbiexTzROf7ZbDzvzCrNl14nyU= --cloud.google.com/go/networksecurity v0.7.0/go.mod h1:mAnzoxx/8TBSyXEeESMy9OOYwo1v+gZ5eMRnsT5bC8k= --cloud.google.com/go/networksecurity v0.8.0/go.mod h1:B78DkqsxFG5zRSVuwYFRZ9Xz8IcQ5iECsNrPn74hKHU= --cloud.google.com/go/networksecurity v0.9.1/go.mod h1:MCMdxOKQ30wsBI1eI659f9kEp4wuuAueoC9AJKSPWZQ= --cloud.google.com/go/networksecurity v0.9.2/go.mod h1:jG0SeAttWzPMUILEHDUvFYdQTl8L/E/KC8iZDj85lEI= --cloud.google.com/go/networksecurity v0.9.3/go.mod h1:l+C0ynM6P+KV9YjOnx+kk5IZqMSLccdBqW6GUoF4p/0= --cloud.google.com/go/networksecurity v0.9.4/go.mod h1:E9CeMZ2zDsNBkr8axKSYm8XyTqNhiCHf1JO/Vb8mD1w= --cloud.google.com/go/notebooks v1.2.0/go.mod h1:9+wtppMfVPUeJ8fIWPOq1UnATHISkGXGqTkxeieQ6UY= --cloud.google.com/go/notebooks v1.3.0/go.mod h1:bFR5lj07DtCPC7YAAJ//vHskFBxA5JzYlH68kXVdk34= --cloud.google.com/go/notebooks v1.4.0/go.mod h1:4QPMngcwmgb6uw7Po99B2xv5ufVoIQ7nOGDyL4P8AgA= --cloud.google.com/go/notebooks v1.5.0/go.mod h1:q8mwhnP9aR8Hpfnrc5iN5IBhrXUy8S2vuYs+kBJ/gu0= --cloud.google.com/go/notebooks v1.7.0/go.mod h1:PVlaDGfJgj1fl1S3dUwhFMXFgfYGhYQt2164xOMONmE= --cloud.google.com/go/notebooks v1.8.0/go.mod h1:Lq6dYKOYOWUCTvw5t2q1gp1lAp0zxAxRycayS0iJcqQ= --cloud.google.com/go/notebooks v1.9.1/go.mod h1:zqG9/gk05JrzgBt4ghLzEepPHNwE5jgPcHZRKhlC1A8= --cloud.google.com/go/notebooks v1.10.0/go.mod h1:SOPYMZnttHxqot0SGSFSkRrwE29eqnKPBJFqgWmiK2k= --cloud.google.com/go/notebooks v1.10.1/go.mod h1:5PdJc2SgAybE76kFQCWrTfJolCOUQXF97e+gteUUA6A= --cloud.google.com/go/notebooks v1.11.1/go.mod h1:V2Zkv8wX9kDCGRJqYoI+bQAaoVeE5kSiz4yYHd2yJwQ= --cloud.google.com/go/notebooks v1.11.2/go.mod h1:z0tlHI/lREXC8BS2mIsUeR3agM1AkgLiS+Isov3SS70= --cloud.google.com/go/optimization v1.1.0/go.mod h1:5po+wfvX5AQlPznyVEZjGJTMr4+CAkJf2XSTQOOl9l4= --cloud.google.com/go/optimization v1.2.0/go.mod h1:Lr7SOHdRDENsh+WXVmQhQTrzdu9ybg0NecjHidBq6xs= --cloud.google.com/go/optimization v1.3.1/go.mod h1:IvUSefKiwd1a5p0RgHDbWCIbDFgKuEdB+fPPuP0IDLI= --cloud.google.com/go/optimization v1.4.1/go.mod h1:j64vZQP7h9bO49m2rVaTVoNM0vEBEN5eKPUPbZyXOrk= --cloud.google.com/go/optimization v1.5.0/go.mod h1:evo1OvTxeBRBu6ydPlrIRizKY/LJKo/drDMMRKqGEUU= --cloud.google.com/go/optimization v1.5.1/go.mod h1:NC0gnUD5MWVAF7XLdoYVPmYYVth93Q6BUzqAq3ZwtV8= --cloud.google.com/go/optimization v1.6.1/go.mod h1:hH2RYPTTM9e9zOiTaYPTiGPcGdNZVnBSBxjIAJzUkqo= --cloud.google.com/go/optimization v1.6.2/go.mod h1:mWNZ7B9/EyMCcwNl1frUGEuY6CPijSkz88Fz2vwKPOY= --cloud.google.com/go/orchestration v1.3.0/go.mod h1:Sj5tq/JpWiB//X/q3Ngwdl5K7B7Y0KZ7bfv0wL6fqVA= --cloud.google.com/go/orchestration v1.4.0/go.mod h1:6W5NLFWs2TlniBphAViZEVhrXRSMgUGDfW7vrWKvsBk= --cloud.google.com/go/orchestration v1.6.0/go.mod h1:M62Bevp7pkxStDfFfTuCOaXgaaqRAga1yKyoMtEoWPQ= --cloud.google.com/go/orchestration v1.8.1/go.mod h1:4sluRF3wgbYVRqz7zJ1/EUNc90TTprliq9477fGobD8= --cloud.google.com/go/orchestration v1.8.2/go.mod h1:T1cP+6WyTmh6LSZzeUhvGf0uZVmJyTx7t8z7Vg87+A0= --cloud.google.com/go/orchestration v1.8.3/go.mod h1:xhgWAYqlbYjlz2ftbFghdyqENYW+JXuhBx9KsjMoGHs= --cloud.google.com/go/orchestration v1.8.4/go.mod h1:d0lywZSVYtIoSZXb0iFjv9SaL13PGyVOKDxqGxEf/qI= --cloud.google.com/go/orgpolicy v1.4.0/go.mod h1:xrSLIV4RePWmP9P3tBl8S93lTmlAxjm06NSm2UTmKvE= --cloud.google.com/go/orgpolicy v1.5.0/go.mod h1:hZEc5q3wzwXJaKrsx5+Ewg0u1LxJ51nNFlext7Tanwc= --cloud.google.com/go/orgpolicy v1.10.0/go.mod h1:w1fo8b7rRqlXlIJbVhOMPrwVljyuW5mqssvBtU18ONc= --cloud.google.com/go/orgpolicy v1.11.0/go.mod h1:2RK748+FtVvnfuynxBzdnyu7sygtoZa1za/0ZfpOs1M= --cloud.google.com/go/orgpolicy v1.11.1/go.mod h1:8+E3jQcpZJQliP+zaFfayC2Pg5bmhuLK755wKhIIUCE= --cloud.google.com/go/orgpolicy v1.11.2/go.mod h1:biRDpNwfyytYnmCRWZWxrKF22Nkz9eNVj9zyaBdpm1o= --cloud.google.com/go/orgpolicy v1.11.3/go.mod h1:oKAtJ/gkMjum5icv2aujkP4CxROxPXsBbYGCDbPO8MM= --cloud.google.com/go/orgpolicy v1.11.4/go.mod h1:0+aNV/nrfoTQ4Mytv+Aw+stBDBjNf4d8fYRA9herfJI= --cloud.google.com/go/osconfig v1.7.0/go.mod h1:oVHeCeZELfJP7XLxcBGTMBvRO+1nQ5tFG9VQTmYS2Fs= --cloud.google.com/go/osconfig v1.8.0/go.mod h1:EQqZLu5w5XA7eKizepumcvWx+m8mJUhEwiPqWiZeEdg= --cloud.google.com/go/osconfig v1.9.0/go.mod h1:Yx+IeIZJ3bdWmzbQU4fxNl8xsZ4amB+dygAwFPlvnNo= --cloud.google.com/go/osconfig v1.10.0/go.mod h1:uMhCzqC5I8zfD9zDEAfvgVhDS8oIjySWh+l4WK6GnWw= --cloud.google.com/go/osconfig v1.11.0/go.mod h1:aDICxrur2ogRd9zY5ytBLV89KEgT2MKB2L/n6x1ooPw= --cloud.google.com/go/osconfig v1.12.0/go.mod h1:8f/PaYzoS3JMVfdfTubkowZYGmAhUCjjwnjqWI7NVBc= --cloud.google.com/go/osconfig v1.12.1/go.mod h1:4CjBxND0gswz2gfYRCUoUzCm9zCABp91EeTtWXyz0tE= --cloud.google.com/go/osconfig v1.12.2/go.mod h1:eh9GPaMZpI6mEJEuhEjUJmaxvQ3gav+fFEJon1Y8Iw0= --cloud.google.com/go/osconfig v1.12.3/go.mod h1:L/fPS8LL6bEYUi1au832WtMnPeQNT94Zo3FwwV1/xGM= --cloud.google.com/go/osconfig v1.12.4/go.mod h1:B1qEwJ/jzqSRslvdOCI8Kdnp0gSng0xW4LOnIebQomA= --cloud.google.com/go/oslogin v1.4.0/go.mod h1:YdgMXWRaElXz/lDk1Na6Fh5orF7gvmJ0FGLIs9LId4E= --cloud.google.com/go/oslogin v1.5.0/go.mod h1:D260Qj11W2qx/HVF29zBg+0fd6YCSjSqLUkY/qEenQU= --cloud.google.com/go/oslogin v1.6.0/go.mod h1:zOJ1O3+dTU8WPlGEkFSh7qeHPPSoxrcMbbK1Nm2iX70= --cloud.google.com/go/oslogin v1.7.0/go.mod h1:e04SN0xO1UNJ1M5GP0vzVBFicIe4O53FOfcixIqTyXo= --cloud.google.com/go/oslogin v1.9.0/go.mod h1:HNavntnH8nzrn8JCTT5fj18FuJLFJc4NaZJtBnQtKFs= --cloud.google.com/go/oslogin v1.10.1/go.mod h1:x692z7yAue5nE7CsSnoG0aaMbNoRJRXO4sn73R+ZqAs= --cloud.google.com/go/oslogin v1.11.0/go.mod h1:8GMTJs4X2nOAUVJiPGqIWVcDaF0eniEto3xlOxaboXE= --cloud.google.com/go/oslogin v1.11.1/go.mod h1:OhD2icArCVNUxKqtK0mcSmKL7lgr0LVlQz+v9s1ujTg= --cloud.google.com/go/oslogin v1.12.1/go.mod h1:VfwTeFJGbnakxAY236eN8fsnglLiVXndlbcNomY4iZU= --cloud.google.com/go/oslogin v1.12.2/go.mod h1:CQ3V8Jvw4Qo4WRhNPF0o+HAM4DiLuE27Ul9CX9g2QdY= --cloud.google.com/go/phishingprotection v0.5.0/go.mod h1:Y3HZknsK9bc9dMi+oE8Bim0lczMU6hrX0UpADuMefr0= --cloud.google.com/go/phishingprotection v0.6.0/go.mod h1:9Y3LBLgy0kDTcYET8ZH3bq/7qni15yVUoAxiFxnlSUA= --cloud.google.com/go/phishingprotection v0.7.0/go.mod h1:8qJI4QKHoda/sb/7/YmMQ2omRLSLYSu9bU0EKCNI+Lk= --cloud.google.com/go/phishingprotection v0.8.1/go.mod h1:AxonW7GovcA8qdEk13NfHq9hNx5KPtfxXNeUxTDxB6I= --cloud.google.com/go/phishingprotection v0.8.2/go.mod h1:LhJ91uyVHEYKSKcMGhOa14zMMWfbEdxG032oT6ECbC8= --cloud.google.com/go/phishingprotection v0.8.3/go.mod h1:3B01yO7T2Ra/TMojifn8EoGd4G9jts/6cIO0DgDY9J8= --cloud.google.com/go/phishingprotection v0.8.4/go.mod h1:6b3kNPAc2AQ6jZfFHioZKg9MQNybDg4ixFd4RPZZ2nE= --cloud.google.com/go/policytroubleshooter v1.3.0/go.mod h1:qy0+VwANja+kKrjlQuOzmlvscn4RNsAc0e15GGqfMxg= --cloud.google.com/go/policytroubleshooter v1.4.0/go.mod h1:DZT4BcRw3QoO8ota9xw/LKtPa8lKeCByYeKTIf/vxdE= --cloud.google.com/go/policytroubleshooter v1.5.0/go.mod h1:Rz1WfV+1oIpPdN2VvvuboLVRsB1Hclg3CKQ53j9l8vw= --cloud.google.com/go/policytroubleshooter v1.6.0/go.mod h1:zYqaPTsmfvpjm5ULxAyD/lINQxJ0DDsnWOP/GZ7xzBc= --cloud.google.com/go/policytroubleshooter v1.7.1/go.mod h1:0NaT5v3Ag1M7U5r0GfDCpUFkWd9YqpubBWsQlhanRv0= --cloud.google.com/go/policytroubleshooter v1.8.0/go.mod h1:tmn5Ir5EToWe384EuboTcVQT7nTag2+DuH3uHmKd1HU= --cloud.google.com/go/policytroubleshooter v1.9.0/go.mod h1:+E2Lga7TycpeSTj2FsH4oXxTnrbHJGRlKhVZBLGgU64= --cloud.google.com/go/policytroubleshooter v1.9.1/go.mod h1:MYI8i0bCrL8cW+VHN1PoiBTyNZTstCg2WUw2eVC4c4U= --cloud.google.com/go/policytroubleshooter v1.10.1/go.mod h1:5C0rhT3TDZVxAu8813bwmTvd57Phbl8mr9F4ipOsxEs= --cloud.google.com/go/policytroubleshooter v1.10.2/go.mod h1:m4uF3f6LseVEnMV6nknlN2vYGRb+75ylQwJdnOXfnv0= --cloud.google.com/go/privatecatalog v0.5.0/go.mod h1:XgosMUvvPyxDjAVNDYxJ7wBW8//hLDDYmnsNcMGq1K0= --cloud.google.com/go/privatecatalog v0.6.0/go.mod h1:i/fbkZR0hLN29eEWiiwue8Pb+GforiEIBnV9yrRUOKI= --cloud.google.com/go/privatecatalog v0.7.0/go.mod h1:2s5ssIFO69F5csTXcwBP7NPFTZvps26xGzvQ2PQaBYg= --cloud.google.com/go/privatecatalog v0.8.0/go.mod h1:nQ6pfaegeDAq/Q5lrfCQzQLhubPiZhSaNhIgfJlnIXs= --cloud.google.com/go/privatecatalog v0.9.1/go.mod h1:0XlDXW2unJXdf9zFz968Hp35gl/bhF4twwpXZAW50JA= --cloud.google.com/go/privatecatalog v0.9.2/go.mod h1:RMA4ATa8IXfzvjrhhK8J6H4wwcztab+oZph3c6WmtFc= --cloud.google.com/go/privatecatalog v0.9.3/go.mod h1:K5pn2GrVmOPjXz3T26mzwXLcKivfIJ9R5N79AFCF9UE= --cloud.google.com/go/privatecatalog v0.9.4/go.mod h1:SOjm93f+5hp/U3PqMZAHTtBtluqLygrDrVO8X8tYtG0= --cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= --cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= --cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA= --cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU= --cloud.google.com/go/pubsub v1.26.0/go.mod h1:QgBH3U/jdJy/ftjPhTkyXNj543Tin1pRYcdcPRnFIRI= --cloud.google.com/go/pubsub v1.27.1/go.mod h1:hQN39ymbV9geqBnfQq6Xf63yNhUAhv9CZhzp5O6qsW0= --cloud.google.com/go/pubsub v1.28.0/go.mod h1:vuXFpwaVoIPQMGXqRyUQigu/AX1S3IWugR9xznmcXX8= --cloud.google.com/go/pubsub v1.30.0/go.mod h1:qWi1OPS0B+b5L+Sg6Gmc9zD1Y+HaM0MdUr7LsupY1P4= --cloud.google.com/go/pubsub v1.32.0/go.mod h1:f+w71I33OMyxf9VpMVcZbnG5KSUkCOUHYpFd5U1GdRc= --cloud.google.com/go/pubsub v1.33.0/go.mod h1:f+w71I33OMyxf9VpMVcZbnG5KSUkCOUHYpFd5U1GdRc= --cloud.google.com/go/pubsublite v1.5.0/go.mod h1:xapqNQ1CuLfGi23Yda/9l4bBCKz/wC3KIJ5gKcxveZg= --cloud.google.com/go/pubsublite v1.6.0/go.mod h1:1eFCS0U11xlOuMFV/0iBqw3zP12kddMeCbj/F3FSj9k= --cloud.google.com/go/pubsublite v1.7.0/go.mod h1:8hVMwRXfDfvGm3fahVbtDbiLePT3gpoiJYJY+vxWxVM= --cloud.google.com/go/pubsublite v1.8.1/go.mod h1:fOLdU4f5xldK4RGJrBMm+J7zMWNj/k4PxwEZXy39QS0= --cloud.google.com/go/recaptchaenterprise v1.3.1/go.mod h1:OdD+q+y4XGeAlxRaMn1Y7/GveP6zmq76byL6tjPE7d4= --cloud.google.com/go/recaptchaenterprise/v2 v2.1.0/go.mod h1:w9yVqajwroDNTfGuhmOjPDN//rZGySaf6PtFVcSCa7o= --cloud.google.com/go/recaptchaenterprise/v2 v2.2.0/go.mod h1:/Zu5jisWGeERrd5HnlS3EUGb/D335f9k51B/FVil0jk= --cloud.google.com/go/recaptchaenterprise/v2 v2.3.0/go.mod h1:O9LwGCjrhGHBQET5CA7dd5NwwNQUErSgEDit1DLNTdo= --cloud.google.com/go/recaptchaenterprise/v2 v2.4.0/go.mod h1:Am3LHfOuBstrLrNCBrlI5sbwx9LBg3te2N6hGvHn2mE= --cloud.google.com/go/recaptchaenterprise/v2 v2.5.0/go.mod h1:O8LzcHXN3rz0j+LBC91jrwI3R+1ZSZEWrfL7XHgNo9U= --cloud.google.com/go/recaptchaenterprise/v2 v2.6.0/go.mod h1:RPauz9jeLtB3JVzg6nCbe12qNoaa8pXc4d/YukAmcnA= --cloud.google.com/go/recaptchaenterprise/v2 v2.7.0/go.mod h1:19wVj/fs5RtYtynAPJdDTb69oW0vNHYDBTbB4NvMD9c= --cloud.google.com/go/recaptchaenterprise/v2 v2.7.2/go.mod h1:kR0KjsJS7Jt1YSyWFkseQ756D45kaYNTlDPPaRAvDBU= --cloud.google.com/go/recaptchaenterprise/v2 v2.8.0/go.mod h1:QuE8EdU9dEnesG8/kG3XuJyNsjEqMlMzg3v3scCJ46c= --cloud.google.com/go/recaptchaenterprise/v2 v2.8.1/go.mod h1:JZYZJOeZjgSSTGP4uz7NlQ4/d1w5hGmksVgM0lbEij0= --cloud.google.com/go/recaptchaenterprise/v2 v2.8.2/go.mod h1:kpaDBOpkwD4G0GVMzG1W6Doy1tFFC97XAV3xy+Rd/pw= --cloud.google.com/go/recaptchaenterprise/v2 v2.8.3/go.mod h1:Dak54rw6lC2gBY8FBznpOCAR58wKf+R+ZSJRoeJok4w= --cloud.google.com/go/recaptchaenterprise/v2 v2.8.4/go.mod h1:Dak54rw6lC2gBY8FBznpOCAR58wKf+R+ZSJRoeJok4w= --cloud.google.com/go/recommendationengine v0.5.0/go.mod h1:E5756pJcVFeVgaQv3WNpImkFP8a+RptV6dDLGPILjvg= --cloud.google.com/go/recommendationengine v0.6.0/go.mod h1:08mq2umu9oIqc7tDy8sx+MNJdLG0fUi3vaSVbztHgJ4= --cloud.google.com/go/recommendationengine v0.7.0/go.mod h1:1reUcE3GIu6MeBz/h5xZJqNLuuVjNg1lmWMPyjatzac= --cloud.google.com/go/recommendationengine v0.8.1/go.mod h1:MrZihWwtFYWDzE6Hz5nKcNz3gLizXVIDI/o3G1DLcrE= --cloud.google.com/go/recommendationengine v0.8.2/go.mod h1:QIybYHPK58qir9CV2ix/re/M//Ty10OxjnnhWdaKS1Y= --cloud.google.com/go/recommendationengine v0.8.3/go.mod h1:m3b0RZV02BnODE9FeSvGv1qibFo8g0OnmB/RMwYy4V8= --cloud.google.com/go/recommendationengine v0.8.4/go.mod h1:GEteCf1PATl5v5ZsQ60sTClUE0phbWmo3rQ1Js8louU= --cloud.google.com/go/recommender v1.5.0/go.mod h1:jdoeiBIVrJe9gQjwd759ecLJbxCDED4A6p+mqoqDvTg= --cloud.google.com/go/recommender v1.6.0/go.mod h1:+yETpm25mcoiECKh9DEScGzIRyDKpZ0cEhWGo+8bo+c= --cloud.google.com/go/recommender v1.7.0/go.mod h1:XLHs/W+T8olwlGOgfQenXBTbIseGclClff6lhFVe9Bs= --cloud.google.com/go/recommender v1.8.0/go.mod h1:PkjXrTT05BFKwxaUxQmtIlrtj0kph108r02ZZQ5FE70= --cloud.google.com/go/recommender v1.9.0/go.mod h1:PnSsnZY7q+VL1uax2JWkt/UegHssxjUVVCrX52CuEmQ= --cloud.google.com/go/recommender v1.10.1/go.mod h1:XFvrE4Suqn5Cq0Lf+mCP6oBHD/yRMA8XxP5sb7Q7gpA= --cloud.google.com/go/recommender v1.11.0/go.mod h1:kPiRQhPyTJ9kyXPCG6u/dlPLbYfFlkwHNRwdzPVAoII= --cloud.google.com/go/recommender v1.11.1/go.mod h1:sGwFFAyI57v2Hc5LbIj+lTwXipGu9NW015rkaEM5B18= --cloud.google.com/go/recommender v1.11.2/go.mod h1:AeoJuzOvFR/emIcXdVFkspVXVTYpliRCmKNYDnyBv6Y= --cloud.google.com/go/recommender v1.11.3/go.mod h1:+FJosKKJSId1MBFeJ/TTyoGQZiEelQQIZMKYYD8ruK4= --cloud.google.com/go/redis v1.7.0/go.mod h1:V3x5Jq1jzUcg+UNsRvdmsfuFnit1cfe3Z/PGyq/lm4Y= --cloud.google.com/go/redis v1.8.0/go.mod h1:Fm2szCDavWzBk2cDKxrkmWBqoCiL1+Ctwq7EyqBCA/A= --cloud.google.com/go/redis v1.9.0/go.mod h1:HMYQuajvb2D0LvMgZmLDZW8V5aOC/WxstZHiy4g8OiA= --cloud.google.com/go/redis v1.10.0/go.mod h1:ThJf3mMBQtW18JzGgh41/Wld6vnDDc/F/F35UolRZPM= --cloud.google.com/go/redis v1.11.0/go.mod h1:/X6eicana+BWcUda5PpwZC48o37SiFVTFSs0fWAJ7uQ= --cloud.google.com/go/redis v1.13.1/go.mod h1:VP7DGLpE91M6bcsDdMuyCm2hIpB6Vp2hI090Mfd1tcg= --cloud.google.com/go/redis v1.13.2/go.mod h1:0Hg7pCMXS9uz02q+LoEVl5dNHUkIQv+C/3L76fandSA= --cloud.google.com/go/redis v1.13.3/go.mod h1:vbUpCKUAZSYzFcWKmICnYgRAhTFg9r+djWqFxDYXi4U= --cloud.google.com/go/redis v1.14.1/go.mod h1:MbmBxN8bEnQI4doZPC1BzADU4HGocHBk2de3SbgOkqs= --cloud.google.com/go/resourcemanager v1.3.0/go.mod h1:bAtrTjZQFJkiWTPDb1WBjzvc6/kifjj4QBYuKCCoqKA= --cloud.google.com/go/resourcemanager v1.4.0/go.mod h1:MwxuzkumyTX7/a3n37gmsT3py7LIXwrShilPh3P1tR0= --cloud.google.com/go/resourcemanager v1.5.0/go.mod h1:eQoXNAiAvCf5PXxWxXjhKQoTMaUSNrEfg+6qdf/wots= --cloud.google.com/go/resourcemanager v1.6.0/go.mod h1:YcpXGRs8fDzcUl1Xw8uOVmI8JEadvhRIkoXXUNVYcVo= --cloud.google.com/go/resourcemanager v1.7.0/go.mod h1:HlD3m6+bwhzj9XCouqmeiGuni95NTrExfhoSrkC/3EI= --cloud.google.com/go/resourcemanager v1.9.1/go.mod h1:dVCuosgrh1tINZ/RwBufr8lULmWGOkPS8gL5gqyjdT8= --cloud.google.com/go/resourcemanager v1.9.2/go.mod h1:OujkBg1UZg5lX2yIyMo5Vz9O5hf7XQOSV7WxqxxMtQE= --cloud.google.com/go/resourcemanager v1.9.3/go.mod h1:IqrY+g0ZgLsihcfcmqSe+RKp1hzjXwG904B92AwBz6U= --cloud.google.com/go/resourcemanager v1.9.4/go.mod h1:N1dhP9RFvo3lUfwtfLWVxfUWq8+KUQ+XLlHLH3BoFJ0= --cloud.google.com/go/resourcesettings v1.3.0/go.mod h1:lzew8VfESA5DQ8gdlHwMrqZs1S9V87v3oCnKCWoOuQU= --cloud.google.com/go/resourcesettings v1.4.0/go.mod h1:ldiH9IJpcrlC3VSuCGvjR5of/ezRrOxFtpJoJo5SmXg= --cloud.google.com/go/resourcesettings v1.5.0/go.mod h1:+xJF7QSG6undsQDfsCJyqWXyBwUoJLhetkRMDRnIoXA= --cloud.google.com/go/resourcesettings v1.6.1/go.mod h1:M7mk9PIZrC5Fgsu1kZJci6mpgN8o0IUzVx3eJU3y4Jw= --cloud.google.com/go/resourcesettings v1.6.2/go.mod h1:mJIEDd9MobzunWMeniaMp6tzg4I2GvD3TTmPkc8vBXk= --cloud.google.com/go/resourcesettings v1.6.3/go.mod h1:pno5D+7oDYkMWZ5BpPsb4SO0ewg3IXcmmrUZaMJrFic= --cloud.google.com/go/resourcesettings v1.6.4/go.mod h1:pYTTkWdv2lmQcjsthbZLNBP4QW140cs7wqA3DuqErVI= --cloud.google.com/go/retail v1.8.0/go.mod h1:QblKS8waDmNUhghY2TI9O3JLlFk8jybHeV4BF19FrE4= --cloud.google.com/go/retail v1.9.0/go.mod h1:g6jb6mKuCS1QKnH/dpu7isX253absFl6iE92nHwlBUY= --cloud.google.com/go/retail v1.10.0/go.mod h1:2gDk9HsL4HMS4oZwz6daui2/jmKvqShXKQuB2RZ+cCc= --cloud.google.com/go/retail v1.11.0/go.mod h1:MBLk1NaWPmh6iVFSz9MeKG/Psyd7TAgm6y/9L2B4x9Y= --cloud.google.com/go/retail v1.12.0/go.mod h1:UMkelN/0Z8XvKymXFbD4EhFJlYKRx1FGhQkVPU5kF14= --cloud.google.com/go/retail v1.14.1/go.mod h1:y3Wv3Vr2k54dLNIrCzenyKG8g8dhvhncT2NcNjb/6gE= --cloud.google.com/go/retail v1.14.2/go.mod h1:W7rrNRChAEChX336QF7bnMxbsjugcOCPU44i5kbLiL8= --cloud.google.com/go/retail v1.14.3/go.mod h1:Omz2akDHeSlfCq8ArPKiBxlnRpKEBjUH386JYFLUvXo= --cloud.google.com/go/retail v1.14.4/go.mod h1:l/N7cMtY78yRnJqp5JW8emy7MB1nz8E4t2yfOmklYfg= --cloud.google.com/go/run v0.2.0/go.mod h1:CNtKsTA1sDcnqqIFR3Pb5Tq0usWxJJvsWOCPldRU3Do= --cloud.google.com/go/run v0.3.0/go.mod h1:TuyY1+taHxTjrD0ZFk2iAR+xyOXEA0ztb7U3UNA0zBo= --cloud.google.com/go/run v0.8.0/go.mod h1:VniEnuBwqjigv0A7ONfQUaEItaiCRVujlMqerPPiktM= --cloud.google.com/go/run v0.9.0/go.mod h1:Wwu+/vvg8Y+JUApMwEDfVfhetv30hCG4ZwDR/IXl2Qg= --cloud.google.com/go/run v1.2.0/go.mod h1:36V1IlDzQ0XxbQjUx6IYbw8H3TJnWvhii963WW3B/bo= --cloud.google.com/go/run v1.3.0/go.mod h1:S/osX/4jIPZGg+ssuqh6GNgg7syixKe3YnprwehzHKU= --cloud.google.com/go/run v1.3.1/go.mod h1:cymddtZOzdwLIAsmS6s+Asl4JoXIDm/K1cpZTxV4Q5s= --cloud.google.com/go/run v1.3.2/go.mod h1:SIhmqArbjdU/D9M6JoHaAqnAMKLFtXaVdNeq04NjnVE= --cloud.google.com/go/run v1.3.3/go.mod h1:WSM5pGyJ7cfYyYbONVQBN4buz42zFqwG67Q3ch07iK4= --cloud.google.com/go/scheduler v1.4.0/go.mod h1:drcJBmxF3aqZJRhmkHQ9b3uSSpQoltBPGPxGAWROx6s= --cloud.google.com/go/scheduler v1.5.0/go.mod h1:ri073ym49NW3AfT6DZi21vLZrG07GXr5p3H1KxN5QlI= --cloud.google.com/go/scheduler v1.6.0/go.mod h1:SgeKVM7MIwPn3BqtcBntpLyrIJftQISRrYB5ZtT+KOk= --cloud.google.com/go/scheduler v1.7.0/go.mod h1:jyCiBqWW956uBjjPMMuX09n3x37mtyPJegEWKxRsn44= --cloud.google.com/go/scheduler v1.8.0/go.mod h1:TCET+Y5Gp1YgHT8py4nlg2Sew8nUHMqcpousDgXJVQc= --cloud.google.com/go/scheduler v1.9.0/go.mod h1:yexg5t+KSmqu+njTIh3b7oYPheFtBWGcbVUYF1GGMIc= --cloud.google.com/go/scheduler v1.10.1/go.mod h1:R63Ldltd47Bs4gnhQkmNDse5w8gBRrhObZ54PxgR2Oo= --cloud.google.com/go/scheduler v1.10.2/go.mod h1:O3jX6HRH5eKCA3FutMw375XHZJudNIKVonSCHv7ropY= --cloud.google.com/go/scheduler v1.10.3/go.mod h1:8ANskEM33+sIbpJ+R4xRfw/jzOG+ZFE8WVLy7/yGvbc= --cloud.google.com/go/scheduler v1.10.4/go.mod h1:MTuXcrJC9tqOHhixdbHDFSIuh7xZF2IysiINDuiq6NI= --cloud.google.com/go/scheduler v1.10.5/go.mod h1:MTuXcrJC9tqOHhixdbHDFSIuh7xZF2IysiINDuiq6NI= --cloud.google.com/go/secretmanager v1.6.0/go.mod h1:awVa/OXF6IiyaU1wQ34inzQNc4ISIDIrId8qE5QGgKA= --cloud.google.com/go/secretmanager v1.8.0/go.mod h1:hnVgi/bN5MYHd3Gt0SPuTPPp5ENina1/LxM+2W9U9J4= --cloud.google.com/go/secretmanager v1.9.0/go.mod h1:b71qH2l1yHmWQHt9LC80akm86mX8AL6X1MA01dW8ht4= --cloud.google.com/go/secretmanager v1.10.0/go.mod h1:MfnrdvKMPNra9aZtQFvBcvRU54hbPD8/HayQdlUgJpU= --cloud.google.com/go/secretmanager v1.11.1/go.mod h1:znq9JlXgTNdBeQk9TBW/FnR/W4uChEKGeqQWAJ8SXFw= --cloud.google.com/go/secretmanager v1.11.2/go.mod h1:MQm4t3deoSub7+WNwiC4/tRYgDBHJgJPvswqQVB1Vss= --cloud.google.com/go/secretmanager v1.11.3/go.mod h1:0bA2o6FabmShrEy328i67aV+65XoUFFSmVeLBn/51jI= --cloud.google.com/go/secretmanager v1.11.4/go.mod h1:wreJlbS9Zdq21lMzWmJ0XhWW2ZxgPeahsqeV/vZoJ3w= --cloud.google.com/go/security v1.5.0/go.mod h1:lgxGdyOKKjHL4YG3/YwIL2zLqMFCKs0UbQwgyZmfJl4= --cloud.google.com/go/security v1.7.0/go.mod h1:mZklORHl6Bg7CNnnjLH//0UlAlaXqiG7Lb9PsPXLfD0= --cloud.google.com/go/security v1.8.0/go.mod h1:hAQOwgmaHhztFhiQ41CjDODdWP0+AE1B3sX4OFlq+GU= --cloud.google.com/go/security v1.9.0/go.mod h1:6Ta1bO8LXI89nZnmnsZGp9lVoVWXqsVbIq/t9dzI+2Q= --cloud.google.com/go/security v1.10.0/go.mod h1:QtOMZByJVlibUT2h9afNDWRZ1G96gVywH8T5GUSb9IA= --cloud.google.com/go/security v1.12.0/go.mod h1:rV6EhrpbNHrrxqlvW0BWAIawFWq3X90SduMJdFwtLB8= --cloud.google.com/go/security v1.13.0/go.mod h1:Q1Nvxl1PAgmeW0y3HTt54JYIvUdtcpYKVfIB8AOMZ+0= --cloud.google.com/go/security v1.15.1/go.mod h1:MvTnnbsWnehoizHi09zoiZob0iCHVcL4AUBj76h9fXA= --cloud.google.com/go/security v1.15.2/go.mod h1:2GVE/v1oixIRHDaClVbHuPcZwAqFM28mXuAKCfMgYIg= --cloud.google.com/go/security v1.15.3/go.mod h1:gQ/7Q2JYUZZgOzqKtw9McShH+MjNvtDpL40J1cT+vBs= --cloud.google.com/go/security v1.15.4/go.mod h1:oN7C2uIZKhxCLiAAijKUCuHLZbIt/ghYEo8MqwD/Ty4= --cloud.google.com/go/securitycenter v1.13.0/go.mod h1:cv5qNAqjY84FCN6Y9z28WlkKXyWsgLO832YiWwkCWcU= --cloud.google.com/go/securitycenter v1.14.0/go.mod h1:gZLAhtyKv85n52XYWt6RmeBdydyxfPeTrpToDPw4Auc= --cloud.google.com/go/securitycenter v1.15.0/go.mod h1:PeKJ0t8MoFmmXLXWm41JidyzI3PJjd8sXWaVqg43WWk= --cloud.google.com/go/securitycenter v1.16.0/go.mod h1:Q9GMaLQFUD+5ZTabrbujNWLtSLZIZF7SAR0wWECrjdk= --cloud.google.com/go/securitycenter v1.18.1/go.mod h1:0/25gAzCM/9OL9vVx4ChPeM/+DlfGQJDwBy/UC8AKK0= --cloud.google.com/go/securitycenter v1.19.0/go.mod h1:LVLmSg8ZkkyaNy4u7HCIshAngSQ8EcIRREP3xBnyfag= --cloud.google.com/go/securitycenter v1.23.0/go.mod h1:8pwQ4n+Y9WCWM278R8W3nF65QtY172h4S8aXyI9/hsQ= --cloud.google.com/go/securitycenter v1.23.1/go.mod h1:w2HV3Mv/yKhbXKwOCu2i8bCuLtNP1IMHuiYQn4HJq5s= --cloud.google.com/go/securitycenter v1.24.1/go.mod h1:3h9IdjjHhVMXdQnmqzVnM7b0wMn/1O/U20eWVpMpZjI= --cloud.google.com/go/securitycenter v1.24.2/go.mod h1:l1XejOngggzqwr4Fa2Cn+iWZGf+aBLTXtB/vXjy5vXM= --cloud.google.com/go/servicecontrol v1.4.0/go.mod h1:o0hUSJ1TXJAmi/7fLJAedOovnujSEvjKCAFNXPQ1RaU= --cloud.google.com/go/servicecontrol v1.5.0/go.mod h1:qM0CnXHhyqKVuiZnGKrIurvVImCs8gmqWsDoqe9sU1s= --cloud.google.com/go/servicecontrol v1.10.0/go.mod h1:pQvyvSRh7YzUF2efw7H87V92mxU8FnFDawMClGCNuAA= --cloud.google.com/go/servicecontrol v1.11.0/go.mod h1:kFmTzYzTUIuZs0ycVqRHNaNhgR+UMUpw9n02l/pY+mc= --cloud.google.com/go/servicecontrol v1.11.1/go.mod h1:aSnNNlwEFBY+PWGQ2DoM0JJ/QUXqV5/ZD9DOLB7SnUk= --cloud.google.com/go/servicedirectory v1.4.0/go.mod h1:gH1MUaZCgtP7qQiI+F+A+OpeKF/HQWgtAddhTbhL2bs= --cloud.google.com/go/servicedirectory v1.5.0/go.mod h1:QMKFL0NUySbpZJ1UZs3oFAmdvVxhhxB6eJ/Vlp73dfg= --cloud.google.com/go/servicedirectory v1.6.0/go.mod h1:pUlbnWsLH9c13yGkxCmfumWEPjsRs1RlmJ4pqiNjVL4= --cloud.google.com/go/servicedirectory v1.7.0/go.mod h1:5p/U5oyvgYGYejufvxhgwjL8UVXjkuw7q5XcG10wx1U= --cloud.google.com/go/servicedirectory v1.8.0/go.mod h1:srXodfhY1GFIPvltunswqXpVxFPpZjf8nkKQT7XcXaY= --cloud.google.com/go/servicedirectory v1.9.0/go.mod h1:29je5JjiygNYlmsGz8k6o+OZ8vd4f//bQLtvzkPPT/s= --cloud.google.com/go/servicedirectory v1.10.1/go.mod h1:Xv0YVH8s4pVOwfM/1eMTl0XJ6bzIOSLDt8f8eLaGOxQ= --cloud.google.com/go/servicedirectory v1.11.0/go.mod h1:Xv0YVH8s4pVOwfM/1eMTl0XJ6bzIOSLDt8f8eLaGOxQ= --cloud.google.com/go/servicedirectory v1.11.1/go.mod h1:tJywXimEWzNzw9FvtNjsQxxJ3/41jseeILgwU/QLrGI= --cloud.google.com/go/servicedirectory v1.11.2/go.mod h1:KD9hCLhncWRV5jJphwIpugKwM5bn1x0GyVVD4NO8mGg= --cloud.google.com/go/servicedirectory v1.11.3/go.mod h1:LV+cHkomRLr67YoQy3Xq2tUXBGOs5z5bPofdq7qtiAw= --cloud.google.com/go/servicemanagement v1.4.0/go.mod h1:d8t8MDbezI7Z2R1O/wu8oTggo3BI2GKYbdG4y/SJTco= --cloud.google.com/go/servicemanagement v1.5.0/go.mod h1:XGaCRe57kfqu4+lRxaFEAuqmjzF0r+gWHjWqKqBvKFo= --cloud.google.com/go/servicemanagement v1.6.0/go.mod h1:aWns7EeeCOtGEX4OvZUWCCJONRZeFKiptqKf1D0l/Jc= --cloud.google.com/go/servicemanagement v1.8.0/go.mod h1:MSS2TDlIEQD/fzsSGfCdJItQveu9NXnUniTrq/L8LK4= --cloud.google.com/go/serviceusage v1.3.0/go.mod h1:Hya1cozXM4SeSKTAgGXgj97GlqUvF5JaoXacR1JTP/E= --cloud.google.com/go/serviceusage v1.4.0/go.mod h1:SB4yxXSaYVuUBYUml6qklyONXNLt83U0Rb+CXyhjEeU= --cloud.google.com/go/serviceusage v1.5.0/go.mod h1:w8U1JvqUqwJNPEOTQjrMHkw3IaIFLoLsPLvsE3xueec= --cloud.google.com/go/serviceusage v1.6.0/go.mod h1:R5wwQcbOWsyuOfbP9tGdAnCAc6B9DRwPG1xtWMDeuPA= --cloud.google.com/go/shell v1.3.0/go.mod h1:VZ9HmRjZBsjLGXusm7K5Q5lzzByZmJHf1d0IWHEN5X4= --cloud.google.com/go/shell v1.4.0/go.mod h1:HDxPzZf3GkDdhExzD/gs8Grqk+dmYcEjGShZgYa9URw= --cloud.google.com/go/shell v1.6.0/go.mod h1:oHO8QACS90luWgxP3N9iZVuEiSF84zNyLytb+qE2f9A= --cloud.google.com/go/shell v1.7.1/go.mod h1:u1RaM+huXFaTojTbW4g9P5emOrrmLE69KrxqQahKn4g= --cloud.google.com/go/shell v1.7.2/go.mod h1:KqRPKwBV0UyLickMn0+BY1qIyE98kKyI216sH/TuHmc= --cloud.google.com/go/shell v1.7.3/go.mod h1:cTTEz/JdaBsQAeTQ3B6HHldZudFoYBOqjteev07FbIc= --cloud.google.com/go/shell v1.7.4/go.mod h1:yLeXB8eKLxw0dpEmXQ/FjriYrBijNsONpwnWsdPqlKM= --cloud.google.com/go/spanner v1.41.0/go.mod h1:MLYDBJR/dY4Wt7ZaMIQ7rXOTLjYrmxLE/5ve9vFfWos= --cloud.google.com/go/spanner v1.44.0/go.mod h1:G8XIgYdOK+Fbcpbs7p2fiprDw4CaZX63whnSMLVBxjk= --cloud.google.com/go/spanner v1.45.0/go.mod h1:FIws5LowYz8YAE1J8fOS7DJup8ff7xJeetWEo5REA2M= --cloud.google.com/go/spanner v1.47.0/go.mod h1:IXsJwVW2j4UKs0eYDqodab6HgGuA1bViSqW4uH9lfUI= --cloud.google.com/go/spanner v1.49.0/go.mod h1:eGj9mQGK8+hkgSVbHNQ06pQ4oS+cyc4tXXd6Dif1KoM= --cloud.google.com/go/spanner v1.50.0/go.mod h1:eGj9mQGK8+hkgSVbHNQ06pQ4oS+cyc4tXXd6Dif1KoM= --cloud.google.com/go/spanner v1.51.0/go.mod h1:c5KNo5LQ1X5tJwma9rSQZsXNBDNvj4/n8BVc3LNahq0= --cloud.google.com/go/spanner v1.53.0/go.mod h1:liG4iCeLqm5L3fFLU5whFITqP0e0orsAW1uUSrd4rws= --cloud.google.com/go/speech v1.6.0/go.mod h1:79tcr4FHCimOp56lwC01xnt/WPJZc4v3gzyT7FoBkCM= --cloud.google.com/go/speech v1.7.0/go.mod h1:KptqL+BAQIhMsj1kOP2la5DSEEerPDuOP/2mmkhHhZQ= --cloud.google.com/go/speech v1.8.0/go.mod h1:9bYIl1/tjsAnMgKGHKmBZzXKEkGgtU+MpdDPTE9f7y0= --cloud.google.com/go/speech v1.9.0/go.mod h1:xQ0jTcmnRFFM2RfX/U+rk6FQNUF6DQlydUSyoooSpco= --cloud.google.com/go/speech v1.14.1/go.mod h1:gEosVRPJ9waG7zqqnsHpYTOoAS4KouMRLDFMekpJ0J0= --cloud.google.com/go/speech v1.15.0/go.mod h1:y6oH7GhqCaZANH7+Oe0BhgIogsNInLlz542tg3VqeYI= --cloud.google.com/go/speech v1.17.1/go.mod h1:8rVNzU43tQvxDaGvqOhpDqgkJTFowBpDvCJ14kGlJYo= --cloud.google.com/go/speech v1.19.0/go.mod h1:8rVNzU43tQvxDaGvqOhpDqgkJTFowBpDvCJ14kGlJYo= --cloud.google.com/go/speech v1.19.1/go.mod h1:WcuaWz/3hOlzPFOVo9DUsblMIHwxP589y6ZMtaG+iAA= --cloud.google.com/go/speech v1.19.2/go.mod h1:2OYFfj+Ch5LWjsaSINuCZsre/789zlcCI3SY4oAi2oI= --cloud.google.com/go/speech v1.20.1/go.mod h1:wwolycgONvfz2EDU8rKuHRW3+wc9ILPsAWoikBEWavY= --cloud.google.com/go/speech v1.21.0/go.mod h1:wwolycgONvfz2EDU8rKuHRW3+wc9ILPsAWoikBEWavY= --cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw= --cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos= --cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= --cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= --cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= --cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo= --cloud.google.com/go/storage v1.22.1/go.mod h1:S8N1cAStu7BOeFfE8KAQzmyyLkK8p/vmRq6kuBTW58Y= --cloud.google.com/go/storage v1.23.0/go.mod h1:vOEEDNFnciUMhBeT6hsJIn3ieU5cFRmzeLgDvXzfIXc= --cloud.google.com/go/storage v1.27.0/go.mod h1:x9DOL8TK/ygDUMieqwfhdpQryTeEkhGKMi80i/iqR2s= --cloud.google.com/go/storage v1.28.1/go.mod h1:Qnisd4CqDdo6BGs2AD5LLnEsmSQ80wQ5ogcBBKhU86Y= --cloud.google.com/go/storage v1.29.0/go.mod h1:4puEjyTKnku6gfKoTfNOU/W+a9JyuVNxjpS5GBrB8h4= --cloud.google.com/go/storage v1.30.1/go.mod h1:NfxhC0UJE1aXSx7CIIbCf7y9HKT7BiccwkR7+P7gN8E= --cloud.google.com/go/storage v1.35.1/go.mod h1:M6M/3V/D3KpzMTJyPOR/HU6n2Si5QdaXYEsng2xgOs8= --cloud.google.com/go/storagetransfer v1.5.0/go.mod h1:dxNzUopWy7RQevYFHewchb29POFv3/AaBgnhqzqiK0w= --cloud.google.com/go/storagetransfer v1.6.0/go.mod h1:y77xm4CQV/ZhFZH75PLEXY0ROiS7Gh6pSKrM8dJyg6I= --cloud.google.com/go/storagetransfer v1.7.0/go.mod h1:8Giuj1QNb1kfLAiWM1bN6dHzfdlDAVC9rv9abHot2W4= --cloud.google.com/go/storagetransfer v1.8.0/go.mod h1:JpegsHHU1eXg7lMHkvf+KE5XDJ7EQu0GwNJbbVGanEw= --cloud.google.com/go/storagetransfer v1.10.0/go.mod h1:DM4sTlSmGiNczmV6iZyceIh2dbs+7z2Ayg6YAiQlYfA= --cloud.google.com/go/storagetransfer v1.10.1/go.mod h1:rS7Sy0BtPviWYTTJVWCSV4QrbBitgPeuK4/FKa4IdLs= --cloud.google.com/go/storagetransfer v1.10.2/go.mod h1:meIhYQup5rg9juQJdyppnA/WLQCOguxtk1pr3/vBWzA= --cloud.google.com/go/storagetransfer v1.10.3/go.mod h1:Up8LY2p6X68SZ+WToswpQbQHnJpOty/ACcMafuey8gc= --cloud.google.com/go/talent v1.1.0/go.mod h1:Vl4pt9jiHKvOgF9KoZo6Kob9oV4lwd/ZD5Cto54zDRw= --cloud.google.com/go/talent v1.2.0/go.mod h1:MoNF9bhFQbiJ6eFD3uSsg0uBALw4n4gaCaEjBw9zo8g= --cloud.google.com/go/talent v1.3.0/go.mod h1:CmcxwJ/PKfRgd1pBjQgU6W3YBwiewmUzQYH5HHmSCmM= --cloud.google.com/go/talent v1.4.0/go.mod h1:ezFtAgVuRf8jRsvyE6EwmbTK5LKciD4KVnHuDEFmOOA= --cloud.google.com/go/talent v1.5.0/go.mod h1:G+ODMj9bsasAEJkQSzO2uHQWXHHXUomArjWQQYkqK6c= --cloud.google.com/go/talent v1.6.2/go.mod h1:CbGvmKCG61mkdjcqTcLOkb2ZN1SrQI8MDyma2l7VD24= --cloud.google.com/go/talent v1.6.3/go.mod h1:xoDO97Qd4AK43rGjJvyBHMskiEf3KulgYzcH6YWOVoo= --cloud.google.com/go/talent v1.6.4/go.mod h1:QsWvi5eKeh6gG2DlBkpMaFYZYrYUnIpo34f6/V5QykY= --cloud.google.com/go/talent v1.6.5/go.mod h1:Mf5cma696HmE+P2BWJ/ZwYqeJXEeU0UqjHFXVLadEDI= --cloud.google.com/go/texttospeech v1.4.0/go.mod h1:FX8HQHA6sEpJ7rCMSfXuzBcysDAuWusNNNvN9FELDd8= --cloud.google.com/go/texttospeech v1.5.0/go.mod h1:oKPLhR4n4ZdQqWKURdwxMy0uiTS1xU161C8W57Wkea4= --cloud.google.com/go/texttospeech v1.6.0/go.mod h1:YmwmFT8pj1aBblQOI3TfKmwibnsfvhIBzPXcW4EBovc= --cloud.google.com/go/texttospeech v1.7.1/go.mod h1:m7QfG5IXxeneGqTapXNxv2ItxP/FS0hCZBwXYqucgSk= --cloud.google.com/go/texttospeech v1.7.2/go.mod h1:VYPT6aTOEl3herQjFHYErTlSZJ4vB00Q2ZTmuVgluD4= --cloud.google.com/go/texttospeech v1.7.3/go.mod h1:Av/zpkcgWfXlDLRYob17lqMstGZ3GqlvJXqKMp2u8so= --cloud.google.com/go/texttospeech v1.7.4/go.mod h1:vgv0002WvR4liGuSd5BJbWy4nDn5Ozco0uJymY5+U74= --cloud.google.com/go/tpu v1.3.0/go.mod h1:aJIManG0o20tfDQlRIej44FcwGGl/cD0oiRyMKG19IQ= --cloud.google.com/go/tpu v1.4.0/go.mod h1:mjZaX8p0VBgllCzF6wcU2ovUXN9TONFLd7iz227X2Xg= --cloud.google.com/go/tpu v1.5.0/go.mod h1:8zVo1rYDFuW2l4yZVY0R0fb/v44xLh3llq7RuV61fPM= --cloud.google.com/go/tpu v1.6.1/go.mod h1:sOdcHVIgDEEOKuqUoi6Fq53MKHJAtOwtz0GuKsWSH3E= --cloud.google.com/go/tpu v1.6.2/go.mod h1:NXh3NDwt71TsPZdtGWgAG5ThDfGd32X1mJ2cMaRlVgU= --cloud.google.com/go/tpu v1.6.3/go.mod h1:lxiueqfVMlSToZY1151IaZqp89ELPSrk+3HIQ5HRkbY= --cloud.google.com/go/tpu v1.6.4/go.mod h1:NAm9q3Rq2wIlGnOhpYICNI7+bpBebMJbh0yyp3aNw1Y= --cloud.google.com/go/trace v1.3.0/go.mod h1:FFUE83d9Ca57C+K8rDl/Ih8LwOzWIV1krKgxg6N0G28= --cloud.google.com/go/trace v1.4.0/go.mod h1:UG0v8UBqzusp+z63o7FK74SdFE+AXpCLdFb1rshXG+Y= --cloud.google.com/go/trace v1.8.0/go.mod h1:zH7vcsbAhklH8hWFig58HvxcxyQbaIqMarMg9hn5ECA= --cloud.google.com/go/trace v1.9.0/go.mod h1:lOQqpE5IaWY0Ixg7/r2SjixMuc6lfTFeO4QGM4dQWOk= --cloud.google.com/go/trace v1.10.1/go.mod h1:gbtL94KE5AJLH3y+WVpfWILmqgc6dXcqgNXdOPAQTYk= --cloud.google.com/go/trace v1.10.2/go.mod h1:NPXemMi6MToRFcSxRl2uDnu/qAlAQ3oULUphcHGh1vA= --cloud.google.com/go/trace v1.10.3/go.mod h1:Ke1bgfc73RV3wUFml+uQp7EsDw4dGaETLxB7Iq/r4CY= --cloud.google.com/go/trace v1.10.4/go.mod h1:Nso99EDIK8Mj5/zmB+iGr9dosS/bzWCJ8wGmE6TXNWY= --cloud.google.com/go/translate v1.3.0/go.mod h1:gzMUwRjvOqj5i69y/LYLd8RrNQk+hOmIXTi9+nb3Djs= --cloud.google.com/go/translate v1.4.0/go.mod h1:06Dn/ppvLD6WvA5Rhdp029IX2Mi3Mn7fpMRLPvXT5Wg= --cloud.google.com/go/translate v1.5.0/go.mod h1:29YDSYveqqpA1CQFD7NQuP49xymq17RXNaUDdc0mNu0= --cloud.google.com/go/translate v1.6.0/go.mod h1:lMGRudH1pu7I3n3PETiOB2507gf3HnfLV8qlkHZEyos= --cloud.google.com/go/translate v1.7.0/go.mod h1:lMGRudH1pu7I3n3PETiOB2507gf3HnfLV8qlkHZEyos= --cloud.google.com/go/translate v1.8.1/go.mod h1:d1ZH5aaOA0CNhWeXeC8ujd4tdCFw8XoNWRljklu5RHs= --cloud.google.com/go/translate v1.8.2/go.mod h1:d1ZH5aaOA0CNhWeXeC8ujd4tdCFw8XoNWRljklu5RHs= --cloud.google.com/go/translate v1.9.0/go.mod h1:d1ZH5aaOA0CNhWeXeC8ujd4tdCFw8XoNWRljklu5RHs= --cloud.google.com/go/translate v1.9.1/go.mod h1:TWIgDZknq2+JD4iRcojgeDtqGEp154HN/uL6hMvylS8= --cloud.google.com/go/translate v1.9.2/go.mod h1:E3Tc6rUTsQkVrXW6avbUhKJSr7ZE3j7zNmqzXKHqRrY= --cloud.google.com/go/translate v1.9.3/go.mod h1:Kbq9RggWsbqZ9W5YpM94Q1Xv4dshw/gr/SHfsl5yCZ0= --cloud.google.com/go/video v1.8.0/go.mod h1:sTzKFc0bUSByE8Yoh8X0mn8bMymItVGPfTuUBUyRgxk= --cloud.google.com/go/video v1.9.0/go.mod h1:0RhNKFRF5v92f8dQt0yhaHrEuH95m068JYOvLZYnJSw= --cloud.google.com/go/video v1.12.0/go.mod h1:MLQew95eTuaNDEGriQdcYn0dTwf9oWiA4uYebxM5kdg= --cloud.google.com/go/video v1.13.0/go.mod h1:ulzkYlYgCp15N2AokzKjy7MQ9ejuynOJdf1tR5lGthk= --cloud.google.com/go/video v1.14.0/go.mod h1:SkgaXwT+lIIAKqWAJfktHT/RbgjSuY6DobxEp0C5yTQ= --cloud.google.com/go/video v1.15.0/go.mod h1:SkgaXwT+lIIAKqWAJfktHT/RbgjSuY6DobxEp0C5yTQ= --cloud.google.com/go/video v1.17.1/go.mod h1:9qmqPqw/Ib2tLqaeHgtakU+l5TcJxCJbhFXM7UJjVzU= --cloud.google.com/go/video v1.19.0/go.mod h1:9qmqPqw/Ib2tLqaeHgtakU+l5TcJxCJbhFXM7UJjVzU= --cloud.google.com/go/video v1.20.0/go.mod h1:U3G3FTnsvAGqglq9LxgqzOiBc/Nt8zis8S+850N2DUM= --cloud.google.com/go/video v1.20.1/go.mod h1:3gJS+iDprnj8SY6pe0SwLeC5BUW80NjhwX7INWEuWGU= --cloud.google.com/go/video v1.20.2/go.mod h1:lrixr5JeKNThsgfM9gqtwb6Okuqzfo4VrY2xynaViTA= --cloud.google.com/go/video v1.20.3/go.mod h1:TnH/mNZKVHeNtpamsSPygSR0iHtvrR/cW1/GDjN5+GU= --cloud.google.com/go/videointelligence v1.6.0/go.mod h1:w0DIDlVRKtwPCn/C4iwZIJdvC69yInhW0cfi+p546uU= --cloud.google.com/go/videointelligence v1.7.0/go.mod h1:k8pI/1wAhjznARtVT9U1llUaFNPh7muw8QyOUpavru4= --cloud.google.com/go/videointelligence v1.8.0/go.mod h1:dIcCn4gVDdS7yte/w+koiXn5dWVplOZkE+xwG9FgK+M= --cloud.google.com/go/videointelligence v1.9.0/go.mod h1:29lVRMPDYHikk3v8EdPSaL8Ku+eMzDljjuvRs105XoU= --cloud.google.com/go/videointelligence v1.10.0/go.mod h1:LHZngX1liVtUhZvi2uNS0VQuOzNi2TkY1OakiuoUOjU= --cloud.google.com/go/videointelligence v1.11.1/go.mod h1:76xn/8InyQHarjTWsBR058SmlPCwQjgcvoW0aZykOvo= --cloud.google.com/go/videointelligence v1.11.2/go.mod h1:ocfIGYtIVmIcWk1DsSGOoDiXca4vaZQII1C85qtoplc= --cloud.google.com/go/videointelligence v1.11.3/go.mod h1:tf0NUaGTjU1iS2KEkGWvO5hRHeCkFK3nPo0/cOZhZAo= --cloud.google.com/go/videointelligence v1.11.4/go.mod h1:kPBMAYsTPFiQxMLmmjpcZUMklJp3nC9+ipJJtprccD8= --cloud.google.com/go/vision v1.2.0/go.mod h1:SmNwgObm5DpFBme2xpyOyasvBc1aPdjvMk2bBk0tKD0= --cloud.google.com/go/vision/v2 v2.2.0/go.mod h1:uCdV4PpN1S0jyCyq8sIM42v2Y6zOLkZs+4R9LrGYwFo= --cloud.google.com/go/vision/v2 v2.3.0/go.mod h1:UO61abBx9QRMFkNBbf1D8B1LXdS2cGiiCRx0vSpZoUo= --cloud.google.com/go/vision/v2 v2.4.0/go.mod h1:VtI579ll9RpVTrdKdkMzckdnwMyX2JILb+MhPqRbPsY= --cloud.google.com/go/vision/v2 v2.5.0/go.mod h1:MmaezXOOE+IWa+cS7OhRRLK2cNv1ZL98zhqFFZaaH2E= --cloud.google.com/go/vision/v2 v2.6.0/go.mod h1:158Hes0MvOS9Z/bDMSFpjwsUrZ5fPrdwuyyvKSGAGMY= --cloud.google.com/go/vision/v2 v2.7.0/go.mod h1:H89VysHy21avemp6xcf9b9JvZHVehWbET0uT/bcuY/0= --cloud.google.com/go/vision/v2 v2.7.2/go.mod h1:jKa8oSYBWhYiXarHPvP4USxYANYUEdEsQrloLjrSwJU= --cloud.google.com/go/vision/v2 v2.7.3/go.mod h1:V0IcLCY7W+hpMKXK1JYE0LV5llEqVmj+UJChjvA1WsM= --cloud.google.com/go/vision/v2 v2.7.4/go.mod h1:ynDKnsDN/0RtqkKxQZ2iatv3Dm9O+HfRb5djl7l4Vvw= --cloud.google.com/go/vision/v2 v2.7.5/go.mod h1:GcviprJLFfK9OLf0z8Gm6lQb6ZFUulvpZws+mm6yPLM= --cloud.google.com/go/vmmigration v1.2.0/go.mod h1:IRf0o7myyWFSmVR1ItrBSFLFD/rJkfDCUTO4vLlJvsE= --cloud.google.com/go/vmmigration v1.3.0/go.mod h1:oGJ6ZgGPQOFdjHuocGcLqX4lc98YQ7Ygq8YQwHh9A7g= --cloud.google.com/go/vmmigration v1.5.0/go.mod h1:E4YQ8q7/4W9gobHjQg4JJSgXXSgY21nA5r8swQV+Xxc= --cloud.google.com/go/vmmigration v1.6.0/go.mod h1:bopQ/g4z+8qXzichC7GW1w2MjbErL54rk3/C843CjfY= --cloud.google.com/go/vmmigration v1.7.1/go.mod h1:WD+5z7a/IpZ5bKK//YmT9E047AD+rjycCAvyMxGJbro= --cloud.google.com/go/vmmigration v1.7.2/go.mod h1:iA2hVj22sm2LLYXGPT1pB63mXHhrH1m/ruux9TwWLd8= --cloud.google.com/go/vmmigration v1.7.3/go.mod h1:ZCQC7cENwmSWlwyTrZcWivchn78YnFniEQYRWQ65tBo= --cloud.google.com/go/vmmigration v1.7.4/go.mod h1:yBXCmiLaB99hEl/G9ZooNx2GyzgsjKnw5fWcINRgD70= --cloud.google.com/go/vmwareengine v0.1.0/go.mod h1:RsdNEf/8UDvKllXhMz5J40XxDrNJNN4sagiox+OI208= --cloud.google.com/go/vmwareengine v0.2.2/go.mod h1:sKdctNJxb3KLZkE/6Oui94iw/xs9PRNC2wnNLXsHvH8= --cloud.google.com/go/vmwareengine v0.3.0/go.mod h1:wvoyMvNWdIzxMYSpH/R7y2h5h3WFkx6d+1TIsP39WGY= --cloud.google.com/go/vmwareengine v0.4.1/go.mod h1:Px64x+BvjPZwWuc4HdmVhoygcXqEkGHXoa7uyfTgSI0= --cloud.google.com/go/vmwareengine v1.0.0/go.mod h1:Px64x+BvjPZwWuc4HdmVhoygcXqEkGHXoa7uyfTgSI0= --cloud.google.com/go/vmwareengine v1.0.1/go.mod h1:aT3Xsm5sNx0QShk1Jc1B8OddrxAScYLwzVoaiXfdzzk= --cloud.google.com/go/vmwareengine v1.0.2/go.mod h1:xMSNjIk8/itYrz1JA8nV3Ajg4L4n3N+ugP8JKzk3OaA= --cloud.google.com/go/vmwareengine v1.0.3/go.mod h1:QSpdZ1stlbfKtyt6Iu19M6XRxjmXO+vb5a/R6Fvy2y4= --cloud.google.com/go/vpcaccess v1.4.0/go.mod h1:aQHVbTWDYUR1EbTApSVvMq1EnT57ppDmQzZ3imqIk4w= --cloud.google.com/go/vpcaccess v1.5.0/go.mod h1:drmg4HLk9NkZpGfCmZ3Tz0Bwnm2+DKqViEpeEpOq0m8= --cloud.google.com/go/vpcaccess v1.6.0/go.mod h1:wX2ILaNhe7TlVa4vC5xce1bCnqE3AeH27RV31lnmZes= --cloud.google.com/go/vpcaccess v1.7.1/go.mod h1:FogoD46/ZU+JUBX9D606X21EnxiszYi2tArQwLY4SXs= --cloud.google.com/go/vpcaccess v1.7.2/go.mod h1:mmg/MnRHv+3e8FJUjeSibVFvQF1cCy2MsFaFqxeY1HU= --cloud.google.com/go/vpcaccess v1.7.3/go.mod h1:YX4skyfW3NC8vI3Fk+EegJnlYFatA+dXK4o236EUCUc= --cloud.google.com/go/vpcaccess v1.7.4/go.mod h1:lA0KTvhtEOb/VOdnH/gwPuOzGgM+CWsmGu6bb4IoMKk= --cloud.google.com/go/webrisk v1.4.0/go.mod h1:Hn8X6Zr+ziE2aNd8SliSDWpEnSS1u4R9+xXZmFiHmGE= --cloud.google.com/go/webrisk v1.5.0/go.mod h1:iPG6fr52Tv7sGk0H6qUFzmL3HHZev1htXuWDEEsqMTg= --cloud.google.com/go/webrisk v1.6.0/go.mod h1:65sW9V9rOosnc9ZY7A7jsy1zoHS5W9IAXv6dGqhMQMc= --cloud.google.com/go/webrisk v1.7.0/go.mod h1:mVMHgEYH0r337nmt1JyLthzMr6YxwN1aAIEc2fTcq7A= --cloud.google.com/go/webrisk v1.8.0/go.mod h1:oJPDuamzHXgUc+b8SiHRcVInZQuybnvEW72PqTc7sSg= --cloud.google.com/go/webrisk v1.9.1/go.mod h1:4GCmXKcOa2BZcZPn6DCEvE7HypmEJcJkr4mtM+sqYPc= --cloud.google.com/go/webrisk v1.9.2/go.mod h1:pY9kfDgAqxUpDBOrG4w8deLfhvJmejKB0qd/5uQIPBc= --cloud.google.com/go/webrisk v1.9.3/go.mod h1:RUYXe9X/wBDXhVilss7EDLW9ZNa06aowPuinUOPCXH8= --cloud.google.com/go/webrisk v1.9.4/go.mod h1:w7m4Ib4C+OseSr2GL66m0zMBywdrVNTDKsdEsfMl7X0= --cloud.google.com/go/websecurityscanner v1.3.0/go.mod h1:uImdKm2wyeXQevQJXeh8Uun/Ym1VqworNDlBXQevGMo= --cloud.google.com/go/websecurityscanner v1.4.0/go.mod h1:ebit/Fp0a+FWu5j4JOmJEV8S8CzdTkAS77oDsiSqYWQ= --cloud.google.com/go/websecurityscanner v1.5.0/go.mod h1:Y6xdCPy81yi0SQnDY1xdNTNpfY1oAgXUlcfN3B3eSng= --cloud.google.com/go/websecurityscanner v1.6.1/go.mod h1:Njgaw3rttgRHXzwCB8kgCYqv5/rGpFCsBOvPbYgszpg= --cloud.google.com/go/websecurityscanner v1.6.2/go.mod h1:7YgjuU5tun7Eg2kpKgGnDuEOXWIrh8x8lWrJT4zfmas= --cloud.google.com/go/websecurityscanner v1.6.3/go.mod h1:x9XANObUFR+83Cya3g/B9M/yoHVqzxPnFtgF8yYGAXw= --cloud.google.com/go/websecurityscanner v1.6.4/go.mod h1:mUiyMQ+dGpPPRkHgknIZeCzSHJ45+fY4F52nZFDHm2o= --cloud.google.com/go/workflows v1.6.0/go.mod h1:6t9F5h/unJz41YqfBmqSASJSXccBLtD1Vwf+KmJENM0= --cloud.google.com/go/workflows v1.7.0/go.mod h1:JhSrZuVZWuiDfKEFxU0/F1PQjmpnpcoISEXH2bcHC3M= --cloud.google.com/go/workflows v1.8.0/go.mod h1:ysGhmEajwZxGn1OhGOGKsTXc5PyxOc0vfKf5Af+to4M= --cloud.google.com/go/workflows v1.9.0/go.mod h1:ZGkj1aFIOd9c8Gerkjjq7OW7I5+l6cSvT3ujaO/WwSA= --cloud.google.com/go/workflows v1.10.0/go.mod h1:fZ8LmRmZQWacon9UCX1r/g/DfAXx5VcPALq2CxzdePw= --cloud.google.com/go/workflows v1.11.1/go.mod h1:Z+t10G1wF7h8LgdY/EmRcQY8ptBD/nvofaL6FqlET6g= --cloud.google.com/go/workflows v1.12.0/go.mod h1:PYhSk2b6DhZ508tj8HXKaBh+OFe+xdl0dHF/tJdzPQM= --cloud.google.com/go/workflows v1.12.1/go.mod h1:5A95OhD/edtOhQd/O741NSfIMezNTbCwLM1P1tBRGHM= --cloud.google.com/go/workflows v1.12.2/go.mod h1:+OmBIgNqYJPVggnMo9nqmizW0qEXHhmnAzK/CnBqsHc= --cloud.google.com/go/workflows v1.12.3/go.mod h1:fmOUeeqEwPzIU81foMjTRQIdwQHADi/vEr1cx9R1m5g= --dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= --gioui.org v0.0.0-20210308172011-57750fc8a0a6/go.mod h1:RSH6KIUZ0p2xy5zHDxgAM4zumjgTw83q2ge/PI+yyw8= --git.sr.ht/~sbinet/gg v0.3.1/go.mod h1:KGYtlADtqsqANL9ueOFkWymvzUvLMQllU5Ixo+8v3pc= --github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= --github.com/BurntSushi/toml v0.4.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= - github.com/BurntSushi/toml v1.3.2 h1:o7IhLm0Msx3BaB+n3Ag7L8EVlByGnpq14C4YWiu/gL8= - github.com/BurntSushi/toml v1.3.2/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= --github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= --github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= --github.com/JohnCGriffin/overflow v0.0.0-20211019200055-46fa312c352c/go.mod h1:X0CRv0ky0k6m906ixxpzmDRLvX58TFUKS2eePweuyxk= - github.com/Masterminds/goutils v1.1.1 h1:5nUrii3FMTL5diU80unEVvNevw1nH4+ZV4DSLVJLSYI= - github.com/Masterminds/goutils v1.1.1/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU= - github.com/Masterminds/semver/v3 v3.2.0/go.mod h1:qvl/7zhW3nngYb5+80sSMF+FG2BjYrf8m9wsX0PNOMQ= -@@ -1163,310 +7,54 @@ github.com/Masterminds/semver/v3 v3.2.1 h1:RN9w6+7QoMeJVGyfmbcgs28Br8cvmnucEXnY0 - github.com/Masterminds/semver/v3 v3.2.1/go.mod h1:qvl/7zhW3nngYb5+80sSMF+FG2BjYrf8m9wsX0PNOMQ= - github.com/Masterminds/sprig/v3 v3.2.3 h1:eL2fZNezLomi0uOLqjQoN6BfsDD+fyLtgbJMAj9n6YA= - github.com/Masterminds/sprig/v3 v3.2.3/go.mod h1:rXcFaZ2zZbLRJv/xSysmlgIM1u11eBaRMhvYXJNkGuM= --github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= - github.com/agext/levenshtein v1.2.1/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558= - github.com/agext/levenshtein v1.2.2/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558= - github.com/agext/levenshtein v1.2.3 h1:YB2fHEn0UJagG8T1rrWknE3ZQzWM06O8AMAatNn7lmo= - github.com/agext/levenshtein v1.2.3/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558= --github.com/ajstarks/deck v0.0.0-20200831202436-30c9fc6549a9/go.mod h1:JynElWSGnm/4RlzPXRlREEwqTHAN3T56Bv2ITsFT3gY= --github.com/ajstarks/deck/generate v0.0.0-20210309230005-c3f852c02e19/go.mod h1:T13YZdzov6OU0A1+RfKZiZN9ca6VeKdBdyDV+BY97Tk= --github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod h1:K08gAheRH3/J6wwsYMMT4xOr94bZjxIelGM0+d/wbFw= --github.com/ajstarks/svgo v0.0.0-20211024235047-1546f124cd8b/go.mod h1:1KcenG0jGWcpt8ov532z81sp/kMMUG485J2InIOyADM= --github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= --github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= --github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= --github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= --github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho= --github.com/andybalholm/brotli v1.0.4/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= --github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= --github.com/apache/arrow/go/v10 v10.0.1/go.mod h1:YvhnlEePVnBS4+0z3fhPfUy7W1Ikj0Ih0vcRo/gZ1M0= --github.com/apache/arrow/go/v11 v11.0.0/go.mod h1:Eg5OsL5H+e299f7u5ssuXsuHQVEGC4xei5aX110hRiI= --github.com/apache/arrow/go/v12 v12.0.0/go.mod h1:d+tV/eHZZ7Dz7RPrFKtPK02tpr+c9/PEd/zm8mDS9Vg= --github.com/apache/thrift v0.16.0/go.mod h1:PHK3hniurgQaNMZYaCLEqXKsYK8upmhPbmdP2FXSqgU= - github.com/apparentlymart/go-dump v0.0.0-20180507223929-23540a00eaa3/go.mod h1:oL81AME2rN47vu18xqj1S1jPIPuN7afo62yKTNn3XMM= --github.com/apparentlymart/go-textseg v1.0.0 h1:rRmlIsPEEhUTIKQb7T++Nz/A5Q6C9IuX2wFoYVvnCs0= - github.com/apparentlymart/go-textseg v1.0.0/go.mod h1:z96Txxhf3xSFMPmb5X/1W05FF/Nj9VFpLOpjS5yuumk= --github.com/apparentlymart/go-textseg/v13 v13.0.0/go.mod h1:ZK2fH7c4NqDTLtiYLvIkEghdlcqw7yxLeM89kiTRPUo= - github.com/apparentlymart/go-textseg/v15 v15.0.0 h1:uYvfpb3DyLSCGWnctWKGj857c6ew1u1fNQOlOtuGxQY= - github.com/apparentlymart/go-textseg/v15 v15.0.0/go.mod h1:K8XmNZdhEBkdlyDdvbmmsvpAG721bKi0joRfFdHIWJ4= --github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= --github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= --github.com/armon/go-metrics v0.4.1/go.mod h1:E6amYzXo6aW1tqzoZGT755KkbgrJsSdpwZ+3JqfkOG4= --github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= --github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= --github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= --github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= --github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= --github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= --github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= --github.com/boombuler/barcode v1.0.0/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8= --github.com/boombuler/barcode v1.0.1/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8= - github.com/bufbuild/protocompile v0.4.0 h1:LbFKd2XowZvQ/kajzguUp2DC9UEIQhIq77fZZlaQsNA= - github.com/bufbuild/protocompile v0.4.0/go.mod h1:3v93+mbWn/v3xzN+31nwkJfrEpAUwp+BagBSZWx+TP8= --github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= --github.com/census-instrumentation/opencensus-proto v0.3.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= --github.com/census-instrumentation/opencensus-proto v0.4.1/go.mod h1:4T9NM4+4Vw91VeyqjLS6ao50K5bOcLKN6Q42XnYaRYw= --github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= --github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= --github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= --github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= --github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= --github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= --github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag= --github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I= --github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= --github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= --github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= --github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= --github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI= --github.com/cncf/udpa/go v0.0.0-20220112060539-c52dc94e7fbe/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI= --github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= --github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= --github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= --github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= --github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= --github.com/cncf/xds/go v0.0.0-20220314180256-7f1daf1720fc/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= --github.com/cncf/xds/go v0.0.0-20230105202645-06c439db220b/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= --github.com/cncf/xds/go v0.0.0-20230310173818-32f1caf87195/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= --github.com/cncf/xds/go v0.0.0-20230428030218-4003588d1b74/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= --github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= --github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= --github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= - github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= --github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= - github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= - github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= - github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= - github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= --github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE= --github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= --github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= --github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= --github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= --github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= --github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po= --github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= --github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= --github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ= --github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0= --github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE= --github.com/envoyproxy/go-control-plane v0.10.3/go.mod h1:fJJn/j26vwOu972OllsvAgJJM//w9BV6Fxbg2LuVd34= --github.com/envoyproxy/go-control-plane v0.11.0/go.mod h1:VnHyVMpzcLvCFt9yUz1UnCwHLhwx1WguiVDV7pTG/tI= --github.com/envoyproxy/go-control-plane v0.11.1-0.20230524094728-9239064ad72f/go.mod h1:sfYdkwUW4BA3PbKjySwjJy+O4Pu0h62rlqCMHNk+K+Q= --github.com/envoyproxy/go-control-plane v0.11.1/go.mod h1:uhMcXKCQMEJHiAb0w+YGefQLaTEw+YhGluxZkrTmD0g= --github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= --github.com/envoyproxy/protoc-gen-validate v0.6.7/go.mod h1:dyJXwwfPK2VSqiB9Klm1J6romD608Ba7Hij42vrOBCo= --github.com/envoyproxy/protoc-gen-validate v0.9.1/go.mod h1:OKNgG7TCp5pF4d6XftA0++PMirau2/yoOwVac3AbF2w= --github.com/envoyproxy/protoc-gen-validate v0.10.0/go.mod h1:DRjgyB0I43LtJapqN6NiRwroiAU2PaFuvk/vjgh61ss= --github.com/envoyproxy/protoc-gen-validate v0.10.1/go.mod h1:DRjgyB0I43LtJapqN6NiRwroiAU2PaFuvk/vjgh61ss= --github.com/envoyproxy/protoc-gen-validate v1.0.1/go.mod h1:0vj8bNkYbSTNS2PIyH87KZaeN4x9zpL9Qt8fQC7d+vs= --github.com/envoyproxy/protoc-gen-validate v1.0.2/go.mod h1:GpiZQP3dDbg4JouG/NNS7QWXpgx6x8QiMKdmN72jogE= --github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= --github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= - github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= --github.com/fatih/color v1.14.1/go.mod h1:2oHN61fhTpgcxD3TSWCgKDiH1+x4OiDVVGH8WlgGZGg= - github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM= - github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE= --github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k= --github.com/fogleman/gg v1.3.0/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k= - github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8= - github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0= - github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= - github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= --github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= --github.com/go-fonts/dejavu v0.1.0/go.mod h1:4Wt4I4OU2Nq9asgDCteaAaWZOV24E+0/Pwo0gppep4g= --github.com/go-fonts/latin-modern v0.2.0/go.mod h1:rQVLdDMK+mK1xscDwsqM5J8U2jrRa3T0ecnM9pNujks= --github.com/go-fonts/liberation v0.1.1/go.mod h1:K6qoJYypsmfVjWg8KOVDQhLc8UDgIK2HYqyqAO9z7GY= --github.com/go-fonts/liberation v0.2.0/go.mod h1:K6qoJYypsmfVjWg8KOVDQhLc8UDgIK2HYqyqAO9z7GY= --github.com/go-fonts/stix v0.1.0/go.mod h1:w/c1f0ldAUlJmLBvlbkvVXLAD+tAMqobIIQpmnUIzUY= --github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= --github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= --github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= --github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= --github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= --github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= --github.com/go-latex/latex v0.0.0-20210118124228-b3d85cf34e07/go.mod h1:CO1AlKB2CSIqUrmQPqA0gdRIlnLEY0gK5JGjh37zN5U= --github.com/go-latex/latex v0.0.0-20210823091927-c0d11ff05a81/go.mod h1:SX0U8uGpxhq9o2S/CELCSUxEWWAuoCUcVCQWv7G2OCk= --github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= --github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= --github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= --github.com/go-pdf/fpdf v0.5.0/go.mod h1:HzcnA+A23uwogo0tp9yU+l3V+KXhiESpt1PMayhOh5M= --github.com/go-pdf/fpdf v0.6.0/go.mod h1:HzcnA+A23uwogo0tp9yU+l3V+KXhiESpt1PMayhOh5M= --github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= - github.com/go-test/deep v1.0.3 h1:ZrJSEWsXzPOxaZnFteGEfooLba+ju3FYIbOrS+rQd68= - github.com/go-test/deep v1.0.3/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA= --github.com/goccy/go-json v0.9.11/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= --github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= --github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= --github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= --github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k= --github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= --github.com/golang/glog v1.0.0/go.mod h1:EWib/APOK0SL3dFbYqvxE3UYd8E6s1ouQ7iEp/0LWV4= --github.com/golang/glog v1.1.0/go.mod h1:pfYeQZ3JWZoXTV5sFc986z3HTpwQs9At6P4ImfuP3NQ= --github.com/golang/glog v1.1.2/go.mod h1:zR+okUeTbrL6EL3xHUDxZuEtGv04p5shwip1+mL/rLQ= --github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= --github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= --github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= --github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= --github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= --github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= --github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= --github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= --github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= --github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= --github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= --github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8= --github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs= - github.com/golang/protobuf v1.1.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= --github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= --github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= --github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= --github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= --github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= --github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk= --github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= --github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= --github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= --github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= --github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= --github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= --github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= --github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= - github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= --github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM= --github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= - github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= - github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= --github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= --github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= --github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= --github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= --github.com/google/btree v1.0.1/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9uaxA= --github.com/google/flatbuffers v2.0.8+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8= - github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= - github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= --github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= --github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= --github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= --github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= --github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= --github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= --github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= --github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= - github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= --github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= --github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE= --github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= -+github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= - github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= --github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= --github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= --github.com/google/go-pkcs11 v0.2.0/go.mod h1:6eQoGcuNJpa7jnd5pMGdkSaQpNDYvPlXWMcjXXThLlY= --github.com/google/go-pkcs11 v0.2.1-0.20230907215043-c6f79328ddf9/go.mod h1:6eQoGcuNJpa7jnd5pMGdkSaQpNDYvPlXWMcjXXThLlY= --github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= --github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= --github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= --github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= --github.com/google/martian/v3 v3.2.1/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk= --github.com/google/martian/v3 v3.3.2/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk= --github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= --github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= --github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= --github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= --github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= --github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= --github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= --github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= --github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= --github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= --github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= --github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= --github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= --github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= --github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= --github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= --github.com/google/s2a-go v0.1.0/go.mod h1:OJpEgntRZo8ugHpF9hkoLJbS5dSI20XZeXJ9JVywLlM= --github.com/google/s2a-go v0.1.3/go.mod h1:Ej+mSEMGRnqRzjc7VtF+jdBwYG5fuJfiZ8ELkjEwM0A= --github.com/google/s2a-go v0.1.4/go.mod h1:Ej+mSEMGRnqRzjc7VtF+jdBwYG5fuJfiZ8ELkjEwM0A= --github.com/google/s2a-go v0.1.7/go.mod h1:50CgR4k1jNlWBu4UfS4AcfhVe1r6pdZPygJ3R8F0Qdw= - github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= --github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= --github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= --github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= - github.com/google/uuid v1.4.0 h1:MtMxsa51/r9yyhkyLsVeVt0B+BGQZzpQiTQ4eHZ8bc4= - github.com/google/uuid v1.4.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= --github.com/googleapis/enterprise-certificate-proxy v0.0.0-20220520183353-fd19c99a87aa/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8= --github.com/googleapis/enterprise-certificate-proxy v0.1.0/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8= --github.com/googleapis/enterprise-certificate-proxy v0.2.0/go.mod h1:8C0jb7/mgJe/9KK8Lm7X9ctZC2t60YyIpYEI16jx0Qg= --github.com/googleapis/enterprise-certificate-proxy v0.2.1/go.mod h1:AwSRAtLfXpU5Nm3pW+v7rGDHp09LsPtGY9MduiEsR9k= --github.com/googleapis/enterprise-certificate-proxy v0.2.3/go.mod h1:AwSRAtLfXpU5Nm3pW+v7rGDHp09LsPtGY9MduiEsR9k= --github.com/googleapis/enterprise-certificate-proxy v0.2.4/go.mod h1:AwSRAtLfXpU5Nm3pW+v7rGDHp09LsPtGY9MduiEsR9k= --github.com/googleapis/enterprise-certificate-proxy v0.2.5/go.mod h1:RxW0N9901Cko1VOCW3SXCpWP+mlIEkk2tP7jnHy9a3w= --github.com/googleapis/enterprise-certificate-proxy v0.3.2/go.mod h1:VLSiSSBs/ksPL8kq3OBOQ6WRI2QnaFynd1DCjZ62+V0= --github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= --github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= --github.com/googleapis/gax-go/v2 v2.1.0/go.mod h1:Q3nei7sK6ybPYH7twZdmQpAd1MKb7pfu6SK+H1/DsU0= --github.com/googleapis/gax-go/v2 v2.1.1/go.mod h1:hddJymUZASv3XPyGkUpKj8pPO47Rmb0eJc8R6ouapiM= --github.com/googleapis/gax-go/v2 v2.2.0/go.mod h1:as02EH8zWkzwUoLbBaFeQ+arQaj/OthfcblKl4IGNaM= --github.com/googleapis/gax-go/v2 v2.3.0/go.mod h1:b8LNqSzNabLiUpXKkY7HAR5jr6bIT99EXz9pXxye9YM= --github.com/googleapis/gax-go/v2 v2.4.0/go.mod h1:XOTVJ59hdnfJLIP/dh8n5CGryZR2LxK9wbMD5+iXC6c= --github.com/googleapis/gax-go/v2 v2.5.1/go.mod h1:h6B0KMMFNtI2ddbGJn3T3ZbwkeT6yqEF02fYlzkUCyo= --github.com/googleapis/gax-go/v2 v2.6.0/go.mod h1:1mjbznJAPHFpesgE5ucqfYEscaz5kMdcIDwU/6+DDoY= --github.com/googleapis/gax-go/v2 v2.7.0/go.mod h1:TEop28CZZQ2y+c0VxMUmu1lV+fQx57QpBWsYpwqHJx8= --github.com/googleapis/gax-go/v2 v2.7.1/go.mod h1:4orTrqY6hXxxaUL4LHIPl6lGo8vAE38/qKbhSAKP6QI= --github.com/googleapis/gax-go/v2 v2.8.0/go.mod h1:4orTrqY6hXxxaUL4LHIPl6lGo8vAE38/qKbhSAKP6QI= --github.com/googleapis/gax-go/v2 v2.10.0/go.mod h1:4UOEnMCrxsSqQ940WnTiD6qJ63le2ev3xfyagutxiPw= --github.com/googleapis/gax-go/v2 v2.11.0/go.mod h1:DxmR61SGKkGLa2xigwuZIQpkCI2S5iydzRfb3peWZJI= --github.com/googleapis/gax-go/v2 v2.12.0/go.mod h1:y+aIqrI5eb1YGMVJfuV3185Ts/D7qKpsEkdD5+I6QGU= --github.com/googleapis/go-type-adapters v1.0.0/go.mod h1:zHW75FOG2aur7gAO2B+MLby+cLsWGBF62rFAi7WjWO4= --github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g= --github.com/googleapis/google-cloud-go-testing v0.0.0-20210719221736-1c9a4c676720/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g= --github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= --github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= --github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0/go.mod h1:hgWBS7lorOAVIJEQMi4ZsPv9hVvWI6+ch50m39Pf2Ks= --github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.3/go.mod h1:o//XUCC/F+yRGJoPO/VU0GSB0f8Nhgmxx0VIRUvaC0w= --github.com/hashicorp/consul/api v1.25.1/go.mod h1:iiLVwR/htV7mas/sy0O+XSuEnrdBUUydemjxcUrAt4g= --github.com/hashicorp/consul/sdk v0.14.1/go.mod h1:vFt03juSzocLRFo59NkeQHHmQa6+g7oU0pfzdI1mUhg= --github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= --github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= --github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= --github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48= --github.com/hashicorp/go-hclog v0.14.1/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= --github.com/hashicorp/go-hclog v1.5.0/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M= - github.com/hashicorp/go-hclog v1.6.1 h1:pa92nu9bPoAqI7p+uPDCIWGAibUdlCi6TYWJEQQkLf8= - github.com/hashicorp/go-hclog v1.6.1/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M= --github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= --github.com/hashicorp/go-immutable-radix v1.3.1/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= --github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= --github.com/hashicorp/go-msgpack v0.5.5/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= --github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= --github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+vmowP0z+KUhOZdA= --github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= - github.com/hashicorp/go-plugin v1.6.0 h1:wgd4KxHJTVGGqWBq4QPB1i5BZNEx9BR8+OFmHDmTk8A= - github.com/hashicorp/go-plugin v1.6.0/go.mod h1:lBS5MtSSBZk0SHc66KACcjjlU6WzEVP/8pwz68aMkCI= --github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs= --github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8= --github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU= --github.com/hashicorp/go-sockaddr v1.0.2/go.mod h1:rB4wwRAUzs07qva3c5SdrY/NEtAUjGlgmH/UkBUC97A= --github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4= --github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= --github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= --github.com/hashicorp/go-uuid v1.0.3/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= --github.com/hashicorp/go-version v1.2.1/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= - github.com/hashicorp/go-version v1.6.0 h1:feTTfFNnjP967rlCxM/I9g701jU+RN74YKx2mOkIeek= - github.com/hashicorp/go-version v1.6.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= --github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= --github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= --github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= - github.com/hashicorp/hcl v0.0.0-20170504190234-a4b07c25de5f/go.mod h1:oZtUIOe8dh44I2q6ScRibXws4Ajl+d+nod3AaR9vL5w= - github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= - github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= - github.com/hashicorp/hcl/v2 v2.0.0/go.mod h1:oVVDG71tEinNGYCxinCYadcmKU9bglqW9pV3txagJ90= - github.com/hashicorp/hcl/v2 v2.19.1 h1://i05Jqznmb2EXqa39Nsvyan2o5XyMowW5fnCKW5RPI= - github.com/hashicorp/hcl/v2 v2.19.1/go.mod h1:ThLC89FV4p9MPW804KVbe/cEXoQ8NZEh+JtMeeGErHE= --github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= --github.com/hashicorp/mdns v1.0.4/go.mod h1:mtBihi+LeNXGtG8L9dX59gAEa12BDtBQSp4v/YAJqrc= --github.com/hashicorp/memberlist v0.5.0/go.mod h1:yvyXLpo0QaGE59Y7hDTsTzDD25JYBZ4mHgHUZ8lrOI0= --github.com/hashicorp/serf v0.10.1/go.mod h1:yL2t6BqATOLGc5HF7qbFkTfXoPIY0WZdWHfEvMqbG+4= - github.com/hashicorp/yamux v0.1.1 h1:yrQxtgseBDrq9Y652vSRDvsKCJKOUD+GzTS4Y0Y8pvE= - github.com/hashicorp/yamux v0.1.1/go.mod h1:CtWFDAQgb7dxtzFs4tWbplKIe2jSi3+5vKbgIO0SLnQ= - github.com/huandu/xstrings v1.3.3/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE= -@@ -1474,46 +62,14 @@ github.com/huandu/xstrings v1.4.0 h1:D17IlohoQq4UcpqD7fDk80P7l+lwAmlFaBHgOipl2FU - github.com/huandu/xstrings v1.4.0/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE= - github.com/iancoleman/orderedmap v0.3.0 h1:5cbR2grmZR/DiVt+VJopEhtVs9YGInGIxAoMJn+Ichc= - github.com/iancoleman/orderedmap v0.3.0/go.mod h1:XuLcCUkdL5owUCQeF2Ue9uuw1EptkJDkXXS7VoV7XGE= --github.com/iancoleman/strcase v0.2.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho= --github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= --github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= - github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= - github.com/imdario/mergo v0.3.16 h1:wwQJbIsHYGMUyLSPrEq1CT16AhnhNJQ51+4fdHUnCl4= - github.com/imdario/mergo v0.3.16/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY= - github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= - github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= --github.com/jhump/gopoet v0.0.0-20190322174617-17282ff210b3/go.mod h1:me9yfT6IJSlOL3FCfrg+L6yzUEZ+5jW6WHt4Sk+UPUI= --github.com/jhump/gopoet v0.1.0/go.mod h1:me9yfT6IJSlOL3FCfrg+L6yzUEZ+5jW6WHt4Sk+UPUI= --github.com/jhump/goprotoc v0.5.0/go.mod h1:VrbvcYrQOrTi3i0Vf+m+oqQWk9l72mjkJCYo7UvLHRQ= --github.com/jhump/protoreflect v1.11.0/go.mod h1:U7aMIjN0NWq9swDP7xDdoMfRHb35uiuTd3Z9nFXJf5E= - github.com/jhump/protoreflect v1.15.1 h1:HUMERORf3I3ZdX05WaQ6MIpd/NJ434hTp5YiKgfCL6c= - github.com/jhump/protoreflect v1.15.1/go.mod h1:jD/2GMKKE6OqX8qTjhADU1e6DShO+gavG9e0Q693nKo= --github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= --github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= --github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= --github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= --github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= --github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= --github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= --github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= --github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= --github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= --github.com/jung-kurt/gofpdf v1.0.0/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes= --github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes= --github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8= --github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= --github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= --github.com/klauspost/asmfmt v1.3.2/go.mod h1:AG8TuvYojzulgDAMCnYn50l/5QV3Bs/tp6j0HLHbNSE= --github.com/klauspost/compress v1.15.9/go.mod h1:PhcZ0MbTNciWF3rruxRgKxI5NkcHHrHUDtV4Yw2GlzU= --github.com/klauspost/compress v1.17.0/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= --github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= --github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= --github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= --github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= --github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= - github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= --github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= --github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk= - github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= - github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= - github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= -@@ -1523,143 +79,54 @@ github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= - github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348/go.mod h1:B69LEHPfb2qLo0BaaOLcbitczOKLWTsrBG9LczfCD4k= - github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= - github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= --github.com/lyft/protoc-gen-star v0.6.0/go.mod h1:TGAoBVkt8w7MPG72TrKIu85MIdXwDuzJYeZuUPFPNwA= --github.com/lyft/protoc-gen-star v0.6.1/go.mod h1:TGAoBVkt8w7MPG72TrKIu85MIdXwDuzJYeZuUPFPNwA= --github.com/lyft/protoc-gen-star/v2 v2.0.1/go.mod h1:RcCdONR2ScXaYnQC5tUzxzlpA3WVYF7/opLeUgcQs/o= --github.com/lyft/protoc-gen-star/v2 v2.0.3/go.mod h1:amey7yeodaJhXSbf/TlLvWiqQfLOSpEk//mLlc+axEk= - github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY= - github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0= --github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= --github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= --github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= - github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= - github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= - github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= - github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= --github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= --github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= --github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84= --github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE= - github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= - github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= - github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= --github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= - github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= - github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= --github.com/mattn/go-sqlite3 v1.14.14/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU= --github.com/mattn/go-sqlite3 v1.14.15/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg= --github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= --github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso= --github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJysuI= --github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8/go.mod h1:mC1jAcsrzbxHt8iiaC+zU4b1ylILSosueou12R++wfY= --github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3/go.mod h1:RagcQ7I8IeTMnF8JTXieKnO4Z6JCsikNEzj0DwauVzE= --github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= --github.com/mitchellh/cli v1.1.0/go.mod h1:xcISNoH86gajksDmfB23e/pu+B+GeFRMYmoHXxx3xhI= - github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw= - github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw= - github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HKCj9FbZEVFJRxO9s= - github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= - github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= --github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= - github.com/mitchellh/go-testing-interface v1.14.1 h1:jrgshOhYAUVNMAJiKbEu7EqAwgJJ2JqpQmpLJOu07cU= - github.com/mitchellh/go-testing-interface v1.14.1/go.mod h1:gfgS7OtZj6MA4U1UrDRp04twqAjfvlZyCfX3sDjEym8= - github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo= - github.com/mitchellh/go-wordwrap v1.0.0/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo= - github.com/mitchellh/go-wordwrap v1.0.1 h1:TLuKupo69TCn6TQSyGxwI1EblZZEsQ0vMlAFQflz0v0= - github.com/mitchellh/go-wordwrap v1.0.1/go.mod h1:R62XHJLzvMFRBbcrT7m7WgmE1eOyTSsCt+hzestvNj0= --github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= - github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= - github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= - github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= - github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ= - github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= --github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= --github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= --github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= --github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= --github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= --github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= --github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= --github.com/nats-io/nats.go v1.31.0/go.mod h1:di3Bm5MLsoB4Bx61CBTsxuarI36WbhAwOm8QrW39+i8= --github.com/nats-io/nkeys v0.4.5/go.mod h1:XUkxdLPTufzlihbamfzQ7mw/VGx6ObUs+0bN5sNvt64= --github.com/nats-io/nkeys v0.4.6/go.mod h1:4DxZNzenSVd1cYQoAa8948QY3QDjrHfcfVADymtkpts= --github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= --github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA= - github.com/oklog/run v1.1.0 h1:GEenZ1cK0+q0+wsJew9qUg/DyD8k3JzYsZAi5gYi2mA= - github.com/oklog/run v1.1.0/go.mod h1:sVPdnTZT1zYwAJeCMu2Th4T21pA3FPOQRfWjQlk7DVU= --github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= --github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= - github.com/pelletier/go-toml/v2 v2.1.0 h1:FnwAJ4oYMvbT/34k9zzHuZNrhlz48GB3/s6at6/MHO4= - github.com/pelletier/go-toml/v2 v2.1.0/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc= --github.com/phpdave11/gofpdf v1.4.2/go.mod h1:zpO6xFn9yxo3YLyMvW8HcKWVdbNqgIfOOp2dXMnm1mY= --github.com/phpdave11/gofpdi v1.0.12/go.mod h1:vBmVV0Do6hSBHC8uKUQ71JGW+ZGQq74llk/7bXwjDoI= --github.com/phpdave11/gofpdi v1.0.13/go.mod h1:vBmVV0Do6hSBHC8uKUQ71JGW+ZGQq74llk/7bXwjDoI= --github.com/pierrec/lz4/v4 v4.1.15/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= --github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= --github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= --github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= --github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= --github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI= --github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg= --github.com/pkg/sftp v1.13.6/go.mod h1:tz1ryNURKu77RL+GuCzmoJYxQczL3wLNNpPWagdg4Qk= - github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= - github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= - github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= --github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= --github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s= --github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= --github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= --github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU= --github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= --github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= --github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= --github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= --github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= --github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= --github.com/prometheus/client_model v0.3.0/go.mod h1:LDGWKZIo7rky3hgvBe+caln+Dr3dPggB5dvjtD7w9+w= --github.com/prometheus/client_model v0.4.0/go.mod h1:oMQmHW1/JoDwqLtg57MGgP/Fb1CJEYF2imWWhWtMkYU= --github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= --github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= --github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= --github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= --github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= --github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= --github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= --github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= --github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= --github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= --github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= --github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= --github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= --github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= --github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= - github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= - github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= - github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= --github.com/ruudk/golang-pdf417 v0.0.0-20181029194003-1af4ab5afa58/go.mod h1:6lfFZQK844Gfx8o5WFuvpxWRwnSoipWe/p622j1v06w= --github.com/ruudk/golang-pdf417 v0.0.0-20201230142125-a7e3863a1245/go.mod h1:pQAZKsJ8yyVxGRWYNEm9oFB8ieLgKFnamEyDmSA0BRk= --github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= --github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= --github.com/sagikazarmark/crypt v0.17.0/go.mod h1:SMtHTvdmsZMuY/bpZoqokSoChIrcJ/epOxZN58PbZDg= - github.com/sagikazarmark/locafero v0.4.0 h1:HApY1R9zGo4DBgr7dqsTH/JJxLTTsOt7u6keLGt6kNQ= - github.com/sagikazarmark/locafero v0.4.0/go.mod h1:Pe1W6UlPYUk/+wc/6KFhbORCfqzgYEpgQ3O5fPuL3H4= - github.com/sagikazarmark/slog-shim v0.1.0 h1:diDBnUNK9N/354PgrxMywXnAwEr1QZcOr6gto+ugjYE= - github.com/sagikazarmark/slog-shim v0.1.0/go.mod h1:SrcSrq8aKtyuqEI1uvTDTK1arOWRIczQRv+GVI1AkeQ= --github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= - github.com/sergi/go-diff v1.0.0 h1:Kpca3qRNrduNnOQeazBd0ysaKrUJiIuISHxogkT9RPQ= - github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= - github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= - github.com/shopspring/decimal v1.3.1 h1:2Usl1nmF/WZucqkFZhnfFYxxxu8LG21F6nPQBE5gKV8= - github.com/shopspring/decimal v1.3.1/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= --github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= --github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= --github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= - github.com/sourcegraph/conc v0.3.0 h1:OQTbbt6P72L20UqAkXXuLOj79LfEanQ+YQFNpLA9ySo= - github.com/sourcegraph/conc v0.3.0/go.mod h1:Sdozi7LEKbFPqYX2/J+iBAM6HpqSLTASQIKqDmF7Mt0= --github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= --github.com/spf13/afero v1.3.3/go.mod h1:5KUK8ByomD5Ti5Artl0RtHeI5pTF7MIDuXL3yY520V4= --github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= --github.com/spf13/afero v1.9.2/go.mod h1:iUV7ddyEEZPO5gA3zD4fJt6iStLlL+Lg4m2cihcDf8Y= - github.com/spf13/afero v1.11.0 h1:WJQKhtpdm3v2IzqG8VMqrr6Rf3UYpEF239Jy9wNepM8= - github.com/spf13/afero v1.11.0/go.mod h1:GH9Y3pIexgf1MTIWtNGyogA5MwRIDXGUr+hbWNoBjkY= - github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= -@@ -1674,964 +141,108 @@ github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An - github.com/spf13/viper v1.18.0 h1:pN6W1ub/G4OfnM+NR9p7xP9R6TltLUzp5JG9yZD3Qg0= - github.com/spf13/viper v1.18.0/go.mod h1:EKmWIqdnk5lOcmR72yw6hS+8OPYcwD0jteitLMVB+yk= - github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= --github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= - github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= - github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= - github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= - github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= --github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= - github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= --github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= --github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= - github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= - github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals= --github.com/stretchr/testify v1.7.5/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= - github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= --github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= --github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= --github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= - github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= - github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= - github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8= - github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU= - github.com/terraform-docs/terraform-config-inspect v0.0.0-20210728164355-9c1f178932fa h1:wdyf3TobwYFwsqnUGJcjdNHxKfwHPFbaOknBJehnF1M= - github.com/terraform-docs/terraform-config-inspect v0.0.0-20210728164355-9c1f178932fa/go.mod h1:GtanFwTsRRXScYHOMb5h4K18XQBFeS2tXat9/LrPtPc= --github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM= - github.com/vmihailenco/msgpack v3.3.3+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk= --github.com/vmihailenco/msgpack/v5 v5.3.5/go.mod h1:7xyJ9e+0+9SaZT0Wt1RGleJXzli6Q/V5KbhBonMG9jc= --github.com/vmihailenco/tagparser/v2 v2.0.0/go.mod h1:Wri+At7QHww0WTrCBeu4J6bNtoV6mEfg5OIWRZA9qds= --github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= --github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= --github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= --github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= --github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= --github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= - github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= - github.com/zclconf/go-cty v1.1.0/go.mod h1:xnAOWiHeOqg2nWS62VtQ7pbOu17FtxJNW8RLEih+O3s= --github.com/zclconf/go-cty v1.2.0/go.mod h1:hOPWgoHbaTUnI5k4D2ld+GRpFJSCe6bCM7m1q/N4PQ8= --github.com/zclconf/go-cty v1.13.0/go.mod h1:YKQzy/7pZ7iq2jNFzy5go57xdxdWoLLpaEp4u238AE0= - github.com/zclconf/go-cty v1.14.1 h1:t9fyA35fwjjUMcmL5hLER+e/rEPqrbCK1/OSE4SI9KA= - github.com/zclconf/go-cty v1.14.1/go.mod h1:VvMs5i0vgZdhYawQNq5kePSpLAoz8u1xvZgrPIxfnZE= --github.com/zclconf/go-cty-debug v0.0.0-20191215020915-b22d67c1ba0b/go.mod h1:ZRKQfBXbGkpdV6QMzT3rU1kSTAnfu1dO8dPKjYprgj8= --github.com/zeebo/assert v1.3.0/go.mod h1:Pq9JiuJQpG8JLJdtkwrJESF0Foym2/D9XMU5ciN/wJ0= --github.com/zeebo/xxh3 v1.0.2/go.mod h1:5NWz9Sef7zIDm2JHfFlcQvNekmcEl9ekUZQQKCYaDcA= --go.etcd.io/etcd/api/v3 v3.5.10/go.mod h1:TidfmT4Uycad3NM/o25fG3J07odo4GBB9hoxaodFCtI= --go.etcd.io/etcd/client/pkg/v3 v3.5.10/go.mod h1:DYivfIviIuQ8+/lCq4vcxuseg2P2XbHygkKwFo9fc8U= --go.etcd.io/etcd/client/v2 v2.305.10/go.mod h1:m3CKZi69HzilhVqtPDcjhSGp+kA1OmbNn0qamH80xjA= --go.etcd.io/etcd/client/v3 v3.5.10/go.mod h1:RVeBnDz2PUEZqTpgqwAtUd8nAPf5kjyFyND7P1VkOKc= --go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= --go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= --go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= --go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= --go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= --go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= --go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= --go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= --go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= --go.opentelemetry.io/proto/otlp v0.15.0/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U= --go.opentelemetry.io/proto/otlp v0.19.0/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U= --go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= --go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= --go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= --go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= --go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= --go.uber.org/multierr v1.9.0/go.mod h1:X2jQV1h+kxSjClGpnseKVIxpmcjrj7MNnI0bnlfKTVQ= - go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= - go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= --go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= --go.uber.org/zap v1.21.0/go.mod h1:wjWOCqI0f2ZZrJF/UufIOkiC8ii6tm1iqIsLo76RfJw= --golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= - golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= - golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= --golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= --golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= --golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= --golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= --golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= --golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= --golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= - golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= --golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= --golang.org/x/crypto v0.0.0-20220314234659-1baeb1ce4c0b/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= --golang.org/x/crypto v0.0.0-20220517005047-85d78b3ac167/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= --golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw= - golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= --golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58= --golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU= --golang.org/x/crypto v0.9.0/go.mod h1:yrmDGqONDYtNj3tH8X9dzUun2m2lzPa9ngI6/RUPGR0= --golang.org/x/crypto v0.10.0/go.mod h1:o4eNf7Ede1fv+hwOwZsTHl9EsPFO6q6ZvYR8vYfY45I= --golang.org/x/crypto v0.11.0/go.mod h1:xgJhtzW8F9jGdVFWZESrid1U1bjeNy4zgy5cRr/CIio= --golang.org/x/crypto v0.12.0/go.mod h1:NF0Gs7EO5K4qLn+Ylc+fih8BSTeIjAP05siRnAh98yw= --golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc= --golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= --golang.org/x/crypto v0.15.0/go.mod h1:4ChreQoLWfG3xLDer1WdlH5NdlQ3+mwnQq1YTKY+72g= - golang.org/x/crypto v0.16.0 h1:mMMrFzRSCF0GvB7Ne27XVtVAaXLrPmgPC7/v0tkwHaY= - golang.org/x/crypto v0.16.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4= --golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= --golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= --golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= --golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= --golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= --golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= --golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek= --golang.org/x/exp v0.0.0-20191002040644-a1355ae1e2c3/go.mod h1:NOZ3BPKG0ec/BKJQgnvsSFpcKLM5xXVWnvZS97DWHgE= --golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY= --golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= --golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= --golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= --golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= --golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= --golang.org/x/exp v0.0.0-20220827204233-334a2380cb91/go.mod h1:cyybsKvd6eL0RnXn6p/Grxp8F5bW7iYuBgsNCOHpMYE= --golang.org/x/exp v0.0.0-20230321023759-10a507213a29/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= --golang.org/x/exp v0.0.0-20230905200255-921286631fa9/go.mod h1:S2oDrQGGwySpoQPVqRShND87VCbxmc6bL1Yd2oYrm6k= - golang.org/x/exp v0.0.0-20231206192017-f3f8817b8deb h1:c0vyKkb6yr3KR7jEfJaOSv4lG7xPkbN6r52aJz1d8a8= - golang.org/x/exp v0.0.0-20231206192017-f3f8817b8deb/go.mod h1:iRJReGqOEeBhDZGkGbynYwcHlctCvnjTYIamk7uXpHI= --golang.org/x/exp/typeparams v0.0.0-20220218215828-6cf2b201936e/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk= - golang.org/x/exp/typeparams v0.0.0-20220722155223-a9213eeb770e h1:7Xs2YCOpMlNqSQSmrrnhlzBXIE/bpMecZplbLePTJvE= - golang.org/x/exp/typeparams v0.0.0-20220722155223-a9213eeb770e/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk= --golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs= --golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= --golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= --golang.org/x/image v0.0.0-20190910094157-69e4b8554b2a/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= --golang.org/x/image v0.0.0-20200119044424-58c23975cae1/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= --golang.org/x/image v0.0.0-20200430140353-33d19683fad8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= --golang.org/x/image v0.0.0-20200618115811-c13761719519/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= --golang.org/x/image v0.0.0-20201208152932-35266b937fa6/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= --golang.org/x/image v0.0.0-20210216034530-4410531fe030/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= --golang.org/x/image v0.0.0-20210607152325-775e3b0c77b9/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM= --golang.org/x/image v0.0.0-20210628002857-a66eb6448b8d/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM= --golang.org/x/image v0.0.0-20211028202545-6944b10bf410/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM= --golang.org/x/image v0.0.0-20220302094943-723b81ca9867/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM= --golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= --golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= --golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= --golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= --golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= --golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= --golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= --golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs= --golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= --golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= --golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= --golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= --golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= --golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= --golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= --golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= --golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= --golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= --golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= --golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= --golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= --golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= --golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= --golang.org/x/mod v0.5.0/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= --golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= - golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= --golang.org/x/mod v0.6.0/go.mod h1:4mET923SAdbXp2ki8ey+zGs1SLqsuM2Y0uvdZR/fUNI= --golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= --golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= --golang.org/x/mod v0.9.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= --golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= --golang.org/x/mod v0.11.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= --golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= - golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0= - golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= --golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= - golang.org/x/net v0.0.0-20180811021610-c39426892332/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= --golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= --golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= --golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= --golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= --golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= - golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= --golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= --golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= --golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= --golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= - golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= --golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= --golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= --golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= --golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= --golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= --golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= --golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= --golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= --golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= --golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= --golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= --golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= --golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= --golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= --golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= --golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= --golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= --golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= --golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= --golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= --golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= --golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= --golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= - golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= --golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc= --golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= --golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1/go.mod h1:9tjilg8BloeKEkVJvy7fQ90B1CfIiPueXVOjqfkSzI8= --golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= --golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= --golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= --golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= --golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= --golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= --golang.org/x/net v0.0.0-20220325170049-de3da57026de/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= --golang.org/x/net v0.0.0-20220412020605-290c469a71a5/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= --golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= --golang.org/x/net v0.0.0-20220607020251-c690dde0001d/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= --golang.org/x/net v0.0.0-20220617184016-355a448f1bc9/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= --golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= - golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= --golang.org/x/net v0.0.0-20220909164309-bea034e7d591/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= --golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= --golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= --golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= - golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY= --golang.org/x/net v0.4.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE= --golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws= --golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= --golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= --golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= --golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns= --golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= --golang.org/x/net v0.11.0/go.mod h1:2L/ixqYpgIVXmeoSA/4Lu7BzTG4KIyPIryS4IsOd1oQ= --golang.org/x/net v0.12.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA= --golang.org/x/net v0.13.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA= --golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI= --golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk= --golang.org/x/net v0.16.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= --golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= --golang.org/x/net v0.18.0/go.mod h1:/czyP5RqHAH4odGYxBJ1qz0+CE5WZ+2j1YgoEo8F2jQ= - golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c= - golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U= --golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= --golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= --golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= --golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= --golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= --golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= --golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= --golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= --golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= --golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= --golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= --golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= --golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= --golang.org/x/oauth2 v0.0.0-20210805134026-6f1e6394065a/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= --golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= --golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= --golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= --golang.org/x/oauth2 v0.0.0-20220309155454-6242fa91716a/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= --golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= --golang.org/x/oauth2 v0.0.0-20220608161450-d0670ef3b1eb/go.mod h1:jaDAt6Dkxork7LmZnYtzbRWj0W47D86a3TGe0YHBvmE= --golang.org/x/oauth2 v0.0.0-20220622183110-fd043fe589d2/go.mod h1:jaDAt6Dkxork7LmZnYtzbRWj0W47D86a3TGe0YHBvmE= --golang.org/x/oauth2 v0.0.0-20220822191816-0ebed06d0094/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg= --golang.org/x/oauth2 v0.0.0-20220909003341-f21342109be1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg= --golang.org/x/oauth2 v0.0.0-20221006150949-b44042a4b9c1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg= --golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg= --golang.org/x/oauth2 v0.4.0/go.mod h1:RznEsdpjGAINPTOF0UH/t+xJ75L18YO3Ho6Pyn+uRec= --golang.org/x/oauth2 v0.5.0/go.mod h1:9/XBHVqLaWO3/BRHs5jbpYCnOZVjj5V0ndyaAM7KB4I= --golang.org/x/oauth2 v0.6.0/go.mod h1:ycmewcwgD4Rpr3eZJLSB4Kyyljb3qDh40vJ8STE5HKw= --golang.org/x/oauth2 v0.7.0/go.mod h1:hPLQkd9LyjfXTiRohC/41GhcFqxisoUQ99sCUOHO9x4= --golang.org/x/oauth2 v0.8.0/go.mod h1:yr7u4HXZRm1R1kBWqr/xKNqewf0plRYoB7sla+BCIXE= --golang.org/x/oauth2 v0.10.0/go.mod h1:kTpgurOux7LqtuxjuyZa4Gj2gdezIt/jQtGnNFfypQI= --golang.org/x/oauth2 v0.11.0/go.mod h1:LdF7O/8bLR/qWK9DrpXmbHLTouvRHK0SgJl0GmDBchk= --golang.org/x/oauth2 v0.13.0/go.mod h1:/JMhi4ZRXAf4HG9LiNmxvk+45+96RUlVThiH8FzNBn0= --golang.org/x/oauth2 v0.14.0/go.mod h1:lAtNWgaWfL4cm7j2OV8TxGi9Qb7ECORx8DktCY74OwM= --golang.org/x/oauth2 v0.15.0/go.mod h1:q48ptWNTY5XWf+JNten23lcvHpLJ0ZSxF5ttTHKVCAM= - golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= --golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= --golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= --golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= - golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= --golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= --golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= --golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= --golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= --golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= --golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= --golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= - golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= --golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= --golang.org/x/sync v0.0.0-20220929204114-8fcdb60fdcc0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= --golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= --golang.org/x/sync v0.2.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= --golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= --golang.org/x/sync v0.4.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= - golang.org/x/sync v0.5.0 h1:60k92dhOjHxJkrqnwsfl8KuaHbn/5dl0lUPUklKo3qE= - golang.org/x/sync v0.5.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= --golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= --golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= --golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= --golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= - golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= --golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= --golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= - golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= - golang.org/x/sys v0.0.0-20190502175342-a43fa875dd82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= - golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= - golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= - golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20210304124612-50617c2ba197/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= --golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= --golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= --golang.org/x/sys v0.0.0-20210603125802-9665404d3644/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= - golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= --golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= - golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= --golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= --golang.org/x/sys v0.0.0-20210816183151-1e6c022a8912/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= --golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= --golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= - golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= --golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= --golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= --golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= --golang.org/x/sys v0.0.0-20211210111614-af8b64212486/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= --golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= --golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= --golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= --golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= --golang.org/x/sys v0.0.0-20220328115105-d36c6a25d886/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= --golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= --golang.org/x/sys v0.0.0-20220502124256-b6088ccd6cba/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= - golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= - golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= --golang.org/x/sys v0.0.0-20220610221304-9f5ed59c137d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= --golang.org/x/sys v0.0.0-20220615213510-4f61da869c0c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= --golang.org/x/sys v0.0.0-20220624220833-87e55d714810/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= - golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= --golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= - golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= --golang.org/x/sys v0.0.0-20220829200755-d48e67d00261/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= --golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= - golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= --golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= --golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= --golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= - golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= --golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= --golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= --golang.org/x/sys v0.9.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= --golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= --golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= --golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= --golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= --golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= - golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc= - golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= - golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= - golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= --golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= - golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc= --golang.org/x/term v0.3.0/go.mod h1:q750SLmJuPmVoN1blW3UFBPREJfb1KmY3vwxfr+nFDA= --golang.org/x/term v0.4.0/go.mod h1:9P2UbLfCdcvo3p/nzKvsmas4TnlujnuoV9hGgYzW1lQ= --golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= --golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U= --golang.org/x/term v0.7.0/go.mod h1:P32HKFT3hSsZrRxla30E9HqToFYAQPCMs/zFMBUFqPY= --golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= --golang.org/x/term v0.9.0/go.mod h1:M6DEAAIenWoTxdKrOltXcmDY3rSplQUkrvaDU5FcQyo= --golang.org/x/term v0.10.0/go.mod h1:lpqdcUyK/oCiQxvxVrppt5ggO2KCZ5QblwqPnfZ6d5o= --golang.org/x/term v0.11.0/go.mod h1:zC9APTIj3jG3FdV/Ons+XE1riIZXG4aZ4GTHiPZJPIU= --golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU= --golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U= --golang.org/x/term v0.14.0/go.mod h1:TySc+nGkYR6qt8km8wUhuFRTVSMIX3XPR58y2lC8vww= --golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0= --golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= - golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= --golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= - golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= - golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= --golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= --golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= --golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= - golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= --golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= - golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= --golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= --golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= --golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= --golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= --golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= --golang.org/x/text v0.10.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= --golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= --golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= --golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= - golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= - golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= --golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= --golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= --golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= --golang.org/x/time v0.0.0-20220922220347-f3bd1da661af/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= --golang.org/x/time v0.1.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= --golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= --golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= --golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= - golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= --golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= --golang.org/x/tools v0.0.0-20190206041539-40960b6deb8e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= --golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= --golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= --golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= --golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= --golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= --golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= --golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= --golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= --golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= --golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= --golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= --golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= --golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= --golang.org/x/tools v0.0.0-20190927191325-030b2cf1153e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= --golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= --golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= --golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= - golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= --golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= --golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= --golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= --golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= --golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= --golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= --golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= --golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= --golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= --golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= --golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= --golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= --golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= --golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= --golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= --golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= --golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= --golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= --golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= --golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= --golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= --golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= --golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= --golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE= --golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= --golang.org/x/tools v0.0.0-20201124115921-2c860bdd6e78/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= --golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= --golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= --golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= --golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= --golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= --golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= --golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= --golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= --golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= --golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= --golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= --golang.org/x/tools v0.1.9/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU= --golang.org/x/tools v0.1.11-0.20220513221640-090b14e8501f/go.mod h1:SgwaegtQh8clINPpECJMqnxLv9I09HLqnW3RMqW0CA4= - golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= --golang.org/x/tools v0.2.0/go.mod h1:y4OqIKeOV/fWJetJ8bXPU1sEVniLMIyDAZWeHdV+NTA= --golang.org/x/tools v0.3.0/go.mod h1:/rWhSS2+zyEVwoJf8YAX6L2f0ntZ7Kn/mGgAWcipA5k= --golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= --golang.org/x/tools v0.7.0/go.mod h1:4pg6aUX35JBAogB10C9AtvVL+qowtN4pT3CGSQex14s= --golang.org/x/tools v0.8.0/go.mod h1:JxBZ99ISMI5ViVkT1tr6tdNmXeTrcpVSD3vZ1RsRdN4= --golang.org/x/tools v0.9.1/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc= --golang.org/x/tools v0.10.0/go.mod h1:UJwyiVBsOA2uwvK/e5OY3GTpDUJriEd+/YlqAwLPmyM= --golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58= - golang.org/x/tools v0.16.0 h1:GO788SKMRunPIBCXiQyo2AaexLstOrVhuAL5YwsckQM= - golang.org/x/tools v0.16.0/go.mod h1:kYVVN6I1mBNoB1OX+noeBjbRk4IUEPa7JJ+TJMEooJ0= - golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= --golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= - golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= --golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= --golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= --golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= --golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= --golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= --gonum.org/v1/gonum v0.0.0-20180816165407-929014505bf4/go.mod h1:Y+Yx5eoAFn32cQvJDxZx5Dpnq+c3wtXuadVZAcxbbBo= --gonum.org/v1/gonum v0.8.2/go.mod h1:oe/vMfY3deqTw+1EZJhuvEW2iwGF1bW9wwu7XCu0+v0= --gonum.org/v1/gonum v0.9.3/go.mod h1:TZumC3NeyVQskjXqmyWt4S3bINhy7B4eYwW69EbyX+0= --gonum.org/v1/gonum v0.11.0/go.mod h1:fSG4YDCxxUZQJ7rKsQrj0gMOg00Il0Z96/qMA4bVQhA= --gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw= --gonum.org/v1/plot v0.0.0-20190515093506-e2840ee46a6b/go.mod h1:Wt8AAjI+ypCyYX3nZBvf6cAIx93T+c/OS2HFAYskSZc= --gonum.org/v1/plot v0.9.0/go.mod h1:3Pcqqmp6RHvJI72kgb8fThyUnav364FOsdDo2aGW5lY= --gonum.org/v1/plot v0.10.1/go.mod h1:VZW5OlhkL1mysU9vaqNHnsy86inf6Ot+jB3r+BczCEo= --google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= --google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= --google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= --google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= --google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= --google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= --google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= --google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= --google.golang.org/api v0.18.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= --google.golang.org/api v0.19.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= --google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= --google.golang.org/api v0.22.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= --google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= --google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= --google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM= --google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc= --google.golang.org/api v0.35.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg= --google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34qYtE= --google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8= --google.golang.org/api v0.41.0/go.mod h1:RkxM5lITDfTzmyKFPt+wGrCJbVfniCr2ool8kTBzRTU= --google.golang.org/api v0.43.0/go.mod h1:nQsDGjRXMo4lvh5hP0TKqF244gqhGcr/YSIykhUk/94= --google.golang.org/api v0.47.0/go.mod h1:Wbvgpq1HddcWVtzsVLyfLp8lDg6AA241LmgIL59tHXo= --google.golang.org/api v0.48.0/go.mod h1:71Pr1vy+TAZRPkPs/xlCf5SsU8WjuAWv1Pfjbtukyy4= --google.golang.org/api v0.50.0/go.mod h1:4bNT5pAuq5ji4SRZm+5QIkjny9JAyVD/3gaSihNefaw= --google.golang.org/api v0.51.0/go.mod h1:t4HdrdoNgyN5cbEfm7Lum0lcLDLiise1F8qDKX00sOU= --google.golang.org/api v0.54.0/go.mod h1:7C4bFFOvVDGXjfDTAsgGwDgAxRDeQ4X8NvUedIt6z3k= --google.golang.org/api v0.55.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE= --google.golang.org/api v0.56.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE= --google.golang.org/api v0.57.0/go.mod h1:dVPlbZyBo2/OjBpmvNdpn2GRm6rPy75jyU7bmhdrMgI= --google.golang.org/api v0.61.0/go.mod h1:xQRti5UdCmoCEqFxcz93fTl338AVqDgyaDRuOZ3hg9I= --google.golang.org/api v0.63.0/go.mod h1:gs4ij2ffTRXwuzzgJl/56BdwJaA194ijkfn++9tDuPo= --google.golang.org/api v0.67.0/go.mod h1:ShHKP8E60yPsKNw/w8w+VYaj9H6buA5UqDp8dhbQZ6g= --google.golang.org/api v0.70.0/go.mod h1:Bs4ZM2HGifEvXwd50TtW70ovgJffJYw2oRCOFU/SkfA= --google.golang.org/api v0.71.0/go.mod h1:4PyU6e6JogV1f9eA4voyrTY2batOLdgZ5qZ5HOCc4j8= --google.golang.org/api v0.74.0/go.mod h1:ZpfMZOVRMywNyvJFeqL9HRWBgAuRfSjJFpe9QtRRyDs= --google.golang.org/api v0.75.0/go.mod h1:pU9QmyHLnzlpar1Mjt4IbapUCy8J+6HD6GeELN69ljA= --google.golang.org/api v0.77.0/go.mod h1:pU9QmyHLnzlpar1Mjt4IbapUCy8J+6HD6GeELN69ljA= --google.golang.org/api v0.78.0/go.mod h1:1Sg78yoMLOhlQTeF+ARBoytAcH1NNyyl390YMy6rKmw= --google.golang.org/api v0.80.0/go.mod h1:xY3nI94gbvBrE0J6NHXhxOmW97HG7Khjkku6AFB3Hyg= --google.golang.org/api v0.84.0/go.mod h1:NTsGnUFJMYROtiquksZHBWtHfeMC7iYthki7Eq3pa8o= --google.golang.org/api v0.85.0/go.mod h1:AqZf8Ep9uZ2pyTvgL+x0D3Zt0eoT9b5E8fmzfu6FO2g= --google.golang.org/api v0.90.0/go.mod h1:+Sem1dnrKlrXMR/X0bPnMWyluQe4RsNoYfmNLhOIkzw= --google.golang.org/api v0.93.0/go.mod h1:+Sem1dnrKlrXMR/X0bPnMWyluQe4RsNoYfmNLhOIkzw= --google.golang.org/api v0.95.0/go.mod h1:eADj+UBuxkh5zlrSntJghuNeg8HwQ1w5lTKkuqaETEI= --google.golang.org/api v0.96.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ13s= --google.golang.org/api v0.97.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ13s= --google.golang.org/api v0.98.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ13s= --google.golang.org/api v0.99.0/go.mod h1:1YOf74vkVndF7pG6hIHuINsM7eWwpVTAfNMNiL91A08= --google.golang.org/api v0.100.0/go.mod h1:ZE3Z2+ZOr87Rx7dqFsdRQkRBk36kDtp/h+QpHbB7a70= --google.golang.org/api v0.102.0/go.mod h1:3VFl6/fzoA+qNuS1N1/VfXY4LjoXN/wzeIp7TweWwGo= --google.golang.org/api v0.103.0/go.mod h1:hGtW6nK1AC+d9si/UBhw8Xli+QMOf6xyNAyJw4qU9w0= --google.golang.org/api v0.106.0/go.mod h1:2Ts0XTHNVWxypznxWOYUeI4g3WdP9Pk2Qk58+a/O9MY= --google.golang.org/api v0.107.0/go.mod h1:2Ts0XTHNVWxypznxWOYUeI4g3WdP9Pk2Qk58+a/O9MY= --google.golang.org/api v0.108.0/go.mod h1:2Ts0XTHNVWxypznxWOYUeI4g3WdP9Pk2Qk58+a/O9MY= --google.golang.org/api v0.110.0/go.mod h1:7FC4Vvx1Mooxh8C5HWjzZHcavuS2f6pmJpZx60ca7iI= --google.golang.org/api v0.111.0/go.mod h1:qtFHvU9mhgTJegR31csQ+rwxyUTHOKFqCKWp1J0fdw0= --google.golang.org/api v0.114.0/go.mod h1:ifYI2ZsFK6/uGddGfAD5BMxlnkBqCmqHSDUVi45N5Yg= --google.golang.org/api v0.118.0/go.mod h1:76TtD3vkgmZ66zZzp72bUUklpmQmKlhh6sYtIjYK+5E= --google.golang.org/api v0.122.0/go.mod h1:gcitW0lvnyWjSp9nKxAbdHKIZ6vF4aajGueeslZOyms= --google.golang.org/api v0.124.0/go.mod h1:xu2HQurE5gi/3t1aFCvhPD781p0a3p11sdunTJ2BlP4= --google.golang.org/api v0.125.0/go.mod h1:mBwVAtz+87bEN6CbA1GtZPDOqY2R5ONPqJeIlvyo4Aw= --google.golang.org/api v0.126.0/go.mod h1:mBwVAtz+87bEN6CbA1GtZPDOqY2R5ONPqJeIlvyo4Aw= --google.golang.org/api v0.128.0/go.mod h1:Y611qgqaE92On/7g65MQgxYul3c0rEB894kniWLY750= --google.golang.org/api v0.139.0/go.mod h1:CVagp6Eekz9CjGZ718Z+sloknzkDJE7Vc1Ckj9+viBk= --google.golang.org/api v0.149.0/go.mod h1:Mwn1B7JTXrzXtnvmzQE2BD6bYZQ8DShKZDZbeN9I7qI= --google.golang.org/api v0.150.0/go.mod h1:ccy+MJ6nrYFgE3WgRx/AMXOxOmU8Q4hSa+jjibzhxcg= --google.golang.org/api v0.152.0/go.mod h1:3qNJX5eOmhiWYc67jRA/3GsDw97UFb5ivv7Y2PrriAY= --google.golang.org/api v0.153.0/go.mod h1:3qNJX5eOmhiWYc67jRA/3GsDw97UFb5ivv7Y2PrriAY= - google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= --google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= --google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= --google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= --google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= --google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= --google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= --google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= --google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= --google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= --google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= --google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= --google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= --google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= --google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= --google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= --google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= --google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= --google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= --google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= --google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= --google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod h1:GmwEX6Z4W5gMy59cAlVYjN9JhxgbQH6Gn+gFDQe2lzA= --google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= --google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= --google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= --google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= --google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= --google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= --google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= --google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= --google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= --google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U= --google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= --google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA= --google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= --google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= --google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= --google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= --google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= --google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= --google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= --google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= --google.golang.org/genproto v0.0.0-20210108203827-ffc7fda8c3d7/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= --google.golang.org/genproto v0.0.0-20210222152913-aa3ee6e6a81c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= --google.golang.org/genproto v0.0.0-20210226172003-ab064af71705/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= --google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= --google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= --google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= --google.golang.org/genproto v0.0.0-20210329143202-679c6ae281ee/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A= --google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A= --google.golang.org/genproto v0.0.0-20210513213006-bf773b8c8384/go.mod h1:P3QM42oQyzQSnHPnZ/vqoCdDmzH28fzWByN9asMeM8A= --google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= --google.golang.org/genproto v0.0.0-20210604141403-392c879c8b08/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= --google.golang.org/genproto v0.0.0-20210608205507-b6d2f5bf0d7d/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= --google.golang.org/genproto v0.0.0-20210624195500-8bfb893ecb84/go.mod h1:SzzZ/N+nwJDaO1kznhnlzqS8ocJICar6hYhVyhi++24= --google.golang.org/genproto v0.0.0-20210713002101-d411969a0d9a/go.mod h1:AxrInvYm1dci+enl5hChSFPOmmUF1+uAa/UsgNRWd7k= --google.golang.org/genproto v0.0.0-20210716133855-ce7ef5c701ea/go.mod h1:AxrInvYm1dci+enl5hChSFPOmmUF1+uAa/UsgNRWd7k= --google.golang.org/genproto v0.0.0-20210728212813-7823e685a01f/go.mod h1:ob2IJxKrgPT52GcgX759i1sleT07tiKowYBGbczaW48= --google.golang.org/genproto v0.0.0-20210805201207-89edb61ffb67/go.mod h1:ob2IJxKrgPT52GcgX759i1sleT07tiKowYBGbczaW48= --google.golang.org/genproto v0.0.0-20210813162853-db860fec028c/go.mod h1:cFeNkxwySK631ADgubI+/XFU/xp8FD5KIVV4rj8UC5w= --google.golang.org/genproto v0.0.0-20210821163610-241b8fcbd6c8/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= --google.golang.org/genproto v0.0.0-20210828152312-66f60bf46e71/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= --google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= --google.golang.org/genproto v0.0.0-20210903162649-d08c68adba83/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= --google.golang.org/genproto v0.0.0-20210909211513-a8c4777a87af/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= --google.golang.org/genproto v0.0.0-20210924002016-3dee208752a0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= --google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= --google.golang.org/genproto v0.0.0-20211206160659-862468c7d6e0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= --google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= --google.golang.org/genproto v0.0.0-20211221195035-429b39de9b1c/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= --google.golang.org/genproto v0.0.0-20220126215142-9970aeb2e350/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= --google.golang.org/genproto v0.0.0-20220207164111-0872dc986b00/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= --google.golang.org/genproto v0.0.0-20220218161850-94dd64e39d7c/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI= --google.golang.org/genproto v0.0.0-20220222213610-43724f9ea8cf/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI= --google.golang.org/genproto v0.0.0-20220304144024-325a89244dc8/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI= --google.golang.org/genproto v0.0.0-20220310185008-1973136f34c6/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI= --google.golang.org/genproto v0.0.0-20220324131243-acbaeb5b85eb/go.mod h1:hAL49I2IFola2sVEjAn7MEwsja0xp51I0tlGAf9hz4E= --google.golang.org/genproto v0.0.0-20220329172620-7be39ac1afc7/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= --google.golang.org/genproto v0.0.0-20220407144326-9054f6ed7bac/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= --google.golang.org/genproto v0.0.0-20220413183235-5e96e2839df9/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= --google.golang.org/genproto v0.0.0-20220414192740-2d67ff6cf2b4/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= --google.golang.org/genproto v0.0.0-20220421151946-72621c1f0bd3/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= --google.golang.org/genproto v0.0.0-20220429170224-98d788798c3e/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= --google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4= --google.golang.org/genproto v0.0.0-20220505152158-f39f71e6c8f3/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4= --google.golang.org/genproto v0.0.0-20220518221133-4f43b3371335/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4= --google.golang.org/genproto v0.0.0-20220523171625-347a074981d8/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4= --google.golang.org/genproto v0.0.0-20220608133413-ed9918b62aac/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA= --google.golang.org/genproto v0.0.0-20220616135557-88e70c0c3a90/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA= --google.golang.org/genproto v0.0.0-20220617124728-180714bec0ad/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA= --google.golang.org/genproto v0.0.0-20220624142145-8cd45d7dbd1f/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA= --google.golang.org/genproto v0.0.0-20220628213854-d9e0b6570c03/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA= --google.golang.org/genproto v0.0.0-20220722212130-b98a9ff5e252/go.mod h1:GkXuJDJ6aQ7lnJcRF+SJVgFdQhypqgl3LB1C9vabdRE= --google.golang.org/genproto v0.0.0-20220801145646-83ce21fca29f/go.mod h1:iHe1svFLAZg9VWz891+QbRMwUv9O/1Ww+/mngYeThbc= --google.golang.org/genproto v0.0.0-20220815135757-37a418bb8959/go.mod h1:dbqgFATTzChvnt+ujMdZwITVAJHFtfyN1qUhDqEiIlk= --google.golang.org/genproto v0.0.0-20220817144833-d7fd3f11b9b1/go.mod h1:dbqgFATTzChvnt+ujMdZwITVAJHFtfyN1qUhDqEiIlk= --google.golang.org/genproto v0.0.0-20220822174746-9e6da59bd2fc/go.mod h1:dbqgFATTzChvnt+ujMdZwITVAJHFtfyN1qUhDqEiIlk= --google.golang.org/genproto v0.0.0-20220829144015-23454907ede3/go.mod h1:dbqgFATTzChvnt+ujMdZwITVAJHFtfyN1qUhDqEiIlk= --google.golang.org/genproto v0.0.0-20220829175752-36a9c930ecbf/go.mod h1:dbqgFATTzChvnt+ujMdZwITVAJHFtfyN1qUhDqEiIlk= --google.golang.org/genproto v0.0.0-20220913154956-18f8339a66a5/go.mod h1:0Nb8Qy+Sk5eDzHnzlStwW3itdNaWoZA5XeSG+R3JHSo= --google.golang.org/genproto v0.0.0-20220914142337-ca0e39ece12f/go.mod h1:0Nb8Qy+Sk5eDzHnzlStwW3itdNaWoZA5XeSG+R3JHSo= --google.golang.org/genproto v0.0.0-20220915135415-7fd63a7952de/go.mod h1:0Nb8Qy+Sk5eDzHnzlStwW3itdNaWoZA5XeSG+R3JHSo= --google.golang.org/genproto v0.0.0-20220916172020-2692e8806bfa/go.mod h1:0Nb8Qy+Sk5eDzHnzlStwW3itdNaWoZA5XeSG+R3JHSo= --google.golang.org/genproto v0.0.0-20220919141832-68c03719ef51/go.mod h1:0Nb8Qy+Sk5eDzHnzlStwW3itdNaWoZA5XeSG+R3JHSo= --google.golang.org/genproto v0.0.0-20220920201722-2b89144ce006/go.mod h1:ht8XFiar2npT/g4vkk7O0WYS1sHOHbdujxbEp7CJWbw= --google.golang.org/genproto v0.0.0-20220926165614-551eb538f295/go.mod h1:woMGP53BroOrRY3xTxlbr8Y3eB/nzAvvFM83q7kG2OI= --google.golang.org/genproto v0.0.0-20220926220553-6981cbe3cfce/go.mod h1:woMGP53BroOrRY3xTxlbr8Y3eB/nzAvvFM83q7kG2OI= --google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqwhZAwq4wsRUaVG555sVgsNmIjRtO7t/JH29U= --google.golang.org/genproto v0.0.0-20221014173430-6e2ab493f96b/go.mod h1:1vXfmgAz9N9Jx0QA82PqRVauvCz1SGSz739p0f183jM= --google.golang.org/genproto v0.0.0-20221014213838-99cd37c6964a/go.mod h1:1vXfmgAz9N9Jx0QA82PqRVauvCz1SGSz739p0f183jM= --google.golang.org/genproto v0.0.0-20221024153911-1573dae28c9c/go.mod h1:9qHF0xnpdSfF6knlcsnpzUu5y+rpwgbvsyGAZPBMg4s= --google.golang.org/genproto v0.0.0-20221024183307-1bc688fe9f3e/go.mod h1:9qHF0xnpdSfF6knlcsnpzUu5y+rpwgbvsyGAZPBMg4s= --google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c/go.mod h1:CGI5F/G+E5bKwmfYo09AXuVN4dD894kIKUFmVbP2/Fo= --google.golang.org/genproto v0.0.0-20221109142239-94d6d90a7d66/go.mod h1:rZS5c/ZVYMaOGBfO68GWtjOw/eLaZM1X6iVtgjZ+EWg= --google.golang.org/genproto v0.0.0-20221114212237-e4508ebdbee1/go.mod h1:rZS5c/ZVYMaOGBfO68GWtjOw/eLaZM1X6iVtgjZ+EWg= --google.golang.org/genproto v0.0.0-20221117204609-8f9c96812029/go.mod h1:rZS5c/ZVYMaOGBfO68GWtjOw/eLaZM1X6iVtgjZ+EWg= --google.golang.org/genproto v0.0.0-20221118155620-16455021b5e6/go.mod h1:rZS5c/ZVYMaOGBfO68GWtjOw/eLaZM1X6iVtgjZ+EWg= --google.golang.org/genproto v0.0.0-20221201164419-0e50fba7f41c/go.mod h1:rZS5c/ZVYMaOGBfO68GWtjOw/eLaZM1X6iVtgjZ+EWg= --google.golang.org/genproto v0.0.0-20221201204527-e3fa12d562f3/go.mod h1:rZS5c/ZVYMaOGBfO68GWtjOw/eLaZM1X6iVtgjZ+EWg= --google.golang.org/genproto v0.0.0-20221202195650-67e5cbc046fd/go.mod h1:cTsE614GARnxrLsqKREzmNYJACSWWpAWdNMwnD7c2BE= --google.golang.org/genproto v0.0.0-20221227171554-f9683d7f8bef/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM= --google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM= --google.golang.org/genproto v0.0.0-20230112194545-e10362b5ecf9/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM= --google.golang.org/genproto v0.0.0-20230113154510-dbe35b8444a5/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM= --google.golang.org/genproto v0.0.0-20230123190316-2c411cf9d197/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM= --google.golang.org/genproto v0.0.0-20230124163310-31e0e69b6fc2/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM= --google.golang.org/genproto v0.0.0-20230125152338-dcaf20b6aeaa/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM= --google.golang.org/genproto v0.0.0-20230127162408-596548ed4efa/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM= --google.golang.org/genproto v0.0.0-20230209215440-0dfe4f8abfcc/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM= --google.golang.org/genproto v0.0.0-20230216225411-c8e22ba71e44/go.mod h1:8B0gmkoRebU8ukX6HP+4wrVQUY1+6PkQ44BSyIlflHA= --google.golang.org/genproto v0.0.0-20230222225845-10f96fb3dbec/go.mod h1:3Dl5ZL0q0isWJt+FVcfpQyirqemEuLAK/iFvg1UP1Hw= --google.golang.org/genproto v0.0.0-20230223222841-637eb2293923/go.mod h1:3Dl5ZL0q0isWJt+FVcfpQyirqemEuLAK/iFvg1UP1Hw= --google.golang.org/genproto v0.0.0-20230303212802-e74f57abe488/go.mod h1:TvhZT5f700eVlTNwND1xoEZQeWTB2RY/65kplwl/bFA= --google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4/go.mod h1:NWraEVixdDnqcqQ30jipen1STv2r/n24Wb7twVTGR4s= --google.golang.org/genproto v0.0.0-20230320184635-7606e756e683/go.mod h1:NWraEVixdDnqcqQ30jipen1STv2r/n24Wb7twVTGR4s= --google.golang.org/genproto v0.0.0-20230323212658-478b75c54725/go.mod h1:UUQDJDOlWu4KYeJZffbWgBkS1YFobzKbLVfK69pe0Ak= --google.golang.org/genproto v0.0.0-20230330154414-c0448cd141ea/go.mod h1:UUQDJDOlWu4KYeJZffbWgBkS1YFobzKbLVfK69pe0Ak= --google.golang.org/genproto v0.0.0-20230331144136-dcfb400f0633/go.mod h1:UUQDJDOlWu4KYeJZffbWgBkS1YFobzKbLVfK69pe0Ak= --google.golang.org/genproto v0.0.0-20230403163135-c38d8f061ccd/go.mod h1:UUQDJDOlWu4KYeJZffbWgBkS1YFobzKbLVfK69pe0Ak= --google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1/go.mod h1:nKE/iIaLqn2bQwXBg8f1g2Ylh6r5MN5CmZvuzZCgsCU= --google.golang.org/genproto v0.0.0-20230525234025-438c736192d0/go.mod h1:9ExIQyXL5hZrHzQceCwuSYwZZ5QZBazOcprJ5rgs3lY= --google.golang.org/genproto v0.0.0-20230526161137-0005af68ea54/go.mod h1:zqTuNwFlFRsw5zIts5VnzLQxSRqh+CGOTVMlYbY0Eyk= --google.golang.org/genproto v0.0.0-20230526203410-71b5a4ffd15e/go.mod h1:zqTuNwFlFRsw5zIts5VnzLQxSRqh+CGOTVMlYbY0Eyk= --google.golang.org/genproto v0.0.0-20230530153820-e85fd2cbaebc/go.mod h1:xZnkP7mREFX5MORlOPEzLMr+90PPZQ2QWzrVTWfAq64= --google.golang.org/genproto v0.0.0-20230629202037-9506855d4529/go.mod h1:xZnkP7mREFX5MORlOPEzLMr+90PPZQ2QWzrVTWfAq64= --google.golang.org/genproto v0.0.0-20230706204954-ccb25ca9f130/go.mod h1:O9kGHb51iE/nOGvQaDUuadVYqovW56s5emA88lQnj6Y= --google.golang.org/genproto v0.0.0-20230711160842-782d3b101e98/go.mod h1:S7mY02OqCJTD0E1OiQy1F72PWFB4bZJ87cAtLPYgDR0= --google.golang.org/genproto v0.0.0-20230726155614-23370e0ffb3e/go.mod h1:0ggbjUrZYpy1q+ANUS30SEoGZ53cdfwtbuG7Ptgy108= --google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5/go.mod h1:oH/ZOT02u4kWEp7oYBGYFFkCdKS/uYR9Z7+0/xuuFp8= --google.golang.org/genproto v0.0.0-20230821184602-ccc8af3d0e93/go.mod h1:yZTlhN0tQnXo3h00fuXNCxJdLdIdnVFVBaRJ5LWBbw4= --google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d/go.mod h1:yZTlhN0tQnXo3h00fuXNCxJdLdIdnVFVBaRJ5LWBbw4= --google.golang.org/genproto v0.0.0-20230913181813-007df8e322eb/go.mod h1:yZTlhN0tQnXo3h00fuXNCxJdLdIdnVFVBaRJ5LWBbw4= --google.golang.org/genproto v0.0.0-20230920204549-e6e6cdab5c13/go.mod h1:CCviP9RmpZ1mxVr8MUjCnSiY09IbAXZxhLE6EhHIdPU= --google.golang.org/genproto v0.0.0-20231002182017-d307bd883b97/go.mod h1:t1VqOqqvce95G3hIDCT5FeO3YUc6Q4Oe24L/+rNMxRk= --google.golang.org/genproto v0.0.0-20231012201019-e917dd12ba7a/go.mod h1:EMfReVxb80Dq1hhioy0sOsY9jCE46YDgHlJ7fWVUWRE= --google.golang.org/genproto v0.0.0-20231016165738-49dd2c1f3d0b/go.mod h1:CgAqfJo+Xmu0GwA0411Ht3OU3OntXwsGmrmjI8ioGXI= --google.golang.org/genproto v0.0.0-20231030173426-d783a09b4405/go.mod h1:3WDQMjmJk36UQhjQ89emUzb1mdaHcPeeAh4SCBKznB4= --google.golang.org/genproto v0.0.0-20231106174013-bbf56f31fb17/go.mod h1:J7XzRzVy1+IPwWHZUzoD0IccYZIrXILAQpc+Qy9CMhY= --google.golang.org/genproto v0.0.0-20231120223509-83a465c0220f h1:Vn+VyHU5guc9KjB5KrjI2q0wCOWEOIh0OEsleqakHJg= --google.golang.org/genproto v0.0.0-20231120223509-83a465c0220f/go.mod h1:nWSwAFPb+qfNJXsoeO3Io7zf4tMSfN8EA8RlDA04GhY= --google.golang.org/genproto/googleapis/api v0.0.0-20230525234020-1aefcd67740a/go.mod h1:ts19tUU+Z0ZShN1y3aPyq2+O3d5FUNNgT6FtOzmrNn8= --google.golang.org/genproto/googleapis/api v0.0.0-20230525234035-dd9d682886f9/go.mod h1:vHYtlOoi6TsQ3Uk2yxR7NI5z8uoV+3pZtR4jmHIkRig= --google.golang.org/genproto/googleapis/api v0.0.0-20230526203410-71b5a4ffd15e/go.mod h1:vHYtlOoi6TsQ3Uk2yxR7NI5z8uoV+3pZtR4jmHIkRig= --google.golang.org/genproto/googleapis/api v0.0.0-20230530153820-e85fd2cbaebc/go.mod h1:vHYtlOoi6TsQ3Uk2yxR7NI5z8uoV+3pZtR4jmHIkRig= --google.golang.org/genproto/googleapis/api v0.0.0-20230629202037-9506855d4529/go.mod h1:vHYtlOoi6TsQ3Uk2yxR7NI5z8uoV+3pZtR4jmHIkRig= --google.golang.org/genproto/googleapis/api v0.0.0-20230706204954-ccb25ca9f130/go.mod h1:mPBs5jNgx2GuQGvFwUvVKqtn6HsUw9nP64BedgvqEsQ= --google.golang.org/genproto/googleapis/api v0.0.0-20230711160842-782d3b101e98/go.mod h1:rsr7RhLuwsDKL7RmgDDCUc6yaGr1iqceVb5Wv6f6YvQ= --google.golang.org/genproto/googleapis/api v0.0.0-20230726155614-23370e0ffb3e/go.mod h1:rsr7RhLuwsDKL7RmgDDCUc6yaGr1iqceVb5Wv6f6YvQ= --google.golang.org/genproto/googleapis/api v0.0.0-20230803162519-f966b187b2e5/go.mod h1:5DZzOUPCLYL3mNkQ0ms0F3EuUNZ7py1Bqeq6sxzI7/Q= --google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d/go.mod h1:KjSP20unUpOx5kyQUFa7k4OJg0qeJ7DEZflGDu2p6Bk= --google.golang.org/genproto/googleapis/api v0.0.0-20230913181813-007df8e322eb/go.mod h1:KjSP20unUpOx5kyQUFa7k4OJg0qeJ7DEZflGDu2p6Bk= --google.golang.org/genproto/googleapis/api v0.0.0-20230920204549-e6e6cdab5c13/go.mod h1:RdyHbowztCGQySiCvQPgWQWgWhGnouTdCflKoDBt32U= --google.golang.org/genproto/googleapis/api v0.0.0-20231002182017-d307bd883b97/go.mod h1:iargEX0SFPm3xcfMI0d1domjg0ZF4Aa0p2awqyxhvF0= --google.golang.org/genproto/googleapis/api v0.0.0-20231012201019-e917dd12ba7a/go.mod h1:SUBoKXbI1Efip18FClrQVGjWcyd0QZd8KkvdP34t7ww= --google.golang.org/genproto/googleapis/api v0.0.0-20231016165738-49dd2c1f3d0b/go.mod h1:IBQ646DjkDkvUIsVq/cc03FUFQ9wbZu7yE396YcL870= --google.golang.org/genproto/googleapis/api v0.0.0-20231030173426-d783a09b4405/go.mod h1:oT32Z4o8Zv2xPQTg0pbVaPr0MPOH6f14RgXt7zfIpwg= --google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17/go.mod h1:0xJLfVdJqpAPl8tDg1ujOCGzx6LFLttXT5NhllGOXY4= --google.golang.org/genproto/googleapis/bytestream v0.0.0-20230530153820-e85fd2cbaebc/go.mod h1:ylj+BE99M198VPbBh6A8d9n3w8fChvyLK3wwBOjXBFA= --google.golang.org/genproto/googleapis/bytestream v0.0.0-20230807174057-1744710a1577/go.mod h1:NjCQG/D8JandXxM57PZbAJL1DCNL6EypA0vPPwfsc7c= --google.golang.org/genproto/googleapis/bytestream v0.0.0-20231030173426-d783a09b4405/go.mod h1:GRUCuLdzVqZte8+Dl/D4N25yLzcGqqWaYkeVOwulFqw= --google.golang.org/genproto/googleapis/bytestream v0.0.0-20231120223509-83a465c0220f/go.mod h1:iIgEblxoG4klcXsG0d9cpoxJ4xndv6+1FkDROCHhPRI= --google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234015-3fc162c6f38a/go.mod h1:xURIpW9ES5+/GZhnV6beoEtxQrnkRGIfP5VQG2tCBLc= --google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19/go.mod h1:66JfowdXAEgad5O9NnYcsNPLCPZJD++2L9X0PCMODrA= --google.golang.org/genproto/googleapis/rpc v0.0.0-20230526203410-71b5a4ffd15e/go.mod h1:66JfowdXAEgad5O9NnYcsNPLCPZJD++2L9X0PCMODrA= --google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc/go.mod h1:66JfowdXAEgad5O9NnYcsNPLCPZJD++2L9X0PCMODrA= --google.golang.org/genproto/googleapis/rpc v0.0.0-20230629202037-9506855d4529/go.mod h1:66JfowdXAEgad5O9NnYcsNPLCPZJD++2L9X0PCMODrA= --google.golang.org/genproto/googleapis/rpc v0.0.0-20230706204954-ccb25ca9f130/go.mod h1:8mL13HKkDa+IuJ8yruA3ci0q+0vsUz4m//+ottjwS5o= --google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98/go.mod h1:TUfxEVdsvPg18p6AslUXFoLdpED4oBnGwyqk3dV1XzM= --google.golang.org/genproto/googleapis/rpc v0.0.0-20230731190214-cbb8c96f2d6d/go.mod h1:TUfxEVdsvPg18p6AslUXFoLdpED4oBnGwyqk3dV1XzM= --google.golang.org/genproto/googleapis/rpc v0.0.0-20230803162519-f966b187b2e5/go.mod h1:zBEcrKX2ZOcEkHWxBPAIvYUWOKKMIhYcmNiUIu2ji3I= --google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d/go.mod h1:+Bk1OCOj40wS2hwAMA+aCW9ypzm63QTBBHp6lQ3p+9M= --google.golang.org/genproto/googleapis/rpc v0.0.0-20230920183334-c177e329c48b/go.mod h1:+Bk1OCOj40wS2hwAMA+aCW9ypzm63QTBBHp6lQ3p+9M= --google.golang.org/genproto/googleapis/rpc v0.0.0-20230920204549-e6e6cdab5c13/go.mod h1:KSqppvjFjtoCI+KGd4PELB0qLNxdJHRGqRI09mB6pQA= --google.golang.org/genproto/googleapis/rpc v0.0.0-20231002182017-d307bd883b97/go.mod h1:v7nGkzlmW8P3n/bKmWBn2WpBjpOEx8Q6gMueudAmKfY= --google.golang.org/genproto/googleapis/rpc v0.0.0-20231012201019-e917dd12ba7a/go.mod h1:4cYg8o5yUbm77w8ZX00LhMVNl/YVBFJRYWDc0uYWMs0= --google.golang.org/genproto/googleapis/rpc v0.0.0-20231016165738-49dd2c1f3d0b/go.mod h1:swOH3j0KzcDDgGUWr+SNpyTen5YrXjS3eyPzFYKc6lc= --google.golang.org/genproto/googleapis/rpc v0.0.0-20231030173426-d783a09b4405/go.mod h1:67X1fPuzjcrkymZzZV1vvkFeTn2Rvc6lYF9MYFGCcwE= --google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17/go.mod h1:oQ5rr10WTTMvP4A36n8JpR1OrO1BEiV4f78CneXZxkA= --google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f/go.mod h1:L9KNLi232K1/xB6f7AlSX692koaRnKaWSR0stBki0Yc= - google.golang.org/genproto/googleapis/rpc v0.0.0-20231127180814-3a041ad873d4 h1:DC7wcm+i+P1rN3Ff07vL+OndGg5OhNddHyTA+ocPqYE= - google.golang.org/genproto/googleapis/rpc v0.0.0-20231127180814-3a041ad873d4/go.mod h1:eJVxU6o+4G1PSczBr85xmyvSNYAKvAYgkub40YGomFM= --google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= --google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= --google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= --google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= --google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= --google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= --google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= --google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= --google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60= --google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= --google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= --google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= --google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= --google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= --google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= --google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8= --google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= --google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= --google.golang.org/grpc v1.36.1/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= --google.golang.org/grpc v1.37.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= --google.golang.org/grpc v1.37.1/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= --google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= --google.golang.org/grpc v1.39.0/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE= --google.golang.org/grpc v1.39.1/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE= --google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= --google.golang.org/grpc v1.40.1/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= --google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= --google.golang.org/grpc v1.44.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= --google.golang.org/grpc v1.45.0/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11+0rQ= --google.golang.org/grpc v1.46.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= --google.golang.org/grpc v1.46.2/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= --google.golang.org/grpc v1.47.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= --google.golang.org/grpc v1.48.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= --google.golang.org/grpc v1.49.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= --google.golang.org/grpc v1.50.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= --google.golang.org/grpc v1.50.1/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= --google.golang.org/grpc v1.51.0/go.mod h1:wgNDFcnuBGmxLKI/qn4T+m5BtEBYXJPvibbUPsAIPww= --google.golang.org/grpc v1.52.0/go.mod h1:pu6fVzoFb+NBYNAvQL08ic+lvB2IojljRYuun5vorUY= --google.golang.org/grpc v1.52.3/go.mod h1:pu6fVzoFb+NBYNAvQL08ic+lvB2IojljRYuun5vorUY= --google.golang.org/grpc v1.53.0/go.mod h1:OnIrk0ipVdj4N5d9IUoFUx72/VlD7+jUsHwZgwSMQpw= --google.golang.org/grpc v1.54.0/go.mod h1:PUSEXI6iWghWaB6lXM4knEgpJNu2qUcKfDtNci3EC2g= --google.golang.org/grpc v1.55.0/go.mod h1:iYEXKGkEBhg1PjZQvoYEVPTDkHo1/bjTnfwTeGONTY8= --google.golang.org/grpc v1.56.1/go.mod h1:I9bI3vqKfayGqPUAwGdOSu7kt6oIJLixfffKrpXqQ9s= --google.golang.org/grpc v1.56.2/go.mod h1:I9bI3vqKfayGqPUAwGdOSu7kt6oIJLixfffKrpXqQ9s= --google.golang.org/grpc v1.57.0/go.mod h1:Sd+9RMTACXwmub0zcNY2c4arhtrbBYD1AUHI/dt16Mo= --google.golang.org/grpc v1.58.2/go.mod h1:tgX3ZQDlNJGU96V6yHh1T/JeoBQ2TXdr43YbYSsCJk0= --google.golang.org/grpc v1.58.3/go.mod h1:tgX3ZQDlNJGU96V6yHh1T/JeoBQ2TXdr43YbYSsCJk0= - google.golang.org/grpc v1.59.0 h1:Z5Iec2pjwb+LEOqzpB2MR12/eKFhDPhuqW91O+4bwUk= - google.golang.org/grpc v1.59.0/go.mod h1:aUPDwccQo6OTjy7Hct4AfBPD1GptF4fyUjIkQ9YtF98= --google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= --google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= --google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= --google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= --google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= --google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= --google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= --google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= --google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= --google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= --google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= - google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= - google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= --google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= --google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= --google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= --google.golang.org/protobuf v1.28.2-0.20230222093303-bc1253ad3743/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= --google.golang.org/protobuf v1.29.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= --google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= - google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= - google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= --gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= - gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= - gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -+gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= - gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= --gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= --gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= --gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= - gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA= - gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= --gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= - gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= --gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= --gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= --gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= --gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= - gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= --gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= - gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= --gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= - gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= - gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= --honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= --honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= --honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= --honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= --honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= --honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= --honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= --honnef.co/go/tools v0.1.3/go.mod h1:NgwopIslSNH47DimFoV78dnkksY2EFtX0ajyb3K/las= - honnef.co/go/tools v0.3.2 h1:ytYb4rOqyp1TSa2EPvNVwtPQJctSELKaMyLfqNP4+34= - honnef.co/go/tools v0.3.2/go.mod h1:jzwdWgg7Jdq75wlfblQxO4neNaFFSvgc1tD5Wv8U0Yw= --lukechampine.com/uint128 v1.1.1/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk= --lukechampine.com/uint128 v1.2.0/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk= --modernc.org/cc/v3 v3.36.0/go.mod h1:NFUHyPn4ekoC/JHeZFfZurN6ixxawE1BnVonP/oahEI= --modernc.org/cc/v3 v3.36.2/go.mod h1:NFUHyPn4ekoC/JHeZFfZurN6ixxawE1BnVonP/oahEI= --modernc.org/cc/v3 v3.36.3/go.mod h1:NFUHyPn4ekoC/JHeZFfZurN6ixxawE1BnVonP/oahEI= --modernc.org/cc/v3 v3.37.0/go.mod h1:vtL+3mdHx/wcj3iEGz84rQa8vEqR6XM84v5Lcvfph20= --modernc.org/cc/v3 v3.40.0/go.mod h1:/bTg4dnWkSXowUO6ssQKnOV0yMVxDYNIsIrzqTFDGH0= --modernc.org/ccgo/v3 v3.0.0-20220428102840-41399a37e894/go.mod h1:eI31LL8EwEBKPpNpA4bU1/i+sKOwOrQy8D87zWUcRZc= --modernc.org/ccgo/v3 v3.0.0-20220430103911-bc99d88307be/go.mod h1:bwdAnOoaIt8Ax9YdWGjxWsdkPcZyRPHqrOvJxaKAKGw= --modernc.org/ccgo/v3 v3.0.0-20220904174949-82d86e1b6d56/go.mod h1:YSXjPL62P2AMSxBphRHPn7IkzhVHqkvOnRKAKh+W6ZI= --modernc.org/ccgo/v3 v3.16.4/go.mod h1:tGtX0gE9Jn7hdZFeU88slbTh1UtCYKusWOoCJuvkWsQ= --modernc.org/ccgo/v3 v3.16.6/go.mod h1:tGtX0gE9Jn7hdZFeU88slbTh1UtCYKusWOoCJuvkWsQ= --modernc.org/ccgo/v3 v3.16.8/go.mod h1:zNjwkizS+fIFDrDjIAgBSCLkWbJuHF+ar3QRn+Z9aws= --modernc.org/ccgo/v3 v3.16.9/go.mod h1:zNMzC9A9xeNUepy6KuZBbugn3c0Mc9TeiJO4lgvkJDo= --modernc.org/ccgo/v3 v3.16.13-0.20221017192402-261537637ce8/go.mod h1:fUB3Vn0nVPReA+7IG7yZDfjv1TMWjhQP8gCxrFAtL5g= --modernc.org/ccgo/v3 v3.16.13/go.mod h1:2Quk+5YgpImhPjv2Qsob1DnZ/4som1lJTodubIcoUkY= --modernc.org/ccorpus v1.11.6/go.mod h1:2gEUTrWqdpH2pXsmTM1ZkjeSrUWDpjMu2T6m29L/ErQ= --modernc.org/httpfs v1.0.6/go.mod h1:7dosgurJGp0sPaRanU53W4xZYKh14wfzX420oZADeHM= --modernc.org/libc v0.0.0-20220428101251-2d5f3daf273b/go.mod h1:p7Mg4+koNjc8jkqwcoFBJx7tXkpj00G77X7A72jXPXA= --modernc.org/libc v1.16.0/go.mod h1:N4LD6DBE9cf+Dzf9buBlzVJndKr/iJHG97vGLHYnb5A= --modernc.org/libc v1.16.1/go.mod h1:JjJE0eu4yeK7tab2n4S1w8tlWd9MxXLRzheaRnAKymU= --modernc.org/libc v1.16.17/go.mod h1:hYIV5VZczAmGZAnG15Vdngn5HSF5cSkbvfz2B7GRuVU= --modernc.org/libc v1.16.19/go.mod h1:p7Mg4+koNjc8jkqwcoFBJx7tXkpj00G77X7A72jXPXA= --modernc.org/libc v1.17.0/go.mod h1:XsgLldpP4aWlPlsjqKRdHPqCxCjISdHfM/yeWC5GyW0= --modernc.org/libc v1.17.1/go.mod h1:FZ23b+8LjxZs7XtFMbSzL/EhPxNbfZbErxEHc7cbD9s= --modernc.org/libc v1.17.4/go.mod h1:WNg2ZH56rDEwdropAJeZPQkXmDwh+JCA1s/htl6r2fA= --modernc.org/libc v1.18.0/go.mod h1:vj6zehR5bfc98ipowQOM2nIDUZnVew/wNC/2tOGS+q0= --modernc.org/libc v1.20.3/go.mod h1:ZRfIaEkgrYgZDl6pa4W39HgN5G/yDW+NRmNKZBDFrk0= --modernc.org/libc v1.21.4/go.mod h1:przBsL5RDOZajTVslkugzLBj1evTue36jEomFQOoYuI= --modernc.org/libc v1.22.2/go.mod h1:uvQavJ1pZ0hIoC/jfqNoMLURIMhKzINIWypNM17puug= --modernc.org/mathutil v1.2.2/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E= --modernc.org/mathutil v1.4.1/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E= --modernc.org/mathutil v1.5.0/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E= --modernc.org/memory v1.1.1/go.mod h1:/0wo5ibyrQiaoUoH7f9D8dnglAmILJ5/cxZlRECf+Nw= --modernc.org/memory v1.2.0/go.mod h1:/0wo5ibyrQiaoUoH7f9D8dnglAmILJ5/cxZlRECf+Nw= --modernc.org/memory v1.2.1/go.mod h1:PkUhL0Mugw21sHPeskwZW4D6VscE/GQJOnIpCnW6pSU= --modernc.org/memory v1.3.0/go.mod h1:PkUhL0Mugw21sHPeskwZW4D6VscE/GQJOnIpCnW6pSU= --modernc.org/memory v1.4.0/go.mod h1:PkUhL0Mugw21sHPeskwZW4D6VscE/GQJOnIpCnW6pSU= --modernc.org/memory v1.5.0/go.mod h1:PkUhL0Mugw21sHPeskwZW4D6VscE/GQJOnIpCnW6pSU= --modernc.org/opt v0.1.1/go.mod h1:WdSiB5evDcignE70guQKxYUl14mgWtbClRi5wmkkTX0= --modernc.org/opt v0.1.3/go.mod h1:WdSiB5evDcignE70guQKxYUl14mgWtbClRi5wmkkTX0= --modernc.org/sqlite v1.18.1/go.mod h1:6ho+Gow7oX5V+OiOQ6Tr4xeqbx13UZ6t+Fw9IRUG4d4= --modernc.org/sqlite v1.18.2/go.mod h1:kvrTLEWgxUcHa2GfHBQtanR1H9ht3hTJNtKpzH9k1u0= --modernc.org/strutil v1.1.1/go.mod h1:DE+MQQ/hjKBZS2zNInV5hhcipt5rLPWkmpbGeW5mmdw= --modernc.org/strutil v1.1.3/go.mod h1:MEHNA7PdEnEwLvspRMtWTNnp2nnyvMfkimT1NKNAGbw= --modernc.org/tcl v1.13.1/go.mod h1:XOLfOwzhkljL4itZkK6T72ckMgvj0BDsnKNdZVUOecw= --modernc.org/tcl v1.13.2/go.mod h1:7CLiGIPo1M8Rv1Mitpv5akc2+8fxUd2y2UzC/MfMzy0= --modernc.org/token v1.0.0/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM= --modernc.org/token v1.0.1/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM= --modernc.org/token v1.1.0/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM= --modernc.org/z v1.5.1/go.mod h1:eWFB510QWW5Th9YGZT81s+LwvaAs3Q2yr4sP0rmLkv8= - mvdan.cc/xurls/v2 v2.5.0 h1:lyBNOm8Wo71UknhUs4QTFUNNMyxy2JEIaKKo0RWOh+8= - mvdan.cc/xurls/v2 v2.5.0/go.mod h1:yQgaGQ1rFtJUzkmKiHYSSfuQxqfYmd//X6PxvholpeE= --rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= --rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4= --rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= --rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= --sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix index 9e4d3d824f7b2..2b34e7c6d544d 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , buildGoModule +, buildGo123Module , fetchFromGitHub , fetchFromGitLab , callPackage @@ -24,7 +25,7 @@ let , deleteVendor ? false , proxyVendor ? false , mkProviderFetcher ? fetchFromGitHub - , mkProviderGoModule ? buildGoModule + , mkProviderGoModule ? buildGo123Module # "https://registry.terraform.io/providers/vancluever/acme" , homepage ? "" # "registry.terraform.io/vancluever/acme" diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 9b613c6ff4ae8..35ba84a27c26a 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1,21 +1,21 @@ { "aci": { - "hash": "sha256-4EVSO/DCuKSI3CPlaXSDxuy0pqAMBHRDwGJTBdQd61w=", + "hash": "sha256-f4hgHFJgRUG+mhRgD7GMtkXoYkzAbkxxMIzvGLS0ums=", "homepage": "https://registry.terraform.io/providers/CiscoDevNet/aci", "owner": "CiscoDevNet", "repo": "terraform-provider-aci", - "rev": "v2.14.0", + "rev": "v2.15.0", "spdx": "MPL-2.0", "vendorHash": null }, "acme": { - "hash": "sha256-4H3isw9YRWJANez3qcJYnXO9yW2DoGUAoOPGI7mLXlI=", + "hash": "sha256-RboEWeTUgEZShZ9NrR9yuUzbGPq9wauTyoFiHXZS2oI=", "homepage": "https://registry.terraform.io/providers/vancluever/acme", "owner": "vancluever", "repo": "terraform-provider-acme", - "rev": "v2.23.2", + "rev": "v2.26.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-RZmT31fetR46vFQRoLkBjadD6ROqvElI/jOZnf6FWTU=" + "vendorHash": "sha256-pJlt35kPV3CYOE4RiIjHLT9YEwSreQHgzRuY3ba9oBk=" }, "age": { "hash": "sha256-bJrzjvkrCX93bNqCA+FdRibHnAw6cb61StqtwUY5ok4=", @@ -27,29 +27,29 @@ "vendorHash": "sha256-jK7JuARpoxq7hvq5+vTtUwcYot0YqlOZdtDwq4IqKvk=" }, "aiven": { - "hash": "sha256-PCtWQP2FsYl5OITVCUp6OJub0uXDLJebWP310F4KWU8=", + "hash": "sha256-cNcF8pyqRR1YEc2RuKhOtcpFDkdFU8OFCYHRhefdHHk=", "homepage": "https://registry.terraform.io/providers/aiven/aiven", "owner": "aiven", "repo": "terraform-provider-aiven", - "rev": "v4.19.1", + "rev": "v4.24.0", "spdx": "MIT", - "vendorHash": "sha256-5Ljj3L7mhtvn5P9xw4W3AlHqRBGohKFGbiAmpN3dT0w=" + "vendorHash": "sha256-ENH/TfC/Yv+jjn4giiThfj9SatFxkfwR/Xj3W+FT/Lg=" }, "akamai": { - "hash": "sha256-jDCrNDJ6O9dXE6bG4GAMFytlVbEe/Z8mb6vx4DG355U=", + "hash": "sha256-d4unurf1WYmVx5z698kAeqKslkVH+tM8G4hrCofDtUs=", "homepage": "https://registry.terraform.io/providers/akamai/akamai", "owner": "akamai", "repo": "terraform-provider-akamai", - "rev": "v6.2.0", + "rev": "v6.4.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-QQaLUJJs/7hfLTIOIkG9WF7XmkLXsJP9MOQAvQoDQOw=" + "vendorHash": "sha256-qnKpQpK/AoFOxPiGHkUMqcF5loc0hVbqOuPaDLzj1Es=" }, "alicloud": { - "hash": "sha256-x/hq45iqcKurjFeXsdycWqDlJ+O1/4f01+6ay6TDejY=", + "hash": "sha256-lVQAkdwrnZrSZlBqNj2BBpQwzI0d5c+NGaKJxVpgQPg=", "homepage": "https://registry.terraform.io/providers/aliyun/alicloud", "owner": "aliyun", "repo": "terraform-provider-alicloud", - "rev": "v1.225.1", + "rev": "v1.230.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -63,13 +63,13 @@ "vendorHash": "sha256-OAd8SeTqTrH0kMoM2LsK3vM2PI23b3gl57FaJYM9hM0=" }, "archive": { - "hash": "sha256-jkqbj7NGrTQeMQcg52JVurV3ce8iosxAJjBGdoQ3PLY=", + "hash": "sha256-Xm9BT8O18aTIa1h166dElYaTq4PlC4u7TgFgCfcC6jI=", "homepage": "https://registry.terraform.io/providers/hashicorp/archive", "owner": "hashicorp", "repo": "terraform-provider-archive", - "rev": "v2.4.2", + "rev": "v2.6.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-buKYDNVCIcSDLCrCL4ZAKNQ7HqkH3+/7RHjyyR4dLmU=" + "vendorHash": "sha256-b8yGtOUZezGRgURXigv8ySaxxHN/vCCDPgoDC5EBlok=" }, "argocd": { "hash": "sha256-dHIvMFz5XIxxBvBFsEw8lqi6yVoYM9E4tLIoTY+mdiQ=", @@ -81,22 +81,22 @@ "vendorHash": "sha256-yyTU+D4zMDcJPZ9j7a2ZuPjGBCHvED5R0rvevCEaoAI=" }, "artifactory": { - "hash": "sha256-4gE8+z4GZElmkVK9nVDriAolXJ95arNNKyIq88XAwp8=", + "hash": "sha256-m6eRhNPxMa08OYYkFDt+Ew2iCkJdI/5aQth9qiE0v4o=", "homepage": "https://registry.terraform.io/providers/jfrog/artifactory", "owner": "jfrog", "repo": "terraform-provider-artifactory", - "rev": "v11.0.0", + "rev": "v11.9.1", "spdx": "Apache-2.0", - "vendorHash": "sha256-5kdyDc3/jBvg6QNBivh8J4SrYgMd0dkiUHUx43wzepQ=" + "vendorHash": "sha256-+3EemRl+rKoCg2HpHvjMPvN6ajrDOnO5C98NVGkYdo4=" }, "auth0": { - "hash": "sha256-Ay/EPlAxpEehbDsOeOyOViwT3jDsd3FmpHB5sxnAxAs=", + "hash": "sha256-Yltf+s1gEgP/dbX8EuK45VPBAEzelP+CAcllUaqvnAQ=", "homepage": "https://registry.terraform.io/providers/auth0/auth0", "owner": "auth0", "repo": "terraform-provider-auth0", - "rev": "v1.3.0", + "rev": "v1.6.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-oc6ZI5j7pqiiFgfbaTARb6sn+Ma/rqrupv/RPN05mrc=" + "vendorHash": "sha256-76Uf6vQpQ6GlumPHd1uBi0gO5aGmm/HAhNY3I7WCr8k=" }, "avi": { "hash": "sha256-OKUxIJO5WR8ZVkhst1xIgxKsAy+9PNHOmG2NsaRUxFY=", @@ -108,38 +108,38 @@ "vendorHash": "sha256-Sq304WOdKx4J1sD1+YA7uDi+uQtUiXa+BISs/j87dWw=" }, "aviatrix": { - "hash": "sha256-84MtHPrDVaLMQQYnAfuP/pZuzruWxUTLpziwn3ny1oU=", + "hash": "sha256-erBjyDX6xG8lpqcPq8iqgsanJKLuSgmiW/9PC8Xbyag=", "homepage": "https://registry.terraform.io/providers/AviatrixSystems/aviatrix", "owner": "AviatrixSystems", "repo": "terraform-provider-aviatrix", - "rev": "v3.1.4", + "rev": "v3.1.5", "spdx": "MPL-2.0", "vendorHash": null }, "aws": { - "hash": "sha256-YykNKCDFPQCtES2vAbCbqbHbkx1EmVM0bTEylr84bqs=", + "hash": "sha256-Fmhb3mKRviYsl3qQfXuQMI6KBpmDN0rtwJxDjSkj4EM=", "homepage": "https://registry.terraform.io/providers/hashicorp/aws", "owner": "hashicorp", "repo": "terraform-provider-aws", - "rev": "v5.43.0", + "rev": "v5.66.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-2KQEX1QwPrN32gFMKF7QPnisLdBC/bn74wX1f8uiC+0=" + "vendorHash": "sha256-9DWxMDsyWl/bczvbPOmdRTwjIYAKTuNXyBzrCHExNUA=" }, "azuread": { - "hash": "sha256-8uGSVvYygkR8WuKVGYVGN5dq2LoFQx8tbNYLYVBW4LE=", + "hash": "sha256-UOaEfmhGPrqQBkodNYybYb5rnB3X8wpXKHlpKqZnnXU=", "homepage": "https://registry.terraform.io/providers/hashicorp/azuread", "owner": "hashicorp", "repo": "terraform-provider-azuread", - "rev": "v2.52.0", + "rev": "v2.53.1", "spdx": "MPL-2.0", "vendorHash": null }, "azurerm": { - "hash": "sha256-ukfUXWT1Q8jziaSMpZl2awaid9GfByl3TniG63JxkuQ=", + "hash": "sha256-tCZKDqMrmwAGqs4eoMWj4lty4aVOkzF16RpEl24GNPc=", "homepage": "https://registry.terraform.io/providers/hashicorp/azurerm", "owner": "hashicorp", "repo": "terraform-provider-azurerm", - "rev": "v3.109.0", + "rev": "v4.1.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -153,20 +153,20 @@ "vendorHash": null }, "baiducloud": { - "hash": "sha256-uKIBimMMTManwztb4vdMCpsRWMr6GB8O7vK850sVI2g=", + "hash": "sha256-kLEEbBQ1YdxJkvCCHzpGHBX2wC9JtLVY6chZEmAziSU=", "homepage": "https://registry.terraform.io/providers/baidubce/baiducloud", "owner": "baidubce", "repo": "terraform-provider-baiducloud", - "rev": "v1.21.8", + "rev": "v1.21.9", "spdx": "MPL-2.0", "vendorHash": null }, "bigip": { - "hash": "sha256-F7AD3Wb6R6exPRcEByOTuEQFdYSJB+V2cVotO2cabt0=", + "hash": "sha256-jCQgjxGBSy2d9DIJeshLVdj6N/SXWEPcd5EpJ5GAXe4=", "homepage": "https://registry.terraform.io/providers/F5Networks/bigip", "owner": "F5Networks", "repo": "terraform-provider-bigip", - "rev": "v1.22.2", + "rev": "v1.22.3", "spdx": "MPL-2.0", "vendorHash": null }, @@ -179,6 +179,15 @@ "spdx": "MPL-2.0", "vendorHash": "sha256-oDMKf39uNMO9/kyiZ1IuZlj2yIF1q5Z3wewxEBh3yso=" }, + "bitwarden": { + "hash": "sha256-YB+9CWd3U6Yl33ZFbTxzjomrLCilpBPKLdn6Yv7LAUA=", + "homepage": "https://registry.terraform.io/providers/maxlaverse/bitwarden", + "owner": "maxlaverse", + "repo": "terraform-provider-bitwarden", + "rev": "v0.8.1", + "spdx": "MPL-2.0", + "vendorHash": "sha256-BZ1+D0JQrGb6qE25+eTLSHIQdCmzucMPKUY/6x2LwT8=" + }, "brightbox": { "hash": "sha256-pwFbCP+qDL/4IUfbPRCkddkbsEEeAu7Wp12/mDL0ABA=", "homepage": "https://registry.terraform.io/providers/brightbox/brightbox", @@ -189,22 +198,22 @@ "vendorHash": "sha256-/dOiXO2aPkuZaFiwv/6AXJdIADgx8T7eOwvJfBBoqg8=" }, "buildkite": { - "hash": "sha256-/vyiQZ4UDe42sIxacgWDf+wktwd8ZXhW++gh+qF4C3c=", + "hash": "sha256-kwrhIii1jGpIZBzT58UdgnDtX5279shW77HphLobaEI=", "homepage": "https://registry.terraform.io/providers/buildkite/buildkite", "owner": "buildkite", "repo": "terraform-provider-buildkite", - "rev": "v1.10.0", + "rev": "v1.10.2", "spdx": "MIT", - "vendorHash": "sha256-Vozfdh6LwIS0ISc28OGmEnpS9jjFth1i6bNUGY4mXKc=" + "vendorHash": "sha256-PFeWgDw1hkW/ekQfubRSYlaD4d4wJ4GOohOJ00QcEqQ=" }, "checkly": { - "hash": "sha256-xM3KJiWO1Lsw33talLR6gcalEm9gRffUOikdUQZ6AsM=", + "hash": "sha256-4J7pwtlAa920RXF6ZoSoi03qA15NBzUlXQCZRErI2Co=", "homepage": "https://registry.terraform.io/providers/checkly/checkly", "owner": "checkly", "repo": "terraform-provider-checkly", - "rev": "v1.7.8", + "rev": "v1.8.2", "spdx": null, - "vendorHash": "sha256-TgoTz9kFLhikfQYt654nmoGPzjVLfUMnUrs3mVqrgJo=" + "vendorHash": "sha256-DcRe3nBzKn8fC0Q8Dx/p0PXuUccX+4kmOMdZa3HuXNI=" }, "ciscoasa": { "hash": "sha256-xzc44FEy2MPo51Faq/VFwg411JK9e0kQucpt0vdN8yg=", @@ -216,22 +225,22 @@ "vendorHash": null }, "cloudamqp": { - "hash": "sha256-aEbGvGPYvW3NOO+Q89/ebcJWNrXIoNQkqAIbv9ikiI8=", + "hash": "sha256-0lqVHIq37CebSVDR5Ni4kFyXeZZ+tOqpj8gN4h7OaA0=", "homepage": "https://registry.terraform.io/providers/cloudamqp/cloudamqp", "owner": "cloudamqp", "repo": "terraform-provider-cloudamqp", - "rev": "v1.29.4", + "rev": "v1.32.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-cI3brJwN+7FTceOMwR0HMbZCNHhwvm31OXqjAEvrzrs=" + "vendorHash": "sha256-j3qdi19dxJL+R8Xa6MDag6KHMuBnzEZ9lUhuSAEZOAQ=" }, "cloudflare": { - "hash": "sha256-7MdXh5SIQwFPL5APmdrkrh++shZRbRUAYrVIHDGjM68=", + "hash": "sha256-9M7PQEBg0qDmyz2B35krNUF9dDo0g28JomFor7b/Nsc=", "homepage": "https://registry.terraform.io/providers/cloudflare/cloudflare", "owner": "cloudflare", "repo": "terraform-provider-cloudflare", - "rev": "v4.36.0", + "rev": "v4.41.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-og31UnUsXGgOm2dH0jlvEpvjOnxUlRy04s2TffiVX00=" + "vendorHash": "sha256-uLkoG0m3v1vohXO03nCrfxEhvJYfJOvYSIHsgYCjKtc=" }, "cloudfoundry": { "hash": "sha256-1nYncJLVU/f9WD6Quh9IieIXgixPzbPk4zbtI1zmf9g=", @@ -253,32 +262,32 @@ "vendorHash": "sha256-Hny481ihxllpoVPL5/0rTV9oCAmyoGKxCYiN986aKTk=" }, "cloudscale": { - "hash": "sha256-O4Y8p5S5C4SldryndecoaX5d8nrX10nqurAkJ0Un2NY=", + "hash": "sha256-4RU1CD0WwLMd3NsnJWl2Smc8XBYlP9K8Iev16uqsetE=", "homepage": "https://registry.terraform.io/providers/cloudscale-ch/cloudscale", "owner": "cloudscale-ch", "repo": "terraform-provider-cloudscale", - "rev": "v4.3.0", + "rev": "v4.4.0", "spdx": "MIT", "vendorHash": null }, "constellix": { "deleteVendor": true, - "hash": "sha256-ecwXWYrs7XJM1web+kia2ccpvTjxAVFPzav6lLal4e4=", + "hash": "sha256-yDXZ+lizDK+Ds8/Z3jfNLjO7fvlfRhx5y88bMLZCaj0=", "homepage": "https://registry.terraform.io/providers/Constellix/constellix", "owner": "Constellix", "repo": "terraform-provider-constellix", - "rev": "v0.4.5", + "rev": "v0.4.6", "spdx": "MPL-2.0", "vendorHash": "sha256-UJHDX/vx3n/RTuQ50Y6TAhpEEFk9yBoaz8yK02E8Fhw=" }, "consul": { - "hash": "sha256-Glgig56QdXZ9VNZx25/60YPChg9MtLq/S95nuAco3m0=", + "hash": "sha256-QiVE1ezwViOjCNhTAfeR5G8hXAHCi19PqwWnBlwhPCc=", "homepage": "https://registry.terraform.io/providers/hashicorp/consul", "owner": "hashicorp", "repo": "terraform-provider-consul", - "rev": "v2.20.0", + "rev": "v2.21.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-OKKcyx5JAQGMoUMRxIbe3lg825vhwCcWcPNZqo+/gl4=" + "vendorHash": "sha256-hR20+dRvS3tZ6aoTKCHs4zkyE5jWHEh62uLBkVJPA4M=" }, "ct": { "hash": "sha256-c1cqTfMlZ5fXDNMYLsk4447X0p/qIQYvRTqVY8cSs+E=", @@ -290,22 +299,22 @@ "vendorHash": "sha256-ZCMSmOCPEMxCSpl3DjIUGPj1W/KNJgyjtHpmQ19JquA=" }, "datadog": { - "hash": "sha256-L6GXoyjTd2n2n79gPvmQ0zLhW0iDS8ZcrY1gxPaQ61I=", + "hash": "sha256-s1JCno9cpXk0RdovXjTue77Gv9cLX3lB46jYy2xgOOk=", "homepage": "https://registry.terraform.io/providers/DataDog/datadog", "owner": "DataDog", "repo": "terraform-provider-datadog", - "rev": "v3.39.0", + "rev": "v3.44.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-jK6GI44o1FoJw9eZaCbWz1zw3dHqyaS5664h+Z27OXQ=" + "vendorHash": "sha256-ZmOuk2uNnFQzXSfRp6Lz/1bplEm0AuB/M94+dRnqhHU=" }, "dexidp": { - "hash": "sha256-XR8OI+Nf3PKNzZzM+jvylF8Itnapb9Xdztxq4OyXPVQ=", + "hash": "sha256-ommpazPlY4dMAOB1pgI7942aGH6YYPn6WtaowucQpZY=", "homepage": "https://registry.terraform.io/providers/marcofranssen/dexidp", "owner": "marcofranssen", "repo": "terraform-provider-dexidp", - "rev": "v0.5.0", + "rev": "v0.6.1", "spdx": "MIT", - "vendorHash": "sha256-xW0sPt2TGmoQXc5a2lp6471amBbDDPZbyc9YIIHP+M0=" + "vendorHash": "sha256-3swcRmm+JZ4ZQX0hvXZosYDGwk0KSyZcqEdNGDYcyYE=" }, "dhall": { "hash": "sha256-QjY5ZazQn4HiLQtdmw9X7o5tFw+27B2IISzmzMMHjHE=", @@ -318,11 +327,11 @@ "vendorHash": "sha256-quoFrJbB1vjz+MdV+jnr7FPACHuUe5Gx9POLubD2IaM=" }, "digitalocean": { - "hash": "sha256-66bG22xNzJEjCZJ7pHY4OW1vj8qTJIXd0CF/0zLiyug=", + "hash": "sha256-EpT0pL6JrQ9BKL7IyUmEYllRyIFbjJepVvVZdxQhFKs=", "homepage": "https://registry.terraform.io/providers/digitalocean/digitalocean", "owner": "digitalocean", "repo": "terraform-provider-digitalocean", - "rev": "v2.39.2", + "rev": "v2.40.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -345,13 +354,13 @@ "vendorHash": "sha256-yOuZcvaregVLf0O6Teuvv6FtapuQGgHjTkqiH2euV8U=" }, "dnsimple": { - "hash": "sha256-xF0zvUKJgB67rKNkeHKyKU0k7INiCKzN+G6v0PIq204=", + "hash": "sha256-19h4x+kxhFwlNUdTmTLjoLRQB7fNBh0CxxoQDGRPPiQ=", "homepage": "https://registry.terraform.io/providers/dnsimple/dnsimple", "owner": "dnsimple", "repo": "terraform-provider-dnsimple", - "rev": "v1.6.0", + "rev": "v1.7.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-Zl98s0+sgs+n/OkrJMsia0MxqO/AGWId8zzY+/n6LXM=" + "vendorHash": "sha256-5445cUKxjNlZcQ6opJKgXgT7I9XUmqbPMB/iKuEBPwg=" }, "docker": { "hash": "sha256-UyHOI8C0eDV5YllAi9clHp/CEldHjIp3FHHMPy1rK58=", @@ -363,11 +372,11 @@ "vendorHash": "sha256-XxltOTtCgmJ9wZX8Yw39HkwVVZb58kZjAH7jfKPhjKM=" }, "doppler": { - "hash": "sha256-jDCmIHdfHi+gp3+HGo8Wh+xYiHVU2Zy0lxETKW2rvGA=", + "hash": "sha256-yHWOMDhsqF+DXIKREyx8FftItZiWlWFoRhpub752UtU=", "homepage": "https://registry.terraform.io/providers/DopplerHQ/doppler", "owner": "DopplerHQ", "repo": "terraform-provider-doppler", - "rev": "v1.8.0", + "rev": "v1.10.0", "spdx": "Apache-2.0", "vendorHash": "sha256-UvpSfCelEsV9gjRWHxdYvVe3HAnYWWY5KYLVYiqc/So=" }, @@ -381,20 +390,20 @@ "vendorHash": "sha256-oVTanZpCWs05HwyIKW2ajiBPz1HXOFzBAt5Us+EtTRw=" }, "equinix": { - "hash": "sha256-jnV8dg9CJ38YKdEmc0hxDDbl/YUQgPTM6D5YYVjjWFc=", + "hash": "sha256-Wj/qrc18/wJekWZdNgzheT1hsIlAPTAf/tAIrpw6N9Y=", "homepage": "https://registry.terraform.io/providers/equinix/equinix", "owner": "equinix", "repo": "terraform-provider-equinix", - "rev": "v1.38.1", + "rev": "v2.4.1", "spdx": "MIT", - "vendorHash": "sha256-25kuUGbBCHOL3RzQcLDzzdfQ1j+XvqJSEyIowV0Od8A=" + "vendorHash": "sha256-5M/ceHvcwAlIhjpYO1JTQVUmuBLa9pT5opwiC/tp6+8=" }, "exoscale": { - "hash": "sha256-d6vdYtEBD34SPHDAlkpTb/T8D7TaLbVwMYjSefuNdr0=", + "hash": "sha256-i7Lp3NhaxVR317vHfdE/2aXAxmKk7u7kETM7JTJr5BI=", "homepage": "https://registry.terraform.io/providers/exoscale/exoscale", "owner": "exoscale", "repo": "terraform-provider-exoscale", - "rev": "v0.59.1", + "rev": "v0.59.2", "spdx": "MPL-2.0", "vendorHash": null }, @@ -408,11 +417,11 @@ "vendorHash": "sha256-qeKXdjrDPJWO4xW8by6djJReeYbCjh8VzQmE5/65zII=" }, "fastly": { - "hash": "sha256-xoxxicu0bXoaISMNwZNM6G8bBz0GKv48ORpcABwSsg8=", + "hash": "sha256-NzuWXQtaobbkk4oKcs+aT6ONeIsmLZsyRhW3BP7+5Wg=", "homepage": "https://registry.terraform.io/providers/fastly/fastly", "owner": "fastly", "repo": "terraform-provider-fastly", - "rev": "v5.10.0", + "rev": "v5.13.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -444,40 +453,40 @@ "vendorHash": "sha256-EiTWJ4bw8IwsRTD9Lt28Up2DXH0oVneO2IaO8VqWtkw=" }, "github": { - "hash": "sha256-6RAGc1UXebNm24d4+7S0LugvpSVgjIvqa7B6y+pozkA=", + "hash": "sha256-8TP3iw/NeVjq49HhurCULXbAOvP2ye6mZsVe62FxSAE=", "homepage": "https://registry.terraform.io/providers/integrations/github", "owner": "integrations", "repo": "terraform-provider-github", - "rev": "v6.2.2", + "rev": "v6.2.3", "spdx": "MIT", "vendorHash": null }, "gitlab": { - "hash": "sha256-WquY33Dx5E+OgnAMZ6dhgwrixhHhAYRUa4l6TuzGzmw=", + "hash": "sha256-F+ps7hpRm6+DHJwVOMe2qwVvKSL2o1JUl0Blgd8qFsA=", "homepage": "https://registry.terraform.io/providers/gitlabhq/gitlab", "owner": "gitlabhq", "repo": "terraform-provider-gitlab", - "rev": "v16.10.0", + "rev": "v17.3.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-7hIThIq3uU803aK+paR5KdTdfVmSZu7Spf9UepaVgvc=" + "vendorHash": "sha256-vIGqb5+e9vZkJFsH7f1UU13V80XtQVcsQ1hYu5laV70=" }, "google": { - "hash": "sha256-YonRToq/xdUy584hlzG+0/olYPhq3yxBUEahGz1ODkk=", + "hash": "sha256-RIBSJc5wmBXvd+NWaz3oCOClAOqXEOpSXIR8+wYKfk0=", "homepage": "https://registry.terraform.io/providers/hashicorp/google", "owner": "hashicorp", "repo": "terraform-provider-google", - "rev": "v5.35.0", + "rev": "v6.2.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-cpxk3g3bKG+3s53WBJlX2O722qNeQICqaIqcMrpDJYs=" + "vendorHash": "sha256-iRN3qqJHmpLuuAbmaFCj9wFXAHTXK+farkFlkWt1hyU=" }, "google-beta": { - "hash": "sha256-71eEmUUwSGM81kNwzvJ1QnkjMskdRx8BoETNSLIjYog=", + "hash": "sha256-CxoWwoR4CVW5sVSOpOmfnn5xECKmbSuSpBWVAhW24D0=", "homepage": "https://registry.terraform.io/providers/hashicorp/google-beta", "owner": "hashicorp", "repo": "terraform-provider-google-beta", - "rev": "v5.35.0", + "rev": "v6.2.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-2sqUzK8yxNKdfvrToCQWK8Eyr2n4ch6/KrrIAYmLwcA=" + "vendorHash": "sha256-RgquPp7hJQcgXZndl9kojAxunGA3KxSneYACru23WUk=" }, "googleworkspace": { "hash": "sha256-dedYnsKHizxJZibuvJOMbJoux0W6zgKaK5fxIofKqCY=", @@ -489,49 +498,49 @@ "vendorHash": "sha256-fqVBnAivVekV+4tpkl+E6eNA3wi8mhLevJRCs3W7L2g=" }, "grafana": { - "hash": "sha256-VEg95n7S4PDWjGPbuADOQWymGDlS4jupQAHo2OCkfAA=", + "hash": "sha256-tUx6L+ESPsa9VWFztNoYAtspnPoNO8QX3AQk3i0VyNc=", "homepage": "https://registry.terraform.io/providers/grafana/grafana", "owner": "grafana", "repo": "terraform-provider-grafana", - "rev": "v3.2.1", + "rev": "v3.7.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-ykPnplAA7s6lVQ7M0We7irIxOM2Ie4zSdQQynIjLFWA=" + "vendorHash": "sha256-d7ugVKmKQovewfeZF5k5KHbELwCSY9Krknow7q/7HWo=" }, "gridscale": { - "hash": "sha256-pFBH3J61Bk3QSfYVtLx3NrAFqrAnvKjKzL8qpeH5cOw=", + "hash": "sha256-GVOjkena3zRaOxO3YRYf+gfM2/CRm8VajpuWGTU0F1Y=", "homepage": "https://registry.terraform.io/providers/gridscale/gridscale", "owner": "gridscale", "repo": "terraform-provider-gridscale", - "rev": "v1.25.0", + "rev": "v1.26.0", "spdx": "MPL-2.0", "vendorHash": null }, "harbor": { - "hash": "sha256-dlAjbiSSgTuuZhTML66l4mSa3Rf14G86++RyXUJYbkw=", + "hash": "sha256-JdCBeUYB6rkSNhfTTIoRV8Bz4FnlHJFJxEZZbqyzAyc=", "homepage": "https://registry.terraform.io/providers/goharbor/harbor", "owner": "goharbor", "repo": "terraform-provider-harbor", - "rev": "v3.10.12", + "rev": "v3.10.15", "spdx": "MIT", "vendorHash": "sha256-TZxiDRVZPfg3jSflZsSbVaVcfUNqJ2U+ymHIm01pgkI=" }, "hcloud": { - "hash": "sha256-2eCHgHh6SVSHqjf+h4tRaD1orzh1LRUNVJdNsfLtZMc=", + "hash": "sha256-td1R2Xeo1QfsNJOwE7cCuzF5OjW4XUQJOVd0LPAXfuE=", "homepage": "https://registry.terraform.io/providers/hetznercloud/hcloud", "owner": "hetznercloud", "repo": "terraform-provider-hcloud", - "rev": "v1.47.0", + "rev": "v1.48.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-wCr9tYaA6Y1LgbhvWbRtqtDrviMu45WnXAB/WMWpkl0=" + "vendorHash": "sha256-t9nXq30jRSlx9gMR+s8irDVdSE5tg9ZvMp47HZwEm7w=" }, "helm": { - "hash": "sha256-SD5lUEkbn09S/fnQNyCE9ZZ2fkXbcFZfdE95GGEqHzE=", + "hash": "sha256-82jM8XZF8X7tYbebMXPYNyhNGqQ51zl3WxYWX2ObD1g=", "homepage": "https://registry.terraform.io/providers/hashicorp/helm", "owner": "hashicorp", "repo": "terraform-provider-helm", - "rev": "v2.14.0", + "rev": "v2.15.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-p6VUNSJKJtPrawdsi8Lgmu0uYjRmsdP4nsOl2L6h3JA=" + "vendorHash": "sha256-QERpwymuz45RiH9SMuAJPyl/z8r0a5Wd8NBMFKV6NjI=" }, "heroku": { "hash": "sha256-B/NaFe8KOKGJJlF3vZnpdMnbD1VxBktqodPBk+4NZEc=", @@ -561,20 +570,20 @@ "vendorHash": "sha256-zo22ng+J9ItkptdgUt6Pekkd9T7hFTYdVAWnp2k2vrs=" }, "http": { - "hash": "sha256-fGJBrgobtDAOPXnAIcmuepgCRVIdSCABQlP+dycAm+E=", + "hash": "sha256-fYbOfsKTah+5pgJdSftZvVlYmBp75o/6ByJO+ayXDhQ=", "homepage": "https://registry.terraform.io/providers/hashicorp/http", "owner": "hashicorp", "repo": "terraform-provider-http", - "rev": "v3.4.3", + "rev": "v3.4.4", "spdx": "MPL-2.0", - "vendorHash": "sha256-3yrcTs0QV2I4CX1TZgY9FimXC2G/p1s+xNsurH0n8e8=" + "vendorHash": "sha256-+U6k+mAVdGWOKzopp0yfaMmKuhqG0Laut+jHap4hBWs=" }, "huaweicloud": { - "hash": "sha256-04y0G3555aRnB3Zc9TgeYOMo1QyJ9ns4r85AikXSNE4=", + "hash": "sha256-Qs5/bDIb2SkQn9oXYU0kgpHY2q2obf8h2bN4prsaNrs=", "homepage": "https://registry.terraform.io/providers/huaweicloud/huaweicloud", "owner": "huaweicloud", "repo": "terraform-provider-huaweicloud", - "rev": "v1.65.2", + "rev": "v1.68.1", "spdx": "MPL-2.0", "vendorHash": null }, @@ -597,13 +606,13 @@ "vendorHash": null }, "ibm": { - "hash": "sha256-5esd44JgaarCJK38QyYv+fxMz0+zzivMZD8rqyqrdbo=", + "hash": "sha256-PgrC6k6xGfGR9DoTBLSbWDjfF5comrpLGxgUIeof1lI=", "homepage": "https://registry.terraform.io/providers/IBM-Cloud/ibm", "owner": "IBM-Cloud", "repo": "terraform-provider-ibm", - "rev": "v1.64.0", + "rev": "v1.69.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-YFxD7hvKTXdaQ/+/Oiws/i6TipbFaAQ0Ah1arGK7JUo=" + "vendorHash": "sha256-Ve0qfeuDU59W3jCXpNvcZbnLt7OLAreBbGam2Wp/3Ig=" }, "icinga2": { "hash": "sha256-Y/Oq0aTzP+oSKPhHiHY9Leal4HJJm7TNDpcdqkUsCmk=", @@ -615,13 +624,13 @@ "vendorHash": null }, "incus": { - "hash": "sha256-nyL8sWFgTlJjuAYhBuzThCm89UHwYmb+x+A39z2FCj0=", + "hash": "sha256-VHoEUcFwsERC3EKfobTEoWOxuiOEBzEaWXL+mzlTe44=", "homepage": "https://registry.terraform.io/providers/lxc/incus", "owner": "lxc", "repo": "terraform-provider-incus", - "rev": "v0.1.2", + "rev": "v0.1.4", "spdx": "MPL-2.0", - "vendorHash": "sha256-81ykw34Qj5qAAa06p7br94bvlIM4uNiKNUI8d+Gw07g=" + "vendorHash": "sha256-7MQi9gJU0RAm9jTiY/YjkEU5QsxSX2lbUC7qvT20mes=" }, "infoblox": { "hash": "sha256-x5WGCYvsXby2O8J15fvoRNsYnBCaYdjx6LuDkYAfIlU=", @@ -642,13 +651,13 @@ "vendorHash": "sha256-NEGjgtrn6ZowqSF6NAK1NnSjYVUvfWuH/4R5ZPdTZSs=" }, "kafka": { - "hash": "sha256-bkZfgA/PgLWC3YXrIgoF2YRgOFQhoT+Seeifg1GvVFY=", + "hash": "sha256-CIA+0BMVPOpsB83QD6QEVOhohzeEFjFYTQ5UE+9MMIY=", "homepage": "https://registry.terraform.io/providers/Mongey/kafka", "owner": "Mongey", "repo": "terraform-provider-kafka", - "rev": "v0.7.1", + "rev": "v0.8.1", "spdx": "MIT", - "vendorHash": "sha256-Adfz3r3xWY7a4u9/m6a1rvQYGq+E8Q5pAuS/uMgZRQM=" + "vendorHash": "sha256-wfN5tgW/Pqm6PqHLnuON4SQwd7U6DFj7e8HiTSrTGbo=" }, "kafka-connect": { "hash": "sha256-3EUTte3txaDRz3jh0h23+Bf1tdLeCvPN9x8mYWY5VjI=", @@ -678,22 +687,22 @@ "vendorHash": "sha256-lXQHo66b9X0jZhoF+5Ix5qewQGyI82VPJ7gGzc2CHao=" }, "kubernetes": { - "hash": "sha256-MlM7OEpzDOmM8BaaGYn6ZSDaIO8IswreOIkLOkbqQHo=", + "hash": "sha256-SXHi6iW946P7EjNOtci2b0ioftxMHtqTIZmTBnHvmU4=", "homepage": "https://registry.terraform.io/providers/hashicorp/kubernetes", "owner": "hashicorp", "repo": "terraform-provider-kubernetes", - "rev": "v2.31.0", + "rev": "v2.32.0", "spdx": "MPL-2.0", "vendorHash": "sha256-MfXuVZC7aroO83CJTNCh5YfbmMlUG1CiPeGgxhUFjN0=" }, "launchdarkly": { - "hash": "sha256-ZJxtrDGUH/Ea07CwBX+om0Ccsg6oSUjoS9pKIOnl0GM=", + "hash": "sha256-ke7o4I6d1JSsk+/6hk0EXUatnyCnXzb8xdgPX/cr4eM=", "homepage": "https://registry.terraform.io/providers/launchdarkly/launchdarkly", "owner": "launchdarkly", "repo": "terraform-provider-launchdarkly", - "rev": "v2.19.0", + "rev": "v2.20.2", "spdx": "MPL-2.0", - "vendorHash": "sha256-pO9QTtqA+YG0i+o1+p3PYg8E/mUpzIV3II++CxQcuHE=" + "vendorHash": "sha256-v9N7lj7bEgR5HZm1SO0+DSCmQFVnsRvHPMycYMfpYwo=" }, "libvirt": { "hash": "sha256-yGlNBbixrQxjh7zgZoK3YXpUmr1vrLiLZhKpXvQULYg=", @@ -705,13 +714,13 @@ "vendorHash": "sha256-K/PH8DAi6Wj+isPx9xefQcLPKnrimfItZFSPfktTias=" }, "linode": { - "hash": "sha256-6q1x34SWBCDi1jGoyNoxMAtHqxqP3qAVk1MLMLIRbg8=", + "hash": "sha256-4uRKers66pbuft7lWKzBbsE3fFWTfyozWvGjmDke210=", "homepage": "https://registry.terraform.io/providers/linode/linode", "owner": "linode", "repo": "terraform-provider-linode", - "rev": "v2.23.0", + "rev": "v2.27.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-ZQkFp9UXhY61YgtPVaWOSoQIYNcaTs9V/iwZ+UDRluA=" + "vendorHash": "sha256-bWyHzN+W3G83V8sjqn1bfLBuB71/O5DuUWsro58A2xs=" }, "linuxbox": { "hash": "sha256-MzasMVtXO7ZeZ+qEx2Z+7881fOIA0SFzSvXVHeEROtg=", @@ -732,13 +741,13 @@ "vendorHash": "sha256-PpLqFek6FnD+xWF8QMS2PFUP7sXXVWWWosq6fpLRzxg=" }, "lxd": { - "hash": "sha256-z7AjOKMSf2XnyCQiBcjFY0V9mDLF6Fj54Ck7971Ehio=", + "hash": "sha256-LGho9iCjKn0OR8sbnkduZtLIxcnVwpedvVinA78791c=", "homepage": "https://registry.terraform.io/providers/terraform-lxd/lxd", "owner": "terraform-lxd", "repo": "terraform-provider-lxd", - "rev": "v2.1.0", + "rev": "v2.3.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-fu6EgUIw1rFswXM3xUi0DLSChhl2c3a70uJO7aZhX+I=" + "vendorHash": "sha256-J1KWnU0IspjoosI5wIAc8ygOImXlc3tFkhV3yDXoDl4=" }, "mailgun": { "hash": "sha256-Sj6iejtaSdAPg2tI5f0b88Lni431cervHxlQWwGl8Bo=", @@ -768,31 +777,31 @@ "vendorHash": "sha256-QxbZv6YMa5/I4bTeQBNdmG3EKtLEmstnH7HMiZzFJrI=" }, "migadu": { - "hash": "sha256-EGVIk828DwYGMkRBGs3Lnt9goYb+biWoZcXmfuy/OPg=", + "hash": "sha256-/VR2pko5ctH/Gz3zUMhmwlZOpxQPu1AgZ3wRddndf6c=", "homepage": "https://registry.terraform.io/providers/metio/migadu", "owner": "metio", "repo": "terraform-provider-migadu", - "rev": "2024.6.6", + "rev": "2024.9.5", "spdx": "0BSD", - "vendorHash": "sha256-xUb3tRMG9Exth2d2/1hGVa3llFss99up1cnNaldwse0=" + "vendorHash": "sha256-3pPRgmoC0eYFyu/kNpJty45MfIjBMN5uV8l7iQErAns=" }, "minio": { - "hash": "sha256-P+rhDVmZl8DouSOTkBRE2MNG0ZcpLDveO3Npt1AIEGU=", + "hash": "sha256-1f6T5sfrBPgwxKKZMknd3JJd7mv90zuGtXInDPKAg0M=", "homepage": "https://registry.terraform.io/providers/aminueza/minio", "owner": "aminueza", "repo": "terraform-provider-minio", - "rev": "v2.3.2", + "rev": "v2.5.0", "spdx": "AGPL-3.0", "vendorHash": "sha256-Gn4P4NIksv8S4DmnuYArxdSQDQsyCeayJJAIkmm/I6A=" }, "mongodbatlas": { - "hash": "sha256-TitX99F/jx2q2FOSmJAGLprhFSsG4CBdmKQhzNqxotk=", + "hash": "sha256-ZAgoC6HNBIQP3tCo3+kZh7TyMDi+caPstqB5HpjTa5g=", "homepage": "https://registry.terraform.io/providers/mongodb/mongodbatlas", "owner": "mongodb", "repo": "terraform-provider-mongodbatlas", - "rev": "v1.17.2", + "rev": "v1.18.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-Te8Kd+1B3T3Ngo+xKgiqjnm5CZ2QRNXEQxPlaLPXNRY=" + "vendorHash": "sha256-llbYJi3ghgh9y97ri03a7ZBXSUPMs7f3FLd4iLRRmmk=" }, "namecheap": { "hash": "sha256-g3i7jZBOl2umsyRk1z7Radv8a9Ry6oQ8oorv3YbY7Xo=", @@ -813,31 +822,31 @@ "vendorHash": null }, "newrelic": { - "hash": "sha256-UxSWEejkEH5VzPWXc2RZ5ho8rtvwH6zYUEP+W/r4ny0=", + "hash": "sha256-Q1wY613U8cdAlHd+mVTKVNO4KBqVm2/HcKp66DTzbII=", "homepage": "https://registry.terraform.io/providers/newrelic/newrelic", "owner": "newrelic", "repo": "terraform-provider-newrelic", - "rev": "v3.38.1", + "rev": "v3.45.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-wsIi0BwwSXiVhYg2h53UzqjbGpPYMHXcmmMXO20gbWw=" + "vendorHash": "sha256-C3dDWWmV7YrorPps0m0V9DQDraID57+vXWg8pBIYXIE=" }, "nomad": { - "hash": "sha256-42QZfbbugxV6USCz0Urnhfcsf+DZKpOepC44Z37dGkw=", + "hash": "sha256-OdttxZEY4fiLiK6ReoIFjN3VAvEgARQ9yBAqemVyheU=", "homepage": "https://registry.terraform.io/providers/hashicorp/nomad", "owner": "hashicorp", "repo": "terraform-provider-nomad", - "rev": "v2.3.0", + "rev": "v2.3.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-+4JU2z56W/uT+DW4+LRf1hwK0nLK9WARTY31bqMpHNM=" + "vendorHash": "sha256-WTfhKSaSzXOsYH8Aso735y5fYCKEjwMtWto5oZ6lU4s=" }, "ns1": { - "hash": "sha256-KbtMwLgwCPHilzQ22oco99q6c5+0B/9OXoc0IZXLLVk=", + "hash": "sha256-3NDHEpvBlVb3IgkEjJ1g2Jpvy2MbgXSeabuCPlpKZmM=", "homepage": "https://registry.terraform.io/providers/ns1-terraform/ns1", "owner": "ns1-terraform", "repo": "terraform-provider-ns1", - "rev": "v2.3.0", + "rev": "v2.4.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-kQFlW6G20x1OJNywb+KfJC1A7XSdgHlif7/szUOBuhs=" + "vendorHash": "sha256-jTsjVhVEgtI3B+tLl9xLqQsGI2piQc6QA2EHqfVhDxg=" }, "null": { "hash": "sha256-KOwJXGvMc9Xgq4Kbr72aW6RDwzldUrU1C3aDxpKO3qE=", @@ -859,22 +868,22 @@ "vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI=" }, "oci": { - "hash": "sha256-EcemPlqHB3Ggra0o1rzjxAGtcpBKpUp3/H8zS56COYA=", + "hash": "sha256-LlRy0i4JGjaeHMQMWUYtKgJOUqm0RFwtyDO+KtQcCRI=", "homepage": "https://registry.terraform.io/providers/oracle/oci", "owner": "oracle", "repo": "terraform-provider-oci", - "rev": "v5.46.0", + "rev": "v6.9.0", "spdx": "MPL-2.0", "vendorHash": null }, "okta": { - "hash": "sha256-GHC2HhpyPBQ5gPg/HPmP+Bms6O5mLhdAysKW58FWhwA=", + "hash": "sha256-lSZWAAZWkM2+fgLpbfsHLvu1m6R8LMrtc7hUPdwiioc=", "homepage": "https://registry.terraform.io/providers/okta/okta", "owner": "okta", "repo": "terraform-provider-okta", - "rev": "v4.9.1", + "rev": "v4.10.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-71z33jsQmNQoCVSQCiyjHnfUMtwY+KB5Mn2MHItwGa0=" + "vendorHash": "sha256-8Wez4UkS0LsJTtgepdPpyZHhNZADxvGwOEVu6RLBI0o=" }, "oktaasa": { "hash": "sha256-2LhxgowqKvDDDOwdznusL52p2DKP+UiXALHcs9ZQd0U=", @@ -886,11 +895,11 @@ "vendorHash": null }, "onepassword": { - "hash": "sha256-rdS9Udzfc/U7E4CIyySnntOCVBBZL0/GuAiVCI5uMrc=", + "hash": "sha256-u2nSzEKD0o/e0AzeHdKQj3+h7mAt6r5cxaKsPn6nRGo=", "homepage": "https://registry.terraform.io/providers/1Password/onepassword", "owner": "1Password", "repo": "terraform-provider-onepassword", - "rev": "v2.1.0", + "rev": "v2.1.2", "spdx": "MIT", "vendorHash": null }, @@ -904,47 +913,47 @@ "vendorHash": "sha256-Hd6vh4ihuR1rRk5yIu1mPuDMb4Not4soKld10MfOuGU=" }, "openstack": { - "hash": "sha256-NSfKyXTuPiEYFE8guWsRcJsKiccMrHJRK4I5REzzIZQ=", + "hash": "sha256-Vt6cFZBfM5sP62zWeyoCuEPU6vRucGG8z7zeQywDA40=", "homepage": "https://registry.terraform.io/providers/terraform-provider-openstack/openstack", "owner": "terraform-provider-openstack", "repo": "terraform-provider-openstack", - "rev": "v2.0.0", + "rev": "v2.1.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-TS1Zp9IMD+Mq91QhyRuDgzbwd61bASWLPft5JdNCcy4=" + "vendorHash": "sha256-UH4LgC4UATpglZ2lYb92LvEeAgqXyDFzujNnaYCYN3g=" }, "opentelekomcloud": { - "hash": "sha256-UhECzYRA9AaATeYdC68ALd3aoB8G0okWQm1U9VkgL5c=", + "hash": "sha256-CXWaIISfDtT6jTdFKE67LiRPlGaq+9fRO77GqIMrZhs=", "homepage": "https://registry.terraform.io/providers/opentelekomcloud/opentelekomcloud", "owner": "opentelekomcloud", "repo": "terraform-provider-opentelekomcloud", - "rev": "v1.36.12", + "rev": "v1.36.18", "spdx": "MPL-2.0", - "vendorHash": "sha256-PwYc9p8nRe0QkgLKLOeb7KYTLgFiT2JQGsmTfFLzBH4=" + "vendorHash": "sha256-vsK74qZ20VOID5sg7kHjxBXiu1dkyJ961zFf0+QkqH0=" }, "opsgenie": { - "hash": "sha256-ZssKhfwFrzCjvlebEmKAHWBInN5daVqxbmVFoA92dv8=", + "hash": "sha256-+msy9kPAryR0Ll5jKOd47DMjeMxEdSIfKZZKVHohQGY=", "homepage": "https://registry.terraform.io/providers/opsgenie/opsgenie", "owner": "opsgenie", "repo": "terraform-provider-opsgenie", - "rev": "v0.6.35", + "rev": "v0.6.37", "spdx": "MPL-2.0", "vendorHash": null }, "ovh": { - "hash": "sha256-346lBl1AnEdZmLEfsPiTW7I6rhOv61t004DBx7gRkF8=", + "hash": "sha256-XVNinT1kjvjrVLB4NXELw1Rf6UZEkX4el+dKzOO0QjY=", "homepage": "https://registry.terraform.io/providers/ovh/ovh", "owner": "ovh", "repo": "terraform-provider-ovh", - "rev": "v0.45.0", + "rev": "v0.48.0", "spdx": "MPL-2.0", "vendorHash": null }, "pagerduty": { - "hash": "sha256-GB2U+JBMAj+ePay7CYHWv/daLzVm+V+5YoADJ6uQp+E=", + "hash": "sha256-+8Ar/PDGSSe9Xs2BoNndrBCXZpgqKHNXz7HNVvok1Eo=", "homepage": "https://registry.terraform.io/providers/PagerDuty/pagerduty", "owner": "PagerDuty", "repo": "terraform-provider-pagerduty", - "rev": "v3.14.3", + "rev": "v3.15.6", "spdx": "MPL-2.0", "vendorHash": null }, @@ -967,13 +976,13 @@ "vendorHash": "sha256-pbJk35O8EowCa2dgLCrPDgakR0EJVaAnEvePGnrl/YQ=" }, "postgresql": { - "hash": "sha256-UNnAe5alro4dEZ9x2ZDsjybOgHq2IVs8w9rMcMJBm8w=", + "hash": "sha256-v/88uUvILQT0uHRgfwMuLQWw0ma2ELT691kQ9GVjr/A=", "homepage": "https://registry.terraform.io/providers/cyrilgdn/postgresql", "owner": "cyrilgdn", "repo": "terraform-provider-postgresql", - "rev": "v1.22.0", + "rev": "v1.23.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-omJjWeCLIdHIySQW8tcDPQ1XPmfWbPDOGwPUedrb8Bw=" + "vendorHash": "sha256-fHNXJGyOWGF7Dwfk14GWmLXSIENsshIHbxkF7iQJNuI=" }, "powerdns": { "hash": "sha256-NtJs2oNJbjUYNFsbrfo2RYhqOlKA15GJt9gi1HuTIw0=", @@ -985,13 +994,13 @@ "vendorHash": null }, "project": { - "hash": "sha256-CuUHTuq2ufSuolpvfkT4Q30tiIGkpuIoYCYqY9EOd9s=", + "hash": "sha256-rxv1owtlc9P9uZDReH0lKFUUTSL+X+HlkWL5FWz3bHw=", "homepage": "https://registry.terraform.io/providers/jfrog/project", "owner": "jfrog", "repo": "terraform-provider-project", - "rev": "v1.6.2", + "rev": "v1.7.2", "spdx": "Apache-2.0", - "vendorHash": "sha256-UcoTldBVqCPh1SVaZm2aKeRVCVfgE/zGOR7+feDEUM0=" + "vendorHash": "sha256-ld52rPoG4bCfU+qizliuwmz6ncxrhcoAYOEZo5mnCYI=" }, "proxmox": { "hash": "sha256-ikXLLNoAjrnGGGI3fHTKFXm8YwqNazE/U39JTjOBsW4=", @@ -1012,13 +1021,13 @@ "vendorHash": "sha256-j+3qtGlueKZgf0LuNps4Wc9G3EmpSgl8ZNSLqslyizI=" }, "rancher2": { - "hash": "sha256-w9oAeE8KuD7kdBFOkNgifaELrxr3X1yKYXFiQLyaGY8=", + "hash": "sha256-n4sEIew7C7tG19paaJjgtCwGt5KhUyoR/OGoLu4Kal8=", "homepage": "https://registry.terraform.io/providers/rancher/rancher2", "owner": "rancher", "repo": "terraform-provider-rancher2", - "rev": "v4.1.0", + "rev": "v5.0.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-kzOEHkVCHOwISXVPmKbJJ2BbBdIJ3G1JtA1nFGZYnG8=" + "vendorHash": "sha256-uIyLOqabx8wQurxcG70LHm+jBga+bCNyf5XxGrt5OKA=" }, "random": { "hash": "sha256-10SRHJx7h04qRH4XnBsqiwJ43nxTodj89kkik2UTI6E=", @@ -1048,13 +1057,13 @@ "vendorHash": null }, "scaleway": { - "hash": "sha256-VTtS5iqeMzcaVveMlnJZDrXUSf0Ts/FG7STVix08mQs=", + "hash": "sha256-h30SfKtx2l9zp9ZGy1KRoQRmb83B4e48R/URJ2I2J+U=", "homepage": "https://registry.terraform.io/providers/scaleway/scaleway", "owner": "scaleway", "repo": "terraform-provider-scaleway", - "rev": "v2.41.3", + "rev": "v2.44.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-eLQLozDXk83vjfTrsJHQqU3GMZToMwvjadqf+X7OeOU=" + "vendorHash": "sha256-crp1XJRsWBEhRFC1CzLTgBTrTLaM2Y39Mwx+l1mg0Ks=" }, "secret": { "hash": "sha256-MmAnA/4SAPqLY/gYcJSTnEttQTsDd2kEdkQjQj6Bb+A=", @@ -1066,13 +1075,13 @@ "vendorHash": null }, "selectel": { - "hash": "sha256-yIQdxwkcpFKm2+woHW7yClWAwQr82XaCDFHh6KAOaQI=", + "hash": "sha256-cLN0wNT8Yn+uiaGZFzdDg1ZN4pzm5VHriMgRGZv3ZpU=", "homepage": "https://registry.terraform.io/providers/selectel/selectel", "owner": "selectel", "repo": "terraform-provider-selectel", - "rev": "v5.1.1", + "rev": "v5.3.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-PyATpaCqu8csmpf83EODKgecZaquraFlh1bTYhhhBO4=" + "vendorHash": "sha256-MP44e56j7rLyT4+TbFDfDb5GNc/LzZNLplm1/qqeGiw=" }, "sentry": { "hash": "sha256-iTwl5FowrrhznO+Zr7QXy7/6HlYWCryZTMxNsBGSfWI=", @@ -1093,13 +1102,13 @@ "vendorHash": "sha256-MIO0VHofPtKPtynbvjvEukMNr5NXHgk7BqwIhbc9+u0=" }, "signalfx": { - "hash": "sha256-JPL2VjYIg8qW9kk6QaT3+alWtMvKHXRlqLD6AZ2+cQ0=", + "hash": "sha256-OmM3NvTnT/yZBgBYf15vITJSVOXQ7Vvqn6T6+LXOpbk=", "homepage": "https://registry.terraform.io/providers/splunk-terraform/signalfx", "owner": "splunk-terraform", "repo": "terraform-provider-signalfx", - "rev": "v9.1.5", + "rev": "v9.1.6", "spdx": "MPL-2.0", - "vendorHash": "sha256-uPAWL2BigYiazZQSScM/J39dLDtYheq2P6l4A9M3rOA=" + "vendorHash": "sha256-h+tusSFbu4jmfu0v1BwRrSoDEPYjXZwQ+YykRUoXlv4=" }, "skytap": { "hash": "sha256-JII4czazo6Di2sad1uFHMKDO2gWgZlQE8l/+IRYHQHU=", @@ -1120,31 +1129,40 @@ "vendorHash": "sha256-F1AuO/dkldEDRvkwrbq2EjByxjg3K2rohZAM4DzKPUw=" }, "snowflake": { - "hash": "sha256-3vC246+XoCfmnEdNFHW8iy0fy5aN+kmaZzgJot4hKs0=", + "hash": "sha256-jIzLT2tQViOdNOQ462fM1SFt0E22QZbUdh33OjmUf+k=", "homepage": "https://registry.terraform.io/providers/Snowflake-Labs/snowflake", "owner": "Snowflake-Labs", "repo": "terraform-provider-snowflake", - "rev": "v0.92.0", + "rev": "v0.95.0", "spdx": "MIT", - "vendorHash": "sha256-pxti3wXBke16zoEPaTbXrTc/LI1QbvKfBvbUSxnAIOk=" + "vendorHash": "sha256-FPIqTXbGLui6QW1bFhwV4rGgo8IUw3XkmryqmjpM5Sw=" }, "sops": { - "hash": "sha256-ZastswL5AVurQY3xn6yx3M1BMvQ9RjfcZdXX0S/oZqw=", + "hash": "sha256-MdsWKV98kWpZpTK5qC7x6vN6cODxeeiVVc+gtlh1s88=", "homepage": "https://registry.terraform.io/providers/carlpett/sops", "owner": "carlpett", "repo": "terraform-provider-sops", - "rev": "v1.0.0", + "rev": "v1.1.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-8W1PK4T98iK1N6EB6AVjvr1P9Ja51+kSOmYAEosxrh8=" + "vendorHash": "sha256-YFV+qXD78eajSeagJPgPu+qIktx1Vh/ZT0fUPOBuZyo=" + }, + "spacelift": { + "hash": "sha256-kEfZ1ErNMdUGw1eRiX4SphreCCGMQj1Wj0DLFikTfxI=", + "homepage": "https://registry.terraform.io/providers/spacelift-io/spacelift", + "owner": "spacelift-io", + "repo": "terraform-provider-spacelift", + "rev": "v1.15.0", + "spdx": "MIT", + "vendorHash": "sha256-m/J390su2nUpYMXrrYcOfKSjZb5Y23+g24rroLRss4U=" }, "spotinst": { - "hash": "sha256-6bdOwmAKxP7EVdRV8vw6b/lewPm35zE9T0Dah6NL5FA=", + "hash": "sha256-ChtaZkztmyFPJvtoE+TUPzZyEEoZ6y3o1CgnKsnK6I4=", "homepage": "https://registry.terraform.io/providers/spotinst/spotinst", "owner": "spotinst", "repo": "terraform-provider-spotinst", - "rev": "v1.178.0", + "rev": "v1.190.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-c6vs7FypPQybAzFAsTnOGVjVLhhmj6v2/O0FU1z6X0A=" + "vendorHash": "sha256-JGwBQMsMGxH5ceHOd5CbSQFQdL6u99lHpWFgJUyMYRQ=" }, "ssh": { "hash": "sha256-1UN5QJyjCuxs2vQYlSuz2jsu/HgGTxOoWWRcv4qcwow=", @@ -1174,20 +1192,20 @@ "vendorHash": "sha256-9M1DsE/FPQK8TG7xCJWbU3HAJCK3p/7lxdzjO1oAfWs=" }, "sumologic": { - "hash": "sha256-ei5BxMyrx4CyVYl81DUDxLdbjGJBiTZWiFylhUFTr0s=", + "hash": "sha256-e/Vmu+odmn/IasHl6dSy5aYLRi/lTcVjpzJl+YYn1mg=", "homepage": "https://registry.terraform.io/providers/SumoLogic/sumologic", "owner": "SumoLogic", "repo": "terraform-provider-sumologic", - "rev": "v2.30.1", + "rev": "v2.31.3", "spdx": "MPL-2.0", - "vendorHash": "sha256-ti0zBliq3DXVNWlqE0dO6T5UxN/p1fLMt4FK/0/j9oY=" + "vendorHash": "sha256-YdWs2orKhbwAZSQYC73t4e/vvVxk8LrBPG9ZC38VcZE=" }, "tailscale": { - "hash": "sha256-hMcnHTdxxEfAU5cd0nlK2Bc+fxfrERk4wYaRidPM4mA=", + "hash": "sha256-GflanQbIPpS0mxmw7LXeTfPly+CmgpsoLHBIMe6f7xM=", "homepage": "https://registry.terraform.io/providers/tailscale/tailscale", "owner": "tailscale", "repo": "terraform-provider-tailscale", - "rev": "v0.16.1", + "rev": "v0.16.2", "spdx": "MIT", "vendorHash": "sha256-RAmAN57hIHvQvZ2pjbLbanixUk8Cart6a3PQPXhnx9U=" }, @@ -1201,49 +1219,49 @@ "vendorHash": "sha256-939lQsdp0Ixj9FU7IqxbOAM93GwL+X6gC3kY5/0x+AE=" }, "temporalcloud": { - "hash": "sha256-ISx/kc3Mi/EBnzfrMojRTsZEG10iPqKMB8Ac8SzBZmY=", + "hash": "sha256-OD3cCNRZG9wQSu/aFmnVzcUbJyASusM1rt2PdpWKXkI=", "homepage": "https://registry.terraform.io/providers/temporalio/temporalcloud", "owner": "temporalio", "repo": "terraform-provider-temporalcloud", - "rev": "v0.0.8", + "rev": "v0.0.11", "spdx": "MPL-2.0", - "vendorHash": "sha256-2rYaxDDIPH46gXNILnTcHRsChpEd406r4pzWdnHMLNM=" + "vendorHash": "sha256-/yXPJgwpUCKRs3Sf2BbuHp3pfQiheTAh7Auxk3qkTFg=" }, "tencentcloud": { - "hash": "sha256-RR7F+sZl/btVEsybmKFxG3yrE7PkvdstMuDAJwx4Ggk=", + "hash": "sha256-HgBC+C7z15cdVUBOAaPE3ddhEKMfp7Ow+lWqS/EkD98=", "homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud", "owner": "tencentcloudstack", "repo": "terraform-provider-tencentcloud", - "rev": "v1.81.105", + "rev": "v1.81.120", "spdx": "MPL-2.0", "vendorHash": null }, "tfe": { - "hash": "sha256-mfJtQs+fl7zfysWJO/EBM/DMYYOvR5nuOwDA6sei1PI=", + "hash": "sha256-lXwdNtdbCwiotVCGBIiAPHUjNdj+srpBaW30GUWW0ao=", "homepage": "https://registry.terraform.io/providers/hashicorp/tfe", "owner": "hashicorp", "repo": "terraform-provider-tfe", - "rev": "v0.56.0", + "rev": "v0.58.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-heMfI1NLjOHSKondXY8mRCNWFedSYJqfn9nU2Ywj57c=" + "vendorHash": "sha256-eeVkzZ+ATTyZCEq4loEbIb0XO/Ir1jejUaWi4Jd6nMo=" }, "thunder": { - "hash": "sha256-ezolcZ652YUV/CDoNKNRZkiRpRoa5AMqHxeYLxluA5A=", + "hash": "sha256-2i1DSOSt/vbFs0QCPogEBvADhLJFKbrQzwZ20ChCQMk=", "homepage": "https://registry.terraform.io/providers/a10networks/thunder", "owner": "a10networks", "repo": "terraform-provider-thunder", - "rev": "v1.4.1", + "rev": "v1.4.2", "spdx": "BSD-2-Clause", "vendorHash": null }, "time": { - "hash": "sha256-Uwe0VpY7CKXNy6RNS+yoIkyLmMQ2daJ5x7IhJV+KuxU=", + "hash": "sha256-mAGBcBMd00r2URY/jqZQBLjo0mN+IMG5ONVKj0AwXNs=", "homepage": "https://registry.terraform.io/providers/hashicorp/time", "owner": "hashicorp", "repo": "terraform-provider-time", - "rev": "v0.11.2", + "rev": "v0.12.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-dmBCjbVmK4Qa07bcgUxKch5Vj7nylgNA7rzx+7ag3CY=" + "vendorHash": "sha256-C40wkY1M9d5oPO6TOm/iu99Gcrnnin1ggn9mbOJ0YjY=" }, "tls": { "hash": "sha256-2K18jY2+oPvelMtZ2o4WJcAPhc93nCvJdHq+VNfmWZI=", @@ -1265,11 +1283,11 @@ "vendorHash": "sha256-UuLHaOEG6jmOAgfdNOtLyUimlAr3g6K8n3Ehu64sKqk=" }, "turbot": { - "hash": "sha256-OmhNZZcCw6tGsL3Ha4cdg76GHqMjKeRB6aOXfqkIOjQ=", + "hash": "sha256-lVKJKMCAm8paXxfPo6YvJBnHdmV4iwaTYmwdN31s/e4=", "homepage": "https://registry.terraform.io/providers/turbot/turbot", "owner": "turbot", "repo": "terraform-provider-turbot", - "rev": "v1.10.1", + "rev": "v1.11.1", "spdx": "MPL-2.0", "vendorHash": null }, @@ -1283,31 +1301,31 @@ "vendorHash": null }, "utils": { - "hash": "sha256-9a8K2Yl3hfmUG+/QgQJdXnW6lxkOJps1BskFto3tIwg=", + "hash": "sha256-bxjEdmPgKPFpRM9Jz9nichDhXY+7x74WS6VjZGf9VUE=", "homepage": "https://registry.terraform.io/providers/cloudposse/utils", "owner": "cloudposse", "repo": "terraform-provider-utils", - "rev": "1.23.0", + "rev": "v1.26.0", "spdx": "Apache-2.0", - "vendorHash": "sha256-oaVBYSH2ix9SUqvrFo+oBIS80/Sb3E7Z/Jpvznt+OtU=" + "vendorHash": "sha256-zJtVKDaqOMQqyAzq4VtVv5MgXS999BwxeWhXQI6McC4=" }, "vault": { - "hash": "sha256-tPRwdSwygypfgXAS3QmZNAb4GXe/8IFsRs8YGa4HDJg=", + "hash": "sha256-EiCLz5Z0ztwWrn8yHG9JnuIizicpi3WtvDSGyBtzgSY=", "homepage": "https://registry.terraform.io/providers/hashicorp/vault", "owner": "hashicorp", "repo": "terraform-provider-vault", - "rev": "v4.3.0", + "rev": "v4.4.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-rS6tigtjTGG2c4FwSjn6dvblwqYtPQS/tl7qQ+P7uVM=" + "vendorHash": "sha256-z9qg6NVKYIU2OQTW8g72t6B69aTL/BeLCUFeoII75cE=" }, "vcd": { - "hash": "sha256-f5uoRyf8uW/hJ9MAbi9KdViWh8CMR/FlQyJtAY5pEvI=", + "hash": "sha256-4+7CblKeop9Uwpl7XxjmR33XE/mcmZfOuFJrJuqzZmw=", "homepage": "https://registry.terraform.io/providers/vmware/vcd", "owner": "vmware", "repo": "terraform-provider-vcd", - "rev": "v3.12.1", + "rev": "v3.13.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-vKfHRTmTRxwDijEA1l4IyjBHS5kZx9LcGfprUntVg5w=" + "vendorHash": "sha256-GKI3eXgXA92URJiwafcVchBcW7JQQ7hM14ThA6B6wKg=" }, "venafi": { "hash": "sha256-0ea6ael4NQDHFOrXsMKE/KRRpARKjrxPBFykB8Bk1JA=", @@ -1346,13 +1364,13 @@ "vendorHash": null }, "vsphere": { - "hash": "sha256-BCEUFIw47o7lFmOaQ/SBk2n1bPnvzAwdxeuuMNx4OgA=", + "hash": "sha256-V13LeUNJ4LbP18CMRphU/w/7eytg49j5//gl/sZSV04=", "homepage": "https://registry.terraform.io/providers/hashicorp/vsphere", "owner": "hashicorp", "repo": "terraform-provider-vsphere", - "rev": "v2.8.1", + "rev": "v2.9.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-K7T4ZGz8Us/RRWoAmT5M++m6uJKl6tyPX7T+sS7NuLs=" + "vendorHash": "sha256-ozdbYuqz6ua1ubh48IkLxJZ6xAV2ho9mkhtnCTwzRIM=" }, "vultr": { "hash": "sha256-gQwLGnYmB9bwpGrLNdbw+zY0MlPPrY/37rJPtindT1Q=", @@ -1373,12 +1391,12 @@ "vendorHash": "sha256-GRnVhGpVgFI83Lg34Zv1xgV5Kp8ioKTFV5uaqS80ATg=" }, "yandex": { - "hash": "sha256-PTlnXq30roG1ueLJM5aGSeuDJ5zukmU33T9Qf7cnxd8=", + "hash": "sha256-47aAZuGLhiHLzk0mvHD48NfoSUs1Ec3R4DGEpbvPyj8=", "homepage": "https://registry.terraform.io/providers/yandex-cloud/yandex", "owner": "yandex-cloud", "repo": "terraform-provider-yandex", - "rev": "v0.122.0", + "rev": "v0.128.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-Lo847kKBWDFeN3t7T/akaQ8gkU7b+p1BSSi4ddLLDyc=" + "vendorHash": "sha256-4uHYcg+dJg1bJQRsJWDT9VEsPs5JOvGIdrw8cj0IkrE=" } } diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 14bd84533894d..f4578e81f4f03 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -165,9 +165,9 @@ rec { mkTerraform = attrs: pluggable (generic attrs); terraform_1 = mkTerraform { - version = "1.8.5"; - hash = "sha256-5PzP0LUJPpOQQ8YqwBFyEFcsHF2O1uDD8Yh8wB3uJ8s="; - vendorHash = "sha256-PXA2AWq1IFmnqhhU92S9UaIYTUAAn5lsg3S7h5hBOQE="; + version = "1.9.6"; + hash = "sha256-rlqpqiMlLcn2LqqKRU9iFaVqUz/QQtpiiZ39h5ZvpbI="; + vendorHash = "sha256-tH9KQF4oHcQh34ikB9Bx6fij/iLZN+waxv5ZilqGGlU="; patches = [ ./provider-path-0_15.patch ]; passthru = { inherit plugins; diff --git a/pkgs/applications/networking/cluster/terraform/provider-path-0_15.patch b/pkgs/applications/networking/cluster/terraform/provider-path-0_15.patch index 318df9ab69a8c..9e46eebd1b4b5 100644 --- a/pkgs/applications/networking/cluster/terraform/provider-path-0_15.patch +++ b/pkgs/applications/networking/cluster/terraform/provider-path-0_15.patch @@ -1,23 +1,23 @@ diff -Naur terraform.old/internal/command/init.go terraform.new/internal/command/init.go --- terraform.old/internal/command/init.go +++ terraform.new/internal/command/init.go -@@ -3,6 +3,7 @@ - import ( +@@ -7,6 +7,7 @@ "context" + "errors" "fmt" + "os" "log" - "strings" - -@@ -55,6 +56,11 @@ - - var diags tfdiags.Diagnostics - + "reflect" + "sort" +@@ -79,6 +80,11 @@ + c.migrateState = true + } + + val, ok := os.LookupEnv("NIX_TERRAFORM_PLUGIN_DIR") + if ok { -+ flagPluginPath = append(flagPluginPath, val) ++ initArgs.PluginPath = append(initArgs.PluginPath, val) + } + - if len(flagPluginPath) > 0 { - c.pluginPath = flagPluginPath + if len(initArgs.PluginPath) > 0 { + c.pluginPath = initArgs.PluginPath } diff --git a/pkgs/applications/networking/cluster/terraspace/Gemfile b/pkgs/applications/networking/cluster/terraspace/Gemfile index 7a6bbf7cc943e..3e9579dd75cf3 100644 --- a/pkgs/applications/networking/cluster/terraspace/Gemfile +++ b/pkgs/applications/networking/cluster/terraspace/Gemfile @@ -1,2 +1,2 @@ source "https://rubygems.org" -gem "terraspace", '~> 2.2.8' +gem "terraspace" diff --git a/pkgs/applications/networking/cluster/terraspace/Gemfile.lock b/pkgs/applications/networking/cluster/terraspace/Gemfile.lock index 4fce1f819664d..aa9e1600198be 100644 --- a/pkgs/applications/networking/cluster/terraspace/Gemfile.lock +++ b/pkgs/applications/networking/cluster/terraspace/Gemfile.lock @@ -1,36 +1,45 @@ GEM remote: https://rubygems.org/ specs: - activesupport (7.0.6) + activesupport (7.1.3.4) + base64 + bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) + connection_pool (>= 2.2.5) + drb i18n (>= 1.6, < 2) minitest (>= 5.1) + mutex_m tzinfo (~> 2.0) - aws-eventstream (1.2.0) - aws-partitions (1.785.0) - aws-sdk-core (3.177.0) - aws-eventstream (~> 1, >= 1.0.2) + aws-eventstream (1.3.0) + aws-partitions (1.956.0) + aws-sdk-core (3.201.1) + aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) - aws-sigv4 (~> 1.5) + aws-sigv4 (~> 1.8) jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.70.0) - aws-sdk-core (~> 3, >= 3.177.0) - aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.128.0) - aws-sdk-core (~> 3, >= 3.177.0) + aws-sdk-kms (1.88.0) + aws-sdk-core (~> 3, >= 3.201.0) + aws-sigv4 (~> 1.5) + aws-sdk-s3 (1.156.0) + aws-sdk-core (~> 3, >= 3.201.0) aws-sdk-kms (~> 1) - aws-sigv4 (~> 1.6) - aws-sigv4 (1.6.0) + aws-sigv4 (~> 1.5) + aws-sigv4 (1.8.0) aws-eventstream (~> 1, >= 1.0.2) - cli-format (0.2.2) + base64 (0.2.0) + bigdecimal (3.1.8) + cli-format (0.6.1) activesupport text-table zeitwerk - concurrent-ruby (1.2.2) + concurrent-ruby (1.3.3) + connection_pool (2.4.1) deep_merge (1.2.2) - diff-lcs (1.5.0) - dotenv (2.8.1) - dsl_evaluator (0.3.1) + diff-lcs (1.5.1) + dotenv (3.1.2) + drb (2.2.1) + dsl_evaluator (0.3.2) activesupport memoist rainbow @@ -38,40 +47,42 @@ GEM eventmachine (1.2.7) eventmachine-tail (0.6.5) eventmachine - graph (2.11.0) + graph (2.11.1) hcl_parser (0.2.2) rhcl - i18n (1.14.1) + i18n (1.14.5) concurrent-ruby (~> 1.0) jmespath (1.6.2) memoist (0.16.2) - minitest (5.18.1) - nokogiri (1.15.3) - racc (~> 1.4) + mini_portile2 (2.8.7) + minitest (5.24.1) + mutex_m (0.2.0) + nokogiri (1.16.6) mini_portile2 (~> 2.8.2) - racc (1.7.1) - mini_portile2 (2.8.2) + racc (~> 1.4) + racc (1.8.0) rainbow (3.1.1) render_me_pretty (0.9.0) activesupport rainbow tilt - rexml (3.2.5) + rexml (3.3.2) + strscan rhcl (0.1.0) deep_merge - rspec (3.12.0) - rspec-core (~> 3.12.0) - rspec-expectations (~> 3.12.0) - rspec-mocks (~> 3.12.0) - rspec-core (3.12.2) - rspec-support (~> 3.12.0) - rspec-expectations (3.12.3) + rspec (3.13.0) + rspec-core (~> 3.13.0) + rspec-expectations (~> 3.13.0) + rspec-mocks (~> 3.13.0) + rspec-core (3.13.0) + rspec-support (~> 3.13.0) + rspec-expectations (3.13.1) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.12.0) - rspec-mocks (3.12.5) + rspec-support (~> 3.13.0) + rspec-mocks (3.13.1) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.12.0) - rspec-support (3.12.1) + rspec-support (~> 3.13.0) + rspec-support (3.13.1) rspec-terraspace (0.3.3) activesupport memoist @@ -79,7 +90,8 @@ GEM rspec zeitwerk rubyzip (2.3.2) - terraspace (2.2.8) + strscan (3.1.0) + terraspace (2.2.17) activesupport bundler cli-format @@ -110,20 +122,20 @@ GEM thor zeitwerk text-table (1.2.4) - thor (1.2.2) - tilt (2.2.0) + thor (1.3.1) + tilt (2.4.0) tty-tree (0.4.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - zeitwerk (2.6.8) + zeitwerk (2.6.16) zip_folder (0.1.0) rubyzip PLATFORMS - x86_64-linux + ruby DEPENDENCIES - terraspace (~> 2.2.8) + terraspace BUNDLED WITH - 2.3.26 + 2.5.11 diff --git a/pkgs/applications/networking/cluster/terraspace/gemset.nix b/pkgs/applications/networking/cluster/terraspace/gemset.nix index a4e082c6d0d85..606e450c42708 100644 --- a/pkgs/applications/networking/cluster/terraspace/gemset.nix +++ b/pkgs/applications/networking/cluster/terraspace/gemset.nix @@ -1,34 +1,34 @@ { activesupport = { - dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; + dependencies = ["base64" "bigdecimal" "concurrent-ruby" "connection_pool" "drb" "i18n" "minitest" "mutex_m" "tzinfo"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1cjsf26656996hv48wgv2mkwxf0fy1qc68ikgzq7mzfq2mmvmayk"; + sha256 = "0283wk1zxb76lg79dk501kcf5xy9h25qiw15m86s4nrfv11vqns5"; type = "gem"; }; - version = "7.0.6"; + version = "7.1.3.4"; }; aws-eventstream = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pyis1nvnbjxk12a43xvgj2gv0mvp4cnkc1gzw0v1018r61399gz"; + sha256 = "0gvdg4yx4p9av2glmp7vsxhs0n8fj1ga9kq2xdb8f95j7b04qhzi"; type = "gem"; }; - version = "1.2.0"; + version = "1.3.0"; }; aws-partitions = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05m0c3h1z0jhaqiciil55fshrjvc725cf1lc0g933pf98vqflb0r"; + sha256 = "03zb6x4x68y91gywsyi4a6hxy4pdyng8mnxwd858bhjfymml8kkf"; type = "gem"; }; - version = "1.785.0"; + version = "1.956.0"; }; aws-sdk-core = { dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"]; @@ -36,10 +36,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09firi4bin3ay4pd59qgxspq2f1isfi1li8rabpw6lvvbhnar168"; + sha256 = "1ihl7iwndl3jjy89sh427wf8mdb7ii76bsjf6fkxq9ha30nz4f3g"; type = "gem"; }; - version = "3.177.0"; + version = "3.201.1"; }; aws-sdk-kms = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -47,10 +47,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1x73qj2c39ap926by14x56cjmp2cd5jpq5gv33xynypy1idyb0fj"; + sha256 = "02g3l3lcyddqncrwjxgawxl33p2p715k1gbrdlgyiv0yvy88sn0k"; type = "gem"; }; - version = "1.70.0"; + version = "1.88.0"; }; aws-sdk-s3 = { dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"]; @@ -58,10 +58,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11cxk6b3p1bsl1gg3pi93qx2ynbjrrsrsc68nnqsjm4npvaj052v"; + sha256 = "0ika0xmmrkc7jiwdi5gqia5wywkcbw1nal2dhl436dkh38fxl0lk"; type = "gem"; }; - version = "1.128.0"; + version = "1.156.0"; }; aws-sigv4 = { dependencies = ["aws-eventstream"]; @@ -69,10 +69,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0z889c4c1w7wsjm3szg64ay5j51kjl4pdf94nlr1yks2rlanm7na"; + sha256 = "1g3w27wzjy4si6kp49w10as6ml6g6zl3xrfqs5ikpfciidv9kpc4"; type = "gem"; }; - version = "1.6.0"; + version = "1.8.0"; + }; + base64 = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01qml0yilb9basf7is2614skjp8384h2pycfx86cr8023arfj98g"; + type = "gem"; + }; + version = "0.2.0"; + }; + bigdecimal = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1gi7zqgmqwi5lizggs1jhc3zlwaqayy9rx2ah80sxy24bbnng558"; + type = "gem"; + }; + version = "3.1.8"; }; cli-format = { dependencies = ["activesupport" "text-table" "zeitwerk"]; @@ -80,20 +100,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mr8vkw5zwb3flhhf8s923mi7r85g1ky0lmjz4q5xhwb48ji55qf"; + sha256 = "0rrjck5r25dlcg1gwz6pb5f4rllx77lg6a514a5l3lajfd95shm3"; type = "gem"; }; - version = "0.2.2"; + version = "0.6.1"; }; concurrent-ruby = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0krcwb6mn0iklajwngwsg850nk8k9b35dhmc2qkbdqvmifdi2y9q"; + sha256 = "0skwdasxq7mnlcccn6aqabl7n9r3jd7k19ryzlzzip64cn4x572g"; type = "gem"; }; - version = "1.2.2"; + version = "1.3.3"; + }; + connection_pool = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1x32mcpm2cl5492kd6lbjbaf17qsssmpx9kdyr7z1wcif2cwyh0g"; + type = "gem"; + }; + version = "2.4.1"; }; deep_merge = { groups = ["default"]; @@ -110,20 +140,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rwvjahnp7cpmracd8x732rjgnilqv2sx7d1gfrysslc3h039fa9"; + sha256 = "1znxccz83m4xgpd239nyqxlifdb7m8rlfayk6s259186nkgj6ci7"; type = "gem"; }; - version = "1.5.0"; + version = "1.5.1"; }; dotenv = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1n0pi8x8ql5h1mijvm8lgn6bhq4xjb5a500p5r1krq4s6j9lg565"; + sha256 = "0y24jabiz4cf9ni9vi4j8sab8b5phpf2mpw3981r0r94l4m6q0q8"; type = "gem"; }; - version = "2.8.1"; + version = "3.1.2"; + }; + drb = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0h5kbj9hvg5hb3c7l425zpds0vb42phvln2knab8nmazg2zp5m79"; + type = "gem"; + }; + version = "2.2.1"; }; dsl_evaluator = { dependencies = ["activesupport" "memoist" "rainbow" "zeitwerk"]; @@ -131,10 +171,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mck2j0gr851kj9l7pix97jmmwwazfjq83ryamx5rpdbgv5mrh51"; + sha256 = "0hd079baa5pfyyc2wc9p5h82qjp7fnx0s0shn2i19ig186cizh2x"; type = "gem"; }; - version = "0.3.1"; + version = "0.3.2"; }; eventmachine = { groups = ["default"]; @@ -162,10 +202,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10l1bdqc9yzdk6kqwh9vw918lyw846gpqw2z8kfcwl53zdjdzcl9"; + sha256 = "1bwssjgl9nfq9jhn9bfc7pqfl2c2xi0wnpng66l029m03kmdq8k4"; type = "gem"; }; - version = "2.11.0"; + version = "2.11.1"; }; hcl_parser = { dependencies = ["rhcl"]; @@ -184,10 +224,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qaamqsh5f3szhcakkak8ikxlzxqnv49n2p7504hcz2l0f4nj0wx"; + sha256 = "1ffix518y7976qih9k1lgnc17i3v6yrlh0a3mckpxdb4wc2vrp16"; type = "gem"; }; - version = "1.14.1"; + version = "1.14.5"; }; jmespath = { groups = ["default"]; @@ -214,20 +254,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0z7f38iq37h376n9xbl4gajdrnwzq284c9v1py4imw3gri2d5cj6"; + sha256 = "1q1f2sdw3y3y9mnym9dhjgsjr72sq975cfg5c4yx7gwv8nmzbvhk"; type = "gem"; }; - version = "2.8.2"; + version = "2.8.7"; }; minitest = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1kg9wh7jlc9zsr3hkhpzkbn0ynf4np5ap9m2d8xdrb8shy0y6pmb"; + sha256 = "0jj629q3vw5yn90q4di4dyb87pil4a8qfm2srhgy5nc8j2n33v1i"; + type = "gem"; + }; + version = "5.24.1"; + }; + mutex_m = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ma093ayps1m92q845hmpk0dmadicvifkbf05rpq9pifhin0rvxn"; type = "gem"; }; - version = "5.18.1"; + version = "0.2.0"; }; nokogiri = { dependencies = ["mini_portile2" "racc"]; @@ -235,20 +285,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jw8a20a9k05fpz3q24im19b97idss3179z76yn5scc5b8lk2rl7"; + sha256 = "1vz1ychq2fhfqjgqdrx8bqkaxg5dzcgwnah00m57ydylczfy8pwk"; type = "gem"; }; - version = "1.15.3"; + version = "1.16.6"; }; racc = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11v3l46mwnlzlc371wr3x6yylpgafgwdf0q7hc7c1lzx6r414r5g"; + sha256 = "021s7maw0c4d9a6s07vbmllrzqsj2sgmrwimlh8ffkvwqdjrld09"; type = "gem"; }; - version = "1.7.1"; + version = "1.8.0"; }; rainbow = { groups = ["default"]; @@ -272,14 +322,15 @@ version = "0.9.0"; }; rexml = { + dependencies = ["strscan"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53"; + sha256 = "0zr5qpa8lampaqzhdcjcvyqnrqcjl7439mqjlkjz43wdhmpnh4s5"; type = "gem"; }; - version = "3.2.5"; + version = "3.3.2"; }; rhcl = { dependencies = ["deep_merge"]; @@ -298,10 +349,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "171rc90vcgjl8p1bdrqa92ymrj8a87qf6w20x05xq29mljcigi6c"; + sha256 = "14xrp8vq6i9zx37vh0yp4h9m0anx9paw200l1r5ad9fmq559346l"; type = "gem"; }; - version = "3.12.0"; + version = "3.13.0"; }; rspec-core = { dependencies = ["rspec-support"]; @@ -309,10 +360,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0l95bnjxdabrn79hwdhn2q1n7mn26pj7y1w5660v5qi81x458nqm"; + sha256 = "0k252n7s80bvjvpskgfm285a3djjjqyjcarlh3aq7a4dx2s94xsm"; type = "gem"; }; - version = "3.12.2"; + version = "3.13.0"; }; rspec-expectations = { dependencies = ["diff-lcs" "rspec-support"]; @@ -320,10 +371,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05j44jfqlv7j2rpxb5vqzf9hfv7w8ba46wwgxwcwd8p0wzi1hg89"; + sha256 = "0022nxs9gqfhx35n4klibig770n0j31pnkd8anz00yvrvkdghk41"; type = "gem"; }; - version = "3.12.3"; + version = "3.13.1"; }; rspec-mocks = { dependencies = ["diff-lcs" "rspec-support"]; @@ -331,20 +382,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hfm17xakfvwya236graj6c2arr4sb9zasp35q5fykhyz8mhs0w2"; + sha256 = "0f3vgp43hajw716vmgjv6f4ar6f97zf50snny6y3fy9kkj4qjw88"; type = "gem"; }; - version = "3.12.5"; + version = "3.13.1"; }; rspec-support = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ky86j3ksi26ng9ybd7j0qsdf1lpr8mzrmn98yy9gzv801fvhsgr"; + sha256 = "03z7gpqz5xkw9rf53835pa8a9vgj4lic54rnix9vfwmp2m7pv1s8"; type = "gem"; }; - version = "3.12.1"; + version = "3.13.1"; }; rspec-terraspace = { dependencies = ["activesupport" "memoist" "rainbow" "rspec" "zeitwerk"]; @@ -367,16 +418,26 @@ }; version = "2.3.2"; }; + strscan = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0mamrl7pxacbc79ny5hzmakc9grbjysm3yy6119ppgsg44fsif01"; + type = "gem"; + }; + version = "3.1.0"; + }; terraspace = { dependencies = ["activesupport" "cli-format" "deep_merge" "dotenv" "dsl_evaluator" "eventmachine-tail" "graph" "hcl_parser" "memoist" "rainbow" "render_me_pretty" "rexml" "rspec-terraspace" "terraspace-bundler" "thor" "tty-tree" "zeitwerk" "zip_folder"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zhcdaiq0sgk2gcy4krkzm4qrvcaibkf5n755qgqgcp1f1b0w6gl"; + sha256 = "1zmnp71fwcj453cafmb8iicbk93flk98wh0wdk0q9xd3mgm3qh6x"; type = "gem"; }; - version = "2.2.8"; + version = "2.2.17"; }; terraspace-bundler = { dependencies = ["activesupport" "aws-sdk-s3" "dsl_evaluator" "memoist" "nokogiri" "rainbow" "rubyzip" "thor" "zeitwerk"]; @@ -404,20 +465,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0k7j2wn14h1pl4smibasw0bp66kg626drxb59z7rzflch99cd4rg"; + sha256 = "1vq1fjp45az9hfp6fxljhdrkv75cvbab1jfrwcw738pnsiqk8zps"; type = "gem"; }; - version = "1.2.2"; + version = "1.3.1"; }; tilt = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bmjgbv8158klwp2r3klxjwaj93nh1sbl4xvj9wsha0ic478avz7"; + sha256 = "0kds7wkxmb038cwp6ravnwn8k65ixc68wpm8j5jx5bhx8ndg4x6z"; type = "gem"; }; - version = "2.2.0"; + version = "2.4.0"; }; tty-tree = { groups = ["default"]; @@ -445,10 +506,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ck6bj7wa73dkdh13735jl06k6cfny98glxjkas82aivlmyzqqbk"; + sha256 = "08cfb35232p9s1r4jqv8wacv38vxh699mgbr9y03ga89gx9lipqp"; type = "gem"; }; - version = "2.6.8"; + version = "2.6.16"; }; zip_folder = { dependencies = ["rubyzip"]; diff --git a/pkgs/applications/networking/cluster/tfautomv/default.nix b/pkgs/applications/networking/cluster/tfautomv/default.nix index fc9dadbf37b6f..efabad7ed89b0 100644 --- a/pkgs/applications/networking/cluster/tfautomv/default.nix +++ b/pkgs/applications/networking/cluster/tfautomv/default.nix @@ -5,16 +5,19 @@ buildGoModule rec { pname = "tfautomv"; - version = "0.5.4"; + version = "0.6.2"; src = fetchFromGitHub { owner = "busser"; repo = pname; rev = "v${version}"; - hash = "sha256-irB0Kfd8eqIKq0ooJRxB0X4t2/1aFCNYRwaG6lAw3ic="; + hash = "sha256-qUeIbHJqxGkt2esMm4w6fM52ZE16jWnxugVXxqBh1Qc="; }; - vendorHash = "sha256-Wc5hpiHL5I01IodcHX0IzeKfthkFS7SuUxmaxOU6WkA="; + # checks require unfree programs like terraform/terragrunt + doCheck = false; + + vendorHash = "sha256-BZ8IhVPxZTPQXBotFBrxV3dfwvst0te8R84I/urq3gY="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/applications/networking/cluster/tfswitch/default.nix b/pkgs/applications/networking/cluster/tfswitch/default.nix index 1350ff921a2c5..a9994ef144ecb 100644 --- a/pkgs/applications/networking/cluster/tfswitch/default.nix +++ b/pkgs/applications/networking/cluster/tfswitch/default.nix @@ -1,16 +1,16 @@ { buildGoModule, lib, fetchFromGitHub }: buildGoModule rec { pname = "tfswitch"; - version = "1.0.2"; + version = "1.2.2"; src = fetchFromGitHub { owner = "warrensbox"; repo = "terraform-switcher"; - rev = version; - sha256 = "sha256-Gp7+TEE7rmlabZhley/crpYZiqiKcc6uqSr6leZsmgU="; + rev = "v${version}"; + sha256 = "sha256-Ym0ypMfoceOvje1z1oCxjnFrl1oosMFSplM7bhI0KXU="; }; - vendorHash = "sha256-DsC9djgt7Er2m2TacUldpJP43jC0IBklPnu41Saf4DY="; + vendorHash = "sha256-44A9fF+HIOJrlxpps6GV3yjPBqfpwOhEZ8Ejnp2o/wk="; # Disable tests since it requires network access and relies on the # presence of release.hashicorp.com diff --git a/pkgs/applications/networking/cluster/tftui/default.nix b/pkgs/applications/networking/cluster/tftui/default.nix index 9af694c683fd9..097476446676c 100644 --- a/pkgs/applications/networking/cluster/tftui/default.nix +++ b/pkgs/applications/networking/cluster/tftui/default.nix @@ -24,7 +24,6 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = with python3.pkgs; [ makeWrapper poetry-core - pythonRelaxDepsHook ]; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/applications/networking/cluster/tfupdate/default.nix b/pkgs/applications/networking/cluster/tfupdate/default.nix index 25a547402104c..e28cf36926149 100644 --- a/pkgs/applications/networking/cluster/tfupdate/default.nix +++ b/pkgs/applications/networking/cluster/tfupdate/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tfupdate"; - version = "0.8.2"; + version = "0.8.5"; src = fetchFromGitHub { owner = "minamijoyo"; repo = "tfupdate"; rev = "v${version}"; - sha256 = "sha256-RewBCiUNdXA30gwcnBu+wBoMNbVjaIWkCQV+Bat6l0o="; + sha256 = "sha256-iWiY1IuNZCqHpnAoib0SkWwAg1Mnuqr2QjKI3KZGYs0="; }; - vendorHash = "sha256-fs61aMsRGF2zmyLro5ySWi3P1qPPgvISTqCvuVWAvz0="; + vendorHash = "sha256-/ZNWVuGInZY/t0s317FQstEPeJpTKWMXUVo8cE44GkI="; # Tests start http servers which need to bind to local addresses: # panic: httptest: failed to listen on a port: listen tcp6 [::1]:0: bind: operation not permitted diff --git a/pkgs/applications/networking/cluster/tilt/assets.nix b/pkgs/applications/networking/cluster/tilt/assets.nix index 8fafcf666d8d2..a1edf18d594d3 100644 --- a/pkgs/applications/networking/cluster/tilt/assets.nix +++ b/pkgs/applications/networking/cluster/tilt/assets.nix @@ -1,46 +1,86 @@ { lib , stdenvNoCC -, version, src -, fetchYarnDeps -, fixup-yarn-lock, yarn, nodejs +, nodejs +, yarn-berry +, cacert +, version +, src }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation { pname = "tilt-assets"; + src = "${src}/web"; + inherit version; - inherit src version; + nativeBuildInputs = [ nodejs yarn-berry ]; - nativeBuildInputs = [ fixup-yarn-lock yarn nodejs ]; + yarnOfflineCache = stdenvNoCC.mkDerivation { + name = "tilt-assets-deps"; + src = "${src}/web"; - yarnOfflineCache = fetchYarnDeps { - yarnLock = "${src}/web/yarn.lock"; - hash = "sha256-0JpoAQKRmU7P1bzYNR/vqtPjOOSw8wSlNjXl2f6uBrw="; + nativeBuildInputs = [ yarn-berry ]; + + supportedArchitectures = builtins.toJSON { + os = [ "darwin" "linux" ]; + cpu = [ "arm" "arm64" "ia32" "x64" ]; + libc = [ "glibc" "musl" ]; + }; + + NODE_EXTRA_CA_CERTS = "${cacert}/etc/ssl/certs/ca-bundle.crt"; + + configurePhase = '' + runHook preConfigure + + export HOME="$NIX_BUILD_TOP" + export YARN_ENABLE_TELEMETRY=0 + + yarn config set enableGlobalCache false + yarn config set cacheFolder $out + yarn config set supportedArchitectures --json "$supportedArchitectures" + + runHook postConfigure + ''; + + buildPhase = '' + runHook preBuild + + mkdir -p $out + yarn install --immutable --mode skip-build + + runHook postBuild + ''; + + dontInstall = true; + + outputHashAlgo = "sha256"; + outputHash = "sha256-5f9lKRD6vc2FOnUeSxK/zlu/tshS1+RCSB0slGSO/Rc="; + outputHashMode = "recursive"; }; configurePhase = '' - export HOME=$(mktemp -d)/yarn_home + runHook preConfigure + + export HOME="$NIX_BUILD_TOP" + export YARN_ENABLE_TELEMETRY=0 + + yarn config set enableGlobalCache false + yarn config set cacheFolder $yarnOfflineCache + + runHook postConfigure ''; buildPhase = '' runHook preBuild - yarn config --offline set yarn-offline-mirror $yarnOfflineCache - - cd web - fixup-yarn-lock yarn.lock - yarn install --offline --frozen-lockfile --ignore-engines - patchShebangs node_modules - export PATH=$PWD/node_modules/.bin:$PATH - ./node_modules/.bin/react-scripts build - - mkdir -p $out - cd .. + yarn install --immutable --immutable-cache + yarn build runHook postBuild ''; installPhase = '' - cp -r web/build/* $out + mkdir -p $out + cp -r build/. $out/ ''; meta = with lib; { diff --git a/pkgs/applications/networking/cluster/tilt/default.nix b/pkgs/applications/networking/cluster/tilt/default.nix index 819d3dbc5095f..bb52c7e633012 100644 --- a/pkgs/applications/networking/cluster/tilt/default.nix +++ b/pkgs/applications/networking/cluster/tilt/default.nix @@ -5,13 +5,13 @@ let args = rec { /* Do not use "dev" as a version. If you do, Tilt will consider itself running in development environment and try to serve assets from the source tree, which is not there once build completes. */ - version = "0.33.10"; + version = "0.33.17"; src = fetchFromGitHub { owner = "tilt-dev"; repo = "tilt"; rev = "v${version}"; - hash = "sha256-LPb2tC3xIGhjiLYkTU+NBIUoqiicO2ORM6Nt1eTnwQs="; + hash = "sha256-GzWnTq3X615A/jRjYhBriRYaH4tjv+yg2/zHIJuKXPE="; }; }; diff --git a/pkgs/applications/networking/cluster/timoni/default.nix b/pkgs/applications/networking/cluster/timoni/default.nix index 482aa416f2d8a..965a5a5c9a75c 100644 --- a/pkgs/applications/networking/cluster/timoni/default.nix +++ b/pkgs/applications/networking/cluster/timoni/default.nix @@ -1,21 +1,21 @@ { lib -, buildGo122Module +, buildGoModule , fetchFromGitHub , installShellFiles }: -buildGo122Module rec { +buildGoModule 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/cluster/tubekit/wrapper.nix b/pkgs/applications/networking/cluster/tubekit/wrapper.nix index 7cba11c97a3af..d12f69adbfb9c 100644 --- a/pkgs/applications/networking/cluster/tubekit/wrapper.nix +++ b/pkgs/applications/networking/cluster/tubekit/wrapper.nix @@ -1,5 +1,4 @@ -{ lib -, runCommand +{ runCommand , makeWrapper , tubekit-unwrapped , pname ? "tubekit" diff --git a/pkgs/applications/networking/cluster/vcluster/default.nix b/pkgs/applications/networking/cluster/vcluster/default.nix deleted file mode 100644 index f475ba4fbd0c5..0000000000000 --- a/pkgs/applications/networking/cluster/vcluster/default.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ lib, go, buildGoModule, fetchFromGitHub, installShellFiles, testers, vcluster }: - -buildGoModule rec { - pname = "vcluster"; - version = "0.19.5"; - - src = fetchFromGitHub { - owner = "loft-sh"; - repo = "vcluster"; - rev = "v${version}"; - hash = "sha256-V+Y2LekBYlKZU53BsYCW6ADSMJOxkwSK9hbFGXBaa9o="; - }; - - vendorHash = null; - - subPackages = [ "cmd/vclusterctl" ]; - - ldflags = [ - "-s" "-w" - "-X main.version=${version}" - "-X main.goVersion=${lib.getVersion go}" - ]; - - nativeBuildInputs = [ installShellFiles ]; - - # Test is disabled because e2e tests expect k8s. - doCheck = false; - - installPhase = '' - runHook preInstall - mkdir -p $out/bin - install -Dm755 "$GOPATH/bin/vclusterctl" -T $out/bin/vcluster - runHook postInstall - ''; - - postInstall = '' - installShellCompletion --cmd vcluster \ - --bash <($out/bin/vcluster completion bash) \ - --fish <($out/bin/vcluster completion fish) \ - --zsh <($out/bin/vcluster completion zsh) - ''; - - passthru.tests.version = testers.testVersion { - package = vcluster; - command = "vcluster --version"; - }; - - meta = { - changelog = "https://github.com/loft-sh/vcluster/releases/tag/v${version}"; - description = "Create fully functional virtual Kubernetes clusters"; - downloadPage = "https://github.com/loft-sh/vcluster"; - homepage = "https://www.vcluster.com/"; - license = lib.licenses.asl20; - mainProgram = "vcluster"; - maintainers = with lib.maintainers; [ berryp peterromfeldhk qjoly superherointj ]; - }; -} diff --git a/pkgs/applications/networking/cluster/velero/default.nix b/pkgs/applications/networking/cluster/velero/default.nix deleted file mode 100644 index 509b5aa5576e5..0000000000000 --- a/pkgs/applications/networking/cluster/velero/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles }: - -buildGoModule rec { - pname = "velero"; - version = "1.14.0"; - - - src = fetchFromGitHub { - owner = "vmware-tanzu"; - repo = "velero"; - rev = "v${version}"; - sha256 = "sha256-1jhhZosrU2zTlgMhM7vJ2kLpO+BITPdUo0t3rcbDYjg="; - }; - - ldflags = [ - "-s" "-w" - "-X github.com/vmware-tanzu/velero/pkg/buildinfo.Version=v${version}" - "-X github.com/vmware-tanzu/velero/pkg/buildinfo.ImageRegistry=velero" - "-X github.com/vmware-tanzu/velero/pkg/buildinfo.GitTreeState=clean" - "-X github.com/vmware-tanzu/velero/pkg/buildinfo.GitSHA=none" - ]; - - vendorHash = "sha256-J0fYfSbxL4R1ac6ezM03e1+J8n7+CRSujVU6XDCyPU4="; - - excludedPackages = [ "issue-template-gen" "release-tools" "v1" "velero-restic-restore-helper" ]; - - doCheck = false; # Tests expect a running cluster see https://github.com/vmware-tanzu/velero/tree/main/test/e2e - doInstallCheck = true; - installCheckPhase = '' - $out/bin/velero version --client-only | grep ${version} > /dev/null - ''; - - nativeBuildInputs = [ installShellFiles ]; - postInstall = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' - $out/bin/velero completion bash > velero.bash - $out/bin/velero completion zsh > velero.zsh - installShellCompletion velero.{bash,zsh} - ''; - - meta = with lib; { - description = - "A utility for managing disaster recovery, specifically for your Kubernetes cluster resources and persistent volumes"; - homepage = "https://velero.io/"; - changelog = - "https://github.com/vmware-tanzu/velero/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = [ maintainers.mbode maintainers.bryanasdev000 ]; - }; -} diff --git a/pkgs/applications/networking/cluster/waagent/default.nix b/pkgs/applications/networking/cluster/waagent/default.nix deleted file mode 100644 index 294440d820e1d..0000000000000 --- a/pkgs/applications/networking/cluster/waagent/default.nix +++ /dev/null @@ -1,76 +0,0 @@ -{ bash -, coreutils -, fetchFromGitHub -, lib -, python39 -, substituteAll -}: - -let - inherit (lib) makeBinPath; - # the latest python version that waagent test against according to https://github.com/Azure/WALinuxAgent/blob/28345a55f9b21dae89472111635fd6e41809d958/.github/workflows/ci_pr.yml#L75 - python = python39; - -in -python.pkgs.buildPythonApplication rec { - pname = "waagent"; - version = "2.11.1.4"; - src = fetchFromGitHub { - owner = "Azure"; - repo = "WALinuxAgent"; - rev = "refs/tags/v${version}"; - sha256 = "sha256-5V9js9gGkIsdGYrQQK/V6tPfL9lh2Cht4llOKBVTyOM="; - }; - patches = [ - # Suppress the following error when waagent tries to configure sshd: - # Read-only file system: '/etc/ssh/sshd_config' - ./dont-configure-sshd.patch - ]; - doCheck = false; - - # azure-product-uuid chmod rule invokes chmod to change the mode of - # product_uuid (which is not a device itself). - # Replace this with an absolute path. - postPatch = '' - substituteInPlace config/99-azure-product-uuid.rules \ - --replace "/bin/chmod" "${coreutils}/bin/chmod" - ''; - - propagatedBuildInputs = [ python.pkgs.distro ]; - - # The udev rules are placed to the wrong place. - # Move them to their default location. - # Keep $out/${python.sitePackages}/usr/sbin/waagent where it is. - # waagent re-executes itself in UpdateHandler.run_latest, even if autoupdate - # is disabled, manually spawning a python interprever with argv0. - # We can't use the default python program wrapping mechanism, as it uses - # wrapProgram which doesn't support --argv0. - # So instead we make our own wrapper in $out/bin/waagent, setting PATH and - # PYTHONPATH. - # PATH contains our PYTHON, and PYTHONPATH stays set, so this should somewhat - # still work. - preFixup = '' - mv $out/${python.sitePackages}/etc $out/ - - buildPythonPath - - mkdir -p $out/bin - makeWrapper $out/${python.sitePackages}/usr/sbin/waagent $out/bin/waagent \ - --set PYTHONPATH $PYTHONPATH \ - --prefix PATH : $program_PATH \ - --argv0 $out/${python.sitePackages}/usr/sbin/waagent - ''; - - dontWrapPythonPrograms = false; - - meta = { - description = "Microsoft Azure Linux Agent (waagent)"; - mainProgram = "waagent"; - longDescription = '' - The Microsoft Azure Linux Agent (waagent) - manages Linux provisioning and VM interaction with the Azure - Fabric Controller''; - homepage = "https://github.com/Azure/WALinuxAgent"; - license = with lib.licenses; [ asl20 ]; - }; -} diff --git a/pkgs/applications/networking/cluster/waagent/dont-configure-sshd.patch b/pkgs/applications/networking/cluster/waagent/dont-configure-sshd.patch deleted file mode 100644 index 9068f4a3ddd30..0000000000000 --- a/pkgs/applications/networking/cluster/waagent/dont-configure-sshd.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 383e7c826906baedcd12ae7c20a4a5d4b32b104a Mon Sep 17 00:00:00 2001 -From: "Yang, Bo" <bo@preemo.io> -Date: Wed, 8 Nov 2023 23:08:07 +0000 -Subject: [PATCH] Don't configure sshd - ---- - azurelinuxagent/pa/provision/default.py | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/azurelinuxagent/pa/provision/default.py b/azurelinuxagent/pa/provision/default.py -index 91fe04edab..48edf01490 100644 ---- a/azurelinuxagent/pa/provision/default.py -+++ b/azurelinuxagent/pa/provision/default.py -@@ -237,9 +237,6 @@ def config_user_account(self, ovfenv): - self.osutil.conf_sudoer(ovfenv.username, - nopasswd=ovfenv.user_password is None) - -- logger.info("Configure sshd") -- self.osutil.conf_sshd(ovfenv.disable_ssh_password_auth) -- - self.deploy_ssh_pubkeys(ovfenv) - self.deploy_ssh_keypairs(ovfenv) - diff --git a/pkgs/applications/networking/cluster/weave-gitops/default.nix b/pkgs/applications/networking/cluster/weave-gitops/default.nix index f3bc732b764c0..f26371d647117 100644 --- a/pkgs/applications/networking/cluster/weave-gitops/default.nix +++ b/pkgs/applications/networking/cluster/weave-gitops/default.nix @@ -31,7 +31,7 @@ buildGoModule rec { description = "Weave Gitops CLI"; license = licenses.mpl20; platforms = platforms.linux; - maintainers = with maintainers; [ nullx76 ]; + maintainers = [ ]; mainProgram = "gitops"; }; } diff --git a/pkgs/applications/networking/cluster/yor/default.nix b/pkgs/applications/networking/cluster/yor/default.nix index 2e941997f77d0..27e875c76c316 100644 --- a/pkgs/applications/networking/cluster/yor/default.nix +++ b/pkgs/applications/networking/cluster/yor/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "yor"; - version = "0.1.194"; + version = "0.1.199"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = version; - hash = "sha256-8JkxCkDYalu3IMoGbyNOEJ28CgU87gTq0bX+o+5sV2Q="; + hash = "sha256-VQzaSWVf8n7/PHW4d0Vu1LBbPjB7EjvJrDp5w2fbl34="; }; vendorHash = "sha256-uT/jGD4hDVes4h+mlSIT2p+C9TjxnUWsmKv9haPjjLc="; diff --git a/pkgs/applications/networking/cluster/zarf/default.nix b/pkgs/applications/networking/cluster/zarf/default.nix index e580dd7e6ff27..5f030b872f690 100644 --- a/pkgs/applications/networking/cluster/zarf/default.nix +++ b/pkgs/applications/networking/cluster/zarf/default.nix @@ -1,22 +1,26 @@ { lib , buildGoModule , fetchFromGitHub +, installShellFiles +, stdenv }: buildGoModule rec { pname = "zarf"; - version = "0.34.0"; + version = "0.39.0"; src = fetchFromGitHub { owner = "defenseunicorns"; repo = "zarf"; rev = "v${version}"; - hash = "sha256-o3sfvzUCCW7hwNDrWH1IiRyZHkVnxffJdLS8BqzD5Ng="; + hash = "sha256-ATC+eoM3B21iG/ih31vlxBjnJ6zwmuxOLiw4nHKTp4o="; }; - vendorHash = "sha256-Co9xKC7J0WGoaYxa+YukrP+6aOuhweZyXaH5wD97ioA="; + vendorHash = "sha256-7G+gROPw8Ab6iGMr7vnmC7jAm7jLPd5pbLOkKqDKIDc="; proxyVendor = true; + nativeBuildInputs = [ installShellFiles ]; + preBuild = '' mkdir -p build/ui touch build/ui/index.html @@ -26,6 +30,14 @@ buildGoModule rec { ldflags = [ "-s" "-w" "-X" "github.com/defenseunicorns/zarf/src/config.CLIVersion=${src.rev}" "-X" "k8s.io/component-base/version.gitVersion=v0.0.0+zarf${src.rev}" "-X" "k8s.io/component-base/version.gitCommit=${src.rev}" "-X" "k8s.io/component-base/version.buildDate=1970-01-01T00:00:00Z" ]; + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + export K9S_LOGS_DIR=$(mktemp -d) + installShellCompletion --cmd zarf \ + --bash <($out/bin/zarf completion --no-log-file bash) \ + --fish <($out/bin/zarf completion --no-log-file fish) \ + --zsh <($out/bin/zarf completion --no-log-file zsh) + ''; + meta = with lib; { description = "DevSecOps for Air Gap & Limited-Connection Systems. https://zarf.dev"; mainProgram = "zarf"; diff --git a/pkgs/applications/networking/compactor/default.nix b/pkgs/applications/networking/compactor/default.nix index 12e6f432c5bdc..88f0b34fd27cf 100644 --- a/pkgs/applications/networking/compactor/default.nix +++ b/pkgs/applications/networking/compactor/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { ]; enableParallelBuilding = true; - doCheck = !stdenv.isDarwin; # check-dnstap.sh failing on Darwin + doCheck = !stdenv.hostPlatform.isDarwin; # check-dnstap.sh failing on Darwin nativeCheckInputs = [ cbor-diag cddl diff --git a/pkgs/applications/networking/coreth/default.nix b/pkgs/applications/networking/coreth/default.nix index 2f4db7dcd5c16..242c6da0424c2 100644 --- a/pkgs/applications/networking/coreth/default.nix +++ b/pkgs/applications/networking/coreth/default.nix @@ -1,24 +1,23 @@ { buildGoModule , fetchFromGitHub , lib -, stdenv }: buildGoModule rec { pname = "coreth"; - version = "0.13.5"; + version = "0.13.8"; src = fetchFromGitHub { owner = "ava-labs"; repo = pname; rev = "v${version}"; - hash = "sha256-cnxNIFf0zCpbUg9G+bHNoApxB31O7RH5BVgprYN2GYk="; + hash = "sha256-TR4c+7VUHoxZfLCOip7WqjOQFFxGyg+36FUaNw0Sc9k="; }; # go mod vendor has a bug, see: golang/go#57529 proxyVendor = true; - vendorHash = "sha256-IVmz+2pWHsiZOhHKEK9GW9zZq8m1IH5lpfKeClnmc3o="; + vendorHash = "sha256-41r6tsrHw533ygvS3G2OQA9wsVXVxJi96DVu6stBq3c="; ldflags = [ "-s" diff --git a/pkgs/applications/networking/cyberduck/default.nix b/pkgs/applications/networking/cyberduck/default.nix index 2fb9664437182..cec9f93214dfb 100644 --- a/pkgs/applications/networking/cyberduck/default.nix +++ b/pkgs/applications/networking/cyberduck/default.nix @@ -1,17 +1,18 @@ -{ lib -, stdenvNoCC -, fetchurl -, unzip +{ + lib, + stdenvNoCC, + fetchurl, + unzip, }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "cyberduck"; - version = "8.6.0.39818"; + version = "9.0.0.41777"; src = fetchurl { url = "https://update.cyberduck.io/Cyberduck-${finalAttrs.version}.zip"; - sha256 = "1iqq54n267lmmdlv8wmr9k461p49jindc1mn5wy742k08cqxc5ab"; + hash = "sha256-oDTFkoX4uu+X5vLDHn+tGoNB/Pd9ncdFE8dGS6PT5wg="; }; - dontUnpack = true; + sourceRoot = "."; nativeBuildInputs = [ unzip ]; @@ -19,7 +20,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { runHook preInstall mkdir -p $out/Applications - unzip -d $out/Applications $src + cp -r Cyberduck.app $out/Applications runHook postInstall ''; @@ -29,7 +30,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { homepage = "https://cyberduck.io"; license = licenses.gpl3Plus; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - maintainers = with maintainers; [ emilytrau Enzime ]; + maintainers = with maintainers; [ emilytrau ]; platforms = platforms.darwin; }; }) diff --git a/pkgs/applications/networking/datovka/default.nix b/pkgs/applications/networking/datovka/default.nix index da61b2684067c..b445676ca378c 100644 --- a/pkgs/applications/networking/datovka/default.nix +++ b/pkgs/applications/networking/datovka/default.nix @@ -12,11 +12,11 @@ mkDerivation rec { pname = "datovka"; - version = "4.24.0"; + version = "4.24.1"; src = fetchurl { url = "https://gitlab.nic.cz/datovka/datovka/-/archive/v${version}/datovka-v${version}.tar.gz"; - sha256 = "sha256-6Bd6IeuCXVnK8ZPgU9FOSNqoYf3ZNpkSBC+cR5JU9AQ="; + sha256 = "sha256-/thevIj3nliVkkFGQ0fr6qAprkNj1FgHsXx7Wmn10xI="; }; buildInputs = [ libdatovka qmake qtbase qtsvg libxml2 qtwebsockets ]; diff --git a/pkgs/applications/networking/deck/default.nix b/pkgs/applications/networking/deck/default.nix deleted file mode 100644 index f35b1e909bb81..0000000000000 --- a/pkgs/applications/networking/deck/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ buildGoModule, lib, installShellFiles, fetchFromGitHub }: - -buildGoModule rec { - pname = "deck"; - version = "1.38.0"; - - src = fetchFromGitHub { - owner = "Kong"; - repo = "deck"; - rev = "v${version}"; - hash = "sha256-9bEPkEeKOVFETSo5HEFWbuhx7+mWwogGm1jN18Vj/Sw="; - }; - - nativeBuildInputs = [ installShellFiles ]; - - CGO_ENABLED = 0; - - ldflags = [ - "-s -w -X github.com/kong/deck/cmd.VERSION=${version}" - "-X github.com/kong/deck/cmd.COMMIT=${src.rev}" - ]; - - proxyVendor = true; # darwin/linux hash mismatch - vendorHash = "sha256-eWDnZNNXgvIiDiKEpkVEL/JpEfy7WKtSAUA6riCrMdc="; - - postInstall = '' - installShellCompletion --cmd deck \ - --bash <($out/bin/deck completion bash) \ - --fish <($out/bin/deck completion fish) \ - --zsh <($out/bin/deck completion zsh) - ''; - - meta = with lib; { - description = "Configuration management and drift detection tool for Kong"; - homepage = "https://github.com/Kong/deck"; - license = licenses.asl20; - maintainers = with maintainers; [ liyangau ]; - }; -} diff --git a/pkgs/applications/networking/discordo/default.nix b/pkgs/applications/networking/discordo/default.nix index 9841eb6de2f26..b7b7f0ad53344 100644 --- a/pkgs/applications/networking/discordo/default.nix +++ b/pkgs/applications/networking/discordo/default.nix @@ -3,16 +3,16 @@ buildGoModule rec { pname = "discordo"; - version = "0-unstable-2024-04-27"; + version = "0-unstable-2024-07-02"; src = fetchFromGitHub { owner = "ayn2op"; repo = pname; - rev = "d76a7db668900a7fc41ead7db194e20f126071ac"; - hash = "sha256-uEMz7n0IFTGK1fZC1/vuwJpyySGdTUIMUjunCmycnzM="; + rev = "31905f3e790e63cd0f2366526afe41fb278c226e"; + hash = "sha256-IhGZGHV/A1m653WlVCwxtb9OZbMolQ3GHOr2fXehjNk="; }; - vendorHash = "sha256-hSrGN3NHPpp5601l4KcmNHVYOGWfLjFeWWr9g11nM3I="; + vendorHash = "sha256-5ZsvoIDwxZCGkMRxlCyp2Iv6fcvvpmzG+krz3MZSiTM="; CGO_ENABLED = 0; diff --git a/pkgs/applications/networking/diswall/default.nix b/pkgs/applications/networking/diswall/default.nix index 6afe93fee4712..356f8f622c350 100644 --- a/pkgs/applications/networking/diswall/default.nix +++ b/pkgs/applications/networking/diswall/default.nix @@ -5,20 +5,20 @@ let in rustPlatform.buildRustPackage rec { pname = "diswall"; - version = "0.5.2"; + version = "0.5.3"; src = fetchFromGitHub { owner = "dis-works"; repo = "diswall-rs"; rev = "v${version}"; - sha256 = "sha256-HoIkozwRV0xz14mOTM4BXDzPShRAp8a3quhvtWwnQ2I="; + sha256 = "sha256-iZln/cgYGSFYwXDvD1CkQdfwBDXj897X1il1m5HfFJs="; }; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; - cargoHash = "sha256-KA2hwaEhY2G+H4+xVgin6xhmRfnGcJBBWj9xWtD0h9I="; + cargoHash = "sha256-5PPI7fnG71xkQCY+OLLk83XZb+4DoPX81bAtKRp/H8U="; doCheck = false; diff --git a/pkgs/applications/networking/dnscontrol/default.nix b/pkgs/applications/networking/dnscontrol/default.nix index 832133082f778..e8a09f4e73012 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.13.0"; src = fetchFromGitHub { owner = "StackExchange"; repo = "dnscontrol"; rev = "v${version}"; - hash = "sha256-W1X/d2Xf31xQWZH7ShH8Y6axhhyTOqxE/EjxNvR6pBU="; + hash = "sha256-qDCt1Ld3xHPexpCv/0SbvQwGhWE46cVX3BJ0PoBsKcA="; }; - vendorHash = "sha256-Dz45h33Rv4Pf5Lo0aok37MNrcbT8f/xrPPkGJMNBo8Y="; + vendorHash = "sha256-qEIvxQ4PRtDWyIw3MWmyXV4HLraCLSglHivlV7UJ9jM="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/drive/default.nix b/pkgs/applications/networking/drive/default.nix index e8b62033f350b..c28b48bba1639 100644 --- a/pkgs/applications/networking/drive/default.nix +++ b/pkgs/applications/networking/drive/default.nix @@ -29,7 +29,7 @@ buildGoModule rec { homepage = "https://github.com/odeke-em/drive"; description = "Google Drive client for the commandline"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; mainProgram = "drive"; }; } diff --git a/pkgs/applications/networking/dropbox/cli.nix b/pkgs/applications/networking/dropbox/cli.nix index a922d70cd68fd..10e133ac4cab5 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 = [ @@ -67,7 +67,7 @@ stdenv.mkDerivation { description = "Command line client for the dropbox daemon"; license = lib.licenses.gpl3Plus; mainProgram = "dropbox"; - maintainers = with lib.maintainers; [ eclairevoyant ]; + maintainers = with lib.maintainers; [ ]; # NOTE: Dropbox itself only works on linux, so this is ok. platforms = lib.platforms.linux; }; diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index fd48bc86a9b85..303678bbe3fb8 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -7,7 +7,7 @@ assert lib.elem stdenv.hostPlatform.system platforms; # Dropbox client to bootstrap installation. # The client is self-updating, so the actual version may be newer. let - version = "185.4.6054"; + version = "206.3.6386"; arch = { x86_64-linux = "x86_64"; @@ -15,9 +15,7 @@ let }.${stdenv.hostPlatform.system}; installer = "https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.${arch}-${version}.tar.gz"; -in -let desktopItem = makeDesktopItem { name = "dropbox"; exec = "dropbox"; @@ -33,6 +31,12 @@ in buildFHSEnv { name = "dropbox"; + # The dropbox-cli command `dropbox start` starts the dropbox daemon in a + # separate session, and wants the daemon to outlive the launcher. Enabling + # `--die-with-parent` defeats this and causes the daemon to exit when + # dropbox-cli exits. + dieWithParent = false; + # dropbox-cli (i.e. nautilus-dropbox) needs the PID to confirm dropbox is running. # Dropbox's internal limit-to-one-instance check also relies on the PID. unsharePid = false; @@ -84,7 +88,7 @@ buildFHSEnv { description = "Online stored folders (daemon version)"; homepage = "http://www.dropbox.com/"; license = licenses.unfree; - maintainers = with maintainers; [ eclairevoyant ttuegel ]; + maintainers = with maintainers; [ ttuegel ]; platforms = [ "i686-linux" "x86_64-linux" ]; mainProgram = "dropbox"; }; 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/dyndns/dyndnsc/default.nix b/pkgs/applications/networking/dyndns/dyndnsc/default.nix index 930fc34603192..a4c84ee7e76a6 100644 --- a/pkgs/applications/networking/dyndns/dyndnsc/default.nix +++ b/pkgs/applications/networking/dyndns/dyndnsc/default.nix @@ -24,7 +24,6 @@ python3Packages.buildPythonApplication rec { build-system = with python3Packages; [ setuptools ]; - nativeBuildInputs = with python3Packages; [ pythonRelaxDepsHook ]; dependencies = with python3Packages; [ daemonocle @@ -49,7 +48,7 @@ python3Packages.buildPythonApplication rec { # AssertionError "test_null_dummy" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # The tests that spawn a server using Bottle cannot be run on # macOS or Windows as the default multiprocessing start method # on those platforms is 'spawn', which requires the code to be @@ -76,7 +75,7 @@ python3Packages.buildPythonApplication rec { homepage = "https://github.com/infothrill/python-dyndnsc"; changelog = "https://github.com/infothrill/python-dyndnsc/releases/tag/${version}"; license = licenses.mit; - maintainers = with maintainers; [ AluisioASG ]; + maintainers = [ ]; mainProgram = "dyndnsc"; platforms = platforms.unix; }; diff --git a/pkgs/applications/networking/errbot/default.nix b/pkgs/applications/networking/errbot/default.nix index c94bbc8780188..cf8897b444f2f 100644 --- a/pkgs/applications/networking/errbot/default.nix +++ b/pkgs/applications/networking/errbot/default.nix @@ -5,7 +5,7 @@ python3.pkgs.buildPythonApplication rec { pname = "errbot"; - version = "6.1.9"; + version = "6.2.0"; format = "setuptools"; @@ -13,13 +13,9 @@ python3.pkgs.buildPythonApplication rec { owner = "errbotio"; repo = "errbot"; rev = version; - hash = "sha256-BmHChLWWnrtg0p4WH8bANwpo+p4RTwjYbXfyPnz6mp8="; + hash = "sha256-UdqzBrlcb9NkuVo8ChADJmaKevadoGLyZUrckStb5ko="; }; - nativeBuildInputs = with python3.pkgs; [ - pythonRelaxDepsHook - ]; - pythonRelaxDeps = true; propagatedBuildInputs = with python3.pkgs; [ @@ -56,6 +52,7 @@ python3.pkgs.buildPythonApplication rec { "test_backup" "test_broken_plugin" "test_plugin_cycle" + "test_entrypoint_paths" ]; pythonImportsCheck = [ "errbot" ]; @@ -64,7 +61,7 @@ python3.pkgs.buildPythonApplication rec { changelog = "https://github.com/errbotio/errbot/blob/${version}/CHANGES.rst"; description = "Chatbot designed to be simple to extend with plugins written in Python"; homepage = "http://errbot.io/"; - maintainers = with maintainers; [ ]; + maintainers = [ ]; license = licenses.gpl3Plus; platforms = platforms.linux; # flaky on darwin, "RuntimeError: can't start new thread" diff --git a/pkgs/applications/networking/feedreaders/feed2imap-go/default.nix b/pkgs/applications/networking/feedreaders/feed2imap-go/default.nix index 806e4fc147e00..d34eecd9e2d30 100644 --- a/pkgs/applications/networking/feedreaders/feed2imap-go/default.nix +++ b/pkgs/applications/networking/feedreaders/feed2imap-go/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "feed2imap-go"; - version = "1.7.0"; + version = "1.7.2"; src = fetchFromGitHub { owner = "Necoro"; repo = "feed2imap-go"; rev = "v${version}"; - sha256 = "sha256-Qtpg8DvIFkba+Do8IwemBF0rt85wS4Tq7yOLsdpQFCs="; + sha256 = "sha256-LMtuGrNRVG3/2cgZFS7YlVmassbWDhH/nQgPh08NmpA="; }; ldflags = [ @@ -17,7 +17,7 @@ buildGoModule rec { "-X github.com/Necoro/feed2imap-go/pkg/version.commit=nixpkgs" ]; - vendorHash = "sha256-WFbfSzU1N2RAOMfCM7wqiAQ6R1HRaT0EfX4KYhstHJU="; + vendorHash = "sha256-3J9fd/ogClQ+1a2ORahwf+JwkC4b1+pR1vdVjwLutoY="; # The print-cache tool is not an end-user tool (https://github.com/Necoro/feed2imap-go/issues/94) postInstall = '' diff --git a/pkgs/applications/networking/feedreaders/newsboat/default.nix b/pkgs/applications/networking/feedreaders/newsboat/default.nix deleted file mode 100644 index 5d0249249478b..0000000000000 --- a/pkgs/applications/networking/feedreaders/newsboat/default.nix +++ /dev/null @@ -1,70 +0,0 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, stfl, sqlite, curl, gettext, pkg-config, libxml2, json_c, ncurses -, asciidoctor, libiconv, Security, Foundation, makeWrapper, nix-update-script }: - -rustPlatform.buildRustPackage rec { - pname = "newsboat"; - version = "2.36"; - - src = fetchFromGitHub { - owner = "newsboat"; - repo = "newsboat"; - rev = "r${version}"; - hash = "sha256-RnDnyRAZ71aE5st5wUcUKjFFGY288oFpiyDXAno15MQ="; - }; - - cargoHash = "sha256-0z3G8j0Qk0HEDUKA7fmjFfNW956rRtzKO+0ltNQR4es="; - - # TODO: Check if that's still needed - postPatch = lib.optionalString stdenv.isDarwin '' - # Allow other ncurses versions on Darwin - substituteInPlace config.sh \ - --replace "ncurses5.4" "ncurses" - ''; - - nativeBuildInputs = [ - pkg-config - asciidoctor - gettext - ] ++ lib.optionals stdenv.isDarwin [ makeWrapper ncurses ]; - - buildInputs = [ stfl sqlite curl libxml2 json_c ncurses ] - ++ lib.optionals stdenv.isDarwin [ Security Foundation libiconv gettext ]; - - postBuild = '' - make -j $NIX_BUILD_CORES prefix="$out" - ''; - - # https://github.com/NixOS/nixpkgs/pull/98471#issuecomment-703100014 . We set - # these for all platforms, since upstream's gettext crate behavior might - # change in the future. - GETTEXT_LIB_DIR = "${lib.getLib gettext}/lib"; - GETTEXT_INCLUDE_DIR = "${lib.getDev gettext}/include"; - GETTEXT_BIN_DIR = "${lib.getBin gettext}/bin"; - - doCheck = true; - - preCheck = '' - make -j $NIX_BUILD_CORES test - ''; - - postInstall = '' - make -j $NIX_BUILD_CORES prefix="$out" install - '' + lib.optionalString stdenv.isDarwin '' - for prog in $out/bin/*; do - wrapProgram "$prog" --prefix DYLD_LIBRARY_PATH : "${stfl}/lib" - done - ''; - - passthru = { - updateScript = nix-update-script { }; - }; - - meta = { - homepage = "https://newsboat.org/"; - changelog = "https://github.com/newsboat/newsboat/blob/${src.rev}/CHANGELOG.md"; - description = "Fork of Newsbeuter, an RSS/Atom feed reader for the text console"; - maintainers = with lib.maintainers; [ dotlambda nicknovitski ]; - license = lib.licenses.mit; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/applications/networking/feedreaders/newsflash/Cargo.lock b/pkgs/applications/networking/feedreaders/newsflash/Cargo.lock index 68d085655d13e..cb8dd85b7a6a4 100644 --- a/pkgs/applications/networking/feedreaders/newsflash/Cargo.lock +++ b/pkgs/applications/networking/feedreaders/newsflash/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "addr2line" -version = "0.21.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +checksum = "f5fb1d8e4442bd405fdfd1dacb42792696b0cf9cb15882e5d097b742a676d375" dependencies = [ "gimli", ] @@ -18,6 +18,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] +name = "adler2" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" + +[[package]] name = "aes" version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -89,9 +95,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.86" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" +checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" [[package]] name = "arbitrary" @@ -113,20 +119,19 @@ checksum = "0ae92a5119aa49cdbcf6b9f893fe4e1d98b04ccbf82ee0584ad948a44a734dea" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] name = "arrayvec" -version = "0.7.4" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" +checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" [[package]] name = "article_scraper" version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2f3fa375ebee9245309680ef4b2178782a9ac5e7b1f7bf869cff93f8f3c55c6" +source = "git+https://gitlab.com/news-flash/article_scraper.git#b3ce28632dab8678ae04789aeae76262283b1bb0" dependencies = [ "base64 0.22.1", "chrono", @@ -142,14 +147,15 @@ dependencies = [ "rust-embed", "thiserror", "tokio", + "unic-emoji-char", "url", ] [[package]] name = "ashpd" -version = "0.8.1" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd884d7c72877a94102c3715f3b1cd09ff4fac28221add3e57cfbe25c236d093" +checksum = "bfe7e0dd0ac5a401dc116ed9f9119cf9decc625600474cb41f0fc0a0050abc9a" dependencies = [ "async-fs", "async-net", @@ -165,12 +171,12 @@ dependencies = [ [[package]] name = "async-broadcast" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "258b52a1aa741b9f09783b2d86cf0aeeb617bbf847f6933340a39644227acbdb" +checksum = "20cd0e2e25ea8e5f7e9df04578dc6cf5c83577fd09b1a46aaf5c85e1c33f2a7e" dependencies = [ - "event-listener 5.3.0", - "event-listener-strategy 0.5.2", + "event-listener", + "event-listener-strategy", "futures-core", "pin-project-lite", ] @@ -182,16 +188,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-compression" -version = "0.4.10" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c90a406b4495d129f00461241616194cb8a032c8d1c53c657f0961d5f8e0498" +checksum = "fec134f64e2bc57411226dfc4e52dec859ddfc7e711fc5e07b612584f000e4aa" dependencies = [ "brotli", "flate2", @@ -203,9 +209,9 @@ dependencies = [ [[package]] name = "async-executor" -version = "1.12.0" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8828ec6e544c02b0d6691d21ed9f9218d0384a82542855073c2a3f58304aaf0" +checksum = "30ca9a001c1e8ba5149f91a74362376cc6bc5b919d92d988668657bd570bdcec" dependencies = [ "async-task", "concurrent-queue", @@ -227,9 +233,9 @@ dependencies = [ [[package]] name = "async-io" -version = "2.3.2" +version = "2.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcccb0f599cfa2f8ace422d3555572f47424da5648a4382a9dd0310ff8210884" +checksum = "444b0228950ee6501b3568d3c93bf1176a1fdbc3b758dcd9475046d30f4dc7e8" dependencies = [ "async-lock", "cfg-if", @@ -241,17 +247,17 @@ dependencies = [ "rustix", "slab", "tracing", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[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", + "event-listener-strategy", "pin-project-lite", ] @@ -268,9 +274,9 @@ dependencies = [ [[package]] name = "async-process" -version = "2.2.2" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a53fc6301894e04a92cb2584fedde80cb25ba8e02d9dc39d4a87d036e22f397d" +checksum = "63255f1dc2381611000436537bbedfe83183faa303a5a0edaf191edef06526bb" dependencies = [ "async-channel", "async-io", @@ -279,11 +285,10 @@ dependencies = [ "async-task", "blocking", "cfg-if", - "event-listener 5.3.0", + "event-listener", "futures-lite", "rustix", "tracing", - "windows-sys 0.52.0", ] [[package]] @@ -294,14 +299,14 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] name = "async-signal" -version = "0.2.6" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afe66191c335039c7bb78f99dc7520b0cbb166b3a1cb33a03f53d8a1c6f2afda" +checksum = "637e00349800c0bdf8bfc21ebbc0b6524abea702b0da4168ac00d070d0c0b9f3" dependencies = [ "async-io", "async-lock", @@ -312,7 +317,7 @@ dependencies = [ "rustix", "signal-hook-registry", "slab", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -323,13 +328,13 @@ checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" [[package]] name = "async-trait" -version = "0.1.80" +version = "0.1.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" +checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] @@ -369,17 +374,17 @@ dependencies = [ [[package]] name = "backtrace" -version = "0.3.71" +version = "0.3.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" +checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a" dependencies = [ "addr2line", - "cc", "cfg-if", "libc", - "miniz_oxide", + "miniz_oxide 0.8.0", "object", "rustc-demangle", + "windows-targets 0.52.6", ] [[package]] @@ -396,9 +401,9 @@ checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "bigdecimal" -version = "0.4.3" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9324c8014cd04590682b34f1e9448d38f0674d0f7b2dc553331016ef0e4e9ebc" +checksum = "51d712318a27c7150326677b321a5fa91b55f6d9034ffd67f20319e147d40cee" dependencies = [ "autocfg", "libm", @@ -421,15 +426,15 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" [[package]] name = "bitstream-io" -version = "2.3.0" +version = "2.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c12d1856e42f0d817a835fe55853957c85c8c8a470114029143d3f12671446e" +checksum = "b81e1519b0d82120d2fd469d5bfb2919a9361c48b02d82d04befc1cdd2002452" [[package]] name = "block" @@ -508,9 +513,9 @@ dependencies = [ [[package]] name = "built" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6a6c0b39c38fd754ac338b00a88066436389c0f029da5d37d1e01091d9b7c17" +checksum = "236e6289eda5a812bc6b53c3b024039382a2895fbbeef2d748b2931546d392c4" [[package]] name = "bumpalo" @@ -520,9 +525,9 @@ checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "bytemuck" -version = "1.16.0" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78834c15cb5d5efe3452d58b1e8ba890dd62d21907f867f383358198e56ebca5" +checksum = "94bbb0ad554ad961ddc5da507a12a29b14e4ae5bda06b19f575a3e6079d2e2ae" [[package]] name = "byteorder" @@ -538,9 +543,9 @@ checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495" [[package]] name = "bytes" -version = "1.6.0" +version = "1.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" +checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3" [[package]] name = "bytesize" @@ -550,37 +555,36 @@ checksum = "a3e368af43e418a04d52505cf3dbc23dda4e3407ae2fa99fd0e4f308ce546acc" [[package]] name = "cairo-rs" -version = "0.19.4" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ac2a4d0e69036cf0062976f6efcba1aaee3e448594e6514bb2ddf87acce562" +checksum = "e8a0ea147c94108c9613235388f540e4d14c327f7081c9e471fc8ee8a2533e69" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cairo-sys-rs", "glib", "libc", - "thiserror", ] [[package]] name = "cairo-sys-rs" -version = "0.19.2" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd3bb3119664efbd78b5e6c93957447944f16bdbced84c17a9f41c7829b81e64" +checksum = "428290f914b9b86089f60f5d8a9f6e440508e1bcff23b25afd51502b0a2da88f" dependencies = [ "glib-sys", "libc", - "system-deps", + "system-deps 7.0.3", ] [[package]] name = "cc" -version = "1.0.98" +version = "1.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f" +checksum = "07b1695e2c7e8fc85310cde85aeaab7e3097f593c91d209d3f9df76c928100f0" dependencies = [ "jobserver", "libc", - "once_cell", + "shlex", ] [[package]] @@ -594,6 +598,16 @@ dependencies = [ ] [[package]] +name = "cfg-expr" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0890061c4d3223e7267f3bad2ec40b997d64faac1c2815a4a9d95018e2b9e9c" +dependencies = [ + "smallvec", + "target-lexicon", +] + +[[package]] name = "cfg-if" version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -601,9 +615,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 = "chrono" @@ -616,7 +630,7 @@ dependencies = [ "js-sys", "num-traits", "wasm-bindgen", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -631,9 +645,9 @@ dependencies = [ [[package]] name = "clapper" version = "0.1.0" -source = "git+https://gitlab.gnome.org/JanGernert/clapper-rs.git#286198bdffd84b1e5eb539078b440ac25c7e31ba" +source = "git+https://gitlab.gnome.org/JanGernert/clapper-rs.git#530b6fd53a60563d8038f7a1d9d735d6dc496adb" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "clapper-sys", "gio", "glib", @@ -644,9 +658,9 @@ dependencies = [ [[package]] name = "clapper-gtk" version = "0.1.0" -source = "git+https://gitlab.gnome.org/JanGernert/clapper-rs.git#286198bdffd84b1e5eb539078b440ac25c7e31ba" +source = "git+https://gitlab.gnome.org/JanGernert/clapper-rs.git#530b6fd53a60563d8038f7a1d9d735d6dc496adb" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "clapper", "clapper-gtk-sys", "gdk4", @@ -659,27 +673,27 @@ dependencies = [ [[package]] name = "clapper-gtk-sys" version = "0.0.1" -source = "git+https://gitlab.gnome.org/JanGernert/clapper-rs.git#286198bdffd84b1e5eb539078b440ac25c7e31ba" +source = "git+https://gitlab.gnome.org/JanGernert/clapper-rs.git#530b6fd53a60563d8038f7a1d9d735d6dc496adb" dependencies = [ "clapper-sys", "gio-sys", "glib-sys", "gtk4-sys", "libc", - "system-deps", + "system-deps 7.0.3", ] [[package]] name = "clapper-sys" version = "0.0.1" -source = "git+https://gitlab.gnome.org/JanGernert/clapper-rs.git#286198bdffd84b1e5eb539078b440ac25c7e31ba" +source = "git+https://gitlab.gnome.org/JanGernert/clapper-rs.git#530b6fd53a60563d8038f7a1d9d735d6dc496adb" dependencies = [ "gio-sys", "glib-sys", "gobject-sys", "gstreamer-sys", "libc", - "system-deps", + "system-deps 6.2.2", ] [[package]] @@ -725,9 +739,9 @@ dependencies = [ [[package]] name = "cookie" -version = "0.17.0" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7efb37c3e1ccb1ff97164ad95ac1606e8ccd35b3fa0a7d99a304c7f4a428cc24" +checksum = "4ddef33a339a91ea89fb53151bd0a4689cfce27055c291dfa69945475d22c747" dependencies = [ "percent-encoding", "time", @@ -736,12 +750,12 @@ dependencies = [ [[package]] name = "cookie_store" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "387461abbc748185c3a6e1673d826918b450b87ff22639429c694619a83b6cf6" +checksum = "4934e6b7e8419148b6ef56950d277af8561060b56afd59e2aadf98b59fce6baa" dependencies = [ "cookie", - "idna 0.3.0", + "idna 0.5.0", "log", "publicsuffix", "serde", @@ -763,15 +777,15 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.6" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "cpufeatures" -version = "0.2.12" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0" dependencies = [ "libc", ] @@ -845,6 +859,41 @@ dependencies = [ ] [[package]] +name = "darling" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" +dependencies = [ + "darling_core", + "darling_macro", +] + +[[package]] +name = "darling_core" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim", + "syn 2.0.77", +] + +[[package]] +name = "darling_macro" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" +dependencies = [ + "darling_core", + "quote", + "syn 2.0.77", +] + +[[package]] name = "data-encoding" version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -895,9 +944,9 @@ checksum = "3c877555693c14d2f84191cfd3ad8582790fc52b5e2274b40b59cf5f5cea25c7" [[package]] name = "diesel" -version = "2.1.6" +version = "2.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff236accb9a5069572099f0b350a92e9560e8e63a9b8d546162f4a5e03026bb2" +checksum = "158fe8e2e68695bd615d7e4f3227c0727b151330d3e253b525086c348d055d5e" dependencies = [ "bigdecimal", "chrono", @@ -916,21 +965,22 @@ dependencies = [ [[package]] name = "diesel_derives" -version = "2.1.4" +version = "2.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14701062d6bed917b5c7103bdffaee1e4609279e240488ad24e7bd979ca6866c" +checksum = "e7f2c3de51e2ba6bf2a648285696137aaf0f5f487bcbea93972fe8a364e131a4" dependencies = [ "diesel_table_macro_syntax", + "dsl_auto_type", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] name = "diesel_migrations" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6036b3f0120c5961381b570ee20a02432d7e2d27ea60de9578799cf9156914ac" +checksum = "8a73ce704bad4231f001bff3314d91dce4aba0770cee8b233991859abc15c1f6" dependencies = [ "diesel", "migrations_internals", @@ -939,11 +989,11 @@ dependencies = [ [[package]] name = "diesel_table_macro_syntax" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc5557efc453706fed5e4fa85006fe9817c224c3f480a34c7e5959fd700921c5" +checksum = "209c735641a413bc68c4923a9d6ad4bcb3ca306b794edaa7eb0b3228a99ffb25" dependencies = [ - "syn 2.0.66", + "syn 2.0.77", ] [[package]] @@ -1008,10 +1058,24 @@ dependencies = [ ] [[package]] +name = "dsl_auto_type" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5d9abe6314103864cc2d8901b7ae224e0ab1a103a0a416661b4097b0779b607" +dependencies = [ + "darling", + "either", + "heck", + "proc-macro2", + "quote", + "syn 2.0.77", +] + +[[package]] name = "either" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "encoding_rs" @@ -1036,21 +1100,21 @@ checksum = "b5320ae4c3782150d900b79807611a59a99fc9a1d61d686faafc24b93fc8d7ca" [[package]] name = "enum-as-inner" -version = "0.6.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ffccbb6966c05b32ef8fbac435df276c4ae4d3dc55a8cd0eb9745e6c12f546a" +checksum = "a1e6a265c649f3f5979b601d26f1d05ada116434c87741c9493cb56218f76cbc" dependencies = [ - "heck 0.4.1", + "heck", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", ] [[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", @@ -1058,13 +1122,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.66", + "syn 2.0.77", ] [[package]] @@ -1094,20 +1158,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", @@ -1116,21 +1169,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", "pin-project-lite", ] @@ -1144,7 +1187,7 @@ dependencies = [ "flume", "half", "lebe", - "miniz_oxide", + "miniz_oxide 0.7.4", "rayon-core", "smallvec", "zune-inflate", @@ -1162,9 +1205,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.1.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" +checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" [[package]] name = "fdeflate" @@ -1177,9 +1220,9 @@ dependencies = [ [[package]] name = "feed-rs" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be5366c3d4ae865540354ecafa0e5b41dd56c2f31d0b2ef876669edf964daaec" +checksum = "2c546f6f85e02eaca09e6a6dd22fe4db839745f55ae16c8f36626980a57f5bc4" dependencies = [ "chrono", "mediatype", @@ -1252,12 +1295,12 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.30" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" +checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253" dependencies = [ "crc32fast", - "miniz_oxide", + "miniz_oxide 0.8.0", ] [[package]] @@ -1379,7 +1422,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] @@ -1414,9 +1457,9 @@ dependencies = [ [[package]] name = "gdk-pixbuf" -version = "0.19.2" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6a23f8a0b5090494fd04924662d463f8386cc678dd3915015a838c1a3679b92" +checksum = "8730751991b97419fc3f0c2dca2c9e45b48edf46e48e0f965964ecf33889812f" dependencies = [ "gdk-pixbuf-sys", "gio", @@ -1426,22 +1469,22 @@ dependencies = [ [[package]] name = "gdk-pixbuf-sys" -version = "0.19.5" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fdbf021f8b9d19e30fb9ea6d6e5f2b6a712fe4645417c69f86f6ff1e1444a8f" +checksum = "1ffbf649fd5b1c8c0f0feeb015b7533c3ef92da2887fb95ddd338bc2b1644a7c" dependencies = [ "gio-sys", "glib-sys", "gobject-sys", "libc", - "system-deps", + "system-deps 7.0.3", ] [[package]] name = "gdk4" -version = "0.8.2" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db265c9dd42d6a371e09e52deab3a84808427198b86ac792d75fd35c07990a07" +checksum = "4b7d7237c1487ed4b300aac7744efcbf1319e12d60d7afcd6f505414bd5b5dea" dependencies = [ "cairo-rs", "gdk-pixbuf", @@ -1454,9 +1497,9 @@ dependencies = [ [[package]] name = "gdk4-sys" -version = "0.8.2" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9418fb4e8a67074919fe7604429c45aa74eb9df82e7ca529767c6d4e9dc66dd" +checksum = "a67576c8ec012156d7f680e201a807b4432a77babb3157e0555e990ab6bcd878" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -1466,7 +1509,7 @@ dependencies = [ "libc", "pango-sys", "pkg-config", - "system-deps", + "system-deps 7.0.3", ] [[package]] @@ -1492,9 +1535,9 @@ dependencies = [ [[package]] name = "gettext-rs" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e49ea8a8fad198aaa1f9655a2524b64b70eb06b2f3ff37da407566c93054f364" +checksum = "4a6716b8a0db461a2720b850ba1623e5b69e4b1aa0224cf5e1fb23a0fe49e65c" dependencies = [ "gettext-sys", "locale_config", @@ -1502,9 +1545,9 @@ dependencies = [ [[package]] name = "gettext-sys" -version = "0.21.3" +version = "0.21.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c63ce2e00f56a206778276704bbe38564c8695249fdc8f354b4ef71c57c3839d" +checksum = "f7b8797f28f2dabfbe2caadb6db4f7fd739e251b5ede0a2ba49e506071edcf67" dependencies = [ "cc", "temp-dir", @@ -1522,15 +1565,15 @@ dependencies = [ [[package]] name = "gimli" -version = "0.28.1" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" +checksum = "32085ea23f3234fc7846555e85283ba4de91e21016dc0455a16286d87a292d64" [[package]] name = "gio" -version = "0.19.5" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be548be810e45dd31d3bbb89c6210980bb7af9bca3ea1292b5f16b75f8e394a7" +checksum = "dcacaa37401cad0a95aadd266bc39c72a131d454fc012f6dfd217f891d76cc52" dependencies = [ "futures-channel", "futures-core", @@ -1541,29 +1584,28 @@ dependencies = [ "libc", "pin-project-lite", "smallvec", - "thiserror", ] [[package]] name = "gio-sys" -version = "0.19.5" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4bdbef451b0f0361e7f762987cc6bebd5facab1d535e85a3cf1115dfb08db40" +checksum = "5237611e97e9b86ab5768adc3eef853ae713ea797aa3835404acdfacffc9fb38" dependencies = [ "glib-sys", "gobject-sys", "libc", - "system-deps", + "system-deps 7.0.3", "windows-sys 0.52.0", ] [[package]] name = "glib" -version = "0.19.7" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e52355166df21c7ed16b6a01f615669c7911ed74e27ef60eba339c0d2da12490" +checksum = "95648aac01b75503000bb3bcaa5ec7a7a2dd61e43636b8b1814854de94dd80e4" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "futures-channel", "futures-core", "futures-executor", @@ -1576,48 +1618,47 @@ dependencies = [ "libc", "memchr", "smallvec", - "thiserror", ] [[package]] name = "glib-macros" -version = "0.19.7" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70025dbfa1275cf7d0531c3317ba6270dae15d87e63342229d638246ff45202e" +checksum = "302f1d633c9cdef4350330e7b68fd8016e2834bb106c93fdf9789fcde753c1ab" dependencies = [ - "heck 0.5.0", + "heck", "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] name = "glib-sys" -version = "0.19.5" +version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "767d23ead9bbdfcbb1c2242c155c8128a7d13dde7bf69c176f809546135e2282" +checksum = "92eee4531c1c9abba945d19378b205031b5890e1f99c319ba0503b6e0c06a163" dependencies = [ "libc", - "system-deps", + "system-deps 7.0.3", ] [[package]] name = "gobject-sys" -version = "0.19.5" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3787b0bfacca12bb25f8f822b0dbee9f7e4a86e6469a29976d332d2c14c945b" +checksum = "fa3d1dcd8a1eb2e7c22be3d5e792b14b186f3524f79b25631730f9a8c169d49a" dependencies = [ "glib-sys", "libc", - "system-deps", + "system-deps 7.0.3", ] [[package]] name = "graphene-rs" -version = "0.19.2" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99e4d388e96c5f29e2b2f67045d229ddf826d0a8d6d282f94ed3b34452222c91" +checksum = "80aac87f74e81c0e13433e892a047237abdc37945c86887f5eed905038356e69" dependencies = [ "glib", "graphene-sys", @@ -1626,14 +1667,14 @@ dependencies = [ [[package]] name = "graphene-sys" -version = "0.19.5" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a60e7381afdd7be43bd10a89d3b6741d162aabbca3a8db73505afb6a3aea59d" +checksum = "cc2f91ecd32989efad60326cc20a8fb252bd2852239a08e4e70cde8c100de9ca" dependencies = [ "glib-sys", "libc", "pkg-config", - "system-deps", + "system-deps 7.0.3", ] [[package]] @@ -1654,9 +1695,9 @@ dependencies = [ [[package]] name = "gsk4" -version = "0.8.2" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7563884bf6939f4468e5d94654945bdd9afcaf8c3ba4c5dd17b5342b747221be" +checksum = "1f3cf2091e1af185b347b3450817d93dea6fe435df7abd4c2cd7fb5bcb4cfda8" dependencies = [ "cairo-rs", "gdk4", @@ -1669,9 +1710,9 @@ dependencies = [ [[package]] name = "gsk4-sys" -version = "0.8.2" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23024bf2636c38bbd1f822f58acc9d1c25b28da896ff0f291a1a232d4272b3dc" +checksum = "6aa69614a26d8760c186c3690f1b0fbb917572ca23ef83137445770ceddf8cde" dependencies = [ "cairo-sys-rs", "gdk4-sys", @@ -1680,14 +1721,14 @@ dependencies = [ "graphene-sys", "libc", "pango-sys", - "system-deps", + "system-deps 7.0.3", ] [[package]] name = "gstreamer" -version = "0.22.5" +version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56b59fdce2dfacda226d4b1b71ce4700b2f04228909b52252c197d8e30bd54a6" +checksum = "683e15f8cc3a1a2646d9fe2181a58b7abb4c166256d8d15cce368e420c741140" dependencies = [ "cfg-if", "futures-channel", @@ -1710,21 +1751,21 @@ dependencies = [ [[package]] name = "gstreamer-sys" -version = "0.22.5" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4975a75279a9cf658bac1798dcf57100c6ec89fca7886572c8250ea4d94b76bd" +checksum = "d9c9005b55dd2b1784645963c1ec409f9d420a56f6348d0ae69c2eaff584bcc3" dependencies = [ "glib-sys", "gobject-sys", "libc", - "system-deps", + "system-deps 7.0.3", ] [[package]] name = "gtk4" -version = "0.8.2" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b04e11319b08af11358ab543105a9e49b0c491faca35e2b8e7e36bfba8b671ab" +checksum = "f4fe572bf318e5dbc6f5a2f8a25d853f1ae3f42768c0b08af6ca20a18f4057e1" dependencies = [ "cairo-rs", "field-offset", @@ -1743,21 +1784,21 @@ dependencies = [ [[package]] name = "gtk4-macros" -version = "0.8.2" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec655a7ef88d8ce9592899deb8b2d0fa50bab1e6dd69182deb764e643c522408" +checksum = "e9e7b362c8fccd2712297903717d65d30defdab2b509bc9d209cbe5ffb9fabaf" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] name = "gtk4-sys" -version = "0.8.2" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c8aa86b7f85ea71d66ea88c1d4bae1cfacf51ca4856274565133838d77e57b5" +checksum = "1114a207af8ada02cf4658a76692f4190f06f093380d5be07e3ca8b43aa7c666" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -1769,14 +1810,14 @@ dependencies = [ "gsk4-sys", "libc", "pango-sys", - "system-deps", + "system-deps 7.0.3", ] [[package]] name = "h2" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab" +checksum = "524e8ac6999421f49a846c2d4411f337e53497d8ec55d67753beffa43c5d9205" dependencies = [ "atomic-waker", "bytes", @@ -1820,7 +1861,7 @@ version = "1.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1bfae7cdfe23e50ea96929ccf1948d9ae1d8608353556461e5de247463d3a4f6" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "proc-macro2", "quote", "syn 1.0.109", @@ -1834,12 +1875,6 @@ checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" [[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" @@ -1851,6 +1886,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" [[package]] +name = "hermit-abi" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" + +[[package]] name = "hex" version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1955,9 +1996,9 @@ dependencies = [ [[package]] name = "http-body" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" +checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" dependencies = [ "bytes", "http", @@ -1965,12 +2006,12 @@ dependencies = [ [[package]] name = "http-body-util" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0475f8b2ac86659c21b64320d5d653f9efe42acd2a4e560073ec61a155a34f1d" +checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" dependencies = [ "bytes", - "futures-core", + "futures-util", "http", "http-body", "pin-project-lite", @@ -1978,9 +2019,9 @@ dependencies = [ [[package]] name = "httparse" -version = "1.8.0" +version = "1.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" +checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" [[package]] name = "humantime" @@ -1990,9 +2031,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "1.3.1" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe575dd17d0862a9a33781c8c4696a55c320909004a67a00fb286ba8b1bc496d" +checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" dependencies = [ "bytes", "futures-channel", @@ -2009,6 +2050,23 @@ dependencies = [ ] [[package]] +name = "hyper-rustls" +version = "0.27.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333" +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" @@ -2026,9 +2084,9 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.4" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d8d52be92d09acc2e01dddb7fde3ad983fc6489c7db4837e605bc3fca4cb63e" +checksum = "da62f120a8a37763efb0cf8fdf264b884c7b8b9ac8660b900c8661030c00e6ba" dependencies = [ "bytes", "futures-channel", @@ -2046,9 +2104,9 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.60" +version = "0.1.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" +checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -2068,6 +2126,12 @@ dependencies = [ ] [[package]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + +[[package]] name = "idna" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2099,12 +2163,12 @@ dependencies = [ [[package]] name = "image" -version = "0.25.1" +version = "0.25.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd54d660e773627692c524beaad361aca785a4f9f5730ce91f42aabe5bce3d11" +checksum = "99314c8a2152b8ddb211f924cdae532d8c5e4c8bb54728e12fff1b0cd5963a10" dependencies = [ "bytemuck", - "byteorder", + "byteorder-lite", "color_quant", "exr", "gif", @@ -2122,12 +2186,12 @@ dependencies = [ [[package]] name = "image-webp" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d730b085583c4d789dfd07fdcf185be59501666a90c97c40162b37e4fdad272d" +checksum = "f79afb8cbee2ef20f59ccd477a218c12a93943d075b492015ecb1bb81f8ee904" dependencies = [ "byteorder-lite", - "thiserror", + "quick-error 2.0.1", ] [[package]] @@ -2144,9 +2208,9 @@ checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683" [[package]] name = "indexmap" -version = "2.2.6" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" +checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5" dependencies = [ "equivalent", "hashbrown", @@ -2160,7 +2224,7 @@ checksum = "c34819042dc3d3971c46c2190835914dfbe0c3c13f61449b2997f4e9722dfa60" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] @@ -2172,14 +2236,14 @@ dependencies = [ "socket2", "widestring", "windows-sys 0.48.0", - "winreg 0.50.0", + "winreg", ] [[package]] name = "ipnet" -version = "2.9.0" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" +checksum = "187674a687eed5fe42285b40c6291f9a01517d415fad1c3cbc6a9f778af7fcd4" [[package]] name = "ipnetwork" @@ -2225,9 +2289,9 @@ checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "javascriptcore6" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d95a69260c40bbf52066f2c6fa520c00c1ec8ab8208636cf3070c0157c5221f8" +checksum = "03b28ed9c7c08f906b2a51bc2365eae2ba5e7db1249b89892f7ae4cbd602d1f4" dependencies = [ "glib", "javascriptcore6-sys", @@ -2236,14 +2300,14 @@ dependencies = [ [[package]] name = "javascriptcore6-sys" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc104f99c5adcd7ed53dd491121c111e05e3e8d40020d3519e98c346ca64186b" +checksum = "4741e2a31c2145050dd4971f8dd51e92c840d5839a7124cc68a33c7325523a12" dependencies = [ "glib-sys", "gobject-sys", "libc", - "system-deps", + "system-deps 7.0.3", ] [[package]] @@ -2254,9 +2318,9 @@ checksum = "47f142fe24a9c9944451e8349de0a56af5f3e7226dc46f3ed4d4ecc0b85af75e" [[package]] name = "jobserver" -version = "0.1.31" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" +checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" dependencies = [ "libc", ] @@ -2269,18 +2333,18 @@ checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" [[package]] name = "js-sys" -version = "0.3.69" +version = "0.3.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" +checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" dependencies = [ "wasm-bindgen", ] [[package]] name = "lazy_static" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "lebe" @@ -2290,11 +2354,10 @@ checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" [[package]] name = "libadwaita" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91b4990248b9e1ec5e72094a2ccaea70ec3809f88f6fd52192f2af306b87c5d9" +checksum = "2ff9c222b5c783729de45185f07b2fec2d43a7f9c63961e777d3667e20443878" dependencies = [ - "gdk-pixbuf", "gdk4", "gio", "glib", @@ -2306,9 +2369,9 @@ dependencies = [ [[package]] name = "libadwaita-sys" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23a748e4e92be1265cd9e93d569c0b5dfc7814107985aa6743d670ab281ea1a8" +checksum = "1c44d8bdbad31d6639e1f20cc9c1424f1a8e02d751fc28d44659bf743fb9eca6" dependencies = [ "gdk4-sys", "gio-sys", @@ -2317,14 +2380,14 @@ dependencies = [ "gtk4-sys", "libc", "pango-sys", - "system-deps", + "system-deps 7.0.3", ] [[package]] name = "libc" -version = "0.2.155" +version = "0.2.158" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" +checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" [[package]] name = "libfuzzer-sys" @@ -2349,15 +2412,15 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "libc", ] [[package]] name = "libsqlite3-sys" -version = "0.28.0" +version = "0.30.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c10584274047cb335c23d3e61bcef8e323adae7c5c8c760540f73610177fc3f" +checksum = "2e99fb7a497b1e3339bc746195567ed8d3e24945ecd636e3619d20b9de9e9149" dependencies = [ "pkg-config", "vcpkg", @@ -2420,9 +2483,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.21" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" dependencies = [ "serde", ] @@ -2556,7 +2619,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ea1f30cedd69f0a2954655f7188c6a834246d2bcf1e315e2ac40c4b24dc9519" dependencies = [ "cfg-if", - "rayon", ] [[package]] @@ -2584,9 +2646,9 @@ checksum = "8878cd8d1b3c8c8ae4b2ba0a36652b7cf192f618a599a7fbdfa25cffd4ea72dd" [[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 = "memoffset" @@ -2599,19 +2661,19 @@ dependencies = [ [[package]] name = "migrations_internals" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f23f71580015254b020e856feac3df5878c2c7a8812297edd6c0a485ac9dada" +checksum = "fd01039851e82f8799046eabbb354056283fb265c8ec0996af940f4e85a380ff" dependencies = [ "serde", - "toml 0.7.8", + "toml", ] [[package]] name = "migrations_macros" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cce3325ac70e67bbab5bd837a31cae01f1a6db64e0e744a33cb03a543469ef08" +checksum = "ffb161cc72176cb37aa47f1fc520d3ef02263d67d661f44f05d05a079e1237fd" dependencies = [ "migrations_internals", "proc-macro2", @@ -2626,9 +2688,9 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] name = "mime_guess" -version = "2.0.4" +version = "2.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" +checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e" dependencies = [ "mime", "unicase", @@ -2636,9 +2698,9 @@ dependencies = [ [[package]] name = "miniflux_api" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e6e3b827f7d7e0b921d129e27e2621d317bb38005e0f2512092aa33435e5dc0" +checksum = "1063beb3a61f877a219fe278c01242851d5c1a107f23cbc50fd841ad92f67fe9" dependencies = [ "base64 0.22.1", "log", @@ -2658,37 +2720,47 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae" +checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" dependencies = [ "adler", "simd-adler32", ] [[package]] +name = "miniz_oxide" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" +dependencies = [ + "adler2", +] + +[[package]] name = "mio" -version = "0.8.11" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" +checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" dependencies = [ + "hermit-abi 0.3.9", "libc", "wasi", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "moka" -version = "0.12.7" +version = "0.12.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e0d88686dc561d743b40de8269b26eaf0dc58781bde087b0984646602021d08" +checksum = "32cf62eb4dd975d2dde76432fb1075c49e3ee2331cf36f1f8fd4b66550d32b6f" dependencies = [ "async-lock", "async-trait", "crossbeam-channel", "crossbeam-epoch", "crossbeam-utils", - "event-listener 5.3.0", + "event-listener", "futures-util", "once_cell", "parking_lot", @@ -2739,12 +2811,12 @@ checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" [[package]] name = "news-flash" version = "2.3.0-alpha.0" -source = "git+https://gitlab.com/news_flash/news_flash.git#d5d9cfcbd4a0c3f2e2c609062b539603490bcca3" +source = "git+https://gitlab.com/news_flash/news_flash.git#6b65c403da8dbe36e5df6fbb597cfeb2afaa6b58" dependencies = [ "article_scraper", "async-trait", "base64 0.22.1", - "bitflags 2.5.0", + "bitflags 2.6.0", "bytes", "chrono", "commafeed_api", @@ -2766,7 +2838,6 @@ dependencies = [ "mime", "mime_guess", "miniflux_api", - "moka", "nanohtml2text", "newsblur_api", "nextcloud_news_api", @@ -2814,6 +2885,7 @@ dependencies = [ "libadwaita", "log", "log4rs", + "moka", "news-flash", "once_cell", "pango", @@ -2863,11 +2935,11 @@ dependencies = [ [[package]] name = "nix" -version = "0.28.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" +checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cfg-if", "cfg_aliases", "libc", @@ -2892,9 +2964,9 @@ checksum = "0676bb32a98c1a483ce53e500a81ad9c3d5b3f7c920c28c24e9cb0980d0b5bc8" [[package]] name = "num-bigint" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c165a9ab64cf766f73521c0dd2cfdff64f488b8f0b3e621face3462d3db536d7" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" dependencies = [ "num-integer", "num-traits", @@ -2914,7 +2986,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] @@ -2952,7 +3024,7 @@ version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi", + "hermit-abi 0.3.9", "libc", ] @@ -2993,9 +3065,9 @@ dependencies = [ [[package]] name = "object" -version = "0.32.2" +version = "0.36.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a" dependencies = [ "memchr", ] @@ -3014,11 +3086,11 @@ checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" [[package]] name = "openssl" -version = "0.10.64" +version = "0.10.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" +checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cfg-if", "foreign-types", "libc", @@ -3035,7 +3107,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] @@ -3046,9 +3118,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.102" +version = "0.9.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2" +checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" dependencies = [ "cc", "libc", @@ -3103,9 +3175,9 @@ dependencies = [ [[package]] name = "pango" -version = "0.19.5" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "504ce6e805439ea2c6791168fe7ef8e3da0c1b2ef82c44bc450dbc330592920d" +checksum = "5764e5a174a5a0ec054fe5962ce6d4fc7052e2d0dcc23bbc77202b40a4a403d3" dependencies = [ "gio", "glib", @@ -3115,21 +3187,21 @@ dependencies = [ [[package]] name = "pango-sys" -version = "0.19.5" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4829555bdbb83692ddeaf5a6927fb2d025c8131e5ecaa4f7619fff6985d3505" +checksum = "fd317e1de76b14b3d3efe05518c08b360327f1ab7fec150473a89ffcad4b072d" dependencies = [ "glib-sys", "gobject-sys", "libc", - "system-deps", + "system-deps 7.0.3", ] [[package]] name = "parking" -version = "2.2.0" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" +checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba" [[package]] name = "parking_lot" @@ -3151,7 +3223,7 @@ dependencies = [ "libc", "redox_syscall", "smallvec", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -3221,7 +3293,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] @@ -3238,9 +3310,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "piper" -version = "0.2.2" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "464db0c665917b13ebb5d453ccdec4add5658ee1adc7affc7677615356a8afaf" +checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066" dependencies = [ "atomic-waker", "fastrand", @@ -3249,9 +3321,9 @@ dependencies = [ [[package]] name = "pkg-config" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" +checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" [[package]] name = "png" @@ -3263,22 +3335,22 @@ dependencies = [ "crc32fast", "fdeflate", "flate2", - "miniz_oxide", + "miniz_oxide 0.7.4", ] [[package]] name = "polling" -version = "3.7.0" +version = "3.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "645493cf344456ef24219d02a768cf1fb92ddf8c92161679ae3d91b91a637be3" +checksum = "cc2790cd301dec6cd3b7a025e4815cf825724a51c98dccfe6a3e55f05ffb6511" dependencies = [ "cfg-if", "concurrent-queue", - "hermit-abi", + "hermit-abi 0.4.0", "pin-project-lite", "rustix", "tracing", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -3289,9 +3361,12 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" [[package]] name = "ppv-lite86" -version = "0.2.17" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +dependencies = [ + "zerocopy", +] [[package]] name = "precomputed-hash" @@ -3301,18 +3376,18 @@ checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" [[package]] name = "proc-macro-crate" -version = "3.1.0" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b" dependencies = [ - "toml_edit 0.21.1", + "toml_edit", ] [[package]] name = "proc-macro2" -version = "1.0.84" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec96c6a92621310b51366f1e28d05ef11489516e93be030060e5fc12024a49d6" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] @@ -3333,7 +3408,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8021cf59c8ec9c432cfc2526ac6b8aa508ecaf29cd415f271b8406c1b851c3fd" dependencies = [ "quote", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] @@ -3390,9 +3465,9 @@ checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" [[package]] name = "quick-xml" -version = "0.31.0" +version = "0.36.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" +checksum = "f7649a7b4df05aed9ea7ec6f628c67c9953a43869b8bc50929569b2999d443fe" dependencies = [ "encoding_rs", "memchr", @@ -3400,9 +3475,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.36" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" dependencies = [ "proc-macro2", ] @@ -3486,7 +3561,7 @@ dependencies = [ "rand", "rand_chacha", "simd_helpers", - "system-deps", + "system-deps 6.2.2", "thiserror", "v_frame", "wasm-bindgen", @@ -3494,26 +3569,25 @@ dependencies = [ [[package]] name = "ravif" -version = "0.11.5" +version = "0.11.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc13288f5ab39e6d7c9d501759712e6969fcc9734220846fc9ed26cae2cc4234" +checksum = "a8f0bfd976333248de2078d350bfdf182ff96e168a24d23d2436cef320dd4bdd" dependencies = [ "avif-serialize", "imgref", "loop9", "quick-error 2.0.1", "rav1e", - "rayon", "rgb", ] [[package]] name = "raw-cpuid" -version = "11.0.2" +version = "11.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e29830cbb1290e404f24c73af91c5d8d631ce7e128691e9477556b540cd01ecd" +checksum = "cb9ee317cfe3fbd54b36a511efc1edd42e216903c9cd575e686dd68a2ba90d8d" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", ] [[package]] @@ -3544,18 +3618,18 @@ checksum = "ca8049c74229f22d8cba889ee1d541b05da9c9668d8fe2011bb922250d0be148" [[package]] name = "redox_syscall" -version = "0.5.1" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" +checksum = "0884ad60e090bf1345b93da0a5de8923c93884cd03f40dfcfddd3b4bee661853" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", ] [[package]] name = "redox_users" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" +checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" dependencies = [ "getrandom", "libredox", @@ -3564,9 +3638,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.4" +version = "1.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" +checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" dependencies = [ "aho-corasick", "memchr", @@ -3576,9 +3650,9 @@ 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", @@ -3587,15 +3661,15 @@ dependencies = [ [[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 = "reqwest" -version = "0.12.4" +version = "0.12.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "566cafdd92868e0939d3fb961bd0dc25fcfaaed179291093b3d43e6b3150ea10" +checksum = "f8f4955649ef5c38cc7f9e8aa41761d48fb9677197daea9984dc54f56aad5e63" dependencies = [ "async-compression", "base64 0.22.1", @@ -3611,6 +3685,7 @@ dependencies = [ "http-body", "http-body-util", "hyper", + "hyper-rustls", "hyper-tls", "hyper-util", "ipnet", @@ -3638,7 +3713,7 @@ dependencies = [ "wasm-bindgen-futures", "wasm-streams", "web-sys", - "winreg 0.52.0", + "windows-registry", ] [[package]] @@ -3653,18 +3728,33 @@ dependencies = [ [[package]] name = "rgb" -version = "0.8.37" +version = "0.8.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05aaa8004b64fd573fc9d002f4e632d51ad4f026c2b5ba95fcb6c2f32c2c47d8" +checksum = "57397d16646700483b67d2dd6511d79318f9d057fdbd21a4066aeac8b41d310a" 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" +version = "8.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19549741604902eb99a7ed0ee177a0663ee1eda51a29f71401f166e47e77806a" +checksum = "fa66af4a4fdd5e7ebc276f115e895611a34739a9c1c01028383d612d550953c0" dependencies = [ "rust-embed-impl", "rust-embed-utils", @@ -3673,23 +3763,23 @@ dependencies = [ [[package]] name = "rust-embed-impl" -version = "8.4.0" +version = "8.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb9f96e283ec64401f30d3df8ee2aaeb2561f34c824381efa24a35f79bf40ee4" +checksum = "6125dbc8867951125eec87294137f4e9c2c96566e61bf72c45095a7c77761478" dependencies = [ "proc-macro2", "quote", "rust-embed-utils", "shellexpand", - "syn 2.0.66", + "syn 2.0.77", "walkdir", ] [[package]] name = "rust-embed-utils" -version = "8.4.0" +version = "8.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38c74a686185620830701348de757fd36bef4aa9680fd23c49fc539ddcc1af32" +checksum = "2e5347777e9aacb56039b0e1f28785929a8a3b709e87482e7442c72e7c12529d" dependencies = [ "sha2 0.10.8", "walkdir", @@ -3703,20 +3793,20 @@ checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustc_version" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" dependencies = [ "semver", ] [[package]] name = "rustix" -version = "0.38.34" +version = "0.38.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" +checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "errno", "libc", "linux-raw-sys", @@ -3724,10 +3814,23 @@ dependencies = [ ] [[package]] +name = "rustls" +version = "0.23.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2dabaac7466917e566adb06783a81ca48944c6898a1b08b9374106dd671f4c8" +dependencies = [ + "once_cell", + "rustls-pki-types", + "rustls-webpki", + "subtle", + "zeroize", +] + +[[package]] name = "rustls-pemfile" -version = "2.1.2" +version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d" +checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425" dependencies = [ "base64 0.22.1", "rustls-pki-types", @@ -3735,9 +3838,20 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" +checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0" + +[[package]] +name = "rustls-webpki" +version = "0.102.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9" +dependencies = [ + "ring", + "rustls-pki-types", + "untrusted", +] [[package]] name = "ryu" @@ -3766,11 +3880,11 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" +checksum = "e9aaafd5a2b6e3d657ff009d82fbd630b6bd54dd4eb06f21693925cdf80f9b8b" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -3790,11 +3904,11 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "security-framework" -version = "2.11.0" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0" +checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "core-foundation", "core-foundation-sys", "libc", @@ -3803,9 +3917,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.11.0" +version = "2.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7" +checksum = "ea4a292869320c0272d7bc55a5a6aafaff59b4f63404a003887b679a2e05b4b6" dependencies = [ "core-foundation-sys", "libc", @@ -3819,9 +3933,9 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.203" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" +checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" dependencies = [ "serde_derive", ] @@ -3838,22 +3952,23 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.203" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" +checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] name = "serde_json" -version = "1.0.117" +version = "1.0.128" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" +checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" dependencies = [ "itoa", + "memchr", "ryu", "serde", ] @@ -3866,14 +3981,14 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] name = "serde_spanned" -version = "0.6.6" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" +checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" dependencies = [ "serde", ] @@ -3948,6 +4063,12 @@ dependencies = [ ] [[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + +[[package]] name = "signal-hook-registry" version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4010,9 +4131,9 @@ dependencies = [ [[package]] name = "soup3" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb6bbb0e56d089517432ca8aac0879e5f343b309783384a7fdbdd6d5232e681" +checksum = "b84ccd1f4aee0854a16b0b489ba843798e2eb4cdcddd4a61248f7db9ce8b6df1" dependencies = [ "futures-channel", "gio", @@ -4023,15 +4144,15 @@ dependencies = [ [[package]] name = "soup3-sys" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9c6d7beef555a91c6129f5e71ecf4b6e9eac8b48914098d713b1537ebbf6917" +checksum = "8869997193d52a61a1db48627bdaa57343f76e2c5132ee6d351245a6ab30631e" dependencies = [ "gio-sys", "glib-sys", "gobject-sys", "libc", - "system-deps", + "system-deps 7.0.3", ] [[package]] @@ -4076,6 +4197,18 @@ dependencies = [ ] [[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + +[[package]] +name = "subtle" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" + +[[package]] name = "syn" version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4088,9 +4221,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.66" +version = "2.0.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" +checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" dependencies = [ "proc-macro2", "quote", @@ -4099,26 +4232,29 @@ dependencies = [ [[package]] name = "sync_wrapper" -version = "0.1.2" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" +checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" +dependencies = [ + "futures-core", +] [[package]] name = "system-configuration" -version = "0.5.1" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" +checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", "core-foundation", "system-configuration-sys", ] [[package]] name = "system-configuration-sys" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" +checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4" dependencies = [ "core-foundation-sys", "libc", @@ -4130,10 +4266,23 @@ version = "6.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349" dependencies = [ - "cfg-expr", - "heck 0.5.0", + "cfg-expr 0.15.8", + "heck", + "pkg-config", + "toml", + "version-compare", +] + +[[package]] +name = "system-deps" +version = "7.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "66d23aaf9f331227789a99e8de4c91bf46703add012bdfd45fdecdfb2975a005" +dependencies = [ + "cfg-expr 0.17.0", + "heck", "pkg-config", - "toml 0.8.13", + "toml", "version-compare", ] @@ -4145,9 +4294,9 @@ checksum = "7b2093cf4c8eb1e67749a6762251bc9cd836b6fc171623bd0a9d324d37af2417" [[package]] name = "target-lexicon" -version = "0.12.14" +version = "0.12.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" +checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" [[package]] name = "temp-dir" @@ -4157,14 +4306,15 @@ checksum = "1f227968ec00f0e5322f9b8173c7a0cbcff6181a0a5b28e9892491c286277231" [[package]] name = "tempfile" -version = "3.10.1" +version = "3.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" dependencies = [ "cfg-if", "fastrand", + "once_cell", "rustix", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -4189,29 +4339,29 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.61" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" +checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.61" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" +checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] name = "thread-id" -version = "4.2.1" +version = "4.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0ec81c46e9eb50deaa257be2f148adf052d1fb7701cfd55ccfab2525280b70b" +checksum = "cfe8f25bbdd100db7e1d34acf7fd2dc59c4bf8f7483f505eaa7d4f12f76cc0ea" dependencies = [ "libc", "winapi", @@ -4272,9 +4422,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.6.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" dependencies = [ "tinyvec_macros", ] @@ -4287,30 +4437,29 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.37.0" +version = "1.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" +checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" dependencies = [ "backtrace", "bytes", "libc", "mio", - "num_cpus", "pin-project-lite", "socket2", "tokio-macros", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "tokio-macros" -version = "2.2.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" +checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] @@ -4324,10 +4473,21 @@ dependencies = [ ] [[package]] +name = "tokio-rustls" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" +dependencies = [ + "rustls", + "rustls-pki-types", + "tokio", +] + +[[package]] name = "tokio-socks" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51165dfa029d2a65969413a6cc96f354b86b464498702f174a4efa13608fd8c0" +checksum = "0d4770b8024672c1101b3f6733eab95b18007dbe0847a8afe341fcf79e06043f" dependencies = [ "either", "futures-util", @@ -4337,9 +4497,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.11" +version = "0.7.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" +checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a" dependencies = [ "bytes", "futures-core", @@ -4350,72 +4510,36 @@ dependencies = [ [[package]] name = "toml" -version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" -dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit 0.19.15", -] - -[[package]] -name = "toml" -version = "0.8.13" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4e43f8cc456c9704c851ae29c67e17ef65d2c30017c17a9765b89c382dc8bba" +checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.13", + "toml_edit", ] [[package]] name = "toml_datetime" -version = "0.6.6" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" +checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.19.15" +version = "0.22.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +checksum = "3b072cee73c449a636ffd6f32bd8de3a9f7119139aff882f44943ce2986dc5cf" dependencies = [ "indexmap", "serde", "serde_spanned", "toml_datetime", - "winnow 0.5.40", -] - -[[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.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c127785850e8c20836d49732ae6abfa47616e60bf9d9f57c43c250361a9db96c" -dependencies = [ - "indexmap", - "serde", - "serde_spanned", - "toml_datetime", - "winnow 0.6.8", + "winnow", ] [[package]] @@ -4435,15 +4559,15 @@ dependencies = [ [[package]] name = "tower-layer" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" +checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" [[package]] name = "tower-service" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tracing" @@ -4464,7 +4588,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", ] [[package]] @@ -4515,6 +4639,47 @@ dependencies = [ ] [[package]] +name = "unic-char-property" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8c57a407d9b6fa02b4795eb81c5b6652060a15a7903ea981f3d723e6c0be221" +dependencies = [ + "unic-char-range", +] + +[[package]] +name = "unic-char-range" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0398022d5f700414f6b899e10b8348231abf9173fa93144cbc1a43b9793c1fbc" + +[[package]] +name = "unic-common" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80d7ff825a6a654ee85a63e80f92f054f904f21e7d12da4e22f9834a4aaa35bc" + +[[package]] +name = "unic-emoji-char" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b07221e68897210270a38bde4babb655869637af0f69407f96053a34f76494d" +dependencies = [ + "unic-char-property", + "unic-char-range", + "unic-ucd-version", +] + +[[package]] +name = "unic-ucd-version" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96bd2f2237fe450fcd0a1d2f5f4e91711124f7857ba2e964247776ebeeb7b0c4" +dependencies = [ + "unic-common", +] + +[[package]] name = "unicase" version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4531,15 +4696,15 @@ checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" [[package]] name = "unicode-ident" -version = "1.0.12" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" [[package]] name = "unicode-normalization" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" +checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956" dependencies = [ "tinyvec", ] @@ -4560,10 +4725,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861" [[package]] +name = "untrusted" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + +[[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 0.5.0", @@ -4579,9 +4750,9 @@ checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" [[package]] name = "uuid" -version = "1.8.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" +checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" dependencies = [ "getrandom", ] @@ -4611,9 +4782,9 @@ checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b" [[package]] name = "version_check" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" [[package]] name = "walkdir" @@ -4642,34 +4813,35 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" +checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" dependencies = [ "cfg-if", + "once_cell", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" +checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.42" +version = "0.4.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" +checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed" dependencies = [ "cfg-if", "js-sys", @@ -4679,9 +4851,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" +checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -4689,22 +4861,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" +checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" +checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" [[package]] name = "wasm-streams" @@ -4721,9 +4893,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.69" +version = "0.3.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" +checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" dependencies = [ "js-sys", "wasm-bindgen", @@ -4731,9 +4903,9 @@ dependencies = [ [[package]] name = "webkit6" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d82bda18116290a9effc1e0f8dbd00236807bf4a9b990b9484bad5ba852fc06" +checksum = "8c359ef247305dcade3363c281c505b943e0e6162a42eac76ff76ed8e7cebfbd" dependencies = [ "gdk4", "gio", @@ -4747,9 +4919,9 @@ dependencies = [ [[package]] name = "webkit6-sys" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c459941f1b22750cbda435ede3f94ed8e8dd8c8608d324ecb0b9a8556b49abd" +checksum = "96284c5280af5984dbdae8dae3cfeea11b44b214f9bd42b35c0ca75903bccce2" dependencies = [ "gdk4-sys", "gio-sys", @@ -4759,7 +4931,7 @@ dependencies = [ "javascriptcore6-sys", "libc", "soup3-sys", - "system-deps", + "system-deps 7.0.3", ] [[package]] @@ -4792,11 +4964,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -4811,7 +4983,37 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-registry" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0" +dependencies = [ + "windows-result", + "windows-strings", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-result" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-strings" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" +dependencies = [ + "windows-result", + "windows-targets 0.52.6", ] [[package]] @@ -4829,7 +5031,16 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", ] [[package]] @@ -4849,18 +5060,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.5", - "windows_aarch64_msvc 0.52.5", - "windows_i686_gnu 0.52.5", + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", "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", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", ] [[package]] @@ -4871,9 +5082,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" @@ -4883,9 +5094,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" @@ -4895,15 +5106,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" [[package]] name = "windows_i686_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" @@ -4913,9 +5124,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" @@ -4925,9 +5136,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" @@ -4937,9 +5148,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" @@ -4949,24 +5160,15 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" -version = "0.5.40" +version = "0.6.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" -dependencies = [ - "memchr", -] - -[[package]] -name = "winnow" -version = "0.6.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3c52e9c97a68071b23e836c9380edae937f17b9c4667bd021973efc689f618d" +checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f" dependencies = [ "memchr", ] @@ -4982,30 +5184,20 @@ dependencies = [ ] [[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 = "xdg-home" -version = "1.1.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21e5a325c3cb8398ad6cf859c1135b25dd29e186679cf2da7581d9679f63b38e" +checksum = "ec1cdab258fb55c0da61328dc52c8764709b249011b2cad0454c72f0bf10a1f6" dependencies = [ "libc", - "winapi", + "windows-sys 0.59.0", ] [[package]] name = "xml-rs" -version = "0.8.20" +version = "0.8.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "791978798f0597cfc70478424c2b4fdc2b7a8024aaff78497ef00f24ef674193" +checksum = "af4e2e2f7cba5a093896c1e150fbfe177d1883e7448200efb81d40b9d339ef26" [[package]] name = "xml5ever" @@ -5026,18 +5218,18 @@ checksum = "66fee0b777b0f5ac1c69bb06d361268faafa61cd4682ae064a171c16c433e9e4" [[package]] name = "xmltree" -version = "0.10.3" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7d8a75eaf6557bb84a65ace8609883db44a29951042ada9b393151532e41fcb" +checksum = "b619f8c85654798007fb10afa5125590b43b088c225a25fc2fec100a9fad0fc6" dependencies = [ "xml-rs", ] [[package]] name = "zbus" -version = "4.2.2" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "989c3977a7aafa97b12b9a35d21cdcff9b0d2289762b14683f45d66b1ba6c48f" +checksum = "bb97012beadd29e654708a0fdb4c84bc046f537aecfde2c3ee0a9e4b4d48c725" dependencies = [ "async-broadcast", "async-executor", @@ -5050,7 +5242,7 @@ dependencies = [ "async-trait", "blocking", "enumflags2", - "event-listener 5.3.0", + "event-listener", "futures-core", "futures-sink", "futures-util", @@ -5073,14 +5265,14 @@ dependencies = [ [[package]] name = "zbus_macros" -version = "4.2.2" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fe9de53245dcf426b7be226a4217dd5e339080e5d46e64a02d6e5dcbf90fca1" +checksum = "267db9407081e90bbfa46d841d3cbc60f59c0351838c4bc65199ecd79ab1983e" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", "zvariant_utils", ] @@ -5096,6 +5288,33 @@ dependencies = [ ] [[package]] +name = "zerocopy" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +dependencies = [ + "byteorder", + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.77", +] + +[[package]] +name = "zeroize" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" + +[[package]] name = "zune-core" version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5112,18 +5331,18 @@ dependencies = [ [[package]] name = "zune-jpeg" -version = "0.4.11" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec866b44a2a1fd6133d363f073ca1b179f438f99e7e5bfb1e33f7181facfe448" +checksum = "16099418600b4d8f028622f73ff6e3deaabdff330fb9a2a131dea781ee8b0768" dependencies = [ "zune-core", ] [[package]] name = "zvariant" -version = "4.1.1" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aa6d31a02fbfb602bfde791de7fedeb9c2c18115b3d00f3a36e489f46ffbbc7" +checksum = "2084290ab9a1c471c38fc524945837734fbf124487e105daec2bb57fd48c81fe" dependencies = [ "endi", "enumflags2", @@ -5135,24 +5354,24 @@ dependencies = [ [[package]] name = "zvariant_derive" -version = "4.1.1" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "642bf1b6b6d527988b3e8193d20969d53700a36eac734d21ae6639db168701c8" +checksum = "73e2ba546bda683a90652bac4a279bc146adad1386f25379cf73200d2002c449" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", "zvariant_utils", ] [[package]] name = "zvariant_utils" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc242db087efc22bd9ade7aa7809e4ba828132edc312871584a6b4391bdf8786" +checksum = "c51bcff7cc3dbb5055396bcf774748c3dab426b4b8659046963523cee4808340" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.77", ] diff --git a/pkgs/applications/networking/feedreaders/newsflash/default.nix b/pkgs/applications/networking/feedreaders/newsflash/default.nix index 779a811605b7a..f751c13329176 100644 --- a/pkgs/applications/networking/feedreaders/newsflash/default.nix +++ b/pkgs/applications/networking/feedreaders/newsflash/default.nix @@ -1,18 +1,17 @@ { lib, stdenv, - rustPlatform, fetchFromGitLab, - substituteAll, + rustPlatform, + blueprint-compiler, cargo, + desktop-file-utils, meson, ninja, pkg-config, rustc, - blueprint-compiler, wrapGAppsHook4, gdk-pixbuf, - glib, clapper, gtk4, libadwaita, @@ -28,60 +27,46 @@ stdenv.mkDerivation (finalAttrs: { pname = "newsflash"; - version = "3.3.0"; + version = "3.3.5"; src = fetchFromGitLab { owner = "news-flash"; repo = "news_flash_gtk"; rev = "refs/tags/v.${finalAttrs.version}"; - hash = "sha256-s8h/OIJJzMmsCsaQJ0SOjCAVXfYQbjOupdDtLOqM9d0="; + hash = "sha256-H2/qKnsByidziUldX5MZBrMyMHfuQ4SN9wXizJUGQ8I="; }; cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; outputHashes = { - "clapper-0.1.0" = "sha256-xQ7l6luO5E4PMjtN9elg0bkJa7IhWzA7KuYDJ+m/VY0="; - "news-flash-2.3.0-alpha.0" = "sha256-ZgX6tQmPDMSpLcYD04u2ReQXdzeGzQTwGaUy/y4z4do="; + "article_scraper-2.1.0" = "sha256-0jDXH5kkX34tAWK+3hpmW1LWBsFksVgTnSuQX+XXVEM="; + "clapper-0.1.0" = "sha256-IFFqfSq2OpzfopQXSYfnJ68HGLY+rvcLqk7NTdDd+28="; + "news-flash-2.3.0-alpha.0" = "sha256-L7siGYdb8v57nBGYs86smlw971fvurYQJKK/AdTpi6s="; "newsblur_api-0.3.0" = "sha256-m2178zdJzeskl3BQpZr6tlxTAADehxz8uYcZzi15nhQ="; }; }; - patches = [ - # Post install tries to generate an icon cache & update the - # desktop database. The gtk setup hook drop-icon-theme-cache.sh - # would strip out the icon cache and the desktop database wouldn't - # be included in $out. They will generated by xdg.mime.enable & - # gtk.iconCache.enable instead. - ./no-post-install.patch - - # Replace placeholder "0.0.0" project version with nixpkgs version - (substituteAll { - src = ./hardcode-version.patch; - inherit (finalAttrs) version; - }) - ]; - postPatch = '' patchShebangs build-aux/cargo.sh + meson rewrite kwargs set project / version '${finalAttrs.version}' ''; strictDeps = true; nativeBuildInputs = [ + blueprint-compiler + cargo + desktop-file-utils meson ninja pkg-config + rustc + rustPlatform.cargoSetupHook wrapGAppsHook4 # Provides setup hook to fix "Unrecognized image file format" gdk-pixbuf - # Provides glib-compile-resources to compile gresources - glib - rustPlatform.cargoSetupHook - cargo - rustc - blueprint-compiler ]; buildInputs = @@ -110,15 +95,15 @@ stdenv.mkDerivation (finalAttrs: { passthru.updateScript = gitUpdater { rev-prefix = "v."; }; - meta = with lib; { + meta = { description = "Modern feed reader designed for the GNOME desktop"; homepage = "https://gitlab.com/news-flash/news_flash_gtk"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ kira-bruneau stunkymonkey ]; - platforms = platforms.unix; + platforms = lib.platforms.unix; mainProgram = "io.gitlab.news_flash.NewsFlash"; }; }) diff --git a/pkgs/applications/networking/feedreaders/newsflash/hardcode-version.patch b/pkgs/applications/networking/feedreaders/newsflash/hardcode-version.patch deleted file mode 100644 index 972ec7464e08f..0000000000000 --- a/pkgs/applications/networking/feedreaders/newsflash/hardcode-version.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/meson.build b/meson.build -index 55a5048a..1c648189 100644 ---- a/meson.build -+++ b/meson.build -@@ -1,6 +1,6 @@ - project( - 'newsflash', 'rust', -- version: '0.0.0', -+ version: '@version@', - license: 'GPLv3', - ) - diff --git a/pkgs/applications/networking/feedreaders/newsflash/no-post-install.patch b/pkgs/applications/networking/feedreaders/newsflash/no-post-install.patch deleted file mode 100644 index ba316812bbeb9..0000000000000 --- a/pkgs/applications/networking/feedreaders/newsflash/no-post-install.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/meson.build b/meson.build -index e554ddd7..55a5048a 100644 ---- a/meson.build -+++ b/meson.build -@@ -56,10 +56,3 @@ meson.add_dist_script( - subdir('data') - subdir('po') - subdir('src') -- --gnome.post_install( -- gtk_update_icon_cache: true, -- glib_compile_schemas: false, -- update_desktop_database: true, --) -- diff --git a/pkgs/applications/networking/feedreaders/rsstail/default.nix b/pkgs/applications/networking/feedreaders/rsstail/default.nix index 524e8d76b6973..cecad11a4f632 100644 --- a/pkgs/applications/networking/feedreaders/rsstail/default.nix +++ b/pkgs/applications/networking/feedreaders/rsstail/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "12p69i3g1fwlw0bds9jqsdmzkid3k5a41w31d227i7vm12wcvjf6"; }; - buildInputs = [ libmrss ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = [ libmrss ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; postPatch = '' substituteInPlace Makefile --replace -liconv_hook "" diff --git a/pkgs/applications/networking/feedreaders/russ/default.nix b/pkgs/applications/networking/feedreaders/russ/default.nix index aa0154227c1e8..3fbaa2108d605 100644 --- a/pkgs/applications/networking/feedreaders/russ/default.nix +++ b/pkgs/applications/networking/feedreaders/russ/default.nix @@ -2,7 +2,6 @@ , stdenv , fetchFromGitHub , rustPlatform -, xorg , darwin }: @@ -22,7 +21,7 @@ rustPlatform.buildRustPackage { # tests are network based :( doCheck = false; - buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ CoreServices AppKit ]); diff --git a/pkgs/applications/networking/feedreaders/tuifeed/default.nix b/pkgs/applications/networking/feedreaders/tuifeed/default.nix index be76874b2fccf..16bb0324d07a6 100644 --- a/pkgs/applications/networking/feedreaders/tuifeed/default.nix +++ b/pkgs/applications/networking/feedreaders/tuifeed/default.nix @@ -11,12 +11,12 @@ rustPlatform.buildRustPackage rec { src = fetchCrate { inherit pname version; - sha256 = "sha256-JG/l6NfN5RqBpz9NVcVY3mP/iE31TXvw+Vjq8N8rNIY="; + hash = "sha256-JG/l6NfN5RqBpz9NVcVY3mP/iE31TXvw+Vjq8N8rNIY="; }; cargoHash = "sha256-QKSNbpVRtSKp2q1jVPYTS8XCMtQAyg3AWvD/6+OjI7Y="; - buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; doCheck = false; diff --git a/pkgs/applications/networking/filebrowser/default.nix b/pkgs/applications/networking/filebrowser/default.nix index 334302cae0089..7adede3e32997 100644 --- a/pkgs/applications/networking/filebrowser/default.nix +++ b/pkgs/applications/networking/filebrowser/default.nix @@ -1,20 +1,27 @@ -{ buildGoModule, buildNpmPackage, fetchFromGitHub, lib }: +{ + buildGo123Module, + buildNpmPackage, + fetchFromGitHub, + lib, +}: let + version = "2.31.0"; + + src = fetchFromGitHub { + owner = "filebrowser"; + repo = "filebrowser"; + rev = "v${version}"; + hash = "sha256-zLM1fLrucIhzGdTTDu81ZnTIipK+iRnPhgfMiT1P+yg="; + }; + frontend = buildNpmPackage rec { pname = "filebrowser-frontend"; - version = "2.23.0"; - - src = fetchFromGitHub { - owner = "filebrowser"; - repo = "filebrowser"; - rev = "v${version}"; - hash = "sha256-xhBIJcEtxDdMXSgQtLAV0UWzPtrvKEil0WV76K5ycBc="; - }; + inherit version src; sourceRoot = "${src.name}/frontend"; - npmDepsHash = "sha256-acNIMKHc4q7eiFLPBtKZBNweEsrt+//0VR6dqwXHTvA="; + npmDepsHash = "sha256-5/yEMWkNPAS8/PkaHlPBGFLiJu7xK2GHYo5dYqHAfCE="; NODE_OPTIONS = "--openssl-legacy-provider"; @@ -28,18 +35,11 @@ let ''; }; in -buildGoModule rec { +buildGo123Module { pname = "filebrowser"; - version = "2.23.0"; + inherit version src; - src = fetchFromGitHub { - owner = "filebrowser"; - repo = "filebrowser"; - rev = "v${version}"; - hash = "sha256-xhBIJcEtxDdMXSgQtLAV0UWzPtrvKEil0WV76K5ycBc="; - }; - - vendorHash = "sha256-MR0ju2Nomb3j78Z+1YcJY+jPd40MZpuOTuQJM94AM8A="; + vendorHash = "sha256-N5aUs8rgTYXeb0qJhPQBCa6lUDkT6lH1bh+1u4bixos="; excludedPackages = [ "tools" ]; @@ -55,7 +55,8 @@ buildGoModule rec { description = "Filebrowser is a web application for managing files and directories"; homepage = "https://filebrowser.org"; license = licenses.asl20; - maintainers = with maintainers; [ nielsegberts ]; + maintainers = with maintainers; [ oakenshield ]; mainProgram = "filebrowser"; }; } + diff --git a/pkgs/applications/networking/firewalld/default.nix b/pkgs/applications/networking/firewalld/default.nix index 0743e7541d35b..1ea6f2f8d593c 100644 --- a/pkgs/applications/networking/firewalld/default.nix +++ b/pkgs/applications/networking/firewalld/default.nix @@ -31,13 +31,13 @@ let in stdenv.mkDerivation rec { pname = "firewalld"; - version = "2.1.2"; + version = "2.2.1"; src = fetchFromGitHub { owner = "firewalld"; repo = "firewalld"; rev = "v${version}"; - sha256 = "sha256-bCLMTWtgEay3fLKOFWUoWpOL1iGDHRR5hu+v06bLxLs="; + sha256 = "sha256-VI1LyedohInmZb7heNoZ/4cvLz5IImEE2tyNylvr2mU="; }; patches = [ @@ -99,6 +99,6 @@ stdenv.mkDerivation rec { description = "Firewall daemon with D-Bus interface"; homepage = "https://github.com/firewalld/firewalld"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/networking/flent/default.nix b/pkgs/applications/networking/flent/default.nix index 8aa1f9809c262..f2d796b213840 100644 --- a/pkgs/applications/networking/flent/default.nix +++ b/pkgs/applications/networking/flent/default.nix @@ -12,7 +12,7 @@ buildPythonApplication rec { version = "2.1.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-21gd6sPYCZll3Q2O7kucTRhXvc5byXeQr50+1bZVT3M="; + hash = "sha256-21gd6sPYCZll3Q2O7kucTRhXvc5byXeQr50+1bZVT3M="; }; buildInputs = [python.pkgs.sphinx]; diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix deleted file mode 100644 index 5bdda1c1f4efa..0000000000000 --- a/pkgs/applications/networking/flexget/default.nix +++ /dev/null @@ -1,89 +0,0 @@ -{ lib -, python3 -, fetchFromGitHub -}: - -python3.pkgs.buildPythonApplication rec { - pname = "flexget"; - version = "3.11.39"; - pyproject = true; - - # Fetch from GitHub in order to use `requirements.in` - src = fetchFromGitHub { - owner = "Flexget"; - repo = "Flexget"; - rev = "refs/tags/v${version}"; - hash = "sha256-saNxs+Xdf6OTRRcMTceU8/ITcYzwtP8VqRKxsWyas+o="; - }; - - postPatch = '' - # remove dependency constraints but keep environment constraints - sed 's/[~<>=][^;]*//' -i requirements.txt - ''; - - build-system = with python3.pkgs; [ - setuptools - wheel - ]; - - dependencies = with python3.pkgs; [ - # See https://github.com/Flexget/Flexget/blob/master/requirements.txt - apscheduler - beautifulsoup4 - click - colorama - commonmark - feedparser - guessit - html5lib - jinja2 - jsonschema - loguru - more-itertools - packaging - pendulum - psutil - pynzb - pyrsistent - pyrss2gen - python-dateutil - pyyaml - rebulk - requests - rich - rpyc - sqlalchemy - typing-extensions - - # WebUI requirements - cherrypy - flask-compress - flask-cors - flask-login - flask-restful - flask-restx - flask - pyparsing - werkzeug - zxcvbn - - # Plugins requirements - transmission-rpc - ]; - - pythonImportsCheck = [ - "flexget" - "flexget.plugins.clients.transmission" - ]; - - # ~400 failures - doCheck = false; - - meta = with lib; { - homepage = "https://flexget.com/"; - changelog = "https://github.com/Flexget/Flexget/releases/tag/v${version}"; - description = "Multipurpose automation tool for all of your media"; - license = licenses.mit; - maintainers = with maintainers; [ pbsds ]; - }; -} diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix index 10cf454dc659e..e8a1f90fbfa8b 100644 --- a/pkgs/applications/networking/ftp/filezilla/default.nix +++ b/pkgs/applications/networking/ftp/filezilla/default.nix @@ -50,9 +50,9 @@ stdenv.mkDerivation rec { wxGTK32 gtk3 xdg-utils - ] ++ lib.optionals stdenv.isDarwin [ CoreServices Security ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices Security ]; - preBuild = lib.optionalString (stdenv.isDarwin) '' + preBuild = lib.optionalString (stdenv.hostPlatform.isDarwin) '' export MACOSX_DEPLOYMENT_TARGET=11.0 ''; diff --git a/pkgs/applications/networking/ftp/taxi/default.nix b/pkgs/applications/networking/ftp/taxi/default.nix deleted file mode 100644 index 4b3303ecd0acd..0000000000000 --- a/pkgs/applications/networking/ftp/taxi/default.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, gobject-introspection -, gtk3 -, libgee -, libhandy -, libsecret -, libsoup -, meson -, ninja -, nix-update-script -, pantheon -, pkg-config -, python3 -, vala -, wrapGAppsHook3 -}: - -stdenv.mkDerivation rec { - pname = "taxi"; - version = "2.0.2"; - - src = fetchFromGitHub { - owner = "Alecaddd"; - repo = pname; - rev = version; - sha256 = "1a4a14b2d5vqbk56drzbbldp0nngfqhwycpyv8d3svi2nchkvpqa"; - }; - - nativeBuildInputs = [ - gobject-introspection - meson - ninja - pkg-config - python3 - vala - wrapGAppsHook3 - ]; - - buildInputs = [ - gtk3 - libgee - libhandy - libsecret - libsoup - pantheon.granite - ]; - - postPatch = '' - chmod +x meson/post_install.py - patchShebangs meson/post_install.py - ''; - - passthru.updateScript = nix-update-script { }; - - meta = with lib; { - homepage = "https://github.com/Alecaddd/taxi"; - description = "FTP Client that drives you anywhere"; - license = licenses.lgpl3Plus; - maintainers = with maintainers; [ AndersonTorres ] ++ teams.pantheon.members; - platforms = platforms.linux; - mainProgram = "com.github.alecaddd.taxi"; - }; -} diff --git a/pkgs/applications/networking/gdrive3/default.nix b/pkgs/applications/networking/gdrive3/default.nix index 4e7fea1296542..3fc7af9b14177 100644 --- a/pkgs/applications/networking/gdrive3/default.nix +++ b/pkgs/applications/networking/gdrive3/default.nix @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { }; }; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/applications/networking/geph/default.nix b/pkgs/applications/networking/geph/default.nix index 32b0fe1462946..43761b659b82f 100644 --- a/pkgs/applications/networking/geph/default.nix +++ b/pkgs/applications/networking/geph/default.nix @@ -1,26 +1,24 @@ -{ lib -, stdenvNoCC -, rustPlatform -, fetchFromGitHub -, buildGoModule -, makeWrapper -, nodejs -, pnpm -, cacert -, esbuild -, jq -, moreutils -, perl -, pkg-config -, glib -, webkitgtk -, libayatana-appindicator -, cairo -, openssl +{ + lib, + stdenvNoCC, + rustPlatform, + fetchFromGitHub, + buildGoModule, + makeWrapper, + nodejs, + pnpm, + esbuild, + perl, + pkg-config, + glib, + webkitgtk, + libayatana-appindicator, + cairo, + openssl, }: let - version = "4.11.0"; + version = "4.99.2"; geph-meta = with lib; { description = "Modular Internet censorship circumvention system designed specifically to deal with national filtering"; homepage = "https://geph.io"; @@ -37,10 +35,10 @@ in owner = "geph-official"; repo = pname; rev = "v${version}"; - hash = "sha256-6zii8WxJp++yqTkxejNDta7IW+SG0uPgmnWqX5Oa9PU="; + hash = "sha256-aZFm4+oUQungCPbxs7j1J8hLcCYoIodIEQEiQfjoLUw="; }; - cargoHash = "sha256-WI525ufJxuepRZHyx8tO4K+7WZuM/NlTVNqVMJH6avg="; + cargoHash = "sha256-ypnjVoscGqVifkjzFh2KE+3EVFWIiyahTNTil3nu/+s="; nativeBuildInputs = [ perl ]; @@ -56,8 +54,8 @@ in src = fetchFromGitHub { owner = "geph-official"; repo = "gephgui-pkg"; - rev = "3a6d2fa85603e9ac3d5d6286685d8a8ca792a508"; - hash = "sha256-SE1TwYvR3+zwdPxlanq4hovmJsOdCJQzWfSJ6sSyJ5k="; + rev = "3b045e21b8c587c26f9d5f0f2b4bdf0a34bfee80"; + hash = "sha256-p+AxAOznUsG45Ibm1kczapfmbK+aeex2js463eqZ8gY="; fetchSubmodules = true; }; @@ -96,18 +94,25 @@ in openssl ]; - ESBUILD_BINARY_PATH = "${lib.getExe (esbuild.override { - buildGoModule = args: buildGoModule (args // rec { - version = "0.15.10"; - src = fetchFromGitHub { - owner = "evanw"; - repo = "esbuild"; - rev = "v${version}"; - hash = "sha256-DebmLtgPrla+1UcvOHMnWmxa/ZqrugeRRKXIiJ9LYDk="; - }; - vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; - }); - })}"; + ESBUILD_BINARY_PATH = "${lib.getExe ( + esbuild.override { + buildGoModule = + args: + buildGoModule ( + args + // rec { + version = "0.15.10"; + src = fetchFromGitHub { + owner = "evanw"; + repo = "esbuild"; + rev = "v${version}"; + hash = "sha256-DebmLtgPrla+1UcvOHMnWmxa/ZqrugeRRKXIiJ9LYDk="; + }; + vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; + } + ); + } + )}"; pnpmRoot = "gephgui"; diff --git a/pkgs/applications/networking/gnmic/default.nix b/pkgs/applications/networking/gnmic/default.nix index 4ecc4b0440559..dfa28d8417d07 100644 --- a/pkgs/applications/networking/gnmic/default.nix +++ b/pkgs/applications/networking/gnmic/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "gnmic"; - version = "0.37.0"; + version = "0.38.2"; src = fetchFromGitHub { owner = "openconfig"; repo = pname; rev = "v${version}"; - hash = "sha256-PktDdwtdCHLgLVpCRLi+Rna7dO2JeAAT6myFesIhpYc="; + hash = "sha256-TSRexhhYny1L7znhjqPLudIMUYhyMQUmLClyXzsZxcY="; }; - vendorHash = "sha256-gxtVvh39VqJgS5VetnLpUyKJE8DcUZgn4MA8zdD/ccU="; + vendorHash = "sha256-pJz613QFdA+8HcV+U0aG+A+WDZtSZIgaLVqCnu4WQWo="; ldflags = [ "-s" "-w" diff --git a/pkgs/applications/networking/gnome-network-displays/default.nix b/pkgs/applications/networking/gnome-network-displays/default.nix index 1e3945ea63803..819e26b1a4c68 100644 --- a/pkgs/applications/networking/gnome-network-displays/default.nix +++ b/pkgs/applications/networking/gnome-network-displays/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { version = "0.92.2"; src = fetchurl { - url = "mirror://gnome/sources/${finalAttrs.pname}/${lib.versions.majorMinor finalAttrs.version}/${finalAttrs.pname}-${finalAttrs.version}.tar.xz"; + url = "mirror://gnome/sources/gnome-network-displays/${lib.versions.majorMinor finalAttrs.version}/gnome-network-displays-${finalAttrs.version}.tar.xz"; sha256 = "sha256-df35UJnRolVSiYcArpnrglxNKbTKA3LAGsNwlDF7cj4="; }; diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix index b6838844afe43..c34309258fc91 100644 --- a/pkgs/applications/networking/gns3/default.nix +++ b/pkgs/applications/networking/gns3/default.nix @@ -1,36 +1,38 @@ { callPackage , libsForQt5 +, python311Packages }: let mkGui = args: callPackage (import ./gui.nix (args)) { inherit (libsForQt5) wrapQtAppsHook; + python3Packages = python311Packages; }; mkServer = args: callPackage (import ./server.nix (args)) { }; -in { - +in +{ guiStable = mkGui { channel = "stable"; - version = "2.2.47"; - hash = "sha256-6UXQTPkRHbtNX6RzWMakCsO9YpkFlWliNnm+mZ4wuZA="; + version = "2.2.49"; + hash = "sha256-hvLJ4VilcgtpxHeboeSUuGAco9LEnUB8J6vy/ZPajbU="; }; guiPreview = mkGui { channel = "stable"; - version = "2.2.47"; - hash = "sha256-6UXQTPkRHbtNX6RzWMakCsO9YpkFlWliNnm+mZ4wuZA="; + version = "2.2.49"; + hash = "sha256-hvLJ4VilcgtpxHeboeSUuGAco9LEnUB8J6vy/ZPajbU="; }; serverStable = mkServer { channel = "stable"; - version = "2.2.47"; - hash = "sha256-iZ/1qACPLe7r1cZMhJbFRjVt/FlVgadBgp9tJwvYSi0="; + version = "2.2.49"; + hash = "sha256-fI49MxA6b2kPkUihLl32a6jo8oHcEwDEjmvSVDj8/So="; }; serverPreview = mkServer { channel = "stable"; - version = "2.2.47"; - hash = "sha256-iZ/1qACPLe7r1cZMhJbFRjVt/FlVgadBgp9tJwvYSi0="; + version = "2.2.49"; + hash = "sha256-fI49MxA6b2kPkUihLl32a6jo8oHcEwDEjmvSVDj8/So="; }; } diff --git a/pkgs/applications/networking/gns3/gui.nix b/pkgs/applications/networking/gns3/gui.nix index 895df8abfbc72..e01380bc286ab 100644 --- a/pkgs/applications/networking/gns3/gui.nix +++ b/pkgs/applications/networking/gns3/gui.nix @@ -1,41 +1,45 @@ -{ channel -, version -, hash +{ + channel, + version, + hash, }: -{ lib -, python3 -, fetchFromGitHub -, qt5 -, wrapQtAppsHook -, testers -, gns3-gui +{ + fetchFromGitHub, + gns3-gui, + lib, + python3Packages, + qt5, + testers, + wrapQtAppsHook, }: -python3.pkgs.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "gns3-gui"; inherit version; src = fetchFromGitHub { inherit hash; owner = "GNS3"; - repo = pname; + repo = "gns3-gui"; rev = "refs/tags/v${version}"; }; - nativeBuildInputs = with python3.pkgs; [ - wrapQtAppsHook - ]; + nativeBuildInputs = with python3Packages; [ wrapQtAppsHook ]; + + build-system = with python3Packages; [ setuptools ]; - propagatedBuildInputs = with python3.pkgs; [ + propagatedBuildInputs = [ qt5.qtwayland ]; + + dependencies = with python3Packages; [ distro jsonschema psutil sentry-sdk setuptools - sip4 (pyqt5.override { withWebSockets = true; }) + sip + (pyqt5.override { withWebSockets = true; }) truststore - qt5.qtwayland ] ++ lib.optionals (pythonOlder "3.9") [ importlib-resources ]; @@ -48,9 +52,7 @@ python3.pkgs.buildPythonApplication rec { doCheck = true; - checkInputs = with python3.pkgs; [ - pytestCheckHook - ]; + checkInputs = with python3Packages; [ pytestCheckHook ]; preCheck = '' export HOME=$(mktemp -d) @@ -64,7 +66,7 @@ python3.pkgs.buildPythonApplication rec { command = "${lib.getExe gns3-gui} --version"; }; - meta = with lib; { + meta = { description = "Graphical Network Simulator 3 GUI (${channel} release)"; longDescription = '' Graphical user interface for controlling the GNS3 network simulator. This @@ -73,9 +75,9 @@ python3.pkgs.buildPythonApplication rec { ''; homepage = "https://www.gns3.com/"; changelog = "https://github.com/GNS3/gns3-gui/releases/tag/v${version}"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ anthonyroussel ]; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ anthonyroussel ]; mainProgram = "gns3"; }; } diff --git a/pkgs/applications/networking/gns3/server.nix b/pkgs/applications/networking/gns3/server.nix index c6ba5fe2b93e6..dec90b620f704 100644 --- a/pkgs/applications/networking/gns3/server.nix +++ b/pkgs/applications/networking/gns3/server.nix @@ -1,17 +1,19 @@ -{ channel -, version -, hash +{ + channel, + version, + hash, }: -{ lib -, python3Packages -, fetchFromGitHub -, pkgsStatic -, stdenv -, nixosTests -, testers -, util-linux -, gns3-server +{ + fetchFromGitHub, + gns3-server, + lib, + nixosTests, + pkgsStatic, + python3Packages, + stdenv, + testers, + util-linux, }: python3Packages.buildPythonApplication { @@ -30,7 +32,9 @@ python3Packages.buildPythonApplication { cp ${pkgsStatic.busybox}/bin/busybox gns3server/compute/docker/resources/bin/busybox ''; - propagatedBuildInputs = with python3Packages; [ + build-system = with python3Packages; [ setuptools ]; + + dependencies = with python3Packages; [ aiofiles aiohttp aiohttp-cors @@ -44,7 +48,6 @@ python3Packages.buildPythonApplication { psutil py-cpuinfo sentry-sdk - setuptools truststore yarl ] ++ lib.optionals (pythonOlder "3.9") [ @@ -69,7 +72,7 @@ python3Packages.buildPythonApplication { checkInputs = with python3Packages; [ pytest-aiohttp pytest-rerunfailures - (pytestCheckHook.override { pytest = pytest_7; }) + pytestCheckHook ]; pytestFlagsArray = [ @@ -87,7 +90,7 @@ python3Packages.buildPythonApplication { }; }; - meta = with lib; { + meta = { description = "Graphical Network Simulator 3 server (${channel} release)"; longDescription = '' The GNS3 server manages emulators such as Dynamips, VirtualBox or @@ -96,9 +99,9 @@ python3Packages.buildPythonApplication { ''; homepage = "https://www.gns3.com/"; changelog = "https://github.com/GNS3/gns3-server/releases/tag/v${version}"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ anthonyroussel ]; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ anthonyroussel ]; mainProgram = "gns3server"; }; } diff --git a/pkgs/applications/networking/go-graft/default.nix b/pkgs/applications/networking/go-graft/default.nix index b57f57081b8c3..b2d34d9e90aaa 100644 --- a/pkgs/applications/networking/go-graft/default.nix +++ b/pkgs/applications/networking/go-graft/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "go-graft"; - version = "0.2.18"; + version = "0.2.19"; src = fetchFromGitHub { owner = "mzz2017"; repo = "gg"; rev = "v${version}"; - sha256 = "sha256-07fP3dVFs4MZrFOH/8/4e3LHjFGZd7pNu6J3LBOWAd8="; + sha256 = "sha256-DXW0NtFYvcCX4CgMs5/5HPaO9f9eFtw401wmJdCbHPU="; }; CGO_ENABLED = 0; diff --git a/pkgs/applications/networking/gopher/phetch/default.nix b/pkgs/applications/networking/gopher/phetch/default.nix index d8c30a9e6ab40..a74f94eceb60e 100644 --- a/pkgs/applications/networking/gopher/phetch/default.nix +++ b/pkgs/applications/networking/gopher/phetch/default.nix @@ -23,10 +23,10 @@ rustPlatform.buildRustPackage rec { hash = "sha256-J+ka7/B37WzVPPE2Krkd/TIiVwuKfI2QYWmT0JHgBGQ="; }; - cargoSha256 = "sha256-y3Y5PnZ51Zc3LmVTijUGnb0KaGm28sWOSYxjuM3A1Zk="; + cargoHash = "sha256-y3Y5PnZ51Zc3LmVTijUGnb0KaGm28sWOSYxjuM3A1Zk="; nativeBuildInputs = [ installShellFiles pkg-config scdoc which ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; postInstall = '' make manual diff --git a/pkgs/applications/networking/gopher/sacc/default.nix b/pkgs/applications/networking/gopher/sacc/default.nix index dc4ed20d7204e..92907d8a110de 100644 --- a/pkgs/applications/networking/gopher/sacc/default.nix +++ b/pkgs/applications/networking/gopher/sacc/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses libressl ]; - CFLAGS = lib.optionals stdenv.isDarwin [ + CFLAGS = lib.optionals stdenv.hostPlatform.isDarwin [ "-D_DARWIN_C_SOURCE" ]; diff --git a/pkgs/applications/networking/gossa/default.nix b/pkgs/applications/networking/gossa/default.nix index 66f024934b2a3..0a4073781434d 100644 --- a/pkgs/applications/networking/gossa/default.nix +++ b/pkgs/applications/networking/gossa/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , fetchFromGitHub , buildGoModule }: diff --git a/pkgs/applications/networking/headlines/default.nix b/pkgs/applications/networking/headlines/default.nix index a4e5a8e684c63..0ab9b639769bb 100644 --- a/pkgs/applications/networking/headlines/default.nix +++ b/pkgs/applications/networking/headlines/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { owner = "caveman250"; repo = "Headlines"; rev = version; - sha256 = "sha256-wamow0UozX5ecKbXWOgsWCerInL4J0gK0+Muf+eoO9k="; + hash = "sha256-wamow0UozX5ecKbXWOgsWCerInL4J0gK0+Muf+eoO9k="; }; nativeBuildInputs = [ 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/hyprspace/default.nix b/pkgs/applications/networking/hyprspace/default.nix deleted file mode 100644 index 77a3107420627..0000000000000 --- a/pkgs/applications/networking/hyprspace/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, iproute2mac }: - -buildGoModule rec { - pname = "hyprspace"; - version = "0.2.2"; - - propagatedBuildInputs = lib.optional stdenv.isDarwin iproute2mac; - - src = fetchFromGitHub { - owner = pname; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-UlIQCy4moW58tQ1dqxrPsU5LN1Bs/Jy5X+2CEmXdYIk="; - }; - - vendorHash = "sha256-EV59sXmjunWs+MC++CwyuBlbWzWZI1YXDLEsOaESgRU="; - - meta = with lib; { - description = "Lightweight VPN Built on top of Libp2p for Truly Distributed Networks"; - homepage = "https://github.com/hyprspace/hyprspace"; - license = licenses.asl20; - maintainers = with maintainers; [ yusdacra ]; - platforms = platforms.linux ++ platforms.darwin; - broken = true; # build fails with go > 1.17 - }; -} diff --git a/pkgs/applications/networking/ids/suricata/default.nix b/pkgs/applications/networking/ids/suricata/default.nix index 215606c527390..f654a96cb75d1 100644 --- a/pkgs/applications/networking/ids/suricata/default.nix +++ b/pkgs/applications/networking/ids/suricata/default.nix @@ -33,11 +33,11 @@ in stdenv.mkDerivation rec { pname = "suricata"; - version = "7.0.5"; + version = "7.0.6"; src = fetchurl { url = "https://www.openinfosecfoundation.org/download/${pname}-${version}.tar.gz"; - hash = "sha256-H/tWgVjyZcCFVEZL+4VOZWjvaDvwMxKSO1HyjFB5Ck4="; + hash = "sha256-IYJPf/Egh8DJud4gcZmnWpwxsDA2aIx8ucF48KO1f40="; }; nativeBuildInputs = [ @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - patches = lib.optional stdenv.is64bit ./bpf_stubs_workaround.patch; + patches = lib.optional stdenv.hostPlatform.is64bit ./bpf_stubs_workaround.patch; postPatch = '' substituteInPlace ./configure \ @@ -125,7 +125,10 @@ stdenv.mkDerivation rec { sed -i 's|${builtins.storeDir}/\(.\{8\}\)[^-]*-|${builtins.storeDir}/\1...-|g' ./src/build-info.h ''; - hardeningDisable = [ "stackprotector" ]; + # zerocallusedregs interferes during BPF compilation; TODO: perhaps improve + hardeningDisable = [ "stackprotector" "zerocallusedregs" ]; + + doCheck = true; installFlags = [ "e_datadir=\${TMPDIR}" diff --git a/pkgs/applications/networking/ids/zeek/broker/default.nix b/pkgs/applications/networking/ids/zeek/broker/default.nix index 1e9b6f3f0c08d..0fcdd5048c0e6 100644 --- a/pkgs/applications/networking/ids/zeek/broker/default.nix +++ b/pkgs/applications/networking/ids/zeek/broker/default.nix @@ -1,9 +1,7 @@ { stdenv , lib -, callPackage , fetchFromGitHub , cmake -, pkg-config , python3 , caf , openssl @@ -64,11 +62,11 @@ stdenv.mkDerivation rec { ./0001-Fix-include-path-in-exported-CMake-targets.patch ]; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace bindings/python/CMakeLists.txt --replace " -u -r" "" ''; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake python3 ]; buildInputs = [ openssl python3.pkgs.pybind11 ]; propagatedBuildInputs = [ caf' ]; @@ -78,7 +76,7 @@ stdenv.mkDerivation rec { "-DPY_MOD_INSTALL_DIR=${placeholder "py"}/${python3.sitePackages}/" ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-faligned-allocation"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-faligned-allocation"; meta = with lib; { description = "Zeek's Messaging Library"; diff --git a/pkgs/applications/networking/ids/zeek/default.nix b/pkgs/applications/networking/ids/zeek/default.nix index 6beba3f4c6b9b..8286c46bcb484 100644 --- a/pkgs/applications/networking/ids/zeek/default.nix +++ b/pkgs/applications/networking/ids/zeek/default.nix @@ -45,6 +45,7 @@ stdenv.mkDerivation rec { file flex python + swig ]; buildInputs = [ @@ -55,12 +56,11 @@ stdenv.mkDerivation rec { libpcap ncurses openssl - swig zlib python - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libkqueue - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ gettext ]; @@ -78,11 +78,11 @@ stdenv.mkDerivation rec { "-DZEEK_STATE_DIR=/var/lib/zeek" "-DZEEK_SPOOL_DIR=/var/spool/zeek" "-DDISABLE_JAVASCRIPT=ON" - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "-DLIBKQUEUE_ROOT_DIR=${libkqueue}" ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-faligned-allocation"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-faligned-allocation"; postInstall = '' for file in $out/share/zeek/base/frameworks/notice/actions/pp-alarms.zeek $out/share/zeek/base/frameworks/notice/main.zeek; do diff --git a/pkgs/applications/networking/instant-messengers/alfaview/default.nix b/pkgs/applications/networking/instant-messengers/alfaview/default.nix index d8c4089eee728..4e1230e614e91 100644 --- a/pkgs/applications/networking/instant-messengers/alfaview/default.nix +++ b/pkgs/applications/networking/instant-messengers/alfaview/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "alfaview"; - version = "9.12.0"; + version = "9.14.0"; src = fetchurl { url = "https://assets.alfaview.com/stable/linux/deb/${pname}_${version}.deb"; - hash = "sha256-nzSgJrlTRN4LDcdjvCIBwjBJTRRoch376R4PIbvcajQ="; + hash = "sha256-YBC6zjcxSnOOY3RSo0X1ixTY1to2vEEkj1/9rItLzNA="; }; nativeBuildInputs = [ @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { homepage = "https://alfaview.com"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; - maintainers = with maintainers; [ hexchen ]; + maintainers = [ ]; mainProgram = "alfaview"; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/applications/networking/instant-messengers/armcord/default.nix b/pkgs/applications/networking/instant-messengers/armcord/default.nix index f7336df2612f1..1c0ad5aa361a9 100644 --- a/pkgs/applications/networking/instant-messengers/armcord/default.nix +++ b/pkgs/applications/networking/instant-messengers/armcord/default.nix @@ -1,141 +1,83 @@ { lib , stdenv -, fetchurl -, autoPatchelfHook -, dpkg -, makeShellWrapper -, wrapGAppsHook3 -, alsa-lib -, at-spi2-atk -, at-spi2-core -, atk -, cairo -, cups -, dbus -, expat -, ffmpeg -, fontconfig -, freetype -, gdk-pixbuf -, glib -, gtk3 -, libappindicator-gtk3 -, libdrm -, libnotify -, libpulseaudio -, libsecret -, libuuid -, libxkbcommon -, mesa -, nss -, pango -, systemd -, xdg-utils -, xorg -, wayland -, pipewire +, fetchFromGitHub +, pnpm +, nodejs +, electron_31 +, makeWrapper +, copyDesktopItems +, makeDesktopItem }: - stdenv.mkDerivation rec { pname = "armcord"; - version = "3.2.7"; + version = "3.3.1"; + + src = fetchFromGitHub { + owner = "ArmCord"; + repo = "ArmCord"; + rev = "v${version}"; + hash = "sha256-rCcjanmr4s9Nc5QB3Rb5ptKF/Ge8PSZt0WvgIul3RGs="; + }; - src = - let - base = "https://github.com/ArmCord/ArmCord/releases/download"; - in - { - x86_64-linux = fetchurl { - url = "${base}/v${version}/ArmCord_${version}_amd64.deb"; - hash = "sha256-TFgO9ddz/Svi4QfugjTTejpV/m+xc1548cokzhVgwkw="; - }; - aarch64-linux = fetchurl { - url = "${base}/v${version}/ArmCord_${version}_arm64.deb"; - hash = "sha256-AJ4TSG3ry2P40vzK1fsaWgQ/O0z9r3z8+0uxSmddZKo="; - }; - }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + nativeBuildInputs = [ pnpm.configHook nodejs makeWrapper copyDesktopItems ]; - nativeBuildInputs = [ autoPatchelfHook dpkg makeShellWrapper wrapGAppsHook3 ]; + pnpmDeps = pnpm.fetchDeps { + inherit pname version src; + hash = "sha256-ZfErOj03NdkviNXV4bvZC8uPOk29RhgmSez/Qvw1sGo="; + }; - dontWrapGApps = true; + ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; - buildInputs = [ - alsa-lib - at-spi2-atk - at-spi2-core - atk - cairo - cups - dbus - expat - ffmpeg - fontconfig - freetype - gdk-pixbuf - glib - gtk3 - pango - systemd - mesa # for libgbm - nss - libuuid - libdrm - libnotify - libsecret - libpulseaudio - libxkbcommon - libappindicator-gtk3 - xorg.libX11 - xorg.libxcb - xorg.libXcomposite - xorg.libXcursor - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXi - xorg.libXrandr - xorg.libXrender - xorg.libXScrnSaver - xorg.libxshmfence - xorg.libXtst - wayland - pipewire - ]; + buildPhase = '' + runHook preBuild + + pnpm build - sourceRoot = "."; - unpackCmd = "dpkg-deb -x $src ."; + npm exec electron-builder -- \ + --dir \ + -c.electronDist="${electron_31.dist}" \ + -c.electronVersion="${electron_31.version}" + + runHook postBuild + ''; installPhase = '' runHook preInstall - mkdir -p "$out/bin" - cp -R "opt" "$out" - cp -R "usr/share" "$out/share" - chmod -R g-w "$out" + mkdir -p "$out/share/lib/armcord" + cp -r ./dist/*-unpacked/{locales,resources{,.pak}} "$out/share/lib/armcord" - # use makeShellWrapper (instead of the makeBinaryWrapper provided by wrapGAppsHook3) for proper shell variable expansion - # see https://github.com/NixOS/nixpkgs/issues/172583 - makeShellWrapper $out/opt/ArmCord/armcord $out/bin/armcord \ - "''${gappsWrapperArgs[@]}" \ - --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=UseOzonePlatform --enable-features=WebRTCPipeWireCapturer }}" \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath buildInputs}" \ - --suffix PATH : ${lib.makeBinPath [ xdg-utils ]} + install -Dm644 "build/icon.png" "$out/share/icons/hicolor/256x256/apps/armcord.png" - # Fix desktop link - substituteInPlace $out/share/applications/armcord.desktop \ - --replace /opt/ArmCord/ $out/bin/ + makeShellWrapper "${lib.getExe electron_31}" "$out/bin/armcord" \ + --add-flags "$out/share/lib/armcord/resources/app.asar" \ + "''${gappsWrapperArgs[@]}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ + --set-default ELECTRON_IS_DEV 0 \ + --inherit-argv0 runHook postInstall ''; + desktopItems = [ + (makeDesktopItem { + name = "armcord"; + desktopName = "ArmCord"; + exec = "armcord %U"; + icon = "armcord"; + comment = meta.description; + categories = [ "Network" ]; + startupWMClass = "ArmCord"; + terminal = false; + }) + ]; + meta = with lib; { description = "Lightweight, alternative desktop client for Discord"; homepage = "https://armcord.app"; downloadPage = "https://github.com/ArmCord/ArmCord"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.osl3; - maintainers = with maintainers; [ wrmilling ]; + maintainers = with maintainers; [ wrmilling water-sucks ]; platforms = [ "x86_64-linux" "aarch64-linux" ]; mainProgram = "armcord"; }; diff --git a/pkgs/applications/networking/instant-messengers/beeper/default.nix b/pkgs/applications/networking/instant-messengers/beeper/default.nix index 87d1d53c9ddea..b9ce525a9cbbb 100644 --- a/pkgs/applications/networking/instant-messengers/beeper/default.nix +++ b/pkgs/applications/networking/instant-messengers/beeper/default.nix @@ -10,11 +10,10 @@ }: let pname = "beeper"; - version = "3.106.2"; - name = "${pname}-${version}"; + version = "3.108.3"; src = fetchurl { - url = "https://download.todesktop.com/2003241lzgn20jd/beeper-3.106.2-build-240604xwl5q01pr-x86_64.AppImage"; - hash = "sha256-WbAWJJzk58UVmRN3RHmU/V6zPiLWAb7m7hns4gmP55M="; + url = "https://download.todesktop.com/2003241lzgn20jd/beeper-3.108.3-build-2407188w36frwla-x86_64.AppImage"; + hash = "sha256-mlbw5K7+xZqz05FWKgKnro5SiVG+uSTI7muErAt8PM0="; }; appimage = appimageTools.wrapType2 { inherit version pname src; @@ -25,7 +24,7 @@ let }; in stdenvNoCC.mkDerivation rec { - inherit name pname version; + inherit pname version; src = appimage; diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix index 6badb7cda7604..a763ed6e81e0e 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, stdenv, bitlbee, autoreconfHook, pkg-config, glib }: +{ lib, fetchFromGitHub, stdenv, bitlbee, autoreconfHook, pkg-config }: stdenv.mkDerivation rec { pname = "bitlbee-discord"; diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-mastodon/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee-mastodon/default.nix index 3e09a6aa25b85..0e014ea9a7906 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee-mastodon/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee-mastodon/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchgit, stdenv, bitlbee, autoreconfHook, pkg-config, glib }: +{ lib, fetchgit, stdenv, bitlbee, autoreconfHook, pkg-config }: stdenv.mkDerivation rec { pname = "bitlbee-mastodon"; diff --git a/pkgs/applications/networking/instant-messengers/bluejeans/default.nix b/pkgs/applications/networking/instant-messengers/bluejeans/default.nix index e1bc3b3b560fc..732f121f9dfaa 100644 --- a/pkgs/applications/networking/instant-messengers/bluejeans/default.nix +++ b/pkgs/applications/networking/instant-messengers/bluejeans/default.nix @@ -130,7 +130,7 @@ stdenv.mkDerivation rec { homepage = "https://www.bluejeans.com"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/caprine-bin/default.nix b/pkgs/applications/networking/instant-messengers/caprine-bin/default.nix index cadfe432b297e..f82ae2ac42201 100644 --- a/pkgs/applications/networking/instant-messengers/caprine-bin/default.nix +++ b/pkgs/applications/networking/instant-messengers/caprine-bin/default.nix @@ -18,7 +18,7 @@ let sha256 = "sha256-WMT4yrLjDSMsI/lFbYODu3/0whcF+++4ShoChfMyLfQ="; }; in -(if stdenvNoCC.isDarwin then x86_64-dmg else x86_64-appimage).overrideAttrs (oldAttrs: { +(if stdenvNoCC.hostPlatform.isDarwin then x86_64-dmg else x86_64-appimage).overrideAttrs (oldAttrs: { passthru = (oldAttrs.passthru or { }) // { inherit x86_64-appimage x86_64-dmg; }; meta = oldAttrs.meta // { platforms = x86_64-appimage.meta.platforms ++ x86_64-dmg.meta.platforms; diff --git a/pkgs/applications/networking/instant-messengers/chatterino2/default.nix b/pkgs/applications/networking/instant-messengers/chatterino2/default.nix index 43b5e7600bce2..be7862611f192 100644 --- a/pkgs/applications/networking/instant-messengers/chatterino2/default.nix +++ b/pkgs/applications/networking/instant-messengers/chatterino2/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { owner = "Chatterino"; repo = pname; rev = "v${version}"; - sha256 = "sha256-c3Vhzes54xLjKV0Of7D1eFpQvIWJwcUBXvLT2p6VwBE="; + hash = "sha256-c3Vhzes54xLjKV0Of7D1eFpQvIWJwcUBXvLT2p6VwBE="; fetchSubmodules = true; }; nativeBuildInputs = [ cmake pkg-config qt6.wrapQtAppsHook ]; @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { boost openssl libsecret - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ qt6.qtwayland ]; cmakeFlags = [ "-DBUILD_WITH_QT6=ON" ]; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p "$out/Applications" mv bin/chatterino.app "$out/Applications/" '' + '' diff --git a/pkgs/applications/networking/instant-messengers/chatty/default.nix b/pkgs/applications/networking/instant-messengers/chatty/default.nix index c939412e152f0..a18ba2c1b96ac 100644 --- a/pkgs/applications/networking/instant-messengers/chatty/default.nix +++ b/pkgs/applications/networking/instant-messengers/chatty/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "chatty"; - version = "0.8.3"; + version = "0.8.4"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { repo = "Chatty"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-Ywed/8PhOgmzcka+5dyxjmWTcDBPF90LW+C2eeQmyLo="; + hash = "sha256-1CHreTkw1C3tc6vOCG+7Y/u4R/xTFOnlI4mcxjY/alY="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/cinny-desktop/Cargo.lock b/pkgs/applications/networking/instant-messengers/cinny-desktop/Cargo.lock deleted file mode 100644 index 07f897d9fa662..0000000000000 --- a/pkgs/applications/networking/instant-messengers/cinny-desktop/Cargo.lock +++ /dev/null @@ -1,4801 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "aho-corasick" -version = "0.7.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" -dependencies = [ - "memchr", -] - -[[package]] -name = "aho-corasick" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" -dependencies = [ - "memchr", -] - -[[package]] -name = "alloc-no-stdlib" -version = "2.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3" - -[[package]] -name = "alloc-stdlib" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece" -dependencies = [ - "alloc-no-stdlib", -] - -[[package]] -name = "android-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 = "anyhow" -version = "1.0.66" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "216261ddc8289130e551ddcd5ce8a064710c0d064a4d2895c67151c92b5443f6" - -[[package]] -name = "async-broadcast" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c48ccdbf6ca6b121e0f586cbc0e73ae440e56c67c30fa0873b4e110d9c26d2b" -dependencies = [ - "event-listener", - "futures-core", -] - -[[package]] -name = "async-channel" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" -dependencies = [ - "concurrent-queue", - "event-listener", - "futures-core", -] - -[[package]] -name = "async-executor" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b0c4a4f319e45986f347ee47fef8bf5e81c9abc3f6f58dc2391439f30df65f0" -dependencies = [ - "async-lock", - "async-task", - "concurrent-queue", - "fastrand 2.0.1", - "futures-lite", - "slab", -] - -[[package]] -name = "async-fs" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06" -dependencies = [ - "async-lock", - "autocfg", - "blocking", - "futures-lite", -] - -[[package]] -name = "async-io" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" -dependencies = [ - "async-lock", - "autocfg", - "cfg-if", - "concurrent-queue", - "futures-lite", - "log", - "parking", - "polling", - "rustix", - "slab", - "socket2", - "waker-fn", -] - -[[package]] -name = "async-lock" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" -dependencies = [ - "event-listener", -] - -[[package]] -name = "async-process" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a9d28b1d97e08915212e2e45310d47854eafa69600756fc735fb788f75199c9" -dependencies = [ - "async-io", - "async-lock", - "autocfg", - "blocking", - "cfg-if", - "event-listener", - "futures-lite", - "rustix", - "signal-hook", - "windows-sys 0.48.0", -] - -[[package]] -name = "async-recursion" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.38", -] - -[[package]] -name = "async-task" -version = "4.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4eb2cdb97421e01129ccb49169d8279ed21e829929144f4a22a6e54ac549ca1" - -[[package]] -name = "async-trait" -version = "0.1.74" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.38", -] - -[[package]] -name = "atk" -version = "0.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c3d816ce6f0e2909a96830d6911c2aff044370b1ef92d7f267b43bae5addedd" -dependencies = [ - "atk-sys", - "bitflags", - "glib", - "libc", -] - -[[package]] -name = "atk-sys" -version = "0.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58aeb089fb698e06db8089971c7ee317ab9644bade33383f63631437b03aafb6" -dependencies = [ - "glib-sys", - "gobject-sys", - "libc", - "system-deps 6.0.3", -] - -[[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.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 = "base64" -version = "0.21.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[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.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e" -dependencies = [ - "generic-array", -] - -[[package]] -name = "blocking" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77231a1c8f801696fc0123ec6150ce92cffb8e164a02afb9c8ddee0e9b65ad65" -dependencies = [ - "async-channel", - "async-lock", - "async-task", - "atomic-waker", - "fastrand 1.8.0", - "futures-lite", - "log", -] - -[[package]] -name = "brotli" -version = "3.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1a0b1dbcc8ae29329621f8d4f0d835787c1c38bb1401979b49d13b0b305ff68" -dependencies = [ - "alloc-no-stdlib", - "alloc-stdlib", - "brotli-decompressor", -] - -[[package]] -name = "brotli-decompressor" -version = "2.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59ad2d4653bf5ca36ae797b1f4bb4dbddb60ce49ca4aed8a2ce4829f60425b80" -dependencies = [ - "alloc-no-stdlib", - "alloc-stdlib", -] - -[[package]] -name = "bstr" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223" -dependencies = [ - "memchr", -] - -[[package]] -name = "bumpalo" -version = "3.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba" - -[[package]] -name = "bytemuck" -version = "1.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aaa3a8d9a1ca92e282c96a32d6511b695d7d994d1d102ba85d279f9b2756947f" - -[[package]] -name = "byteorder" -version = "1.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" - -[[package]] -name = "bytes" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfb24e866b15a1af2a1b663f10c6b6b8f397a84aadb828f12e5b289ec23a3a3c" -dependencies = [ - "serde", -] - -[[package]] -name = "cairo-rs" -version = "0.15.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c76ee391b03d35510d9fa917357c7f1855bd9a6659c95a1b392e33f49b3369bc" -dependencies = [ - "bitflags", - "cairo-sys-rs", - "glib", - "libc", - "thiserror", -] - -[[package]] -name = "cairo-sys-rs" -version = "0.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c55d429bef56ac9172d25fecb85dc8068307d17acd74b377866b7a1ef25d3c8" -dependencies = [ - "glib-sys", - "libc", - "system-deps 6.0.3", -] - -[[package]] -name = "cargo_toml" -version = "0.15.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "599aa35200ffff8f04c1925aa1acc92fa2e08874379ef42e210a80e527e60838" -dependencies = [ - "serde", - "toml 0.7.8", -] - -[[package]] -name = "cc" -version = "1.0.83" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" -dependencies = [ - "libc", -] - -[[package]] -name = "cesu8" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" - -[[package]] -name = "cfb" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d38f2da7a0a2c4ccf0065be06397cc26a81f4e528be095826eee9d4adbb8c60f" -dependencies = [ - "byteorder", - "fnv", - "uuid", -] - -[[package]] -name = "cfg-expr" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3431df59f28accaf4cb4eed4a9acc66bea3f3c3753aa6cdc2f024174ef232af7" -dependencies = [ - "smallvec", -] - -[[package]] -name = "cfg-expr" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0357a6402b295ca3a86bc148e84df46c02e41f41fef186bda662557ef6328aa" -dependencies = [ - "smallvec", -] - -[[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 0.48.5", -] - -[[package]] -name = "cinny" -version = "3.2.0" -dependencies = [ - "serde", - "serde_json", - "tauri", - "tauri-build", -] - -[[package]] -name = "cocoa" -version = "0.24.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f425db7937052c684daec3bd6375c8abe2d146dca4b8b143d6db777c39138f3a" -dependencies = [ - "bitflags", - "block", - "cocoa-foundation", - "core-foundation", - "core-graphics", - "foreign-types", - "libc", - "objc", -] - -[[package]] -name = "cocoa-foundation" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ade49b65d560ca58c403a479bb396592b155c0185eada742ee323d1d68d6318" -dependencies = [ - "bitflags", - "block", - "core-foundation", - "core-graphics-types", - "foreign-types", - "libc", - "objc", -] - -[[package]] -name = "color_quant" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" - -[[package]] -name = "combine" -version = "4.6.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4" -dependencies = [ - "bytes", - "memchr", -] - -[[package]] -name = "concurrent-queue" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f057a694a54f12365049b0958a1685bb52d567f5593b355fbf685838e873d400" -dependencies = [ - "crossbeam-utils", -] - -[[package]] -name = "convert_case" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" - -[[package]] -name = "core-foundation" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "core-foundation-sys" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" - -[[package]] -name = "core-graphics" -version = "0.22.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb" -dependencies = [ - "bitflags", - "core-foundation", - "core-graphics-types", - "foreign-types", - "libc", -] - -[[package]] -name = "core-graphics-types" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a68b68b3446082644c91ac778bf50cd4104bfb002b5a6a7c44cca5a2c70788b" -dependencies = [ - "bitflags", - "core-foundation", - "foreign-types", - "libc", -] - -[[package]] -name = "cpufeatures" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" -dependencies = [ - "libc", -] - -[[package]] -name = "crc32fast" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "crossbeam-channel" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521" -dependencies = [ - "cfg-if", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb766fa798726286dbbb842f174001dab8abc7b627a1dd86e0b7222a95d929f" -dependencies = [ - "cfg-if", -] - -[[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 = "cssparser" -version = "0.27.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "754b69d351cdc2d8ee09ae203db831e005560fc6030da058f86ad60c92a9cb0a" -dependencies = [ - "cssparser-macros", - "dtoa-short", - "itoa 0.4.8", - "matches", - "phf 0.8.0", - "proc-macro2", - "quote", - "smallvec", - "syn 1.0.105", -] - -[[package]] -name = "cssparser-macros" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfae75de57f2b2e85e8768c3ea840fd159c8f33e2b6522c7835b7abac81be16e" -dependencies = [ - "quote", - "syn 1.0.105", -] - -[[package]] -name = "ctor" -version = "0.1.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" -dependencies = [ - "quote", - "syn 1.0.105", -] - -[[package]] -name = "cty" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35" - -[[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.38", -] - -[[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.38", -] - -[[package]] -name = "derivative" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.105", -] - -[[package]] -name = "derive_more" -version = "0.99.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" -dependencies = [ - "convert_case", - "proc-macro2", - "quote", - "rustc_version 0.4.0", - "syn 1.0.105", -] - -[[package]] -name = "digest" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" -dependencies = [ - "block-buffer", - "crypto-common", -] - -[[package]] -name = "dirs-next" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" -dependencies = [ - "cfg-if", - "dirs-sys-next", -] - -[[package]] -name = "dirs-sys-next" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" -dependencies = [ - "libc", - "redox_users", - "winapi", -] - -[[package]] -name = "dispatch" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" - -[[package]] -name = "dtoa" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56899898ce76aaf4a0f24d914c97ea6ed976d42fec6ad33fcbb0a1103e07b2b0" - -[[package]] -name = "dtoa-short" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bde03329ae10e79ede66c9ce4dc930aa8599043b0743008548680f25b91502d6" -dependencies = [ - "dtoa", -] - -[[package]] -name = "dunce" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bd4b30a6560bbd9b4620f4de34c3f14f60848e58a9b7216801afcb4c7b31c3c" - -[[package]] -name = "embed-resource" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f54cc3e827ee1c3812239a9a41dede7b4d7d5d5464faa32d71bd7cba28ce2cb2" -dependencies = [ - "cc", - "rustc_version 0.4.0", - "toml 0.8.5", - "vswhom", - "winreg 0.51.0", -] - -[[package]] -name = "embed_plist" -version = "1.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ef6b89e5b37196644d8796de5268852ff179b44e96276cf4290264843743bb7" - -[[package]] -name = "encoding_rs" -version = "0.8.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "enumflags2" -version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5998b4f30320c9d93aed72f63af821bfdac50465b75428fce77b48ec482c3939" -dependencies = [ - "enumflags2_derive", - "serde", -] - -[[package]] -name = "enumflags2_derive" -version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f95e2801cd355d4a1a3e3953ce6ee5ae9603a5c833455343a8bfe3f44d418246" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.38", -] - -[[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.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" -dependencies = [ - "libc", - "windows-sys 0.48.0", -] - -[[package]] -name = "event-listener" -version = "2.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" - -[[package]] -name = "fastrand" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499" -dependencies = [ - "instant", -] - -[[package]] -name = "fastrand" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" - -[[package]] -name = "field-offset" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e1c54951450cbd39f3dbcf1005ac413b49487dabf18a720ad2383eccfeffb92" -dependencies = [ - "memoffset 0.6.5", - "rustc_version 0.3.3", -] - -[[package]] -name = "filetime" -version = "0.2.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e884668cd0c7480504233e951174ddc3b382f7c2666e3b7310b5c4e7b0c37f9" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall", - "windows-sys 0.42.0", -] - -[[package]] -name = "flate2" -version = "1.0.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841" -dependencies = [ - "crc32fast", - "miniz_oxide", -] - -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "foreign-types" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "foreign-types-shared", -] - -[[package]] -name = "foreign-types-shared" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - -[[package]] -name = "form_urlencoded" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" -dependencies = [ - "percent-encoding", -] - -[[package]] -name = "futf" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df420e2e84819663797d1ec6544b13c5be84629e7bb00dc960d6917db2987843" -dependencies = [ - "mac", - "new_debug_unreachable", -] - -[[package]] -name = "futures-channel" -version = "0.3.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52ba265a92256105f45b719605a571ffe2d1f0fea3807304b522c1d778f79eed" -dependencies = [ - "futures-core", -] - -[[package]] -name = "futures-core" -version = "0.3.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04909a7a7e4633ae6c4a9ab280aeb86da1236243a77b694a49eacd659a4bd3ac" - -[[package]] -name = "futures-executor" -version = "0.3.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7acc85df6714c176ab5edf386123fafe217be88c0840ec11f199441134a074e2" -dependencies = [ - "futures-core", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-io" -version = "0.3.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00f5fb52a06bdcadeb54e8d3671f8888a39697dcb0b81b23b55174030427f4eb" - -[[package]] -name = "futures-lite" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" -dependencies = [ - "fastrand 1.8.0", - "futures-core", - "futures-io", - "memchr", - "parking", - "pin-project-lite", - "waker-fn", -] - -[[package]] -name = "futures-macro" -version = "0.3.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.105", -] - -[[package]] -name = "futures-sink" -version = "0.3.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" - -[[package]] -name = "futures-task" -version = "0.3.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ffb393ac5d9a6eaa9d3fdf37ae2776656b706e200c8e16b1bdb227f5198e6ea" - -[[package]] -name = "futures-util" -version = "0.3.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6" -dependencies = [ - "futures-core", - "futures-io", - "futures-macro", - "futures-sink", - "futures-task", - "memchr", - "pin-project-lite", - "pin-utils", - "slab", -] - -[[package]] -name = "fxhash" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" -dependencies = [ - "byteorder", -] - -[[package]] -name = "gdk" -version = "0.15.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6e05c1f572ab0e1f15be94217f0dc29088c248b14f792a5ff0af0d84bcda9e8" -dependencies = [ - "bitflags", - "cairo-rs", - "gdk-pixbuf", - "gdk-sys", - "gio", - "glib", - "libc", - "pango", -] - -[[package]] -name = "gdk-pixbuf" -version = "0.15.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad38dd9cc8b099cceecdf41375bb6d481b1b5a7cd5cd603e10a69a9383f8619a" -dependencies = [ - "bitflags", - "gdk-pixbuf-sys", - "gio", - "glib", - "libc", -] - -[[package]] -name = "gdk-pixbuf-sys" -version = "0.15.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "140b2f5378256527150350a8346dbdb08fadc13453a7a2d73aecd5fab3c402a7" -dependencies = [ - "gio-sys", - "glib-sys", - "gobject-sys", - "libc", - "system-deps 6.0.3", -] - -[[package]] -name = "gdk-sys" -version = "0.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32e7a08c1e8f06f4177fb7e51a777b8c1689f743a7bc11ea91d44d2226073a88" -dependencies = [ - "cairo-sys-rs", - "gdk-pixbuf-sys", - "gio-sys", - "glib-sys", - "gobject-sys", - "libc", - "pango-sys", - "pkg-config", - "system-deps 6.0.3", -] - -[[package]] -name = "gdkwayland-sys" -version = "0.15.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cca49a59ad8cfdf36ef7330fe7bdfbe1d34323220cc16a0de2679ee773aee2c2" -dependencies = [ - "gdk-sys", - "glib-sys", - "gobject-sys", - "libc", - "pkg-config", - "system-deps 6.0.3", -] - -[[package]] -name = "gdkx11-sys" -version = "0.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4b7f8c7a84b407aa9b143877e267e848ff34106578b64d1e0a24bf550716178" -dependencies = [ - "gdk-sys", - "glib-sys", - "libc", - "system-deps 6.0.3", - "x11", -] - -[[package]] -name = "generator" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d266041a359dfa931b370ef684cceb84b166beb14f7f0421f4a6a3d0c446d12e" -dependencies = [ - "cc", - "libc", - "log", - "rustversion", - "windows 0.39.0", -] - -[[package]] -name = "generic-array" -version = "0.14.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" -dependencies = [ - "typenum", - "version_check", -] - -[[package]] -name = "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.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" -dependencies = [ - "cfg-if", - "libc", - "wasi 0.11.0+wasi-snapshot-preview1", -] - -[[package]] -name = "gio" -version = "0.15.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68fdbc90312d462781a395f7a16d96a2b379bb6ef8cd6310a2df272771c4283b" -dependencies = [ - "bitflags", - "futures-channel", - "futures-core", - "futures-io", - "gio-sys", - "glib", - "libc", - "once_cell", - "thiserror", -] - -[[package]] -name = "gio-sys" -version = "0.15.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32157a475271e2c4a023382e9cab31c4584ee30a97da41d3c4e9fdd605abcf8d" -dependencies = [ - "glib-sys", - "gobject-sys", - "libc", - "system-deps 6.0.3", - "winapi", -] - -[[package]] -name = "glib" -version = "0.15.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edb0306fbad0ab5428b0ca674a23893db909a98582969c9b537be4ced78c505d" -dependencies = [ - "bitflags", - "futures-channel", - "futures-core", - "futures-executor", - "futures-task", - "glib-macros", - "glib-sys", - "gobject-sys", - "libc", - "once_cell", - "smallvec", - "thiserror", -] - -[[package]] -name = "glib-macros" -version = "0.15.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25a68131a662b04931e71891fb14aaf65ee4b44d08e8abc10f49e77418c86c64" -dependencies = [ - "anyhow", - "heck 0.4.0", - "proc-macro-crate", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 1.0.105", -] - -[[package]] -name = "glib-sys" -version = "0.15.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef4b192f8e65e9cf76cbf4ea71fa8e3be4a0e18ffe3d68b8da6836974cc5bad4" -dependencies = [ - "libc", - "system-deps 6.0.3", -] - -[[package]] -name = "glob" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" - -[[package]] -name = "globset" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a1e17342619edbc21a964c2afbeb6c820c6a2560032872f397bb97ea127bd0a" -dependencies = [ - "aho-corasick 0.7.20", - "bstr", - "fnv", - "log", - "regex", -] - -[[package]] -name = "gobject-sys" -version = "0.15.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d57ce44246becd17153bd035ab4d32cfee096a657fc01f2231c9278378d1e0a" -dependencies = [ - "glib-sys", - "libc", - "system-deps 6.0.3", -] - -[[package]] -name = "gtk" -version = "0.15.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92e3004a2d5d6d8b5057d2b57b3712c9529b62e82c77f25c1fecde1fd5c23bd0" -dependencies = [ - "atk", - "bitflags", - "cairo-rs", - "field-offset", - "futures-channel", - "gdk", - "gdk-pixbuf", - "gio", - "glib", - "gtk-sys", - "gtk3-macros", - "libc", - "once_cell", - "pango", - "pkg-config", -] - -[[package]] -name = "gtk-sys" -version = "0.15.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5bc2f0587cba247f60246a0ca11fe25fb733eabc3de12d1965fc07efab87c84" -dependencies = [ - "atk-sys", - "cairo-sys-rs", - "gdk-pixbuf-sys", - "gdk-sys", - "gio-sys", - "glib-sys", - "gobject-sys", - "libc", - "pango-sys", - "system-deps 6.0.3", -] - -[[package]] -name = "gtk3-macros" -version = "0.15.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24f518afe90c23fba585b2d7697856f9e6a7bbc62f65588035e66f6afb01a2e9" -dependencies = [ - "anyhow", - "proc-macro-crate", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 1.0.105", -] - -[[package]] -name = "h2" -version = "0.3.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833" -dependencies = [ - "bytes", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http", - "indexmap 1.9.2", - "slab", - "tokio", - "tokio-util", - "tracing", -] - -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" - -[[package]] -name = "hashbrown" -version = "0.14.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" - -[[package]] -name = "heck" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" -dependencies = [ - "unicode-segmentation", -] - -[[package]] -name = "heck" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" - -[[package]] -name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - -[[package]] -name = "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 = "html5ever" -version = "0.25.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5c13fb08e5d4dfc151ee5e88bae63f7773d61852f3bdc73c9f4b9e1bde03148" -dependencies = [ - "log", - "mac", - "markup5ever 0.10.1", - "proc-macro2", - "quote", - "syn 1.0.105", -] - -[[package]] -name = "html5ever" -version = "0.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bea68cab48b8459f17cf1c944c67ddc572d272d9f2b274140f223ecb1da4a3b7" -dependencies = [ - "log", - "mac", - "markup5ever 0.11.0", - "proc-macro2", - "quote", - "syn 1.0.105", -] - -[[package]] -name = "http" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399" -dependencies = [ - "bytes", - "fnv", - "itoa 1.0.4", -] - -[[package]] -name = "http-body" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" -dependencies = [ - "bytes", - "http", - "pin-project-lite", -] - -[[package]] -name = "http-range" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21dec9db110f5f872ed9699c3ecf50cf16f423502706ba5c72462e28d3157573" - -[[package]] -name = "httparse" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" - -[[package]] -name = "httpdate" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" - -[[package]] -name = "hyper" -version = "0.14.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" -dependencies = [ - "bytes", - "futures-channel", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "httparse", - "httpdate", - "itoa 1.0.4", - "pin-project-lite", - "socket2", - "tokio", - "tower-service", - "tracing", - "want", -] - -[[package]] -name = "hyper-tls" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" -dependencies = [ - "bytes", - "hyper", - "native-tls", - "tokio", - "tokio-native-tls", -] - -[[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 = "ico" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3804960be0bb5e4edb1e1ad67afd321a9ecfd875c3e65c099468fd2717d7cae" -dependencies = [ - "byteorder", - "png", -] - -[[package]] -name = "ident_case" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" - -[[package]] -name = "idna" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "ignore" -version = "0.4.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "713f1b139373f96a2e0ce3ac931cd01ee973c3c5dd7c40c0c2efe96ad2b6751d" -dependencies = [ - "crossbeam-utils", - "globset", - "lazy_static", - "log", - "memchr", - "regex", - "same-file", - "thread_local", - "walkdir", - "winapi-util", -] - -[[package]] -name = "image" -version = "0.24.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69b7ea949b537b0fd0af141fff8c77690f2ce96f4f41f042ccb6c69c6c965945" -dependencies = [ - "bytemuck", - "byteorder", - "color_quant", - "num-rational", - "num-traits", -] - -[[package]] -name = "indexmap" -version = "1.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" -dependencies = [ - "autocfg", - "hashbrown 0.12.3", - "serde", -] - -[[package]] -name = "indexmap" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897" -dependencies = [ - "equivalent", - "hashbrown 0.14.2", - "serde", -] - -[[package]] -name = "infer" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a898e4b7951673fce96614ce5751d13c40fc5674bc2d759288e46c3ab62598b3" -dependencies = [ - "cfb", -] - -[[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "io-lifetimes" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" -dependencies = [ - "hermit-abi 0.3.3", - "libc", - "windows-sys 0.48.0", -] - -[[package]] -name = "ipnet" -version = "2.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" - -[[package]] -name = "itoa" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" - -[[package]] -name = "itoa" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc" - -[[package]] -name = "javascriptcore-rs" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf053e7843f2812ff03ef5afe34bb9c06ffee120385caad4f6b9967fcd37d41c" -dependencies = [ - "bitflags", - "glib", - "javascriptcore-rs-sys", -] - -[[package]] -name = "javascriptcore-rs-sys" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "905fbb87419c5cde6e3269537e4ea7d46431f3008c5d057e915ef3f115e7793c" -dependencies = [ - "glib-sys", - "gobject-sys", - "libc", - "system-deps 5.0.0", -] - -[[package]] -name = "jni" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "039022cdf4d7b1cf548d31f60ae783138e5fd42013f6271049d7df7afadef96c" -dependencies = [ - "cesu8", - "combine", - "jni-sys", - "log", - "thiserror", - "walkdir", -] - -[[package]] -name = "jni-sys" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" - -[[package]] -name = "js-sys" -version = "0.3.60" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "json-patch" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55ff1e1486799e3f64129f8ccad108b38290df9cd7015cd31bed17239f0789d6" -dependencies = [ - "serde", - "serde_json", - "thiserror", - "treediff", -] - -[[package]] -name = "kuchiki" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ea8e9c6e031377cff82ee3001dc8026cdf431ed4e2e6b51f98ab8c73484a358" -dependencies = [ - "cssparser", - "html5ever 0.25.2", - "matches", - "selectors", -] - -[[package]] -name = "kuchikiki" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e4755b7b995046f510a7520c42b2fed58b77bd94d5a87a8eb43d2fd126da8" -dependencies = [ - "cssparser", - "html5ever 0.26.0", - "indexmap 1.9.2", - "matches", - "selectors", -] - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "libappindicator" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db2d3cb96d092b4824cb306c9e544c856a4cb6210c1081945187f7f1924b47e8" -dependencies = [ - "glib", - "gtk", - "gtk-sys", - "libappindicator-sys", - "log", -] - -[[package]] -name = "libappindicator-sys" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1b3b6681973cea8cc3bce7391e6d7d5502720b80a581c9a95c9cbaf592826aa" -dependencies = [ - "gtk-sys", - "libloading", - "once_cell", -] - -[[package]] -name = "libc" -version = "0.2.149" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" - -[[package]] -name = "libloading" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" -dependencies = [ - "cfg-if", - "winapi", -] - -[[package]] -name = "line-wrap" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30344350a2a51da54c1d53be93fade8a237e545dbcc4bdbe635413f2117cab9" -dependencies = [ - "safemem", -] - -[[package]] -name = "linux-raw-sys" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" - -[[package]] -name = "lock_api" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" -dependencies = [ - "autocfg", - "scopeguard", -] - -[[package]] -name = "log" -version = "0.4.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" - -[[package]] -name = "loom" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff50ecb28bb86013e935fb6683ab1f6d3a20016f123c76fd4c27470076ac30f5" -dependencies = [ - "cfg-if", - "generator", - "scoped-tls", - "serde", - "serde_json", - "tracing", - "tracing-subscriber", -] - -[[package]] -name = "mac" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4" - -[[package]] -name = "mac-notification-sys" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e72d50edb17756489e79d52eb146927bec8eba9dd48faadf9ef08bca3791ad5" -dependencies = [ - "cc", - "dirs-next", - "objc-foundation", - "objc_id", - "time", -] - -[[package]] -name = "malloc_buf" -version = "0.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" -dependencies = [ - "libc", -] - -[[package]] -name = "markup5ever" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a24f40fb03852d1cdd84330cddcaf98e9ec08a7b7768e952fad3b4cf048ec8fd" -dependencies = [ - "log", - "phf 0.8.0", - "phf_codegen 0.8.0", - "string_cache", - "string_cache_codegen", - "tendril", -] - -[[package]] -name = "markup5ever" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a2629bb1404f3d34c2e921f21fd34ba00b206124c81f65c50b43b6aaefeb016" -dependencies = [ - "log", - "phf 0.10.1", - "phf_codegen 0.10.0", - "string_cache", - "string_cache_codegen", - "tendril", -] - -[[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 = "matches" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" - -[[package]] -name = "memchr" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" - -[[package]] -name = "memoffset" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" -dependencies = [ - "autocfg", -] - -[[package]] -name = "memoffset" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" -dependencies = [ - "autocfg", -] - -[[package]] -name = "mime" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" - -[[package]] -name = "minisign-verify" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "933dca44d65cdd53b355d0b73d380a2ff5da71f87f036053188bf1eab6a19881" - -[[package]] -name = "miniz_oxide" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" -dependencies = [ - "adler", -] - -[[package]] -name = "mio" -version = "0.8.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0" -dependencies = [ - "libc", - "log", - "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.48.0", -] - -[[package]] -name = "native-tls" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" -dependencies = [ - "lazy_static", - "libc", - "log", - "openssl", - "openssl-probe", - "openssl-sys", - "schannel", - "security-framework", - "security-framework-sys", - "tempfile", -] - -[[package]] -name = "ndk" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2032c77e030ddee34a6787a64166008da93f6a352b629261d0fee232b8742dd4" -dependencies = [ - "bitflags", - "jni-sys", - "ndk-sys", - "num_enum", - "thiserror", -] - -[[package]] -name = "ndk-context" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" - -[[package]] -name = "ndk-sys" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e5a6ae77c8ee183dcbbba6150e2e6b9f3f4196a7666c02a715a95692ec1fa97" -dependencies = [ - "jni-sys", -] - -[[package]] -name = "new_debug_unreachable" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" - -[[package]] -name = "nix" -version = "0.26.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" -dependencies = [ - "bitflags", - "cfg-if", - "libc", - "memoffset 0.7.1", -] - -[[package]] -name = "nodrop" -version = "0.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" - -[[package]] -name = "notify-rust" -version = "4.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cc2e370356160e41aba3fd0fbac26d86a89ddd2ac4300c03de999a77cfa2509" -dependencies = [ - "mac-notification-sys", - "serde", - "tauri-winrt-notification", - "zbus", - "zvariant", - "zvariant_derive", -] - -[[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-integer" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" -dependencies = [ - "autocfg", - "num-traits", -] - -[[package]] -name = "num-rational" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-traits" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" -dependencies = [ - "autocfg", -] - -[[package]] -name = "num_cpus" -version = "1.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6058e64324c71e02bc2b150e4f3bc8286db6c83092132ffa3f6b1eab0f9def5" -dependencies = [ - "hermit-abi 0.1.19", - "libc", -] - -[[package]] -name = "num_enum" -version = "0.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf5395665662ef45796a4ff5486c5d41d29e0c09640af4c5f17fd94ee2c119c9" -dependencies = [ - "num_enum_derive", -] - -[[package]] -name = "num_enum_derive" -version = "0.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b0498641e53dd6ac1a4f22547548caa6864cc4933784319cd1775271c5a46ce" -dependencies = [ - "proc-macro-crate", - "proc-macro2", - "quote", - "syn 1.0.105", -] - -[[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-foundation" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9" -dependencies = [ - "block", - "objc", - "objc_id", -] - -[[package]] -name = "objc_exception" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4" -dependencies = [ - "cc", -] - -[[package]] -name = "objc_id" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b" -dependencies = [ - "objc", -] - -[[package]] -name = "once_cell" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860" - -[[package]] -name = "open" -version = "3.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2078c0039e6a54a0c42c28faa984e115fb4c2d5bf2208f77d1961002df8576f8" -dependencies = [ - "pathdiff", - "windows-sys 0.42.0", -] - -[[package]] -name = "openssl" -version = "0.10.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29d971fd5722fec23977260f6e81aa67d2f22cadbdc2aa049f1022d9a3be1566" -dependencies = [ - "bitflags", - "cfg-if", - "foreign-types", - "libc", - "once_cell", - "openssl-macros", - "openssl-sys", -] - -[[package]] -name = "openssl-macros" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.105", -] - -[[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.79" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5454462c0eced1e97f2ec09036abc8da362e66802f66fd20f86854d9d8cbcbc4" -dependencies = [ - "autocfg", - "cc", - "libc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "ordered-stream" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aa2b01e1d916879f73a53d01d1d6cee68adbb31d6d9177a8cfce093cced1d50" -dependencies = [ - "futures-core", - "pin-project-lite", -] - -[[package]] -name = "os_info" -version = "3.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4750134fb6a5d49afc80777394ad5d95b04bc12068c6abb92fae8f43817270f" -dependencies = [ - "log", - "serde", - "winapi", -] - -[[package]] -name = "os_pipe" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6a252f1f8c11e84b3ab59d7a488e48e4478a93937e027076638c49536204639" -dependencies = [ - "libc", - "windows-sys 0.42.0", -] - -[[package]] -name = "overload" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" - -[[package]] -name = "pango" -version = "0.15.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22e4045548659aee5313bde6c582b0d83a627b7904dd20dc2d9ef0895d414e4f" -dependencies = [ - "bitflags", - "glib", - "libc", - "once_cell", - "pango-sys", -] - -[[package]] -name = "pango-sys" -version = "0.15.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2a00081cde4661982ed91d80ef437c20eacaf6aa1a5962c0279ae194662c3aa" -dependencies = [ - "glib-sys", - "gobject-sys", - "libc", - "system-deps 6.0.3", -] - -[[package]] -name = "parking" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" - -[[package]] -name = "parking_lot" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" -dependencies = [ - "lock_api", - "parking_lot_core", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ff9f3fef3968a3ec5945535ed654cb38ff72d7495a25619e2247fb15a2ed9ba" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall", - "smallvec", - "windows-sys 0.42.0", -] - -[[package]] -name = "pathdiff" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" - -[[package]] -name = "percent-encoding" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" - -[[package]] -name = "pest" -version = "2.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc8bed3549e0f9b0a2a78bf7c0018237a2cdf085eecbbc048e52612438e4e9d0" -dependencies = [ - "thiserror", - "ucd-trie", -] - -[[package]] -name = "phf" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12" -dependencies = [ - "phf_macros 0.8.0", - "phf_shared 0.8.0", - "proc-macro-hack", -] - -[[package]] -name = "phf" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259" -dependencies = [ - "phf_macros 0.10.0", - "phf_shared 0.10.0", - "proc-macro-hack", -] - -[[package]] -name = "phf_codegen" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbffee61585b0411840d3ece935cce9cb6321f01c45477d30066498cd5e1a815" -dependencies = [ - "phf_generator 0.8.0", - "phf_shared 0.8.0", -] - -[[package]] -name = "phf_codegen" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb1c3a8bc4dd4e5cfce29b44ffc14bedd2ee294559a294e2a4d4c9e9a6a13cd" -dependencies = [ - "phf_generator 0.10.0", - "phf_shared 0.10.0", -] - -[[package]] -name = "phf_generator" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526" -dependencies = [ - "phf_shared 0.8.0", - "rand 0.7.3", -] - -[[package]] -name = "phf_generator" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6" -dependencies = [ - "phf_shared 0.10.0", - "rand 0.8.5", -] - -[[package]] -name = "phf_macros" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f6fde18ff429ffc8fe78e2bf7f8b7a5a5a6e2a8b58bc5a9ac69198bbda9189c" -dependencies = [ - "phf_generator 0.8.0", - "phf_shared 0.8.0", - "proc-macro-hack", - "proc-macro2", - "quote", - "syn 1.0.105", -] - -[[package]] -name = "phf_macros" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58fdf3184dd560f160dd73922bea2d5cd6e8f064bf4b13110abd81b03697b4e0" -dependencies = [ - "phf_generator 0.10.0", - "phf_shared 0.10.0", - "proc-macro-hack", - "proc-macro2", - "quote", - "syn 1.0.105", -] - -[[package]] -name = "phf_shared" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7" -dependencies = [ - "siphasher", -] - -[[package]] -name = "phf_shared" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" -dependencies = [ - "siphasher", -] - -[[package]] -name = "pin-project-lite" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" - -[[package]] -name = "pin-utils" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - -[[package]] -name = "pkg-config" -version = "0.3.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" - -[[package]] -name = "plist" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd39bc6cdc9355ad1dc5eeedefee696bb35c34caf21768741e81826c0bbd7225" -dependencies = [ - "base64 0.13.1", - "indexmap 1.9.2", - "line-wrap", - "serde", - "time", - "xml-rs", -] - -[[package]] -name = "png" -version = "0.17.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d708eaf860a19b19ce538740d2b4bdeeb8337fa53f7738455e706623ad5c638" -dependencies = [ - "bitflags", - "crc32fast", - "flate2", - "miniz_oxide", -] - -[[package]] -name = "polling" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" -dependencies = [ - "autocfg", - "bitflags", - "cfg-if", - "concurrent-queue", - "libc", - "log", - "pin-project-lite", - "windows-sys 0.48.0", -] - -[[package]] -name = "ppv-lite86" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" - -[[package]] -name = "precomputed-hash" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" - -[[package]] -name = "proc-macro-crate" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eda0fc3b0fb7c975631757e14d9049da17374063edb6ebbcbc54d880d4fe94e9" -dependencies = [ - "once_cell", - "thiserror", - "toml 0.5.9", -] - -[[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.105", - "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-macro-hack" -version = "0.5.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" - -[[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 = "quick-xml" -version = "0.23.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11bafc859c6815fbaffbbbf4229ecb767ac913fecb27f9ad4343662e9ef099ea" -dependencies = [ - "memchr", -] - -[[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.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -dependencies = [ - "getrandom 0.1.16", - "libc", - "rand_chacha 0.2.2", - "rand_core 0.5.1", - "rand_hc", - "rand_pcg", -] - -[[package]] -name = "rand" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" -dependencies = [ - "libc", - "rand_chacha 0.3.1", - "rand_core 0.6.4", -] - -[[package]] -name = "rand_chacha" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" -dependencies = [ - "ppv-lite86", - "rand_core 0.5.1", -] - -[[package]] -name = "rand_chacha" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" -dependencies = [ - "ppv-lite86", - "rand_core 0.6.4", -] - -[[package]] -name = "rand_core" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -dependencies = [ - "getrandom 0.1.16", -] - -[[package]] -name = "rand_core" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" -dependencies = [ - "getrandom 0.2.8", -] - -[[package]] -name = "rand_hc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -dependencies = [ - "rand_core 0.5.1", -] - -[[package]] -name = "rand_pcg" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429" -dependencies = [ - "rand_core 0.5.1", -] - -[[package]] -name = "raw-window-handle" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed7e3d950b66e19e0c372f3fa3fbbcf85b1746b571f74e0c2af6042a5c93420a" -dependencies = [ - "cty", -] - -[[package]] -name = "redox_syscall" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "bitflags", -] - -[[package]] -name = "redox_users" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" -dependencies = [ - "getrandom 0.2.8", - "redox_syscall", - "thiserror", -] - -[[package]] -name = "regex" -version = "1.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12de2eff854e5fa4b1295edd650e227e9d8fb0c9e90b12e7f36d6a6811791a29" -dependencies = [ - "aho-corasick 1.1.2", - "memchr", - "regex-automata 0.3.7", - "regex-syntax 0.7.5", -] - -[[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.28", -] - -[[package]] -name = "regex-automata" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49530408a136e16e5b486e883fbb6ba058e8e4e8ae6621a77b048b314336e629" -dependencies = [ - "aho-corasick 1.1.2", - "memchr", - "regex-syntax 0.7.5", -] - -[[package]] -name = "regex-syntax" -version = "0.6.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" - -[[package]] -name = "regex-syntax" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" - -[[package]] -name = "remove_dir_all" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" -dependencies = [ - "winapi", -] - -[[package]] -name = "reqwest" -version = "0.11.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b" -dependencies = [ - "base64 0.21.5", - "bytes", - "encoding_rs", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "hyper", - "hyper-tls", - "ipnet", - "js-sys", - "log", - "mime", - "native-tls", - "once_cell", - "percent-encoding", - "pin-project-lite", - "serde", - "serde_json", - "serde_urlencoded", - "system-configuration", - "tokio", - "tokio-native-tls", - "tokio-util", - "tower-service", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "wasm-streams", - "web-sys", - "winreg 0.50.0", -] - -[[package]] -name = "rfd" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0149778bd99b6959285b0933288206090c50e2327f47a9c463bfdbf45c8823ea" -dependencies = [ - "block", - "dispatch", - "glib-sys", - "gobject-sys", - "gtk-sys", - "js-sys", - "lazy_static", - "log", - "objc", - "objc-foundation", - "objc_id", - "raw-window-handle", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "windows 0.37.0", -] - -[[package]] -name = "rustc_version" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0dfe2087c51c460008730de8b57e6a320782fbfb312e1f4d520e6c6fae155ee" -dependencies = [ - "semver 0.11.0", -] - -[[package]] -name = "rustc_version" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" -dependencies = [ - "semver 1.0.14", -] - -[[package]] -name = "rustix" -version = "0.37.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" -dependencies = [ - "bitflags", - "errno", - "io-lifetimes", - "libc", - "linux-raw-sys", - "windows-sys 0.48.0", -] - -[[package]] -name = "rustversion" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97477e48b4cf8603ad5f7aaf897467cf42ab4218a38ef76fb14c2d6773a6d6a8" - -[[package]] -name = "ryu" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09" - -[[package]] -name = "safemem" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" - -[[package]] -name = "same-file" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "schannel" -version = "0.1.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88d6731146462ea25d9244b2ed5fd1d716d25c52e4d54aa4fb0f3c4e9854dbe2" -dependencies = [ - "lazy_static", - "windows-sys 0.36.1", -] - -[[package]] -name = "scoped-tls" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" - -[[package]] -name = "scopeguard" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" - -[[package]] -name = "security-framework" -version = "2.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bc1bb97804af6631813c55739f771071e0f2ed33ee20b68c86ec505d906356c" -dependencies = [ - "bitflags", - "core-foundation", - "core-foundation-sys", - "libc", - "security-framework-sys", -] - -[[package]] -name = "security-framework-sys" -version = "2.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0160a13a177a45bfb43ce71c01580998474f556ad854dcbca936dd2841a5c556" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "selectors" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df320f1889ac4ba6bc0cdc9c9af7af4bd64bb927bccdf32d81140dc1f9be12fe" -dependencies = [ - "bitflags", - "cssparser", - "derive_more", - "fxhash", - "log", - "matches", - "phf 0.8.0", - "phf_codegen 0.8.0", - "precomputed-hash", - "servo_arc", - "smallvec", - "thin-slice", -] - -[[package]] -name = "semver" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6" -dependencies = [ - "semver-parser", -] - -[[package]] -name = "semver" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e25dfac463d778e353db5be2449d1cce89bd6fd23c9f1ea21310ce6e5a1b29c4" -dependencies = [ - "serde", -] - -[[package]] -name = "semver-parser" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7" -dependencies = [ - "pest", -] - -[[package]] -name = "serde" -version = "1.0.190" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91d3c334ca1ee894a2c6f6ad698fe8c435b76d504b13d436f0685d648d6d96f7" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.190" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67c5609f394e5c2bd7fc51efda478004ea80ef42fee983d5c67a65e34f32c0e3" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.38", -] - -[[package]] -name = "serde_json" -version = "1.0.107" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" -dependencies = [ - "itoa 1.0.4", - "ryu", - "serde", -] - -[[package]] -name = "serde_repr" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fe39d9fbb0ebf5eb2c7cb7e2a47e4f462fad1379f1166b8ae49ad9eae89a7ca" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.105", -] - -[[package]] -name = "serde_spanned" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80" -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 1.0.4", - "ryu", - "serde", -] - -[[package]] -name = "serde_with" -version = "3.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64cd236ccc1b7a29e7e2739f27c0b2dd199804abc4290e32f59f3b68d6405c23" -dependencies = [ - "base64 0.21.5", - "chrono", - "hex", - "indexmap 1.9.2", - "indexmap 2.0.2", - "serde", - "serde_json", - "serde_with_macros", - "time", -] - -[[package]] -name = "serde_with_macros" -version = "3.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93634eb5f75a2323b16de4748022ac4297f9e76b6dced2be287a099f41b5e788" -dependencies = [ - "darling", - "proc-macro2", - "quote", - "syn 2.0.38", -] - -[[package]] -name = "serialize-to-javascript" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9823f2d3b6a81d98228151fdeaf848206a7855a7a042bbf9bf870449a66cafb" -dependencies = [ - "serde", - "serde_json", - "serialize-to-javascript-impl", -] - -[[package]] -name = "serialize-to-javascript-impl" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74064874e9f6a15f04c1f3cb627902d0e6b410abbf36668afa873c61889f1763" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.105", -] - -[[package]] -name = "servo_arc" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d98238b800e0d1576d8b6e3de32827c2d74bee68bb97748dcf5071fb53965432" -dependencies = [ - "nodrop", - "stable_deref_trait", -] - -[[package]] -name = "sha1" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest", -] - -[[package]] -name = "sha2" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest", -] - -[[package]] -name = "sharded-slab" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31" -dependencies = [ - "lazy_static", -] - -[[package]] -name = "shared_child" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0d94659ad3c2137fef23ae75b03d5241d633f8acded53d672decfa0e6e0caef" -dependencies = [ - "libc", - "winapi", -] - -[[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-registry" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" -dependencies = [ - "libc", -] - -[[package]] -name = "siphasher" -version = "0.3.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" - -[[package]] -name = "slab" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef" -dependencies = [ - "autocfg", -] - -[[package]] -name = "smallvec" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" - -[[package]] -name = "socket2" -version = "0.4.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "soup2" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2b4d76501d8ba387cf0fefbe055c3e0a59891d09f0f995ae4e4b16f6b60f3c0" -dependencies = [ - "bitflags", - "gio", - "glib", - "libc", - "once_cell", - "soup2-sys", -] - -[[package]] -name = "soup2-sys" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "009ef427103fcb17f802871647a7fa6c60cbb654b4c4e4c0ac60a31c5f6dc9cf" -dependencies = [ - "bitflags", - "gio-sys", - "glib-sys", - "gobject-sys", - "libc", - "system-deps 5.0.0", -] - -[[package]] -name = "stable_deref_trait" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" - -[[package]] -name = "state" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbe866e1e51e8260c9eed836a042a5e7f6726bb2b411dffeaa712e19c388f23b" -dependencies = [ - "loom", -] - -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - -[[package]] -name = "string_cache" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213494b7a2b503146286049378ce02b482200519accc31872ee8be91fa820a08" -dependencies = [ - "new_debug_unreachable", - "once_cell", - "parking_lot", - "phf_shared 0.10.0", - "precomputed-hash", - "serde", -] - -[[package]] -name = "string_cache_codegen" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bb30289b722be4ff74a408c3cc27edeaad656e06cb1fe8fa9231fa59c728988" -dependencies = [ - "phf_generator 0.10.0", - "phf_shared 0.10.0", - "proc-macro2", - "quote", -] - -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - -[[package]] -name = "strum" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7ac893c7d471c8a21f31cfe213ec4f6d9afeed25537c772e08ef3f005f8729e" -dependencies = [ - "strum_macros", -] - -[[package]] -name = "strum_macros" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "339f799d8b549e3744c7ac7feb216383e4005d94bdb22561b3ab8f3b808ae9fb" -dependencies = [ - "heck 0.3.3", - "proc-macro2", - "quote", - "syn 1.0.105", -] - -[[package]] -name = "syn" -version = "1.0.105" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60b9b43d45702de4c839cb9b51d9f529c5dd26a4aff255b42b1ebc03e88ee908" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "syn" -version = "2.0.38" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "sys-locale" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8a11bd9c338fdba09f7881ab41551932ad42e405f61d01e8406baea71c07aee" -dependencies = [ - "js-sys", - "libc", - "wasm-bindgen", - "web-sys", - "windows-sys 0.45.0", -] - -[[package]] -name = "system-configuration" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" -dependencies = [ - "bitflags", - "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 = "5.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18db855554db7bd0e73e06cf7ba3df39f97812cb11d3f75e71c39bf45171797e" -dependencies = [ - "cfg-expr 0.9.1", - "heck 0.3.3", - "pkg-config", - "toml 0.5.9", - "version-compare 0.0.11", -] - -[[package]] -name = "system-deps" -version = "6.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2955b1fe31e1fa2fbd1976b71cc69a606d7d4da16f6de3333d0c92d51419aeff" -dependencies = [ - "cfg-expr 0.11.0", - "heck 0.4.0", - "pkg-config", - "toml 0.5.9", - "version-compare 0.1.1", -] - -[[package]] -name = "tao" -version = "0.16.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75f5aefd6be4cd3ad3f047442242fd9f57cbfb3e565379f66b5e14749364fa4f" -dependencies = [ - "bitflags", - "cairo-rs", - "cc", - "cocoa", - "core-foundation", - "core-graphics", - "crossbeam-channel", - "dirs-next", - "dispatch", - "gdk", - "gdk-pixbuf", - "gdk-sys", - "gdkwayland-sys", - "gdkx11-sys", - "gio", - "glib", - "glib-sys", - "gtk", - "image", - "instant", - "jni", - "lazy_static", - "libappindicator", - "libc", - "log", - "ndk", - "ndk-context", - "ndk-sys", - "objc", - "once_cell", - "parking_lot", - "png", - "raw-window-handle", - "scopeguard", - "serde", - "tao-macros", - "unicode-segmentation", - "uuid", - "windows 0.39.0", - "windows-implement", - "x11-dl", -] - -[[package]] -name = "tao-macros" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec114582505d158b669b136e6851f85840c109819d77c42bb7c0709f727d18c2" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.105", -] - -[[package]] -name = "tar" -version = "0.4.38" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b55807c0344e1e6c04d7c965f5289c39a8d94ae23ed5c0b57aabac549f871c6" -dependencies = [ - "filetime", - "libc", - "xattr", -] - -[[package]] -name = "tauri" -version = "1.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bfe673cf125ef364d6f56b15e8ce7537d9ca7e4dae1cf6fbbdeed2e024db3d9" -dependencies = [ - "anyhow", - "base64 0.21.5", - "bytes", - "cocoa", - "dirs-next", - "embed_plist", - "encoding_rs", - "flate2", - "futures-util", - "glib", - "glob", - "gtk", - "heck 0.4.0", - "http", - "ignore", - "minisign-verify", - "notify-rust", - "objc", - "once_cell", - "open", - "os_info", - "os_pipe", - "percent-encoding", - "rand 0.8.5", - "raw-window-handle", - "regex", - "reqwest", - "rfd", - "semver 1.0.14", - "serde", - "serde_json", - "serde_repr", - "serialize-to-javascript", - "shared_child", - "state", - "sys-locale", - "tar", - "tauri-macros", - "tauri-runtime", - "tauri-runtime-wry", - "tauri-utils", - "tempfile", - "thiserror", - "time", - "tokio", - "url", - "uuid", - "webkit2gtk", - "webview2-com", - "windows 0.39.0", - "zip", -] - -[[package]] -name = "tauri-build" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "defbfc551bd38ab997e5f8e458f87396d2559d05ce32095076ad6c30f7fc5f9c" -dependencies = [ - "anyhow", - "cargo_toml", - "dirs-next", - "heck 0.4.0", - "json-patch", - "semver 1.0.14", - "serde", - "serde_json", - "tauri-utils", - "tauri-winres", - "walkdir", -] - -[[package]] -name = "tauri-codegen" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b3475e55acec0b4a50fb96435f19631fb58cbcd31923e1a213de5c382536bbb" -dependencies = [ - "base64 0.21.5", - "brotli", - "ico", - "json-patch", - "plist", - "png", - "proc-macro2", - "quote", - "regex", - "semver 1.0.14", - "serde", - "serde_json", - "sha2", - "tauri-utils", - "thiserror", - "time", - "uuid", - "walkdir", -] - -[[package]] -name = "tauri-macros" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "613740228de92d9196b795ac455091d3a5fbdac2654abb8bb07d010b62ab43af" -dependencies = [ - "heck 0.4.0", - "proc-macro2", - "quote", - "syn 1.0.105", - "tauri-codegen", - "tauri-utils", -] - -[[package]] -name = "tauri-runtime" -version = "0.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07f8e9e53e00e9f41212c115749e87d5cd2a9eebccafca77a19722eeecd56d43" -dependencies = [ - "gtk", - "http", - "http-range", - "rand 0.8.5", - "raw-window-handle", - "serde", - "serde_json", - "tauri-utils", - "thiserror", - "url", - "uuid", - "webview2-com", - "windows 0.39.0", -] - -[[package]] -name = "tauri-runtime-wry" -version = "0.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8141d72b6b65f2008911e9ef5b98a68d1e3413b7a1464e8f85eb3673bb19a895" -dependencies = [ - "cocoa", - "gtk", - "percent-encoding", - "rand 0.8.5", - "raw-window-handle", - "tauri-runtime", - "tauri-utils", - "uuid", - "webkit2gtk", - "webview2-com", - "windows 0.39.0", - "wry", -] - -[[package]] -name = "tauri-utils" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34d55e185904a84a419308d523c2c6891d5e2dbcee740c4997eb42e75a7b0f46" -dependencies = [ - "brotli", - "ctor", - "dunce", - "glob", - "heck 0.4.0", - "html5ever 0.26.0", - "infer", - "json-patch", - "kuchikiki", - "log", - "memchr", - "phf 0.10.1", - "proc-macro2", - "quote", - "semver 1.0.14", - "serde", - "serde_json", - "serde_with", - "thiserror", - "url", - "walkdir", - "windows 0.39.0", -] - -[[package]] -name = "tauri-winres" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5993dc129e544393574288923d1ec447c857f3f644187f4fbf7d9a875fbfc4fb" -dependencies = [ - "embed-resource", - "toml 0.7.8", -] - -[[package]] -name = "tauri-winrt-notification" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c58de036c4d2e20717024de2a3c4bf56c301f07b21bc8ef9b57189fce06f1f3b" -dependencies = [ - "quick-xml", - "strum", - "windows 0.39.0", -] - -[[package]] -name = "tempfile" -version = "3.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" -dependencies = [ - "cfg-if", - "fastrand 1.8.0", - "libc", - "redox_syscall", - "remove_dir_all", - "winapi", -] - -[[package]] -name = "tendril" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d24a120c5fc464a3458240ee02c299ebcb9d67b5249c8848b09d639dca8d7bb0" -dependencies = [ - "futf", - "mac", - "utf-8", -] - -[[package]] -name = "thin-slice" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eaa81235c7058867fa8c0e7314f33dcce9c215f535d1913822a2b3f5e289f3c" - -[[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.38", -] - -[[package]] -name = "thread_local" -version = "1.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180" -dependencies = [ - "once_cell", -] - -[[package]] -name = "time" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a561bf4617eebd33bca6434b988f39ed798e527f51a1e797d0ee4f61c0a38376" -dependencies = [ - "itoa 1.0.4", - "serde", - "time-core", - "time-macros", -] - -[[package]] -name = "time-core" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" - -[[package]] -name = "time-macros" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d967f99f534ca7e495c575c62638eebc2898a8c84c119b89e250477bc4ba16b2" -dependencies = [ - "time-core", -] - -[[package]] -name = "tinyvec" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" -dependencies = [ - "tinyvec_macros", -] - -[[package]] -name = "tinyvec_macros" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" - -[[package]] -name = "tokio" -version = "1.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eab6d665857cc6ca78d6e80303a02cea7a7851e85dfbd77cbdc09bd129f1ef46" -dependencies = [ - "autocfg", - "bytes", - "libc", - "memchr", - "mio", - "num_cpus", - "pin-project-lite", - "socket2", - "windows-sys 0.42.0", -] - -[[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-util" -version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" -dependencies = [ - "bytes", - "futures-core", - "futures-sink", - "pin-project-lite", - "tokio", - "tracing", -] - -[[package]] -name = "toml" -version = "0.5.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7" -dependencies = [ - "serde", -] - -[[package]] -name = "toml" -version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" -dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit 0.19.15", -] - -[[package]] -name = "toml" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3efaf127c78d5339cc547cce4e4d973bd5e4f56e949a06d091c082ebeef2f800" -dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit 0.20.5", -] - -[[package]] -name = "toml_datetime" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" -dependencies = [ - "serde", -] - -[[package]] -name = "toml_edit" -version = "0.19.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" -dependencies = [ - "indexmap 2.0.2", - "serde", - "serde_spanned", - "toml_datetime", - "winnow", -] - -[[package]] -name = "toml_edit" -version = "0.20.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "782bf6c2ddf761c1e7855405e8975472acf76f7f36d0d4328bd3b7a2fae12a85" -dependencies = [ - "indexmap 2.0.2", - "serde", - "serde_spanned", - "toml_datetime", - "winnow", -] - -[[package]] -name = "tower-service" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" - -[[package]] -name = "tracing" -version = "0.1.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" -dependencies = [ - "cfg-if", - "pin-project-lite", - "tracing-attributes", - "tracing-core", -] - -[[package]] -name = "tracing-attributes" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.105", -] - -[[package]] -name = "tracing-core" -version = "0.1.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" -dependencies = [ - "once_cell", - "valuable", -] - -[[package]] -name = "tracing-log" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" -dependencies = [ - "lazy_static", - "log", - "tracing-core", -] - -[[package]] -name = "tracing-subscriber" -version = "0.3.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6176eae26dd70d0c919749377897b54a9276bd7061339665dd68777926b5a70" -dependencies = [ - "matchers", - "nu-ansi-term", - "once_cell", - "regex", - "sharded-slab", - "smallvec", - "thread_local", - "tracing", - "tracing-core", - "tracing-log", -] - -[[package]] -name = "treediff" -version = "4.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52984d277bdf2a751072b5df30ec0377febdb02f7696d64c2d7d54630bac4303" -dependencies = [ - "serde_json", -] - -[[package]] -name = "try-lock" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" - -[[package]] -name = "typenum" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" - -[[package]] -name = "ucd-trie" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e79c4d996edb816c91e4308506774452e55e95c3c9de07b6729e17e15a5ef81" - -[[package]] -name = "uds_windows" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce65604324d3cce9b966701489fbd0cf318cb1f7bd9dd07ac9a4ee6fb791930d" -dependencies = [ - "tempfile", - "winapi", -] - -[[package]] -name = "unicode-bidi" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" - -[[package]] -name = "unicode-ident" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3" - -[[package]] -name = "unicode-normalization" -version = "0.1.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "unicode-segmentation" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fdbf052a0783de01e944a6ce7a8cb939e295b1e7be835a1112c3b9a7f047a5a" - -[[package]] -name = "url" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" -dependencies = [ - "form_urlencoded", - "idna", - "percent-encoding", - "serde", -] - -[[package]] -name = "utf-8" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" - -[[package]] -name = "uuid" -version = "1.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "422ee0de9031b5b948b97a8fc04e3aa35230001a722ddd27943e0be31564ce4c" -dependencies = [ - "getrandom 0.2.8", -] - -[[package]] -name = "valuable" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" - -[[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.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c18c859eead79d8b95d09e4678566e8d70105c4e7b251f707a03df32442661b" - -[[package]] -name = "version-compare" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "579a42fc0b8e0c63b76519a339be31bed574929511fa53c1a3acae26eb258f29" - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "vswhom" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be979b7f07507105799e854203b470ff7c78a1639e330a58f183b5fea574608b" -dependencies = [ - "libc", - "vswhom-sys", -] - -[[package]] -name = "vswhom-sys" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3b17ae1f6c8a2b28506cd96d412eebf83b4a0ff2cbefeeb952f2f9dfa44ba18" -dependencies = [ - "cc", - "libc", -] - -[[package]] -name = "waker-fn" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" - -[[package]] -name = "walkdir" -version = "2.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" -dependencies = [ - "same-file", - "winapi", - "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.9.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" - -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] -name = "wasm-bindgen" -version = "0.2.83" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268" -dependencies = [ - "cfg-if", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.83" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142" -dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2", - "quote", - "syn 1.0.105", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-futures" -version = "0.4.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23639446165ca5a5de86ae1d8896b737ae80319560fbaa4c2887b7da6e7ebd7d" -dependencies = [ - "cfg-if", - "js-sys", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.83" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.83" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.105", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.83" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f" - -[[package]] -name = "wasm-streams" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4609d447824375f43e1ffbc051b50ad8f4b3ae8219680c94452ea05eb240ac7" -dependencies = [ - "futures-util", - "js-sys", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", -] - -[[package]] -name = "web-sys" -version = "0.3.60" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcda906d8be16e728fd5adc5b729afad4e444e106ab28cd1c7256e54fa61510f" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "webkit2gtk" -version = "0.18.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8f859735e4a452aeb28c6c56a852967a8a76c8eb1cc32dbf931ad28a13d6370" -dependencies = [ - "bitflags", - "cairo-rs", - "gdk", - "gdk-sys", - "gio", - "gio-sys", - "glib", - "glib-sys", - "gobject-sys", - "gtk", - "gtk-sys", - "javascriptcore-rs", - "libc", - "once_cell", - "soup2", - "webkit2gtk-sys", -] - -[[package]] -name = "webkit2gtk-sys" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d76ca6ecc47aeba01ec61e480139dda143796abcae6f83bcddf50d6b5b1dcf3" -dependencies = [ - "atk-sys", - "bitflags", - "cairo-sys-rs", - "gdk-pixbuf-sys", - "gdk-sys", - "gio-sys", - "glib-sys", - "gobject-sys", - "gtk-sys", - "javascriptcore-rs-sys", - "libc", - "pango-sys", - "pkg-config", - "soup2-sys", - "system-deps 6.0.3", -] - -[[package]] -name = "webview2-com" -version = "0.19.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4a769c9f1a64a8734bde70caafac2b96cada12cd4aefa49196b3a386b8b4178" -dependencies = [ - "webview2-com-macros", - "webview2-com-sys", - "windows 0.39.0", - "windows-implement", -] - -[[package]] -name = "webview2-com-macros" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaebe196c01691db62e9e4ca52c5ef1e4fd837dcae27dae3ada599b5a8fd05ac" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.105", -] - -[[package]] -name = "webview2-com-sys" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aac48ef20ddf657755fdcda8dfed2a7b4fc7e4581acce6fe9b88c3d64f29dee7" -dependencies = [ - "regex", - "serde", - "serde_json", - "thiserror", - "windows 0.39.0", - "windows-bindgen", - "windows-metadata", -] - -[[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.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" -dependencies = [ - "winapi", -] - -[[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" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57b543186b344cc61c85b5aab0d2e3adf4e0f99bc076eff9aa5927bcc0b8a647" -dependencies = [ - "windows_aarch64_msvc 0.37.0", - "windows_i686_gnu 0.37.0", - "windows_i686_msvc 0.37.0", - "windows_x86_64_gnu 0.37.0", - "windows_x86_64_msvc 0.37.0", -] - -[[package]] -name = "windows" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1c4bd0a50ac6020f65184721f758dba47bb9fbc2133df715ec74a237b26794a" -dependencies = [ - "windows-implement", - "windows_aarch64_msvc 0.39.0", - "windows_i686_gnu 0.39.0", - "windows_i686_msvc 0.39.0", - "windows_x86_64_gnu 0.39.0", - "windows_x86_64_msvc 0.39.0", -] - -[[package]] -name = "windows-bindgen" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68003dbd0e38abc0fb85b939240f4bce37c43a5981d3df37ccbaaa981b47cb41" -dependencies = [ - "windows-metadata", - "windows-tokens", -] - -[[package]] -name = "windows-core" -version = "0.51.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" -dependencies = [ - "windows-targets 0.48.5", -] - -[[package]] -name = "windows-implement" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba01f98f509cb5dc05f4e5fc95e535f78260f15fea8fe1a8abdd08f774f1cee7" -dependencies = [ - "syn 1.0.105", - "windows-tokens", -] - -[[package]] -name = "windows-metadata" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ee5e275231f07c6e240d14f34e1b635bf1faa1c76c57cfd59a5cdb9848e4278" - -[[package]] -name = "windows-sys" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" -dependencies = [ - "windows_aarch64_msvc 0.36.1", - "windows_i686_gnu 0.36.1", - "windows_i686_msvc 0.36.1", - "windows_x86_64_gnu 0.36.1", - "windows_x86_64_msvc 0.36.1", -] - -[[package]] -name = "windows-sys" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" -dependencies = [ - "windows_aarch64_gnullvm 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-sys" -version = "0.45.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" -dependencies = [ - "windows-targets 0.42.2", -] - -[[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-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-tokens" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f838de2fe15fe6bac988e74b798f26499a8b21a9d97edec321e79b28d1d7f597" - -[[package]] -name = "windows_aarch64_gnullvm" -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 = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2623277cb2d1c216ba3b578c0f3cf9cdebeddb6e66b1b218bb33596ea7769c3a" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec7711666096bd4096ffa835238905bb33fb87267910e154b18b44eaabb340f2" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" - -[[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.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" - -[[package]] -name = "windows_i686_gnu" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3925fd0b0b804730d44d4b6278c50f9699703ec49bcd628020f46f4ba07d9e1" - -[[package]] -name = "windows_i686_gnu" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "763fc57100a5f7042e3057e7e8d9bdd7860d330070251a73d003563a3bb49e1b" - -[[package]] -name = "windows_i686_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" - -[[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.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" - -[[package]] -name = "windows_i686_msvc" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce907ac74fe331b524c1298683efbf598bb031bc84d5e274db2083696d07c57c" - -[[package]] -name = "windows_i686_msvc" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bc7cbfe58828921e10a9f446fcaaf649204dcfe6c1ddd712c5eebae6bda1106" - -[[package]] -name = "windows_i686_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" - -[[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.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2babfba0828f2e6b32457d5341427dcbb577ceef556273229959ac23a10af33d" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6868c165637d653ae1e8dc4d82c25d4f97dd6605eaa8d784b5c6e0ab2a252b65" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" - -[[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.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -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_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4dd6dc7df2d84cf7b33822ed5b86318fb1781948e9663bacd047fc9dd52259d" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e4d40883ae9cae962787ca76ba76390ffa29214667a111db9e0a1ad8377e809" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" - -[[package]] -name = "winnow" -version = "0.5.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3b801d0e0a6726477cc207f60162da452f3a95adb368399bef20a946e06f65c" -dependencies = [ - "memchr", -] - -[[package]] -name = "winreg" -version = "0.50.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" -dependencies = [ - "cfg-if", - "windows-sys 0.48.0", -] - -[[package]] -name = "winreg" -version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "937f3df7948156640f46aacef17a70db0de5917bda9c92b0f751f3a955b588fc" -dependencies = [ - "cfg-if", - "windows-sys 0.48.0", -] - -[[package]] -name = "wry" -version = "0.24.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ef04bdad49eba2e01f06e53688c8413bd6a87b0bc14b72284465cf96e3578e" -dependencies = [ - "base64 0.13.1", - "block", - "cocoa", - "core-graphics", - "crossbeam-channel", - "dunce", - "gdk", - "gio", - "glib", - "gtk", - "html5ever 0.25.2", - "http", - "kuchiki", - "libc", - "log", - "objc", - "objc_id", - "once_cell", - "serde", - "serde_json", - "sha2", - "soup2", - "tao", - "thiserror", - "url", - "webkit2gtk", - "webkit2gtk-sys", - "webview2-com", - "windows 0.39.0", - "windows-implement", -] - -[[package]] -name = "x11" -version = "2.20.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2638d5b9c17ac40575fb54bb461a4b1d2a8d1b4ffcc4ff237d254ec59ddeb82" -dependencies = [ - "libc", - "pkg-config", -] - -[[package]] -name = "x11-dl" -version = "2.20.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1536d6965a5d4e573c7ef73a2c15ebcd0b2de3347bdf526c34c297c00ac40f0" -dependencies = [ - "lazy_static", - "libc", - "pkg-config", -] - -[[package]] -name = "xattr" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d1526bbe5aaeb5eb06885f4d987bcdfa5e23187055de9b83fe00156a821fabc" -dependencies = [ - "libc", -] - -[[package]] -name = "xdg-home" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2769203cd13a0c6015d515be729c526d041e9cf2c0cc478d57faee85f40c6dcd" -dependencies = [ - "nix", - "winapi", -] - -[[package]] -name = "xml-rs" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2d7d3948613f75c98fd9328cfdcc45acc4d360655289d0a7d4ec931392200a3" - -[[package]] -name = "zbus" -version = "3.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31de390a2d872e4cd04edd71b425e29853f786dc99317ed72d73d6fcf5ebb948" -dependencies = [ - "async-broadcast", - "async-executor", - "async-fs", - "async-io", - "async-lock", - "async-process", - "async-recursion", - "async-task", - "async-trait", - "blocking", - "byteorder", - "derivative", - "enumflags2", - "event-listener", - "futures-core", - "futures-sink", - "futures-util", - "hex", - "nix", - "once_cell", - "ordered-stream", - "rand 0.8.5", - "serde", - "serde_repr", - "sha1", - "static_assertions", - "tracing", - "uds_windows", - "winapi", - "xdg-home", - "zbus_macros", - "zbus_names", - "zvariant", -] - -[[package]] -name = "zbus_macros" -version = "3.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41d1794a946878c0e807f55a397187c11fc7a038ba5d868e7db4f3bd7760bc9d" -dependencies = [ - "proc-macro-crate", - "proc-macro2", - "quote", - "regex", - "syn 1.0.105", - "zvariant_utils", -] - -[[package]] -name = "zbus_names" -version = "2.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb80bb776dbda6e23d705cf0123c3b95df99c4ebeaec6c2599d4a5419902b4a9" -dependencies = [ - "serde", - "static_assertions", - "zvariant", -] - -[[package]] -name = "zip" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "537ce7411d25e54e8ae21a7ce0b15840e7bfcff15b51d697ec3266cc76bdf080" -dependencies = [ - "byteorder", - "crc32fast", - "crossbeam-utils", -] - -[[package]] -name = "zvariant" -version = "3.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44b291bee0d960c53170780af148dca5fa260a63cdd24f1962fa82e03e53338c" -dependencies = [ - "byteorder", - "enumflags2", - "libc", - "serde", - "static_assertions", - "zvariant_derive", -] - -[[package]] -name = "zvariant_derive" -version = "3.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "934d7a7dfc310d6ee06c87ffe88ef4eca7d3e37bb251dece2ef93da8f17d8ecd" -dependencies = [ - "proc-macro-crate", - "proc-macro2", - "quote", - "syn 1.0.105", - "zvariant_utils", -] - -[[package]] -name = "zvariant_utils" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7234f0d811589db492d16893e3f21e8e2fd282e6d01b0cddee310322062cc200" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.105", -] diff --git a/pkgs/applications/networking/instant-messengers/cinny-desktop/default.nix b/pkgs/applications/networking/instant-messengers/cinny-desktop/default.nix deleted file mode 100644 index 23ad9cc02961b..0000000000000 --- a/pkgs/applications/networking/instant-messengers/cinny-desktop/default.nix +++ /dev/null @@ -1,105 +0,0 @@ -{ lib -, stdenv -, darwin -, fetchFromGitHub -, rust -, rustPlatform -, cargo-tauri -, cinny -, copyDesktopItems -, wrapGAppsHook3 -, pkg-config -, openssl -, dbus -, glib -, glib-networking -, libayatana-appindicator -, webkitgtk -, makeDesktopItem -}: - -rustPlatform.buildRustPackage rec { - pname = "cinny-desktop"; - # We have to be using the same version as cinny-web or this isn't going to work. - version = "3.2.0"; - - src = fetchFromGitHub { - owner = "cinnyapp"; - repo = "cinny-desktop"; - rev = "v${version}"; - hash = "sha256-uHGqvulH7/9JpUjkpcbCh1pPvX4/ndVIKcBXzWmDo+s="; - }; - - sourceRoot = "${src.name}/src-tauri"; - - # modififying $cargoDepsCopy requires the lock to be vendored - cargoLock.lockFile = ./Cargo.lock; - - postPatch = let - cinny' = - assert lib.assertMsg (cinny.version == version) "cinny.version (${cinny.version}) != cinny-desktop.version (${version})"; - cinny; - in '' - substituteInPlace tauri.conf.json \ - --replace '"distDir": "../cinny/dist",' '"distDir": "${cinny'}",' - substituteInPlace tauri.conf.json \ - --replace '"cd cinny && npm run build"' '""' - '' + lib.optionalString stdenv.hostPlatform.isLinux '' - substituteInPlace $cargoDepsCopy/libappindicator-sys-*/src/lib.rs \ - --replace "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1" - ''; - - postBuild = lib.optionalString stdenv.hostPlatform.isDarwin '' - cargo tauri build --bundles app --target "${rust.envVars.rustHostPlatform}" - ''; - - postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' - install -DT icons/128x128@2x.png $out/share/icons/hicolor/256x256@2/apps/cinny.png - install -DT icons/128x128.png $out/share/icons/hicolor/128x128/apps/cinny.png - install -DT icons/32x32.png $out/share/icons/hicolor/32x32/apps/cinny.png - '' + lib.optionalString stdenv.hostPlatform.isDarwin '' - mkdir -p "$out/Applications/" - cp -r "target/${rust.envVars.rustHostPlatform}/release/bundle/macos/Cinny.app" "$out/Applications/" - ln -sf "$out/Applications/Cinny.app/Contents/MacOS/Cinny" "$out/bin/cinny" - ''; - - nativeBuildInputs = [ - copyDesktopItems - wrapGAppsHook3 - pkg-config - cargo-tauri - ]; - - buildInputs = [ - openssl - dbus - glib - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - glib-networking - libayatana-appindicator - webkitgtk - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.DarwinTools - darwin.apple_sdk.frameworks.WebKit - ]; - - desktopItems = lib.optionals stdenv.hostPlatform.isLinux [ - (makeDesktopItem { - name = "cinny"; - exec = "cinny"; - icon = "cinny"; - desktopName = "Cinny"; - comment = meta.description; - categories = [ "Network" "InstantMessaging" ]; - }) - ]; - - meta = with lib; { - description = "Yet another matrix client for desktop"; - homepage = "https://github.com/cinnyapp/cinny-desktop"; - maintainers = with maintainers; [ qyriad ]; - license = licenses.agpl3Only; - platforms = platforms.linux ++ platforms.darwin; - mainProgram = "cinny"; - }; -} diff --git a/pkgs/applications/networking/instant-messengers/cinny/default.nix b/pkgs/applications/networking/instant-messengers/cinny/default.nix deleted file mode 100644 index f3ae1665fe3d9..0000000000000 --- a/pkgs/applications/networking/instant-messengers/cinny/default.nix +++ /dev/null @@ -1,67 +0,0 @@ -{ lib -, buildNpmPackage -, fetchFromGitHub -, writeText -, jq -, python3 -, pkg-config -, pixman -, cairo -, pango -, stdenv -, darwin -, conf ? { } -}: - -let - configOverrides = writeText "cinny-config-overrides.json" (builtins.toJSON conf); -in -buildNpmPackage rec { - pname = "cinny"; - version = "3.2.0"; - - src = fetchFromGitHub { - owner = "cinnyapp"; - repo = "cinny"; - rev = "v${version}"; - hash = "sha256-wAa7y2mXPkXAfirRSFqwZYIJK0CKDzZG8ULzXzr4zZ4="; - }; - - npmDepsHash = "sha256-dVdylvclUIHvF5syVumdxkXR4bG1FA4LOYg3GmnNzXE="; - - # 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"; - - nativeBuildInputs = [ - jq - python3 - pkg-config - ]; - - buildInputs = [ - pixman - cairo - pango - ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.CoreText - ]; - - installPhase = '' - runHook preInstall - - cp -r dist $out - jq -s '.[0] * .[1]' "config.json" "${configOverrides}" > "$out/config.json" - - runHook postInstall - ''; - - meta = with lib; { - description = "Yet another Matrix client for the web"; - homepage = "https://cinny.in/"; - maintainers = with maintainers; [ abbe ashkitten ]; - license = licenses.agpl3Only; - platforms = platforms.all; - }; -} diff --git a/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix b/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix deleted file mode 100644 index 43a18d775f9ee..0000000000000 --- a/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix +++ /dev/null @@ -1,150 +0,0 @@ -{ lib -, buildNpmPackage -, copyDesktopItems -, electron -, buildGoModule -, esbuild -, fetchFromGitHub -, jq -, deltachat-rpc-server -, libdeltachat -, makeDesktopItem -, makeWrapper -, noto-fonts-color-emoji -, pkg-config -, python3 -, roboto -, sqlcipher -, stdenv -, CoreServices -, testers -, deltachat-desktop -}: - -let - esbuild' = esbuild.override { - buildGoModule = args: buildGoModule (args // rec { - version = "0.19.8"; - src = fetchFromGitHub { - owner = "evanw"; - repo = "esbuild"; - rev = "v${version}"; - hash = "sha256-f13YbgHFQk71g7twwQ2nSOGA0RG0YYM01opv6txRMuw="; - }; - vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; - }); - }; -in -buildNpmPackage rec { - pname = "deltachat-desktop"; - version = "1.46.1"; - - src = fetchFromGitHub { - owner = "deltachat"; - repo = "deltachat-desktop"; - rev = "v${version}"; - hash = "sha256-90/Wmh0h75i3kvqj3Wo+A3KlKW8LLDWfPza2gDrDY6E="; - }; - - npmDepsHash = "sha256-UzWxMd+DYH5A8Zo1rzi8oIsoKbmzsVbGpr3uWtc02rY="; - - postPatch = '' - test \ - $(jq -r '.packages."node_modules/@deltachat/jsonrpc-client".version' package-lock.json) \ - = $(pkg-config --modversion deltachat) \ - || (echo "error: libdeltachat version does not match jsonrpc-client" && exit 1) - ''; - - nativeBuildInputs = [ - jq - makeWrapper - pkg-config - python3 - ] ++ lib.optionals stdenv.isLinux [ - copyDesktopItems - ]; - - buildInputs = [ - deltachat-rpc-server - libdeltachat - ] ++ lib.optionals stdenv.isDarwin [ - CoreServices - ]; - - env = { - ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; - ESBUILD_BINARY_PATH = "${esbuild'}/bin/esbuild"; - USE_SYSTEM_LIBDELTACHAT = "true"; - VERSION_INFO_GIT_REF = src.rev; - }; - - preBuild = '' - rm node_modules/@deltachat/stdio-rpc-server-*/deltachat-rpc-server - ln -s ${lib.getExe deltachat-rpc-server} node_modules/@deltachat/stdio-rpc-server-linux-* - ''; - - npmBuildScript = "build4production"; - - installPhase = '' - runHook preInstall - - npm prune --production - - mkdir -p $out/lib/node_modules/deltachat-desktop - cp -r . $out/lib/node_modules/deltachat-desktop - - awk '!/^#/ && NF' build/packageignore_list \ - | xargs -I {} sh -c "rm -rf $out/lib/node_modules/deltachat-desktop/{}" || true - - # required for electron to import index.js as a module - cp package.json $out/lib/node_modules/deltachat-desktop - - install -D build/icon.png \ - $out/share/icons/hicolor/scalable/apps/deltachat.png - - ln -sf ${noto-fonts-color-emoji}/share/fonts/noto/NotoColorEmoji.ttf \ - $out/lib/node_modules/deltachat-desktop/html-dist/fonts/noto/emoji - for font in $out/lib/node_modules/deltachat-desktop/html-dist/fonts/Roboto-*.ttf; do - ln -sf ${roboto}/share/fonts/truetype/$(basename $font) \ - $out/lib/node_modules/deltachat-desktop/html-dist/fonts - done - - makeWrapper ${lib.getExe electron} $out/bin/deltachat \ - --set LD_PRELOAD ${sqlcipher}/lib/libsqlcipher${stdenv.hostPlatform.extensions.sharedLibrary} \ - --add-flags $out/lib/node_modules/deltachat-desktop - - runHook postInstall - ''; - - desktopItems = lib.singleton (makeDesktopItem { - name = "deltachat"; - exec = "deltachat %u"; - icon = "deltachat"; - desktopName = "Delta Chat"; - genericName = "Delta Chat"; - comment = meta.description; - categories = [ "Network" "InstantMessaging" "Chat" ]; - startupWMClass = "DeltaChat"; - mimeTypes = [ - "x-scheme-handler/openpgp4fpr" - "x-scheme-handler/dcaccount" - "x-scheme-handler/dclogin" - "x-scheme-handler/mailto" - ]; - }); - - passthru.tests = { - version = testers.testVersion { - package = deltachat-desktop; - }; - }; - - meta = with lib; { - description = "Email-based instant messaging for Desktop"; - homepage = "https://github.com/deltachat/deltachat-desktop"; - changelog = "https://github.com/deltachat/deltachat-desktop/blob/${src.rev}/CHANGELOG.md"; - license = licenses.gpl3Plus; - mainProgram = "deltachat"; - maintainers = with maintainers; [ dotlambda ]; - }; -} diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix index 428715b6f1b7a..dd5f8f54c7455 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" @@ -100,7 +94,7 @@ stdenv.mkDerivation rec { ]; # Undefined symbols for architecture arm64: "_gpg_strerror" - NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-lgpg-error"; + NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-lgpg-error"; doCheck = true; checkPhase = '' @@ -118,7 +112,7 @@ stdenv.mkDerivation rec { # will load # # See https://github.com/dino/dino/wiki/macOS - postFixup = lib.optionalString (stdenv.isDarwin) '' + postFixup = lib.optionalString (stdenv.hostPlatform.isDarwin) '' cd "$out/lib/dino/plugins/" for f in *.dylib; do mv "$f" "$(basename "$f" .dylib).so" @@ -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/discord/darwin.nix b/pkgs/applications/networking/instant-messengers/discord/darwin.nix index c6f901639693c..aff995a1cee48 100644 --- a/pkgs/applications/networking/instant-messengers/discord/darwin.nix +++ b/pkgs/applications/networking/instant-messengers/discord/darwin.nix @@ -1,8 +1,21 @@ -{ pname, version, src, meta, stdenv, binaryName, desktopName, lib, undmg, makeWrapper, writeScript +{ pname, version, src, meta, stdenv, binaryName, desktopName, lib, undmg, makeWrapper, writeScript, python3, runCommand , branch , withOpenASAR ? false, openasar , withVencord ? false, vencord }: +let + disableBreakingUpdates = runCommand "disable-breaking-updates.py" + { + pythonInterpreter = "${python3.interpreter}"; + configDirName = lib.toLower binaryName; + meta.mainProgram = "disable-breaking-updates.py"; + } '' + mkdir -p $out/bin + cp ${./disable-breaking-updates.py} $out/bin/disable-breaking-updates.py + substituteAllInPlace $out/bin/disable-breaking-updates.py + chmod +x $out/bin/disable-breaking-updates.py + ''; +in stdenv.mkDerivation { inherit pname version src meta; @@ -18,7 +31,8 @@ stdenv.mkDerivation { # wrap executable to $out/bin mkdir -p $out/bin - makeWrapper "$out/Applications/${desktopName}.app/Contents/MacOS/${binaryName}" "$out/bin/${binaryName}" + makeWrapper "$out/Applications/${desktopName}.app/Contents/MacOS/${binaryName}" "$out/bin/${binaryName}" \ + --run ${lib.getExe disableBreakingUpdates} runHook postInstall ''; @@ -33,6 +47,8 @@ stdenv.mkDerivation { ''; passthru = { + # make it possible to run disableBreakingUpdates standalone + inherit disableBreakingUpdates; updateScript = writeScript "discord-update-script" '' #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl gnugrep common-updater-scripts diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 7c0d9c7b1e5a2..939716d9b52d3 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -1,53 +1,53 @@ { branch ? "stable", callPackage, fetchurl, lib, stdenv }: let versions = - if stdenv.isLinux then { - stable = "0.0.56"; - ptb = "0.0.90"; - canary = "0.0.431"; - development = "0.0.19"; + if stdenv.hostPlatform.isLinux then { + stable = "0.0.67"; + ptb = "0.0.105"; + canary = "0.0.492"; + development = "0.0.28"; } else { - stable = "0.0.307"; - ptb = "0.0.119"; - canary = "0.0.531"; - development = "0.0.41"; + stable = "0.0.318"; + ptb = "0.0.133"; + canary = "0.0.591"; + development = "0.0.49"; }; version = versions.${branch}; srcs = rec { x86_64-linux = { stable = fetchurl { url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz"; - hash = "sha256-HpdsvzWtB4AoqZXf7LV0J50/OQDsYgK8bkQ1HGvu7Ec="; + hash = "sha256-L8COdPP4SFRO+1mipjn4tjLR+xShcJbT/72yhNHdSWg="; }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; - hash = "sha256-75YnLhgNTd7pwpTE9qSIF0rzBwmGJ/CYa+YgN3OQZ2w="; + hash = "sha256-u/4wWssZxKlHrRW/Vd9pqUfqN2VQGYv1SDktpRsOayM="; }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; - hash = "sha256-59Sv3U3osfk+QoXgorpqK7CU0nJBdpFOMkoGRgHN3v8="; + hash = "sha256-NjcNgKYm1Twm8nN3sFlZCG/3x5fcSmX7X2On7CeZm0M="; }; development = fetchurl { url = "https://dl-development.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz"; - hash = "sha256-RP6SUM4DW3JhddSbJX6Xg8EE4iqCkSOgBL1oa7Zwp/E="; + hash = "sha256-326KAuqt3VQSgyJAdsdc7YgrdF3vCVoJoKUCVC2UdaU="; }; }; x86_64-darwin = { stable = fetchurl { url = "https://dl.discordapp.net/apps/osx/${version}/Discord.dmg"; - hash = "sha256-FBYxQhtwctMQ8ByOgAVncWh5297k1Vh95w/rWnZg9Fw="; + hash = "sha256-Ot6IM6EAg4MQPp0JqvUOZNAor6Nr6luc6pGY+722GMo="; }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/osx/${version}/DiscordPTB.dmg"; - hash = "sha256-Y5t6ndecfRf3zVfYEvFGiFinQxRSa7VyfnkAors8VPY="; + hash = "sha256-FFp6CRgD/kpCVxJ4+es0DaOGaW5v2Aa+lzJdG2Zu8eY="; }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/osx/${version}/DiscordCanary.dmg"; - hash = "sha256-eMJ/OKi+k92QEk140UW3RIi5G/UFlR6mW9f8kPZbFaw="; + hash = "sha256-TIXe8cy6feME0900R5aWyItZfUrUA8zXo0pqwQ79yAM="; }; development = fetchurl { url = "https://dl-development.discordapp.net/apps/osx/${version}/DiscordDevelopment.dmg"; - hash = "sha256-RiGyca/zjPpENgcq9KnRh5G4YArrUOQeueUdUBgZgjo="; + hash = "sha256-kfHnS1NHuPD7UR7XvMdtY2LPsDRJVQHk7/Nm+cR/KGc="; }; }; aarch64-darwin = x86_64-darwin; @@ -65,7 +65,7 @@ let mainProgram = "discord"; }; package = - if stdenv.isLinux + if stdenv.hostPlatform.isLinux then ./linux.nix else ./darwin.nix; @@ -85,17 +85,17 @@ let }; ptb = rec { pname = "discord-ptb"; - binaryName = if stdenv.isLinux then "DiscordPTB" else desktopName; + binaryName = if stdenv.hostPlatform.isLinux then "DiscordPTB" else desktopName; desktopName = "Discord PTB"; }; canary = rec { pname = "discord-canary"; - binaryName = if stdenv.isLinux then "DiscordCanary" else desktopName; + binaryName = if stdenv.hostPlatform.isLinux then "DiscordCanary" else desktopName; desktopName = "Discord Canary"; }; development = rec { pname = "discord-development"; - binaryName = if stdenv.isLinux then "DiscordDevelopment" else desktopName; + binaryName = if stdenv.hostPlatform.isLinux then "DiscordDevelopment" else desktopName; desktopName = "Discord Development"; }; } diff --git a/pkgs/applications/networking/instant-messengers/discord/disable-breaking-updates.py b/pkgs/applications/networking/instant-messengers/discord/disable-breaking-updates.py index fca1b76941734..a7ffd8405ad64 100644 --- a/pkgs/applications/networking/instant-messengers/discord/disable-breaking-updates.py +++ b/pkgs/applications/networking/instant-messengers/discord/disable-breaking-updates.py @@ -17,12 +17,19 @@ import os import sys from pathlib import Path -XDG_CONFIG_HOME = os.environ.get("XDG_CONFIG_HOME") or os.path.join( - os.path.expanduser("~"), ".config" -) +config_home = { + "darwin": os.path.join(os.path.expanduser("~"), "Library", "Application Support"), + "linux": os.environ.get("XDG_CONFIG_HOME") or os.path.join(os.path.expanduser("~"), ".config") +}.get(sys.platform, None) -settings_path = Path(f"{XDG_CONFIG_HOME}/@configDirName@/settings.json") -settings_path_temp = Path(f"{XDG_CONFIG_HOME}/@configDirName@/settings.json.tmp") +if config_home is None: + print("[Nix] Unsupported operating system.") + sys.exit(1) + +config_dir_name = "@configDirName@".replace(" ", "") if sys.platform == "darwin" else "@configDirName@" + +settings_path = Path(f"{config_home}/{config_dir_name}/settings.json") +settings_path_temp = Path(f"{config_home}/{config_dir_name}/settings.json.tmp") if os.path.exists(settings_path): with settings_path.open(encoding="utf-8") as settings_file: diff --git a/pkgs/applications/networking/instant-messengers/discord/linux.nix b/pkgs/applications/networking/instant-messengers/discord/linux.nix index eb3f29cf2a391..e0375ecf7b89b 100644 --- a/pkgs/applications/networking/instant-messengers/discord/linux.nix +++ b/pkgs/applications/networking/instant-messengers/discord/linux.nix @@ -6,7 +6,7 @@ , libXi, libXrandr, libXrender, libXtst, libxcb, libxshmfence, mesa, nspr, nss , pango, systemd, libappindicator-gtk3, libdbusmenu, writeScript, python3, runCommand , libunity -, speechd +, speechd-minimal , wayland , branch , withOpenASAR ? false, openasar @@ -91,7 +91,7 @@ stdenv.mkDerivation rec { libappindicator-gtk3 libdbusmenu wayland - ] ++ lib.optional withTTS speechd); + ] ++ lib.optional withTTS speechd-minimal); installPhase = '' runHook preInstall diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix index db8a8be7a8718..fc40e11dca16b 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: builtins.removeAttrs pinData [ "hashes" ] // { pname = "element-desktop"; name = "${finalAttrs.pname}-${finalAttrs.version}"; src = fetchFromGitHub { - owner = "vector-im"; + owner = "element-hq"; repo = "element-desktop"; rev = "v${finalAttrs.version}"; hash = desktopSrcHash; @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: builtins.removeAttrs pinData [ "hashes" ] // { }; nativeBuildInputs = [ yarn fixup-yarn-lock nodejs makeWrapper jq ] - ++ lib.optionals stdenv.isDarwin [ desktopToDarwinBundle ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ desktopToDarwinBundle ]; inherit seshat; @@ -112,7 +112,7 @@ stdenv.mkDerivation (finalAttrs: builtins.removeAttrs pinData [ "hashes" ] // { ''; # The desktop item properties should be kept in sync with data from upstream: - # https://github.com/vector-im/element-desktop/blob/develop/package.json + # https://github.com/element-hq/element-desktop/blob/develop/package.json desktopItem = makeDesktopItem { name = "element-desktop"; exec = "${executableName} %u"; @@ -125,7 +125,7 @@ stdenv.mkDerivation (finalAttrs: builtins.removeAttrs pinData [ "hashes" ] // { mimeTypes = [ "x-scheme-handler/element" ]; }; - postFixup = lib.optionalString stdenv.isDarwin '' + postFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' cp build/icon.icns $out/Applications/Element.app/Contents/Resources/element.icns ''; @@ -147,7 +147,7 @@ stdenv.mkDerivation (finalAttrs: builtins.removeAttrs pinData [ "hashes" ] // { meta = with lib; { description = "A feature-rich client for Matrix.org"; homepage = "https://element.io/"; - changelog = "https://github.com/vector-im/element-desktop/blob/v${finalAttrs.version}/CHANGELOG.md"; + changelog = "https://github.com/element-hq/element-desktop/blob/v${finalAttrs.version}/CHANGELOG.md"; license = licenses.asl20; maintainers = teams.matrix.members; inherit (electron.meta) platforms; diff --git a/pkgs/applications/networking/instant-messengers/element/element-web.nix b/pkgs/applications/networking/instant-messengers/element/element-web.nix index 66243fe724444..1bfea7162dde8 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-web.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-web.nix @@ -1,9 +1,7 @@ { lib , stdenv -, runCommand , fetchFromGitHub , fetchYarnDeps -, writeText , jq , yarn , fixup-yarn-lock @@ -22,8 +20,8 @@ stdenv.mkDerivation (finalAttrs: builtins.removeAttrs pinData [ "hashes" ] // { pname = "element-web"; src = fetchFromGitHub { - owner = "vector-im"; - repo = finalAttrs.pname; + owner = "element-hq"; + repo = "element-web"; rev = "v${finalAttrs.version}"; hash = webSrcHash; }; @@ -53,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: builtins.removeAttrs pinData [ "hashes" ] // { # with the update of openssl3, some key ciphers are not supported anymore # this flag will allow those codecs again as a workaround # see https://medium.com/the-node-js-collection/node-js-17-is-here-8dba1e14e382#5f07 - # and https://github.com/vector-im/element-web/issues/21043 + # and https://github.com/element-hq/element-web/issues/21043 export NODE_OPTIONS=--openssl-legacy-provider mkdir -p $HOME @@ -69,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: builtins.removeAttrs pinData [ "hashes" ] // { runHook preInstall cp -R webapp $out - cp ${jitsi-meet}/libs/external_api.min.js $out/jitsi_external_api.min.js + tar --extract --to-stdout --file ${jitsi-meet.src} jitsi-meet/libs/external_api.min.js > $out/jitsi_external_api.min.js echo "${finalAttrs.version}" > "$out/version" jq -s '.[0] * $conf' "config.sample.json" --argjson "conf" '${builtins.toJSON noPhoningHome}' > "$out/config.json" @@ -79,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: builtins.removeAttrs pinData [ "hashes" ] // { meta = { description = "Glossy Matrix collaboration client for the web"; homepage = "https://element.io/"; - changelog = "https://github.com/vector-im/element-web/blob/v${finalAttrs.version}/CHANGELOG.md"; + changelog = "https://github.com/element-hq/element-web/blob/v${finalAttrs.version}/CHANGELOG.md"; maintainers = lib.teams.matrix.members; license = lib.licenses.asl20; platforms = lib.platforms.all; diff --git a/pkgs/applications/networking/instant-messengers/element/keytar/default.nix b/pkgs/applications/networking/instant-messengers/element/keytar/default.nix index d43894e08239a..958a80fb47430 100644 --- a/pkgs/applications/networking/instant-messengers/element/keytar/default.nix +++ b/pkgs/applications/networking/instant-messengers/element/keytar/default.nix @@ -19,10 +19,10 @@ in stdenv.mkDerivation rec { nodejs python3 pkg-config npmHooks.npmConfigHook ] - ++ lib.optional stdenv.isDarwin xcbuild; + ++ lib.optional stdenv.hostPlatform.isDarwin xcbuild; - buildInputs = lib.optionals (!stdenv.isDarwin) [ libsecret ] - ++ lib.optionals stdenv.isDarwin [ Security AppKit ]; + buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ libsecret ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security AppKit ]; npmDeps = fetchNpmDeps { inherit src; @@ -37,10 +37,10 @@ in stdenv.mkDerivation rec { ''; # https://nodejs.org/api/os.html#osarch - npmFlagsArray = [ "--arch=${if stdenv.hostPlatform.parsed.cpu.name == "i686" then "ia32" - else if stdenv.hostPlatform.parsed.cpu.name == "x86_64" then "x64" - else if stdenv.hostPlatform.parsed.cpu.name == "aarch64" then "arm64" - else stdenv.hostPlatform.parsed.cpu.name}" ]; + npmFlags = [ "--arch=${if stdenv.hostPlatform.parsed.cpu.name == "i686" then "ia32" + else if stdenv.hostPlatform.parsed.cpu.name == "x86_64" then "x64" + else if stdenv.hostPlatform.parsed.cpu.name == "aarch64" then "arm64" + else stdenv.hostPlatform.parsed.cpu.name}" ]; installPhase = '' runHook preInstall diff --git a/pkgs/applications/networking/instant-messengers/element/pin.nix b/pkgs/applications/networking/instant-messengers/element/pin.nix index 4dfc4b97494af..9abdf0f463ff5 100644 --- a/pkgs/applications/networking/instant-messengers/element/pin.nix +++ b/pkgs/applications/networking/instant-messengers/element/pin.nix @@ -1,9 +1,9 @@ { - "version" = "1.11.69"; + "version" = "1.11.77"; "hashes" = { - "desktopSrcHash" = "sha256-sSEWnvWZ6sfrHL3mqbq3T90At131C1W7N72Hb/BHKCk="; - "desktopYarnHash" = "0awz1dscksx4zvp99p08mdl2h6i7gbwjddanl3bhxkysxqdnwqb1"; - "webSrcHash" = "sha256-oFSaKtig1z3jepLpwJW4i5VskMBhKUIbPsCfLQuCgMY="; - "webYarnHash" = "1rzq05dnkwjglira52wllsl5nqw1g8whvamjfxzgvp0nyby46nha"; + "desktopSrcHash" = "sha256-y7cmTSkNzA4aNY7z9sjgyIquTPVvl+nH7BHUx/2nJ5A="; + "desktopYarnHash" = "0fwkdrfhfl6knvx552q2lpp5pd54qbzkm4kx6jvcrdwjk3x4cgqd"; + "webSrcHash" = "sha256-IeBuLlcorsHZ78P6h5LVCCGHauqzwwm2Lc9B07su86Y="; + "webYarnHash" = "0nm70m37kqkb959vi69r8zidsh25nzgn1550yl46pzihzbiqm8nx"; }; } diff --git a/pkgs/applications/networking/instant-messengers/element/seshat/default.nix b/pkgs/applications/networking/instant-messengers/element/seshat/default.nix index c1c9a57d43569..e8e88491c2cc0 100644 --- a/pkgs/applications/networking/instant-messengers/element/seshat/default.nix +++ b/pkgs/applications/networking/instant-messengers/element/seshat/default.nix @@ -17,7 +17,7 @@ in rustPlatform.buildRustPackage rec { sourceRoot = "${src.name}/seshat-node/native"; nativeBuildInputs = [ nodejs python3 yarn fixup-yarn-lock ]; - buildInputs = [ sqlcipher ] ++ lib.optional stdenv.isDarwin CoreServices; + buildInputs = [ sqlcipher ] ++ lib.optional stdenv.hostPlatform.isDarwin CoreServices; npm_config_nodedir = nodejs; @@ -36,7 +36,7 @@ in rustPlatform.buildRustPackage rec { fixup-yarn-lock yarn.lock yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive patchShebangs node_modules/ - node_modules/.bin/neon build --release -- --target ${rust.toRustTargetSpec stdenv.hostPlatform} -Z unstable-options --out-dir target/release + node_modules/.bin/neon build --release -- --target ${stdenv.hostPlatform.rust.rustcTarget} -Z unstable-options --out-dir target/release runHook postBuild ''; diff --git a/pkgs/applications/networking/instant-messengers/element/update.sh b/pkgs/applications/networking/instant-messengers/element/update.sh index 0a1cc0595f879..2a4ec5fcdec24 100755 --- a/pkgs/applications/networking/instant-messengers/element/update.sh +++ b/pkgs/applications/networking/instant-messengers/element/update.sh @@ -12,15 +12,15 @@ version="$1" set -euo pipefail if [ -z "$version" ]; then - version="$(wget -q -O- "https://api.github.com/repos/vector-im/element-desktop/releases?per_page=1" | jq -r '.[0].tag_name')" + version="$(wget -q -O- "https://api.github.com/repos/element-hq/element-desktop/releases?per_page=1" | jq -r '.[0].tag_name')" fi # strip leading "v" version="${version#v}" # Element Web -web_src="https://raw.githubusercontent.com/vector-im/element-web/v$version" -web_src_hash=$(nix-prefetch-github vector-im element-web --rev v${version} | jq -r .hash) +web_src="https://raw.githubusercontent.com/element-hq/element-web/v$version" +web_src_hash=$(nix-prefetch-github element-hq element-web --rev v${version} | jq -r .hash) web_tmpdir=$(mktemp -d) trap 'rm -rf "$web_tmpdir"' EXIT @@ -31,8 +31,8 @@ web_yarn_hash=$(prefetch-yarn-deps yarn.lock) popd # Element Desktop -desktop_src="https://raw.githubusercontent.com/vector-im/element-desktop/v$version" -desktop_src_hash=$(nix-prefetch-github vector-im element-desktop --rev v${version} | jq -r .hash) +desktop_src="https://raw.githubusercontent.com/element-hq/element-desktop/v$version" +desktop_src_hash=$(nix-prefetch-github element-hq element-desktop --rev v${version} | jq -r .hash) desktop_tmpdir=$(mktemp -d) trap 'rm -rf "$desktop_tmpdir"' EXIT diff --git a/pkgs/applications/networking/instant-messengers/feishu/default.nix b/pkgs/applications/networking/instant-messengers/feishu/default.nix index d43320558b2a8..8a0dc4256a031 100644 --- a/pkgs/applications/networking/instant-messengers/feishu/default.nix +++ b/pkgs/applications/networking/instant-messengers/feishu/default.nix @@ -1,4 +1,4 @@ -{ addOpenGLRunpath +{ addDriverRunpath , alsa-lib , at-spi2-atk , at-spi2-core @@ -55,7 +55,6 @@ , stdenv , systemd , wayland -, wrapGAppsHook3 , xdg-utils , writeScript @@ -66,12 +65,12 @@ let sources = { x86_64-linux = fetchurl { - url = "https://sf3-cn.feishucdn.com/obj/ee-appcenter/7e382fc2/Feishu-linux_x64-7.15.13.deb"; - sha256 = "sha256-CyQmQKfyYcWqpty5LxTNqm73AVnPdm7biBwICkbBEco="; + url = "https://sf3-cn.feishucdn.com/obj/ee-appcenter/bfdb886c/Feishu-linux_x64-7.22.9.deb"; + sha256 = "sha256-4lLCQeW6ZRzmzrHPQ91RxKEqJCxqqa4iGuJ8snZqvkQ="; }; aarch64-linux = fetchurl { - url = "https://sf3-cn.feishucdn.com/obj/ee-appcenter/4c8c2fbf/Feishu-linux_arm64-7.15.13.deb"; - sha256 = "sha256-nxtu5xOafZ1tlN/f0+5VF2I6ISfHmPJTztOI+AQwp9c="; + url = "https://sf3-cn.feishucdn.com/obj/ee-appcenter/c3f495d6/Feishu-linux_arm64-7.22.9.deb"; + sha256 = "sha256-cT9n1p220ya1T21fWy4b7b7dIx3hqw7lConGaSZ2+UA="; }; }; @@ -132,7 +131,7 @@ let ]; in stdenv.mkDerivation { - version = "7.15.13"; + version = "7.22.9"; pname = "feishu"; src = sources.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); @@ -179,7 +178,7 @@ stdenv.mkDerivation { # FIXME: Add back NIXOS_OZONE_WL support once upstream fixes the crash on native Wayland (see #318035) wrapProgram $executable \ --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \ - --prefix LD_LIBRARY_PATH : ${rpath}:$out/opt/bytedance/feishu:${addOpenGLRunpath.driverLink}/share \ + --prefix LD_LIBRARY_PATH : ${rpath}:$out/opt/bytedance/feishu:${addDriverRunpath.driverLink}/share \ ${lib.optionalString (commandLineArgs!="") "--add-flags ${lib.escapeShellArg commandLineArgs}"} done diff --git a/pkgs/applications/networking/instant-messengers/ferdi/default.nix b/pkgs/applications/networking/instant-messengers/ferdi/default.nix deleted file mode 100644 index f3362ab775018..0000000000000 --- a/pkgs/applications/networking/instant-messengers/ferdi/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib, mkFranzDerivation, fetchurl, xorg, xdg-utils, buildEnv, writeShellScriptBin }: - -let - mkFranzDerivation' = mkFranzDerivation.override { - xdg-utils = buildEnv { - name = "xdg-utils-for-ferdi"; - paths = [ - xdg-utils - (lib.hiPrio (writeShellScriptBin "xdg-open" '' - unset GDK_BACKEND - exec ${xdg-utils}/bin/xdg-open "$@" - '')) - ]; - }; - }; -in -mkFranzDerivation' rec { - pname = "ferdi"; - name = "Ferdi"; - version = "5.8.1"; - src = fetchurl { - url = "https://master.dl.sourceforge.net/project/ferdi.mirror/v${version}/ferdi_${version}_amd64.deb"; - sha256 = "sha256-Bl7bM5iDQlfPSZxksqlg7GbuwWlm53QkOf/TQEg3/n0="; - }; - extraBuildInputs = [ xorg.libxshmfence ]; - meta = with lib; { - description = "Combine your favorite messaging services into one application"; - homepage = "https://getferdi.com/"; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - license = licenses.asl20; - maintainers = with maintainers; [ davidtwco ]; - platforms = [ "x86_64-linux" ]; - hydraPlatforms = [ ]; - knownVulnerabilities = [ - "CVE-2022-32320" - ]; - }; -} diff --git a/pkgs/applications/networking/instant-messengers/ferdium/default.nix b/pkgs/applications/networking/instant-messengers/ferdium/default.nix index d78109b9b69f7..8e8d18e63005e 100644 --- a/pkgs/applications/networking/instant-messengers/ferdium/default.nix +++ b/pkgs/applications/networking/instant-messengers/ferdium/default.nix @@ -6,14 +6,14 @@ let aarch64-linux = "arm64"; }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); hash = { - amd64-linux_hash = "sha256-4yMaW1ByEQaQHdn99TGpUez2jVi5Ad4ODpugzW6kTm8="; - arm64-linux_hash = "sha256-oIkHF1l7Un4W6/zufa+DOLi9oujQ2Zaq8AaKoHDAMRc="; + amd64-linux_hash = "sha256-gx8tDGb2yjwexChZGJ9RdVbgseDByFeW2ZR1RebjlO4="; + arm64-linux_hash = "sha256-/qv931J4ufKpAtj7KEqrN6klZ59ueHpbWJXsndBuD90="; }."${arch}-linux_hash"; in mkFranzDerivation rec { pname = "ferdium"; name = "Ferdium"; - version = "6.7.4"; + version = "6.7.6"; src = fetchurl { url = "https://github.com/ferdium/ferdium-app/releases/download/v${version}/Ferdium-linux-${version}-${arch}.deb"; inherit hash; diff --git a/pkgs/applications/networking/instant-messengers/flare-signal/Cargo.lock b/pkgs/applications/networking/instant-messengers/flare-signal/Cargo.lock index 2c3c6fd52ecb8..4f715a576acdf 100644 --- a/pkgs/applications/networking/instant-messengers/flare-signal/Cargo.lock +++ b/pkgs/applications/networking/instant-messengers/flare-signal/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "addr2line" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" dependencies = [ "gimli", ] @@ -78,6 +78,12 @@ dependencies = [ ] [[package]] +name = "aligned-vec" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4aa90d7ce82d4be67b64039a3d588d38dbcc6736577de4a847025ce5b0c468d1" + +[[package]] name = "android-tzdata" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -94,47 +100,48 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.13" +version = "0.6.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" +checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b" dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", "anstyle-wincon", "colorchoice", + "is_terminal_polyfill", "utf8parse", ] [[package]] name = "anstyle" -version = "1.0.6" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" +checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b" [[package]] name = "anstyle-parse" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" +checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.0.2" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" +checksum = "ad186efb764318d35165f1758e7dcef3b10628e26d41a44bc5550652e6804391" dependencies = [ "windows-sys 0.52.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.2" +version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" +checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19" dependencies = [ "anstyle", "windows-sys 0.52.0", @@ -142,15 +149,32 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.81" +version = "1.0.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" + +[[package]] +name = "arbitrary" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247" +checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" + +[[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.72", +] [[package]] name = "arrayref" -version = "0.3.7" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" +checksum = "9d151e35f61089500b617991b791fc8bfd237ae50cd5950803758a179b41e67a" [[package]] name = "arrayvec" @@ -181,36 +205,35 @@ dependencies = [ [[package]] name = "async-broadcast" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "258b52a1aa741b9f09783b2d86cf0aeeb617bbf847f6933340a39644227acbdb" +checksum = "20cd0e2e25ea8e5f7e9df04578dc6cf5c83577fd09b1a46aaf5c85e1c33f2a7e" dependencies = [ - "event-listener 5.2.0", - "event-listener-strategy 0.5.1", + "event-listener", + "event-listener-strategy", "futures-core", "pin-project-lite", ] [[package]] name = "async-channel" -version = "2.2.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f28243a43d821d11341ab73c80bed182dc015c514b951616cf79bd4af39af0c3" +checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a" dependencies = [ "concurrent-queue", - "event-listener 5.2.0", - "event-listener-strategy 0.5.1", + "event-listener-strategy", "futures-core", "pin-project-lite", ] [[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", "cfg-if", "concurrent-queue", "futures-io", @@ -225,38 +248,29 @@ dependencies = [ [[package]] name = "async-lock" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" -dependencies = [ - "event-listener 2.5.3", -] - -[[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", + "event-listener-strategy", "pin-project-lite", ] [[package]] name = "async-process" -version = "2.2.0" +version = "2.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d999d925640d51b662b7b4e404224dd81de70f4aa4a199383c2c5e5b86885fa3" +checksum = "f7eda79bbd84e29c2b308d1dc099d7de8dcc7035e48f4bf5dc4a531a44ff5e2a" dependencies = [ "async-channel", "async-io", - "async-lock 3.3.0", + "async-lock", "async-signal", "async-task", "blocking", "cfg-if", - "event-listener 5.2.0", + "event-listener", "futures-lite", "rustix", "tracing", @@ -265,23 +279,23 @@ dependencies = [ [[package]] name = "async-recursion" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30c5ef0ede93efbf733c1a727f3b6b5a1060bbedd5600183e66f6e4be4af0ec5" +checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.57", + "syn 2.0.72", ] [[package]] name = "async-signal" -version = "0.2.5" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5" +checksum = "dfb3634b73397aa844481f814fad23bbf07fdb0eabec10f2eb95e58944b1ec32" dependencies = [ "async-io", - "async-lock 2.8.0", + "async-lock", "atomic-waker", "cfg-if", "futures-core", @@ -289,24 +303,24 @@ dependencies = [ "rustix", "signal-hook-registry", "slab", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "async-task" -version = "4.7.0" +version = "4.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbb36e985947064623dbd357f727af08ffd077f93d696782f3c56365fa2e2799" +checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" [[package]] name = "async-trait" -version = "0.1.79" +version = "0.1.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507401cad91ec6a857ed5513a2073c82a9b9048762b885bb98655b306964681" +checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" dependencies = [ "proc-macro2", "quote", - "syn 2.0.57", + "syn 2.0.72", ] [[package]] @@ -334,15 +348,38 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] name = "autocfg" -version = "1.2.0" +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 = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" +checksum = "876c75a42f6364451a033496a14c44bffe41f5f4a8236f697391f11024e596d2" +dependencies = [ + "arrayvec", +] [[package]] name = "backtrace" -version = "0.3.71" +version = "0.3.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" +checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" dependencies = [ "addr2line", "cc", @@ -360,6 +397,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" [[package]] +name = "base64" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" + +[[package]] name = "bincode" version = "1.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -382,15 +425,21 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" + +[[package]] +name = "bitstream-io" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c12d1856e42f0d817a835fe55853957c85c8c8a470114029143d3f12671446e" [[package]] name = "blake3" -version = "1.5.1" +version = "1.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30cca6d3674597c30ddf2c587bf8d9d65c9a84d2326d941cc79c9842dfe0ef52" +checksum = "e9ec96fe9a81b5e365f9db71fe00edc4fe4ca2cc7dcb7861f0603012a7caa210" dependencies = [ "arrayref", "arrayvec", @@ -425,41 +474,44 @@ dependencies = [ [[package]] name = "blocking" -version = "1.5.1" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118" +checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea" dependencies = [ "async-channel", - "async-lock 3.3.0", "async-task", - "fastrand", "futures-io", "futures-lite", "piper", - "tracing", ] [[package]] name = "blurhash" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "565b78e03039f24994c5bc87ff793987be98a9ff59fa4851b72bc2e630001c9d" +checksum = "2415c16381be1178c8a3b9d9d67d364406c8c097894d8ae27202a00a7accedb3" dependencies = [ "gdk-pixbuf", - "image", + "image 0.25.2", ] [[package]] +name = "built" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "236e6289eda5a812bc6b53c3b024039382a2895fbbeef2d748b2931546d392c4" + +[[package]] name = "bumpalo" -version = "3.15.4" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "bytemuck" -version = "1.15.0" +version = "1.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15" +checksum = "b236fc92302c97ed75b38da1f4917b5cdda4984745740f153a5d3059e48d725e" [[package]] name = "byteorder" @@ -468,18 +520,24 @@ 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" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" +checksum = "a12916984aab3fa6e39d655a33e09c0071eb36d6ab3aea5c2d78551f1df6d952" [[package]] name = "cairo-rs" -version = "0.19.2" +version = "0.19.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2650f66005301bd33cc486dec076e1293c4cecf768bc7ba9bf5d2b1be339b99c" +checksum = "b2ac2a4d0e69036cf0062976f6efcba1aaee3e448594e6514bb2ddf87acce562" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cairo-sys-rs", "glib", "libc", @@ -508,9 +566,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.90" +version = "1.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5" +checksum = "2aba8f4e9906c7ce3c73463f62a7f0c65183ada1a2d47e397cc8810827f9694f" dependencies = [ "jobserver", "libc", @@ -518,9 +576,9 @@ dependencies = [ [[package]] name = "cfg-expr" -version = "0.15.7" +version = "0.15.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa50868b64a9a6fda9d593ce778849ea8715cd2a3d2cc17ffdb4a2f2f2f1961d" +checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02" dependencies = [ "smallvec", "target-lexicon", @@ -534,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 = "chacha20" @@ -564,15 +622,17 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.37" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a0d04d43504c61aa6c7531f1871dd0d418d91130162063b789da00fd7057a5e" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" dependencies = [ "android-tzdata", "iana-time-zone", + "js-sys", "num-traits", "serde", - "windows-targets 0.52.4", + "wasm-bindgen", + "windows-targets 0.52.6", ] [[package]] @@ -594,15 +654,15 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" [[package]] name = "colorchoice" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" +checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" [[package]] name = "concurrent-queue" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" dependencies = [ "crossbeam-utils", ] @@ -640,9 +700,9 @@ 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", ] @@ -668,9 +728,9 @@ dependencies = [ [[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 = "crunchy" @@ -700,15 +760,14 @@ dependencies = [ [[package]] name = "curve25519-dalek" -version = "4.1.1" -source = "git+https://github.com/signalapp/curve25519-dalek?tag=signal-curve25519-4.1.1#a12ab4e58455bb3dc7cd73a0f9f3443507b2854b" +version = "4.1.3" +source = "git+https://github.com/signalapp/curve25519-dalek?tag=signal-curve25519-4.1.3#7c6d34756355a3566a704da84dce7b1c039a6572" dependencies = [ "cfg-if", "cpufeatures", "curve25519-dalek-derive", "digest", "fiat-crypto", - "platforms", "rustc_version", "serde", "subtle", @@ -717,19 +776,19 @@ dependencies = [ [[package]] name = "curve25519-dalek-derive" -version = "0.1.0" -source = "git+https://github.com/signalapp/curve25519-dalek?tag=signal-curve25519-4.1.1#a12ab4e58455bb3dc7cd73a0f9f3443507b2854b" +version = "0.1.1" +source = "git+https://github.com/signalapp/curve25519-dalek?tag=signal-curve25519-4.1.3#7c6d34756355a3566a704da84dce7b1c039a6572" dependencies = [ "proc-macro2", "quote", - "syn 2.0.57", + "syn 2.0.72", ] [[package]] name = "data-encoding" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" +checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2" [[package]] name = "derivative" @@ -750,7 +809,7 @@ checksum = "62d671cc41a825ebabc75757b62d3d168c577f9149b2d49ece1dad1f72119d25" dependencies = [ "proc-macro2", "quote", - "syn 2.0.57", + "syn 2.0.72", ] [[package]] @@ -766,13 +825,13 @@ dependencies = [ [[package]] name = "displaydoc" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.57", + "syn 2.0.72", ] [[package]] @@ -783,9 +842,9 @@ checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" [[package]] name = "either" -version = "1.10.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "endi" @@ -795,9 +854,9 @@ checksum = "a3d8a32ae18130a3c84dd492d4215c3d913c3b07c6b63c2eb3eb7ff1101ab7bf" [[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", @@ -805,13 +864,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.57", + "syn 2.0.72", ] [[package]] @@ -859,9 +918,9 @@ dependencies = [ [[package]] name = "errno" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" dependencies = [ "libc", "windows-sys 0.52.0", @@ -869,26 +928,9 @@ dependencies = [ [[package]] name = "event-listener" -version = "2.5.3" +version = "5.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" - -[[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.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b5fb89194fa3cad959b833185b3063ba881dbfc7030680b314250779fb4cc91" +checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba" dependencies = [ "concurrent-queue", "parking", @@ -897,21 +939,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.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "332f51cb23d20b0de8458b86580878211da09bcd4503cb579c225b3d124cabb3" +checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" dependencies = [ - "event-listener 5.2.0", + "event-listener", "pin-project-lite", ] @@ -933,9 +965,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.0.2" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984" +checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" [[package]] name = "fdeflate" @@ -948,9 +980,9 @@ dependencies = [ [[package]] name = "fiat-crypto" -version = "0.2.7" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c007b1ae3abe1cb6f85a16305acd418b7ca6343b953633fee2b76d8f108b830f" +checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d" [[package]] name = "field-offset" @@ -970,16 +1002,17 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flare" -version = "0.14.3" +version = "0.15.0" dependencies = [ "ashpd", "blurhash", + "chrono", "env_logger", "err-derive", "futures", "gettext-rs", "gtk4", - "image", + "image 0.24.9", "lazy_static", "libadwaita", "libsignal-service", @@ -1002,9 +1035,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.28" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" dependencies = [ "crc32fast", "miniz_oxide", @@ -1016,7 +1049,7 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" dependencies = [ - "spin 0.9.8", + "spin", ] [[package]] @@ -1119,7 +1152,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.57", + "syn 2.0.72", ] [[package]] @@ -1163,9 +1196,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", @@ -1175,9 +1208,9 @@ dependencies = [ [[package]] name = "gdk-pixbuf-sys" -version = "0.19.0" +version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dcbd04c1b2c4834cc008b4828bc917d062483b88d26effde6342e5622028f96" +checksum = "4efa05a4f83c8cc50eb4d883787b919b85e5f1d8dd10b5a1df53bf5689782379" dependencies = [ "gio-sys", "glib-sys", @@ -1188,9 +1221,9 @@ dependencies = [ [[package]] name = "gdk4" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9100b25604183f2fd97f55ef087fae96ab4934d7215118a35303e422688e6e4b" +checksum = "db265c9dd42d6a371e09e52deab3a84808427198b86ac792d75fd35c07990a07" dependencies = [ "cairo-rs", "gdk-pixbuf", @@ -1203,9 +1236,9 @@ dependencies = [ [[package]] name = "gdk4-sys" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0b76874c40bb8d1c7d03a7231e23ac75fa577a456cd53af32ec17ec8f121626" +checksum = "c9418fb4e8a67074919fe7604429c45aa74eb9df82e7ca529767c6d4e9dc66dd" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -1220,9 +1253,9 @@ dependencies = [ [[package]] name = "gdk4-wayland" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13fc91be838be766ff038221e068e05e4083f3b6cf48ef1f5251ba28f98f80bf" +checksum = "f620a0ecbe4c574e3fec6bef6bebcefe19cb1b9a81569245ca4503c95f9b1371" dependencies = [ "gdk4", "gdk4-wayland-sys", @@ -1233,9 +1266,9 @@ dependencies = [ [[package]] name = "gdk4-wayland-sys" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5cdc6c5cb3f64ba9b810782077939a0fc8d82e809f0147054bbe41910ac2b51" +checksum = "7a5fd3927c917184b0e8712624eebabdc7f0909b645d468c825f8ec627e61803" dependencies = [ "glib-sys", "libc", @@ -1244,9 +1277,9 @@ dependencies = [ [[package]] name = "gdk4-x11" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bff98d3e61807ecc1ddd15cf746b9de14fb6499fc259ca9e8d87d92e8901c7db" +checksum = "ec6da3e3527007c14b27ddafe19496c49696a2a74dccb6ab75ba58dfa478b7ab" dependencies = [ "gdk4", "gdk4-x11-sys", @@ -1257,9 +1290,9 @@ dependencies = [ [[package]] name = "gdk4-x11-sys" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30406b31a7c355c73c504c9b31d35806397944165730eca7db46f0409abf8f8f" +checksum = "0bb4e987ec77b7b2fb72c0943ccbec5c3834d9d7165fe762af8ff2414f0ae23d" dependencies = [ "gdk4-sys", "glib-sys", @@ -1279,9 +1312,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.12" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "libc", @@ -1331,15 +1364,15 @@ dependencies = [ [[package]] name = "gimli" -version = "0.28.1" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" +checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" [[package]] name = "gio" -version = "0.19.3" +version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c64947d08d7fbb03bf8ad1f25a8ac6cf4329bc772c9b7e5abe7bf9493c81194f" +checksum = "4c49f117d373ffcc98a35d114db5478bc223341cff53e39a5d6feced9e2ddffe" dependencies = [ "futures-channel", "futures-core", @@ -1355,9 +1388,9 @@ dependencies = [ [[package]] name = "gio-sys" -version = "0.19.0" +version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcf8e1d9219bb294636753d307b030c1e8a032062cba74f493c431a5c8b81ce4" +checksum = "2cd743ba4714d671ad6b6234e8ab2a13b42304d0e13ab7eba1dcdd78a7d6d4ef" dependencies = [ "glib-sys", "gobject-sys", @@ -1368,11 +1401,11 @@ dependencies = [ [[package]] name = "glib" -version = "0.19.3" +version = "0.19.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01e191cc1af1f35b9699213107068cd3fe05d9816275ac118dc785a0dd8faebf" +checksum = "39650279f135469465018daae0ba53357942a5212137515777d5fdca74984a44" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "futures-channel", "futures-core", "futures-executor", @@ -1390,22 +1423,22 @@ dependencies = [ [[package]] name = "glib-macros" -version = "0.19.3" +version = "0.19.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9972bb91643d589c889654693a4f1d07697fdcb5d104b5c44fb68649ba1bf68d" +checksum = "4429b0277a14ae9751350ad9b658b1be0abb5b54faa5bcdf6e74a3372582fad7" dependencies = [ - "heck 0.5.0", + "heck", "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 2.0.57", + "syn 2.0.72", ] [[package]] name = "glib-sys" -version = "0.19.0" +version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630f097773d7c7a0bb3258df4e8157b47dc98bbfa0e60ad9ab56174813feced4" +checksum = "5c2dc18d3a82b0006d470b13304fbbb3e0a9bd4884cf985a60a7ed733ac2c4a5" dependencies = [ "libc", "system-deps", @@ -1419,9 +1452,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "gobject-sys" -version = "0.19.0" +version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c85e2b1080b9418dd0c58b498da3a5c826030343e0ef07bde6a955d28de54979" +checksum = "2e697e252d6e0416fd1d9e169bda51c0f1c926026c39ca21fbe8b1bb5c3b8b9e" dependencies = [ "glib-sys", "libc", @@ -1430,9 +1463,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", @@ -1441,9 +1474,9 @@ dependencies = [ [[package]] name = "graphene-sys" -version = "0.19.0" +version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "236ed66cc9b18d8adf233716f75de803d0bf6fc806f60d14d948974a12e240d0" +checksum = "2f530e0944bccba4b55065e9c69f4975ad691609191ebac16e13ab8e1f27af05" dependencies = [ "glib-sys", "libc", @@ -1453,9 +1486,9 @@ dependencies = [ [[package]] name = "gsk4" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c65036fc8f99579e8cb37b12487969b707ab23ec8ab953682ff347cbd15d396e" +checksum = "7563884bf6939f4468e5d94654945bdd9afcaf8c3ba4c5dd17b5342b747221be" dependencies = [ "cairo-rs", "gdk4", @@ -1468,9 +1501,9 @@ dependencies = [ [[package]] name = "gsk4-sys" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd24c814379f9c3199dc53e52253ee8d0f657eae389ab282c330505289d24738" +checksum = "23024bf2636c38bbd1f822f58acc9d1c25b28da896ff0f291a1a232d4272b3dc" dependencies = [ "cairo-sys-rs", "gdk4-sys", @@ -1484,9 +1517,9 @@ dependencies = [ [[package]] name = "gtk4" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa82753b8c26277e4af1446c70e35b19aad4fb794a7b143859e7eeb9a4025d83" +checksum = "b04e11319b08af11358ab543105a9e49b0c491faca35e2b8e7e36bfba8b671ab" dependencies = [ "cairo-rs", "field-offset", @@ -1505,23 +1538,21 @@ dependencies = [ [[package]] name = "gtk4-macros" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40300bf071d2fcd4c94eacc09e84ec6fe73129d2ceb635cf7e55b026b5443567" +checksum = "ec655a7ef88d8ce9592899deb8b2d0fa50bab1e6dd69182deb764e643c522408" dependencies = [ - "anyhow", "proc-macro-crate 3.1.0", - "proc-macro-error", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.72", ] [[package]] name = "gtk4-sys" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0db1b104138f087ccdc81d2c332de5dd049b89de3d384437cc1093b17cd2da18" +checksum = "8c8aa86b7f85ea71d66ea88c1d4bae1cfacf51ca4856274565133838d77e57b5" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -1551,15 +1582,15 @@ dependencies = [ "indexmap", "slab", "tokio", - "tokio-util 0.7.10", + "tokio-util 0.7.11", "tracing", ] [[package]] name = "half" -version = "2.4.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5eceaaeec696539ddaf7b333340f1af35a5aa87ae3e4f3ead0532f72affab2e" +checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888" dependencies = [ "cfg-if", "crunchy", @@ -1567,9 +1598,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.14.3" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" [[package]] name = "headers" @@ -1577,7 +1608,7 @@ version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "06683b93020a07e3dbcf5f8c0f6d40080d725bea7936fc01ad345c01b97dc270" dependencies = [ - "base64", + "base64 0.21.7", "bytes", "headers-core", "http 0.2.12", @@ -1597,12 +1628,6 @@ dependencies = [ [[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" @@ -1614,6 +1639,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" [[package]] +name = "hermit-abi" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" + +[[package]] name = "hex" version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1644,15 +1675,6 @@ dependencies = [ ] [[package]] -name = "home" -version = "0.5.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" -dependencies = [ - "windows-sys 0.52.0", -] - -[[package]] name = "html-escape" version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1696,9 +1718,9 @@ dependencies = [ [[package]] name = "httparse" -version = "1.8.0" +version = "1.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" +checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" [[package]] name = "httpdate" @@ -1714,9 +1736,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.28" +version = "0.14.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" +checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9" dependencies = [ "bytes", "futures-channel", @@ -1817,6 +1839,45 @@ dependencies = [ ] [[package]] +name = "image" +version = "0.25.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99314c8a2152b8ddb211f924cdae532d8c5e4c8bb54728e12fff1b0cd5963a10" +dependencies = [ + "bytemuck", + "byteorder-lite", + "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.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f79afb8cbee2ef20f59ccd477a218c12a93943d075b492015ecb1bb81f8ee904" +dependencies = [ + "byteorder-lite", + "quick-error", +] + +[[package]] +name = "imgref" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44feda355f4159a7c757171a77de25daf6411e217b4cabd03bd6650690468126" + +[[package]] name = "indexmap" version = "2.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1838,23 +1899,31 @@ dependencies = [ [[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", ] [[package]] -name = "itertools" -version = "0.11.0" +name = "interpolate_name" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" +checksum = "c34819042dc3d3971c46c2190835914dfbe0c3c13f61449b2997f4e9722dfa60" dependencies = [ - "either", + "proc-macro2", + "quote", + "syn 2.0.72", ] [[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.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1871,9 +1940,9 @@ checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "jobserver" -version = "0.1.28" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab46a6e9526ddef3ae7f787c06f0f2600639ba80ea3eade3d8e670a2230f51d6" +checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" dependencies = [ "libc", ] @@ -1898,11 +1967,11 @@ dependencies = [ [[package]] name = "lazy_static" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" dependencies = [ - "spin 0.5.2", + "spin", ] [[package]] @@ -1945,9 +2014,20 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.153" +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 = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +checksum = "a96cfd5557eb82f2b83fed4955246c988d331975a002961b07c81584d107e7f7" +dependencies = [ + "arbitrary", + "cc", + "once_cell", +] [[package]] name = "libm" @@ -1958,7 +2038,7 @@ checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" [[package]] name = "libsignal-core" version = "0.1.0" -source = "git+https://github.com/signalapp/libsignal?tag=v0.40.1#f980fccd8ae72fe21dc202d644b358667d60e2b0" +source = "git+https://github.com/signalapp/libsignal?tag=v0.51.1#2e2896fc235efa293213dd5f0aff4b1f8528bab2" dependencies = [ "num_enum", "uuid", @@ -1967,7 +2047,7 @@ dependencies = [ [[package]] name = "libsignal-protocol" version = "0.1.0" -source = "git+https://github.com/signalapp/libsignal?tag=v0.40.1#f980fccd8ae72fe21dc202d644b358667d60e2b0" +source = "git+https://github.com/signalapp/libsignal?tag=v0.51.1#2e2896fc235efa293213dd5f0aff4b1f8528bab2" dependencies = [ "aes", "aes-gcm-siv", @@ -1981,7 +2061,7 @@ dependencies = [ "hkdf", "hmac", "indexmap", - "itertools 0.12.1", + "itertools", "libsignal-core", "log", "num_enum", @@ -1991,9 +2071,9 @@ dependencies = [ "prost-build", "rand", "rayon", + "serde", "sha2", "signal-crypto", - "static_assertions", "subtle", "thiserror", "uuid", @@ -2003,12 +2083,12 @@ dependencies = [ [[package]] name = "libsignal-service" version = "0.1.0" -source = "git+https://github.com/whisperfish/libsignal-service-rs?rev=c072491aa3e2b604b45b9f2b764552b7d382898c#c072491aa3e2b604b45b9f2b764552b7d382898c" +source = "git+https://github.com/whisperfish/libsignal-service-rs?rev=1b591540b908112816be131d6baa6eafba2129cb#1b591540b908112816be131d6baa6eafba2129cb" dependencies = [ "aes", "aes-gcm", "async-trait", - "base64", + "base64 0.21.7", "bincode", "bytes", "cbc", @@ -2038,7 +2118,7 @@ dependencies = [ [[package]] name = "libsignal-service-hyper" version = "0.1.0" -source = "git+https://github.com/whisperfish/libsignal-service-rs?rev=c072491aa3e2b604b45b9f2b764552b7d382898c#c072491aa3e2b604b45b9f2b764552b7d382898c" +source = "git+https://github.com/whisperfish/libsignal-service-rs?rev=1b591540b908112816be131d6baa6eafba2129cb#1b591540b908112816be131d6baa6eafba2129cb" dependencies = [ "async-trait", "async-tungstenite", @@ -2098,9 +2178,9 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[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 = "locale_config" @@ -2117,9 +2197,9 @@ dependencies = [ [[package]] name = "lock_api" -version = "0.4.11" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" dependencies = [ "autocfg", "scopeguard", @@ -2127,9 +2207,18 @@ dependencies = [ [[package]] name = "log" -version = "0.4.21" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" + +[[package]] +name = "loop9" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fae87c125b03c1d2c0150c90365d7d6bcc53fb73a9acaef207d2d065860f062" +dependencies = [ + "imgref", +] [[package]] name = "lru-cache" @@ -2150,10 +2239,30 @@ dependencies = [ ] [[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 = "md-5" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" +dependencies = [ + "cfg-if", + "digest", +] + +[[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 = "memoffset" @@ -2172,9 +2281,9 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] name = "mime_guess" -version = "2.0.4" +version = "2.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" +checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e" dependencies = [ "mime", "unicase", @@ -2188,9 +2297,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", @@ -2231,17 +2340,23 @@ dependencies = [ [[package]] name = "multimap" -version = "0.8.3" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" +checksum = "defc4c55412d89136f966bbb339008b474350e5e6e78d2714439c386b3137a03" + +[[package]] +name = "new_debug_unreachable" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" [[package]] name = "nix" -version = "0.28.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" +checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cfg-if", "cfg_aliases", "libc", @@ -2259,10 +2374,16 @@ dependencies = [ ] [[package]] +name = "noop_proc_macro" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0676bb32a98c1a483ce53e500a81ad9c3d5b3f7c920c28c24e9cb0980d0b5bc8" + +[[package]] name = "num" -version = "0.4.1" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b05180d69e3da0e530ba2a1dae5110317e49e3b7f3d41be227dc5f92e49ee7af" +checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23" dependencies = [ "num-bigint", "num-complex", @@ -2274,11 +2395,10 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.4.4" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" dependencies = [ - "autocfg", "num-integer", "num-traits", ] @@ -2303,14 +2423,25 @@ dependencies = [ [[package]] name = "num-complex" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23c6602fda94a57c990fe0df199a035d83576b496aa29f4e634a8ac6004e68a6" +checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495" dependencies = [ "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.72", +] + +[[package]] name = "num-integer" version = "0.1.46" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2321,9 +2452,9 @@ dependencies = [ [[package]] name = "num-iter" -version = "0.1.44" +version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d869c01cc0c455284163fd0092f1f93835385ccab5a98a0dcc497b2f8bf055a9" +checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" dependencies = [ "autocfg", "num-integer", @@ -2332,11 +2463,10 @@ dependencies = [ [[package]] name = "num-rational" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" +checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824" dependencies = [ - "autocfg", "num-bigint", "num-integer", "num-traits", @@ -2344,9 +2474,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.18" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", ] @@ -2357,7 +2487,7 @@ version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi", + "hermit-abi 0.3.9", "libc", ] @@ -2379,7 +2509,7 @@ dependencies = [ "proc-macro-crate 1.3.1", "proc-macro2", "quote", - "syn 2.0.57", + "syn 2.0.72", ] [[package]] @@ -2413,9 +2543,9 @@ dependencies = [ [[package]] name = "object" -version = "0.32.2" +version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +checksum = "081b846d1d56ddfc18fdf1a922e4f6e07a11768ea1b92dec44e42b72712ccfce" dependencies = [ "memchr", ] @@ -2434,23 +2564,26 @@ checksum = "44d11de466f4a3006fe8a5e7ec84e93b79c70cb992ae0aa0eb631ad2df8abfe2" [[package]] name = "oo7" -version = "0.3.0" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37558cac1af63a81fd2ff7f3469c02a4da06b163c5671791553b8dac10f07c82" +checksum = "8fc6ce4692fbfd044ce22ca07dcab1a30fa12432ca2aa5b1294eca50d3332a24" dependencies = [ "aes", "cbc", "cipher", "digest", + "endi", "futures-util", "hkdf", "hmac", + "md-5", "num", "num-bigint-dig", "pbkdf2", "rand", "serde", "sha2", + "subtle", "tokio", "zbus", "zeroize", @@ -2481,9 +2614,9 @@ dependencies = [ [[package]] name = "pango" -version = "0.19.3" +version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1264d13deb823cc652f26cfe59afb1ec4b9db2a5bd27c41b738c879cc1bfaa1" +checksum = "3f0d328648058085cfd6897c9ae4272884098a926f3a833cd50c8c73e6eccecd" dependencies = [ "gio", "glib", @@ -2493,9 +2626,9 @@ dependencies = [ [[package]] name = "pango-sys" -version = "0.19.0" +version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f52ef6a881c19fbfe3b1484df5cad411acaaba29dbec843941c3110d19f340ea" +checksum = "ff03da4fa086c0b244d4a4587d3e20622a3ecdb21daea9edf66597224c634ba0" dependencies = [ "glib-sys", "gobject-sys", @@ -2551,10 +2684,16 @@ checksum = "7459127d7a18cb202d418e4b7df1103ffd6d82a106e9b2091c250624c2ace70d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.57", + "syn 2.0.72", ] [[package]] +name = "paste" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" + +[[package]] name = "pbkdf2" version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2572,9 +2711,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "petgraph" -version = "0.6.4" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" +checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" dependencies = [ "fixedbitset", "indexmap", @@ -2582,14 +2721,14 @@ dependencies = [ [[package]] name = "phonenumber" -version = "0.3.3+8.13.9" +version = "0.3.6+8.13.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "635f3e6288e4f01c049d89332a031bd74f25d64b6fb94703ca966e819488cd06" +checksum = "11756237b57b8cc5e97dc8b1e70ea436324d30e7075de63b14fd15073a8f692a" dependencies = [ "bincode", "either", "fnv", - "itertools 0.11.0", + "itertools", "lazy_static", "nom", "quick-xml", @@ -2618,7 +2757,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.57", + "syn 2.0.72", ] [[package]] @@ -2635,9 +2774,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "piper" -version = "0.2.1" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" +checksum = "ae1d5c74c9876f070d3e8fd503d748c7d974c3e48da8f41350fa5222ef9b4391" dependencies = [ "atomic-waker", "fastrand", @@ -2651,12 +2790,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] -name = "platforms" -version = "3.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db23d408679286588f4d4644f965003d056e3dd5abcaaa938116871d7ce2fee7" - -[[package]] name = "png" version = "0.17.13" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2672,23 +2805,22 @@ dependencies = [ [[package]] name = "poksho" version = "0.7.0" -source = "git+https://github.com/signalapp/libsignal?tag=v0.40.1#f980fccd8ae72fe21dc202d644b358667d60e2b0" +source = "git+https://github.com/signalapp/libsignal?tag=v0.51.1#2e2896fc235efa293213dd5f0aff4b1f8528bab2" dependencies = [ "curve25519-dalek", "hmac", "sha2", - "subtle", ] [[package]] name = "polling" -version = "3.6.0" +version = "3.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0c976a60b2d7e99d6f229e414670a9b85d13ac305cc6d1e9c134de58c5aaaf6" +checksum = "a3ed00ed3fbf728b5816498ecd316d1716eecaced9c0c8d2c5a6740ca214985b" dependencies = [ "cfg-if", "concurrent-queue", - "hermit-abi", + "hermit-abi 0.4.0", "pin-project-lite", "rustix", "tracing", @@ -2757,10 +2889,10 @@ checksum = "94e851c7654eed9e68d7d27164c454961a616cf8c203d500607ef22c737b51bb" [[package]] name = "presage" -version = "0.6.1" -source = "git+https://github.com/Schmiddiii/presage?rev=de9c6d0df4fb5908586c9b06f74d5f2ce7078a9e#de9c6d0df4fb5908586c9b06f74d5f2ce7078a9e" +version = "0.6.2" +source = "git+https://github.com/whisperfish/presage?rev=e2392c42a0392397b9db782607fdd7ab2ea91b5f#e2392c42a0392397b9db782607fdd7ab2ea91b5f" dependencies = [ - "base64", + "base64 0.21.7", "futures", "hex", "libsignal-service", @@ -2778,7 +2910,7 @@ dependencies = [ [[package]] name = "presage-store-cipher" version = "0.1.0" -source = "git+https://github.com/Schmiddiii/presage?rev=de9c6d0df4fb5908586c9b06f74d5f2ce7078a9e#de9c6d0df4fb5908586c9b06f74d5f2ce7078a9e" +source = "git+https://github.com/whisperfish/presage?rev=e2392c42a0392397b9db782607fdd7ab2ea91b5f#e2392c42a0392397b9db782607fdd7ab2ea91b5f" dependencies = [ "blake3", "chacha20poly1305", @@ -2795,10 +2927,11 @@ dependencies = [ [[package]] name = "presage-store-sled" version = "0.6.0-dev" -source = "git+https://github.com/Schmiddiii/presage?rev=de9c6d0df4fb5908586c9b06f74d5f2ce7078a9e#de9c6d0df4fb5908586c9b06f74d5f2ce7078a9e" +source = "git+https://github.com/whisperfish/presage?rev=e2392c42a0392397b9db782607fdd7ab2ea91b5f#e2392c42a0392397b9db782607fdd7ab2ea91b5f" dependencies = [ "async-trait", - "base64", + "base64 0.21.7", + "chrono", "fs_extra", "log", "presage", @@ -2815,12 +2948,12 @@ dependencies = [ [[package]] name = "prettyplease" -version = "0.2.17" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d3928fb5db768cb86f891ff014f0144589297e3c6a1aba6ed7cecfdace270c7" +checksum = "5f12335488a2f3b0a83b14edad48dca9879ce89b2edd10e80237e4e852dd645e" dependencies = [ "proc-macro2", - "syn 2.0.57", + "syn 2.0.72", ] [[package]] @@ -2868,18 +3001,37 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.79" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" 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.72", +] + +[[package]] name = "prost" -version = "0.12.3" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "146c289cda302b98a28d40c8b3b90498d6e526dd24ac2ecea73e4e491685b94a" +checksum = "deb1435c188b76130da55f17a466d252ff7b1418b2ad3e037d127b94e3411f29" dependencies = [ "bytes", "prost-derive", @@ -2887,13 +3039,13 @@ dependencies = [ [[package]] name = "prost-build" -version = "0.12.3" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c55e02e35260070b6f716a2423c2ff1c3bb1642ddca6f99e1f26d06268a0e2d2" +checksum = "22505a5c94da8e3b7c2996394d1c933236c4d743e81a410bcca4e6989fc066a4" dependencies = [ "bytes", - "heck 0.4.1", - "itertools 0.11.0", + "heck", + "itertools", "log", "multimap", "once_cell", @@ -2902,29 +3054,28 @@ dependencies = [ "prost", "prost-types", "regex", - "syn 2.0.57", + "syn 2.0.72", "tempfile", - "which", ] [[package]] name = "prost-derive" -version = "0.12.3" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efb6c9a1dd1def8e2124d17e83a20af56f1570d6c2d2bd9e266ccb768df3840e" +checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1" dependencies = [ "anyhow", - "itertools 0.11.0", + "itertools", "proc-macro2", "quote", - "syn 2.0.57", + "syn 2.0.72", ] [[package]] name = "prost-types" -version = "0.12.3" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "193898f59edcf43c26227dcd4c8427f00d99d61e95dcde58dabd49fa291d470e" +checksum = "9091c90b0a32608e984ff2fa4091273cbdd755d54935c51d520887f4a1dbd5b0" dependencies = [ "prost", ] @@ -2945,7 +3096,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d06cb9646c7a14096231a2474d7f21e5e8c13de090c68d13bde6157cfe7f159" dependencies = [ "html-escape", - "image", + "image 0.24.9", "qrcodegen", ] @@ -2956,10 +3107,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4339fc7a1021c9c1621d87f5e3505f2805c8c105420ba2f2a4df86814590c142" [[package]] +name = "quick-error" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" + +[[package]] name = "quick-xml" -version = "0.28.2" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ce5e73202a820a31f8a0ee32ada5e21029c81fd9e3ebf668a40832e4219d9d1" +checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" dependencies = [ "memchr", ] @@ -2977,9 +3134,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.35" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] @@ -3015,6 +3172,57 @@ dependencies = [ ] [[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", + "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.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85be49d628515bb99a01c44200009f0a4167c252f036445b975b35daf952258c" +dependencies = [ + "avif-serialize", + "bitstream-io", + "imgref", + "loop9", + "quick-error", + "rav1e", + "rayon", + "rgb", +] + +[[package]] name = "rayon" version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3045,25 +3253,25 @@ 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", - "regex-syntax 0.8.3", + "regex-syntax 0.8.4", ] [[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]] @@ -3086,9 +3294,18 @@ 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 = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" + +[[package]] +name = "rgb" +version = "0.8.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" +checksum = "ade4539f42266ded9e755c605bdddf546242b2c961b03b06a7375260788a0523" +dependencies = [ + "bytemuck", +] [[package]] name = "ring" @@ -3100,16 +3317,16 @@ dependencies = [ "cfg-if", "getrandom", "libc", - "spin 0.9.8", + "spin", "untrusted", "windows-sys 0.52.0", ] [[package]] name = "rustc-demangle" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustc_version" @@ -3122,11 +3339,11 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.32" +version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "errno", "libc", "linux-raw-sys", @@ -3149,9 +3366,9 @@ dependencies = [ [[package]] name = "rustls-native-certs" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f1fb85efa936c42c6d5fc28d2629bb51e4b2f4b8a5211e297d599cc5a093792" +checksum = "a88d6d420651b496bdd98684116959239430022a115c1240e6c3993be0b15fba" dependencies = [ "openssl-probe", "rustls-pemfile", @@ -3162,25 +3379,25 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "2.1.1" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f48172685e6ff52a556baa527774f61fcaa884f59daf3375c62a3f1cd2549dab" +checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d" dependencies = [ - "base64", + "base64 0.22.1", "rustls-pki-types", ] [[package]] name = "rustls-pki-types" -version = "1.4.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecd36cc4259e3e4514335c4a138c6b43171a8d61d8f5c9348f9fc7529416f247" +checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" [[package]] name = "rustls-webpki" -version = "0.102.2" +version = "0.102.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "faaa0a62740bedb9b2ef5afa303da42764c012f743917351dc9a237ea1663610" +checksum = "8e6b52d4fda176fd835fdc55a835d4a89b8499cad995885a21149d5ad62f852e" dependencies = [ "ring", "rustls-pki-types", @@ -3189,15 +3406,15 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.14" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" +checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" [[package]] name = "ryu" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "schannel" @@ -3216,11 +3433,11 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "security-framework" -version = "2.10.0" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "770452e37cad93e0a50d5abc3990d2bc351c36d0328f86cefec2f2fb206eaef6" +checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", "core-foundation", "core-foundation-sys", "libc", @@ -3229,9 +3446,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.10.0" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41f3cc463c0ef97e11c3461a9d3787412d30e8e7eb907c79180c4a57bf7c04ef" +checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf" dependencies = [ "core-foundation-sys", "libc", @@ -3239,35 +3456,35 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.22" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.197" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.197" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" +checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" dependencies = [ "proc-macro2", "quote", - "syn 2.0.57", + "syn 2.0.72", ] [[package]] name = "serde_json" -version = "1.0.115" +version = "1.0.120" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd" +checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5" dependencies = [ "itoa", "ryu", @@ -3276,20 +3493,20 @@ dependencies = [ [[package]] name = "serde_repr" -version = "0.1.18" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb" +checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.57", + "syn 2.0.72", ] [[package]] name = "serde_spanned" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" +checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" dependencies = [ "serde", ] @@ -3319,7 +3536,7 @@ dependencies = [ [[package]] name = "signal-crypto" version = "0.1.0" -source = "git+https://github.com/signalapp/libsignal?tag=v0.40.1#f980fccd8ae72fe21dc202d644b358667d60e2b0" +source = "git+https://github.com/signalapp/libsignal?tag=v0.51.1#2e2896fc235efa293213dd5f0aff4b1f8528bab2" dependencies = [ "aes", "cbc", @@ -3335,9 +3552,9 @@ dependencies = [ [[package]] name = "signal-hook-registry" -version = "1.4.1" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" dependencies = [ "libc", ] @@ -3349,6 +3566,15 @@ 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 = "slab" version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3381,9 +3607,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "socket2" -version = "0.5.6" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" dependencies = [ "libc", "windows-sys 0.52.0", @@ -3426,12 +3652,6 @@ dependencies = [ [[package]] name = "spin" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" - -[[package]] -name = "spin" version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" @@ -3447,31 +3667,31 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "strum" -version = "0.24.1" +version = "0.26.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f" +checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" dependencies = [ "strum_macros", ] [[package]] name = "strum_macros" -version = "0.24.3" +version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" +checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" dependencies = [ - "heck 0.4.1", + "heck", "proc-macro2", "quote", "rustversion", - "syn 1.0.109", + "syn 2.0.72", ] [[package]] name = "subtle" -version = "2.5.0" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "syn" @@ -3486,9 +3706,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.57" +version = "2.0.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11a6ae1e52eb25aab8f3fb9fca13be982a373b8f1157ca14b897a825ba4a2d35" +checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af" dependencies = [ "proc-macro2", "quote", @@ -3514,7 +3734,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349" dependencies = [ "cfg-expr", - "heck 0.5.0", + "heck", "pkg-config", "toml", "version-compare", @@ -3522,9 +3742,9 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.14" +version = "0.12.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" +checksum = "4873307b7c257eddcb50c9bedf158eb669578359fb28428bef438fec8e6ba7c2" [[package]] name = "temp-dir" @@ -3546,22 +3766,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.58" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.58" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", - "syn 2.0.57", + "syn 2.0.72", ] [[package]] @@ -3577,9 +3797,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.6.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" dependencies = [ "tinyvec_macros", ] @@ -3592,9 +3812,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.37.0" +version = "1.38.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" +checksum = "eb2caba9f80616f438e09748d5acda951967e1ea58508ef53d9c6402485a46df" dependencies = [ "backtrace", "bytes", @@ -3621,13 +3841,13 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" +checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.57", + "syn 2.0.72", ] [[package]] @@ -3657,35 +3877,34 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.10" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" +checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" dependencies = [ "bytes", "futures-core", "futures-sink", "pin-project-lite", "tokio", - "tracing", ] [[package]] name = "toml" -version = "0.8.12" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3" +checksum = "ac2caab0bf757388c6c0ae23b3293fdb463fee59434529014f85e3263b995c28" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.9", + "toml_edit 0.22.16", ] [[package]] name = "toml_datetime" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" dependencies = [ "serde", ] @@ -3714,15 +3933,15 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.9" +version = "0.22.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e40bb779c5187258fd7aad0eb68cb8706a0a81fa712fbea808ab43c4b8374c4" +checksum = "278f3d518e152219c994ce877758516bca5e118eaed6996192a774fb9fbf0788" dependencies = [ "indexmap", "serde", "serde_spanned", "toml_datetime", - "winnow 0.6.5", + "winnow 0.6.14", ] [[package]] @@ -3751,7 +3970,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.57", + "syn 2.0.72", ] [[package]] @@ -3871,9 +4090,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[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", @@ -3895,20 +4114,31 @@ checksum = "86bd8d4e895da8537e5315b8254664e6b769c4ff3db18321b297a1e7004392e3" [[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 = "uuid" -version = "1.8.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" +checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" dependencies = [ "serde", ] [[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 = "version-compare" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3956,7 +4186,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.57", + "syn 2.0.72", "wasm-bindgen-shared", ] @@ -3978,7 +4208,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.57", + "syn 2.0.72", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -3996,18 +4226,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" [[package]] -name = "which" -version = "4.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" -dependencies = [ - "either", - "home", - "once_cell", - "rustix", -] - -[[package]] name = "winapi" version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4035,7 +4253,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.4", + "windows-targets 0.52.6", ] [[package]] @@ -4053,7 +4271,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.4", + "windows-targets 0.52.6", ] [[package]] @@ -4073,17 +4291,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.4", - "windows_aarch64_msvc 0.52.4", - "windows_i686_gnu 0.52.4", - "windows_i686_msvc 0.52.4", - "windows_x86_64_gnu 0.52.4", - "windows_x86_64_gnullvm 0.52.4", - "windows_x86_64_msvc 0.52.4", + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", ] [[package]] @@ -4094,9 +4313,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" @@ -4106,9 +4325,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" @@ -4118,9 +4337,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.4" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" @@ -4130,9 +4355,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" @@ -4142,9 +4367,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" @@ -4154,9 +4379,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" @@ -4166,9 +4391,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" @@ -4181,9 +4406,9 @@ dependencies = [ [[package]] name = "winnow" -version = "0.6.5" +version = "0.6.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dffa400e67ed5a4dd237983829e66475f0a4a26938c4b04c21baede6262215b8" +checksum = "374ec40a2d767a3c1b4972d9475ecd557356637be906f2cb3f7fe17a6eb5e22f" dependencies = [ "memchr", ] @@ -4202,27 +4427,26 @@ dependencies = [ [[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]] name = "zbus" -version = "4.1.2" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9ff46f2a25abd690ed072054733e0bc3157e3d4c45f41bd183dce09c2ff8ab9" +checksum = "bb97012beadd29e654708a0fdb4c84bc046f537aecfde2c3ee0a9e4b4d48c725" dependencies = [ "async-broadcast", "async-process", "async-recursion", "async-trait", - "derivative", "enumflags2", - "event-listener 5.2.0", + "event-listener", "futures-core", "futures-sink", "futures-util", @@ -4246,15 +4470,14 @@ dependencies = [ [[package]] name = "zbus_macros" -version = "4.1.2" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e0e3852c93dcdb49c9462afe67a2a468f7bd464150d866e861eaf06208633e0" +checksum = "267db9407081e90bbfa46d841d3cbc60f59c0351838c4bc65199ecd79ab1983e" dependencies = [ "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "regex", - "syn 1.0.109", + "syn 2.0.72", "zvariant_utils", ] @@ -4271,9 +4494,9 @@ dependencies = [ [[package]] name = "zeroize" -version = "1.7.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" dependencies = [ "zeroize_derive", ] @@ -4286,28 +4509,32 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.57", + "syn 2.0.72", ] [[package]] name = "zkcredential" version = "0.1.0" -source = "git+https://github.com/signalapp/libsignal?tag=v0.40.1#f980fccd8ae72fe21dc202d644b358667d60e2b0" +source = "git+https://github.com/signalapp/libsignal?tag=v0.51.1#2e2896fc235efa293213dd5f0aff4b1f8528bab2" dependencies = [ + "cfg-if", "curve25519-dalek", "derive-where", "displaydoc", "lazy_static", "partial-default", "poksho", + "rayon", "serde", + "sha2", "subtle", + "thiserror", ] [[package]] name = "zkgroup" version = "0.9.0" -source = "git+https://github.com/signalapp/libsignal?tag=v0.40.1#f980fccd8ae72fe21dc202d644b358667d60e2b0" +source = "git+https://github.com/signalapp/libsignal?tag=v0.51.1#2e2896fc235efa293213dd5f0aff4b1f8528bab2" dependencies = [ "aes-gcm-siv", "bincode", @@ -4319,17 +4546,27 @@ dependencies = [ "hkdf", "lazy_static", "libsignal-core", + "num_enum", "partial-default", "poksho", + "rand", + "rayon", "serde", "sha2", "signal-crypto", "subtle", + "thiserror", "uuid", "zkcredential", ] [[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" @@ -4339,10 +4576,19 @@ dependencies = [ ] [[package]] +name = "zune-jpeg" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16099418600b4d8f028622f73ff6e3deaabdff330fb9a2a131dea781ee8b0768" +dependencies = [ + "zune-core", +] + +[[package]] name = "zvariant" -version = "4.0.2" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c1b3ca6db667bfada0f1ebfc94b2b1759ba25472ee5373d4551bb892616389a" +checksum = "2084290ab9a1c471c38fc524945837734fbf124487e105daec2bb57fd48c81fe" dependencies = [ "endi", "enumflags2", @@ -4354,24 +4600,24 @@ dependencies = [ [[package]] name = "zvariant_derive" -version = "4.0.2" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7a4b236063316163b69039f77ce3117accb41a09567fd24c168e43491e521bc" +checksum = "73e2ba546bda683a90652bac4a279bc146adad1386f25379cf73200d2002c449" dependencies = [ "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.72", "zvariant_utils", ] [[package]] name = "zvariant_utils" -version = "1.1.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00bedb16a193cc12451873fee2a1bc6550225acece0e36f333e68326c73c8172" +checksum = "c51bcff7cc3dbb5055396bcf774748c3dab426b4b8659046963523cee4808340" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.72", ] diff --git a/pkgs/applications/networking/instant-messengers/flare-signal/default.nix b/pkgs/applications/networking/instant-messengers/flare-signal/default.nix index b22963c476a79..6614d54ff696c 100644 --- a/pkgs/applications/networking/instant-messengers/flare-signal/default.nix +++ b/pkgs/applications/networking/instant-messengers/flare-signal/default.nix @@ -21,23 +21,23 @@ stdenv.mkDerivation rec { pname = "flare"; - version = "0.14.3"; + version = "0.15.0"; src = fetchFromGitLab { domain = "gitlab.com"; owner = "schmiddi-on-mobile"; repo = "flare"; rev = version; - hash = "sha256-e/XkY5xULYnx5zBB3pxjBSocufK85xzb2t+kVXxhFNg="; + hash = "sha256-sIT4oEmIV8TJ5MMxg3vxkvK+7PaIy/01kN9I2FTsfo0="; }; cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; outputHashes = { - "curve25519-dalek-4.1.1" = "sha256-p9Vx0lAaYILypsI4/RVsHZLOqZKaa4Wvf7DanLA38pc="; - "libsignal-core-0.1.0" = "sha256-p4YzrtJaQhuMBTtquvS1m9llszfyTeDfl7+IXzRUFSE="; - "libsignal-service-0.1.0" = "sha256-rXa/7AmCt03WvMPqrOxPkQlNrMvJQuodEkBuqYo9sFQ="; - "presage-0.6.1" = "sha256-4rH/Yt//0EpF8KQQXkurX5m9tMrFRI2MaJ+IzddVUUU="; + "curve25519-dalek-4.1.3" = "sha256-bPh7eEgcZnq9C3wmSnnYv0C4aAP+7pnwk9Io29GrI4A="; + "libsignal-core-0.1.0" = "sha256-4aHINlpVAqVTtm7npwXQRutZUmIxYgkhXhApg7jSM4M="; + "libsignal-service-0.1.0" = "sha256-UMQqp6hfyVtUwkAqsw/xsn7UrGul/F4WVC/Oy5s+hqA="; + "presage-0.6.2" = "sha256-4E23mzXwb5gcj0XpXB17a5BD96+ZAl7dh5I6vMvE9Kg="; }; }; diff --git a/pkgs/applications/networking/instant-messengers/fluffychat/default.nix b/pkgs/applications/networking/instant-messengers/fluffychat/default.nix index 66d7abc0822d0..666cda55472ea 100644 --- a/pkgs/applications/networking/instant-messengers/fluffychat/default.nix +++ b/pkgs/applications/networking/instant-messengers/fluffychat/default.nix @@ -7,7 +7,8 @@ , flutter319 , pulseaudio , makeDesktopItem -, gnome +, zenity +, olm , targetFlutterPlatform ? "linux" }: @@ -44,13 +45,14 @@ flutter319.buildFlutterApplication (rec { maintainers = with maintainers; [ mkg20001 gilice ]; platforms = [ "x86_64-linux" "aarch64-linux" ]; sourceProvenance = [ sourceTypes.fromSource ]; + inherit (olm.meta) knownVulnerabilities; }; } // lib.optionalAttrs (targetFlutterPlatform == "linux") { nativeBuildInputs = [ imagemagick ]; 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/fractal/Cargo.lock b/pkgs/applications/networking/instant-messengers/fractal/Cargo.lock index 336cfeb7c00aa..9be63cae42a02 100644 --- a/pkgs/applications/networking/instant-messengers/fractal/Cargo.lock +++ b/pkgs/applications/networking/instant-messengers/fractal/Cargo.lock @@ -4,21 +4,21 @@ version = 3 [[package]] name = "accessory" -version = "1.3.0" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "850bb534b9dc04744fbbb71d30ad6d25a7e4cf6dc33e223c81ef3a92ebab4e0b" +checksum = "87537f9ae7cfa78d5b8ebd1a1db25959f5e737126be4d8eb44a5452fc4b63cde" dependencies = [ "macroific", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.71", ] [[package]] name = "addr2line" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" dependencies = [ "gimli", ] @@ -79,22 +79,9 @@ checksum = "4aa90d7ce82d4be67b64039a3d588d38dbcc6736577de4a847025ce5b0c468d1" [[package]] name = "allocator-api2" -version = "0.2.16" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" - -[[package]] -name = "ammonia" -version = "3.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64e6d1c7838db705c9b756557ee27c384ce695a1c51a6fe528784cb1c6840170" -dependencies = [ - "html5ever", - "maplit", - "once_cell", - "tendril", - "url", -] +checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" [[package]] name = "android-tzdata" @@ -123,9 +110,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.82" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" [[package]] name = "anymap2" @@ -144,7 +131,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.71", ] [[package]] @@ -161,7 +148,7 @@ checksum = "0ae92a5119aa49cdbcf6b9f893fe4e1d98b04ccbf82ee0584ad948a44a734dea" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.71", ] [[package]] @@ -187,9 +174,9 @@ checksum = "f38fa22307249f86fb7fad906fcae77f2564caeb56d7209103c551cd1cf4798f" [[package]] name = "ashpd" -version = "0.8.1" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd884d7c72877a94102c3715f3b1cd09ff4fac28221add3e57cfbe25c236d093" +checksum = "bfe7e0dd0ac5a401dc116ed9f9119cf9decc625600474cb41f0fc0a0050abc9a" dependencies = [ "enumflags2", "futures-channel", @@ -212,34 +199,33 @@ checksum = "5f093eed78becd229346bf859eec0aa4dd7ddde0757287b2b4107a1f09c80002" [[package]] name = "async-broadcast" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "258b52a1aa741b9f09783b2d86cf0aeeb617bbf847f6933340a39644227acbdb" +checksum = "20cd0e2e25ea8e5f7e9df04578dc6cf5c83577fd09b1a46aaf5c85e1c33f2a7e" dependencies = [ - "event-listener 5.3.0", - "event-listener-strategy 0.5.1", + "event-listener", + "event-listener-strategy", "futures-core", "pin-project-lite", ] [[package]] name = "async-channel" -version = "2.2.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f28243a43d821d11341ab73c80bed182dc015c514b951616cf79bd4af39af0c3" +checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a" dependencies = [ "concurrent-queue", - "event-listener 5.3.0", - "event-listener-strategy 0.5.1", + "event-listener-strategy", "futures-core", "pin-project-lite", ] [[package]] name = "async-compression" -version = "0.4.8" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07dbbf24db18d609b1462965249abdf49129ccad073ec257da372adc83259c60" +checksum = "cd066d0b4ef8ecb03a55319dc13aa6910616d0f44008a045bb1835af830abff5" dependencies = [ "flate2", "futures-core", @@ -250,11 +236,11 @@ 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", "cfg-if", "concurrent-queue", "futures-io", @@ -269,21 +255,12 @@ dependencies = [ [[package]] name = "async-lock" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" -dependencies = [ - "event-listener 2.5.3", -] - -[[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", + "event-listener-strategy", "pin-project-lite", ] @@ -295,18 +272,18 @@ checksum = "9338790e78aa95a416786ec8389546c4b6a1dfc3dc36071ed9518a9413a542eb" [[package]] name = "async-process" -version = "2.2.0" +version = "2.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d999d925640d51b662b7b4e404224dd81de70f4aa4a199383c2c5e5b86885fa3" +checksum = "f7eda79bbd84e29c2b308d1dc099d7de8dcc7035e48f4bf5dc4a531a44ff5e2a" dependencies = [ "async-channel", "async-io", - "async-lock 3.3.0", + "async-lock", "async-signal", "async-task", "blocking", "cfg-if", - "event-listener 5.3.0", + "event-listener", "futures-lite", "rustix", "tracing", @@ -315,13 +292,13 @@ dependencies = [ [[package]] name = "async-recursion" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30c5ef0ede93efbf733c1a727f3b6b5a1060bbedd5600183e66f6e4be4af0ec5" +checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.71", ] [[package]] @@ -336,12 +313,12 @@ dependencies = [ [[package]] name = "async-signal" -version = "0.2.5" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5" +checksum = "dfb3634b73397aa844481f814fad23bbf07fdb0eabec10f2eb95e58944b1ec32" dependencies = [ "async-io", - "async-lock 2.8.0", + "async-lock", "atomic-waker", "cfg-if", "futures-core", @@ -349,7 +326,7 @@ dependencies = [ "rustix", "signal-hook-registry", "slab", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -371,24 +348,24 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.71", ] [[package]] name = "async-task" -version = "4.7.0" +version = "4.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbb36e985947064623dbd357f727af08ffd077f93d696782f3c56365fa2e2799" +checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" [[package]] name = "async-trait" -version = "0.1.79" +version = "0.1.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507401cad91ec6a857ed5513a2073c82a9b9048762b885bb98655b306964681" +checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.71", ] [[package]] @@ -411,9 +388,9 @@ checksum = "41e67cd8309bbd06cd603a9e693a784ac2e5d1e955f11286e355089fcab3047c" [[package]] name = "autocfg" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "av1-grain" @@ -439,6 +416,61 @@ dependencies = [ ] [[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 = "backoff" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -454,9 +486,9 @@ dependencies = [ [[package]] name = "backtrace" -version = "0.3.71" +version = "0.3.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" +checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" dependencies = [ "addr2line", "cc", @@ -468,22 +500,10 @@ dependencies = [ ] [[package]] -name = "base16ct" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" - -[[package]] -name = "base64" -version = "0.21.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" - -[[package]] name = "base64" -version = "0.22.0" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "base64ct" @@ -498,7 +518,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" dependencies = [ "annotate-snippets", - "bitflags 2.5.0", + "bitflags 2.6.0", "cexpr", "clang-sys", "itertools 0.12.1", @@ -509,7 +529,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.58", + "syn 2.0.71", ] [[package]] @@ -526,9 +546,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" dependencies = [ "serde", ] @@ -541,15 +561,15 @@ checksum = "a1d084b0137aaa901caf9f1e8b21daa6aa24d41cd806e111335541eff9683bd6" [[package]] name = "bitstream-io" -version = "2.2.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06c9989a51171e2e81038ab168b6ae22886fe9ded214430dbb4f41c28cf176da" +checksum = "3dcde5f311c85b8ca30c2e4198d4326bc342c76541590106f5fa4a50946ea499" [[package]] name = "blake3" -version = "1.5.1" +version = "1.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30cca6d3674597c30ddf2c587bf8d9d65c9a84d2326d941cc79c9842dfe0ef52" +checksum = "e9ec96fe9a81b5e365f9db71fe00edc4fe4ca2cc7dcb7861f0603012a7caa210" dependencies = [ "arrayref", "arrayvec", @@ -584,18 +604,15 @@ dependencies = [ [[package]] name = "blocking" -version = "1.5.1" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118" +checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea" dependencies = [ "async-channel", - "async-lock 3.3.0", "async-task", - "fastrand", "futures-io", "futures-lite", "piper", - "tracing", ] [[package]] @@ -609,9 +626,9 @@ dependencies = [ [[package]] name = "built" -version = "0.7.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41bfbdb21256b87a8b5e80fab81a8eed158178e812fd7ba451907518b2742f16" +checksum = "236e6289eda5a812bc6b53c3b024039382a2895fbbeef2d748b2931546d392c4" [[package]] name = "bumpalo" @@ -621,9 +638,9 @@ checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "bytemuck" -version = "1.15.0" +version = "1.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15" +checksum = "b236fc92302c97ed75b38da1f4917b5cdda4984745740f153a5d3059e48d725e" [[package]] name = "byteorder" @@ -632,10 +649,16 @@ 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" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" +checksum = "a12916984aab3fa6e39d655a33e09c0071eb36d6ab3aea5c2d78551f1df6d952" [[package]] name = "bytesize" @@ -645,11 +668,11 @@ checksum = "a3e368af43e418a04d52505cf3dbc23dda4e3407ae2fa99fd0e4f308ce546acc" [[package]] name = "cairo-rs" -version = "0.19.4" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ac2a4d0e69036cf0062976f6efcba1aaee3e448594e6514bb2ddf87acce562" +checksum = "797fd5a634dcb0ad0d7d583df794deb0a236d88e759cd34b7da20198c6c9d145" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cairo-sys-rs", "glib", "libc", @@ -658,13 +681,13 @@ dependencies = [ [[package]] name = "cairo-sys-rs" -version = "0.19.2" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd3bb3119664efbd78b5e6c93957447944f16bdbced84c17a9f41c7829b81e64" +checksum = "428290f914b9b86089f60f5d8a9f6e440508e1bcff23b25afd51502b0a2da88f" dependencies = [ "glib-sys", "libc", - "system-deps", + "system-deps 7.0.1", ] [[package]] @@ -678,9 +701,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.92" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2678b2e3449475e95b0aa6f9b506a28e61b3dc8996592b983695e8ebb58a8b41" +checksum = "324c74f2155653c90b04f25b2a47a8a631360cb908f92a772695f430c7e31052" dependencies = [ "jobserver", "libc", @@ -712,22 +735,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] -name = "cfg-vis" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3a2c3bf5fc10fe2ca157564fbe08a4cb2b0a7d2ff3fe2f9683e65d5e7c7859c" -dependencies = [ - "proc-macro-crate 1.3.1", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[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 = "chacha20" @@ -755,17 +766,16 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.37" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a0d04d43504c61aa6c7531f1871dd0d418d91130162063b789da00fd7057a5e" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" dependencies = [ "android-tzdata", "iana-time-zone", "js-sys", "num-traits", - "serde", "wasm-bindgen", - "windows-targets 0.52.4", + "windows-targets 0.52.6", ] [[package]] @@ -781,9 +791,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", @@ -798,9 +808,9 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" [[package]] name = "concurrent-queue" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" dependencies = [ "crossbeam-utils", ] @@ -868,23 +878,14 @@ 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-channel" -version = "0.5.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95" -dependencies = [ - "crossbeam-utils", -] - -[[package]] name = "crossbeam-deque" version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -905,9 +906,9 @@ dependencies = [ [[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 = "crunchy" @@ -916,18 +917,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" [[package]] -name = "crypto-bigint" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76" -dependencies = [ - "generic-array", - "rand_core", - "subtle", - "zeroize", -] - -[[package]] name = "crypto-common" version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -949,16 +938,15 @@ dependencies = [ [[package]] name = "curve25519-dalek" -version = "4.1.2" +version = "4.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a677b8922c94e01bdbb12126b0bc852f00447528dee1782229af9c720c3f348" +checksum = "97fb8b7c4503de7d6ae7b42ab72a5a59857b4c937ec27a3d4539dba95b5ab2be" dependencies = [ "cfg-if", "cpufeatures", "curve25519-dalek-derive", "digest", "fiat-crypto", - "platforms", "rustc_version", "serde", "subtle", @@ -973,14 +961,14 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.71", ] [[package]] name = "darling" -version = "0.20.8" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391" +checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" dependencies = [ "darling_core", "darling_macro", @@ -988,34 +976,34 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.8" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f" +checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", "strsim", - "syn 2.0.58", + "syn 2.0.71", ] [[package]] name = "darling_macro" -version = "0.20.8" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" +checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core", "quote", - "syn 2.0.58", + "syn 2.0.71", ] [[package]] -name = "data-encoding" -version = "2.5.0" +name = "date_header" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" +checksum = "0c03c416ed1a30fbb027ef484ba6ab6f80e1eada675e1a2b92fd673c045a1f1d" [[package]] name = "deadpool" @@ -1031,9 +1019,9 @@ dependencies = [ [[package]] name = "deadpool-runtime" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63dfa964fe2a66f3fde91fc70b267fe193d822c7e603e2a675a49a7f46ad3f49" +checksum = "092966b41edc516079bdf31ec78a2e0588d1d0c08f78b91d8307215928642b2b" dependencies = [ "tokio", ] @@ -1051,9 +1039,9 @@ dependencies = [ [[package]] name = "deadpool-sync" -version = "0.1.2" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8db70494c13cae4ce67b4b4dafdaf828cf0df7237ab5b9e2fcabee4965d0a0a" +checksum = "524bc3df0d57e98ecd022e21ba31166c2625e7d3e5bcc4510efaeeab4abcab04" dependencies = [ "deadpool-runtime", ] @@ -1067,7 +1055,7 @@ dependencies = [ "macroific", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.71", ] [[package]] @@ -1079,19 +1067,18 @@ dependencies = [ "const-oid", "der_derive", "flagset", - "pem-rfc7468", "zeroize", ] [[package]] name = "der_derive" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fe87ce4529967e0ba1dcf8450bab64d97dfd5010a6256187ffe2e43e6f0e049" +checksum = "8034092389675178f570469e6c3b0465d3d30b4505c294a6550db47f3c17ad18" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.71", ] [[package]] @@ -1101,18 +1088,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" dependencies = [ "powerfmt", - "serde", -] - -[[package]] -name = "derivative" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", ] [[package]] @@ -1133,7 +1108,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.71", ] [[package]] @@ -1143,7 +1118,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "206868b8242f27cecce124c19fd88157fbd0dd334df2587f36417bafbc85097b" dependencies = [ "derive_builder_core", - "syn 2.0.58", + "syn 2.0.71", ] [[package]] @@ -1153,49 +1128,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ "block-buffer", - "const-oid", "crypto-common", "subtle", ] [[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.58", -] - -[[package]] name = "djb_hash" version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8cf7d61e627a3b49af8f24f47e57f3788cdd7a0e4f17cd79fda5ada87f08578" [[package]] -name = "dyn-clone" -version = "1.0.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125" - -[[package]] -name = "ecdsa" -version = "0.16.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca" -dependencies = [ - "der", - "digest", - "elliptic-curve", - "rfc6979", - "signature", - "spki", -] - -[[package]] name = "ed25519" version = "2.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1223,39 +1166,9 @@ dependencies = [ [[package]] name = "either" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" - -[[package]] -name = "elliptic-curve" -version = "0.13.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47" -dependencies = [ - "base16ct", - "crypto-bigint", - "digest", - "ff", - "generic-array", - "group", - "hkdf", - "pem-rfc7468", - "pkcs8", - "rand_core", - "sec1", - "subtle", - "zeroize", -] - -[[package]] -name = "encoding_rs" -version = "0.8.34" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" -dependencies = [ - "cfg-if", -] +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "endi" @@ -1265,9 +1178,9 @@ checksum = "a3d8a32ae18130a3c84dd492d4215c3d913c3b07c6b63c2eb3eb7ff1101ab7bf" [[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", @@ -1275,13 +1188,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.58", + "syn 2.0.71", ] [[package]] @@ -1292,9 +1205,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" dependencies = [ "libc", "windows-sys 0.52.0", @@ -1302,26 +1215,9 @@ dependencies = [ [[package]] name = "event-listener" -version = "2.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" - -[[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", @@ -1330,21 +1226,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.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "332f51cb23d20b0de8458b86580878211da09bcd4503cb579c225b3d124cabb3" +checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" dependencies = [ - "event-listener 5.3.0", + "event-listener", "pin-project-lite", ] @@ -1366,9 +1252,9 @@ dependencies = [ [[package]] name = "eyeball" -version = "0.8.7" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42482893d982111055ce4b24234d6250396d3785767c6b04cedd84612a0b80fb" +checksum = "d93bd0ebf93d61d6332d3c09a96e97975968a44e19a64c947bde06e6baff383f" dependencies = [ "futures-core", "readlock", @@ -1377,9 +1263,9 @@ dependencies = [ [[package]] name = "eyeball-im" -version = "0.4.2" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "021fab29d9670be5867b16d56a95c29a12c3c1bb654e7d589010a028716d625d" +checksum = "2ae8c5165c9770f3ec7cccce12f4c5d70f01fa8bf84cf30cfbfd5a1c6f8901d5" dependencies = [ "futures-core", "imbl", @@ -1390,9 +1276,9 @@ dependencies = [ [[package]] name = "eyeball-im-util" -version = "0.5.3" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0fea22ab33f31f2fac1a3a81b9024b461e28518f3262fecb6156943221e9960" +checksum = "32b6b037e2cdce928a432ecc2880c944e5436d8a38c827974b882ad373f60037" dependencies = [ "arrayvec", "eyeball-im", @@ -1423,14 +1309,14 @@ dependencies = [ "macroific", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.71", ] [[package]] name = "fastrand" -version = "2.0.2" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984" +checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" [[package]] name = "fdeflate" @@ -1442,20 +1328,10 @@ dependencies = [ ] [[package]] -name = "ff" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449" -dependencies = [ - "rand_core", - "subtle", -] - -[[package]] name = "fiat-crypto" -version = "0.2.7" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c007b1ae3abe1cb6f85a16305acd418b7ca6343b953633fee2b76d8f108b830f" +checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d" [[package]] name = "field-offset" @@ -1469,15 +1345,15 @@ dependencies = [ [[package]] name = "flagset" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdeb3aa5e95cf9aabc17f060cfa0ced7b83f042390760ca53bf09df9968acaa1" +checksum = "b3ea1ec5f8307826a5b71094dd91fc04d4ae75d5709b20ad351c7fb4815c86ec" [[package]] name = "flate2" -version = "1.0.28" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" dependencies = [ "crc32fast", "miniz_oxide", @@ -1489,7 +1365,7 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" dependencies = [ - "spin 0.9.8", + "spin", ] [[package]] @@ -1524,11 +1400,10 @@ dependencies = [ [[package]] name = "fractal" -version = "7.0.0" +version = "8.0.0" dependencies = [ "ashpd", "djb_hash", - "eyeball-im", "futures-channel", "futures-util", "geo-uri", @@ -1540,20 +1415,18 @@ dependencies = [ "gstreamer-play", "gstreamer-video", "gtk4", - "html-escape", - "html2pango", - "html5gum", "image", - "indexmap 2.2.6", + "indexmap", "libadwaita", "libshumate", + "linkify", "matrix-sdk", "matrix-sdk-ui", "mime", "mime_guess", "once_cell", "oo7", - "pulldown-cmark 0.10.2", + "pulldown-cmark", "qrcode", "rand", "regex", @@ -1566,7 +1439,9 @@ dependencies = [ "sourceview5", "strum", "thiserror", + "tld", "tokio", + "tokio-stream", "tracing", "tracing-subscriber", "url", @@ -1651,7 +1526,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.71", ] [[package]] @@ -1723,9 +1598,9 @@ checksum = "af6a86e750338603ea2c14b1c0bfe58cd61f87ca67a0021d9334996024608e12" [[package]] name = "gdk-pixbuf" -version = "0.19.2" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6a23f8a0b5090494fd04924662d463f8386cc678dd3915015a838c1a3679b92" +checksum = "28bb53ecb56857c683c9ec859908e076dd3969c7d67598bd8b1ce095d211304a" dependencies = [ "gdk-pixbuf-sys", "gio", @@ -1735,22 +1610,22 @@ dependencies = [ [[package]] name = "gdk-pixbuf-sys" -version = "0.19.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dcbd04c1b2c4834cc008b4828bc917d062483b88d26effde6342e5622028f96" +checksum = "9f6681a0c1330d1d3968bec1529f7172d62819ef0bdbb0d18022320654158b03" dependencies = [ "gio-sys", "glib-sys", "gobject-sys", "libc", - "system-deps", + "system-deps 7.0.1", ] [[package]] name = "gdk4" -version = "0.8.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9100b25604183f2fd97f55ef087fae96ab4934d7215118a35303e422688e6e4b" +checksum = "4b7d7237c1487ed4b300aac7744efcbf1319e12d60d7afcd6f505414bd5b5dea" dependencies = [ "cairo-rs", "gdk-pixbuf", @@ -1763,9 +1638,9 @@ dependencies = [ [[package]] name = "gdk4-sys" -version = "0.8.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0b76874c40bb8d1c7d03a7231e23ac75fa577a456cd53af32ec17ec8f121626" +checksum = "a67576c8ec012156d7f680e201a807b4432a77babb3157e0555e990ab6bcd878" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -1775,14 +1650,14 @@ dependencies = [ "libc", "pango-sys", "pkg-config", - "system-deps", + "system-deps 7.0.1", ] [[package]] name = "gdk4-win32" -version = "0.8.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab6181b6e5c91ee292dca0032b00d48dee8e61358253742c9752537a88486b3f" +checksum = "05afbcc8165b10f9143d2c4e4a589fce3a5071c6b20d75dd40704266d6eb4bb4" dependencies = [ "gdk4", "gdk4-win32-sys", @@ -1793,14 +1668,14 @@ dependencies = [ [[package]] name = "gdk4-win32-sys" -version = "0.8.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efa8530d6619cf43f007f3efd993a356e1ca4e643c4d0bd2a99832a08af2e402" +checksum = "198c0604ceb45732c76b1fdb696d92b99400ea3a1c549fc5e40f4d79f8033205" dependencies = [ "gdk4-sys", "glib-sys", "libc", - "system-deps", + "system-deps 7.0.1", ] [[package]] @@ -1811,7 +1686,6 @@ checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" dependencies = [ "typenum", "version_check", - "zeroize", ] [[package]] @@ -1835,9 +1709,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "js-sys", @@ -1878,15 +1752,15 @@ dependencies = [ [[package]] name = "gimli" -version = "0.28.1" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" +checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" [[package]] name = "gio" -version = "0.19.4" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f91a0518c2ec539f099d3f945ab2d6a83ec372a9ef40a21906343b191182845" +checksum = "398e3da68749fdc32783cbf7521ec3f65c9cf946db8c7774f8460af49e52c6e2" dependencies = [ "futures-channel", "futures-core", @@ -1902,24 +1776,24 @@ dependencies = [ [[package]] name = "gio-sys" -version = "0.19.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcf8e1d9219bb294636753d307b030c1e8a032062cba74f493c431a5c8b81ce4" +checksum = "e4feb96b31c32730ea3e1e89aecd2e4e37ecb1c473ad8f685e3430a159419f63" dependencies = [ "glib-sys", "gobject-sys", "libc", - "system-deps", + "system-deps 7.0.1", "windows-sys 0.52.0", ] [[package]] name = "glib" -version = "0.19.4" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae1407b2ce171e654720be10d57d4054d3ff2f10a13d5b37e6819b41439832f7" +checksum = "fee90a615ce05be7a32932cfb8adf2c4bbb4700e80d37713c981fb24c0c56238" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "futures-channel", "futures-core", "futures-executor", @@ -1937,25 +1811,25 @@ dependencies = [ [[package]] name = "glib-macros" -version = "0.19.4" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8bba315e8ce8aa59631545358450f4962557e89b5f7db7442e7153b47037f71" +checksum = "4da558d8177c0c8c54368818b508a4244e1286fce2858cef4e547023f0cfa5ef" dependencies = [ - "heck 0.5.0", - "proc-macro-crate 3.1.0", + "heck", + "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.71", ] [[package]] name = "glib-sys" -version = "0.19.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630f097773d7c7a0bb3258df4e8157b47dc98bbfa0e60ad9ab56174813feced4" +checksum = "4958c26e5a01c9af00dea669a97369eccbec29a8e6d125c24ea2d85ee7467b60" dependencies = [ "libc", - "system-deps", + "system-deps 7.0.1", ] [[package]] @@ -1991,20 +1865,20 @@ dependencies = [ [[package]] name = "gobject-sys" -version = "0.19.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c85e2b1080b9418dd0c58b498da3a5c826030343e0ef07bde6a955d28de54979" +checksum = "c6908864f5ffff15b56df7e90346863904f49b949337ed0456b9287af61903b8" dependencies = [ "glib-sys", "libc", - "system-deps", + "system-deps 7.0.1", ] [[package]] name = "graphene-rs" -version = "0.19.2" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99e4d388e96c5f29e2b2f67045d229ddf826d0a8d6d282f94ed3b34452222c91" +checksum = "630e940ad5824f90221d6579043a9cd1f8bec86b4a17faaf7827d58eb16e8c1f" dependencies = [ "glib", "graphene-sys", @@ -2013,32 +1887,33 @@ dependencies = [ [[package]] name = "graphene-sys" -version = "0.19.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "236ed66cc9b18d8adf233716f75de803d0bf6fc806f60d14d948974a12e240d0" +checksum = "6fb8fade7b754982f47ebbed241fd2680816fdd4598321784da10b9e1168836a" dependencies = [ "glib-sys", "libc", "pkg-config", - "system-deps", + "system-deps 7.0.1", ] [[package]] -name = "group" -version = "0.13.0" +name = "growable-bloom-filter" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" +checksum = "c669fa03050eb3445343f215d62fc1ab831e8098bc9a55f26e9724faff11075c" dependencies = [ - "ff", - "rand_core", - "subtle", + "serde", + "serde_bytes", + "serde_derive", + "xxhash-rust", ] [[package]] name = "gsk4" -version = "0.8.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c65036fc8f99579e8cb37b12487969b707ab23ec8ab953682ff347cbd15d396e" +checksum = "1f3cf2091e1af185b347b3450817d93dea6fe435df7abd4c2cd7fb5bcb4cfda8" dependencies = [ "cairo-rs", "gdk4", @@ -2051,9 +1926,9 @@ dependencies = [ [[package]] name = "gsk4-sys" -version = "0.8.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd24c814379f9c3199dc53e52253ee8d0f657eae389ab282c330505289d24738" +checksum = "6aa69614a26d8760c186c3690f1b0fbb917572ca23ef83137445770ceddf8cde" dependencies = [ "cairo-sys-rs", "gdk4-sys", @@ -2062,14 +1937,14 @@ dependencies = [ "graphene-sys", "libc", "pango-sys", - "system-deps", + "system-deps 7.0.1", ] [[package]] name = "gst-plugin-gtk4" -version = "0.12.3" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83c12132d3619f85db54f6034b4e3872577886657b07e055c521baeb2d5f6733" +checksum = "69b98aeb531b6cf9c3a6eb36742cedc0168054e2f040b76ddc61260c10dec589" dependencies = [ "async-channel", "gdk4-win32", @@ -2090,14 +1965,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4e5e874f1660252fd2ec81c602066df3633b3a6fcbe2b196f7f93c27cf069b2a" dependencies = [ "chrono", - "toml_edit 0.22.9", + "toml_edit 0.22.16", ] [[package]] name = "gstreamer" -version = "0.22.4" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc6f2d7dcde4b42b5297d25e9f51914cacfa148c99ba6ddabebf006fb2b18c20" +checksum = "21e95b1d1153239a621ec143501fdcca6c1ad3efb87d268597285f85c4136f73" dependencies = [ "cfg-if", "futures-channel", @@ -2105,7 +1980,7 @@ dependencies = [ "futures-util", "glib", "gstreamer-sys", - "itertools 0.12.1", + "itertools 0.13.0", "libc", "muldiv", "num-integer", @@ -2120,9 +1995,9 @@ dependencies = [ [[package]] name = "gstreamer-audio" -version = "0.22.4" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73a5de9ced05f9650168a74c7a4afeddbf3e63af595a7d56a700765be3b4869c" +checksum = "50c434cbdde750d82853a978a59eb96e270c238d721a41bee0f37bfdc771f997" dependencies = [ "cfg-if", "glib", @@ -2136,23 +2011,23 @@ dependencies = [ [[package]] name = "gstreamer-audio-sys" -version = "0.22.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34d92a1e2a915874f70f0a33c3ea4589bc6b66a138b6ec8bb6acedf49bdec2c3" +checksum = "4bb0542026fb062c2880d15e712c0814336e3209a054da43a64c14f7570da02f" dependencies = [ "glib-sys", "gobject-sys", "gstreamer-base-sys", "gstreamer-sys", "libc", - "system-deps", + "system-deps 7.0.1", ] [[package]] name = "gstreamer-base" -version = "0.22.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "514c71195b53c7eced4842b66ca9149833e41cf6a1d949e45e2ca4a4fa929850" +checksum = "a3faa0b3cf361bf538dcb25b5cb7f6e73bd872ed031d85f3997b42d3fbd66409" dependencies = [ "atomic_refcell", "cfg-if", @@ -2164,22 +2039,22 @@ dependencies = [ [[package]] name = "gstreamer-base-sys" -version = "0.22.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "286591e0f85bbda1adf9bab6f21d015acd9ca0a4d4acb61da65e3d0487e23c4e" +checksum = "4a6643ef963c636b8022adc93aa19eac6f356bd174a187c499339fc5d64c1e05" dependencies = [ "glib-sys", "gobject-sys", "gstreamer-sys", "libc", - "system-deps", + "system-deps 7.0.1", ] [[package]] name = "gstreamer-gl" -version = "0.22.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d21c0c5fbf74018a0254b3ab77bca0a5b2c0f002bcfd910c09113ae90a95d98" +checksum = "cfe28e4b7c72022958add8a3d86e7293ff227a5086c426731b5ec5a15ffbc759" dependencies = [ "glib", "gstreamer", @@ -2192,9 +2067,9 @@ dependencies = [ [[package]] name = "gstreamer-gl-sys" -version = "0.22.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61d1e3b9b02abc23835e9d770f2bd705b67a50406ea37e963b4526a77c6a7cd8" +checksum = "2bc2ff7c20ae47c4a80f42a67d85d6889a5fad3bc2385aec6dc9b58795920c5b" dependencies = [ "glib-sys", "gobject-sys", @@ -2202,14 +2077,14 @@ dependencies = [ "gstreamer-sys", "gstreamer-video-sys", "libc", - "system-deps", + "system-deps 7.0.1", ] [[package]] name = "gstreamer-pbutils" -version = "0.22.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f173b14cdf3d10bc57d136797946fe2091c322015d879919765c317a0ea5edb3" +checksum = "05155dded8d67ecae23d22b9e8cad67e16b46f9f9fec161cabfda804716bba4c" dependencies = [ "glib", "gstreamer", @@ -2222,9 +2097,9 @@ dependencies = [ [[package]] name = "gstreamer-pbutils-sys" -version = "0.22.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b3afcb1df3d217b2a6b00aa7a391a779764b5be6ccb7dcf35b5690279c61c5c" +checksum = "5a1711616229f46a5767b79eb3bf15cb5ab9be9a721dc00b857f1cd6454387ac" dependencies = [ "glib-sys", "gobject-sys", @@ -2232,14 +2107,14 @@ dependencies = [ "gstreamer-sys", "gstreamer-video-sys", "libc", - "system-deps", + "system-deps 7.0.1", ] [[package]] name = "gstreamer-play" -version = "0.22.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04cd4315d97f8f38a6a6fdaad27d51cc67fd132785816091ad9985e197d2c052" +checksum = "fcc9fac3926d08f882d5a7b98fc7780b2ea812cbebc0c56c56c7186bde34fcdd" dependencies = [ "glib", "gstreamer", @@ -2250,35 +2125,35 @@ dependencies = [ [[package]] name = "gstreamer-play-sys" -version = "0.22.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19def7b12d3a53c520ad661b8f4501ae04158627e4a9fc49cc30c4ea04522cbf" +checksum = "37ffb862566a025cb5477089bbcdb15cc871e317ad451169835a2c06efaa7097" dependencies = [ "glib-sys", "gobject-sys", "gstreamer-sys", "gstreamer-video-sys", "libc", - "system-deps", + "system-deps 7.0.1", ] [[package]] name = "gstreamer-sys" -version = "0.22.2" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5ddf526b3bf90ea627224c804f00b8bcb0452e3b447978b4d5092f8e8ff5918" +checksum = "d9c9005b55dd2b1784645963c1ec409f9d420a56f6348d0ae69c2eaff584bcc3" dependencies = [ "glib-sys", "gobject-sys", "libc", - "system-deps", + "system-deps 7.0.1", ] [[package]] name = "gstreamer-video" -version = "0.22.4" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fc0a96481ecfcdd120d5057bb7ab5a6f6cd392cc34ba1e8b86cac3ba082f788" +checksum = "57332bca1ae7825a53fe57d993b63389f132d335aed691ac76f0ffe4304548e3" dependencies = [ "cfg-if", "futures-channel", @@ -2293,23 +2168,23 @@ dependencies = [ [[package]] name = "gstreamer-video-sys" -version = "0.22.1" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1ea7996ba44fbbf563aeeda96e24259efc9f06b407854d837ee58e260d7ba78" +checksum = "0f5c334d143384e8dc714af948c2e5d7d12cb588fdcfb56f3bf37c24daf350ef" dependencies = [ "glib-sys", "gobject-sys", "gstreamer-base-sys", "gstreamer-sys", "libc", - "system-deps", + "system-deps 7.0.1", ] [[package]] name = "gtk4" -version = "0.8.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa82753b8c26277e4af1446c70e35b19aad4fb794a7b143859e7eeb9a4025d83" +checksum = "eaffc6c743c9160514cc9b67eace364e5dc5798369fa809cdb04e035c21c5c5d" dependencies = [ "cairo-rs", "field-offset", @@ -2328,23 +2203,21 @@ dependencies = [ [[package]] name = "gtk4-macros" -version = "0.8.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40300bf071d2fcd4c94eacc09e84ec6fe73129d2ceb635cf7e55b026b5443567" +checksum = "188211f546ce5801f6d0245c37b6249143a2cb4fa040e54829ca1e76796e9f09" dependencies = [ - "anyhow", - "proc-macro-crate 3.1.0", - "proc-macro-error", + "proc-macro-crate", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.71", ] [[package]] name = "gtk4-sys" -version = "0.8.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0db1b104138f087ccdc81d2c332de5dd049b89de3d384437cc1093b17cd2da18" +checksum = "1114a207af8ada02cf4658a76692f4190f06f093380d5be07e3ca8b43aa7c666" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -2356,26 +2229,7 @@ dependencies = [ "gsk4-sys", "libc", "pango-sys", - "system-deps", -] - -[[package]] -name = "h2" -version = "0.3.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" -dependencies = [ - "bytes", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http", - "indexmap 2.2.6", - "slab", - "tokio", - "tokio-util", - "tracing", + "system-deps 7.0.1", ] [[package]] @@ -2390,15 +2244,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" - -[[package]] -name = "hashbrown" -version = "0.14.3" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" dependencies = [ "ahash", "allocator-api2", @@ -2410,41 +2258,11 @@ version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" dependencies = [ - "hashbrown 0.14.3", -] - -[[package]] -name = "headers" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06683b93020a07e3dbcf5f8c0f6d40080d725bea7936fc01ad345c01b97dc270" -dependencies = [ - "base64 0.21.7", - "bytes", - "headers-core", - "http", - "httpdate", - "mime", - "sha1", -] - -[[package]] -name = "headers-core" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429" -dependencies = [ - "http", + "hashbrown", ] [[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" @@ -2456,6 +2274,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" [[package]] +name = "hermit-abi" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" + +[[package]] name = "hex" version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2480,58 +2304,24 @@ dependencies = [ ] [[package]] -name = "html-escape" -version = "0.2.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d1ad449764d627e22bfd7cd5e8868264fc9236e07c752972b4080cd351cb476" -dependencies = [ - "utf8-width", -] - -[[package]] -name = "html2pango" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5f061cc3c0538033f81a94417f209e2b1908e3dab8b87b205d84e6109c8091b" -dependencies = [ - "ammonia", - "anyhow", - "html5ever", - "linkify", - "maplit", - "markup5ever_rcdom", - "once_cell", - "regex", -] - -[[package]] name = "html5ever" -version = "0.26.0" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bea68cab48b8459f17cf1c944c67ddc572d272d9f2b274140f223ecb1da4a3b7" +checksum = "c13771afe0e6e846f1e67d038d4cb29998a6779f93c809212e4e9c32efd244d4" dependencies = [ "log", "mac", "markup5ever", "proc-macro2", "quote", - "syn 1.0.109", -] - -[[package]] -name = "html5gum" -version = "0.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c4e556171a058ba117bbe88b059fb37b6289023e007d2903ea6dca3a3cbff14" -dependencies = [ - "jetscii", + "syn 2.0.71", ] [[package]] name = "http" -version = "0.2.12" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" dependencies = [ "bytes", "fnv", @@ -2540,26 +2330,32 @@ dependencies = [ [[package]] name = "http-body" -version = "0.4.6" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" +checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" dependencies = [ "bytes", "http", - "pin-project-lite", ] [[package]] -name = "http-range-header" -version = "0.3.1" +name = "http-body-util" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "add0ab9360ddbd88cfeb3bd9574a1d85cfdfa14db10b3e21d3700dbc4328758f" +checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" +dependencies = [ + "bytes", + "futures-util", + "http", + "http-body", + "pin-project-lite", +] [[package]] name = "httparse" -version = "1.8.0" +version = "1.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" +checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" [[package]] name = "httpdate" @@ -2569,39 +2365,58 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "hyper" -version = "0.14.28" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" +checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" dependencies = [ "bytes", "futures-channel", - "futures-core", "futures-util", - "h2", "http", "http-body", "httparse", "httpdate", "itoa", "pin-project-lite", - "socket2", + "smallvec", "tokio", - "tower-service", - "tracing", "want", ] [[package]] name = "hyper-tls" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" +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.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ab92f4f49ee4fb4f997c784b7a2e0fa70050211e0b6a287f898c3c9785ca956" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http", + "http-body", + "hyper", + "pin-project-lite", + "socket2", + "tokio", + "tower", + "tower-service", + "tracing", ] [[package]] @@ -2668,19 +2483,19 @@ dependencies = [ [[package]] name = "image-webp" -version = "0.1.1" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a84a25dcae3ac487bc24ef280f9e20c79c9b1a3e5e32cbed3041d1c514aa87c" +checksum = "f79afb8cbee2ef20f59ccd477a218c12a93943d075b492015ecb1bb81f8ee904" dependencies = [ - "byteorder", - "thiserror", + "byteorder-lite", + "quick-error", ] [[package]] name = "imbl" -version = "2.0.3" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978d142c8028edf52095703af2fad11d6f611af1246685725d6b850634647085" +checksum = "bc3be8d8cd36f33a46b1849f31f837c44d9fa87223baee3b4bd96b8f11df81eb" dependencies = [ "bitmaps", "imbl-sized-chunks", @@ -2707,18 +2522,18 @@ checksum = "44feda355f4159a7c757171a77de25daf6411e217b4cabd03bd6650690468126" [[package]] name = "include_dir" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18762faeff7122e89e0857b02f7ce6fcc0d101d5e9ad2ad7846cc01d61b7f19e" +checksum = "923d117408f1e49d914f1a379a309cffe4f18c05cf4e3d12e613a15fc81bd0dd" dependencies = [ "include_dir_macros", ] [[package]] name = "include_dir_macros" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b139284b5cf57ecfa712bcc66950bb635b31aff41c188e8a4cfc758eca374a3f" +checksum = "7cab85a7ed0bd5f0e76d93846e0147172bed2e2d3f859bcc33a8d9699cad1a75" dependencies = [ "proc-macro2", "quote", @@ -2743,23 +2558,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "1.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" -dependencies = [ - "autocfg", - "hashbrown 0.12.3", - "serde", -] - -[[package]] -name = "indexmap" version = "2.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", - "hashbrown 0.14.3", + "hashbrown", "serde", ] @@ -2775,9 +2579,9 @@ dependencies = [ [[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", "js-sys", @@ -2793,7 +2597,7 @@ checksum = "c34819042dc3d3971c46c2190835914dfbe0c3c13f61449b2997f4e9722dfa60" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.71", ] [[package]] @@ -2821,22 +2625,25 @@ dependencies = [ ] [[package]] -name = "itoa" -version = "1.0.11" +name = "itertools" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" +dependencies = [ + "either", +] [[package]] -name = "jetscii" -version = "0.5.3" +name = "itoa" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47f142fe24a9c9944451e8349de0a56af5f3e7226dc46f3ed4d4ecc0b85af75e" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "jobserver" -version = "0.1.28" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab46a6e9526ddef3ae7f787c06f0f2600639ba80ea3eade3d8e670a2230f51d6" +checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" dependencies = [ "libc", ] @@ -2875,24 +2682,10 @@ dependencies = [ ] [[package]] -name = "k256" -version = "0.13.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "956ff9b67e26e1a6a866cb758f12c6f8746208489e3e4a4b5580802f2f0a587b" -dependencies = [ - "cfg-if", - "ecdsa", - "elliptic-curve", - "once_cell", - "sha2", - "signature", -] - -[[package]] name = "konst" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d712a8c49d4274f8d8a5cf61368cb5f3c143d149882b1a2918129e53395fdb0" +checksum = "50a0ba6de5f7af397afff922f22c149ff605c766cd3269cf6c1cd5e466dbe3b9" dependencies = [ "const_panic", "konst_kernel", @@ -2901,29 +2694,20 @@ dependencies = [ [[package]] name = "konst_kernel" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dac6ea8c376b6e208a81cf39b8e82bebf49652454d98a4829e907dac16ef1790" +checksum = "be0a455a1719220fd6adf756088e1c69a85bf14b6a9e24537a5cc04f503edb2b" dependencies = [ "typewit", ] [[package]] -name = "language-tags" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4345964bb142484797b161f473a503a434de77149dd8c7427788c6e13379388" -dependencies = [ - "serde", -] - -[[package]] name = "lazy_static" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" dependencies = [ - "spin 0.5.2", + "spin", ] [[package]] @@ -2940,11 +2724,10 @@ checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" [[package]] name = "libadwaita" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91b4990248b9e1ec5e72094a2ccaea70ec3809f88f6fd52192f2af306b87c5d9" +checksum = "2ff9c222b5c783729de45185f07b2fec2d43a7f9c63961e777d3667e20443878" dependencies = [ - "gdk-pixbuf", "gdk4", "gio", "glib", @@ -2956,9 +2739,9 @@ dependencies = [ [[package]] name = "libadwaita-sys" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23a748e4e92be1265cd9e93d569c0b5dfc7814107985aa6743d670ab281ea1a8" +checksum = "1c44d8bdbad31d6639e1f20cc9c1424f1a8e02d751fc28d44659bf743fb9eca6" dependencies = [ "gdk4-sys", "gio-sys", @@ -2967,14 +2750,14 @@ dependencies = [ "gtk4-sys", "libc", "pango-sys", - "system-deps", + "system-deps 7.0.1", ] [[package]] name = "libc" -version = "0.2.153" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libfuzzer-sys" @@ -2989,12 +2772,12 @@ dependencies = [ [[package]] name = "libloading" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" +checksum = "e310b3a6b5907f99202fcdb4960ff45b93735d7c7d96b760fcff8db2dc0e103d" dependencies = [ "cfg-if", - "windows-targets 0.52.4", + "windows-targets 0.52.6", ] [[package]] @@ -3005,9 +2788,9 @@ checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" [[package]] name = "libshumate" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd77c1202aaccef5460f4ca95b3b3c117f85986c942127e4e518c47058a6eaf6" +checksum = "fc9921cc829fb2d546bd6a3a158a4134002098887e0bb01ceb4535521af610ec" dependencies = [ "gdk-pixbuf", "gdk4", @@ -3020,9 +2803,9 @@ dependencies = [ [[package]] name = "libshumate-sys" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef5765221e416ebe7b5e9c5bd7e8dd09ca9e920b012474ca8f3da18f8e13c4a5" +checksum = "b238767323bdd28dc72471fa8a512ad0ae99a18d9668deb626c55f373f7aff81" dependencies = [ "gdk-pixbuf-sys", "gdk4-sys", @@ -3031,7 +2814,7 @@ dependencies = [ "gobject-sys", "gtk4-sys", "libc", - "system-deps", + "system-deps 7.0.1", ] [[package]] @@ -3040,7 +2823,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "65f3a4b81b2a2d8c7f300643676202debd1b7c929dbf5c9bb89402ea11d19810" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cc", "convert_case", "cookie-factory", @@ -3048,7 +2831,7 @@ dependencies = [ "libspa-sys", "nix 0.27.1", "nom", - "system-deps", + "system-deps 6.2.2", ] [[package]] @@ -3059,7 +2842,7 @@ checksum = "bf0d9716420364790e85cbb9d3ac2c950bde16a7dd36f3209b7dfdfc4a24d01f" dependencies = [ "bindgen", "cc", - "system-deps", + "system-deps 6.2.2", ] [[package]] @@ -3074,18 +2857,18 @@ dependencies = [ [[package]] name = "linkify" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96dd5884008358112bc66093362197c7248ece00d46624e2cf71e50029f8cff5" +checksum = "f1dfa36d52c581e9ec783a7ce2a5e0143da6237be5811a0b3153fedfdbe9f780" dependencies = [ "memchr", ] [[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 = "locale_config" @@ -3102,9 +2885,9 @@ dependencies = [ [[package]] name = "lock_api" -version = "0.4.11" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" dependencies = [ "autocfg", "scopeguard", @@ -3112,9 +2895,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.21" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "loop9" @@ -3131,7 +2914,7 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc" dependencies = [ - "hashbrown 0.14.3", + "hashbrown", ] [[package]] @@ -3160,7 +2943,7 @@ dependencies = [ "cfg-if", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.71", ] [[package]] @@ -3171,7 +2954,7 @@ checksum = "13198c120864097a565ccb3ff947672d969932b7975ebd4085732c9f09435e55" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.71", ] [[package]] @@ -3184,7 +2967,7 @@ dependencies = [ "macroific_core", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.71", ] [[package]] @@ -3204,12 +2987,12 @@ checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" [[package]] name = "markup5ever" -version = "0.11.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a2629bb1404f3d34c2e921f21fd34ba00b206124c81f65c50b43b6aaefeb016" +checksum = "16ce3abbeba692c8b8441d036ef91aea6df8da2c6b6e21c7e14d3c18e526be45" dependencies = [ "log", - "phf 0.10.1", + "phf", "phf_codegen", "string_cache", "string_cache_codegen", @@ -3217,108 +3000,6 @@ dependencies = [ ] [[package]] -name = "markup5ever_rcdom" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9521dd6750f8e80ee6c53d65e2e4656d7de37064f3a7a5d2d11d05df93839c2" -dependencies = [ - "html5ever", - "markup5ever", - "tendril", - "xml5ever", -] - -[[package]] -name = "mas-http" -version = "0.8.0" -source = "git+https://github.com/matrix-org/matrix-authentication-service?rev=099eabd1371d2840a2f025a6372d6428039eb511#099eabd1371d2840a2f025a6372d6428039eb511" -dependencies = [ - "bytes", - "futures-util", - "headers", - "http", - "http-body", - "hyper", - "opentelemetry", - "serde", - "serde_json", - "serde_urlencoded", - "thiserror", - "tower", - "tower-http", - "tracing", - "tracing-opentelemetry", -] - -[[package]] -name = "mas-iana" -version = "0.8.0" -source = "git+https://github.com/matrix-org/matrix-authentication-service?rev=099eabd1371d2840a2f025a6372d6428039eb511#099eabd1371d2840a2f025a6372d6428039eb511" -dependencies = [ - "schemars", - "serde", -] - -[[package]] -name = "mas-jose" -version = "0.8.0" -source = "git+https://github.com/matrix-org/matrix-authentication-service?rev=099eabd1371d2840a2f025a6372d6428039eb511#099eabd1371d2840a2f025a6372d6428039eb511" -dependencies = [ - "base64ct", - "chrono", - "digest", - "ecdsa", - "elliptic-curve", - "generic-array", - "hmac", - "k256", - "mas-iana", - "p256", - "p384", - "rand", - "rsa", - "schemars", - "sec1", - "serde", - "serde_json", - "serde_with", - "sha2", - "signature", - "thiserror", - "tracing", - "url", -] - -[[package]] -name = "mas-oidc-client" -version = "0.8.0" -source = "git+https://github.com/matrix-org/matrix-authentication-service?rev=099eabd1371d2840a2f025a6372d6428039eb511#099eabd1371d2840a2f025a6372d6428039eb511" -dependencies = [ - "base64ct", - "bytes", - "chrono", - "form_urlencoded", - "futures-util", - "headers", - "http", - "language-tags", - "mas-http", - "mas-iana", - "mas-jose", - "mime", - "oauth2-types", - "rand", - "serde", - "serde_json", - "serde_urlencoded", - "serde_with", - "thiserror", - "tower", - "tracing", - "url", -] - -[[package]] name = "matchers" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3328,10 +3009,16 @@ dependencies = [ ] [[package]] +name = "matchit" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" + +[[package]] name = "matrix-pickle" -version = "0.1.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7fd26463ce5d86b8d9bb9c4142d453198ba22fb91bd46d3c9f144ae699d821d" +checksum = "7eb521190328c57a2051f70250beb874dc0fac6bcd22b615f7f9700b7b4fb826" dependencies = [ "matrix-pickle-derive", "thiserror", @@ -3339,21 +3026,21 @@ dependencies = [ [[package]] name = "matrix-pickle-derive" -version = "0.1.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93779aa78d39c2fe34746287b10a866192cf8af1b81767fff76bd64099acc0f5" +checksum = "c6fb3c7231cbb7fbbc50871615edebf65183b382cdaa1fe21c5e88a12617de8e" dependencies = [ - "proc-macro-crate 2.0.0", + "proc-macro-crate", "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.71", ] [[package]] name = "matrix-sdk" version = "0.7.1" -source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=88c4dec35f05ae295e0f2bf0362d6f5d72606d92#88c4dec35f05ae295e0f2bf0362d6f5d72606d92" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=92b4c2a469f507696fa9db3d6bdb000a761e2694#92b4c2a469f507696fa9db3d6bdb000a761e2694" dependencies = [ "anymap2", "aquamarine", @@ -3361,26 +3048,21 @@ dependencies = [ "async-channel", "async-stream", "async-trait", + "axum", "backoff", "bytes", "bytesize", - "cfg-vis", - "chrono", - "event-listener 4.0.3", + "event-listener", "eyeball", "eyeball-im", - "eyeball-im-util", "futures-core", "futures-util", "gloo-timers", "http", - "hyper", "image", "imbl", - "indexmap 2.2.6", + "indexmap", "js_int", - "language-tags", - "mas-oidc-client", "matrix-sdk-base", "matrix-sdk-common", "matrix-sdk-indexeddb", @@ -3393,7 +3075,6 @@ dependencies = [ "serde", "serde_html_form", "serde_json", - "sha2", "tempfile", "thiserror", "tokio", @@ -3403,20 +3084,22 @@ dependencies = [ "tracing", "url", "urlencoding", + "vodozemac", "zeroize", ] [[package]] name = "matrix-sdk-base" version = "0.7.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=88c4dec35f05ae295e0f2bf0362d6f5d72606d92#88c4dec35f05ae295e0f2bf0362d6f5d72606d92" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=92b4c2a469f507696fa9db3d6bdb000a761e2694#92b4c2a469f507696fa9db3d6bdb000a761e2694" dependencies = [ "as_variant", "async-trait", - "bitflags 2.5.0", + "bitflags 2.6.0", "eyeball", "eyeball-im", "futures-util", + "growable-bloom-filter", "matrix-sdk-common", "matrix-sdk-crypto", "matrix-sdk-store-encryption", @@ -3432,7 +3115,7 @@ dependencies = [ [[package]] name = "matrix-sdk-common" version = "0.7.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=88c4dec35f05ae295e0f2bf0362d6f5d72606d92#88c4dec35f05ae295e0f2bf0362d6f5d72606d92" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=92b4c2a469f507696fa9db3d6bdb000a761e2694#92b4c2a469f507696fa9db3d6bdb000a761e2694" dependencies = [ "async-trait", "futures-core", @@ -3453,8 +3136,8 @@ dependencies = [ [[package]] name = "matrix-sdk-crypto" -version = "0.7.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=88c4dec35f05ae295e0f2bf0362d6f5d72606d92#88c4dec35f05ae295e0f2bf0362d6f5d72606d92" +version = "0.7.1" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=92b4c2a469f507696fa9db3d6bdb000a761e2694#92b4c2a469f507696fa9db3d6bdb000a761e2694" dependencies = [ "aes", "as_variant", @@ -3487,6 +3170,7 @@ dependencies = [ "tokio-stream", "tracing", "ulid", + "url", "vodozemac", "zeroize", ] @@ -3494,13 +3178,14 @@ dependencies = [ [[package]] name = "matrix-sdk-indexeddb" version = "0.7.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=88c4dec35f05ae295e0f2bf0362d6f5d72606d92#88c4dec35f05ae295e0f2bf0362d6f5d72606d92" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=92b4c2a469f507696fa9db3d6bdb000a761e2694#92b4c2a469f507696fa9db3d6bdb000a761e2694" dependencies = [ "anyhow", "async-trait", - "base64 0.21.7", + "base64", "getrandom", "gloo-utils", + "hkdf", "indexed_db_futures", "js-sys", "matrix-sdk-crypto", @@ -3509,17 +3194,19 @@ dependencies = [ "serde", "serde-wasm-bindgen", "serde_json", + "sha2", "thiserror", "tokio", "tracing", "wasm-bindgen", "web-sys", + "zeroize", ] [[package]] name = "matrix-sdk-qrcode" version = "0.7.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=88c4dec35f05ae295e0f2bf0362d6f5d72606d92#88c4dec35f05ae295e0f2bf0362d6f5d72606d92" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=92b4c2a469f507696fa9db3d6bdb000a761e2694#92b4c2a469f507696fa9db3d6bdb000a761e2694" dependencies = [ "byteorder", "qrcode", @@ -3531,7 +3218,7 @@ dependencies = [ [[package]] name = "matrix-sdk-sqlite" version = "0.7.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=88c4dec35f05ae295e0f2bf0362d6f5d72606d92#88c4dec35f05ae295e0f2bf0362d6f5d72606d92" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=92b4c2a469f507696fa9db3d6bdb000a761e2694#92b4c2a469f507696fa9db3d6bdb000a761e2694" dependencies = [ "async-trait", "deadpool-sqlite", @@ -3553,12 +3240,11 @@ dependencies = [ [[package]] name = "matrix-sdk-store-encryption" version = "0.7.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=88c4dec35f05ae295e0f2bf0362d6f5d72606d92#88c4dec35f05ae295e0f2bf0362d6f5d72606d92" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=92b4c2a469f507696fa9db3d6bdb000a761e2694#92b4c2a469f507696fa9db3d6bdb000a761e2694" dependencies = [ - "base64 0.21.7", + "base64", "blake3", "chacha20poly1305", - "displaydoc", "hmac", "pbkdf2", "rand", @@ -3573,7 +3259,7 @@ dependencies = [ [[package]] name = "matrix-sdk-ui" version = "0.7.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=88c4dec35f05ae295e0f2bf0362d6f5d72606d92#88c4dec35f05ae295e0f2bf0362d6f5d72606d92" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=92b4c2a469f507696fa9db3d6bdb000a761e2694#92b4c2a469f507696fa9db3d6bdb000a761e2694" dependencies = [ "as_variant", "async-once-cell", @@ -3588,8 +3274,9 @@ dependencies = [ "futures-core", "futures-util", "fuzzy-matcher", + "growable-bloom-filter", "imbl", - "indexmap 2.2.6", + "indexmap", "itertools 0.12.1", "matrix-sdk", "matrix-sdk-base", @@ -3603,7 +3290,6 @@ dependencies = [ "tokio", "tracing", "unicode-normalization", - "url", ] [[package]] @@ -3618,9 +3304,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 = "memoffset" @@ -3645,9 +3331,9 @@ checksum = "a1a85a5069ebd40e64b1985773cc81addbe9d90d7ecf60e7b5475a57ad584c70" [[package]] name = "mime_guess" -version = "2.0.4" +version = "2.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" +checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e" dependencies = [ "mime", "unicase", @@ -3661,9 +3347,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", @@ -3688,11 +3374,10 @@ checksum = "956787520e75e9bd233246045d19f42fb73242759cc57fba9611d940ae96d4b0" [[package]] name = "native-tls" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" +checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466" dependencies = [ - "lazy_static", "libc", "log", "openssl", @@ -3716,18 +3401,18 @@ version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cfg-if", "libc", ] [[package]] name = "nix" -version = "0.28.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" +checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cfg-if", "cfg_aliases", "libc", @@ -3762,9 +3447,9 @@ dependencies = [ [[package]] name = "num" -version = "0.4.1" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b05180d69e3da0e530ba2a1dae5110317e49e3b7f3d41be227dc5f92e49ee7af" +checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23" dependencies = [ "num-bigint", "num-complex", @@ -3776,11 +3461,10 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.4.4" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" dependencies = [ - "autocfg", "num-integer", "num-traits", ] @@ -3805,9 +3489,9 @@ dependencies = [ [[package]] name = "num-complex" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23c6602fda94a57c990fe0df199a035d83576b496aa29f4e634a8ac6004e68a6" +checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495" dependencies = [ "num-traits", ] @@ -3826,7 +3510,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.71", ] [[package]] @@ -3840,9 +3524,9 @@ dependencies = [ [[package]] name = "num-iter" -version = "0.1.44" +version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d869c01cc0c455284163fd0092f1f93835385ccab5a98a0dcc497b2f8bf055a9" +checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" dependencies = [ "autocfg", "num-integer", @@ -3851,11 +3535,10 @@ dependencies = [ [[package]] name = "num-rational" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" +checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824" dependencies = [ - "autocfg", "num-bigint", "num-integer", "num-traits", @@ -3863,12 +3546,11 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.18" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", - "libm", ] [[package]] @@ -3877,31 +3559,11 @@ version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi", + "hermit-abi 0.3.9", "libc", ] [[package]] -name = "oauth2-types" -version = "0.8.0" -source = "git+https://github.com/matrix-org/matrix-authentication-service?rev=099eabd1371d2840a2f025a6372d6428039eb511#099eabd1371d2840a2f025a6372d6428039eb511" -dependencies = [ - "chrono", - "data-encoding", - "http", - "language-tags", - "mas-iana", - "mas-jose", - "parse-display", - "serde", - "serde_json", - "serde_with", - "sha2", - "thiserror", - "url", -] - -[[package]] name = "objc" version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3932,9 +3594,9 @@ dependencies = [ [[package]] name = "object" -version = "0.32.2" +version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +checksum = "081b846d1d56ddfc18fdf1a922e4f6e07a11768ea1b92dec44e42b72712ccfce" dependencies = [ "memchr", ] @@ -3947,10 +3609,11 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "oo7" -version = "0.3.0" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37558cac1af63a81fd2ff7f3469c02a4da06b163c5671791553b8dac10f07c82" +checksum = "8fc6ce4692fbfd044ce22ca07dcab1a30fa12432ca2aa5b1294eca50d3332a24" dependencies = [ + "endi", "futures-util", "num", "num-bigint-dig", @@ -3976,7 +3639,7 @@ version = "0.10.64" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cfg-if", "foreign-types", "libc", @@ -3993,7 +3656,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.71", ] [[package]] @@ -4015,40 +3678,6 @@ dependencies = [ ] [[package]] -name = "opentelemetry" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "900d57987be3f2aeb70d385fff9b27fb74c5723cc9a52d904d4f9c807a0667bf" -dependencies = [ - "futures-core", - "futures-sink", - "js-sys", - "once_cell", - "pin-project-lite", - "thiserror", - "urlencoding", -] - -[[package]] -name = "opentelemetry_sdk" -version = "0.22.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e90c7113be649e31e9a0f8b5ee24ed7a16923b322c3c5ab6367469c049d6b7e" -dependencies = [ - "async-trait", - "crossbeam-channel", - "futures-channel", - "futures-executor", - "futures-util", - "once_cell", - "opentelemetry", - "ordered-float", - "percent-encoding", - "rand", - "thiserror", -] - -[[package]] name = "option-operations" version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4058,15 +3687,6 @@ 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" @@ -4083,34 +3703,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] -name = "p256" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9863ad85fa8f4460f9c48cb909d38a0d689dba1f6f6988a5e3e0d31071bcd4b" -dependencies = [ - "ecdsa", - "elliptic-curve", - "primeorder", - "sha2", -] - -[[package]] -name = "p384" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70786f51bcc69f6a4c0360e063a4cac5419ef7c5cd5b3c99ad70f3be5ba79209" -dependencies = [ - "ecdsa", - "elliptic-curve", - "primeorder", - "sha2", -] - -[[package]] name = "pango" -version = "0.19.3" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1264d13deb823cc652f26cfe59afb1ec4b9db2a5bd27c41b738c879cc1bfaa1" +checksum = "54768854025df6903061d0084fd9702a253ddfd60db7d9b751d43b76689a7f0a" dependencies = [ "gio", "glib", @@ -4120,14 +3716,14 @@ dependencies = [ [[package]] name = "pango-sys" -version = "0.19.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f52ef6a881c19fbfe3b1484df5cad411acaaba29dbec843941c3110d19f340ea" +checksum = "b07cc57d10cee4ec661f718a6902cee18c2f4cfae08e87e5a390525946913390" dependencies = [ "glib-sys", "gobject-sys", "libc", - "system-deps", + "system-deps 7.0.1", ] [[package]] @@ -4138,9 +3734,9 @@ checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" [[package]] name = "parking_lot" -version = "0.12.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ "lock_api", "parking_lot_core", @@ -4148,47 +3744,22 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.9" +version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", "redox_syscall", "smallvec", - "windows-targets 0.48.5", -] - -[[package]] -name = "parse-display" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06af5f9333eb47bd9ba8462d612e37a8328a5cb80b13f0af4de4c3b89f52dee5" -dependencies = [ - "parse-display-derive", - "regex", - "regex-syntax 0.8.3", -] - -[[package]] -name = "parse-display-derive" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc9252f259500ee570c75adcc4e317fa6f57a1e47747d622e0bf838002a7b790" -dependencies = [ - "proc-macro2", - "quote", - "regex", - "regex-syntax 0.8.3", - "structmeta", - "syn 2.0.58", + "windows-targets 0.52.6", ] [[package]] name = "paste" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "pbkdf2" @@ -4201,15 +3772,6 @@ dependencies = [ ] [[package]] -name = "pem-rfc7468" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412" -dependencies = [ - "base64ct", -] - -[[package]] name = "percent-encoding" version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4217,15 +3779,6 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "phf" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259" -dependencies = [ - "phf_shared 0.10.0", -] - -[[package]] -name = "phf" version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" @@ -4236,12 +3789,12 @@ dependencies = [ [[package]] name = "phf_codegen" -version = "0.10.0" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb1c3a8bc4dd4e5cfce29b44ffc14bedd2ee294559a294e2a4d4c9e9a6a13cd" +checksum = "e8d39688d359e6b34654d328e262234662d16cc0f60ec8dcbe5e718709342a5a" dependencies = [ - "phf_generator 0.10.0", - "phf_shared 0.10.0", + "phf_generator 0.11.2", + "phf_shared 0.11.2", ] [[package]] @@ -4274,7 +3827,7 @@ dependencies = [ "phf_shared 0.11.2", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.71", ] [[package]] @@ -4312,7 +3865,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.71", ] [[package]] @@ -4329,9 +3882,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "piper" -version = "0.2.1" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" +checksum = "ae1d5c74c9876f070d3e8fd503d748c7d974c3e48da8f41350fa5222ef9b4391" dependencies = [ "atomic-waker", "fastrand", @@ -4345,7 +3898,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08e645ba5c45109106d56610b3ee60eb13a6f2beb8b74f8dc8186cf261788dda" dependencies = [ "anyhow", - "bitflags 2.5.0", + "bitflags 2.6.0", "libc", "libspa", "libspa-sys", @@ -4363,18 +3916,7 @@ checksum = "849e188f90b1dda88fe2bfe1ad31fe5f158af2c98f80fb5d13726c44f3f01112" dependencies = [ "bindgen", "libspa-sys", - "system-deps", -] - -[[package]] -name = "pkcs1" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f" -dependencies = [ - "der", - "pkcs8", - "spki", + "system-deps 6.2.2", ] [[package]] @@ -4405,12 +3947,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] -name = "platforms" -version = "3.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db23d408679286588f4d4644f965003d056e3dd5abcaaa938116871d7ce2fee7" - -[[package]] name = "png" version = "0.17.13" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4425,13 +3961,13 @@ dependencies = [ [[package]] name = "polling" -version = "3.6.0" +version = "3.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0c976a60b2d7e99d6f229e414670a9b85d13ac305cc6d1e9c134de58c5aaaf6" +checksum = "a3ed00ed3fbf728b5816498ecd316d1716eecaced9c0c8d2c5a6740ca214985b" dependencies = [ "cfg-if", "concurrent-queue", - "hermit-abi", + "hermit-abi 0.4.0", "pin-project-lite", "rustix", "tracing", @@ -4468,34 +4004,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" [[package]] -name = "primeorder" -version = "0.13.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "353e1ca18966c16d9deb1c69278edbc5f194139612772bd9537af60ac231e1e6" -dependencies = [ - "elliptic-curve", -] - -[[package]] -name = "proc-macro-crate" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" -dependencies = [ - "once_cell", - "toml_edit 0.19.15", -] - -[[package]] -name = "proc-macro-crate" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e8366a6159044a37876a2b9817124296703c586a5c92e2c53751fa06d8d43e8" -dependencies = [ - "toml_edit 0.20.7", -] - -[[package]] name = "proc-macro-crate" version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4530,9 +4038,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.79" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] @@ -4553,14 +4061,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8021cf59c8ec9c432cfc2526ac6b8aa508ecaf29cd415f271b8406c1b851c3fd" dependencies = [ "quote", - "syn 2.0.58", + "syn 2.0.71", ] [[package]] name = "prost" -version = "0.12.4" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0f5d036824e4761737860779c906171497f6d55681139d8312388f8fe398922" +checksum = "e13db3d3fde688c61e2446b4d843bc27a7e8af269a69440c0308021dc92333cc" dependencies = [ "bytes", "prost-derive", @@ -4568,35 +4076,24 @@ dependencies = [ [[package]] name = "prost-derive" -version = "0.12.4" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19de2de2a00075bf566bee3bd4db014b11587e84184d3f7a791bc17f1a8e9e48" +checksum = "18bec9b0adc4eba778b33684b7ba3e7137789434769ee3ce3930463ef904cfca" dependencies = [ "anyhow", - "itertools 0.12.1", + "itertools 0.13.0", "proc-macro2", "quote", - "syn 2.0.58", -] - -[[package]] -name = "pulldown-cmark" -version = "0.9.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57206b407293d2bcd3af849ce869d52068623f19e1b5ff8e8778e3309439682b" -dependencies = [ - "bitflags 2.5.0", - "memchr", - "unicase", + "syn 2.0.71", ] [[package]] name = "pulldown-cmark" -version = "0.10.2" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f0530d13d87d1f549b66a3e8d0c688952abe5994e204ed62615baaf25dc029c" +checksum = "8746739f11d39ce5ad5c2520a9b75285310dbfe78c541ccf832d38615765aec0" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "getopts", "memchr", "pulldown-cmark-escape", @@ -4605,9 +4102,9 @@ dependencies = [ [[package]] name = "pulldown-cmark-escape" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5d8f9aa0e3cbcfaf8bf00300004ee3b72f74770f9cbac93f6928771f613276b" +checksum = "007d8adb5ddab6f8e3f491ac63566a7d5002cc7ed73901f72057943fa71ae1ae" [[package]] name = "qoi" @@ -4620,9 +4117,9 @@ dependencies = [ [[package]] name = "qrcode" -version = "0.14.0" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23e719ca51966ff9f5a8436edb00d6115b3c606a0bb27c8f8ca74a38ff2b036d" +checksum = "d68782463e408eb1e668cf6152704bd856c78c5b6417adaee3203d8f4c1fc9ec" dependencies = [ "image", ] @@ -4710,7 +4207,7 @@ dependencies = [ "rand", "rand_chacha", "simd_helpers", - "system-deps", + "system-deps 6.2.2", "thiserror", "v_frame", "wasm-bindgen", @@ -4718,9 +4215,9 @@ dependencies = [ [[package]] name = "ravif" -version = "0.11.5" +version = "0.11.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc13288f5ab39e6d7c9d501759712e6969fcc9734220846fc9ed26cae2cc4234" +checksum = "c6ba61c28ba24c0cf8406e025cb29a742637e3f70776e61c27a8a8b72a042d12" dependencies = [ "avif-serialize", "imgref", @@ -4753,29 +4250,29 @@ dependencies = [ [[package]] name = "readlock" -version = "0.1.7" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7b323e7196daa571c8584de958be19e92941c41f845776fe06babfe8fa280a2" +checksum = "072cfe5b1d2dcd38d20e18f85e9c9978b6cc08f0b373e9f1fff1541335622974" [[package]] name = "redox_syscall" -version = "0.4.1" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", ] [[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]] @@ -4789,13 +4286,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]] @@ -4806,27 +4303,27 @@ 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 = "reqwest" -version = "0.11.27" +version = "0.12.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" +checksum = "c7d6d2a27d57148378eb5e111173f4276ad26340ecc5c49a4a2152167a2d6a37" dependencies = [ "async-compression", - "base64 0.21.7", + "base64", "bytes", - "encoding_rs", "futures-core", "futures-util", - "h2", "http", "http-body", + "http-body-util", "hyper", "hyper-tls", + "hyper-util", "ipnet", "js-sys", "log", @@ -4839,8 +4336,7 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", - "sync_wrapper", - "system-configuration", + "sync_wrapper 1.0.1", "tokio", "tokio-native-tls", "tokio-socks", @@ -4855,29 +4351,19 @@ dependencies = [ ] [[package]] -name = "rfc6979" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2" -dependencies = [ - "hmac", - "subtle", -] - -[[package]] name = "rgb" -version = "0.8.37" +version = "0.8.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05aaa8004b64fd573fc9d002f4e632d51ad4f026c2b5ba95fcb6c2f32c2c47d8" +checksum = "ade4539f42266ded9e755c605bdddf546242b2c961b03b06a7375260788a0523" dependencies = [ "bytemuck", ] [[package]] name = "rmp" -version = "0.8.12" +version = "0.8.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f9860a6cc38ed1da53456442089b4dfa35e7cedaa326df63017af88385e6b20" +checksum = "228ed7c16fa39782c3b3468e974aec2795e9089153cd08ee2e9aefb3613334c4" dependencies = [ "byteorder", "num-traits", @@ -4886,9 +4372,9 @@ dependencies = [ [[package]] name = "rmp-serde" -version = "1.1.2" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bffea85eea980d8a74453e5d02a8d93028f3c34725de143085a844ebe953258a" +checksum = "52e599a477cf9840e92f2cde9a7189e67b42c57532749bf90aea6ec10facd4db" dependencies = [ "byteorder", "rmp", @@ -4907,29 +4393,9 @@ dependencies = [ ] [[package]] -name = "rsa" -version = "0.9.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d0e5124fcb30e76a7e79bfee683a2746db83784b86289f6251b54b7950a0dfc" -dependencies = [ - "const-oid", - "digest", - "num-bigint-dig", - "num-integer", - "num-traits", - "pkcs1", - "pkcs8", - "rand_core", - "signature", - "spki", - "subtle", - "zeroize", -] - -[[package]] name = "ruma" -version = "0.9.4" -source = "git+https://github.com/ruma/ruma.git?rev=4c00bd010dbdca6005bd599b52e90a0b7015d056#4c00bd010dbdca6005bd599b52e90a0b7015d056" +version = "0.10.1" +source = "git+https://github.com/matrix-org/ruma.git?rev=4d3d8b46fd519012e4585ccf00dbea1eb602c028#4d3d8b46fd519012e4585ccf00dbea1eb602c028" dependencies = [ "assign", "js_int", @@ -4940,16 +4406,18 @@ dependencies = [ "ruma-federation-api", "ruma-html", "ruma-push-gateway-api", + "web-time", ] [[package]] name = "ruma-client-api" -version = "0.17.4" -source = "git+https://github.com/ruma/ruma.git?rev=4c00bd010dbdca6005bd599b52e90a0b7015d056#4c00bd010dbdca6005bd599b52e90a0b7015d056" +version = "0.18.0" +source = "git+https://github.com/matrix-org/ruma.git?rev=4d3d8b46fd519012e4585ccf00dbea1eb602c028#4d3d8b46fd519012e4585ccf00dbea1eb602c028" dependencies = [ "as_variant", "assign", "bytes", + "date_header", "http", "js_int", "js_option", @@ -4959,20 +4427,23 @@ dependencies = [ "serde", "serde_html_form", "serde_json", + "thiserror", + "url", + "web-time", ] [[package]] name = "ruma-common" -version = "0.12.1" -source = "git+https://github.com/ruma/ruma.git?rev=4c00bd010dbdca6005bd599b52e90a0b7015d056#4c00bd010dbdca6005bd599b52e90a0b7015d056" +version = "0.13.0" +source = "git+https://github.com/matrix-org/ruma.git?rev=4d3d8b46fd519012e4585ccf00dbea1eb602c028#4d3d8b46fd519012e4585ccf00dbea1eb602c028" dependencies = [ "as_variant", - "base64 0.21.7", + "base64", "bytes", "form_urlencoded", "getrandom", "http", - "indexmap 2.2.6", + "indexmap", "js-sys", "js_int", "konst", @@ -4995,15 +4466,15 @@ dependencies = [ [[package]] name = "ruma-events" -version = "0.27.11" -source = "git+https://github.com/ruma/ruma.git?rev=4c00bd010dbdca6005bd599b52e90a0b7015d056#4c00bd010dbdca6005bd599b52e90a0b7015d056" +version = "0.28.1" +source = "git+https://github.com/matrix-org/ruma.git?rev=4d3d8b46fd519012e4585ccf00dbea1eb602c028#4d3d8b46fd519012e4585ccf00dbea1eb602c028" dependencies = [ "as_variant", - "indexmap 2.2.6", + "indexmap", "js_int", "js_option", "percent-encoding", - "pulldown-cmark 0.9.6", + "pulldown-cmark", "regex", "ruma-common", "ruma-html", @@ -5014,13 +4485,14 @@ dependencies = [ "thiserror", "tracing", "url", + "web-time", "wildmatch", ] [[package]] name = "ruma-federation-api" -version = "0.8.0" -source = "git+https://github.com/ruma/ruma.git?rev=4c00bd010dbdca6005bd599b52e90a0b7015d056#4c00bd010dbdca6005bd599b52e90a0b7015d056" +version = "0.9.0" +source = "git+https://github.com/matrix-org/ruma.git?rev=4d3d8b46fd519012e4585ccf00dbea1eb602c028#4d3d8b46fd519012e4585ccf00dbea1eb602c028" dependencies = [ "js_int", "ruma-common", @@ -5031,20 +4503,21 @@ dependencies = [ [[package]] name = "ruma-html" -version = "0.1.0" -source = "git+https://github.com/ruma/ruma.git?rev=4c00bd010dbdca6005bd599b52e90a0b7015d056#4c00bd010dbdca6005bd599b52e90a0b7015d056" +version = "0.2.0" +source = "git+https://github.com/matrix-org/ruma.git?rev=4d3d8b46fd519012e4585ccf00dbea1eb602c028#4d3d8b46fd519012e4585ccf00dbea1eb602c028" dependencies = [ "as_variant", "html5ever", - "phf 0.11.2", + "phf", + "ruma-common", "tracing", "wildmatch", ] [[package]] name = "ruma-identifiers-validation" -version = "0.9.3" -source = "git+https://github.com/ruma/ruma.git?rev=4c00bd010dbdca6005bd599b52e90a0b7015d056#4c00bd010dbdca6005bd599b52e90a0b7015d056" +version = "0.9.5" +source = "git+https://github.com/matrix-org/ruma.git?rev=4d3d8b46fd519012e4585ccf00dbea1eb602c028#4d3d8b46fd519012e4585ccf00dbea1eb602c028" dependencies = [ "js_int", "thiserror", @@ -5052,23 +4525,23 @@ dependencies = [ [[package]] name = "ruma-macros" -version = "0.12.0" -source = "git+https://github.com/ruma/ruma.git?rev=4c00bd010dbdca6005bd599b52e90a0b7015d056#4c00bd010dbdca6005bd599b52e90a0b7015d056" +version = "0.13.0" +source = "git+https://github.com/matrix-org/ruma.git?rev=4d3d8b46fd519012e4585ccf00dbea1eb602c028#4d3d8b46fd519012e4585ccf00dbea1eb602c028" dependencies = [ "once_cell", - "proc-macro-crate 2.0.0", + "proc-macro-crate", "proc-macro2", "quote", "ruma-identifiers-validation", "serde", - "syn 2.0.58", + "syn 2.0.71", "toml", ] [[package]] name = "ruma-push-gateway-api" -version = "0.8.0" -source = "git+https://github.com/ruma/ruma.git?rev=4c00bd010dbdca6005bd599b52e90a0b7015d056#4c00bd010dbdca6005bd599b52e90a0b7015d056" +version = "0.9.0" +source = "git+https://github.com/matrix-org/ruma.git?rev=4d3d8b46fd519012e4585ccf00dbea1eb602c028#4d3d8b46fd519012e4585ccf00dbea1eb602c028" dependencies = [ "js_int", "ruma-common", @@ -5083,7 +4556,7 @@ version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a78046161564f5e7cd9008aff3b2990b3850dc8e0349119b98e8f251e099f24d" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "fallible-iterator", "fallible-streaming-iterator", "hashlink", @@ -5093,9 +4566,9 @@ dependencies = [ [[package]] name = "rustc-demangle" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustc-hash" @@ -5114,11 +4587,11 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.32" +version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "errno", "libc", "linux-raw-sys", @@ -5127,24 +4600,31 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "1.0.4" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" +checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d" dependencies = [ - "base64 0.21.7", + "base64", + "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 = "rustversion" -version = "1.0.15" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80af6f9131f277a45a3fba6ce8e2258037bb0477a67e610d3c1fe046ab31de47" +checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" [[package]] name = "ryu" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "schannel" @@ -5156,53 +4636,12 @@ dependencies = [ ] [[package]] -name = "schemars" -version = "0.8.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45a28f4c49489add4ce10783f7911893516f15afe45d015608d41faca6bc4d29" -dependencies = [ - "chrono", - "dyn-clone", - "indexmap 1.9.3", - "schemars_derive", - "serde", - "serde_json", - "url", -] - -[[package]] -name = "schemars_derive" -version = "0.8.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c767fd6fa65d9ccf9cf026122c1b555f2ef9a4f0cea69da4d7dbc3e258d30967" -dependencies = [ - "proc-macro2", - "quote", - "serde_derive_internals", - "syn 1.0.109", -] - -[[package]] name = "scopeguard" version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] -name = "sec1" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc" -dependencies = [ - "base16ct", - "der", - "generic-array", - "pkcs8", - "subtle", - "zeroize", -] - -[[package]] name = "secular" version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5213,11 +4652,11 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.10.0" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "770452e37cad93e0a50d5abc3990d2bc351c36d0328f86cefec2f2fb206eaef6" +checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", "core-foundation", "core-foundation-sys", "libc", @@ -5226,9 +4665,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.10.0" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41f3cc463c0ef97e11c3461a9d3787412d30e8e7eb907c79180c4a57bf7c04ef" +checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf" dependencies = [ "core-foundation-sys", "libc", @@ -5236,15 +4675,15 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.22" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.197" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" dependencies = [ "serde_derive", ] @@ -5262,33 +4701,22 @@ dependencies = [ [[package]] name = "serde_bytes" -version = "0.11.14" +version = "0.11.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b8497c313fd43ab992087548117643f6fcd935cbf36f176ffda0aacf9591734" +checksum = "387cc504cb06bb40a96c8e04e951fe01854cf6bc921053c954e4a606d9675c6a" dependencies = [ "serde", ] [[package]] name = "serde_derive" -version = "1.0.197" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.58", -] - -[[package]] -name = "serde_derive_internals" -version = "0.26.0" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85bf8229e7920a9f636479437026331ce11aa132b4dde37d121944a44d6e5f3c" +checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.71", ] [[package]] @@ -5298,7 +4726,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8de514ef58196f1fc96dcaef80fe6170a1ce6215df9687a93fe8300e773fefc5" dependencies = [ "form_urlencoded", - "indexmap 2.2.6", + "indexmap", "itoa", "ryu", "serde", @@ -5306,17 +4734,26 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.115" +version = "1.0.120" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd" +checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5" dependencies = [ - "indexmap 2.2.6", "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_repr" version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5324,14 +4761,14 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.71", ] [[package]] name = "serde_spanned" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" +checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" dependencies = [ "serde", ] @@ -5349,36 +4786,6 @@ dependencies = [ ] [[package]] -name = "serde_with" -version = "3.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee80b0e361bbf88fd2f6e242ccd19cfda072cb0faa6ae694ecee08199938569a" -dependencies = [ - "base64 0.21.7", - "chrono", - "hex", - "indexmap 1.9.3", - "indexmap 2.2.6", - "serde", - "serde_derive", - "serde_json", - "serde_with_macros", - "time", -] - -[[package]] -name = "serde_with_macros" -version = "3.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6561dc161a9224638a31d876ccdfefbc1df91d3f3a8342eddb35f055d48c7655" -dependencies = [ - "darling", - "proc-macro2", - "quote", - "syn 2.0.58", -] - -[[package]] name = "sha1" version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5417,9 +4824,9 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" [[package]] name = "signal-hook-registry" -version = "1.4.1" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" dependencies = [ "libc", ] @@ -5430,7 +4837,6 @@ version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" dependencies = [ - "digest", "rand_core", ] @@ -5472,9 +4878,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "socket2" -version = "0.5.6" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" dependencies = [ "libc", "windows-sys 0.52.0", @@ -5482,9 +4888,9 @@ dependencies = [ [[package]] name = "sourceview5" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f0bf70f2f1ac4624af22056f9c4cf58dccff73dafc7207b46fbd3df7b57410f" +checksum = "905c83b38d4aff1800a12adba65b083deba61b4d948f62fc2ff7ad7d77656d05" dependencies = [ "futures-channel", "futures-core", @@ -5500,9 +4906,9 @@ dependencies = [ [[package]] name = "sourceview5-sys" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eac236ad7ce6dad2b819ced8b68b5a1cf4d968aa301cb9a7692470eb21f657be" +checksum = "4a3759467713554a8063faa380237ee2c753e89026bbe1b8e9611d991cb106ff" dependencies = [ "gdk-pixbuf-sys", "gdk4-sys", @@ -5512,17 +4918,11 @@ dependencies = [ "gtk4-sys", "libc", "pango-sys", - "system-deps", + "system-deps 7.0.1", ] [[package]] name = "spin" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" - -[[package]] -name = "spin" version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" @@ -5574,60 +4974,37 @@ dependencies = [ [[package]] name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - -[[package]] -name = "structmeta" -version = "0.3.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e1575d8d40908d70f6fd05537266b90ae71b15dbbe7a8b7dffa2b759306d329" -dependencies = [ - "proc-macro2", - "quote", - "structmeta-derive", - "syn 2.0.58", -] - -[[package]] -name = "structmeta-derive" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "152a0b65a590ff6c3da95cabe2353ee04e6167c896b28e3b14478c2636c922fc" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.58", -] +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "strum" -version = "0.26.2" +version = "0.26.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d8cec3501a5194c432b2b7976db6b7d10ec95c253208b45f83f7136aa985e29" +checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" dependencies = [ "strum_macros", ] [[package]] name = "strum_macros" -version = "0.26.2" +version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6cf59daf282c0a494ba14fd21610a0325f9f90ec9d1231dea26bcb1d696c946" +checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" dependencies = [ - "heck 0.4.1", + "heck", "proc-macro2", "quote", "rustversion", - "syn 2.0.58", + "syn 2.0.71", ] [[package]] name = "subtle" -version = "2.5.0" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "syn" @@ -5642,9 +5019,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.58" +version = "2.0.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44cfb93f38070beee36b3fef7d4f5a16f27751d94b187b666a5cc5e9b0d30687" +checksum = "b146dcf730474b4bcd16c311627b31ede9ab149045db4d6088b3becaea046462" dependencies = [ "proc-macro2", "quote", @@ -5658,34 +5035,32 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" [[package]] -name = "system-configuration" -version = "0.5.1" +name = "sync_wrapper" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "system-configuration-sys", -] +checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" [[package]] -name = "system-configuration-sys" -version = "0.5.0" +name = "system-deps" +version = "6.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" +checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349" dependencies = [ - "core-foundation-sys", - "libc", + "cfg-expr", + "heck", + "pkg-config", + "toml", + "version-compare", ] [[package]] name = "system-deps" -version = "6.2.2" +version = "7.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349" +checksum = "6c81f13d9a334a6c242465140bd262fae382b752ff2011c4f7419919a9c97922" dependencies = [ "cfg-expr", - "heck 0.5.0", + "heck", "pkg-config", "toml", "version-compare", @@ -5693,9 +5068,9 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.14" +version = "0.12.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" +checksum = "4873307b7c257eddcb50c9bedf158eb669578359fb28428bef438fec8e6ba7c2" [[package]] name = "temp-dir" @@ -5728,22 +5103,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.58" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.58" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.71", ] [[package]] @@ -5800,9 +5175,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.6.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" dependencies = [ "tinyvec_macros", ] @@ -5814,10 +5189,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] +name = "tld" +version = "2.35.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73ca5fc340fcb4f52570c502cf443fc22d5521e9ef2bb03528e3634254016cf7" +dependencies = [ + "phf", + "phf_codegen", +] + +[[package]] name = "tokio" -version = "1.37.0" +version = "1.38.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" +checksum = "eb2caba9f80616f438e09748d5acda951967e1ea58508ef53d9c6402485a46df" dependencies = [ "backtrace", "bytes", @@ -5834,13 +5219,13 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" +checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.71", ] [[package]] @@ -5879,83 +5264,60 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.10" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" +checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" dependencies = [ "bytes", "futures-core", "futures-sink", "pin-project-lite", "tokio", - "tracing", ] [[package]] name = "toml" -version = "0.8.12" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3" +checksum = "ac2caab0bf757388c6c0ae23b3293fdb463fee59434529014f85e3263b995c28" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.9", + "toml_edit 0.22.16", ] [[package]] name = "toml_datetime" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.19.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" -dependencies = [ - "indexmap 2.2.6", - "toml_datetime", - "winnow 0.5.40", -] - -[[package]] -name = "toml_edit" -version = "0.20.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" -dependencies = [ - "indexmap 2.2.6", - "toml_datetime", - "winnow 0.5.40", -] - -[[package]] -name = "toml_edit" version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" dependencies = [ - "indexmap 2.2.6", + "indexmap", "toml_datetime", "winnow 0.5.40", ] [[package]] name = "toml_edit" -version = "0.22.9" +version = "0.22.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e40bb779c5187258fd7aad0eb68cb8706a0a81fa712fbea808ab43c4b8374c4" +checksum = "278f3d518e152219c994ce877758516bca5e118eaed6996192a774fb9fbf0788" dependencies = [ - "indexmap 2.2.6", + "indexmap", "serde", "serde_spanned", "toml_datetime", - "winnow 0.6.5", + "winnow 0.6.13", ] [[package]] @@ -5975,24 +5337,6 @@ dependencies = [ ] [[package]] -name = "tower-http" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61c5bb1d698276a2443e5ecfabc1008bf15a36c12e6a7176e7bf089ea9131140" -dependencies = [ - "bitflags 2.5.0", - "bytes", - "futures-core", - "futures-util", - "http", - "http-body", - "http-range-header", - "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" @@ -6024,7 +5368,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.71", ] [[package]] @@ -6049,22 +5393,6 @@ dependencies = [ ] [[package]] -name = "tracing-opentelemetry" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9be14ba1bbe4ab79e9229f7f89fab8d120b865859f10527f31c033e599d2284" -dependencies = [ - "js-sys", - "once_cell", - "opentelemetry", - "opentelemetry_sdk", - "tracing", - "tracing-core", - "tracing-subscriber", - "web-time", -] - -[[package]] name = "tracing-subscriber" version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6122,9 +5450,9 @@ dependencies = [ [[package]] name = "ulid" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34778c17965aa2a08913b57e1f34db9b4a63f5de31768b55bf20d2795f921259" +checksum = "04f903f293d11f31c0c29e4148f6dc0d033a7f80cebc0282bea147611667d289" dependencies = [ "getrandom", "rand", @@ -6169,9 +5497,9 @@ checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" [[package]] name = "unicode-width" -version = "0.1.11" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" +checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" [[package]] name = "universal-hash" @@ -6185,9 +5513,9 @@ dependencies = [ [[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", @@ -6208,12 +5536,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" [[package]] -name = "utf8-width" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86bd8d4e895da8537e5315b8254664e6b769c4ff3db18321b297a1e7004392e3" - -[[package]] name = "uuid" version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6260,13 +5582,16 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "vodozemac" -version = "0.5.1" -source = "git+https://github.com/matrix-org/vodozemac?rev=0c75746fc8a5eda4a0e490d345d1798b4c6cbd67#0c75746fc8a5eda4a0e490d345d1798b4c6cbd67" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "051d4af70b53b42adf2aac459a305851b8d754f210aaf11ab509e1065beff422" dependencies = [ "aes", "arrayvec", - "base64 0.22.0", + "base64", + "base64ct", "cbc", + "chacha20poly1305", "curve25519-dalek", "ed25519-dalek", "getrandom", @@ -6322,7 +5647,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.71", "wasm-bindgen-shared", ] @@ -6356,7 +5681,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.71", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -6408,9 +5733,9 @@ checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" [[package]] name = "wildmatch" -version = "2.3.3" +version = "2.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "939e59c1bc731542357fdaad98b209ef78c8743d652bb61439d16b16a79eb025" +checksum = "3928939971918220fed093266b809d1ee4ec6c1a2d72692ff6876898f3b16c19" [[package]] name = "winapi" @@ -6440,7 +5765,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.4", + "windows-targets 0.52.6", ] [[package]] @@ -6458,7 +5783,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.4", + "windows-targets 0.52.6", ] [[package]] @@ -6478,17 +5803,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.4", - "windows_aarch64_msvc 0.52.4", - "windows_i686_gnu 0.52.4", - "windows_i686_msvc 0.52.4", - "windows_x86_64_gnu 0.52.4", - "windows_x86_64_gnullvm 0.52.4", - "windows_x86_64_msvc 0.52.4", + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", ] [[package]] @@ -6499,9 +5825,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" @@ -6511,9 +5837,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" @@ -6523,9 +5849,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.4" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" @@ -6535,9 +5867,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" @@ -6547,9 +5879,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" @@ -6559,9 +5891,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" @@ -6571,9 +5903,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" @@ -6586,18 +5918,18 @@ dependencies = [ [[package]] name = "winnow" -version = "0.6.5" +version = "0.6.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dffa400e67ed5a4dd237983829e66475f0a4a26938c4b04c21baede6262215b8" +checksum = "59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1" dependencies = [ "memchr", ] [[package]] name = "winreg" -version = "0.50.0" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" +checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" dependencies = [ "cfg-if", "windows-sys 0.48.0", @@ -6628,24 +5960,19 @@ dependencies = [ [[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]] -name = "xml5ever" -version = "0.17.0" +name = "xxhash-rust" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4034e1d05af98b51ad7214527730626f019682d797ba38b51689212118d8e650" -dependencies = [ - "log", - "mac", - "markup5ever", -] +checksum = "63658493314859b4dfdf3fb8c1defd61587839def09582db50b8a4e93afca6bb" [[package]] name = "yansi-term" @@ -6658,22 +5985,21 @@ dependencies = [ [[package]] name = "zbus" -version = "4.1.2" +version = "4.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9ff46f2a25abd690ed072054733e0bc3157e3d4c45f41bd183dce09c2ff8ab9" +checksum = "851238c133804e0aa888edf4a0229481c753544ca12a60fd1c3230c8a500fe40" dependencies = [ "async-broadcast", "async-process", "async-recursion", "async-trait", - "derivative", "enumflags2", - "event-listener 5.3.0", + "event-listener", "futures-core", "futures-sink", "futures-util", "hex", - "nix 0.28.0", + "nix 0.29.0", "ordered-stream", "rand", "serde", @@ -6692,15 +6018,14 @@ dependencies = [ [[package]] name = "zbus_macros" -version = "4.1.2" +version = "4.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e0e3852c93dcdb49c9462afe67a2a468f7bd464150d866e861eaf06208633e0" +checksum = "8d5a3f12c20bd473be3194af6b49d50d7bb804ef3192dc70eddedb26b85d9da7" dependencies = [ - "proc-macro-crate 3.1.0", + "proc-macro-crate", "proc-macro2", "quote", - "regex", - "syn 1.0.109", + "syn 2.0.71", "zvariant_utils", ] @@ -6717,29 +6042,29 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.7.32" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.32" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.71", ] [[package]] name = "zeroize" -version = "1.7.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" dependencies = [ "zeroize_derive", ] @@ -6752,7 +6077,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.71", ] [[package]] @@ -6781,9 +6106,9 @@ dependencies = [ [[package]] name = "zvariant" -version = "4.0.2" +version = "4.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c1b3ca6db667bfada0f1ebfc94b2b1759ba25472ee5373d4551bb892616389a" +checksum = "1724a2b330760dc7d2a8402d841119dc869ef120b139d29862d6980e9c75bfc9" dependencies = [ "endi", "enumflags2", @@ -6795,24 +6120,24 @@ dependencies = [ [[package]] name = "zvariant_derive" -version = "4.0.2" +version = "4.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7a4b236063316163b69039f77ce3117accb41a09567fd24c168e43491e521bc" +checksum = "55025a7a518ad14518fb243559c058a2e5b848b015e31f1d90414f36e3317859" dependencies = [ - "proc-macro-crate 3.1.0", + "proc-macro-crate", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.71", "zvariant_utils", ] [[package]] name = "zvariant_utils" -version = "1.1.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00bedb16a193cc12451873fee2a1bc6550225acece0e36f333e68326c73c8172" +checksum = "fc242db087efc22bd9ade7aa7809e4ba828132edc312871584a6b4391bdf8786" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.71", ] diff --git a/pkgs/applications/networking/instant-messengers/fractal/default.nix b/pkgs/applications/networking/instant-messengers/fractal/default.nix index cdbddfe9959a6..d5f1f4fae8f2d 100644 --- a/pkgs/applications/networking/instant-messengers/fractal/default.nix +++ b/pkgs/applications/networking/instant-messengers/fractal/default.nix @@ -25,23 +25,21 @@ stdenv.mkDerivation rec { pname = "fractal"; - version = "7"; + version = "8"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "fractal"; rev = "refs/tags/${version}"; - hash = "sha256-IfcThpsGATMD3Uj9tvw/aK7IVbiVT8sdZ088gRUqnlg="; + hash = "sha256-a77+lPH2eqWTLFrYfcBXSvbyyYC52zSo+Rh/diqKYx4="; }; cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; outputHashes = { - "mas-http-0.8.0" = "sha256-IiYxF9qT/J/n8t/cVT/DRV3gl2MTA6/YfjshVIic/n4="; - "matrix-sdk-0.7.1" = "sha256-quwt9Dx0K6LDMwHBipc52Ek59zz5mlTAdOj+RXZBU3Q="; - "ruma-0.9.4" = "sha256-tp0EFS39UTXZJQPUDjeQixb8wzsMCzyFggVj6M8TRYg="; - "vodozemac-0.5.1" = "sha256-Hm0C696RmNX6n1Jx+hqkKMjpdbArliuzdiS4wCv3OIM="; + "matrix-sdk-0.7.1" = "sha256-ZlkxGXGrmZ8VQV7UY7A7BBfcqFCAB9Ep7l65irx4Dy8="; + "ruma-0.10.1" = "sha256-C/GJ0hDWJ9/grfjMuPSatJq2SrVkV0jxQlAAASkUWqg="; }; }; @@ -86,7 +84,7 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.gnome.org/GNOME/fractal"; changelog = "https://gitlab.gnome.org/World/fractal/-/releases/${version}"; license = licenses.gpl3Plus; - maintainers = teams.gnome.members ++ (with maintainers; [ anselmschueler dtzWill ]); + maintainers = teams.gnome.members; platforms = platforms.linux; mainProgram = "fractal"; }; diff --git a/pkgs/applications/networking/instant-messengers/freetalk/default.nix b/pkgs/applications/networking/instant-messengers/freetalk/default.nix index e259c6b60f8d6..b71395ad93bb0 100644 --- a/pkgs/applications/networking/instant-messengers/freetalk/default.nix +++ b/pkgs/applications/networking/instant-messengers/freetalk/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { buildInputs = [ guile glib loudmouth gmp libidn readline libtool libunwind ncurses curl jansson - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ argp-standalone ]; - env.NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-largp"; + env.NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-largp"; meta = with lib; { description = "Console XMPP client"; diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index 7f273359de4e7..8436a518d6d83 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 @@ -21,17 +21,18 @@ python3.pkgs.buildPythonApplication rec { pname = "gajim"; - version = "1.9.0"; + version = "1.9.3"; src = fetchurl { url = "https://gajim.org/downloads/${lib.versions.majorMinor version}/gajim-${version}.tar.gz"; - hash = "sha256-eiRLQZr60BvjqqnoYEY+LswgW6e+S9mTLvBKVCXrCzI="; + hash = "sha256-TxWyUDoBvscKa2ogPrFlzLC2q+5RMyMnAiOpQdpFP4M="; }; 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/go-neb/default.nix b/pkgs/applications/networking/instant-messengers/go-neb/default.nix index 82cfb3126c861..6b4528dfe289c 100644 --- a/pkgs/applications/networking/instant-messengers/go-neb/default.nix +++ b/pkgs/applications/networking/instant-messengers/go-neb/default.nix @@ -21,7 +21,7 @@ buildGoModule { passthru.tests.go-neb = nixosTests.go-neb; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Extensible matrix bot written in Go"; mainProgram = "go-neb"; homepage = "https://github.com/matrix-org/go-neb"; diff --git a/pkgs/applications/networking/instant-messengers/gomuks/default.nix b/pkgs/applications/networking/instant-messengers/gomuks/default.nix index 26b0e9c0225db..510f577a50e93 100644 --- a/pkgs/applications/networking/instant-messengers/gomuks/default.nix +++ b/pkgs/applications/networking/instant-messengers/gomuks/default.nix @@ -1,6 +1,5 @@ { lib , stdenv -, substituteAll , buildGoModule , fetchFromGitHub , makeDesktopItem @@ -13,16 +12,16 @@ buildGoModule rec { pname = "gomuks"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "tulir"; repo = pname; rev = "v${version}"; - sha256 = "sha256-gLyjqmGZudj8PmsYUGXHOjetZzi6u5CFI7Y50y2XAzk="; + sha256 = "sha256-bDJXo8d9K5UO599HDaABpfwc9/dJJy+9d24KMVZHyvI="; }; - vendorHash = "sha256-FmQJG6hv0YPyHVjZ/DvkQExrGLc1hjoiPS59MnqG2gU="; + vendorHash = "sha256-0my58bVKLWbdTwhAnXMruNjujd07NXFn4bkRe1cUYpE="; doCheck = false; @@ -43,7 +42,7 @@ buildGoModule rec { }/* $out/ substituteAllInPlace $out/share/applications/* wrapProgram $out/bin/gomuks \ - --prefix PATH : "${lib.makeBinPath (lib.optionals stdenv.isLinux [ libnotify pulseaudio ])}" \ + --prefix PATH : "${lib.makeBinPath (lib.optionals stdenv.hostPlatform.isLinux [ libnotify pulseaudio ])}" \ --set-default GOMUKS_SOUND_NORMAL "${sound-theme-freedesktop}/share/sounds/freedesktop/stereo/message-new-instant.oga" \ --set-default GOMUKS_SOUND_CRITICAL "${sound-theme-freedesktop}/share/sounds/freedesktop/stereo/complete.oga" ''; diff --git a/pkgs/applications/networking/instant-messengers/gurk-rs/Cargo.lock b/pkgs/applications/networking/instant-messengers/gurk-rs/Cargo.lock index 3c5de8c878377..2ca881477050b 100644 --- a/pkgs/applications/networking/instant-messengers/gurk-rs/Cargo.lock +++ b/pkgs/applications/networking/instant-messengers/gurk-rs/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "addr2line" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" dependencies = [ "gimli", ] @@ -18,6 +18,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] +name = "adler2" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" + +[[package]] name = "aead" version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -70,9 +76,9 @@ dependencies = [ [[package]] name = "ahash" -version = "0.8.10" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b79b82693f705137f8fb9b37871d99e4f9a7df12b917eed79c3d3954830a60b" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ "cfg-if", "getrandom", @@ -83,27 +89,18 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "0.7.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" -dependencies = [ - "memchr", -] - -[[package]] -name = "aho-corasick" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ "memchr", ] [[package]] name = "allocator-api2" -version = "0.2.16" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" +checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" [[package]] name = "android-tzdata" @@ -128,47 +125,48 @@ checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" [[package]] name = "anstream" -version = "0.6.13" +version = "0.6.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" +checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526" dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", "anstyle-wincon", "colorchoice", + "is_terminal_polyfill", "utf8parse", ] [[package]] name = "anstyle" -version = "1.0.6" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" +checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" [[package]] name = "anstyle-parse" -version = "0.2.3" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" +checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.0.2" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" +checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a" dependencies = [ "windows-sys 0.52.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.2" +version = "3.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" +checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8" dependencies = [ "anstyle", "windows-sys 0.52.0", @@ -176,25 +174,24 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.80" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" [[package]] name = "arboard" -version = "3.3.1" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1faa3c733d9a3dd6fbaf85da5d162a2e03b2e0033a90dceb0e2a90fdd1e5380a" +checksum = "9fb4009533e8ff8f1450a5bcbc30f4242a1d34442221f72314bea1f5dc9c7f89" dependencies = [ "clipboard-win", "core-graphics", "image", "log", - "objc", - "objc-foundation", - "objc_id", - "parking_lot 0.12.1", - "thiserror", + "objc2", + "objc2-app-kit", + "objc2-foundation", + "parking_lot 0.12.3", "windows-sys 0.48.0", "wl-clipboard-rs", "x11rb", @@ -202,185 +199,158 @@ dependencies = [ [[package]] name = "arrayref" -version = "0.3.7" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" +checksum = "9d151e35f61089500b617991b791fc8bfd237ae50cd5950803758a179b41e67a" [[package]] name = "arrayvec" -version = "0.7.4" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" +checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" [[package]] name = "async-broadcast" -version = "0.5.1" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c48ccdbf6ca6b121e0f586cbc0e73ae440e56c67c30fa0873b4e110d9c26d2b" +checksum = "20cd0e2e25ea8e5f7e9df04578dc6cf5c83577fd09b1a46aaf5c85e1c33f2a7e" dependencies = [ - "event-listener 2.5.3", + "event-listener 5.3.1", + "event-listener-strategy", "futures-core", + "pin-project-lite", ] [[package]] name = "async-channel" -version = "2.2.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f28243a43d821d11341ab73c80bed182dc015c514b951616cf79bd4af39af0c3" +checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a" dependencies = [ "concurrent-queue", - "event-listener 5.2.0", - "event-listener-strategy 0.5.0", + "event-listener-strategy", "futures-core", "pin-project-lite", ] [[package]] name = "async-executor" -version = "1.8.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ae5ebefcc48e7452b4987947920dac9450be1110cadf34d1b8c116bdbaf97c" +checksum = "d7ebdfa2ebdab6b1760375fa7d6f382b9f486eac35fc994625a00e89280bdbb7" dependencies = [ - "async-lock 3.3.0", "async-task", "concurrent-queue", - "fastrand 2.0.1", - "futures-lite 2.2.0", + "fastrand", + "futures-lite", "slab", ] [[package]] name = "async-fs" -version = "1.6.0" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06" +checksum = "ebcd09b382f40fcd159c2d695175b2ae620ffa5f3bd6f664131efff4e8b9e04a" dependencies = [ - "async-lock 2.8.0", - "autocfg", + "async-lock", "blocking", - "futures-lite 1.13.0", -] - -[[package]] -name = "async-io" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" -dependencies = [ - "async-lock 2.8.0", - "autocfg", - "cfg-if", - "concurrent-queue", - "futures-lite 1.13.0", - "log", - "parking", - "polling 2.8.0", - "rustix 0.37.27", - "slab", - "socket2 0.4.10", - "waker-fn", + "futures-lite", ] [[package]] name = "async-io" -version = "2.3.1" +version = "2.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f97ab0c5b00a7cdbe5a371b9a782ee7be1316095885c8a4ea1daf490eb0ef65" +checksum = "444b0228950ee6501b3568d3c93bf1176a1fdbc3b758dcd9475046d30f4dc7e8" dependencies = [ - "async-lock 3.3.0", + "async-lock", "cfg-if", "concurrent-queue", "futures-io", - "futures-lite 2.2.0", + "futures-lite", "parking", - "polling 3.5.0", - "rustix 0.38.31", + "polling", + "rustix", "slab", "tracing", - "windows-sys 0.52.0", -] - -[[package]] -name = "async-lock" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" -dependencies = [ - "event-listener 2.5.3", + "windows-sys 0.59.0", ] [[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", ] [[package]] name = "async-process" -version = "1.8.1" +version = "2.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88" +checksum = "a8a07789659a4d385b79b18b9127fc27e1a59e1e89117c78c5ea3b806f016374" dependencies = [ - "async-io 1.13.0", - "async-lock 2.8.0", + "async-channel", + "async-io", + "async-lock", "async-signal", + "async-task", "blocking", "cfg-if", - "event-listener 3.1.0", - "futures-lite 1.13.0", - "rustix 0.38.31", - "windows-sys 0.48.0", + "event-listener 5.3.1", + "futures-lite", + "rustix", + "tracing", + "windows-sys 0.59.0", ] [[package]] name = "async-recursion" -version = "1.0.5" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" +checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.76", ] [[package]] name = "async-signal" -version = "0.2.5" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5" +checksum = "637e00349800c0bdf8bfc21ebbc0b6524abea702b0da4168ac00d070d0c0b9f3" dependencies = [ - "async-io 2.3.1", - "async-lock 2.8.0", + "async-io", + "async-lock", "atomic-waker", "cfg-if", "futures-core", "futures-io", - "rustix 0.38.31", + "rustix", "signal-hook-registry", "slab", - "windows-sys 0.48.0", + "windows-sys 0.59.0", ] [[package]] name = "async-task" -version = "4.7.0" +version = "4.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbb36e985947064623dbd357f727af08ffd077f93d696782f3c56365fa2e2799" +checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" [[package]] name = "async-trait" -version = "0.1.77" +version = "0.1.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" +checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.76", ] [[package]] @@ -425,47 +395,37 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] -name = "atomic-write-file" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edcdbedc2236483ab103a53415653d6b4442ea6141baf1ffa85df29635e88436" -dependencies = [ - "nix 0.27.1", - "rand", -] - -[[package]] name = "autocfg" -version = "1.1.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "backtrace" -version = "0.3.69" +version = "0.3.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" dependencies = [ "addr2line", "cc", "cfg-if", "libc", - "miniz_oxide", + "miniz_oxide 0.7.4", "object", "rustc-demangle", ] [[package]] name = "base64" -version = "0.13.1" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" [[package]] name = "base64" -version = "0.21.7" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "base64ct" @@ -490,18 +450,18 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.2" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" dependencies = [ "serde", ] [[package]] name = "blake3" -version = "1.5.0" +version = "1.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0231f06152bf547e9c2b5194f247cd97aacf6dcd8b15d8e5ec0663f64580da87" +checksum = "d82033247fd8e890df8f740e407ad4d038debb9eb1f40533fffb32e7d17dc6f7" dependencies = [ "arrayref", "arrayvec", @@ -535,49 +495,49 @@ dependencies = [ ] [[package]] +name = "block2" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c132eebf10f5cad5289222520a4a058514204aed6d791f1cf4fe8088b82d15f" +dependencies = [ + "objc2", +] + +[[package]] name = "blocking" -version = "1.5.1" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118" +checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea" dependencies = [ "async-channel", - "async-lock 3.3.0", "async-task", - "fastrand 2.0.1", "futures-io", - "futures-lite 2.2.0", + "futures-lite", "piper", - "tracing", ] [[package]] name = "bstr" -version = "1.9.1" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706" +checksum = "40723b8fb387abc38f4f4a37c09073622e41dd12327033091ef8950659e6dc0c" dependencies = [ "memchr", - "regex-automata 0.4.5", + "regex-automata", "serde", ] [[package]] name = "bumpalo" -version = "3.15.3" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea184aa71bb362a1157c896979544cc23974e08fd265f29ea96b59f0b4a555b" - -[[package]] -name = "bytecount" -version = "0.6.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1e5f035d16fc623ae5f74981db80a439803888314e3a555fd6f04acd51a3205" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "bytemuck" -version = "1.14.3" +version = "1.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2ef034f05691a48569bd920a96c81b9d91bbad1ab5ac7c4616c1f6ef36cb79f" +checksum = "773d90827bc3feecfb67fab12e24de0749aad83c74b9504ecde46237b5cd24e2" [[package]] name = "byteorder" @@ -586,10 +546,16 @@ 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.5.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" +checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" [[package]] name = "cassowary" @@ -604,6 +570,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] +name = "castaway" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0abae9be0aaf9ea96a3b1b8b1b55c602ca751eba1b1500220cea4ecbafe7c0d5" +dependencies = [ + "rustversion", +] + +[[package]] name = "cbc" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -614,11 +589,13 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.88" +version = "1.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02f341c093d19155a6e41631ce5971aac4e9a868262212153124c15fa22d1cdc" +checksum = "57b6a275aa2903740dc87da01c62040406b8812552e97129a63ea8850a17c6e6" dependencies = [ + "jobserver", "libc", + "shlex", ] [[package]] @@ -628,6 +605,18 @@ 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 = "cfg_aliases" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" + +[[package]] name = "chacha20" version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -659,15 +648,17 @@ checksum = "17cc5e6b5ab06331c33589842070416baa137e8b0eb912b008cfd4a78ada7919" [[package]] name = "chrono" -version = "0.4.34" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bc015644b92d5890fab7489e49d21f879d5c990186827d42ec511919404f38b" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" dependencies = [ "android-tzdata", "iana-time-zone", + "js-sys", "num-traits", "serde", - "windows-targets 0.52.4", + "wasm-bindgen", + "windows-targets 0.52.6", ] [[package]] @@ -710,9 +701,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.1" +version = "4.5.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c918d541ef2913577a0f9566e9ce27cb35b6df072075769e0b26cb5a554520da" +checksum = "ed6719fffa43d0d87e5fd8caeab59be1554fb028cd30edc88fc4369b17971019" dependencies = [ "clap_builder", "clap_derive", @@ -720,9 +711,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.1" +version = "4.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f3e7391dad68afb0c2ede1bf619f579a3dc9c2ec67f089baa397123a2f3d1eb" +checksum = "216aec2b177652e3846684cbfe25c9964d18ec45234f0f5da5157b207ed1aab6" dependencies = [ "anstream", "anstyle", @@ -732,27 +723,27 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.0" +version = "4.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "307bc0538d5f0f83b8248db3087aa92fe504e4691294d0c96c0eabc33f47ba47" +checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0" dependencies = [ - "heck", + "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.76", ] [[package]] name = "clap_lex" -version = "0.7.0" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" +checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" [[package]] name = "clipboard-win" -version = "5.2.0" +version = "5.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12f9a0700e0127ba15d1d52dd742097f821cd9c65939303a44d970465040a297" +checksum = "15efe7a882b08f34e38556b14f2fb3daa98769d06c7f0c1b076dfd0d983bc892" dependencies = [ "error-code", ] @@ -764,22 +755,29 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "67ba02a97a2bd10f4b59b25c7973101c79642302776489e030cd13cdab09ed15" [[package]] -name = "color_quant" -version = "1.1.0" +name = "colorchoice" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" +checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0" [[package]] -name = "colorchoice" -version = "1.0.0" +name = "compact_str" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" +checksum = "f86b9c4c00838774a6d902ef931eff7470720c51d90c2e32cfe15dc304737b3f" +dependencies = [ + "castaway", + "cfg-if", + "itoa", + "ryu", + "static_assertions", +] [[package]] name = "concurrent-queue" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" dependencies = [ "crossbeam-utils", ] @@ -804,9 +802,9 @@ checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" [[package]] name = "constant_time_eq" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" +checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6" [[package]] name = "core-foundation" @@ -820,15 +818,15 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.6" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "core-graphics" -version = "0.23.1" +version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "970a29baf4110c26fedbc7f82107d42c23f7e88e404c4577ed73fe99ff85a212" +checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081" dependencies = [ "bitflags 1.3.2", "core-foundation", @@ -850,18 +848,18 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.12" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +checksum = "51e852e6dc9a5bed1fae92dd2375037bf2b768725bf3be87811edee3249d09ad" dependencies = [ "libc", ] [[package]] name = "crc" -version = "3.0.1" +version = "3.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86ec7a15cbe22e59248fc7eadb1907dab5ba09372595da4d73dd805ed4417dfe" +checksum = "69e6e4d7b33a94f0991c26729976b10ebde1d34c3ee82408fb536164fa10d636" dependencies = [ "crc-catalog", ] @@ -874,9 +872,9 @@ checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" [[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", ] @@ -921,15 +919,15 @@ dependencies = [ [[package]] name = "critical-section" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7059fff8937831a9ae6f0fe4d658ffabf58f2ca96aa9dec1c889f936f705f216" +checksum = "f64009896348fc5af4222e9cf7d7d82a95a256c634ebcf61c53e4ea461422242" [[package]] name = "crossbeam-channel" -version = "0.5.12" +version = "0.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95" +checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" dependencies = [ "crossbeam-utils", ] @@ -964,9 +962,9 @@ dependencies = [ [[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 = "crossterm" @@ -974,12 +972,12 @@ version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.6.0", "crossterm_winapi", "futures-core", "libc", - "mio", - "parking_lot 0.12.1", + "mio 0.8.11", + "parking_lot 0.12.3", "signal-hook", "signal-hook-mio", "winapi", @@ -1022,15 +1020,14 @@ dependencies = [ [[package]] name = "curve25519-dalek" -version = "4.1.1" -source = "git+https://github.com/signalapp/curve25519-dalek?tag=signal-curve25519-4.1.1#a12ab4e58455bb3dc7cd73a0f9f3443507b2854b" +version = "4.1.3" +source = "git+https://github.com/signalapp/curve25519-dalek?tag=signal-curve25519-4.1.3#7c6d34756355a3566a704da84dce7b1c039a6572" dependencies = [ "cfg-if", "cpufeatures", "curve25519-dalek-derive", "digest", "fiat-crypto", - "platforms", "rustc_version", "serde", "subtle", @@ -1039,25 +1036,36 @@ dependencies = [ [[package]] name = "curve25519-dalek-derive" -version = "0.1.0" -source = "git+https://github.com/signalapp/curve25519-dalek?tag=signal-curve25519-4.1.1#a12ab4e58455bb3dc7cd73a0f9f3443507b2854b" +version = "0.1.1" +source = "git+https://github.com/signalapp/curve25519-dalek?tag=signal-curve25519-4.1.3#7c6d34756355a3566a704da84dce7b1c039a6572" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.76", ] [[package]] name = "data-encoding" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" +checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2" + +[[package]] +name = "dbus" +version = "0.9.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bb21987b9fb1613058ba3843121dd18b163b254d8a6e797e144cbac14d96d1b" +dependencies = [ + "libc", + "libdbus-sys", + "winapi", +] [[package]] name = "der" -version = "0.7.8" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c" +checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0" dependencies = [ "const-oid", "pem-rfc7468", @@ -1086,13 +1094,13 @@ dependencies = [ [[package]] name = "derive-new" -version = "0.5.9" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3418329ca0ad70234b9735dc4ceed10af4df60eff9c8e7b06cb5e520d92c3535" +checksum = "d150dea618e920167e5973d70ae6ece4385b7164e0d799fe7c122dd0a5d912ad" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.76", ] [[package]] @@ -1103,7 +1111,7 @@ checksum = "62d671cc41a825ebabc75757b62d3d168c577f9149b2d49ece1dad1f72119d25" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.76", ] [[package]] @@ -1120,9 +1128,9 @@ dependencies = [ [[package]] name = "dirs" -version = "4.0.0" +version = "5.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" +checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" dependencies = [ "dirs-sys", ] @@ -1139,13 +1147,14 @@ dependencies = [ [[package]] name = "dirs-sys" -version = "0.3.7" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" +checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" dependencies = [ "libc", + "option-ext", "redox_users", - "winapi", + "windows-sys 0.48.0", ] [[package]] @@ -1161,13 +1170,13 @@ dependencies = [ [[package]] name = "displaydoc" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.76", ] [[package]] @@ -1187,21 +1196,21 @@ checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b" [[package]] name = "downcast-rs" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" +checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" [[package]] name = "dunce" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" +checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813" [[package]] name = "either" -version = "1.10.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" dependencies = [ "serde", ] @@ -1213,10 +1222,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef1a6892d9eef45c8fa6b9e0086428a2cca8491aca8f787c534a3d6d0bcb3ced" [[package]] -name = "emojis" +name = "embedded-io" version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ee61eb945bff65ee7d19d157d39c67c33290ff0742907413fd5eefd29edc979" +checksum = "edd0f118536f44f5ccd48bcb8b111bdc3de888b58c74639dfb034a357d0f206d" + +[[package]] +name = "emojis" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e72f23d65b46527e461b161ab9a126c378aa2249d8a8d15718d23ab1fb4d8786" dependencies = [ "phf", ] @@ -1228,10 +1243,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" [[package]] +name = "endi" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3d8a32ae18130a3c84dd492d4215c3d913c3b07c6b63c2eb3eb7ff1101ab7bf" + +[[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", @@ -1239,13 +1260,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.52", + "syn 2.0.76", ] [[package]] @@ -1266,9 +1287,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" dependencies = [ "libc", "windows-sys 0.52.0", @@ -1299,9 +1320,9 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] name = "event-listener" -version = "3.1.0" +version = "5.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d93877bcde0eb80ca09131a08d23f0a5c18a620b01db137dba666d18cd9b30c2" +checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba" dependencies = [ "concurrent-queue", "parking", @@ -1309,61 +1330,20 @@ 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.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b5fb89194fa3cad959b833185b3063ba881dbfc7030680b314250779fb4cc91" -dependencies = [ - "concurrent-queue", - "parking", - "pin-project-lite", -] - -[[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.0" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "feedafcaa9b749175d5ac357452a9d41ea2911da598fde46ce1fe02c37751291" +checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" dependencies = [ - "event-listener 5.2.0", + "event-listener 5.3.1", "pin-project-lite", ] [[package]] name = "fastrand" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" -dependencies = [ - "instant", -] - -[[package]] -name = "fastrand" -version = "2.0.1" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" +checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" [[package]] name = "fdeflate" @@ -1376,29 +1356,23 @@ dependencies = [ [[package]] name = "fiat-crypto" -version = "0.2.6" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1676f435fc1dadde4d03e43f5d62b259e1ce5f40bd4ffb21db2b42ebe59c1382" +checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d" [[package]] name = "filetime" -version = "0.2.23" +version = "0.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" +checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.4.1", - "windows-sys 0.52.0", + "libredox", + "windows-sys 0.59.0", ] [[package]] -name = "finl_unicode" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fcfdc7a0362c9f4444381a9e697c79d435fe65b52a37466fc2c1184cee9edc6" - -[[package]] name = "fixedbitset" version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1406,12 +1380,12 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flate2" -version = "1.0.28" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253" dependencies = [ "crc32fast", - "miniz_oxide", + "miniz_oxide 0.8.0", ] [[package]] @@ -1422,7 +1396,7 @@ checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" dependencies = [ "futures-core", "futures-sink", - "spin 0.9.8", + "spin", ] [[package]] @@ -1449,7 +1423,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.76", ] [[package]] @@ -1533,7 +1507,7 @@ checksum = "1d930c203dd0b6ff06e0201a4a2fe9149b43c684fd4420555b26d21b1a02956f" dependencies = [ "futures-core", "lock_api", - "parking_lot 0.12.1", + "parking_lot 0.12.3", ] [[package]] @@ -1544,26 +1518,11 @@ checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" [[package]] name = "futures-lite" -version = "1.13.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" +checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" dependencies = [ - "fastrand 1.9.0", - "futures-core", - "futures-io", - "memchr", - "parking", - "pin-project-lite", - "waker-fn", -] - -[[package]] -name = "futures-lite" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445ba825b27408685aaecefd65178908c36c6e96aaf6d8599419d46e624192ba" -dependencies = [ - "fastrand 2.0.1", + "fastrand", "futures-core", "futures-io", "parking", @@ -1578,7 +1537,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.76", ] [[package]] @@ -1651,9 +1610,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.12" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "libc", @@ -1662,9 +1621,9 @@ dependencies = [ [[package]] name = "ghash" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d930750de5717d2dd0b8c0d42c076c0e884c81a73e6cab859bbd2339c71e3e40" +checksum = "f0d8a4362ccb29cb0b265253fb0a2728f592895ee6854fd9bc13f2ffda266ff1" dependencies = [ "opaque-debug", "polyval", @@ -1673,9 +1632,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.28.1" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" +checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" [[package]] name = "glob" @@ -1685,18 +1644,17 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "gurk" -version = "0.4.3" +version = "0.5.1" dependencies = [ - "aho-corasick 0.7.20", + "aho-corasick", "anyhow", "arboard", "async-trait", - "base64 0.13.1", + "base64 0.22.1", "chrono", "clap", "criterion", "crossterm", - "derivative", "dirs", "emojis", "futures-channel", @@ -1705,7 +1663,8 @@ dependencies = [ "hostname", "image", "insta", - "itertools 0.10.5", + "itertools 0.12.1", + "libsqlite3-sys", "log-panics", "mime_guess", "notify-rust", @@ -1715,18 +1674,16 @@ dependencies = [ "postcard", "presage", "presage-store-sled", - "prost 0.10.4", + "prost", "qr2term", "quickcheck", "quickcheck_macros", "ratatui", "rayon", "regex", - "regex-automata 0.1.10", "scopeguard", "serde", "serde_json", - "sha2", "sqlx", "tempfile", "textwrap", @@ -1739,34 +1696,35 @@ dependencies = [ "tracing-appender", "tracing-subscriber", "unicode-width", + "url", "uuid", "whoami", ] [[package]] name = "h2" -version = "0.3.24" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9" +checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" dependencies = [ "bytes", "fnv", "futures-core", "futures-sink", "futures-util", - "http 0.2.11", + "http 0.2.12", "indexmap", "slab", "tokio", - "tokio-util 0.7.10", + "tokio-util 0.7.11", "tracing", ] [[package]] name = "half" -version = "2.4.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5eceaaeec696539ddaf7b333340f1af35a5aa87ae3e4f3ead0532f72affab2e" +checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888" dependencies = [ "cfg-if", "crunchy", @@ -1783,9 +1741,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.14.3" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" dependencies = [ "ahash", "allocator-api2", @@ -1809,7 +1767,7 @@ dependencies = [ "base64 0.21.7", "bytes", "headers-core", - "http 0.2.11", + "http 0.2.12", "httpdate", "mime", "sha1", @@ -1821,7 +1779,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429" dependencies = [ - "http 0.2.11", + "http 0.2.12", ] [[package]] @@ -1834,7 +1792,7 @@ dependencies = [ "hash32", "rustc_version", "serde", - "spin 0.9.8", + "spin", "stable_deref_trait", ] @@ -1848,12 +1806,24 @@ dependencies = [ ] [[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 = "hermit-abi" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" + +[[package]] name = "hex" version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1894,20 +1864,20 @@ dependencies = [ [[package]] name = "hostname" -version = "0.3.1" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867" +checksum = "f9c7c7c8ac16c798734b8a24560c1362120597c40d5e1459f09498f8f6c8f2ba" dependencies = [ + "cfg-if", "libc", - "match_cfg", - "winapi", + "windows 0.52.0", ] [[package]] name = "http" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" +checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" dependencies = [ "bytes", "fnv", @@ -1916,9 +1886,9 @@ dependencies = [ [[package]] name = "http" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b32afd38673a8016f7c9ae69e5af41a58f81b1d31689040f2f1959594ce194ea" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" dependencies = [ "bytes", "fnv", @@ -1932,15 +1902,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" dependencies = [ "bytes", - "http 0.2.11", + "http 0.2.12", "pin-project-lite", ] [[package]] name = "httparse" -version = "1.8.0" +version = "1.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" +checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" [[package]] name = "httpdate" @@ -1950,22 +1920,22 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "hyper" -version = "0.14.28" +version = "0.14.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" +checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9" dependencies = [ "bytes", "futures-channel", "futures-core", "futures-util", "h2", - "http 0.2.11", + "http 0.2.12", "http-body", "httparse", "httpdate", "itoa", "pin-project-lite", - "socket2 0.5.6", + "socket2", "tokio", "tower-service", "tracing", @@ -1979,10 +1949,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "399c78f9338483cb7e630c8474b07268983c6bd5acee012e4211f9f7bb21b070" dependencies = [ "futures-util", - "http 0.2.11", + "http 0.2.12", "hyper", "log", - "rustls 0.22.2", + "rustls 0.22.4", "rustls-native-certs", "rustls-pki-types", "tokio", @@ -2036,13 +2006,12 @@ dependencies = [ [[package]] name = "image" -version = "0.24.9" +version = "0.25.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d" +checksum = "99314c8a2152b8ddb211f924cdae532d8c5e4c8bb54728e12fff1b0cd5963a10" dependencies = [ "bytemuck", - "byteorder", - "color_quant", + "byteorder-lite", "num-traits", "png", "tiff", @@ -2050,21 +2019,15 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.2.5" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b0b929d511467233429c45a44ac1dcaa21ba0f5ba11e4879e6ed28ddb4f9df4" +checksum = "93ead53efc7ea8ed3cfb0c79fc8023fbb782a5432b52830b6518941cebe6505c" dependencies = [ "equivalent", "hashbrown", ] [[package]] -name = "indoc" -version = "2.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8" - -[[package]] name = "inout" version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2076,48 +2039,42 @@ dependencies = [ [[package]] name = "insta" -version = "1.35.1" +version = "1.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c985c1bef99cf13c58fade470483d81a2bfe846ebde60ed28cc2dddec2df9e2" +checksum = "810ae6042d48e2c9e9215043563a58a80b877bc863228a74cf10c49d4620a6f5" dependencies = [ "console", "lazy_static", "linked-hash-map", "serde", "similar", - "yaml-rust", ] [[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", ] [[package]] -name = "io-lifetimes" -version = "1.0.11" +name = "is-terminal" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" +checksum = "261f68e344040fbd0edea105bef17c66edf46f984ddb1115b775ce31be948f4b" dependencies = [ - "hermit-abi", + "hermit-abi 0.4.0", "libc", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] -name = "is-terminal" -version = "0.4.12" +name = "is_terminal_polyfill" +version = "1.70.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" -dependencies = [ - "hermit-abi", - "libc", - "windows-sys 0.52.0", -] +checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" [[package]] name = "itertools" @@ -2130,27 +2087,36 @@ dependencies = [ [[package]] name = "itertools" -version = "0.11.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" dependencies = [ "either", ] [[package]] name = "itertools" -version = "0.12.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" dependencies = [ "either", ] [[package]] name = "itoa" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" + +[[package]] +name = "jobserver" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" +dependencies = [ + "libc", +] [[package]] name = "jpeg-decoder" @@ -2160,36 +2126,46 @@ checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" [[package]] name = "js-sys" -version = "0.3.68" +version = "0.3.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "406cda4b368d531c842222cf9d2600a9a4acce8d29423695379c6868a143a9ee" +checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" dependencies = [ "wasm-bindgen", ] [[package]] name = "lazy_static" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" dependencies = [ - "spin 0.5.2", + "spin", ] [[package]] name = "libc" -version = "0.2.153" +version = "0.2.158" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" + +[[package]] +name = "libdbus-sys" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06085512b750d640299b79be4bad3d2fa90a9c00b1fd9e1b46364f66f0485c72" +dependencies = [ + "cc", + "pkg-config", +] [[package]] name = "libloading" -version = "0.8.1" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161" +checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" dependencies = [ "cfg-if", - "windows-sys 0.48.0", + "windows-targets 0.52.6", ] [[package]] @@ -2200,19 +2176,19 @@ checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" [[package]] name = "libredox" -version = "0.0.1" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.6.0", "libc", - "redox_syscall 0.4.1", + "redox_syscall 0.5.3", ] [[package]] name = "libsignal-core" version = "0.1.0" -source = "git+https://github.com/signalapp/libsignal?tag=v0.40.1#f980fccd8ae72fe21dc202d644b358667d60e2b0" +source = "git+https://github.com/signalapp/libsignal?tag=v0.51.1#2e2896fc235efa293213dd5f0aff4b1f8528bab2" dependencies = [ "num_enum", "uuid", @@ -2221,7 +2197,7 @@ dependencies = [ [[package]] name = "libsignal-protocol" version = "0.1.0" -source = "git+https://github.com/signalapp/libsignal?tag=v0.40.1#f980fccd8ae72fe21dc202d644b358667d60e2b0" +source = "git+https://github.com/signalapp/libsignal?tag=v0.51.1#2e2896fc235efa293213dd5f0aff4b1f8528bab2" dependencies = [ "aes", "aes-gcm-siv", @@ -2241,13 +2217,13 @@ dependencies = [ "num_enum", "pqcrypto-kyber", "pqcrypto-traits", - "prost 0.12.3", + "prost", "prost-build", "rand", "rayon", + "serde", "sha2", "signal-crypto", - "static_assertions", "subtle", "thiserror", "uuid", @@ -2257,7 +2233,7 @@ dependencies = [ [[package]] name = "libsignal-service" version = "0.1.0" -source = "git+https://github.com/whisperfish/libsignal-service-rs?rev=689a4c2#689a4c23292026f0d7067535988eb4a9e4bdb37a" +source = "git+https://github.com/whisperfish/libsignal-service-rs?rev=86dd9da99b254c2127fb60c366df426d60318097#86dd9da99b254c2127fb60c366df426d60318097" dependencies = [ "aes", "aes-gcm", @@ -2275,7 +2251,7 @@ dependencies = [ "hmac", "libsignal-protocol", "phonenumber", - "prost 0.12.3", + "prost", "prost-build", "rand", "serde", @@ -2292,7 +2268,7 @@ dependencies = [ [[package]] name = "libsignal-service-hyper" version = "0.1.0" -source = "git+https://github.com/whisperfish/libsignal-service-rs?rev=689a4c2#689a4c23292026f0d7067535988eb4a9e4bdb37a" +source = "git+https://github.com/whisperfish/libsignal-service-rs?rev=86dd9da99b254c2127fb60c366df426d60318097#86dd9da99b254c2127fb60c366df426d60318097" dependencies = [ "async-trait", "async-tungstenite", @@ -2304,7 +2280,7 @@ dependencies = [ "hyper-timeout", "libsignal-service", "mpart-async", - "rustls-pemfile 2.1.1", + "rustls-pemfile 2.1.3", "serde", "serde_json", "thiserror", @@ -2322,6 +2298,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf4e226dcd58b4be396f7bd3c20da8fdee2911400705297ba7d2d7cc2c30f716" dependencies = [ "cc", + "openssl-sys", "pkg-config", "vcpkg", ] @@ -2334,21 +2311,15 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[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.13" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "lock_api" -version = "0.4.11" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" dependencies = [ "autocfg", "scopeguard", @@ -2356,9 +2327,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.21" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "log-panics" @@ -2370,6 +2341,15 @@ dependencies = [ ] [[package]] +name = "lru" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37ee39891760e7d94734f6f63fedc29a2e4a152f836120753a72503f09fcf904" +dependencies = [ + "hashbrown", +] + +[[package]] name = "lru-cache" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2401,12 +2381,6 @@ dependencies = [ ] [[package]] -name = "match_cfg" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4" - -[[package]] name = "md-5" version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2418,24 +2392,15 @@ dependencies = [ [[package]] name = "memchr" -version = "2.7.1" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "memoffset" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" -dependencies = [ - "autocfg", -] - -[[package]] -name = "memoffset" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" dependencies = [ "autocfg", ] @@ -2448,9 +2413,9 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] name = "mime_guess" -version = "2.0.4" +version = "2.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" +checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e" dependencies = [ "mime", "unicase", @@ -2464,19 +2429,28 @@ 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", ] [[package]] +name = "miniz_oxide" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" +dependencies = [ + "adler2", +] + +[[package]] name = "mio" -version = "0.8.10" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" dependencies = [ "libc", "log", @@ -2485,6 +2459,18 @@ dependencies = [ ] [[package]] +name = "mio" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" +dependencies = [ + "hermit-abi 0.3.9", + "libc", + "wasi", + "windows-sys 0.52.0", +] + +[[package]] name = "mpart-async" version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2493,7 +2479,7 @@ dependencies = [ "bytes", "futures-core", "futures-util", - "http 0.2.11", + "http 0.2.12", "httparse", "log", "memchr", @@ -2508,32 +2494,33 @@ dependencies = [ [[package]] name = "multimap" -version = "0.8.3" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" +checksum = "defc4c55412d89136f966bbb339008b474350e5e6e78d2714439c386b3137a03" [[package]] name = "nix" -version = "0.26.4" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" +checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", "cfg-if", + "cfg_aliases 0.1.1", "libc", - "memoffset 0.7.1", - "pin-utils", ] [[package]] name = "nix" -version = "0.27.1" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" +checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.6.0", "cfg-if", + "cfg_aliases 0.2.1", "libc", + "memoffset", ] [[package]] @@ -2547,10 +2534,19 @@ dependencies = [ ] [[package]] +name = "normpath" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8911957c4b1549ac0dc74e30db9c8b0e66ddcd6d7acc33098f4c63a64a6d7ed" +dependencies = [ + "windows-sys 0.59.0", +] + +[[package]] name = "notify-rust" -version = "4.10.0" +version = "4.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "827c5edfa80235ded4ab3fe8e9dc619b4f866ef16fe9b1c6b8a7f8692c0f2226" +checksum = "26a1d03b6305ecefdd9c6c60150179bb8d9f0cd4e64bbcad1e41419e7bf5e414" dependencies = [ "log", "mac-notification-sys", @@ -2603,9 +2599,9 @@ dependencies = [ [[package]] name = "num-iter" -version = "0.1.44" +version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d869c01cc0c455284163fd0092f1f93835385ccab5a98a0dcc497b2f8bf055a9" +checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" dependencies = [ "autocfg", "num-integer", @@ -2614,25 +2610,15 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.18" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" +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.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2647,10 +2633,10 @@ version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96667db765a921f7b295ffee8b60472b686a51d4f21c2ee4ffdb94c7013b65a6" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 1.3.1", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.76", ] [[package]] @@ -2674,6 +2660,105 @@ dependencies = [ ] [[package]] +name = "objc-sys" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310" + +[[package]] +name = "objc2" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +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.6.0", + "block2", + "libc", + "objc2", + "objc2-core-data", + "objc2-core-image", + "objc2-foundation", + "objc2-quartz-core", +] + +[[package]] +name = "objc2-core-data" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef" +dependencies = [ + "bitflags 2.6.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-encode" +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.6.0", + "block2", + "libc", + "objc2", +] + +[[package]] +name = "objc2-metal" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6" +dependencies = [ + "bitflags 2.6.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.6.0", + "block2", + "objc2", + "objc2-foundation", + "objc2-metal", +] + +[[package]] name = "objc_id" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2684,9 +2769,9 @@ dependencies = [ [[package]] name = "object" -version = "0.32.2" +version = "0.36.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +checksum = "27b64972346851a39438c60b341ebc01bba47464ae329e55cf343eb93964efd9" dependencies = [ "memchr", ] @@ -2705,9 +2790,9 @@ checksum = "44d11de466f4a3006fe8a5e7ec84e93b79c70cb992ae0aa0eb631ad2df8abfe2" [[package]] name = "oorandom" -version = "11.1.3" +version = "11.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" +checksum = "b410bbe7e14ab526a0e86877eb47c6996a2bd7746f027ba551028c925390e4e9" [[package]] name = "opaque-debug" @@ -2717,12 +2802,14 @@ checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" [[package]] name = "opener" -version = "0.5.2" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "293c15678e37254c15bd2f092314abb4e51d7fdde05c2021279c12631b54f005" +checksum = "d0812e5e4df08da354c851a3376fead46db31c2214f849d3de356d774d057681" dependencies = [ "bstr", - "winapi", + "dbus", + "normpath", + "windows-sys 0.59.0", ] [[package]] @@ -2732,6 +2819,34 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] +name = "openssl-src" +version = "300.3.1+3.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7259953d42a81bf137fbbd73bd30a8e1914d6dce43c2b90ed575783a22608b91" +dependencies = [ + "cc", +] + +[[package]] +name = "openssl-sys" +version = "0.9.103" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" +dependencies = [ + "cc", + "libc", + "openssl-src", + "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 = "ordered-stream" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2743,12 +2858,12 @@ dependencies = [ [[package]] name = "os_pipe" -version = "1.1.5" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57119c3b893986491ec9aa85056780d3a0f3cf4da7cc09dd3650dbd6c6738fb9" +checksum = "5ffd2b0a5634335b135d5728d84c5e0fd726954b87111f7506a61c502280d982" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -2776,12 +2891,12 @@ dependencies = [ [[package]] name = "parking_lot" -version = "0.12.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ "lock_api", - "parking_lot_core 0.9.9", + "parking_lot_core 0.9.10", ] [[package]] @@ -2800,15 +2915,15 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.9" +version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.4.1", + "redox_syscall 0.5.3", "smallvec", - "windows-targets 0.48.5", + "windows-targets 0.52.6", ] [[package]] @@ -2828,14 +2943,14 @@ checksum = "7459127d7a18cb202d418e4b7df1103ffd6d82a106e9b2091c250624c2ace70d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.76", ] [[package]] name = "paste" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "pbkdf2" @@ -2864,9 +2979,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "petgraph" -version = "0.6.4" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" +checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" dependencies = [ "fixedbitset", "indexmap", @@ -2892,50 +3007,50 @@ dependencies = [ [[package]] name = "phonenumber" -version = "0.3.3+8.13.9" +version = "0.3.6+8.13.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "635f3e6288e4f01c049d89332a031bd74f25d64b6fb94703ca966e819488cd06" +checksum = "11756237b57b8cc5e97dc8b1e70ea436324d30e7075de63b14fd15073a8f692a" dependencies = [ "bincode", "either", "fnv", - "itertools 0.11.0", + "itertools 0.12.1", "lazy_static", "nom", - "quick-xml 0.28.2", + "quick-xml 0.31.0", "regex", "regex-cache", "serde", "serde_derive", - "strum 0.24.1", + "strum", "thiserror", ] [[package]] name = "pin-project" -version = "1.1.4" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0302c4a0442c456bd56f841aee5c3bfd17967563f6fadc9ceb9f9c23cf3807e0" +checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.4" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "266c042b60c9c76b8d53061e52b2e0d1116abc57cefc8c5cd671619a56ac3690" +checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.76", ] [[package]] name = "pin-project-lite" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" [[package]] name = "pin-utils" @@ -2945,12 +3060,12 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "piper" -version = "0.2.1" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" +checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066" dependencies = [ "atomic-waker", - "fastrand 2.0.1", + "fastrand", "futures-io", ] @@ -2982,16 +3097,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] -name = "platforms" -version = "3.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "626dec3cac7cc0e1577a2ec3fc496277ec2baa084bebad95bb6fdbfae235f84c" - -[[package]] name = "plotters" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2c224ba00d7cadd4d5c660deaf2098e5e80e07846537c51f9cfa4be50c1fd45" +checksum = "a15b6eccb8484002195a3e44fe65a4ce8e93a625797a063735536fd59cb01cf3" dependencies = [ "num-traits", "plotters-backend", @@ -3002,15 +3111,15 @@ dependencies = [ [[package]] name = "plotters-backend" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e76628b4d3a7581389a35d5b6e2139607ad7c75b17aed325f210aa91f4a9609" +checksum = "414cec62c6634ae900ea1c56128dfe87cf63e7caece0852ec76aba307cebadb7" [[package]] name = "plotters-svg" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38f6d39893cca0701371e3c27294f09797214b86f1fb951b89ade8ec04e2abab" +checksum = "81b30686a7d9c3e010b84284bdd26a29f2138574f52f5eb6f794fc0ad924e705" dependencies = [ "plotters-backend", ] @@ -3025,48 +3134,32 @@ dependencies = [ "crc32fast", "fdeflate", "flate2", - "miniz_oxide", + "miniz_oxide 0.7.4", ] [[package]] name = "poksho" version = "0.7.0" -source = "git+https://github.com/signalapp/libsignal?tag=v0.40.1#f980fccd8ae72fe21dc202d644b358667d60e2b0" +source = "git+https://github.com/signalapp/libsignal?tag=v0.51.1#2e2896fc235efa293213dd5f0aff4b1f8528bab2" dependencies = [ "curve25519-dalek", "hmac", "sha2", - "subtle", ] [[package]] name = "polling" -version = "2.8.0" +version = "3.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" +checksum = "cc2790cd301dec6cd3b7a025e4815cf825724a51c98dccfe6a3e55f05ffb6511" dependencies = [ - "autocfg", - "bitflags 1.3.2", "cfg-if", "concurrent-queue", - "libc", - "log", + "hermit-abi 0.4.0", "pin-project-lite", - "windows-sys 0.48.0", -] - -[[package]] -name = "polling" -version = "3.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24f040dee2588b4963afb4e420540439d126f73fdacf4a9c486a96d840bac3c9" -dependencies = [ - "cfg-if", - "concurrent-queue", - "pin-project-lite", - "rustix 0.38.31", + "rustix", "tracing", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -3082,9 +3175,9 @@ dependencies = [ [[package]] name = "polyval" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52cff9d1d4dee5fe6d03729099f4a310a41179e0a10dbf542039873f2e826fb" +checksum = "9d1fe60d06143b2430aa532c94cfe9e29783047f06c0d7fd359a9a51b729fa25" dependencies = [ "cfg-if", "cpufeatures", @@ -3094,12 +3187,13 @@ dependencies = [ [[package]] name = "postcard" -version = "1.0.8" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a55c51ee6c0db07e68448e336cf8ea4131a620edefebf9893e759b2d793420f8" +checksum = "5f7f0a8d620d71c457dd1d47df76bb18960378da56af4527aaa10f515eee732e" dependencies = [ "cobs", - "embedded-io", + "embedded-io 0.4.0", + "embedded-io 0.6.1", "heapless", "serde", ] @@ -3112,9 +3206,12 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" [[package]] name = "ppv-lite86" -version = "0.2.17" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +dependencies = [ + "zerocopy", +] [[package]] name = "pqcrypto-internals" @@ -3149,8 +3246,8 @@ checksum = "94e851c7654eed9e68d7d27164c454961a616cf8c203d500607ef22c737b51bb" [[package]] name = "presage" -version = "0.6.1" -source = "git+https://github.com/whisperfish/presage?rev=97e2357#97e235721efbc47da0872ab432e401f434b0ee99" +version = "0.6.2" +source = "git+https://github.com/whisperfish/presage?rev=67d98a3cb021dd365a671be067abc69deb71c736#67d98a3cb021dd365a671be067abc69deb71c736" dependencies = [ "base64 0.21.7", "futures", @@ -3170,7 +3267,7 @@ dependencies = [ [[package]] name = "presage-store-cipher" version = "0.1.0" -source = "git+https://github.com/whisperfish/presage?rev=97e2357#97e235721efbc47da0872ab432e401f434b0ee99" +source = "git+https://github.com/whisperfish/presage?rev=67d98a3cb021dd365a671be067abc69deb71c736#67d98a3cb021dd365a671be067abc69deb71c736" dependencies = [ "blake3", "chacha20poly1305", @@ -3187,15 +3284,16 @@ dependencies = [ [[package]] name = "presage-store-sled" version = "0.6.0-dev" -source = "git+https://github.com/whisperfish/presage?rev=97e2357#97e235721efbc47da0872ab432e401f434b0ee99" +source = "git+https://github.com/whisperfish/presage?rev=67d98a3cb021dd365a671be067abc69deb71c736#67d98a3cb021dd365a671be067abc69deb71c736" dependencies = [ "async-trait", "base64 0.21.7", + "chrono", "fs_extra", "log", "presage", "presage-store-cipher", - "prost 0.12.3", + "prost", "prost-build", "quickcheck_macros", "serde", @@ -3207,12 +3305,12 @@ dependencies = [ [[package]] name = "prettyplease" -version = "0.2.16" +version = "0.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a41cf62165e97c7f814d2221421dbb9afcbcdb0a88068e5ea206e19951c2cbb5" +checksum = "479cf940fbbb3426c32c5d5176f62ad57549a0bb84773423ba8be9d089f5faba" dependencies = [ "proc-macro2", - "syn 2.0.52", + "syn 2.0.76", ] [[package]] @@ -3222,108 +3320,100 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" dependencies = [ "once_cell", - "toml_edit", + "toml_edit 0.19.15", ] [[package]] -name = "proc-macro2" -version = "1.0.78" +name = "proc-macro-crate" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" +checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b" dependencies = [ - "unicode-ident", + "toml_edit 0.22.20", ] [[package]] -name = "prost" -version = "0.10.4" +name = "proc-macro2" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71adf41db68aa0daaefc69bb30bcd68ded9b9abaad5d1fbb6304c4fb390e083e" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ - "bytes", - "prost-derive 0.10.1", + "unicode-ident", ] [[package]] name = "prost" -version = "0.12.3" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "146c289cda302b98a28d40c8b3b90498d6e526dd24ac2ecea73e4e491685b94a" +checksum = "deb1435c188b76130da55f17a466d252ff7b1418b2ad3e037d127b94e3411f29" dependencies = [ "bytes", - "prost-derive 0.12.3", + "prost-derive", ] [[package]] name = "prost-build" -version = "0.12.3" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c55e02e35260070b6f716a2423c2ff1c3bb1642ddca6f99e1f26d06268a0e2d2" +checksum = "22505a5c94da8e3b7c2996394d1c933236c4d743e81a410bcca4e6989fc066a4" dependencies = [ "bytes", - "heck", - "itertools 0.11.0", + "heck 0.5.0", + "itertools 0.12.1", "log", "multimap", "once_cell", "petgraph", "prettyplease", - "prost 0.12.3", + "prost", "prost-types", "regex", - "syn 2.0.52", + "syn 2.0.76", "tempfile", - "which", -] - -[[package]] -name = "prost-derive" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b670f45da57fb8542ebdbb6105a925fe571b67f9e7ed9f47a06a84e72b4e7cc" -dependencies = [ - "anyhow", - "itertools 0.10.5", - "proc-macro2", - "quote", - "syn 1.0.109", ] [[package]] name = "prost-derive" -version = "0.12.3" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efb6c9a1dd1def8e2124d17e83a20af56f1570d6c2d2bd9e266ccb768df3840e" +checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1" dependencies = [ "anyhow", - "itertools 0.11.0", + "itertools 0.12.1", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.76", ] [[package]] name = "prost-types" -version = "0.12.3" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "193898f59edcf43c26227dcd4c8427f00d99d61e95dcde58dabd49fa291d470e" +checksum = "9091c90b0a32608e984ff2fa4091273cbdd755d54935c51d520887f4a1dbd5b0" dependencies = [ - "prost 0.12.3", + "prost", ] [[package]] name = "pulldown-cmark" -version = "0.9.6" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57206b407293d2bcd3af849ce869d52068623f19e1b5ff8e8778e3309439682b" +checksum = "cb4e75767fbc9d92b90e4d0c011f61358cde9513b31ef07ea3631b15ffc3b4fd" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.6.0", "getopts", "memchr", + "pulldown-cmark-escape", "unicase", ] [[package]] +name = "pulldown-cmark-escape" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "007d8adb5ddab6f8e3f491ac63566a7d5002cc7ed73901f72057943fa71ae1ae" + +[[package]] name = "qr2term" version = "0.3.1" source = "git+https://github.com/boxdot/qr2term-rs?rev=ed8ae7f#ed8ae7fe3a115578820fd54955f8aac8e4df374a" @@ -3343,27 +3433,18 @@ dependencies = [ [[package]] name = "quick-xml" -version = "0.28.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ce5e73202a820a31f8a0ee32ada5e21029c81fd9e3ebf668a40832e4219d9d1" -dependencies = [ - "memchr", -] - -[[package]] -name = "quick-xml" -version = "0.30.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eff6510e86862b57b210fd8cbe8ed3f0d7d600b9c2863cd4549a2e033c66e956" +checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" dependencies = [ "memchr", ] [[package]] name = "quick-xml" -version = "0.31.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" +checksum = "6f24d770aeca0eacb81ac29dfbc55ebcc09312fdd1f8bbecdc7e4a84e000e3b4" dependencies = [ "memchr", ] @@ -3392,9 +3473,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.35" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" dependencies = [ "proc-macro2", ] @@ -3431,26 +3512,29 @@ dependencies = [ [[package]] name = "ratatui" -version = "0.23.0" +version = "0.26.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e2e4cd95294a85c3b4446e63ef054eea43e0205b1fd60120c16b74ff7ff96ad" +checksum = "f44c9e68fd46eda15c646fbb85e1040b657a58cdc8c98db1d97a55930d991eef" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.6.0", "cassowary", + "compact_str", "crossterm", - "indoc", - "itertools 0.11.0", + "itertools 0.12.1", + "lru", "paste", - "strum 0.25.0", + "stability", + "strum", "unicode-segmentation", + "unicode-truncate", "unicode-width", ] [[package]] name = "rayon" -version = "1.9.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4963ed1bc86e4f3ee217022bd855b297cef07fb9eac5dfa1f788b220b49b3bd" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" dependencies = [ "either", "rayon-core", @@ -3485,10 +3569,19 @@ dependencies = [ ] [[package]] +name = "redox_syscall" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" +dependencies = [ + "bitflags 2.6.0", +] + +[[package]] name = "redox_users" -version = "0.4.4" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" +checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" dependencies = [ "getrandom", "libredox", @@ -3497,34 +3590,25 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.3" +version = "1.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" +checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" dependencies = [ - "aho-corasick 1.1.2", + "aho-corasick", "memchr", - "regex-automata 0.4.5", - "regex-syntax 0.8.2", -] - -[[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", + "regex-automata", + "regex-syntax 0.8.4", ] [[package]] name = "regex-automata" -version = "0.4.5" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd" +checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" dependencies = [ - "aho-corasick 1.1.2", + "aho-corasick", "memchr", - "regex-syntax 0.8.2", + "regex-syntax 0.8.4", ] [[package]] @@ -3547,9 +3631,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.8.2" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" [[package]] name = "ring" @@ -3561,7 +3645,7 @@ dependencies = [ "cfg-if", "getrandom", "libc", - "spin 0.9.8", + "spin", "untrusted", "windows-sys 0.52.0", ] @@ -3588,9 +3672,9 @@ dependencies = [ [[package]] name = "rustc-demangle" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustc_version" @@ -3603,36 +3687,22 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.27" +version = "0.38.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" +checksum = "a85d50532239da68e9addb745ba38ff4612a242c1c7ceea689c4bc7c2f43c36f" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", "errno", - "io-lifetimes", "libc", - "linux-raw-sys 0.3.8", - "windows-sys 0.48.0", -] - -[[package]] -name = "rustix" -version = "0.38.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" -dependencies = [ - "bitflags 2.4.2", - "errno", - "libc", - "linux-raw-sys 0.4.13", + "linux-raw-sys", "windows-sys 0.52.0", ] [[package]] name = "rustls" -version = "0.21.10" +version = "0.21.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" +checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" dependencies = [ "ring", "rustls-webpki 0.101.7", @@ -3641,26 +3711,26 @@ dependencies = [ [[package]] name = "rustls" -version = "0.22.2" +version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e87c9956bd9807afa1f77e0f7594af32566e830e088a5576d27c5b6f30f49d41" +checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" dependencies = [ "log", "ring", "rustls-pki-types", - "rustls-webpki 0.102.2", + "rustls-webpki 0.102.7", "subtle", "zeroize", ] [[package]] name = "rustls-native-certs" -version = "0.7.0" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f1fb85efa936c42c6d5fc28d2629bb51e4b2f4b8a5211e297d599cc5a093792" +checksum = "04182dffc9091a404e0fc069ea5cd60e5b866c3adf881eff99a32d048242dffa" dependencies = [ "openssl-probe", - "rustls-pemfile 2.1.1", + "rustls-pemfile 2.1.3", "rustls-pki-types", "schannel", "security-framework", @@ -3677,19 +3747,19 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "2.1.1" +version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f48172685e6ff52a556baa527774f61fcaa884f59daf3375c62a3f1cd2549dab" +checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425" dependencies = [ - "base64 0.21.7", + "base64 0.22.1", "rustls-pki-types", ] [[package]] name = "rustls-pki-types" -version = "1.3.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ede67b28608b4c60685c7d54122d4400d90f62b40caee7700e700380a390fa8" +checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0" [[package]] name = "rustls-webpki" @@ -3703,9 +3773,9 @@ dependencies = [ [[package]] name = "rustls-webpki" -version = "0.102.2" +version = "0.102.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "faaa0a62740bedb9b2ef5afa303da42764c012f743917351dc9a237ea1663610" +checksum = "84678086bd54edf2b415183ed7a94d0efb049f1b646a33e22a36f3794be6ae56" dependencies = [ "ring", "rustls-pki-types", @@ -3714,15 +3784,15 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.14" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" +checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" [[package]] name = "ryu" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "same-file" @@ -3766,11 +3836,11 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.9.2" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" +checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", "core-foundation", "core-foundation-sys", "libc", @@ -3779,9 +3849,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.9.1" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" +checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf" dependencies = [ "core-foundation-sys", "libc", @@ -3789,50 +3859,60 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.22" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.197" +version = "1.0.209" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.197" +version = "1.0.209" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" +checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.76", ] [[package]] name = "serde_json" -version = "1.0.114" +version = "1.0.127" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" +checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad" dependencies = [ "itoa", + "memchr", "ryu", "serde", ] [[package]] name = "serde_repr" -version = "0.1.18" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb" +checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.76", +] + +[[package]] +name = "serde_spanned" +version = "0.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" +dependencies = [ + "serde", ] [[package]] @@ -3867,9 +3947,15 @@ dependencies = [ ] [[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + +[[package]] name = "signal-crypto" version = "0.1.0" -source = "git+https://github.com/signalapp/libsignal?tag=v0.40.1#f980fccd8ae72fe21dc202d644b358667d60e2b0" +source = "git+https://github.com/signalapp/libsignal?tag=v0.51.1#2e2896fc235efa293213dd5f0aff4b1f8528bab2" dependencies = [ "aes", "cbc", @@ -3895,20 +3981,20 @@ dependencies = [ [[package]] name = "signal-hook-mio" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af" +checksum = "34db1a06d485c9142248b7a054f034b349b212551f3dfd19c94d45a754a217cd" dependencies = [ "libc", - "mio", + "mio 0.8.11", "signal-hook", ] [[package]] name = "signal-hook-registry" -version = "1.4.1" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" dependencies = [ "libc", ] @@ -3931,9 +4017,9 @@ checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" [[package]] name = "similar" -version = "2.4.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32fea41aca09ee824cc9724996433064c89f7777e60762749a4170a14abbfa21" +checksum = "1de1d4f81173b03af4c0cbed3c898f6bff5b870e4a7f5d6f4057d62a7a4b686e" [[package]] name = "siphasher" @@ -3968,9 +4054,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.13.1" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "smawk" @@ -3980,19 +4066,9 @@ checksum = "b7c388c1b5e93756d0c740965c41e8822f866621d41acbdf6336a6a168f8840c" [[package]] name = "socket2" -version = "0.4.10" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "socket2" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" dependencies = [ "libc", "windows-sys 0.52.0", @@ -4000,12 +4076,6 @@ dependencies = [ [[package]] name = "spin" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" - -[[package]] -name = "spin" version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" @@ -4025,20 +4095,19 @@ dependencies = [ [[package]] name = "sqlformat" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce81b7bd7c4493975347ef60d8c7e8b742d4694f4c49f93e0a12ea263938176c" +checksum = "f895e3734318cc55f1fe66258926c9b910c124d47520339efecbb6c59cec7c1f" dependencies = [ - "itertools 0.12.1", "nom", "unicode_categories", ] [[package]] name = "sqlx" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dba03c279da73694ef99763320dea58b51095dfe87d001b1d4b5fe78ba8763cf" +checksum = "c9a2ccff1a000a5a59cd33da541d9f2fdcd9e6e8229cc200565942bff36d0aaa" dependencies = [ "sqlx-core", "sqlx-macros", @@ -4049,9 +4118,9 @@ dependencies = [ [[package]] name = "sqlx-core" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d84b0a3c3739e220d94b3239fd69fb1f74bc36e16643423bd99de3b43c21bfbd" +checksum = "24ba59a9342a3d9bab6c56c118be528b27c9b60e490080e9711a04dccac83ef6" dependencies = [ "ahash", "atoi", @@ -4060,7 +4129,6 @@ dependencies = [ "chrono", "crc", "crossbeam-queue", - "dotenvy", "either", "event-listener 2.5.3", "futures-channel", @@ -4076,7 +4144,7 @@ dependencies = [ "once_cell", "paste", "percent-encoding", - "rustls 0.21.10", + "rustls 0.21.12", "rustls-pemfile 1.0.4", "serde", "serde_json", @@ -4094,9 +4162,9 @@ dependencies = [ [[package]] name = "sqlx-macros" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89961c00dc4d7dffb7aee214964b065072bff69e36ddb9e2c107541f75e4f2a5" +checksum = "4ea40e2345eb2faa9e1e5e326db8c34711317d2b5e08d0d5741619048a803127" dependencies = [ "proc-macro2", "quote", @@ -4107,14 +4175,13 @@ dependencies = [ [[package]] name = "sqlx-macros-core" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0bd4519486723648186a08785143599760f7cc81c52334a55d6a83ea1e20841" +checksum = "5833ef53aaa16d860e92123292f1f6a3d53c34ba8b1969f152ef1a7bb803f3c8" dependencies = [ - "atomic-write-file", "dotenvy", "either", - "heck", + "heck 0.4.1", "hex", "once_cell", "proc-macro2", @@ -4134,13 +4201,13 @@ dependencies = [ [[package]] name = "sqlx-mysql" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e37195395df71fd068f6e2082247891bc11e3289624bbc776a0cdfa1ca7f1ea4" +checksum = "1ed31390216d20e538e447a7a9b959e06ed9fc51c37b514b46eb758016ecd418" dependencies = [ "atoi", "base64 0.21.7", - "bitflags 2.4.2", + "bitflags 2.6.0", "byteorder", "bytes", "chrono", @@ -4178,13 +4245,13 @@ dependencies = [ [[package]] name = "sqlx-postgres" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6ac0ac3b7ccd10cc96c7ab29791a7dd236bd94021f31eec7ba3d46a74aa1c24" +checksum = "7c824eb80b894f926f89a0b9da0c7f435d27cdd35b8c655b114e58223918577e" dependencies = [ "atoi", "base64 0.21.7", - "bitflags 2.4.2", + "bitflags 2.6.0", "byteorder", "chrono", "crc", @@ -4206,7 +4273,6 @@ dependencies = [ "rand", "serde", "serde_json", - "sha1", "sha2", "smallvec", "sqlx-core", @@ -4219,9 +4285,9 @@ dependencies = [ [[package]] name = "sqlx-sqlite" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "210976b7d948c7ba9fced8ca835b11cbb2d677c59c79de41ac0d397e14547490" +checksum = "b244ef0a8414da0bed4bb1910426e890b19e5e9bccc27ada6b797d05c55ae0aa" dependencies = [ "atoi", "chrono", @@ -4243,6 +4309,16 @@ dependencies = [ ] [[package]] +name = "stability" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d904e7009df136af5297832a3ace3370cd14ff1546a232f4f185036c2736fcac" +dependencies = [ + "quote", + "syn 2.0.76", +] + +[[package]] name = "stable_deref_trait" version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4256,70 +4332,48 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "stringprep" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb41d74e231a107a1b4ee36bd1214b11285b77768d2e3824aedafa988fd36ee6" +checksum = "7b4df3d392d81bd458a8a621b8bffbd2302a12ffe288a9d931670948749463b1" dependencies = [ - "finl_unicode", "unicode-bidi", "unicode-normalization", + "unicode-properties", ] [[package]] name = "strsim" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "strum" -version = "0.24.1" +version = "0.26.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f" +checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" dependencies = [ - "strum_macros 0.24.3", -] - -[[package]] -name = "strum" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" -dependencies = [ - "strum_macros 0.25.3", + "strum_macros", ] [[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 = "strum_macros" -version = "0.25.3" +version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" +checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" dependencies = [ - "heck", + "heck 0.5.0", "proc-macro2", "quote", "rustversion", - "syn 2.0.52", + "syn 2.0.76", ] [[package]] name = "subtle" -version = "2.5.0" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "syn" @@ -4334,9 +4388,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.52" +version = "2.0.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b699d15b36d1f02c3e7c69f8ffef53de37aefae075d8488d4ba1a7788d574a07" +checksum = "578e081a14e0cefc3279b0472138c513f37b41a08d5a3cca9b6e4e8ceb6cd525" dependencies = [ "proc-macro2", "quote", @@ -4345,9 +4399,9 @@ dependencies = [ [[package]] name = "tar" -version = "0.4.40" +version = "0.4.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb" +checksum = "cb797dad5fb5b76fcf519e702f4a589483b5ef06567f160c392832c1f5e44909" dependencies = [ "filetime", "libc", @@ -4356,24 +4410,26 @@ dependencies = [ [[package]] name = "tauri-winrt-notification" -version = "0.1.3" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "006851c9ccefa3c38a7646b8cec804bb429def3da10497bfa977179869c3e8e2" +checksum = "f89f5fb70d6f62381f5d9b2ba9008196150b40b75f3068eb24faeddf1c686871" dependencies = [ - "quick-xml 0.30.0", - "windows", + "quick-xml 0.31.0", + "windows 0.56.0", + "windows-version", ] [[package]] name = "tempfile" -version = "3.10.1" +version = "3.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" dependencies = [ "cfg-if", - "fastrand 2.0.1", - "rustix 0.38.31", - "windows-sys 0.52.0", + "fastrand", + "once_cell", + "rustix", + "windows-sys 0.59.0", ] [[package]] @@ -4389,22 +4445,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.57" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.57" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.76", ] [[package]] @@ -4430,9 +4486,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.34" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ "deranged", "itoa", @@ -4451,9 +4507,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.17" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" dependencies = [ "num-conv", "time-core", @@ -4471,9 +4527,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.6.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" dependencies = [ "tinyvec_macros", ] @@ -4486,19 +4542,18 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.36.0" +version = "1.39.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931" +checksum = "9babc99b9923bfa4804bd74722ff02c0381021eafa4db9949217e3be8e84fff5" dependencies = [ "backtrace", "bytes", "libc", - "mio", - "num_cpus", + "mio 1.0.2", "pin-project-lite", - "socket2 0.5.6", + "socket2", "tokio-macros", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -4513,13 +4568,13 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.2.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" +checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.76", ] [[package]] @@ -4528,16 +4583,16 @@ version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" dependencies = [ - "rustls 0.22.2", + "rustls 0.22.4", "rustls-pki-types", "tokio", ] [[package]] name = "tokio-stream" -version = "0.1.14" +version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" +checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" dependencies = [ "futures-core", "pin-project-lite", @@ -4560,32 +4615,37 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.10" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" +checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" dependencies = [ "bytes", "futures-core", "futures-sink", "pin-project-lite", "tokio", - "tracing", ] [[package]] name = "toml" -version = "0.5.11" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" +checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" dependencies = [ "serde", + "serde_spanned", + "toml_datetime", + "toml_edit 0.22.20", ] [[package]] name = "toml_datetime" -version = "0.6.5" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" +dependencies = [ + "serde", +] [[package]] name = "toml_edit" @@ -4595,14 +4655,27 @@ checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ "indexmap", "toml_datetime", - "winnow", + "winnow 0.5.40", +] + +[[package]] +name = "toml_edit" +version = "0.22.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d" +dependencies = [ + "indexmap", + "serde", + "serde_spanned", + "toml_datetime", + "winnow 0.6.18", ] [[package]] name = "tower-service" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tracing" @@ -4636,7 +4709,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.76", ] [[package]] @@ -4686,13 +4759,13 @@ dependencies = [ [[package]] name = "tree_magic_mini" -version = "3.0.3" +version = "3.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91adfd0607cacf6e4babdb870e9bec4037c1c4b151cfd279ccefc5e0c7feaa6d" +checksum = "469a727cac55b41448315cc10427c069c618ac59bb6a4480283fcd811749bdc2" dependencies = [ - "bytecount", "fnv", - "lazy_static", + "home", + "memchr", "nom", "once_cell", "petgraph", @@ -4713,11 +4786,11 @@ dependencies = [ "byteorder", "bytes", "data-encoding", - "http 1.0.0", + "http 1.1.0", "httparse", "log", "rand", - "rustls 0.22.2", + "rustls 0.22.4", "rustls-pki-types", "sha1", "thiserror", @@ -4737,7 +4810,7 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9" dependencies = [ - "memoffset 0.9.0", + "memoffset", "tempfile", "winapi", ] @@ -4779,16 +4852,33 @@ dependencies = [ ] [[package]] +name = "unicode-properties" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52ea75f83c0137a9b98608359a5f1af8144876eb67bcb1ce837368e906a9f524" + +[[package]] name = "unicode-segmentation" version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" [[package]] +name = "unicode-truncate" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3644627a5af5fa321c95b9b235a72fd24cd29c648c2c379431e6628655627bf" +dependencies = [ + "itertools 0.13.0", + "unicode-segmentation", + "unicode-width", +] + +[[package]] name = "unicode-width" -version = "0.1.11" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" +checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" [[package]] name = "unicode_categories" @@ -4814,9 +4904,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[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", @@ -4838,15 +4928,15 @@ checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" [[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 = "uuid" -version = "1.7.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a" +checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" dependencies = [ "getrandom", "serde", @@ -4866,21 +4956,15 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" [[package]] name = "version_check" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "waker-fn" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" [[package]] name = "walkdir" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" dependencies = [ "same-file", "winapi-util", @@ -4902,35 +4986,42 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] +name = "wasite" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b" + +[[package]] name = "wasm-bindgen" -version = "0.2.91" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1e124130aee3fb58c5bdd6b639a0509486b0338acaaae0c84a5124b0f588b7f" +checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" dependencies = [ "cfg-if", + "once_cell", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.91" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9e7e1900c352b609c8488ad12639a311045f40a35491fb69ba8c12f758af70b" +checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.76", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.91" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b30af9e2d358182b5c7449424f017eba305ed32a7010509ede96cdc4696c46ed" +checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -4938,32 +5029,32 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.91" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "642f325be6301eb8107a83d12a8ac6c1e1c54345a7ef1a9261962dfefda09e66" +checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.76", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.91" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f186bd2dcf04330886ce82d6f33dd75a7bfcf69ecf5763b89fcde53b6ac9838" +checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" [[package]] name = "wayland-backend" -version = "0.3.3" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d50fa61ce90d76474c87f5fc002828d81b32677340112b4ef08079a9d459a40" +checksum = "f90e11ce2ca99c97b940ee83edbae9da2d56a08f9ea8158550fd77fa31722993" dependencies = [ "cc", "downcast-rs", - "rustix 0.38.31", + "rustix", "scoped-tls", "smallvec", "wayland-sys", @@ -4971,12 +5062,12 @@ dependencies = [ [[package]] name = "wayland-client" -version = "0.31.2" +version = "0.31.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82fb96ee935c2cea6668ccb470fb7771f6215d1691746c2d896b447a00ad3f1f" +checksum = "7e321577a0a165911bdcfb39cf029302479d7527b517ee58ab0f6ad09edf0943" dependencies = [ - "bitflags 2.4.2", - "rustix 0.38.31", + "bitflags 2.6.0", + "rustix", "wayland-backend", "wayland-scanner", ] @@ -4987,7 +5078,7 @@ version = "0.31.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f81f365b8b4a97f422ac0e8737c438024b5951734506b0e1d775c73030561f4" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.6.0", "wayland-backend", "wayland-client", "wayland-scanner", @@ -4999,7 +5090,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.6.0", "wayland-backend", "wayland-client", "wayland-protocols", @@ -5008,20 +5099,20 @@ dependencies = [ [[package]] name = "wayland-scanner" -version = "0.31.1" +version = "0.31.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63b3a62929287001986fb58c789dce9b67604a397c15c611ad9f747300b6c283" +checksum = "d7b56f89937f1cf2ee1f1259cf2936a17a1f45d8f0aa1019fae6d470d304cfa6" dependencies = [ "proc-macro2", - "quick-xml 0.31.0", + "quick-xml 0.34.0", "quote", ] [[package]] name = "wayland-sys" -version = "0.31.1" +version = "0.31.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15a0c8eaff5216d07f226cb7a549159267f3467b289d9a2e52fd3ef5aae2b7af" +checksum = "43676fe2daf68754ecf1d72026e4e6c15483198b5d24e888b74d3f22f887a148" dependencies = [ "dlib", "log", @@ -5030,9 +5121,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.68" +version = "0.3.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96565907687f7aceb35bc5fc03770a8a0471d82e479f25832f54a0e3f4b28446" +checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" dependencies = [ "js-sys", "wasm-bindgen", @@ -5051,24 +5142,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" [[package]] -name = "which" -version = "4.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" -dependencies = [ - "either", - "home", - "once_cell", - "rustix 0.38.31", -] - -[[package]] name = "whoami" -version = "1.4.1" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22fc3756b8a9133049b26c7f61ab35416c130e8c09b660f5b3958b446f52cc50" +checksum = "a44ab49fad634e88f55bf8f9bb3abd2f27d7204172a112c7c9987e01c1c94ea9" dependencies = [ - "wasm-bindgen", + "redox_syscall 0.4.1", + "wasite", "web-sys", ] @@ -5090,11 +5170,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.6" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "winapi", + "windows-sys 0.59.0", ] [[package]] @@ -5105,21 +5185,22 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows" -version = "0.51.1" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9" +checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" dependencies = [ - "windows-core 0.51.1", - "windows-targets 0.48.5", + "windows-core 0.52.0", + "windows-targets 0.52.6", ] [[package]] -name = "windows-core" -version = "0.51.1" +name = "windows" +version = "0.56.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" +checksum = "1de69df01bdf1ead2f4ac895dc77c9351aefff65b2f3db429a343f9cbf05e132" dependencies = [ - "windows-targets 0.48.5", + "windows-core 0.56.0", + "windows-targets 0.52.6", ] [[package]] @@ -5128,7 +5209,50 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.4", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-core" +version = "0.56.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4698e52ed2d08f8658ab0c39512a7c00ee5fe2688c65f8c0a4f06750d729f2a6" +dependencies = [ + "windows-implement", + "windows-interface", + "windows-result", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-implement" +version = "0.56.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6fc35f58ecd95a9b71c4f2329b911016e6bec66b3f2e6a4aad86bd2e99e2f9b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.76", +] + +[[package]] +name = "windows-interface" +version = "0.56.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08990546bf4edef8f431fa6326e032865f27138718c587dc21bc0265bbcb57cc" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.76", +] + +[[package]] +name = "windows-result" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8" +dependencies = [ + "windows-targets 0.52.6", ] [[package]] @@ -5146,7 +5270,16 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.4", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", ] [[package]] @@ -5166,17 +5299,27 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.4", - "windows_aarch64_msvc 0.52.4", - "windows_i686_gnu 0.52.4", - "windows_i686_msvc 0.52.4", - "windows_x86_64_gnu 0.52.4", - "windows_x86_64_gnullvm 0.52.4", - "windows_x86_64_msvc 0.52.4", + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", +] + +[[package]] +name = "windows-version" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6998aa457c9ba8ff2fb9f13e9d2a930dabcea28f1d0ab94d687d8b3654844515" +dependencies = [ + "windows-targets 0.52.6", ] [[package]] @@ -5187,9 +5330,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" @@ -5199,9 +5342,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" @@ -5211,9 +5354,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.4" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" @@ -5223,9 +5372,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" @@ -5235,9 +5384,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" @@ -5247,9 +5396,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" @@ -5259,9 +5408,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" @@ -5273,15 +5422,24 @@ dependencies = [ ] [[package]] +name = "winnow" +version = "0.6.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f" +dependencies = [ + "memchr", +] + +[[package]] name = "wl-clipboard-rs" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57af79e973eadf08627115c73847392e6b766856ab8e3844a59245354b23d2fa" +checksum = "12b41773911497b18ca8553c3daaf8ec9fe9819caf93d451d3055f69de028adb" dependencies = [ "derive-new", "libc", "log", - "nix 0.26.4", + "nix 0.28.0", "os_pipe", "tempfile", "thiserror", @@ -5294,20 +5452,20 @@ dependencies = [ [[package]] name = "x11rb" -version = "0.13.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8f25ead8c7e4cba123243a6367da5d3990e0d3affa708ea19dce96356bd9f1a" +checksum = "5d91ffca73ee7f68ce055750bf9f6eca0780b8c85eff9bc046a3b0da41755e12" dependencies = [ "gethostname", - "rustix 0.38.31", + "rustix", "x11rb-protocol", ] [[package]] name = "x11rb-protocol" -version = "0.13.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e63e71c4b8bd9ffec2c963173a4dc4cbde9ee96961d4fcb4429db9929b606c34" +checksum = "ec107c4503ea0b4a98ef47356329af139c0a4f7750e621cf2973cd3385ebcb3d" [[package]] name = "x25519-dalek" @@ -5328,18 +5486,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" dependencies = [ "libc", - "linux-raw-sys 0.4.13", - "rustix 0.38.31", + "linux-raw-sys", + "rustix", ] [[package]] name = "xdg-home" -version = "1.1.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21e5a325c3cb8398ad6cf859c1135b25dd29e186679cf2da7581d9679f63b38e" +checksum = "ec1cdab258fb55c0da61328dc52c8764709b249011b2cad0454c72f0bf10a1f6" dependencies = [ "libc", - "winapi", + "windows-sys 0.59.0", ] [[package]] @@ -5359,18 +5517,18 @@ checksum = "672423d4fea7ffa2f6c25ba60031ea13dc6258070556f125cc4d790007d4a155" [[package]] name = "xshell" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce2107fe03e558353b4c71ad7626d58ed82efaf56c54134228608893c77023ad" +checksum = "6db0ab86eae739efd1b054a8d3d16041914030ac4e01cd1dca0cf252fd8b6437" dependencies = [ "xshell-macros", ] [[package]] name = "xshell-macros" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e2c411759b501fb9501aac2b1b2d287a6e93e5bdcf13c25306b23e1b716dd0e" +checksum = "9d422e8e38ec76e2f06ee439ccc765e9c6a9638b9e7c9f2e8255e4d41e8bd852" [[package]] name = "xtask" @@ -5386,40 +5544,28 @@ dependencies = [ ] [[package]] -name = "yaml-rust" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" -dependencies = [ - "linked-hash-map", -] - -[[package]] name = "zbus" -version = "3.15.2" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "675d170b632a6ad49804c8cf2105d7c31eddd3312555cffd4b740e08e97c25e6" +checksum = "bb97012beadd29e654708a0fdb4c84bc046f537aecfde2c3ee0a9e4b4d48c725" dependencies = [ "async-broadcast", "async-executor", "async-fs", - "async-io 1.13.0", - "async-lock 2.8.0", + "async-io", + "async-lock", "async-process", "async-recursion", "async-task", "async-trait", "blocking", - "byteorder", - "derivative", "enumflags2", - "event-listener 2.5.3", + "event-listener 5.3.1", "futures-core", "futures-sink", "futures-util", "hex", - "nix 0.26.4", - "once_cell", + "nix 0.29.0", "ordered-stream", "rand", "serde", @@ -5428,7 +5574,7 @@ dependencies = [ "static_assertions", "tracing", "uds_windows", - "winapi", + "windows-sys 0.52.0", "xdg-home", "zbus_macros", "zbus_names", @@ -5437,23 +5583,22 @@ dependencies = [ [[package]] name = "zbus_macros" -version = "3.15.2" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7131497b0f887e8061b430c530240063d33bf9455fa34438f388a245da69e0a5" +checksum = "267db9407081e90bbfa46d841d3cbc60f59c0351838c4bc65199ecd79ab1983e" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 3.2.0", "proc-macro2", "quote", - "regex", - "syn 1.0.109", + "syn 2.0.76", "zvariant_utils", ] [[package]] name = "zbus_names" -version = "2.6.1" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "437d738d3750bed6ca9b8d423ccc7a8eb284f6b1d6d4e225a0e4e6258d864c8d" +checksum = "4b9b1fef7d021261cc16cba64c351d291b715febe0fa10dc3a443ac5a5022e6c" dependencies = [ "serde", "static_assertions", @@ -5462,29 +5607,30 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.7.32" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" dependencies = [ + "byteorder", "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.32" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.76", ] [[package]] name = "zeroize" -version = "1.7.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" dependencies = [ "zeroize_derive", ] @@ -5497,28 +5643,32 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.76", ] [[package]] name = "zkcredential" version = "0.1.0" -source = "git+https://github.com/signalapp/libsignal?tag=v0.40.1#f980fccd8ae72fe21dc202d644b358667d60e2b0" +source = "git+https://github.com/signalapp/libsignal?tag=v0.51.1#2e2896fc235efa293213dd5f0aff4b1f8528bab2" dependencies = [ + "cfg-if", "curve25519-dalek", "derive-where", "displaydoc", "lazy_static", "partial-default", "poksho", + "rayon", "serde", + "sha2", "subtle", + "thiserror", ] [[package]] name = "zkgroup" version = "0.9.0" -source = "git+https://github.com/signalapp/libsignal?tag=v0.40.1#f980fccd8ae72fe21dc202d644b358667d60e2b0" +source = "git+https://github.com/signalapp/libsignal?tag=v0.51.1#2e2896fc235efa293213dd5f0aff4b1f8528bab2" dependencies = [ "aes-gcm-siv", "bincode", @@ -5530,25 +5680,28 @@ dependencies = [ "hkdf", "lazy_static", "libsignal-core", + "num_enum", "partial-default", "poksho", + "rand", + "rayon", "serde", "sha2", "signal-crypto", "subtle", + "thiserror", "uuid", "zkcredential", ] [[package]] name = "zvariant" -version = "3.15.2" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eef2be88ba09b358d3b58aca6e41cd853631d44787f319a1383ca83424fb2db" +checksum = "2084290ab9a1c471c38fc524945837734fbf124487e105daec2bb57fd48c81fe" dependencies = [ - "byteorder", + "endi", "enumflags2", - "libc", "serde", "static_assertions", "zvariant_derive", @@ -5556,24 +5709,24 @@ dependencies = [ [[package]] name = "zvariant_derive" -version = "3.15.2" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37c24dc0bed72f5f90d1f8bb5b07228cbf63b3c6e9f82d82559d4bae666e7ed9" +checksum = "73e2ba546bda683a90652bac4a279bc146adad1386f25379cf73200d2002c449" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 3.2.0", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.76", "zvariant_utils", ] [[package]] name = "zvariant_utils" -version = "1.0.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7234f0d811589db492d16893e3f21e8e2fd282e6d01b0cddee310322062cc200" +checksum = "c51bcff7cc3dbb5055396bcf774748c3dab426b4b8659046963523cee4808340" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.76", ] diff --git a/pkgs/applications/networking/instant-messengers/gurk-rs/default.nix b/pkgs/applications/networking/instant-messengers/gurk-rs/default.nix index 7bcc99d98063d..ae7001fe7bf97 100644 --- a/pkgs/applications/networking/instant-messengers/gurk-rs/default.nix +++ b/pkgs/applications/networking/instant-messengers/gurk-rs/default.nix @@ -5,17 +5,19 @@ , fetchFromGitHub , Cocoa , pkgsBuildHost +, openssl +, pkg-config }: rustPlatform.buildRustPackage rec { pname = "gurk-rs"; - version = "0.4.3"; + version = "0.5.1"; src = fetchFromGitHub { owner = "boxdot"; repo = pname; rev = "v${version}"; - hash = "sha256-MPYqWgwh5PKH3GsCDx6aa4ryorWZ96YK8KOYZ5PILkk="; + hash = "sha256-g0V6FPkCpIEWx+/kDG9+0NtlCVj6jc1gbkkzOSl/lAo="; }; postPatch = '' @@ -25,22 +27,27 @@ rustPlatform.buildRustPackage rec { cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "libsignal-protocol-0.1.0" = "sha256-p4YzrtJaQhuMBTtquvS1m9llszfyTeDfl7+IXzRUFSE="; - "libsignal-service-0.1.0" = "sha256-p0umCPtBg9s4G6RHcwK/tU+RtQE2fFLRHOYt2GmBCtQ="; - "curve25519-dalek-4.1.1" = "sha256-p9Vx0lAaYILypsI4/RVsHZLOqZKaa4Wvf7DanLA38pc="; - "presage-0.6.1" = "sha256-MsVSUI4ht+ftO2UC1IIeCtomkzg4ug95kKsc41PDVNg="; + "libsignal-protocol-0.1.0" = "sha256-4aHINlpVAqVTtm7npwXQRutZUmIxYgkhXhApg7jSM4M="; + "libsignal-service-0.1.0" = "sha256-AOGw76A9R2qH3hc7B+MBE3okzW8b5LTZdepzUDOv9lM="; + "curve25519-dalek-4.1.3" = "sha256-bPh7eEgcZnq9C3wmSnnYv0C4aAP+7pnwk9Io29GrI4A="; + "presage-0.6.2" = "sha256-t9t8ecPtefI/jYlk+Ul8WdgH26VJIkfMptbKxprekS0="; "qr2term-0.3.1" = "sha256-U8YLouVZTtDwsvzZiO6YB4Pe75RXGkZXOxHCQcCOyT8="; }; }; - nativeBuildInputs = [ protobuf ]; + nativeBuildInputs = [ protobuf pkg-config ]; - buildInputs = lib.optionals stdenv.isDarwin [ Cocoa ]; + buildInputs = [ openssl ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ]; - NIX_LDFLAGS = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ "-framework" "AppKit" ]; + NIX_LDFLAGS = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ "-framework" "AppKit" ]; PROTOC = "${pkgsBuildHost.protobuf}/bin/protoc"; + OPENSSL_NO_VENDOR = true; + + useNextest = true; + meta = with lib; { description = "Signal Messenger client for terminal"; mainProgram = "gurk"; diff --git a/pkgs/applications/networking/instant-messengers/hydrogen-web/unwrapped.nix b/pkgs/applications/networking/instant-messengers/hydrogen-web/unwrapped.nix index 7a3ad36e47b74..f0e9a267e950b 100644 --- a/pkgs/applications/networking/instant-messengers/hydrogen-web/unwrapped.nix +++ b/pkgs/applications/networking/instant-messengers/hydrogen-web/unwrapped.nix @@ -1,29 +1,35 @@ -{ lib -, stdenv -, fetchFromGitHub -, fetchYarnDeps -, yarn -, fixup-yarn-lock -, nodejs +{ + lib, + stdenv, + fetchFromGitHub, + fetchYarnDeps, + yarn, + fixup-yarn-lock, + nodejs, + olm, }: stdenv.mkDerivation (finalAttrs: { pname = "hydrogen-web"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { - owner = "vector-im"; - repo = finalAttrs.pname; + owner = "element-hq"; + repo = "hydrogen-web"; rev = "v${finalAttrs.version}"; - hash = "sha256-u8Yex3r7EZH+JztQHJbfncYeyyl6hgb1ZNFIg//wcb0="; + hash = "sha256-pXrmWPp4/MYIS1FHEGzAxGbh4OnTaiPudg+NauvA6Vc="; }; offlineCache = fetchYarnDeps { yarnLock = finalAttrs.src + "/yarn.lock"; - hash = "sha256-N9lUAhfYLlEAIaWSNS3Ecq+aBTz+f7Z22Sclwj9rp6w="; + hash = "sha256-j+BwlmL0ncaccy9qQbzb9GpDRC4KB9MwOR2ISx+vbLE="; }; - nativeBuildInputs = [ yarn fixup-yarn-lock nodejs ]; + nativeBuildInputs = [ + yarn + fixup-yarn-lock + nodejs + ]; configurePhase = '' runHook preConfigure @@ -57,9 +63,10 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Lightweight matrix client with legacy and mobile browser support"; - homepage = "https://github.com/vector-im/hydrogen-web"; + homepage = "https://github.com/element-hq/hydrogen-web"; maintainers = lib.teams.matrix.members; license = lib.licenses.asl20; platforms = lib.platforms.all; + inherit (olm.meta) knownVulnerabilities; }; }) diff --git a/pkgs/applications/networking/instant-messengers/iamb/default.nix b/pkgs/applications/networking/instant-messengers/iamb/default.nix index af2e875411756..02a632a9f4b1f 100644 --- a/pkgs/applications/networking/instant-messengers/iamb/default.nix +++ b/pkgs/applications/networking/instant-messengers/iamb/default.nix @@ -8,20 +8,21 @@ rustPlatform.buildRustPackage rec { pname = "iamb"; - version = "0.0.9"; + version = "0.0.10"; src = fetchFromGitHub { owner = "ulyssa"; repo = "iamb"; rev = "v${version}"; - hash = "sha256-UYc7iphpzqZPwhOn/ia7XvnnlIUvM7nSFBz67ZkXmNs="; + hash = "sha256-cjBSWUBgfwdLnpneJ5XW2TdOFkNc+Rc/wyUp9arZzwg="; }; - cargoHash = "sha256-982FdK6ej3Bbg4R9e43VSwlni837ZK4rkMkoeYMyW8E="; + cargoHash = "sha256-a5y8nNFixOxJPNDOzvFFRqVrY2jsirCud2ZJJ8OvRhQ="; nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit + darwin.apple_sdk.frameworks.Cocoa ]; postInstall = '' diff --git a/pkgs/applications/networking/instant-messengers/jackline/default.nix b/pkgs/applications/networking/instant-messengers/jackline/default.nix index 946b77512e176..d4876e20370d1 100644 --- a/pkgs/applications/networking/instant-messengers/jackline/default.nix +++ b/pkgs/applications/networking/instant-messengers/jackline/default.nix @@ -4,15 +4,15 @@ with ocamlPackages; buildDunePackage rec { pname = "jackline"; - version = "unstable-2023-03-09"; + version = "unstable-2024-02-28"; minimalOCamlVersion = "4.08"; src = fetchFromGitHub { owner = "hannesm"; repo = "jackline"; - rev = "a7acd19bd8141b842ac69b05146d9a63e729230d"; - hash = "sha256-AhiFfZkDit9tnGenETc3A1hHqWN+csiS2bVjsGNaHf8="; + rev = "31b90275a5f848cfc8c4f5b75e7d1933bec37852"; + hash = "sha256-G2jjsc/i9Qgo0TP+ZE4gB/1cjuZ9l8R7e59K2DGD5GY="; }; nativeBuildInpts = [ @@ -23,6 +23,7 @@ buildDunePackage rec { buildInputs = [ erm_xmpp tls + tls-lwt mirage-crypto-pk x509 domain-name diff --git a/pkgs/applications/networking/instant-messengers/jami/default.nix b/pkgs/applications/networking/instant-messengers/jami/default.nix index c16f8d4c2aa59..a3df5958beb63 100644 --- a/pkgs/applications/networking/instant-messengers/jami/default.nix +++ b/pkgs/applications/networking/instant-messengers/jami/default.nix @@ -1,88 +1,92 @@ -{ stdenv -, lib -, pkg-config -, fetchFromGitLab -, gitUpdater -, ffmpeg_6 +{ + stdenv, + lib, + pkg-config, + fetchFromGitLab, + gitUpdater, + ffmpeg_6, # for daemon -, autoreconfHook -, perl # for pod2man -, alsa-lib -, asio -, dbus -, sdbus-cpp -, fmt -, gmp -, gnutls -, http-parser -, jack -, jsoncpp -, libarchive -, libgit2 -, libnatpmp -, libpulseaudio -, libupnp -, yaml-cpp -, msgpack-cxx -, openssl -, restinio -, secp256k1 -, speex -, udev -, webrtc-audio-processing -, zlib + autoreconfHook, + perl, # for pod2man + alsa-lib, + asio, + dbus, + sdbus-cpp, + fmt, + gmp, + gnutls, + llhttp, + jack, + jsoncpp, + libarchive, + libgit2, + libnatpmp, + libpulseaudio, + libupnp, + yaml-cpp, + msgpack-cxx, + openssl, + restinio, + secp256k1, + speex, + udev, + webrtc-audio-processing, + zlib, + + # for dhtnet + expected-lite, # for client -, cmake -, git -, networkmanager # for libnm -, python3 -, qttools # for translations -, wrapQtAppsHook -, libnotify -, qt5compat -, qtbase -, qtdeclarative -, qrencode -, qtmultimedia -, qtnetworkauth -, qtpositioning -, qtsvg -, qtwebengine -, qtwebchannel -, wrapGAppsHook3 -, withWebengine ? true + cmake, + git, + networkmanager, # for libnm + python3, + qttools, # for translations + wrapQtAppsHook, + libnotify, + qt5compat, + qtbase, + qtdeclarative, + qrencode, + qtmultimedia, + qtnetworkauth, + qtpositioning, + qtsvg, + qtwebengine, + qtwebchannel, + wrapGAppsHook3, + withWebengine ? true, # for pjsip -, fetchFromGitHub -, pjsip + fetchFromGitHub, + pjsip, # for opendht -, opendht + opendht, }: stdenv.mkDerivation rec { pname = "jami"; - version = "20240529.0"; + version = "20240823.0"; src = fetchFromGitLab { domain = "git.jami.net"; owner = "savoirfairelinux"; repo = "jami-client-qt"; rev = "stable/${version}"; - hash = "sha256-v2GFvgHHJ2EMoayZ+//OZ0U+P1fh5Mgp5fAoqtZts7U="; + hash = "sha256-7jGH54sFiS6qrdEiKSS64lJyJXL1FOJVbesxo/FFmyA="; fetchSubmodules = true; }; pjsip-jami = pjsip.overrideAttrs (old: rec { - version = "797f1a38cc1066acc4adc9561aa1288afabe72d5"; + version = "8fc165b833eea6e3c88d67a541385424b129fd3f"; src = fetchFromGitHub { owner = "savoirfairelinux"; repo = "pjproject"; rev = version; - hash = "sha256-lTDbJF09R2G+EIkMj1YyKa4XokH9LlcIG+RhRJhzUes="; + hash = "sha256-uA6ZJYUgAu3cK4CKCGtqaI0KPM/0szExPS2pCOflz5A="; }; configureFlags = [ @@ -106,38 +110,44 @@ stdenv.mkDerivation rec { "--disable-resample" "--disable-libwebrtc" "--with-gnutls=yes" - ] - ++ lib.optionals stdenv.isLinux [ - "--enable-epoll" - ]; + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "--enable-epoll" ]; buildInputs = old.buildInputs ++ [ gnutls ]; }); - opendht-jami = (opendht.overrideAttrs { - src = fetchFromGitHub { - owner = "savoirfairelinux"; - repo = "opendht"; - rev = "f2cee8e9ce24746caa7dee1847829c526d340284"; - hash = "sha256-ZnIrlybF3MCiXxxv80tRzCJ5CJ54S42prGUjq1suJNA="; - }; - }).override { - enableProxyServerAndClient = true; - enablePushNotifications = true; - }; + opendht-jami = + (opendht.overrideAttrs { + src = fetchFromGitHub { + owner = "savoirfairelinux"; + repo = "opendht"; + rev = "074e05cc3254d5d73b0d96ee772a6e01bb3113e5"; + hash = "sha256-WuaURlC7eDDxvnM3YuyU9CNrwnE4WBQUIEw3z/0zjN8="; + }; + }).override + { + enableProxyServerAndClient = true; + enablePushNotifications = true; + }; dhtnet = stdenv.mkDerivation { pname = "dhtnet"; - version = "unstable-2024-05-17"; + version = "unstable-2024-07-22"; src = fetchFromGitLab { domain = "git.jami.net"; owner = "savoirfairelinux"; repo = "dhtnet"; - rev = "77331098ff663a5ac54fae7d0bedafe076c575a1"; - hash = "sha256-55LEnI1YgVujCtv1dGOFtJdvnzB2SKqwEptaHasZB7I="; + rev = "cfe512b0632eea046f683b22e42d01eeb943d751"; + hash = "sha256-SGidaCi5z7hO0ePJIZIkcWAkb+cKsZTdksVS7ldpjME="; }; + postPatch = '' + substituteInPlace dependencies/build.py \ + --replace-fail \ + "wget https://raw.githubusercontent.com/martinmoene/expected-lite/master/include/nonstd/expected.hpp -O" \ + "cp ${expected-lite}/include/nonstd/expected.hpp" + ''; + nativeBuildInputs = [ cmake pkg-config @@ -147,7 +157,7 @@ stdenv.mkDerivation rec { asio fmt gnutls - http-parser + llhttp jsoncpp libupnp msgpack-cxx @@ -194,7 +204,7 @@ stdenv.mkDerivation rec { ffmpeg_6 gmp gnutls - http-parser + llhttp jack jsoncpp libarchive @@ -265,13 +275,9 @@ stdenv.mkDerivation rec { qtpositioning qtsvg qtwebchannel - ] ++ lib.optionals withWebengine [ - qtwebengine - ]; + ] ++ lib.optionals withWebengine [ qtwebengine ]; - cmakeFlags = lib.optionals (!withWebengine) [ - "-DWITH_WEBENGINE=false" - ]; + cmakeFlags = lib.optionals (!withWebengine) [ "-DWITH_WEBENGINE=false" ]; qtWrapperArgs = [ # With wayland the titlebar is not themed and the wmclass is wrong. @@ -282,9 +288,7 @@ stdenv.mkDerivation rec { qtWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; - passthru.updateScript = gitUpdater { - rev-prefix = "stable/"; - }; + passthru.updateScript = gitUpdater { rev-prefix = "stable/"; }; meta = with lib; { homepage = "https://jami.net/"; diff --git a/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix b/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix index 78c6912b12ba7..619759df2f008 100644 --- a/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix +++ b/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix @@ -16,41 +16,39 @@ let inherit (darwin.apple_sdk.frameworks) Carbon CoreFoundation ApplicationServices OpenGL; - - electronDist = electron + (if stdenv.isDarwin then "/Applications" else "/libexec/electron"); in buildNpmPackage rec { pname = "jitsi-meet-electron"; - version = "2024.3.0"; + version = "2024.6.0"; src = fetchFromGitHub { owner = "jitsi"; repo = "jitsi-meet-electron"; rev = "v${version}"; - hash = "sha256-BGN+t9Caw5n/NN1E5Oi/ruMLjoVh0jUlpzYR6vodHbw="; + hash = "sha256-jnt+aHkCnIj4GGFbAk6AlVhg0rvzFhGCELAaYMCZx88="; }; nativeBuildInputs = [ makeWrapper - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ copyDesktopItems ]; # robotjs node-gyp dependencies - buildInputs = lib.optionals stdenv.isLinux [ + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libpng libX11 libXi libXtst zlib - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Carbon CoreFoundation ApplicationServices OpenGL ]; - npmDepsHash = "sha256-KanG8y+tYzswCCXjSkOlk+p9XKaouP2Z7IhsD5bDtRk="; + npmDepsHash = "sha256-zmnxNJdalspZib1PGZN0YBIauJ+gaxs6Iir94cPRNtU="; makeCacheWritable = true; @@ -70,7 +68,7 @@ buildNpmPackage rec { ''; postBuild = '' - cp -r ${electronDist} electron-dist + cp -r ${electron.dist} electron-dist chmod -R u+w electron-dist # npmRebuild is needed because robotjs won't be built on darwin otherwise @@ -86,7 +84,7 @@ buildNpmPackage rec { installPhase = '' runHook preInstall - ${lib.optionalString stdenv.isLinux '' + ${lib.optionalString stdenv.hostPlatform.isLinux '' mkdir -p $out/share/jitsi-meet-electron cp -r dist/*-unpacked/{locales,resources{,.pak}} $out/share/jitsi-meet-electron @@ -99,7 +97,7 @@ buildNpmPackage rec { install -Dm644 resources/icons/512x512.png $out/share/icons/hicolor/512x512/apps/jitsi-meet-electron.png ''} - ${lib.optionalString stdenv.isDarwin '' + ${lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications cp -r dist/mac*/"Jitsi Meet.app" $out/Applications makeWrapper "$out/Applications/Jitsi Meet.app/Contents/MacOS/Jitsi Meet" $out/bin/jitsi-meet-electron diff --git a/pkgs/applications/networking/instant-messengers/kaidan/default.nix b/pkgs/applications/networking/instant-messengers/kaidan/default.nix index b710421adb4aa..497f9eef64ba9 100644 --- a/pkgs/applications/networking/instant-messengers/kaidan/default.nix +++ b/pkgs/applications/networking/instant-messengers/kaidan/default.nix @@ -21,14 +21,14 @@ mkDerivation rec { pname = "kaidan"; - version = "0.9.1"; + version = "0.9.2"; src = fetchFromGitLab { domain = "invent.kde.org"; owner = "network"; repo = pname; rev = "v${version}"; - hash = "sha256-F5GhN9hAF2e8b0T3peUnLk8CVd+nq4YR8k52x6ZOoLM="; + hash = "sha256-2UzXWd/fR5UwGywebYGWhh817x+VC76zmVaVZSBOg7M="; }; nativeBuildInputs = [ cmake extra-cmake-modules pkg-config ]; diff --git a/pkgs/applications/networking/instant-messengers/keet/default.nix b/pkgs/applications/networking/instant-messengers/keet/default.nix index c49442e38370e..c708d46d3a2e6 100644 --- a/pkgs/applications/networking/instant-messengers/keet/default.nix +++ b/pkgs/applications/networking/instant-messengers/keet/default.nix @@ -1,23 +1,30 @@ -{ lib, appimageTools, fetchurl }: +{ lib, appimageTools, fetchzip }: let pname = "keet"; - version = "1.2.1"; + version = "2.2.0"; - src = fetchurl { - url = "https://keet.io/downloads/${version}/Keet.AppImage"; - sha256 = "1f76ccfa16719a24f6d84b88e5ca49fab1c372de309ce74393461903c5c49d98"; + src = fetchzip { + url = "https://keet.io/downloads/${version}/Keet-x64.tar.gz"; + hash = "sha256-Sd2aCUvgxdbCb8MtWMcznX2efmL1h9wLT29GG7t3Gzc="; }; - appimageContents = appimageTools.extract { inherit pname version src; }; + appimageContents = appimageTools.extract { + inherit pname version; + src = "${src}/Keet.AppImage"; + }; in appimageTools.wrapType2 { - inherit src pname version; + inherit pname version; + + src = "${src}/Keet.AppImage"; + + extraPkgs = pkgs: with pkgs; [ + gtk4 + ]; extraInstallCommands = '' - install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications - substituteInPlace $out/share/applications/${pname}.desktop \ - --replace 'Exec=AppRun' 'Exec=${pname}' - cp -r ${appimageContents}/usr/share/icons $out/share + install -m 444 -D ${appimageContents}/Keet.desktop -t $out/share/applications + cp -r ${appimageContents}/*.png $out/share ''; meta = with lib; { diff --git a/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix b/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix index 6d39ab785cfa8..856aa55f132da 100644 --- a/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix +++ b/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix @@ -41,7 +41,7 @@ buildPythonApplication rec { propagatedBuildInputs = [ cacert setuptools - matrix-nio + (matrix-nio.override { withOlm = true; }) python-magic markdown pillow @@ -51,7 +51,7 @@ buildPythonApplication rec { pyxdg python-olm emoji - ] ++ matrix-nio.optional-dependencies.e2e; + ]; meta = with lib; { description = "Simple but convenient CLI-based Matrix client app for sending and receiving"; diff --git a/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix b/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix index 8a1052d04df4f..41c27ed7c19ca 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.9.0"; srcs = { "x86_64-linux" = { url = "https://releases.mattermost.com/desktop/${version}/${pname}-${version}-linux-x64.tar.gz"; - hash = "sha256-1xfU9+VzjhSVWsP1AYizphhQ2010GbQBgQ4dxvY3TBU="; + hash = "sha256-zLKdfu5p7TyJOw8vJX7i/uu4j0PrUf2/BDmb1kdqqMc="; }; "aarch64-linux" = { url = "https://releases.mattermost.com/desktop/${version}/${pname}-${version}-linux-arm64.tar.gz"; - hash = "sha256-RrH+R9IuokKK+zfmCmOt38hD1HvWJbKqmxTFhQ3RcqQ="; + hash = "sha256-JljK7d4KLAn1+NwF+VcedL/7hEsp/9LzLdzROa1fgJA="; }; }; diff --git a/pkgs/applications/networking/instant-messengers/mikutter/default.nix b/pkgs/applications/networking/instant-messengers/mikutter/default.nix deleted file mode 100644 index 3938d03447f83..0000000000000 --- a/pkgs/applications/networking/instant-messengers/mikutter/default.nix +++ /dev/null @@ -1,159 +0,0 @@ -{ lib -, stdenv -, fetchurl -, bundlerEnv -, alsa-utils -, atk -, copyDesktopItems -, gobject-introspection -, gtk2 -, ruby -, libicns -, libnotify -, makeDesktopItem -, which -, wrapGAppsHook3 -, writeText -}: - -let - # NOTE: $out may have different values depending on context - mikutterPaths = rec { - optPrefixDir = "$out/opt/mikutter"; - appPrefixDir = "$out/Applications/mikutter.app/Contents"; - appBinDir = "${appPrefixDir}/MacOS"; - appResourceDir = "${appPrefixDir}/Resources"; - iconPath = "${optPrefixDir}/core/skin/data/icon.png"; - }; - - gems = bundlerEnv { - name = "mikutter-gems"; # leave the version out to enable package reuse - gemdir = ./deps; - groups = [ "default" "plugin" ]; - inherit ruby; - - # Avoid the following error: - # > `<module:Moneta>': uninitialized constant Moneta::Builder (NameError) - # - # Related: - # https://github.com/NixOS/nixpkgs/pull/76510 - # https://github.com/NixOS/nixpkgs/pull/76765 - # https://github.com/NixOS/nixpkgs/issues/83442 - # https://github.com/NixOS/nixpkgs/issues/106545 - copyGemFiles = true; - }; - - mkDesktopItem = { description }: - makeDesktopItem { - name = "mikutter"; - desktopName = "mikutter"; - exec = "mikutter"; - icon = "mikutter"; - categories = [ "Network" ]; - comment = description; - keywords = [ "Mastodon" ]; - }; - - mkInfoPlist = { version }: - writeText "Info.plist" (lib.generators.toPlist { } { - CFBundleName = "mikutter"; - CFBundleDisplayName = "mikutter"; - CFBundleExecutable = "mikutter"; - CFBundleIconFile = "mikutter"; - CFBundleIdentifier = "net.hachune.mikutter"; - CFBundleInfoDictionaryVersion = "6.0"; - CFBundlePackageType = "APPL"; - CFBundleVersion = version; - CFBundleShortVersionString = version; - }); - - inherit (gems) wrappedRuby; -in -with mikutterPaths; stdenv.mkDerivation rec { - pname = "mikutter"; - version = "4.1.4"; - - src = fetchurl { - url = "https://mikutter.hachune.net/bin/mikutter-${version}.tar.gz"; - sha256 = "05253nz4i1lmnq6czj48qdab2ny4vx2mznj6nsn2l1m2z6zqkwk3"; - }; - - nativeBuildInputs = [ copyDesktopItems wrapGAppsHook3 gobject-introspection ] - ++ lib.optionals stdenv.isDarwin [ libicns ]; - buildInputs = [ - atk - gtk2 - libnotify - which # some plugins use it at runtime - wrappedRuby - ] ++ lib.optionals stdenv.isLinux [ alsa-utils ]; - - scriptPath = lib.makeBinPath ( - [ wrappedRuby libnotify which ] - ++ lib.optionals stdenv.isLinux [ alsa-utils ] - ); - - postUnpack = '' - rm -rf vendor - ''; - - installPhase = '' - runHook preInstall - - mkdir -p $out/bin ${optPrefixDir} - - install -Dm644 README $out/share/doc/mikutter/README - install -Dm644 LICENSE $out/share/doc/mikutter/LICENSE - rm -r README LICENSE deployment - - cp -r . ${optPrefixDir} - - gappsWrapperArgsHook # FIXME: currently runs at preFixup - wrapGApp ${optPrefixDir}/mikutter.rb \ - --prefix PATH : "${scriptPath}" \ - --set DISABLE_BUNDLER_SETUP 1 - mv ${optPrefixDir}/mikutter.rb $out/bin/mikutter - - install -Dm644 ${iconPath} $out/share/icons/hicolor/256x256/apps/mikutter.png - - runHook postInstall - ''; - - postInstall = - let - infoPlist = mkInfoPlist { inherit version; }; - in - lib.optionalString stdenv.isDarwin '' - mkdir -p ${appBinDir} ${appResourceDir} - install -Dm644 ${infoPlist} ${appPrefixDir}/Info.plist - ln -s $out/bin/mikutter ${appBinDir}/mikutter - png2icns ${appResourceDir}/mikutter.icns ${iconPath} - ''; - - installCheckPhase = '' - runHook preInstallCheck - - testDir="$(mktemp -d)" - install -Dm644 ${./test_plugin.rb} "$testDir/plugin/test_plugin/test_plugin.rb" - - $out/bin/mikutter --confroot="$testDir" --plugin=test_plugin --debug - - runHook postInstallCheck - ''; - - desktopItems = [ - (mkDesktopItem { inherit (meta) description; }) - ]; - - doInstallCheck = true; - dontWrapGApps = true; # the target is placed outside of bin/ - - passthru.updateScript = [ ./update.sh version (toString ./.) ]; - - meta = with lib; { - description = "An extensible Mastodon client"; - homepage = "https://mikutter.hachune.net"; - platforms = ruby.meta.platforms; - license = licenses.mit; - }; -} diff --git a/pkgs/applications/networking/instant-messengers/mikutter/deps/Gemfile b/pkgs/applications/networking/instant-messengers/mikutter/deps/Gemfile deleted file mode 100644 index fbe6a2f29c5da..0000000000000 --- a/pkgs/applications/networking/instant-messengers/mikutter/deps/Gemfile +++ /dev/null @@ -1,39 +0,0 @@ -alias __source_distinct__ source -def source(url) - @loaded ||= {} - unless @loaded[url] - @loaded[url] = true - __source_distinct__(url) end end - -source 'https://rubygems.org' - -ruby '>= 2.5.0' - -group :default do - gem 'addressable','>= 2.7.0', '< 2.8' - gem 'delayer','>= 1.1.2', '< 2.0' - gem 'delayer-deferred','>= 2.2.0', '< 3.0' - gem 'diva','>= 1.0.2', '< 2.0' - gem 'memoist','>= 0.16.2', '< 0.17' - gem 'oauth','>= 0.5.4' - gem 'pluggaloid','>= 1.5.0', '< 2.0' - gem 'typed-array','>= 0.1.2', '< 0.2' -end - -group :test do - gem 'test-unit','>= 3.3.4', '< 4.0' - gem 'rake','>= 13.0.1' - gem 'mocha','>= 1.11.1' - gem 'webmock','>= 3.7.6' - gem 'ruby-prof','>= 1.1.0' -end - - -group :plugin do - Dir.glob(File.expand_path(File.join(__dir__, 'plugin/*/Gemfile'))){ |path| - eval File.open(path).read - } - Dir.glob(File.join(File.expand_path(ENV['MIKUTTER_CONFROOT'] || '~/.mikutter'), 'plugin/*/Gemfile')){ |path| - eval File.open(path).read - } -end diff --git a/pkgs/applications/networking/instant-messengers/mikutter/deps/Gemfile.lock b/pkgs/applications/networking/instant-messengers/mikutter/deps/Gemfile.lock deleted file mode 100644 index 92568056d52a4..0000000000000 --- a/pkgs/applications/networking/instant-messengers/mikutter/deps/Gemfile.lock +++ /dev/null @@ -1,101 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - addressable (2.7.0) - public_suffix (>= 2.0.2, < 5.0) - atk (3.4.1) - glib2 (= 3.4.1) - cairo (1.17.5) - native-package-installer (>= 1.0.3) - pkg-config (>= 1.2.2) - red-colors - cairo-gobject (3.4.1) - cairo (>= 1.16.2) - glib2 (= 3.4.1) - crack (0.4.5) - rexml - delayer (1.2.0) - delayer-deferred (2.2.0) - delayer (>= 1.1.2, < 2.0) - diva (1.0.2) - addressable (>= 2.5.2, < 2.8) - gdk_pixbuf2 (3.4.1) - gio2 (= 3.4.1) - gettext (3.3.7) - locale (>= 2.0.5) - text (>= 1.3.0) - gio2 (3.4.1) - gobject-introspection (= 3.4.1) - glib2 (3.4.1) - native-package-installer (>= 1.0.3) - pkg-config (>= 1.3.5) - gobject-introspection (3.4.1) - glib2 (= 3.4.1) - gtk2 (3.4.1) - atk (= 3.4.1) - gdk_pixbuf2 (= 3.4.1) - pango (= 3.4.1) - hashdiff (1.0.1) - httpclient (2.8.3) - instance_storage (1.0.0) - locale (2.1.3) - memoist (0.16.2) - mini_portile2 (2.5.0) - mocha (1.12.0) - moneta (1.4.1) - native-package-installer (1.1.1) - nokogiri (1.11.3) - mini_portile2 (~> 2.5.0) - racc (~> 1.4) - oauth (0.5.6) - pango (3.4.1) - cairo-gobject (= 3.4.1) - gobject-introspection (= 3.4.1) - pkg-config (1.4.6) - pluggaloid (1.5.0) - delayer (>= 1.1.0, < 2.0) - instance_storage (>= 1.0.0, < 2.0.0) - power_assert (2.0.0) - public_suffix (4.0.6) - racc (1.5.2) - rake (13.0.3) - red-colors (0.1.1) - rexml (3.2.5) - ruby-prof (1.4.3) - test-unit (3.4.0) - power_assert - text (1.3.1) - typed-array (0.1.2) - webmock (3.12.2) - addressable (>= 2.3.6) - crack (>= 0.3.2) - hashdiff (>= 0.4.0, < 2.0.0) - -PLATFORMS - ruby - -DEPENDENCIES - addressable (>= 2.7.0, < 2.8) - delayer (>= 1.1.2, < 2.0) - delayer-deferred (>= 2.2.0, < 3.0) - diva (>= 1.0.2, < 2.0) - gettext (>= 3.3.5, < 3.4) - gtk2 (= 3.4.1) - httpclient - memoist (>= 0.16.2, < 0.17) - mocha (>= 1.11.1) - moneta - nokogiri - oauth (>= 0.5.4) - pluggaloid (>= 1.5.0, < 2.0) - rake (>= 13.0.1) - ruby-prof (>= 1.1.0) - test-unit (>= 3.3.4, < 4.0) - typed-array (>= 0.1.2, < 0.2) - webmock (>= 3.7.6) - -RUBY VERSION - ruby 2.6.6p146 - -BUNDLED WITH - 2.1.4 diff --git a/pkgs/applications/networking/instant-messengers/mikutter/deps/gemset.nix b/pkgs/applications/networking/instant-messengers/mikutter/deps/gemset.nix deleted file mode 100644 index b45a36c6fec09..0000000000000 --- a/pkgs/applications/networking/instant-messengers/mikutter/deps/gemset.nix +++ /dev/null @@ -1,410 +0,0 @@ -{ - addressable = { - dependencies = ["public_suffix"]; - groups = ["default" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1fvchp2rhp2rmigx7qglf69xvjqvzq7x0g49naliw29r2bz656sy"; - type = "gem"; - }; - version = "2.7.0"; - }; - atk = { - dependencies = ["glib2"]; - groups = ["default" "plugin"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0a8q9a1f6x4gy55p8cf52a22bnpjgn18ad9n959x0f4gybbhs948"; - type = "gem"; - }; - version = "3.4.1"; - }; - cairo = { - dependencies = ["native-package-installer" "pkg-config" "red-colors"]; - groups = ["default" "plugin"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0vbj9szp2xbnxqan8hppip8vm9fxpcmpx745y5fvg2scdh9f0p7s"; - type = "gem"; - }; - version = "1.17.5"; - }; - cairo-gobject = { - dependencies = ["cairo" "glib2"]; - groups = ["default" "plugin"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0gkxdfslcvrwrs48giilji3bgxd5bwijwq33p9h00r10jzfg2028"; - type = "gem"; - }; - version = "3.4.1"; - }; - crack = { - dependencies = ["rexml"]; - groups = ["default" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1cr1kfpw3vkhysvkk3wg7c54m75kd68mbm9rs5azdjdq57xid13r"; - type = "gem"; - }; - version = "0.4.5"; - }; - delayer = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0iqf4i18i8rk3x7qgvkhbiqskf0xzdf733fjimrq6xkag2mq60bl"; - type = "gem"; - }; - version = "1.2.0"; - }; - delayer-deferred = { - dependencies = ["delayer"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0i2das3ncssacpqdgaf4as77vrxm7jfiizaja884fqv4rzv6s2sv"; - type = "gem"; - }; - version = "2.2.0"; - }; - diva = { - dependencies = ["addressable"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "05wl4wg57vvng4nrp4lzjq148v908xzq092kq93phwvyxs7jnw2g"; - type = "gem"; - }; - version = "1.0.2"; - }; - gdk_pixbuf2 = { - dependencies = ["gio2"]; - groups = ["default" "plugin"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0194gzn0kialfh0j7crllvp808r64sg6dh297x69b0av21ar5pam"; - type = "gem"; - }; - version = "3.4.1"; - }; - gettext = { - dependencies = ["locale" "text"]; - groups = ["default" "plugin"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1fqlwq7i8ck1fjyhn19q3skvgrbz44q7gq51mlr0qym5rkj5f6rn"; - type = "gem"; - }; - version = "3.3.7"; - }; - gio2 = { - dependencies = ["gobject-introspection"]; - groups = ["default" "plugin"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1l3jpgbdvb55xhcmpkcqgwx5068dfyi8kijfvzhbqh96ng0p1m7g"; - type = "gem"; - }; - version = "3.4.1"; - }; - glib2 = { - dependencies = ["native-package-installer" "pkg-config"]; - groups = ["default" "plugin"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "18clyn0fp0h5alnkf9i2bqd6wvl78h468pdbzs1csqnba8vw4q1c"; - type = "gem"; - }; - version = "3.4.1"; - }; - gobject-introspection = { - dependencies = ["glib2"]; - groups = ["default" "plugin"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1a3x8qiisbax3x0izj8l5w66r53ba5ma53ax2jhdbhbvaxx3d02n"; - type = "gem"; - }; - version = "3.4.1"; - }; - gtk2 = { - dependencies = ["atk" "gdk_pixbuf2" "pango"]; - groups = ["plugin"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "17az8g0n1yzz90kdbjg2hpabi04qccda7v6lin76bs637ivfg2md"; - type = "gem"; - }; - version = "3.4.1"; - }; - hashdiff = { - groups = ["default" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1nynpl0xbj0nphqx1qlmyggq58ms1phf5i03hk64wcc0a17x1m1c"; - type = "gem"; - }; - version = "1.0.1"; - }; - httpclient = { - groups = ["plugin"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "19mxmvghp7ki3klsxwrlwr431li7hm1lczhhj8z4qihl2acy8l99"; - type = "gem"; - }; - version = "2.8.3"; - }; - instance_storage = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "08nf5fhq9dckq9lmaklxydq0hrlfi7phk66gr3bggxg45zd687pl"; - type = "gem"; - }; - version = "1.0.0"; - }; - locale = { - groups = ["default" "plugin"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0997465kxvpxm92fiwc2b16l49mngk7b68g5k35ify0m3q0yxpdn"; - type = "gem"; - }; - version = "2.1.3"; - }; - memoist = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0i9wpzix3sjhf6d9zw60dm4371iq8kyz7ckh2qapan2vyaim6b55"; - type = "gem"; - }; - version = "0.16.2"; - }; - mini_portile2 = { - groups = ["default" "plugin"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1hdbpmamx8js53yk3h8cqy12kgv6ca06k0c9n3pxh6b6cjfs19x7"; - type = "gem"; - }; - version = "2.5.0"; - }; - mocha = { - groups = ["test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "05yw6rwgjppq116jgqfg4pv4bql3ci4r2fmmg0m2c3sqib1bq41a"; - type = "gem"; - }; - version = "1.12.0"; - }; - moneta = { - groups = ["plugin"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0z25b4yysvnf2hi9jxnsiv3fvnicnzr2m70ci231av5093jfknc6"; - type = "gem"; - }; - version = "1.4.1"; - }; - native-package-installer = { - groups = ["default" "plugin"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1ww1mq41q7rda975byjmq5dk8k13v8dawvm33370pbkrymd8syp8"; - type = "gem"; - }; - version = "1.1.1"; - }; - nokogiri = { - dependencies = ["mini_portile2" "racc"]; - groups = ["plugin"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "19d78mdg2lbz9jb4ph6nk783c9jbsdm8rnllwhga6pd53xffp6x0"; - type = "gem"; - }; - version = "1.11.3"; - }; - oauth = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1zwd6v39yqfdrpg1p3d9jvzs9ljg55ana2p06m0l7qn5w0lgx1a0"; - type = "gem"; - }; - version = "0.5.6"; - }; - pango = { - dependencies = ["cairo-gobject" "gobject-introspection"]; - groups = ["default" "plugin"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1d0cn50qgpifrcv8qx72wi6l9xalw3ryngbfmm9xpg9vx5rl1qbp"; - type = "gem"; - }; - version = "3.4.1"; - }; - pkg-config = { - groups = ["default" "plugin"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1mjjy1grxr64znkffxsvprcckbrrnm40b6gbllnbm7jxslbr3gjl"; - type = "gem"; - }; - version = "1.4.6"; - }; - pluggaloid = { - dependencies = ["delayer" "instance_storage"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0m3f940lf1bg01jin22by7hg9hs43y995isgcyqb6vbvlv51zj11"; - type = "gem"; - }; - version = "1.5.0"; - }; - power_assert = { - groups = ["default" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "172qfmzwxdf82bmwgcb13hnz9i3p6i2s2nijxnx6r63kn3drjppr"; - type = "gem"; - }; - version = "2.0.0"; - }; - public_suffix = { - groups = ["default" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1xqcgkl7bwws1qrlnmxgh8g4g9m10vg60bhlw40fplninb3ng6d9"; - type = "gem"; - }; - version = "4.0.6"; - }; - racc = { - groups = ["default" "plugin"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "178k7r0xn689spviqzhvazzvxfq6fyjldxb3ywjbgipbfi4s8j1g"; - type = "gem"; - }; - version = "1.5.2"; - }; - rake = { - groups = ["test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1iik52mf9ky4cgs38fp2m8r6skdkq1yz23vh18lk95fhbcxb6a67"; - type = "gem"; - }; - version = "13.0.3"; - }; - red-colors = { - groups = ["default" "plugin"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0ar2k7zvhr1215jx5di29hkg5h1798f1gypmq6v0sy9v35w6ijca"; - type = "gem"; - }; - version = "0.1.1"; - }; - rexml = { - groups = ["default" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53"; - type = "gem"; - }; - version = "3.2.5"; - }; - ruby-prof = { - groups = ["test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1r3xalp91l07m0cwllcxjzg6nkviiqnxkcbgg5qnzsdji6rgy65m"; - type = "gem"; - }; - version = "1.4.3"; - }; - test-unit = { - dependencies = ["power_assert"]; - groups = ["test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1h0c323zfn4hdida4g58h8wnlh4kax438gyxlw20dd78kcp01i8m"; - type = "gem"; - }; - version = "3.4.0"; - }; - text = { - groups = ["default" "plugin"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1x6kkmsr49y3rnrin91rv8mpc3dhrf3ql08kbccw8yffq61brfrg"; - type = "gem"; - }; - version = "1.3.1"; - }; - typed-array = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0qlv2rnkin9rwkgjx3k5qvc17m0m7jf5cdirw3wxbjnw5kga27w9"; - type = "gem"; - }; - version = "0.1.2"; - }; - webmock = { - dependencies = ["addressable" "crack" "hashdiff"]; - groups = ["test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "038igpmkpmn0nw0k7s4db8x88af1nwcy7wzh9m9c9q4p74h7rii0"; - type = "gem"; - }; - version = "3.12.2"; - }; -} diff --git a/pkgs/applications/networking/instant-messengers/mikutter/deps/plugin/gtk/Gemfile b/pkgs/applications/networking/instant-messengers/mikutter/deps/plugin/gtk/Gemfile deleted file mode 100644 index 3306c29e3cbff..0000000000000 --- a/pkgs/applications/networking/instant-messengers/mikutter/deps/plugin/gtk/Gemfile +++ /dev/null @@ -1,4 +0,0 @@ -source 'https://rubygems.org' - -gem 'gtk2', '3.4.1' - diff --git a/pkgs/applications/networking/instant-messengers/mikutter/deps/plugin/image_file_cache/Gemfile b/pkgs/applications/networking/instant-messengers/mikutter/deps/plugin/image_file_cache/Gemfile deleted file mode 100644 index f86005fef078e..0000000000000 --- a/pkgs/applications/networking/instant-messengers/mikutter/deps/plugin/image_file_cache/Gemfile +++ /dev/null @@ -1 +0,0 @@ -gem 'moneta' diff --git a/pkgs/applications/networking/instant-messengers/mikutter/deps/plugin/photo_support/Gemfile b/pkgs/applications/networking/instant-messengers/mikutter/deps/plugin/photo_support/Gemfile deleted file mode 100644 index 66016eee9c466..0000000000000 --- a/pkgs/applications/networking/instant-messengers/mikutter/deps/plugin/photo_support/Gemfile +++ /dev/null @@ -1,4 +0,0 @@ -source 'https://rubygems.org' - -gem 'nokogiri' -gem 'httpclient' diff --git a/pkgs/applications/networking/instant-messengers/mikutter/deps/plugin/uitranslator/Gemfile b/pkgs/applications/networking/instant-messengers/mikutter/deps/plugin/uitranslator/Gemfile deleted file mode 100644 index 08b4831dfc66c..0000000000000 --- a/pkgs/applications/networking/instant-messengers/mikutter/deps/plugin/uitranslator/Gemfile +++ /dev/null @@ -1,5 +0,0 @@ -source 'https://rubygems.org' - -group :default do - gem 'gettext', '>= 3.3.5', '< 3.4' -end diff --git a/pkgs/applications/networking/instant-messengers/mikutter/test_plugin.rb b/pkgs/applications/networking/instant-messengers/mikutter/test_plugin.rb deleted file mode 100644 index b19c15cd304fb..0000000000000 --- a/pkgs/applications/networking/instant-messengers/mikutter/test_plugin.rb +++ /dev/null @@ -1,10 +0,0 @@ -# Tests mikutter's event system. - -Plugin.create(:test_plugin) do - require 'logger' - Delayer.new do - log = Logger.new(STDOUT) - log.info("loaded test_plugin") - exit - end -end diff --git a/pkgs/applications/networking/instant-messengers/mikutter/update.sh b/pkgs/applications/networking/instant-messengers/mikutter/update.sh deleted file mode 100755 index 142fd8ca9424d..0000000000000 --- a/pkgs/applications/networking/instant-messengers/mikutter/update.sh +++ /dev/null @@ -1,51 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p bundler bundix curl jq common-updater-scripts -# shellcheck shell=bash - -set -euo pipefail - -main() { - local currentVer="$1" - local scriptDir="$2" - local latestVer - local srcDir - - if [[ -z "$UPDATE_NIX_ATTR_PATH" ]]; then - echo "[ERROR] Please run the following instead:" >&2 - echo >&2 - echo " % nix-shell maintainers/scripts/update.nix --argstr path mikutter" >&2 - exit 1 - fi - - latestVer="$(queryLatestVersion)" - if [[ "$currentVer" == "$latestVer" ]]; then - echo "[INFO] mikutter is already up to date" >&2 - exit - fi - - update-source-version "$UPDATE_NIX_ATTR_PATH" "$latestVer" - - cd "$scriptDir" - - rm -rf deps - mkdir deps - cd deps - - srcDir="$(nix-build ../../../../../.. --no-out-link -A mikutter.src)" - tar xvf "$srcDir" --strip-components=1 - find . -not -name Gemfile -exec rm {} \; - find . -type d -exec rmdir -p --ignore-fail-on-non-empty {} \; || true - - bundle lock - bundix -} - -queryLatestVersion() { - curl -sS 'https://mikutter.hachune.net/download.json?count=1' \ - | jq -r '.[].version_string' \ - | head -n1 -} - -main "$@" - -# vim:set ft=bash: diff --git a/pkgs/applications/networking/instant-messengers/mm/default.nix b/pkgs/applications/networking/instant-messengers/mm/default.nix index fd5fd66c66cc2..2fa65fddfd1d0 100644 --- a/pkgs/applications/networking/instant-messengers/mm/default.nix +++ b/pkgs/applications/networking/instant-messengers/mm/default.nix @@ -7,7 +7,7 @@ buildGoModule { src = fetchgit { url = "https://git.lost.host/meutraa/mm.git"; rev = "e5fa8eeb845aac8f28fc36013ee8a1dbe1e5710c"; - sha256 = "sha256-SdD4EE/rc85H7xqKB/kU8XFsC63i1sVObPha/zrxFGk="; + hash = "sha256-SdD4EE/rc85H7xqKB/kU8XFsC63i1sVObPha/zrxFGk="; }; vendorHash = "sha256-zJJ9PzQShv2iRNyCg1XVscbwjV9ZtMIojJDtXXm3rVM="; @@ -17,6 +17,6 @@ buildGoModule { mainProgram = "mm"; homepage = "https://git.lost.host/meutraa/mm"; license = licenses.isc; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/nchat/default.nix b/pkgs/applications/networking/instant-messengers/nchat/default.nix index 0e3c7f6803fb7..b9183b2d7645f 100644 --- a/pkgs/applications/networking/instant-messengers/nchat/default.nix +++ b/pkgs/applications/networking/instant-messengers/nchat/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { readline sqlite zlib - ] ++ lib.optionals stdenv.isDarwin [ AppKit Cocoa Foundation ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit Cocoa Foundation ]; cmakeFlags = [ "-DHAS_WHATSAPP=OFF" # go module build required diff --git a/pkgs/applications/networking/instant-messengers/neosay/default.nix b/pkgs/applications/networking/instant-messengers/neosay/default.nix index 46ea22da5db81..b931cdb05a9d9 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 = [ ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/oysttyer/default.nix b/pkgs/applications/networking/instant-messengers/oysttyer/default.nix deleted file mode 100644 index 5dc09ae1f3eec..0000000000000 --- a/pkgs/applications/networking/instant-messengers/oysttyer/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ stdenv, lib, perl, perlPackages, coreutils, -fetchFromGitHub, makeWrapper }: - -stdenv.mkDerivation rec { - pname = "oysttyer"; - version = "2.10.0"; - - src = fetchFromGitHub { - owner = "oysttyer"; - repo = "oysttyer"; - rev = version; - sha256 = "0cm1hvi68iqgjsg15xdii271pklgzjn9j9afb1c460z71kgy3wz2"; - }; - - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ - perl - ]; - - propagatedBuildInputs = with perlPackages; [ - DateTimeFormatDateParse - TermReadLineTTYtter - TermReadKey - ]; - - installPhase = '' - ${coreutils}/bin/install -Dm755 \ - oysttyer.pl \ - $out/bin/oysttyer - - wrapProgram $out/bin/oysttyer \ - --prefix PERL5LIB : $PERL5LIB - ''; - - meta = with lib; { - description = "Perl Console Twitter Client"; - homepage = "http://oysttyer.github.io/"; - maintainers = with maintainers; [ woffs ]; - license = with licenses; [ ffsl ]; - }; -} diff --git a/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix b/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix index f12a51d751913..8a6391892ae40 100644 --- a/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix +++ b/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix @@ -5,6 +5,7 @@ , installShellFiles , nixosTests , enableDbusUi ? true +, wrapGAppsHook3 }: python3Packages.buildPythonApplication rec { @@ -24,7 +25,6 @@ python3Packages.buildPythonApplication rec { installShellFiles ] ++ (with python3Packages; [ setuptools - pythonRelaxDepsHook ]); pythonRelaxDeps = [ @@ -40,11 +40,10 @@ python3Packages.buildPythonApplication rec { janus keyring logbook - matrix-nio + (matrix-nio.override { withOlm = true; }) peewee prompt-toolkit ] - ++ matrix-nio.optional-dependencies.e2e ++ lib.optionals enableDbusUi optional-dependencies.ui; optional-dependencies.ui = with python3Packages; [ @@ -62,8 +61,17 @@ python3Packages.buildPythonApplication rec { ] ++ lib.flatten (lib.attrValues optional-dependencies); + nativeBuildInputs = lib.optionals enableDbusUi [ + wrapGAppsHook3 + ]; + + dontWrapGApps = enableDbusUi; + makeWrapperArgs = lib.optionals enableDbusUi [ + "\${gappsWrapperArgs[@]}" + ]; + # darwin has difficulty communicating with server, fails some integration tests - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; postInstall = '' installManPage docs/man/*.[1-9] diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix index 9300a73b175db..c2c8f98251b66 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix @@ -79,14 +79,14 @@ let ] ++ lib.optional withOpenssl openssl ++ lib.optionals withGnutls [ gnutls libgcrypt ] - ++ lib.optionals stdenv.isLinux [ gtk2 gtkspell2 farstream ] - ++ lib.optional stdenv.isDarwin gtk2-x11; + ++ lib.optionals stdenv.hostPlatform.isLinux [ gtk2 gtkspell2 farstream ] + ++ lib.optional stdenv.hostPlatform.isDarwin gtk2-x11; propagatedBuildInputs = [ pkg-config gettext ] ++ (with perlPackages; [ perl XMLParser ]) - ++ lib.optional stdenv.isLinux gtk2 - ++ lib.optional stdenv.isDarwin gtk2-x11; + ++ lib.optional stdenv.hostPlatform.isLinux gtk2 + ++ lib.optional stdenv.hostPlatform.isDarwin gtk2-x11; patches = [ ./add-search-path.patch @@ -107,7 +107,7 @@ let ] ++ lib.optionals withCyrus_sasl [ "--enable-cyrus-sasl=yes" ] ++ lib.optionals withGnutls [ "--enable-gnutls=yes" "--enable-nss=no" ] - ++ lib.optionals stdenv.isDarwin [ "--disable-gtkspell" "--disable-vv" ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "--disable-gtkspell" "--disable-vv" ] ++ lib.optionals stdenv.cc.isClang [ "CFLAGS=-Wno-error=int-conversion" ]; enableParallelBuilding = true; @@ -121,7 +121,7 @@ let # In particular, this detects missing python imports in some of the tools. postFixup = let # TODO: python is a script, so it doesn't work as interpreter on darwin - binsToTest = lib.optionalString stdenv.isLinux "purple-remote," + "pidgin,finch"; + binsToTest = lib.optionalString stdenv.hostPlatform.isLinux "purple-remote," + "pidgin,finch"; in lib.optionalString doInstallCheck '' for f in "''${!outputBin}"/bin/{${binsToTest}}; do echo "Testing: $f --help" diff --git a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/carbons/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/carbons/default.nix index f702a667ae16f..d24504f8260ca 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/carbons/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/carbons/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { description = "XEP-0280: Message Carbons plugin for libpurple"; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/default.nix index 4d4fa9521fc41..09d7bed922ee7 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/default.nix @@ -14,7 +14,8 @@ lib.makeScope newScope (self: plugins = []; }; - pidginPackages = self; + # Prevent `pkgs/top-level/release-attrpaths-superset.nix` from recursing here. + pidginPackages = self // { pidginPackages = self.pidginPackages // { __attrsFailEvaluation = true; }; }; pidgin-indicator = callPackage ./pidgin-indicator { }; diff --git a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/pidgin-skypeweb/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/pidgin-skypeweb/default.nix index d7c3c6cacabd9..fc877115ad15b 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/pidgin-skypeweb/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/pidgin-skypeweb/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { description = "SkypeWeb plugin for Pidgin"; license = licenses.gpl3; platforms = platforms.linux; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-googlechat/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-googlechat/default.nix index b274b55ac228a..4fb4a1c1c26dc 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-googlechat/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-googlechat/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation { description = "Native Google Chat support for pidgin"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ dtzWill ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-hangouts/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-hangouts/default.nix index 653708abe3b69..e3713afbec0eb 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-hangouts/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-hangouts/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation { description = "Native Hangouts support for pidgin"; license = licenses.gpl3; platforms = platforms.linux; - maintainers = with maintainers; [ ralith ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-lurch/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-lurch/default.nix index c0497ed86ce14..2348e1a877ec6 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-lurch/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-lurch/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "gkdr"; repo = "lurch"; rev = "v${version}"; - sha256 = "sha256-yyzotKL1Z4B2BxloJndJKemONMPLG9pVDVe2K5AL05g="; + hash = "sha256-yyzotKL1Z4B2BxloJndJKemONMPLG9pVDVe2K5AL05g="; fetchSubmodules = true; }; diff --git a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-mm-sms/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-mm-sms/default.nix index 4989c36d83445..1b84b1a93ab22 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-mm-sms/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-mm-sms/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { description = "Libpurple plugin for sending and receiving SMS via Modemmanager"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-signald/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-signald/default.nix index 50ae99ceaecfe..c3ff29cb09fbe 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-signald/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-signald/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "hoehermann"; repo = "libpurple-signald"; rev = "v${version}"; - sha256 = "sha256-2LiHjVRBwdPbfravIVM+gvsh3Gq4bhjtRD6eWAbkWmc="; + hash = "sha256-2LiHjVRBwdPbfravIVM+gvsh3Gq4bhjtRD6eWAbkWmc="; fetchSubmodules = true; }; diff --git a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/tdlib-purple/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/tdlib-purple/default.nix index 1a1fd3b409a66..26c67b070e5e8 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/tdlib-purple/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/tdlib-purple/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DNoVoip=True" ]; # libtgvoip required - env.NIX_CFLAGS_COMPILE = toString (lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ "-U__ARM_NEON__" ]); + env.NIX_CFLAGS_COMPILE = toString (lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ "-U__ARM_NEON__" ]); meta = with lib; { homepage = "https://github.com/ars3niy/tdlib-purple"; diff --git a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/window-merge/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/window-merge/default.nix index c5437e965ed87..bcc09b1f6481e 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/window-merge/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/window-merge/default.nix @@ -16,6 +16,6 @@ stdenv.mkDerivation rec { description = "Pidgin plugin that merges the Buddy List window with a conversation window"; license = licenses.gpl3; platforms = platforms.linux; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/qq/default.nix b/pkgs/applications/networking/instant-messengers/qq/default.nix deleted file mode 100644 index cbb23559ae61f..0000000000000 --- a/pkgs/applications/networking/instant-messengers/qq/default.nix +++ /dev/null @@ -1,120 +0,0 @@ -{ alsa-lib -, cups -, dpkg -, fetchurl -, glib -, libssh2 -, gtk3 -, lib -, libayatana-appindicator -, libdrm -, libgcrypt -, libkrb5 -, libnotify -, mesa # for libgbm -, libpulseaudio -, libGL -, nss -, xorg -, systemd -, stdenv -, vips -, at-spi2-core -, autoPatchelfHook -, makeShellWrapper -, wrapGAppsHook3 -, commandLineArgs ? "" -}: - -let - sources = import ./sources.nix; - srcs = { - x86_64-linux = fetchurl { - url = sources.amd64_url; - hash = sources.amd64_hash; - }; - aarch64-linux = fetchurl { - url = sources.arm64_url; - hash = sources.arm64_hash; - }; - }; - src = srcs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); -in -stdenv.mkDerivation { - pname = "qq"; - version = sources.version; - inherit src; - - nativeBuildInputs = [ - autoPatchelfHook - makeShellWrapper - wrapGAppsHook3 - dpkg - ]; - - buildInputs = [ - alsa-lib - at-spi2-core - cups - glib - gtk3 - libdrm - libpulseaudio - libgcrypt - libkrb5 - mesa - nss - vips - xorg.libXdamage - ]; - - dontWrapGApps = true; - - runtimeDependencies = map lib.getLib [ - systemd - ]; - - installPhase = '' - runHook preInstall - - mkdir -p $out/bin - cp -r opt $out/opt - cp -r usr/share $out/share - substituteInPlace $out/share/applications/qq.desktop \ - --replace "/opt/QQ/qq" "$out/bin/qq" \ - --replace "/usr/share" "$out/share" - 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 ]}" \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ - --add-flags ${lib.escapeShellArg commandLineArgs} \ - "''${gappsWrapperArgs[@]}" - - # Remove bundled libraries - rm -r $out/opt/QQ/resources/app/sharp-lib - - # https://aur.archlinux.org/cgit/aur.git/commit/?h=linuxqq&id=f7644776ee62fa20e5eb30d0b1ba832513c77793 - rm -r $out/opt/QQ/resources/app/libssh2.so.1 - - # https://github.com/microcai/gentoo-zh/commit/06ad5e702327adfe5604c276635ae8a373f7d29e - ln -s ${libayatana-appindicator}/lib/libayatana-appindicator3.so \ - $out/opt/QQ/libappindicator3.so - - ln -s ${libnotify}/lib/libnotify.so \ - $out/opt/QQ/libnotify.so - - runHook postInstall - ''; - - passthru.updateScript = ./update.sh; - - meta = with lib; { - homepage = "https://im.qq.com/linuxqq/"; - description = "Messaging app"; - platforms = [ "x86_64-linux" "aarch64-linux" ]; - license = licenses.unfree; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - maintainers = with lib.maintainers; [ fee1-dead ]; - }; -} diff --git a/pkgs/applications/networking/instant-messengers/qq/sources.nix b/pkgs/applications/networking/instant-messengers/qq/sources.nix deleted file mode 100644 index 4fa23026a9571..0000000000000 --- a/pkgs/applications/networking/instant-messengers/qq/sources.nix +++ /dev/null @@ -1,9 +0,0 @@ -# Generated by ./update.sh - do not update manually! -# Last updated: 2024-06-07 -{ - 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="; -} diff --git a/pkgs/applications/networking/instant-messengers/qq/update.sh b/pkgs/applications/networking/instant-messengers/qq/update.sh deleted file mode 100755 index 777ea2a90103a..0000000000000 --- a/pkgs/applications/networking/instant-messengers/qq/update.sh +++ /dev/null @@ -1,31 +0,0 @@ -#! /usr/bin/env nix-shell -#! nix-shell -i bash --pure --keep GITHUB_TOKEN -p nix git curl cacert nix-prefetch-git jq - -set -euo pipefail - -cd $(readlink -e $(dirname "${BASH_SOURCE[0]}")) - -payload=$(curl https://im.qq.com/rainbow/linuxQQDownload | grep -oP "var params= \K\{.*\}(?=;)") -amd64_url=$(jq -r .x64DownloadUrl.deb <<< "$payload") -arm64_url=$(jq -r .armDownloadUrl.deb <<< "$payload") - -version=$(grep -oP "(?<=/QQ_).*(?=_[0-9]{6})" <<< "$amd64_url") - -amd64_hash=$(nix-prefetch-url $amd64_url) -arm64_hash=$(nix-prefetch-url $arm64_url) - -# use friendlier hashes -amd64_hash=$(nix hash to-sri --type sha256 "$amd64_hash") -arm64_hash=$(nix hash to-sri --type sha256 "$arm64_hash") - -cat >sources.nix <<EOF -# Generated by ./update.sh - do not update manually! -# Last updated: $(date +%F) -{ - version = "$version"; - amd64_url = "$amd64_url"; - arm64_url = "$arm64_url"; - arm64_hash = "$arm64_hash"; - amd64_hash = "$amd64_hash"; -} -EOF diff --git a/pkgs/applications/networking/instant-messengers/qtox/default.nix b/pkgs/applications/networking/instant-messengers/qtox/default.nix index 09240ae4713b5..84b24dab2de79 100644 --- a/pkgs/applications/networking/instant-messengers/qtox/default.nix +++ b/pkgs/applications/networking/instant-messengers/qtox/default.nix @@ -53,10 +53,10 @@ mkDerivation rec { pcre qrencode sqlcipher - ] ++ lib.optionals stdenv.isDarwin [ AVFoundation ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ AVFoundation ]; nativeBuildInputs = [ cmake pkg-config qttools ] - ++ lib.optionals stdenv.isDarwin [ perl ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ perl ]; cmakeFlags = [ "-DGIT_DESCRIBE=v${version}" @@ -67,7 +67,7 @@ mkDerivation rec { ]; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Qt Tox client"; mainProgram = "qtox"; homepage = "https://tox.chat"; diff --git a/pkgs/applications/networking/instant-messengers/quaternion/default.nix b/pkgs/applications/networking/instant-messengers/quaternion/default.nix index 2a0bfce75631c..ef6bc08616c54 100644 --- a/pkgs/applications/networking/instant-messengers/quaternion/default.nix +++ b/pkgs/applications/networking/instant-messengers/quaternion/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: { ]; postInstall = - if stdenv.isDarwin then '' + if stdenv.hostPlatform.isDarwin then '' mkdir -p $out/Applications mv $out/bin/quaternion.app $out/Applications rmdir $out/bin || : diff --git a/pkgs/applications/networking/instant-messengers/rambox/default.nix b/pkgs/applications/networking/instant-messengers/rambox/default.nix index 9310154d04448..995284672bb85 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/default.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/default.nix @@ -2,11 +2,11 @@ let pname = "rambox"; - version = "2.3.4"; + version = "2.4.0"; src = fetchurl { url = "https://github.com/ramboxapp/download/releases/download/v${version}/Rambox-${version}-linux-x64.AppImage"; - hash = "sha256-YaLvqd0yr0wlsvjtoN/9GXoZIpjH26DInhWC0Vg62Rs="; + hash = "sha256-pm4Ji1gv5vNMgB9ZWNKMLZSUE9wBklQ/MnFOKHP+Rcc="; }; desktopItem = (makeDesktopItem { diff --git a/pkgs/applications/networking/instant-messengers/ripcord/default.nix b/pkgs/applications/networking/instant-messengers/ripcord/default.nix index 82d1fdff2e808..7e40f880d2761 100644 --- a/pkgs/applications/networking/instant-messengers/ripcord/default.nix +++ b/pkgs/applications/networking/instant-messengers/ripcord/default.nix @@ -14,7 +14,7 @@ mkDerivation rec { name = "${pname}-${version}.AppImage"; }; in appimageTools.extract { - name = "${pname}-${version}"; + inherit pname version; src = appimage; }; diff --git a/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix b/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix index 93fb435f3909a..95ab2c39b21dd 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.1.1"; 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-6NvQtc+IUWqixFwWUHvl+SkSl0pk3SK4VmQXoZYyqqg="; }; 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/session-desktop/default.nix b/pkgs/applications/networking/instant-messengers/session-desktop/default.nix index a272967119061..7eafae046a5e0 100644 --- a/pkgs/applications/networking/instant-messengers/session-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/session-desktop/default.nix @@ -1,32 +1,32 @@ -{ lib -, makeDesktopItem -, copyDesktopItems -, stdenvNoCC -, fetchurl -, appimageTools -, makeWrapper +{ + lib, + makeDesktopItem, + copyDesktopItems, + stdenvNoCC, + fetchurl, + appimageTools, + makeWrapper, }: let - version = "1.11.5"; + version = "1.13.2"; pname = "session-desktop"; src = fetchurl { url = "https://github.com/oxen-io/session-desktop/releases/download/v${version}/session-desktop-linux-x86_64-${version}.AppImage"; - hash = "sha256-Sma8e3A1tf7JmnlS4mbtlF98Ow5aRPqw+aUoitzCjmk="; - }; - appimage = appimageTools.wrapType2 { - inherit version pname src; - }; - appimage-contents = appimageTools.extractType2 { - inherit version pname src; + hash = "sha256-71v6CvlKa4m1LPG07eGhPqkpK60X4VrafCQyfjQR3rs="; }; + appimage = appimageTools.wrapType2 { inherit version pname src; }; + appimage-contents = appimageTools.extractType2 { inherit version pname src; }; in stdenvNoCC.mkDerivation { inherit version pname; src = appimage; - nativeBuildInputs = [ copyDesktopItems makeWrapper ]; + nativeBuildInputs = [ + copyDesktopItems + makeWrapper + ]; desktopItems = [ (makeDesktopItem { @@ -58,7 +58,10 @@ stdenvNoCC.mkDerivation { mainProgram = "session-desktop"; homepage = "https://getsession.org/"; license = licenses.gpl3Only; - maintainers = with maintainers; [ alexnortung ]; + maintainers = with maintainers; [ + alexnortung + cyewashish + ]; platforms = [ "x86_64-linux" ]; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; }; diff --git a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix index a6855b2539dd6..d20ef1f1817e0 100644 --- a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix @@ -2,22 +2,22 @@ stdenv.mkDerivation rec { pname = "signal-cli"; - version = "0.13.3"; + version = "0.13.6"; # Building from source would be preferred, but is much more involved. src = fetchurl { url = "https://github.com/AsamK/signal-cli/releases/download/v${version}/signal-cli-${version}.tar.gz"; - hash = "sha256-JNDl/esJdY+L+CGCAauPSeUID5eAaKChHqMf+jl4HuQ="; + hash = "sha256-OTKXLcLktWiSdRhGe7ioL2ViJQQcCjR1+2LlGoMnSgE="; }; - buildInputs = lib.optionals stdenv.isLinux [ libmatthew_java dbus dbus_java ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libmatthew_java dbus dbus_java ]; nativeBuildInputs = [ makeWrapper ]; installPhase = '' mkdir -p $out/bin cp -r lib $out/lib cp bin/signal-cli $out/bin/signal-cli - '' + (if stdenv.isLinux then '' + '' + (if stdenv.hostPlatform.isLinux then '' makeWrapper ${openjdk21_headless}/bin/java $out/bin/signal-cli \ --set JAVA_HOME "${openjdk21_headless}" \ --add-flags "-classpath '$out/lib/*:${libmatthew_java}/lib/jni'" \ @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { # /System/Library/Frameworks/Cocoa.framework/Versions/A/Cocoa: file system sandbox blocked stat() # /System/Library/Frameworks/Cocoa.framework/Versions/A/Cocoa: file system sandbox blocked stat() # /nix/store/in41dz8byyyz4c0w132l7mqi43liv4yr-stdenv-darwin/setup: line 1310: 2231 Abort trap: 6 signal-cli --version - doInstallCheck = stdenv.isLinux; + doInstallCheck = stdenv.hostPlatform.isLinux; installCheckPhase = '' export PATH=$PATH:$out/bin diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/copy-noto-emoji.py b/pkgs/applications/networking/instant-messengers/signal-desktop/copy-noto-emoji.py new file mode 100644 index 0000000000000..393519e5c1f04 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/copy-noto-emoji.py @@ -0,0 +1,118 @@ +"""Copy Noto Color Emoji PNGs into an extracted Signal ASAR archive. + +Signal loads small Apple emoji PNGs directly from +`node_modules/emoji-datasource-apple/img/apple/64`, and downloads and +caches large Apple emoji WebP files in `.proto` bundles on the fly. The +latter are not a copyright concern for the Nixpkgs cache, but would +result in inconsistent presentation between small and large emoji. + +We skip the complexity and buy some additional privacy by replacing the +`emoji://jumbo?emoji=` URL prefix with a `file://` path to the copied +PNGs inside the ASAR archive, and linking the `node_modules` PNG paths +directly to them. +""" + +import json +import shutil +import sys +from pathlib import Path + + +def signal_name_to_emoji(signal_emoji_name: str) -> str: + r"""Return the emoji corresponding to a Signal emoji name. + + Signal emoji names are concatenations of UTF‐16 code units, + represented in lowercase big‐endian hex padded to four digits. + + >>> signal_name_to_emoji("d83dde36200dd83cdf2bfe0f") + '😶🌫️' + >>> b"\xd8\x3d\xde\x36\x20\x0d\xd8\x3c\xdf\x2b\xfe\x0f".decode("utf-16-be") + '😶🌫️' + """ + hex_bytes = zip(signal_emoji_name[::2], signal_emoji_name[1::2]) + emoji_utf_16_be = bytes( + int("".join(hex_pair), 16) for hex_pair in hex_bytes + ) + return emoji_utf_16_be.decode("utf-16-be") + + +def emoji_to_noto_name(emoji: str) -> str: + r"""Return the Noto emoji name of an emoji. + + Noto emoji names are underscore‐separated Unicode scalar values, + represented in lowercase big‐endian hex padded to at least four + digits. Any U+FE0F variant selectors are omitted. + + >>> emoji_to_noto_name("😶🌫️") + '1f636_200d_1f32b' + >>> emoji_to_noto_name("\U0001f636\u200d\U0001f32b\ufe0f") + '1f636_200d_1f32b' + """ + return "_".join( + f"{ord(scalar_value):04x}" + for scalar_value in emoji + if scalar_value != "\ufe0f" + ) + + +def emoji_to_emoji_data_name(emoji: str) -> str: + r"""Return the npm emoji-data emoji name of an emoji. + + emoji-data emoji names are hyphen‐minus‐separated Unicode scalar + values, represented in lowercase big‐endian hex padded to at least + four digits. + + >>> emoji_to_emoji_data_name("😶🌫️") + '1f636-200d-1f32b-fe0f' + >>> emoji_to_emoji_data_name("\U0001f636\u200d\U0001f32b\ufe0f") + '1f636-200d-1f32b-fe0f' + """ + return "-".join(f"{ord(scalar_value):04x}" for scalar_value in emoji) + + +def _main() -> None: + noto_png_path, asar_root = (Path(arg) for arg in sys.argv[1:]) + asar_root = asar_root.absolute() + + out_path = asar_root / "images" / "nixpkgs-emoji" + out_path.mkdir(parents=True) + + emoji_data_out_path = ( + asar_root + / "node_modules" + / "emoji-datasource-apple" + / "img" + / "apple" + / "64" + ) + emoji_data_out_path.mkdir(parents=True) + + jumbomoji_json_path = asar_root / "build" / "jumbomoji.json" + with jumbomoji_json_path.open() as jumbomoji_json_file: + jumbomoji_packs = json.load(jumbomoji_json_file) + + for signal_emoji_names in jumbomoji_packs.values(): + for signal_emoji_name in signal_emoji_names: + emoji = signal_name_to_emoji(signal_emoji_name) + + try: + shutil.copy( + noto_png_path / f"emoji_u{emoji_to_noto_name(emoji)}.png", + out_path / emoji, + ) + except FileNotFoundError: + print( + f"Missing Noto emoji: {emoji} {signal_emoji_name}", + file=sys.stderr, + ) + continue + + ( + emoji_data_out_path / f"{emoji_to_emoji_data_name(emoji)}.png" + ).symlink_to(out_path / emoji) + + print(out_path.relative_to(asar_root)) + + +if __name__ == "__main__": + _main() diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix index 558ace43ec161..97abf0e749f66 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix @@ -1,10 +1,14 @@ { stdenv , lib +, callPackage , fetchurl , autoPatchelfHook +, noto-fonts-color-emoji , dpkg -, wrapGAppsHook3 -, makeWrapper +, asar +, rsync +, python3 +, buildPackages , nixosTests , gtk3 , atk @@ -57,6 +61,27 @@ let inherit (stdenv) targetPlatform; ARCH = if targetPlatform.isAarch64 then "arm64" else "x64"; + + # Noto Color Emoji PNG files for emoji replacement; see below. + noto-fonts-color-emoji-png = noto-fonts-color-emoji.overrideAttrs (prevAttrs: { + pname = "noto-fonts-color-emoji-png"; + + # The build produces 136×128 PNGs by default for arcane font + # reasons, but we want square PNGs. + buildFlags = prevAttrs.buildFlags or [ ] ++ [ "BODY_DIMENSIONS=128x128" ]; + + makeTargets = [ "compressed" ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share + mv build/compressed_pngs $out/share/noto-fonts-color-emoji-png + python3 add_aliases.py --srcdir=$out/share/noto-fonts-color-emoji-png + + runHook postInstall + ''; + }); in stdenv.mkDerivation rec { inherit pname version; @@ -71,12 +96,39 @@ stdenv.mkDerivation rec { src = fetchurl { inherit url hash; + recursiveHash = true; + downloadToTemp = true; + nativeBuildInputs = [ dpkg asar ]; + # Signal ships the Apple emoji set without a licence via an npm + # package and upstream does not seem terribly interested in fixing + # this; see: + # + # * <https://github.com/signalapp/Signal-Android/issues/5862> + # * <https://whispersystems.discoursehosting.net/t/signal-is-likely-violating-apple-license-terms-by-using-apple-emoji-in-the-sticker-creator-and-android-and-desktop-apps/52883> + # + # We work around this by replacing it with the Noto Color Emoji + # set, which is available under a FOSS licence and more likely to + # be used on a NixOS machine anyway. The Apple emoji are removed + # during `fetchurl` to ensure that the build doesn’t cache the + # unlicensed emoji files, but the rest of the work is done in the + # main derivation. + postFetch = '' + dpkg-deb -x $downloadedFile $out + asar extract "$out/opt/${dir}/resources/app.asar" $out/asar-contents + rm -r \ + "$out/opt/${dir}/resources/app.asar"{,.unpacked} \ + $out/asar-contents/node_modules/emoji-datasource-apple + ''; }; nativeBuildInputs = [ + rsync + asar + python3 autoPatchelfHook - dpkg - (wrapGAppsHook3.override { inherit makeWrapper; }) + # override doesn't preserve splicing https://github.com/NixOS/nixpkgs/issues/132651 + # Has to use `makeShellWrapper` from `buildPackages` even though `makeShellWrapper` from the inputs is spliced because `propagatedBuildInputs` would pick the wrong one because of a different offset. + (buildPackages.wrapGAppsHook3.override { makeWrapper = buildPackages.makeShellWrapper; }) ]; buildInputs = [ @@ -127,11 +179,13 @@ stdenv.mkDerivation rec { wayland ]; - unpackPhase = "dpkg-deb -x $src ."; - dontBuild = true; dontConfigure = true; + unpackPhase = '' + rsync -a --chmod=+w $src/ . + ''; + installPhase = '' runHook preInstall @@ -147,6 +201,30 @@ stdenv.mkDerivation rec { # Create required symlinks: ln -s libGLESv2.so "$out/lib/${dir}/libGLESv2.so.2" + # Copy the Noto Color Emoji PNGs into the ASAR contents. See `src` + # for the motivation, and the script for the technical details. + emojiPrefix=$( + python3 ${./copy-noto-emoji.py} \ + ${noto-fonts-color-emoji-png}/share/noto-fonts-color-emoji-png \ + asar-contents + ) + + # Replace the URL used for fetching large versions of emoji with + # the local path to our copied PNGs. + substituteInPlace asar-contents/preload.bundle.js \ + --replace-fail \ + 'emoji://jumbo?emoji=' \ + "file://$out/lib/${lib.escapeURL dir}/resources/app.asar/$emojiPrefix/" + + # `asar(1)` copies files from the corresponding `.unpacked` + # directory when extracting, and will put them back in the modified + # archive if you don’t specify them again when repacking. Signal + # leaves their native `.node` libraries unpacked, so we match that. + asar pack \ + --unpack '*.node' \ + asar-contents \ + "$out/lib/${dir}/resources/app.asar" + runHook postInstall ''; @@ -180,8 +258,20 @@ stdenv.mkDerivation rec { ''; homepage = "https://signal.org/"; changelog = "https://github.com/signalapp/Signal-Desktop/releases/tag/v${version}"; - license = lib.licenses.agpl3Only; - maintainers = with lib.maintainers; [ eclairevoyant mic92 equirosa urandom bkchr teutat3s ]; + license = [ + lib.licenses.agpl3Only + + # Various npm packages + lib.licenses.free + ]; + maintainers = with lib.maintainers; [ + mic92 + equirosa + urandom + bkchr + teutat3s + emily + ]; mainProgram = pname; platforms = [ "x86_64-linux" "aarch64-linux" ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/pyproject.toml b/pkgs/applications/networking/instant-messengers/signal-desktop/pyproject.toml new file mode 100644 index 0000000000000..eeee9c7287a05 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/pyproject.toml @@ -0,0 +1,15 @@ +[tool.mypy] +files = ["*.py"] +strict = true + +[tool.ruff] +line-length = 80 + +[tool.ruff.lint] +select = ["ALL"] +ignore = ["COM812", "D203", "D213", "ISC001", "T201"] +allowed-confusables = ["‐"] + +[tool.ruff.format] +docstring-code-format = true +docstring-code-line-length = "dynamic" diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-aarch64.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-aarch64.nix index cccaa12cc2b03..8f3eabb7bc279 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-aarch64.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-aarch64.nix @@ -2,7 +2,7 @@ callPackage ./generic.nix { } rec { pname = "signal-desktop"; dir = "Signal"; - version = "7.5.1"; + version = "7.23.0"; url = "https://github.com/0mniteck/Signal-Desktop-Mobian/raw/${version}/builds/release/signal-desktop_${version}_arm64.deb"; - hash = "sha256-X7B7eQQXTZ+ADLrrLI9XUsl7rHO9akMeW2zAgduXfLY="; + hash = "sha256-fQb2nYE1+q6DNcMF0z5NadGlffYaCFNgcu8IIGVUtf8="; } diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix index 8621aaf1b3eab..f557734764cdc 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix @@ -2,7 +2,7 @@ callPackage ./generic.nix { } rec { pname = "signal-desktop-beta"; dir = "Signal Beta"; - version = "7.14.0-beta.1"; + version = "7.25.0-beta.2"; url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop-beta/signal-desktop-beta_${version}_amd64.deb"; - hash = "sha256-SC7CCqylPkc/qmlSYlXJcVWGi1+hvRQ9qBGR6wqo6sk="; + hash = "sha256-7L+ldJYJXB9VkC12s8AyUdECVXnyN8PNo7AFIyEHcS8="; } 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..91b35e95441d6 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.26.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-A9gTphQ7FQm1iCutrDxAD2wazihn+4ZafJrqdZ8Nahk="; } diff --git a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix index 6f241957b552d..8cd6bed359fa8 100644 --- a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix +++ b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix @@ -1,27 +1,42 @@ -{ lib, stdenv, fetchFromGitHub, openssl, sqlite }: +{ + lib, + stdenv, + fetchFromGitHub, + + cmake, + pkg-config, + + darwin, + dbus, + openssl, + sqlite, +}: stdenv.mkDerivation rec { pname = "signalbackup-tools"; - version = "20240625"; + version = "20240929"; src = fetchFromGitHub { owner = "bepaald"; - repo = pname; + repo = "signalbackup-tools"; rev = version; - hash = "sha256-sEuSVyfbHqljXz0mHX0loIkw/OCwcBXE/iGD+55GRng="; + hash = "sha256-OXn/RMc2v099S8/atQTYz1YwSH0sD7o7ZImlrBmUlSE="; }; - postPatch = '' - patchShebangs BUILDSCRIPT_MULTIPROC.bash44 - ''; + nativeBuildInputs = [ + cmake + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ + pkg-config + ]; - buildInputs = [ openssl sqlite ]; - - buildPhase = '' - runHook preBuild - ./BUILDSCRIPT_MULTIPROC.bash44${lib.optionalString stdenv.isDarwin " --config nixpkgs-darwin"} - runHook postBuild - ''; + buildInputs = [ + openssl + sqlite + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ + dbus + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + darwin.apple_sdk_11_0.frameworks.Security + ]; installPhase = '' runHook preInstall diff --git a/pkgs/applications/networking/instant-messengers/signald/0001-Fetch-buildconfig-during-gradle-build-inside-Nix-FOD.patch b/pkgs/applications/networking/instant-messengers/signald/0001-Fetch-buildconfig-during-gradle-build-inside-Nix-FOD.patch deleted file mode 100644 index 4a49ff991e6bc..0000000000000 --- a/pkgs/applications/networking/instant-messengers/signald/0001-Fetch-buildconfig-during-gradle-build-inside-Nix-FOD.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 33d8de9ccce7eecb12542e0fc11131b5101e1aa8 Mon Sep 17 00:00:00 2001 -From: Maximilian Bosch <maximilian@mbosch.me> -Date: Sat, 26 Feb 2022 12:33:13 +0100 -Subject: [PATCH] Fetch buildconfig during gradle build inside Nix FOD - ---- - build.gradle | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/build.gradle b/build.gradle -index ea3fea1..01e444d 100644 ---- a/build.gradle -+++ b/build.gradle -@@ -82,6 +82,9 @@ static String getVersion() { - - repositories { - maven {url "https://gitlab.com/api/v4/groups/6853927/-/packages/maven"} // https://gitlab.com/groups/signald/-/packages -+ maven { -+ url "https://plugins.gradle.org/m2/" -+ } - mavenCentral() - } - -@@ -101,6 +104,8 @@ dependencies { - implementation 'io.prometheus:simpleclient:0.16.0' - implementation 'io.prometheus:simpleclient_hotspot:0.16.0' - implementation 'io.prometheus:simpleclient_httpserver:0.16.0' -+ implementation 'com.github.gmazzo.buildconfig:com.github.gmazzo.buildconfig.gradle.plugin:3.0.3' -+ implementation 'org.jetbrains.kotlin:kotlin-scripting-jvm:1.7.10' - implementation 'com.squareup.okhttp3:logging-interceptor:4.10.0' - implementation 'io.sentry:sentry:6.11.0' - testImplementation 'org.junit.jupiter:junit-jupiter:5.9.0' -@@ -170,4 +175,4 @@ allprojects { - runtime { - options = ['--strip-java-debug-attributes', '--compress', '2', '--no-header-files', '--no-man-pages'] - modules = ['java.base', 'java.management', 'java.naming', 'java.sql', 'java.xml', 'jdk.crypto.ec', 'jdk.httpserver', 'java.desktop', 'jdk.unsupported'] --} -\ No newline at end of file -+} --- -2.38.3 - diff --git a/pkgs/applications/networking/instant-messengers/signald/0002-buildconfig-local-deps-fixes.patch b/pkgs/applications/networking/instant-messengers/signald/0002-buildconfig-local-deps-fixes.patch deleted file mode 100644 index bf583de53ba26..0000000000000 --- a/pkgs/applications/networking/instant-messengers/signald/0002-buildconfig-local-deps-fixes.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 4bf0aef4003f7494103a93ae1c2957b2cd32bb59 Mon Sep 17 00:00:00 2001 -From: Maximilian Bosch <maximilian@mbosch.me> -Date: Sat, 26 Feb 2022 12:36:15 +0100 -Subject: [PATCH 2/2] buildconfig/local deps fixes - ---- - build.gradle | 26 ++++++++++++++++++-------- - 1 file changed, 18 insertions(+), 8 deletions(-) - -diff --git a/build.gradle b/build.gradle -index ea3fea1..24415d8 100644 ---- a/build.gradle -+++ b/build.gradle -@@ -10,11 +10,21 @@ import org.gradle.nativeplatform.platform.internal.ArchitectureInternal - import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform - import org.gradle.nativeplatform.platform.internal.OperatingSystemInternal - -+buildscript { -+ repositories { -+ maven { -+ url(uri("@deps@")) -+ } -+ } -+ dependencies { -+ classpath "com.github.gmazzo:gradle-buildconfig-plugin:3.0.3" -+ } -+} -+ - plugins { -- id 'com.github.gmazzo.buildconfig' version '3.0.3' -- id 'org.beryx.runtime' version '1.12.7' - id 'application' - } -+apply plugin: "com.github.gmazzo.buildconfig" - - compileJava.options.encoding = 'UTF-8' - -@@ -82,7 +92,10 @@ static String getVersion() { - - repositories { - maven {url "https://gitlab.com/api/v4/groups/6853927/-/packages/maven"} // https://gitlab.com/groups/signald/-/packages -- mavenCentral() -+ mavenLocal() -+ maven { -+ url uri("@deps@") -+ } - } - - dependencies { -@@ -101,6 +114,8 @@ dependencies { - implementation 'io.prometheus:simpleclient:0.16.0' - implementation 'io.prometheus:simpleclient_hotspot:0.16.0' - implementation 'io.prometheus:simpleclient_httpserver:0.16.0' -+ implementation 'com.github.gmazzo.buildconfig:com.github.gmazzo.buildconfig.gradle.plugin:3.0.3' -+ implementation 'org.jetbrains.kotlin:kotlin-scripting-jvm:1.7.10' - implementation 'com.squareup.okhttp3:logging-interceptor:4.10.0' - implementation 'io.sentry:sentry:6.11.0' - testImplementation 'org.junit.jupiter:junit-jupiter:5.9.0' -@@ -166,8 +181,3 @@ allprojects { - } - } - } -- --runtime { -- options = ['--strip-java-debug-attributes', '--compress', '2', '--no-header-files', '--no-man-pages'] -- modules = ['java.base', 'java.management', 'java.naming', 'java.sql', 'java.xml', 'jdk.crypto.ec', 'jdk.httpserver', 'java.desktop', 'jdk.unsupported'] --} -\ No newline at end of file --- -2.38.3 - diff --git a/pkgs/applications/networking/instant-messengers/signald/default.nix b/pkgs/applications/networking/instant-messengers/signald/default.nix index 425e4b45ec613..6131e64e91524 100644 --- a/pkgs/applications/networking/instant-messengers/signald/default.nix +++ b/pkgs/applications/networking/instant-messengers/signald/default.nix @@ -1,10 +1,7 @@ { lib, stdenv, fetchFromGitLab, jdk17_headless, coreutils, findutils, gnused, -gradle, git, perl, makeWrapper, substituteAll, jre_minimal +gradle, git, makeWrapper, jre_minimal }: -# NOTE: when updating the package, please check if some of the hacks in `deps.installPhase` -# can be removed again! - let pname = "signald"; version = "0.23.2"; @@ -13,11 +10,9 @@ let owner = pname; repo = pname; rev = version; - sha256 = "sha256-EofgwZSDp2ZFhlKL2tHfzMr3EsidzuY4pkRZrV2+1bA="; + hash = "sha256-EofgwZSDp2ZFhlKL2tHfzMr3EsidzuY4pkRZrV2+1bA="; }; - gradleWithJdk = gradle.override { java = jdk17_headless; }; - jre' = jre_minimal.override { jdk = jdk17_headless; # from https://gitlab.com/signald/signald/-/blob/0.23.0/build.gradle#L173 @@ -37,76 +32,19 @@ let ]; }; - # fake build to pre-download deps into fixed-output derivation - deps = stdenv.mkDerivation { - pname = "${pname}-deps"; - inherit src version; - nativeBuildInputs = [ gradleWithJdk perl ]; - patches = [ ./0001-Fetch-buildconfig-during-gradle-build-inside-Nix-FOD.patch ]; - buildPhase = '' - export GRADLE_USER_HOME=$(mktemp -d) - gradle --no-daemon build - ''; - installPhase = '' - find $GRADLE_USER_HOME/caches/modules-2 -type f -regex '.*\.\(jar\|pom\)' \ - | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \ - | sh -x - - # WARNING: don't try this at home and wear safety-goggles while working with this! - # We patch around in the dependency tree to resolve some spurious dependency resolution errors. - # Whenever this package gets updated, please check if some of these hacks are obsolete! - - # Mimic existence of okio-3.2.0.jar. Originally known as okio-jvm-3.2.0 (and renamed), - # but gradle doesn't detect such renames, only fetches the latter and then fails - # in `signald.buildPhase` because it cannot find `okio-3.2.0.jar`. - pushd $out/com/squareup/okio/okio/3.2.0 &>/dev/null - cp -v ../../okio-jvm/3.2.0/okio-jvm-3.2.0.jar okio-3.2.0.jar - popd &>/dev/null - - # For some reason gradle fetches 2.14.1 instead of 2.14.0 here even though 2.14.0 is required - # according to `./gradlew -q dependencies`, so we pretend to have 2.14.0 available here. - # According to the diff in https://github.com/FasterXML/jackson-dataformats-text/compare/jackson-dataformats-text-2.14.0...jackson-dataformats-text-2.14.1 - # the only relevant change is in the code itself (and in the tests/docs), so this seems - # binary-compatible. - cp -v \ - $out/com/fasterxml/jackson/dataformat/jackson-dataformat-toml/2.14.1/jackson-dataformat-toml-2.14.1.jar \ - $out/com/fasterxml/jackson/dataformat/jackson-dataformat-toml/2.14.0/jackson-dataformat-toml-2.14.0.jar - ''; - # Don't move info to share/ - forceShare = [ "dummy" ]; - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - # Downloaded jars differ by platform - outputHash = { - x86_64-linux = "sha256-9DHykkvazVBN2kfw1Pbejizk/R18v5w8lRBHZ4aXL5Q="; - aarch64-linux = "sha256-RgAiRbUojBc+9RN/HpAzzpTjkjZ6q+jebDsqvah5XBw="; - }.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); - }; - in stdenv.mkDerivation { inherit pname src version; - patches = [ - (substituteAll { - src = ./0002-buildconfig-local-deps-fixes.patch; - inherit deps; - }) - ]; - - passthru = { - # Mostly for debugging purposes. - inherit deps; + mitmCache = gradle.fetchDeps { + inherit pname; + data = ./deps.json; }; - buildPhase = '' - runHook preBuild - - export GRADLE_USER_HOME=$(mktemp -d) + __darwinAllowLocalNetworking = true; - gradle --offline --no-daemon distTar + gradleFlags = [ "-Dorg.gradle.java.home=${jdk17_headless}" ]; - runHook postBuild - ''; + gradleBuildTask = "distTar"; installPhase = '' runHook preInstall @@ -120,10 +58,19 @@ in stdenv.mkDerivation { runHook postInstall ''; - nativeBuildInputs = [ git gradleWithJdk makeWrapper ]; + nativeBuildInputs = [ git gradle makeWrapper ]; doCheck = true; + gradleUpdateScript = '' + runHook preBuild + + SIGNALD_TARGET=x86_64-unknown-linux-gnu gradle nixDownloadDeps + SIGNALD_TARGET=aarch64-unknown-linux-gnu gradle nixDownloadDeps + SIGNALD_TARGET=x86_64-apple-darwin gradle nixDownloadDeps + SIGNALD_TARGET=aarch64-apple-darwin gradle nixDownloadDeps + ''; + meta = with lib; { description = "Unofficial daemon for interacting with Signal"; longDescription = '' @@ -138,6 +85,6 @@ in stdenv.mkDerivation { ]; license = licenses.gpl3Plus; maintainers = with maintainers; [ expipiplus1 ]; - platforms = [ "x86_64-linux" "aarch64-linux" ]; + platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/signald/deps.json b/pkgs/applications/networking/instant-messengers/signald/deps.json new file mode 100644 index 0000000000000..c3ec7f1e80d02 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/signald/deps.json @@ -0,0 +1,528 @@ +{ + "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", + "!version": 1, + "https://gitlab.com/api/v4/groups/6853927/-/packages/maven/org": { + "signald#libsignal-client-aarch64-apple-darwin/0.21.1": { + "jar": "sha256-GZyZBUokXraIAXXRoGMFoU48FzUym80J0XU2o/fbEgE=", + "module": "sha256-Z6k9Pt5ac5il2uK2ngQn0Mc8utSRChIl+pO7UeOmbJs=", + "pom": "sha256-b2SOa4rB+2SGAohZpsv7ZNUKPrcCBIONBiflsaLJA7A=" + }, + "signald#libsignal-client-aarch64-unknown-linux-gnu/0.21.1": { + "jar": "sha256-qkF5S7OwiRTABFoAWsXn2WsRCKe+GIcDeX+ENFjbhQg=", + "module": "sha256-Y/ir3VC1oORyDy19ZOctnIcDxgm+tbZSbKKz9VcBh3E=", + "pom": "sha256-E5pDb3MphJnKuE6xfizHrJ4qWXu4Tfv1hWPzynRkx+g=" + }, + "signald#libsignal-client-x86_64-apple-darwin/0.21.1": { + "jar": "sha256-Xc+eIRMlTTReDigOlcPxD4sIm44cwKoJ63tGBxx10pk=", + "module": "sha256-g2GHQh5ThVjmHn7Fiq4j0cPQDpZWl4Lx8kNq8E754fQ=", + "pom": "sha256-AHphg71FAR4tLhOXJP0TfHtSRothQmXL9h6/Vy2fg2I=" + }, + "signald#libsignal-client-x86_64-unknown-linux-gnu/0.21.1": { + "jar": "sha256-b9C1XUATmYS+QyZZT0twxY8e5VBYPX4PGc4KwMuz3MY=", + "module": "sha256-LdJQ1bGMcVuW5gMxwXNfco0fk9EqKUR3/dcXK9/f+uI=", + "pom": "sha256-vQvRDMrMPzs26mkIGyWealXU9n+F1zUsYi+0mGmB4Pc=" + }, + "signald#signal-service-java-aarch64-apple-darwin/2.15.3_unofficial_65": { + "jar": "sha256-AWLSsBwoo2bA95cX7cUZr8djin+pzrg7uQklKB5HaX8=", + "module": "sha256-Kx4rUnEcn7UqES53q7SBDzM1SrPYRW9hLyy8bTUpGqE=", + "pom": "sha256-lIWISMl3ZO1DTH0UvwrFWsWNvTT2T/l8XMnbVu64b90=" + }, + "signald#signal-service-java-aarch64-unknown-linux-gnu/2.15.3_unofficial_65": { + "jar": "sha256-rnh3En9Apq4zZPNCWCpat3bJwjegnWmfKclyWq9WV38=", + "module": "sha256-+ul/buZ1z6UMjhTWY4wrhz9sYrOOiOvbuLg3qSpxJKI=", + "pom": "sha256-4Bt4nts4B+MZJMVAjrxB5b85TaHhEfcslDDegkCVy7Y=" + }, + "signald#signal-service-java-x86_64-apple-darwin/2.15.3_unofficial_65": { + "jar": "sha256-Hkig/2S8txhBKyyzRcloqwc5rMhDELTbRSzy4XGg7Sw=", + "module": "sha256-e/U5v2nGOG3VbIHh0GDFBdIRo+qp3SyiTcsrum9T7gk=", + "pom": "sha256-B+8twiic8oQYWENG9d9ETv4eyYfdEuT6U0aNj87rB48=" + }, + "signald#signal-service-java-x86_64-unknown-linux-gnu/2.15.3_unofficial_65": { + "jar": "sha256-+p3jm8+Bg96BUIQdGT6LHczAhMfSqQVm5OlP5g+bEEs=", + "module": "sha256-GKfQ5h9vzUQL+1pNejIPyb1yjhtVn8CkkAGyaUr5RBM=", + "pom": "sha256-MCAEHWahZHEhR7FP7tDKII+FZM41e3Sc3fVuWwN8GhI=" + } + }, + "https://plugins.gradle.org/m2": { + "com/github/gmazzo#gradle-buildconfig-plugin/3.0.3": { + "jar": "sha256-ql6AIOvktizdRYn07XFhq1wkSlIJ5eWey7lFOP312to=", + "pom": "sha256-EVUqzLXaH59nxdNJoUjwxAP6MJKT85Vcc1qOvY1XH8I=" + }, + "com/github/gmazzo/buildconfig#com.github.gmazzo.buildconfig.gradle.plugin/3.0.3": { + "pom": "sha256-U2RlL3aMVri6eXtNL2AEDerbGlzB6lvG0gfFF88d7W4=" + }, + "com/github/gundy#semver4j/0.16.4": { + "jar": "sha256-3vm0Il+jchnhj4HQHw5S1z3KElejj1R1vp3Vj4dzZRA=", + "pom": "sha256-MgAdskQ7M53SH1t5/ynRreci0boIDCFL3oGfD3LRYE0=" + }, + "com/google/code/gson#gson-parent/2.8.6": { + "pom": "sha256-NzZGOFnsGSZyleiUlAroKo9oRBMDESL+Nc58/34wp3Q=" + }, + "com/google/code/gson#gson/2.8.6": { + "jar": "sha256-yPtIOQVNKAswM/gA0fWpfeLwKOuLoutFitKH5Tbz8l8=", + "pom": "sha256-IXRBWmRzMtMP2gS9HPxwij7MhOr3UX9ZYYjYJE4QORE=" + }, + "com/squareup#javapoet/1.11.1": { + "jar": "sha256-nL8hB75JnsbpWv02tY48oSKiQWbN03VzLlEmfWQFjpA=", + "pom": "sha256-+fP8Lz85koufe74oEXW3R9O1Wgkh8wLi4g0J7o5Bw+w=" + }, + "com/squareup#kotlinpoet/1.0.1": { + "jar": "sha256-vqGIRbA8fGXPkfc5iLoBlQuuZ5nDxRgrVo/nHN2JSqE=", + "pom": "sha256-R0rbJYzTlWjOYNanxzBoFzo6BhZ25AGBBVKnXiPuxdU=" + }, + "de/undercouch#gradle-download-task/4.0.2": { + "jar": "sha256-lSy/zF8hvuzLWSXMW6ZIrwmDklhEHdRNCH1kpX006Ho=", + "pom": "sha256-YvKRaNwv+1gMRKpgIfZVBRqcsKSN/Ue8fk6MpvljrbA=" + }, + "org/antlr#antlr4-master/4.5.2-1": { + "pom": "sha256-U1i0eNglVatXr9f8cjHWA7QPl3vnyjn0DF7FTnZ+tnQ=" + }, + "org/antlr#antlr4-runtime/4.5.2-1": { + "jar": "sha256-6DFBMAS87tfZFcOhdZJ7Haq8SXS3uKb4e7zohtNVA5g=", + "pom": "sha256-k7rJtrxxTVWZBO1DJCeCqMvlQ86/AQS7PswXhqnLZh4=" + }, + "org/apache#apache/19": { + "pom": "sha256-kfejMJbqabrCy69tAf65NMrAAsSNjIz6nCQLQPHsId8=" + }, + "org/apache/commons#commons-lang3/3.8.1": { + "jar": "sha256-2sgH9lsHaY/zmxsHv+89h64/1G2Ru/iivAKyqDFhb2g=", + "pom": "sha256-7I4J91QRaFIFvQ2deHLMNiLmfHbfRKCiJ7J4vqBEWNU=" + }, + "org/apache/commons#commons-parent/47": { + "pom": "sha256-io7LVwVTv58f+uIRqNTKnuYwwXr+WSkzaPunvZtC/Lc=" + }, + "org/beryx#badass-runtime-plugin/1.12.7": { + "jar": "sha256-N3Mx2VyxIFb6U6Qt9/RfF4svqG1sWF9w74TRIz0RB0U=", + "pom": "sha256-9vIy9OpH3sXV5y4jWaQG+pMd8/M2fiVdMmkkCAPBtkk=" + }, + "org/beryx/runtime#org.beryx.runtime.gradle.plugin/1.12.7": { + "pom": "sha256-95lWpL5pLmiBvaBnA0zUDOOqFX8ti9VWS5wAKWxrK3M=" + }, + "org/jetbrains#annotations/13.0": { + "jar": "sha256-rOKhDcji1f00kl7KwD5JiLLA+FFlDJS4zvSbob0RFHg=", + "pom": "sha256-llrrK+3/NpgZvd4b96CzuJuCR91pyIuGN112Fju4w5c=" + }, + "org/jetbrains/intellij/deps#trove4j/1.0.20181211": { + "jar": "sha256-r/t8haPIe9z2n/HbuE3hH2PckxKTk0vAjNerGN4INgE=", + "pom": "sha256-MQpqotkFNMMrj0bx/JjNDtrpXc38oj4oR+Xvqa4MAZo=" + }, + "org/jetbrains/kotlin#kotlin-android-extensions/1.4.31": { + "jar": "sha256-SNfgjtYPscadJ/VyBaihHEcdaBM55nlEpL0L8sLht5A=", + "pom": "sha256-6ezdB6SaaAPWXoSb5064ff36iLtElaSDK1zJJbvv2BY=" + }, + "org/jetbrains/kotlin#kotlin-annotation-processing-gradle/1.4.31": { + "jar": "sha256-E11Hgji/ecK6L8FKIgRG3uj3TmiyP5ELwuTRmBorcG0=", + "pom": "sha256-GkmFH2YJ3/XRCK5UUb76mNEcNYUsz7XZiOmqeBiUw4I=" + }, + "org/jetbrains/kotlin#kotlin-build-common/1.4.31": { + "jar": "sha256-2AXnlC+1fSIUHUODV8TAIv8bIa78+yRd3SLqa3SGKrQ=", + "pom": "sha256-DIaSpl7cpUpc/Pp9s+9OLx9nafNTf4jrMwWvw4PBwhw=" + }, + "org/jetbrains/kotlin#kotlin-compiler-embeddable/1.4.31": { + "jar": "sha256-X0oOX3T+lrzUzRQxfISlbnsGpqwW2z2+cMOwaAdzOZ4=", + "pom": "sha256-DWc4Z/LPQirjQPVloRWgPrtcdVxVe9bZyiiGTcw4iyQ=" + }, + "org/jetbrains/kotlin#kotlin-compiler-runner/1.4.31": { + "jar": "sha256-Ybrn0tzI82KaPrIUkKmsVTU8Io+iPdfids7u3jeHisE=", + "pom": "sha256-Yhlloc7kdCcFwWEjv1oN7mTkLZohXrDEvHMj40tEWxs=" + }, + "org/jetbrains/kotlin#kotlin-daemon-client/1.4.31": { + "jar": "sha256-fQJ+9Vrx3JC8BiRn8sjBbAwMlhZ2JdtAnyEhCSjtZAk=", + "pom": "sha256-edI2i+n6TYGBCdixMynI1WMVJSzTV69R9YzgT6f0izw=" + }, + "org/jetbrains/kotlin#kotlin-daemon-embeddable/1.4.31": { + "jar": "sha256-l9xXBLT9JbFamx7X/9hJiqWAeHf7ar5Ni2bW0Qs5zzY=", + "pom": "sha256-L94ntYnr0Y2EFnb7sh4/pi2ZD25eqqbKq1K0vgDj5+s=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin-api/1.4.31": { + "jar": "sha256-fAuO07UHXmM0/+rpg6Io9LFEUmMenUl9FhwMKiMN4mI=", + "pom": "sha256-MggUaX5sg1nwXU46eBVdL3MetImMyyXfUCKz+VT1vMc=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin-model/1.4.31": { + "jar": "sha256-9ATALOZ7ahMo2s4i2TW+/cZmBdzdziaVEBvkZshZJqk=", + "pom": "sha256-6EvVpsF+h0q9cIlbQcWI9I/mmzcq6rQTTVW8V2Dzp8s=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin/1.4.31": { + "jar": "sha256-/MsDW9vopXkf6e2zvUknrFByoMf9/UzFWDukRv8dfc8=", + "pom": "sha256-UQ2wwA85guaiBXihK97GuNB7d8Mdag2amJJw1Jl71kQ=" + }, + "org/jetbrains/kotlin#kotlin-reflect/1.4.31": { + "jar": "sha256-kfrQtCl0p9WBHjCmHwVwbhdrFEI1cXxt5+geOngQKPI=", + "pom": "sha256-jkm6uEPdhV8xXIfjkMUpqcojkSHYv/uFs6z6L2BgNpc=" + }, + "org/jetbrains/kotlin#kotlin-script-runtime/1.4.31": { + "jar": "sha256-t/j6k4MVJ2wTV7xr+VUDTUZ+20JCuxKjlscPNqxI0/k=", + "pom": "sha256-BnvN9hLIGnhfkdeSR4VpM6ulX9gUEAk8US6Qp+VOs4c=" + }, + "org/jetbrains/kotlin#kotlin-scripting-common/1.4.31": { + "jar": "sha256-7Gb0SktBsyUsvAkcnXwJa8i7WaIRGCt913xmlPCXfzw=", + "pom": "sha256-SZt/nSwkShmt9lDZOmOKIUYYm555w57W2jok/N1EQOU=" + }, + "org/jetbrains/kotlin#kotlin-scripting-compiler-embeddable/1.4.31": { + "jar": "sha256-0t+NwkUxRqwnvOwBiQxM9rBNGIZbFtnTFWYcqoc4c5I=", + "pom": "sha256-08xMx05y+9GrwJI5/eU/y2DkqAiZqokUfHIqzjN3MRY=" + }, + "org/jetbrains/kotlin#kotlin-scripting-compiler-impl-embeddable/1.4.31": { + "jar": "sha256-oWYNbJIDA+MEgTI51PjKD/gB8iQl1C3454+twFe6fAY=", + "pom": "sha256-v1odNDN3icu4zbwipO9OGBnUod+yoRdRjnRc+PrrBVE=" + }, + "org/jetbrains/kotlin#kotlin-scripting-jvm/1.4.31": { + "jar": "sha256-/A0P+l0IOsnJS8f4aUmgV+L5cRISs/xyt0X2eLPM/6o=", + "pom": "sha256-ZwY1ME+KCaH0smigpfb/klIwc7DNootBdASK6tfLHyk=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-common/1.4.31": { + "jar": "sha256-V5YvRDcadGtnghiggCqHEsYlUgbemmnt4hXjqksERwg=", + "pom": "sha256-FYKrEwto/LuJsukVVzwfmfi6O8aP3UUfazYtbFM1MYc=" + }, + "org/jetbrains/kotlin#kotlin-stdlib/1.4.31": { + "jar": "sha256-dqWZ2IsWforJCHm22qcixq00UrpxTJq6Gb0ZZUS5fxw=", + "pom": "sha256-hRnj56xe5wBSfuEEiOtDLxqhBtzN3nwGw7qyWKHdvU4=" + }, + "org/jetbrains/kotlin#kotlin-util-io/1.4.31": { + "jar": "sha256-742OP5+fXt4dcNPcIXRsiQySCi9APVaeHNW1KIE6XMA=", + "pom": "sha256-0JWe1skYAwhX/3VMyTLA44GDawd4IsoChO5uftTyItY=" + }, + "org/jetbrains/kotlin#kotlin-util-klib/1.4.31": { + "jar": "sha256-K8ihVTz6jLbeitaN50bY+thxQbF3SfCLpQcMaUxr2W0=", + "pom": "sha256-4VfHncwf0BzZaSstV21gbs9q8hGHhv6gTa/IBLpm93c=" + }, + "org/jetbrains/kotlinx#kotlinx-coroutines-core/1.3.8": { + "jar": "sha256-+Mi3SF1KV1445elJRVOdHU7M0yKKGZ4amqCU6MJhdO4=", + "pom": "sha256-JP+mW9+32JM0nLLnj7NxSkkN0KnAc3V0S7E26YBIB/0=" + }, + "org/ow2#ow2/1.5": { + "pom": "sha256-D4obEW52C4/mOJxRuE5LB6cPwRCC1Pk25FO1g91QtDs=" + }, + "org/ow2/asm#asm-analysis/9.1": { + "jar": "sha256-gaiAQbG4vtpaiplkYJgEbEhwlTgnDEne9oq/8lrDvjQ=", + "pom": "sha256-rFRUwRsDQxypUd9x+06GyMTIDfaXn5W3V8rtOrD0cVY=" + }, + "org/ow2/asm#asm-commons/9.1": { + "jar": "sha256-r8sm3B/BLAxKma2mcJCN2C4Y38SIyvXuklRplrRwwAw=", + "pom": "sha256-oPZRsnuK/pwOYS16Ambqy197HHh7xLWsgkXz16EYG38=" + }, + "org/ow2/asm#asm-tree/9.1": { + "jar": "sha256-/QCvpJ6VlddkYgWwnOy0p3ao/wugby1ZuPe/nHBLSnM=", + "pom": "sha256-tqANkgfANUYPgcfXDtQSU/DSFmUr7UX6GjBS/81QuUw=" + }, + "org/ow2/asm#asm-util/9.1": { + "jar": "sha256-OA4uzRb3zA8adrqboEkXm1dgpXsoKoekxlPK7/LNW9Y=", + "pom": "sha256-jd108aHiuTxwnZdtAgXnT7850AVwPJYmpe1cxXTK+88=" + }, + "org/ow2/asm#asm/9.1": { + "jar": "sha256-zaTeRV+rSP8Ly3xItGOUR9TehZp6/DCglKmG8JNr66I=", + "pom": "sha256-xoOpDdaPKxeIy9/EZH6pQF71kls3HBmfj9OdRNPO3o0=" + }, + "org/slf4j#slf4j-api/1.7.25": { + "jar": "sha256-GMSgCV1cHaa4F1kudnuyPSndL1YK1033X/OWHb3iW3k=", + "pom": "sha256-fNnXoLXZPf1GGhSIkbQ1Cc9AOpx/n7SQYNNVTfHIHh4=" + }, + "org/slf4j#slf4j-parent/1.7.25": { + "pom": "sha256-GPXFISDbA26I1hNviDnIMtB0vdqVx1bG9CkknS21SsY=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/sonatype/oss#oss-parent/9": { + "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" + } + }, + "https://repo.maven.apache.org/maven2": { + "com/fasterxml#oss-parent/48": { + "pom": "sha256-EbuiLYYxgW4JtiOiAHR0U9ZJGmbqyPXAicc9ordJAU8=" + }, + "com/fasterxml/jackson#jackson-base/2.14.0": { + "pom": "sha256-tZryboho1AOOURYUvXa7t0A2NXOVGWAvEOfaCTFYKw8=" + }, + "com/fasterxml/jackson#jackson-base/2.14.1": { + "pom": "sha256-GAFdG6y6mhRiWovxlBH1v62C0AYN83snvQLngTLEZ24=" + }, + "com/fasterxml/jackson#jackson-bom/2.14.0": { + "pom": "sha256-SfD44IeIL07MwxErYBt91RKZRyOklDo3oQ7LgHMiZso=" + }, + "com/fasterxml/jackson#jackson-bom/2.14.1": { + "pom": "sha256-eP35nlBQ/EhfQRfauMzL+2+mxoOF6184oJtlU3HUpsw=" + }, + "com/fasterxml/jackson#jackson-parent/2.14": { + "pom": "sha256-CQat2FWuOfkjV9Y/SFiJsI/KTEOl/kM1ItdTROB1exk=" + }, + "com/fasterxml/jackson/core#jackson-annotations/2.14.1": { + "jar": "sha256-0lW0uGP/jscUqPlvpVw0Yh1D27grgtP1dHZJakwJ4ec=", + "module": "sha256-JnpoC7csvXUsdreeuQiuDAq+sRT8scIKlnjwN4iYues=", + "pom": "sha256-id8WI4ax7eg6iATpCDlw0aYr310caenpkUdhtGf4CIM=" + }, + "com/fasterxml/jackson/core#jackson-core/2.14.1": { + "jar": "sha256-ARQYfilrNMkxwb+eWoQVK2K/q30YL1Yj85gtwto15SY=", + "module": "sha256-fIuANfkA8/HL2wa4x53CsYsR9q+hOwt0cZzuNJ/0wyk=", + "pom": "sha256-dHse68uLbe8o+u7cCSN0jxwVP8aksNjjsLyo3l/aY38=" + }, + "com/fasterxml/jackson/core#jackson-databind/2.14.1": { + "jar": "sha256-QjoMgG3ks/petKKGmDBeOjd3xzHhvPobLzo3YMe253M=", + "module": "sha256-2BeXfIprCq7aUZ+yp7jcugKzjDwnICT62jLFzOfj08s=", + "pom": "sha256-etsj1tdG7c+UbRwGKxmP+aAmwOIrMHuNXXnB4IU4xjU=" + }, + "com/fasterxml/jackson/dataformat#jackson-dataformat-toml/2.14.0": { + "module": "sha256-CsCosk9G8UO74qeQCyh914XgMRuf7s92MG2Is1aJBl0=", + "pom": "sha256-UbvlEh00Ij7Yc8nN6DWTvDl+mCSkknNvv7wuA65QrhA=" + }, + "com/fasterxml/jackson/dataformat#jackson-dataformat-toml/2.14.1": { + "jar": "sha256-EwRbLsSlXKVS8JF5N83Qt7rp1a5AnJVfbw0We5HIYkE=", + "module": "sha256-fYt0DCgjZAjWkDDdCewOQgy08dBIZEhM/muNxnJro8g=", + "pom": "sha256-k3qvGFoaW0g5TmkQusBVM+iPu8ICREy5aZ2D4BpNprc=" + }, + "com/fasterxml/jackson/dataformat#jackson-dataformats-text/2.14.0": { + "pom": "sha256-6tGzXPQ8iianI2wDCKi/w+5InCkyiOBRPqvLXnIyS4o=" + }, + "com/fasterxml/jackson/dataformat#jackson-dataformats-text/2.14.1": { + "pom": "sha256-+jI/nD8sJtfMzU4hNgkQRRVNRdwcFmHU+HakcfVix1k=" + }, + "com/google/code/findbugs#jsr305/3.0.2": { + "jar": "sha256-dmrSoHg/JoeWLIrXTO7MOKKLn3Ki0IXuQ4t4E+ko0Mc=", + "pom": "sha256-GYidvfGyVLJgGl7mRbgUepdGRIgil2hMeYr+XWPXjf4=" + }, + "com/google/protobuf#protobuf-bom/3.21.11": { + "pom": "sha256-b8t65uskGL00Pp3E4ED3nFk+9W957j0NKiEZzk/nr7Q=" + }, + "com/google/protobuf#protobuf-bom/3.21.12": { + "pom": "sha256-O72GqUBXpnHmPVX532EsZBlz1ecNba4qtFYk/xrfUcU=" + }, + "com/google/protobuf#protobuf-javalite/3.21.11": { + "jar": "sha256-2HsppVT9lD3WH0lPJjeyDeKI27EsS87oXp/k4q2JRFM=", + "pom": "sha256-RnCf68zs39yLZXU+9Bs5E7cPC2Ipu7U5XYCYXtziW/U=" + }, + "com/google/protobuf#protobuf-javalite/3.21.12": { + "jar": "sha256-z2eKs/vJkvS0ZUqGwDVXwhkE1jUgK2doj8suykQsLUA=", + "pom": "sha256-JX9QiTSYkVb912RUQ9uf4lbX06pEx93oMCfYHW6MutQ=" + }, + "com/google/protobuf#protobuf-parent/3.21.11": { + "pom": "sha256-kZpCn8dl43GYT5jpgoEcn6jMTqxgt0tEJM/NgMruCG8=" + }, + "com/google/protobuf#protobuf-parent/3.21.12": { + "pom": "sha256-fj44jW/7fyDmb/JfRbk3i0Igt7L9Jh9rO8IGs9/4u8g=" + }, + "com/googlecode/libphonenumber#libphonenumber-parent/8.12.54": { + "pom": "sha256-MzfHf0YxCWHoxuXPv4zgRDIXpDNqhqRneipt5U8mqHo=" + }, + "com/googlecode/libphonenumber#libphonenumber/8.12.54": { + "jar": "sha256-sjeB0pk7ailmUzsvWOEfM5L8FB+J6NVYNdo4Nl3guuk=", + "pom": "sha256-/SZ9HcfjYSkf+MEAbrBvTv2isfEt/jhTXZVf/sDBl/E=" + }, + "com/kohlschutter#kohlschutter-parent-multirelease/1.5.1": { + "pom": "sha256-m8IGSgNZlu+KoTo39gEtr+wrj7Ixf0gK0vYOcUu/BTM=" + }, + "com/kohlschutter#kohlschutter-parent/1.5.1": { + "pom": "sha256-QOM4M3T7g/qqpHW7scFy920D5DLYbpgsnfTO+ZQDh40=" + }, + "com/kohlschutter/junixsocket#junixsocket-common/2.6.1": { + "jar": "sha256-k9Eg4tSd31v97oJYdi/IdLJsZX8Cf41szBoFUVa/zeE=", + "pom": "sha256-RRjCFVtlyk9jbQJRRBK1kIFdbAsYKMsV8vUlXcA2Qzo=" + }, + "com/kohlschutter/junixsocket#junixsocket-native-common/2.6.1": { + "jar": "sha256-Yfu9bP0rbfZcDnsZsW/091XWyx0zO1ZvQoZAfxLxhnA=", + "pom": "sha256-t4zAQTztX2+M2jYiG5Yg0Bq4PPJMlwN2vEqH31S4jAQ=" + }, + "com/kohlschutter/junixsocket#junixsocket/2.6.1": { + "pom": "sha256-crOETfvf8/Nc6WPPHBro4cxJa/SoJMYFYb6QQvVHtfQ=" + }, + "com/squareup/okhttp3#logging-interceptor/4.10.0": { + "jar": "sha256-JzuiGGNsNPegkcBZ0VlgBUPgPqi+7yxfxWUltHOWFg4=", + "module": "sha256-/MsMrtTFnKXjEketzz+Zu9FeWn8NI8me4UbeMd0BhSI=", + "pom": "sha256-t/v3nfpIMFDEygZTdhoh0A1YWBkVUHo9nVGctmJgv98=" + }, + "com/squareup/okhttp3#okhttp/4.10.0": { + "jar": "sha256-dYDxT6FpEgbjcIGtP5IGOxYDsyjaC7MW8v7wLgVi5+w=", + "module": "sha256-bDBwggtZH17IwpSEl7Wmt0L0krcVvKz0t1EVs6j/qxU=", + "pom": "sha256-x/kgsofIOOHYHipj+Gd7svqZE3BYorEeZTWv3pyBoOU=" + }, + "com/squareup/okio#okio-jvm/3.2.0": { + "jar": "sha256-tkK670xXAFXeTLPRZnsrFtztkB/4BmNFoGNpGqBgJaQ=", + "module": "sha256-p3jzkIXtar/NaHESmGxjhapXrC2IQLIdlGs8IJXzDqQ=", + "pom": "sha256-XEUflKdr6oYbbvK/hOj1cgBUWWjIZVWr3+0Tx8otSJ0=" + }, + "com/squareup/okio#okio/3.2.0": { + "module": "sha256-aB9c7BcN5FuVST6e5wWGjrNa34mO4G+W4i0ZclDBsQQ=", + "pom": "sha256-i0b1jZua6xF4Nh1YpoZfTa1mWTDF/3tV4LqmHvOpcqE=" + }, + "info/picocli#picocli/4.7.0": { + "jar": "sha256-P2/7EM6FPvL2+TS0Z8zBPJwXCLTYOhpWZP2wfgeOjhw=", + "pom": "sha256-TeCd0zhFd9Vzo9lP85jNe4SUbEJkDzhSva2X9yl0YXQ=" + }, + "io/prometheus#parent/0.16.0": { + "pom": "sha256-citVEZCXsE1xFHnftg3VSye1kgoa63cCAnxEohX/xZY=" + }, + "io/prometheus#simpleclient/0.16.0": { + "jar": "sha256-IsN08jf3vE/bHw7C2jecC6AOaa0v/otq3lQ9cwYtN38=", + "pom": "sha256-/sCA0HqxWHXZccSugflR2mG1z/mZHPUOUwuo/KR3CXM=" + }, + "io/prometheus#simpleclient_common/0.16.0": { + "jar": "sha256-66bsJs5+QMu4cl4F+4Mkep9PRJRbnnUi4zdd3me58Fk=", + "pom": "sha256-d/ARCc4VB710Q+InJzdnSydST6rLDcuW47jt4LarnrY=" + }, + "io/prometheus#simpleclient_hotspot/0.16.0": { + "jar": "sha256-E08VbP60TL04ZAZYBu9dtVQ8aK9XjR1+5ZKD4umFP3M=", + "pom": "sha256-0haTfecjEg+3pMiLksW+oZEa+4i6dtDUjxdprYW2dek=" + }, + "io/prometheus#simpleclient_httpserver/0.16.0": { + "jar": "sha256-yrh94QtqR0FRzO68O2NDKalz/7YCzm7+8sD9l6kDZcg=", + "pom": "sha256-PGR/1vVhohsZ7ZcdBBn9Ri2fg/k0e8ChBaHCie6qqsQ=" + }, + "io/prometheus#simpleclient_tracer/0.16.0": { + "pom": "sha256-OBK7IrlfgbTDRg6eTnXDunL6ReRDqfzlMghCqr0OmcI=" + }, + "io/prometheus#simpleclient_tracer_common/0.16.0": { + "jar": "sha256-6Ep4SsjiTxgu5i2oC2tcgUB3S3W/pL+cw9O4OQ22JfY=", + "pom": "sha256-X5AHXOz80RKB3pzLSJaNEhKyRnDWhP/IQEQaUq6HXv8=" + }, + "io/prometheus#simpleclient_tracer_otel/0.16.0": { + "jar": "sha256-oqhMWb7zeWu3+cbyrot96LkFMT7ygYCsPef/Yd1o3z8=", + "pom": "sha256-frl58dwz6L5OWtFDDlQJcYpBeDwmd5qzEFJg9rQ20EY=" + }, + "io/prometheus#simpleclient_tracer_otel_agent/0.16.0": { + "jar": "sha256-etK7QN90p3LZ9URaPQNXm0nWs3pH1ekPbPP1ns9BrQY=", + "pom": "sha256-VSj4WIQ1SulNm8BnR+f1iS0JLAtVBVrnBWZo6gyhznw=" + }, + "io/reactivex/rxjava3#rxjava/3.0.13": { + "jar": "sha256-WYq69x28lw3Qcn5tX094bcmZ31uXLL8mExajLhVbLGk=", + "module": "sha256-khiPWj8bL7xUkxB3AKetrnAsHXc8TO02auitkjj2q+g=", + "pom": "sha256-yZCmX0c2tGOe0X1nhMqUdtPClRuGUqAKVnbAKHw24OQ=" + }, + "io/sentry#sentry/6.11.0": { + "jar": "sha256-77Huk5ks2xQSGMB71siYkzkvwzzcAaqHZjOuJNc8Wa4=", + "pom": "sha256-gOTkmRGslV0gUJp3OFODNyge4TUUFCIslXFpoyfWIfc=" + }, + "org/apache#apache/24": { + "pom": "sha256-LpO7q+NBOviaDDv7nmv3Hbyej5+xTMux14vQJ13xxSU=" + }, + "org/apache/logging#logging-parent/5": { + "pom": "sha256-3HYwz4LLMfTUdiFgVCIa/9UldG7pZUEkD0UvcyNwMCI=" + }, + "org/apache/logging/log4j#log4j-api/2.19.0": { + "jar": "sha256-XMskrZ+S52jQvEVtMGGnN5USYt+APgBNLK0Ja3WojWA=", + "pom": "sha256-DKkiQ2MurHxkRF8mO+UDBLdaerv7eIXNbIH1cRJ01KU=" + }, + "org/apache/logging/log4j#log4j-bom/2.19.0": { + "pom": "sha256-jGp6wVCpGKIpBzNf1VZpFHMe14E2l3DVJfZMDQf+h+c=" + }, + "org/apache/logging/log4j#log4j-core/2.19.0": { + "jar": "sha256-tKF5b6t7/DbfAVwbQFJFkUeZfo0hWnGZ1x0F+edH5PQ=", + "pom": "sha256-c1r8+2E2GCqidn62RZdhr9MrgleR1OCJXqGpSyrbmzk=" + }, + "org/apache/logging/log4j#log4j/2.19.0": { + "pom": "sha256-FWJLoaVtv4ZGBgdFMlM2GPoytGQvcoUfy+kuE2vq7JQ=" + }, + "org/apiguardian#apiguardian-api/1.1.2": { + "jar": "sha256-tQlEisUG1gcxnxglN/CzXXEAdYLsdBgyofER5bW3Czg=", + "module": "sha256-4IAoExN1s1fR0oc06aT7QhbahLJAZByz7358fWKCI/w=", + "pom": "sha256-MjVQgdEJCVw9XTdNWkO09MG3XVSemD71ByPidy5TAqA=" + }, + "org/bouncycastle#bcprov-jdk15on/1.70": { + "jar": "sha256-jzwg4+LVZdJvM+jUhXo30Nf4rDm2KnAmSW/Ksb2sMNQ=", + "pom": "sha256-bfS1t22QYgF2ZK0MooXlcVSugDYHy4nJcLOcwOAWq7A=" + }, + "org/checkerframework#checker-qual/3.5.0": { + "jar": "sha256-cpmQs/GKlWBvwlc4NraVi820TLUr+9G3qpwznP81paQ=", + "pom": "sha256-KDazuKeO2zGhgDWS5g/HZ7IfLRkHZGMbpu+gg3uzVyE=" + }, + "org/flywaydb#flyway-core/9.10.2": { + "jar": "sha256-OAf+3K2+ykuLiUCW0R2+zX8qosfO2QrDmM9/fgWzhT4=", + "pom": "sha256-2xICRB2Ebg6wWLppHmJbvq4p7Dj7HgmRtdsbhrxoeSE=" + }, + "org/flywaydb#flyway-parent/9.10.2": { + "pom": "sha256-HPI2yGyMqSFnUC8Fjw/IUagPpXG5UvEWUGhAqcIbOHg=" + }, + "org/jetbrains#annotations/13.0": { + "jar": "sha256-rOKhDcji1f00kl7KwD5JiLLA+FFlDJS4zvSbob0RFHg=", + "pom": "sha256-llrrK+3/NpgZvd4b96CzuJuCR91pyIuGN112Fju4w5c=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-common/1.6.20": { + "jar": "sha256-jaQKJSDTDcsQEhdv6T0k6C0Io+NGw34DQ7D7b2T2vgE=", + "pom": "sha256-PgTMk1HVzsQqRcBg+HM/bpTrx+NZExClGOBuiFB4mcg=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.6.10": { + "pom": "sha256-YSIR/5MPW1LHJP92NBfVqigd1+AyXDs1yNGBIKao300=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.6.20": { + "jar": "sha256-qi+i6BNVxNmN2X2iFpv0AfhCJhN49bHL6hqhGFXWdiA=", + "pom": "sha256-iBveiiNwhuKOA0KLTvMmj0SspfoajHb4lUdIRVyuvSE=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.6.10": { + "pom": "sha256-Q6ZJ+nN7+zX6SvTm3jPi8IpdGRBNdYLqQNvNK2N5Csw=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.6.20": { + "jar": "sha256-/asb8SDiteerbXiI6evAJOxrjKcpNhKWOV2rY0shNpU=", + "pom": "sha256-GEap+GBLC+HHGiEovb2diQJyAnlCf2ItK5pECsmjwwk=" + }, + "org/jetbrains/kotlin#kotlin-stdlib/1.6.20": { + "jar": "sha256-7rUcK2eyYjP9gdC8T4BE7ISXGIkJBXY87/2Eox4st5k=", + "pom": "sha256-oI6D3LDymFCYd94i1SZEZHbdsx6hx3Uw8sgfJNsWb5k=" + }, + "org/junit#junit-bom/5.9.0": { + "module": "sha256-oFTq9QFrWLvN6GZgREp8DdPiyvhNKhrV/Ey1JZecGbk=", + "pom": "sha256-2D6H8Wds3kQZHuxc2mkEkjkvJpI7HkmBSMpznf7XUpU=" + }, + "org/junit#junit-bom/5.9.1": { + "module": "sha256-kCbBZWaQ+hRa117Og2dCEaoSrYkwqRsQfC9c3s4vGxw=", + "pom": "sha256-sWPBz8j8H9WLRXoA1YbATEbphtdZBOnKVMA6l9ZbSWw=" + }, + "org/junit/jupiter#junit-jupiter-api/5.9.0": { + "jar": "sha256-PjcLy7HoV/2l8LIDckEW0CsF54j6oeslGIFKzPnPtbE=", + "module": "sha256-n5LPF5V1xN9pgpRwTRDxLozHFdaC+yDtzYrbxB/H8PQ=", + "pom": "sha256-ap2MRpjcjGkE1qwfXRMBiqf4KESbxbjO94/BQxzgghc=" + }, + "org/junit/jupiter#junit-jupiter-engine/5.9.0": { + "jar": "sha256-24bLszUnGfoKl4AO39CcIEY8fyq0oEaZJEQwvYlUWDs=", + "module": "sha256-sVnltbYmIiOP1v0oZPigEsHfbbK7JvEMqA4dIqzOLx0=", + "pom": "sha256-qLfR7QMvuStDJY140jmwGcX1g02swIT5l4PjTD7hLL8=" + }, + "org/junit/jupiter#junit-jupiter-params/5.9.0": { + "jar": "sha256-uM73mC3VPfhMlXpumsie3pZ88ubZNA70xReG4gVIxBs=", + "module": "sha256-QUkSewrR3JKJdqY4WIer3wpD9oNlRLK614OUh2kJenE=", + "pom": "sha256-DDOljPiR2vvGIfPG2cyCMnCDHrOxib3juIbMMDmQ/Ww=" + }, + "org/junit/jupiter#junit-jupiter/5.9.0": { + "jar": "sha256-LbLkqitegv78vxjQryDICVpD6UrZq50WvYdVfNqjl90=", + "module": "sha256-a1AJDfWdSZ4ycr41ULiBJdXJGojhzbSaEsLwi+p6hds=", + "pom": "sha256-Imsy40Pt4WvSls+36xXhmaFOQBxUJulUOsUDrM1E3JI=" + }, + "org/junit/platform#junit-platform-commons/1.9.0": { + "jar": "sha256-5YlLcQCUtMqvxigLiCmkOft2SQHqCuGNBu2AOIswm3o=", + "module": "sha256-SyAzP4ruVOgwRY2B0EXrjRfcBCTTEzKNtQmpzCSZsXo=", + "pom": "sha256-MJp9efG/577WChoXCKqovXGGHBKdIWhNaO305NnILCA=" + }, + "org/junit/platform#junit-platform-engine/1.9.0": { + "jar": "sha256-quxzX3REqfwFXiBlmN49gpwk6ceo7qbv3usZYgh/6BE=", + "module": "sha256-/3Xx1hE/RdWyXyUpUE3tiDmGoBLJtD0hrUI5jknXEGM=", + "pom": "sha256-G2rN+hUNaWYlIHYAAcaONlhl1o7xMNGZblK5SD7IYWE=" + }, + "org/opentest4j#opentest4j/1.2.0": { + "jar": "sha256-WIEt5giY2Xb7ge87YtoFxmBMGP1KJJ9QRCgkefwoavI=", + "pom": "sha256-qW5nGBbB/4gDvex0ySQfAlvfsnfaXStO4CJmQFk2+ZQ=" + }, + "org/postgresql#postgresql/42.5.1": { + "jar": "sha256-iei/+os3uUh5RgEsaQzwTzEDlTBRwcGT2I7ja2jTZa4=", + "pom": "sha256-R8t/RdAe0XyJ5mNlrU4v8anBR5AX35QhAPSgjLYyIRw=" + }, + "org/reactivestreams#reactive-streams/1.0.3": { + "jar": "sha256-He4EgQctGckptiPhVeFNL2CF3AEVKaCg2+/ITPVx2GU=", + "pom": "sha256-zO1GcXX0JXgz9ssHUQ/5ezx1oG4aWNiCo515hT1RxgI=" + }, + "org/slf4j#slf4j-api/2.0.5": { + "jar": "sha256-9KKXRQkpGsxJ/aSnmw1Z4V4rUkCV1kIcZjkbkjh69Mk=", + "pom": "sha256-nvLaYxSfXZ7M9608lTzfwSTrbRR79444YA9Z9gXF1G4=" + }, + "org/slf4j#slf4j-nop/2.0.5": { + "jar": "sha256-qY7YTal6RbnblFVrKH4vWW6h3qz4j4qw0ivRt+jvANk=", + "pom": "sha256-uCIqkKiTH/PY63GgELA8JGCqBWfKaWQvUCXulWd/Ga4=" + }, + "org/slf4j#slf4j-parent/2.0.5": { + "pom": "sha256-FwsRsEgVAFw7TMbfeckYQ+C5UPhbWP++jUg+0hkTuYs=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/xerial#sqlite-jdbc/3.40.0.0": { + "jar": "sha256-46G5CXh7M7s34E8lLzfkq0ekieHB1FqAmgmCw3lEXBA=", + "pom": "sha256-fI0dETimo05pNXbQe29U4h840iC4YtnhQFyy4KqIpDo=" + } + } +} diff --git a/pkgs/applications/networking/instant-messengers/silc-client/default.nix b/pkgs/applications/networking/instant-messengers/silc-client/default.nix index 9dd94225acfed..7a64e5cc12332 100644 --- a/pkgs/applications/networking/instant-messengers/silc-client/default.nix +++ b/pkgs/applications/networking/instant-messengers/silc-client/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { description = "Secure Internet Live Conferencing server"; mainProgram = "silc"; license = lib.licenses.gpl2; - maintainers = with lib.maintainers; [viric]; + maintainers = [ ]; platforms = with lib.platforms; linux; }; } diff --git a/pkgs/applications/networking/instant-messengers/sky/default.nix b/pkgs/applications/networking/instant-messengers/sky/default.nix deleted file mode 100644 index e949625875e58..0000000000000 --- a/pkgs/applications/networking/instant-messengers/sky/default.nix +++ /dev/null @@ -1,67 +0,0 @@ -{ lib -, mkDerivation -, fetchurl -, autoPatchelfHook -, zstd -, curl -, ffmpeg -, libjpeg_turbo -, libpam-wrapper -, libv4l -, pulseaudio -, zlib -, xorg -}: - -mkDerivation rec { - pname = "sky"; - version = "2.1.7801"; - - src = fetchurl { - url = "https://tel.red/repos/archlinux/sky-archlinux-${version}-1-x86_64.pkg.tar.zst"; - sha256 = "sha256-3xiq2b3CwNjRd09q0z8olrmLGhgkJGAVkZoJSIHom+k="; - }; - - nativeBuildInputs = [ autoPatchelfHook zstd ]; - - buildInputs = [ - curl - ffmpeg - libjpeg_turbo - libpam-wrapper - libv4l - pulseaudio - xorg.libX11 - xorg.libXScrnSaver - xorg.libXcursor - xorg.libXdamage - xorg.libXinerama - xorg.libXmu - xorg.libXrandr - xorg.libXtst - xorg.libXv - xorg.libxkbfile - zlib - ]; - - installPhase = '' - runHook preInstall - - mkdir $out - mv * $out/ - ln --force --symbolic $out/lib/sky/sky{,_sender} $out/bin - substituteInPlace $out/share/applications/sky.desktop \ - --replace /usr/ $out/ - - runHook postInstall - ''; - - meta = { - description = "Lync & Skype for Business on Linux"; - homepage = "https://tel.red/"; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - license = lib.licenses.unfree; - maintainers = [ lib.maintainers.wucke13 ]; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix deleted file mode 100644 index 99ff0b412e2cd..0000000000000 --- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ /dev/null @@ -1,129 +0,0 @@ -{ lib, stdenv, fetchurl, dpkg -, alsa-lib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, gdk-pixbuf, glib, glibc, gnome -, gtk3, libappindicator-gtk3, libnotify, libpulseaudio, libsecret, libv4l, nspr, nss, pango, systemd, wrapGAppsHook3, xorg -, at-spi2-atk, libuuid, at-spi2-core, libdrm, mesa, libxkbcommon, libxshmfence }: - -let - - # Please keep the version x.y.0.z and do not update to x.y.76.z because the - # source of the latter disappears much faster. - version = "8.110.76.107"; - - rpath = lib.makeLibraryPath [ - alsa-lib - atk - at-spi2-atk - at-spi2-core - cairo - cups - curl - dbus - expat - fontconfig - freetype - glib - glibc - libsecret - libuuid - - gdk-pixbuf - gtk3 - libappindicator-gtk3 - - gnome.gnome-keyring - - libnotify - libpulseaudio - nspr - nss - pango - stdenv.cc.cc - systemd - - libv4l - libdrm - mesa - libxkbcommon - libxshmfence - xorg.libxkbfile - xorg.libX11 - xorg.libXcomposite - xorg.libXcursor - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXi - xorg.libXrandr - xorg.libXrender - xorg.libXtst - xorg.libXScrnSaver - xorg.libxcb - ] + ":${stdenv.cc.cc.lib}/lib64"; - - src = - if stdenv.hostPlatform.system == "x86_64-linux" then - fetchurl { - urls = [ - "https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb" - "https://mirror.cs.uchicago.edu/skype/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb" - "https://web.archive.org/web/https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb" - ]; - sha256 = "sha256-ocXhISwEtwzPd1dOPjgIj5UQ/8sqq2gUtmZ8KZBAxKM="; - } - else - throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}"; - -in stdenv.mkDerivation { - pname = "skypeforlinux"; - inherit version; - - system = "x86_64-linux"; - - inherit src; - - nativeBuildInputs = [ - wrapGAppsHook3 - glib # For setup hook populating GSETTINGS_SCHEMA_PATH - ]; - - buildInputs = [ dpkg ]; - - dontUnpack = true; - installPhase = '' - mkdir -p $out - dpkg -x $src $out - cp -av $out/usr/* $out - rm -rf $out/opt $out/usr - rm $out/bin/skypeforlinux - - ln -s "$out/share/skypeforlinux/skypeforlinux" "$out/bin/skypeforlinux" - - # Otherwise it looks "suspicious" - chmod -R g-w $out - ''; - - postFixup = '' - for file in $(find $out -type f \( -perm /0111 -o -name \*.so\* -or -name \*.node\* \) ); do - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$file" || true - patchelf --set-rpath ${rpath}:$out/share/skypeforlinux $file || true - done - - # Fix the desktop link - substituteInPlace $out/share/applications/skypeforlinux.desktop \ - --replace /usr/bin/ "" - substituteInPlace $out/share/applications/skypeforlinux-share.desktop \ - --replace /usr/bin/ "" - substituteInPlace $out/share/kservices5/ServiceMenus/skypeforlinux.desktop \ - --replace /usr/bin/ "" - ''; - - meta = with lib; { - description = "Linux client for skype"; - homepage = "https://www.skype.com"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.unfree; - maintainers = with maintainers; [ panaeon jraygauthier ]; - platforms = [ "x86_64-linux" ]; - mainProgram = "skypeforlinux"; - }; -} diff --git a/pkgs/applications/networking/instant-messengers/slack-term/default.nix b/pkgs/applications/networking/instant-messengers/slack-term/default.nix index 2750336cf1d13..a7c302dbd4b62 100644 --- a/pkgs/applications/networking/instant-messengers/slack-term/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack-term/default.nix @@ -16,7 +16,7 @@ buildGoModule rec { description = "Slack client for your terminal"; homepage = "https://github.com/erroneousboat/slack-term"; license = licenses.mit; - maintainers = with maintainers; [ dtzWill ]; + maintainers = [ ]; mainProgram = "slack-term"; }; } diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index e27bbcdb1bca6..9359480b0efbe 100644 --- a/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -45,14 +45,14 @@ let pname = "slack"; - x86_64-darwin-version = "4.38.121"; - x86_64-darwin-sha256 = "1w0s6j8z8961sv4y00jxpy5gjlj0dswyxs15c7isb26ii11nn1i2"; + x86_64-darwin-version = "4.39.95"; + x86_64-darwin-sha256 = "1bvafqnh60ps5dba473l6zpm6hw7qcmpj55mxm6amakvkp63d92s"; - x86_64-linux-version = "4.38.125"; - x86_64-linux-sha256 = "sha256-BJeFXZ8STbMCmGvYRoFsfsyIpGukQkuwv0m2NzE+89c="; + x86_64-linux-version = "4.39.95"; + x86_64-linux-sha256 = "06d4mnvk3fj57laygf08nlh970wb4jvq1kycv27h1bq6bq365b6n"; - aarch64-darwin-version = "4.38.121"; - aarch64-darwin-sha256 = "161z947p7a2d7584hybl77chab8y027cqpph2hd2s4b5k6bchkj5"; + aarch64-darwin-version = "4.39.95"; + aarch64-darwin-sha256 = "0kmbf9nd6ccng8a9qb02i2n2mcrjk45cqphx0k7drwd4nyn6zzmy"; version = { x86_64-darwin = x86_64-darwin-version; @@ -65,15 +65,15 @@ let base = "https://downloads.slack-edge.com"; in { x86_64-darwin = fetchurl { - url = "${base}/releases/macos/${version}/prod/x64/Slack-${version}-macOS.dmg"; + url = "${base}/desktop-releases/mac/universal/${version}/Slack-${version}-macOS.dmg"; sha256 = x86_64-darwin-sha256; }; x86_64-linux = fetchurl { - url = "${base}/releases/linux/${version}/prod/x64/slack-desktop-${version}-amd64.deb"; + url = "${base}/desktop-releases/linux/x64/${version}/slack-desktop-${version}-amd64.deb"; sha256 = x86_64-linux-sha256; }; aarch64-darwin = fetchurl { - url = "${base}/releases/macos/${version}/prod/arm64/Slack-${version}-macOS.dmg"; + url = "${base}/desktop-releases/mac/arm64/${version}/Slack-${version}-macOS.dmg"; sha256 = aarch64-darwin-sha256; }; }.${system} or throwSystem; @@ -207,6 +207,6 @@ let ''; }; in -if stdenv.isDarwin +if stdenv.hostPlatform.isDarwin then darwin else linux diff --git a/pkgs/applications/networking/instant-messengers/slack/update.sh b/pkgs/applications/networking/instant-messengers/slack/update.sh index eacd7b4284c71..8b66e30002843 100755 --- a/pkgs/applications/networking/instant-messengers/slack/update.sh +++ b/pkgs/applications/networking/instant-messengers/slack/update.sh @@ -19,9 +19,9 @@ if [[ "$nixpkgs_linux_version" == "$latest_linux_version" && \ exit 0 fi -linux_url="https://downloads.slack-edge.com/releases/linux/${latest_linux_version}/prod/x64/slack-desktop-${latest_linux_version}-amd64.deb" -mac_url="https://downloads.slack-edge.com/releases/macos/${latest_mac_version}/prod/x64/Slack-${latest_mac_version}-macOS.dmg" -mac_arm_url="https://downloads.slack-edge.com/releases/macos/${latest_mac_version}/prod/arm64/Slack-${latest_mac_version}-macOS.dmg" +linux_url="https://downloads.slack-edge.com/desktop-releases/linux/x64/${latest_linux_version}/slack-desktop-${latest_linux_version}-amd64.deb" +mac_url="https://downloads.slack-edge.com/desktop-releases/mac/universal/${latest_mac_version}/Slack-${latest_mac_version}-macOS.dmg" +mac_arm_url="https://downloads.slack-edge.com/desktop-releases/mac/arm64/${latest_mac_version}/Slack-${latest_mac_version}-macOS.dmg" linux_sha256=$(nix-prefetch-url ${linux_url}) mac_sha256=$(nix-prefetch-url ${mac_url}) mac_arm_sha256=$(nix-prefetch-url ${mac_arm_url}) diff --git a/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix b/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix deleted file mode 100644 index f59b9c3774bc6..0000000000000 --- a/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix +++ /dev/null @@ -1,107 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, makeWrapper -, makeDesktopItem -, copyDesktopItems -, yarn -, nodejs -, fetchYarnDeps -, fixup-yarn-lock -, electron -, alsa-utils -, which -, testers -, teams-for-linux -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "teams-for-linux"; - version = "1.4.27"; - - src = fetchFromGitHub { - owner = "IsmaelMartinez"; - repo = "teams-for-linux"; - rev = "v${finalAttrs.version}"; - hash = "sha256-nUHiveS1XI+vC2Tj1DK/DS4CrKTLMg1IYgTPWXuLrAc="; - }; - - offlineCache = fetchYarnDeps { - yarnLock = "${finalAttrs.src}/yarn.lock"; - hash = "sha256-jBwyIyiWeqNmOnxmVOr7c4oMWwHElEjM25sShhTMi78="; - }; - - nativeBuildInputs = [ yarn fixup-yarn-lock nodejs copyDesktopItems makeWrapper ]; - - configurePhase = '' - runHook preConfigure - - export HOME=$(mktemp -d) - yarn config --offline set yarn-offline-mirror $offlineCache - fixup-yarn-lock yarn.lock - yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive - patchShebangs node_modules/ - - runHook postConfigure - ''; - - buildPhase = '' - runHook preBuild - - yarn --offline electron-builder \ - --dir ${if stdenv.isDarwin then "--macos" else "--linux"} ${if stdenv.hostPlatform.isAarch64 then "--arm64" else "--x64"} \ - -c.electronDist=${electron}/libexec/electron \ - -c.electronVersion=${electron.version} - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - mkdir -p $out/share/{applications,teams-for-linux} - cp dist/${if stdenv.isDarwin then "darwin-" else "linux-"}${lib.optionalString stdenv.hostPlatform.isAarch64 "arm64-"}unpacked/resources/app.asar $out/share/teams-for-linux/ - - pushd build/icons - for image in *png; do - mkdir -p $out/share/icons/hicolor/''${image%.png}/apps - cp -r $image $out/share/icons/hicolor/''${image%.png}/apps/teams-for-linux.png - done - popd - - # Linux needs 'aplay' for notification sounds - makeWrapper '${electron}/bin/electron' "$out/bin/teams-for-linux" \ - ${lib.optionalString stdenv.isLinux '' - --prefix PATH : ${lib.makeBinPath [ alsa-utils which ]} \ - ''} \ - --add-flags "$out/share/teams-for-linux/app.asar" \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" - - runHook postInstall - ''; - - desktopItems = [(makeDesktopItem { - name = finalAttrs.pname; - exec = finalAttrs.pname; - icon = finalAttrs.pname; - desktopName = "Microsoft Teams for Linux"; - comment = finalAttrs.meta.description; - categories = [ "Network" "InstantMessaging" "Chat" ]; - })]; - - passthru.updateScript = ./update.sh; - passthru.tests.version = testers.testVersion rec { - package = teams-for-linux; - command = "HOME=$TMPDIR ${package.meta.mainProgram or package.pname} --version"; - }; - - meta = { - description = "Unofficial Microsoft Teams client for Linux"; - mainProgram = "teams-for-linux"; - homepage = "https://github.com/IsmaelMartinez/teams-for-linux"; - license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ muscaln lilyinstarlight qjoly chvp ]; - platforms = lib.platforms.unix; - broken = stdenv.isDarwin; - }; -}) diff --git a/pkgs/applications/networking/instant-messengers/teams-for-linux/update.sh b/pkgs/applications/networking/instant-messengers/teams-for-linux/update.sh deleted file mode 100755 index 650edf188611f..0000000000000 --- a/pkgs/applications/networking/instant-messengers/teams-for-linux/update.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p nix jq common-updater-scripts - -set -euo pipefail - -nixpkgs="$(git rev-parse --show-toplevel || (printf 'Could not find root of nixpkgs repo\nAre we running from within the nixpkgs git repo?\n' >&2; exit 1))" - -stripwhitespace() { - sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//' -} - -nixeval() { - nix --extra-experimental-features nix-command eval --json --impure -f "$nixpkgs" "$1" | jq -r . -} - -vendorhash() { - (nix --extra-experimental-features nix-command build --impure --argstr nixpkgs "$nixpkgs" --argstr attr "$1" --expr '{ nixpkgs, attr }: let pkgs = import nixpkgs {}; in with pkgs.lib; (getAttrFromPath (splitString "." attr) pkgs).overrideAttrs (attrs: { outputHash = fakeHash; })' --no-link 2>&1 >/dev/null | tail -n3 | grep -F got: | cut -d: -f2- | stripwhitespace) 2>/dev/null || true -} - -findpath() { - path="$(nix --extra-experimental-features nix-command eval --json --impure -f "$nixpkgs" "$1.meta.position" | jq -r . | cut -d: -f1)" - outpath="$(nix --extra-experimental-features nix-command eval --json --impure --expr "builtins.fetchGit \"$nixpkgs\"")" - - if [ -n "$outpath" ]; then - path="${path/$(echo "$outpath" | jq -r .)/$nixpkgs}" - fi - - echo "$path" -} - -attr="${UPDATE_NIX_ATTR_PATH:-teams-for-linux}" -version="$(cd "$nixpkgs" && list-git-tags --pname="$(nixeval "$attr".pname)" --attr-path="$attr" | grep '^v' | sed -e 's|^v||' | sort -V | tail -n1)" - -pkgpath="$(findpath "$attr")" - -updated="$(cd "$nixpkgs" && update-source-version "$attr" "$version" --file="$pkgpath" --print-changes | jq -r length)" - -if [ "$updated" -eq 0 ]; then - echo 'update.sh: Package version not updated, nothing to do.' - exit 0 -fi - -curhash="$(nixeval "$attr.offlineCache.outputHash")" -newhash="$(vendorhash "$attr.offlineCache")" - -if [ -n "$newhash" ] && [ "$curhash" != "$newhash" ]; then - sed -i -e "s|\"$curhash\"|\"$newhash\"|" "$pkgpath" -else - echo 'update.sh: New vendorHash same as old vendorHash, nothing to do.' -fi diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/client5.nix b/pkgs/applications/networking/instant-messengers/teamspeak/client5.nix index 86136dbb36d6a..c66c765a5038e 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/client5.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/client5.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { libnotify libpulseaudio libxkbcommon - mesa.drivers + mesa nss xorg.libX11 xorg.libXScrnSaver diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/server.nix b/pkgs/applications/networking/instant-messengers/teamspeak/server.nix index 577589f6a40b0..f77da2638c3dd 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/server.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/server.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchurl, postgresql, autoPatchelfHook, writeScript }: let - arch = if stdenv.is64bit then "amd64" else "x86"; + arch = if stdenv.hostPlatform.is64bit then "amd64" else "x86"; in stdenv.mkDerivation rec { pname = "teamspeak-server"; version = "3.13.7"; src = fetchurl { url = "https://files.teamspeak-services.com/releases/server/${version}/teamspeak3-server_linux_${arch}-${version}.tar.bz2"; - sha256 = if stdenv.is64bit + sha256 = if stdenv.hostPlatform.is64bit then "sha256-d1pXMamAmAHkyPkGbNm8ViobNoVTE5wSSfKgdA1QBB4=" else "sha256-aMEDOnvBeKfzG8lDFhU8I5DYgG53IsCDBMV2MUyJi2g="; }; 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..102500c1c41b7 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,56 @@ , range-v3 , tl-expected , hunspell -, glibmm +, gobject-introspection , jemalloc , rnnoise -, abseil-cpp , microsoft-gsl +, boost , 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.hostPlatform.isLinux then "kotatogram-desktop" else "Kotatogram"; in stdenv.mkDerivation rec { pname = "kotatogram-desktop"; - version = "1.4.9"; + version = "0-unstable-2024-09-01"; src = fetchFromGitHub { owner = "kotatogram"; repo = "kotatogram-desktop"; - rev = "k${version}"; - sha256 = "sha256-6bF/6fr8mJyyVg53qUykysL7chuewtJB8E22kVyxjHw="; + rev = "e30c1857bf38c354467f4e6a2a37b1252b4e28e6"; + hash = "sha256-kmJeqaDAVKhMWwcazy+gGB+55Kao67RJrlLvZQ+AtqY="; fetchSubmodules = true; }; patches = [ - ./kf594.patch - ./shortcuts-binary-path.patch + ./macos.patch + ./macos-opengl.patch ]; - postPatch = lib.optionalString stdenv.isLinux '' + postPatch = lib.optionalString stdenv.hostPlatform.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"' - '' + 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" + --replace-fail '"libpulse.so.0"' '"${libpulseaudio}/lib/libpulse.so.0"' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' + 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.hostPlatform.isDarwin; + nativeBuildInputs = [ pkg-config cmake @@ -120,10 +83,12 @@ stdenv.mkDerivation rec { python3 wrapQtAppsHook removeReferencesTo - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ # to build bundled libdispatch clang - extra-cmake-modules + gobject-introspection + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + lld ]; buildInputs = [ @@ -132,7 +97,7 @@ stdenv.mkDerivation rec { qtsvg lz4 xxHash - ffmpeg_4 + ffmpeg openalSoft minizip libopus @@ -141,15 +106,16 @@ stdenv.mkDerivation rec { rnnoise tg_owt microsoft-gsl - ] ++ lib.optionals stdenv.isLinux [ - kwayland + boost + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ + qtwayland + kcoreaddons alsa-lib libpulseaudio hunspell - glibmm jemalloc wayland - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ Cocoa CoreFoundation CoreServices @@ -180,27 +146,34 @@ stdenv.mkDerivation rec { MediaPlayer IOSurface Metal + NaturalLanguage libicns - ]; + ]); enableParallelBuilding = true; + env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { + NIX_CFLAGS_LINK = "-fuse-ld=lld"; + }; + cmakeFlags = [ "-DTDESKTOP_API_TEST=ON" - "-DDESKTOP_APP_QT6=OFF" ]; - installPhase = lib.optionalString stdenv.isDarwin '' + installPhase = lib.optionalString stdenv.hostPlatform.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.hostPlatform.isDarwin '' + wrapQtApp $out/Applications/${mainProgram}.app/Contents/MacOS/${mainProgram} ''; passthru = { @@ -208,8 +181,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 +193,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..941e5f80526b8 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/macos.patch @@ -0,0 +1,171 @@ +diff --git a/Telegram/SourceFiles/platform/mac/overlay_widget_mac.mm b/Telegram/SourceFiles/platform/mac/overlay_widget_mac.mm +index ef544803e9..69c61b3139 100644 +--- a/Telegram/SourceFiles/platform/mac/overlay_widget_mac.mm ++++ b/Telegram/SourceFiles/platform/mac/overlay_widget_mac.mm +@@ -97,9 +97,11 @@ void MacOverlayWidgetHelper::updateStyles(bool fullscreen) { + [window setTitleVisibility:NSWindowTitleHidden]; + [window setTitlebarAppearsTransparent:YES]; + [window setStyleMask:[window styleMask] | NSWindowStyleMaskFullSizeContentView]; ++#if 0 + if (@available(macOS 12.0, *)) { + _data->topNotchSkip = [[window screen] safeAreaInsets].top; + } ++#endif + } + + void MacOverlayWidgetHelper::refreshButtons(bool fullscreen) { +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_webrtc contains modified content +diff --git a/Telegram/lib_webrtc/webrtc/platform/mac/webrtc_environment_mac.mm b/Telegram/lib_webrtc/webrtc/platform/mac/webrtc_environment_mac.mm +index 7521c08..5e22da2 100644 +--- a/Telegram/lib_webrtc/webrtc/platform/mac/webrtc_environment_mac.mm ++++ b/Telegram/lib_webrtc/webrtc/platform/mac/webrtc_environment_mac.mm +@@ -364,6 +364,7 @@ EnvironmentMac::EnvironmentMac(not_null<EnvironmentDelegate*> delegate) + DefaultCaptureDeviceChangedMonitor.registerEnvironment(this); + AudioDeviceListChangedMonitor.registerEnvironment(this); + ++#if 0 + if (@available(macOS 14.0, *)) { + const auto weak = base::make_weak(this); + id block = [^(BOOL shouldBeMuted){ +@@ -387,6 +388,7 @@ EnvironmentMac::EnvironmentMac(not_null<EnvironmentDelegate*> delegate) + setInputMuteStateChangeHandler:block + error:nil]; + } ++#endif + } + + EnvironmentMac::~EnvironmentMac() { +@@ -537,15 +539,18 @@ void EnvironmentMac::devicesRequested(DeviceType type) { + } + + void EnvironmentMac::setCaptureMuted(bool muted) { ++#if 0 + if (@available(macOS 14.0, *)) { + if (!_captureMuteNotification) { + const auto value = muted ? YES : NO; + [[AVAudioApplication sharedInstance] setInputMuted:value error:nil]; + } + } ++#endif + } + + void EnvironmentMac::captureMuteSubscribe() { ++#if 0 + if (@available(macOS 14.0, *)) { + id observer = [[InputMuteObserver alloc] init]; + [[[NSWorkspace sharedWorkspace] notificationCenter] +@@ -578,6 +583,7 @@ void EnvironmentMac::captureMuteSubscribe() { + [observer release]; + }); + } ++#endif + } + + void EnvironmentMac::captureMuteUnsubscribe() { +@@ -595,6 +601,7 @@ void EnvironmentMac::captureMuteRestartAdm() { + void EnvironmentMac::setCaptureMuteTracker( + not_null<CaptureMuteTracker*> tracker, + bool track) { ++#if 0 + if (@available(macOS 14.0, *)) { + if (track) { + if (!_captureMuteTracker) { +@@ -619,6 +626,7 @@ void EnvironmentMac::setCaptureMuteTracker( + } + } + } ++#endif + } + + std::unique_ptr<Environment> CreateEnvironment( +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 e7808fc..34020f0 100644 +--- a/Telegram/lib_webview/webview/platform/mac/webview_mac.mm ++++ b/Telegram/lib_webview/webview/platform/mac/webview_mac.mm +@@ -334,6 +334,7 @@ Instance::Instance(Config config) { + _handler = [[Handler alloc] initWithMessageHandler:config.messageHandler navigationStartHandler:config.navigationStartHandler navigationDoneHandler:config.navigationDoneHandler dialogHandler:config.dialogHandler dataRequested:handleDataRequest]; + _dataRequestHandler = std::move(config.dataRequestHandler); + [configuration setURLSchemeHandler:_handler forURLScheme:stdToNS(kDataUrlScheme)]; ++#if 0 + if (@available(macOS 14, *)) { + if (config.userDataToken != LegacyStorageIdToken().toStdString()) { + NSUUID *uuid = UuidFromToken(config.userDataToken); +@@ -341,10 +342,13 @@ Instance::Instance(Config config) { + [uuid release]; + } + } ++#endif + _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]; +@@ -700,10 +704,12 @@ void *Instance::winId() { + } + + void Instance::setOpaqueBg(QColor opaqueBg) { ++#if 0 + if (@available(macOS 12.0, *)) { + [_webview setValue: @NO forKey: @"drawsBackground"]; + [_webview setUnderPageBackgroundColor:[NSColor clearColor]]; + } ++#endif + } + + void Instance::resizeToWindow() { +@@ -739,6 +745,7 @@ std::string GenerateStorageToken() { + } + + void ClearStorageDataByToken(const std::string &token) { ++#if 0 + if (@available(macOS 14, *)) { + if (!token.empty() && token != LegacyStorageIdToken().toStdString()) { + if (NSUUID *uuid = UuidFromToken(token)) { +@@ -754,6 +761,7 @@ void ClearStorageDataByToken(const std::string &token) { + } + } + } ++#endif + } + + } // namespace Webview 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..c136d121aa867 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.hostPlatform.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,13 +58,13 @@ stdenv.mkDerivation { libjpeg openssl libopus - ffmpeg_4 + ffmpeg protobuf openh264 - usrsctp + crc32c libvpx abseil-cpp - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libX11 libXtst libXcomposite @@ -121,7 +78,7 @@ stdenv.mkDerivation { mesa libdrm libGL - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.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/instant-messengers/telegram/telegram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix index 27617f930fae5..e3e8a3b3f6eb9 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix @@ -1,6 +1,5 @@ { lib , fetchFromGitHub -, fetchpatch , callPackage , pkg-config , cmake @@ -39,6 +38,7 @@ , xdg-utils , microsoft-gsl , rlottie +, ada , stdenv , darwin , lld @@ -60,18 +60,17 @@ let cxxStandard = "20"; }; }; - mainProgram = if stdenv.isLinux then "telegram-desktop" else "Telegram"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "telegram-desktop"; - version = "5.1.8"; + version = "5.5.5"; src = fetchFromGitHub { owner = "telegramdesktop"; repo = "tdesktop"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-YTCvniC8THoz0BUM/gkr97rhbbSVQ+SCE1H3qS68lIM="; + hash = "sha256-LWIOgyHp43bLN4RQtBKH2HitfVI6AKstPK5es2s+wVw="; }; patches = [ @@ -79,13 +78,10 @@ stdenv.mkDerivation rec { # the generated .desktop files contains references to unwrapped tdesktop, breaking scheme handling # and the scheme handler is already registered in the packaged .desktop file, rendering this unnecessary # see https://github.com/NixOS/nixpkgs/issues/218370 - (fetchpatch { - url = "https://salsa.debian.org/debian/telegram-desktop/-/raw/09b363ed5a4fcd8ecc3282b9bfede5fbb83f97ef/debian/patches/Disable-register-custom-scheme.patch"; - hash = "sha256-B8X5lnSpwwdp1HlvyXJWQPybEN+plOwimdV5gW6aY2Y="; - }) + ./scheme.patch ]; - postPatch = lib.optionalString stdenv.isLinux '' + postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioInputALSA.cpp \ --replace-fail '"libasound.so.2"' '"${alsa-lib}/lib/libasound.so.2"' substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioOutputALSA.cpp \ @@ -94,7 +90,7 @@ stdenv.mkDerivation rec { --replace-fail '"libpulse.so.0"' '"${libpulseaudio}/lib/libpulse.so.0"' substituteInPlace Telegram/lib_webview/webview/platform/linux/webview_linux_webkitgtk_library.cpp \ --replace-fail '"libwebkitgtk-6.0.so.4"' '"${webkitgtk_6_0}/lib/libwebkitgtk-6.0.so.4"' - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace Telegram/lib_webrtc/webrtc/platform/mac/webrtc_environment_mac.mm \ --replace-fail kAudioObjectPropertyElementMain kAudioObjectPropertyElementMaster ''; @@ -109,11 +105,11 @@ stdenv.mkDerivation rec { ninja python3 wrapQtAppsHook - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ gobject-introspection wrapGAppsHook3 extra-cmake-modules - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ lld ]; @@ -135,7 +131,8 @@ stdenv.mkDerivation rec { tg_owt microsoft-gsl rlottie - ] ++ lib.optionals stdenv.isLinux [ + ada + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ qtwayland gtk3 glib-networking @@ -147,7 +144,7 @@ stdenv.mkDerivation rec { hunspell webkitgtk_6_0 jemalloc - ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ Cocoa CoreFoundation CoreServices @@ -179,21 +176,21 @@ stdenv.mkDerivation rec { IOSurface Metal NaturalLanguage + LocalAuthentication libicns ]); - env = lib.optionalAttrs stdenv.isDarwin { + env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { NIX_CFLAGS_LINK = "-fuse-ld=lld"; }; cmakeFlags = [ - "-Ddisable_autoupdate=ON" + (lib.cmakeBool "DESKTOP_APP_DISABLE_AUTOUPDATE" true) # We're allowed to used the API ID of the Snap package: - "-DTDESKTOP_API_ID=611335" - "-DTDESKTOP_API_HASH=d524b414d21f4d37f08684c1df41ac9c" + (lib.cmakeFeature "TDESKTOP_API_ID" "611335") + (lib.cmakeFeature "TDESKTOP_API_HASH" "d524b414d21f4d37f08684c1df41ac9c") # See: https://github.com/NixOS/nixpkgs/pull/130827#issuecomment-885212649 - "-DDESKTOP_APP_USE_PACKAGED_FONTS=OFF" - "-DDESKTOP_APP_DISABLE_SCUDO=ON" + (lib.cmakeBool "DESKTOP_APP_USE_PACKAGED_FONTS" false) ]; preBuild = '' @@ -201,21 +198,21 @@ stdenv.mkDerivation rec { export GI_GIR_PATH="$XDG_DATA_DIRS" ''; - installPhase = lib.optionalString stdenv.isDarwin '' + installPhase = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications - cp -r ${mainProgram}.app $out/Applications - ln -s $out/{Applications/${mainProgram}.app/Contents/MacOS,bin} + cp -r ${finalAttrs.meta.mainProgram}.app $out/Applications + ln -s $out/{Applications/${finalAttrs.meta.mainProgram}.app/Contents/MacOS,bin} ''; - postFixup = lib.optionalString stdenv.isLinux '' + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' # This is necessary to run Telegram in a pure environment. # We also use gappsWrapperArgs from wrapGAppsHook. - wrapProgram $out/bin/${mainProgram} \ + wrapProgram $out/bin/${finalAttrs.meta.mainProgram} \ "''${gappsWrapperArgs[@]}" \ "''${qtWrapperArgs[@]}" \ --suffix PATH : ${lib.makeBinPath [ xdg-utils ]} - '' + lib.optionalString stdenv.isDarwin '' - wrapQtApp $out/Applications/${mainProgram}.app/Contents/MacOS/${mainProgram} + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' + wrapQtApp $out/Applications/${finalAttrs.meta.mainProgram}.app/Contents/MacOS/${finalAttrs.meta.mainProgram} ''; passthru = { @@ -223,17 +220,17 @@ stdenv.mkDerivation rec { updateScript = nix-update-script { }; }; - meta = with lib; { + meta = { description = "Telegram Desktop messaging app"; longDescription = '' Desktop client for the Telegram messenger, based on the Telegram API and the MTProto secure protocol. ''; - license = licenses.gpl3Only; - platforms = platforms.all; + license = lib.licenses.gpl3Only; + platforms = lib.platforms.all; homepage = "https://desktop.telegram.org/"; - changelog = "https://github.com/telegramdesktop/tdesktop/releases/tag/v${version}"; - maintainers = with maintainers; [ nickcao ]; - inherit mainProgram; + changelog = "https://github.com/telegramdesktop/tdesktop/releases/tag/v${finalAttrs.version}"; + maintainers = with lib.maintainers; [ nickcao ]; + mainProgram = if stdenv.hostPlatform.isLinux then "telegram-desktop" else "Telegram"; }; -} +}) diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/scheme.patch b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/scheme.patch new file mode 100644 index 0000000000000..58aaa8a7fcb54 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/scheme.patch @@ -0,0 +1,12 @@ +diff --git a/Telegram/SourceFiles/core/application.cpp b/Telegram/SourceFiles/core/application.cpp +index e3e0de6c6..d5851bd6e 100644 +--- a/Telegram/SourceFiles/core/application.cpp ++++ b/Telegram/SourceFiles/core/application.cpp +@@ -421,7 +421,6 @@ void Application::run() { + + void Application::autoRegisterUrlScheme() { + if (!OptionSkipUrlSchemeRegister.value()) { +- InvokeQueued(this, [] { RegisterUrlScheme(); }); + } + } + diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix index 1889c1825d8c3..64541fc79e97a 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix @@ -1,79 +1,117 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch -, pkg-config, cmake, ninja, yasm -, libjpeg, openssl, libopus, ffmpeg, alsa-lib, libpulseaudio, protobuf -, openh264, usrsctp, libevent, libvpx -, libX11, libXtst, libXcomposite, libXdamage, libXext, libXrender, libXrandr, libXi -, glib, abseil-cpp, pcre, util-linuxMinimal, libselinux, libsepol, pipewire -, mesa, libepoxy, libglvnd, unstableGitUpdater, darwin +{ + lib, + stdenv, + fetchFromGitHub, + pkg-config, + cmake, + crc32c, + python3, + libjpeg, + openssl, + libopus, + ffmpeg, + openh264, + libvpx, + libXi, + libXfixes, + libXtst, + libXcomposite, + libXdamage, + libXext, + libXrender, + libXrandr, + glib, + abseil-cpp, + pipewire, + mesa, + libGL, + unstableGitUpdater, + darwin, }: stdenv.mkDerivation { pname = "tg_owt"; - version = "0-unstable-2024-06-15"; + version = "0-unstable-2024-08-04"; src = fetchFromGitHub { owner = "desktop-app"; repo = "tg_owt"; - rev = "c9cc4390ab951f2cbc103ff783a11f398b27660b"; - sha256 = "sha256-FfWmSYaeryTDbsGJT3R7YK1oiyJcrR7YKKBOF+9PmpY="; + rev = "dc17143230b5519f3c1a8da0079e00566bd4c5a8"; + sha256 = "sha256-7j7hBIOXEdNJDnDSVUqy234nkTCaeZ9tDAzqvcuaq0o="; fetchSubmodules = true; }; - outputs = [ "out" "dev" ]; + outputs = [ + "out" + "dev" + ]; - nativeBuildInputs = [ pkg-config cmake ninja yasm ]; + nativeBuildInputs = [ + cmake + pkg-config + python3 + ]; - buildInputs = [ - libjpeg libopus ffmpeg protobuf openh264 usrsctp libevent libvpx abseil-cpp - ] ++ lib.optionals stdenv.isLinux [ - libX11 libXtst libXcomposite libXdamage libXext libXrender libXrandr libXi - glib pcre util-linuxMinimal libselinux libsepol pipewire alsa-lib libpulseaudio - mesa libepoxy libglvnd - ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ - Cocoa - AppKit - IOKit - IOSurface - Foundation - AVFoundation - CoreMedia - VideoToolbox - CoreGraphics - CoreVideo - OpenGL - Metal - MetalKit - CoreFoundation - ApplicationServices - ]); + buildInputs = + [ + openssl + libjpeg + libopus + ffmpeg + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + glib + libXi + libXcomposite + libXdamage + libXext + libXfixes + libXrender + libXrandr + libXtst + pipewire + mesa + libGL + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin ( + with darwin.apple_sdk.frameworks; + [ + Cocoa + AppKit + IOKit + IOSurface + Foundation + AVFoundation + CoreMedia + VideoToolbox + CoreGraphics + CoreVideo + Metal + MetalKit + CoreFoundation + ApplicationServices + ] + ); - patches = [ - # GCC 12 Fix - (fetchpatch { - url = "https://github.com/desktop-app/tg_owt/pull/101/commits/86d2bcd7afb8706663d29e30f65863de5a626142.patch"; - hash = "sha256-iWS0mB8R0vqPU/0qf6Ax54UCAKYDVCPac2mi/VHbFm0="; - }) - # additional fix for GCC 12 + musl - (fetchpatch { - url = "https://git.alpinelinux.org/aports/plain/community/tg_owt/gcc12.patch?id=8120df03fa3b6db5b8ff92c7a52b680290ad6e20"; - hash = "sha256-ikgxUH1e7pz0n0pKUemrPXXa4UkECX+w467M9gU68zs="; - }) + propagatedBuildInputs = [ + abseil-cpp + crc32c + openh264 + libvpx ]; cmakeFlags = [ # Building as a shared library isn't officially supported and may break at any time. - "-DBUILD_SHARED_LIBS=OFF" - ]; - - propagatedBuildInputs = [ - # Required for linking downstream binaries. - abseil-cpp openh264 usrsctp libevent libvpx openssl + (lib.cmakeBool "BUILD_SHARED_LIBS" false) ]; passthru.updateScript = unstableGitUpdater { }; - meta = with lib; { - license = licenses.bsd3; - maintainers = with maintainers; [ oxalica ]; + meta = { + description = "Fork of Google's webrtc library for telegram-desktop"; + homepage = "https://github.com/desktop-app/tg_owt"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ oxalica ]; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/applications/networking/instant-messengers/telegram/tg/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tg/default.nix index 7cdbda355d382..d23ee405efc2f 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tg/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tg/default.nix @@ -30,7 +30,7 @@ buildPythonApplication rec { ]; # Fix notifications on platforms other than darwin by providing notify-send - postPatch = lib.optionalString (!stdenv.isDarwin) '' + postPatch = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' sed -i 's|^NOTIFY_CMD = .*|NOTIFY_CMD = "${libnotify}/bin/notify-send {title} {message} -i {icon_path}"|' tg/config.py ''; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix index 9a8e547b70eb4..70612f529434f 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { buildInputs = [ dbus-glib libxml2 sqlite telepathy-glib dbus - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit darwin.apple_sdk.frameworks.Foundation ]; @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { description = "Logger service for Telepathy framework"; homepage = "https://telepathy.freedesktop.org/components/telepathy-logger/"; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix index 03465b1314faa..5d4bfc5eab4b9 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { pkg-config libxslt makeWrapper - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ autoreconfHook gtk-doc ]; @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { description = "Account manager and channel dispatcher for the Telepathy framework"; homepage = "https://telepathy.freedesktop.org/components/telepathy-mission-control/"; license = licenses.lgpl21Only; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/instant-messengers/tensor/default.nix b/pkgs/applications/networking/instant-messengers/tensor/default.nix index c8b38ccb35ecd..2a42692e412c2 100644 --- a/pkgs/applications/networking/instant-messengers/tensor/default.nix +++ b/pkgs/applications/networking/instant-messengers/tensor/default.nix @@ -19,7 +19,7 @@ mkDerivation rec { owner = "davidar"; repo = "tensor"; rev = "f3f3056d770d7fb4a21c610cee7936ee900569f5"; - sha256 = "sha256-aR6TsfUxsxoSDaIWYgRCwd7BCgekSEqY6LpDoQ5DNqY="; + hash = "sha256-aR6TsfUxsxoSDaIWYgRCwd7BCgekSEqY6LpDoQ5DNqY="; fetchSubmodules = true; }; @@ -37,7 +37,7 @@ mkDerivation rec { mimeTypes = [ "application/x-chat" ]; }; - installPhase = if stdenv.isDarwin then '' + installPhase = if stdenv.hostPlatform.isDarwin then '' runHook preInstall mkdir -p $out/Applications diff --git a/pkgs/applications/networking/instant-messengers/threema-desktop/default.nix b/pkgs/applications/networking/instant-messengers/threema-desktop/default.nix index 2f71df5cef5ac..25878085a30f2 100644 --- a/pkgs/applications/networking/instant-messengers/threema-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/threema-desktop/default.nix @@ -32,7 +32,7 @@ let npmBuildScript = "dist"; nativeBuildInputs = [ - python3 # Used by gyp + (python3.withPackages (ps: [ ps.setuptools ])) # Used by gyp ]; patches = [ diff --git a/pkgs/applications/networking/instant-messengers/turses/default.nix b/pkgs/applications/networking/instant-messengers/turses/default.nix index dfcb9facfd8ed..0df36afc3fdfd 100644 --- a/pkgs/applications/networking/instant-messengers/turses/default.nix +++ b/pkgs/applications/networking/instant-messengers/turses/default.nix @@ -7,6 +7,7 @@ let py = python3.override { + self = py; packageOverrides = self: super: { # Support for later tweepy releases is missing @@ -90,7 +91,7 @@ buildPythonPackage rec { mainProgram = "turses"; homepage = "https://github.com/louipc/turses"; license = licenses.gpl3Only; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix b/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix index f6145678d38f1..8d3b360718745 100644 --- a/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix +++ b/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "twitch-tui"; - version = "2.6.12"; + version = "2.6.16"; src = fetchFromGitHub { owner = "Xithrius"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-mEpeuopMzZhWOAikEP7Er8xcgNkGbCTkJJYrQr7GrBQ="; + hash = "sha256-QWIy+gAW42tJhmNIj6UThVedIrfAFdlatD71BoKZC4s="; }; - cargoHash = "sha256-U9L4SrYTAUcQ9/2f8tD7jxByVQS9P6OXpra6QvbhNNg="; + cargoHash = "sha256-eR21I7xWUyImF30p4M+NwMrxRemrECLcGh8U6wKnp7E="; nativeBuildInputs = [ pkg-config @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices Security SystemConfiguration diff --git a/pkgs/applications/networking/instant-messengers/utox/default.nix b/pkgs/applications/networking/instant-messengers/utox/default.nix index c5aa13da0d33d..706904a8dd2c1 100644 --- a/pkgs/applications/networking/instant-messengers/utox/default.nix +++ b/pkgs/applications/networking/instant-messengers/utox/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "uTox"; repo = "uTox"; rev = "v${version}"; - sha256 = "sha256-DxnolxUTn+CL6TbZHKLHOUMTHhtTSWufzzOTRpKjOwc="; + hash = "sha256-DxnolxUTn+CL6TbZHKLHOUMTHhtTSWufzzOTRpKjOwc="; fetchSubmodules = true; }; @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { mainProgram = "utox"; homepage = "https://github.com/uTox/uTox"; license = licenses.gpl3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = platforms.all; }; } diff --git a/pkgs/applications/networking/instant-messengers/viber/default.nix b/pkgs/applications/networking/instant-messengers/viber/default.nix deleted file mode 100644 index 781508179cbfe..0000000000000 --- a/pkgs/applications/networking/instant-messengers/viber/default.nix +++ /dev/null @@ -1,111 +0,0 @@ -{fetchurl, lib, stdenv, dpkg, makeWrapper, - alsa-lib, cups, curl, dbus, expat, fontconfig, freetype, glib, gst_all_1, - harfbuzz, libcap, libGL, libGLU, libpulseaudio, libxkbcommon, libxml2, libxslt, - nspr, nss, openssl_1_1, systemd, wayland, xorg, zlib, ... -}: - -stdenv.mkDerivation { - pname = "viber"; - version = "16.1.0.37"; - - src = fetchurl { - # Official link: https://download.cdn.viber.com/cdn/desktop/Linux/viber.deb - url = "https://web.archive.org/web/20211119123858/https://download.cdn.viber.com/cdn/desktop/Linux/viber.deb"; - sha256 = "sha256-hOz+EQc2OOlLTPa2kOefPJMUyWvSvrgqgPgBKjWE3p8="; - }; - - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ dpkg ]; - - dontUnpack = true; - - libPath = lib.makeLibraryPath [ - alsa-lib - cups - curl - dbus - expat - fontconfig - freetype - glib - gst_all_1.gst-plugins-base - gst_all_1.gstreamer - harfbuzz - libcap - libGLU libGL - libpulseaudio - libxkbcommon - libxml2 - libxslt - nspr - nss - openssl_1_1 - stdenv.cc.cc - systemd - wayland - zlib - - xorg.libICE - xorg.libSM - xorg.libX11 - xorg.libxcb - xorg.libXcomposite - xorg.libXcursor - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXi - xorg.libXrandr - xorg.libXrender - xorg.libXScrnSaver - xorg.libXtst - xorg.xcbutilimage - xorg.xcbutilkeysyms - xorg.xcbutilrenderutil - xorg.xcbutilwm - ] - ; - - installPhase = '' - dpkg-deb -x $src $out - mkdir -p $out/bin - - # Soothe nix-build "suspicions" - chmod -R g-w $out - - for file in $(find $out -type f \( -perm /0111 -o -name \*.so\* \) ); do - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$file" || true - patchelf --set-rpath $libPath:$out/opt/viber/lib $file || true - done - - # qt.conf is not working, so override everything using environment variables - wrapProgram $out/opt/viber/Viber \ - --set QT_QPA_PLATFORM "xcb" \ - --set QT_PLUGIN_PATH "$out/opt/viber/plugins" \ - --set QT_XKB_CONFIG_ROOT "${xorg.xkeyboardconfig}/share/X11/xkb" \ - --set QTCOMPOSE "${xorg.libX11.out}/share/X11/locale" \ - --set QML2_IMPORT_PATH "$out/opt/viber/qml" - ln -s $out/opt/viber/Viber $out/bin/viber - - mv $out/usr/share $out/share - rm -rf $out/usr - - # Fix the desktop link - substituteInPlace $out/share/applications/viber.desktop \ - --replace /opt/viber/Viber $out/opt/viber/Viber \ - --replace /usr/share/ $out/share/ - ''; - - dontStrip = true; - dontPatchELF = true; - - meta = { - homepage = "https://www.viber.com"; - description = "Instant messaging and Voice over IP (VoIP) app"; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - license = lib.licenses.unfree; - platforms = [ "x86_64-linux" ]; - maintainers = with lib.maintainers; [ jagajaga ]; - }; - -} diff --git a/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix b/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix index 50be0777ae4eb..60ed9d60b1e12 100644 --- a/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix +++ b/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix @@ -71,4 +71,4 @@ let cp -r *.app $out/Applications ''; }; -in if stdenv.isDarwin then darwin else linux +in if stdenv.hostPlatform.isDarwin then darwin else linux diff --git a/pkgs/applications/networking/instant-messengers/wavebox/default.nix b/pkgs/applications/networking/instant-messengers/wavebox/default.nix index d1df9c108143e..211f1af8726e8 100644 --- a/pkgs/applications/networking/instant-messengers/wavebox/default.nix +++ b/pkgs/applications/networking/instant-messengers/wavebox/default.nix @@ -1,94 +1,247 @@ -{ alsa-lib -, autoPatchelfHook -, fetchurl -, gtk3 -, gtk4 -, libnotify -, copyDesktopItems -, makeDesktopItem -, makeWrapper -, mesa -, nss -, lib -, libdrm -, qt5 -, stdenv -, udev -, xdg-utils -, xorg +{ + lib, + stdenv, + patchelf, + makeWrapper, + fetchurl, + writeScript, + + # Libraries + glib, + fontconfig, + freetype, + pango, + cairo, + libX11, + libXi, + atk, + nss, + nspr, + libXcursor, + libXext, + libXfixes, + libXrender, + libXScrnSaver, + libXcomposite, + libxcb, + alsa-lib, + libXdamage, + libXtst, + libXrandr, + libxshmfence, + expat, + cups, + dbus, + gtk3, + gtk4, + gdk-pixbuf, + gcc-unwrapped, + at-spi2-atk, + at-spi2-core, + libkrb5, + libdrm, + libglvnd, + mesa, + libxkbcommon, + pipewire, + wayland, + + coreutils, + + # command line arguments which are always set e.g "--disable-gpu" + commandLineArgs ? "", + + systemd, + + # Loaded at runtime. + libexif, + pciutils, + + liberation_ttf, + curl, + util-linux, + xdg-utils, + wget, + flac, + harfbuzz, + icu, + libpng, + libopus, + snappy, + speechd, + bzip2, + libcap, + + # Necessary for USB audio devices. + pulseSupport ? true, + libpulseaudio, + + gsettings-desktop-schemas, + + # Allow video acceleration via VA-API to be disabled on systems where is doesn't + # work reliably (--enable-features=VaapiVideoDecoder) + libvaSupport ? true, + libva, + + # For Vulkan support (--enable-features=Vulkan) + addDriverRunpath, }: -stdenv.mkDerivation rec { +let + opusWithCustomModes = libopus.override { withCustomModes = true; }; + + deps = + [ + glib + fontconfig + freetype + pango + cairo + libX11 + libXi + atk + nss + nspr + libXcursor + libXext + libXfixes + libXrender + libXScrnSaver + libXcomposite + libxcb + alsa-lib + libXdamage + libXtst + libXrandr + libxshmfence + expat + cups + dbus + gdk-pixbuf + gcc-unwrapped.lib + systemd + libexif + pciutils + liberation_ttf + curl + util-linux + wget + flac + harfbuzz + icu + libpng + opusWithCustomModes + snappy + speechd + bzip2 + libcap + at-spi2-atk + at-spi2-core + libkrb5 + libdrm + libglvnd + mesa + coreutils + libxkbcommon + pipewire + wayland + ] + ++ lib.optional pulseSupport libpulseaudio + ++ lib.optional libvaSupport libva + ++ [ + gtk3 + gtk4 + ]; + +in +stdenv.mkDerivation (finalAttrs: { pname = "wavebox"; - version = "10.124.17-2"; + version = "10.128.7-2"; src = fetchurl { - url = "https://download.wavebox.app/stable/linux/tar/Wavebox_${version}.tar.gz"; - sha256 = "sha256-RS1/zs/rFWsj29BrT8Mb2IXgy9brBsQypxfvnd7pKl0="; + url = "https://download.wavebox.app/stable/linux/deb/amd64/wavebox_${finalAttrs.version}_amd64.deb"; + hash = "sha256-MRMN/xVs80u3MfdQfALhPW7dpTZrjsVhMjEN/zl7K+U="; }; - # don't remove runtime deps - dontPatchELF = true; - # ignore optional Qt 6 shim - autoPatchelfIgnoreMissingDeps = [ "libQt6Widgets.so.6" "libQt6Gui.so.6" "libQt6Core.so.6" ]; - - nativeBuildInputs = [ autoPatchelfHook makeWrapper qt5.wrapQtAppsHook copyDesktopItems ]; - - buildInputs = with xorg; [ - libXdmcp - libXScrnSaver - libXtst - libxshmfence - libXdamage - ] ++ [ - alsa-lib + nativeBuildInputs = [ + patchelf + makeWrapper + ]; + buildInputs = [ + gsettings-desktop-schemas # needed for GSETTINGS_SCHEMAS_PATH + glib gtk3 - nss - libdrm - mesa - gtk4 - qt5.qtbase ]; - runtimeDependencies = [ (lib.getLib udev) libnotify gtk4 ]; - - desktopItems = [ - (makeDesktopItem rec { - name = "Wavebox"; - exec = "wavebox"; - icon = "wavebox"; - desktopName = name; - genericName = name; - categories = [ "Network" "WebBrowser" ]; - }) - ]; + unpackPhase = '' + ar x $src + tar xf data.tar.xz + ''; + + rpath = lib.makeLibraryPath deps + ":" + lib.makeSearchPathOutput "lib" "lib64" deps; installPhase = '' runHook preInstall - mkdir -p $out/bin $out/opt/wavebox - cp -r * $out/opt/wavebox + exe=$out/bin/wavebox + + mkdir -p $out/bin $out/share + + cp -a opt/* $out/share + cp -a usr/share/* $out/share - # provide icon for desktop item - mkdir -p $out/share/icons/hicolor/128x128/apps - ln -s $out/opt/wavebox/product_logo_128.png $out/share/icons/hicolor/128x128/apps/wavebox.png + + substituteInPlace $out/share/wavebox.io/wavebox/wavebox-launcher \ + --replace-fail 'CHROME_WRAPPER' 'WRAPPER' + substituteInPlace $out/share/applications/wavebox.desktop \ + --replace-fail /opt/wavebox.io/wavebox/wavebox-launcher $exe + substituteInPlace $out/share/menu/wavebox.menu \ + --replace-fail /opt $out/share \ + --replace-fail $out/share/wavebox.io/wavebox/wavebox $exe + + for icon_file in $out/share/wavebox.io/wavebox/product_logo_[0-9]*.png; do + num_and_suffix="''${icon_file##*logo_}" + icon_size="''${num_and_suffix%.*}" + logo_output_prefix="$out/share/icons/hicolor" + logo_output_path="$logo_output_prefix/''${icon_size}x''${icon_size}/apps" + mkdir -p "$logo_output_path" + mv "$icon_file" "$logo_output_path/wavebox.png" + done + + makeWrapper "$out/share/wavebox.io/wavebox/wavebox" "$exe" \ + --prefix LD_LIBRARY_PATH : "$rpath" \ + --prefix PATH : "${lib.makeBinPath deps}" \ + --suffix PATH : "${lib.makeBinPath [ xdg-utils ]}" \ + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:${addDriverRunpath.driverLink}/share" \ + --set CHROME_WRAPPER "wavebox" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ + --add-flags ${lib.escapeShellArg commandLineArgs} + + for elf in $out/share/wavebox.io/wavebox/{wavebox,chrome-sandbox,chrome_crashpad_handler}; do + patchelf --set-rpath $rpath $elf + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $elf + done runHook postInstall ''; - postFixup = '' - makeWrapper $out/opt/wavebox/wavebox-launcher $out/bin/wavebox \ - --prefix PATH : ${xdg-utils}/bin - ''; + passthru = { + updateScript = writeScript "update-wavebox.sh" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p nix-update curl jq - passthru.updateScript = ./update.sh; + version=$(curl "https://download.wavebox.app/stable/linux/latest.json" | jq --raw-output '.["urls"]["deb"] | match("https://download.wavebox.app/stable/linux/deb/amd64/wavebox_(.+)_amd64.deb").captures[0]["string"]') + nix-update wavebox --version "$version" + ''; + }; - meta = with lib; { - description = "Wavebox messaging application"; + meta = { + description = "Wavebox Productivity Browser"; homepage = "https://wavebox.io"; - license = licenses.mpl20; - maintainers = with maintainers; [ rawkode ]; + license = lib.licenses.unfree; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + maintainers = with lib.maintainers; [ flexiondotorg ]; platforms = [ "x86_64-linux" ]; - hydraPlatforms = [ ]; + mainProgram = "wavebox"; }; -} +}) diff --git a/pkgs/applications/networking/instant-messengers/wavebox/update.sh b/pkgs/applications/networking/instant-messengers/wavebox/update.sh deleted file mode 100755 index 316f8bfbb7ecc..0000000000000 --- a/pkgs/applications/networking/instant-messengers/wavebox/update.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p nix-update curl jq - -version=$(curl "https://download.wavebox.app/stable/linux/latest.json" | jq --raw-output '.["urls"]["tar"] | match("https://download.wavebox.app/stable/linux/tar/Wavebox_(.+).tar.gz").captures[0]["string"]') -nix-update wavebox --version "$version" diff --git a/pkgs/applications/networking/instant-messengers/webex/default.nix b/pkgs/applications/networking/instant-messengers/webex/default.nix index 979a6abd7f3c7..3a03bef180a9a 100644 --- a/pkgs/applications/networking/instant-messengers/webex/default.nix +++ b/pkgs/applications/networking/instant-messengers/webex/default.nix @@ -56,11 +56,11 @@ stdenv.mkDerivation rec { pname = "webex"; - version = "44.5.0.29672"; + version = "44.8.0.30404"; src = fetchurl { - url = "https://binaries.webex.com/WebexDesktop-Ubuntu-Gold/20240521091053/Webex_ubuntu.7z"; - sha256 = "e155c280d15f2db4b5e638f244319dbec938d6de267f2fed1b4ba2b55fbb8a9b"; + url = "https://binaries.webex.com/WebexDesktop-Ubuntu-Gold/20240806164911/Webex_ubuntu.7z"; + sha256 = "770067b495fcc3b376d77de65371f4196d0f1a0d718b84928d24aa6ea752d29b"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/whatsapp-for-linux/default.nix b/pkgs/applications/networking/instant-messengers/whatsapp-for-linux/default.nix index e699c761b6953..0925bae8a6956 100644 --- a/pkgs/applications/networking/instant-messengers/whatsapp-for-linux/default.nix +++ b/pkgs/applications/networking/instant-messengers/whatsapp-for-linux/default.nix @@ -74,6 +74,6 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "whatsapp-for-linux"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ bartuka ]; - platforms = [ "x86_64-linux" ]; + platforms = [ "x86_64-linux" "aarch64-linux" ]; }; }) diff --git a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix index 8dda89f776b49..22bf7fb11e6c5 100644 --- a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix @@ -30,7 +30,7 @@ let in { inherit x86_64-darwin; aarch64-darwin = x86_64-darwin; - x86_64-linux = "3.35.3348"; + x86_64-linux = "3.36.3462"; }.${system} or throwSystem; hash = let @@ -38,7 +38,7 @@ let in { inherit x86_64-darwin; aarch64-darwin = x86_64-darwin; - x86_64-linux = "sha256-KtDUuAzD53mFJ0+yywp0Q2/hx9MGsOhFjRLWsZAd+h0="; + x86_64-linux = "sha256-tlX15AT4PcrmD2Vna99TGqo0b/8xv2YOAt03aCqSeXg="; }.${system} or throwSystem; meta = with lib; { @@ -136,6 +136,10 @@ let libdbusmenu ]; + preFixup = '' + gappsWrapperArgs+=(--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --ozone-platform=wayland --enable-features=WaylandWindowDecorations}}") + ''; + postFixup = '' makeWrapper $out/opt/Wire/wire-desktop $out/bin/wire-desktop \ "''${gappsWrapperArgs[@]}" @@ -183,6 +187,6 @@ let }; in -if stdenv.isDarwin +if stdenv.hostPlatform.isDarwin then darwin else linux diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix deleted file mode 100644 index 74f70b71c4988..0000000000000 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ /dev/null @@ -1,202 +0,0 @@ -{ stdenv -, lib -, fetchurl -, pipewire -, makeWrapper -, xar -, cpio - # Dynamic libraries -, alsa-lib -, atk -, at-spi2-atk -, at-spi2-core -, cairo -, cups -, dbus -, expat -, libdrm -, libGL -, fontconfig -, freetype -, gtk3 -, gdk-pixbuf -, glib -, mesa -, nspr -, nss -, pango -, wayland -, xorg -, libxkbcommon -, udev -, zlib -, libkrb5 - # Runtime -, coreutils -, pciutils -, procps -, util-linux -, pulseaudioSupport ? true -, libpulseaudio -}: - -let - inherit (stdenv.hostPlatform) system; - throwSystem = throw "Unsupported system: ${system}"; - - # Zoom versions are released at different times for each platform - # and often with different versions. We write them on three lines - # like this (rather than using {}) so that the updater script can - # find where to edit them. - versions.aarch64-darwin = "6.1.0.35886"; - versions.x86_64-darwin = "6.1.0.35886"; - versions.x86_64-linux = "6.1.0.198"; - - srcs = { - aarch64-darwin = fetchurl { - url = "https://zoom.us/client/${versions.aarch64-darwin}/zoomusInstallerFull.pkg?archType=arm64"; - name = "zoomusInstallerFull.pkg"; - hash = "sha256-jAH/3r2AM8WAzfHE8CvKBrr53sM/9DH624C+EiJIdXs="; - }; - x86_64-darwin = fetchurl { - url = "https://zoom.us/client/${versions.x86_64-darwin}/zoomusInstallerFull.pkg"; - hash = "sha256-nKJPZQbyVG+P974hP4+4eAtupEQOf5Kl64Zp+jV/Ka0="; - }; - x86_64-linux = fetchurl { - url = "https://zoom.us/client/${versions.x86_64-linux}/zoom_x86_64.pkg.tar.xz"; - hash = "sha256-R4f0dnwqkODFeo8mPBecAI/AGQLwYkcNtJq6UVXCPfI="; - }; - }; - - libs = lib.makeLibraryPath ([ - # $ LD_LIBRARY_PATH=$NIX_LD_LIBRARY_PATH:$PWD ldd zoom | grep 'not found' - alsa-lib - atk - at-spi2-atk - at-spi2-core - cairo - cups - dbus - expat - libdrm - libGL - pipewire - fontconfig - freetype - gtk3 - gdk-pixbuf - glib - mesa - nspr - nss - pango - stdenv.cc.cc - wayland - xorg.libX11 - xorg.libxcb - xorg.libXcomposite - xorg.libXdamage - xorg.libXext - libxkbcommon - xorg.libXrandr - xorg.libXrender - xorg.libxshmfence - xorg.xcbutilimage - xorg.xcbutilkeysyms - xorg.xcbutilrenderutil - xorg.xcbutilwm - xorg.libXfixes - xorg.libXtst - udev - zlib - libkrb5 - ] ++ lib.optional (pulseaudioSupport) libpulseaudio); - -in -stdenv.mkDerivation rec { - pname = "zoom"; - version = versions.${system} or throwSystem; - - src = srcs.${system} or throwSystem; - - dontUnpack = stdenv.isLinux; - unpackPhase = lib.optionalString stdenv.isDarwin '' - xar -xf $src - zcat < zoomus.pkg/Payload | cpio -i - ''; - - nativeBuildInputs = [ - makeWrapper - ] - ++ lib.optionals stdenv.isDarwin [ - xar - cpio - ]; - - installPhase = '' - runHook preInstall - ${rec { - aarch64-darwin = '' - mkdir -p $out/Applications - cp -R zoom.us.app $out/Applications/ - ''; - # darwin steps same on both architectures - x86_64-darwin = aarch64-darwin; - x86_64-linux = '' - mkdir $out - tar -C $out -xf $src - mv $out/usr/* $out/ - ''; - }.${system} or throwSystem} - runHook postInstall - ''; - - postFixup = lib.optionalString stdenv.isDarwin '' - makeWrapper $out/Applications/zoom.us.app/Contents/MacOS/zoom.us $out/bin/zoom - '' + lib.optionalString stdenv.isLinux '' - # Desktop File - substituteInPlace $out/share/applications/Zoom.desktop \ - --replace "Exec=/usr/bin/zoom" "Exec=$out/bin/zoom" - - for i in aomhost zopen zoom ZoomLauncher; do - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/opt/zoom/$i - done - - # ZoomLauncher sets LD_LIBRARY_PATH before execing zoom - # IPC breaks if the executable name does not end in 'zoom' - mv $out/opt/zoom/zoom $out/opt/zoom/.zoom - makeWrapper $out/opt/zoom/.zoom $out/opt/zoom/zoom \ - --prefix LD_LIBRARY_PATH ":" ${libs} - - rm $out/bin/zoom - # Zoom expects "zopen" executable (needed for web login) to be present in CWD. Or does it expect - # everybody runs Zoom only after cd to Zoom package directory? Anyway, :facepalm: - # Clear Qt paths to prevent tripping over "foreign" Qt resources. - # Clear Qt screen scaling settings to prevent over-scaling. - makeWrapper $out/opt/zoom/ZoomLauncher $out/bin/zoom \ - --chdir "$out/opt/zoom" \ - --unset QML2_IMPORT_PATH \ - --unset QT_PLUGIN_PATH \ - --unset QT_SCREEN_SCALE_FACTORS \ - --prefix PATH : ${lib.makeBinPath [ coreutils glib.dev pciutils procps util-linux ]} \ - --prefix LD_LIBRARY_PATH ":" ${libs} - - # Backwards compatibility: we used to call it zoom-us - ln -s $out/bin/{zoom,zoom-us} - ''; - - # already done - dontPatchELF = true; - - passthru.updateScript = ./update.sh; - - meta = with lib; { - homepage = "https://zoom.us/"; - description = "zoom.us video conferencing application"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.unfree; - platforms = builtins.attrNames srcs; - maintainers = with maintainers; [ danbst tadfisher ]; - mainProgram = "zoom"; - }; -} diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/update.sh b/pkgs/applications/networking/instant-messengers/zoom-us/update.sh deleted file mode 100755 index 3684f057a08c3..0000000000000 --- a/pkgs/applications/networking/instant-messengers/zoom-us/update.sh +++ /dev/null @@ -1,34 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p common-updater-scripts curl jq - -set -eu -o pipefail - -scriptDir=$(cd "${BASH_SOURCE[0]%/*}" && pwd) -nixpkgs=$(realpath "$scriptDir"/../../../../..) - -echo >&2 "=== Obtaining version data from https://zoom.us/rest/download ..." -linux_data=$(curl -Ls 'https://zoom.us/rest/download?os=linux' | jq .result.downloadVO) -mac_data=$(curl -Ls 'https://zoom.us/rest/download?os=mac' | jq .result.downloadVO) - -version_aarch64_darwin=$(jq -r .zoomArm64.version <<<"$mac_data") -version_x86_64_darwin=$(jq -r .zoom.version <<<"$mac_data") -version_x86_64_linux=$(jq -r .zoom.version <<<"$linux_data") - -echo >&2 "=== Downloading packages and computing hashes..." -# We precalculate the hashes before calling update-source-version -# because it attempts to calculate each architecture's package's hash -# by running `nix-build --system <architecture> -A zoom-us.src` which -# causes cross compiling headaches; using nix-prefetch-url with -# hard-coded URLs is simpler. Keep these URLs in sync with the ones -# in default.nix where `srcs` is defined. -hash_aarch64_darwin=$(nix hash to-sri --type sha256 $(nix-prefetch-url --type sha256 "https://zoom.us/client/${version_aarch64_darwin}/zoomusInstallerFull.pkg?archType=arm64")) -hash_x86_64_darwin=$(nix hash to-sri --type sha256 $(nix-prefetch-url --type sha256 "https://zoom.us/client/${version_x86_64_darwin}/zoomusInstallerFull.pkg")) -hash_x86_64_linux=$(nix hash to-sri --type sha256 $(nix-prefetch-url --type sha256 "https://zoom.us/client/${version_x86_64_linux}/zoom_x86_64.pkg.tar.xz")) - -echo >&2 "=== Updating default.nix ..." -# update-source-version expects to be at the root of nixpkgs -(cd "$nixpkgs" && update-source-version zoom-us "$version_aarch64_darwin" $hash_aarch64_darwin --system=aarch64-darwin --version-key=versions.aarch64-darwin) -(cd "$nixpkgs" && update-source-version zoom-us "$version_x86_64_darwin" $hash_x86_64_darwin --system=x86_64-darwin --version-key=versions.x86_64-darwin) -(cd "$nixpkgs" && update-source-version zoom-us "$version_x86_64_linux" $hash_x86_64_linux --system=x86_64-linux --version-key=versions.x86_64-linux) - -echo >&2 "=== Done!" diff --git a/pkgs/applications/networking/instant-messengers/zulip-term/default.nix b/pkgs/applications/networking/instant-messengers/zulip-term/default.nix index 092cb32999905..7c741216df11a 100644 --- a/pkgs/applications/networking/instant-messengers/zulip-term/default.nix +++ b/pkgs/applications/networking/instant-messengers/zulip-term/default.nix @@ -7,6 +7,7 @@ let py = python3.override { + self = py; packageOverrides = self: super: { # Requires "urwid~=2.1.2", otherwise some tests are failing diff --git a/pkgs/applications/networking/instant-messengers/zulip/default.nix b/pkgs/applications/networking/instant-messengers/zulip/default.nix index f7bb1ea099cab..877eb833de8ce 100644 --- a/pkgs/applications/networking/instant-messengers/zulip/default.nix +++ b/pkgs/applications/networking/instant-messengers/zulip/default.nix @@ -5,11 +5,11 @@ let pname = "zulip"; - version = "5.11.0"; + version = "5.11.1"; src = fetchurl { url = "https://github.com/zulip/zulip-desktop/releases/download/v${version}/Zulip-${version}-x86_64.AppImage"; - hash = "sha256-snxeMgcLFMYDEsog7Xqeybw8GkU4kPqHMds1174bPd0="; + hash = "sha256-t5qBm5+kTdeRMvcHpNbS5mp184UG/IqgJrtj7Ntcbb0="; name="${pname}-${version}.AppImage"; }; @@ -27,14 +27,14 @@ in appimageTools.wrapType2 { install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/512x512/apps/zulip.png \ $out/share/icons/hicolor/512x512/apps/zulip.png substituteInPlace $out/share/applications/zulip.desktop \ - --replace 'Exec=AppRun' 'Exec=${pname}' + --replace-fail 'Exec=AppRun' 'Exec=${pname}' ''; meta = with lib; { description = "Desktop client for Zulip Chat"; homepage = "https://zulip.com"; license = licenses.asl20; - maintainers = with maintainers; [ andersk jonafato ]; + maintainers = with maintainers; [ andersk ]; platforms = [ "x86_64-linux" ]; mainProgram = "zulip"; }; diff --git a/pkgs/applications/networking/ipget/default.nix b/pkgs/applications/networking/ipget/default.nix index 0ad7de8ec468c..4beb88feca1ff 100644 --- a/pkgs/applications/networking/ipget/default.nix +++ b/pkgs/applications/networking/ipget/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "ipget"; - version = "0.10.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "ipfs"; repo = "ipget"; rev = "v${version}"; - hash = "sha256-nT0bMy4L1T2rwE6g3Q4tNkmeP3XyPVxCV9yoGqMZjNs="; + hash = "sha256-SCYbfsQ8yF2ggwNyW0+kydpSBQN9NPpz1Hmw4ni3cg0="; }; - vendorHash = "sha256-q8uwijh3y4l4ebFc3u5Z6TLUUiQqUK6Qpqq/m0kLF14="; + vendorHash = "sha256-90iimOtFys12nrT0hHyzHrpB03YGNfHY/a7V8Blijfw="; postPatch = '' # main module (github.com/ipfs/ipget) does not contain package github.com/ipfs/ipget/sharness/dependencies diff --git a/pkgs/applications/networking/irc/communi/default.nix b/pkgs/applications/networking/irc/communi/default.nix index 84940c288bed2..9c25ece8556b3 100644 --- a/pkgs/applications/networking/irc/communi/default.nix +++ b/pkgs/applications/networking/irc/communi/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { # libCommuni.dylib is installed in $out/Applications/Communi.app/Contents/Frameworks/ on Darwin # Wrapper hook thinks it's a binary because it's in $out/Applications, wraps it with a shell script # So we manually call the wrapper script on just the binary - dontWrapQtApps = stdenv.isDarwin; + dontWrapQtApps = stdenv.hostPlatform.isDarwin; preConfigure = '' export QMAKEFEATURES=${libcommuni}/features @@ -47,11 +47,11 @@ stdenv.mkDerivation rec { "COMMUNI_INSTALL_ICONS=${placeholder "out"}/share/icons/hicolor" "COMMUNI_INSTALL_DESKTOP=${placeholder "out"}/share/applications" "COMMUNI_INSTALL_THEMES=${placeholder "out"}/share/communi/themes" - "COMMUNI_INSTALL_BINS=${placeholder "out"}/${if stdenv.isDarwin then "Applications" else "bin"}" + "COMMUNI_INSTALL_BINS=${placeholder "out"}/${if stdenv.hostPlatform.isDarwin then "Applications" else "bin"}" ]; postInstall = - if stdenv.isDarwin then '' + if stdenv.hostPlatform.isDarwin then '' # Nix qmake does not add the bundle rpath by default. install_name_tool \ -add_rpath @executable_path/../Frameworks \ diff --git a/pkgs/applications/networking/irc/convos/default.nix b/pkgs/applications/networking/irc/convos/default.nix index 2fc2e0585910c..c456875d016ba 100644 --- a/pkgs/applications/networking/irc/convos/default.nix +++ b/pkgs/applications/networking/irc/convos/default.nix @@ -14,7 +14,7 @@ perlPackages.buildPerlPackage rec { }; nativeBuildInputs = [ makeWrapper ] - ++ lib.optionals stdenv.isDarwin [ shortenPerlShebang ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ shortenPerlShebang ]; buildInputs = with perlPackages; [ CryptPassphrase CryptPassphraseArgon2 CryptPassphraseBcrypt @@ -79,7 +79,7 @@ perlPackages.buildPerlPackage rec { ln -s $AUTO_SHARE_PATH/public/assets $out/assets cp -vR templates $out/templates cp Makefile.PL $out/Makefile.PL - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' shortenPerlShebang $out/bin/convos '' + '' wrapProgram $out/bin/convos --set MOJO_HOME $out diff --git a/pkgs/applications/networking/irc/epic5/default.nix b/pkgs/applications/networking/irc/epic5/default.nix index 404eca810ef24..c3a10cc39e9dd 100644 --- a/pkgs/applications/networking/irc/epic5/default.nix +++ b/pkgs/applications/networking/irc/epic5/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { # Darwin needs libiconv, tcl; while Linux build don't buildInputs = [ openssl ncurses libxcrypt ] - ++ lib.optionals stdenv.isDarwin [ libiconv tcl ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv tcl ]; patches = [ (fetchpatch { @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { homepage = "http://epicsol.org"; description = "IRC client that offers a great ircII interface"; license = licenses.bsd3; - maintainers = []; + maintainers = [ ]; }; } diff --git a/pkgs/applications/networking/irc/glowing-bear/default.nix b/pkgs/applications/networking/irc/glowing-bear/default.nix index d5c0cad075b39..c493cae6d4637 100644 --- a/pkgs/applications/networking/irc/glowing-bear/default.nix +++ b/pkgs/applications/networking/irc/glowing-bear/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { description = "Web client for Weechat"; homepage = "https://github.com/glowing-bear/glowing-bear"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/irc/hexchat/default.nix b/pkgs/applications/networking/irc/hexchat/default.nix deleted file mode 100644 index 4aafcc272638f..0000000000000 --- a/pkgs/applications/networking/irc/hexchat/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, gtk2, lua, perl, python3Packages -, pciutils, dbus-glib, libcanberra-gtk2, libproxy -, enchant2, libnotify, openssl, isocodes -, desktop-file-utils -, meson, ninja, makeWrapper -}: - -stdenv.mkDerivation rec { - pname = "hexchat"; - version = "2.16.2"; - - src = fetchFromGitHub { - owner = "hexchat"; - repo = "hexchat"; - rev = "v${version}"; - sha256 = "sha256-rgaXqXbBWlfSyz+CT0jRLyfGOR1cYYnRhEAu7AsaWus="; - }; - - nativeBuildInputs = [ meson ninja pkg-config makeWrapper ]; - - buildInputs = [ - gtk2 lua perl python3Packages.python python3Packages.cffi pciutils dbus-glib libcanberra-gtk2 libproxy - libnotify openssl desktop-file-utils - isocodes - ]; - - #hexchat and hexchat-text loads enchant spell checking library at run time and so it needs to have route to the path - postPatch = '' - sed -i "s,libenchant-2.so.2,${enchant2}/lib/libenchant-2.so.2,g" src/fe-gtk/sexy-spell-entry.c - sed -i "/flag.startswith('-I')/i if flag.contains('no-such-path')\ncontinue\nendif" plugins/perl/meson.build - chmod +x meson_post_install.py - for f in meson_post_install.py \ - plugins/perl/generate_header.py \ - plugins/python/generate_plugin.py \ - po/validate-textevent-translations \ - src/common/make-te.py - do - patchShebangs $f - done - ''; - - mesonFlags = [ "-Dwith-lua=lua" "-Dtext-frontend=true" ]; - - postInstall = '' - wrapProgram $out/bin/hexchat --prefix PYTHONPATH : "$PYTHONPATH" - ''; - - meta = with lib; { - description = "Popular and easy to use graphical IRC (chat) client"; - homepage = "https://hexchat.github.io/"; - license = licenses.gpl2; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; - }; -} diff --git a/pkgs/applications/networking/irc/ircdog/default.nix b/pkgs/applications/networking/irc/ircdog/default.nix index f08d6857799c6..c2b1d5b2ee535 100644 --- a/pkgs/applications/networking/irc/ircdog/default.nix +++ b/pkgs/applications/networking/irc/ircdog/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "ircdog"; - version = "0.5.3"; + version = "0.5.5"; src = fetchFromGitHub { owner = "goshuirc"; repo = "ircdog"; rev = "refs/tags/v${version}"; - hash = "sha256-TdMgt1ZgoEaweH8Cbb+wG/H1Bx9DpgHgzGO5dZfxvK8="; + hash = "sha256-maF53Z0FHAhGmnOnMsX0dDnmckPNBY4Bcm4OBM/x4hQ="; }; vendorHash = null; diff --git a/pkgs/applications/networking/irc/irssi/default.nix b/pkgs/applications/networking/irc/irssi/default.nix index 940242b6668df..6e035b2bdbc2f 100644 --- a/pkgs/applications/networking/irc/irssi/default.nix +++ b/pkgs/applications/networking/irc/irssi/default.nix @@ -5,7 +5,6 @@ , libgcrypt , libintl , libotr -, libtool , meson , ncurses , ninja diff --git a/pkgs/applications/networking/irc/irssi/fish/default.nix b/pkgs/applications/networking/irc/irssi/fish/default.nix index b26b2cb1daf46..a5ee8b7cef628 100644 --- a/pkgs/applications/networking/irc/irssi/fish/default.nix +++ b/pkgs/applications/networking/irc/irssi/fish/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/falsovsky/FiSH-irssi"; license = licenses.mit; - maintainers = with maintainers; [ viric ]; + maintainers = [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/irc/kirc/default.nix b/pkgs/applications/networking/irc/kirc/default.nix deleted file mode 100644 index ea2e45bff88e0..0000000000000 --- a/pkgs/applications/networking/irc/kirc/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -}: - -stdenv.mkDerivation rec { - pname = "kirc"; - version = "0.3.2"; - - src = fetchFromGitHub { - owner = "mcpcpc"; - repo = pname; - rev = version; - hash = "sha256-SXPtSFjGPLgORG9OCSCEStzNzdGZFzCx72YOrW288MU="; - }; - - dontConfigure = true; - - installFlags = [ "PREFIX=$(out)" ]; - - meta = with lib; { - homepage = "https://mcpcpc.github.io/kirc/"; - description = "Tiny IRC client written in C99"; - mainProgram = "kirc"; - longDescription = '' - kirc is a tiny open-source Internet Relay Chat (IRC) client designed with - usability and cross-platform compatibility in mind. - - It features: - - No dependencies other than a C99 compiler. - - Simple Authentication and Security Layer (SASL) procotol support. - - Client-to-client (CTCP) protocol support. - - Transport Layer Security (TLS) protocol support (via external - utilities). - - Simple chat history logging. - - Asynchronous message handling. - - Multi-channel joining at server connection. - - Full support for all RFC 2812 commands. - - Easy customized color scheme definition. - ''; - license = licenses.mit; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/applications/networking/irc/thelounge/default.nix b/pkgs/applications/networking/irc/thelounge/default.nix index 1078f515c69ac..b297ba4e253a0 100644 --- a/pkgs/applications/networking/irc/thelounge/default.nix +++ b/pkgs/applications/networking/irc/thelounge/default.nix @@ -5,9 +5,9 @@ , nodejs , yarn , fixup-yarn-lock -, python3 +, python311 , npmHooks -, darwin +, cctools , sqlite , srcOnly , buildPackages @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "thelounge"; - version = "4.4.1"; + version = "4.4.3"; src = fetchFromGitHub { owner = "thelounge"; repo = "thelounge"; rev = "v${finalAttrs.version}"; - hash = "sha256-4FdNYP9VLgv/rfvT7KHCF+ABFsZvPbJjfz6IvvDkRNA="; + hash = "sha256-lDbyqVFjhF2etRx31ax7KiQ1QKgVhD8xkTog/E3pUlA="; }; # Allow setting package path for the NixOS module. @@ -35,10 +35,12 @@ stdenv.mkDerivation (finalAttrs: { offlineCache = fetchYarnDeps { yarnLock = "${finalAttrs.src}/yarn.lock"; - hash = "sha256-MM6SgVT7Pjdu96A4eWRucEzT7uNPxBqUDgHKl8mH2C0="; + hash = "sha256-csVrgsEy9HjSBXxtgNG0hcBrR9COlcadhMQrw6BWPc4="; }; - nativeBuildInputs = [ nodejs yarn fixup-yarn-lock python3 npmHooks.npmInstallHook ] ++ lib.optional stdenv.isDarwin darwin.cctools; + # Distutils was deprecated in 3.10, and removed in 3.12. This build needs it. An alternative could be adding + # setuptools, but testing with that and 3.12 still fails. + nativeBuildInputs = [ nodejs yarn fixup-yarn-lock python311 npmHooks.npmInstallHook ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools ]; buildInputs = [ sqlite ]; configurePhase = '' diff --git a/pkgs/applications/networking/irc/tiny/default.nix b/pkgs/applications/networking/irc/tiny/default.nix index 583723c0d147c..fa8f3edf5ad6e 100644 --- a/pkgs/applications/networking/irc/tiny/default.nix +++ b/pkgs/applications/networking/irc/tiny/default.nix @@ -4,10 +4,10 @@ , fetchFromGitHub , pkg-config , Foundation -, dbusSupport ? stdenv.isLinux, dbus +, dbusSupport ? stdenv.hostPlatform.isLinux, dbus # rustls will be used for TLS if useOpenSSL=false -, useOpenSSL ? stdenv.isLinux, openssl -, notificationSupport ? stdenv.isLinux +, useOpenSSL ? stdenv.hostPlatform.isLinux, openssl +, notificationSupport ? stdenv.hostPlatform.isLinux }: rustPlatform.buildRustPackage rec { @@ -23,10 +23,10 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-AhQCfLCoJU7o8s+XL3hDOPmZi9QjOxXSA9uglA1KSuY="; - nativeBuildInputs = lib.optional stdenv.isLinux pkg-config; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isLinux pkg-config; buildInputs = lib.optionals dbusSupport [ dbus ] ++ lib.optionals useOpenSSL [ openssl ] - ++ lib.optional stdenv.isDarwin Foundation; + ++ lib.optional stdenv.hostPlatform.isDarwin Foundation; buildFeatures = lib.optional notificationSupport "desktop-notifications"; diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index b31ae22fd33b1..8ac356b9183bc 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -3,14 +3,14 @@ , zlib, curl, pkg-config, libgcrypt , cmake, libobjc, libresolv, libiconv , asciidoctor # manpages -, enableTests ? !stdenv.isDarwin, cpputest +, enableTests ? !stdenv.hostPlatform.isDarwin, cpputest , guileSupport ? true, guile , luaSupport ? true, lua5 , perlSupport ? true, perl , pythonSupport ? true, python3Packages , rubySupport ? true, ruby , tclSupport ? true, tcl -, phpSupport ? !stdenv.isDarwin, php, systemd, libxml2, pcre2, libargon2 +, phpSupport ? !stdenv.hostPlatform.isDarwin, php, systemd, libxml2, pcre2, libargon2 , extraBuildInputs ? [] }: @@ -29,21 +29,21 @@ let { name = "python"; enabled = pythonSupport; cmakeFlag = "ENABLE_PYTHON3"; buildInputs = [ python ]; } { name = "php"; enabled = phpSupport; cmakeFlag = "ENABLE_PHP"; buildInputs = [ php-embed.unwrapped.dev libxml2 pcre2 libargon2 - ] ++ lib.optional stdenv.isLinux systemd; } + ] ++ lib.optional stdenv.hostPlatform.isLinux systemd; } ]; enabledPlugins = builtins.filter (p: p.enabled) plugins; in assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins; stdenv.mkDerivation rec { - version = "4.3.3"; + version = "4.4.2"; pname = "weechat"; hardeningEnable = [ "pie" ]; src = fetchurl { url = "https://weechat.org/files/src/weechat-${version}.tar.xz"; - hash = "sha256-VYfbbOoziVvaEBxGptCen8COD8p2/4rDsUTasysQXtg="; + hash = "sha256-1N8ompxbygOm1PrgBuUgNwZO8Dutb76VnFOPMZdDTew="; }; # Why is this needed? https://github.com/weechat/weechat/issues/2031 @@ -51,30 +51,28 @@ let outputs = [ "out" "man" ] ++ map (p: p.name) enabledPlugins; - cmakeFlags = with lib; [ + cmakeFlags = [ "-DENABLE_MAN=ON" "-DENABLE_DOC=ON" "-DENABLE_DOC_INCOMPLETE=ON" "-DENABLE_TESTS=${if enableTests then "ON" else "OFF"}" ] - ++ optionals stdenv.isDarwin ["-DICONV_LIBRARY=${libiconv}/lib/libiconv.dylib"] + ++ lib.optionals stdenv.hostPlatform.isDarwin ["-DICONV_LIBRARY=${libiconv}/lib/libiconv.dylib"] ++ map (p: "-D${p.cmakeFlag}=" + (if p.enabled then "ON" else "OFF")) plugins ; nativeBuildInputs = [ cmake pkg-config asciidoctor ] ++ lib.optional enableTests cpputest; - buildInputs = with lib; [ - ncurses openssl aspell cjson gnutls gettext zlib curl - libgcrypt ] - ++ optionals stdenv.isDarwin [ libobjc libresolv ] - ++ concatMap (p: p.buildInputs) enabledPlugins + buildInputs = [ ncurses openssl aspell cjson gnutls gettext zlib curl libgcrypt ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libobjc libresolv ] + ++ lib.concatMap (p: p.buildInputs) enabledPlugins ++ extraBuildInputs; env.NIX_CFLAGS_COMPILE = "-I${python}/include/${python.libPrefix}" # Fix '_res_9_init: undefined symbol' error - + (lib.optionalString stdenv.isDarwin "-DBIND_8_COMPAT=1 -lresolv"); + + (lib.optionalString stdenv.hostPlatform.isDarwin "-DBIND_8_COMPAT=1 -lresolv"); - postInstall = with lib; '' - for p in ${concatMapStringsSep " " (p: p.name) enabledPlugins}; do + postInstall = '' + for p in ${lib.concatMapStringsSep " " (p: p.name) enabledPlugins}; do from=$out/lib/weechat/plugins/$p.so to=''${!p}/lib/weechat/plugins/$p.so mkdir -p $(dirname $to) diff --git a/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix b/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix index 46d676682b5bf..65b5bbd5d6682 100644 --- a/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix +++ b/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, substituteAll, buildEnv, fetchFromGitHub, python3Packages }: +{ lib, stdenv, fetchpatch, substituteAll, buildEnv, fetchFromGitHub, python3Packages }: stdenv.mkDerivation rec { pname = "wee-slack"; @@ -12,6 +12,12 @@ stdenv.mkDerivation rec { }; patches = [ + # Fix for https://github.com/wee-slack/wee-slack/issues/930 + (fetchpatch { + url = "https://github.com/wee-slack/wee-slack/commit/e610b39aee2d9a49d080924d47d96c5d140f66ac.patch"; + hash = "sha256-+yBZSx0LsoXmTmdN9d3VV2KNzpXfgfNVp4ZqfS4oKzg="; + }) + (substituteAll { src = ./libpath.patch; env = "${buildEnv { diff --git a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix index 46cb08594ee05..22eb0849cc4a0 100644 --- a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix +++ b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix @@ -40,12 +40,12 @@ stdenv.mkDerivation { meta = with lib; { description = "WeeChat script in Lua that implements the matrix.org chat protocol"; homepage = "https://github.com/torhve/weechat-matrix-protocol-script"; - maintainers = with maintainers; [ ]; + maintainers = [ ]; license = licenses.mit; # see https://github.com/torhve/weechat-matrix-protocol-script/blob/0052e7275ae149dc5241226391c9b1889ecc3c6b/matrix.lua#L53 platforms = platforms.unix; # As of 2019-06-30, all of the dependencies are available on macOS but the # package itself does not build. - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix index a67903c6fe98a..265065a445e3c 100644 --- a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix +++ b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix @@ -56,10 +56,10 @@ in buildPythonPackage { attrs logbook pygments - matrix-nio + (matrix-nio.override { withOlm = true; }) aiohttp requests - ] ++ matrix-nio.optional-dependencies.e2e; + ]; passthru.scripts = [ "matrix.py" ]; diff --git a/pkgs/applications/networking/irc/wraith/default.nix b/pkgs/applications/networking/irc/wraith/default.nix index c059babffe7b6..c046a0c2d7f99 100644 --- a/pkgs/applications/networking/irc/wraith/default.nix +++ b/pkgs/applications/networking/irc/wraith/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); description = "IRC channel management bot written purely in C/C++"; longDescription = '' Wraith is an IRC channel management bot written purely in C/C++. It has diff --git a/pkgs/applications/networking/iroh/default.nix b/pkgs/applications/networking/iroh/default.nix index 263d5e3342e83..ba87e0f293647 100644 --- a/pkgs/applications/networking/iroh/default.nix +++ b/pkgs/applications/networking/iroh/default.nix @@ -7,18 +7,18 @@ rustPlatform.buildRustPackage rec { pname = "iroh"; - version = "0.17.0"; + version = "0.25.0"; src = fetchFromGitHub { owner = "n0-computer"; repo = pname; rev = "v${version}"; - hash = "sha256-CemVlw0S4UmKFopWSh1Hv2znMRN3guIBx303esK/gLw="; + hash = "sha256-hF1Nf4+uJXVPpkfsLFKjySMmCSmJdX2LeSHNb0vrBoA="; }; - cargoHash = "sha256-LgA6gdBRLsow98nv9A5rYb/v/FGzu/LPQwftyeuKHk4="; + cargoHash = "sha256-t1re2vpxGZkC45n0jUytqe2SPAC/+fh4Itq1h9znYnM="; - buildInputs = lib.optionals stdenv.isDarwin ( + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; [ Security SystemConfiguration diff --git a/pkgs/applications/networking/juju/default.nix b/pkgs/applications/networking/juju/default.nix index cce7f1e7c88f1..915bb54563e46 100644 --- a/pkgs/applications/networking/juju/default.nix +++ b/pkgs/applications/networking/juju/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "juju"; - version = "3.5.1"; + version = "3.5.3"; src = fetchFromGitHub { owner = "juju"; repo = "juju"; rev = "v${version}"; - hash = "sha256-VOGkAv42dus2uxoffffIn6dwC18idwF2tycEHLd6I4s="; + hash = "sha256-PdNUmPfPYqOYEphY0ZlwEikUV/bKSPOGQuAJsi8+g/E="; }; - vendorHash = "sha256-2JNEN8fmxflEyP5lHAv75Bjt9sbKoWL5O+87hxK89vU="; + vendorHash = "sha256-FCN+0Wx2fYQcj5CRgPubAWbGGyVQcSSfu/Om6SUB6TQ="; subPackages = [ "cmd/juju" diff --git a/pkgs/applications/networking/jxplorer/default.nix b/pkgs/applications/networking/jxplorer/default.nix index c31c27bdd5db3..e7bd11e5f1d05 100644 --- a/pkgs/applications/networking/jxplorer/default.nix +++ b/pkgs/applications/networking/jxplorer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, makeDesktopItem, ant, jdk8, copyDesktopItems, makeWrapper }: +{ lib, stdenv, fetchurl, makeDesktopItem, jdk8, copyDesktopItems, makeWrapper }: stdenv.mkDerivation rec { pname = "jxplorer"; diff --git a/pkgs/applications/networking/ktailctl/default.nix b/pkgs/applications/networking/ktailctl/default.nix index b9cd8e47d9383..5c691e239d218 100644 --- a/pkgs/applications/networking/ktailctl/default.nix +++ b/pkgs/applications/networking/ktailctl/default.nix @@ -1,11 +1,11 @@ { lib , stdenv , fetchFromGitHub -, buildGoModule +, buildGo123Module , cmake , extra-cmake-modules , git -, go +, go_1_23 , wrapQtAppsHook , qtbase , qtdeclarative @@ -23,20 +23,20 @@ }: let - version = "0.16.2"; + version = "0.18.1"; src = fetchFromGitHub { owner = "f-koehler"; repo = "KTailctl"; rev = "v${version}"; - hash = "sha256-rnuh0+i6W9ipSM61MXd9dTlIkdGUHMjtvElW/4S2YCg="; + hash = "sha256-hlpxim4Vm/C37ts+Q/t9swCejKEE97R1QlP+Y2jNWoM="; }; - goDeps = (buildGoModule { + goDeps = (buildGo123Module { pname = "ktailctl-go-wrapper"; inherit src version; modRoot = "src/wrapper"; - vendorHash = "sha256-GD+G+7b8GBwR3OrRPJbGJVom+kLC67VvlGFIA0S7UF8="; + vendorHash = "sha256-KdkvAPLnoC7DccRVIz7t/Ns71dnG59DpO5qwOhJk7qc="; }).goModules; in stdenv.mkDerivation { @@ -61,7 +61,7 @@ stdenv.mkDerivation { cmake extra-cmake-modules git - go + go_1_23 wrapQtAppsHook ]; diff --git a/pkgs/applications/networking/kubo-migrator/all-migrations.nix b/pkgs/applications/networking/kubo-migrator/all-migrations.nix index 54ae2551caa32..d44fafb3be9e9 100644 --- a/pkgs/applications/networking/kubo-migrator/all-migrations.nix +++ b/pkgs/applications/networking/kubo-migrator/all-migrations.nix @@ -63,7 +63,7 @@ let fs-repo-9-to-10 fs-repo-8-to-9 fs-repo-7-to-8 - ] ++ lib.optional (!stdenv.isDarwin) # I didn't manage to fix this on macOS: + ] ++ lib.optional (!stdenv.hostPlatform.isDarwin) # I didn't manage to fix this on macOS: fs-repo-6-to-7 # gx/ipfs/QmSGRM5Udmy1jsFBr1Cawez7Lt7LZ3ZKA23GGVEsiEW6F3/eventfd/eventfd.go:27:32: undefined: syscall.SYS_EVENTFD2 ++ [ fs-repo-5-to-6 diff --git a/pkgs/applications/networking/libcoap/default.nix b/pkgs/applications/networking/libcoap/default.nix index bae998f6cf88a..5c3752046be39 100644 --- a/pkgs/applications/networking/libcoap/default.nix +++ b/pkgs/applications/networking/libcoap/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "obgm"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-SzuXFn4rihZIHxKSH5waC5362mhsOtBdRatIGI6nv4I="; + hash = "sha256-SzuXFn4rihZIHxKSH5waC5362mhsOtBdRatIGI6nv4I="; }; nativeBuildInputs = [ automake diff --git a/pkgs/applications/networking/lls/default.nix b/pkgs/applications/networking/lls/default.nix index 3d4d70597e69c..3662477fde16d 100644 --- a/pkgs/applications/networking/lls/default.nix +++ b/pkgs/applications/networking/lls/default.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { hash = "sha256-FtRPRR+/R3JTEI90mAEHFyhqloAbNEdR3jkquKa9Ahw="; }; - cargoSha256 = "sha256-yjRbg/GzCs5d3zXL22j5U9c4BlOcRHyggHCovj4fMIs="; + cargoHash = "sha256-yjRbg/GzCs5d3zXL22j5U9c4BlOcRHyggHCovj4fMIs="; meta = with lib; { description = "Tool to list listening sockets"; diff --git a/pkgs/applications/networking/localproxy/default.nix b/pkgs/applications/networking/localproxy/default.nix index 3de21a4c71127..f693bcb12c04a 100644 --- a/pkgs/applications/networking/localproxy/default.nix +++ b/pkgs/applications/networking/localproxy/default.nix @@ -15,25 +15,18 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "localproxy"; - version = "3.1.1"; + version = "3.1.2"; src = fetchFromGitHub { owner = "aws-samples"; repo = "aws-iot-securetunneling-localproxy"; rev = "v${finalAttrs.version}"; - hash = "sha256-voUKfXa43mOltePQEXgmJ2EBaN06E6R/2Zz6O09ogyY="; + hash = "sha256-bIJLGJhSzBVqJaTWJj4Pmw/shA4Y0CzX4HhHtQZjfj0="; }; patches = [ - # gcc-13 compatibility fix: - # https://github.com/aws-samples/aws-iot-securetunneling-localproxy/pull/136 (fetchpatch { - name = "gcc-13-part-1.patch"; - url = "https://github.com/aws-samples/aws-iot-securetunneling-localproxy/commit/f6ba73eaede61841534623cdb01b69d793124f4b.patch"; - hash = "sha256-sB9GuEuHLyj6DXNPuYAMibUJXdkThKbS/fxvnJU3rS4="; - }) - (fetchpatch { - name = "gcc-13-part-2.patch"; + name = "gcc-13.patch"; url = "https://github.com/aws-samples/aws-iot-securetunneling-localproxy/commit/de8779630d14e4f4969c9b171d826acfa847822b.patch"; hash = "sha256-11k6mRvCx72+5G/5LZZx2qnx10yfKpcAZofn8t8BD3E="; }) @@ -43,6 +36,10 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ openssl protobuf catch2 boost icu ]; + postPatch = '' + sed -i '/set(OPENSSL_USE_STATIC_LIBS TRUE)/d' CMakeLists.txt + ''; + # causes redefinition of _FORTIFY_SOURCE hardeningDisable = [ "fortify3" ]; diff --git a/pkgs/applications/networking/localsend/default.nix b/pkgs/applications/networking/localsend/default.nix deleted file mode 100644 index bd681b74eebbc..0000000000000 --- a/pkgs/applications/networking/localsend/default.nix +++ /dev/null @@ -1,102 +0,0 @@ -{ lib -, stdenv -, fetchurl -, fetchFromGitHub -, flutter313 -, makeDesktopItem -, pkg-config -, libayatana-appindicator -, undmg -, makeBinaryWrapper -}: - -let - pname = "localsend"; - version = "1.14.0"; - - linux = flutter313.buildFlutterApplication rec { - inherit pname version; - - src = fetchFromGitHub { - owner = pname; - repo = pname; - rev = "v${version}"; - hash = "sha256-CO0uFcZnOfE31EZxRUpgtod3+1lyXPpbytHB45DEM98="; - }; - - sourceRoot = "${src.name}/app"; - - pubspecLock = lib.importJSON ./pubspec.lock.json; - - gitHashes = { - "permission_handler_windows" = "sha256-a7bN7/A65xsvnQGXUvZCfKGtslbNWEwTWR8fAIjMwS0="; - "tray_manager" = "sha256-eF14JGf5jclsKdXfCE7Rcvp72iuWd9wuSZ8Bej17tjg="; - }; - - nativeBuildInputs = [ pkg-config ]; - - buildInputs = [ libayatana-appindicator ]; - - postInstall = '' - for s in 32 128 256 512; do - d=$out/share/icons/hicolor/''${s}x''${s}/apps - mkdir -p $d - ln -s $out/app/data/flutter_assets/assets/img/logo-''${s}.png $d/localsend.png - done - mkdir -p $out/share/applications - cp $desktopItem/share/applications/*.desktop $out/share/applications - substituteInPlace $out/share/applications/*.desktop --subst-var out - ''; - - desktopItem = makeDesktopItem { - name = "LocalSend"; - exec = "@out@/bin/localsend_app"; - icon = "localsend"; - desktopName = "LocalSend"; - startupWMClass = "localsend_app"; - genericName = "An open source cross-platform alternative to AirDrop"; - categories = [ "Network" ]; - }; - - passthru.updateScript = ./update.sh; - - meta = metaCommon // { - mainProgram = "localsend_app"; - }; - }; - - darwin = stdenv.mkDerivation { - inherit pname version; - - src = fetchurl { - url = "https://github.com/localsend/localsend/releases/download/v${version}/LocalSend-${version}.dmg"; - hash = "sha256-L7V48QoOA0cjx45n+9Xav/zzCzCsZB3TBip0WGusMXg="; - }; - - nativeBuildInputs = [ undmg makeBinaryWrapper ]; - - sourceRoot = "."; - - installPhase = '' - mkdir -p $out/Applications - cp -r *.app $out/Applications - makeBinaryWrapper $out/Applications/LocalSend.app/Contents/MacOS/LocalSend $out/bin/localsend - ''; - - meta = metaCommon // { - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - platforms = [ "x86_64-darwin" "aarch64-darwin" ]; - }; - }; - - metaCommon = with lib; { - description = "Open source cross-platform alternative to AirDrop"; - homepage = "https://localsend.org/"; - license = licenses.mit; - mainProgram = "localsend"; - maintainers = with maintainers; [ sikmir linsui ]; - }; -in -if stdenv.isDarwin -then darwin -else linux diff --git a/pkgs/applications/networking/localsend/pubspec.lock.json b/pkgs/applications/networking/localsend/pubspec.lock.json deleted file mode 100644 index 2f16aafd6ce2a..0000000000000 --- a/pkgs/applications/networking/localsend/pubspec.lock.json +++ /dev/null @@ -1,2219 +0,0 @@ -{ - "packages": { - "_fe_analyzer_shared": { - "dependency": "transitive", - "description": { - "name": "_fe_analyzer_shared", - "sha256": "ae92f5d747aee634b87f89d9946000c2de774be1d6ac3e58268224348cd0101a", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "61.0.0" - }, - "analyzer": { - "dependency": "transitive", - "description": { - "name": "analyzer", - "sha256": "ea3d8652bda62982addfd92fdc2d0214e5f82e43325104990d4f4c4a2a313562", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "5.13.0" - }, - "ansicolor": { - "dependency": "transitive", - "description": { - "name": "ansicolor", - "sha256": "8bf17a8ff6ea17499e40a2d2542c2f481cd7615760c6d34065cb22bfd22e6880", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.0.2" - }, - "app_group_directory": { - "dependency": "direct main", - "description": { - "name": "app_group_directory", - "sha256": "ad89800fd55133b46e1f6940ac6b974562f7fb6394c662c0f4422b90167f2416", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.0.0" - }, - "archive": { - "dependency": "transitive", - "description": { - "name": "archive", - "sha256": "22600aa1e926be775fa5fe7e6894e7fb3df9efda8891c73f70fb3262399a432d", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.4.10" - }, - "args": { - "dependency": "transitive", - "description": { - "name": "args", - "sha256": "eef6c46b622e0494a36c5a12d10d77fb4e855501a91c1b9ef9339326e58f0596", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.4.2" - }, - "async": { - "dependency": "transitive", - "description": { - "name": "async", - "sha256": "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.11.0" - }, - "basic_utils": { - "dependency": "direct main", - "description": { - "name": "basic_utils", - "sha256": "2064b21d3c41ed7654bc82cc476fd65542e04d60059b74d5eed490a4da08fc6c", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "5.7.0" - }, - "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_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": "0343061a33da9c5810b2d6cee51945127d8f4c060b7fbdd9d54917f0a3feaaa1", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.0.1" - }, - "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": "581bacf68f89ec8792f5e5a0b2c4decd1c948e97ce659dc783688c8a88fbec21", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.4.8" - }, - "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": "fedde275e0a6b798c3296963c5cd224e3e1b55d0e478d5b7e65e6b540f363a0e", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "8.9.1" - }, - "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" - }, - "cli_util": { - "dependency": "transitive", - "description": { - "name": "cli_util", - "sha256": "c05b7406fdabc7a49a3929d4af76bcaccbbffcbcdcf185b082e1ae07da323d19", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.4.1" - }, - "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": "f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.17.2" - }, - "color": { - "dependency": "transitive", - "description": { - "name": "color", - "sha256": "ddcdf1b3badd7008233f5acffaf20ca9f5dc2cd0172b75f68f24526a5f5725cb", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.0.0" - }, - "common": { - "dependency": "direct main", - "description": { - "path": "../common", - "relative": true - }, - "source": "path", - "version": "1.0.0" - }, - "connectivity_plus": { - "dependency": "direct main", - "description": { - "name": "connectivity_plus", - "sha256": "224a77051d52a11fbad53dd57827594d3bd24f945af28bd70bab376d68d437f0", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "5.0.2" - }, - "connectivity_plus_platform_interface": { - "dependency": "transitive", - "description": { - "name": "connectivity_plus_platform_interface", - "sha256": "cf1d1c28f4416f8c654d7dc3cd638ec586076255d407cef3ddbdaf178272a71a", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.2.4" - }, - "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" - }, - "coverage": { - "dependency": "transitive", - "description": { - "name": "coverage", - "sha256": "595a29b55ce82d53398e1bcc2cba525d7bd7c59faeb2d2540e9d42c390cfeeeb", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.6.4" - }, - "cross_file": { - "dependency": "transitive", - "description": { - "name": "cross_file", - "sha256": "2f9d2cbccb76127ba28528cb3ae2c2326a122446a83de5a056aaa3880d3882c5", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.3.3+7" - }, - "crypto": { - "dependency": "transitive", - "description": { - "name": "crypto", - "sha256": "ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.0.3" - }, - "csslib": { - "dependency": "transitive", - "description": { - "name": "csslib", - "sha256": "706b5707578e0c1b4b7550f64078f0a0f19dec3f50a178ffae7006b0a9ca58fb", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.0" - }, - "csv": { - "dependency": "transitive", - "description": { - "name": "csv", - "sha256": "63ed2871dd6471193dffc52c0e6c76fb86269c00244d244297abbb355c84a86e", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "5.1.1" - }, - "dart_mappable": { - "dependency": "direct main", - "description": { - "name": "dart_mappable", - "sha256": "7b6d38ae95f1ae8ffa65df9a5464f14b56c2de94699a035202ca4cd3a0ba249e", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.2.0" - }, - "dart_mappable_builder": { - "dependency": "direct dev", - "description": { - "name": "dart_mappable_builder", - "sha256": "98c058f7e80a98ea42d357d888ed1648d96bedac8b16872b58fc7024faefcdfe", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.2.0" - }, - "dart_style": { - "dependency": "transitive", - "description": { - "name": "dart_style", - "sha256": "1efa911ca7086affd35f463ca2fc1799584fb6aa89883cf0af8e3664d6a02d55", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.3.2" - }, - "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" - }, - "desktop_drop": { - "dependency": "direct main", - "description": { - "name": "desktop_drop", - "sha256": "d55a010fe46c8e8fcff4ea4b451a9ff84a162217bdb3b2a0aa1479776205e15d", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.4.4" - }, - "device_apps": { - "dependency": "direct main", - "description": { - "name": "device_apps", - "sha256": "e84dc74d55749993fd671148cc0bd53096e1be0c268fc364285511b1d8a4c19b", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.2.0" - }, - "device_info_plus": { - "dependency": "direct main", - "description": { - "name": "device_info_plus", - "sha256": "77f757b789ff68e4eaf9c56d1752309bd9f7ad557cb105b938a7f8eb89e59110", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "9.1.2" - }, - "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" - }, - "dio": { - "dependency": "direct main", - "description": { - "name": "dio", - "sha256": "49af28382aefc53562459104f64d16b9dfd1e8ef68c862d5af436cc8356ce5a8", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "5.4.1" - }, - "dynamic_color": { - "dependency": "direct main", - "description": { - "name": "dynamic_color", - "sha256": "a866f1f8947bfdaf674d7928e769eac7230388a2e7a2542824fad4bb5b87be3b", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.6.9" - }, - "extended_image": { - "dependency": "transitive", - "description": { - "name": "extended_image", - "sha256": "b4d72a27851751cfadaf048936d42939db7cd66c08fdcfe651eeaa1179714ee6", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "8.1.1" - }, - "extended_image_library": { - "dependency": "transitive", - "description": { - "name": "extended_image_library", - "sha256": "8bf87c0b14dcb59200c923a9a3952304e4732a0901e40811428834ef39018ee1", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.6.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": "7bf0adc28a23d395f19f3f1eb21dd7cfd1dd9f8e1c50051c069122e6853bc878", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.1.0" - }, - "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": "4e42aacde3b993c5947467ab640882c56947d9d27342a5b6f2895b23956954a6", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "6.1.1" - }, - "file_selector": { - "dependency": "direct main", - "description": { - "name": "file_selector", - "sha256": "5019692b593455127794d5718304ff1ae15447dea286cdda9f0db2a796a1b828", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.3" - }, - "file_selector_android": { - "dependency": "transitive", - "description": { - "name": "file_selector_android", - "sha256": "1cd66575f063b689e041aec836905ba7be18d76c9f0634d0d75daec825f67095", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.5.0+7" - }, - "file_selector_ios": { - "dependency": "transitive", - "description": { - "name": "file_selector_ios", - "sha256": "b015154e6d9fddbc4d08916794df170b44531798c8dd709a026df162d07ad81d", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.5.1+8" - }, - "file_selector_linux": { - "dependency": "transitive", - "description": { - "name": "file_selector_linux", - "sha256": "045d372bf19b02aeb69cacf8b4009555fb5f6f0b7ad8016e5f46dd1387ddd492", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.9.2+1" - }, - "file_selector_macos": { - "dependency": "transitive", - "description": { - "name": "file_selector_macos", - "sha256": "b15c3da8bd4908b9918111fa486903f5808e388b8d1c559949f584725a6594d6", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.9.3+3" - }, - "file_selector_platform_interface": { - "dependency": "transitive", - "description": { - "name": "file_selector_platform_interface", - "sha256": "a3994c26f10378a039faa11de174d7b78eb8f79e4dd0af2a451410c1a5c3f66b", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.6.2" - }, - "file_selector_web": { - "dependency": "transitive", - "description": { - "name": "file_selector_web", - "sha256": "dc6622c4d66cb1bee623ddcc029036603c6cc45c85e4a775bb06008d61c809c1", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.9.2+1" - }, - "file_selector_windows": { - "dependency": "transitive", - "description": { - "name": "file_selector_windows", - "sha256": "d3547240c20cabf205c7c7f01a50ecdbc413755814d6677f3cb366f04abcead0", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.9.3+1" - }, - "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_displaymode": { - "dependency": "direct main", - "description": { - "name": "flutter_displaymode", - "sha256": "42c5e9abd13d28ed74f701b60529d7f8416947e58256e6659c5550db719c57ef", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.6.0" - }, - "flutter_gen_core": { - "dependency": "transitive", - "description": { - "name": "flutter_gen_core", - "sha256": "8b4ff1d45d125e576e26ea99d15e0419bb3c45b53696e022880866b78bb6b830", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "5.3.2" - }, - "flutter_gen_runner": { - "dependency": "direct dev", - "description": { - "name": "flutter_gen_runner", - "sha256": "fd197f8c657e79313d53d3934de602ebe604ba722a84c88ae3a43cd90428c67a", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "5.3.2" - }, - "flutter_lints": { - "dependency": "direct dev", - "description": { - "name": "flutter_lints", - "sha256": "e2a421b7e59244faef694ba7b30562e489c2b489866e505074eb005cd7060db7", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.0.1" - }, - "flutter_localizations": { - "dependency": "direct main", - "description": "flutter", - "source": "sdk", - "version": "0.0.0" - }, - "flutter_markdown": { - "dependency": "direct main", - "description": { - "name": "flutter_markdown", - "sha256": "21b085a1c185e46701373866144ced56cfb7a0c33f63c916bb8fe2d0c1491278", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.6.19" - }, - "flutter_plugin_android_lifecycle": { - "dependency": "transitive", - "description": { - "name": "flutter_plugin_android_lifecycle", - "sha256": "b068ffc46f82a55844acfa4fdbb61fad72fa2aef0905548419d97f0f95c456da", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.0.17" - }, - "flutter_test": { - "dependency": "transitive", - "description": "flutter", - "source": "sdk", - "version": "0.0.0" - }, - "flutter_web_plugins": { - "dependency": "transitive", - "description": "flutter", - "source": "sdk", - "version": "0.0.0" - }, - "frontend_server_client": { - "dependency": "transitive", - "description": { - "name": "frontend_server_client", - "sha256": "408e3ca148b31c20282ad6f37ebfa6f4bdc8fede5b74bc2f08d9d92b55db3612", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.2.0" - }, - "gal": { - "dependency": "direct main", - "description": { - "name": "gal", - "sha256": "54c9b72528efce7c66234f3b6dd01cb0304fd8af8196de15571d7bdddb940977", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.3.0" - }, - "get_it": { - "dependency": "transitive", - "description": { - "name": "get_it", - "sha256": "e6017ce7fdeaf218dc51a100344d8cb70134b80e28b760f8bb23c242437bafd7", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "7.6.7" - }, - "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" - }, - "gtk": { - "dependency": "transitive", - "description": { - "name": "gtk", - "sha256": "e8ce9ca4b1df106e4d72dad201d345ea1a036cc12c360f1a7d5a758f78ffa42c", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.1.0" - }, - "html": { - "dependency": "transitive", - "description": { - "name": "html", - "sha256": "3a7812d5bcd2894edf53dfaf8cd640876cf6cef50a8f238745c8b8120ea74d3a", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.15.4" - }, - "http": { - "dependency": "transitive", - "description": { - "name": "http", - "sha256": "759d1a329847dd0f39226c688d3e06a6b8679668e350e2891a6474f8b4bb8525", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.1.0" - }, - "http_client_helper": { - "dependency": "transitive", - "description": { - "name": "http_client_helper", - "sha256": "8a9127650734da86b5c73760de2b404494c968a3fd55602045ffec789dac3cb1", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.0.0" - }, - "http_methods": { - "dependency": "transitive", - "description": { - "name": "http_methods", - "sha256": "6bccce8f1ec7b5d701e7921dca35e202d425b57e317ba1a37f2638590e29e566", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.1.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": "4c68bfd5ae83e700b5204c1e74451e7bf3cf750e6843c6e158289cf56bda018e", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.1.7" - }, - "image_picker": { - "dependency": "direct main", - "description": { - "name": "image_picker", - "sha256": "26222b01a0c9a2c8fe02fc90b8208bd3325da5ed1f4a2acabf75939031ac0bdd", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.7" - }, - "image_picker_android": { - "dependency": "transitive", - "description": { - "name": "image_picker_android", - "sha256": "39f2bfe497e495450c81abcd44b62f56c2a36a37a175da7d137b4454977b51b1", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.8.9+3" - }, - "image_picker_for_web": { - "dependency": "transitive", - "description": { - "name": "image_picker_for_web", - "sha256": "e2423c53a68b579a7c37a1eda967b8ae536c3d98518e5db95ca1fe5719a730a3", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.0.2" - }, - "image_picker_ios": { - "dependency": "transitive", - "description": { - "name": "image_picker_ios", - "sha256": "fadafce49e8569257a0cad56d24438a6fa1f0cbd7ee0af9b631f7492818a4ca3", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.8.9+1" - }, - "image_picker_linux": { - "dependency": "transitive", - "description": { - "name": "image_picker_linux", - "sha256": "4ed1d9bb36f7cd60aa6e6cd479779cc56a4cb4e4de8f49d487b1aaad831300fa", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.2.1+1" - }, - "image_picker_macos": { - "dependency": "transitive", - "description": { - "name": "image_picker_macos", - "sha256": "3f5ad1e8112a9a6111c46d0b57a7be2286a9a07fc6e1976fdf5be2bd31d4ff62", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.2.1+1" - }, - "image_picker_platform_interface": { - "dependency": "transitive", - "description": { - "name": "image_picker_platform_interface", - "sha256": "fa4e815e6fcada50e35718727d83ba1c92f1edf95c0b4436554cec301b56233b", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.9.3" - }, - "image_picker_windows": { - "dependency": "transitive", - "description": { - "name": "image_picker_windows", - "sha256": "6ad07afc4eb1bc25f3a01084d28520496c4a3bb0cb13685435838167c9dcedeb", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.2.1+1" - }, - "in_app_purchase": { - "dependency": "direct main", - "description": { - "name": "in_app_purchase", - "sha256": "def70fbaa2a274f4d835677459f6f7afc5469de912438f86076e51cbd4cbd5b4", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.1.13" - }, - "in_app_purchase_android": { - "dependency": "transitive", - "description": { - "name": "in_app_purchase_android", - "sha256": "c94aebe986723b6f4e4d8551d160c6602e73d0b38bf86a59fb054dfeb44bc1e5", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.3.1" - }, - "in_app_purchase_platform_interface": { - "dependency": "transitive", - "description": { - "name": "in_app_purchase_platform_interface", - "sha256": "412efce2b9238c5ace4f057acad43f793ed06880e366d26ae322e796cadb051a", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.3.7" - }, - "in_app_purchase_storekit": { - "dependency": "transitive", - "description": { - "name": "in_app_purchase_storekit", - "sha256": "c4b17a7f2ca8ddc7fd7996a8c32a3af6beddf91d651997c8675a5f23c103c9bc", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.3.8+1" - }, - "intl": { - "dependency": "direct main", - "description": { - "name": "intl", - "sha256": "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.18.1" - }, - "io": { - "dependency": "transitive", - "description": { - "name": "io", - "sha256": "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.4" - }, - "js": { - "dependency": "transitive", - "description": { - "name": "js", - "sha256": "f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.6.7" - }, - "json2yaml": { - "dependency": "transitive", - "description": { - "name": "json2yaml", - "sha256": "da94630fbc56079426fdd167ae58373286f603371075b69bf46d848d63ba3e51", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.0.1" - }, - "json_annotation": { - "dependency": "transitive", - "description": { - "name": "json_annotation", - "sha256": "b10a7b2ff83d83c777edba3c6a0f97045ddadd56c944e1a23a3fdf43a1bf4467", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.8.1" - }, - "launch_at_startup": { - "dependency": "direct main", - "description": { - "name": "launch_at_startup", - "sha256": "93fc5638e088290004fae358bae691486673d469957d461d9dae5b12248593eb", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.2.2" - }, - "lints": { - "dependency": "transitive", - "description": { - "name": "lints", - "sha256": "cbf8d4b858bb0134ef3ef87841abdf8d63bfc255c266b7bf6b39daa1085c4290", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.0.0" - }, - "logging": { - "dependency": "direct main", - "description": { - "name": "logging", - "sha256": "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.2.0" - }, - "markdown": { - "dependency": "transitive", - "description": { - "name": "markdown", - "sha256": "1b134d9f8ff2da15cb298efe6cd8b7d2a78958c1b00384ebcbdf13fe340a6c90", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "7.2.1" - }, - "matcher": { - "dependency": "transitive", - "description": { - "name": "matcher", - "sha256": "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.12.16" - }, - "material_color_utilities": { - "dependency": "transitive", - "description": { - "name": "material_color_utilities", - "sha256": "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.5.0" - }, - "menu_base": { - "dependency": "transitive", - "description": { - "name": "menu_base", - "sha256": "820368014a171bd1241030278e6c2617354f492f5c703d7b7d4570a6b8b84405", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.1.1" - }, - "meta": { - "dependency": "transitive", - "description": { - "name": "meta", - "sha256": "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.9.1" - }, - "mime": { - "dependency": "direct main", - "description": { - "name": "mime", - "sha256": "e4ff8e8564c03f255408decd16e7899da1733852a9110a58fe6d1b817684a63e", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.4" - }, - "mockito": { - "dependency": "direct dev", - "description": { - "name": "mockito", - "sha256": "6841eed20a7befac0ce07df8116c8b8233ed1f4486a7647c7fc5a02ae6163917", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "5.4.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" - }, - "network_info_plus": { - "dependency": "direct main", - "description": { - "name": "network_info_plus", - "sha256": "4601b815b1c6a46d84839f65cd774a7d999738471d910fae00d813e9e98b04e1", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.1.0+1" - }, - "network_info_plus_platform_interface": { - "dependency": "transitive", - "description": { - "name": "network_info_plus_platform_interface", - "sha256": "881f5029c5edaf19c616c201d3d8b366c5b1384afd5c1da5a49e4345de82fb8b", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.1.3" - }, - "nm": { - "dependency": "transitive", - "description": { - "name": "nm", - "sha256": "2c9aae4127bdc8993206464fcc063611e0e36e72018696cd9631023a31b24254", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.5.0" - }, - "node_preamble": { - "dependency": "transitive", - "description": { - "name": "node_preamble", - "sha256": "6e7eac89047ab8a8d26cf16127b5ed26de65209847630400f9aefd7cd5c730db", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.0.2" - }, - "open_filex": { - "dependency": "direct main", - "description": { - "name": "open_filex", - "sha256": "74e2280754cf8161e860746c3181db2c996d6c1909c7057b738ede4a469816b8", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.4.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": "7e76fad405b3e4016cd39d08f455a4eb5199723cf594cd1b8916d47140d93017", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.2.0" - }, - "package_info_plus_platform_interface": { - "dependency": "transitive", - "description": { - "name": "package_info_plus_platform_interface", - "sha256": "9bc8ba46813a4cc42c66ab781470711781940780fd8beddd0c3da62506d3a6c6", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.0.1" - }, - "pasteboard": { - "dependency": "direct main", - "description": { - "name": "pasteboard", - "sha256": "1c8b6a8b3f1d12e55d4e9404433cda1b4abe66db6b17bc2d2fb5965772c04674", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.2.0" - }, - "path": { - "dependency": "direct main", - "description": { - "name": "path", - "sha256": "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.8.3" - }, - "path_provider": { - "dependency": "direct main", - "description": { - "name": "path_provider", - "sha256": "b27217933eeeba8ff24845c34003b003b2b22151de3c908d0e679e8fe1aa078b", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.1.2" - }, - "path_provider_android": { - "dependency": "transitive", - "description": { - "name": "path_provider_android", - "sha256": "477184d672607c0a3bf68fbbf601805f92ef79c82b64b4d6eb318cbca4c48668", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.2.2" - }, - "path_provider_foundation": { - "dependency": "transitive", - "description": { - "name": "path_provider_foundation", - "sha256": "5a7999be66e000916500be4f15a3633ebceb8302719b47b9cc49ce924125350f", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.3.2" - }, - "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": "284a66179cabdf942f838543e10413246f06424d960c92ba95c84439154fcac8", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "11.0.1" - }, - "permission_handler_android": { - "dependency": "transitive", - "description": { - "name": "permission_handler_android", - "sha256": "f9fddd3b46109bd69ff3f9efa5006d2d309b7aec0f3c1c5637a60a2d5659e76e", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "11.1.0" - }, - "permission_handler_apple": { - "dependency": "transitive", - "description": { - "name": "permission_handler_apple", - "sha256": "99e220bce3f8877c78e4ace901082fb29fa1b4ebde529ad0932d8d664b34f3f5", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "9.1.4" - }, - "permission_handler_platform_interface": { - "dependency": "transitive", - "description": { - "name": "permission_handler_platform_interface", - "sha256": "6760eb5ef34589224771010805bea6054ad28453906936f843a8cc4d3a55c4a4", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.12.0" - }, - "permission_handler_windows": { - "dependency": "direct overridden", - "description": { - "path": ".", - "ref": "2dadd8afbf81e0e3e4791d7144e689555e58f649", - "resolved-ref": "2dadd8afbf81e0e3e4791d7144e689555e58f649", - "url": "https://github.com/localsend/permission_handler_windows_noop.git" - }, - "source": "git", - "version": "0.1.2" - }, - "petitparser": { - "dependency": "transitive", - "description": { - "name": "petitparser", - "sha256": "cb3798bef7fc021ac45b308f4b51208a152792445cce0448c9a4ba5879dd8750", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "5.4.0" - }, - "photo_manager": { - "dependency": "transitive", - "description": { - "name": "photo_manager", - "sha256": "2d698826421ebd045ecc0df60422e9dd24bd22b178310b68444385f783735b55", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.8.1" - }, - "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" - }, - "pointycastle": { - "dependency": "transitive", - "description": { - "name": "pointycastle", - "sha256": "43ac87de6e10afabc85c445745a7b799e04de84cebaa4fd7bf55a5e1e9604d29", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.7.4" - }, - "pool": { - "dependency": "transitive", - "description": { - "name": "pool", - "sha256": "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.5.1" - }, - "pretty_qr_code": { - "dependency": "direct main", - "description": { - "name": "pretty_qr_code", - "sha256": "47a0fde3967e01ea31985d1a11a998fab1ab900becdba592e9abb0a4034b807e", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.2.1" - }, - "provider": { - "dependency": "transitive", - "description": { - "name": "provider", - "sha256": "9a96a0a19b594dbc5bf0f1f27d2bc67d5f95957359b461cd9feb44ed6ae75096", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "6.1.1" - }, - "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" - }, - "qr": { - "dependency": "transitive", - "description": { - "name": "qr", - "sha256": "64957a3930367bf97cc211a5af99551d630f2f4625e38af10edd6b19131b64b3", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.0.1" - }, - "refena": { - "dependency": "transitive", - "description": { - "name": "refena", - "sha256": "a29603854d785e5259c6fb99268847e918f54463a861accc36cc913daea95cb8", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.6.1" - }, - "refena_flutter": { - "dependency": "direct main", - "description": { - "name": "refena_flutter", - "sha256": "2bee85271c8d8ced0238d98c1c056dbabfd4af207f9cc248d10af5a37820ae3e", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.6.0" - }, - "refena_inspector": { - "dependency": "direct dev", - "description": { - "name": "refena_inspector", - "sha256": "495822cc8142b3a5826b5f17061b8ea60aa4b0fd7758fdec9746b85cbd61895d", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.2.0" - }, - "refena_inspector_client": { - "dependency": "direct main", - "description": { - "name": "refena_inspector_client", - "sha256": "f01636eb2c9609e9a5df5591132df5d3008a4a397b70166bc18c464af09880a6", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.2.0" - }, - "routerino": { - "dependency": "direct main", - "description": { - "name": "routerino", - "sha256": "204affbe5304d107fec4df606a72deb34c4c9d75661d4357961f58d567bb448f", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.8.0" - }, - "saf_stream": { - "dependency": "direct main", - "description": { - "name": "saf_stream", - "sha256": "1db21cfa5914a5cf9a7c962b5d57fc8c07011561e365e7ff7f8013019cc3c0f3", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.4.0" - }, - "screen_retriever": { - "dependency": "direct main", - "description": { - "name": "screen_retriever", - "sha256": "6ee02c8a1158e6dae7ca430da79436e3b1c9563c8cf02f524af997c201ac2b90", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.1.9" - }, - "share_handler": { - "dependency": "direct main", - "description": { - "name": "share_handler", - "sha256": "2350c7f22579cb753323c533fde05c48e42ec717f76c7090dacd7a9eb0ec68b0", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.0.19" - }, - "share_handler_android": { - "dependency": "transitive", - "description": { - "name": "share_handler_android", - "sha256": "6e752f2c4f67a9f7bef5503f6e1b0dd6075e127cafe7763d92649559c3692bc6", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.0.7" - }, - "share_handler_ios": { - "dependency": "direct main", - "description": { - "name": "share_handler_ios", - "sha256": "522e5284ef186e83c34acea16fd65469db56a78a4c932c95e71a5be8a0e02d51", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.0.12" - }, - "share_handler_platform_interface": { - "dependency": "transitive", - "description": { - "name": "share_handler_platform_interface", - "sha256": "7a4df95a87b326b2f07458d937f2281874567c364b7b7ebe4e7d50efaae5f106", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.0.6" - }, - "shared_preferences": { - "dependency": "direct main", - "description": { - "name": "shared_preferences", - "sha256": "81429e4481e1ccfb51ede496e916348668fd0921627779233bd24cc3ff6abd02", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.2.2" - }, - "shared_preferences_android": { - "dependency": "transitive", - "description": { - "name": "shared_preferences_android", - "sha256": "8568a389334b6e83415b6aae55378e158fbc2314e074983362d20c562780fb06", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.2.1" - }, - "shared_preferences_foundation": { - "dependency": "transitive", - "description": { - "name": "shared_preferences_foundation", - "sha256": "7708d83064f38060c7b39db12aefe449cb8cdc031d6062280087bc4cdb988f5c", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.3.5" - }, - "shared_preferences_linux": { - "dependency": "transitive", - "description": { - "name": "shared_preferences_linux", - "sha256": "9f2cbcf46d4270ea8be39fa156d86379077c8a5228d9dfdb1164ae0bb93f1faa", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.3.2" - }, - "shared_preferences_platform_interface": { - "dependency": "direct main", - "description": { - "name": "shared_preferences_platform_interface", - "sha256": "22e2ecac9419b4246d7c22bfbbda589e3acf5c0351137d87dd2939d984d37c3b", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.3.2" - }, - "shared_preferences_web": { - "dependency": "transitive", - "description": { - "name": "shared_preferences_web", - "sha256": "d762709c2bbe80626ecc819143013cc820fa49ca5e363620ee20a8b15a3e3daf", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.2.1" - }, - "shared_preferences_windows": { - "dependency": "transitive", - "description": { - "name": "shared_preferences_windows", - "sha256": "841ad54f3c8381c480d0c9b508b89a34036f512482c407e6df7a9c4aa2ef8f59", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.3.2" - }, - "shared_storage": { - "dependency": "direct main", - "description": { - "name": "shared_storage", - "sha256": "cf20428d06af065311b71e09cbfbbfe431e979a3bf9180001c1952129b7c708f", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.8.1" - }, - "shelf": { - "dependency": "direct main", - "description": { - "name": "shelf", - "sha256": "ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.4.1" - }, - "shelf_packages_handler": { - "dependency": "transitive", - "description": { - "name": "shelf_packages_handler", - "sha256": "89f967eca29607c933ba9571d838be31d67f53f6e4ee15147d5dc2934fee1b1e", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.0.2" - }, - "shelf_router": { - "dependency": "direct main", - "description": { - "name": "shelf_router", - "sha256": "f5e5d492440a7fb165fe1e2e1a623f31f734d3370900070b2b1e0d0428d59864", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.1.4" - }, - "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" - }, - "shortid": { - "dependency": "transitive", - "description": { - "name": "shortid", - "sha256": "d0b40e3dbb50497dad107e19c54ca7de0d1a274eb9b4404991e443dadb9ebedb", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.1.2" - }, - "sky_engine": { - "dependency": "transitive", - "description": "flutter", - "source": "sdk", - "version": "0.0.99" - }, - "slang": { - "dependency": "direct main", - "description": { - "name": "slang", - "sha256": "95dee03eb3fd1b36c99f365d4eace270a0d83c6148f8e7d1057806ef60cfaf12", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.29.0" - }, - "slang_build_runner": { - "dependency": "direct dev", - "description": { - "name": "slang_build_runner", - "sha256": "929ea4bf24f11e09afd2b01abd658f550da7eb4039ae83d91bc220f942e18cb3", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.29.0" - }, - "slang_flutter": { - "dependency": "direct main", - "description": { - "name": "slang_flutter", - "sha256": "34c7cf297c608e24d3957a29e75c6790f4dbbfb1a4783d261a6c1e33ede7ad0f", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.29.0" - }, - "slang_gpt": { - "dependency": "direct dev", - "description": { - "name": "slang_gpt", - "sha256": "1adfe55319721c2c18395acbb9bb96adcd4b9c954882af96e9b8487dd12a1cd8", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.10.0" - }, - "source_gen": { - "dependency": "transitive", - "description": { - "name": "source_gen", - "sha256": "14658ba5f669685cd3d63701d01b31ea748310f7ab854e471962670abcf57832", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.5.0" - }, - "source_map_stack_trace": { - "dependency": "transitive", - "description": { - "name": "source_map_stack_trace", - "sha256": "84cf769ad83aa6bb61e0aa5a18e53aea683395f196a6f39c4c881fb90ed4f7ae", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.1.1" - }, - "source_maps": { - "dependency": "transitive", - "description": { - "name": "source_maps", - "sha256": "708b3f6b97248e5781f493b765c3337db11c5d2c81c3094f10904bfa8004c703", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.10.12" - }, - "source_span": { - "dependency": "transitive", - "description": { - "name": "source_span", - "sha256": "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.10.0" - }, - "stack_trace": { - "dependency": "transitive", - "description": { - "name": "stack_trace", - "sha256": "c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.11.0" - }, - "stream_channel": { - "dependency": "transitive", - "description": { - "name": "stream_channel", - "sha256": "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.1.1" - }, - "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" - }, - "system_settings": { - "dependency": "direct main", - "description": { - "name": "system_settings", - "sha256": "666693f8dace789bcf1200a88f6132b6906026643a5ee93ff140d3a547e5faf1", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.1.0" - }, - "system_tray": { - "dependency": "direct main", - "description": { - "name": "system_tray", - "sha256": "40444e5de8ed907822a98694fd031b8accc3cb3c0baa547634ce76189cf3d9cf", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.0.3" - }, - "term_glyph": { - "dependency": "transitive", - "description": { - "name": "term_glyph", - "sha256": "a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.2.1" - }, - "test": { - "dependency": "direct dev", - "description": { - "name": "test", - "sha256": "13b41f318e2a5751c3169137103b60c584297353d4b1761b66029bae6411fe46", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.24.3" - }, - "test_api": { - "dependency": "transitive", - "description": { - "name": "test_api", - "sha256": "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.6.0" - }, - "test_core": { - "dependency": "transitive", - "description": { - "name": "test_core", - "sha256": "99806e9e6d95c7b059b7a0fc08f07fc53fabe54a829497f0d9676299f1e8637e", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.5.3" - }, - "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" - }, - "tray_manager": { - "dependency": "direct main", - "description": { - "path": ".", - "ref": "b37f5e088e0f02c45a684ae41e9d2da2d5c596db", - "resolved-ref": "b37f5e088e0f02c45a684ae41e9d2da2d5c596db", - "url": "https://github.com/Tienisto/tray_manager.git" - }, - "source": "git", - "version": "0.2.0" - }, - "type_plus": { - "dependency": "transitive", - "description": { - "name": "type_plus", - "sha256": "2e33cfac2e129297d5874567bdf7587502ec359881e9318551e014d91b02f84a", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.1.0" - }, - "typed_data": { - "dependency": "transitive", - "description": { - "name": "typed_data", - "sha256": "facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.3.2" - }, - "url_launcher": { - "dependency": "direct main", - "description": { - "name": "url_launcher", - "sha256": "c512655380d241a337521703af62d2c122bf7b77a46ff7dd750092aa9433499c", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "6.2.4" - }, - "url_launcher_android": { - "dependency": "transitive", - "description": { - "name": "url_launcher_android", - "sha256": "d4ed0711849dd8e33eb2dd69c25db0d0d3fdc37e0a62e629fe32f57a22db2745", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "6.3.0" - }, - "url_launcher_ios": { - "dependency": "transitive", - "description": { - "name": "url_launcher_ios", - "sha256": "75bb6fe3f60070407704282a2d295630cab232991eb52542b18347a8a941df03", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "6.2.4" - }, - "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": "b7244901ea3cf489c5335bdacda07264a6e960b1c1b1a9f91e4bc371d9e68234", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.1.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": "7fd2f55fe86cea2897b963e864dc01a7eb0719ecc65fcef4c1cc3d686d718bb2", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.2.0" - }, - "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" - }, - "vector_math": { - "dependency": "transitive", - "description": { - "name": "vector_math", - "sha256": "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.1.4" - }, - "video_player": { - "dependency": "transitive", - "description": { - "name": "video_player", - "sha256": "fbf28ce8bcfe709ad91b5789166c832cb7a684d14f571a81891858fefb5bb1c2", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.8.2" - }, - "video_player_android": { - "dependency": "transitive", - "description": { - "name": "video_player_android", - "sha256": "4dd9b8b86d70d65eecf3dcabfcdfbb9c9115d244d022654aba49a00336d540c2", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.4.12" - }, - "video_player_avfoundation": { - "dependency": "transitive", - "description": { - "name": "video_player_avfoundation", - "sha256": "bc923884640d6dc403050586eb40713cdb8d1d84e6886d8aca50ab04c59124c2", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.5.2" - }, - "video_player_platform_interface": { - "dependency": "transitive", - "description": { - "name": "video_player_platform_interface", - "sha256": "236454725fafcacf98f0f39af0d7c7ab2ce84762e3b63f2cbb3ef9a7e0550bc6", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "6.2.2" - }, - "video_player_web": { - "dependency": "transitive", - "description": { - "name": "video_player_web", - "sha256": "34beb3a07d4331a24f7e7b2f75b8e2b103289038e07e65529699a671b6a6e2cb", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.1.3" - }, - "vm_service": { - "dependency": "transitive", - "description": { - "name": "vm_service", - "sha256": "c538be99af830f478718b51630ec1b6bee5e74e52c8a802d328d9e71d35d2583", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "11.10.0" - }, - "wakelock_plus": { - "dependency": "direct main", - "description": { - "name": "wakelock_plus", - "sha256": "f268ca2116db22e57577fb99d52515a24bdc1d570f12ac18bb762361d43b043d", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.1.4" - }, - "wakelock_plus_platform_interface": { - "dependency": "transitive", - "description": { - "name": "wakelock_plus_platform_interface", - "sha256": "40fabed5da06caff0796dc638e1f07ee395fb18801fbff3255a2372db2d80385", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.1.0" - }, - "watcher": { - "dependency": "transitive", - "description": { - "name": "watcher", - "sha256": "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.1.0" - }, - "web": { - "dependency": "transitive", - "description": { - "name": "web", - "sha256": "dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.1.4-beta" - }, - "web_socket_channel": { - "dependency": "transitive", - "description": { - "name": "web_socket_channel", - "sha256": "d88238e5eac9a42bb43ca4e721edba3c08c6354d4a53063afaa568516217621b", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.4.0" - }, - "webkit_inspection_protocol": { - "dependency": "transitive", - "description": { - "name": "webkit_inspection_protocol", - "sha256": "87d3f2333bb240704cd3f1c6b5b7acd8a10e7f0bc28c28dcf14e782014f4a572", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.2.1" - }, - "wechat_assets_picker": { - "dependency": "direct main", - "description": { - "name": "wechat_assets_picker", - "sha256": "f78c7797dc88e3c9170d318acc9f535ca104ab648cc69ab3b7745f1ceac29910", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "8.8.1+1" - }, - "win32": { - "dependency": "transitive", - "description": { - "name": "win32", - "sha256": "b0f37db61ba2f2e9b7a78a1caece0052564d1bc70668156cf3a29d676fe4e574", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "5.1.1" - }, - "win32_registry": { - "dependency": "transitive", - "description": { - "name": "win32_registry", - "sha256": "41fd8a189940d8696b1b810efb9abcf60827b6cbfab90b0c43e8439e3a39d85a", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.1.2" - }, - "window_manager": { - "dependency": "direct main", - "description": { - "name": "window_manager", - "sha256": "b3c895bdf936c77b83c5254bec2e6b3f066710c1f89c38b20b8acc382b525494", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.3.8" - }, - "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": "5bc72e1e45e941d825fd7468b9b4cc3b9327942649aeb6fc5cdbf135f0a86e84", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "6.3.0" - }, - "yaml": { - "dependency": "transitive", - "description": { - "name": "yaml", - "sha256": "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.1.2" - }, - "yaru": { - "dependency": "direct main", - "description": { - "name": "yaru", - "sha256": "e9ccb22cb283ecf3f6b21d64dee9764d4abff65a44f48ce21aa13b9eae3e3be5", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.2.2" - } - }, - "sdks": { - "dart": ">=3.1.1 <4.0.0", - "flutter": ">=3.13.0" - } -} diff --git a/pkgs/applications/networking/localsend/update.sh b/pkgs/applications/networking/localsend/update.sh deleted file mode 100755 index fa69be0ba995c..0000000000000 --- a/pkgs/applications/networking/localsend/update.sh +++ /dev/null @@ -1,26 +0,0 @@ -#! /usr/bin/env nix-shell -#! nix-shell -I nixpkgs=./. -i bash -p curl gnused jq yq nix - -set -eou pipefail - -ROOT="$(dirname "$(readlink -f "$0")")" - -latestVersion=$(curl --fail --silent https://api.github.com/repos/localsend/localsend/releases/latest | jq --raw-output .tag_name | sed 's/^v//') - -currentVersion=$(nix-instantiate --eval -E "with import ./. {}; localsend.version or (lib.getVersion localsend)" | tr -d '"') - -if [[ "$currentVersion" == "$latestVersion" ]]; then - echo "package is up-to-date: $currentVersion" - exit 0 -fi - -sed -i "s/version = \".*\"/version = \"${latestVersion}\"/" "$ROOT/default.nix" - -DARWIN_x64_URL="https://github.com/localsend/localsend/releases/download/v${latestVersion}/LocalSend-${latestVersion}.dmg" -DARWIN_X64_SHA=$(nix hash to-sri --type sha256 $(nix-prefetch-url ${DARWIN_x64_URL})) -sed -i "/darwin/,/hash/{s|hash = \".*\"|hash = \"${DARWIN_X64_SHA}\"|}" "$ROOT/default.nix" - -GIT_SRC_URL="https://github.com/localsend/localsend/archive/refs/tags/v${latestVersion}.tar.gz" -GIT_SRC_SHA=$(nix hash to-sri --type sha256 $(nix-prefetch-url --unpack ${GIT_SRC_URL})) -sed -i "/linux/,/hash/{s|hash = \".*\"|hash = \"${GIT_SRC_SHA}\"|}" "$ROOT/default.nix" -curl https://raw.githubusercontent.com/localsend/localsend/v${latestVersion}/app/pubspec.lock | yq . > $ROOT/pubspec.lock.json diff --git a/pkgs/applications/networking/maestral-qt/default.nix b/pkgs/applications/networking/maestral-qt/default.nix index 3c30bc4fd3f6c..0027fe8804def 100644 --- a/pkgs/applications/networking/maestral-qt/default.nix +++ b/pkgs/applications/networking/maestral-qt/default.nix @@ -1,16 +1,17 @@ -{ lib -, fetchFromGitHub -, python3 -, qtbase -, qtsvg -, qtwayland -, nixosTests -, wrapQtAppsHook +{ + lib, + fetchFromGitHub, + python3, + qtbase, + qtsvg, + qtwayland, + nixosTests, + wrapQtAppsHook, }: python3.pkgs.buildPythonApplication rec { pname = "maestral-qt"; - version = "1.9.3"; + version = "1.9.4"; pyproject = true; disabled = python3.pythonOlder "3.7"; @@ -19,12 +20,10 @@ python3.pkgs.buildPythonApplication rec { owner = "SamSchott"; repo = "maestral-qt"; rev = "refs/tags/v${version}"; - hash = "sha256-7Lt0Neobtofd1JDoz8BhGn+nFKaMLbM/6z0QQmtEKpA="; + hash = "sha256-VkJOKKYnoXux3WjD1JwINGWwv1SMIXfidyV2ITE7dJc="; }; - build-system = with python3.pkgs; [ - setuptools - ]; + build-system = with python3.pkgs; [ setuptools ]; dependencies = with python3.pkgs; [ click @@ -37,12 +36,10 @@ python3.pkgs.buildPythonApplication rec { buildInputs = [ qtwayland qtbase - qtsvg # Needed for the systray icon + qtsvg # Needed for the systray icon ]; - nativeBuildInputs = [ - wrapQtAppsHook - ]; + nativeBuildInputs = [ wrapQtAppsHook ]; dontWrapQtApps = true; @@ -67,7 +64,10 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://maestral.app"; changelog = "https://github.com/samschott/maestral/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ peterhoeg sfrijters ]; + maintainers = with maintainers; [ + peterhoeg + sfrijters + ]; platforms = platforms.linux; mainProgram = "maestral_qt"; }; diff --git a/pkgs/applications/networking/mailreaders/aerc/default.nix b/pkgs/applications/networking/mailreaders/aerc/default.nix deleted file mode 100644 index 11dfe033248ad..0000000000000 --- a/pkgs/applications/networking/mailreaders/aerc/default.nix +++ /dev/null @@ -1,79 +0,0 @@ -{ lib -, buildGoModule -, fetchFromSourcehut -, ncurses -, notmuch -, scdoc -, python3 -, w3m -, dante -, gawk -}: - -buildGoModule rec { - pname = "aerc"; - version = "0.17.0"; - - src = fetchFromSourcehut { - owner = "~rjarry"; - repo = "aerc"; - rev = version; - hash = "sha256-XpVUUAtm6o4DXIouTKRX/8mLERb/4nA+VUGeB21mfjE="; - }; - - proxyVendor = true; - vendorHash = "sha256-AHEhIWa6PP8f+hhIdY+0brLF2HYhvTal7qXfCwG9iyo="; - - nativeBuildInputs = [ - scdoc - python3.pkgs.wrapPython - ]; - - patches = [ - ./runtime-libexec.patch - ]; - - postPatch = '' - substituteAllInPlace config/aerc.conf - substituteAllInPlace config/config.go - substituteAllInPlace doc/aerc-config.5.scd - - # Prevent buildGoModule from trying to build this - rm contrib/linters.go - ''; - - makeFlags = [ "PREFIX=${placeholder "out"}" ]; - - pythonPath = [ - python3.pkgs.vobject - ]; - - buildInputs = [ python3 notmuch gawk ]; - - installPhase = '' - runHook preInstall - - make $makeFlags GOFLAGS="$GOFLAGS -tags=notmuch" install - - runHook postInstall - ''; - - postFixup = '' - wrapProgram $out/bin/aerc \ - --prefix PATH ":" "${lib.makeBinPath [ ncurses ]}" - wrapProgram $out/libexec/aerc/filters/html \ - --prefix PATH ":" ${lib.makeBinPath [ w3m dante ]} - wrapProgram $out/libexec/aerc/filters/html-unsafe \ - --prefix PATH ":" ${lib.makeBinPath [ w3m dante ]} - patchShebangs $out/libexec/aerc/filters - ''; - - meta = with lib; { - description = "Email client for your terminal"; - homepage = "https://aerc-mail.org/"; - maintainers = with maintainers; [ tadeokondrak ]; - mainProgram = "aerc"; - license = licenses.mit; - platforms = platforms.unix; - }; -} diff --git a/pkgs/applications/networking/mailreaders/aerc/runtime-libexec.patch b/pkgs/applications/networking/mailreaders/aerc/runtime-libexec.patch deleted file mode 100644 index f8e8d07470484..0000000000000 --- a/pkgs/applications/networking/mailreaders/aerc/runtime-libexec.patch +++ /dev/null @@ -1,87 +0,0 @@ -diff --git a/config/aerc.conf b/config/aerc.conf -index 7d33b43..4315f0e 100644 ---- a/config/aerc.conf -+++ b/config/aerc.conf -@@ -202,8 +202,7 @@ - # - # ${XDG_CONFIG_HOME:-~/.config}/aerc/stylesets - # ${XDG_DATA_HOME:-~/.local/share}/aerc/stylesets --# /usr/local/share/aerc/stylesets --# /usr/share/aerc/stylesets -+# @out@/share/aerc/stylesets - # - #stylesets-dirs= - -@@ -547,8 +546,7 @@ message/rfc822=colorize - # - # ${XDG_CONFIG_HOME:-~/.config}/aerc/templates - # ${XDG_DATA_HOME:-~/.local/share}/aerc/templates --# /usr/local/share/aerc/templates --# /usr/share/aerc/templates -+# @out@/share/aerc/templates - # - #template-dirs= - -diff --git a/config/config.go b/config/config.go -index d70bcfe..c19e59a 100644 ---- a/config/config.go -+++ b/config/config.go -@@ -54,10 +54,8 @@ func buildDefaultDirs() []string { - } - - // Add fixed fallback locations -- defaultDirs = append(defaultDirs, "/usr/local/libexec/aerc") -- defaultDirs = append(defaultDirs, "/usr/local/share/aerc") -- defaultDirs = append(defaultDirs, "/usr/libexec/aerc") -- defaultDirs = append(defaultDirs, "/usr/share/aerc") -+ defaultDirs = append(defaultDirs, "@out@/libexec/aerc") -+ defaultDirs = append(defaultDirs, "@out@/share/aerc") - - return defaultDirs - } -diff --git a/doc/aerc-config.5.scd b/doc/aerc-config.5.scd -index 9e1f8a3..694abbc 100644 ---- a/doc/aerc-config.5.scd -+++ b/doc/aerc-config.5.scd -@@ -300,8 +300,7 @@ These options are configured in the *[ui]* section of _aerc.conf_. - ``` - ${XDG_CONFIG_HOME:-~/.config}/aerc/stylesets - ${XDG_DATA_HOME:-~/.local/share}/aerc/stylesets -- /usr/local/share/aerc/stylesets -- /usr/share/aerc/stylesets -+ @out@/share/aerc/stylesets - ``` - - *styleset-name* = _<string>_ -@@ -900,8 +899,7 @@ These options are configured in the *[templates]* section of _aerc.conf_. - ``` - ${XDG_CONFIG_HOME:-~/.config}/aerc/templates - ${XDG_DATA_HOME:-~/.local/share}/aerc/templates -- /usr/local/share/aerc/templates -- /usr/share/aerc/templates -+ @out@/share/aerc/templates - ``` - - *new-message* = _<template_name>_ -diff --git a/doc/aerc-templates.7.scd b/doc/aerc-templates.7.scd -index ae9bc6d..5f42b14 100644 ---- a/doc/aerc-templates.7.scd -+++ b/doc/aerc-templates.7.scd -@@ -319,7 +319,7 @@ aerc provides the following additional functions: - Execute external command, provide the second argument to its stdin. - - ``` -- {{exec `/usr/libexec/aerc/filters/html` .OriginalText}} -+ {{exec `@out@/libexec/aerc/filters/html` .OriginalText}} - ``` - - *.Local* -@@ -425,7 +425,7 @@ aerc provides the following additional functions: - - ``` - {{if eq .OriginalMIMEType "text/html"}} -- {{exec `/usr/libexec/aerc/filters/html` .OriginalText | wrap 72 | quote}} -+ {{exec `@out@/libexec/aerc/filters/html` .OriginalText | wrap 72 | quote}} - {{else}} - {{wrap 72 .OriginalText | trimSignature | quote}} - {{end}} diff --git a/pkgs/applications/networking/mailreaders/alot/default.nix b/pkgs/applications/networking/mailreaders/alot/default.nix index cc3273dcdca90..cf0de377e370b 100644 --- a/pkgs/applications/networking/mailreaders/alot/default.nix +++ b/pkgs/applications/networking/mailreaders/alot/default.nix @@ -1,17 +1,18 @@ { lib -, python3 +, python311 , fetchFromGitHub , file , gnupg , gawk -, notmuch , procps +, notmuch , withManpage ? false }: -with python3.pkgs; buildPythonApplication rec { +with python311.pkgs; buildPythonApplication rec { pname = "alot"; - version = "0.10"; + version = "0.11"; + pyproject = true; outputs = [ "out" @@ -24,16 +25,18 @@ with python3.pkgs; buildPythonApplication rec { src = fetchFromGitHub { owner = "pazz"; repo = "alot"; - rev = version; - sha256 = "sha256-1reAq8X9VwaaZDY5UfvcFzHDKd71J88CqJgH3+ANjis="; + rev = "refs/tags/${version}"; + sha256 = "sha256-mXaRzl7260uxio/BQ36BCBxgKhl1r0Rc6PwFZA8qNqc="; }; postPatch = '' substituteInPlace alot/settings/manager.py \ - --replace /usr/share "$out/share" + --replace-fail /usr/share "$out/share" ''; - nativeBuildInputs = lib.optional withManpage sphinx; + nativeBuildInputs = [ + setuptools-scm + ] ++ lib.optional withManpage sphinx; propagatedBuildInputs = [ configobj @@ -54,6 +57,7 @@ with python3.pkgs; buildPythonApplication rec { mock procps pytestCheckHook + notmuch ]; postBuild = lib.optionalString withManpage [ @@ -81,7 +85,7 @@ with python3.pkgs; buildPythonApplication rec { cp -r extra/themes $out/share/alot substituteInPlace extra/completion/alot-completion.zsh \ - --replace "python3" "${completionPython.interpreter}" + --replace-fail "python3" "${completionPython.interpreter}" install -D extra/completion/alot-completion.zsh $out/share/zsh/site-functions/_alot sed "s,/usr/bin,$out/bin,g" extra/alot.desktop > $out/share/applications/alot.desktop 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/ayatana-webmail/default.nix b/pkgs/applications/networking/mailreaders/ayatana-webmail/default.nix index 8adb3acfe407a..1c99ef0427e37 100644 --- a/pkgs/applications/networking/mailreaders/ayatana-webmail/default.nix +++ b/pkgs/applications/networking/mailreaders/ayatana-webmail/default.nix @@ -1,30 +1,31 @@ -{ lib -, fetchFromGitHub -, gettext -, gtk3 -, python3Packages -, gdk-pixbuf -, libnotify -, glib -, gobject-introspection -, wrapGAppsHook3 -# BTW libappindicator is also supported, but upstream recommends their -# implementation, see: -# https://github.com/AyatanaIndicators/ayatana-webmail/issues/24#issuecomment-1050352862 -, libayatana-appindicator -, gsettings-desktop-schemas -, libcanberra-gtk3 +{ + lib, + fetchFromGitHub, + gettext, + gtk3, + python3Packages, + gdk-pixbuf, + libnotify, + glib, + gobject-introspection, + wrapGAppsHook3, + # BTW libappindicator is also supported, but upstream recommends their + # implementation, see: + # https://github.com/AyatanaIndicators/ayatana-webmail/issues/24#issuecomment-1050352862 + libayatana-appindicator, + gsettings-desktop-schemas, + libcanberra-gtk3, }: python3Packages.buildPythonApplication rec { pname = "ayatana-webmail"; - version = "22.12.15"; + version = "24.5.17"; src = fetchFromGitHub { owner = "AyatanaIndicators"; repo = "ayatana-webmail"; - rev = version; - hash = "sha256-K2jqCWrY1i1wYdZVpjN/3TcVyWariOQQ4slZf6sEPRU="; + rev = "refs/tags/${version}"; + hash = "sha256-k557FWKGq2MXODVxVzOetC5kkwTNYOoLO8msCOabais="; }; postConfigure = '' # Fix fhs paths @@ -32,7 +33,7 @@ python3Packages.buildPythonApplication rec { ayatanawebmail/accounts.py \ ayatanawebmail/actions.py \ ayatanawebmail/dialog.py \ - --replace /usr/share $out/share + --replace-fail /usr/share $out/share ''; buildInputs = [ @@ -80,11 +81,11 @@ python3Packages.buildPythonApplication rec { makeWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ libcanberra-gtk3 ]}) ''; - meta = with lib; { + meta = { description = "Webmail notifications and actions for any desktop"; homepage = "https://github.com/AyatanaIndicators/ayatana-webmail"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ doronbehar ]; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ doronbehar ]; }; } diff --git a/pkgs/applications/networking/mailreaders/betterbird/default.nix b/pkgs/applications/networking/mailreaders/betterbird/default.nix index b62b30ae60b36..38ff368ad5fde 100644 --- a/pkgs/applications/networking/mailreaders/betterbird/default.nix +++ b/pkgs/applications/networking/mailreaders/betterbird/default.nix @@ -12,13 +12,13 @@ let thunderbird-unwrapped = thunderbirdPackages.thunderbird-115; - version = "115.9.0"; + version = "115.14.0"; majVer = lib.versions.major version; betterbird-patches = fetchFromGitHub { owner = "Betterbird"; repo = "thunderbird-patches"; - rev = "${version}-bb26-build2"; + rev = "${version}-bb31"; postFetch = '' echo "Retrieving external patches" @@ -36,7 +36,7 @@ let . ./external.sh rm external.sh ''; - hash = "sha256-0RlI30zxiueeXdLEXPZevc8QyKr667juHk0bTcqBB1w="; + hash = "sha256-dXfpu+ufBfAWl1OlpQ1i8CC7N8f0NbxfaMH6BdKr28c="; }; in ((buildMozillaMach { pname = "betterbird"; @@ -50,7 +50,7 @@ in ((buildMozillaMach { src = fetchurl { # https://download.cdn.mozilla.net/pub/thunderbird/releases/ url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - hash = "sha256-Kut3ynA43289MG+cPSpOphWvDtzw9ykCFcpfMMEpDlc="; + hash = "sha256-A3/D8D9e5PI9SUetKFUE0oDpJsThprIk1zUfZoxu1/A="; }; extraPostPatch = thunderbird-unwrapped.extraPostPatch or "" + /* bash */ '' @@ -79,7 +79,8 @@ in ((buildMozillaMach { fi # requires vendored icu, fails to link with our icu - if [[ $patch == 14-feature-regexp-searchterm.patch || $patch == 14-feature-regexp-searchterm-m-c.patch ]]; then + # feature-506064 depends on those icu patches + if [[ $patch == 14-feature-regexp-searchterm.patch || $patch == 14-feature-regexp-searchterm-m-c.patch || $patch == feature-506064-match-diacritics.patch || $patch == feature-506064-match-diacritics-m-c.patch ]]; then continue fi @@ -111,6 +112,8 @@ in ((buildMozillaMach { webrtcSupport = false; pgoSupport = false; # console.warn: feeds: "downloadFeed: network connection unavailable" + + inherit (thunderbird-unwrapped.passthru) icu73; }).overrideAttrs (oldAttrs: { postInstall = oldAttrs.postInstall or "" + '' mv $out/lib/thunderbird/* $out/lib/betterbird diff --git a/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/pkgs/applications/networking/mailreaders/claws-mail/default.nix index ddc47d1800c37..d0345f946600b 100644 --- a/pkgs/applications/networking/mailreaders/claws-mail/default.nix +++ b/pkgs/applications/networking/mailreaders/claws-mail/default.nix @@ -18,7 +18,7 @@ , enableLdap ? true, openldap , enableNetworkManager ? true, networkmanager , enableLibetpan ? true, libetpan -, enableValgrind ? !stdenv.isDarwin && lib.meta.availableOn stdenv.hostPlatform valgrind, valgrind +, enableValgrind ? !stdenv.hostPlatform.isDarwin && lib.meta.availableOn stdenv.hostPlatform valgrind, valgrind , enableSvg ? true, librsvg # Configure claws-mail's plugins diff --git a/pkgs/applications/networking/mailreaders/electron-mail/default.nix b/pkgs/applications/networking/mailreaders/electron-mail/default.nix index bf40dba20861a..22e7200277f97 100644 --- a/pkgs/applications/networking/mailreaders/electron-mail/default.nix +++ b/pkgs/applications/networking/mailreaders/electron-mail/default.nix @@ -1,16 +1,22 @@ -{ appimageTools, lib, fetchurl }: +{ + appimageTools, + lib, + fetchurl, + nix-update-script, +}: let pname = "electron-mail"; - version = "5.1.8"; + version = "5.2.3"; src = fetchurl { url = "https://github.com/vladimiry/ElectronMail/releases/download/v${version}/electron-mail-${version}-linux-x86_64.AppImage"; - sha256 = "sha256-btqlxFrQUyb728i99IE65A9jwEFNvJ5b6zji0kwwATU="; + sha256 = "sha256-ajekPPRgprYNWE2osAXe46qVjnxXzkXa+MkWiNYJ5Fc="; }; appimageContents = appimageTools.extract { inherit pname version src; }; -in appimageTools.wrapType2 { +in +appimageTools.wrapType2 { inherit pname version src; extraInstallCommands = '' @@ -25,6 +31,8 @@ in appimageTools.wrapType2 { pkgs.libappindicator-gtk3 ]; + passthru.updateScript = nix-update-script { }; + meta = with lib; { description = "ElectronMail is an Electron-based unofficial desktop client for ProtonMail"; mainProgram = "electron-mail"; @@ -32,5 +40,6 @@ in appimageTools.wrapType2 { license = licenses.gpl3; maintainers = [ maintainers.princemachiavelli ]; platforms = [ "x86_64-linux" ]; + changelog = "https://github.com/vladimiry/ElectronMail/releases/tag/v${version}"; }; } diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix index aa38ee7cb8d31..3ad8b21567b07 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation rec { pname = "evolution-ews"; - version = "3.52.2"; + version = "3.52.4"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-qVUPG1PUdANt0jmWJ7MRjrO4QxhBztwO3yFFewlhkUE="; + hash = "sha256-QI1VBWyA5K1kR+PHeINodYIfbCYdNepxF1YocPAvY7o="; }; patches = [ diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix index 0fe2e4796efc4..fd8d214d5ea66 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 @@ -44,11 +45,11 @@ stdenv.mkDerivation rec { pname = "evolution"; - version = "3.52.2"; + version = "3.52.4"; src = fetchurl { url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-pIt0EtE+2sdPbAms+mdmVuahLt8AMM3cJgKawE2j5VE="; + hash = "sha256-9XkpgB1uQBphHWUh71kiTYGzBQA1ekuePkYkXslGGBk="; }; nativeBuildInputs = [ @@ -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/mailspring/darwin.nix b/pkgs/applications/networking/mailreaders/mailspring/darwin.nix index cccc46a4f5eb5..e0166e361fe9f 100644 --- a/pkgs/applications/networking/mailreaders/mailspring/darwin.nix +++ b/pkgs/applications/networking/mailreaders/mailspring/darwin.nix @@ -1,5 +1,4 @@ -{ lib -, stdenv +{ stdenv , fetchurl , pname , version diff --git a/pkgs/applications/networking/mailreaders/mmh/default.nix b/pkgs/applications/networking/mailreaders/mmh/default.nix index 95c101002e2b9..edcc48386a110 100644 --- a/pkgs/applications/networking/mailreaders/mmh/default.nix +++ b/pkgs/applications/networking/mailreaders/mmh/default.nix @@ -23,7 +23,7 @@ in stdenv.mkDerivation rec { homepage = "http://marmaro.de/prog/mmh"; license = licenses.bsd3; platforms = platforms.unix; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; maintainers = with maintainers; [ kaction ]; }; } diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix index 8a26dbb315c74..5a94137ea2f3a 100644 --- a/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -1,8 +1,38 @@ -{ lib, stdenv, fetchFromGitHub, gettext, makeWrapper, tcl, which -, ncurses, perl , cyrus_sasl, gss, gpgme, libkrb5, libidn2, libxml2, notmuch, openssl -, lua, lmdb, libxslt, docbook_xsl, docbook_xml_dtd_42, w3m, mailcap, sqlite, zlib, lndir -, pkg-config, zstd, enableZstd ? true, enableMixmaster ? false, enableLua ? false -, withContrib ? true +{ + lib, + stdenv, + fetchFromGitHub, + gettext, + makeWrapper, + tcl, + which, + ncurses, + perl, + cyrus_sasl, + gss, + gpgme, + libkrb5, + libidn2, + libxml2, + notmuch, + openssl, + lua, + lmdb, + libxslt, + docbook_xsl, + docbook_xml_dtd_42, + w3m, + mailcap, + sqlite, + zlib, + lndir, + pkg-config, + zstd, + enableZstd ? true, + enableMixmaster ? false, + enableLua ? false, + enableSmimeKeys ? true, + withContrib ? true, }: stdenv.mkDerivation (finalAttrs: { @@ -10,22 +40,38 @@ stdenv.mkDerivation (finalAttrs: { version = "20240425"; src = fetchFromGitHub { - owner = "neomutt"; - repo = "neomutt"; - rev = finalAttrs.version; - hash = "sha256-QBqPFteoAm3AdQN0XTWpho8DEW2BFCCzBcHUZIiSxyQ="; + owner = "neomutt"; + repo = "neomutt"; + rev = finalAttrs.version; + hash = "sha256-QBqPFteoAm3AdQN0XTWpho8DEW2BFCCzBcHUZIiSxyQ="; }; buildInputs = [ - cyrus_sasl gss gpgme libkrb5 libidn2 ncurses - notmuch openssl perl lmdb - mailcap sqlite - ] - ++ lib.optional enableZstd zstd - ++ lib.optional enableLua lua; + cyrus_sasl + gss + gpgme + libkrb5 + libidn2 + ncurses + notmuch + openssl + perl + lmdb + mailcap + sqlite + ] ++ lib.optional enableZstd zstd ++ lib.optional enableLua lua; nativeBuildInputs = [ - docbook_xsl docbook_xml_dtd_42 gettext libxml2 libxslt.bin makeWrapper tcl which zlib w3m + docbook_xsl + docbook_xml_dtd_42 + gettext + libxml2 + libxslt.bin + makeWrapper + tcl + which + zlib + w3m pkg-config ]; @@ -49,31 +95,38 @@ stdenv.mkDerivation (finalAttrs: { --replace /etc/mime.types ${mailcap}/etc/mime.types ''; - configureFlags = [ - "--enable-autocrypt" - "--gpgme" - "--gss" - "--lmdb" - "--notmuch" - "--ssl" - "--sasl" - "--with-homespool=mailbox" - "--with-mailpath=" - # To make it not reference .dev outputs. See: - # https://github.com/neomutt/neomutt/pull/2367 - "--disable-include-path-in-cflags" - "--zlib" - ] - ++ lib.optional enableZstd "--zstd" - ++ lib.optional enableLua "--lua" - ++ lib.optional enableMixmaster "--mixmaster"; - - postInstall = '' - wrapProgram "$out/bin/neomutt" --prefix PATH : "$out/libexec/neomutt" - '' - # https://github.com/neomutt/neomutt-contrib - # Contains vim-keys, keybindings presets and more. - + lib.optionalString withContrib "${lib.getExe lndir} ${finalAttrs.passthru.contrib} $out/share/doc/neomutt"; + configureFlags = + [ + "--enable-autocrypt" + "--gpgme" + "--gss" + "--lmdb" + "--notmuch" + "--ssl" + "--sasl" + "--with-homespool=mailbox" + "--with-mailpath=" + # To make it not reference .dev outputs. See: + # https://github.com/neomutt/neomutt/pull/2367 + "--disable-include-path-in-cflags" + "--zlib" + ] + ++ lib.optional enableZstd "--zstd" + ++ lib.optional enableLua "--lua" + ++ lib.optional enableMixmaster "--mixmaster"; + + postInstall = + '' + wrapProgram "$out/bin/neomutt" --prefix PATH : "$out/libexec/neomutt" + '' + + lib.optionalString enableSmimeKeys '' + install -m 755 $src/contrib/smime_keys $out/bin; + substituteInPlace $out/bin/smime_keys \ + --replace-fail '/usr/bin/openssl' '${openssl}/bin/openssl'; + '' + # https://github.com/neomutt/neomutt-contrib + # Contains vim-keys, keybindings presets and more. + + lib.optionalString withContrib "${lib.getExe lndir} ${finalAttrs.passthru.contrib} $out/share/doc/neomutt"; doCheck = true; @@ -111,9 +164,12 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Small but very powerful text-based mail client"; mainProgram = "neomutt"; - homepage = "https://www.neomutt.org"; - license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ erikryb vrthra raitobezarius ]; - platforms = lib.platforms.unix; + homepage = "https://www.neomutt.org"; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ + erikryb + raitobezarius + ]; + platforms = lib.platforms.unix; }; }) diff --git a/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix b/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix index 29aa21bca0f22..7073c7b911138 100644 --- a/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "notmuch-bower"; - version = "1.0"; + version = "1.1"; src = fetchFromGitHub { owner = "wangp"; repo = "bower"; rev = version; - sha256 = "sha256-BNuJEVuzreI2AK/fqVMRHq8ZhPQjO33Y2FzkrWlfmm0="; + sha256 = "sha256-CqA9JU/ujqIn/NvtbPtSWxKDYCv4oDdLCgbf2jj9Av4="; }; nativeBuildInputs = [ mercury pandoc ]; diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index 588cd4326a61e..b70512a9d1514 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -2,7 +2,6 @@ , pkg-config, gnupg , xapian, gmime3, sfsexp, talloc, zlib , doxygen, perl, texinfo -, notmuch , pythonPackages , emacs , ruby @@ -157,7 +156,7 @@ stdenv.mkDerivation (finalAttrs: { paths = with ruby.gems; [ mail ]; pathsToLink = [ "/lib" "/nix-support" ]; }; - tests.version = testers.testVersion { package = notmuch; }; + tests.version = testers.testVersion { package = finalAttrs.finalPackage; }; updateScript = gitUpdater { url = "https://git.notmuchmail.org/git/notmuch"; diff --git a/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix b/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix index 3c933eaa4b8a7..6de6838eeeda1 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { mainProgram = "muchsync"; homepage = "http://www.muchsync.org/"; platforms = lib.platforms.unix; - maintainers = with lib.maintainers; []; + maintainers = [ ]; license = lib.licenses.gpl2Plus; }; } diff --git a/pkgs/applications/networking/mailreaders/notmuch/notmuch-mailmover.nix b/pkgs/applications/networking/mailreaders/notmuch/notmuch-mailmover.nix index 2467e79255b50..3b6d2ee9285fe 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/notmuch-mailmover.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/notmuch-mailmover.nix @@ -1,29 +1,28 @@ { notmuch , lib -, stdenv , fetchFromGitHub , rustPlatform , installShellFiles }: rustPlatform.buildRustPackage rec { pname = "notmuch-mailmover"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "michaeladler"; repo = pname; rev = "v${version}"; - hash = "sha256-12eDCqer13GJS0YjJDleJbkP4o7kZfof6HlLG06qZW0="; + hash = "sha256-b+6vQ7m49+9RQ+GA75VgOAJej/2zeu5JAje/OazsEsk="; }; - cargoHash = "sha256-B5VSkhY4nNXSG2SeCl22pSkl6SXEEoYj99wEsNhs/bQ="; + cargoHash = "sha256-qHSmfR5iUBXq8OQJkGCVA4JnExXisN2OIAVKiVMUaZo="; nativeBuildInputs = [ installShellFiles ]; buildInputs = [ notmuch ]; postInstall = '' - installManPage share/notmuch-mailmover.1 + installManPage share/notmuch-mailmover.1.gz installShellCompletion --cmd notmuch-mailmover \ --bash share/notmuch-mailmover.bash \ --fish share/notmuch-mailmover.fish \ diff --git a/pkgs/applications/networking/mailreaders/sylpheed/default.nix b/pkgs/applications/networking/mailreaders/sylpheed/default.nix index d45c7f6dd5759..9e765743dd636 100644 --- a/pkgs/applications/networking/mailreaders/sylpheed/default.nix +++ b/pkgs/applications/networking/mailreaders/sylpheed/default.nix @@ -33,19 +33,19 @@ stdenv.mkDerivation rec { buildInputs = [ gtk2 ] ++ lib.optionals gpgSupport [ gpgme ] ++ lib.optionals sslSupport [ openssl ] - ++ lib.optionals stdenv.isDarwin [ Foundation ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Foundation ]; configureFlags = lib.optional gpgSupport "--enable-gpgme" ++ lib.optional sslSupport "--enable-ssl"; # Undefined symbols for architecture arm64: "_OBJC_CLASS_$_NSAutoreleasePool" - NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-framework Foundation"; + NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-framework Foundation"; meta = with lib; { homepage = "https://sylpheed.sraoss.jp/en/"; description = "Lightweight and user-friendly e-mail client"; mainProgram = "sylpheed"; - maintainers = with maintainers; [ eelco ]; + maintainers = [ ]; platforms = platforms.linux ++ platforms.darwin; license = licenses.gpl2; }; diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix index 5026afeaea0bf..cd3954ba590a3 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix @@ -3,48 +3,10 @@ # To update `thunderbird-bin`'s `release_sources.nix`, run from the nixpkgs root: # # nix-shell maintainers/scripts/update.nix --argstr package pkgs.thunderbird-bin-unwrapped -{ lib, stdenv, fetchurl, config, wrapGAppsHook3 +{ lib, stdenv, fetchurl, config, wrapGAppsHook3, autoPatchelfHook , alsa-lib -, atk -, cairo , curl -, cups -, dbus-glib -, dbus -, fontconfig -, freetype -, gdk-pixbuf -, glib -, glibc -, gtk2 , gtk3 -, libkrb5 -, libX11 -, libXScrnSaver -, libxcb -, libXcomposite -, libXcursor -, libXdamage -, libXext -, libXfixes -, libXi -, libXinerama -, libXrender -, libXrandr -, libXt -, libXtst -, libcanberra -, libnotify -, adwaita-icon-theme -, libGLU, libGL -, nspr -, nss_latest -, pango -, pipewire -, pciutils -, heimdal -, libpulseaudio -, systemd , writeScript , writeText , xidel @@ -52,10 +14,9 @@ , gnused , gnugrep , gnupg -, ffmpeg , runtimeShell -, mesa # thunderbird wants gbm for drm+dmabuf , systemLocale ? config.i18n.defaultLocale or "en_US" +, patchelfUnstable # have to use patchelfUnstable to support --no-clobber-old-sections , generated }: @@ -86,83 +47,30 @@ let else lib.replaceStrings ["_"] ["-"] systemLocale; source = lib.findFirst (sourceMatches mozLocale) defaultSource sources; + + pname = "thunderbird-bin"; in stdenv.mkDerivation { - pname = "thunderbird-bin"; - inherit version; + inherit pname version; src = fetchurl { url = "https://download-installer.cdn.mozilla.net/pub/thunderbird/releases/${version}/${source.arch}/${source.locale}/thunderbird-${version}.tar.bz2"; inherit (source) sha256; }; - libPath = lib.makeLibraryPath - [ stdenv.cc.cc - alsa-lib - atk - cairo - curl - cups - dbus-glib - dbus - fontconfig - freetype - gdk-pixbuf - glib - glibc - gtk2 - gtk3 - libkrb5 - mesa - libX11 - libXScrnSaver - libXcomposite - libXcursor - libxcb - libXdamage - libXext - libXfixes - libXi - libXinerama - libXrender - libXrandr - libXt - libXtst - libcanberra - libnotify - libGLU libGL - nspr - nss_latest - pango - pipewire - pciutils - heimdal - libpulseaudio - systemd - ffmpeg - ] + ":" + lib.makeSearchPathOutput "lib" "lib64" [ - stdenv.cc.cc - ]; - - inherit gtk3; - - nativeBuildInputs = [ wrapGAppsHook3 ]; - - buildInputs = [ gtk3 adwaita-icon-theme ]; - - # "strip" after "patchelf" may break binaries. - # See: https://github.com/NixOS/patchelf/issues/10 - dontStrip = true; - dontPatchELF = true; + nativeBuildInputs = [ wrapGAppsHook3 autoPatchelfHook patchelfUnstable ]; + buildInputs = [ + alsa-lib + ]; + # Thunderbird uses "relrhack" to manually process relocations from a fixed offset + patchelfFlags = [ "--no-clobber-old-sections" ]; patchPhase = '' # Don't download updates from Mozilla directly echo 'pref("app.update.auto", "false");' >> defaults/pref/channel-prefs.js ''; - # See "Note on GPG support" in `../thunderbird/default.nix` for explanations - # on adding `gnupg` and `gpgme` into PATH/LD_LIBRARY_PATH. installPhase = '' mkdir -p "$prefix/usr/lib/thunderbird-bin-${version}" @@ -171,21 +79,6 @@ stdenv.mkDerivation { mkdir -p "$out/bin" ln -s "$prefix/usr/lib/thunderbird-bin-${version}/thunderbird" "$out/bin/" - for executable in \ - thunderbird thunderbird-bin plugin-container \ - updater crashreporter webapprt-stub \ - glxtest vaapitest - do - if [ -e "$out/usr/lib/thunderbird-bin-${version}/$executable" ]; then - patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - "$out/usr/lib/thunderbird-bin-${version}/$executable" - fi - done - - find . -executable -type f -exec \ - patchelf --set-rpath "$libPath" \ - "$out/usr/lib/thunderbird-bin-${version}/{}" \; - # wrapThunderbird expects "$out/lib" instead of "$out/usr/lib" ln -s "$out/usr/lib" "$out/lib" @@ -197,16 +90,18 @@ stdenv.mkDerivation { ''; passthru.updateScript = import ./../../browsers/firefox-bin/update.nix { - inherit lib writeScript xidel coreutils gnused gnugrep curl gnupg runtimeShell; - pname = "thunderbird-bin"; + inherit pname lib writeScript xidel coreutils gnused gnugrep curl gnupg runtimeShell; baseName = "thunderbird"; channel = "release"; basePath = "pkgs/applications/networking/mailreaders/thunderbird-bin"; baseUrl = "http://archive.mozilla.org/pub/thunderbird/releases/"; + versionSuffix = "esr"; }; passthru = { binaryName = "thunderbird"; + gssSupport = true; + gtk3 = gtk3; }; meta = with lib; { diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index 3bed100179b17..76a3f313009cf 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,665 +1,665 @@ { - version = "115.10.1"; + version = "128.2.0esr"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/af/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/af/thunderbird-128.2.0esr.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "9023faca327f2ef67090cd06635030acde12caf4b028f293d06463cc6303f2c7"; + sha256 = "f4b3a3087afc240c9c1b4439316b1f0fda190143cca1da0d0c10d537ec47fdf2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/ar/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/ar/thunderbird-128.2.0esr.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "3d312b1a651a836e725ef79236ff4b0a8e73d7ebe3ee065da7d87ff329ec3596"; + sha256 = "d49d17d785de3f9145f5640e3c835a1cd6ec7b205868be4c0a598160835bfe25"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/ast/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/ast/thunderbird-128.2.0esr.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "8d645ce0694a5f9e464243f85e46c96e08c69aec7d4e7ef6b7028f457cf11a8a"; + sha256 = "7d2e82951778bf97279fe5c1eb9a36010af6d28ac3eaaaec7cff6da26cb51593"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/be/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/be/thunderbird-128.2.0esr.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "c5564e5235f990caccae034b77ea835f5b9a3741e2bdcbc5ed750e1b3161af4e"; + sha256 = "e77107193165eb5050286965e752b326fa15f33cc891e011f01ab09b90e92d91"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/bg/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/bg/thunderbird-128.2.0esr.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "061d15ae7805143fd74d8b16a2c2fcbfed471297d815692c55415c92ffe8bb41"; + sha256 = "f64b546fe7803e808a82de46f9bd118b897004afdfb10baa2de9a190e3572ce0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/br/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/br/thunderbird-128.2.0esr.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "33e802d7485b46bab1626dc1290db69df39c19434af8ad8dbdaecdb05cd5b2c0"; + sha256 = "a64ed5e163431a5fccfa452a565b109badbc80556cbe13bf00285afdb6fa1c1f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/ca/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/ca/thunderbird-128.2.0esr.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "6bdd0eb8fe98dca531796228ef3fbc51bca6d2a220111272464192ef9744fa78"; + sha256 = "b0fb10db25845009c25e1bdbb408a1cc6935dd742c8cc1acd7c398bff4a600d0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/cak/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/cak/thunderbird-128.2.0esr.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "9430aa1c2e5af6e461cfe7947c00421d32e5d91f69215981f470db14355d53c7"; + sha256 = "74a8c917565f27eced4b9ec952fee871da7e51c2323e509225227ccdb231cb79"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/cs/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/cs/thunderbird-128.2.0esr.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "f40ccf3947b4f98306697ffb984ac93ea1777019cb778fd1dd97d5f39c8718e8"; + sha256 = "63537a0b0efff24f47e9e8ea35bd28a55c6b96917c06a2dfa141d8f107f3194c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/cy/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/cy/thunderbird-128.2.0esr.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "694d0e4a7ca2585afb3c8fa8a41e318c5de7fbcbe91627c3acf692974c75685f"; + sha256 = "fd459d4fcd1c6143f7a03ae3069073f4e4b8d097733d504dd0221069520fcc6e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/da/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/da/thunderbird-128.2.0esr.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "8b8f5c9895b40ee6dc5d2ef0877325ec0af21ab638abb47c5d952334fcde29aa"; + sha256 = "7b75d5ab21254ef75a96217d715fc0a951ab38e8da61c2411820daea4b2ab979"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/de/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/de/thunderbird-128.2.0esr.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "f6f498a1e0756248fa06b4b94b52be11026a28cadd1aaab81b49aca3a311f3c1"; + sha256 = "cb05aa781c9cb360b23c597ab4566954e2506c01e214b14b0f7e863b2d5cadc0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/dsb/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/dsb/thunderbird-128.2.0esr.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "2415f1a021c2005c8646bfa8b75df2115fd6d86c5eabf6bbc23aa499d3a1d045"; + sha256 = "0d79340c7ae3af1e3be717ec92fe1ee14a53a680991ee2fb092dc9d4894b62c3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/el/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/el/thunderbird-128.2.0esr.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "57b4f990a15d0a2a9361bf9ec241fbe7b1fa33f7d3da871bec68e32d1b89ee3c"; + sha256 = "58049b7f1224ed79f63e053c1dabf795f851e6441c09044e6b7272074cbaeb15"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/en-CA/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/en-CA/thunderbird-128.2.0esr.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "3ad955c9557f0a692d7ce8b42cd764e3f9cb9dcba2b5bbb396a9debb40b8c1a4"; + sha256 = "338d69c084b4a9dcf93b0536417ab8a3dfa258647229e74e2f6b487a3d381900"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/en-GB/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/en-GB/thunderbird-128.2.0esr.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "c52eff0e765472a4e6f9db49210e1aad20fcfa422749d7962c7fbc7d92ef86a9"; + sha256 = "cc87b7ea712cc7f426129245a32d26724047932c12c4f5ac262e52ca551d7378"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/en-US/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/en-US/thunderbird-128.2.0esr.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "66afb5c126670e37b7a127d33c8d93da0eabbf360ee2ece42270535069f2186d"; + sha256 = "4200c48e8b57bddde15c7ad6757077e560d2f52a29da1902a35bcce945e751aa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/es-AR/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/es-AR/thunderbird-128.2.0esr.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "ab2ba1379c80e1e52971656dcea195d06c0c19d4ccef107a55e92dc8dfc24d0a"; + sha256 = "a1cf08ad3e0a80b90814c779e031a97aa9dba9797b02acf8c2e45fb1e994d54f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/es-ES/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/es-ES/thunderbird-128.2.0esr.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "4d55e1ac9aca0f85a890e6a014407eeafcd75710157a6c869d03c5d9bb3f010e"; + sha256 = "2e0a4a2d9001c587b9f61478de6611a94de912ab8fe1ed3bace2959f3bfb57ee"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/es-MX/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/es-MX/thunderbird-128.2.0esr.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "6ab228494d21fe9846aa9370942ef619422b3a65106ad943e5870322f011d2d8"; + sha256 = "e47fb45e3c8e05a0027bff1bf2b9a9fe07b73c28144beeceef5fe40b40fbd5a0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/et/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/et/thunderbird-128.2.0esr.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "46b9ed9a8a4244b0660b04acc357b27dbd516bef5b0c82001021a46f72087305"; + sha256 = "c45c5801a736a578c06993f3e061e0df5c798fefc49f415d5ed1196c93d3b07f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/eu/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/eu/thunderbird-128.2.0esr.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "322ef300f4a92bc5263e3fc5aef5a6ce5ff13bcda841af06546c2d580e104b89"; + sha256 = "f709c4440888772dca99dd6cc667a9d72d20a6e1eb5c84dfbb0a7a8e488a6f74"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/fi/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/fi/thunderbird-128.2.0esr.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "f84c400cf83c8676b25669fe9208da4da56e3a88161fea806b39fb61b39ad79d"; + sha256 = "e6f32dfc0095065326ce886f0ccc46259a13ae4339f609b2519f74226cf88e02"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/fr/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/fr/thunderbird-128.2.0esr.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "ed2aeb8f849e433771f79bedc8b05ab83cc7a22a0b7c7b4fc333ded3ec0a18d1"; + sha256 = "92ba3a5b2ebddd5e6f60c52e948f3336360e69fb3c21ca97f5629f16b6c74158"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/fy-NL/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/fy-NL/thunderbird-128.2.0esr.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "99210d27c75e591355fb641664f8e477b412b79ed545b87f9fc10b7ea7956c5c"; + sha256 = "7f905d1e7d17dd314f3e58286bdac0f4fcfacdddf1df809dd95a80a992f3ac03"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/ga-IE/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/ga-IE/thunderbird-128.2.0esr.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "7cb91bef278037efd512f8e5384cb8011ffee3025c0209c9d575d0693523891e"; + sha256 = "10421949c685172e8c842fa99ab11ee249a4e8357b9595a10d9a93659d5f45b5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/gd/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/gd/thunderbird-128.2.0esr.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "116149801edfb6166d651eed7752cae466a7998700e2d85e0fa0e89dcb8ed12b"; + sha256 = "8861ac36c0c65b00e15fbe3ecb6b288c612b4226bc06d688189548e95abe46f7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/gl/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/gl/thunderbird-128.2.0esr.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "47789526c5de43000f58bcdbb0a88e7fdd67deb5f4fd836236347cf62194b9ea"; + sha256 = "44259d867c523488b62c06b41a340e5efdceda7e42faa98564643249c6409110"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/he/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/he/thunderbird-128.2.0esr.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "9f3968f4919398b33bd16c645d86aac5e58d8b713204ea5ac8db06f37f3c8fbe"; + sha256 = "56b6152345ae31bf2e721aa1c4256493214969d1e6237bb3d861b784d0ff61d1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/hr/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/hr/thunderbird-128.2.0esr.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "b5e436bf3c02a0a9085b0a35fac71646dec1f0e83970e7532fcf35dcda8cd1b7"; + sha256 = "64c7bf327329149f0f8f0138db5759fd0d2f032d58ea795b95f23c44e6cd2124"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/hsb/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/hsb/thunderbird-128.2.0esr.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "6e42557492e0db90f0a42c2c239f8bf052b9c4c43a55d615fa1ec4da5a5c678b"; + sha256 = "b23577fb06f2813a6b8a0a0e8b76d029ec0d129758814696de4b5679e8b46d3f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/hu/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/hu/thunderbird-128.2.0esr.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "e11733b4f2fd13071fb0d1e25f3f21c0c022016e634f630a98cd5053d0850889"; + sha256 = "9f2a7bb6990dfdd7b35922132701ead5505343ad53b12ef44743fffef8d4878e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/hy-AM/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/hy-AM/thunderbird-128.2.0esr.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "0a13c41658426d99de46f3b7e6a5d2faba81040ac71368d910d1222b9d47b8ff"; + sha256 = "176130e7a7701022fdb308edfa8504c432639794e2582c214807d9496583de95"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/id/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/id/thunderbird-128.2.0esr.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "d9194d612852c4e7cf7ee466e95318716c83a2f7badcba280a31eef10d8296d9"; + sha256 = "80d9b02e4125d1e8f59cb7384c2ea6559c77a517675c84e286f8574d86459aeb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/is/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/is/thunderbird-128.2.0esr.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "143d425cce754af88da296fd1dd3e40b0a2e125f6d45ca066940efdeeaa92d11"; + sha256 = "677d0f4bc43d2efefc1fb052706cf7307ccf7b8bd529c76c1860e6f121daaf2e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/it/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/it/thunderbird-128.2.0esr.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "130e92f13ad92e110378eee9f2caead36a4280d6380d45390ab6e6d4b7e2bf86"; + sha256 = "f7160c5183922bdcecdaf87100b1556081072dc31c2436690ac707e47511d36b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/ja/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/ja/thunderbird-128.2.0esr.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "9561fc79e72fe60c36313f0e07b14f04cae28a47108832cb3853d5da610c6652"; + sha256 = "9b1144c1911f0186d4ad6b1b4526d55aad0a6de2157e02cd8bf593c827ac28f3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/ka/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/ka/thunderbird-128.2.0esr.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "f37f5eb50af136c712726c3ed180e564a243ac9b0d87166ec0acf058f6be7bf7"; + sha256 = "1dbc9c8419f6f7d131c00851d54bab714ca30f75be97529bf5f679a859014050"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/kab/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/kab/thunderbird-128.2.0esr.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "2923b3671f38b72890e0d8be963ecccfb682ce0e09ff2286d05fc0d86413da45"; + sha256 = "fe5fbf0b7c3e5f10846a0ab019baf5ddddc7b7bbb04b32e56cfca6bde5d92fb6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/kk/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/kk/thunderbird-128.2.0esr.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "c3414484527fb499b4fa1a19010e97b452d1c6a48d0731ec3f8bb7041bc2d400"; + sha256 = "77055d3004bbe6fce489cb4ea8c9e6f75d19ad35d0015caceb24920d372036f3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/ko/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/ko/thunderbird-128.2.0esr.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "4caf7796c7af7e9421d1f20f8b238abd6ef369131e1beb614fcba6d8e15c397a"; + sha256 = "1711d530249728789931831680cb3062c1da2addd90482a195d27ccb2d69cb33"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/lt/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/lt/thunderbird-128.2.0esr.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "8c9c7de04c3537013e002dd2833ba9bd0a647e4e01f2d94e9eebef88a67dcae6"; + sha256 = "e3fd07e0bf2c1c6586b5826c92e4aa2341faea04791e686c8e6213a0d0f4e00c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/lv/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/lv/thunderbird-128.2.0esr.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "63fa8509fbb99621226378d79ad75b0cf7f474dd7403bb8963361c81c9d01c61"; + sha256 = "432cce43817a60790d8295c49b6e04b5d595811a3bf5024d733302ea755ab1c3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/ms/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/ms/thunderbird-128.2.0esr.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "9de01e0ede9d4d6196c7b72e08f7abb438681a303b679abbc1f8294448211ab3"; + sha256 = "110ea1d59a3d00d45198505ecb15100d9cbcc77bfba69fb9000ecdfcc9db1d4c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/nb-NO/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/nb-NO/thunderbird-128.2.0esr.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "8eb261abc0f68e42bd048315957acc47665b275bce848372e1b0953e2ab99c26"; + sha256 = "7d7bac855a4e27055e0a8561172cde744058e74aa8233554504d87dfc68f29f6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/nl/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/nl/thunderbird-128.2.0esr.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "c4aae2a0489d919c4665285b402d113a8efec53d15279eff056d9a576888287b"; + sha256 = "4820f08e4979e9eddc4182fea39d023defcb450e7edac9c8a2d3b09c62669959"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/nn-NO/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/nn-NO/thunderbird-128.2.0esr.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "4495660e73f937a07c2745c6d48fa43a8a159b1d84d8e6859e1a42579f1157e5"; + sha256 = "835b1befa30afa3d8cd50f4cd9a2922cb63815ac1c9b240c491d114f4e8542cf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/pa-IN/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/pa-IN/thunderbird-128.2.0esr.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "874ae66c39b199981cc02363bed7a2a74c133a80b591785c8c862e7499b17c89"; + sha256 = "cee9b2f3aee4e978772222f2946c99986ce36695f34e51708cae928bc66ab6ef"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/pl/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/pl/thunderbird-128.2.0esr.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "ae7c458b41e7eecc2581be2801571bac54933372797d291f03acee7311ba784e"; + sha256 = "ba29593feccd45c43605c6aaaddaa99afd25308e810e6059ca873a162a054eae"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/pt-BR/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/pt-BR/thunderbird-128.2.0esr.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "30912ac7a19d1bbdad39e537f78d512951124a44407eddfc4382c1175cae76de"; + sha256 = "5e1bb94d66d757a62e093835f91b097586980702985931813d2825bf7b90f5c6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/pt-PT/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/pt-PT/thunderbird-128.2.0esr.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "2cb2225df1364a1f67911a0cbbe034d62df6fd51b567e5fa8b036273790c3fad"; + sha256 = "f437bdc00cc4cd70995000c4a23dc7407f8b0b42dd42d3e536e95ea6d79f0ebf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/rm/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/rm/thunderbird-128.2.0esr.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "09d6d3cdf00a280eb2b1149154150b1ce23e2761d379b1b4eb362422e0ce7584"; + sha256 = "b068a55935501994c69390b2d45b3592e2d3f7fb8e270fb058aec8882a353e90"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/ro/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/ro/thunderbird-128.2.0esr.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "fdffa6a81e15bc84f4cb1d48ebc1109413ec10f40ba7ab4a78e8c980fd447683"; + sha256 = "6f6fce04d2676a21dad81a77f0b875a3730e996810f249452fd49d277d13b39a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/ru/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/ru/thunderbird-128.2.0esr.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "0cea8488bf4537d205b3fab1f98239f7cff85fff6c2f7eab247a3191e089c14e"; + sha256 = "2044141931cb4735ef1236b8c000aeed718266cbbd3c28b5d3fd3ddda4f64317"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/sk/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/sk/thunderbird-128.2.0esr.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "eff9c4d36259590e8397cff0ee8ba407e5f116b541f730e5845a2bce70f7a68b"; + sha256 = "bdf6d92e16397237d5c9168d3d5f14d0ffc8df04e9b435a5f1e7a49138cf593f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/sl/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/sl/thunderbird-128.2.0esr.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "97db4b1c97a85cc65c16e72e166a1739bbfa20e07be767e5695c10fbdcb86231"; + sha256 = "21aa9cd554c5a5d6f23f433c4697e47e3fca90d957f9a413d3b7aeb030055544"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/sq/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/sq/thunderbird-128.2.0esr.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "f6d3b3a90cc9ec5c794b803675c141c9cc6acbdc6d25093369ecd0c937206f85"; + sha256 = "f8bfdbb24d67341cd5d3e88012883835a2d48f18e0d6efe33c1b726431bc279b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/sr/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/sr/thunderbird-128.2.0esr.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "3f6f0f5222f4481406087b11bca95b122705e60d3050040e31f901960d729aaf"; + sha256 = "f906ca1bd4391ccad57eed53d247d32fd62b3328a005e034e5f76e74ea37aa4b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/sv-SE/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/sv-SE/thunderbird-128.2.0esr.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "a168edd15476aa8150718de09fdb0d94bee32b9f20dc9cfb4ef942684a96e857"; + sha256 = "697c1c80cc743f5446c3d6744cfac640bf5968d9b8322697546af9a4cffe6517"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/th/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/th/thunderbird-128.2.0esr.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "65992ba363ce0378a271cc0d073e64176873be8dfd5a4c6f3378b5e819aeed0a"; + sha256 = "62bf8a81688e3405ebde85623df7cbb9c87a41ed0b86ef32f791c1a3b383c185"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/tr/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/tr/thunderbird-128.2.0esr.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "d1a2c48e4c12977151361ab1264d26b0027fc74a256b7a2ccdd3e38050a14049"; + sha256 = "af3b01def0092f1abd3dc7517ac68e41d92fa816ff0ee0045a14fffd257dc732"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/uk/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/uk/thunderbird-128.2.0esr.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "ac72a9b613ea56178c2f5a16ec59a5f4d481b85aed1932689ea1cae328d8e81b"; + sha256 = "0b5c83c3e28b59c7feeba5ce953b0b60d115f33f567e7942d450c804e4f0d236"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/uz/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/uz/thunderbird-128.2.0esr.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "0db8b885543185f06d0f5ae4ee18b95046cf00172774ccbd6c79f825e94a0a67"; + sha256 = "45091cbd6336995b86d3e2b5e0ef82792dc5484a90ca94de905526d3122853c2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/vi/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/vi/thunderbird-128.2.0esr.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "ce91ae20b5feaa7f0d9a20de5661bfece4b84da32063bcd647309ad0c7a3a342"; + sha256 = "448a8ed43b80448994b918f3f91c3de3698b106f578b776efbaa7b4e4c4d3fc1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/zh-CN/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/zh-CN/thunderbird-128.2.0esr.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "ab89a35b926209221fb672bcd9c3a83c636e3c7b95b507926ca6317e5f977b51"; + sha256 = "53cbdf5039e2f6d724b45ecf948c63af367e7df4f7766e628fb945fce33734f8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/zh-TW/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-x86_64/zh-TW/thunderbird-128.2.0esr.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "407062f4b5de3e40e44888713a39337b6e223487a76fff0bdb7219154700cfdf"; + sha256 = "147e2983179d906c7878a889a4e05be792fb54336f029b7c4c7f26f115ed9217"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/af/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/af/thunderbird-128.2.0esr.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "19b5940f6fba18e0246d1173d2a5fcb8c93d7265ffe8c9028647f9ff0afbc486"; + sha256 = "282558d2d07b3c44de23c5684771e8f2eab9f67f5fef844f569f84474687da04"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/ar/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/ar/thunderbird-128.2.0esr.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "9dc9deb45751da0d2d09d0331eaaa89c318f2457d575a2c03bef207f169e8de7"; + sha256 = "972d674e174433e6dd91627942a1d2e3e06b16c9fcc5288b9ab1f92a0a2526f8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/ast/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/ast/thunderbird-128.2.0esr.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "5710e364f670e388d9bf6dbc8b1fb7fcded75806a4be249b7ddacc2c24d6da06"; + sha256 = "bb7c12421185c2a1db8e94bcd7d0c7b9d461272652ab22fa5a05f08e83a226c3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/be/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/be/thunderbird-128.2.0esr.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "f7e20df373381cc63c4d52c50c4e9305bd9378c2e2f1d21a4d2f0db36d831156"; + sha256 = "0a731f7c5caa910719d3efbf8d65a8d7149a3195631263de13e0ccdc51eb5268"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/bg/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/bg/thunderbird-128.2.0esr.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "8c7332cbbcc3df7be3b6ab2d7e929031c4e349de0aa548b775c6b7af3e63cca3"; + sha256 = "af55dd242ea2edceb2b7faabcf26f1c976efb9f8b5ff76d5b07cfbd9c6eb55d5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/br/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/br/thunderbird-128.2.0esr.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "4b5621ab96b9a937851698e18347259155803a3cc7d7ac9b7227a3fa203178a7"; + sha256 = "b5b249a78710ba4c7d1bc696fccfa7a63a517d537ac4f011ba7a22f2d3fffb0a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/ca/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/ca/thunderbird-128.2.0esr.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "965a5374467b248e52f9508154fecf9d6bb9cb58eb3fd6be240d74a7208650fb"; + sha256 = "2dc876760e6520cd3ace249943e37d363f98388e799c0e0fb2d51e751404de40"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/cak/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/cak/thunderbird-128.2.0esr.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "f17a469e28cfc5aa9b2b795c1d7517e076146f87cf534b9fd4a4ecc905858a4a"; + sha256 = "836350ae188d39899231a26d7e10eaa029559c83a3395b7c74536d37f73d795f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/cs/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/cs/thunderbird-128.2.0esr.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "802fa9a0d857a973592ae87a94fc9ba3b18c8fc86a3352d90d152c0a7ece0db5"; + sha256 = "1b3bdd19f3e880bab7428e831f490c0ce69fe1db20b8699402e956f09b77c5ff"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/cy/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/cy/thunderbird-128.2.0esr.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "c9cba2912211963ca4acccb1bbf9c904e9a79f1c3781a69df76c003bbd1f5c1a"; + sha256 = "b1153a70b2bcf6e9f0deaaaf175a5085921f7d1e1a1f319136c94ce57bef54ed"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/da/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/da/thunderbird-128.2.0esr.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "5c54d287396d2c172f463010bb5be1520a5c7636a6f79435430420943036a364"; + sha256 = "a2eb8ba6175dd4b7336ab05fe4834527a31ab5e13abb0381f187e91f836031e3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/de/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/de/thunderbird-128.2.0esr.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "c6558305d0207a706fb8f5af595dbfc2515652a732fb7e95646a334335a01a61"; + sha256 = "1c23af1559f2e8f090cc651c827d4130e74f7141daae585ddc43c0287b8b0e0a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/dsb/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/dsb/thunderbird-128.2.0esr.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "9eb4d57f121df4714d91ac0a5075face494fb6efea301625ede1b4420c398ff8"; + sha256 = "341d6a892f5b79836bb18fcd97df1b2fab695791a50af6ded0d966f1d0439008"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/el/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/el/thunderbird-128.2.0esr.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "a96136d8392cdf21af28efe2b512efd45190e97ad420a293cba6d621ca7f2106"; + sha256 = "8eb920d8e41cc1ca8607580f124061f9c10a549377b591ac5cfb53b2859248d9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/en-CA/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/en-CA/thunderbird-128.2.0esr.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "30d9f5125940c08c77d2c6f2aa2de794fd9abfbdf88640dd56c0ed4e87f33ead"; + sha256 = "ca2c7d3eee2129e3da7bc4a7d25db4b867c23408084a9438c4a600c1d35c9853"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/en-GB/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/en-GB/thunderbird-128.2.0esr.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "9e78d591b35f8aad5811a5cdceaf9ab5d394fd3ad1dade692d21a3ccbec4b14e"; + sha256 = "f8f1aeddf0b5711e10ae4a4d785380230a9f8871d73baebe95ae43f3bf4b2a45"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/en-US/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/en-US/thunderbird-128.2.0esr.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "1f459cd30a477a654f91565963ba6ef077c087a8fea98ac36186c41ed78db627"; + sha256 = "c89cda02e8a17ff8e455085ef22c1a14f8d42217239e68133ab0d3076a4df170"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/es-AR/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/es-AR/thunderbird-128.2.0esr.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "17cbdbfc9df3e0f8447f73d8205ff4e126cce613ff596c64dcc99992e6c2bddc"; + sha256 = "30b6d06405cdc824d2ea2e8ae3352403d631e02d182621035c9c4b89a2f5d3e8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/es-ES/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/es-ES/thunderbird-128.2.0esr.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "a5622a156340409aa1ea7af7b0531741e3024a1fdacd9bc5307a17d596dfe720"; + sha256 = "4a52ee0cad2c6adb85a5e847b71761fa931f2baa34f310c2135249a1f74d1e81"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/es-MX/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/es-MX/thunderbird-128.2.0esr.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "cb69980eafc5209b37606cdd2b6657943d2d4f827450fa0f9bbf64ae31bf8a05"; + sha256 = "5e3ee38af26a47df39c542da9cad4f0f5fcd761b93cc25aa3b3e484afea342a2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/et/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/et/thunderbird-128.2.0esr.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "b8ad3424ba8f4aa2affd9cf03133d64e0c68513983f733c4805962ca0535bd40"; + sha256 = "bad8263e3754045770662250327c14ea50a11d46d786fcf0d41f761e0cc2c60f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/eu/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/eu/thunderbird-128.2.0esr.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "800c8f9ae9486d8109bc0e62636b511662042b6115313e4be5e50cb8851b0d8b"; + sha256 = "8433875ae5b054541f6fc70ef566482acabc9f013a0010d4d3125c09acbd4e2c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/fi/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/fi/thunderbird-128.2.0esr.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "b4e47065f2f91cbd84c16f23f25682dd1928ab966c497d0584cc19eaaf5436a0"; + sha256 = "4a077df147a2a27eff7cae97bf33c1d2ed92c11f6f6f6e71307bda9951137fe7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/fr/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/fr/thunderbird-128.2.0esr.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "fd47e4c10a7c1c70c34635a899aa03c139666b3b5c9752dcfd7f5d6aaea750d5"; + sha256 = "4373edef98045ff52146a9899159f4d0614cefc0a49740c538ea52692097d45b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/fy-NL/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/fy-NL/thunderbird-128.2.0esr.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "1d690a540600918e3bc8ee664b29cb9855b10c961d2d09bf434d3473ceb98933"; + sha256 = "0397b53ac71755e8ce65a946d3aa1eb2d025ee3e211857d31519f13d560e99f7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/ga-IE/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/ga-IE/thunderbird-128.2.0esr.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "b62a866a69ef782a51e5a0e3ad314e944a0cb63968454d049c5c2112adaff143"; + sha256 = "ea0f51dce8b5f51cb857c112eda213599a0cf85f03de718c3cccb575afe8c311"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/gd/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/gd/thunderbird-128.2.0esr.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "35eafe0440625d32249d7cc721f2fde9dc7331f9d4b542682f23f3c3281f584d"; + sha256 = "4f2f2d90b84349889b93be998eadff420dc547b36ed2e232c3cdf6a4269a7c1e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/gl/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/gl/thunderbird-128.2.0esr.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "1a6badeae7defbb158615639fd129a59e0b24db557f5106fe20b85d0b5e0b46e"; + sha256 = "8737b1b7a116da2e2a7054c579d5898ecca15abff78a179d86734ea9a58e717e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/he/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/he/thunderbird-128.2.0esr.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "12cb6baa362cc0c4147cc75d80bf94d0a5be18dc895aabcc1359df1bd483e096"; + sha256 = "2260a9384ac575b3232dc5ceed92e76d56ffd44072784d26f4efaa30a7c4d33c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/hr/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/hr/thunderbird-128.2.0esr.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "a130fee072cc32f1203da09507e5935aa1669b018a44f7d6ca097119f835e184"; + sha256 = "30ffe91315ac17eaecbe112d4f7db5482c464843c80dcf45f2cb7739b6f957c2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/hsb/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/hsb/thunderbird-128.2.0esr.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "5e564ff266867829b963e058a2cecc5da29258acb1a852329e7d57c746e5ad61"; + sha256 = "4ab8a3ad84614e9b5efeb953e34a7258cdad035235d4de1e802351c04d135889"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/hu/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/hu/thunderbird-128.2.0esr.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "c050c63e38cdd80d57b1d06abad5f3810454523ce1f9c2bb4c25ed656d1f3102"; + sha256 = "e710ec3beb0656fb14962cfae06b29be24d30f5c2cefd1cbb4e8e09471193d54"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/hy-AM/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/hy-AM/thunderbird-128.2.0esr.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "56536454c673a14a5166533f695d31168a6a64d14b69a5a344270b8e1a9b9754"; + sha256 = "18941e2454d60b17aeebdc95aad7854b989e71c4e928b0147c0beb36eff54f3f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/id/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/id/thunderbird-128.2.0esr.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "f6731b88513533b355b73293fac108f77c2a0a4c47e2e5ac4ab560a91c90cc4c"; + sha256 = "029c210861312a5d2d3c59f69b692692b133296b27d125367ac2cc2419e0a8d5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/is/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/is/thunderbird-128.2.0esr.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "c9ba2344d981c83bf78e38f2d694db8ce34877dbd62cf4fe2657c31e4ddb8420"; + sha256 = "bdc4447638fc299cf5974adf5ca268d6d4a46f6d1b22b51e54b2de46f1c266c8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/it/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/it/thunderbird-128.2.0esr.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "c4e4c6956aff5ccc290a3fec4354c7cfff3bc9370917820208e270211730d3a1"; + sha256 = "b3a39203e13635e59b6f58fbd053ebe630c5da786325c48f62f2493e00237d32"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/ja/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/ja/thunderbird-128.2.0esr.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "a998c41e9afc12fb0f79146271a88f45153ec640ccd5c62132f2081cf404f355"; + sha256 = "d684e3c5423710c07f5f6918257acabff6ee3c7fa685fb19269f482a6c6f9c61"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/ka/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/ka/thunderbird-128.2.0esr.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "20d8145d782954c0647e416a062dff881370bbed4370d122a74f8d0854cc542f"; + sha256 = "5363ebecae103a8b5d37dbd0011e6bdc284e28beb4a32dae17314d3ab420cd22"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/kab/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/kab/thunderbird-128.2.0esr.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "065579cf33edb1ecceb56b5f3fa3a4b1f4f2da93dcf666aef859206fd30f515a"; + sha256 = "06a8be9cd3cdd3a7b6dd1c9d854a92858c3bde93a1ec49986a9e9325d883527a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/kk/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/kk/thunderbird-128.2.0esr.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "691b931acec550b087ec3950bb74f17b040bc0b8f9f9cf475603906a9fcaf5be"; + sha256 = "48f9e2bb1efd842fa78cd593305771b43c80d25bbc5ae3336123af43a50a8676"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/ko/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/ko/thunderbird-128.2.0esr.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "c91281e38d08a5c738ae3cf1be458566c998c0d65e588b0a463202a6bd19020b"; + sha256 = "09c25ebf06fb2524b3717f17a63c4ffc95925a626d0f102ce926108ba1fb4f0e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/lt/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/lt/thunderbird-128.2.0esr.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "6b9309f8f3c1191addb96770e4569fadb81de8f807790d9d00ad303d0d47a2e9"; + sha256 = "721c02bd8e8016494d7a32465cb69cac923fb8ba48bd32dbedde6c7e3d88a1be"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/lv/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/lv/thunderbird-128.2.0esr.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "d91fef64dde27d7b756327afa8b115e07c58906fc1bccb98ca893755e34a36bd"; + sha256 = "2f60dcfa5fbadb856aeb15b3542f27952469aa8b333fcb91d3d1e7f69cb9b3a2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/ms/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/ms/thunderbird-128.2.0esr.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "9f2b25e37d18a39542d60257813d72a7075dca6dee2fe70e437de430cbeb2ee2"; + sha256 = "cdf054772acb4130e300ba0aac0e803298387e775af0d890476239e3d7be7c05"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/nb-NO/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/nb-NO/thunderbird-128.2.0esr.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "44fd3298de7c95033c47831484549fbd8121b463f2e904d51b43c9502e712c09"; + sha256 = "1c56b63aff8096f946388498eee83ba509c46b2f8a609665eded59f13b729d22"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/nl/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/nl/thunderbird-128.2.0esr.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "067f544982f4174eee55d621a495e9c286f70a70d0ca072668a087e434906a2b"; + sha256 = "d93de2c117308f4843d9c9377ad336730834132ce823d2d0a1f49c40160c0933"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/nn-NO/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/nn-NO/thunderbird-128.2.0esr.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "a60ca5cce0a272b2213312fc86930134c2d513fb8d7d8eea9c77de68f2fdbf0c"; + sha256 = "4f183fe49f3725defcd1c2b4ae65bd95a5ff135b5f2ba0ef348fdecf04c2f7d4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/pa-IN/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/pa-IN/thunderbird-128.2.0esr.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "d5c43a67d0cb9146ef6d9b076ab04c37c22e26ee24e16867f2af497e752a8aab"; + sha256 = "f9c8787bd95bdedc4e21fb9ee13b2d4ce7bb051bc3890d104b805b5f859ab922"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/pl/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/pl/thunderbird-128.2.0esr.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "0c9df1326d8b72f3492f690c34841fa4558452fd2a386b2724e8433470effda7"; + sha256 = "f536ba3b737d23dc9e0b0f9bf6d0bef06c08c35f37ae92e8f56ce49760422614"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/pt-BR/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/pt-BR/thunderbird-128.2.0esr.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "69fff4ee82f72116bcfabd82fc44fa9878e2d1b378120ab22958784e257b32d4"; + sha256 = "5d7a8b873affd479fcefbe88db6677fdbe616ad67031ccf7fdeee4e740e99653"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/pt-PT/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/pt-PT/thunderbird-128.2.0esr.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "ce4a6b8a0b81e7a481a08222671daf80c9ee1f0f6a41c1e10e9b060d1b64db23"; + sha256 = "999f812b3ca0cec36503a425b0d756555bc159e2a1cd952a06d65034d28aa0f9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/rm/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/rm/thunderbird-128.2.0esr.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "a45d5e83cbaf53a7c7d87e3c573719b03017f6fddfff7badce77b8a29012c404"; + sha256 = "081809c7c14f8056db296ff3ac97e2a9aaaf56302a40ffb8ede62d83e17fc944"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/ro/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/ro/thunderbird-128.2.0esr.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "8e59f5a9da26c90e2841931c3a54f0416b425b9d084a97370d3794605fe9f815"; + sha256 = "61ffe80eb8d740dda615ced1365b96f6a453947cd174bc3e96577538e3ffb8b3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/ru/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/ru/thunderbird-128.2.0esr.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "fbdd472bc1d768fb7bc5491772326ffdda0fb48c2754e6dd6352dba20d2d221b"; + sha256 = "c71adef5e11819e3cb7d8ba9c4081058e76f5e3a07e57f8e6c66dd4baf53945c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/sk/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/sk/thunderbird-128.2.0esr.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "ffb92d870c91aeb8385d3a5a1aedd86198567861e8a8e9fe249671c42b9f0e8a"; + sha256 = "28f2ead6651a8fd9d2e75ad3eca88161e93aa13b0ab4e4efa22a5b4e0f77804d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/sl/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/sl/thunderbird-128.2.0esr.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "e291960c5edbaf370afb39593e79e50d896942358fe1b19a0267c5cb68e09bbb"; + sha256 = "ace141250862bd1ed339e2a808c059e453ee48cc655e1fec00539c44c12fc77a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/sq/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/sq/thunderbird-128.2.0esr.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "613aec7a4f08bf323f75a8517deb27fe4957e7119c45e8c91628dadf51f9ec64"; + sha256 = "4463332d93d5f055a39aefefee061c496e4df909c5f605e561bdad524df0ec8b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/sr/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/sr/thunderbird-128.2.0esr.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "55b488eaf7dcc4fd0e1a8ca4720d82960a5a93a32e729f5b0b3b95e535971776"; + sha256 = "c6b2bc17a929cce1f829809870cbee9be414c0847ce00a51afa923977a1e0bb7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/sv-SE/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/sv-SE/thunderbird-128.2.0esr.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "e3ace007963edaa894c97701bf80acf2cdbd1609e2d0d23aeee56ec53aa4fc79"; + sha256 = "71241892935c67e156ea3b37e46056896ac9e60ec90f328ff6fbde1d3fc15bff"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/th/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/th/thunderbird-128.2.0esr.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "17a3032090164feaa68196709e19d8a255beed609e3b178ff08009efceb39c2c"; + sha256 = "23a404e4f2ad01295a8a6b8439e6a4a733b4ee26eeb709c71ef76a6fb859a244"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/tr/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/tr/thunderbird-128.2.0esr.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "5eea9db6abfa816f30b0bfb0e6da6a5b9777edaea1fc451cce6ed3a5a44f7df4"; + sha256 = "e418a2be53df374d9ea08fd64a890dbe076e420d9b0e2db3dd58035433801d57"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/uk/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/uk/thunderbird-128.2.0esr.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "300d12c8eb0f735996bcd443adba9252d5ec4267cf9348ecff8f4a9f22ad3afe"; + sha256 = "0185113bbdda3bf7fc03578ff8cd7c2cabf691608d3ff67e598bb669c60690fb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/uz/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/uz/thunderbird-128.2.0esr.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "bc6707522482d5b01e2d908040f878322e79bee9e2121c041b340cf12634058f"; + sha256 = "dda399a258e14ce9f38b5b1c4b9c366c52ed0d3158ae8eda45da3e28648bba6e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/vi/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/vi/thunderbird-128.2.0esr.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "b4cd7d36debe223a05a1539e33c951564aea27d392cd0d1f081f14b3cade6d7e"; + sha256 = "fadfa641fd7363d82856b2957645a619c9f8f582c9bda78b6a74a825729aec91"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/zh-CN/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/zh-CN/thunderbird-128.2.0esr.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "956851f3eabd6345ebeb6719dc3e80dd30b66bf42c1078e02996dc5b0ea66e67"; + sha256 = "667e7244f358e12973df794afd4077bb1ceb7e4cbaee88f0832cb2c25d151d1d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/zh-TW/thunderbird-115.10.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/128.2.0esr/linux-i686/zh-TW/thunderbird-128.2.0esr.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "93561ed61edb07a8a4882e0687db51238d31f7d6c04919b39b3e88156d3be132"; + sha256 = "becf451ca9483fb8a8d0b9d76942eac71df2d4ea063ff8f5411e84d9b8392898"; } ]; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig-115.patch b/pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig-115.patch deleted file mode 100644 index f386ee5a5d7f6..0000000000000 --- a/pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig-115.patch +++ /dev/null @@ -1,13 +0,0 @@ -Remove about:buildconfig. If used as-is, it would add unnecessary runtime dependencies. ---- a/comm/mail/base/jar.mn -+++ b/comm/mail/base/jar.mn -@@ -120,9 +120,6 @@ - % override chrome://mozapps/content/profile/profileDowngrade.js chrome://messenger/content/profileDowngrade.js - % override chrome://mozapps/content/profile/profileDowngrade.xhtml chrome://messenger/content/profileDowngrade.xhtml - --* content/messenger/buildconfig.html (content/buildconfig.html) --% override chrome://global/content/buildconfig.html chrome://messenger/content/buildconfig.html -- - comm.jar: - % content communicator %content/communicator/ - content/communicator/contentAreaClick.js (content/contentAreaClick.js) diff --git a/pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig.patch b/pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig.patch index c4e29f6355cf0..f386ee5a5d7f6 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig.patch +++ b/pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig.patch @@ -1,13 +1,13 @@ Remove about:buildconfig. If used as-is, it would add unnecessary runtime dependencies. --- a/comm/mail/base/jar.mn +++ b/comm/mail/base/jar.mn -@@ -119,9 +119,6 @@ messenger.jar: +@@ -120,9 +120,6 @@ % override chrome://mozapps/content/profile/profileDowngrade.js chrome://messenger/content/profileDowngrade.js % override chrome://mozapps/content/profile/profileDowngrade.xhtml chrome://messenger/content/profileDowngrade.xhtml - + -* content/messenger/buildconfig.html (content/buildconfig.html) -% override chrome://global/content/buildconfig.html chrome://messenger/content/buildconfig.html - - # L10n resources and overrides. - % override chrome://mozapps/locale/profile/profileDowngrade.dtd chrome://messenger/locale/profileDowngrade.dtd - % override chrome://global/locale/netError.dtd chrome://messenger/locale/netError.dtd + comm.jar: + % content communicator %content/communicator/ + content/communicator/contentAreaClick.js (content/contentAreaClick.js) diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index e4da05046a9a2..41c7c27a1b480 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -1,55 +1,79 @@ -{ stdenv, lib, buildMozillaMach, callPackage, fetchurl, fetchpatch, nixosTests, icu, fetchpatch2, config }: +{ stdenv, lib, buildMozillaMach, callPackage, fetchurl, icu73, fetchpatch2, config }: -rec { - thunderbird = thunderbird-115; +let + icu73' = icu73.overrideAttrs (attrs: { + # standardize vtzone output + # Work around ICU-22132 https://unicode-org.atlassian.net/browse/ICU-22132 + # https://bugzilla.mozilla.org/show_bug.cgi?id=1790071 + patches = attrs.patches ++ [(fetchpatch2 { + url = "https://hg.mozilla.org/mozilla-central/raw-file/fb8582f80c558000436922fb37572adcd4efeafc/intl/icu-patches/bug-1790071-ICU-22132-standardize-vtzone-output.diff"; + stripLen = 3; + hash = "sha256-MGNnWix+kDNtLuACrrONDNcFxzjlUcLhesxwVZFzPAM="; + })]; + }); - thunderbird-115 = (buildMozillaMach rec { + common = { version, sha512, updateScript }: (buildMozillaMach rec { pname = "thunderbird"; - version = "115.12.2"; + inherit version updateScript; application = "comm/mail"; applicationName = "Mozilla Thunderbird"; binaryName = pname; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "182f35e8e5ece98d18dfefe106c73bc97fbc619f59772d9b3455b7c8af412021ecc5eae97a12515224e91deb814abb7a6ef7f538c450e9e77fdfd84078678038"; + inherit sha512; }; extraPatches = [ # The file to be patched is different from firefox's `no-buildconfig-ffx90.patch`. - ./no-buildconfig-115.patch + ./no-buildconfig.patch ]; + extraPassthru = { + icu73 = icu73'; + }; + meta = with lib; { changelog = "https://www.thunderbird.net/en-US/thunderbird/${version}/releasenotes/"; description = "Full-featured e-mail client"; homepage = "https://thunderbird.net/"; mainProgram = "thunderbird"; - maintainers = with maintainers; [ eelco lovesegfault pierron vcunat ]; + maintainers = with maintainers; [ lovesegfault pierron vcunat ]; platforms = platforms.unix; badPlatforms = platforms.darwin; broken = stdenv.buildPlatform.is32bit; # since Firefox 60, build on 32-bit platforms fails with "out of memory". # not in `badPlatforms` because cross-compilation on 64-bit machine might work. license = licenses.mpl20; }; - updateScript = callPackage ./update.nix { - attrPath = "thunderbird-unwrapped"; - versionPrefix = "115"; - }; }).override { geolocationSupport = false; webrtcSupport = false; pgoSupport = false; # console.warn: feeds: "downloadFeed: network connection unavailable" - icu = icu.overrideAttrs (attrs: { - # standardize vtzone output - # Work around ICU-22132 https://unicode-org.atlassian.net/browse/ICU-22132 - # https://bugzilla.mozilla.org/show_bug.cgi?id=1790071 - patches = attrs.patches ++ [(fetchpatch2 { - url = "https://hg.mozilla.org/mozilla-central/raw-file/fb8582f80c558000436922fb37572adcd4efeafc/intl/icu-patches/bug-1790071-ICU-22132-standardize-vtzone-output.diff"; - stripLen = 3; - hash = "sha256-MGNnWix+kDNtLuACrrONDNcFxzjlUcLhesxwVZFzPAM="; - })]; - }); + icu73 = icu73'; + }; + +in rec { + thunderbird = thunderbird-128; + + thunderbird-115 = common { + version = "115.15.0"; + sha512 = "b161b99e09b6d1ba833f77264e35034ad199438b4fc88d244a6b68c84693fa2e90fbab60dafb827a2e23b37c484f9843a58751d93826ba7cdd0391114d253de2"; + + updateScript = callPackage ./update.nix { + attrPath = "thunderbirdPackages.thunderbird-115"; + versionPrefix = "115"; + }; + }; + + thunderbird-128 = common { + version = "128.2.3esr"; + sha512 = "f852d1fe6b8d41aa2f0fbc0fceae93cccf1e5f88d9c0447f504de775283289b82b246b79a01e8eb26e9c87197fb33138fb18c75ecc3f5f1bcfefa3920a7c7512"; + + updateScript = callPackage ./update.nix { + attrPath = "thunderbirdPackages.thunderbird-128"; + versionPrefix = "128"; + versionSuffix = "esr"; + }; }; } // lib.optionalAttrs config.allowAliases { diff --git a/pkgs/applications/networking/mailreaders/thunderbird/update.nix b/pkgs/applications/networking/mailreaders/thunderbird/update.nix index d6f1a007faa47..c7f2e0511d241 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/update.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/update.nix @@ -3,5 +3,5 @@ }@args: callPackage ../../browsers/firefox/update.nix ({ - baseUrl = "http://archive.mozilla.org/pub/thunderbird/releases/"; + baseUrl = "https://archive.mozilla.org/pub/thunderbird/releases/"; } // (builtins.removeAttrs args ["callPackage"])) diff --git a/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix b/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix index 3e09dbc9b8786..55b19785e448a 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 = "235.240718.0"; src = fetchurl { url = "https://github.com/tutao/tutanota/releases/download/tutanota-desktop-release-${version}/tutanota-desktop-linux.AppImage"; - hash = "sha256-pgRqlaUbEDEAd4frooSloeiNEX02VESPhqIzRIuQshI="; + hash = "sha256-Pycz05cwse2SUvJlaCXMA1/Trdt6ZGOJK3NRSPb6/VM="; }; extraPkgs = pkgs: [ pkgs.libsecret ]; diff --git a/pkgs/applications/networking/mhost/default.nix b/pkgs/applications/networking/mhost/default.nix index 435f58d068502..777ea44dc7bdb 100644 --- a/pkgs/applications/networking/mhost/default.nix +++ b/pkgs/applications/networking/mhost/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-d2JYT/eJaGm8pfmjsuSZiQxlzcsypFH53F/9joW0J6I="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security SystemConfiguration ]; diff --git a/pkgs/applications/networking/misc/zammad/default.nix b/pkgs/applications/networking/misc/zammad/default.nix index 065749554ea10..4a37b4737c610 100644 --- a/pkgs/applications/networking/misc/zammad/default.nix +++ b/pkgs/applications/networking/misc/zammad/default.nix @@ -74,7 +74,7 @@ let ]; gemConfig = defaultGemConfig // { pg = attrs: { - buildFlags = [ "--with-pg-config=${postgresql}/bin/pg_config" ]; + buildFlags = [ "--with-pg-config=${lib.getDev postgresql}/bin/pg_config" ]; }; rszr = attrs: { buildInputs = [ imlib2 imlib2.dev ]; diff --git a/pkgs/applications/networking/mkchromecast/default.nix b/pkgs/applications/networking/mkchromecast/default.nix index f6364f5ba5726..b0df1210b318b 100644 --- a/pkgs/applications/networking/mkchromecast/default.nix +++ b/pkgs/applications/networking/mkchromecast/default.nix @@ -25,7 +25,7 @@ let packages = [ nodejs ffmpeg youtube-dl -] ++ lib.optionals stdenv.isLinux [ pulseaudio ]; +] ++ lib.optionals stdenv.hostPlatform.isLinux [ pulseaudio ]; in python3Packages.buildPythonApplication { @@ -39,7 +39,7 @@ python3Packages.buildPythonApplication { sha256 = "sha256-dxsIcBPrZaXlsfzOEXhYj2qoK5LRducJG2ggMrMMl9Y="; }; - buildInputs = lib.optional stdenv.isLinux qtwayland; + buildInputs = lib.optional stdenv.hostPlatform.isLinux qtwayland; propagatedBuildInputs = with python3Packages; ([ pychromecast psutil @@ -72,7 +72,7 @@ python3Packages.buildPythonApplication { postInstall = '' substituteInPlace $out/${python3Packages.python.sitePackages}/mkchromecast/video.py \ --replace '/usr/share/mkchromecast/nodejs/' '${placeholder "out"}/share/mkchromecast/nodejs/' - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' install -Dm 755 -t $out/bin bin/audiodevice substituteInPlace $out/${python3Packages.python.sitePackages}/mkchromecast/audio_devices.py \ --replace './bin/audiodevice' '${placeholder "out"}/bin/audiodevice' diff --git a/pkgs/applications/networking/mpop/default.nix b/pkgs/applications/networking/mpop/default.nix index efc782e832833..5e41ef5d2a91a 100644 --- a/pkgs/applications/networking/mpop/default.nix +++ b/pkgs/applications/networking/mpop/default.nix @@ -16,11 +16,11 @@ assert lib.assertOneOf "sslLibrary" sslLibrary ["gnutls" "openssl" "no"]; stdenv.mkDerivation rec { pname = "mpop"; - version = "1.4.18"; + version = "1.4.20"; src = fetchurl { url = "https://marlam.de/${pname}/releases/${pname}-${version}.tar.xz"; - sha256 = "sha256-YJmVAYT30JSngtHnq5gzc28SMI00pUSlm0aoRx2fhbc="; + sha256 = "sha256-Ncx94X492spHQ4Y0ZEiPjIKoOsGzdk/d1/QjiBQ1v0s="; }; nativeBuildInputs = [ @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ]; buildInputs = - lib.optional stdenv.isDarwin Security + lib.optional stdenv.hostPlatform.isDarwin Security ++ lib.optional gsaslSupport gsasl ++ lib.optional idnSupport libidn ++ lib.optional (sslLibrary == "gnutls") gnutls @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { (lib.withFeature idnSupport "idn") (lib.withFeature gsaslSupport "gsasl") "--with-tls=${sslLibrary}" - ] ++ lib.optional stdenv.isDarwin "--with-macosx-keyring"; + ] ++ lib.optional stdenv.hostPlatform.isDarwin "--with-macosx-keyring"; meta = with lib;{ description = "POP3 mail retrieval agent"; diff --git a/pkgs/applications/networking/msmtp/default.nix b/pkgs/applications/networking/msmtp/default.nix index e68e8f8fe96b9..15cd369ae335d 100644 --- a/pkgs/applications/networking/msmtp/default.nix +++ b/pkgs/applications/networking/msmtp/default.nix @@ -25,13 +25,13 @@ let inherit (lib) getBin getExe optionals; - version = "1.8.22"; + version = "1.8.25"; src = fetchFromGitHub { owner = "marlam"; - repo = "msmtp-mirror"; + repo = "msmtp"; rev = "msmtp-${version}"; - hash = "sha256-Jt/uvGBrYYr6ua6LVPiP0nuRiIkxBJASdgHBNHivzxQ="; + hash = "sha256-UZKUpF/ZwYPM2rPDudL1O8e8LguKJh9sTcJRT3vgsf4="; }; meta = with lib; { @@ -48,10 +48,10 @@ let inherit version src meta; configureFlags = [ "--sysconfdir=/etc" "--with-libgsasl" ] - ++ optionals stdenv.isDarwin [ "--with-macosx-keyring" ]; + ++ optionals stdenv.hostPlatform.isDarwin [ "--with-macosx-keyring" ]; buildInputs = [ gnutls gsasl libidn2 ] - ++ optionals stdenv.isDarwin [ Security ] + ++ optionals stdenv.hostPlatform.isDarwin [ Security ] ++ optionals withKeyring [ libsecret ]; nativeBuildInputs = [ autoreconfHook pkg-config texinfo ]; @@ -68,7 +68,10 @@ let pname = "msmtp-scripts"; inherit version src meta; - patches = [ ./paths.patch ]; + patches = [ + ./msmtpq-remove-binary-check.patch + ./msmtpq-systemd-logging.patch + ]; postPatch = '' substituteInPlace scripts/msmtpq/msmtpq \ diff --git a/pkgs/applications/networking/msmtp/msmtpq-remove-binary-check.patch b/pkgs/applications/networking/msmtp/msmtpq-remove-binary-check.patch new file mode 100644 index 0000000000000..045f71c22a9f3 --- /dev/null +++ b/pkgs/applications/networking/msmtp/msmtpq-remove-binary-check.patch @@ -0,0 +1,13 @@ +diff --git a/scripts/msmtpq/msmtpq b/scripts/msmtpq/msmtpq +index bcb384e..9622e47 100755 +--- a/scripts/msmtpq/msmtpq ++++ b/scripts/msmtpq/msmtpq +@@ -60,8 +60,6 @@ err() { dsp '' "$@" '' ; exit 1 ; } + ## export the location of the msmtp executable before running this script (no quotes !!) + ## e.g. ( export MSMTP=/path/to/msmtp ) + MSMTP="${MSMTP:-msmtp}" +-"$MSMTP" --version >/dev/null 2>&1 || \ +- log_later -e 1 "msmtpq : can't run the msmtp executable [ $MSMTP ]" # if not found - complain ; quit + ## + ## set the queue var to the location of the msmtp queue directory + ## if the queue dir doesn't yet exist, create it (0700) diff --git a/pkgs/applications/networking/msmtp/msmtpq-systemd-logging.patch b/pkgs/applications/networking/msmtp/msmtpq-systemd-logging.patch new file mode 100644 index 0000000000000..a9db3e6458082 --- /dev/null +++ b/pkgs/applications/networking/msmtp/msmtpq-systemd-logging.patch @@ -0,0 +1,41 @@ +diff --git a/scripts/msmtpq/msmtpq b/scripts/msmtpq/msmtpq +index bcb384e..dbaf1b5 100755 +--- a/scripts/msmtpq/msmtpq ++++ b/scripts/msmtpq/msmtpq +@@ -92,6 +92,8 @@ if [ ! -v MSMTPQ_LOG ] ; then + fi + fi + [ -d "$(dirname "$MSMTPQ_LOG")" ] || mkdir -p "$(dirname "$MSMTPQ_LOG")" ++ ++JOURNAL=@journal@ + ## ====================================================================================== + + ## msmtpq can use the following environment variables : +@@ -144,6 +146,7 @@ on_exit() { # unlock the queue on exit if the lock was + ## display msg to user, as well + ## + log() { ++ local NAME=msmtpq + local ARG RC PFX + PFX="$('date' +'%Y %d %b %H:%M:%S')" + # time stamp prefix - "2008 13 Mar 03:59:45 " +@@ -161,10 +164,19 @@ log() { + done + fi + ++ if [ "$JOURNAL" = "Y" ]; then ++ for ARG; do ++ [ -n "$ARG" ] && ++ echo "$ARG" | systemd-cat -t "$NAME" -p info ++ done ++ fi ++ + if [ -n "$RC" ] ; then # an error ; leave w/error return + [ -n "$LKD" ] && lock_queue -u # unlock here (if locked) + [ -n "$MSMTPQ_LOG" ] && \ + echo " exit code = $RC" >> "$MSMTPQ_LOG" # logging ok ; send exit code to log ++ [ "$JOURNAL" = "Y" ] && \ ++ echo "exit code= $RC" | systemd-cat -t "$NAME" -p emerg + exit "$RC" # exit w/return code + fi + } diff --git a/pkgs/applications/networking/msmtp/paths.patch b/pkgs/applications/networking/msmtp/paths.patch deleted file mode 100644 index 9298519e4da3a..0000000000000 --- a/pkgs/applications/networking/msmtp/paths.patch +++ /dev/null @@ -1,64 +0,0 @@ -diff --git a/scripts/msmtpq/msmtpq b/scripts/msmtpq/msmtpq -index d8b4039..1f2a7b5 100755 ---- a/scripts/msmtpq/msmtpq -+++ b/scripts/msmtpq/msmtpq -@@ -60,8 +60,8 @@ err() { dsp '' "$@" '' ; exit 1 ; } - ## e.g. ( export MSMTP=/path/to/msmtp ) - if [ "$MSMTP" = "" ] ; then # If MSMTP is unset or empty... - MSMTP=msmtp --elif [ ! -x "$MSMTP" ] ; then -- log -e 1 "msmtpq : can't find the msmtp executable [ $MSMTP ]" # if not found - complain ; quit -+# elif [ ! -x "$MSMTP" ] ; then -+# log -e 1 "msmtpq : can't find the msmtp executable [ $MSMTP ]" # if not found - complain ; quit - fi - ## - ## set the queue var to the location of the msmtp queue directory -@@ -71,7 +71,7 @@ fi - ## ( chmod 0700 msmtp.queue ) - ## - ## the queue dir - export this variable to reflect where you'd like it to be (no quotes !!) --Q=${Q:-~/.msmtp.queue} -+Q=${MSMTP_QUEUE:-~/.msmtp.queue} - [ -d "$Q" ] || mkdir -m 0700 -p "$Q" || \ - err '' "msmtpq : can't find or create msmtp queue directory [ $Q ]" '' # if not present - complain ; quit - ## -@@ -85,8 +85,10 @@ Q=${Q:-~/.msmtp.queue} - ## - ## the queue log file - export this variable to change where logs are stored (but no quotes !!) - ## Set it to "" (empty string) to disable logging. --[ -v LOG ] || LOG=~/log/msmtp.queue.log -+LOG=${MSMTP_LOG:-~/log/msmtp.queue.log} - [ -d "$(dirname "$LOG")" ] || mkdir -p "$(dirname "$LOG")" -+ -+JOURNAL=@journal@ - ## ====================================================================================== - - ## msmtpq can use the following environment variables : -@@ -139,6 +141,7 @@ on_exit() { # unlock the queue on exit if the lock was - ## display msg to user, as well - ## - log() { -+ local NAME=msmtpq - local ARG RC PFX - PFX="$('date' +'%Y %d %b %H:%M:%S')" - # time stamp prefix - "2008 13 Mar 03:59:45 " -@@ -156,10 +159,19 @@ log() { - done - fi - -+ if [ "$JOURNAL" = "Y" ]; then -+ for ARG; do -+ [ -n "$ARG" ] && -+ echo "$ARG" | systemd-cat -t "$NAME" -p info -+ done -+ fi -+ - if [ -n "$RC" ] ; then # an error ; leave w/error return - [ -n "$LKD" ] && lock_queue -u # unlock here (if locked) - [ -n "$LOG" ] && \ - echo " exit code = $RC" >> "$LOG" # logging ok ; send exit code to log -+ [ "$JOURNAL" = "Y" ] && \ -+ echo "exit code= $RC" | systemd-cat -t "$NAME" -p emerg - exit "$RC" # exit w/return code - fi - } diff --git a/pkgs/applications/networking/mujmap/default.nix b/pkgs/applications/networking/mujmap/default.nix index 60f49163be73b..8ee04ef19607a 100644 --- a/pkgs/applications/networking/mujmap/default.nix +++ b/pkgs/applications/networking/mujmap/default.nix @@ -17,11 +17,11 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-Qb9fEPQrdn+Ek9bdOMfaPIxlGGpQ9RfQZOeeqoOf17E="; }; - cargoSha256 = "sha256-nnAYjutjxtEpDNoWTnlESDO4Haz14wZxY4gdyzdLgBU="; + cargoHash = "sha256-nnAYjutjxtEpDNoWTnlESDO4Haz14wZxY4gdyzdLgBU="; buildInputs = [ notmuch - ] ++ lib.optional stdenv.isDarwin Security; + ] ++ lib.optional stdenv.hostPlatform.isDarwin Security; meta = with lib; { description = "JMAP integration for notmuch mail"; diff --git a/pkgs/applications/networking/mullvad-vpn/default.nix b/pkgs/applications/networking/mullvad-vpn/default.nix index cc490ee182aa2..2499600297719 100644 --- a/pkgs/applications/networking/mullvad-vpn/default.nix +++ b/pkgs/applications/networking/mullvad-vpn/default.nix @@ -64,7 +64,7 @@ let systemd ]; - version = "2024.3"; + version = "2024.4"; selectSystem = attrs: attrs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); @@ -74,8 +74,8 @@ let }; hash = selectSystem { - x86_64-linux = "sha256-LfuLBYGHlVEcVpHSdRSAEf9D7QChRd/fhx8EoCBZbSc="; - aarch64-linux = "sha256-7uUgewZ9KVLyMUax6u0R6ZN1YS3L4c43meVqJQD77lA="; + x86_64-linux = "sha256-bsXlOzqGr37AZhEij68Fy2/3Lk50J7A3jHV0re5U6j0="; + aarch64-linux = "sha256-6OBCqOnSkXBntFGxXicPU7GSb9+a5WN4rYExgDa08/I="; }; in diff --git a/pkgs/applications/networking/mullvad/Cargo.lock b/pkgs/applications/networking/mullvad/Cargo.lock index fb0d7780c63f2..1df9eeb250f0d 100644 --- a/pkgs/applications/networking/mullvad/Cargo.lock +++ b/pkgs/applications/networking/mullvad/Cargo.lock @@ -35,9 +35,9 @@ dependencies = [ [[package]] name = "aes" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2" +checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" dependencies = [ "cfg-if", "cipher", @@ -60,9 +60,9 @@ dependencies = [ [[package]] name = "ahash" -version = "0.8.8" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42cd52102d3df161c77a887b608d7a4897d7cc112886a9537b738a887a03aaff" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ "cfg-if", "once_cell", @@ -72,9 +72,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.0.5" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c378d78423fdad8089616f827526ee33c19f2fddbd5de1629152c9593ba4783" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ "memchr", ] @@ -114,9 +114,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.11" +version = "0.6.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e2e1ebcb11de5c03c67de28a7df593d32191b44939c482e97702baaaa6ab6a5" +checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" dependencies = [ "anstyle", "anstyle-parse", @@ -128,26 +128,26 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.2" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15c4c2c83f81532e5845a733998b6971faca23490340a418e9b72a3ec9de12ea" +checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" [[package]] name = "anstyle-parse" -version = "0.2.1" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333" +checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.0.0" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -162,15 +162,15 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.75" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" +checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519" [[package]] name = "arc-swap" -version = "1.6.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6" +checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" [[package]] name = "arrayref" @@ -185,17 +185,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" [[package]] -name = "async-recursion" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30c5ef0ede93efbf733c1a727f3b6b5a1060bbedd5600183e66f6e4be4af0ec5" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.51", -] - -[[package]] name = "async-stream" version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -214,25 +203,25 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.51", + "syn 2.0.60", ] [[package]] name = "async-trait" -version = "0.1.73" +version = "0.1.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" +checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" dependencies = [ "proc-macro2", "quote", - "syn 2.0.51", + "syn 2.0.60", ] [[package]] name = "autocfg" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" [[package]] name = "axum" @@ -245,9 +234,9 @@ dependencies = [ "bitflags 1.3.2", "bytes", "futures-util", - "http", - "http-body", - "hyper", + "http 0.2.12", + "http-body 0.4.6", + "hyper 0.14.28", "itoa", "matchit", "memchr", @@ -271,8 +260,8 @@ dependencies = [ "async-trait", "bytes", "futures-util", - "http", - "http-body", + "http 0.2.12", + "http-body 0.4.6", "mime", "rustversion", "tower-layer", @@ -281,9 +270,9 @@ dependencies = [ [[package]] name = "backtrace" -version = "0.3.69" +version = "0.3.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" dependencies = [ "addr2line", "cc", @@ -296,21 +285,21 @@ dependencies = [ [[package]] name = "base16ct" -version = "0.1.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349a06037c7bf932dd7e7d1f653678b2038b9ad46a74102f1fc7bd7872678cce" +checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" [[package]] name = "base64" -version = "0.13.1" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" [[package]] name = "base64" -version = "0.21.3" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "414dcefbc63d77c526a76b3afcf6fbb9b5e2791c19c3aa2297733208750c6e53" +checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51" [[package]] name = "base64ct" @@ -341,22 +330,21 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" +checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" [[package]] name = "blake3" -version = "1.4.1" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "199c42ab6972d92c9f8995f086273d25c42fc0f7b2a1fcefba465c1352d25ba5" +checksum = "30cca6d3674597c30ddf2c587bf8d9d65c9a84d2326d941cc79c9842dfe0ef52" dependencies = [ "arrayref", "arrayvec", "cc", "cfg-if", "constant_time_eq", - "digest", ] [[package]] @@ -370,9 +358,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.13.0" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "byte_string" @@ -382,15 +370,25 @@ checksum = "11aade7a05aa8c3a351cedc44c3fc45806430543382fcc4743a9b757a2a0b4ed" [[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 = "bytes" -version = "1.5.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" +checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" + +[[package]] +name = "camellia" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3264e2574e9ef2b53ce6f536dea83a69ac0bc600b762d1523ff83fe07230ce30" +dependencies = [ + "byteorder", + "cipher", +] [[package]] name = "cbindgen" @@ -398,7 +396,7 @@ version = "0.24.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4b922faaf31122819ec80c4047cc684c6979a087366c069611e33649bf98e18d" dependencies = [ - "heck", + "heck 0.4.1", "indexmap 1.9.3", "log", "proc-macro2", @@ -412,12 +410,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.83" +version = "1.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" -dependencies = [ - "libc", -] +checksum = "d32a725bc159af97c3e629873bb9f88fb8cf8a4867175f76dc987815ea07c83b" [[package]] name = "cesu8" @@ -463,15 +458,15 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.30" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "defd4e7873dbddba6c7c91e199c7fcb946abc4a6a4ac3195400bcfb01b5de877" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" dependencies = [ "android-tzdata", "iana-time-zone", "num-traits", "serde", - "windows-targets 0.48.5", + "windows-targets 0.52.5", ] [[package]] @@ -487,9 +482,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.18" +version = "4.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e578d6ec4194633722ccf9544794b71b1385c3c027efe0c55db226fc880865c" +checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0" dependencies = [ "clap_builder", "clap_derive", @@ -497,42 +492,42 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.18" +version = "4.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4df4df40ec50c46000231c914968278b1eb05098cf8f1b3a518a95030e71d1c7" +checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" dependencies = [ "anstream", "anstyle", "clap_lex", - "strsim 0.10.0", + "strsim 0.11.1", ] [[package]] name = "clap_complete" -version = "4.4.8" +version = "4.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaf7dcb7c21d8ca1a2482ee0f1d341f437c9a7af6ca6da359dc5e1b164e98215" +checksum = "dd79504325bf38b10165b02e89b4347300f855f273c4cb30c4a3209e6583275e" dependencies = [ "clap", ] [[package]] name = "clap_derive" -version = "4.4.7" +version = "4.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" +checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64" dependencies = [ - "heck", + "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.51", + "syn 2.0.60", ] [[package]] name = "clap_lex" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" +checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" [[package]] name = "classic-mceliece-rust" @@ -564,9 +559,9 @@ dependencies = [ [[package]] name = "combine" -version = "4.6.6" +version = "4.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4" +checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" dependencies = [ "bytes", "memchr", @@ -574,9 +569,9 @@ dependencies = [ [[package]] name = "const-oid" -version = "0.9.5" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28c122c3980598d243d63d9a704629a2d748d101f278052ff068be5a4423ab6f" +checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" [[package]] name = "constant_time_eq" @@ -586,9 +581,9 @@ checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" [[package]] name = "core-foundation" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" dependencies = [ "core-foundation-sys", "libc", @@ -596,9 +591,9 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.4" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "core2" @@ -611,9 +606,9 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.9" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" dependencies = [ "libc", ] @@ -629,28 +624,24 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.8" +version = "0.5.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" +checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95" dependencies = [ - "cfg-if", "crossbeam-utils", ] [[package]] name = "crossbeam-utils" -version = "0.8.16" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" -dependencies = [ - "cfg-if", -] +checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" [[package]] name = "crypto-bigint" -version = "0.4.9" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef2b4b23cddf68b89b8f8069890e8c270d54e2d5fe1b143820234805e4cb17ef" +checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76" dependencies = [ "generic-array", "rand_core 0.6.4", @@ -680,12 +671,12 @@ dependencies = [ [[package]] name = "ctrlc" -version = "3.4.1" +version = "3.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82e95fbd621905b854affdc67943b043a0fbb6ed7385fd5a25650d19a8a6cfdf" +checksum = "672465ae37dc1bc6380a6547a8883d5dd397b0f1faaad4f265726cc7042a5345" dependencies = [ - "nix 0.27.1", - "windows-sys 0.48.0", + "nix 0.28.0", + "windows-sys 0.52.0", ] [[package]] @@ -706,13 +697,13 @@ dependencies = [ [[package]] name = "curve25519-dalek-derive" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83fdaf97f4804dcebfa5862639bc9ce4121e82140bec2a987ac5140294865b5b" +checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.51", + "syn 2.0.60", ] [[package]] @@ -763,7 +754,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ "cfg-if", - "hashbrown 0.14.0", + "hashbrown 0.14.3", "lock_api", "once_cell", "parking_lot_core", @@ -771,9 +762,9 @@ dependencies = [ [[package]] name = "data-encoding" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" +checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" [[package]] name = "dbus" @@ -788,9 +779,9 @@ dependencies = [ [[package]] name = "der" -version = "0.6.1" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1a467a65c5e759bce6e65eaf91cc29f466cdc57cb65777bd646872a8a1fd4de" +checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0" dependencies = [ "const-oid", "zeroize", @@ -798,9 +789,12 @@ dependencies = [ [[package]] name = "deranged" -version = "0.3.8" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +dependencies = [ + "powerfmt", +] [[package]] name = "derive-try-from-primitive" @@ -872,9 +866,9 @@ dependencies = [ [[package]] name = "duct" -version = "0.13.6" +version = "0.13.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37ae3fc31835f74c2a7ceda3aeede378b0ae2e74c8f1c36559fcc9ae2a4e7d3e" +checksum = "e4ab5718d1224b63252cd0c6f74f6480f9ffeb117438a2e0f5cf6d9a4798929c" dependencies = [ "libc", "once_cell", @@ -884,9 +878,9 @@ dependencies = [ [[package]] name = "ecdsa" -version = "0.14.8" +version = "0.16.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "413301934810f597c1d19ca71c8710e99a3f1ba28a0d2ebc01551a2daeea3c5c" +checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca" dependencies = [ "der", "elliptic-curve", @@ -895,30 +889,32 @@ dependencies = [ [[package]] name = "ed25519" -version = "1.5.3" +version = "2.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91cff35c70bba8a626e3185d8cd48cc11b5437e1a5bcd15b9b5fa3c64b6dfee7" +checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53" dependencies = [ + "pkcs8", "signature", ] [[package]] name = "either" -version = "1.9.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" +checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2" [[package]] name = "elliptic-curve" -version = "0.12.3" +version = "0.13.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7bb888ab5300a19b8e5bceef25ac745ad065f3c9f7efc6de1b91958110891d3" +checksum = "b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47" dependencies = [ "base16ct", "crypto-bigint", - "der", "digest", + "ff", "generic-array", + "group", "rand_core 0.6.4", "sec1", "subtle", @@ -931,10 +927,10 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5ffccbb6966c05b32ef8fbac435df276c4ae4d3dc55a8cd0eb9745e6c12f546a" dependencies = [ - "heck", + "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.51", + "syn 2.0.60", ] [[package]] @@ -949,9 +945,9 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.10.0" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" +checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580" dependencies = [ "humantime", "is-terminal", @@ -1029,9 +1025,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.0.0" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" +checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984" [[package]] name = "fern" @@ -1044,21 +1040,31 @@ dependencies = [ ] [[package]] +name = "ff" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449" +dependencies = [ + "rand_core 0.6.4", + "subtle", +] + +[[package]] name = "fiat-crypto" -version = "0.2.1" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0870c84016d4b481be5c9f323c24f65e31e901ae618f0e80f4308fb00de1d2d" +checksum = "38793c55593b33412e3ae40c2c9781ffaa6f438f6f8c10f24e71846fbd7ae01e" [[package]] name = "filetime" -version = "0.2.22" +version = "0.2.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0" +checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.3.5", - "windows-sys 0.48.0", + "redox_syscall", + "windows-sys 0.52.0", ] [[package]] @@ -1075,9 +1081,9 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "form_urlencoded" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" dependencies = [ "percent-encoding", ] @@ -1093,9 +1099,9 @@ dependencies = [ [[package]] name = "futures" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" dependencies = [ "futures-channel", "futures-core", @@ -1108,9 +1114,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" dependencies = [ "futures-core", "futures-sink", @@ -1118,15 +1124,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" [[package]] name = "futures-executor" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" dependencies = [ "futures-core", "futures-task", @@ -1135,38 +1141,38 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" [[package]] name = "futures-macro" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.51", + "syn 2.0.60", ] [[package]] name = "futures-sink" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" [[package]] name = "futures-task" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" [[package]] name = "futures-util" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" dependencies = [ "futures-channel", "futures-core", @@ -1188,6 +1194,7 @@ checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" dependencies = [ "typenum", "version_check", + "zeroize", ] [[package]] @@ -1203,9 +1210,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.10" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" +checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c" dependencies = [ "cfg-if", "libc", @@ -1214,9 +1221,9 @@ dependencies = [ [[package]] name = "ghash" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d930750de5717d2dd0b8c0d42c076c0e884c81a73e6cab859bbd2339c71e3e40" +checksum = "f0d8a4362ccb29cb0b265253fb0a2728f592895ee6854fd9bc13f2ffda266ff1" dependencies = [ "opaque-debug", "polyval", @@ -1224,9 +1231,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.28.0" +version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" [[package]] name = "glob" @@ -1235,6 +1242,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] +name = "group" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" +dependencies = [ + "ff", + "rand_core 0.6.4", + "subtle", +] + +[[package]] name = "h2" version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1245,11 +1263,30 @@ dependencies = [ "futures-core", "futures-sink", "futures-util", - "http", - "indexmap 2.0.0", + "http 0.2.12", + "indexmap 2.2.6", "slab", "tokio", - "tokio-util", + "tokio-util 0.7.10", + "tracing", +] + +[[package]] +name = "h2" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "816ec7294445779408f36fe57bc5b7fc1cf59664059096c65f905c1c61f58069" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http 1.1.0", + "indexmap 2.2.6", + "slab", + "tokio", + "tokio-util 0.7.10", "tracing", ] @@ -1270,9 +1307,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.14.0" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" [[package]] name = "heck" @@ -1281,10 +1318,16 @@ 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.2" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" [[package]] name = "hex" @@ -1294,10 +1337,10 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "hickory-proto" -version = "0.24.0" -source = "git+https://github.com/mullvad/hickory-dns?rev=9e8f8c67fbcb6d2985503027362a3fb022529802#9e8f8c67fbcb6d2985503027362a3fb022529802" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07698b8420e2f0d6447a436ba999ec85d8fbf2a398bbd737b82cac4a2e96e512" dependencies = [ - "async-recursion", "async-trait", "cfg-if", "data-encoding", @@ -1305,7 +1348,7 @@ dependencies = [ "futures-channel", "futures-io", "futures-util", - "idna 0.5.0", + "idna 0.4.0", "ipnet", "once_cell", "rand 0.8.5", @@ -1319,8 +1362,9 @@ dependencies = [ [[package]] name = "hickory-resolver" -version = "0.24.0" -source = "git+https://github.com/mullvad/hickory-dns?rev=9e8f8c67fbcb6d2985503027362a3fb022529802#9e8f8c67fbcb6d2985503027362a3fb022529802" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28757f23aa75c98f254cf0405e6d8c25b831b32921b050a66692427679b1f243" dependencies = [ "cfg-if", "futures-util", @@ -1340,8 +1384,9 @@ dependencies = [ [[package]] name = "hickory-server" -version = "0.24.0" -source = "git+https://github.com/mullvad/hickory-dns?rev=9e8f8c67fbcb6d2985503027362a3fb022529802#9e8f8c67fbcb6d2985503027362a3fb022529802" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9be0e43c556b9b3fdb6c7c71a9a32153a2275d02419e3de809e520bfcfe40c37" dependencies = [ "async-trait", "bytes", @@ -1350,21 +1395,19 @@ dependencies = [ "futures-util", "hickory-proto", "hickory-resolver", - "ipnet", - "prefix-trie", "serde", "thiserror", "time", "tokio", - "tokio-util", + "tokio-util 0.7.10", "tracing", ] [[package]] name = "hkdf" -version = "0.12.3" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "791a029f6b9fc27657f6f188ec6e5e43f6911f6f878e0dc5501396e09809d437" +checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7" dependencies = [ "hmac", ] @@ -1380,11 +1423,11 @@ dependencies = [ [[package]] name = "home" -version = "0.5.5" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" +checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -1400,9 +1443,9 @@ dependencies = [ [[package]] name = "htmlize" -version = "1.0.3" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6507eaed4d57bf58786aabd4ebc91a7d702d1fdace5ccc6479de1aee666765dd" +checksum = "4e81e415f6d22240930e82ae0f541b2dd494ca37daaf10c1d7b32546f3b1159f" dependencies = [ "memchr", "paste", @@ -1413,9 +1456,20 @@ dependencies = [ [[package]] name = "http" -version = "0.2.9" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "http" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" dependencies = [ "bytes", "fnv", @@ -1424,12 +1478,35 @@ dependencies = [ [[package]] name = "http-body" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" +checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" dependencies = [ "bytes", - "http", + "http 0.2.12", + "pin-project-lite", +] + +[[package]] +name = "http-body" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" +dependencies = [ + "bytes", + "http 1.1.0", +] + +[[package]] +name = "http-body-util" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0475f8b2ac86659c21b64320d5d653f9efe42acd2a4e560073ec61a155a34f1d" +dependencies = [ + "bytes", + "futures-core", + "http 1.1.0", + "http-body 1.0.0", "pin-project-lite", ] @@ -1453,22 +1530,22 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.27" +version = "0.14.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" +checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" dependencies = [ "bytes", "futures-channel", "futures-core", "futures-util", - "h2", - "http", - "http-body", + "h2 0.3.26", + "http 0.2.12", + "http-body 0.4.6", "httparse", "httpdate", "itoa", "pin-project-lite", - "socket2 0.4.9", + "socket2", "tokio", "tower-service", "tracing", @@ -1476,12 +1553,33 @@ dependencies = [ ] [[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 0.4.4", + "http 1.1.0", + "http-body 1.0.0", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "smallvec", + "tokio", + "want", +] + +[[package]] name = "hyper-timeout" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" dependencies = [ - "hyper", + "hyper 0.14.28", "pin-project-lite", "tokio", "tokio-io-timeout", @@ -1489,16 +1587,16 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.57" +version = "0.1.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows", + "windows-core", ] [[package]] @@ -1548,12 +1646,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.0.0" +version = "2.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", - "hashbrown 0.14.0", + "hashbrown 0.14.3", ] [[package]] @@ -1610,7 +1708,7 @@ version = "0.0.0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.51", + "syn 2.0.60", ] [[package]] @@ -1625,7 +1723,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f" dependencies = [ - "socket2 0.5.3", + "socket2", "widestring", "windows-sys 0.48.0", "winreg 0.50.0", @@ -1633,12 +1731,9 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.8.0" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6" -dependencies = [ - "serde", -] +checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" [[package]] name = "ipnetwork" @@ -1689,9 +1784,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.9" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "jni" @@ -1731,7 +1826,7 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "002f4dfe6d97ae88c33f3489c0d31ffc6f81d9a492de98ff113b127d73bafff8" dependencies = [ - "heck", + "heck 0.4.1", "proc-macro2", "quote", "syn 1.0.109", @@ -1739,9 +1834,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.64" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" dependencies = [ "wasm-bindgen", ] @@ -1759,9 +1854,9 @@ dependencies = [ [[package]] name = "keccak" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f6d5ed8676d904364de097082f4e7d240b571b67989ced0240f08b7f966f940" +checksum = "ecc2af9a1119c51f12a14607e783cb977bde58bc069ff0c3da1095e635d70654" dependencies = [ "cpufeatures", ] @@ -1832,12 +1927,32 @@ dependencies = [ ] [[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 = "linked-hash-map" version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1851,9 +1966,9 @@ checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" [[package]] name = "lock_api" -version = "0.4.10" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" dependencies = [ "autocfg", "scopeguard", @@ -1861,9 +1976,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.20" +version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" [[package]] name = "log-panics" @@ -1906,40 +2021,41 @@ checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4" [[package]] name = "matchit" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed1202b2a6f884ae56f04cff409ab315c5ce26b5e58d7412e484f01fd52f52ef" +checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" [[package]] name = "maybenot" -version = "1.0.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cc2e64fe3f5fb1e247110a9a408449eff2259cc272cf57bad6f161e801ac962" +checksum = "94ed977e86fc65a7ffae967a6a973e6f7a90b5d747ebd755703d5718804f7c16" dependencies = [ "byteorder", "hex", "libflate", "rand 0.8.5", "rand_distr", - "ring", + "ring 0.16.20", "serde", "simple-error", ] [[package]] name = "md-5" -version = "0.10.5" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6365506850d44bff6e2fbcb5176cf63650e48bd45ef2fe2665ae1570e0f4b9ca" +checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" dependencies = [ + "cfg-if", "digest", ] [[package]] name = "memchr" -version = "2.6.3" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" +checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" [[package]] name = "memoffset" @@ -1952,9 +2068,9 @@ dependencies = [ [[package]] name = "memoffset" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" dependencies = [ "autocfg", ] @@ -1967,9 +2083,9 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] name = "miniz_oxide" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" dependencies = [ "adler", ] @@ -2014,8 +2130,8 @@ dependencies = [ "cbindgen", "chrono", "futures", - "http", - "hyper", + "http 0.2.12", + "hyper 0.14.28", "ipnetwork", "libc", "log", @@ -2052,7 +2168,7 @@ dependencies = [ "talpid-types", "thiserror", "tokio", - "windows-sys 0.48.0", + "windows-sys 0.52.0", "winres", ] @@ -2096,7 +2212,7 @@ dependencies = [ "tokio-stream", "winapi", "windows-service", - "windows-sys 0.48.0", + "windows-sys 0.52.0", "winres", ] @@ -2178,7 +2294,7 @@ dependencies = [ "once_cell", "thiserror", "widestring", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -2188,7 +2304,7 @@ dependencies = [ "clap", "dirs", "duct", - "env_logger 0.10.0", + "env_logger 0.10.2", "log", "mullvad-api", "mullvad-paths", @@ -2200,7 +2316,7 @@ dependencies = [ "thiserror", "tokio", "uuid", - "windows-sys 0.48.0", + "windows-sys 0.52.0", "winres", ] @@ -2227,7 +2343,7 @@ name = "mullvad-setup" version = "0.0.0" dependencies = [ "clap", - "env_logger 0.10.0", + "env_logger 0.10.2", "mullvad-api", "mullvad-daemon", "mullvad-management-interface", @@ -2250,7 +2366,6 @@ dependencies = [ "clap", "intersection-derive", "ipnetwork", - "jnix", "log", "once_cell", "regex", @@ -2269,9 +2384,9 @@ dependencies = [ [[package]] name = "multimap" -version = "0.8.3" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" +checksum = "defc4c55412d89136f966bbb339008b474350e5e6e78d2714439c386b3137a03" [[package]] name = "natord" @@ -2334,9 +2449,9 @@ dependencies = [ [[package]] name = "netlink-sys" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6471bf08e7ac0135876a9581bf3217ef0333c191c128d34878079f42ee150411" +checksum = "416060d346fbaf1f23f9512963e3e878f1a78e707cb699ba9215761754244307" dependencies = [ "bytes", "futures", @@ -2394,26 +2509,15 @@ dependencies = [ [[package]] name = "nix" -version = "0.27.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" -dependencies = [ - "bitflags 2.4.0", - "cfg-if", - "libc", -] - -[[package]] -name = "nix" version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.5.0", "cfg-if", "cfg_aliases", "libc", - "memoffset 0.9.0", + "memoffset 0.9.1", ] [[package]] @@ -2428,7 +2532,7 @@ version = "6.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.5.0", "crossbeam-channel", "filetime", "fsevent-sys", @@ -2442,10 +2546,16 @@ dependencies = [ ] [[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + +[[package]] name = "num-traits" -version = "0.2.16" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" +checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" dependencies = [ "autocfg", "libm", @@ -2482,24 +2592,24 @@ dependencies = [ [[package]] name = "object" -version = "0.32.1" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" +checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" dependencies = [ "memchr", ] [[package]] name = "once_cell" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "opaque-debug" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" +checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" [[package]] name = "openvpn-plugin" @@ -2520,12 +2630,12 @@ checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" [[package]] name = "os_pipe" -version = "1.1.4" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ae859aa07428ca9a929b936690f8b12dc5f11dd8c6992a18ca93919f28bc177" +checksum = "57119c3b893986491ec9aa85056780d3a0f3cf4da7cc09dd3650dbd6c6738fb9" dependencies = [ "libc", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -2541,9 +2651,9 @@ dependencies = [ [[package]] name = "p256" -version = "0.11.1" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51f44edd08f51e2ade572f141051021c5af22677e42b7dd28a88155151c33594" +checksum = "c9863ad85fa8f4460f9c48cb909d38a0d689dba1f6f6988a5e3e0d31071bcd4b" dependencies = [ "ecdsa", "elliptic-curve", @@ -2551,12 +2661,13 @@ dependencies = [ [[package]] name = "p384" -version = "0.11.2" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfc8c5bf642dde52bb9e87c0ecd8ca5a76faac2eeed98dedb7c717997e1080aa" +checksum = "70786f51bcc69f6a4c0360e063a4cac5419ef7c5cd5b3c99ad70f3be5ba79209" dependencies = [ "ecdsa", "elliptic-curve", + "primeorder", ] [[package]] @@ -2585,13 +2696,13 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.8" +version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.3.5", + "redox_syscall", "smallvec", "windows-targets 0.48.5", ] @@ -2603,16 +2714,33 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" [[package]] +name = "pcap" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45f1686828a29fd8002fbf9c01506b4b2dd575c2305e1b884da3731abae8b9e0" +dependencies = [ + "bitflags 1.3.2", + "errno 0.2.8", + "futures", + "libc", + "libloading", + "pkg-config", + "regex", + "tokio", + "windows-sys 0.36.1", +] + +[[package]] name = "percent-encoding" -version = "2.3.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pest" -version = "2.7.3" +version = "2.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7a4d085fd991ac8d5b05a147b437791b4260b76326baf0fc60cf7c9c27ecd33" +checksum = "560131c633294438da9f7c4b08189194b20946c8274c6b9e38881a7874dc8ee8" dependencies = [ "memchr", "thiserror", @@ -2621,9 +2749,9 @@ dependencies = [ [[package]] name = "pest_derive" -version = "2.7.3" +version = "2.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bee7be22ce7918f641a33f08e3f43388c7656772244e2bbb2477f44cc9021a" +checksum = "26293c9193fbca7b1a3bf9b79dc1e388e927e6cacaa78b4a3ab705a1d3d41459" dependencies = [ "pest", "pest_generator", @@ -2631,22 +2759,22 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.7.3" +version = "2.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1511785c5e98d79a05e8a6bc34b4ac2168a0e3e92161862030ad84daa223141" +checksum = "3ec22af7d3fb470a85dd2ca96b7c577a1eb4ef6f1683a9fe9a8c16e136c04687" dependencies = [ "pest", "pest_meta", "proc-macro2", "quote", - "syn 2.0.51", + "syn 2.0.60", ] [[package]] name = "pest_meta" -version = "2.7.3" +version = "2.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b42f0394d3123e33353ca5e1e89092e533d2cc490389f2bd6131c43c634ebc5f" +checksum = "d7a240022f37c361ec1878d646fc5b7d7c4d28d5946e1a80ad5a7a4f4ca0bdcd" dependencies = [ "once_cell", "pest", @@ -2660,7 +2788,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" dependencies = [ "fixedbitset", - "indexmap 2.0.0", + "indexmap 2.2.6", ] [[package]] @@ -2717,29 +2845,29 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.1.3" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" +checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.3" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" +checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.51", + "syn 2.0.60", ] [[package]] name = "pin-project-lite" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" [[package]] name = "pin-utils" @@ -2749,9 +2877,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkcs8" -version = "0.9.0" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9eca2c590a5f85da82668fa685c09ce2888b9430e83299debf1f34b65fd4a4ba" +checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" dependencies = [ "der", "spki", @@ -2759,51 +2887,51 @@ dependencies = [ [[package]] name = "pkg-config" -version = "0.3.27" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] name = "platforms" -version = "3.1.2" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4503fa043bf02cee09a9582e9554b4c6403b2ef55e4612e96561d294419429f8" +checksum = "db23d408679286588f4d4644f965003d056e3dd5abcaaa938116871d7ce2fee7" [[package]] name = "pnet_base" -version = "0.33.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "872e46346144ebf35219ccaa64b1dffacd9c6f188cd7d012bd6977a2a838f42e" +checksum = "fe4cf6fb3ab38b68d01ab2aea03ed3d1132b4868fa4e06285f29f16da01c5f4c" dependencies = [ "no-std-net", ] [[package]] name = "pnet_macros" -version = "0.33.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a780e80005c2e463ec25a6e9f928630049a10b43945fea83207207d4a7606f4" +checksum = "688b17499eee04a0408aca0aa5cba5fc86401d7216de8a63fdf7a4c227871804" dependencies = [ "proc-macro2", "quote", "regex", - "syn 1.0.109", + "syn 2.0.60", ] [[package]] name = "pnet_macros_support" -version = "0.33.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6d932134f32efd7834eb8b16d42418dac87086347d1bc7d142370ef078582bc" +checksum = "eea925b72f4bd37f8eab0f221bbe4c78b63498350c983ffa9dd4bcde7e030f56" dependencies = [ "pnet_base", ] [[package]] name = "pnet_packet" -version = "0.33.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bde678bbd85cb1c2d99dc9fc596e57f03aa725f84f3168b0eaf33eeccb41706" +checksum = "a9a005825396b7fe7a38a8e288dbc342d5034dac80c15212436424fef8ea90ba" dependencies = [ "glob", "pnet_base", @@ -2824,9 +2952,9 @@ dependencies = [ [[package]] name = "polyval" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52cff9d1d4dee5fe6d03729099f4a310a41179e0a10dbf542039873f2e826fb" +checksum = "9d1fe60d06143b2430aa532c94cfe9e29783047f06c0d7fd359a9a51b729fa25" dependencies = [ "cfg-if", "cpufeatures", @@ -2835,6 +2963,12 @@ dependencies = [ ] [[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" @@ -2851,23 +2985,22 @@ dependencies = [ ] [[package]] -name = "prefix-trie" -version = "0.2.5" +name = "prettyplease" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85fe48f29e6e6fcf123d0d03d63028dbe4c4a738023d35d525df4882f4929418" +checksum = "5ac2cf0f2e4f42b49f5ffd07dae8d746508ef7526c13940e5f524012ae6c6550" dependencies = [ - "ipnet", - "num-traits", + "proc-macro2", + "syn 2.0.60", ] [[package]] -name = "prettyplease" -version = "0.2.15" +name = "primeorder" +version = "0.13.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d" +checksum = "353e1ca18966c16d9deb1c69278edbc5f194139612772bd9537af60ac231e1e6" dependencies = [ - "proc-macro2", - "syn 2.0.51", + "elliptic-curve", ] [[package]] @@ -2896,9 +3029,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.78" +version = "1.0.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" +checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba" dependencies = [ "unicode-ident", ] @@ -2911,13 +3044,13 @@ checksum = "31b476131c3c86cb68032fdc5cb6d5a1045e3e42d96b69fa599fd77701e1f5bf" dependencies = [ "bit-set", "bit-vec", - "bitflags 2.4.0", + "bitflags 2.5.0", "lazy_static", "num-traits", "rand 0.8.5", "rand_chacha 0.3.1", "rand_xorshift", - "regex-syntax 0.8.2", + "regex-syntax", "rusty-fork", "tempfile", "unarray", @@ -2925,9 +3058,9 @@ dependencies = [ [[package]] name = "prost" -version = "0.12.0" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa8473a65b88506c106c28ae905ca4a2b83a2993640467a41bb3080627ddfd2c" +checksum = "d0f5d036824e4761737860779c906171497f6d55681139d8312388f8fe398922" dependencies = [ "bytes", "prost-derive", @@ -2935,13 +3068,13 @@ dependencies = [ [[package]] name = "prost-build" -version = "0.12.0" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30d3e647e9eb04ddfef78dfee2d5b3fefdf94821c84b710a3d8ebc89ede8b164" +checksum = "80b776a1b2dc779f5ee0641f8ade0125bc1298dd41a9a0c16d8bd57b42d222b1" dependencies = [ "bytes", - "heck", - "itertools 0.10.5", + "heck 0.5.0", + "itertools 0.12.1", "log", "multimap", "once_cell", @@ -2950,29 +3083,28 @@ dependencies = [ "prost", "prost-types", "regex", - "syn 2.0.51", + "syn 2.0.60", "tempfile", - "which", ] [[package]] name = "prost-derive" -version = "0.12.0" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56075c27b20ae524d00f247b8a4dc333e5784f889fe63099f8e626bc8d73486c" +checksum = "19de2de2a00075bf566bee3bd4db014b11587e84184d3f7a791bc17f1a8e9e48" dependencies = [ "anyhow", - "itertools 0.10.5", + "itertools 0.12.1", "proc-macro2", "quote", - "syn 2.0.51", + "syn 2.0.60", ] [[package]] name = "prost-types" -version = "0.12.0" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cebe0a918c97f86c217b0f76fd754e966f8b9f41595095cf7d74cb4e59d730f6" +checksum = "3235c33eb02c1f1e212abdbe34c78b264b038fb58ca612664343271e36e55ffe" dependencies = [ "prost", ] @@ -2995,9 +3127,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.35" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] @@ -3061,7 +3193,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.10", + "getrandom 0.2.14", ] [[package]] @@ -3094,67 +3226,52 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "redox_syscall" -version = "0.3.5" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" dependencies = [ "bitflags 1.3.2", ] [[package]] name = "redox_users" -version = "0.4.3" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" dependencies = [ - "getrandom 0.2.10", - "redox_syscall 0.2.16", + "getrandom 0.2.14", + "libredox", "thiserror", ] [[package]] name = "regex" -version = "1.9.5" +version = "1.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47" +checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" dependencies = [ "aho-corasick", "memchr", "regex-automata", - "regex-syntax 0.7.5", + "regex-syntax", ] [[package]] name = "regex-automata" -version = "0.3.8" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795" +checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.7.5", + "regex-syntax", ] [[package]] name = "regex-syntax" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" - -[[package]] -name = "regex-syntax" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" +checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" [[package]] name = "resolv-conf" @@ -3176,27 +3293,42 @@ dependencies = [ "libc", "once_cell", "spin 0.5.2", - "untrusted", + "untrusted 0.7.1", "web-sys", "winapi", ] [[package]] +name = "ring" +version = "0.17.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" +dependencies = [ + "cc", + "cfg-if", + "getrandom 0.2.14", + "libc", + "spin 0.9.8", + "untrusted 0.9.0", + "windows-sys 0.52.0", +] + +[[package]] name = "ring-compat" -version = "0.5.1" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "333b9bf6765e0141324d95b5375bb1aa5267865bb4bc0281c22aff22f5d37746" +checksum = "ccce7bae150b815f0811db41b8312fcb74bffa4cab9cee5429ee00f356dd5bd4" dependencies = [ "aead", "digest", "ecdsa", "ed25519", "generic-array", - "opaque-debug", "p256", "p384", "pkcs8", - "ring", + "rand_core 0.6.4", + "ring 0.17.8", "signature", ] @@ -3244,11 +3376,11 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.32" +version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.5.0", "errno 0.3.8", "libc", "linux-raw-sys", @@ -3257,40 +3389,40 @@ dependencies = [ [[package]] name = "rustls" -version = "0.21.7" +version = "0.21.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8" +checksum = "7fecbfb7b1444f477b345853b1fce097a2c6fb637b2bfb87e6bc5db0f043fae4" dependencies = [ "log", - "ring", + "ring 0.17.8", "rustls-webpki", "sct", ] [[package]] name = "rustls-pemfile" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" dependencies = [ - "base64 0.21.3", + "base64 0.21.7", ] [[package]] name = "rustls-webpki" -version = "0.101.4" +version = "0.101.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d93931baf2d282fff8d3a532bbfd7653f734643161b87e3e01e59a04439bf0d" +checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" dependencies = [ - "ring", - "untrusted", + "ring 0.17.8", + "untrusted 0.9.0", ] [[package]] name = "rustversion" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" +checksum = "80af6f9131f277a45a3fba6ce8e2258037bb0477a67e610d3c1fe046ab31de47" [[package]] name = "rusty-fork" @@ -3306,9 +3438,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.15" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" +checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" [[package]] name = "same-file" @@ -3327,19 +3459,19 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "sct" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" +checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" dependencies = [ - "ring", - "untrusted", + "ring 0.17.8", + "untrusted 0.9.0", ] [[package]] name = "sec1" -version = "0.3.0" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3be24c1842290c45df0a7bf069e0c268a747ad05a192f2fd7dcfdbc1cba40928" +checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc" dependencies = [ "base16ct", "der", @@ -3350,9 +3482,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.18" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" +checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" [[package]] name = "sendfd" @@ -3366,29 +3498,29 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.188" +version = "1.0.198" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" +checksum = "9846a40c979031340571da2545a4e5b7c4163bdae79b301d5f86d03979451fcc" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.188" +version = "1.0.198" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" +checksum = "e88edab869b01783ba905e7d0153f9fc1a6505a96e4ad3018011eedb838566d9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.51", + "syn 2.0.60", ] [[package]] name = "serde_json" -version = "1.0.105" +version = "1.0.116" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360" +checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813" dependencies = [ "itoa", "ryu", @@ -3409,9 +3541,9 @@ dependencies = [ [[package]] name = "sha1" -version = "0.10.5" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" dependencies = [ "cfg-if", "cpufeatures", @@ -3420,9 +3552,9 @@ dependencies = [ [[package]] name = "sha2" -version = "0.10.7" +version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" dependencies = [ "cfg-if", "cpufeatures", @@ -3441,18 +3573,19 @@ dependencies = [ [[package]] name = "shadowsocks" -version = "1.16.0" +version = "1.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5d4aadc3b1b38e760533d4060a1aa53a2d754f073389f5aafe6bf7b579c4f97" +checksum = "ed5edddeff89d9874fa59366cfc506b53525410f129bbf13064ab36de15374e6" dependencies = [ "arc-swap", "async-trait", - "base64 0.21.3", + "base64 0.22.0", "blake3", "byte_string", "bytes", "cfg-if", "futures", + "hickory-resolver", "libc", "log", "notify", @@ -3464,24 +3597,24 @@ dependencies = [ "serde_json", "serde_urlencoded", "shadowsocks-crypto", - "socket2 0.5.3", + "socket2", "spin 0.9.8", "thiserror", "tokio", "tokio-tfo", - "trust-dns-resolver", "url", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "shadowsocks-crypto" -version = "0.5.1" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfb488687e398030dd9c9396e119ddbc6952bdeaefe2168943b5b2ddaa54f2e6" +checksum = "65da645ff4a6440ba1b52a9d6b4c8792054860ac135cb87f8ad3d2c7a78d41b5" dependencies = [ "aes", "aes-gcm", + "camellia", "cfg-if", "chacha20", "chacha20poly1305", @@ -3506,9 +3639,9 @@ dependencies = [ [[package]] name = "shadowsocks-service" -version = "1.16.1" +version = "1.18.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7782cbb1b1e3743b03dd99165750990cca1b4cd181b2a0e91ddeeccc3f77d8cd" +checksum = "7be0ae9c02adf5fb2a91cdee6b3d6e3610d88411114080280e816d817fe437c8" dependencies = [ "arc-swap", "async-trait", @@ -3517,27 +3650,27 @@ dependencies = [ "bytes", "cfg-if", "futures", - "hyper", - "idna 0.4.0", + "http-body-util", + "hyper 1.3.1", + "idna 0.5.0", "ipnet", "iprange", "json5", "libc", "log", "lru_time_cache", - "nix 0.27.1", + "nix 0.28.0", "once_cell", "pin-project", "rand 0.8.5", "regex", "serde", "shadowsocks", - "socket2 0.5.3", + "socket2", "spin 0.9.8", "thiserror", "tokio", - "tower", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -3558,18 +3691,18 @@ checksum = "45bb67a18fa91266cc7807181f62f9178a6873bfad7dc788c42e6430db40184f" [[package]] name = "signal-hook-registry" -version = "1.4.1" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" dependencies = [ "libc", ] [[package]] name = "signature" -version = "1.6.4" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" +checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" dependencies = [ "rand_core 0.6.4", ] @@ -3607,28 +3740,18 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" - -[[package]] -name = "socket2" -version = "0.4.9" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" -dependencies = [ - "libc", - "winapi", -] +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "socket2" -version = "0.5.3" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877" +checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" dependencies = [ "libc", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -3648,9 +3771,9 @@ dependencies = [ [[package]] name = "spki" -version = "0.6.0" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67cf02bbac7a337dc36e4f5a693db6c21e7863f45070f7064577eb4367a3212b" +checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" dependencies = [ "base64ct", "der", @@ -3664,9 +3787,9 @@ checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c" [[package]] name = "strsim" -version = "0.10.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "subslice" @@ -3685,15 +3808,15 @@ checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" [[package]] name = "surge-ping" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af341b2be485d647b5dc4cfb2da99efac35b5c95748a08fb7233480fedc5ead3" +checksum = "efbf95ce4c7c5b311d2ce3f088af2b93edef0f09727fa50fbe03c7a979afce77" dependencies = [ "hex", "parking_lot", "pnet_packet", "rand 0.8.5", - "socket2 0.5.3", + "socket2", "thiserror", "tokio", "tracing", @@ -3712,9 +3835,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.51" +version = "2.0.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ab617d94515e94ae53b8406c628598680aa0c9587474ecbe58188f7b345d66c" +checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3" dependencies = [ "proc-macro2", "quote", @@ -3780,15 +3903,21 @@ dependencies = [ "mnl", "nftnl", "nix 0.23.2", + "nix 0.28.0", "once_cell", "parking_lot", + "pcap", "pfctl", + "pnet_packet", "rand 0.8.5", "resolv-conf", + "serde", + "serde_json", "subslice", "system-configuration", "talpid-dbus", "talpid-openvpn", + "talpid-platform-metadata", "talpid-routing", "talpid-tunnel", "talpid-tunnel-config-client", @@ -3799,10 +3928,11 @@ dependencies = [ "tokio", "tonic-build", "triggered", + "tun", "which", "widestring", "windows-service", - "windows-sys 0.48.0", + "windows-sys 0.52.0", "winreg 0.51.0", ] @@ -3851,7 +3981,7 @@ dependencies = [ "triggered", "uuid", "widestring", - "windows-sys 0.48.0", + "windows-sys 0.52.0", "winreg 0.51.0", ] @@ -3859,7 +3989,7 @@ dependencies = [ name = "talpid-openvpn-plugin" version = "0.0.0" dependencies = [ - "env_logger 0.10.0", + "env_logger 0.10.2", "log", "mullvad-version", "openvpn-plugin", @@ -3871,7 +4001,7 @@ dependencies = [ "tonic", "tonic-build", "tower", - "windows-sys 0.48.0", + "windows-sys 0.52.0", "winres", ] @@ -3881,14 +4011,14 @@ version = "0.0.0" dependencies = [ "rs-release", "talpid-dbus", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "talpid-routing" version = "0.0.0" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.5.0", "futures", "ipnetwork", "libc", @@ -3904,7 +4034,7 @@ dependencies = [ "thiserror", "tokio", "widestring", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -3932,16 +4062,18 @@ dependencies = [ "thiserror", "tokio", "tun", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "talpid-tunnel-config-client" version = "0.0.0" dependencies = [ + "cbindgen", "classic-mceliece-rust", "libc", "log", + "oslog", "pqc_kyber", "prost", "rand 0.8.5", @@ -3950,7 +4082,7 @@ dependencies = [ "tonic", "tonic-build", "tower", - "windows-sys 0.48.0", + "windows-sys 0.52.0", "zeroize", ] @@ -3958,7 +4090,7 @@ dependencies = [ name = "talpid-types" version = "0.0.0" dependencies = [ - "base64 0.13.1", + "base64 0.22.0", "ipnetwork", "jnix", "log", @@ -3973,17 +4105,16 @@ name = "talpid-windows" version = "0.0.0" dependencies = [ "futures", - "socket2 0.5.3", + "socket2", "talpid-types", "thiserror", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "talpid-wireguard" version = "0.0.0" dependencies = [ - "base64 0.13.1", "bitflags 1.3.2", "byteorder", "chrono", @@ -4005,7 +4136,7 @@ dependencies = [ "proptest", "rand 0.8.5", "rtnetlink", - "socket2 0.5.3", + "socket2", "surge-ping", "talpid-dbus", "talpid-routing", @@ -4018,68 +4149,69 @@ dependencies = [ "tokio-stream", "tunnel-obfuscation", "widestring", - "windows-sys 0.48.0", + "windows-sys 0.52.0", "zeroize", ] [[package]] name = "tempfile" -version = "3.8.0" +version = "3.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" dependencies = [ "cfg-if", "fastrand", - "redox_syscall 0.3.5", "rustix", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "termcolor" -version = "1.2.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" dependencies = [ "winapi-util", ] [[package]] name = "thiserror" -version = "1.0.57" +version = "1.0.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b" +checksum = "f0126ad08bff79f29fc3ae6a55cc72352056dfff61e3ff8bb7129476d44b23aa" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.57" +version = "1.0.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81" +checksum = "d1cd413b5d558b4c5bf3680e324a6fa5014e7b7c067a51e69dbdf47eb7148b66" dependencies = [ "proc-macro2", "quote", - "syn 2.0.51", + "syn 2.0.60", ] [[package]] name = "time" -version = "0.3.28" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17f6bb557fd245c28e6411aa56b6403c689ad95061f50e4be16c274e70a17e48" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ "deranged", + "num-conv", + "powerfmt", "serde", "time-core", ] [[package]] name = "time-core" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "tinyvec" @@ -4098,9 +4230,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.32.0" +version = "1.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" +checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" dependencies = [ "backtrace", "bytes", @@ -4110,7 +4242,7 @@ dependencies = [ "parking_lot", "pin-project-lite", "signal-hook-registry", - "socket2 0.5.3", + "socket2", "tokio-macros", "windows-sys 0.48.0", ] @@ -4127,13 +4259,13 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" +checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.51", + "syn 2.0.60", ] [[package]] @@ -4160,9 +4292,9 @@ dependencies = [ [[package]] name = "tokio-stream" -version = "0.1.14" +version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" +checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" dependencies = [ "futures-core", "pin-project-lite", @@ -4181,13 +4313,27 @@ dependencies = [ "log", "once_cell", "pin-project", - "socket2 0.5.3", + "socket2", "tokio", "windows-sys 0.48.0", ] [[package]] name = "tokio-util" +version = "0.6.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36943ee01a6d67977dd3f84a5a1d2efeb4ada3a1ae771cadfaa535d9d9fc6507" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "log", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "tokio-util" version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" @@ -4211,19 +4357,19 @@ dependencies = [ [[package]] name = "tonic" -version = "0.10.0" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5469afaf78a11265c343a88969045c1568aa8ecc6c787dbf756e92e70f199861" +checksum = "d560933a0de61cf715926b9cac824d4c883c2c43142f787595e48280c40a1d0e" dependencies = [ "async-stream", "async-trait", "axum", - "base64 0.21.3", + "base64 0.21.7", "bytes", - "h2", - "http", - "http-body", - "hyper", + "h2 0.3.26", + "http 0.2.12", + "http-body 0.4.6", + "hyper 0.14.28", "hyper-timeout", "percent-encoding", "pin-project", @@ -4238,15 +4384,15 @@ dependencies = [ [[package]] name = "tonic-build" -version = "0.10.0" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b477abbe1d18c0b08f56cd01d1bc288668c5b5cfd19b2ae1886bbf599c546f1" +checksum = "9d021fc044c18582b9a2408cd0dd05b1596e3ecdb5c4df822bb0183545683889" dependencies = [ "prettyplease", "proc-macro2", "prost-build", "quote", - "syn 2.0.51", + "syn 2.0.60", ] [[package]] @@ -4263,7 +4409,7 @@ dependencies = [ "rand 0.8.5", "slab", "tokio", - "tokio-util", + "tokio-util 0.7.10", "tower-layer", "tower-service", "tracing", @@ -4283,11 +4429,10 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" [[package]] name = "tracing" -version = "0.1.37" +version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ - "cfg-if", "log", "pin-project-lite", "tracing-attributes", @@ -4296,20 +4441,20 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.26" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.51", + "syn 2.0.60", ] [[package]] name = "tracing-core" -version = "0.1.31" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" dependencies = [ "once_cell", ] @@ -4333,56 +4478,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ce148eae0d1a376c1b94ae651fc3261d9cb8294788b962b7382066376503a2d1" [[package]] -name = "trust-dns-proto" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dc775440033cb114085f6f2437682b194fa7546466024b1037e82a48a052a69" -dependencies = [ - "async-trait", - "cfg-if", - "data-encoding", - "enum-as-inner", - "futures-channel", - "futures-io", - "futures-util", - "idna 0.4.0", - "ipnet", - "once_cell", - "rand 0.8.5", - "smallvec", - "thiserror", - "tinyvec", - "tokio", - "tracing", - "url", -] - -[[package]] -name = "trust-dns-resolver" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dff7aed33ef3e8bf2c9966fccdfed93f93d46f432282ea875cd66faabc6ef2f" -dependencies = [ - "cfg-if", - "futures-util", - "ipconfig", - "lru-cache", - "once_cell", - "parking_lot", - "rand 0.8.5", - "resolv-conf", - "smallvec", - "thiserror", - "tokio", - "tracing", - "trust-dns-proto", -] - -[[package]] name = "try-lock" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "tun" @@ -4390,9 +4489,14 @@ version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cbc25e23adc6cac7dd895ce2780f255902290fc39b00e1ae3c33e89f3d20fa66" dependencies = [ + "byteorder", + "bytes", + "futures-core", "ioctl-sys", "libc", "thiserror", + "tokio", + "tokio-util 0.6.10", ] [[package]] @@ -4418,9 +4522,9 @@ dependencies = [ [[package]] name = "typenum" -version = "1.16.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "ucd-trie" @@ -4449,21 +4553,21 @@ checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94" [[package]] name = "unicode-bidi" -version = "0.3.13" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" [[package]] name = "unicode-ident" -version = "1.0.11" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" dependencies = [ "tinyvec", ] @@ -4491,13 +4595,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" [[package]] +name = "untrusted" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + +[[package]] name = "url" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" +checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" dependencies = [ "form_urlencoded", - "idna 0.4.0", + "idna 0.5.0", "percent-encoding", "serde", ] @@ -4510,11 +4620,11 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" -version = "1.4.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" +checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" dependencies = [ - "getrandom 0.2.10", + "getrandom 0.2.14", "serde", ] @@ -4535,9 +4645,9 @@ dependencies = [ [[package]] name = "walkdir" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" dependencies = [ "same-file", "winapi-util", @@ -4566,9 +4676,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.87" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -4576,24 +4686,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.87" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.51", + "syn 2.0.60", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.87" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -4601,28 +4711,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.87" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.51", + "syn 2.0.60", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.87" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "web-sys" -version = "0.3.64" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" +checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" dependencies = [ "js-sys", "wasm-bindgen", @@ -4642,9 +4752,9 @@ dependencies = [ [[package]] name = "widestring" -version = "1.0.2" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8" +checksum = "7219d36b6eac893fa81e84ebe06485e7dcbb616177469b142df14f1f4deb1311" [[package]] name = "winapi" @@ -4664,11 +4774,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.5" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +checksum = "134306a13c5647ad6453e8deaec55d3a44d6021970129e6188735e74bf546697" dependencies = [ - "winapi", + "windows-sys 0.52.0", ] [[package]] @@ -4678,12 +4788,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] -name = "windows" -version = "0.48.0" +name = "windows-core" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.48.5", + "windows-targets 0.52.5", ] [[package]] @@ -4699,6 +4809,19 @@ dependencies = [ [[package]] name = "windows-sys" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" +dependencies = [ + "windows_aarch64_msvc 0.36.1", + "windows_i686_gnu 0.36.1", + "windows_i686_msvc 0.36.1", + "windows_x86_64_gnu 0.36.1", + "windows_x86_64_msvc 0.36.1", +] + +[[package]] +name = "windows-sys" version = "0.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" @@ -4721,7 +4844,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.0", + "windows-targets 0.52.5", ] [[package]] @@ -4756,17 +4879,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" dependencies = [ - "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", + "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]] @@ -4783,9 +4907,15 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" +checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" [[package]] name = "windows_aarch64_msvc" @@ -4801,9 +4931,15 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" +checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" + +[[package]] +name = "windows_i686_gnu" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" [[package]] name = "windows_i686_gnu" @@ -4819,9 +4955,21 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" +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.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" [[package]] name = "windows_i686_msvc" @@ -4837,9 +4985,15 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.0" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" +checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" [[package]] name = "windows_x86_64_gnu" @@ -4855,9 +5009,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" +checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" [[package]] name = "windows_x86_64_gnullvm" @@ -4873,9 +5027,15 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.0" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" +checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" [[package]] name = "windows_x86_64_msvc" @@ -4891,9 +5051,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.0" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" +checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" [[package]] name = "winreg" @@ -4953,14 +5113,14 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.51", + "syn 2.0.60", ] [[package]] name = "zeroize" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9" +checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" dependencies = [ "zeroize_derive", ] @@ -4973,5 +5133,5 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.51", + "syn 2.0.60", ] diff --git a/pkgs/applications/networking/mullvad/libwg.nix b/pkgs/applications/networking/mullvad/libwg.nix index 4d9d4c373ee31..88d0ae1b6f517 100644 --- a/pkgs/applications/networking/mullvad/libwg.nix +++ b/pkgs/applications/networking/mullvad/libwg.nix @@ -12,7 +12,7 @@ buildGoModule { sourceRoot = "${mullvad.src.name}/wireguard/libwg"; - vendorHash = "sha256-2hb6+OHifm/oAgXCiYf+nwtNDDZNWR6lAbLSGT3AG0I="; + vendorHash = "sha256-gaU3na3sjzM6lvmsGRkuGtV2AHvkl6IgzmyGx3R5ZpM="; # XXX: hack to make the ar archive go to the correct place # This is necessary because passing `-o ...` to `ldflags` does not work diff --git a/pkgs/applications/networking/mullvad/mullvad.nix b/pkgs/applications/networking/mullvad/mullvad.nix index b1f64da558b9b..b43881123a905 100644 --- a/pkgs/applications/networking/mullvad/mullvad.nix +++ b/pkgs/applications/networking/mullvad/mullvad.nix @@ -17,23 +17,24 @@ }: rustPlatform.buildRustPackage rec { pname = "mullvad"; - version = "2024.3"; + version = "2024.4"; src = fetchFromGitHub { owner = "mullvad"; repo = "mullvadvpn-app"; rev = version; - hash = "sha256-poQtE+XIlPcL9viAau+70xWx1fPrTXJXMcuPvXlqjZg="; + hash = "sha256-d7poR1NnvqaPutXLFizpQnyipl+38N1Qe2zVXeV7v1Q="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "hickory-proto-0.24.0" = "sha256-IqGVoQ1vRruCcaDr82ARkvSo42Pe9Q6iJIWnSd6GqEg="; "udp-over-tcp-0.3.0" = "sha256-5PeaM7/zhux1UdlaKpnQ2yIdmFy1n2weV/ux9lSRha4="; }; }; + checkFlags = "--skip=version_check"; + nativeBuildInputs = [ pkg-config protobuf diff --git a/pkgs/applications/networking/mullvad/openvpn.nix b/pkgs/applications/networking/mullvad/openvpn.nix index ad33172801690..af2a2d2e494e9 100644 --- a/pkgs/applications/networking/mullvad/openvpn.nix +++ b/pkgs/applications/networking/mullvad/openvpn.nix @@ -3,7 +3,6 @@ , openvpn , fetchpatch , fetchurl -, iproute2 , libnl , autoreconfHook , pkg-config @@ -32,7 +31,7 @@ openvpn.overrideAttrs (oldAttrs: ]; buildInputs = oldAttrs.buildInputs or [ ] - ++ optional stdenv.isLinux [ libnl.dev ]; + ++ optional stdenv.hostPlatform.isLinux [ libnl.dev ]; configureFlags = [ # Assignement instead of appending to make sure to use exactly the flags required by mullvad @@ -53,7 +52,7 @@ openvpn.overrideAttrs (oldAttrs: "--disable-lz4" "--enable-comp-stub" ] - ++ optional stdenv.isLinux [ + ++ optional stdenv.hostPlatform.isLinux [ # Flags are based on https://github.com/mullvad/mullvadvpn-app-binaries/blob/main/Makefile#L35 "--enable-dco" # requires libnl "--disable-iproute2" diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index b72e218ddcfb7..ba77425b5ef8e 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -11,7 +11,7 @@ , jackSupport ? false, libjack2 , pipewireSupport ? true, pipewire , pulseSupport ? true, libpulseaudio -, speechdSupport ? false, speechd +, speechdSupport ? false, speechd-minimal }: let @@ -27,6 +27,7 @@ let cmakeFlags = [ "-D g15=OFF" + "-D CMAKE_CXX_STANDARD=17" # protobuf >22 requires C++ 17 ] ++ (overrides.configureFlags or [ ]); preConfigure = '' @@ -52,7 +53,7 @@ let buildInputs = [ flac libogg libopus libsndfile libvorbis qt5.qtsvg rnnoise speex ] ++ lib.optional (!jackSupport) alsa-lib ++ lib.optional jackSupport libjack2 - ++ lib.optional speechdSupport speechd + ++ lib.optional speechdSupport speechd-minimal ++ lib.optional pulseSupport libpulseaudio ++ lib.optional pipewireSupport pipewire; @@ -71,7 +72,7 @@ let ++ lib.optional (!pipewireSupport) "-D pipewire=OFF" ++ lib.optional jackSupport "-D alsa=OFF -D jackaudio=ON"; - env.NIX_CFLAGS_COMPILE = lib.optionalString speechdSupport "-I${speechd}/include/speech-dispatcher"; + env.NIX_CFLAGS_COMPILE = lib.optionalString speechdSupport "-I${speechd-minimal}/include/speech-dispatcher"; postFixup = '' wrapProgram $out/bin/mumble \ @@ -103,9 +104,17 @@ let owner = "mumble-voip"; repo = "mumble"; rev = "v${version}"; - sha256 = "sha256-d9XmXHq264rTT80zphYcKLxS+AyUhjb19D3DuBJvMI4="; + hash = "sha256-d9XmXHq264rTT80zphYcKLxS+AyUhjb19D3DuBJvMI4="; fetchSubmodules = true; }; + + patches = [ + (fetchpatch { + name = "GCC14.patch"; + url = "https://github.com/mumble-voip/mumble/commit/56945a9dfb62d29dccfe561572ebf64500deaed1.patch"; + hash = "sha256-Frct9XJ/ZuHPglx+GB9h3vVycR8YY039dStIbfkPPDk="; + }) + ]; }; in { mumble = client source; diff --git a/pkgs/applications/networking/n8n/default.nix b/pkgs/applications/networking/n8n/default.nix deleted file mode 100644 index 66b5688ddb067..0000000000000 --- a/pkgs/applications/networking/n8n/default.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ pkgs, stdenv, lib, nixosTests }: - -let - nodePackages = import ./node-composition.nix { - inherit pkgs; - inherit (stdenv.hostPlatform) system; - }; -in -nodePackages.n8n.override { - nativeBuildInputs = [ - pkgs.nodePackages.node-pre-gyp - pkgs.which - pkgs.xcbuild - ]; - - buildInputs = [ - pkgs.libkrb5 - pkgs.libmongocrypt - pkgs.postgresql - ]; - - preRebuild = lib.optionalString stdenv.isAarch64 '' - # Oracle's official package on npm is binary only (WHY?!) and doesn't provide binaries for aarch64. - # This can supposedly be fixed by building a custom copy of the module from source, but that's way - # too much complexity for a setup no one would ever actually run. - # - # NB: If you _are_ actually running n8n on Oracle on aarch64, feel free to submit a patch. - rm -rf node_modules/oracledb - - # This package tries to load a prebuilt binary for a different arch, and it doesn't provide the binary for aarch64. - # It is marked as an optional dependency in pnpm-lock.yaml and there are no other references to it n8n. - rm -rf node_modules/@sap/hana-client - ''; - - # makes libmongocrypt bindings not look for static libraries in completely wrong places - BUILD_TYPE = "dynamic"; - - # Disable NAPI_EXPERIMENTAL to allow to build with Node.js≥18.20.0. - NIX_CFLAGS_COMPILE = "-DNODE_API_EXPERIMENTAL_NOGC_ENV_OPT_OUT"; - - dontNpmInstall = true; - - passthru = { - updateScript = ./generate-dependencies.sh; - tests = nixosTests.n8n; - }; - - meta = with lib; { - description = "Free and source-available fair-code licensed workflow automation tool. Easily automate tasks across different services"; - maintainers = with maintainers; [ freezeboy k900 ]; - license = licenses.sustainableUse; - mainProgram = "n8n"; - }; -} diff --git a/pkgs/applications/networking/n8n/generate-dependencies.sh b/pkgs/applications/networking/n8n/generate-dependencies.sh deleted file mode 100755 index 9bc19abe3eadb..0000000000000 --- a/pkgs/applications/networking/n8n/generate-dependencies.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env nix-shell -#! nix-shell -i bash -p nodePackages.node2nix - -# --strip-optional-dependencies to get rid of deprecated build deps: -# -# n8n -# -> n8n-nodes-base -# -> ssh2-sftp-client -# -> ssh2 -# -> cpu-features -# -> node-gyp@3.8.0 -> python2 -# -> cmake -cd "$(dirname $(readlink -f $0))" - -node2nix \ - --nodejs-18 \ - --strip-optional-dependencies \ - --node-env node-env.nix \ - --input package.json \ - --output node-packages.nix \ - --composition node-composition.nix diff --git a/pkgs/applications/networking/n8n/node-composition.nix b/pkgs/applications/networking/n8n/node-composition.nix deleted file mode 100644 index d9c0daef7834c..0000000000000 --- a/pkgs/applications/networking/n8n/node-composition.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file has been generated by node2nix 1.11.1. Do not edit! - -{pkgs ? import <nixpkgs> { - inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_18"}: - -let - nodeEnv = import ./node-env.nix { - inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript; - inherit pkgs nodejs; - libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; - }; -in -import ./node-packages.nix { - inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit; - inherit nodeEnv; -} diff --git a/pkgs/applications/networking/n8n/node-env.nix b/pkgs/applications/networking/n8n/node-env.nix deleted file mode 100644 index bc1e36628ac8a..0000000000000 --- a/pkgs/applications/networking/n8n/node-env.nix +++ /dev/null @@ -1,689 +0,0 @@ -# This file originates from node2nix - -{lib, stdenv, nodejs, python2, pkgs, libtool, runCommand, writeTextFile, writeShellScript}: - -let - # Workaround to cope with utillinux in Nixpkgs 20.09 and util-linux in Nixpkgs master - utillinux = if pkgs ? utillinux then pkgs.utillinux else pkgs.util-linux; - - python = if nodejs ? python then nodejs.python else python2; - - # Create a tar wrapper that filters all the 'Ignoring unknown extended header keyword' noise - tarWrapper = runCommand "tarWrapper" {} '' - mkdir -p $out/bin - - cat > $out/bin/tar <<EOF - #! ${stdenv.shell} -e - $(type -p tar) "\$@" --warning=no-unknown-keyword --delay-directory-restore - EOF - - chmod +x $out/bin/tar - ''; - - # Function that generates a TGZ file from a NPM project - buildNodeSourceDist = - { name, version, src, ... }: - - stdenv.mkDerivation { - name = "node-tarball-${name}-${version}"; - inherit src; - buildInputs = [ nodejs ]; - buildPhase = '' - export HOME=$TMPDIR - tgzFile=$(npm pack | tail -n 1) # Hooks to the pack command will add output (https://docs.npmjs.com/misc/scripts) - ''; - installPhase = '' - mkdir -p $out/tarballs - mv $tgzFile $out/tarballs - mkdir -p $out/nix-support - echo "file source-dist $out/tarballs/$tgzFile" >> $out/nix-support/hydra-build-products - ''; - }; - - # Common shell logic - installPackage = writeShellScript "install-package" '' - installPackage() { - local packageName=$1 src=$2 - - local strippedName - - local DIR=$PWD - cd $TMPDIR - - unpackFile $src - - # Make the base dir in which the target dependency resides first - mkdir -p "$(dirname "$DIR/$packageName")" - - if [ -f "$src" ] - then - # Figure out what directory has been unpacked - packageDir="$(find . -maxdepth 1 -type d | tail -1)" - - # Restore write permissions to make building work - find "$packageDir" -type d -exec chmod u+x {} \; - chmod -R u+w "$packageDir" - - # Move the extracted tarball into the output folder - mv "$packageDir" "$DIR/$packageName" - elif [ -d "$src" ] - then - # Get a stripped name (without hash) of the source directory. - # On old nixpkgs it's already set internally. - if [ -z "$strippedName" ] - then - strippedName="$(stripHash $src)" - fi - - # Restore write permissions to make building work - chmod -R u+w "$strippedName" - - # Move the extracted directory into the output folder - mv "$strippedName" "$DIR/$packageName" - fi - - # Change to the package directory to install dependencies - cd "$DIR/$packageName" - } - ''; - - # Bundle the dependencies of the package - # - # Only include dependencies if they don't exist. They may also be bundled in the package. - includeDependencies = {dependencies}: - lib.optionalString (dependencies != []) ( - '' - mkdir -p node_modules - cd node_modules - '' - + (lib.concatMapStrings (dependency: - '' - if [ ! -e "${dependency.packageName}" ]; then - ${composePackage dependency} - fi - '' - ) dependencies) - + '' - cd .. - '' - ); - - # Recursively composes the dependencies of a package - composePackage = { name, packageName, src, dependencies ? [], ... }@args: - builtins.addErrorContext "while evaluating node package '${packageName}'" '' - installPackage "${packageName}" "${src}" - ${includeDependencies { inherit dependencies; }} - cd .. - ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} - ''; - - pinpointDependencies = {dependencies, production}: - let - pinpointDependenciesFromPackageJSON = writeTextFile { - name = "pinpointDependencies.js"; - text = '' - var fs = require('fs'); - var path = require('path'); - - function resolveDependencyVersion(location, name) { - if(location == process.env['NIX_STORE']) { - return null; - } else { - var dependencyPackageJSON = path.join(location, "node_modules", name, "package.json"); - - if(fs.existsSync(dependencyPackageJSON)) { - var dependencyPackageObj = JSON.parse(fs.readFileSync(dependencyPackageJSON)); - - if(dependencyPackageObj.name == name) { - return dependencyPackageObj.version; - } - } else { - return resolveDependencyVersion(path.resolve(location, ".."), name); - } - } - } - - function replaceDependencies(dependencies) { - if(typeof dependencies == "object" && dependencies !== null) { - for(var dependency in dependencies) { - var resolvedVersion = resolveDependencyVersion(process.cwd(), dependency); - - if(resolvedVersion === null) { - process.stderr.write("WARNING: cannot pinpoint dependency: "+dependency+", context: "+process.cwd()+"\n"); - } else { - dependencies[dependency] = resolvedVersion; - } - } - } - } - - /* Read the package.json configuration */ - var packageObj = JSON.parse(fs.readFileSync('./package.json')); - - /* Pinpoint all dependencies */ - replaceDependencies(packageObj.dependencies); - if(process.argv[2] == "development") { - replaceDependencies(packageObj.devDependencies); - } - else { - packageObj.devDependencies = {}; - } - replaceDependencies(packageObj.optionalDependencies); - replaceDependencies(packageObj.peerDependencies); - - /* Write the fixed package.json file */ - fs.writeFileSync("package.json", JSON.stringify(packageObj, null, 2)); - ''; - }; - in - '' - node ${pinpointDependenciesFromPackageJSON} ${if production then "production" else "development"} - - ${lib.optionalString (dependencies != []) - '' - if [ -d node_modules ] - then - cd node_modules - ${lib.concatMapStrings (dependency: pinpointDependenciesOfPackage dependency) dependencies} - cd .. - fi - ''} - ''; - - # Recursively traverses all dependencies of a package and pinpoints all - # dependencies in the package.json file to the versions that are actually - # being used. - - pinpointDependenciesOfPackage = { packageName, dependencies ? [], production ? true, ... }@args: - '' - if [ -d "${packageName}" ] - then - cd "${packageName}" - ${pinpointDependencies { inherit dependencies production; }} - cd .. - ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} - fi - ''; - - # Extract the Node.js source code which is used to compile packages with - # native bindings - nodeSources = runCommand "node-sources" {} '' - tar --no-same-owner --no-same-permissions -xf ${nodejs.src} - mv node-* $out - ''; - - # Script that adds _integrity fields to all package.json files to prevent NPM from consulting the cache (that is empty) - addIntegrityFieldsScript = writeTextFile { - name = "addintegrityfields.js"; - text = '' - var fs = require('fs'); - var path = require('path'); - - function augmentDependencies(baseDir, dependencies) { - for(var dependencyName in dependencies) { - var dependency = dependencies[dependencyName]; - - // Open package.json and augment metadata fields - var packageJSONDir = path.join(baseDir, "node_modules", dependencyName); - var packageJSONPath = path.join(packageJSONDir, "package.json"); - - if(fs.existsSync(packageJSONPath)) { // Only augment packages that exist. Sometimes we may have production installs in which development dependencies can be ignored - console.log("Adding metadata fields to: "+packageJSONPath); - var packageObj = JSON.parse(fs.readFileSync(packageJSONPath)); - - if(dependency.integrity) { - packageObj["_integrity"] = dependency.integrity; - } else { - packageObj["_integrity"] = "sha1-000000000000000000000000000="; // When no _integrity string has been provided (e.g. by Git dependencies), add a dummy one. It does not seem to harm and it bypasses downloads. - } - - if(dependency.resolved) { - packageObj["_resolved"] = dependency.resolved; // Adopt the resolved property if one has been provided - } else { - packageObj["_resolved"] = dependency.version; // Set the resolved version to the version identifier. This prevents NPM from cloning Git repositories. - } - - if(dependency.from !== undefined) { // Adopt from property if one has been provided - packageObj["_from"] = dependency.from; - } - - fs.writeFileSync(packageJSONPath, JSON.stringify(packageObj, null, 2)); - } - - // Augment transitive dependencies - if(dependency.dependencies !== undefined) { - augmentDependencies(packageJSONDir, dependency.dependencies); - } - } - } - - if(fs.existsSync("./package-lock.json")) { - var packageLock = JSON.parse(fs.readFileSync("./package-lock.json")); - - if(![1, 2].includes(packageLock.lockfileVersion)) { - process.stderr.write("Sorry, I only understand lock file versions 1 and 2!\n"); - process.exit(1); - } - - if(packageLock.dependencies !== undefined) { - augmentDependencies(".", packageLock.dependencies); - } - } - ''; - }; - - # Reconstructs a package-lock file from the node_modules/ folder structure and package.json files with dummy sha1 hashes - reconstructPackageLock = writeTextFile { - name = "reconstructpackagelock.js"; - text = '' - var fs = require('fs'); - var path = require('path'); - - var packageObj = JSON.parse(fs.readFileSync("package.json")); - - var lockObj = { - name: packageObj.name, - version: packageObj.version, - lockfileVersion: 2, - requires: true, - packages: { - "": { - name: packageObj.name, - version: packageObj.version, - license: packageObj.license, - bin: packageObj.bin, - dependencies: packageObj.dependencies, - engines: packageObj.engines, - optionalDependencies: packageObj.optionalDependencies - } - }, - dependencies: {} - }; - - function augmentPackageJSON(filePath, packages, dependencies) { - var packageJSON = path.join(filePath, "package.json"); - if(fs.existsSync(packageJSON)) { - var packageObj = JSON.parse(fs.readFileSync(packageJSON)); - packages[filePath] = { - version: packageObj.version, - integrity: "sha1-000000000000000000000000000=", - dependencies: packageObj.dependencies, - engines: packageObj.engines, - optionalDependencies: packageObj.optionalDependencies - }; - dependencies[packageObj.name] = { - version: packageObj.version, - integrity: "sha1-000000000000000000000000000=", - dependencies: {} - }; - processDependencies(path.join(filePath, "node_modules"), packages, dependencies[packageObj.name].dependencies); - } - } - - function processDependencies(dir, packages, dependencies) { - if(fs.existsSync(dir)) { - var files = fs.readdirSync(dir); - - files.forEach(function(entry) { - var filePath = path.join(dir, entry); - var stats = fs.statSync(filePath); - - if(stats.isDirectory()) { - if(entry.substr(0, 1) == "@") { - // When we encounter a namespace folder, augment all packages belonging to the scope - var pkgFiles = fs.readdirSync(filePath); - - pkgFiles.forEach(function(entry) { - if(stats.isDirectory()) { - var pkgFilePath = path.join(filePath, entry); - augmentPackageJSON(pkgFilePath, packages, dependencies); - } - }); - } else { - augmentPackageJSON(filePath, packages, dependencies); - } - } - }); - } - } - - processDependencies("node_modules", lockObj.packages, lockObj.dependencies); - - fs.writeFileSync("package-lock.json", JSON.stringify(lockObj, null, 2)); - ''; - }; - - # Script that links bins defined in package.json to the node_modules bin directory - # NPM does not do this for top-level packages itself anymore as of v7 - linkBinsScript = writeTextFile { - name = "linkbins.js"; - text = '' - var fs = require('fs'); - var path = require('path'); - - var packageObj = JSON.parse(fs.readFileSync("package.json")); - - var nodeModules = Array(packageObj.name.split("/").length).fill("..").join(path.sep); - - if(packageObj.bin !== undefined) { - fs.mkdirSync(path.join(nodeModules, ".bin")) - - if(typeof packageObj.bin == "object") { - Object.keys(packageObj.bin).forEach(function(exe) { - if(fs.existsSync(packageObj.bin[exe])) { - console.log("linking bin '" + exe + "'"); - fs.symlinkSync( - path.join("..", packageObj.name, packageObj.bin[exe]), - path.join(nodeModules, ".bin", exe) - ); - } - else { - console.log("skipping non-existent bin '" + exe + "'"); - } - }) - } - else { - if(fs.existsSync(packageObj.bin)) { - console.log("linking bin '" + packageObj.bin + "'"); - fs.symlinkSync( - path.join("..", packageObj.name, packageObj.bin), - path.join(nodeModules, ".bin", packageObj.name.split("/").pop()) - ); - } - else { - console.log("skipping non-existent bin '" + packageObj.bin + "'"); - } - } - } - else if(packageObj.directories !== undefined && packageObj.directories.bin !== undefined) { - fs.mkdirSync(path.join(nodeModules, ".bin")) - - fs.readdirSync(packageObj.directories.bin).forEach(function(exe) { - if(fs.existsSync(path.join(packageObj.directories.bin, exe))) { - console.log("linking bin '" + exe + "'"); - fs.symlinkSync( - path.join("..", packageObj.name, packageObj.directories.bin, exe), - path.join(nodeModules, ".bin", exe) - ); - } - else { - console.log("skipping non-existent bin '" + exe + "'"); - } - }) - } - ''; - }; - - prepareAndInvokeNPM = {packageName, bypassCache, reconstructLock, npmFlags, production}: - let - forceOfflineFlag = if bypassCache then "--offline" else "--registry http://www.example.com"; - in - '' - # Pinpoint the versions of all dependencies to the ones that are actually being used - echo "pinpointing versions of dependencies..." - source $pinpointDependenciesScriptPath - - # Patch the shebangs of the bundled modules to prevent them from - # calling executables outside the Nix store as much as possible - patchShebangs . - - # Deploy the Node.js package by running npm install. Since the - # dependencies have been provided already by ourselves, it should not - # attempt to install them again, which is good, because we want to make - # it Nix's responsibility. If it needs to install any dependencies - # anyway (e.g. because the dependency parameters are - # incomplete/incorrect), it fails. - # - # The other responsibilities of NPM are kept -- version checks, build - # steps, postprocessing etc. - - export HOME=$TMPDIR - cd "${packageName}" - runHook preRebuild - - ${lib.optionalString bypassCache '' - ${lib.optionalString reconstructLock '' - if [ -f package-lock.json ] - then - echo "WARNING: Reconstruct lock option enabled, but a lock file already exists!" - echo "This will most likely result in version mismatches! We will remove the lock file and regenerate it!" - rm package-lock.json - else - echo "No package-lock.json file found, reconstructing..." - fi - - node ${reconstructPackageLock} - ''} - - node ${addIntegrityFieldsScript} - ''} - - npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} rebuild - - runHook postRebuild - - if [ "''${dontNpmInstall-}" != "1" ] - then - # NPM tries to download packages even when they already exist if npm-shrinkwrap is used. - rm -f npm-shrinkwrap.json - - npm ${forceOfflineFlag} --nodedir=${nodeSources} --no-bin-links --ignore-scripts ${npmFlags} ${lib.optionalString production "--production"} install - fi - - # Link executables defined in package.json - node ${linkBinsScript} - ''; - - # Builds and composes an NPM package including all its dependencies - buildNodePackage = - { name - , packageName - , version ? null - , dependencies ? [] - , buildInputs ? [] - , production ? true - , npmFlags ? "" - , dontNpmInstall ? false - , bypassCache ? false - , reconstructLock ? false - , preRebuild ? "" - , dontStrip ? true - , unpackPhase ? "true" - , buildPhase ? "true" - , meta ? {} - , ... }@args: - - let - extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" "meta" ]; - in - stdenv.mkDerivation ({ - name = "${name}${if version == null then "" else "-${version}"}"; - buildInputs = [ tarWrapper python nodejs ] - ++ lib.optional (stdenv.isLinux) utillinux - ++ lib.optional (stdenv.isDarwin) libtool - ++ buildInputs; - - inherit nodejs; - - inherit dontStrip; # Stripping may fail a build for some package deployments - inherit dontNpmInstall preRebuild unpackPhase buildPhase; - - compositionScript = composePackage args; - pinpointDependenciesScript = pinpointDependenciesOfPackage args; - - passAsFile = [ "compositionScript" "pinpointDependenciesScript" ]; - - installPhase = '' - source ${installPackage} - - # Create and enter a root node_modules/ folder - mkdir -p $out/lib/node_modules - cd $out/lib/node_modules - - # Compose the package and all its dependencies - source $compositionScriptPath - - ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }} - - # Create symlink to the deployed executable folder, if applicable - if [ -d "$out/lib/node_modules/.bin" ] - then - ln -s $out/lib/node_modules/.bin $out/bin - - # Fixup all executables - ls $out/bin/* | while read i - do - file="$(readlink -f "$i")" - chmod u+rwx "$file" - if isScript "$file" - then - sed -i 's/\r$//' "$file" # convert crlf to lf - fi - done - fi - - # Create symlinks to the deployed manual page folders, if applicable - if [ -d "$out/lib/node_modules/${packageName}/man" ] - then - mkdir -p $out/share - for dir in "$out/lib/node_modules/${packageName}/man/"* - do - mkdir -p $out/share/man/$(basename "$dir") - for page in "$dir"/* - do - ln -s $page $out/share/man/$(basename "$dir") - done - done - fi - - # Run post install hook, if provided - runHook postInstall - ''; - - meta = { - # default to Node.js' platforms - platforms = nodejs.meta.platforms; - } // meta; - } // extraArgs); - - # Builds a node environment (a node_modules folder and a set of binaries) - buildNodeDependencies = - { name - , packageName - , version ? null - , src - , dependencies ? [] - , buildInputs ? [] - , production ? true - , npmFlags ? "" - , dontNpmInstall ? false - , bypassCache ? false - , reconstructLock ? false - , dontStrip ? true - , unpackPhase ? "true" - , buildPhase ? "true" - , ... }@args: - - let - extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ]; - in - stdenv.mkDerivation ({ - name = "node-dependencies-${name}${if version == null then "" else "-${version}"}"; - - buildInputs = [ tarWrapper python nodejs ] - ++ lib.optional (stdenv.isLinux) utillinux - ++ lib.optional (stdenv.isDarwin) libtool - ++ buildInputs; - - inherit dontStrip; # Stripping may fail a build for some package deployments - inherit dontNpmInstall unpackPhase buildPhase; - - includeScript = includeDependencies { inherit dependencies; }; - pinpointDependenciesScript = pinpointDependenciesOfPackage args; - - passAsFile = [ "includeScript" "pinpointDependenciesScript" ]; - - installPhase = '' - source ${installPackage} - - mkdir -p $out/${packageName} - cd $out/${packageName} - - source $includeScriptPath - - # Create fake package.json to make the npm commands work properly - cp ${src}/package.json . - chmod 644 package.json - ${lib.optionalString bypassCache '' - if [ -f ${src}/package-lock.json ] - then - cp ${src}/package-lock.json . - chmod 644 package-lock.json - fi - ''} - - # Go to the parent folder to make sure that all packages are pinpointed - cd .. - ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} - - ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }} - - # Expose the executables that were installed - cd .. - ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} - - mv ${packageName} lib - ln -s $out/lib/node_modules/.bin $out/bin - ''; - } // extraArgs); - - # Builds a development shell - buildNodeShell = - { name - , packageName - , version ? null - , src - , dependencies ? [] - , buildInputs ? [] - , production ? true - , npmFlags ? "" - , dontNpmInstall ? false - , bypassCache ? false - , reconstructLock ? false - , dontStrip ? true - , unpackPhase ? "true" - , buildPhase ? "true" - , ... }@args: - - let - nodeDependencies = buildNodeDependencies args; - extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "unpackPhase" "buildPhase" ]; - in - stdenv.mkDerivation ({ - name = "node-shell-${name}${if version == null then "" else "-${version}"}"; - - buildInputs = [ python nodejs ] ++ lib.optional (stdenv.isLinux) utillinux ++ buildInputs; - buildCommand = '' - mkdir -p $out/bin - cat > $out/bin/shell <<EOF - #! ${stdenv.shell} -e - $shellHook - exec ${stdenv.shell} - EOF - chmod +x $out/bin/shell - ''; - - # Provide the dependencies in a development shell through the NODE_PATH environment variable - inherit nodeDependencies; - shellHook = lib.optionalString (dependencies != []) '' - export NODE_PATH=${nodeDependencies}/lib/node_modules - export PATH="${nodeDependencies}/bin:$PATH" - ''; - } // extraArgs); -in -{ - buildNodeSourceDist = lib.makeOverridable buildNodeSourceDist; - buildNodePackage = lib.makeOverridable buildNodePackage; - buildNodeDependencies = lib.makeOverridable buildNodeDependencies; - buildNodeShell = lib.makeOverridable buildNodeShell; -} diff --git a/pkgs/applications/networking/n8n/node-packages.nix b/pkgs/applications/networking/n8n/node-packages.nix deleted file mode 100644 index c2ccd588615f8..0000000000000 --- a/pkgs/applications/networking/n8n/node-packages.nix +++ /dev/null @@ -1,13476 +0,0 @@ -# This file has been generated by node2nix 1.11.1. Do not edit! - -{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}: - -let - sources = { - "@acuminous/bitsyntax-0.1.2" = { - name = "_at_acuminous_slash_bitsyntax"; - packageName = "@acuminous/bitsyntax"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@acuminous/bitsyntax/-/bitsyntax-0.1.2.tgz"; - sha512 = "29lUK80d1muEQqiUsSo+3A0yP6CdspgC95EnKBMi22Xlwt79i/En4Vr67+cXhU+cZjbti3TgGGC5wy1stIywVQ=="; - }; - }; - "@apidevtools/json-schema-ref-parser-9.0.9" = { - name = "_at_apidevtools_slash_json-schema-ref-parser"; - packageName = "@apidevtools/json-schema-ref-parser"; - version = "9.0.9"; - src = fetchurl { - url = "https://registry.npmjs.org/@apidevtools/json-schema-ref-parser/-/json-schema-ref-parser-9.0.9.tgz"; - sha512 = "GBD2Le9w2+lVFoc4vswGI/TjkNIZSVp7+9xPf+X3uidBfWnAeUWmquteSyt0+VCrhNMWj/FTABISQrD3Z/YA+w=="; - }; - }; - "@authenio/xml-encryption-2.0.2" = { - name = "_at_authenio_slash_xml-encryption"; - packageName = "@authenio/xml-encryption"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@authenio/xml-encryption/-/xml-encryption-2.0.2.tgz"; - sha512 = "cTlrKttbrRHEw3W+0/I609A2Matj5JQaRvfLtEIGZvlN0RaPi+3ANsMeqAyCAVlH/lUIW2tmtBlSMni74lcXeg=="; - }; - }; - "@aws-crypto/crc32-3.0.0" = { - name = "_at_aws-crypto_slash_crc32"; - packageName = "@aws-crypto/crc32"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@aws-crypto/crc32/-/crc32-3.0.0.tgz"; - sha512 = "IzSgsrxUcsrejQbPVilIKy16kAT52EwB6zSaI+M3xxIhKh5+aldEyvI+z6erM7TCLB2BJsFrtHjp6/4/sr+3dA=="; - }; - }; - "@aws-crypto/crc32c-3.0.0" = { - name = "_at_aws-crypto_slash_crc32c"; - packageName = "@aws-crypto/crc32c"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@aws-crypto/crc32c/-/crc32c-3.0.0.tgz"; - sha512 = "ENNPPManmnVJ4BTXlOjAgD7URidbAznURqD0KvfREyc4o20DPYdEldU1f5cQ7Jbj0CJJSPaMIk/9ZshdB3210w=="; - }; - }; - "@aws-crypto/ie11-detection-3.0.0" = { - name = "_at_aws-crypto_slash_ie11-detection"; - packageName = "@aws-crypto/ie11-detection"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@aws-crypto/ie11-detection/-/ie11-detection-3.0.0.tgz"; - sha512 = "341lBBkiY1DfDNKai/wXM3aujNBkXR7tq1URPQDL9wi3AUbI80NR74uF1TXHMm7po1AcnFk8iu2S2IeU/+/A+Q=="; - }; - }; - "@aws-crypto/sha1-browser-3.0.0" = { - name = "_at_aws-crypto_slash_sha1-browser"; - packageName = "@aws-crypto/sha1-browser"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@aws-crypto/sha1-browser/-/sha1-browser-3.0.0.tgz"; - sha512 = "NJth5c997GLHs6nOYTzFKTbYdMNA6/1XlKVgnZoaZcQ7z7UJlOgj2JdbHE8tiYLS3fzXNCguct77SPGat2raSw=="; - }; - }; - "@aws-crypto/sha256-browser-3.0.0" = { - name = "_at_aws-crypto_slash_sha256-browser"; - packageName = "@aws-crypto/sha256-browser"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@aws-crypto/sha256-browser/-/sha256-browser-3.0.0.tgz"; - sha512 = "8VLmW2B+gjFbU5uMeqtQM6Nj0/F1bro80xQXCW6CQBWgosFWXTx77aeOF5CAIAmbOK64SdMBJdNr6J41yP5mvQ=="; - }; - }; - "@aws-crypto/sha256-js-3.0.0" = { - name = "_at_aws-crypto_slash_sha256-js"; - packageName = "@aws-crypto/sha256-js"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@aws-crypto/sha256-js/-/sha256-js-3.0.0.tgz"; - sha512 = "PnNN7os0+yd1XvXAy23CFOmTbMaDxgxXtTKHybrJ39Y8kGzBATgBFibWJKH6BhytLI/Zyszs87xCOBNyBig6vQ=="; - }; - }; - "@aws-crypto/supports-web-crypto-3.0.0" = { - name = "_at_aws-crypto_slash_supports-web-crypto"; - packageName = "@aws-crypto/supports-web-crypto"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@aws-crypto/supports-web-crypto/-/supports-web-crypto-3.0.0.tgz"; - sha512 = "06hBdMwUAb2WFTuGG73LSC0wfPu93xWwo5vL2et9eymgmu3Id5vFAHBbajVWiGhPO37qcsdCap/FqXvJGJWPIg=="; - }; - }; - "@aws-crypto/util-3.0.0" = { - name = "_at_aws-crypto_slash_util"; - packageName = "@aws-crypto/util"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@aws-crypto/util/-/util-3.0.0.tgz"; - sha512 = "2OJlpeJpCR48CC8r+uKVChzs9Iungj9wkZrl8Z041DWEWvyIHILYKCPNzJghKsivj+S3mLo6BVc7mBNzdxA46w=="; - }; - }; - "@aws-sdk/client-cognito-identity-3.427.0" = { - name = "_at_aws-sdk_slash_client-cognito-identity"; - packageName = "@aws-sdk/client-cognito-identity"; - version = "3.427.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.427.0.tgz"; - sha512 = "9brRaNnl6haE7R3R43A5CSNw0k1YtB3xjuArbMg/p6NDUpvRSRgOVNWu2R02Yjh/j2ZuaLOCPLuCipb+PHQPKQ=="; - }; - }; - "@aws-sdk/client-s3-3.427.0" = { - name = "_at_aws-sdk_slash_client-s3"; - packageName = "@aws-sdk/client-s3"; - version = "3.427.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/client-s3/-/client-s3-3.427.0.tgz"; - sha512 = "YKjJ9zgn0oE393HURKgvjNoX6lxUjb+dkTBE1GymFnGCPl6VxQbKXajXWNqUyN+oPPlZ2osEiljPaN0RserUjA=="; - }; - }; - "@aws-sdk/client-sso-3.427.0" = { - name = "_at_aws-sdk_slash_client-sso"; - packageName = "@aws-sdk/client-sso"; - version = "3.427.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.427.0.tgz"; - sha512 = "sFVFEmsQ1rmgYO1SgrOTxE/MTKpeE4hpOkm1WqhLQK7Ij136vXpjCxjH1JYZiHiUzO1wr9t4ex4dlB5J3VS/Xg=="; - }; - }; - "@aws-sdk/client-sts-3.427.0" = { - name = "_at_aws-sdk_slash_client-sts"; - packageName = "@aws-sdk/client-sts"; - version = "3.427.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.427.0.tgz"; - sha512 = "le2wLJKILyWuRfPz2HbyaNtu5kEki+ojUkTqCU6FPDRrqUvEkaaCBH9Awo/2AtrCfRkiobop8RuTTj6cAnpiJg=="; - }; - }; - "@aws-sdk/credential-provider-cognito-identity-3.427.0" = { - name = "_at_aws-sdk_slash_credential-provider-cognito-identity"; - packageName = "@aws-sdk/credential-provider-cognito-identity"; - version = "3.427.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.427.0.tgz"; - sha512 = "BQNzNrMJlBAfXhYNdAUqaVASpT9Aho5swj7glZKxx4Uds1w5Pih2e14JWgnl8XgUWAZ36pchTrV1aA4JT7N8vw=="; - }; - }; - "@aws-sdk/credential-provider-env-3.425.0" = { - name = "_at_aws-sdk_slash_credential-provider-env"; - packageName = "@aws-sdk/credential-provider-env"; - version = "3.425.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.425.0.tgz"; - sha512 = "J20etnLvMKXRVi5FK4F8yOCNm2RTaQn5psQTGdDEPWJNGxohcSpzzls8U2KcMyUJ+vItlrThr4qwgpHG3i/N0w=="; - }; - }; - "@aws-sdk/credential-provider-http-3.425.0" = { - name = "_at_aws-sdk_slash_credential-provider-http"; - packageName = "@aws-sdk/credential-provider-http"; - version = "3.425.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.425.0.tgz"; - sha512 = "aP9nkoVWf+OlNMecrUqe4+RuQrX13nucVbty0HTvuwfwJJj0T6ByWZzle+fo1D+5OxvJmtzTflBWt6jUERdHWA=="; - }; - }; - "@aws-sdk/credential-provider-ini-3.427.0" = { - name = "_at_aws-sdk_slash_credential-provider-ini"; - packageName = "@aws-sdk/credential-provider-ini"; - version = "3.427.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.427.0.tgz"; - sha512 = "NmH1cO/w98CKMltYec3IrJIIco19wRjATFNiw83c+FGXZ+InJwReqBnruxIOmKTx2KDzd6fwU1HOewS7UjaaaQ=="; - }; - }; - "@aws-sdk/credential-provider-node-3.427.0" = { - name = "_at_aws-sdk_slash_credential-provider-node"; - packageName = "@aws-sdk/credential-provider-node"; - version = "3.427.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.427.0.tgz"; - sha512 = "wYYbQ57nKL8OfgRbl8k6uXcdnYml+p3LSSfDUAuUEp1HKlQ8lOXFJ3BdLr5qrk7LhpyppSRnWBmh2c3kWa7ANQ=="; - }; - }; - "@aws-sdk/credential-provider-process-3.425.0" = { - name = "_at_aws-sdk_slash_credential-provider-process"; - packageName = "@aws-sdk/credential-provider-process"; - version = "3.425.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.425.0.tgz"; - sha512 = "YY6tkLdvtb1Fgofp3b1UWO+5vwS14LJ/smGmuGpSba0V7gFJRdcrJ9bcb9vVgAGuMdjzRJ+bUKlLLtqXkaykEw=="; - }; - }; - "@aws-sdk/credential-provider-sso-3.427.0" = { - name = "_at_aws-sdk_slash_credential-provider-sso"; - packageName = "@aws-sdk/credential-provider-sso"; - version = "3.427.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.427.0.tgz"; - sha512 = "c+tXyS/i49erHs4bAp6vKNYeYlyQ0VNMBgoco0LCn1rL0REtHbfhWMnqDLF6c2n3yIWDOTrQu0D73Idnpy16eA=="; - }; - }; - "@aws-sdk/credential-provider-web-identity-3.425.0" = { - name = "_at_aws-sdk_slash_credential-provider-web-identity"; - packageName = "@aws-sdk/credential-provider-web-identity"; - version = "3.425.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.425.0.tgz"; - sha512 = "/0R65TgRzL01JU3SzloivWNwdkbIhr06uY/F5pBHf/DynQqaspKNfdHn6AiozgSVDfwRHFjKBTUy6wvf3QFkuA=="; - }; - }; - "@aws-sdk/credential-providers-3.427.0" = { - name = "_at_aws-sdk_slash_credential-providers"; - packageName = "@aws-sdk/credential-providers"; - version = "3.427.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-providers/-/credential-providers-3.427.0.tgz"; - sha512 = "rKKohSHju462vo+uQnPjcEZPBAfAMgGH6K1XyyCNpuOC0yYLkG87PYpvAQeb8riTrkHPX0dYUHuTHZ6zQgMGjA=="; - }; - }; - "@aws-sdk/middleware-bucket-endpoint-3.425.0" = { - name = "_at_aws-sdk_slash_middleware-bucket-endpoint"; - packageName = "@aws-sdk/middleware-bucket-endpoint"; - version = "3.425.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-bucket-endpoint/-/middleware-bucket-endpoint-3.425.0.tgz"; - sha512 = "7UTfA10fmDw9cgHLApxRUNPywZTG4S/1TNZgTxndO/1OM9ZHtIatw1iLbqJD35gHrpEYI8Vo14YvcnD2ITuiMw=="; - }; - }; - "@aws-sdk/middleware-expect-continue-3.425.0" = { - name = "_at_aws-sdk_slash_middleware-expect-continue"; - packageName = "@aws-sdk/middleware-expect-continue"; - version = "3.425.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-expect-continue/-/middleware-expect-continue-3.425.0.tgz"; - sha512 = "CqAmnDST2o7+sKKw2/ffHKiYKE+jZb/Ce9U0P//ZYzqp9R1Wb016ID+W6DoxufyPJAS9dpRMcUDnAssmMIC/EA=="; - }; - }; - "@aws-sdk/middleware-flexible-checksums-3.425.0" = { - name = "_at_aws-sdk_slash_middleware-flexible-checksums"; - packageName = "@aws-sdk/middleware-flexible-checksums"; - version = "3.425.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-flexible-checksums/-/middleware-flexible-checksums-3.425.0.tgz"; - sha512 = "BDwn2vVVsC/AzmHXQlaZhEpKXL7GfKFpH7ZFccZuwEQBcyn8lVCcwtfaRe5P1mEe2wklVzOXd1dw8bt0+BOUPA=="; - }; - }; - "@aws-sdk/middleware-host-header-3.425.0" = { - name = "_at_aws-sdk_slash_middleware-host-header"; - packageName = "@aws-sdk/middleware-host-header"; - version = "3.425.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.425.0.tgz"; - sha512 = "E5Gt41LObQ+cr8QnLthwsH3MtVSNXy1AKJMowDr85h0vzqA/FHUkgHyOGntgozzjXT5M0MaSRYxS0xwTR5D4Ew=="; - }; - }; - "@aws-sdk/middleware-location-constraint-3.425.0" = { - name = "_at_aws-sdk_slash_middleware-location-constraint"; - packageName = "@aws-sdk/middleware-location-constraint"; - version = "3.425.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-location-constraint/-/middleware-location-constraint-3.425.0.tgz"; - sha512 = "3rt0LpGmL1LCRFuEObS1yERd9OEV+AEIAvhY7b53M7u7SyrjWQtpntWkI365L/QljhgMXQBfps2qO4JtrhQnsA=="; - }; - }; - "@aws-sdk/middleware-logger-3.425.0" = { - name = "_at_aws-sdk_slash_middleware-logger"; - packageName = "@aws-sdk/middleware-logger"; - version = "3.425.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.425.0.tgz"; - sha512 = "INE9XWRXx2f4a/r2vOU0tAmgctVp7nEaEasemNtVBYhqbKLZvr9ndLBSgKGgJ8LIcXAoISipaMuFiqIGkFsm7A=="; - }; - }; - "@aws-sdk/middleware-recursion-detection-3.425.0" = { - name = "_at_aws-sdk_slash_middleware-recursion-detection"; - packageName = "@aws-sdk/middleware-recursion-detection"; - version = "3.425.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.425.0.tgz"; - sha512 = "77gnzJ5b91bgD75L/ugpOyerx6lR3oyS4080X1YI58EzdyBMkDrHM4FbMcY2RynETi3lwXCFzLRyZjWXY1mRlw=="; - }; - }; - "@aws-sdk/middleware-sdk-s3-3.427.0" = { - name = "_at_aws-sdk_slash_middleware-sdk-s3"; - packageName = "@aws-sdk/middleware-sdk-s3"; - version = "3.427.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.427.0.tgz"; - sha512 = "virGCf9vsqYCLpmngLOZOVSYgVr2cCOCvTuRoT9vf5tD/63JwaC173jnbdoJO6CWI7ID5Iz0eNdgITXVQ2mpew=="; - }; - }; - "@aws-sdk/middleware-sdk-sts-3.425.0" = { - name = "_at_aws-sdk_slash_middleware-sdk-sts"; - packageName = "@aws-sdk/middleware-sdk-sts"; - version = "3.425.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-sdk-sts/-/middleware-sdk-sts-3.425.0.tgz"; - sha512 = "JFojrg76oKAoBknnr9EL5N2aJ1mRCtBqXoZYST58GSx8uYdFQ89qS65VNQ8JviBXzsrCNAn4vDhZ5Ch5E6TxGQ=="; - }; - }; - "@aws-sdk/middleware-signing-3.425.0" = { - name = "_at_aws-sdk_slash_middleware-signing"; - packageName = "@aws-sdk/middleware-signing"; - version = "3.425.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-signing/-/middleware-signing-3.425.0.tgz"; - sha512 = "ZpOfgJHk7ovQ0sSwg3tU4NxFOnz53lJlkJRf7S+wxQALHM0P2MJ6LYBrZaFMVsKiJxNIdZBXD6jclgHg72ZW6Q=="; - }; - }; - "@aws-sdk/middleware-ssec-3.425.0" = { - name = "_at_aws-sdk_slash_middleware-ssec"; - packageName = "@aws-sdk/middleware-ssec"; - version = "3.425.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-ssec/-/middleware-ssec-3.425.0.tgz"; - sha512 = "9HTuXnHYAZWkwPC8x9tElsQjFPxDT//orbIFauS7VF5HkLCKn9J6O6lW1wKMxrEnDwfN/Vi3nw479MoPj5Ss0Q=="; - }; - }; - "@aws-sdk/middleware-user-agent-3.427.0" = { - name = "_at_aws-sdk_slash_middleware-user-agent"; - packageName = "@aws-sdk/middleware-user-agent"; - version = "3.427.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.427.0.tgz"; - sha512 = "y9HxYsNvnA3KqDl8w1jHeCwz4P9CuBEtu/G+KYffLeAMBsMZmh4SIkFFCO9wE/dyYg6+yo07rYcnnIfy7WA0bw=="; - }; - }; - "@aws-sdk/region-config-resolver-3.425.0" = { - name = "_at_aws-sdk_slash_region-config-resolver"; - packageName = "@aws-sdk/region-config-resolver"; - version = "3.425.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/region-config-resolver/-/region-config-resolver-3.425.0.tgz"; - sha512 = "u7uv/iUOapIJdRgRkO3wnpYsUgV6ponsZJQgVg/8L+n+Vo5PQL5gAcIuAOwcYSKQPFaeK+KbmByI4SyOK203Vw=="; - }; - }; - "@aws-sdk/signature-v4-multi-region-3.425.0" = { - name = "_at_aws-sdk_slash_signature-v4-multi-region"; - packageName = "@aws-sdk/signature-v4-multi-region"; - version = "3.425.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/signature-v4-multi-region/-/signature-v4-multi-region-3.425.0.tgz"; - sha512 = "7n2FRPE9rLaVa26xXQJ8TExrt53dWN824axQd1a0r5va0SmMQYG/iV5LBmwUlAntUSq46Lse4Q5YnbOVedGOmw=="; - }; - }; - "@aws-sdk/token-providers-3.427.0" = { - name = "_at_aws-sdk_slash_token-providers"; - packageName = "@aws-sdk/token-providers"; - version = "3.427.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.427.0.tgz"; - sha512 = "4E5E+4p8lJ69PBY400dJXF06LUHYx5lkKzBEsYqWWhoZcoftrvi24ltIhUDoGVLkrLcTHZIWSdFAWSos4hXqeg=="; - }; - }; - "@aws-sdk/types-3.425.0" = { - name = "_at_aws-sdk_slash_types"; - packageName = "@aws-sdk/types"; - version = "3.425.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/types/-/types-3.425.0.tgz"; - sha512 = "6lqbmorwerN4v+J5dqbHPAsjynI0mkEF+blf+69QTaKKGaxBBVaXgqoqul9RXYcK5MMrrYRbQIMd0zYOoy90kA=="; - }; - }; - "@aws-sdk/util-arn-parser-3.310.0" = { - name = "_at_aws-sdk_slash_util-arn-parser"; - packageName = "@aws-sdk/util-arn-parser"; - version = "3.310.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-arn-parser/-/util-arn-parser-3.310.0.tgz"; - sha512 = "jL8509owp/xB9+Or0pvn3Fe+b94qfklc2yPowZZIFAkFcCSIdkIglz18cPDWnYAcy9JGewpMS1COXKIUhZkJsA=="; - }; - }; - "@aws-sdk/util-endpoints-3.427.0" = { - name = "_at_aws-sdk_slash_util-endpoints"; - packageName = "@aws-sdk/util-endpoints"; - version = "3.427.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.427.0.tgz"; - sha512 = "rSyiAIFF/EVvity/+LWUqoTMJ0a25RAc9iqx0WZ4tf1UjuEXRRXxZEb+jEZg1bk+pY84gdLdx9z5E+MSJCZxNQ=="; - }; - }; - "@aws-sdk/util-locate-window-3.310.0" = { - name = "_at_aws-sdk_slash_util-locate-window"; - packageName = "@aws-sdk/util-locate-window"; - version = "3.310.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-locate-window/-/util-locate-window-3.310.0.tgz"; - sha512 = "qo2t/vBTnoXpjKxlsC2e1gBrRm80M3bId27r0BRB2VniSSe7bL1mmzM+/HFtujm0iAxtPM+aLEflLJlJeDPg0w=="; - }; - }; - "@aws-sdk/util-user-agent-browser-3.425.0" = { - name = "_at_aws-sdk_slash_util-user-agent-browser"; - packageName = "@aws-sdk/util-user-agent-browser"; - version = "3.425.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.425.0.tgz"; - sha512 = "22Y9iMtjGcFjGILR6/xdp1qRezlHVLyXtnpEsbuPTiernRCPk6zfAnK/ATH77r02MUjU057tdxVkd5umUBTn9Q=="; - }; - }; - "@aws-sdk/util-user-agent-node-3.425.0" = { - name = "_at_aws-sdk_slash_util-user-agent-node"; - packageName = "@aws-sdk/util-user-agent-node"; - version = "3.425.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.425.0.tgz"; - sha512 = "SIR4F5uQeeVAi8lv4OgRirtdtNi5zeyogTuQgGi9su8F/WP1N6JqxofcwpUY5f8/oJ2UlXr/tx1f09UHfJJzvA=="; - }; - }; - "@aws-sdk/util-utf8-browser-3.259.0" = { - name = "_at_aws-sdk_slash_util-utf8-browser"; - packageName = "@aws-sdk/util-utf8-browser"; - version = "3.259.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-utf8-browser/-/util-utf8-browser-3.259.0.tgz"; - sha512 = "UvFa/vR+e19XookZF8RzFZBrw2EUkQWxiBW0yYQAhvk3C+QVGl0H3ouca8LDBlBfQKXwmW3huo/59H8rwb1wJw=="; - }; - }; - "@aws-sdk/xml-builder-3.310.0" = { - name = "_at_aws-sdk_slash_xml-builder"; - packageName = "@aws-sdk/xml-builder"; - version = "3.310.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/xml-builder/-/xml-builder-3.310.0.tgz"; - sha512 = "TqELu4mOuSIKQCqj63fGVs86Yh+vBx5nHRpWKNUNhB2nPTpfbziTs5c1X358be3peVWA4wPxW7Nt53KIg1tnNw=="; - }; - }; - "@azure/abort-controller-1.1.0" = { - name = "_at_azure_slash_abort-controller"; - packageName = "@azure/abort-controller"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@azure/abort-controller/-/abort-controller-1.1.0.tgz"; - sha512 = "TrRLIoSQVzfAJX9H1JeFjzAoDGcoK1IYX1UImfceTZpsyYfWr09Ss1aHW1y5TrrR3iq6RZLBwJ3E24uwPhwahw=="; - }; - }; - "@azure/core-auth-1.5.0" = { - name = "_at_azure_slash_core-auth"; - packageName = "@azure/core-auth"; - version = "1.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@azure/core-auth/-/core-auth-1.5.0.tgz"; - sha512 = "udzoBuYG1VBoHVohDTrvKjyzel34zt77Bhp7dQntVGGD0ehVq48owENbBG8fIgkHRNUBQH5k1r0hpoMu5L8+kw=="; - }; - }; - "@azure/core-client-1.7.3" = { - name = "_at_azure_slash_core-client"; - packageName = "@azure/core-client"; - version = "1.7.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@azure/core-client/-/core-client-1.7.3.tgz"; - sha512 = "kleJ1iUTxcO32Y06dH9Pfi9K4U+Tlb111WXEnbt7R/ne+NLRwppZiTGJuTD5VVoxTMK5NTbEtm5t2vcdNCFe2g=="; - }; - }; - "@azure/core-http-3.0.3" = { - name = "_at_azure_slash_core-http"; - packageName = "@azure/core-http"; - version = "3.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@azure/core-http/-/core-http-3.0.3.tgz"; - sha512 = "QMib3wXotJMFhHgmJBPUF9YsyErw34H0XDFQd9CauH7TPB+RGcyl9Ayy7iURtJB04ngXhE6YwrQsWDXlSLrilg=="; - }; - }; - "@azure/core-http-compat-1.3.0" = { - name = "_at_azure_slash_core-http-compat"; - packageName = "@azure/core-http-compat"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@azure/core-http-compat/-/core-http-compat-1.3.0.tgz"; - sha512 = "ZN9avruqbQ5TxopzG3ih3KRy52n8OAbitX3fnZT5go4hzu0J+KVPSzkL+Wt3hpJpdG8WIfg1sBD1tWkgUdEpBA=="; - }; - }; - "@azure/core-lro-2.5.4" = { - name = "_at_azure_slash_core-lro"; - packageName = "@azure/core-lro"; - version = "2.5.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@azure/core-lro/-/core-lro-2.5.4.tgz"; - sha512 = "3GJiMVH7/10bulzOKGrrLeG/uCBH/9VtxqaMcB9lIqAeamI/xYQSHJL/KcsLDuH+yTjYpro/u6D/MuRe4dN70Q=="; - }; - }; - "@azure/core-paging-1.5.0" = { - name = "_at_azure_slash_core-paging"; - packageName = "@azure/core-paging"; - version = "1.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@azure/core-paging/-/core-paging-1.5.0.tgz"; - sha512 = "zqWdVIt+2Z+3wqxEOGzR5hXFZ8MGKK52x4vFLw8n58pR6ZfKRx3EXYTxTaYxYHc/PexPUTyimcTWFJbji9Z6Iw=="; - }; - }; - "@azure/core-rest-pipeline-1.12.1" = { - name = "_at_azure_slash_core-rest-pipeline"; - packageName = "@azure/core-rest-pipeline"; - version = "1.12.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@azure/core-rest-pipeline/-/core-rest-pipeline-1.12.1.tgz"; - sha512 = "SsyWQ+T5MFQRX+M8H/66AlaI6HyCbQStGfFngx2fuiW+vKI2DkhtOvbYodPyf9fOe/ARLWWc3ohX54lQ5Kmaog=="; - }; - }; - "@azure/core-tracing-1.0.0-preview.13" = { - name = "_at_azure_slash_core-tracing"; - packageName = "@azure/core-tracing"; - version = "1.0.0-preview.13"; - src = fetchurl { - url = "https://registry.npmjs.org/@azure/core-tracing/-/core-tracing-1.0.0-preview.13.tgz"; - sha512 = "KxDlhXyMlh2Jhj2ykX6vNEU0Vou4nHr025KoSEiz7cS3BNiHNaZcdECk/DmLkEB0as5T7b/TpRcehJ5yV6NeXQ=="; - }; - }; - "@azure/core-tracing-1.0.1" = { - name = "_at_azure_slash_core-tracing"; - packageName = "@azure/core-tracing"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@azure/core-tracing/-/core-tracing-1.0.1.tgz"; - sha512 = "I5CGMoLtX+pI17ZdiFJZgxMJApsK6jjfm85hpgp3oazCdq5Wxgh4wMr7ge/TTWW1B5WBuvIOI1fMU/FrOAMKrw=="; - }; - }; - "@azure/core-util-1.5.0" = { - name = "_at_azure_slash_core-util"; - packageName = "@azure/core-util"; - version = "1.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@azure/core-util/-/core-util-1.5.0.tgz"; - sha512 = "GZBpVFDtQ/15hW1OgBcRdT4Bl7AEpcEZqLfbAvOtm1CQUncKWiYapFHVD588hmlV27NbOOtSm3cnLF3lvoHi4g=="; - }; - }; - "@azure/identity-2.1.0" = { - name = "_at_azure_slash_identity"; - packageName = "@azure/identity"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@azure/identity/-/identity-2.1.0.tgz"; - sha512 = "BPDz1sK7Ul9t0l9YKLEa8PHqWU4iCfhGJ+ELJl6c8CP3TpJt2urNCbm0ZHsthmxRsYoMPbz2Dvzj30zXZVmAFw=="; - }; - }; - "@azure/keyvault-keys-4.7.2" = { - name = "_at_azure_slash_keyvault-keys"; - packageName = "@azure/keyvault-keys"; - version = "4.7.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@azure/keyvault-keys/-/keyvault-keys-4.7.2.tgz"; - sha512 = "VdIH6PjbQ3J5ntK+xeI8eOe1WsDxF9ndXw8BPR/9MZVnIj0vQNtNCS6gpR7EFQeGcs8XjzMfHm0AvKGErobqJQ=="; - }; - }; - "@azure/logger-1.0.4" = { - name = "_at_azure_slash_logger"; - packageName = "@azure/logger"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@azure/logger/-/logger-1.0.4.tgz"; - sha512 = "ustrPY8MryhloQj7OWGe+HrYx+aoiOxzbXTtgblbV3xwCqpzUK36phH3XNHQKj3EPonyFUuDTfR3qFhTEAuZEg=="; - }; - }; - "@azure/msal-browser-2.38.2" = { - name = "_at_azure_slash_msal-browser"; - packageName = "@azure/msal-browser"; - version = "2.38.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@azure/msal-browser/-/msal-browser-2.38.2.tgz"; - sha512 = "71BeIn2we6LIgMplwCSaMq5zAwmalyJR3jFcVOZxNVfQ1saBRwOD+P77nLs5vrRCedVKTq8RMFhIOdpMLNno0A=="; - }; - }; - "@azure/msal-common-13.3.0" = { - name = "_at_azure_slash_msal-common"; - packageName = "@azure/msal-common"; - version = "13.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@azure/msal-common/-/msal-common-13.3.0.tgz"; - sha512 = "/VFWTicjcJbrGp3yQP7A24xU95NiDMe23vxIU1U6qdRPFsprMDNUohMudclnd+WSHE4/McqkZs/nUU3sAKkVjg=="; - }; - }; - "@azure/msal-common-7.6.0" = { - name = "_at_azure_slash_msal-common"; - packageName = "@azure/msal-common"; - version = "7.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@azure/msal-common/-/msal-common-7.6.0.tgz"; - sha512 = "XqfbglUTVLdkHQ8F9UQJtKseRr3sSnr9ysboxtoswvaMVaEfvyLtMoHv9XdKUfOc0qKGzNgRFd9yRjIWVepl6Q=="; - }; - }; - "@azure/msal-node-1.18.3" = { - name = "_at_azure_slash_msal-node"; - packageName = "@azure/msal-node"; - version = "1.18.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@azure/msal-node/-/msal-node-1.18.3.tgz"; - sha512 = "lI1OsxNbS/gxRD4548Wyj22Dk8kS7eGMwD9GlBZvQmFV8FJUXoXySL1BiNzDsHUE96/DS/DHmA+F73p1Dkcktg=="; - }; - }; - "@azure/storage-blob-12.16.0" = { - name = "_at_azure_slash_storage-blob"; - packageName = "@azure/storage-blob"; - version = "12.16.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@azure/storage-blob/-/storage-blob-12.16.0.tgz"; - sha512 = "jz33rUSUGUB65FgYrTRgRDjG6hdPHwfvHe+g/UrwVG8MsyLqSxg9TaW7Yuhjxu1v1OZ5xam2NU6+IpCN0xJO8Q=="; - }; - }; - "@babel/runtime-7.23.1" = { - name = "_at_babel_slash_runtime"; - packageName = "@babel/runtime"; - version = "7.23.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.23.1.tgz"; - sha512 = "hC2v6p8ZSI/W0HUzh3V8C5g+NwSKzKPtJwSpTjwl0o297GP9+ZLQSkdvHz46CM3LqyoXxq+5G9komY+eSqSO0g=="; - }; - }; - "@colors/colors-1.5.0" = { - name = "_at_colors_slash_colors"; - packageName = "@colors/colors"; - version = "1.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@colors/colors/-/colors-1.5.0.tgz"; - sha512 = "ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ=="; - }; - }; - "@colors/colors-1.6.0" = { - name = "_at_colors_slash_colors"; - packageName = "@colors/colors"; - version = "1.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@colors/colors/-/colors-1.6.0.tgz"; - sha512 = "Ir+AOibqzrIsL6ajt3Rz3LskB7OiMVHqltZmspbW/TJuTVuyOMirVqAkjfY6JISiLHgyNqicAC8AyHHGzNd/dA=="; - }; - }; - "@cspotcode/source-map-support-0.8.1" = { - name = "_at_cspotcode_slash_source-map-support"; - packageName = "@cspotcode/source-map-support"; - version = "0.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz"; - sha512 = "IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw=="; - }; - }; - "@curlconverter/yargs-0.0.2" = { - name = "_at_curlconverter_slash_yargs"; - packageName = "@curlconverter/yargs"; - version = "0.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@curlconverter/yargs/-/yargs-0.0.2.tgz"; - sha512 = "Q1YEebpCY61kxme4wvU0/IN/uMBfG5pZOKCo9FU+w20ElPvN+eH2qEVbK1C12t3Tee3qeYLLEU6HkiUeO1gc4A=="; - }; - }; - "@curlconverter/yargs-parser-0.0.1" = { - name = "_at_curlconverter_slash_yargs-parser"; - packageName = "@curlconverter/yargs-parser"; - version = "0.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@curlconverter/yargs-parser/-/yargs-parser-0.0.1.tgz"; - sha512 = "DbEVRYqrorzwqc63MQ3RODflut1tNla8ZCKo1h83lF7+fbntgubZsDfRDBv5Lxj3vkKuvAolysNM2ekwJev8wA=="; - }; - }; - "@dabh/diagnostics-2.0.3" = { - name = "_at_dabh_slash_diagnostics"; - packageName = "@dabh/diagnostics"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@dabh/diagnostics/-/diagnostics-2.0.3.tgz"; - sha512 = "hrlQOIi7hAfzsMqlGSFyVucrx38O+j6wiGOf//H2ecvIEqYN4ADBSS2iLMh5UFyDunCNniUIPk/q3riFv45xRA=="; - }; - }; - "@ewoudenberg/difflib-0.1.0" = { - name = "_at_ewoudenberg_slash_difflib"; - packageName = "@ewoudenberg/difflib"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@ewoudenberg/difflib/-/difflib-0.1.0.tgz"; - sha512 = "OU5P5mJyD3OoWYMWY+yIgwvgNS9cFAU10f+DDuvtogcWQOoJIsQ4Hy2McSfUfhKjq8L0FuWVb4Rt7kgA+XK86A=="; - }; - }; - "@fastify/busboy-2.0.0" = { - name = "_at_fastify_slash_busboy"; - packageName = "@fastify/busboy"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@fastify/busboy/-/busboy-2.0.0.tgz"; - sha512 = "JUFJad5lv7jxj926GPgymrWQxxjPYuJNiNjNMzqT+HiuP6Vl3dk5xzG+8sTX96np0ZAluvaMzPsjhHZ5rNuNQQ=="; - }; - }; - "@gar/promisify-1.1.3" = { - name = "_at_gar_slash_promisify"; - packageName = "@gar/promisify"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.3.tgz"; - sha512 = "k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw=="; - }; - }; - "@google-cloud/common-3.10.0" = { - name = "_at_google-cloud_slash_common"; - packageName = "@google-cloud/common"; - version = "3.10.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@google-cloud/common/-/common-3.10.0.tgz"; - sha512 = "XMbJYMh/ZSaZnbnrrOFfR/oQrb0SxG4qh6hDisWCoEbFcBHV0qHQo4uXfeMCzolx2Mfkh6VDaOGg+hyJsmxrlw=="; - }; - }; - "@google-cloud/paginator-3.0.7" = { - name = "_at_google-cloud_slash_paginator"; - packageName = "@google-cloud/paginator"; - version = "3.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@google-cloud/paginator/-/paginator-3.0.7.tgz"; - sha512 = "jJNutk0arIQhmpUUQJPJErsojqo834KcyB6X7a1mxuic8i1tKXxde8E69IZxNZawRIlZdIK2QY4WALvlK5MzYQ=="; - }; - }; - "@google-cloud/precise-date-2.0.4" = { - name = "_at_google-cloud_slash_precise-date"; - packageName = "@google-cloud/precise-date"; - version = "2.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@google-cloud/precise-date/-/precise-date-2.0.4.tgz"; - sha512 = "nOB+mZdevI/1Si0QAfxWfzzIqFdc7wrO+DYePFvgbOoMtvX+XfFTINNt7e9Zg66AbDbWCPRnikU+6f5LTm9Wyg=="; - }; - }; - "@google-cloud/projectify-2.1.1" = { - name = "_at_google-cloud_slash_projectify"; - packageName = "@google-cloud/projectify"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@google-cloud/projectify/-/projectify-2.1.1.tgz"; - sha512 = "+rssMZHnlh0twl122gXY4/aCrk0G1acBqkHFfYddtsqpYXGxA29nj9V5V9SfC+GyOG00l650f6lG9KL+EpFEWQ=="; - }; - }; - "@google-cloud/projectify-3.0.0" = { - name = "_at_google-cloud_slash_projectify"; - packageName = "@google-cloud/projectify"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@google-cloud/projectify/-/projectify-3.0.0.tgz"; - sha512 = "HRkZsNmjScY6Li8/kb70wjGlDDyLkVk3KvoEo9uIoxSjYLJasGiCch9+PqRVDOCGUFvEIqyogl+BeqILL4OJHA=="; - }; - }; - "@google-cloud/promisify-2.0.4" = { - name = "_at_google-cloud_slash_promisify"; - packageName = "@google-cloud/promisify"; - version = "2.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@google-cloud/promisify/-/promisify-2.0.4.tgz"; - sha512 = "j8yRSSqswWi1QqUGKVEKOG03Q7qOoZP6/h2zN2YO+F5h2+DHU0bSrHCK9Y7lo2DI9fBd8qGAw795sf+3Jva4yA=="; - }; - }; - "@google-cloud/promisify-3.0.1" = { - name = "_at_google-cloud_slash_promisify"; - packageName = "@google-cloud/promisify"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@google-cloud/promisify/-/promisify-3.0.1.tgz"; - sha512 = "z1CjRjtQyBOYL+5Qr9DdYIfrdLBe746jRTYfaYU6MeXkqp7UfYs/jX16lFFVzZ7PGEJvqZNqYUEtb1mvDww4pA=="; - }; - }; - "@google-cloud/spanner-5.18.0" = { - name = "_at_google-cloud_slash_spanner"; - packageName = "@google-cloud/spanner"; - version = "5.18.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@google-cloud/spanner/-/spanner-5.18.0.tgz"; - sha512 = "KcfepoEuGsjqjeI8cVWfJ9yPdYJFPnpMzdZg3FX2W4MzNOzeNrJEB/EfD/epOOZ/fNhRlUTl+tLFN3WjVxcWlw=="; - }; - }; - "@google-cloud/storage-6.12.0" = { - name = "_at_google-cloud_slash_storage"; - packageName = "@google-cloud/storage"; - version = "6.12.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@google-cloud/storage/-/storage-6.12.0.tgz"; - sha512 = "78nNAY7iiZ4O/BouWMWTD/oSF2YtYgYB3GZirn0To6eBOugjXVoK+GXgUXOl+HlqbAOyHxAVXOlsj3snfbQ1dw=="; - }; - }; - "@grpc/grpc-js-1.6.12" = { - name = "_at_grpc_slash_grpc-js"; - packageName = "@grpc/grpc-js"; - version = "1.6.12"; - src = fetchurl { - url = "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.6.12.tgz"; - sha512 = "JmvQ03OTSpVd9JTlj/K3IWHSz4Gk/JMLUTtW7Zb0KvO1LcOYGATh5cNuRYzCAeDR3O8wq+q8FZe97eO9MBrkUw=="; - }; - }; - "@grpc/proto-loader-0.6.13" = { - name = "_at_grpc_slash_proto-loader"; - packageName = "@grpc/proto-loader"; - version = "0.6.13"; - src = fetchurl { - url = "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.6.13.tgz"; - sha512 = "FjxPYDRTn6Ec3V0arm1FtSpmP6V50wuph2yILpyvTKzjc76oDdoihXqM1DzOW5ubvCC8GivfCnNtfaRE8myJ7g=="; - }; - }; - "@grpc/proto-loader-0.7.10" = { - name = "_at_grpc_slash_proto-loader"; - packageName = "@grpc/proto-loader"; - version = "0.7.10"; - src = fetchurl { - url = "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.7.10.tgz"; - sha512 = "CAqDfoaQ8ykFd9zqBDn4k6iWT9loLAlc2ETmDFS9JCD70gDcnA4L3AFEo2iV7KyAtAAHFW9ftq1Fz+Vsgq80RQ=="; - }; - }; - "@httptoolkit/websocket-stream-6.0.1" = { - name = "_at_httptoolkit_slash_websocket-stream"; - packageName = "@httptoolkit/websocket-stream"; - version = "6.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@httptoolkit/websocket-stream/-/websocket-stream-6.0.1.tgz"; - sha512 = "A0NOZI+Glp3Xgcz6Na7i7o09+/+xm2m0UCU8gdtM2nIv6/cjLmhMZMqehSpTlgbx9omtLmV8LVqOskPEyWnmZQ=="; - }; - }; - "@icetee/ftp-0.3.15" = { - name = "_at_icetee_slash_ftp"; - packageName = "@icetee/ftp"; - version = "0.3.15"; - src = fetchurl { - url = "https://registry.npmjs.org/@icetee/ftp/-/ftp-0.3.15.tgz"; - sha512 = "RxSa9VjcDWgWCYsaLdZItdCnJj7p4LxggaEk+Y3MP0dHKoxez8ioG07DVekVbZZqccsrL+oPB/N9AzVPxj4blg=="; - }; - }; - "@ioredis/commands-1.2.0" = { - name = "_at_ioredis_slash_commands"; - packageName = "@ioredis/commands"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@ioredis/commands/-/commands-1.2.0.tgz"; - sha512 = "Sx1pU8EM64o2BrqNpEO1CNLtKQwyhuXuqyfH7oGKCk+1a33d2r5saW8zNwm3j6BTExtjrv2BxTgzzkMwts6vGg=="; - }; - }; - "@isaacs/cliui-8.0.2" = { - name = "_at_isaacs_slash_cliui"; - packageName = "@isaacs/cliui"; - version = "8.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz"; - sha512 = "O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA=="; - }; - }; - "@jridgewell/gen-mapping-0.3.3" = { - name = "_at_jridgewell_slash_gen-mapping"; - packageName = "@jridgewell/gen-mapping"; - version = "0.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz"; - sha512 = "HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ=="; - }; - }; - "@jridgewell/resolve-uri-3.1.1" = { - name = "_at_jridgewell_slash_resolve-uri"; - packageName = "@jridgewell/resolve-uri"; - version = "3.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz"; - sha512 = "dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA=="; - }; - }; - "@jridgewell/set-array-1.1.2" = { - name = "_at_jridgewell_slash_set-array"; - packageName = "@jridgewell/set-array"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz"; - sha512 = "xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw=="; - }; - }; - "@jridgewell/source-map-0.3.5" = { - name = "_at_jridgewell_slash_source-map"; - packageName = "@jridgewell/source-map"; - version = "0.3.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.5.tgz"; - sha512 = "UTYAUj/wviwdsMfzoSJspJxbkH5o1snzwX0//0ENX1u/55kkZZkcTZP6u9bwKGkv+dkk9at4m1Cpt0uY80kcpQ=="; - }; - }; - "@jridgewell/sourcemap-codec-1.4.15" = { - name = "_at_jridgewell_slash_sourcemap-codec"; - packageName = "@jridgewell/sourcemap-codec"; - version = "1.4.15"; - src = fetchurl { - url = "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz"; - sha512 = "eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg=="; - }; - }; - "@jridgewell/trace-mapping-0.3.19" = { - name = "_at_jridgewell_slash_trace-mapping"; - packageName = "@jridgewell/trace-mapping"; - version = "0.3.19"; - src = fetchurl { - url = "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.19.tgz"; - sha512 = "kf37QtfW+Hwx/buWGMPcR60iF9ziHa6r/CZJIHbmcm4+0qrXiVdxegAH0F6yddEVQ7zdkjcGCgCzUu+BcbhQxw=="; - }; - }; - "@jridgewell/trace-mapping-0.3.9" = { - name = "_at_jridgewell_slash_trace-mapping"; - packageName = "@jridgewell/trace-mapping"; - version = "0.3.9"; - src = fetchurl { - url = "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz"; - sha512 = "3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ=="; - }; - }; - "@js-joda/core-5.6.0" = { - name = "_at_js-joda_slash_core"; - packageName = "@js-joda/core"; - version = "5.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@js-joda/core/-/core-5.6.0.tgz"; - sha512 = "qCVg3pFw3dXiWcO4H0bMWNiJIuqgEKCu7HIqwkqFyuqa1SawWU3yYJDRkhOTBLt7c+tgEZDobzykv7Obj09Erg=="; - }; - }; - "@jsdevtools/ono-7.1.3" = { - name = "_at_jsdevtools_slash_ono"; - packageName = "@jsdevtools/ono"; - version = "7.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@jsdevtools/ono/-/ono-7.1.3.tgz"; - sha512 = "4JQNk+3mVzK3xh2rqd6RB4J46qUR19azEHBneZyTZM+c456qOrbbM/5xcR8huNCCcbVt7+UmizG6GuUvPvKUYg=="; - }; - }; - "@kafkajs/confluent-schema-registry-1.0.6" = { - name = "_at_kafkajs_slash_confluent-schema-registry"; - packageName = "@kafkajs/confluent-schema-registry"; - version = "1.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@kafkajs/confluent-schema-registry/-/confluent-schema-registry-1.0.6.tgz"; - sha512 = "NrZL1peOIlmlLKvheQcJAx9PHdnc4kaW+9+Yt4jXUfbbYR9EFNCZt6yApI4SwlFilaiZieReM6XslWy1LZAvoQ=="; - }; - }; - "@kwsites/file-exists-1.1.1" = { - name = "_at_kwsites_slash_file-exists"; - packageName = "@kwsites/file-exists"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@kwsites/file-exists/-/file-exists-1.1.1.tgz"; - sha512 = "m9/5YGR18lIwxSFDwfE3oA7bWuq9kdau6ugN4H2rJeyhFQZcG9AgSHkQtSD15a8WvTgfz9aikZMrKPHvbpqFiw=="; - }; - }; - "@kwsites/promise-deferred-1.1.1" = { - name = "_at_kwsites_slash_promise-deferred"; - packageName = "@kwsites/promise-deferred"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@kwsites/promise-deferred/-/promise-deferred-1.1.1.tgz"; - sha512 = "GaHYm+c0O9MjZRu0ongGBRbinu8gVAMd2UZjji6jVmqKtZluZnptXGWhz1E8j8D2HJ3f/yMxKAUC0b+57wncIw=="; - }; - }; - "@mapbox/node-pre-gyp-1.0.11" = { - name = "_at_mapbox_slash_node-pre-gyp"; - packageName = "@mapbox/node-pre-gyp"; - version = "1.0.11"; - src = fetchurl { - url = "https://registry.npmjs.org/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.11.tgz"; - sha512 = "Yhlar6v9WQgUp/He7BdgzOz8lqMQ8sU+jkCq7Wx8Myc5YFJLbEe7lgui/V7G1qB1DJykHSGwreceSaD60Y0PUQ=="; - }; - }; - "@mongodb-js/zstd-1.2.0" = { - name = "_at_mongodb-js_slash_zstd"; - packageName = "@mongodb-js/zstd"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@mongodb-js/zstd/-/zstd-1.2.0.tgz"; - sha512 = "sKHsJU2MXsp822IFXOHw/4mpFulScNHpZzVy1Zi5k5wBsdiAPx1QramyOXZkpacla+2QPEC/s7TxPlEhG/HuNQ=="; - }; - }; - "@n8n/client-oauth2-0.7.0" = { - name = "_at_n8n_slash_client-oauth2"; - packageName = "@n8n/client-oauth2"; - version = "0.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@n8n/client-oauth2/-/client-oauth2-0.7.0.tgz"; - sha512 = "E/ir1Ay8Pmia+b5tvV4KhZ0J0xexz3jJc1w93xx39Iaq5XuZRWC3TNJhJdVp0f2fPti0rVDHnAMHsovBucHBIw=="; - }; - }; - "@n8n/tournament-1.0.2" = { - name = "_at_n8n_slash_tournament"; - packageName = "@n8n/tournament"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@n8n/tournament/-/tournament-1.0.2.tgz"; - sha512 = "fTpi7F8ra5flGSVfRzohPyG7czAAKCZPlLjdKdwbLJivLoI/Ekhgodov1jfVSCVFVbwQ06gRQRxLEDzl2jl8ig=="; - }; - }; - "@n8n/vm2-3.9.23" = { - name = "_at_n8n_slash_vm2"; - packageName = "@n8n/vm2"; - version = "3.9.23"; - src = fetchurl { - url = "https://registry.npmjs.org/@n8n/vm2/-/vm2-3.9.23.tgz"; - sha512 = "yu+It+L89uljQsCJ2e9cQaXzoXJe9bU69QQIoWUOcUw0u5Zon37DuB7bdNNsjKS1ZdFD+fBWCQpq/FkqHsSjXQ=="; - }; - }; - "@n8n_io/license-sdk-2.6.1" = { - name = "_at_n8n_io_slash_license-sdk"; - packageName = "@n8n_io/license-sdk"; - version = "2.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@n8n_io/license-sdk/-/license-sdk-2.6.1.tgz"; - sha512 = "N4yBzgNIRrQlhy+BWyEC9cbf86asPxryWbJpmrfeaqkFpBR6Z5yIqmWRGnLs7XKVC9se8cdWlF7EWKtaH6oDPA=="; - }; - }; - "@n8n_io/riot-tmpl-4.0.1" = { - name = "_at_n8n_io_slash_riot-tmpl"; - packageName = "@n8n_io/riot-tmpl"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@n8n_io/riot-tmpl/-/riot-tmpl-4.0.1.tgz"; - sha512 = "/zdRbEfTFjsm1NqnpPQHgZTkTdbp5v3VUxGeMA9098sps8jRCTraQkc3AQstJgHUm7ylBXJcIVhnVeLUMWAfwQ=="; - }; - }; - "@nodelib/fs.scandir-2.1.5" = { - name = "_at_nodelib_slash_fs.scandir"; - packageName = "@nodelib/fs.scandir"; - version = "2.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz"; - sha512 = "vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g=="; - }; - }; - "@nodelib/fs.stat-2.0.5" = { - name = "_at_nodelib_slash_fs.stat"; - packageName = "@nodelib/fs.stat"; - version = "2.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz"; - sha512 = "RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A=="; - }; - }; - "@nodelib/fs.walk-1.2.8" = { - name = "_at_nodelib_slash_fs.walk"; - packageName = "@nodelib/fs.walk"; - version = "1.2.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz"; - sha512 = "oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg=="; - }; - }; - "@npmcli/fs-1.1.1" = { - name = "_at_npmcli_slash_fs"; - packageName = "@npmcli/fs"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@npmcli/fs/-/fs-1.1.1.tgz"; - sha512 = "8KG5RD0GVP4ydEzRn/I4BNDuxDtqVbOdm8675T49OIG/NGhaK0pjPX7ZcDlvKYbA+ulvVK3ztfcF4uBdOxuJbQ=="; - }; - }; - "@npmcli/move-file-1.1.2" = { - name = "_at_npmcli_slash_move-file"; - packageName = "@npmcli/move-file"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@npmcli/move-file/-/move-file-1.1.2.tgz"; - sha512 = "1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg=="; - }; - }; - "@oclif/command-1.8.36" = { - name = "_at_oclif_slash_command"; - packageName = "@oclif/command"; - version = "1.8.36"; - src = fetchurl { - url = "https://registry.npmjs.org/@oclif/command/-/command-1.8.36.tgz"; - sha512 = "/zACSgaYGtAQRzc7HjzrlIs14FuEYAZrMOEwicRoUnZVyRunG4+t5iSEeQu0Xy2bgbCD0U1SP/EdeNZSTXRwjQ=="; - }; - }; - "@oclif/config-1.18.16" = { - name = "_at_oclif_slash_config"; - packageName = "@oclif/config"; - version = "1.18.16"; - src = fetchurl { - url = "https://registry.npmjs.org/@oclif/config/-/config-1.18.16.tgz"; - sha512 = "VskIxVcN22qJzxRUq+raalq6Q3HUde7sokB7/xk5TqRZGEKRVbFeqdQBxDWwQeudiJEgcNiMvIFbMQ43dY37FA=="; - }; - }; - "@oclif/config-1.18.17" = { - name = "_at_oclif_slash_config"; - packageName = "@oclif/config"; - version = "1.18.17"; - src = fetchurl { - url = "https://registry.npmjs.org/@oclif/config/-/config-1.18.17.tgz"; - sha512 = "k77qyeUvjU8qAJ3XK3fr/QVAqsZO8QOBuESnfeM5HHtPNLSyfVcwiMM2zveSW5xRdLSG3MfV8QnLVkuyCL2ENg=="; - }; - }; - "@oclif/core-1.26.2" = { - name = "_at_oclif_slash_core"; - packageName = "@oclif/core"; - version = "1.26.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@oclif/core/-/core-1.26.2.tgz"; - sha512 = "6jYuZgXvHfOIc9GIaS4T3CIKGTjPmfAxuMcbCbMRKJJl4aq/4xeRlEz0E8/hz8HxvxZBGvN2GwAUHlrGWQVrVw=="; - }; - }; - "@oclif/errors-1.3.6" = { - name = "_at_oclif_slash_errors"; - packageName = "@oclif/errors"; - version = "1.3.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@oclif/errors/-/errors-1.3.6.tgz"; - sha512 = "fYaU4aDceETd89KXP+3cLyg9EHZsLD3RxF2IU9yxahhBpspWjkWi3Dy3bTgcwZ3V47BgxQaGapzJWDM33XIVDQ=="; - }; - }; - "@oclif/help-1.0.15" = { - name = "_at_oclif_slash_help"; - packageName = "@oclif/help"; - version = "1.0.15"; - src = fetchurl { - url = "https://registry.npmjs.org/@oclif/help/-/help-1.0.15.tgz"; - sha512 = "Yt8UHoetk/XqohYX76DfdrUYLsPKMc5pgkzsZVHDyBSkLiGRzujVaGZdjr32ckVZU9q3a47IjhWxhip7Dz5W/g=="; - }; - }; - "@oclif/linewrap-1.0.0" = { - name = "_at_oclif_slash_linewrap"; - packageName = "@oclif/linewrap"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@oclif/linewrap/-/linewrap-1.0.0.tgz"; - sha512 = "Ups2dShK52xXa8w6iBWLgcjPJWjais6KPJQq3gQ/88AY6BXoTX+MIGFPrWQO1KLMiQfoTpcLnUwloN4brrVUHw=="; - }; - }; - "@oclif/parser-3.8.17" = { - name = "_at_oclif_slash_parser"; - packageName = "@oclif/parser"; - version = "3.8.17"; - src = fetchurl { - url = "https://registry.npmjs.org/@oclif/parser/-/parser-3.8.17.tgz"; - sha512 = "l04iSd0xoh/16TGVpXb81Gg3z7tlQGrEup16BrVLsZBK6SEYpYHRJZnM32BwZrHI97ZSFfuSwVlzoo6HdsaK8A=="; - }; - }; - "@oclif/screen-3.0.7" = { - name = "_at_oclif_slash_screen"; - packageName = "@oclif/screen"; - version = "3.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@oclif/screen/-/screen-3.0.7.tgz"; - sha512 = "jQBPHcMh5rcIPKdqA6xlzioLOmkaVnjg2MVyjMzBKV8hDhLWNSiZqx7NAWXpP70v2LFvGdVoV8BSbK9iID3eHg=="; - }; - }; - "@opentelemetry/api-1.6.0" = { - name = "_at_opentelemetry_slash_api"; - packageName = "@opentelemetry/api"; - version = "1.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@opentelemetry/api/-/api-1.6.0.tgz"; - sha512 = "OWlrQAnWn9577PhVgqjUvMr1pg57Bc4jv0iL4w0PRuOSRvq67rvHW9Ie/dZVMvCzhSCB+UxhcY/PmCmFj33Q+g=="; - }; - }; - "@protobufjs/aspromise-1.1.2" = { - name = "_at_protobufjs_slash_aspromise"; - packageName = "@protobufjs/aspromise"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@protobufjs/aspromise/-/aspromise-1.1.2.tgz"; - sha512 = "j+gKExEuLmKwvz3OgROXtrJ2UG2x8Ch2YZUxahh+s1F2HZ+wAceUNLkvy6zKCPVRkU++ZWQrdxsUeQXmcg4uoQ=="; - }; - }; - "@protobufjs/base64-1.1.2" = { - name = "_at_protobufjs_slash_base64"; - packageName = "@protobufjs/base64"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@protobufjs/base64/-/base64-1.1.2.tgz"; - sha512 = "AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg=="; - }; - }; - "@protobufjs/codegen-2.0.4" = { - name = "_at_protobufjs_slash_codegen"; - packageName = "@protobufjs/codegen"; - version = "2.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@protobufjs/codegen/-/codegen-2.0.4.tgz"; - sha512 = "YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg=="; - }; - }; - "@protobufjs/eventemitter-1.1.0" = { - name = "_at_protobufjs_slash_eventemitter"; - packageName = "@protobufjs/eventemitter"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz"; - sha512 = "j9ednRT81vYJ9OfVuXG6ERSTdEL1xVsNgqpkxMsbIabzSo3goCjDIveeGv5d03om39ML71RdmrGNjG5SReBP/Q=="; - }; - }; - "@protobufjs/fetch-1.1.0" = { - name = "_at_protobufjs_slash_fetch"; - packageName = "@protobufjs/fetch"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@protobufjs/fetch/-/fetch-1.1.0.tgz"; - sha512 = "lljVXpqXebpsijW71PZaCYeIcE5on1w5DlQy5WH6GLbFryLUrBD4932W/E2BSpfRJWseIL4v/KPgBFxDOIdKpQ=="; - }; - }; - "@protobufjs/float-1.0.2" = { - name = "_at_protobufjs_slash_float"; - packageName = "@protobufjs/float"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@protobufjs/float/-/float-1.0.2.tgz"; - sha512 = "Ddb+kVXlXst9d+R9PfTIxh1EdNkgoRe5tOX6t01f1lYWOvJnSPDBlG241QLzcyPdoNTsblLUdujGSE4RzrTZGQ=="; - }; - }; - "@protobufjs/inquire-1.1.0" = { - name = "_at_protobufjs_slash_inquire"; - packageName = "@protobufjs/inquire"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@protobufjs/inquire/-/inquire-1.1.0.tgz"; - sha512 = "kdSefcPdruJiFMVSbn801t4vFK7KB/5gd2fYvrxhuJYg8ILrmn9SKSX2tZdV6V+ksulWqS7aXjBcRXl3wHoD9Q=="; - }; - }; - "@protobufjs/path-1.1.2" = { - name = "_at_protobufjs_slash_path"; - packageName = "@protobufjs/path"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@protobufjs/path/-/path-1.1.2.tgz"; - sha512 = "6JOcJ5Tm08dOHAbdR3GrvP+yUUfkjG5ePsHYczMFLq3ZmMkAD98cDgcT2iA1lJ9NVwFd4tH/iSSoe44YWkltEA=="; - }; - }; - "@protobufjs/pool-1.1.0" = { - name = "_at_protobufjs_slash_pool"; - packageName = "@protobufjs/pool"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@protobufjs/pool/-/pool-1.1.0.tgz"; - sha512 = "0kELaGSIDBKvcgS4zkjz1PeddatrjYcmMWOlAuAPwAeccUrPHdUqo/J6LiymHHEiJT5NrF1UVwxY14f+fy4WQw=="; - }; - }; - "@protobufjs/utf8-1.1.0" = { - name = "_at_protobufjs_slash_utf8"; - packageName = "@protobufjs/utf8"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz"; - sha512 = "Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw=="; - }; - }; - "@redis/bloom-1.2.0" = { - name = "_at_redis_slash_bloom"; - packageName = "@redis/bloom"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@redis/bloom/-/bloom-1.2.0.tgz"; - sha512 = "HG2DFjYKbpNmVXsa0keLHp/3leGJz1mjh09f2RLGGLQZzSHpkmZWuwJbAvo3QcRY8p80m5+ZdXZdYOSBLlp7Cg=="; - }; - }; - "@redis/client-1.5.11" = { - name = "_at_redis_slash_client"; - packageName = "@redis/client"; - version = "1.5.11"; - src = fetchurl { - url = "https://registry.npmjs.org/@redis/client/-/client-1.5.11.tgz"; - sha512 = "cV7yHcOAtNQ5x/yQl7Yw1xf53kO0FNDTdDU6bFIMbW6ljB7U7ns0YRM+QIkpoqTAt6zK5k9Fq0QWlUbLcq9AvA=="; - }; - }; - "@redis/graph-1.1.0" = { - name = "_at_redis_slash_graph"; - packageName = "@redis/graph"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@redis/graph/-/graph-1.1.0.tgz"; - sha512 = "16yZWngxyXPd+MJxeSr0dqh2AIOi8j9yXKcKCwVaKDbH3HTuETpDVPcLujhFYVPtYrngSco31BUcSa9TH31Gqg=="; - }; - }; - "@redis/json-1.0.6" = { - name = "_at_redis_slash_json"; - packageName = "@redis/json"; - version = "1.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@redis/json/-/json-1.0.6.tgz"; - sha512 = "rcZO3bfQbm2zPRpqo82XbW8zg4G/w4W3tI7X8Mqleq9goQjAGLL7q/1n1ZX4dXEAmORVZ4s1+uKLaUOg7LrUhw=="; - }; - }; - "@redis/search-1.1.5" = { - name = "_at_redis_slash_search"; - packageName = "@redis/search"; - version = "1.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@redis/search/-/search-1.1.5.tgz"; - sha512 = "hPP8w7GfGsbtYEJdn4n7nXa6xt6hVZnnDktKW4ArMaFQ/m/aR7eFvsLQmG/mn1Upq99btPJk+F27IQ2dYpCoUg=="; - }; - }; - "@redis/time-series-1.0.5" = { - name = "_at_redis_slash_time-series"; - packageName = "@redis/time-series"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@redis/time-series/-/time-series-1.0.5.tgz"; - sha512 = "IFjIgTusQym2B5IZJG3XKr5llka7ey84fw/NOYqESP5WUfQs9zz1ww/9+qoz4ka/S6KcGBodzlCeZ5UImKbscg=="; - }; - }; - "@rudderstack/rudder-sdk-node-1.0.6" = { - name = "_at_rudderstack_slash_rudder-sdk-node"; - packageName = "@rudderstack/rudder-sdk-node"; - version = "1.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@rudderstack/rudder-sdk-node/-/rudder-sdk-node-1.0.6.tgz"; - sha512 = "kJYCXv6fRFbQrAp3hMsgRCnAa7RUBdbiGLBT9PcpQURi0VwHmD7mk3Ja7U4HDnL0EHXYJpPyx3oSonkklmPJ9Q=="; - }; - }; - "@sap/hana-client-2.18.24" = { - name = "_at_sap_slash_hana-client"; - packageName = "@sap/hana-client"; - version = "2.18.24"; - src = fetchurl { - url = "https://registry.npmjs.org/@sap/hana-client/-/hana-client-2.18.24.tgz"; - sha512 = "CbLXVPYntnHc9EWO2zgJ8hTGje76om7XIPPKpu3kBHTs19f8wHKyhmQkJJTeJix0yAnYuv9sXNinlpvRGujMow=="; - }; - }; - "@segment/loosely-validate-event-2.0.0" = { - name = "_at_segment_slash_loosely-validate-event"; - packageName = "@segment/loosely-validate-event"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@segment/loosely-validate-event/-/loosely-validate-event-2.0.0.tgz"; - sha512 = "ZMCSfztDBqwotkl848ODgVcAmN4OItEWDCkshcKz0/W6gGSQayuuCtWV/MlodFivAZD793d6UgANd6wCXUfrIw=="; - }; - }; - "@selderee/plugin-htmlparser2-0.11.0" = { - name = "_at_selderee_slash_plugin-htmlparser2"; - packageName = "@selderee/plugin-htmlparser2"; - version = "0.11.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@selderee/plugin-htmlparser2/-/plugin-htmlparser2-0.11.0.tgz"; - sha512 = "P33hHGdldxGabLFjPPpaTxVolMrzrcegejx+0GxjrIb9Zv48D8yAIA/QTDR2dFl7Uz7urX8aX6+5bCZslr+gWQ=="; - }; - }; - "@sentry-internal/tracing-7.73.0" = { - name = "_at_sentry-internal_slash_tracing"; - packageName = "@sentry-internal/tracing"; - version = "7.73.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@sentry-internal/tracing/-/tracing-7.73.0.tgz"; - sha512 = "ig3WL/Nqp8nRQ52P205NaypGKNfIl/G+cIqge9xPW6zfRb5kJdM1YParw9GSJ1SPjEZBkBORGAML0on5H2FILw=="; - }; - }; - "@sentry/core-7.73.0" = { - name = "_at_sentry_slash_core"; - packageName = "@sentry/core"; - version = "7.73.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@sentry/core/-/core-7.73.0.tgz"; - sha512 = "9FEz4Gq848LOgVN2OxJGYuQqxv7cIVw69VlAzWHEm3njt8mjvlTq+7UiFsGRo84+59V2FQuHxzA7vVjl90WfSg=="; - }; - }; - "@sentry/integrations-7.73.0" = { - name = "_at_sentry_slash_integrations"; - packageName = "@sentry/integrations"; - version = "7.73.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@sentry/integrations/-/integrations-7.73.0.tgz"; - sha512 = "IjVpn4d+aSL9L1Ntu/oAdRwujz4BzzavDsZf96Xgc/AjBnjAEUT+wT1dAwluThfuKDXmWOJHhZ2cHHMfqI+7vw=="; - }; - }; - "@sentry/node-7.73.0" = { - name = "_at_sentry_slash_node"; - packageName = "@sentry/node"; - version = "7.73.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@sentry/node/-/node-7.73.0.tgz"; - sha512 = "i50bRfmgkRRx0XXUbg9jGD/RuznDJxJXc4rBILhoJuhl+BjRIaoXA3ayplfJn8JLZxsNh75uJaCq4IUK70SORw=="; - }; - }; - "@sentry/types-7.73.0" = { - name = "_at_sentry_slash_types"; - packageName = "@sentry/types"; - version = "7.73.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@sentry/types/-/types-7.73.0.tgz"; - sha512 = "/v8++bly8jW7r4cP2wswYiiVpn7eLLcqwnfPUMeCQze4zj3F3nTRIKc9BGHzU0V+fhHa3RwRC2ksqTGq1oJMDg=="; - }; - }; - "@sentry/utils-7.73.0" = { - name = "_at_sentry_slash_utils"; - packageName = "@sentry/utils"; - version = "7.73.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@sentry/utils/-/utils-7.73.0.tgz"; - sha512 = "h3ZK/qpf4k76FhJV9uiSbvMz3V/0Ovy94C+5/9UgPMVCJXFmVsdw8n/dwANJ7LupVPfYP23xFGgebDMFlK1/2w=="; - }; - }; - "@smithy/abort-controller-2.0.11" = { - name = "_at_smithy_slash_abort-controller"; - packageName = "@smithy/abort-controller"; - version = "2.0.11"; - src = fetchurl { - url = "https://registry.npmjs.org/@smithy/abort-controller/-/abort-controller-2.0.11.tgz"; - sha512 = "MSzE1qR2JNyb7ot3blIOT3O3H0Jn06iNDEgHRaqZUwBgx5EG+VIx24Y21tlKofzYryIOcWpIohLrIIyocD6LMA=="; - }; - }; - "@smithy/chunked-blob-reader-2.0.0" = { - name = "_at_smithy_slash_chunked-blob-reader"; - packageName = "@smithy/chunked-blob-reader"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@smithy/chunked-blob-reader/-/chunked-blob-reader-2.0.0.tgz"; - sha512 = "k+J4GHJsMSAIQPChGBrjEmGS+WbPonCXesoqP9fynIqjn7rdOThdH8FAeCmokP9mxTYKQAKoHCLPzNlm6gh7Wg=="; - }; - }; - "@smithy/chunked-blob-reader-native-2.0.0" = { - name = "_at_smithy_slash_chunked-blob-reader-native"; - packageName = "@smithy/chunked-blob-reader-native"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@smithy/chunked-blob-reader-native/-/chunked-blob-reader-native-2.0.0.tgz"; - sha512 = "HM8V2Rp1y8+1343tkZUKZllFhEQPNmpNdgFAncbTsxkZ18/gqjk23XXv3qGyXWp412f3o43ZZ1UZHVcHrpRnCQ=="; - }; - }; - "@smithy/config-resolver-2.0.14" = { - name = "_at_smithy_slash_config-resolver"; - packageName = "@smithy/config-resolver"; - version = "2.0.14"; - src = fetchurl { - url = "https://registry.npmjs.org/@smithy/config-resolver/-/config-resolver-2.0.14.tgz"; - sha512 = "K1K+FuWQoy8j/G7lAmK85o03O89s2Vvh6kMFmzEmiHUoQCRH1rzbDtMnGNiaMHeSeYJ6y79IyTusdRG+LuWwtg=="; - }; - }; - "@smithy/credential-provider-imds-2.0.16" = { - name = "_at_smithy_slash_credential-provider-imds"; - packageName = "@smithy/credential-provider-imds"; - version = "2.0.16"; - src = fetchurl { - url = "https://registry.npmjs.org/@smithy/credential-provider-imds/-/credential-provider-imds-2.0.16.tgz"; - sha512 = "tKa2xF+69TvGxJT+lnJpGrKxUuAZDLYXFhqnPEgnHz+psTpkpcB4QRjHj63+uj83KaeFJdTfW201eLZeRn6FfA=="; - }; - }; - "@smithy/eventstream-codec-2.0.11" = { - name = "_at_smithy_slash_eventstream-codec"; - packageName = "@smithy/eventstream-codec"; - version = "2.0.11"; - src = fetchurl { - url = "https://registry.npmjs.org/@smithy/eventstream-codec/-/eventstream-codec-2.0.11.tgz"; - sha512 = "BQCTjxhCYRZIfXapa2LmZSaH8QUBGwMZw7XRN83hrdixbLjIcj+o549zjkedFS07Ve2TlvWUI6BTzP+nv7snBA=="; - }; - }; - "@smithy/eventstream-serde-browser-2.0.11" = { - name = "_at_smithy_slash_eventstream-serde-browser"; - packageName = "@smithy/eventstream-serde-browser"; - version = "2.0.11"; - src = fetchurl { - url = "https://registry.npmjs.org/@smithy/eventstream-serde-browser/-/eventstream-serde-browser-2.0.11.tgz"; - sha512 = "p9IK4uvwT6B3pT1VGlODvcVBfPVikjBFHAcKpvvNF+7lAEI+YiC6d0SROPkpjnvCgVBYyGXa3ciqrWnFze6mwQ=="; - }; - }; - "@smithy/eventstream-serde-config-resolver-2.0.11" = { - name = "_at_smithy_slash_eventstream-serde-config-resolver"; - packageName = "@smithy/eventstream-serde-config-resolver"; - version = "2.0.11"; - src = fetchurl { - url = "https://registry.npmjs.org/@smithy/eventstream-serde-config-resolver/-/eventstream-serde-config-resolver-2.0.11.tgz"; - sha512 = "vN32E8yExo0Z8L7kXhlU9KRURrhqOpPdLxQMp3MwfMThrjiqbr1Sk5srUXc1ed2Ygl/l0TEN9vwNG0bQHg6AjQ=="; - }; - }; - "@smithy/eventstream-serde-node-2.0.11" = { - name = "_at_smithy_slash_eventstream-serde-node"; - packageName = "@smithy/eventstream-serde-node"; - version = "2.0.11"; - src = fetchurl { - url = "https://registry.npmjs.org/@smithy/eventstream-serde-node/-/eventstream-serde-node-2.0.11.tgz"; - sha512 = "Gjqbpg7UmD+YzkpgNShNcDNZcUpBWIkvX2XCGptz5PoxJU/UQbuF9eSc93ZlIb7j4aGjtFfqk23HUMW8Hopg2Q=="; - }; - }; - "@smithy/eventstream-serde-universal-2.0.11" = { - name = "_at_smithy_slash_eventstream-serde-universal"; - packageName = "@smithy/eventstream-serde-universal"; - version = "2.0.11"; - src = fetchurl { - url = "https://registry.npmjs.org/@smithy/eventstream-serde-universal/-/eventstream-serde-universal-2.0.11.tgz"; - sha512 = "F8FsxLTbFN4+Esgpo+nNKcEajrgRZJ+pG9c8+MhLM4Odp5ejLHw2GMCXd81cGsgmfcbnzdDEXazPPVzOwj89MQ=="; - }; - }; - "@smithy/fetch-http-handler-2.2.3" = { - name = "_at_smithy_slash_fetch-http-handler"; - packageName = "@smithy/fetch-http-handler"; - version = "2.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@smithy/fetch-http-handler/-/fetch-http-handler-2.2.3.tgz"; - sha512 = "0G9sePU+0R+8d7cie+OXzNbbkjnD4RfBlVCs46ZEuQAMcxK8OniemYXSSkOc80CCk8Il4DnlYZcUSvsIs2OB2w=="; - }; - }; - "@smithy/hash-blob-browser-2.0.11" = { - name = "_at_smithy_slash_hash-blob-browser"; - packageName = "@smithy/hash-blob-browser"; - version = "2.0.11"; - src = fetchurl { - url = "https://registry.npmjs.org/@smithy/hash-blob-browser/-/hash-blob-browser-2.0.11.tgz"; - sha512 = "/6vq/NiH2EN3mWdwcLdjVohP+VCng+ZA1GnlUdx959egsfgIlLWQvCyjnB2ze9Hr6VHV5XEFLLpLQH2dHA6Sgw=="; - }; - }; - "@smithy/hash-node-2.0.11" = { - name = "_at_smithy_slash_hash-node"; - packageName = "@smithy/hash-node"; - version = "2.0.11"; - src = fetchurl { - url = "https://registry.npmjs.org/@smithy/hash-node/-/hash-node-2.0.11.tgz"; - sha512 = "PbleVugN2tbhl1ZoNWVrZ1oTFFas/Hq+s6zGO8B9bv4w/StTriTKA9W+xZJACOj9X7zwfoTLbscM+avCB1KqOQ=="; - }; - }; - "@smithy/hash-stream-node-2.0.11" = { - name = "_at_smithy_slash_hash-stream-node"; - packageName = "@smithy/hash-stream-node"; - version = "2.0.11"; - src = fetchurl { - url = "https://registry.npmjs.org/@smithy/hash-stream-node/-/hash-stream-node-2.0.11.tgz"; - sha512 = "Jn2yl+Dn0kvwKvSavvR1/BFVYa2wIkaJKWeTH48kno89gqHAJxMh1hrtBN6SJ7F8VhodNZTiNOlQVqCSfLheNQ=="; - }; - }; - "@smithy/invalid-dependency-2.0.11" = { - name = "_at_smithy_slash_invalid-dependency"; - packageName = "@smithy/invalid-dependency"; - version = "2.0.11"; - src = fetchurl { - url = "https://registry.npmjs.org/@smithy/invalid-dependency/-/invalid-dependency-2.0.11.tgz"; - sha512 = "zazq99ujxYv/NOf9zh7xXbNgzoVLsqE0wle8P/1zU/XdhPi/0zohTPKWUzIxjGdqb5hkkwfBkNkl5H+LE0mvgw=="; - }; - }; - "@smithy/is-array-buffer-2.0.0" = { - name = "_at_smithy_slash_is-array-buffer"; - packageName = "@smithy/is-array-buffer"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-2.0.0.tgz"; - sha512 = "z3PjFjMyZNI98JFRJi/U0nGoLWMSJlDjAW4QUX2WNZLas5C0CmVV6LJ01JI0k90l7FvpmixjWxPFmENSClQ7ug=="; - }; - }; - "@smithy/md5-js-2.0.11" = { - name = "_at_smithy_slash_md5-js"; - packageName = "@smithy/md5-js"; - version = "2.0.11"; - src = fetchurl { - url = "https://registry.npmjs.org/@smithy/md5-js/-/md5-js-2.0.11.tgz"; - sha512 = "YBIv+e95qeGvQA05ucwstmTeQ/bUzWgU+nO2Ffmif5awu6IzSR0Jfk3XLYh4mdy7f8DCgsn8qA63u7N9Lu0+5A=="; - }; - }; - "@smithy/middleware-content-length-2.0.13" = { - name = "_at_smithy_slash_middleware-content-length"; - packageName = "@smithy/middleware-content-length"; - version = "2.0.13"; - src = fetchurl { - url = "https://registry.npmjs.org/@smithy/middleware-content-length/-/middleware-content-length-2.0.13.tgz"; - sha512 = "Md2kxWpaec3bXp1oERFPQPBhOXCkGSAF7uc1E+4rkwjgw3/tqAXRtbjbggu67HJdwaif76As8AV6XxbD1HzqTQ=="; - }; - }; - "@smithy/middleware-endpoint-2.1.0" = { - name = "_at_smithy_slash_middleware-endpoint"; - packageName = "@smithy/middleware-endpoint"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@smithy/middleware-endpoint/-/middleware-endpoint-2.1.0.tgz"; - sha512 = "e6HZbfrp9CNTJqIPSgkydB9mNQXiq5pkHF3ZB6rOzPPR9PkJBoGFo9TcM7FaaKFUaH4Kc20AX6WwwVyIlNhXTA=="; - }; - }; - "@smithy/middleware-retry-2.0.16" = { - name = "_at_smithy_slash_middleware-retry"; - packageName = "@smithy/middleware-retry"; - version = "2.0.16"; - src = fetchurl { - url = "https://registry.npmjs.org/@smithy/middleware-retry/-/middleware-retry-2.0.16.tgz"; - sha512 = "Br5+0yoiMS0ugiOAfJxregzMMGIRCbX4PYo1kDHtLgvkA/d++aHbnHB819m5zOIAMPvPE7AThZgcsoK+WOsUTA=="; - }; - }; - "@smithy/middleware-serde-2.0.11" = { - name = "_at_smithy_slash_middleware-serde"; - packageName = "@smithy/middleware-serde"; - version = "2.0.11"; - src = fetchurl { - url = "https://registry.npmjs.org/@smithy/middleware-serde/-/middleware-serde-2.0.11.tgz"; - sha512 = "NuxnjMyf4zQqhwwdh0OTj5RqpnuT6HcH5Xg5GrPijPcKzc2REXVEVK4Yyk8ckj8ez1XSj/bCmJ+oNjmqB02GWA=="; - }; - }; - "@smithy/middleware-stack-2.0.5" = { - name = "_at_smithy_slash_middleware-stack"; - packageName = "@smithy/middleware-stack"; - version = "2.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@smithy/middleware-stack/-/middleware-stack-2.0.5.tgz"; - sha512 = "bVQU/rZzBY7CbSxIrDTGZYnBWKtIw+PL/cRc9B7etZk1IKSOe0NvKMJyWllfhfhrTeMF6eleCzOihIQympAvPw=="; - }; - }; - "@smithy/node-config-provider-2.1.1" = { - name = "_at_smithy_slash_node-config-provider"; - packageName = "@smithy/node-config-provider"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@smithy/node-config-provider/-/node-config-provider-2.1.1.tgz"; - sha512 = "1lF6s1YWBi1LBu2O30tD3jyTgMtuvk/Z1twzXM4GPYe4dmZix4nNREPJIPOcfFikNU2o0eTYP80+izx5F2jIJA=="; - }; - }; - "@smithy/node-http-handler-2.1.7" = { - name = "_at_smithy_slash_node-http-handler"; - packageName = "@smithy/node-http-handler"; - version = "2.1.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@smithy/node-http-handler/-/node-http-handler-2.1.7.tgz"; - sha512 = "PQIKZXlp3awCDn/xNlCSTFE7aYG/5Tx33M05NfQmWYeB5yV1GZZOSz4dXpwiNJYTXb9jPqjl+ueXXkwtEluFFA=="; - }; - }; - "@smithy/property-provider-2.0.12" = { - name = "_at_smithy_slash_property-provider"; - packageName = "@smithy/property-provider"; - version = "2.0.12"; - src = fetchurl { - url = "https://registry.npmjs.org/@smithy/property-provider/-/property-provider-2.0.12.tgz"; - sha512 = "Un/OvvuQ1Kg8WYtoMCicfsFFuHb/TKL3pCA6ZIo/WvNTJTR94RtoRnL7mY4XkkUAoFMyf6KjcQJ76y1FX7S5rw=="; - }; - }; - "@smithy/protocol-http-3.0.7" = { - name = "_at_smithy_slash_protocol-http"; - packageName = "@smithy/protocol-http"; - version = "3.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@smithy/protocol-http/-/protocol-http-3.0.7.tgz"; - sha512 = "HnZW8y+r66ntYueCDbLqKwWcMNWW8o3eVpSrHNluwtBJ/EUWfQHRKSiu6vZZtc6PGfPQWgVfucoCE/C3QufMAA=="; - }; - }; - "@smithy/querystring-builder-2.0.11" = { - name = "_at_smithy_slash_querystring-builder"; - packageName = "@smithy/querystring-builder"; - version = "2.0.11"; - src = fetchurl { - url = "https://registry.npmjs.org/@smithy/querystring-builder/-/querystring-builder-2.0.11.tgz"; - sha512 = "b4kEbVMxpmfv2VWUITn2otckTi7GlMteZQxi+jlwedoATOGEyrCJPfRcYQJjbCi3fZ2QTfh3PcORvB27+j38Yg=="; - }; - }; - "@smithy/querystring-parser-2.0.11" = { - name = "_at_smithy_slash_querystring-parser"; - packageName = "@smithy/querystring-parser"; - version = "2.0.11"; - src = fetchurl { - url = "https://registry.npmjs.org/@smithy/querystring-parser/-/querystring-parser-2.0.11.tgz"; - sha512 = "YXe7jhi7s3dQ0Fu9dLoY/gLu6NCyy8tBWJL/v2c9i7/RLpHgKT+uT96/OqZkHizCJ4kr0ZD46tzMjql/o60KLg=="; - }; - }; - "@smithy/service-error-classification-2.0.4" = { - name = "_at_smithy_slash_service-error-classification"; - packageName = "@smithy/service-error-classification"; - version = "2.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@smithy/service-error-classification/-/service-error-classification-2.0.4.tgz"; - sha512 = "77506l12I5gxTZqBkx3Wb0RqMG81bMYLaVQ+EqIWFwQDJRs5UFeXogKxSKojCmz1wLUziHZQXm03MBzPQiumQw=="; - }; - }; - "@smithy/shared-ini-file-loader-2.2.0" = { - name = "_at_smithy_slash_shared-ini-file-loader"; - packageName = "@smithy/shared-ini-file-loader"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-2.2.0.tgz"; - sha512 = "xFXqs4vAb5BdkzHSRrTapFoaqS4/3m/CGZzdw46fBjYZ0paYuLAoMY60ICCn1FfGirG+PiJ3eWcqJNe4/SkfyA=="; - }; - }; - "@smithy/signature-v4-2.0.11" = { - name = "_at_smithy_slash_signature-v4"; - packageName = "@smithy/signature-v4"; - version = "2.0.11"; - src = fetchurl { - url = "https://registry.npmjs.org/@smithy/signature-v4/-/signature-v4-2.0.11.tgz"; - sha512 = "EFVU1dT+2s8xi227l1A9O27edT/GNKvyAK6lZnIZ0zhIHq/jSLznvkk15aonGAM1kmhmZBVGpI7Tt0odueZK9A=="; - }; - }; - "@smithy/smithy-client-2.1.11" = { - name = "_at_smithy_slash_smithy-client"; - packageName = "@smithy/smithy-client"; - version = "2.1.11"; - src = fetchurl { - url = "https://registry.npmjs.org/@smithy/smithy-client/-/smithy-client-2.1.11.tgz"; - sha512 = "okjMbuBBCTiieK665OFN/ap6u9+Z9z55PMphS5FYCsS6Zfp137Q3qlnt0OgBAnUVnH/mNGyoJV0LBX9gkTWptg=="; - }; - }; - "@smithy/types-2.3.5" = { - name = "_at_smithy_slash_types"; - packageName = "@smithy/types"; - version = "2.3.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@smithy/types/-/types-2.3.5.tgz"; - sha512 = "ehyDt8M9hehyxrLQGoA1BGPou8Js1Ocoh5M0ngDhJMqbFmNK5N6Xhr9/ZExWkyIW8XcGkiMPq3ZUEE0ScrhbuQ=="; - }; - }; - "@smithy/url-parser-2.0.11" = { - name = "_at_smithy_slash_url-parser"; - packageName = "@smithy/url-parser"; - version = "2.0.11"; - src = fetchurl { - url = "https://registry.npmjs.org/@smithy/url-parser/-/url-parser-2.0.11.tgz"; - sha512 = "h89yXMCCF+S5k9XIoKltMIWTYj+FcEkU/IIFZ6RtE222fskOTL4Iak6ZRG+ehSvZDt8yKEcxqheTDq7JvvtK3g=="; - }; - }; - "@smithy/util-base64-2.0.0" = { - name = "_at_smithy_slash_util-base64"; - packageName = "@smithy/util-base64"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@smithy/util-base64/-/util-base64-2.0.0.tgz"; - sha512 = "Zb1E4xx+m5Lud8bbeYi5FkcMJMnn+1WUnJF3qD7rAdXpaL7UjkFQLdmW5fHadoKbdHpwH9vSR8EyTJFHJs++tA=="; - }; - }; - "@smithy/util-body-length-browser-2.0.0" = { - name = "_at_smithy_slash_util-body-length-browser"; - packageName = "@smithy/util-body-length-browser"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@smithy/util-body-length-browser/-/util-body-length-browser-2.0.0.tgz"; - sha512 = "JdDuS4ircJt+FDnaQj88TzZY3+njZ6O+D3uakS32f2VNnDo3vyEuNdBOh/oFd8Df1zSZOuH1HEChk2AOYDezZg=="; - }; - }; - "@smithy/util-body-length-node-2.1.0" = { - name = "_at_smithy_slash_util-body-length-node"; - packageName = "@smithy/util-body-length-node"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@smithy/util-body-length-node/-/util-body-length-node-2.1.0.tgz"; - sha512 = "/li0/kj/y3fQ3vyzn36NTLGmUwAICb7Jbe/CsWCktW363gh1MOcpEcSO3mJ344Gv2dqz8YJCLQpb6hju/0qOWw=="; - }; - }; - "@smithy/util-buffer-from-2.0.0" = { - name = "_at_smithy_slash_util-buffer-from"; - packageName = "@smithy/util-buffer-from"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-2.0.0.tgz"; - sha512 = "/YNnLoHsR+4W4Vf2wL5lGv0ksg8Bmk3GEGxn2vEQt52AQaPSCuaO5PM5VM7lP1K9qHRKHwrPGktqVoAHKWHxzw=="; - }; - }; - "@smithy/util-config-provider-2.0.0" = { - name = "_at_smithy_slash_util-config-provider"; - packageName = "@smithy/util-config-provider"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@smithy/util-config-provider/-/util-config-provider-2.0.0.tgz"; - sha512 = "xCQ6UapcIWKxXHEU4Mcs2s7LcFQRiU3XEluM2WcCjjBtQkUN71Tb+ydGmJFPxMUrW/GWMgQEEGipLym4XG0jZg=="; - }; - }; - "@smithy/util-defaults-mode-browser-2.0.15" = { - name = "_at_smithy_slash_util-defaults-mode-browser"; - packageName = "@smithy/util-defaults-mode-browser"; - version = "2.0.15"; - src = fetchurl { - url = "https://registry.npmjs.org/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-2.0.15.tgz"; - sha512 = "2raMZOYKSuke7QlDg/HDcxQdrp0zteJ8z+S0B9Rn23J55ZFNK1+IjG4HkN6vo/0u3Xy/JOdJ93ibiBSB8F7kOw=="; - }; - }; - "@smithy/util-defaults-mode-node-2.0.19" = { - name = "_at_smithy_slash_util-defaults-mode-node"; - packageName = "@smithy/util-defaults-mode-node"; - version = "2.0.19"; - src = fetchurl { - url = "https://registry.npmjs.org/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-2.0.19.tgz"; - sha512 = "7pScU4jBFADB2MBYKM3zb5onMh6Nn0X3IfaFVLYPyCarTIZDLUtUl1GtruzEUJPmDzP+uGeqOtU589HDY0Ni6g=="; - }; - }; - "@smithy/util-hex-encoding-2.0.0" = { - name = "_at_smithy_slash_util-hex-encoding"; - packageName = "@smithy/util-hex-encoding"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@smithy/util-hex-encoding/-/util-hex-encoding-2.0.0.tgz"; - sha512 = "c5xY+NUnFqG6d7HFh1IFfrm3mGl29lC+vF+geHv4ToiuJCBmIfzx6IeHLg+OgRdPFKDXIw6pvi+p3CsscaMcMA=="; - }; - }; - "@smithy/util-middleware-2.0.4" = { - name = "_at_smithy_slash_util-middleware"; - packageName = "@smithy/util-middleware"; - version = "2.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@smithy/util-middleware/-/util-middleware-2.0.4.tgz"; - sha512 = "Pbu6P4MBwRcjrLgdTR1O4Y3c0sTZn2JdOiJNcgL7EcIStcQodj+6ZTXtbyU/WTEU3MV2NMA10LxFc3AWHZ3+4A=="; - }; - }; - "@smithy/util-retry-2.0.4" = { - name = "_at_smithy_slash_util-retry"; - packageName = "@smithy/util-retry"; - version = "2.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@smithy/util-retry/-/util-retry-2.0.4.tgz"; - sha512 = "b+n1jBBKc77C1E/zfBe1Zo7S9OXGBiGn55N0apfhZHxPUP/fMH5AhFUUcWaJh7NAnah284M5lGkBKuhnr3yK5w=="; - }; - }; - "@smithy/util-stream-2.0.16" = { - name = "_at_smithy_slash_util-stream"; - packageName = "@smithy/util-stream"; - version = "2.0.16"; - src = fetchurl { - url = "https://registry.npmjs.org/@smithy/util-stream/-/util-stream-2.0.16.tgz"; - sha512 = "b5ZSRh1KzUzC7LoJcpfk7+iXGoRr3WylEfmPd4FnBLm90OwxSB9VgK1fDZwicfYxSEvWHdYXgvvjPtenEYBBhw=="; - }; - }; - "@smithy/util-uri-escape-2.0.0" = { - name = "_at_smithy_slash_util-uri-escape"; - packageName = "@smithy/util-uri-escape"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@smithy/util-uri-escape/-/util-uri-escape-2.0.0.tgz"; - sha512 = "ebkxsqinSdEooQduuk9CbKcI+wheijxEb3utGXkCoYQkJnwTnLbH1JXGimJtUkQwNQbsbuYwG2+aFVyZf5TLaw=="; - }; - }; - "@smithy/util-utf8-2.0.0" = { - name = "_at_smithy_slash_util-utf8"; - packageName = "@smithy/util-utf8"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-2.0.0.tgz"; - sha512 = "rctU1VkziY84n5OXe3bPNpKR001ZCME2JCaBBFgtiM2hfKbHFudc/BkMuPab8hRbLd0j3vbnBTTZ1igBf0wgiQ=="; - }; - }; - "@smithy/util-waiter-2.0.11" = { - name = "_at_smithy_slash_util-waiter"; - packageName = "@smithy/util-waiter"; - version = "2.0.11"; - src = fetchurl { - url = "https://registry.npmjs.org/@smithy/util-waiter/-/util-waiter-2.0.11.tgz"; - sha512 = "8SJWUl9O1YhjC77EccgltI3q4XZQp3vp9DGEW6o0OdkUcwqm/H4qOLnMkA2n+NDojuM5Iia2jWoCdbluIiG7TA=="; - }; - }; - "@sqltools/formatter-1.2.5" = { - name = "_at_sqltools_slash_formatter"; - packageName = "@sqltools/formatter"; - version = "1.2.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@sqltools/formatter/-/formatter-1.2.5.tgz"; - sha512 = "Uy0+khmZqUrUGm5dmMqVlnvufZRSK0FbYzVgp0UMstm+F5+W2/jnEEQyc9vo1ZR/E5ZI/B1WjjoTqBqwJL6Krw=="; - }; - }; - "@swc/core-1.3.92" = { - name = "_at_swc_slash_core"; - packageName = "@swc/core"; - version = "1.3.92"; - src = fetchurl { - url = "https://registry.npmjs.org/@swc/core/-/core-1.3.92.tgz"; - sha512 = "vx0vUrf4YTEw59njOJ46Ha5i0cZTMYdRHQ7KXU29efN1MxcmJH2RajWLPlvQarOP1ab9iv9cApD7SMchDyx2vA=="; - }; - }; - "@swc/counter-0.1.2" = { - name = "_at_swc_slash_counter"; - packageName = "@swc/counter"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@swc/counter/-/counter-0.1.2.tgz"; - sha512 = "9F4ys4C74eSTEUNndnER3VJ15oru2NumfQxS8geE+f3eB5xvfxpWyqE5XlVnxb/R14uoXi6SLbBwwiDSkv+XEw=="; - }; - }; - "@swc/helpers-0.5.3" = { - name = "_at_swc_slash_helpers"; - packageName = "@swc/helpers"; - version = "0.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.3.tgz"; - sha512 = "FaruWX6KdudYloq1AHD/4nU+UsMTdNE8CKyrseXWEcgjDAbvkwJg2QGPAnfIJLIWsjZOSPLOAykK6fuYp4vp4A=="; - }; - }; - "@swc/types-0.1.5" = { - name = "_at_swc_slash_types"; - packageName = "@swc/types"; - version = "0.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@swc/types/-/types-0.1.5.tgz"; - sha512 = "myfUej5naTBWnqOCc/MdVOLVjXUXtIA+NpDrDBKJtLLg2shUjBu3cZmB/85RyitKc55+lUUyl7oRfLOvkr2hsw=="; - }; - }; - "@swc/wasm-1.3.92" = { - name = "_at_swc_slash_wasm"; - packageName = "@swc/wasm"; - version = "1.3.92"; - src = fetchurl { - url = "https://registry.npmjs.org/@swc/wasm/-/wasm-1.3.92.tgz"; - sha512 = "hOaY0Nsz3B2b8IdiUF2JKPsa3pH1Aj3E+F+pgfXXgxbsLOgYcdNjWLkuJfHgh/F3TSs8FVs8gCXktO+nAI0fWw=="; - }; - }; - "@techteamer/ocsp-1.0.0" = { - name = "_at_techteamer_slash_ocsp"; - packageName = "@techteamer/ocsp"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@techteamer/ocsp/-/ocsp-1.0.0.tgz"; - sha512 = "lNAOoFHaZN+4huo30ukeqVrUmfC+avoEBYQ11QAnAw1PFhnI5oBCg8O/TNiCoEWix7gNGBIEjrQwtPREqKMPog=="; - }; - }; - "@tediousjs/connection-string-0.3.0" = { - name = "_at_tediousjs_slash_connection-string"; - packageName = "@tediousjs/connection-string"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@tediousjs/connection-string/-/connection-string-0.3.0.tgz"; - sha512 = "d/keJiNKfpHo+GmSB8QcsAwBx8h+V1UbdozA5TD+eSLXprNY53JAYub47J9evsSKWDdNG5uVj0FiMozLKuzowQ=="; - }; - }; - "@tediousjs/connection-string-0.5.0" = { - name = "_at_tediousjs_slash_connection-string"; - packageName = "@tediousjs/connection-string"; - version = "0.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@tediousjs/connection-string/-/connection-string-0.5.0.tgz"; - sha512 = "7qSgZbincDDDFyRweCIEvZULFAw5iz/DeunhvuxpL31nfntX3P4Yd4HkHBRg9H8CdqY1e5WFN1PZIz/REL9MVQ=="; - }; - }; - "@tokenizer/token-0.3.0" = { - name = "_at_tokenizer_slash_token"; - packageName = "@tokenizer/token"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@tokenizer/token/-/token-0.3.0.tgz"; - sha512 = "OvjF+z51L3ov0OyAU0duzsYuvO01PH7x4t6DJx+guahgTnBHkhJdG7soQeTSFLWN3efnHyibZ4Z8l2EuWwJN3A=="; - }; - }; - "@tootallnate/once-1.1.2" = { - name = "_at_tootallnate_slash_once"; - packageName = "@tootallnate/once"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz"; - sha512 = "RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw=="; - }; - }; - "@tootallnate/once-2.0.0" = { - name = "_at_tootallnate_slash_once"; - packageName = "@tootallnate/once"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz"; - sha512 = "XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A=="; - }; - }; - "@tsconfig/node10-1.0.9" = { - name = "_at_tsconfig_slash_node10"; - packageName = "@tsconfig/node10"; - version = "1.0.9"; - src = fetchurl { - url = "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.9.tgz"; - sha512 = "jNsYVVxU8v5g43Erja32laIDHXeoNvFEpX33OK4d6hljo3jDhCBDhx5dhCCTMWUojscpAagGiRkBKxpdl9fxqA=="; - }; - }; - "@tsconfig/node12-1.0.11" = { - name = "_at_tsconfig_slash_node12"; - packageName = "@tsconfig/node12"; - version = "1.0.11"; - src = fetchurl { - url = "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.11.tgz"; - sha512 = "cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag=="; - }; - }; - "@tsconfig/node14-1.0.3" = { - name = "_at_tsconfig_slash_node14"; - packageName = "@tsconfig/node14"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.3.tgz"; - sha512 = "ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow=="; - }; - }; - "@tsconfig/node16-1.0.4" = { - name = "_at_tsconfig_slash_node16"; - packageName = "@tsconfig/node16"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.4.tgz"; - sha512 = "vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA=="; - }; - }; - "@types/asn1-0.2.1" = { - name = "_at_types_slash_asn1"; - packageName = "@types/asn1"; - version = "0.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/asn1/-/asn1-0.2.1.tgz"; - sha512 = "MgrOWeBGvb9CU43AOMvrr7laqiATS4dApdqnmXl4MLxH6rSXcjSoh12y/9YGv/7Cn63cob5xQjcxVvjnOLmrmw=="; - }; - }; - "@types/big.js-6.2.0" = { - name = "_at_types_slash_big.js"; - packageName = "@types/big.js"; - version = "6.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/big.js/-/big.js-6.2.0.tgz"; - sha512 = "ubLURWoc4tCw/8Yds0P3CE9cBG5q+aoycwWBiXXx4gp7XPYZy9ch0L9+Pv6osSoSRgvuQNqJdlwEhP5QhKKl6w=="; - }; - }; - "@types/body-parser-1.19.3" = { - name = "_at_types_slash_body-parser"; - packageName = "@types/body-parser"; - version = "1.19.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.3.tgz"; - sha512 = "oyl4jvAfTGX9Bt6Or4H9ni1Z447/tQuxnZsytsCaExKlmJiU8sFgnIBRzJUpKwB5eWn9HuBYlUlVA74q/yN0eQ=="; - }; - }; - "@types/connect-3.4.36" = { - name = "_at_types_slash_connect"; - packageName = "@types/connect"; - version = "3.4.36"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/connect/-/connect-3.4.36.tgz"; - sha512 = "P63Zd/JUGq+PdrM1lv0Wv5SBYeA2+CORvbrXbngriYY0jzLUWfQMQQxOhjONEz/wlHOAxOdY7CY65rgQdTjq2w=="; - }; - }; - "@types/duplexify-3.6.2" = { - name = "_at_types_slash_duplexify"; - packageName = "@types/duplexify"; - version = "3.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/duplexify/-/duplexify-3.6.2.tgz"; - sha512 = "2/0R4riyD/OS6GNJLIhwRaj+8ZbxHUZl3I0a3PHwH7zhZEEAACUWjzaBrY1qVWckueZ5pouDRP0UxX6P8Hzfww=="; - }; - }; - "@types/es-aggregate-error-1.0.3" = { - name = "_at_types_slash_es-aggregate-error"; - packageName = "@types/es-aggregate-error"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/es-aggregate-error/-/es-aggregate-error-1.0.3.tgz"; - sha512 = "GmY61WWXQemfJp+qmMu6RsrNev0eoEWeWtg46w9pdXje23jRJrf7yETbAkl7F+CfQJSKW7w3//sTYtQTt+R5Lg=="; - }; - }; - "@types/eslint-8.44.4" = { - name = "_at_types_slash_eslint"; - packageName = "@types/eslint"; - version = "8.44.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/eslint/-/eslint-8.44.4.tgz"; - sha512 = "lOzjyfY/D9QR4hY9oblZ76B90MYTB3RrQ4z2vBIJKj9ROCRqdkYl2gSUx1x1a4IWPjKJZLL4Aw1Zfay7eMnmnA=="; - }; - }; - "@types/eslint-scope-3.7.5" = { - name = "_at_types_slash_eslint-scope"; - packageName = "@types/eslint-scope"; - version = "3.7.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.5.tgz"; - sha512 = "JNvhIEyxVW6EoMIFIvj93ZOywYFatlpu9deeH6eSx6PE3WHYvHaQtmHmQeNw7aA81bYGBPPQqdtBm6b1SsQMmA=="; - }; - }; - "@types/estree-1.0.2" = { - name = "_at_types_slash_estree"; - packageName = "@types/estree"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/estree/-/estree-1.0.2.tgz"; - sha512 = "VeiPZ9MMwXjO32/Xu7+OwflfmeoRwkE/qzndw42gGtgJwZopBnzy2gD//NN1+go1mADzkDcqf/KnFRSjTJ8xJA=="; - }; - }; - "@types/express-4.17.19" = { - name = "_at_types_slash_express"; - packageName = "@types/express"; - version = "4.17.19"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/express/-/express-4.17.19.tgz"; - sha512 = "UtOfBtzN9OvpZPPbnnYunfjM7XCI4jyk1NvnFhTVz5krYAnW4o5DCoIekvms+8ApqhB4+9wSge1kBijdfTSmfg=="; - }; - }; - "@types/express-serve-static-core-4.17.37" = { - name = "_at_types_slash_express-serve-static-core"; - packageName = "@types/express-serve-static-core"; - version = "4.17.37"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.37.tgz"; - sha512 = "ZohaCYTgGFcOP7u6aJOhY9uIZQgZ2vxC2yWoArY+FeDXlqeH66ZVBjgvg+RLVAS/DWNq4Ap9ZXu1+SUQiiWYMg=="; - }; - }; - "@types/http-errors-2.0.2" = { - name = "_at_types_slash_http-errors"; - packageName = "@types/http-errors"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.2.tgz"; - sha512 = "lPG6KlZs88gef6aD85z3HNkztpj7w2R7HmR3gygjfXCQmsLloWNARFkMuzKiiY8FGdh1XDpgBdrSf4aKDiA7Kg=="; - }; - }; - "@types/json-schema-7.0.13" = { - name = "_at_types_slash_json-schema"; - packageName = "@types/json-schema"; - version = "7.0.13"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.13.tgz"; - sha512 = "RbSSoHliUbnXj3ny0CNFOoxrIDV6SUGyStHsvDqosw6CkdPV8TtWGlfecuK4ToyMEAql6pzNxgCFKanovUzlgQ=="; - }; - }; - "@types/jsonwebtoken-9.0.3" = { - name = "_at_types_slash_jsonwebtoken"; - packageName = "@types/jsonwebtoken"; - version = "9.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/jsonwebtoken/-/jsonwebtoken-9.0.3.tgz"; - sha512 = "b0jGiOgHtZ2jqdPgPnP6WLCXZk1T8p06A/vPGzUvxpFGgKMbjXJDjC5m52ErqBnIuWZFgGoIJyRdeG5AyreJjA=="; - }; - }; - "@types/lodash-4.14.199" = { - name = "_at_types_slash_lodash"; - packageName = "@types/lodash"; - version = "4.14.199"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.199.tgz"; - sha512 = "Vrjz5N5Ia4SEzWWgIVwnHNEnb1UE1XMkvY5DGXrAeOGE9imk0hgTHh5GyDjLDJi9OTCn9oo9dXH1uToK1VRfrg=="; - }; - }; - "@types/long-4.0.2" = { - name = "_at_types_slash_long"; - packageName = "@types/long"; - version = "4.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/long/-/long-4.0.2.tgz"; - sha512 = "MqTGEo5bj5t157U6fA/BiDynNkn0YknVdh48CMPkTSpFTVmvao5UQmm7uEF6xBEo7qIMAlY/JSleYaE6VOdpaA=="; - }; - }; - "@types/mime-1.3.3" = { - name = "_at_types_slash_mime"; - packageName = "@types/mime"; - version = "1.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/mime/-/mime-1.3.3.tgz"; - sha512 = "Ys+/St+2VF4+xuY6+kDIXGxbNRO0mesVg0bbxEfB97Od1Vjpjx9KD1qxs64Gcb3CWPirk9Xe+PT4YiiHQ9T+eg=="; - }; - }; - "@types/multer-1.4.8" = { - name = "_at_types_slash_multer"; - packageName = "@types/multer"; - version = "1.4.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/multer/-/multer-1.4.8.tgz"; - sha512 = "VMZOW6mnmMMhA5m3fsCdXBwFwC+a+27/8gctNMuQC4f7UtWcF79KAFGoIfKZ4iqrElgWIa3j5vhMJDp0iikQ1g=="; - }; - }; - "@types/node-20.8.4" = { - name = "_at_types_slash_node"; - packageName = "@types/node"; - version = "20.8.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-20.8.4.tgz"; - sha512 = "ZVPnqU58giiCjSxjVUESDtdPk4QR5WQhhINbc9UBrKLU68MX5BF6kbQzTrkwbolyr0X8ChBpXfavr5mZFKZQ5A=="; - }; - }; - "@types/node-fetch-2.6.6" = { - name = "_at_types_slash_node-fetch"; - packageName = "@types/node-fetch"; - version = "2.6.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.6.6.tgz"; - sha512 = "95X8guJYhfqiuVVhRFxVQcf4hW/2bCuoPwDasMf/531STFoNoWTT7YDnWdXHEZKqAGUigmpG31r2FE70LwnzJw=="; - }; - }; - "@types/pumpify-1.4.2" = { - name = "_at_types_slash_pumpify"; - packageName = "@types/pumpify"; - version = "1.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/pumpify/-/pumpify-1.4.2.tgz"; - sha512 = "UBMrvkSFjQNWy0999fubiO8uFIuDJsbap4KnS+xsi2ax40w6mivT2zRPLywPDervsD6EMdvESHF72YMsgHSpXA=="; - }; - }; - "@types/qs-6.9.8" = { - name = "_at_types_slash_qs"; - packageName = "@types/qs"; - version = "6.9.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/qs/-/qs-6.9.8.tgz"; - sha512 = "u95svzDlTysU5xecFNTgfFG5RUWu1A9P0VzgpcIiGZA9iraHOdSzcxMxQ55DyeRaGCSxQi7LxXDI4rzq/MYfdg=="; - }; - }; - "@types/range-parser-1.2.5" = { - name = "_at_types_slash_range-parser"; - packageName = "@types/range-parser"; - version = "1.2.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.5.tgz"; - sha512 = "xrO9OoVPqFuYyR/loIHjnbvvyRZREYKLjxV4+dY6v3FQR3stQ9ZxIGkaclF7YhI9hfjpuTbu14hZEy94qKLtOA=="; - }; - }; - "@types/readable-stream-4.0.3" = { - name = "_at_types_slash_readable-stream"; - packageName = "@types/readable-stream"; - version = "4.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/readable-stream/-/readable-stream-4.0.3.tgz"; - sha512 = "Z8BOzyIj3UPpn3j5DmDNKIw4wPN9N8a1d1oyteiprWq+wxdgQNC0UfFAQwWjmjyA7uoj7mvoWgxWWH66zYtm4Q=="; - }; - }; - "@types/send-0.17.2" = { - name = "_at_types_slash_send"; - packageName = "@types/send"; - version = "0.17.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/send/-/send-0.17.2.tgz"; - sha512 = "aAG6yRf6r0wQ29bkS+x97BIs64ZLxeE/ARwyS6wrldMm3C1MdKwCcnnEwMC1slI8wuxJOpiUH9MioC0A0i+GJw=="; - }; - }; - "@types/serve-static-1.15.3" = { - name = "_at_types_slash_serve-static"; - packageName = "@types/serve-static"; - version = "1.15.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.3.tgz"; - sha512 = "yVRvFsEMrv7s0lGhzrggJjNOSmZCdgCjw9xWrPr/kNNLp6FaDfMC1KaYl3TSJ0c58bECwNBMoQrZJ8hA8E1eFg=="; - }; - }; - "@types/stack-trace-0.0.29" = { - name = "_at_types_slash_stack-trace"; - packageName = "@types/stack-trace"; - version = "0.0.29"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/stack-trace/-/stack-trace-0.0.29.tgz"; - sha512 = "TgfOX+mGY/NyNxJLIbDWrO9DjGoVSW9+aB8H2yy1fy32jsvxijhmyJI9fDFgvz3YP4lvJaq9DzdR/M1bOgVc9g=="; - }; - }; - "@types/triple-beam-1.3.3" = { - name = "_at_types_slash_triple-beam"; - packageName = "@types/triple-beam"; - version = "1.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/triple-beam/-/triple-beam-1.3.3.tgz"; - sha512 = "6tOUG+nVHn0cJbVp25JFayS5UE6+xlbcNF9Lo9mU7U0zk3zeUShZied4YEQZjy1JBF043FSkdXw8YkUJuVtB5g=="; - }; - }; - "@types/tunnel-0.0.3" = { - name = "_at_types_slash_tunnel"; - packageName = "@types/tunnel"; - version = "0.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/tunnel/-/tunnel-0.0.3.tgz"; - sha512 = "sOUTGn6h1SfQ+gbgqC364jLFBw2lnFqkgF3q0WovEHRLMrVD1sd5aufqi/aJObLekJO+Aq5z646U4Oxy6shXMA=="; - }; - }; - "@types/uuid-8.3.4" = { - name = "_at_types_slash_uuid"; - packageName = "@types/uuid"; - version = "8.3.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/uuid/-/uuid-8.3.4.tgz"; - sha512 = "c/I8ZRb51j+pYGAu5CrFMRxqZ2ke4y2grEBO5AUjgSkSk+qT2Ea+OdWElz/OiMf5MNpn2b17kuVBwZLQJXzihw=="; - }; - }; - "@types/uuid-9.0.5" = { - name = "_at_types_slash_uuid"; - packageName = "@types/uuid"; - version = "9.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/uuid/-/uuid-9.0.5.tgz"; - sha512 = "xfHdwa1FMJ082prjSJpoEI57GZITiQz10r3vEJCHa2khEFQjKy91aWKz6+zybzssCvXUwE1LQWgWVwZ4nYUvHQ=="; - }; - }; - "@types/validator-13.11.2" = { - name = "_at_types_slash_validator"; - packageName = "@types/validator"; - version = "13.11.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/validator/-/validator-13.11.2.tgz"; - sha512 = "nIKVVQKT6kGKysnNt+xLobr+pFJNssJRi2s034wgWeFBUx01fI8BeHTW2TcRp7VcFu9QCYG8IlChTuovcm0oKQ=="; - }; - }; - "@types/webidl-conversions-7.0.1" = { - name = "_at_types_slash_webidl-conversions"; - packageName = "@types/webidl-conversions"; - version = "7.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/webidl-conversions/-/webidl-conversions-7.0.1.tgz"; - sha512 = "8hKOnOan+Uu+NgMaCouhg3cT9x5fFZ92Jwf+uDLXLu/MFRbXxlWwGeQY7KVHkeSft6RvY+tdxklUBuyY9eIEKg=="; - }; - }; - "@types/whatwg-url-8.2.2" = { - name = "_at_types_slash_whatwg-url"; - packageName = "@types/whatwg-url"; - version = "8.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/whatwg-url/-/whatwg-url-8.2.2.tgz"; - sha512 = "FtQu10RWgn3D9U4aazdwIE2yzphmTJREDqNdODHrbrZmmMqI0vMheC/6NE/J1Yveaj8H+ela+YwWTjq5PGmuhA=="; - }; - }; - "@types/ws-8.5.7" = { - name = "_at_types_slash_ws"; - packageName = "@types/ws"; - version = "8.5.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/ws/-/ws-8.5.7.tgz"; - sha512 = "6UrLjiDUvn40CMrAubXuIVtj2PEfKDffJS7ychvnPU44j+KVeXmdHHTgqcM/dxLUTHxlXHiFM8Skmb8ozGdTnQ=="; - }; - }; - "@webassemblyjs/ast-1.11.6" = { - name = "_at_webassemblyjs_slash_ast"; - packageName = "@webassemblyjs/ast"; - version = "1.11.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.6.tgz"; - sha512 = "IN1xI7PwOvLPgjcf180gC1bqn3q/QaOCwYUahIOhbYUu8KA/3tw2RT/T0Gidi1l7Hhj5D/INhJxiICObqpMu4Q=="; - }; - }; - "@webassemblyjs/floating-point-hex-parser-1.11.6" = { - name = "_at_webassemblyjs_slash_floating-point-hex-parser"; - packageName = "@webassemblyjs/floating-point-hex-parser"; - version = "1.11.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz"; - sha512 = "ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw=="; - }; - }; - "@webassemblyjs/helper-api-error-1.11.6" = { - name = "_at_webassemblyjs_slash_helper-api-error"; - packageName = "@webassemblyjs/helper-api-error"; - version = "1.11.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz"; - sha512 = "o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q=="; - }; - }; - "@webassemblyjs/helper-buffer-1.11.6" = { - name = "_at_webassemblyjs_slash_helper-buffer"; - packageName = "@webassemblyjs/helper-buffer"; - version = "1.11.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.6.tgz"; - sha512 = "z3nFzdcp1mb8nEOFFk8DrYLpHvhKC3grJD2ardfKOzmbmJvEf/tPIqCY+sNcwZIY8ZD7IkB2l7/pqhUhqm7hLA=="; - }; - }; - "@webassemblyjs/helper-numbers-1.11.6" = { - name = "_at_webassemblyjs_slash_helper-numbers"; - packageName = "@webassemblyjs/helper-numbers"; - version = "1.11.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz"; - sha512 = "vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g=="; - }; - }; - "@webassemblyjs/helper-wasm-bytecode-1.11.6" = { - name = "_at_webassemblyjs_slash_helper-wasm-bytecode"; - packageName = "@webassemblyjs/helper-wasm-bytecode"; - version = "1.11.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz"; - sha512 = "sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA=="; - }; - }; - "@webassemblyjs/helper-wasm-section-1.11.6" = { - name = "_at_webassemblyjs_slash_helper-wasm-section"; - packageName = "@webassemblyjs/helper-wasm-section"; - version = "1.11.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.6.tgz"; - sha512 = "LPpZbSOwTpEC2cgn4hTydySy1Ke+XEu+ETXuoyvuyezHO3Kjdu90KK95Sh9xTbmjrCsUwvWwCOQQNta37VrS9g=="; - }; - }; - "@webassemblyjs/ieee754-1.11.6" = { - name = "_at_webassemblyjs_slash_ieee754"; - packageName = "@webassemblyjs/ieee754"; - version = "1.11.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz"; - sha512 = "LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg=="; - }; - }; - "@webassemblyjs/leb128-1.11.6" = { - name = "_at_webassemblyjs_slash_leb128"; - packageName = "@webassemblyjs/leb128"; - version = "1.11.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.6.tgz"; - sha512 = "m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ=="; - }; - }; - "@webassemblyjs/utf8-1.11.6" = { - name = "_at_webassemblyjs_slash_utf8"; - packageName = "@webassemblyjs/utf8"; - version = "1.11.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.6.tgz"; - sha512 = "vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA=="; - }; - }; - "@webassemblyjs/wasm-edit-1.11.6" = { - name = "_at_webassemblyjs_slash_wasm-edit"; - packageName = "@webassemblyjs/wasm-edit"; - version = "1.11.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.6.tgz"; - sha512 = "Ybn2I6fnfIGuCR+Faaz7YcvtBKxvoLV3Lebn1tM4o/IAJzmi9AWYIPWpyBfU8cC+JxAO57bk4+zdsTjJR+VTOw=="; - }; - }; - "@webassemblyjs/wasm-gen-1.11.6" = { - name = "_at_webassemblyjs_slash_wasm-gen"; - packageName = "@webassemblyjs/wasm-gen"; - version = "1.11.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.6.tgz"; - sha512 = "3XOqkZP/y6B4F0PBAXvI1/bky7GryoogUtfwExeP/v7Nzwo1QLcq5oQmpKlftZLbT+ERUOAZVQjuNVak6UXjPA=="; - }; - }; - "@webassemblyjs/wasm-opt-1.11.6" = { - name = "_at_webassemblyjs_slash_wasm-opt"; - packageName = "@webassemblyjs/wasm-opt"; - version = "1.11.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.6.tgz"; - sha512 = "cOrKuLRE7PCe6AsOVl7WasYf3wbSo4CeOk6PkrjS7g57MFfVUF9u6ysQBBODX0LdgSvQqRiGz3CXvIDKcPNy4g=="; - }; - }; - "@webassemblyjs/wasm-parser-1.11.6" = { - name = "_at_webassemblyjs_slash_wasm-parser"; - packageName = "@webassemblyjs/wasm-parser"; - version = "1.11.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.6.tgz"; - sha512 = "6ZwPeGzMJM3Dqp3hCsLgESxBGtT/OeCvCZ4TA1JUPYgmhAx38tTPR9JaKy0S5H3evQpO/h2uWs2j6Yc/fjkpTQ=="; - }; - }; - "@webassemblyjs/wast-printer-1.11.6" = { - name = "_at_webassemblyjs_slash_wast-printer"; - packageName = "@webassemblyjs/wast-printer"; - version = "1.11.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.6.tgz"; - sha512 = "JM7AhRcE+yW2GWYaKeHL5vt4xqee5N2WcezptmgyhNS+ScggqcT1OtXykhAb13Sn5Yas0j2uv9tHgrjwvzAP4A=="; - }; - }; - "@xmldom/xmldom-0.8.10" = { - name = "_at_xmldom_slash_xmldom"; - packageName = "@xmldom/xmldom"; - version = "0.8.10"; - src = fetchurl { - url = "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.10.tgz"; - sha512 = "2WALfTl4xo2SkGCYRt6rDTFfk9R1czmBvUQy12gK2KuRKIpWEhcbbzy8EZXtz/jkRqHX8bFEc6FC1HjX4TUWYw=="; - }; - }; - "@xtuc/ieee754-1.2.0" = { - name = "_at_xtuc_slash_ieee754"; - packageName = "@xtuc/ieee754"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz"; - sha512 = "DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA=="; - }; - }; - "@xtuc/long-4.2.2" = { - name = "_at_xtuc_slash_long"; - packageName = "@xtuc/long"; - version = "4.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz"; - sha512 = "NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ=="; - }; - }; - "a-sync-waterfall-1.0.1" = { - name = "a-sync-waterfall"; - packageName = "a-sync-waterfall"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/a-sync-waterfall/-/a-sync-waterfall-1.0.1.tgz"; - sha512 = "RYTOHHdWipFUliRFMCS4X2Yn2X8M87V/OpSqWzKKOGhzqyUxzyVmhHDH9sAvG+ZuQf/TAOFsLCpMw09I1ufUnA=="; - }; - }; - "abbrev-1.1.1" = { - name = "abbrev"; - packageName = "abbrev"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz"; - sha512 = "nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="; - }; - }; - "abort-controller-3.0.0" = { - name = "abort-controller"; - packageName = "abort-controller"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz"; - sha512 = "h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg=="; - }; - }; - "accepts-1.3.8" = { - name = "accepts"; - packageName = "accepts"; - version = "1.3.8"; - src = fetchurl { - url = "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz"; - sha512 = "PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw=="; - }; - }; - "acorn-8.10.0" = { - name = "acorn"; - packageName = "acorn"; - version = "8.10.0"; - src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz"; - sha512 = "F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw=="; - }; - }; - "acorn-import-assertions-1.9.0" = { - name = "acorn-import-assertions"; - packageName = "acorn-import-assertions"; - version = "1.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz"; - sha512 = "cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA=="; - }; - }; - "acorn-walk-8.2.0" = { - name = "acorn-walk"; - packageName = "acorn-walk"; - version = "8.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz"; - sha512 = "k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA=="; - }; - }; - "agent-base-6.0.2" = { - name = "agent-base"; - packageName = "agent-base"; - version = "6.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz"; - sha512 = "RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ=="; - }; - }; - "agentkeepalive-4.5.0" = { - name = "agentkeepalive"; - packageName = "agentkeepalive"; - version = "4.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.5.0.tgz"; - sha512 = "5GG/5IbQQpC9FpkRGsSvZI5QYeSCzlJHdpBQntCsuTOxhKD8lqKhrleg2Yi7yvMIf82Ycmmqln9U8V9qwEiJew=="; - }; - }; - "aggregate-error-3.1.0" = { - name = "aggregate-error"; - packageName = "aggregate-error"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz"; - sha512 = "4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA=="; - }; - }; - "ajv-6.12.6" = { - name = "ajv"; - packageName = "ajv"; - version = "6.12.6"; - src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz"; - sha512 = "j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g=="; - }; - }; - "ajv-keywords-3.5.2" = { - name = "ajv-keywords"; - packageName = "ajv-keywords"; - version = "3.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz"; - sha512 = "5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ=="; - }; - }; - "amqplib-0.10.3" = { - name = "amqplib"; - packageName = "amqplib"; - version = "0.10.3"; - src = fetchurl { - url = "https://registry.npmjs.org/amqplib/-/amqplib-0.10.3.tgz"; - sha512 = "UHmuSa7n8vVW/a5HGh2nFPqAEr8+cD4dEZ6u9GjP91nHfr1a54RyAKyra7Sb5NH7NBKOUlyQSMXIp0qAixKexw=="; - }; - }; - "ansi-escapes-4.3.2" = { - name = "ansi-escapes"; - packageName = "ansi-escapes"; - version = "4.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz"; - sha512 = "gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ=="; - }; - }; - "ansi-regex-5.0.1" = { - name = "ansi-regex"; - packageName = "ansi-regex"; - version = "5.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz"; - sha512 = "quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="; - }; - }; - "ansi-regex-6.0.1" = { - name = "ansi-regex"; - packageName = "ansi-regex"; - version = "6.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz"; - sha512 = "n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA=="; - }; - }; - "ansi-styles-4.3.0" = { - name = "ansi-styles"; - packageName = "ansi-styles"; - version = "4.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz"; - sha512 = "zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="; - }; - }; - "ansi-styles-6.2.1" = { - name = "ansi-styles"; - packageName = "ansi-styles"; - version = "6.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz"; - sha512 = "bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug=="; - }; - }; - "ansicolors-0.3.2" = { - name = "ansicolors"; - packageName = "ansicolors"; - version = "0.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/ansicolors/-/ansicolors-0.3.2.tgz"; - sha512 = "QXu7BPrP29VllRxH8GwB7x5iX5qWKAAMLqKQGWTeLWVlNHNOpVMJ91dsxQAIWXpjuW5wqvxu3Jd/nRjrJ+0pqg=="; - }; - }; - "any-promise-1.3.0" = { - name = "any-promise"; - packageName = "any-promise"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz"; - sha512 = "7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A=="; - }; - }; - "anymatch-3.1.3" = { - name = "anymatch"; - packageName = "anymatch"; - version = "3.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz"; - sha512 = "KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw=="; - }; - }; - "app-root-path-3.1.0" = { - name = "app-root-path"; - packageName = "app-root-path"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/app-root-path/-/app-root-path-3.1.0.tgz"; - sha512 = "biN3PwB2gUtjaYy/isrU3aNWI5w+fAfvHkSvCKeQGxhmYpwKFUxudR3Yya+KqVRHBmEDYh+/lTozYCFbmzX4nA=="; - }; - }; - "append-field-1.0.0" = { - name = "append-field"; - packageName = "append-field"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/append-field/-/append-field-1.0.0.tgz"; - sha512 = "klpgFSWLW1ZEs8svjfb7g4qWY0YS5imI82dTg+QahUvJ8YqAY0P10Uk8tTyh9ZGuYEZEMaeJYCF5BFuX552hsw=="; - }; - }; - "aproba-2.0.0" = { - name = "aproba"; - packageName = "aproba"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/aproba/-/aproba-2.0.0.tgz"; - sha512 = "lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ=="; - }; - }; - "are-we-there-yet-2.0.0" = { - name = "are-we-there-yet"; - packageName = "are-we-there-yet"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz"; - sha512 = "Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw=="; - }; - }; - "are-we-there-yet-3.0.1" = { - name = "are-we-there-yet"; - packageName = "are-we-there-yet"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-3.0.1.tgz"; - sha512 = "QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg=="; - }; - }; - "arg-4.1.3" = { - name = "arg"; - packageName = "arg"; - version = "4.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz"; - sha512 = "58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA=="; - }; - }; - "argparse-1.0.10" = { - name = "argparse"; - packageName = "argparse"; - version = "1.0.10"; - src = fetchurl { - url = "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz"; - sha512 = "o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg=="; - }; - }; - "argparse-2.0.1" = { - name = "argparse"; - packageName = "argparse"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz"; - sha512 = "8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="; - }; - }; - "array-buffer-byte-length-1.0.0" = { - name = "array-buffer-byte-length"; - packageName = "array-buffer-byte-length"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz"; - sha512 = "LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A=="; - }; - }; - "array-flatten-1.1.1" = { - name = "array-flatten"; - packageName = "array-flatten"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz"; - sha512 = "PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg=="; - }; - }; - "array-parallel-0.1.3" = { - name = "array-parallel"; - packageName = "array-parallel"; - version = "0.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/array-parallel/-/array-parallel-0.1.3.tgz"; - sha512 = "TDPTwSWW5E4oiFiKmz6RGJ/a80Y91GuLgUYuLd49+XBS75tYo8PNgaT2K/OxuQYqkoI852MDGBorg9OcUSTQ8w=="; - }; - }; - "array-series-0.1.5" = { - name = "array-series"; - packageName = "array-series"; - version = "0.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/array-series/-/array-series-0.1.5.tgz"; - sha512 = "L0XlBwfx9QetHOsbLDrE/vh2t018w9462HM3iaFfxRiK83aJjAt/Ja3NMkOW7FICwWTlQBa3ZbL5FKhuQWkDrg=="; - }; - }; - "array-union-2.1.0" = { - name = "array-union"; - packageName = "array-union"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz"; - sha512 = "HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw=="; - }; - }; - "array.prototype.reduce-1.0.6" = { - name = "array.prototype.reduce"; - packageName = "array.prototype.reduce"; - version = "1.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/array.prototype.reduce/-/array.prototype.reduce-1.0.6.tgz"; - sha512 = "UW+Mz8LG/sPSU8jRDCjVr6J/ZKAGpHfwrZ6kWTG5qCxIEiXdVshqGnu5vEZA8S1y6X4aCSbQZ0/EEsfvEvBiSg=="; - }; - }; - "arraybuffer.prototype.slice-1.0.2" = { - name = "arraybuffer.prototype.slice"; - packageName = "arraybuffer.prototype.slice"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.2.tgz"; - sha512 = "yMBKppFur/fbHu9/6USUe03bZ4knMYiwFBcyiaXB8Go0qNehwX6inYPzK9U0NeQvGxKthcmHcaR8P5MStSRBAw=="; - }; - }; - "arrify-2.0.1" = { - name = "arrify"; - packageName = "arrify"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz"; - sha512 = "3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug=="; - }; - }; - "asap-2.0.6" = { - name = "asap"; - packageName = "asap"; - version = "2.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz"; - sha512 = "BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA=="; - }; - }; - "asn1-0.2.6" = { - name = "asn1"; - packageName = "asn1"; - version = "0.2.6"; - src = fetchurl { - url = "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz"; - sha512 = "ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ=="; - }; - }; - "asn1.js-5.4.1" = { - name = "asn1.js"; - packageName = "asn1.js"; - version = "5.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz"; - sha512 = "+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA=="; - }; - }; - "asn1.js-rfc2560-5.0.1" = { - name = "asn1.js-rfc2560"; - packageName = "asn1.js-rfc2560"; - version = "5.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/asn1.js-rfc2560/-/asn1.js-rfc2560-5.0.1.tgz"; - sha512 = "1PrVg6kuBziDN3PGFmRk3QrjpKvP9h/Hv5yMrFZvC1kpzP6dQRzf5BpKstANqHBkaOUmTpakJWhicTATOA/SbA=="; - }; - }; - "asn1.js-rfc5280-3.0.0" = { - name = "asn1.js-rfc5280"; - packageName = "asn1.js-rfc5280"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/asn1.js-rfc5280/-/asn1.js-rfc5280-3.0.0.tgz"; - sha512 = "Y2LZPOWeZ6qehv698ZgOGGCZXBQShObWnGthTrIFlIQjuV1gg2B8QOhWFRExq/MR1VnPpIIe7P9vX2vElxv+Pg=="; - }; - }; - "assert-2.1.0" = { - name = "assert"; - packageName = "assert"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/assert/-/assert-2.1.0.tgz"; - sha512 = "eLHpSK/Y4nhMJ07gDaAzoX/XAKS8PSaojml3M0DM4JpV1LAi5JOJ/p6H/XWrl8L+DzVEvVCW1z3vWAaB9oTsQw=="; - }; - }; - "assert-options-0.8.0" = { - name = "assert-options"; - packageName = "assert-options"; - version = "0.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/assert-options/-/assert-options-0.8.0.tgz"; - sha512 = "qSELrEaEz4sGwTs4Qh+swQkjiHAysC4rot21+jzXU86dJzNG+FDqBzyS3ohSoTRf4ZLA3FSwxQdiuNl5NXUtvA=="; - }; - }; - "assert-plus-1.0.0" = { - name = "assert-plus"; - packageName = "assert-plus"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"; - sha512 = "NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw=="; - }; - }; - "ast-types-0.15.2" = { - name = "ast-types"; - packageName = "ast-types"; - version = "0.15.2"; - src = fetchurl { - url = "https://registry.npmjs.org/ast-types/-/ast-types-0.15.2.tgz"; - sha512 = "c27loCv9QkZinsa5ProX751khO9DJl/AcB5c2KNtA6NRvHKS0PgLfcftz72KVq504vB0Gku5s2kUZzDBvQWvHg=="; - }; - }; - "ast-types-0.16.1" = { - name = "ast-types"; - packageName = "ast-types"; - version = "0.16.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ast-types/-/ast-types-0.16.1.tgz"; - sha512 = "6t10qk83GOG8p0vKmaCr8eiilZwO171AvbROMtvvNiwrTly62t+7XkA8RdIIVbpMhCASAsxgAzdRSwh6nw/5Dg=="; - }; - }; - "async-2.6.4" = { - name = "async"; - packageName = "async"; - version = "2.6.4"; - src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-2.6.4.tgz"; - sha512 = "mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA=="; - }; - }; - "async-3.2.4" = { - name = "async"; - packageName = "async"; - version = "3.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-3.2.4.tgz"; - sha512 = "iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ=="; - }; - }; - "async-retry-1.3.3" = { - name = "async-retry"; - packageName = "async-retry"; - version = "1.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/async-retry/-/async-retry-1.3.3.tgz"; - sha512 = "wfr/jstw9xNi/0teMHrRW7dsz3Lt5ARhYNZ2ewpadnhaIp5mbALhOAP+EAdsC7t4Z6wqsDVv9+W6gm1Dk9mEyw=="; - }; - }; - "asynckit-0.4.0" = { - name = "asynckit"; - packageName = "asynckit"; - version = "0.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz"; - sha512 = "Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="; - }; - }; - "at-least-node-1.0.0" = { - name = "at-least-node"; - packageName = "at-least-node"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz"; - sha512 = "+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg=="; - }; - }; - "auto-changelog-1.16.4" = { - name = "auto-changelog"; - packageName = "auto-changelog"; - version = "1.16.4"; - src = fetchurl { - url = "https://registry.npmjs.org/auto-changelog/-/auto-changelog-1.16.4.tgz"; - sha512 = "h7diyELoq692AA4oqO50ULoYKIomUdzuQ+NW+eFPwIX0xzVbXEu9cIcgzZ3TYNVbpkGtcNKh51aRfAQNef7HVA=="; - }; - }; - "available-typed-arrays-1.0.5" = { - name = "available-typed-arrays"; - packageName = "available-typed-arrays"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz"; - sha512 = "DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw=="; - }; - }; - "avsc-5.7.7" = { - name = "avsc"; - packageName = "avsc"; - version = "5.7.7"; - src = fetchurl { - url = "https://registry.npmjs.org/avsc/-/avsc-5.7.7.tgz"; - sha512 = "9cYNccliXZDByFsFliVwk5GvTq058Fj513CiR4E60ndDwmuXzTJEp/Bp8FyuRmGyYupLjHLs+JA9/CBoVS4/NQ=="; - }; - }; - "aws-crt-1.18.0" = { - name = "aws-crt"; - packageName = "aws-crt"; - version = "1.18.0"; - src = fetchurl { - url = "https://registry.npmjs.org/aws-crt/-/aws-crt-1.18.0.tgz"; - sha512 = "H5Vrb/GMzq72+Of2zrW69i/BTQ4gQd3MQvdZ3X3okfppzHdEjSPkdJN6ia8V2/1J1FmFvEtoxaY4nwraHUGQvg=="; - }; - }; - "aws4-1.12.0" = { - name = "aws4"; - packageName = "aws4"; - version = "1.12.0"; - src = fetchurl { - url = "https://registry.npmjs.org/aws4/-/aws4-1.12.0.tgz"; - sha512 = "NmWvPnx0F1SfrQbYwOi7OeaNGokp9XhzNioJ/CSBs8Qa4vxug81mhJEAVZwxXuBmYB5KDRfMq/F3RR0BIU7sWg=="; - }; - }; - "axios-0.21.4" = { - name = "axios"; - packageName = "axios"; - version = "0.21.4"; - src = fetchurl { - url = "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz"; - sha512 = "ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg=="; - }; - }; - "axios-0.24.0" = { - name = "axios"; - packageName = "axios"; - version = "0.24.0"; - src = fetchurl { - url = "https://registry.npmjs.org/axios/-/axios-0.24.0.tgz"; - sha512 = "Q6cWsys88HoPgAaFAVUb0WpPk0O8iTeisR9IMqy9G8AbO4NlpVknrnQS03zzF9PGAWgO3cgletO3VjV/P7VztA=="; - }; - }; - "axios-0.27.2" = { - name = "axios"; - packageName = "axios"; - version = "0.27.2"; - src = fetchurl { - url = "https://registry.npmjs.org/axios/-/axios-0.27.2.tgz"; - sha512 = "t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ=="; - }; - }; - "axios-1.5.1" = { - name = "axios"; - packageName = "axios"; - version = "1.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/axios/-/axios-1.5.1.tgz"; - sha512 = "Q28iYCWzNHjAm+yEAot5QaAMxhMghWLFVf7rRdwhUI+c2jix2DUXjAHXVi+s1ibs3mjPO/cCgbA++3BjD0vP/A=="; - }; - }; - "axios-retry-3.8.0" = { - name = "axios-retry"; - packageName = "axios-retry"; - version = "3.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/axios-retry/-/axios-retry-3.8.0.tgz"; - sha512 = "CfIsQyWNc5/AE7x/UEReRUadiBmQeoBpSEC+4QyGLJMswTsP1tz0GW2YYPnE7w9+ESMef5zOgLDFpHynNyEZ1w=="; - }; - }; - "balanced-match-1.0.2" = { - name = "balanced-match"; - packageName = "balanced-match"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz"; - sha512 = "3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="; - }; - }; - "base-64-1.0.0" = { - name = "base-64"; - packageName = "base-64"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/base-64/-/base-64-1.0.0.tgz"; - sha512 = "kwDPIFCGx0NZHog36dj+tHiwP4QMzsZ3AgMViUBKI0+V5n4U0ufTCUMhnQ04diaRI8EX/QcPfql7zlhZ7j4zgg=="; - }; - }; - "base64-js-1.5.1" = { - name = "base64-js"; - packageName = "base64-js"; - version = "1.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz"; - sha512 = "AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="; - }; - }; - "basic-auth-2.0.1" = { - name = "basic-auth"; - packageName = "basic-auth"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/basic-auth/-/basic-auth-2.0.1.tgz"; - sha512 = "NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg=="; - }; - }; - "bcrypt-pbkdf-1.0.2" = { - name = "bcrypt-pbkdf"; - packageName = "bcrypt-pbkdf"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz"; - sha512 = "qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w=="; - }; - }; - "bcryptjs-2.4.3" = { - name = "bcryptjs"; - packageName = "bcryptjs"; - version = "2.4.3"; - src = fetchurl { - url = "https://registry.npmjs.org/bcryptjs/-/bcryptjs-2.4.3.tgz"; - sha512 = "V/Hy/X9Vt7f3BbPJEi8BdVFMByHi+jNXrYkW3huaybV/kQ0KJg0Y6PkEMbn+zeT+i+SiKZ/HMqJGIIt4LZDqNQ=="; - }; - }; - "better-sqlite3-8.7.0" = { - name = "better-sqlite3"; - packageName = "better-sqlite3"; - version = "8.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/better-sqlite3/-/better-sqlite3-8.7.0.tgz"; - sha512 = "99jZU4le+f3G6aIl6PmmV0cxUIWqKieHxsiF7G34CVFiE+/UabpYqkU0NJIkY/96mQKikHeBjtR27vFfs5JpEw=="; - }; - }; - "big-integer-1.6.51" = { - name = "big-integer"; - packageName = "big-integer"; - version = "1.6.51"; - src = fetchurl { - url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.51.tgz"; - sha512 = "GPEid2Y9QU1Exl1rpO9B2IPJGHPSupF5GnVIP0blYvNOMer2bTvSWs1jGOUg04hTmu67nmLsQ9TBo1puaotBHg=="; - }; - }; - "big.js-5.2.2" = { - name = "big.js"; - packageName = "big.js"; - version = "5.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz"; - sha512 = "vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ=="; - }; - }; - "big.js-6.2.1" = { - name = "big.js"; - packageName = "big.js"; - version = "6.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/big.js/-/big.js-6.2.1.tgz"; - sha512 = "bCtHMwL9LeDIozFn+oNhhFoq+yQ3BNdnsLSASUxLciOb1vgvpHsIO1dsENiGMgbb4SkP5TrzWzRiLddn8ahVOQ=="; - }; - }; - "bignumber.js-2.4.0" = { - name = "bignumber.js"; - packageName = "bignumber.js"; - version = "2.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/bignumber.js/-/bignumber.js-2.4.0.tgz"; - sha512 = "uw4ra6Cv483Op/ebM0GBKKfxZlSmn6NgFRby5L3yGTlunLj53KQgndDlqy2WVFOwgvurocApYkSud0aO+mvrpQ=="; - }; - }; - "bignumber.js-9.1.2" = { - name = "bignumber.js"; - packageName = "bignumber.js"; - version = "9.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.1.2.tgz"; - sha512 = "2/mKyZH9K85bzOEfhXDBFZTGd1CTs+5IHpeFQo9luiBG7hghdC851Pj2WAhb6E3R6b9tZj/XKhbg4fum+Kepug=="; - }; - }; - "binary-extensions-2.2.0" = { - name = "binary-extensions"; - packageName = "binary-extensions"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz"; - sha512 = "jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA=="; - }; - }; - "binascii-0.0.2" = { - name = "binascii"; - packageName = "binascii"; - version = "0.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/binascii/-/binascii-0.0.2.tgz"; - sha512 = "rA2CrUl1+6yKrn+XgLs8Hdy18OER1UW146nM+ixzhQXDY+Bd3ySkyIJGwF2a4I45JwbvF1mDL/nWkqBwpOcdBA=="; - }; - }; - "bindings-1.5.0" = { - name = "bindings"; - packageName = "bindings"; - version = "1.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz"; - sha512 = "p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ=="; - }; - }; - "bintrees-1.0.2" = { - name = "bintrees"; - packageName = "bintrees"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/bintrees/-/bintrees-1.0.2.tgz"; - sha512 = "VOMgTMwjAaUG580SXn3LacVgjurrbMme7ZZNYGSSV7mmtY6QQRh0Eg3pwIcntQ77DErK1L0NxkbetjcoXzVwKw=="; - }; - }; - "bl-4.1.0" = { - name = "bl"; - packageName = "bl"; - version = "4.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz"; - sha512 = "1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w=="; - }; - }; - "bl-5.1.0" = { - name = "bl"; - packageName = "bl"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/bl/-/bl-5.1.0.tgz"; - sha512 = "tv1ZJHLfTDnXE6tMHv73YgSJaWR2AFuPwMntBe7XL/GBFHnT0CLnsHMogfk5+GzCDC5ZWarSCYaIGATZt9dNsQ=="; - }; - }; - "bluebird-2.11.0" = { - name = "bluebird"; - packageName = "bluebird"; - version = "2.11.0"; - src = fetchurl { - url = "https://registry.npmjs.org/bluebird/-/bluebird-2.11.0.tgz"; - sha512 = "UfFSr22dmHPQqPP9XWHRhq+gWnHCYguQGkXQlbyPtW5qTnhFWA8/iXg765tH0cAjy7l/zPJ1aBTO0g5XgA7kvQ=="; - }; - }; - "bn.js-4.12.0" = { - name = "bn.js"; - packageName = "bn.js"; - version = "4.12.0"; - src = fetchurl { - url = "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz"; - sha512 = "c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="; - }; - }; - "bn.js-5.2.1" = { - name = "bn.js"; - packageName = "bn.js"; - version = "5.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/bn.js/-/bn.js-5.2.1.tgz"; - sha512 = "eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ=="; - }; - }; - "body-parser-1.20.1" = { - name = "body-parser"; - packageName = "body-parser"; - version = "1.20.1"; - src = fetchurl { - url = "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz"; - sha512 = "jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw=="; - }; - }; - "boolbase-1.0.0" = { - name = "boolbase"; - packageName = "boolbase"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz"; - sha512 = "JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww=="; - }; - }; - "bowser-2.11.0" = { - name = "bowser"; - packageName = "bowser"; - version = "2.11.0"; - src = fetchurl { - url = "https://registry.npmjs.org/bowser/-/bowser-2.11.0.tgz"; - sha512 = "AlcaJBi/pqqJBIQ8U9Mcpc9i8Aqxn88Skv5d+xBX006BY5u8N3mGLHa5Lgppa7L/HfwgwLgZ6NYs+Ag6uUmJRA=="; - }; - }; - "brace-expansion-1.1.11" = { - name = "brace-expansion"; - packageName = "brace-expansion"; - version = "1.1.11"; - src = fetchurl { - url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz"; - sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA=="; - }; - }; - "brace-expansion-2.0.1" = { - name = "brace-expansion"; - packageName = "brace-expansion"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz"; - sha512 = "XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA=="; - }; - }; - "braces-3.0.2" = { - name = "braces"; - packageName = "braces"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz"; - sha512 = "b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A=="; - }; - }; - "browser-request-0.3.3" = { - name = "browser-request"; - packageName = "browser-request"; - version = "0.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/browser-request/-/browser-request-0.3.3.tgz"; - sha512 = "YyNI4qJJ+piQG6MMEuo7J3Bzaqssufx04zpEKYfSrl/1Op59HWali9zMtBpXnkmqMcOuWJPZvudrm9wISmnCbg=="; - }; - }; - "browserslist-4.22.1" = { - name = "browserslist"; - packageName = "browserslist"; - version = "4.22.1"; - src = fetchurl { - url = "https://registry.npmjs.org/browserslist/-/browserslist-4.22.1.tgz"; - sha512 = "FEVc202+2iuClEhZhrWy6ZiAcRLvNMyYcxZ8raemul1DYVOVdFsbqckWLdsixQZCpJlwe77Z3UTalE7jsjnKfQ=="; - }; - }; - "bson-4.7.2" = { - name = "bson"; - packageName = "bson"; - version = "4.7.2"; - src = fetchurl { - url = "https://registry.npmjs.org/bson/-/bson-4.7.2.tgz"; - sha512 = "Ry9wCtIZ5kGqkJoi6aD8KjxFZEx78guTQDnpXWiNthsxzrxAK/i8E6pCHAIZTbaEFWcOCvbecMukfK7XUvyLpQ=="; - }; - }; - "bson-5.5.0" = { - name = "bson"; - packageName = "bson"; - version = "5.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/bson/-/bson-5.5.0.tgz"; - sha512 = "B+QB4YmDx9RStKv8LLSl/aVIEV3nYJc3cJNNTK2Cd1TL+7P+cNpw9mAPeCgc5K+j01Dv6sxUzcITXDx7ZU3F0w=="; - }; - }; - "buffer-5.7.1" = { - name = "buffer"; - packageName = "buffer"; - version = "5.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz"; - sha512 = "EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ=="; - }; - }; - "buffer-6.0.3" = { - name = "buffer"; - packageName = "buffer"; - version = "6.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz"; - sha512 = "FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA=="; - }; - }; - "buffer-equal-constant-time-1.0.1" = { - name = "buffer-equal-constant-time"; - packageName = "buffer-equal-constant-time"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz"; - sha512 = "zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA=="; - }; - }; - "buffer-from-1.1.2" = { - name = "buffer-from"; - packageName = "buffer-from"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz"; - sha512 = "E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ=="; - }; - }; - "buffer-more-ints-1.0.0" = { - name = "buffer-more-ints"; - packageName = "buffer-more-ints"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/buffer-more-ints/-/buffer-more-ints-1.0.0.tgz"; - sha512 = "EMetuGFz5SLsT0QTnXzINh4Ksr+oo4i+UGTXEshiGCQWnsgSs7ZhJ8fzlwQ+OzEMs0MpDAMr1hxnblp5a4vcHg=="; - }; - }; - "buffer-writer-2.0.0" = { - name = "buffer-writer"; - packageName = "buffer-writer"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/buffer-writer/-/buffer-writer-2.0.0.tgz"; - sha512 = "a7ZpuTZU1TRtnwyCNW3I5dc0wWNC3VR9S++Ewyk2HHZdrO3CQJqSpd+95Us590V6AL7JqUAH2IwZ/398PmNFgw=="; - }; - }; - "bufferutil-4.0.7" = { - name = "bufferutil"; - packageName = "bufferutil"; - version = "4.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/bufferutil/-/bufferutil-4.0.7.tgz"; - sha512 = "kukuqc39WOHtdxtw4UScxF/WVnMFVSQVKhtx3AjZJzhd0RGZZldcrfSEbVsWWe6KNH253574cq5F+wpv0G9pJw=="; - }; - }; - "bull-3.29.3" = { - name = "bull"; - packageName = "bull"; - version = "3.29.3"; - src = fetchurl { - url = "https://registry.npmjs.org/bull/-/bull-3.29.3.tgz"; - sha512 = "MOqV1dKLy1YQgP9m3lFolyMxaU+1+o4afzYYf0H4wNM+x/S0I1QPQfkgGlLiH00EyFrvSmeubeCYFP47rTfpjg=="; - }; - }; - "bull-4.11.3" = { - name = "bull"; - packageName = "bull"; - version = "4.11.3"; - src = fetchurl { - url = "https://registry.npmjs.org/bull/-/bull-4.11.3.tgz"; - sha512 = "DhS0XtiAuejkAY08iGOdDK35eex/yGNoezlWqGJTu9FqWFF/oBjUhpsusE9SXiI4culyDbOoFs+l3ar0VXhFqQ=="; - }; - }; - "busboy-1.6.0" = { - name = "busboy"; - packageName = "busboy"; - version = "1.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/busboy/-/busboy-1.6.0.tgz"; - sha512 = "8SFQbg/0hQ9xy3UNTB0YEnsNBbWfhf7RtnzpL7TkBiTBRfrQ9Fxcnz7VJsleJpyp6rVLvXiuORqjlHi5q+PYuA=="; - }; - }; - "bytes-3.0.0" = { - name = "bytes"; - packageName = "bytes"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz"; - sha512 = "pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw=="; - }; - }; - "bytes-3.1.2" = { - name = "bytes"; - packageName = "bytes"; - version = "3.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz"; - sha512 = "/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg=="; - }; - }; - "cacache-15.3.0" = { - name = "cacache"; - packageName = "cacache"; - version = "15.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cacache/-/cacache-15.3.0.tgz"; - sha512 = "VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ=="; - }; - }; - "cache-manager-5.2.4" = { - name = "cache-manager"; - packageName = "cache-manager"; - version = "5.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/cache-manager/-/cache-manager-5.2.4.tgz"; - sha512 = "gkuCjug16NdGvKm/sydxGVx17uffrSWcEe2xraBtwRCgdYcFxwJAla4OYpASAZT2yhSoxgDiWL9XH6IAChcZJA=="; - }; - }; - "cache-manager-ioredis-yet-1.2.2" = { - name = "cache-manager-ioredis-yet"; - packageName = "cache-manager-ioredis-yet"; - version = "1.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/cache-manager-ioredis-yet/-/cache-manager-ioredis-yet-1.2.2.tgz"; - sha512 = "o03N/tQxfFONZ1XLGgIxOFHuQQpjpRdnSAL1THG1YWZIVp1JMUfjU3ElSAjFN1LjbJXa55IpC8waG+VEoLUCUw=="; - }; - }; - "call-bind-1.0.2" = { - name = "call-bind"; - packageName = "call-bind"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz"; - sha512 = "7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA=="; - }; - }; - "call-me-maybe-1.0.2" = { - name = "call-me-maybe"; - packageName = "call-me-maybe"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/call-me-maybe/-/call-me-maybe-1.0.2.tgz"; - sha512 = "HpX65o1Hnr9HH25ojC1YGs7HCQLq0GCOibSaWER0eNpgJ/Z1MZv2mTc7+xh6WOPxbRVcmgbv4hGU+uSQ/2xFZQ=="; - }; - }; - "callsites-3.1.0" = { - name = "callsites"; - packageName = "callsites"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz"; - sha512 = "P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ=="; - }; - }; - "camel-case-4.1.2" = { - name = "camel-case"; - packageName = "camel-case"; - version = "4.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/camel-case/-/camel-case-4.1.2.tgz"; - sha512 = "gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw=="; - }; - }; - "camelcase-6.3.0" = { - name = "camelcase"; - packageName = "camelcase"; - version = "6.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz"; - sha512 = "Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA=="; - }; - }; - "caniuse-lite-1.0.30001547" = { - name = "caniuse-lite"; - packageName = "caniuse-lite"; - version = "1.0.30001547"; - src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001547.tgz"; - sha512 = "W7CrtIModMAxobGhz8iXmDfuJiiKg1WADMO/9x7/CLNin5cpSbuBjooyoIUVB5eyCc36QuTVlkVa1iB2S5+/eA=="; - }; - }; - "capital-case-1.0.4" = { - name = "capital-case"; - packageName = "capital-case"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/capital-case/-/capital-case-1.0.4.tgz"; - sha512 = "ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A=="; - }; - }; - "cardinal-2.1.1" = { - name = "cardinal"; - packageName = "cardinal"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/cardinal/-/cardinal-2.1.1.tgz"; - sha512 = "JSr5eOgoEymtYHBjNWyjrMqet9Am2miJhlfKNdqLp6zoeAh0KN5dRAcxlecj5mAJrmQomgiOBj35xHLrFjqBpw=="; - }; - }; - "chalk-4.1.2" = { - name = "chalk"; - packageName = "chalk"; - version = "4.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz"; - sha512 = "oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA=="; - }; - }; - "change-case-4.1.2" = { - name = "change-case"; - packageName = "change-case"; - version = "4.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/change-case/-/change-case-4.1.2.tgz"; - sha512 = "bSxY2ws9OtviILG1EiY5K7NNxkqg/JnRnFxLtKQ96JaviiIxi7djMrSd0ECT9AC+lttClmYwKw53BWpOMblo7A=="; - }; - }; - "chardet-0.7.0" = { - name = "chardet"; - packageName = "chardet"; - version = "0.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz"; - sha512 = "mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA=="; - }; - }; - "charenc-0.0.2" = { - name = "charenc"; - packageName = "charenc"; - version = "0.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/charenc/-/charenc-0.0.2.tgz"; - sha512 = "yrLQ/yVUFXkzg7EDQsPieE/53+0RlaWTs+wBrvW36cyilJ2SaDWfl4Yj7MtLTXleV9uEKefbAGUPv2/iWSooRA=="; - }; - }; - "checkpoint-stream-0.1.2" = { - name = "checkpoint-stream"; - packageName = "checkpoint-stream"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/checkpoint-stream/-/checkpoint-stream-0.1.2.tgz"; - sha512 = "eYXIcydL3mPjjEVLxHdi1ISgTwmxGJZ8vyJ3lYVvFTDRyTOZMTbKZdRJqiA7Gi1rPcwOyyzcrZmGLL8ff7e69w=="; - }; - }; - "cheerio-1.0.0-rc.6" = { - name = "cheerio"; - packageName = "cheerio"; - version = "1.0.0-rc.6"; - src = fetchurl { - url = "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.6.tgz"; - sha512 = "hjx1XE1M/D5pAtMgvWwE21QClmAEeGHOIDfycgmndisdNgI6PE1cGRQkMGBcsbUbmEQyWu5PJLUcAOjtQS8DWw=="; - }; - }; - "cheerio-select-1.6.0" = { - name = "cheerio-select"; - packageName = "cheerio-select"; - version = "1.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cheerio-select/-/cheerio-select-1.6.0.tgz"; - sha512 = "eq0GdBvxVFbqWgmCm7M3XGs1I8oLy/nExUnh6oLqmBditPO9AqQJrkslDpMun/hZ0yyTs8L0m85OHp4ho6Qm9g=="; - }; - }; - "chokidar-3.5.2" = { - name = "chokidar"; - packageName = "chokidar"; - version = "3.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/chokidar/-/chokidar-3.5.2.tgz"; - sha512 = "ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ=="; - }; - }; - "chokidar-3.5.3" = { - name = "chokidar"; - packageName = "chokidar"; - version = "3.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz"; - sha512 = "Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw=="; - }; - }; - "chownr-1.1.4" = { - name = "chownr"; - packageName = "chownr"; - version = "1.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz"; - sha512 = "jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg=="; - }; - }; - "chownr-2.0.0" = { - name = "chownr"; - packageName = "chownr"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz"; - sha512 = "bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ=="; - }; - }; - "chrome-trace-event-1.0.3" = { - name = "chrome-trace-event"; - packageName = "chrome-trace-event"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz"; - sha512 = "p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg=="; - }; - }; - "class-transformer-0.5.1" = { - name = "class-transformer"; - packageName = "class-transformer"; - version = "0.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/class-transformer/-/class-transformer-0.5.1.tgz"; - sha512 = "SQa1Ws6hUbfC98vKGxZH3KFY0Y1lm5Zm0SY8XX9zbK7FJCyVEac3ATW0RIpwzW+oOfmHE5PMPufDG9hCfoEOMw=="; - }; - }; - "class-validator-0.14.0" = { - name = "class-validator"; - packageName = "class-validator"; - version = "0.14.0"; - src = fetchurl { - url = "https://registry.npmjs.org/class-validator/-/class-validator-0.14.0.tgz"; - sha512 = "ct3ltplN8I9fOwUd8GrP8UQixwff129BkEtuWDKL5W45cQuLd19xqmTLu5ge78YDm/fdje6FMt0hGOhl0lii3A=="; - }; - }; - "clean-stack-2.2.0" = { - name = "clean-stack"; - packageName = "clean-stack"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz"; - sha512 = "4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A=="; - }; - }; - "clean-stack-3.0.1" = { - name = "clean-stack"; - packageName = "clean-stack"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/clean-stack/-/clean-stack-3.0.1.tgz"; - sha512 = "lR9wNiMRcVQjSB3a7xXGLuz4cr4wJuuXlaAEbRutGowQTmlp7R72/DOgN21e8jdwblMWl9UOJMJXarX94pzKdg=="; - }; - }; - "cli-cursor-3.1.0" = { - name = "cli-cursor"; - packageName = "cli-cursor"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz"; - sha512 = "I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw=="; - }; - }; - "cli-highlight-2.1.11" = { - name = "cli-highlight"; - packageName = "cli-highlight"; - version = "2.1.11"; - src = fetchurl { - url = "https://registry.npmjs.org/cli-highlight/-/cli-highlight-2.1.11.tgz"; - sha512 = "9KDcoEVwyUXrjcJNvHD0NFc/hiwe/WPVYIleQh2O1N2Zro5gWJZ/K+3DGn8w8P/F6FxOgzyC5bxDyHIgCSPhGg=="; - }; - }; - "cli-progress-3.12.0" = { - name = "cli-progress"; - packageName = "cli-progress"; - version = "3.12.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cli-progress/-/cli-progress-3.12.0.tgz"; - sha512 = "tRkV3HJ1ASwm19THiiLIXLO7Im7wlTuKnvkYaTkyoAPefqjNg7W7DHKUlGRxy9vxDvbyCYQkQozvptuMkGCg8A=="; - }; - }; - "cli-width-3.0.0" = { - name = "cli-width"; - packageName = "cli-width"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz"; - sha512 = "FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw=="; - }; - }; - "cliui-7.0.4" = { - name = "cliui"; - packageName = "cliui"; - version = "7.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz"; - sha512 = "OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ=="; - }; - }; - "cliui-8.0.1" = { - name = "cliui"; - packageName = "cliui"; - version = "8.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz"; - sha512 = "BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ=="; - }; - }; - "cluster-key-slot-1.1.2" = { - name = "cluster-key-slot"; - packageName = "cluster-key-slot"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/cluster-key-slot/-/cluster-key-slot-1.1.2.tgz"; - sha512 = "RMr0FhtfXemyinomL4hrWcYJxmX6deFdCxpJzhDttxgO1+bcCnkk+9drydLVDmAMG7NE6aN/fl4F7ucU/90gAA=="; - }; - }; - "color-3.2.1" = { - name = "color"; - packageName = "color"; - version = "3.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/color/-/color-3.2.1.tgz"; - sha512 = "aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA=="; - }; - }; - "color-convert-1.9.3" = { - name = "color-convert"; - packageName = "color-convert"; - version = "1.9.3"; - src = fetchurl { - url = "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz"; - sha512 = "QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg=="; - }; - }; - "color-convert-2.0.1" = { - name = "color-convert"; - packageName = "color-convert"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz"; - sha512 = "RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ=="; - }; - }; - "color-name-1.1.3" = { - name = "color-name"; - packageName = "color-name"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz"; - sha512 = "72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="; - }; - }; - "color-name-1.1.4" = { - name = "color-name"; - packageName = "color-name"; - version = "1.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz"; - sha512 = "dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="; - }; - }; - "color-string-1.9.1" = { - name = "color-string"; - packageName = "color-string"; - version = "1.9.1"; - src = fetchurl { - url = "https://registry.npmjs.org/color-string/-/color-string-1.9.1.tgz"; - sha512 = "shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg=="; - }; - }; - "color-support-1.1.3" = { - name = "color-support"; - packageName = "color-support"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz"; - sha512 = "qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg=="; - }; - }; - "colors-1.4.0" = { - name = "colors"; - packageName = "colors"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz"; - sha512 = "a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA=="; - }; - }; - "colorspace-1.1.4" = { - name = "colorspace"; - packageName = "colorspace"; - version = "1.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/colorspace/-/colorspace-1.1.4.tgz"; - sha512 = "BgvKJiuVu1igBUF2kEjRCZXol6wiiGbY5ipL/oVPwm0BL9sIpMIzM8IK7vwuxIIzOXMV3Ey5w+vxhm0rR/TN8w=="; - }; - }; - "combined-stream-1.0.8" = { - name = "combined-stream"; - packageName = "combined-stream"; - version = "1.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz"; - sha512 = "FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg=="; - }; - }; - "commander-11.0.0" = { - name = "commander"; - packageName = "commander"; - version = "11.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-11.0.0.tgz"; - sha512 = "9HMlXtt/BNoYr8ooyjjNRdIilOTkVJXB+GhxMTtOKwk0R4j4lS4NpjuqmRxroBfnfTSHQIHQB7wryHhXarNjmQ=="; - }; - }; - "commander-2.20.3" = { - name = "commander"; - packageName = "commander"; - version = "2.20.3"; - src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz"; - sha512 = "GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="; - }; - }; - "commander-5.1.0" = { - name = "commander"; - packageName = "commander"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz"; - sha512 = "P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg=="; - }; - }; - "commander-9.5.0" = { - name = "commander"; - packageName = "commander"; - version = "9.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-9.5.0.tgz"; - sha512 = "KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ=="; - }; - }; - "commist-1.1.0" = { - name = "commist"; - packageName = "commist"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/commist/-/commist-1.1.0.tgz"; - sha512 = "rraC8NXWOEjhADbZe9QBNzLAN5Q3fsTPQtBV+fEVj6xKIgDgNiEVE6ZNfHpZOqfQ21YUzfVNUXLOEZquYvQPPg=="; - }; - }; - "commist-3.2.0" = { - name = "commist"; - packageName = "commist"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/commist/-/commist-3.2.0.tgz"; - sha512 = "4PIMoPniho+LqXmpS5d3NuGYncG6XWlkBSVGiWycL22dd42OYdUGil2CWuzklaJoNxyxUSpO4MKIBU94viWNAw=="; - }; - }; - "component-type-1.2.1" = { - name = "component-type"; - packageName = "component-type"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/component-type/-/component-type-1.2.1.tgz"; - sha512 = "Kgy+2+Uwr75vAi6ChWXgHuLvd+QLD7ssgpaRq2zCvt80ptvAfMc/hijcJxXkBa2wMlEZcJvC2H8Ubo+A9ATHIg=="; - }; - }; - "compressible-2.0.18" = { - name = "compressible"; - packageName = "compressible"; - version = "2.0.18"; - src = fetchurl { - url = "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz"; - sha512 = "AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg=="; - }; - }; - "compression-1.7.4" = { - name = "compression"; - packageName = "compression"; - version = "1.7.4"; - src = fetchurl { - url = "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz"; - sha512 = "jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ=="; - }; - }; - "concat-map-0.0.1" = { - name = "concat-map"; - packageName = "concat-map"; - version = "0.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"; - sha512 = "/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="; - }; - }; - "concat-stream-1.6.2" = { - name = "concat-stream"; - packageName = "concat-stream"; - version = "1.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz"; - sha512 = "27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw=="; - }; - }; - "concat-stream-2.0.0" = { - name = "concat-stream"; - packageName = "concat-stream"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/concat-stream/-/concat-stream-2.0.0.tgz"; - sha512 = "MWufYdFw53ccGjCA+Ol7XJYpAlW6/prSMzuPOTRnJGcGzuhLn4Scrz7qf6o8bROZ514ltazcIFJZevcfbo0x7A=="; - }; - }; - "connect-history-api-fallback-1.6.0" = { - name = "connect-history-api-fallback"; - packageName = "connect-history-api-fallback"; - version = "1.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz"; - sha512 = "e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg=="; - }; - }; - "console-control-strings-1.1.0" = { - name = "console-control-strings"; - packageName = "console-control-strings"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz"; - sha512 = "ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ=="; - }; - }; - "constant-case-3.0.4" = { - name = "constant-case"; - packageName = "constant-case"; - version = "3.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/constant-case/-/constant-case-3.0.4.tgz"; - sha512 = "I2hSBi7Vvs7BEuJDr5dDHfzb/Ruj3FyvFyh7KLilAjNQw3Be+xgqUBA2W6scVEcL0hL1dwPRtIqEPVUCKkSsyQ=="; - }; - }; - "content-disposition-0.5.4" = { - name = "content-disposition"; - packageName = "content-disposition"; - version = "0.5.4"; - src = fetchurl { - url = "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz"; - sha512 = "FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ=="; - }; - }; - "content-type-1.0.5" = { - name = "content-type"; - packageName = "content-type"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz"; - sha512 = "nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA=="; - }; - }; - "convict-6.2.4" = { - name = "convict"; - packageName = "convict"; - version = "6.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/convict/-/convict-6.2.4.tgz"; - sha512 = "qN60BAwdMVdofckX7AlohVJ2x9UvjTNoKVXCL2LxFk1l7757EJqf1nySdMkPQer0bt8kQ5lQiyZ9/2NvrFBuwQ=="; - }; - }; - "cookie-0.4.1" = { - name = "cookie"; - packageName = "cookie"; - version = "0.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/cookie/-/cookie-0.4.1.tgz"; - sha512 = "ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA=="; - }; - }; - "cookie-0.4.2" = { - name = "cookie"; - packageName = "cookie"; - version = "0.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz"; - sha512 = "aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA=="; - }; - }; - "cookie-0.5.0" = { - name = "cookie"; - packageName = "cookie"; - version = "0.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz"; - sha512 = "YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw=="; - }; - }; - "cookie-parser-1.4.6" = { - name = "cookie-parser"; - packageName = "cookie-parser"; - version = "1.4.6"; - src = fetchurl { - url = "https://registry.npmjs.org/cookie-parser/-/cookie-parser-1.4.6.tgz"; - sha512 = "z3IzaNjdwUC2olLIB5/ITd0/setiaFMLYiZJle7xg5Fe9KWAceil7xszYfHHBtDFYLSgJduS2Ty0P1uJdPDJeA=="; - }; - }; - "cookie-signature-1.0.6" = { - name = "cookie-signature"; - packageName = "cookie-signature"; - version = "1.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz"; - sha512 = "QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ=="; - }; - }; - "core-js-3.33.0" = { - name = "core-js"; - packageName = "core-js"; - version = "3.33.0"; - src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-3.33.0.tgz"; - sha512 = "HoZr92+ZjFEKar5HS6MC776gYslNOKHt75mEBKWKnPeFDpZ6nH5OeF3S6HFT1mUAUZKrzkez05VboaX8myjSuw=="; - }; - }; - "core-util-is-1.0.3" = { - name = "core-util-is"; - packageName = "core-util-is"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz"; - sha512 = "ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ=="; - }; - }; - "create-require-1.1.1" = { - name = "create-require"; - packageName = "create-require"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz"; - sha512 = "dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ=="; - }; - }; - "cron-1.7.2" = { - name = "cron"; - packageName = "cron"; - version = "1.7.2"; - src = fetchurl { - url = "https://registry.npmjs.org/cron/-/cron-1.7.2.tgz"; - sha512 = "+SaJ2OfeRvfQqwXQ2kgr0Y5pzBR/lijf5OpnnaruwWnmI799JfWr2jN2ItOV9s3A/+TFOt6mxvKzQq5F0Jp6VQ=="; - }; - }; - "cron-parser-2.18.0" = { - name = "cron-parser"; - packageName = "cron-parser"; - version = "2.18.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cron-parser/-/cron-parser-2.18.0.tgz"; - sha512 = "s4odpheTyydAbTBQepsqd2rNWGa2iV3cyo8g7zbI2QQYGLVsfbhmwukayS1XHppe02Oy1fg7mg6xoaraVJeEcg=="; - }; - }; - "cron-parser-4.9.0" = { - name = "cron-parser"; - packageName = "cron-parser"; - version = "4.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cron-parser/-/cron-parser-4.9.0.tgz"; - sha512 = "p0SaNjrHOnQeR8/VnfGbmg9te2kfyYSQ7Sc/j/6DtPL3JQvKxmjO9TSjNFpujqV3vEYYBvNNvXSxzyksBWAx1Q=="; - }; - }; - "cross-spawn-4.0.2" = { - name = "cross-spawn"; - packageName = "cross-spawn"; - version = "4.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.2.tgz"; - sha512 = "yAXz/pA1tD8Gtg2S98Ekf/sewp3Lcp3YoFKJ4Hkp5h5yLWnKVTDU0kwjKJ8NDCYcfTLfyGkzTikst+jWypT1iA=="; - }; - }; - "cross-spawn-7.0.3" = { - name = "cross-spawn"; - packageName = "cross-spawn"; - version = "7.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz"; - sha512 = "iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w=="; - }; - }; - "crypt-0.0.2" = { - name = "crypt"; - packageName = "crypt"; - version = "0.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/crypt/-/crypt-0.0.2.tgz"; - sha512 = "mCxBlsHFYh9C+HVpiEacem8FEBnMXgU9gy4zmNC+SXAZNB/1idgp/aulFJ4FgCi7GPEVbfyng092GqL2k2rmow=="; - }; - }; - "crypto-js-4.1.1" = { - name = "crypto-js"; - packageName = "crypto-js"; - version = "4.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/crypto-js/-/crypto-js-4.1.1.tgz"; - sha512 = "o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw=="; - }; - }; - "csrf-3.1.0" = { - name = "csrf"; - packageName = "csrf"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/csrf/-/csrf-3.1.0.tgz"; - sha512 = "uTqEnCvWRk042asU6JtapDTcJeeailFy4ydOQS28bj1hcLnYRiqi8SsD2jS412AY1I/4qdOwWZun774iqywf9w=="; - }; - }; - "css-select-4.3.0" = { - name = "css-select"; - packageName = "css-select"; - version = "4.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz"; - sha512 = "wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ=="; - }; - }; - "css-select-5.1.0" = { - name = "css-select"; - packageName = "css-select"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/css-select/-/css-select-5.1.0.tgz"; - sha512 = "nwoRF1rvRRnnCqqY7updORDsuqKzqYJ28+oSMaJMMgOauh3fvwHqMS7EZpIPqK8GL+g9mKxF1vP/ZjSeNjEVHg=="; - }; - }; - "css-what-6.1.0" = { - name = "css-what"; - packageName = "css-what"; - version = "6.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz"; - sha512 = "HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw=="; - }; - }; - "csv-parse-5.5.2" = { - name = "csv-parse"; - packageName = "csv-parse"; - version = "5.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/csv-parse/-/csv-parse-5.5.2.tgz"; - sha512 = "YRVtvdtUNXZCMyK5zd5Wty1W6dNTpGKdqQd4EQ8tl/c6KW1aMBB1Kg1ppky5FONKmEqGJ/8WjLlTNLPne4ioVA=="; - }; - }; - "curlconverter-3.21.0" = { - name = "curlconverter"; - packageName = "curlconverter"; - version = "3.21.0"; - src = fetchurl { - url = "https://registry.npmjs.org/curlconverter/-/curlconverter-3.21.0.tgz"; - sha512 = "DXCnp1A/Xa69FujksUfdvWQFAnIn/C+4Wuv8t+UVdZkF/lY5bzj98GGKOGme7V/ckSHDLxE29Xp76sJ5Cpsp5A=="; - }; - }; - "currency-codes-2.1.0" = { - name = "currency-codes"; - packageName = "currency-codes"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/currency-codes/-/currency-codes-2.1.0.tgz"; - sha512 = "aASwFNP8VjZ0y0PWlSW7c9N/isYTLxK6OCbm7aVuQMk7dWO2zgup9KGiFQgeL9OGL5P/ulvCHcjQizmuEeZXtw=="; - }; - }; - "dashdash-1.14.1" = { - name = "dashdash"; - packageName = "dashdash"; - version = "1.14.1"; - src = fetchurl { - url = "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz"; - sha512 = "jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g=="; - }; - }; - "data-api-client-1.3.0" = { - name = "data-api-client"; - packageName = "data-api-client"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/data-api-client/-/data-api-client-1.3.0.tgz"; - sha512 = "+Q+lChhl5PBogsB7nO/VZFF3X0WJe8y93dyft50HIg2Bg+c765wM/sXkfBz5pjmGoRESkB/GLesQJLTMBbK4dQ=="; - }; - }; - "date-fns-2.30.0" = { - name = "date-fns"; - packageName = "date-fns"; - version = "2.30.0"; - src = fetchurl { - url = "https://registry.npmjs.org/date-fns/-/date-fns-2.30.0.tgz"; - sha512 = "fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw=="; - }; - }; - "debug-2.6.9" = { - name = "debug"; - packageName = "debug"; - version = "2.6.9"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz"; - sha512 = "bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="; - }; - }; - "debug-3.1.0" = { - name = "debug"; - packageName = "debug"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz"; - sha512 = "OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g=="; - }; - }; - "debug-3.2.7" = { - name = "debug"; - packageName = "debug"; - version = "3.2.7"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz"; - sha512 = "CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ=="; - }; - }; - "debug-4.3.2" = { - name = "debug"; - packageName = "debug"; - version = "4.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz"; - sha512 = "mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw=="; - }; - }; - "debug-4.3.4" = { - name = "debug"; - packageName = "debug"; - version = "4.3.4"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz"; - sha512 = "PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ=="; - }; - }; - "debuglog-1.0.1" = { - name = "debuglog"; - packageName = "debuglog"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/debuglog/-/debuglog-1.0.1.tgz"; - sha512 = "syBZ+rnAK3EgMsH2aYEOLUW7mZSY9Gb+0wUMCFsZvcmiz+HigA0LOcq/HoQqVuGG+EKykunc7QG2bzrponfaSw=="; - }; - }; - "decode-uri-component-0.2.2" = { - name = "decode-uri-component"; - packageName = "decode-uri-component"; - version = "0.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.2.tgz"; - sha512 = "FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ=="; - }; - }; - "decompress-response-6.0.0" = { - name = "decompress-response"; - packageName = "decompress-response"; - version = "6.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz"; - sha512 = "aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ=="; - }; - }; - "deep-equal-2.2.2" = { - name = "deep-equal"; - packageName = "deep-equal"; - version = "2.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/deep-equal/-/deep-equal-2.2.2.tgz"; - sha512 = "xjVyBf0w5vH0I42jdAZzOKVldmPgSulmiyPRywoyq7HXC9qdgo17kxJE+rdnif5Tz6+pIrpJI8dCpMNLIGkUiA=="; - }; - }; - "deep-extend-0.6.0" = { - name = "deep-extend"; - packageName = "deep-extend"; - version = "0.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz"; - sha512 = "LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA=="; - }; - }; - "deepmerge-4.3.1" = { - name = "deepmerge"; - packageName = "deepmerge"; - version = "4.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz"; - sha512 = "3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A=="; - }; - }; - "define-data-property-1.1.0" = { - name = "define-data-property"; - packageName = "define-data-property"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.0.tgz"; - sha512 = "UzGwzcjyv3OtAvolTj1GoyNYzfFR+iqbGjcnBEENZVCpM4/Ng1yhGNvS3lR/xDS74Tb2wGG9WzNSNIOS9UVb2g=="; - }; - }; - "define-lazy-prop-2.0.0" = { - name = "define-lazy-prop"; - packageName = "define-lazy-prop"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz"; - sha512 = "Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og=="; - }; - }; - "define-properties-1.2.1" = { - name = "define-properties"; - packageName = "define-properties"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz"; - sha512 = "8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg=="; - }; - }; - "delayed-stream-1.0.0" = { - name = "delayed-stream"; - packageName = "delayed-stream"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"; - sha512 = "ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ=="; - }; - }; - "delegates-1.0.0" = { - name = "delegates"; - packageName = "delegates"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz"; - sha512 = "bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ=="; - }; - }; - "denque-1.5.1" = { - name = "denque"; - packageName = "denque"; - version = "1.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/denque/-/denque-1.5.1.tgz"; - sha512 = "XwE+iZ4D6ZUB7mfYRMb5wByE8L74HCn30FBN7sWnXksWc1LO1bPDl67pBR9o/kC4z/xSNAwkMYcGgqDV3BE3Hw=="; - }; - }; - "denque-2.1.0" = { - name = "denque"; - packageName = "denque"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/denque/-/denque-2.1.0.tgz"; - sha512 = "HVQE3AAb/pxF8fQAoiqpvg9i3evqug3hoiwakOyZAwJm+6vZehbkYXZ0l4JxS+I3QxM97v5aaRNhj8v5oBhekw=="; - }; - }; - "depd-2.0.0" = { - name = "depd"; - packageName = "depd"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz"; - sha512 = "g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw=="; - }; - }; - "destroy-1.2.0" = { - name = "destroy"; - packageName = "destroy"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz"; - sha512 = "2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg=="; - }; - }; - "detect-libc-2.0.2" = { - name = "detect-libc"; - packageName = "detect-libc"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.2.tgz"; - sha512 = "UX6sGumvvqSaXgdKGUsgZWqcUyIXZ/vZTrlRT/iobiKhGL0zL4d3osHj3uqllWJK+i+sixDS/3COVEOFbupFyw=="; - }; - }; - "dezalgo-1.0.4" = { - name = "dezalgo"; - packageName = "dezalgo"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/dezalgo/-/dezalgo-1.0.4.tgz"; - sha512 = "rXSP0bf+5n0Qonsb+SVVfNfIsimO4HEtmnIpPHY8Q1UCzKlQrDMfdobr8nJOOsRgWCyMRqeSBQzmWUMq7zvVig=="; - }; - }; - "diff-4.0.2" = { - name = "diff"; - packageName = "diff"; - version = "4.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz"; - sha512 = "58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A=="; - }; - }; - "dir-glob-3.0.1" = { - name = "dir-glob"; - packageName = "dir-glob"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz"; - sha512 = "WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA=="; - }; - }; - "dom-serializer-1.4.1" = { - name = "dom-serializer"; - packageName = "dom-serializer"; - version = "1.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz"; - sha512 = "VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag=="; - }; - }; - "dom-serializer-2.0.0" = { - name = "dom-serializer"; - packageName = "dom-serializer"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz"; - sha512 = "wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg=="; - }; - }; - "domelementtype-2.3.0" = { - name = "domelementtype"; - packageName = "domelementtype"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz"; - sha512 = "OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw=="; - }; - }; - "domhandler-4.3.1" = { - name = "domhandler"; - packageName = "domhandler"; - version = "4.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz"; - sha512 = "GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ=="; - }; - }; - "domhandler-5.0.3" = { - name = "domhandler"; - packageName = "domhandler"; - version = "5.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz"; - sha512 = "cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w=="; - }; - }; - "dommatrix-1.0.3" = { - name = "dommatrix"; - packageName = "dommatrix"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/dommatrix/-/dommatrix-1.0.3.tgz"; - sha512 = "l32Xp/TLgWb8ReqbVJAFIvXmY7go4nTxxlWiAFyhoQw9RKEOHBZNnyGvJWqDVSPmq3Y9HlM4npqF/T6VMOXhww=="; - }; - }; - "domutils-2.8.0" = { - name = "domutils"; - packageName = "domutils"; - version = "2.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz"; - sha512 = "w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A=="; - }; - }; - "domutils-3.1.0" = { - name = "domutils"; - packageName = "domutils"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/domutils/-/domutils-3.1.0.tgz"; - sha512 = "H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA=="; - }; - }; - "dot-case-3.0.4" = { - name = "dot-case"; - packageName = "dot-case"; - version = "3.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/dot-case/-/dot-case-3.0.4.tgz"; - sha512 = "Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w=="; - }; - }; - "dotenv-16.3.1" = { - name = "dotenv"; - packageName = "dotenv"; - version = "16.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/dotenv/-/dotenv-16.3.1.tgz"; - sha512 = "IPzF4w4/Rd94bA9imS68tZBaYyBWSCE47V1RGuMrB94iyTOIEwRmVL2x/4An+6mETpLrKJ5hQkB8W4kFAadeIQ=="; - }; - }; - "dotenv-8.6.0" = { - name = "dotenv"; - packageName = "dotenv"; - version = "8.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/dotenv/-/dotenv-8.6.0.tgz"; - sha512 = "IrPdXQsk2BbzvCBGBOTmmSH5SodmqZNt4ERAZDmW4CT+tL8VtvinqywuANaFu4bOMWki16nqf0e4oC0QIaDr/g=="; - }; - }; - "dreamopt-0.8.0" = { - name = "dreamopt"; - packageName = "dreamopt"; - version = "0.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/dreamopt/-/dreamopt-0.8.0.tgz"; - sha512 = "vyJTp8+mC+G+5dfgsY+r3ckxlz+QMX40VjPQsZc5gxVAxLmi64TBoVkP54A/pRAXMXsbu2GMMBrZPxNv23waMg=="; - }; - }; - "duplexify-3.7.1" = { - name = "duplexify"; - packageName = "duplexify"; - version = "3.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz"; - sha512 = "07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g=="; - }; - }; - "duplexify-4.1.2" = { - name = "duplexify"; - packageName = "duplexify"; - version = "4.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/duplexify/-/duplexify-4.1.2.tgz"; - sha512 = "fz3OjcNCHmRP12MJoZMPglx8m4rrFP8rovnk4vT8Fs+aonZoCwGg10dSsQsfP/E62eZcPTMSMP6686fu9Qlqtw=="; - }; - }; - "eastasianwidth-0.2.0" = { - name = "eastasianwidth"; - packageName = "eastasianwidth"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz"; - sha512 = "I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA=="; - }; - }; - "ecc-jsbn-0.1.2" = { - name = "ecc-jsbn"; - packageName = "ecc-jsbn"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz"; - sha512 = "eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw=="; - }; - }; - "ecdsa-sig-formatter-1.0.11" = { - name = "ecdsa-sig-formatter"; - packageName = "ecdsa-sig-formatter"; - version = "1.0.11"; - src = fetchurl { - url = "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz"; - sha512 = "nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ=="; - }; - }; - "ee-first-1.1.1" = { - name = "ee-first"; - packageName = "ee-first"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz"; - sha512 = "WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="; - }; - }; - "ejs-3.1.9" = { - name = "ejs"; - packageName = "ejs"; - version = "3.1.9"; - src = fetchurl { - url = "https://registry.npmjs.org/ejs/-/ejs-3.1.9.tgz"; - sha512 = "rC+QVNMJWv+MtPgkt0y+0rVEIdbtxVADApW9JXrUVlzHetgcyczP/E7DJmWJ4fJCZF2cPcBk0laWO9ZHMG3DmQ=="; - }; - }; - "electron-to-chromium-1.4.549" = { - name = "electron-to-chromium"; - packageName = "electron-to-chromium"; - version = "1.4.549"; - src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.549.tgz"; - sha512 = "gpXfJslSi4hYDkA0mTLEpYKRv9siAgSUgZ+UWyk+J5Cttpd1ThCVwdclzIwQSclz3hYn049+M2fgrP1WpvF8xg=="; - }; - }; - "emoji-regex-8.0.0" = { - name = "emoji-regex"; - packageName = "emoji-regex"; - version = "8.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz"; - sha512 = "MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="; - }; - }; - "emoji-regex-9.2.2" = { - name = "emoji-regex"; - packageName = "emoji-regex"; - version = "9.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz"; - sha512 = "L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg=="; - }; - }; - "emojis-list-3.0.0" = { - name = "emojis-list"; - packageName = "emojis-list"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz"; - sha512 = "/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q=="; - }; - }; - "enabled-2.0.0" = { - name = "enabled"; - packageName = "enabled"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/enabled/-/enabled-2.0.0.tgz"; - sha512 = "AKrN98kuwOzMIdAizXGI86UFBoo26CL21UM763y1h/GMSJ4/OHU9k2YlsmBpyScFo/wbLzWQJBMCW4+IO3/+OQ=="; - }; - }; - "encodeurl-1.0.2" = { - name = "encodeurl"; - packageName = "encodeurl"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz"; - sha512 = "TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w=="; - }; - }; - "encoding-0.1.13" = { - name = "encoding"; - packageName = "encoding"; - version = "0.1.13"; - src = fetchurl { - url = "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz"; - sha512 = "ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A=="; - }; - }; - "encoding-japanese-2.0.0" = { - name = "encoding-japanese"; - packageName = "encoding-japanese"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/encoding-japanese/-/encoding-japanese-2.0.0.tgz"; - sha512 = "++P0RhebUC8MJAwJOsT93dT+5oc5oPImp1HubZpAuCZ5kTLnhuuBhKHj2jJeO/Gj93idPBWmIuQ9QWMe5rX3pQ=="; - }; - }; - "end-of-stream-1.4.4" = { - name = "end-of-stream"; - packageName = "end-of-stream"; - version = "1.4.4"; - src = fetchurl { - url = "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz"; - sha512 = "+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q=="; - }; - }; - "enhanced-resolve-5.15.0" = { - name = "enhanced-resolve"; - packageName = "enhanced-resolve"; - version = "5.15.0"; - src = fetchurl { - url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.15.0.tgz"; - sha512 = "LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg=="; - }; - }; - "ent-2.2.0" = { - name = "ent"; - packageName = "ent"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz"; - sha512 = "GHrMyVZQWvTIdDtpiEXdHZnFQKzeO09apj8Cbl4pKWy4i0Oprcq17usfDt5aO63swf0JOeMWjWQE/LzgSRuWpA=="; - }; - }; - "entities-2.2.0" = { - name = "entities"; - packageName = "entities"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz"; - sha512 = "p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A=="; - }; - }; - "entities-4.5.0" = { - name = "entities"; - packageName = "entities"; - version = "4.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz"; - sha512 = "V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw=="; - }; - }; - "env-paths-2.2.1" = { - name = "env-paths"; - packageName = "env-paths"; - version = "2.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz"; - sha512 = "+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A=="; - }; - }; - "err-code-2.0.3" = { - name = "err-code"; - packageName = "err-code"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz"; - sha512 = "2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA=="; - }; - }; - "es-abstract-1.22.2" = { - name = "es-abstract"; - packageName = "es-abstract"; - version = "1.22.2"; - src = fetchurl { - url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.2.tgz"; - sha512 = "YoxfFcDmhjOgWPWsV13+2RNjq1F6UQnfs+8TftwNqtzlmFzEXvlUwdrNrYeaizfjQzRMxkZ6ElWMOJIFKdVqwA=="; - }; - }; - "es-aggregate-error-1.0.11" = { - name = "es-aggregate-error"; - packageName = "es-aggregate-error"; - version = "1.0.11"; - src = fetchurl { - url = "https://registry.npmjs.org/es-aggregate-error/-/es-aggregate-error-1.0.11.tgz"; - sha512 = "DCiZiNlMlbvofET/cE55My387NiLvuGToBEZDdK9U2G3svDCjL8WOgO5Il6lO83nQ8qmag/R9nArdpaFQ/m3lA=="; - }; - }; - "es-array-method-boxes-properly-1.0.0" = { - name = "es-array-method-boxes-properly"; - packageName = "es-array-method-boxes-properly"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz"; - sha512 = "wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA=="; - }; - }; - "es-get-iterator-1.1.3" = { - name = "es-get-iterator"; - packageName = "es-get-iterator"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.3.tgz"; - sha512 = "sPZmqHBe6JIiTfN5q2pEi//TwxmAFHwj/XEuYjTuse78i8KxaqMTTzxPoFKuzRpDpTJ+0NAbpfenkmH2rePtuw=="; - }; - }; - "es-module-lexer-1.3.1" = { - name = "es-module-lexer"; - packageName = "es-module-lexer"; - version = "1.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.3.1.tgz"; - sha512 = "JUFAyicQV9mXc3YRxPnDlrfBKpqt6hUYzz9/boprUJHs4e4KVr3XwOF70doO6gwXUor6EWZJAyWAfKki84t20Q=="; - }; - }; - "es-set-tostringtag-2.0.1" = { - name = "es-set-tostringtag"; - packageName = "es-set-tostringtag"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz"; - sha512 = "g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg=="; - }; - }; - "es-to-primitive-1.2.1" = { - name = "es-to-primitive"; - packageName = "es-to-primitive"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz"; - sha512 = "QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA=="; - }; - }; - "escalade-3.1.1" = { - name = "escalade"; - packageName = "escalade"; - version = "3.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz"; - sha512 = "k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw=="; - }; - }; - "escape-html-1.0.3" = { - name = "escape-html"; - packageName = "escape-html"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz"; - sha512 = "NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow=="; - }; - }; - "escape-string-regexp-1.0.5" = { - name = "escape-string-regexp"; - packageName = "escape-string-regexp"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"; - sha512 = "vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg=="; - }; - }; - "escape-string-regexp-4.0.0" = { - name = "escape-string-regexp"; - packageName = "escape-string-regexp"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz"; - sha512 = "TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="; - }; - }; - "eslint-config-riot-1.0.0" = { - name = "eslint-config-riot"; - packageName = "eslint-config-riot"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-config-riot/-/eslint-config-riot-1.0.0.tgz"; - sha512 = "NB/L/1Y30qyJcG5xZxCJKW/+bqyj+llbcCwo9DEz8bESIP0SLTOQ8T1DWCCFc+wJ61AMEstj4511PSScqMMfCw=="; - }; - }; - "eslint-scope-5.1.1" = { - name = "eslint-scope"; - packageName = "eslint-scope"; - version = "5.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz"; - sha512 = "2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw=="; - }; - }; - "esprima-4.0.1" = { - name = "esprima"; - packageName = "esprima"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz"; - sha512 = "eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="; - }; - }; - "esprima-next-5.8.4" = { - name = "esprima-next"; - packageName = "esprima-next"; - version = "5.8.4"; - src = fetchurl { - url = "https://registry.npmjs.org/esprima-next/-/esprima-next-5.8.4.tgz"; - sha512 = "8nYVZ4ioIH4Msjb/XmhnBdz5WRRBaYqevKa1cv9nGJdCehMbzZCPNEEnqfLCZVetUVrUPEcb5IYyu1GG4hFqgg=="; - }; - }; - "esrecurse-4.3.0" = { - name = "esrecurse"; - packageName = "esrecurse"; - version = "4.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz"; - sha512 = "KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag=="; - }; - }; - "estraverse-4.3.0" = { - name = "estraverse"; - packageName = "estraverse"; - version = "4.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz"; - sha512 = "39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw=="; - }; - }; - "estraverse-5.3.0" = { - name = "estraverse"; - packageName = "estraverse"; - version = "5.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz"; - sha512 = "MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA=="; - }; - }; - "etag-1.8.1" = { - name = "etag"; - packageName = "etag"; - version = "1.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz"; - sha512 = "aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg=="; - }; - }; - "event-target-shim-5.0.1" = { - name = "event-target-shim"; - packageName = "event-target-shim"; - version = "5.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz"; - sha512 = "i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ=="; - }; - }; - "eventemitter3-4.0.7" = { - name = "eventemitter3"; - packageName = "eventemitter3"; - version = "4.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz"; - sha512 = "8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw=="; - }; - }; - "events-3.3.0" = { - name = "events"; - packageName = "events"; - version = "3.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/events/-/events-3.3.0.tgz"; - sha512 = "mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q=="; - }; - }; - "events-intercept-2.0.0" = { - name = "events-intercept"; - packageName = "events-intercept"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/events-intercept/-/events-intercept-2.0.0.tgz"; - sha512 = "blk1va0zol9QOrdZt0rFXo5KMkNPVSp92Eju/Qz8THwKWKRKeE0T8Br/1aW6+Edkyq9xHYgYxn2QtOnUKPUp+Q=="; - }; - }; - "eventsource-2.0.2" = { - name = "eventsource"; - packageName = "eventsource"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/eventsource/-/eventsource-2.0.2.tgz"; - sha512 = "IzUmBGPR3+oUG9dUeXynyNmf91/3zUSJg1lCktzKw47OXuhco54U3r9B7O4XX+Rb1Itm9OZ2b0RkTs10bICOxA=="; - }; - }; - "expand-template-2.0.3" = { - name = "expand-template"; - packageName = "expand-template"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz"; - sha512 = "XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg=="; - }; - }; - "expand-tilde-2.0.2" = { - name = "expand-tilde"; - packageName = "expand-tilde"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz"; - sha512 = "A5EmesHW6rfnZ9ysHQjPdJRni0SRar0tjtG5MNtm9n5TUvsYU8oozprtRD4AqHxcZWWlVuAmQo2nWKfN9oyjTw=="; - }; - }; - "express-4.18.2" = { - name = "express"; - packageName = "express"; - version = "4.18.2"; - src = fetchurl { - url = "https://registry.npmjs.org/express/-/express-4.18.2.tgz"; - sha512 = "5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ=="; - }; - }; - "express-async-errors-3.1.1" = { - name = "express-async-errors"; - packageName = "express-async-errors"; - version = "3.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/express-async-errors/-/express-async-errors-3.1.1.tgz"; - sha512 = "h6aK1da4tpqWSbyCa3FxB/V6Ehd4EEB15zyQq9qe75OZBp0krinNKuH4rAY+S/U/2I36vdLAUFSjQJ+TFmODng=="; - }; - }; - "express-handlebars-7.1.2" = { - name = "express-handlebars"; - packageName = "express-handlebars"; - version = "7.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/express-handlebars/-/express-handlebars-7.1.2.tgz"; - sha512 = "ss9d3mBChOLTEtyfzXCsxlItUxpgS3i4cb/F70G6Q5ohQzmD12XB4x/Y9U6YboeeYBJZt7WQ5yUNu7ZSQ/EGyQ=="; - }; - }; - "express-openapi-validator-4.13.8" = { - name = "express-openapi-validator"; - packageName = "express-openapi-validator"; - version = "4.13.8"; - src = fetchurl { - url = "https://registry.npmjs.org/express-openapi-validator/-/express-openapi-validator-4.13.8.tgz"; - sha512 = "89/sdkq+BKBuIyykaMl/vR9grFc3WFUPTjFo0THHbu+5g+q8rA7fKeoMfz+h84yOQIBcztmJ5ZJdk5uhEls31A=="; - }; - }; - "express-prom-bundle-6.6.0" = { - name = "express-prom-bundle"; - packageName = "express-prom-bundle"; - version = "6.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/express-prom-bundle/-/express-prom-bundle-6.6.0.tgz"; - sha512 = "tZh2P2p5a8/yxQ5VbRav011Poa4R0mHqdFwn9Swe/obXDe5F0jY9wtRAfNYnqk4LXY7akyvR/nrvAHxQPWUjsQ=="; - }; - }; - "extend-3.0.2" = { - name = "extend"; - packageName = "extend"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz"; - sha512 = "fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="; - }; - }; - "external-editor-3.1.0" = { - name = "external-editor"; - packageName = "external-editor"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz"; - sha512 = "hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew=="; - }; - }; - "fast-deep-equal-3.1.3" = { - name = "fast-deep-equal"; - packageName = "fast-deep-equal"; - version = "3.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz"; - sha512 = "f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="; - }; - }; - "fast-glob-3.3.1" = { - name = "fast-glob"; - packageName = "fast-glob"; - version = "3.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.1.tgz"; - sha512 = "kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg=="; - }; - }; - "fast-json-stable-stringify-2.1.0" = { - name = "fast-json-stable-stringify"; - packageName = "fast-json-stable-stringify"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz"; - sha512 = "lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="; - }; - }; - "fast-text-encoding-1.0.6" = { - name = "fast-text-encoding"; - packageName = "fast-text-encoding"; - version = "1.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/fast-text-encoding/-/fast-text-encoding-1.0.6.tgz"; - sha512 = "VhXlQgj9ioXCqGstD37E/HBeqEGV/qOD/kmbVG8h5xKBYvM1L3lR1Zn4555cQ8GkYbJa8aJSipLPndE1k6zK2w=="; - }; - }; - "fast-xml-parser-4.2.5" = { - name = "fast-xml-parser"; - packageName = "fast-xml-parser"; - version = "4.2.5"; - src = fetchurl { - url = "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.2.5.tgz"; - sha512 = "B9/wizE4WngqQftFPmdaMYlXoJlJOYxGQOanC77fq9k8+Z0v5dDSVh+3glErdIROP//s/jgb7ZuxKfB8nVyo0g=="; - }; - }; - "fastq-1.15.0" = { - name = "fastq"; - packageName = "fastq"; - version = "1.15.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz"; - sha512 = "wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw=="; - }; - }; - "fecha-4.2.3" = { - name = "fecha"; - packageName = "fecha"; - version = "4.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/fecha/-/fecha-4.2.3.tgz"; - sha512 = "OP2IUU6HeYKJi3i0z4A19kHMQoLVs4Hc+DPqqxI2h/DPZHTm/vjsfC6P0b4jCMy14XizLBqvndQ+UilD7707Jw=="; - }; - }; - "fflate-0.7.4" = { - name = "fflate"; - packageName = "fflate"; - version = "0.7.4"; - src = fetchurl { - url = "https://registry.npmjs.org/fflate/-/fflate-0.7.4.tgz"; - sha512 = "5u2V/CDW15QM1XbbgS+0DfPxVB+jUKhWEKuuFuHncbk3tEEqzmoXL+2KyOFuKGqOnmdIy0/davWF1CkuwtibCw=="; - }; - }; - "figures-3.2.0" = { - name = "figures"; - packageName = "figures"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz"; - sha512 = "yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg=="; - }; - }; - "file-type-16.5.4" = { - name = "file-type"; - packageName = "file-type"; - version = "16.5.4"; - src = fetchurl { - url = "https://registry.npmjs.org/file-type/-/file-type-16.5.4.tgz"; - sha512 = "/yFHK0aGjFEgDJjEKP0pWCplsPFPhwyfwevf/pVxiN0tmE4L9LmwWxWukdJSHdoCli4VgQLehjJtwQBnqmsKcw=="; - }; - }; - "file-uri-to-path-1.0.0" = { - name = "file-uri-to-path"; - packageName = "file-uri-to-path"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz"; - sha512 = "0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw=="; - }; - }; - "filelist-1.0.4" = { - name = "filelist"; - packageName = "filelist"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz"; - sha512 = "w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q=="; - }; - }; - "fill-range-7.0.1" = { - name = "fill-range"; - packageName = "fill-range"; - version = "7.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz"; - sha512 = "qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ=="; - }; - }; - "filter-obj-1.1.0" = { - name = "filter-obj"; - packageName = "filter-obj"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/filter-obj/-/filter-obj-1.1.0.tgz"; - sha512 = "8rXg1ZnX7xzy2NGDVkBVaAy+lSlPNwad13BtgSlLuxfIslyt5Vg64U7tFcCt4WS1R0hvtnQybT/IyCkGZ3DpXQ=="; - }; - }; - "finalhandler-1.2.0" = { - name = "finalhandler"; - packageName = "finalhandler"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz"; - sha512 = "5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg=="; - }; - }; - "first-match-0.0.1" = { - name = "first-match"; - packageName = "first-match"; - version = "0.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/first-match/-/first-match-0.0.1.tgz"; - sha512 = "VvKbnaxrC0polTFDC+teKPTdl2mn6B/KUW+WB3C9RzKDeNwbzfLdnUz3FxC+tnjvus6bI0jWrWicQyVIPdS37A=="; - }; - }; - "flatted-3.2.9" = { - name = "flatted"; - packageName = "flatted"; - version = "3.2.9"; - src = fetchurl { - url = "https://registry.npmjs.org/flatted/-/flatted-3.2.9.tgz"; - sha512 = "36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ=="; - }; - }; - "fn.name-1.1.0" = { - name = "fn.name"; - packageName = "fn.name"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fn.name/-/fn.name-1.1.0.tgz"; - sha512 = "GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw=="; - }; - }; - "follow-redirects-1.15.3" = { - name = "follow-redirects"; - packageName = "follow-redirects"; - version = "1.15.3"; - src = fetchurl { - url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.3.tgz"; - sha512 = "1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q=="; - }; - }; - "for-each-0.3.3" = { - name = "for-each"; - packageName = "for-each"; - version = "0.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz"; - sha512 = "jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw=="; - }; - }; - "foreground-child-3.1.1" = { - name = "foreground-child"; - packageName = "foreground-child"; - version = "3.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz"; - sha512 = "TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg=="; - }; - }; - "form-data-4.0.0" = { - name = "form-data"; - packageName = "form-data"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz"; - sha512 = "ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww=="; - }; - }; - "formidable-3.5.1" = { - name = "formidable"; - packageName = "formidable"; - version = "3.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/formidable/-/formidable-3.5.1.tgz"; - sha512 = "WJWKelbRHN41m5dumb0/k8TeAx7Id/y3a+Z7QfhxP/htI9Js5zYaEDtG8uMgG0vM0lOlqnmjE99/kfpOYi/0Og=="; - }; - }; - "forwarded-0.2.0" = { - name = "forwarded"; - packageName = "forwarded"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz"; - sha512 = "buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow=="; - }; - }; - "fresh-0.5.2" = { - name = "fresh"; - packageName = "fresh"; - version = "0.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz"; - sha512 = "zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q=="; - }; - }; - "fs-constants-1.0.0" = { - name = "fs-constants"; - packageName = "fs-constants"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz"; - sha512 = "y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow=="; - }; - }; - "fs-extra-8.1.0" = { - name = "fs-extra"; - packageName = "fs-extra"; - version = "8.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz"; - sha512 = "yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g=="; - }; - }; - "fs-extra-9.1.0" = { - name = "fs-extra"; - packageName = "fs-extra"; - version = "9.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz"; - sha512 = "hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ=="; - }; - }; - "fs-minipass-2.1.0" = { - name = "fs-minipass"; - packageName = "fs-minipass"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz"; - sha512 = "V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg=="; - }; - }; - "fs.realpath-1.0.0" = { - name = "fs.realpath"; - packageName = "fs.realpath"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"; - sha512 = "OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="; - }; - }; - "function-bind-1.1.1" = { - name = "function-bind"; - packageName = "function-bind"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz"; - sha512 = "yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="; - }; - }; - "function.prototype.name-1.1.6" = { - name = "function.prototype.name"; - packageName = "function.prototype.name"; - version = "1.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.6.tgz"; - sha512 = "Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg=="; - }; - }; - "functions-have-names-1.2.3" = { - name = "functions-have-names"; - packageName = "functions-have-names"; - version = "1.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz"; - sha512 = "xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ=="; - }; - }; - "gauge-3.0.2" = { - name = "gauge"; - packageName = "gauge"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/gauge/-/gauge-3.0.2.tgz"; - sha512 = "+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q=="; - }; - }; - "gauge-4.0.4" = { - name = "gauge"; - packageName = "gauge"; - version = "4.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/gauge/-/gauge-4.0.4.tgz"; - sha512 = "f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg=="; - }; - }; - "gaxios-4.3.3" = { - name = "gaxios"; - packageName = "gaxios"; - version = "4.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/gaxios/-/gaxios-4.3.3.tgz"; - sha512 = "gSaYYIO1Y3wUtdfHmjDUZ8LWaxJQpiavzbF5Kq53akSzvmVg0RfyOcFDbO1KJ/KCGRFz2qG+lS81F0nkr7cRJA=="; - }; - }; - "gaxios-5.1.3" = { - name = "gaxios"; - packageName = "gaxios"; - version = "5.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/gaxios/-/gaxios-5.1.3.tgz"; - sha512 = "95hVgBRgEIRQQQHIbnxBXeHbW4TqFk4ZDJW7wmVtvYar72FdhRIo1UGOLS2eRAKCPEdPBWu+M7+A33D9CdX9rA=="; - }; - }; - "gcp-metadata-4.3.1" = { - name = "gcp-metadata"; - packageName = "gcp-metadata"; - version = "4.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-4.3.1.tgz"; - sha512 = "x850LS5N7V1F3UcV7PoupzGsyD6iVwTVvsh3tbXfkctZnBnjW5yu5z1/3k3SehF7TyoTIe78rJs02GMMy+LF+A=="; - }; - }; - "gcp-metadata-5.3.0" = { - name = "gcp-metadata"; - packageName = "gcp-metadata"; - version = "5.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-5.3.0.tgz"; - sha512 = "FNTkdNEnBdlqF2oatizolQqNANMrcqJt6AAYt99B3y1aLLC8Hc5IOBb+ZnnzllodEEf6xMBp6wRcBbc16fa65w=="; - }; - }; - "generate-function-2.3.1" = { - name = "generate-function"; - packageName = "generate-function"; - version = "2.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/generate-function/-/generate-function-2.3.1.tgz"; - sha512 = "eeB5GfMNeevm/GRYq20ShmsaGcmI81kIX2K9XQx5miC8KdHaC6Jm0qQ8ZNeGOi7wYB8OsdxKs+Y2oVuTFuVwKQ=="; - }; - }; - "generic-pool-3.9.0" = { - name = "generic-pool"; - packageName = "generic-pool"; - version = "3.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/generic-pool/-/generic-pool-3.9.0.tgz"; - sha512 = "hymDOu5B53XvN4QT9dBmZxPX4CWhBPPLguTZ9MMFeFa/Kg0xWVfylOVNlJji/E7yTZWFd/q9GO5TxDLq156D7g=="; - }; - }; - "get-caller-file-2.0.5" = { - name = "get-caller-file"; - packageName = "get-caller-file"; - version = "2.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz"; - sha512 = "DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="; - }; - }; - "get-intrinsic-1.2.1" = { - name = "get-intrinsic"; - packageName = "get-intrinsic"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz"; - sha512 = "2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw=="; - }; - }; - "get-package-type-0.1.0" = { - name = "get-package-type"; - packageName = "get-package-type"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz"; - sha512 = "pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q=="; - }; - }; - "get-port-5.1.1" = { - name = "get-port"; - packageName = "get-port"; - version = "5.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/get-port/-/get-port-5.1.1.tgz"; - sha512 = "g/Q1aTSDOxFpchXC4i8ZWvxA1lnPqx/JHqcpIw0/LX9T8x/GBbi6YnlN5nhaKIFkT8oFsscUKgDJYxfwfS6QsQ=="; - }; - }; - "get-symbol-description-1.0.0" = { - name = "get-symbol-description"; - packageName = "get-symbol-description"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz"; - sha512 = "2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw=="; - }; - }; - "get-system-fonts-2.0.2" = { - name = "get-system-fonts"; - packageName = "get-system-fonts"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/get-system-fonts/-/get-system-fonts-2.0.2.tgz"; - sha512 = "zzlgaYnHMIEgHRrfC7x0Qp0Ylhw/sHpM6MHXeVBTYIsvGf5GpbnClB+Q6rAPdn+0gd2oZZIo6Tj3EaWrt4VhDQ=="; - }; - }; - "getpass-0.1.7" = { - name = "getpass"; - packageName = "getpass"; - version = "0.1.7"; - src = fetchurl { - url = "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz"; - sha512 = "0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng=="; - }; - }; - "github-from-package-0.0.0" = { - name = "github-from-package"; - packageName = "github-from-package"; - version = "0.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz"; - sha512 = "SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw=="; - }; - }; - "glob-10.3.10" = { - name = "glob"; - packageName = "glob"; - version = "10.3.10"; - src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-10.3.10.tgz"; - sha512 = "fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g=="; - }; - }; - "glob-7.2.3" = { - name = "glob"; - packageName = "glob"; - version = "7.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz"; - sha512 = "nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q=="; - }; - }; - "glob-8.1.0" = { - name = "glob"; - packageName = "glob"; - version = "8.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz"; - sha512 = "r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ=="; - }; - }; - "glob-parent-5.1.2" = { - name = "glob-parent"; - packageName = "glob-parent"; - version = "5.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz"; - sha512 = "AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow=="; - }; - }; - "glob-to-regexp-0.4.1" = { - name = "glob-to-regexp"; - packageName = "glob-to-regexp"; - version = "0.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz"; - sha512 = "lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw=="; - }; - }; - "globalthis-1.0.3" = { - name = "globalthis"; - packageName = "globalthis"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/globalthis/-/globalthis-1.0.3.tgz"; - sha512 = "sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA=="; - }; - }; - "globby-11.1.0" = { - name = "globby"; - packageName = "globby"; - version = "11.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz"; - sha512 = "jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g=="; - }; - }; - "gm-1.25.0" = { - name = "gm"; - packageName = "gm"; - version = "1.25.0"; - src = fetchurl { - url = "https://registry.npmjs.org/gm/-/gm-1.25.0.tgz"; - sha512 = "4kKdWXTtgQ4biIo7hZA396HT062nDVVHPjQcurNZ3o/voYN+o5FUC5kOwuORbpExp3XbTJ3SU7iRipiIhQtovw=="; - }; - }; - "google-auth-library-7.14.1" = { - name = "google-auth-library"; - packageName = "google-auth-library"; - version = "7.14.1"; - src = fetchurl { - url = "https://registry.npmjs.org/google-auth-library/-/google-auth-library-7.14.1.tgz"; - sha512 = "5Rk7iLNDFhFeBYc3s8l1CqzbEBcdhwR193RlD4vSNFajIcINKI8W8P0JLmBpwymHqqWbX34pJDQu39cSy/6RsA=="; - }; - }; - "google-auth-library-8.9.0" = { - name = "google-auth-library"; - packageName = "google-auth-library"; - version = "8.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/google-auth-library/-/google-auth-library-8.9.0.tgz"; - sha512 = "f7aQCJODJFmYWN6PeNKzgvy9LI2tYmXnzpNDHEjG5sDNPgGb2FXQyTBnXeSH+PAtpKESFD+LmHw3Ox3mN7e1Fg=="; - }; - }; - "google-gax-2.30.5" = { - name = "google-gax"; - packageName = "google-gax"; - version = "2.30.5"; - src = fetchurl { - url = "https://registry.npmjs.org/google-gax/-/google-gax-2.30.5.tgz"; - sha512 = "Jey13YrAN2hfpozHzbtrwEfEHdStJh1GwaQ2+Akh1k0Tv/EuNVSuBtHZoKSBm5wBMvNsxTsEIZ/152NrYyZgxQ=="; - }; - }; - "google-p12-pem-3.1.4" = { - name = "google-p12-pem"; - packageName = "google-p12-pem"; - version = "3.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-3.1.4.tgz"; - sha512 = "HHuHmkLgwjdmVRngf5+gSmpkyaRI6QmOg77J8tkNBHhNEI62sGHyw4/+UkgyZEI7h84NbWprXDJ+sa3xOYFvTg=="; - }; - }; - "google-p12-pem-4.0.1" = { - name = "google-p12-pem"; - packageName = "google-p12-pem"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-4.0.1.tgz"; - sha512 = "WPkN4yGtz05WZ5EhtlxNDWPhC4JIic6G8ePitwUWy4l+XPVYec+a0j0Ts47PDtW59y3RwAhUd9/h9ZZ63px6RQ=="; - }; - }; - "google-timezones-json-1.2.0" = { - name = "google-timezones-json"; - packageName = "google-timezones-json"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/google-timezones-json/-/google-timezones-json-1.2.0.tgz"; - sha512 = "NqhNA3tS6kiQMpmV6LyrkYPckxDpydrG09AcN5lk/grDNcihl73Q+SBUqpWOCdZ8BxFRbM7V62hpzidiYeYCEQ=="; - }; - }; - "gopd-1.0.1" = { - name = "gopd"; - packageName = "gopd"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz"; - sha512 = "d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA=="; - }; - }; - "graceful-fs-4.2.11" = { - name = "graceful-fs"; - packageName = "graceful-fs"; - version = "4.2.11"; - src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz"; - sha512 = "RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ=="; - }; - }; - "grpc-gcp-0.3.3" = { - name = "grpc-gcp"; - packageName = "grpc-gcp"; - version = "0.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/grpc-gcp/-/grpc-gcp-0.3.3.tgz"; - sha512 = "GuIoDnxuSDZoB5DEuuNh8SNB2vk+ZGPoY0+tXQ53TcLTyeY3X0xmkF2v6f9+HAS70TzJ6biyug8Eq9t4HIqpbQ=="; - }; - }; - "gtoken-5.3.2" = { - name = "gtoken"; - packageName = "gtoken"; - version = "5.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/gtoken/-/gtoken-5.3.2.tgz"; - sha512 = "gkvEKREW7dXWF8NV8pVrKfW7WqReAmjjkMBh6lNCCGOM4ucS0r0YyXXl0r/9Yj8wcW/32ISkfc8h5mPTDbtifQ=="; - }; - }; - "gtoken-6.1.2" = { - name = "gtoken"; - packageName = "gtoken"; - version = "6.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/gtoken/-/gtoken-6.1.2.tgz"; - sha512 = "4ccGpzz7YAr7lxrT2neugmXQ3hP9ho2gcaityLVkiUecAiwiy60Ii8gRbZeOsXV19fYaRjgBSshs8kXw+NKCPQ=="; - }; - }; - "handlebars-4.7.7" = { - name = "handlebars"; - packageName = "handlebars"; - version = "4.7.7"; - src = fetchurl { - url = "https://registry.npmjs.org/handlebars/-/handlebars-4.7.7.tgz"; - sha512 = "aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA=="; - }; - }; - "handlebars-4.7.8" = { - name = "handlebars"; - packageName = "handlebars"; - version = "4.7.8"; - src = fetchurl { - url = "https://registry.npmjs.org/handlebars/-/handlebars-4.7.8.tgz"; - sha512 = "vafaFqs8MZkRrSX7sFVUdo3ap/eNiLnb4IakshzvP56X5Nr1iGKAIqdX6tMlm6HcNRIkr6AxO5jFEoJzzpT8aQ=="; - }; - }; - "has-1.0.4" = { - name = "has"; - packageName = "has"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/has/-/has-1.0.4.tgz"; - sha512 = "qdSAmqLF6209RFj4VVItywPMbm3vWylknmB3nvNiUIs72xAimcM8nVYxYr7ncvZq5qzk9MKIZR8ijqD/1QuYjQ=="; - }; - }; - "has-bigints-1.0.2" = { - name = "has-bigints"; - packageName = "has-bigints"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz"; - sha512 = "tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ=="; - }; - }; - "has-flag-4.0.0" = { - name = "has-flag"; - packageName = "has-flag"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz"; - sha512 = "EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="; - }; - }; - "has-property-descriptors-1.0.0" = { - name = "has-property-descriptors"; - packageName = "has-property-descriptors"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz"; - sha512 = "62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ=="; - }; - }; - "has-proto-1.0.1" = { - name = "has-proto"; - packageName = "has-proto"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz"; - sha512 = "7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg=="; - }; - }; - "has-symbols-1.0.3" = { - name = "has-symbols"; - packageName = "has-symbols"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz"; - sha512 = "l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="; - }; - }; - "has-tostringtag-1.0.0" = { - name = "has-tostringtag"; - packageName = "has-tostringtag"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz"; - sha512 = "kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ=="; - }; - }; - "has-unicode-2.0.1" = { - name = "has-unicode"; - packageName = "has-unicode"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz"; - sha512 = "8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ=="; - }; - }; - "hdb-pool-0.1.6" = { - name = "hdb-pool"; - packageName = "hdb-pool"; - version = "0.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/hdb-pool/-/hdb-pool-0.1.6.tgz"; - sha512 = "8VZOLn1EHamm1NmTFQj2iqjVcfonYIsD7F5DU2bz2N+gF+knp6/MbAVeRXkJtya717IBkPeA5iv0/1iPuYo4ZA=="; - }; - }; - "he-1.2.0" = { - name = "he"; - packageName = "he"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/he/-/he-1.2.0.tgz"; - sha512 = "F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw=="; - }; - }; - "header-case-2.0.4" = { - name = "header-case"; - packageName = "header-case"; - version = "2.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/header-case/-/header-case-2.0.4.tgz"; - sha512 = "H/vuk5TEEVZwrR0lp2zed9OCo1uAILMlx0JEMgC26rzyJJ3N1v6XkwHHXJQdR2doSjcGPM6OKPYoJgf0plJ11Q=="; - }; - }; - "heap-0.2.7" = { - name = "heap"; - packageName = "heap"; - version = "0.2.7"; - src = fetchurl { - url = "https://registry.npmjs.org/heap/-/heap-0.2.7.tgz"; - sha512 = "2bsegYkkHO+h/9MGbn6KWcE45cHZgPANo5LXF7EvWdT0yT2EguSVO1nDgU5c8+ZOPwp2vMNa7YFsJhVcDR9Sdg=="; - }; - }; - "help-me-3.0.0" = { - name = "help-me"; - packageName = "help-me"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/help-me/-/help-me-3.0.0.tgz"; - sha512 = "hx73jClhyk910sidBB7ERlnhMlFsJJIBqSVMFDwPN8o2v9nmp5KgLq1Xz1Bf1fCMMZ6mPrX159iG0VLy/fPMtQ=="; - }; - }; - "help-me-4.2.0" = { - name = "help-me"; - packageName = "help-me"; - version = "4.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/help-me/-/help-me-4.2.0.tgz"; - sha512 = "TAOnTB8Tz5Dw8penUuzHVrKNKlCIbwwbHnXraNJxPwf8LRtE2HlM84RYuezMFcwOJmoYOCWVDyJ8TQGxn9PgxA=="; - }; - }; - "hexoid-1.0.0" = { - name = "hexoid"; - packageName = "hexoid"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/hexoid/-/hexoid-1.0.0.tgz"; - sha512 = "QFLV0taWQOZtvIRIAdBChesmogZrtuXvVWsFHZTk2SU+anspqZ2vMnoLg7IE1+Uk16N19APic1BuF8bC8c2m5g=="; - }; - }; - "highlight.js-10.7.3" = { - name = "highlight.js"; - packageName = "highlight.js"; - version = "10.7.3"; - src = fetchurl { - url = "https://registry.npmjs.org/highlight.js/-/highlight.js-10.7.3.tgz"; - sha512 = "tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A=="; - }; - }; - "homedir-polyfill-1.0.3" = { - name = "homedir-polyfill"; - packageName = "homedir-polyfill"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz"; - sha512 = "eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA=="; - }; - }; - "html-to-text-9.0.5" = { - name = "html-to-text"; - packageName = "html-to-text"; - version = "9.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/html-to-text/-/html-to-text-9.0.5.tgz"; - sha512 = "qY60FjREgVZL03vJU6IfMV4GDjGBIoOyvuFdpBDIX9yTlDw0TjxVBQp+P8NvpdIXNJvfWBTNul7fsAQJq2FNpg=="; - }; - }; - "htmlparser2-6.1.0" = { - name = "htmlparser2"; - packageName = "htmlparser2"; - version = "6.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz"; - sha512 = "gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A=="; - }; - }; - "htmlparser2-8.0.2" = { - name = "htmlparser2"; - packageName = "htmlparser2"; - version = "8.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-8.0.2.tgz"; - sha512 = "GYdjWKDkbRLkZ5geuHs5NY1puJ+PXwP7+fHPRz06Eirsb9ugf6d8kkXav6ADhcODhFFPMIXyxkxSuMf3D6NCFA=="; - }; - }; - "http-cache-semantics-4.1.1" = { - name = "http-cache-semantics"; - packageName = "http-cache-semantics"; - version = "4.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz"; - sha512 = "er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ=="; - }; - }; - "http-errors-2.0.0" = { - name = "http-errors"; - packageName = "http-errors"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz"; - sha512 = "FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ=="; - }; - }; - "http-proxy-agent-4.0.1" = { - name = "http-proxy-agent"; - packageName = "http-proxy-agent"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz"; - sha512 = "k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg=="; - }; - }; - "http-proxy-agent-5.0.0" = { - name = "http-proxy-agent"; - packageName = "http-proxy-agent"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz"; - sha512 = "n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w=="; - }; - }; - "https-proxy-agent-5.0.1" = { - name = "https-proxy-agent"; - packageName = "https-proxy-agent"; - version = "5.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz"; - sha512 = "dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA=="; - }; - }; - "humanize-ms-1.2.1" = { - name = "humanize-ms"; - packageName = "humanize-ms"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/humanize-ms/-/humanize-ms-1.2.1.tgz"; - sha512 = "Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ=="; - }; - }; - "hyperlinker-1.0.0" = { - name = "hyperlinker"; - packageName = "hyperlinker"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/hyperlinker/-/hyperlinker-1.0.0.tgz"; - sha512 = "Ty8UblRWFEcfSuIaajM34LdPXIhbs1ajEX/BBPv24J+enSVaEVY63xQ6lTO9VRYS5LAoghIG0IDJ+p+IPzKUQQ=="; - }; - }; - "iconv-lite-0.4.24" = { - name = "iconv-lite"; - packageName = "iconv-lite"; - version = "0.4.24"; - src = fetchurl { - url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz"; - sha512 = "v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA=="; - }; - }; - "iconv-lite-0.4.5" = { - name = "iconv-lite"; - packageName = "iconv-lite"; - version = "0.4.5"; - src = fetchurl { - url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.5.tgz"; - sha512 = "LQ4GtDkFagYaac8u4rE73zWu7h0OUUmR0qVBOgzLyFSoJhoDG2xV9PZJWWyVVcYha/9/RZzQHUinFMbNKiOoAA=="; - }; - }; - "iconv-lite-0.6.3" = { - name = "iconv-lite"; - packageName = "iconv-lite"; - version = "0.6.3"; - src = fetchurl { - url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz"; - sha512 = "4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw=="; - }; - }; - "ics-2.44.0" = { - name = "ics"; - packageName = "ics"; - version = "2.44.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ics/-/ics-2.44.0.tgz"; - sha512 = "JeiPjNeWkd7Qri/wfHqjZCtglVwRJRqy1MEFKn9QzatzxUyCOsx4YARPlLkU8UnPxpg4VtEjR+VRUG+Cvj6bDg=="; - }; - }; - "ieee754-1.2.1" = { - name = "ieee754"; - packageName = "ieee754"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz"; - sha512 = "dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="; - }; - }; - "ignore-5.2.4" = { - name = "ignore"; - packageName = "ignore"; - version = "5.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz"; - sha512 = "MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ=="; - }; - }; - "imap-0.8.19" = { - name = "imap"; - packageName = "imap"; - version = "0.8.19"; - src = fetchurl { - url = "https://registry.npmjs.org/imap/-/imap-0.8.19.tgz"; - sha512 = "z5DxEA1uRnZG73UcPA4ES5NSCGnPuuouUx43OPX7KZx1yzq3N8/vx2mtXEShT5inxB3pRgnfG1hijfu7XN2YMw=="; - }; - }; - "imap-simple-4.3.0" = { - name = "imap-simple"; - packageName = "imap-simple"; - version = "4.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/imap-simple/-/imap-simple-4.3.0.tgz"; - sha512 = "SW3LtfEJFjlJKS/h2CmpX2IKpya2RXobR3ENJJW4iMQ3QYPxWxf5oeaz1K3P4eGUwfGEndkqt7uVDKnEyG9zeQ=="; - }; - }; - "immediate-3.0.6" = { - name = "immediate"; - packageName = "immediate"; - version = "3.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz"; - sha512 = "XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ=="; - }; - }; - "imurmurhash-0.1.4" = { - name = "imurmurhash"; - packageName = "imurmurhash"; - version = "0.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz"; - sha512 = "JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA=="; - }; - }; - "indent-string-4.0.0" = { - name = "indent-string"; - packageName = "indent-string"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz"; - sha512 = "EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg=="; - }; - }; - "infer-owner-1.0.4" = { - name = "infer-owner"; - packageName = "infer-owner"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz"; - sha512 = "IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A=="; - }; - }; - "infisical-node-1.5.0" = { - name = "infisical-node"; - packageName = "infisical-node"; - version = "1.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/infisical-node/-/infisical-node-1.5.0.tgz"; - sha512 = "mMdhhu50J7pI4Y89M2HMbNWRyRY6ian3oBIXW+pAWz1z8XWn5yT0ge6/YNXwTPKLnBuR1py+GwiNQUaqxkOXZw=="; - }; - }; - "inflight-1.0.6" = { - name = "inflight"; - packageName = "inflight"; - version = "1.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz"; - sha512 = "k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA=="; - }; - }; - "inherits-2.0.4" = { - name = "inherits"; - packageName = "inherits"; - version = "2.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz"; - sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="; - }; - }; - "ini-1.3.8" = { - name = "ini"; - packageName = "ini"; - version = "1.3.8"; - src = fetchurl { - url = "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz"; - sha512 = "JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="; - }; - }; - "inquirer-7.3.3" = { - name = "inquirer"; - packageName = "inquirer"; - version = "7.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/inquirer/-/inquirer-7.3.3.tgz"; - sha512 = "JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA=="; - }; - }; - "internal-slot-1.0.5" = { - name = "internal-slot"; - packageName = "internal-slot"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.5.tgz"; - sha512 = "Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ=="; - }; - }; - "interpret-1.4.0" = { - name = "interpret"; - packageName = "interpret"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz"; - sha512 = "agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA=="; - }; - }; - "ioredis-4.28.5" = { - name = "ioredis"; - packageName = "ioredis"; - version = "4.28.5"; - src = fetchurl { - url = "https://registry.npmjs.org/ioredis/-/ioredis-4.28.5.tgz"; - sha512 = "3GYo0GJtLqgNXj4YhrisLaNNvWSNwSS2wS4OELGfGxH8I69+XfNdnmV1AyN+ZqMh0i7eX+SWjrwFKDBDgfBC1A=="; - }; - }; - "ioredis-5.3.2" = { - name = "ioredis"; - packageName = "ioredis"; - version = "5.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/ioredis/-/ioredis-5.3.2.tgz"; - sha512 = "1DKMMzlIHM02eBBVOFQ1+AolGjs6+xEcM4PDL7NqOS6szq7H9jSaEkIUH6/a5Hl241LzW6JLSiAbNvTQjUupUA=="; - }; - }; - "ip-2.0.0" = { - name = "ip"; - packageName = "ip"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ip/-/ip-2.0.0.tgz"; - sha512 = "WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ=="; - }; - }; - "ipaddr.js-1.9.1" = { - name = "ipaddr.js"; - packageName = "ipaddr.js"; - version = "1.9.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz"; - sha512 = "0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g=="; - }; - }; - "is-3.3.0" = { - name = "is"; - packageName = "is"; - version = "3.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is/-/is-3.3.0.tgz"; - sha512 = "nW24QBoPcFGGHJGUwnfpI7Yc5CdqWNdsyHQszVE/z2pKHXzh7FZ5GWhJqSyaQ9wMkQnsTx+kAI8bHlCX4tKdbg=="; - }; - }; - "is-arguments-1.1.1" = { - name = "is-arguments"; - packageName = "is-arguments"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz"; - sha512 = "8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA=="; - }; - }; - "is-array-buffer-3.0.2" = { - name = "is-array-buffer"; - packageName = "is-array-buffer"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.2.tgz"; - sha512 = "y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w=="; - }; - }; - "is-arrayish-0.3.2" = { - name = "is-arrayish"; - packageName = "is-arrayish"; - version = "0.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz"; - sha512 = "eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ=="; - }; - }; - "is-bigint-1.0.4" = { - name = "is-bigint"; - packageName = "is-bigint"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz"; - sha512 = "zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg=="; - }; - }; - "is-binary-path-2.1.0" = { - name = "is-binary-path"; - packageName = "is-binary-path"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz"; - sha512 = "ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw=="; - }; - }; - "is-boolean-object-1.1.2" = { - name = "is-boolean-object"; - packageName = "is-boolean-object"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz"; - sha512 = "gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA=="; - }; - }; - "is-buffer-1.1.6" = { - name = "is-buffer"; - packageName = "is-buffer"; - version = "1.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz"; - sha512 = "NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="; - }; - }; - "is-callable-1.2.7" = { - name = "is-callable"; - packageName = "is-callable"; - version = "1.2.7"; - src = fetchurl { - url = "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz"; - sha512 = "1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA=="; - }; - }; - "is-core-module-2.13.0" = { - name = "is-core-module"; - packageName = "is-core-module"; - version = "2.13.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.0.tgz"; - sha512 = "Z7dk6Qo8pOCp3l4tsX2C5ZVas4V+UxwQodwZhLopL91TX8UyyHEXafPcyoeeWuLrwzHcr3igO78wNLwHJHsMCQ=="; - }; - }; - "is-date-object-1.0.5" = { - name = "is-date-object"; - packageName = "is-date-object"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz"; - sha512 = "9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ=="; - }; - }; - "is-docker-2.2.1" = { - name = "is-docker"; - packageName = "is-docker"; - version = "2.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz"; - sha512 = "F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ=="; - }; - }; - "is-extglob-2.1.1" = { - name = "is-extglob"; - packageName = "is-extglob"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz"; - sha512 = "SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ=="; - }; - }; - "is-fullwidth-code-point-3.0.0" = { - name = "is-fullwidth-code-point"; - packageName = "is-fullwidth-code-point"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz"; - sha512 = "zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="; - }; - }; - "is-generator-function-1.0.10" = { - name = "is-generator-function"; - packageName = "is-generator-function"; - version = "1.0.10"; - src = fetchurl { - url = "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.10.tgz"; - sha512 = "jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A=="; - }; - }; - "is-glob-4.0.3" = { - name = "is-glob"; - packageName = "is-glob"; - version = "4.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz"; - sha512 = "xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg=="; - }; - }; - "is-lambda-1.0.1" = { - name = "is-lambda"; - packageName = "is-lambda"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-lambda/-/is-lambda-1.0.1.tgz"; - sha512 = "z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ=="; - }; - }; - "is-map-2.0.2" = { - name = "is-map"; - packageName = "is-map"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-map/-/is-map-2.0.2.tgz"; - sha512 = "cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg=="; - }; - }; - "is-nan-1.3.2" = { - name = "is-nan"; - packageName = "is-nan"; - version = "1.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-nan/-/is-nan-1.3.2.tgz"; - sha512 = "E+zBKpQ2t6MEo1VsonYmluk9NxGrbzpeeLC2xIViuO2EjU2xsXsBPwTr3Ykv9l08UYEVEdWeRZNouaZqF6RN0w=="; - }; - }; - "is-negative-zero-2.0.2" = { - name = "is-negative-zero"; - packageName = "is-negative-zero"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz"; - sha512 = "dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA=="; - }; - }; - "is-number-7.0.0" = { - name = "is-number"; - packageName = "is-number"; - version = "7.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz"; - sha512 = "41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="; - }; - }; - "is-number-object-1.0.7" = { - name = "is-number-object"; - packageName = "is-number-object"; - version = "1.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz"; - sha512 = "k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ=="; - }; - }; - "is-promise-1.0.1" = { - name = "is-promise"; - packageName = "is-promise"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-promise/-/is-promise-1.0.1.tgz"; - sha512 = "mjWH5XxnhMA8cFnDchr6qRP9S/kLntKuEfIYku+PaN1CnS8v+OG9O/BKpRCVRJvpIkgAZm0Pf5Is3iSSOILlcg=="; - }; - }; - "is-property-1.0.2" = { - name = "is-property"; - packageName = "is-property"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz"; - sha512 = "Ks/IoX00TtClbGQr4TWXemAnktAQvYB7HzcCxDGqEZU6oCmb2INHuOoKxbtR+HFkmYWBKv/dOZtGRiAjDhj92g=="; - }; - }; - "is-regex-1.1.4" = { - name = "is-regex"; - packageName = "is-regex"; - version = "1.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz"; - sha512 = "kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg=="; - }; - }; - "is-retry-allowed-2.2.0" = { - name = "is-retry-allowed"; - packageName = "is-retry-allowed"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-2.2.0.tgz"; - sha512 = "XVm7LOeLpTW4jV19QSH38vkswxoLud8sQ57YwJVTPWdiaI9I8keEhGFpBlslyVsgdQy4Opg8QOLb8YRgsyZiQg=="; - }; - }; - "is-set-2.0.2" = { - name = "is-set"; - packageName = "is-set"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-set/-/is-set-2.0.2.tgz"; - sha512 = "+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g=="; - }; - }; - "is-shared-array-buffer-1.0.2" = { - name = "is-shared-array-buffer"; - packageName = "is-shared-array-buffer"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz"; - sha512 = "sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA=="; - }; - }; - "is-stream-2.0.1" = { - name = "is-stream"; - packageName = "is-stream"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz"; - sha512 = "hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg=="; - }; - }; - "is-stream-ended-0.1.4" = { - name = "is-stream-ended"; - packageName = "is-stream-ended"; - version = "0.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/is-stream-ended/-/is-stream-ended-0.1.4.tgz"; - sha512 = "xj0XPvmr7bQFTvirqnFr50o0hQIh6ZItDqloxt5aJrR4NQsYeSsyFQERYGCAzfindAcnKjINnwEEgLx4IqVzQw=="; - }; - }; - "is-string-1.0.7" = { - name = "is-string"; - packageName = "is-string"; - version = "1.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz"; - sha512 = "tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg=="; - }; - }; - "is-symbol-1.0.4" = { - name = "is-symbol"; - packageName = "is-symbol"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz"; - sha512 = "C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg=="; - }; - }; - "is-typed-array-1.1.12" = { - name = "is-typed-array"; - packageName = "is-typed-array"; - version = "1.1.12"; - src = fetchurl { - url = "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.12.tgz"; - sha512 = "Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg=="; - }; - }; - "is-weakmap-2.0.1" = { - name = "is-weakmap"; - packageName = "is-weakmap"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.1.tgz"; - sha512 = "NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA=="; - }; - }; - "is-weakref-1.0.2" = { - name = "is-weakref"; - packageName = "is-weakref"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz"; - sha512 = "qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ=="; - }; - }; - "is-weakset-2.0.2" = { - name = "is-weakset"; - packageName = "is-weakset"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.2.tgz"; - sha512 = "t2yVvttHkQktwnNNmBQ98AhENLdPUTDTE21uPqAQ0ARwQfGeQKRVS0NNurH7bTf7RrvcVn1OOge45CnBeHCSmg=="; - }; - }; - "is-wsl-2.2.0" = { - name = "is-wsl"; - packageName = "is-wsl"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz"; - sha512 = "fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww=="; - }; - }; - "isarray-0.0.1" = { - name = "isarray"; - packageName = "isarray"; - version = "0.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"; - sha512 = "D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ=="; - }; - }; - "isarray-1.0.0" = { - name = "isarray"; - packageName = "isarray"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"; - sha512 = "VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="; - }; - }; - "isarray-2.0.5" = { - name = "isarray"; - packageName = "isarray"; - version = "2.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz"; - sha512 = "xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw=="; - }; - }; - "isbot-3.7.0" = { - name = "isbot"; - packageName = "isbot"; - version = "3.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/isbot/-/isbot-3.7.0.tgz"; - sha512 = "9BcjlI89966BqWJmYdTnRub85sit931MyCthSIPtgoOsTjoW7A2MVa09HzPpYE2+G4vyAxfDvR0AbUGV0FInQg=="; - }; - }; - "isexe-2.0.0" = { - name = "isexe"; - packageName = "isexe"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz"; - sha512 = "RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="; - }; - }; - "iso-639-1-2.1.15" = { - name = "iso-639-1"; - packageName = "iso-639-1"; - version = "2.1.15"; - src = fetchurl { - url = "https://registry.npmjs.org/iso-639-1/-/iso-639-1-2.1.15.tgz"; - sha512 = "7c7mBznZu2ktfvyT582E2msM+Udc1EjOyhVRE/0ZsjD9LBtWSm23h3PtiRh2a35XoUsTQQjJXaJzuLjXsOdFDg=="; - }; - }; - "isomorphic-ws-4.0.1" = { - name = "isomorphic-ws"; - packageName = "isomorphic-ws"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/isomorphic-ws/-/isomorphic-ws-4.0.1.tgz"; - sha512 = "BhBvN2MBpWTaSHdWRb/bwdZJ1WaehQ2L1KngkCkfLUGF0mAWAT1sQUQacEmQ0jXkFw/czDXPNQSL5u2/Krsz1w=="; - }; - }; - "jackspeak-2.3.6" = { - name = "jackspeak"; - packageName = "jackspeak"; - version = "2.3.6"; - src = fetchurl { - url = "https://registry.npmjs.org/jackspeak/-/jackspeak-2.3.6.tgz"; - sha512 = "N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ=="; - }; - }; - "jake-10.8.7" = { - name = "jake"; - packageName = "jake"; - version = "10.8.7"; - src = fetchurl { - url = "https://registry.npmjs.org/jake/-/jake-10.8.7.tgz"; - sha512 = "ZDi3aP+fG/LchyBzUM804VjddnwfSfsdeYkwt8NcbKRvo4rFkjhs456iLFn3k2ZUWvNe4i48WACDbza8fhq2+w=="; - }; - }; - "jest-worker-27.5.1" = { - name = "jest-worker"; - packageName = "jest-worker"; - version = "27.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz"; - sha512 = "7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg=="; - }; - }; - "jmespath-0.16.0" = { - name = "jmespath"; - packageName = "jmespath"; - version = "0.16.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jmespath/-/jmespath-0.16.0.tgz"; - sha512 = "9FzQjJ7MATs1tSpnco1K6ayiYE3figslrXA72G2HQ/n76RzvYlofyi5QM+iX4YRs/pu3yzxlVQSST23+dMDknw=="; - }; - }; - "join-component-1.1.0" = { - name = "join-component"; - packageName = "join-component"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/join-component/-/join-component-1.1.0.tgz"; - sha512 = "bF7vcQxbODoGK1imE2P9GS9aw4zD0Sd+Hni68IMZLj7zRnquH7dXUmMw9hDI5S/Jzt7q+IyTXN0rSg2GI0IKhQ=="; - }; - }; - "jose-4.15.2" = { - name = "jose"; - packageName = "jose"; - version = "4.15.2"; - src = fetchurl { - url = "https://registry.npmjs.org/jose/-/jose-4.15.2.tgz"; - sha512 = "IY73F228OXRl9ar3jJagh7Vnuhj/GzBunPiZP13K0lOl7Am9SoWW3kEzq3MCllJMTtZqHTiDXQvoRd4U95aU6A=="; - }; - }; - "js-base64-3.7.5" = { - name = "js-base64"; - packageName = "js-base64"; - version = "3.7.5"; - src = fetchurl { - url = "https://registry.npmjs.org/js-base64/-/js-base64-3.7.5.tgz"; - sha512 = "3MEt5DTINKqfScXKfJFrRbxkrnk2AxPWGBL/ycjz4dK8iqiSJ06UxD8jh8xuh6p10TX4t2+7FsBYVxxQbMg+qA=="; - }; - }; - "js-md4-0.3.2" = { - name = "js-md4"; - packageName = "js-md4"; - version = "0.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/js-md4/-/js-md4-0.3.2.tgz"; - sha512 = "/GDnfQYsltsjRswQhN9fhv3EMw2sCpUdrdxyWDOUK7eyD++r3gRhzgiQgc/x4MAv2i1iuQ4lxO5mvqM3vj4bwA=="; - }; - }; - "js-nacl-1.4.0" = { - name = "js-nacl"; - packageName = "js-nacl"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/js-nacl/-/js-nacl-1.4.0.tgz"; - sha512 = "HgYLcutGbMYBJrwgVICiHliuw1OJLy2U3tIuK6a1rZ06KC84TPl81WG1hcBRrBCiIIuBe3PSo9G4IZOMGdSg3Q=="; - }; - }; - "js-sdsl-4.3.0" = { - name = "js-sdsl"; - packageName = "js-sdsl"; - version = "4.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.3.0.tgz"; - sha512 = "mifzlm2+5nZ+lEcLJMoBK0/IH/bDg8XnJfd/Wq6IP+xoCjLZsTOnV2QpxlVbX9bMnkl5PdEjNtBJ9Cj1NjifhQ=="; - }; - }; - "js-yaml-3.14.1" = { - name = "js-yaml"; - packageName = "js-yaml"; - version = "3.14.1"; - src = fetchurl { - url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz"; - sha512 = "okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g=="; - }; - }; - "js-yaml-4.1.0" = { - name = "js-yaml"; - packageName = "js-yaml"; - version = "4.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz"; - sha512 = "wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA=="; - }; - }; - "jsbi-4.3.0" = { - name = "jsbi"; - packageName = "jsbi"; - version = "4.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jsbi/-/jsbi-4.3.0.tgz"; - sha512 = "SnZNcinB4RIcnEyZqFPdGPVgrg2AcnykiBy0sHVJQKHYeaLUvi3Exj+iaPpLnFVkDPZIV4U0yvgC9/R4uEAZ9g=="; - }; - }; - "jsbn-0.1.1" = { - name = "jsbn"; - packageName = "jsbn"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz"; - sha512 = "UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg=="; - }; - }; - "jsesc-3.0.2" = { - name = "jsesc"; - packageName = "jsesc"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/jsesc/-/jsesc-3.0.2.tgz"; - sha512 = "xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g=="; - }; - }; - "json-bigint-1.0.0" = { - name = "json-bigint"; - packageName = "json-bigint"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/json-bigint/-/json-bigint-1.0.0.tgz"; - sha512 = "SiPv/8VpZuWbvLSMtTDU8hEfrZWg/mH/nV/b4o0CYbSxu1UIQPLdwKOCIyLQX+VIPO5vrLX3i8qtqFyhdPSUSQ=="; - }; - }; - "json-diff-1.0.6" = { - name = "json-diff"; - packageName = "json-diff"; - version = "1.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/json-diff/-/json-diff-1.0.6.tgz"; - sha512 = "tcFIPRdlc35YkYdGxcamJjllUhXWv4n2rK9oJ2RsAzV4FBkuV4ojKEDgcZ+kpKxDmJKv+PFK65+1tVVOnSeEqA=="; - }; - }; - "json-parse-even-better-errors-2.3.1" = { - name = "json-parse-even-better-errors"; - packageName = "json-parse-even-better-errors"; - version = "2.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz"; - sha512 = "xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w=="; - }; - }; - "json-schema-ref-parser-9.0.9" = { - name = "json-schema-ref-parser"; - packageName = "json-schema-ref-parser"; - version = "9.0.9"; - src = fetchurl { - url = "https://registry.npmjs.org/json-schema-ref-parser/-/json-schema-ref-parser-9.0.9.tgz"; - sha512 = "qcP2lmGy+JUoQJ4DOQeLaZDqH9qSkeGCK3suKWxJXS82dg728Mn3j97azDMaOUmJAN4uCq91LdPx4K7E8F1a7Q=="; - }; - }; - "json-schema-traverse-0.4.1" = { - name = "json-schema-traverse"; - packageName = "json-schema-traverse"; - version = "0.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz"; - sha512 = "xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="; - }; - }; - "json5-2.2.3" = { - name = "json5"; - packageName = "json5"; - version = "2.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz"; - sha512 = "XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg=="; - }; - }; - "jsonfile-4.0.0" = { - name = "jsonfile"; - packageName = "jsonfile"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz"; - sha512 = "m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg=="; - }; - }; - "jsonfile-6.1.0" = { - name = "jsonfile"; - packageName = "jsonfile"; - version = "6.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz"; - sha512 = "5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ=="; - }; - }; - "jsonschema-1.4.1" = { - name = "jsonschema"; - packageName = "jsonschema"; - version = "1.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/jsonschema/-/jsonschema-1.4.1.tgz"; - sha512 = "S6cATIPVv1z0IlxdN+zUk5EPjkGCdnhN4wVSBlvoUO1tOLJootbo9CquNJmbIh4yikWHiUedhRYrNPn1arpEmQ=="; - }; - }; - "jsonwebtoken-9.0.2" = { - name = "jsonwebtoken"; - packageName = "jsonwebtoken"; - version = "9.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-9.0.2.tgz"; - sha512 = "PRp66vJ865SSqOlgqS8hujT5U4AOgMfhrwYIuIhfKaoSCZcirrmASQr8CX7cUg+RMih+hgznrjp99o+W4pJLHQ=="; - }; - }; - "jssha-3.3.1" = { - name = "jssha"; - packageName = "jssha"; - version = "3.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/jssha/-/jssha-3.3.1.tgz"; - sha512 = "VCMZj12FCFMQYcFLPRm/0lOBbLi8uM2BhXPTqw3U4YAfs4AZfiApOoBLoN8cQE60Z50m1MYMTQVCfgF/KaCVhQ=="; - }; - }; - "jwa-1.4.1" = { - name = "jwa"; - packageName = "jwa"; - version = "1.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/jwa/-/jwa-1.4.1.tgz"; - sha512 = "qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA=="; - }; - }; - "jwa-2.0.0" = { - name = "jwa"; - packageName = "jwa"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jwa/-/jwa-2.0.0.tgz"; - sha512 = "jrZ2Qx916EA+fq9cEAeCROWPTfCwi1IVHqT2tapuqLEVVDKFDENFw1oL+MwrTvH6msKxsd1YTDVw6uKEcsrLEA=="; - }; - }; - "jwks-rsa-3.1.0" = { - name = "jwks-rsa"; - packageName = "jwks-rsa"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jwks-rsa/-/jwks-rsa-3.1.0.tgz"; - sha512 = "v7nqlfezb9YfHHzYII3ef2a2j1XnGeSE/bK3WfumaYCqONAIstJbrEGapz4kadScZzEt7zYCN7bucj8C0Mv/Rg=="; - }; - }; - "jws-3.2.2" = { - name = "jws"; - packageName = "jws"; - version = "3.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/jws/-/jws-3.2.2.tgz"; - sha512 = "YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA=="; - }; - }; - "jws-4.0.0" = { - name = "jws"; - packageName = "jws"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jws/-/jws-4.0.0.tgz"; - sha512 = "KDncfTmOZoOMTFG4mBlG0qUIOlc03fmzH+ru6RgYVZhPkyiy/92Owlt/8UEN+a4TXR1FQetfIpJE8ApdvdVxTg=="; - }; - }; - "kafkajs-1.16.0" = { - name = "kafkajs"; - packageName = "kafkajs"; - version = "1.16.0"; - src = fetchurl { - url = "https://registry.npmjs.org/kafkajs/-/kafkajs-1.16.0.tgz"; - sha512 = "+Rcfu2hyQ/jv5skqRY8xA7Ra+mmRkDAzCaLDYbkGtgsNKpzxPWiLbk8ub0dgr4EbWrN1Zb4BCXHUkD6+zYfdWg=="; - }; - }; - "kerberos-2.0.3" = { - name = "kerberos"; - packageName = "kerberos"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/kerberos/-/kerberos-2.0.3.tgz"; - sha512 = "p2EgcmKCdFyGbvReS3+YZMDss7e4xYE4H6KYKzk0Vd9zj0nUt02I9DpD/+cMBsOcPHoqlHr1tm6RWY/SHCQVtw=="; - }; - }; - "kuler-2.0.0" = { - name = "kuler"; - packageName = "kuler"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/kuler/-/kuler-2.0.0.tgz"; - sha512 = "Xq9nH7KlWZmXAtodXDDRE7vs6DU1gTU8zYDHDiWLSip45Egwq3plLHzPn27NgvzL2r1LMPC1vdqh98sQxtqj4A=="; - }; - }; - "ldapts-4.2.6" = { - name = "ldapts"; - packageName = "ldapts"; - version = "4.2.6"; - src = fetchurl { - url = "https://registry.npmjs.org/ldapts/-/ldapts-4.2.6.tgz"; - sha512 = "r1eOj2PtTJi+9aZxLirktoHntuYXlbQD9ZXCjiZmJx0VBQtBcWc+rueqABuh/AxMcFHNPDSJLJAXxoj5VevTwQ=="; - }; - }; - "leac-0.6.0" = { - name = "leac"; - packageName = "leac"; - version = "0.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/leac/-/leac-0.6.0.tgz"; - sha512 = "y+SqErxb8h7nE/fiEX07jsbuhrpO9lL8eca7/Y1nuWV2moNlXhyd59iDGcRf6moVyDMbmTNzL40SUyrFU/yDpg=="; - }; - }; - "leven-2.1.0" = { - name = "leven"; - packageName = "leven"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/leven/-/leven-2.1.0.tgz"; - sha512 = "nvVPLpIHUxCUoRLrFqTgSxXJ614d8AgQoWl7zPe/2VadE8+1dpU3LBhowRuBAcuwruWtOdD8oYC9jDNJjXDPyA=="; - }; - }; - "libbase64-1.2.1" = { - name = "libbase64"; - packageName = "libbase64"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/libbase64/-/libbase64-1.2.1.tgz"; - sha512 = "l+nePcPbIG1fNlqMzrh68MLkX/gTxk/+vdvAb388Ssi7UuUN31MI44w4Yf33mM3Cm4xDfw48mdf3rkdHszLNew=="; - }; - }; - "libmime-5.2.0" = { - name = "libmime"; - packageName = "libmime"; - version = "5.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/libmime/-/libmime-5.2.0.tgz"; - sha512 = "X2U5Wx0YmK0rXFbk67ASMeqYIkZ6E5vY7pNWRKtnNzqjvdYYG8xtPDpCnuUEnPU9vlgNev+JoSrcaKSUaNvfsw=="; - }; - }; - "libmime-5.2.1" = { - name = "libmime"; - packageName = "libmime"; - version = "5.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/libmime/-/libmime-5.2.1.tgz"; - sha512 = "A0z9O4+5q+ZTj7QwNe/Juy1KARNb4WaviO4mYeFC4b8dBT2EEqK2pkM+GC8MVnkOjqhl5nYQxRgnPYRRTNmuSQ=="; - }; - }; - "libphonenumber-js-1.10.47" = { - name = "libphonenumber-js"; - packageName = "libphonenumber-js"; - version = "1.10.47"; - src = fetchurl { - url = "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.10.47.tgz"; - sha512 = "b4t7VQDV29xx/ni+58yl9KWPGjnDLDXCeCTLrD4V8vDpObXZRZBrg7uX/HWZ7YXiJKqdBDGgc+barUUTNB6Slw=="; - }; - }; - "libpq-1.8.12" = { - name = "libpq"; - packageName = "libpq"; - version = "1.8.12"; - src = fetchurl { - url = "https://registry.npmjs.org/libpq/-/libpq-1.8.12.tgz"; - sha512 = "4lUY9BD9suz76mVS0kH4rRgRy620g/c9YZH5GYC3smfIpjtj6KiPuQ4IwQSHSZMMMhMM3tBFrYUrw8mHOOZVeg=="; - }; - }; - "libqp-2.0.1" = { - name = "libqp"; - packageName = "libqp"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/libqp/-/libqp-2.0.1.tgz"; - sha512 = "Ka0eC5LkF3IPNQHJmYBWljJsw0UvM6j+QdKRbWyCdTmYwvIDE6a7bCm0UkTAL/K+3KXK5qXT/ClcInU01OpdLg=="; - }; - }; - "lie-3.1.1" = { - name = "lie"; - packageName = "lie"; - version = "3.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lie/-/lie-3.1.1.tgz"; - sha512 = "RiNhHysUjhrDQntfYSfY4MU24coXXdEOgw9WGcKHNeEwffDYbF//u87M1EWaMGzuFoSbqW0C9C6lEEhDOAswfw=="; - }; - }; - "limiter-1.1.5" = { - name = "limiter"; - packageName = "limiter"; - version = "1.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/limiter/-/limiter-1.1.5.tgz"; - sha512 = "FWWMIEOxz3GwUI4Ts/IvgVy6LPvoMPgjMdQ185nN6psJyBJ4yOpzqm695/h5umdLJg2vW3GR5iG11MAkR2AzJA=="; - }; - }; - "linkify-it-4.0.1" = { - name = "linkify-it"; - packageName = "linkify-it"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/linkify-it/-/linkify-it-4.0.1.tgz"; - sha512 = "C7bfi1UZmoj8+PQx22XyeXCuBlokoyWQL5pWSP+EI6nzRylyThouddufc2c1NDIcP9k5agmN9fLpA7VNJfIiqw=="; - }; - }; - "loader-runner-4.3.0" = { - name = "loader-runner"; - packageName = "loader-runner"; - version = "4.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz"; - sha512 = "3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg=="; - }; - }; - "loader-utils-2.0.4" = { - name = "loader-utils"; - packageName = "loader-utils"; - version = "2.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz"; - sha512 = "xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw=="; - }; - }; - "localforage-1.10.0" = { - name = "localforage"; - packageName = "localforage"; - version = "1.10.0"; - src = fetchurl { - url = "https://registry.npmjs.org/localforage/-/localforage-1.10.0.tgz"; - sha512 = "14/H1aX7hzBBmmh7sGPd+AOMkkIrHM3Z1PAyGgZigA1H1p5O5ANnMyWzvpAETtG68/dC4pC0ncy3+PPGzXZHPg=="; - }; - }; - "localtunnel-2.0.2" = { - name = "localtunnel"; - packageName = "localtunnel"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/localtunnel/-/localtunnel-2.0.2.tgz"; - sha512 = "n418Cn5ynvJd7m/N1d9WVJISLJF/ellZnfsLnx8WBWGzxv/ntNcFkJ1o6se5quUhCplfLGBNL5tYHiq5WF3Nug=="; - }; - }; - "lodash-4.17.21" = { - name = "lodash"; - packageName = "lodash"; - version = "4.17.21"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz"; - sha512 = "v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="; - }; - }; - "lodash-es-4.17.21" = { - name = "lodash-es"; - packageName = "lodash-es"; - version = "4.17.21"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz"; - sha512 = "mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw=="; - }; - }; - "lodash.camelcase-4.3.0" = { - name = "lodash.camelcase"; - packageName = "lodash.camelcase"; - version = "4.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz"; - sha512 = "TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA=="; - }; - }; - "lodash.clonedeep-4.5.0" = { - name = "lodash.clonedeep"; - packageName = "lodash.clonedeep"; - version = "4.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz"; - sha512 = "H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ=="; - }; - }; - "lodash.defaults-4.2.0" = { - name = "lodash.defaults"; - packageName = "lodash.defaults"; - version = "4.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz"; - sha512 = "qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ=="; - }; - }; - "lodash.flatten-4.4.0" = { - name = "lodash.flatten"; - packageName = "lodash.flatten"; - version = "4.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz"; - sha512 = "C5N2Z3DgnnKr0LOpv/hKCgKdb7ZZwafIrsesve6lmzvZIRZRGaZ/l6Q8+2W7NaT+ZwO3fFlSCzCzrDCFdJfZ4g=="; - }; - }; - "lodash.get-4.4.2" = { - name = "lodash.get"; - packageName = "lodash.get"; - version = "4.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz"; - sha512 = "z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ=="; - }; - }; - "lodash.includes-4.3.0" = { - name = "lodash.includes"; - packageName = "lodash.includes"; - version = "4.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz"; - sha512 = "W3Bx6mdkRTGtlJISOvVD/lbqjTlPPUDTMnlXZFnVwi9NKJ6tiAk6LVdlhZMm17VZisqhKcgzpO5Wz91PCt5b0w=="; - }; - }; - "lodash.isarguments-3.1.0" = { - name = "lodash.isarguments"; - packageName = "lodash.isarguments"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz"; - sha512 = "chi4NHZlZqZD18a0imDHnZPrDeBbTtVN7GXMwuGdRH9qotxAjYs3aVLKc7zNOG9eddR5Ksd8rvFEBc9SsggPpg=="; - }; - }; - "lodash.isboolean-3.0.3" = { - name = "lodash.isboolean"; - packageName = "lodash.isboolean"; - version = "3.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz"; - sha512 = "Bz5mupy2SVbPHURB98VAcw+aHh4vRV5IPNhILUCsOzRmsTmSQ17jIuqopAentWoehktxGd9e/hbIXq980/1QJg=="; - }; - }; - "lodash.isinteger-4.0.4" = { - name = "lodash.isinteger"; - packageName = "lodash.isinteger"; - version = "4.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz"; - sha512 = "DBwtEWN2caHQ9/imiNeEA5ys1JoRtRfY3d7V9wkqtbycnAmTvRRmbHKDV4a0EYc678/dia0jrte4tjYwVBaZUA=="; - }; - }; - "lodash.isnumber-3.0.3" = { - name = "lodash.isnumber"; - packageName = "lodash.isnumber"; - version = "3.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz"; - sha512 = "QYqzpfwO3/CWf3XP+Z+tkQsfaLL/EnUlXWVkIk5FUPc4sBdTehEqZONuyRt2P67PXAk+NXmTBcc97zw9t1FQrw=="; - }; - }; - "lodash.isplainobject-4.0.6" = { - name = "lodash.isplainobject"; - packageName = "lodash.isplainobject"; - version = "4.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz"; - sha512 = "oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA=="; - }; - }; - "lodash.isstring-4.0.1" = { - name = "lodash.isstring"; - packageName = "lodash.isstring"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz"; - sha512 = "0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw=="; - }; - }; - "lodash.once-4.1.1" = { - name = "lodash.once"; - packageName = "lodash.once"; - version = "4.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz"; - sha512 = "Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg=="; - }; - }; - "lodash.snakecase-4.1.1" = { - name = "lodash.snakecase"; - packageName = "lodash.snakecase"; - version = "4.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.snakecase/-/lodash.snakecase-4.1.1.tgz"; - sha512 = "QZ1d4xoBHYUeuouhEq3lk3Uq7ldgyFXGBhg04+oRLnIz8o9T65Eh+8YdroUwn846zchkA9yDsDl5CVVaV2nqYw=="; - }; - }; - "lodash.uniq-4.5.0" = { - name = "lodash.uniq"; - packageName = "lodash.uniq"; - version = "4.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz"; - sha512 = "xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ=="; - }; - }; - "lodash.uniqby-4.7.0" = { - name = "lodash.uniqby"; - packageName = "lodash.uniqby"; - version = "4.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.uniqby/-/lodash.uniqby-4.7.0.tgz"; - sha512 = "e/zcLx6CSbmaEgFHCA7BnoQKyCtKMxnuWrJygbwPs/AIn+IMKl66L8/s+wBUn5LRw2pZx3bUHibiV1b6aTWIww=="; - }; - }; - "lodash.zipobject-4.1.3" = { - name = "lodash.zipobject"; - packageName = "lodash.zipobject"; - version = "4.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.zipobject/-/lodash.zipobject-4.1.3.tgz"; - sha512 = "A9SzX4hMKWS25MyalwcOnNoplyHbkNVsjidhTp8ru0Sj23wY9GWBKS8gAIGDSAqeWjIjvE4KBEl24XXAs+v4wQ=="; - }; - }; - "logform-2.5.1" = { - name = "logform"; - packageName = "logform"; - version = "2.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/logform/-/logform-2.5.1.tgz"; - sha512 = "9FyqAm9o9NKKfiAKfZoYo9bGXXuwMkxQiQttkT4YjjVtQVIQtK6LmVtlxmCaFswo6N4AfEkHqZTV0taDtPotNg=="; - }; - }; - "long-4.0.0" = { - name = "long"; - packageName = "long"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/long/-/long-4.0.0.tgz"; - sha512 = "XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA=="; - }; - }; - "long-5.2.3" = { - name = "long"; - packageName = "long"; - version = "5.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/long/-/long-5.2.3.tgz"; - sha512 = "lcHwpNoggQTObv5apGNCTdJrO69eHOZMi4BNC+rTLER8iHAqGrUVeLh/irVIM7zTw2bOXA8T6uNPeujwOLg/2Q=="; - }; - }; - "lossless-json-1.0.5" = { - name = "lossless-json"; - packageName = "lossless-json"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/lossless-json/-/lossless-json-1.0.5.tgz"; - sha512 = "RicKUuLwZVNZ6ZdJHgIZnSeA05p8qWc5NW0uR96mpPIjN9WDLUg9+kj1esQU1GkPn9iLZVKatSQK5gyiaFHgJA=="; - }; - }; - "lower-case-2.0.2" = { - name = "lower-case"; - packageName = "lower-case"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz"; - sha512 = "7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg=="; - }; - }; - "lru-cache-10.0.1" = { - name = "lru-cache"; - packageName = "lru-cache"; - version = "10.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lru-cache/-/lru-cache-10.0.1.tgz"; - sha512 = "IJ4uwUTi2qCccrioU6g9g/5rvvVl13bsdczUUcqbciD9iLr095yj8DQKdObriEvuNSx325N1rV1O0sJFszx75g=="; - }; - }; - "lru-cache-4.0.2" = { - name = "lru-cache"; - packageName = "lru-cache"; - version = "4.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.0.2.tgz"; - sha512 = "uQw9OqphAGiZhkuPlpFGmdTU2tEuhxTourM/19qGJrxBPHAr/f8BT1a0i/lOclESnGatdJG/UCkP9kZB/Lh1iw=="; - }; - }; - "lru-cache-4.1.5" = { - name = "lru-cache"; - packageName = "lru-cache"; - version = "4.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz"; - sha512 = "sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g=="; - }; - }; - "lru-cache-6.0.0" = { - name = "lru-cache"; - packageName = "lru-cache"; - version = "6.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz"; - sha512 = "Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA=="; - }; - }; - "lru-cache-7.18.3" = { - name = "lru-cache"; - packageName = "lru-cache"; - version = "7.18.3"; - src = fetchurl { - url = "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz"; - sha512 = "jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA=="; - }; - }; - "lru-memoizer-2.2.0" = { - name = "lru-memoizer"; - packageName = "lru-memoizer"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lru-memoizer/-/lru-memoizer-2.2.0.tgz"; - sha512 = "QfOZ6jNkxCcM/BkIPnFsqDhtrazLRsghi9mBwFAzol5GCvj4EkFT899Za3+QwikCg5sRX8JstioBDwOxEyzaNw=="; - }; - }; - "lru_map-0.3.3" = { - name = "lru_map"; - packageName = "lru_map"; - version = "0.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/lru_map/-/lru_map-0.3.3.tgz"; - sha512 = "Pn9cox5CsMYngeDbmChANltQl+5pi6XmTrraMSzhPmMBbmgcxmqWry0U3PGapCU1yB4/LqCcom7qhHZiF/jGfQ=="; - }; - }; - "luxon-3.4.3" = { - name = "luxon"; - packageName = "luxon"; - version = "3.4.3"; - src = fetchurl { - url = "https://registry.npmjs.org/luxon/-/luxon-3.4.3.tgz"; - sha512 = "tFWBiv3h7z+T/tDaoxA8rqTxy1CHV6gHS//QdaH4pulbq/JuBSGgQspQQqcgnwdAx6pNI7cmvz5Sv/addzHmUg=="; - }; - }; - "mailparser-3.6.5" = { - name = "mailparser"; - packageName = "mailparser"; - version = "3.6.5"; - src = fetchurl { - url = "https://registry.npmjs.org/mailparser/-/mailparser-3.6.5.tgz"; - sha512 = "nteTpF0Khm5JLOnt4sigmzNdUH/6mO7PZ4KEnvxf4mckyXYFFhrtAWZzbq/V5aQMH+049gA7ZjfLdh+QiX2Uqg=="; - }; - }; - "mailsplit-5.4.0" = { - name = "mailsplit"; - packageName = "mailsplit"; - version = "5.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mailsplit/-/mailsplit-5.4.0.tgz"; - sha512 = "wnYxX5D5qymGIPYLwnp6h8n1+6P6vz/MJn5AzGjZ8pwICWssL+CCQjWBIToOVHASmATot4ktvlLo6CyLfOXWYA=="; - }; - }; - "make-dir-3.1.0" = { - name = "make-dir"; - packageName = "make-dir"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz"; - sha512 = "g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw=="; - }; - }; - "make-error-1.3.6" = { - name = "make-error"; - packageName = "make-error"; - version = "1.3.6"; - src = fetchurl { - url = "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz"; - sha512 = "s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw=="; - }; - }; - "make-fetch-happen-9.1.0" = { - name = "make-fetch-happen"; - packageName = "make-fetch-happen"; - version = "9.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-9.1.0.tgz"; - sha512 = "+zopwDy7DNknmwPQplem5lAZX/eCOzSvSNNcSKm5eVwTkOBzoktEfXsa9L23J/GIRhxRsaxzkPEhrJEpE2F4Gg=="; - }; - }; - "mappersmith-2.42.0" = { - name = "mappersmith"; - packageName = "mappersmith"; - version = "2.42.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mappersmith/-/mappersmith-2.42.0.tgz"; - sha512 = "1QCZ1FKu+3GqgPkCotTkhnDEyFCU+ZPJnIx7X20L9d2JL6OfBDL9VVc5kyGGlroxZZ6IwYZrmSke+14HpSVC1g=="; - }; - }; - "md5-2.3.0" = { - name = "md5"; - packageName = "md5"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/md5/-/md5-2.3.0.tgz"; - sha512 = "T1GITYmFaKuO91vxyoQMFETst+O71VUPEU3ze5GNzDm0OWdP8v1ziTaAEPUr/3kLsY3Sftgz242A1SetQiDL7g=="; - }; - }; - "media-typer-0.3.0" = { - name = "media-typer"; - packageName = "media-typer"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz"; - sha512 = "dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ=="; - }; - }; - "media-typer-1.1.0" = { - name = "media-typer"; - packageName = "media-typer"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/media-typer/-/media-typer-1.1.0.tgz"; - sha512 = "aisnrDP4GNe06UcKFnV5bfMNPBUw4jsLGaWwWfnH3v02GnBuXX2MCVn5RbrWo0j3pczUilYblq7fQ7Nw2t5XKw=="; - }; - }; - "merge-descriptors-1.0.1" = { - name = "merge-descriptors"; - packageName = "merge-descriptors"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz"; - sha512 = "cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w=="; - }; - }; - "merge-stream-2.0.0" = { - name = "merge-stream"; - packageName = "merge-stream"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz"; - sha512 = "abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w=="; - }; - }; - "merge2-1.4.1" = { - name = "merge2"; - packageName = "merge2"; - version = "1.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz"; - sha512 = "8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg=="; - }; - }; - "methods-1.1.2" = { - name = "methods"; - packageName = "methods"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz"; - sha512 = "iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w=="; - }; - }; - "micromatch-4.0.5" = { - name = "micromatch"; - packageName = "micromatch"; - version = "4.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz"; - sha512 = "DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA=="; - }; - }; - "mime-1.6.0" = { - name = "mime"; - packageName = "mime"; - version = "1.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz"; - sha512 = "x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="; - }; - }; - "mime-3.0.0" = { - name = "mime"; - packageName = "mime"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mime/-/mime-3.0.0.tgz"; - sha512 = "jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A=="; - }; - }; - "mime-db-1.52.0" = { - name = "mime-db"; - packageName = "mime-db"; - version = "1.52.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz"; - sha512 = "sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="; - }; - }; - "mime-types-2.1.35" = { - name = "mime-types"; - packageName = "mime-types"; - version = "2.1.35"; - src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz"; - sha512 = "ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw=="; - }; - }; - "mimic-fn-2.1.0" = { - name = "mimic-fn"; - packageName = "mimic-fn"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz"; - sha512 = "OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="; - }; - }; - "mimic-response-3.1.0" = { - name = "mimic-response"; - packageName = "mimic-response"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz"; - sha512 = "z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ=="; - }; - }; - "minifaker-1.34.1" = { - name = "minifaker"; - packageName = "minifaker"; - version = "1.34.1"; - src = fetchurl { - url = "https://registry.npmjs.org/minifaker/-/minifaker-1.34.1.tgz"; - sha512 = "O9+c6GaUETgtKe65bJkpDTJxGcAALiUPqJtDv97dT3o0uP2HmyUVEguEGm6PLKuoSzZUmHqSTZ4cS7m8xKFEAg=="; - }; - }; - "minimalistic-assert-1.0.1" = { - name = "minimalistic-assert"; - packageName = "minimalistic-assert"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz"; - sha512 = "UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A=="; - }; - }; - "minimatch-3.1.2" = { - name = "minimatch"; - packageName = "minimatch"; - version = "3.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz"; - sha512 = "J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw=="; - }; - }; - "minimatch-5.1.6" = { - name = "minimatch"; - packageName = "minimatch"; - version = "5.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz"; - sha512 = "lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g=="; - }; - }; - "minimatch-9.0.3" = { - name = "minimatch"; - packageName = "minimatch"; - version = "9.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz"; - sha512 = "RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg=="; - }; - }; - "minimist-1.2.8" = { - name = "minimist"; - packageName = "minimist"; - version = "1.2.8"; - src = fetchurl { - url = "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz"; - sha512 = "2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA=="; - }; - }; - "minipass-3.3.6" = { - name = "minipass"; - packageName = "minipass"; - version = "3.3.6"; - src = fetchurl { - url = "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz"; - sha512 = "DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw=="; - }; - }; - "minipass-5.0.0" = { - name = "minipass"; - packageName = "minipass"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz"; - sha512 = "3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ=="; - }; - }; - "minipass-7.0.4" = { - name = "minipass"; - packageName = "minipass"; - version = "7.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/minipass/-/minipass-7.0.4.tgz"; - sha512 = "jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ=="; - }; - }; - "minipass-collect-1.0.2" = { - name = "minipass-collect"; - packageName = "minipass-collect"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz"; - sha512 = "6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA=="; - }; - }; - "minipass-fetch-1.4.1" = { - name = "minipass-fetch"; - packageName = "minipass-fetch"; - version = "1.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-1.4.1.tgz"; - sha512 = "CGH1eblLq26Y15+Azk7ey4xh0J/XfJfrCox5LDJiKqI2Q2iwOLOKrlmIaODiSQS8d18jalF6y2K2ePUm0CmShw=="; - }; - }; - "minipass-flush-1.0.5" = { - name = "minipass-flush"; - packageName = "minipass-flush"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz"; - sha512 = "JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw=="; - }; - }; - "minipass-pipeline-1.2.4" = { - name = "minipass-pipeline"; - packageName = "minipass-pipeline"; - version = "1.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz"; - sha512 = "xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A=="; - }; - }; - "minipass-sized-1.0.3" = { - name = "minipass-sized"; - packageName = "minipass-sized"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/minipass-sized/-/minipass-sized-1.0.3.tgz"; - sha512 = "MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g=="; - }; - }; - "minizlib-2.1.2" = { - name = "minizlib"; - packageName = "minizlib"; - version = "2.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz"; - sha512 = "bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg=="; - }; - }; - "mkdirp-0.5.6" = { - name = "mkdirp"; - packageName = "mkdirp"; - version = "0.5.6"; - src = fetchurl { - url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz"; - sha512 = "FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw=="; - }; - }; - "mkdirp-1.0.4" = { - name = "mkdirp"; - packageName = "mkdirp"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz"; - sha512 = "vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="; - }; - }; - "mkdirp-2.1.6" = { - name = "mkdirp"; - packageName = "mkdirp"; - version = "2.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/mkdirp/-/mkdirp-2.1.6.tgz"; - sha512 = "+hEnITedc8LAtIP9u3HJDFIdcLV2vXP33sqLLIzkv1Db1zO/1OxbvYf0Y1OC/S/Qo5dxHXepofhmxL02PsKe+A=="; - }; - }; - "mkdirp-classic-0.5.3" = { - name = "mkdirp-classic"; - packageName = "mkdirp-classic"; - version = "0.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz"; - sha512 = "gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A=="; - }; - }; - "moment-2.29.4" = { - name = "moment"; - packageName = "moment"; - version = "2.29.4"; - src = fetchurl { - url = "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz"; - sha512 = "5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w=="; - }; - }; - "moment-timezone-0.5.43" = { - name = "moment-timezone"; - packageName = "moment-timezone"; - version = "0.5.43"; - src = fetchurl { - url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.43.tgz"; - sha512 = "72j3aNyuIsDxdF1i7CEgV2FfxM1r6aaqJyLB2vwb33mXYyoyLly+F1zbWqhA3/bVIoJ4szlUoMbUnVdid32NUQ=="; - }; - }; - "mongodb-4.17.1" = { - name = "mongodb"; - packageName = "mongodb"; - version = "4.17.1"; - src = fetchurl { - url = "https://registry.npmjs.org/mongodb/-/mongodb-4.17.1.tgz"; - sha512 = "MBuyYiPUPRTqfH2dV0ya4dcr2E5N52ocBuZ8Sgg/M030nGF78v855B3Z27mZJnp8PxjnUquEnAtjOsphgMZOlQ=="; - }; - }; - "mongodb-5.9.0" = { - name = "mongodb"; - packageName = "mongodb"; - version = "5.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mongodb/-/mongodb-5.9.0.tgz"; - sha512 = "g+GCMHN1CoRUA+wb1Agv0TI4YTSiWr42B5ulkiAfLLHitGK1R+PkSAf3Lr5rPZwi/3F04LiaZEW0Kxro9Fi2TA=="; - }; - }; - "mongodb-client-encryption-2.9.1" = { - name = "mongodb-client-encryption"; - packageName = "mongodb-client-encryption"; - version = "2.9.1"; - src = fetchurl { - url = "https://registry.npmjs.org/mongodb-client-encryption/-/mongodb-client-encryption-2.9.1.tgz"; - sha512 = "JBWr6CF60sqOdlaVzlywuLOZQ6D0iDrCz2ZjPAM38ZHVvC9WER5jgHl81JOY+EIAKwZVhJakCqlr809jPQeGUA=="; - }; - }; - "mongodb-connection-string-url-2.6.0" = { - name = "mongodb-connection-string-url"; - packageName = "mongodb-connection-string-url"; - version = "2.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mongodb-connection-string-url/-/mongodb-connection-string-url-2.6.0.tgz"; - sha512 = "WvTZlI9ab0QYtTYnuMLgobULWhokRjtC7db9LtcVfJ+Hsnyr5eo6ZtNAt3Ly24XZScGMelOcGtm7lSn0332tPQ=="; - }; - }; - "mqtt-4.3.7" = { - name = "mqtt"; - packageName = "mqtt"; - version = "4.3.7"; - src = fetchurl { - url = "https://registry.npmjs.org/mqtt/-/mqtt-4.3.7.tgz"; - sha512 = "ew3qwG/TJRorTz47eW46vZ5oBw5MEYbQZVaEji44j5lAUSQSqIEoul7Kua/BatBW0H0kKQcC9kwUHa1qzaWHSw=="; - }; - }; - "mqtt-5.1.2" = { - name = "mqtt"; - packageName = "mqtt"; - version = "5.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/mqtt/-/mqtt-5.1.2.tgz"; - sha512 = "jEyrJGj3qkyTWx/7t5p+u6BY1rpikcl0ydlaHPGJ6rjeCkHVCFcTK+ZP5hVqAei5rwn7h4qtjTezhXHWkSZOHg=="; - }; - }; - "mqtt-packet-6.10.0" = { - name = "mqtt-packet"; - packageName = "mqtt-packet"; - version = "6.10.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-6.10.0.tgz"; - sha512 = "ja8+mFKIHdB1Tpl6vac+sktqy3gA8t9Mduom1BA75cI+R9AHnZOiaBQwpGiWnaVJLDGRdNhQmFaAqd7tkKSMGA=="; - }; - }; - "mqtt-packet-8.2.1" = { - name = "mqtt-packet"; - packageName = "mqtt-packet"; - version = "8.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-8.2.1.tgz"; - sha512 = "vrHHjwhmuxzQIe3fJWoOLQHF4H5FETUrQGYD5g1qGfEmpjkQUkPONfygA0cI8Wtb3IUCfu66WmZiVSCgGm8oUw=="; - }; - }; - "ms-2.0.0" = { - name = "ms"; - packageName = "ms"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz"; - sha512 = "Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="; - }; - }; - "ms-2.1.2" = { - name = "ms"; - packageName = "ms"; - version = "2.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz"; - sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="; - }; - }; - "ms-2.1.3" = { - name = "ms"; - packageName = "ms"; - version = "2.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz"; - sha512 = "6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="; - }; - }; - "msgpackr-1.9.9" = { - name = "msgpackr"; - packageName = "msgpackr"; - version = "1.9.9"; - src = fetchurl { - url = "https://registry.npmjs.org/msgpackr/-/msgpackr-1.9.9.tgz"; - sha512 = "sbn6mioS2w0lq1O6PpGtsv6Gy8roWM+o3o4Sqjd6DudrL/nOugY+KyJUimoWzHnf9OkO0T6broHFnYE/R05t9A=="; - }; - }; - "mssql-8.1.4" = { - name = "mssql"; - packageName = "mssql"; - version = "8.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/mssql/-/mssql-8.1.4.tgz"; - sha512 = "nqkYYehETWVvFLB9zAGJV2kegOsdtLjUnkHA52aFhlE0ZIoOXC3BL8pLERwFicFypM4i3DX1hYeuM726EEIxjQ=="; - }; - }; - "mssql-9.3.2" = { - name = "mssql"; - packageName = "mssql"; - version = "9.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/mssql/-/mssql-9.3.2.tgz"; - sha512 = "XI5GOGCCSSNL8K2SSXg9HMyugJoCjLmrhiZfcZrJrJ2r3NfTcnz3Cegeg4m+xPkNVd0o3owsSL/NsDCFYfjOlw=="; - }; - }; - "multer-1.4.5-lts.1" = { - name = "multer"; - packageName = "multer"; - version = "1.4.5-lts.1"; - src = fetchurl { - url = "https://registry.npmjs.org/multer/-/multer-1.4.5-lts.1.tgz"; - sha512 = "ywPWvcDMeH+z9gQq5qYHCCy+ethsk4goepZ45GLD63fOu0YcNecQxi64nDs3qluZB+murG3/D4dJ7+dGctcCQQ=="; - }; - }; - "mute-stream-0.0.8" = { - name = "mute-stream"; - packageName = "mute-stream"; - version = "0.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz"; - sha512 = "nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA=="; - }; - }; - "mysql2-2.3.3" = { - name = "mysql2"; - packageName = "mysql2"; - version = "2.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/mysql2/-/mysql2-2.3.3.tgz"; - sha512 = "wxJUev6LgMSgACDkb/InIFxDprRa6T95+VEoR+xPvtngtccNH2dGjEB/fVZ8yg1gWv1510c9CvXuJHi5zUm0ZA=="; - }; - }; - "mz-2.7.0" = { - name = "mz"; - packageName = "mz"; - version = "2.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz"; - sha512 = "z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q=="; - }; - }; - "n8n-core-1.9.1" = { - name = "n8n-core"; - packageName = "n8n-core"; - version = "1.9.1"; - src = fetchurl { - url = "https://registry.npmjs.org/n8n-core/-/n8n-core-1.9.1.tgz"; - sha512 = "XBTVZTW30Ohh+F9IeGFBqhhnj8J5pL9x/i1Ry0ciICEjVjwInxzueFudI93pY3QJwevwAn0vfusw5KV0sx11EQ=="; - }; - }; - "n8n-editor-ui-1.9.3" = { - name = "n8n-editor-ui"; - packageName = "n8n-editor-ui"; - version = "1.9.3"; - src = fetchurl { - url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-1.9.3.tgz"; - sha512 = "gxme20z+2URuKpupdvfCOPCWJZUCegADO6TGoPSGh0qQLxgN5nWR74Z5V2mM5ceB0Tk4V15cwwO8rB/PIvbUPQ=="; - }; - }; - "n8n-nodes-base-1.9.2" = { - name = "n8n-nodes-base"; - packageName = "n8n-nodes-base"; - version = "1.9.2"; - src = fetchurl { - url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-1.9.2.tgz"; - sha512 = "nAtyNXsIAt/CSdwdRo11QkNa2RSN/FKAcYs4NldnRhiaHHRmt3jtbmy52p9zG4NfIVNctfHPOH/kED8spoQRaw=="; - }; - }; - "n8n-nodes-base-1.9.3" = { - name = "n8n-nodes-base"; - packageName = "n8n-nodes-base"; - version = "1.9.3"; - src = fetchurl { - url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-1.9.3.tgz"; - sha512 = "4VoaSFDO71O6j2vO1UX7s4cTuTiTxtfKxTHsbEUMZobjk5XAZuREBGmMdRbb792z5iXzGU8pX8tkhAtZSv4XwA=="; - }; - }; - "n8n-workflow-1.9.1" = { - name = "n8n-workflow"; - packageName = "n8n-workflow"; - version = "1.9.1"; - src = fetchurl { - url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-1.9.1.tgz"; - sha512 = "DvzREgrb/k7duALtx1rftxVJDjZUDmbzjwqLdwS8nxyzvs0pOqh5xKpSj3q8NDNbF9xaw2H1PI6getFrpMKLSA=="; - }; - }; - "named-placeholders-1.1.3" = { - name = "named-placeholders"; - packageName = "named-placeholders"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/named-placeholders/-/named-placeholders-1.1.3.tgz"; - sha512 = "eLoBxg6wE/rZkJPhU/xRX1WTpkFEwDJEN96oxFrTsqBdbT5ec295Q+CoHrL9IT0DipqKhmGcaZmwOt8OON5x1w=="; - }; - }; - "nan-2.18.0" = { - name = "nan"; - packageName = "nan"; - version = "2.18.0"; - src = fetchurl { - url = "https://registry.npmjs.org/nan/-/nan-2.18.0.tgz"; - sha512 = "W7tfG7vMOGtD30sHoZSSc/JVYiyDPEyQVso/Zz+/uQd0B0L46gtC+pHha5FFMRpil6fm/AoEcRWyOVi4+E/f8w=="; - }; - }; - "nanoclone-0.2.1" = { - name = "nanoclone"; - packageName = "nanoclone"; - version = "0.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/nanoclone/-/nanoclone-0.2.1.tgz"; - sha512 = "wynEP02LmIbLpcYw8uBKpcfF6dmg2vcpKqxeH5UcoKEYdExslsdUA4ugFauuaeYdTB76ez6gJW8XAZ6CgkXYxA=="; - }; - }; - "nanoid-3.3.6" = { - name = "nanoid"; - packageName = "nanoid"; - version = "3.3.6"; - src = fetchurl { - url = "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz"; - sha512 = "BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA=="; - }; - }; - "napi-build-utils-1.0.2" = { - name = "napi-build-utils"; - packageName = "napi-build-utils"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-1.0.2.tgz"; - sha512 = "ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg=="; - }; - }; - "native-duplexpair-1.0.0" = { - name = "native-duplexpair"; - packageName = "native-duplexpair"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/native-duplexpair/-/native-duplexpair-1.0.0.tgz"; - sha512 = "E7QQoM+3jvNtlmyfqRZ0/U75VFgCls+fSkbml2MpgWkWyz3ox8Y58gNhfuziuQYGNNQAbFZJQck55LHCnCK6CA=="; - }; - }; - "natural-orderby-2.0.3" = { - name = "natural-orderby"; - packageName = "natural-orderby"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/natural-orderby/-/natural-orderby-2.0.3.tgz"; - sha512 = "p7KTHxU0CUrcOXe62Zfrb5Z13nLvPhSWR/so3kFulUQU0sgUll2Z0LwpsLN351eOOD+hRGu/F1g+6xDfPeD++Q=="; - }; - }; - "negotiator-0.6.3" = { - name = "negotiator"; - packageName = "negotiator"; - version = "0.6.3"; - src = fetchurl { - url = "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz"; - sha512 = "+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg=="; - }; - }; - "neo-async-2.6.2" = { - name = "neo-async"; - packageName = "neo-async"; - version = "2.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz"; - sha512 = "Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw=="; - }; - }; - "no-case-3.0.4" = { - name = "no-case"; - packageName = "no-case"; - version = "3.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz"; - sha512 = "fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg=="; - }; - }; - "node-abi-3.49.0" = { - name = "node-abi"; - packageName = "node-abi"; - version = "3.49.0"; - src = fetchurl { - url = "https://registry.npmjs.org/node-abi/-/node-abi-3.49.0.tgz"; - sha512 = "ji8IK8VT2zAQv9BeOqwnpuvJnCivxPCe2HNiPe8P1z1SDhqEFpm7GqctqTWkujb8mLfZ1PWDrjMeiq6l9TN7fA=="; - }; - }; - "node-abort-controller-3.1.1" = { - name = "node-abort-controller"; - packageName = "node-abort-controller"; - version = "3.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/node-abort-controller/-/node-abort-controller-3.1.1.tgz"; - sha512 = "AGK2yQKIjRuqnc6VkX2Xj5d+QW8xZ87pa1UK6yA6ouUyuxfHuMP6umE5QK7UmTeOAymo+Zx1Fxiuw9rVx8taHQ=="; - }; - }; - "node-addon-api-4.3.0" = { - name = "node-addon-api"; - packageName = "node-addon-api"; - version = "4.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/node-addon-api/-/node-addon-api-4.3.0.tgz"; - sha512 = "73sE9+3UaLYYFmDsFZnqCInzPyh3MqIwZO9cw58yIqAZhONrrabrYyYe3TuIqtIiOuTXVhsGau8hcrhhwSsDIQ=="; - }; - }; - "node-addon-api-6.1.0" = { - name = "node-addon-api"; - packageName = "node-addon-api"; - version = "6.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/node-addon-api/-/node-addon-api-6.1.0.tgz"; - sha512 = "+eawOlIgy680F0kBzPUNFhMZGtJ1YmqM6l4+Crf4IkImjYrO/mqPwRMh352g23uIaQKFItcQ64I7KMaJxHgAVA=="; - }; - }; - "node-fetch-2.7.0" = { - name = "node-fetch"; - packageName = "node-fetch"; - version = "2.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz"; - sha512 = "c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A=="; - }; - }; - "node-forge-1.3.1" = { - name = "node-forge"; - packageName = "node-forge"; - version = "1.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz"; - sha512 = "dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA=="; - }; - }; - "node-gyp-8.4.1" = { - name = "node-gyp"; - packageName = "node-gyp"; - version = "8.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/node-gyp/-/node-gyp-8.4.1.tgz"; - sha512 = "olTJRgUtAb/hOXG0E93wZDs5YiJlgbXxTwQAFHyNlRsXQnYzUaF2aGgujZbw+hR8aF4ZG/rST57bWMWD16jr9w=="; - }; - }; - "node-gyp-build-4.6.1" = { - name = "node-gyp-build"; - packageName = "node-gyp-build"; - version = "4.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.6.1.tgz"; - sha512 = "24vnklJmyRS8ViBNI8KbtK/r/DmXQMRiOMXTNz2nrTnAYUwjmEEbnnpB/+kt+yWRv73bPsSPRFddrcIbAxSiMQ=="; - }; - }; - "node-html-markdown-1.3.0" = { - name = "node-html-markdown"; - packageName = "node-html-markdown"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/node-html-markdown/-/node-html-markdown-1.3.0.tgz"; - sha512 = "OeFi3QwC/cPjvVKZ114tzzu+YoR+v9UXW5RwSXGUqGb0qCl0DvP406tzdL7SFn8pZrMyzXoisfG2zcuF9+zw4g=="; - }; - }; - "node-html-parser-6.1.10" = { - name = "node-html-parser"; - packageName = "node-html-parser"; - version = "6.1.10"; - src = fetchurl { - url = "https://registry.npmjs.org/node-html-parser/-/node-html-parser-6.1.10.tgz"; - sha512 = "6/uWdWxjQWQ7tMcFK2wWlrflsQUzh1HsEzlIf2j5+TtzfhT2yUvg3DwZYAmjEHeR3uX74ko7exjHW69J0tOzIg=="; - }; - }; - "node-machine-id-1.1.12" = { - name = "node-machine-id"; - packageName = "node-machine-id"; - version = "1.1.12"; - src = fetchurl { - url = "https://registry.npmjs.org/node-machine-id/-/node-machine-id-1.1.12.tgz"; - sha512 = "QNABxbrPa3qEIfrE6GOJ7BYIuignnJw7iQ2YPbc3Nla1HzRJjXzZOiikfF8m7eAMfichLt3M4VgLOetqgDmgGQ=="; - }; - }; - "node-releases-2.0.13" = { - name = "node-releases"; - packageName = "node-releases"; - version = "2.0.13"; - src = fetchurl { - url = "https://registry.npmjs.org/node-releases/-/node-releases-2.0.13.tgz"; - sha512 = "uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ=="; - }; - }; - "node-rsa-1.1.1" = { - name = "node-rsa"; - packageName = "node-rsa"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/node-rsa/-/node-rsa-1.1.1.tgz"; - sha512 = "Jd4cvbJMryN21r5HgxQOpMEqv+ooke/korixNNK3mGqfGJmy0M77WDDzo/05969+OkMy3XW1UuZsSmW9KQm7Fw=="; - }; - }; - "node-ssh-12.0.5" = { - name = "node-ssh"; - packageName = "node-ssh"; - version = "12.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/node-ssh/-/node-ssh-12.0.5.tgz"; - sha512 = "uN2GTGdBRUUKkZmcNBr9OM+xKL6zq74emnkSyb1TshBdVWegj3boue6QallQeqZzo7YGVheP5gAovUL+8hZSig=="; - }; - }; - "nodeify-1.0.1" = { - name = "nodeify"; - packageName = "nodeify"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/nodeify/-/nodeify-1.0.1.tgz"; - sha512 = "n7C2NyEze8GCo/z73KdbjRsBiLbv6eBn1FxwYKQ23IqGo7pQY3mhQan61Sv7eEDJCiyUjTVrVkXTzJCo1dW7Aw=="; - }; - }; - "nodemailer-6.9.3" = { - name = "nodemailer"; - packageName = "nodemailer"; - version = "6.9.3"; - src = fetchurl { - url = "https://registry.npmjs.org/nodemailer/-/nodemailer-6.9.3.tgz"; - sha512 = "fy9v3NgTzBngrMFkDsKEj0r02U7jm6XfC3b52eoNV+GCrGj+s8pt5OqhiJdWKuw51zCTdiNR/IUD1z33LIIGpg=="; - }; - }; - "nodemailer-6.9.6" = { - name = "nodemailer"; - packageName = "nodemailer"; - version = "6.9.6"; - src = fetchurl { - url = "https://registry.npmjs.org/nodemailer/-/nodemailer-6.9.6.tgz"; - sha512 = "s7pDtWwe5fLMkQUhw8TkWB/wnZ7SRdd9HRZslq/s24hlZvBP3j32N/ETLmnqTpmj4xoBZL9fOWyCIZ7r2HORHg=="; - }; - }; - "nopt-5.0.0" = { - name = "nopt"; - packageName = "nopt"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz"; - sha512 = "Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ=="; - }; - }; - "normalize-path-3.0.0" = { - name = "normalize-path"; - packageName = "normalize-path"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz"; - sha512 = "6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="; - }; - }; - "npmlog-5.0.1" = { - name = "npmlog"; - packageName = "npmlog"; - version = "5.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/npmlog/-/npmlog-5.0.1.tgz"; - sha512 = "AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw=="; - }; - }; - "npmlog-6.0.2" = { - name = "npmlog"; - packageName = "npmlog"; - version = "6.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/npmlog/-/npmlog-6.0.2.tgz"; - sha512 = "/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg=="; - }; - }; - "nth-check-2.1.1" = { - name = "nth-check"; - packageName = "nth-check"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz"; - sha512 = "lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w=="; - }; - }; - "nub-0.0.0" = { - name = "nub"; - packageName = "nub"; - version = "0.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/nub/-/nub-0.0.0.tgz"; - sha512 = "dK0Ss9C34R/vV0FfYJXuqDAqHlaW9fvWVufq9MmGF2umCuDbd5GRfRD9fpi/LiM0l4ZXf8IBB+RYmZExqCrf0w=="; - }; - }; - "number-allocator-1.0.14" = { - name = "number-allocator"; - packageName = "number-allocator"; - version = "1.0.14"; - src = fetchurl { - url = "https://registry.npmjs.org/number-allocator/-/number-allocator-1.0.14.tgz"; - sha512 = "OrL44UTVAvkKdOdRQZIJpLkAdjXGTRda052sN4sO77bKEzYYqWKMBjQvrJFzqygI99gL6Z4u2xctPW1tB8ErvA=="; - }; - }; - "nunjucks-3.2.4" = { - name = "nunjucks"; - packageName = "nunjucks"; - version = "3.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/nunjucks/-/nunjucks-3.2.4.tgz"; - sha512 = "26XRV6BhkgK0VOxfbU5cQI+ICFUtMLixv1noZn1tGU38kQH5A5nmmbk/O45xdyBhD1esk47nKrY0mvQpZIhRjQ=="; - }; - }; - "oauth-1.0a-2.2.6" = { - name = "oauth-1.0a"; - packageName = "oauth-1.0a"; - version = "2.2.6"; - src = fetchurl { - url = "https://registry.npmjs.org/oauth-1.0a/-/oauth-1.0a-2.2.6.tgz"; - sha512 = "6bkxv3N4Gu5lty4viIcIAnq5GbxECviMBeKR3WX/q87SPQ8E8aursPZUtsXDnxCs787af09WPRBLqYrf/lwoYQ=="; - }; - }; - "object-assign-4.1.1" = { - name = "object-assign"; - packageName = "object-assign"; - version = "4.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz"; - sha512 = "rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg=="; - }; - }; - "object-hash-3.0.0" = { - name = "object-hash"; - packageName = "object-hash"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/object-hash/-/object-hash-3.0.0.tgz"; - sha512 = "RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw=="; - }; - }; - "object-inspect-1.12.3" = { - name = "object-inspect"; - packageName = "object-inspect"; - version = "1.12.3"; - src = fetchurl { - url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz"; - sha512 = "geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g=="; - }; - }; - "object-is-1.1.5" = { - name = "object-is"; - packageName = "object-is"; - version = "1.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz"; - sha512 = "3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw=="; - }; - }; - "object-keys-1.1.1" = { - name = "object-keys"; - packageName = "object-keys"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz"; - sha512 = "NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="; - }; - }; - "object-treeify-1.1.33" = { - name = "object-treeify"; - packageName = "object-treeify"; - version = "1.1.33"; - src = fetchurl { - url = "https://registry.npmjs.org/object-treeify/-/object-treeify-1.1.33.tgz"; - sha512 = "EFVjAYfzWqWsBMRHPMAXLCDIJnpMhdWAqR7xG6M6a2cs6PMFpl/+Z20w9zDW4vkxOFfddegBKq9Rehd0bxWE7A=="; - }; - }; - "object.assign-4.1.4" = { - name = "object.assign"; - packageName = "object.assign"; - version = "4.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz"; - sha512 = "1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ=="; - }; - }; - "object.getownpropertydescriptors-2.1.7" = { - name = "object.getownpropertydescriptors"; - packageName = "object.getownpropertydescriptors"; - version = "2.1.7"; - src = fetchurl { - url = "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.7.tgz"; - sha512 = "PrJz0C2xJ58FNn11XV2lr4Jt5Gzl94qpy9Lu0JlfEj14z88sqbSBJCBEzdlNUCzY2gburhbrwOZ5BHCmuNUy0g=="; - }; - }; - "on-finished-2.4.1" = { - name = "on-finished"; - packageName = "on-finished"; - version = "2.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz"; - sha512 = "oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg=="; - }; - }; - "on-headers-1.0.2" = { - name = "on-headers"; - packageName = "on-headers"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz"; - sha512 = "pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA=="; - }; - }; - "once-1.4.0" = { - name = "once"; - packageName = "once"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/once/-/once-1.4.0.tgz"; - sha512 = "lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w=="; - }; - }; - "one-time-1.0.0" = { - name = "one-time"; - packageName = "one-time"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/one-time/-/one-time-1.0.0.tgz"; - sha512 = "5DXOiRKwuSEcQ/l0kGCF6Q3jcADFv5tSmRaJck/OqkVFcOzutB134KRSfF0xDrL39MNnqxbHBbUUcjZIhTgb2g=="; - }; - }; - "onetime-5.1.2" = { - name = "onetime"; - packageName = "onetime"; - version = "5.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz"; - sha512 = "kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg=="; - }; - }; - "ono-7.1.3" = { - name = "ono"; - packageName = "ono"; - version = "7.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/ono/-/ono-7.1.3.tgz"; - sha512 = "9jnfVriq7uJM4o5ganUY54ntUm+5EK21EGaQ5NWnkWg3zz5ywbbonlBguRcnmF1/HDiIe3zxNxXcO1YPBmPcQQ=="; - }; - }; - "open-7.4.2" = { - name = "open"; - packageName = "open"; - version = "7.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/open/-/open-7.4.2.tgz"; - sha512 = "MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q=="; - }; - }; - "open-8.4.2" = { - name = "open"; - packageName = "open"; - version = "8.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/open/-/open-8.4.2.tgz"; - sha512 = "7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ=="; - }; - }; - "openapi-types-10.0.0" = { - name = "openapi-types"; - packageName = "openapi-types"; - version = "10.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/openapi-types/-/openapi-types-10.0.0.tgz"; - sha512 = "Y8xOCT2eiKGYDzMW9R4x5cmfc3vGaaI4EL2pwhDmodWw1HlK18YcZ4uJxc7Rdp7/gGzAygzH9SXr6GKYIXbRcQ=="; - }; - }; - "openurl-1.1.1" = { - name = "openurl"; - packageName = "openurl"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/openurl/-/openurl-1.1.1.tgz"; - sha512 = "d/gTkTb1i1GKz5k3XE3XFV/PxQ1k45zDqGP2OA7YhgsaLoqm6qRvARAZOFer1fcXritWlGBRCu/UgeS4HAnXAA=="; - }; - }; - "oracledb-5.5.0" = { - name = "oracledb"; - packageName = "oracledb"; - version = "5.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/oracledb/-/oracledb-5.5.0.tgz"; - sha512 = "i5cPvMENpZP8nnqptB6l0pjiOyySj1IISkbM4Hr3yZEDdANo2eezarwZb9NQ8fTh5pRjmgpZdSyIbnn9N3AENw=="; - }; - }; - "os-tmpdir-1.0.2" = { - name = "os-tmpdir"; - packageName = "os-tmpdir"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz"; - sha512 = "D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g=="; - }; - }; - "otpauth-9.1.5" = { - name = "otpauth"; - packageName = "otpauth"; - version = "9.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/otpauth/-/otpauth-9.1.5.tgz"; - sha512 = "mnic91MZxvj04Ir7FN8Xi6wF3FU8D+s6M5p6FQaSS91/csKswoOI9Dk7kKSnGFAoBYgGTTO+OWScV0nJuzrbPg=="; - }; - }; - "p-cancelable-2.1.1" = { - name = "p-cancelable"; - packageName = "p-cancelable"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.1.1.tgz"; - sha512 = "BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg=="; - }; - }; - "p-finally-1.0.0" = { - name = "p-finally"; - packageName = "p-finally"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz"; - sha512 = "LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow=="; - }; - }; - "p-lazy-3.1.0" = { - name = "p-lazy"; - packageName = "p-lazy"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-lazy/-/p-lazy-3.1.0.tgz"; - sha512 = "sCJn0Cdahs6G6SX9+DUihVFUhrzDEduzE5xeViVBGtoqy5dBWko7W8T6Kk6TjR2uevRXJO7CShfWrqdH5s3w3g=="; - }; - }; - "p-limit-3.1.0" = { - name = "p-limit"; - packageName = "p-limit"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz"; - sha512 = "TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ=="; - }; - }; - "p-map-2.1.0" = { - name = "p-map"; - packageName = "p-map"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz"; - sha512 = "y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw=="; - }; - }; - "p-map-4.0.0" = { - name = "p-map"; - packageName = "p-map"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz"; - sha512 = "/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ=="; - }; - }; - "p-queue-6.6.2" = { - name = "p-queue"; - packageName = "p-queue"; - version = "6.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/p-queue/-/p-queue-6.6.2.tgz"; - sha512 = "RwFpb72c/BhQLEXIZ5K2e+AhgNVmIejGlTgiB9MzZ0e93GRvqZ7uSi0dvRF7/XIXDeNkra2fNHBxTyPDGySpjQ=="; - }; - }; - "p-timeout-3.2.0" = { - name = "p-timeout"; - packageName = "p-timeout"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-timeout/-/p-timeout-3.2.0.tgz"; - sha512 = "rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg=="; - }; - }; - "packet-reader-1.0.0" = { - name = "packet-reader"; - packageName = "packet-reader"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/packet-reader/-/packet-reader-1.0.0.tgz"; - sha512 = "HAKu/fG3HpHFO0AA8WE8q2g+gBJaZ9MG7fcKk+IJPLTGAD6Psw4443l+9DGRbOIh3/aXr7Phy0TjilYivJo5XQ=="; - }; - }; - "pako-1.0.11" = { - name = "pako"; - packageName = "pako"; - version = "1.0.11"; - src = fetchurl { - url = "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz"; - sha512 = "4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw=="; - }; - }; - "param-case-3.0.4" = { - name = "param-case"; - packageName = "param-case"; - version = "3.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/param-case/-/param-case-3.0.4.tgz"; - sha512 = "RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A=="; - }; - }; - "parse-github-url-1.0.2" = { - name = "parse-github-url"; - packageName = "parse-github-url"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/parse-github-url/-/parse-github-url-1.0.2.tgz"; - sha512 = "kgBf6avCbO3Cn6+RnzRGLkUsv4ZVqv/VfAYkRsyBcgkshNvVBkRn1FEZcW0Jb+npXQWm2vHPnnOqFteZxRRGNw=="; - }; - }; - "parse-passwd-1.0.0" = { - name = "parse-passwd"; - packageName = "parse-passwd"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz"; - sha512 = "1Y1A//QUXEZK7YKz+rD9WydcE1+EuPr6ZBgKecAB8tmoW6UFv0NREVJe1p+jRxtThkcbbKkfwIbWJe/IeE6m2Q=="; - }; - }; - "parse5-5.1.1" = { - name = "parse5"; - packageName = "parse5"; - version = "5.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/parse5/-/parse5-5.1.1.tgz"; - sha512 = "ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug=="; - }; - }; - "parse5-6.0.1" = { - name = "parse5"; - packageName = "parse5"; - version = "6.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz"; - sha512 = "Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw=="; - }; - }; - "parse5-htmlparser2-tree-adapter-6.0.1" = { - name = "parse5-htmlparser2-tree-adapter"; - packageName = "parse5-htmlparser2-tree-adapter"; - version = "6.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz"; - sha512 = "qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA=="; - }; - }; - "parseley-0.12.1" = { - name = "parseley"; - packageName = "parseley"; - version = "0.12.1"; - src = fetchurl { - url = "https://registry.npmjs.org/parseley/-/parseley-0.12.1.tgz"; - sha512 = "e6qHKe3a9HWr0oMRVDTRhKce+bRO8VGQR3NyVwcjwrbhMmFCX9KszEV35+rn4AdilFAq9VPxP/Fe1wC9Qjd2lw=="; - }; - }; - "parseurl-1.3.3" = { - name = "parseurl"; - packageName = "parseurl"; - version = "1.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz"; - sha512 = "CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ=="; - }; - }; - "pascal-case-3.1.2" = { - name = "pascal-case"; - packageName = "pascal-case"; - version = "3.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/pascal-case/-/pascal-case-3.1.2.tgz"; - sha512 = "uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g=="; - }; - }; - "passport-0.6.0" = { - name = "passport"; - packageName = "passport"; - version = "0.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/passport/-/passport-0.6.0.tgz"; - sha512 = "0fe+p3ZnrWRW74fe8+SvCyf4a3Pb2/h7gFkQ8yTJpAO50gDzlfjZUZTO1k5Eg9kUct22OxHLqDZoKUWRHOh9ug=="; - }; - }; - "passport-cookie-1.0.9" = { - name = "passport-cookie"; - packageName = "passport-cookie"; - version = "1.0.9"; - src = fetchurl { - url = "https://registry.npmjs.org/passport-cookie/-/passport-cookie-1.0.9.tgz"; - sha512 = "8a6foX2bbGoJzup0RAiNcC2tTqzYS46RQEK3Z4u8p86wesPUjgDaji3C7+5j4TGyCq4ZoOV+3YLw1Hy6cV6kyw=="; - }; - }; - "passport-jwt-4.0.1" = { - name = "passport-jwt"; - packageName = "passport-jwt"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/passport-jwt/-/passport-jwt-4.0.1.tgz"; - sha512 = "UCKMDYhNuGOBE9/9Ycuoyh7vP6jpeTp/+sfMJl7nLff/t6dps+iaeE0hhNkKN8/HZHcJ7lCdOyDxHdDoxoSvdQ=="; - }; - }; - "passport-strategy-1.0.0" = { - name = "passport-strategy"; - packageName = "passport-strategy"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/passport-strategy/-/passport-strategy-1.0.0.tgz"; - sha512 = "CB97UUvDKJde2V0KDWWB3lyf6PC3FaZP7YxZ2G8OAtn9p4HI9j9JLP9qjOGZFvyl8uwNT8qM+hGnz/n16NI7oA=="; - }; - }; - "password-prompt-1.1.3" = { - name = "password-prompt"; - packageName = "password-prompt"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/password-prompt/-/password-prompt-1.1.3.tgz"; - sha512 = "HkrjG2aJlvF0t2BMH0e2LB/EHf3Lcq3fNMzy4GYHcQblAvOl+QQji1Lx7WRBMqpVK8p+KR7bCg7oqAMXtdgqyw=="; - }; - }; - "path-case-3.0.4" = { - name = "path-case"; - packageName = "path-case"; - version = "3.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/path-case/-/path-case-3.0.4.tgz"; - sha512 = "qO4qCFjXqVTrcbPt/hQfhTQ+VhFsqNKOPtytgNKkKxSoEp3XPUQ8ObFuePylOIok5gjn69ry8XiULxCwot3Wfg=="; - }; - }; - "path-is-absolute-1.0.1" = { - name = "path-is-absolute"; - packageName = "path-is-absolute"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; - sha512 = "AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg=="; - }; - }; - "path-key-3.1.1" = { - name = "path-key"; - packageName = "path-key"; - version = "3.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz"; - sha512 = "ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="; - }; - }; - "path-parse-1.0.7" = { - name = "path-parse"; - packageName = "path-parse"; - version = "1.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz"; - sha512 = "LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="; - }; - }; - "path-scurry-1.10.1" = { - name = "path-scurry"; - packageName = "path-scurry"; - version = "1.10.1"; - src = fetchurl { - url = "https://registry.npmjs.org/path-scurry/-/path-scurry-1.10.1.tgz"; - sha512 = "MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ=="; - }; - }; - "path-to-regexp-0.1.7" = { - name = "path-to-regexp"; - packageName = "path-to-regexp"; - version = "0.1.7"; - src = fetchurl { - url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz"; - sha512 = "5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ=="; - }; - }; - "path-to-regexp-6.2.1" = { - name = "path-to-regexp"; - packageName = "path-to-regexp"; - version = "6.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.2.1.tgz"; - sha512 = "JLyh7xT1kizaEvcaXOQwOc2/Yhw6KZOvPf1S8401UyLk86CU79LN3vl7ztXGm/pZ+YjoyAJ4rxmHwbkBXJX+yw=="; - }; - }; - "path-type-4.0.0" = { - name = "path-type"; - packageName = "path-type"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz"; - sha512 = "gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw=="; - }; - }; - "pause-0.0.1" = { - name = "pause"; - packageName = "pause"; - version = "0.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/pause/-/pause-0.0.1.tgz"; - sha512 = "KG8UEiEVkR3wGEb4m5yZkVCzigAD+cVEJck2CzYZO37ZGJfctvVptVO192MwrtPhzONn6go8ylnOdMhKqi4nfg=="; - }; - }; - "pdfjs-dist-2.16.105" = { - name = "pdfjs-dist"; - packageName = "pdfjs-dist"; - version = "2.16.105"; - src = fetchurl { - url = "https://registry.npmjs.org/pdfjs-dist/-/pdfjs-dist-2.16.105.tgz"; - sha512 = "J4dn41spsAwUxCpEoVf6GVoz908IAA3mYiLmNxg8J9kfRXc2jxpbUepcP0ocp0alVNLFthTAM8DZ1RaHh8sU0A=="; - }; - }; - "peberminta-0.9.0" = { - name = "peberminta"; - packageName = "peberminta"; - version = "0.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/peberminta/-/peberminta-0.9.0.tgz"; - sha512 = "XIxfHpEuSJbITd1H3EeQwpcZbTLHc+VVr8ANI9t5sit565tsI4/xK3KWTUFE2e6QiangUkh3B0jihzmGnNrRsQ=="; - }; - }; - "peek-readable-4.1.0" = { - name = "peek-readable"; - packageName = "peek-readable"; - version = "4.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/peek-readable/-/peek-readable-4.1.0.tgz"; - sha512 = "ZI3LnwUv5nOGbQzD9c2iDG6toheuXSZP5esSHBjopsXH4dg19soufvpUGA3uohi5anFtGb2lhAVdHzH6R/Evvg=="; - }; - }; - "pg-8.11.3" = { - name = "pg"; - packageName = "pg"; - version = "8.11.3"; - src = fetchurl { - url = "https://registry.npmjs.org/pg/-/pg-8.11.3.tgz"; - sha512 = "+9iuvG8QfaaUrrph+kpF24cXkH1YOOUeArRNYIxq1viYHZagBxrTno7cecY1Fa44tJeZvaoG+Djpkc3JwehN5g=="; - }; - }; - "pg-8.8.0" = { - name = "pg"; - packageName = "pg"; - version = "8.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pg/-/pg-8.8.0.tgz"; - sha512 = "UXYN0ziKj+AeNNP7VDMwrehpACThH7LUl/p8TDFpEUuSejCUIwGSfxpHsPvtM6/WXFy6SU4E5RG4IJV/TZAGjw=="; - }; - }; - "pg-connection-string-2.6.2" = { - name = "pg-connection-string"; - packageName = "pg-connection-string"; - version = "2.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.6.2.tgz"; - sha512 = "ch6OwaeaPYcova4kKZ15sbJ2hKb/VP48ZD2gE7i1J+L4MspCtBMAx8nMgz7bksc7IojCIIWuEhHibSMFH8m8oA=="; - }; - }; - "pg-cursor-2.10.3" = { - name = "pg-cursor"; - packageName = "pg-cursor"; - version = "2.10.3"; - src = fetchurl { - url = "https://registry.npmjs.org/pg-cursor/-/pg-cursor-2.10.3.tgz"; - sha512 = "rDyBVoqPVnx/PTmnwQAYgusSeAKlTL++gmpf5klVK+mYMFEqsOc6VHHZnPKc/4lOvr4r6fiMuoxSFuBF1dx4FQ=="; - }; - }; - "pg-int8-1.0.1" = { - name = "pg-int8"; - packageName = "pg-int8"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/pg-int8/-/pg-int8-1.0.1.tgz"; - sha512 = "WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw=="; - }; - }; - "pg-minify-1.6.2" = { - name = "pg-minify"; - packageName = "pg-minify"; - version = "1.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/pg-minify/-/pg-minify-1.6.2.tgz"; - sha512 = "1KdmFGGTP6jplJoI8MfvRlfvMiyBivMRP7/ffh4a11RUFJ7kC2J0ZHlipoKiH/1hz+DVgceon9U2qbaHpPeyPg=="; - }; - }; - "pg-native-3.0.1" = { - name = "pg-native"; - packageName = "pg-native"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/pg-native/-/pg-native-3.0.1.tgz"; - sha512 = "LBVNWkNh0fVx/cienARRP2y22J5OpUsKBe0TpxzAx3arEUUdIs77aLSAHS3scS7SMaqc+OkG40CEu5fN0/cjIw=="; - }; - }; - "pg-pool-3.6.1" = { - name = "pg-pool"; - packageName = "pg-pool"; - version = "3.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/pg-pool/-/pg-pool-3.6.1.tgz"; - sha512 = "jizsIzhkIitxCGfPRzJn1ZdcosIt3pz9Sh3V01fm1vZnbnCMgmGl5wvGGdNN2EL9Rmb0EcFoCkixH4Pu+sP9Og=="; - }; - }; - "pg-promise-10.15.4" = { - name = "pg-promise"; - packageName = "pg-promise"; - version = "10.15.4"; - src = fetchurl { - url = "https://registry.npmjs.org/pg-promise/-/pg-promise-10.15.4.tgz"; - sha512 = "BKlHCMCdNUmF6gagVbehRWSEiVcZzPVltEx14OJExR9Iz9/1R6KETDWLLGv2l6yRqYFnEZZy1VDjRhArzeIGrw=="; - }; - }; - "pg-protocol-1.6.0" = { - name = "pg-protocol"; - packageName = "pg-protocol"; - version = "1.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.6.0.tgz"; - sha512 = "M+PDm637OY5WM307051+bsDia5Xej6d9IR4GwJse1qA1DIhiKlksvrneZOYQq42OM+spubpcNYEo2FcKQrDk+Q=="; - }; - }; - "pg-query-stream-4.5.3" = { - name = "pg-query-stream"; - packageName = "pg-query-stream"; - version = "4.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/pg-query-stream/-/pg-query-stream-4.5.3.tgz"; - sha512 = "ufa94r/lHJdjAm3+zPZEO0gXAmCb4tZPaOt7O76mjcxdL/HxwTuryy76km+u0odBBgtfdKFYq/9XGfiYeQF0yA=="; - }; - }; - "pg-types-1.13.0" = { - name = "pg-types"; - packageName = "pg-types"; - version = "1.13.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pg-types/-/pg-types-1.13.0.tgz"; - sha512 = "lfKli0Gkl/+za/+b6lzENajczwZHc7D5kiUCZfgm914jipD2kIOIvEkAhZ8GrW3/TUoP9w8FHjwpPObBye5KQQ=="; - }; - }; - "pg-types-2.2.0" = { - name = "pg-types"; - packageName = "pg-types"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pg-types/-/pg-types-2.2.0.tgz"; - sha512 = "qTAAlrEsl8s4OiEQY69wDvcMIdQN6wdz5ojQiOy6YRMuynxenON0O5oCpJI6lshc6scgAY8qvJ2On/p+CXY0GA=="; - }; - }; - "pgpass-1.0.5" = { - name = "pgpass"; - packageName = "pgpass"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/pgpass/-/pgpass-1.0.5.tgz"; - sha512 = "FdW9r/jQZhSeohs1Z3sI1yxFQNFvMcnmfuj4WBMUTxOrAyLMaTcE1aAMBiTlbMNaXvBCQuVi0R7hd8udDSP7ug=="; - }; - }; - "picocolors-1.0.0" = { - name = "picocolors"; - packageName = "picocolors"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz"; - sha512 = "1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="; - }; - }; - "picomatch-2.3.1" = { - name = "picomatch"; - packageName = "picomatch"; - version = "2.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz"; - sha512 = "JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="; - }; - }; - "pkce-challenge-3.1.0" = { - name = "pkce-challenge"; - packageName = "pkce-challenge"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pkce-challenge/-/pkce-challenge-3.1.0.tgz"; - sha512 = "bQ/0XPZZ7eX+cdAkd61uYWpfMhakH3NeteUF1R8GNa+LMqX8QFAkbCLqq+AYAns1/ueACBu/BMWhrlKGrdvGZg=="; - }; - }; - "postgres-array-1.0.3" = { - name = "postgres-array"; - packageName = "postgres-array"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/postgres-array/-/postgres-array-1.0.3.tgz"; - sha512 = "5wClXrAP0+78mcsNX3/ithQ5exKvCyK5lr5NEEEeGwwM6NJdQgzIJBVxLvRW+huFpX92F2QnZ5CcokH0VhK2qQ=="; - }; - }; - "postgres-array-2.0.0" = { - name = "postgres-array"; - packageName = "postgres-array"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postgres-array/-/postgres-array-2.0.0.tgz"; - sha512 = "VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA=="; - }; - }; - "postgres-bytea-1.0.0" = { - name = "postgres-bytea"; - packageName = "postgres-bytea"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postgres-bytea/-/postgres-bytea-1.0.0.tgz"; - sha512 = "xy3pmLuQqRBZBXDULy7KbaitYqLcmxigw14Q5sj8QBVLqEwXfeybIKVWiqAXTlcvdvb0+xkOtDbfQMOf4lST1w=="; - }; - }; - "postgres-date-1.0.7" = { - name = "postgres-date"; - packageName = "postgres-date"; - version = "1.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/postgres-date/-/postgres-date-1.0.7.tgz"; - sha512 = "suDmjLVQg78nMK2UZ454hAG+OAW+HQPZ6n++TNDUX+L0+uUlLywnoxJKDou51Zm+zTCjrCl0Nq6J9C5hP9vK/Q=="; - }; - }; - "postgres-interval-1.2.0" = { - name = "postgres-interval"; - packageName = "postgres-interval"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postgres-interval/-/postgres-interval-1.2.0.tgz"; - sha512 = "9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ=="; - }; - }; - "posthog-node-2.6.0" = { - name = "posthog-node"; - packageName = "posthog-node"; - version = "2.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/posthog-node/-/posthog-node-2.6.0.tgz"; - sha512 = "/BiFw/jwdP0uJSRAIoYqLoBTjZ612xv74b1L/a3T/p1nJVL8e0OrHuxbJW56c6WVW/IKm9gBF/zhbqfaz0XgJQ=="; - }; - }; - "prebuild-install-7.1.1" = { - name = "prebuild-install"; - packageName = "prebuild-install"; - version = "7.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.1.tgz"; - sha512 = "jAXscXWMcCK8GgCoHOfIr0ODh5ai8mj63L2nWrjuAgXE6tDyYGnx4/8o/rCgU+B4JSyZBKbeZqzhtwtC3ovxjw=="; - }; - }; - "pretty-bytes-5.6.0" = { - name = "pretty-bytes"; - packageName = "pretty-bytes"; - version = "5.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.6.0.tgz"; - sha512 = "FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg=="; - }; - }; - "process-0.11.10" = { - name = "process"; - packageName = "process"; - version = "0.11.10"; - src = fetchurl { - url = "https://registry.npmjs.org/process/-/process-0.11.10.tgz"; - sha512 = "cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A=="; - }; - }; - "process-nextick-args-2.0.1" = { - name = "process-nextick-args"; - packageName = "process-nextick-args"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz"; - sha512 = "3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="; - }; - }; - "prom-client-13.2.0" = { - name = "prom-client"; - packageName = "prom-client"; - version = "13.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/prom-client/-/prom-client-13.2.0.tgz"; - sha512 = "wGr5mlNNdRNzEhRYXgboUU2LxHWIojxscJKmtG3R8f4/KiWqyYgXTLHs0+Ted7tG3zFT7pgHJbtomzZ1L0ARaQ=="; - }; - }; - "promise-1.3.0" = { - name = "promise"; - packageName = "promise"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/promise/-/promise-1.3.0.tgz"; - sha512 = "R9WrbTF3EPkVtWjp7B7umQGVndpsi+rsDAfrR4xAALQpFLa/+2OriecLhawxzvii2gd9+DZFwROWDuUUaqS5yA=="; - }; - }; - "promise-ftp-1.3.5" = { - name = "promise-ftp"; - packageName = "promise-ftp"; - version = "1.3.5"; - src = fetchurl { - url = "https://registry.npmjs.org/promise-ftp/-/promise-ftp-1.3.5.tgz"; - sha512 = "v368jPSqzmjjKDIyggulC+dRFcpAOEX7aFdEWkFYQp8Ao3P2N4Y6XnFFdKgK7PtkylwvGQkZR/65HZuzmq0V7A=="; - }; - }; - "promise-ftp-common-1.1.5" = { - name = "promise-ftp-common"; - packageName = "promise-ftp-common"; - version = "1.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/promise-ftp-common/-/promise-ftp-common-1.1.5.tgz"; - sha512 = "a84F/zM2Z0Ry/ht3nXfV6Ze7BISOQlWrct/YObrluJn8qy2LVeeQ+IJ7jD4bkmM0N2xfXYy5nurz4L1KEj+rJg=="; - }; - }; - "promise-inflight-1.0.1" = { - name = "promise-inflight"; - packageName = "promise-inflight"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz"; - sha512 = "6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g=="; - }; - }; - "promise-retry-2.0.1" = { - name = "promise-retry"; - packageName = "promise-retry"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz"; - sha512 = "y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g=="; - }; - }; - "promise.prototype.finally-3.1.7" = { - name = "promise.prototype.finally"; - packageName = "promise.prototype.finally"; - version = "3.1.7"; - src = fetchurl { - url = "https://registry.npmjs.org/promise.prototype.finally/-/promise.prototype.finally-3.1.7.tgz"; - sha512 = "iL9OcJRUZcCE5xn6IwhZxO+eMM0VEXjkETHy+Nk+d9q3s7kxVtPg+mBlMO+ZGxNKNMODyKmy/bOyt/yhxTnvEw=="; - }; - }; - "property-expr-2.0.5" = { - name = "property-expr"; - packageName = "property-expr"; - version = "2.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/property-expr/-/property-expr-2.0.5.tgz"; - sha512 = "IJUkICM5dP5znhCckHSv30Q4b5/JA5enCtkRHYaOVOAocnH/1BQEYTC5NMfT3AVl/iXKdr3aqQbQn9DxyWknwA=="; - }; - }; - "proto3-json-serializer-0.1.9" = { - name = "proto3-json-serializer"; - packageName = "proto3-json-serializer"; - version = "0.1.9"; - src = fetchurl { - url = "https://registry.npmjs.org/proto3-json-serializer/-/proto3-json-serializer-0.1.9.tgz"; - sha512 = "A60IisqvnuI45qNRygJjrnNjX2TMdQGMY+57tR3nul3ZgO2zXkR9OGR8AXxJhkqx84g0FTnrfi3D5fWMSdANdQ=="; - }; - }; - "protobufjs-6.11.3" = { - name = "protobufjs"; - packageName = "protobufjs"; - version = "6.11.3"; - src = fetchurl { - url = "https://registry.npmjs.org/protobufjs/-/protobufjs-6.11.3.tgz"; - sha512 = "xL96WDdCZYdU7Slin569tFX712BxsxslWwAfAhCYjQKGTq7dAU91Lomy6nLLhh/dyGhk/YH4TwTSRxTzhuHyZg=="; - }; - }; - "protobufjs-6.11.4" = { - name = "protobufjs"; - packageName = "protobufjs"; - version = "6.11.4"; - src = fetchurl { - url = "https://registry.npmjs.org/protobufjs/-/protobufjs-6.11.4.tgz"; - sha512 = "5kQWPaJHi1WoCpjTGszzQ32PG2F4+wRY6BmAT4Vfw56Q2FZ4YZzK20xUYQH4YkfehY1e6QSICrJquM6xXZNcrw=="; - }; - }; - "protobufjs-7.2.5" = { - name = "protobufjs"; - packageName = "protobufjs"; - version = "7.2.5"; - src = fetchurl { - url = "https://registry.npmjs.org/protobufjs/-/protobufjs-7.2.5.tgz"; - sha512 = "gGXRSXvxQ7UiPgfw8gevrfRWcTlSbOFg+p/N+JVJEK5VhueL2miT6qTymqAmjr1Q5WbOCyJbyrk6JfWKwlFn6A=="; - }; - }; - "proxy-addr-2.0.7" = { - name = "proxy-addr"; - packageName = "proxy-addr"; - version = "2.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz"; - sha512 = "llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg=="; - }; - }; - "proxy-from-env-1.1.0" = { - name = "proxy-from-env"; - packageName = "proxy-from-env"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz"; - sha512 = "D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg=="; - }; - }; - "pseudomap-1.0.2" = { - name = "pseudomap"; - packageName = "pseudomap"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz"; - sha512 = "b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ=="; - }; - }; - "psl-1.9.0" = { - name = "psl"; - packageName = "psl"; - version = "1.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz"; - sha512 = "E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag=="; - }; - }; - "pump-2.0.1" = { - name = "pump"; - packageName = "pump"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz"; - sha512 = "ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA=="; - }; - }; - "pump-3.0.0" = { - name = "pump"; - packageName = "pump"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz"; - sha512 = "LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww=="; - }; - }; - "pumpify-1.5.1" = { - name = "pumpify"; - packageName = "pumpify"; - version = "1.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz"; - sha512 = "oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ=="; - }; - }; - "punycode-2.3.0" = { - name = "punycode"; - packageName = "punycode"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz"; - sha512 = "rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA=="; - }; - }; - "pyodide-0.23.4" = { - name = "pyodide"; - packageName = "pyodide"; - version = "0.23.4"; - src = fetchurl { - url = "https://registry.npmjs.org/pyodide/-/pyodide-0.23.4.tgz"; - sha512 = "WpQUHaIXQ1xede5BMqPAjBcmopxN22s5hEsYOR8T7/UW/fkNLFUn07SaemUgthbtvedD5JGymMMj4VpD9sGMTg=="; - }; - }; - "python-struct-1.1.3" = { - name = "python-struct"; - packageName = "python-struct"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/python-struct/-/python-struct-1.1.3.tgz"; - sha512 = "UsI/mNvk25jRpGKYI38Nfbv84z48oiIWwG67DLVvjRhy8B/0aIK+5Ju5WOHgw/o9rnEmbAS00v4rgKFQeC332Q=="; - }; - }; - "qs-6.11.0" = { - name = "qs"; - packageName = "qs"; - version = "6.11.0"; - src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz"; - sha512 = "MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q=="; - }; - }; - "query-string-7.1.3" = { - name = "query-string"; - packageName = "query-string"; - version = "7.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/query-string/-/query-string-7.1.3.tgz"; - sha512 = "hh2WYhq4fi8+b+/2Kg9CEge4fDPvHS534aOOvOZeQ3+Vf2mCFsaFBYj0i+iXcAq6I9Vzp5fjMFBlONvayDC1qg=="; - }; - }; - "querystringify-2.2.0" = { - name = "querystringify"; - packageName = "querystringify"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz"; - sha512 = "FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ=="; - }; - }; - "queue-microtask-1.2.3" = { - name = "queue-microtask"; - packageName = "queue-microtask"; - version = "1.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz"; - sha512 = "NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A=="; - }; - }; - "quoted-printable-1.0.1" = { - name = "quoted-printable"; - packageName = "quoted-printable"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/quoted-printable/-/quoted-printable-1.0.1.tgz"; - sha512 = "cihC68OcGiQOjGiXuo5Jk6XHANTHl1K4JLk/xlEJRTIXfy19Sg6XzB95XonYgr+1rB88bCpr7WZE7D7AlZow4g=="; - }; - }; - "random-bytes-1.0.0" = { - name = "random-bytes"; - packageName = "random-bytes"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/random-bytes/-/random-bytes-1.0.0.tgz"; - sha512 = "iv7LhNVO047HzYR3InF6pUcUsPQiHTM1Qal51DcGSuZFBil1aBBWG5eHPNek7bvILMaYJ/8RU1e8w1AMdHmLQQ=="; - }; - }; - "randombytes-2.1.0" = { - name = "randombytes"; - packageName = "randombytes"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz"; - sha512 = "vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ=="; - }; - }; - "range-parser-1.2.1" = { - name = "range-parser"; - packageName = "range-parser"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz"; - sha512 = "Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="; - }; - }; - "raw-body-2.5.1" = { - name = "raw-body"; - packageName = "raw-body"; - version = "2.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz"; - sha512 = "qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig=="; - }; - }; - "raw-body-2.5.2" = { - name = "raw-body"; - packageName = "raw-body"; - version = "2.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz"; - sha512 = "8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA=="; - }; - }; - "rc-1.2.8" = { - name = "rc"; - packageName = "rc"; - version = "1.2.8"; - src = fetchurl { - url = "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz"; - sha512 = "y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw=="; - }; - }; - "readable-stream-1.0.31" = { - name = "readable-stream"; - packageName = "readable-stream"; - version = "1.0.31"; - src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.31.tgz"; - sha512 = "tco/Dwv1f/sgIgN6CWdj/restacPKNskK6yps1981ivH2ZmLYcs5o5rVzL3qaO/cSkhN8hYOMWs7+glzOLSgRg=="; - }; - }; - "readable-stream-1.1.14" = { - name = "readable-stream"; - packageName = "readable-stream"; - version = "1.1.14"; - src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz"; - sha512 = "+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ=="; - }; - }; - "readable-stream-2.3.8" = { - name = "readable-stream"; - packageName = "readable-stream"; - version = "2.3.8"; - src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz"; - sha512 = "8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA=="; - }; - }; - "readable-stream-3.6.2" = { - name = "readable-stream"; - packageName = "readable-stream"; - version = "3.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz"; - sha512 = "9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA=="; - }; - }; - "readable-stream-4.4.2" = { - name = "readable-stream"; - packageName = "readable-stream"; - version = "4.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-4.4.2.tgz"; - sha512 = "Lk/fICSyIhodxy1IDK2HazkeGjSmezAWX2egdtJnYhtzKEsBPJowlI6F6LPb5tqIQILrMbx22S5o3GuJavPusA=="; - }; - }; - "readable-web-to-node-stream-3.0.2" = { - name = "readable-web-to-node-stream"; - packageName = "readable-web-to-node-stream"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/readable-web-to-node-stream/-/readable-web-to-node-stream-3.0.2.tgz"; - sha512 = "ePeK6cc1EcKLEhJFt/AebMCLL+GgSKhuygrZ/GLaKZYEecIgIECf4UaUuaByiGtzckwR4ain9VzUh95T1exYGw=="; - }; - }; - "readdirp-3.6.0" = { - name = "readdirp"; - packageName = "readdirp"; - version = "3.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz"; - sha512 = "hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA=="; - }; - }; - "recast-0.21.5" = { - name = "recast"; - packageName = "recast"; - version = "0.21.5"; - src = fetchurl { - url = "https://registry.npmjs.org/recast/-/recast-0.21.5.tgz"; - sha512 = "hjMmLaUXAm1hIuTqOdeYObMslq/q+Xff6QE3Y2P+uoHAg2nmVlLBps2hzh1UJDdMtDTMXOFewK6ky51JQIeECg=="; - }; - }; - "recast-0.22.0" = { - name = "recast"; - packageName = "recast"; - version = "0.22.0"; - src = fetchurl { - url = "https://registry.npmjs.org/recast/-/recast-0.22.0.tgz"; - sha512 = "5AAx+mujtXijsEavc5lWXBPQqrM4+Dl5qNH96N2aNeuJFUzpiiToKPsxQD/zAIJHspz7zz0maX0PCtCTFVlixQ=="; - }; - }; - "rechoir-0.6.2" = { - name = "rechoir"; - packageName = "rechoir"; - version = "0.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz"; - sha512 = "HFM8rkZ+i3zrV+4LQjwQ0W+ez98pApMGM3HUrN04j3CqzPOzl9nmP15Y8YXNm8QHGv/eacOVEjqhmWpkRV0NAw=="; - }; - }; - "redeyed-2.1.1" = { - name = "redeyed"; - packageName = "redeyed"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/redeyed/-/redeyed-2.1.1.tgz"; - sha512 = "FNpGGo1DycYAdnrKFxCMmKYgo/mILAqtRYbkdQD8Ep/Hk2PQ5+aEAEx+IU713RTDmuBaH0c8P5ZozurNu5ObRQ=="; - }; - }; - "redis-3.1.2" = { - name = "redis"; - packageName = "redis"; - version = "3.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/redis/-/redis-3.1.2.tgz"; - sha512 = "grn5KoZLr/qrRQVwoSkmzdbw6pwF+/rwODtrOr6vuBRiR/f3rjSTGupbF90Zpqm2oenix8Do6RV7pYEkGwlKkw=="; - }; - }; - "redis-4.6.10" = { - name = "redis"; - packageName = "redis"; - version = "4.6.10"; - src = fetchurl { - url = "https://registry.npmjs.org/redis/-/redis-4.6.10.tgz"; - sha512 = "mmbyhuKgDiJ5TWUhiKhBssz+mjsuSI/lSZNPI9QvZOYzWvYGejtb+W3RlDDf8LD6Bdl5/mZeG8O1feUGhXTxEg=="; - }; - }; - "redis-commands-1.7.0" = { - name = "redis-commands"; - packageName = "redis-commands"; - version = "1.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/redis-commands/-/redis-commands-1.7.0.tgz"; - sha512 = "nJWqw3bTFy21hX/CPKHth6sfhZbdiHP6bTawSgQBlKOVRG7EZkfHbbHwQJnrE4vsQf0CMNE+3gJ4Fmm16vdVlQ=="; - }; - }; - "redis-errors-1.2.0" = { - name = "redis-errors"; - packageName = "redis-errors"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/redis-errors/-/redis-errors-1.2.0.tgz"; - sha512 = "1qny3OExCf0UvUV/5wpYKf2YwPcOqXzkwKKSmKHiE6ZMQs5heeE/c8eXK+PNllPvmjgAbfnsbpkGZWy8cBpn9w=="; - }; - }; - "redis-parser-3.0.0" = { - name = "redis-parser"; - packageName = "redis-parser"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/redis-parser/-/redis-parser-3.0.0.tgz"; - sha512 = "DJnGAeenTdpMEH6uAJRK/uiyEIH9WVsUmoLwzudwGJUwZPp80PDBWPHXSAGNPwNvIXAbe7MSUB1zQFugFml66A=="; - }; - }; - "reflect-metadata-0.1.13" = { - name = "reflect-metadata"; - packageName = "reflect-metadata"; - version = "0.1.13"; - src = fetchurl { - url = "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.1.13.tgz"; - sha512 = "Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg=="; - }; - }; - "regenerator-runtime-0.13.11" = { - name = "regenerator-runtime"; - packageName = "regenerator-runtime"; - version = "0.13.11"; - src = fetchurl { - url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz"; - sha512 = "kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg=="; - }; - }; - "regenerator-runtime-0.14.0" = { - name = "regenerator-runtime"; - packageName = "regenerator-runtime"; - version = "0.14.0"; - src = fetchurl { - url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.0.tgz"; - sha512 = "srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA=="; - }; - }; - "regexp.prototype.flags-1.5.1" = { - name = "regexp.prototype.flags"; - packageName = "regexp.prototype.flags"; - version = "1.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.1.tgz"; - sha512 = "sy6TXMN+hnP/wMy+ISxg3krXx7BAtWVO4UouuCN/ziM9UEne0euamVNafDfvC83bRNr95y0V5iijeDQFUNpvrg=="; - }; - }; - "reinterval-1.1.0" = { - name = "reinterval"; - packageName = "reinterval"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/reinterval/-/reinterval-1.1.0.tgz"; - sha512 = "QIRet3SYrGp0HUHO88jVskiG6seqUGC5iAG7AwI/BV4ypGcuqk9Du6YQBUOUqm9c8pw1eyLoIaONifRua1lsEQ=="; - }; - }; - "remove-trailing-slash-0.1.1" = { - name = "remove-trailing-slash"; - packageName = "remove-trailing-slash"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/remove-trailing-slash/-/remove-trailing-slash-0.1.1.tgz"; - sha512 = "o4S4Qh6L2jpnCy83ysZDau+VORNvnFw07CKSAymkd6ICNVEPisMyzlc00KlvvicsxKck94SEwhDnMNdICzO+tA=="; - }; - }; - "replacestream-4.0.3" = { - name = "replacestream"; - packageName = "replacestream"; - version = "4.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/replacestream/-/replacestream-4.0.3.tgz"; - sha512 = "AC0FiLS352pBBiZhd4VXB1Ab/lh0lEgpP+GGvZqbQh8a5cmXVoTe5EX/YeTFArnp4SRGTHh1qCHu9lGs1qG8sA=="; - }; - }; - "require-directory-2.1.1" = { - name = "require-directory"; - packageName = "require-directory"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz"; - sha512 = "fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q=="; - }; - }; - "requires-port-1.0.0" = { - name = "requires-port"; - packageName = "requires-port"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz"; - sha512 = "KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ=="; - }; - }; - "resolve-1.22.8" = { - name = "resolve"; - packageName = "resolve"; - version = "1.22.8"; - src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz"; - sha512 = "oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw=="; - }; - }; - "restore-cursor-3.1.0" = { - name = "restore-cursor"; - packageName = "restore-cursor"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz"; - sha512 = "l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA=="; - }; - }; - "retry-0.12.0" = { - name = "retry"; - packageName = "retry"; - version = "0.12.0"; - src = fetchurl { - url = "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz"; - sha512 = "9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow=="; - }; - }; - "retry-0.13.1" = { - name = "retry"; - packageName = "retry"; - version = "0.13.1"; - src = fetchurl { - url = "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz"; - sha512 = "XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg=="; - }; - }; - "retry-request-4.2.2" = { - name = "retry-request"; - packageName = "retry-request"; - version = "4.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/retry-request/-/retry-request-4.2.2.tgz"; - sha512 = "xA93uxUD/rogV7BV59agW/JHPGXeREMWiZc9jhcwY4YdZ7QOtC7qbomYg0n4wyk2lJhggjvKvhNX8wln/Aldhg=="; - }; - }; - "retry-request-5.0.2" = { - name = "retry-request"; - packageName = "retry-request"; - version = "5.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/retry-request/-/retry-request-5.0.2.tgz"; - sha512 = "wfI3pk7EE80lCIXprqh7ym48IHYdwmAAzESdbU8Q9l7pnRCk9LEhpbOTNKjz6FARLm/Bl5m+4F0ABxOkYUujSQ=="; - }; - }; - "reusify-1.0.4" = { - name = "reusify"; - packageName = "reusify"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz"; - sha512 = "U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw=="; - }; - }; - "rfc2047-4.0.1" = { - name = "rfc2047"; - packageName = "rfc2047"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/rfc2047/-/rfc2047-4.0.1.tgz"; - sha512 = "x5zHBAZtSSZDuBNAqGEAVpsQFV+YUluIkMWVaYRMEeGoLPxNVMmg67TxRnXwmRmCB7QaneyrkWXeKqbjfcK6RA=="; - }; - }; - "rfdc-1.3.0" = { - name = "rfdc"; - packageName = "rfdc"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/rfdc/-/rfdc-1.3.0.tgz"; - sha512 = "V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA=="; - }; - }; - "rhea-1.0.24" = { - name = "rhea"; - packageName = "rhea"; - version = "1.0.24"; - src = fetchurl { - url = "https://registry.npmjs.org/rhea/-/rhea-1.0.24.tgz"; - sha512 = "PEl62U2EhxCO5wMUZ2/bCBcXAVKN9AdMSNQOrp3+R5b77TEaOSiy16MQ0sIOmzj/iqsgIAgPs1mt3FYfu1vIXA=="; - }; - }; - "rimraf-3.0.2" = { - name = "rimraf"; - packageName = "rimraf"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz"; - sha512 = "JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA=="; - }; - }; - "rndm-1.2.0" = { - name = "rndm"; - packageName = "rndm"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/rndm/-/rndm-1.2.0.tgz"; - sha512 = "fJhQQI5tLrQvYIYFpOnFinzv9dwmR7hRnUz1XqP3OJ1jIweTNOd6aTO4jwQSgcBSFUB+/KHJxuGneime+FdzOw=="; - }; - }; - "rss-parser-3.13.0" = { - name = "rss-parser"; - packageName = "rss-parser"; - version = "3.13.0"; - src = fetchurl { - url = "https://registry.npmjs.org/rss-parser/-/rss-parser-3.13.0.tgz"; - sha512 = "7jWUBV5yGN3rqMMj7CZufl/291QAhvrrGpDNE4k/02ZchL0npisiYYqULF71jCEKoIiHvK/Q2e6IkDwPziT7+w=="; - }; - }; - "run-async-2.4.1" = { - name = "run-async"; - packageName = "run-async"; - version = "2.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz"; - sha512 = "tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ=="; - }; - }; - "run-parallel-1.2.0" = { - name = "run-parallel"; - packageName = "run-parallel"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz"; - sha512 = "5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA=="; - }; - }; - "rxjs-6.6.7" = { - name = "rxjs"; - packageName = "rxjs"; - version = "6.6.7"; - src = fetchurl { - url = "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz"; - sha512 = "hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ=="; - }; - }; - "safe-array-concat-1.0.1" = { - name = "safe-array-concat"; - packageName = "safe-array-concat"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.0.1.tgz"; - sha512 = "6XbUAseYE2KtOuGueyeobCySj9L4+66Tn6KQMOPQJrAJEowYKW/YR/MGJZl7FdydUdaFu4LYyDZjxf4/Nmo23Q=="; - }; - }; - "safe-buffer-5.1.2" = { - name = "safe-buffer"; - packageName = "safe-buffer"; - version = "5.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz"; - sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="; - }; - }; - "safe-buffer-5.2.1" = { - name = "safe-buffer"; - packageName = "safe-buffer"; - version = "5.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz"; - sha512 = "rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="; - }; - }; - "safe-regex-test-1.0.0" = { - name = "safe-regex-test"; - packageName = "safe-regex-test"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz"; - sha512 = "JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA=="; - }; - }; - "safe-stable-stringify-2.4.3" = { - name = "safe-stable-stringify"; - packageName = "safe-stable-stringify"; - version = "2.4.3"; - src = fetchurl { - url = "https://registry.npmjs.org/safe-stable-stringify/-/safe-stable-stringify-2.4.3.tgz"; - sha512 = "e2bDA2WJT0wxseVd4lsDP4+3ONX6HpMXQa1ZhFQ7SU+GjvORCmShbCMltrtIDfkYhVHrOcPtj+KhmDBdPdZD1g=="; - }; - }; - "safer-buffer-2.1.2" = { - name = "safer-buffer"; - packageName = "safer-buffer"; - version = "2.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz"; - sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; - }; - }; - "samlify-2.8.10" = { - name = "samlify"; - packageName = "samlify"; - version = "2.8.10"; - src = fetchurl { - url = "https://registry.npmjs.org/samlify/-/samlify-2.8.10.tgz"; - sha512 = "g2M1Qq2uL7GHtmBRaTVYcJD0Vb+XOyvXHsPARHCoqQ54Vp7m5h3NMUGzvLEIFGujxaamyM3BhEi9fdVAkJMvHw=="; - }; - }; - "sax-1.3.0" = { - name = "sax"; - packageName = "sax"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/sax/-/sax-1.3.0.tgz"; - sha512 = "0s+oAmw9zLl1V1cS9BtZN7JAd0cW5e0QH4W3LWEK6a4LaLEA2OTpGYWDY+6XasBLtz6wkm3u1xRw95mRuJ59WA=="; - }; - }; - "sb-promise-queue-2.1.0" = { - name = "sb-promise-queue"; - packageName = "sb-promise-queue"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/sb-promise-queue/-/sb-promise-queue-2.1.0.tgz"; - sha512 = "zwq4YuP1FQFkGx2Q7GIkZYZ6PqWpV+bg0nIO1sJhWOyGyhqbj0MsTvK6lCFo5TQwX5pZr6SCQ75e8PCDCuNvkg=="; - }; - }; - "sb-scandir-3.1.0" = { - name = "sb-scandir"; - packageName = "sb-scandir"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/sb-scandir/-/sb-scandir-3.1.0.tgz"; - sha512 = "70BVm2xz9jn94zSQdpvYrEG101/UV9TVGcfWr9T5iob3QhCK4lYXeculfBqPGFv3XTeKgx4dpWyYIDeZUqo4kg=="; - }; - }; - "schema-utils-3.3.0" = { - name = "schema-utils"; - packageName = "schema-utils"; - version = "3.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz"; - sha512 = "pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg=="; - }; - }; - "selderee-0.11.0" = { - name = "selderee"; - packageName = "selderee"; - version = "0.11.0"; - src = fetchurl { - url = "https://registry.npmjs.org/selderee/-/selderee-0.11.0.tgz"; - sha512 = "5TF+l7p4+OsnP8BCCvSyZiSPc4x4//p5uPwK8TCnVPJYRmU2aYKMpOXvw8zM5a5JvuuCGN1jmsMwuU2W02ukfA=="; - }; - }; - "semver-5.3.0" = { - name = "semver"; - packageName = "semver"; - version = "5.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz"; - sha512 = "mfmm3/H9+67MCVix1h+IXTpDwL6710LyHuk7+cWC9T1mE0qz4iHhh6r4hU2wrIT9iTsAAC2XQRvfblL028cpLw=="; - }; - }; - "semver-6.3.1" = { - name = "semver"; - packageName = "semver"; - version = "6.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz"; - sha512 = "BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="; - }; - }; - "semver-7.5.4" = { - name = "semver"; - packageName = "semver"; - version = "7.5.4"; - src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz"; - sha512 = "1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA=="; - }; - }; - "send-0.18.0" = { - name = "send"; - packageName = "send"; - version = "0.18.0"; - src = fetchurl { - url = "https://registry.npmjs.org/send/-/send-0.18.0.tgz"; - sha512 = "qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg=="; - }; - }; - "sentence-case-3.0.4" = { - name = "sentence-case"; - packageName = "sentence-case"; - version = "3.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/sentence-case/-/sentence-case-3.0.4.tgz"; - sha512 = "8LS0JInaQMCRoQ7YUytAo/xUu5W2XnQxV2HI/6uM6U7CITS1RqPElr30V6uIqyMKM9lJGRVFy5/4CuzcixNYSg=="; - }; - }; - "seq-queue-0.0.5" = { - name = "seq-queue"; - packageName = "seq-queue"; - version = "0.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/seq-queue/-/seq-queue-0.0.5.tgz"; - sha512 = "hr3Wtp/GZIc/6DAGPDcV4/9WoZhjrkXsi5B/07QgX8tsdc6ilr7BFM6PM6rbdAX1kFSDYeZGLipIZZKyQP0O5Q=="; - }; - }; - "serialize-javascript-5.0.1" = { - name = "serialize-javascript"; - packageName = "serialize-javascript"; - version = "5.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-5.0.1.tgz"; - sha512 = "SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA=="; - }; - }; - "serialize-javascript-6.0.1" = { - name = "serialize-javascript"; - packageName = "serialize-javascript"; - version = "6.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.1.tgz"; - sha512 = "owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w=="; - }; - }; - "serve-static-1.15.0" = { - name = "serve-static"; - packageName = "serve-static"; - version = "1.15.0"; - src = fetchurl { - url = "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz"; - sha512 = "XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g=="; - }; - }; - "set-blocking-2.0.0" = { - name = "set-blocking"; - packageName = "set-blocking"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz"; - sha512 = "KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw=="; - }; - }; - "set-function-name-2.0.1" = { - name = "set-function-name"; - packageName = "set-function-name"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.1.tgz"; - sha512 = "tMNCiqYVkXIZgc2Hnoy2IvC/f8ezc5koaRFkCjrpWzGpCd3qbZXPzVy9MAZzK1ch/X0jvSkojys3oqJN0qCmdA=="; - }; - }; - "setprototypeof-1.2.0" = { - name = "setprototypeof"; - packageName = "setprototypeof"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz"; - sha512 = "E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="; - }; - }; - "sha.js-2.4.11" = { - name = "sha.js"; - packageName = "sha.js"; - version = "2.4.11"; - src = fetchurl { - url = "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz"; - sha512 = "QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ=="; - }; - }; - "shebang-command-2.0.0" = { - name = "shebang-command"; - packageName = "shebang-command"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz"; - sha512 = "kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA=="; - }; - }; - "shebang-regex-3.0.0" = { - name = "shebang-regex"; - packageName = "shebang-regex"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz"; - sha512 = "7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="; - }; - }; - "shell-escape-0.2.0" = { - name = "shell-escape"; - packageName = "shell-escape"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/shell-escape/-/shell-escape-0.2.0.tgz"; - sha512 = "uRRBT2MfEOyxuECseCZd28jC1AJ8hmqqneWQ4VWUTgCAFvb3wKU1jLqj6egC4Exrr88ogg3dp+zroH4wJuaXzw=="; - }; - }; - "shelljs-0.8.5" = { - name = "shelljs"; - packageName = "shelljs"; - version = "0.8.5"; - src = fetchurl { - url = "https://registry.npmjs.org/shelljs/-/shelljs-0.8.5.tgz"; - sha512 = "TiwcRcrkhHvbrZbnRcFYMLl30Dfov3HKqzp5tO5b4pt6G/SezKcYhmDg15zXVBswHmctSAQKznqNW2LO5tTDow=="; - }; - }; - "showdown-2.1.0" = { - name = "showdown"; - packageName = "showdown"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/showdown/-/showdown-2.1.0.tgz"; - sha512 = "/6NVYu4U819R2pUIk79n67SYgJHWCce0a5xTP979WbNp0FL9MN1I1QK662IDU1b6JzKTvmhgI7T7JYIxBi3kMQ=="; - }; - }; - "side-channel-1.0.4" = { - name = "side-channel"; - packageName = "side-channel"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz"; - sha512 = "q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw=="; - }; - }; - "signal-exit-3.0.7" = { - name = "signal-exit"; - packageName = "signal-exit"; - version = "3.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz"; - sha512 = "wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="; - }; - }; - "signal-exit-4.1.0" = { - name = "signal-exit"; - packageName = "signal-exit"; - version = "4.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz"; - sha512 = "bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw=="; - }; - }; - "simple-concat-1.0.1" = { - name = "simple-concat"; - packageName = "simple-concat"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz"; - sha512 = "cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q=="; - }; - }; - "simple-get-4.0.1" = { - name = "simple-get"; - packageName = "simple-get"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/simple-get/-/simple-get-4.0.1.tgz"; - sha512 = "brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA=="; - }; - }; - "simple-git-3.20.0" = { - name = "simple-git"; - packageName = "simple-git"; - version = "3.20.0"; - src = fetchurl { - url = "https://registry.npmjs.org/simple-git/-/simple-git-3.20.0.tgz"; - sha512 = "ozK8tl2hvLts8ijTs18iFruE+RoqmC/mqZhjs/+V7gS5W68JpJ3+FCTmLVqmR59MaUQ52MfGQuWsIqfsTbbJ0Q=="; - }; - }; - "simple-lru-cache-0.0.2" = { - name = "simple-lru-cache"; - packageName = "simple-lru-cache"; - version = "0.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/simple-lru-cache/-/simple-lru-cache-0.0.2.tgz"; - sha512 = "uEv/AFO0ADI7d99OHDmh1QfYzQk/izT1vCmu/riQfh7qjBVUUgRT87E5s5h7CxWCA/+YoZerykpEthzVrW3LIw=="; - }; - }; - "simple-swizzle-0.2.2" = { - name = "simple-swizzle"; - packageName = "simple-swizzle"; - version = "0.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz"; - sha512 = "JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg=="; - }; - }; - "slash-3.0.0" = { - name = "slash"; - packageName = "slash"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz"; - sha512 = "g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q=="; - }; - }; - "smart-buffer-4.2.0" = { - name = "smart-buffer"; - packageName = "smart-buffer"; - version = "4.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz"; - sha512 = "94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg=="; - }; - }; - "snake-case-3.0.4" = { - name = "snake-case"; - packageName = "snake-case"; - version = "3.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/snake-case/-/snake-case-3.0.4.tgz"; - sha512 = "LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg=="; - }; - }; - "snappy-7.2.2" = { - name = "snappy"; - packageName = "snappy"; - version = "7.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/snappy/-/snappy-7.2.2.tgz"; - sha512 = "iADMq1kY0v3vJmGTuKcFWSXt15qYUz7wFkArOrsSg0IFfI3nJqIJvK2/ZbEIndg7erIJLtAVX2nSOqPz7DcwbA=="; - }; - }; - "snowflake-sdk-1.9.0" = { - name = "snowflake-sdk"; - packageName = "snowflake-sdk"; - version = "1.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/snowflake-sdk/-/snowflake-sdk-1.9.0.tgz"; - sha512 = "RtFRV2KC+ebQk/kOUg8WV42LnAu9puoan2wMXykgrAj1u4sGP/GgQyQhsAfLGwXWzn+J9JAwij07h3+6HYBmFw=="; - }; - }; - "socks-2.7.1" = { - name = "socks"; - packageName = "socks"; - version = "2.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/socks/-/socks-2.7.1.tgz"; - sha512 = "7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ=="; - }; - }; - "socks-proxy-agent-6.2.1" = { - name = "socks-proxy-agent"; - packageName = "socks-proxy-agent"; - version = "6.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-6.2.1.tgz"; - sha512 = "a6KW9G+6B3nWZ1yB8G7pJwL3ggLy1uTzKAgCb7ttblwqdz9fMGJUuTy3uFzEP48FAs9FLILlmzDlE2JJhVQaXQ=="; - }; - }; - "source-map-0.6.1" = { - name = "source-map"; - packageName = "source-map"; - version = "0.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz"; - sha512 = "UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="; - }; - }; - "source-map-support-0.5.21" = { - name = "source-map-support"; - packageName = "source-map-support"; - version = "0.5.21"; - src = fetchurl { - url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz"; - sha512 = "uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w=="; - }; - }; - "spex-3.2.0" = { - name = "spex"; - packageName = "spex"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/spex/-/spex-3.2.0.tgz"; - sha512 = "9srjJM7NaymrpwMHvSmpDeIK5GoRMX/Tq0E8aOlDPS54dDnDUIp30DrP9SphMPEETDLzEM9+4qo+KipmbtPecg=="; - }; - }; - "split-array-stream-1.0.3" = { - name = "split-array-stream"; - packageName = "split-array-stream"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/split-array-stream/-/split-array-stream-1.0.3.tgz"; - sha512 = "yGY35QmZFzZkWZ0eHE06RPBi63umym8m+pdtuC/dlO1ADhdKSfCj0uNn87BYCXBBDFxyTq4oTw0BgLYT0K5z/A=="; - }; - }; - "split-array-stream-2.0.0" = { - name = "split-array-stream"; - packageName = "split-array-stream"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/split-array-stream/-/split-array-stream-2.0.0.tgz"; - sha512 = "hmMswlVY91WvGMxs0k8MRgq8zb2mSen4FmDNc5AFiTWtrBpdZN6nwD6kROVe4vNL+ywrvbCKsWVCnEd4riELIg=="; - }; - }; - "split-on-first-1.1.0" = { - name = "split-on-first"; - packageName = "split-on-first"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/split-on-first/-/split-on-first-1.1.0.tgz"; - sha512 = "43ZssAJaMusuKWL8sKUBQXHWOpq8d6CfN/u1p4gUzfJkM05C8rxTmYrkIPTXapZpORA6LkkzcUulJ8FqA7Uudw=="; - }; - }; - "split2-3.2.2" = { - name = "split2"; - packageName = "split2"; - version = "3.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/split2/-/split2-3.2.2.tgz"; - sha512 = "9NThjpgZnifTkJpzTZ7Eue85S49QwpNhZTq6GRJwObb6jnLFNGB7Qm73V5HewTROPyxD0C29xqmaI68bQtV+hg=="; - }; - }; - "split2-4.2.0" = { - name = "split2"; - packageName = "split2"; - version = "4.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/split2/-/split2-4.2.0.tgz"; - sha512 = "UcjcJOWknrNkF6PLX83qcHM6KHgVKNkV62Y8a5uYDVv9ydGQVwAHMKqHdJje1VTWpljG0WYpCDhrCdAOYH4TWg=="; - }; - }; - "sprintf-js-1.0.3" = { - name = "sprintf-js"; - packageName = "sprintf-js"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz"; - sha512 = "D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g=="; - }; - }; - "sprintf-js-1.1.3" = { - name = "sprintf-js"; - packageName = "sprintf-js"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz"; - sha512 = "Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA=="; - }; - }; - "sql.js-1.8.0" = { - name = "sql.js"; - packageName = "sql.js"; - version = "1.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/sql.js/-/sql.js-1.8.0.tgz"; - sha512 = "3HD8pSkZL+5YvYUI8nlvNILs61ALqq34xgmF+BHpqxe68yZIJ1H+sIVIODvni25+CcxHUxDyrTJUL0lE/m7afw=="; - }; - }; - "sqlite3-5.1.6" = { - name = "sqlite3"; - packageName = "sqlite3"; - version = "5.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/sqlite3/-/sqlite3-5.1.6.tgz"; - sha512 = "olYkWoKFVNSSSQNvxVUfjiVbz3YtBwTJj+mfV5zpHmqW3sELx2Cf4QCdirMelhM5Zh+KDVaKgQHqCxrqiWHybw=="; - }; - }; - "sqlstring-2.3.3" = { - name = "sqlstring"; - packageName = "sqlstring"; - version = "2.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/sqlstring/-/sqlstring-2.3.3.tgz"; - sha512 = "qC9iz2FlN7DQl3+wjwn3802RTyjCx7sDvfQEXchwa6CWOx07/WVfh91gBmQ9fahw8snwGEWU3xGzOt4tFyHLxg=="; - }; - }; - "sse-channel-4.0.0" = { - name = "sse-channel"; - packageName = "sse-channel"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/sse-channel/-/sse-channel-4.0.0.tgz"; - sha512 = "I539Tc0gyDTQ2QCSg4v78Flxo/UbqR9x7JoyPcqaPtwo+qzeOw/fF+aPSbk0xTvBQAAAZk7Dlkc8K1bum5GUnw=="; - }; - }; - "ssh2-1.14.0" = { - name = "ssh2"; - packageName = "ssh2"; - version = "1.14.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ssh2/-/ssh2-1.14.0.tgz"; - sha512 = "AqzD1UCqit8tbOKoj6ztDDi1ffJZ2rV2SwlgrVVrHPkV5vWqGJOVp5pmtj18PunkPJAuKQsnInyKV+/Nb2bUnA=="; - }; - }; - "ssh2-sftp-client-7.2.3" = { - name = "ssh2-sftp-client"; - packageName = "ssh2-sftp-client"; - version = "7.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/ssh2-sftp-client/-/ssh2-sftp-client-7.2.3.tgz"; - sha512 = "Bmq4Uewu3e0XOwu5bnPbiS5KRQYv+dff5H6+85V4GZrPrt0Fkt1nUH+uXanyAkoNxUpzjnAPEEoLdOaBO9c3xw=="; - }; - }; - "sshpk-1.17.0" = { - name = "sshpk"; - packageName = "sshpk"; - version = "1.17.0"; - src = fetchurl { - url = "https://registry.npmjs.org/sshpk/-/sshpk-1.17.0.tgz"; - sha512 = "/9HIEs1ZXGhSPE8X6Ccm7Nam1z8KcoCqPdI7ecm1N33EzAetWahvQWVqLZtaZQ+IDKX4IyA2o0gBzqIMkAagHQ=="; - }; - }; - "ssri-8.0.1" = { - name = "ssri"; - packageName = "ssri"; - version = "8.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz"; - sha512 = "97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ=="; - }; - }; - "stack-trace-0.0.10" = { - name = "stack-trace"; - packageName = "stack-trace"; - version = "0.0.10"; - src = fetchurl { - url = "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz"; - sha512 = "KGzahc7puUKkzyMt+IqAep+TVNbKP+k2Lmwhub39m1AsTSkaDutx56aDCo+HLDzf/D26BIHTJWNiTG1KAJiQCg=="; - }; - }; - "standard-as-callback-2.1.0" = { - name = "standard-as-callback"; - packageName = "standard-as-callback"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/standard-as-callback/-/standard-as-callback-2.1.0.tgz"; - sha512 = "qoRRSyROncaz1z0mvYqIE4lCd9p2R90i6GxW3uZv5ucSu8tU7B5HXUP1gG8pVZsYNVaXjk8ClXHPttLyxAL48A=="; - }; - }; - "statuses-2.0.1" = { - name = "statuses"; - packageName = "statuses"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz"; - sha512 = "RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ=="; - }; - }; - "stop-iteration-iterator-1.0.0" = { - name = "stop-iteration-iterator"; - packageName = "stop-iteration-iterator"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/stop-iteration-iterator/-/stop-iteration-iterator-1.0.0.tgz"; - sha512 = "iCGQj+0l0HOdZ2AEeBADlsRC+vsnDsZsbdSiH1yNSjcfKM7fdpCMfqAL/dwF5BLiw/XhRft/Wax6zQbhq2BcjQ=="; - }; - }; - "stoppable-1.1.0" = { - name = "stoppable"; - packageName = "stoppable"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/stoppable/-/stoppable-1.1.0.tgz"; - sha512 = "KXDYZ9dszj6bzvnEMRYvxgeTHU74QBFL54XKtP3nyMuJ81CFYtABZ3bAzL2EdFUaEwJOBOgENyFj3R7oTzDyyw=="; - }; - }; - "stream-events-1.0.5" = { - name = "stream-events"; - packageName = "stream-events"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/stream-events/-/stream-events-1.0.5.tgz"; - sha512 = "E1GUzBSgvct8Jsb3v2X15pjzN1tYebtbLaMg+eBOUOAxgbLoSbT2NS91ckc5lJD1KfLjId+jXJRgo0qnV5Nerg=="; - }; - }; - "stream-shift-1.0.1" = { - name = "stream-shift"; - packageName = "stream-shift"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.1.tgz"; - sha512 = "AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ=="; - }; - }; - "streamsearch-1.1.0" = { - name = "streamsearch"; - packageName = "streamsearch"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/streamsearch/-/streamsearch-1.1.0.tgz"; - sha512 = "Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg=="; - }; - }; - "strict-event-emitter-types-2.0.0" = { - name = "strict-event-emitter-types"; - packageName = "strict-event-emitter-types"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/strict-event-emitter-types/-/strict-event-emitter-types-2.0.0.tgz"; - sha512 = "Nk/brWYpD85WlOgzw5h173aci0Teyv8YdIAEtV+N88nDB0dLlazZyJMIsN6eo1/AR61l+p6CJTG1JIyFaoNEEA=="; - }; - }; - "strict-uri-encode-2.0.0" = { - name = "strict-uri-encode"; - packageName = "strict-uri-encode"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz"; - sha512 = "QwiXZgpRcKkhTj2Scnn++4PKtWsH0kpzZ62L2R6c/LUVYv7hVnZqcg2+sMuT6R7Jusu1vviK/MFsu6kNJfWlEQ=="; - }; - }; - "string-similarity-4.0.4" = { - name = "string-similarity"; - packageName = "string-similarity"; - version = "4.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/string-similarity/-/string-similarity-4.0.4.tgz"; - sha512 = "/q/8Q4Bl4ZKAPjj8WerIBJWALKkaPRfrvhfF8k/B23i4nzrlRj2/go1m90In7nG/3XDSbOo0+pu6RvCTM9RGMQ=="; - }; - }; - "string-width-4.2.3" = { - name = "string-width"; - packageName = "string-width"; - version = "4.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz"; - sha512 = "wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g=="; - }; - }; - "string-width-5.1.2" = { - name = "string-width"; - packageName = "string-width"; - version = "5.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz"; - sha512 = "HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA=="; - }; - }; - "string-width-cjs-4.2.3" = { - name = "string-width-cjs"; - packageName = "string-width-cjs"; - version = "4.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz"; - sha512 = "wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g=="; - }; - }; - "string.prototype.startswith-1.0.0" = { - name = "string.prototype.startswith"; - packageName = "string.prototype.startswith"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.startswith/-/string.prototype.startswith-1.0.0.tgz"; - sha512 = "VHhsDkuf8gsw4JNRK9cIZjYe6r7PsVUutVohaBhqYAoPaRADoQH+mMgUg7Cs/TgQeDGEvI+PzPEMOdvdsCMvpg=="; - }; - }; - "string.prototype.trim-1.2.8" = { - name = "string.prototype.trim"; - packageName = "string.prototype.trim"; - version = "1.2.8"; - src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.8.tgz"; - sha512 = "lfjY4HcixfQXOfaqCvcBuOIapyaroTXhbkfJN3gcB1OtyupngWK4sEET9Knd0cXd28kTUqu/kHoV4HKSJdnjiQ=="; - }; - }; - "string.prototype.trimend-1.0.7" = { - name = "string.prototype.trimend"; - packageName = "string.prototype.trimend"; - version = "1.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.7.tgz"; - sha512 = "Ni79DqeB72ZFq1uH/L6zJ+DKZTkOtPIHovb3YZHQViE+HDouuU4mBrLOLDn5Dde3RF8qw5qVETEjhu9locMLvA=="; - }; - }; - "string.prototype.trimstart-1.0.7" = { - name = "string.prototype.trimstart"; - packageName = "string.prototype.trimstart"; - version = "1.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.7.tgz"; - sha512 = "NGhtDFu3jCEm7B4Fy0DpLewdJQOZcQ0rGbwQ/+stjnrp2i+rlKeCvos9hOIeCmqwratM47OBxY7uFZzjxHXmrg=="; - }; - }; - "string_decoder-0.10.31" = { - name = "string_decoder"; - packageName = "string_decoder"; - version = "0.10.31"; - src = fetchurl { - url = "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"; - sha512 = "ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ=="; - }; - }; - "string_decoder-1.1.1" = { - name = "string_decoder"; - packageName = "string_decoder"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz"; - sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg=="; - }; - }; - "string_decoder-1.3.0" = { - name = "string_decoder"; - packageName = "string_decoder"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz"; - sha512 = "hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA=="; - }; - }; - "strip-ansi-6.0.1" = { - name = "strip-ansi"; - packageName = "strip-ansi"; - version = "6.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz"; - sha512 = "Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="; - }; - }; - "strip-ansi-7.1.0" = { - name = "strip-ansi"; - packageName = "strip-ansi"; - version = "7.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz"; - sha512 = "iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ=="; - }; - }; - "strip-ansi-cjs-6.0.1" = { - name = "strip-ansi-cjs"; - packageName = "strip-ansi-cjs"; - version = "6.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz"; - sha512 = "Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="; - }; - }; - "strip-json-comments-2.0.1" = { - name = "strip-json-comments"; - packageName = "strip-json-comments"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz"; - sha512 = "4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ=="; - }; - }; - "strnum-1.0.5" = { - name = "strnum"; - packageName = "strnum"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/strnum/-/strnum-1.0.5.tgz"; - sha512 = "J8bbNyKKXl5qYcR36TIO8W3mVGVHrmmxsd5PAItGkmyzwJvybiw2IVq5nqd0i4LSNSkB/sx9VHllbfFdr9k1JA=="; - }; - }; - "strtok3-6.3.0" = { - name = "strtok3"; - packageName = "strtok3"; - version = "6.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/strtok3/-/strtok3-6.3.0.tgz"; - sha512 = "fZtbhtvI9I48xDSywd/somNqgUHl2L2cstmXCCif0itOf96jeW18MBSyrLuNicYQVkvpOxkZtkzujiTJ9LW5Jw=="; - }; - }; - "stubs-3.0.0" = { - name = "stubs"; - packageName = "stubs"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/stubs/-/stubs-3.0.0.tgz"; - sha512 = "PdHt7hHUJKxvTCgbKX9C1V/ftOcjJQgz8BZwNfV5c4B6dcGqlpelTbJ999jBGZ2jYiPAwcX5dP6oBwVlBlUbxw=="; - }; - }; - "supports-color-7.2.0" = { - name = "supports-color"; - packageName = "supports-color"; - version = "7.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz"; - sha512 = "qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="; - }; - }; - "supports-color-8.1.1" = { - name = "supports-color"; - packageName = "supports-color"; - version = "8.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz"; - sha512 = "MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q=="; - }; - }; - "supports-hyperlinks-2.3.0" = { - name = "supports-hyperlinks"; - packageName = "supports-hyperlinks"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.3.0.tgz"; - sha512 = "RpsAZlpWcDwOPQA22aCH4J0t7L8JmAvsCxfOSEwm7cQs3LshN36QaTkwd70DnBOXDWGssw2eUoc8CaRWT0XunA=="; - }; - }; - "supports-preserve-symlinks-flag-1.0.0" = { - name = "supports-preserve-symlinks-flag"; - packageName = "supports-preserve-symlinks-flag"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz"; - sha512 = "ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w=="; - }; - }; - "swagger-ui-dist-5.9.0" = { - name = "swagger-ui-dist"; - packageName = "swagger-ui-dist"; - version = "5.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-5.9.0.tgz"; - sha512 = "NUHSYoe5XRTk/Are8jPJ6phzBh3l9l33nEyXosM17QInoV95/jng8+PuSGtbD407QoPf93MH3Bkh773OgesJpA=="; - }; - }; - "swagger-ui-express-4.6.3" = { - name = "swagger-ui-express"; - packageName = "swagger-ui-express"; - version = "4.6.3"; - src = fetchurl { - url = "https://registry.npmjs.org/swagger-ui-express/-/swagger-ui-express-4.6.3.tgz"; - sha512 = "CDje4PndhTD2HkgyKH3pab+LKspDeB/NhPN2OF1j+piYIamQqBYwAXWESOT1Yju2xFg51bRW9sUng2WxDjzArw=="; - }; - }; - "syslog-client-1.1.1" = { - name = "syslog-client"; - packageName = "syslog-client"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/syslog-client/-/syslog-client-1.1.1.tgz"; - sha512 = "c3qKw8JzCuHt0mwrzKQr8eqOc3RB28HgOpFuwGMO3GLscVpfR+0ECevWLZq/yIJTbx3WTb3QXBFVpTFtKAPDrw=="; - }; - }; - "tapable-2.2.1" = { - name = "tapable"; - packageName = "tapable"; - version = "2.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz"; - sha512 = "GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ=="; - }; - }; - "tar-6.2.0" = { - name = "tar"; - packageName = "tar"; - version = "6.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/tar/-/tar-6.2.0.tgz"; - sha512 = "/Wo7DcT0u5HUV486xg675HtjNd3BXZ6xDbzsCUZPt5iw8bTQ63bP0Raut3mvro9u+CUyq7YQd8Cx55fsZXxqLQ=="; - }; - }; - "tar-fs-2.1.1" = { - name = "tar-fs"; - packageName = "tar-fs"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz"; - sha512 = "V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng=="; - }; - }; - "tar-stream-2.2.0" = { - name = "tar-stream"; - packageName = "tar-stream"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz"; - sha512 = "ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ=="; - }; - }; - "tarn-3.0.2" = { - name = "tarn"; - packageName = "tarn"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/tarn/-/tarn-3.0.2.tgz"; - sha512 = "51LAVKUSZSVfI05vjPESNc5vwqqZpbXCsU+/+wxlOrUjk2SnFTt97v9ZgQrD4YmxYW1Px6w2KjaDitCfkvgxMQ=="; - }; - }; - "tdigest-0.1.2" = { - name = "tdigest"; - packageName = "tdigest"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/tdigest/-/tdigest-0.1.2.tgz"; - sha512 = "+G0LLgjjo9BZX2MfdvPfH+MKLCrxlXSYec5DaPYP1fe6Iyhf0/fSmJ0bFiZ1F8BT6cGXl2LpltQptzjXKWEkKA=="; - }; - }; - "tedious-14.7.0" = { - name = "tedious"; - packageName = "tedious"; - version = "14.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/tedious/-/tedious-14.7.0.tgz"; - sha512 = "d3qlmZcvZyt7akyPHiOdR+knfzObWZH3mW+gouQTSb7YTSwtpHuYHcvsQabfbY7oOvgbs51xRb7CwOahWK/t9w=="; - }; - }; - "tedious-15.1.3" = { - name = "tedious"; - packageName = "tedious"; - version = "15.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/tedious/-/tedious-15.1.3.tgz"; - sha512 = "166EpRm5qknwhEisjZqz/mF7k14fXKJYHRg6XiAXVovd/YkyHJ3SG4Ppy89caPaNFfRr7PVYe+s4dAvKaCMFvw=="; - }; - }; - "teeny-request-7.2.0" = { - name = "teeny-request"; - packageName = "teeny-request"; - version = "7.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/teeny-request/-/teeny-request-7.2.0.tgz"; - sha512 = "SyY0pek1zWsi0LRVAALem+avzMLc33MKW/JLLakdP4s9+D7+jHcy5x6P+h94g2QNZsAqQNfX5lsbd3WSeJXrrw=="; - }; - }; - "teeny-request-8.0.3" = { - name = "teeny-request"; - packageName = "teeny-request"; - version = "8.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/teeny-request/-/teeny-request-8.0.3.tgz"; - sha512 = "jJZpA5He2y52yUhA7pyAGZlgQpcB+xLjcN0eUFxr9c8hP/H7uOXbBNVo/O0C/xVfJLJs680jvkFgVJEEvk9+ww=="; - }; - }; - "terser-5.21.0" = { - name = "terser"; - packageName = "terser"; - version = "5.21.0"; - src = fetchurl { - url = "https://registry.npmjs.org/terser/-/terser-5.21.0.tgz"; - sha512 = "WtnFKrxu9kaoXuiZFSGrcAvvBqAdmKx0SFNmVNYdJamMu9yyN3I/QF0FbH4QcqJQ+y1CJnzxGIKH0cSj+FGYRw=="; - }; - }; - "terser-webpack-plugin-5.3.9" = { - name = "terser-webpack-plugin"; - packageName = "terser-webpack-plugin"; - version = "5.3.9"; - src = fetchurl { - url = "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.9.tgz"; - sha512 = "ZuXsqE07EcggTWQjXUj+Aot/OMcD0bMKGgF63f7UxYcu5/AJF53aIpK1YoP5xR9l6s/Hy2b+t1AM0bLNPRuhwA=="; - }; - }; - "text-hex-1.0.0" = { - name = "text-hex"; - packageName = "text-hex"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/text-hex/-/text-hex-1.0.0.tgz"; - sha512 = "uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg=="; - }; - }; - "thenify-3.3.1" = { - name = "thenify"; - packageName = "thenify"; - version = "3.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz"; - sha512 = "RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw=="; - }; - }; - "thenify-all-1.6.0" = { - name = "thenify-all"; - packageName = "thenify-all"; - version = "1.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz"; - sha512 = "RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA=="; - }; - }; - "through-2.3.8" = { - name = "through"; - packageName = "through"; - version = "2.3.8"; - src = fetchurl { - url = "https://registry.npmjs.org/through/-/through-2.3.8.tgz"; - sha512 = "w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg=="; - }; - }; - "through2-2.0.5" = { - name = "through2"; - packageName = "through2"; - version = "2.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz"; - sha512 = "/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ=="; - }; - }; - "through2-4.0.2" = { - name = "through2"; - packageName = "through2"; - version = "4.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/through2/-/through2-4.0.2.tgz"; - sha512 = "iOqSav00cVxEEICeD7TjLB1sueEL+81Wpzp2bY17uZjZN0pWZPuo4suZ/61VujxmqSGFfgOcNuTZ85QJwNZQpw=="; - }; - }; - "title-case-3.0.3" = { - name = "title-case"; - packageName = "title-case"; - version = "3.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/title-case/-/title-case-3.0.3.tgz"; - sha512 = "e1zGYRvbffpcHIrnuqT0Dh+gEJtDaxDSoG4JAIpq4oDFyooziLBIiYQv0GBT4FUAnUop5uZ1hiIAj7oAF6sOCA=="; - }; - }; - "tlds-1.240.0" = { - name = "tlds"; - packageName = "tlds"; - version = "1.240.0"; - src = fetchurl { - url = "https://registry.npmjs.org/tlds/-/tlds-1.240.0.tgz"; - sha512 = "1OYJQenswGZSOdRw7Bql5Qu7uf75b+F3HFBXbqnG/ifHa0fev1XcG+3pJf3pA/KC6RtHQzfKgIf1vkMlMG7mtQ=="; - }; - }; - "tmp-0.0.33" = { - name = "tmp"; - packageName = "tmp"; - version = "0.0.33"; - src = fetchurl { - url = "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz"; - sha512 = "jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw=="; - }; - }; - "tmp-0.2.1" = { - name = "tmp"; - packageName = "tmp"; - version = "0.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz"; - sha512 = "76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ=="; - }; - }; - "tmp-promise-3.0.3" = { - name = "tmp-promise"; - packageName = "tmp-promise"; - version = "3.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/tmp-promise/-/tmp-promise-3.0.3.tgz"; - sha512 = "RwM7MoPojPxsOBYnyd2hy0bxtIlVrihNs9pj5SUvY8Zz1sQcQG2tG1hSr8PDxfgEB8RNKDhqbIlroIarSNDNsQ=="; - }; - }; - "to-regex-range-5.0.1" = { - name = "to-regex-range"; - packageName = "to-regex-range"; - version = "5.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz"; - sha512 = "65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ=="; - }; - }; - "toidentifier-1.0.1" = { - name = "toidentifier"; - packageName = "toidentifier"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz"; - sha512 = "o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA=="; - }; - }; - "token-types-4.2.1" = { - name = "token-types"; - packageName = "token-types"; - version = "4.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/token-types/-/token-types-4.2.1.tgz"; - sha512 = "6udB24Q737UD/SDsKAHI9FCRP7Bqc9D/MQUV02ORQg5iskjtLJlZJNdN4kKtcdtwCeWIwIHDGaUsTsCCAa8sFQ=="; - }; - }; - "toposort-2.0.2" = { - name = "toposort"; - packageName = "toposort"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/toposort/-/toposort-2.0.2.tgz"; - sha512 = "0a5EOkAUp8D4moMi2W8ZF8jcga7BgZd91O/yabJCFY8az+XSzeGyTKs0Aoo897iV1Nj6guFq8orWDS96z91oGg=="; - }; - }; - "tr46-0.0.3" = { - name = "tr46"; - packageName = "tr46"; - version = "0.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz"; - sha512 = "N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="; - }; - }; - "tr46-3.0.0" = { - name = "tr46"; - packageName = "tr46"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/tr46/-/tr46-3.0.0.tgz"; - sha512 = "l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA=="; - }; - }; - "transliteration-2.3.5" = { - name = "transliteration"; - packageName = "transliteration"; - version = "2.3.5"; - src = fetchurl { - url = "https://registry.npmjs.org/transliteration/-/transliteration-2.3.5.tgz"; - sha512 = "HAGI4Lq4Q9dZ3Utu2phaWgtm3vB6PkLUFqWAScg/UW+1eZ/Tg6Exo4oC0/3VUol/w4BlefLhUUSVBr/9/ZGQOw=="; - }; - }; - "triple-beam-1.4.1" = { - name = "triple-beam"; - packageName = "triple-beam"; - version = "1.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/triple-beam/-/triple-beam-1.4.1.tgz"; - sha512 = "aZbgViZrg1QNcG+LULa7nhZpJTZSLm/mXnHXnbAbjmN5aSa0y7V+wvv6+4WaBtpISJzThKy+PIPxc1Nq1EJ9mg=="; - }; - }; - "ts-node-10.9.1" = { - name = "ts-node"; - packageName = "ts-node"; - version = "10.9.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ts-node/-/ts-node-10.9.1.tgz"; - sha512 = "NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw=="; - }; - }; - "tslib-1.14.1" = { - name = "tslib"; - packageName = "tslib"; - version = "1.14.1"; - src = fetchurl { - url = "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz"; - sha512 = "Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="; - }; - }; - "tslib-2.6.2" = { - name = "tslib"; - packageName = "tslib"; - version = "2.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz"; - sha512 = "AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="; - }; - }; - "tsscmp-1.0.6" = { - name = "tsscmp"; - packageName = "tsscmp"; - version = "1.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/tsscmp/-/tsscmp-1.0.6.tgz"; - sha512 = "LxhtAkPDTkVCMQjt2h6eBVY28KCjikZqZfMcC15YBeNjkgUpdCfBu5HoiOTDu86v6smE8yOjyEktJ8hlbANHQA=="; - }; - }; - "tunnel-0.0.6" = { - name = "tunnel"; - packageName = "tunnel"; - version = "0.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/tunnel/-/tunnel-0.0.6.tgz"; - sha512 = "1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg=="; - }; - }; - "tunnel-agent-0.6.0" = { - name = "tunnel-agent"; - packageName = "tunnel-agent"; - version = "0.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz"; - sha512 = "McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w=="; - }; - }; - "tweetnacl-0.14.5" = { - name = "tweetnacl"; - packageName = "tweetnacl"; - version = "0.14.5"; - src = fetchurl { - url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz"; - sha512 = "KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA=="; - }; - }; - "tweetnacl-1.0.3" = { - name = "tweetnacl"; - packageName = "tweetnacl"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-1.0.3.tgz"; - sha512 = "6rt+RN7aOi1nGMyC4Xa5DdYiukl2UWCbcJft7YhxReBGQD7OAM8Pbxw6YMo4r2diNEA8FEmu32YOn9rhaiE5yw=="; - }; - }; - "tweetnacl-util-0.15.1" = { - name = "tweetnacl-util"; - packageName = "tweetnacl-util"; - version = "0.15.1"; - src = fetchurl { - url = "https://registry.npmjs.org/tweetnacl-util/-/tweetnacl-util-0.15.1.tgz"; - sha512 = "RKJBIj8lySrShN4w6i/BonWp2Z/uxwC3h4y7xsRrpP59ZboCd0GpEVsOnMDYLMmKBpYhb5TgHzZXy7wTfYFBRw=="; - }; - }; - "type-fest-0.21.3" = { - name = "type-fest"; - packageName = "type-fest"; - version = "0.21.3"; - src = fetchurl { - url = "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz"; - sha512 = "t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w=="; - }; - }; - "type-is-1.6.18" = { - name = "type-is"; - packageName = "type-is"; - version = "1.6.18"; - src = fetchurl { - url = "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz"; - sha512 = "TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g=="; - }; - }; - "typed-array-buffer-1.0.0" = { - name = "typed-array-buffer"; - packageName = "typed-array-buffer"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.0.tgz"; - sha512 = "Y8KTSIglk9OZEr8zywiIHG/kmQ7KWyjseXs1CbSo8vC42w7hg2HgYTxSWwP0+is7bWDc1H+Fo026CpHFwm8tkw=="; - }; - }; - "typed-array-byte-length-1.0.0" = { - name = "typed-array-byte-length"; - packageName = "typed-array-byte-length"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.0.tgz"; - sha512 = "Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA=="; - }; - }; - "typed-array-byte-offset-1.0.0" = { - name = "typed-array-byte-offset"; - packageName = "typed-array-byte-offset"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.0.tgz"; - sha512 = "RD97prjEt9EL8YgAgpOkf3O4IF9lhJFr9g0htQkm0rchFp/Vx7LW5Q8fSXXub7BXAODyUQohRMyOc3faCPd0hg=="; - }; - }; - "typed-array-length-1.0.4" = { - name = "typed-array-length"; - packageName = "typed-array-length"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.4.tgz"; - sha512 = "KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng=="; - }; - }; - "typedarray-0.0.6" = { - name = "typedarray"; - packageName = "typedarray"; - version = "0.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz"; - sha512 = "/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA=="; - }; - }; - "typedi-0.10.0" = { - name = "typedi"; - packageName = "typedi"; - version = "0.10.0"; - src = fetchurl { - url = "https://registry.npmjs.org/typedi/-/typedi-0.10.0.tgz"; - sha512 = "v3UJF8xm68BBj6AF4oQML3ikrfK2c9EmZUyLOfShpJuItAqVBHWP/KtpGinkSsIiP6EZyyb6Z3NXyW9dgS9X1w=="; - }; - }; - "typeorm-0.3.17" = { - name = "typeorm"; - packageName = "typeorm"; - version = "0.3.17"; - src = fetchurl { - url = "https://registry.npmjs.org/typeorm/-/typeorm-0.3.17.tgz"; - sha512 = "UDjUEwIQalO9tWw9O2A4GU+sT3oyoUXheHJy4ft+RFdnRdQctdQ34L9SqE2p7LdwzafHx1maxT+bqXON+Qnmig=="; - }; - }; - "typeorm-aurora-data-api-driver-2.4.4" = { - name = "typeorm-aurora-data-api-driver"; - packageName = "typeorm-aurora-data-api-driver"; - version = "2.4.4"; - src = fetchurl { - url = "https://registry.npmjs.org/typeorm-aurora-data-api-driver/-/typeorm-aurora-data-api-driver-2.4.4.tgz"; - sha512 = "EqrdoXr0FbUrAMmkNQQuPwlhUGM7SJnpwUlWTWNlK2mOhOUyM+33fhm1f1hz3nnJJV8fTxzS3kTDq6pkVASLAw=="; - }; - }; - "typescript-5.2.2" = { - name = "typescript"; - packageName = "typescript"; - version = "5.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-5.2.2.tgz"; - sha512 = "mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w=="; - }; - }; - "uc.micro-1.0.6" = { - name = "uc.micro"; - packageName = "uc.micro"; - version = "1.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz"; - sha512 = "8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA=="; - }; - }; - "uid-safe-2.1.5" = { - name = "uid-safe"; - packageName = "uid-safe"; - version = "2.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.5.tgz"; - sha512 = "KPHm4VL5dDXKz01UuEd88Df+KzynaohSL9fBh096KWAxSKZQDI2uBrVqtvRM4rwrIrRRKsdLNML/lnaaVSRioA=="; - }; - }; - "unbox-primitive-1.0.2" = { - name = "unbox-primitive"; - packageName = "unbox-primitive"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz"; - sha512 = "61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw=="; - }; - }; - "undici-5.26.0" = { - name = "undici"; - packageName = "undici"; - version = "5.26.0"; - src = fetchurl { - url = "https://registry.npmjs.org/undici/-/undici-5.26.0.tgz"; - sha512 = "MLqGMyaJk2ubSl7FrmWuV7ZOsYWmdF7gcBHDRxm4AR8NoodQhgy3vO/D1god79HoetxR0uAeVNB65yj2lNRQnQ=="; - }; - }; - "undici-types-5.25.3" = { - name = "undici-types"; - packageName = "undici-types"; - version = "5.25.3"; - src = fetchurl { - url = "https://registry.npmjs.org/undici-types/-/undici-types-5.25.3.tgz"; - sha512 = "Ga1jfYwRn7+cP9v8auvEXN1rX3sWqlayd4HP7OKk4mZWylEmu3KzXDUGrQUN6Ol7qo1gPvB2e5gX6udnyEPgdA=="; - }; - }; - "unique-filename-1.1.1" = { - name = "unique-filename"; - packageName = "unique-filename"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz"; - sha512 = "Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ=="; - }; - }; - "unique-slug-2.0.2" = { - name = "unique-slug"; - packageName = "unique-slug"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz"; - sha512 = "zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w=="; - }; - }; - "universalify-0.1.2" = { - name = "universalify"; - packageName = "universalify"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz"; - sha512 = "rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="; - }; - }; - "universalify-2.0.0" = { - name = "universalify"; - packageName = "universalify"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz"; - sha512 = "hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ=="; - }; - }; - "unpipe-1.0.0" = { - name = "unpipe"; - packageName = "unpipe"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz"; - sha512 = "pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ=="; - }; - }; - "update-browserslist-db-1.0.13" = { - name = "update-browserslist-db"; - packageName = "update-browserslist-db"; - version = "1.0.13"; - src = fetchurl { - url = "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz"; - sha512 = "xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg=="; - }; - }; - "upper-case-2.0.2" = { - name = "upper-case"; - packageName = "upper-case"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/upper-case/-/upper-case-2.0.2.tgz"; - sha512 = "KgdgDGJt2TpuwBUIjgG6lzw2GWFRCW9Qkfkiv0DxqHHLYJHmtmdUIKcZd8rHgFSjopVTlw6ggzCm1b8MFQwikg=="; - }; - }; - "upper-case-first-2.0.2" = { - name = "upper-case-first"; - packageName = "upper-case-first"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/upper-case-first/-/upper-case-first-2.0.2.tgz"; - sha512 = "514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg=="; - }; - }; - "uri-js-4.4.1" = { - name = "uri-js"; - packageName = "uri-js"; - version = "4.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz"; - sha512 = "7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg=="; - }; - }; - "url-parse-1.5.10" = { - name = "url-parse"; - packageName = "url-parse"; - version = "1.5.10"; - src = fetchurl { - url = "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz"; - sha512 = "WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ=="; - }; - }; - "url-value-parser-2.2.0" = { - name = "url-value-parser"; - packageName = "url-value-parser"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/url-value-parser/-/url-value-parser-2.2.0.tgz"; - sha512 = "yIQdxJpgkPamPPAPuGdS7Q548rLhny42tg8d4vyTNzFqvOnwqrgHXvgehT09U7fwrzxi3RxCiXjoNUNnNOlQ8A=="; - }; - }; - "utf-8-validate-5.0.10" = { - name = "utf-8-validate"; - packageName = "utf-8-validate"; - version = "5.0.10"; - src = fetchurl { - url = "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-5.0.10.tgz"; - sha512 = "Z6czzLq4u8fPOyx7TU6X3dvUZVvoJmxSQ+IcrlmagKhilxlhZgxPK6C5Jqbkw1IDUmFTM+cz9QDnnLTwDz/2gQ=="; - }; - }; - "utf7-1.0.2" = { - name = "utf7"; - packageName = "utf7"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/utf7/-/utf7-1.0.2.tgz"; - sha512 = "qQrPtYLLLl12NF4DrM9CvfkxkYI97xOb5dsnGZHE3teFr0tWiEZ9UdgMPczv24vl708cYMpe6mGXGHrotIp3Bw=="; - }; - }; - "utf8-2.1.2" = { - name = "utf8"; - packageName = "utf8"; - version = "2.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/utf8/-/utf8-2.1.2.tgz"; - sha512 = "QXo+O/QkLP/x1nyi54uQiG0XrODxdysuQvE5dtVqv7F5K2Qb6FsN+qbr6KhF5wQ20tfcV3VQp0/2x1e1MRSPWg=="; - }; - }; - "util-0.12.5" = { - name = "util"; - packageName = "util"; - version = "0.12.5"; - src = fetchurl { - url = "https://registry.npmjs.org/util/-/util-0.12.5.tgz"; - sha512 = "kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA=="; - }; - }; - "util-deprecate-1.0.2" = { - name = "util-deprecate"; - packageName = "util-deprecate"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"; - sha512 = "EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="; - }; - }; - "util.promisify-1.1.2" = { - name = "util.promisify"; - packageName = "util.promisify"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/util.promisify/-/util.promisify-1.1.2.tgz"; - sha512 = "PBdZ03m1kBnQ5cjjO0ZvJMJS+QsbyIcFwi4hY4U76OQsCO9JrOYjbCFgIF76ccFg9xnJo7ZHPkqyj1GqmdS7MA=="; - }; - }; - "utils-merge-1.0.1" = { - name = "utils-merge"; - packageName = "utils-merge"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz"; - sha512 = "pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA=="; - }; - }; - "uuencode-0.0.4" = { - name = "uuencode"; - packageName = "uuencode"; - version = "0.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/uuencode/-/uuencode-0.0.4.tgz"; - sha512 = "yEEhCuCi5wRV7Z5ZVf9iV2gWMvUZqKJhAs1ecFdKJ0qzbyaVelmsE3QjYAamehfp9FKLiZbKldd+jklG3O0LfA=="; - }; - }; - "uuid-8.3.2" = { - name = "uuid"; - packageName = "uuid"; - version = "8.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz"; - sha512 = "+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="; - }; - }; - "uuid-9.0.1" = { - name = "uuid"; - packageName = "uuid"; - version = "9.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz"; - sha512 = "b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA=="; - }; - }; - "v8-compile-cache-lib-3.0.1" = { - name = "v8-compile-cache-lib"; - packageName = "v8-compile-cache-lib"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz"; - sha512 = "wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg=="; - }; - }; - "validator-13.7.0" = { - name = "validator"; - packageName = "validator"; - version = "13.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/validator/-/validator-13.7.0.tgz"; - sha512 = "nYXQLCBkpJ8X6ltALua9dRrZDHVYxjJ1wgskNt1lH9fzGjs3tgojGSCBjmEPwkWS1y29+DrizMTW19Pr9uB2nw=="; - }; - }; - "vary-1.1.2" = { - name = "vary"; - packageName = "vary"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz"; - sha512 = "BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg=="; - }; - }; - "watchpack-2.4.0" = { - name = "watchpack"; - packageName = "watchpack"; - version = "2.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz"; - sha512 = "Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg=="; - }; - }; - "web-streams-polyfill-3.2.1" = { - name = "web-streams-polyfill"; - packageName = "web-streams-polyfill"; - version = "3.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-3.2.1.tgz"; - sha512 = "e0MO3wdXWKrLbL0DgGnUV7WHVuw9OUvL4hjgnPkIeEvESk74gAITi5G606JtZPp39cd8HA9VQzCIvA49LpPN5Q=="; - }; - }; - "webidl-conversions-3.0.1" = { - name = "webidl-conversions"; - packageName = "webidl-conversions"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz"; - sha512 = "2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="; - }; - }; - "webidl-conversions-7.0.0" = { - name = "webidl-conversions"; - packageName = "webidl-conversions"; - version = "7.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz"; - sha512 = "VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g=="; - }; - }; - "webpack-5.88.2" = { - name = "webpack"; - packageName = "webpack"; - version = "5.88.2"; - src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-5.88.2.tgz"; - sha512 = "JmcgNZ1iKj+aiR0OvTYtWQqJwq37Pf683dY9bVORwVbUrDhLhdn/PlO2sHsFHPkj7sHNQF3JwaAkp49V+Sq1tQ=="; - }; - }; - "webpack-sources-3.2.3" = { - name = "webpack-sources"; - packageName = "webpack-sources"; - version = "3.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz"; - sha512 = "/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w=="; - }; - }; - "whatwg-url-11.0.0" = { - name = "whatwg-url"; - packageName = "whatwg-url"; - version = "11.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-11.0.0.tgz"; - sha512 = "RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ=="; - }; - }; - "whatwg-url-5.0.0" = { - name = "whatwg-url"; - packageName = "whatwg-url"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz"; - sha512 = "saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw=="; - }; - }; - "which-1.3.1" = { - name = "which"; - packageName = "which"; - version = "1.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/which/-/which-1.3.1.tgz"; - sha512 = "HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ=="; - }; - }; - "which-2.0.2" = { - name = "which"; - packageName = "which"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/which/-/which-2.0.2.tgz"; - sha512 = "BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA=="; - }; - }; - "which-boxed-primitive-1.0.2" = { - name = "which-boxed-primitive"; - packageName = "which-boxed-primitive"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz"; - sha512 = "bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg=="; - }; - }; - "which-collection-1.0.1" = { - name = "which-collection"; - packageName = "which-collection"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/which-collection/-/which-collection-1.0.1.tgz"; - sha512 = "W8xeTUwaln8i3K/cY1nGXzdnVZlidBcagyNFtBdD5kxnb4TvGKR7FfSIS3mYpwWS1QUCutfKz8IY8RjftB0+1A=="; - }; - }; - "which-typed-array-1.1.11" = { - name = "which-typed-array"; - packageName = "which-typed-array"; - version = "1.1.11"; - src = fetchurl { - url = "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.11.tgz"; - sha512 = "qe9UWWpkeG5yzZ0tNYxDmd7vo58HDBc39mZ0xWWpolAGADdFOzkfamWLDxkOWcvHQKVmdTyQdLD4NOfjLWTKew=="; - }; - }; - "wide-align-1.1.5" = { - name = "wide-align"; - packageName = "wide-align"; - version = "1.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz"; - sha512 = "eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg=="; - }; - }; - "widest-line-3.1.0" = { - name = "widest-line"; - packageName = "widest-line"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/widest-line/-/widest-line-3.1.0.tgz"; - sha512 = "NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg=="; - }; - }; - "winston-3.11.0" = { - name = "winston"; - packageName = "winston"; - version = "3.11.0"; - src = fetchurl { - url = "https://registry.npmjs.org/winston/-/winston-3.11.0.tgz"; - sha512 = "L3yR6/MzZAOl0DsysUXHVjOwv8mKZ71TrA/41EIduGpOOV5LQVodqN+QdQ6BS6PJ/RdIshZhq84P/fStEZkk7g=="; - }; - }; - "winston-transport-4.5.0" = { - name = "winston-transport"; - packageName = "winston-transport"; - version = "4.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/winston-transport/-/winston-transport-4.5.0.tgz"; - sha512 = "YpZzcUzBedhlTAfJg6vJDlyEai/IFMIVcaEZZyl3UXIl4gmqRpU7AE89AHLkbzLUsv0NVmw7ts+iztqKxxPW1Q=="; - }; - }; - "wordwrap-1.0.0" = { - name = "wordwrap"; - packageName = "wordwrap"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz"; - sha512 = "gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q=="; - }; - }; - "worker-loader-3.0.8" = { - name = "worker-loader"; - packageName = "worker-loader"; - version = "3.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/worker-loader/-/worker-loader-3.0.8.tgz"; - sha512 = "XQyQkIFeRVC7f7uRhFdNMe/iJOdO6zxAaR3EWbDp45v3mDhrTi+++oswKNxShUNjPC/1xUp5DB29YKLhFo129g=="; - }; - }; - "wrap-ansi-6.2.0" = { - name = "wrap-ansi"; - packageName = "wrap-ansi"; - version = "6.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz"; - sha512 = "r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA=="; - }; - }; - "wrap-ansi-7.0.0" = { - name = "wrap-ansi"; - packageName = "wrap-ansi"; - version = "7.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz"; - sha512 = "YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q=="; - }; - }; - "wrap-ansi-8.1.0" = { - name = "wrap-ansi"; - packageName = "wrap-ansi"; - version = "8.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz"; - sha512 = "si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ=="; - }; - }; - "wrap-ansi-cjs-7.0.0" = { - name = "wrap-ansi-cjs"; - packageName = "wrap-ansi-cjs"; - version = "7.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz"; - sha512 = "YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q=="; - }; - }; - "wrappy-1.0.2" = { - name = "wrappy"; - packageName = "wrappy"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"; - sha512 = "l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="; - }; - }; - "ws-7.5.9" = { - name = "ws"; - packageName = "ws"; - version = "7.5.9"; - src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz"; - sha512 = "F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q=="; - }; - }; - "ws-8.14.2" = { - name = "ws"; - packageName = "ws"; - version = "8.14.2"; - src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-8.14.2.tgz"; - sha512 = "wEBG1ftX4jcglPxgFCMJmZ2PLtSbJ2Peg6TmpJFTbe9GZYOQCDPdMYu/Tm0/bGZkw8paZnJY45J4K2PZrLYq8g=="; - }; - }; - "xlsx-https://cdn.sheetjs.com/xlsx-0.19.3/xlsx-0.19.3.tgz" = { - name = "xlsx"; - packageName = "xlsx"; - version = "0.19.3"; - src = fetchurl { - name = "xlsx-0.19.3.tar.gz"; - url = "https://cdn.sheetjs.com/xlsx-0.19.3/xlsx-0.19.3.tgz"; - sha256 = "1705b76a0a18e86f71d133a204bd9c21fafd626c742dd5655647da40e6dceb13"; - }; - }; - "xml-1.0.1" = { - name = "xml"; - packageName = "xml"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/xml/-/xml-1.0.1.tgz"; - sha512 = "huCv9IH9Tcf95zuYCsQraZtWnJvBtLVE0QHMOs8bWyZAFZNDcYjsPq1nEx8jKA9y+Beo9v+7OBPRisQTjinQMw=="; - }; - }; - "xml-crypto-3.2.0" = { - name = "xml-crypto"; - packageName = "xml-crypto"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/xml-crypto/-/xml-crypto-3.2.0.tgz"; - sha512 = "qVurBUOQrmvlgmZqIVBqmb06TD2a/PpEUfFPgD7BuBfjmoH4zgkqaWSIJrnymlCvM2GGt9x+XtJFA+ttoAufqg=="; - }; - }; - "xml2js-0.5.0" = { - name = "xml2js"; - packageName = "xml2js"; - version = "0.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/xml2js/-/xml2js-0.5.0.tgz"; - sha512 = "drPFnkQJik/O+uPKpqSgr22mpuFHqKdbS835iAQrUC73L2F5WkboIRd63ai/2Yg6I1jzifPFKH2NTK+cfglkIA=="; - }; - }; - "xmlbuilder-11.0.1" = { - name = "xmlbuilder"; - packageName = "xmlbuilder"; - version = "11.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz"; - sha512 = "fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA=="; - }; - }; - "xmllint-wasm-3.0.1" = { - name = "xmllint-wasm"; - packageName = "xmllint-wasm"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/xmllint-wasm/-/xmllint-wasm-3.0.1.tgz"; - sha512 = "t+aKQXJQNAt9/qLgCjhHUmCnPXAyqBKiyh8oV0ZwBMar/uB+5F40tqOJZ97JwLADcqQr5WB2bjCxLKrm+DHz1g=="; - }; - }; - "xpath-0.0.32" = { - name = "xpath"; - packageName = "xpath"; - version = "0.0.32"; - src = fetchurl { - url = "https://registry.npmjs.org/xpath/-/xpath-0.0.32.tgz"; - sha512 = "rxMJhSIoiO8vXcWvSifKqhvV96GjiD5wYb8/QHdoRyQvraTpp4IEv944nhGausZZ3u7dhQXteZuZbaqfpB7uYw=="; - }; - }; - "xregexp-2.0.0" = { - name = "xregexp"; - packageName = "xregexp"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/xregexp/-/xregexp-2.0.0.tgz"; - sha512 = "xl/50/Cf32VsGq/1R8jJE5ajH1yMCQkpmoS10QbFZWl2Oor4H0Me64Pu2yxvsRWK3m6soJbmGfzSR7BYmDcWAA=="; - }; - }; - "xtend-4.0.2" = { - name = "xtend"; - packageName = "xtend"; - version = "4.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz"; - sha512 = "LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ=="; - }; - }; - "y18n-5.0.8" = { - name = "y18n"; - packageName = "y18n"; - version = "5.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz"; - sha512 = "0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA=="; - }; - }; - "yallist-2.1.2" = { - name = "yallist"; - packageName = "yallist"; - version = "2.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz"; - sha512 = "ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A=="; - }; - }; - "yallist-4.0.0" = { - name = "yallist"; - packageName = "yallist"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz"; - sha512 = "3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="; - }; - }; - "yamljs-0.3.0" = { - name = "yamljs"; - packageName = "yamljs"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/yamljs/-/yamljs-0.3.0.tgz"; - sha512 = "C/FsVVhht4iPQYXOInoxUM/1ELSf9EsgKH34FofQOp6hwCPrW4vG4w5++TED3xRUo8gD7l0P1J1dLlDYzODsTQ=="; - }; - }; - "yargs-16.2.0" = { - name = "yargs"; - packageName = "yargs"; - version = "16.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz"; - sha512 = "D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw=="; - }; - }; - "yargs-17.1.1" = { - name = "yargs"; - packageName = "yargs"; - version = "17.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-17.1.1.tgz"; - sha512 = "c2k48R0PwKIqKhPMWjeiF6y2xY/gPMUlro0sgxqXpbOIohWiLNXWslsootttv7E1e73QPAMQSg5FeySbVcpsPQ=="; - }; - }; - "yargs-17.7.2" = { - name = "yargs"; - packageName = "yargs"; - version = "17.7.2"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz"; - sha512 = "7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w=="; - }; - }; - "yargs-parser-20.2.9" = { - name = "yargs-parser"; - packageName = "yargs-parser"; - version = "20.2.9"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz"; - sha512 = "y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w=="; - }; - }; - "yargs-parser-21.1.1" = { - name = "yargs-parser"; - packageName = "yargs-parser"; - version = "21.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz"; - sha512 = "tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw=="; - }; - }; - "yn-3.1.1" = { - name = "yn"; - packageName = "yn"; - version = "3.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz"; - sha512 = "Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q=="; - }; - }; - "yocto-queue-0.1.0" = { - name = "yocto-queue"; - packageName = "yocto-queue"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz"; - sha512 = "rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q=="; - }; - }; - "yup-0.32.11" = { - name = "yup"; - packageName = "yup"; - version = "0.32.11"; - src = fetchurl { - url = "https://registry.npmjs.org/yup/-/yup-0.32.11.tgz"; - sha512 = "Z2Fe1bn+eLstG8DRR6FTavGD+MeAwyfmouhHsIUgaADz8jvFKbO/fXc2trJKZg+5EBjh4gGm3iU/t3onKlXHIg=="; - }; - }; - }; -in -{ - n8n = nodeEnv.buildNodePackage { - name = "n8n"; - packageName = "n8n"; - version = "1.9.3"; - src = fetchurl { - url = "https://registry.npmjs.org/n8n/-/n8n-1.9.3.tgz"; - sha512 = "+7DknxJzcLwuqwXnXgt627BM0Ve37QAnioy6f/qhhsQUAPEZ0e78lCHyb4yE62Zmf87fskFSCXl61rMXPFpdjw=="; - }; - dependencies = [ - (sources."@acuminous/bitsyntax-0.1.2" // { - dependencies = [ - sources."safe-buffer-5.1.2" - ]; - }) - (sources."@apidevtools/json-schema-ref-parser-9.0.9" // { - dependencies = [ - sources."argparse-2.0.1" - sources."js-yaml-4.1.0" - ]; - }) - sources."@authenio/xml-encryption-2.0.2" - (sources."@aws-crypto/crc32-3.0.0" // { - dependencies = [ - sources."tslib-1.14.1" - ]; - }) - (sources."@aws-crypto/crc32c-3.0.0" // { - dependencies = [ - sources."tslib-1.14.1" - ]; - }) - (sources."@aws-crypto/ie11-detection-3.0.0" // { - dependencies = [ - sources."tslib-1.14.1" - ]; - }) - (sources."@aws-crypto/sha1-browser-3.0.0" // { - dependencies = [ - sources."tslib-1.14.1" - ]; - }) - (sources."@aws-crypto/sha256-browser-3.0.0" // { - dependencies = [ - sources."tslib-1.14.1" - ]; - }) - (sources."@aws-crypto/sha256-js-3.0.0" // { - dependencies = [ - sources."tslib-1.14.1" - ]; - }) - (sources."@aws-crypto/supports-web-crypto-3.0.0" // { - dependencies = [ - sources."tslib-1.14.1" - ]; - }) - (sources."@aws-crypto/util-3.0.0" // { - dependencies = [ - sources."tslib-1.14.1" - ]; - }) - sources."@aws-sdk/client-cognito-identity-3.427.0" - sources."@aws-sdk/client-s3-3.427.0" - sources."@aws-sdk/client-sso-3.427.0" - sources."@aws-sdk/client-sts-3.427.0" - sources."@aws-sdk/credential-provider-cognito-identity-3.427.0" - sources."@aws-sdk/credential-provider-env-3.425.0" - sources."@aws-sdk/credential-provider-http-3.425.0" - sources."@aws-sdk/credential-provider-ini-3.427.0" - sources."@aws-sdk/credential-provider-node-3.427.0" - sources."@aws-sdk/credential-provider-process-3.425.0" - sources."@aws-sdk/credential-provider-sso-3.427.0" - sources."@aws-sdk/credential-provider-web-identity-3.425.0" - sources."@aws-sdk/credential-providers-3.427.0" - sources."@aws-sdk/middleware-bucket-endpoint-3.425.0" - sources."@aws-sdk/middleware-expect-continue-3.425.0" - sources."@aws-sdk/middleware-flexible-checksums-3.425.0" - sources."@aws-sdk/middleware-host-header-3.425.0" - sources."@aws-sdk/middleware-location-constraint-3.425.0" - sources."@aws-sdk/middleware-logger-3.425.0" - sources."@aws-sdk/middleware-recursion-detection-3.425.0" - sources."@aws-sdk/middleware-sdk-s3-3.427.0" - sources."@aws-sdk/middleware-sdk-sts-3.425.0" - sources."@aws-sdk/middleware-signing-3.425.0" - sources."@aws-sdk/middleware-ssec-3.425.0" - sources."@aws-sdk/middleware-user-agent-3.427.0" - sources."@aws-sdk/region-config-resolver-3.425.0" - sources."@aws-sdk/signature-v4-multi-region-3.425.0" - sources."@aws-sdk/token-providers-3.427.0" - sources."@aws-sdk/types-3.425.0" - sources."@aws-sdk/util-arn-parser-3.310.0" - sources."@aws-sdk/util-endpoints-3.427.0" - sources."@aws-sdk/util-locate-window-3.310.0" - sources."@aws-sdk/util-user-agent-browser-3.425.0" - sources."@aws-sdk/util-user-agent-node-3.425.0" - sources."@aws-sdk/util-utf8-browser-3.259.0" - sources."@aws-sdk/xml-builder-3.310.0" - sources."@azure/abort-controller-1.1.0" - sources."@azure/core-auth-1.5.0" - sources."@azure/core-client-1.7.3" - (sources."@azure/core-http-3.0.3" // { - dependencies = [ - sources."@azure/core-tracing-1.0.0-preview.13" - ]; - }) - sources."@azure/core-http-compat-1.3.0" - sources."@azure/core-lro-2.5.4" - sources."@azure/core-paging-1.5.0" - (sources."@azure/core-rest-pipeline-1.12.1" // { - dependencies = [ - sources."@tootallnate/once-2.0.0" - sources."http-proxy-agent-5.0.0" - ]; - }) - sources."@azure/core-tracing-1.0.1" - sources."@azure/core-util-1.5.0" - (sources."@azure/identity-2.1.0" // { - dependencies = [ - sources."jwa-2.0.0" - sources."jws-4.0.0" - sources."open-8.4.2" - ]; - }) - sources."@azure/keyvault-keys-4.7.2" - sources."@azure/logger-1.0.4" - (sources."@azure/msal-browser-2.38.2" // { - dependencies = [ - sources."@azure/msal-common-13.3.0" - ]; - }) - sources."@azure/msal-common-7.6.0" - (sources."@azure/msal-node-1.18.3" // { - dependencies = [ - sources."@azure/msal-common-13.3.0" - ]; - }) - (sources."@azure/storage-blob-12.16.0" // { - dependencies = [ - sources."@azure/core-tracing-1.0.0-preview.13" - ]; - }) - (sources."@babel/runtime-7.23.1" // { - dependencies = [ - sources."regenerator-runtime-0.14.0" - ]; - }) - sources."@colors/colors-1.6.0" - sources."@cspotcode/source-map-support-0.8.1" - sources."@curlconverter/yargs-0.0.2" - sources."@curlconverter/yargs-parser-0.0.1" - sources."@dabh/diagnostics-2.0.3" - sources."@ewoudenberg/difflib-0.1.0" - sources."@fastify/busboy-2.0.0" - sources."@gar/promisify-1.1.3" - sources."@google-cloud/common-3.10.0" - sources."@google-cloud/paginator-3.0.7" - sources."@google-cloud/precise-date-2.0.4" - sources."@google-cloud/projectify-2.1.1" - sources."@google-cloud/promisify-2.0.4" - sources."@google-cloud/spanner-5.18.0" - (sources."@google-cloud/storage-6.12.0" // { - dependencies = [ - sources."@google-cloud/projectify-3.0.0" - sources."@google-cloud/promisify-3.0.1" - sources."@tootallnate/once-2.0.0" - sources."gaxios-5.1.3" - sources."gcp-metadata-5.3.0" - sources."google-auth-library-8.9.0" - sources."google-p12-pem-4.0.1" - sources."gtoken-6.1.2" - sources."http-proxy-agent-5.0.0" - sources."jwa-2.0.0" - sources."jws-4.0.0" - sources."lru-cache-6.0.0" - sources."mime-3.0.0" - sources."retry-request-5.0.2" - (sources."teeny-request-8.0.3" // { - dependencies = [ - sources."uuid-9.0.1" - ]; - }) - sources."yallist-4.0.0" - ]; - }) - (sources."@grpc/grpc-js-1.6.12" // { - dependencies = [ - sources."@grpc/proto-loader-0.7.10" - sources."cliui-8.0.1" - sources."long-5.2.3" - sources."protobufjs-7.2.5" - sources."wrap-ansi-7.0.0" - sources."yargs-17.7.2" - sources."yargs-parser-21.1.1" - ]; - }) - (sources."@grpc/proto-loader-0.6.13" // { - dependencies = [ - sources."yargs-16.2.0" - ]; - }) - (sources."@httptoolkit/websocket-stream-6.0.1" // { - dependencies = [ - sources."duplexify-3.7.1" - ]; - }) - (sources."@icetee/ftp-0.3.15" // { - dependencies = [ - sources."isarray-0.0.1" - sources."readable-stream-1.1.14" - sources."string_decoder-0.10.31" - ]; - }) - sources."@ioredis/commands-1.2.0" - (sources."@isaacs/cliui-8.0.2" // { - dependencies = [ - sources."ansi-regex-6.0.1" - sources."ansi-styles-6.2.1" - sources."emoji-regex-9.2.2" - sources."string-width-5.1.2" - sources."strip-ansi-7.1.0" - sources."wrap-ansi-8.1.0" - ]; - }) - sources."@jridgewell/gen-mapping-0.3.3" - sources."@jridgewell/resolve-uri-3.1.1" - sources."@jridgewell/set-array-1.1.2" - sources."@jridgewell/source-map-0.3.5" - sources."@jridgewell/sourcemap-codec-1.4.15" - sources."@jridgewell/trace-mapping-0.3.9" - sources."@js-joda/core-5.6.0" - sources."@jsdevtools/ono-7.1.3" - sources."@kafkajs/confluent-schema-registry-1.0.6" - sources."@kwsites/file-exists-1.1.1" - sources."@kwsites/promise-deferred-1.1.1" - sources."@mapbox/node-pre-gyp-1.0.11" - sources."@mongodb-js/zstd-1.2.0" - sources."@n8n/client-oauth2-0.7.0" - (sources."@n8n/tournament-1.0.2" // { - dependencies = [ - sources."ast-types-0.16.1" - (sources."recast-0.22.0" // { - dependencies = [ - sources."ast-types-0.15.2" - ]; - }) - ]; - }) - sources."@n8n/vm2-3.9.23" - sources."@n8n_io/license-sdk-2.6.1" - sources."@n8n_io/riot-tmpl-4.0.1" - sources."@nodelib/fs.scandir-2.1.5" - sources."@nodelib/fs.stat-2.0.5" - sources."@nodelib/fs.walk-1.2.8" - sources."@npmcli/fs-1.1.1" - (sources."@npmcli/move-file-1.1.2" // { - dependencies = [ - sources."mkdirp-1.0.4" - ]; - }) - sources."@oclif/command-1.8.36" - sources."@oclif/config-1.18.17" - (sources."@oclif/core-1.26.2" // { - dependencies = [ - sources."supports-color-8.1.1" - sources."wrap-ansi-7.0.0" - ]; - }) - (sources."@oclif/errors-1.3.6" // { - dependencies = [ - sources."fs-extra-8.1.0" - sources."jsonfile-4.0.0" - sources."universalify-0.1.2" - sources."wrap-ansi-7.0.0" - ]; - }) - (sources."@oclif/help-1.0.15" // { - dependencies = [ - sources."@oclif/config-1.18.16" - ]; - }) - sources."@oclif/linewrap-1.0.0" - sources."@oclif/parser-3.8.17" - sources."@oclif/screen-3.0.7" - sources."@opentelemetry/api-1.6.0" - sources."@protobufjs/aspromise-1.1.2" - sources."@protobufjs/base64-1.1.2" - sources."@protobufjs/codegen-2.0.4" - sources."@protobufjs/eventemitter-1.1.0" - sources."@protobufjs/fetch-1.1.0" - sources."@protobufjs/float-1.0.2" - sources."@protobufjs/inquire-1.1.0" - sources."@protobufjs/path-1.1.2" - sources."@protobufjs/pool-1.1.0" - sources."@protobufjs/utf8-1.1.0" - sources."@redis/bloom-1.2.0" - (sources."@redis/client-1.5.11" // { - dependencies = [ - sources."yallist-4.0.0" - ]; - }) - sources."@redis/graph-1.1.0" - sources."@redis/json-1.0.6" - sources."@redis/search-1.1.5" - sources."@redis/time-series-1.0.5" - (sources."@rudderstack/rudder-sdk-node-1.0.6" // { - dependencies = [ - sources."bull-3.29.3" - sources."ioredis-4.28.5" - ]; - }) - (sources."@sap/hana-client-2.18.24" // { - dependencies = [ - sources."debug-3.1.0" - sources."ms-2.0.0" - ]; - }) - sources."@segment/loosely-validate-event-2.0.0" - (sources."@selderee/plugin-htmlparser2-0.11.0" // { - dependencies = [ - sources."domhandler-5.0.3" - ]; - }) - sources."@sentry-internal/tracing-7.73.0" - sources."@sentry/core-7.73.0" - sources."@sentry/integrations-7.73.0" - sources."@sentry/node-7.73.0" - sources."@sentry/types-7.73.0" - sources."@sentry/utils-7.73.0" - sources."@smithy/abort-controller-2.0.11" - sources."@smithy/chunked-blob-reader-2.0.0" - sources."@smithy/chunked-blob-reader-native-2.0.0" - sources."@smithy/config-resolver-2.0.14" - sources."@smithy/credential-provider-imds-2.0.16" - sources."@smithy/eventstream-codec-2.0.11" - sources."@smithy/eventstream-serde-browser-2.0.11" - sources."@smithy/eventstream-serde-config-resolver-2.0.11" - sources."@smithy/eventstream-serde-node-2.0.11" - sources."@smithy/eventstream-serde-universal-2.0.11" - sources."@smithy/fetch-http-handler-2.2.3" - sources."@smithy/hash-blob-browser-2.0.11" - sources."@smithy/hash-node-2.0.11" - sources."@smithy/hash-stream-node-2.0.11" - sources."@smithy/invalid-dependency-2.0.11" - sources."@smithy/is-array-buffer-2.0.0" - sources."@smithy/md5-js-2.0.11" - sources."@smithy/middleware-content-length-2.0.13" - sources."@smithy/middleware-endpoint-2.1.0" - sources."@smithy/middleware-retry-2.0.16" - sources."@smithy/middleware-serde-2.0.11" - sources."@smithy/middleware-stack-2.0.5" - sources."@smithy/node-config-provider-2.1.1" - sources."@smithy/node-http-handler-2.1.7" - sources."@smithy/property-provider-2.0.12" - sources."@smithy/protocol-http-3.0.7" - sources."@smithy/querystring-builder-2.0.11" - sources."@smithy/querystring-parser-2.0.11" - sources."@smithy/service-error-classification-2.0.4" - sources."@smithy/shared-ini-file-loader-2.2.0" - sources."@smithy/signature-v4-2.0.11" - sources."@smithy/smithy-client-2.1.11" - sources."@smithy/types-2.3.5" - sources."@smithy/url-parser-2.0.11" - sources."@smithy/util-base64-2.0.0" - sources."@smithy/util-body-length-browser-2.0.0" - sources."@smithy/util-body-length-node-2.1.0" - sources."@smithy/util-buffer-from-2.0.0" - sources."@smithy/util-config-provider-2.0.0" - sources."@smithy/util-defaults-mode-browser-2.0.15" - sources."@smithy/util-defaults-mode-node-2.0.19" - sources."@smithy/util-hex-encoding-2.0.0" - sources."@smithy/util-middleware-2.0.4" - sources."@smithy/util-retry-2.0.4" - sources."@smithy/util-stream-2.0.16" - sources."@smithy/util-uri-escape-2.0.0" - sources."@smithy/util-utf8-2.0.0" - sources."@smithy/util-waiter-2.0.11" - sources."@sqltools/formatter-1.2.5" - sources."@swc/core-1.3.92" - sources."@swc/counter-0.1.2" - sources."@swc/helpers-0.5.3" - sources."@swc/types-0.1.5" - sources."@swc/wasm-1.3.92" - sources."@techteamer/ocsp-1.0.0" - sources."@tediousjs/connection-string-0.5.0" - sources."@tokenizer/token-0.3.0" - sources."@tootallnate/once-1.1.2" - sources."@tsconfig/node10-1.0.9" - sources."@tsconfig/node12-1.0.11" - sources."@tsconfig/node14-1.0.3" - sources."@tsconfig/node16-1.0.4" - sources."@types/asn1-0.2.1" - sources."@types/big.js-6.2.0" - sources."@types/body-parser-1.19.3" - sources."@types/connect-3.4.36" - sources."@types/duplexify-3.6.2" - sources."@types/es-aggregate-error-1.0.3" - sources."@types/eslint-8.44.4" - sources."@types/eslint-scope-3.7.5" - sources."@types/estree-1.0.2" - sources."@types/express-4.17.19" - sources."@types/express-serve-static-core-4.17.37" - sources."@types/http-errors-2.0.2" - sources."@types/json-schema-7.0.13" - sources."@types/jsonwebtoken-9.0.3" - sources."@types/lodash-4.14.199" - sources."@types/long-4.0.2" - sources."@types/mime-1.3.3" - sources."@types/multer-1.4.8" - sources."@types/node-20.8.4" - sources."@types/node-fetch-2.6.6" - sources."@types/pumpify-1.4.2" - sources."@types/qs-6.9.8" - sources."@types/range-parser-1.2.5" - (sources."@types/readable-stream-4.0.3" // { - dependencies = [ - sources."safe-buffer-5.1.2" - ]; - }) - sources."@types/send-0.17.2" - sources."@types/serve-static-1.15.3" - sources."@types/stack-trace-0.0.29" - sources."@types/triple-beam-1.3.3" - sources."@types/tunnel-0.0.3" - sources."@types/uuid-9.0.5" - sources."@types/validator-13.11.2" - sources."@types/webidl-conversions-7.0.1" - sources."@types/whatwg-url-8.2.2" - sources."@types/ws-8.5.7" - sources."@webassemblyjs/ast-1.11.6" - sources."@webassemblyjs/floating-point-hex-parser-1.11.6" - sources."@webassemblyjs/helper-api-error-1.11.6" - sources."@webassemblyjs/helper-buffer-1.11.6" - sources."@webassemblyjs/helper-numbers-1.11.6" - sources."@webassemblyjs/helper-wasm-bytecode-1.11.6" - sources."@webassemblyjs/helper-wasm-section-1.11.6" - sources."@webassemblyjs/ieee754-1.11.6" - sources."@webassemblyjs/leb128-1.11.6" - sources."@webassemblyjs/utf8-1.11.6" - sources."@webassemblyjs/wasm-edit-1.11.6" - sources."@webassemblyjs/wasm-gen-1.11.6" - sources."@webassemblyjs/wasm-opt-1.11.6" - sources."@webassemblyjs/wasm-parser-1.11.6" - sources."@webassemblyjs/wast-printer-1.11.6" - sources."@xmldom/xmldom-0.8.10" - sources."@xtuc/ieee754-1.2.0" - sources."@xtuc/long-4.2.2" - sources."a-sync-waterfall-1.0.1" - sources."abbrev-1.1.1" - sources."abort-controller-3.0.0" - sources."accepts-1.3.8" - sources."acorn-8.10.0" - sources."acorn-import-assertions-1.9.0" - sources."acorn-walk-8.2.0" - sources."agent-base-6.0.2" - sources."agentkeepalive-4.5.0" - (sources."aggregate-error-3.1.0" // { - dependencies = [ - sources."clean-stack-2.2.0" - ]; - }) - sources."ajv-6.12.6" - sources."ajv-keywords-3.5.2" - (sources."amqplib-0.10.3" // { - dependencies = [ - sources."isarray-0.0.1" - sources."readable-stream-1.1.14" - sources."string_decoder-0.10.31" - ]; - }) - sources."ansi-escapes-4.3.2" - sources."ansi-regex-5.0.1" - sources."ansi-styles-4.3.0" - sources."ansicolors-0.3.2" - sources."any-promise-1.3.0" - sources."anymatch-3.1.3" - sources."app-root-path-3.1.0" - sources."append-field-1.0.0" - sources."aproba-2.0.0" - (sources."are-we-there-yet-2.0.0" // { - dependencies = [ - sources."readable-stream-3.6.2" - ]; - }) - sources."arg-4.1.3" - sources."argparse-1.0.10" - sources."array-buffer-byte-length-1.0.0" - sources."array-flatten-1.1.1" - sources."array-parallel-0.1.3" - sources."array-series-0.1.5" - sources."array-union-2.1.0" - sources."array.prototype.reduce-1.0.6" - sources."arraybuffer.prototype.slice-1.0.2" - sources."arrify-2.0.1" - sources."asap-2.0.6" - sources."asn1-0.2.6" - (sources."asn1.js-5.4.1" // { - dependencies = [ - sources."bn.js-4.12.0" - ]; - }) - sources."asn1.js-rfc2560-5.0.1" - sources."asn1.js-rfc5280-3.0.0" - sources."assert-2.1.0" - sources."assert-options-0.8.0" - sources."assert-plus-1.0.0" - sources."ast-types-0.15.2" - sources."async-3.2.4" - (sources."async-retry-1.3.3" // { - dependencies = [ - sources."retry-0.13.1" - ]; - }) - sources."asynckit-0.4.0" - sources."at-least-node-1.0.0" - (sources."auto-changelog-1.16.4" // { - dependencies = [ - sources."semver-6.3.1" - ]; - }) - sources."available-typed-arrays-1.0.5" - sources."avsc-5.7.7" - (sources."aws-crt-1.18.0" // { - dependencies = [ - sources."axios-0.24.0" - ]; - }) - sources."aws4-1.12.0" - sources."axios-0.21.4" - sources."axios-retry-3.8.0" - sources."balanced-match-1.0.2" - sources."base-64-1.0.0" - sources."base64-js-1.5.1" - (sources."basic-auth-2.0.1" // { - dependencies = [ - sources."safe-buffer-5.1.2" - ]; - }) - (sources."bcrypt-pbkdf-1.0.2" // { - dependencies = [ - sources."tweetnacl-0.14.5" - ]; - }) - sources."bcryptjs-2.4.3" - sources."better-sqlite3-8.7.0" - sources."big-integer-1.6.51" - sources."big.js-6.2.1" - sources."bignumber.js-9.1.2" - sources."binary-extensions-2.2.0" - sources."binascii-0.0.2" - sources."bindings-1.5.0" - sources."bintrees-1.0.2" - (sources."bl-4.1.0" // { - dependencies = [ - sources."buffer-5.7.1" - sources."readable-stream-3.6.2" - ]; - }) - sources."bluebird-2.11.0" - sources."bn.js-5.2.1" - (sources."body-parser-1.20.1" // { - dependencies = [ - sources."bytes-3.1.2" - sources."debug-2.6.9" - sources."iconv-lite-0.4.24" - sources."ms-2.0.0" - sources."raw-body-2.5.1" - ]; - }) - sources."boolbase-1.0.0" - sources."bowser-2.11.0" - sources."brace-expansion-2.0.1" - sources."braces-3.0.2" - sources."browser-request-0.3.3" - sources."browserslist-4.22.1" - sources."bson-5.5.0" - sources."buffer-6.0.3" - sources."buffer-equal-constant-time-1.0.1" - sources."buffer-from-1.1.2" - sources."buffer-more-ints-1.0.0" - sources."buffer-writer-2.0.0" - sources."bufferutil-4.0.7" - (sources."bull-4.11.3" // { - dependencies = [ - sources."cron-parser-4.9.0" - ]; - }) - sources."busboy-1.6.0" - sources."bytes-3.0.0" - (sources."cacache-15.3.0" // { - dependencies = [ - sources."glob-7.2.3" - sources."lru-cache-6.0.0" - sources."minipass-3.3.6" - sources."mkdirp-1.0.4" - sources."p-map-4.0.0" - sources."yallist-4.0.0" - ]; - }) - sources."cache-manager-5.2.4" - sources."cache-manager-ioredis-yet-1.2.2" - sources."call-bind-1.0.2" - sources."call-me-maybe-1.0.2" - sources."callsites-3.1.0" - sources."camel-case-4.1.2" - sources."camelcase-6.3.0" - sources."caniuse-lite-1.0.30001547" - sources."capital-case-1.0.4" - sources."cardinal-2.1.1" - sources."chalk-4.1.2" - sources."change-case-4.1.2" - sources."chardet-0.7.0" - sources."charenc-0.0.2" - (sources."checkpoint-stream-0.1.2" // { - dependencies = [ - sources."async-2.6.4" - sources."split-array-stream-1.0.3" - sources."through2-2.0.5" - ]; - }) - (sources."cheerio-1.0.0-rc.6" // { - dependencies = [ - sources."parse5-6.0.1" - ]; - }) - sources."cheerio-select-1.6.0" - sources."chokidar-3.5.3" - sources."chownr-2.0.0" - sources."chrome-trace-event-1.0.3" - sources."class-transformer-0.5.1" - sources."class-validator-0.14.0" - sources."clean-stack-3.0.1" - sources."cli-cursor-3.1.0" - (sources."cli-highlight-2.1.11" // { - dependencies = [ - sources."yargs-16.2.0" - ]; - }) - sources."cli-progress-3.12.0" - sources."cli-width-3.0.0" - (sources."cliui-7.0.4" // { - dependencies = [ - sources."wrap-ansi-7.0.0" - ]; - }) - sources."cluster-key-slot-1.1.2" - (sources."color-3.2.1" // { - dependencies = [ - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - ]; - }) - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."color-string-1.9.1" - sources."color-support-1.1.3" - sources."colors-1.4.0" - sources."colorspace-1.1.4" - sources."combined-stream-1.0.8" - sources."commander-5.1.0" - sources."commist-1.1.0" - sources."component-type-1.2.1" - sources."compressible-2.0.18" - (sources."compression-1.7.4" // { - dependencies = [ - sources."debug-2.6.9" - sources."ms-2.0.0" - sources."safe-buffer-5.1.2" - ]; - }) - sources."concat-map-0.0.1" - sources."concat-stream-1.6.2" - sources."connect-history-api-fallback-1.6.0" - sources."console-control-strings-1.1.0" - sources."constant-case-3.0.4" - sources."content-disposition-0.5.4" - sources."content-type-1.0.5" - sources."convict-6.2.4" - sources."cookie-0.5.0" - (sources."cookie-parser-1.4.6" // { - dependencies = [ - sources."cookie-0.4.1" - ]; - }) - sources."cookie-signature-1.0.6" - sources."core-js-3.33.0" - sources."core-util-is-1.0.3" - sources."create-require-1.1.1" - sources."cron-1.7.2" - sources."cron-parser-2.18.0" - sources."cross-spawn-7.0.3" - sources."crypt-0.0.2" - sources."crypto-js-4.1.1" - sources."csrf-3.1.0" - sources."css-select-4.3.0" - sources."css-what-6.1.0" - sources."csv-parse-5.5.2" - (sources."curlconverter-3.21.0" // { - dependencies = [ - sources."cookie-0.4.2" - ]; - }) - sources."currency-codes-2.1.0" - sources."dashdash-1.14.1" - sources."data-api-client-1.3.0" - sources."date-fns-2.30.0" - sources."debug-4.3.4" - sources."debuglog-1.0.1" - sources."decode-uri-component-0.2.2" - sources."decompress-response-6.0.0" - sources."deep-equal-2.2.2" - sources."deep-extend-0.6.0" - sources."deepmerge-4.3.1" - sources."define-data-property-1.1.0" - sources."define-lazy-prop-2.0.0" - sources."define-properties-1.2.1" - sources."delayed-stream-1.0.0" - sources."delegates-1.0.0" - sources."denque-1.5.1" - sources."depd-2.0.0" - sources."destroy-1.2.0" - sources."detect-libc-2.0.2" - sources."dezalgo-1.0.4" - sources."diff-4.0.2" - sources."dir-glob-3.0.1" - sources."dom-serializer-1.4.1" - sources."domelementtype-2.3.0" - sources."domhandler-4.3.1" - sources."dommatrix-1.0.3" - sources."domutils-2.8.0" - sources."dot-case-3.0.4" - sources."dotenv-8.6.0" - sources."dreamopt-0.8.0" - (sources."duplexify-4.1.2" // { - dependencies = [ - sources."readable-stream-3.6.2" - ]; - }) - sources."eastasianwidth-0.2.0" - sources."ecc-jsbn-0.1.2" - sources."ecdsa-sig-formatter-1.0.11" - sources."ee-first-1.1.1" - sources."ejs-3.1.9" - sources."electron-to-chromium-1.4.549" - sources."emoji-regex-8.0.0" - sources."emojis-list-3.0.0" - sources."enabled-2.0.0" - sources."encodeurl-1.0.2" - sources."encoding-0.1.13" - sources."encoding-japanese-2.0.0" - sources."end-of-stream-1.4.4" - sources."enhanced-resolve-5.15.0" - sources."ent-2.2.0" - sources."entities-2.2.0" - sources."env-paths-2.2.1" - sources."err-code-2.0.3" - sources."es-abstract-1.22.2" - sources."es-aggregate-error-1.0.11" - sources."es-array-method-boxes-properly-1.0.0" - sources."es-get-iterator-1.1.3" - sources."es-module-lexer-1.3.1" - sources."es-set-tostringtag-2.0.1" - sources."es-to-primitive-1.2.1" - sources."escalade-3.1.1" - sources."escape-html-1.0.3" - sources."escape-string-regexp-4.0.0" - sources."eslint-config-riot-1.0.0" - sources."eslint-scope-5.1.1" - sources."esprima-4.0.1" - sources."esprima-next-5.8.4" - (sources."esrecurse-4.3.0" // { - dependencies = [ - sources."estraverse-5.3.0" - ]; - }) - sources."estraverse-4.3.0" - sources."etag-1.8.1" - sources."event-target-shim-5.0.1" - sources."eventemitter3-4.0.7" - sources."events-3.3.0" - sources."events-intercept-2.0.0" - sources."eventsource-2.0.2" - sources."expand-template-2.0.3" - sources."expand-tilde-2.0.2" - (sources."express-4.18.2" // { - dependencies = [ - sources."debug-2.6.9" - sources."ms-2.0.0" - ]; - }) - sources."express-async-errors-3.1.1" - (sources."express-handlebars-7.1.2" // { - dependencies = [ - sources."handlebars-4.7.8" - ]; - }) - (sources."express-openapi-validator-4.13.8" // { - dependencies = [ - sources."media-typer-1.1.0" - sources."path-to-regexp-6.2.1" - ]; - }) - sources."express-prom-bundle-6.6.0" - sources."extend-3.0.2" - (sources."external-editor-3.1.0" // { - dependencies = [ - sources."iconv-lite-0.4.24" - ]; - }) - sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.3.1" - sources."fast-json-stable-stringify-2.1.0" - sources."fast-text-encoding-1.0.6" - sources."fast-xml-parser-4.2.5" - sources."fastq-1.15.0" - sources."fecha-4.2.3" - sources."fflate-0.7.4" - (sources."figures-3.2.0" // { - dependencies = [ - sources."escape-string-regexp-1.0.5" - ]; - }) - sources."file-type-16.5.4" - sources."file-uri-to-path-1.0.0" - (sources."filelist-1.0.4" // { - dependencies = [ - sources."minimatch-5.1.6" - ]; - }) - sources."fill-range-7.0.1" - sources."filter-obj-1.1.0" - (sources."finalhandler-1.2.0" // { - dependencies = [ - sources."debug-2.6.9" - sources."ms-2.0.0" - ]; - }) - sources."first-match-0.0.1" - sources."flatted-3.2.9" - sources."fn.name-1.1.0" - sources."follow-redirects-1.15.3" - sources."for-each-0.3.3" - sources."foreground-child-3.1.1" - sources."form-data-4.0.0" - sources."formidable-3.5.1" - sources."forwarded-0.2.0" - sources."fresh-0.5.2" - sources."fs-constants-1.0.0" - sources."fs-extra-9.1.0" - (sources."fs-minipass-2.1.0" // { - dependencies = [ - sources."minipass-3.3.6" - sources."yallist-4.0.0" - ]; - }) - sources."fs.realpath-1.0.0" - sources."function-bind-1.1.1" - sources."function.prototype.name-1.1.6" - sources."functions-have-names-1.2.3" - (sources."gauge-3.0.2" // { - dependencies = [ - sources."signal-exit-3.0.7" - ]; - }) - sources."gaxios-4.3.3" - sources."gcp-metadata-4.3.1" - sources."generate-function-2.3.1" - sources."generic-pool-3.9.0" - sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.2.1" - sources."get-package-type-0.1.0" - sources."get-port-5.1.1" - sources."get-symbol-description-1.0.0" - sources."get-system-fonts-2.0.2" - sources."getpass-0.1.7" - sources."github-from-package-0.0.0" - (sources."glob-10.3.10" // { - dependencies = [ - sources."minimatch-9.0.3" - ]; - }) - sources."glob-parent-5.1.2" - sources."glob-to-regexp-0.4.1" - sources."globalthis-1.0.3" - sources."globby-11.1.0" - (sources."gm-1.25.0" // { - dependencies = [ - sources."cross-spawn-4.0.2" - sources."debug-3.2.7" - sources."lru-cache-4.1.5" - sources."which-1.3.1" - ]; - }) - (sources."google-auth-library-7.14.1" // { - dependencies = [ - sources."jwa-2.0.0" - sources."jws-4.0.0" - sources."lru-cache-6.0.0" - sources."yallist-4.0.0" - ]; - }) - (sources."google-gax-2.30.5" // { - dependencies = [ - sources."protobufjs-6.11.3" - ]; - }) - sources."google-p12-pem-3.1.4" - sources."google-timezones-json-1.2.0" - sources."gopd-1.0.1" - sources."graceful-fs-4.2.11" - sources."grpc-gcp-0.3.3" - (sources."gtoken-5.3.2" // { - dependencies = [ - sources."jwa-2.0.0" - sources."jws-4.0.0" - ]; - }) - sources."handlebars-4.7.7" - sources."has-1.0.4" - sources."has-bigints-1.0.2" - sources."has-flag-4.0.0" - sources."has-property-descriptors-1.0.0" - sources."has-proto-1.0.1" - sources."has-symbols-1.0.3" - sources."has-tostringtag-1.0.0" - sources."has-unicode-2.0.1" - sources."hdb-pool-0.1.6" - sources."he-1.2.0" - sources."header-case-2.0.4" - sources."heap-0.2.7" - (sources."help-me-3.0.0" // { - dependencies = [ - sources."glob-7.2.3" - sources."readable-stream-3.6.2" - ]; - }) - sources."hexoid-1.0.0" - sources."highlight.js-10.7.3" - sources."homedir-polyfill-1.0.3" - (sources."html-to-text-9.0.5" // { - dependencies = [ - sources."dom-serializer-2.0.0" - sources."domhandler-5.0.3" - sources."domutils-3.1.0" - sources."entities-4.5.0" - sources."htmlparser2-8.0.2" - ]; - }) - sources."htmlparser2-6.1.0" - sources."http-cache-semantics-4.1.1" - sources."http-errors-2.0.0" - sources."http-proxy-agent-4.0.1" - sources."https-proxy-agent-5.0.1" - sources."humanize-ms-1.2.1" - sources."hyperlinker-1.0.0" - sources."iconv-lite-0.6.3" - sources."ics-2.44.0" - sources."ieee754-1.2.1" - sources."ignore-5.2.4" - (sources."imap-0.8.19" // { - dependencies = [ - sources."isarray-0.0.1" - sources."readable-stream-1.1.14" - sources."string_decoder-0.10.31" - ]; - }) - (sources."imap-simple-4.3.0" // { - dependencies = [ - sources."iconv-lite-0.4.24" - ]; - }) - sources."immediate-3.0.6" - sources."imurmurhash-0.1.4" - sources."indent-string-4.0.0" - sources."infer-owner-1.0.4" - (sources."infisical-node-1.5.0" // { - dependencies = [ - sources."axios-1.5.1" - sources."dotenv-16.3.1" - ]; - }) - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."ini-1.3.8" - sources."inquirer-7.3.3" - sources."internal-slot-1.0.5" - sources."interpret-1.4.0" - (sources."ioredis-5.3.2" // { - dependencies = [ - sources."denque-2.1.0" - ]; - }) - sources."ip-2.0.0" - sources."ipaddr.js-1.9.1" - sources."is-3.3.0" - sources."is-arguments-1.1.1" - sources."is-array-buffer-3.0.2" - sources."is-arrayish-0.3.2" - sources."is-bigint-1.0.4" - sources."is-binary-path-2.1.0" - sources."is-boolean-object-1.1.2" - sources."is-buffer-1.1.6" - sources."is-callable-1.2.7" - sources."is-core-module-2.13.0" - sources."is-date-object-1.0.5" - sources."is-docker-2.2.1" - sources."is-extglob-2.1.1" - sources."is-fullwidth-code-point-3.0.0" - sources."is-generator-function-1.0.10" - sources."is-glob-4.0.3" - sources."is-lambda-1.0.1" - sources."is-map-2.0.2" - sources."is-nan-1.3.2" - sources."is-negative-zero-2.0.2" - sources."is-number-7.0.0" - sources."is-number-object-1.0.7" - sources."is-promise-1.0.1" - sources."is-property-1.0.2" - sources."is-regex-1.1.4" - sources."is-retry-allowed-2.2.0" - sources."is-set-2.0.2" - sources."is-shared-array-buffer-1.0.2" - sources."is-stream-2.0.1" - sources."is-stream-ended-0.1.4" - sources."is-string-1.0.7" - sources."is-symbol-1.0.4" - sources."is-typed-array-1.1.12" - sources."is-weakmap-2.0.1" - sources."is-weakref-1.0.2" - sources."is-weakset-2.0.2" - sources."is-wsl-2.2.0" - sources."isarray-2.0.5" - sources."isbot-3.7.0" - sources."isexe-2.0.0" - sources."iso-639-1-2.1.15" - sources."isomorphic-ws-4.0.1" - sources."jackspeak-2.3.6" - sources."jake-10.8.7" - (sources."jest-worker-27.5.1" // { - dependencies = [ - sources."supports-color-8.1.1" - ]; - }) - sources."jmespath-0.16.0" - sources."join-component-1.1.0" - sources."jose-4.15.2" - sources."js-base64-3.7.5" - sources."js-md4-0.3.2" - sources."js-nacl-1.4.0" - sources."js-sdsl-4.3.0" - sources."js-yaml-3.14.1" - sources."jsbi-4.3.0" - sources."jsbn-0.1.1" - sources."jsesc-3.0.2" - sources."json-bigint-1.0.0" - sources."json-diff-1.0.6" - sources."json-parse-even-better-errors-2.3.1" - sources."json-schema-ref-parser-9.0.9" - sources."json-schema-traverse-0.4.1" - sources."json5-2.2.3" - sources."jsonfile-6.1.0" - sources."jsonschema-1.4.1" - sources."jsonwebtoken-9.0.2" - sources."jssha-3.3.1" - sources."jwa-1.4.1" - sources."jwks-rsa-3.1.0" - sources."jws-3.2.2" - sources."kafkajs-1.16.0" - (sources."kerberos-2.0.3" // { - dependencies = [ - sources."node-addon-api-6.1.0" - ]; - }) - sources."kuler-2.0.0" - (sources."ldapts-4.2.6" // { - dependencies = [ - sources."uuid-9.0.1" - ]; - }) - sources."leac-0.6.0" - sources."leven-2.1.0" - sources."libbase64-1.2.1" - sources."libmime-5.2.1" - sources."libphonenumber-js-1.10.47" - sources."libpq-1.8.12" - sources."libqp-2.0.1" - sources."lie-3.1.1" - sources."limiter-1.1.5" - sources."linkify-it-4.0.1" - sources."loader-runner-4.3.0" - (sources."loader-utils-2.0.4" // { - dependencies = [ - sources."big.js-5.2.2" - ]; - }) - sources."localforage-1.10.0" - (sources."localtunnel-2.0.2" // { - dependencies = [ - sources."debug-4.3.2" - ]; - }) - sources."lodash-4.17.21" - sources."lodash-es-4.17.21" - sources."lodash.camelcase-4.3.0" - sources."lodash.clonedeep-4.5.0" - sources."lodash.defaults-4.2.0" - sources."lodash.flatten-4.4.0" - sources."lodash.get-4.4.2" - sources."lodash.includes-4.3.0" - sources."lodash.isarguments-3.1.0" - sources."lodash.isboolean-3.0.3" - sources."lodash.isinteger-4.0.4" - sources."lodash.isnumber-3.0.3" - sources."lodash.isplainobject-4.0.6" - sources."lodash.isstring-4.0.1" - sources."lodash.once-4.1.1" - sources."lodash.snakecase-4.1.1" - sources."lodash.uniq-4.5.0" - sources."lodash.uniqby-4.7.0" - sources."lodash.zipobject-4.1.3" - (sources."logform-2.5.1" // { - dependencies = [ - sources."@colors/colors-1.5.0" - ]; - }) - sources."long-4.0.0" - sources."lossless-json-1.0.5" - sources."lower-case-2.0.2" - sources."lru-cache-10.0.1" - (sources."lru-memoizer-2.2.0" // { - dependencies = [ - sources."lru-cache-4.0.2" - ]; - }) - sources."lru_map-0.3.3" - sources."luxon-3.4.3" - (sources."mailparser-3.6.5" // { - dependencies = [ - sources."nodemailer-6.9.3" - ]; - }) - (sources."mailsplit-5.4.0" // { - dependencies = [ - sources."libmime-5.2.0" - ]; - }) - (sources."make-dir-3.1.0" // { - dependencies = [ - sources."semver-6.3.1" - ]; - }) - sources."make-error-1.3.6" - (sources."make-fetch-happen-9.1.0" // { - dependencies = [ - sources."lru-cache-6.0.0" - sources."minipass-3.3.6" - sources."yallist-4.0.0" - ]; - }) - sources."mappersmith-2.42.0" - sources."md5-2.3.0" - sources."media-typer-0.3.0" - sources."merge-descriptors-1.0.1" - sources."merge-stream-2.0.0" - sources."merge2-1.4.1" - sources."methods-1.1.2" - sources."micromatch-4.0.5" - sources."mime-1.6.0" - sources."mime-db-1.52.0" - sources."mime-types-2.1.35" - sources."mimic-fn-2.1.0" - sources."mimic-response-3.1.0" - (sources."minifaker-1.34.1" // { - dependencies = [ - sources."@types/uuid-8.3.4" - ]; - }) - sources."minimalistic-assert-1.0.1" - (sources."minimatch-3.1.2" // { - dependencies = [ - sources."brace-expansion-1.1.11" - ]; - }) - sources."minimist-1.2.8" - sources."minipass-7.0.4" - (sources."minipass-collect-1.0.2" // { - dependencies = [ - sources."minipass-3.3.6" - sources."yallist-4.0.0" - ]; - }) - (sources."minipass-fetch-1.4.1" // { - dependencies = [ - sources."minipass-3.3.6" - sources."yallist-4.0.0" - ]; - }) - (sources."minipass-flush-1.0.5" // { - dependencies = [ - sources."minipass-3.3.6" - sources."yallist-4.0.0" - ]; - }) - (sources."minipass-pipeline-1.2.4" // { - dependencies = [ - sources."minipass-3.3.6" - sources."yallist-4.0.0" - ]; - }) - (sources."minipass-sized-1.0.3" // { - dependencies = [ - sources."minipass-3.3.6" - sources."yallist-4.0.0" - ]; - }) - (sources."minizlib-2.1.2" // { - dependencies = [ - sources."minipass-3.3.6" - sources."yallist-4.0.0" - ]; - }) - sources."mkdirp-0.5.6" - sources."mkdirp-classic-0.5.3" - sources."moment-2.29.4" - sources."moment-timezone-0.5.43" - sources."mongodb-5.9.0" - (sources."mongodb-client-encryption-2.9.1" // { - dependencies = [ - sources."gaxios-5.1.3" - sources."gcp-metadata-5.3.0" - ]; - }) - (sources."mongodb-connection-string-url-2.6.0" // { - dependencies = [ - sources."tr46-3.0.0" - sources."webidl-conversions-7.0.0" - sources."whatwg-url-11.0.0" - ]; - }) - (sources."mqtt-4.3.7" // { - dependencies = [ - sources."concat-stream-2.0.0" - sources."lru-cache-6.0.0" - sources."pump-3.0.0" - sources."readable-stream-3.6.2" - sources."split2-3.2.2" - sources."ws-7.5.9" - sources."yallist-4.0.0" - ]; - }) - sources."mqtt-packet-6.10.0" - sources."ms-2.1.2" - sources."msgpackr-1.9.9" - (sources."mssql-9.3.2" // { - dependencies = [ - sources."commander-11.0.0" - ]; - }) - sources."multer-1.4.5-lts.1" - sources."mute-stream-0.0.8" - (sources."mysql2-2.3.3" // { - dependencies = [ - sources."denque-2.1.0" - sources."lru-cache-6.0.0" - sources."yallist-4.0.0" - ]; - }) - sources."mz-2.7.0" - (sources."n8n-core-1.9.1" // { - dependencies = [ - sources."@tediousjs/connection-string-0.3.0" - (sources."bl-5.1.0" // { - dependencies = [ - sources."buffer-6.0.3" - ]; - }) - sources."bson-4.7.2" - sources."buffer-5.7.1" - sources."chokidar-3.5.2" - sources."commander-9.5.0" - sources."commist-3.2.0" - sources."concat-stream-2.0.0" - sources."glob-8.1.0" - sources."help-me-4.2.0" - sources."lru-cache-7.18.3" - sources."minimatch-5.1.6" - sources."mongodb-4.17.1" - (sources."mqtt-5.1.2" // { - dependencies = [ - sources."buffer-6.0.3" - sources."readable-stream-4.4.2" - ]; - }) - sources."mqtt-packet-8.2.1" - sources."mssql-8.1.4" - sources."n8n-nodes-base-1.9.2" - sources."readable-stream-3.6.2" - sources."redis-3.1.2" - sources."sprintf-js-1.1.3" - sources."string_decoder-1.3.0" - sources."tedious-14.7.0" - ]; - }) - sources."n8n-editor-ui-1.9.3" - (sources."n8n-nodes-base-1.9.3" // { - dependencies = [ - sources."@tediousjs/connection-string-0.3.0" - (sources."bl-5.1.0" // { - dependencies = [ - sources."buffer-6.0.3" - sources."readable-stream-3.6.2" - ]; - }) - sources."bson-4.7.2" - sources."buffer-5.7.1" - sources."chokidar-3.5.2" - sources."commander-9.5.0" - sources."commist-3.2.0" - (sources."concat-stream-2.0.0" // { - dependencies = [ - sources."readable-stream-3.6.2" - ]; - }) - sources."glob-8.1.0" - (sources."help-me-4.2.0" // { - dependencies = [ - sources."readable-stream-3.6.2" - ]; - }) - sources."lru-cache-7.18.3" - sources."minimatch-5.1.6" - sources."mongodb-4.17.1" - sources."mqtt-5.1.2" - sources."mqtt-packet-8.2.1" - sources."mssql-8.1.4" - (sources."readable-stream-4.4.2" // { - dependencies = [ - sources."buffer-6.0.3" - ]; - }) - sources."redis-3.1.2" - sources."sprintf-js-1.1.3" - sources."string_decoder-1.3.0" - sources."tedious-14.7.0" - sources."xlsx-https://cdn.sheetjs.com/xlsx-0.19.3/xlsx-0.19.3.tgz" - ]; - }) - sources."n8n-workflow-1.9.1" - (sources."named-placeholders-1.1.3" // { - dependencies = [ - sources."lru-cache-7.18.3" - ]; - }) - sources."nan-2.18.0" - sources."nanoclone-0.2.1" - sources."nanoid-3.3.6" - sources."napi-build-utils-1.0.2" - sources."native-duplexpair-1.0.0" - sources."natural-orderby-2.0.3" - sources."negotiator-0.6.3" - sources."neo-async-2.6.2" - sources."no-case-3.0.4" - sources."node-abi-3.49.0" - sources."node-abort-controller-3.1.1" - sources."node-addon-api-4.3.0" - sources."node-fetch-2.7.0" - sources."node-forge-1.3.1" - (sources."node-gyp-8.4.1" // { - dependencies = [ - sources."are-we-there-yet-3.0.1" - sources."gauge-4.0.4" - sources."glob-7.2.3" - sources."npmlog-6.0.2" - sources."readable-stream-3.6.2" - sources."signal-exit-3.0.7" - ]; - }) - sources."node-gyp-build-4.6.1" - sources."node-html-markdown-1.3.0" - (sources."node-html-parser-6.1.10" // { - dependencies = [ - sources."css-select-5.1.0" - sources."dom-serializer-2.0.0" - sources."domhandler-5.0.3" - sources."domutils-3.1.0" - sources."entities-4.5.0" - ]; - }) - sources."node-machine-id-1.1.12" - sources."node-releases-2.0.13" - sources."node-rsa-1.1.1" - sources."node-ssh-12.0.5" - sources."nodeify-1.0.1" - sources."nodemailer-6.9.6" - sources."nopt-5.0.0" - sources."normalize-path-3.0.0" - sources."npmlog-5.0.1" - sources."nth-check-2.1.1" - sources."nub-0.0.0" - sources."number-allocator-1.0.14" - sources."nunjucks-3.2.4" - sources."oauth-1.0a-2.2.6" - sources."object-assign-4.1.1" - sources."object-hash-3.0.0" - sources."object-inspect-1.12.3" - sources."object-is-1.1.5" - sources."object-keys-1.1.1" - sources."object-treeify-1.1.33" - sources."object.assign-4.1.4" - sources."object.getownpropertydescriptors-2.1.7" - sources."on-finished-2.4.1" - sources."on-headers-1.0.2" - sources."once-1.4.0" - sources."one-time-1.0.0" - sources."onetime-5.1.2" - sources."ono-7.1.3" - sources."open-7.4.2" - sources."openapi-types-10.0.0" - sources."openurl-1.1.1" - sources."oracledb-5.5.0" - sources."os-tmpdir-1.0.2" - sources."otpauth-9.1.5" - sources."p-cancelable-2.1.1" - sources."p-finally-1.0.0" - sources."p-lazy-3.1.0" - sources."p-limit-3.1.0" - sources."p-map-2.1.0" - sources."p-queue-6.6.2" - sources."p-timeout-3.2.0" - sources."packet-reader-1.0.0" - sources."pako-1.0.11" - sources."param-case-3.0.4" - sources."parse-github-url-1.0.2" - sources."parse-passwd-1.0.0" - sources."parse5-5.1.1" - (sources."parse5-htmlparser2-tree-adapter-6.0.1" // { - dependencies = [ - sources."parse5-6.0.1" - ]; - }) - sources."parseley-0.12.1" - sources."parseurl-1.3.3" - sources."pascal-case-3.1.2" - sources."passport-0.6.0" - sources."passport-cookie-1.0.9" - sources."passport-jwt-4.0.1" - sources."passport-strategy-1.0.0" - sources."password-prompt-1.1.3" - sources."path-case-3.0.4" - sources."path-is-absolute-1.0.1" - sources."path-key-3.1.1" - sources."path-parse-1.0.7" - sources."path-scurry-1.10.1" - sources."path-to-regexp-0.1.7" - sources."path-type-4.0.0" - sources."pause-0.0.1" - sources."pdfjs-dist-2.16.105" - sources."peberminta-0.9.0" - sources."peek-readable-4.1.0" - sources."pg-8.11.3" - sources."pg-connection-string-2.6.2" - sources."pg-cursor-2.10.3" - sources."pg-int8-1.0.1" - sources."pg-minify-1.6.2" - (sources."pg-native-3.0.1" // { - dependencies = [ - sources."isarray-0.0.1" - sources."pg-types-1.13.0" - sources."postgres-array-1.0.3" - sources."readable-stream-1.0.31" - sources."string_decoder-0.10.31" - ]; - }) - sources."pg-pool-3.6.1" - (sources."pg-promise-10.15.4" // { - dependencies = [ - sources."pg-8.8.0" - ]; - }) - sources."pg-protocol-1.6.0" - sources."pg-query-stream-4.5.3" - sources."pg-types-2.2.0" - sources."pgpass-1.0.5" - sources."picocolors-1.0.0" - sources."picomatch-2.3.1" - sources."pkce-challenge-3.1.0" - sources."postgres-array-2.0.0" - sources."postgres-bytea-1.0.0" - sources."postgres-date-1.0.7" - sources."postgres-interval-1.2.0" - (sources."posthog-node-2.6.0" // { - dependencies = [ - sources."axios-0.27.2" - ]; - }) - (sources."prebuild-install-7.1.1" // { - dependencies = [ - sources."pump-3.0.0" - ]; - }) - sources."pretty-bytes-5.6.0" - sources."process-0.11.10" - sources."process-nextick-args-2.0.1" - sources."prom-client-13.2.0" - sources."promise-1.3.0" - sources."promise-ftp-1.3.5" - sources."promise-ftp-common-1.1.5" - sources."promise-inflight-1.0.1" - sources."promise-retry-2.0.1" - sources."promise.prototype.finally-3.1.7" - sources."property-expr-2.0.5" - sources."proto3-json-serializer-0.1.9" - sources."protobufjs-6.11.4" - sources."proxy-addr-2.0.7" - sources."proxy-from-env-1.1.0" - sources."pseudomap-1.0.2" - sources."psl-1.9.0" - sources."pump-2.0.1" - (sources."pumpify-1.5.1" // { - dependencies = [ - sources."duplexify-3.7.1" - ]; - }) - sources."punycode-2.3.0" - sources."pyodide-0.23.4" - sources."python-struct-1.1.3" - sources."qs-6.11.0" - sources."query-string-7.1.3" - sources."querystringify-2.2.0" - sources."queue-microtask-1.2.3" - sources."quoted-printable-1.0.1" - sources."random-bytes-1.0.0" - sources."randombytes-2.1.0" - sources."range-parser-1.2.1" - (sources."raw-body-2.5.2" // { - dependencies = [ - sources."bytes-3.1.2" - sources."iconv-lite-0.4.24" - ]; - }) - sources."rc-1.2.8" - (sources."readable-stream-2.3.8" // { - dependencies = [ - sources."isarray-1.0.0" - sources."safe-buffer-5.1.2" - ]; - }) - (sources."readable-web-to-node-stream-3.0.2" // { - dependencies = [ - sources."readable-stream-3.6.2" - ]; - }) - sources."readdirp-3.6.0" - sources."recast-0.21.5" - sources."rechoir-0.6.2" - sources."redeyed-2.1.1" - sources."redis-4.6.10" - sources."redis-commands-1.7.0" - sources."redis-errors-1.2.0" - sources."redis-parser-3.0.0" - sources."reflect-metadata-0.1.13" - sources."regenerator-runtime-0.13.11" - sources."regexp.prototype.flags-1.5.1" - sources."reinterval-1.1.0" - sources."remove-trailing-slash-0.1.1" - (sources."replacestream-4.0.3" // { - dependencies = [ - sources."escape-string-regexp-1.0.5" - ]; - }) - sources."require-directory-2.1.1" - sources."requires-port-1.0.0" - sources."resolve-1.22.8" - (sources."restore-cursor-3.1.0" // { - dependencies = [ - sources."signal-exit-3.0.7" - ]; - }) - sources."retry-0.12.0" - sources."retry-request-4.2.2" - sources."reusify-1.0.4" - (sources."rfc2047-4.0.1" // { - dependencies = [ - sources."iconv-lite-0.4.5" - ]; - }) - sources."rfdc-1.3.0" - (sources."rhea-1.0.24" // { - dependencies = [ - sources."debug-3.2.7" - ]; - }) - (sources."rimraf-3.0.2" // { - dependencies = [ - sources."glob-7.2.3" - ]; - }) - sources."rndm-1.2.0" - sources."rss-parser-3.13.0" - sources."run-async-2.4.1" - sources."run-parallel-1.2.0" - (sources."rxjs-6.6.7" // { - dependencies = [ - sources."tslib-1.14.1" - ]; - }) - sources."safe-array-concat-1.0.1" - sources."safe-buffer-5.2.1" - sources."safe-regex-test-1.0.0" - sources."safe-stable-stringify-2.4.3" - sources."safer-buffer-2.1.2" - sources."samlify-2.8.10" - sources."sax-1.3.0" - sources."sb-promise-queue-2.1.0" - sources."sb-scandir-3.1.0" - sources."schema-utils-3.3.0" - sources."selderee-0.11.0" - (sources."semver-7.5.4" // { - dependencies = [ - sources."lru-cache-6.0.0" - sources."yallist-4.0.0" - ]; - }) - (sources."send-0.18.0" // { - dependencies = [ - (sources."debug-2.6.9" // { - dependencies = [ - sources."ms-2.0.0" - ]; - }) - sources."ms-2.1.3" - ]; - }) - sources."sentence-case-3.0.4" - sources."seq-queue-0.0.5" - sources."serialize-javascript-5.0.1" - sources."serve-static-1.15.0" - sources."set-blocking-2.0.0" - sources."set-function-name-2.0.1" - sources."setprototypeof-1.2.0" - sources."sha.js-2.4.11" - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" - sources."shell-escape-0.2.0" - (sources."shelljs-0.8.5" // { - dependencies = [ - sources."glob-7.2.3" - ]; - }) - (sources."showdown-2.1.0" // { - dependencies = [ - sources."commander-9.5.0" - ]; - }) - sources."side-channel-1.0.4" - sources."signal-exit-4.1.0" - sources."simple-concat-1.0.1" - sources."simple-get-4.0.1" - sources."simple-git-3.20.0" - sources."simple-lru-cache-0.0.2" - sources."simple-swizzle-0.2.2" - sources."slash-3.0.0" - sources."smart-buffer-4.2.0" - sources."snake-case-3.0.4" - sources."snappy-7.2.2" - (sources."snowflake-sdk-1.9.0" // { - dependencies = [ - sources."axios-1.5.1" - sources."bignumber.js-2.4.0" - sources."debug-3.2.7" - sources."glob-7.2.3" - sources."mkdirp-1.0.4" - sources."tmp-0.2.1" - ]; - }) - sources."socks-2.7.1" - sources."socks-proxy-agent-6.2.1" - sources."source-map-0.6.1" - sources."source-map-support-0.5.21" - sources."spex-3.2.0" - sources."split-array-stream-2.0.0" - sources."split-on-first-1.1.0" - sources."split2-4.2.0" - sources."sprintf-js-1.0.3" - sources."sql.js-1.8.0" - sources."sqlite3-5.1.6" - sources."sqlstring-2.3.3" - sources."sse-channel-4.0.0" - sources."ssh2-1.14.0" - (sources."ssh2-sftp-client-7.2.3" // { - dependencies = [ - sources."concat-stream-2.0.0" - sources."readable-stream-3.6.2" - ]; - }) - (sources."sshpk-1.17.0" // { - dependencies = [ - sources."tweetnacl-0.14.5" - ]; - }) - (sources."ssri-8.0.1" // { - dependencies = [ - sources."minipass-3.3.6" - sources."yallist-4.0.0" - ]; - }) - sources."stack-trace-0.0.10" - sources."standard-as-callback-2.1.0" - sources."statuses-2.0.1" - sources."stop-iteration-iterator-1.0.0" - sources."stoppable-1.1.0" - sources."stream-events-1.0.5" - sources."stream-shift-1.0.1" - sources."streamsearch-1.1.0" - sources."strict-event-emitter-types-2.0.0" - sources."strict-uri-encode-2.0.0" - sources."string-similarity-4.0.4" - sources."string-width-4.2.3" - sources."string-width-cjs-4.2.3" - sources."string.prototype.startswith-1.0.0" - sources."string.prototype.trim-1.2.8" - sources."string.prototype.trimend-1.0.7" - sources."string.prototype.trimstart-1.0.7" - (sources."string_decoder-1.1.1" // { - dependencies = [ - sources."safe-buffer-5.1.2" - ]; - }) - sources."strip-ansi-6.0.1" - sources."strip-ansi-cjs-6.0.1" - sources."strip-json-comments-2.0.1" - sources."strnum-1.0.5" - sources."strtok3-6.3.0" - sources."stubs-3.0.0" - sources."supports-color-7.2.0" - sources."supports-hyperlinks-2.3.0" - sources."supports-preserve-symlinks-flag-1.0.0" - sources."swagger-ui-dist-5.9.0" - sources."swagger-ui-express-4.6.3" - sources."syslog-client-1.1.1" - sources."tapable-2.2.1" - (sources."tar-6.2.0" // { - dependencies = [ - sources."minipass-5.0.0" - sources."mkdirp-1.0.4" - sources."yallist-4.0.0" - ]; - }) - (sources."tar-fs-2.1.1" // { - dependencies = [ - sources."chownr-1.1.4" - sources."pump-3.0.0" - ]; - }) - (sources."tar-stream-2.2.0" // { - dependencies = [ - sources."readable-stream-3.6.2" - ]; - }) - sources."tarn-3.0.2" - sources."tdigest-0.1.2" - (sources."tedious-15.1.3" // { - dependencies = [ - sources."bl-5.1.0" - sources."readable-stream-3.6.2" - sources."sprintf-js-1.1.3" - ]; - }) - (sources."teeny-request-7.2.0" // { - dependencies = [ - sources."@tootallnate/once-2.0.0" - sources."http-proxy-agent-5.0.0" - ]; - }) - (sources."terser-5.21.0" // { - dependencies = [ - sources."commander-2.20.3" - ]; - }) - (sources."terser-webpack-plugin-5.3.9" // { - dependencies = [ - sources."@jridgewell/trace-mapping-0.3.19" - sources."serialize-javascript-6.0.1" - ]; - }) - sources."text-hex-1.0.0" - sources."thenify-3.3.1" - sources."thenify-all-1.6.0" - sources."through-2.3.8" - (sources."through2-4.0.2" // { - dependencies = [ - sources."readable-stream-3.6.2" - ]; - }) - sources."title-case-3.0.3" - sources."tlds-1.240.0" - sources."tmp-0.0.33" - (sources."tmp-promise-3.0.3" // { - dependencies = [ - sources."tmp-0.2.1" - ]; - }) - sources."to-regex-range-5.0.1" - sources."toidentifier-1.0.1" - sources."token-types-4.2.1" - sources."toposort-2.0.2" - sources."tr46-0.0.3" - (sources."transliteration-2.3.5" // { - dependencies = [ - sources."cliui-8.0.1" - sources."wrap-ansi-7.0.0" - sources."yargs-17.7.2" - sources."yargs-parser-21.1.1" - ]; - }) - sources."triple-beam-1.4.1" - sources."ts-node-10.9.1" - sources."tslib-2.6.2" - sources."tsscmp-1.0.6" - sources."tunnel-0.0.6" - sources."tunnel-agent-0.6.0" - sources."tweetnacl-1.0.3" - sources."tweetnacl-util-0.15.1" - sources."type-fest-0.21.3" - sources."type-is-1.6.18" - sources."typed-array-buffer-1.0.0" - sources."typed-array-byte-length-1.0.0" - sources."typed-array-byte-offset-1.0.0" - sources."typed-array-length-1.0.4" - sources."typedarray-0.0.6" - sources."typedi-0.10.0" - (sources."typeorm-0.3.17" // { - dependencies = [ - sources."cliui-8.0.1" - sources."dotenv-16.3.1" - sources."glob-8.1.0" - sources."minimatch-5.1.6" - sources."mkdirp-2.1.6" - sources."uuid-9.0.1" - sources."wrap-ansi-7.0.0" - sources."yargs-17.7.2" - sources."yargs-parser-21.1.1" - ]; - }) - sources."typeorm-aurora-data-api-driver-2.4.4" - sources."typescript-5.2.2" - sources."uc.micro-1.0.6" - sources."uid-safe-2.1.5" - sources."unbox-primitive-1.0.2" - sources."undici-5.26.0" - sources."undici-types-5.25.3" - sources."unique-filename-1.1.1" - sources."unique-slug-2.0.2" - sources."universalify-2.0.0" - sources."unpipe-1.0.0" - sources."update-browserslist-db-1.0.13" - sources."upper-case-2.0.2" - sources."upper-case-first-2.0.2" - sources."uri-js-4.4.1" - sources."url-parse-1.5.10" - sources."url-value-parser-2.2.0" - sources."utf-8-validate-5.0.10" - (sources."utf7-1.0.2" // { - dependencies = [ - sources."semver-5.3.0" - ]; - }) - sources."utf8-2.1.2" - sources."util-0.12.5" - sources."util-deprecate-1.0.2" - sources."util.promisify-1.1.2" - sources."utils-merge-1.0.1" - sources."uuencode-0.0.4" - sources."uuid-8.3.2" - sources."v8-compile-cache-lib-3.0.1" - sources."validator-13.7.0" - sources."vary-1.1.2" - sources."watchpack-2.4.0" - sources."web-streams-polyfill-3.2.1" - sources."webidl-conversions-3.0.1" - sources."webpack-5.88.2" - sources."webpack-sources-3.2.3" - sources."whatwg-url-5.0.0" - sources."which-2.0.2" - sources."which-boxed-primitive-1.0.2" - sources."which-collection-1.0.1" - sources."which-typed-array-1.1.11" - sources."wide-align-1.1.5" - sources."widest-line-3.1.0" - (sources."winston-3.11.0" // { - dependencies = [ - sources."readable-stream-3.6.2" - ]; - }) - (sources."winston-transport-4.5.0" // { - dependencies = [ - sources."readable-stream-3.6.2" - ]; - }) - sources."wordwrap-1.0.0" - sources."worker-loader-3.0.8" - sources."wrap-ansi-6.2.0" - sources."wrap-ansi-cjs-7.0.0" - sources."wrappy-1.0.2" - sources."ws-8.14.2" - sources."xlsx-https://cdn.sheetjs.com/xlsx-0.19.3/xlsx-0.19.3.tgz" - sources."xml-1.0.1" - sources."xml-crypto-3.2.0" - sources."xml2js-0.5.0" - sources."xmlbuilder-11.0.1" - sources."xmllint-wasm-3.0.1" - sources."xpath-0.0.32" - sources."xregexp-2.0.0" - sources."xtend-4.0.2" - sources."y18n-5.0.8" - sources."yallist-2.1.2" - (sources."yamljs-0.3.0" // { - dependencies = [ - sources."glob-7.2.3" - ]; - }) - sources."yargs-17.1.1" - sources."yargs-parser-20.2.9" - sources."yn-3.1.1" - sources."yocto-queue-0.1.0" - sources."yup-0.32.11" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "n8n Workflow Automation Tool"; - homepage = "https://n8n.io"; - license = "SEE LICENSE IN LICENSE.md"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; -} diff --git a/pkgs/applications/networking/n8n/package.json b/pkgs/applications/networking/n8n/package.json deleted file mode 100644 index ac8d49dfaa412..0000000000000 --- a/pkgs/applications/networking/n8n/package.json +++ /dev/null @@ -1,3 +0,0 @@ -[ - "n8n" -] diff --git a/pkgs/applications/networking/nali/default.nix b/pkgs/applications/networking/nali/default.nix index 1eab5e5a97bc6..55c23d865a450 100644 --- a/pkgs/applications/networking/nali/default.nix +++ b/pkgs/applications/networking/nali/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, buildGoModule, installShellFiles }: +{ lib, stdenv, fetchFromGitHub, buildGoModule, installShellFiles }: buildGoModule rec { pname = "nali"; @@ -19,11 +19,13 @@ buildGoModule rec { CGO_ENABLED = 0; ldflags = [ "-s" "-w" "-X github.com/zu1k/nali/internal/constant.Version=${version}" ]; - postInstall = '' - installShellCompletion --cmd nali \ - --bash <($out/bin/nali completion bash) \ - --fish <($out/bin/nali completion fish) \ - --zsh <($out/bin/nali completion zsh) + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + export HOME="$TMPDIR" + # write to temp files to avoid race condition in config loading + $out/bin/nali completion bash > nali.bash + $out/bin/nali completion fish > nali.fish + $out/bin/nali completion zsh > nali.zsh + installShellCompletion --cmd nali nali.{bash,fish,zsh} ''; meta = with lib; { diff --git a/pkgs/applications/networking/ncgopher/default.nix b/pkgs/applications/networking/ncgopher/default.nix index 6f7dcc5120754..4d2f72c35439d 100644 --- a/pkgs/applications/networking/ncgopher/default.nix +++ b/pkgs/applications/networking/ncgopher/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-KrvTwcIeINIBkia6PTnKXp4jFd6GEMBh/xbn0Ot/wmE="; }; - cargoSha256 = "sha256-Zft/ip+/uJbUIqCDDEa4hchmZZiYWGdaVnzWC74FgU8="; + cargoHash = "sha256-Zft/ip+/uJbUIqCDDEa4hchmZZiYWGdaVnzWC74FgU8="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ diff --git a/pkgs/applications/networking/ndppd/default.nix b/pkgs/applications/networking/ndppd/default.nix index e5ea298a8dc99..65b5ee1269ee3 100644 --- a/pkgs/applications/networking/ndppd/default.nix +++ b/pkgs/applications/networking/ndppd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, gzip }: +{ lib, stdenv, fetchFromGitHub, gzip, nixosTests }: stdenv.mkDerivation rec { pname = "ndppd"; @@ -26,6 +26,8 @@ stdenv.mkDerivation rec { cp ndppd.conf-dist $out/etc/ndppd.conf ''; + passthru.tests = { inherit (nixosTests) ndppd; }; + meta = with lib; { description = "Daemon that proxies NDP (Neighbor Discovery Protocol) messages between interfaces"; homepage = "https://github.com/DanielAdolfsson/ndppd"; diff --git a/pkgs/applications/networking/netmaker/default.nix b/pkgs/applications/networking/netmaker/default.nix index 58e48e69fc4f6..20d4f831d78bc 100644 --- a/pkgs/applications/networking/netmaker/default.nix +++ b/pkgs/applications/networking/netmaker/default.nix @@ -1,6 +1,5 @@ { buildGoModule , fetchFromGitHub -, installShellFiles , lib , libglvnd , pkg-config @@ -10,16 +9,16 @@ buildGoModule rec { pname = "netmaker"; - version = "0.24.1"; + version = "0.25.0"; src = fetchFromGitHub { owner = "gravitl"; repo = pname; rev = "v${version}"; - hash = "sha256-Me1hux+Y3EiT9vlP4+4019JPcDEW0d5byFO6YIfKbbw="; + hash = "sha256-1mrodzW51nbqfWQjjmHYnInJd61FsWtQcYbKhJAiQ8Q="; }; - vendorHash = "sha256-BlZYXLvB05BTI2gMke8I2ob4jYSrixfpBUqKzNcHisI="; + vendorHash = "sha256-/iuXnnO8OhGhQWg5nU/hza4yZMSIHKOTPFqojgY8w74="; inherit subPackages; diff --git a/pkgs/applications/networking/newsreaders/pan/default.nix b/pkgs/applications/networking/newsreaders/pan/default.nix index 1f01b52ee6502..4e23246a6d428 100644 --- a/pkgs/applications/networking/newsreaders/pan/default.nix +++ b/pkgs/applications/networking/newsreaders/pan/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { description = "GTK-based Usenet newsreader good at both text and binaries"; mainProgram = "pan"; homepage = "http://pan.rebelbase.com/"; - maintainers = [ maintainers.eelco ]; + maintainers = with maintainers; [ aleksana ]; platforms = platforms.linux; license = with licenses; [ gpl2Only fdl11Only ]; }; diff --git a/pkgs/applications/networking/nextcloud-client/0001-When-creating-the-autostart-entry-do-not-use-an-abso.patch b/pkgs/applications/networking/nextcloud-client/0001-When-creating-the-autostart-entry-do-not-use-an-abso.patch index d3bac6af08d2a..312a0d089f603 100644 --- a/pkgs/applications/networking/nextcloud-client/0001-When-creating-the-autostart-entry-do-not-use-an-abso.patch +++ b/pkgs/applications/networking/nextcloud-client/0001-When-creating-the-autostart-entry-do-not-use-an-abso.patch @@ -16,7 +16,7 @@ index 887213f09..c66468306 100644 << QLatin1String("Name=") << guiName << QLatin1Char('\n') << QLatin1String("GenericName=") << QLatin1String("File Synchronizer\n") - << QLatin1String("Exec=\"") << executablePath << "\" --background\n" -+ << QLatin1String("Exec=") << "nextcloud --background" << endl ++ << QLatin1String("Exec=") << "nextcloud --background\n" << QLatin1String("Terminal=") << "false\n" << QLatin1String("Icon=") << APPLICATION_ICON_NAME << QLatin1Char('\n') << QLatin1String("Categories=") << QLatin1String("Network\n") diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index 7e78fb5e65878..29f044536981c 100644 --- a/pkgs/applications/networking/nextcloud-client/default.nix +++ b/pkgs/applications/networking/nextcloud-client/default.nix @@ -4,20 +4,20 @@ , cmake , extra-cmake-modules , inotify-tools +, kdePackages , libcloudproviders , librsvg , libsecret , openssl , pcre , pkg-config +, qt5compat , qtbase , qtkeychain +, qtsvg , qttools , qtwebengine , qtwebsockets -, qtquickcontrols2 -, qtgraphicaleffects -, plasma5Packages , sphinx , sqlite , xdg-utils @@ -26,15 +26,15 @@ stdenv.mkDerivation rec { pname = "nextcloud-client"; - version = "3.13.0"; + version = "3.14.1"; outputs = [ "out" "dev" ]; src = fetchFromGitHub { - owner = "nextcloud"; + owner = "nextcloud-releases"; repo = "desktop"; - rev = "v${version}"; - hash = "sha256-i4vQGH9NSxIrLaPdCEh+WN6i6NQilH6uO4dSk/mhLi8="; + rev = "refs/tags/v${version}"; + hash = "sha256-bUqHegW38NQJn4TnEQt9wRJFqR6fbLpvQvmWF3akekc="; }; patches = [ @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { postPatch = '' for file in src/libsync/vfs/*/CMakeLists.txt; do substituteInPlace $file \ - --replace "PLUGINDIR" "KDE_INSTALL_PLUGINDIR" + --replace-fail "PLUGINDIR" "KDE_INSTALL_PLUGINDIR" done ''; @@ -61,17 +61,17 @@ stdenv.mkDerivation rec { buildInputs = [ inotify-tools + kdePackages.kio libcloudproviders libsecret openssl pcre - plasma5Packages.kio + qt5compat qtbase qtkeychain + qtsvg qttools qtwebengine - qtquickcontrols2 - qtgraphicaleffects qtwebsockets sqlite ]; @@ -93,7 +93,8 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "Nextcloud themed desktop client"; + changelog = "https://github.com/nextcloud/desktop/releases/tag/v${version}"; + description = "Desktop sync client for Nextcloud"; homepage = "https://nextcloud.com"; license = licenses.gpl2Plus; maintainers = with maintainers; [ kranzes SuperSandro2000 ]; diff --git a/pkgs/applications/networking/ngadmin/default.nix b/pkgs/applications/networking/ngadmin/default.nix index f63fbfcf95033..fb36a0367c594 100644 --- a/pkgs/applications/networking/ngadmin/default.nix +++ b/pkgs/applications/networking/ngadmin/default.nix @@ -19,10 +19,10 @@ stdenv.mkDerivation { [ autoreconfHook ] ++ lib.optional withReadline readline; enableParallelBuilding = true; - configureFlags = with lib; - optional (!withReadline) "--without-readline" - ++ optional enableEmu "--enable-emu" - ++ optional enableSpy "--enable-spy"; + configureFlags = + lib.optional (!withReadline) "--without-readline" + ++ lib.optional enableEmu "--enable-emu" + ++ lib.optional enableSpy "--enable-spy"; meta = with lib; { description = "Netgear switch (NSDP) administration tool"; diff --git a/pkgs/applications/networking/nload/default.nix b/pkgs/applications/networking/nload/default.nix index a2b2731b3b033..3f97981528f5f 100644 --- a/pkgs/applications/networking/nload/default.nix +++ b/pkgs/applications/networking/nload/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = lib.optional stdenv.isDarwin autoreconfHook; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin autoreconfHook; buildInputs = [ ncurses ]; meta = { 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/nym/default.nix b/pkgs/applications/networking/nym/default.nix index fc2095caaf21e..41fe108b99f29 100644 --- a/pkgs/applications/networking/nym/default.nix +++ b/pkgs/applications/networking/nym/default.nix @@ -45,7 +45,7 @@ rustPlatform.buildRustPackage { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security CoreServices ]; + buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security CoreServices ]; checkType = "debug"; diff --git a/pkgs/applications/networking/offrss/default.nix b/pkgs/applications/networking/offrss/default.nix index 8d7889663fff7..89853c8a088d6 100644 --- a/pkgs/applications/networking/offrss/default.nix +++ b/pkgs/applications/networking/offrss/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ curl libmrss ] ++ lib.optional (stdenv.hostPlatform == stdenv.buildPlatform) podofo - ++ lib.optional (!stdenv.isLinux) libiconv; + ++ lib.optional (!stdenv.hostPlatform.isLinux) libiconv; # Workaround build failure on -fno-common toolchains: # ld: serve_pdf.o:offrss.h:75: multiple definition of `cgi_url_path'; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { configurePhase = '' substituteInPlace Makefile \ --replace '$(CC) $(CFLAGS) $(LDFLAGS)' '$(CXX) $(CFLAGS) $(LDFLAGS)' - '' + lib.optionalString (!stdenv.isLinux) '' + '' + lib.optionalString (!stdenv.hostPlatform.isLinux) '' sed 's/#EXTRA/EXTRA/' -i Makefile '' + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' sed 's/^PDF/#PDF/' -i Makefile @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { homepage = "http://vicerveza.homeunix.net/~viric/cgi-bin/offrss"; description = "Offline RSS/Atom reader"; license = licenses.agpl3Plus; - maintainers = with maintainers; [ viric ]; + maintainers = [ ]; platforms = lib.platforms.linux; mainProgram = "offrss"; }; diff --git a/pkgs/applications/networking/omping/default.nix b/pkgs/applications/networking/omping/default.nix index 808df455a4f2e..1efcd98b46f86 100644 --- a/pkgs/applications/networking/omping/default.nix +++ b/pkgs/applications/networking/omping/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Open Multicast Ping (omping) is a tool for testing IPv4/IPv6 multicast connectivity on a LAN"; license = licenses.mit; platforms = platforms.unix; diff --git a/pkgs/applications/networking/onionshare/default.nix b/pkgs/applications/networking/onionshare/default.nix index 49ce4fae12173..9e7152393a4d1 100644 --- a/pkgs/applications/networking/onionshare/default.nix +++ b/pkgs/applications/networking/onionshare/default.nix @@ -1,41 +1,26 @@ { lib , stdenv -, buildPythonApplication -, colorama , fetchFromGitHub , fetchpatch -, flask -, flask-compress -, flask-socketio -, gevent-websocket +, meek , obfs4 -, psutil -, packaging -, pycrypto -, pynacl -, pyside6 -, pysocks -, pytestCheckHook -, qrcode +, python3 , qt5 -, requests , snowflake -, stem , substituteAll , tor -, unidecode -, waitress -, werkzeug }: let version = "2.6.2"; + src = fetchFromGitHub { owner = "onionshare"; repo = "onionshare"; rev = "v${version}"; hash = "sha256-J8Hdriy8eWpHuMCI87a9a/zCR6xafM3A/Tkyom0Ktko="; }; + meta = with lib; { description = "Securely and anonymously send and receive files"; longDescription = '' @@ -60,13 +45,9 @@ let license = licenses.gpl3Plus; maintainers = with maintainers; [ bbjubjub ]; }; - - # TODO: package meek https://support.torproject.org/glossary/meek/ - meek = "/meek-not-available"; - in rec { - onionshare = buildPythonApplication { + onionshare = python3.pkgs.buildPythonApplication { pname = "onionshare-cli"; inherit version; src = "${src}/cli"; @@ -77,8 +58,17 @@ rec { inherit tor meek obfs4 snowflake; inherit (tor) geoip; }) + + # Remove distutils for Python 3.12 compatibility + # https://github.com/onionshare/onionshare/pull/1907 + (fetchpatch { + url = "https://github.com/onionshare/onionshare/commit/1fb1a470df20d8a7576c8cf51213e5928528d59a.patch"; + includes = [ "onionshare_cli/onion.py" ]; + stripLen = 1; + hash = "sha256-4XkqaEhMhvj6PyMssnLfXRazdP4k+c9mMDveho7pWg8="; + }) ]; - propagatedBuildInputs = [ + dependencies = with python3.pkgs; [ colorama flask flask-compress @@ -91,7 +81,6 @@ rec { pyside6 pysocks qrcode - qrcode requests stem unidecode @@ -104,7 +93,7 @@ rec { tor ]; - nativeCheckInputs = [ + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ]; @@ -113,9 +102,9 @@ rec { export HOME="$(mktemp -d)" ''; - disabledTests = lib.optionals stdenv.isLinux [ + disabledTests = lib.optionals stdenv.hostPlatform.isLinux [ "test_get_tor_paths_linux" # expects /usr instead of /nix/store - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # requires meek-client which is not packaged "test_get_tor_paths_darwin" # on darwin (and only on darwin) onionshare attempts to discover @@ -129,7 +118,7 @@ rec { }; }; - onionshare-gui = buildPythonApplication { + onionshare-gui = python3.pkgs.buildPythonApplication { pname = "onionshare"; inherit version; src = "${src}/desktop"; @@ -147,9 +136,18 @@ rec { stripLen = 1; hash = "sha256-wfIjdPhdUYAvbK5XyE1o2OtFOlJRj0X5mh7QQRjdyP0="; }) + + # Remove distutils for Python 3.12 compatibility + # https://github.com/onionshare/onionshare/pull/1907 + (fetchpatch { + url = "https://github.com/onionshare/onionshare/commit/1fb1a470df20d8a7576c8cf51213e5928528d59a.patch"; + includes = [ "onionshare/update_checker.py" ]; + stripLen = 1; + hash = "sha256-mRRj9cALZVHw86CgU17sp9EglKhkRRcGfROyQpsXVfU="; + }) ]; - propagatedBuildInputs = [ + dependencies = with python3.pkgs; [ onionshare pyside6 qrcode diff --git a/pkgs/applications/networking/opsdroid/default.nix b/pkgs/applications/networking/opsdroid/default.nix index bded5d6d2b356..3ef92e059e057 100644 --- a/pkgs/applications/networking/opsdroid/default.nix +++ b/pkgs/applications/networking/opsdroid/default.nix @@ -1,36 +1,77 @@ -{ lib, fetchFromGitHub, python3Packages }: +{ + lib, + fetchFromGitHub, + python3Packages, +}: python3Packages.buildPythonPackage rec { pname = "opsdroid"; - version = "0.25.0"; + version = "0.30.0"; + pyproject = true; src = fetchFromGitHub { owner = "opsdroid"; repo = "opsdroid"; - rev = "v${version}"; - sha256 = "0f32jf2rds9543akysxinf3hsgzr0w880xwcrcm1r2r0nhp8b8s5"; + rev = "refs/tags/v${version}"; + hash = "sha256-7H44wdhJD4Z6OP1sUmSGlepuvx+LlwKLq7iR8cwqR24="; }; - disabled = !python3Packages.isPy3k; + build-system = with python3Packages; [ setuptools ]; - # tests folder is not included in release - doCheck = false; - - propagatedBuildInputs = with python3Packages; [ - click babel opsdroid-get-image-size slackclient webexteamssdk bleach - parse emoji puremagic yamale nbformat websockets pycron nbconvert - aiohttp matrix-api-async aioredis aiosqlite arrow pyyaml motor regex - mattermostdriver setuptools voluptuous ibm-watson tailer multidict - watchgod get-video-properties appdirs bitstring matrix-nio - ] ++ matrix-nio.optional-dependencies.e2e; + dependencies = with python3Packages; [ + aiohttp + aiohttp-middlewares + aioredis + aiosqlite + appdirs + arrow + babel + bitstring + bleach + # botbuilder-core, connector for teams + certifi + click + # dialogflow, connector for Dialogflow + dnspython + emoji + get-video-properties + ibm-watson + (matrix-nio.override { withOlm = true; }) + mattermostdriver + motor + multidict + nbconvert + nbformat + opsdroid-get-image-size + parse + puremagic + pycron + python-olm + pyyaml + regex + rich + slack-sdk + tailer + voluptuous + watchgod + webexteamssdk + wrapt + ]; passthru.python = python3Packages.python; + # Tests are not included in releases + doCheck = false; + meta = with lib; { description = "Open source chat-ops bot framework"; homepage = "https://opsdroid.dev"; - maintainers = with maintainers; [ globin willibutz ]; + changelog = "https://github.com/opsdroid/opsdroid/releases/tag/v${version}"; license = licenses.asl20; + maintainers = with maintainers; [ + globin + willibutz + ]; platforms = platforms.unix; mainProgram = "opsdroid"; }; diff --git a/pkgs/applications/networking/p2p/deluge/default.nix b/pkgs/applications/networking/p2p/deluge/default.nix index 8c3d76d755f75..241f2a02e8033 100644 --- a/pkgs/applications/networking/p2p/deluge/default.nix +++ b/pkgs/applications/networking/p2p/deluge/default.nix @@ -8,6 +8,7 @@ , gobject-introspection , librsvg , wrapGAppsHook3 +, nixosTests }: let @@ -87,6 +88,8 @@ let done ''; + passthru.tests = { inherit (nixosTests) deluge; }; + meta = with lib; { description = "Torrent client"; homepage = "https://deluge-torrent.org"; diff --git a/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix b/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix index 5386c6636add0..61501dbeb20e9 100644 --- a/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix +++ b/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, bzip2, libX11 +{ lib, stdenv, fetchFromGitHub, fetchpatch2, cmake, pkg-config, bzip2, libX11 , mkDerivation, qtbase, qttools, qtmultimedia, qtscript , libiconv, pcre-cpp, libidn, lua5, miniupnpc, aspell, gettext, perl }: @@ -13,13 +13,20 @@ mkDerivation rec { sha256 = "sha256-JmAopXFS6MkxW0wDQ1bC/ibRmWgOpzU0971hcqAehLU="; }; + patches = [ + (fetchpatch2 { + url = "https://github.com/eiskaltdcpp/eiskaltdcpp/commit/5ab5e1137a46864b6ecd1ca302756da8b833f754.patch?full_index=1"; + hash = "sha256-GIdcIHKXNSbHxbiMGRPgfq2w/zNSfR/FhyyXayFWfg8="; + }) + ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ qtbase qttools qtmultimedia qtscript bzip2 libX11 pcre-cpp libidn lua5 miniupnpc aspell gettext (perl.withPackages (p: with p; [ GetoptLong TermShellUI ])) ] - ++ lib.optional stdenv.isDarwin libiconv; + ++ lib.optional stdenv.hostPlatform.isDarwin libiconv; cmakeFlags = [ "-DDBUS_NOTIFY=ON" diff --git a/pkgs/applications/networking/p2p/enhanced-ctorrent/default.nix b/pkgs/applications/networking/p2p/enhanced-ctorrent/default.nix index e8432b4c5c244..5074690228045 100644 --- a/pkgs/applications/networking/p2p/enhanced-ctorrent/default.nix +++ b/pkgs/applications/networking/p2p/enhanced-ctorrent/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { ]; meta = { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "BitTorrent client written in C++"; mainProgram = "ctorrent"; longDescription = '' diff --git a/pkgs/applications/networking/p2p/freenet/default.nix b/pkgs/applications/networking/p2p/freenet/default.nix deleted file mode 100644 index 3ca23647251a1..0000000000000 --- a/pkgs/applications/networking/p2p/freenet/default.nix +++ /dev/null @@ -1,126 +0,0 @@ -{ lib, stdenv, fetchurl, fetchFromGitHub, jdk, jre, gradle, bash, coreutils -, substituteAll, nixosTests, perl, fetchpatch, writeText }: - -let - version = "01497"; - - freenet_ext = fetchurl { - url = "https://github.com/freenet/fred/releases/download/build01495/freenet-ext.jar"; - sha256 = "sha256-MvKz1r7t9UE36i+aPr72dmbXafCWawjNF/19tZuk158="; - }; - - seednodes = fetchurl { - url = "https://downloads.freenetproject.org/alpha/opennet/seednodes.fref"; - sha256 = "08awwr8n80b4cdzzb3y8hf2fzkr1f2ly4nlq779d6pvi5jymqdvv"; - }; - - patches = [ - # gradle 7 support - # https://github.com/freenet/fred/pull/827 - (fetchpatch { - url = "https://github.com/freenet/fred/commit/8991303493f2c0d9933f645337f0a7a5a979e70a.patch"; - sha256 = "sha256-T1zymxRTADVhhwp2TyB+BC/J4gZsT/CUuMrT4COlpTY="; - }) - ]; - -in stdenv.mkDerivation rec { - pname = "freenet"; - inherit version patches; - - src = fetchFromGitHub { - owner = "freenet"; - repo = "fred"; - rev = "refs/tags/build${version}"; - hash = "sha256-pywNPekofF/QotNVF28McojqK7c1Zzucds5rWV0R7BQ="; - }; - - postPatch = '' - rm gradle/verification-{keyring.keys,metadata.xml} - ''; - - nativeBuildInputs = [ gradle jdk ]; - - wrapper = substituteAll { - src = ./freenetWrapper; - inherit bash coreutils jre seednodes; - }; - - # https://github.com/freenet/fred/blob/next/build-offline.sh - # fake build to pre-download deps into fixed-output derivation - deps = stdenv.mkDerivation { - pname = "${pname}-deps"; - inherit src version patches; - - nativeBuildInputs = [ gradle perl ]; - buildPhase = '' - export GRADLE_USER_HOME=$(mktemp -d) - gradle --no-daemon build - ''; - # perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar) - installPhase = '' - find $GRADLE_USER_HOME/caches/modules-2 -type f -regex '.*\.\(jar\|pom\)' \ - | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/''${\($5 =~ s/okio-jvm/okio/r)}" #e' \ - | sh - ''; - # Don't move info to share/ - forceShare = [ "dummy" ]; - outputHashMode = "recursive"; - # Downloaded jars differ by platform - outputHash = "sha256-CZf5M3lI7Lz9Pl8U/lNoQ6V6Jxbmkxau8L273XFFS2E="; - outputHashAlgo = "sha256"; - }; - - # Point to our local deps repo - gradleInit = writeText "init.gradle" '' - gradle.projectsLoaded { - rootProject.allprojects { - buildscript { - repositories { - clear() - maven { url '${deps}/'; metadataSources {mavenPom(); artifact()} } - } - } - repositories { - clear() - maven { url '${deps}/'; metadataSources {mavenPom(); artifact()} } - } - } - } - - settingsEvaluated { settings -> - settings.pluginManagement { - repositories { - maven { url '${deps}/'; metadataSources {mavenPom(); artifact()} } - } - } - } - ''; - - buildPhase = '' - gradle jar -Dorg.gradle.java.home=${jdk} --offline --no-daemon --info --init-script $gradleInit - ''; - - installPhase = '' - runHook preInstall - install -Dm444 build/libs/freenet.jar $out/share/freenet/freenet.jar - ln -s ${freenet_ext} $out/share/freenet/freenet-ext.jar - mkdir -p $out/bin - install -Dm555 ${wrapper} $out/bin/freenet - substituteInPlace $out/bin/freenet \ - --subst-var-by outFreenet $out - ln -s ${deps} $out/deps - runHook postInstall - ''; - - passthru.tests = { inherit (nixosTests) freenet; }; - - meta = { - description = "Decentralised and censorship-resistant network"; - homepage = "https://freenetproject.org/"; - sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; - license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ nagy ]; - platforms = with lib.platforms; linux; - changelog = "https://github.com/freenet/fred/blob/build${version}/NEWS.md"; - }; -} diff --git a/pkgs/applications/networking/p2p/freenet/freenetWrapper b/pkgs/applications/networking/p2p/freenet/freenetWrapper deleted file mode 100755 index 74ff2c62961f6..0000000000000 --- a/pkgs/applications/networking/p2p/freenet/freenetWrapper +++ /dev/null @@ -1,18 +0,0 @@ -#! @bash@/bin/bash -set -eo pipefail -PATH=@coreutils@/bin:$PATH -export CLASSPATH=$(find @outFreenet@/deps/ -name "*.jar"|grep -v bcprov-jdk15on-1.48.jar|tr $'\n' :) -CLASSPATH=$CLASSPATH:@outFreenet@/share/freenet/freenet-ext.jar:@outFreenet@/share/freenet/freenet.jar - -export FREENET_HOME="$HOME/.local/share/freenet" -if [ -n "$XDG_DATA_HOME" ] ; then - FREENET_HOME="$XDG_DATA_HOME/freenet" -fi - -mkdir -p -- $FREENET_HOME - -cp -u -- @seednodes@ $FREENET_HOME/seednodes.fref -chmod u+rw -- $FREENET_HOME/seednodes.fref - -cd -- $FREENET_HOME -exec @jre@/bin/java -Xmx1024M freenet.node.NodeStarter "$@" diff --git a/pkgs/applications/networking/p2p/gnunet/default.nix b/pkgs/applications/networking/p2p/gnunet/default.nix index 43f0b97c9ff08..767897dbd04a5 100644 --- a/pkgs/applications/networking/p2p/gnunet/default.nix +++ b/pkgs/applications/networking/p2p/gnunet/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { homepage = "https://gnunet.org/"; license = licenses.agpl3Plus; - maintainers = with maintainers; [ pstn vrthra ]; + maintainers = with maintainers; [ pstn ]; platforms = platforms.unix; changelog = "https://git.gnunet.org/gnunet.git/tree/ChangeLog?h=v${version}"; }; diff --git a/pkgs/applications/networking/p2p/magnetico/default.nix b/pkgs/applications/networking/p2p/magnetico/default.nix index f3579c494ba80..aeb6ec21fb260 100644 --- a/pkgs/applications/networking/p2p/magnetico/default.nix +++ b/pkgs/applications/networking/p2p/magnetico/default.nix @@ -1,55 +1,37 @@ { lib -, fetchFromGitHub -, fetchpatch -, nixosTests +, stdenv +, fetchFromGitea , buildGoModule +, nixosTests , sqlite }: -buildGoModule { +buildGoModule rec { pname = "magnetico"; - version = "unstable-2022-08-10"; + version = "0.12.1"; - src = fetchFromGitHub { - owner = "ireun"; + src = fetchFromGitea { + domain = "maxwell.ydns.eu/git"; + owner = "rnhmjoj"; repo = "magnetico"; - rev = "828e230d3b3c0759d3274e27f5a7b70400f4d6ea"; - hash = "sha256-V1pBzillWTk9iuHAhFztxYaq4uLL3U3HYvedGk6ffbk="; + rev = "v${version}"; + hash = "sha256-cO5TVtQ1jdW1YkFtj35kmRfJG46/lXjXyz870NCPT0g="; }; - patches = [ - # https://github.com/ireun/magnetico/pull/15 - (fetchpatch { - url = "https://github.com/ireun/magnetico/commit/90db34991aa44af9b79ab4710c638607c6211c1c.patch"; - hash = "sha256-wC9lVQqfngQ5AaRgb4TtoWSgbQ2iSHeQ2UBDUyWjMK8="; - }) - ]; - - vendorHash = "sha256-JDrBXjnQAcWp8gKvnm+q1F5oV+FozKUvhHK/Me/Cyj8="; + vendorHash = "sha256-jIVMQtPCq9RYaYsH4LSZJFspH6TpCbgzHN0GX8cM/CI="; buildInputs = [ sqlite ]; - buildPhase = '' - runHook preBuild - - make magneticow magneticod - - runHook postBuild - ''; - - checkPhase = '' - runHook preCheck - - make test + tags = [ "fts5" "libsqlite3" ]; + ldflags = [ "-s" "-w" ]; - runHook postCheck - ''; + doCheck = !stdenv.hostPlatform.isStatic; passthru.tests = { inherit (nixosTests) magnetico; }; meta = with lib; { description = "Autonomous (self-hosted) BitTorrent DHT search engine suite"; - homepage = "https://github.com/ireun/magnetico"; + homepage = "https://maxwell.ydns.eu/git/rnhmjoj/magnetico"; license = licenses.agpl3Only; badPlatforms = platforms.darwin; maintainers = with maintainers; [ rnhmjoj ]; diff --git a/pkgs/applications/networking/p2p/mldonkey/default.nix b/pkgs/applications/networking/p2p/mldonkey/default.nix index 81a625e5210fd..d83a33833b0bc 100644 --- a/pkgs/applications/networking/p2p/mldonkey/default.nix +++ b/pkgs/applications/networking/p2p/mldonkey/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { buildInputs = (with ocamlPackages; [ num ]) ++ [ zlib ]; meta = { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Client for many p2p networks, with multiple frontends"; homepage = "https://github.com/ygrek/mldonkey"; license = lib.licenses.gpl2Only; diff --git a/pkgs/applications/networking/p2p/pyrosimple/default.nix b/pkgs/applications/networking/p2p/pyrosimple/default.nix index c08f6ae4b64b1..240dc41998017 100644 --- a/pkgs/applications/networking/p2p/pyrosimple/default.nix +++ b/pkgs/applications/networking/p2p/pyrosimple/default.nix @@ -5,19 +5,19 @@ , pyrosimple , python3 , testers -, withInotify ? stdenv.isLinux +, withInotify ? stdenv.hostPlatform.isLinux }: python3.pkgs.buildPythonApplication rec { pname = "pyrosimple"; - version = "2.13.0"; + version = "2.14.0"; format = "pyproject"; src = fetchFromGitHub { owner = "kannibalox"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-e69e1Aa10/pew1UZBCIPIH3BK7I8C3HiW59fRuSZlkc="; + hash = "sha256-lEtyt7i8MyL2VffxNFQkL9RkmGeo6Nof0AOQwf6BUSE="; }; pythonRelaxDeps = [ @@ -27,7 +27,6 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = with python3.pkgs; [ poetry-core - pythonRelaxDepsHook ]; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix index 1ec2cbac9ce45..c9ff194687456 100644 --- a/pkgs/applications/networking/p2p/qbittorrent/default.nix +++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix @@ -30,13 +30,13 @@ stdenv.mkDerivation rec { pname = "qbittorrent" + lib.optionalString (guiSupport && qtVersion == "5") "-qt5" + lib.optionalString (!guiSupport) "-nox"; - version = "4.6.5"; + version = "4.6.7"; src = fetchFromGitHub { owner = "qbittorrent"; repo = "qBittorrent"; rev = "release-${version}"; - hash = "sha256-umJObvPv4VjdAZdQEuhqFCRvi1eZQViu1IO88oeTTq8="; + hash = "sha256-vUC8YIuyoGnl46FajfJG/XFXG+2lM9EaHWl2Hfo3T7c="; }; nativeBuildInputs = [ @@ -52,11 +52,11 @@ stdenv.mkDerivation rec { qtbase qtsvg qttools - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ] ++ lib.optionals guiSupport [ dbus - ] ++ lib.optionals (guiSupport && stdenv.isLinux) [ + ] ++ lib.optionals (guiSupport && stdenv.hostPlatform.isLinux) [ qtwayland ] ++ lib.optionals trackerSearch [ python3 @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { dontWrapGApps = true; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' APP_NAME=qbittorrent${lib.optionalString (!guiSupport) "-nox"} mkdir -p $out/{Applications,bin} cp -R $APP_NAME.app $out/Applications diff --git a/pkgs/applications/networking/p2p/retroshare/cpp-filesystem.patch b/pkgs/applications/networking/p2p/retroshare/cpp-filesystem.patch deleted file mode 100644 index e9aa64e2871a6..0000000000000 --- a/pkgs/applications/networking/p2p/retroshare/cpp-filesystem.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/libretroshare/src/util/rsdir.cc b/libretroshare/src/util/rsdir.cc -index 8556b8198..d63699216 100644 ---- a/libretroshare/src/util/rsdir.cc -+++ b/libretroshare/src/util/rsdir.cc -@@ -47,6 +47,7 @@ - - #include <fstream> - #include <stdexcept> -+#include <filesystem> - - #if defined(WIN32) || defined(__CYGWIN__) - #include "util/rsstring.h" diff --git a/pkgs/applications/networking/p2p/retroshare/default.nix b/pkgs/applications/networking/p2p/retroshare/default.nix index 741cca91543ac..bbfc978eef5b0 100644 --- a/pkgs/applications/networking/p2p/retroshare/default.nix +++ b/pkgs/applications/networking/p2p/retroshare/default.nix @@ -1,19 +1,18 @@ -{ lib, mkDerivation, fetchFromGitHub -, fetchpatch +{ lib, mkDerivation, fetchFromGitHub, fetchpatch2 , 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 { pname = "retroshare"; - version = "0.6.6"; + version = "0.6.7.2"; src = fetchFromGitHub { owner = "RetroShare"; repo = "RetroShare"; rev = "v${version}"; - sha256 = "1hsymbhsfgycj39mdkrdp2hgq8irmvxa4a6jx2gg339m1fgf2xmh"; + hash = "sha256-1A1YvOWIiWlP1JPUTg5Z/lxVGCBv4tCPf5sZdPogitU="; fetchSubmodules = true; }; @@ -21,19 +20,19 @@ mkDerivation rec { # The build normally tries to get git sub-modules during build # but we already have them checked out ./no-submodules.patch - ./cpp-filesystem.patch - # Fix gcc-13 build failure - (fetchpatch { - name = "gcc-13.patch"; - url = "https://github.com/RetroShare/RetroShare/commit/e1934fd9b03cd52c556eb06d94fb5d68b649592e.patch"; - hash = "sha256-oqxQAsD4fmkWAH2kSVmmed/q0LzTW/iqUU1SgYNdFyk="; + # Support the miniupnpc-2.2.8 API change + (fetchpatch2 { + url = "https://github.com/RetroShare/libretroshare/commit/f1b89c4f87d77714571b4135c301bf0429096a20.patch?full_index=1"; + hash = "sha256-UiZMsUFaOZTLj/dx1rLr5bTR1CQ6nt2+IygQdvwJqwc="; + stripLen = 1; + extraPrefix = "libretroshare/"; }) ]; 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 ]; @@ -48,6 +47,15 @@ mkDerivation rec { "RS_EXTRA_VERSION=" ]; + postPatch = '' + # Build libsam3 as C, not C++. No, I have no idea why it tries to + # do that, either. + substituteInPlace libretroshare/src/libretroshare.pro \ + --replace-fail \ + "LIBSAM3_MAKE_PARAMS =" \ + "LIBSAM3_MAKE_PARAMS = CC=$CC AR=$AR" + ''; + postInstall = '' # BT DHT bootstrap cp libbitdht/src/bitdht/bdboot.txt $out/share/retroshare diff --git a/pkgs/applications/networking/p2p/retroshare/no-submodules.patch b/pkgs/applications/networking/p2p/retroshare/no-submodules.patch index d47268003090f..f8cb88adfe0bc 100644 --- a/pkgs/applications/networking/p2p/retroshare/no-submodules.patch +++ b/pkgs/applications/networking/p2p/retroshare/no-submodules.patch @@ -1,8 +1,9 @@ +Submodule libretroshare contains modified content diff --git a/libretroshare/src/libretroshare.pro b/libretroshare/src/libretroshare.pro -index 84d18944e..71aeb67d2 100644 +index 923f878c..ef00f3d7 100644 --- a/libretroshare/src/libretroshare.pro +++ b/libretroshare/src/libretroshare.pro -@@ -870,20 +870,14 @@ rs_jsonapi { +@@ -930,20 +930,14 @@ rs_jsonapi { genrestbedlib.variable_out = PRE_TARGETDEPS win32-g++:isEmpty(QMAKE_SH) { genrestbedlib.commands = \ @@ -28,7 +29,7 @@ index 84d18944e..71aeb67d2 100644 mkdir -p $${RESTBED_BUILD_PATH} && } genrestbedlib.commands += \ -@@ -991,14 +985,9 @@ rs_broadcast_discovery { +@@ -1063,14 +1057,9 @@ rs_broadcast_discovery { udpdiscoverycpplib.variable_out = PRE_TARGETDEPS win32-g++:isEmpty(QMAKE_SH) { udpdiscoverycpplib.commands = \ @@ -44,8 +45,26 @@ index 84d18944e..71aeb67d2 100644 } udpdiscoverycpplib.commands += \ cd $$shell_path($${UDP_DISCOVERY_BUILD_PATH}) && \ +@@ -1106,15 +1095,13 @@ rs_sam3_libsam3 { + win32-g++:isEmpty(QMAKE_SH) { + LIBSAM3_MAKE_PARAMS = CC=gcc + libsam3.commands = \ +- cd /D $$shell_path($${RS_SRC_PATH}) && git submodule update --init supportlibs/libsam3 || cd . $$escape_expand(\\n\\t) \ ++ cd /D $$shell_path($${RS_SRC_PATH}) && cd . $$escape_expand(\\n\\t) \ + $(CHK_DIR_EXISTS) $$shell_path($$LIBSAM3_BUILD_PATH) $(MKDIR) $$shell_path($${LIBSAM3_BUILD_PATH}) $$escape_expand(\\n\\t) \ + $(COPY_DIR) $$shell_path($${LIBSAM3_SRC_PATH}) $$shell_path($${LIBSAM3_BUILD_PATH}) || cd . $$escape_expand(\\n\\t) + } else { + LIBSAM3_MAKE_PARAMS = + libsam3.commands = \ +- cd $${RS_SRC_PATH} && ( \ +- git submodule update --init supportlibs/libsam3 || \ +- true ) && \ ++ cd $${RS_SRC_PATH} && \ + mkdir -p $${LIBSAM3_BUILD_PATH} && \ + (cp -r $${LIBSAM3_SRC_PATH}/* $${LIBSAM3_BUILD_PATH} || true) && + } diff --git a/retroshare-gui/src/retroshare-gui.pro b/retroshare-gui/src/retroshare-gui.pro -index 654efd170..06cba9ba3 100644 +index d73117b84..b2fc6799a 100644 --- a/retroshare-gui/src/retroshare-gui.pro +++ b/retroshare-gui/src/retroshare-gui.pro @@ -66,10 +66,7 @@ rs_gui_cmark { diff --git a/pkgs/applications/networking/p2p/soulseekqt/default.nix b/pkgs/applications/networking/p2p/soulseekqt/default.nix index 9587bd0a93047..014dd89d74995 100644 --- a/pkgs/applications/networking/p2p/soulseekqt/default.nix +++ b/pkgs/applications/networking/p2p/soulseekqt/default.nix @@ -33,7 +33,8 @@ mkDerivation rec { # fixup and install desktop file desktop-file-install --dir $out/share/applications \ - --set-key Exec --set-value $binary \ + --set-key Exec --set-value SoulseekQt \ + --set-key Terminal --set-value false \ --set-key Comment --set-value "${meta.description}" \ --set-key Categories --set-value Network ${appextracted}/default.desktop mv $out/share/applications/default.desktop $out/share/applications/SoulseekQt.desktop diff --git a/pkgs/applications/networking/p2p/stig/default.nix b/pkgs/applications/networking/p2p/stig/default.nix index b36ad59194d2b..19e108f45a318 100644 --- a/pkgs/applications/networking/p2p/stig/default.nix +++ b/pkgs/applications/networking/p2p/stig/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , fetchFromGitHub , python310Packages , testers @@ -10,13 +9,13 @@ python310Packages.buildPythonApplication rec { pname = "stig"; # This project has a different concept for pre release / alpha, # Read the project's README for details: https://github.com/rndusr/stig#stig - version = "0.12.8a0"; + version = "0.12.10a0"; src = fetchFromGitHub { owner = "rndusr"; repo = "stig"; rev = "v${version}"; - sha256 = "sha256-vfmuA6DqWvAygcS6N+qX1h+Ag+P4eOwm41DhAFZR3r8="; + sha256 = "sha256-lSFI4/DxWl17KFgLXZ7c5nW/e5IUGN7s8Gm6wTM5ZWg="; }; propagatedBuildInputs = with python310Packages; [ @@ -58,12 +57,13 @@ python310Packages.buildPythonApplication rec { version = "stig version ${version}"; }; + # https://github.com/rndusr/stig/issues/214#issuecomment-1995651219 + dontUsePytestCheck = true; + meta = with lib; { description = "TUI and CLI for the BitTorrent client Transmission"; homepage = "https://github.com/rndusr/stig"; license = licenses.gpl3Plus; - # Too many broken tests, and it fails to launch - broken = true; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/networking/p2p/synapse-bt/default.nix b/pkgs/applications/networking/p2p/synapse-bt/default.nix index 9ab60d5a18f40..120afed45de6a 100644 --- a/pkgs/applications/networking/p2p/synapse-bt/default.nix +++ b/pkgs/applications/networking/p2p/synapse-bt/default.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ CoreServices Security ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices Security ]; cargoBuildFlags = [ "--all" ]; diff --git a/pkgs/applications/networking/p2p/transmission/4.nix b/pkgs/applications/networking/p2p/transmission/4.nix index 7c5e9b3651868..25296efe6926b 100644 --- a/pkgs/applications/networking/p2p/transmission/4.nix +++ b/pkgs/applications/networking/p2p/transmission/4.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchFromGitHub +, fetchpatch2 , cmake , pkg-config , python3 @@ -54,7 +55,7 @@ let zlib ] ++ optionals enableSystemd [ systemd ] - ++ optionals stdenv.isLinux [ inotify-tools ]); + ++ optionals stdenv.hostPlatform.isLinux [ inotify-tools ]); in stdenv.mkDerivation (finalAttrs: { @@ -69,6 +70,20 @@ stdenv.mkDerivation (finalAttrs: { fetchSubmodules = true; }; + patches = [ + (fetchpatch2 { + url = "https://github.com/transmission/transmission/commit/febfe49ca3ecab1a7142ecb34012c1f0b2bcdee8.patch?full_index=1"; + hash = "sha256-Ge0+AXf/ilfMieGBAdvvImY7JOb0gGIdeKprC37AROs="; + excludes = [ + # The submodule that we don't use (we use our miniupnp) + "third-party/miniupnp" + # Hunk fails for this one, but we don't care because we don't rely upon + # xcode definitions even for the Darwin build. + "Transmission.xcodeproj/project.pbxproj" + ]; + }) + ]; + outputs = [ "out" "apparmor" ]; cmakeFlags = [ @@ -78,7 +93,7 @@ stdenv.mkDerivation (finalAttrs: { (cmakeBool "ENABLE_MAC" false) # requires xcodebuild (cmakeBool "ENABLE_QT" (enableQt5 || enableQt6)) (cmakeBool "INSTALL_LIB" installLib) - ] ++ optionals stdenv.isDarwin [ + ] ++ optionals stdenv.hostPlatform.isDarwin [ # Transmission sets this to 10.13 if not explicitly specified, see https://github.com/transmission/transmission/blob/0be7091eb12f4eb55f6690f313ef70a66795ee72/CMakeLists.txt#L7-L16. "-DCMAKE_OSX_DEPLOYMENT_TARGET=${stdenv.hostPlatform.darwinMinVersion}" ]; @@ -130,8 +145,8 @@ stdenv.mkDerivation (finalAttrs: { ++ optionals enableQt6 (with qt6Packages; [ qttools qtbase qtsvg ]) ++ optionals enableGTK3 [ gtkmm3 xorg.libpthreadstubs ] ++ optionals enableSystemd [ systemd ] - ++ optionals stdenv.isLinux [ inotify-tools ] - ++ optionals stdenv.isDarwin [ libiconv Foundation ]; + ++ optionals stdenv.hostPlatform.isLinux [ inotify-tools ] + ++ optionals stdenv.hostPlatform.isDarwin [ libiconv Foundation ]; postInstall = '' mkdir $apparmor diff --git a/pkgs/applications/networking/p2p/tremc/default.nix b/pkgs/applications/networking/p2p/tremc/default.nix index 6a75a02d854b3..98ab36dac08a0 100644 --- a/pkgs/applications/networking/p2p/tremc/default.nix +++ b/pkgs/applications/networking/p2p/tremc/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, fetchpatch, python3Packages -, x11Support ? !stdenv.isDarwin +, x11Support ? !stdenv.hostPlatform.isDarwin , xclip ? null , pbcopy ? null , useGeoIP ? false # Require /var/lib/geoip-databases/GeoIP.dat }: let - wrapperPath = with lib; makeBinPath ( - optional x11Support xclip ++ - optional stdenv.isDarwin pbcopy + wrapperPath = lib.makeBinPath ( + lib.optional x11Support xclip ++ + lib.optional stdenv.hostPlatform.isDarwin pbcopy ); in python3Packages.buildPythonApplication rec { diff --git a/pkgs/applications/networking/p2p/vuze/default.nix b/pkgs/applications/networking/p2p/vuze/default.nix index 6dc00cba9ee08..e246017576851 100644 --- a/pkgs/applications/networking/p2p/vuze/default.nix +++ b/pkgs/applications/networking/p2p/vuze/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { homepage = "http://www.vuze.com"; license = licenses.unfree; platforms = platforms.all; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/networking/p2p/xd/default.nix b/pkgs/applications/networking/p2p/xd/default.nix index b513d35f2ab1c..2974fe3935792 100644 --- a/pkgs/applications/networking/p2p/xd/default.nix +++ b/pkgs/applications/networking/p2p/xd/default.nix @@ -1,4 +1,4 @@ -{ pkgs, buildGoModule, fetchFromGitHub, lib, perl }: +{ buildGoModule, fetchFromGitHub, lib, perl }: buildGoModule rec { pname = "XD"; diff --git a/pkgs/applications/networking/pcloud/default.nix b/pkgs/applications/networking/pcloud/default.nix index 08cdc3498811d..3a2a479e78eb6 100644 --- a/pkgs/applications/networking/pcloud/default.nix +++ b/pkgs/applications/networking/pcloud/default.nix @@ -38,17 +38,17 @@ let pname = "pcloud"; - version = "1.14.6"; - code = "XZQDbs0Z4ET1VL0SIUuzr5ewR9LYuf6ssLRk"; + version = "1.14.7"; + code = "XZhPkU0Zh5gulxHfMn4j1dYBS4dh45iDQHby"; # Archive link's codes: https://www.pcloud.com/release-notes/linux.html src = fetchzip { url = "https://api.pcloud.com/getpubzip?code=${code}&filename=pcloud-${version}.zip"; - hash = "sha256-3HUVIDxeq7svzeWyZrxlE4TjZ8lOwT8bYgyRFRzGnmU="; + hash = "sha256-fzQVuCI3mK93Y3Fwzc0WM5rti0fTZhRm+Qj1CHC8CJ4="; }; appimageContents = appimageTools.extractType2 { - name = "${pname}-${version}"; + inherit pname version; src = "${src}/pcloud"; }; diff --git a/pkgs/applications/networking/pjsip/default.nix b/pkgs/applications/networking/pjsip/default.nix index fe0e032dd2247..047e86036d082 100644 --- a/pkgs/applications/networking/pjsip/default.nix +++ b/pkgs/applications/networking/pjsip/default.nix @@ -1,45 +1,67 @@ -{ lib -, testers -, stdenv -, fetchFromGitHub -, openssl -, libsamplerate -, swig -, alsa-lib -, AppKit -, CoreFoundation -, Security -, python3 -, pythonSupport ? true -, runCommand +{ + lib, + testers, + stdenv, + fetchFromGitHub, + openssl, + libsamplerate, + swig, + alsa-lib, + AppKit, + CoreFoundation, + Security, + python3, + pythonSupport ? true, + runCommand, }: stdenv.mkDerivation (finalAttrs: { pname = "pjsip"; version = "2.14.1"; src = fetchFromGitHub { - owner = finalAttrs.pname; + owner = "pjsip"; repo = "pjproject"; rev = "refs/tags/${finalAttrs.version}"; hash = "sha256-LDA3o1QMrAxcGuOi/YRoMzXmw/wFkfDs2wweZuIJ2RY="; }; - patches = [ - ./fix-aarch64.patch - ]; + patches = [ ./fix-aarch64.patch ]; - nativeBuildInputs = - lib.optionals pythonSupport [ swig python3 ]; + postPatch = '' + substituteInPlace \ + pjsip-apps/src/py_pjsua/setup.py \ + pjsip-apps/src/swig/python/setup.py \ + pjsip-apps/src/python/setup.py \ + pjsip-apps/src/python/setup-vc.py \ + --replace-fail "distutils.core" "setuptools" + ''; - buildInputs = [ openssl libsamplerate ] - ++ lib.optional stdenv.isLinux alsa-lib - ++ lib.optionals stdenv.isDarwin [ AppKit CoreFoundation Security ]; + nativeBuildInputs = lib.optionals pythonSupport [ + swig + python3 + python3.pkgs.build + python3.pkgs.installer + python3.pkgs.setuptools + python3.pkgs.wheel + ]; - env = lib.optionalAttrs stdenv.cc.isClang { - CXXFLAGS = "-std=c++11"; - } // lib.optionalAttrs stdenv.isDarwin { - NIX_CFLAGS_LINK = "-headerpad_max_install_names"; - }; + buildInputs = + [ + openssl + libsamplerate + ] + ++ lib.optional stdenv.hostPlatform.isLinux alsa-lib + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + AppKit + CoreFoundation + Security + ]; + + env = + lib.optionalAttrs stdenv.cc.isClang { CXXFLAGS = "-std=c++11"; } + // lib.optionalAttrs stdenv.hostPlatform.isDarwin { + NIX_CFLAGS_LINK = "-headerpad_max_install_names"; + }; preConfigure = '' export LD=$CC @@ -51,52 +73,55 @@ stdenv.mkDerivation (finalAttrs: { configureFlags = [ "--enable-shared" ]; - outputs = [ "out" ] - ++ lib.optional pythonSupport "py"; - - postInstall = '' - mkdir -p $out/bin - cp pjsip-apps/bin/pjsua-* $out/bin/pjsua - mkdir -p $out/share/${finalAttrs.pname}-${finalAttrs.version}/samples - cp pjsip-apps/bin/samples/*/* $out/share/${finalAttrs.pname}-${finalAttrs.version}/samples - '' + lib.optionalString pythonSupport '' - (cd pjsip-apps/src/swig/python && \ - python setup.py install --prefix=$py - ) - '' + lib.optionalString stdenv.isDarwin '' - # On MacOS relative paths are used to refer to libraries. All libraries use - # a relative path like ../lib/*.dylib or ../../lib/*.dylib. We need to - # rewrite these to use absolute ones. - - # First, find all libraries (and their symlinks) in our outputs to define - # the install_name_tool -change arguments we should pass. - readarray -t libraries < <( - for outputName in $(getAllOutputNames); do - find "''${!outputName}" \( -name '*.dylib*' -o -name '*.so*' \) + outputs = [ "out" ] ++ lib.optional pythonSupport "py"; + + postInstall = + '' + mkdir -p $out/bin + cp pjsip-apps/bin/pjsua-* $out/bin/pjsua + mkdir -p $out/share/${finalAttrs.pname}-${finalAttrs.version}/samples + cp pjsip-apps/bin/samples/*/* $out/share/${finalAttrs.pname}-${finalAttrs.version}/samples + '' + + lib.optionalString pythonSupport '' + (cd pjsip-apps/src/swig/python && \ + python -m build --no-isolation --outdir dist/ --wheel + python -m installer --prefix $py dist/*.whl + ) + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + # On MacOS relative paths are used to refer to libraries. All libraries use + # a relative path like ../lib/*.dylib or ../../lib/*.dylib. We need to + # rewrite these to use absolute ones. + + # First, find all libraries (and their symlinks) in our outputs to define + # the install_name_tool -change arguments we should pass. + readarray -t libraries < <( + for outputName in $(getAllOutputNames); do + find "''${!outputName}" \( -name '*.dylib*' -o -name '*.so*' \) + done + ) + + # Determine the install_name_tool -change arguments that are going to be + # applied to all libraries. + change_args=() + for lib in "''${libraries[@]}"; do + lib_name="$(basename $lib)" + change_args+=(-change ../lib/$lib_name $lib) + change_args+=(-change ../../lib/$lib_name $lib) done - ) - - # Determine the install_name_tool -change arguments that are going to be - # applied to all libraries. - change_args=() - for lib in "''${libraries[@]}"; do - lib_name="$(basename $lib)" - change_args+=(-change ../lib/$lib_name $lib) - change_args+=(-change ../../lib/$lib_name $lib) - done - - # Rewrite id and library refences for all non-symlinked libraries. - for lib in "''${libraries[@]}"; do - if [ -f "$lib" ]; then - install_name_tool -id $lib "''${change_args[@]}" $lib - fi - done - - # Rewrite library references for all executables. - find "$out" -executable -type f | while read executable; do - install_name_tool "''${change_args[@]}" "$executable" - done - ''; + + # Rewrite id and library refences for all non-symlinked libraries. + for lib in "''${libraries[@]}"; do + if [ -f "$lib" ]; then + install_name_tool -id $lib "''${change_args[@]}" $lib + fi + done + + # Rewrite library references for all executables. + find "$out" -executable -type f | while read executable; do + install_name_tool "''${change_args[@]}" "$executable" + done + ''; # We need the libgcc_s.so.1 loadable (for pthread_cancel to work) dontPatchELF = true; @@ -106,9 +131,7 @@ stdenv.mkDerivation (finalAttrs: { command = "pjsua --version"; }; - passthru.tests.pkg-config = testers.hasPkgConfigModules { - package = finalAttrs.finalPackage; - }; + passthru.tests.pkg-config = testers.hasPkgConfigModules { package = finalAttrs.finalPackage; }; passthru.tests.python-pjsua2 = runCommand "python-pjsua2" { } '' ${(python3.withPackages (pkgs: [ pkgs.pjsua2 ])).interpreter} -c "import pjsua2" > $out @@ -121,8 +144,6 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with maintainers; [ olynch ]; mainProgram = "pjsua"; platforms = platforms.linux ++ platforms.darwin; - pkgConfigModules = [ - "libpjproject" - ]; + pkgConfigModules = [ "libpjproject" ]; }; }) diff --git a/pkgs/applications/networking/powerdns-admin/default.nix b/pkgs/applications/networking/powerdns-admin/default.nix index 6028f0e1a1ae9..7029dd0541655 100644 --- a/pkgs/applications/networking/powerdns-admin/default.nix +++ b/pkgs/applications/networking/powerdns-admin/default.nix @@ -1,6 +1,7 @@ -{ lib, stdenv, fetchFromGitHub, fetchYarnDeps, mkYarnPackage, nixosTests, writeText, python3 }: +{ lib, stdenv, fetchFromGitHub, fetchYarnDeps, yarnConfigHook, nixosTests, writeText, python3 }: let + pname = "powerdns-admin"; version = "0.4.2"; src = fetchFromGitHub { owner = "PowerDNS-Admin"; @@ -23,44 +24,32 @@ let ./0001-Fix-flask-2.3-issue.patch ]; - assets = mkYarnPackage { - inherit src version; - packageJSON = ./package.json; + assets = stdenv.mkDerivation { + pname = "${pname}-assets"; + inherit version src; offlineCache = fetchYarnDeps { yarnLock = "${src}/yarn.lock"; hash = "sha256-rXIts+dgOuZQGyiSke1NIG7b4lFlR/Gfu3J6T3wP3aY="; }; - # Copied from package.json, see also - # https://github.com/NixOS/nixpkgs/pull/214952 - packageResolutions = { - "@fortawesome/fontawesome-free" = "6.3.0"; - }; - - nativeBuildInputs = pythonDeps; + nativeBuildInputs = [ + yarnConfigHook + ] ++ pythonDeps; patches = all_patches ++ [ ./0002-Remove-cssrewrite-filter.patch ]; buildPhase = '' - # The build process expects the directory to be writable - # with node_modules at a specific path - # https://github.com/PowerDNS-Admin/PowerDNS-Admin/blob/master/.yarnrc - - approot=deps/powerdns-admin-assets - - ln -s $node_modules $approot/powerdnsadmin/static/node_modules - SESSION_TYPE=filesystem FLASK_APP=$approot/powerdnsadmin/__init__.py flask assets build + SESSION_TYPE=filesystem FLASK_APP=./powerdnsadmin/__init__.py flask assets build ''; installPhase = '' # https://github.com/PowerDNS-Admin/PowerDNS-Admin/blob/54b257768f600c5548a1c7e50eac49c40df49f92/docker/Dockerfile#L43 mkdir $out - cp -r $approot/powerdnsadmin/static/{generated,assets,img} $out - find $node_modules -name webfonts -exec cp -r {} $out \; - find $node_modules -name fonts -exec cp -r {} $out \; - find $node_modules/icheck/skins/square -name '*.png' -exec cp {} $out/generated \; + cp -r powerdnsadmin/static/{generated,assets,img} $out + find powerdnsadmin/static/node_modules -name webfonts -exec cp -r {} $out \; -printf "Copying %P\n" + find powerdnsadmin/static/node_modules -name fonts -exec cp -r {} $out \; -printf "Copying %P\n" + find powerdnsadmin/static/node_modules/icheck/skins/square -name '*.png' -exec cp {} $out/generated \; ''; - distPhase = "true"; }; assetsPy = writeText "assets.py" '' @@ -73,9 +62,7 @@ let assets.register('css_main', 'generated/main.css') ''; in stdenv.mkDerivation { - pname = "powerdns-admin"; - - inherit src version; + inherit pname version src; nativeBuildInputs = [ python.pkgs.wrapPython ]; diff --git a/pkgs/applications/networking/powerdns-admin/package.json b/pkgs/applications/networking/powerdns-admin/package.json deleted file mode 100644 index 0fb58f9c544cd..0000000000000 --- a/pkgs/applications/networking/powerdns-admin/package.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "dependencies": { - "@fortawesome/fontawesome-free": "6.3.0", - "admin-lte": "3.2.0", - "bootstrap": "4.6.2", - "bootstrap-datepicker": "^1.9.0", - "bootstrap-validator": "^0.11.9", - "datatables.net-plugins": "^1.13.1", - "icheck": "^1.0.2", - "jquery-slimscroll": "^1.3.8", - "jquery-sparkline": "^2.4.0", - "jquery-ui-dist": "^1.13.2", - "jquery.quicksearch": "^2.4.0", - "jquery-validation": "^1.19.5", - "jtimeout": "^3.2.0", - "knockout": "^3.5.1", - "multiselect": "^0.9.12" - }, - "resolutions": { - "admin-lte/@fortawesome/fontawesome-free": "6.3.0" - }, - "name": "powerdns-admin-assets", - "version": "0.4.1" -} diff --git a/pkgs/applications/networking/protonmail-bridge/default.nix b/pkgs/applications/networking/protonmail-bridge/default.nix index 2b27eef11c32f..16c2bcf66cef6 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.13.0"; src = fetchFromGitHub { owner = "ProtonMail"; repo = "proton-bridge"; rev = "v${version}"; - hash = "sha256-PM162vj1Q336fM5z6KoBgtujz9UgESIxUW3Lw8AEYTw="; + hash = "sha256-rwESt2s/TCAFNkf+JwMa7sfYpRvMT8FoIii4EzR/Z6U="; }; - vendorHash = "sha256-qi6ME74pJH/wgDh0xp/Rsc9hPd3v3L/M8pBQJzNieK8="; + vendorHash = "sha256-jmXh53KwzPvmu7RP1F1Ein9/EfJ5m/GGVAqjJVcEVsE="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/networking/protonvpn-gui/default.nix b/pkgs/applications/networking/protonvpn-gui/default.nix index 38b196cb6c3d2..9484a1c42dcf0 100644 --- a/pkgs/applications/networking/protonvpn-gui/default.nix +++ b/pkgs/applications/networking/protonvpn-gui/default.nix @@ -1,46 +1,46 @@ -{ lib -, buildPythonApplication -, fetchFromGitHub -, gobject-introspection -, setuptools -, wrapGAppsHook3 -, dbus-python -, packaging -, proton-core -, proton-keyring-linux -, proton-keyring-linux-secretservice -, proton-vpn-api-core -, proton-vpn-connection -, proton-vpn-killswitch -, proton-vpn-killswitch-network-manager -, proton-vpn-logger -, proton-vpn-network-manager -, proton-vpn-network-manager-openvpn -, proton-vpn-session -, pycairo -, pygobject3 -, pytestCheckHook -, withIndicator ? true -, libappindicator-gtk3 -, libayatana-appindicator +{ + lib, + buildPythonApplication, + fetchFromGitHub, + gobject-introspection, + setuptools, + wrapGAppsHook3, + dbus-python, + packaging, + proton-core, + proton-keyring-linux, + proton-keyring-linux-secretservice, + proton-vpn-api-core, + proton-vpn-connection, + proton-vpn-killswitch, + proton-vpn-killswitch-network-manager, + proton-vpn-logger, + proton-vpn-network-manager, + proton-vpn-network-manager-openvpn, + proton-vpn-network-manager-wireguard, + proton-vpn-session, + pycairo, + pygobject3, + withIndicator ? true, + libappindicator-gtk3, + libayatana-appindicator, }: buildPythonApplication rec { pname = "protonvpn-gui"; - version = "4.3.0"; + version = "4.4.4"; pyproject = true; src = fetchFromGitHub { owner = "ProtonVPN"; repo = "proton-vpn-gtk-app"; rev = "refs/tags/v${version}"; - hash = "sha256-H4m4u9zksab47W5aIsQZPQTPEYiXbmrVCnT67b+A5Tc="; + hash = "sha256-e581FgXrk1cfjsl/UaG9M+3VBYXcV0mggeLeEW9s9KM="; }; nativeBuildInputs = [ # Needed for the NM namespace gobject-introspection - setuptools wrapGAppsHook3 ]; @@ -51,7 +51,11 @@ buildPythonApplication rec { libayatana-appindicator ]; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ dbus-python packaging proton-core @@ -64,26 +68,18 @@ buildPythonApplication rec { proton-vpn-logger proton-vpn-network-manager proton-vpn-network-manager-openvpn + proton-vpn-network-manager-wireguard proton-vpn-session pycairo pygobject3 ]; - postPatch = '' - substituteInPlace setup.cfg \ - --replace-fail "--cov=proton --cov-report=html --cov-report=term" "" - ''; - postInstall = '' mkdir -p $out/share/{applications,pixmaps} install -Dm 644 ${src}/rpmbuild/SOURCES/protonvpn-app.desktop $out/share/applications install -Dm 644 ${src}/rpmbuild/SOURCES/proton-vpn-logo.svg $out/share/pixmaps ''; - nativeCheckInputs = [ - pytestCheckHook - ]; - preCheck = '' # Needed for Permission denied: '/homeless-shelter' export HOME=$(mktemp -d) @@ -92,12 +88,12 @@ buildPythonApplication rec { # Gets a segmentation fault after the widgets test doCheck = false; - meta = with lib; { + meta = { description = "Proton VPN GTK app for Linux"; homepage = "https://github.com/ProtonVPN/proton-vpn-gtk-app"; - license = licenses.gpl3Plus; - platforms = platforms.linux; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; mainProgram = "protonvpn-app"; - maintainers = [ ]; + maintainers = with lib.maintainers; [ sebtm ]; }; } diff --git a/pkgs/applications/networking/protonvpn-gui/legacy.nix b/pkgs/applications/networking/protonvpn-gui/legacy.nix index a749b2875affb..19a2fe7288e92 100644 --- a/pkgs/applications/networking/protonvpn-gui/legacy.nix +++ b/pkgs/applications/networking/protonvpn-gui/legacy.nix @@ -1,22 +1,24 @@ -{ lib -, buildPythonApplication -, fetchFromGitHub -, setuptools -, wrapGAppsHook3 -, gdk-pixbuf -, glib-networking -, gobject-introspection -, imagemagick -, librsvg -, pango -, python3 -, webkitgtk -# Python libs -, protonvpn-nm-lib -, psutil -# Optionals -, withIndicator ? true -, libappindicator-gtk3 }: +{ + lib, + buildPythonApplication, + fetchFromGitHub, + setuptools, + wrapGAppsHook3, + gdk-pixbuf, + glib-networking, + gobject-introspection, + imagemagick, + librsvg, + pango, + python3, + webkitgtk, + # Python libs + protonvpn-nm-lib, + psutil, + # Optionals + withIndicator ? true, + libappindicator-gtk3, +}: buildPythonApplication rec { pname = "protonvpn-gui"; diff --git a/pkgs/applications/networking/pyload-ng/default.nix b/pkgs/applications/networking/pyload-ng/default.nix index 61c62fb95e949..aae05e4cf10bb 100644 --- a/pkgs/applications/networking/pyload-ng/default.nix +++ b/pkgs/applications/networking/pyload-ng/default.nix @@ -1,4 +1,9 @@ -{ lib, fetchPypi, nixosTests, python3 }: +{ + lib, + fetchPypi, + nixosTests, + python3, +}: python3.pkgs.buildPythonApplication rec { version = "0.5.0b3.dev85"; @@ -22,48 +27,48 @@ python3.pkgs.buildPythonApplication rec { postPatch = '' # relax version bounds - sed -i 's/\([A-z0-9]*\)~=.*$/\1/' setup.cfg + sed -i -E 's/([A-z0-9]*)~=[^;]*(.*)/\1\2/' setup.cfg ''; - propagatedBuildInputs = with python3.pkgs; [ - bitmath - certifi - cheroot - cryptography - filetype - flask - flask-babel - flask-caching - flask-compress - flask-session - flask-themes2 - js2py - pycurl - semver - setuptools - ]; + dependencies = + with python3.pkgs; + [ + bitmath + certifi + cheroot + cryptography + filetype + flask + flask-babel + flask-caching + flask-compress + flask-session + flask-themes2 + pycurl + semver + setuptools + ] + ++ (if pythonOlder "3.12" then [ js2py ] else [ dukpy ]); - passthru = { - optional-dependencies = { - plugins = with python3.pkgs; [ - beautifulsoup4 # for some plugins - colorlog # colorful console logging - pillow # for some CAPTCHA plugin - send2trash # send some files to trash instead of deleting them - slixmpp # XMPP plugin - ]; - }; + optional-dependencies = { + plugins = with python3.pkgs; [ + beautifulsoup4 # for some plugins + colorlog # colorful console logging + pillow # for some CAPTCHA plugin + send2trash # send some files to trash instead of deleting them + slixmpp # XMPP plugin + ]; + }; - tests = { - inherit (nixosTests) pyload; - }; + passthru.tests = { + inherit (nixosTests) pyload; }; - meta = with lib; { + meta = { description = "Free and open-source download manager with support for 1-click-hosting sites"; homepage = "https://github.com/pyload/pyload"; - license = licenses.agpl3Plus; - maintainers = with maintainers; [ ruby0b ]; + license = lib.licenses.agpl3Plus; + maintainers = with lib.maintainers; [ ruby0b ]; mainProgram = "pyload"; }; } diff --git a/pkgs/applications/networking/qv2ray/default.nix b/pkgs/applications/networking/qv2ray/default.nix index 01e471c97de96..1105933a9afa6 100644 --- a/pkgs/applications/networking/qv2ray/default.nix +++ b/pkgs/applications/networking/qv2ray/default.nix @@ -30,7 +30,7 @@ mkDerivation rec { fetchSubmodules = true; }; - postPatch = lib.optionals stdenv.isDarwin '' + postPatch = lib.optionals stdenv.hostPlatform.isDarwin '' substituteInPlace cmake/platforms/macos.cmake \ --replace \''${QV2RAY_QtX_DIR}/../../../bin/macdeployqt macdeployqt ''; @@ -76,7 +76,7 @@ mkDerivation rec { maintainers = with maintainers; [ poscat rewine ]; platforms = platforms.all; # never built on aarch64-darwin, x86_64-darwin since update to unstable-2022-09-25 - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; mainProgram = "qv2ray"; }; } diff --git a/pkgs/applications/networking/remote/anydesk/default.nix b/pkgs/applications/networking/remote/anydesk/default.nix index ef1c08ef2dcc7..35da8969ae2ee 100644 --- a/pkgs/applications/networking/remote/anydesk/default.nix +++ b/pkgs/applications/networking/remote/anydesk/default.nix @@ -7,14 +7,14 @@ let description = "Desktop sharing application, providing remote support and online meetings"; in stdenv.mkDerivation (finalAttrs: { pname = "anydesk"; - version = "6.3.2"; + version = "6.3.3"; src = fetchurl { urls = [ "https://download.anydesk.com/linux/anydesk-${finalAttrs.version}-amd64.tar.gz" "https://download.anydesk.com/linux/generic-linux/anydesk-${finalAttrs.version}-amd64.tar.gz" ]; - hash = "sha256-nSY4qHRsEvQk4M3JDHalAk3C6Y21WlfDQ2Gpp6/jjMs="; + hash = "sha256-uSotkFOpuC2a2sRTagY9KFx3F2VJmgrsn+dBa5ycdck="; }; buildInputs = [ diff --git a/pkgs/applications/networking/remote/citrix-workspace/generic.nix b/pkgs/applications/networking/remote/citrix-workspace/generic.nix index aa96c72e400d8..b59a82f720dce 100644 --- a/pkgs/applications/networking/remote/citrix-workspace/generic.nix +++ b/pkgs/applications/networking/remote/citrix-workspace/generic.nix @@ -2,7 +2,7 @@ , file, atk, alsa-lib, cairo, fontconfig, gdk-pixbuf, glib, webkitgtk, gtk2-x11, gtk3 , heimdal, krb5, libsoup, libvorbis, speex, openssl, zlib, xorg, pango, gtk2 , gnome2, mesa, nss, nspr, gtk_engines, freetype, dconf, libpng12, libxml2 -, libjpeg, libredirect, tzdata, cacert, systemd, libcxx, e2fsprogs, symlinkJoin +, libjpeg, libredirect, tzdata, cacert, systemd, libcxx, symlinkJoin , libpulseaudio, pcsclite, glib-networking, llvmPackages_12, opencv4 , libfaketime , libinput, libcap, libjson, libsecret, libcanberra-gtk3 @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { message = '' In order to use Citrix Workspace, you need to comply with the Citrix EULA and download - the ${if stdenv.is64bit then "64-bit" else "32-bit"} binaries, .tar.gz from: + the ${if stdenv.hostPlatform.is64bit then "64-bit" else "32-bit"} binaries, .tar.gz from: ${homepage} @@ -238,7 +238,7 @@ stdenv.mkDerivation rec { description = "Citrix Workspace"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; platforms = [ "x86_64-linux" ] ++ optional (versionOlder version "24") "i686-linux"; - maintainers = with maintainers; [ michaeladler ]; + maintainers = [ ]; inherit homepage; }; } diff --git a/pkgs/applications/networking/remote/citrix-workspace/sources.nix b/pkgs/applications/networking/remote/citrix-workspace/sources.nix index 1b0826c4d2bdf..2b5d0e9d7b142 100644 --- a/pkgs/applications/networking/remote/citrix-workspace/sources.nix +++ b/pkgs/applications/networking/remote/citrix-workspace/sources.nix @@ -3,9 +3,9 @@ let mkVersionInfo = _: { major, minor, patch, x64hash, x86hash, x64suffix, x86suffix, homepage }: { inherit homepage; - version = "${major}.${minor}.${patch}.${if stdenv.is64bit then x64suffix else x86suffix}"; - prefix = "linuxx${if stdenv.is64bit then "64" else "86"}"; - hash = if stdenv.is64bit then x64hash else x86hash; + version = "${major}.${minor}.${patch}.${if stdenv.hostPlatform.is64bit then x64suffix else x86suffix}"; + prefix = "linuxx${if stdenv.hostPlatform.is64bit then "64" else "86"}"; + hash = if stdenv.hostPlatform.is64bit then x64hash else x86hash; }; # Attribute-set with all actively supported versions of the Citrix workspace app diff --git a/pkgs/applications/networking/remote/freerdp/3.nix b/pkgs/applications/networking/remote/freerdp/3.nix index b25e090bf8b48..49b412bf76631 100644 --- a/pkgs/applications/networking/remote/freerdp/3.nix +++ b/pkgs/applications/networking/remote/freerdp/3.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchFromGitHub +, fetchpatch , cmake , docbook-xsl-nons , libxslt @@ -61,6 +62,8 @@ , withManPages ? stdenv.buildPlatform.canExecute stdenv.hostPlatform , buildPackages +, gnome +, remmina }: let @@ -68,15 +71,24 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "freerdp"; - version = "3.5.1"; + version = "3.8.0"; src = fetchFromGitHub { owner = "FreeRDP"; repo = "FreeRDP"; rev = finalAttrs.version; - hash = "sha256-8yWMnwJbvyUiEuX+2bEim1IeqPx20u9yvNIVe7MC/ZQ="; + hash = "sha256-zqqPfAXHjY4IV18mgbNxWDw7ZP/7SvoYn1u0FahpcNk="; }; + patches = [ + (fetchpatch { + name = "clang-fix-unwind-getlanguagespecificdata.patch"; + url = "https://github.com/FreeRDP/FreeRDP/commit/6fb7bfd043d159d3819486fb601b598102cca823.patch"; + hash = "sha256-U2Oz+IVvlIdg7kJ4rgAWhJVdzthY50YaCYKMMc2he7Y="; + }) + ]; + + postPatch = '' export HOME=$TMP @@ -140,12 +152,13 @@ stdenv.mkDerivation (finalAttrs: { SDL2_image uriparser zlib - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib fuse3 systemd wayland - ] ++ lib.optionals stdenv.isDarwin [ + wayland-scanner + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ AudioToolbox AVFoundation Carbon @@ -160,29 +173,28 @@ stdenv.mkDerivation (finalAttrs: { "-Wno-dev" "-DCMAKE_INSTALL_LIBDIR=lib" "-DDOCBOOKXSL_DIR=${docbook-xsl-nons}/xml/xsl/docbook" - "-DWAYLAND_SCANNER=${buildPackages.wayland-scanner}/bin/wayland-scanner" ] ++ lib.mapAttrsToList (k: v: "-D${k}=${cmFlag v}") { BUILD_TESTING = false; # false is recommended by upstream - WITH_CAIRO = (cairo != null); - WITH_CUPS = (cups != null); - WITH_FAAC = (withUnfree && faac != null); - WITH_FAAD2 = (faad2 != null); - WITH_FUSE = (stdenv.isLinux && fuse3 != null); - WITH_JPEG = (libjpeg_turbo != null); - WITH_KRB5 = (libkrb5 != null); - WITH_OPENH264 = (openh264 != null); - WITH_OPUS = (libopus != null); + WITH_CAIRO = cairo != null; + WITH_CUPS = cups != null; + WITH_FAAC = withUnfree && faac != null; + WITH_FAAD2 = faad2 != null; + WITH_FUSE = stdenv.hostPlatform.isLinux && fuse3 != null; + WITH_JPEG = libjpeg_turbo != null; + WITH_KRB5 = libkrb5 != null; + WITH_OPENH264 = openh264 != null; + WITH_OPUS = libopus != null; WITH_OSS = false; WITH_MANPAGES = withManPages; - WITH_PCSC = (pcsclite != null); - WITH_PULSE = (libpulseaudio != null); + WITH_PCSC = pcsclite != null; + WITH_PULSE = libpulseaudio != null; WITH_SERVER = buildServer; WITH_WEBVIEW = false; # avoid introducing webkit2gtk-4.0 WITH_VAAPI = false; # false is recommended by upstream WITH_X11 = true; }; - env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.isDarwin [ + env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.hostPlatform.isDarwin [ "-DTARGET_OS_IPHONE=0" "-DTARGET_OS_WATCH=0" "-include AudioToolbox/AudioToolbox.h" @@ -190,10 +202,15 @@ stdenv.mkDerivation (finalAttrs: { "-Wno-error=incompatible-function-pointer-types" ]); - env.NIX_LDFLAGS = toString (lib.optionals stdenv.isDarwin [ + env.NIX_LDFLAGS = toString (lib.optionals stdenv.hostPlatform.isDarwin [ "-framework AudioToolbox" ]); + passthru.tests = { + inherit remmina; + inherit (gnome) gnome-remote-desktop; + }; + meta = with lib; { description = "Remote Desktop Protocol Client"; longDescription = '' diff --git a/pkgs/applications/networking/remote/freerdp/default.nix b/pkgs/applications/networking/remote/freerdp/default.nix index e2b974a41e40c..7490066c73271 100644 --- a/pkgs/applications/networking/remote/freerdp/default.nix +++ b/pkgs/applications/networking/remote/freerdp/default.nix @@ -64,7 +64,7 @@ let dir = "libfreerdp/crypto/test"; file = "Test_x509_cert_info.c"; } - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ { dir = "winpr/libwinpr/sysinfo/test"; file = "TestGetComputerName.c"; @@ -140,11 +140,11 @@ stdenv.mkDerivation rec { pcre2 pcsclite zlib - ] ++ optionals stdenv.isLinux [ + ] ++ optionals stdenv.hostPlatform.isLinux [ alsa-lib systemd wayland - ] ++ optionals stdenv.isDarwin [ + ] ++ optionals stdenv.hostPlatform.isDarwin [ AudioToolbox AVFoundation Carbon @@ -167,7 +167,6 @@ stdenv.mkDerivation rec { "-Wno-dev" "-DCMAKE_INSTALL_LIBDIR=lib" "-DDOCBOOKXSL_DIR=${docbook-xsl-nons}/xml/xsl/docbook" - "-DWAYLAND_SCANNER=${buildPackages.wayland-scanner}/bin/wayland-scanner" ] ++ lib.mapAttrsToList (k: v: "-D${k}=${cmFlag v}") { BUILD_TESTING = false; # false is recommended by upstream @@ -186,7 +185,7 @@ stdenv.mkDerivation rec { WITH_X11 = true; }; - env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.isDarwin [ + env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.hostPlatform.isDarwin [ "-DTARGET_OS_IPHONE=0" "-DTARGET_OS_WATCH=0" "-include AudioToolbox/AudioToolbox.h" @@ -194,7 +193,7 @@ stdenv.mkDerivation rec { "-Wno-error=incompatible-function-pointer-types" ]); - NIX_LDFLAGS = lib.optionals stdenv.isDarwin [ + NIX_LDFLAGS = lib.optionals stdenv.hostPlatform.isDarwin [ "-framework AudioToolbox" ]; diff --git a/pkgs/applications/networking/remote/putty/default.nix b/pkgs/applications/networking/remote/putty/default.nix index 82f096699b20b..585f48d3a5f8d 100644 --- a/pkgs/applications/networking/remote/putty/default.nix +++ b/pkgs/applications/networking/remote/putty/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake perl pkg-config copyDesktopItems ]; buildInputs = lib.optionals stdenv.hostPlatform.isUnix [ gtk3 ncurses - ] ++ lib.optional stdenv.isDarwin darwin.apple_sdk.libs.utmp; + ] ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.libs.utmp; enableParallelBuilding = true; desktopItems = [ diff --git a/pkgs/applications/networking/remote/rdesktop/default.nix b/pkgs/applications/networking/remote/rdesktop/default.nix index a544984ee76b8..b92822b17d3f6 100644 --- a/pkgs/applications/networking/remote/rdesktop/default.nix +++ b/pkgs/applications/networking/remote/rdesktop/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, openssl, libX11, krb5, libXcursor, libtasn1 , nettle, gnutls, pkg-config, autoreconfHook, libiconv -, enableCredssp ? (!stdenv.isDarwin) +, enableCredssp ? (!stdenv.hostPlatform.isDarwin) } : stdenv.mkDerivation (rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation (rec { nativeBuildInputs = [pkg-config autoreconfHook]; buildInputs = [openssl libX11 libXcursor libtasn1 nettle gnutls] ++ lib.optional enableCredssp krb5 - ++ lib.optional stdenv.isDarwin libiconv; + ++ lib.optional stdenv.hostPlatform.isDarwin libiconv; configureFlags = [ "--with-ipv6" diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix index d80850edd4466..eb926ff1c0661 100644 --- a/pkgs/applications/networking/remote/remmina/default.nix +++ b/pkgs/applications/networking/remote/remmina/default.nix @@ -2,17 +2,18 @@ , curl, fuse3, fetchpatch2 , desktopToDarwinBundle , glib, gtk3, gettext, libxkbfile, libX11, python3 -, freerdp3, libssh, libgcrypt, gnutls, vte +, freerdp3, libssh, libgcrypt, gnutls , pcre2, libdbusmenu-gtk3, libappindicator-gtk3 , libvncserver, libpthreadstubs, libXdmcp, libxkbcommon , libsecret, libsoup_3, spice-protocol, spice-gtk, libepoxy, at-spi2-core -, openssl, gsettings-desktop-schemas, json-glib, libsodium, webkitgtk_4_1, harfbuzz +, openssl, gsettings-desktop-schemas, json-glib, libsodium, harfbuzz , wayland # The themes here are soft dependencies; only icons are missing without them. -, gnome -, withKf5Wallet ? stdenv.isLinux, libsForQt5 -, withLibsecret ? stdenv.isLinux -, withVte ? true +, adwaita-icon-theme +, withKf5Wallet ? stdenv.hostPlatform.isLinux, libsForQt5 +, withLibsecret ? stdenv.hostPlatform.isLinux +, withWebkitGtk ? false, webkitgtk_4_1 +, withVte ? true, vte }: stdenv.mkDerivation (finalAttrs: { @@ -35,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { ]; nativeBuildInputs = [ cmake ninja pkg-config wrapGAppsHook3 ] - ++ lib.optionals stdenv.isDarwin [ desktopToDarwinBundle ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ desktopToDarwinBundle ]; buildInputs = [ curl @@ -47,12 +48,13 @@ 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 ] + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ fuse3 libappindicator-gtk3 libdbusmenu-gtk3 ] ++ lib.optionals withLibsecret [ libsecret ] ++ lib.optionals withKf5Wallet [ libsForQt5.kwallet ] + ++ lib.optionals withWebkitGtk [ webkitgtk_4_1 ] ++ lib.optionals withVte [ vte ]; cmakeFlags = [ @@ -62,14 +64,14 @@ stdenv.mkDerivation (finalAttrs: { "-DWITH_AVAHI=OFF" "-DWITH_KF5WALLET=${if withKf5Wallet then "ON" else "OFF"}" "-DWITH_LIBSECRET=${if withLibsecret then "ON" else "OFF"}" - ] ++ lib.optionals stdenv.isDarwin [ + "-DWITH_WEBKIT2GTK=${if withWebkitGtk then "ON" else "OFF"}" + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DHAVE_LIBAPPINDICATOR=OFF" "-DWITH_CUPS=OFF" "-DWITH_ICON_CACHE=OFF" - "-DWITH_WEBKIT2GTK=OFF" ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin (toString [ + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin (toString [ "-DTARGET_OS_IPHONE=0" "-DTARGET_OS_WATCH=0" ]); @@ -80,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: { gappsWrapperArgs+=( --set-default SSL_CERT_DIR "/etc/ssl/certs/" --prefix LD_LIBRARY_PATH : "${libX11.out}/lib" - ${lib.optionalString stdenv.isDarwin '' + ${lib.optionalString stdenv.hostPlatform.isDarwin '' --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS" ''} ) diff --git a/pkgs/applications/networking/remote/rustdesk/Cargo.lock b/pkgs/applications/networking/remote/rustdesk/Cargo.lock deleted file mode 100644 index 3a8adbda2ca68..0000000000000 --- a/pkgs/applications/networking/remote/rustdesk/Cargo.lock +++ /dev/null @@ -1,7470 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "addr2line" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97" -dependencies = [ - "gimli", -] - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "aes" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8" -dependencies = [ - "cfg-if 1.0.0", - "cipher", - "cpufeatures", - "opaque-debug", -] - -[[package]] -name = "ahash" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" -dependencies = [ - "getrandom", - "once_cell", - "version_check", -] - -[[package]] -name = "aho-corasick" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04" -dependencies = [ - "memchr", -] - -[[package]] -name = "allo-isolate" -version = "0.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ed55848be9f41d44c79df6045b680a74a78bc579e0813f7f196cd7928e22fb1" -dependencies = [ - "anyhow", - "atomic", - "chrono", - "uuid", -] - -[[package]] -name = "alloc-no-stdlib" -version = "2.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3" - -[[package]] -name = "alloc-stdlib" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece" -dependencies = [ - "alloc-no-stdlib", -] - -[[package]] -name = "alsa" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8512c9117059663fb5606788fbca3619e2a91dac0e3fe516242eab1fa6be5e44" -dependencies = [ - "alsa-sys", - "bitflags", - "libc", - "nix 0.24.3", -] - -[[package]] -name = "alsa-sys" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db8fee663d06c4e303404ef5f40488a53e062f89ba8bfed81f42325aafad1527" -dependencies = [ - "libc", - "pkg-config", -] - -[[package]] -name = "android_log-sys" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27f0fc03f560e1aebde41c2398b691cb98b5ea5996a6184a7a67bbbb77448969" - -[[package]] -name = "android_logger" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fa490e751f3878eb9accb9f18988eca52c2337ce000a8bf31ef50d4c723ca9e" -dependencies = [ - "android_log-sys", - "env_logger 0.10.0", - "log", - "once_cell", -] - -[[package]] -name = "android_system_properties" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" -dependencies = [ - "libc", -] - -[[package]] -name = "ansi_term" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" -dependencies = [ - "winapi 0.3.9", -] - -[[package]] -name = "anstream" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163" -dependencies = [ - "anstyle", - "anstyle-parse", - "anstyle-query", - "anstyle-wincon", - "colorchoice", - "is-terminal", - "utf8parse", -] - -[[package]] -name = "anstyle" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d" - -[[package]] -name = "anstyle-parse" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e765fd216e48e067936442276d1d57399e37bce53c264d6fefbe298080cb57ee" -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 0.48.0", -] - -[[package]] -name = "anstyle-wincon" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188" -dependencies = [ - "anstyle", - "windows-sys 0.48.0", -] - -[[package]] -name = "anyhow" -version = "1.0.71" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" - -[[package]] -name = "apple-bindgen" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38f109ee76f68b4767848cb5dc93bfcc7c425deca849c4c81fa11cdce525e3d2" -dependencies = [ - "apple-sdk", - "bindgen 0.63.0", - "derive_more", - "regex", - "serde 1.0.163", - "thiserror", - "toml 0.6.0", -] - -[[package]] -name = "apple-sdk" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a04f192a700686ee70008ff4e4eb76fe7d11814ab93b7ee9d48c36b9a9f0bd2a" -dependencies = [ - "plist", - "serde 1.0.163", - "serde_json 1.0.96", -] - -[[package]] -name = "apple-sys" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12b3a1c3342678cd72676d0c1644fde496c1f65ea41f51465f54a89cad3bdf34" -dependencies = [ - "apple-bindgen", - "apple-sdk", - "objc", -] - -[[package]] -name = "arboard" -version = "3.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6041616acea41d67c4a984709ddab1587fd0b10efe5cc563fee954d2f011854" -dependencies = [ - "clipboard-win", - "core-graphics", - "image", - "log", - "objc", - "objc-foundation", - "objc_id", - "once_cell", - "parking_lot", - "thiserror", - "winapi 0.3.9", - "x11rb", -] - -[[package]] -name = "async-broadcast" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c48ccdbf6ca6b121e0f586cbc0e73ae440e56c67c30fa0873b4e110d9c26d2b" -dependencies = [ - "event-listener", - "futures-core", -] - -[[package]] -name = "async-channel" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf46fee83e5ccffc220104713af3292ff9bc7c64c7de289f66dae8e38d826833" -dependencies = [ - "concurrent-queue", - "event-listener", - "futures-core", -] - -[[package]] -name = "async-executor" -version = "1.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fa3dc5f2a8564f07759c008b9109dc0d39de92a88d5588b8a5036d286383afb" -dependencies = [ - "async-lock", - "async-task", - "concurrent-queue", - "fastrand", - "futures-lite", - "slab", -] - -[[package]] -name = "async-fs" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06" -dependencies = [ - "async-lock", - "autocfg 1.1.0", - "blocking", - "futures-lite", -] - -[[package]] -name = "async-io" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" -dependencies = [ - "async-lock", - "autocfg 1.1.0", - "cfg-if 1.0.0", - "concurrent-queue", - "futures-lite", - "log", - "parking", - "polling", - "rustix", - "slab", - "socket2 0.4.9", - "waker-fn", -] - -[[package]] -name = "async-lock" -version = "2.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa24f727524730b077666307f2734b4a1a1c57acb79193127dcc8914d5242dd7" -dependencies = [ - "event-listener", -] - -[[package]] -name = "async-process" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a9d28b1d97e08915212e2e45310d47854eafa69600756fc735fb788f75199c9" -dependencies = [ - "async-io", - "async-lock", - "autocfg 1.1.0", - "blocking", - "cfg-if 1.0.0", - "event-listener", - "futures-lite", - "rustix", - "signal-hook", - "windows-sys 0.48.0", -] - -[[package]] -name = "async-recursion" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba" -dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.27", - "syn 2.0.15", -] - -[[package]] -name = "async-task" -version = "4.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae" - -[[package]] -name = "async-trait" -version = "0.1.68" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" -dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.27", - "syn 2.0.15", -] - -[[package]] -name = "atk" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39991bc421ddf72f70159011b323ff49b0f783cc676a7287c59453da2e2531cf" -dependencies = [ - "atk-sys", - "bitflags", - "glib 0.16.7", - "libc", -] - -[[package]] -name = "atk-sys" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11ad703eb64dc058024f0e57ccfa069e15a413b98dbd50a1a950e743b7f11148" -dependencies = [ - "glib-sys 0.16.3", - "gobject-sys 0.16.3", - "libc", - "system-deps 6.1.0", -] - -[[package]] -name = "atomic" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b88d82667eca772c4aa12f0f1348b3ae643424c8876448f3f7bd5787032e234c" -dependencies = [ - "autocfg 1.1.0", -] - -[[package]] -name = "atomic-waker" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1181e1e0d1fce796a03db1ae795d67167da795f9cf4a39c37589e85ef57f26d3" - -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi 0.1.19", - "libc", - "winapi 0.3.9", -] - -[[package]] -name = "autocfg" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dde43e75fd43e8a1bf86103336bc699aa8d17ad1be60c76c0bdfd4828e19b78" -dependencies = [ - "autocfg 1.1.0", -] - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "backtrace" -version = "0.3.67" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca" -dependencies = [ - "addr2line", - "cc", - "cfg-if 1.0.0", - "libc", - "miniz_oxide 0.6.2", - "object", - "rustc-demangle", -] - -[[package]] -name = "base64" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" - -[[package]] -name = "base64ct" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" - -[[package]] -name = "bindgen" -version = "0.59.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bd2a9a458e8f4304c52c43ebb0cfbd520289f8379a52e329a38afda99bf8eb8" -dependencies = [ - "bitflags", - "cexpr", - "clang-sys", - "clap 2.34.0", - "env_logger 0.9.3", - "lazy_static", - "lazycell", - "log", - "peeking_take_while", - "proc-macro2 1.0.63", - "quote 1.0.27", - "regex", - "rustc-hash", - "shlex", - "which", -] - -[[package]] -name = "bindgen" -version = "0.63.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36d860121800b2a9a94f9b5604b332d5cffb234ce17609ea479d723dbc9d3885" -dependencies = [ - "bitflags", - "cexpr", - "clang-sys", - "lazy_static", - "lazycell", - "log", - "peeking_take_while", - "proc-macro2 1.0.63", - "quote 1.0.27", - "regex", - "rustc-hash", - "shlex", - "syn 1.0.109", - "which", -] - -[[package]] -name = "bindgen" -version = "0.64.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4243e6031260db77ede97ad86c27e501d646a27ab57b59a574f725d98ab1fb4" -dependencies = [ - "bitflags", - "cexpr", - "clang-sys", - "lazy_static", - "lazycell", - "peeking_take_while", - "proc-macro2 1.0.63", - "quote 1.0.27", - "regex", - "rustc-hash", - "shlex", - "syn 1.0.109", -] - -[[package]] -name = "bindgen" -version = "0.65.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfdf7b466f9a4903edc73f95d6d2bcd5baf8ae620638762244d3f60143643cc5" -dependencies = [ - "bitflags", - "cexpr", - "clang-sys", - "lazy_static", - "lazycell", - "log", - "peeking_take_while", - "prettyplease", - "proc-macro2 1.0.63", - "quote 1.0.27", - "regex", - "rustc-hash", - "shlex", - "syn 2.0.15", - "which", -] - -[[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 = "bitvec" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" -dependencies = [ - "funty", - "radium", - "tap", - "wyz", -] - -[[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 = "blocking" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77231a1c8f801696fc0123ec6150ce92cffb8e164a02afb9c8ddee0e9b65ad65" -dependencies = [ - "async-channel", - "async-lock", - "async-task", - "atomic-waker", - "fastrand", - "futures-lite", - "log", -] - -[[package]] -name = "brotli" -version = "3.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1a0b1dbcc8ae29329621f8d4f0d835787c1c38bb1401979b49d13b0b305ff68" -dependencies = [ - "alloc-no-stdlib", - "alloc-stdlib", - "brotli-decompressor", -] - -[[package]] -name = "brotli-decompressor" -version = "2.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b6561fd3f895a11e8f72af2cb7d22e08366bebc2b6b57f7744c4bda27034744" -dependencies = [ - "alloc-no-stdlib", - "alloc-stdlib", -] - -[[package]] -name = "build-target" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "832133bbabbbaa9fbdba793456a2827627a7d2b8fb96032fa1e7666d7895832b" - -[[package]] -name = "bumpalo" -version = "3.12.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c6ed94e98ecff0c12dd1b04c15ec0d7d9458ca8fe806cea6f12954efe74c63b" - -[[package]] -name = "bytemuck" -version = "1.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea" - -[[package]] -name = "byteorder" -version = "1.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" - -[[package]] -name = "bytes" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" -dependencies = [ - "serde 1.0.163", -] - -[[package]] -name = "bzip2" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdb116a6ef3f6c3698828873ad02c3014b3c85cadb88496095628e3ef1e347f8" -dependencies = [ - "bzip2-sys", - "libc", -] - -[[package]] -name = "bzip2-sys" -version = "0.1.11+1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc" -dependencies = [ - "cc", - "libc", - "pkg-config", -] - -[[package]] -name = "cairo-rs" -version = "0.16.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3125b15ec28b84c238f6f476c6034016a5f6cc0221cb514ca46c532139fc97d" -dependencies = [ - "bitflags", - "cairo-sys-rs", - "glib 0.16.7", - "libc", - "once_cell", - "thiserror", -] - -[[package]] -name = "cairo-sys-rs" -version = "0.16.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c48f4af05fabdcfa9658178e1326efa061853f040ce7d72e33af6885196f421" -dependencies = [ - "glib-sys 0.16.3", - "libc", - "system-deps 6.1.0", -] - -[[package]] -name = "camino" -version = "1.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c530edf18f37068ac2d977409ed5cd50d53d73bc653c7647b48eb78976ac9ae2" -dependencies = [ - "serde 1.0.163", -] - -[[package]] -name = "cargo-platform" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbdb825da8a5df079a43676dbe042702f1707b1109f713a01420fbb4cc71fa27" -dependencies = [ - "serde 1.0.163", -] - -[[package]] -name = "cargo_metadata" -version = "0.14.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4acbb09d9ee8e23699b9634375c72795d095bf268439da88562cf9b501f181fa" -dependencies = [ - "camino", - "cargo-platform", - "semver", - "serde 1.0.163", - "serde_json 1.0.96", -] - -[[package]] -name = "cbindgen" -version = "0.24.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6358dedf60f4d9b8db43ad187391afe959746101346fe51bb978126bec61dfb" -dependencies = [ - "clap 3.2.25", - "heck 0.4.1", - "indexmap", - "log", - "proc-macro2 1.0.63", - "quote 1.0.27", - "serde 1.0.163", - "serde_json 1.0.96", - "syn 1.0.109", - "tempfile", - "toml 0.5.11", -] - -[[package]] -name = "cc" -version = "1.0.79" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" -dependencies = [ - "jobserver", -] - -[[package]] -name = "cesu8" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" - -[[package]] -name = "cexpr" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" -dependencies = [ - "nom", -] - -[[package]] -name = "cfg-expr" -version = "0.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8790cf1286da485c72cf5fc7aeba308438800036ec67d89425924c4807268c9" -dependencies = [ - "smallvec", - "target-lexicon", -] - -[[package]] -name = "cfg-if" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "chrono" -version = "0.4.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e3c5919066adf22df73762e50cffcde3a758f2a848b113b586d1f86728b673b" -dependencies = [ - "iana-time-zone", - "js-sys", - "num-integer", - "num-traits 0.2.15", - "time 0.1.45", - "wasm-bindgen", - "winapi 0.3.9", -] - -[[package]] -name = "cidr-utils" -version = "0.5.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdfa36f04861d39453affe1cf084ce2d6554021a84eb6f31ebdeafb6fb92a01c" -dependencies = [ - "debug-helper", - "num-bigint", - "num-traits 0.2.15", - "once_cell", - "regex", -] - -[[package]] -name = "cipher" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7" -dependencies = [ - "generic-array", -] - -[[package]] -name = "clang-sys" -version = "1.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f" -dependencies = [ - "glob", - "libc", - "libloading 0.7.4", -] - -[[package]] -name = "clap" -version = "2.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" -dependencies = [ - "ansi_term", - "atty", - "bitflags", - "strsim 0.8.0", - "textwrap 0.11.0", - "unicode-width", - "vec_map", -] - -[[package]] -name = "clap" -version = "3.2.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123" -dependencies = [ - "atty", - "bitflags", - "clap_lex 0.2.4", - "indexmap", - "strsim 0.10.0", - "termcolor", - "textwrap 0.16.0", -] - -[[package]] -name = "clap" -version = "4.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34d21f9bf1b425d2968943631ec91202fe5e837264063503708b83013f8fc938" -dependencies = [ - "clap_builder", - "clap_derive", - "once_cell", -] - -[[package]] -name = "clap_builder" -version = "4.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "914c8c79fb560f238ef6429439a30023c862f7a28e688c58f7203f12b29970bd" -dependencies = [ - "anstream", - "anstyle", - "bitflags", - "clap_lex 0.4.1", - "strsim 0.10.0", -] - -[[package]] -name = "clap_derive" -version = "4.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9644cd56d6b87dbe899ef8b053e331c0637664e9e21a33dfcdc36093f5c5c4" -dependencies = [ - "heck 0.4.1", - "proc-macro2 1.0.63", - "quote 1.0.27", - "syn 2.0.15", -] - -[[package]] -name = "clap_lex" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" -dependencies = [ - "os_str_bytes", -] - -[[package]] -name = "clap_lex" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a2dd5a6fe8c6e3502f568a6353e5273bbb15193ad9a89e457b9970798efbea1" - -[[package]] -name = "clipboard" -version = "0.1.0" -dependencies = [ - "cc", - "hbb_common", - "lazy_static", - "serde 1.0.163", - "serde_derive", - "thiserror", -] - -[[package]] -name = "clipboard-win" -version = "4.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7191c27c2357d9b7ef96baac1773290d4ca63b24205b82a3fd8a0637afcf0362" -dependencies = [ - "error-code", - "str-buf", - "winapi 0.3.9", -] - -[[package]] -name = "cloudabi" -version = "0.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" -dependencies = [ - "bitflags", -] - -[[package]] -name = "cmake" -version = "0.1.50" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31c789563b815f77f4250caee12365734369f942439b7defd71e18a48197130" -dependencies = [ - "cc", -] - -[[package]] -name = "cocoa" -version = "0.24.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f425db7937052c684daec3bd6375c8abe2d146dca4b8b143d6db777c39138f3a" -dependencies = [ - "bitflags", - "block", - "cocoa-foundation", - "core-foundation", - "core-graphics", - "foreign-types", - "libc", - "objc", -] - -[[package]] -name = "cocoa-foundation" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "931d3837c286f56e3c58423ce4eba12d08db2374461a785c86f672b08b5650d6" -dependencies = [ - "bitflags", - "block", - "core-foundation", - "core-graphics-types", - "foreign-types", - "libc", - "objc", -] - -[[package]] -name = "codespan-reporting" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" -dependencies = [ - "termcolor", - "unicode-width", -] - -[[package]] -name = "color_quant" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" - -[[package]] -name = "colorchoice" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" - -[[package]] -name = "colored" -version = "1.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4ffc801dacf156c5854b9df4f425a626539c3a6ef7893cc0c5084a23f0b6c59" -dependencies = [ - "atty", - "lazy_static", - "winapi 0.3.9", -] - -[[package]] -name = "combine" -version = "4.6.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4" -dependencies = [ - "bytes", - "memchr", -] - -[[package]] -name = "concurrent-queue" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c" -dependencies = [ - "crossbeam-utils", -] - -[[package]] -name = "confy" -version = "0.4.0-2" -source = "git+https://github.com/open-trade/confy#7855cd3c32b1a60b44e5076ee8f6b4131da10350" -dependencies = [ - "directories-next", - "serde 1.0.163", - "thiserror", - "toml 0.5.11", -] - -[[package]] -name = "console_error_panic_hook" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a06aeb73f470f66dcdbf7223caeebb85984942f22f1adb2a088cf9668146bbbc" -dependencies = [ - "cfg-if 1.0.0", - "wasm-bindgen", -] - -[[package]] -name = "const_fn" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbdcdcb6d86f71c5e97409ad45898af11cbc995b4ee8112d59095a28d376c935" - -[[package]] -name = "const_format" -version = "0.2.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c990efc7a285731f9a4378d81aff2f0e85a2c8781a05ef0f8baa8dac54d0ff48" -dependencies = [ - "const_format_proc_macros", -] - -[[package]] -name = "const_format_proc_macros" -version = "0.2.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e026b6ce194a874cb9cf32cd5772d1ef9767cc8fcb5765948d74f37a9d8b2bf6" -dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.27", - "unicode-xid 0.2.4", -] - -[[package]] -name = "constant_time_eq" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" - -[[package]] -name = "convert_case" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" - -[[package]] -name = "convert_case" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb4a24b1aaf0fd0ce8b45161144d6f42cd91677fd5940fd431183eb023b3a2b8" - -[[package]] -name = "core-foundation" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" -dependencies = [ - "core-foundation-sys 0.8.4", - "libc", -] - -[[package]] -name = "core-foundation-sys" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b" - -[[package]] -name = "core-foundation-sys" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" - -[[package]] -name = "core-graphics" -version = "0.22.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb" -dependencies = [ - "bitflags", - "core-foundation", - "core-graphics-types", - "foreign-types", - "libc", -] - -[[package]] -name = "core-graphics-types" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a68b68b3446082644c91ac778bf50cd4104bfb002b5a6a7c44cca5a2c70788b" -dependencies = [ - "bitflags", - "core-foundation", - "foreign-types", - "libc", -] - -[[package]] -name = "coreaudio-rs" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb17e2d1795b1996419648915df94bc7103c28f7b48062d7acf4652fc371b2ff" -dependencies = [ - "bitflags", - "core-foundation-sys 0.6.2", - "coreaudio-sys", -] - -[[package]] -name = "coreaudio-sys" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f034b2258e6c4ade2f73bf87b21047567fb913ee9550837c2316d139b0262b24" -dependencies = [ - "bindgen 0.64.0", -] - -[[package]] -name = "cpal" -version = "0.15.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d959d90e938c5493000514b446987c07aed46c668faaa7d34d6c7a67b1a578c" -dependencies = [ - "alsa", - "core-foundation-sys 0.8.4", - "coreaudio-rs", - "dasp_sample", - "jni 0.19.0", - "js-sys", - "libc", - "mach2", - "ndk", - "ndk-context", - "oboe", - "once_cell", - "parking_lot", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "windows 0.46.0", -] - -[[package]] -name = "cpufeatures" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e4c1eaa2012c47becbbad2ab175484c2a84d1185b566fb2cc5b8707343dfe58" -dependencies = [ - "libc", -] - -[[package]] -name = "crc32fast" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" -dependencies = [ - "cfg-if 1.0.0", -] - -[[package]] -name = "crossbeam-channel" -version = "0.5.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" -dependencies = [ - "cfg-if 1.0.0", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-deque" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" -dependencies = [ - "cfg-if 1.0.0", - "crossbeam-epoch", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.9.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695" -dependencies = [ - "autocfg 1.1.0", - "cfg-if 1.0.0", - "crossbeam-utils", - "memoffset 0.8.0", - "scopeguard", -] - -[[package]] -name = "crossbeam-queue" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1cfb3ea8a53f37c40dea2c7bedcbd88bdfae54f5e2175d6ecaff1c988353add" -dependencies = [ - "cfg-if 1.0.0", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b" -dependencies = [ - "cfg-if 1.0.0", -] - -[[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 = "ctrlc" -version = "3.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbcf33c2a618cbe41ee43ae6e9f2e48368cd9f9db2896f10167d8d762679f639" -dependencies = [ - "nix 0.26.2", - "windows-sys 0.45.0", -] - -[[package]] -name = "cxx" -version = "1.0.94" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f61f1b6389c3fe1c316bf8a4dccc90a38208354b330925bce1f74a6c4756eb93" -dependencies = [ - "cc", - "cxxbridge-flags", - "cxxbridge-macro", - "link-cplusplus", -] - -[[package]] -name = "cxx-build" -version = "1.0.94" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12cee708e8962df2aeb38f594aae5d827c022b6460ac71a7a3e2c3c2aae5a07b" -dependencies = [ - "cc", - "codespan-reporting", - "once_cell", - "proc-macro2 1.0.63", - "quote 1.0.27", - "scratch", - "syn 2.0.15", -] - -[[package]] -name = "cxxbridge-flags" -version = "1.0.94" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7944172ae7e4068c533afbb984114a56c46e9ccddda550499caa222902c7f7bb" - -[[package]] -name = "cxxbridge-macro" -version = "1.0.94" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2345488264226bf682893e25de0769f3360aac9957980ec49361b083ddaa5bc5" -dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.27", - "syn 2.0.15", -] - -[[package]] -name = "dark-light" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a62007a65515b3cd88c733dd3464431f05d2ad066999a824259d8edc3cf6f645" -dependencies = [ - "dconf_rs", - "detect-desktop-environment", - "dirs 4.0.0", - "objc", - "rust-ini", - "web-sys", - "winreg 0.10.1", - "zbus", - "zvariant", -] - -[[package]] -name = "dart-sys" -version = "4.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d8b5680b5c2cc52f50acb2457d9b3a3b58adcca785db13a0e3655626f601de6" -dependencies = [ - "cc", -] - -[[package]] -name = "dasp" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7381b67da416b639690ac77c73b86a7b5e64a29e31d1f75fb3b1102301ef355a" -dependencies = [ - "dasp_envelope", - "dasp_frame", - "dasp_interpolate", - "dasp_peak", - "dasp_ring_buffer", - "dasp_rms", - "dasp_sample", - "dasp_signal", - "dasp_slice", - "dasp_window", -] - -[[package]] -name = "dasp_envelope" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ec617ce7016f101a87fe85ed44180839744265fae73bb4aa43e7ece1b7668b6" -dependencies = [ - "dasp_frame", - "dasp_peak", - "dasp_ring_buffer", - "dasp_rms", - "dasp_sample", -] - -[[package]] -name = "dasp_frame" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2a3937f5fe2135702897535c8d4a5553f8b116f76c1529088797f2eee7c5cd6" -dependencies = [ - "dasp_sample", -] - -[[package]] -name = "dasp_interpolate" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fc975a6563bb7ca7ec0a6c784ead49983a21c24835b0bc96eea11ee407c7486" -dependencies = [ - "dasp_frame", - "dasp_ring_buffer", - "dasp_sample", -] - -[[package]] -name = "dasp_peak" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cf88559d79c21f3d8523d91250c397f9a15b5fc72fbb3f87fdb0a37b79915bf" -dependencies = [ - "dasp_frame", - "dasp_sample", -] - -[[package]] -name = "dasp_ring_buffer" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07d79e19b89618a543c4adec9c5a347fe378a19041699b3278e616e387511ea1" - -[[package]] -name = "dasp_rms" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6c5dcb30b7e5014486e2822537ea2beae50b19722ffe2ed7549ab03774575aa" -dependencies = [ - "dasp_frame", - "dasp_ring_buffer", - "dasp_sample", -] - -[[package]] -name = "dasp_sample" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c87e182de0887fd5361989c677c4e8f5000cd9491d6d563161a8f3a5519fc7f" - -[[package]] -name = "dasp_signal" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa1ab7d01689c6ed4eae3d38fe1cea08cba761573fbd2d592528d55b421077e7" -dependencies = [ - "dasp_envelope", - "dasp_frame", - "dasp_interpolate", - "dasp_peak", - "dasp_ring_buffer", - "dasp_rms", - "dasp_sample", - "dasp_window", -] - -[[package]] -name = "dasp_slice" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e1c7335d58e7baedafa516cb361360ff38d6f4d3f9d9d5ee2a2fc8e27178fa1" -dependencies = [ - "dasp_frame", - "dasp_sample", -] - -[[package]] -name = "dasp_window" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99ded7b88821d2ce4e8b842c9f1c86ac911891ab89443cc1de750cae764c5076" -dependencies = [ - "dasp_sample", -] - -[[package]] -name = "dbus" -version = "0.9.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bb21987b9fb1613058ba3843121dd18b163b254d8a6e797e144cbac14d96d1b" -dependencies = [ - "libc", - "libdbus-sys", - "winapi 0.3.9", -] - -[[package]] -name = "dbus-crossroads" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a4c83437187544ba5142427746835061b330446ca8902eabd70e4afb8f76de0" -dependencies = [ - "dbus", -] - -[[package]] -name = "dconf_rs" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7046468a81e6a002061c01e6a7c83139daf91b11c30e66795b13217c2d885c8b" - -[[package]] -name = "debug-helper" -version = "0.3.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f578e8e2c440e7297e008bb5486a3a8a194775224bbc23729b0dbdfaeebf162e" - -[[package]] -name = "default-net" -version = "0.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4898b43aed56499fad6b294d15b3e76a51df68079bf492e5daae38ca084e003" -dependencies = [ - "dlopen2", - "libc", - "memalloc", - "netlink-packet-core", - "netlink-packet-route", - "netlink-sys", - "once_cell", - "system-configuration", - "windows 0.32.0", -] - -[[package]] -name = "delegate" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "082a24a9967533dc5d743c602157637116fc1b52806d694a5a45e6f32567fcdd" -dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.27", - "syn 1.0.109", -] - -[[package]] -name = "derivative" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" -dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.27", - "syn 1.0.109", -] - -[[package]] -name = "derive_more" -version = "0.99.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" -dependencies = [ - "convert_case 0.4.0", - "proc-macro2 1.0.63", - "quote 1.0.27", - "rustc_version", - "syn 1.0.109", -] - -[[package]] -name = "detect-desktop-environment" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21d8ad60dd5b13a4ee6bd8fa2d5d88965c597c67bce32b5fc49c94f55cb50810" - -[[package]] -name = "digest" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" -dependencies = [ - "block-buffer", - "crypto-common", - "subtle", -] - -[[package]] -name = "directories-next" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "339ee130d97a610ea5a5872d2bbb130fdf68884ff09d3028b81bec8a1ac23bbc" -dependencies = [ - "cfg-if 1.0.0", - "dirs-sys-next", -] - -[[package]] -name = "dirs" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13aea89a5c93364a98e9b37b2fa237effbb694d5cfe01c5b70941f7eb087d5e3" -dependencies = [ - "cfg-if 0.1.10", - "dirs-sys 0.3.7", -] - -[[package]] -name = "dirs" -version = "4.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" -dependencies = [ - "dirs-sys 0.3.7", -] - -[[package]] -name = "dirs" -version = "5.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" -dependencies = [ - "dirs-sys 0.4.1", -] - -[[package]] -name = "dirs-next" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" -dependencies = [ - "cfg-if 1.0.0", - "dirs-sys-next", -] - -[[package]] -name = "dirs-sys" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" -dependencies = [ - "libc", - "redox_users", - "winapi 0.3.9", -] - -[[package]] -name = "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 = "dirs-sys-next" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" -dependencies = [ - "libc", - "redox_users", - "winapi 0.3.9", -] - -[[package]] -name = "dispatch" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" - -[[package]] -name = "dlopen" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71e80ad39f814a9abe68583cd50a2d45c8a67561c3361ab8da240587dda80937" -dependencies = [ - "dlopen_derive", - "lazy_static", - "libc", - "winapi 0.3.9", -] - -[[package]] -name = "dlopen2" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b121caccfc363e4d9a4589528f3bef7c71b83c6ed01c8dc68cbeeb7fd29ec698" -dependencies = [ - "dlopen2_derive", - "libc", - "once_cell", - "winapi 0.3.9", -] - -[[package]] -name = "dlopen2_derive" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a09ac8bb8c16a282264c379dffba707b9c998afc7506009137f3c6136888078" -dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.27", - "syn 1.0.109", -] - -[[package]] -name = "dlopen_derive" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f236d9e1b1fbd81cea0f9cbdc8dcc7e8ebcd80e6659cd7cb2ad5f6c05946c581" -dependencies = [ - "libc", - "quote 0.6.13", - "syn 0.15.44", -] - -[[package]] -name = "dlv-list" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0688c2a7f92e427f44895cd63841bff7b29f8d7a1648b9e7e07a4a365b2e1257" - -[[package]] -name = "docopt" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f3f119846c823f9eafcf953a8f6ffb6ed69bf6240883261a7f13b634579a51f" -dependencies = [ - "lazy_static", - "regex", - "serde 1.0.163", - "strsim 0.10.0", -] - -[[package]] -name = "dtoa" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56899898ce76aaf4a0f24d914c97ea6ed976d42fec6ad33fcbb0a1103e07b2b0" - -[[package]] -name = "dylib_virtual_display" -version = "0.1.0" -dependencies = [ - "cc", - "hbb_common", - "lazy_static", - "serde 1.0.163", - "serde_derive", - "thiserror", -] - -[[package]] -name = "ed25519" -version = "1.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91cff35c70bba8a626e3185d8cd48cc11b5437e1a5bcd15b9b5fa3c64b6dfee7" -dependencies = [ - "signature", -] - -[[package]] -name = "either" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" - -[[package]] -name = "embed-resource" -version = "2.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80663502655af01a2902dff3f06869330782267924bf1788410b74edcd93770a" -dependencies = [ - "cc", - "rustc_version", - "toml 0.7.3", - "vswhom", - "winreg 0.11.0", -] - -[[package]] -name = "encoding_rs" -version = "0.8.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" -dependencies = [ - "cfg-if 1.0.0", -] - -[[package]] -name = "enigo" -version = "0.0.14" -dependencies = [ - "core-graphics", - "hbb_common", - "log", - "objc", - "pkg-config", - "rdev", - "serde 1.0.163", - "serde_derive", - "tfc", - "unicode-segmentation", - "winapi 0.3.9", -] - -[[package]] -name = "enum-iterator" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7add3873b5dd076766ee79c8e406ad1a472c385476b9e38849f8eec24f1be689" -dependencies = [ - "enum-iterator-derive", -] - -[[package]] -name = "enum-iterator-derive" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eecf8589574ce9b895052fa12d69af7a233f99e6107f5cb8dd1044f2a17bfdcb" -dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.27", - "syn 2.0.15", -] - -[[package]] -name = "enum-map" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "988f0d17a0fa38291e5f41f71ea8d46a5d5497b9054d5a759fae2cbb819f2356" -dependencies = [ - "enum-map-derive", -] - -[[package]] -name = "enum-map-derive" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a4da76b3b6116d758c7ba93f7ec6a35d2e2cf24feda76c6e38a375f4d5c59f2" -dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.27", - "syn 1.0.109", -] - -[[package]] -name = "enum_dispatch" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11f36e95862220b211a6e2aa5eca09b4fa391b13cd52ceb8035a24bf65a79de2" -dependencies = [ - "once_cell", - "proc-macro2 1.0.63", - "quote 1.0.27", - "syn 1.0.109", -] - -[[package]] -name = "enumflags2" -version = "0.7.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c041f5090df68b32bcd905365fd51769c8b9d553fe87fde0b683534f10c01bd2" -dependencies = [ - "enumflags2_derive", - "serde 1.0.163", -] - -[[package]] -name = "enumflags2_derive" -version = "0.7.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e9a1f9f7d83e59740248a6e14ecf93929ade55027844dfcea78beafccc15745" -dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.27", - "syn 2.0.15", -] - -[[package]] -name = "env_logger" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7" -dependencies = [ - "atty", - "humantime", - "log", - "regex", - "termcolor", -] - -[[package]] -name = "env_logger" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" -dependencies = [ - "humantime", - "is-terminal", - "log", - "regex", - "termcolor", -] - -[[package]] -name = "epoll" -version = "4.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20df693c700404f7e19d4d6fae6b15215d2913c27955d2b9d6f2c0f537511cd0" -dependencies = [ - "bitflags", - "libc", -] - -[[package]] -name = "errno" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" -dependencies = [ - "errno-dragonfly", - "libc", - "windows-sys 0.48.0", -] - -[[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 = "error-code" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64f18991e7bf11e7ffee451b5318b5c1a73c52d0d0ada6e5a3017c8c1ced6a21" -dependencies = [ - "libc", - "str-buf", -] - -[[package]] -name = "evdev" -version = "0.11.5" -source = "git+https://github.com/fufesou/evdev#cec616e37790293d2cd2aa54a96601ed6b1b35a9" -dependencies = [ - "bitvec", - "libc", - "nix 0.23.2", -] - -[[package]] -name = "event-listener" -version = "2.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" - -[[package]] -name = "exr" -version = "1.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdd2162b720141a91a054640662d3edce3d50a944a50ffca5313cd951abb35b4" -dependencies = [ - "bit_field", - "flume", - "half", - "lebe", - "miniz_oxide 0.6.2", - "rayon-core", - "smallvec", - "zune-inflate", -] - -[[package]] -name = "fastrand" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" -dependencies = [ - "instant", -] - -[[package]] -name = "fdeflate" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d329bdeac514ee06249dabc27877490f17f5d371ec693360768b838e19f3ae10" -dependencies = [ - "simd-adler32", -] - -[[package]] -name = "fern" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9f0c14694cbd524c8720dd69b0e3179344f04ebb5f90f2e4a440c6ea3b2f1ee" -dependencies = [ - "chrono", - "colored", - "log", -] - -[[package]] -name = "field-offset" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3cf3a800ff6e860c863ca6d4b16fd999db8b752819c1606884047b73e468535" -dependencies = [ - "memoffset 0.8.0", - "rustc_version", -] - -[[package]] -name = "filetime" -version = "0.2.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cbc844cecaee9d4443931972e1289c8ff485cb4cc2767cb03ca139ed6885153" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "redox_syscall 0.2.16", - "windows-sys 0.48.0", -] - -[[package]] -name = "flate2" -version = "1.0.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" -dependencies = [ - "crc32fast", - "miniz_oxide 0.7.1", -] - -[[package]] -name = "flexi_logger" -version = "0.25.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "611de758a8869ffffa7524aafdb48658c64dae95cdce49654d68a8442e500d89" -dependencies = [ - "chrono", - "crossbeam-channel", - "crossbeam-queue", - "glob", - "is-terminal", - "lazy_static", - "log", - "nu-ansi-term", - "regex", - "thiserror", -] - -[[package]] -name = "flume" -version = "0.10.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1657b4441c3403d9f7b3409e47575237dac27b1b5726df654a6ecbf92f0f7577" -dependencies = [ - "futures-core", - "futures-sink", - "nanorand", - "pin-project", - "spin 0.9.8", -] - -[[package]] -name = "flutter_rust_bridge" -version = "1.75.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "907f6624c3c6a5a1421b1c1eb9c2881104607730d5f67ce7ae50051efa7a2cf3" -dependencies = [ - "allo-isolate", - "anyhow", - "build-target", - "bytemuck", - "cc", - "chrono", - "console_error_panic_hook", - "dart-sys", - "flutter_rust_bridge_macros", - "js-sys", - "lazy_static", - "libc", - "log", - "parking_lot", - "threadpool", - "uuid", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "flutter_rust_bridge_codegen" -version = "1.75.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49fdb2728cabeb86d1271ed4398ee1518b4a3d9f659756cf5021e5c5a91e3f25" -dependencies = [ - "anyhow", - "atty", - "cargo_metadata", - "cbindgen", - "chrono", - "clap 4.2.7", - "convert_case 0.5.0", - "delegate", - "enum-iterator", - "enum_dispatch", - "fern", - "itertools 0.10.5", - "lazy_static", - "log", - "pathdiff", - "quote 1.0.27", - "regex", - "serde 1.0.163", - "serde_yaml", - "strum_macros 0.24.3", - "syn 1.0.109", - "tempfile", - "thiserror", - "toml 0.5.11", - "topological-sort", -] - -[[package]] -name = "flutter_rust_bridge_macros" -version = "1.75.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de66560e226cb4a5da7ab042a0872c0be4e165288f5bcde809a08f3f5ca22962" - -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "fon" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad46a0e6c9bc688823a742aa969b5c08fdc56c2a436ee00d5c6fbcb5982c55c4" -dependencies = [ - "libm", -] - -[[package]] -name = "foreign-types" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "foreign-types-shared", -] - -[[package]] -name = "foreign-types-shared" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - -[[package]] -name = "form_urlencoded" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" -dependencies = [ - "percent-encoding", -] - -[[package]] -name = "fruitbasket" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "898289b8e0528c84fb9b88f15ac9d5109bcaf23e0e49bb6f64deee0d86b6a351" -dependencies = [ - "dirs 2.0.2", - "objc", - "objc-foundation", - "objc_id", - "time 0.1.45", -] - -[[package]] -name = "fuchsia-cprng" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" - -[[package]] -name = "funty" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" - -[[package]] -name = "futures" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" -dependencies = [ - "futures-channel", - "futures-core", - "futures-executor", - "futures-io", - "futures-sink", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-channel" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" -dependencies = [ - "futures-core", - "futures-sink", -] - -[[package]] -name = "futures-core" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" - -[[package]] -name = "futures-executor" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" -dependencies = [ - "futures-core", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-io" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" - -[[package]] -name = "futures-lite" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" -dependencies = [ - "fastrand", - "futures-core", - "futures-io", - "memchr", - "parking", - "pin-project-lite", - "waker-fn", -] - -[[package]] -name = "futures-macro" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" -dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.27", - "syn 2.0.15", -] - -[[package]] -name = "futures-sink" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" - -[[package]] -name = "futures-task" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" - -[[package]] -name = "futures-util" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" -dependencies = [ - "futures-channel", - "futures-core", - "futures-io", - "futures-macro", - "futures-sink", - "futures-task", - "memchr", - "pin-project-lite", - "pin-utils", - "slab", -] - -[[package]] -name = "gdk" -version = "0.16.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa9cb33da481c6c040404a11f8212d193889e9b435db2c14fd86987f630d3ce1" -dependencies = [ - "bitflags", - "cairo-rs", - "gdk-pixbuf", - "gdk-sys", - "gio", - "glib 0.16.7", - "libc", - "pango", -] - -[[package]] -name = "gdk-pixbuf" -version = "0.16.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3578c60dee9d029ad86593ed88cb40f35c1b83360e12498d055022385dd9a05" -dependencies = [ - "bitflags", - "gdk-pixbuf-sys", - "gio", - "glib 0.16.7", - "libc", -] - -[[package]] -name = "gdk-pixbuf-sys" -version = "0.16.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3092cf797a5f1210479ea38070d9ae8a5b8e9f8f1be9f32f4643c529c7d70016" -dependencies = [ - "gio-sys", - "glib-sys 0.16.3", - "gobject-sys 0.16.3", - "libc", - "system-deps 6.1.0", -] - -[[package]] -name = "gdk-sys" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d76354f97a913e55b984759a997b693aa7dc71068c9e98bcce51aa167a0a5c5a" -dependencies = [ - "cairo-sys-rs", - "gdk-pixbuf-sys", - "gio-sys", - "glib-sys 0.16.3", - "gobject-sys 0.16.3", - "libc", - "pango-sys", - "pkg-config", - "system-deps 6.1.0", -] - -[[package]] -name = "gdkwayland-sys" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4511710212ed3020b61a8622a37aa6f0dd2a84516575da92e9b96928dcbe83ba" -dependencies = [ - "gdk-sys", - "glib-sys 0.16.3", - "gobject-sys 0.16.3", - "libc", - "pkg-config", - "system-deps 6.1.0", -] - -[[package]] -name = "gdkx11-sys" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fa2bf8b5b8c414bc5d05e48b271896d0fd3ddb57464a3108438082da61de6af" -dependencies = [ - "gdk-sys", - "glib-sys 0.16.3", - "libc", - "system-deps 6.1.0", - "x11 2.21.0", -] - -[[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 = "gethostname" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1ebd34e35c46e00bb73e81363248d627782724609fe1b6396f553f68fe3862e" -dependencies = [ - "libc", - "winapi 0.3.9", -] - -[[package]] -name = "getrandom" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4" -dependencies = [ - "cfg-if 1.0.0", - "js-sys", - "libc", - "wasi 0.11.0+wasi-snapshot-preview1", - "wasm-bindgen", -] - -[[package]] -name = "gif" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80792593675e051cf94a4b111980da2ba60d4a83e43e0048c5693baab3977045" -dependencies = [ - "color_quant", - "weezl", -] - -[[package]] -name = "gimli" -version = "0.27.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4" - -[[package]] -name = "gio" -version = "0.16.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a1c84b4534a290a29160ef5c6eff2a9c95833111472e824fc5cb78b513dd092" -dependencies = [ - "bitflags", - "futures-channel", - "futures-core", - "futures-io", - "futures-util", - "gio-sys", - "glib 0.16.7", - "libc", - "once_cell", - "pin-project-lite", - "smallvec", - "thiserror", -] - -[[package]] -name = "gio-sys" -version = "0.16.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9b693b8e39d042a95547fc258a7b07349b1f0b48f4b2fa3108ba3c51c0b5229" -dependencies = [ - "glib-sys 0.16.3", - "gobject-sys 0.16.3", - "libc", - "system-deps 6.1.0", - "winapi 0.3.9", -] - -[[package]] -name = "git2" -version = "0.16.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccf7f68c2995f392c49fffb4f95ae2c873297830eb25c6bc4c114ce8f4562acc" -dependencies = [ - "bitflags", - "libc", - "libgit2-sys", - "log", - "url", -] - -[[package]] -name = "glib" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c685013b7515e668f1b57a165b009d4d28cb139a8a989bbd699c10dad29d0c5" -dependencies = [ - "bitflags", - "futures-channel", - "futures-core", - "futures-executor", - "futures-task", - "futures-util", - "glib-macros 0.10.1", - "glib-sys 0.10.1", - "gobject-sys 0.10.0", - "libc", - "once_cell", -] - -[[package]] -name = "glib" -version = "0.16.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddd4df61a866ed7259d6189b8bcb1464989a77f1d85d25d002279bbe9dd38b2f" -dependencies = [ - "bitflags", - "futures-channel", - "futures-core", - "futures-executor", - "futures-task", - "futures-util", - "gio-sys", - "glib-macros 0.16.8", - "glib-sys 0.16.3", - "gobject-sys 0.16.3", - "libc", - "once_cell", - "smallvec", - "thiserror", -] - -[[package]] -name = "glib-macros" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41486a26d1366a8032b160b59065a59fb528530a46a49f627e7048fb8c064039" -dependencies = [ - "anyhow", - "heck 0.3.3", - "itertools 0.9.0", - "proc-macro-crate 0.1.5", - "proc-macro-error", - "proc-macro2 1.0.63", - "quote 1.0.27", - "syn 1.0.109", -] - -[[package]] -name = "glib-macros" -version = "0.16.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb1a9325847aa46f1e96ffea37611b9d51fc4827e67f79e7de502a297560a67b" -dependencies = [ - "anyhow", - "heck 0.4.1", - "proc-macro-crate 1.3.1", - "proc-macro-error", - "proc-macro2 1.0.63", - "quote 1.0.27", - "syn 1.0.109", -] - -[[package]] -name = "glib-sys" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7e9b997a66e9a23d073f2b1abb4dbfc3925e0b8952f67efd8d9b6e168e4cdc1" -dependencies = [ - "libc", - "system-deps 1.3.2", -] - -[[package]] -name = "glib-sys" -version = "0.16.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61a4f46316d06bfa33a7ac22df6f0524c8be58e3db2d9ca99ccb1f357b62a65" -dependencies = [ - "libc", - "system-deps 6.1.0", -] - -[[package]] -name = "glob" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" - -[[package]] -name = "gobject-sys" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "952133b60c318a62bf82ee75b93acc7e84028a093e06b9e27981c2b6fe68218c" -dependencies = [ - "glib-sys 0.10.1", - "libc", - "system-deps 1.3.2", -] - -[[package]] -name = "gobject-sys" -version = "0.16.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3520bb9c07ae2a12c7f2fbb24d4efc11231c8146a86956413fb1a79bb760a0f1" -dependencies = [ - "glib-sys 0.16.3", - "libc", - "system-deps 6.1.0", -] - -[[package]] -name = "gstreamer" -version = "0.16.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ff5d0f7ff308ae37e6eb47b6ded17785bdea06e438a708cd09e0288c1862f33" -dependencies = [ - "bitflags", - "cfg-if 1.0.0", - "futures-channel", - "futures-core", - "futures-util", - "glib 0.10.3", - "glib-sys 0.10.1", - "gobject-sys 0.10.0", - "gstreamer-sys", - "libc", - "muldiv", - "num-rational 0.3.2", - "once_cell", - "paste", - "pretty-hex", - "thiserror", -] - -[[package]] -name = "gstreamer-app" -version = "0.16.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc80888271338c3ede875d8cafc452eb207476ff5539dcbe0018a8f5b827af0e" -dependencies = [ - "bitflags", - "futures-core", - "futures-sink", - "glib 0.10.3", - "glib-sys 0.10.1", - "gobject-sys 0.10.0", - "gstreamer", - "gstreamer-app-sys", - "gstreamer-base", - "gstreamer-sys", - "libc", - "once_cell", -] - -[[package]] -name = "gstreamer-app-sys" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "813f64275c9e7b33b828b9efcf9dfa64b95996766d4de996e84363ac65b87e3d" -dependencies = [ - "glib-sys 0.10.1", - "gstreamer-base-sys", - "gstreamer-sys", - "libc", - "system-deps 1.3.2", -] - -[[package]] -name = "gstreamer-base" -version = "0.16.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bafd01c56f59cb10f4b5a10f97bb4bdf8c2b2784ae5b04da7e2d400cf6e6afcf" -dependencies = [ - "bitflags", - "glib 0.10.3", - "glib-sys 0.10.1", - "gobject-sys 0.10.0", - "gstreamer", - "gstreamer-base-sys", - "gstreamer-sys", - "libc", -] - -[[package]] -name = "gstreamer-base-sys" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4b7b6dc2d6e160a1ae28612f602bd500b3fa474ce90bf6bb2f08072682beef5" -dependencies = [ - "glib-sys 0.10.1", - "gobject-sys 0.10.0", - "gstreamer-sys", - "libc", - "system-deps 1.3.2", -] - -[[package]] -name = "gstreamer-sys" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc1f154082d01af5718c5f8a8eb4f565a4ea5586ad8833a8fc2c2aa6844b601d" -dependencies = [ - "glib-sys 0.10.1", - "gobject-sys 0.10.0", - "libc", - "system-deps 1.3.2", -] - -[[package]] -name = "gstreamer-video" -version = "0.16.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7bbb1485d87469849ec45c08e03c2f280d3ea20ff3c439d03185be54e3ce98e" -dependencies = [ - "bitflags", - "futures-channel", - "futures-util", - "glib 0.10.3", - "glib-sys 0.10.1", - "gobject-sys 0.10.0", - "gstreamer", - "gstreamer-base", - "gstreamer-base-sys", - "gstreamer-sys", - "gstreamer-video-sys", - "libc", - "once_cell", -] - -[[package]] -name = "gstreamer-video-sys" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92347e46438007d6a2386302125f62cb9df6769cdacb931af5c0f12c1ee21de4" -dependencies = [ - "glib-sys 0.10.1", - "gobject-sys 0.10.0", - "gstreamer-base-sys", - "gstreamer-sys", - "libc", - "system-deps 1.3.2", -] - -[[package]] -name = "gtk" -version = "0.16.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4d3507d43908c866c805f74c9dd593c0ce7ba5c38e576e41846639cdcd4bee6" -dependencies = [ - "atk", - "bitflags", - "cairo-rs", - "field-offset", - "futures-channel", - "gdk", - "gdk-pixbuf", - "gio", - "glib 0.16.7", - "gtk-sys", - "gtk3-macros", - "libc", - "once_cell", - "pango", - "pkg-config", -] - -[[package]] -name = "gtk-sys" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b5f8946685d5fe44497007786600c2f368ff6b1e61a16251c89f72a97520a3" -dependencies = [ - "atk-sys", - "cairo-sys-rs", - "gdk-pixbuf-sys", - "gdk-sys", - "gio-sys", - "glib-sys 0.16.3", - "gobject-sys 0.16.3", - "libc", - "pango-sys", - "system-deps 6.1.0", -] - -[[package]] -name = "gtk3-macros" -version = "0.16.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "096eb63c6fedf03bafe65e5924595785eaf1bcb7200dac0f2cbe9c9738f05ad8" -dependencies = [ - "anyhow", - "proc-macro-crate 1.3.1", - "proc-macro-error", - "proc-macro2 1.0.63", - "quote 1.0.27", - "syn 1.0.109", -] - -[[package]] -name = "h2" -version = "0.3.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17f8a914c2987b688368b5138aa05321db91f4090cf26118185672ad588bce21" -dependencies = [ - "bytes", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http", - "indexmap", - "slab", - "tokio", - "tokio-util", - "tracing", -] - -[[package]] -name = "half" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02b4af3693f1b705df946e9fe5631932443781d0aabb423b62fcd4d73f6d2fd0" -dependencies = [ - "crunchy", -] - -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" -dependencies = [ - "ahash", -] - -[[package]] -name = "hbb_common" -version = "0.1.0" -dependencies = [ - "anyhow", - "backtrace", - "bytes", - "chrono", - "confy", - "directories-next", - "dirs-next", - "dlopen", - "env_logger 0.10.0", - "filetime", - "flexi_logger", - "futures", - "futures-util", - "lazy_static", - "libc", - "log", - "mac_address", - "machine-uid", - "osascript", - "protobuf", - "protobuf-codegen", - "quinn", - "rand 0.8.5", - "regex", - "serde 1.0.163", - "serde_derive", - "serde_json 1.0.96", - "socket2 0.3.19", - "sodiumoxide", - "sysinfo", - "tokio", - "tokio-socks", - "tokio-util", - "toml 0.7.3", - "uuid", - "winapi 0.3.9", - "zstd 0.12.3+zstd.1.5.2", -] - -[[package]] -name = "heck" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" -dependencies = [ - "unicode-segmentation", -] - -[[package]] -name = "heck" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" - -[[package]] -name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - -[[package]] -name = "hermit-abi" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" -dependencies = [ - "libc", -] - -[[package]] -name = "hermit-abi" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" - -[[package]] -name = "hex" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" - -[[package]] -name = "hmac" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" -dependencies = [ - "digest", -] - -[[package]] -name = "hound" -version = "3.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d13cdbd5dbb29f9c88095bbdc2590c9cba0d0a1269b983fef6b2cdd7e9f4db1" - -[[package]] -name = "http" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" -dependencies = [ - "bytes", - "fnv", - "itoa 1.0.6", -] - -[[package]] -name = "http-body" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" -dependencies = [ - "bytes", - "http", - "pin-project-lite", -] - -[[package]] -name = "httparse" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" - -[[package]] -name = "httpdate" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" - -[[package]] -name = "humantime" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" - -[[package]] -name = "hwcodec" -version = "0.1.1" -source = "git+https://github.com/21pages/hwcodec?branch=stable#82cdc15457e42feaf14e1b38622506b2d54baf76" -dependencies = [ - "bindgen 0.59.2", - "cc", - "log", - "serde 1.0.163", - "serde_derive", - "serde_json 1.0.96", -] - -[[package]] -name = "hyper" -version = "0.14.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab302d72a6f11a3b910431ff93aae7e773078c769f0a3ef15fb9ec692ed147d4" -dependencies = [ - "bytes", - "futures-channel", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "httparse", - "httpdate", - "itoa 1.0.6", - "pin-project-lite", - "socket2 0.4.9", - "tokio", - "tower-service", - "tracing", - "want", -] - -[[package]] -name = "hyper-rustls" -version = "0.24.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0646026eb1b3eea4cd9ba47912ea5ce9cc07713d105b1a14698f4e6433d348b7" -dependencies = [ - "http", - "hyper", - "rustls 0.21.2", - "tokio", - "tokio-rustls", -] - -[[package]] -name = "iana-time-zone" -version = "0.1.56" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0722cd7114b7de04316e7ea5456a0bbb20e4adb46fd27a3697adb812cff0f37c" -dependencies = [ - "android_system_properties", - "core-foundation-sys 0.8.4", - "iana-time-zone-haiku", - "js-sys", - "wasm-bindgen", - "windows 0.48.0", -] - -[[package]] -name = "iana-time-zone-haiku" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca" -dependencies = [ - "cxx", - "cxx-build", -] - -[[package]] -name = "idna" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "image" -version = "0.24.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "527909aa81e20ac3a44803521443a765550f09b5130c2c2fa1ea59c2f8f50a3a" -dependencies = [ - "bytemuck", - "byteorder", - "color_quant", - "exr", - "gif", - "jpeg-decoder", - "num-rational 0.4.1", - "num-traits 0.2.15", - "png", - "qoi", - "tiff", -] - -[[package]] -name = "impersonate_system" -version = "0.1.0" -source = "git+https://github.com/21pages/impersonate-system#84b401893d5b6628c8b33b295328d13fbbe2674b" -dependencies = [ - "cc", -] - -[[package]] -name = "include_dir" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18762faeff7122e89e0857b02f7ce6fcc0d101d5e9ad2ad7846cc01d61b7f19e" -dependencies = [ - "include_dir_macros", -] - -[[package]] -name = "include_dir_macros" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b139284b5cf57ecfa712bcc66950bb635b31aff41c188e8a4cfc758eca374a3f" -dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.27", -] - -[[package]] -name = "indexmap" -version = "1.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" -dependencies = [ - "autocfg 1.1.0", - "hashbrown", -] - -[[package]] -name = "inotify" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abf888f9575c290197b2c948dc9e9ff10bd1a39ad1ea8585f734585fa6b9d3f9" -dependencies = [ - "bitflags", - "inotify-sys", - "libc", -] - -[[package]] -name = "inotify-sys" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb" -dependencies = [ - "libc", -] - -[[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if 1.0.0", -] - -[[package]] -name = "io-lifetimes" -version = "1.0.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220" -dependencies = [ - "hermit-abi 0.3.1", - "libc", - "windows-sys 0.48.0", -] - -[[package]] -name = "ipnet" -version = "2.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12b6ee2129af8d4fb011108c73d99a1b83a85977f23b82460c0ae2e25bb4b57f" - -[[package]] -name = "is-terminal" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" -dependencies = [ - "hermit-abi 0.3.1", - "io-lifetimes", - "rustix", - "windows-sys 0.48.0", -] - -[[package]] -name = "is_debug" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06d198e9919d9822d5f7083ba8530e04de87841eaf21ead9af8f2304efd57c89" - -[[package]] -name = "itertools" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b" -dependencies = [ - "either", -] - -[[package]] -name = "itertools" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" -dependencies = [ - "either", -] - -[[package]] -name = "itoa" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8324a32baf01e2ae060e9de58ed0bc2320c9a2833491ee36cd3b4c414de4db8c" - -[[package]] -name = "itoa" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" - -[[package]] -name = "jni" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6df18c2e3db7e453d3c6ac5b3e9d5182664d28788126d39b91f2d1e22b017ec" -dependencies = [ - "cesu8", - "combine", - "jni-sys", - "log", - "thiserror", - "walkdir", -] - -[[package]] -name = "jni" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "039022cdf4d7b1cf548d31f60ae783138e5fd42013f6271049d7df7afadef96c" -dependencies = [ - "cesu8", - "combine", - "jni-sys", - "log", - "thiserror", - "walkdir", -] - -[[package]] -name = "jni" -version = "0.21.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97" -dependencies = [ - "cesu8", - "cfg-if 1.0.0", - "combine", - "jni-sys", - "log", - "thiserror", - "walkdir", - "windows-sys 0.45.0", -] - -[[package]] -name = "jni-sys" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" - -[[package]] -name = "jobserver" -version = "0.1.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" -dependencies = [ - "libc", -] - -[[package]] -name = "jpeg-decoder" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e" -dependencies = [ - "rayon", -] - -[[package]] -name = "js-sys" -version = "0.3.62" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68c16e1bfd491478ab155fd8b4896b86f9ede344949b641e61501e07c2b8b4d5" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "keepawake" -version = "0.4.3" -source = "git+https://github.com/rustdesk-org/keepawake-rs#ac395ef826b32a077bc5d2fe108cf71fde8fe2e6" -dependencies = [ - "anyhow", - "apple-sys", - "cfg-if 1.0.0", - "core-foundation", - "shadow-rs", - "windows 0.48.0", - "winres", - "zbus", -] - -[[package]] -name = "kernel32-sys" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" -dependencies = [ - "winapi 0.2.8", - "winapi-build", -] - -[[package]] -name = "keyboard-types" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7668b7cff6a51fe61cdde64cd27c8a220786f399501b57ebe36f7d8112fd68" -dependencies = [ - "bitflags", - "serde 1.0.163", - "unicode-segmentation", -] - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "lazycell" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" - -[[package]] -name = "lebe" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" - -[[package]] -name = "libappindicator" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89e1edfdc9b0853358306c6dfb4b77c79c779174256fe93d80c0b5ebca451a2f" -dependencies = [ - "glib 0.16.7", - "gtk", - "gtk-sys", - "libappindicator-sys", - "log", -] - -[[package]] -name = "libappindicator-sys" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08fcb2bea89cee9613982501ec83eaa2d09256b24540ae463c52a28906163918" -dependencies = [ - "gtk-sys", - "libloading 0.7.4", - "once_cell", -] - -[[package]] -name = "libc" -version = "0.2.144" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b00cc1c228a6782d0f076e7b232802e0c5689d41bb5df366f2a6b6621cfdfe1" - -[[package]] -name = "libdbus-sys" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06085512b750d640299b79be4bad3d2fa90a9c00b1fd9e1b46364f66f0485c72" -dependencies = [ - "pkg-config", -] - -[[package]] -name = "libgit2-sys" -version = "0.14.2+1.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f3d95f6b51075fe9810a7ae22c7095f12b98005ab364d8544797a825ce946a4" -dependencies = [ - "cc", - "libc", - "libz-sys", - "pkg-config", -] - -[[package]] -name = "libloading" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" -dependencies = [ - "cfg-if 1.0.0", - "winapi 0.3.9", -] - -[[package]] -name = "libloading" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d580318f95776505201b28cf98eb1fa5e4be3b689633ba6a3e6cd880ff22d8cb" -dependencies = [ - "cfg-if 1.0.0", - "windows-sys 0.48.0", -] - -[[package]] -name = "libm" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "348108ab3fba42ec82ff6e9564fc4ca0247bdccdc68dd8af9764bbc79c3c8ffb" - -[[package]] -name = "libpulse-binding" -version = "2.27.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1745b20bfc194ac12ef828f144f0ec2d4a7fe993281fa3567a0bd4969aee6890" -dependencies = [ - "bitflags", - "libc", - "libpulse-sys", - "num-derive", - "num-traits 0.2.15", - "winapi 0.3.9", -] - -[[package]] -name = "libpulse-simple-binding" -version = "2.27.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ced94199e6e44133431374e4043f34e1f0697ebfb7b7d6c244a65bfaedf0e31" -dependencies = [ - "libpulse-binding", - "libpulse-simple-sys", - "libpulse-sys", -] - -[[package]] -name = "libpulse-simple-sys" -version = "1.20.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84e423d9c619c908ce9b4916080e65ab586ca55b8c4939379f15e6e72fb43842" -dependencies = [ - "libpulse-sys", - "pkg-config", -] - -[[package]] -name = "libpulse-sys" -version = "1.20.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2191e6880818d1df4cf72eac8e91dce7a5a52ba0da4b2a5cdafabc22b937eadb" -dependencies = [ - "libc", - "num-derive", - "num-traits 0.2.15", - "pkg-config", - "winapi 0.3.9", -] - -[[package]] -name = "libsamplerate-sys" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28853b399f78f8281cd88d333b54a63170c4275f6faea66726a2bea5cca72e0d" -dependencies = [ - "cmake", -] - -[[package]] -name = "libsodium-sys" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b779387cd56adfbc02ea4a668e704f729be8d6a6abd2c27ca5ee537849a92fd" -dependencies = [ - "cc", - "libc", - "pkg-config", - "walkdir", -] - -[[package]] -name = "libxdo" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00333b8756a3d28e78def82067a377de7fa61b24909000aeaa2b446a948d14db" -dependencies = [ - "libxdo-sys", -] - -[[package]] -name = "libxdo-sys" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db23b9e7e2b7831bbd8aac0bbeeeb7b68cbebc162b227e7052e8e55829a09212" -dependencies = [ - "libc", - "x11 2.21.0", -] - -[[package]] -name = "libz-sys" -version = "1.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56ee889ecc9568871456d42f603d6a0ce59ff328d291063a45cbdf0036baf6db" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "line-wrap" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30344350a2a51da54c1d53be93fade8a237e545dbcc4bdbe635413f2117cab9" -dependencies = [ - "safemem", -] - -[[package]] -name = "link-cplusplus" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5" -dependencies = [ - "cc", -] - -[[package]] -name = "linked-hash-map" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" - -[[package]] -name = "linux-raw-sys" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ece97ea872ece730aed82664c424eb4c8291e1ff2480247ccf7409044bc6479f" - -[[package]] -name = "lock_api" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" -dependencies = [ - "autocfg 1.1.0", - "scopeguard", -] - -[[package]] -name = "log" -version = "0.4.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if 1.0.0", -] - -[[package]] -name = "mac_address" -version = "1.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b238e3235c8382b7653c6408ed1b08dd379bdb9fdf990fb0bbae3db2cc0ae963" -dependencies = [ - "nix 0.23.2", - "winapi 0.3.9", -] - -[[package]] -name = "mach2" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d0d1830bcd151a6fc4aea1369af235b36c1528fe976b8ff678683c9995eade8" -dependencies = [ - "libc", -] - -[[package]] -name = "machine-uid" -version = "0.3.0" -source = "git+https://github.com/21pages/machine-uid#381ff579c1dc3a6c54db9dfec47c44bcb0246542" -dependencies = [ - "bindgen 0.59.2", - "cc", - "winreg 0.11.0", -] - -[[package]] -name = "magnum-opus" -version = "0.4.0" -source = "git+https://github.com/rustdesk/magnum-opus#5cd2bf989c148662fa3a2d9d539a71d71fd1d256" -dependencies = [ - "bindgen 0.59.2", - "pkg-config", - "target_build_utils", -] - -[[package]] -name = "malloc_buf" -version = "0.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" -dependencies = [ - "libc", -] - -[[package]] -name = "md5" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771" - -[[package]] -name = "memalloc" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df39d232f5c40b0891c10216992c2f250c054105cb1e56f0fc9032db6203ecc1" - -[[package]] -name = "memchr" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" - -[[package]] -name = "memoffset" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" -dependencies = [ - "autocfg 1.1.0", -] - -[[package]] -name = "memoffset" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" -dependencies = [ - "autocfg 1.1.0", -] - -[[package]] -name = "memoffset" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" -dependencies = [ - "autocfg 1.1.0", -] - -[[package]] -name = "mime" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" - -[[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.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" -dependencies = [ - "adler", -] - -[[package]] -name = "miniz_oxide" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" -dependencies = [ - "adler", - "simd-adler32", -] - -[[package]] -name = "mio" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9" -dependencies = [ - "libc", - "log", - "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.45.0", -] - -[[package]] -name = "miow" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52ffbca2f655e33c08be35d87278e5b18b89550a37dbd598c20db92f6a471123" -dependencies = [ - "windows-sys 0.42.0", -] - -[[package]] -name = "mouce" -version = "0.2.1" -source = "git+https://github.com/fufesou/mouce.git#ed83800d532b95d70e39915314f6052aa433e9b9" -dependencies = [ - "glob", -] - -[[package]] -name = "muda" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3c820db003e601413e835a33b10cf51452b6415ef34ff1d862401826431c675" -dependencies = [ - "cocoa", - "crossbeam-channel", - "gdk", - "gdk-pixbuf", - "gtk", - "keyboard-types", - "libxdo", - "objc", - "once_cell", - "png", - "thiserror", - "windows-sys 0.48.0", -] - -[[package]] -name = "muldiv" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0419348c027fa7be448d2ae7ea0e4e04c2334c31dc4e74ab29f00a2a7ca69204" - -[[package]] -name = "nanorand" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3" -dependencies = [ - "getrandom", -] - -[[package]] -name = "ndk" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "451422b7e4718271c8b5b3aadf5adedba43dc76312454b387e98fae0fc951aa0" -dependencies = [ - "bitflags", - "jni-sys", - "ndk-sys", - "num_enum", - "raw-window-handle", - "thiserror", -] - -[[package]] -name = "ndk-context" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" - -[[package]] -name = "ndk-sys" -version = "0.4.1+23.1.7779620" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cf2aae958bd232cac5069850591667ad422d263686d75b52a065f9badeee5a3" -dependencies = [ - "jni-sys", -] - -[[package]] -name = "netlink-packet-core" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e5cf0b54effda4b91615c40ff0fd12d0d4c9a6e0f5116874f03941792ff535a" -dependencies = [ - "anyhow", - "byteorder", - "libc", - "netlink-packet-utils", -] - -[[package]] -name = "netlink-packet-route" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea993e32c77d87f01236c38f572ecb6c311d592e56a06262a007fd2a6e31253c" -dependencies = [ - "anyhow", - "bitflags", - "byteorder", - "libc", - "netlink-packet-core", - "netlink-packet-utils", -] - -[[package]] -name = "netlink-packet-utils" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ede8a08c71ad5a95cdd0e4e52facd37190977039a4704eb82a283f713747d34" -dependencies = [ - "anyhow", - "byteorder", - "paste", - "thiserror", -] - -[[package]] -name = "netlink-sys" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6471bf08e7ac0135876a9581bf3217ef0333c191c128d34878079f42ee150411" -dependencies = [ - "bytes", - "libc", - "log", -] - -[[package]] -name = "nix" -version = "0.23.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f3790c00a0150112de0f4cd161e3d7fc4b2d8a5542ffc35f099a2562aecb35c" -dependencies = [ - "bitflags", - "cc", - "cfg-if 1.0.0", - "libc", - "memoffset 0.6.5", -] - -[[package]] -name = "nix" -version = "0.24.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" -dependencies = [ - "bitflags", - "cfg-if 1.0.0", - "libc", - "memoffset 0.6.5", -] - -[[package]] -name = "nix" -version = "0.26.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" -dependencies = [ - "bitflags", - "cfg-if 1.0.0", - "libc", - "memoffset 0.7.1", - "static_assertions", -] - -[[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 = "nom8" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae01545c9c7fc4486ab7debaf2aad7003ac19431791868fb2e8066df97fad2f8" -dependencies = [ - "memchr", -] - -[[package]] -name = "ntapi" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4" -dependencies = [ - "winapi 0.3.9", -] - -[[package]] -name = "nu-ansi-term" -version = "0.46.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" -dependencies = [ - "overload", - "winapi 0.3.9", -] - -[[package]] -name = "num-bigint" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" -dependencies = [ - "autocfg 1.1.0", - "num-integer", - "num-traits 0.2.15", -] - -[[package]] -name = "num-complex" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02e0d21255c828d6f128a1e41534206671e8c3ea0c62f32291e808dc82cff17d" -dependencies = [ - "num-traits 0.2.15", -] - -[[package]] -name = "num-derive" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" -dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.27", - "syn 1.0.109", -] - -[[package]] -name = "num-integer" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" -dependencies = [ - "autocfg 1.1.0", - "num-traits 0.2.15", -] - -[[package]] -name = "num-rational" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12ac428b1cb17fce6f731001d307d351ec70a6d202fc2e60f7d4c5e42d8f4f07" -dependencies = [ - "autocfg 1.1.0", - "num-integer", - "num-traits 0.2.15", -] - -[[package]] -name = "num-rational" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" -dependencies = [ - "autocfg 1.1.0", - "num-integer", - "num-traits 0.2.15", -] - -[[package]] -name = "num-traits" -version = "0.1.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31" -dependencies = [ - "num-traits 0.2.15", -] - -[[package]] -name = "num-traits" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" -dependencies = [ - "autocfg 1.1.0", -] - -[[package]] -name = "num_cpus" -version = "1.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" -dependencies = [ - "hermit-abi 0.2.6", - "libc", -] - -[[package]] -name = "num_enum" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9" -dependencies = [ - "num_enum_derive", -] - -[[package]] -name = "num_enum_derive" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" -dependencies = [ - "proc-macro-crate 1.3.1", - "proc-macro2 1.0.63", - "quote 1.0.27", - "syn 1.0.109", -] - -[[package]] -name = "num_threads" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" -dependencies = [ - "libc", -] - -[[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-foundation" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9" -dependencies = [ - "block", - "objc", - "objc_id", -] - -[[package]] -name = "objc_exception" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4" -dependencies = [ - "cc", -] - -[[package]] -name = "objc_id" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b" -dependencies = [ - "objc", -] - -[[package]] -name = "object" -version = "0.30.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea86265d3d3dcb6a27fc51bd29a4bf387fae9d2986b823079d4986af253eb439" -dependencies = [ - "memchr", -] - -[[package]] -name = "oboe" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8868cc237ee02e2d9618539a23a8d228b9bb3fc2e7a5b11eed3831de77c395d0" -dependencies = [ - "jni 0.20.0", - "ndk", - "ndk-context", - "num-derive", - "num-traits 0.2.15", - "oboe-sys", -] - -[[package]] -name = "oboe-sys" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f44155e7fb718d3cfddcf70690b2b51ac4412f347cd9e4fbe511abe9cd7b5f2" -dependencies = [ - "cc", -] - -[[package]] -name = "once_cell" -version = "1.17.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" - -[[package]] -name = "opaque-debug" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" - -[[package]] -name = "openssl-probe" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" - -[[package]] -name = "option-ext" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" - -[[package]] -name = "ordered-multimap" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccd746e37177e1711c20dd619a1620f34f5c8b569c53590a72dedd5344d8924a" -dependencies = [ - "dlv-list", - "hashbrown", -] - -[[package]] -name = "ordered-stream" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aa2b01e1d916879f73a53d01d1d6cee68adbb31d6d9177a8cfce093cced1d50" -dependencies = [ - "futures-core", - "pin-project-lite", -] - -[[package]] -name = "os-version" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a8a1fed76ac765e39058ca106b6229a93c5a60292a1bd4b602ce2be11e1c020" -dependencies = [ - "anyhow", - "plist", - "uname", - "winapi 0.3.9", -] - -[[package]] -name = "os_str_bytes" -version = "6.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ceedf44fb00f2d1984b0bc98102627ce622e083e49a5bacdb3e514fa4238e267" - -[[package]] -name = "osascript" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38731fa859ef679f1aec66ca9562165926b442f298467f76f5990f431efe87dc" -dependencies = [ - "serde 1.0.163", - "serde_derive", - "serde_json 1.0.96", -] - -[[package]] -name = "overload" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" - -[[package]] -name = "pam" -version = "0.7.0" -source = "git+https://github.com/fufesou/pam#10da2cbbabe32cbc9de22a66abe44738e7ec0ea0" -dependencies = [ - "libc", - "pam-macros", - "pam-sys", - "users 0.10.0", -] - -[[package]] -name = "pam-macros" -version = "0.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c94f3b9b97df3c6d4e51a14916639b24e02c7d15d1dba686ce9b1118277cb811" -dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.27", - "syn 1.0.109", -] - -[[package]] -name = "pam-sys" -version = "1.0.0-alpha4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e9dfd42858f6a6bb1081079fd9dc259ca3e2aaece6cb689fd36b1058046c969" -dependencies = [ - "bindgen 0.59.2", - "libc", -] - -[[package]] -name = "pango" -version = "0.16.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdff66b271861037b89d028656184059e03b0b6ccb36003820be19f7200b1e94" -dependencies = [ - "bitflags", - "gio", - "glib 0.16.7", - "libc", - "once_cell", - "pango-sys", -] - -[[package]] -name = "pango-sys" -version = "0.16.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e134909a9a293e04d2cc31928aa95679c5e4df954d0b85483159bd20d8f047f" -dependencies = [ - "glib-sys 0.16.3", - "gobject-sys 0.16.3", - "libc", - "system-deps 6.1.0", -] - -[[package]] -name = "parity-tokio-ipc" -version = "0.7.3-2" -source = "git+https://github.com/open-trade/parity-tokio-ipc#a5b7861249107cbacc856cd43507cb95f40aef6e" -dependencies = [ - "futures", - "libc", - "log", - "miow", - "rand 0.8.5", - "tokio", - "winapi 0.3.9", -] - -[[package]] -name = "parking" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e" - -[[package]] -name = "parking_lot" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" -dependencies = [ - "lock_api", - "parking_lot_core", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "redox_syscall 0.2.16", - "smallvec", - "windows-sys 0.45.0", -] - -[[package]] -name = "password-hash" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7676374caaee8a325c9e7a2ae557f216c5563a171d6997b0ef8a65af35147700" -dependencies = [ - "base64ct", - "rand_core 0.6.4", - "subtle", -] - -[[package]] -name = "paste" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79" - -[[package]] -name = "pathdiff" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" - -[[package]] -name = "pbkdf2" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" -dependencies = [ - "digest", - "hmac", - "password-hash", - "sha2", -] - -[[package]] -name = "peeking_take_while" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" - -[[package]] -name = "percent-encoding" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" - -[[package]] -name = "phf" -version = "0.7.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3da44b85f8e8dfaec21adae67f95d93244b2ecf6ad2a692320598dcc8e6dd18" -dependencies = [ - "phf_shared", -] - -[[package]] -name = "phf_codegen" -version = "0.7.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b03e85129e324ad4166b06b2c7491ae27fe3ec353af72e72cd1654c7225d517e" -dependencies = [ - "phf_generator", - "phf_shared", -] - -[[package]] -name = "phf_generator" -version = "0.7.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09364cc93c159b8b06b1f4dd8a4398984503483891b0c26b867cf431fb132662" -dependencies = [ - "phf_shared", - "rand 0.6.5", -] - -[[package]] -name = "phf_shared" -version = "0.7.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "234f71a15de2288bcb7e3b6515828d22af7ec8598ee6d24c3b526fa0a80b67a0" -dependencies = [ - "siphasher", -] - -[[package]] -name = "pin-project" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc" -dependencies = [ - "pin-project-internal", -] - -[[package]] -name = "pin-project-internal" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" -dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.27", - "syn 1.0.109", -] - -[[package]] -name = "pin-project-lite" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" - -[[package]] -name = "pin-utils" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - -[[package]] -name = "pkg-config" -version = "0.3.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" - -[[package]] -name = "plist" -version = "1.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bd9647b268a3d3e14ff09c23201133a62589c658db02bb7388c7246aafe0590" -dependencies = [ - "base64", - "indexmap", - "line-wrap", - "quick-xml 0.28.2", - "serde 1.0.163", - "time 0.3.21", -] - -[[package]] -name = "png" -version = "0.17.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aaeebc51f9e7d2c150d3f3bfeb667f2aa985db5ef1e3d212847bdedb488beeaa" -dependencies = [ - "bitflags", - "crc32fast", - "fdeflate", - "flate2", - "miniz_oxide 0.7.1", -] - -[[package]] -name = "polling" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" -dependencies = [ - "autocfg 1.1.0", - "bitflags", - "cfg-if 1.0.0", - "concurrent-queue", - "libc", - "log", - "pin-project-lite", - "windows-sys 0.48.0", -] - -[[package]] -name = "ppv-lite86" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" - -[[package]] -name = "pretty-hex" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc5c99d529f0d30937f6f4b8a86d988047327bb88d04d2c4afc356de74722131" - -[[package]] -name = "prettyplease" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ceca8aaf45b5c46ec7ed39fff75f57290368c1846d33d24a122ca81416ab058" -dependencies = [ - "proc-macro2 1.0.63", - "syn 2.0.15", -] - -[[package]] -name = "primal-check" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9df7f93fd637f083201473dab4fee2db4c429d32e55e3299980ab3957ab916a0" -dependencies = [ - "num-integer", -] - -[[package]] -name = "proc-macro-crate" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785" -dependencies = [ - "toml 0.5.11", -] - -[[package]] -name = "proc-macro-crate" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" -dependencies = [ - "once_cell", - "toml_edit 0.19.8", -] - -[[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 1.0.63", - "quote 1.0.27", - "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 1.0.63", - "quote 1.0.27", - "version_check", -] - -[[package]] -name = "proc-macro2" -version = "0.4.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" -dependencies = [ - "unicode-xid 0.1.0", -] - -[[package]] -name = "proc-macro2" -version = "1.0.63" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b368fba921b0dce7e60f5e04ec15e565b3303972b42bcfde1d0713b881959eb" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "protobuf" -version = "3.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b55bad9126f378a853655831eb7363b7b01b81d19f8cb1218861086ca4a1a61e" -dependencies = [ - "bytes", - "once_cell", - "protobuf-support", - "thiserror", -] - -[[package]] -name = "protobuf-codegen" -version = "3.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dd418ac3c91caa4032d37cb80ff0d44e2ebe637b2fb243b6234bf89cdac4901" -dependencies = [ - "anyhow", - "once_cell", - "protobuf", - "protobuf-parse", - "regex", - "tempfile", - "thiserror", -] - -[[package]] -name = "protobuf-parse" -version = "3.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d39b14605eaa1f6a340aec7f320b34064feb26c93aec35d6a9a2272a8ddfa49" -dependencies = [ - "anyhow", - "indexmap", - "log", - "protobuf", - "protobuf-support", - "tempfile", - "thiserror", - "which", -] - -[[package]] -name = "protobuf-support" -version = "3.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5d4d7b8601c814cfb36bcebb79f0e61e45e1e93640cf778837833bbed05c372" -dependencies = [ - "thiserror", -] - -[[package]] -name = "qoi" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f6d64c71eb498fe9eae14ce4ec935c555749aef511cca85b5568910d6e48001" -dependencies = [ - "bytemuck", -] - -[[package]] -name = "quest" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "556af5f5c953a2ee13f45753e581a38f9778e6551bc3ccc56d90b14628fe59d8" -dependencies = [ - "cfg-if 0.1.10", - "rpassword 2.1.0", - "tempfile", - "termios", - "winapi 0.3.9", -] - -[[package]] -name = "quick-xml" -version = "0.23.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11bafc859c6815fbaffbbbf4229ecb767ac913fecb27f9ad4343662e9ef099ea" -dependencies = [ - "memchr", -] - -[[package]] -name = "quick-xml" -version = "0.28.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ce5e73202a820a31f8a0ee32ada5e21029c81fd9e3ebf668a40832e4219d9d1" -dependencies = [ - "memchr", -] - -[[package]] -name = "quinn" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445cbfe2382fa023c4f2f3c7e1c95c03dcc1df2bf23cebcb2b13e1402c4394d1" -dependencies = [ - "bytes", - "pin-project-lite", - "quinn-proto", - "quinn-udp", - "rustc-hash", - "rustls 0.20.8", - "thiserror", - "tokio", - "tracing", - "webpki", -] - -[[package]] -name = "quinn-proto" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67c10f662eee9c94ddd7135043e544f3c82fa839a1e7b865911331961b53186c" -dependencies = [ - "bytes", - "rand 0.8.5", - "ring", - "rustc-hash", - "rustls 0.20.8", - "rustls-native-certs", - "slab", - "thiserror", - "tinyvec", - "tracing", - "webpki", -] - -[[package]] -name = "quinn-udp" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "641538578b21f5e5c8ea733b736895576d0fe329bb883b937db6f4d163dbaaf4" -dependencies = [ - "libc", - "quinn-proto", - "socket2 0.4.9", - "tracing", - "windows-sys 0.42.0", -] - -[[package]] -name = "quote" -version = "0.6.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1" -dependencies = [ - "proc-macro2 0.4.30", -] - -[[package]] -name = "quote" -version = "1.0.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f4f29d145265ec1c483c7c654450edde0bfe043d3938d6972630663356d9500" -dependencies = [ - "proc-macro2 1.0.63", -] - -[[package]] -name = "radium" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" - -[[package]] -name = "rand" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca" -dependencies = [ - "autocfg 0.1.8", - "libc", - "rand_chacha 0.1.1", - "rand_core 0.4.2", - "rand_hc", - "rand_isaac", - "rand_jitter", - "rand_os", - "rand_pcg", - "rand_xorshift", - "winapi 0.3.9", -] - -[[package]] -name = "rand" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" -dependencies = [ - "libc", - "rand_chacha 0.3.1", - "rand_core 0.6.4", -] - -[[package]] -name = "rand_chacha" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef" -dependencies = [ - "autocfg 0.1.8", - "rand_core 0.3.1", -] - -[[package]] -name = "rand_chacha" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" -dependencies = [ - "ppv-lite86", - "rand_core 0.6.4", -] - -[[package]] -name = "rand_core" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" -dependencies = [ - "rand_core 0.4.2", -] - -[[package]] -name = "rand_core" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" - -[[package]] -name = "rand_core" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" -dependencies = [ - "getrandom", -] - -[[package]] -name = "rand_hc" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4" -dependencies = [ - "rand_core 0.3.1", -] - -[[package]] -name = "rand_isaac" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08" -dependencies = [ - "rand_core 0.3.1", -] - -[[package]] -name = "rand_jitter" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b" -dependencies = [ - "libc", - "rand_core 0.4.2", - "winapi 0.3.9", -] - -[[package]] -name = "rand_os" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071" -dependencies = [ - "cloudabi", - "fuchsia-cprng", - "libc", - "rand_core 0.4.2", - "rdrand", - "winapi 0.3.9", -] - -[[package]] -name = "rand_pcg" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44" -dependencies = [ - "autocfg 0.1.8", - "rand_core 0.4.2", -] - -[[package]] -name = "rand_xorshift" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c" -dependencies = [ - "rand_core 0.3.1", -] - -[[package]] -name = "raw-window-handle" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" - -[[package]] -name = "rayon" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" -dependencies = [ - "either", - "rayon-core", -] - -[[package]] -name = "rayon-core" -version = "1.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" -dependencies = [ - "crossbeam-channel", - "crossbeam-deque", - "crossbeam-utils", - "num_cpus", -] - -[[package]] -name = "rdev" -version = "0.5.0-2" -source = "git+https://github.com/fufesou/rdev#2e8221d653f4995c831ad52966e79a514516b1fa" -dependencies = [ - "cocoa", - "core-foundation", - "core-foundation-sys 0.8.4", - "core-graphics", - "dispatch", - "enum-map", - "epoll", - "inotify", - "lazy_static", - "libc", - "log", - "mio", - "strum 0.24.1", - "strum_macros 0.24.3", - "widestring", - "winapi 0.3.9", - "x11 2.21.0", -] - -[[package]] -name = "rdrand" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" -dependencies = [ - "rand_core 0.3.1", -] - -[[package]] -name = "realfft" -version = "3.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93d6b8e8f0c6d2234aa58048d7290c60bf92cd36fd2888cd8331c66ad4f2e1d2" -dependencies = [ - "rustfft", -] - -[[package]] -name = "redox_syscall" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "bitflags", -] - -[[package]] -name = "redox_syscall" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" -dependencies = [ - "bitflags", -] - -[[package]] -name = "redox_users" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" -dependencies = [ - "getrandom", - "redox_syscall 0.2.16", - "thiserror", -] - -[[package]] -name = "regex" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af83e617f331cc6ae2da5443c602dfa5af81e517212d9d611a5b3ba1777b5370" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5996294f19bd3aae0453a862ad728f60e6600695733dd5df01da90c54363a3c" - -[[package]] -name = "repng" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dd57cd2cb5cc699b3eb4824d654e5a32f3bc013766da4966f71fe94805abbda" -dependencies = [ - "byteorder", - "flate2", -] - -[[package]] -name = "reqwest" -version = "0.11.18" -source = "git+https://github.com/rustdesk-org/reqwest#4cc834539d9c44f7b6bbc5d2f8805842dc5aa328" -dependencies = [ - "base64", - "bytes", - "encoding_rs", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "hyper", - "hyper-rustls", - "ipnet", - "js-sys", - "log", - "mime", - "once_cell", - "percent-encoding", - "pin-project-lite", - "rustls 0.21.2", - "rustls-pemfile", - "serde 1.0.163", - "serde_json 1.0.96", - "serde_urlencoded", - "tokio", - "tokio-rustls", - "tower-service", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "webpki-roots", - "winreg 0.50.0", -] - -[[package]] -name = "ring" -version = "0.16.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" -dependencies = [ - "cc", - "libc", - "once_cell", - "spin 0.5.2", - "untrusted", - "web-sys", - "winapi 0.3.9", -] - -[[package]] -name = "ringbuf" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79abed428d1fd2a128201cec72c5f6938e2da607c6f3745f769fabea399d950a" -dependencies = [ - "crossbeam-utils", -] - -[[package]] -name = "rpassword" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d37473170aedbe66ffa3ad3726939ba677d83c646ad4fd99e5b4bc38712f45ec" -dependencies = [ - "kernel32-sys", - "libc", - "winapi 0.2.8", -] - -[[package]] -name = "rpassword" -version = "7.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6678cf63ab3491898c0d021b493c94c9b221d91295294a2a5746eacbe5928322" -dependencies = [ - "libc", - "rtoolbox", - "winapi 0.3.9", -] - -[[package]] -name = "rtoolbox" -version = "0.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "034e22c514f5c0cb8a10ff341b9b048b5ceb21591f31c8f44c43b960f9b3524a" -dependencies = [ - "libc", - "winapi 0.3.9", -] - -[[package]] -name = "rubato" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd70209c27d5b08f5528bdc779ea3ffb418954e28987f9f9775c6eac41003f9c" -dependencies = [ - "num-complex", - "num-integer", - "num-traits 0.2.15", - "realfft", -] - -[[package]] -name = "runas" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed87390fefd18965ff20baae5aeb9913bcf82d2b59dc04c0f6d8f17f7be56ff2" -dependencies = [ - "cc", - "which", -] - -[[package]] -name = "rust-ini" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6d5f2436026b4f6e79dc829837d467cc7e9a55ee40e750d716713540715a2df" -dependencies = [ - "cfg-if 1.0.0", - "ordered-multimap", -] - -[[package]] -name = "rust-pulsectl" -version = "0.2.12" -source = "git+https://github.com/open-trade/pulsectl#5e68f4c2b7c644fa321984688602d71e8ad0bba3" -dependencies = [ - "libpulse-binding", -] - -[[package]] -name = "rustc-demangle" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" - -[[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 = "rustdesk" -version = "1.2.3" -dependencies = [ - "android_logger", - "arboard", - "async-process", - "async-trait", - "base64", - "bytes", - "cc", - "cfg-if 1.0.0", - "chrono", - "cidr-utils", - "clap 4.2.7", - "clipboard", - "cocoa", - "core-foundation", - "core-graphics", - "cpal", - "crossbeam-queue", - "ctrlc", - "dark-light", - "dasp", - "dbus", - "dbus-crossroads", - "default-net", - "dispatch", - "enigo", - "errno", - "evdev", - "flutter_rust_bridge", - "flutter_rust_bridge_codegen", - "fon", - "fruitbasket", - "hbb_common", - "hex", - "hound", - "image", - "impersonate_system", - "include_dir", - "jni 0.21.1", - "keepawake", - "lazy_static", - "libloading 0.8.0", - "libpulse-binding", - "libpulse-simple-binding", - "mac_address", - "magnum-opus", - "mouce", - "num_cpus", - "objc", - "objc_id", - "os-version", - "pam", - "parity-tokio-ipc", - "rdev", - "repng", - "reqwest", - "ringbuf", - "rpassword 7.2.0", - "rubato", - "runas", - "rust-pulsectl", - "samplerate", - "sciter-rs", - "scrap", - "serde 1.0.163", - "serde_derive", - "serde_json 1.0.96", - "serde_repr", - "sha2", - "shared_memory", - "shutdown_hooks", - "sys-locale", - "system_shutdown", - "tao", - "tauri-winrt-notification", - "tray-icon", - "url", - "users 0.11.0", - "uuid", - "virtual_display", - "whoami", - "winapi 0.3.9", - "windows-service", - "winreg 0.11.0", - "winres", - "wol-rs", - "zip", -] - -[[package]] -name = "rustdesk-portable-packer" -version = "0.1.0" -dependencies = [ - "brotli", - "dirs 5.0.1", - "embed-resource", - "md5", - "winapi 0.3.9", -] - -[[package]] -name = "rustfft" -version = "6.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e17d4f6cbdb180c9f4b2a26bbf01c4e647f1e1dea22fe8eb9db54198b32f9434" -dependencies = [ - "num-complex", - "num-integer", - "num-traits 0.2.15", - "primal-check", - "strength_reduce", - "transpose", - "version_check", -] - -[[package]] -name = "rustix" -version = "0.37.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acf8729d8542766f1b2cf77eb034d52f40d375bb8b615d0b147089946e16613d" -dependencies = [ - "bitflags", - "errno", - "io-lifetimes", - "libc", - "linux-raw-sys", - "windows-sys 0.48.0", -] - -[[package]] -name = "rustls" -version = "0.20.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f" -dependencies = [ - "ring", - "sct", - "webpki", -] - -[[package]] -name = "rustls" -version = "0.21.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e32ca28af694bc1bbf399c33a516dbdf1c90090b8ab23c2bc24f834aa2247f5f" -dependencies = [ - "log", - "ring", - "rustls-webpki", - "sct", -] - -[[package]] -name = "rustls-native-certs" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0167bac7a9f490495f3c33013e7722b53cb087ecbe082fb0c6387c96f634ea50" -dependencies = [ - "openssl-probe", - "rustls-pemfile", - "schannel", - "security-framework", -] - -[[package]] -name = "rustls-pemfile" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d194b56d58803a43635bdc398cd17e383d6f71f9182b9a192c127ca42494a59b" -dependencies = [ - "base64", -] - -[[package]] -name = "rustls-webpki" -version = "0.100.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6207cd5ed3d8dca7816f8f3725513a34609c0c765bf652b8c3cb4cfd87db46b" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "rustversion" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06" - -[[package]] -name = "ryu" -version = "1.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" - -[[package]] -name = "safemem" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" - -[[package]] -name = "same-file" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "samplerate" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e032b2b24715c4f982f483ea3abdb3c9ba444d9f63e87b2843d6f998f5ba2698" -dependencies = [ - "libsamplerate-sys", -] - -[[package]] -name = "schannel" -version = "0.1.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" -dependencies = [ - "windows-sys 0.42.0", -] - -[[package]] -name = "sciter-rs" -version = "0.5.57" -source = "git+https://github.com/open-trade/rust-sciter?branch=dyn#fab913b7c2e779b05c249b0c5de5a08759b2c15d" -dependencies = [ - "lazy_static", - "libc", - "objc", - "objc-foundation", -] - -[[package]] -name = "scopeguard" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" - -[[package]] -name = "scrap" -version = "0.5.0" -dependencies = [ - "android_logger", - "bindgen 0.65.1", - "block", - "cfg-if 1.0.0", - "dbus", - "docopt", - "gstreamer", - "gstreamer-app", - "gstreamer-video", - "hbb_common", - "hwcodec", - "jni 0.21.1", - "lazy_static", - "log", - "ndk", - "num_cpus", - "pkg-config", - "quest", - "repng", - "serde 1.0.163", - "serde_json 1.0.96", - "target_build_utils", - "tracing", - "webm", - "winapi 0.3.9", -] - -[[package]] -name = "scratch" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1" - -[[package]] -name = "sct" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "security-framework" -version = "2.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a332be01508d814fed64bf28f798a146d73792121129962fdf335bb3c49a4254" -dependencies = [ - "bitflags", - "core-foundation", - "core-foundation-sys 0.8.4", - "libc", - "security-framework-sys", -] - -[[package]] -name = "security-framework-sys" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31c9bb296072e961fcbd8853511dd39c2d8be2deb1e17c6860b1d30732b323b4" -dependencies = [ - "core-foundation-sys 0.8.4", - "libc", -] - -[[package]] -name = "semver" -version = "1.0.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" -dependencies = [ - "serde 1.0.163", -] - -[[package]] -name = "serde" -version = "0.9.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34b623917345a631dc9608d5194cc206b3fe6c3554cd1c75b937e55e285254af" - -[[package]] -name = "serde" -version = "1.0.163" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.163" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e" -dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.27", - "syn 2.0.15", -] - -[[package]] -name = "serde_json" -version = "0.9.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad8bcf487be7d2e15d3d543f04312de991d631cfe1b43ea0ade69e6a8a5b16a1" -dependencies = [ - "dtoa", - "itoa 0.3.4", - "num-traits 0.1.43", - "serde 0.9.15", -] - -[[package]] -name = "serde_json" -version = "1.0.96" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1" -dependencies = [ - "itoa 1.0.6", - "ryu", - "serde 1.0.163", -] - -[[package]] -name = "serde_repr" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcec881020c684085e55a25f7fd888954d56609ef363479dc5a1305eb0d40cab" -dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.27", - "syn 2.0.15", -] - -[[package]] -name = "serde_spanned" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0efd8caf556a6cebd3b285caf480045fcc1ac04f6bd786b09a6f11af30c4fcf4" -dependencies = [ - "serde 1.0.163", -] - -[[package]] -name = "serde_urlencoded" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" -dependencies = [ - "form_urlencoded", - "itoa 1.0.6", - "ryu", - "serde 1.0.163", -] - -[[package]] -name = "serde_yaml" -version = "0.8.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578a7433b776b56a35785ed5ce9a7e777ac0598aac5a6dd1b4b18a307c7fc71b" -dependencies = [ - "indexmap", - "ryu", - "serde 1.0.163", - "yaml-rust", -] - -[[package]] -name = "sha1" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" -dependencies = [ - "cfg-if 1.0.0", - "cpufeatures", - "digest", -] - -[[package]] -name = "sha2" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" -dependencies = [ - "cfg-if 1.0.0", - "cpufeatures", - "digest", -] - -[[package]] -name = "shadow-rs" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "427f07ab5f873000cf55324882e12a88c0a7ea7025df4fc1e7e35e688877a583" -dependencies = [ - "const_format", - "git2", - "is_debug", - "time 0.3.21", - "tzdb", -] - -[[package]] -name = "shared_memory" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba8593196da75d9dc4f69349682bd4c2099f8cde114257d1ef7ef1b33d1aba54" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "nix 0.23.2", - "rand 0.8.5", - "win-sys", -] - -[[package]] -name = "shlex" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" - -[[package]] -name = "shutdown_hooks" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6057adedbec913419c92996f395ba69931acbd50b7d56955394cd3f7bedbfa45" - -[[package]] -name = "signal-hook" -version = "0.3.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "732768f1176d21d09e076c23a93123d40bba92d50c4058da34d45c8de8e682b9" -dependencies = [ - "libc", - "signal-hook-registry", -] - -[[package]] -name = "signal-hook-registry" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" -dependencies = [ - "libc", -] - -[[package]] -name = "signature" -version = "1.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" - -[[package]] -name = "simd-adler32" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "238abfbb77c1915110ad968465608b68e869e0772622c9656714e73e5a1a522f" - -[[package]] -name = "siphasher" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac" - -[[package]] -name = "slab" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" -dependencies = [ - "autocfg 1.1.0", -] - -[[package]] -name = "smallvec" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" - -[[package]] -name = "socket2" -version = "0.3.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "winapi 0.3.9", -] - -[[package]] -name = "socket2" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" -dependencies = [ - "libc", - "winapi 0.3.9", -] - -[[package]] -name = "sodiumoxide" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e26be3acb6c2d9a7aac28482586a7856436af4cfe7100031d219de2d2ecb0028" -dependencies = [ - "ed25519", - "libc", - "libsodium-sys", - "serde 1.0.163", -] - -[[package]] -name = "spin" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" - -[[package]] -name = "spin" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" -dependencies = [ - "lock_api", -] - -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - -[[package]] -name = "str-buf" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e08d8363704e6c71fc928674353e6b7c23dcea9d82d7012c8faf2a3a025f8d0" - -[[package]] -name = "strength_reduce" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe895eb47f22e2ddd4dabc02bce419d2e643c8e3b585c78158b349195bc24d82" - -[[package]] -name = "strsim" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" - -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - -[[package]] -name = "strum" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57bd81eb48f4c437cadc685403cad539345bf703d78e63707418431cecd4522b" - -[[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.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87c85aa3f8ea653bfd3ddf25f7ee357ee4d204731f6aa9ad04002306f6e2774c" -dependencies = [ - "heck 0.3.3", - "proc-macro2 1.0.63", - "quote 1.0.27", - "syn 1.0.109", -] - -[[package]] -name = "strum_macros" -version = "0.24.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" -dependencies = [ - "heck 0.4.1", - "proc-macro2 1.0.63", - "quote 1.0.27", - "rustversion", - "syn 1.0.109", -] - -[[package]] -name = "subtle" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" - -[[package]] -name = "syn" -version = "0.15.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5" -dependencies = [ - "proc-macro2 0.4.30", - "quote 0.6.13", - "unicode-xid 0.1.0", -] - -[[package]] -name = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.27", - "unicode-ident", -] - -[[package]] -name = "syn" -version = "2.0.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822" -dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.27", - "unicode-ident", -] - -[[package]] -name = "sys-locale" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea0b9eefabb91675082b41eb94c3ecd91af7656caee3fb4961a07c0ec8c7ca6f" -dependencies = [ - "libc", - "windows-sys 0.45.0", -] - -[[package]] -name = "sysinfo" -version = "0.29.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7cb97a5a85a136d84e75d5c3cf89655090602efb1be0d8d5337b7e386af2908" -dependencies = [ - "cfg-if 1.0.0", - "core-foundation-sys 0.8.4", - "libc", - "ntapi", - "once_cell", - "rayon", - "winapi 0.3.9", -] - -[[package]] -name = "system-configuration" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d75182f12f490e953596550b65ee31bda7c8e043d9386174b353bda50838c3fd" -dependencies = [ - "bitflags", - "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 0.8.4", - "libc", -] - -[[package]] -name = "system-deps" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f3ecc17269a19353b3558b313bba738b25d82993e30d62a18406a24aba4649b" -dependencies = [ - "heck 0.3.3", - "pkg-config", - "strum 0.18.0", - "strum_macros 0.18.0", - "thiserror", - "toml 0.5.11", - "version-compare 0.0.10", -] - -[[package]] -name = "system-deps" -version = "6.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5fa6fb9ee296c0dc2df41a656ca7948546d061958115ddb0bcaae43ad0d17d2" -dependencies = [ - "cfg-expr", - "heck 0.4.1", - "pkg-config", - "toml 0.7.3", - "version-compare 0.1.1", -] - -[[package]] -name = "system_shutdown" -version = "4.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7567f71160af5e9abfb4f5a21532cf2174cefe91ac5c336419295685a695cc66" -dependencies = [ - "windows 0.44.0", - "zbus", -] - -[[package]] -name = "tao" -version = "0.22.2" -source = "git+https://github.com/rustdesk-org/tao?branch=dev#1e5b97258cf42a30f80f85a6aa0b1a4aece1977e" -dependencies = [ - "bitflags", - "cairo-rs", - "cc", - "cocoa", - "core-foundation", - "core-graphics", - "crossbeam-channel", - "dispatch", - "gdk", - "gdk-pixbuf", - "gdk-sys", - "gdkwayland-sys", - "gdkx11-sys", - "gio", - "glib 0.16.7", - "glib-sys 0.16.3", - "gtk", - "image", - "instant", - "jni 0.21.1", - "lazy_static", - "libc", - "log", - "ndk", - "ndk-context", - "ndk-sys", - "objc", - "once_cell", - "parking_lot", - "png", - "raw-window-handle", - "scopeguard", - "tao-macros", - "unicode-segmentation", - "url", - "uuid", - "windows 0.48.0", - "windows-implement", - "x11-dl", - "zbus", -] - -[[package]] -name = "tao-macros" -version = "0.1.2" -source = "git+https://github.com/rustdesk-org/tao?branch=dev#1e5b97258cf42a30f80f85a6aa0b1a4aece1977e" -dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.27", - "syn 1.0.109", -] - -[[package]] -name = "tap" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" - -[[package]] -name = "target-lexicon" -version = "0.12.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd1ba337640d60c3e96bc6f0638a939b9c9a7f2c316a1598c279828b3d1dc8c5" - -[[package]] -name = "target_build_utils" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "013d134ae4a25ee744ad6129db589018558f620ddfa44043887cdd45fa08e75c" -dependencies = [ - "phf", - "phf_codegen", - "serde_json 0.9.10", -] - -[[package]] -name = "tauri-winrt-notification" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f5bff1d532fead7c43324a0fa33643b8621a47ce2944a633be4cb6c0240898f" -dependencies = [ - "quick-xml 0.23.1", - "windows 0.39.0", -] - -[[package]] -name = "tempfile" -version = "3.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998" -dependencies = [ - "cfg-if 1.0.0", - "fastrand", - "redox_syscall 0.3.5", - "rustix", - "windows-sys 0.45.0", -] - -[[package]] -name = "termcolor" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "termios" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "411c5bf740737c7918b8b1fe232dca4dc9f8e754b8ad5e20966814001ed0ac6b" -dependencies = [ - "libc", -] - -[[package]] -name = "textwrap" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -dependencies = [ - "unicode-width", -] - -[[package]] -name = "textwrap" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" - -[[package]] -name = "tfc" -version = "0.6.1" -source = "git+https://github.com/fufesou/The-Fat-Controller#9dd86151525fd010dc93f6bc9b6aedd1a75cc342" -dependencies = [ - "anyhow", - "core-graphics", - "unicode-segmentation", - "winapi 0.3.9", - "x11 2.19.0", -] - -[[package]] -name = "thiserror" -version = "1.0.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" -dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.27", - "syn 2.0.15", -] - -[[package]] -name = "threadpool" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa" -dependencies = [ - "num_cpus", -] - -[[package]] -name = "tiff" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7449334f9ff2baf290d55d73983a7d6fa15e01198faef72af07e2a8db851e471" -dependencies = [ - "flate2", - "jpeg-decoder", - "weezl", -] - -[[package]] -name = "time" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" -dependencies = [ - "libc", - "wasi 0.10.0+wasi-snapshot-preview1", - "winapi 0.3.9", -] - -[[package]] -name = "time" -version = "0.3.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f3403384eaacbca9923fa06940178ac13e4edb725486d70e8e15881d0c836cc" -dependencies = [ - "itoa 1.0.6", - "libc", - "num_threads", - "serde 1.0.163", - "time-core", - "time-macros", -] - -[[package]] -name = "time-core" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" - -[[package]] -name = "time-macros" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b" -dependencies = [ - "time-core", -] - -[[package]] -name = "tinyvec" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" -dependencies = [ - "tinyvec_macros", -] - -[[package]] -name = "tinyvec_macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" - -[[package]] -name = "tokio" -version = "1.28.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0aa32867d44e6f2ce3385e89dceb990188b8bb0fb25b0cf576647a6f98ac5105" -dependencies = [ - "autocfg 1.1.0", - "bytes", - "libc", - "mio", - "num_cpus", - "parking_lot", - "pin-project-lite", - "signal-hook-registry", - "socket2 0.4.9", - "tokio-macros", - "windows-sys 0.48.0", -] - -[[package]] -name = "tokio-macros" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" -dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.27", - "syn 2.0.15", -] - -[[package]] -name = "tokio-rustls" -version = "0.24.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" -dependencies = [ - "rustls 0.21.2", - "tokio", -] - -[[package]] -name = "tokio-socks" -version = "0.5.1-2" -source = "git+https://github.com/open-trade/tokio-socks#14a5c2564fa20a2765ea53d03c573ee2b7e20421" -dependencies = [ - "bytes", - "either", - "futures-core", - "futures-sink", - "futures-util", - "pin-project", - "thiserror", - "tokio", - "tokio-util", -] - -[[package]] -name = "tokio-util" -version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" -dependencies = [ - "bytes", - "futures-core", - "futures-io", - "futures-sink", - "futures-util", - "hashbrown", - "pin-project-lite", - "slab", - "tokio", - "tracing", -] - -[[package]] -name = "toml" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" -dependencies = [ - "serde 1.0.163", -] - -[[package]] -name = "toml" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb9d890e4dc9298b70f740f615f2e05b9db37dce531f6b24fb77ac993f9f217" -dependencies = [ - "serde 1.0.163", - "serde_spanned", - "toml_datetime 0.5.1", - "toml_edit 0.18.1", -] - -[[package]] -name = "toml" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b403acf6f2bb0859c93c7f0d967cb4a75a7ac552100f9322faf64dc047669b21" -dependencies = [ - "serde 1.0.163", - "serde_spanned", - "toml_datetime 0.6.1", - "toml_edit 0.19.8", -] - -[[package]] -name = "toml_datetime" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4553f467ac8e3d374bc9a177a26801e5d0f9b211aa1673fb137a403afd1c9cf5" -dependencies = [ - "serde 1.0.163", -] - -[[package]] -name = "toml_datetime" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622" -dependencies = [ - "serde 1.0.163", -] - -[[package]] -name = "toml_edit" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56c59d8dd7d0dcbc6428bf7aa2f0e823e26e43b3c9aca15bbc9475d23e5fa12b" -dependencies = [ - "indexmap", - "nom8", - "serde 1.0.163", - "serde_spanned", - "toml_datetime 0.5.1", -] - -[[package]] -name = "toml_edit" -version = "0.19.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13" -dependencies = [ - "indexmap", - "serde 1.0.163", - "serde_spanned", - "toml_datetime 0.6.1", - "winnow", -] - -[[package]] -name = "topological-sort" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea68304e134ecd095ac6c3574494fc62b909f416c4fca77e440530221e549d3d" - -[[package]] -name = "tower-service" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" - -[[package]] -name = "tracing" -version = "0.1.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" -dependencies = [ - "cfg-if 1.0.0", - "pin-project-lite", - "tracing-attributes", - "tracing-core", -] - -[[package]] -name = "tracing-attributes" -version = "0.1.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f57e3ca2a01450b1a921183a9c9cbfda207fd822cef4ccb00a65402cbba7a74" -dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.27", - "syn 2.0.15", -] - -[[package]] -name = "tracing-core" -version = "0.1.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" -dependencies = [ - "once_cell", -] - -[[package]] -name = "transpose" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6522d49d03727ffb138ae4cbc1283d3774f0d10aa7f9bf52e6784c45daf9b23" -dependencies = [ - "num-integer", - "strength_reduce", -] - -[[package]] -name = "tray-icon" -version = "0.5.1" -source = "git+https://github.com/rustdesk-org/tray-icon#ef98e7b98abed2e3da614277eced12a85bfb717c" -dependencies = [ - "cocoa", - "core-graphics", - "crossbeam-channel", - "dirs-next", - "libappindicator", - "muda", - "objc", - "once_cell", - "png", - "thiserror", - "windows-sys 0.48.0", -] - -[[package]] -name = "try-lock" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" - -[[package]] -name = "typenum" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" - -[[package]] -name = "tz-rs" -version = "0.6.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33851b15c848fad2cf4b105c6bb66eb9512b6f6c44a4b13f57c53c73c707e2b4" -dependencies = [ - "const_fn", -] - -[[package]] -name = "tzdb" -version = "0.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec758958f2fb5069cd7fae385be95cc8eceb8cdfd270c7d14de6034f0108d99e" -dependencies = [ - "iana-time-zone", - "tz-rs", -] - -[[package]] -name = "uds_windows" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce65604324d3cce9b966701489fbd0cf318cb1f7bd9dd07ac9a4ee6fb791930d" -dependencies = [ - "tempfile", - "winapi 0.3.9", -] - -[[package]] -name = "uname" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b72f89f0ca32e4db1c04e2a72f5345d59796d4866a1ee0609084569f73683dc8" -dependencies = [ - "libc", -] - -[[package]] -name = "unicode-bidi" -version = "0.3.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" - -[[package]] -name = "unicode-ident" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" - -[[package]] -name = "unicode-normalization" -version = "0.1.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "unicode-segmentation" -version = "1.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" - -[[package]] -name = "unicode-width" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" - -[[package]] -name = "unicode-xid" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" - -[[package]] -name = "unicode-xid" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" - -[[package]] -name = "untrusted" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" - -[[package]] -name = "url" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" -dependencies = [ - "form_urlencoded", - "idna", - "percent-encoding", - "serde 1.0.163", -] - -[[package]] -name = "users" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa4227e95324a443c9fcb06e03d4d85e91aabe9a5a02aa818688b6918b6af486" -dependencies = [ - "libc", - "log", -] - -[[package]] -name = "users" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24cc0f6d6f267b73e5a2cadf007ba8f9bc39c6a6f9666f8cf25ea809a153b032" -dependencies = [ - "libc", - "log", -] - -[[package]] -name = "utf8parse" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" - -[[package]] -name = "uuid" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dad5567ad0cf5b760e5665964bec1b47dfd077ba8a2544b513f3556d3d239a2" -dependencies = [ - "getrandom", -] - -[[package]] -name = "vcpkg" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" - -[[package]] -name = "vec_map" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" - -[[package]] -name = "version-compare" -version = "0.0.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d63556a25bae6ea31b52e640d7c41d1ab27faba4ccb600013837a3d0b3994ca1" - -[[package]] -name = "version-compare" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "579a42fc0b8e0c63b76519a339be31bed574929511fa53c1a3acae26eb258f29" - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "virtual_display" -version = "0.1.0" -dependencies = [ - "hbb_common", - "lazy_static", -] - -[[package]] -name = "vswhom" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be979b7f07507105799e854203b470ff7c78a1639e330a58f183b5fea574608b" -dependencies = [ - "libc", - "vswhom-sys", -] - -[[package]] -name = "vswhom-sys" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3b17ae1f6c8a2b28506cd96d412eebf83b4a0ff2cbefeeb952f2f9dfa44ba18" -dependencies = [ - "cc", - "libc", -] - -[[package]] -name = "waker-fn" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" - -[[package]] -name = "walkdir" -version = "2.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" -dependencies = [ - "same-file", - "winapi-util", -] - -[[package]] -name = "want" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" -dependencies = [ - "log", - "try-lock", -] - -[[package]] -name = "wasi" -version = "0.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.85" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b6cb788c4e39112fbe1822277ef6fb3c55cd86b95cb3d3c4c1c9597e4ac74b4" -dependencies = [ - "cfg-if 1.0.0", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.85" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35e522ed4105a9d626d885b35d62501b30d9666283a5c8be12c14a8bdafe7822" -dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2 1.0.63", - "quote 1.0.27", - "syn 2.0.15", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-futures" -version = "0.4.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "083abe15c5d88556b77bdf7aef403625be9e327ad37c62c4e4129af740168163" -dependencies = [ - "cfg-if 1.0.0", - "js-sys", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.85" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "358a79a0cb89d21db8120cbfb91392335913e4890665b1a7981d9e956903b434" -dependencies = [ - "quote 1.0.27", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.85" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4783ce29f09b9d93134d41297aded3a712b7b979e9c6f28c32cb88c973a94869" -dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.27", - "syn 2.0.15", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.85" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a901d592cafaa4d711bc324edfaff879ac700b19c3dfd60058d2b445be2691eb" - -[[package]] -name = "web-sys" -version = "0.3.62" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b5f940c7edfdc6d12126d98c9ef4d1b3d470011c47c76a6581df47ad9ba721" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "webm" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecb047148a12ef1fd8ab26302bca7e82036f005c3073b48e17cc1b44ec577136" -dependencies = [ - "webm-sys", -] - -[[package]] -name = "webm-sys" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ded6ec82ccf51fe265b0b2b1579cac839574ed910c17baac58e807f8a9de7f3" -dependencies = [ - "cc", -] - -[[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.23.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b03058f88386e5ff5310d9111d53f48b17d732b401aeb83a8d5190f2ac459338" -dependencies = [ - "rustls-webpki", -] - -[[package]] -name = "weezl" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" - -[[package]] -name = "which" -version = "4.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269" -dependencies = [ - "either", - "libc", - "once_cell", -] - -[[package]] -name = "whoami" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c70234412ca409cc04e864e89523cb0fc37f5e1344ebed5a3ebf4192b6b9f68" -dependencies = [ - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "widestring" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8" - -[[package]] -name = "win-sys" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b7b128a98c1cfa201b09eb49ba285887deb3cbe7466a98850eb1adabb452be5" -dependencies = [ - "windows 0.34.0", -] - -[[package]] -name = "winapi" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-build" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-util" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" -dependencies = [ - "winapi 0.3.9", -] - -[[package]] -name = "winapi-wsapoll" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44c17110f57155602a80dca10be03852116403c9ff3cd25b079d666f2aa3df6e" -dependencies = [ - "winapi 0.3.9", -] - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "windows" -version = "0.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbedf6db9096bc2364adce0ae0aa636dcd89f3c3f2cd67947062aaf0ca2a10ec" -dependencies = [ - "windows_aarch64_msvc 0.32.0", - "windows_i686_gnu 0.32.0", - "windows_i686_msvc 0.32.0", - "windows_x86_64_gnu 0.32.0", - "windows_x86_64_msvc 0.32.0", -] - -[[package]] -name = "windows" -version = "0.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45296b64204227616fdbf2614cefa4c236b98ee64dfaaaa435207ed99fe7829f" -dependencies = [ - "windows_aarch64_msvc 0.34.0", - "windows_i686_gnu 0.34.0", - "windows_i686_msvc 0.34.0", - "windows_x86_64_gnu 0.34.0", - "windows_x86_64_msvc 0.34.0", -] - -[[package]] -name = "windows" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1c4bd0a50ac6020f65184721f758dba47bb9fbc2133df715ec74a237b26794a" -dependencies = [ - "windows_aarch64_msvc 0.39.0", - "windows_i686_gnu 0.39.0", - "windows_i686_msvc 0.39.0", - "windows_x86_64_gnu 0.39.0", - "windows_x86_64_msvc 0.39.0", -] - -[[package]] -name = "windows" -version = "0.44.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e745dab35a0c4c77aa3ce42d595e13d2003d6902d6b08c9ef5fc326d08da12b" -dependencies = [ - "windows-targets 0.42.2", -] - -[[package]] -name = "windows" -version = "0.46.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdacb41e6a96a052c6cb63a144f24900236121c6f63f4f8219fef5977ecb0c25" -dependencies = [ - "windows-targets 0.42.2", -] - -[[package]] -name = "windows" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" -dependencies = [ - "windows-implement", - "windows-interface", - "windows-targets 0.48.0", -] - -[[package]] -name = "windows-implement" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e2ee588991b9e7e6c8338edf3333fbe4da35dc72092643958ebb43f0ab2c49c" -dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.27", - "syn 1.0.109", -] - -[[package]] -name = "windows-interface" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6fb8df20c9bcaa8ad6ab513f7b40104840c8867d5751126e4df3b08388d0cc7" -dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.27", - "syn 1.0.109", -] - -[[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.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" -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-sys" -version = "0.45.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" -dependencies = [ - "windows-targets 0.42.2", -] - -[[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.0", -] - -[[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.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" -dependencies = [ - "windows_aarch64_gnullvm 0.48.0", - "windows_aarch64_msvc 0.48.0", - "windows_i686_gnu 0.48.0", - "windows_i686_msvc 0.48.0", - "windows_x86_64_gnu 0.48.0", - "windows_x86_64_gnullvm 0.48.0", - "windows_x86_64_msvc 0.48.0", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8e92753b1c443191654ec532f14c199742964a061be25d77d7a96f09db20bf5" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17cffbe740121affb56fad0fc0e421804adf0ae00891205213b5cecd30db881d" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec7711666096bd4096ffa835238905bb33fb87267910e154b18b44eaabb340f2" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" - -[[package]] -name = "windows_i686_gnu" -version = "0.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a711c68811799e017b6038e0922cb27a5e2f43a2ddb609fe0b6f3eeda9de615" - -[[package]] -name = "windows_i686_gnu" -version = "0.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2564fde759adb79129d9b4f54be42b32c89970c18ebf93124ca8870a498688ed" - -[[package]] -name = "windows_i686_gnu" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "763fc57100a5f7042e3057e7e8d9bdd7860d330070251a73d003563a3bb49e1b" - -[[package]] -name = "windows_i686_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" - -[[package]] -name = "windows_i686_gnu" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" - -[[package]] -name = "windows_i686_msvc" -version = "0.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "146c11bb1a02615db74680b32a68e2d61f553cc24c4eb5b4ca10311740e44172" - -[[package]] -name = "windows_i686_msvc" -version = "0.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cd9d32ba70453522332c14d38814bceeb747d80b3958676007acadd7e166956" - -[[package]] -name = "windows_i686_msvc" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bc7cbfe58828921e10a9f446fcaaf649204dcfe6c1ddd712c5eebae6bda1106" - -[[package]] -name = "windows_i686_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" - -[[package]] -name = "windows_i686_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c912b12f7454c6620635bbff3450962753834be2a594819bd5e945af18ec64bc" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfce6deae227ee8d356d19effc141a509cc503dfd1f850622ec4b0f84428e1f4" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6868c165637d653ae1e8dc4d82c25d4f97dd6605eaa8d784b5c6e0ab2a252b65" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "504a2476202769977a040c6364301a3f65d0cc9e3fb08600b2bda150a0488316" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d19538ccc21819d01deaf88d6a17eae6596a12e9aafdbb97916fb49896d89de9" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e4d40883ae9cae962787ca76ba76390ffa29214667a111db9e0a1ad8377e809" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" - -[[package]] -name = "winnow" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61de7bac303dc551fe038e2b3cef0f571087a47571ea6e79a87692ac99b99699" -dependencies = [ - "memchr", -] - -[[package]] -name = "winreg" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" -dependencies = [ - "winapi 0.3.9", -] - -[[package]] -name = "winreg" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76a1a57ff50e9b408431e8f97d5456f2807f8eb2a2cd79b06068fc87f8ecf189" -dependencies = [ - "cfg-if 1.0.0", - "winapi 0.3.9", -] - -[[package]] -name = "winreg" -version = "0.50.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" -dependencies = [ - "cfg-if 1.0.0", - "windows-sys 0.48.0", -] - -[[package]] -name = "winres" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b68db261ef59e9e52806f688020631e987592bd83619edccda9c47d42cde4f6c" -dependencies = [ - "toml 0.5.11", -] - -[[package]] -name = "wol-rs" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48dc5e486e34a31515518d370cdd8bf59ec696323fe8f92b858e43942e84a765" - -[[package]] -name = "wyz" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" -dependencies = [ - "tap", -] - -[[package]] -name = "x11" -version = "2.19.0" -source = "git+https://github.com/bjornsnoen/x11-rs#c2e9bfaa7b196938f8700245564d8ac5d447786a" -dependencies = [ - "libc", - "pkg-config", -] - -[[package]] -name = "x11" -version = "2.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "502da5464ccd04011667b11c435cb992822c2c0dbde1770c988480d312a0db2e" -dependencies = [ - "libc", - "pkg-config", -] - -[[package]] -name = "x11-dl" -version = "2.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38735924fedd5314a6e548792904ed8c6de6636285cb9fec04d5b1db85c1516f" -dependencies = [ - "libc", - "once_cell", - "pkg-config", -] - -[[package]] -name = "x11rb" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "592b4883219f345e712b3209c62654ebda0bb50887f330cbd018d0f654bfd507" -dependencies = [ - "gethostname", - "nix 0.24.3", - "winapi 0.3.9", - "winapi-wsapoll", - "x11rb-protocol", -] - -[[package]] -name = "x11rb-protocol" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56b245751c0ac9db0e006dc812031482784e434630205a93c73cfefcaabeac67" -dependencies = [ - "nix 0.24.3", -] - -[[package]] -name = "xdg-home" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2769203cd13a0c6015d515be729c526d041e9cf2c0cc478d57faee85f40c6dcd" -dependencies = [ - "nix 0.26.2", - "winapi 0.3.9", -] - -[[package]] -name = "yaml-rust" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" -dependencies = [ - "linked-hash-map", -] - -[[package]] -name = "zbus" -version = "3.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29242fa5ec5693629ae74d6eb1f69622a9511f600986d6d9779bccf36ac316e3" -dependencies = [ - "async-broadcast", - "async-executor", - "async-fs", - "async-io", - "async-lock", - "async-recursion", - "async-task", - "async-trait", - "byteorder", - "derivative", - "enumflags2", - "event-listener", - "futures-core", - "futures-sink", - "futures-util", - "hex", - "nix 0.26.2", - "once_cell", - "ordered-stream", - "rand 0.8.5", - "serde 1.0.163", - "serde_repr", - "sha1", - "static_assertions", - "tracing", - "uds_windows", - "winapi 0.3.9", - "xdg-home", - "zbus_macros", - "zbus_names", - "zvariant", -] - -[[package]] -name = "zbus_macros" -version = "3.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "537793e26e9af85f774801dc52c6f6292352b2b517c5cf0449ffd3735732a53a" -dependencies = [ - "proc-macro-crate 1.3.1", - "proc-macro2 1.0.63", - "quote 1.0.27", - "regex", - "syn 1.0.109", - "zvariant_utils", -] - -[[package]] -name = "zbus_names" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f34f314916bd89bdb9934154627fab152f4f28acdda03e7c4c68181b214fe7e3" -dependencies = [ - "serde 1.0.163", - "static_assertions", - "zvariant", -] - -[[package]] -name = "zip" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e92305c174683d78035cbf1b70e18db6329cc0f1b9cae0a52ca90bf5bfe7125" -dependencies = [ - "aes", - "byteorder", - "bzip2", - "constant_time_eq", - "crc32fast", - "crossbeam-utils", - "flate2", - "hmac", - "pbkdf2", - "sha1", - "time 0.3.21", - "zstd 0.11.2+zstd.1.5.2", -] - -[[package]] -name = "zstd" -version = "0.11.2+zstd.1.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4" -dependencies = [ - "zstd-safe 5.0.2+zstd.1.5.2", -] - -[[package]] -name = "zstd" -version = "0.12.3+zstd.1.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76eea132fb024e0e13fd9c2f5d5d595d8a967aa72382ac2f9d39fcc95afd0806" -dependencies = [ - "zstd-safe 6.0.5+zstd.1.5.4", -] - -[[package]] -name = "zstd-safe" -version = "5.0.2+zstd.1.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db" -dependencies = [ - "libc", - "zstd-sys", -] - -[[package]] -name = "zstd-safe" -version = "6.0.5+zstd.1.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d56d9e60b4b1758206c238a10165fbcae3ca37b01744e394c463463f6529d23b" -dependencies = [ - "libc", - "zstd-sys", -] - -[[package]] -name = "zstd-sys" -version = "2.0.8+zstd.1.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5556e6ee25d32df2586c098bbfa278803692a20d0ab9565e049480d52707ec8c" -dependencies = [ - "cc", - "libc", - "pkg-config", -] - -[[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 = "zvariant" -version = "3.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46fe4914a985446d6fd287019b5fceccce38303d71407d9e6e711d44954a05d8" -dependencies = [ - "byteorder", - "enumflags2", - "libc", - "serde 1.0.163", - "static_assertions", - "zvariant_derive", -] - -[[package]] -name = "zvariant_derive" -version = "3.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34c20260af4b28b3275d6676c7e2a6be0d4332e8e0aba4616d34007fd84e462a" -dependencies = [ - "proc-macro-crate 1.3.1", - "proc-macro2 1.0.63", - "quote 1.0.27", - "syn 1.0.109", - "zvariant_utils", -] - -[[package]] -name = "zvariant_utils" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53b22993dbc4d128a17a3b6c92f1c63872dd67198537ee728d8b5d7c40640a8b" -dependencies = [ - "proc-macro2 1.0.63", - "quote 1.0.27", - "syn 1.0.109", -] diff --git a/pkgs/applications/networking/remote/rustdesk/default.nix b/pkgs/applications/networking/remote/rustdesk/default.nix deleted file mode 100644 index d1b0facf7f5b9..0000000000000 --- a/pkgs/applications/networking/remote/rustdesk/default.nix +++ /dev/null @@ -1,168 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, pkg-config -, wrapGAppsHook3 -, atk -, bzip2 -, cairo -, dbus -, gdk-pixbuf -, glib -, gst_all_1 -, gtk3 -, libayatana-appindicator -, libgit2 -, libpulseaudio -, libsodium -, libXtst -, libvpx -, libyuv -, libopus -, libaom -, libxkbcommon -, libsciter -, xdotool -, pam -, pango -, zlib -, zstd -, stdenv -, darwin -, alsa-lib -, makeDesktopItem -, copyDesktopItems -}: - -rustPlatform.buildRustPackage rec { - pname = "rustdesk"; - version = "1.2.3"; - - src = fetchFromGitHub { - owner = "rustdesk"; - repo = "rustdesk"; - rev = version; - hash = "sha256-6TdirqEnWvuPgKOLzNIAm66EgKNdGVjD7vf2maqlxI8="; - }; - - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "confy-0.4.0-2" = "sha256-r5VeggXrIq5Cwxc2WSrxQDI5Gvbw979qIUQfMKHgBUI="; - "evdev-0.11.5" = "sha256-aoPmjGi/PftnH6ClEWXHvIj0X3oh15ZC1q7wPC1XPr0="; - "hwcodec-0.1.1" = "sha256-EQGJr5kH8O48y1oSrzFF3QGGpGFKP3v4gn2JquAkdlY="; - "impersonate_system-0.1.0" = "sha256-qbaTw9gxMKDjX5pKdUrKlmIxCxWwb99YuWPDvD2A3kY="; - "keepawake-0.4.3" = "sha256-sLQf9q88dB2bkTN01UlxRWSpoF1kFsqqpYC4Sw6cbEY="; - "machine-uid-0.3.0" = "sha256-rEOyNThg6p5oqE9URnxSkPtzyW8D4zKzLi9pAnzTElE="; - "magnum-opus-0.4.0" = "sha256-T4qaYOl8lCK1h9jWa9KqGvnVfDViT9Ob5R+YgnSw2tg="; - "mouce-0.2.1" = "sha256-3PtNEmVMXgqKV4r3KiKTkk4oyCt4BKynniJREE+RyFk="; - "pam-0.7.0" = "sha256-qe2GH6sfGEUnqLiQucYLB5rD/GyAaVtm9pAxWRb1H3Q="; - "parity-tokio-ipc-0.7.3-2" = "sha256-WXDKcDBaJuq4K9gjzOKMozePOFiVX0EqYAFamAz/Yvw="; - "rdev-0.5.0-2" = "sha256-MJ4Uqp0yz1CcFvoZYyUYwNojUcfW1AyVowKShihhhbY="; - "reqwest-0.11.18" = "sha256-3k2wcVD+DzJEdP/+8BqP9qz3tgEWcbWZj5/CjrZz5LY="; - "rust-pulsectl-0.2.12" = "sha256-8jXTspWvjONFcvw9/Z8C43g4BuGZ3rsG32tvLMQbtbM="; - "sciter-rs-0.5.57" = "sha256-NQPDlMQ0sGY8c9lBMlplT82sNjbgJy2m/+REnF3fz8M="; - "tao-0.22.2" = "sha256-vZx7WM6vK9UarbFQ/FMnTNEEDS+tglhWcPXt/h7YMFA="; - "tfc-0.6.1" = "sha256-ukxJl7Z+pUXCjvTsG5Q0RiXocPERWGsnAyh3SIWm0HU="; - "tokio-socks-0.5.1-2" = "sha256-x3aFJKo0XLaCGkZLtG9GYA+A/cGGedVZ8gOztWiYVUY="; - "tray-icon-0.5.1" = "sha256-1VyUg8V4omgdRIYyXhfn8kUvhV5ef6D2cr2Djz2uQyc="; - "x11-2.19.0" = "sha256-GDCeKzUtvaLeBDmPQdyr499EjEfT6y4diBMzZVEptzc="; - }; - }; - - desktopItems = [ - (makeDesktopItem { - name = "rustdesk"; - exec = meta.mainProgram; - icon = "rustdesk"; - desktopName = "RustDesk"; - comment = meta.description; - genericName = "Remote Desktop"; - categories = [ "Network" ]; - mimeTypes = [ "x-scheme-handler/rustdesk" ]; - }) - ]; - - nativeBuildInputs = [ - copyDesktopItems - pkg-config - rustPlatform.bindgenHook - wrapGAppsHook3 - ]; - - buildFeatures = lib.optionals stdenv.isLinux [ "linux-pkg-config" ]; - - # Checks require an active X server - doCheck = false; - - buildInputs = [ - atk - bzip2 - cairo - dbus - gdk-pixbuf - glib - gst_all_1.gst-plugins-base - gst_all_1.gstreamer - gtk3 - libgit2 - libpulseaudio - libsodium - libXtst - libvpx - libyuv - libopus - libaom - libxkbcommon - xdotool - pam - pango - zlib - zstd - ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.AppKit - darwin.apple_sdk.frameworks.CoreAudio - darwin.apple_sdk.frameworks.CoreFoundation - darwin.apple_sdk.frameworks.CoreGraphics - darwin.apple_sdk.frameworks.Foundation - darwin.apple_sdk.frameworks.IOKit - darwin.apple_sdk.frameworks.Security - darwin.apple_sdk.frameworks.SystemConfiguration - ] ++ lib.optionals stdenv.isLinux [ - alsa-lib - ]; - - # Add static ui resources and libsciter to same folder as binary so that it - # can find them. - postInstall = '' - mkdir -p $out/{share/src,lib/rustdesk} - - # .so needs to be next to the executable - mv $out/bin/rustdesk $out/lib/rustdesk - ln -s ${libsciter}/lib/libsciter-gtk.so $out/lib/rustdesk - - makeWrapper $out/lib/rustdesk/rustdesk $out/bin/rustdesk \ - --chdir "$out/share" - - cp -a $src/src/ui $out/share/src - - install -Dm0644 $src/res/logo.svg $out/share/icons/hicolor/scalable/apps/rustdesk.svg - ''; - - postFixup = '' - patchelf --add-rpath "${libayatana-appindicator}/lib" "$out/lib/rustdesk/rustdesk" - ''; - - env = { - SODIUM_USE_PKG_CONFIG = true; - ZSTD_SYS_USE_PKG_CONFIG = true; - }; - - meta = with lib; { - description = "Virtual / remote desktop infrastructure for everyone! Open source TeamViewer / Citrix alternative"; - homepage = "https://rustdesk.com"; - license = licenses.agpl3Only; - maintainers = with maintainers; [ ocfox leixb ]; - mainProgram = "rustdesk"; - }; -} diff --git a/pkgs/applications/networking/remote/vmware-horizon-client/default.nix b/pkgs/applications/networking/remote/vmware-horizon-client/default.nix index 5f9ef27201e35..e223dfad5abe7 100644 --- a/pkgs/applications/networking/remote/vmware-horizon-client/default.nix +++ b/pkgs/applications/networking/remote/vmware-horizon-client/default.nix @@ -151,6 +151,6 @@ stdenv.mkDerivation { homepage = "https://www.vmware.com/go/viewclients"; license = licenses.unfree; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/networking/remote/x2goclient/default.nix b/pkgs/applications/networking/remote/x2goclient/default.nix index 848590d4cb873..551f8e57f7a08 100644 --- a/pkgs/applications/networking/remote/x2goclient/default.nix +++ b/pkgs/applications/networking/remote/x2goclient/default.nix @@ -62,7 +62,7 @@ qt5.mkDerivation rec { description = "Graphical NoMachine NX3 remote desktop client"; mainProgram = "x2goclient"; homepage = "http://x2go.org/"; - maintainers = with maintainers; [ ]; + maintainers = [ ]; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/applications/networking/remote/xrdp/default.nix b/pkgs/applications/networking/remote/xrdp/default.nix index 6e2f10ee8e47c..ff301d6909414 100644 --- a/pkgs/applications/networking/remote/xrdp/default.nix +++ b/pkgs/applications/networking/remote/xrdp/default.nix @@ -21,6 +21,7 @@ , libjpeg_turbo , _experimental-update-script-combinators , gitUpdater +, nixosTests }: let @@ -159,6 +160,9 @@ let { command = ["rm" "update-git-commits.txt"]; } (gitUpdater { rev-prefix = "v"; attrPath = "xrdp.xorgxrdp"; }) ]); + tests = { + inherit (nixosTests) xrdp; + }; }; meta = with lib; { diff --git a/pkgs/applications/networking/resilio-sync/default.nix b/pkgs/applications/networking/resilio-sync/default.nix index 5bf146995f128..f9f74a4af5b5f 100644 --- a/pkgs/applications/networking/resilio-sync/default.nix +++ b/pkgs/applications/networking/resilio-sync/default.nix @@ -2,22 +2,22 @@ stdenv.mkDerivation rec { pname = "resilio-sync"; - version = "2.7.3"; + version = "2.8.1.1390"; src = { x86_64-linux = fetchurl { - url = "https://download-cdn.resilio.com/${version}/linux-x64/resilio-sync_x64.tar.gz"; - sha256 = "sha256-DYQs9KofHkvtlsRQHRLwQHoHwSZkr40Ih0RVAw2xv3M="; + url = "https://download-cdn.resilio.com/${version}/linux/x64/0/resilio-sync_x64.tar.gz"; + sha256 = "sha256-XrfE2frDxOS32MzO7gpJEsMd0WY+b7TS0h/H94M7Py4="; }; i686-linux = fetchurl { - url = "https://download-cdn.resilio.com/${version}/linux-i386/resilio-sync_i386.tar.gz"; - sha256 = "sha256-PFKVBs0KthG4tuvooHkAciPhNQP0K8oi2LyoRUs5V7I="; + url = "https://download-cdn.resilio.com/${version}/linux/i386/0/resilio-sync_i386.tar.gz"; + sha256 = "sha256-tWwb9DHLlXeyimzyo/yxVKqlkP3jlAxT2Yzs6h2bIgs="; }; aarch64-linux = fetchurl { - url = "https://download-cdn.resilio.com/${version}/linux-arm64/resilio-sync_arm64.tar.gz"; - sha256 = "sha256-o2DlYOBTkFhQMEDJySlVSNlVqLNbBzacyv2oTwxrXto="; + url = "https://download-cdn.resilio.com/${version}/linux/arm64/0/resilio-sync_arm64.tar.gz"; + sha256 = "sha256-b859DqxTfnBMMeiwXlGKTQ+Mpmr2Rpg24l/GNkxSWbA="; }; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); @@ -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/rymdport/default.nix b/pkgs/applications/networking/rymdport/default.nix index 08c5243414dac..70b446db8a5a2 100644 --- a/pkgs/applications/networking/rymdport/default.nix +++ b/pkgs/applications/networking/rymdport/default.nix @@ -35,7 +35,7 @@ buildGoModule rec { libXinerama libXrandr libXxf86vm - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Carbon Cocoa IOKit diff --git a/pkgs/applications/networking/scaleft/default.nix b/pkgs/applications/networking/scaleft/default.nix index 8a500c5e162f0..942cad0d42feb 100644 --- a/pkgs/applications/networking/scaleft/default.nix +++ b/pkgs/applications/networking/scaleft/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, rpmextract, patchelf, bash, testers, scaleft }: +{ lib, stdenv, fetchurl, rpmextract, patchelf, testers, scaleft }: stdenv.mkDerivation rec { pname = "scaleft"; diff --git a/pkgs/applications/networking/seafile-client/default.nix b/pkgs/applications/networking/seafile-client/default.nix index 0a133bb49e5e4..2575d3b4e4803 100644 --- a/pkgs/applications/networking/seafile-client/default.nix +++ b/pkgs/applications/networking/seafile-client/default.nix @@ -3,7 +3,6 @@ , fetchFromGitHub , pkg-config , cmake -, qtbase , qttools , libuuid , seafile-shared @@ -16,13 +15,13 @@ stdenv.mkDerivation rec { pname = "seafile-client"; - version = "9.0.6"; + version = "9.0.8"; src = fetchFromGitHub { owner = "haiwen"; repo = "seafile-client"; rev = "v${version}"; - sha256 = "sha256-JjicVgDqiuIuVn7swbVekqQ+3Ly64Nd7qKu5UymTEYE="; + sha256 = "sha256-1E/PgQEg8lQntKpafCubPNUIF/L3kjA/rp1xAL8vFfs="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/seahub/default.nix b/pkgs/applications/networking/seahub/default.nix deleted file mode 100644 index 20cdf386257ec..0000000000000 --- a/pkgs/applications/networking/seahub/default.nix +++ /dev/null @@ -1,91 +0,0 @@ -{ lib -, fetchFromGitHub -, fetchpatch -, python3 -, makeWrapper -, nixosTests -}: -let - python = python3.override { - packageOverrides = self: super: { - django = super.django_3; - }; - }; -in -python.pkgs.buildPythonApplication rec { - pname = "seahub"; - version = "10.0.1"; - pyproject = false; - - src = fetchFromGitHub { - owner = "haiwen"; - repo = "seahub"; - rev = "e8c02236c0eaca6dde009872745f089da4b77e6e"; # using a fixed revision because upstream may re-tag releases :/ - sha256 = "sha256-7JXWKEFqCsC+ZByhvyP8AmDpajT3hpgyYDNUqc3wXyg="; - }; - - patches = [ - (fetchpatch { - # PIL update fix - url = "https://patch-diff.githubusercontent.com/raw/haiwen/seahub/pull/5570.patch"; - sha256 = "sha256-7V2aRlacJ7Qhdi9k4Bs+t/Emx+EAM/NNCI+K40bMwLA="; - }) - ]; - - dontBuild = true; - - doCheck = false; # disabled because it requires a ccnet environment - - nativeBuildInputs = [ - makeWrapper - ]; - - propagatedBuildInputs = with python.pkgs; [ - django - future - django-compressor - django-statici18n - django-webpack-loader - django-simple-captcha - django-picklefield - django-formtools - mysqlclient - pillow - python-dateutil - djangorestframework - openpyxl - requests - requests-oauthlib - chardet - pyjwt - pycryptodome - qrcode - pysearpc - seaserv - gunicorn - markdown - bleach - ]; - - installPhase = '' - cp -dr --no-preserve='ownership' . $out/ - wrapProgram $out/manage.py \ - --prefix PYTHONPATH : "$PYTHONPATH:$out/thirdpart:" - ''; - - passthru = { - inherit python; - pythonPath = python.pkgs.makePythonPath propagatedBuildInputs; - tests = { - inherit (nixosTests) seafile; - }; - }; - - meta = with lib; { - description = "Web end of seafile server"; - homepage = "https://github.com/haiwen/seahub"; - license = licenses.asl20; - maintainers = with maintainers; [ greizgh schmittlauch ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/networking/seaweedfs/default.nix b/pkgs/applications/networking/seaweedfs/default.nix index 3913c98fea88f..a43e954e70f4d 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.73"; src = fetchFromGitHub { owner = "seaweedfs"; repo = "seaweedfs"; rev = version; - hash = "sha256-ncA6YXa/focfmPMdEQWbeUxrLhwCqQiPqjP0SovLB2c="; + hash = "sha256-5CgkpL0nBLKojKPSfkYxh8F5Ub+yWhfmOsKC5qQ4QaE="; }; - vendorHash = "sha256-YgrDzfcp1Lh8bOI1FF7bTBquaShhgE9nZ/+7mvFiQCc="; + vendorHash = "sha256-rj5BbbT3/IBtPZ1MqbwC9TNp+N9ec90Anear2AWBZZU="; subPackages = [ "weed" ]; diff --git a/pkgs/applications/networking/shellhub-agent/default.nix b/pkgs/applications/networking/shellhub-agent/default.nix index 9a50dcb17f170..c4b6ffdba0a5b 100644 --- a/pkgs/applications/networking/shellhub-agent/default.nix +++ b/pkgs/applications/networking/shellhub-agent/default.nix @@ -11,18 +11,18 @@ buildGoModule rec { pname = "shellhub-agent"; - version = "0.15.1"; + version = "0.16.2"; src = fetchFromGitHub { owner = "shellhub-io"; repo = "shellhub"; rev = "v${version}"; - hash = "sha256-QwbxGym0eesCzrT//1+Hcr15B4nFck5u1VNRU8xE3Qo="; + hash = "sha256-oIRMzifp/MVw+0s/QjhZpW7HEjNPHiCyEoNQq6ZRBGE="; }; modRoot = "./agent"; - vendorHash = "sha256-JlfQRYdmxghGrKGwrn8jK1m32EhskmhMiyxNHZma0N0="; + vendorHash = "sha256-qqh9KdhOt6KDgwUhf6lzb6I7YAhocBSZ7UeyBT0e0eM="; ldflags = [ "-s" "-w" "-X main.AgentVersion=v${version}" ]; diff --git a/pkgs/applications/networking/siproxd/default.nix b/pkgs/applications/networking/siproxd/default.nix index 76ef0338dccf9..7c6319e450bda 100644 --- a/pkgs/applications/networking/siproxd/default.nix +++ b/pkgs/applications/networking/siproxd/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { homepage = "http://siproxd.sourceforge.net/"; description = "Masquerading SIP Proxy Server"; mainProgram = "siproxd"; - maintainers = with lib.maintainers; [viric]; + maintainers = [ ]; platforms = with lib.platforms; linux; license = lib.licenses.gpl2Plus; }; diff --git a/pkgs/applications/networking/sniffers/qtwirediff/default.nix b/pkgs/applications/networking/sniffers/qtwirediff/default.nix index 8ed53ec0771f9..ad71c217dbb92 100644 --- a/pkgs/applications/networking/sniffers/qtwirediff/default.nix +++ b/pkgs/applications/networking/sniffers/qtwirediff/default.nix @@ -27,17 +27,17 @@ stdenv.mkDerivation { buildInputs = [ qtbase - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ qtwayland ]; installPhase = '' runHook preInstall - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications cp -r qtwirediff.app $out/Applications makeWrapper $out/{Applications/qtwirediff.app/Contents/MacOS,bin}/qtwirediff - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' install -Dm755 -T qtwirediff $out/bin/qtwirediff wrapProgram $out/bin/qtwirediff \ --prefix PATH : "${lib.makeBinPath [ wireshark-cli ]}" @@ -50,6 +50,6 @@ stdenv.mkDerivation { mainProgram = "qtwirediff"; homepage = "https://github.com/aaptel/qtwirediff"; license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ janik ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/networking/sniffers/sngrep/default.nix b/pkgs/applications/networking/sniffers/sngrep/default.nix index 2c2c47e92efb9..f1661582549ef 100644 --- a/pkgs/applications/networking/sniffers/sngrep/default.nix +++ b/pkgs/applications/networking/sniffers/sngrep/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "sngrep"; - version = "1.8.1"; + version = "1.8.2"; src = fetchFromGitHub { owner = "irontec"; repo = pname; rev = "v${version}"; - sha256 = "sha256-EbB5Ok/8RUoNzkgoWIhHTRvlq9Vv2KVx6Hu8ejrLkMc="; + sha256 = "sha256-nvuT//FWJAa6DzmjBsBW9s2p1M+6Zs4cVmpK4dVemnE="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index 81dd459f5cb06..04f62befcc9bd 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -9,6 +9,7 @@ , buildPackages , c-ares , cmake +, fixDarwinDylibNames , flex , gettext , glib @@ -49,12 +50,14 @@ , withQt ? true , qt6 ? null }: - +let + isAppBundle = withQt && stdenv.hostPlatform.isDarwin; +in assert withQt -> qt6 != null; stdenv.mkDerivation rec { pname = "wireshark-${if withQt then "qt" else "cli"}"; - version = "4.2.5"; + version = "4.2.6"; outputs = [ "out" "dev" ]; @@ -62,7 +65,7 @@ stdenv.mkDerivation rec { repo = "wireshark"; owner = "wireshark"; rev = "v${version}"; - hash = "sha256-g0b0YGWQzWsALVnNJl/WQGl9J2QjaLnry2VL6qvN1FQ="; + hash = "sha256-zlFTUgsEKraE9crS5SZ13r93JJzUb6eyBhusJbbGwsE="; }; patches = [ @@ -86,6 +89,8 @@ stdenv.mkDerivation rec { ] ++ lib.optionals withQt [ qt6.wrapQtAppsHook wrapGAppsHook3 + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + fixDarwinDylibNames ]; buildInputs = [ @@ -121,13 +126,13 @@ stdenv.mkDerivation rec { qtmultimedia qtsvg qttools - ]) ++ lib.optionals (withQt && stdenv.isLinux) [ + ]) ++ lib.optionals (withQt && stdenv.hostPlatform.isLinux) [ qt6.qtwayland - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libcap libnl sbc - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ ApplicationServices gmp SystemConfiguration @@ -139,7 +144,7 @@ stdenv.mkDerivation rec { "-DBUILD_wireshark=${if withQt then "ON" else "OFF"}" # Fix `extcap` and `plugins` paths. See https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=16444 "-DCMAKE_INSTALL_LIBDIR=lib" - "-DENABLE_APPLICATION_BUNDLE=${if withQt && stdenv.isDarwin then "ON" else "OFF"}" + "-DENABLE_APPLICATION_BUNDLE=${if isAppBundle then "ON" else "OFF"}" "-DLEMON_C_COMPILER=cc" ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "-DHAVE_C99_VSNPRINTF_EXITCODE__TRYRUN_OUTPUT=" @@ -163,14 +168,20 @@ stdenv.mkDerivation rec { postInstall = '' cmake --install . --prefix "''${!outputDev}" --component Development - '' + lib.optionalString (stdenv.isDarwin && withQt) '' + '' + lib.optionalString isAppBundle '' mkdir -p $out/Applications mv $out/bin/Wireshark.app $out/Applications/Wireshark.app + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' + local flags=() + for file in $out/lib/*.dylib; do + flags+=(-change @rpath/"$(basename "$file")" "$file") + done - for f in $(find $out/Applications/Wireshark.app/Contents/PlugIns -name "*.so"); do - for dylib in $(otool -L $f | awk '/^\t*lib/ {print $1}'); do - install_name_tool -change "$dylib" "$out/lib/$dylib" "$f" - done + for file in $out/lib/wireshark/extcap/*; do + if [ -L "$file" ]; then continue; fi + echo "$file: fixing dylib references" + # note that -id does nothing on binaries + install_name_tool -id "$file" "''${flags[@]}" "$file" done ''; @@ -178,6 +189,15 @@ stdenv.mkDerivation rec { qtWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; + # This is done to remove some binary wrappers that wrapQtApps adds in *.app directories. + # Copying because unfortunately pointing Wireshark (when built as an appbundle) at $out/lib instead is nontrivial. + postFixup = lib.optionalString isAppBundle '' + rm -rf $out/Applications/Wireshark.app/Contents/MacOS/extcap $out/Applications/Wireshark.app/Contents/PlugIns + mkdir -p $out/Applications/Wireshark.app/Contents/PlugIns/wireshark + cp -r $out/lib/wireshark/plugins/4-2 $out/Applications/Wireshark.app/Contents/PlugIns/wireshark/4-2 + cp -r $out/lib/wireshark/extcap $out/Applications/Wireshark.app/Contents/MacOS/extcap + ''; + meta = with lib; { description = "Powerful network protocol analyzer"; longDescription = '' diff --git a/pkgs/applications/networking/sniffnet/default.nix b/pkgs/applications/networking/sniffnet/default.nix index def0f5900ba19..146c0941e8507 100644 --- a/pkgs/applications/networking/sniffnet/default.nix +++ b/pkgs/applications/networking/sniffnet/default.nix @@ -3,35 +3,37 @@ , fetchFromGitHub , pkg-config , libpcap +, libxkbcommon , openssl , stdenv , alsa-lib , expat , fontconfig , vulkan-loader +, wayland , xorg , darwin }: rustPlatform.buildRustPackage rec { pname = "sniffnet"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "gyulyvgc"; repo = "sniffnet"; rev = "refs/tags/v${version}"; - hash = "sha256-3OvzMzlaSwT7fOJATi+2QsSWln+SLkXNr2kYlQGClwA="; + hash = "sha256-wepy56LOhliU6t0ZRPviEbZtsWNqrtUnpUXsEdkRDqI="; }; - cargoHash = "sha256-PdlST5n8YaKkByPOvFAg5CqRxVkqRgLeVHW6CJOKioY="; + cargoHash = "sha256-cV3WhidnH2CBlmHa3IVHTQfTuPdSHwwY0XhgNPyLDN4="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libpcap openssl - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib expat fontconfig @@ -40,7 +42,7 @@ rustPlatform.buildRustPackage rec { xorg.libXcursor xorg.libXi xorg.libXrandr - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit rustPlatform.bindgenHook ]; @@ -60,9 +62,9 @@ rustPlatform.buildRustPackage rec { --replace 'Exec=/usr/bin/sniffnet' 'Exec=sniffnet' ''; - postFixup = lib.optionalString stdenv.isLinux '' + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' patchelf $out/bin/sniffnet \ - --add-rpath ${lib.makeLibraryPath [ vulkan-loader xorg.libX11 ]} + --add-rpath ${lib.makeLibraryPath [ vulkan-loader xorg.libX11 libxkbcommon wayland ]} ''; meta = with lib; { diff --git a/pkgs/applications/networking/spideroak/default.nix b/pkgs/applications/networking/spideroak/default.nix index c1531a25b5480..c4ef9831a8ce7 100644 --- a/pkgs/applications/networking/spideroak/default.nix +++ b/pkgs/applications/networking/spideroak/default.nix @@ -19,7 +19,7 @@ in stdenv.mkDerivation { src = fetchurl { name = "SpiderOakONE-${version}-slack_tar_x64.tgz"; - url = "https://spideroak.com/release/spideroak/slack_tar_x64"; + url = "https://spideroak-releases.s3.us-east-2.amazonaws.com/SpiderOakONE-${version}-slack_tar_x64.tgz"; inherit sha256; }; diff --git a/pkgs/applications/networking/station/default.nix b/pkgs/applications/networking/station/default.nix index 7207617a11665..c1a4dab8f7094 100644 --- a/pkgs/applications/networking/station/default.nix +++ b/pkgs/applications/networking/station/default.nix @@ -32,7 +32,7 @@ in appimageTools.wrapType2 rec { homepage = "https://getstation.com"; license = licenses.mit; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ ]; + maintainers = [ ]; mainProgram = "station"; }; } diff --git a/pkgs/applications/networking/stc-cli/default.nix b/pkgs/applications/networking/stc-cli/default.nix index bfc2d1e84d290..3528c48a18d12 100644 --- a/pkgs/applications/networking/stc-cli/default.nix +++ b/pkgs/applications/networking/stc-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "stc"; - version = "1.4"; + version = "1.5"; src = fetchFromGitHub { owner = "tenox7"; repo = pname; rev = version; - sha256 = "sha256-g1zn/CBpLv0oNhp32njeNhhli8aTCECgh92+zn5v+4U="; + sha256 = "sha256-Hv8md27LUB/d1MNqNEw7UX7r3tMYdguuGP3xOI2LWBk="; }; - vendorHash = "sha256-0OsxCGCJT5k5bHXNSIL6QiJXj72bzYCZiI03gvHQuR8="; + vendorHash = "sha256-TnWCviLstm6kS34cNkrVGS9RZ21cVX/jmx8d+KytB0c="; meta = with lib; { description = "Syncthing CLI Tool"; diff --git a/pkgs/applications/networking/sync/backintime/common.nix b/pkgs/applications/networking/sync/backintime/common.nix index 0a1a1d05dde4a..087b415c241fe 100644 --- a/pkgs/applications/networking/sync/backintime/common.nix +++ b/pkgs/applications/networking/sync/backintime/common.nix @@ -7,13 +7,13 @@ let apps = lib.makeBinPath [ openssh python' cron rsync sshfs-fuse encfs ]; in stdenv.mkDerivation rec { pname = "backintime-common"; - version = "1.4.3"; + version = "1.5.2"; src = fetchFromGitHub { owner = "bit-team"; repo = "backintime"; rev = "v${version}"; - sha256 = "sha256-2q2Q4rnxXwVnfH1YEBwY35B2ctG9+qpOIAHqPOjjArg="; + sha256 = "sha256-yfCSTzCmhXDBC1vYqwgVjsYUtc5VO1VW74BmIB0hHfE="; }; nativeBuildInputs = [ makeWrapper gettext ]; @@ -24,12 +24,13 @@ in stdenv.mkDerivation rec { configureFlags = [ "--python=${lib.getExe python'}" ]; preConfigure = '' + patchShebangs --build updateversion.sh cd common substituteInPlace configure \ - --replace "/.." "" \ - --replace "share/backintime" "${python'.sitePackages}/backintime" - substituteInPlace "backintime" \ - --replace "share" "${python'.sitePackages}" + --replace-fail "/.." "" \ + --replace-fail "share/backintime" "${python'.sitePackages}/backintime" + substituteInPlace "backintime" "backintime-askpass" \ + --replace-fail "share" "${python'.sitePackages}" ''; dontAddPrefix = true; @@ -44,10 +45,11 @@ in stdenv.mkDerivation rec { description = "Simple backup tool for Linux"; license = lib.licenses.gpl2; maintainers = with lib.maintainers; [ stephen-huan ]; - platforms = lib.platforms.all; + platforms = lib.platforms.linux; + mainProgram = "backintime"; longDescription = '' Back In Time is a simple backup tool (on top of rsync) for Linux - inspired from “flyback project” and “TimeVault”. The backup is + inspired from "flyback project" and "TimeVault". The backup is done by taking snapshots of a specified set of directories. ''; }; diff --git a/pkgs/applications/networking/sync/backintime/qt.nix b/pkgs/applications/networking/sync/backintime/qt.nix index 1580a51151a2b..136b91a0623cf 100644 --- a/pkgs/applications/networking/sync/backintime/qt.nix +++ b/pkgs/applications/networking/sync/backintime/qt.nix @@ -1,19 +1,25 @@ -{ lib, mkDerivation, backintime-common, python3, polkit, which, su, coreutils, util-linux }: +{ lib, stdenv, backintime-common, python3, polkit, which, su, coreutils, util-linux, +wrapQtAppsHook, qtbase, qtwayland }: let - python' = python3.withPackages (ps: with ps; [ pyqt5 backintime-common packaging ]); + python' = python3.withPackages (ps: with ps; [ pyqt6 backintime-common packaging ]); in -mkDerivation { +stdenv.mkDerivation { inherit (backintime-common) - version src installFlags meta dontAddPrefix nativeBuildInputs; + version src installFlags meta dontAddPrefix; pname = "backintime-qt"; - buildInputs = [ python' backintime-common ]; + buildInputs = [ python' backintime-common qtbase qtwayland ]; + + nativeBuildInputs = backintime-common.nativeBuildInputs or [ ] ++ [ + wrapQtAppsHook + ]; configureFlags = [ "--python=${lib.getExe python'}" ]; preConfigure = '' + patchShebangs --build updateversion.sh cd qt substituteInPlace qttools_path.py \ --replace "__file__, os.pardir, os.pardir" '"${backintime-common}/${python'.sitePackages}/backintime"' @@ -24,23 +30,23 @@ mkDerivation { --prefix PATH : "${lib.getBin backintime-common}/bin:$PATH" substituteInPlace "$out/share/polkit-1/actions/net.launchpad.backintime.policy" \ - --replace "/usr/bin/backintime-qt" "$out/bin/backintime-qt" + --replace-fail "/usr/bin/backintime-qt" "$out/bin/backintime-qt" substituteInPlace "$out/share/applications/backintime-qt-root.desktop" \ - --replace "/usr/bin/backintime-qt" "backintime-qt" + --replace-fail "/usr/bin/backintime-qt" "backintime-qt" substituteInPlace "$out/share/backintime/qt/serviceHelper.py" \ - --replace "'which'" "'${lib.getBin which}/bin/which'" \ - --replace "/bin/su" "${lib.getBin su}/bin/su" \ - --replace "/usr/bin/backintime" "${lib.getBin backintime-common}/bin/backintime" \ - --replace "/usr/bin/nice" "${lib.getBin coreutils}/bin/nice" \ - --replace "/usr/bin/ionice" "${lib.getBin util-linux}/bin/ionice" + --replace-fail "'which'" "'${lib.getExe which}'" \ + --replace-fail "/bin/su" "${lib.getBin su}/bin/su" \ + --replace-fail "/usr/bin/backintime" "${lib.getExe backintime-common}" \ + --replace-fail "/usr/bin/nice" "${lib.getBin coreutils}/bin/nice" \ + --replace-fail "/usr/bin/ionice" "${lib.getBin util-linux}/bin/ionice" substituteInPlace "$out/share/dbus-1/system-services/net.launchpad.backintime.serviceHelper.service" \ - --replace "/usr/share/backintime" "$out/share/backintime" + --replace-fail "/usr/share/backintime" "$out/share/backintime" substituteInPlace "$out/bin/backintime-qt_polkit" \ - --replace "/usr/bin/backintime-qt" "$out/bin/backintime-qt" + --replace-fail "/usr/bin/backintime-qt" "$out/bin/backintime-qt" wrapProgram "$out/bin/backintime-qt_polkit" \ --prefix PATH : "${lib.getBin polkit}/bin:$PATH" diff --git a/pkgs/applications/networking/sync/celeste/default.nix b/pkgs/applications/networking/sync/celeste/default.nix index 7eef4f4510051..b1a946f244f93 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.hostPlatform.isDarwin [ + darwin.apple_sdk.frameworks.Foundation + darwin.apple_sdk.frameworks.Security ]; + env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.hostPlatform.isDarwin [ + "-Wno-error=incompatible-function-pointer-types" + ]); + preFixup = '' gappsWrapperArgs+=( --prefix PATH : "${lib.makeBinPath [ rclone ]}" diff --git a/pkgs/applications/networking/sync/lcsync/default.nix b/pkgs/applications/networking/sync/lcsync/default.nix index 9ba34ab6319c0..a71514516eb97 100644 --- a/pkgs/applications/networking/sync/lcsync/default.nix +++ b/pkgs/applications/networking/sync/lcsync/default.nix @@ -8,14 +8,14 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "lcsync"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitea { domain = "codeberg.org"; owner = "librecast"; repo = "lcsync"; rev = "v${finalAttrs.version}"; - hash = "sha256-eiYbS/LYnM2ZjDHO9KhBp1rrovbhm+OVVfmLtjxAE+Y="; + hash = "sha256-x8KjvUtn00g+zxDfSWZq4WgALDKRgbCF9rtipdOMbpc="; }; buildInputs = [ lcrq librecast libsodium ]; configureFlags = [ "SETCAP_PROGRAM=true" ]; diff --git a/pkgs/applications/networking/sync/lsyncd/default.nix b/pkgs/applications/networking/sync/lsyncd/default.nix index bdb1b69289fed..66fa5665ccaf8 100644 --- a/pkgs/applications/networking/sync/lsyncd/default.nix +++ b/pkgs/applications/networking/sync/lsyncd/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { # Special flags needed on Darwin: # https://github.com/axkibe/lsyncd/blob/42413cabbedca429d55a5378f6e830f191f3cc86/INSTALL#L51 - cmakeFlags = lib.optionals stdenv.isDarwin [ "-DWITH_INOTIFY=OFF" "-DWITH_FSEVENTS=ON" "-DXNU_DIR=${xnu}/include" ]; + cmakeFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "-DWITH_INOTIFY=OFF" "-DWITH_FSEVENTS=ON" "-DXNU_DIR=${xnu}/include" ]; dontUseCmakeBuildDir = true; diff --git a/pkgs/applications/networking/sync/onedrive/default.nix b/pkgs/applications/networking/sync/onedrive/default.nix deleted file mode 100644 index d7dd30b106c8e..0000000000000 --- a/pkgs/applications/networking/sync/onedrive/default.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, autoreconfHook -, ldc -, installShellFiles -, pkg-config -, curl -, sqlite -, libnotify -, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd -, systemd -}: - -stdenv.mkDerivation rec { - pname = "onedrive"; - version = "2.4.25"; - - src = fetchFromGitHub { - owner = "abraunegg"; - repo = pname; - rev = "v${version}"; - hash = "sha256-M6EOJiykmAKWIuAXdm9ebTSX1eVoO+1axgzxlAmuI8U="; - }; - - nativeBuildInputs = [ autoreconfHook ldc installShellFiles pkg-config ]; - - buildInputs = [ - curl - sqlite - libnotify - ] ++ lib.optional withSystemd systemd; - - configureFlags = [ - "--enable-notifications" - ] ++ lib.optionals withSystemd [ - "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system" - "--with-systemduserunitdir=${placeholder "out"}/lib/systemd/user" - ]; - - # we could also pass --enable-completions to configure but we would then have to - # figure out the paths manually and pass those along. - postInstall = '' - installShellCompletion --bash --name ${pname} contrib/completions/complete.bash - installShellCompletion --zsh --name _${pname} contrib/completions/complete.zsh - installShellCompletion --fish --name ${pname} contrib/completions/complete.fish - ''; - - meta = with lib; { - description = "Complete tool to interact with OneDrive on Linux"; - mainProgram = "onedrive"; - homepage = "https://github.com/abraunegg/onedrive"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ srgom peterhoeg bertof ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix index 11e24de45199e..87f7080f2fd44 100644 --- a/pkgs/applications/networking/sync/rclone/default.nix +++ b/pkgs/applications/networking/sync/rclone/default.nix @@ -6,28 +6,34 @@ buildGoModule rec { pname = "rclone"; - version = "1.67.0"; + version = "1.68.1"; + + outputs = [ "out" "man" ]; src = fetchFromGitHub { owner = "rclone"; repo = "rclone"; rev = "v${version}"; - hash = "sha256-rTibyh5z89QuPgZMvv3Y6FCugxMIytAg1gdCxE3+QLE="; + hash = "sha256-qVk1l6PLB2S9KlUiccBN60wbaApZnPXTjq1LYsf7pyE="; }; - vendorHash = "sha256-Sw9zZf0rup+VyncIpJHp9PKUp60lv+TV4wbWtVTTK3w="; + vendorHash = "sha256-vZxdayoKTo/fs5PgEdT4gepNq0kNNmLQhlybWY5kpx0="; subPackages = [ "." ]; - outputs = [ "out" "man" ]; - - buildInputs = lib.optional enableCmount (if stdenv.isDarwin then macfuse-stubs else fuse); nativeBuildInputs = [ installShellFiles makeWrapper ]; + buildInputs = lib.optional enableCmount (if stdenv.hostPlatform.isDarwin then macfuse-stubs else fuse); + tags = lib.optionals enableCmount [ "cmount" ]; ldflags = [ "-s" "-w" "-X github.com/rclone/rclone/fs.Version=${version}" ]; + postConfigure = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' + substituteInPlace vendor/github.com/winfsp/cgofuse/fuse/host_cgo.go \ + --replace-fail '"libfuse.so.2"' '"${lib.getLib fuse}/lib/libfuse.so.2"' + ''; + postInstall = let rcloneBin = @@ -45,13 +51,12 @@ buildGoModule rec { # filesystem helpers ln -s $out/bin/rclone $out/bin/rclonefs ln -s $out/bin/rclone $out/bin/mount.rclone - '' + lib.optionalString (enableCmount && !stdenv.isDarwin) + '' + lib.optionalString (enableCmount && !stdenv.hostPlatform.isDarwin) # use --suffix here to ensure we don't shadow /run/wrappers/bin/fusermount3, # as the setuid wrapper is required as non-root on NixOS. '' wrapProgram $out/bin/rclone \ - --suffix PATH : "${lib.makeBinPath [ fuse3 ] }" \ - --prefix LD_LIBRARY_PATH : "${fuse3}/lib" + --suffix PATH : "${lib.makeBinPath [ fuse3 ] }" ''; passthru.tests = { diff --git a/pkgs/applications/networking/sync/rsync/configure.ac-fix-failing-IPv6-check.patch b/pkgs/applications/networking/sync/rsync/configure.ac-fix-failing-IPv6-check.patch new file mode 100644 index 0000000000000..3305653d025ff --- /dev/null +++ b/pkgs/applications/networking/sync/rsync/configure.ac-fix-failing-IPv6-check.patch @@ -0,0 +1,12 @@ +diff -rup rsync-3.2.7/configure.sh rsync-3.2.7-fixed/configure.sh +--- rsync-3.2.7/configure.sh 2022-10-20 17:57:22 ++++ rsync-3.2.7-fixed/configure.sh 2024-01-01 19:51:58 +@@ -7706,7 +7706,7 @@ else $as_nop + #include <stdlib.h> + #include <sys/types.h> + #include <sys/socket.h> +-main() ++int main() + { + if (socket(AF_INET6, SOCK_STREAM, 0) < 0) + exit(1); diff --git a/pkgs/applications/networking/sync/rsync/default.nix b/pkgs/applications/networking/sync/rsync/default.nix index 555fb68416b8d..32236f36a9b90 100644 --- a/pkgs/applications/networking/sync/rsync/default.nix +++ b/pkgs/applications/networking/sync/rsync/default.nix @@ -31,6 +31,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook perl ]; + patches = [ + # https://github.com/WayneD/rsync/pull/558 + ./configure.ac-fix-failing-IPv6-check.patch + ]; + buildInputs = [ libiconv zlib popt ] ++ lib.optional enableACLs acl ++ lib.optional enableZstd zstd @@ -39,6 +44,10 @@ stdenv.mkDerivation rec { ++ lib.optional enableXXHash xxHash; configureFlags = [ + (lib.enableFeature enableLZ4 "lz4") + (lib.enableFeature enableOpenSSL "openssl") + (lib.enableFeature enableXXHash "xxhash") + (lib.enableFeature enableZstd "zstd") "--with-nobody-group=nogroup" # disable the included zlib explicitly as it otherwise still compiles and @@ -47,14 +56,6 @@ stdenv.mkDerivation rec { ] ++ lib.optionals (stdenv.hostPlatform.isMusl && stdenv.hostPlatform.isx86_64) [ # fix `multiversioning needs 'ifunc' which is not supported on this target` error "--disable-roll-simd" - ] ++ lib.optionals (!enableZstd) [ - "--disable-zstd" - ] ++ lib.optionals (!enableXXHash) [ - "--disable-xxhash" - ] ++ lib.optionals (!enableLZ4) [ - "--disable-lz4" - ] ++ lib.optionals (!enableOpenSSL) [ - "--disable-openssl" ]; enableParallelBuilding = true; diff --git a/pkgs/applications/networking/sync/storj-uplink/default.nix b/pkgs/applications/networking/sync/storj-uplink/default.nix index 5c5625d8dd710..07548fbe66317 100644 --- a/pkgs/applications/networking/sync/storj-uplink/default.nix +++ b/pkgs/applications/networking/sync/storj-uplink/default.nix @@ -5,18 +5,18 @@ buildGoModule rec { pname = "storj-uplink"; - version = "1.105.2"; + version = "1.113.4"; src = fetchFromGitHub { owner = "storj"; repo = "storj"; rev = "v${version}"; - hash = "sha256-uoMjV0ab/H8WXWawWM9CB/mGTh9odrfmKehRz6A9/Xo="; + hash = "sha256-nf2fNnkY6Z0T5dfSRUmqYpstV5yP+dJiZqB/AF3NR94="; }; subPackages = [ "cmd/uplink" ]; - vendorHash = "sha256-HlnnWmjYL/j5RvRKFtEE4ib477erA94aQ+HSF+sCiuA="; + vendorHash = "sha256-NnFCs64xUoFFHFQs/3YtdJkUurd3TxNieZJ96VqnJaU="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/applications/networking/sync/wdt/default.nix b/pkgs/applications/networking/sync/wdt/default.nix index ccf3e05138f70..f07734928bf97 100644 --- a/pkgs/applications/networking/sync/wdt/default.nix +++ b/pkgs/applications/networking/sync/wdt/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation { pname = "wdt"; - version = "1.27.1612021-unstable-2024-05-21"; + version = "1.27.1612021-unstable-2024-08-22"; src = fetchFromGitHub { owner = "facebook"; repo = "wdt"; - rev = "6263fee3bebc8bb0012e095723170f70b99ff67d"; - sha256 = "sha256-CxwRfjPkR7d+Poe+8+TbBGcsK90EwupCyLqUkxUlITs="; + rev = "4cc8a21cfa29e55aa803365ab69248d0bf8fbb82"; + sha256 = "sha256-BEoZ662KsL6gf6hfN9ahgoPtHOFBi9k3gjRuGWs3zOw="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/networking/syncplay/default.nix b/pkgs/applications/networking/syncplay/default.nix index b816da9e4b5cb..f7d0fdeb5c36f 100644 --- a/pkgs/applications/networking/syncplay/default.nix +++ b/pkgs/applications/networking/syncplay/default.nix @@ -28,11 +28,11 @@ buildPythonApplication rec { ./trusted_certificates.patch ]; - buildInputs = lib.optionals enableGUI [ (if stdenv.isLinux then qt6.qtwayland else qt6.qtbase) ]; + buildInputs = lib.optionals enableGUI [ (if stdenv.hostPlatform.isLinux then qt6.qtwayland else qt6.qtbase) ]; propagatedBuildInputs = [ certifi pem twisted ] ++ twisted.optional-dependencies.tls ++ lib.optional enableGUI pyside6 - ++ lib.optional (stdenv.isDarwin && enableGUI) appnope; + ++ lib.optional (stdenv.hostPlatform.isDarwin && enableGUI) appnope; nativeBuildInputs = lib.optionals enableGUI [ qt6.wrapQtAppsHook ]; makeFlags = [ "DESTDIR=" "PREFIX=$(out)" ]; @@ -46,6 +46,6 @@ buildPythonApplication rec { description = "Free software that synchronises media players"; license = licenses.asl20; platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ assistant Enzime ]; + maintainers = with maintainers; [ assistant ]; }; } diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 24427cb8ed3bf..b87752f0412b6 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -13,18 +13,18 @@ let common = { stname, target, postInstall ? "" }: buildGoModule rec { pname = stname; - version = "1.27.8"; + version = "1.27.12"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - hash = "sha256-+uyN/x/nFB/YAOvIqO1IIs3UH+yn/eKMBW1Ap9PvhRM="; + hash = "sha256-/HPq71KkWUE0vG7qUBD3JON4N5KBkuRWc4SvX/JA2nQ="; }; - vendorHash = "sha256-fzNpdriCRr4M3oW8IaImnGEN4G9AQwLZNFHg00zbIs0="; + vendorHash = "sha256-R5GlsCkfoMc5km+NaV+TNUlM3Ot1ARcXfEFimcZOLI4="; - nativeBuildInputs = lib.optionals stdenv.isDarwin [ + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ # Recent versions of macOS seem to require binaries to be signed when # run from Launch Agents/Daemons, even on x86 devices where it has a # more lax code signing policy compared to Apple Silicon. So just sign @@ -61,14 +61,14 @@ let inherit (nixosTests) syncthing syncthing-init syncthing-relay; }; - meta = with lib; { + meta = { homepage = "https://syncthing.net/"; description = "Open Source Continuous File Synchronization"; changelog = "https://github.com/syncthing/syncthing/releases/tag/v${version}"; - license = licenses.mpl20; - maintainers = with maintainers; [ joko peterhoeg ]; + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ joko peterhoeg ]; mainProgram = target; - platforms = platforms.unix; + platforms = lib.platforms.unix; }; }; @@ -87,20 +87,16 @@ in install -Dm644 "$mf" "$mandir/$(basename "$mf")" done - '' + lib.optionalString (stdenv.isLinux) '' + '' + lib.optionalString (stdenv.hostPlatform.isLinux) '' mkdir -p $out/lib/systemd/{system,user} - substitute etc/linux-systemd/system/syncthing-resume.service \ - $out/lib/systemd/system/syncthing-resume.service \ - --replace /usr/bin/pkill ${procps}/bin/pkill - substitute etc/linux-systemd/system/syncthing@.service \ $out/lib/systemd/system/syncthing@.service \ - --replace /usr/bin/syncthing $out/bin/syncthing + --replace-fail /usr/bin/syncthing $out/bin/syncthing substitute etc/linux-systemd/user/syncthing.service \ $out/lib/systemd/user/syncthing.service \ - --replace /usr/bin/syncthing $out/bin/syncthing + --replace-fail /usr/bin/syncthing $out/bin/syncthing ''; }; @@ -113,12 +109,12 @@ in stname = "syncthing-relay"; target = "strelaysrv"; - postInstall = lib.optionalString (stdenv.isLinux) '' + postInstall = lib.optionalString (stdenv.hostPlatform.isLinux) '' mkdir -p $out/lib/systemd/system substitute cmd/strelaysrv/etc/linux-systemd/strelaysrv.service \ $out/lib/systemd/system/strelaysrv.service \ - --replace /usr/bin/strelaysrv $out/bin/strelaysrv + --replace-fail /usr/bin/strelaysrv $out/bin/strelaysrv ''; }; } diff --git a/pkgs/applications/networking/synology-drive-client/default.nix b/pkgs/applications/networking/synology-drive-client/default.nix index d4ab94315bf96..fb930edd14479 100644 --- a/pkgs/applications/networking/synology-drive-client/default.nix +++ b/pkgs/applications/networking/synology-drive-client/default.nix @@ -2,8 +2,8 @@ let pname = "synology-drive-client"; baseUrl = "https://global.synologydownload.com/download/Utility/SynologyDriveClient"; - version = "3.5.0-16084"; - buildNumber = with lib; last (splitString "-" version); + version = "3.5.1-16101"; + buildNumber = lib.last (lib.splitString "-" version); meta = with lib; { description = "Desktop application to synchronize files and folders between the computer and the Synology Drive server"; homepage = "https://www.synology.com/en-global/dsm/feature/drive"; @@ -30,7 +30,7 @@ let src = fetchurl { url = "${baseUrl}/${version}/Ubuntu/Installer/synology-drive-client-${buildNumber}.x86_64.deb"; - sha256 = "sha256-Spl6DC+wf+JaXjwH2ecraySo1VtA+EiI3/TWw9UOSA8="; + sha256 = "sha256-VeS5bPcMM4JDCSH5GXkl4OgQjrPKaNDh5PfX28/zqaU="; }; nativeBuildInputs = [ autoPatchelfHook dpkg ]; @@ -60,7 +60,7 @@ let src = fetchurl { url = "${baseUrl}/${version}/Mac/Installer/synology-drive-client-${buildNumber}.dmg"; - sha256 = "sha256-NDYxUhWtAVUtpCf1WemqShZCFHGgLGwrkX6HldxOlH0="; + sha256 = "sha256-VyhROpQCeVHNxxYgPUZdAlng15aJ1/IYadz30FThlsw="; }; nativeBuildInputs = [ cpio xar undmg ]; @@ -78,4 +78,4 @@ let cp -R 'Synology Drive Client.app' $out/Applications/ ''; }; -in if stdenv.isDarwin then darwin else linux +in if stdenv.hostPlatform.isDarwin then darwin else linux diff --git a/pkgs/applications/networking/termius/default.nix b/pkgs/applications/networking/termius/default.nix index 7e660f4e2ba1b..487b13e557058 100644 --- a/pkgs/applications/networking/termius/default.nix +++ b/pkgs/applications/networking/termius/default.nix @@ -10,11 +10,13 @@ , mesa , udev , wrapGAppsHook3 +, writeScript }: stdenv.mkDerivation rec { pname = "termius"; - version = "8.1.2"; + version = "9.6.1"; + revision = "204"; src = fetchurl { # find the latest version with @@ -23,8 +25,8 @@ stdenv.mkDerivation rec { # curl -H 'X-Ubuntu-Series: 16' https://api.snapcraft.io/api/v1/snaps/details/termius-app | jq '.download_url' -r # and the sha512 with # curl -H 'X-Ubuntu-Series: 16' https://api.snapcraft.io/api/v1/snaps/details/termius-app | jq '.download_sha512' -r - url = "https://api.snapcraft.io/api/v1/snaps/download/WkTBXwoX81rBe3s3OTt3EiiLKBx2QhuS_167.snap"; - hash = "sha512-M/cyLfSnoCFJcdGXlA5/kH/MuyRpYcfBoyp6y6KSsTyh8Goq6niGZAQcCdIjNX8KVUvmcTWISsx8so4W5BrkCw=="; + url = "https://api.snapcraft.io/api/v1/snaps/download/WkTBXwoX81rBe3s3OTt3EiiLKBx2QhuS_${revision}.snap"; + hash = "sha512-ok3B/h+d0Q7k5i+IjgGB+4S5g2kzrQT/b4dYz4k07OnyfjJRgJ4X4f7BFFrwKLd+IbIC5OIibrvivWnkSWU3Ew=="; }; desktopItem = makeDesktopItem { @@ -63,7 +65,7 @@ stdenv.mkDerivation rec { mkdir -p $out/opt/termius cp -r ./ $out/opt/termius - mkdir -p "$out/share/applications" "$out/share/pixmaps/termius-app.png" + mkdir -p "$out/share/applications" "$out/share/pixmaps" cp "${desktopItem}/share/applications/"* "$out/share/applications" cp meta/gui/icon.png $out/share/pixmaps/termius-app.png @@ -77,6 +79,28 @@ stdenv.mkDerivation rec { "''${gappsWrapperArgs[@]}" ''; + passthru.updateScript = writeScript "update-termius" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p common-updater-scripts curl jq + + set -eu -o pipefail + + data=$(curl -H 'X-Ubuntu-Series: 16' \ + 'https://api.snapcraft.io/api/v1/snaps/details/termius-app?fields=download_sha512,revision,version') + + version=$(jq -r .version <<<"$data") + + if [[ "x$UPDATE_NIX_OLD_VERSION" != "x$version" ]]; then + + revision=$(jq -r .revision <<<"$data") + hash=$(nix hash to-sri "sha512:$(jq -r .download_sha512 <<<"$data")") + + update-source-version "$UPDATE_NIX_ATTR_PATH" "$version" "$hash" + update-source-version --ignore-same-hash --version-key=revision "$UPDATE_NIX_ATTR_PATH" "$revision" "$hash" + + fi + ''; + meta = with lib; { description = "Cross-platform SSH client with cloud data sync and more"; homepage = "https://termius.com/"; diff --git a/pkgs/applications/networking/tmpmail/default.nix b/pkgs/applications/networking/tmpmail/default.nix index b55db4e64af27..55a42eebebd27 100644 --- a/pkgs/applications/networking/tmpmail/default.nix +++ b/pkgs/applications/networking/tmpmail/default.nix @@ -26,7 +26,7 @@ stdenvNoCC.mkDerivation rec { meta = with lib; { homepage = "https://github.com/sdushantha/tmpmail"; - description = "Temporary email right from your terminal written in POSIX sh "; + description = "Temporary email right from your terminal written in POSIX sh"; license = licenses.mit; maintainers = [ maintainers.lom ]; mainProgram = "tmpmail"; diff --git a/pkgs/applications/networking/trayscale/default.nix b/pkgs/applications/networking/trayscale/default.nix index d6f2f2ef04476..7e8648c3bb0e3 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.13.1"; src = fetchFromGitHub { owner = "DeedleFake"; repo = "trayscale"; rev = "v${version}"; - hash = "sha256-quy1maeC1ebVzMvN+JzKf8AmMbipju9vvdTU03SyNnc="; + hash = "sha256-uOPTF6AD70POD1y0R5aXo7t9WtyFGbRrgL8U++nTRl0="; }; - vendorHash = "sha256-lGjJLqEGBFd2aYm82xrDfLK90Mcrhb7bMtXSNZpp/bM="; + vendorHash = "sha256-8lrszfxTKLA3KRuuQ312s+1GfK63DwQEK8xDwb1JdrI="; 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 = [ ]; mainProgram = "trayscale"; platforms = platforms.linux; }; diff --git a/pkgs/applications/networking/twingate/default.nix b/pkgs/applications/networking/twingate/default.nix index 9537ab4c17846..dfab962499f95 100644 --- a/pkgs/applications/networking/twingate/default.nix +++ b/pkgs/applications/networking/twingate/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "twingate"; - version = "2024.98.119300"; + version = "2024.263.131851"; src = fetchurl { url = "https://binaries.twingate.com/client/linux/DEB/x86_64/${version}/twingate-amd64.deb"; - hash = "sha256-N0cabYHaF5H1EeriQRQL7bN5UM85oOGrm9pxGr1AlEk="; + hash = "sha256-8rmTGCHROdq+g+IsuZUMbhXfQEKfiy0riSXjLZ2yDhA="; }; buildInputs = [ diff --git a/pkgs/applications/networking/umurmur/default.nix b/pkgs/applications/networking/umurmur/default.nix index 5af5c568e4636..5f87a73954629 100644 --- a/pkgs/applications/networking/umurmur/default.nix +++ b/pkgs/applications/networking/umurmur/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/umurmur/umurmur"; platforms = platforms.all; # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin && stdenv.isAarch64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; mainProgram = "umurmurd"; }; } diff --git a/pkgs/applications/networking/warp/default.nix b/pkgs/applications/networking/warp/default.nix index 0861e72906db7..c41cc99df4b43 100644 --- a/pkgs/applications/networking/warp/default.nix +++ b/pkgs/applications/networking/warp/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitLab +, fetchpatch2 , appstream-glib , cargo , desktop-file-utils @@ -33,14 +34,23 @@ stdenv.mkDerivation rec { hash = "sha256-GRxZ3y1PdJpBDnGCfmOmZgN8n1aaYf9IhyszRwo3MjQ="; }; + patches = [ + # https://gitlab.gnome.org/World/warp/-/merge_requests/74 + (fetchpatch2 { + name = "rust-1.80-compat.patch"; + url = "https://gitlab.gnome.org/World/warp/-/commit/38747cc2dde79089df53fd8451ea2db13f9f3714.patch"; + hash = "sha256-9P5LwCHaC6J5WR2OnjCaNE+4de/Jv6XGXS7bOfYrM7w="; + }) + ]; + postPatch = '' patchShebangs build-aux ''; cargoDeps = rustPlatform.fetchCargoTarball { - inherit src; + inherit src patches; name = "${pname}-${version}"; - hash = "sha256-v/MhVcQmMYD/n/8wmPCYUy4YpXhL0v4fq8h6cllo/pw="; + hash = "sha256-xF9AzcO2uawHu7XZay7Wwr2r+OVLbXhfSynnBYbVkZM="; }; nativeBuildInputs = [ @@ -66,7 +76,7 @@ stdenv.mkDerivation rec { gstreamer gst-plugins-base gst-plugins-bad - ]) ++ lib.optionals stdenv.isDarwin [ + ]) ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security Foundation ]; @@ -78,6 +88,6 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ dotlambda foo-dogsquared ]; platforms = lib.platforms.all; mainProgram = "warp"; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/applications/networking/weather/meteo/default.nix b/pkgs/applications/networking/weather/meteo/default.nix index 9914f664d0b02..92ccc8f46ed20 100644 --- a/pkgs/applications/networking/weather/meteo/default.nix +++ b/pkgs/applications/networking/weather/meteo/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { owner = "bitseater"; repo = pname; rev = version; - sha256 = "sha256-hubKusrs0Hh8RryoEI29pnhTSNsIbtGMltlH4qoM6gE="; + hash = "sha256-hubKusrs0Hh8RryoEI29pnhTSNsIbtGMltlH4qoM6gE="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/wg-bond/default.nix b/pkgs/applications/networking/wg-bond/default.nix index f3dec5e6ab07e..88e30976b307e 100644 --- a/pkgs/applications/networking/wg-bond/default.nix +++ b/pkgs/applications/networking/wg-bond/default.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, rustPlatform, fetchFromGitLab, wireguard-tools, makeWrapper }: +{ lib, rustPlatform, fetchFromGitLab, wireguard-tools, makeWrapper }: rustPlatform.buildRustPackage rec { pname = "wg-bond"; version = "0.2.0"; @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec { hash = "sha256:04k0maxy39k7qzcsqsv1byddsmjszmnyjffrf22nzbvml83p3l0y"; }; - cargoSha256 = "1nlzhkhk1y0jhj6n3wn4dm783ldsxn7dk0d2xjx6ylczf9z3gp12"; + cargoHash = "sha256-Itw3fnKfUW+67KKB2Y7tutGBTm3E8mGNhBL4MOGEn9o="; nativeBuildInputs = [ makeWrapper ]; postInstall = '' diff --git a/pkgs/applications/networking/xpipe/default.nix b/pkgs/applications/networking/xpipe/default.nix index b5d181dc73a47..58d818bbe2c51 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-l7uu101UcY5AGMh6BzMvXvPMw1tlaX6grus9eL9Kxf8="; }.${system} or throwSystem; displayname = "XPipe"; in stdenvNoCC.mkDerivation rec { pname = "xpipe"; - version = "9.4.1"; + version = "11.3"; src = fetchzip { url = "https://github.com/xpipe-io/xpipe/releases/download/${version}/xpipe-portable-linux-${arch}.tar.gz"; diff --git a/pkgs/applications/networking/yaup/default.nix b/pkgs/applications/networking/yaup/default.nix index f3854cecd6a8e..d2fa2778fc875 100644 --- a/pkgs/applications/networking/yaup/default.nix +++ b/pkgs/applications/networking/yaup/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch2 , intltool , pkg-config , wrapGAppsHook3 @@ -19,6 +20,15 @@ stdenv.mkDerivation { hash = "sha256-RWnNjpgXRYncz9ID8zirENffy1UsfHD1H6Mmd8DKN4k="; }; + patches = [ + # Fix build with miniupnpc 2.2.8 + # https://github.com/Holarse-Linuxgaming/yaup/pull/6 + (fetchpatch2 { + url = "https://github.com/Holarse-Linuxgaming/yaup/commit/c92134e305932785a60bd72131388f507b4d1853.patch?full_index=1"; + hash = "sha256-Exqkfp9VYIf9JpAc10cO8NuEAWvI5Houi7CLXV5zBDY="; + }) + ]; + nativeBuildInputs = [ intltool pkg-config @@ -42,7 +52,7 @@ stdenv.mkDerivation { maintainers = with maintainers; [ fgaz ]; platforms = platforms.all; # ld: unknown option: --export-dynamic - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; mainProgram = "yaup"; }; } 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/networking/znc/modules.nix b/pkgs/applications/networking/znc/modules.nix index 7478461947299..f19573bace985 100644 --- a/pkgs/applications/networking/znc/modules.nix +++ b/pkgs/applications/networking/znc/modules.nix @@ -77,7 +77,7 @@ in description = "ZNC clientaway module"; homepage = "https://github.com/kylef/znc-contrib"; license = licenses.gpl2; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; }; @@ -117,7 +117,7 @@ in description = "ZNC ignore module"; homepage = "https://github.com/kylef/znc-contrib"; license = licenses.gpl2; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; }; diff --git a/pkgs/applications/office/PageEdit/default.nix b/pkgs/applications/office/PageEdit/default.nix index 5f47ca9bbe68b..fa7acd9310ba5 100644 --- a/pkgs/applications/office/PageEdit/default.nix +++ b/pkgs/applications/office/PageEdit/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DINSTALL_BUNDLED_DICTS=0" ]; installPhase = - if stdenv.isDarwin then '' + if stdenv.hostPlatform.isDarwin then '' runHook preInstall mkdir -p $out/Applications diff --git a/pkgs/applications/office/appflowy/default.nix b/pkgs/applications/office/appflowy/default.nix index 8db8b3fbb7919..0790cb44d1f33 100644 --- a/pkgs/applications/office/appflowy/default.nix +++ b/pkgs/applications/office/appflowy/default.nix @@ -1,31 +1,47 @@ -{ stdenv -, lib -, fetchzip -, autoPatchelfHook -, makeWrapper -, copyDesktopItems -, makeDesktopItem -, gtk3 -, xdg-user-dirs -, keybinder3 -, libnotify +{ + stdenvNoCC, + lib, + fetchzip, + autoPatchelfHook, + makeWrapper, + copyDesktopItems, + makeDesktopItem, + gtk3, + xdg-user-dirs, + keybinder3, + libnotify, }: -stdenv.mkDerivation rec { +let + dist = + rec { + x86_64-linux = { + urlSuffix = "linux-x86_64.tar.gz"; + hash = "sha256-sQ3dxwPWHLUoWgnR9+oHaFoDzXxtwKRiBvz2wkFB01g="; + }; + x86_64-darwin = { + urlSuffix = "macos-universal.zip"; + hash = "sha256-4bU/qecZBrTr34SZAjDDgwpXAAHDITz6lV6mJGjElko="; + }; + aarch64-darwin = x86_64-darwin; + } + ."${stdenvNoCC.hostPlatform.system}" + or (throw "appflowy: No source for system: ${stdenvNoCC.hostPlatform.system}"); +in +stdenvNoCC.mkDerivation (finalAttrs: { pname = "appflowy"; - version = "0.5.7"; + version = "0.6.8"; src = fetchzip { - url = "https://github.com/AppFlowy-IO/appflowy/releases/download/${version}/AppFlowy-${version}-linux-x86_64.tar.gz"; - hash = "sha256-SVtAx/yllHugBys506pT/5n6IDEZvPEeCHRjFHLMZ0A="; + url = "https://github.com/AppFlowy-IO/appflowy/releases/download/${finalAttrs.version}/AppFlowy-${finalAttrs.version}-${dist.urlSuffix}"; + inherit (dist) hash; stripRoot = false; }; nativeBuildInputs = [ - autoPatchelfHook makeWrapper copyDesktopItems - ]; + ] ++ lib.optionals stdenvNoCC.hostPlatform.isLinux [ autoPatchelfHook ]; buildInputs = [ gtk3 @@ -36,35 +52,47 @@ stdenv.mkDerivation rec { dontBuild = true; dontConfigure = true; - installPhase = '' - runHook preInstall + installPhase = + lib.optionalString stdenvNoCC.hostPlatform.isLinux '' + runHook preInstall + + cd AppFlowy/ + + mkdir -p $out/{bin,opt} - cd AppFlowy/ + # Copy archive contents to the outpout directory + cp -r ./* $out/opt/ - mkdir -p $out/opt/ - mkdir -p $out/bin/ + # Copy icon + install -Dm444 data/flutter_assets/assets/images/flowy_logo.svg $out/share/icons/hicolor/scalable/apps/appflowy.svg - # Copy archive contents to the outpout directory - cp -r ./* $out/opt/ + runHook postInstall + '' + + lib.optionalString stdenvNoCC.hostPlatform.isDarwin '' + runHook preInstall - # Copy icon - install -Dm444 data/flutter_assets/assets/images/flowy_logo.svg $out/share/icons/hicolor/scalable/apps/appflowy.svg + mkdir -p $out/{Applications,bin} + cp -r ./AppFlowy.app $out/Applications/ - runHook postInstall - ''; + runHook postInstall + ''; - preFixup = '' - # Add missing libraries to appflowy using the ones it comes with - makeWrapper $out/opt/AppFlowy $out/bin/appflowy \ - --set LD_LIBRARY_PATH "$out/opt/lib/" \ - --prefix PATH : "${lib.makeBinPath [ xdg-user-dirs ]}" - ''; + preFixup = + lib.optionalString stdenvNoCC.hostPlatform.isLinux '' + # Add missing libraries to appflowy using the ones it comes with + makeWrapper $out/opt/AppFlowy $out/bin/appflowy \ + --set LD_LIBRARY_PATH "$out/opt/lib/" \ + --prefix PATH : "${lib.makeBinPath [ xdg-user-dirs ]}" + '' + + lib.optionalString stdenvNoCC.hostPlatform.isDarwin '' + makeWrapper $out/Applications/AppFlowy.app/Contents/MacOS/AppFlowy $out/bin/appflowy + ''; - desktopItems = [ + desktopItems = lib.optionals stdenvNoCC.hostPlatform.isLinux [ (makeDesktopItem { - name = pname; + name = "appflowy"; desktopName = "AppFlowy"; - comment = meta.description; + comment = finalAttrs.meta.description; exec = "appflowy"; icon = "appflowy"; categories = [ "Office" ]; @@ -76,9 +104,9 @@ stdenv.mkDerivation rec { homepage = "https://www.appflowy.io/"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.agpl3Only; - changelog = "https://github.com/AppFlowy-IO/appflowy/releases/tag/${version}"; + changelog = "https://github.com/AppFlowy-IO/appflowy/releases/tag/${finalAttrs.version}"; maintainers = with maintainers; [ darkonion0 ]; - platforms = [ "x86_64-linux" ]; + platforms = [ "x86_64-linux" ] ++ platforms.darwin; mainProgram = "appflowy"; }; -} +}) 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/banana-accounting/default.nix b/pkgs/applications/office/banana-accounting/default.nix index a0213e05f60ce..8afc96eaf88ca 100644 --- a/pkgs/applications/office/banana-accounting/default.nix +++ b/pkgs/applications/office/banana-accounting/default.nix @@ -1,6 +1,5 @@ { autoPatchelfHook , cairo -, config , e2fsprogs , fetchurl , gmp diff --git a/pkgs/applications/office/beamerpresenter/default.nix b/pkgs/applications/office/beamerpresenter/default.nix index 65fe907c27668..0d122cfbf3cd9 100644 --- a/pkgs/applications/office/beamerpresenter/default.nix +++ b/pkgs/applications/office/beamerpresenter/default.nix @@ -28,13 +28,13 @@ stdenv.mkDerivation rec { pname = "beamerpresenter"; - version = "0.2.4"; + version = "0.2.5"; src = fetchFromGitHub { owner = "stiglers-eponym"; repo = "BeamerPresenter"; rev = "v${version}"; - hash = "sha256-UQbyzkFjrIDPcrE6yGuOWsXNjz8jWyJEWiQwHmf91/8="; + hash = "sha256-ofS0KMsn0KG8squIvMPxSCgE/qNK+Kd47psNziLBBoo="; }; nativeBuildInputs = [ @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { qtsvg qtmultimedia qttools - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ qtwayland ] ++ lib.optionals useMupdf [ freetype 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/calligra/default.nix b/pkgs/applications/office/calligra/default.nix deleted file mode 100644 index 611336b8a908e..0000000000000 --- a/pkgs/applications/office/calligra/default.nix +++ /dev/null @@ -1,93 +0,0 @@ -{ mkDerivation, lib, fetchpatch, fetchurl, extra-cmake-modules, kdoctools -, boost, qtwebkit, qtx11extras, shared-mime-info -, breeze-icons, kactivities, karchive, kcodecs, kcompletion, kconfig, kconfigwidgets -, kcoreaddons, kdbusaddons, kdiagram, kguiaddons, khtml, ki18n -, kiconthemes, kitemviews, kjobwidgets, kcmutils, kdelibs4support, kio, kross -, knotifications, knotifyconfig, kparts, ktextwidgets, kwallet, kwidgetsaddons -, kwindowsystem, kxmlgui, sonnet, threadweaver -, kcontacts, akonadi, akonadi-calendar, akonadi-contacts -, eigen, git, gsl, ilmbase, kproperty, kreport, lcms2, marble, pcre, libgit2, libodfgen -, librevenge, libvisio, libwpd, libwpg, libwps, okular, openexr, openjpeg, phonon -, poppler, pstoedit, qca-qt5, vc, fontconfig -# TODO: package Spnav, m2mml LibEtonyek, Libqgit2 -}: - -mkDerivation rec { - pname = "calligra"; - version = "3.2.1"; - - src = fetchurl { - url = "mirror://kde/stable/${pname}/${version}/${pname}-${version}.tar.xz"; - sha256 = "0iqi6z6gkck2afgy200dacgcspq7i7887alcj0pklm08hbmsdy5i"; - }; - - patches = [ - # Fix fontconfig underlinking: https://github.com/NixOS/nixpkgs/issues/137794 - # Can be dropped on next release. - (fetchpatch { - name = "fix-fontconfig-linking.patch"; - url = "https://github.com/KDE/calligra/commit/62f510702ef9c34ac50f8d8601a4290ab558464c.patch"; - sha256 = "11dzrp9q05dmvnwp4vk4ihcibqcf4xyr0ijscpi716cyy730flma"; - excludes = [ "CMakeLists.txt" ]; - }) - # Fixes for building calligra with gcc11/c++17 - (fetchpatch { - name = "build_c++17_poppler.patch"; - url = "https://github.com/archlinux/svntogit-packages/raw/bbbe35f97eb1033798f1cf95d427890168598199/trunk/068cd9ae.patch"; - sha256 = "sha256-d9/ILwSeW+ov11DF191hzIaUafO/rjQrAeONwqDSKbA="; - }) - # Fixes for building calligra with modern poppler[-qt5] - (fetchpatch { - name = "calligra-poppler-22.03.patch"; - url = "https://invent.kde.org/office/calligra/-/commit/236bacbe13739414e919de868283b0caf2df5d8a.patch"; - sha256 = "sha256-9DmKPCvEFy2Cs3g7350iOCF5Vrx1HL+/8jr+Tb44CyE="; - }) - (fetchpatch { - name = "calligra-poppler-22.04.patch"; - url = "https://invent.kde.org/office/calligra/-/commit/6b75bec784c9835c78993349845d8c2ef22ec3de.patch"; - sha256 = "sha256-z9/4he4x0WN2K/ZGrDAAtHF/W5X1PAtpeO6s7fgL/fA="; - }) - ]; - postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace 'CMAKE_CXX_STANDARD 11' 'CMAKE_CXX_STANDARD 17' - ''; - - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - - buildInputs = [ - boost qtwebkit qtx11extras shared-mime-info - kactivities karchive kcodecs kcompletion kconfig kconfigwidgets kcoreaddons - kdbusaddons kdiagram kguiaddons khtml ki18n kiconthemes kitemviews - kjobwidgets kcmutils kdelibs4support kio kross knotifications knotifyconfig kparts - ktextwidgets kwallet kwidgetsaddons kwindowsystem kxmlgui sonnet threadweaver - kcontacts akonadi akonadi-calendar akonadi-contacts - eigen git gsl ilmbase kproperty kreport lcms2 marble pcre libgit2 libodfgen librevenge - libvisio libwpd libwpg libwps okular openexr openjpeg phonon poppler qca-qt5 vc - fontconfig - ]; - - propagatedUserEnvPkgs = [ kproperty ]; - - env.NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR"; - - qtWrapperArgs = [ - "--prefix PATH : ${lib.getBin pstoedit}/bin" - "--prefix XDG_DATA_DIRS : ${breeze-icons}/share" - ]; - - meta = with lib; { - description = "Suite of productivity applications"; - longDescription = '' - Calligra Suite is a set of applications written to help - you to accomplish your work. Calligra includes efficient - and capable office components: Words for text processing, - Sheets for computations, Plan for planning, and Karbon for - vector graphics. - ''; - homepage = "https://www.calligra.org/"; - maintainers = with maintainers; [ ebzzry zraexy ]; - platforms = platforms.linux; - license = with licenses; [ gpl2 lgpl2 ]; - }; -} diff --git a/pkgs/applications/office/cutemarked-ng/default.nix b/pkgs/applications/office/cutemarked-ng/default.nix index cd564199b0169..2c55edb037aaf 100644 --- a/pkgs/applications/office/cutemarked-ng/default.nix +++ b/pkgs/applications/office/cutemarked-ng/default.nix @@ -4,7 +4,6 @@ , qmake , pkg-config , qttools -, qtbase , qtwebengine , wrapQtAppsHook , qmarkdowntextedit diff --git a/pkgs/applications/office/documenso/default.nix b/pkgs/applications/office/documenso/default.nix index cca2c86c55844..00ef8c0e7bbea 100644 --- a/pkgs/applications/office/documenso/default.nix +++ b/pkgs/applications/office/documenso/default.nix @@ -1,7 +1,7 @@ { lib , fetchFromGitHub , buildNpmPackage -, nodePackages +, prisma , nix-update-script }: let @@ -18,12 +18,14 @@ buildNpmPackage { hash = "sha256-uKOJVZ0GRHo/CYvd/Ix/tq1WDhutRji1tSGdcITsNlo="; }; + nativeBuildInputs = [ prisma ]; + preBuild = '' # somehow for linux, npm is not finding the prisma package with the # packages installed with the lockfile. # This generates a prisma version incompatibility warning and is a kludge # until the upstream package-lock is modified. - ${nodePackages.prisma}/bin/prisma generate + prisma generate ''; npmDepsHash = "sha256-+JbvFMi8xoyxkuL9k96K1Vq0neciCGkkyZUPd15ES2E="; 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/espanso/default.nix b/pkgs/applications/office/espanso/default.nix index c8883f36339e4..5679c44ca2dc7 100644 --- a/pkgs/applications/office/espanso/default.nix +++ b/pkgs/applications/office/espanso/default.nix @@ -30,14 +30,14 @@ , WebKit , System , waylandSupport ? false -, x11Support ? stdenv.isLinux +, x11Support ? stdenv.hostPlatform.isLinux , testers , espanso }: # espanso does not support building with both X11 and Wayland support at the same time -assert stdenv.isLinux -> x11Support != waylandSupport; -assert stdenv.isDarwin -> !x11Support; -assert stdenv.isDarwin -> !waylandSupport; +assert stdenv.hostPlatform.isLinux -> x11Support != waylandSupport; +assert stdenv.hostPlatform.isDarwin -> !x11Support; +assert stdenv.hostPlatform.isDarwin -> !waylandSupport; rustPlatform.buildRustPackage rec { pname = "espanso"; version = "2.2-unstable-2024-05-14"; @@ -69,20 +69,20 @@ rustPlatform.buildRustPackage rec { "modulo" ] ++ lib.optionals waylandSupport [ "wayland" - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "vendored-tls" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "native-tls" ]; buildInputs = [ wxGTK32 - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ openssl dbus libnotify libxkbcommon - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit Cocoa Foundation @@ -104,7 +104,7 @@ rustPlatform.buildRustPackage rec { xdotool ]; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace scripts/create_bundle.sh \ --replace-fail target/mac/ $out/Applications/ \ --replace-fail /bin/echo ${coreutils}/bin/echo @@ -119,12 +119,12 @@ rustPlatform.buildRustPackage rec { doCheck = false; postInstall = - if stdenv.isDarwin then '' + if stdenv.hostPlatform.isDarwin then '' EXEC_PATH=$out/bin/espanso BUILD_ARCH=current ${stdenv.shell} ./scripts/create_bundle.sh '' else '' wrapProgram $out/bin/espanso \ --prefix PATH : ${lib.makeBinPath ( - lib.optionals stdenv.isLinux [ + lib.optionals stdenv.hostPlatform.isLinux [ libnotify setxkbmap ] ++ lib.optionals waylandSupport [ diff --git a/pkgs/applications/office/fava/default.nix b/pkgs/applications/office/fava/default.nix deleted file mode 100644 index d00600bbea592..0000000000000 --- a/pkgs/applications/office/fava/default.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ lib, python3, fetchPypi }: - -python3.pkgs.buildPythonApplication rec { - pname = "fava"; - version = "1.27.3"; - format = "pyproject"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-GsnXZaazEiOhyjbIinHRD1fdoqlAp3d5csrmtydxmGM="; - }; - - nativeBuildInputs = with python3.pkgs; [ setuptools-scm ]; - - propagatedBuildInputs = with python3.pkgs; [ - babel - beancount - cheroot - click - flask - flask-babel - jaraco-functools - jinja2 - markdown2 - ply - simplejson - werkzeug - ]; - - nativeCheckInputs = with python3.pkgs; [ - pytestCheckHook - ]; - - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'setuptools_scm>=8.0' 'setuptools_scm' - ''; - - preCheck = '' - export HOME=$TEMPDIR - ''; - - disabledTests = [ - # runs fava in debug mode, which tries to interpret bash wrapper as Python - "test_cli" - ]; - - meta = with lib; { - description = "Web interface for beancount"; - mainProgram = "fava"; - homepage = "https://beancount.github.io/fava"; - changelog = "https://beancount.github.io/fava/changelog.html"; - license = licenses.mit; - maintainers = with maintainers; [ bhipple ]; - }; -} diff --git a/pkgs/applications/office/gnote/default.nix b/pkgs/applications/office/gnote/default.nix index 6a77eb0534a66..935645a05f2dc 100644 --- a/pkgs/applications/office/gnote/default.nix +++ b/pkgs/applications/office/gnote/default.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { pname = "gnote"; - version = "46.0"; + version = "47.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-ht9YoVlbIVN0aRq0S/wWE7Sf28p3CEI6PVZY3NOgFe0="; + hash = "sha256-vrNcreIMYOQxVRbyCsfr7p37wrgPAHy+2LxaUlIuRC4="; }; buildInputs = [ diff --git a/pkgs/applications/office/gnucash/0001-disable-date-and-time-tests.patch b/pkgs/applications/office/gnucash/0001-disable-date-and-time-tests.patch deleted file mode 100644 index c20342564430a..0000000000000 --- a/pkgs/applications/office/gnucash/0001-disable-date-and-time-tests.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff --git a/libgnucash/engine/test/CMakeLists.txt b/libgnucash/engine/test/CMakeLists.txt -index 8e44172ff..c7289e4fd 100644 ---- a/libgnucash/engine/test/CMakeLists.txt -+++ b/libgnucash/engine/test/CMakeLists.txt -@@ -167,22 +167,22 @@ set(test_gnc_numeric_SOURCES - gnc_add_test(test-gnc-numeric "${test_gnc_numeric_SOURCES}" - gtest_engine_INCLUDES gtest_qof_LIBS) - --set(test_gnc_timezone_SOURCES -- ${MODULEPATH}/gnc-timezone.cpp -- gtest-gnc-timezone.cpp) --gnc_add_test(test-gnc-timezone "${test_gnc_timezone_SOURCES}" -- gtest_engine_INCLUDES gtest_old_engine_LIBS) -- --set(test_gnc_datetime_SOURCES -- ${MODULEPATH}/gnc-datetime.cpp -- ${MODULEPATH}/gnc-timezone.cpp -- ${MODULEPATH}/gnc-date.cpp -- ${MODULEPATH}/qoflog.cpp -- ${CMAKE_SOURCE_DIR}/libgnucash/core-utils/gnc-locale-utils.cpp -- ${gtest_engine_win32_SOURCES} -- gtest-gnc-datetime.cpp) --gnc_add_test(test-gnc-datetime "${test_gnc_datetime_SOURCES}" -- gtest_engine_INCLUDES gtest_qof_LIBS) -+#set(test_gnc_timezone_SOURCES -+# ${MODULEPATH}/gnc-timezone.cpp -+# gtest-gnc-timezone.cpp) -+#gnc_add_test(test-gnc-timezone "${test_gnc_timezone_SOURCES}" -+# gtest_engine_INCLUDES gtest_old_engine_LIBS) -+ -+#set(test_gnc_datetime_SOURCES -+# ${MODULEPATH}/gnc-datetime.cpp -+# ${MODULEPATH}/gnc-timezone.cpp -+# ${MODULEPATH}/gnc-date.cpp -+# ${MODULEPATH}/qoflog.cpp -+# ${CMAKE_SOURCE_DIR}/libgnucash/core-utils/gnc-locale-utils.cpp -+# ${gtest_engine_win32_SOURCES} -+# gtest-gnc-datetime.cpp) -+#gnc_add_test(test-gnc-datetime "${test_gnc_datetime_SOURCES}" -+# gtest_engine_INCLUDES gtest_qof_LIBS) - - set(test_import_map_SOURCES - gtest-import-map.cpp) diff --git a/pkgs/applications/office/gnucash/0002-disable-gnc-fq-update.patch b/pkgs/applications/office/gnucash/0002-disable-gnc-fq-update.patch deleted file mode 100644 index 25170b87129f9..0000000000000 --- a/pkgs/applications/office/gnucash/0002-disable-gnc-fq-update.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/libgnucash/quotes/CMakeLists.txt b/libgnucash/quotes/CMakeLists.txt -index 7e42016629..7211663408 100644 ---- a/libgnucash/quotes/CMakeLists.txt -+++ b/libgnucash/quotes/CMakeLists.txt -@@ -1,6 +1,6 @@ - - set(_BIN_FILES "") --foreach(file gnc-fq-update.in finance-quote-wrapper.in) -+foreach(file finance-quote-wrapper.in) - string(REPLACE ".in" "" _OUTPUT_FILE_NAME ${file}) - set(_ABS_OUTPUT_FILE ${BINDIR_BUILD}/${_OUTPUT_FILE_NAME}) - configure_file( ${file} ${_ABS_OUTPUT_FILE} @ONLY) -@@ -26,4 +26,4 @@ add_custom_target(quotes-bin ALL DEPENDS ${_BIN_FILES}) - install(FILES ${_MAN_FILES} DESTINATION ${CMAKE_INSTALL_MANDIR}/man1) - install(PROGRAMS ${_BIN_FILES} DESTINATION ${CMAKE_INSTALL_BINDIR}) - --set_dist_list(quotes_DIST CMakeLists.txt gnc-fq-update.in finance-quote-wrapper.in README) -+set_dist_list(quotes_DIST CMakeLists.txt finance-quote-wrapper.in README) diff --git a/pkgs/applications/office/gnucash/0003-remove-valgrind.patch b/pkgs/applications/office/gnucash/0003-remove-valgrind.patch deleted file mode 100644 index 329b87985383a..0000000000000 --- a/pkgs/applications/office/gnucash/0003-remove-valgrind.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git a/gnucash/CMakeLists.txt b/gnucash/CMakeLists.txt -index 95ff42cd8f..1c1944a811 100644 ---- a/gnucash/CMakeLists.txt -+++ b/gnucash/CMakeLists.txt -@@ -169,13 +169,6 @@ set(GNUCASH_BIN_INSTALL_NAME "gnucash") - - set(VALGRIND_OUTDIR ${BINDIR_BUILD}) - --configure_file(gnucash-valgrind.in ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/gnucash-valgrind @ONLY) -- --file(COPY ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/gnucash-valgrind -- DESTINATION ${VALGRIND_OUTDIR} -- FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE --) -- - ## Create the environment file - - file(STRINGS ${CMAKE_CURRENT_SOURCE_DIR}/environment.in ENV_STRINGS_IN) -@@ -259,14 +252,13 @@ file(COPY ${ENV_FILE_OUT} - FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE - ) - --install(FILES ${SCRIPT_LIST} ${VALGRIND_OUTDIR}/gnucash-valgrind DESTINATION ${CMAKE_INSTALL_BINDIR}) - install(FILES ${ENVIRONMENT_FILE_DIR}/environment DESTINATION - ${CMAKE_INSTALL_FULL_SYSCONFDIR}/gnucash) - - - set_local_dist(gnucash_DIST_local CMakeLists.txt environment.in generate-gnc-script - gnucash.cpp gnucash-commands.cpp gnucash-cli.cpp gnucash-core-app.cpp -- gnucash-locale-macos.mm gnucash-locale-windows.c gnucash.rc.in gnucash-valgrind.in -+ gnucash-locale-macos.mm gnucash-locale-windows.c gnucash.rc.in - ${gnucash_GRESOURCES} - ${gnucash_noinst_HEADERS} ${gnucash_EXTRA_DIST}) - diff --git a/pkgs/applications/office/gnucash/0004-exec-fq-wrapper.patch b/pkgs/applications/office/gnucash/0004-exec-fq-wrapper.patch deleted file mode 100644 index 8b00b275e59cd..0000000000000 --- a/pkgs/applications/office/gnucash/0004-exec-fq-wrapper.patch +++ /dev/null @@ -1,52 +0,0 @@ ---- a/libgnucash/app-utils/gnc-quotes.cpp 2023-09-23 07:04:21.000000000 +0900 -+++ b/libgnucash/app-utils/gnc-quotes.cpp 2023-09-25 11:58:46.482696433 +0900 -@@ -125,7 +125,6 @@ - - class GncFQQuoteSource final : public GncQuoteSource - { -- const bfs::path c_cmd; - std::string c_fq_wrapper; - std::string m_version; - StrVec m_sources; -@@ -148,13 +147,12 @@ - static const std::string empty_string{}; - - GncFQQuoteSource::GncFQQuoteSource() : --c_cmd{bp::search_path("perl")}, - m_version{}, m_sources{}, m_api_key{} - { - char *bindir = gnc_path_get_bindir(); - c_fq_wrapper = std::string(bindir) + "/finance-quote-wrapper"; - g_free(bindir); -- StrVec args{"-w", c_fq_wrapper, "-v"}; -+ StrVec args{"-v"}; - auto [rv, sources, errors] = run_cmd(args, empty_string); - if (rv) - { -@@ -200,7 +198,7 @@ - QuoteResult - GncFQQuoteSource::get_quotes(const std::string& json_str) const - { -- StrVec args{"-w", c_fq_wrapper, "-f" }; -+ StrVec args{"-f" }; - return run_cmd(args, json_str); - } - -@@ -218,7 +216,7 @@ - auto input_buf = bp::buffer (json_string); - bp::child process; - if (m_api_key.empty()) -- process = bp::child(c_cmd, args, -+ process = bp::child(c_fq_wrapper, args, - bp::std_out > out_buf, - bp::std_err > err_buf, - bp::std_in < input_buf, -@@ -227,7 +225,7 @@ - #endif - svc); - else -- process = bp::child(c_cmd, args, -+ process = bp::child(c_fq_wrapper, args, - bp::std_out > out_buf, - bp::std_err > err_buf, - bp::std_in < input_buf, diff --git a/pkgs/applications/office/gnucash/0005-disable-test-lots.patch b/pkgs/applications/office/gnucash/0005-disable-test-lots.patch deleted file mode 100644 index c7418b7b88b9b..0000000000000 --- a/pkgs/applications/office/gnucash/0005-disable-test-lots.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/libgnucash/engine/test/CMakeLists.txt 2024-02-23 09:05:19.000000000 +0900 -+++ b/libgnucash/engine/test/CMakeLists.txt 2024-05-08 22:08:04.572060359 +0900 -@@ -57,7 +57,6 @@ - - add_engine_test(test-account-object test-account-object.cpp) - add_engine_test(test-group-vs-book test-group-vs-book.cpp) --add_engine_test(test-lots test-lots.cpp) - add_engine_test(test-querynew test-querynew.c) - add_engine_test(test-query test-query.cpp) - add_engine_test(test-split-vs-account test-split-vs-account.cpp) - diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix deleted file mode 100644 index 8d86d771d0aa8..0000000000000 --- a/pkgs/applications/office/gnucash/default.nix +++ /dev/null @@ -1,174 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, fetchurl -, fetchpatch -, aqbanking -, boost -, cmake -, gettext -, glib -, glibcLocales -, gtest -, guile -, gwenhywfar -, icu -, libdbi -, libdbiDrivers -, libofx -, libxml2 -, libxslt -, makeWrapper -, perlPackages -, pkg-config -, swig -, webkitgtk -, wrapGAppsHook3 -}: - -stdenv.mkDerivation rec { - pname = "gnucash"; - version = "5.6"; - - # raw source code doesn't work out of box; fetchFromGitHub not usable - src = fetchurl { - url = "https://github.com/Gnucash/gnucash/releases/download/${version}/gnucash-${version}.tar.bz2"; - hash = "sha256-tLQsYmNQ8+effKHyFzVFzGPd7hrd8kYLGh8iIhvyG9E="; - }; - - nativeBuildInputs = [ - cmake - gettext - makeWrapper - wrapGAppsHook3 - pkg-config - ]; - - buildInputs = [ - aqbanking - boost - glib - glibcLocales - gtest - guile - gwenhywfar - icu - libdbi - libdbiDrivers - libofx - libxml2 - libxslt - swig - webkitgtk - ] - ++ (with perlPackages; [ - JSONParse - FinanceQuote - perl - ]); - - patches = [ - # this patch disables test-gnc-timezone and test-gnc-datetime which fail due to nix datetime challenges - ./0001-disable-date-and-time-tests.patch - # this patch prevents the building of gnc-fq-update, a utility which updates the GnuCash cli utils - ./0002-disable-gnc-fq-update.patch - # this patch prevents the building of gnucash-valgrind - ./0003-remove-valgrind.patch - # this patch makes gnucash exec the Finance::Quote wrapper directly - ./0004-exec-fq-wrapper.patch - # this patch disables a flaky test - # see https://bugs.gnucash.org/show_bug.cgi?id=799289 - ./0005-disable-test-lots.patch - # Fix importing QIF by backporting a fix. remove on next release - # https://bugs.gnucash.org/show_bug.cgi?id=799262 - (fetchpatch { - url = "https://github.com/Gnucash/gnucash/commit/b33b864c2fa0ba72d1940465e7fa962dd36833c9.patch"; - hash = "sha256-A8pYW6CcNFBGC/MDijnuFJdlNAzSDS6Tcj+haCcEI/M="; - }) - ]; - - # this needs to be an environment variable and not a cmake flag to suppress - # guile warning - env.GUILE_AUTO_COMPILE = "0"; - - env.NIX_CFLAGS_COMPILE = toString (lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "12") [ - # Needed with GCC 12 but breaks on darwin (with clang) or older gcc - "-Wno-error=use-after-free" - ]); - - doCheck = true; - enableParallelChecking = true; - checkTarget = "check"; - - passthru.docs = stdenv.mkDerivation { - pname = "gnucash-docs"; - inherit version; - - src = fetchFromGitHub { - owner = "Gnucash"; - repo = "gnucash-docs"; - rev = version; - hash = "sha256-rQZoau466Bi/YpPj1XpSsm67FgTYhiMfZfogTtn+m1k="; - }; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ libxml2 libxslt ]; - }; - - preFixup = '' - gappsWrapperArgs+=( - # documentation - --prefix XDG_DATA_DIRS : ${passthru.docs}/share - # db drivers location - --set GNC_DBD_DIR ${libdbiDrivers}/lib/dbd - # gsettings schema location on Nix - --set GSETTINGS_SCHEMA_DIR ${glib.makeSchemaPath "$out" "gnucash-${version}"} - ) - ''; - - # wrapGAppsHook3 would wrap all binaries including the cli utils which need - # Perl wrapping - dontWrapGApps = true; - - # gnucash is wrapped using the args constructed for wrapGAppsHook3. - # gnc-fq-* are cli utils written in Perl hence the extra wrapping - postFixup = '' - wrapProgram $out/bin/gnucash "''${gappsWrapperArgs[@]}" - wrapProgram $out/bin/gnucash-cli "''${gappsWrapperArgs[@]}" - - wrapProgram $out/bin/finance-quote-wrapper \ - --prefix PERL5LIB : "${with perlPackages; makeFullPerlPath [ JSONParse FinanceQuote ]}" - ''; - - passthru.updateScript = ./update.sh; - - meta = with lib; { - homepage = "https://www.gnucash.org/"; - description = "Free software for double entry accounting"; - longDescription = '' - GnuCash is personal and small-business financial-accounting software, - freely licensed under the GNU GPL and available for GNU/Linux, BSD, - Solaris, Mac OS X and Microsoft Windows. - - Designed to be easy to use, yet powerful and flexible, GnuCash allows you - to track bank accounts, stocks, income and expenses. As quick and - intuitive to use as a checkbook register, it is based on professional - accounting principles to ensure balanced books and accurate reports. - - Some interesting features: - - - Double-Entry Accounting - - Stock/Bond/Mutual Fund Accounts - - Small-Business Accounting - - Reports, Graphs - - QIF/OFX/HBCI Import, Transaction Matching - - Scheduled Transactions - - Financial Calculations - ''; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ domenkozar AndersonTorres rski nevivurn ]; - platforms = platforms.unix; - mainProgram = "gnucash"; - }; -} -# TODO: investigate Darwin support diff --git a/pkgs/applications/office/gnucash/update.sh b/pkgs/applications/office/gnucash/update.sh deleted file mode 100755 index b339fd4a7c7c1..0000000000000 --- a/pkgs/applications/office/gnucash/update.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env nix-shell -#! nix-shell -I nixpkgs=./. -i bash -p curl jq nix-prefetch-github - -set -euo pipefail - -latest_version=$(curl -s https://api.github.com/repos/Gnucash/gnucash/releases/latest | jq -r '.tag_name') - -if [[ "$latest_version" = "$UPDATE_NIX_OLD_VERSION" ]]; then - echo "already up to date" - exit 0 -fi - -old_src_hash=$(nix-instantiate --eval -A gnucash.src.outputHash | tr -d '"') -old_src_doc_hash=$(nix-instantiate --eval -A gnucash.docs.src.outputHash | tr -d '"') - -src_hash=$(nix-prefetch-url "https://github.com/Gnucash/gnucash/releases/download/$latest_version/gnucash-$latest_version.tar.bz2") -src_hash=$(nix-hash --to-sri --type sha256 "$src_hash") -src_doc_hash=$(nix-prefetch-github Gnucash gnucash-docs --rev "$latest_version" | jq -r .hash) -src_doc_hash=$(nix-hash --to-sri --type sha256 "$src_doc_hash") - -cd "$(dirname "${BASH_SOURCE[0]}")" -sed -i default.nix -e "s|$old_src_hash|$src_hash|" -sed -i default.nix -e "s|$old_src_doc_hash|$src_doc_hash|" -sed -i default.nix -e "/ version =/s|\"${UPDATE_NIX_OLD_VERSION}\"|\"${latest_version}\"|" 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/gtg/default.nix b/pkgs/applications/office/gtg/default.nix index 6f3f7425eb0e4..d990a2004a2dc 100644 --- a/pkgs/applications/office/gtg/default.nix +++ b/pkgs/applications/office/gtg/default.nix @@ -55,7 +55,6 @@ python3Packages.buildPythonApplication rec { ]; nativeCheckInputs = with python3Packages; [ - nose mock xvfb-run pytest diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix deleted file mode 100644 index 000942ff68bdd..0000000000000 --- a/pkgs/applications/office/homebank/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ fetchurl, lib, stdenv, gtk, pkg-config, libofx, intltool, wrapGAppsHook3 -, libsoup_3, gnome }: - -stdenv.mkDerivation rec { - pname = "homebank"; - version = "5.8.1"; - src = fetchurl { - url = "https://www.gethomebank.org/public/sources/homebank-${version}.tar.gz"; - hash = "sha256-YMNf6v40GuyP7Z3ksKh13A9cFnTF9YBP9xkKbGxT3AE="; - }; - - patches = [ - ./fix-clang-build.diff - ]; - - nativeBuildInputs = [ pkg-config wrapGAppsHook3 intltool ]; - buildInputs = [ gtk libofx libsoup_3 gnome.adwaita-icon-theme]; - - meta = with lib; { - description = "Free, easy, personal accounting for everyone"; - mainProgram = "homebank"; - homepage = "https://www.gethomebank.org"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ pSub frlan ]; - platforms = platforms.linux ++ platforms.darwin; - }; -} diff --git a/pkgs/applications/office/homebank/fix-clang-build.diff b/pkgs/applications/office/homebank/fix-clang-build.diff deleted file mode 100644 index 1b8c7fd359e23..0000000000000 --- a/pkgs/applications/office/homebank/fix-clang-build.diff +++ /dev/null @@ -1,23 +0,0 @@ -C Standard says in 6.8.1: - - labeled-statement: - identifier : statement - case constant-expression : statement - default : statement - -Notably, only expressions and no declarations are allowed. A common workaround for this -is adding an empty statement. - -diff --git a/src/rep-budget.c b/src/rep-budget.c -index eb5cce6..61e2e77 100644 ---- a/src/rep-budget.c -+++ b/src/rep-budget.c -@@ -255,7 +255,7 @@ gint tmpmode; - } - else - { --libname: -+libname: ; - gchar *name; - - gtk_tree_model_get(model, iter, diff --git a/pkgs/applications/office/ib/controller/default.nix b/pkgs/applications/office/ib/controller/default.nix deleted file mode 100644 index 6df00fc174ed7..0000000000000 --- a/pkgs/applications/office/ib/controller/default.nix +++ /dev/null @@ -1,164 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, unzip, jdk, ib-tws, xpra }: - -stdenv.mkDerivation rec { - version = "2.14.0"; - pname = "ib-controller"; - - src = fetchFromGitHub { - owner = "ib-controller"; - repo = "ib-controller"; - rev = version; - sha256 = "sha256-R175CKb3uErjBNe73HEFMI+bNmmuH2nWGraCSh5bXwc="; - }; - - nativeBuildInputs = [ unzip ]; - buildInputs = [ jdk ib-tws ]; - - installPhase = '' - mkdir -p $out $out/bin $out/etc/ib/controller $out/share/IBController - cp resources/*.jar $out/share/IBController/. - cp resources/*.ini $out/etc/ib/controller/. - classpath="" - for jar in ${ib-tws}/share/IBJts/*.jar; do - classpath="$classpath:$jar" - done - for jar in $out/share/IBController/*.jar; do - classpath="$classpath:$jar" - done - # strings to use below; separated to avoid nix specific substitutions - javaOptions={JAVA_OPTIONS:--Xmx1024M} - ibProfileDir={IB_PROFILE_DIR:-~/IB/} - cat<<EOF > $out/bin/ib-tws-c - #!$SHELL - if [[ \$1 == /* ]] || [[ \$1 == ./* ]]; then - IB_USER_PROFILE=\`realpath \$1\` - IB_USER_PROFILE_TITLE=\`basename \$1\` - else - if [[ x\$1 != "x" ]] && [[ \$1 != -* ]]; then - IB_USER_PROFILE=\`realpath \$$ibProfileDir\$1\` - IB_USER_PROFILE_TITLE=\$1 - else - echo "ERROR: \"\$1\" is not a valid name of a profile." - exit 1 - fi - fi - shift - if [ ! -e \$IB_USER_PROFILE ]; then mkdir -p \$IB_USER_PROFILE; fi - if [ ! -d \$IB_USER_PROFILE ]; then echo "ERROR: \$IB_USER_PROFILE must be a directory!" && echo 1; fi - if [ ! -e \$IB_USER_PROFILE/jts.ini ]; then cp ${ib-tws}/etc/ib/tws/jts.ini \$IB_USER_PROFILE/. && chmod +w \$IB_USER_PROFILE/jts.ini; fi - if [ ! -e \$IB_USER_PROFILE/IBController.ini ]; then cp $out/etc/ib/controller/IBController.ini \$IB_USER_PROFILE/. && chmod +w \$IB_USER_PROFILE/IBController.ini; fi - if [[ \$1 == "-q" ]]; then - if [ -f \$IB_USER_PROFILE/xpra/run ]; then - ${xpra}/bin/xpra stop \`cat \$IB_USER_PROFILE/xpra/run\` --socket-dir=\$IB_USER_PROFILE/xpra/ &> /dev/null - fi - exit 0 - fi - if [[ \$1 == "-d" ]] && [ ! -f \$IB_USER_PROFILE/xpra/run ]; then - ( sleep infinity ) & - WAIT_DUMMY_PID=\$! - ( trap "" INT; - DISPLAYNUM=100 - while [ -f /tmp/.X\$DISPLAYNUM-lock ]; do DISPLAYNUM=\$((\$DISPLAYNUM + 1)); done - mkdir -p \$IB_USER_PROFILE/xpra - cd \$IB_USER_PROFILE - nohup ${xpra}/bin/xpra start :\$DISPLAYNUM \ - --socket-dir=\$IB_USER_PROFILE/xpra/ \ - --start-child="echo -n :\$DISPLAYNUM > \$IB_USER_PROFILE/xpra/run \ - && kill \$WAIT_DUMMY_PID &> /dev/null \ - && ${jdk}/bin/java -cp $classpath \$$javaOptions ibcontroller.IBController \$IB_USER_PROFILE/IBController.ini" \ - --exit-with-children \ - --no-pulseaudio \ - --no-mdns \ - --no-notification \ - --no-daemon \ - &> \$IB_USER_PROFILE/xpra/server.log - rm -f \$IB_USER_PROFILE/xpra/run - rm -f /tmp/.X\$DISPLAYNUM-lock - ) & - wait \$WAIT_DUMMY_PID - exit 0 - fi - if [ -f \$IB_USER_PROFILE/xpra/run ]; then - ${xpra}/bin/xpra attach \`cat \$IB_USER_PROFILE/xpra/run\` --socket-dir=\$IB_USER_PROFILE/xpra/ \ - --windows \ - --no-speaker \ - --no-microphone \ - --no-tray \ - --title="\$IB_USER_PROFILE_TITLE: @title@" \ - &> \$IB_USER_PROFILE/xpra/client.log - fi - EOF - chmod u+x $out/bin/ib-tws-c - cat<<EOF > $out/bin/ib-gw-c - #!$SHELL - if [[ \$1 == /* ]] || [[ \$1 == ./* ]]; then - IB_USER_PROFILE=\`realpath \$1\` - IB_USER_PROFILE_TITLE=\`basename \$1\` - else - if [[ x\$1 != "x" ]] && [[ \$1 != -* ]]; then - IB_USER_PROFILE=\`realpath \$$ibProfileDir\$1\` - IB_USER_PROFILE_TITLE=\$1 - else - echo "ERROR: \"\$1\" is not a valid name of a profile." - exit 1 - fi - fi - shift - if [ ! -e \$IB_USER_PROFILE ]; then mkdir -p \$IB_USER_PROFILE; fi - if [ ! -d \$IB_USER_PROFILE ]; then echo "ERROR: \$IB_USER_PROFILE must be a directory!" && echo 1; fi - if [ ! -e \$IB_USER_PROFILE/jts.ini ]; then cp ${ib-tws}/etc/ib/tws/jts.ini \$IB_USER_PROFILE/. && chmod +w \$IB_USER_PROFILE/jts.ini; fi - if [ ! -e \$IB_USER_PROFILE/IBController.ini ]; then cp $out/etc/ib/controller/IBController.ini \$IB_USER_PROFILE/. && chmod +w \$IB_USER_PROFILE/IBController.ini; fi - if [[ \$1 == "-q" ]]; then - if [ -f \$IB_USER_PROFILE/xpra/run ]; then - ${xpra}/bin/xpra stop \`cat \$IB_USER_PROFILE/xpra/run\` --socket-dir=\$IB_USER_PROFILE/xpra/ &> /dev/null - fi - exit 0 - fi - if [[ \$1 == "-d" ]] && [ ! -f \$IB_USER_PROFILE/xpra/run ]; then - ( sleep infinity ) & - WAIT_DUMMY_PID=\$! - ( trap "" INT; - DISPLAYNUM=100 - while [ -f /tmp/.X\$DISPLAYNUM-lock ]; do DISPLAYNUM=\$((\$DISPLAYNUM + 1)); done - mkdir -p \$IB_USER_PROFILE/xpra - cd \$IB_USER_PROFILE - nohup ${xpra}/bin/xpra start :\$DISPLAYNUM \ - --socket-dir=\$IB_USER_PROFILE/xpra/ \ - --start-child="echo -n :\$DISPLAYNUM > \$IB_USER_PROFILE/xpra/run \ - && kill \$WAIT_DUMMY_PID &> /dev/null \ - && ${jdk}/bin/java -cp $classpath \$$javaOptions ibcontroller.IBGatewayController \$IB_USER_PROFILE/IBController.ini" \ - --exit-with-children \ - --no-pulseaudio \ - --no-mdns \ - --no-notification \ - --no-daemon \ - &> \$IB_USER_PROFILE/xpra/server.log - rm -f \$IB_USER_PROFILE/xpra/run - rm -f /tmp/.X\$DISPLAYNUM-lock - ) & - wait \$WAIT_DUMMY_PID - exit 0 - fi - if [ -f \$IB_USER_PROFILE/xpra/run ]; then - ${xpra}/bin/xpra attach \`cat \$IB_USER_PROFILE/xpra/run\` --socket-dir=\$IB_USER_PROFILE/xpra/ \ - --windows \ - --no-speaker \ - --no-microphone \ - --no-tray \ - --title="\$IB_USER_PROFILE_TITLE: @title@" \ - &> \$IB_USER_PROFILE/xpra/client.log - fi - EOF - chmod u+x $out/bin/ib-gw-c - ''; - - - meta = with lib; { - description = "Automation Controller for the Trader Work Station of Interactive Brokers"; - homepage = "https://github.com/ib-controller/ib-controller"; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; - license = licenses.gpl3; - maintainers = [ ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/office/ib/tws/default.nix b/pkgs/applications/office/ib/tws/default.nix deleted file mode 100644 index 3b267d79f39fe..0000000000000 --- a/pkgs/applications/office/ib/tws/default.nix +++ /dev/null @@ -1,95 +0,0 @@ -{ lib, stdenv, requireFile, jdk }: - -stdenv.mkDerivation rec { - version = "9542"; - pname = "ib-tws"; - - src = requireFile rec { - name = "ibtws_${version}.jar"; - message = '' - This nix expression requires that ${name} is already part of the store. - Download the TWS from - https://download2.interactivebrokers.com/download/unixmacosx_latest.jar, - rename the file to ${name}, and add it to the nix store with - "nix-prefetch-url file://\$PWD/${name}". - ''; - sha256 = "1a2jiwwnr5g3xfba1a89c257bdbnq4zglri8hz021vk7f6s4rlrf"; - }; - - buildInputs = [ jdk ]; - - buildPhase = '' - jar -xf IBJts/jts.jar - cp trader/common/images/ibapp_icon.gif ibtws_icon.gif - ''; - - unpackPhase = '' - jar xf ${src} - ''; - - installPhase = '' - mkdir -p $out $out/bin $out/etc/ib/tws $out/share/IBJts $out/share/icons - cp IBJts/*.jar $out/share/IBJts/. - cp IBJts/*.ini $out/etc/ib/tws/. - cp ibtws_icon.gif $out/share/icons/. - classpath="" - for jar in $out/share/IBJts/*.jar; do - classpath="$classpath:$jar" - done - # strings to use below; separated to avoid nix specific substitutions - javaOptions={JAVA_OPTIONS:-'-Xmx1024M -Dawt.useSystemAAFontSettings=lcd -Dsun.java2d.xrender=True -Dsun.java2d.opengl=False'} - # OTHER JAVA_OPTIONS: -Dawt.useSystemAAFontSettings=on -Dswing.aatext=true -Dswing.defaultlaf=com.sun.java - ibProfileDir={IB_PROFILE_DIR:-~/IB/} - cat<<EOF > $out/bin/ib-tws - #!$SHELL - if [[ \$1 == /* ]] || [[ \$1 == ./* ]]; then - IB_USER_PROFILE=\`realpath \$1\` - IB_USER_PROFILE_TITLE=\`basename \$1\` - else - if [[ x\$1 != "x" ]] && [[ \$1 != -* ]]; then - IB_USER_PROFILE=\`realpath \$$ibProfileDir\$1\` - IB_USER_PROFILE_TITLE=\$1 - else - echo "ERROR: \"\$1\" is not a valid name of a profile." - exit 1 - fi - fi - shift - if [ ! -e \$IB_USER_PROFILE ]; then mkdir -p \$IB_USER_PROFILE; fi - if [ ! -d \$IB_USER_PROFILE ]; then echo "ERROR: \$IB_USER_PROFILE must be a directory!" && echo 1; fi - if [ ! -e \$IB_USER_PROFILE/jts.ini ]; then cp $out/etc/ib/tws/jts.ini \$IB_USER_PROFILE/. && chmod +w \$IB_USER_PROFILE/jts.ini; fi - ${jdk}/bin/java -cp $classpath \$$javaOptions jclient.LoginFrame \$IB_USER_PROFILE - EOF - chmod u+x $out/bin/ib-tws - cat<<EOF > $out/bin/ib-gw - #!$SHELL - if [[ \$1 == /* ]] || [[ \$1 == ./* ]]; then - IB_USER_PROFILE=\`realpath \$1\` - IB_USER_PROFILE_TITLE=\`basename \$1\` - else - if [[ x\$1 != "x" ]] && [[ \$1 != -* ]]; then - IB_USER_PROFILE=\`realpath \$$ibProfileDir\$1\` - IB_USER_PROFILE_TITLE=\$1 - else - echo "ERROR: \"\$1\" is not a valid name of a profile." - exit 1 - fi - fi - shift - if [ ! -e \$IB_USER_PROFILE ]; then mkdir -p \$IB_USER_PROFILE; fi - if [ ! -d \$IB_USER_PROFILE ]; then echo "ERROR: \$IB_USER_PROFILE must be a directory!" && echo 1; fi - if [ ! -e \$IB_USER_PROFILE/jts.ini ]; then cp $out/etc/ib/tws/jts.ini \$IB_USER_PROFILE/. && chmod +w \$IB_USER_PROFILE/jts.ini; fi - ${jdk}/bin/java -cp $classpath -Dsun.java2d.noddraw=true \$$javaOptions ibgateway.GWClient \$IB_USER_PROFILE - EOF - chmod u+x $out/bin/ib-gw - ''; - - meta = with lib; { - description = "Trader Work Station of Interactive Brokers"; - homepage = "https://www.interactivebrokers.com"; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; - license = licenses.unfree; - maintainers = [ ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/office/jabref/default.nix b/pkgs/applications/office/jabref/default.nix index 286ab63cbd0ac..96ff199f964d5 100644 --- a/pkgs/applications/office/jabref/default.nix +++ b/pkgs/applications/office/jabref/default.nix @@ -9,18 +9,9 @@ , gtk3 , jdk , gradle -, perl , python3 }: -let - versionReplace = { - easybind = { - snapshot = "2.2.1-SNAPSHOT"; - pin = "2.2.1-20230117.075740-16"; - }; - }; -in stdenv.mkDerivation rec { version = "5.13"; pname = "jabref"; @@ -47,36 +38,12 @@ stdenv.mkDerivation rec { }) ]; - deps = stdenv.mkDerivation { - pname = "${pname}-deps"; - inherit src version postPatch; - - nativeBuildInputs = [ gradle perl ]; - buildPhase = '' - export GRADLE_USER_HOME=$(mktemp -d) - gradle --no-daemon downloadDependencies -Dos.arch=amd64 - gradle --no-daemon downloadDependencies -Dos.arch=aarch64 - ''; - # perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar) - installPhase = '' - find $GRADLE_USER_HOME/caches/modules-2/ -type f -regex '.*\.\(jar\|pom\)' \ - | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/''${\($5 =~ s/-jvm//r)}" #e' \ - | sh - mv $out/com/tobiasdiez/easybind/${versionReplace.easybind.pin} \ - $out/com/tobiasdiez/easybind/${versionReplace.easybind.snapshot} - ''; - # Don't move info to share/ - forceShare = [ "dummy" ]; - outputHashMode = "recursive"; - outputHash = "sha256-lpFIhvPgkzIsHR6IVnn+oPhdSjo0yOIw7USo2+SJCVQ="; + mitmCache = gradle.fetchDeps { + inherit pname; + data = ./deps.json; }; postPatch = '' - # Pin the version - substituteInPlace build.gradle \ - --replace 'com.tobiasdiez:easybind:${versionReplace.easybind.snapshot}' \ - 'com.tobiasdiez:easybind:${versionReplace.easybind.pin}' - # Disable update check substituteInPlace src/main/java/org/jabref/preferences/JabRefPreferences.java \ --replace 'VERSION_CHECK_ENABLED, Boolean.TRUE' \ @@ -85,30 +52,6 @@ stdenv.mkDerivation rec { # Find OpenOffice/LibreOffice binary substituteInPlace src/main/java/org/jabref/logic/openoffice/OpenOfficePreferences.java \ --replace '/usr' '/run/current-system/sw' - - # Add back downloadDependencies task for deps download which is removed upstream in https://github.com/JabRef/jabref/pull/10326 - cat <<EOF >> build.gradle - task downloadDependencies { - description "Pre-downloads *most* dependencies" - doLast { - configurations.getAsMap().each { name, config -> - println "Retrieving dependencies for $name" - try { - config.files - } catch (e) { - // some cannot be resolved, just log them - project.logger.info e.message - } - } - } - } - EOF - ''; - - preBuild = '' - # Use the local packages from -deps - sed -i -e '/repositories {/a maven { url uri("${deps}") }' build.gradle - sed -i -e '1i pluginManagement { repositories { maven { url uri("${deps}") } } }' settings.gradle ''; nativeBuildInputs = [ @@ -124,19 +67,13 @@ stdenv.mkDerivation rec { python3 ]; - buildPhase = '' - runHook preBuild - - export GRADLE_USER_HOME=$(mktemp -d) - gradle \ - --offline \ - --no-daemon \ - -PprojVersion="${version}" \ - -PprojVersionInfo="${version} NixOS" \ - -Dorg.gradle.java.home=${jdk} \ - assemble + gradleFlags = [ + "-PprojVersion=${version}" + "-Dorg.gradle.java.home=${jdk}" + ]; - runHook postBuild + preBuild = '' + gradleFlagsArray+=(-PprojVersionInfo="${version} NixOS") ''; dontWrapGApps = true; @@ -178,6 +115,13 @@ stdenv.mkDerivation rec { ln -sf $out/bin/JabRef $out/bin/jabref ''; + gradleUpdateScript = '' + runHook preBuild + + gradle nixDownloadDeps -Dos.arch=amd64 + gradle nixDownloadDeps -Dos.arch=aarch64 + ''; + meta = with lib; { description = "Open source bibliography reference manager"; homepage = "https://www.jabref.org"; diff --git a/pkgs/applications/office/jabref/deps.json b/pkgs/applications/office/jabref/deps.json new file mode 100644 index 0000000000000..6b510245eb299 --- /dev/null +++ b/pkgs/applications/office/jabref/deps.json @@ -0,0 +1,2143 @@ +{ + "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", + "!version": 1, + "https://jitpack.io/com/github/sialcasa": { + "mvvmFX#mvvmfx-parent/f195849ca9": { + "pom": "sha256-5nTE66pGjgRswUpwK3guGpZb5iI4/2kmYy+wtGIsSz0=" + }, + "mvvmFX#mvvmfx-validation/f195849ca9": { + "jar": "sha256-Q3dcLohYshPQP3jWb0/Wh6IENg4CGn9Tl8tVvRHVhO0=", + "pom": "sha256-MplYnkdrZQ8ptd0PuUqUcWe6SwKaoM4VdOOV1KMAPvs=" + } + }, + "https://oss.sonatype.org/content/groups/public/com": { + "tobiasdiez#easybind/2.2.1-20230117.075740-16/SNAPSHOT": { + "jar": "sha256-eubEgC/aixBe3Ho3QWBsJltPkWwmSRFGdlpx/0dl158=", + "module": "sha256-tgPZPbaK5Hy7JDPg3Yo5dh/zn+av+bgvbmklypPYZqc=", + "pom": "sha256-NudbADyHMI49AKmZi2KOYbTzRW/uuPdiYDDJcwEEPhA=" + }, + "tobiasdiez/easybind/2.2.1-SNAPSHOT/maven-metadata": { + "xml": { + "groupId": "com.tobiasdiez", + "lastUpdated": "20230117075740" + } + } + }, + "https://plugins.gradle.org/m2": { + "com/adarshr#gradle-test-logger-plugin/4.0.0": { + "jar": "sha256-5nhoOjPSvINWcb3U5YcQAErR2TFqqfmlTP4iQZpPbvk=", + "module": "sha256-jERLLH/UQgDNSrMYJyJwHCCXWkOyPH6e35sCJgSavcI=", + "pom": "sha256-ienBpTqmJS2mx9fZscN/t/j8qQuysaNq+Ti8cNni3GE=" + }, + "com/adarshr/test-logger#com.adarshr.test-logger.gradle.plugin/4.0.0": { + "pom": "sha256-sobTcqzS2uG4vHsg/ouoT49kiXMdiBpB83NqYCCFotc=" + }, + "com/github/andygoossens#gradle-modernizer-plugin/1.9.2": { + "jar": "sha256-PTzh7ej2aFWPPQCOs+nbNiAcYgbDlZDmciyr1XlHnBk=", + "module": "sha256-fpPjWPi71bCrOGIfkBU2QZfSguUT85C+oWjfvKqfbss=", + "pom": "sha256-/jLkdoa/L/1ARpoP52+JmSmawj38yVpzyzDGf/hsKr4=" + }, + "com/github/andygoossens/modernizer#com.github.andygoossens.modernizer.gradle.plugin/1.9.2": { + "pom": "sha256-d45Z81rXBHHqcW+H8U+oFW1SuaUyJ4MlEFG6DnrRSy0=" + }, + "com/google/code/findbugs#jsr305/3.0.2": { + "jar": "sha256-dmrSoHg/JoeWLIrXTO7MOKKLn3Ki0IXuQ4t4E+ko0Mc=", + "pom": "sha256-GYidvfGyVLJgGl7mRbgUepdGRIgil2hMeYr+XWPXjf4=" + }, + "com/google/code/gson#gson-parent/2.10.1": { + "pom": "sha256-QkjgiCQmxhUYI4XWCGw+8yYudplXGJ4pMGKAuFSCuDM=" + }, + "com/google/code/gson#gson/2.10.1": { + "jar": "sha256-QkHBSncnw0/uplB+yAExij1KkPBw5FJWgQefuU7kxZM=", + "pom": "sha256-0rEVY09cCF20ucn/wmWOieIx/b++IkISGhzZXU2Ujdc=" + }, + "com/google/gradle#osdetector-gradle-plugin/1.7.3": { + "jar": "sha256-a0aS+ROiGx+2Axae54uo8+SrKvnXYq+cqIt5EmwcCtE=", + "pom": "sha256-hGDJUBJ8o1mHZhYeOLT/jWO01p+4MQoW4As1E1ABDBE=" + }, + "kr/motd/maven#os-maven-plugin/1.7.1": { + "jar": "sha256-9Hru+Ggh5SsrGHWJeL0EXwPXIikuMudHCCEixiKJUuA=", + "pom": "sha256-S3WABEIrljPdMY8p54Tx0YC9ilkgzVCvGTCGH21qVHY=" + }, + "me/champeau/jmh#jmh-gradle-plugin/0.7.2": { + "jar": "sha256-2Wcgmf+Pw/m/PU0BWGThWG8H7L0qihd6ZhhO8LaKumU=", + "module": "sha256-bYSa50VKs5Fxjl/HDicWQY7z7SZEcjRb2Axt5k4AtsQ=", + "pom": "sha256-FdkdAH98O7wCJseQSM3cRf/BJPoegAgu//jhAwxoSg8=" + }, + "me/champeau/jmh#me.champeau.jmh.gradle.plugin/0.7.2": { + "pom": "sha256-V+DCOsYJRa77WgxKkzm+poopU2TKR8epB5oDL3kBOrs=" + }, + "net/sf/jopt-simple#jopt-simple/5.0.4": { + "jar": "sha256-3ybMWPI19HfbB/dTulo6skPr5Xidn4ns9o3WLqmmbCg=", + "pom": "sha256-amd2O3avzZyAuV5cXiR4LRjMGw49m0VK0/h1THa3aBU=" + }, + "org/apache#apache/16": { + "pom": "sha256-n4X/L9fWyzCXqkf7QZ7n8OvoaRCfmKup9Oyj9J50pA4=" + }, + "org/apache/commons#commons-math3/3.6.1": { + "jar": "sha256-HlbXsFjSi2Wr0la4RY44hbZ0wdWI+kPNfRy7nH7yswg=", + "pom": "sha256-+tcjNup9fdBtoQMUTjdA21CPpLF9nFTXhHc37cJKfmA=" + }, + "org/apache/commons#commons-parent/39": { + "pom": "sha256-h80n4aAqXD622FBZzphpa7G0TCuLZQ8FZ8ht9g+mHac=" + }, + "org/beryx#badass-jlink-plugin/3.0.1": { + "jar": "sha256-dgjXY18yKiLff//d+IiBuTngqBDuUmoqTFPFN7/WT4Y=", + "module": "sha256-b3ksJpweGUNdCWcOtY12cyOFm2Hpt9YcZLPMdHK8Qgo=", + "pom": "sha256-OwPpihIF17Spe7jcvlkCs6AW4D+FACDzkjuIWomh2zM=" + }, + "org/beryx/jlink#org.beryx.jlink.gradle.plugin/3.0.1": { + "pom": "sha256-MRg/jaYel0ILAf4NarvkrGfgYY5PxAEyfBu8HvoBCqw=" + }, + "org/fusesource#fusesource-pom/1.12": { + "pom": "sha256-xA2WDarc73sBwbHGZXr7rE//teUxaPj8sLKLhOb9zKE=" + }, + "org/fusesource/jansi#jansi/2.4.0": { + "jar": "sha256-bNkZkTI917L7KMqT16wSr1qGovUyeeKzWCezAxP9C58=", + "pom": "sha256-rECp8tDB7mMfw7CO+OLwvRS6IgEcp2/xvPZftWnq3zU=" + }, + "org/gradle/toolchains#foojay-resolver/0.8.0": { + "jar": "sha256-+Q5pNRY46QueyYSOdZ0hhjWQfAklQRkRUAN7CyLlFAw=", + "module": "sha256-jDzPVNoHLGSkDgaIKqplIzbLKe7C6iMPBtaEOrs4TVE=", + "pom": "sha256-pxZyrK0MCu4576V1P1yU+aSjWh2sBl4ii8rDQt6nxUg=" + }, + "org/gradle/toolchains/foojay-resolver-convention#org.gradle.toolchains.foojay-resolver-convention.gradle.plugin/0.8.0": { + "pom": "sha256-O2ciN72cwejoyobvWnkgpnj2nQTS9L+9DFouedRcXLU=" + }, + "org/javamodularity#moduleplugin/1.8.15": { + "jar": "sha256-TtYKjxlMndPuoesswP//5xo9gr+lr6YYszce8WDEdGI=", + "module": "sha256-rVmC0YlFvQQqTzjgQ+m2X90tdaek+LtlZ8ivt57NSPo=", + "pom": "sha256-BH+RV4mcE+kqwL9wlgswRdu77RoUOL6Y34YGIcjgk3A=" + }, + "org/javamodularity/moduleplugin#org.javamodularity.moduleplugin.gradle.plugin/1.8.15": { + "pom": "sha256-FL6DuFvFUx4otorZSr54f4wPPdBGThV0XPJc9Nbjc1k=" + }, + "org/jetbrains#annotations/13.0": { + "jar": "sha256-rOKhDcji1f00kl7KwD5JiLLA+FFlDJS4zvSbob0RFHg=", + "pom": "sha256-llrrK+3/NpgZvd4b96CzuJuCR91pyIuGN112Fju4w5c=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-common/1.9.0": { + "jar": "sha256-KDJ0IEvXwCB4nsRvj45yr0JE1/VQszkqV+XKAGrXqiw=", + "pom": "sha256-NmDTanD+s6vknxG5BjPkHTYnNXbwcbDhCdqbOg3wgqU=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.9.0": { + "jar": "sha256-t5eaeqyUBV8Nnx/TtHzl/+HLYDKoQrqfvnGG8IUokXg=", + "pom": "sha256-wRB08MiYqYuGPGFEcdQ409+Soewzgqbjf5NdfXGVS1o=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.9.0": { + "jar": "sha256-pZ+iT98f+1lLrs2/D9EAEPl3zqECNtSH/jRkl3pzd/o=", + "pom": "sha256-ZNWY3YjiUEZnMeIDBKtvBsu7urfuMitHA7a1n4gcT5I=" + }, + "org/jetbrains/kotlin#kotlin-stdlib/1.9.0": { + "jar": "sha256-Na7/vi21qkRgcs7lD87ki3+p4vxRyjfAzH19C8OdlS4=", + "pom": "sha256-N3UiY/Ysw+MlCFbiiO5Kc9QQLXJqd2JwNPlIBsjBCso=" + }, + "org/openjdk/jmh#jmh-core/1.37": { + "jar": "sha256-3A6vK78ANqcLYHmMeF1uA6na8GtouO2w8bqes0IbrrM=", + "pom": "sha256-BEU74Abwb4bXxD88SS97TrM2JoDK5PHugLpl2yM3P1o=" + }, + "org/openjdk/jmh#jmh-parent/1.37": { + "pom": "sha256-DCTyFvNjfd52ORFPcCc6aX+FRvekxtWs1Mxtrum+9Mk=" + }, + "org/openjfx#javafx-plugin/0.1.0": { + "jar": "sha256-Xq7sB5m0QGRrDKTP2iGaMttr4rpXktAyoNpKOlw4j6s=", + "module": "sha256-rf+3RA0kntF8BJOD1nBp+UU7F3gncMAFtoKkNBbYNmE=", + "pom": "sha256-NMjfVSfrWjXl8AmjzeH3oInEzkoOclgC8uy+UDu9PLY=" + }, + "org/openjfx/javafxplugin#org.openjfx.javafxplugin.gradle.plugin/0.1.0": { + "pom": "sha256-1tASf/Q2PQAXPDV6mByec+/wPDCl0Ohq2CtgVPrvqEE=" + }, + "org/openrewrite#plugin/6.11.2": { + "jar": "sha256-dAt66QGZroKUlK4Jfib2q09UNzq0d3eC9yAUMyfL9fs=", + "module": "sha256-iA8IW7839ZimMSQz43weQHNo+4bEU9yqx6kC8n6u6n0=", + "pom": "sha256-RimWO6LSfL3l71E84EzahIQGwql6NevGzjV13W2fCYM=" + }, + "org/openrewrite#rewrite-bom/8.23.1": { + "pom": "sha256-8u0Wv2wmF542ps1nOlVp7peJ4Mrqlf0LCiEtVKJcTyI=" + }, + "org/openrewrite/rewrite#org.openrewrite.rewrite.gradle.plugin/6.11.2": { + "pom": "sha256-bWFob6WyvE+GbjsVgCm5iv3ZYtn6iw3k5xG+e10m4H4=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/sonatype/oss#oss-parent/9": { + "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" + } + }, + "https://repo.maven.apache.org/maven2": { + "at/favre/lib#hkdf/1.1.0": { + "jar": "sha256-gexMVudA1EC8lCb6YAyu5Ku26fTO/1dunOznw4F8WgY=", + "pom": "sha256-HCRX381QzRlXEdO38sd7YLFf+8YukrOvxTujzKawfHg=" + }, + "com/dlsc#dlsc-maven-parent/1.2.0": { + "pom": "sha256-p8CBi7FQmIk6zmfeQXEziZyrn6ANUKNxDMQFmdaoQyA=" + }, + "com/dlsc/gemsfx#gemsfx/2.6.0": { + "jar": "sha256-aquYe1ejruKNQJPgtvxrm9RSicErcfs6qiYL//9zk24=", + "pom": "sha256-edvfx3x1xd6lOE8D6aJDizzq1e5ZJBCtls2Q2TzmZ8M=" + }, + "com/dlsc/gemsfx#parent/2.6.0": { + "pom": "sha256-nSHYQq+N0GgUmQ06p5Vtnsu+3BAua3y5Rser3CqNOZ8=" + }, + "com/dlsc/pickerfx#parent/1.2.0": { + "pom": "sha256-4lUHLdlg6zdXzIFKUCAi2JZ6qsn/65YQVIi1nVn6Bz4=" + }, + "com/dlsc/pickerfx#pickerfx/1.2.0": { + "jar": "sha256-Bb9i2x4nDgVrgCvnEgA2USFljBvuotFqgTGE8H9ZLSU=", + "pom": "sha256-9+Gvj6sKVXhyzq9XmHKtd4E3hsvr15iqGS8QD0BV6VQ=" + }, + "com/dlsc/unitfx#unitfx-parent/1.0.10": { + "pom": "sha256-z1bPD/5QLEIs94RW+7gVoiZHEnArhkw4YuLNaubj5wo=" + }, + "com/dlsc/unitfx#unitfx/1.0.10": { + "jar": "sha256-Sxhrmeu47j3uesKeevLS+/dkeQQ8cj+q1Zaad+WhnBg=", + "pom": "sha256-6v50YYv2uOH3NAVfC75ayZ7hfLkWxfW8AJppE0uCOb8=" + }, + "com/fasterxml#aalto-xml/1.3.2": { + "jar": "sha256-3PLV9FMFbDzoSMr/QXkCG/uDte+zo9d5Qzxb1wl2Bos=", + "pom": "sha256-5G98AijEtoWJ2njFJgySfvR5nydr9g5sGqxDOpjK9hw=" + }, + "com/fasterxml#oss-parent/35": { + "pom": "sha256-r8Be0hBk6srI3jACUwyxkiCL0RTrJIQX2tGIbL9UBW4=" + }, + "com/fasterxml#oss-parent/38": { + "pom": "sha256-yD+PRd/cqNC2s2YcYLP4R4D2cbEuBvka1dHBodH5Zug=" + }, + "com/fasterxml#oss-parent/43": { + "pom": "sha256-5VhcwcNwebLjgXqJl5RXNvFYgxhE1Z0OTTpFsnYR+SY=" + }, + "com/fasterxml#oss-parent/44": { + "pom": "sha256-PplVTpaDtHlO11OM10Rsk4wZtswb8F+dFIBzkGuQ/iI=" + }, + "com/fasterxml#oss-parent/50": { + "pom": "sha256-9dpV3XuI+xcMRoAdF3dKZS+y9FgftbHQpfyGqhgrhXc=" + }, + "com/fasterxml#oss-parent/56": { + "pom": "sha256-/UkfeIV0JBBtLj1gW815m1PTGlZc3IaEY8p+h120WlA=" + }, + "com/fasterxml#oss-parent/58": { + "pom": "sha256-VnDmrBxN3MnUE8+HmXpdou+qTSq+Q5Njr57xAqCgnkA=" + }, + "com/fasterxml/jackson#jackson-base/2.16.1": { + "pom": "sha256-jiOFFhGXyf4S3JlltMi1fz0QMhdRIgW1tgudxnW86o0=" + }, + "com/fasterxml/jackson#jackson-base/2.17.0": { + "pom": "sha256-w9lEq1Kiy2/0VJ3O6wTUIajeYyo8yl3UVPq8f1KsMeI=" + }, + "com/fasterxml/jackson#jackson-bom/2.13.4.20221013": { + "pom": "sha256-y2P4/5jHzL5THjdkviyR0nW4/P4pcs1nqn8KeBojmjY=" + }, + "com/fasterxml/jackson#jackson-bom/2.16.1": { + "pom": "sha256-adi/myp9QsnPHXCtgr5C9qxv14iRim4ddXkuzcwRegs=" + }, + "com/fasterxml/jackson#jackson-bom/2.17.0": { + "pom": "sha256-SWSsYtWw5Ne/Vuz4sscC+pkUGCpfwtLnZvTPdoZP0qU=" + }, + "com/fasterxml/jackson#jackson-parent/2.13": { + "pom": "sha256-K7qJl4Fyrx7/y00UPQmSGj8wgspNzxIrHe2Yv1WyrVc=" + }, + "com/fasterxml/jackson#jackson-parent/2.16": { + "pom": "sha256-i/YUKBIUiiq/aFCycvCvTD2P8RIe1gTEAvPzjJ5lRqs=" + }, + "com/fasterxml/jackson#jackson-parent/2.17": { + "pom": "sha256-rubeSpcoOwQOQ/Ta1XXnt0eWzZhNiSdvfsdWc4DIop0=" + }, + "com/fasterxml/jackson/core#jackson-annotations/2.16.1": { + "jar": "sha256-pHMHceakld03k6Qs24zmvduWx34V9AyY/Y2aeuCecoY=", + "module": "sha256-oBBBBbhXmkrFKxTH+2qLPxPfU9iPT8lCoZrJy/6E9Zo=", + "pom": "sha256-xt/2p4sBSYkppprzZObLeK73LSpFJUuS1klbKhmOwSk=" + }, + "com/fasterxml/jackson/core#jackson-annotations/2.17.0": { + "jar": "sha256-hWJWmgAdRuhOojgCJX4zyPaLJOtHweDv0TOgNyxRKVk=", + "module": "sha256-RkPjPFKL6kG0/F7A4vivbBzVlQAr4voTzE+pF2JXf7w=", + "pom": "sha256-yHz4sMhDRDpM7E5pp4kTM10OR7FqGdI8IcI4JuCS+Mk=" + }, + "com/fasterxml/jackson/core#jackson-core/2.16.1": { + "jar": "sha256-9fjvkGCeZP7ILrkI5JfcfYGy65g/5Qm4cCkqGTzeTfs=", + "module": "sha256-S6CAt7eaIxoJv7AoTCyURJ7OumQzJlWRwe2CDWBzpuI=", + "pom": "sha256-Hu0WEE2ArswTfEH+FuSj/1q5or+ossScV3L+Sl/S5s4=" + }, + "com/fasterxml/jackson/core#jackson-core/2.17.0": { + "jar": "sha256-Vb4TD2poA4CIomGFbE44POeZV6D8GinsshOp79bvQ4k=", + "module": "sha256-PSDo4ew+imyoB/J3vL2UM//DSs27X9PcJIWs8lKXlIc=", + "pom": "sha256-lR2zV/nEmlyId8CJYMSoroa9jJqohwYmZL0E96/+6pU=" + }, + "com/fasterxml/jackson/core#jackson-databind/2.16.1": { + "jar": "sha256-uvio6+6PRe9ozdXi3Tkjs+KWwJN7luwLSAaqOjG8zR0=", + "module": "sha256-tDy1vynzVFuW6QV0jyU5FpXGIHEwMnxFGT/R3DdI2f8=", + "pom": "sha256-fIprQo6kaI0BIGlWzMr7I6ySj8adcXp2vdd0M0jSjbg=" + }, + "com/fasterxml/jackson/core#jackson-databind/2.17.0": { + "jar": "sha256-0O1bVMsbC7sIKOJM51KkOgBtwYizTjpK4yOKzHtjdBg=", + "module": "sha256-fHs6Ikpqvls4uhoi/kVMCyVh80uyfnI8FwkluK0Akhs=", + "pom": "sha256-itZM7RCQyt5O90sVYbmWOkUeM/Sc8/oCp4y7LaCvzxc=" + }, + "com/fasterxml/jackson/dataformat#jackson-dataformat-csv/2.16.1": { + "jar": "sha256-7aBbHqTiDzaafnPVGbA8SFSX7HzJJDYiaPBvvXr3ob0=", + "module": "sha256-wlMG3ZnsfpOimIdHqKgy+8UNxwm8NDxyzndbzQ8/h3U=", + "pom": "sha256-nsHgPUHXk2//3LgE0sHQXCyDul7npvXYWwm0PkmH9Fs=" + }, + "com/fasterxml/jackson/dataformat#jackson-dataformat-smile/2.16.1": { + "jar": "sha256-N2d0Ty435uZyw6mBdOaFZ5B9GOpcRRsgOhnnsK2TQ1Q=", + "module": "sha256-Gstdx7Rb/kYEdBemRyijrWm2FsdTIcFpwGPD0CvhK0I=", + "pom": "sha256-vWoXuvgb1M2uGZBp+MoPm7JGwV3YtkzsdDIBxtz+9qk=" + }, + "com/fasterxml/jackson/dataformat#jackson-dataformat-xml/2.16.1": { + "jar": "sha256-uOc/oXHRJ2gyq78g67TfWX43dAX4de05gIzumsyj06w=", + "module": "sha256-1w5SJRr2K5qfp47uA3tqJu4ZmTAphVNh8+EQKN5aR68=", + "pom": "sha256-khKEVzDdd22UE76t2JQRSQ9UG4/a7wMdIL380dRH0uA=" + }, + "com/fasterxml/jackson/dataformat#jackson-dataformat-yaml/2.17.0": { + "jar": "sha256-RrZazgNrAXQ3ELz8nn8EHt7S/IK6DT2D4ZsyyBjBi0w=", + "module": "sha256-IT9a3fdRMt9CITThwUAswirxt0EiJfk/f1TuDlrt0Jc=", + "pom": "sha256-eGjm/vOpdpC6N9WO4lfw5PejOaU1BHPwhI5scuRh2Mk=" + }, + "com/fasterxml/jackson/dataformat#jackson-dataformats-binary/2.16.1": { + "pom": "sha256-2o7LvtR1bqPGKjNOR734F+omCJ8l2otbxdxcKZ6YCSs=" + }, + "com/fasterxml/jackson/dataformat#jackson-dataformats-text/2.16.1": { + "pom": "sha256-1DusfWR8CD8XI4P8YinkAOSJY6TuCfTqD2LZAySVvJQ=" + }, + "com/fasterxml/jackson/dataformat#jackson-dataformats-text/2.17.0": { + "pom": "sha256-xjxXKeuXzo1Qwi/kmg09d/89qYr4WHk4qeES3dGthQI=" + }, + "com/fasterxml/jackson/datatype#jackson-datatype-jdk8/2.16.1": { + "jar": "sha256-qapcgPjdp3rY8DUApcAhq/cgrNYKrk4pOp6MKIXW3Cs=", + "module": "sha256-ixUB9M569HwUmHZVBPzhXhaUduYJr1DnxpxmLMPk+ZI=", + "pom": "sha256-8s/ApppgZcY1xfzBr2GTy/HQqrqljrTK2k0u1lrGFBU=" + }, + "com/fasterxml/jackson/datatype#jackson-datatype-jsr310/2.16.1": { + "jar": "sha256-YoGXBoKo2j3brFS7IDybrfHCb1B/PsqkjvEDGFebya0=", + "module": "sha256-kUcpUsDym3P6oCNeMXzrabXy+we+thRESrukR2sK+Yw=", + "pom": "sha256-yd4rhj3RPkYjfRhcHmYEmE9uY0cYWeoNot/E6fLwj/E=" + }, + "com/fasterxml/jackson/datatype#jackson-datatype-jsr310/2.17.0": { + "jar": "sha256-lOovIk42YywC2x5mgSfDAYysuFmvwV3fb0xYWRepM5Y=", + "module": "sha256-DXg7+bYOzm6sjx8tuukW4HsxVYQX9y/OPkqrL4yW1MM=", + "pom": "sha256-amzpD+KlIb5thcfoIh9k0eP4jxwaDwl67LZXRLFdypk=" + }, + "com/fasterxml/jackson/module#jackson-module-jaxb-annotations/2.16.1": { + "jar": "sha256-YJYSSYlrXkm+pFZex7hgEA/zhyruHY5Bat4vgS8/yjY=", + "module": "sha256-0pECVhl8P5iyv7Lk9OGSDyjab+Xe2ng/1FXeMZ7QMfI=", + "pom": "sha256-zdtENElgsf6mNk1EYmApfXTO3fDhL2NjmWP0ci83HQQ=" + }, + "com/fasterxml/jackson/module#jackson-module-parameter-names/2.16.1": { + "jar": "sha256-mzM+fmkFOAf0Kp2S/B5dpAWTjsxGgxRrix65xpZ/6o4=", + "module": "sha256-WY9Np7a+PbFBVD4KBS25ZROVBDlrxP/Sy41H4XKzLuM=", + "pom": "sha256-D2U6eU8WV+XpMaADp6NLfP+xlbXv07OcqfrEh0yPcsU=" + }, + "com/fasterxml/jackson/module#jackson-modules-base/2.16.1": { + "pom": "sha256-iv0eHmPCIXlw+WhHArnWX1F7ctlKxmUgFB3j7WgfAtM=" + }, + "com/fasterxml/jackson/module#jackson-modules-java8/2.16.1": { + "pom": "sha256-GIciU1hZ78rlq3XDBi3DLg3ejh6qbBgh9ZBSxCA8RKU=" + }, + "com/fasterxml/jackson/module#jackson-modules-java8/2.17.0": { + "pom": "sha256-3AfGDsVkRInNBomkZKm5ap3V9qP7WePRyjPUbR2iv08=" + }, + "com/fasterxml/woodstox#woodstox-core/6.5.1": { + "jar": "sha256-ySjWBmXGQV+xw5d1z5XPxE9/RYDPWrAbHDgOv/12iH8=", + "pom": "sha256-SDllThaxcU509Rq8s3jYNWgUq49NUnPR3S8c6KOQrdw=" + }, + "com/github/ben-manes/caffeine#caffeine/2.9.3": { + "jar": "sha256-Hgp7vvHdeRZTFD8/BdDkiZNL9UgeWKh8nmGc1Gtocps=", + "module": "sha256-J9/TStZlaZDTxzF2NEsJkfLIJwn6swcJs93qj6MAMHA=", + "pom": "sha256-b6TxwQGSgG+O8FtdS+e9n1zli4dvZDZNTpDD/AkjI9w=" + }, + "com/github/docker-java#docker-java-api/3.3.6": { + "jar": "sha256-OoHkFFKR//tn68dcDhmlZBaTPpEtjyF8N4lAQk0jKbE=", + "pom": "sha256-XeM/4+u6ofcEmOMLFKkS2eD1eZpIGhevE10a5snqmyk=" + }, + "com/github/docker-java#docker-java-parent/3.3.6": { + "pom": "sha256-jdqBOGg4fuv3fOS/85xmT8ggtSDUHTOksZByq9bLWnI=" + }, + "com/github/docker-java#docker-java-transport-zerodep/3.3.6": { + "jar": "sha256-/f1MfYHq+GWebOa9u5hiKGGdnHtlTb1chavQRPHeAzA=", + "pom": "sha256-D7UCE9aHUCOHnIts1pH1ZR5ynFBiSXipDrmhQYq8Tpc=" + }, + "com/github/docker-java#docker-java-transport/3.3.6": { + "jar": "sha256-MhUpuq96t/UMPppW83ttvNnvSgothGYRDiAqbgf4hZg=", + "pom": "sha256-8HHKdfDnP5fCS/rKO+385yPOEa2FEk3I0eGDBv7T0qQ=" + }, + "com/github/hypfvieh#dbus-java-core/4.2.1": { + "jar": "sha256-Onuf1UOhvpTemQCcNqwYA/CNbRI1dwbI9QQIVTFUadE=", + "pom": "sha256-IXRgXAmRRZPObYk10FKvENIo1SuN2V1IYRhnE1zsjIY=" + }, + "com/github/hypfvieh#dbus-java-parent/4.2.1": { + "pom": "sha256-eeJ6xZ6OgExWBdEMu45x2CHxorciTuc4B4LcV14Cdds=" + }, + "com/github/hypfvieh#dbus-java-transport-native-unixsocket/4.2.1": { + "jar": "sha256-u2fem9CBSBI7kYRY78eAVRRr1a4VOEh89KAY3Q9kSDc=", + "pom": "sha256-MnkIfkz4UMIYm8dSl7nnBVBSgRC+ML6Nb/eFxmGVpkU=" + }, + "com/github/javakeyring#java-keyring-parent/1.0.4": { + "pom": "sha256-bByWW9rbWaDYGa9MtdDFiZ2GBt6bgtgRt9NWcGxTv0k=" + }, + "com/github/javakeyring#java-keyring/1.0.4": { + "jar": "sha256-7c0NsZ5aIWJl2gNGFbi+8TgBaNSJFT85CtxIRJPJqlo=", + "pom": "sha256-/wQyxT//a1/dcnAG08orA7lEUjl7g4+PFUby92u0OSM=" + }, + "com/github/tomtung#latex2unicode_2.13/0.3.2": { + "jar": "sha256-sOJRyPXdNuZ1TOunDNRjBZ4pfgy9Iw3Jcc/bG1BY89Q=", + "pom": "sha256-wRAxRUgycqScz7gHpv5MuKR31ENvyQT2kRoLUEvieAo=" + }, + "com/github/vatbub#mslinks/1.0.6.2": { + "jar": "sha256-ue5zrbUjLnWQDg//nc7Cbzj+puROqxPbbudzEh9oRCA=", + "pom": "sha256-hdVzY9II1Vxt0ZWTsws8qLZIAW3h2/sNsfcEz9dxNzU=" + }, + "com/github/weisj#jsvg/1.2.0": { + "jar": "sha256-kS832F3qr1t0dwD1vTdhqTsUpRYZAOdDbP84a2F2EYo=", + "pom": "sha256-L1qCkk25xJTbGD3ukkL1S2/TI6/bd0oX5GMlHfPle2A=" + }, + "com/google/code/findbugs#jsr305/3.0.2": { + "jar": "sha256-dmrSoHg/JoeWLIrXTO7MOKKLn3Ki0IXuQ4t4E+ko0Mc=", + "pom": "sha256-GYidvfGyVLJgGl7mRbgUepdGRIgil2hMeYr+XWPXjf4=" + }, + "com/google/code/gson#gson-parent/2.10": { + "pom": "sha256-+1OsCwbBkRbKYaw0S03+inwpzE+Bs1POiJSTpQOQBPs=" + }, + "com/google/code/gson#gson/2.10": { + "jar": "sha256-DN0WPONZiiD8BO7nGxQLJPbyo7NfCkmdu92YUug/v68=", + "pom": "sha256-rGnZ8lQmDK6rOZjqrWDzVVmcJRIeGVFWv9/8ijVfxr0=" + }, + "com/google/errorprone#error_prone_annotations/2.10.0": { + "jar": "sha256-oknU0l37htQebIL8M131gBifDJ/uq9xTIz/B5QYHJKE=", + "pom": "sha256-1oDcn1eKd6bc2ZKywyUOsWinIUzyf48MrB8GUmcQwMw=" + }, + "com/google/errorprone#error_prone_annotations/2.26.1": { + "jar": "sha256-3iXy2aIVZSm9dl9R2O/fwN+nMB4E77nMdbfxDPXQ4Ps=", + "pom": "sha256-rqfpkeLf3LR/X71QhYdTX3gCvLni/C1Ou1C+QbaE2p8=" + }, + "com/google/errorprone#error_prone_parent/2.10.0": { + "pom": "sha256-B4kah8SQ+QDBIJe+6V7By24HHIp9+BBmY4fgx3Lwifo=" + }, + "com/google/errorprone#error_prone_parent/2.26.1": { + "pom": "sha256-SmrQDTGwpa3Nmk9gUGXVtEX65KBMv4J+XRrBB34vgU0=" + }, + "com/google/guava#failureaccess/1.0.2": { + "jar": "sha256-io+Bz5s1nj9t+mkaHndphcBh7y8iPJssgHU+G0WOgGQ=", + "pom": "sha256-GevG9L207bs9B7bumU+Ea1TvKVWCqbVjRxn/qfMdA7I=" + }, + "com/google/guava#guava-parent/26.0-android": { + "pom": "sha256-+GmKtGypls6InBr8jKTyXrisawNNyJjUWDdCNgAWzAQ=" + }, + "com/google/guava#guava-parent/33.1.0-jre": { + "pom": "sha256-D73wcsyo4Fa6MVQrt18MFJCRRABYbUukIuz8fR38ecY=" + }, + "com/google/guava#guava/33.1.0-jre": { + "jar": "sha256-NGrsDrjImHNgyKJk5w/xDC+6dgRG6yfoqwfnjnh6df4=", + "module": "sha256-6qUNmCgORsANUYq/FUgp3pm1lm0bb+KLffHVvZB+dKg=", + "pom": "sha256-VXQa0W+Yzubm3Ard3UOAacxeP/KaJuMXXU/qKHaSVLc=" + }, + "com/google/guava#listenablefuture/9999.0-empty-to-avoid-conflict-with-guava": { + "jar": "sha256-s3KgN9QjCqV/vv/e8w/WEj+cDC24XQrO0AyRuXTzP5k=", + "pom": "sha256-GNSx2yYVPU5VB5zh92ux/gXNuGLvmVSojLzE/zi4Z5s=" + }, + "com/google/j2objc#j2objc-annotations/3.0.0": { + "jar": "sha256-iCQVc0Z93KRP/U10qgTCu/0Rv3wX4MNCyUyd56cKfGQ=", + "pom": "sha256-I7PQOeForYndEUaY5t1744P0osV3uId9gsc6ZRXnShc=" + }, + "com/googlecode/javaewah#JavaEWAH/1.2.3": { + "jar": "sha256-1lImlJcTxMYaeE9BxRFn57Axb5N2Q5jrup5DNrPZVMI=", + "pom": "sha256-5O1sZpYgNm+ZOSBln+CsfLyD11PbwNwOseUplzr5byM=" + }, + "com/googlecode/plist#dd-plist/1.28": { + "jar": "sha256-iO2Ocw9zhil0hRdsQ4cUbGkUo4wOWPwpbooBzcO2IeE=", + "pom": "sha256-64AZrY6Ql2ztM0sYOyPxPxnQi9uuteSrKEpFoos4aIs=" + }, + "com/h2database#h2-mvstore/2.2.224": { + "jar": "sha256-EMeCk8sHu+6zewzCyRmnkJ6VyeTu8EZ/Ib+WGySSIUw=", + "pom": "sha256-csQffdVNSrUhROTkmFBYBJZfpifX6UYnqjN8RUtD9KY=" + }, + "com/ibm/icu#icu4j/72.1": { + "jar": "sha256-PfVyskCmjRO1zXeK0jk+iF0mQRQ0zY8JisWYfqLmTOM=", + "pom": "sha256-Pe8rKa9KGa2AXLFTBWklqJqQP5L77hre4S7S/BTETug=" + }, + "com/konghq#unirest-java-parent/3.14.5": { + "pom": "sha256-LMc4Plsi7+Umtd0r7KhgCYl2G4jebQffDBf+a7UPJ8A=" + }, + "com/konghq#unirest-java/3.14.5": { + "jar": "sha256-8MwzkiHp51loG9FDX1kY9GC+rexHRcJ6hxmvbaJtReU=", + "pom": "sha256-qIJBno0orj+m1wqfldT6jQH4IicdBcI1egKu6r6v6pE=" + }, + "com/oracle/ojdbc#ojdbc10/19.3.0.0": { + "jar": "sha256-+iJonNP7sDf07IZBJevngyXzgR/FDPGUxr1w/n5RRWg=", + "pom": "sha256-pfJtJo9fU2k9CvaVIXdzZ1/ktv5lXFVm+gZihXltP9Y=" + }, + "com/oracle/ojdbc#ons/19.3.0.0": { + "jar": "sha256-bj8kNwBxbE+i6d36oIyTlK1v2jpkDTvvA5Qfe1c9+dc=", + "pom": "sha256-iS3lC3HfR+jb7pTomhpPLDYC+7rk/LFu+sxtdq6LnlI=" + }, + "com/oracle/ojdbc#osdt_cert/19.3.0.0": { + "jar": "sha256-+qDMpZTTVNW7H16sPa+hVoOHonV2gTqb1yPW/YdEvow=", + "pom": "sha256-7BCuWrL03nbJmeAWpivQ4f49t9YwMLE1FQ6/ZzOWuog=" + }, + "com/oracle/ojdbc#osdt_core/19.3.0.0": { + "jar": "sha256-x6kMB6Euc9A8Ht1qAuaZABIT5pj+D1IloncczUarC2M=", + "pom": "sha256-8ydgabF5+h8t8AXptZtyzyQp2Sfcke7yDKOuMEGKeZw=" + }, + "com/oracle/ojdbc#simplefan/19.3.0.0": { + "jar": "sha256-UTjWWO3/DgEG8FWfaMcvuQ8c00OBSSmVt10AEuqeEvI=", + "pom": "sha256-8kMWnRLNjdURbYO+vsySNSiNGGFySLkjOa3FIX/W5wE=" + }, + "com/oracle/ojdbc#ucp/19.3.0.0": { + "jar": "sha256-I9jevkCnZN901e2n6MHOmywZCjT3OcpNdR6qlBFNMcw=", + "pom": "sha256-+SvQTVeVmp5ZlqjFSYluZRJ5ucW5VAE2EMpjN1zbItU=" + }, + "com/puppycrawl/tools#checkstyle/10.15.0": { + "jar": "sha256-RI7oAzg3HwsbSuEhPw7bJI0rYEJnpb75l+ARDVxP8aE=", + "pom": "sha256-UMoBscqFa2DqEzp9dA2RLUYqIhTpjpCzkBU5hf14K1A=" + }, + "com/salesforce/maven#MavenBase/1.0.19": { + "pom": "sha256-K6DjALx2Etaz4MDWYiw7Jv0M1s2s2JmuRWsyaw6F8c8=" + }, + "com/salesforce/maven#MavenParent/1.0.19": { + "pom": "sha256-3OlrnKlw7dinNuI9yiDal9CakdYh1mzNzGylQAdehoU=" + }, + "com/squareup/okhttp3#okhttp/3.12.0": { + "jar": "sha256-cXh/LFmeBEHHpEE5g7/dk9QLVuG63F4EE9akxIW6PzU=", + "pom": "sha256-mklEjyDeMUc8RtcixQDFXhIPp4mCm7Sv3Aa7syzOqag=" + }, + "com/squareup/okhttp3#parent/3.12.0": { + "pom": "sha256-hkeC3bfMW1sPSzZ04ChLv+jVVbXVlozkN+epQvLpDKc=" + }, + "com/squareup/okio#okio-parent/1.15.0": { + "pom": "sha256-NOCaPqKqzXId85lHDQWkeuza2AEmmiEhlf+/nSEFbbI=" + }, + "com/squareup/okio#okio/1.15.0": { + "jar": "sha256-aT+jGafohDMAYCsgQCO3Z08Qbry1d/LdWAchK2YRi9I=", + "pom": "sha256-8cELFIDRq3X7BRoHsnPjfNolJel+Fgfug+aDO3Dhv84=" + }, + "com/squareup/retrofit2#parent/2.6.1": { + "pom": "sha256-hrrYjK2fQEK3mI3+nR5e8t6Uh4FK8sPDB6ilhdSmAp4=" + }, + "com/squareup/retrofit2#retrofit/2.6.1": { + "jar": "sha256-b+36izjQWs9OUt3ku9dK7W2+A0h8XSZ/4Ehteih+lxI=", + "pom": "sha256-6rtyWWf0U2/HGFSh5UW2EBKnbbnxSM/S/rTBLH6a3Xg=" + }, + "com/sun/activation#all/1.2.2": { + "pom": "sha256-GXPUmcwsEmSv8tbQUqHHFq5hPQGK4cL2EN1qTRwkV44=" + }, + "com/sun/activation#all/2.0.1": { + "pom": "sha256-ZI1dYrYVP0LxkM7S1ucMHmRCVQyc/rZvvuCWHGYWssw=" + }, + "com/sun/activation#jakarta.activation/2.0.1": { + "jar": "sha256-ueJLfdbgdJVWLqllMb4xMMltuk144d/Yitu96/QzKHE=", + "pom": "sha256-igaFktsI5oUyBP8LYlowFDjjw26l8a5lur/tIIUCeBo=" + }, + "com/sun/istack#istack-commons-runtime/4.0.1": { + "jar": "sha256-n5ERX0SThIhvVyvWLIgS7hAEJz1LXIXKxlF5rUwWmQ8=", + "pom": "sha256-OPtqwbPZtUmt8h99yEzRXBu3x1zOtYEm6b0Wy+bd7u8=" + }, + "com/sun/istack#istack-commons-runtime/4.1.2": { + "jar": "sha256-f9Z5I2H03QD4xWr0ogzswAZt7qSo897Dg0ivI/wilu4=", + "pom": "sha256-EiKikL7dtvbpK8mZvOvDaW/NbXIhWFbSJHJ6e8LcOso=" + }, + "com/sun/istack#istack-commons-tools/4.0.1": { + "jar": "sha256-NEhuoD6CKWZ9cS4RLhZK3u11NMqBcYuw5lMHK362B4Y=", + "pom": "sha256-doe2Z9DL1OB5n8wqq9N64pJ7ORg4AATZR79eHV172M4=" + }, + "com/sun/istack#istack-commons/4.0.1": { + "pom": "sha256-zDvPJtQsLgI6SpDkfzMXk+DZR2uvJyetndyLvnNSFsI=" + }, + "com/sun/istack#istack-commons/4.1.2": { + "pom": "sha256-2Ig+twNkcB2uDjdEnIj9knUResPYYEDonxvj6dR+nJ0=" + }, + "com/sun/xml/bind#jaxb-bom-ext/3.0.2": { + "pom": "sha256-jUSIUplsdYMRpbs9oecjTGqGefTRO1InWxSp9RevjBA=" + }, + "com/sun/xml/bind#jaxb-bom-ext/4.0.3": { + "pom": "sha256-SkQftgU/yfRooSve6hy48Efq9kNzA34/BJrUMEJ/0PA=" + }, + "com/sun/xml/bind/external#relaxng-datatype/3.0.2": { + "jar": "sha256-wYsnDxQPFerIy77dRsx3cn4C92haLi237BIgSZkNFms=", + "pom": "sha256-8jwf3cYFxiEYtS/1SkTfU9CP4ypQSPtWKfn/yZ9bQQI=" + }, + "com/sun/xml/bind/external#rngom/3.0.2": { + "jar": "sha256-qo64ztOBV2dT3QBxZXliuNjmDmMnYwmmb1TPn4o80xM=", + "pom": "sha256-twSdFXrnU0PYywdBPmPIV4Q9TXsBXokXv0H5S7dP4ro=" + }, + "com/sun/xml/bind/mvn#jaxb-codemodel-parent/3.0.2": { + "pom": "sha256-sMPbw6G+mLHxcPIoNWNEFzSKK+S0oDwLtNu7hD2Dt2o=" + }, + "com/sun/xml/bind/mvn#jaxb-external-parent/3.0.2": { + "pom": "sha256-ExwRX0kx+YQ8rtDHeOD0Rb75zr+WvtiZNXh1DoyVYoE=" + }, + "com/sun/xml/bind/mvn#jaxb-parent/3.0.2": { + "pom": "sha256-HfAhd4Qlf3/Dq0XIzuIU7CBYrnbEH7zZz4OU1emMlnM=" + }, + "com/sun/xml/bind/mvn#jaxb-parent/4.0.3": { + "pom": "sha256-6WIwlX8fVlh/nP25dKNr7XcH6JYWtakKknss99NHZ28=" + }, + "com/sun/xml/bind/mvn#jaxb-runtime-parent/3.0.2": { + "pom": "sha256-mFAJ3lm0JVXoj+4X8tRGfYT2widkb4Pm/Bsx80a4690=" + }, + "com/sun/xml/bind/mvn#jaxb-runtime-parent/4.0.3": { + "pom": "sha256-PjQHp7FdgRMzJfEsVXN8xGeoyhGh5DsTotS9+HBW2no=" + }, + "com/sun/xml/bind/mvn#jaxb-txw-parent/3.0.2": { + "pom": "sha256-DVq8zIBaLrvyXD8uwbPkLc3rFuqckFuYVnRiAWjBoKs=" + }, + "com/sun/xml/bind/mvn#jaxb-txw-parent/4.0.3": { + "pom": "sha256-hU4ErXwT/9tlUbKQ6apsCN10JQdTvMgB4HZVB9EYfXw=" + }, + "com/sun/xml/dtd-parser#dtd-parser/1.4.5": { + "jar": "sha256-pM1q3c7ULi+HDcyhcW9FnaUfBvL+SUMNLRKPFHyOkp0=", + "pom": "sha256-sKYTLhmm4ALSU5VPat87YaJjVvz3f16PzEOpz9senUA=" + }, + "com/tngtech/archunit#archunit-junit5-api/1.2.1": { + "jar": "sha256-zAxo/vGa3fpBwaGDYIsQdd6+/iueLzzcAfQJYZT2u0g=", + "pom": "sha256-jpvGRO2Ygl/Jv1w/+Shsg2OMODLXAs+TcsZkhhQO3IU=" + }, + "com/tngtech/archunit#archunit-junit5-engine-api/1.2.1": { + "jar": "sha256-60XLhCUj2ne8DlDQRPvWftuwaEwAjsApGJGzTBSCqPc=", + "pom": "sha256-fBFqW8OgjDIiAIYwBl6aFQH/5GMMYXx53Ljmtp4ySWI=" + }, + "com/tngtech/archunit#archunit-junit5-engine/1.2.1": { + "jar": "sha256-bGwGyDAtt5rkq9xKpWEPqZURFfaTgbNCy2O3qBmgefQ=", + "pom": "sha256-LW4u2WZKQaaZxS5vbhjZpcojmXAOUjR6f6nAS3IMwDg=" + }, + "com/tngtech/archunit#archunit/1.2.1": { + "jar": "sha256-eLPLD4NQmPImSlnnkdiF+AitgNJCXvKY3Cz+0DPGueg=", + "pom": "sha256-GA8sOPoquiEKfyUHxdC1B1FghhfbFK/mvS8iqm/lDbU=" + }, + "com/vladsch/flexmark#flexmark-ext-emoji/0.64.8": { + "jar": "sha256-AS0ttRRjr9hHAmJ+ST/tzkLrfesbrjCd3O/RgasoPL4=", + "pom": "sha256-N1dSYA7KUGOae9HyFnK282sDFbYCoOcKDzoGRZZxQKk=" + }, + "com/vladsch/flexmark#flexmark-ext-gfm-strikethrough/0.64.8": { + "jar": "sha256-/GytAm+9A2s//QRIJkNgpfG1cnVu80J/8CJxW3/F8cM=", + "pom": "sha256-29iSNA0WNyOaf2bF5SGSELfNQX0f13HOk6llsD9xgog=" + }, + "com/vladsch/flexmark#flexmark-ext-ins/0.64.8": { + "jar": "sha256-W2G4PDHLC9MnPL8SrtOIe2O4vcbfoXsD7PR5zxzhdr0=", + "pom": "sha256-TPZAzDnlBtzCvF7Sk0ZOiet9u3X8chhlgre2M8ziWyE=" + }, + "com/vladsch/flexmark#flexmark-ext-superscript/0.64.8": { + "jar": "sha256-RXkzMk0cqfKDvBWhhCd3xt8DhfMY/M6t5N5BYhOV5AI=", + "pom": "sha256-+JfvOutkMsN/uIgBcgUxFtEa84rkcJyQiqcBVM0mGh4=" + }, + "com/vladsch/flexmark#flexmark-ext-tables/0.64.8": { + "jar": "sha256-zfgtJuES6WrefjcBOK6xaSC34tQR0gxsFcsaz6zR7x8=", + "pom": "sha256-+Lnuh0FZExL8I1PkfMjMbZIud2RInYOrrX0V8zU33PU=" + }, + "com/vladsch/flexmark#flexmark-ext-wikilink/0.64.8": { + "jar": "sha256-8y73ee77TDuA1b6/PEt61yBvxG4IOlkBz1Hbe0U1/3k=", + "pom": "sha256-Vr+s6mEz9k+F30Ir6iY/9USKNWCxfSIXw8LSvJRPtbo=" + }, + "com/vladsch/flexmark#flexmark-html2md-converter/0.64.8": { + "jar": "sha256-PySpCo/t1nCPBr5yu8n19SEavEnDXulZGM57C0FlHmI=", + "pom": "sha256-UrrKRFXJePTvC0NK2oOfmHQy9JaQFS7yDkxvHmYb7TA=" + }, + "com/vladsch/flexmark#flexmark-java/0.64.8": { + "pom": "sha256-QHv3UvN2KqkIxfxNZkuJOZTRt4OqIKKWakP4bBVetDM=" + }, + "com/vladsch/flexmark#flexmark-jira-converter/0.64.8": { + "jar": "sha256-zMHDqWWaEEt1pTojIenB1M7bBazYZ9Q2bYuOFke9N90=", + "pom": "sha256-aO668VQ27ex78DMIQgcN0iOqcXQcaX17yQKVEdlG4II=" + }, + "com/vladsch/flexmark#flexmark-util-ast/0.64.8": { + "jar": "sha256-pTQvZExqXzfVAvIlw6DLaZwmNiHILnINnAjrpanzuNM=", + "pom": "sha256-M5IPcD8naQ/qq7CKQ07O8g073bpMbcF9m1EYACUHITM=" + }, + "com/vladsch/flexmark#flexmark-util-builder/0.64.8": { + "jar": "sha256-r7nIjZ9lJFHnXxqwaa193XkdcS6yEcUdjSqDSUJAh10=", + "pom": "sha256-ERKthdmLh0tJeVT6eySR9AXb4B2kso0x9XVMzFtqL6E=" + }, + "com/vladsch/flexmark#flexmark-util-collection/0.64.8": { + "jar": "sha256-Ax/wFAjQ9UxiNdsY1FHcbmsVuFmw7B5A/zQpqCN1CCo=", + "pom": "sha256-xHLCQN7mFbkqISQcG0Lzm/44ZYlcMChulWI82UBecms=" + }, + "com/vladsch/flexmark#flexmark-util-data/0.64.8": { + "jar": "sha256-g861mJqwIFBUvxtCRG9Vy22hTBCqfCvaBdaiUEZw81M=", + "pom": "sha256-26l1Ca96vWwSBNwLP2K0hpzxqON8np1mNW4QqyTkhfE=" + }, + "com/vladsch/flexmark#flexmark-util-dependency/0.64.8": { + "jar": "sha256-5BrbXoFEaZtht41Q6wBO633oT5DExjYmYJ5s7l6ii0I=", + "pom": "sha256-0EkP+0Tt80pQprn6nrXD3XPT9weOH03oruUhmyIURVY=" + }, + "com/vladsch/flexmark#flexmark-util-format/0.64.8": { + "jar": "sha256-bJrIdoZHTt8BF7P4ONncs7ll+nK+SZjSF3tZgBNnn3M=", + "pom": "sha256-q+B6AP/rbr+L6DoCzOTSdpHnRUlRvnatteV9qmJiSOE=" + }, + "com/vladsch/flexmark#flexmark-util-html/0.64.8": { + "jar": "sha256-WxnmUGr/eRPHStclr3wrip8jlY5jJL8HEMWmRaRmMBc=", + "pom": "sha256-QSOT8DUt+GmWg4KaaRDOIX7RtSyaucYZIg1OM9W0n7o=" + }, + "com/vladsch/flexmark#flexmark-util-misc/0.64.8": { + "jar": "sha256-dEcsqBqQgOUeoaTxHCcImOPWwkLJInX6tH65k4Bsjys=", + "pom": "sha256-7kzBaZZgo0M+YJAy20ar+0yTTlGmP3pYOewfi2qVwOE=" + }, + "com/vladsch/flexmark#flexmark-util-options/0.64.8": { + "jar": "sha256-JIn0HpyvHZ+AYYM7MRslQDkly7Yx//K4wGkZKATW/Ig=", + "pom": "sha256-GA5DN4dxzcVhlDhgQ8XX9Dsq7EW9N9CJwmYV0As5i2A=" + }, + "com/vladsch/flexmark#flexmark-util-sequence/0.64.8": { + "jar": "sha256-biKXb+TpuN6U/VKZkeyy15zEgqrZSYU2dHCpO+HYJjE=", + "pom": "sha256-bOq0Eg9oVbt9IeVyDhVuogqWkeURN9ZGj0uQZzUvg+8=" + }, + "com/vladsch/flexmark#flexmark-util-visitor/0.64.8": { + "jar": "sha256-2bMAKoM6B4xF4TlWizBtqwrBF/+QRsah+eGAwBVFY/w=", + "pom": "sha256-+kWiyg+uR7+nw6GXwiuhe2QiNZhZTDimzlknPlOQwXY=" + }, + "com/vladsch/flexmark#flexmark-util/0.64.8": { + "jar": "sha256-HiTIkdrJUyu3Ir5xIscCb7R4aMPeNsAkAO7Y6a1TVyc=", + "pom": "sha256-g4Eg9qTozQub7BiGcCnXjxFNV3zcvOppRr65fsmM5/g=" + }, + "com/vladsch/flexmark#flexmark/0.64.8": { + "jar": "sha256-MTOHjRCPDhlk19Qn83mnQz4bcaRfnzwfq37QrAMB07A=", + "pom": "sha256-wwO7cco5tSiAann47wLaSpTxklt11Bh3ojRNsbwiWpI=" + }, + "commons-beanutils#commons-beanutils/1.9.4": { + "jar": "sha256-fZOMgXiQKARcCMBl6UvnX8KAUnYg1b1itRnVg4UyNoo=", + "pom": "sha256-w1zKe2HUZ42VeMvAuQG4cXtTmr+SVEQdp4uP5g3gZNA=" + }, + "commons-cli#commons-cli/1.6.0": { + "jar": "sha256-aeEjcFms1W8PhlTc3gnYoUEu7oKRi+9VZNUfj7J1cRs=", + "pom": "sha256-x3AmC5U07xOUD6CHpbAZasVKZNDc1IXermbErapsF1g=" + }, + "commons-codec#commons-codec/1.15": { + "jar": "sha256-s+n21jp5AQm/DQVmEfvtHPaQVYJt7+uYlKcTadJG7WM=", + "pom": "sha256-yG7hmKNaNxVIeGD0Gcv2Qufk2ehxR3eUfb5qTjogq1g=" + }, + "commons-codec#commons-codec/1.16.0": { + "jar": "sha256-VllfsgsLhbyR0NUD2tULt/G5r8Du1d/6bLslkpAASE0=", + "pom": "sha256-bLWVeBnfOTlW/TEaOgw/XuwevEm6Wy0J8/ROYWf6PnQ=" + }, + "commons-codec#commons-codec/1.16.1": { + "jar": "sha256-7Ie/tV8iy9GyHiGQ7toosrMS7SpDHuSfvcwBgS0EpeQ=", + "pom": "sha256-uCbd2S+dfMZDcaAvoIMMFU1nyYNw6lSi0ZbnLrWQrSg=" + }, + "commons-collections#commons-collections/3.2.2": { + "jar": "sha256-7urpF5FxRKaKdB1MDf9mqlxcX9hVk/8he87T/Iyng7g=", + "pom": "sha256-1dgfzCiMDYxxHDAgB8raSqmiJu0aES1LqmTLHWMiFws=" + }, + "commons-digester#commons-digester/2.1": { + "jar": "sha256-4LK5gKhPxlM8XOKR8ZF7MsUH9ivK1kGY//RDaMIZaj0=", + "pom": "sha256-FaWcDnV8bAfD0baJ1zXI46nsVpXWzrapQdQGKrIpAbc=" + }, + "commons-io#commons-io/2.15.1": { + "jar": "sha256-pYrxLuG2jP0uuwwnyu8WTwhDgaAOyBpIzCdf1+pU4VQ=", + "pom": "sha256-Fxoa+CtnWetXQLO4gJrKgBE96vEVMDby9ERZAd/T+R0=" + }, + "commons-logging#commons-logging/1.2": { + "jar": "sha256-2t3qHqC+D1aXirMAa4rJKDSv7vvZt+TmMW/KV98PpjY=", + "pom": "sha256-yRq1qlcNhvb9B8wVjsa8LFAIBAKXLukXn+JBAHOfuyA=" + }, + "commons-validator#commons-validator/1.7": { + "jar": "sha256-TXT0zk+2iyYX7a0Ibfbe/fkzhGfSN30sYuaQOOHE8C8=", + "pom": "sha256-UztBf2dHU/bHn6v7/vlqRj6pw8yj16g/8Ot9dmgpP8k=" + }, + "de/rototor/jeuclid#jeuclid-core/3.1.11": { + "jar": "sha256-YQbzzUZZnxpEzHn2z937hwY8CpX4z2+Z3g4uUIO/Opk=", + "pom": "sha256-vS3A6dN1Fn8TOTnQdApdXprF/gWGTWGs4RJxfYC4vG4=" + }, + "de/rototor/jeuclid#jeuclid-parent/3.1.11": { + "pom": "sha256-+T/FFx4EcsyDQLfOyXomFjolaNMpCEQFthjooVF1sNE=" + }, + "de/rototor/snuggletex#snuggletex-core/1.3.0": { + "jar": "sha256-7w3dJvbdYAa7KBc+GclddBNORETGdloYAG4L05LcKxs=", + "pom": "sha256-5ydOkNQLsH8QV1/YDte8jAhqgRA+HVhMALqxrjKphbs=" + }, + "de/rototor/snuggletex#snuggletex-jeuclid/1.3.0": { + "jar": "sha256-XALsqU5bJFi/oQuYVVZQ443GGlUauebI5JN0v76dlhk=", + "pom": "sha256-IbGfKgTq1ykaBhEdpQ8OmkmcyOtNY361+AOhCrYhP/I=" + }, + "de/rototor/snuggletex#snuggletex/1.3.0": { + "pom": "sha256-9oYkdlBlNa7G36UyTmJQk8fYwY47yqx1nvlDDbeK/0Q=" + }, + "de/sandec#JMemoryBuddy/0.5.1": { + "jar": "sha256-4Exc1XGjH2m7lnM0bQYhA9SPVJ/6wVu/bFyuqBhFOb4=", + "pom": "sha256-2Iq74jW0dpXz85Q9xT1rkh3MJXDqZgw3PuOTc4XL8bE=" + }, + "de/saxsys#mvvmfx-parent/1.8.0": { + "pom": "sha256-tp0rfN1IaPX4/rFgaV7mvP/PsIf7LYGeXXW7o1AjbJs=" + }, + "de/saxsys#mvvmfx/1.8.0": { + "jar": "sha256-BCQbjfnK7uHeBTsMRi/m4cLeMXLw6fVCsDh5CsUJHV4=", + "pom": "sha256-mASw53q9WQLcBOAT5LhQETFo2rjEV0kEZNK3XBud9JM=" + }, + "de/swiesend#secret-service/1.8.1-jdk17": { + "jar": "sha256-A7ouzaiq01ipF9I23oVP10b25szZp0ti98UkdzMwo0Y=", + "pom": "sha256-29pS9ELRHsCI5GAHXeBCgn0JEB93W8IoQoAZAtM3z+Y=" + }, + "de/undercouch#citeproc-java/3.0.0": { + "jar": "sha256-ah2CFCjGIXZiGS9pLR3sgs25vWTFz7O+R5V+Luo/EPk=", + "module": "sha256-0WU5hgCyIOsiGiDXydX+yX3ZBOO7p5hBVuhfWOv4mbo=", + "pom": "sha256-0LpxAQH7jCteBQxlLPYr+KmZT+6PBv+jzi2BLdkABMk=" + }, + "dev/failsafe#failsafe-parent/3.3.2": { + "pom": "sha256-52onlGrLqFePJthfAjPMDzlGiw58KYXcbXxs4BBVLYQ=" + }, + "dev/failsafe#failsafe/3.3.2": { + "jar": "sha256-LF3Ieabax+o6eynXleJ71JuOeQiwXC8+VgU8GdeYUPU=", + "pom": "sha256-elPaR8MAdPlyXIyfzWg8a/gTZ9QnO9+653PzPDR8aCs=" + }, + "eu/lestard#doc-annotations/0.2": { + "jar": "sha256-Yl5U0tQDYG0hdD/PbYsHJD7yhEQ9pNwvpBKUQX34Glw=", + "pom": "sha256-YT1F0/kGPP++cdD0u1U1yHa+JOOkeWTXEFWqCDRBJI4=" + }, + "info/debatty#java-string-similarity/2.0.0": { + "jar": "sha256-h2dZheY30jG1eD0f6gvZR+cSZ79VetyTzj2uyKUZvSI=", + "pom": "sha256-dgQpbIuuApGPJvekSKGwnzjluw2W1XhuTi3yF2B+9No=" + }, + "info/picocli#picocli/4.7.5": { + "jar": "sha256-6DqQb7mbVwkdHWisEffD0lGL16ganHGyWeLADRVkyOg=", + "pom": "sha256-fk6LD0t8pgdSCyDS8eWN9Pk0ymNsseuoKJz/LylWv9g=" + }, + "io/fabric8#kubernetes-client-bom/5.12.4": { + "pom": "sha256-0jI5KonD79yFqymcWpToud01vALzQM6ERv9lmqFZE6A=" + }, + "io/github/classgraph#classgraph/4.8.168": { + "jar": "sha256-IjPyDp2MY0qa8oQkYQAEHGdnDdb+OzWroXKHWACWWmg=", + "pom": "sha256-98UQqlWYvLu+nMT8dqy/mnD0Z3rQkaJy46weuS31zvw=" + }, + "io/github/fastfilter#fastfilter/1.0.2": { + "jar": "sha256-OPiCTQfIyTL6UMwBdfMsD/8vr7ORPNL5VxrDScljEUk=", + "pom": "sha256-Z+W0AfZs90NI+mBkUbg7wuoYwrWGEKikE23e0Y6IeT4=" + }, + "io/github/fastfilter#fastfilter_java/1.0.2": { + "pom": "sha256-YEBDeouTEBGJJsGgqK4aRWTisn1dFfM+jF6XgGGTGAw=" + }, + "io/github/java-diff-utils#java-diff-utils-parent/4.12": { + "pom": "sha256-2BHPnxGMwsrRMMlCetVcF01MCm8aAKwa4cm8vsXESxk=" + }, + "io/github/java-diff-utils#java-diff-utils/4.12": { + "jar": "sha256-mZCiA5d49rTMlHkBQcKGiGTqzuBiDGxFlFESGpAc1bU=", + "pom": "sha256-wm4JftyOxoBdExmBfSPU5JbMEBXMVdxSAhEtj2qRZfw=" + }, + "io/micrometer#micrometer-core/1.9.17": { + "jar": "sha256-w1DP3HbAg1bxKmDoQPLb6u6nVAcS1YtUvs1sMCqGFHo=", + "pom": "sha256-A5aSALpYr0jxc6v17OILwK8Ic1BF+/4zAl9P2aiGqxY=" + }, + "io/netty#netty-bom/4.1.107.Final": { + "pom": "sha256-w2mXVYv7ThHyAN2m7i5BpF8t+eGu9njtoI553Yk4whA=" + }, + "io/quarkus/gizmo#gizmo/1.0.11.Final": { + "jar": "sha256-pUv7ttzOkpgTRZWzzR35YbxzJGiCXybuUpbytfiMC5k=", + "pom": "sha256-/9w5IIbOwtuB0m4uvTYDRxHokpwoQ1uUdpGWCFNrOP0=" + }, + "jakarta/activation#jakarta.activation-api/1.2.2": { + "jar": "sha256-oYepORA671hJp6+EvX4nvi0SDEEK8pFDc3X/4GH08J0=", + "pom": "sha256-XlD+k4BoRx9QSn78QHGCNCW1IOq8b4DHLZNevVRoMJE=" + }, + "jakarta/activation#jakarta.activation-api/2.1.3": { + "jar": "sha256-AbF21xihaSY+eCkGkfxHmXcYa8xrMzSHMlCE1lhvRic=", + "pom": "sha256-slSZQMF7aGWjT2E1t3Iu2Mv+9tC2wNs3LDDwNGvIzVg=" + }, + "jakarta/annotation#jakarta.annotation-api/2.1.1": { + "jar": "sha256-X2X9r0JO7itV4diCupuzdr6T+wmze4CL5uIuiFHJCf4=", + "pom": "sha256-r2UOyh3huYdBAGrNglB+RAjP/t0v7jOg6kY9YVCNt+w=" + }, + "jakarta/inject#jakarta.inject-api/2.0.1": { + "jar": "sha256-99yYBi/M8UEmq7dRtk+rEsMSVm6MvchINZi//OqTr3w=", + "pom": "sha256-5/1yMuljB6V1sklMk2fWjPQ+yYJEqs48zCPhdz/6b9o=" + }, + "jakarta/platform#jakarta.jakartaee-bom/9.1.0": { + "pom": "sha256-35jgJmIZ/buCVigm15o6IHdqi6Aqp4fw8HZaU4ZUyKQ=" + }, + "jakarta/platform#jakartaee-api-parent/9.1.0": { + "pom": "sha256-p3AsSHAmgCeEtXl7YjMKi41lkr8PRzeyXGel6sgmWcA=" + }, + "jakarta/servlet#jakarta.servlet-api/6.0.0": { + "jar": "sha256-wDTrGvsViYfbtTpf6gyt9hHI2ujardWcRNnVq3ASnO8=", + "pom": "sha256-PVolnfvSuUDklcMFy6K2BhWSPcgXjgMrfvYMuyQThDk=" + }, + "jakarta/validation#jakarta.validation-api/3.0.2": { + "jar": "sha256-KRwl5pEMxqfr2W1Ma66/bXw3Z2xUgsLZYUbpAbYsH8k=", + "pom": "sha256-CnucYyeWiv4NgvfPT6y9p+FXloxYCNaby4AZhjspjcQ=" + }, + "jakarta/ws/rs#all/3.1.0": { + "pom": "sha256-1P3UF4DgZarNWsCZzQSQFxk3zFEi3CyO8biKh7PJQkw=" + }, + "jakarta/ws/rs#jakarta.ws.rs-api/3.1.0": { + "jar": "sha256-azs2KLi0rt2g0kwzVDNemFSX2O88UQuPMCjpINW4Zj0=", + "pom": "sha256-xpejA+n/wxlj6xwnW793pYOn1IKWWsTxuybckeWV/78=" + }, + "jakarta/xml/bind#jakarta.xml.bind-api-parent/2.3.3": { + "pom": "sha256-KA2lMXYBZtRBI2jQ3Yme9K6/0KfYK/IzUC4phWgGrak=" + }, + "jakarta/xml/bind#jakarta.xml.bind-api-parent/3.0.1": { + "pom": "sha256-nx+11KAun4/dYu876rlLj+p7gWQ3SMhvaKMfQPd0rVY=" + }, + "jakarta/xml/bind#jakarta.xml.bind-api-parent/4.0.2": { + "pom": "sha256-SCzbRtTdL1r33IhMim3nPd/+ba9UnvNqbAd/1uQe7Qg=" + }, + "jakarta/xml/bind#jakarta.xml.bind-api/2.3.3": { + "jar": "sha256-wEU59HLppt0MdoXqgtZ3KCJpq457rKLhRQDjgeDGzsU=", + "pom": "sha256-f+LKXc5LFKZGu/kh0TykLK8qLAZU2hVcdWOGXJiTlv0=" + }, + "jakarta/xml/bind#jakarta.xml.bind-api/3.0.1": { + "jar": "sha256-uPtL7j/1tcHvdxRNhBExYBjXu9Qfzx7eBkb3l4VGuGc=", + "pom": "sha256-onPayXQUEv2dzM6ZESmHBteJ5YLcs1GXB19v0qWw6+o=" + }, + "jakarta/xml/bind#jakarta.xml.bind-api/4.0.2": { + "jar": "sha256-DWvP5Hdj6FBHrPfDmDNtyE/4XrytCny287nT6YEkVAY=", + "pom": "sha256-q3Jz4mpUgks7czPUlW5uzSbeE6XrPZDuYwIxk6ktcr4=" + }, + "javax/measure#unit-api/2.1.2": { + "jar": "sha256-XZ8donteeopyNap7V0jbSjSa0D0poaIAKaiFqYni9jo=", + "pom": "sha256-Iwbk9m8ncc0FSEyu2lnyfIWPbl3kHVuFCOlzo2mBUHY=" + }, + "junit#junit/4.13.2": { + "jar": "sha256-jklbY0Rp1k+4rPo0laBly6zIoP/1XOHjEAe+TBbcV9M=", + "pom": "sha256-Vptpd+5GA8llwcRsMFj6bpaSkbAWDraWTdCSzYnq3ZQ=" + }, + "net/bytebuddy#byte-buddy-agent/1.14.12": { + "jar": "sha256-KzCakwAJLgtpb3xHH9UdmWkAHfeEyKufB5l0N9dXrW0=", + "pom": "sha256-ZpifcNNV1gD9TZJtiDXke30b7/Z47r7FnRljY7XNTCw=" + }, + "net/bytebuddy#byte-buddy-parent/1.14.12": { + "pom": "sha256-m3/SvyklMayw6XTZVeSjbKQTMt0Nr+icJNj+Q5uuV7A=" + }, + "net/bytebuddy#byte-buddy-parent/1.14.9": { + "pom": "sha256-Zrg0IlHTXyBj5pMW9juvywVjQv516SHA9GXC2WWTU14=" + }, + "net/bytebuddy#byte-buddy/1.14.12": { + "jar": "sha256-lwY2E01hwYOxn49Y+mMeMNLyq8o0SzeEijk8rHhj3XA=", + "pom": "sha256-XamVxw3nt/SoSKhUN8fd7oA9GrfKwtfY33GUw9XicU0=" + }, + "net/bytebuddy#byte-buddy/1.14.9": { + "jar": "sha256-N3NS4lMoK/hvcxrJDtiDSOj0CmPOAzwAqFmC3n55Dm8=", + "pom": "sha256-LWdykQ0WFpvUySKeijZc9U4ZK8Ygy8+n+EJx9dEV6BU=" + }, + "net/harawata#appdirs/1.2.2": { + "jar": "sha256-wf0q5mJLk4+7/Cr4fTdlb6lTYRNW4lKOhN0EYor4B68=", + "pom": "sha256-B+NZycEfUgyvAn17z9nAlpNf6AEj0lC1vr+vw8HDdWw=" + }, + "net/java/dev/jna#jna-platform/5.13.0": { + "jar": "sha256-R017iPbpcAm27B2YwwJN2VwjGHxl2r+8NTMbysPRc90=", + "pom": "sha256-Y7IMivBXyYGW+HieGiGm3d8Cqo84XmsEtLT58N8lcGY=" + }, + "net/java/dev/jna#jna-platform/5.14.0": { + "jar": "sha256-rkys6zhAcwwlN/m3+1WgG6ulgChrQSKVFIi87lWMJEk=", + "pom": "sha256-bLoOBPnuyxZIYAB5O7J+EDsPTQSF4FVOK0wK7RPS7RY=" + }, + "net/java/dev/jna#jna/5.13.0": { + "jar": "sha256-ZtT4GaBipRodVie//CP6xV0Wd/Dgof66FEqr3WcKZLs=", + "pom": "sha256-9RXCV4F49FJH7Mp6nh2xCVMbHELyQk4lPO6w9rjUI3Q=" + }, + "net/java/dev/jna#jna/5.14.0": { + "jar": "sha256-NO0eHyf6iWvKUNvE6ZzzcylnzsOHp6DV40hsCWc/6MY=", + "pom": "sha256-4E4llRUB3yWtx7Hc22xTNzyUiXuE0+FJISknY+4Hrj0=" + }, + "net/jcip#jcip-annotations/1.0": { + "jar": "sha256-vlgFOSBgxxR0v2yaZ6CZRxJ00wuD7vhL/E4IiaTx3MA=", + "pom": "sha256-XBnmhIzFUKlWZPsIIwS8X5/Pe2cvrwOvFjXw6TwmgXc=" + }, + "net/jodah#typetools/0.6.1": { + "jar": "sha256-7+iqots4OhUeMYgQQAgEw5kr3lQ+dKTXLeon7VR0yvo=", + "pom": "sha256-HxvbdkwDDZ3Q3MGAxHfDKgtwRuK6GDmAsSJXVeLegZ8=" + }, + "net/sf/jopt-simple#jopt-simple/5.0.4": { + "jar": "sha256-3ybMWPI19HfbB/dTulo6skPr5Xidn4ns9o3WLqmmbCg=", + "pom": "sha256-amd2O3avzZyAuV5cXiR4LRjMGw49m0VK0/h1THa3aBU=" + }, + "net/sf/saxon#Saxon-HE/12.4": { + "jar": "sha256-V1+LaW47b5qno78BYRuL8bhFdrVc4pvBZlalOhR+9EE=", + "pom": "sha256-op6LTcFteBhLSANZRkoazPbahWpP31vyugKtTistHBs=" + }, + "net/synedra#validatorfx/0.5.0": { + "jar": "sha256-XfN+TrBpGSzyguSXe8pCcbaitVuzIhhUbsHzB/YlxgY=", + "module": "sha256-/Tug0IOZVKYfG8oVdC20pC7lKUQngFYyF4Q5HjNcUo8=", + "pom": "sha256-nEf1KmxKSozF0fdU1cQuGIyRvoiA9PxUb50jG6FE70E=" + }, + "org/abego/treelayout#org.abego.treelayout.core/1.0.3": { + "jar": "sha256-+l4xOVw5wufUasoPgfcgYJMWB7L6Qb02A46yy2+5MyY=", + "pom": "sha256-o7KyI3lDcDVeeSQzrwEvyZNmfAMxviusrYTbwJrOSgw=" + }, + "org/antlr#ST4/4.3.4": { + "jar": "sha256-+SesOExG10n4texolypTrtIeADE1CSmWFu23O/oV/zM=", + "pom": "sha256-nnwfPkiZGUQOjBMInlljcp1bf4D3AjO/uuMJxkmryj4=" + }, + "org/antlr#antlr-master/3.5.3": { + "pom": "sha256-6p43JQ9cTC52tlOL6XtX8zSb2lhe31PzypfiB7OFuJU=" + }, + "org/antlr#antlr-runtime/3.5.3": { + "jar": "sha256-aL+fWjPfyzQDNJXFh+Yja+9ON6pmEpGfWx6EO5Bmn7k=", + "pom": "sha256-EymODgqvr0FP99RAZCfKtuxPv6NkJ/bXEDxDLzLAfSU=" + }, + "org/antlr#antlr4-master/4.11.1": { + "pom": "sha256-cupd6Nq7ZhV4X9D+qqur1T3NrnD+FrzXx7lobApuAK0=" + }, + "org/antlr#antlr4-master/4.13.1": { + "pom": "sha256-28/JebgFKPwMtFP8to28nSsGA6e+LNzpmrL8aHFGnRg=" + }, + "org/antlr#antlr4-runtime/4.11.1": { + "jar": "sha256-4GxlU8HMwU02BS7EsPxvE7gIz5V7Wx3D9hv0AZlq2lk=", + "pom": "sha256-xFbsKVkHjFkfvX72mtlACnJ5IAaNdGmJx0q4BO1oGzQ=" + }, + "org/antlr#antlr4-runtime/4.13.1": { + "jar": "sha256-VGZdKDjMZkWDQ0aO/FOeRU/JW0aooEsTxqxD/JvmNQU=", + "pom": "sha256-GSJrF7+jj5nqImsi6XQg4qjt4JqXQg+xrPGG2a2kZXE=" + }, + "org/antlr#antlr4/4.13.1": { + "jar": "sha256-ziYdzmlSWDmqn8W9IyzhuBOnpAp1AwcTzEqA74Fw89U=", + "pom": "sha256-ahWaEs/WYoqnNuw//ZM/qUEuXLy3zn7FIXo/9CDGapk=" + }, + "org/apache#apache/13": { + "pom": "sha256-/1E9sDYf1BI3vvR4SWi8FarkeNTsCpSW+BEHLMrzhB0=" + }, + "org/apache#apache/16": { + "pom": "sha256-n4X/L9fWyzCXqkf7QZ7n8OvoaRCfmKup9Oyj9J50pA4=" + }, + "org/apache#apache/19": { + "pom": "sha256-kfejMJbqabrCy69tAf65NMrAAsSNjIz6nCQLQPHsId8=" + }, + "org/apache#apache/21": { + "pom": "sha256-rxDBCNoBTxfK+se1KytLWjocGCZfoq+XoyXZFDU3s4A=" + }, + "org/apache#apache/23": { + "pom": "sha256-vBBiTgYj82V3+sVjnKKTbTJA7RUvttjVM6tNJwVDSRw=" + }, + "org/apache#apache/29": { + "pom": "sha256-PkkDcXSCC70N9jQgqXclWIY5iVTCoGKR+mH3J6w1s3c=" + }, + "org/apache#apache/30": { + "pom": "sha256-Y91KOTqcDfyzFO/oOHGkHSQ7yNIAy8fy0ZfzDaeCOdg=" + }, + "org/apache#apache/31": { + "pom": "sha256-VV0MnqppwEKv+SSSe5OB6PgXQTbTVe6tRFIkRS5ikcw=" + }, + "org/apache#apache/6": { + "pom": "sha256-Eu21CW4T9Aw2LQvUCQJYn6lYZQUSP6Jnmc5QsRb6W7M=" + }, + "org/apache#apache/7": { + "pom": "sha256-E5fOHbQzrcnyI9vwdJbRM2gUSHUfSuKeWPaOePtLbCU=" + }, + "org/apache/commons#commons-compress/1.24.0": { + "pom": "sha256-g1qmZTLHql7G6F+FKJ2NP6raDGmLmLmxpBC4pUmcMMU=" + }, + "org/apache/commons#commons-compress/1.26.1": { + "jar": "sha256-J7tdQPN8O7cgW0oFQCR98FdxXp9su9l9Ymq4tQMYuwQ=", + "pom": "sha256-X0SKAh2IyW84QN/mGRKNYuXPticSzW5m3KincElFsG4=" + }, + "org/apache/commons#commons-csv/1.10.0": { + "jar": "sha256-LQbmoHpja693etjmWSVvIRkQnd4jVRybgMVCLUJLgIw=", + "pom": "sha256-JDVBrVAeQ+8Jus96hsh/fD7QGNNKgj/19U5ajFgRCU8=" + }, + "org/apache/commons#commons-lang3/3.14.0": { + "jar": "sha256-e5a/PuaJSau1vEZVWawnDgVRWW+jRSP934kOxBjd4Tw=", + "pom": "sha256-EQQ4hjutN8KPkGv4cBbjjHqMdYujIeCdEdxaI2Oo554=" + }, + "org/apache/commons#commons-lang3/3.8.1": { + "jar": "sha256-2sgH9lsHaY/zmxsHv+89h64/1G2Ru/iivAKyqDFhb2g=", + "pom": "sha256-7I4J91QRaFIFvQ2deHLMNiLmfHbfRKCiJ7J4vqBEWNU=" + }, + "org/apache/commons#commons-math3/3.2": { + "jar": "sha256-YmipoOo+dp/Ek6IURmZMDvZo5IyT0SZ5H28/dXl4/uI=", + "pom": "sha256-LNDbe843DBQEAlzAE8Efj9SfPzw0Cm0tz5nTY9eUimk=" + }, + "org/apache/commons#commons-parent/17": { + "pom": "sha256-lucYuvU0h07mLOTULeJl8t2s2IORpUDgMNWdmPp8RAg=" + }, + "org/apache/commons#commons-parent/28": { + "pom": "sha256-FHM6aOixILad5gzZbSIhRtzzLwPBxsxqdQsSabr+hsc=" + }, + "org/apache/commons#commons-parent/34": { + "pom": "sha256-Oi5p0G1kHR87KTEm3J4uTqZWO/jDbIfgq2+kKS0Et5w=" + }, + "org/apache/commons#commons-parent/39": { + "pom": "sha256-h80n4aAqXD622FBZzphpa7G0TCuLZQ8FZ8ht9g+mHac=" + }, + "org/apache/commons#commons-parent/45": { + "pom": "sha256-nIhiPs+pHwEsZz7kYiwO60Nn5eDSItlg92zSCLGk/aY=" + }, + "org/apache/commons#commons-parent/47": { + "pom": "sha256-io7LVwVTv58f+uIRqNTKnuYwwXr+WSkzaPunvZtC/Lc=" + }, + "org/apache/commons#commons-parent/51": { + "pom": "sha256-m3edGLItjeVZYFVY57sKCjGz8Awqu5yHgRfDmKrKvso=" + }, + "org/apache/commons#commons-parent/52": { + "pom": "sha256-ddvo806Y5MP/QtquSi+etMvNO18QR9VEYKzpBtu0UC4=" + }, + "org/apache/commons#commons-parent/56": { + "pom": "sha256-VgxwUd3HaOE3LkCHlwdk5MATkDxdxutSwph3Nw2uJpQ=" + }, + "org/apache/commons#commons-parent/58": { + "pom": "sha256-LUsS4YiZBjq9fHUni1+pejcp2Ah4zuy2pA2UbpwNVZA=" + }, + "org/apache/commons#commons-parent/61": { + "pom": "sha256-0+wtNYSB/lEmDBNbtg+lIRwvXhhaFOp/eNA6Fr2QmNc=" + }, + "org/apache/commons#commons-parent/64": { + "pom": "sha256-bxljiZToNXtO1zRpb5kgV++q+hI1ZzmYEzKZeY4szds=" + }, + "org/apache/commons#commons-parent/65": { + "pom": "sha256-bPNJX8LmrJE6K38uA/tZCPs/Ip+wbTNY3EVnjVrz424=" + }, + "org/apache/commons#commons-parent/66": { + "pom": "sha256-SP1tyEblax9AhmDRY+dTAPnjhLtjvkgqgIKiHXKo25w=" + }, + "org/apache/commons#commons-text/1.11.0": { + "jar": "sha256-Ks8woHCxkWPVpIDq5BGigTQehwAg41NMbV1MhHJznjA=", + "pom": "sha256-O0AZecBkEoXYUM8Ri04Y8EmsIj3Hherk0LNXKPxTTRE=" + }, + "org/apache/commons#commons-text/1.3": { + "jar": "sha256-gYWzpTEQktg+0fGEwtCTsxBdcmu9doZ8MrNRFUK7mag=", + "pom": "sha256-3usrqXAeSV3DHTJjPrhrlLJLCpbg3Gf7h+cGLxUwJ6o=" + }, + "org/apache/geronimo/genesis#genesis-default-flava/2.0": { + "pom": "sha256-CObhRvTiRSZt/53YALEodd0jZ9P2ejSrZgoSbIESFfg=" + }, + "org/apache/geronimo/genesis#genesis-java5-flava/2.0": { + "pom": "sha256-58U1i7u8J9qlsyf2O8EmUKdd3J+axtS/oSeJvh8sKds=" + }, + "org/apache/geronimo/genesis#genesis/2.0": { + "pom": "sha256-ue0vndQ0YxFY13MI7lZIYiwinM7OFyLF43ekKWkj2uY=" + }, + "org/apache/httpcomponents#httpasyncclient/4.1.5": { + "jar": "sha256-DBh3SJqdG6T6UPbPyrEdESNhiFjLMdVq+qta/dUGTZk=", + "pom": "sha256-beSudsiSFXUj62TD2bFNvHSnWGNrQO5MxkVqwRmYKXU=" + }, + "org/apache/httpcomponents#httpclient/4.5.13": { + "jar": "sha256-b+kCalZsalABYIzz/DIZZkH2weXhmG0QN8zb1fMe90M=", + "pom": "sha256-eOua2nSSn81j0HrcT0kjaEGkXMKdX4F79FgB9RP9fmw=" + }, + "org/apache/httpcomponents#httpcomponents-asyncclient/4.1.5": { + "pom": "sha256-6QGB4oDAJx/zE3QTQ+bwVAX66IJwL0WkzibewBbNnJ8=" + }, + "org/apache/httpcomponents#httpcomponents-client/4.5.13": { + "pom": "sha256-nLpZTAjbcnHQwg6YRdYiuznmlYORC0Xn1d+C9gWNTdk=" + }, + "org/apache/httpcomponents#httpcomponents-core/4.4.13": { + "pom": "sha256-xVTnAI5FF8fvVOAFzIt09Mh6VKDqLG9Xvl0Fad9Rk2s=" + }, + "org/apache/httpcomponents#httpcomponents-core/4.4.14": { + "pom": "sha256-IJ7ZMctXmYJS3+AnyqnAOtpiBhNkIylnkTEWX4scutE=" + }, + "org/apache/httpcomponents#httpcomponents-parent/11": { + "pom": "sha256-qQH4exFcVQcMfuQ+//Y+IOewLTCvJEOuKSvx9OUy06o=" + }, + "org/apache/httpcomponents#httpcomponents-parent/12": { + "pom": "sha256-QgnwlZMhKYfCnWgBkXMJ3V5vcbU7Kx0ODw77mErRH6E=" + }, + "org/apache/httpcomponents#httpcore-nio/4.4.13": { + "jar": "sha256-cfz76GkALEhWPMWXn8c0VxyNDRZ8zOQpcMky8zeYHxk=", + "pom": "sha256-8yDynYbZgAPg8NxA1UNj3vuLpGJr5RoNMVhbyXYqFsw=" + }, + "org/apache/httpcomponents#httpcore/4.4.13": { + "jar": "sha256-4G6J1AlDJF/Po57FN82/zjdirs3o+cWXeA0rAMK0NCQ=", + "pom": "sha256-j4Etn6e3Kj1Kp/glJ4kypd80S0Km2DmJBYeUMaG/mpc=" + }, + "org/apache/httpcomponents#httpcore/4.4.14": { + "jar": "sha256-+VYgnkUMsdDFF3bfvSPlPp3Y25oSmO1itwvwlEumOyg=", + "pom": "sha256-VXFjmKl48QID+eJciu/AWA2vfwkHxu0K6tgexftrf9g=" + }, + "org/apache/httpcomponents#httpmime/4.5.13": { + "jar": "sha256-BudU2ZJFuY3MKGDctD0g5zfWUNor8gd6EF9orMvVxcw=", + "pom": "sha256-k0GN8hCu7VBQJUjbzysXwPHZFEMDDnL+++7RZSscKN0=" + }, + "org/apache/httpcomponents/client5#httpclient5-parent/5.1.3": { + "pom": "sha256-onsUE67OkqOqR3SRX3WJ4MYXnXKNKsailddY7k+iTMU=" + }, + "org/apache/httpcomponents/client5#httpclient5/5.1.3": { + "jar": "sha256-KMdZJU9ONTGeB4u2/+p1Z2YI3BLLJDsk+zyHMlIpd/4=", + "pom": "sha256-GYirPRva4PUfIsg9yXuI+gdWGttiRGedi49xRs3ROq8=" + }, + "org/apache/httpcomponents/core5#httpcore5-h2/5.1.3": { + "jar": "sha256-0OeLoVqo6+d5grZgrEsJqV1uA129vqdiV33ByOKTWAc=", + "pom": "sha256-K8AxehSO3Jrv6j7BU1OU787T0TfWL3/1ZW0LA/lMB4Y=" + }, + "org/apache/httpcomponents/core5#httpcore5-parent/5.1.3": { + "pom": "sha256-pnU4hlrg83RLIekcpH1GEFRzfFUtH/KdpxTIYMmS1bs=" + }, + "org/apache/httpcomponents/core5#httpcore5/5.1.3": { + "jar": "sha256-8r8vLHdyFpyeMGmXGWZ60w+bRsTp14QZB96y0S2ZI/4=", + "pom": "sha256-f8K4BFgJ8/J6ydTZ6ZudNGIbY3HPk8cxPs2Epa8Om64=" + }, + "org/apache/logging#logging-parent/10.6.0": { + "pom": "sha256-+CdHWECmQIO1heyNu/cJO2/QJiQpPOw31W7fn8NUEJ4=" + }, + "org/apache/logging/log4j#log4j-api/2.23.1": { + "jar": "sha256-kuwf02qzvAneYZjS18CRRoXA9xJ+qTGswy/S7N2C6ok=", + "pom": "sha256-tnzD0JgJJwSaO+sA1Qbs4oh0ZzKw3sgSJFxZ9FP7HKE=" + }, + "org/apache/logging/log4j#log4j-bom/2.23.1": { + "pom": "sha256-NyOW4EWNTNMsCWytq+DMkzDsEPT1f6O+LnT3m14XijU=" + }, + "org/apache/logging/log4j#log4j-to-slf4j/2.23.1": { + "jar": "sha256-eTeoQFUVaRAjTjtCho9V5o/0t77Ltv/RAUb3L1v1TdU=", + "pom": "sha256-BVZJuX0nP8asOjx61a/Y3tPA/OAEeyur7RKZ3Bpzk4I=" + }, + "org/apache/logging/log4j#log4j/2.23.1": { + "pom": "sha256-bOFUBFU2S1PqIqGDQssSamOBYz9lPwlUZ/KqGYURps4=" + }, + "org/apache/lucene#lucene-analysis-common/9.10.0": { + "jar": "sha256-vOhhPw3pPYblt1Z+ulUb5K+Ac3ObC9mpvXpCJc/cQk0=", + "pom": "sha256-Srvab0oxxV8FIKvqyytdhZ9wBJzavpC6fkFeEpFtMS4=" + }, + "org/apache/lucene#lucene-core/9.10.0": { + "jar": "sha256-r8GtQCslhKfBx86SjYu0bLuAD1xmzuiqhrdIGrF/sLU=", + "pom": "sha256-PJXUTXgwFjqAngE5GonrCS0gQUnZ0k4t3JsatJsKBHQ=" + }, + "org/apache/lucene#lucene-highlighter/9.10.0": { + "jar": "sha256-7ybMHN8UOfqqIE6Vy522/GnBet2umIRyJtWINNKn8Do=", + "pom": "sha256-2dp1xDusYvIVdF1tMe07XAw4Zs+crm0HfEHBxrbbs+Y=" + }, + "org/apache/lucene#lucene-memory/9.10.0": { + "jar": "sha256-OKPssbAQnWHOet9MFp3TZIXhqZP/2bMXiPjG9wTZQbk=", + "pom": "sha256-PXwz38GDkdhWHYDEGhKbYd2dJw5OAbQL593wtjsuvvM=" + }, + "org/apache/lucene#lucene-queries/9.10.0": { + "jar": "sha256-BkR8kzqupa4toz6JPM/RpBy0GgACueUi48UTO8E/nBE=", + "pom": "sha256-9KRvTeo+5jnkr/uWw+ptSlC9IF7T94+I7b0mjF4jNAk=" + }, + "org/apache/lucene#lucene-queryparser/9.10.0": { + "jar": "sha256-4vDlFZm22vZcQrhQ7xs5thfXlLYXasgdP/hZchHL7Ig=", + "pom": "sha256-EB74pcAiq+IzQtQCU+nVmjfacjBTydGi4GO5AELX2b8=" + }, + "org/apache/lucene#lucene-sandbox/9.10.0": { + "jar": "sha256-/VdPTmheCtOC7wdUYNLg4hFp8fr/gVeaMqWf3IIxl5U=", + "pom": "sha256-0hLxwbL4qXWtYp8nvFg61n3mBTTT6d8zyCAg9ep88ok=" + }, + "org/apache/maven#maven-parent/34": { + "pom": "sha256-Go+vemorhIrLJqlZlU7hFcDXnb51piBvs7jHwvRaI38=" + }, + "org/apache/maven/doxia#doxia-core/1.12.0": { + "jar": "sha256-XknNgnvrvOpYKdOziD0XrRzhXr1jlK61CtUNff2Tn80=", + "pom": "sha256-sDiPdIoIheE+fCxFOSH4u53U+1sZBb50VoVHbPNFbqM=" + }, + "org/apache/maven/doxia#doxia-logging-api/1.12.0": { + "jar": "sha256-mFMGFiwKn0wwnUYQlEfzDwK/b8m8FqPgOdWeHavQGS8=", + "pom": "sha256-ndmbQ1AiOEZYUxBpTERjGLFpK6dG7XFzdtWWGaJxI7Q=" + }, + "org/apache/maven/doxia#doxia-module-xdoc/1.12.0": { + "jar": "sha256-6HMboApO3TSyDv+eSnKcIEXGLLeWw+SRaSYH3kR2qwE=", + "pom": "sha256-+2nZW+S1WvLzsKm2jj6OYgY+aVlMH86+cFpaTbCZbSU=" + }, + "org/apache/maven/doxia#doxia-modules/1.12.0": { + "pom": "sha256-q4/2u0eTz7pZsU+zg/81GjSbEJHQccZrH8vKco1QW9w=" + }, + "org/apache/maven/doxia#doxia-sink-api/1.12.0": { + "jar": "sha256-XcpqqqnnDYoHZuFD3c+dsJ3l/eD7zHjLY11052TfzKU=", + "pom": "sha256-JrUf3babXKbgRM2ii40cGje2+v0M+5v7FakZ3lfGcdU=" + }, + "org/apache/maven/doxia#doxia/1.12.0": { + "pom": "sha256-LQKgvWTzMbdnzudFWzGTxvuCEQFDoRmFiryWh5il/Ck=" + }, + "org/apache/pdfbox#fontbox/3.0.2": { + "jar": "sha256-ds8EEOkD49txQDKvu0WNWiO5IlO5/fiAA18J6orTraw=", + "pom": "sha256-hthT5W8q+Yb6c1s/kH6jh6KXNCLH0F8TwDasuRNal90=" + }, + "org/apache/pdfbox#pdfbox-io/3.0.2": { + "jar": "sha256-nW535C437zaC53aBEpwxRRXog9UKvB3aljguejHnDjg=", + "pom": "sha256-yD3gYR+UMN4W2dakjfXJEPgrkfHgU1xB9Woy9iYwz0c=" + }, + "org/apache/pdfbox#pdfbox-parent/3.0.2": { + "pom": "sha256-kN6rEjTjkUu8B07Ax3Y7+kFHgICziISpOwtVVxnWY0g=" + }, + "org/apache/pdfbox#pdfbox/3.0.2": { + "jar": "sha256-yv4sysEB6ao63z9+p23/AuWIWislWLdfr/l0dvBIfuI=", + "pom": "sha256-wMNAwn6AF2V+Y81PaJUG8U03Y10NFebRpAjysZFGax8=" + }, + "org/apache/pdfbox#xmpbox/3.0.2": { + "jar": "sha256-GJLj3icM8GdIRgZW0G0/sNFfScVLfRs4hB5sl0WwGuQ=", + "pom": "sha256-LOPcpcHUKiZOJw5rOrIcR5Dd0f2Vg3ZOkjfGoYqKkXc=" + }, + "org/apache/xbean#xbean-reflect/3.7": { + "jar": "sha256-EE5em7WmafhnIvMigZYHAPfsjjIJ71GyPrm20j0WKcs=", + "pom": "sha256-l5XBUyLF0ZrzNu69nhZPp9WJfEsASn1m4hY1oXPnSKk=" + }, + "org/apache/xbean#xbean/3.7": { + "pom": "sha256-6nFxMt6EBLYvyQl6HzIVxwXVJdRXvppfEmU63GjDOrc=" + }, + "org/apiguardian#apiguardian-api/1.1.2": { + "jar": "sha256-tQlEisUG1gcxnxglN/CzXXEAdYLsdBgyofER5bW3Czg=", + "module": "sha256-4IAoExN1s1fR0oc06aT7QhbahLJAZByz7358fWKCI/w=", + "pom": "sha256-MjVQgdEJCVw9XTdNWkO09MG3XVSemD71ByPidy5TAqA=" + }, + "org/assertj#assertj-core/3.13.2": { + "jar": "sha256-2LaYBfg9lmaqZ9vjqbk3RoFgdo30B6I9eHR1LyzFuKw=", + "pom": "sha256-aMUxi7Y+vrPoWy/olYk5tQBiVfjxG7JEL4gH7DvSZ6c=" + }, + "org/assertj#assertj-parent-pom/2.2.5": { + "pom": "sha256-TeW1pTWrd9GKtRYTfuTfTKVQlYCSpb+VqkefdSIEBkY=" + }, + "org/bouncycastle#bcprov-jdk18on/1.77": { + "jar": "sha256-2ruYwk1yybn1hWM9HfnFzVjZrTc9DNaBNn5qYDpJXVg=", + "pom": "sha256-rROCz80DvN2L4TkTwC9E/UadCnalPPLK71vhgK3DayM=" + }, + "org/checkerframework#checker-qual/3.19.0": { + "jar": "sha256-qCfEkYPzpjInfSegpGc2hss0FQdEe51XAmEJS9dIqmg=", + "module": "sha256-U+GJnd48UTyh79N2q/+sDmkH6OhKvV+WYkJjTJXk0Vc=", + "pom": "sha256-KbqcXOGpS3AL2CPE7WEvWCe1kPGaSXdf1+uPmX+Ko3E=" + }, + "org/checkerframework#checker-qual/3.42.0": { + "jar": "sha256-zK7dM68LeJTZ8vO2RPTRnkOSjjKQLmGsTRB3eDD1qsc=", + "module": "sha256-4PpiK33mPq4RBH726RtMKtDx8OE8uQP/UggKR/V6V0Y=", + "pom": "sha256-v1/KqycvVMvPG753w72WPIIcmrrSBYcIvwvtPIdUlMo=" + }, + "org/codehaus/groovy#groovy-bom/3.0.21": { + "pom": "sha256-ksw2r/0g9Wi1CSwLlOz1hd3rCigbbIunJWVwuxhdZTQ=" + }, + "org/codehaus/groovy#groovy/3.0.21": { + "jar": "sha256-XPNzDAwsFcKT93UN1xFO0npnH8lAFlu64DeKKB9bLV4=", + "pom": "sha256-uOnopeJGLS/MFGzkHalgebiTHnDbPqudWdaJhj0Jaxc=" + }, + "org/codehaus/plexus#plexus-classworlds/2.6.0": { + "jar": "sha256-Uvd8XsSfeHycQX6+1dbv2ZIvRKIC8hc3bk+UwNdPNUk=", + "pom": "sha256-RppsWfku/6YsB5fOfVLSwDz47hA0uSPDYN14qfUFp7o=" + }, + "org/codehaus/plexus#plexus-component-annotations/2.1.0": { + "jar": "sha256-veNhfOm1vPlYQSYEYIAEOvaks7rqQKOxU/Aue7wyrKw=", + "pom": "sha256-BnC2BSVffcmkVNqux5EpGMzxtUdcv8o3Q2O1H8/U6gA=" + }, + "org/codehaus/plexus#plexus-container-default/2.1.0": { + "jar": "sha256-bc6xJGsYgVO9y2+WLVQ9Ud22csygfK2Up4+6vJ7fCjk=", + "pom": "sha256-i4wg5jC9zHlcyYUCTEwQRcFHvhFgUsLJdeMMYI9/O0U=" + }, + "org/codehaus/plexus#plexus-containers/2.1.0": { + "pom": "sha256-lNWu2zxGAjJlOWUnz4zn/JRLe9eeTrq5BzhkGOtaCNc=" + }, + "org/codehaus/plexus#plexus-utils/3.3.0": { + "jar": "sha256-dtF0eSVA4nda+U0D0Q+y08d24s0KwOv0J9PlcAcruc4=", + "pom": "sha256-ecl5IHP97jzb69YadrqMLdEWJKn4XRKLrla9oZ4gR1w=" + }, + "org/codehaus/plexus#plexus/5.1": { + "pom": "sha256-o0PkT/V5au0OpgvhFFTJNc4gqxxfFkrMjaV0SC3Lx+k=" + }, + "org/codehaus/woodstox#stax2-api/4.2": { + "jar": "sha256-ut9ggaC7Um/SwBlR3++tkbaEa23Q6wBIWH4w0d0zTmg=", + "pom": "sha256-YhW0dL03FPG5z0216ig39LqvO42vkSEOh+qM6mWlCXw=" + }, + "org/codehaus/woodstox#stax2-api/4.2.1": { + "jar": "sha256-Z4Vn5ItRpCxlxpnyZlOa09Z21LGlsK19iezoudV3JXk=", + "pom": "sha256-edpBDIwPRqP46K2zDWwkzNYGW272v96HvZfpiB6gouc=" + }, + "org/controlsfx#controlsfx/11.2.1": { + "jar": "sha256-63VY0JTDa4Yw6oqab40k+K9F0ak6N14R4gbXbAgiFDA=", + "pom": "sha256-veC6xL8EPqp19uTOEbpXfHneak+5Mfd1e93Y36MwKTc=" + }, + "org/eclipse/angus#angus-activation-project/2.0.1": { + "pom": "sha256-wxdtWY0dwW67QG/aGoexTEUBqjNfBa584+Rq6p6NsbU=" + }, + "org/eclipse/angus#angus-activation/2.0.1": { + "jar": "sha256-siZ2GBWGjt+JZMHXHm0tVKsjjCeIUHBhtOBjOTO0wTE=", + "pom": "sha256-Z8XrD/f1JeoaGY8C2v7nfg0qUxudkIBxvEBhOGrgQO8=" + }, + "org/eclipse/ee4j#project/1.0.5": { + "pom": "sha256-kWtHlNjYIgpZo/32pk2+eUrrIzleiIuBrjaptaLFkaY=" + }, + "org/eclipse/ee4j#project/1.0.6": { + "pom": "sha256-Tn2DKdjafc8wd52CQkG+FF8nEIky9aWiTrkHZ3vI1y0=" + }, + "org/eclipse/ee4j#project/1.0.7": { + "pom": "sha256-IFwDmkLLrjVW776wSkg+s6PPlVC9db+EJg3I8oIY8QU=" + }, + "org/eclipse/ee4j#project/1.0.8": { + "pom": "sha256-DQx7blSjXq9sJG4QfrGox6yP8KC4TEibB6NXcTrfZ0s=" + }, + "org/eclipse/ee4j#project/1.0.9": { + "pom": "sha256-glN5k0oc8pJJ80ny0Yra95p7LLLb4jFRiXTh7nCUHBc=" + }, + "org/eclipse/jetty#jetty-bom/9.4.54.v20240208": { + "pom": "sha256-00QQSm7mGdplmEA8JdA6qqrw9U6WRv01EkWN9Xyarrg=" + }, + "org/eclipse/jgit#org.eclipse.jgit-parent/6.9.0.202403050737-r": { + "pom": "sha256-RLRxOI58JtkpSnpPJNmX7DTzaSFvMjVInkAbKlUdS1U=" + }, + "org/eclipse/jgit#org.eclipse.jgit/6.9.0.202403050737-r": { + "jar": "sha256-YgmsZpG+KgYyDwIADYm+1z7fBfRdZe+aFVFHURq3fzw=", + "pom": "sha256-d5jTR1SE+88OZAOlETeAHPEey2CRi2+vtyIRUiU5Ews=" + }, + "org/functionaljava#functionaljava/5.0": { + "jar": "sha256-N3rRQOfSa6BPrfIZsJ1+HHS8AjL6QBCyDBx52xH5Zw4=", + "pom": "sha256-R9OA2YVT2vdCc5tRC/3ElIp0GHftyypTlvwpGZaJzgk=" + }, + "org/fxmisc/flowless#flowless/0.7.2": { + "jar": "sha256-VsrfwuST8d5gGZhYCx7WJW/BWO+MWjN55KRdwGckzw8=", + "module": "sha256-l0+zKTCi9FClhhTqRgzUDE/UV25NKK6Ca8YTk6hMZjE=", + "pom": "sha256-CouO13pqSfjRGZIu1DGJ+Uh3swjL1fQf5GIh3ucsi7Y=" + }, + "org/fxmisc/richtext#richtextfx/0.11.2": { + "jar": "sha256-jeYtdfz5uFsvvp6ONe/GZAjIxdC1n6bcB/uLSBsoJCE=", + "module": "sha256-V2XP/R3VuYQkk0Xpet9SwCiRewJwzji40UE77kLOz6A=", + "pom": "sha256-Vahb2I6AB9CPU/POrDa9wNxLJPruAmqXwraXmfklEzw=" + }, + "org/fxmisc/undo#undofx/2.1.1": { + "jar": "sha256-25cIxYqOLbRX+9Z/BRXkqVlVygsLj06no9y7/L0Z0tc=", + "pom": "sha256-t2MMyZwGJaE4Mvzmb+wLKb0OmuwHD76DO461Jy3BhHU=" + }, + "org/fxmisc/wellbehaved#wellbehavedfx/0.3.3": { + "jar": "sha256-4pEAWo4yM7A2RQ0SbLzScNW0Ujl3GZSVGcM8i6CeJXw=", + "pom": "sha256-RxdpNVcNIb1oX5VaJavPbwFwmrtaN3Wsj6iVA3fKSZ0=" + }, + "org/gaul#modernizer-maven-annotations/2.7.0": { + "jar": "sha256-noNA0HwiJuKKj10RVBiy4qsCE58vOWbc2RY/pZAuJn8=", + "pom": "sha256-yoJ5IPQ10QCcug70IeWcw5F0GoYJ/vV0nTZgG/D2k7Q=" + }, + "org/gaul#modernizer-maven-parent/2.7.0": { + "pom": "sha256-gAUSdml5uc61hhNSs3ZhZDJ/HNSPc2skbJX/x3U+Eo0=" + }, + "org/gaul#modernizer-maven-plugin/2.7.0": { + "jar": "sha256-QcjLKxfxDnw79Q50lq1L/nMEp/3ZFERxhWChsr5EZPc=", + "pom": "sha256-RjjOCZYGJo+Joi0e4qgp3FOg/Z9NtiYBjca5EKDSO+k=" + }, + "org/glassfish/grizzly#grizzly-bom/4.0.1": { + "pom": "sha256-mm2yNlYQGV49O4GXFx4OVMM5gUNX5vmaJPW8QGP9uwQ=" + }, + "org/glassfish/grizzly#grizzly-framework/4.0.1": { + "jar": "sha256-9vSRqXbwNZL2hsao4PxPIFRgXR0wF/t9j/Sd6aL7dp0=", + "pom": "sha256-2dwKWG7j+v93SUXK9+wVK8QXzBxUD4w5mPLESqMNCaE=" + }, + "org/glassfish/grizzly#grizzly-http-server/4.0.1": { + "jar": "sha256-gLG79NRUkndw789LIfoy0y2M2ugJKMK5b+gkCwttFcQ=", + "pom": "sha256-m6yXc7fb67qrxiRBjoloRX5SEdwBTGbhjMsN4y7+P0Y=" + }, + "org/glassfish/grizzly#grizzly-http-servlet/4.0.1": { + "jar": "sha256-1ZEIjRLmYpUNHCul35Hi2t0/k/HCPdkCJkEvwlBY8Xw=", + "pom": "sha256-fqD4CtPGql+VUxdrv5GLN76A4CHMeqo9LkuV2ySvXmk=" + }, + "org/glassfish/grizzly#grizzly-http/4.0.1": { + "jar": "sha256-SPcpFdeqWmqaaIMJPCnS/poMGz0MwJkJQtGV4ZiDqA8=", + "pom": "sha256-2lhHmLixD4gckYv9UsHWb2U1hN4xEcNzNshf3sGheGc=" + }, + "org/glassfish/grizzly#grizzly-project/4.0.1": { + "pom": "sha256-1bwcO6NciLv/9nlRP8YlLya9crqSrzzSseLvq7kbjGg=" + }, + "org/glassfish/hk2#external/3.1.0": { + "pom": "sha256-oh3tpD6bZO1uigyuzMX6dGyOcLU2bkRx+McV2r7j/Zw=" + }, + "org/glassfish/hk2#hk2-api/3.1.0": { + "jar": "sha256-kgJ30r2mEOLMU6BKT1s4+0hLAwzenI6MXAoS8SbW/5k=", + "pom": "sha256-I+ad5ZlFefvsnR1FOKI12knh2rfMwXPcTZymGcRs+Jo=" + }, + "org/glassfish/hk2#hk2-locator/3.0.5": { + "jar": "sha256-sFInfb3K74EPG0KxDpQWwj58z6DBlbClNE2AzBeGMew=", + "pom": "sha256-fbjs2dCxJgwgfvn0l6mzoGnYJSMxN6BAThJFWeH7PQw=" + }, + "org/glassfish/hk2#hk2-parent/3.0.5": { + "pom": "sha256-4wc+GDpLY13Hl4Q2wq1v9Xl+CK+8nB+jLTMpHMqcVuk=" + }, + "org/glassfish/hk2#hk2-parent/3.1.0": { + "pom": "sha256-yOhpECjfgN2wyP5MGb7QmL/XVRF5VQemBeN/uEVr7e4=" + }, + "org/glassfish/hk2#hk2-utils/3.1.0": { + "jar": "sha256-17fKc3GmdocxY+B/e1CMFzKkA2unAep/6CNJ+EnvuOc=", + "pom": "sha256-KC/8KZjCw5ScuWuRABq1WMXQg8vf6eS9HG8s8elYKC4=" + }, + "org/glassfish/hk2#osgi-resource-locator/1.0.3": { + "jar": "sha256-qrXXhJ98/Nosx8VBuhvTZRUdQidvFRyCU4ckXf3j3XQ=", + "pom": "sha256-i2Yi64HlVymfvZqoVLxax20wf3rl53BYZImli7Uziyo=" + }, + "org/glassfish/hk2/external#aopalliance-repackaged/3.1.0": { + "jar": "sha256-RMv2jdXiSe/CJK18RWwdiYtx0ISvvC0hfoQ2RLlrp5s=", + "pom": "sha256-I+QCQveDcaQIPtCaMpEUPM21vRwbpVP9iEDlEMjPBwA=" + }, + "org/glassfish/jaxb#codemodel/3.0.2": { + "jar": "sha256-aTwDgiR2QDufy2V4z2sHsgx/nQ02otJ8zPDAjcWH7ic=", + "pom": "sha256-5osyFiDUZnkRXhg3kAvguBEK5FTzjguChwtcj9mYErk=" + }, + "org/glassfish/jaxb#jaxb-bom/3.0.2": { + "pom": "sha256-BioTMvjLS+0N2c1Yu0zAdQH6RMkNqhf+wQefRQudVwM=" + }, + "org/glassfish/jaxb#jaxb-bom/4.0.3": { + "pom": "sha256-Zg8EhAYlliYXiumpcrA86VFmXDPDM8q0U7EXi40NJBU=" + }, + "org/glassfish/jaxb#jaxb-core/3.0.2": { + "jar": "sha256-+aNguTlZdkOyZ241/El6+1YdIOilExKKXABwNm2xG70=", + "pom": "sha256-YMLhqbt6sWupylJsRx4DMNtXyHOeLAutDZkOntbHzo4=" + }, + "org/glassfish/jaxb#jaxb-core/4.0.3": { + "jar": "sha256-1tdcQidSaE+/BN10ohaY/q4OSkBsKJK1rwLSPcl7KsY=", + "pom": "sha256-crhKVGcO3sRAUgH3Heo7C/aYJbrkFjNtfzFAbGnHoyc=" + }, + "org/glassfish/jaxb#jaxb-runtime/3.0.2": { + "jar": "sha256-ezo3hLnG40Oo04/BCGArqBAXfwPy2NHnJYsc73/Z1Mc=", + "pom": "sha256-AY2B8CPynufFVdb1lyBuLUwvuAttvBhUWuite6+LGQc=" + }, + "org/glassfish/jaxb#jaxb-runtime/4.0.3": { + "jar": "sha256-eV4tvdPmTIun5TLjX4MTZgOTGo6aO1/+sF+fSDratuA=", + "pom": "sha256-sloOI7PxuK4yG6wnNyC3TCIqN0DdHj3h6W1ItF8ukW0=" + }, + "org/glassfish/jaxb#jaxb-xjc/3.0.2": { + "jar": "sha256-qLkrrDG2MaGQwgzh9qDutnKVUjP/dAIe/lCcph0nO3c=", + "pom": "sha256-2tovgbYhAbOknTPrHeF+KQZCBo7uk5bzS7XDZ4p7qKk=" + }, + "org/glassfish/jaxb#txw2/3.0.2": { + "jar": "sha256-tLz5T7CnWUVuJSFyRRO67JS3jpMSdUSvFi48/wjZM0M=", + "pom": "sha256-aZ+oKsMHb9ZNujfkw8DSJValP4R1ALK+EN/HKUI+eLk=" + }, + "org/glassfish/jaxb#txw2/4.0.3": { + "jar": "sha256-3welGAG5leRK7JqV74ddlfu43ih0QX3mBm2E9zHLnpw=", + "pom": "sha256-i4TetIZ5zAQrPL7GjXA9+c6May+SOdqKKOPKqp7a1Nk=" + }, + "org/glassfish/jaxb#xsom/3.0.2": { + "jar": "sha256-RXBjIzVKYGMj/xEwy1deRMbU16rEQ5VkF018ys5syQo=", + "pom": "sha256-4WK6+AKxr6D6VE2rOuYoVvK7AvnoWVvAwYjrfaatfoM=" + }, + "org/glassfish/jersey#project/3.1.5": { + "pom": "sha256-qG4HZUqPTqHoQgJUPobD7SafpkgyqXLO2C08p5JkCek=" + }, + "org/glassfish/jersey/containers#jersey-container-grizzly2-http/3.1.5": { + "jar": "sha256-CRUFmLl8UkVc5WpQbdEL5TbM6uEgrbYKUZFBVhkbSvE=", + "pom": "sha256-YO+rDTz6F6XsD7Tq2FkbRjhM1KgJhwuIkpWKsJ7IziM=" + }, + "org/glassfish/jersey/containers#jersey-container-grizzly2-servlet/3.1.5": { + "jar": "sha256-NmJ3F780m9H9NbOSPFvUBEyRNQL9UPE/vw6dnqTBvDQ=", + "pom": "sha256-PN56Lc1NRb9jJmpPSMAtHP23D8eOUAa/MKaNOJhSeOo=" + }, + "org/glassfish/jersey/containers#jersey-container-servlet-core/3.1.5": { + "jar": "sha256-0HhdH6ximojUY358LM52rhvfhWnT6MFWJaDCsn+r53k=", + "pom": "sha256-S8Rp8T3VEcgew+RO5FmhKSNSf993i62d7GU1cYNWiSc=" + }, + "org/glassfish/jersey/containers#jersey-container-servlet/3.1.5": { + "jar": "sha256-GDEXWGACsiKhBXGo3twMaIlWXGboQmH8nktnPXCv7OQ=", + "pom": "sha256-bYYCMI286FDIaQVca8hy56G75XJ+cpkPDZitrkAh5cI=" + }, + "org/glassfish/jersey/containers#project/3.1.5": { + "pom": "sha256-w0lqpSIlKKZlfbQpB8W21Xic+vEgpLAM8vMj7AiynZg=" + }, + "org/glassfish/jersey/core#jersey-client/3.1.5": { + "jar": "sha256-4muCTOuB4MpLc8eBBEj7VWbvDBeshxrdk6ksKR5QUkM=", + "pom": "sha256-5Ij1g6kL9sbEMHOPxl2vcu6tzDLiKtP7e8lKYv0C3Ew=" + }, + "org/glassfish/jersey/core#jersey-common/3.1.5": { + "jar": "sha256-xyWPN0Qz31g+ULvlWD/W1mlDk6MikVAk9xnSGiGNwBI=", + "pom": "sha256-/knk2CpaOF6H9YzdvJKUG+MWpOhfnorIlUORB9yuyho=" + }, + "org/glassfish/jersey/core#jersey-server/3.1.5": { + "jar": "sha256-qbleTsxoqwZCycSmUEgmMO3smVvRp0DWIjYWooKwXnY=", + "pom": "sha256-M24ILdVc0GTsiV42nLKSbawHHDwrva37cQCGCHuY4aI=" + }, + "org/glassfish/jersey/inject#jersey-hk2/3.1.5": { + "jar": "sha256-DJSWz8a0+bIjxEyDtN8+3qeSTOTVK/+1XPGA6exLTus=", + "pom": "sha256-3jrHm4cU7g1lUp0Cp62C5duJ52Runw7sq+2tNenvad4=" + }, + "org/glassfish/jersey/inject#project/3.1.5": { + "pom": "sha256-aRrGuMI0wACq6GFyQwpKF6sLZlzSHGijpf+13gg0SEU=" + }, + "org/glassfish/jersey/media#jersey-media-jaxb/3.1.5": { + "jar": "sha256-2Iuyf13SKPAPBh76KOkQvK5V7SdqPWhGSntF34Rj9s0=", + "pom": "sha256-jWmzTdb7VDDtvUIP3/3tU/n7fBCm4tloba213xBqtfw=" + }, + "org/glassfish/jersey/media#project/3.1.5": { + "pom": "sha256-B3StBF40WyM4BI1aabYx1qBEkSWqO3EIFTCny6WY5x8=" + }, + "org/glassfish/jersey/test-framework#jersey-test-framework-core/3.1.5": { + "jar": "sha256-GmwP8JuRO4+DFQjA3d8k+pg+2XVFdYEXWBf3DLGGCTs=", + "pom": "sha256-RL34Nhr024shPxcP1pRA+UVp4PxlbFrEDJJGU2HT/PQ=" + }, + "org/glassfish/jersey/test-framework#project/3.1.5": { + "pom": "sha256-tR7CLcyzmCwMtbZPWIi7XRZBpRex1ukrHs0GlrXWiAM=" + }, + "org/glassfish/jersey/test-framework/providers#jersey-test-framework-provider-grizzly2/3.1.5": { + "jar": "sha256-BFgys+mtbHeTEeUEW0WOWOFoNesKi2k+sT9jeDx7xL4=", + "pom": "sha256-vSgHhW2X3Ybj7N5tOAyKuFtmbvhfxLQ9SpakI9DQT6g=" + }, + "org/glassfish/jersey/test-framework/providers#project/3.1.5": { + "pom": "sha256-+wR6Cq8ol1omU6F9ut6avXmwygNpXG0eNONob5qdnHg=" + }, + "org/hamcrest#hamcrest-core/1.3": { + "jar": "sha256-Zv3vkelzk0jfeglqo4SlaF9Oh1WEzOiThqekclHE2Ok=", + "pom": "sha256-/eOGp5BRc6GxA95quCBydYS1DQ4yKC4nl3h8IKZP+pM=" + }, + "org/hamcrest#hamcrest-core/2.2": { + "jar": "sha256-CU9dkrS32ciiv1PMadNWJDronDSZRXvLS5L37Tv5WHk=", + "pom": "sha256-9/3i//UQGl/Do54ogQuRHC2iAt3CvVB2X4nnxv+M590=" + }, + "org/hamcrest#hamcrest-library/2.2": { + "jar": "sha256-OFFSOiAaDUglwlphpu3FBxKCWjm9PQM5G5jEjKPLOWw=", + "pom": "sha256-9YrYNdJCZDElnYbk/jpPUWHmcdkWxcvs81c4vN6C/P8=" + }, + "org/hamcrest#hamcrest-parent/1.3": { + "pom": "sha256-bVNflO+2Y722gsnyelAzU5RogAlkK6epZ3UEvBvkEps=" + }, + "org/hamcrest#hamcrest/2.2": { + "jar": "sha256-XmKEaonwXNeM2cGlU/NA0AJFg4DDIEVd0fj8VJeoocE=", + "pom": "sha256-s2E3N2xLP8923DN+KhvFtpGirBqpZqtdJiCak4EvpX0=" + }, + "org/hdrhistogram#HdrHistogram/2.1.12": { + "jar": "sha256-m0f7rkRP6qxLfgTw6ilFaeS8KCvGnYws4qw/I1dygeI=", + "pom": "sha256-f7PnkMFU0bXiMXC7jL9/cO8ICa8XIp8dywENd5llEIA=" + }, + "org/jabref#afterburner.fx/2.0.0": { + "jar": "sha256-PhxWSKv8xpaYIdi3BnPwxMV5qp8IBP/9/gwn1UTZDIM=", + "module": "sha256-j0p3hue1SGir/mBWqjTFp/vJ7uk9vWg8B07GwyBIjm0=", + "pom": "sha256-b1tEN8KM1NC5yV5HQ6wNwU9fQPQzpbHCqMJNxvnDH14=" + }, + "org/jacoco#org.jacoco.agent/0.8.10": { + "jar": "sha256-MtYiEcCjI/UIIqdQpkfBIrKxtVn2NTPqLjJMAyQ4E3A=", + "pom": "sha256-8Dj11h4Ka6MZsFBzsoShXIa7d0fko0lrJ/N6cRgLHNc=" + }, + "org/jacoco#org.jacoco.ant/0.8.10": { + "jar": "sha256-p8jdZ0GsszfMB3GpvxdqpnwJpSpt4BHreg9eeMm9WHI=", + "pom": "sha256-8J92Wz8N61zalBSG1r4ldS+XhC4/4yVTfWnoG7wTey8=" + }, + "org/jacoco#org.jacoco.build/0.8.10": { + "pom": "sha256-49ew2Y3rqhRTOTwiA4GSEsUofrvEZ90LSiKtBGa9bDs=" + }, + "org/jacoco#org.jacoco.core/0.8.10": { + "jar": "sha256-54lmfZOnUDk47peK5Pu8mhvM2jtUYpmyTYVQ2BbYDgg=", + "pom": "sha256-k6Dt1RSc77OOYvS+NIF5FJBoCbxPM7shEoPcQ31x6ok=" + }, + "org/jacoco#org.jacoco.report/0.8.10": { + "jar": "sha256-PjXBT3hTx8iNvgTPCG7gU6Vzn0GemACZCbvt7N3d1Qw=", + "pom": "sha256-aoWwNquHV1jv3g+Y30EAhum51X2CYYiosUVgVC3yuuI=" + }, + "org/javassist#javassist/3.28.0-GA": { + "jar": "sha256-V9Cp6ShvgvTqqFESUYaZf4Eb784OIGD/ChWnf1qd2ac=", + "pom": "sha256-w2p8E9o6SFKqiBvfnbYLnk0a8UbsKvtTmPltWYP21d0=" + }, + "org/javassist#javassist/3.29.2-GA": { + "jar": "sha256-qQ3bJRNd+eV+qb1OIk4hlVSSl1j5uumWXyn4HWCjKT8=", + "pom": "sha256-Ehu5fA3qc0LXSJInrCe/8J2hJ6TkS14Vy09YyeccbIk=" + }, + "org/jbibtex#jbibtex/1.0.20": { + "jar": "sha256-sOqDZn2darH89q2EieF6pRsA18CGRUrsNQFuL7Ucm7U=", + "pom": "sha256-ZMsdu8KSZgmcYTnVsq8NXKfUxgVV/gABoBePhGjfnCo=" + }, + "org/jboss#jandex/2.4.2.Final": { + "jar": "sha256-PyzlXH1x50RYFIjcUQWAaqgITAjm6RagGbq4+GmJlPA=", + "pom": "sha256-6l4By7dQ+V1+DkR9PLk0NadCgZU9ldZTKzyEgHwo10c=" + }, + "org/jboss#jboss-parent/12": { + "pom": "sha256-nlb1shiYpucR6FdiGsHvts88PeFlpKowfbmYgmrU/98=" + }, + "org/jboss#jboss-parent/39": { + "pom": "sha256-BN/wdaAAlLYwYa9AfSgW2c3mZ5WsrjdqBUvf6Lox5mQ=" + }, + "org/jetbrains#annotations/24.0.1": { + "jar": "sha256-YWZtvOfkLmyFtDwE/PuCk6Idy1WzyA6GknDOQsAaazU=", + "pom": "sha256-mb7eKcAzHBlS7uBL+ZeN5TWpDJfi3v/6XgCTNRcZJbA=" + }, + "org/jetbrains#annotations/24.1.0": { + "jar": "sha256-J6dw3HzlBQCRi7jDwGYMmCkGMOx5a1489rkPQDswM8Y=", + "pom": "sha256-Ljf9cCCkNkueXZ93xbZ0Kjvqkn3VYMoeOQ3IFcnFCCA=" + }, + "org/jetbrains/intellij/deps#trove4j/1.0.20200330": { + "jar": "sha256-xf1yW/+rUYRr88d9sTg8YKquv+G3/i8A0j/ht98KQ50=", + "pom": "sha256-h3IcuqZaPJfYsbqdIHhA8WTJ/jh1n8nqEP/iZWX40+k=" + }, + "org/jetbrains/kotlin#kotlin-bom/1.9.22": { + "pom": "sha256-GICVqDQdZtIs9LSZRMAFThWpS7j7m06rL2YabLjD4X4=" + }, + "org/jetbrains/kotlin#kotlin-compiler-embeddable/1.9.22": { + "jar": "sha256-K/6t7lmrGYjDNtvW5l2ZH3Zq4d2Gg/Km3tX6oCefDKA=", + "pom": "sha256-s9o0u29ClqzzoPRDRm8FBsbJnaXNliTW4LdFsiKHhOs=" + }, + "org/jetbrains/kotlin#kotlin-daemon-embeddable/1.9.22": { + "jar": "sha256-kqV4ExcUR9U0Rh+hP+N9yM07f4bYPpsfe7GwvjBUH4s=", + "pom": "sha256-9uo9z2v7Og0GmER8SKa88I2Oqs+D/JX+nUGBpeXjwrE=" + }, + "org/jetbrains/kotlin#kotlin-reflect/1.6.10": { + "jar": "sha256-MnesECrheq0QpVq+x1/1aWyNEJeQOWQ0tJbnUIeFQgM=", + "pom": "sha256-V5BVJCdKAK4CiqzMJyg/a8WSWpNKBGwcxdBsjuTW1ak=" + }, + "org/jetbrains/kotlin#kotlin-script-runtime/1.9.22": { + "jar": "sha256-uAZwV59/ktRz2NWDTwsST3dVxFmP6UskQYOwKDSDRXQ=", + "pom": "sha256-/ra0ns9pEG1MEoXnH5ob2noSfO9oMC4+n9yCmKTjR5U=" + }, + "org/jetbrains/kotlin#kotlin-stdlib/1.9.22": { + "jar": "sha256-ar4UbCeGQTi4dMzM/l9TTj65I8maG3tdRUlO5WlPPgo=", + "module": "sha256-9IIxS1B5wUVfb7DUJXp0XRAcYSTOlhUiuob53JCQHkc=", + "pom": "sha256-zOLxUoXsgHijd0a1cwigVAQt1cwlQgxD9zt4V8JGjwM=" + }, + "org/jooq#jool/0.9.15": { + "jar": "sha256-ow2WcZCZ603oewgVL5etsLo8/vmX2tys6LLk3NwZf4Q=", + "pom": "sha256-/mCqsovG1YbUq0u/zSPc9KFXa/gzK2lEwhxaehS8x4M=" + }, + "org/jsoup#jsoup/1.17.2": { + "jar": "sha256-9gszs46desk+qqaKbHD3BruZA2SUsuKt0r/uEdCaxvU=", + "pom": "sha256-ejSdIXeQw3ML4wjO0eqe4yxOdPcgWOg8K2DloolU3Q0=" + }, + "org/jspecify#jspecify/0.3.0": { + "jar": "sha256-4cfhgytglfz8vldIVwDHMw1T1OV+LFu/nHGBmwLpeL4=", + "module": "sha256-M7jCLyQkwpAyQaf+olj8QasMTWiJd2V2xRkEdWLuQ6U=", + "pom": "sha256-9LGyrWHKF/KNBjxWEJ0+g5g5oQswG8lzSVQ+zu5X8xY=" + }, + "org/junit#junit-bom/5.10.0": { + "module": "sha256-6z7mEnYIAQaUqJgFbnQH0RcpYAOrpfXbgB30MLmIf88=", + "pom": "sha256-4AbdiJT5/Ht1/DK7Ev5e2L5lZn1bRU+Z4uC4xbuNMLM=" + }, + "org/junit#junit-bom/5.10.1": { + "module": "sha256-IbCvz//i7LN3D16wCuehn+rulOdx+jkYFzhQ2ueAZ7c=", + "pom": "sha256-IcSwKG9LIAaVd/9LIJeKhcEArIpGtvHIZy+6qzN7w/I=" + }, + "org/junit#junit-bom/5.10.2": { + "module": "sha256-3iOxFLPkEZqP5usXvtWjhSgWaYus5nBxV51tkn67CAo=", + "pom": "sha256-Fp3ZBKSw9lIM/+ZYzGIpK/6fPBSpifqSEgckzeQ6mWg=" + }, + "org/junit#junit-bom/5.5.1": { + "pom": "sha256-eHThBkE5sx4sWkZrPcEClwk2IWK98B8PSqq3OKuTLTM=" + }, + "org/junit#junit-bom/5.9.1": { + "module": "sha256-kCbBZWaQ+hRa117Og2dCEaoSrYkwqRsQfC9c3s4vGxw=", + "pom": "sha256-sWPBz8j8H9WLRXoA1YbATEbphtdZBOnKVMA6l9ZbSWw=" + }, + "org/junit#junit-bom/5.9.2": { + "module": "sha256-qxN7pajjLJsGa/kSahx23VYUtyS6XAsCVJdyten0zx8=", + "pom": "sha256-LtB9ZYRRMfUzaoZHbJpAVrWdC1i5gVqzZ5uw82819wU=" + }, + "org/junit#junit-bom/5.9.3": { + "module": "sha256-tAH9JZAeWCpSSqU0PEs54ovFbiSWHBBpvytLv87ka5M=", + "pom": "sha256-TQMpzZ5y8kIOXKFXJMv+b/puX9KIg2FRYnEZD9w0Ltc=" + }, + "org/junit/jupiter#junit-jupiter-api/5.10.2": { + "jar": "sha256-r/93wYbNMXJ1gDhy+lEzqoAf1qxAvZHHimz4AJtLF8w=", + "module": "sha256-QRtKlsKm2wmY1uWOiZNn8NElQWPzBBydmOeu38o3RBk=", + "pom": "sha256-u12jBgImsbPOtUCEldxptZRlv1DX6+Y+75TyWQnPGQA=" + }, + "org/junit/jupiter#junit-jupiter-engine/5.10.2": { + "jar": "sha256-tt812nUKVGrpMjdvEbPA34QfDJDHyylEzTmttDKIbks=", + "module": "sha256-FD7yda5mlRGdeCEqkyRazrv5I1tTdbn0wdSvcy87Uwo=", + "pom": "sha256-q+csj7+anI+e55usKbpkedMrDf+quICApQKRHSTTlGM=" + }, + "org/junit/jupiter#junit-jupiter-params/5.10.2": { + "jar": "sha256-7bHkP/C4BnYm/7VeXp7sodmrJHgUGnx/JT0RWynMfPI=", + "module": "sha256-IMLmXVKjnIVJbo4XDgjG7Sk1x/NeZRAT2WTcG7dcgns=", + "pom": "sha256-8n19CW20igXW56/YQalUVEJOVcUj167RZoF4szpjy9c=" + }, + "org/junit/jupiter#junit-jupiter/5.10.2": { + "jar": "sha256-Jj5DRH9LQPEmrWsdy9ffN5RIQTve244NJAxby7p8ek8=", + "module": "sha256-cjF2bPGyuJLGehQsljkU5rc/u1BhpschROt/jnJ3DsE=", + "pom": "sha256-1bcMXC10Ui2mEM04d28iW6wDSsJZGEO+6Xl6urOIDqs=" + }, + "org/junit/platform#junit-platform-commons/1.10.2": { + "jar": "sha256-tWpewACked9Jc7GLuiTJj+Dbj6oUyJB9PvRR2Mcf2K4=", + "module": "sha256-HoFCGmL4cryk0gIgs56hniexNfNre3gXBPkvrVQxlhg=", + "pom": "sha256-8/glx8o72JcU1IlEfHfHbifqOPAoX195ahAAoX/KS+c=" + }, + "org/junit/platform#junit-platform-engine/1.10.2": { + "jar": "sha256-kFy6m0mYzMKdEjkIWn+x/g4oAk11JhUjVtgQ7ewKSaM=", + "module": "sha256-4dG63P7cJyRFQeC+XV6EtyoicNevYWhrJvEc/Edw2kI=", + "pom": "sha256-EqqGyhwNZIoiXU58aWBUwfx26IeCxcOft983muI7728=" + }, + "org/junit/platform#junit-platform-launcher/1.10.2": { + "jar": "sha256-rtT0L7kK2ps0fCMfE2VvwJEhuiDattxkamvZ1Nox5Ko=", + "module": "sha256-/1YhIQJQJSv9rbYiu+LqZuzsMahnc2zqSz1K3yGcp/8=", + "pom": "sha256-WjEXCOeQa7l0YpwayHC8EWV0ZbmJ2koHfkVBa9mHJeQ=" + }, + "org/kohsuke#pom/21": { + "pom": "sha256-C8qSPq0O1GSp1AglUITbhghxsjIMrdDduczkbkwFvi4=" + }, + "org/kohsuke#wordnet-random-name/1.5": { + "jar": "sha256-AgxW1yGfqdgrfi/Puj0kyX8HYYsqaVfZMIetcHK5khA=", + "pom": "sha256-RG4Gql8gAlAWNo2W9yX5sXUss+w6sp4WzLydoyMZpwA=" + }, + "org/kordamp/ikonli#ikonli-bootstrapicons-pack/12.3.1": { + "jar": "sha256-OgLyfRuGyubrnLgLOarbBmxaD9H+ppi5ce3nK9BdMe4=", + "pom": "sha256-d0wPeMVNPKNg7wDAltsvKlndf7EV5RqC2c7cfGAgRxM=" + }, + "org/kordamp/ikonli#ikonli-core/12.3.1": { + "jar": "sha256-GN0LOvW716ZKvvWvdGzkm71mvYDx+4l0PR46D4sP5Ws=", + "pom": "sha256-MXGJdHSQH1Jt2wccCwJQtouDW3A73/Src5rEJEObYWo=" + }, + "org/kordamp/ikonli#ikonli-javafx/12.3.1": { + "jar": "sha256-tx7z81LDaeDn8IwU74nKv4hC9JWh5smUkDfZXvSpDYo=", + "pom": "sha256-7dl4yXjxkoOOVUh0EJibs/8oxpX70JBPNsT0E2GXzEQ=" + }, + "org/kordamp/ikonli#ikonli-material-pack/12.3.1": { + "jar": "sha256-G8TzVs+yhQv6nEGB2qLb8zcI505bZGNRUIJpMs5hxVA=", + "pom": "sha256-gAcPK4qbi/U63F7pO7qDGY5TL0PE8UhVEi0yFE66Sj8=" + }, + "org/kordamp/ikonli#ikonli-materialdesign-pack/12.3.1": { + "jar": "sha256-FeIubWaDNfbf3LTQ5KqJix+/uD3AMxvvRXoe2kJggtE=", + "pom": "sha256-j/6Z8wpYyG7I7ihokW5DMLRQ7kGJQcRn0K9t9phGlsA=" + }, + "org/kordamp/ikonli#ikonli-materialdesign2-pack/12.3.1": { + "jar": "sha256-1Qfh07ZoZNeiol957eMgvssfduFtIAsGdW9KzmWCEMQ=", + "pom": "sha256-GkIkc7zZStCyfgXp8HNHJPjcCXtbdAKBE8Bug1+/0OM=" + }, + "org/latencyutils#LatencyUtils/2.0.3": { + "jar": "sha256-oyqf+gay9OAcU2D4+d97xdlFSl03PNjzYTR/paVxZew=", + "pom": "sha256-jwwBU3kLhK9sCTFtVpvRBu4PAIuTk+gLpHj1v2Vziig=" + }, + "org/libreoffice#libreoffice/7.6.4": { + "jar": "sha256-mTOuf6lh4qeFo1Iat1cVdyuuNUA2zeigI5mnc4OeGDY=", + "pom": "sha256-fNpYEKQpmEYPgNrKCZ6YAJtcY0bqKgVJLsE7NPQZQbU=" + }, + "org/libreoffice#unoloader/7.6.4": { + "jar": "sha256-1j+kVLLB04iy9GZeJhEpHZ8/YxWzy1QPA1sBzzUMbXQ=", + "pom": "sha256-0Agwh7BhqHsyN8Q+dMWdNDgv5EoioiCbf/mmdfLX55s=" + }, + "org/mariadb/jdbc#mariadb-java-client/2.7.9": { + "jar": "sha256-8siZYGTKh2mS9ZDXjqJfbE+siK0pdt/0cp2BbrrNbsU=", + "pom": "sha256-Dh+6B9VnA7GEygOL/cvLxOMHeOUC52dF9fRB/SASFBg=" + }, + "org/mockito#mockito-bom/4.11.0": { + "pom": "sha256-2FMadGyYj39o7V8YjN6pRQBq6pk+xd+eUk4NJ9YUkdo=" + }, + "org/mockito#mockito-core/5.11.0": { + "jar": "sha256-8HbJax9JuNm8QuRrCWmq9WhMQMi1tnnUAOXYgAc6DgA=", + "pom": "sha256-ugsbXXA1CUlPmo5EWCIjh54zSKTElmfwx35odG5IHHg=" + }, + "org/objenesis#objenesis-parent/3.3": { + "pom": "sha256-MFw4SqLx4cf+U6ltpBw+w1JDuX1CjSSo93mBjMEL5P8=" + }, + "org/objenesis#objenesis/3.3": { + "jar": "sha256-At/QsEOaVZHjW3CO0vVHTrCUj1Or90Y36Vm45O9pv+s=", + "pom": "sha256-ugxA2iZpoEi24k73BmpHHw+8v8xQnmo+hWyk3fphStM=" + }, + "org/openjdk/jmh#jmh-core/1.36": { + "jar": "sha256-+Ql0430NqIhrXAXm4+fiBVaQDXR8WkHBAjtHwzAepzw=", + "pom": "sha256-mBI0JlrAQfFmsXxa3GsdRZ6JTKv/6vawnAB08PQDguQ=" + }, + "org/openjdk/jmh#jmh-generator-asm/1.36": { + "jar": "sha256-dGCxG4I97nSz4ZYX011ZEbASRTA9bjHDD4NBfPwvVLU=", + "pom": "sha256-V7u+h4OU+LP8G4DEEWHdSItCwNez1wpeR09CcbHqOkk=" + }, + "org/openjdk/jmh#jmh-generator-bytecode/1.36": { + "jar": "sha256-M3ZUL4lQvNcGxRbOBiDR34IjCecJK4+TOJFygxgdWF0=", + "pom": "sha256-URABHSX7lGay8Am/99fsCmLop6uvBomb+2tjBbBOKUQ=" + }, + "org/openjdk/jmh#jmh-generator-reflection/1.36": { + "jar": "sha256-qccnYOEsGZ4qLCjxoSbr8MxbUcC1jUZHJZb8Mvf5JTQ=", + "pom": "sha256-msCIMyyp0UcTCJk55zzaHn/0Q8fIx3usiFsIo7eHUUY=" + }, + "org/openjdk/jmh#jmh-parent/1.36": { + "pom": "sha256-O2PObo/vrLMgN24F6fuzuuhqiJI5AIdZGJoLDVylxdY=" + }, + "org/openjfx#javafx-base/19": { + "pom": "sha256-Aey9z45qdPR7FVUFTzHW8Vsh7yUi+IC47nVoMCG4e5U=" + }, + "org/openjfx#javafx-base/22": { + "pom": "sha256-XPr4AKyei29O5+mOaRZvN0PAo+xyLhx8idLaEzmgQIE=" + }, + "org/openjfx#javafx-base/22/linux": { + "jar": "sha256-guS1JYZGAz4MvYzoYKBZWGDIwNeOrfXKWQ9FNps7PQ8=" + }, + "org/openjfx#javafx-base/22/linux-aarch64": { + "jar": "sha256-V/RTupEwEyrt1pOsAzUdsTU/869RxG/7lUUnp71Jygk=" + }, + "org/openjfx#javafx-controls/22": { + "pom": "sha256-8AZSRCn/IPdz+tfjwXq9/qkkzMeqGamSoeQZPl/kCA8=" + }, + "org/openjfx#javafx-controls/22/linux": { + "jar": "sha256-4E5POGe18PR56yKJsDgwPOn7TR3vImvJHCkYlpvzW2s=" + }, + "org/openjfx#javafx-controls/22/linux-aarch64": { + "jar": "sha256-lrubCX8JhvuuwvMnReQ2C5s81ACnFGtJYwpoQtrks3E=" + }, + "org/openjfx#javafx-fxml/22": { + "pom": "sha256-N2R+Lpsq+3hcJKu2GjjD5p02av/TUyv6J+jIrm92tPI=" + }, + "org/openjfx#javafx-fxml/22/linux": { + "jar": "sha256-K5X/HQ+4GUIrIU2Xs423Bc2alyMK41P0kr3UiJujqdY=" + }, + "org/openjfx#javafx-fxml/22/linux-aarch64": { + "jar": "sha256-6O1DY40U+OTRIkabO7E4SP8WJpgQ+HzeAgwEQstngZc=" + }, + "org/openjfx#javafx-graphics/22": { + "pom": "sha256-snXDI9Pbr1/anOegMkG/JEvfeJ5GFON+pMPjww4P858=" + }, + "org/openjfx#javafx-graphics/22/linux": { + "jar": "sha256-ACrpnQ8ML2Clh72fkRaP7lvZ2AJ4H0eXV1lWz0icJLs=" + }, + "org/openjfx#javafx-graphics/22/linux-aarch64": { + "jar": "sha256-+9uVZeikBGWUwCjtAHX/UIU2XW8K5a855qOlV+InMWo=" + }, + "org/openjfx#javafx-media/22": { + "pom": "sha256-vEijYpt55oTHD6hTfzwpQh5HX2+r0TObedWHcpMN5XA=" + }, + "org/openjfx#javafx-media/22/linux": { + "jar": "sha256-kVG0rkkTRjBQ2WvTTIQOov6iPaJ471BRyvDn8ldkTRo=" + }, + "org/openjfx#javafx-media/22/linux-aarch64": { + "jar": "sha256-ijZAJ9fOc6n4rfSkkxf86PNqTndJGJPmaYmpZt2PHjY=" + }, + "org/openjfx#javafx-swing/22": { + "pom": "sha256-wPQryYkBk3076g85BuQT1HvgXNsaWu7FbRw5JD2DM5w=" + }, + "org/openjfx#javafx-swing/22/linux": { + "jar": "sha256-JTdrxDkPNwbv3wlfQLGAZt9DWkNlufS99GGOWFZexZA=" + }, + "org/openjfx#javafx-swing/22/linux-aarch64": { + "jar": "sha256-4VmmNrLKX0uia0YqDEg/5OUXHIrp8HYcHk1Nml9ZhbQ=" + }, + "org/openjfx#javafx-web/22": { + "pom": "sha256-iart37SyLvVtJt/pOmmrx1NXNSxi1Y+1EkMPWM/q0BU=" + }, + "org/openjfx#javafx-web/22/linux": { + "jar": "sha256-aodN6LOSTA7EKlLTUfIxBgAmwAjLKG8vCqy4PHc/KBk=" + }, + "org/openjfx#javafx-web/22/linux-aarch64": { + "jar": "sha256-kZ35kB0DE4sbhHFpQl4JkHO/1HKexPGy1GKdecJtSqc=" + }, + "org/openjfx#javafx/19": { + "pom": "sha256-3uMYnD1+670gSRMKUACQBOKE7GIJ5pDv/UhQAgcDMVs=" + }, + "org/openjfx#javafx/22": { + "pom": "sha256-ZO+kxQXukz+S0/4hqQ7RVKKs1Dhif6hKHYG7jRZWN58=" + }, + "org/openrewrite#rewrite-bom/8.21.0": { + "pom": "sha256-Azkt40r0B5flheYgsf23SFMWWIlmazmzaDVw1FLuew8=" + }, + "org/openrewrite#rewrite-core/8.21.0": { + "jar": "sha256-6GSDE7y3VWH6HJz3LwkdsFniahLoImye+8+nuRsI76k=", + "pom": "sha256-A/ew4svumksQ5JEhZ0b7LuijjcUa/JkjlA+d/kcSJBo=" + }, + "org/openrewrite#rewrite-gradle/8.21.0": { + "jar": "sha256-XTHPQ9DTaKc4TnQiagPCyBFQTaLfCXOH2z5i9qObeXc=", + "pom": "sha256-Y1eifRHVGfN6a6H/zd4RkoBc+U4sF10ozzespNEpJvs=" + }, + "org/openrewrite#rewrite-groovy/8.21.0": { + "jar": "sha256-DdOshMdDc28F8L33l/WcSHOJGD2HMTE7uaK2/L/b5NQ=", + "pom": "sha256-i/8dIEtMZ/b13X/xrzg1tWYevCpsEq6MteAQTpQE7VU=" + }, + "org/openrewrite#rewrite-java-11/8.21.0": { + "jar": "sha256-63noiYXGCPXvh5C63ZFgE+X0DvI0ep2R0N28MNOrrcs=", + "pom": "sha256-qux8ai9mgiRqmpAAVg71TGZtbwJyownpOglc9dOfIv0=" + }, + "org/openrewrite#rewrite-java-17/8.21.0": { + "jar": "sha256-YYmKR/DtaGPZwkVE2FgoBpuQ3t3BXVgrjYBnYL6hWaw=", + "pom": "sha256-yDjkf7A+AjW8nEw6Iib2ItX9tNbHhhz6XY8qqDov21g=" + }, + "org/openrewrite#rewrite-java-21/8.21.0": { + "jar": "sha256-vzeB1BuAq69JMnA14hGapmmRpFSczMH0nlnoCTRy9ow=", + "pom": "sha256-r6aBMHJ1c+5ylW0IOBqOMDfsa/32V4ZwpVrAWcuWHKY=" + }, + "org/openrewrite#rewrite-java-8/8.21.0": { + "jar": "sha256-z6Of1uCO1N/o3P067MMmN4XJ8pg+Z2DA30eSUs3LF7U=", + "pom": "sha256-7IQKBZa1bUslZiP/yByco2SfqixQoQVq12orrFHPDqk=" + }, + "org/openrewrite#rewrite-java/8.21.0": { + "jar": "sha256-4zpbtRptMY7tffzefDhMW8tFv16SnZz0o+EGgMeWoZE=", + "pom": "sha256-uylbeYK6uPlJwhN+EOrJbqvT0EorJmX+tg6kFfmHyv8=" + }, + "org/openrewrite#rewrite-kotlin/1.13.0": { + "jar": "sha256-RaOAjSzUP0bDYILxlv3vM3WMWDO0+LXIHoFwIRvGGJU=", + "pom": "sha256-n3bzjLFeL0EgpMIyWKbm15pLtd8yLbrc6VhZszsRJOQ=" + }, + "org/openrewrite#rewrite-maven/8.21.0": { + "jar": "sha256-8SfV+EbDpE4Fd3OygACuHm4g4YRosHMdtBuoZkbNl3Q=", + "pom": "sha256-kBLtw6s/7iHpVsBeu+CNjzQhSZgCz35bGQqJ8nLjbf4=" + }, + "org/openrewrite#rewrite-properties/8.21.0": { + "jar": "sha256-xKVI0BqeyFYGiZHDg5V2PAk56idauyEPmvcqmfmEqTU=", + "pom": "sha256-Q+MMeQxF+rOUx/urik29d7MVO5n3DTifk1WDaxg+4bM=" + }, + "org/openrewrite#rewrite-templating/1.6.3": { + "jar": "sha256-gUQATASLXMbZTtHoGAAxH5A+zHydEcZSubaIgMgRHE4=", + "module": "sha256-srYqszmlwMhSsBOwQgXg2tLxanpkleLg+L5JTItfyQ8=", + "pom": "sha256-JlYrXvlmF1b3jE5wQlhMPXqo3UCazWYIF2DfVsPA69Y=" + }, + "org/openrewrite#rewrite-xml/8.21.0": { + "jar": "sha256-vyVYEE7bPfGbrUZ5Tb6zBRDUqKsyQjsWCvcn/cxW+w4=", + "pom": "sha256-Ed1qEe2ACbkIwi76pitZNljilzTTq2JAMLZBRQdBVPs=" + }, + "org/openrewrite#rewrite-yaml/8.21.0": { + "jar": "sha256-C8j00wnD4IHxPpPz8m+ckOtKS+o4jn+GcQcfCDbSBa4=", + "pom": "sha256-l/ku9K9CAgKXwrB/7npvHsSZ3yBQoYK34GP0LIxtUQE=" + }, + "org/openrewrite/meta#rewrite-analysis/2.5.0": { + "jar": "sha256-/wYl8HtENRIN5D1Qnej6SKJrMHGC6O0qAqO9+PIKEXA=", + "pom": "sha256-KJ/UbupGTtq8FE3q3ao/J4pM04i3t3PFlsBMj5s0EUA=" + }, + "org/openrewrite/recipe#rewrite-github-actions/2.1.7": { + "jar": "sha256-+U58BXTuyk4b3glUSQNpazuJLDVWgVfgpx5imSpByQY=", + "pom": "sha256-9tN8nQx7IKgMwlNmh0Qhu6dFQBAqmOXW2HuG9y/+3cQ=" + }, + "org/openrewrite/recipe#rewrite-java-dependencies/1.6.0": { + "jar": "sha256-xEXEsREh7neaM4sehHO5FP2AmadbLdoVhDpBWe4dJMw=", + "pom": "sha256-ju9CTQl7Uu6MX3zAlr8QGXcDPfJpjCteGMNflvPun6s=" + }, + "org/openrewrite/recipe#rewrite-logging-frameworks/2.5.0": { + "jar": "sha256-XkUkAscaFk1HfLoxBS6KoVDPXW2XnkO84pc401lkPPw=", + "pom": "sha256-Fr1EBxgNTmopE+Yv9mBXXkLPgwi+3b48TYTCBlhXljU=" + }, + "org/openrewrite/recipe#rewrite-migrate-java/2.11.0": { + "jar": "sha256-G7KiDLRYWfiH61uT1KFByn5tSgoX7Lili3G1vtnGmtQ=", + "pom": "sha256-1AUeb7KAgDV/Ny3jgzw3F8aGVlg4pS5GJ3JrGtwwzao=" + }, + "org/openrewrite/recipe#rewrite-recipe-bom/2.8.1": { + "pom": "sha256-UhsIRURzoOk+BXcbmOqz/WgEB8mPtt4x6KVvnvUpnGg=" + }, + "org/openrewrite/recipe#rewrite-static-analysis/1.4.2": { + "jar": "sha256-jQ+HQhy5s65fr8DJVx9zBwelxwc7NENwgkxYbEnP3WY=", + "pom": "sha256-JWhucQZ6NSPReV1ZAjkjBbyTEL6hZhHJpRY/JN4mMBo=" + }, + "org/openrewrite/recipe#rewrite-testing-frameworks/2.6.0": { + "jar": "sha256-yZeGKnv0lO04nA2wYX2RDbXQHdJ4FKOVtjz1azcPLdA=", + "pom": "sha256-PTCTctbxw43Bf4rNg5LD0Etp2oCT/T64CA80/bpZo/I=" + }, + "org/openrewrite/tools#java-object-diff/1.0.1": { + "jar": "sha256-jc8DgdMGxSI86kwKy4Sv1WkexutB4Lajbdooigx+xNw=", + "pom": "sha256-WB1ijMi/jOggPdk0mFEiFkhqZeiG6KM7lLgZgdWrEe4=" + }, + "org/opentest4j#opentest4j/1.3.0": { + "jar": "sha256-SOLfY2yrZWPO1k3N/4q7I1VifLI27wvzdZhoLd90Lxs=", + "module": "sha256-SL8dbItdyU90ZSvReQD2VN63FDUCSM9ej8onuQkMjg0=", + "pom": "sha256-m/fP/EEPPoNywlIleN+cpW2dQ72TfjCUhwbCMqlDs1U=" + }, + "org/ow2#ow2/1.5": { + "pom": "sha256-D4obEW52C4/mOJxRuE5LB6cPwRCC1Pk25FO1g91QtDs=" + }, + "org/ow2#ow2/1.5.1": { + "pom": "sha256-Mh3bt+5v5PU96mtM1tt0FU1r+kI5HB92OzYbn0hazwU=" + }, + "org/ow2/asm#asm-analysis/9.6": { + "jar": "sha256-2Sgy18N+3AfGDiVZrGEYsx1kLjN6ZnHty3up+uaO27s=", + "pom": "sha256-+j+ZUCHP9PQTkwbmz/7uoHU5EGRA0psZzAanpjahOFA=" + }, + "org/ow2/asm#asm-bom/9.5": { + "pom": "sha256-cXVrNd2DfbY4gG8A9Ad+i7Nf6NgL1nToFBowfIEWNb8=" + }, + "org/ow2/asm#asm-commons/9.5": { + "jar": "sha256-cu7p+6+53o2UY/IN1YSkjO635RUq1MmHv74X3UgRya4=", + "pom": "sha256-im5GDu34zHuF0zx1YhPmpfeHX0qDg9U10ZnzIR7CNVw=" + }, + "org/ow2/asm#asm-tree/9.5": { + "jar": "sha256-PDOmSBkQea6urrfBmkmxU5UvnkD+hvusUgVVTd2azZQ=", + "pom": "sha256-pyqq+N0FGJn6CJ54PsfUgnrE19GHYgHG3uy6qUoNyVY=" + }, + "org/ow2/asm#asm-tree/9.6": { + "jar": "sha256-xD7PF7U5x3fhXae1uGVTs3fi05poPeYoVWfVKDiI5+8=", + "pom": "sha256-G8tIHX/Ba5VbtgygfIz6JCS87ni9xAW7oxx9b13C0RM=" + }, + "org/ow2/asm#asm-util/9.6": { + "jar": "sha256-xjWnQC9Kqb9msvQjDOpiAloP4c1j6HKa3vybGZT6xMM=", + "pom": "sha256-UsXB01dAR3nRqZtJqFv506CFAluFFstz2+93yK40AF4=" + }, + "org/ow2/asm#asm/9.0": { + "jar": "sha256-Dfl1dJFK7pL9NJ0MtOAPM0XUWywjngu1DwqQ6tR4iOA=", + "module": "sha256-ivgQlu06/6OaRyn8kApVtmOJSRHWfE1L7w6kJDk90/k=", + "pom": "sha256-3gNVWQ3Rv8zNyNeQJK6ZKXLoVSaKztua1oLQheA6lK0=" + }, + "org/ow2/asm#asm/9.5": { + "jar": "sha256-ti6EtZgHKXUbBFjFNM8TZvcnVCu40VhiEzVoKkYPA1M=", + "pom": "sha256-LJzOuVHMZYbejZoWxnKtPkwwucMjAo16PDNmVg1WJ7E=" + }, + "org/ow2/asm#asm/9.6": { + "jar": "sha256-PG+sJCTbPUqFO2afTj0dnDxVIjXhmjGWc/iHCDwjA6E=", + "pom": "sha256-ku7iS8PIQ+SIHUbB3WUFRx7jFC+s+0ZrQoz+paVsa2A=" + }, + "org/postgresql#postgresql/42.7.3": { + "jar": "sha256-omRMv7obqhRf9+jI71gqbu16fsTKeS9/BUEivex1Ymg=", + "pom": "sha256-wqy2hFfZlqjkntB3flklW3RlCXZSOVHxAa25QHXhWIU=" + }, + "org/reactfx#reactfx/2.0-M5": { + "jar": "sha256-ux/CCc2cBXsXpIAz03lPk3unpWazwIstuIh3cnaf3Wc=", + "pom": "sha256-FdCXejrnQDKd3KigR9gDgnVo5WO+1MLABshBr3/mftE=" + }, + "org/reflections#reflections/0.10.2": { + "jar": "sha256-k4otCP5UBQ12ELlE2N3DoJNVcQ2ea+CqyDjbwE6aKCU=", + "pom": "sha256-tsqj6301vXVu1usKKoGGi408D29CJE/q5BdgrGYwbYc=" + }, + "org/rnorth/duct-tape#duct-tape/1.0.8": { + "jar": "sha256-Mc7xLd7JedH4bXz3CMQaF9pSPQXGhf1mQunQsq3bckA=", + "pom": "sha256-Jjb2bevm4SQ3Yy8jpnubyWGwNjMAnlJSeju8hx9AabQ=" + }, + "org/scala-lang#scala-library/2.13.8": { + "jar": "sha256-oIgrglFBkMK6x9GkWYcqdfAF/A8+iLK8A5A2cUbjXbc=", + "pom": "sha256-SucLPLDCFdaa6sKMkhLmgR+euXiVZ4I0BgiTNCCIDVI=" + }, + "org/slf4j#jul-to-slf4j/2.0.12": { + "jar": "sha256-hPAoZMq4Zv+xlu0gIrG42mgupvs9ShYQaUKeg5HuKXk=", + "pom": "sha256-cSxGGjt/ZQhXk27ruv6k8afSqsHlVheuJM4+vjkorEg=" + }, + "org/slf4j#slf4j-api/1.7.36": { + "jar": "sha256-0+9XXj5JeWeNwBvx3M5RAhSTtNEft/G+itmCh3wWocA=", + "pom": "sha256-+wRqnCKUN5KLsRwtJ8i113PriiXmDL0lPZhSEN7cJoQ=" + }, + "org/slf4j#slf4j-api/2.0.12": { + "jar": "sha256-p5UCuKvfvXIoRqJ2kSJqQIhoLW01ZU+bgOKpzKz37Uc=", + "pom": "sha256-Udh5pZmPWCJ0Dc9VIsDtaXGtXEpeowtw9bVGCT5rQmM=" + }, + "org/slf4j#slf4j-bom/2.0.12": { + "pom": "sha256-SH70mE1wFY9Yw3zodmkxukx+VzdYZYhLdWORv9bQDDk=" + }, + "org/slf4j#slf4j-parent/1.7.36": { + "pom": "sha256-uziNN/vN083mTDzt4hg4aTIY3EUfBAQMXfNgp47X6BI=" + }, + "org/slf4j#slf4j-parent/2.0.12": { + "pom": "sha256-fGvEdX5NSZJN3w/sX1zkAvg6bGzz4QUtGVsSgqeFVd4=" + }, + "org/sonatype/oss#oss-parent/5": { + "pom": "sha256-FnjUEgpYXYpjATGu7ExSTZKDmFg7fqthbufVqH9SDT0=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/sonatype/oss#oss-parent/9": { + "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" + }, + "org/springframework#spring-framework-bom/5.3.32": { + "module": "sha256-R6cJH2l8pjEYXtQY8Morhu7wyCqhbRdx3exLLDu3s70=", + "pom": "sha256-glr3ES49kupDa7DfeMGVFIhfXAFtD8YMiyTUdjoBWhA=" + }, + "org/testcontainers#testcontainers/1.19.7": { + "jar": "sha256-xjfgJnjOvRKjAZqw/QWu9actBCkfC3OPGASZciMSgGw=", + "pom": "sha256-cKoV/o9xafOk76fPgfcIpIHMucsuCUe2Qh9ZKwjTDkU=" + }, + "org/testfx#testfx-core/4.0.16-alpha": { + "jar": "sha256-d0OENQCPIFYHClNrpQE9YxtPjBJv/1tTpJgh0Ml6dVE=", + "pom": "sha256-WgPqJdnH2bzqrnSheRJYPpZEpfUPENk20ovgMHzuyhs=" + }, + "org/testfx#testfx-junit5/4.0.16-alpha": { + "jar": "sha256-QFZZthIlFxY+GwQdr3WL6q7Y2PQKmtRXEkhiUTrSbZI=", + "pom": "sha256-US6tI6KaaXRc4VgL44P/L1XE+2ts0tAoOjJCOo1sQcQ=" + }, + "org/tinylog#slf4j-tinylog/2.7.0": { + "jar": "sha256-UdOqc6mGv8mFPuqRzXGHe5eJHwHIX2m0Kie1u5YpXeI=", + "pom": "sha256-m/aklJduXebZ9Qqm8D2J3IVeBnG9MGvvgJdAMbEkHys=" + }, + "org/tinylog#tinylog-api/2.7.0": { + "jar": "sha256-61ER4CprUyS1/U5DTL5rkxGb4FrS26PSHPAEWzqXVAw=", + "pom": "sha256-tSUMtY3N/tHm3xrll9xpKdNfukezTEmqKOS4iTyhjSQ=" + }, + "org/tinylog#tinylog-impl/2.7.0": { + "jar": "sha256-N+Uy9wagG7dqmEVMzXHR/6LoPyvv4cMJ5cZ+PEdL7bo=", + "pom": "sha256-mfmyIjpFEnD+OiS3DkfSXS46HWyYW0AxzReI/l1jt8Q=" + }, + "org/xerial/snappy#snappy-java/1.1.10.5": { + "jar": "sha256-Dz8YV+0zEWWD9IC031wCGINsR7+8nGIhwNc/NW3s83s=", + "pom": "sha256-ZfW4PkjZ5JRIKtA/GEyeV680jXj0rr4AzWr9xnaB7Y0=" + }, + "org/xmlresolver#xmlresolver/5.2.2": { + "jar": "sha256-78kr1+0ys+VwleCz6HIFHM+73MmAgx7zPonjgWGoUiI=", + "module": "sha256-GwTrOc/sj9X44KtqVSGymabUTza3o8Vx+6lr5Tp26AU=", + "pom": "sha256-4VopIlQ7OlXDF3TxDoPbdOk7L6kLPWMV3TocQqkfAHQ=" + }, + "org/xmlresolver#xmlresolver/5.2.2/data": { + "jar": "sha256-FzkEvb14O6D6ySxbzAXaXQnwzn7tJDRmZuoKI5Rh+bQ=" + }, + "org/xmlunit#xmlunit-core/2.9.1": { + "jar": "sha256-fnDyPU914F8O558Pa54Tts9R0082xfw6a4OUKd3h7+8=", + "pom": "sha256-0n5OKjEqIVR+82BcgS5+YMiuyWTn+WDlDU3Dy2azkBI=" + }, + "org/xmlunit#xmlunit-matchers/2.9.1": { + "jar": "sha256-uAyzm0wip1yGgQbGJoG/K64aWB9D82s1x74qz52d1GY=", + "pom": "sha256-EuxNwYrSDy5ojDCKgHWYl4ZE8T2bsTrqkDKlUEvQIK0=" + }, + "org/xmlunit#xmlunit-parent/2.9.1": { + "pom": "sha256-1+RY+9XGRFBIeOX7zglLHTB402mn/uF93ezj0Zn9qsA=" + }, + "org/yaml#snakeyaml/2.2": { + "jar": "sha256-FGeTFEiggXaWrigFt7iyC/sIJlK/nE767VKJMNxJOJs=", + "pom": "sha256-6YLq3HiMac8uTeUKn2MrGCwx26UGEoMNNI/EtLqN19Y=" + }, + "pt/davidafsilva/apple#jkeychain/1.1.0": { + "jar": "sha256-DBAKBPcAbxpuRxOFMF2IORIFaO29gPV7eHtxq415sXM=", + "module": "sha256-jMj9dmUna3xQ+fSqQtV4t40JKzy8ts0F/TKffE36A40=", + "pom": "sha256-McjawxJZPkNy5BS90l5/ggozTuwD/itb0p4daocwRKg=" + }, + "tech/units#indriya/2.1.2": { + "jar": "sha256-KGUPPEehW1AM1XkXaZKqWfbcQwqEKQqd7Svhly0r/eA=", + "pom": "sha256-ydZchn1fU9Z4XogcMASiwBCmk9EcCT8y03eiwHWxz9c=" + }, + "tech/uom#uom-parent/2.1": { + "pom": "sha256-iIrWpNud30ZNQcX1Jf0E95C5yTmoEPEWskVBw6ndFpM=" + }, + "tech/uom#uom-parent/2.1.1": { + "pom": "sha256-rNe3raemg444OLgoG3V4Hoo+mKSZm79kjwsNiBHXSe0=" + }, + "tech/uom/lib#uom-lib-common/2.1": { + "jar": "sha256-YYJfVNYd2pvalSU7QHZTvhz5/ZuUHaNGLJSjsW8rHIg=", + "pom": "sha256-ZyShzOK9EVWuZmGJ5j6Hzyu2tScCqxqLZsgY18dufvg=" + }, + "tech/uom/lib#uom-lib/2.1": { + "pom": "sha256-x71alqfCcTCj8zlti6X9PO7yPTE9k8wAexFAKlJzjbY=" + } + }, + "https://sandec.jfrog.io": { + "artifactory/repo/one/jpro/jproutils#tree-showing/0.2.2": { + "jar": "sha256-UL0OKkyxsS6fmZUT19xz7XRE6xGDirJwOPh/42G7wk0=", + "module": "sha256-MIj5KRKf67jwt1J/uusje3MSfHk6PB4wVAPLpTn3xC8=", + "pom": "sha256-fP6x7y/1WE9jjIYlE+o+8IyFw0gTyzvHDOPTUyQLTMw=" + } + } +} diff --git a/pkgs/applications/office/jameica/default.nix b/pkgs/applications/office/jameica/default.nix index f87eaf6d9e4d4..32cbcf088c51a 100644 --- a/pkgs/applications/office/jameica/default.nix +++ b/pkgs/applications/office/jameica/default.nix @@ -48,8 +48,8 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ ant jdk wrapGAppsHook3 makeWrapper stripJavaArchivesHook ]; - buildInputs = lib.optionals stdenv.isLinux [ gtk2 glib libXtst ] - ++ lib.optional stdenv.isDarwin Cocoa; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ gtk2 glib libXtst ] + ++ lib.optional stdenv.hostPlatform.isDarwin Cocoa; dontWrapGApps = true; @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { postFixup = '' makeWrapper ${jre}/bin/java $out/bin/jameica \ --add-flags "-cp $out/share/java/jameica.jar:$out/share/jameica-${version}/* ${ - lib.optionalString stdenv.isDarwin ''-Xdock:name="Jameica" -XstartOnFirstThread'' + lib.optionalString stdenv.hostPlatform.isDarwin ''-Xdock:name="Jameica" -XstartOnFirstThread'' } de.willuhn.jameica.Main" \ --prefix LD_LIBRARY_PATH : ${lib.escapeShellArg (lib.makeLibraryPath buildInputs)} \ --chdir "$out/share/java/" \ diff --git a/pkgs/applications/office/kitsas/default.nix b/pkgs/applications/office/kitsas/default.nix index 28064da7fe4cb..9821cdd2f2f86 100644 --- a/pkgs/applications/office/kitsas/default.nix +++ b/pkgs/applications/office/kitsas/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, qmake, qtbase, qtsvg, poppler, libzip, pkg-config, wrapQtAppsHook }: +{ lib, stdenv, fetchFromGitHub, qmake, qtsvg, poppler, libzip, pkg-config, wrapQtAppsHook }: stdenv.mkDerivation rec { pname = "kitsas"; @@ -28,10 +28,10 @@ stdenv.mkDerivation rec { qmakeFlags = [ "../kitsas/kitsas.pro" ]; - installPhase = lib.optionalString stdenv.isDarwin '' + installPhase = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications mv kitsas.app $out/Applications - '' + lib.optionalString (!stdenv.isDarwin) '' + '' + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' install -Dm755 kitsas -t $out/bin install -Dm644 ../kitsas.svg -t $out/share/icons/hicolor/scalable/apps install -Dm644 ../kitsas.png -t $out/share/icons/hicolor/256x256/apps diff --git a/pkgs/applications/office/ktimetracker/default.nix b/pkgs/applications/office/ktimetracker/default.nix index 58720625cc8e7..b31eb4588c3f8 100644 --- a/pkgs/applications/office/ktimetracker/default.nix +++ b/pkgs/applications/office/ktimetracker/default.nix @@ -28,6 +28,6 @@ kio knotifications kwindowsystem kxmlgui ktextwidgets mainProgram = "ktimetracker"; license = licenses.gpl2; homepage = "https://userbase.kde.org/KTimeTracker"; - maintainers = with maintainers; [ dtzWill ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/office/ledger-autosync/default.nix b/pkgs/applications/office/ledger-autosync/default.nix deleted file mode 100644 index 55b89f195e693..0000000000000 --- a/pkgs/applications/office/ledger-autosync/default.nix +++ /dev/null @@ -1,67 +0,0 @@ -{ lib -, python3Packages -, fetchFromGitHub -, ledger -, hledger -, useLedger ? true -, useHledger ? true -}: - -python3Packages.buildPythonApplication rec { - pname = "ledger-autosync"; - version = "1.0.3"; - format = "pyproject"; - - # no tests included in PyPI tarball - src = fetchFromGitHub { - owner = "egh"; - repo = "ledger-autosync"; - rev = "v${version}"; - sha256 = "0n3y4qxsv1cyvyap95h3rj4bj1sinyfgsajygm7s8di3j5aabqr2"; - }; - - nativeBuildInputs = with python3Packages; [ - poetry-core - ]; - - propagatedBuildInputs = with python3Packages; [ - asn1crypto - beautifulsoup4 - cffi - cryptography - entrypoints - fuzzywuzzy - idna - jeepney - keyring - lxml - mock - nose - ofxclient - ofxhome - ofxparse - pbr - pycparser - secretstorage - six - ] ++ lib.optional useLedger ledger - ++ lib.optional useHledger hledger; - - # Checks require ledger as a python package, - # ledger does not support python3 while ledger-autosync requires it. - nativeCheckInputs = with python3Packages; [ ledger hledger nose mock pytestCheckHook ]; - - # Disable some non-passing tests: - # https://github.com/egh/ledger-autosync/issues/127 - disabledTests = [ - "test_payee_match" - "test_args_only" - ]; - - meta = with lib; { - homepage = "https://github.com/egh/ledger-autosync"; - description = "OFX/CSV autosync for ledger and hledger"; - license = licenses.gpl3; - maintainers = with maintainers; [ eamsden ]; - }; -} diff --git a/pkgs/applications/office/libreoffice/0001-Strip-away-BUILDCONFIG.patch b/pkgs/applications/office/libreoffice/0001-Strip-away-BUILDCONFIG.patch deleted file mode 100644 index b477f902b2fb2..0000000000000 --- a/pkgs/applications/office/libreoffice/0001-Strip-away-BUILDCONFIG.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 982d38084f08950863b55043f36ce5548bd73635 Mon Sep 17 00:00:00 2001 -From: Maximilian Bosch <maximilian@mbosch.me> -Date: Mon, 24 Jul 2023 19:12:25 +0200 -Subject: [PATCH] Strip away BUILDCONFIG - -The `BuildConfig` field in `libsofficeapp.so` includes the entire -`PKG_CONFIG_PATH` and subsequently references to a lot of `dev` outputs -of library dependencies blowing up the closure. - -Since this is not strictly needed and the inputs are comprehensible via -`nix derivation show`, this doesn't bring a real benefit in the case of -nixpkgs anyways. ---- - desktop/source/lib/init.cxx | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx -index 8d830c0cbd00..fbdc86aa7115 100644 ---- a/desktop/source/lib/init.cxx -+++ b/desktop/source/lib/init.cxx -@@ -7097,7 +7097,7 @@ static char* lo_getVersionInfo(SAL_UNUSED_PARAMETER LibreOfficeKit* /*pThis*/) - "\"ProductVersion\": \"%PRODUCTVERSION\", " - "\"ProductExtension\": \"%PRODUCTEXTENSION\", " - "\"BuildId\": \"%BUILDID\", " -- "\"BuildConfig\": \"" BUILDCONFIG "\" " -+ "\"BuildConfig\": \"removed to avoid runtime dependencies against dev outputs of each dependency. Use 'nix derivation show' against the package to find out details about BuildConfig.\" " - "}")); - } - --- -2.40.1 - diff --git a/pkgs/applications/office/libreoffice/darwin/default.nix b/pkgs/applications/office/libreoffice/darwin/default.nix index c81d08d31d98f..f415b9164959d 100644 --- a/pkgs/applications/office/libreoffice/darwin/default.nix +++ b/pkgs/applications/office/libreoffice/darwin/default.nix @@ -3,7 +3,6 @@ , fetchurl , undmg , writeScript -, callPackage }: let @@ -44,7 +43,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..f0ffec6d92755 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -1,8 +1,10 @@ { stdenv , fetchurl +, fetchgit +, fetchpatch2 , lib , pam -, python3 +, python311 , libxslt , perl , perlPackages @@ -86,7 +88,7 @@ , glm , gst_all_1 , gdb -, gnome +, adwaita-icon-theme , glib , ncurses , libepoxy @@ -97,7 +99,8 @@ , libetonyek , liborcus , libpng -, langs ? [ "ar" "ca" "cs" "da" "de" "en-GB" "en-US" "eo" "es" "fi" "fr" "hu" "it" "ja" "nl" "pl" "pt" "pt-BR" "ro" "ru" "sk" "sl" "tr" "uk" "zh-CN" ] +, langs ? [ "ar" "ca" "cs" "da" "de" "en-GB" "en-US" "eo" "es" "fi" "fr" "hu" "it" "ja" "ko" "nl" "pl" "pt" "pt-BR" "ro" "ru" "sk" "sl" "tr" "uk" "zh-CN" ] +, withFonts ? false , withHelp ? true , kdeIntegration ? false , qtbase ? null @@ -115,6 +118,7 @@ , amiri , caladea , carlito +, culmus , dejavu_fonts , rubik , liberation-sans-narrow @@ -123,6 +127,10 @@ , libertine-g , noto-fonts , noto-fonts-cjk-sans +, rhino +, lp_solve +, xmlsec +, libcmis # The rest are used only in passthru, for the wrapper , kauth ? null , kcompletion ? null @@ -135,6 +143,7 @@ , kxmlgui ? null , phonon ? null , qtdeclarative ? null +, qtmultimedia ? null , qtquickcontrols ? null , qtsvg ? null , qttools ? null @@ -142,7 +151,7 @@ , sonnet ? null }: -assert builtins.elem variant [ "fresh" "still" ]; +assert builtins.elem variant [ "fresh" "still" "collabora" ]; let inherit (lib) @@ -156,6 +165,7 @@ let amiri caladea carlito + culmus dejavu_fonts rubik liberation-sans-narrow @@ -197,8 +207,8 @@ let }) // { inherit (x) md5name md5; }) srcsAttributes.deps; - translations = fetchurl srcsAttributes.translations; - help = fetchurl srcsAttributes.help; + translations = srcsAttributes.translations { inherit fetchurl fetchgit; }; + help = srcsAttributes.help { inherit fetchurl fetchgit; }; }; qtMajor = lib.versions.major qtbase.version; @@ -208,6 +218,7 @@ let name = "libreoffice-kde-dependencies-${version}"; paths = flatten (map (e: [ (getDev e) (getLib e) ]) [ qtbase + qtmultimedia qtx11extras kconfig kcoreaddons @@ -221,7 +232,8 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "libreoffice"; inherit version; - src = fetchurl srcsAttributes.main; + + src = srcsAttributes.main { inherit fetchurl fetchgit; }; postUnpack = '' mkdir -v $sourceRoot/${tarballPath} @@ -231,31 +243,38 @@ in stdenv.mkDerivation (finalAttrs: { ln -sfv ${f} $sourceRoot/${tarballPath}/${f.name} '')} + '' + (if (variant != "collabora") then '' ln -sv ${srcs.help} $sourceRoot/${tarballPath}/${srcs.help.name} ln -svf ${srcs.translations} $sourceRoot/${tarballPath}/${srcs.translations.name} tar -xf ${srcs.help} tar -xf ${srcs.translations} - ''; + '' else '' + cp -r --no-preserve=mode ${srcs.help}/. $sourceRoot/helpcontent2/ + cp -r --no-preserve=mode ${srcs.translations}/. $sourceRoot/translations/ + ''); patches = [ # Skip some broken tests: # - tdf160386 does not fall back to a CJK font properly for some reason - # - the remaining tests have notes in the patch + # - the remaining tests have notes in the patches # FIXME: get rid of this ASAP ./skip-broken-tests.patch - ] ++ lib.optionals (variant == "still") [ - # Remove build config to reduce the amount of `-dev` outputs in the - # runtime closure. This behavior was introduced by upstream in commit - # cbfac11330882c7d0a817b6c37a08b2ace2b66f4 - ./0001-Strip-away-BUILDCONFIG.patch - # See above - ./skip-broken-tests-still.patch - ] ++ lib.optionals (variant == "fresh") [ + (./skip-broken-tests- + variant + ".patch") + + # Don't detect Qt paths from qmake, so our patched-in onese are used + ./dont-detect-qt-paths-from-qmake.patch + # Revert part of https://github.com/LibreOffice/core/commit/6f60670877208612b5ea320b3677480ef6508abb that broke zlib linking ./readd-explicit-zlib-link.patch - # See above - ./skip-broken-tests-fresh.patch + ] ++ lib.optionals (lib.versionOlder version "24.8") [ + (fetchpatch2 { + name = "icu74-compat.patch"; + url = "https://gitlab.archlinux.org/archlinux/packaging/packages/libreoffice-fresh/-/raw/main/libreoffice-7.5.8.2-icu-74-compatibility.patch?ref_type=heads.patch"; + hash = "sha256-OGBPIVQj8JTYlkKywt4QpH7ULAzKmet5jTLztGpIS0Y="; + }) + ] ++ lib.optionals (variant == "collabora") [ + ./fix-unpack-collabora.patch ]; postPatch = '' @@ -268,6 +287,9 @@ in stdenv.mkDerivation (finalAttrs: { substituteInPlace configure.ac --replace-fail \ 'GPGMEPP_CFLAGS=-I/usr/include/gpgme++' \ 'GPGMEPP_CFLAGS=-I${gpgme.dev}/include/gpgme++' + + # Fix for Python 3.12 + substituteInPlace configure.ac --replace-fail distutils.sysconfig sysconfig ''; nativeBuildInputs = [ @@ -311,7 +333,7 @@ in stdenv.mkDerivation (finalAttrs: { gettext glib glm - gnome.adwaita-icon-theme + adwaita-icon-theme gperf gpgme graphite2 @@ -334,6 +356,7 @@ in stdenv.mkDerivation (finalAttrs: { libargon2 libatomic_ops libcdr + libcmis libe-book libepoxy libepubgen @@ -360,6 +383,7 @@ in stdenv.mkDerivation (finalAttrs: { libxslt libzmf libwebp + lp_solve mdds mythes ncurses @@ -372,12 +396,13 @@ in stdenv.mkDerivation (finalAttrs: { perl poppler postgresql - python3 + python311 sane-backends unixODBC unzip util-linux which + xmlsec zip zlib ] ++ optionals kdeIntegration [ @@ -437,18 +462,6 @@ in stdenv.mkDerivation (finalAttrs: { "--enable-release-build" "--enable-epm" "--with-ant-home=${getLib ant}/lib/ant" - "--with-system-cairo" - "--with-system-libs" - "--with-system-headers" - "--with-system-openssl" - "--with-system-libabw" - "--with-system-liblangtag" - "--without-system-libcmis" - "--with-system-libwps" - "--with-system-mdds" - "--with-system-openldap" - "--with-system-coinmp" - "--with-system-postgresql" # Without these, configure does not finish "--without-junit" @@ -464,15 +477,31 @@ in stdenv.mkDerivation (finalAttrs: { # Modified on every upgrade, though "--disable-odk" "--disable-firebird-sdbc" - "--without-fonts" + (lib.withFeature withFonts "fonts") "--without-doxygen" - # TODO: package these as system libraries "--with-system-beanshell" - "--without-system-hsqldb" + "--with-system-cairo" + "--with-system-coinmp" + "--with-system-headers" + "--with-system-libabw" + "--with-system-libcmis" + "--with-system-libepubgen" + "--with-system-libetonyek" + "--with-system-liblangtag" + "--with-system-libs" + "--with-system-libwps" + "--with-system-lpsolve" + "--with-system-mdds" + "--with-system-openldap" + "--with-system-openssl" + "--with-system-orcus" + "--with-system-postgresql" + "--with-system-xmlsec" + + # TODO: package these as system libraries "--without-system-altlinuxhyph" "--without-system-frozen" - "--without-system-lpsolve" "--without-system-libfreehand" "--without-system-libmspub" "--without-system-libnumbertext" @@ -482,20 +511,26 @@ in stdenv.mkDerivation (finalAttrs: { "--without-system-dragonbox" "--without-system-libfixmath" - # is packaged but headers can't be found because there is no pkg-config file - "--without-system-zxcvbn" + # requires an oddly specific, old version + "--without-system-hsqldb" - "--with-system-orcus" - "--with-system-libepubgen" - "--with-system-libetonyek" - "--without-system-xmlsec" + # searches hardcoded paths that are wrong "--without-system-zxing" + + # is packaged but headers can't be found because there is no pkg-config file + "--without-system-zxcvbn" ] ++ optionals kdeIntegration [ "--enable-kf${qtMajor}" "--enable-qt${qtMajor}" ] ++ optionals (kdeIntegration && qtMajor == "5") [ "--enable-gtk3-kde5" - ]; + ] ++ (if variant == "fresh" then [ + "--with-system-rhino" + "--with-rhino-jar=${rhino}/share/java/js.jar" + ] else [ + # our Rhino is too new for older versions + "--without-system-rhino" + ]); env = { @@ -525,9 +560,10 @@ in stdenv.mkDerivation (finalAttrs: { "--keep-going" # easier to debug test failures ]; - postInstall = '' - mkdir -p $out/share/icons + postInstall = optionalString (variant != "collabora") '' + mkdir -p $out/{include,share/icons} + cp -r include/LibreOfficeKit $out/include/ cp -r sysui/desktop/icons/hicolor $out/share/icons # Rename icons for consistency @@ -553,6 +589,7 @@ in stdenv.mkDerivation (finalAttrs: { passthru = { inherit srcs; jdk = jre'; + python = python311; # for unoconv updateScript = [ ./update.sh # Pass it this file name as argument @@ -578,6 +615,7 @@ in stdenv.mkDerivation (finalAttrs: { ki18n knotifications qtdeclarative + qtmultimedia qtquickcontrols qtwayland solid @@ -598,6 +636,7 @@ in stdenv.mkDerivation (finalAttrs: { phonon qtbase qtdeclarative + qtmultimedia qtsvg qttools qtwayland @@ -624,5 +663,6 @@ in stdenv.mkDerivation (finalAttrs: { license = licenses.lgpl3; maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; + mainProgram = "libreoffice"; }; }) diff --git a/pkgs/applications/office/libreoffice/dont-detect-qt-paths-from-qmake.patch b/pkgs/applications/office/libreoffice/dont-detect-qt-paths-from-qmake.patch new file mode 100644 index 0000000000000..6be6598cfd3f3 --- /dev/null +++ b/pkgs/applications/office/libreoffice/dont-detect-qt-paths-from-qmake.patch @@ -0,0 +1,22 @@ +diff --git a/configure.ac b/configure.ac +index 2c11703cb3ff..302a006bbf75 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -13444,8 +13444,6 @@ then + fi + fi + +- qt5_incdirs="`$QMAKE5 -query QT_INSTALL_HEADERS` $qt5_incdirs" +- qt5_libdirs="`$QMAKE5 -query QT_INSTALL_LIBS` $qt5_libdirs" + qt5_platformsdir="`$QMAKE5 -query QT_INSTALL_PLUGINS`/platforms" + QT5_PLATFORMS_SRCDIR="$qt5_platformsdir" + +@@ -13585,8 +13583,6 @@ then + AC_MSG_NOTICE([Detected Qt6 version: $qmake6_test_ver]) + fi + +- qt6_incdirs="`$QMAKE6 -query QT_INSTALL_HEADERS` $qt6_incdirs" +- qt6_libdirs="`$QMAKE6 -query QT_INSTALL_LIBS` $qt6_libdirs" + qt6_platformsdir="`$QMAKE6 -query QT_INSTALL_PLUGINS`/platforms" + QT6_PLATFORMS_SRCDIR="$qt6_platformsdir" + diff --git a/pkgs/applications/office/libreoffice/fix-unpack-collabora.patch b/pkgs/applications/office/libreoffice/fix-unpack-collabora.patch new file mode 100644 index 0000000000000..1d95a536e35c9 --- /dev/null +++ b/pkgs/applications/office/libreoffice/fix-unpack-collabora.patch @@ -0,0 +1,10 @@ +--- a/solenv/gbuild/UnpackedTarball.mk ++++ b/solenv/gbuild/UnpackedTarball.mk +@@ -31,6 +31,7 @@ define gb_UnpackedTarget__command_unzip + unzip \ + -qq \ + -d $(UNPACKED_DIR) $(UNPACKED_TARBALL) \ ++ && chmod -R u+r $(UNPACKED_DIR) \ + $(if $(filter-out 0,$(UNPACKED_STRIP_COMPONENTS)),\ + && UNZIP_DIR=`ls $(UNPACKED_DIR)` \ + && mv $(UNPACKED_DIR)/$$UNZIP_DIR/* $(UNPACKED_DIR) \ diff --git a/pkgs/applications/office/libreoffice/generate-libreoffice-srcs.py b/pkgs/applications/office/libreoffice/generate-libreoffice-srcs.py index 3126d0b48251e..7e2c13b5b17c9 100755 --- a/pkgs/applications/office/libreoffice/generate-libreoffice-srcs.py +++ b/pkgs/applications/office/libreoffice/generate-libreoffice-srcs.py @@ -9,6 +9,7 @@ of the input file, and writes the result to stdout. todo - Ideally we would move as much as possible into derivation dependencies. """ import collections, itertools, json, re, subprocess, sys, os +import urllib.request, urllib.error def main(): @@ -53,12 +54,29 @@ def main(): def construct_url(x): if x['brief']: - return 'https://dev-www.libreoffice.org/src/{}{}'.format( + url = 'https://dev-www.libreoffice.org/src/{}{}'.format( x.get('subdir', ''), x['tarball']) else: - return 'https://dev-www.libreoffice.org/src/{}{}-{}'.format( + url = 'https://dev-www.libreoffice.org/src/{}{}-{}'.format( x.get('subdir', ''), x['md5'], x['tarball']) + if x['name'].startswith('FONT_NOTO_') and not probe_url(url): + return 'https://noto-website-2.storage.googleapis.com/pkgs/{}'.format(x['tarball']) + + if x['name'] == 'FONT_OPENDYSLEXIC': + return 'https://github.com/antijingoist/opendyslexic/releases/download/v0.91.12/{}'.format(x['tarball']) + + return url + + +def probe_url(url: str) -> bool: + request = urllib.request.Request(url, method='HEAD') + try: + with urllib.request.urlopen(request) as response: + return response.status == 200 + except urllib.error.HTTPError as e: + return False + def download(url, name, hash, hashtype): cmd = ['nix-prefetch-url', url, hash, '--print-path', diff --git a/pkgs/applications/office/libreoffice/skip-broken-tests-collabora.patch b/pkgs/applications/office/libreoffice/skip-broken-tests-collabora.patch new file mode 100644 index 0000000000000..f162d7c407f49 --- /dev/null +++ b/pkgs/applications/office/libreoffice/skip-broken-tests-collabora.patch @@ -0,0 +1,65 @@ +--- a/sc/Module_sc.mk ++++ b/sc/Module_sc.mk +@@ -69,8 +69,8 @@ endif + + ifneq ($(DISABLE_GUI),TRUE) + ifeq ($(OS),LINUX) ++# CppunitTest_sc_tiledrendering hangs + $(eval $(call gb_Module_add_check_targets,sc,\ +- CppunitTest_sc_tiledrendering \ + CppunitTest_sc_tiledrendering2 \ + )) + endif +--- a/sc/qa/extras/vba-macro-test.cxx ++++ b/sc/qa/extras/vba-macro-test.cxx +@@ -364,7 +364,7 @@ CPPUNIT_TEST_FIXTURE(VBAMacroTest, testVba) + // Failed: : Test change event for Range.FillRight: + // Tests passed: 4 + // Tests failed: 4 +-#if !defined(_WIN32) ++#if 0 // flaky, see above + { OUString("Ranges-3.xls"), + OUString( + "vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document") }, +--- a/sc/qa/unit/ucalc_formula.cxx ++++ b/sc/qa/unit/ucalc_formula.cxx +@@ -1507,6 +1507,8 @@ CPPUNIT_TEST_FIXTURE(TestFormula, testFormulaAnnotateTrimOnDoubleRefs) + + CPPUNIT_TEST_FIXTURE(TestFormula, testFormulaRefUpdate) + { ++ return; // fails consistently on nixpkgs? ++ + m_pDoc->InsertTab(0, "Formula"); + + sc::AutoCalcSwitch aACSwitch(*m_pDoc, true); // turn auto calc on. +--- a/sw/qa/extras/tiledrendering/tiledrendering.cxx ++++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx +@@ -2948,6 +2948,8 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testHighlightNumbering_shd) + + CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testPilcrowRedlining) + { ++ return; // flaky ++ + // Load a document where the top left tile contains + // paragraph and line break symbols with redlining. + SwXTextDocument* pXTextDocument = createDoc("pilcrow-redlining.fodt"); +@@ -4100,6 +4104,8 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testRedlineTooltip) + // toggling Formatting Marks on/off for one view should have no effect on other views + CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testToggleFormattingMarks) + { ++ return; // fails consistently ++ + SwXTextDocument* pXTextDocument = createDoc(); + int nView1 = SfxLokHelper::getView(); + +--- a/vcl/qa/cppunit/complextext.cxx ++++ b/vcl/qa/cppunit/complextext.cxx +@@ -529,6 +529,8 @@ CPPUNIT_TEST_FIXTURE(VclComplexTextTest, testMixedCJKLatinScript_glyph_advanceme + + CPPUNIT_TEST_FIXTURE(VclComplexTextTest, testTdf107718) + { ++ return; // fails to find the font ++ + #if HAVE_MORE_FONTS + #if !defined _WIN32 // TODO: Fails on jenkins but passes locally + vcl::Font aFont(u"Source Han Sans"_ustr, u"Regular"_ustr, Size(0, 72)); diff --git a/pkgs/applications/office/libreoffice/skip-broken-tests-fresh.patch b/pkgs/applications/office/libreoffice/skip-broken-tests-fresh.patch index d1971cfde4bac..7b6d1d90f3e9d 100644 --- a/pkgs/applications/office/libreoffice/skip-broken-tests-fresh.patch +++ b/pkgs/applications/office/libreoffice/skip-broken-tests-fresh.patch @@ -1,21 +1,93 @@ ---- a/svgio/qa/cppunit/data/tdf160386.svg -+++ b/svgio/qa/cppunit/data/tdf160386.svg -@@ -8,7 +8,6 @@ - <text systemLanguage="en">Hello!</text> - <text systemLanguage="es">Hola!</text> - <text systemLanguage="fr">Bonjour!</text> -- <text systemLanguage="ja">こんにちは</text> - <text systemLanguage="ru">Привет!</text> - <text>☺</text> - </switch> ---- a/sw/qa/core/text/text.cxx -+++ b/sw/qa/core/text/text.cxx -@@ -1577,6 +1577,8 @@ CPPUNIT_TEST_FIXTURE(SwCoreTextTest, testParaUpperMarginFlyIntersect) +--- a/sc/Module_sc.mk ++++ b/sc/Module_sc.mk +@@ -69,8 +69,8 @@ endif - CPPUNIT_TEST_FIXTURE(SwCoreTextTest, testTdf129810) + ifneq ($(DISABLE_GUI),TRUE) + ifeq ($(OS),LINUX) ++# CppunitTest_sc_tiledrendering hangs + $(eval $(call gb_Module_add_check_targets,sc,\ +- CppunitTest_sc_tiledrendering \ + CppunitTest_sc_tiledrendering2 \ + )) + endif +--- a/sc/qa/extras/vba-macro-test.cxx ++++ b/sc/qa/extras/vba-macro-test.cxx +@@ -364,7 +364,7 @@ CPPUNIT_TEST_FIXTURE(VBAMacroTest, testVba) + // Failed: : Test change event for Range.FillRight: + // Tests passed: 4 + // Tests failed: 4 +-#if !defined(_WIN32) ++#if 0 // flaky, see above + { u"Ranges-3.xls"_ustr, + u"vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document"_ustr }, + #endif +--- a/sc/qa/unit/ucalc_formula.cxx ++++ b/sc/qa/unit/ucalc_formula.cxx +@@ -1507,6 +1507,8 @@ CPPUNIT_TEST_FIXTURE(TestFormula, testFormulaAnnotateTrimOnDoubleRefs) + + CPPUNIT_TEST_FIXTURE(TestFormula, testFormulaRefUpdate) + { ++ return; // fails consistently on nixpkgs? ++ + m_pDoc->InsertTab(0, u"Formula"_ustr); + + sc::AutoCalcSwitch aACSwitch(*m_pDoc, true); // turn auto calc on. +--- a/sw/qa/extras/layout/layout3.cxx ++++ b/sw/qa/extras/layout/layout3.cxx +@@ -3039,6 +3041,9 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf104209VertRTL) + + CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf56408LTR) + { ++ return; // requests Noto Sans Hebrew with charset=28, which the font does not have ++ // FIXME: investigate ++ + // Verify that line breaking a first bidi portion correctly underflows in LTR text + createSwDoc("tdf56408-ltr.fodt"); + auto pXmlDoc = parseLayoutDump(); +@@ -3053,6 +3058,8 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf56408LTR) + + CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf56408RTL) + { ++ return; // same Noto Sans Hebrew issue ++ + // Verify that line breaking a first bidi portion correctly underflows in RTL text + createSwDoc("tdf56408-rtl.fodt"); + auto pXmlDoc = parseLayoutDump(); +@@ -3083,6 +3090,8 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf56408NoUnderflow) + + CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf56408AfterFieldCrash) + { ++ return; // same Noto Sans Hebrew issue ++ + // Verify there is no crash/assertion for underflow after a number field + createSwDoc("tdf56408-after-field.fodt"); + } +@@ -3121,6 +3130,8 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf146081) + + CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf157829LTR) + { ++ return; // same Noto Sans Hebrew issue ++ + // Verify that line breaking inside a bidi portion triggers underflow to previous bidi portions + createSwDoc("tdf157829-ltr.fodt"); + auto pXmlDoc = parseLayoutDump(); +@@ -3135,6 +3146,8 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf157829LTR) + + CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf157829RTL) + { ++ return; // same Noto Sans Hebrew issue ++ + // Verify that line breaking inside a bidi portion triggers underflow to previous bidi portions + createSwDoc("tdf157829-rtl.fodt"); + auto pXmlDoc = parseLayoutDump(); +--- a/sw/qa/extras/tiledrendering/tiledrendering.cxx ++++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx +@@ -4230,6 +4232,8 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testRedlineTooltip) + // toggling Formatting Marks on/off for one view should have no effect on other views + CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testToggleFormattingMarks) { -+ return; // flaky? ++ return; // fails consistently + - // Load the document. - // The document embeds a subset of "Source Han Serif SC" so that it works - // even when the font is not installed. + SwXTextDocument* pXTextDocument = createDoc(); + int nView1 = SfxLokHelper::getView(); + diff --git a/pkgs/applications/office/libreoffice/skip-broken-tests-still.patch b/pkgs/applications/office/libreoffice/skip-broken-tests-still.patch index 24a813a1ac512..e7064d1085520 100644 --- a/pkgs/applications/office/libreoffice/skip-broken-tests-still.patch +++ b/pkgs/applications/office/libreoffice/skip-broken-tests-still.patch @@ -1,11 +1,69 @@ ---- a/sw/qa/core/text/text.cxx -+++ b/sw/qa/core/text/text.cxx -@@ -1369,6 +1369,8 @@ CPPUNIT_TEST_FIXTURE(SwCoreTextTest, testParaUpperMarginFlyIntersect) +--- a/sc/qa/extras/vba-macro-test.cxx ++++ b/sc/qa/extras/vba-macro-test.cxx +@@ -364,7 +364,7 @@ CPPUNIT_TEST_FIXTURE(VBAMacroTest, testVba) + // Failed: : Test change event for Range.FillRight: + // Tests passed: 4 + // Tests failed: 4 +-#if !defined(_WIN32) ++#if 0 // flaky, see above + { OUString("Ranges-3.xls"), + OUString( + "vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document") }, +--- a/sc/qa/unit/ucalc_formula.cxx ++++ b/sc/qa/unit/ucalc_formula.cxx +@@ -1507,6 +1507,8 @@ CPPUNIT_TEST_FIXTURE(TestFormula, testFormulaAnnotateTrimOnDoubleRefs) - CPPUNIT_TEST_FIXTURE(SwCoreTextTest, testTdf129810) + CPPUNIT_TEST_FIXTURE(TestFormula, testFormulaRefUpdate) { -+ return; // flaky? ++ return; // fails consistently on nixpkgs? + - // Load the document, which embeds a CJK font. - createSwDoc("tdf129810.odt"); + m_pDoc->InsertTab(0, "Formula"); + sc::AutoCalcSwitch aACSwitch(*m_pDoc, true); // turn auto calc on. +--- a/sw/qa/extras/tiledrendering/tiledrendering.cxx ++++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx +@@ -685,6 +685,8 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testSearchAll) + + CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testSearchAllNotifications) + { ++ return; // flaky on GTK ++ + SwXTextDocument* pXTextDocument = createDoc("search.odt"); + SwWrtShell* pWrtShell = pXTextDocument->GetDocShell()->GetWrtShell(); + setupLibreOfficeKitViewCallback(pWrtShell->GetSfxViewShell()); +@@ -949,6 +951,8 @@ namespace { + + CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testMissingInvalidation) + { ++ return; // flaky on GTK ++ + // Create two views. + SwXTextDocument* pXTextDocument = createDoc("dummy.fodt"); + ViewCallback aView1; +@@ -982,6 +986,8 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testMissingInvalidation) + + CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testViewCursors) + { ++ return; // flaky on GTK ++ + SwXTextDocument* pXTextDocument = createDoc("dummy.fodt"); + ViewCallback aView1; + SfxLokHelper::createView(); +@@ -3189,6 +3189,8 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testRedlineNotificationDuringSave) + + CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testHyperlink) + { ++ return; // flaky on GTK ++ + comphelper::LibreOfficeKit::setViewIdForVisCursorInvalidation(true); + SwXTextDocument* pXTextDocument = createDoc("hyperlink.odt"); + SwWrtShell* pWrtShell = pXTextDocument->GetDocShell()->GetWrtShell(); +@@ -3399,6 +3401,8 @@ static void lcl_extractHandleParameters(std::string_view selection, sal_Int32& i + + CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testMoveShapeHandle) + { ++ return; // flaky on GTK ++ + comphelper::LibreOfficeKit::setActive(); + SwXTextDocument* pXTextDocument = createDoc("shape.fodt"); + diff --git a/pkgs/applications/office/libreoffice/skip-broken-tests.patch b/pkgs/applications/office/libreoffice/skip-broken-tests.patch index aad3660b18195..3f45a7cda9db0 100644 --- a/pkgs/applications/office/libreoffice/skip-broken-tests.patch +++ b/pkgs/applications/office/libreoffice/skip-broken-tests.patch @@ -18,28 +18,16 @@ LibLibreOffice_Impl aOffice; LibLODocument_Impl* pDocument = loadDoc("search.ods"); pDocument->pClass->initializeForRendering(pDocument, nullptr); ---- a/sc/qa/extras/vba-macro-test.cxx -+++ b/sc/qa/extras/vba-macro-test.cxx -@@ -364,7 +364,7 @@ CPPUNIT_TEST_FIXTURE(VBAMacroTest, testVba) - // Failed: : Test change event for Range.FillRight: - // Tests passed: 4 - // Tests failed: 4 --#if !defined(_WIN32) -+#if 0 // flaky, see above - { OUString("Ranges-3.xls"), - OUString( - "vnd.sun.Star.script:VBAProject.testMacros.test?language=Basic&location=document") }, ---- a/sc/qa/unit/ucalc_formula.cxx -+++ b/sc/qa/unit/ucalc_formula.cxx -@@ -1507,6 +1507,8 @@ CPPUNIT_TEST_FIXTURE(TestFormula, testFormulaAnnotateTrimOnDoubleRefs) - - CPPUNIT_TEST_FIXTURE(TestFormula, testFormulaRefUpdate) - { -+ return; // fails consistently on nixpkgs? -+ - m_pDoc->InsertTab(0, "Formula"); - - sc::AutoCalcSwitch aACSwitch(*m_pDoc, true); // turn auto calc on. +--- a/svgio/qa/cppunit/data/tdf160386.svg ++++ b/svgio/qa/cppunit/data/tdf160386.svg +@@ -8,7 +8,6 @@ + <text systemLanguage="en">Hello!</text> + <text systemLanguage="es">Hola!</text> + <text systemLanguage="fr">Bonjour!</text> +- <text systemLanguage="ja">こんにちは</text> + <text systemLanguage="ru">Привет!</text> + <text>☺</text> + </switch> --- a/sw/qa/core/accessibilitycheck/AccessibilityCheckTest.cxx +++ b/sw/qa/core/accessibilitycheck/AccessibilityCheckTest.cxx @@ -284,6 +284,8 @@ void checkIssuePosition(std::shared_ptr<sfx::AccessibilityIssue> const& pIssue, @@ -51,6 +39,17 @@ // Checks the a11y checker is setting the a11y issues to the nodes // correctly when splitting and appending nodes (through undo), which // happen on editing all the time. +--- a/sw/qa/core/text/text.cxx ++++ b/sw/qa/core/text/text.cxx +@@ -1577,6 +1577,8 @@ CPPUNIT_TEST_FIXTURE(SwCoreTextTest, testParaUpperMarginFlyIntersect) + + CPPUNIT_TEST_FIXTURE(SwCoreTextTest, testTdf129810) + { ++ return; // flaky? ++ + // Load the document. + // The document embeds a subset of "Source Han Serif SC" so that it works + // even when the font is not installed. --- a/sw/qa/extras/htmlimport/htmlimport.cxx +++ b/sw/qa/extras/htmlimport/htmlimport.cxx @@ -306,6 +306,8 @@ CPPUNIT_TEST_FIXTURE(HtmlImportTest, testTableBorder1px) @@ -95,6 +94,15 @@ SwXTextDocument* pXTextDocument = createDoc("dummy.fodt"); ViewCallback aView1; int nView1 = SfxLokHelper::getView(); +@@ -3187,6 +3187,8 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testDoubleUnderlineAndStrikeOut) + + CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testTdf43244_SpacesOnMargin) + { ++ return; // fails consistently ++ + // Load a document where the top left tile contains + // paragraph and line break symbols with redlining. + SwXTextDocument* pXTextDocument = createDoc("tdf43244_SpacesOnMargin.odt"); --- a/sw/qa/extras/uiwriter/uiwriter5.cxx +++ b/sw/qa/extras/uiwriter/uiwriter5.cxx @@ -1613,6 +1613,8 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest5, testDateFormFieldCurrentDateHandling) diff --git a/pkgs/applications/office/libreoffice/src-collabora/deps.nix b/pkgs/applications/office/libreoffice/src-collabora/deps.nix new file mode 100644 index 0000000000000..f697e3f6140ff --- /dev/null +++ b/pkgs/applications/office/libreoffice/src-collabora/deps.nix @@ -0,0 +1,1087 @@ +[ + { + name = "libabw-0.1.3.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libabw-0.1.3.tar.xz"; + sha256 = "e763a9dc21c3d2667402d66e202e3f8ef4db51b34b79ef41f56cacb86dcd6eed"; + md5 = ""; + md5name = "e763a9dc21c3d2667402d66e202e3f8ef4db51b34b79ef41f56cacb86dcd6eed-libabw-0.1.3.tar.xz"; + } + { + name = "phc-winner-argon2-20190702.tar.gz"; + url = "https://dev-www.libreoffice.org/src/phc-winner-argon2-20190702.tar.gz"; + sha256 = "daf972a89577f8772602bf2eb38b6a3dd3d922bf5724d45e7f9589b5e830442c"; + md5 = ""; + md5name = "daf972a89577f8772602bf2eb38b6a3dd3d922bf5724d45e7f9589b5e830442c-phc-winner-argon2-20190702.tar.gz"; + } + { + name = "boost_1_82_0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/boost_1_82_0.tar.xz"; + sha256 = "e48ab6953fbd68ba47234bea5173e62427e9f6a7894e152305142895cfe955de"; + md5 = ""; + md5name = "e48ab6953fbd68ba47234bea5173e62427e9f6a7894e152305142895cfe955de-boost_1_82_0.tar.xz"; + } + { + name = "box2d-2.4.1.tar.gz"; + url = "https://dev-www.libreoffice.org/src/box2d-2.4.1.tar.gz"; + sha256 = "d6b4650ff897ee1ead27cf77a5933ea197cbeef6705638dd181adc2e816b23c2"; + md5 = ""; + md5name = "d6b4650ff897ee1ead27cf77a5933ea197cbeef6705638dd181adc2e816b23c2-box2d-2.4.1.tar.gz"; + } + { + name = "breakpad-b324760c7f53667af128a6b77b790323da04fcb9.tar.xz"; + url = "https://dev-www.libreoffice.org/src/breakpad-b324760c7f53667af128a6b77b790323da04fcb9.tar.xz"; + sha256 = "c44a2e898895cfc13b42d2371ba4b88b0777d7782214d6cdc91c33720f3b0d91"; + md5 = ""; + md5name = "c44a2e898895cfc13b42d2371ba4b88b0777d7782214d6cdc91c33720f3b0d91-breakpad-b324760c7f53667af128a6b77b790323da04fcb9.tar.xz"; + } + { + name = "bsh-2.0b6-src.zip"; + url = "https://dev-www.libreoffice.org/src/beeca87be45ec87d241ddd0e1bad80c1-bsh-2.0b6-src.zip"; + sha256 = "9e93c73e23aff644b17dfff656444474c14150e7f3b38b19635e622235e01c96"; + md5 = "beeca87be45ec87d241ddd0e1bad80c1"; + md5name = "beeca87be45ec87d241ddd0e1bad80c1-bsh-2.0b6-src.zip"; + } + { + name = "bzip2-1.0.8.tar.gz"; + url = "https://dev-www.libreoffice.org/src/bzip2-1.0.8.tar.gz"; + sha256 = "ab5a03176ee106d3f0fa90e381da478ddae405918153cca248e682cd0c4a2269"; + md5 = ""; + md5name = "ab5a03176ee106d3f0fa90e381da478ddae405918153cca248e682cd0c4a2269-bzip2-1.0.8.tar.gz"; + } + { + name = "cairo-1.17.6.tar.xz"; + url = "https://dev-www.libreoffice.org/src/cairo-1.17.6.tar.xz"; + sha256 = "4eebc4c2bad0402bc3f501db184417094657d111fb6c06f076a82ea191fe1faf"; + md5 = ""; + md5name = "4eebc4c2bad0402bc3f501db184417094657d111fb6c06f076a82ea191fe1faf-cairo-1.17.6.tar.xz"; + } + { + name = "libcdr-0.1.7.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libcdr-0.1.7.tar.xz"; + sha256 = "5666249d613466b9aa1e987ea4109c04365866e9277d80f6cd9663e86b8ecdd4"; + md5 = ""; + md5name = "5666249d613466b9aa1e987ea4109c04365866e9277d80f6cd9663e86b8ecdd4-libcdr-0.1.7.tar.xz"; + } + { + name = "clucene-core-2.3.3.4.tar.gz"; + url = "https://dev-www.libreoffice.org/src/48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz"; + sha256 = "ddfdc433dd8ad31b5c5819cc4404a8d2127472a3b720d3e744e8c51d79732eab"; + md5 = "48d647fbd8ef8889e5a7f422c1bfda94"; + md5name = "48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz"; + } + { + name = "dragonbox-1.1.3.tar.gz"; + url = "https://dev-www.libreoffice.org/src/dragonbox-1.1.3.tar.gz"; + sha256 = "09d63b05e9c594ec423778ab59b7a5aa1d76fdd71d25c7048b0258c4ec9c3384"; + md5 = ""; + md5name = "09d63b05e9c594ec423778ab59b7a5aa1d76fdd71d25c7048b0258c4ec9c3384-dragonbox-1.1.3.tar.gz"; + } + { + name = "dtoa-20180411.tgz"; + url = "https://dev-www.libreoffice.org/src/dtoa-20180411.tgz"; + sha256 = "0082d0684f7db6f62361b76c4b7faba19e0c7ce5cb8e36c4b65fea8281e711b4"; + md5 = ""; + md5name = "0082d0684f7db6f62361b76c4b7faba19e0c7ce5cb8e36c4b65fea8281e711b4-dtoa-20180411.tgz"; + } + { + name = "libcmis-0.6.1.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libcmis-0.6.1.tar.xz"; + sha256 = "d54d19d86153dbc88e2d468f7136269a2cfe71b73227e12fded01d29ac268074"; + md5 = ""; + md5name = "d54d19d86153dbc88e2d468f7136269a2cfe71b73227e12fded01d29ac268074-libcmis-0.6.1.tar.xz"; + } + { + name = "CoinMP-1.8.4.tgz"; + url = "https://dev-www.libreoffice.org/src/CoinMP-1.8.4.tgz"; + sha256 = "3459fb0ccbdd39342744684338984ac4cc153fb0434f4cae8cf74bd67490a38d"; + md5 = ""; + md5name = "3459fb0ccbdd39342744684338984ac4cc153fb0434f4cae8cf74bd67490a38d-CoinMP-1.8.4.tgz"; + } + { + name = "cppunit-1.15.1.tar.gz"; + url = "https://dev-www.libreoffice.org/src/cppunit-1.15.1.tar.gz"; + sha256 = "89c5c6665337f56fd2db36bc3805a5619709d51fb136e51937072f63fcc717a7"; + md5 = ""; + md5name = "89c5c6665337f56fd2db36bc3805a5619709d51fb136e51937072f63fcc717a7-cppunit-1.15.1.tar.gz"; + } + { + name = "curl-8.7.1.tar.xz"; + url = "https://dev-www.libreoffice.org/src/curl-8.7.1.tar.xz"; + sha256 = "6fea2aac6a4610fbd0400afb0bcddbe7258a64c63f1f68e5855ebc0c659710cd"; + md5 = ""; + md5name = "6fea2aac6a4610fbd0400afb0bcddbe7258a64c63f1f68e5855ebc0c659710cd-curl-8.7.1.tar.xz"; + } + { + name = "libe-book-0.1.3.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libe-book-0.1.3.tar.xz"; + sha256 = "7e8d8ff34f27831aca3bc6f9cc532c2f90d2057c778963b884ff3d1e34dfe1f9"; + md5 = ""; + md5name = "7e8d8ff34f27831aca3bc6f9cc532c2f90d2057c778963b884ff3d1e34dfe1f9-libe-book-0.1.3.tar.xz"; + } + { + name = "libepoxy-1.5.10.tar.gz"; + url = "https://dev-www.libreoffice.org/src/libepoxy-1.5.10.tar.gz"; + sha256 = "a7ced37f4102b745ac86d6a70a9da399cc139ff168ba6b8002b4d8d43c900c15"; + md5 = ""; + md5name = "a7ced37f4102b745ac86d6a70a9da399cc139ff168ba6b8002b4d8d43c900c15-libepoxy-1.5.10.tar.gz"; + } + { + name = "epm-3.7.tar.gz"; + url = "https://dev-www.libreoffice.org/src/3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz"; + sha256 = "b3fc4c5445de6c9a801504a3ea3efb2d4ea9d5a622c9427e716736e7713ddb91"; + md5 = "3ade8cfe7e59ca8e65052644fed9fca4"; + md5name = "3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz"; + } + { + name = "libepubgen-0.1.1.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libepubgen-0.1.1.tar.xz"; + sha256 = "03e084b994cbeffc8c3dd13303b2cb805f44d8f2c3b79f7690d7e3fc7f6215ad"; + md5 = ""; + md5name = "03e084b994cbeffc8c3dd13303b2cb805f44d8f2c3b79f7690d7e3fc7f6215ad-libepubgen-0.1.1.tar.xz"; + } + { + name = "libetonyek-0.1.10.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libetonyek-0.1.10.tar.xz"; + sha256 = "b430435a6e8487888b761dc848b7981626eb814884963ffe25eb26a139301e9a"; + md5 = ""; + md5name = "b430435a6e8487888b761dc848b7981626eb814884963ffe25eb26a139301e9a-libetonyek-0.1.10.tar.xz"; + } + { + name = "expat-2.6.2.tar.xz"; + url = "https://dev-www.libreoffice.org/src/expat-2.6.2.tar.xz"; + sha256 = "ee14b4c5d8908b1bec37ad937607eab183d4d9806a08adee472c3c3121d27364"; + md5 = ""; + md5name = "ee14b4c5d8908b1bec37ad937607eab183d4d9806a08adee472c3c3121d27364-expat-2.6.2.tar.xz"; + } + { + name = "Firebird-3.0.7.33374-0.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/Firebird-3.0.7.33374-0.tar.bz2"; + sha256 = "acb85cedafa10ce106b1823fb236b1b3e5d942a5741e8f8435cc8ccfec0afe76"; + md5 = ""; + md5name = "acb85cedafa10ce106b1823fb236b1b3e5d942a5741e8f8435cc8ccfec0afe76-Firebird-3.0.7.33374-0.tar.bz2"; + } + { + name = "fontconfig-2.14.2.tar.xz"; + url = "https://dev-www.libreoffice.org/src/fontconfig-2.14.2.tar.xz"; + sha256 = "dba695b57bce15023d2ceedef82062c2b925e51f5d4cc4aef736cf13f60a468b"; + md5 = ""; + md5name = "dba695b57bce15023d2ceedef82062c2b925e51f5d4cc4aef736cf13f60a468b-fontconfig-2.14.2.tar.xz"; + } + { + name = "crosextrafonts-20130214.tar.gz"; + url = "https://dev-www.libreoffice.org/src/368f114c078f94214a308a74c7e991bc-crosextrafonts-20130214.tar.gz"; + sha256 = "c48d1c2fd613c9c06c959c34da7b8388059e2408d2bb19845dc3ed35f76e4d09"; + md5 = "368f114c078f94214a308a74c7e991bc"; + md5name = "368f114c078f94214a308a74c7e991bc-crosextrafonts-20130214.tar.gz"; + } + { + name = "crosextrafonts-carlito-20130920.tar.gz"; + url = "https://dev-www.libreoffice.org/src/c74b7223abe75949b4af367942d96c7a-crosextrafonts-carlito-20130920.tar.gz"; + sha256 = "4bd12b6cbc321c1cf16da76e2c585c925ce956a08067ae6f6c64eff6ccfdaf5a"; + md5 = "c74b7223abe75949b4af367942d96c7a"; + md5name = "c74b7223abe75949b4af367942d96c7a-crosextrafonts-carlito-20130920.tar.gz"; + } + { + name = "dejavu-fonts-ttf-2.37.zip"; + url = "https://dev-www.libreoffice.org/src/33e1e61fab06a547851ed308b4ffef42-dejavu-fonts-ttf-2.37.zip"; + sha256 = "7576310b219e04159d35ff61dd4a4ec4cdba4f35c00e002a136f00e96a908b0a"; + md5 = "33e1e61fab06a547851ed308b4ffef42"; + md5name = "33e1e61fab06a547851ed308b4ffef42-dejavu-fonts-ttf-2.37.zip"; + } + { + name = "GentiumBasic_1102.zip"; + url = "https://dev-www.libreoffice.org/src/1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip"; + sha256 = "2f1a2c5491d7305dffd3520c6375d2f3e14931ee35c6d8ae1e8f098bf1a7b3cc"; + md5 = "1725634df4bb3dcb1b2c91a6175f8789"; + md5name = "1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip"; + } + { + name = "karla.zip"; + url = "https://dev-www.libreoffice.org/src/506757f768adb2331881d5186f7286bd-karla.zip"; + sha256 = "0cba83e7d555ae792d98a657b847cff1ccb198ecf740117a610f76d66e48eaba"; + md5 = "506757f768adb2331881d5186f7286bd"; + md5name = "506757f768adb2331881d5186f7286bd-karla.zip"; + } + { + name = "liberation-narrow-fonts-ttf-1.07.6.tar.gz"; + url = "https://dev-www.libreoffice.org/src/liberation-narrow-fonts-ttf-1.07.6.tar.gz"; + sha256 = "8879d89b5ff7b506c9fc28efc31a5c0b954bbe9333e66e5283d27d20a8519ea3"; + md5 = ""; + md5name = "8879d89b5ff7b506c9fc28efc31a5c0b954bbe9333e66e5283d27d20a8519ea3-liberation-narrow-fonts-ttf-1.07.6.tar.gz"; + } + { + name = "liberation-fonts-ttf-2.1.4.tar.gz"; + url = "https://dev-www.libreoffice.org/src/liberation-fonts-ttf-2.1.4.tar.gz"; + sha256 = "26f85412dd0aa9d061504a1cc8aaf0aa12a70710e8d47d8b65a1251757c1a5ef"; + md5 = ""; + md5name = "26f85412dd0aa9d061504a1cc8aaf0aa12a70710e8d47d8b65a1251757c1a5ef-liberation-fonts-ttf-2.1.4.tar.gz"; + } + { + name = "LinLibertineG-20120116.zip"; + url = "https://dev-www.libreoffice.org/src/e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip"; + sha256 = "54adcb2bc8cac0927a647fbd9362f45eff48130ce6e2379dc3867643019e08c5"; + md5 = "e7a384790b13c29113e22e596ade9687"; + md5name = "e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip"; + } + { + name = "source-sans-pro-2.010R-ro-1.065R-it.tar.gz"; + url = "https://dev-www.libreoffice.org/src/edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz"; + sha256 = "e7bc9a1fec787a529e49f5a26b93dcdcf41506449dfc70f92cdef6d17eb6fb61"; + md5 = "edc4d741888bc0d38e32dbaa17149596"; + md5name = "edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz"; + } + { + name = "NotoKufiArabic-v2.109.zip"; + url = "https://dev-www.libreoffice.org/src/NotoKufiArabic-v2.109.zip"; + sha256 = "1b6880e4b8df09c3b9e246d6084bfd94bf32a0ffff60cf2dcffd3622d0e2d79f"; + md5 = ""; + md5name = "1b6880e4b8df09c3b9e246d6084bfd94bf32a0ffff60cf2dcffd3622d0e2d79f-NotoKufiArabic-v2.109.zip"; + } + { + name = "NotoSans-v2.012.zip"; + url = "https://dev-www.libreoffice.org/src/NotoSans-v2.012.zip"; + sha256 = "efef2f66ed2c5e005472cba156bd2afb68063a51bb628c6ee14143edc019d293"; + md5 = ""; + md5name = "efef2f66ed2c5e005472cba156bd2afb68063a51bb628c6ee14143edc019d293-NotoSans-v2.012.zip"; + } + { + name = "NotoSerif-v2.012.zip"; + url = "https://dev-www.libreoffice.org/src/NotoSerif-v2.012.zip"; + sha256 = "3d4566a0e51e7fc14528f5a1eecc6f12e5ffbbec6484470d3da48b0d8ead345a"; + md5 = ""; + md5name = "3d4566a0e51e7fc14528f5a1eecc6f12e5ffbbec6484470d3da48b0d8ead345a-NotoSerif-v2.012.zip"; + } + { + name = "NotoSerifHebrew-v2.004.zip"; + url = "https://dev-www.libreoffice.org/src/NotoSerifHebrew-v2.004.zip"; + sha256 = "99523f4f21051495f18cbd5169ed0d1e9b395eefe770fece1844a4a7a00c46da"; + md5 = ""; + md5name = "99523f4f21051495f18cbd5169ed0d1e9b395eefe770fece1844a4a7a00c46da-NotoSerifHebrew-v2.004.zip"; + } + { + name = "NotoSansArabic-v2.010.zip"; + url = "https://dev-www.libreoffice.org/src/NotoSansArabic-v2.010.zip"; + sha256 = "a5a34ac1ea01d0d71c083f99440ebfb1f64224474a0d88bb7ef0e2f8d9a996d2"; + md5 = ""; + md5name = "a5a34ac1ea01d0d71c083f99440ebfb1f64224474a0d88bb7ef0e2f8d9a996d2-NotoSansArabic-v2.010.zip"; + } + { + name = "NotoNaskhArabic-v2.019.zip"; + url = "https://dev-www.libreoffice.org/src/NotoNaskhArabic-v2.019.zip"; + sha256 = "7a509e10c9c8d21f384a26807ef2f5fbbecec46fdb8626c5441bed6d894edb81"; + md5 = ""; + md5name = "7a509e10c9c8d21f384a26807ef2f5fbbecec46fdb8626c5441bed6d894edb81-NotoNaskhArabic-v2.019.zip"; + } + { + name = "NotoSansHebrew-v3.001.zip"; + url = "https://dev-www.libreoffice.org/src/NotoSansHebrew-v3.001.zip"; + sha256 = "df0a71814b4e63644cf40fcc4529111b61266b7a2dafbe95068b29a7520cc3cb"; + md5 = ""; + md5name = "df0a71814b4e63644cf40fcc4529111b61266b7a2dafbe95068b29a7520cc3cb-NotoSansHebrew-v3.001.zip"; + } + { + name = "NotoSansArmenian-v2.008.zip"; + url = "https://dev-www.libreoffice.org/src/NotoSansArmenian-v2.008.zip"; + sha256 = "eab89b99e134177ca6a3f9f0412a7cb812aafceb13175d686b4c45cb237f64ac"; + md5 = ""; + md5name = "eab89b99e134177ca6a3f9f0412a7cb812aafceb13175d686b4c45cb237f64ac-NotoSansArmenian-v2.008.zip"; + } + { + name = "NotoSerifArmenian-v2.008.zip"; + url = "https://dev-www.libreoffice.org/src/NotoSerifArmenian-v2.008.zip"; + sha256 = "b21c198a4c76ae598a304decefb3b5c2a4c2d4c3ae226728eff359185f291c6f"; + md5 = ""; + md5name = "b21c198a4c76ae598a304decefb3b5c2a4c2d4c3ae226728eff359185f291c6f-NotoSerifArmenian-v2.008.zip"; + } + { + name = "NotoSansGeorgian-v2.003.zip"; + url = "https://dev-www.libreoffice.org/src/NotoSansGeorgian-v2.003.zip"; + sha256 = "bd75d1f0b9ef619b5ded0018d6258eeab2f9e976d8f8074bb7890f4e301648bf"; + md5 = ""; + md5name = "bd75d1f0b9ef619b5ded0018d6258eeab2f9e976d8f8074bb7890f4e301648bf-NotoSansGeorgian-v2.003.zip"; + } + { + name = "NotoSerifGeorgian-v2.003.zip"; + url = "https://dev-www.libreoffice.org/src/NotoSerifGeorgian-v2.003.zip"; + sha256 = "cfb41a264b97d463bab6807a5be937ba4a6ddcfa93d519a21b98b0ba73ca27d4"; + md5 = ""; + md5name = "cfb41a264b97d463bab6807a5be937ba4a6ddcfa93d519a21b98b0ba73ca27d4-NotoSerifGeorgian-v2.003.zip"; + } + { + name = "NotoSansLao-v2.003.zip"; + url = "https://dev-www.libreoffice.org/src/NotoSansLao-v2.003.zip"; + sha256 = "5a87c31b1a40ef8147c1e84437e5f0ceba2d4dbbfc0b56a65821ad29870da8c0"; + md5 = ""; + md5name = "5a87c31b1a40ef8147c1e84437e5f0ceba2d4dbbfc0b56a65821ad29870da8c0-NotoSansLao-v2.003.zip"; + } + { + name = "NotoSerifLao-v2.003.zip"; + url = "https://dev-www.libreoffice.org/src/NotoSerifLao-v2.003.zip"; + sha256 = "e96a303d3347790b0ef3db274971a989a736ce766ec9ea1bea0e1458568a80b2"; + md5 = ""; + md5name = "e96a303d3347790b0ef3db274971a989a736ce766ec9ea1bea0e1458568a80b2-NotoSerifLao-v2.003.zip"; + } + { + name = "NotoSansLisu-v2.102.zip"; + url = "https://dev-www.libreoffice.org/src/NotoSansLisu-v2.102.zip"; + sha256 = "b12a1ff762680681b7ce4d98dd29a7f54d90f5bcadd10c955afc640a27b3a268"; + md5 = ""; + md5name = "b12a1ff762680681b7ce4d98dd29a7f54d90f5bcadd10c955afc640a27b3a268-NotoSansLisu-v2.102.zip"; + } + { + name = "Noto-hinted.zip"; + url = "https://noto-website-2.storage.googleapis.com/pkgs/Noto-hinted.zip"; + sha256 = "837b4a9352fce32ad7f298fbf155af1da5b6f3f8dbd995eb63fdd8e82117e4ae"; + md5 = ""; + md5name = "837b4a9352fce32ad7f298fbf155af1da5b6f3f8dbd995eb63fdd8e82117e4ae-Noto-hinted.zip"; + } + { + name = "NotoSansKR.zip"; + url = "https://noto-website-2.storage.googleapis.com/pkgs/NotoSansKR.zip"; + sha256 = "5147b755c29f16f82b706b1c7ff7982894fccbebcf99e6c5fb0d48c315604b98"; + md5 = ""; + md5name = "5147b755c29f16f82b706b1c7ff7982894fccbebcf99e6c5fb0d48c315604b98-NotoSansKR.zip"; + } + { + name = "NotoSansSC.zip"; + url = "https://noto-website-2.storage.googleapis.com/pkgs/NotoSansSC.zip"; + sha256 = "bee1af8c0722cfb3eb1b2fa91a7f3dc011dca231c25c8fcd9d9d544699ababf9"; + md5 = ""; + md5name = "bee1af8c0722cfb3eb1b2fa91a7f3dc011dca231c25c8fcd9d9d544699ababf9-NotoSansSC.zip"; + } + { + name = "NotoSansTC.zip"; + url = "https://noto-website-2.storage.googleapis.com/pkgs/NotoSansTC.zip"; + sha256 = "ec9e8a4156593e1b3ff7cff843989f43f114f96eff0b5db9691ef3c2bdefb73e"; + md5 = ""; + md5name = "ec9e8a4156593e1b3ff7cff843989f43f114f96eff0b5db9691ef3c2bdefb73e-NotoSansTC.zip"; + } + { + name = "NotoSerifJP.zip"; + url = "https://noto-website-2.storage.googleapis.com/pkgs/NotoSerifJP.zip"; + sha256 = "362438901cb871bf84b01ff4734c668dab57b4905f39e5ec76d8b68a7a7b5fa8"; + md5 = ""; + md5name = "362438901cb871bf84b01ff4734c668dab57b4905f39e5ec76d8b68a7a7b5fa8-NotoSerifJP.zip"; + } + { + name = "NotoSerifKR.zip"; + url = "https://noto-website-2.storage.googleapis.com/pkgs/NotoSerifKR.zip"; + sha256 = "3c0d276fb05aaefbbca808b4f8c7b1520b4b4e7c0be46296d6e8a5e42f559f5c"; + md5 = ""; + md5name = "3c0d276fb05aaefbbca808b4f8c7b1520b4b4e7c0be46296d6e8a5e42f559f5c-NotoSerifKR.zip"; + } + { + name = "NotoSerifSC.zip"; + url = "https://noto-website-2.storage.googleapis.com/pkgs/NotoSerifSC.zip"; + sha256 = "00ed5970680a82453619ac5952c5631ea138372bbb0f864d156d91a0fd9c8279"; + md5 = ""; + md5name = "00ed5970680a82453619ac5952c5631ea138372bbb0f864d156d91a0fd9c8279-NotoSerifSC.zip"; + } + { + name = "NotoSerifTC.zip"; + url = "https://noto-website-2.storage.googleapis.com/pkgs/NotoSerifTC.zip"; + sha256 = "c33e04199f6d69056a6de0ebc5522dbe36e02f145208c71c9a4c803841151ad2"; + md5 = ""; + md5name = "c33e04199f6d69056a6de0ebc5522dbe36e02f145208c71c9a4c803841151ad2-NotoSerifTC.zip"; + } + { + name = "culmus-0.133.tar.gz"; + url = "https://dev-www.libreoffice.org/src/culmus-0.133.tar.gz"; + sha256 = "c0c6873742d07544f6bacf2ad52eb9cb392974d56427938dc1dfbc8399c64d05"; + md5 = ""; + md5name = "c0c6873742d07544f6bacf2ad52eb9cb392974d56427938dc1dfbc8399c64d05-culmus-0.133.tar.gz"; + } + { + name = "libre-hebrew-1.0.tar.gz"; + url = "https://dev-www.libreoffice.org/src/libre-hebrew-1.0.tar.gz"; + sha256 = "f596257c1db706ce35795b18d7f66a4db99d427725f20e9384914b534142579a"; + md5 = ""; + md5name = "f596257c1db706ce35795b18d7f66a4db99d427725f20e9384914b534142579a-libre-hebrew-1.0.tar.gz"; + } + { + name = "alef-1.001.tar.gz"; + url = "https://dev-www.libreoffice.org/src/alef-1.001.tar.gz"; + sha256 = "b98b67602a2c8880a1770f0b9e37c190f29a7e2ade5616784f0b89fbdb75bf52"; + md5 = ""; + md5name = "b98b67602a2c8880a1770f0b9e37c190f29a7e2ade5616784f0b89fbdb75bf52-alef-1.001.tar.gz"; + } + { + name = "Amiri-1.000.zip"; + url = "https://dev-www.libreoffice.org/src/Amiri-1.000.zip"; + sha256 = "926fe1bd7dfde8e55178281f645258bfced6420c951c6f2fd532fd21691bca30"; + md5 = ""; + md5name = "926fe1bd7dfde8e55178281f645258bfced6420c951c6f2fd532fd21691bca30-Amiri-1.000.zip"; + } + { + name = "ReemKufi-1.2.zip"; + url = "https://dev-www.libreoffice.org/src/ReemKufi-1.2.zip"; + sha256 = "c4fd68a23c0ea471cc084ae7efe888da372b925cb208eeb0322c26792d2ef413"; + md5 = ""; + md5name = "c4fd68a23c0ea471cc084ae7efe888da372b925cb208eeb0322c26792d2ef413-ReemKufi-1.2.zip"; + } + { + name = "Scheherazade-2.100.zip"; + url = "https://dev-www.libreoffice.org/src/Scheherazade-2.100.zip"; + sha256 = "251c8817ceb87d9b661ce1d5b49e732a0116add10abc046be4b8ba5196e149b5"; + md5 = ""; + md5name = "251c8817ceb87d9b661ce1d5b49e732a0116add10abc046be4b8ba5196e149b5-Scheherazade-2.100.zip"; + } + { + name = "opendyslexic-0.910.12-rc2-2019.10.17.zip"; + url = "https://github.com/antijingoist/opendyslexic/releases/download/v0.91.12/opendyslexic-0.910.12-rc2-2019.10.17.zip"; + sha256 = "b92d7fcb9409f2bcfd23b65ac71647256eb49c429f4fbb1cc870381fc93eb486"; + md5 = ""; + md5name = "b92d7fcb9409f2bcfd23b65ac71647256eb49c429f4fbb1cc870381fc93eb486-opendyslexic-0.910.12-rc2-2019.10.17.zip"; + } + { + name = "Open_Sans.zip"; + url = "https://dev-www.libreoffice.org/src/Open_Sans.zip"; + sha256 = "85d79a39d26acb207ba13fb1007189d55355a0faf2cf7ccfe6a2edf2abac06d9"; + md5 = ""; + md5name = "85d79a39d26acb207ba13fb1007189d55355a0faf2cf7ccfe6a2edf2abac06d9-Open_Sans.zip"; + } + { + name = "Agdasima-2.002.zip"; + url = "https://dev-www.libreoffice.org/src/Agdasima-2.002.zip"; + sha256 = "b4c17499f8bc183320ffdcf1f8491c778dd68a237adc056dc08e1fcb2da488f3"; + md5 = ""; + md5name = "b4c17499f8bc183320ffdcf1f8491c778dd68a237adc056dc08e1fcb2da488f3-Agdasima-2.002.zip"; + } + { + name = "Bacasime_Antique-2.000.zip"; + url = "https://dev-www.libreoffice.org/src/Bacasime_Antique-2.000.zip"; + sha256 = "81127cebc97d4ee0b950c2bc2d6be0ed29abfe0d5988435eb9a39e382557250a"; + md5 = ""; + md5name = "81127cebc97d4ee0b950c2bc2d6be0ed29abfe0d5988435eb9a39e382557250a-Bacasime_Antique-2.000.zip"; + } + { + name = "Belanosima-2.000.zip"; + url = "https://dev-www.libreoffice.org/src/Belanosima-2.000.zip"; + sha256 = "9c30e9e7cdb0797b651113a77f6b789659b8d8598a466b2ba92754e9dec30449"; + md5 = ""; + md5name = "9c30e9e7cdb0797b651113a77f6b789659b8d8598a466b2ba92754e9dec30449-Belanosima-2.000.zip"; + } + { + name = "Caprasimo-1.001.zip"; + url = "https://dev-www.libreoffice.org/src/Caprasimo-1.001.zip"; + sha256 = "f066d27cfc99b6601083be102d08b4039da8d2834e2795aabd890f16c6fd1b9b"; + md5 = ""; + md5name = "f066d27cfc99b6601083be102d08b4039da8d2834e2795aabd890f16c6fd1b9b-Caprasimo-1.001.zip"; + } + { + name = "Lugrasimo-1.001.zip"; + url = "https://dev-www.libreoffice.org/src/Lugrasimo-1.001.zip"; + sha256 = "db24dff31e8ddf6a113556c947a219f9534b072852e9ce2079a08c94854a7503"; + md5 = ""; + md5name = "db24dff31e8ddf6a113556c947a219f9534b072852e9ce2079a08c94854a7503-Lugrasimo-1.001.zip"; + } + { + name = "Lumanosimo-1.010.zip"; + url = "https://dev-www.libreoffice.org/src/Lumanosimo-1.010.zip"; + sha256 = "d4545ad6afded9a55d9a7728cfc7453cf5637861db87aafe0a730676a0cb960f"; + md5 = ""; + md5name = "d4545ad6afded9a55d9a7728cfc7453cf5637861db87aafe0a730676a0cb960f-Lumanosimo-1.010.zip"; + } + { + name = "Lunasima-2.009.zip"; + url = "https://dev-www.libreoffice.org/src/Lunasima-2.009.zip"; + sha256 = "4302809cf4b95b481bec53de87484d919b391c90a518d065f6c775fd435a5393"; + md5 = ""; + md5name = "4302809cf4b95b481bec53de87484d919b391c90a518d065f6c775fd435a5393-Lunasima-2.009.zip"; + } + { + name = "libfreehand-0.1.2.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libfreehand-0.1.2.tar.xz"; + sha256 = "0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d9091676420de34ac"; + md5 = ""; + md5name = "0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d9091676420de34ac-libfreehand-0.1.2.tar.xz"; + } + { + name = "freetype-2.13.0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/freetype-2.13.0.tar.xz"; + sha256 = "5ee23abd047636c24b2d43c6625dcafc66661d1aca64dec9e0d05df29592624c"; + md5 = ""; + md5name = "5ee23abd047636c24b2d43c6625dcafc66661d1aca64dec9e0d05df29592624c-freetype-2.13.0.tar.xz"; + } + { + name = "frozen-1.1.1.tar.gz"; + url = "https://dev-www.libreoffice.org/src/frozen-1.1.1.tar.gz"; + sha256 = "f7c7075750e8fceeac081e9ef01944f221b36d9725beac8681cbd2838d26be45"; + md5 = ""; + md5name = "f7c7075750e8fceeac081e9ef01944f221b36d9725beac8681cbd2838d26be45-frozen-1.1.1.tar.gz"; + } + { + name = "glm-0.9.9.8.zip"; + url = "https://dev-www.libreoffice.org/src/glm-0.9.9.8.zip"; + sha256 = "6bba5f032bed47c73ad9397f2313b9acbfb56253d0d0576b5873d3dcb25e99ad"; + md5 = ""; + md5name = "6bba5f032bed47c73ad9397f2313b9acbfb56253d0d0576b5873d3dcb25e99ad-glm-0.9.9.8.zip"; + } + { + name = "gpgme-1.23.2.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/gpgme-1.23.2.tar.bz2"; + sha256 = "9499e8b1f33cccb6815527a1bc16049d35a6198a6c5fae0185f2bd561bce5224"; + md5 = ""; + md5name = "9499e8b1f33cccb6815527a1bc16049d35a6198a6c5fae0185f2bd561bce5224-gpgme-1.23.2.tar.bz2"; + } + { + name = "graphite2-minimal-1.3.14.tgz"; + url = "https://dev-www.libreoffice.org/src/graphite2-minimal-1.3.14.tgz"; + sha256 = "b8e892d8627c41888ff121e921455b9e2d26836978f2359173d19825da62b8fc"; + md5 = ""; + md5name = "b8e892d8627c41888ff121e921455b9e2d26836978f2359173d19825da62b8fc-graphite2-minimal-1.3.14.tgz"; + } + { + name = "harfbuzz-8.2.2.tar.xz"; + url = "https://dev-www.libreoffice.org/src/harfbuzz-8.2.2.tar.xz"; + sha256 = "e433ad85fbdf57f680be29479b3f964577379aaf319f557eb76569f0ecbc90f3"; + md5 = ""; + md5name = "e433ad85fbdf57f680be29479b3f964577379aaf319f557eb76569f0ecbc90f3-harfbuzz-8.2.2.tar.xz"; + } + { + name = "hsqldb_1_8_0.zip"; + url = "https://dev-www.libreoffice.org/src/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip"; + sha256 = "d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370"; + md5 = "17410483b5b5f267aa18b7e00b65e6e0"; + md5name = "17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip"; + } + { + name = "hunspell-1.7.2.tar.gz"; + url = "https://dev-www.libreoffice.org/src/hunspell-1.7.2.tar.gz"; + sha256 = "11ddfa39afe28c28539fe65fc4f1592d410c1e9b6dd7d8a91ca25d85e9ec65b8"; + md5 = ""; + md5name = "11ddfa39afe28c28539fe65fc4f1592d410c1e9b6dd7d8a91ca25d85e9ec65b8-hunspell-1.7.2.tar.gz"; + } + { + name = "hyphen-2.8.8.tar.gz"; + url = "https://dev-www.libreoffice.org/src/5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz"; + sha256 = "304636d4eccd81a14b6914d07b84c79ebb815288c76fe027b9ebff6ff24d5705"; + md5 = "5ade6ae2a99bc1e9e57031ca88d36dad"; + md5name = "5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz"; + } + { + name = "IAccessible2-1.3+git20231013.3d8c7f0.tar.gz"; + url = "https://dev-www.libreoffice.org/src/IAccessible2-1.3+git20231013.3d8c7f0.tar.gz"; + sha256 = "0e279003f5199f80031c6dcd08f79d6f65a0505139160e7df0d09b226bff4023"; + md5 = ""; + md5name = "0e279003f5199f80031c6dcd08f79d6f65a0505139160e7df0d09b226bff4023-IAccessible2-1.3+git20231013.3d8c7f0.tar.gz"; + } + { + name = "icu4c-73_2-src.tgz"; + url = "https://dev-www.libreoffice.org/src/icu4c-73_2-src.tgz"; + sha256 = "818a80712ed3caacd9b652305e01afc7fa167e6f2e94996da44b90c2ab604ce1"; + md5 = ""; + md5name = "818a80712ed3caacd9b652305e01afc7fa167e6f2e94996da44b90c2ab604ce1-icu4c-73_2-src.tgz"; + } + { + name = "icu4c-73_2-data.zip"; + url = "https://dev-www.libreoffice.org/src/icu4c-73_2-data.zip"; + sha256 = "ca1ee076163b438461e484421a7679fc33a64cd0a54f9d4b401893fa1eb42701"; + md5 = ""; + md5name = "ca1ee076163b438461e484421a7679fc33a64cd0a54f9d4b401893fa1eb42701-icu4c-73_2-data.zip"; + } + { + name = "Java-WebSocket-1.5.4.tar.gz"; + url = "https://dev-www.libreoffice.org/src/Java-WebSocket-1.5.4.tar.gz"; + sha256 = "a6828b35d1f938fee2335945f3d3c563cbbfa58ce7eb0bf72778d0fa7a550720"; + md5 = ""; + md5name = "a6828b35d1f938fee2335945f3d3c563cbbfa58ce7eb0bf72778d0fa7a550720-Java-WebSocket-1.5.4.tar.gz"; + } + { + name = "flow-engine-0.9.4.zip"; + url = "https://dev-www.libreoffice.org/src/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip"; + sha256 = "233f66e8d25c5dd971716d4200203a612a407649686ef3b52075d04b4c9df0dd"; + md5 = "ba2930200c9f019c2d93a8c88c651a0f"; + md5name = "ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip"; + } + { + name = "flute-1.1.6.zip"; + url = "https://dev-www.libreoffice.org/src/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip"; + sha256 = "1b5b24f7bc543c0362b667692f78db8bab4ed6dafc6172f104d0bd3757d8a133"; + md5 = "d8bd5eed178db6e2b18eeed243f85aa8"; + md5name = "d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip"; + } + { + name = "libbase-1.1.6.zip"; + url = "https://dev-www.libreoffice.org/src/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip"; + sha256 = "75c80359c9ce343c20aab8a36a45cb3b9ee7c61cf92c13ae45399d854423a9ba"; + md5 = "eeb2c7ddf0d302fba4bfc6e97eac9624"; + md5name = "eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip"; + } + { + name = "libfonts-1.1.6.zip"; + url = "https://dev-www.libreoffice.org/src/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip"; + sha256 = "e0531091787c0f16c83965fdcbc49162c059d7f0c64669e7f119699321549743"; + md5 = "3bdf40c0d199af31923e900d082ca2dd"; + md5name = "3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip"; + } + { + name = "libformula-1.1.7.zip"; + url = "https://dev-www.libreoffice.org/src/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip"; + sha256 = "5826d1551bf599b85742545f6e01a0079b93c1b2c8434bf409eddb3a29e4726b"; + md5 = "3404ab6b1792ae5f16bbd603bd1e1d03"; + md5name = "3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip"; + } + { + name = "liblayout-0.2.10.zip"; + url = "https://dev-www.libreoffice.org/src/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip"; + sha256 = "e1fb87f3f7b980d33414473279615c4644027e013012d156efa538bc2b031772"; + md5 = "db60e4fde8dd6d6807523deb71ee34dc"; + md5name = "db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip"; + } + { + name = "libloader-1.1.6.zip"; + url = "https://dev-www.libreoffice.org/src/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip"; + sha256 = "3d853b19b1d94a6efa69e7af90f7f2b09ecf302913bee3da796c15ecfebcfac8"; + md5 = "97b2d4dba862397f446b217e2b623e71"; + md5name = "97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip"; + } + { + name = "librepository-1.1.6.zip"; + url = "https://dev-www.libreoffice.org/src/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip"; + sha256 = "abe2c57ac12ba45d83563b02e240fa95d973376de2f720aab8fe11f2e621c095"; + md5 = "8ce2fcd72becf06c41f7201d15373ed9"; + md5name = "8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip"; + } + { + name = "libserializer-1.1.6.zip"; + url = "https://dev-www.libreoffice.org/src/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip"; + sha256 = "05640a1f6805b2b2d7e2cb9c50db9a5cb084e3c52ab1a71ce015239b4a1d4343"; + md5 = "f94d9870737518e3b597f9265f4e9803"; + md5name = "f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip"; + } + { + name = "libxml-1.1.7.zip"; + url = "https://dev-www.libreoffice.org/src/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip"; + sha256 = "7d2797fe9f79a77009721e3f14fa4a1dec17a6d706bdc93f85f1f01d124fab66"; + md5 = "ace6ab49184e329db254e454a010f56d"; + md5name = "ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip"; + } + { + name = "sacjava-1.3.zip"; + url = "https://dev-www.libreoffice.org/src/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip"; + sha256 = "085f2112c51fa8c1783fac12fbd452650596415121348393bb51f0f7e85a9045"; + md5 = "39bb3fcea1514f1369fcfc87542390fd"; + md5name = "39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip"; + } + { + name = "libjpeg-turbo-2.1.5.1.tar.gz"; + url = "https://dev-www.libreoffice.org/src/libjpeg-turbo-2.1.5.1.tar.gz"; + sha256 = "2fdc3feb6e9deb17adec9bafa3321419aa19f8f4e5dea7bf8486844ca22207bf"; + md5 = ""; + md5name = "2fdc3feb6e9deb17adec9bafa3321419aa19f8f4e5dea7bf8486844ca22207bf-libjpeg-turbo-2.1.5.1.tar.gz"; + } + { + name = "language-subtag-registry-2024-06-14.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2024-06-14.tar.bz2"; + sha256 = "75bc394dd83ddfd62b172a462db1b66bdb5950f40823ed63b8c7db6b71e37e75"; + md5 = ""; + md5name = "75bc394dd83ddfd62b172a462db1b66bdb5950f40823ed63b8c7db6b71e37e75-language-subtag-registry-2024-06-14.tar.bz2"; + } + { + name = "lcms2-2.16.tar.gz"; + url = "https://dev-www.libreoffice.org/src/lcms2-2.16.tar.gz"; + sha256 = "d873d34ad8b9b4cea010631f1a6228d2087475e4dc5e763eb81acc23d9d45a51"; + md5 = ""; + md5name = "d873d34ad8b9b4cea010631f1a6228d2087475e4dc5e763eb81acc23d9d45a51-lcms2-2.16.tar.gz"; + } + { + name = "libassuan-2.5.7.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/libassuan-2.5.7.tar.bz2"; + sha256 = "0103081ffc27838a2e50479153ca105e873d3d65d8a9593282e9c94c7e6afb76"; + md5 = ""; + md5name = "0103081ffc27838a2e50479153ca105e873d3d65d8a9593282e9c94c7e6afb76-libassuan-2.5.7.tar.bz2"; + } + { + name = "libatomic_ops-7.8.0.tar.gz"; + url = "https://dev-www.libreoffice.org/src/libatomic_ops-7.8.0.tar.gz"; + sha256 = "15676e7674e11bda5a7e50a73f4d9e7d60452271b8acf6fd39a71fefdf89fa31"; + md5 = ""; + md5name = "15676e7674e11bda5a7e50a73f4d9e7d60452271b8acf6fd39a71fefdf89fa31-libatomic_ops-7.8.0.tar.gz"; + } + { + name = "libeot-0.01.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/libeot-0.01.tar.bz2"; + sha256 = "cf5091fa8e7dcdbe667335eb90a2cfdd0a3fe8f8c7c8d1ece44d9d055736a06a"; + md5 = ""; + md5name = "cf5091fa8e7dcdbe667335eb90a2cfdd0a3fe8f8c7c8d1ece44d9d055736a06a-libeot-0.01.tar.bz2"; + } + { + name = "libexttextcat-3.4.6.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libexttextcat-3.4.6.tar.xz"; + sha256 = "6d77eace20e9ea106c1330e268ede70c9a4a89744ddc25715682754eca3368df"; + md5 = ""; + md5name = "6d77eace20e9ea106c1330e268ede70c9a4a89744ddc25715682754eca3368df-libexttextcat-3.4.6.tar.xz"; + } + { + name = "libffi-3.4.4.tar.gz"; + url = "https://dev-www.libreoffice.org/src/libffi-3.4.4.tar.gz"; + sha256 = "d66c56ad259a82cf2a9dfc408b32bf5da52371500b84745f7fb8b645712df676"; + md5 = ""; + md5name = "d66c56ad259a82cf2a9dfc408b32bf5da52371500b84745f7fb8b645712df676-libffi-3.4.4.tar.gz"; + } + { + name = "libgpg-error-1.48.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/libgpg-error-1.48.tar.bz2"; + sha256 = "89ce1ae893e122924b858de84dc4f67aae29ffa610ebf668d5aa539045663d6f"; + md5 = ""; + md5name = "89ce1ae893e122924b858de84dc4f67aae29ffa610ebf668d5aa539045663d6f-libgpg-error-1.48.tar.bz2"; + } + { + name = "liblangtag-0.6.7.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/liblangtag-0.6.7.tar.bz2"; + sha256 = "5ed6bcd4ae3f3c05c912e62f216cd1a44123846147f729a49fb5668da51e030e"; + md5 = ""; + md5name = "5ed6bcd4ae3f3c05c912e62f216cd1a44123846147f729a49fb5668da51e030e-liblangtag-0.6.7.tar.bz2"; + } + { + name = "libnumbertext-1.0.11.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libnumbertext-1.0.11.tar.xz"; + sha256 = "5dcb4db3b2340f81f601ce86d8d76b69e34d70f84f804192c901e4b7f84d5fb0"; + md5 = ""; + md5name = "5dcb4db3b2340f81f601ce86d8d76b69e34d70f84f804192c901e4b7f84d5fb0-libnumbertext-1.0.11.tar.xz"; + } + { + name = "ltm-1.3.0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/ltm-1.3.0.tar.xz"; + sha256 = "296272d93435991308eb73607600c034b558807a07e829e751142e65ccfa9d08"; + md5 = ""; + md5name = "296272d93435991308eb73607600c034b558807a07e829e751142e65ccfa9d08-ltm-1.3.0.tar.xz"; + } + { + name = "libwebp-1.3.2.tar.gz"; + url = "https://dev-www.libreoffice.org/src/libwebp-1.3.2.tar.gz"; + sha256 = "2a499607df669e40258e53d0ade8035ba4ec0175244869d1025d460562aa09b4"; + md5 = ""; + md5name = "2a499607df669e40258e53d0ade8035ba4ec0175244869d1025d460562aa09b4-libwebp-1.3.2.tar.gz"; + } + { + name = "xmlsec1-1.3.2.tar.gz"; + url = "https://dev-www.libreoffice.org/src/xmlsec1-1.3.2.tar.gz"; + sha256 = "4003c56b3d356d21b1db7775318540fad6bfedaf5f117e8f7c010811219be3cf"; + md5 = ""; + md5name = "4003c56b3d356d21b1db7775318540fad6bfedaf5f117e8f7c010811219be3cf-xmlsec1-1.3.2.tar.gz"; + } + { + name = "libxml2-2.12.8.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libxml2-2.12.8.tar.xz"; + sha256 = "43ad877b018bc63deb2468d71f95219c2fac196876ef36d1bee51d226173ec93"; + md5 = ""; + md5name = "43ad877b018bc63deb2468d71f95219c2fac196876ef36d1bee51d226173ec93-libxml2-2.12.8.tar.xz"; + } + { + name = "libxslt-1.1.39.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libxslt-1.1.39.tar.xz"; + sha256 = "2a20ad621148339b0759c4d4e96719362dee64c9a096dbba625ba053846349f0"; + md5 = ""; + md5name = "2a20ad621148339b0759c4d4e96719362dee64c9a096dbba625ba053846349f0-libxslt-1.1.39.tar.xz"; + } + { + name = "lp_solve_5.5.tar.gz"; + url = "https://dev-www.libreoffice.org/src/26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz"; + sha256 = "171816288f14215c69e730f7a4f1c325739873e21f946ff83884b350574e6695"; + md5 = "26b3e95ddf3d9c077c480ea45874b3b8"; + md5name = "26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz"; + } + { + name = "lxml-4.9.2.tgz"; + url = "https://dev-www.libreoffice.org/src/lxml-4.9.2.tgz"; + sha256 = "2455cfaeb7ac70338b3257f41e21f0724f4b5b0c0e7702da67ee6c3640835b67"; + md5 = ""; + md5name = "2455cfaeb7ac70338b3257f41e21f0724f4b5b0c0e7702da67ee6c3640835b67-lxml-4.9.2.tgz"; + } + { + name = "mariadb-connector-c-3.3.8-src.tar.gz"; + url = "https://dev-www.libreoffice.org/src/mariadb-connector-c-3.3.8-src.tar.gz"; + sha256 = "f9f076b4aa9fb22cc94b24f82c80f9ef063805ecd6533a2eb5d5060cf93833e8"; + md5 = ""; + md5name = "f9f076b4aa9fb22cc94b24f82c80f9ef063805ecd6533a2eb5d5060cf93833e8-mariadb-connector-c-3.3.8-src.tar.gz"; + } + { + name = "mdds-2.1.1.tar.xz"; + url = "https://dev-www.libreoffice.org/src/mdds-2.1.1.tar.xz"; + sha256 = "1483d90cefb8aa4563c4d0a85cb7b243aa95217d235d422e9ca6722fd5b97e56"; + md5 = ""; + md5name = "1483d90cefb8aa4563c4d0a85cb7b243aa95217d235d422e9ca6722fd5b97e56-mdds-2.1.1.tar.xz"; + } + { + name = "mDNSResponder-878.200.35.tar.gz"; + url = "https://dev-www.libreoffice.org/src/mDNSResponder-878.200.35.tar.gz"; + sha256 = "e777b4d7dbf5eb1552cb80090ad1ede319067ab6e45e3990d68aabf6e8b3f5a0"; + md5 = ""; + md5name = "e777b4d7dbf5eb1552cb80090ad1ede319067ab6e45e3990d68aabf6e8b3f5a0-mDNSResponder-878.200.35.tar.gz"; + } + { + name = "libmspub-0.1.4.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libmspub-0.1.4.tar.xz"; + sha256 = "ef36c1a1aabb2ba3b0bedaaafe717bf4480be2ba8de6f3894be5fd3702b013ba"; + md5 = ""; + md5name = "ef36c1a1aabb2ba3b0bedaaafe717bf4480be2ba8de6f3894be5fd3702b013ba-libmspub-0.1.4.tar.xz"; + } + { + name = "libmwaw-0.3.21.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libmwaw-0.3.21.tar.xz"; + sha256 = "e8750123a78d61b943cef78b7736c8a7f20bb0a649aa112402124fba794fc21c"; + md5 = ""; + md5name = "e8750123a78d61b943cef78b7736c8a7f20bb0a649aa112402124fba794fc21c-libmwaw-0.3.21.tar.xz"; + } + { + name = "mythes-1.2.5.tar.xz"; + url = "https://dev-www.libreoffice.org/src/mythes-1.2.5.tar.xz"; + sha256 = "19279f70707bbe5ffa619f2dc319f888cec0c4a8d339dc0a21330517bd6f521d"; + md5 = ""; + md5name = "19279f70707bbe5ffa619f2dc319f888cec0c4a8d339dc0a21330517bd6f521d-mythes-1.2.5.tar.xz"; + } + { + name = "nss-3.99-with-nspr-4.35.tar.gz"; + url = "https://dev-www.libreoffice.org/src/nss-3.99-with-nspr-4.35.tar.gz"; + sha256 = "5f29fea64b3234b33a615b6df40469e239a4168ac0909106bd00e6490b274c31"; + md5 = ""; + md5name = "5f29fea64b3234b33a615b6df40469e239a4168ac0909106bd00e6490b274c31-nss-3.99-with-nspr-4.35.tar.gz"; + } + { + name = "libodfgen-0.1.8.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libodfgen-0.1.8.tar.xz"; + sha256 = "55200027fd46623b9bdddd38d275e7452d1b0ff8aeddcad6f9ae6dc25f610625"; + md5 = ""; + md5name = "55200027fd46623b9bdddd38d275e7452d1b0ff8aeddcad6f9ae6dc25f610625-libodfgen-0.1.8.tar.xz"; + } + { + name = "odfvalidator-0.9.0-RC2-SNAPSHOT-jar-with-dependencies-2726ab578664434a545f8379a01a9faffac0ae73.jar"; + url = "https://dev-www.libreoffice.org/src/../extern/odfvalidator-0.9.0-RC2-SNAPSHOT-jar-with-dependencies-2726ab578664434a545f8379a01a9faffac0ae73.jar"; + sha256 = "d55495ab3a86544650587de2a72180ddf8bfc6376d14ddfa923992dbc86a06e0"; + md5 = ""; + md5name = "d55495ab3a86544650587de2a72180ddf8bfc6376d14ddfa923992dbc86a06e0-odfvalidator-0.9.0-RC2-SNAPSHOT-jar-with-dependencies-2726ab578664434a545f8379a01a9faffac0ae73.jar"; + } + { + name = "officeotron-0.7.4-master.jar"; + url = "https://dev-www.libreoffice.org/src/../extern/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar"; + sha256 = "f2443f27561af52324eee03a1892d9f569adc8db9e7bca55614898bc2a13a770"; + md5 = "8249374c274932a21846fa7629c2aa9b"; + md5name = "8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar"; + } + { + name = "onlineupdate-c003be8b9727672e7d30972983b375f4c200233f-2.tar.xz"; + url = "https://dev-www.libreoffice.org/src/onlineupdate-c003be8b9727672e7d30972983b375f4c200233f-2.tar.xz"; + sha256 = "37206cf981e8409d048b59ac5839621ea107ff49af72beb9d7769a2f41da8d90"; + md5 = ""; + md5name = "37206cf981e8409d048b59ac5839621ea107ff49af72beb9d7769a2f41da8d90-onlineupdate-c003be8b9727672e7d30972983b375f4c200233f-2.tar.xz"; + } + { + name = "openldap-2.6.7.tgz"; + url = "https://dev-www.libreoffice.org/src/openldap-2.6.7.tgz"; + sha256 = "cd775f625c944ed78a3da18a03b03b08eea73c8aabc97b41bb336e9a10954930"; + md5 = ""; + md5name = "cd775f625c944ed78a3da18a03b03b08eea73c8aabc97b41bb336e9a10954930-openldap-2.6.7.tgz"; + } + { + name = "openssl-3.0.14.tar.gz"; + url = "https://dev-www.libreoffice.org/src/openssl-3.0.14.tar.gz"; + sha256 = "eeca035d4dd4e84fc25846d952da6297484afa0650a6f84c682e39df3a4123ca"; + md5 = ""; + md5name = "eeca035d4dd4e84fc25846d952da6297484afa0650a6f84c682e39df3a4123ca-openssl-3.0.14.tar.gz"; + } + { + name = "liborcus-0.19.2.tar.xz"; + url = "https://dev-www.libreoffice.org/src/liborcus-0.19.2.tar.xz"; + sha256 = "69ed26a00d4aaa7688e62a6e003cbc81928521a45e96605e53365aa499719e39"; + md5 = ""; + md5name = "69ed26a00d4aaa7688e62a6e003cbc81928521a45e96605e53365aa499719e39-liborcus-0.19.2.tar.xz"; + } + { + name = "libpagemaker-0.0.4.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libpagemaker-0.0.4.tar.xz"; + sha256 = "66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d"; + md5 = ""; + md5name = "66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d-libpagemaker-0.0.4.tar.xz"; + } + { + name = "pdfium-6536.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/pdfium-6536.tar.bz2"; + sha256 = "9c2db89e9ea96f632108170bce7d901dbfc773bb09d03b7cd0ac68ebe26b9092"; + md5 = ""; + md5name = "9c2db89e9ea96f632108170bce7d901dbfc773bb09d03b7cd0ac68ebe26b9092-pdfium-6536.tar.bz2"; + } + { + name = "pixman-0.42.2.tar.gz"; + url = "https://dev-www.libreoffice.org/src/pixman-0.42.2.tar.gz"; + sha256 = "ea1480efada2fd948bc75366f7c349e1c96d3297d09a3fe62626e38e234a625e"; + md5 = ""; + md5name = "ea1480efada2fd948bc75366f7c349e1c96d3297d09a3fe62626e38e234a625e-pixman-0.42.2.tar.gz"; + } + { + name = "libpng-1.6.43.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libpng-1.6.43.tar.xz"; + sha256 = "6a5ca0652392a2d7c9db2ae5b40210843c0bbc081cbd410825ab00cc59f14a6c"; + md5 = ""; + md5name = "6a5ca0652392a2d7c9db2ae5b40210843c0bbc081cbd410825ab00cc59f14a6c-libpng-1.6.43.tar.xz"; + } + { + name = "tiff-4.6.0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/tiff-4.6.0.tar.xz"; + sha256 = "e178649607d1e22b51cf361dd20a3753f244f022eefab1f2f218fc62ebaf87d2"; + md5 = ""; + md5name = "e178649607d1e22b51cf361dd20a3753f244f022eefab1f2f218fc62ebaf87d2-tiff-4.6.0.tar.xz"; + } + { + name = "poppler-23.09.0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/poppler-23.09.0.tar.xz"; + sha256 = "80d1d44dd8bdf4ac1a47d56c5065075eb9991790974b1ed7d14b972acde88e55"; + md5 = ""; + md5name = "80d1d44dd8bdf4ac1a47d56c5065075eb9991790974b1ed7d14b972acde88e55-poppler-23.09.0.tar.xz"; + } + { + name = "poppler-data-0.4.12.tar.gz"; + url = "https://dev-www.libreoffice.org/src/poppler-data-0.4.12.tar.gz"; + sha256 = "c835b640a40ce357e1b83666aabd95edffa24ddddd49b8daff63adb851cdab74"; + md5 = ""; + md5name = "c835b640a40ce357e1b83666aabd95edffa24ddddd49b8daff63adb851cdab74-poppler-data-0.4.12.tar.gz"; + } + { + name = "postgresql-13.14.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/postgresql-13.14.tar.bz2"; + sha256 = "b8df078551898960bd500dc5d38a177e9905376df81fe7f2b660a1407fa6a5ed"; + md5 = ""; + md5name = "b8df078551898960bd500dc5d38a177e9905376df81fe7f2b660a1407fa6a5ed-postgresql-13.14.tar.bz2"; + } + { + name = "Python-3.8.19.tar.xz"; + url = "https://dev-www.libreoffice.org/src/Python-3.8.19.tar.xz"; + sha256 = "d2807ac69f69b84fd46a0b93bbd02a4fa48d3e70f4b2835ff0f72a2885040076"; + md5 = ""; + md5name = "d2807ac69f69b84fd46a0b93bbd02a4fa48d3e70f4b2835ff0f72a2885040076-Python-3.8.19.tar.xz"; + } + { + name = "libqxp-0.0.2.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libqxp-0.0.2.tar.xz"; + sha256 = "e137b6b110120a52c98edd02ebdc4095ee08d0d5295a94316a981750095a945c"; + md5 = ""; + md5name = "e137b6b110120a52c98edd02ebdc4095ee08d0d5295a94316a981750095a945c-libqxp-0.0.2.tar.xz"; + } + { + name = "raptor2-2.0.15.tar.gz"; + url = "https://dev-www.libreoffice.org/src/a39f6c07ddb20d7dd2ff1f95fa21e2cd-raptor2-2.0.15.tar.gz"; + sha256 = "ada7f0ba54787b33485d090d3d2680533520cd4426d2f7fb4782dd4a6a1480ed"; + md5 = "a39f6c07ddb20d7dd2ff1f95fa21e2cd"; + md5name = "a39f6c07ddb20d7dd2ff1f95fa21e2cd-raptor2-2.0.15.tar.gz"; + } + { + name = "rasqal-0.9.33.tar.gz"; + url = "https://dev-www.libreoffice.org/src/1f5def51ca0026cd192958ef07228b52-rasqal-0.9.33.tar.gz"; + sha256 = "6924c9ac6570bd241a9669f83b467c728a322470bf34f4b2da4f69492ccfd97c"; + md5 = "1f5def51ca0026cd192958ef07228b52"; + md5name = "1f5def51ca0026cd192958ef07228b52-rasqal-0.9.33.tar.gz"; + } + { + name = "redland-1.0.17.tar.gz"; + url = "https://dev-www.libreoffice.org/src/e5be03eda13ef68aabab6e42aa67715e-redland-1.0.17.tar.gz"; + sha256 = "de1847f7b59021c16bdc72abb4d8e2d9187cd6124d69156f3326dd34ee043681"; + md5 = "e5be03eda13ef68aabab6e42aa67715e"; + md5name = "e5be03eda13ef68aabab6e42aa67715e-redland-1.0.17.tar.gz"; + } + { + name = "librevenge-0.0.4.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/librevenge-0.0.4.tar.bz2"; + sha256 = "c51601cd08320b75702812c64aae0653409164da7825fd0f451ac2c5dbe77cbf"; + md5 = ""; + md5name = "c51601cd08320b75702812c64aae0653409164da7825fd0f451ac2c5dbe77cbf-librevenge-0.0.4.tar.bz2"; + } + { + name = "rhino1_5R5.zip"; + url = "https://dev-www.libreoffice.org/src/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip"; + sha256 = "1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753"; + md5 = "798b2ffdc8bcfe7bca2cf92b62caf685"; + md5name = "798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip"; + } + { + name = "skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz"; + url = "https://dev-www.libreoffice.org/src/skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz"; + sha256 = "2223ebce534458a37826e8fe4f24635b0712cde7ed1bd3208f089f6fdd796e01"; + md5 = ""; + md5name = "2223ebce534458a37826e8fe4f24635b0712cde7ed1bd3208f089f6fdd796e01-skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz"; + } + { + name = "libstaroffice-0.0.7.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libstaroffice-0.0.7.tar.xz"; + sha256 = "f94fb0ad8216f97127bedef163a45886b43c62deac5e5b0f5e628e234220c8db"; + md5 = ""; + md5name = "f94fb0ad8216f97127bedef163a45886b43c62deac5e5b0f5e628e234220c8db-libstaroffice-0.0.7.tar.xz"; + } + { + name = "swingExSrc.zip"; + url = "https://dev-www.libreoffice.org/src/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip"; + sha256 = "64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1"; + md5 = "35c94d2df8893241173de1d16b6034c0"; + md5name = "35c94d2df8893241173de1d16b6034c0-swingExSrc.zip"; + } + { + name = "twaindsm_2.4.1.orig.tar.gz"; + url = "https://dev-www.libreoffice.org/src/twaindsm_2.4.1.orig.tar.gz"; + sha256 = "82c818be771f242388457aa8c807e4b52aa84dc22b21c6c56184a6b4cbb085e6"; + md5 = ""; + md5name = "82c818be771f242388457aa8c807e4b52aa84dc22b21c6c56184a6b4cbb085e6-twaindsm_2.4.1.orig.tar.gz"; + } + { + name = "libvisio-0.1.7.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libvisio-0.1.7.tar.xz"; + sha256 = "8faf8df870cb27b09a787a1959d6c646faa44d0d8ab151883df408b7166bea4c"; + md5 = ""; + md5name = "8faf8df870cb27b09a787a1959d6c646faa44d0d8ab151883df408b7166bea4c-libvisio-0.1.7.tar.xz"; + } + { + name = "libwpd-0.10.3.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libwpd-0.10.3.tar.xz"; + sha256 = "2465b0b662fdc5d4e3bebcdc9a79027713fb629ca2bff04a3c9251fdec42dd09"; + md5 = ""; + md5name = "2465b0b662fdc5d4e3bebcdc9a79027713fb629ca2bff04a3c9251fdec42dd09-libwpd-0.10.3.tar.xz"; + } + { + name = "libwpg-0.3.4.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libwpg-0.3.4.tar.xz"; + sha256 = "b55fda9440d1e070630eb2487d8b8697cf412c214a27caee9df69cec7c004de3"; + md5 = ""; + md5name = "b55fda9440d1e070630eb2487d8b8697cf412c214a27caee9df69cec7c004de3-libwpg-0.3.4.tar.xz"; + } + { + name = "libwps-0.4.14.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libwps-0.4.14.tar.xz"; + sha256 = "365b968e270e85a8469c6b160aa6af5619a4e6c995dbb04c1ecc1b4dd13e80de"; + md5 = ""; + md5name = "365b968e270e85a8469c6b160aa6af5619a4e6c995dbb04c1ecc1b4dd13e80de-libwps-0.4.14.tar.xz"; + } + { + name = "xsltml_2.1.2.zip"; + url = "https://dev-www.libreoffice.org/src/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip"; + sha256 = "75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870"; + md5 = "a7983f859eafb2677d7ff386a023bc40"; + md5name = "a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip"; + } + { + name = "zlib-1.3.1.tar.xz"; + url = "https://dev-www.libreoffice.org/src/zlib-1.3.1.tar.xz"; + sha256 = "38ef96b8dfe510d42707d9c781877914792541133e1870841463bfa73f883e32"; + md5 = ""; + md5name = "38ef96b8dfe510d42707d9c781877914792541133e1870841463bfa73f883e32-zlib-1.3.1.tar.xz"; + } + { + name = "libzmf-0.0.2.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libzmf-0.0.2.tar.xz"; + sha256 = "27051a30cb057fdb5d5de65a1f165c7153dc76e27fe62251cbb86639eb2caf22"; + md5 = ""; + md5name = "27051a30cb057fdb5d5de65a1f165c7153dc76e27fe62251cbb86639eb2caf22-libzmf-0.0.2.tar.xz"; + } + { + name = "zxcvbn-c-2.5.tar.gz"; + url = "https://dev-www.libreoffice.org/src/zxcvbn-c-2.5.tar.gz"; + sha256 = "77d6c6ecb35952a8d8ce7f736b7a2bf466275c48210e309b73782d6b7e84dffd"; + md5 = ""; + md5name = "77d6c6ecb35952a8d8ce7f736b7a2bf466275c48210e309b73782d6b7e84dffd-zxcvbn-c-2.5.tar.gz"; + } + { + name = "zxing-cpp-2.1.0.tar.gz"; + url = "https://dev-www.libreoffice.org/src/zxing-cpp-2.1.0.tar.gz"; + sha256 = "6d54e403592ec7a143791c6526c1baafddf4c0897bb49b1af72b70a0f0c4a3fe"; + md5 = ""; + md5name = "6d54e403592ec7a143791c6526c1baafddf4c0897bb49b1af72b70a0f0c4a3fe-zxing-cpp-2.1.0.tar.gz"; + } +] diff --git a/pkgs/applications/office/libreoffice/src-collabora/help.nix b/pkgs/applications/office/libreoffice/src-collabora/help.nix new file mode 100644 index 0000000000000..fc5d4a3fa2a07 --- /dev/null +++ b/pkgs/applications/office/libreoffice/src-collabora/help.nix @@ -0,0 +1,6 @@ +{ fetchgit, ... }: +fetchgit { + url = "https://gerrit.libreoffice.org/help"; + rev = "27f62cdb52fe23f6090a3249fcd1433777b2598d"; + hash = "sha256-lyBuj7FI1jwVLLBkB6JJcmQVtm1FKExYWvRUoGqRbJ0="; +} diff --git a/pkgs/applications/office/libreoffice/src-collabora/main.nix b/pkgs/applications/office/libreoffice/src-collabora/main.nix new file mode 100644 index 0000000000000..ef4d5d77bfc16 --- /dev/null +++ b/pkgs/applications/office/libreoffice/src-collabora/main.nix @@ -0,0 +1,7 @@ +{ fetchgit, ... }: +fetchgit { + url = "https://gerrit.libreoffice.org/core"; + rev = "refs/tags/cp-24.04.5-4"; + hash = "sha256-OJ3R8qs8/R8QnXGCRgn/ZJK7Nn8cWwYbZxjEWg0VpBc="; + fetchSubmodules = false; +} diff --git a/pkgs/applications/office/libreoffice/src-collabora/translations.nix b/pkgs/applications/office/libreoffice/src-collabora/translations.nix new file mode 100644 index 0000000000000..06f5fe5a36244 --- /dev/null +++ b/pkgs/applications/office/libreoffice/src-collabora/translations.nix @@ -0,0 +1,6 @@ +{ fetchgit, ... }: +fetchgit { + url = "https://gerrit.libreoffice.org/translations"; + rev = "5fd34a953e6861cb8e392363c0a3500059ed6b01"; + hash = "sha256-1j0kTvPbytsCWszXz+xFE+n53zPkR8gNgVaawn+rjfI="; +} diff --git a/pkgs/applications/office/libreoffice/src-collabora/version.nix b/pkgs/applications/office/libreoffice/src-collabora/version.nix new file mode 100644 index 0000000000000..f88ef53af8e6f --- /dev/null +++ b/pkgs/applications/office/libreoffice/src-collabora/version.nix @@ -0,0 +1 @@ +"24.04.5-4" diff --git a/pkgs/applications/office/libreoffice/src-fresh/deps.nix b/pkgs/applications/office/libreoffice/src-fresh/deps.nix index cc24540cebd14..38354245ba1ef 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/deps.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/deps.nix @@ -14,11 +14,11 @@ md5name = "daf972a89577f8772602bf2eb38b6a3dd3d922bf5724d45e7f9589b5e830442c-phc-winner-argon2-20190702.tar.gz"; } { - name = "boost_1_82_0.tar.xz"; - url = "https://dev-www.libreoffice.org/src/boost_1_82_0.tar.xz"; - sha256 = "e48ab6953fbd68ba47234bea5173e62427e9f6a7894e152305142895cfe955de"; + name = "boost_1_85_0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/boost_1_85_0.tar.xz"; + sha256 = "4e23218ff5036d57afd20f7cdab2e94cdbf6ba9c509d656ace643a81c40a985a"; md5 = ""; - md5name = "e48ab6953fbd68ba47234bea5173e62427e9f6a7894e152305142895cfe955de-boost_1_82_0.tar.xz"; + md5name = "4e23218ff5036d57afd20f7cdab2e94cdbf6ba9c509d656ace643a81c40a985a-boost_1_85_0.tar.xz"; } { name = "box2d-2.4.1.tar.gz"; @@ -35,11 +35,11 @@ md5name = "c44a2e898895cfc13b42d2371ba4b88b0777d7782214d6cdc91c33720f3b0d91-breakpad-b324760c7f53667af128a6b77b790323da04fcb9.tar.xz"; } { - name = "bsh-2.0b6-src.zip"; - url = "https://dev-www.libreoffice.org/src/beeca87be45ec87d241ddd0e1bad80c1-bsh-2.0b6-src.zip"; - sha256 = "9e93c73e23aff644b17dfff656444474c14150e7f3b38b19635e622235e01c96"; - md5 = "beeca87be45ec87d241ddd0e1bad80c1"; - md5name = "beeca87be45ec87d241ddd0e1bad80c1-bsh-2.0b6-src.zip"; + name = "bsh-2.1.1-src.zip"; + url = "https://dev-www.libreoffice.org/src/bsh-2.1.1-src.zip"; + sha256 = "2248387ceaa319840434a3547a8b2fec12f95a8418ee039ce5ff5726053a139c"; + md5 = ""; + md5name = "2248387ceaa319840434a3547a8b2fec12f95a8418ee039ce5ff5726053a139c-bsh-2.1.1-src.zip"; } { name = "bzip2-1.0.8.tar.gz"; @@ -84,11 +84,11 @@ md5name = "0082d0684f7db6f62361b76c4b7faba19e0c7ce5cb8e36c4b65fea8281e711b4-dtoa-20180411.tgz"; } { - name = "libcmis-0.6.1.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libcmis-0.6.1.tar.xz"; - sha256 = "d54d19d86153dbc88e2d468f7136269a2cfe71b73227e12fded01d29ac268074"; + name = "libcmis-0.6.2.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libcmis-0.6.2.tar.xz"; + sha256 = "1b5c2d7258ff93eb5f9958ff0e4dfd7332dc75a071bb717dde2217a26602a644"; md5 = ""; - md5name = "d54d19d86153dbc88e2d468f7136269a2cfe71b73227e12fded01d29ac268074-libcmis-0.6.1.tar.xz"; + md5name = "1b5c2d7258ff93eb5f9958ff0e4dfd7332dc75a071bb717dde2217a26602a644-libcmis-0.6.2.tar.xz"; } { name = "CoinMP-1.8.4.tgz"; @@ -105,11 +105,11 @@ md5name = "89c5c6665337f56fd2db36bc3805a5619709d51fb136e51937072f63fcc717a7-cppunit-1.15.1.tar.gz"; } { - name = "curl-8.7.1.tar.xz"; - url = "https://dev-www.libreoffice.org/src/curl-8.7.1.tar.xz"; - sha256 = "6fea2aac6a4610fbd0400afb0bcddbe7258a64c63f1f68e5855ebc0c659710cd"; + name = "curl-8.9.0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/curl-8.9.0.tar.xz"; + sha256 = "ff09b2791ca56d25fd5c3f3a4927dce7c8a9dc4182200c487ca889fba1fdd412"; md5 = ""; - md5name = "6fea2aac6a4610fbd0400afb0bcddbe7258a64c63f1f68e5855ebc0c659710cd-curl-8.7.1.tar.xz"; + md5name = "ff09b2791ca56d25fd5c3f3a4927dce7c8a9dc4182200c487ca889fba1fdd412-curl-8.9.0.tar.xz"; } { name = "libe-book-0.1.3.tar.xz"; @@ -161,11 +161,11 @@ md5name = "acb85cedafa10ce106b1823fb236b1b3e5d942a5741e8f8435cc8ccfec0afe76-Firebird-3.0.7.33374-0.tar.bz2"; } { - name = "fontconfig-2.14.2.tar.xz"; - url = "https://dev-www.libreoffice.org/src/fontconfig-2.14.2.tar.xz"; - sha256 = "dba695b57bce15023d2ceedef82062c2b925e51f5d4cc4aef736cf13f60a468b"; + name = "fontconfig-2.15.0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/fontconfig-2.15.0.tar.xz"; + sha256 = "63a0658d0e06e0fa886106452b58ef04f21f58202ea02a94c39de0d3335d7c0e"; md5 = ""; - md5name = "dba695b57bce15023d2ceedef82062c2b925e51f5d4cc4aef736cf13f60a468b-fontconfig-2.14.2.tar.xz"; + md5name = "63a0658d0e06e0fa886106452b58ef04f21f58202ea02a94c39de0d3335d7c0e-fontconfig-2.15.0.tar.xz"; } { name = "crosextrafonts-20130214.tar.gz"; @@ -203,11 +203,11 @@ md5name = "8879d89b5ff7b506c9fc28efc31a5c0b954bbe9333e66e5283d27d20a8519ea3-liberation-narrow-fonts-ttf-1.07.6.tar.gz"; } { - name = "liberation-fonts-ttf-2.1.4.tar.gz"; - url = "https://dev-www.libreoffice.org/src/liberation-fonts-ttf-2.1.4.tar.gz"; - sha256 = "26f85412dd0aa9d061504a1cc8aaf0aa12a70710e8d47d8b65a1251757c1a5ef"; + name = "liberation-fonts-ttf-2.1.5.tar.gz"; + url = "https://dev-www.libreoffice.org/src/liberation-fonts-ttf-2.1.5.tar.gz"; + sha256 = "7191c669bf38899f73a2094ed00f7b800553364f90e2637010a69c0e268f25d0"; md5 = ""; - md5name = "26f85412dd0aa9d061504a1cc8aaf0aa12a70710e8d47d8b65a1251757c1a5ef-liberation-fonts-ttf-2.1.4.tar.gz"; + md5name = "7191c669bf38899f73a2094ed00f7b800553364f90e2637010a69c0e268f25d0-liberation-fonts-ttf-2.1.5.tar.gz"; } { name = "LinLibertineG-20120116.zip"; @@ -224,25 +224,25 @@ md5name = "1b6880e4b8df09c3b9e246d6084bfd94bf32a0ffff60cf2dcffd3622d0e2d79f-NotoKufiArabic-v2.109.zip"; } { - name = "NotoSans-v2.012.zip"; - url = "https://dev-www.libreoffice.org/src/NotoSans-v2.012.zip"; - sha256 = "efef2f66ed2c5e005472cba156bd2afb68063a51bb628c6ee14143edc019d293"; + name = "NotoSans-v2.013.zip"; + url = "https://dev-www.libreoffice.org/src/NotoSans-v2.013.zip"; + sha256 = "9fd595dd701d7ea103a9ba8a9cfdcf0c35c5574ef754fecabe718eadad8bccde"; md5 = ""; - md5name = "efef2f66ed2c5e005472cba156bd2afb68063a51bb628c6ee14143edc019d293-NotoSans-v2.012.zip"; + md5name = "9fd595dd701d7ea103a9ba8a9cfdcf0c35c5574ef754fecabe718eadad8bccde-NotoSans-v2.013.zip"; } { - name = "NotoSerif-v2.012.zip"; - url = "https://dev-www.libreoffice.org/src/NotoSerif-v2.012.zip"; - sha256 = "3d4566a0e51e7fc14528f5a1eecc6f12e5ffbbec6484470d3da48b0d8ead345a"; + name = "NotoSerif-v2.013.zip"; + url = "https://dev-www.libreoffice.org/src/NotoSerif-v2.013.zip"; + sha256 = "fb4c6c75f10365f63b5c8ad5a1864ebe46dd0c70c40d0461cb0dc1b1b7c13a35"; md5 = ""; - md5name = "3d4566a0e51e7fc14528f5a1eecc6f12e5ffbbec6484470d3da48b0d8ead345a-NotoSerif-v2.012.zip"; + md5name = "fb4c6c75f10365f63b5c8ad5a1864ebe46dd0c70c40d0461cb0dc1b1b7c13a35-NotoSerif-v2.013.zip"; } { - name = "NotoSerifHebrew-v2.003.zip"; - url = "https://dev-www.libreoffice.org/src/NotoSerifHebrew-v2.003.zip"; - sha256 = "e45c149d6c29b38b8981401f875ab4304e73a366312783c41c082eb5366d3921"; + name = "NotoSerifHebrew-v2.004.zip"; + url = "https://dev-www.libreoffice.org/src/NotoSerifHebrew-v2.004.zip"; + sha256 = "99523f4f21051495f18cbd5169ed0d1e9b395eefe770fece1844a4a7a00c46da"; md5 = ""; - md5name = "e45c149d6c29b38b8981401f875ab4304e73a366312783c41c082eb5366d3921-NotoSerifHebrew-v2.003.zip"; + md5name = "99523f4f21051495f18cbd5169ed0d1e9b395eefe770fece1844a4a7a00c46da-NotoSerifHebrew-v2.004.zip"; } { name = "NotoSansArabic-v2.010.zip"; @@ -252,18 +252,18 @@ md5name = "a5a34ac1ea01d0d71c083f99440ebfb1f64224474a0d88bb7ef0e2f8d9a996d2-NotoSansArabic-v2.010.zip"; } { - name = "NotoNaskhArabic-v2.016.zip"; - url = "https://dev-www.libreoffice.org/src/NotoNaskhArabic-v2.016.zip"; - sha256 = "2b6a3f30f21d27bc6b75b40a350221e12e64b753604d613bf3ddf71cdbe331ac"; + name = "NotoNaskhArabic-v2.019.zip"; + url = "https://dev-www.libreoffice.org/src/NotoNaskhArabic-v2.019.zip"; + sha256 = "7a509e10c9c8d21f384a26807ef2f5fbbecec46fdb8626c5441bed6d894edb81"; md5 = ""; - md5name = "2b6a3f30f21d27bc6b75b40a350221e12e64b753604d613bf3ddf71cdbe331ac-NotoNaskhArabic-v2.016.zip"; + md5name = "7a509e10c9c8d21f384a26807ef2f5fbbecec46fdb8626c5441bed6d894edb81-NotoNaskhArabic-v2.019.zip"; } { - name = "NotoSansHebrew-v2.003.zip"; - url = "https://dev-www.libreoffice.org/src/NotoSansHebrew-v2.003.zip"; - sha256 = "ded809309ff924bc45834bf19afaa5693cadf17580972468f6041f5e599ddb8a"; + name = "NotoSansHebrew-v3.001.zip"; + url = "https://dev-www.libreoffice.org/src/NotoSansHebrew-v3.001.zip"; + sha256 = "df0a71814b4e63644cf40fcc4529111b61266b7a2dafbe95068b29a7520cc3cb"; md5 = ""; - md5name = "ded809309ff924bc45834bf19afaa5693cadf17580972468f6041f5e599ddb8a-NotoSansHebrew-v2.003.zip"; + md5name = "df0a71814b4e63644cf40fcc4529111b61266b7a2dafbe95068b29a7520cc3cb-NotoSansHebrew-v3.001.zip"; } { name = "NotoSansArmenian-v2.008.zip"; @@ -280,11 +280,11 @@ md5name = "b21c198a4c76ae598a304decefb3b5c2a4c2d4c3ae226728eff359185f291c6f-NotoSerifArmenian-v2.008.zip"; } { - name = "NotoSansGeorgian-v2.003.zip"; - url = "https://dev-www.libreoffice.org/src/NotoSansGeorgian-v2.003.zip"; - sha256 = "bd75d1f0b9ef619b5ded0018d6258eeab2f9e976d8f8074bb7890f4e301648bf"; + name = "NotoSansGeorgian-v2.005.zip"; + url = "https://dev-www.libreoffice.org/src/NotoSansGeorgian-v2.005.zip"; + sha256 = "10e85011008108308e6feab0408242acb07804da61ede3d3ff236461ae07ab1b"; md5 = ""; - md5name = "bd75d1f0b9ef619b5ded0018d6258eeab2f9e976d8f8074bb7890f4e301648bf-NotoSansGeorgian-v2.003.zip"; + md5name = "10e85011008108308e6feab0408242acb07804da61ede3d3ff236461ae07ab1b-NotoSansGeorgian-v2.005.zip"; } { name = "NotoSerifGeorgian-v2.003.zip"; @@ -343,11 +343,11 @@ md5name = "926fe1bd7dfde8e55178281f645258bfced6420c951c6f2fd532fd21691bca30-Amiri-1.000.zip"; } { - name = "ReemKufi-1.2.zip"; - url = "https://dev-www.libreoffice.org/src/ReemKufi-1.2.zip"; - sha256 = "c4fd68a23c0ea471cc084ae7efe888da372b925cb208eeb0322c26792d2ef413"; + name = "ReemKufi-1.7.zip"; + url = "https://dev-www.libreoffice.org/src/ReemKufi-1.7.zip"; + sha256 = "2359f036c7bddeb4d5529d7b3c9139c3288c920cc26053d417cdbb563eafe0a4"; md5 = ""; - md5name = "c4fd68a23c0ea471cc084ae7efe888da372b925cb208eeb0322c26792d2ef413-ReemKufi-1.2.zip"; + md5name = "2359f036c7bddeb4d5529d7b3c9139c3288c920cc26053d417cdbb563eafe0a4-ReemKufi-1.7.zip"; } { name = "Scheherazade-2.100.zip"; @@ -364,11 +364,11 @@ md5name = "0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d9091676420de34ac-libfreehand-0.1.2.tar.xz"; } { - name = "freetype-2.13.0.tar.xz"; - url = "https://dev-www.libreoffice.org/src/freetype-2.13.0.tar.xz"; - sha256 = "5ee23abd047636c24b2d43c6625dcafc66661d1aca64dec9e0d05df29592624c"; + name = "freetype-2.13.2.tar.xz"; + url = "https://dev-www.libreoffice.org/src/freetype-2.13.2.tar.xz"; + sha256 = "12991c4e55c506dd7f9b765933e62fd2be2e06d421505d7950a132e4f1bb484d"; md5 = ""; - md5name = "5ee23abd047636c24b2d43c6625dcafc66661d1aca64dec9e0d05df29592624c-freetype-2.13.0.tar.xz"; + md5name = "12991c4e55c506dd7f9b765933e62fd2be2e06d421505d7950a132e4f1bb484d-freetype-2.13.2.tar.xz"; } { name = "frozen-1.1.1.tar.gz"; @@ -378,11 +378,11 @@ md5name = "f7c7075750e8fceeac081e9ef01944f221b36d9725beac8681cbd2838d26be45-frozen-1.1.1.tar.gz"; } { - name = "glm-0.9.9.8.zip"; - url = "https://dev-www.libreoffice.org/src/glm-0.9.9.8.zip"; - sha256 = "6bba5f032bed47c73ad9397f2313b9acbfb56253d0d0576b5873d3dcb25e99ad"; + name = "glm-1.0.1.zip"; + url = "https://dev-www.libreoffice.org/src/glm-1.0.1.zip"; + sha256 = "09c5716296787e1f7fcb87b1cbdbf26814ec1288ed6259ccd30d5d9795809fa5"; md5 = ""; - md5name = "6bba5f032bed47c73ad9397f2313b9acbfb56253d0d0576b5873d3dcb25e99ad-glm-0.9.9.8.zip"; + md5name = "09c5716296787e1f7fcb87b1cbdbf26814ec1288ed6259ccd30d5d9795809fa5-glm-1.0.1.zip"; } { name = "gpgme-1.23.2.tar.bz2"; @@ -399,11 +399,11 @@ md5name = "b8e892d8627c41888ff121e921455b9e2d26836978f2359173d19825da62b8fc-graphite2-minimal-1.3.14.tgz"; } { - name = "harfbuzz-8.2.2.tar.xz"; - url = "https://dev-www.libreoffice.org/src/harfbuzz-8.2.2.tar.xz"; - sha256 = "e433ad85fbdf57f680be29479b3f964577379aaf319f557eb76569f0ecbc90f3"; + name = "harfbuzz-8.5.0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/harfbuzz-8.5.0.tar.xz"; + sha256 = "77e4f7f98f3d86bf8788b53e6832fb96279956e1c3961988ea3d4b7ca41ddc27"; md5 = ""; - md5name = "e433ad85fbdf57f680be29479b3f964577379aaf319f557eb76569f0ecbc90f3-harfbuzz-8.2.2.tar.xz"; + md5name = "77e4f7f98f3d86bf8788b53e6832fb96279956e1c3961988ea3d4b7ca41ddc27-harfbuzz-8.5.0.tar.xz"; } { name = "hsqldb_1_8_0.zip"; @@ -434,25 +434,25 @@ md5name = "0e279003f5199f80031c6dcd08f79d6f65a0505139160e7df0d09b226bff4023-IAccessible2-1.3+git20231013.3d8c7f0.tar.gz"; } { - name = "icu4c-73_2-src.tgz"; - url = "https://dev-www.libreoffice.org/src/icu4c-73_2-src.tgz"; - sha256 = "818a80712ed3caacd9b652305e01afc7fa167e6f2e94996da44b90c2ab604ce1"; + name = "icu4c-74_2-src.tgz"; + url = "https://dev-www.libreoffice.org/src/icu4c-74_2-src.tgz"; + sha256 = "68db082212a96d6f53e35d60f47d38b962e9f9d207a74cfac78029ae8ff5e08c"; md5 = ""; - md5name = "818a80712ed3caacd9b652305e01afc7fa167e6f2e94996da44b90c2ab604ce1-icu4c-73_2-src.tgz"; + md5name = "68db082212a96d6f53e35d60f47d38b962e9f9d207a74cfac78029ae8ff5e08c-icu4c-74_2-src.tgz"; } { - name = "icu4c-73_2-data.zip"; - url = "https://dev-www.libreoffice.org/src/icu4c-73_2-data.zip"; - sha256 = "ca1ee076163b438461e484421a7679fc33a64cd0a54f9d4b401893fa1eb42701"; + name = "icu4c-74_2-data.zip"; + url = "https://dev-www.libreoffice.org/src/icu4c-74_2-data.zip"; + sha256 = "c28c3ca5f4ba3384781797138a294ca360988d4322674ad4d51e52f5d9b0a2b6"; md5 = ""; - md5name = "ca1ee076163b438461e484421a7679fc33a64cd0a54f9d4b401893fa1eb42701-icu4c-73_2-data.zip"; + md5name = "c28c3ca5f4ba3384781797138a294ca360988d4322674ad4d51e52f5d9b0a2b6-icu4c-74_2-data.zip"; } { - name = "Java-WebSocket-1.5.4.tar.gz"; - url = "https://dev-www.libreoffice.org/src/Java-WebSocket-1.5.4.tar.gz"; - sha256 = "a6828b35d1f938fee2335945f3d3c563cbbfa58ce7eb0bf72778d0fa7a550720"; + name = "Java-WebSocket-1.5.6.tar.gz"; + url = "https://dev-www.libreoffice.org/src/Java-WebSocket-1.5.6.tar.gz"; + sha256 = "167e86561cd7b5ed21b67d7543536134edcb14b373892739b28c417566a3832f"; md5 = ""; - md5name = "a6828b35d1f938fee2335945f3d3c563cbbfa58ce7eb0bf72778d0fa7a550720-Java-WebSocket-1.5.4.tar.gz"; + md5name = "167e86561cd7b5ed21b67d7543536134edcb14b373892739b28c417566a3832f-Java-WebSocket-1.5.6.tar.gz"; } { name = "flow-engine-0.9.4.zip"; @@ -539,11 +539,11 @@ md5name = "2fdc3feb6e9deb17adec9bafa3321419aa19f8f4e5dea7bf8486844ca22207bf-libjpeg-turbo-2.1.5.1.tar.gz"; } { - name = "language-subtag-registry-2023-08-02.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2023-08-02.tar.bz2"; - sha256 = "59fdc026b5088e7947e1e6add482d2a40e1f7e25c50f198b456954216462c2eb"; + name = "language-subtag-registry-2024-06-14.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2024-06-14.tar.bz2"; + sha256 = "75bc394dd83ddfd62b172a462db1b66bdb5950f40823ed63b8c7db6b71e37e75"; md5 = ""; - md5name = "59fdc026b5088e7947e1e6add482d2a40e1f7e25c50f198b456954216462c2eb-language-subtag-registry-2023-08-02.tar.bz2"; + md5name = "75bc394dd83ddfd62b172a462db1b66bdb5950f40823ed63b8c7db6b71e37e75-language-subtag-registry-2024-06-14.tar.bz2"; } { name = "lcms2-2.16.tar.gz"; @@ -553,18 +553,18 @@ md5name = "d873d34ad8b9b4cea010631f1a6228d2087475e4dc5e763eb81acc23d9d45a51-lcms2-2.16.tar.gz"; } { - name = "libassuan-2.5.7.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/libassuan-2.5.7.tar.bz2"; - sha256 = "0103081ffc27838a2e50479153ca105e873d3d65d8a9593282e9c94c7e6afb76"; + name = "libassuan-3.0.1.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/libassuan-3.0.1.tar.bz2"; + sha256 = "c8f0f42e6103dea4b1a6a483cb556654e97302c7465308f58363778f95f194b1"; md5 = ""; - md5name = "0103081ffc27838a2e50479153ca105e873d3d65d8a9593282e9c94c7e6afb76-libassuan-2.5.7.tar.bz2"; + md5name = "c8f0f42e6103dea4b1a6a483cb556654e97302c7465308f58363778f95f194b1-libassuan-3.0.1.tar.bz2"; } { - name = "libatomic_ops-7.8.0.tar.gz"; - url = "https://dev-www.libreoffice.org/src/libatomic_ops-7.8.0.tar.gz"; - sha256 = "15676e7674e11bda5a7e50a73f4d9e7d60452271b8acf6fd39a71fefdf89fa31"; + name = "libatomic_ops-7.8.2.tar.gz"; + url = "https://dev-www.libreoffice.org/src/libatomic_ops-7.8.2.tar.gz"; + sha256 = "d305207fe207f2b3fb5cb4c019da12b44ce3fcbc593dfd5080d867b1a2419b51"; md5 = ""; - md5name = "15676e7674e11bda5a7e50a73f4d9e7d60452271b8acf6fd39a71fefdf89fa31-libatomic_ops-7.8.0.tar.gz"; + md5name = "d305207fe207f2b3fb5cb4c019da12b44ce3fcbc593dfd5080d867b1a2419b51-libatomic_ops-7.8.2.tar.gz"; } { name = "libeot-0.01.tar.bz2"; @@ -574,11 +574,11 @@ md5name = "cf5091fa8e7dcdbe667335eb90a2cfdd0a3fe8f8c7c8d1ece44d9d055736a06a-libeot-0.01.tar.bz2"; } { - name = "libexttextcat-3.4.6.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libexttextcat-3.4.6.tar.xz"; - sha256 = "6d77eace20e9ea106c1330e268ede70c9a4a89744ddc25715682754eca3368df"; + name = "libexttextcat-3.4.7.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libexttextcat-3.4.7.tar.xz"; + sha256 = "df0a59d413a5b202573d8d4f5159e33a8538da4f8e8e60979facc64d6290cebd"; md5 = ""; - md5name = "6d77eace20e9ea106c1330e268ede70c9a4a89744ddc25715682754eca3368df-libexttextcat-3.4.6.tar.xz"; + md5name = "df0a59d413a5b202573d8d4f5159e33a8538da4f8e8e60979facc64d6290cebd-libexttextcat-3.4.7.tar.xz"; } { name = "libffi-3.4.4.tar.gz"; @@ -588,11 +588,11 @@ md5name = "d66c56ad259a82cf2a9dfc408b32bf5da52371500b84745f7fb8b645712df676-libffi-3.4.4.tar.gz"; } { - name = "libgpg-error-1.48.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/libgpg-error-1.48.tar.bz2"; - sha256 = "89ce1ae893e122924b858de84dc4f67aae29ffa610ebf668d5aa539045663d6f"; + name = "libgpg-error-1.50.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/libgpg-error-1.50.tar.bz2"; + sha256 = "69405349e0a633e444a28c5b35ce8f14484684518a508dc48a089992fe93e20a"; md5 = ""; - md5name = "89ce1ae893e122924b858de84dc4f67aae29ffa610ebf668d5aa539045663d6f-libgpg-error-1.48.tar.bz2"; + md5name = "69405349e0a633e444a28c5b35ce8f14484684518a508dc48a089992fe93e20a-libgpg-error-1.50.tar.bz2"; } { name = "liblangtag-0.6.7.tar.bz2"; @@ -616,32 +616,32 @@ md5name = "296272d93435991308eb73607600c034b558807a07e829e751142e65ccfa9d08-ltm-1.3.0.tar.xz"; } { - name = "libwebp-1.3.2.tar.gz"; - url = "https://dev-www.libreoffice.org/src/libwebp-1.3.2.tar.gz"; - sha256 = "2a499607df669e40258e53d0ade8035ba4ec0175244869d1025d460562aa09b4"; + name = "libwebp-1.4.0.tar.gz"; + url = "https://dev-www.libreoffice.org/src/libwebp-1.4.0.tar.gz"; + sha256 = "61f873ec69e3be1b99535634340d5bde750b2e4447caa1db9f61be3fd49ab1e5"; md5 = ""; - md5name = "2a499607df669e40258e53d0ade8035ba4ec0175244869d1025d460562aa09b4-libwebp-1.3.2.tar.gz"; + md5name = "61f873ec69e3be1b99535634340d5bde750b2e4447caa1db9f61be3fd49ab1e5-libwebp-1.4.0.tar.gz"; } { - name = "xmlsec1-1.3.2.tar.gz"; - url = "https://dev-www.libreoffice.org/src/xmlsec1-1.3.2.tar.gz"; - sha256 = "4003c56b3d356d21b1db7775318540fad6bfedaf5f117e8f7c010811219be3cf"; + name = "xmlsec1-1.3.5.tar.gz"; + url = "https://dev-www.libreoffice.org/src/xmlsec1-1.3.5.tar.gz"; + sha256 = "2ffd4ad1f860ec93e47a680310ab2bc94968bd07566e71976bd96133d9504917"; md5 = ""; - md5name = "4003c56b3d356d21b1db7775318540fad6bfedaf5f117e8f7c010811219be3cf-xmlsec1-1.3.2.tar.gz"; + md5name = "2ffd4ad1f860ec93e47a680310ab2bc94968bd07566e71976bd96133d9504917-xmlsec1-1.3.5.tar.gz"; } { - name = "libxml2-2.12.6.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libxml2-2.12.6.tar.xz"; - sha256 = "889c593a881a3db5fdd96cc9318c87df34eb648edfc458272ad46fd607353fbb"; + name = "libxml2-2.12.9.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libxml2-2.12.9.tar.xz"; + sha256 = "59912db536ab56a3996489ea0299768c7bcffe57169f0235e7f962a91f483590"; md5 = ""; - md5name = "889c593a881a3db5fdd96cc9318c87df34eb648edfc458272ad46fd607353fbb-libxml2-2.12.6.tar.xz"; + md5name = "59912db536ab56a3996489ea0299768c7bcffe57169f0235e7f962a91f483590-libxml2-2.12.9.tar.xz"; } { - name = "libxslt-1.1.39.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libxslt-1.1.39.tar.xz"; - sha256 = "2a20ad621148339b0759c4d4e96719362dee64c9a096dbba625ba053846349f0"; + name = "libxslt-1.1.41.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libxslt-1.1.41.tar.xz"; + sha256 = "3ad392af91115b7740f7b50d228cc1c5fc13afc1da7f16cb0213917a37f71bda"; md5 = ""; - md5name = "2a20ad621148339b0759c4d4e96719362dee64c9a096dbba625ba053846349f0-libxslt-1.1.39.tar.xz"; + md5name = "3ad392af91115b7740f7b50d228cc1c5fc13afc1da7f16cb0213917a37f71bda-libxslt-1.1.41.tar.xz"; } { name = "lp_solve_5.5.tar.gz"; @@ -651,11 +651,11 @@ md5name = "26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz"; } { - name = "lxml-4.9.2.tgz"; - url = "https://dev-www.libreoffice.org/src/lxml-4.9.2.tgz"; - sha256 = "2455cfaeb7ac70338b3257f41e21f0724f4b5b0c0e7702da67ee6c3640835b67"; + name = "lxml-5.2.2.tar.gz"; + url = "https://dev-www.libreoffice.org/src/lxml-5.2.2.tar.gz"; + sha256 = "bb2dc4898180bea79863d5487e5f9c7c34297414bad54bcd0f0852aee9cfdb87"; md5 = ""; - md5name = "2455cfaeb7ac70338b3257f41e21f0724f4b5b0c0e7702da67ee6c3640835b67-lxml-4.9.2.tgz"; + md5name = "bb2dc4898180bea79863d5487e5f9c7c34297414bad54bcd0f0852aee9cfdb87-lxml-5.2.2.tar.gz"; } { name = "mariadb-connector-c-3.3.8-src.tar.gz"; @@ -686,11 +686,11 @@ md5name = "ef36c1a1aabb2ba3b0bedaaafe717bf4480be2ba8de6f3894be5fd3702b013ba-libmspub-0.1.4.tar.xz"; } { - name = "libmwaw-0.3.21.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libmwaw-0.3.21.tar.xz"; - sha256 = "e8750123a78d61b943cef78b7736c8a7f20bb0a649aa112402124fba794fc21c"; + name = "libmwaw-0.3.22.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libmwaw-0.3.22.tar.xz"; + sha256 = "a1a39ffcea3ff2a7a7aae0c23877ddf4918b554bf82b0de5d7ce8e7f61ea8e32"; md5 = ""; - md5name = "e8750123a78d61b943cef78b7736c8a7f20bb0a649aa112402124fba794fc21c-libmwaw-0.3.21.tar.xz"; + md5name = "a1a39ffcea3ff2a7a7aae0c23877ddf4918b554bf82b0de5d7ce8e7f61ea8e32-libmwaw-0.3.22.tar.xz"; } { name = "mythes-1.2.5.tar.xz"; @@ -700,11 +700,11 @@ md5name = "19279f70707bbe5ffa619f2dc319f888cec0c4a8d339dc0a21330517bd6f521d-mythes-1.2.5.tar.xz"; } { - name = "nss-3.99-with-nspr-4.35.tar.gz"; - url = "https://dev-www.libreoffice.org/src/nss-3.99-with-nspr-4.35.tar.gz"; - sha256 = "5f29fea64b3234b33a615b6df40469e239a4168ac0909106bd00e6490b274c31"; + name = "nss-3.102.1-with-nspr-4.35.tar.gz"; + url = "https://dev-www.libreoffice.org/src/nss-3.102.1-with-nspr-4.35.tar.gz"; + sha256 = "ddfdec73fb4b0eedce5fc4de09de9ba14d2ddbfbf67e42372903e1510f2d3d65"; md5 = ""; - md5name = "5f29fea64b3234b33a615b6df40469e239a4168ac0909106bd00e6490b274c31-nss-3.99-with-nspr-4.35.tar.gz"; + md5name = "ddfdec73fb4b0eedce5fc4de09de9ba14d2ddbfbf67e42372903e1510f2d3d65-nss-3.102.1-with-nspr-4.35.tar.gz"; } { name = "libodfgen-0.1.8.tar.xz"; @@ -735,18 +735,18 @@ md5name = "37206cf981e8409d048b59ac5839621ea107ff49af72beb9d7769a2f41da8d90-onlineupdate-c003be8b9727672e7d30972983b375f4c200233f-2.tar.xz"; } { - name = "openldap-2.6.7.tgz"; - url = "https://dev-www.libreoffice.org/src/openldap-2.6.7.tgz"; - sha256 = "cd775f625c944ed78a3da18a03b03b08eea73c8aabc97b41bb336e9a10954930"; + name = "openldap-2.6.8.tgz"; + url = "https://dev-www.libreoffice.org/src/openldap-2.6.8.tgz"; + sha256 = "48969323e94e3be3b03c6a132942dcba7ef8d545f2ad35401709019f696c3c4e"; md5 = ""; - md5name = "cd775f625c944ed78a3da18a03b03b08eea73c8aabc97b41bb336e9a10954930-openldap-2.6.7.tgz"; + md5name = "48969323e94e3be3b03c6a132942dcba7ef8d545f2ad35401709019f696c3c4e-openldap-2.6.8.tgz"; } { - name = "openssl-3.0.13.tar.gz"; - url = "https://dev-www.libreoffice.org/src/openssl-3.0.13.tar.gz"; - sha256 = "88525753f79d3bec27d2fa7c66aa0b92b3aa9498dafd93d7cfa4b3780cdae313"; + name = "openssl-3.0.14.tar.gz"; + url = "https://dev-www.libreoffice.org/src/openssl-3.0.14.tar.gz"; + sha256 = "eeca035d4dd4e84fc25846d952da6297484afa0650a6f84c682e39df3a4123ca"; md5 = ""; - md5name = "88525753f79d3bec27d2fa7c66aa0b92b3aa9498dafd93d7cfa4b3780cdae313-openssl-3.0.13.tar.gz"; + md5name = "eeca035d4dd4e84fc25846d952da6297484afa0650a6f84c682e39df3a4123ca-openssl-3.0.14.tar.gz"; } { name = "liborcus-0.19.2.tar.xz"; @@ -763,11 +763,11 @@ md5name = "66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d-libpagemaker-0.0.4.tar.xz"; } { - name = "pdfium-6179.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/pdfium-6179.tar.bz2"; - sha256 = "4d3f08fe0e2fda86246832085426616826dcca0912202874428bfbc24d13d95c"; + name = "pdfium-6425.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/pdfium-6425.tar.bz2"; + sha256 = "fe0291b96d7352bac530d13ef2e5fd63ad9980e0128911f88b957b5992508f1c"; md5 = ""; - md5name = "4d3f08fe0e2fda86246832085426616826dcca0912202874428bfbc24d13d95c-pdfium-6179.tar.bz2"; + md5name = "fe0291b96d7352bac530d13ef2e5fd63ad9980e0128911f88b957b5992508f1c-pdfium-6425.tar.bz2"; } { name = "pixman-0.42.2.tar.gz"; @@ -784,18 +784,18 @@ md5name = "6a5ca0652392a2d7c9db2ae5b40210843c0bbc081cbd410825ab00cc59f14a6c-libpng-1.6.43.tar.xz"; } { - name = "tiff-4.6.0.tar.xz"; - url = "https://dev-www.libreoffice.org/src/tiff-4.6.0.tar.xz"; - sha256 = "e178649607d1e22b51cf361dd20a3753f244f022eefab1f2f218fc62ebaf87d2"; + name = "tiff-4.6.0t.tar.xz"; + url = "https://dev-www.libreoffice.org/src/tiff-4.6.0t.tar.xz"; + sha256 = "d6da35c9986a4ec845eb96258b3693f8df515f7eb4c1e597ceb03e22788f305b"; md5 = ""; - md5name = "e178649607d1e22b51cf361dd20a3753f244f022eefab1f2f218fc62ebaf87d2-tiff-4.6.0.tar.xz"; + md5name = "d6da35c9986a4ec845eb96258b3693f8df515f7eb4c1e597ceb03e22788f305b-tiff-4.6.0t.tar.xz"; } { - name = "poppler-23.09.0.tar.xz"; - url = "https://dev-www.libreoffice.org/src/poppler-23.09.0.tar.xz"; - sha256 = "80d1d44dd8bdf4ac1a47d56c5065075eb9991790974b1ed7d14b972acde88e55"; + name = "poppler-24.06.0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/poppler-24.06.0.tar.xz"; + sha256 = "0cdabd495cada11f6ee9e75c793f80daf46367b66c25a63ee8c26d0f9ec40c76"; md5 = ""; - md5name = "80d1d44dd8bdf4ac1a47d56c5065075eb9991790974b1ed7d14b972acde88e55-poppler-23.09.0.tar.xz"; + md5name = "0cdabd495cada11f6ee9e75c793f80daf46367b66c25a63ee8c26d0f9ec40c76-poppler-24.06.0.tar.xz"; } { name = "poppler-data-0.4.12.tar.gz"; @@ -805,18 +805,18 @@ md5name = "c835b640a40ce357e1b83666aabd95edffa24ddddd49b8daff63adb851cdab74-poppler-data-0.4.12.tar.gz"; } { - name = "postgresql-13.14.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/postgresql-13.14.tar.bz2"; - sha256 = "b8df078551898960bd500dc5d38a177e9905376df81fe7f2b660a1407fa6a5ed"; + name = "postgresql-13.15.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/postgresql-13.15.tar.bz2"; + sha256 = "42edd415446d33b8c242be76d1ad057531b2264b2e86939339b7075c6e4ec925"; md5 = ""; - md5name = "b8df078551898960bd500dc5d38a177e9905376df81fe7f2b660a1407fa6a5ed-postgresql-13.14.tar.bz2"; + md5name = "42edd415446d33b8c242be76d1ad057531b2264b2e86939339b7075c6e4ec925-postgresql-13.15.tar.bz2"; } { - name = "Python-3.8.19.tar.xz"; - url = "https://dev-www.libreoffice.org/src/Python-3.8.19.tar.xz"; - sha256 = "d2807ac69f69b84fd46a0b93bbd02a4fa48d3e70f4b2835ff0f72a2885040076"; + name = "Python-3.9.19.tar.xz"; + url = "https://dev-www.libreoffice.org/src/Python-3.9.19.tar.xz"; + sha256 = "d4892cd1618f6458cb851208c030df1482779609d0f3939991bd38184f8c679e"; md5 = ""; - md5name = "d2807ac69f69b84fd46a0b93bbd02a4fa48d3e70f4b2835ff0f72a2885040076-Python-3.8.19.tar.xz"; + md5name = "d4892cd1618f6458cb851208c030df1482779609d0f3939991bd38184f8c679e-Python-3.9.19.tar.xz"; } { name = "libqxp-0.0.2.tar.xz"; @@ -847,18 +847,18 @@ md5name = "e5be03eda13ef68aabab6e42aa67715e-redland-1.0.17.tar.gz"; } { - name = "librevenge-0.0.4.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/librevenge-0.0.4.tar.bz2"; - sha256 = "c51601cd08320b75702812c64aae0653409164da7825fd0f451ac2c5dbe77cbf"; + name = "librevenge-0.0.5.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/librevenge-0.0.5.tar.bz2"; + sha256 = "5892ca6796f7a2a93d580832e907e849b19d980b40d326a283b18877ab6de0c5"; md5 = ""; - md5name = "c51601cd08320b75702812c64aae0653409164da7825fd0f451ac2c5dbe77cbf-librevenge-0.0.4.tar.bz2"; + md5name = "5892ca6796f7a2a93d580832e907e849b19d980b40d326a283b18877ab6de0c5-librevenge-0.0.5.tar.bz2"; } { - name = "rhino1_5R5.zip"; - url = "https://dev-www.libreoffice.org/src/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip"; - sha256 = "1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753"; - md5 = "798b2ffdc8bcfe7bca2cf92b62caf685"; - md5name = "798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip"; + name = "rhino-1.7.14.zip"; + url = "https://dev-www.libreoffice.org/src/rhino-1.7.14.zip"; + sha256 = "bf4d2d0c5ff8889fd494486db09291cb7965f0bf2f93ef005d3b08070a5a4f5c"; + md5 = ""; + md5name = "bf4d2d0c5ff8889fd494486db09291cb7965f0bf2f93ef005d3b08070a5a4f5c-rhino-1.7.14.zip"; } { name = "skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz"; @@ -875,13 +875,6 @@ md5name = "f94fb0ad8216f97127bedef163a45886b43c62deac5e5b0f5e628e234220c8db-libstaroffice-0.0.7.tar.xz"; } { - name = "swingExSrc.zip"; - url = "https://dev-www.libreoffice.org/src/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip"; - sha256 = "64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1"; - md5 = "35c94d2df8893241173de1d16b6034c0"; - md5name = "35c94d2df8893241173de1d16b6034c0-swingExSrc.zip"; - } - { name = "twaindsm_2.4.1.orig.tar.gz"; url = "https://dev-www.libreoffice.org/src/twaindsm_2.4.1.orig.tar.gz"; sha256 = "82c818be771f242388457aa8c807e4b52aa84dc22b21c6c56184a6b4cbb085e6"; @@ -945,10 +938,10 @@ md5name = "77d6c6ecb35952a8d8ce7f736b7a2bf466275c48210e309b73782d6b7e84dffd-zxcvbn-c-2.5.tar.gz"; } { - name = "zxing-cpp-2.1.0.tar.gz"; - url = "https://dev-www.libreoffice.org/src/zxing-cpp-2.1.0.tar.gz"; - sha256 = "6d54e403592ec7a143791c6526c1baafddf4c0897bb49b1af72b70a0f0c4a3fe"; + name = "zxing-cpp-2.2.1.tar.gz"; + url = "https://dev-www.libreoffice.org/src/zxing-cpp-2.2.1.tar.gz"; + sha256 = "02078ae15f19f9d423a441f205b1d1bee32349ddda7467e2c84e8f08876f8635"; md5 = ""; - md5name = "6d54e403592ec7a143791c6526c1baafddf4c0897bb49b1af72b70a0f0c4a3fe-zxing-cpp-2.1.0.tar.gz"; + md5name = "02078ae15f19f9d423a441f205b1d1bee32349ddda7467e2c84e8f08876f8635-zxing-cpp-2.2.1.tar.gz"; } ] diff --git a/pkgs/applications/office/libreoffice/src-fresh/help.nix b/pkgs/applications/office/libreoffice/src-fresh/help.nix index a2ccc9be28ac6..2a807c3615951 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/help.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/help.nix @@ -1,4 +1,5 @@ -{ - sha256 = "0sxvc6raij7rd8n0rg8pg61ppxlpvsx1i551hs53x972156cz2lf"; - url = "https://download.documentfoundation.org/libreoffice/src/24.2.3/libreoffice-help-24.2.3.2.tar.xz"; +{ fetchurl, ... }: +fetchurl { + sha256 = "1vbi2qbap3ccychc0sfn32z46klyzjh0hhk4in0sd7qkl97y6lvn"; + url = "https://download.documentfoundation.org/libreoffice/src/24.8.0/libreoffice-help-24.8.0.3.tar.xz"; } diff --git a/pkgs/applications/office/libreoffice/src-fresh/main.nix b/pkgs/applications/office/libreoffice/src-fresh/main.nix index 7aa7e08105695..2bbbb6b3b0c29 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/main.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/main.nix @@ -1,4 +1,5 @@ -{ - sha256 = "0r0y92c7i42iiimzg9b1pyldnswh28j8p0lmilz7j1sxv2f0bqpn"; - url = "https://download.documentfoundation.org/libreoffice/src/24.2.3/libreoffice-24.2.3.2.tar.xz"; +{ fetchurl, ... }: +fetchurl { + sha256 = "1hbqgpgih3j9ic1dljxz3mz0rsjf0iyws7qm7g1hb35ns664c4av"; + url = "https://download.documentfoundation.org/libreoffice/src/24.8.0/libreoffice-24.8.0.3.tar.xz"; } diff --git a/pkgs/applications/office/libreoffice/src-fresh/translations.nix b/pkgs/applications/office/libreoffice/src-fresh/translations.nix index 42740ef1243db..d5890a86e2cbb 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/translations.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/translations.nix @@ -1,4 +1,5 @@ -{ - sha256 = "0jibmsghr9719nmq6w2m947g4arc8dl3wrj5yyg0fy8znnim6477"; - url = "https://download.documentfoundation.org/libreoffice/src/24.2.3/libreoffice-translations-24.2.3.2.tar.xz"; +{ fetchurl, ... }: +fetchurl { + sha256 = "0p75xijrmp44kcda33xg5dr06xl1fcxwhxgvlcj396rkn2k0c9sy"; + url = "https://download.documentfoundation.org/libreoffice/src/24.8.0/libreoffice-translations-24.8.0.3.tar.xz"; } diff --git a/pkgs/applications/office/libreoffice/src-fresh/version.nix b/pkgs/applications/office/libreoffice/src-fresh/version.nix index 8996537117f8e..e6bf645f80826 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/version.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/version.nix @@ -1 +1 @@ -"24.2.3.2" +"24.8.0.3" diff --git a/pkgs/applications/office/libreoffice/src-still/deps.nix b/pkgs/applications/office/libreoffice/src-still/deps.nix index f9fa8532b3362..d9ef29364fc84 100644 --- a/pkgs/applications/office/libreoffice/src-still/deps.nix +++ b/pkgs/applications/office/libreoffice/src-still/deps.nix @@ -7,6 +7,13 @@ md5name = "e763a9dc21c3d2667402d66e202e3f8ef4db51b34b79ef41f56cacb86dcd6eed-libabw-0.1.3.tar.xz"; } { + name = "phc-winner-argon2-20190702.tar.gz"; + url = "https://dev-www.libreoffice.org/src/phc-winner-argon2-20190702.tar.gz"; + sha256 = "daf972a89577f8772602bf2eb38b6a3dd3d922bf5724d45e7f9589b5e830442c"; + md5 = ""; + md5name = "daf972a89577f8772602bf2eb38b6a3dd3d922bf5724d45e7f9589b5e830442c-phc-winner-argon2-20190702.tar.gz"; + } + { name = "boost_1_82_0.tar.xz"; url = "https://dev-www.libreoffice.org/src/boost_1_82_0.tar.xz"; sha256 = "e48ab6953fbd68ba47234bea5173e62427e9f6a7894e152305142895cfe955de"; @@ -84,11 +91,11 @@ md5name = "d54d19d86153dbc88e2d468f7136269a2cfe71b73227e12fded01d29ac268074-libcmis-0.6.1.tar.xz"; } { - name = "CoinMP-1.7.6.tgz"; - url = "https://dev-www.libreoffice.org/src/CoinMP-1.7.6.tgz"; - sha256 = "86c798780b9e1f5921fe4efe651a93cb420623b45aa1fdff57af8c37f116113f"; + name = "CoinMP-1.8.4.tgz"; + url = "https://dev-www.libreoffice.org/src/CoinMP-1.8.4.tgz"; + sha256 = "3459fb0ccbdd39342744684338984ac4cc153fb0434f4cae8cf74bd67490a38d"; md5 = ""; - md5name = "86c798780b9e1f5921fe4efe651a93cb420623b45aa1fdff57af8c37f116113f-CoinMP-1.7.6.tgz"; + md5name = "3459fb0ccbdd39342744684338984ac4cc153fb0434f4cae8cf74bd67490a38d-CoinMP-1.8.4.tgz"; } { name = "cppunit-1.15.1.tar.gz"; @@ -98,11 +105,11 @@ md5name = "89c5c6665337f56fd2db36bc3805a5619709d51fb136e51937072f63fcc717a7-cppunit-1.15.1.tar.gz"; } { - name = "curl-8.6.0.tar.xz"; - url = "https://dev-www.libreoffice.org/src/curl-8.6.0.tar.xz"; - sha256 = "3ccd55d91af9516539df80625f818c734dc6f2ecf9bada33c76765e99121db15"; + name = "curl-8.7.1.tar.xz"; + url = "https://dev-www.libreoffice.org/src/curl-8.7.1.tar.xz"; + sha256 = "6fea2aac6a4610fbd0400afb0bcddbe7258a64c63f1f68e5855ebc0c659710cd"; md5 = ""; - md5name = "3ccd55d91af9516539df80625f818c734dc6f2ecf9bada33c76765e99121db15-curl-8.6.0.tar.xz"; + md5name = "6fea2aac6a4610fbd0400afb0bcddbe7258a64c63f1f68e5855ebc0c659710cd-curl-8.7.1.tar.xz"; } { name = "libe-book-0.1.3.tar.xz"; @@ -210,11 +217,102 @@ md5name = "e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip"; } { - name = "noto-fonts-20171024.tar.gz"; - url = "https://dev-www.libreoffice.org/src/noto-fonts-20171024.tar.gz"; - sha256 = "29acc15a4c4d6b51201ba5d60f303dfbc2e5acbfdb70413c9ae1ed34fa259994"; + name = "NotoKufiArabic-v2.109.zip"; + url = "https://dev-www.libreoffice.org/src/NotoKufiArabic-v2.109.zip"; + sha256 = "1b6880e4b8df09c3b9e246d6084bfd94bf32a0ffff60cf2dcffd3622d0e2d79f"; + md5 = ""; + md5name = "1b6880e4b8df09c3b9e246d6084bfd94bf32a0ffff60cf2dcffd3622d0e2d79f-NotoKufiArabic-v2.109.zip"; + } + { + name = "NotoSans-v2.012.zip"; + url = "https://dev-www.libreoffice.org/src/NotoSans-v2.012.zip"; + sha256 = "efef2f66ed2c5e005472cba156bd2afb68063a51bb628c6ee14143edc019d293"; + md5 = ""; + md5name = "efef2f66ed2c5e005472cba156bd2afb68063a51bb628c6ee14143edc019d293-NotoSans-v2.012.zip"; + } + { + name = "NotoSerif-v2.012.zip"; + url = "https://dev-www.libreoffice.org/src/NotoSerif-v2.012.zip"; + sha256 = "3d4566a0e51e7fc14528f5a1eecc6f12e5ffbbec6484470d3da48b0d8ead345a"; + md5 = ""; + md5name = "3d4566a0e51e7fc14528f5a1eecc6f12e5ffbbec6484470d3da48b0d8ead345a-NotoSerif-v2.012.zip"; + } + { + name = "NotoSerifHebrew-v2.004.zip"; + url = "https://dev-www.libreoffice.org/src/NotoSerifHebrew-v2.004.zip"; + sha256 = "99523f4f21051495f18cbd5169ed0d1e9b395eefe770fece1844a4a7a00c46da"; + md5 = ""; + md5name = "99523f4f21051495f18cbd5169ed0d1e9b395eefe770fece1844a4a7a00c46da-NotoSerifHebrew-v2.004.zip"; + } + { + name = "NotoSansArabic-v2.010.zip"; + url = "https://dev-www.libreoffice.org/src/NotoSansArabic-v2.010.zip"; + sha256 = "a5a34ac1ea01d0d71c083f99440ebfb1f64224474a0d88bb7ef0e2f8d9a996d2"; + md5 = ""; + md5name = "a5a34ac1ea01d0d71c083f99440ebfb1f64224474a0d88bb7ef0e2f8d9a996d2-NotoSansArabic-v2.010.zip"; + } + { + name = "NotoNaskhArabic-v2.019.zip"; + url = "https://dev-www.libreoffice.org/src/NotoNaskhArabic-v2.019.zip"; + sha256 = "7a509e10c9c8d21f384a26807ef2f5fbbecec46fdb8626c5441bed6d894edb81"; + md5 = ""; + md5name = "7a509e10c9c8d21f384a26807ef2f5fbbecec46fdb8626c5441bed6d894edb81-NotoNaskhArabic-v2.019.zip"; + } + { + name = "NotoSansHebrew-v3.001.zip"; + url = "https://dev-www.libreoffice.org/src/NotoSansHebrew-v3.001.zip"; + sha256 = "df0a71814b4e63644cf40fcc4529111b61266b7a2dafbe95068b29a7520cc3cb"; + md5 = ""; + md5name = "df0a71814b4e63644cf40fcc4529111b61266b7a2dafbe95068b29a7520cc3cb-NotoSansHebrew-v3.001.zip"; + } + { + name = "NotoSansArmenian-v2.008.zip"; + url = "https://dev-www.libreoffice.org/src/NotoSansArmenian-v2.008.zip"; + sha256 = "eab89b99e134177ca6a3f9f0412a7cb812aafceb13175d686b4c45cb237f64ac"; + md5 = ""; + md5name = "eab89b99e134177ca6a3f9f0412a7cb812aafceb13175d686b4c45cb237f64ac-NotoSansArmenian-v2.008.zip"; + } + { + name = "NotoSerifArmenian-v2.008.zip"; + url = "https://dev-www.libreoffice.org/src/NotoSerifArmenian-v2.008.zip"; + sha256 = "b21c198a4c76ae598a304decefb3b5c2a4c2d4c3ae226728eff359185f291c6f"; md5 = ""; - md5name = "29acc15a4c4d6b51201ba5d60f303dfbc2e5acbfdb70413c9ae1ed34fa259994-noto-fonts-20171024.tar.gz"; + md5name = "b21c198a4c76ae598a304decefb3b5c2a4c2d4c3ae226728eff359185f291c6f-NotoSerifArmenian-v2.008.zip"; + } + { + name = "NotoSansGeorgian-v2.003.zip"; + url = "https://dev-www.libreoffice.org/src/NotoSansGeorgian-v2.003.zip"; + sha256 = "bd75d1f0b9ef619b5ded0018d6258eeab2f9e976d8f8074bb7890f4e301648bf"; + md5 = ""; + md5name = "bd75d1f0b9ef619b5ded0018d6258eeab2f9e976d8f8074bb7890f4e301648bf-NotoSansGeorgian-v2.003.zip"; + } + { + name = "NotoSerifGeorgian-v2.003.zip"; + url = "https://dev-www.libreoffice.org/src/NotoSerifGeorgian-v2.003.zip"; + sha256 = "cfb41a264b97d463bab6807a5be937ba4a6ddcfa93d519a21b98b0ba73ca27d4"; + md5 = ""; + md5name = "cfb41a264b97d463bab6807a5be937ba4a6ddcfa93d519a21b98b0ba73ca27d4-NotoSerifGeorgian-v2.003.zip"; + } + { + name = "NotoSansLao-v2.003.zip"; + url = "https://dev-www.libreoffice.org/src/NotoSansLao-v2.003.zip"; + sha256 = "5a87c31b1a40ef8147c1e84437e5f0ceba2d4dbbfc0b56a65821ad29870da8c0"; + md5 = ""; + md5name = "5a87c31b1a40ef8147c1e84437e5f0ceba2d4dbbfc0b56a65821ad29870da8c0-NotoSansLao-v2.003.zip"; + } + { + name = "NotoSerifLao-v2.003.zip"; + url = "https://dev-www.libreoffice.org/src/NotoSerifLao-v2.003.zip"; + sha256 = "e96a303d3347790b0ef3db274971a989a736ce766ec9ea1bea0e1458568a80b2"; + md5 = ""; + md5name = "e96a303d3347790b0ef3db274971a989a736ce766ec9ea1bea0e1458568a80b2-NotoSerifLao-v2.003.zip"; + } + { + name = "NotoSansLisu-v2.102.zip"; + url = "https://dev-www.libreoffice.org/src/NotoSansLisu-v2.102.zip"; + sha256 = "b12a1ff762680681b7ce4d98dd29a7f54d90f5bcadd10c955afc640a27b3a268"; + md5 = ""; + md5name = "b12a1ff762680681b7ce4d98dd29a7f54d90f5bcadd10c955afc640a27b3a268-NotoSansLisu-v2.102.zip"; } { name = "culmus-0.133.tar.gz"; @@ -287,11 +385,11 @@ md5name = "6bba5f032bed47c73ad9397f2313b9acbfb56253d0d0576b5873d3dcb25e99ad-glm-0.9.9.8.zip"; } { - name = "gpgme-1.18.0.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/gpgme-1.18.0.tar.bz2"; - sha256 = "361d4eae47ce925dba0ea569af40e7b52c645c4ae2e65e5621bf1b6cdd8b0e9e"; + name = "gpgme-1.23.2.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/gpgme-1.23.2.tar.bz2"; + sha256 = "9499e8b1f33cccb6815527a1bc16049d35a6198a6c5fae0185f2bd561bce5224"; md5 = ""; - md5name = "361d4eae47ce925dba0ea569af40e7b52c645c4ae2e65e5621bf1b6cdd8b0e9e-gpgme-1.18.0.tar.bz2"; + md5name = "9499e8b1f33cccb6815527a1bc16049d35a6198a6c5fae0185f2bd561bce5224-gpgme-1.23.2.tar.bz2"; } { name = "graphite2-minimal-1.3.14.tgz"; @@ -329,6 +427,13 @@ md5name = "5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz"; } { + name = "IAccessible2-1.3+git20231013.3d8c7f0.tar.gz"; + url = "https://dev-www.libreoffice.org/src/IAccessible2-1.3+git20231013.3d8c7f0.tar.gz"; + sha256 = "0e279003f5199f80031c6dcd08f79d6f65a0505139160e7df0d09b226bff4023"; + md5 = ""; + md5name = "0e279003f5199f80031c6dcd08f79d6f65a0505139160e7df0d09b226bff4023-IAccessible2-1.3+git20231013.3d8c7f0.tar.gz"; + } + { name = "icu4c-73_2-src.tgz"; url = "https://dev-www.libreoffice.org/src/icu4c-73_2-src.tgz"; sha256 = "818a80712ed3caacd9b652305e01afc7fa167e6f2e94996da44b90c2ab604ce1"; @@ -343,6 +448,13 @@ md5name = "ca1ee076163b438461e484421a7679fc33a64cd0a54f9d4b401893fa1eb42701-icu4c-73_2-data.zip"; } { + name = "Java-WebSocket-1.5.4.tar.gz"; + url = "https://dev-www.libreoffice.org/src/Java-WebSocket-1.5.4.tar.gz"; + sha256 = "a6828b35d1f938fee2335945f3d3c563cbbfa58ce7eb0bf72778d0fa7a550720"; + md5 = ""; + md5name = "a6828b35d1f938fee2335945f3d3c563cbbfa58ce7eb0bf72778d0fa7a550720-Java-WebSocket-1.5.4.tar.gz"; + } + { name = "flow-engine-0.9.4.zip"; url = "https://dev-www.libreoffice.org/src/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip"; sha256 = "233f66e8d25c5dd971716d4200203a612a407649686ef3b52075d04b4c9df0dd"; @@ -427,32 +539,32 @@ md5name = "2fdc3feb6e9deb17adec9bafa3321419aa19f8f4e5dea7bf8486844ca22207bf-libjpeg-turbo-2.1.5.1.tar.gz"; } { - name = "language-subtag-registry-2023-08-02.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2023-08-02.tar.bz2"; - sha256 = "59fdc026b5088e7947e1e6add482d2a40e1f7e25c50f198b456954216462c2eb"; + name = "language-subtag-registry-2024-06-14.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2024-06-14.tar.bz2"; + sha256 = "75bc394dd83ddfd62b172a462db1b66bdb5950f40823ed63b8c7db6b71e37e75"; md5 = ""; - md5name = "59fdc026b5088e7947e1e6add482d2a40e1f7e25c50f198b456954216462c2eb-language-subtag-registry-2023-08-02.tar.bz2"; + md5name = "75bc394dd83ddfd62b172a462db1b66bdb5950f40823ed63b8c7db6b71e37e75-language-subtag-registry-2024-06-14.tar.bz2"; } { - name = "lcms2-2.12.tar.gz"; - url = "https://dev-www.libreoffice.org/src/lcms2-2.12.tar.gz"; - sha256 = "18663985e864100455ac3e507625c438c3710354d85e5cbb7cd4043e11fe10f5"; + name = "lcms2-2.16.tar.gz"; + url = "https://dev-www.libreoffice.org/src/lcms2-2.16.tar.gz"; + sha256 = "d873d34ad8b9b4cea010631f1a6228d2087475e4dc5e763eb81acc23d9d45a51"; md5 = ""; - md5name = "18663985e864100455ac3e507625c438c3710354d85e5cbb7cd4043e11fe10f5-lcms2-2.12.tar.gz"; + md5name = "d873d34ad8b9b4cea010631f1a6228d2087475e4dc5e763eb81acc23d9d45a51-lcms2-2.16.tar.gz"; } { - name = "libassuan-2.5.6.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/libassuan-2.5.6.tar.bz2"; - sha256 = "e9fd27218d5394904e4e39788f9b1742711c3e6b41689a31aa3380bd5aa4f426"; + name = "libassuan-2.5.7.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/libassuan-2.5.7.tar.bz2"; + sha256 = "0103081ffc27838a2e50479153ca105e873d3d65d8a9593282e9c94c7e6afb76"; md5 = ""; - md5name = "e9fd27218d5394904e4e39788f9b1742711c3e6b41689a31aa3380bd5aa4f426-libassuan-2.5.6.tar.bz2"; + md5name = "0103081ffc27838a2e50479153ca105e873d3d65d8a9593282e9c94c7e6afb76-libassuan-2.5.7.tar.bz2"; } { - name = "libatomic_ops-7.6.8.tar.gz"; - url = "https://dev-www.libreoffice.org/src/libatomic_ops-7.6.8.tar.gz"; - sha256 = "1d6a279edf81767e74d2ad2c9fce09459bc65f12c6525a40b0cb3e53c089f665"; + name = "libatomic_ops-7.8.0.tar.gz"; + url = "https://dev-www.libreoffice.org/src/libatomic_ops-7.8.0.tar.gz"; + sha256 = "15676e7674e11bda5a7e50a73f4d9e7d60452271b8acf6fd39a71fefdf89fa31"; md5 = ""; - md5name = "1d6a279edf81767e74d2ad2c9fce09459bc65f12c6525a40b0cb3e53c089f665-libatomic_ops-7.6.8.tar.gz"; + md5name = "15676e7674e11bda5a7e50a73f4d9e7d60452271b8acf6fd39a71fefdf89fa31-libatomic_ops-7.8.0.tar.gz"; } { name = "libeot-0.01.tar.bz2"; @@ -476,11 +588,11 @@ md5name = "d66c56ad259a82cf2a9dfc408b32bf5da52371500b84745f7fb8b645712df676-libffi-3.4.4.tar.gz"; } { - name = "libgpg-error-1.43.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/libgpg-error-1.43.tar.bz2"; - sha256 = "a9ab83ca7acc442a5bd846a75b920285ff79bdb4e3d34aa382be88ed2c3aebaf"; + name = "libgpg-error-1.48.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/libgpg-error-1.48.tar.bz2"; + sha256 = "89ce1ae893e122924b858de84dc4f67aae29ffa610ebf668d5aa539045663d6f"; md5 = ""; - md5name = "a9ab83ca7acc442a5bd846a75b920285ff79bdb4e3d34aa382be88ed2c3aebaf-libgpg-error-1.43.tar.bz2"; + md5name = "89ce1ae893e122924b858de84dc4f67aae29ffa610ebf668d5aa539045663d6f-libgpg-error-1.48.tar.bz2"; } { name = "liblangtag-0.6.7.tar.bz2"; @@ -497,11 +609,11 @@ md5name = "5dcb4db3b2340f81f601ce86d8d76b69e34d70f84f804192c901e4b7f84d5fb0-libnumbertext-1.0.11.tar.xz"; } { - name = "ltm-1.2.1.tar.xz"; - url = "https://dev-www.libreoffice.org/src/ltm-1.2.1.tar.xz"; - sha256 = "986025d7b374276fee2e30e99f3649e4ac0db8a02257a37ee10eae72abed0d1f"; + name = "ltm-1.3.0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/ltm-1.3.0.tar.xz"; + sha256 = "296272d93435991308eb73607600c034b558807a07e829e751142e65ccfa9d08"; md5 = ""; - md5name = "986025d7b374276fee2e30e99f3649e4ac0db8a02257a37ee10eae72abed0d1f-ltm-1.2.1.tar.xz"; + md5name = "296272d93435991308eb73607600c034b558807a07e829e751142e65ccfa9d08-ltm-1.3.0.tar.xz"; } { name = "libwebp-1.3.2.tar.gz"; @@ -511,18 +623,18 @@ md5name = "2a499607df669e40258e53d0ade8035ba4ec0175244869d1025d460562aa09b4-libwebp-1.3.2.tar.gz"; } { - name = "xmlsec1-1.2.37.tar.gz"; - url = "https://dev-www.libreoffice.org/src/xmlsec1-1.2.37.tar.gz"; - sha256 = "5f8dfbcb6d1e56bddd0b5ec2e00a3d0ca5342a9f57c24dffde5c796b2be2871c"; + name = "xmlsec1-1.3.2.tar.gz"; + url = "https://dev-www.libreoffice.org/src/xmlsec1-1.3.2.tar.gz"; + sha256 = "4003c56b3d356d21b1db7775318540fad6bfedaf5f117e8f7c010811219be3cf"; md5 = ""; - md5name = "5f8dfbcb6d1e56bddd0b5ec2e00a3d0ca5342a9f57c24dffde5c796b2be2871c-xmlsec1-1.2.37.tar.gz"; + md5name = "4003c56b3d356d21b1db7775318540fad6bfedaf5f117e8f7c010811219be3cf-xmlsec1-1.3.2.tar.gz"; } { - name = "libxml2-2.12.5.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libxml2-2.12.5.tar.xz"; - sha256 = "a972796696afd38073e0f59c283c3a2f5a560b5268b4babc391b286166526b21"; + name = "libxml2-2.12.8.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libxml2-2.12.8.tar.xz"; + sha256 = "43ad877b018bc63deb2468d71f95219c2fac196876ef36d1bee51d226173ec93"; md5 = ""; - md5name = "a972796696afd38073e0f59c283c3a2f5a560b5268b4babc391b286166526b21-libxml2-2.12.5.tar.xz"; + md5name = "43ad877b018bc63deb2468d71f95219c2fac196876ef36d1bee51d226173ec93-libxml2-2.12.8.tar.xz"; } { name = "libxslt-1.1.39.tar.xz"; @@ -539,18 +651,18 @@ md5name = "26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz"; } { - name = "lxml-4.1.1.tgz"; - url = "https://dev-www.libreoffice.org/src/lxml-4.1.1.tgz"; - sha256 = "940caef1ec7c78e0c34b0f6b94fe42d0f2022915ffc78643d28538a5cfd0f40e"; + name = "lxml-4.9.2.tgz"; + url = "https://dev-www.libreoffice.org/src/lxml-4.9.2.tgz"; + sha256 = "2455cfaeb7ac70338b3257f41e21f0724f4b5b0c0e7702da67ee6c3640835b67"; md5 = ""; - md5name = "940caef1ec7c78e0c34b0f6b94fe42d0f2022915ffc78643d28538a5cfd0f40e-lxml-4.1.1.tgz"; + md5name = "2455cfaeb7ac70338b3257f41e21f0724f4b5b0c0e7702da67ee6c3640835b67-lxml-4.9.2.tgz"; } { - name = "mariadb-connector-c-3.3.7-src.tar.gz"; - url = "https://dev-www.libreoffice.org/src/mariadb-connector-c-3.3.7-src.tar.gz"; - sha256 = "975a9a862fed80f84e0206373f7ef05537aada5b65d99b71b36ab892b44240bf"; + name = "mariadb-connector-c-3.3.8-src.tar.gz"; + url = "https://dev-www.libreoffice.org/src/mariadb-connector-c-3.3.8-src.tar.gz"; + sha256 = "f9f076b4aa9fb22cc94b24f82c80f9ef063805ecd6533a2eb5d5060cf93833e8"; md5 = ""; - md5name = "975a9a862fed80f84e0206373f7ef05537aada5b65d99b71b36ab892b44240bf-mariadb-connector-c-3.3.7-src.tar.gz"; + md5name = "f9f076b4aa9fb22cc94b24f82c80f9ef063805ecd6533a2eb5d5060cf93833e8-mariadb-connector-c-3.3.8-src.tar.gz"; } { name = "mdds-2.1.1.tar.xz"; @@ -588,11 +700,11 @@ md5name = "19279f70707bbe5ffa619f2dc319f888cec0c4a8d339dc0a21330517bd6f521d-mythes-1.2.5.tar.xz"; } { - name = "nss-3.98-with-nspr-4.35.tar.gz"; - url = "https://dev-www.libreoffice.org/src/nss-3.98-with-nspr-4.35.tar.gz"; - sha256 = "59bb55a59b02e4004fc26ad0aa1a13fe8d73c6c90c447dd2f2efb73fb81083ed"; + name = "nss-3.99-with-nspr-4.35.tar.gz"; + url = "https://dev-www.libreoffice.org/src/nss-3.99-with-nspr-4.35.tar.gz"; + sha256 = "5f29fea64b3234b33a615b6df40469e239a4168ac0909106bd00e6490b274c31"; md5 = ""; - md5name = "59bb55a59b02e4004fc26ad0aa1a13fe8d73c6c90c447dd2f2efb73fb81083ed-nss-3.98-with-nspr-4.35.tar.gz"; + md5name = "5f29fea64b3234b33a615b6df40469e239a4168ac0909106bd00e6490b274c31-nss-3.99-with-nspr-4.35.tar.gz"; } { name = "libodfgen-0.1.8.tar.xz"; @@ -616,18 +728,25 @@ md5name = "8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar"; } { - name = "openldap-2.6.6.tgz"; - url = "https://dev-www.libreoffice.org/src/openldap-2.6.6.tgz"; - sha256 = "082e998cf542984d43634442dbe11da860759e510907152ea579bdc42fe39ea0"; + name = "onlineupdate-c003be8b9727672e7d30972983b375f4c200233f-2.tar.xz"; + url = "https://dev-www.libreoffice.org/src/onlineupdate-c003be8b9727672e7d30972983b375f4c200233f-2.tar.xz"; + sha256 = "37206cf981e8409d048b59ac5839621ea107ff49af72beb9d7769a2f41da8d90"; md5 = ""; - md5name = "082e998cf542984d43634442dbe11da860759e510907152ea579bdc42fe39ea0-openldap-2.6.6.tgz"; + md5name = "37206cf981e8409d048b59ac5839621ea107ff49af72beb9d7769a2f41da8d90-onlineupdate-c003be8b9727672e7d30972983b375f4c200233f-2.tar.xz"; } { - name = "openssl-3.0.13.tar.gz"; - url = "https://dev-www.libreoffice.org/src/openssl-3.0.13.tar.gz"; - sha256 = "88525753f79d3bec27d2fa7c66aa0b92b3aa9498dafd93d7cfa4b3780cdae313"; + name = "openldap-2.6.7.tgz"; + url = "https://dev-www.libreoffice.org/src/openldap-2.6.7.tgz"; + sha256 = "cd775f625c944ed78a3da18a03b03b08eea73c8aabc97b41bb336e9a10954930"; md5 = ""; - md5name = "88525753f79d3bec27d2fa7c66aa0b92b3aa9498dafd93d7cfa4b3780cdae313-openssl-3.0.13.tar.gz"; + md5name = "cd775f625c944ed78a3da18a03b03b08eea73c8aabc97b41bb336e9a10954930-openldap-2.6.7.tgz"; + } + { + name = "openssl-3.0.14.tar.gz"; + url = "https://dev-www.libreoffice.org/src/openssl-3.0.14.tar.gz"; + sha256 = "eeca035d4dd4e84fc25846d952da6297484afa0650a6f84c682e39df3a4123ca"; + md5 = ""; + md5name = "eeca035d4dd4e84fc25846d952da6297484afa0650a6f84c682e39df3a4123ca-openssl-3.0.14.tar.gz"; } { name = "liborcus-0.19.2.tar.xz"; @@ -644,11 +763,11 @@ md5name = "66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d-libpagemaker-0.0.4.tar.xz"; } { - name = "pdfium-5778.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/pdfium-5778.tar.bz2"; - sha256 = "b1052ff24e9ffb11af017c444bb0f6ad508d64c9a0fb88cacb0e8210245dde06"; + name = "pdfium-6179.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/pdfium-6179.tar.bz2"; + sha256 = "4d3f08fe0e2fda86246832085426616826dcca0912202874428bfbc24d13d95c"; md5 = ""; - md5name = "b1052ff24e9ffb11af017c444bb0f6ad508d64c9a0fb88cacb0e8210245dde06-pdfium-5778.tar.bz2"; + md5name = "4d3f08fe0e2fda86246832085426616826dcca0912202874428bfbc24d13d95c-pdfium-6179.tar.bz2"; } { name = "pixman-0.42.2.tar.gz"; @@ -658,11 +777,11 @@ md5name = "ea1480efada2fd948bc75366f7c349e1c96d3297d09a3fe62626e38e234a625e-pixman-0.42.2.tar.gz"; } { - name = "libpng-1.6.40.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libpng-1.6.40.tar.xz"; - sha256 = "535b479b2467ff231a3ec6d92a525906fb8ef27978be4f66dbe05d3f3a01b3a1"; + name = "libpng-1.6.43.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libpng-1.6.43.tar.xz"; + sha256 = "6a5ca0652392a2d7c9db2ae5b40210843c0bbc081cbd410825ab00cc59f14a6c"; md5 = ""; - md5name = "535b479b2467ff231a3ec6d92a525906fb8ef27978be4f66dbe05d3f3a01b3a1-libpng-1.6.40.tar.xz"; + md5name = "6a5ca0652392a2d7c9db2ae5b40210843c0bbc081cbd410825ab00cc59f14a6c-libpng-1.6.43.tar.xz"; } { name = "tiff-4.6.0.tar.xz"; @@ -742,11 +861,11 @@ md5name = "798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip"; } { - name = "skia-m111-a31e897fb3dcbc96b2b40999751611d029bf5404.tar.xz"; - url = "https://dev-www.libreoffice.org/src/skia-m111-a31e897fb3dcbc96b2b40999751611d029bf5404.tar.xz"; - sha256 = "0d08a99ed46cde43b5ad2672b5d8770c8eb85d0d26cb8f1f85fd9befe1e9ceb9"; + name = "skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz"; + url = "https://dev-www.libreoffice.org/src/skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz"; + sha256 = "2223ebce534458a37826e8fe4f24635b0712cde7ed1bd3208f089f6fdd796e01"; md5 = ""; - md5name = "0d08a99ed46cde43b5ad2672b5d8770c8eb85d0d26cb8f1f85fd9befe1e9ceb9-skia-m111-a31e897fb3dcbc96b2b40999751611d029bf5404.tar.xz"; + md5name = "2223ebce534458a37826e8fe4f24635b0712cde7ed1bd3208f089f6fdd796e01-skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz"; } { name = "libstaroffice-0.0.7.tar.xz"; @@ -819,10 +938,17 @@ md5name = "27051a30cb057fdb5d5de65a1f165c7153dc76e27fe62251cbb86639eb2caf22-libzmf-0.0.2.tar.xz"; } { - name = "zxing-cpp-2.0.0.tar.gz"; - url = "https://dev-www.libreoffice.org/src/zxing-cpp-2.0.0.tar.gz"; - sha256 = "12b76b7005c30d34265fc20356d340da179b0b4d43d2c1b35bcca86776069f76"; + name = "zxcvbn-c-2.5.tar.gz"; + url = "https://dev-www.libreoffice.org/src/zxcvbn-c-2.5.tar.gz"; + sha256 = "77d6c6ecb35952a8d8ce7f736b7a2bf466275c48210e309b73782d6b7e84dffd"; + md5 = ""; + md5name = "77d6c6ecb35952a8d8ce7f736b7a2bf466275c48210e309b73782d6b7e84dffd-zxcvbn-c-2.5.tar.gz"; + } + { + name = "zxing-cpp-2.1.0.tar.gz"; + url = "https://dev-www.libreoffice.org/src/zxing-cpp-2.1.0.tar.gz"; + sha256 = "6d54e403592ec7a143791c6526c1baafddf4c0897bb49b1af72b70a0f0c4a3fe"; md5 = ""; - md5name = "12b76b7005c30d34265fc20356d340da179b0b4d43d2c1b35bcca86776069f76-zxing-cpp-2.0.0.tar.gz"; + md5name = "6d54e403592ec7a143791c6526c1baafddf4c0897bb49b1af72b70a0f0c4a3fe-zxing-cpp-2.1.0.tar.gz"; } ] diff --git a/pkgs/applications/office/libreoffice/src-still/help.nix b/pkgs/applications/office/libreoffice/src-still/help.nix index f9e71ea799369..0f9f549052708 100644 --- a/pkgs/applications/office/libreoffice/src-still/help.nix +++ b/pkgs/applications/office/libreoffice/src-still/help.nix @@ -1,4 +1,5 @@ -{ - sha256 = "1l543k603mbr3rnwlnv9j52mblmvkgj9y49w4v7w3xm8b15331rs"; - url = "https://download.documentfoundation.org/libreoffice/src/7.6.7/libreoffice-help-7.6.7.2.tar.xz"; +{ fetchurl, ... }: +fetchurl { + sha256 = "090pi8dnj5izpvng94hgmjid14n7xvy3rlqqvang3pqdn35xnpsl"; + url = "https://download.documentfoundation.org/libreoffice/src/24.2.5/libreoffice-help-24.2.5.2.tar.xz"; } diff --git a/pkgs/applications/office/libreoffice/src-still/main.nix b/pkgs/applications/office/libreoffice/src-still/main.nix index 5706e610f3d00..69376e497a117 100644 --- a/pkgs/applications/office/libreoffice/src-still/main.nix +++ b/pkgs/applications/office/libreoffice/src-still/main.nix @@ -1,4 +1,5 @@ -{ - sha256 = "159vbv4zhibfd4xjdamcqs4h0p3h5y79kcjwrmshvjhs23p55l3m"; - url = "https://download.documentfoundation.org/libreoffice/src/7.6.7/libreoffice-7.6.7.2.tar.xz"; +{ fetchurl, ... }: +fetchurl { + sha256 = "03halzc9w4z8pfs8krpswp2qzrqq9rhnmms8v8ny88am87vy85lw"; + url = "https://download.documentfoundation.org/libreoffice/src/24.2.5/libreoffice-24.2.5.2.tar.xz"; } diff --git a/pkgs/applications/office/libreoffice/src-still/translations.nix b/pkgs/applications/office/libreoffice/src-still/translations.nix index 9604ad622e210..b969430601824 100644 --- a/pkgs/applications/office/libreoffice/src-still/translations.nix +++ b/pkgs/applications/office/libreoffice/src-still/translations.nix @@ -1,4 +1,5 @@ -{ - sha256 = "1bzmpa04bv8afhl3p68dlicamh0zyckmbdgqb3v72fjmx2h8i64a"; - url = "https://download.documentfoundation.org/libreoffice/src/7.6.7/libreoffice-translations-7.6.7.2.tar.xz"; +{ fetchurl, ... }: +fetchurl { + sha256 = "0fri41y59zhm8lq0kh6hvf5rpdjdqx0lg1sl40mhh1d6lf1izc1w"; + url = "https://download.documentfoundation.org/libreoffice/src/24.2.5/libreoffice-translations-24.2.5.2.tar.xz"; } diff --git a/pkgs/applications/office/libreoffice/src-still/version.nix b/pkgs/applications/office/libreoffice/src-still/version.nix index d7fc5122189fb..ede95eca68ce5 100644 --- a/pkgs/applications/office/libreoffice/src-still/version.nix +++ b/pkgs/applications/office/libreoffice/src-still/version.nix @@ -1 +1 @@ -"7.6.7.2" +"24.2.5.2" diff --git a/pkgs/applications/office/libreoffice/update.sh b/pkgs/applications/office/libreoffice/update.sh index a04e668e8188f..9f7a580ad56e8 100755 --- a/pkgs/applications/office/libreoffice/update.sh +++ b/pkgs/applications/office/libreoffice/update.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p python3 pup curl jq nix +#!nix-shell -i bash -p python3 pup curl jq nix nix-prefetch-git set -euo pipefail echoerr() { echo "$@" 1>&2; } @@ -14,6 +14,8 @@ if [[ $variant == fresh ]]; then head_tail=head elif [[ $variant == still ]]; then head_tail=tail +elif [[ $variant == collabora ]]; then + true else echoerr got unknown variant $variant exit 3 @@ -26,49 +28,93 @@ shift mkdir -p "$(dirname $fname)/src-$variant" cd "$(dirname $fname)/src-$variant" -# The pup command prints both fresh and still versions one after another, and -# we use either head -1 or tail -1 to get the right version, per the if elif -# above. -version_major="$(curl --silent https://www.libreoffice.org/download/download-libreoffice/ |\ - pup '.dl_version_number text{}' | $head_tail -1)" -echoerr got from website ${variant}_version $version_major -baseurl=https://download.documentfoundation.org/libreoffice/src/$version_major -tarballs=($(curl --silent $baseurl/ |\ - pup 'table json{}' |\ - jq --raw-output '.. | .href? | strings' |\ - grep "$version_major.*.tar.xz$")) +case $variant in +(fresh|still) + # The pup command prints both fresh and still versions one after another, and + # we use either head -1 or tail -1 to get the right version, per the if elif + # above. + version_major="$(curl --silent https://www.libreoffice.org/download/download-libreoffice/ |\ + pup '.dl_version_number text{}' | $head_tail -1)" + echoerr got from website ${variant}_version $version_major + baseurl=https://download.documentfoundation.org/libreoffice/src/$version_major + tarballs=($(curl --silent $baseurl/ |\ + pup 'table json{}' |\ + jq --raw-output '.. | .href? | strings' |\ + grep "$version_major.*.tar.xz$")) -full_version="$(echo ${tarballs[0]} | sed -e 's/^libreoffice-//' -e 's/.tar.xz$//')" -echoerr full version is $full_version -echo \"$full_version\" > version.nix + full_version="$(echo ${tarballs[0]} | sed -e 's/^libreoffice-//' -e 's/.tar.xz$//')" + echoerr full version is $full_version + echo \"$full_version\" > version.nix -for t in help translations; do - echo "{" > $t.nix - echo " sha256 = "\"$(nix-prefetch-url $baseurl/libreoffice-$t-$full_version.tar.xz)'";' >> $t.nix - echo " url = "\"$baseurl/libreoffice-$t-$full_version.tar.xz'";' >> $t.nix - echo "}" >> $t.nix -done + for t in help translations; do + echo "{ fetchurl, ... }:" > $t.nix + echo "fetchurl {" >> $t.nix + echo " sha256 = "\"$(nix-prefetch-url $baseurl/libreoffice-$t-$full_version.tar.xz)'";' >> $t.nix + echo " url = "\"$baseurl/libreoffice-$t-$full_version.tar.xz'";' >> $t.nix + echo "}" >> $t.nix + done -# Out of loop nix-prefetch-url, because there is no $t, and we want the output -# path as well, to get the download.lst file from there afterwards. -main_path_hash=($(nix-prefetch-url --print-path $baseurl/libreoffice-$full_version.tar.xz)) -echo "{" > main.nix -echo " sha256 = "\"${main_path_hash[0]}'";' >> main.nix -echo " url = "\"$baseurl/libreoffice-$full_version.tar.xz'";' >> main.nix -echo "}" >> main.nix -echoerr got filename ${main_path_hash[1]} + # Out of loop nix-prefetch-url, because there is no $t, and we want the output + # path as well, to get the download.lst file from there afterwards. + main_path_hash=($(nix-prefetch-url --print-path $baseurl/libreoffice-$full_version.tar.xz)) + echo "{ fetchurl, ... }:" > main.nix + echo "fetchurl {" >> main.nix + echo " sha256 = "\"${main_path_hash[0]}'";' >> main.nix + echo " url = "\"$baseurl/libreoffice-$full_version.tar.xz'";' >> main.nix + echo "}" >> main.nix + echoerr got filename ${main_path_hash[1]} + + # Environment variable required by ../generate-libreoffice-srcs.py + export downloadList=/tmp/nixpkgs-libreoffice-update-download-$full_version.lst + # Need to extract the file only if it doesn't exist, otherwise spare time be + # skipping this. + if [[ ! -f "$downloadList" ]]; then + tar --extract \ + --file=${main_path_hash[1]} \ + libreoffice-$full_version/download.lst \ + -O > $downloadList + else + echoerr relying on previously downloaded downloadList file + fi + ;; + +(collabora) + all_tags=$(git ls-remote --tags --sort -v:refname https://gerrit.libreoffice.org/core) + rev=$(grep --perl-regexp --only-matching --max-count=1 \ + '\Krefs/tags/cp-\d+\.\d+\.\d+-\d+$' <<< "$all_tags") + full_version=${rev#refs/tags/cp-} + echoerr full version is $full_version + echo \"$full_version\" > version.nix + + # The full checkout including the submodules is too big for Hydra, so we fetch + # submodules separately. + declare -A dirnames=([help]=helpcontent2 [translations]=translations) + for t in help translations; do + sub_rev=$(curl --silent "https://git.libreoffice.org/core/+/$rev/${dirnames[$t]}" |\ + pup '.gitlink-detail text{}' |\ + sed -n 's/^Submodule link to \([0-9a-f]\{40\}\) of .*/\1/p') + echoerr got rev $sub_rev for $t + prefetch_output=$(nix-prefetch-git "https://gerrit.libreoffice.org/$t" --rev "$sub_rev") + echo "{ fetchgit, ... }:" > $t.nix + echo "fetchgit {" >> $t.nix + echo " url = \"$(jq -r '.url' <<< "$prefetch_output")\";" >> $t.nix + echo " rev = \"$rev\";" >> $t.nix + echo " hash = \"$(jq -r '.hash' <<< "$prefetch_output")\";" >> $t.nix + echo "}" + done + + local prefetch_output=$(nix-prefetch-git "https://gerrit.libreoffice.org/core" --rev "$rev") + echo "{ fetchgit, ... }:" > main.nix + echo "fetchgit {" >> main.nix + echo " url = \"$(jq -r '.url' <<< "$prefetch_output")\";" >> main.nix + echo " rev = \"$rev\";" >> main.nix + echo " hash = \"$(jq -r '.hash' <<< "$prefetch_output")\";" >> main.nix + echo " fetchSubmodules = false;" >> main.nix + echo "}" >> main.nix + + # Environment variable required by ../generate-libreoffice-srcs.py + export downloadList=$(jq -r '.path' <<< "$prefetch_output")/download.lst +esac -# Environment variable required by ../generate-libreoffice-srcs.py -export downloadList=/tmp/nixpkgs-libreoffice-update-download-$full_version.lst -# Need to extract the file only if it doesn't exist, otherwise spare time be -# skipping this. -if [[ ! -f "$downloadList" ]]; then - tar --extract \ - --file=${main_path_hash[1]} \ - libreoffice-$full_version/download.lst \ - -O > $downloadList -else - echoerr relying on previously downloaded downloadList file -fi cd .. python3 ./generate-libreoffice-srcs.py > src-$variant/deps.nix diff --git a/pkgs/applications/office/libreoffice/wrapper.nix b/pkgs/applications/office/libreoffice/wrapper.nix index 013a2ee5575ef..aeab3da08dd7a 100644 --- a/pkgs/applications/office/libreoffice/wrapper.nix +++ b/pkgs/applications/office/libreoffice/wrapper.nix @@ -5,7 +5,6 @@ , makeWrapper , xorg # for lndir , runCommand -, substituteAll # For Emulating wrapGAppsHook3 , gsettings-desktop-schemas , hicolor-icon-theme @@ -17,7 +16,7 @@ , gnugrep # Configuration options for the wrapper , extraMakeWrapperArgs ? [] -, dbusVerify ? stdenv.isLinux +, dbusVerify ? stdenv.hostPlatform.isLinux , dbus }: @@ -50,9 +49,13 @@ let # Add dictionaries from all NIX_PROFILES "--run" (lib.escapeShellArg '' for PROFILE in $NIX_PROFILES; do - HDIR="$PROFILE/share/hunspell" - if [ -d "$HDIR" ]; then - export DICPATH=$DICPATH''${DICPATH:+:}$HDIR + HU_DIR="$PROFILE/share/hunspell" + HY_DIR="$PROFILE/share/hyphen" + if [ -d "$HU_DIR" ]; then + export DICPATH=$DICPATH''${DICPATH:+:}$HU_DIR + fi + if [ -d "$HY_DIR" ]; then + export DICPATH=$DICPATH''${DICPATH:+:}$HY_DIR fi done '') diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix index acfa14dabb7de..73dff5c7c5b64 100644 --- a/pkgs/applications/office/mendeley/default.nix +++ b/pkgs/applications/office/mendeley/default.nix @@ -7,13 +7,13 @@ let pname = "mendeley"; - version = "2.115.0"; + version = "2.120.0"; executableName = "${pname}-reference-manager"; src = fetchurl { url = "https://static.mendeley.com/bin/desktop/mendeley-reference-manager-${version}-x86_64.AppImage"; - hash = "sha256-ir96BQQ+dlUv2aNU9iQ+jnpeLE3D3ow9RPGstREUWNA="; + hash = "sha256-yKHrTcIiNhsLMfwNQNSLE2mAQLsDFxhTYdper3a8oM8="; }; appimageContents = appimageTools.extractType2 { @@ -38,7 +38,7 @@ in appimageTools.wrapType2 { sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ dtzWill atila ]; + maintainers = with maintainers; [ atila ]; mainProgram = "mendeley-reference-manager"; }; diff --git a/pkgs/applications/office/micropad/default.nix b/pkgs/applications/office/micropad/default.nix index c50e14015f3be..8fd6b2dd5228c 100644 --- a/pkgs/applications/office/micropad/default.nix +++ b/pkgs/applications/office/micropad/default.nix @@ -2,100 +2,88 @@ , stdenv , fetchFromGitHub , fetchYarnDeps +, yarnBuildHook , fetchzip , makeWrapper , makeDesktopItem -, mkYarnPackage , electron , desktopToDarwinBundle , copyDesktopItems }: -let - executableName = "micropad"; -in - mkYarnPackage rec { - pname = "micropad"; - version = "4.5.1"; - src = fetchFromGitHub { - owner = "MicroPad"; - repo = "Micropad-Electron"; - rev = "v${version}"; - hash = "sha256-z+g+FwmoX4Qqf+v4BVLCtfrXwGiAUFlPLQQhp2CMhLU="; - }; +stdenv.mkDerivation (finalAttrs: { + pname = "micropad"; + version = "4.5.1"; - micropad-core = fetchzip { - url = "https://github.com/MicroPad/MicroPad-Core/releases/download/v${version}/micropad.tar.xz"; - hash = "sha256-y13PVA/AKKsc5q7NDwZFasb7fOo+56IW8qbTbsm2WWc="; - }; + src = fetchFromGitHub { + owner = "MicroPad"; + repo = "Micropad-Electron"; + rev = "v${finalAttrs.version}"; + hash = "sha256-z+g+FwmoX4Qqf+v4BVLCtfrXwGiAUFlPLQQhp2CMhLU="; + }; - packageJSON = ./package.json; + # This project can't be built from source currently, because Nixpkgs lacks + # ecosystem for https://bun.sh + micropad-core = fetchzip { + url = "https://github.com/MicroPad/MicroPad-Core/releases/download/v${finalAttrs.version}/micropad.tar.xz"; + hash = "sha256-y13PVA/AKKsc5q7NDwZFasb7fOo+56IW8qbTbsm2WWc="; + }; - offlineCache = fetchYarnDeps { - yarnLock = "${src}/yarn.lock"; - hash = "sha256-ESYSHuHLNsn3EYKIe2p0kg142jyC0USB+Ef//oGeF08="; - }; + offlineCache = fetchYarnDeps { + yarnLock = "${finalAttrs.src}/yarn.lock"; + hash = "sha256-ESYSHuHLNsn3EYKIe2p0kg142jyC0USB+Ef//oGeF08="; + }; - nativeBuildInputs = [ copyDesktopItems makeWrapper ] - ++ lib.optionals stdenv.isDarwin [ desktopToDarwinBundle ]; + nativeBuildInputs = [ yarnBuildHook copyDesktopItems makeWrapper ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ desktopToDarwinBundle ]; - buildPhase = '' - runHook preBuild - pushd deps/micropad/ - yarn --offline build - popd - runHook postBuild - ''; + installPhase = '' + runHook preInstall - installPhase = '' - runHook preInstall + # resources + mkdir -p "$out/share/" + cp -r './deps/micropad' "$out/share/micropad" + ln -s '${finalAttrs.micropad-core}' "$out/share/micropad/core" + rm "$out/share/micropad/node_modules" + cp -r './node_modules' "$out/share/micropad" - # resources - mkdir -p "$out/share/" - cp -r './deps/micropad' "$out/share/micropad" - ln -s '${micropad-core}' "$out/share/micropad/core" - rm "$out/share/micropad/node_modules" - cp -r './node_modules' "$out/share/micropad" + # icons + for icon in $out/share/micropad/build/icons/*.png; do + mkdir -p "$out/share/icons/hicolor/$(basename $icon .png | sed -e 's/^icon-//')/apps" + ln -s "$icon" "$out/share/icons/hicolor/$(basename $icon .png | sed -e 's/^icon-//')/apps/micropad.png" + done - # icons - for icon in $out/share/micropad/build/icons/*.png; do - mkdir -p "$out/share/icons/hicolor/$(basename $icon .png | sed -e 's/^icon-//')/apps" - ln -s "$icon" "$out/share/icons/hicolor/$(basename $icon .png | sed -e 's/^icon-//')/apps/micropad.png" - done + # executable wrapper + makeWrapper '${electron}/bin/electron' "$out/bin/micropad" \ + --add-flags "$out/share/micropad" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" - # executable wrapper - makeWrapper '${electron}/bin/electron' "$out/bin/${executableName}" \ - --add-flags "$out/share/micropad" \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" + runHook postInstall + ''; - runHook postInstall - ''; + # Do not attempt generating a tarball for micropad again. + doDist = false; - # Do not attempt generating a tarball for micropad again. - doDist = false; + # The desktop item properties should be kept in sync with data from upstream: + # https://github.com/MicroPad/MicroPad-Electron/blob/master/package.json + desktopItems = [ + (makeDesktopItem { + name = "micropad"; + exec = "micropad %u"; + icon = "micropad"; + desktopName = "µPad"; + startupWMClass = "µPad"; + comment = finalAttrs.meta.description; + categories = ["Office"]; + }) + ]; - # The desktop item properties should be kept in sync with data from upstream: - # https://github.com/MicroPad/MicroPad-Electron/blob/master/package.json - desktopItems = [ - (makeDesktopItem { - name = "micropad"; - exec = "${executableName} %u"; - icon = "micropad"; - desktopName = "µPad"; - startupWMClass = "µPad"; - comment = meta.description; - categories = ["Office"]; - }) - ]; - - passthru.updateScript = ./update.sh; - - meta = with lib; { - description = "A powerful note-taking app that helps you organise + take notes without restrictions"; - homepage = "https://getmicropad.com/"; - license = licenses.mpl20; - maintainers = with maintainers; [rhysmdnz]; - inherit (electron.meta) platforms; - mainProgram = "micropad"; - }; - } + meta = { + description = "A powerful note-taking app that helps you organise + take notes without restrictions"; + homepage = "https://getmicropad.com/"; + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [rhysmdnz]; + inherit (electron.meta) platforms; + mainProgram = "micropad"; + }; +}) diff --git a/pkgs/applications/office/micropad/package.json b/pkgs/applications/office/micropad/package.json deleted file mode 100644 index 8e1ca96a05195..0000000000000 --- a/pkgs/applications/office/micropad/package.json +++ /dev/null @@ -1,117 +0,0 @@ -{ - "name": "micropad", - "version": "4.5.1", - "description": "A powerful note-taking app that helps you organise + take notes without restrictions.", - "main": "main.js", - "scripts": { - "start": "yarn build && yarn electron . --is-dev --no-sandbox", - "build": "yarn tsc -p tsconfig.json", - "update-core": "rm -rf core && rm -rf tmp && mkdir tmp && wget https://github.com/MicroPad/MicroPad-Core/releases/download/v${npm_package_version}/micropad.tar.xz -P ./tmp && cd tmp && tar -xf micropad.tar.xz && rm build/dist/*.map && cp -r build ../core && cd .. && rm -rf tmp", - "pack": "yarn build && yarn electron-builder --dir", - "dist": "yarn build && yarn electron-builder", - "windows:version": "echo %npm_package_version%" - }, - "repository": { - "type": "git", - "url": "git+https://github.com/MicroPad/Electron.git" - }, - "author": { - "name": "Nick Webster", - "email": "nick@nick.geek.nz" - }, - "license": "MPL-2.0", - "bugs": { - "url": "https://github.com/MicroPad/Electron/issues" - }, - "homepage": "https://getmicropad.com", - "devDependencies": { - "@types/mime": "^3.0.1", - "@types/node": "^18.7.18", - "@types/typo-js": "^1.2.1", - "electron": "^28.1.0", - "electron-builder": "^24.9.1", - "typescript": "~5.2.2" - }, - "dependencies": { - "dictionary-en": "^3.0.0", - "dictionary-en-au": "^2.1.1", - "electron-context-menu": "^3.1.2", - "electron-window-state": "^5.0.3", - "localforage": "^1.10.0", - "mime": "^3.0.0", - "typo-js": "^1.2.3" - }, - "build": { - "appId": "com.getmicropad.micropad", - "productName": "µPad", - "publish": { - "provider": "github", - "releaseType": "release" - }, - "asarUnpack": [ - "preload.js" - ], - "linux": { - "target": [ - { - "target": "tar.gz", - "arch": [ - "x64", - "armv7l", - "arm64" - ] - }, - { - "target": "AppImage", - "arch": [ - "x64", - "armv7l", - "arm64" - ] - }, - "snap", - "deb", - "rpm", - "pacman" - ], - "executableName": "micropad", - "category": "Office", - "icon": "build/icons" - }, - "pacman": { - "depends": [ - "gtk3" - ] - }, - "snap": { - "publish": { - "provider": "github", - "releaseType": "release" - } - }, - "mac": { - "target": { - "target": "dmg", - "arch": "universal" - }, - "category": "public.app-category.productivity", - "identity": null - }, - "win": { - "target": [ - { - "target": "nsis", - "arch": [ - "x64", - "arm64" - ] - }, - "portable" - ] - }, - "nsis": { - "allowToChangeInstallationDirectory": true, - "oneClick": false - } - } -} diff --git a/pkgs/applications/office/micropad/update.sh b/pkgs/applications/office/micropad/update.sh deleted file mode 100755 index e2265af4ee721..0000000000000 --- a/pkgs/applications/office/micropad/update.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl common-updater-scripts jq nix nodePackages.prettier prefetch-yarn-deps - -set -eu -o pipefail - -latest_version=$(curl -s https://api.github.com/repos/MicroPad/Micropad-Electron/releases/latest | jq --raw-output '.tag_name[1:]') -old_core_hash=$(nix-instantiate --eval --strict -A "micropad.micropad-core.drvAttrs.outputHash" | tr -d '"' | sed -re 's|[+]|\\&|g') -new_core_hash=$(nix hash to-sri --type sha256 $(nix-prefetch-url --unpack "https://github.com/MicroPad/MicroPad-Core/releases/download/v$latest_version/micropad.tar.xz")) - -nixFile=$(nix-instantiate --eval --strict -A "micropad.meta.position" | sed -re 's/^"(.*):[0-9]+"$/\1/') -nixFolder=$(dirname "$nixFile") - -sed -i "$nixFile" -re "s|\"$old_core_hash\"|\"$new_core_hash\"|" - -curl -o "$nixFolder/package.json" -s "https://raw.githubusercontent.com/MicroPad/MicroPad-Electron/v$latest_version/package.json" -curl -o "$nixFolder/yarn.lock" -s "https://raw.githubusercontent.com/MicroPad/MicroPad-Electron/v$latest_version/yarn.lock" - -prettier --write "$nixFolder/package.json" -old_yarn_hash=$(nix-instantiate --eval --strict -A "micropad.offlineCache.outputHash" | tr -d '"' | sed -re 's|[+]|\\&|g') -new_yarn_hash=$(nix hash to-sri --type sha256 $(prefetch-yarn-deps "$nixFolder/yarn.lock")) -sed -i "$nixFile" -re "s|\"$old_yarn_hash\"|\"$new_yarn_hash\"|" -rm "$nixFolder/yarn.lock" - -update-source-version micropad "$latest_version" diff --git a/pkgs/applications/office/mmex/default.nix b/pkgs/applications/office/mmex/default.nix index c4508df84b7b6..b88f70225873b 100644 --- a/pkgs/applications/office/mmex/default.nix +++ b/pkgs/applications/office/mmex/default.nix @@ -27,10 +27,10 @@ stdenv.mkDerivation rec { hash = "sha256-TQgJ2Q4Z7+OtwuwkfPBgm2BmMKML9nmyFLSkmKJ1RE4="; }; - postPatch = lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) '' + postPatch = lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) '' substituteInPlace src/platfdep_mac.mm \ --replace "appearance.name == NSAppearanceNameDarkAqua" "NO" - '' + lib.optionalString (stdenv.isLinux && !stdenv.isx86_64) '' + '' + lib.optionalString (stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isx86_64) '' substituteInPlace 3rd/CMakeLists.txt \ --replace "-msse4.2 -maes" "" ''; @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { makeWrapper pkg-config wrapGAppsHook3 - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ lsb-release ]; @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { sqlite wxGTK32 gtk3 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.libobjc ]; @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { "-Wno-unused-parameter" ]); - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/{Applications,bin} mv $out/mmex.app $out/Applications makeWrapper $out/{Applications/mmex.app/Contents/MacOS,bin}/mmex @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { description = "Easy-to-use personal finance software"; homepage = "https://www.moneymanagerex.org/"; license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ viric ]; + maintainers = [ ]; platforms = with lib.platforms; unix; mainProgram = "mmex"; }; diff --git a/pkgs/applications/office/morgen/default.nix b/pkgs/applications/office/morgen/default.nix index 433b8855a9a21..797a1ca2ea678 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.6"; src = fetchurl { url = "https://dl.todesktop.com/210203cqcj00tw1/versions/${version}/linux/deb"; - hash = "sha256-5oBIw9PVbEGF1e47GeYNF6gJFm5z3M9KeJ1711cAg2s="; + hash = "sha256-knguIcvGCwlI83DIaX/EYt/15azMoxEWNtFIXYqLops="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/office/notes/default.nix b/pkgs/applications/office/notes/default.nix deleted file mode 100644 index 7f41ca33e3dcf..0000000000000 --- a/pkgs/applications/office/notes/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, wrapQtAppsHook -, qtbase -, qtdeclarative -, Cocoa -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "notes"; - version = "2.2.1"; - - src = fetchFromGitHub { - owner = "nuttyartist"; - repo = "notes"; - rev = "v${finalAttrs.version}"; - hash = "sha256-ShChF87ysRoisKshY86kJTa3ZAiQhBOImuL8OsEqgBo="; - fetchSubmodules = true; - }; - - cmakeFlags = [ "-DUPDATE_CHECKER=OFF" ]; - - nativeBuildInputs = [ - cmake - wrapQtAppsHook - ]; - - buildInputs = [ - qtbase - qtdeclarative - ] ++ lib.optionals stdenv.isDarwin [ - Cocoa - ]; - - postInstall = lib.optionalString stdenv.isDarwin '' - mkdir $out/Applications - mv $out/bin/Notes.app $out/Applications - ''; - - meta = { - description = "Fast and beautiful note-taking app"; - mainProgram = "notes"; - downloadPage = "https://github.com/nuttyartist/notes"; - homepage = "https://www.get-notes.com"; - license = lib.licenses.mpl20; - maintainers = with lib.maintainers; [ zendo ]; - platforms = lib.platforms.linux ++ lib.platforms.darwin; - }; -}) diff --git a/pkgs/applications/office/paperless-ngx/default.nix b/pkgs/applications/office/paperless-ngx/default.nix index 6aa2af7dba4c3..b0e51f5a8e542 100644 --- a/pkgs/applications/office/paperless-ngx/default.nix +++ b/pkgs/applications/office/paperless-ngx/default.nix @@ -21,22 +21,24 @@ , pango , pkg-config , nltk-data +, xorg }: let - version = "2.10.2"; + version = "2.12.1"; src = fetchFromGitHub { owner = "paperless-ngx"; repo = "paperless-ngx"; rev = "refs/tags/v${version}"; - hash = "sha256-LwWdgoVlZjL5o+T8zzU9jkYaQbdiZokrCGn8ZTIQ4OQ="; + hash = "sha256-txqwVGLUel74ObCqwMWSqa4Nd2eDRf0SqAIes5tlMDg="; }; # subpath installation is broken with uvicorn >= 0.26 # https://github.com/NixOS/nixpkgs/issues/298719 # https://github.com/paperless-ngx/paperless-ngx/issues/5494 python = python3.override { + self = python; packageOverrides = final: prev: { # tesseract5 may be overwritten in the paperless module and we need to propagate that to make the closure reduction effective ocrmypdf = prev.ocrmypdf.override { tesseract = tesseract5; }; @@ -50,18 +52,6 @@ let hash = "sha256-ng98DTw49zyFjrPnEwfnPfONyjKKZYuLl0qduxSppYk="; }; }); - - djangorestframework = prev.djangorestframework.overridePythonAttrs (oldAttrs: rec { - version = "3.14.0"; - src = oldAttrs.src.override { - rev = version; - hash = "sha256-Fnj0n3NS3SetOlwSmGkLE979vNJnYE6i6xwVBslpNz4="; - }; - nativeCheckInputs = with prev; [ - pytest7CheckHook - pytest-django - ]; - }); }; }; @@ -86,18 +76,18 @@ let cd src-ui ''; - npmDepsHash = "sha256-zmlYwlH2cnGbbKf6jt5zBLh0Iv3C9/xN0iA4xVetRNE="; + npmDepsHash = "sha256-hb2z2cPMTN5bHtUldTR5Mvgo4nZL8/S+Uhfis37gF44="; nativeBuildInputs = [ pkg-config python3 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild ]; buildInputs = [ pango - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ giflib darwin.apple_sdk.frameworks.CoreText ]; @@ -126,15 +116,22 @@ let in python.pkgs.buildPythonApplication rec { pname = "paperless-ngx"; - format = "other"; + pyproject = false; inherit version src; + postPatch = '' + # pytest-xdist makes the tests flaky + substituteInPlace src/setup.cfg \ + --replace-fail "--numprocesses auto --maxprocesses=16" "" + ''; + nativeBuildInputs = [ gettext + xorg.lndir ]; - propagatedBuildInputs = with python.pkgs; [ + dependencies = with python.pkgs; [ bleach channels channels-redis @@ -201,18 +198,18 @@ python.pkgs.buildPythonApplication rec { ''; installPhase = let - pythonPath = python.pkgs.makePythonPath propagatedBuildInputs; + pythonPath = python.pkgs.makePythonPath dependencies; in '' runHook preInstall - mkdir -p $out/lib/paperless-ngx + mkdir -p $out/lib/paperless-ngx/static/frontend cp -r {src,static,LICENSE,gunicorn.conf.py} $out/lib/paperless-ngx - ln -s ${frontend}/lib/paperless-ui/frontend $out/lib/paperless-ngx/static/ + lndir -silent ${frontend}/lib/paperless-ui/frontend $out/lib/paperless-ngx/static/frontend chmod +x $out/lib/paperless-ngx/src/manage.py makeWrapper $out/lib/paperless-ngx/src/manage.py $out/bin/paperless-ngx \ --prefix PYTHONPATH : "${pythonPath}" \ --prefix PATH : "${path}" - makeWrapper ${python.pkgs.celery}/bin/celery $out/bin/celery \ + makeWrapper ${lib.getExe python.pkgs.celery} $out/bin/celery \ --prefix PYTHONPATH : "${pythonPath}:$out/lib/paperless-ngx/src" \ --prefix PATH : "${path}" @@ -228,11 +225,12 @@ python.pkgs.buildPythonApplication rec { daphne factory-boy imagehash + pytest-cov-stub pytest-django pytest-env pytest-httpx + pytest-mock pytest-rerunfailures - pytest-xdist pytestCheckHook ]; @@ -248,10 +246,6 @@ python.pkgs.buildPythonApplication rec { export PATH="${path}:$PATH" export HOME=$(mktemp -d) export XDG_DATA_DIRS="${liberation_ttf}/share:$XDG_DATA_DIRS" - - # Disable unneeded code coverage test - substituteInPlace src/setup.cfg \ - --replace-fail "--cov --cov-report=html --cov-report=xml" "" ''; disabledTests = [ @@ -265,11 +259,11 @@ python.pkgs.buildPythonApplication rec { "test_rtl_language_detection" ]; - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; passthru = { inherit python path frontend tesseract5; - nltkData = with nltk-data; [ punkt snowball_data stopwords ]; + nltkData = with nltk-data; [ punkt_tab snowball_data stopwords ]; tests = { inherit (nixosTests) paperless; }; }; @@ -279,6 +273,6 @@ python.pkgs.buildPythonApplication rec { changelog = "https://github.com/paperless-ngx/paperless-ngx/releases/tag/v${version}"; license = licenses.gpl3Only; platforms = platforms.unix; - maintainers = with maintainers; [ lukegb gador erikarvstedt leona ]; + maintainers = with maintainers; [ leona SuperSandro2000 erikarvstedt ]; }; } 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/paperwork/src.nix b/pkgs/applications/office/paperwork/src.nix index 2f54b435928f6..8b8735d9ac354 100644 --- a/pkgs/applications/office/paperwork/src.nix +++ b/pkgs/applications/office/paperwork/src.nix @@ -1,13 +1,13 @@ {fetchFromGitLab}: rec { - version = "2.2.3"; + version = "2.2.5"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; repo = "paperwork"; group = "World"; owner = "OpenPaperwork"; rev = version; - sha256 = "sha256-xQN1IUbTQEHtyW5F8Zbg2EUN5K87oYqnSdzo0gEeOfI="; + sha256 = "sha256-PRh0ohmPLwpM76qYfbExFqq4OK6Hm0fbdzrjXungSoY="; }; sample_documents = fetchFromGitLab { domain = "gitlab.gnome.org"; 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/planify/default.nix b/pkgs/applications/office/planify/default.nix index 3a084c358469a..7c10b9953cdc4 100644 --- a/pkgs/applications/office/planify/default.nix +++ b/pkgs/applications/office/planify/default.nix @@ -28,13 +28,13 @@ stdenv.mkDerivation rec { pname = "planify"; - version = "4.8.4"; + version = "4.11.4"; src = fetchFromGitHub { owner = "alainm23"; repo = "planify"; rev = version; - hash = "sha256-iQo7ETz5j/Uy5a96XFRkZ0U67dTHWEYLsr/qUi79Y4E="; + hash = "sha256-ADNMSXvfeAT53coAtCu3CVCU5XUFhLbvAH3WPFoKJVE="; }; nativeBuildInputs = [ @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { description = "Task manager with Todoist support designed for GNU/Linux"; homepage = "https://github.com/alainm23/planify"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ dtzWill ] ++ teams.pantheon.members; + maintainers = with maintainers; [ ] ++ teams.pantheon.members; platforms = platforms.linux; mainProgram = "io.github.alainm23.planify"; }; diff --git a/pkgs/applications/office/portfolio/default.nix b/pkgs/applications/office/portfolio/default.nix deleted file mode 100644 index 72cf6cbb57523..0000000000000 --- a/pkgs/applications/office/portfolio/default.nix +++ /dev/null @@ -1,80 +0,0 @@ -{ lib -, stdenv -, autoPatchelfHook -, fetchurl -, glib-networking -, glibc -, gcc-unwrapped -, gtk3 -, jre -, libsecret -, makeDesktopItem -, webkitgtk -, wrapGAppsHook3 -, writeScript -}: -let - desktopItem = makeDesktopItem { - name = "Portfolio"; - exec = "portfolio"; - icon = "portfolio"; - comment = "Calculate Investment Portfolio Performance"; - desktopName = "Portfolio Performance"; - categories = [ "Office" ]; - }; - - runtimeLibs = lib.makeLibraryPath [ gtk3 webkitgtk ]; -in -stdenv.mkDerivation rec { - pname = "PortfolioPerformance"; - version = "0.69.0"; - - src = fetchurl { - url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz"; - hash = "sha256-5U1MGZ/CWI0m1utXCak6qWEHIFwMvZSqRt4qrUPCqVo="; - }; - - nativeBuildInputs = [ - autoPatchelfHook - wrapGAppsHook3 - ]; - - buildInputs = [ - gcc-unwrapped - glib-networking - glibc - libsecret - ]; - - installPhase = '' - mkdir -p $out/portfolio - cp -av ./* $out/portfolio - - makeWrapper $out/portfolio/PortfolioPerformance $out/bin/portfolio \ - --prefix LD_LIBRARY_PATH : "${runtimeLibs}" \ - --prefix PATH : ${jre}/bin - - # Create desktop item - mkdir -p $out/share/applications - cp ${desktopItem}/share/applications/* $out/share/applications - mkdir -p $out/share/pixmaps - ln -s $out/portfolio/icon.xpm $out/share/pixmaps/portfolio.xpm - ''; - - passthru.updateScript = writeScript "update.sh" '' - #!/usr/bin/env nix-shell - #!nix-shell -i bash -p curl jq common-updater-scripts - version="$(curl -sL "https://api.github.com/repos/buchen/portfolio/tags" | jq '.[0].name' --raw-output)" - update-source-version portfolio "$version" - ''; - - meta = with lib; { - description = "Simple tool to calculate the overall performance of an investment portfolio"; - homepage = "https://www.portfolio-performance.info/"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.epl10; - maintainers = with maintainers; [ kilianar oyren shawn8901 ]; - mainProgram = "portfolio"; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/pkgs/applications/office/pympress/default.nix b/pkgs/applications/office/pympress/default.nix index 8ada870912eb9..f370ecec9ddfd 100644 --- a/pkgs/applications/office/pympress/default.nix +++ b/pkgs/applications/office/pympress/default.nix @@ -7,9 +7,9 @@ , gobject-introspection , libcanberra-gtk3 , poppler_gi -, withGstreamer ? stdenv.isLinux +, withGstreamer ? stdenv.hostPlatform.isLinux , gst_all_1 -, withVLC ? stdenv.isLinux +, withVLC ? stdenv.hostPlatform.isLinux }: python3Packages.buildPythonApplication rec { diff --git a/pkgs/applications/office/qnotero/default.nix b/pkgs/applications/office/qnotero/default.nix index c091f61dffc6a..4fd2e741adb00 100644 --- a/pkgs/applications/office/qnotero/default.nix +++ b/pkgs/applications/office/qnotero/default.nix @@ -47,7 +47,7 @@ python3Packages.buildPythonPackage rec { homepage = "https://www.cogsci.nl/software/qnotero"; license = lib.licenses.gpl2; platforms = lib.platforms.unix; - broken = stdenv.isDarwin; # Build fails even after adding cx-freeze to `buildInputs` + broken = stdenv.hostPlatform.isDarwin; # Build fails even after adding cx-freeze to `buildInputs` maintainers = [ lib.maintainers.nico202 ]; }; } diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix index 53563d72d6584..77e36de1d5df3 100644 --- a/pkgs/applications/office/qownnotes/default.nix +++ b/pkgs/applications/office/qownnotes/default.nix @@ -1,14 +1,13 @@ { lib , stdenv , fetchurl -, qmake +, cmake , qttools , qtbase , qtdeclarative , qtsvg , qtwayland , qtwebsockets -, qt5compat , makeWrapper , wrapQtAppsHook , botan2 @@ -21,36 +20,36 @@ let pname = "qownnotes"; appname = "QOwnNotes"; - version = "24.6.3"; + version = "24.9.7"; 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-n5Il8DnEK6emZANv6IMUpaEsHZ/hoPl4jNaXCuo7X5g="; }; nativeBuildInputs = [ - qmake + cmake qttools wrapQtAppsHook pkg-config installShellFiles xvfb-run - ] ++ lib.optionals stdenv.isDarwin [ makeWrapper ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ makeWrapper ]; buildInputs = [ qtbase qtdeclarative qtsvg qtwebsockets - qt5compat botan2 - ] ++ lib.optionals stdenv.isLinux [ qtwayland ]; + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ qtwayland ]; - qmakeFlags = [ - "USE_SYSTEM_BOTAN=1" + cmakeFlags = [ + "-DQON_QT6_BUILD=ON" + "-DBUILD_WITH_SYSTEM_BOTAN=ON" ]; postInstall = '' @@ -62,11 +61,11 @@ stdenv.mkDerivation { --fish <(xvfb-run $out/bin/${appname} --completion fish) '' # Create a lowercase symlink for Linux - + lib.optionalString stdenv.isLinux '' + + lib.optionalString stdenv.hostPlatform.isLinux '' ln -s $out/bin/${appname} $out/bin/${pname} '' # Wrap application for macOS as lowercase binary - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications mv $out/bin/${appname}.app $out/Applications makeWrapper $out/Applications/${appname}.app/Contents/MacOS/${appname} $out/bin/${pname} diff --git a/pkgs/applications/office/qpdfview/default.nix b/pkgs/applications/office/qpdfview/default.nix index 56bd5f126afae..7d44c684fd99e 100644 --- a/pkgs/applications/office/qpdfview/default.nix +++ b/pkgs/applications/office/qpdfview/default.nix @@ -40,6 +40,9 @@ mkDerivation rec { ghostscript ]; + # needed for qmakeFlags+=( below + __structuredAttrs = true; + preConfigure = '' lrelease qpdfview.pro qmakeFlags+=(*.pro) diff --git a/pkgs/applications/office/roam-research/common.nix b/pkgs/applications/office/roam-research/common.nix index 19e51e7b0eae3..00cbbf009096c 100644 --- a/pkgs/applications/office/roam-research/common.nix +++ b/pkgs/applications/office/roam-research/common.nix @@ -1,22 +1,22 @@ { fetchurl }: let pname = "roam-research"; - version = "0.0.19"; + version = "0.0.22"; in { inherit pname version; sources = { x86_64-darwin = fetchurl { url = "https://roam-electron-deploy.s3.us-east-2.amazonaws.com/Roam+Research-${version}.dmg"; - hash = "sha256-pIH4p7dnmyOgGyruSJ39xB8iJ45wtxcIQmfUeBLlDes="; + hash = "sha256-GA9m4z+3Dy87Dz/YPG5MYbREQ1cEAdX/MJvkAJ/fe34="; }; aarch64-darwin = fetchurl { url = "https://roam-electron-deploy.s3.us-east-2.amazonaws.com/Roam+Research-${version}-arm64.dmg"; - hash = "sha256-iQRaaSU033t3WVWZSKuXCPJbMoNpwLnDHBz5QURu6Gw="; + hash = "sha256-+lgV5TpTzN7mJvvVEpBbmq+aBOBKy1CpYkMNhfoxhK0="; }; x86_64-linux = fetchurl { url = "https://roam-electron-deploy.s3.us-east-2.amazonaws.com/${pname}_${version}_amd64.deb"; - hash = "sha256-eDN+hrAc+ePRELcXAs5WypzPlJ+Wtg3kUarf8rq5CnA="; + hash = "sha256-HVGytdP5fkQQABeL9y869GZioutvnBHrwPprAjfBbFg="; }; }; } diff --git a/pkgs/applications/office/roam-research/darwin.nix b/pkgs/applications/office/roam-research/darwin.nix index 372186f551f1b..721e9e8fc7e9d 100644 --- a/pkgs/applications/office/roam-research/darwin.nix +++ b/pkgs/applications/office/roam-research/darwin.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, undmg, fetchurl }: +{ lib, stdenv, _7zz, fetchurl }: let common = import ./common.nix { inherit fetchurl; }; inherit (stdenv.hostPlatform) system; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sourceRoot = "."; - nativeBuildInputs = [ undmg ]; + nativeBuildInputs = [ _7zz ]; installPhase = '' runHook preInstall diff --git a/pkgs/applications/office/roam-research/default.nix b/pkgs/applications/office/roam-research/default.nix index 408f026bc57a1..3edbbe1a50813 100644 --- a/pkgs/applications/office/roam-research/default.nix +++ b/pkgs/applications/office/roam-research/default.nix @@ -2,7 +2,7 @@ let extraArgs = removeAttrs args [ "callPackage" ]; in -if stdenv.isDarwin then +if stdenv.hostPlatform.isDarwin then callPackage ./darwin.nix (extraArgs // { }) else callPackage ./linux.nix (extraArgs // { }) diff --git a/pkgs/applications/office/scribus/default.nix b/pkgs/applications/office/scribus/default.nix index 85c0afe9db66a..f95ac14c67ab5 100644 --- a/pkgs/applications/office/scribus/default.nix +++ b/pkgs/applications/office/scribus/default.nix @@ -83,6 +83,6 @@ stdenv.mkDerivation (finalAttrs: { mit publicDomain ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; }) diff --git a/pkgs/applications/office/semantik/default.nix b/pkgs/applications/office/semantik/default.nix index f4cc1670383bc..b7007719a694d 100644 --- a/pkgs/applications/office/semantik/default.nix +++ b/pkgs/applications/office/semantik/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , mkDerivation , fetchFromGitLab , wafHook diff --git a/pkgs/applications/office/softmaker/generic.nix b/pkgs/applications/office/softmaker/generic.nix index fed47d637f266..0cdbe16e11335 100644 --- a/pkgs/applications/office/softmaker/generic.nix +++ b/pkgs/applications/office/softmaker/generic.nix @@ -124,7 +124,7 @@ in stdenv.mkDerivation { homepage = "https://www.softmaker.com/"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/office/super-productivity/default.nix b/pkgs/applications/office/super-productivity/default.nix index 1e404ddc24c12..4883af59286a3 100644 --- a/pkgs/applications/office/super-productivity/default.nix +++ b/pkgs/applications/office/super-productivity/default.nix @@ -2,17 +2,16 @@ stdenv.mkDerivation rec { pname = "super-productivity"; - version = "8.0.10"; + version = "9.0.5"; src = fetchurl { url = "https://github.com/johannesjo/super-productivity/releases/download/v${version}/superProductivity-${version}.AppImage"; - sha256 = "sha256-YJx5ygHx0ZYPmw3xFGjPRx8nR20D+XR9SMxE2ymuWes="; + sha256 = "sha256-eNAoLcQWnsTDA7sG8i0Ur9BZ+pNt4AK1GOppFCD1ZGg="; name = "${pname}-${version}.AppImage"; }; appimageContents = appimageTools.extractType2 { - name = "${pname}-${version}"; - inherit src; + inherit pname version src; }; dontUnpack = true; diff --git a/pkgs/applications/office/teapot/001-fix-warning.patch b/pkgs/applications/office/teapot/001-fix-warning.patch deleted file mode 100644 index c9ab9da94bf47..0000000000000 --- a/pkgs/applications/office/teapot/001-fix-warning.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur teapot-2.3.0-old/scanner.c teapot-2.3.0-new/scanner.c ---- teapot-2.3.0-old/scanner.c 1969-12-31 21:00:01.000000000 -0300 -+++ teapot-2.3.0-new/scanner.c 2021-11-25 17:46:49.936673391 -0300 -@@ -25,6 +25,7 @@ - #include "main.h" - #include "misc.h" - #include "scanner.h" -+#include "utf8.h" - /*}}}*/ - - /* identcode -- return number of identifier */ /*{{{*/ diff --git a/pkgs/applications/office/teapot/002-remove-help.patch b/pkgs/applications/office/teapot/002-remove-help.patch deleted file mode 100644 index 5bf804255be19..0000000000000 --- a/pkgs/applications/office/teapot/002-remove-help.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff -Naur teapot-2.3.0-old/CMakeLists.txt teapot-2.3.0-new/CMakeLists.txt ---- teapot-2.3.0-old/CMakeLists.txt 1969-12-31 21:00:01.000000000 -0300 -+++ teapot-2.3.0-new/CMakeLists.txt 2021-11-25 18:16:06.594423660 -0300 -@@ -64,46 +64,6 @@ - install(TARGETS fteapot DESTINATION bin) - endif () - --if (ENABLE_HELP) -- add_custom_command( -- OUTPUT teapot.tex teapot.lyx -- MAIN_DEPENDENCY ${CMAKE_CURRENT_SOURCE_DIR}/doc/teapot.lyx -- VERBATIM -- COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/doc/teapot.lyx teapot.lyx -- COMMAND lyx -e pdflatex -f main teapot.lyx -- ) -- add_custom_command( -- OUTPUT teapot.pdf teapot.aux.old teapot.log teapot.toc -- MAIN_DEPENDENCY teapot.tex -- VERBATIM -- COMMAND pdflatex teapot.tex; diff -q teapot.aux.old teapot.aux && cp teapot.aux teapot.aux.old -- COMMAND pdflatex teapot.tex; diff -q teapot.aux.old teapot.aux && cp teapot.aux teapot.aux.old -- ) -- add_custom_command(OUTPUT teapot.pdf teapot.out MAIN_DEPENDENCY teapot.tex teapot.aux.old VERBATIM COMMAND pdflatex teapot.tex; diff -q teapot.aux.old teapot.aux && cp teapot.aux teapot.aux.old) -- add_custom_command( -- OUTPUT html/ html/index.html .latex2html-init -- MAIN_DEPENDENCY teapot.tex -- DEPENDS teapot.tex teapot.pdf ${CMAKE_CURRENT_SOURCE_DIR}/doc/.latex2html-init -- VERBATIM -- COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/doc/.latex2html-init .latex2html-init -- COMMAND ${CMAKE_COMMAND} -E make_directory html -- COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/doc/contents.png html/ -- COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/doc/next.png html/ -- COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/doc/next_g.png html/ -- COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/doc/prev.png html/ -- COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/doc/prev_g.png html/ -- COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/doc/up.png html/ -- COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/doc/up_g.png html/ -- COMMAND latex2html teapot.tex -- ) -- add_custom_target(pdf DEPENDS teapot.pdf) -- add_custom_target(html DEPENDS html/index.html) -- add_custom_target(doc ALL DEPENDS teapot.pdf html/index.html) -- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html DESTINATION share/doc/teapot FILES_MATCHING PATTERN *.html PATTERN *.png) -- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/teapot.pdf DESTINATION share/doc/teapot) -- set(HELPFILE "${CMAKE_INSTALL_PREFIX}/share/doc/teapot/index.html") --endif () -- - install(FILES COPYING README DESTINATION share/doc/teapot) - install(FILES teapot.1 DESTINATION share/man/man1) diff --git a/pkgs/applications/office/teapot/default.nix b/pkgs/applications/office/teapot/default.nix deleted file mode 100644 index 31ff3c8609874..0000000000000 --- a/pkgs/applications/office/teapot/default.nix +++ /dev/null @@ -1,80 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, libtirpc -, ncurses -}: - -stdenv.mkDerivation rec { - pname = "teapot"; - version = "2.3.0"; - - src = fetchFromGitHub { - name = "${pname}-${version}"; - owner = "museoa"; - repo = pname; - rev = version; - hash = "sha256-38XFjRzOGasr030f+mRYT+ptlabpnVJfa+1s7ZAjS+k="; - }; - - prePatch = '' - cd src - ''; - - patches = [ - # include a local file in order to make cc happy - ./001-fix-warning.patch - # remove the ENABLE_HELP target entirely - lyx and latex are huge! - ./002-remove-help.patch - ]; - - nativeBuildInputs = [ - cmake - ]; - - buildInputs = [ - libtirpc - ncurses - ]; - - # By no known reason libtirpc is not detected - env.NIX_CFLAGS_COMPILE = toString [ "-I${libtirpc.dev}/include/tirpc" ]; - NIX_LDFLAGS = [ "-ltirpc" ]; - - cmakeConfigureFlags = [ - "-DENABLE_HELP=OFF" - ]; - - meta = with lib; { - inherit (src.meta) homepage; - description = "Table Editor And Planner, Or: Teapot"; - longDescription = '' - Teapot is a compact spreadsheet software originally written by Michael - Haardt. It features a (n)curses-based text terminal interface, and - recently also a FLTK-based GUI. - - These days, it may seem pointless having yet another spreadsheet program - (and one that doesn't even know how to load Microsoft Excel files). Its - compact size (130k for the ncurses executable, 140k for the GUI - executable, 300k for the self-contained Windows EXE) and the fact that it - can run across serial lines and SSH sessions make it an interesting choice - for embedded applications and as system administration utility, even more - so since it has a batch processing mode and comes with example code for - creating graphs from data sets. - - Another interesting feature is its modern approach to spread sheet theory: - It sports true three-dimensional tables and iterative expressions. And - since it breaks compatibility with the usual notions of big spreadsheet - packages, it can also throw old syntactic cruft over board which many - spreadsheets still inherit from the days of VisiCalc on ancient CP/M - systems. - ''; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.unix; - mainProgram = "teapot"; - }; -} -# TODO: patch/fix FLTK building -# TODO: add documentation diff --git a/pkgs/applications/office/ticktick/default.nix b/pkgs/applications/office/ticktick/default.nix index 2510d42b9a82a..6d1876082917e 100644 --- a/pkgs/applications/office/ticktick/default.nix +++ b/pkgs/applications/office/ticktick/default.nix @@ -15,11 +15,11 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "ticktick"; - version = "2.0.20"; + version = "6.0.0"; src = fetchurl { - url = "https://d2atcrkye2ik4e.cloudfront.net/download/linux/linux_deb_x64/${finalAttrs.pname}-${finalAttrs.version}-amd64.deb"; - hash = "sha256-5w50QMSMmkpuhSOqv3LjrcQQDwaD7pIdKUo+8YUgvpk="; + url = "https://d2atcrkye2ik4e.cloudfront.net/download/linux/linux_deb_x64/ticktick-${finalAttrs.version}-amd64.deb"; + hash = "sha256-yoskJ7v0RgRZ16gs9UY1xf/PunLoFkNGKmVMkPJDPmM="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/office/timetrap/default.nix b/pkgs/applications/office/timetrap/default.nix index 4ec8101db0e58..1bdc846638354 100644 --- a/pkgs/applications/office/timetrap/default.nix +++ b/pkgs/applications/office/timetrap/default.nix @@ -1,6 +1,5 @@ { stdenv , lib -, pkgs , bundlerEnv , bundlerApp , bundlerUpdateScript diff --git a/pkgs/applications/office/todoman/default.nix b/pkgs/applications/office/todoman/default.nix index d53306e77904e..eae9e424857f0 100644 --- a/pkgs/applications/office/todoman/default.nix +++ b/pkgs/applications/office/todoman/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , fetchFromGitHub , glibcLocales , installShellFiles @@ -46,7 +45,7 @@ python3.pkgs.buildPythonApplication rec { hypothesis pytestCheckHook glibcLocales - pytest-cov + pytest-cov-stub ]; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/applications/office/treesheets/default.nix b/pkgs/applications/office/treesheets/default.nix index c2a84adc2a0da..a696ab5412808 100644 --- a/pkgs/applications/office/treesheets/default.nix +++ b/pkgs/applications/office/treesheets/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "treesheets"; - version = "0-unstable-2024-06-20"; + version = "0-unstable-2024-09-08"; src = fetchFromGitHub { owner = "aardappel"; repo = "treesheets"; - rev = "d363b4207281caaa6f3b84af93b0cd56c1855692"; - hash = "sha256-aZIt0DAGDQmIeLZHXjYao5CUhjLp9pjTiXJyoDi0kpQ="; + rev = "8db448f67710194d64211ac467ffd2d456854432"; + hash = "sha256-SM62ymN5HXRiyXayoWQaGXLCGEDbHcKMJdPLXDv5dv8="; }; nativeBuildInputs = [ @@ -30,13 +30,13 @@ stdenv.mkDerivation rec { buildInputs = [ wxGTK - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ]; env.NIX_CFLAGS_COMPILE = "-DPACKAGE_VERSION=\"${builtins.replaceStrings [ "unstable-" ] [ "" ] version}\""; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' shopt -s extglob mkdir -p $out/{share/treesheets,bin} mv $out/!(share) $out/share/treesheets diff --git a/pkgs/applications/office/trilium/desktop.nix b/pkgs/applications/office/trilium/desktop.nix index 9681c5fc9b8a4..13a291f458042 100644 --- a/pkgs/applications/office/trilium/desktop.nix +++ b/pkgs/applications/office/trilium/desktop.nix @@ -96,4 +96,4 @@ let }; in - if stdenv.isDarwin then darwin else linux + if stdenv.hostPlatform.isDarwin then darwin else linux diff --git a/pkgs/applications/office/tryton/default.nix b/pkgs/applications/office/tryton/default.nix index 27d50caedde05..bc66a8b458a63 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 @@ -17,26 +17,25 @@ , wrapGAppsHook3 }: -with lib; - python3Packages.buildPythonApplication rec { pname = "tryton"; - version = "7.2.2"; - - disabled = !python3Packages.isPy3k; + version = "7.2.5"; + pyproject = true; src = fetchPypi { inherit pname version; - sha256 = "sha256-XIPzpVIttTgP34rbA705vFoRZE9dj8Of3BR23DbpQPk="; + hash = "sha256-U6hA6TuIMDTFAZUic60A5IKr/LKxKZEgiTIhkLlTJSw="; }; + build-system = [ python3Packages.setuptools ]; + nativeBuildInputs = [ pkg-config gobject-introspection wrapGAppsHook3 ]; - propagatedBuildInputs = with python3Packages; [ + dependencies = with python3Packages; [ python-dateutil pygobject3 goocalendar @@ -47,7 +46,7 @@ python3Packages.buildPythonApplication rec { atk gdk-pixbuf glib - gnome.adwaita-icon-theme + adwaita-icon-theme goocanvas2 fontconfig freetype @@ -57,11 +56,19 @@ python3Packages.buildPythonApplication rec { pango ]; + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + strictDeps = false; + pythonImportsCheck = [ "tryton" ]; + doCheck = false; - meta = { + meta = with lib; { description = "Client of the Tryton application platform"; mainProgram = "tryton"; longDescription = '' diff --git a/pkgs/applications/office/vnote/default.nix b/pkgs/applications/office/vnote/default.nix deleted file mode 100644 index 1b815228ac2d5..0000000000000 --- a/pkgs/applications/office/vnote/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, qmake -, qtbase -, qtwebengine -, qtx11extras -, wrapQtAppsHook -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "vnote"; - version = "3.17.0"; - - src = fetchFromGitHub { - owner = "vnotex"; - repo = "vnote"; - rev = "v${finalAttrs.version}"; - fetchSubmodules = true; - hash = "sha256-NUVu6tKXrrwAoT4BgxX05mmGSC9yx20lwvXzd4y19Zs="; - }; - - nativeBuildInputs = [ - qmake - wrapQtAppsHook - ]; - - buildInputs = [ - qtbase - qtwebengine - qtx11extras - ]; - - meta = { - homepage = "https://vnotex.github.io/vnote"; - description = "Pleasant note-taking platform"; - mainProgram = "vnote"; - changelog = "https://github.com/vnotex/vnote/releases/tag/${finalAttrs.src.rev}"; - license = lib.licenses.lgpl3Plus; - maintainers = with lib.maintainers; [ AndersonTorres ]; - platforms = lib.platforms.linux; - }; -}) diff --git a/pkgs/applications/office/wordgrinder/default.nix b/pkgs/applications/office/wordgrinder/default.nix index 3647d8ea8e22f..c3b2aaf42a071 100644 --- a/pkgs/applications/office/wordgrinder/default.nix +++ b/pkgs/applications/office/wordgrinder/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { "OBJDIR=$TMP/wg-build" ]; - preBuild = lib.optionalString stdenv.isLinux '' + preBuild = lib.optionalString stdenv.hostPlatform.isLinux '' makeFlagsArray+=('XFT_PACKAGE=--cflags={} --libs={-lX11 -lXft}') ''; @@ -38,17 +38,17 @@ stdenv.mkDerivation rec { ncurses readline zlib - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libXft ]; # To be able to find <Xft.h> - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isLinux "-I${libXft.dev}/include/X11"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isLinux "-I${libXft.dev}/include/X11"; # Binaries look for LuaFileSystem library (lfs.so) at runtime postInstall = '' wrapProgram $out/bin/wordgrinder --set LUA_CPATH "${lua52Packages.luafilesystem}/lib/lua/5.2/lfs.so"; - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' wrapProgram $out/bin/xwordgrinder --set LUA_CPATH "${lua52Packages.luafilesystem}/lib/lua/5.2/lfs.so"; ''; diff --git a/pkgs/applications/office/wpsoffice/default.nix b/pkgs/applications/office/wpsoffice/default.nix index a9bb14d1b4e2a..81d6e299bb6bf 100644 --- a/pkgs/applications/office/wpsoffice/default.nix +++ b/pkgs/applications/office/wpsoffice/default.nix @@ -23,7 +23,7 @@ , useChineseVersion ? false }: let - pkgVersion = "11.1.0.11719"; + pkgVersion = "11.1.0.11723"; url = if useChineseVersion then "https://wps-linux-personal.wpscdn.cn/wps/download/ep/Linux2019/${lib.last (lib.splitVersion pkgVersion)}/wps-office_${pkgVersion}_amd64.deb" @@ -31,9 +31,9 @@ let "https://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/${lib.last (lib.splitVersion pkgVersion)}/wps-office_${pkgVersion}.XA_amd64.deb"; hash = if useChineseVersion then - "sha256-LgE5du2ZnMsAqgoQkY63HWyWYA5TLS5I8ArRYrpxffs=" + "sha256-vpXK8YyjqhFdmtajO6ZotYACpe5thMct9hwUT3advUM=" else - "sha256-6fXzHSMzZDGuBubOXsHA0YEUGKcy5QIPg3noyxUbdjA="; + "sha256-o8njvwE/UsQpPuLyChxGAZ4euvwfuaHxs5pfUvcM7kI="; uri = builtins.replaceStrings [ "https://wps-linux-personal.wpscdn.cn" ] [ "" ] url; securityKey = "7f8faaaa468174dc1c9cd62e5f218a5b"; in diff --git a/pkgs/applications/office/zim/default.nix b/pkgs/applications/office/zim/default.nix index 98d83f53f2d33..77eaaa16b9929 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[@]}") ''; @@ -55,6 +55,6 @@ python3Packages.buildPythonApplication rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ pSub ]; mainProgram = "zim"; - broken = stdenv.isDarwin; # https://github.com/NixOS/nixpkgs/pull/52658#issuecomment-449565790 + broken = stdenv.hostPlatform.isDarwin; # https://github.com/NixOS/nixpkgs/pull/52658#issuecomment-449565790 }; } diff --git a/pkgs/applications/office/zk/default.nix b/pkgs/applications/office/zk/default.nix index a274ca210dafa..e491e9b95fcb9 100644 --- a/pkgs/applications/office/zk/default.nix +++ b/pkgs/applications/office/zk/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, buildGoModule, icu }: +{ lib, fetchFromGitHub, buildGoModule }: buildGoModule rec { pname = "zk"; diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix index b31ce7f8c2de7..7b9a22ff07215 100644 --- a/pkgs/applications/office/zotero/default.nix +++ b/pkgs/applications/office/zotero/default.nix @@ -3,99 +3,58 @@ , fetchurl , wrapGAppsHook3 , makeDesktopItem +, alsa-lib , atk , cairo -, coreutils -, curl -, cups , dbus-glib -, dbus -, dconf -, fontconfig -, freetype , gdk-pixbuf , glib -, glibc , gtk3 -, libX11 -, libXScrnSaver -, libxcb -, libXcomposite -, libXcursor -, libXdamage -, libXext -, libXfixes -, libXi -, libXinerama -, libXrender -, libXt -, libnotify -, gnome -, libGLU , libGL -, nspr -, nss +, libva +, xorg +, mesa , pango -, gsettings-desktop-schemas +, pciutils }: stdenv.mkDerivation rec { pname = "zotero"; - version = "6.0.35"; + version = "7.0.3"; src = fetchurl { - url = - "https://download.zotero.org/client/release/${version}/Zotero-${version}_linux-x86_64.tar.bz2"; - hash = "sha256-HAVLmamEPuFf0548/iEXes+f4XnQ7kU1u9hyOYhVyZ0="; + url = "https://download.zotero.org/client/release/${version}/Zotero-${version}_linux-x86_64.tar.bz2"; + hash = "sha256-W5/j5ohrx/X0qlOiWWtB/FEF9aZCnbbAA3pcL8R6yy0="; }; - nativeBuildInputs = [ wrapGAppsHook3 ]; - buildInputs = - [ gsettings-desktop-schemas glib gtk3 gnome.adwaita-icon-theme dconf ]; - - dontConfigure = true; - dontBuild = true; - dontStrip = true; dontPatchELF = true; + nativeBuildInputs = [ wrapGAppsHook3 ]; libPath = lib.makeLibraryPath [ - stdenv.cc.cc + alsa-lib atk cairo - curl - cups dbus-glib - dbus - fontconfig - freetype gdk-pixbuf glib - glibc gtk3 - libX11 - libXScrnSaver - libXcomposite - libXcursor - libxcb - libXdamage - libXext - libXfixes - libXi - libXinerama - libXrender - libXt - libnotify - libGLU libGL - nspr - nss + libva + xorg.libX11 + xorg.libXcomposite + xorg.libXcursor + xorg.libXdamage + xorg.libXext + xorg.libXfixes + xorg.libXi + xorg.libXrandr + xorg.libXtst + xorg.libxcb + mesa pango + pciutils ] + ":" + lib.makeSearchPathOutput "lib" "lib64" [ stdenv.cc.cc ]; - postPatch = '' - sed -i '/pref("app.update.enabled", true);/c\pref("app.update.enabled", false);' defaults/preferences/prefs.js - ''; - desktopItem = makeDesktopItem { name = "zotero"; exec = "zotero -url %U"; @@ -111,22 +70,29 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall + # Copy package contents to the output directory mkdir -p "$prefix/usr/lib/zotero-bin-${version}" cp -r * "$prefix/usr/lib/zotero-bin-${version}" mkdir -p "$out/bin" ln -s "$prefix/usr/lib/zotero-bin-${version}/zotero" "$out/bin/" - # install desktop file and icons. + # Install desktop file and icons mkdir -p $out/share/applications cp ${desktopItem}/share/applications/* $out/share/applications/ - for size in 16 32 48 256; do - install -Dm444 chrome/icons/default/default$size.png \ + for size in 32 64 128; do + install -Dm444 icons/icon''${size}.png \ $out/share/icons/hicolor/''${size}x''${size}/apps/zotero.png done + install -Dm444 icons/symbolic.svg \ + $out/share/icons/hicolor/symbolic/apps/zotero-symbolic.svg + + runHook postInstall + ''; + postFixup = '' for executable in \ - zotero-bin plugin-container \ - updater minidump-analyzer + zotero-bin plugin-container updater vaapitest \ + minidump-analyzer glxtest do if [ -e "$out/usr/lib/zotero-bin-${version}/$executable" ]; then patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ @@ -136,23 +102,15 @@ stdenv.mkDerivation rec { find . -executable -type f -exec \ patchelf --set-rpath "$libPath" \ "$out/usr/lib/zotero-bin-${version}/{}" \; - - runHook postInstall - ''; - - preFixup = '' - gappsWrapperArgs+=( - --prefix PATH : ${lib.makeBinPath [ coreutils ]} - ) ''; meta = with lib; { homepage = "https://www.zotero.org"; description = "Collect, organize, cite, and share your research sources"; + mainProgram = "zotero"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.agpl3Only; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ i077 ]; - mainProgram = "zotero"; + maintainers = with maintainers; [ atila justanotherariel ]; }; } diff --git a/pkgs/applications/office/zotero/zotero.sh b/pkgs/applications/office/zotero/zotero.sh deleted file mode 100644 index 8941097fc422f..0000000000000 --- a/pkgs/applications/office/zotero/zotero.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!@bash@/bin/bash - -exec "@firefox@/bin/firefox" -app "@out@/libexec/zotero/application.ini" "${@}" diff --git a/pkgs/applications/plasma-mobile/plasma-dialer.nix b/pkgs/applications/plasma-mobile/plasma-dialer.nix index 975d4571a16e9..5fa2638042e72 100644 --- a/pkgs/applications/plasma-mobile/plasma-dialer.nix +++ b/pkgs/applications/plasma-mobile/plasma-dialer.nix @@ -82,6 +82,6 @@ mkDerivation rec { mainProgram = "plasmaphonedialer"; homepage = "https://invent.kde.org/plasma-mobile/plasma-dialer"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/plasma-mobile/plasma-phonebook.nix b/pkgs/applications/plasma-mobile/plasma-phonebook.nix index 67164f548d1e0..a3d62cc4a7889 100644 --- a/pkgs/applications/plasma-mobile/plasma-phonebook.nix +++ b/pkgs/applications/plasma-mobile/plasma-phonebook.nix @@ -37,6 +37,6 @@ mkDerivation rec { homepage = "https://invent.kde.org/plasma-mobile/plasma-phonebook"; # https://invent.kde.org/plasma-mobile/plasma-phonebook/-/commit/3ac27760417e51c051c5dd44155c3f42dd000e4f license = licenses.gpl3Plus; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/plasma-mobile/plasma-settings.nix b/pkgs/applications/plasma-mobile/plasma-settings.nix index c30cda1cd8393..c0e58b6653c77 100644 --- a/pkgs/applications/plasma-mobile/plasma-settings.nix +++ b/pkgs/applications/plasma-mobile/plasma-settings.nix @@ -53,6 +53,6 @@ mkDerivation rec { homepage = "https://invent.kde.org/plasma-mobile/plasma-settings"; # https://invent.kde.org/plasma-mobile/plasma-settings/-/commit/a59007f383308503e59498b3036e1483bca26e35 license = licenses.gpl2Plus; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/plasma-mobile/spacebar.nix b/pkgs/applications/plasma-mobile/spacebar.nix index 8dce4192a08c1..4e38649d47e71 100644 --- a/pkgs/applications/plasma-mobile/spacebar.nix +++ b/pkgs/applications/plasma-mobile/spacebar.nix @@ -52,6 +52,6 @@ mkDerivation { mainProgram = "spacebar"; homepage = "https://invent.kde.org/plasma-mobile/spacebar"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/printing/pappl/default.nix b/pkgs/applications/printing/pappl/default.nix index 7c44bebcb0f04..abeb83c9271c3 100644 --- a/pkgs/applications/printing/pappl/default.nix +++ b/pkgs/applications/printing/pappl/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { libpng libusb1 zlib - ] ++ lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ # upstream mentions these are not needed for Mac # see: https://github.com/michaelrsweet/pappl#requirements avahi @@ -58,6 +58,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/michaelrsweet/pappl"; license = licenses.asl20; platforms = platforms.linux; # should also work for darwin, but requires additional work - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/qubes/qubes-core-vchan-xen/default.nix b/pkgs/applications/qubes/qubes-core-vchan-xen/default.nix index 21b80fcf51dd6..7def14890300d 100644 --- a/pkgs/applications/qubes/qubes-core-vchan-xen/default.nix +++ b/pkgs/applications/qubes/qubes-core-vchan-xen/default.nix @@ -28,8 +28,9 @@ stdenv.mkDerivation rec { description = "Libraries required for the higher-level Qubes daemons and tools"; homepage = "https://qubes-os.org"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ _0x4A6F ]; + maintainers = [ ]; platforms = platforms.linux; + broken = true; }; } diff --git a/pkgs/applications/radio/abracadabra/default.nix b/pkgs/applications/radio/abracadabra/default.nix index a9de02d1fa801..faede7f8d7f6d 100644 --- a/pkgs/applications/radio/abracadabra/default.nix +++ b/pkgs/applications/radio/abracadabra/default.nix @@ -1,18 +1,32 @@ -{ lib, stdenv, fetchFromGitHub, cmake, wrapQtAppsHook -, qtbase, qtmultimedia, qttools -, faad2, mpg123, portaudio -, libusb1, rtl-sdr, airspy, soapysdr-with-plugins -} : +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + wrapQtAppsHook, + qtbase, + qtmultimedia, + qttools, + qtpositioning, + qtlocation, + faad2, + mpg123, + portaudio, + libusb1, + rtl-sdr, + airspy, + soapysdr-with-plugins, +}: stdenv.mkDerivation rec { pname = "abracadabra"; - version = "2.5.0"; + version = "2.6.0"; src = fetchFromGitHub { owner = "KejPi"; repo = "AbracaDABra"; rev = "v${version}"; - hash = "sha256-w/WAcTorLCzqHLwQjbZwaHGytLXHr4eW7Yx768on67Q="; + hash = "sha256-oO8ef2VTw/gVNNU2JRXtEHEkJm7X7dypjZr0vZXCfH8="; }; nativeBuildInputs = [ @@ -24,6 +38,8 @@ stdenv.mkDerivation rec { buildInputs = [ qtbase qtmultimedia + qtlocation + qtpositioning faad2 mpg123 portaudio @@ -47,4 +63,3 @@ stdenv.mkDerivation rec { mainProgram = "AbracaDABra"; }; } - diff --git a/pkgs/applications/radio/airspy/default.nix b/pkgs/applications/radio/airspy/default.nix index 6cb0f40f129a8..3c1fa511aef77 100644 --- a/pkgs/applications/radio/airspy/default.nix +++ b/pkgs/applications/radio/airspy/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { buildInputs = [ libusb1 ]; cmakeFlags = - lib.optionals stdenv.isLinux [ "-DINSTALL_UDEV_RULES=ON" ]; + lib.optionals stdenv.hostPlatform.isLinux [ "-DINSTALL_UDEV_RULES=ON" ]; meta = with lib; { homepage = "https://github.com/airspy/airspyone_host"; diff --git a/pkgs/applications/radio/aldo/default.nix b/pkgs/applications/radio/aldo/default.nix index 3488ddecde396..03e775738618a 100644 --- a/pkgs/applications/radio/aldo/default.nix +++ b/pkgs/applications/radio/aldo/default.nix @@ -20,7 +20,7 @@ in stdenv.mkDerivation { description = "Morse code training program"; homepage = "http://aldo.nongnu.org/"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = platforms.linux; mainProgram = "aldo"; }; diff --git a/pkgs/applications/radio/anytone-emu/default.nix b/pkgs/applications/radio/anytone-emu/default.nix index eee3375294db3..8d87096b44077 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 = [ ]; platforms = platforms.linux; mainProgram = "anytone-emu"; }; diff --git a/pkgs/applications/radio/chirp/default.nix b/pkgs/applications/radio/chirp/default.nix deleted file mode 100644 index c113f365aef53..0000000000000 --- a/pkgs/applications/radio/chirp/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ lib -, fetchFromGitHub -, writeShellScript -, glib -, gsettings-desktop-schemas -, python3 -, unstableGitUpdater -, wrapGAppsHook3 -}: - -python3.pkgs.buildPythonApplication rec { - pname = "chirp"; - version = "0.4.0-unstable-2024-05-24"; - - src = fetchFromGitHub { - owner = "kk7ds"; - repo = "chirp"; - rev = "e17c021ba4fc39eea8a2a1de37ef04a0d1253090"; - hash = "sha256-YvIRo7g9fxnlf8og5CM2JLf8DeADVkcHdvb4ppS1veE="; - }; - buildInputs = [ - glib - gsettings-desktop-schemas - ]; - nativeBuildInputs = [ - wrapGAppsHook3 - ]; - propagatedBuildInputs = with python3.pkgs; [ - future - pyserial - requests - six - wxpython - yattag - ]; - - # "running build_ext" fails with no output - doCheck = false; - - passthru.updateScript = unstableGitUpdater { - tagConverter = writeShellScript "chirp-tag-converter.sh" '' - sed -e 's/^release_//g' -e 's/_/./g' - ''; - }; - - meta = with lib; { - description = "Free, open-source tool for programming your amateur radio"; - homepage = "https://chirp.danplanet.com/"; - license = licenses.gpl3Plus; - maintainers = [ maintainers.emantor ]; - platforms = platforms.linux; - }; -} 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/csdr/default.nix b/pkgs/applications/radio/csdr/default.nix index af05cb61e8362..65bbdbb05dac5 100644 --- a/pkgs/applications/radio/csdr/default.nix +++ b/pkgs/applications/radio/csdr/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { libsamplerate ]; - hardeningDisable = lib.optional stdenv.isAarch64 "format"; + hardeningDisable = lib.optional stdenv.hostPlatform.isAarch64 "format"; postFixup = '' substituteInPlace "$out"/lib/pkgconfig/csdr.pc \ @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { description = "Simple DSP library and command-line tool for Software Defined Radio"; license = licenses.gpl3Only; platforms = platforms.unix; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; maintainers = teams.c3d2.members; }; } diff --git a/pkgs/applications/radio/cubicsdr/default.nix b/pkgs/applications/radio/cubicsdr/default.nix index 839fc9ceaaa14..2677795dc0edf 100644 --- a/pkgs/applications/radio/cubicsdr/default.nix +++ b/pkgs/applications/radio/cubicsdr/default.nix @@ -24,8 +24,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ fftw hamlib liquid-dsp soapysdr-with-plugins wxGTK32 ] - ++ lib.optionals stdenv.isLinux [ libpulseaudio libGL libX11 ] - ++ lib.optionals stdenv.isDarwin [ Cocoa WebKit ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ libpulseaudio libGL libX11 ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa WebKit ]; cmakeFlags = [ "-DUSE_HAMLIB=ON" ] ++ lib.optional enableDigitalLab "-DENABLE_DIGITAL_LAB=ON"; diff --git a/pkgs/applications/radio/dablin/default.nix b/pkgs/applications/radio/dablin/default.nix deleted file mode 100644 index 5ccce0a2dc369..0000000000000 --- a/pkgs/applications/radio/dablin/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config -, mpg123, SDL2, gtkmm3, faad2, pcre -} : - -stdenv.mkDerivation rec { - pname = "dablin"; - version = "1.16.0"; - - src = fetchFromGitHub { - owner = "Opendigitalradio"; - repo = "dablin"; - rev = version; - sha256 = "sha256-1rjL0dSEgF7FF72KiT6Tyj7/wbRc24LzyzmM1IGdglc="; - }; - - nativeBuildInputs = [ cmake pkg-config ]; - - buildInputs = [ faad2 mpg123 SDL2 gtkmm3 pcre ]; - - meta = with lib; { - description = "Play DAB/DAB+ from ETI-NI aligned stream"; - homepage = "https://github.com/Opendigitalradio/dablin"; - license = with licenses; [ gpl3 lgpl21 ]; - platforms = platforms.linux; - maintainers = [ maintainers.markuskowa ]; - }; -} - diff --git a/pkgs/applications/radio/digiham/default.nix b/pkgs/applications/radio/digiham/default.nix index 652c6c63cf597..c5f08e1b778a7 100644 --- a/pkgs/applications/radio/digiham/default.nix +++ b/pkgs/applications/radio/digiham/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub -, cmake, pkg-config, protobuf, icu, csdr, codecserver +, cmake, protobuf, icu, csdr, codecserver }: stdenv.mkDerivation rec { diff --git a/pkgs/applications/radio/direwolf/default.nix b/pkgs/applications/radio/direwolf/default.nix index e55f895d24af1..6cd591fcbda64 100644 --- a/pkgs/applications/radio/direwolf/default.nix +++ b/pkgs/applications/radio/direwolf/default.nix @@ -30,8 +30,8 @@ stdenv.mkDerivation rec { strictDeps = true; - buildInputs = lib.optionals stdenv.isLinux [ alsa-lib udev ] - ++ lib.optionals stdenv.isDarwin [ portaudio ] + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib udev ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ portaudio ] ++ lib.optionals gpsdSupport [ gpsd ] ++ lib.optionals hamlibSupport [ hamlib ] ++ lib.optionals extraScripts [ python3 perl espeak ]; diff --git a/pkgs/applications/radio/dmrconfig/default.nix b/pkgs/applications/radio/dmrconfig/default.nix index 292263c0f2691..e235d68d365bd 100644 --- a/pkgs/applications/radio/dmrconfig/default.nix +++ b/pkgs/applications/radio/dmrconfig/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://github.com/sergev/dmrconfig"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = platforms.linux; mainProgram = "dmrconfig"; }; diff --git a/pkgs/applications/radio/dsd/default.nix b/pkgs/applications/radio/dsd/default.nix index 620923377add3..f23add3215760 100644 --- a/pkgs/applications/radio/dsd/default.nix +++ b/pkgs/applications/radio/dsd/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/szechyjs/dsd"; license = licenses.gpl2; platforms = platforms.unix; - maintainers = with maintainers; [ ]; + maintainers = [ ]; mainProgram = "dsd"; }; } diff --git a/pkgs/applications/radio/dump1090/default.nix b/pkgs/applications/radio/dump1090/default.nix index bcbf0ab9fd155..c34e18be8696f 100644 --- a/pkgs/applications/radio/dump1090/default.nix +++ b/pkgs/applications/radio/dump1090/default.nix @@ -1,12 +1,13 @@ { lib, stdenv , fetchFromGitHub , pkg-config +, hackrf , libbladeRF , libusb1 +, limesuite , ncurses , rtl-sdr -, hackrf -, limesuite +, soapysdr-with-plugins }: stdenv.mkDerivation rec { @@ -23,17 +24,18 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ + hackrf libbladeRF libusb1 ncurses rtl-sdr - hackrf - ] ++ lib.optional stdenv.isLinux limesuite; + soapysdr-with-plugins + ] ++ lib.optional stdenv.hostPlatform.isLinux limesuite; env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-implicit-function-declaration -Wno-int-conversion -Wno-unknown-warning-option"; - buildFlags = [ "DUMP1090_VERSION=${version}" "dump1090" "view1090" ]; + buildFlags = [ "DUMP1090_VERSION=${version}" "showconfig" "dump1090" "view1090" ]; doCheck = true; diff --git a/pkgs/applications/radio/flamp/default.nix b/pkgs/applications/radio/flamp/default.nix index fc44826258be1..b0a70b40898f2 100644 --- a/pkgs/applications/radio/flamp/default.nix +++ b/pkgs/applications/radio/flamp/default.nix @@ -4,7 +4,6 @@ , autoreconfHook , pkg-config , fltk13 -, libsndfile , gettext }: diff --git a/pkgs/applications/radio/fldigi/default.nix b/pkgs/applications/radio/fldigi/default.nix index 2390a4f8c0813..0a7edb7aed6ad 100644 --- a/pkgs/applications/radio/fldigi/default.nix +++ b/pkgs/applications/radio/fldigi/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { portaudio libsndfile libsamplerate - ] ++ lib.optionals (stdenv.isLinux) [ libpulseaudio alsa-lib udev ]; + ] ++ lib.optionals (stdenv.hostPlatform.isLinux) [ libpulseaudio alsa-lib udev ]; env.CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++14"; diff --git a/pkgs/applications/radio/flex-ncat/default.nix b/pkgs/applications/radio/flex-ncat/default.nix index 96912b95d1838..185f830aa6c69 100644 --- a/pkgs/applications/radio/flex-ncat/default.nix +++ b/pkgs/applications/radio/flex-ncat/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "flex-ncat"; - version = "0.4-20231210.1"; + version = "0.4-20240817.1"; src = fetchFromGitHub { owner = "kc2g-flex-tools"; repo = "nCAT"; rev = "v${version}"; - hash = "sha256-oC7TPq+Xsl960B7qJP81cWF+GGc28Miv4L8+1vWo7jA="; + hash = "sha256-OjivRCWSGdzko31KwiYb1FcIE+1W94XOYiE/GS4Ky3s="; }; - vendorHash = "sha256-1i9v8Ej7TMIO+aMYFPFxdfD4b5j84/zkegaYb67WokU="; + vendorHash = "sha256-RqQMCP9rmdTG5AXLXkIQz0vE7qF+3RZ1BDdVRYoHHQs="; meta = with lib; { homepage = "https://github.com/kc2g-flex-tools/nCAT"; diff --git a/pkgs/applications/radio/flex-ndax/default.nix b/pkgs/applications/radio/flex-ndax/default.nix index d350d481b9f56..e45604856a59e 100644 --- a/pkgs/applications/radio/flex-ndax/default.nix +++ b/pkgs/applications/radio/flex-ndax/default.nix @@ -2,21 +2,21 @@ buildGoModule rec { pname = "flex-ndax"; - version = "0.3-20230126.0"; + version = "0.4-20240818"; src = fetchFromGitHub { owner = "kc2g-flex-tools"; repo = "nDAX"; rev = "v${version}"; - hash = "sha256-co2S3DrdGeoNneqNyifd+Z1z5TshyD+FgHkiSRqK3SQ="; + hash = "sha256-FCF22apO6uAc24H36SkvfKEKdyqY4l+j7ABdOnhZP6M="; }; buildInputs = [ libpulseaudio ]; - vendorHash = "sha256-eHy8oFYicVONQr31LQQ9b5auzeBoIzbszw2buKaBQbQ="; + vendorHash = "sha256-05LWJm4MoJqjJaFrBZvutKlqSTGl4dSp433AfHHO6LU="; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; homepage = "https://github.com/kc2g-flex-tools/nDAX"; description = "FlexRadio digital audio transport (DAX) connector for PulseAudio"; license = licenses.mit; diff --git a/pkgs/applications/radio/freedv/default.nix b/pkgs/applications/radio/freedv/default.nix index 27da63dd40221..d53f67031600f 100644 --- a/pkgs/applications/radio/freedv/default.nix +++ b/pkgs/applications/radio/freedv/default.nix @@ -16,7 +16,7 @@ , hamlib_4 , wxGTK32 , sioclient -, pulseSupport ? config.pulseaudio or stdenv.isLinux +, pulseSupport ? config.pulseaudio or stdenv.hostPlatform.isLinux , AppKit , AVFoundation , Cocoa @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { hash = "sha256-oFuAH81mduiSQGIDgDDy1IPskqqCBmfWbpqQstUIw9g="; }; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace CMakeLists.txt \ --replace-fail "-Wl,-ld_classic" "" substituteInPlace src/CMakeLists.txt \ @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ macdylibbundler makeWrapper darwin.autoSignDarwinBinariesHook @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { wxGTK32 sioclient ] ++ (if pulseSupport then [ libpulseaudio ] else [ portaudio ]) - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit AVFoundation Cocoa @@ -74,13 +74,13 @@ stdenv.mkDerivation rec { "-DUSE_PULSEAUDIO:BOOL=${if pulseSupport then "TRUE" else "FALSE"}" ]; - env.NIX_CFLAGS_COMPILE = toString (lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + env.NIX_CFLAGS_COMPILE = toString (lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ "-DAPPLE_OLD_XCODE" ]); doCheck = true; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications mv $out/bin/FreeDV.app $out/Applications makeWrapper $out/Applications/FreeDV.app/Contents/MacOS/FreeDV $out/bin/freedv diff --git a/pkgs/applications/radio/gnuradio/3.8.nix b/pkgs/applications/radio/gnuradio/3.8.nix index 37533bb05d34d..b611ef66b8250 100644 --- a/pkgs/applications/radio/gnuradio/3.8.nix +++ b/pkgs/applications/radio/gnuradio/3.8.nix @@ -103,11 +103,11 @@ let runtime = [ thrift ]; - pythonRuntime = with python.pkgs; [ + pythonRuntime = [ python.pkgs.thrift # For gr-perf-monitorx - matplotlib - networkx + python.pkgs.matplotlib + python.pkgs.networkx ]; }; gnuradio-companion = { @@ -150,8 +150,8 @@ let }; gr-audio = { runtime = [] - ++ lib.optionals stdenv.isLinux [ alsa-lib libjack2 ] - ++ lib.optionals stdenv.isDarwin [ CoreAudio ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib libjack2 ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreAudio ] ; cmakeEnableFlag = "GR_AUDIO"; }; @@ -296,7 +296,7 @@ stdenv.mkDerivation (finalAttrs: (shared // { # This is the only python reference worth removing, if needed (3.7 doesn't # set that reference). + lib.optionalString (!hasFeature "python-support") '' - ${removeReferencesTo}/bin/remove-references-to -t ${python} $out/lib/cmake/gnuradio/GnuradioConfig.cmake + remove-references-to -t ${python} $out/lib/cmake/gnuradio/GnuradioConfig.cmake '' ; })) diff --git a/pkgs/applications/radio/gnuradio/3.9.nix b/pkgs/applications/radio/gnuradio/3.9.nix deleted file mode 100644 index 606681b1d6c83..0000000000000 --- a/pkgs/applications/radio/gnuradio/3.9.nix +++ /dev/null @@ -1,310 +0,0 @@ -{ lib, stdenv -, fetchpatch -, fetchFromGitHub -, cmake -# Remove gcc and python references -, removeReferencesTo -, pkg-config -, volk -, cppunit -, orc -, boost -, log4cpp -, mpir -, doxygen -, python -, codec2 -, gsm -, fftwFloat -, alsa-lib -, libjack2 -, CoreAudio -, uhd -, SDL -, gsl -, soapysdr -, libsodium -, libsndfile -, libunwind -, thrift -, cppzmq -# Needed only if qt-gui is disabled, from some reason -, icu -# GUI related -, gtk3 -, pango -, gobject-introspection -, cairo -, qt5 -, libsForQt5 -# Features available to override, the list of them is in featuresInfo. They -# are all turned on by default. -, features ? {} -# If one wishes to use a different src or name for a very custom build -, overrideSrc ? {} -, pname ? "gnuradio" -, version ? "3.9.8.0" -}: - -let - sourceSha256 = "sha256-0umGUOjD5l84CBBeDy1uFgUyEDpI9o9/SEQ8BZm22j4="; - featuresInfo = { - # Needed always - basic = { - native = [ - cmake - pkg-config - orc - ]; - runtime = [ - volk - boost - log4cpp - mpir - ] - # when gr-qtgui is disabled, icu needs to be included, otherwise - # building with boost 1.7x fails - ++ lib.optionals (!(hasFeature "gr-qtgui")) [ icu ]; - pythonNative = with python.pkgs; [ - mako - six - ]; - }; - doxygen = { - native = [ doxygen ]; - cmakeEnableFlag = "DOXYGEN"; - }; - man-pages = { - cmakeEnableFlag = "MANPAGES"; - }; - python-support = { - pythonRuntime = [ python.pkgs.six ]; - native = [ - python - ]; - cmakeEnableFlag = "PYTHON"; - }; - testing-support = { - native = [ cppunit ]; - cmakeEnableFlag = "TESTING"; - }; - post-install = { - cmakeEnableFlag = "POSTINSTALL"; - }; - gnuradio-runtime = { - cmakeEnableFlag = "GNURADIO_RUNTIME"; - pythonRuntime = [ - python.pkgs.pybind11 - ]; - }; - gr-ctrlport = { - runtime = [ - libunwind - thrift - ]; - pythonRuntime = with python.pkgs; [ - python.pkgs.thrift - # For gr-perf-monitorx - matplotlib - networkx - ]; - cmakeEnableFlag = "GR_CTRLPORT"; - }; - gnuradio-companion = { - pythonRuntime = with python.pkgs; [ - pyyaml - mako - numpy - pygobject3 - ]; - native = [ - python.pkgs.pytest - ]; - runtime = [ - gtk3 - pango - gobject-introspection - cairo - libsndfile - ]; - cmakeEnableFlag = "GRC"; - }; - jsonyaml_blocks = { - pythonRuntime = [ - python.pkgs.jsonschema - ]; - cmakeEnableFlag = "JSONYAML_BLOCKS"; - }; - gr-blocks = { - cmakeEnableFlag = "GR_BLOCKS"; - runtime = [ - libsndfile - ]; - }; - gr-fec = { - cmakeEnableFlag = "GR_FEC"; - }; - gr-fft = { - runtime = [ fftwFloat ]; - cmakeEnableFlag = "GR_FFT"; - }; - gr-filter = { - runtime = [ fftwFloat ]; - cmakeEnableFlag = "GR_FILTER"; - pythonRuntime = with python.pkgs; [ - scipy - pyqtgraph - ]; - }; - gr-analog = { - cmakeEnableFlag = "GR_ANALOG"; - }; - gr-digital = { - cmakeEnableFlag = "GR_DIGITAL"; - }; - gr-dtv = { - cmakeEnableFlag = "GR_DTV"; - }; - gr-audio = { - runtime = [] - ++ lib.optionals stdenv.isLinux [ alsa-lib libjack2 ] - ++ lib.optionals stdenv.isDarwin [ CoreAudio ] - ; - cmakeEnableFlag = "GR_AUDIO"; - }; - gr-channels = { - cmakeEnableFlag = "GR_CHANNELS"; - }; - gr-qtgui = { - runtime = [ qt5.qtbase libsForQt5.qwt ]; - pythonRuntime = [ python.pkgs.pyqt5 ]; - cmakeEnableFlag = "GR_QTGUI"; - }; - gr-trellis = { - cmakeEnableFlag = "GR_TRELLIS"; - }; - gr-uhd = { - runtime = [ - uhd - ]; - cmakeEnableFlag = "GR_UHD"; - }; - gr-uhd-rfnoc = { - runtime = [ - uhd - ]; - cmakeEnableFlag = "UHD_RFNOC"; - }; - gr-utils = { - cmakeEnableFlag = "GR_UTILS"; - pythonRuntime = with python.pkgs; [ - # For gr_plot - matplotlib - ]; - }; - gr-modtool = { - pythonRuntime = with python.pkgs; [ - setuptools - click - click-plugins - ]; - cmakeEnableFlag = "GR_MODTOOL"; - }; - gr-blocktool = { - cmakeEnableFlag = "GR_BLOCKTOOL"; - }; - gr-video-sdl = { - runtime = [ SDL ]; - cmakeEnableFlag = "GR_VIDEO_SDL"; - }; - gr-vocoder = { - runtime = [ codec2 gsm ]; - cmakeEnableFlag = "GR_VOCODER"; - }; - gr-wavelet = { - cmakeEnableFlag = "GR_WAVELET"; - runtime = [ gsl libsodium ]; - }; - gr-zeromq = { - runtime = [ cppzmq ]; - cmakeEnableFlag = "GR_ZEROMQ"; - pythonRuntime = [ - # Will compile without this, but it is required by tests, and by some - # gr blocks. - python.pkgs.pyzmq - ]; - }; - gr-network = { - cmakeEnableFlag = "GR_NETWORK"; - }; - gr-soapy = { - cmakeEnableFlag = "GR_SOAPY"; - runtime = [ - soapysdr - ]; - }; - }; - shared = (import ./shared.nix { - inherit - stdenv - lib - python - removeReferencesTo - featuresInfo - features - version - sourceSha256 - overrideSrc - fetchFromGitHub - ; - qt = qt5; - gtk = gtk3; - }); - inherit (shared.passthru) hasFeature; # function -in - -stdenv.mkDerivation (finalAttrs: (shared // { - inherit pname version; - # Will still evaluate correctly if not used here. It only helps nix-update - # find the right file in which version is defined. - inherit (shared) src; - # Remove failing tests - preConfigure = (shared.preConfigure or "") + '' - # https://github.com/gnuradio/gnuradio/issues/3801 - rm gr-blocks/python/blocks/qa_cpp_py_binding.py - rm gr-blocks/python/blocks/qa_cpp_py_binding_set.py - rm gr-blocks/python/blocks/qa_ctrlport_probes.py - ''; - patches = [ - # Not accepted upstream, see https://github.com/gnuradio/gnuradio/pull/5227 - ./modtool-newmod-permissions.3_9.patch - # Fix compilation with GCC 13 - (fetchpatch { - url = "https://github.com/gnuradio/gnuradio/commit/fe1b3592776c26e349e9985d47d3178568dfe6ec.patch"; - hash = "sha256-bu6fJuUo/i4kM+cZqSw8moB0ymoSVooLfwUIW+WDpWI="; - }) - ]; - passthru = shared.passthru // { - # Deps that are potentially overridden and are used inside GR plugins - the same version must - inherit - boost - volk - ; - # Used by many gnuradio modules, the same attribute is present in - # gnuradio3.10 where there it's spdlog. - logLib = log4cpp; - } // lib.optionalAttrs (hasFeature "gr-uhd") { - inherit uhd; - } // lib.optionalAttrs (hasFeature "gr-qtgui") { - inherit (libsForQt5) qwt; - }; - - postInstall = shared.postInstall - # This is the only python reference worth removing, if needed. - + lib.optionalString (!hasFeature "python-support") '' - ${removeReferencesTo}/bin/remove-references-to -t ${python} $out/lib/cmake/gnuradio/GnuradioConfig.cmake - ${removeReferencesTo}/bin/remove-references-to -t ${python} $(readlink -f $out/lib/libgnuradio-runtime${stdenv.hostPlatform.extensions.sharedLibrary}) - ${removeReferencesTo}/bin/remove-references-to -t ${python.pkgs.pybind11} $out/lib/cmake/gnuradio/gnuradio-runtimeTargets.cmake - '' - ; -})) diff --git a/pkgs/applications/radio/gnuradio/default.nix b/pkgs/applications/radio/gnuradio/default.nix index de851c24fa28a..f9113b0a23c39 100644 --- a/pkgs/applications/radio/gnuradio/default.nix +++ b/pkgs/applications/radio/gnuradio/default.nix @@ -44,11 +44,11 @@ # If one wishes to use a different src or name for a very custom build , overrideSrc ? {} , pname ? "gnuradio" -, version ? "3.10.10.0" +, version ? "3.10.11.0" }: let - sourceSha256 = "sha256-pEVWhXDjOevrduDbZQbiDbODZY8PpsGY4O8yxrwlCcs="; + sourceSha256 = "sha256-QOZXUj+ZmfpazsrHEs8Gx3WSmoHG/zO43NEpyhIjpN8="; featuresInfo = { # Needed always basic = { @@ -103,11 +103,11 @@ let libunwind thrift ]; - pythonRuntime = with python.pkgs; [ + pythonRuntime = [ python.pkgs.thrift # For gr-perf-monitorx - matplotlib - networkx + python.pkgs.matplotlib + python.pkgs.networkx ]; cmakeEnableFlag = "GR_CTRLPORT"; }; @@ -156,6 +156,7 @@ let pythonRuntime = with python.pkgs; [ scipy pyqtgraph + pyqt5 ]; }; gr-analog = { @@ -169,8 +170,8 @@ let }; gr-audio = { runtime = [] - ++ lib.optionals stdenv.isLinux [ alsa-lib libjack2 ] - ++ lib.optionals stdenv.isDarwin [ CoreAudio ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib libjack2 ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreAudio ] ; cmakeEnableFlag = "GR_AUDIO"; }; @@ -311,9 +312,9 @@ stdenv.mkDerivation (finalAttrs: (shared // { postInstall = shared.postInstall # This is the only python reference worth removing, if needed. + lib.optionalString (!hasFeature "python-support") '' - ${removeReferencesTo}/bin/remove-references-to -t ${python} $out/lib/cmake/gnuradio/GnuradioConfig.cmake - ${removeReferencesTo}/bin/remove-references-to -t ${python} $(readlink -f $out/lib/libgnuradio-runtime${stdenv.hostPlatform.extensions.sharedLibrary}) - ${removeReferencesTo}/bin/remove-references-to -t ${python.pkgs.pybind11} $out/lib/cmake/gnuradio/gnuradio-runtimeTargets.cmake + remove-references-to -t ${python} $out/lib/cmake/gnuradio/GnuradioConfig.cmake + remove-references-to -t ${python} $(readlink -f $out/lib/libgnuradio-runtime${stdenv.hostPlatform.extensions.sharedLibrary}) + remove-references-to -t ${python.pkgs.pybind11} $out/lib/cmake/gnuradio/gnuradio-runtimeTargets.cmake '' ; })) diff --git a/pkgs/applications/radio/gnuradio/modtool-newmod-permissions.3_9.patch b/pkgs/applications/radio/gnuradio/modtool-newmod-permissions.3_9.patch deleted file mode 100644 index 7cab73fede0cc..0000000000000 --- a/pkgs/applications/radio/gnuradio/modtool-newmod-permissions.3_9.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git c/gr-utils/modtool/core/newmod.py w/gr-utils/modtool/core/newmod.py -index babebfcde..9a02f663e 100644 ---- c/gr-utils/modtool/core/newmod.py -+++ w/gr-utils/modtool/core/newmod.py -@@ -62,7 +62,9 @@ class ModToolNewModule(ModTool): - self._setup_scm(mode='new') - logger.info(f"Creating out-of-tree module in {self.dir}...") - try: -- shutil.copytree(self.srcdir, self.dir) -+ # https://stackoverflow.com/a/17022146/4935114 -+ shutil.copystat = lambda x, y: x -+ shutil.copytree(self.srcdir, self.dir, copy_function=shutil.copyfile) - try: - shutil.copyfile(os.path.join(gr.prefix(), 'share', 'gnuradio', 'clang-format.conf'), - os.path.join(self.dir, '.clang-format')) diff --git a/pkgs/applications/radio/gnuradio/shared.nix b/pkgs/applications/radio/gnuradio/shared.nix index da3479777d4a9..75a2a97e0d22f 100644 --- a/pkgs/applications/radio/gnuradio/shared.nix +++ b/pkgs/applications/radio/gnuradio/shared.nix @@ -38,7 +38,7 @@ in { sha256 = sourceSha256; } ; - nativeBuildInputs = lib.flatten (lib.mapAttrsToList ( + nativeBuildInputs = [ removeReferencesTo ] ++ lib.flatten (lib.mapAttrsToList ( feat: info: ( lib.optionals (hasFeature feat) ( (lib.optionals (builtins.hasAttr "native" info) info.native) ++ @@ -85,11 +85,11 @@ in { postInstall = "" # Gcc references + lib.optionalString (hasFeature "gnuradio-runtime") '' - ${removeReferencesTo}/bin/remove-references-to -t ${stdenv.cc} $(readlink -f $out/lib/libgnuradio-runtime${stdenv.hostPlatform.extensions.sharedLibrary}) + remove-references-to -t ${stdenv.cc} $(readlink -f $out/lib/libgnuradio-runtime${stdenv.hostPlatform.extensions.sharedLibrary}) '' # Clang references in InstalledDir - + lib.optionalString (hasFeature "gnuradio-runtime" && stdenv.isDarwin) '' - ${removeReferencesTo}/bin/remove-references-to -t ${stdenv.cc.cc} $(readlink -f $out/lib/libgnuradio-runtime${stdenv.hostPlatform.extensions.sharedLibrary}) + + lib.optionalString (hasFeature "gnuradio-runtime" && stdenv.hostPlatform.isDarwin) '' + remove-references-to -t ${stdenv.cc.cc} $(readlink -f $out/lib/libgnuradio-runtime${stdenv.hostPlatform.extensions.sharedLibrary}) '' ; # NOTE: Outputs are disabled due to upstream not using GNU InstallDIrs cmake @@ -116,14 +116,14 @@ in { dontWrapQtApps = true; # On darwin, it requires playing with DYLD_FALLBACK_LIBRARY_PATH to make if # find libgnuradio-runtim.3.*.dylib . - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; preCheck = '' export HOME=$(mktemp -d) export QT_QPA_PLATFORM=offscreen export QT_PLUGIN_PATH="${qt.qtbase.bin}/${qt.qtbase.qtPluginPrefix}" ''; - meta = with lib; { + meta = { description = "Software Defined Radio (SDR) software"; mainProgram = "gnuradio-config-info"; longDescription = '' @@ -136,8 +136,8 @@ in { real-world radio systems. ''; homepage = "https://www.gnuradio.org"; - license = licenses.gpl3; - platforms = platforms.unix; - maintainers = with maintainers; [ doronbehar bjornfor fpletz jiegec ]; + license = lib.licenses.gpl3; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ doronbehar bjornfor fpletz jiegec ]; }; } diff --git a/pkgs/applications/radio/gnuradio/wrapper.nix b/pkgs/applications/radio/gnuradio/wrapper.nix index f468aadb27b5d..4ffe42593ec5d 100644 --- a/pkgs/applications/radio/gnuradio/wrapper.nix +++ b/pkgs/applications/radio/gnuradio/wrapper.nix @@ -127,7 +127,7 @@ let unwrapped.qt.qtbase.qtPluginPrefix (builtins.map lib.getBin ([ unwrapped.qt.qtbase - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ unwrapped.qt.qtwayland ])) }" @@ -137,7 +137,7 @@ let unwrapped.qt.qtbase.qtQmlPrefix (builtins.map lib.getBin ([ unwrapped.qt.qtbase - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ unwrapped.qt.qtwayland ])) }" diff --git a/pkgs/applications/radio/gridtracker/default.nix b/pkgs/applications/radio/gridtracker/default.nix index 2d632a44680f2..688db3fee1d92 100644 --- a/pkgs/applications/radio/gridtracker/default.nix +++ b/pkgs/applications/radio/gridtracker/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "gridtracker.org"; repo = "gridtracker"; rev = "v${version}"; - sha256 = "sha256-p3PdYOk0yvG3QkM17grzZmf9upK1n0zo4aOrlhGTvTU="; + hash = "sha256-p3PdYOk0yvG3QkM17grzZmf9upK1n0zo4aOrlhGTvTU="; }; nativeBuildInputs = [ wrapGAppsHook3 ]; diff --git a/pkgs/applications/radio/limesuite/default.nix b/pkgs/applications/radio/limesuite/default.nix index d8d7bcd22d0a8..9190896d8e11a 100644 --- a/pkgs/applications/radio/limesuite/default.nix +++ b/pkgs/applications/radio/limesuite/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { gnuplot libusb1 soapysdr - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ GLUT ] ++ lib.optionals withGui [ fltk diff --git a/pkgs/applications/radio/m17-cxx-demod/default.nix b/pkgs/applications/radio/m17-cxx-demod/default.nix index d6663fbc42876..47a7d103e76cc 100644 --- a/pkgs/applications/radio/m17-cxx-demod/default.nix +++ b/pkgs/applications/radio/m17-cxx-demod/default.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { platforms = platforms.unix; maintainers = teams.c3d2.members; # never built on aarch64-darwin, x86_64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/applications/radio/multimon-ng/default.nix b/pkgs/applications/radio/multimon-ng/default.nix index 646f8a990249d..f71af7e648625 100644 --- a/pkgs/applications/radio/multimon-ng/default.nix +++ b/pkgs/applications/radio/multimon-ng/default.nix @@ -2,16 +2,16 @@ stdenv.mkDerivation rec { pname = "multimon-ng"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "EliasOenal"; repo = "multimon-ng"; rev = version; - sha256 = "sha256-IJnvOVajkcjaa0DDo8hbkkVvBnDqPKQUN8wJHlafo70="; + sha256 = "sha256-irKpVerxzjJIiLofoTdySk/PzojuVLgMq2DYF0qPaAM="; }; - buildInputs = lib.optionals stdenv.isLinux [ libpulseaudio libX11 ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libpulseaudio libX11 ]; nativeBuildInputs = [ cmake makeWrapper ]; diff --git a/pkgs/applications/radio/pat/default.nix b/pkgs/applications/radio/pat/default.nix index 267be192f44f6..1f1140e5fd4b0 100644 --- a/pkgs/applications/radio/pat/default.nix +++ b/pkgs/applications/radio/pat/default.nix @@ -25,11 +25,11 @@ buildGoModule rec { installShellFiles ]; - buildInputs = lib.optional stdenv.isLinux [ libax25 ]; + buildInputs = lib.optional stdenv.hostPlatform.isLinux [ libax25 ]; # Needed by wl2k-go go module for libax25 to include support for Linux' AX.25 stack by linking against libax25. # ref: https://github.com/la5nta/wl2k-go/blob/abe3ae5bf6a2eec670a21672d461d1c3e1d4c2f3/transport/ax25/ax25.go#L11-L17 - tags = lib.optionals stdenv.isLinux [ "libax25" ]; + tags = lib.optionals stdenv.hostPlatform.isLinux [ "libax25" ]; postInstall = '' installManPage man/pat-configure.1 man/pat.1 diff --git a/pkgs/applications/radio/pothos/default.nix b/pkgs/applications/radio/pothos/default.nix index 93613cb5faa76..ac28698a46097 100644 --- a/pkgs/applications/radio/pothos/default.nix +++ b/pkgs/applications/radio/pothos/default.nix @@ -76,6 +76,6 @@ mkDerivation rec { homepage = "https://github.com/pothosware/PothosCore/wiki"; license = licenses.boost; platforms = platforms.linux; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/radio/qdmr/default.nix b/pkgs/applications/radio/qdmr/default.nix index ed3fa1715f75c..442828a763028 100644 --- a/pkgs/applications/radio/qdmr/default.nix +++ b/pkgs/applications/radio/qdmr/default.nix @@ -3,7 +3,6 @@ stdenv, fetchFromGitHub, installShellFiles, - writeText, cmake, libxslt, docbook_xsl_ns, @@ -17,18 +16,18 @@ }: let - inherit (stdenv) isLinux; + inherit (stdenv.hostPlatform) isLinux; in stdenv.mkDerivation rec { pname = "qdmr"; - version = "0.11.3"; + version = "0.12.0"; src = fetchFromGitHub { owner = "hmatuschek"; repo = "qdmr"; rev = "v${version}"; - hash = "sha256-YLGsKGcKIPd0ihd5IzlT71dYkxZfeH7BpnKQMEyY8dI="; + hash = "sha256-8NV0+M9eMcvkP3UERDkaimbapTKxB4rYRLbHZjzG4Ws="; }; nativeBuildInputs = [ @@ -67,7 +66,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/qlog/default.nix b/pkgs/applications/radio/qlog/default.nix index 7ec6756f20aa3..dacdfcbb2704c 100644 --- a/pkgs/applications/radio/qlog/default.nix +++ b/pkgs/applications/radio/qlog/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "qlog"; - version = "0.36.0"; + version = "0.38.0"; src = fetchFromGitHub { owner = "foldynl"; repo = "QLog"; rev = "v${version}"; - hash = "sha256-YbjtN08zEj8rlRDC5tS/JsBOH70DV98wmL6pFQTehgg="; + hash = "sha256-C9kXntcCUaEl/S1ypZrU0ZPfaJbzg6/aXJSC+TREmhc="; fetchSubmodules = true; }; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { qtwebchannel hamlib qtkeychain - ] ++ (lib.optionals stdenv.isDarwin [ + ] ++ (lib.optionals stdenv.hostPlatform.isDarwin [ cups ]); diff --git a/pkgs/applications/radio/qradiolink/default.nix b/pkgs/applications/radio/qradiolink/default.nix index ab413ca82e386..035f97fd19152 100644 --- a/pkgs/applications/radio/qradiolink/default.nix +++ b/pkgs/applications/radio/qradiolink/default.nix @@ -19,17 +19,18 @@ , speex , speexdsp , cppzmq +, uhd }: gnuradio3_8.pkgs.mkDerivation rec { pname = "qradiolink"; - version = "0.8.11-1"; + version = "0.9.0-1"; src = fetchFromGitHub { owner = "qradiolink"; repo = "qradiolink"; rev = version; - sha256 = "sha256-62+eKaLt9DlTebbnLPVJFx68bfWb7BrdQHocyJTfK28="; + sha256 = "sha256-Js6DzmUG8O9c9VvjE6hc7JGuFmgc1Wq41zVJb8Us/yI="; }; preBuild = '' @@ -67,6 +68,7 @@ gnuradio3_8.pkgs.mkDerivation rec { libsndfile cppzmq gnuradio3_8.qwt + uhd ] ++ lib.optionals (gnuradio3_8.hasFeature "gr-ctrlport") [ thrift gnuradio3_8.unwrapped.python.pkgs.thrift diff --git a/pkgs/applications/radio/quisk/default.nix b/pkgs/applications/radio/quisk/default.nix index aab629aa7c10c..0eef85c992a13 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.38"; src = fetchPypi { inherit pname version; - sha256 = "sha256-PwBQmL6CnDp55eLhXr3vpJXf4DcKAwzFSCnzxt5Nob4="; + hash = "sha256-IF7I+NgnqwU6c5R4caZslt7DJneI3fYk4KXl10dIsEw="; }; buildInputs = [ diff --git a/pkgs/applications/radio/rtl-sdr/default.nix b/pkgs/applications/radio/rtl-sdr/default.nix index f0bbba9b0a3ba..6cb25feb980b8 100644 --- a/pkgs/applications/radio/rtl-sdr/default.nix +++ b/pkgs/applications/radio/rtl-sdr/default.nix @@ -13,7 +13,7 @@ let nativeBuildInputs = [ pkg-config cmake ]; propagatedBuildInputs = [ libusb1 ]; - cmakeFlags = lib.optionals stdenv.isLinux [ + cmakeFlags = lib.optionals stdenv.hostPlatform.isLinux [ "-DINSTALL_UDEV_RULES=ON" "-DWITH_RPC=ON" ]; diff --git a/pkgs/applications/radio/sdr-j-fm/default.nix b/pkgs/applications/radio/sdr-j-fm/default.nix index 6c1dd5f4a0a1d..e77ce2d88eaac 100644 --- a/pkgs/applications/radio/sdr-j-fm/default.nix +++ b/pkgs/applications/radio/sdr-j-fm/default.nix @@ -6,7 +6,7 @@ wrapQtAppsHook, pkg-config, qtbase, - qwt, + qwt6_1, fftwFloat, libsamplerate, portaudio, @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ qtbase - qwt + qwt6_1 fftwFloat libsamplerate portaudio diff --git a/pkgs/applications/radio/sdrangel/default.nix b/pkgs/applications/radio/sdrangel/default.nix index 4f68ea70b345f..36535678a8d6a 100644 --- a/pkgs/applications/radio/sdrangel/default.nix +++ b/pkgs/applications/radio/sdrangel/default.nix @@ -52,13 +52,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "sdrangel"; - version = "7.21.3"; + version = "7.22.0"; src = fetchFromGitHub { owner = "f4exb"; repo = "sdrangel"; rev = "v${finalAttrs.version}"; - hash = "sha256-TeQteQ+RAnG1J0m4BEYJCrALkfplz3gO5IBi0GxTWmI="; + hash = "sha256-cF6vKwAWz32/XYUWvq/4Wu73TFQ2jaGIFxWmeXmlPCE="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/radio/sdrplay/default.nix b/pkgs/applications/radio/sdrplay/default.nix index 9d9ee298e09c0..d19ed4b027942 100644 --- a/pkgs/applications/radio/sdrplay/default.nix +++ b/pkgs/applications/radio/sdrplay/default.nix @@ -1,9 +1,9 @@ { stdenv, lib, fetchurl, autoPatchelfHook, udev, libusb1 }: let arch = - if stdenv.isx86_64 then "x86_64" - else if stdenv.isi686 then "i686" - else if stdenv.isAarch64 then "aarch64" + if stdenv.hostPlatform.isx86_64 then "x86_64" + else if stdenv.hostPlatform.isi686 then "i686" + else if stdenv.hostPlatform.isAarch64 then "aarch64" else throw "unsupported architecture"; version = "3.07.1"; diff --git a/pkgs/applications/radio/sdrpp/default.nix b/pkgs/applications/radio/sdrpp/default.nix index 1ae5c028d28e8..151a967d943ff 100644 --- a/pkgs/applications/radio/sdrpp/default.nix +++ b/pkgs/applications/radio/sdrpp/default.nix @@ -8,12 +8,12 @@ , hackrf_source ? true, hackrf , limesdr_source ? true, limesuite , perseus_source ? false # needs libperseus-sdr, not yet available in nixpks -, plutosdr_source ? stdenv.isLinux, libiio, libad9361 +, plutosdr_source ? stdenv.hostPlatform.isLinux, libiio, libad9361 , rfspace_source ? true , rtl_sdr_source ? true, rtl-sdr-osmocom, libusb1 # osmocom better w/ rtlsdr v4 , rtl_tcp_source ? true , sdrplay_source ? false, sdrplay -, soapy_source ? true, soapysdr +, soapy_source ? true, soapysdr-with-plugins , spyserver_source ? true , usrp_source ? false, uhd, boost @@ -70,8 +70,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ glfw glew fftwFloat volk zstd ] - ++ lib.optional stdenv.isDarwin AppKit - ++ lib.optional stdenv.isLinux libX11 + ++ lib.optional stdenv.hostPlatform.isDarwin AppKit + ++ lib.optional stdenv.hostPlatform.isLinux libX11 ++ lib.optional airspy_source airspy ++ lib.optional airspyhf_source airspyhf ++ lib.optional bladerf_source libbladeRF @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { ++ lib.optional limesdr_source limesuite ++ lib.optionals rtl_sdr_source [ rtl-sdr-osmocom libusb1 ] ++ lib.optional sdrplay_source sdrplay - ++ lib.optional soapy_source soapysdr + ++ lib.optional soapy_source soapysdr-with-plugins ++ lib.optionals plutosdr_source [ libiio libad9361 ] ++ lib.optionals usrp_source [ uhd boost ] ++ lib.optional audio_sink rtaudio diff --git a/pkgs/applications/radio/soapyairspy/default.nix b/pkgs/applications/radio/soapyairspy/default.nix index 289a20d281ccb..9d198ad15eb35 100644 --- a/pkgs/applications/radio/soapyairspy/default.nix +++ b/pkgs/applications/radio/soapyairspy/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ airspy soapysdr ] - ++ lib.optionals stdenv.isDarwin [ libobjc IOKit Security ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libobjc IOKit Security ]; cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ]; diff --git a/pkgs/applications/radio/soapyaudio/default.nix b/pkgs/applications/radio/soapyaudio/default.nix index 7434791b69f0b..86921754d6b64 100644 --- a/pkgs/applications/radio/soapyaudio/default.nix +++ b/pkgs/applications/radio/soapyaudio/default.nix @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ hamlib rtaudio libjack2 libusb1 soapysdr ] - ++ lib.optionals stdenv.isLinux [ alsa-lib libpulseaudio ] - ++ lib.optionals stdenv.isDarwin [ Accelerate CoreAudio ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib libpulseaudio ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Accelerate CoreAudio ]; cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" diff --git a/pkgs/applications/radio/soapybladerf/default.nix b/pkgs/applications/radio/soapybladerf/default.nix index 0f2b445b960e5..15c46507350c2 100644 --- a/pkgs/applications/radio/soapybladerf/default.nix +++ b/pkgs/applications/radio/soapybladerf/default.nix @@ -19,7 +19,7 @@ in stdenv.mkDerivation { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ libbladeRF soapysdr ] - ++ lib.optionals stdenv.isDarwin [ libobjc IOKit Security ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libobjc IOKit Security ]; cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ]; diff --git a/pkgs/applications/radio/soapyhackrf/default.nix b/pkgs/applications/radio/soapyhackrf/default.nix index be621c0d3135e..3f385a4b7255e 100644 --- a/pkgs/applications/radio/soapyhackrf/default.nix +++ b/pkgs/applications/radio/soapyhackrf/default.nix @@ -19,7 +19,7 @@ in stdenv.mkDerivation { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ hackrf soapysdr ] - ++ lib.optionals stdenv.isDarwin [ libobjc IOKit Security ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libobjc IOKit Security ]; cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ]; diff --git a/pkgs/applications/radio/soapyremote/default.nix b/pkgs/applications/radio/soapyremote/default.nix index c6e7cddd0903c..4191b8ae95ceb 100644 --- a/pkgs/applications/radio/soapyremote/default.nix +++ b/pkgs/applications/radio/soapyremote/default.nix @@ -19,7 +19,7 @@ in stdenv.mkDerivation { cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ]; - env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.isDarwin [ "-include sys/select.h" ]); + env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.hostPlatform.isDarwin [ "-include sys/select.h" ]); meta = with lib; { homepage = "https://github.com/pothosware/SoapyRemote"; diff --git a/pkgs/applications/radio/soapyrtlsdr/default.nix b/pkgs/applications/radio/soapyrtlsdr/default.nix index 80ea41e4f950f..f0a5194a4a9e8 100644 --- a/pkgs/applications/radio/soapyrtlsdr/default.nix +++ b/pkgs/applications/radio/soapyrtlsdr/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ rtl-sdr soapysdr ] - ++ lib.optionals stdenv.isDarwin [ libobjc IOKit Security ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libobjc IOKit Security ]; cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ]; diff --git a/pkgs/applications/radio/soapysdr/default.nix b/pkgs/applications/radio/soapysdr/default.nix index ee03d67d59862..68d30ab73cfb3 100644 --- a/pkgs/applications/radio/soapysdr/default.nix +++ b/pkgs/applications/radio/soapysdr/default.nix @@ -1,18 +1,19 @@ -{ stdenv -, lib -, fetchFromGitHub -, fetchpatch -, cmake -, pkg-config -, makeWrapper -, libusb-compat-0_1 -, ncurses -, usePython ? false -, python ? null -, swig2 -, extraPackages ? [ ] -, buildPackages -, testers +{ + stdenv, + lib, + fetchFromGitHub, + fetchpatch, + cmake, + pkg-config, + makeWrapper, + libusb-compat-0_1, + ncurses, + usePython ? false, + python ? null, + swig, + extraPackages ? [ ], + buildPackages, + testers, }: stdenv.mkDerivation (finalAttrs: { @@ -39,21 +40,19 @@ stdenv.mkDerivation (finalAttrs: { pkg-config makeWrapper ]; - buildInputs = [ - libusb-compat-0_1 - ncurses - ] ++ lib.optionals usePython [ - python - swig2 - ]; + buildInputs = + [ + libusb-compat-0_1 + ncurses + ] + ++ lib.optionals usePython [ + python + swig + ]; - propagatedBuildInputs = lib.optionals usePython [ - python.pkgs.numpy - ]; + propagatedBuildInputs = lib.optionals usePython [ python.pkgs.numpy ]; - cmakeFlags = lib.optionals usePython [ - "-DUSE_PYTHON_CONFIG=ON" - ]; + cmakeFlags = lib.optionals usePython [ "-DUSE_PYTHON_CONFIG=ON" ]; postFixup = lib.optionalString (extraPackages != [ ]) ( # Join all plugins via symlinking @@ -62,12 +61,11 @@ stdenv.mkDerivation (finalAttrs: { ${buildPackages.xorg.lndir}/bin/lndir -silent ${pkg} $out '')) lib.concatStrings - ] + '' + ] + + '' # Needed for at least the remote plugin server for file in $out/bin/*; do - wrapProgram "$file" --prefix SOAPY_SDR_PLUGIN_PATH : ${lib.escapeShellArg ( - lib.makeSearchPath finalAttrs.passthru.searchPath extraPackages - )} + wrapProgram "$file" --prefix SOAPY_SDR_PLUGIN_PATH : ${lib.escapeShellArg (lib.makeSearchPath finalAttrs.passthru.searchPath extraPackages)} done '' ); diff --git a/pkgs/applications/radio/soapyuhd/default.nix b/pkgs/applications/radio/soapyuhd/default.nix index 9220df3f5f946..de7b7be855ec6 100644 --- a/pkgs/applications/radio/soapyuhd/default.nix +++ b/pkgs/applications/radio/soapyuhd/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ uhd boost soapysdr ] - ++ lib.optionals stdenv.isDarwin [ libobjc IOKit Security ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libobjc IOKit Security ]; cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ]; diff --git a/pkgs/applications/radio/splat/default.nix b/pkgs/applications/radio/splat/default.nix index 59d0fc1fdeb0e..1bf4e738c7138 100644 --- a/pkgs/applications/radio/splat/default.nix +++ b/pkgs/applications/radio/splat/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "SPLAT! is an RF Signal Propagation, Loss, And Terrain analysis tool for the electromagnetic spectrum between 20 MHz and 20 GHz"; license = licenses.gpl2Only; diff --git a/pkgs/applications/radio/suscan/default.nix b/pkgs/applications/radio/suscan/default.nix index d2b13784a72cf..62600c440da5d 100644 --- a/pkgs/applications/radio/suscan/default.nix +++ b/pkgs/applications/radio/suscan/default.nix @@ -9,16 +9,17 @@ , soapysdr-with-plugins , libxml2 , volk +, zlib }: stdenv.mkDerivation rec { pname = "suscan"; - version = "unstable-2022-07-05"; + version = "0.3.0"; src = fetchFromGitHub { owner = "BatchDrake"; repo = "suscan"; - rev = "37dad542b97aff24654f0bb80fb8e85af7cb84ab"; + rev = "v${version}"; sha256 = "sha256-h1ogtYjkqiHb1/NAJfJ0HQIvGnZM2K/PSP5nqLXUf9M="; }; @@ -38,6 +39,7 @@ stdenv.mkDerivation rec { soapysdr-with-plugins libxml2 volk + zlib ]; meta = with lib; { diff --git a/pkgs/applications/radio/tlf/default.nix b/pkgs/applications/radio/tlf/default.nix index aad62602889d3..c6d8920f828d4 100644 --- a/pkgs/applications/radio/tlf/default.nix +++ b/pkgs/applications/radio/tlf/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://tlf.github.io/"; license = licenses.gpl2; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/radio/ubertooth/default.nix b/pkgs/applications/radio/ubertooth/default.nix index 62e645fb6df81..2d8b9f857938d 100644 --- a/pkgs/applications/radio/ubertooth/default.nix +++ b/pkgs/applications/radio/ubertooth/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ libbtbb libpcap libusb1 bluez ]; - cmakeFlags = lib.optionals stdenv.isLinux [ + cmakeFlags = lib.optionals stdenv.hostPlatform.isLinux [ "-DINSTALL_UDEV_RULES=TRUE" "-DUDEV_RULES_PATH=etc/udev/rules.d" "-DUDEV_RULES_GROUP=${udevGroup}" diff --git a/pkgs/applications/radio/uhd/default.nix b/pkgs/applications/radio/uhd/default.nix index 947d7d48108d2..ce668c45300f6 100644 --- a/pkgs/applications/radio/uhd/default.nix +++ b/pkgs/applications/radio/uhd/default.nix @@ -139,7 +139,7 @@ stdenv.mkDerivation (finalAttrs: { # TODO: Check if this still needed # ABI differences GCC 7.1 # /nix/store/wd6r25miqbk9ia53pp669gn4wrg9n9cj-gcc-7.3.0/include/c++/7.3.0/bits/vector.tcc:394:7: note: parameter passing for argument of type 'std::vector<uhd::range_t>::iterator {aka __gnu_cxx::__normal_iterator<uhd::range_t*, std::vector<uhd::range_t> >}' changed in GCC 7.1 - ] ++ optionals stdenv.isAarch32 [ + ] ++ optionals stdenv.hostPlatform.isAarch32 [ "-DCMAKE_CXX_FLAGS=-Wno-psabi" ]; @@ -163,7 +163,7 @@ stdenv.mkDerivation (finalAttrs: { ]; # many tests fails on darwin, according to ofborg - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; # Build only the host software preConfigure = "cd host"; diff --git a/pkgs/applications/radio/urh/default.nix b/pkgs/applications/radio/urh/default.nix index 6363670d56b75..53f5cfa9c15cd 100644 --- a/pkgs/applications/radio/urh/default.nix +++ b/pkgs/applications/radio/urh/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, python3Packages +{ stdenv, lib, fetchFromGitHub, python3Packages , hackrf, rtl-sdr, airspy, limesuite, libiio , libbladeRF , qt5 @@ -17,7 +17,8 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ qt5.wrapQtAppsHook ]; buildInputs = [ hackrf rtl-sdr airspy limesuite libiio libbladeRF ] - ++ lib.optional USRPSupport uhd; + ++ lib.optional USRPSupport uhd + ++ lib.optional stdenv.hostPlatform.isLinux qt5.qtwayland; propagatedBuildInputs = with python3Packages; [ pyqt5 numpy psutil cython pyzmq pyaudio setuptools diff --git a/pkgs/applications/science/astronomy/calcmysky/default.nix b/pkgs/applications/science/astronomy/calcmysky/default.nix index 9b7f50415ecde..2fe51ba98d925 100644 --- a/pkgs/applications/science/astronomy/calcmysky/default.nix +++ b/pkgs/applications/science/astronomy/calcmysky/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "calcmysky"; - version = "0.3.2"; + version = "0.3.3"; src = fetchFromGitHub { owner = "10110111"; repo = "CalcMySky"; rev = "refs/tags/v${version}"; - hash = "sha256-AP6YkORbvH8PzF869s2OWbTwTfwMC+RLJx3V3BqVy88="; + hash = "sha256-18ZNnLK2zMT7P0MDXS6Z38LffE8EqXKBH89TPPxVWlo="; }; nativeBuildInputs = [ cmake wrapQtAppsHook ]; diff --git a/pkgs/applications/science/astronomy/celestia/default.nix b/pkgs/applications/science/astronomy/celestia/default.nix index 8b40196fdbff5..2d227389d4298 100644 --- a/pkgs/applications/science/astronomy/celestia/default.nix +++ b/pkgs/applications/science/astronomy/celestia/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, freeglut, gtk2, gtkglext +{ lib, stdenv, fetchFromGitHub, pkg-config, libglut, gtk2, gtkglext , libjpeg_turbo, libtheora, libXmu, lua, libGLU, libGL, perl, autoreconfHook }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ - freeglut gtk2 gtkglext lua perl + libglut gtk2 gtkglext lua perl libjpeg_turbo libtheora libXmu libGLU libGL ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - homepage = "https://celestia.space/"; + homepage = "https://celestiaproject.space/"; description = "Real-time 3D simulation of space"; mainProgram = "celestia"; changelog = "https://github.com/CelestiaProject/Celestia/releases/tag/${version}"; diff --git a/pkgs/applications/science/astronomy/gildas/default.nix b/pkgs/applications/science/astronomy/gildas/default.nix index 5767efab733cb..eafc631ef92c1 100644 --- a/pkgs/applications/science/astronomy/gildas/default.nix +++ b/pkgs/applications/science/astronomy/gildas/default.nix @@ -7,8 +7,8 @@ let in stdenv.mkDerivation rec { - srcVersion = "apr24a"; - version = "20240401_a"; + srcVersion = "sep24a"; + version = "20240901_a"; pname = "gildas"; src = fetchurl { @@ -16,23 +16,23 @@ stdenv.mkDerivation rec { # source code of the previous release to a different directory urls = [ "http://www.iram.fr/~gildas/dist/gildas-src-${srcVersion}.tar.xz" "http://www.iram.fr/~gildas/dist/archive/gildas/gildas-src-${srcVersion}.tar.xz" ]; - sha256 = "sha256-Eq6S5S8xrhkCo6O2wUaHnoMDVG9WeiSurGvOc+2JKbM="; + sha256 = "sha256-dZ03J3I1dgoSgSc9yGfO13ZvNawCSYKN3+SGvp1eyGA="; }; nativeBuildInputs = [ pkg-config groff perl getopt gfortran which ]; buildInputs = [ gtk2-x11 lesstif cfitsio python3Env ncurses ] - ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ CoreFoundation ]); + ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ CoreFoundation ]); patches = [ ./wrapper.patch ] - ++ lib.optionals stdenv.isDarwin ([ ./clang.patch ./cpp-darwin.patch ]); + ++ lib.optionals stdenv.hostPlatform.isDarwin ([ ./clang.patch ./cpp-darwin.patch ]); env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-unused-command-line-argument"; # Workaround for https://github.com/NixOS/nixpkgs/issues/304528 - env.GAG_CPP = lib.optionalString stdenv.isDarwin "${gfortran.outPath}/bin/cpp"; + env.GAG_CPP = lib.optionalString stdenv.hostPlatform.isDarwin "${gfortran.outPath}/bin/cpp"; - NIX_LDFLAGS = lib.optionalString stdenv.isDarwin (with darwin.apple_sdk.frameworks; "-F${CoreFoundation}/Library/Frameworks"); + NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; "-F${CoreFoundation}/Library/Frameworks"); configurePhase='' substituteInPlace admin/wrapper.sh --replace '%%OUT%%' $out diff --git a/pkgs/applications/science/astronomy/gnuastro/default.nix b/pkgs/applications/science/astronomy/gnuastro/default.nix deleted file mode 100644 index d1c40d3fefb3e..0000000000000 --- a/pkgs/applications/science/astronomy/gnuastro/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib, stdenv, fetchurl, libtool -, cfitsio, curl, ghostscript, gsl, libgit2, libjpeg, libtiff, lzlib, wcslib }: - -stdenv.mkDerivation rec { - pname = "gnuastro"; - version = "0.22"; - - src = fetchurl { - url = "mirror://gnu/gnuastro/gnuastro-${version}.tar.gz"; - sha256 = "sha256-f9fxaga95VrtliggkM2SITW+6pAjaeWvgUOJ6rnMcwg="; - }; - - nativeBuildInputs = [ libtool ]; - - buildInputs = [ - cfitsio - curl - ghostscript - gsl - libgit2 - libjpeg - libtiff - lzlib - wcslib - ]; - - enableParallelBuilding = true; - - meta = with lib; { - description = "GNU astronomy utilities and library"; - homepage = "https://www.gnu.org/software/gnuastro/"; - changelog = "https://git.savannah.gnu.org/cgit/gnuastro.git/plain/NEWS?id=gnuastro_v${version}"; - license = licenses.gpl3Plus; - platforms = platforms.unix; - maintainers = with maintainers; [ sikmir ]; - }; -} diff --git a/pkgs/applications/science/astronomy/gravit/default.nix b/pkgs/applications/science/astronomy/gravit/default.nix index 36f58d8d18a1b..b734ea9750dcc 100644 --- a/pkgs/applications/science/astronomy/gravit/default.nix +++ b/pkgs/applications/science/astronomy/gravit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, SDL, SDL_ttf, SDL_image, libSM, libICE, libGLU, libGL, libpng, lua5, autoconf, automake }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, SDL, SDL_ttf, SDL_image, libSM, libICE, libGLU, libGL, libpng, lua5, autoconf, automake, mesa }: stdenv.mkDerivation rec { pname = "gravit"; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); homepage = "https://github.com/gak/gravit"; description = "Beautiful OpenGL-based gravity simulator"; mainProgram = "gravit"; @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { view in 3D and zoom in and out. ''; - platforms = lib.platforms.mesaPlatforms; + inherit (mesa.meta) platforms; hydraPlatforms = lib.platforms.linux; # darwin times out }; } diff --git a/pkgs/applications/science/astronomy/kstars/default.nix b/pkgs/applications/science/astronomy/kstars/default.nix index 863c5b70e0211..5f9fe55b9b5f3 100644 --- a/pkgs/applications/science/astronomy/kstars/default.nix +++ b/pkgs/applications/science/astronomy/kstars/default.nix @@ -37,11 +37,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "kstars"; - version = "3.7.0"; + version = "3.7.2"; src = fetchurl { - url = "mirror://kde/stable/kstars/kstars-${finalAttrs.version}.tar.xz"; - hash = "sha256-yvN1k0LqUi5Odb34Nk8UP5qoIbFUcvUiyESpoMKmuqg="; + url = "mirror://kde/stable/kstars/${finalAttrs.version}/kstars-${finalAttrs.version}.tar.xz"; + hash = "sha256-fEu3BGBW5cgrY38zBB3iL0/SRrobEtJVsGNWRNtT40s="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix index 687c0b3a2dda2..7ddaf5357e7c3 100644 --- a/pkgs/applications/science/astronomy/stellarium/default.nix +++ b/pkgs/applications/science/astronomy/stellarium/default.nix @@ -20,17 +20,19 @@ , qttools , exiv2 , nlopt +, testers +, xvfb-run }: stdenv.mkDerivation (finalAttrs: { pname = "stellarium"; - version = "24.1"; + version = "24.2"; src = fetchFromGitHub { owner = "Stellarium"; repo = "stellarium"; rev = "v${finalAttrs.version}"; - hash = "sha256-t3eFmiG9X2cmnjc/PQwZ2bw1SCHaNRA83wiT1cPbKJc="; + hash = "sha256-tqyLwlf8hugixZSsFCZPTtchO3VXk3m/nX1kuDoLOAY="; }; patches = [ @@ -41,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { }) ]; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace CMakeLists.txt \ --replace 'SET(CMAKE_INSTALL_PREFIX "''${PROJECT_BINARY_DIR}/Stellarium.app/Contents")' \ 'SET(CMAKE_INSTALL_PREFIX "${placeholder "out"}/Applications/Stellarium.app/Contents")' @@ -70,22 +72,22 @@ stdenv.mkDerivation (finalAttrs: { libnova exiv2 nlopt - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ qtwayland ]; preConfigure = '' export SOURCE_DATE_EPOCH=$(date -d 20${lib.versions.major finalAttrs.version}0101 +%s) - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' export LC_ALL=en_US.UTF-8 ''; # fatal error: 'QtSerialPort/QSerialPortInfo' file not found - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-F${qtserialport}/lib"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-F${qtserialport}/lib"; dontWrapGApps = true; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' makeWrapper $out/Applications/Stellarium.app/Contents/MacOS/Stellarium $out/bin/stellarium ''; @@ -93,6 +95,18 @@ stdenv.mkDerivation (finalAttrs: { qtWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; + passthru.tests.version = testers.testVersion { + package = finalAttrs.finalPackage; + command = '' + # Create a temporary home directory because stellarium aborts with an + # error if it can't write some configuration files. + tmpdir=$(mktemp -d) + + # stellarium can't be run in headless mode, therefore we need xvfb-run. + HOME="$tmpdir" ${xvfb-run}/bin/xvfb-run stellarium --version + ''; + }; + meta = { description = "Free open-source planetarium"; mainProgram = "stellarium"; diff --git a/pkgs/applications/science/biology/ants/default.nix b/pkgs/applications/science/biology/ants/default.nix index c4b932f6dbae8..b42eb791d27f5 100644 --- a/pkgs/applications/science/biology/ants/default.nix +++ b/pkgs/applications/science/biology/ants/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "ANTs"; - version = "2.5.2"; + version = "2.5.3"; src = fetchFromGitHub { owner = "ANTsX"; repo = "ANTs"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-crvLxUP/uM0u1oakxcpsiULAKUo+86hGATs/kHNseaw="; + hash = "sha256-DZzuHMC0XymFCnDn+H1pRFx9jUt+s03PaN88R4ZBRwY="; }; nativeBuildInputs = [ @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ itk vtk - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ]; diff --git a/pkgs/applications/science/biology/bamtools/default.nix b/pkgs/applications/science/biology/bamtools/default.nix index 602254e2966ad..820459e00003b 100644 --- a/pkgs/applications/science/biology/bamtools/default.nix +++ b/pkgs/applications/science/biology/bamtools/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { description = "C++ API & command-line toolkit for working with BAM data"; mainProgram = "bamtools"; homepage = "https://github.com/pezmaster31/bamtools"; - changelog = "https://github.com/pezmaster31/bamtools/releases/tag/${finalAttrs.src.rev}"; + changelog = "https://github.com/pezmaster31/bamtools/releases/tag/${lib.removePrefix "refs/tags/" finalAttrs.src.rev}"; license = licenses.mit; maintainers = with maintainers; [ natsukium ]; platforms = platforms.unix; diff --git a/pkgs/applications/science/biology/bcftools/default.nix b/pkgs/applications/science/biology/bcftools/default.nix index cafc952dec4c7..1e44835302385 100644 --- a/pkgs/applications/science/biology/bcftools/default.nix +++ b/pkgs/applications/science/biology/bcftools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bcftools"; - version = "1.20"; + version = "1.21"; src = fetchurl { url = "https://github.com/samtools/bcftools/releases/download/${version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-MSuDKd5RMN06N2eMcSlR5h5XcVV8cSmnCjJ6MA/ahiA="; + sha256 = "sha256-UopMwdNVU2jbdacAsio8ldqJP9GCf20wRxbf1F6k4oI="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/biology/blast/bin.nix b/pkgs/applications/science/biology/blast/bin.nix index 48537a568e4ba..1e3975f9f5ffa 100644 --- a/pkgs/applications/science/biology/blast/bin.nix +++ b/pkgs/applications/science/biology/blast/bin.nix @@ -35,9 +35,9 @@ in stdenv.mkDerivation { inherit pname version src; - nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ]; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; - buildInputs = [ python3 perl ] ++ lib.optionals stdenv.isLinux [ zlib bzip2 glib libxml2 ]; + buildInputs = [ python3 perl ] ++ lib.optionals stdenv.hostPlatform.isLinux [ zlib bzip2 glib libxml2 ]; installPhase = '' runHook preInstall diff --git a/pkgs/applications/science/biology/blast/default.nix b/pkgs/applications/science/biology/blast/default.nix index 407d38970b0f8..791d6049ad6da 100644 --- a/pkgs/applications/science/biology/blast/default.nix +++ b/pkgs/applications/science/biology/blast/default.nix @@ -81,7 +81,7 @@ stdenv.mkDerivation rec { # perl is necessary in buildInputs so that installed perl scripts get patched # correctly buildInputs = [ coreutils perl gawk zlib bzip2 cpio ] - ++ lib.optionals stdenv.isDarwin [ ApplicationServices ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ ApplicationServices ]; hardeningDisable = [ "format" ]; postInstall = '' diff --git a/pkgs/applications/science/biology/bowtie2/default.nix b/pkgs/applications/science/biology/bowtie2/default.nix index 576b46288c885..2a1358f2e5b77 100644 --- a/pkgs/applications/science/biology/bowtie2/default.nix +++ b/pkgs/applications/science/biology/bowtie2/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Ultrafast and memory-efficient tool for aligning sequencing reads to long reference sequences"; license = licenses.gpl3Plus; homepage = "http://bowtie-bio.sf.net/bowtie2"; - changelog = "https://github.com/BenLangmead/bowtie2/releases/tag/${finalAttrs.src.rev}"; + changelog = "https://github.com/BenLangmead/bowtie2/releases/tag/${lib.removePrefix "refs/tags/" finalAttrs.src.rev}"; maintainers = with maintainers; [ rybern ]; platforms = platforms.all; mainProgram = "bowtie2"; diff --git a/pkgs/applications/science/biology/bwa-mem2/default.nix b/pkgs/applications/science/biology/bwa-mem2/default.nix index c339baf446d2d..0a2d2c8d20529 100644 --- a/pkgs/applications/science/biology/bwa-mem2/default.nix +++ b/pkgs/applications/science/biology/bwa-mem2/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ zlib ]; # see https://github.com/bwa-mem2/bwa-mem2/issues/93 - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' sed -i 's/memset_s/memset8_s/g' ext/safestringlib/include/safe_mem_lib.h sed -i 's/memset_s/memset8_s/g' ext/safestringlib/safeclib/memset16_s.c sed -i 's/memset_s/memset8_s/g' ext/safestringlib/safeclib/memset32_s.c diff --git a/pkgs/applications/science/biology/cmtk/default.nix b/pkgs/applications/science/biology/cmtk/default.nix index d7d23dd2d46ea..1263f8194c9f2 100644 --- a/pkgs/applications/science/biology/cmtk/default.nix +++ b/pkgs/applications/science/biology/cmtk/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { env.NIX_CFLAGS_COMPILE = toString [ (lib.optionalString stdenv.cc.isGNU "-std=c++11") (lib.optionalString stdenv.cc.isClang "-Wno-error=c++11-narrowing") - (lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) "-Dfinite=isfinite") + (lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) "-Dfinite=isfinite") ]; meta = with lib; { diff --git a/pkgs/applications/science/biology/dcm2niix/default.nix b/pkgs/applications/science/biology/dcm2niix/default.nix index a7f30dbc075df..acf43e52764da 100644 --- a/pkgs/applications/science/biology/dcm2niix/default.nix +++ b/pkgs/applications/science/biology/dcm2niix/default.nix @@ -21,15 +21,15 @@ let sha256 = "sha256-8HNFUGx2uuEb8UrGUiqkN+uVDX83YIisT2uO1Z7GCxc="; }; in -stdenv.mkDerivation rec { - version = "1.0.20230411"; +stdenv.mkDerivation (finalAttrs: { + version = "1.0.20240202"; pname = "dcm2niix"; src = fetchFromGitHub { owner = "rordenlab"; repo = "dcm2niix"; - rev = "v${version}"; - sha256 = "sha256-kOVEoqrk4l6sH8iDVx1QmOYP5tCufxsWnCnn9BibZ08="; + rev = "v${finalAttrs.version}"; + sha256 = "sha256-vJUPv/6KNCsU8UjwfktHdTlsweG7+UGgAEZeESfBkD8="; }; patches = lib.optionals withCloudflareZlib [ @@ -55,15 +55,16 @@ stdenv.mkDerivation rec { "-DZLIB_IMPLEMENTATION=Cloudflare" ]; - meta = with lib; { + meta = { description = "DICOM to NIfTI converter"; mainProgram = "dcm2niix"; longDescription = '' dcm2niix is designed to convert neuroimaging data from the DICOM format to the NIfTI format. ''; homepage = "https://www.nitrc.org/projects/dcm2nii"; - license = licenses.bsd3; - maintainers = with maintainers; [ ashgillman rbreslow ]; - platforms = platforms.all; + changelog = "https://github.com/rordenlab/dcm2niix/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ ashgillman rbreslow ]; + platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/applications/science/biology/delly/default.nix b/pkgs/applications/science/biology/delly/default.nix index 34ea942b4f5c7..f122b24d465f1 100644 --- a/pkgs/applications/science/biology/delly/default.nix +++ b/pkgs/applications/science/biology/delly/default.nix @@ -13,22 +13,27 @@ stdenv.mkDerivation (finalAttrs: { pname = "delly"; - version = "1.2.6"; + version = "1.2.9"; src = fetchFromGitHub { owner = "dellytools"; repo = "delly"; rev = "v${finalAttrs.version}"; - hash = "sha256-OO5nnaIcfNAV8pc03Z8YS5kE96bFOrJXA9QTiLi7vPc="; + hash = "sha256-HeLqf/bUkZQJrW1LHl3XmecW3wS3QmjifoH34VNr3A4="; }; + postPatch = lib.optionalString stdenv.cc.isClang '' + substituteInPlace Makefile \ + --replace-fail "-std=c++17" "-std=c++14" + ''; + buildInputs = [ boost bzip2 htslib xz zlib - ] ++ lib.optional stdenv.isDarwin llvmPackages.openmp; + ] ++ lib.optional stdenv.hostPlatform.isDarwin llvmPackages.openmp; makeFlags = [ "EBROOTHTSLIB=${htslib}" diff --git a/pkgs/applications/science/biology/dssp/default.nix b/pkgs/applications/science/biology/dssp/default.nix index 56eb023805a3e..680fc67ffcd14 100644 --- a/pkgs/applications/science/biology/dssp/default.nix +++ b/pkgs/applications/science/biology/dssp/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Calculate the most likely secondary structure assignment given the 3D structure of a protein"; mainProgram = "mkdssp"; homepage = "https://github.com/PDB-REDO/dssp"; - changelog = "https://github.com/PDB-REDO/libcifpp/releases/tag/${finalAttrs.src.rev}"; + changelog = "https://github.com/PDB-REDO/dssp/releases/tag/${lib.removePrefix "refs/tags/" finalAttrs.src.rev}"; license = licenses.bsd2; maintainers = with maintainers; [ natsukium ]; platforms = platforms.unix; diff --git a/pkgs/applications/science/biology/febio-studio/default.nix b/pkgs/applications/science/biology/febio-studio/default.nix deleted file mode 100644 index 708bd0f4305a4..0000000000000 --- a/pkgs/applications/science/biology/febio-studio/default.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, zlib, libglvnd, libGLU, wrapQtAppsHook -, sshSupport ? true, openssl, libssh -, tetgenSupport ? true, tetgen -, ffmpegSupport ? true, ffmpeg_4 -, dicomSupport ? false, dcmtk -, withModelRepo ? true -, withCadFeatures ? false -}: - -stdenv.mkDerivation rec { - pname = "febio-studio"; - version = "1.6.1"; - - src = fetchFromGitHub { - owner = "febiosoftware"; - repo = "FEBioStudio"; - rev = "v${version}"; - sha256 = "0r6pg49i0q9idp7pjymj7mlxd63qjvmfvg0l7fmx87y1yd2hfw4h"; - }; - - patches = [ - ./febio-studio-cmake.patch # Fix Errors that appear with certain Cmake flags - ]; - - cmakeFlags = [ - "-DQt_Ver=5" - "-DNOT_FIRST=On" - "-DOpenGL_GL_PREFERENCE=GLVND" - ] - ++ lib.optional sshSupport "-DUSE_SSH=On" - ++ lib.optional tetgenSupport "-DUSE_TETGEN=On" - ++ lib.optional ffmpegSupport "-DUSE_FFMPEG=On" - ++ lib.optional dicomSupport "-DUSE_DICOM=On" - ++ lib.optional withModelRepo "-DMODEL_REPO=On" - ++ lib.optional withCadFeatures "-DCAD_FEATURES=On" - ; - - - installPhase = '' - runHook preInstall - mkdir -p $out/ - cp -R bin $out/ - runHook postInstall - ''; - - nativeBuildInputs = [ cmake wrapQtAppsHook ]; - buildInputs = [ zlib libglvnd libGLU openssl libssh ] - ++ lib.optional sshSupport openssl - ++ lib.optional tetgenSupport tetgen - ++ lib.optional ffmpegSupport ffmpeg_4 - ++ lib.optional dicomSupport dcmtk - ; - - meta = with lib; { - description = "FEBio Suite Solver"; - mainProgram = "FEBioStudio"; - license = with licenses; [ mit ]; - homepage = "https://febio.org/"; - platforms = platforms.unix; - maintainers = with maintainers; [ Scriptkiddi ]; - }; -} diff --git a/pkgs/applications/science/biology/febio-studio/febio-studio-cmake.patch b/pkgs/applications/science/biology/febio-studio/febio-studio-cmake.patch deleted file mode 100644 index e694f6c3b89f2..0000000000000 --- a/pkgs/applications/science/biology/febio-studio/febio-studio-cmake.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff --git a/FEBioStudio/RepositoryPanel.cpp b/FEBioStudio/RepositoryPanel.cpp -index 382db303..314cdc68 100644 ---- a/FEBioStudio/RepositoryPanel.cpp -+++ b/FEBioStudio/RepositoryPanel.cpp -@@ -1364,10 +1364,10 @@ void CRepositoryPanel::loadingPageProgress(qint64 bytesSent, qint64 bytesTotal) - - #else - --CRepositoryPanel::CRepositoryPanel(CMainWindow* pwnd, QWidget* parent){} -+CRepositoryPanel::CRepositoryPanel(CMainWindow* pwnd, QDockWidget* parent){} - CRepositoryPanel::~CRepositoryPanel(){} - void CRepositoryPanel::OpenLink(const QString& link) {} --// void CRepositoryPanel::Raise() {} -+void CRepositoryPanel::Raise() {} - void CRepositoryPanel::SetModelList(){} - void CRepositoryPanel::ShowMessage(QString message) {} - void CRepositoryPanel::ShowWelcomeMessage(QByteArray messages) {} -@@ -1396,6 +1396,7 @@ void CRepositoryPanel::on_actionSearch_triggered() {} - void CRepositoryPanel::on_actionClearSearch_triggered() {} - void CRepositoryPanel::on_actionDeleteRemote_triggered() {} - void CRepositoryPanel::on_actionModify_triggered() {} -+void CRepositoryPanel::on_actionCopyPermalink_triggered() {} - void CRepositoryPanel::on_treeWidget_itemSelectionChanged() {} - void CRepositoryPanel::on_treeWidget_customContextMenuRequested(const QPoint &pos) {} - void CRepositoryPanel::DownloadItem(CustomTreeWidgetItem *item) {} -diff --git a/FEBioStudio/WzdUpload.cpp b/FEBioStudio/WzdUpload.cpp -index 5ce74346..20062e06 100644 ---- a/FEBioStudio/WzdUpload.cpp -+++ b/FEBioStudio/WzdUpload.cpp -@@ -1183,7 +1183,7 @@ void CWzdUpload::on_saveJson_triggered() - getProjectJson(&projectInfo); - - QFile file(filedlg.selectedFiles()[0]); -- file.open(QIODeviceBase::WriteOnly); -+ file.open(QIODevice::WriteOnly); - file.write(projectInfo); - file.close(); - } 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/genmap/default.nix b/pkgs/applications/science/biology/genmap/default.nix index 235135cb60506..772975fc6450b 100644 --- a/pkgs/applications/science/biology/genmap/default.nix +++ b/pkgs/applications/science/biology/genmap/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { repo = "genmap"; rev = "genmap-v${version}"; fetchSubmodules = true; - sha256 = "sha256-7sIKBRMNzyCrZ/c2nXkknb6a5YsXe6DRE2IFhp6AviY="; + hash = "sha256-7sIKBRMNzyCrZ/c2nXkknb6a5YsXe6DRE2IFhp6AviY="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/science/biology/igv/default.nix b/pkgs/applications/science/biology/igv/default.nix index 0c74b65c98a26..e2502248a50ae 100644 --- a/pkgs/applications/science/biology/igv/default.nix +++ b/pkgs/applications/science/biology/igv/default.nix @@ -13,10 +13,10 @@ stdenv.mkDerivation rec { cp -Rv * $out/share/ sed -i "s#prefix=.*#prefix=$out/share#g" $out/share/igv.sh - sed -i 's#java#${jdk17}/bin/java#g' $out/share/igv.sh + sed -i 's#\bjava\b#${jdk17}/bin/java#g' $out/share/igv.sh sed -i "s#prefix=.*#prefix=$out/share#g" $out/share/igvtools - sed -i 's#java#${jdk17}/bin/java#g' $out/share/igvtools + sed -i 's#\bjava\b#${jdk17}/bin/java#g' $out/share/igvtools ln -s $out/share/igv.sh $out/bin/igv ln -s $out/share/igvtools $out/bin/igvtools diff --git a/pkgs/applications/science/biology/iqtree/default.nix b/pkgs/applications/science/biology/iqtree/default.nix index 4dfbaa25b36a4..ce6218449a7e8 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.6"; src = fetchFromGitHub { owner = "iqtree"; repo = "iqtree2"; rev = "v${version}"; - hash = "sha256-dnUFllqcABB3JDYoCwPGtIYD/h5lzX2XKOroDpijPpU="; + hash = "sha256-8d5zqZIevv3bnq7z7Iyo/x8i445y1RAFtRMeK8s/ieQ="; fetchSubmodules = true; }; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { boost eigen zlib - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ llvmPackages.openmp ]; diff --git a/pkgs/applications/science/biology/iv/default.nix b/pkgs/applications/science/biology/iv/default.nix index ba1b91298bb32..a4b408b14a012 100644 --- a/pkgs/applications/science/biology/iv/default.nix +++ b/pkgs/applications/science/biology/iv/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { break fi done - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' patchelf --add-needed ${libX11}/lib/libX11.so $out/lib/libIVhines.so ''; diff --git a/pkgs/applications/science/biology/jbrowse/default.nix b/pkgs/applications/science/biology/jbrowse/default.nix index 395e5b5dcd9ab..88db9190465f2 100644 --- a/pkgs/applications/science/biology/jbrowse/default.nix +++ b/pkgs/applications/science/biology/jbrowse/default.nix @@ -1,12 +1,12 @@ -{ lib, fetchurl, appimageTools, wrapGAppsHook3 }: +{ lib, fetchurl, appimageTools }: let pname = "jbrowse"; - version = "2.11.2"; + version = "2.15.1"; src = fetchurl { url = "https://github.com/GMOD/jbrowse-components/releases/download/v${version}/jbrowse-desktop-v${version}-linux.AppImage"; - sha256 = "sha256-7kZsK3vYgxubgtoIG1dByHgEBOlh9GUq+i3u/1eo0/o="; + sha256 = "sha256-/dpHUrigO0wnWay0jIkg6eG75ynrVXd7zcIAss6DhSs="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/applications/science/biology/kalign/default.nix b/pkgs/applications/science/biology/kalign/default.nix index 55df8d875bbd5..4dc720290adce 100644 --- a/pkgs/applications/science/biology/kalign/default.nix +++ b/pkgs/applications/science/biology/kalign/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Fast multiple sequence alignment program"; mainProgram = "kalign"; homepage = "https://github.com/TimoLassmann/kalign"; - changelog = "https://github.com/TimoLassmann/kalign/releases/tag/${finalAttrs.src.rev}"; + changelog = "https://github.com/TimoLassmann/kalign/releases/tag/${lib.removePrefix "refs/tags/" finalAttrs.src.rev}"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ natsukium ]; platforms = lib.platforms.unix; diff --git a/pkgs/applications/science/biology/kallisto/default.nix b/pkgs/applications/science/biology/kallisto/default.nix index 55c555e387de7..a375df35dd3ee 100644 --- a/pkgs/applications/science/biology/kallisto/default.nix +++ b/pkgs/applications/science/biology/kallisto/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "kallisto"; - version = "0.50.1"; + version = "0.51.1"; src = fetchFromGitHub { repo = "kallisto"; owner = "pachterlab"; rev = "v${version}"; - sha256 = "sha256-JJZJOl4u6FzngrrMuC2AfD5ry2LBOT8tdz2piH+9LFE="; + sha256 = "sha256-hfdeztEyHvuOnLS71oSv8sPqFe2UCX5KlANqrT/Gfx8="; }; nativeBuildInputs = [ autoconf cmake ]; diff --git a/pkgs/applications/science/biology/kent/default.nix b/pkgs/applications/science/biology/kent/default.nix index f30a6725bb474..7d73ed90856dc 100644 --- a/pkgs/applications/science/biology/kent/default.nix +++ b/pkgs/applications/science/biology/kent/default.nix @@ -13,13 +13,13 @@ }: stdenv.mkDerivation rec { pname = "kent"; - version = "467"; + version = "468"; src = fetchFromGitHub { owner = "ucscGenomeBrowser"; repo = pname; rev = "v${version}_base"; - hash = "sha256-Y8iHSo70nsPZwVy8ZiiqjU3mGrPOyPQkW0VpLS+ulGE="; + hash = "sha256-OM/noraW2X8WV5wqWEFiI5/JPOBmsp0fTeDdcZoXxAA="; }; buildInputs = [ libpng libuuid zlib bzip2 xz openssl curl libmysqlclient ]; diff --git a/pkgs/applications/science/biology/last/default.nix b/pkgs/applications/science/biology/last/default.nix index 7cfdb674c6e49..9057e767c1759 100644 --- a/pkgs/applications/science/biology/last/default.nix +++ b/pkgs/applications/science/biology/last/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "last"; - version = "1548"; + version = "1550"; src = fetchFromGitLab { owner = "mcfrith"; repo = "last"; rev = "refs/tags/${version}"; - hash = "sha256-6mLPnyEAuRvCeV8pv3avsm6CKDrBPgX8xSxGO2kvTrM="; + hash = "sha256-kvI3m2FIPscU/a3GEH+O3yx5TgdNHdYP6OW3/mI2roM="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/biology/macs2/default.nix b/pkgs/applications/science/biology/macs2/default.nix index 26ec138048f7e..153f85535f943 100644 --- a/pkgs/applications/science/biology/macs2/default.nix +++ b/pkgs/applications/science/biology/macs2/default.nix @@ -1,9 +1,11 @@ -{ lib, python3, fetchpatch, fetchPypi }: +{ lib, python311, fetchpatch, fetchPypi }: -python3.pkgs.buildPythonPackage rec { +# pin python311 because macs2 does not support python 3.12 +# https://github.com/macs3-project/MACS/issues/598#issuecomment-1812622572 +python311.pkgs.buildPythonPackage rec { pname = "macs2"; version = "2.2.9.1"; - format = "pyproject"; + pyproject = true; src = fetchPypi { pname = lib.toUpper pname; @@ -20,20 +22,19 @@ python3.pkgs.buildPythonPackage rec { }) ]; - nativeBuildInputs = with python3.pkgs; [ + build-system = with python311.pkgs; [ cython_0 numpy setuptools - wheel ]; - propagatedBuildInputs = with python3.pkgs; [ + dependencies = with python311.pkgs; [ numpy ]; __darwinAllowLocalNetworking = true; - nativeCheckInputs = with python3.pkgs; [ + nativeCheckInputs = with python311.pkgs; [ unittestCheckHook ]; diff --git a/pkgs/applications/science/biology/messer-slim/default.nix b/pkgs/applications/science/biology/messer-slim/default.nix index 3812e9980cdfe..24b9a96019da6 100644 --- a/pkgs/applications/science/biology/messer-slim/default.nix +++ b/pkgs/applications/science/biology/messer-slim/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, cmake, gcc, gcc-unwrapped }: stdenv.mkDerivation rec { - version = "4.2.2"; + version = "4.3"; pname = "messer-slim"; src = fetchFromGitHub { owner = "MesserLab"; repo = "SLiM"; rev = "v${version}"; - sha256 = "sha256-TlB7Hj4pVN4p4VanACWjQBeTxP9/DvRvdCdgelrXx60="; + hash = "sha256-Hgh1ianEdITRUIDKLiLW32kQlPlXKIfN4PSv3cOXTGI="; }; nativeBuildInputs = [ cmake gcc gcc-unwrapped ]; diff --git a/pkgs/applications/science/biology/migrate/default.nix b/pkgs/applications/science/biology/migrate/default.nix index 7820f177bfb7b..aceb010875d74 100644 --- a/pkgs/applications/science/biology/migrate/default.nix +++ b/pkgs/applications/science/biology/migrate/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "migrate"; src = fetchurl { - url = "https://peterbeerli.com/migrate-html5/download_version4/${finalAttrs.pname}-${finalAttrs.version}.src.tar.gz"; + url = "https://peterbeerli.com/migrate-html5/download_version4/migrate-${finalAttrs.version}.src.tar.gz"; hash = "sha256-twkoR9L6VPUye12OC0B5w0PxcxyKain6RkhCswLEdwg="; }; @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { ]; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Estimates population size, migration, population splitting parameters using genetic/genomic data"; homepage = "https://peterbeerli.com/migrate-html5/index.html"; license = licenses.mit; diff --git a/pkgs/applications/science/biology/minc-tools/default.nix b/pkgs/applications/science/biology/minc-tools/default.nix index 3dece25915b47..d4b98fce87197 100644 --- a/pkgs/applications/science/biology/minc-tools/default.nix +++ b/pkgs/applications/science/biology/minc-tools/default.nix @@ -1,24 +1,54 @@ -{ lib, stdenv, fetchFromGitHub, cmake, makeWrapper, flex, bison, perl, TextFormat, - libminc, libjpeg, nifticlib, zlib }: +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + makeWrapper, + flex, + bison, + perl, + TextFormat, + libminc, + libjpeg, + nifticlib, + zlib, +}: stdenv.mkDerivation rec { - pname = "minc-tools"; - version = "unstable-2020-07-25"; + pname = "minc-tools"; + version = "2.3.06-unstable-2023-08-12"; src = fetchFromGitHub { - owner = "BIC-MNI"; - repo = pname; - rev = "fb0a68a07d281e4e099c5d54df29925240de14c1"; - sha256 = "0zcv2sdj3k6k0xjqdq8j5bxq8smm48dzai90vwsmz8znmbbm6kvw"; + owner = "BIC-MNI"; + repo = pname; + rev = "c86a767dbb63aaa05ee981306fa09f6133bde427"; + hash = "sha256-PLNcuDU0ht1PcjloDhrPzpOpE42gbhPP3rfHtP7WnM4="; }; - nativeBuildInputs = [ cmake flex bison makeWrapper ]; - buildInputs = [ libminc libjpeg nifticlib zlib ]; - propagatedBuildInputs = [ perl TextFormat ]; + nativeBuildInputs = [ + cmake + flex + bison + makeWrapper + ]; - cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/cmake" - "-DZNZ_INCLUDE_DIR=${nifticlib}/include/nifti" - "-DNIFTI_INCLUDE_DIR=${nifticlib}/include/nifti" ]; + buildInputs = [ + libminc + libjpeg + nifticlib + zlib + ]; + + propagatedBuildInputs = [ + perl + TextFormat + ]; + + cmakeFlags = [ + "-DLIBMINC_DIR=${libminc}/lib/cmake" + "-DZNZ_INCLUDE_DIR=${nifticlib}/include/nifti" + "-DNIFTI_INCLUDE_DIR=${nifticlib}/include/nifti" + ]; postFixup = '' for prog in minccomplete minchistory mincpik; do @@ -31,6 +61,6 @@ stdenv.mkDerivation rec { description = "Command-line utilities for working with MINC files"; maintainers = with maintainers; [ bcdarwin ]; platforms = platforms.unix; - license = licenses.free; + license = licenses.free; }; } diff --git a/pkgs/applications/science/biology/minimap2/default.nix b/pkgs/applications/science/biology/minimap2/default.nix index 5597b5504678d..1c523a909241a 100644 --- a/pkgs/applications/science/biology/minimap2/default.nix +++ b/pkgs/applications/science/biology/minimap2/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib ]; - makeFlags = lib.optionals stdenv.isAarch64 [ "arm_neon=1" "aarch64=1" ]; + makeFlags = lib.optionals stdenv.hostPlatform.isAarch64 [ "arm_neon=1" "aarch64=1" ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/applications/science/biology/mrbayes/default.nix b/pkgs/applications/science/biology/mrbayes/default.nix index 54f5b9bbb3703..88b402712016b 100644 --- a/pkgs/applications/science/biology/mrbayes/default.nix +++ b/pkgs/applications/science/biology/mrbayes/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, readline }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "mrbayes"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { MrBayes uses a simulation technique called Markov chain Monte Carlo (or MCMC) to approximate the posterior probabilities of trees. ''; - maintainers = with maintainers; [ ]; + maintainers = [ ]; license = licenses.gpl2Plus; homepage = "https://nbisweden.github.io/MrBayes/"; platforms = platforms.linux; diff --git a/pkgs/applications/science/biology/mrtrix/default.nix b/pkgs/applications/science/biology/mrtrix/default.nix index 64eafa0f69686..e17aa3ca038c7 100644 --- a/pkgs/applications/science/biology/mrtrix/default.nix +++ b/pkgs/applications/science/biology/mrtrix/default.nix @@ -102,7 +102,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); homepage = "https://github.com/MRtrix3/mrtrix3"; description = "Suite of tools for diffusion imaging"; maintainers = with maintainers; [ bcdarwin ]; diff --git a/pkgs/applications/science/biology/muscle/default.nix b/pkgs/applications/science/biology/muscle/default.nix index cdcf6c7b50aa8..33a56d6e26d6d 100644 --- a/pkgs/applications/science/biology/muscle/default.nix +++ b/pkgs/applications/science/biology/muscle/default.nix @@ -1,10 +1,9 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib, gccStdenv, fetchFromGitHub }: -stdenv.mkDerivation rec { - pname = "muscle"; +gccStdenv.mkDerivation rec { + pname = "muscle"; version = "5.1.0"; - src = fetchFromGitHub { owner = "rcedgar"; repo = pname; @@ -14,15 +13,26 @@ stdenv.mkDerivation rec { sourceRoot = "${src.name}/src"; - installPhase = '' - install -m755 -D Linux/muscle $out/bin/muscle - ''; + patches = [ + ./muscle-darwin-g++.patch + ]; + + installPhase = + let + target = + if gccStdenv.hostPlatform.isDarwin + then "Darwin" + else "Linux"; + in + '' + install -m755 -D ${target}/muscle $out/bin/muscle + ''; meta = with lib; { description = "Multiple sequence alignment with top benchmark scores scalable to thousands of sequences"; mainProgram = "muscle"; - license = licenses.gpl3Plus; - homepage = "https://www.drive5.com/muscle/"; + license = licenses.gpl3Plus; + homepage = "https://www.drive5.com/muscle/"; maintainers = with maintainers; [ unode thyol ]; }; } diff --git a/pkgs/applications/science/biology/muscle/muscle-darwin-g++.patch b/pkgs/applications/science/biology/muscle/muscle-darwin-g++.patch new file mode 100644 index 0000000000000..41e5fc7ae476c --- /dev/null +++ b/pkgs/applications/science/biology/muscle/muscle-darwin-g++.patch @@ -0,0 +1,15 @@ + +diff --git a/Makefile b/Makefile +index df16673..be3bd0d 100644 +--- a/Makefile ++++ b/Makefile +@@ -20,9 +20,6 @@ OS := $(shell uname) + CPPFLAGS := $(CPPFLAGS) -DNDEBUG -pthread + + CXX := g++ +-ifeq ($(OS),Darwin) +- CXX := g++-11 +-endif + + CXXFLAGS := $(CXXFLAGS) -O3 -fopenmp -ffast-math + diff --git a/pkgs/applications/science/biology/nest/default.nix b/pkgs/applications/science/biology/nest/default.nix index 807af7ce488ac..9714f015f71a4 100644 --- a/pkgs/applications/science/biology/nest/default.nix +++ b/pkgs/applications/science/biology/nest/default.nix @@ -13,20 +13,19 @@ , boost , python3 , readline -, autoPatchelfHook , withPython ? false , withMpi ? false }: stdenv.mkDerivation rec { pname = "nest"; - version = "3.7"; + version = "3.8"; src = fetchFromGitHub { owner = "nest"; repo = "nest-simulator"; rev = "v${version}"; - hash = "sha256-EwhpsfRmBLJnPiH6hXQXgG9jSNoC2oqq5lZ6t038VpI="; + hash = "sha256-hysOe1ZZpCClVOGo0+UeCP7imAakXrZlnJ4V95zfiyA="; }; postPatch = '' @@ -52,7 +51,7 @@ stdenv.mkDerivation rec { python3 python3.pkgs.cython ] ++ lib.optional withMpi mpi - ++ lib.optional stdenv.isDarwin llvmPackages.openmp; + ++ lib.optional stdenv.hostPlatform.isDarwin llvmPackages.openmp; propagatedBuildInputs = with python3.pkgs; [ numpy diff --git a/pkgs/applications/science/biology/neuron/default.nix b/pkgs/applications/science/biology/neuron/default.nix index ef79fb11a824d..fe5de3c68fab5 100644 --- a/pkgs/applications/science/biology/neuron/default.nix +++ b/pkgs/applications/science/biology/neuron/default.nix @@ -23,7 +23,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "neuron"; - version = "8.2.4"; + version = "8.2.6"; # format is for pythonModule conversion format = "other"; @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { flex git ] ++ optionals useCore [ perl gsl ] - ++ optionals stdenv.isDarwin [ xcbuild ]; + ++ optionals stdenv.hostPlatform.isDarwin [ xcbuild ]; buildInputs = optionals useIv [ xorg.libX11.dev @@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { ] ++ optionals useMpi [ python3.pkgs.mpi4py ] ++ optionals useRx3d [ - python3.pkgs.cython_0 # NOTE: cython<3 is required as of 8.2.4 + python3.pkgs.cython_0 # NOTE: cython<3 is required as of 8.2.6 python3.pkgs.numpy ]; @@ -89,7 +89,7 @@ stdenv.mkDerivation (finalAttrs: { repo = "nrn"; rev = finalAttrs.version; fetchSubmodules = true; - hash = "sha256-KsULc+LHoWmrkGYebpoUot6DhStKidbLQf5a3S+pi4s="; + hash = "sha256-xASBpsF8rIzrb5G+4Qi6rvWC2wqL7nAGlSeMsBAI6WM="; }; meta = with lib; { diff --git a/pkgs/applications/science/biology/obitools/obitools3.nix b/pkgs/applications/science/biology/obitools/obitools3.nix index f415c9c39141d..53aa177307dfa 100644 --- a/pkgs/applications/science/biology/obitools/obitools3.nix +++ b/pkgs/applications/science/biology/obitools/obitools3.nix @@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ python3Packages.cython cmake ]; - postPatch = lib.optionalString stdenv.isAarch64 '' + postPatch = lib.optionalString stdenv.hostPlatform.isAarch64 '' substituteInPlace setup.py \ --replace "'-msse2'," "" ''; diff --git a/pkgs/applications/science/biology/paml/default.nix b/pkgs/applications/science/biology/paml/default.nix index c593b5ed3d34c..1e21d18242bd2 100644 --- a/pkgs/applications/science/biology/paml/default.nix +++ b/pkgs/applications/science/biology/paml/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-P/oHaLxoQzjFuvmHyRdShHv1ayruy6O/I9w8aTyya2s="; }; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-D_POSIX_C_SOURCE"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-D_POSIX_C_SOURCE"; preBuild = '' cd ./src/ @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { longDescription = "PAML is a package of programs for phylogenetic analyses of DNA or protein sequences using maximum likelihood. It is maintained and distributed for academic use free of charge by Ziheng Yang. ANSI C source codes are distributed for UNIX/Linux/Mac OSX, and executables are provided for MS Windows. PAML is not good for tree making. It may be used to estimate parameters and test hypotheses to study the evolutionary process, when you have reconstructed trees using other programs such as PAUP*, PHYLIP, MOLPHY, PhyML, RaxML, etc."; license = lib.licenses.gpl3Only; homepage = "http://abacus.gene.ucl.ac.uk/software/paml.html"; - changelog = "https://github.com/abacus-gene/paml/releases/tag/${finalAttrs.src.rev}"; + changelog = "https://github.com/abacus-gene/paml/releases/tag/${lib.removePrefix "refs/tags/" finalAttrs.src.rev}"; platforms = lib.platforms.unix; }; }) 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/plink-ng/default.nix b/pkgs/applications/science/biology/plink-ng/default.nix index b91655ac8fdac..b66bed97a94a5 100644 --- a/pkgs/applications/science/biology/plink-ng/default.nix +++ b/pkgs/applications/science/biology/plink-ng/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1zhffjbwpd50dxywccbnv1rxy9njwz73l4awc5j7i28rgj3davcq"; }; - buildInputs = [ zlib ] ++ (if stdenv.isDarwin then [ darwin.apple_sdk.frameworks.Accelerate ] else [ blas lapack ]) ; + buildInputs = [ zlib ] ++ (if stdenv.hostPlatform.isDarwin then [ darwin.apple_sdk.frameworks.Accelerate ] else [ blas lapack ]) ; preBuild = '' sed -i 's|zlib-1.2.8/zlib.h|zlib.h|g' *.c *.h @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ''; meta = { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); description = "Comprehensive update to the PLINK association analysis toolset"; mainProgram = "plink"; homepage = "https://www.cog-genomics.org/plink2"; diff --git a/pkgs/applications/science/biology/repseek/default.nix b/pkgs/applications/science/biology/repseek/default.nix index e5e0193f7911a..9b38171b34ef2 100644 --- a/pkgs/applications/science/biology/repseek/default.nix +++ b/pkgs/applications/science/biology/repseek/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { substituteInPlace Makefile \ --replace "INSTALLDIR = \$\$HOME/bin" "INSTALLDIR = $out/bin/" \ --replace "CC= gcc" "CC = $CC" - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace Makefile --replace "MACHINE = MACOSX" "MACHINE = LINUX" ''; diff --git a/pkgs/applications/science/biology/sambamba/default.nix b/pkgs/applications/science/biology/sambamba/default.nix index b6635f02aacdf..e62a5bb14aae4 100644 --- a/pkgs/applications/science/biology/sambamba/default.nix +++ b/pkgs/applications/science/biology/sambamba/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { owner = "biod"; repo = "sambamba"; rev = "v${version}"; - sha256 = "sha256-3O9bHGpMuCgdR2Wm7Dv1VUjMT1QTn8K1hdwgjvwhFDw="; + hash = "sha256-3O9bHGpMuCgdR2Wm7Dv1VUjMT1QTn8K1hdwgjvwhFDw="; fetchSubmodules = true; }; diff --git a/pkgs/applications/science/biology/sortmerna/default.nix b/pkgs/applications/science/biology/sortmerna/default.nix index c19556318843b..b6291ea852975 100644 --- a/pkgs/applications/science/biology/sortmerna/default.nix +++ b/pkgs/applications/science/biology/sortmerna/default.nix @@ -56,6 +56,6 @@ stdenv.mkDerivation rec { platforms = platforms.x86_64; homepage = "https://bioinfo.lifl.fr/RNA/sortmerna/"; maintainers = with maintainers; [ luispedro ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/applications/science/biology/sratoolkit/default.nix b/pkgs/applications/science/biology/sratoolkit/default.nix deleted file mode 100644 index 62c21a23eb66a..0000000000000 --- a/pkgs/applications/science/biology/sratoolkit/default.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ stdenv -, lib -, fetchurl -, autoPatchelfHook -, libidn -, zlib -, bzip2 -}: - - -let - libidn11 = libidn.overrideAttrs (old: { - pname = "libidn"; - version = "1.34"; - src = fetchurl { - url = "mirror://gnu/libidn/libidn-1.34.tar.gz"; - sha256 = "0g3fzypp0xjcgr90c5cyj57apx1cmy0c6y9lvw2qdcigbyby469p"; - }; - }); - -in - -stdenv.mkDerivation rec { - pname = "sratoolkit"; - version = "2.11.3"; - - src = fetchurl { - url = "https://ftp-trace.ncbi.nlm.nih.gov/sra/sdk/${version}/sratoolkit.${version}-ubuntu64.tar.gz"; - sha256 = "1590lc4cplxr3lhjqci8fjncy67imn2h14qd2l87chmhjh243qvx"; - }; - - nativeBuildInputs = [ - autoPatchelfHook - ]; - - buildInputs = [ - libidn11 - zlib - bzip2 - stdenv.cc.cc.lib - ]; - - sourceRoot = "sratoolkit.${version}-ubuntu64/bin"; - - installPhase = '' - find -L . -executable -type f -! -name "*remote-fuser*" -exec install -m755 -D {} $out/bin/{} \; - ''; - - meta = with lib; { - homepage = "https://github.com/ncbi/sra-tools"; - description = "SRA Toolkit and SDK from NCBI is a collection of tools and libraries for using data in the INSDC Sequence Read Archives"; - license = licenses.ncbiPd; - maintainers = with maintainers; [ thyol ]; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/pkgs/applications/science/biology/subread/default.nix b/pkgs/applications/science/biology/subread/default.nix index 62ea61af91926..d2ee518883b54 100644 --- a/pkgs/applications/science/biology/subread/default.nix +++ b/pkgs/applications/science/biology/subread/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { configurePhase = '' cd src - cp Makefile.${if stdenv.isLinux then "Linux" else "MacOS"} Makefile + cp Makefile.${if stdenv.hostPlatform.isLinux then "Linux" else "MacOS"} Makefile ''; makeFlags = [ "CC_EXEC=cc" ]; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "High-performance read alignment, quantification and mutation discovery"; license = licenses.gpl3; maintainers = with maintainers; [ jbedo ]; diff --git a/pkgs/applications/science/biology/svaba/default.nix b/pkgs/applications/science/biology/svaba/default.nix index fec5a5a3b92dc..cdb6c4f9c8aa4 100644 --- a/pkgs/applications/science/biology/svaba/default.nix +++ b/pkgs/applications/science/biology/svaba/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); description = "Structural variant and INDEL caller for DNA sequencing data, using genome-wide local assembly"; mainProgram = "svaba"; license = licenses.gpl3; diff --git a/pkgs/applications/science/biology/tandem-aligner/default.nix b/pkgs/applications/science/biology/tandem-aligner/default.nix deleted file mode 100644 index d44489debbb62..0000000000000 --- a/pkgs/applications/science/biology/tandem-aligner/default.nix +++ /dev/null @@ -1,67 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, fetchpatch -, cmake -, zlib -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "TandemAligner"; - version = "0.1"; - - src = fetchFromGitHub { - owner = "seryrzu"; - repo = "tandem_aligner"; - rev = "v${finalAttrs.version}"; - hash = "sha256-iMDj1HZ8LzmZckuAM3lbG3eSJSd/5JGVA6SBs7+AgX8="; - }; - - patches = [ - (fetchpatch { - # https://github.com/seryrzu/tandem_aligner/pull/4 - url = "https://github.com/seryrzu/tandem_aligner/commit/8b516c94f90aaa9cb84278aa811285d4204b03a9.patch"; - hash = "sha256-kD46SykXklG/avK0+sc61YKFw9Bes8ZgFAjVXmcpN8k="; - stripLen = 1; - }) - ]; - - sourceRoot = "${finalAttrs.src.name}/tandem_aligner"; - - nativeBuildInputs = [ cmake ]; - - buildInputs = [ zlib ]; - - installPhase = '' - runHook preInstall - mkdir -p $out/bin - cp src/projects/tandem_aligner/tandem_aligner $out/bin - runHook postInstall - ''; - - doCheck = true; - - # adapted from target test_launch in Makefile - checkPhase = '' - runHook preCheck - mkdir -p $TMPDIR/test_launch - src/projects/tandem_aligner/tandem_aligner \ - --first $src/tandem_aligner/test_dataset/first.fasta \ - --second $src/tandem_aligner/test_dataset/second.fasta \ - -o $TMPDIR/test_launch \ - --debug - grep -q "Thank you for using TandemAligner!" $TMPDIR/test_launch/tandem_aligner.log - diff $TMPDIR/test_launch/cigar.txt $src/tandem_aligner/test_dataset/true_cigar.txt - runHook postCheck - ''; - - meta = { - description = "Parameter-free algorithm for sequence alignment"; - homepage = "https://github.com/seryrzu/tandem_aligner"; - changelog = "https://github.com/seryrzu/tandem_aligner/releases/tag/v${finalAttrs.version}"; - license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ amesgen ]; - platforms = lib.platforms.linux; - mainProgram = "tandem_aligner"; - }; -}) 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/biology/truvari/default.nix b/pkgs/applications/science/biology/truvari/default.nix index 946f4be606326..3c523b21fc641 100644 --- a/pkgs/applications/science/biology/truvari/default.nix +++ b/pkgs/applications/science/biology/truvari/default.nix @@ -15,14 +15,14 @@ let }; in python3Packages.buildPythonApplication rec { pname = "truvari"; - version = "4.1.0"; + version = "4.2.2"; pyproject = true; src = fetchFromGitHub { owner = "ACEnglish"; repo = "truvari"; rev = "v${version}"; - hash = "sha256-HFVAv1TTL/nMjr62tQKhMdwh25P/y4nBGzSbxoJxMmo="; + hash = "sha256-SFBVatcVavBfQtFbBcXifBX3YnKsxJS669vCcyjsBA4="; }; postPatch = '' @@ -31,11 +31,11 @@ in python3Packages.buildPythonApplication rec { patchShebangs repo_utils/test_files ''; - nativeBuildInputs = [ + build-system = [ python3Packages.setuptools ]; - propagatedBuildInputs = with python3Packages; [ + dependencies = with python3Packages; [ pywfa rich edlib @@ -46,6 +46,7 @@ in python3Packages.buildPythonApplication rec { pytabix bwapy pandas + pyabpoa ]; makeWrapperArgs = [ diff --git a/pkgs/applications/science/biology/veryfasttree/default.nix b/pkgs/applications/science/biology/veryfasttree/default.nix index 6c054fecd7428..27c34f67d952a 100644 --- a/pkgs/applications/science/biology/veryfasttree/default.nix +++ b/pkgs/applications/science/biology/veryfasttree/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "veryfasttree"; - version = "4.0.3"; + version = "4.0.4"; src = fetchFromGitHub { owner = "citiususc"; repo = "veryfasttree"; rev = "v${finalAttrs.version}"; - hash = "sha256-Sp331VJRaYv/BTwFj3HwUcUsWjYf6YEXWjYdOzDhBBA="; + hash = "sha256-S4FW91VEdTPOIwRamz62arLSN9inxoKXpKsen2ISXMo="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/science/biology/whisper/default.nix b/pkgs/applications/science/biology/whisper/default.nix index a69b39f4e0898..6c8bb21df6a52 100644 --- a/pkgs/applications/science/biology/whisper/default.nix +++ b/pkgs/applications/science/biology/whisper/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Short read sequence mapper"; license = licenses.gpl3; homepage = "https://github.com/refresh-bio/whisper"; diff --git a/pkgs/applications/science/chemistry/apbs/default.nix b/pkgs/applications/science/chemistry/apbs/default.nix index ec8f8e7ffbf61..766e4dcbd5575 100644 --- a/pkgs/applications/science/chemistry/apbs/default.nix +++ b/pkgs/applications/science/chemistry/apbs/default.nix @@ -84,7 +84,7 @@ stdenv.mkDerivation (finalAttrs: { suitesparse blas python3 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libintl libiconv ]; diff --git a/pkgs/applications/science/chemistry/autodock-vina/default.nix b/pkgs/applications/science/chemistry/autodock-vina/default.nix index d56b8a02a20d0..844fe5fea7ed5 100644 --- a/pkgs/applications/science/chemistry/autodock-vina/default.nix +++ b/pkgs/applications/science/chemistry/autodock-vina/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ boost' - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ glibc.static ]; diff --git a/pkgs/applications/science/chemistry/avogadro2/default.nix b/pkgs/applications/science/chemistry/avogadro2/default.nix index 7ee42c1a793c4..f69f10164cc1c 100644 --- a/pkgs/applications/science/chemistry/avogadro2/default.nix +++ b/pkgs/applications/science/chemistry/avogadro2/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, cmake, eigen, avogadrolibs, molequeue, hdf5 -, openbabel, qttools, wrapQtAppsHook +, openbabel, qttools, wrapQtAppsHook, mesa }: let @@ -44,7 +44,7 @@ in stdenv.mkDerivation rec { mainProgram = "avogadro2"; maintainers = with maintainers; [ sheepforce ]; homepage = "https://github.com/OpenChemistry/avogadroapp"; - platforms = platforms.mesaPlatforms; + inherit (mesa.meta) platforms; license = licenses.bsd3; }; } diff --git a/pkgs/applications/science/chemistry/chemtool/default.nix b/pkgs/applications/science/chemistry/chemtool/default.nix deleted file mode 100644 index 82b1834671619..0000000000000 --- a/pkgs/applications/science/chemistry/chemtool/default.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ lib -, stdenv -, fetchurl -, pkg-config -, libX11 -, gtk2 -, fig2dev -, wrapGAppsHook3 -}: - -stdenv.mkDerivation rec { - pname = "chemtool"; - version = "1.6.14"; - - src = fetchurl { - url = "http://ruby.chemie.uni-freiburg.de/~martin/${pname}/${pname}-${version}.tar.gz"; - sha256 = "hhYaBGE4azNKX/sXzfCUpJGUGIRngnL0V0mBNRTdr8s="; - }; - - nativeBuildInputs = [ pkg-config wrapGAppsHook3 ]; - buildInputs = [ - libX11 - gtk2 - fig2dev - ]; - - # Workaround build on -fno-common toolchains like upstream gcc-10. - # Otherwise built fails as: - # ld: inout.o:/build/chemtool-1.6.14/ct1.h:279: multiple definition of - # `outtype'; draw.o:/build/chemtool-1.6.14/ct1.h:279: first defined here - env.NIX_CFLAGS_COMPILE = "-fcommon"; - - preFixup = '' - gappsWrapperArgs+=(--prefix PATH : "${lib.makeBinPath [ fig2dev ]}") - ''; - - meta = with lib; { - homepage = "http://ruby.chemie.uni-freiburg.de/~martin/chemtool/"; - description = "Draw chemical structures"; - longDescription = '' - Chemtool is a program for drawing organic molecules. It runs under the X - Window System using the GTK widget set. - - Most operations in chemtool can be accomplished using the mouse - the - first (usually the left) button is used to select or place things, the - middle button modifies properties (e.g. reverses the direction of a bond), - and the right button is used to delete objects. - - The program offers essentially unlimited undo/redo, two text fonts plus - symbols, seven colors, drawing at several zoom scales, and square and - hexagonal backdrop grids for easier alignment. - ''; - license = licenses.mit; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/science/chemistry/cp2k/default.nix b/pkgs/applications/science/chemistry/cp2k/default.nix deleted file mode 100644 index 8a831fe23b742..0000000000000 --- a/pkgs/applications/science/chemistry/cp2k/default.nix +++ /dev/null @@ -1,231 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, mpiCheckPhaseHook -, python3 -, gfortran -, blas -, lapack -, fftw -, libint -, libvori -, libxc -, mpi -, gsl -, scalapack -, openssh -, makeWrapper -, libxsmm -, spglib -, which -, pkg-config -, plumed -, zlib -, hdf5-fortran -, sirius -, libvdwxc -, spla -, spfft -, enableElpa ? false -, elpa -, cudaPackages -, rocmPackages -, config -, gpuBackend ? ( - if config.cudaSupport - then "cuda" - else if config.rocmSupport - then "rocm" - else "none" -) -# Change to a value suitable for your target GPU. -# For AMD values see https://github.com/cp2k/cp2k/blob/master/INSTALL.md#2v-rocmhip-support-for-amd-gpu -# and for Nvidia see https://github.com/cp2k/cp2k/blob/master/INSTALL.md#2i-cuda-optional-improved-performance-on-gpu-systems -, gpuVersion ? ( if gpuBackend == "cuda" then "A100" else "Mi100" ) -, gpuArch ? ( if gpuBackend == "cuda" then "sm_80" else "gfx908" ) -}: - -assert builtins.elem gpuBackend [ "none" "cuda" "rocm" ]; - -let - cp2kVersion = "psmp"; - arch = "Linux-x86-64-gfortran"; - -in -stdenv.mkDerivation rec { - pname = "cp2k"; - version = "2024.1"; - - src = fetchFromGitHub { - owner = "cp2k"; - repo = "cp2k"; - rev = "v${version}"; - hash = "sha256-6PB6wjdTOa55dXV7QIsjxI77hhc95WFEjNePfupBUJQ="; - fetchSubmodules = true; - }; - - patches = [ - # Remove the build command line from the source. - # This avoids dependencies to .dev inputs - ./remove-compiler-options.patch - ]; - - nativeBuildInputs = [ python3 which openssh makeWrapper pkg-config ] - ++ lib.optional (gpuBackend == "cuda") cudaPackages.cuda_nvcc; - - buildInputs = [ - gfortran - fftw - gsl - libint - libvori - libxc - libxsmm - mpi - spglib - scalapack - blas - lapack - plumed - zlib - hdf5-fortran - sirius - spla - spfft - libvdwxc - ] - ++ lib.optional enableElpa elpa - ++ lib.optionals (gpuBackend == "cuda") [ - cudaPackages.cuda_cudart - cudaPackages.libcublas - cudaPackages.cuda_nvrtc - ] ++ lib.optionals (gpuBackend == "rocm") [ - rocmPackages.clr - rocmPackages.rocm-core - rocmPackages.hipblas - rocmPackages.hipfft - rocmPackages.rocblas - ] - ; - - propagatedBuildInputs = [ (lib.getBin mpi) ]; - propagatedUserEnvPkgs = [ mpi ]; - - makeFlags = [ - "ARCH=${arch}" - "VERSION=${cp2kVersion}" - ]; - - doCheck = gpuBackend == "none"; - - enableParallelBuilding = true; - - postPatch = '' - patchShebangs tools exts/dbcsr/tools/build_utils exts/dbcsr/.cp2k - substituteInPlace exts/build_dbcsr/Makefile \ - --replace '/usr/bin/env python3' '${python3}/bin/python' \ - --replace 'SHELL = /bin/sh' 'SHELL = bash' - ''; - - configurePhase = '' - cat > arch/${arch}.${cp2kVersion} << EOF - CC = mpicc - CPP = - FC = mpif90 - LD = mpif90 - AR = ar -r - ${lib.strings.optionalString (gpuBackend == "cuda") '' - OFFLOAD_CC = nvcc - OFFLOAD_FLAGS = -O3 -g -w --std=c++11 -arch ${gpuArch} - OFFLOAD_TARGET = cuda - GPUVER = ${gpuVersion} - CXX = mpicxx - CXXFLAGS = -std=c++11 -fopenmp - ''} - ${lib.strings.optionalString (gpuBackend == "rocm") '' - GPUVER = ${gpuVersion} - OFFLOAD_CC = hipcc - OFFLOAD_FLAGS = -fopenmp -m64 -pthread -fPIC -D__GRID_HIP -O2 --offload-arch=${gpuArch} --rocm-path=${rocmPackages.rocm-core} - OFFLOAD_TARGET = hip - CXX = mpicxx - CXXFLAGS = -std=c++11 -fopenmp -D__HIP_PLATFORM_AMD__ - ''} - DFLAGS = -D__FFTW3 -D__LIBXC -D__LIBINT -D__parallel -D__SCALAPACK \ - -D__MPI_VERSION=3 -D__F2008 -D__LIBXSMM -D__SPGLIB \ - -D__MAX_CONTR=4 -D__LIBVORI ${lib.optionalString enableElpa "-D__ELPA"} \ - -D__PLUMED2 -D__HDF5 -D__GSL -D__SIRIUS -D__LIBVDWXC -D__SPFFT -D__SPLA \ - ${lib.strings.optionalString (gpuBackend == "cuda") "-D__OFFLOAD_CUDA -D__ACC -D__DBCSR_ACC -D__NO_OFFLOAD_PW"} \ - ${lib.strings.optionalString (gpuBackend == "rocm") "-D__OFFLOAD_HIP -D__DBCSR_ACC -D__NO_OFFLOAD_PW"} - CFLAGS = -fopenmp - FCFLAGS = \$(DFLAGS) -O2 -ffree-form -ffree-line-length-none \ - -ftree-vectorize -funroll-loops -msse2 \ - -std=f2008 \ - -fopenmp -ftree-vectorize -funroll-loops \ - ${lib.optionalString enableElpa "$(pkg-config --variable=fcflags elpa)"} \ - -I${lib.getDev libint}/include \ - -I${lib.getDev sirius}/include/sirius \ - -I${lib.getDev libxc}/include \ - -I${lib.getDev libxsmm}/include \ - -I${lib.getDev hdf5-fortran}/include \ - -fallow-argument-mismatch - LIBS = -lfftw3 -lfftw3_threads \ - -lscalapack -lblas -llapack \ - -lxcf03 -lxc -lxsmmf -lxsmm -lsymspg \ - -lint2 -lstdc++ -lvori \ - -lgomp -lpthread -lm \ - -fopenmp ${lib.optionalString enableElpa "$(pkg-config --libs elpa)"} \ - -lz -ldl ${lib.optionalString (mpi.pname == "openmpi") "$(mpicxx --showme:link)"} \ - -lplumed -lhdf5_fortran -lhdf5_hl -lhdf5 -lgsl -lsirius -lspla -lspfft -lvdwxc \ - ${lib.strings.optionalString (gpuBackend == "cuda") '' - -L${cudaPackages.cuda_cudart}/lib/stubs/ \ - -lcudart -lnvrtc -lcuda -lcublas - '' - } \ - ${lib.strings.optionalString (gpuBackend == "rocm") "-lamdhip64 -lhipfft -lhipblas -lrocblas"} - LDFLAGS = \$(FCFLAGS) \$(LIBS) - include ${plumed}/lib/plumed/src/lib/Plumed.inc - EOF - ''; - - nativeCheckInputs = [ - mpiCheckPhaseHook - openssh - ]; - - checkPhase = '' - runHook preCheck - - export CP2K_DATA_DIR=data - mpirun -np 2 exe/${arch}/libcp2k_unittest.${cp2kVersion} - - runHook postCheck - ''; - - installPhase = '' - mkdir -p $out/bin $out/share/cp2k - - cp exe/${arch}/* $out/bin - rm $out/bin/*_unittest.* - - for i in cp2k cp2k_shell graph; do - wrapProgram $out/bin/$i.${cp2kVersion} \ - --set-default CP2K_DATA_DIR $out/share/cp2k - done - - wrapProgram $out/bin/cp2k.popt \ - --set-default CP2K_DATA_DIR $out/share/cp2k \ - --set OMP_NUM_THREADS 1 - - cp -r data/* $out/share/cp2k - ''; - - passthru = { inherit mpi; }; - - meta = with lib; { - description = "Quantum chemistry and solid state physics program"; - homepage = "https://www.cp2k.org"; - license = licenses.gpl2Plus; - maintainers = [ maintainers.sheepforce ]; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/pkgs/applications/science/chemistry/cp2k/remove-compiler-options.patch b/pkgs/applications/science/chemistry/cp2k/remove-compiler-options.patch deleted file mode 100644 index e6cf81494aa33..0000000000000 --- a/pkgs/applications/science/chemistry/cp2k/remove-compiler-options.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff --git a/src/start/cp2k.F b/src/start/cp2k.F -index f69146ea3..a195f0620 100644 ---- a/src/start/cp2k.F -+++ b/src/start/cp2k.F -@@ -58,8 +58,7 @@ PROGRAM cp2k - USE input_cp2k, ONLY: create_cp2k_root_section - USE input_section_types, ONLY: section_release,& - section_type -- USE iso_fortran_env, ONLY: compiler_options,& -- compiler_version -+ USE iso_fortran_env, ONLY: compiler_version - USE kinds, ONLY: default_path_length - USE machine, ONLY: default_output_unit - #include "../base/base_uses.f90" -@@ -70,7 +69,6 @@ PROGRAM cp2k - arg_att, command - CHARACTER(LEN=default_path_length), & - DIMENSION(:, :), ALLOCATABLE :: initial_variables, initial_variables_tmp -- CHARACTER(LEN=:), ALLOCATABLE :: compiler_options_string - INTEGER :: output_unit, l, i, var_set_sep, inp_var_idx - INTEGER :: ierr, i_arg - LOGICAL :: check, usage, echo_input, command_line_error -@@ -328,14 +326,6 @@ PROGRAM cp2k - WRITE (output_unit, "(T2,A)") cp2k_version, & - "Source code revision "//TRIM(compile_revision), & - TRIM(cp2k_flags()) -- compiler_options_string = compiler_options() -- WRITE (output_unit, "(T2,A,A)") "compiler: ", compiler_version() -- WRITE (output_unit, "(T2,A)") "compiler options:" -- DO i = 0, (LEN(compiler_options_string) - 1)/68 -- WRITE (output_unit, "(T4,A)") & -- compiler_options_string(i*68 + 1:MIN(LEN(compiler_options_string), (i + 1)*68)) -- END DO -- DEALLOCATE (compiler_options_string) - END IF - END IF - diff --git a/pkgs/applications/science/chemistry/element/default.nix b/pkgs/applications/science/chemistry/element/default.nix index cc80cb058d92c..dc03eac51028d 100644 --- a/pkgs/applications/science/chemistry/element/default.nix +++ b/pkgs/applications/science/chemistry/element/default.nix @@ -19,6 +19,6 @@ buildGoModule rec { homepage = "https://github.com/gennaro-tedesco/element"; license = licenses.asl20; maintainers = [ maintainers.j0hax ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/applications/science/chemistry/ergoscf/default.nix b/pkgs/applications/science/chemistry/ergoscf/default.nix index 3ee33cf19b746..ceaeb3336427d 100644 --- a/pkgs/applications/science/chemistry/ergoscf/default.nix +++ b/pkgs/applications/science/chemistry/ergoscf/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-linalgebra-templates" "--enable-performance" - ] ++ lib.optional stdenv.isx86_64 "--enable-sse-intrinsics"; + ] ++ lib.optional stdenv.hostPlatform.isx86_64 "--enable-sse-intrinsics"; LDFLAGS = "-lblas -llapack"; diff --git a/pkgs/applications/science/chemistry/gwyddion/default.nix b/pkgs/applications/science/chemistry/gwyddion/default.nix index c379e432bdeb2..c7440e3fad81e 100644 --- a/pkgs/applications/science/chemistry/gwyddion/default.nix +++ b/pkgs/applications/science/chemistry/gwyddion/default.nix @@ -11,7 +11,7 @@ zlibSupport ? true, zlib, libuniqueSupport ? true, libunique, libpngSupport ? true, libpng, - openglSupport ? !stdenv.isDarwin, libGL + openglSupport ? !stdenv.hostPlatform.isDarwin, libGL }: stdenv.mkDerivation rec { @@ -24,19 +24,18 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config file ]; - buildInputs = with lib; - [ gtk2 fftw ] ++ - optionals openglSupport [ gnome2.gtkglext libGL ] ++ - optional openexrSupport openexr ++ - optional libXmuSupport xorg.libXmu ++ - optional fitsSupport cfitsio ++ - optional libpngSupport libpng ++ - optional libxsltSupport libxslt ++ - optional libxml2Support libxml2 ++ - optional libwebpSupport libwebp ++ - optional zlibSupport zlib ++ - optional libuniqueSupport libunique ++ - optional libzipSupport libzip; + buildInputs = [ gtk2 fftw ] ++ + lib.optionals openglSupport [ gnome2.gtkglext libGL ] ++ + lib.optional openexrSupport openexr ++ + lib.optional libXmuSupport xorg.libXmu ++ + lib.optional fitsSupport cfitsio ++ + lib.optional libpngSupport libpng ++ + lib.optional libxsltSupport libxslt ++ + lib.optional libxml2Support libxml2 ++ + lib.optional libwebpSupport libwebp ++ + lib.optional zlibSupport zlib ++ + lib.optional libuniqueSupport libunique ++ + lib.optional libzipSupport libzip; # This patch corrects problems with python support, but should apply cleanly # regardless of whether python support is enabled, and have no effects if @@ -59,8 +58,8 @@ stdenv.mkDerivation rec { ''; license = lib.licenses.gpl2; platforms = with lib.platforms; linux ++ darwin; - maintainers = [ lib.maintainers.cge ]; + maintainers = [ ]; # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin && stdenv.isAarch64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; }; } diff --git a/pkgs/applications/science/chemistry/jmol/default.nix b/pkgs/applications/science/chemistry/jmol/default.nix index cba6a40b59923..a48019febb1de 100644 --- a/pkgs/applications/science/chemistry/jmol/default.nix +++ b/pkgs/applications/science/chemistry/jmol/default.nix @@ -25,14 +25,14 @@ let }; in stdenv.mkDerivation rec { - version = "16.2.17"; + version = "16.2.21"; pname = "jmol"; src = let baseVersion = "${lib.versions.major version}.${lib.versions.minor version}"; in fetchurl { url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz"; - hash = "sha256-1iBLLfaoztbphhrG3NVWH+PVSbCZd+HQqvCYF3H9S/E="; + hash = "sha256-9gIOrHoy0JyoPXaHOfBDHCL+ykmmHNam+Um12sHqZsE="; }; patchPhase = '' diff --git a/pkgs/applications/science/chemistry/marvin/default.nix b/pkgs/applications/science/chemistry/marvin/default.nix index 4228e818e4887..e1e911e2d4dfb 100644 --- a/pkgs/applications/science/chemistry/marvin/default.nix +++ b/pkgs/applications/science/chemistry/marvin/default.nix @@ -1,14 +1,12 @@ { lib, stdenv, fetchurl, dpkg, makeWrapper, coreutils, gawk, gnugrep, gnused, openjdk17 }: -with lib; - stdenv.mkDerivation rec { pname = "marvin"; version = "23.17.0"; src = fetchurl { name = "marvin-${version}.deb"; - url = "http://dl.chemaxon.com/marvin/${version}/marvin_linux_${versions.majorMinor version}.deb"; + url = "http://dl.chemaxon.com/marvin/${version}/marvin_linux_${lib.versions.majorMinor version}.deb"; hash = "sha256-zE/9EaOsNJwzE4Doasm9N8QG4t7wDOxqpV/Nhc4p7Ws="; }; @@ -22,7 +20,7 @@ stdenv.mkDerivation rec { wrapBin() { makeWrapper $1 $out/bin/$(basename $1) \ --set INSTALL4J_JAVA_HOME "${openjdk17}" \ - --prefix PATH : ${makeBinPath [ coreutils gawk gnugrep gnused ]} + --prefix PATH : ${lib.makeBinPath [ coreutils gawk gnugrep gnused ]} } cp -r opt $out mkdir -p $out/bin $out/share/pixmaps $out/share/applications @@ -33,12 +31,12 @@ stdenv.mkDerivation rec { for name in cxcalc cxtrain evaluate molconvert mview msketch; do wrapBin $out/opt/chemaxon/marvinsuite/bin/$name done - ${concatStrings (map (name: '' + ${lib.concatStrings (map (name: '' substitute ${./. + "/${name}.desktop"} $out/share/applications/${name}.desktop --subst-var out '') [ "LicenseManager" "MarvinSketch" "MarvinView" ])} ''; - meta = { + meta = with lib; { description = "Chemical modelling, analysis and structure drawing program"; homepage = "https://chemaxon.com/products/marvin"; maintainers = with maintainers; [ fusion809 ]; diff --git a/pkgs/applications/science/chemistry/nwchem/default.nix b/pkgs/applications/science/chemistry/nwchem/default.nix index 61266a9f02854..fb24f903f5224 100644 --- a/pkgs/applications/science/chemistry/nwchem/default.nix +++ b/pkgs/applications/science/chemistry/nwchem/default.nix @@ -1,6 +1,5 @@ { lib , stdenv -, pkgs , fetchFromGitHub , fetchurl , mpiCheckPhaseHook @@ -14,7 +13,6 @@ , lapack , python3 , tcsh -, bash , automake , autoconf , libtool @@ -34,7 +32,7 @@ let }; dftd3Src = fetchurl { - url = "https://www.chemiebn.uni-bonn.de/pctc/mulliken-center/software/dft-d3/dftd3.tgz"; + url = "https://www.chemie.uni-bonn.de/grimme/software/dft-d3/dftd3.tgz"; hash = "sha256-2Xz5dY9hqoH9hUJUSPv0pujOB8EukjZzmDGjrzKID1k="; }; @@ -47,20 +45,20 @@ let plumedSrc = fetchFromGitHub { owner = "edoapra"; repo = "plumed2"; - rev = "e7c908da50bde1c6399c9f0e445d6ea3330ddd9b"; - hash = "sha256-CNlb6MTEkD977hj3xonYqZH1/WlQ1EdVD7cvL//heRM="; + rev = "88f06db71173e7893713a582e5ada7193e8ae1c9"; + hash = "sha256-p5XNxHcE/QkJ5WdQH/xPp2EyrqCNjA/w/e1R2fkwYts="; }; in stdenv.mkDerivation rec { pname = "nwchem"; - version = "7.2.2"; + version = "7.2.3"; src = fetchFromGitHub { owner = "nwchemgit"; repo = "nwchem"; rev = "v${version}-release"; - hash = "sha256-BcYRqPaPR24OTRY0MJgBxi46HvUG4uFaY0unZmu5b9k="; + hash = "sha256-2qc4kLb/WmUJuJGonIyS7pgCfyt8yXdcpDAKU0RMY58="; }; nativeBuildInputs = [ @@ -166,6 +164,8 @@ stdenv.mkDerivation rec { ''; installPhase = '' + runHook preInstall + mkdir -p $out/bin $out/share/nwchem cp $NWCHEM_TOP/bin/LINUX64/nwchem $out/bin/nwchem @@ -188,6 +188,8 @@ stdenv.mkDerivation rec { charmm_s $out/share/nwchem/data/charmm_s/ charmm_x $out/share/nwchem/data/charmm_x/ EOF + + runHook postInstall ''; doCheck = false; diff --git a/pkgs/applications/science/chemistry/octopus/default.nix b/pkgs/applications/science/chemistry/octopus/default.nix index 2e87cf3db51aa..a9b881b2cdc01 100644 --- a/pkgs/applications/science/chemistry/octopus/default.nix +++ b/pkgs/applications/science/chemistry/octopus/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { owner = "octopus-code"; repo = "octopus"; rev = version; - sha256 = "sha256-8wZR+bYdxJFsUPMWbIGYxRdNzjLgHm+KFLjY7fSN7io="; + hash = "sha256-8wZR+bYdxJFsUPMWbIGYxRdNzjLgHm+KFLjY7fSN7io="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/chemistry/pymol/default.nix b/pkgs/applications/science/chemistry/pymol/default.nix index 1733ba2f236c9..295ac7e14cb23 100644 --- a/pkgs/applications/science/chemistry/pymol/default.nix +++ b/pkgs/applications/science/chemistry/pymol/default.nix @@ -2,7 +2,6 @@ , lib , fetchFromGitHub , makeDesktopItem -, python3 , python3Packages , netcdf , glew @@ -50,7 +49,7 @@ python3Packages.buildPythonApplication rec { postPatch = '' substituteInPlace setup.py \ - --replace-fail "self.install_libbase" '"${placeholder "out"}/${python3.sitePackages}"' + --replace-fail "self.install_libbase" '"${placeholder "out"}/${python3Packages.python.sitePackages}"' ''; build-system = [ @@ -63,10 +62,10 @@ python3Packages.buildPythonApplication rec { postInstall = with python3Packages; '' wrapProgram $out/bin/pymol \ - --prefix PYTHONPATH : ${lib.makeSearchPathOutput "lib" python3.sitePackages [ pyqt5 pyqt5.pyqt5-sip ]} + --prefix PYTHONPATH : ${lib.makeSearchPathOutput "lib" python3Packages.python.sitePackages [ pyqt5 pyqt5.pyqt5-sip ]} mkdir -p "$out/share/icons/" - ln -s $out/${python3.sitePackages}/pymol/pymol_path/data/pymol/icons/icon2.svg "$out/share/icons/pymol.svg" + ln -s $out/${python3Packages.python.sitePackages}/pymol/pymol_path/data/pymol/icons/icon2.svg "$out/share/icons/pymol.svg" '' + lib.optionalString stdenv.hostPlatform.isLinux '' cp -r "${desktopItem}/share/applications/" "$out/share/" ''; diff --git a/pkgs/applications/science/chemistry/quantum-espresso/default.nix b/pkgs/applications/science/chemistry/quantum-espresso/default.nix index 2c565cb5db9f0..2156c1d269691 100644 --- a/pkgs/applications/science/chemistry/quantum-espresso/default.nix +++ b/pkgs/applications/science/chemistry/quantum-espresso/default.nix @@ -4,7 +4,6 @@ , fetchFromGitHub , git , cmake -, gnum4 , gfortran , pkg-config , fftw diff --git a/pkgs/applications/science/chemistry/wxmacmolplt/default.nix b/pkgs/applications/science/chemistry/wxmacmolplt/default.nix index ae6c0df879056..0ec45053bf67c 100644 --- a/pkgs/applications/science/chemistry/wxmacmolplt/default.nix +++ b/pkgs/applications/science/chemistry/wxmacmolplt/default.nix @@ -7,6 +7,7 @@ , pkg-config , xorg , autoreconfHook +, wrapGAppsHook4 }: stdenv.mkDerivation rec { @@ -20,7 +21,7 @@ stdenv.mkDerivation rec { hash = "sha256-gFGstyq9bMmBaIS4QE6N3EIC9GxRvyJYUr8DUvwRQBc="; }; - nativeBuildInputs = [ pkg-config autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook wrapGAppsHook4 ]; buildInputs = [ wxGTK32 libGL diff --git a/pkgs/applications/science/computer-architecture/accelergy/default.nix b/pkgs/applications/science/computer-architecture/accelergy/default.nix index 9eb6f341b714d..42609ada09a38 100644 --- a/pkgs/applications/science/computer-architecture/accelergy/default.nix +++ b/pkgs/applications/science/computer-architecture/accelergy/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, python3Packages, pkgs }: +{ lib, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication rec { pname = "accelergy"; diff --git a/pkgs/applications/science/computer-architecture/timeloop/default.nix b/pkgs/applications/science/computer-architecture/timeloop/default.nix index ec8ec3ed8abc6..3a70478262d55 100644 --- a/pkgs/applications/science/computer-architecture/timeloop/default.nix +++ b/pkgs/applications/science/computer-architecture/timeloop/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { yaml-cpp ncurses accelergy - ] ++ lib.optionals stdenv.isLinux [ gpm ]; + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ gpm ]; preConfigure = '' cp -r ./pat-public/src/pat ./src/pat @@ -41,10 +41,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - #link-time optimization fails on darwin - #see https://github.com/NixOS/nixpkgs/issues/19098 - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-fno-lto"; - postPatch = '' # Fix gcc-13 build failure due to missing includes: sed -e '1i #include <cstdint>' -i \ @@ -54,7 +50,7 @@ stdenv.mkDerivation rec { substituteInPlace ./SConstruct \ --replace-fail "env.Replace(AR = \"gcc-ar\")" "pass" \ --replace-fail "env.Replace(RANLIB = \"gcc-ranlib\")" "pass" - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' # prevent clang from dying on errors that gcc is fine with substituteInPlace ./src/SConscript --replace "-Werror" "-Wno-inconsistent-missing-override" @@ -80,7 +76,7 @@ stdenv.mkDerivation rec { sconsFlags = # will fail on clang/darwin on link without --static due to undefined extern # however, will fail with static on linux as nixpkgs deps aren't static - lib.optional stdenv.isDarwin "--static" + lib.optional stdenv.hostPlatform.isDarwin "--static" ++ lib.optional enableAccelergy "--accelergy" ++ lib.optional enableISL "--with-isl"; diff --git a/pkgs/applications/science/electronics/caneda/default.nix b/pkgs/applications/science/electronics/caneda/default.nix index 4a4cf61c7f658..7eac675eca4e6 100644 --- a/pkgs/applications/science/electronics/caneda/default.nix +++ b/pkgs/applications/science/electronics/caneda/default.nix @@ -19,7 +19,7 @@ mkDerivation rec { mainProgram = "caneda"; homepage = "http://caneda.org"; license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [viric]; + maintainers = [ ]; platforms = with lib.platforms; linux; }; } diff --git a/pkgs/applications/science/electronics/dataexplorer/default.nix b/pkgs/applications/science/electronics/dataexplorer/default.nix deleted file mode 100644 index 224d804ee1f69..0000000000000 --- a/pkgs/applications/science/electronics/dataexplorer/default.nix +++ /dev/null @@ -1,82 +0,0 @@ -{ lib -, stdenv -, fetchurl -, ant -, jdk -, makeWrapper -, strip-nondeterminism -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "dataexplorer"; - version = "3.8.5"; - - src = fetchurl { - url = "mirror://savannah/dataexplorer/dataexplorer-${finalAttrs.version}-src.tar.gz"; - hash = "sha256-b68xIZNbzHdPyZwLngcnjcoBtI6AeTdrblz/qx/HbGQ="; - }; - - nativeBuildInputs = [ - ant - jdk - makeWrapper - strip-nondeterminism - ]; - - buildPhase = '' - runHook preBuild - ant -f build/build.xml dist - runHook postBuild - ''; - - doCheck = false; - # Missing dependencies (e.g. junit). Does not work. - #checkPhase = '' - # ant -f build/build.xml check - #''; - - installPhase = '' - runHook preInstall - - ant -Dprefix=$out/share/ -f build/build.xml install - - # The sources contain a wrapper script in $out/share/DataExplorer/DataExplorer - # but it hardcodes bash shebang and does not pin the java path. - # So we create our own wrapper, using similar cmdline args as upstream. - mkdir -p $out/bin - makeWrapper ${jdk}/bin/java $out/bin/DataExplorer \ - --add-flags "-Xms64m -Xmx3092m -jar $out/share/DataExplorer/DataExplorer.jar" \ - --set SWT_GTK3 0 - - makeWrapper ${jdk}/bin/java $out/bin/DevicePropertiesEditor \ - --add-flags "-Xms32m -Xmx512m -classpath $out/share/DataExplorer/DataExplorer.jar gde.ui.dialog.edit.DevicePropertiesEditor" \ - --set SWT_GTK3 0 \ - --set LIBOVERLAY_SCROLLBAR 0 - - install -Dvm644 build/misc/GNU_LINUX_JUNSI_ICHARER_USB_UDEV_RULE/50-Junsi-iCharger-USB.rules \ - $out/etc/udev/rules.d/50-Junsi-iCharger-USB.rules - install -Dvm644 build/misc/GNU_LINUX_SKYRC_UDEV_RULE/50-SkyRC-Charger.rules \ - $out/etc/udev/rules.d/50-SkyRC-Charger.rules - - runHook postInstall - ''; - - # manually call strip-nondeterminism because using stripJavaArchivesHook takes - # too long to strip bundled jars - postFixup = '' - strip-nondeterminism --type jar $out/share/DataExplorer/{DataExplorer.jar,devices/*.jar} - ''; - - meta = with lib; { - description = "Graphical tool to analyze data, gathered from various hardware devices"; - homepage = "https://www.nongnu.org/dataexplorer/index.html"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ panicgh ]; - platforms = [ "x86_64-linux" ]; - sourceProvenance = with sourceTypes; [ - fromSource - binaryNativeCode # contains RXTXcomm (JNI library with *.so files) - binaryBytecode # contains thirdparty jar files, e.g. javax.json, org.glassfish.json - ]; - }; -}) diff --git a/pkgs/applications/science/electronics/digital/default.nix b/pkgs/applications/science/electronics/digital/default.nix index 7619e43e80332..a929b962481b0 100644 --- a/pkgs/applications/science/electronics/digital/default.nix +++ b/pkgs/applications/science/electronics/digital/default.nix @@ -5,8 +5,8 @@ let pname = "digital"; pkgDescription = "A digital logic designer and circuit simulator."; - version = "0.30"; - buildDate = "2023-02-03T08:00:56+01:00"; # v0.30 commit date + version = "0.31"; + buildDate = "2024-09-03T14:02:31+02:00"; # v0.31 commit date desktopItem = makeDesktopItem { type = "Application"; @@ -35,7 +35,7 @@ maven.buildMavenPackage rec { owner = "hneemann"; repo = "Digital"; rev = "v${version}"; - hash = "sha256-cDykYlcFvDLFBy9UnX07iCR2LCq28SNU+h9vRT/AoJM="; + hash = "sha256-6XaM3U1x/yvoCrkJ2nMtBmj972gCFlWn3F4DM7TLWgw="; }; inherit mvnParameters; @@ -71,7 +71,7 @@ maven.buildMavenPackage rec { description = pkgDescription; mainProgram = "digital"; license = licenses.gpl3Only; - platforms = [ "x86_64-linux" "x86_64-darwin" ]; + platforms = platforms.all; maintainers = with maintainers; [ Dettorer ]; }; } diff --git a/pkgs/applications/science/electronics/diylc/default.nix b/pkgs/applications/science/electronics/diylc/default.nix index ced8c72d2155d..072faf3a8a5b9 100644 --- a/pkgs/applications/science/electronics/diylc/default.nix +++ b/pkgs/applications/science/electronics/diylc/default.nix @@ -73,6 +73,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; sourceProvenance = with sourceTypes; [ binaryBytecode ]; platforms = platforms.linux; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/science/electronics/dsview/default.nix b/pkgs/applications/science/electronics/dsview/default.nix index 5d6c83f5dfaa1..48a94468ef0b2 100644 --- a/pkgs/applications/science/electronics/dsview/default.nix +++ b/pkgs/applications/science/electronics/dsview/default.nix @@ -21,12 +21,12 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ] - ++ lib.optional stdenv.isDarwin desktopToDarwinBundle; + ++ lib.optional stdenv.hostPlatform.isDarwin desktopToDarwinBundle; buildInputs = [ boost fftw qtbase qtsvg libusb1 libzip python3 - ] ++ lib.optional stdenv.isLinux qtwayland; + ] ++ lib.optional stdenv.hostPlatform.isLinux qtwayland; meta = with lib; { description = "GUI program for supporting various instruments from DreamSourceLab, including logic analyzer, oscilloscope, etc"; diff --git a/pkgs/applications/science/electronics/dwfv/default.nix b/pkgs/applications/science/electronics/dwfv/default.nix deleted file mode 100644 index 415cc29812d3d..0000000000000 --- a/pkgs/applications/science/electronics/dwfv/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ lib, rustPlatform, fetchCrate }: - -rustPlatform.buildRustPackage rec { - pname = "dwfv"; - version = "0.4.1"; - - src = fetchCrate { - inherit version pname; - sha256 = "0xxgwbbbzaldbl04k5ksk61wa6i4f9mc84q04ljg438z0k8q6cr7"; - }; - - cargoSha256 = "1z51yx3psdxdzmwny0rzlch5hjx2pssll73q79qij2bc7wgyjscy"; - - meta = with lib; { - description = "Simple digital waveform viewer with vi-like key bindings"; - mainProgram = "dwfv"; - homepage = "https://github.com/psurply/dwfv"; - license = licenses.mit; - maintainers = with maintainers; [ newam ]; - }; -} diff --git a/pkgs/applications/science/electronics/flopoco/default.nix b/pkgs/applications/science/electronics/flopoco/default.nix index 2da80512e2b2c..ef6f297c63ccc 100644 --- a/pkgs/applications/science/electronics/flopoco/default.nix +++ b/pkgs/applications/science/electronics/flopoco/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { repo = pname; # flopoco-4.1.3 is not tagged on GitLab rev = "67598298207c9f3261c35679c8a5966480c4343c"; - sha256 = "sha256-0jRjg4/qciqBcjsi6BTbKO4VJkcoEzpC98wFkUOIGbI="; + hash = "sha256-0jRjg4/qciqBcjsi6BTbKO4VJkcoEzpC98wFkUOIGbI="; }; patches = [ @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { }) ]; - postPatch = lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) '' + postPatch = lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) '' sed -i "s/-pg//g" {,src/Apps/TaMaDi/}CMakeLists.txt ''; @@ -54,12 +54,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ bison cmake + flex installShellFiles ]; buildInputs = [ boost - flex gmp libxml2 mpfi diff --git a/pkgs/applications/science/electronics/fped/default.nix b/pkgs/applications/science/electronics/fped/default.nix index edfe34c0e25e8..e3984dba77d8d 100644 --- a/pkgs/applications/science/electronics/fped/default.nix +++ b/pkgs/applications/science/electronics/fped/default.nix @@ -3,7 +3,6 @@ , pkg-config }: -with lib; stdenv.mkDerivation { pname = "fped"; version = "unstable-2017-05-11"; @@ -39,7 +38,7 @@ stdenv.mkDerivation { gtk2 ]; - meta = { + meta = with lib; { description = "Editor that allows the interactive creation of footprints electronic components"; mainProgram = "fped"; homepage = "http://projects.qi-hardware.com/index.php/p/fped/"; diff --git a/pkgs/applications/science/electronics/fritzing/default.nix b/pkgs/applications/science/electronics/fritzing/default.nix index 9eb7b50445020..04ca24861c0d8 100644 --- a/pkgs/applications/science/electronics/fritzing/default.nix +++ b/pkgs/applications/science/electronics/fritzing/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation { quazip libngspice clipper - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ qtwayland ]; @@ -93,7 +93,7 @@ stdenv.mkDerivation { "phoenix.pro" ]; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir $out/Applications mv $out/bin/Fritzing.app $out/Applications/Fritzing.app cp FritzingInfo.plist $out/Applications/Fritzing.app/Contents/Info.plist diff --git a/pkgs/applications/science/electronics/gtkwave/default.nix b/pkgs/applications/science/electronics/gtkwave/default.nix index d28a5cf809065..5649b6bb5a77f 100644 --- a/pkgs/applications/science/electronics/gtkwave/default.nix +++ b/pkgs/applications/science/electronics/gtkwave/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config wrapGAppsHook3 ]; buildInputs = [ bzip2 glib gperf gtk3 judy tcl tk xz ] - ++ lib.optional stdenv.isDarwin gtk-mac-integration; + ++ lib.optional stdenv.hostPlatform.isDarwin gtk-mac-integration; # fix compilation under Darwin # remove these patches upon next release diff --git a/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix b/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix index c193352eb4559..acf52931c7ed7 100644 --- a/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix +++ b/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix @@ -38,7 +38,7 @@ let hash = "sha256-adU5SctH+H54UaAmr5BZInytD3wjUzLtQbCwngAWs4o="; }) ]; - postPatch = prev.postPatch + lib.optionalString stdenv.isAarch64 '' + postPatch = prev.postPatch + lib.optionalString stdenv.hostPlatform.isAarch64 '' # https://github.com/igraph/igraph/issues/1694 substituteInPlace tests/CMakeLists.txt \ --replace "igraph_scg_grouping3" "" \ @@ -136,7 +136,7 @@ in stdenv.mkDerivation rec { cmakeBuildType = "MinSizeRel"; # some plugins depend on other plugins and need to be able to load them - postFixup = lib.optionalString stdenv.isLinux '' + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' find $out/lib/hal_plugins -name '*.so*' | while read -r f ; do patchelf --set-rpath "$(patchelf --print-rpath "$f"):$out/lib/hal_plugins" "$f" done diff --git a/pkgs/applications/science/electronics/horizon-eda/base.nix b/pkgs/applications/science/electronics/horizon-eda/base.nix index 0292ee493a829..d39fc83823a23 100644 --- a/pkgs/applications/science/electronics/horizon-eda/base.nix +++ b/pkgs/applications/science/electronics/horizon-eda/base.nix @@ -1,4 +1,5 @@ { lib +, cmake , cppzmq , curl , fetchFromGitHub @@ -9,6 +10,8 @@ , libgit2 , librsvg , libuuid +, meson +, ninja , opencascade-occt_7_6 , pkg-config , podofo @@ -20,16 +23,19 @@ in # This base is used in horizon-eda and python3Packages.horizon-eda rec { pname = "horizon-eda"; - version = "2.5.0"; + version = "2.6.0"; src = fetchFromGitHub { owner = "horizon-eda"; repo = "horizon"; rev = "v${version}"; - hash = "sha256-UcjbDJR6shyETpanNkRoH8LF8r6gFjsyNHVSCMHKqS8="; + hash = "sha256-0ikCR10r/WPb+H+Ut2GO6y4A/9bctJLanL/RR4r9GWs="; }; nativeBuildInputs = [ + meson + ninja + cmake pkg-config ]; diff --git a/pkgs/applications/science/electronics/kicad/base.nix b/pkgs/applications/science/electronics/kicad/base.nix index b5f721c3d772d..3d39261bc7a52 100644 --- a/pkgs/applications/science/electronics/kicad/base.nix +++ b/pkgs/applications/science/electronics/kicad/base.nix @@ -39,7 +39,7 @@ , pcre2 , libdeflate -, swig4 +, swig , python , wxPython , opencascade-occt_7_6 @@ -137,7 +137,7 @@ stdenv.mkDerivation rec { ] # wanted by configuration on linux, doesn't seem to affect performance # no effect on closure size - ++ optionals (stdenv.isLinux) [ + ++ optionals (stdenv.hostPlatform.isLinux) [ util-linux libselinux libsepol @@ -168,7 +168,7 @@ stdenv.mkDerivation rec { curl openssl boost - swig4 + swig python unixODBC libdeflate diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix index 1cec011fae33f..a5cceb492522e 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 @@ -22,7 +22,7 @@ , pname ? "kicad" , stable ? true , testing ? false -, withNgspice ? !stdenv.isDarwin +, withNgspice ? !stdenv.hostPlatform.isDarwin , libngspice , withScripting ? true , python3 @@ -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... @@ -234,7 +234,7 @@ stdenv.mkDerivation rec { # $out and $program_PYTHONPATH don't exist when makeWrapperArgs gets set? installPhase = let - bin = if stdenv.isDarwin then "*.app/Contents/MacOS" else "bin"; + bin = if stdenv.hostPlatform.isDarwin then "*.app/Contents/MacOS" else "bin"; tools = [ "kicad" "pcbnew" "eeschema" "gerbview" "pcb_calculator" "pl_editor" "bitmap2component" ]; utils = [ "dxf2idf" "idf2vrml" "idfcyl" "idfrect" "kicad-cli" ]; in @@ -286,7 +286,7 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ evils ]; platforms = lib.platforms.all; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; mainProgram = "kicad"; }; } diff --git a/pkgs/applications/science/electronics/kicad/libraries.nix b/pkgs/applications/science/electronics/kicad/libraries.nix index 327f77d1c42fa..4a3e40a3166d2 100644 --- a/pkgs/applications/science/electronics/kicad/libraries.nix +++ b/pkgs/applications/science/electronics/kicad/libraries.nix @@ -1,6 +1,5 @@ { lib, stdenv , cmake -, gettext , libSrc , stepreduce , parallel diff --git a/pkgs/applications/science/electronics/kicad/versions.nix b/pkgs/applications/science/electronics/kicad/versions.nix index b3ddbd5b604fe..b76db0040088d 100644 --- a/pkgs/applications/science/electronics/kicad/versions.nix +++ b/pkgs/applications/science/electronics/kicad/versions.nix @@ -3,23 +3,23 @@ { "kicad" = { kicadVersion = { - version = "8.0.3"; + version = "8.0.5"; src = { - rev = "8ba5ba46af8502ea7a7d2a9754363167c2742399"; - sha256 = "0hafvcjjwylgcpgyyasmb2q210k82wvcswvgjvwwh76bwshwcpwa"; + rev = "1413b8bfab256aa09ae3f23027b9ffe278161ca6"; + sha256 = "1g0w3g1gq6p72gg0jikdrh5mczcv5y16jmqi79bkp6nfl8gbx4l5"; }; }; libVersion = { - version = "8.0.3"; + version = "8.0.5"; libSources = { - symbols.rev = "2bc103c46a8daacbba2cded8b9f095b330ba928d"; - symbols.sha256 = "1za0spq09bbj7xwfwr1abmwjnqfd3zx0crayaz7915ja0ifi75hd"; - templates.rev = "0f57b59d365d1f8b8fdd0745e10beb035e88ba37"; + symbols.rev = "3bd95a02b135941ba00e5e4671e7c3ebc7672db4"; + symbols.sha256 = "12v8g48fgbalp0xrlgn3vm3ld79ymmwccv5aib6jz2qycdjxmznf"; + templates.rev = "4644b7570ba73dfe03a06a674c98d3fe2a7fe1e4"; templates.sha256 = "03idwrk3vj9h2az8j8lqpbdbnfxdbkzh4db68kq3644yj3cnlcza"; - footprints.rev = "539ffd8c0898ad8c8c51c2ab85ba56bfd77271c7"; - footprints.sha256 = "0ik4hjl5m65wnpaymg58zbvsfvchhyq5x3psvj6005mgv2hrican"; - packages3d.rev = "3172a1cc0931c1734efad68623374d5277f8ab60"; - packages3d.sha256 = "1yjlg7cxwhlzcdbxjqyqamr140sz8gvzi63k2401mhdbh88c9kii"; + footprints.rev = "4d2be8bf917b9c31f0510fa953532b88ef8b8be8"; + footprints.sha256 = "0ixfiraahi09gvszzxsdz21mdr9wsxyby5qp3n57pzid42gs35a1"; + packages3d.rev = "2f3ea516116cc553c9d488424fbb196f4e65ef29"; + packages3d.sha256 = "03yicqv36zx0wrb0njpkk45l4ysvv3dlsjlpi4j8j75gla060mai"; }; }; }; diff --git a/pkgs/applications/science/electronics/kingstvis/default.nix b/pkgs/applications/science/electronics/kingstvis/default.nix index 3699aebbbff0e..0a39c66bc662a 100644 --- a/pkgs/applications/science/electronics/kingstvis/default.nix +++ b/pkgs/applications/science/electronics/kingstvis/default.nix @@ -6,7 +6,6 @@ , glib , lib , libGL -, stdenv , xkeyboard_config , xorg , zlib diff --git a/pkgs/applications/science/electronics/librepcb/default.nix b/pkgs/applications/science/electronics/librepcb/default.nix index cff52d67dc477..061043a67d411 100644 --- a/pkgs/applications/science/electronics/librepcb/default.nix +++ b/pkgs/applications/science/electronics/librepcb/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = pname; repo = pname; rev = version; - sha256 = "sha256-Vyp7asVqvKFkkEb67LXapMkT1AQSburN3+B2dXIPcEU="; + hash = "sha256-Vyp7asVqvKFkkEb67LXapMkT1AQSburN3+B2dXIPcEU="; fetchSubmodules = true; }; diff --git a/pkgs/applications/science/electronics/magic-vlsi/default.nix b/pkgs/applications/science/electronics/magic-vlsi/default.nix deleted file mode 100644 index 0be742f76e3c6..0000000000000 --- a/pkgs/applications/science/electronics/magic-vlsi/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ lib, stdenv -, fetchurl -, python3 -, m4 -, cairo -, libX11 -, mesa_glu -, ncurses -, tcl -, tcsh -, tk -}: - -stdenv.mkDerivation rec { - pname = "magic-vlsi"; - version = "8.3.483"; - - src = fetchurl { - url = "http://opencircuitdesign.com/magic/archive/magic-${version}.tgz"; - sha256 = "sha256-JyawlH/zUTJ7fGf63zHvZ3q8AYRwFELwh+63RN9IkBA="; - }; - - nativeBuildInputs = [ python3 ]; - buildInputs = [ - cairo - libX11 - m4 - mesa_glu - ncurses - tcl - tcsh - tk - ]; - - enableParallelBuilding = true; - - configureFlags = [ - "--with-tcl=${tcl}" - "--with-tk=${tk}" - "--disable-werror" - ]; - - postPatch = '' - patchShebangs scripts/* - ''; - - env.NIX_CFLAGS_COMPILE = "-Wno-implicit-function-declaration"; - - meta = with lib; { - description = "VLSI layout tool written in Tcl"; - homepage = "http://opencircuitdesign.com/magic/"; - license = licenses.mit; - maintainers = with maintainers; [ thoughtpolice AndersonTorres ]; - }; -} diff --git a/pkgs/applications/science/electronics/nanovna-saver/default.nix b/pkgs/applications/science/electronics/nanovna-saver/default.nix index dd58794ed182c..1f483034d2b19 100644 --- a/pkgs/applications/science/electronics/nanovna-saver/default.nix +++ b/pkgs/applications/science/electronics/nanovna-saver/default.nix @@ -1,25 +1,28 @@ { lib, + stdenv, python3, fetchFromGitHub, qt6, }: python3.pkgs.buildPythonApplication rec { pname = "nanovna-saver"; - version = "0.6.3"; + version = "0.6.4"; src = fetchFromGitHub { owner = "NanoVNA-Saver"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-lL6n3hcsIbLmrRKPi/ckWW2XUAtmBqvMSplkWOF4VKQ="; + sha256 = "sha256-fAVsjknhLhsrGdHu2Q6JWLoFoxZoc+wDCNja+ySCsR4="; }; - nativeBuildInputs = [ + nativeBuildInputs = [ qt6.wrapQtAppsHook qt6.qtbase ]; + buildInputs = lib.optional stdenv.hostPlatform.isLinux qt6.qtwayland; + propagatedBuildInputs = with python3.pkgs; [ cython scipy diff --git a/pkgs/applications/science/electronics/nvc/default.nix b/pkgs/applications/science/electronics/nvc/default.nix index 62b62ff15faae..0c557fbeca3e1 100644 --- a/pkgs/applications/science/electronics/nvc/default.nix +++ b/pkgs/applications/science/electronics/nvc/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "nvc"; - version = "1.12.2"; + version = "1.14.0"; src = fetchFromGitHub { owner = "nickg"; repo = "nvc"; rev = "r${version}"; - hash = "sha256-9nqho+iDqy8oQLSxBppXoafzEuS6AkcUuqEY3xxfFs4="; + hash = "sha256-xaJt3zMAv+Op7cQAaKJOyI28oEssMw/7zvEnfReS4aw="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/electronics/openboardview/default.nix b/pkgs/applications/science/electronics/openboardview/default.nix index 4aa9ab2b66f29..a3a906c25c2b4 100644 --- a/pkgs/applications/science/electronics/openboardview/default.nix +++ b/pkgs/applications/science/electronics/openboardview/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { owner = "OpenBoardView"; repo = "OpenBoardView"; rev = version; - sha256 = "sha256-sKDDOPpCagk7rBRlMlZhx+RYYbtoLzJsrnL8qKZMKW8="; + hash = "sha256-sKDDOPpCagk7rBRlMlZhx+RYYbtoLzJsrnL8qKZMKW8="; fetchSubmodules = true; }; @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ cmake pkg-config python3 wrapGAppsHook3 ]; - buildInputs = [ SDL2 fontconfig gtk3 ] ++ lib.optionals stdenv.isDarwin [ + buildInputs = [ SDL2 fontconfig gtk3 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ]; @@ -53,10 +53,10 @@ stdenv.mkDerivation rec { ]; dontWrapGApps = true; - postFixup = lib.optionalString stdenv.isDarwin '' + postFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p "$out/Applications" mv "$out/openboardview.app" "$out/Applications/OpenBoardView.app" - '' + lib.optionalString (!stdenv.isDarwin) '' + '' + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' wrapGApp "$out/bin/${pname}" \ --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ gtk3 ]} ''; diff --git a/pkgs/applications/science/electronics/openroad/default.nix b/pkgs/applications/science/electronics/openroad/default.nix index 16659892a6ee7..65bf094c2a2c1 100644 --- a/pkgs/applications/science/electronics/openroad/default.nix +++ b/pkgs/applications/science/electronics/openroad/default.nix @@ -8,14 +8,13 @@ , flex , git , python3 -, swig4 +, swig , boost179 , cbc # for clp , cimg , clp # for or-tools , eigen , glpk -, gtest , lcov , lemon-graph , libjpeg @@ -52,7 +51,7 @@ mkDerivation rec { flex git pkg-config - swig4 + swig ]; buildInputs = [ diff --git a/pkgs/applications/science/electronics/picoscope/default.nix b/pkgs/applications/science/electronics/picoscope/default.nix index 3aa5cb22aa52c..27e527a01d876 100644 --- a/pkgs/applications/science/electronics/picoscope/default.nix +++ b/pkgs/applications/science/electronics/picoscope/default.nix @@ -15,13 +15,12 @@ ] }: let - shared_meta = lib: - with lib; { - homepage = "https://www.picotech.com/downloads/linux"; - maintainers = with maintainers; [ expipiplus1 wirew0rm ] ++ teams.lumiguide.members; - platforms = [ "x86_64-linux" ]; - license = licenses.unfree; - }; + shared_meta = lib: { + homepage = "https://www.picotech.com/downloads/linux"; + maintainers = with lib.maintainers; [ expipiplus1 wirew0rm ] ++ lib.teams.lumiguide.members; + platforms = [ "x86_64-linux" ]; + license = lib.licenses.unfree; + }; libpicoipp = callPackage ({ stdenv, lib, fetchurl, autoPatchelfHook, dpkg }: stdenv.mkDerivation rec { @@ -39,11 +38,10 @@ let install -Dt $out/usr/share/doc/libpicoipp usr/share/doc/libpicoipp/copyright runHook postInstall ''; - meta = with lib; - shared_meta lib // { - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - description = "library for picotech oscilloscope software"; - }; + meta = shared_meta lib // { + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + description = "library for picotech oscilloscope software"; + }; }) { }; # If we don't have a platform available, put a dummy version here, so at diff --git a/pkgs/applications/science/electronics/pulseview/default.nix b/pkgs/applications/science/electronics/pulseview/default.nix index b6d40a19a14bd..3a40b107817db 100644 --- a/pkgs/applications/science/electronics/pulseview/default.nix +++ b/pkgs/applications/science/electronics/pulseview/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { pkg-config qttools wrapQtAppsHook - ] ++ lib.optional stdenv.isDarwin desktopToDarwinBundle; + ] ++ lib.optional stdenv.hostPlatform.isDarwin desktopToDarwinBundle; buildInputs = [ glib @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { pcre python3 qtsvg - ] ++ lib.optionals stdenv.isLinux [ bluez ]; + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ bluez ]; meta = with lib; { description = "Qt-based LA/scope/MSO GUI for sigrok (a signal analysis software suite)"; diff --git a/pkgs/applications/science/electronics/sv-lang/default.nix b/pkgs/applications/science/electronics/sv-lang/default.nix index 58ecf986cf7a2..928cf3059385e 100644 --- a/pkgs/applications/science/electronics/sv-lang/default.nix +++ b/pkgs/applications/science/electronics/sv-lang/default.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { # TODO: a mysterious linker error occurs when building the unittests on darwin. # The error occurs when using catch2_3 in nixpkgs, not when fetching catch2_3 using CMake - doCheck = !stdenv.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin; meta = with lib; { description = "SystemVerilog compiler and language services"; diff --git a/pkgs/applications/science/electronics/systemc/default.nix b/pkgs/applications/science/electronics/systemc/default.nix index 8e47ef9606566..089ccd85c0331 100644 --- a/pkgs/applications/science/electronics/systemc/default.nix +++ b/pkgs/applications/science/electronics/systemc/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { homepage = "https://systemc.org/"; license = licenses.asl20; platforms = platforms.unix; - maintainers = with maintainers; [ victormignot amiloradovsky ]; + maintainers = with maintainers; [ amiloradovsky ]; }; } diff --git a/pkgs/applications/science/electronics/tkgate/1.x.nix b/pkgs/applications/science/electronics/tkgate/1.x.nix index f20ce5e0acd09..03883652e6378 100644 --- a/pkgs/applications/science/electronics/tkgate/1.x.nix +++ b/pkgs/applications/science/electronics/tkgate/1.x.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchurl, tcl, tk, libX11, glibc, which, bison, flex, imake, xorgproto, gccmakedep }: let - libiconvInc = lib.optionalString stdenv.isLinux "${glibc.dev}/include"; - libiconvLib = lib.optionalString stdenv.isLinux "${glibc.out}/lib"; + libiconvInc = lib.optionalString stdenv.hostPlatform.isLinux "${glibc.dev}/include"; + libiconvLib = lib.optionalString stdenv.hostPlatform.isLinux "${glibc.out}/lib"; in stdenv.mkDerivation rec { pname = "tkgate"; diff --git a/pkgs/applications/science/electronics/verilator/default.nix b/pkgs/applications/science/electronics/verilator/default.nix index 92f8fa52b91f9..b7f2abd37ba75 100644 --- a/pkgs/applications/science/electronics/verilator/default.nix +++ b/pkgs/applications/science/electronics/verilator/default.nix @@ -1,33 +1,59 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, perl, flex, bison, python3, autoconf, - which, cmake, ccache, help2man, makeWrapper, glibcLocales, - systemc, git, numactl }: +{ + lib, + stdenv, + fetchFromGitHub, + perl, + flex, + bison, + python3, + autoconf, + which, + help2man, + makeWrapper, + systemc, + git, + numactl, + coreutils, +}: stdenv.mkDerivation rec { pname = "verilator"; - version = "5.022"; + version = "5.026"; + + # Verilator gets the version from this environment variable + # if it can't do git describe while building. + VERILATOR_SRC_VERSION = "v${version}"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-Ya3lqK8BfvMVLZUrD2Et6OmptteWXp5VmZb2x2G/V/E="; + hash = "sha256-Ds6w95tqlKjIFnkq2kKyslprKCwMOtBOoy7LuTon3KM="; }; - patches = [ - (fetchpatch { - # Fix try-lock spuriously fail in V3ThreadPool destructor - # https://github.com/verilator/verilator/pull/4938 - url = "https://github.com/verilator/verilator/commit/4b9cce4369c78423779238e585ed693c456d464e.patch"; - hash = "sha256-sGrk/pxqZqUcmJdzQoPlzXMmYqHCOmd9Y2n6ieVNg1U="; - }) - ]; - enableParallelBuilding = true; - buildInputs = [ perl python3 systemc ]; # ccache - nativeBuildInputs = [ makeWrapper flex bison autoconf help2man git ]; - nativeCheckInputs = [ which numactl ]; # cmake + buildInputs = [ + perl + python3 + systemc + # ccache + ]; + nativeBuildInputs = [ + makeWrapper + flex + bison + autoconf + help2man + git + ]; + nativeCheckInputs = [ + which + numactl + coreutils + # cmake + ]; - doCheck = stdenv.isLinux; # darwin tests are broken for now... + doCheck = stdenv.hostPlatform.isLinux; # darwin tests are broken for now... checkTarget = "test"; preConfigure = "autoconf"; @@ -36,16 +62,12 @@ stdenv.mkDerivation rec { patchShebangs bin/* src/* nodist/* docs/bin/* examples/xml_py/* \ test_regress/{driver.pl,t/*.{pl,pf}} \ ci/* ci/docker/run/* ci/docker/run/hooks/* ci/docker/buildenv/build.sh + # verilator --gdbbt uses /bin/echo to test if gdb works. + sed -i 's|/bin/echo|${coreutils}\/bin\/echo|' bin/verilator ''; # grep '^#!/' -R . | grep -v /nix/store | less # (in nix-shell after patchPhase) - postInstall = lib.optionalString stdenv.isLinux '' - for x in $(ls $out/bin/verilator*); do - wrapProgram "$x" --set LOCALE_ARCHIVE "${glibcLocales}/lib/locale/locale-archive" - done - ''; - env = { SYSTEMC_INCLUDE = "${lib.getDev systemc}/include"; SYSTEMC_LIBDIR = "${lib.getLib systemc}/lib"; @@ -53,9 +75,15 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Fast and robust (System)Verilog simulator/compiler and linter"; - homepage = "https://www.veripool.org/verilator"; - license = with licenses; [ lgpl3Only artistic2 ]; - platforms = platforms.unix; - maintainers = with maintainers; [ thoughtpolice amiloradovsky ]; + homepage = "https://www.veripool.org/verilator"; + license = with licenses; [ + lgpl3Only + artistic2 + ]; + platforms = platforms.unix; + maintainers = with maintainers; [ + thoughtpolice + amiloradovsky + ]; }; } diff --git a/pkgs/applications/science/electronics/verilog/default.nix b/pkgs/applications/science/electronics/verilog/default.nix deleted file mode 100644 index 06e8a94a4c537..0000000000000 --- a/pkgs/applications/science/electronics/verilog/default.nix +++ /dev/null @@ -1,80 +0,0 @@ -{ lib, stdenv -, fetchFromGitHub -, fetchpatch -, autoconf -, bison -, bzip2 -, flex -, gperf -, ncurses -, perl -, python3 -, readline -, zlib -}: - -stdenv.mkDerivation rec { - pname = "iverilog"; - version = "12.0"; - - src = fetchFromGitHub { - owner = "steveicarus"; - repo = pname; - rev = "v${lib.replaceStrings ["."] ["_"] version}"; - hash = "sha256-J9hedSmC6mFVcoDnXBtaTXigxrSCFa2AhhFd77ueo7I="; - }; - - nativeBuildInputs = [ autoconf bison flex gperf ]; - - CC_FOR_BUILD="${stdenv.cc}/bin/cc"; - CXX_FOR_BUILD="${stdenv.cc}/bin/c++"; - - patches = [ - # NOTE(jleightcap): `-Werror=format-security` warning patched shortly after release, backport the upstream fix - (fetchpatch { - name = "format-security"; - url = "https://github.com/steveicarus/iverilog/commit/23e51ef7a8e8e4ba42208936e0a6a25901f58c65.patch"; - hash = "sha256-fMWfBsCl2fuXe+6AR10ytb8QpC84bXlP5RSdrqsWzEk="; - }) - ]; - - buildInputs = [ bzip2 ncurses readline zlib ]; - - preConfigure = "sh autoconf.sh"; - - enableParallelBuilding = true; - - env = lib.optionalAttrs stdenv.isDarwin { - NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; - }; - - # NOTE(jleightcap): the `make check` target only runs a "Hello, World"-esque sanity check. - # the tests in the doInstallCheck phase run a full regression test suite. - # however, these tests currently fail upstream on aarch64 - # (see https://github.com/steveicarus/iverilog/issues/917) - # so disable the full suite for now. - doCheck = true; - doInstallCheck = !stdenv.isAarch64; - - nativeInstallCheckInputs = [ - perl - (python3.withPackages (pp: with pp; [ - docopt - ])) - ]; - - installCheckPhase = '' - runHook preInstallCheck - export PATH="$PATH:$out/bin" - sh .github/test.sh - runHook postInstallCheck - ''; - - meta = with lib; { - description = "Icarus Verilog compiler"; - homepage = "http://iverilog.icarus.com/"; # https does not work - license = with licenses; [ gpl2Plus lgpl21Plus ]; - maintainers = with maintainers; [ thoughtpolice ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/applications/science/electronics/vhd2vl/default.nix b/pkgs/applications/science/electronics/vhd2vl/default.nix index 078f5e9514047..28656fe6e1216 100644 --- a/pkgs/applications/science/electronics/vhd2vl/default.nix +++ b/pkgs/applications/science/electronics/vhd2vl/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , bison , flex -, verilog +, iverilog , which }: @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - verilog + iverilog ]; # the "translate" target both (a) builds the software and (b) runs diff --git a/pkgs/applications/science/electronics/xoscope/default.nix b/pkgs/applications/science/electronics/xoscope/default.nix index 0fa0c1bc79bfc..37b9076c01cc7 100644 --- a/pkgs/applications/science/electronics/xoscope/default.nix +++ b/pkgs/applications/science/electronics/xoscope/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { mainProgram = "xoscope"; homepage = "https://xoscope.sourceforge.net"; license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [viric]; + maintainers = [ ]; platforms = with lib.platforms; linux; }; } diff --git a/pkgs/applications/science/electronics/xschem/default.nix b/pkgs/applications/science/electronics/xschem/default.nix index 826181139c194..72f4687f5c85e 100644 --- a/pkgs/applications/science/electronics/xschem/default.nix +++ b/pkgs/applications/science/electronics/xschem/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Schematic capture and netlisting EDA tool"; longDescription = '' Xschem is a schematic capture program, it allows creation of diff --git a/pkgs/applications/science/electronics/xyce/default.nix b/pkgs/applications/science/electronics/xyce/default.nix index 93c155038a22b..56fc59c080994 100644 --- a/pkgs/applications/science/electronics/xyce/default.nix +++ b/pkgs/applications/science/electronics/xyce/default.nix @@ -17,14 +17,12 @@ , withMPI ? false # for doc , texliveMedium -, pandoc , enableDocs ? true # for tests , bash , bc , openssh # required by MPI , perl -, perlPackages , python3 , enableTests ? true }: @@ -175,7 +173,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) || stdenv.hostPlatform.isDarwin; description = "High-performance analog circuit simulator"; longDescription = '' Xyce is a SPICE-compatible, high-performance analog circuit simulator, diff --git a/pkgs/applications/science/geometry/antiprism/default.nix b/pkgs/applications/science/geometry/antiprism/default.nix deleted file mode 100644 index 62ffc099dc6cd..0000000000000 --- a/pkgs/applications/science/geometry/antiprism/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, stdenv -, fetchFromGitHub -, autoreconfHook -, libX11 -, libGL -, libGLU -, freeglut }: - -stdenv.mkDerivation rec { - pname = "antiprism"; - version = "0.30"; - - src = fetchFromGitHub { - owner = "antiprism"; - repo = pname; - rev = version; - sha256 = "sha256-dD3MH+KectuuKOYF7bqWtGsBo5zz+UMyY/io1tgXbgU="; - }; - - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ libX11 libGLU libGL.dev freeglut.dev ]; - - meta = with lib; { - homepage = "https://www.antiprism.com"; - description = "Collection of programs for generating, manipulating, transforming and viewing polyhedra"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ AndersonTorres ]; - }; -} diff --git a/pkgs/applications/science/geometry/tetgen/default.nix b/pkgs/applications/science/geometry/tetgen/default.nix index dce56dc4e17d2..e64941f4243ad 100644 --- a/pkgs/applications/science/geometry/tetgen/default.nix +++ b/pkgs/applications/science/geometry/tetgen/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { mainProgram = "tetgen"; homepage = "http://tetgen.org/"; license = lib.licenses.agpl3Plus; - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/science/logic/alt-ergo/default.nix b/pkgs/applications/science/logic/alt-ergo/default.nix index 03787a3a084b1..2f58141c3281b 100644 --- a/pkgs/applications/science/logic/alt-ergo/default.nix +++ b/pkgs/applications/science/logic/alt-ergo/default.nix @@ -2,11 +2,11 @@ let pname = "alt-ergo"; - version = "2.5.4"; + version = "2.6.0"; src = fetchurl { url = "https://github.com/OCamlPro/alt-ergo/releases/download/v${version}/alt-ergo-${version}.tbz"; - hash = "sha256-AsHok5i62vqJ5hK8XRiD8hM6JQaFv3dMxZAcVYEim6w="; + hash = "sha256-EmkxGvJSeKRmiSuoeMyIi6WfF39T3QPxKixiOwP8834="; }; in @@ -14,7 +14,17 @@ let alt-ergo-lib = ocamlPackages.buildDunePackage rec { pname = "alt-ergo-lib"; inherit version src; buildInputs = with ocamlPackages; [ ppx_blob ]; - propagatedBuildInputs = with ocamlPackages; [ camlzip dolmen_loop dune-build-info fmt ocplib-simplex seq stdlib-shims zarith ]; + propagatedBuildInputs = with ocamlPackages; [ + camlzip + dolmen_loop + dune-build-info + fmt + ocplib-simplex + ppx_deriving + seq + stdlib-shims + zarith + ]; }; in let alt-ergo-parsers = ocamlPackages.buildDunePackage rec { @@ -28,8 +38,18 @@ ocamlPackages.buildDunePackage { inherit pname version src; - nativeBuildInputs = [ ocamlPackages.menhir ] ++ lib.optionals stdenv.isDarwin [ darwin.sigtool ]; - buildInputs = [ alt-ergo-parsers ] ++ (with ocamlPackages; [ cmdliner dune-site ]); + nativeBuildInputs = [ ocamlPackages.menhir ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.sigtool ]; + propagatedBuildInputs = [ alt-ergo-parsers ] ++ (with ocamlPackages; [ cmdliner dune-site ppxlib ]); + + outputs = [ "bin" "out" ]; + + installPhase = '' + runHook preInstall + dune install --prefix $bin ${pname} + mkdir -p $out/lib/ocaml/${ocamlPackages.ocaml.version}/site-lib + mv $bin/lib/alt-ergo $out/lib/ocaml/${ocamlPackages.ocaml.version}/site-lib/ + runHook postInstall + ''; meta = { description = "High-performance theorem prover and SMT solver"; diff --git a/pkgs/applications/science/logic/beluga/default.nix b/pkgs/applications/science/logic/beluga/default.nix index b1497e2b1dcbe..d85f375f9f89d 100644 --- a/pkgs/applications/science/logic/beluga/default.nix +++ b/pkgs/applications/science/logic/beluga/default.nix @@ -2,13 +2,13 @@ ocamlPackages.buildDunePackage rec { pname = "beluga"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitHub { owner = "Beluga-lang"; repo = "Beluga"; rev = "refs/tags/v${version}"; - hash = "sha256-l/C77czLtlLnpadVx4d9ve9jv/e11jsOgzrbXt+Zo5s="; + hash = "sha256-QUZ3mmd0gBQ+hnAeo/TbvFsETnThAdAoQyfpz2F//4g="; }; duneVersion = "3"; diff --git a/pkgs/applications/science/logic/bitwuzla/default.nix b/pkgs/applications/science/logic/bitwuzla/default.nix index c1eb751fb1a57..f5a5296de9c47 100644 --- a/pkgs/applications/science/logic/bitwuzla/default.nix +++ b/pkgs/applications/science/logic/bitwuzla/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { # but setting it to shared works even in pkgsStatic "-Ddefault_library=shared" - (lib.strings.mesonEnable "testing" finalAttrs.doCheck) + (lib.strings.mesonEnable "testing" finalAttrs.finalPackage.doCheck) ]; nativeCheckInputs = [ python3 ]; diff --git a/pkgs/applications/science/logic/boolector/default.nix b/pkgs/applications/science/logic/boolector/default.nix index 1fd6bf7dc5431..30e3cf5002114 100644 --- a/pkgs/applications/science/logic/boolector/default.nix +++ b/pkgs/applications/science/logic/boolector/default.nix @@ -34,11 +34,11 @@ stdenv.mkDerivation rec { nativeCheckInputs = [ python3 ]; doCheck = true; preCheck = - let var = if stdenv.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"; + let var = if stdenv.hostPlatform.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"; in # tests modelgen and modelgensmt2 spawn boolector in another processes and # macOS strips DYLD_LIBRARY_PATH, hardcode it for testing - lib.optionalString stdenv.isDarwin '' + lib.optionalString stdenv.hostPlatform.isDarwin '' cp -r bin bin.back install_name_tool -change libboolector.dylib $(pwd)/lib/libboolector.dylib bin/boolector '' + '' @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { patchShebangs .. ''; - postCheck = lib.optionalString stdenv.isDarwin '' + postCheck = lib.optionalString stdenv.hostPlatform.isDarwin '' rm -rf bin mv bin.back bin ''; diff --git a/pkgs/applications/science/logic/btor2tools/default.nix b/pkgs/applications/science/logic/btor2tools/default.nix index a66637150bdfd..2b547eeb92218 100644 --- a/pkgs/applications/science/logic/btor2tools/default.nix +++ b/pkgs/applications/science/logic/btor2tools/default.nix @@ -2,24 +2,16 @@ stdenv.mkDerivation rec { pname = "btor2tools"; - version = "1.0.0-pre_${src.rev}"; + version = "unstable-2024-08-07"; src = fetchFromGitHub { owner = "boolector"; repo = "btor2tools"; - rev = "9831f9909fb283752a3d6d60d43613173bd8af42"; - sha256 = "0mfqmkgvyw8fa2c09kww107dmk180ch1hp98r5kv41vnc04iqb0s"; + rev = "44bcadbfede292ff4c4a4a8962cc18130de522fb"; + sha256 = "0ncl4xwms8d656x95ga8v8zjybx4cmdl5hlcml7dpcgm3p8qj4ks"; }; - patches = [ - (fetchpatch { - name = "gcc-13.patch"; - url = "https://github.com/Boolector/btor2tools/commit/037f1fa88fb439dca6f648ad48a3463256d69d8b.patch"; - hash = "sha256-FX1yy9XdUs1tAReOxhEzNHu48DrISzNNMSYoIrhHoFY="; - }) - ]; - - nativeBuildInputs = [ cmake ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; + nativeBuildInputs = [ cmake ] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; installPhase = '' mkdir -p $out $dev/include/btor2parser/ $lib/lib 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..0bfb512737582 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 = [ @@ -83,6 +83,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ jiegec ]; platforms = platforms.unix; # error: no member named 'aligned_alloc' in the global namespace - broken = stdenv.isDarwin && stdenv.isx86_64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64; }; } diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index af672d500fa6a..c45ee7190e77f 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -5,20 +5,19 @@ # - The exact version can be specified through the `version` argument to # the derivation; it defaults to the latest stable version. -{ lib, stdenv, fetchzip, writeText, pkg-config, gnumake42 +{ lib, stdenv, fetchzip, fetchurl, writeText, pkg-config, gnumake42 , customOCamlPackages ? null , ocamlPackages_4_05, ocamlPackages_4_09, ocamlPackages_4_10, ocamlPackages_4_12 , 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: -let lib' = lib; in -let lib = import ../../../../build-support/coq/extra-lib.nix {lib = lib';}; in -with builtins; with lib; let + lib = import ../../../../build-support/coq/extra-lib.nix { inherit (args) lib; }; + release = { "8.5pl1".sha256 = "1976ki5xjg2r907xj9p7gs0kpdinywbwcqlgxqw75dgp0hkgi00n"; "8.5pl2".sha256 = "109rrcrx7mz0fj7725kjjghfg5ydwb24hjsa5hspa27b4caah7rh"; @@ -59,36 +58,37 @@ let "8.19.0".sha256 = "sha256-ixsYCvCXpBHqJ71hLQklphlwoOO3i/6w2PJjllKqf9k="; "8.19.1".sha256 = "sha256-kmZ8Uk8jpzjOd67aAPp3C+vU2oNaBw9pr7+Uixcgg94="; "8.19.2".sha256 = "sha256-q+i07JsMZp83Gqav6v1jxsgPLN7sPvp5/oszVnavmz0="; + "8.20.0".sha256 = "sha256-WFpZlA6CzFVAruPhWcHQI7VOBVhrGLdFzWrHW0DTSl0="; }; releaseRev = v: "V${v}"; fetched = import ../../../../build-support/coq/meta-fetch/default.nix - { inherit lib stdenv fetchzip; } + { inherit lib stdenv fetchzip fetchurl; } { inherit release releaseRev; location = { owner = "coq"; repo = "coq";}; } args.version; version = fetched.version; - coq-version = args.coq-version or (if version != "dev" then versions.majorMinor version else "dev"); - coqAtLeast = v: coq-version == "dev" || versionAtLeast coq-version v; + coq-version = args.coq-version or (if version != "dev" then lib.versions.majorMinor version else "dev"); + coqAtLeast = v: coq-version == "dev" || lib.versionAtLeast coq-version v; buildIde = args.buildIde or (!coqAtLeast "8.14"); - ideFlags = optionalString (buildIde && !coqAtLeast "8.10") + ideFlags = lib.optionalString (buildIde && !coqAtLeast "8.10") "-lablgtkdir ${ocamlPackages.lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt"; csdpPatch = lib.optionalString (csdp != null) '' substituteInPlace plugins/micromega/sos.ml --replace "; csdp" "; ${csdp}/bin/csdp" substituteInPlace plugins/micromega/coq_micromega.ml --replace "System.is_in_system_path \"csdp\"" "true" ''; ocamlPackages = if customOCamlPackages != null then customOCamlPackages - else with versions; switch coq-version [ - { case = range "8.16" "8.18"; out = ocamlPackages_4_14; } - { case = range "8.14" "8.15"; out = ocamlPackages_4_12; } - { case = range "8.11" "8.13"; out = ocamlPackages_4_10; } - { case = range "8.7" "8.10"; out = ocamlPackages_4_09; } - { case = range "8.5" "8.6"; out = ocamlPackages_4_05; } + else lib.switch coq-version [ + { case = lib.versions.range "8.16" "8.18"; out = ocamlPackages_4_14; } + { case = lib.versions.range "8.14" "8.15"; out = ocamlPackages_4_12; } + { case = lib.versions.range "8.11" "8.13"; out = ocamlPackages_4_10; } + { case = lib.versions.range "8.7" "8.10"; out = ocamlPackages_4_09; } + { case = lib.versions.range "8.5" "8.6"; out = ocamlPackages_4_05; } ] ocamlPackages_4_14; - ocamlNativeBuildInputs = with ocamlPackages; [ ocaml findlib ] - ++ optional (coqAtLeast "8.14") dune_3; + ocamlNativeBuildInputs = [ ocamlPackages.ocaml ocamlPackages.findlib ] + ++ lib.optional (coqAtLeast "8.14") ocamlPackages.dune_3; ocamlPropagatedBuildInputs = [ ] - ++ optional (!coqAtLeast "8.10") ocamlPackages.camlp5 - ++ optional (!coqAtLeast "8.13") ocamlPackages.num - ++ optional (coqAtLeast "8.13") ocamlPackages.zarith; + ++ lib.optional (!coqAtLeast "8.10") ocamlPackages.camlp5 + ++ lib.optional (!coqAtLeast "8.13") ocamlPackages.num + ++ lib.optional (coqAtLeast "8.13") ocamlPackages.zarith; self = stdenv.mkDerivation { pname = "coq"; inherit (fetched) version src; @@ -110,7 +110,7 @@ self = stdenv.mkDerivation { (coq-prog-args)) (mapc (lambda (arg) (when (file-directory-p (concat arg "/lib/coq/${coq-version}/user-contrib")) - (setenv "COQPATH" (concat (getenv "COQPATH") ":" arg "/lib/coq/${coq-version}/user-contrib")))) '(${concatStringsSep " " (map (pkg: "\"${pkg}\"") pkgs)})) + (setenv "COQPATH" (concat (getenv "COQPATH") ":" arg "/lib/coq/${coq-version}/user-contrib")))) '(${lib.concatStringsSep " " (map (pkg: "\"${pkg}\"") pkgs)})) ; TODO Abstract this pattern from here and nixBufferBuilders.withPackages! (defvar nixpkgs--coq-buffer-count 0) (when (eq nixpkgs--coq-buffer-count 0) @@ -147,13 +147,13 @@ self = stdenv.mkDerivation { nativeBuildInputs = [ pkg-config ] ++ ocamlNativeBuildInputs - ++ optional buildIde copyDesktopItems - ++ optional (buildIde && coqAtLeast "8.10") wrapGAppsHook3 - ++ optional (!coqAtLeast "8.6") gnumake42; + ++ lib.optional buildIde copyDesktopItems + ++ lib.optional (buildIde && coqAtLeast "8.10") wrapGAppsHook3 + ++ lib.optional (!coqAtLeast "8.6") gnumake42; buildInputs = [ ncurses ] - ++ optionals buildIde + ++ lib.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 ]) ; @@ -187,12 +187,12 @@ self = stdenv.mkDerivation { prefixKey = "-prefix "; - buildFlags = [ "revision" "coq" ] ++ optional buildIde "coqide" ++ optional (!coqAtLeast "8.14") "bin/votour"; + buildFlags = [ "revision" "coq" ] ++ lib.optional buildIde "coqide" ++ lib.optional (!coqAtLeast "8.14") "bin/votour"; enableParallelBuilding = true; createFindlibDestdir = true; - desktopItems = optional buildIde (makeDesktopItem { + desktopItems = lib.optional buildIde (makeDesktopItem { name = "coqide"; exec = "coqide"; icon = "coq"; @@ -201,18 +201,18 @@ self = stdenv.mkDerivation { categories = [ "Development" "Science" "Math" "IDE" "GTK" ]; }); - postInstall = let suffix = optionalString (coqAtLeast "8.14") "-core"; in optionalString (!coqAtLeast "8.17") '' + postInstall = let suffix = lib.optionalString (coqAtLeast "8.14") "-core"; in lib.optionalString (!coqAtLeast "8.17") '' cp bin/votour $out/bin/ '' + '' ln -s $out/lib/coq${suffix} $OCAMLFIND_DESTDIR/coq${suffix} - '' + optionalString (coqAtLeast "8.14") '' + '' + lib.optionalString (coqAtLeast "8.14") '' ln -s $out/lib/coqide-server $OCAMLFIND_DESTDIR/coqide-server - '' + optionalString buildIde '' + '' + lib.optionalString buildIde '' mkdir -p "$out/share/pixmaps" ln -s "$out/share/coq/coq.png" "$out/share/pixmaps/" ''; - meta = { + meta = with lib; { description = "Coq proof assistant"; longDescription = '' Coq is a formal proof management system. It provides a formal language diff --git a/pkgs/applications/science/logic/cryptoverif/default.nix b/pkgs/applications/science/logic/cryptoverif/default.nix index 7c95c21c2ccf3..fb1ba4df55b24 100644 --- a/pkgs/applications/science/logic/cryptoverif/default.nix +++ b/pkgs/applications/science/logic/cryptoverif/default.nix @@ -1,12 +1,12 @@ -{ lib, stdenv, fetchurl, ocaml }: +{ lib, stdenv, fetchurl, ocaml, writeScript }: stdenv.mkDerivation (finalAttrs: { pname = "cryptoverif"; - version = "2.09"; + version = "2.10"; src = fetchurl { url = "http://prosecco.gforge.inria.fr/personal/bblanche/cryptoverif/cryptoverif${finalAttrs.version}.tar.gz"; - hash = "sha256-FJlPZgTUZ+6HzhG/B0dOiVIjDvoCnF6yg2E9UriSojw="; + hash = "sha256-Gg7PYMB5cYWk9+xuxxcFY9L9vynHX2xYyMDo/0DauPM="; }; /* Fix up the frontend to load the 'default' cryptoverif library @@ -40,10 +40,22 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; + passthru.updateScript = writeScript "update-cryptoverif" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p common-updater-scripts curl pcre2 + + set -eu -o pipefail + + version="$(curl -s https://bblanche.gitlabpages.inria.fr/CryptoVerif/ | + pcre2grep -o1 '\bCryptoVerif version ([.[:alnum:]]+),')" + + update-source-version "$UPDATE_NIX_ATTR_PATH" "$version" + ''; + meta = { description = "Cryptographic protocol verifier in the computational model"; mainProgram = "cryptoverif"; - homepage = "https://prosecco.gforge.inria.fr/personal/bblanche/cryptoverif/"; + homepage = "https://bblanche.gitlabpages.inria.fr/CryptoVerif/"; license = lib.licenses.cecill-b; platforms = lib.platforms.unix; maintainers = [ lib.maintainers.thoughtpolice ]; diff --git a/pkgs/applications/science/logic/cvc4/default.nix b/pkgs/applications/science/logic/cvc4/default.nix index 2dc12b7ab7234..c44b495f2caef 100644 --- a/pkgs/applications/science/logic/cvc4/default.nix +++ b/pkgs/applications/science/logic/cvc4/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ gmp git python3.pkgs.toml readline swig libantlr3c antlr3_4 boost jdk python3 ] - ++ lib.optionals (!stdenv.isDarwin) [ cln ]; + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ cln ]; configureFlags = [ "--enable-language-bindings=c,c++,java" "--enable-gpl" "--with-readline" "--with-boost=${boost.dev}" - ] ++ lib.optionals (!stdenv.isDarwin) [ "--with-cln" ]; + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ "--with-cln" ]; prePatch = '' patch -p1 -i ${./minisat-fenv.patch} -d src/prop/minisat diff --git a/pkgs/applications/science/logic/cvc5/default.nix b/pkgs/applications/science/logic/cvc5/default.nix index 93a05e97ff9e1..6fc2b1b7c972a 100644 --- a/pkgs/applications/science/logic/cvc5/default.nix +++ b/pkgs/applications/science/logic/cvc5/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "cvc5"; - version = "1.1.2"; + version = "1.2.0"; src = fetchFromGitHub { owner = "cvc5"; repo = "cvc5"; rev = "cvc5-${version}"; - hash = "sha256-v+3/2IUslQOySxFDYgTBWJIDnyjbU2RPdpfLcIkEtgQ="; + hash = "sha256-d5F4KwPQ1nwYJbEidQsvqyaGwEugo291SpsJE2rr558="; }; nativeBuildInputs = [ pkg-config cmake flex ]; @@ -28,6 +28,8 @@ stdenv.mkDerivation rec { "-DANTLR3_JAR=${antlr3_4}/lib/antlr/antlr-3.4-complete.jar" ]; + doCheck = true; + meta = with lib; { description = "High-performance theorem prover and SMT solver"; mainProgram = "cvc5"; diff --git a/pkgs/applications/science/logic/dafny/default.nix b/pkgs/applications/science/logic/dafny/default.nix index f85e6cf22879d..3f97765e6c180 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.8.0"; src = fetchFromGitHub { owner = "dafny-lang"; repo = "dafny"; rev = "v${version}"; - hash = "sha256-3t0drxM7PZzrLbxBKYa6Gja2u6GK6Pc+ejoswag3P3k="; + hash = "sha256-x/fX4o+R72Pl02u1Zsr80Rh/4Wb/aKw90fhAGmsfFUI="; }; - 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..95924b788dc9a 100644 --- a/pkgs/applications/science/logic/dafny/deps.nix +++ b/pkgs/applications/science/logic/dafny/deps.nix @@ -2,180 +2,174 @@ # Please dont edit it manually, your changes might get overwritten! { 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 = "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"; }) - (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "1.1.1"; sha256 = "0a1ahssqds2ympr7s4xcxv5y8jgxs7ahd6ah6fbgglj4rki1f1vw"; }) - (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; sha256 = "15gqy2m14fdlvy1g59207h5kisznm355kbw010gy19vh47z8gpz3"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.0.0"; sha256 = "0bbl0jpqywqmzz2gagld1p2gvdfldjfjmm25hil9wj2nq1zc4di8"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "3.7.0"; sha256 = "0882492nx6x68b0pkh3q5xaawz0b2l5x35r40722ignyjnvjydph"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "3.7.0"; sha256 = "0adw6rcag8wxydzyiyhls2mxaqkay5qlz25z1fxrlv5qnchqn0n5"; }) - (fetchNuGet { pname = "Microsoft.DotNet.PlatformAbstractions"; version = "2.0.4"; sha256 = "1fdzln4im9hb55agzwchbfgm3vmngigmbpci5j89b0gqcxixmv8j"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "2.0.0"; sha256 = "0yssxq9di5h6xw2cayp5hj3l9b2p0jw9wcjz73rwk4586spac9s9"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "5.0.0"; sha256 = "01m9vzlq0vg0lhckj2dimwq42niwny8g3lm13c9a401hlyg90z1p"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "2.0.0"; sha256 = "1ilz2yrgg9rbjyhn6a5zh9pr51nmh11z7sixb4p7vivgydj9gxwf"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "5.0.0"; sha256 = "0fqxkc9pjxkqylsdf26s9q21ciyk56h1w33pz3v1v4wcv8yv1v6k"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "2.0.0"; sha256 = "1prvdbma6r18n5agbhhabv6g357p1j70gq4m9g0vs859kf44nrgc"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.CommandLine"; version = "5.0.0"; sha256 = "084hnz5l0vr15ay23rksqipslqnz3pp30w9hsirpx1iqdm5688mc"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.FileExtensions"; version = "5.0.0"; sha256 = "1wq229r3xcmm9wh9sqdpvmfv4qpbp2zms9x6xk7g7sbb8h32hnz3"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Json"; version = "5.0.0"; sha256 = "0hq5i483bjbvprp1la9l3si82x1ydxbvkpfc7r3s7zgxg957fyp9"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "2.0.0"; sha256 = "018izzgykaqcliwarijapgki9kp2c560qv8qsxdjywr7byws5apq"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "5.0.0"; sha256 = "15sdwcyzz0qlybwbdq854bn3jk6kx7awx28gs864c4shhbqkppj4"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "2.0.0"; sha256 = "1pwrfh9b72k9rq6mb2jab5qhhi225d5rjalzkapiayggmygc8nhz"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "5.0.0"; sha256 = "17cz6s80va0ch0a6nqa1wbbbp3p8sqxb96lj4qcw67ivkp2yxiyj"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "2.0.4"; sha256 = "041i1vlcibpzgalxxzdk81g5pgmqvmz2g61k0rqa2sky0wpvijx9"; }) - (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Abstractions"; version = "5.0.0"; sha256 = "01ahgd0b2z2zycrr2lcsq2cl59fn04bh51hdwdp9dcsdkpvnasj1"; }) - (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Physical"; version = "5.0.0"; sha256 = "00vii8148a6pk12l9jl0rhjp7apil5q5qcy7v1smnv17lj4p8szd"; }) - (fetchNuGet { pname = "Microsoft.Extensions.FileSystemGlobbing"; version = "5.0.0"; sha256 = "0lm6n9vbyjh0l17qcc2y9qwn1cns3dyjmkvbxjp0g9sll32kjpmb"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "2.0.0"; sha256 = "1jkwjcq1ld9znz1haazk8ili2g4pzfdp6i7r7rki4hg3jcadn386"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "5.0.0"; sha256 = "1qa1l18q2jh9azya8gv1p8anzcdirjzd9dxxisb4911i9m1648i3"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "5.0.0"; sha256 = "1yza38675dbv1qqnnhqm23alv2bbaqxp0pb7zinjmw8j2mr5r6wc"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "2.0.0"; sha256 = "0g4zadlg73f507krilhaaa7h0jdga216syrzjlyf5fdk25gxmjqh"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "5.0.0"; sha256 = "1rdmgpg770x8qwaaa6ryc27zh93p697fcyvn5vkxp0wimlhqkbay"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Options.ConfigurationExtensions"; version = "2.0.0"; sha256 = "1isc3rjbzz60f7wbmgcwslx5d10hm5hisnk7v54vfi2bz7132gll"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "2.0.0"; sha256 = "1xppr5jbny04slyjgngxjdm0maxdh47vq481ps944d7jrfs0p3mb"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "5.0.0"; sha256 = "0swqcknyh87ns82w539z1mvy804pfwhgzs97cr3nwqk6g5s42gd6"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.1.2"; sha256 = "1507hnpr9my3z4w1r6xk5n0s1j3y6a2c2cnynj76za7cphxi1141"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "3.0.0"; sha256 = "1bk8r4r3ihmi6322jmcag14jmw11mjqys202azqjzglcx59pxh51"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.Extensions.TrxLogger"; version = "17.9.0"; sha256 = "0wn38vj9i4gjw5zsl4wcivpqrmp1h5n6m1zxcfwj7yjn9hf45rz9"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.9.0"; sha256 = "1kgsl9w9fganbm9wvlkqgk0ag9hfi58z88rkfybc6kvg78bx89ca"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.9.0"; sha256 = "19ffh31a1jxzn8j69m1vnk5hyfz3dbxmflq77b8x82zybiilh5nl"; }) - (fetchNuGet { pname = "Microsoft.VisualStudio.Threading"; version = "16.7.56"; sha256 = "13x0xrsjxd86clf9cjjwmpzlyp8pkrf13riya7igs8zy93zw2qap"; }) - (fetchNuGet { pname = "Microsoft.VisualStudio.Threading.Analyzers"; version = "16.7.56"; sha256 = "04v9df0k7bsc0rzgkw4mnvi43pdrh42vk6xdcwn9m6im33m0nnz2"; }) - (fetchNuGet { pname = "Microsoft.VisualStudio.Validation"; version = "15.5.31"; sha256 = "1ah99rn922qa0sd2k3h64m324f2r32pw8cn4cfihgvwx4qdrpmgw"; }) - (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; }) - (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "4.6.0"; sha256 = "0i4y782yrqqyx85pg597m20gm0v126w0j9ddk5z7xb3crx4z9f2s"; }) - (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "6.0.0"; sha256 = "0c6pcj088g1yd1vs529q3ybgsd2vjlk5y1ic6dkmbhvrp5jibl9p"; }) - (fetchNuGet { pname = "Nerdbank.Streams"; version = "2.6.81"; sha256 = "06wihcaga8537ibh0mkj28m720m6vzkqk562zkynhca85nd236yi"; }) - (fetchNuGet { pname = "Newtonsoft.Json"; version = "11.0.2"; sha256 = "1784xi44f4k8v1fr696hsccmwpy94bz7kixxqlri98zhcxn406b2"; }) - (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; }) - (fetchNuGet { pname = "OmniSharp.Extensions.JsonRpc"; version = "0.19.5"; sha256 = "0ilcv3cxcvjkd8ngiydi69pzll07rhqdv5nq9yjnhyj142ynw2cb"; }) - (fetchNuGet { pname = "OmniSharp.Extensions.JsonRpc.Generators"; version = "0.19.5"; sha256 = "1mac4yx29ld8fyirg7n0vqn81hzdvcrl8w0l9w5xhnnm6bcd42v8"; }) - (fetchNuGet { pname = "OmniSharp.Extensions.LanguageProtocol"; version = "0.19.5"; sha256 = "1clgrbw6dlh46iiiqhavwh15xqar41az352mb5r4ln8ql3wnmk1i"; }) - (fetchNuGet { pname = "OmniSharp.Extensions.LanguageServer"; version = "0.19.5"; sha256 = "0cvxmc0r4ajnaah7lsppik61qickq7i0df4jwqaj6c6axiizhqlm"; }) - (fetchNuGet { pname = "OmniSharp.Extensions.LanguageServer.Shared"; version = "0.19.5"; sha256 = "0cczmmsmn3pj74wpasgfhjay1a817sd0zgzgqvvnckxxzq3n463h"; }) - (fetchNuGet { pname = "RangeTree"; version = "3.0.1"; sha256 = "19si88v2r0rc7kai1avwhigcvh3x3c916vrvqlyb59sn4f27pbm2"; }) - (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; }) - (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn"; }) - (fetchNuGet { pname = "runtime.any.System.Globalization"; version = "4.3.0"; sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"; }) - (fetchNuGet { pname = "runtime.any.System.IO"; version = "4.3.0"; sha256 = "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"; }) - (fetchNuGet { pname = "runtime.any.System.Reflection"; version = "4.3.0"; sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"; }) - (fetchNuGet { pname = "runtime.any.System.Reflection.Extensions"; version = "4.3.0"; sha256 = "0zyri97dfc5vyaz9ba65hjj1zbcrzaffhsdlpxc9bh09wy22fq33"; }) - (fetchNuGet { pname = "runtime.any.System.Reflection.Primitives"; version = "4.3.0"; sha256 = "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf"; }) - (fetchNuGet { pname = "runtime.any.System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl"; }) - (fetchNuGet { pname = "runtime.any.System.Runtime"; version = "4.3.0"; sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"; }) - (fetchNuGet { pname = "runtime.any.System.Runtime.Handles"; version = "4.3.0"; sha256 = "0bh5bi25nk9w9xi8z23ws45q5yia6k7dg3i4axhfqlnj145l011x"; }) - (fetchNuGet { pname = "runtime.any.System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19"; }) - (fetchNuGet { pname = "runtime.any.System.Text.Encoding"; version = "4.3.0"; sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"; }) - (fetchNuGet { pname = "runtime.any.System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8"; }) - (fetchNuGet { pname = "runtime.any.System.Threading.Tasks"; version = "4.3.0"; sha256 = "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va"; }) - (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; }) - (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; }) - (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; }) - (fetchNuGet { pname = "runtime.native.System"; version = "4.0.0"; sha256 = "1ppk69xk59ggacj9n7g6fyxvzmk1g5p4fkijm0d7xqfkig98qrkf"; }) - (fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; }) - (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; }) - (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"; }) - (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf"; }) - (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3"; }) - (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn"; }) - (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"; }) - (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"; }) - (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; }) - (fetchNuGet { pname = "runtime.unix.Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0y61k9zbxhdi0glg154v30kkq7f8646nif8lnnxbvkjpakggd5id"; }) - (fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5"; }) - (fetchNuGet { pname = "runtime.unix.System.IO.FileSystem"; version = "4.3.0"; sha256 = "14nbkhvs7sji5r1saj2x8daz82rnf9kx28d3v2qss34qbr32dzix"; }) - (fetchNuGet { pname = "runtime.unix.System.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 = "2.12.0"; sha256 = "0lqxpc96qcjkv9pr1rln7mi4y7n7jdi4vb36c2fv3845w1vswgr4"; }) - (fetchNuGet { pname = "Serilog.Extensions.Logging"; version = "3.0.1"; sha256 = "069qy7dm5nxb372ij112ppa6m99b4iaimj3sji74m659fwrcrl9a"; }) - (fetchNuGet { pname = "Serilog.Settings.Configuration"; version = "3.1.0"; sha256 = "1cj5am4n073331gbfm2ylqb9cadl4q3ppzgwmm5c8m1drxpiwkb5"; }) - (fetchNuGet { pname = "Serilog.Sinks.Debug"; version = "2.0.0"; sha256 = "1i7j870l47gan3gpnnlzkccn5lbm7518cnkp25a3g5gp9l0dbwpw"; }) - (fetchNuGet { pname = "Serilog.Sinks.File"; version = "5.0.0"; sha256 = "097rngmgcrdfy7jy8j7dq3xaq2qky8ijwg0ws6bfv5lx0f3vvb0q"; }) - (fetchNuGet { pname = "System.AppContext"; version = "4.1.0"; sha256 = "0fv3cma1jp4vgj7a8hqc9n7hr1f1kjp541s6z0q1r6nazb4iz9mz"; }) - (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; }) - (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) - (fetchNuGet { pname = "System.Collections.Immutable"; version = "1.7.0"; sha256 = "1gik4sn9jsi1wcy1pyyp0r4sn2g17cwrsh24b2d52vif8p2h24zx"; }) - (fetchNuGet { pname = "System.Collections.Immutable"; version = "1.7.1"; sha256 = "1nh4nlxfc7lbnbl86wwk1a3jwl6myz5j6hvgh5sp4krim9901hsq"; }) - (fetchNuGet { pname = "System.CommandLine"; version = "2.0.0-beta4.22272.1"; sha256 = "1iy5hwwgvx911g3yq65p4zsgpy08w4qz9j3h0igcf7yci44vw8yd"; }) - (fetchNuGet { pname = "System.Configuration.ConfigurationManager"; version = "6.0.0"; sha256 = "0sqapr697jbb4ljkq46msg0xx1qpmc31ivva6llyz2wzq3mpmxbw"; }) - (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; }) - (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; }) - (fetchNuGet { pname = "System.Drawing.Common"; version = "6.0.0"; sha256 = "02n8rzm58dac2np8b3xw8ychbvylja4nh6938l5k2fhyn40imlgz"; }) - (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.0.11"; sha256 = "1pla2dx8gkidf7xkciig6nifdsb494axjvzvann8g2lp3dbqasm9"; }) - (fetchNuGet { pname = "System.Globalization"; version = "4.0.11"; sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; }) - (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; }) - (fetchNuGet { pname = "System.IO"; version = "4.1.0"; sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; }) - (fetchNuGet { pname = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; }) - (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.0.1"; sha256 = "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1"; }) - (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; }) - (fetchNuGet { pname = "System.IO.Pipelines"; version = "4.7.3"; sha256 = "0djp59x56klidi04xx8p5jc1nchv5zvd1d59diphqxwvgny3aawy"; }) - (fetchNuGet { pname = "System.Linq"; version = "4.1.0"; sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5"; }) - (fetchNuGet { pname = "System.Linq.Async"; version = "6.0.1"; sha256 = "10ira8hmv0i54yp9ggrrdm1c06j538sijfjpn1kmnh9j2xk5yzmq"; }) - (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.1.0"; sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg"; }) - (fetchNuGet { pname = "System.Memory"; version = "4.5.4"; sha256 = "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y"; }) - (fetchNuGet { pname = "System.Net.WebSockets"; version = "4.3.0"; sha256 = "1gfj800078kggcgl0xyl00a6y5k4wwh2k2qm69rjy22wbmq7fy4p"; }) - (fetchNuGet { pname = "System.ObjectModel"; version = "4.0.12"; sha256 = "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj"; }) - (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; }) - (fetchNuGet { pname = "System.Reactive"; version = "4.4.1"; sha256 = "0gx8jh3hny2y5kijz5k9pxiqw481d013787c04zlhps21ygklw4a"; }) - (fetchNuGet { pname = "System.Reflection"; version = "4.1.0"; sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9"; }) - (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; }) - (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.0.1"; sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp"; }) - (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.0.1"; sha256 = "1pcd2ig6bg144y10w7yxgc9d22r7c7ww7qn1frdfwgxr24j9wvv0"; }) - (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.0.1"; sha256 = "1s4b043zdbx9k39lfhvsk68msv1nxbidhkq6nbm27q7sf8xcsnxr"; }) - (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.0.1"; sha256 = "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn"; }) - (fetchNuGet { pname = "System.Reflection.Metadata"; version = "1.6.0"; sha256 = "1wdbavrrkajy7qbdblpbpbalbdl48q3h34cchz24gvdgyrlf15r4"; }) - (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.0.1"; sha256 = "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28"; }) - (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; }) - (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.1.0"; sha256 = "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7"; }) - (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.0.1"; sha256 = "0b4i7mncaf8cnai85jv3wnw6hps140cxz8vylv2bik6wyzgvz7bi"; }) - (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; }) - (fetchNuGet { pname = "System.Runtime"; version = "4.1.0"; sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; }) - (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; }) - (fetchNuGet { pname = "System.Runtime.Caching"; version = "6.0.0"; sha256 = "0wh98a77cby4i3h2mar241k01105x661kh03vlyd399shxkfk60a"; }) - (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.4.0"; sha256 = "0a6ahgi5b148sl5qyfpyw383p3cb4yrkm802k29fsi4mxkiwir29"; }) - (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.7.0"; sha256 = "16r6sn4czfjk8qhnz7bnqlyiaaszr0ihinb7mq9zzr1wba257r54"; }) - (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.7.1"; sha256 = "119br3pd85lq8zcgh4f60jzmv1g976q1kdgi3hvqdlhfbw6siz2j"; }) - (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.1.0"; sha256 = "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z"; }) - (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; }) - (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.0.1"; sha256 = "1g0zrdi5508v49pfm3iii2hn6nm00bgvfpjq1zxknfjrxxa20r4g"; }) - (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; }) - (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.1.0"; sha256 = "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1"; }) - (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; }) - (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.0.0"; sha256 = "0glmvarf3jz5xh22iy3w9v3wyragcm4hfdr17v90vs7vcrm7fgp6"; }) - (fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.3.0"; sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; }) - (fetchNuGet { pname = "System.Security.AccessControl"; version = "4.6.0"; sha256 = "1wl1dyghi0qhpap1vgfhg2ybdyyhy9vc2a7dpm1xb30vfgmlkjmf"; }) - (fetchNuGet { pname = "System.Security.AccessControl"; version = "6.0.0"; sha256 = "0a678bzj8yxxiffyzy60z2w1nczzpi8v97igr4ip3byd2q89dv58"; }) - (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "6.0.0"; sha256 = "05kd3a8w7658hjxq9vvszxip30a479fjmfq4bq1r95nrsvs4hbss"; }) - (fetchNuGet { pname = "System.Security.Permissions"; version = "6.0.0"; sha256 = "0jsl4xdrkqi11iwmisi1r2f2qn5pbvl79mzq877gndw6ans2zhzw"; }) - (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.6.0"; sha256 = "1jmfzfz1n8hp63s5lja5xxpzkinbp6g59l3km9h8avjiisdrg5wm"; }) - (fetchNuGet { pname = "System.Text.Encoding"; version = "4.0.11"; sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; }) - (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) - (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "4.5.1"; sha256 = "1z21qyfs6sg76rp68qdx0c9iy57naan89pg7p6i3qpj8kyzn921w"; }) - (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; }) - (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 = "4.7.1"; sha256 = "038fyrriypwzsj5fwgnkw79hm5ya0x63r724yizgahbxf512chr2"; }) - (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.5.3"; sha256 = "0g7r6hm572ax8v28axrdxz1gnsblg6kszq17g51pj14a5rn2af7i"; }) - (fetchNuGet { pname = "System.Windows.Extensions"; version = "6.0.0"; sha256 = "1wy9pq9vn1bqg5qnv53iqrbx04yzdmjw4x5yyi09y3459vaa1sip"; }) - (fetchNuGet { pname = "Tomlyn"; version = "0.16.2"; sha256 = "1i928q6a7l65mk7wj2vvfclyvxamdjxg4dbj3g6g95inrfgvidah"; }) + (fetchNuGet { pname = "Boogie"; version = "3.1.3"; hash = "sha256-0XQcD1ImPNPXQ43fTkahC3qr2zUvHNdmgw0tmYE+7Hc="; }) + (fetchNuGet { pname = "Boogie.AbstractInterpretation"; version = "3.2.3"; hash = "sha256-SwJ5D3tOU+qcyQdNITIM15ujMEC++aXHOsUSovWbsC4="; }) + (fetchNuGet { pname = "Boogie.BaseTypes"; version = "3.2.3"; hash = "sha256-cIUdpGGjMKn70Z0nD8rvva8UbFSoLDUrBprC+TMG/EA="; }) + (fetchNuGet { pname = "Boogie.CodeContractsExtender"; version = "3.2.3"; hash = "sha256-L+phJ66oHNINliPkabU3vO4Vl9Lkv+nug+DWC8VmFlc="; }) + (fetchNuGet { pname = "Boogie.Concurrency"; version = "3.2.3"; hash = "sha256-w+5B+uyfKCf8j8hP0G/SSPUd2lT2T8A4Lkg0tsxniBg="; }) + (fetchNuGet { pname = "Boogie.Core"; version = "3.2.3"; hash = "sha256-qqoeLAdpRRaTISdgxyE3iFqhrmezxISaE5bm02rXVyE="; }) + (fetchNuGet { pname = "Boogie.ExecutionEngine"; version = "3.2.3"; hash = "sha256-8EKwiBnoMFGxeK2+IuG5p6BtnPlR0CCekXi4PBFLEbU="; }) + (fetchNuGet { pname = "Boogie.Graph"; version = "3.2.3"; hash = "sha256-7XjrCHSnvEL7eMmma2vKA7r8YGJe8Oo4E8U9Wja/al0="; }) + (fetchNuGet { pname = "Boogie.Houdini"; version = "3.2.3"; hash = "sha256-g7i0yF/89IWXElTi0onOgvPaesqlPGl3qINMCePHGA8="; }) + (fetchNuGet { pname = "Boogie.Model"; version = "3.2.3"; hash = "sha256-gRMZQQFMjQEQasg3A3iZ9/0KUWCxAoUPiHPZHbWXUs4="; }) + (fetchNuGet { pname = "Boogie.Provers.LeanAuto"; version = "3.2.3"; hash = "sha256-kMLvTTnvKWjggSby7D4jkaRmdvvOum0ZlfM6yU2760Q="; }) + (fetchNuGet { pname = "Boogie.Provers.SMTLib"; version = "3.2.3"; hash = "sha256-SCfEJCRueTE66ZZbHX8FHpD50SrBDQne8725uiKjbvM="; }) + (fetchNuGet { pname = "Boogie.VCExpr"; version = "3.2.3"; hash = "sha256-U6Rc5P0dUtNZ1IGDBU4hggwreVxSZqu6cZSKcWLpq/o="; }) + (fetchNuGet { pname = "Boogie.VCGeneration"; version = "3.2.3"; hash = "sha256-snbFiueD508B1GLqIC8cQdT9jW2jkRyhmYxPTlfnyrQ="; }) + (fetchNuGet { pname = "CocoR"; version = "2014.12.25"; hash = "sha256-qxTcnqh7jziriMHwos5/YArRYUG2+3nNoYYmFyPo8E0="; }) + (fetchNuGet { pname = "JetBrains.Annotations"; version = "2021.1.0"; hash = "sha256-64Vc/jHHG5tzaQrmlaU3y7+9qj3jT1V5vRr1R3uH9h4="; }) + (fetchNuGet { pname = "MediatR"; version = "8.1.0"; hash = "sha256-dyqhDG1NJjY1b+dj37sMmklGkxAm3zKdhh2lBJ0/HTM="; }) + (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "1.1.1"; hash = "sha256-fAcX4sxE0veWM1CZBtXR/Unky+6sE33yrV7ohrWGKig="; }) + (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; hash = "sha256-49+H/iFwp+AfCICvWcqo9us4CzxApPKC37Q5Eqrw+JU="; }) + (fetchNuGet { pname = "Microsoft.DotNet.PlatformAbstractions"; version = "2.0.4"; hash = "sha256-Eu3aY2f4gZWQLJHdVV98tu5Rn1uQ8f9UKQumGomlv7k="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "2.0.0"; hash = "sha256-SSemrjaokMnzOF8ynrgEV6xEh4TlesUE7waW2BLuWns="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "5.0.0"; hash = "sha256-N3yQnqcwAKISG6HS8ZC3PFpBMK+xCTkZpOBtgOnfqQY="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "2.0.0"; hash = "sha256-jveXZPNvx30uWT3q80OA1YaSb4K/KGOhlyun97IXn8Y="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "5.0.0"; hash = "sha256-0+ywPdqMkx32+HcMHqAp00cWBE7aCNc09Xh2eRObHTs="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "2.0.0"; hash = "sha256-7GVLiJupIL3BS5XgB44M95TxzF4KwvVUsShko+pqO98="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.CommandLine"; version = "5.0.0"; hash = "sha256-rCJkSm04hn5z1DBxMO4d32Kqb8R65iG8KiFvQMu3kCA="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.FileExtensions"; version = "5.0.0"; hash = "sha256-41soBkRr6fPO7KYnXb+462KyXd23YZ0gT7WyPnISAvM="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Json"; version = "5.0.0"; hash = "sha256-6Xp3Snr9/aNHPszduVdvPnSBoh40KRpuvnvJNRCJBUM="; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "2.0.0"; hash = "sha256-+KqiuV8ncy9b1xhtDExh4s4U57tKxqx4pAyr6d//EQU="; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "5.0.0"; hash = "sha256-RN478YJQE0YM0g+JztXp00w57CIF4bb48hSD/z3jTZc="; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "2.0.0"; hash = "sha256-H1rEnq/veRWvmp8qmUsrQkQIcVlKilUNzmmKsxJ0md8="; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "5.0.0"; hash = "sha256-0sfuxZ07HsMZJpKatDrW6I671uJBYWsUgAyoDZA2n50="; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "2.0.4"; hash = "sha256-qcu4Lwd+aqFwBjOYJ37duL5bXkCz/d6pev+uyOgOMRA="; }) + (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Abstractions"; version = "5.0.0"; hash = "sha256-QWpl951Ns5Zu4w2GAhcB1qVCmcCaUZEz8198sUB7UAU="; }) + (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Physical"; version = "5.0.0"; hash = "sha256-7Wt0iaQnbFt12MczXHCh8apzJcyAykRFmNcoRAKKcQM="; }) + (fetchNuGet { pname = "Microsoft.Extensions.FileSystemGlobbing"; version = "5.0.0"; hash = "sha256-q145xaBUpweu7GvPKn0b2rJgOU5eMIZPoABKv3ayplI="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "2.0.0"; hash = "sha256-Bg3bFJPjQRJnPvlEc5v7lzwRaUTzKwXDtz81GjCTfMo="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "5.0.0"; hash = "sha256-IyJiQk0xhESWjr231L7MsbFvFbphP6T8VwlKgVGgQeE="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "5.0.0"; hash = "sha256-jJtcchUS8Spt/GddcDtWa4lN1RAVQ2sxDnu1cgwa6vs="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "2.0.0"; hash = "sha256-EMvaXxGzueI8lT97bYJQr0kAj1IK0pjnAcWN82hTnzw="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "5.0.0"; hash = "sha256-Xq2JIa2Rg9vnLnZ75k4ydyT4j2A+G6UUx6iDc959teU="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Options.ConfigurationExtensions"; version = "2.0.0"; hash = "sha256-lD4xwvlLRLdJ2WdaHWGpEIRWOtWcvbr4ccD8v2QeTMc="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "2.0.0"; hash = "sha256-q44LtMvyNEKSvgERvA+BrasKapP92Sc91QR4u2TJ9/Y="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "5.0.0"; hash = "sha256-pj1BdHlmYm5HZifp/yB3lwDkdw0/jcIF0vYg6O1kmGs="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; hash = "sha256-mZotlGZqtrqDSoBrZhsxFe6fuOv5/BIo0w2Z2x0zVAU="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; hash = "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "3.0.0"; hash = "sha256-ocB+U+mMvi/xVwII7bGsIfAqSXiKVSnEMLHCODLJaK4="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; hash = "sha256-lxxw/Gy32xHi0fLgFWNj4YTFBSBkjx5l6ucmbTyf7V4="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; hash = "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ="; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.Extensions.TrxLogger"; version = "17.9.0"; hash = "sha256-6edCHExW+iO5Y/2HamyB4daM746ME6p/4fKRmORGw3I="; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.9.0"; hash = "sha256-iiXUFzpvT8OWdzMj9FGJDqanwHx40s1TXVY9l3ii+s0="; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.9.0"; hash = "sha256-1BZIY1z+C9TROgdTV/tq4zsPy7Q71GQksr/LoMKAzqU="; }) + (fetchNuGet { pname = "Microsoft.VisualStudio.Threading"; version = "16.7.56"; hash = "sha256-V2HB/0j+I/3iUT7mEVyeF11P/61cSpYcZQa1LnXuoI8="; }) + (fetchNuGet { pname = "Microsoft.VisualStudio.Threading.Analyzers"; version = "16.7.56"; hash = "sha256-4lsL6hg1mposZ62buQWBud1B4raV8Pl+BkyvM4FraRM="; }) + (fetchNuGet { pname = "Microsoft.VisualStudio.Validation"; version = "15.5.31"; hash = "sha256-/NWbGyad7wejY8QyxK8YWTgiRiUGjimaBgoLkWxOCao="; }) + (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; hash = "sha256-mBNDmPXNTW54XLnPAUwBRvkIORFM7/j0D0I2SyQPDEg="; }) + (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "4.6.0"; hash = "sha256-Wrj0Sc9srH5+ma0lCbgRYYP6gKgnlXcL6h7j7AU6nkQ="; }) + (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "6.0.0"; hash = "sha256-N9EVZbl5w1VnMywGXyaVWzT9lh84iaJ3aD48hIBk1zA="; }) + (fetchNuGet { pname = "Nerdbank.Streams"; version = "2.6.81"; hash = "sha256-0Zshmi1IMWj9/MKUieffpgJxKhJyVgBXPKMg9RSDkRs="; }) + (fetchNuGet { pname = "Newtonsoft.Json"; version = "11.0.2"; hash = "sha256-YhlAbGfwoxQzxb3Hef4iyV9eGdPQJJNd2GgSR0jsBJ0="; }) + (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; hash = "sha256-K2tSVW4n4beRPzPu3rlVaBEMdGvWSv/3Q1fxaDh4Mjo="; }) + (fetchNuGet { pname = "OmniSharp.Extensions.JsonRpc"; version = "0.19.5"; hash = "sha256-iwluvSBBemilT9iW3TDMB1D6bzKx+fgsalNu1tnYjEY="; }) + (fetchNuGet { pname = "OmniSharp.Extensions.JsonRpc.Generators"; version = "0.19.5"; hash = "sha256-aAvS2DLVWtgLTxRwRDPb7cOALN7Anpejd6jRJLonTNU="; }) + (fetchNuGet { pname = "OmniSharp.Extensions.LanguageProtocol"; version = "0.19.5"; hash = "sha256-Mcxq+aAYWUpyWVWU8VUgWeFeAuRbQRxjNATSZvjKj7I="; }) + (fetchNuGet { pname = "OmniSharp.Extensions.LanguageServer"; version = "0.19.5"; hash = "sha256-lWL4Y+zKMCMV5pK4BuLBk0UczIz3anqgUlYqkgGrfTM="; }) + (fetchNuGet { pname = "OmniSharp.Extensions.LanguageServer.Shared"; version = "0.19.5"; hash = "sha256-cBhiB/69T2b3xu+/D5o+AanglYTuaXU5OfIOW3WtnzE="; }) + (fetchNuGet { pname = "RangeTree"; version = "3.0.1"; hash = "sha256-oq57hCNWp7I8xTtvExIbfcDNXoR8qxDVPCyDLDZCUac="; }) + (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; hash = "sha256-4PGZqyWhZ6/HCTF2KddDsbmTTjxs2oW79YfkberDZS8="; }) + (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tracing"; version = "4.3.0"; hash = "sha256-dsmTLGvt8HqRkDWP8iKVXJCS+akAzENGXKPV18W2RgI="; }) + (fetchNuGet { pname = "runtime.any.System.Globalization"; version = "4.3.0"; hash = "sha256-PaiITTFI2FfPylTEk7DwzfKeiA/g/aooSU1pDcdwWLU="; }) + (fetchNuGet { pname = "runtime.any.System.IO"; version = "4.3.0"; hash = "sha256-vej7ySRhyvM3pYh/ITMdC25ivSd0WLZAaIQbYj/6HVE="; }) + (fetchNuGet { pname = "runtime.any.System.Reflection"; version = "4.3.0"; hash = "sha256-ns6f++lSA+bi1xXgmW1JkWFb2NaMD+w+YNTfMvyAiQk="; }) + (fetchNuGet { pname = "runtime.any.System.Reflection.Extensions"; version = "4.3.0"; hash = "sha256-Y2AnhOcJwJVYv7Rp6Jz6ma0fpITFqJW+8rsw106K2X8="; }) + (fetchNuGet { pname = "runtime.any.System.Reflection.Primitives"; version = "4.3.0"; hash = "sha256-LkPXtiDQM3BcdYkAm5uSNOiz3uF4J45qpxn5aBiqNXQ="; }) + (fetchNuGet { pname = "runtime.any.System.Resources.ResourceManager"; version = "4.3.0"; hash = "sha256-9EvnmZslLgLLhJ00o5MWaPuJQlbUFcUF8itGQNVkcQ4="; }) + (fetchNuGet { pname = "runtime.any.System.Runtime"; version = "4.3.0"; hash = "sha256-qwhNXBaJ1DtDkuRacgHwnZmOZ1u9q7N8j0cWOLYOELM="; }) + (fetchNuGet { pname = "runtime.any.System.Runtime.Handles"; version = "4.3.0"; hash = "sha256-PQRACwnSUuxgVySO1840KvqCC9F8iI9iTzxNW0RcBS4="; }) + (fetchNuGet { pname = "runtime.any.System.Runtime.InteropServices"; version = "4.3.0"; hash = "sha256-Kaw5PnLYIiqWbsoF3VKJhy7pkpoGsUwn4ZDCKscbbzA="; }) + (fetchNuGet { pname = "runtime.any.System.Text.Encoding"; version = "4.3.0"; hash = "sha256-Q18B9q26MkWZx68exUfQT30+0PGmpFlDgaF0TnaIGCs="; }) + (fetchNuGet { pname = "runtime.any.System.Text.Encoding.Extensions"; version = "4.3.0"; hash = "sha256-6MYj0RmLh4EVqMtO/MRqBi0HOn5iG4x9JimgCCJ+EFM="; }) + (fetchNuGet { pname = "runtime.any.System.Threading.Tasks"; version = "4.3.0"; hash = "sha256-agdOM0NXupfHbKAQzQT8XgbI9B8hVEh+a/2vqeHctg4="; }) + (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-LXUPLX3DJxsU1Pd3UwjO1PO9NM2elNEDXeu2Mu/vNps="; }) + (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-qeSqaUI80+lqw5MK4vMpmO0CZaqrmYktwp6L+vQAb0I="; }) + (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-SrHqT9wrCBsxILWtaJgGKd6Odmxm8/Mh7Kh0CUkZVzA="; }) + (fetchNuGet { pname = "runtime.native.System"; version = "4.0.0"; hash = "sha256-bmaM0ovT4X4aqDJOR255Yda/u3fmHZskU++lMnsy894="; }) + (fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; hash = "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y="; }) + (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-Jy01KhtcCl2wjMpZWH+X3fhHcVn+SyllWFY8zWlz/6I="; }) + (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-wyv00gdlqf8ckxEdV7E+Ql9hJIoPcmYEuyeWb5Oz3mM="; }) + (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-zi+b4sCFrA9QBiSGDD7xPV27r3iHGlV99gpyVUjRmc4="; }) + (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-gybQU6mPgaWV3rBG2dbH6tT3tBq8mgze3PROdsuWnX0="; }) + (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-VsP72GVveWnGUvS/vjOQLv1U80H2K8nZ4fDAmI61Hm4="; }) + (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-4yKGa/IrNCKuQ3zaDzILdNPD32bNdy6xr5gdJigyF5g="; }) + (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-HmdJhhRsiVoOOCcUvAwdjpMRiyuSwdcgEv2j9hxi+Zc="; }) + (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-pVFUKuPPIx0edQKjzRon3zKq8zhzHEzko/lc01V/jdw="; }) + (fetchNuGet { pname = "runtime.unix.Microsoft.Win32.Primitives"; version = "4.3.0"; hash = "sha256-LZb23lRXzr26tRS5aA0xyB08JxiblPDoA7HBvn6awXg="; }) + (fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; hash = "sha256-ReoazscfbGH+R6s6jkg5sIEHWNEvjEoHtIsMbpc7+tI="; }) + (fetchNuGet { pname = "runtime.unix.System.IO.FileSystem"; version = "4.3.0"; hash = "sha256-Pf4mRl6YDK2x2KMh0WdyNgv0VUNdSKVDLlHqozecy5I="; }) + (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; hash = "sha256-c5tXWhE/fYbJVl9rXs0uHh3pTsg44YD1dJvyOA0WoMs="; }) + (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; hash = "sha256-l8S9gt6dk3qYG6HYonHtdlYtBKyPb29uQ6NDjmrt3V4="; }) + (fetchNuGet { pname = "Serilog"; version = "2.12.0"; hash = "sha256-JD+ud+CFoLGdYGasTWKTxx5PYj2W5pBv2lMybBK7HVM="; }) + (fetchNuGet { pname = "Serilog.Extensions.Logging"; version = "3.0.1"; hash = "sha256-KtHMMnepmEpOlHrIGlUkK6Vq1L0iBBnFGavbUtvxOBk="; }) + (fetchNuGet { pname = "Serilog.Settings.Configuration"; version = "3.1.0"; hash = "sha256-ZU0eb88tVMRKrfz9ewcmtCmWFqZeVLdeGGMcYElVRbI="; }) + (fetchNuGet { pname = "Serilog.Sinks.Debug"; version = "2.0.0"; hash = "sha256-/PLVAE33lTdUEXdahkI5ddFiGZufWnvfsOodQsFB8sQ="; }) + (fetchNuGet { pname = "Serilog.Sinks.File"; version = "5.0.0"; hash = "sha256-GKy9hwOdlu2W0Rw8LiPyEwus+sDtSOTl8a5l9uqz+SQ="; }) + (fetchNuGet { pname = "System.AppContext"; version = "4.1.0"; hash = "sha256-v6YfyfrKmhww+EYHUq6cwYUMj00MQ6SOfJtcGVRlYzs="; }) + (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; hash = "sha256-XqZWb4Kd04960h4U9seivjKseGA/YEIpdplfHYHQ9jk="; }) + (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; hash = "sha256-afY7VUtD6w/5mYqrce8kQrvDIfS2GXDINDh73IjxJKc="; }) + (fetchNuGet { pname = "System.Collections.Immutable"; version = "1.7.0"; hash = "sha256-/RMBxUUublGaWERAnTk74QmrSQbX+xs84yFqmawmM74="; }) + (fetchNuGet { pname = "System.Collections.Immutable"; version = "1.7.1"; hash = "sha256-WMMAUqoxT3J1gW9DI8v31VAuhwqTc4Posose5jq1BNo="; }) + (fetchNuGet { pname = "System.CommandLine"; version = "2.0.0-beta4.22272.1"; hash = "sha256-zSO+CYnMH8deBHDI9DHhCPj79Ce3GOzHCyH1/TiHxcc="; }) + (fetchNuGet { pname = "System.Configuration.ConfigurationManager"; version = "6.0.0"; hash = "sha256-fPV668Cfi+8pNWrvGAarF4fewdPVEDwlJWvJk0y+Cms="; }) + (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; hash = "sha256-fkA79SjPbSeiEcrbbUsb70u9B7wqbsdM9s1LnoKj0gM="; }) + (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; hash = "sha256-hCETZpHHGVhPYvb4C0fh4zs+8zv4GPoixagkLZjpa9Q="; }) + (fetchNuGet { pname = "System.Drawing.Common"; version = "6.0.0"; hash = "sha256-/9EaAbEeOjELRSMZaImS1O8FmUe8j4WuFUw1VOrPyAo="; }) + (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.0.11"; hash = "sha256-qWqFVxuXioesVftv2RVJZOnmojUvRjb7cS3Oh3oTit4="; }) + (fetchNuGet { pname = "System.Globalization"; version = "4.0.11"; hash = "sha256-rbSgc2PIEc2c2rN6LK3qCREAX3DqA2Nq1WcLrZYsDBw="; }) + (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; hash = "sha256-caL0pRmFSEsaoeZeWN5BTQtGrAtaQPwFi8YOZPZG5rI="; }) + (fetchNuGet { pname = "System.IO"; version = "4.1.0"; hash = "sha256-V6oyQFwWb8NvGxAwvzWnhPxy9dKOfj/XBM3tEC5aHrw="; }) + (fetchNuGet { pname = "System.IO"; version = "4.3.0"; hash = "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY="; }) + (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.0.1"; hash = "sha256-4VKXFgcGYCTWVXjAlniAVq0dO3o5s8KHylg2wg2/7k0="; }) + (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; hash = "sha256-LMnfg8Vwavs9cMnq9nNH8IWtAtSfk0/Fy4s4Rt9r1kg="; }) + (fetchNuGet { pname = "System.IO.Pipelines"; version = "4.7.3"; hash = "sha256-nis1vH2bdwxvbKm00PYvGzIbmCwX9U5AbJFOU3oqVzY="; }) + (fetchNuGet { pname = "System.Linq"; version = "4.1.0"; hash = "sha256-ZQpFtYw5N1F1aX0jUK3Tw+XvM5tnlnshkTCNtfVA794="; }) + (fetchNuGet { pname = "System.Linq.Async"; version = "6.0.1"; hash = "sha256-uH5fZhcyQVtnsFc6GTUaRRrAQm05v5euJyWCXSFSOYI="; }) + (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.1.0"; hash = "sha256-7zqB+FXgkvhtlBzpcZyd81xczWP0D3uWssyAGw3t7b4="; }) + (fetchNuGet { pname = "System.Net.WebSockets"; version = "4.3.0"; hash = "sha256-l3h3cF1cCC9zMhWLKSDnZBZvFADUd0Afe2+iAwBA0r0="; }) + (fetchNuGet { pname = "System.ObjectModel"; version = "4.0.12"; hash = "sha256-MudZ/KYcvYsn2cST3EE049mLikrNkmE7QoUoYKKby+s="; }) + (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; hash = "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM="; }) + (fetchNuGet { pname = "System.Reactive"; version = "4.4.1"; hash = "sha256-inA6nw9CX0g/AeygMwJoARGOY79pli/jLF54CweUqD8="; }) + (fetchNuGet { pname = "System.Reflection"; version = "4.1.0"; hash = "sha256-idZHGH2Yl/hha1CM4VzLhsaR8Ljo/rV7TYe7mwRJSMs="; }) + (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; hash = "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY="; }) + (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.0.1"; hash = "sha256-F1MvYoQWHCY89/O4JBwswogitqVvKuVfILFqA7dmuHk="; }) + (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.0.1"; hash = "sha256-YG+eJBG5P+5adsHiw/lhJwvREnvdHw6CJyS8ZV4Ujd0="; }) + (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.0.1"; hash = "sha256-uVvNOnL64CPqsgZP2OLqNmxdkZl6Q0fTmKmv9gcBi+g="; }) + (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.0.1"; hash = "sha256-NsfmzM9G/sN3H8X2cdnheTGRsh7zbRzvegnjDzDH/FQ="; }) + (fetchNuGet { pname = "System.Reflection.Metadata"; version = "1.6.0"; hash = "sha256-JJfgaPav7UfEh4yRAQdGhLZF1brr0tUWPl6qmfNWq/E="; }) + (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.0.1"; hash = "sha256-SFSfpWEyCBMAOerrMCOiKnpT+UAWTvRcmoRquJR6Vq0="; }) + (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; hash = "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM="; }) + (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.1.0"; hash = "sha256-R0YZowmFda+xzKNR4kKg7neFoE30KfZwp/IwfRSKVK4="; }) + (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.0.1"; hash = "sha256-cZ2/3/fczLjEpn6j3xkgQV9ouOVjy4Kisgw5xWw9kSw="; }) + (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; hash = "sha256-idiOD93xbbrbwwSnD4mORA9RYi/D/U48eRUsn/WnWGo="; }) + (fetchNuGet { pname = "System.Runtime"; version = "4.1.0"; hash = "sha256-FViNGM/4oWtlP6w0JC0vJU+k9efLKZ+yaXrnEeabDQo="; }) + (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; hash = "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg="; }) + (fetchNuGet { pname = "System.Runtime.Caching"; version = "6.0.0"; hash = "sha256-CpjpZoc6pdE83QPAGYzpBYQAZiAiqyrgiMQvdo5CCXI="; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.4.0"; hash = "sha256-SeTI4+yVRO2SmAKgOrMni4070OD+Oo8L1YiEVeKDyig="; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.7.1"; hash = "sha256-UvyoDV8O0oY3HPG1GbA56YVdvwTGEfjYR5gW1O7IK4U="; }) + (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.1.0"; hash = "sha256-X7DZ5CbPY7jHs20YZ7bmcXs9B5Mxptu/HnBUvUnNhGc="; }) + (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; hash = "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o="; }) + (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.0.1"; hash = "sha256-j2QgVO9ZOjv7D1het98CoFpjoYgxjupuIhuBUmLLH7w="; }) + (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; hash = "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms="; }) + (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.1.0"; hash = "sha256-QceAYlJvkPRJc/+5jR+wQpNNI3aqGySWWSO30e/FfQY="; }) + (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; hash = "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI="; }) + (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.0.0"; hash = "sha256-5j53amb76A3SPiE3B0llT2XPx058+CgE7OXL4bLalT4="; }) + (fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.3.0"; hash = "sha256-P5jHCgMbgFMYiONvzmaKFeOqcAIDPu/U8bOVrNPYKqc="; }) + (fetchNuGet { pname = "System.Security.AccessControl"; version = "4.6.0"; hash = "sha256-rspJ63MbjNVDve0owXby0Pu2vHjQvR2uuhCDCJ9vgfI="; }) + (fetchNuGet { pname = "System.Security.AccessControl"; version = "6.0.0"; hash = "sha256-qOyWEBbNr3EjyS+etFG8/zMbuPjA+O+di717JP9Cxyg="; }) + (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "6.0.0"; hash = "sha256-Wi9I9NbZlpQDXgS7Kl06RIFxY/9674S7hKiYw5EabRY="; }) + (fetchNuGet { pname = "System.Security.Permissions"; version = "6.0.0"; hash = "sha256-/MMvtFWGN/vOQfjXdOhet1gsnMgh6lh5DCHimVsnVEs="; }) + (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.6.0"; hash = "sha256-lZeXm45RboVgqnPQVJ65y8b5b+9FSVr0MBciG777rso="; }) + (fetchNuGet { pname = "System.Text.Encoding"; version = "4.0.11"; hash = "sha256-PEailOvG05CVgPTyKLtpAgRydlSHmtd5K0Y8GSHY2Lc="; }) + (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; hash = "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg="; }) + (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; hash = "sha256-vufHXg8QAKxHlujPHHcrtGwAqFmsCD6HKjfDAiHyAYc="; }) + (fetchNuGet { pname = "System.Threading"; version = "4.0.11"; hash = "sha256-mob1Zv3qLQhQ1/xOLXZmYqpniNUMCfn02n8ZkaAhqac="; }) + (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; hash = "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc="; }) + (fetchNuGet { pname = "System.Threading.Channels"; version = "4.7.1"; hash = "sha256-IkMmQnF9QfV+9EScPEwHypcK0+HTPu6K1J9fH3P2Dg0="; }) + (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.0.11"; hash = "sha256-5SLxzFg1df6bTm2t09xeI01wa5qQglqUwwJNlQPJIVs="; }) + (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; hash = "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w="; }) + (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.3"; hash = "sha256-8TglbC6KBHlDeSfgr6d5dGn7wu8td4XERl2JUyo0+Tw="; }) + (fetchNuGet { pname = "System.Windows.Extensions"; version = "6.0.0"; hash = "sha256-N+qg1E6FDJ9A9L50wmVt3xPQV8ZxlG1xeXgFuxO+yfM="; }) + (fetchNuGet { pname = "Tomlyn"; version = "0.16.2"; hash = "sha256-ULW4n8s2lvTMG3I18rpsVfXtKXN7C8nPrMXQowxGIsU="; }) ] diff --git a/pkgs/applications/science/logic/elan/default.nix b/pkgs/applications/science/logic/elan/default.nix index 245f8db13ce60..04c5f746f647a 100644 --- a/pkgs/applications/science/logic/elan/default.nix +++ b/pkgs/applications/science/logic/elan/default.nix @@ -3,26 +3,27 @@ rustPlatform.buildRustPackage rec { pname = "elan"; - version = "3.1.1"; + version = "3.1.1-unstable-2024-08-02"; src = fetchFromGitHub { owner = "leanprover"; repo = "elan"; - rev = "v${version}"; - hash = "sha256-/g5bO3UQcg0XYm62KdoWcVQqOV3SIedWUYLufEcblmE="; + # commit "chore: update to build with rust 1.80 (leanprover/elan#134)" + rev = "97ce78e0e6aecdf3e8d35dbf42b0614302efb250"; + hash = "sha256-7cwpHMyhpTxYXjZM4xbDK+epvA2kBf7jelvMaPGP1kU="; }; - cargoHash = "sha256-f8YVUTxHX1FY2p73DlnLDtCJaG/0JImUtJFraV6ErNM="; + cargoHash = "sha256-ON5d7ryMKEhkx6dV760msr+y/+4hIwssXUE5Ocaq2W0="; nativeBuildInputs = [ pkg-config makeWrapper ]; OPENSSL_NO_VENDOR = 1; buildInputs = [ curl zlib openssl ] - ++ lib.optional stdenv.isDarwin libiconv; + ++ lib.optional stdenv.hostPlatform.isDarwin libiconv; buildFeatures = [ "no-self-update" ]; - patches = lib.optionals stdenv.isLinux [ + patches = lib.optionals stdenv.hostPlatform.isLinux [ # Run patchelf on the downloaded binaries. # This is necessary because Lean 4 is now dynamically linked. (runCommand "0001-dynamically-patchelf-binaries.patch" { diff --git a/pkgs/applications/science/logic/formula/default.nix b/pkgs/applications/science/logic/formula/default.nix index 20267e6071c56..bfaf2489bdf77 100644 --- a/pkgs/applications/science/logic/formula/default.nix +++ b/pkgs/applications/science/logic/formula/default.nix @@ -14,9 +14,9 @@ buildDotnetModule rec { nugetDeps = ./nuget.nix; projectFile = "Src/CommandLine/CommandLine.csproj"; - postFixup = if stdenv.isLinux then '' + postFixup = if stdenv.hostPlatform.isLinux then '' mv $out/bin/CommandLine $out/bin/formula - '' else lib.optionalString stdenv.isDarwin '' + '' else lib.optionalString stdenv.hostPlatform.isDarwin '' makeWrapper ${dotnetCorePackages.runtime_6_0}/bin/dotnet $out/bin/formula \ --add-flags "$out/lib/formula-dotnet/CommandLine.dll" \ --prefix DYLD_LIBRARY_PATH : $out/lib/formula-dotnet/runtimes/macos/native diff --git a/pkgs/applications/science/logic/hol/default.nix b/pkgs/applications/science/logic/hol/default.nix index de47df098da13..883eb4331c9fa 100644 --- a/pkgs/applications/science/logic/hol/default.nix +++ b/pkgs/applications/science/logic/hol/default.nix @@ -4,16 +4,12 @@ let pname = "hol4"; vnum = "14"; -in -let version = "k.${vnum}"; longVersion = "kananaskis-${vnum}"; holsubdir = "hol-${longVersion}"; kernelFlag = if experimentalKernel then "--expk" else "--stdknl"; -in -let polymlEnableShared = with pkgs; lib.overrideDerivation polyml (attrs: { configureFlags = [ "--enable-shared" ]; }); @@ -66,7 +62,7 @@ stdenv.mkDerivation { ''; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); description = "Interactive theorem prover based on Higher-Order Logic"; longDescription = '' HOL4 is the latest version of the HOL interactive proof diff --git a/pkgs/applications/science/logic/hol_light/0004-Fix-compilation-with-camlp5-7.11.patch b/pkgs/applications/science/logic/hol_light/0004-Fix-compilation-with-camlp5-7.11.patch new file mode 100644 index 0000000000000..2fc2b1544c442 --- /dev/null +++ b/pkgs/applications/science/logic/hol_light/0004-Fix-compilation-with-camlp5-7.11.patch @@ -0,0 +1,66 @@ +From: Stephane Glondu <steph@glondu.net> +Date: Wed, 12 Feb 2020 05:42:32 +0100 +Subject: Fix compilation with camlp5 7.11 + +--- + pa_j_4.xx_7.xx.ml | 17 +++++++++++------ + 1 file changed, 11 insertions(+), 6 deletions(-) + +diff --git a/pa_j_4.xx_7.xx.ml b/pa_j_4.xx_7.xx.ml +index 4f7ed60..e834058 100755 +--- a/pa_j/pa_j_4.xx_7.xx.ml ++++ b/pa_j/pa_j_4.xx_7.xx.ml +@@ -410,9 +410,10 @@ and reloc_module_type floc sh = + | MtApp loc x1 x2 → + let loc = floc loc in + MtApp loc (self x1) (self x2) +- | MtFun loc x1 x2 x3 → ++ | MtFun loc x x3 → + let loc = floc loc in +- MtFun loc x1 (self x2) (self x3) ++ let x = vala_map (option_map (fun (x1, x2) -> (x1, self x2))) x in ++ MtFun loc x (self x3) + | MtLid loc x1 → + let loc = floc loc in + MtLid loc x1 +@@ -507,9 +508,10 @@ and reloc_module_expr floc sh = + | MeApp loc x1 x2 → + let loc = floc loc in + MeApp loc (self x1) (self x2) +- | MeFun loc x1 x2 x3 → ++ | MeFun loc x x3 → + let loc = floc loc in +- MeFun loc x1 (reloc_module_type floc sh x2) (self x3) ++ let x = vala_map (option_map (fun (x1, x2) -> (x1, reloc_module_type floc sh x2))) x in ++ MeFun loc x (self x3) + | MeStr loc x1 → + let loc = floc loc in + MeStr loc (vala_map (List.map (reloc_str_item floc sh)) x1) +@@ -2007,7 +2009,7 @@ EXTEND + | -> <:vala< [] >> ] ] + ; + mod_binding: +- [ [ i = V UIDENT; me = mod_fun_binding -> (i, me) ] ] ++ [ [ i = V uidopt "uidopt"; me = mod_fun_binding -> (i, me) ] ] + ; + mod_fun_binding: + [ RIGHTA +@@ -2070,7 +2072,7 @@ EXTEND + <:sig_item< value $lid:i$ : $t$ >> ] ] + ; + mod_decl_binding: +- [ [ i = V UIDENT; mt = module_declaration -> (i, mt) ] ] ++ [ [ i = V uidopt "uidopt"; mt = module_declaration -> (i, mt) ] ] + ; + module_declaration: + [ RIGHTA +@@ -2092,6 +2094,9 @@ EXTEND + | "module"; i = V mod_ident ""; ":="; me = module_expr -> + <:with_constr< module $_:i$ := $me$ >> ] ] + ; ++ uidopt: ++ [ [ m = V UIDENT -> Some m ] ] ++ ; + (* Core expressions *) + expr: + [ "top" RIGHTA diff --git a/pkgs/applications/science/logic/hol_light/default.nix b/pkgs/applications/science/logic/hol_light/default.nix index 0e3dee4b0c0ad..59389f11a2828 100644 --- a/pkgs/applications/science/logic/hol_light/default.nix +++ b/pkgs/applications/science/logic/hol_light/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, runtimeShell, fetchFromGitHub, fetchpatch, ocaml, findlib, num, zarith, camlp5, camlp-streams }: +{ lib, stdenv, runtimeShell, fetchFromGitHub, ocaml, findlib, num, zarith, camlp5, camlp-streams }: let use_zarith = lib.versionAtLeast ocaml.version "4.14"; @@ -28,21 +28,16 @@ in stdenv.mkDerivation { pname = "hol_light"; - version = "unstable-2024-05-10"; + version = "unstable-2024-07-07"; src = fetchFromGitHub { owner = "jrh13"; repo = "hol-light"; - rev = "d8366986e22555c4e4c8ff49667d646d15c35f14"; - hash = "sha256-dN9X7yQlFof759I5lxxL4DxDe8V3XAhCRaryO9NabY4="; + rev = "16b184e30e7e3fe9add7d1ee93242323ed2e1726"; + hash = "sha256-V0OtsmX5pa+CH3ZXmNG3juXwXZ5+A0k13eMCAfaRziQ="; }; - patches = [ - (fetchpatch { - url = "https://salsa.debian.org/ocaml-team/hol-light/-/raw/master/debian/patches/0004-Fix-compilation-with-camlp5-7.11.patch"; - sha256 = "180qmxbrk3vb1ix7j77hcs8vsar91rs11s5mm8ir5352rz7ylicr"; - }) - ]; + patches = [ ./0004-Fix-compilation-with-camlp5-7.11.patch ]; strictDeps = true; diff --git a/pkgs/applications/science/logic/isabelle/components/default.nix b/pkgs/applications/science/logic/isabelle/components/default.nix deleted file mode 100644 index dd7b605f56af0..0000000000000 --- a/pkgs/applications/science/logic/isabelle/components/default.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ callPackage }: - -{ - isabelle-linter = callPackage ./isabelle-linter.nix {}; -} diff --git a/pkgs/applications/science/logic/isabelle/components/isabelle-linter.nix b/pkgs/applications/science/logic/isabelle/components/isabelle-linter.nix deleted file mode 100644 index 91bf5ba32b68e..0000000000000 --- a/pkgs/applications/science/logic/isabelle/components/isabelle-linter.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, isabelle }: - -stdenv.mkDerivation rec { - pname = "isabelle-linter"; - version = "2023-1.0.0"; - - src = fetchFromGitHub { - owner = "isabelle-prover"; - repo = "isabelle-linter"; - rev = "Isabelle2023-v1.0.0"; - sha256 = "sha256-q9+qN94NaTzvhbcNQj7yH/VVfs1QgCH8OU8HW+5+s9U="; - }; - - nativeBuildInputs = [ isabelle ]; - - buildPhase = '' - export HOME=$TMP - isabelle components -u $(pwd) - isabelle scala_build - ''; - - installPhase = '' - dir=$out/Isabelle${isabelle.version}/contrib/${pname}-${version} - mkdir -p $dir - cp -r * $dir/ - ''; - - meta = with lib; { - description = "Linter component for Isabelle"; - homepage = "https://github.com/isabelle-prover/isabelle-linter"; - maintainers = with maintainers; [ jvanbruegge ]; - license = licenses.mit; - platforms = platforms.all; - }; -} diff --git a/pkgs/applications/science/logic/isabelle/default.nix b/pkgs/applications/science/logic/isabelle/default.nix deleted file mode 100644 index edc4483bcfa98..0000000000000 --- a/pkgs/applications/science/logic/isabelle/default.nix +++ /dev/null @@ -1,251 +0,0 @@ -{ lib -, stdenv -, fetchurl -, coreutils -, nettools -, java -, scala_3 -, polyml -, veriT -, vampire -, eprover-ho -, naproche -, rlwrap -, perl -, makeDesktopItem -, isabelle-components -, symlinkJoin -, fetchhg -}: - -let - sha1 = stdenv.mkDerivation { - pname = "isabelle-sha1"; - version = "2021-1"; - - src = fetchhg { - url = "https://isabelle.sketis.net/repos/sha1"; - rev = "e0239faa6f42"; - sha256 = "sha256-4sxHzU/ixMAkSo67FiE6/ZqWJq9Nb9OMNhMoXH2bEy4="; - }; - - buildPhase = (if stdenv.isDarwin then '' - LDFLAGS="-dynamic -undefined dynamic_lookup -lSystem" - '' else '' - LDFLAGS="-fPIC -shared" - '') + '' - CFLAGS="-fPIC -I." - $CC $CFLAGS -c sha1.c -o sha1.o - $LD $LDFLAGS sha1.o -o libsha1.so - ''; - - installPhase = '' - mkdir -p $out/lib - cp libsha1.so $out/lib/ - ''; - }; -in stdenv.mkDerivation (finalAttrs: rec { - pname = "isabelle"; - version = "2023"; - - dirname = "Isabelle${version}"; - - src = - if stdenv.isDarwin - then - fetchurl - { - url = "https://isabelle.in.tum.de/website-${dirname}/dist/${dirname}_macos.tar.gz"; - sha256 = "sha256-0VSW2SrHNI3/k4cCCZ724ruXaq7W1NCPsLrXFZ9l1/Q="; - } - else if stdenv.hostPlatform.isx86 - then - fetchurl { - url = "https://isabelle.in.tum.de/website-${dirname}/dist/${dirname}_linux.tar.gz"; - sha256 = "sha256-Go4ZCsDz5gJ7uWG5VLrNJOddMPX18G99FAadpX53Rqg="; - } - else - fetchurl { - url = "https://isabelle.in.tum.de/website-${dirname}/dist/${dirname}_linux_arm.tar.gz"; - hash = "sha256-Tzxxs0gKw6vymbaXIzH8tK5VgUrpOIp9vcWQ/zxnRCc="; - }; - - nativeBuildInputs = [ java ]; - - buildInputs = [ polyml veriT vampire eprover-ho nettools ] - ++ lib.optionals (!stdenv.isDarwin) [ java ]; - - sourceRoot = "${dirname}${lib.optionalString stdenv.isDarwin ".app"}"; - - doCheck = stdenv.hostPlatform.system != "aarch64-linux"; - checkPhase = "bin/isabelle build -v HOL-SMT_Examples"; - - postUnpack = lib.optionalString stdenv.isDarwin '' - mv $sourceRoot ${dirname} - sourceRoot=${dirname} - ''; - - postPatch = '' - patchShebangs lib/Tools/ bin/ - - cat >contrib/verit-*/etc/settings <<EOF - ISABELLE_VERIT=${veriT}/bin/veriT - EOF - - cat >contrib/e-*/etc/settings <<EOF - E_HOME=${eprover-ho}/bin - E_VERSION=${eprover-ho.version} - EOF - - cat >contrib/vampire-*/etc/settings <<EOF - VAMPIRE_HOME=${vampire}/bin - VAMPIRE_VERSION=${vampire.version} - VAMPIRE_EXTRA_OPTIONS="--mode casc" - EOF - - cat >contrib/polyml-*/etc/settings <<EOF - ML_SYSTEM_64=true - ML_SYSTEM=${polyml.name} - ML_PLATFORM=${stdenv.system} - ML_HOME=${polyml}/bin - ML_OPTIONS="--minheap 1000" - POLYML_HOME="\$COMPONENT" - ML_SOURCES="\$POLYML_HOME/src" - EOF - - cat >contrib/jdk*/etc/settings <<EOF - ISABELLE_JAVA_PLATFORM=${stdenv.system} - ISABELLE_JDK_HOME=${java} - EOF - - '' + lib.optionalString stdenv.hostPlatform.isx86 '' - rm contrib/naproche-*/x86*/Naproche-SAD - ln -s ${naproche}/bin/Naproche-SAD contrib/naproche-*/x86*/ - '' + '' - - echo ISABELLE_LINE_EDITOR=${rlwrap}/bin/rlwrap >>etc/settings - - for comp in contrib/jdk* contrib/polyml-* contrib/verit-* contrib/vampire-* contrib/e-*; do - rm -rf $comp/${if stdenv.hostPlatform.isx86 then "x86" else "arm"}* - done - - substituteInPlace lib/Tools/env \ - --replace /usr/bin/env ${coreutils}/bin/env - - substituteInPlace src/Tools/Setup/src/Environment.java \ - --replace 'cmd.add("/usr/bin/env");' "" \ - --replace 'cmd.add("bash");' "cmd.add(\"$SHELL\");" - - substituteInPlace src/Pure/General/sha1.ML \ - --replace '"$ML_HOME/" ^ (if ML_System.platform_is_windows then "sha1.dll" else "libsha1.so")' '"${sha1}/lib/libsha1.so"' - - rm -r heaps - '' + lib.optionalString (stdenv.hostPlatform.system == "x86_64-darwin") '' - substituteInPlace lib/scripts/isabelle-platform \ - --replace 'ISABELLE_APPLE_PLATFORM64=arm64-darwin' "" - '' + lib.optionalString stdenv.isLinux '' - arch=${if stdenv.hostPlatform.system == "x86_64-linux" then "x86_64-linux" - else if stdenv.hostPlatform.isx86 then "x86-linux" - else "arm64-linux"} - for f in contrib/*/$arch/{z3,epclextract,nunchaku,SPASS,zipperposition}; do - patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f"${lib.optionalString stdenv.isAarch64 " || true"} - done - patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) contrib/bash_process-*/platform_$arch/bash_process - for d in contrib/kodkodi-*/jni/$arch; do - patchelf --set-rpath "${lib.concatStringsSep ":" [ "${java}/lib/openjdk/lib/server" "${stdenv.cc.cc.lib}/lib" ]}" $d/*.so - done - patchelf --set-rpath "${stdenv.cc.cc.lib}/lib" contrib/z3-*/$arch/z3 - ''; - - buildPhase = '' - export HOME=$TMP # The build fails if home is not set - setup_name=$(basename contrib/isabelle_setup*) - - #The following is adapted from https://isabelle.sketis.net/repos/isabelle/file/Isabelle2021-1/Admin/lib/Tools/build_setup - TARGET_DIR="contrib/$setup_name/lib" - rm -rf "$TARGET_DIR" - mkdir -p "$TARGET_DIR/isabelle/setup" - declare -a ARGS=("-Xlint:unchecked") - - SOURCES="$(${perl}/bin/perl -e 'while (<>) { if (m/(\S+\.java)/) { print "$1 "; } }' "src/Tools/Setup/etc/build.props")" - for SRC in $SOURCES - do - ARGS["''${#ARGS[@]}"]="src/Tools/Setup/$SRC" - done - echo "Building isabelle setup" - javac -d "$TARGET_DIR" -classpath "${scala_3.bare}/lib/scala3-interfaces-${scala_3.version}.jar:${scala_3.bare}/lib/scala3-compiler_3-${scala_3.version}.jar" "''${ARGS[@]}" - jar -c -f "$TARGET_DIR/isabelle_setup.jar" -e "isabelle.setup.Setup" -C "$TARGET_DIR" isabelle - rm -rf "$TARGET_DIR/isabelle" - - echo "Building HOL heap" - bin/isabelle build -v -o system_heaps -b HOL - ''; - - installPhase = '' - mkdir -p $out/bin - mv $TMP/$dirname $out - cd $out/$dirname - bin/isabelle install $out/bin - - # icon - mkdir -p "$out/share/icons/hicolor/isabelle/apps" - cp "$out/Isabelle${version}/lib/icons/isabelle.xpm" "$out/share/icons/hicolor/isabelle/apps/" - - # desktop item - mkdir -p "$out/share" - cp -r "${desktopItem}/share/applications" "$out/share/applications" - ''; - - desktopItem = makeDesktopItem { - name = "isabelle"; - exec = "isabelle jedit"; - icon = "isabelle"; - desktopName = "Isabelle"; - comment = meta.description; - categories = [ "Education" "Science" "Math" ]; - }; - - meta = with lib; { - description = "A generic proof assistant"; - - longDescription = '' - Isabelle is a generic proof assistant. It allows mathematical formulas - to be expressed in a formal language and provides tools for proving those - formulas in a logical calculus. - ''; - homepage = "https://isabelle.in.tum.de/"; - sourceProvenance = with sourceTypes; [ - fromSource - binaryNativeCode # source bundles binary dependencies - ]; - license = licenses.bsd3; - maintainers = [ maintainers.jwiegley maintainers.jvanbruegge ]; - platforms = platforms.unix; - }; - - passthru.withComponents = f: - let - isabelle = finalAttrs.finalPackage; - base = "$out/${isabelle.dirname}"; - components = f isabelle-components; - in symlinkJoin { - name = "isabelle-with-components-${isabelle.version}"; - paths = [ isabelle ] ++ (builtins.map (c: c.override { inherit isabelle; }) components); - - postBuild = '' - rm $out/bin/* - - cd ${base} - rm bin/* - cp ${isabelle}/${isabelle.dirname}/bin/* bin/ - rm etc/components - cat ${isabelle}/${isabelle.dirname}/etc/components > etc/components - - export HOME=$TMP - bin/isabelle install $out/bin - patchShebangs $out/bin - '' + lib.concatMapStringsSep "\n" (c: '' - echo contrib/${c.pname}-${c.version} >> ${base}/etc/components - '') components; - }; -}) diff --git a/pkgs/applications/science/logic/key/default.nix b/pkgs/applications/science/logic/key/default.nix index 5a48abfc4aa48..d97eb42b4027f 100644 --- a/pkgs/applications/science/logic/key/default.nix +++ b/pkgs/applications/science/logic/key/default.nix @@ -2,7 +2,6 @@ , fetchurl , jdk , gradle_7 -, perl , jre , makeWrapper , makeDesktopItem @@ -12,6 +11,9 @@ }: let + gradle = gradle_7; + +in stdenv.mkDerivation rec { pname = "key"; version = "2.10.0"; src = fetchurl { @@ -20,30 +22,6 @@ let }; sourceRoot = "key-${version}/key"; - # fake build to pre-download deps into fixed-output derivation - deps = stdenv.mkDerivation { - pname = "${pname}-deps"; - inherit version src sourceRoot; - nativeBuildInputs = [ gradle_7 perl ]; - buildPhase = '' - export GRADLE_USER_HOME=$(mktemp -d) - # https://github.com/gradle/gradle/issues/4426 - ${lib.optionalString stdenv.isDarwin "export TERM=dumb"} - gradle --no-daemon classes testClasses - ''; - # perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar) - installPhase = '' - find $GRADLE_USER_HOME/caches/modules-2 -type f -regex '.*\.\(jar\|pom\)' \ - | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \ - | sh - ''; - outputHashMode = "recursive"; - outputHashAlgo = "sha256"; - outputHash = "sha256-GjBUwJxeyJA6vGrPQVtNpcHb4CJlNlY4kHt1PT21xjo="; - }; -in stdenv.mkDerivation rec { - inherit pname version src sourceRoot; - nativeBuildInputs = [ jdk gradle_7 @@ -65,23 +43,15 @@ in stdenv.mkDerivation rec { }) ]; - # disable tests (broken on darwin) - gradleAction = if stdenv.isDarwin then "assemble" else "build"; - - buildPhase = '' - runHook preBuild + mitmCache = gradle.fetchDeps { + inherit pname; + data = ./deps.json; + }; - export GRADLE_USER_HOME=$(mktemp -d) - # https://github.com/gradle/gradle/issues/4426 - ${lib.optionalString stdenv.isDarwin "export TERM=dumb"} - # point to offline repo - sed -ie "s#repositories {#repositories { maven { url '${deps}' }#g" build.gradle - cat <(echo "pluginManagement { repositories { maven { url '${deps}' } } }") settings.gradle > settings_new.gradle - mv settings_new.gradle settings.gradle - gradle --offline --no-daemon ${gradleAction} + __darwinAllowLocalNetworking = true; - runHook postBuild - ''; + # tests are broken on darwin + doCheck = !stdenv.hostPlatform.isDarwin; installPhase = '' runHook preInstall diff --git a/pkgs/applications/science/logic/key/deps.json b/pkgs/applications/science/logic/key/deps.json new file mode 100644 index 0000000000000..4d6dee8060f9d --- /dev/null +++ b/pkgs/applications/science/logic/key/deps.json @@ -0,0 +1,387 @@ +{ + "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", + "!version": 1, + "https://plugins.gradle.org/m2": { + "ca/coglinc#javacc-gradle-plugin/2.4.0": { + "jar": "sha256-RsMHTru+ENUOzWkQpiYxCkE5FlZ5Ct0JF+kBp9afidw=", + "pom": "sha256-NTSsuHwtwH2hAqOP1wn1oANHgSkM+gcjPZTLXMOiyrA=" + }, + "ca/coglinc/javacc#ca.coglinc.javacc.gradle.plugin/2.4.0": { + "pom": "sha256-zmWjvt7VamHG21s6/cHApVuH6mvAewTxamaqn8DP2jw=" + }, + "com/github/hierynomus/license-base#com.github.hierynomus.license-base.gradle.plugin/0.15.0": { + "pom": "sha256-jWmQF6e7GyViPR4EGOKapRwtUYEHkgNaR8PG+hgMSXU=" + }, + "com/github/hierynomus/license-report#com.github.hierynomus.license-report.gradle.plugin/0.15.0": { + "pom": "sha256-OIRMJK0goaid41C254nDEz3FeeD51kZSyQi9uCgwAxM=" + }, + "com/github/johnrengelman/shadow#com.github.johnrengelman.shadow.gradle.plugin/7.1.0": { + "pom": "sha256-mh4hygODDXleq/uKbALOM4QuvCPGd+xqqZ50W1FPKt4=" + }, + "com/google/guava#guava-jdk5/17.0": { + "jar": "sha256-Wb9FZUe23aPO2WjLVvfy0+FEdOLeKWCjLEfjHB5FbGE=", + "pom": "sha256-+MFSYngT1FvE58wXrW7WpkmgIxroGf+44F0ZsgWj22Y=" + }, + "com/google/guava#guava-parent-jdk5/17.0": { + "pom": "sha256-WpYGvCdjKVazwR34h+mz54WFQGiqpOCAjtVmD2Cx+28=" + }, + "com/mycila#license-maven-plugin-parent/3.0": { + "pom": "sha256-DR8XPOud8hKSZ2Z8EMiR5eXXJm2C46hQcGaNtW2wy/o=" + }, + "com/mycila#license-maven-plugin/3.0": { + "jar": "sha256-Ul/o866FI9Be7ac2ZFxB6cMw8CV4K1s95u8Lqs8teMw=", + "pom": "sha256-kmJwjckIctcrvmfLFVITU6feJkgJzh6zLflfvqR2/IM=" + }, + "com/mycila#mycila-pom/3": { + "pom": "sha256-QCd6OyVlPuZDPEaFLacOlzbBmNlLyvbSw0cIqHOjGyY=" + }, + "com/mycila#mycila-xmltool/4.4.ga": { + "jar": "sha256-ddeyvpOBpl9vrDLzEIIhEvgFVm6fipekXY8Tz1UEnOA=", + "pom": "sha256-wMaee7roquvUQOFnjOn1AotD07ToHNQ26Y+BOkvDIrI=" + }, + "com/mycila/xmltool#xmltool/3.3": { + "jar": "sha256-hw+TlnieL0inuPso38BwwvjnSyAHJ0ziPmm2WBEP0pQ=", + "pom": "sha256-64P2FpRcjH37TYDm+QnnKG9SO7EQd4ArzSFr1w6ccXo=" + }, + "commons-io#commons-io/2.11.0": { + "jar": "sha256-lhsvbYfbrMXVSr9Fq3puJJX4m3VZiWLYxyPOqbwhCQg=", + "pom": "sha256-LgFv1+MkS18sIKytg02TqkeQSG7h5FZGQTYaPoMe71k=" + }, + "commons-io#commons-io/2.4": { + "jar": "sha256-zGpB3D6qzJ5ECmvQ0okLINNrTuQI/i1nEi8yi7bgFYE=", + "pom": "sha256-srXdRs+Zj6Ym62+KHBFPYWfI05JpQWTmJTPliY6bMfI=" + }, + "commons-logging#commons-logging/1.1.1": { + "jar": "sha256-zm+RPK0fDbOq1wGG1lxbx//Mmpnj/o4LE3MSgZ98Ni8=", + "pom": "sha256-0PLhbQVOi7l63ZyiZSXrI0b2koCfzSooeH2ozrPDXug=" + }, + "gradle/plugin/com/github/johnrengelman#shadow/7.1.0": { + "jar": "sha256-Bar4oiGwbGeS7hmZYZPolH7zv3Il6nWOUYsywoNxCJA=", + "pom": "sha256-q7tz6sHPSyR/wBbmyohafaFjNk/vyYDICvjTy+jRSQI=" + }, + "gradle/plugin/com/hierynomus/gradle/plugins#license-gradle-plugin/0.15.0": { + "jar": "sha256-gpLVOVy+k7lGe/p64JgC70z9316oNexy6jxKahfw9ZY=", + "pom": "sha256-IAmy13nhNo/tPGzHVwS58EVRv+3tFpk4F0ltrbtDyiw=" + }, + "org/apache#apache/10": { + "pom": "sha256-gC/uznKFLa/L0KQlpgNnxyxcubbqWq5ZSBEoVpGJ2vk=" + }, + "org/apache#apache/13": { + "pom": "sha256-/1E9sDYf1BI3vvR4SWi8FarkeNTsCpSW+BEHLMrzhB0=" + }, + "org/apache#apache/16": { + "pom": "sha256-n4X/L9fWyzCXqkf7QZ7n8OvoaRCfmKup9Oyj9J50pA4=" + }, + "org/apache#apache/23": { + "pom": "sha256-vBBiTgYj82V3+sVjnKKTbTJA7RUvttjVM6tNJwVDSRw=" + }, + "org/apache#apache/4": { + "pom": "sha256-npMjomuo6yOU7+8MltMbcN9XCAhjDcFHyrHnNUHMUZQ=" + }, + "org/apache#apache/9": { + "pom": "sha256-SUbmClR8jtpp87wjxbbw2tz4Rp6kmx0dp940rs/PGN0=" + }, + "org/apache/ant#ant-launcher/1.10.11": { + "jar": "sha256-2rUw33qYC1rI/X6NIIJDrg0+vW3gmxqiznVjYMwu0lY=", + "pom": "sha256-7SoGiCYb624I7FSzgxLx1ILM8aO4Y8R9KNW5CkRtHB4=" + }, + "org/apache/ant#ant-parent/1.10.11": { + "pom": "sha256-V6BTJoLzD6MHQWoiWSnVcQrNpy17Je4IyvmNyCzTXbY=" + }, + "org/apache/ant#ant/1.10.11": { + "jar": "sha256-iMC4m7uq4B4Nn8rpO+eS9au+NAkQb47uhY/fNl28B1Q=", + "pom": "sha256-wiiU2ctGq/XOv27rK8z+TXjhju6jEaDqat3VnftLH+M=" + }, + "org/apache/commons#commons-collections4/4.1": { + "jar": "sha256-sf6LWWi1fYRlQlNX7S2dxpVQRRi+0t9bVlxLjmjByKU=", + "pom": "sha256-wK1C6RA1N5YNmnTaWOzCTdGjehPR5MSPCWm+k+QBg2k=" + }, + "org/apache/commons#commons-lang3/3.4": { + "jar": "sha256-c0yDVkIMyOMMeV1k/R/NXUTqnZA0KizDJixRWPvG2Ys=", + "pom": "sha256-aG51tWGhPBAx1Dp2R6Nk4u0+RWRnBQ6sRSe5SwbXP9E=" + }, + "org/apache/commons#commons-parent/25": { + "pom": "sha256-RnrmUEQuh2hnN5CU51GN/dZ9IsU1Lr05gIyEJZ6XkLo=" + }, + "org/apache/commons#commons-parent/33": { + "pom": "sha256-U9ABE1Li5RBvN52vzNrHdU7G8PeCQ8AwXklp9azd+Ps=" + }, + "org/apache/commons#commons-parent/37": { + "pom": "sha256-7nBaTdaNjc2cyNEknVeQhh6xRc57DG1sBVW6lEidAUs=" + }, + "org/apache/commons#commons-parent/38": { + "pom": "sha256-VY2WF0Xrrcxdw5HP3n1HQIbUyq7iTdPm35Me2fa1tJU=" + }, + "org/apache/commons#commons-parent/5": { + "pom": "sha256-i9YywAvfgKfeNsIrYPEkUsFH2Oyi8A151maZ6+faoCo=" + }, + "org/apache/commons#commons-parent/52": { + "pom": "sha256-ddvo806Y5MP/QtquSi+etMvNO18QR9VEYKzpBtu0UC4=" + }, + "org/apache/commons#commons-pool2/2.2": { + "jar": "sha256-h4Czu7Mah5fnTp8wIvBD3a3Crui+Y9lPgIKmoWVGxBs=", + "pom": "sha256-SPll6CQtvwF4bQqS0K1j4gogHUpTbgMh0DsQ0uDJgVM=" + }, + "org/apache/logging#logging-parent/3": { + "pom": "sha256-djouwrgJTUFh3rbCZLEmIIW5vjC/OjHCzhNyQuV3Iqc=" + }, + "org/apache/logging/log4j#log4j-api/2.17.1": { + "jar": "sha256-sNikyKtPuLGIjQCVgicDsObUeTxBlVAgPanmkZYWHeQ=", + "pom": "sha256-HirO8yILKb4QrgmXKLFYsY2UP5Ghk8xFAbtC+SnB6Io=" + }, + "org/apache/logging/log4j#log4j-core/2.17.1": { + "jar": "sha256-yWfyI0h5gLk2TpSnx/mooB/T7nwZvb8LD5+MuFEfPUE=", + "pom": "sha256-C7s79tTSKhv6PDwJJ8KUEK8UoPsm47Ark3JvXH6Yqv0=" + }, + "org/apache/logging/log4j#log4j/2.17.1": { + "pom": "sha256-lnq8AkRDqcsJaTVVmvXprW8P9hN1+Esn1EDS+nCAawk=" + }, + "org/apache/maven#maven-parent/21": { + "pom": "sha256-/EWviRHqMH0bV1ZO7x94tpgB6cEaVhnn61jV0Arp244=" + }, + "org/apache/maven#maven-settings-builder/3.0.4": { + "jar": "sha256-o4pU7B5pow3fwUQ04K7Cdk/CaGaKvMDhMthmkqXc4+Q=", + "pom": "sha256-Pgs/YCZ7YHCnQbFdtbQPvYJMYdsSofTxZu1li59i7OA=" + }, + "org/apache/maven#maven-settings/3.0.4": { + "jar": "sha256-Pj3xf1315M4ee38gEcV9YdMo5lZ4VCreIEjw0PopXwk=", + "pom": "sha256-vu3/18fkmtNe+UXDQT8YGfBOQ+opSjGARxTIy7DzcrM=" + }, + "org/apache/maven#maven/3.0.4": { + "pom": "sha256-TSI+AaZWnWZVwfT86Elp1FFCzbq9sRjqCMXIwz7GMvY=" + }, + "org/codehaus/plexus#plexus-component-annotations/1.5.5": { + "jar": "sha256-Tfemp75ks1u8z2C1wRVpf56jQh0iZ0rmcTXd43X8yh8=", + "pom": "sha256-gV8+wxa4xfpwE4X99ACb+1HgfXgOj2puKv5yDFLX4pI=" + }, + "org/codehaus/plexus#plexus-components/1.1.18": { + "pom": "sha256-7128f6kYttu6cdJ+Wz16AN9iS8+iVJpyl/Nv4nX2NNc=" + }, + "org/codehaus/plexus#plexus-containers/1.5.5": { + "pom": "sha256-G8Jkgk7IdrDKb09YOBdcVBxjjLxDMmomi5rufUd4te8=" + }, + "org/codehaus/plexus#plexus-interpolation/1.14": { + "jar": "sha256-f8YzeNPoRmNhm5vtrOn5/niydsK+PGLKIkVEkpTIQXY=", + "pom": "sha256-0IFVxJffN7LD2bWw39sC7AUlsgcLW+Nzn//elC/Kya8=" + }, + "org/codehaus/plexus#plexus-utils/2.0.5": { + "pom": "sha256-Nbx9EhNhYjZXEHKyxW2hj3pXZY3otKQQBkW3BUorJzs=" + }, + "org/codehaus/plexus#plexus-utils/2.0.6": { + "jar": "sha256-i5CfTKl4hkeUL4g9TlWbzGQhI/fGvNOEaYOi5GVGnDM=", + "pom": "sha256-/drU+mLIIxCuxDUl5RnNWfJ9BMdWn+IbGwPKIQiHgQw=" + }, + "org/codehaus/plexus#plexus-utils/3.4.1": { + "jar": "sha256-UtheBLORhyKvEdEoVbSoJX35ag52yPTjhS5vqoUfNXs=", + "pom": "sha256-sUTP+bHGJZ/sT+5b38DzYNacI6vU6m5URTOpSbaeNYI=" + }, + "org/codehaus/plexus#plexus/2.0.6": { + "pom": "sha256-vqEudHcI0l5zQQyhxzHr36EC6L227H2BvUUiWDsjS8w=" + }, + "org/codehaus/plexus#plexus/2.0.7": { + "pom": "sha256-K1kGIDCrChXF0Jd7oiQhcGNokmSIc5pl8leT5xXMinQ=" + }, + "org/codehaus/plexus#plexus/8": { + "pom": "sha256-/6NJ2wTnq/ZYhb3FogYvQZfA/50/H04qpXILdyM/dCw=" + }, + "org/jdom#jdom2/2.0.6": { + "jar": "sha256-E0XxG6YG0VYD1nQFUajCGUfAIVZAdw7GcnH+eL6pfPU=", + "pom": "sha256-R7I6ef4za3QbgkNMbgSdaBZSVuQF51wQkh/XL6imXY0=" + }, + "org/junit#junit-bom/5.7.2": { + "module": "sha256-87zrHFndT2mT9DBN/6WAFyuN9lp2zTb6T9ksBXjSitg=", + "pom": "sha256-zRSqqGmZH4ICHFhdVw0x/zQry6WLtEIztwGTdxuWSHs=" + }, + "org/ow2#ow2/1.5": { + "pom": "sha256-D4obEW52C4/mOJxRuE5LB6cPwRCC1Pk25FO1g91QtDs=" + }, + "org/ow2/asm#asm-analysis/9.2": { + "jar": "sha256-h4++UhcxwHLRTS1luYOxvq5q0G/aAAe2qLroH3P0M8Q=", + "pom": "sha256-dzzBor/BTGxKl5xRoHXAI0oL9pT8Or5PrPRU83oUXxs=" + }, + "org/ow2/asm#asm-commons/9.2": { + "jar": "sha256-vkzlMTiiOLtSLNeBz5Hzulzi9sqT7GLUahYqEnIl4KY=", + "pom": "sha256-AoJOg58qLw5ylZ/dMLSJckDwWvxD3kLXugsYQ3YBwHA=" + }, + "org/ow2/asm#asm-tree/9.2": { + "jar": "sha256-qr+b0jCRpOv8EJwfPufPPkuJ9rotP1HFJD8Ws8/64BE=", + "pom": "sha256-9h8+vqVSDd8Z9FKwPEJscjG92KgdesKHZctScSJaw3g=" + }, + "org/ow2/asm#asm/9.2": { + "jar": "sha256-udT+TXGTjfOIOfDspCqqpkz4sxPWeNoDbwyzyhmbR/U=", + "pom": "sha256-37EqGyJL8Bvh/WBAIEZviUJBvLZF3M45Xt2M1vilDfQ=" + }, + "org/sonarqube#org.sonarqube.gradle.plugin/3.0": { + "pom": "sha256-1Pg7ynlN6ZPv/gtqt/HO572zNJgWc4BVkHgvv6Mj420=" + }, + "org/sonarsource/parent#parent/54": { + "pom": "sha256-QVl5Y/x9ObDgJArLTYT1dbQCQtbhR9xQsCbUzvwFMV8=" + }, + "org/sonarsource/scanner/api#sonar-scanner-api-parent/2.15.0.2182": { + "pom": "sha256-JcR02YT0wD5P147u53D0Pqks+5Xrixf3+qyFVpNgFoY=" + }, + "org/sonarsource/scanner/api#sonar-scanner-api/2.15.0.2182": { + "jar": "sha256-h+foNKu97912pce/pM7ztxUhsfVQ/Iu+qLCphVPjNeg=", + "pom": "sha256-H+gEKIHd2qgREtNNv0k30OM+TQFYYIJ7/R/fb0YLH9U=" + }, + "org/sonarsource/scanner/gradle#sonarqube-gradle-plugin/3.0": { + "jar": "sha256-KLTNnuKtiAHAxeXJhPNtLizGDRkhwC61jujORTpejb8=", + "pom": "sha256-2jJNuKvT65d8B0lY/9E4vdVTWwYojfN7WiRv53Uad7Y=" + }, + "org/sonatype/forge#forge-parent/4": { + "pom": "sha256-GDjRMkeQBbS3RZt5jp2ZFVFQkMKICC/c2G2wsQmDokw=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/sonatype/plexus#plexus-cipher/1.4": { + "jar": "sha256-WhX9uiJmng/dBuENzOYyCHnh9zmPvJEM0Gd7UGcqeMQ=", + "pom": "sha256-pjouI5iMyn+sbJOIbW8FBv0m2I1+jMDLibnG4NbJlK0=" + }, + "org/sonatype/plexus#plexus-sec-dispatcher/1.3": { + "jar": "sha256-OwVZu4Qy8ok37+bKGT71SoUG0Addc/10BrmxFsahEGM=", + "pom": "sha256-1eZQxQ72lYwCjtAktZrwTPPTjhRTp31UK2tIS8D0ygs=" + }, + "org/sonatype/spice#spice-parent/12": { + "pom": "sha256-IaGbJtvlw43bURTPTq2/XMtBG8axKP3VlJscyxLzaD4=" + }, + "org/springframework#spring-asm/3.1.3.RELEASE": { + "jar": "sha256-za8dBwQOdREzok+Zesp9mOrL/mfhsoddzoynOCUngTA=", + "pom": "sha256-f7b7uYdEDEjGc9sVsIdwqcLWySBSBEIZl5z0j0ZvcSM=" + }, + "org/springframework#spring-core/3.1.3.RELEASE": { + "jar": "sha256-AUp7IdtoD9iGfgJrGMO/idME3sWyEJCotqezy1z8d9I=", + "pom": "sha256-8xqLb1m2oBgOOMnBKboGB7rnoNShC5U3V3DIFKtMx1M=" + }, + "org/springframework#spring-parent/3.1.3.RELEASE": { + "pom": "sha256-ZOkRARj4KhQnWaMW0J09jY1xfV2VB51/aziO5Hn6eC8=" + }, + "org/vafer#jdependency/2.7.0": { + "jar": "sha256-1j79V0b/QIlDp91++Frp8Jqn+2O7KxaRFCfObEW1n9A=", + "pom": "sha256-6yRCKwo+nofVrG6oCHeG+1HEsbvg0iXvdSFSxzaiBNA=" + } + }, + "https://repo.maven.apache.org/maven2": { + "antlr#antlr/2.7.7": { + "jar": "sha256-iPvaS5Ellrn1bo4S5YDMlUus+1F3bs/d0+GPwc9W3Ew=", + "pom": "sha256-EA95O6J/i05CBO20YXHr825U4PlM/AJSf+oHoLsfzrc=" + }, + "com/atlassian/commonmark#commonmark-ext-gfm-tables/0.15.2": { + "jar": "sha256-Wn3BAWFAwPHGnFV21kvjcYJcWlStc1sMaZuWLMTgpPo=", + "pom": "sha256-rRZxS5MgMZDpRiSFMrWCkDdBQkg7RhdrsD3CrijycN0=" + }, + "com/atlassian/commonmark#commonmark-parent/0.15.2": { + "pom": "sha256-PhTratCeeq+Uow5I3kexFm+QCz6Ncm+UfMWkD3HkfCU=" + }, + "com/atlassian/commonmark#commonmark/0.15.2": { + "jar": "sha256-/UmFBUzWYXaB9smSH/yTq2uGQraeV3T48InZc9HGbmo=", + "pom": "sha256-3ZVTaHcyCDS90YRnvtbgKE7UhXKdU8LcLfWEE2vmGaI=" + }, + "com/atlassian/pom#base-pom/5.0.13": { + "pom": "sha256-CN0hBF/fYQSL7zj/7FbiHuslxuLYRPwJ9rlW4JNzdUM=" + }, + "com/atlassian/pom#central-pom/5.0.13": { + "pom": "sha256-zihFbTZlB8oPkQIpQqBeOI/Zj4YqbY2zEFxcRJenTOU=" + }, + "com/google/code/findbugs#jsr305/3.0.2": { + "jar": "sha256-dmrSoHg/JoeWLIrXTO7MOKKLn3Ki0IXuQ4t4E+ko0Mc=", + "pom": "sha256-GYidvfGyVLJgGl7mRbgUepdGRIgil2hMeYr+XWPXjf4=" + }, + "com/ibm/icu#icu4j/58.2": { + "jar": "sha256-lT4eg7K+fD6i+I2obBNhT0fp5x01eMhSHX8Yd1a2OWI=", + "pom": "sha256-R7Zq1yxypJmlRL57ixEzX2xz/bcyFxfRGBHfs+k0FGo=" + }, + "com/miglayout#miglayout-core/5.2": { + "jar": "sha256-Zp8NqP12vlPXX1lA9IFibym1RM2ZJbfaJhEYfSaEvHo=", + "pom": "sha256-scvva6qqt3IaCLKlAZtpajfV4+wKfQzXmRo4MOJrfGA=" + }, + "com/miglayout#miglayout-parent/5.2": { + "pom": "sha256-+STS0Cl2vIQu0u/4sx4Hp2Zb/NJUY9TXmtvkEFis6Zs=" + }, + "com/miglayout#miglayout-swing/5.2": { + "jar": "sha256-g2n2guoVPvtoGj9YKsxIjoKpfub0fSU1LwgOl38TjIY=", + "pom": "sha256-52Q1kq9JpxIUc+OUOzdO3Xw/u5zJBdDGq5DOcCvkQqE=" + }, + "com/sun/activation#all/1.2.0": { + "pom": "sha256-HYUY46x1MqEE5Pe+d97zfJguUwcjxr2z1ncIzOKwwsQ=" + }, + "javax/activation#javax.activation-api/1.2.0": { + "jar": "sha256-Q/3vC1ts6zGwQksgi5MMdKtY+sLO63s/b9OuuLXKQ5M=", + "pom": "sha256-2ikm88i+iYZDzBCs3sbeCwNRpX+yc1dw+gF3sGrecbk=" + }, + "javax/xml/bind#jaxb-api-parent/2.4.0-b180830.0359": { + "pom": "sha256-ctEy4shY0iMPFdBI8ek6J5xAxOnshLxW+fLz61r0tLg=" + }, + "javax/xml/bind#jaxb-api/2.4.0-b180830.0359": { + "jar": "sha256-VrnpcCdTdjAHQ1Fi6niAVe/P78hquSDwMsBBHcVHuDY=", + "pom": "sha256-sck/wwHX9f5M3hPRlTKZJR2jfv/8kfUjg1UEw/+HNwc=" + }, + "junit#junit/4.12": { + "jar": "sha256-WXIfCAXiI9hLkGd4h9n/Vn3FNNfFAsqQPAwrF/BcEWo=", + "pom": "sha256-kPFj944/+28cetl96efrpO6iWAcUG4XW0SvmfKJUScQ=" + }, + "net/java#jvnet-parent/1": { + "pom": "sha256-KBRAgRJo5l2eJms8yJgpfiFOBPCXQNA4bO60qJI9Y78=" + }, + "net/java#jvnet-parent/3": { + "pom": "sha256-MPV4nvo53b+WCVqto/wSYMRWH68vcUaGcXyy3FBJR1o=" + }, + "net/java#jvnet-parent/5": { + "pom": "sha256-GvaZ+Nndq2f5oNIC+9eRXrA2Klpt/V/8VMr6NGXJywo=" + }, + "net/java/dev/javacc#javacc/4.0": { + "jar": "sha256-z7qy1qzbN2TivLXAhCpZ9YPLXoui61wTqNuYNoqtzC8=", + "pom": "sha256-EBLeGTH+yhXhvQEomKaJBOXTO7TD6IhY+oagD7ePUDg=" + }, + "org/abego/treelayout#org.abego.treelayout.core/1.0.3": { + "jar": "sha256-+l4xOVw5wufUasoPgfcgYJMWB7L6Qb02A46yy2+5MyY=", + "pom": "sha256-o7KyI3lDcDVeeSQzrwEvyZNmfAMxviusrYTbwJrOSgw=" + }, + "org/antlr#ST4/4.0.8": { + "jar": "sha256-WMqrxAyfdLC1mT/YaOD2SlDAdZCU5qJRqq+tmO38ejs=", + "pom": "sha256-PAiQ3scRdOs7o9QEyp40GQH/awQhgIsAcTsNuxMGwXw=" + }, + "org/antlr#antlr-master/3.5.2": { + "pom": "sha256-QtkaUx6lEA6wm1QaoALDuQjo8oK9c7bi9S83HvEzG9Y=" + }, + "org/antlr#antlr-runtime/3.5.2": { + "jar": "sha256-zj/I7LEPOemjzdy7LONQ0nLZzT0LHhjm/nPDuTichzQ=", + "pom": "sha256-RqnCIAu4sSvXEkqnpQl/9JCZkIMpyFGgTLIFFCCqfyU=" + }, + "org/antlr#antlr/3.5.2": { + "jar": "sha256-WsNsKs+woPPTfa/iC1tXDyZD4tAAxkjURQPCc4vmQ98=", + "pom": "sha256-Bl5egGYv64WHldPAH3cUJHvdMZRZcF7hOxpLGWj6IuQ=" + }, + "org/antlr#antlr4-master/4.7.1": { + "pom": "sha256-QSb2e/QT9si8wbGdh7mnJWdCz6ccJQxKmVMNrt6ghow=" + }, + "org/antlr#antlr4-runtime/4.7.1": { + "jar": "sha256-Q1FtGb6uNZCeBNBq9sDFjBe8lOAHDIXo3JkpymQNyR0=", + "pom": "sha256-zhOGobkOUSy3oli1Ih1C8RJh/9qaElkBzdhs3ypZ/5E=" + }, + "org/antlr#antlr4/4.7.1": { + "jar": "sha256-os3C8vjriTcogyVo3FTQgOtaFJXts7ZuUblxIqYKDYc=", + "pom": "sha256-k+AkX5wHQx6tBunpyPmO7IJUQb9PbtZr3aboypxoR5Y=" + }, + "org/glassfish#javax.json/1.0.4": { + "jar": "sha256-Dh3sQKHt6WWUElHtqWiu7gUsxPUDeLwxbMSOgVm9vrQ=", + "pom": "sha256-a6+Dg/+pi2bqls1b/B7H8teUY7uYrJgFKWSxIcIhLVQ=" + }, + "org/glassfish#json/1.0.4": { + "pom": "sha256-bXxoQjEV+SFxjZRPhZkktMaFIX7AOkn3BFWossqpcuY=" + }, + "org/hamcrest#hamcrest-core/1.3": { + "jar": "sha256-Zv3vkelzk0jfeglqo4SlaF9Oh1WEzOiThqekclHE2Ok=", + "pom": "sha256-/eOGp5BRc6GxA95quCBydYS1DQ4yKC4nl3h8IKZP+pM=" + }, + "org/hamcrest#hamcrest-parent/1.3": { + "pom": "sha256-bVNflO+2Y722gsnyelAzU5RogAlkK6epZ3UEvBvkEps=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/sonatype/oss#oss-parent/9": { + "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" + } + } +} diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix index f0bd2ba777db9..4df1d6eb8aab5 100644 --- a/pkgs/applications/science/logic/lean/default.nix +++ b/pkgs/applications/science/logic/lean/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { postPatch = "patchShebangs ."; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace $out/bin/leanpkg \ --replace "greadlink" "${coreutils}/bin/readlink" ''; diff --git a/pkgs/applications/science/logic/lean2/default.nix b/pkgs/applications/science/logic/lean2/default.nix index e30b8af047350..83cada9e309ab 100644 --- a/pkgs/applications/science/logic/lean2/default.nix +++ b/pkgs/applications/science/logic/lean2/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation { license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ thoughtpolice gebner ]; - broken = stdenv.isAarch64; + broken = stdenv.hostPlatform.isAarch64; mainProgram = "lean"; }; } diff --git a/pkgs/applications/science/logic/lean4/default.nix b/pkgs/applications/science/logic/lean4/default.nix index 2ec05098f4078..a2c33db40afde 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.1"; src = fetchFromGitHub { owner = "leanprover"; repo = "lean4"; rev = "v${finalAttrs.version}"; - hash = "sha256-R75RrAQb/tRTtMvy/ddLl1KQaA7V71nocvjIS9geMrg="; + hash = "sha256-C3N56f3mT+5f149T1BIYQil2UleAWmnRYLqUq4zcLgs="; }; postPatch = '' @@ -53,6 +53,7 @@ stdenv.mkDerivation (finalAttrs: { passthru.tests = { version = testers.testVersion { package = finalAttrs.finalPackage; + version = "v${finalAttrs.version}"; }; }; @@ -62,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/leanprover/lean4/blob/${finalAttrs.src.rev}/RELEASES.md"; license = licenses.asl20; platforms = platforms.all; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ danielbritten ]; mainProgram = "lean"; }; }) diff --git a/pkgs/applications/science/logic/logisim-evolution/default.nix b/pkgs/applications/science/logic/logisim-evolution/default.nix index 3d86c8cafdbc2..465360a202385 100644 --- a/pkgs/applications/science/logic/logisim-evolution/default.nix +++ b/pkgs/applications/science/logic/logisim-evolution/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { makeBinaryWrapper copyDesktopItems unzip - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ desktopToDarwinBundle ]; diff --git a/pkgs/applications/science/logic/logisim/default.nix b/pkgs/applications/science/logic/logisim/default.nix index d278f1e784687..951d5b22deef0 100644 --- a/pkgs/applications/science/logic/logisim/default.nix +++ b/pkgs/applications/science/logic/logisim/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { makeBinaryWrapper copyDesktopItems unzip - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ desktopToDarwinBundle ]; diff --git a/pkgs/applications/science/logic/mcrl2/default.nix b/pkgs/applications/science/logic/mcrl2/default.nix index c26e5f2e761f6..a0cbdabc5a452 100644 --- a/pkgs/applications/science/logic/mcrl2/default.nix +++ b/pkgs/applications/science/logic/mcrl2/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { dontWrapQtApps = true; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Toolset for model-checking concurrent systems and protocols"; longDescription = '' A formal specification language with an associated toolset, diff --git a/pkgs/applications/science/logic/mcy/default.nix b/pkgs/applications/science/logic/mcy/default.nix index 343b50dfd7ef9..65c752f629993 100644 --- a/pkgs/applications/science/logic/mcy/default.nix +++ b/pkgs/applications/science/logic/mcy/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { ''; # the build needs a bit of work... - buildPhase = "true"; + dontBuild = true; installPhase = '' mkdir -p $out/bin $out/share/mcy/{dash,scripts} install mcy.py $out/bin/mcy && chmod +x $out/bin/mcy diff --git a/pkgs/applications/science/logic/monosat/default.nix b/pkgs/applications/science/logic/monosat/default.nix index 067ba8ceb1b33..1bd2d29d45059 100644 --- a/pkgs/applications/science/logic/monosat/default.nix +++ b/pkgs/applications/science/logic/monosat/default.nix @@ -3,8 +3,6 @@ # annoying and break the python library, so let's not bother for now includeJava ? !stdenv.hostPlatform.isDarwin, includeGplCode ? true }: -with lib; - let boolToCmake = x: if x then "ON" else "OFF"; @@ -52,14 +50,14 @@ let "-DCMAKE_SKIP_BUILD_RPATH=ON" ]; - postInstall = optionalString includeJava '' + postInstall = lib.optionalString includeJava '' mkdir -p $out/share/java cp monosat.jar $out/share/java ''; passthru = { inherit python; }; - meta = { + meta = with lib; { description = "SMT solver for Monotonic Theories"; mainProgram = "monosat"; platforms = platforms.unix; diff --git a/pkgs/applications/science/logic/msat/default.nix b/pkgs/applications/science/logic/msat/default.nix index 299fe95224eba..3c27493baff87 100644 --- a/pkgs/applications/science/logic/msat/default.nix +++ b/pkgs/applications/science/logic/msat/default.nix @@ -1,4 +1,4 @@ -{ lib, ocamlPackages }: +{ ocamlPackages }: with ocamlPackages; buildDunePackage { pname = "msat-bin"; diff --git a/pkgs/applications/science/logic/naproche/default.nix b/pkgs/applications/science/logic/naproche/default.nix deleted file mode 100644 index d2070ba8240ff..0000000000000 --- a/pkgs/applications/science/logic/naproche/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib, fetchFromGitHub, haskellPackages, makeWrapper, eprover }: - -with haskellPackages; mkDerivation { - pname = "Naproche-SAD"; - version = "unstable-2024-01-18"; - - src = fetchFromGitHub { - owner = "naproche"; - repo = "naproche"; - rev = "bb3dbcbd2173e3334bc5bdcd04c07c6836a11387"; - hash = "sha256-DWcowUjy8/VBuhqvDYlVINHssF4KhuzT0L+m1YwUxoE="; - }; - - isExecutable = true; - - buildTools = [ hpack makeWrapper ]; - executableHaskellDepends = [ - base array bytestring containers ghc-prim megaparsec mtl network process - split temporary text threads time transformers uuid - ]; - - prePatch = "hpack"; - doCheck = false; # Tests are broken in upstream - - postInstall = '' - wrapProgram $out/bin/Naproche-SAD \ - --set-default NAPROCHE_EPROVER ${eprover}/bin/eprover - ''; - - homepage = "https://github.com/naproche/naproche#readme"; - description = "Write formal proofs in natural language and LaTeX"; - maintainers = with lib.maintainers; [ jvanbruegge ]; - license = lib.licenses.gpl3Only; - mainProgram = "Naproche-SAD"; -} diff --git a/pkgs/applications/science/logic/nuXmv/default.nix b/pkgs/applications/science/logic/nuXmv/default.nix index ad40902e92808..5726796bfa189 100644 --- a/pkgs/applications/science/logic/nuXmv/default.nix +++ b/pkgs/applications/science/logic/nuXmv/default.nix @@ -5,21 +5,21 @@ stdenv.mkDerivation rec { version = "2.0.0"; src = fetchurl { - url = "https://es-static.fbk.eu/tools/nuxmv/downloads/nuXmv-${version}-${if stdenv.isDarwin then "macosx64" else "linux64"}.tar.gz"; - sha256 = if stdenv.isDarwin + url = "https://es-static.fbk.eu/tools/nuxmv/downloads/nuXmv-${version}-${if stdenv.hostPlatform.isDarwin then "macosx64" else "linux64"}.tar.gz"; + sha256 = if stdenv.hostPlatform.isDarwin then "sha256-48I+FhJUUam1nMCMMM47CwGO82BYsNz0eHDHXBfqO2E=" else "sha256-Gf+QgAjTrysZj7qTtt1wcQPganDtO0YtRY4ykhLPzVo="; }; nativeBuildInputs = [ makeWrapper ]; - buildInputs = lib.optionals stdenv.isDarwin [ gmp ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ gmp ]; installPhase= '' runHook preInstall install -Dm755 -t $out/bin ./bin/nuXmv runHook postInstall ''; - postFixup = lib.optionalString stdenv.isDarwin '' + postFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' wrapProgram $out/bin/nuXmv --prefix DYLD_LIBRARY_PATH : ${gmp}/lib ''; diff --git a/pkgs/applications/science/logic/nusmv/default.nix b/pkgs/applications/science/logic/nusmv/default.nix index d7ecbc7cd8874..058949083caf0 100644 --- a/pkgs/applications/science/logic/nusmv/default.nix +++ b/pkgs/applications/science/logic/nusmv/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "New symbolic model checker for the analysis of synchronous finite-state and infinite-state systems"; - homepage = "https://nuxmv.fbk.eu/pmwiki.php"; + homepage = "https://nusmv.fbk.eu/"; maintainers = with maintainers; [ mgttlinger ]; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; platforms = platforms.linux; diff --git a/pkgs/applications/science/logic/open-wbo/default.nix b/pkgs/applications/science/logic/open-wbo/default.nix index 2290ff29224b4..798643acc1bba 100644 --- a/pkgs/applications/science/logic/open-wbo/default.nix +++ b/pkgs/applications/science/logic/open-wbo/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { ''; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); description = "State-of-the-art MaxSAT and Pseudo-Boolean solver"; mainProgram = "open-wbo"; maintainers = with maintainers; [ gebner ]; diff --git a/pkgs/applications/science/logic/opensmt/default.nix b/pkgs/applications/science/logic/opensmt/default.nix index 1a031e8d1e1dd..0ebbbc663caab 100644 --- a/pkgs/applications/science/logic/opensmt/default.nix +++ b/pkgs/applications/science/logic/opensmt/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); description = "Satisfiability modulo theory (SMT) solver"; mainProgram = "opensmt"; maintainers = [ maintainers.raskin ]; diff --git a/pkgs/applications/science/logic/picosat/default.nix b/pkgs/applications/science/logic/picosat/default.nix index 1fef05069a696..23fc2776ba813 100644 --- a/pkgs/applications/science/logic/picosat/default.nix +++ b/pkgs/applications/science/logic/picosat/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { configurePhase = "./configure.sh --shared --trace"; - makeFlags = lib.optional stdenv.isDarwin + makeFlags = lib.optional stdenv.hostPlatform.isDarwin "SONAME=-Wl,-install_name,$(out)/lib/libpicosat.so"; installPhase = '' diff --git a/pkgs/applications/science/logic/prover9/default.nix b/pkgs/applications/science/logic/prover9/default.nix index 5c476be06e4e7..a82e44c8a5109 100644 --- a/pkgs/applications/science/logic/prover9/default.nix +++ b/pkgs/applications/science/logic/prover9/default.nix @@ -41,6 +41,6 @@ stdenv.mkDerivation { the Otter Prover. This is the LADR command-line version. ''; platforms = platforms.linux; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/science/logic/redprl/default.nix b/pkgs/applications/science/logic/redprl/default.nix index 03117d4e03285..a6354a091665e 100644 --- a/pkgs/applications/science/logic/redprl/default.nix +++ b/pkgs/applications/science/logic/redprl/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { repo = "sml-redprl"; rev = "c72190de76f7ed1cfbe1d2046c96e99ac5022b0c"; fetchSubmodules = true; - sha256 = "sha256-xrQT5o0bsIN+mCYUOz9iY4+j3HGROb1I6R2ADcLy8n4="; + hash = "sha256-xrQT5o0bsIN+mCYUOz9iY4+j3HGROb1I6R2ADcLy8n4="; }; buildInputs = [ mlton ]; diff --git a/pkgs/applications/science/logic/satallax/default.nix b/pkgs/applications/science/logic/satallax/default.nix index bd3e9d3e8351e..0f7d05a8823ee 100644 --- a/pkgs/applications/science/logic/satallax/default.nix +++ b/pkgs/applications/science/logic/satallax/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { ''; # error: invalid suffix on literal; C++11 requires a space between literal and identifier - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-reserved-user-defined-literal"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-Wno-reserved-user-defined-literal"; installPhase = '' mkdir -p "$out/share/doc/satallax" "$out/bin" "$out/lib" "$out/lib/satallax" @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { cp -r coq* "$out/lib/satallax/" ''; - doCheck = stdenv.isLinux; + doCheck = stdenv.hostPlatform.isLinux; checkPhase = '' runHook preCheck diff --git a/pkgs/applications/science/logic/stp/default.nix b/pkgs/applications/science/logic/stp/default.nix index fb41ea07f5a15..1025663b1bd7c 100644 --- a/pkgs/applications/science/logic/stp/default.nix +++ b/pkgs/applications/science/logic/stp/default.nix @@ -1,5 +1,17 @@ -{ lib, stdenv, cmake, boost, bison, flex, fetchFromGitHub, perl -, python3, python3Packages, zlib, minisat, cryptominisat }: +{ lib +, stdenv +, cmake +, boost +, bison +, flex +, fetchFromGitHub +, fetchpatch +, perl +, python3 +, zlib +, minisat +, cryptominisat +}: stdenv.mkDerivation rec { pname = "stp"; @@ -8,14 +20,20 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "stp"; repo = "stp"; - rev = version; - sha256 = "1yg2v4wmswh1sigk47drwsxyayr472mf4i47lqmlcgn9hhbx1q87"; + rev = version; + hash = "sha256-B+HQF4TJPkYrpodE4qo4JHvlu+a5HTJf1AFyXTnZ4vk="; }; patches = [ # Fix missing type declaration # due to undeterminisitic compilation # of circularly dependent headers ./stdint.patch + + # Python 3.12+ compatibility for build: https://github.com/stp/stp/pull/450 + (fetchpatch { + url = "https://github.com/stp/stp/commit/fb185479e760b6ff163512cb6c30ac9561aadc0e.patch"; + hash = "sha256-guFgeWOrxRrxkU7kMvd5+nmML0rwLYW196m1usE2qiA="; + }) ]; postPatch = '' @@ -26,10 +44,16 @@ stdenv.mkDerivation rec { sed -e '1i #include <cstdint>' -i include/stp/AST/ASTNode.h ''; - buildInputs = [ boost zlib minisat cryptominisat python3 ]; + buildInputs = [ + boost + zlib + minisat + cryptominisat + python3 + ]; nativeBuildInputs = [ cmake bison flex perl ]; preConfigure = '' - python_install_dir=$out/${python3Packages.python.sitePackages} + python_install_dir=$out/${python3.sitePackages} mkdir -p $python_install_dir cmakeFlagsArray=( $cmakeFlagsArray @@ -40,7 +64,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Simple Theorem Prover"; - maintainers = with maintainers; [ McSinyx ]; + maintainers = with maintainers; [ McSinyx numinit ]; platforms = platforms.linux; license = licenses.mit; }; diff --git a/pkgs/applications/science/logic/surelog/default.nix b/pkgs/applications/science/logic/surelog/default.nix index 7b4c85fe9b215..0d795611b95a8 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; + repo = "surelog"; 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/symbiyosys/default.nix b/pkgs/applications/science/logic/symbiyosys/default.nix deleted file mode 100644 index c3df8340d20c8..0000000000000 --- a/pkgs/applications/science/logic/symbiyosys/default.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ lib, stdenv, fetchFromGitHub -, bash, python3, yosys -, yices, boolector, z3, aiger -}: - -stdenv.mkDerivation { - pname = "symbiyosys"; - version = "2021.11.30"; - - src = fetchFromGitHub { - owner = "YosysHQ"; - repo = "SymbiYosys"; - rev = "b409b1179e36d2a3fff66c85b7d4e271769a2d9e"; - hash = "sha256-S7of2upntiMkSdh4kf1RsrjriS31Eh8iEcVvG36isQg="; - }; - - buildInputs = [ ]; - patchPhase = '' - patchShebangs . - - # Fix up Yosys imports - substituteInPlace sbysrc/sby.py \ - --replace "##yosys-sys-path##" \ - "sys.path += [p + \"/share/yosys/python3/\" for p in [\"$out\", \"${yosys}\"]]" - - # Fix various executable references - substituteInPlace sbysrc/sby_core.py \ - --replace '"/usr/bin/env", "bash"' '"${bash}/bin/bash"' \ - --replace ', "btormc"' ', "${boolector}/bin/btormc"' \ - --replace ', "aigbmc"' ', "${aiger}/bin/aigbmc"' - - substituteInPlace sbysrc/sby_core.py \ - --replace '##yosys-program-prefix##' '"${yosys}/bin/"' - - substituteInPlace sbysrc/sby.py \ - --replace '/usr/bin/env python3' '${python3}/bin/python' - ''; - - buildPhase = "true"; - - installPhase = '' - mkdir -p $out/bin $out/share/yosys/python3 - - cp sbysrc/sby_*.py $out/share/yosys/python3/ - cp sbysrc/sby.py $out/bin/sby - - chmod +x $out/bin/sby - ''; - - doCheck = false; # not all provers are yet packaged... - nativeCheckInputs = [ python3 yosys boolector yices z3 aiger ]; - checkPhase = "make test"; - - meta = { - description = "Tooling for Yosys-based verification flows"; - homepage = "https://symbiyosys.readthedocs.io/"; - license = lib.licenses.isc; - maintainers = with lib.maintainers; [ thoughtpolice ]; - mainProgram = "sby"; - platforms = lib.platforms.all; - }; -} diff --git a/pkgs/applications/science/logic/tamarin-prover/default.nix b/pkgs/applications/science/logic/tamarin-prover/default.nix index 2aa92118b03a7..e621b36a773bb 100644 --- a/pkgs/applications/science/logic/tamarin-prover/default.nix +++ b/pkgs/applications/science/logic/tamarin-prover/default.nix @@ -108,7 +108,7 @@ mkDerivation (common "tamarin-prover" src // { executableToolDepends = [ makeWrapper which maude graphviz ]; postInstall = '' wrapProgram $out/bin/tamarin-prover \ - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' --set LOCALE_ARCHIVE "${glibcLocales}/lib/locale/locale-archive" \ '' + '' --prefix PATH : ${lib.makeBinPath [ which maude graphviz ]} diff --git a/pkgs/applications/science/logic/tlaplus/default.nix b/pkgs/applications/science/logic/tlaplus/default.nix index f478bf204d4f3..f53da73e1e632 100644 --- a/pkgs/applications/science/logic/tlaplus/default.nix +++ b/pkgs/applications/science/logic/tlaplus/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "tlaplus"; - version = "1.7.3"; + version = "1.7.4"; src = fetchurl { url = "https://github.com/tlaplus/tlaplus/releases/download/v${version}/tla2tools.jar"; - sha256 = "sha256-5P8V6oH05voSXAgwBDclSxdxdMalrfaNpElkar4IUZ0="; + sha256 = "sha256-k2omIGHJFGlN/WaaVDviRXPEXVqg/yCouWsj0B4FDog="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/science/logic/uhdm/default.nix b/pkgs/applications/science/logic/uhdm/default.nix index 182f6eb81eeb2..72b55ffbcd7ab 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; + repo = "UHDM"; 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/logic/verifast/default.nix b/pkgs/applications/science/logic/verifast/default.nix index a1f5ec65a3be3..9515bda467cfd 100644 --- a/pkgs/applications/science/logic/verifast/default.nix +++ b/pkgs/applications/science/logic/verifast/default.nix @@ -20,11 +20,11 @@ let in stdenv.mkDerivation rec { pname = "verifast"; - version = "21.04"; + version = "24.08.30"; src = fetchurl { url = "https://github.com/verifast/verifast/releases/download/${version}/${pname}-${version}-linux.tar.gz"; - sha256 = "sha256-PlRsf4wFXoM+E+60SbeKzs/RZK0HNVirX47AnI6NeYM="; + sha256 = "sha256-hIS5e+zVlxSOqr1/ZDy0PangyWjB9uLCvN8Qr688msg="; }; dontConfigure = true; diff --git a/pkgs/applications/science/logic/workcraft/default.nix b/pkgs/applications/science/logic/workcraft/default.nix index cc512acad7937..f1159f3c06875 100644 --- a/pkgs/applications/science/logic/workcraft/default.nix +++ b/pkgs/applications/science/logic/workcraft/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "workcraft"; - version = "3.4.2"; + version = "3.5.1"; src = fetchurl { url = "https://github.com/workcraft/workcraft/releases/download/v${version}/workcraft-v${version}-linux.tar.gz"; - sha256 = "sha256-+O6fl/+D89L5xrrTaAnBTfw0tFz/CoKLaBa+OHtdnaA="; + sha256 = "sha256-326iDxQ1t9iih2JVRO07C41V5DtkUzwkcNHCz5kLHT8="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/science/logic/yices/default.nix b/pkgs/applications/science/logic/yices/default.nix index de80cd725653f..f29a5e1f3f51f 100644 --- a/pkgs/applications/science/logic/yices/default.nix +++ b/pkgs/applications/science/logic/yices/default.nix @@ -2,20 +2,15 @@ stdenv.mkDerivation rec { pname = "yices"; - # We never want X.Y.${odd} versions as they are moving development tags. - version = "2.6.4"; + version = "2.6.5"; src = fetchFromGitHub { owner = "SRI-CSL"; repo = "yices2"; rev = "Yices-${version}"; - sha256 = "sha256-qdxh86CkKdm65oHcRgaafTG9GUOoIgTDjeWmRofIpNE="; + hash = "sha256-/sKyHkFW5I5kojNIRPEKojzTvfRZiyVIN5VlBIbAV7k="; }; - patches = [ - # musl has no ldconfig, create symlinks explicitly - ./linux-no-ldconfig.patch - ]; postPatch = "patchShebangs tests/regress/check.sh"; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/applications/science/logic/yices/linux-no-ldconfig.patch b/pkgs/applications/science/logic/yices/linux-no-ldconfig.patch deleted file mode 100644 index bad3da6ad4a28..0000000000000 --- a/pkgs/applications/science/logic/yices/linux-no-ldconfig.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/Makefile.build -+++ b/Makefile.build -@@ -474,8 +474,9 @@ install-darwin: install-default - install-solaris: install-default - $(LDCONFIG) -n $(DESTDIR)$(libdir) && (cd $(DESTDIR)$(libdir) && $(LN_S) -f libyices.so.$(YICES_VERSION) libyices.so) - -+# avoid ldconfig as it's not present on musl - install-linux install-unix: install-default -- $(LDCONFIG) -n $(DESTDIR)$(libdir) && (cd $(DESTDIR)$(libdir) && $(LN_S) -f libyices.so.$(YICES_VERSION) libyices.so) -+ (cd $(DESTDIR)$(libdir) && $(LN_S) -f libyices.so.$(YICES_VERSION) libyices.so.$(MAJOR).$(MINOR) && $(LN_S) -f libyices.so.$(MAJOR).$(MINOR) libyices.so) - - # on FreeBSD: the library file is libyices.so.X.Y and ldconfig does not take -n - # TODO: fix this. We must also create a symbolic link: libyices.so.X in libdir diff --git a/pkgs/applications/science/logic/z3/default.nix b/pkgs/applications/science/logic/z3/default.nix index 2db1fc95f7974..a17cc5561cf21 100644 --- a/pkgs/applications/science/logic/z3/default.nix +++ b/pkgs/applications/science/logic/z3/default.nix @@ -16,8 +16,6 @@ assert javaBindings -> jdk != null; assert ocamlBindings -> ocaml != null && findlib != null && zarith != null; -with lib; - let common = { version, sha256, patches ? [ ], tag ? "z3" }: stdenv.mkDerivation rec { pname = "z3"; @@ -32,25 +30,25 @@ let common = { version, sha256, patches ? [ ], tag ? "z3" }: strictDeps = true; nativeBuildInputs = [ python ] - ++ optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames - ++ optional javaBindings jdk - ++ optionals ocamlBindings [ ocaml findlib ] + ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames + ++ lib.optional javaBindings jdk + ++ lib.optionals ocamlBindings [ ocaml findlib ] ; propagatedBuildInputs = [ python.pkgs.setuptools ] - ++ optionals ocamlBindings [ zarith ]; + ++ lib.optionals ocamlBindings [ zarith ]; enableParallelBuilding = true; - postPatch = optionalString ocamlBindings '' + postPatch = lib.optionalString ocamlBindings '' export OCAMLFIND_DESTDIR=$ocaml/lib/ocaml/${ocaml.version}/site-lib mkdir -p $OCAMLFIND_DESTDIR/stublibs ''; - configurePhase = concatStringsSep " " + configurePhase = lib.concatStringsSep " " ( [ "${python.pythonOnBuildForHost.interpreter} scripts/mk_make.py --prefix=$out" ] - ++ optional javaBindings "--java" - ++ optional ocamlBindings "--ml" - ++ optional pythonBindings "--python --pypkgdir=$out/${python.sitePackages}" + ++ lib.optional javaBindings "--java" + ++ lib.optional ocamlBindings "--ml" + ++ lib.optional pythonBindings "--python --pypkgdir=$out/${python.sitePackages}" ) + "\n" + "cd build"; doCheck = true; @@ -63,19 +61,19 @@ let common = { version, sha256, patches ? [ ], tag ? "z3" }: mkdir -p $dev $lib mv $out/lib $lib/lib mv $out/include $dev/include - '' + optionalString pythonBindings '' + '' + lib.optionalString pythonBindings '' mkdir -p $python/lib mv $lib/lib/python* $python/lib/ ln -sf $lib/lib/libz3${stdenv.hostPlatform.extensions.sharedLibrary} $python/${python.sitePackages}/z3/lib/libz3${stdenv.hostPlatform.extensions.sharedLibrary} - '' + optionalString javaBindings '' + '' + lib.optionalString javaBindings '' mkdir -p $java/share/java mv com.microsoft.z3.jar $java/share/java moveToOutput "lib/libz3java.${stdenv.hostPlatform.extensions.sharedLibrary}" "$java" ''; outputs = [ "out" "lib" "dev" "python" ] - ++ optional javaBindings "java" - ++ optional ocamlBindings "ocaml"; + ++ lib.optional javaBindings "java" + ++ lib.optional ocamlBindings "ocaml"; meta = with lib; { description = "High-performance theorem prover and SMT solver"; diff --git a/pkgs/applications/science/machine-learning/finalfrontier/default.nix b/pkgs/applications/science/machine-learning/finalfrontier/default.nix index 1a6e9351d3a79..ca495dcc280ac 100644 --- a/pkgs/applications/science/machine-learning/finalfrontier/default.nix +++ b/pkgs/applications/science/machine-learning/finalfrontier/default.nix @@ -20,14 +20,14 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-bnRzXIYairlBjv2JxU16UXYc5BB3VeKZNiJ4+XDzub4="; }; - cargoSha256 = "sha256-C/D9EPfifyajrCyXE8w/qRuzWEoyJJIcj4xii94/9l4="; + cargoHash = "sha256-C/D9EPfifyajrCyXE8w/qRuzWEoyJJIcj4xii94/9l4="; nativeBuildInputs = [ installShellFiles pkg-config ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ + buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv Security ]; @@ -47,6 +47,6 @@ rustPlatform.buildRustPackage rec { mainProgram = "finalfrontier"; homepage = "https://github.com/finalfusion/finalfrontier/"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/science/machine-learning/finalfusion-utils/default.nix b/pkgs/applications/science/machine-learning/finalfusion-utils/default.nix index 0df8a0525be51..2b3bd2776089d 100644 --- a/pkgs/applications/science/machine-learning/finalfusion-utils/default.nix +++ b/pkgs/applications/science/machine-learning/finalfusion-utils/default.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-suzivynlgk4VvDOC2dQR40n5IJHoJ736+ObdrM9dIqE="; }; - cargoSha256 = "sha256-HekjmctuzOWs5k/ihhsV8vVkm6906jEnFf3yvhkrA5Y="; + cargoHash = "sha256-HekjmctuzOWs5k/ihhsV8vVkm6906jEnFf3yvhkrA5Y="; nativeBuildInputs = [ installShellFiles ]; @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { gfortran.cc.lib lapack openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; @@ -49,7 +49,7 @@ rustPlatform.buildRustPackage rec { description = "Utility for converting, quantizing, and querying word embeddings"; homepage = "https://github.com/finalfusion/finalfusion-utils/"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; mainProgram = "finalfusion"; }; } diff --git a/pkgs/applications/science/machine-learning/sc2-headless/default.nix b/pkgs/applications/science/machine-learning/sc2-headless/default.nix index d96d71695e757..37128ce67e39d 100644 --- a/pkgs/applications/science/machine-learning/sc2-headless/default.nix +++ b/pkgs/applications/science/machine-learning/sc2-headless/default.nix @@ -57,6 +57,6 @@ in stdenv.mkDerivation rec { url = "https://blzdistsc2-a.akamaihd.net/AI_AND_MACHINE_LEARNING_LICENSE.html"; free = false; }; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/science/machine-learning/shogun/default.nix b/pkgs/applications/science/machine-learning/shogun/default.nix index 1e317fdec03e3..75bd2278d6069 100644 --- a/pkgs/applications/science/machine-learning/shogun/default.nix +++ b/pkgs/applications/science/machine-learning/shogun/default.nix @@ -53,7 +53,7 @@ let owner = "shogun-toolbox"; repo = "shogun"; rev = "shogun_${version}"; - sha256 = "sha256-38aULxK50wQ2+/ERosSpRyBmssmYSGv5aaWfWSlrSRc="; + hash = "sha256-38aULxK50wQ2+/ERosSpRyBmssmYSGv5aaWfWSlrSRc="; fetchSubmodules = true; }; diff --git a/pkgs/applications/science/machine-learning/starspace/default.nix b/pkgs/applications/science/machine-learning/starspace/default.nix deleted file mode 100644 index f4ca74ef5bbf1..0000000000000 --- a/pkgs/applications/science/machine-learning/starspace/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, boost, zlib }: - -stdenv.mkDerivation rec { - pname = "starspace"; - version = "unstable-2019-12-13"; - - src = fetchFromGitHub { - owner = "facebookresearch"; - repo = pname; - rev = "8aee0a950aa607c023e5c91cff518bec335b5df5"; - sha256 = "0sc7a37z1skb9377a1qs8ggwrkz0nmpybx7sms38xj05b702kbvj"; - }; - - buildInputs = [ boost zlib ]; - - makeFlags = [ - "CXX=${stdenv.cc.targetPrefix}c++" - "BOOST_DIR=${boost.dev}/include" - ]; - - preBuild = '' - cp makefile_compress makefile - ''; - - installPhase = '' - mkdir -p $out/bin - mv starspace $out/bin - ''; - - meta = with lib; { - # Does not build against gcc-13. No development activity upstream - # for past few years. - broken = true; - description = "General-purpose neural model for efficient learning of entity embeddings"; - homepage = "https://ai.facebook.com/tools/starspace/"; - license = licenses.mit; - platforms = platforms.unix; - maintainers = [ maintainers.mausch ]; - }; -} diff --git a/pkgs/applications/science/machine-learning/uarmsolver/default.nix b/pkgs/applications/science/machine-learning/uarmsolver/default.nix index 12bca5531364a..2f24f782927bc 100644 --- a/pkgs/applications/science/machine-learning/uarmsolver/default.nix +++ b/pkgs/applications/science/machine-learning/uarmsolver/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "uarmsolver"; - version = "0.2.6"; + version = "0.3.0"; src = fetchFromGitHub { owner = "firefly-cpp"; repo = "uARMSolver"; rev = version; - sha256 = "sha256-E8hc7qoIDaNERMUhVlh+iBvQX1odzd/szeMSh8TCNFo="; + sha256 = "sha256-IMlh6Y5iVouMZatR1uxw0gUNZBdh2qm56s+GEjcr1+M="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/science/math/4ti2/default.nix b/pkgs/applications/science/math/4ti2/default.nix deleted file mode 100644 index 940e2e45d5acf..0000000000000 --- a/pkgs/applications/science/math/4ti2/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, autoreconfHook -, glpk -, gmp -}: - -stdenv.mkDerivation rec{ - pname = "4ti2"; - version = "1.6.10"; - - src = fetchFromGitHub { - owner = pname; - repo = pname; - rev = "Release_${builtins.replaceStrings ["."] ["_"] version}"; - hash = "sha256-Rz8O1Tf81kzpTGPq7dkZJvv444F1/VqKu7VuRvH59kQ="; - }; - - nativeBuildInputs = [ - autoreconfHook - ]; - - buildInputs = [ - glpk - gmp - ]; - - installFlags = [ "install-exec" ]; - - meta = with lib;{ - homepage = "https://4ti2.github.io/"; - description = "Software package for algebraic, geometric and combinatorial problems on linear spaces"; - license = with licenses; [ gpl2Plus ]; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index b6fac3cca9e5a..f2825e13568a8 100644 --- a/pkgs/applications/science/math/R/default.nix +++ b/pkgs/applications/science/math/R/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { bzip2 gfortran libX11 libXmu libXt libXt libjpeg libpng libtiff ncurses pango pcre2 perl readline (texliveSmall.withPackages (ps: with ps; [ inconsolata helvetic ps.texinfo fancyvrb cm-super rsfs ])) xz zlib less texinfo graphviz icu bison imake which blas lapack curl tcl tk jdk tzdata - ] ++ lib.optionals stdenv.isDarwin [ Cocoa Foundation libobjc libcxx ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa Foundation libobjc libcxx ]; patches = [ ./no-usr-local-search-paths.patch @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { # Test of the examples for package 'tcltk' fails in Darwin sandbox. See: # https://github.com/NixOS/nixpkgs/issues/146131 - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace configure \ --replace "-install_name libRblas.dylib" "-install_name $out/lib/R/lib/libRblas.dylib" \ --replace "-install_name libRlapack.dylib" "-install_name $out/lib/R/lib/libRlapack.dylib" \ @@ -77,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: { RANLIB=$(type -p ranlib) r_cv_have_curl728=yes R_SHELL="${stdenv.shell}" - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' --disable-R-framework --without-x OBJC="clang" diff --git a/pkgs/applications/science/math/bcal/default.nix b/pkgs/applications/science/math/bcal/default.nix index 9ba028d1cb650..6e87136170c64 100644 --- a/pkgs/applications/science/math/bcal/default.nix +++ b/pkgs/applications/science/math/bcal/default.nix @@ -33,6 +33,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/jarun/bcal"; license = licenses.gpl3Only; platforms = platforms.unix; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/science/math/caffe/default.nix b/pkgs/applications/science/math/caffe/default.nix index 2a84d4b27b141..f82cef9d881cb 100644 --- a/pkgs/applications/science/math/caffe/default.nix +++ b/pkgs/applications/science/math/caffe/default.nix @@ -73,14 +73,14 @@ stdenv.mkDerivation rec { ++ lib.optional ncclSupport nccl ++ lib.optionals leveldbSupport [ leveldb snappy ] ++ lib.optionals pythonSupport [ python numpy ] - ++ lib.optionals stdenv.isDarwin [ Accelerate CoreGraphics CoreVideo ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Accelerate CoreGraphics CoreVideo ] ; propagatedBuildInputs = lib.optionals pythonSupport ( # requirements.txt let pp = python.pkgs; in ([ pp.numpy pp.scipy pp.scikit-image pp.h5py - pp.matplotlib pp.ipython pp.networkx pp.nose + pp.matplotlib pp.ipython pp.networkx pp.pandas pp.python-dateutil pp.protobuf pp.gflags pp.pyyaml pp.pillow pp.six ] ++ lib.optional leveldbSupport pp.leveldb) @@ -147,7 +147,7 @@ stdenv.mkDerivation rec { Center (BVLC) and by community contributors. ''; homepage = "http://caffe.berkeleyvision.org/"; - maintainers = with maintainers; [ ]; + maintainers = [ ]; broken = (pythonSupport && (python.isPy310)) || cudaSupport diff --git a/pkgs/applications/science/math/cbc/default.nix b/pkgs/applications/science/math/cbc/default.nix index aa979a78cb485..dbe7b6d241ab5 100644 --- a/pkgs/applications/science/math/cbc/default.nix +++ b/pkgs/applications/science/math/cbc/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://projects.coin-or.org/Cbc"; license = lib.licenses.epl10; - maintainers = [ lib.maintainers.eelco ]; + maintainers = [ ]; platforms = lib.platforms.linux ++ lib.platforms.darwin; description = "Mixed integer programming solver"; }; diff --git a/pkgs/applications/science/math/cemu-ti/default.nix b/pkgs/applications/science/math/cemu-ti/default.nix index c8d5bea6f602e..547b57b312dbf 100644 --- a/pkgs/applications/science/math/cemu-ti/default.nix +++ b/pkgs/applications/science/math/cemu-ti/default.nix @@ -1,39 +1,39 @@ { stdenv , lib , fetchFromGitHub -, qmake +, cmake , pkg-config -, wrapQtAppsHook +, qt6 , libarchive , libpng }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "CEmu"; - version = "unstable-2022-06-29"; + version = "2.0"; src = fetchFromGitHub { owner = "CE-Programming"; repo = "CEmu"; - rev = "880d391ba9f8b7b2ec36ab9b45a34e9ecbf744e9"; - hash = "sha256-aFwGZJceh1jEP8cEajY5wYlSaFuNhYvSoZ/E1QDfJEI="; + rev = "v${finalAttrs.version}"; + hash = "sha256-fohsIJrvPDMmYHoPbmYQlKLMnj/B3XEBaerZYuqxvd8="; fetchSubmodules = true; }; + sourceRoot = "${finalAttrs.src.name}/gui/qt/"; + + nativeBuildInputs = [ - qmake - wrapQtAppsHook + cmake + qt6.wrapQtAppsHook pkg-config ]; buildInputs = [ + qt6.qtbase libarchive libpng ]; - qmakeFlags = [ - "gui/qt" - ]; - meta = with lib; { description = "Third-party TI-84 Plus CE / TI-83 Premium CE emulator, focused on developer features"; mainProgram = "CEmu"; @@ -41,6 +41,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ luc65r ]; platforms = [ "x86_64-linux" "x86_64-darwin" ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; -} +}) diff --git a/pkgs/applications/science/math/colpack/default.nix b/pkgs/applications/science/math/colpack/default.nix index 768366cc5d7a5..591ac3281e5e8 100644 --- a/pkgs/applications/science/math/colpack/default.nix +++ b/pkgs/applications/science/math/colpack/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; configureFlags = [ - "--enable-openmp=${if stdenv.isLinux then "yes" else "no"}" + "--enable-openmp=${if stdenv.hostPlatform.isLinux then "yes" else "no"}" "--enable-examples=no" ]; diff --git a/pkgs/applications/science/math/cplex/default.nix b/pkgs/applications/science/math/cplex/default.nix index ddc950b30664b..e80444b70b275 100644 --- a/pkgs/applications/science/math/cplex/default.nix +++ b/pkgs/applications/science/math/cplex/default.nix @@ -9,14 +9,14 @@ stdenv.mkDerivation rec { pname = "cplex"; - version = "128"; + version = "22.11"; src = if releasePath == null then throw '' This nix expression requires that the cplex installer is already downloaded to your machine. Get it from IBM: - https://developer.ibm.com/docloud/blog/2017/12/20/cplex-optimization-studio-12-8-now-available/ + https://www.ibm.com/support/pages/downloading-ibm-ilog-cplex-optimization-studio-2211 Set `cplex.releasePath = /path/to/download;` in your ~/.config/nixpkgs/config.nix for `nix-*` commands, or @@ -36,7 +36,8 @@ stdenv.mkDerivation rec { ''; buildPhase = '' - sh $name -i silent -DLICENSE_ACCEPTED=TRUE -DUSER_INSTALL_DIR=$out + export JAVA_TOOL_OPTIONS=-Djdk.util.zip.disableZip64ExtraFieldValidation=true + sh $name LAX_VM ${openjdk}/bin/java -i silent -DLICENSE_ACCEPTED=TRUE -DUSER_INSTALL_DIR=$out ''; installPhase = '' diff --git a/pkgs/applications/science/math/dap/default.nix b/pkgs/applications/science/math/dap/default.nix deleted file mode 100644 index 40ce12f66ebd0..0000000000000 --- a/pkgs/applications/science/math/dap/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib -, stdenv -, fetchurl -}: - -stdenv.mkDerivation rec { - pname = "dap"; - version = "3.10"; - - src = fetchurl { - url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz"; - sha256 = "Bk5sty/438jLb1PpurMQ5OqMbr6JqUuuQjcg2bejh2Y="; - }; - - hardeningDisable = [ "format" ]; - - meta = with lib; { - homepage = "https://www.gnu.org/software/dap"; - description = "Small statistics and graphics package based on C"; - longDescription = '' - Dap is a small statistics and graphics package based on C. Version 3.0 and - later of Dap can read SBS programs (based on the utterly famous, industry - standard statistics system with similar initials - you know the one I - mean)! The user wishing to perform basic statistical analyses is now freed - from learning and using C syntax for straightforward tasks, while - retaining access to the C-style graphics and statistics features provided - by the original implementation. Dap provides core methods of data - management, analysis, and graphics that are commonly used in statistical - consulting practice (univariate statistics, correlations and regression, - ANOVA, categorical data analysis, logistic regression, and nonparametric - analyses). - ''; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/applications/science/math/ecm/default.nix b/pkgs/applications/science/math/ecm/default.nix index 222db0e98e6a5..ed1c07d87ec1a 100644 --- a/pkgs/applications/science/math/ecm/default.nix +++ b/pkgs/applications/science/math/ecm/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { }; # See https://trac.sagemath.org/ticket/19233 - configureFlags = lib.optional stdenv.isDarwin "--disable-asm-redc"; + configureFlags = lib.optional stdenv.hostPlatform.isDarwin "--disable-asm-redc"; buildInputs = [ m4 gmp ]; diff --git a/pkgs/applications/science/math/eigenmath/default.nix b/pkgs/applications/science/math/eigenmath/default.nix index a120de87b9ff1..8a3ff56e1f6b9 100644 --- a/pkgs/applications/science/math/eigenmath/default.nix +++ b/pkgs/applications/science/math/eigenmath/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "eigenmath"; - version = "3.27-unstable-2024-06-20"; + version = "3.27-unstable-2024-09-15"; src = fetchFromGitHub { owner = "georgeweigt"; repo = pname; - rev = "c3e3da104dbef888c3e52659134d5e9bdc12764d"; - hash = "sha256-fqCphnRQw79v7ZTCZU9ucm/R7BKY7yCZYDSnxD7uRS8="; + rev = "ba00d77289f1c9ce64108b1bbcee02c71ce48633"; + hash = "sha256-yFzsMNVjQK64uQSfjQKC8LbdQu7/97hDolRMBc4Womc="; }; checkPhase = let emulator = stdenv.hostPlatform.emulator buildPackages; in '' 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/gap/default.nix b/pkgs/applications/science/math/gap/default.nix index 7a466f8c000c5..697a19d6afa19 100644 --- a/pkgs/applications/science/math/gap/default.nix +++ b/pkgs/applications/science/math/gap/default.nix @@ -1,5 +1,6 @@ { stdenv , lib +, fetchpatch , fetchurl , makeWrapper , readline @@ -73,6 +74,13 @@ stdenv.mkDerivation rec { sha256 = "sha256-ZyMIdF63iiIklO6N1nhu3VvDMUVvzGRWrAZL2yjVh6g="; }; + patches = [ + (fetchpatch { + url = "https://github.com/gap-system/gap/commit/c786e229413a44b7462196716b99ae9bb0071f4c.patch"; + hash = "sha256-g3jrEMSavHAUKlHoPqWmOw49hWHU+29SA788Klnr0Uw="; + }) + ]; + # remove all non-essential packages (which take up a lot of space) preConfigure = lib.optionalString (!keepAll) (removeNonWhitelistedPkgs packagesToKeep) + '' patchShebangs . diff --git a/pkgs/applications/science/math/geogebra/default.nix b/pkgs/applications/science/math/geogebra/default.nix index 5fa4862bb9b40..1d5fa4a9ef450 100644 --- a/pkgs/applications/science/math/geogebra/default.nix +++ b/pkgs/applications/science/math/geogebra/default.nix @@ -95,6 +95,6 @@ let ''; }; in -if stdenv.isDarwin +if stdenv.hostPlatform.isDarwin then darwinPkg else linuxPkg diff --git a/pkgs/applications/science/math/geogebra/geogebra6.nix b/pkgs/applications/science/math/geogebra/geogebra6.nix index 38b668804ad16..d57175daff93e 100644 --- a/pkgs/applications/science/math/geogebra/geogebra6.nix +++ b/pkgs/applications/science/math/geogebra/geogebra6.nix @@ -1,4 +1,12 @@ -{ lib, stdenv, unzip, fetchurl, electron, makeWrapper, geogebra }: +{ + lib, + stdenv, + unzip, + fetchurl, + electron, + makeWrapper, + geogebra, +}: let pname = "geogebra"; version = "6-0-794-0"; @@ -14,14 +22,17 @@ let calculus in one easy-to-use package. ''; homepage = "https://www.geogebra.org/"; - maintainers = with maintainers; [ voidless sikmir ]; + maintainers = with maintainers; [ + voidless + sikmir + ]; license = licenses.geogebra; sourceProvenance = with sourceTypes; [ binaryBytecode - binaryNativeCode # some jars include native binaries + binaryNativeCode # some jars include native binaries ]; platforms = with platforms; linux ++ darwin; - hydraPlatforms = []; + hydraPlatforms = [ ]; }; linuxPkg = stdenv.mkDerivation { @@ -50,7 +61,9 @@ let installPhase = '' mkdir -p $out/libexec/geogebra/ $out/bin cp -r GeoGebra-linux-x64/{resources,locales} "$out/" - makeWrapper ${lib.getBin electron}/bin/electron $out/bin/geogebra --add-flags "$out/resources/app" + makeWrapper ${lib.getBin electron}/bin/electron $out/bin/geogebra \ + --add-flags "$out/resources/app" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" install -Dm644 "${desktopItem}/share/applications/"* \ -t $out/share/applications/ @@ -84,6 +97,4 @@ let }; }; in -if stdenv.isDarwin -then darwinPkg -else linuxPkg +if stdenv.hostPlatform.isDarwin then darwinPkg else linuxPkg diff --git a/pkgs/applications/science/math/getdp/default.nix b/pkgs/applications/science/math/getdp/default.nix index 8accf9d76725a..30a5837c3111d 100644 --- a/pkgs/applications/science/math/getdp/default.nix +++ b/pkgs/applications/science/math/getdp/default.nix @@ -1,6 +1,8 @@ { lib, stdenv, fetchurl, cmake, gfortran, blas, lapack, mpi, petsc, python3 }: -stdenv.mkDerivation rec { +let + mpiSupport = petsc.passthru.mpiSupport; +in stdenv.mkDerivation rec { pname = "getdp"; version = "3.6.0"; src = fetchurl { @@ -8,7 +10,6 @@ stdenv.mkDerivation rec { hash = "sha256-nzefwCV+Z9BHDofuTfhR+vhqm3cCSiUT+7cbtn601N8="; }; - inherit (petsc) mpiSupport; nativeBuildInputs = [ cmake python3 ]; buildInputs = [ gfortran blas lapack petsc ] ++ lib.optional mpiSupport mpi @@ -27,7 +28,7 @@ stdenv.mkDerivation rec { ''; homepage = "http://getdp.info/"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/science/math/gfan/default.nix b/pkgs/applications/science/math/gfan/default.nix index ee1fce783d265..531a30e3f857f 100644 --- a/pkgs/applications/science/math/gfan/default.nix +++ b/pkgs/applications/science/math/gfan/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, gmp, mpir, cddlib}: +{lib, stdenv, fetchpatch, fetchurl, gmp, mpir, cddlib}: stdenv.mkDerivation rec { pname = "gfan"; version = "0.6.2"; @@ -10,6 +10,12 @@ stdenv.mkDerivation rec { patches = [ ./gfan-0.6.2-cddlib-prefix.patch + ] ++ lib.optionals (stdenv.cc.isClang) [ + (fetchpatch { + name = "clang-fix-miscompilation.patch"; + url = "https://raw.githubusercontent.com/sagemath/sage/eea1f59394a5066e9acd8ae39a90302820914ee3/build/pkgs/gfan/patches/nodel.patch"; + sha256 = "sha256-RrncSgFyrBIk/Bwe3accxiJ2rpOSJKQ84cV/uBvQsDc="; + }) ]; postPatch = lib.optionalString stdenv.cc.isClang '' diff --git a/pkgs/applications/science/math/giac/default.nix b/pkgs/applications/science/math/giac/default.nix index 834ae7b3d61f3..ce009975c1ba1 100644 --- a/pkgs/applications/science/math/giac/default.nix +++ b/pkgs/applications/science/math/giac/default.nix @@ -9,18 +9,30 @@ assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "giac${lib.optionalString enableGUI "-with-xcas"}"; - version = "1.9.0-43"; # TODO try to remove preCheck phase on upgrade + version = "1.9.0-993"; # TODO try to remove preCheck phase on upgrade src = fetchurl { url = "https://www-fourier.ujf-grenoble.fr/~parisse/debian/dists/stable/main/source/giac_${version}.tar.gz"; - sha256 = "sha256-466jB8ZRqHkU5XCY+j0Fh7Dq/mMaOu10rHECKbtNGrs="; + sha256 = "sha256-pqytFWrSWfEwQqRdRbaigGCq68s8mdgj2j8M+kclslE="; }; patches = [ + ./remove-old-functional-patterns.patch + ./fix-fltk-guard.patch + + (fetchpatch { + name = "pari_2_15.patch"; + url = "https://raw.githubusercontent.com/sagemath/sage/07a2afd65fb4b0a1c9cbc43ede7d4a18c921a000/build/pkgs/giac/patches/pari_2_15.patch"; + sha256 = "sha256-Q3xBFED7XEAyNz6AHjzt63XtospmdGAIdS6iPq1C2UE="; + }) + (fetchpatch { - name = "pari_2_11.patch"; - url = "https://raw.githubusercontent.com/sagemath/sage/21ba7540d385a9864b44850d6987893dfa16bfc0/build/pkgs/giac/patches/pari_2_11.patch"; - sha256 = "sha256-vEo/5MNzMdYRPWgLFPsDcMT1W80Qzj4EPBjx/B8j68k="; + name = "infinity.patch"; + url = "https://github.com/geogebra/giac/commit/851c2cd91e879c79d6652f8a5d5bed03b65c6d39.patch"; + sha256 = "sha256-WJRT2b8I9kgAkRuIugMiXoF4hT7yR7qyad8A6IspNTM="; + stripLen = 5; + extraPrefix = "/src/"; + excludes = [ "src/kdisplay.cc" ]; }) # giac calls scanf/printf with non-constant first arguments, which @@ -31,8 +43,12 @@ stdenv.mkDerivation rec { sha256 = "sha256-r+M+9MRPRqhHcdhYWI6inxyNvWbXUbBcPCeDY7aulvk="; }) - # increase pari stack size for test chk_fhan{4,6} - ./increase-pari-stack-size.patch + # issue with include path precedence + (fetchpatch { + name = "fix_implicit_declaration.patch"; + url = "https://salsa.debian.org/science-team/giac/-/raw/c05ae9b9e74d3c6ee6411d391071989426a76201/debian/patches/fix_implicit_declaration.patch"; + sha256 = "sha256-ompUceYJLiL0ftfjBkIMcYvX1YqG2/XA7e1yDyFY0IY="; + }) ] ++ lib.optionals (!enableGUI) [ # when enableGui is false, giac is compiled without fltk. That # means some outputs differ in the make check. Patch around this: @@ -86,6 +102,12 @@ stdenv.mkDerivation rec { # when fltk is disabled. disable these tests for now. echo > check/chk_fhan2 echo > check/chk_fhan9 + '' + lib.optionalString (stdenv.hostPlatform.isDarwin) '' + # these cover a known regression in giac, likely due to how pari state + # is shared between multiple giac instances (see pari.cc.old). + # see https://github.com/NixOS/nixpkgs/pull/264126 for more information + echo > check/chk_fhan4 + echo > check/chk_fhan6 ''; enableParallelBuilding = true; @@ -96,6 +118,8 @@ stdenv.mkDerivation rec { "--enable-ao" "--enable-ecm" "--enable-glpk" ] ++ lib.optionals enableGUI [ "--enable-gui" "--with-x" + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + "--disable-nls" ] ++ lib.optionals (!enableGUI) [ "--disable-fltk" ] ++ lib.optionals (!enableMicroPy) [ @@ -129,7 +153,6 @@ stdenv.mkDerivation rec { homepage = "https://www-fourier.ujf-grenoble.fr/~parisse/giac.html"; license = licenses.gpl3Plus; platforms = platforms.linux ++ (optionals (!enableGUI) platforms.darwin); - broken = stdenv.isDarwin && stdenv.isAarch64; maintainers = [ maintainers.symphorien ]; }; } diff --git a/pkgs/applications/science/math/giac/fix-fltk-guard.patch b/pkgs/applications/science/math/giac/fix-fltk-guard.patch new file mode 100644 index 0000000000000..a9c8e5bbaab8d --- /dev/null +++ b/pkgs/applications/science/math/giac/fix-fltk-guard.patch @@ -0,0 +1,28 @@ +From c7eafa2d7bde0d735b125912542acec2d5896c17 Mon Sep 17 00:00:00 2001 +From: George Huebner <george@feyor.sh> +Date: Sat, 20 Jul 2024 02:31:20 -0500 +Subject: [PATCH 3/4] remove erroneous HAVE_LIBFLTK guard + +--- + src/icas.cc | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/src/icas.cc b/src/icas.cc +index f91885b..17a0373 100644 +--- a/src/icas.cc ++++ b/src/icas.cc +@@ -2407,11 +2407,7 @@ int main(int ARGC, char *ARGV[]){ + #ifdef __APPLE__ + startc=clock(); + #endif +-#ifdef HAVE_LIBFLTK + xcas::icas_eval(gq,e,reading_file,filename,contextptr); +-#else +- e=eval(gq,1,contextptr); +-#endif + #ifdef __APPLE__ + startc=clock()-startc; + #endif +-- +2.44.1 + diff --git a/pkgs/applications/science/math/giac/increase-pari-stack-size.patch b/pkgs/applications/science/math/giac/increase-pari-stack-size.patch deleted file mode 100644 index b12b4b7fad660..0000000000000 --- a/pkgs/applications/science/math/giac/increase-pari-stack-size.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -ur a/check/chk_fhan4 b/check/chk_fhan4 ---- a/check/chk_fhan4 2018-03-13 19:27:11.000000000 +0100 -+++ b/check/chk_fhan4 2023-05-20 16:31:30.349063063 +0200 -@@ -1,4 +1,5 @@ - #! /bin/sh - unset LANG -+export PARI_SIZE=2048000 - ../src/icas TP04-sol.cas > TP04.tst - diff TP04.tst TP04-sol.cas.out1 -diff -ur a/check/chk_fhan6 b/check/chk_fhan6 ---- a/check/chk_fhan6 2018-03-13 19:27:21.000000000 +0100 -+++ b/check/chk_fhan6 2023-05-20 16:32:04.199407065 +0200 -@@ -1,4 +1,5 @@ - #! /bin/sh - unset LANG -+export PARI_SIZE=2048000 - ../src/icas TP06-sol.cas > TP06.tst - diff TP06.tst TP06-sol.cas.out1 diff --git a/pkgs/applications/science/math/giac/remove-old-functional-patterns.patch b/pkgs/applications/science/math/giac/remove-old-functional-patterns.patch new file mode 100644 index 0000000000000..95f6efe119fcb --- /dev/null +++ b/pkgs/applications/science/math/giac/remove-old-functional-patterns.patch @@ -0,0 +1,294 @@ +From f1c5309d5b815acc2616cd9fbb5182b1e64d225f Mon Sep 17 00:00:00 2001 +From: George Huebner <george@feyor.sh> +Date: Wed, 17 Jul 2024 18:12:36 -0500 +Subject: [PATCH 1/4] remove old <functional> patterns + +pointer_to_binary_function and ptr_fun are holdovers from pre c++11, +and can be replaced or entirely removed. This allows Giac to compile +with Clang 16>=. +--- + src/all_global_var | 2 +- + src/gausspol.cc | 2 +- + src/gausspol.h | 2 +- + src/gen.cc | 2 +- + src/gen.h | 4 ++-- + src/maple.cc | 2 +- + src/monomial.h | 16 ++++++++-------- + src/plot.cc | 2 +- + src/poly.h | 17 +++++++++-------- + src/solve.cc | 18 +++++++++--------- + src/usual.cc | 2 +- + 11 files changed, 35 insertions(+), 34 deletions(-) + +diff --git a/src/all_global_var b/src/all_global_var +index 7d75d73..55f4782 100644 +--- a/src/all_global_var ++++ b/src/all_global_var +@@ -16,7 +16,7 @@ Relatif a l'evaluation du tableur + // File Eqw.cc + vector<string> completion_tab; + // File alg_ext.cc +- rootmap symbolic_rootof_list(ptr_fun(islesscomplex)); ++ rootmap symbolic_rootof_list(islesscomplex); + // File derive.cc + // File desolve.cc + identificateur laplace_var(" s"); +diff --git a/src/gausspol.cc b/src/gausspol.cc +index 8fbd581..2f2121f 100644 +--- a/src/gausspol.cc ++++ b/src/gausspol.cc +@@ -855,7 +855,7 @@ namespace giac { + std::vector< monomial<gen> >::const_iterator & itb_end, + std::vector< monomial<gen> > & new_coord, + bool (* is_strictly_greater)( const index_m &, const index_m &), +- const std::pointer_to_binary_function < const monomial<gen> &, const monomial<gen> &, bool> m_is_strictly_greater ++ const std::function<bool(const monomial<gen> &, const monomial<gen> &)> m_is_strictly_greater + ) { + if (ita==ita_end || itb==itb_end){ + new_coord.clear(); +diff --git a/src/gausspol.h b/src/gausspol.h +index b5d214b..e6c7e0c 100644 +--- a/src/gausspol.h ++++ b/src/gausspol.h +@@ -93,7 +93,7 @@ namespace giac { + std::vector< monomial<gen> >::const_iterator & itb_end, + std::vector< monomial<gen> > & new_coord, + bool (* is_strictly_greater)( const index_t &, const index_t &), +- const std::pointer_to_binary_function < const monomial<gen> &, const monomial<gen> &, bool> m_is_greater ++ const std::function<bool(const monomial<gen> &, const monomial<gen> &)> m_is_greater + ) ; + void mulpoly(const polynome & th,const gen & fact,polynome & res); + polynome operator * (const polynome & th, const gen & fact) ; +diff --git a/src/gen.cc b/src/gen.cc +index 7d4874c..0b64afe 100644 +--- a/src/gen.cc ++++ b/src/gen.cc +@@ -1126,7 +1126,7 @@ namespace giac { + #if 1 // def NSPIRE + g.__MAPptr = new ref_gen_map; + #else +- g.__MAPptr = new ref_gen_map(ptr_fun(islesscomplexthanf)); ++ g.__MAPptr = new ref_gen_map(islesscomplexthanf); + #endif + #endif + g.type=_MAP; +diff --git a/src/gen.h b/src/gen.h +index 04d70af..496b25d 100644 +--- a/src/gen.h ++++ b/src/gen.h +@@ -443,7 +443,7 @@ namespace giac { + }; + typedef std::map<gen,gen,comparegen> gen_map; + #else +- typedef std::map<gen,gen,const std::pointer_to_binary_function < const gen &, const gen &, bool> > gen_map; ++ typedef std::map<gen,gen,const std::function<bool(const gen &, const gen &)> > gen_map; + #endif + struct ref_gen_map; + +@@ -902,7 +902,7 @@ namespace giac { + #if 1 // def NSPIRE + ref_gen_map(): ref_count(1),m() {} + #else +- ref_gen_map(const std::pointer_to_binary_function < const gen &, const gen &, bool> & p): ref_count(1),m(p) {} ++ ref_gen_map(const std::function<bool(const gen &, const gen &)> & p): ref_count(1),m(p) {} + #endif + ref_gen_map(const gen_map & M):ref_count(1),m(M) {} + }; +diff --git a/src/maple.cc b/src/maple.cc +index 3b33da8..d57a170 100644 +--- a/src/maple.cc ++++ b/src/maple.cc +@@ -3626,7 +3626,7 @@ namespace giac { + #if 1 // def NSPIRE + gen_map m; + #else +- gen_map m(ptr_fun(islessthanf)); ++ gen_map m(islessthanf); + #endif + int s=int(args.size()); + vector<int> indexbegin,indexsize; +diff --git a/src/monomial.h b/src/monomial.h +index 6e606d0..637a76c 100644 +--- a/src/monomial.h ++++ b/src/monomial.h +@@ -338,9 +338,9 @@ namespace giac { + + template<class T> class sort_helper { + public: +- std::pointer_to_binary_function < const monomial<T> &, const monomial<T> &, bool> strictly_greater ; +- sort_helper(const std::pointer_to_binary_function < const monomial<T> &, const monomial<T> &, bool> is_strictly_greater):strictly_greater(is_strictly_greater) {}; +- sort_helper():strictly_greater(std::ptr_fun<const monomial<T> &, const monomial<T> &, bool>(m_lex_is_strictly_greater<T>)) {}; ++ std::function<bool(const monomial<T> &, const monomial<T> &)> strictly_greater ; ++ sort_helper(const std::function<bool(const monomial<T> &, const monomial<T> &)> is_strictly_greater):strictly_greater(is_strictly_greater) {}; ++ sort_helper():strictly_greater(m_lex_is_strictly_greater<T>) {}; + bool operator () (const monomial<T> & a, const monomial<T> & b){ return strictly_greater(a,b);} + }; + +@@ -677,7 +677,7 @@ namespace giac { + typename std::vector< monomial<T> >::const_iterator & itb_end, + std::vector< monomial<T> > & new_coord, + bool (* is_strictly_greater)( const index_m &, const index_m &), +- const std::pointer_to_binary_function < const monomial<T> &, const monomial<T> &, bool> m_is_strictly_greater ++ const std::function<bool(const monomial<T> &, const monomial<T> &)> m_is_strictly_greater + ) { + if (ita==ita_end || itb==itb_end){ + new_coord.clear(); +@@ -726,8 +726,8 @@ namespace giac { + #endif + #ifndef NSPIRE + /* other algorithm using a map to avoid reserving too much space */ +- typedef std::map< index_t,T,const std::pointer_to_binary_function < const index_m &, const index_m &, bool> > application; +- application produit(std::ptr_fun(is_strictly_greater)); ++ typedef std::map< index_t,T,const std::function<bool(const index_m &, const index_m &)> > application; ++ application produit(is_strictly_greater); + // typedef std::map<index_t,T> application; + // application produit; + index_t somme(ita->index.size()); +@@ -848,7 +848,7 @@ namespace giac { + typename std::vector< monomial<T> >::const_iterator a=v.begin(), a_end=v.end(); + typename std::vector< monomial<T> >::const_iterator b=w.begin(), b_end=w.end(); + std::vector< monomial<T> > res; +- Mul(a,a_end,b,b_end,res,i_lex_is_strictly_greater,std::ptr_fun< const monomial<T> &, const monomial<T> &, bool >((m_lex_is_strictly_greater<T>))); ++ Mul(a,a_end,b,b_end,res,i_lex_is_strictly_greater,m_lex_is_strictly_greater<T>); + return res ; + } + +@@ -856,7 +856,7 @@ namespace giac { + std::vector< monomial<T> > & operator *= (std::vector< monomial<T> > & v,const std::vector< monomial<T> > & w){ + typename std::vector< monomial<T> >::const_iterator a=v.begin(), a_end=v.end(); + typename std::vector< monomial<T> >::const_iterator b=w.begin(), b_end=w.end(); +- Mul(a,a_end,b,b_end,v,i_lex_is_strictly_greater,std::ptr_fun< const monomial<T> &, const monomial<T> &, bool >((m_lex_is_strictly_greater<T>))); ++ Mul(a,a_end,b,b_end,v,i_lex_is_strictly_greater,m_lex_is_strictly_greater<T>); + return v; + } + +diff --git a/src/plot.cc b/src/plot.cc +index 288a1b5..ac85c9a 100755 +--- a/src/plot.cc ++++ b/src/plot.cc +@@ -11886,7 +11886,7 @@ static vecteur densityscale(double xmin,double xmax,double ymin,double ymax,doub + #if 1 // def NSPIRE + gen_map m; + #else +- gen_map m(ptr_fun(islesscomplexthanf)); ++ gen_map m(islesscomplexthanf); + #endif + int taille; + is >> taille; +diff --git a/src/poly.h b/src/poly.h +index 7d64e2c..d9ff991 100644 +--- a/src/poly.h ++++ b/src/poly.h +@@ -40,23 +40,24 @@ namespace giac { + // T zero; + // functional object sorting function for monomial ordering + bool (* is_strictly_greater)( const index_m &, const index_m &); +- std::pointer_to_binary_function < const monomial<T> &, const monomial<T> &, bool> m_is_strictly_greater ; ++ std::function<bool(const monomial<T> &, const monomial<T> &)> m_is_strictly_greater ; + // constructors + tensor(const tensor<T> & t) : dim(t.dim), coord(t.coord), is_strictly_greater(t.is_strictly_greater), m_is_strictly_greater(t.m_is_strictly_greater) { } + tensor(const tensor<T> & t, const std::vector< monomial<T> > & v) : dim(t.dim), coord(v), is_strictly_greater(t.is_strictly_greater), m_is_strictly_greater(t.m_is_strictly_greater) { } + // warning: this constructor prohibits construction of tensor from a value + // of type T if this value is an int, except by using tensor<T>(T(int)) +- tensor() : dim(0), is_strictly_greater(i_lex_is_strictly_greater), m_is_strictly_greater(std::ptr_fun<const monomial<T> &, const monomial<T> &, bool>(m_lex_is_strictly_greater<T>)) { } +- explicit tensor(int d) : dim(d), is_strictly_greater(i_lex_is_strictly_greater), m_is_strictly_greater(std::ptr_fun<const monomial<T> &, const monomial<T> &, bool>(m_lex_is_strictly_greater<T>)) { } ++ // DANGER ++ tensor() : dim(0), is_strictly_greater(i_lex_is_strictly_greater), m_is_strictly_greater(m_lex_is_strictly_greater<T>) { } ++ explicit tensor(int d) : dim(d), is_strictly_greater(i_lex_is_strictly_greater), m_is_strictly_greater(m_lex_is_strictly_greater<T>) { } + explicit tensor(int d,const tensor<T> & t) : dim(d),is_strictly_greater(t.is_strictly_greater), m_is_strictly_greater(t.m_is_strictly_greater) { } +- tensor(const monomial<T> & v) : dim(int(v.index.size())), is_strictly_greater(i_lex_is_strictly_greater), m_is_strictly_greater(std::ptr_fun<const monomial<T> &, const monomial<T> &, bool>(m_lex_is_strictly_greater<T>)) { ++ tensor(const monomial<T> & v) : dim(int(v.index.size())), is_strictly_greater(i_lex_is_strictly_greater), m_is_strictly_greater(m_lex_is_strictly_greater<T>) { + coord.push_back(v); + } +- tensor(const T & v, int d) : dim(d), is_strictly_greater(i_lex_is_strictly_greater), m_is_strictly_greater(std::ptr_fun<const monomial<T> &, const monomial<T> &, bool>(m_lex_is_strictly_greater<T>)) { ++ tensor(const T & v, int d) : dim(d), is_strictly_greater(i_lex_is_strictly_greater), m_is_strictly_greater(m_lex_is_strictly_greater<T>) { + if (!is_zero(v)) + coord.push_back(monomial<T>(v,0,d)); + } +- tensor(int d,const std::vector< monomial<T> > & c) : dim(d), coord(c), is_strictly_greater(i_lex_is_strictly_greater),m_is_strictly_greater(std::ptr_fun<const monomial<T> &, const monomial<T> &, bool>(m_lex_is_strictly_greater<T>)) { } ++ tensor(int d,const std::vector< monomial<T> > & c) : dim(d), coord(c), is_strictly_greater(i_lex_is_strictly_greater),m_is_strictly_greater(m_lex_is_strictly_greater<T>) { } + ~tensor() { coord.clear(); } + // member functions + // ordering monomials in the tensor +@@ -519,10 +520,10 @@ namespace giac { + template <class T> + void lexsort(std::vector < monomial<T> > & v){ + #if 1 // def NSPIRE +- sort_helper<T> M(std::ptr_fun<const monomial<T> &, const monomial<T> &, bool>(m_lex_is_strictly_greater<T>)); ++ sort_helper<T> M(m_lex_is_strictly_greater<T>); + sort(v.begin(),v.end(),M); + #else +- sort(v.begin(),v.end(),std::ptr_fun<const monomial<T> &, const monomial<T> &, bool>(m_lex_is_strictly_greater<T>)); ++ sort(v.begin(),v.end(),m_lex_is_strictly_greater<T>); + #endif + } + +diff --git a/src/solve.cc b/src/solve.cc +index 889f824..2a51ab8 100755 +--- a/src/solve.cc ++++ b/src/solve.cc +@@ -8684,39 +8684,39 @@ namespace giac { + switch (order.val){ + case _PLEX_ORDER: + p.is_strictly_greater=i_lex_is_strictly_greater; +- p.m_is_strictly_greater=std::ptr_fun(m_lex_is_strictly_greater<gen>); ++ p.m_is_strictly_greater=m_lex_is_strictly_greater<gen>; + break; + case _REVLEX_ORDER: + p.is_strictly_greater=i_total_revlex_is_strictly_greater; +- p.m_is_strictly_greater=std::ptr_fun(m_total_revlex_is_strictly_greater<gen>); ++ p.m_is_strictly_greater=m_total_revlex_is_strictly_greater<gen>; + break; + case _TDEG_ORDER: + p.is_strictly_greater=i_total_lex_is_strictly_greater; +- p.m_is_strictly_greater=std::ptr_fun(m_total_lex_is_strictly_greater<gen>); ++ p.m_is_strictly_greater=m_total_lex_is_strictly_greater<gen>; + break; + case _3VAR_ORDER: + p.is_strictly_greater=i_3var_is_strictly_greater; +- p.m_is_strictly_greater=std::ptr_fun(m_3var_is_strictly_greater<gen>); ++ p.m_is_strictly_greater=m_3var_is_strictly_greater<gen>; + break; + case _7VAR_ORDER: + p.is_strictly_greater=i_7var_is_strictly_greater; +- p.m_is_strictly_greater=std::ptr_fun(m_7var_is_strictly_greater<gen>); ++ p.m_is_strictly_greater=m_7var_is_strictly_greater<gen>; + break; + case _11VAR_ORDER: + p.is_strictly_greater=i_11var_is_strictly_greater; +- p.m_is_strictly_greater=std::ptr_fun(m_11var_is_strictly_greater<gen>); ++ p.m_is_strictly_greater=m_11var_is_strictly_greater<gen>; + break; + case _16VAR_ORDER: + p.is_strictly_greater=i_16var_is_strictly_greater; +- p.m_is_strictly_greater=std::ptr_fun(m_16var_is_strictly_greater<gen>); ++ p.m_is_strictly_greater=m_16var_is_strictly_greater<gen>; + break; + case _32VAR_ORDER: + p.is_strictly_greater=i_32var_is_strictly_greater; +- p.m_is_strictly_greater=std::ptr_fun(m_32var_is_strictly_greater<gen>); ++ p.m_is_strictly_greater=m_32var_is_strictly_greater<gen>; + break; + case _64VAR_ORDER: + p.is_strictly_greater=i_64var_is_strictly_greater; +- p.m_is_strictly_greater=std::ptr_fun(m_64var_is_strictly_greater<gen>); ++ p.m_is_strictly_greater=m_64var_is_strictly_greater<gen>; + break; + } + p.tsort(); +diff --git a/src/usual.cc b/src/usual.cc +index fddede6..eb7ae5e 100755 +--- a/src/usual.cc ++++ b/src/usual.cc +@@ -5950,7 +5950,7 @@ namespace giac { + #if 1 // def NSPIRE + gen_map m; + #else +- gen_map m(ptr_fun(islesscomplexthanf)); ++ gen_map m(islesscomplexthanf); + #endif + for (;it!=itend;++it){ + if (is_equal(*it) || it->is_symb_of_sommet(at_deuxpoints)){ +-- +2.44.1 + diff --git a/pkgs/applications/science/math/ginac/default.nix b/pkgs/applications/science/math/ginac/default.nix index d9d12cbf388de..d2713befed382 100644 --- a/pkgs/applications/science/math/ginac/default.nix +++ b/pkgs/applications/science/math/ginac/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ cln ]; buildInputs = [ readline ] - ++ lib.optional stdenv.isDarwin gmp; + ++ lib.optional stdenv.hostPlatform.isDarwin gmp; nativeBuildInputs = [ pkg-config python3 ]; diff --git a/pkgs/applications/science/math/glsurf/default.nix b/pkgs/applications/science/math/glsurf/default.nix index 38caee5805b43..0edaa32babd70 100644 --- a/pkgs/applications/science/math/glsurf/default.nix +++ b/pkgs/applications/science/math/glsurf/default.nix @@ -5,7 +5,7 @@ , makeWrapper , libGLU , libGL -, freeglut +, libglut , mpfr , gmp , pkgsHostTarget @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ]); buildInputs = [ - freeglut + libglut libGL libGLU mpfr diff --git a/pkgs/applications/science/math/gmsh/default.nix b/pkgs/applications/science/math/gmsh/default.nix index 3e88e7f94bbe6..2219815824e7c 100644 --- a/pkgs/applications/science/math/gmsh/default.nix +++ b/pkgs/applications/science/math/gmsh/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ blas lapack gmm fltk libjpeg zlib opencascade-occt - ] ++ lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ libGL libGLU xorg.libXrender xorg.libXcursor xorg.libXfixes xorg.libXext xorg.libXft xorg.libXinerama xorg.libX11 xorg.libSM xorg.libICE diff --git a/pkgs/applications/science/math/gurobi/default.nix b/pkgs/applications/science/math/gurobi/default.nix index e8f4794d4179d..eff61579a5f99 100644 --- a/pkgs/applications/science/math/gurobi/default.nix +++ b/pkgs/applications/science/math/gurobi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gurobi"; - version = "11.0.2"; + version = "11.0.3"; src = fetchurl { url = "https://packages.gurobi.com/${lib.versions.majorMinor version}/gurobi${version}_linux64.tar.gz"; - hash = "sha256-9DrIo+25h7mgphRSrNnY2+nrNzaMbafONuUkfLKho2g="; + hash = "sha256-gqLIZxwjS7qp3GTaIrGVGr9BxiBH/fdwBOZfJKkd/RM="; }; sourceRoot = "gurobi${builtins.replaceStrings ["."] [""] version}/linux64"; diff --git a/pkgs/applications/science/math/lp_solve/default.nix b/pkgs/applications/science/math/lp_solve/default.nix index 773f1f3c089e4..67d7bfdba90c2 100644 --- a/pkgs/applications/science/math/lp_solve/default.nix +++ b/pkgs/applications/science/math/lp_solve/default.nix @@ -15,16 +15,16 @@ stdenv.mkDerivation rec { sha256 = "sha256-bUq/9cxqqpM66ObBeiJt8PwLZxxDj2lxXUHQn+gfkC8="; }; - nativeBuildInputs = lib.optionals stdenv.isDarwin [ + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ cctools fixDarwinDylibNames - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ autoSignDarwinBinariesHook ]; env = { NIX_CFLAGS_COMPILE = "-Wno-error=implicit-int"; - } // lib.optionalAttrs (stdenv.isDarwin && stdenv.isx86_64) { + } // lib.optionalAttrs (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) { NIX_LDFLAGS = "-headerpad_max_install_names"; }; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { buildPhase = let - ccc = if stdenv.isDarwin then "ccc.osx" else "ccc"; + ccc = if stdenv.hostPlatform.isDarwin then "ccc.osx" else "ccc"; in '' runHook preBuild diff --git a/pkgs/applications/science/math/mathematica/10.nix b/pkgs/applications/science/math/mathematica/10.nix deleted file mode 100644 index e5ab259b8f70b..0000000000000 --- a/pkgs/applications/science/math/mathematica/10.nix +++ /dev/null @@ -1,132 +0,0 @@ -{ lib -, patchelf -, requireFile -, stdenv -# arguments from default.nix -, lang -, meta -, name -, src -, version -# dependencies -, alsa-lib -, coreutils -, cudaPackages -, fontconfig -, freetype -, gcc -, glib -, libuuid -, libxml2 -, ncurses -, opencv2 -, openssl -, unixODBC -, xorg -# options -, cudaSupport -}: - -let - platform = - if stdenv.hostPlatform.system == "i686-linux" || stdenv.hostPlatform.system == "x86_64-linux" then - "Linux" - else - throw "Mathematica requires i686-linux or x86_64 linux"; -in -stdenv.mkDerivation rec { - inherit meta src version; - - pname = "mathematica"; - - buildInputs = [ - coreutils - patchelf - alsa-lib - coreutils - fontconfig - freetype - gcc.cc - gcc.libc - glib - ncurses - opencv2 - openssl - unixODBC - libxml2 - libuuid - ] ++ (with xorg; [ - libX11 - libXext - libXtst - libXi - libXmu - libXrender - libxcb - libXcursor - libXfixes - libXrandr - libICE - libSM - ]); - - ldpath = lib.makeLibraryPath buildInputs - + lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") - (":" + lib.makeSearchPathOutput "lib" "lib64" buildInputs); - - dontConfigure = true; - dontBuild = true; - - unpackPhase = '' - echo "=== Extracting makeself archive ===" - # find offset from file - offset=$(${stdenv.shell} -c "$(grep -axm1 -e 'offset=.*' $src); echo \$offset" $src) - dd if="$src" ibs=$offset skip=1 | tar -xf - - cd Unix - ''; - - installPhase = '' - cd Installer - # don't restrict PATH, that has already been done - sed -i -e 's/^PATH=/# PATH=/' MathInstaller - - echo "=== Running MathInstaller ===" - ./MathInstaller -auto -createdir=y -execdir=$out/bin -targetdir=$out/libexec/Mathematica -platforms=${platform} -silent - ''; - - preFixup = '' - echo "=== PatchElfing away ===" - # This code should be a bit forgiving of errors, unfortunately - set +e - find $out/libexec/Mathematica/SystemFiles -type f -perm -0100 | while read f; do - type=$(readelf -h "$f" 2>/dev/null | grep 'Type:' | sed -e 's/ *Type: *\([A-Z]*\) (.*/\1/') - if [ -z "$type" ]; then - : - elif [ "$type" == "EXEC" ]; then - echo "patching $f executable <<" - patchelf --shrink-rpath "$f" - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "$(patchelf --print-rpath "$f"):${ldpath}" \ - "$f" \ - && patchelf --shrink-rpath "$f" \ - || echo unable to patch ... ignoring 1>&2 - elif [ "$type" == "DYN" ]; then - echo "patching $f library <<" - patchelf \ - --set-rpath "$(patchelf --print-rpath "$f"):${ldpath}" \ - "$f" \ - && patchelf --shrink-rpath "$f" \ - || echo unable to patch ... ignoring 1>&2 - else - echo "not patching $f <<: unknown elf type" - fi - done - ''; - - # all binaries are already stripped - dontStrip = true; - - # we did this in prefixup already - dontPatchELF = true; -} diff --git a/pkgs/applications/science/math/mathematica/11.nix b/pkgs/applications/science/math/mathematica/11.nix deleted file mode 100644 index 5b9460f76e06d..0000000000000 --- a/pkgs/applications/science/math/mathematica/11.nix +++ /dev/null @@ -1,146 +0,0 @@ -{ lib -, patchelf -, requireFile -, stdenv -# arguments from default.nix -, lang -, meta -, name -, src -, version -# dependencies -, alsa-lib -, coreutils -, cudaPackages -, dbus -, fontconfig -, freetype -, gcc -, glib -, libGL -, libGLU -, libuuid -, libxml2 -, ncurses -, opencv2 -, openssl -, unixODBC -, xkeyboard_config -, xorg -, zlib -# options -, cudaSupport -}: - -stdenv.mkDerivation rec { - inherit meta name src version; - - buildInputs = [ - coreutils - patchelf - alsa-lib - coreutils - dbus - fontconfig - freetype - gcc.cc - gcc.libc - glib - ncurses - opencv2 - openssl - unixODBC - xkeyboard_config - libxml2 - libuuid - zlib - libGL - libGLU - ] ++ (with xorg; [ - libX11 - libXext - libXtst - libXi - libXmu - libXrender - libxcb - libXcursor - libXfixes - libXrandr - libICE - libSM - ]); - - ldpath = lib.makeLibraryPath buildInputs - + lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") - (":" + lib.makeSearchPathOutput "lib" "lib64" buildInputs); - - dontConfigure = true; - dontBuild = true; - - unpackPhase = '' - echo "=== Extracting makeself archive ===" - # find offset from file - offset=$(${stdenv.shell} -c "$(grep -axm1 -e 'offset=.*' $src); echo \$offset" $src) - dd if="$src" ibs=$offset skip=1 | tar -xf - - cd Unix - ''; - - installPhase = '' - cd Installer - # don't restrict PATH, that has already been done - sed -i -e 's/^PATH=/# PATH=/' MathInstaller - sed -i -e 's/\/bin\/bash/\/bin\/sh/' MathInstaller - - echo "=== Running MathInstaller ===" - ./MathInstaller -auto -createdir=y -execdir=$out/bin -targetdir=$out/libexec/Mathematica -silent - - # Fix library paths - cd $out/libexec/Mathematica/Executables - for path in mathematica MathKernel Mathematica WolframKernel wolfram math; do - sed -i -e 's#export LD_LIBRARY_PATH$#export LD_LIBRARY_PATH=${zlib}/lib:\''${LD_LIBRARY_PATH}#' $path - done - - # Fix xkeyboard config path for Qt - for path in mathematica Mathematica; do - line=$(grep -n QT_PLUGIN_PATH $path | sed 's/:.*//') - sed -i -e "$line iexport QT_XKB_CONFIG_ROOT=\"${xkeyboard_config}/share/X11/xkb\"" $path - done - ''; - - preFixup = '' - echo "=== PatchElfing away ===" - # This code should be a bit forgiving of errors, unfortunately - set +e - find $out/libexec/Mathematica/SystemFiles -type f -perm -0100 | while read f; do - type=$(readelf -h "$f" 2>/dev/null | grep 'Type:' | sed -e 's/ *Type: *\([A-Z]*\) (.*/\1/') - if [ -z "$type" ]; then - : - elif [ "$type" == "EXEC" ]; then - echo "patching $f executable <<" - patchelf --shrink-rpath "$f" - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "$(patchelf --print-rpath "$f"):${ldpath}" \ - "$f" \ - && patchelf --shrink-rpath "$f" \ - || echo unable to patch ... ignoring 1>&2 - elif [ "$type" == "DYN" ]; then - echo "patching $f library <<" - patchelf \ - --set-rpath "$(patchelf --print-rpath "$f"):${ldpath}" \ - "$f" \ - && patchelf --shrink-rpath "$f" \ - || echo unable to patch ... ignoring 1>&2 - else - echo "not patching $f <<: unknown elf type" - fi - done - ''; - - # all binaries are already stripped - dontStrip = true; - - # we did this in prefixup already - dontPatchELF = true; -} diff --git a/pkgs/applications/science/math/mathematica/9.nix b/pkgs/applications/science/math/mathematica/9.nix deleted file mode 100644 index c2fc07c532fc9..0000000000000 --- a/pkgs/applications/science/math/mathematica/9.nix +++ /dev/null @@ -1,118 +0,0 @@ -{ lib -, patchelf -, requireFile -, stdenv -# arguments from default.nix -, lang -, meta -, name -, src -, version -# dependencies -, alsa-lib -, coreutils -, cudaPackages -, fontconfig -, freetype -, gcc -, glib -, ncurses -, opencv2 -, openssl -, unixODBC -, xorg -# options -, cudaSupport -}: - -let - platform = - if stdenv.hostPlatform.system == "i686-linux" || stdenv.hostPlatform.system == "x86_64-linux" then - "Linux" - else - throw "Mathematica requires i686-linux or x86_64 linux"; -in -stdenv.mkDerivation rec { - inherit meta src version; - pname = "mathematica"; - - buildInputs = [ - coreutils - patchelf - alsa-lib - coreutils - fontconfig - freetype - gcc.cc - gcc.libc - glib - ncurses - opencv2 - openssl - unixODBC - ] ++ (with xorg; [ - libX11 - libXext - libXtst - libXi - libXmu - libXrender - libxcb - ]); - - ldpath = lib.makeLibraryPath buildInputs - + lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") - (":" + lib.makeSearchPathOutput "lib" "lib64" buildInputs); - - dontConfigure = true; - dontBuild = true; - - unpackPhase = '' - echo "=== Extracting makeself archive ===" - # find offset from file - offset=$(${stdenv.shell} -c "$(grep -axm1 -e 'offset=.*' $src); echo \$offset" $src) - dd if="$src" ibs=$offset skip=1 | tar -xf - - cd Unix - ''; - - installPhase = '' - cd Installer - # don't restrict PATH, that has already been done - sed -i -e 's/^PATH=/# PATH=/' MathInstaller - - echo "=== Running MathInstaller ===" - ./MathInstaller -auto -createdir=y -execdir=$out/bin -targetdir=$out/libexec/Mathematica -platforms=${platform} -silent - ''; - - preFixup = '' - echo "=== PatchElfing away ===" - find $out/libexec/Mathematica/SystemFiles -type f -perm -0100 | while read f; do - type=$(readelf -h "$f" 2>/dev/null | grep 'Type:' | sed -e 's/ *Type: *\([A-Z]*\) (.*/\1/') - if [ -z "$type" ]; then - : - elif [ "$type" == "EXEC" ]; then - echo "patching $f executable <<" - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${ldpath}" \ - "$f" - patchelf --shrink-rpath "$f" - elif [ "$type" == "DYN" ]; then - echo "patching $f library <<" - patchelf \ - --set-rpath "$(patchelf --print-rpath "$f"):${ldpath}" \ - "$f" \ - && patchelf --shrink-rpath "$f" \ - || echo unable to patch ... ignoring 1>&2 - else - echo "not patching $f <<: unknown elf type" - fi - done - ''; - - # all binaries are already stripped - dontStrip = true; - - # we did this in prefixup already - dontPatchELF = true; -} diff --git a/pkgs/applications/science/math/mathematica/default.nix b/pkgs/applications/science/math/mathematica/default.nix index c4cebcd8e29ad..9d0a308f44357 100644 --- a/pkgs/applications/science/math/mathematica/default.nix +++ b/pkgs/applications/science/math/mathematica/default.nix @@ -44,12 +44,6 @@ let versions = callPackage ./versions.nix { }; else "and with local documentation"}") else lib.head matching-versions; - specific-drv = ./. + "/${lib.versions.major found-version.version}.nix"; - - real-drv = if lib.pathExists specific-drv - then specific-drv - else ./generic.nix; - isMatching = v1: v2: let as = lib.splitVersion v1; bs = lib.splitVersion v2; @@ -59,12 +53,12 @@ let versions = callPackage ./versions.nix { }; matchesDoc = v: builtins.match (if webdoc - then ".*[0-9]_LINUX.sh" - else ".*[0-9]_BNDL_LINUX.sh") v.src.name != null; + then ".*[0-9]_LIN(UX)?.sh" + else ".*_B[Nn][Dd][Ll].sh") v.src.name != null; in -callPackage real-drv { +callPackage ./generic.nix { inherit cudaSupport cudaPackages; inherit (found-version) version lang; src = if source == null then found-version.src else source; @@ -77,7 +71,7 @@ callPackage real-drv { homepage = "http://www.wolfram.com/mathematica/"; license = licenses.unfree; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - maintainers = with maintainers; [ herberteuler rafaelrc ]; + maintainers = with maintainers; [ herberteuler rafaelrc chewblacka ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/science/math/mathematica/generic.nix b/pkgs/applications/science/math/mathematica/generic.nix index 5a96bf1a26252..6bf8992308125 100644 --- a/pkgs/applications/science/math/mathematica/generic.nix +++ b/pkgs/applications/science/math/mathematica/generic.nix @@ -1,4 +1,4 @@ -{ addOpenGLRunpath +{ addDriverRunpath , autoPatchelfHook , lib , makeWrapper @@ -57,7 +57,7 @@ let cudaEnv = symlinkJoin { ]; postBuild = '' if [ ! -e $out/lib/libcuda.so ]; then - ln -s ${addOpenGLRunpath.driverLink}/lib/libcuda.so $out/lib + ln -s ${addDriverRunpath.driverLink}/lib/libcuda.so $out/lib fi ln -s lib $out/lib64 ''; @@ -69,7 +69,7 @@ in stdenv.mkDerivation { nativeBuildInputs = [ autoPatchelfHook makeWrapper - ] ++ lib.optional cudaSupport addOpenGLRunpath; + ] ++ lib.optional cudaSupport addDriverRunpath; buildInputs = [ alsa-lib @@ -136,8 +136,8 @@ in stdenv.mkDerivation { "--set QT_QPA_PLATFORM wayland;xcb" ] ++ lib.optionals cudaSupport [ "--set CUDA_PATH ${cudaEnv}" - "--set NVIDIA_DRIVER_LIBRARY_PATH ${addOpenGLRunpath.driverLink}/lib/libnvidia-tls.so" - "--set CUDA_LIBRARY_PATH ${addOpenGLRunpath.driverLink}/lib/libcuda.so" + "--set NVIDIA_DRIVER_LIBRARY_PATH ${addDriverRunpath.driverLink}/lib/libnvidia-tls.so" + "--set CUDA_LIBRARY_PATH ${addDriverRunpath.driverLink}/lib/libcuda.so" ]; unpackPhase = '' @@ -157,9 +157,15 @@ in stdenv.mkDerivation { mkdir -p "$out/lib/udev/rules.d" - # Patch MathInstaller's shebangs and udev rules dir - patchShebangs MathInstaller - substituteInPlace MathInstaller \ + # Set name of installer file + if [ -f "MathInstaller" ]; then + INSTALLER="MathInstaller" + else + INSTALLER="WolframInstaller" + fi + # Patch Installer's shebangs and udev rules dir + patchShebangs $INSTALLER + substituteInPlace $INSTALLER \ --replace /etc/udev/rules.d $out/lib/udev/rules.d # Remove PATH restriction, root and avahi daemon checks, and hostname call @@ -169,13 +175,13 @@ in stdenv.mkDerivation { s/^\s*checkAvahiDaemon$/:/ s/^\s*installBundledInstall$/:/ s/`hostname`/""/ - ' MathInstaller + ' $INSTALLER # NOTE: some files placed under HOME may be useful XDG_DATA_HOME="$out/share" HOME="$TMPDIR/home" vernierLink=y \ - ./MathInstaller -execdir="$out/bin" -targetdir="$out/libexec/Mathematica" -auto -verbose -createdir=y + ./$INSTALLER -execdir="$out/bin" -targetdir="$out/libexec/Mathematica" -auto -verbose -createdir=y - # Check if MathInstaller produced any errors + # Check if Installer produced any errors errLog="$out/libexec/Mathematica/InstallErrors" if [ -f "$errLog" ]; then echo "Installation errors:" diff --git a/pkgs/applications/science/math/mathematica/versions.nix b/pkgs/applications/science/math/mathematica/versions.nix index 3bbf70433471f..a88aca6f12a8f 100644 --- a/pkgs/applications/science/math/mathematica/versions.nix +++ b/pkgs/applications/science/math/mathematica/versions.nix @@ -8,6 +8,20 @@ let versions = [ { + version = "14.1.0"; + lang = "en"; + language = "English"; + sha256 = "sha256-PCpjwqA6NC+iwvYxddYBlmF5+vl76r+MoIYAL91WFns="; + installer = "Wolfram_14.1.0_LIN.sh"; + } + { + version = "14.1.0"; + lang = "en"; + language = "English"; + sha256 = "sha256-pnu60Pv3xo3+MAkDLiU3yTPVbbQ00diV45vSVL8B310="; + installer = "Wolfram_14.1.0_LIN_Bndl.sh"; + } + { version = "14.0.0"; lang = "en"; language = "English"; @@ -147,34 +161,6 @@ let versions = [ sha256 = "sha256-uftx4a/MHXLCABlv+kNFEtII+ikg4geHhDP1BOWK6dc="; installer = "Mathematica_12.0.0_LINUX.sh"; } - { - version = "11.3.0"; - lang = "en"; - language = "English"; - sha256 = "sha256-D8/iCMHqyESOe+OvC9uENwsXvZxdBmwBOSjI7pWu0Q4="; - installer = "Mathematica_11.3.0_LINUX.sh"; - } - { - version = "11.2.0"; - lang = "ja"; - language = "Japanese"; - sha256 = "sha256-kWOS7dMr7YYiI430Nd2OhkJrsEMDijM28w3xDYGbSbE="; - installer = "Mathematica_11.2.0_ja_LINUX.sh"; - } - { - version = "9.0.0"; - lang = "en"; - language = "English"; - sha256 = "sha256-mKgxdd7dLWa5EOuR5C37SeU+UC9Cv5YTbY5xSK9y34A="; - installer = "Mathematica_9.0.0_LINUX.sh"; - } - { - version = "10.0.2"; - lang = "en"; - language = "English"; - sha256 = "sha256-NHUg1jzLos1EsIr8TdYdNaA5+3jEcFqVZIr9GVVUXrQ="; - installer = "Mathematica_10.0.2_LINUX.sh"; - } ]; in diff --git a/pkgs/applications/science/math/maxima/5.47.0-CVE-2024-34490.patch b/pkgs/applications/science/math/maxima/5.47.0-CVE-2024-34490.patch new file mode 100644 index 0000000000000..008fe725fa895 --- /dev/null +++ b/pkgs/applications/science/math/maxima/5.47.0-CVE-2024-34490.patch @@ -0,0 +1,86 @@ +Based on upstream https://sourceforge.net/p/maxima/code/ci/51704ccb090f6f971b641e4e0b7c1c22c4828bf7/ +adjusted to apply to 5.47.0 + +diff --git a/src/gnuplot_def.lisp b/src/gnuplot_def.lisp +index 80c174bd5..6fdc8da6d 100644 +--- a/src/gnuplot_def.lisp ++++ b/src/gnuplot_def.lisp +@@ -286,7 +286,7 @@ + (format nil "set term postscript eps color solid lw 2 size 16.4 cm, 12.3 cm font \",24\" ~a" gstrings))) + (if (getf plot-options :gnuplot_out_file) + (setq out-file (getf plot-options :gnuplot_out_file)) +- (setq out-file "maxplot.ps"))) ++ (setq out-file (format nil "~a.ps" (random-name 16))))) + ((eq (getf plot-options :gnuplot_term) '$dumb) + (if (getf plot-options :gnuplot_dumb_term_command) + (setq terminal-command +@@ -294,7 +294,7 @@ + (setq terminal-command "set term dumb 79 22")) + (if (getf plot-options :gnuplot_out_file) + (setq out-file (getf plot-options :gnuplot_out_file)) +- (setq out-file "maxplot.txt"))) ++ (setq out-file (format nil "~a.txt" (random-name 16))))) + ((eq (getf plot-options :gnuplot_term) '$default) + (if (getf plot-options :gnuplot_default_term_command) + (setq terminal-command +diff --git a/src/plot.lisp b/src/plot.lisp +index fb2b3136b..8877f7025 100644 +--- a/src/plot.lisp ++++ b/src/plot.lisp +@@ -1755,16 +1755,24 @@ plot3d([cos(y)*(10.0+6*cos(x)), sin(y)*(10.0+6*cos(x)),-6*sin(x)], + + (defvar $xmaxima_plot_command "xmaxima") + ++;; random-file-name ++;; Creates a random word of 'count' alphanumeric characters ++(defun random-name (count) ++ (let ((chars "0123456789abcdefghijklmnopqrstuvwxyz") (name "")) ++ (setf *random-state* (make-random-state t)) ++ (dotimes (i count) ++ (setq name (format nil "~a~a" name (aref chars (random 36))))) ++ name)) ++ + (defun plot-set-gnuplot-script-file-name (options) + (let ((gnuplot-term (getf options :gnuplot_term)) + (gnuplot-out-file (getf options :gnuplot_out_file))) + (if (and (find (getf options :plot_format) '($gnuplot_pipes $gnuplot)) + (eq gnuplot-term '$default) gnuplot-out-file) + (plot-file-path gnuplot-out-file t options) +- (plot-file-path +- (format nil "maxout~d.~(~a~)" +- (getpid) +- (ensure-string (getf options :plot_format))) nil options)))) ++ (plot-file-path (format nil "~a.~a" (random-name 16) ++ (ensure-string (getf options :plot_format))) ++ nil options)))) + + (defun plot-temp-file0 (file &optional (preserve-file nil)) + (let ((filename +@@ -2577,9 +2585,13 @@ plot2d ( x^2+y^2 = 1, [x, -2, 2], [y, -2 ,2]); + (format dest "}~%")) + (format dest "}~%")) + ++; TODO: Check whether this function is still being used (villate 20240325) + (defun show-open-plot (ans file) + (cond ($show_openplot +- (with-open-file (st1 (plot-temp-file (format nil "maxout~d.xmaxima" (getpid))) :direction :output :if-exists :supersede) ++ (with-open-file ++ (st1 (plot-temp-file ++ (format nil "~a.xmaxima" (random-name 16))) ++ :direction :output :if-exists :supersede) + (princ ans st1)) + ($system (concatenate 'string *maxima-prefix* + (if (string= *autoconf-windows* "true") "\\bin\\" "/bin/") +diff --git a/src/xmaxima_def.lisp b/src/xmaxima_def.lisp +index b6513b564..5a13b6141 100644 +--- a/src/xmaxima_def.lisp ++++ b/src/xmaxima_def.lisp +@@ -431,7 +431,7 @@ + (format $pstream "}~%")))))) + + (defmethod plot-shipout ((plot xmaxima-plot) options &optional output-file) +- (let ((file (plot-file-path (format nil "maxout~d.xmaxima" (getpid))))) ++ (let ((file (plot-file-path (format nil "~a.xmaxima" (random-name 16))))) + (cond ($show_openplot + (with-open-file (fl + #+sbcl (sb-ext:native-namestring file) diff --git a/pkgs/applications/science/math/maxima/default.nix b/pkgs/applications/science/math/maxima/default.nix index e7ac178cd5d13..c1458186b2ae1 100644 --- a/pkgs/applications/science/math/maxima/default.nix +++ b/pkgs/applications/science/math/maxima/default.nix @@ -20,11 +20,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "maxima"; - version = "5.46.0"; + version = "5.47.0"; src = fetchurl { - url = "mirror://sourceforge/${finalAttrs.pname}/${finalAttrs.pname}-${finalAttrs.version}.tar.gz"; - sha256 = "sha256-c5Dwa0jaZckDPosvYpuXi5AFZFSlQCLbfecOIiWqiwc="; + url = "mirror://sourceforge/maxima/maxima-${finalAttrs.version}.tar.gz"; + sha256 = "sha256-kQQCGyT9U+jAOpg1CctC6TepJejAyFwzXXcJoU/UD3o="; }; nativeBuildInputs = [ @@ -79,6 +79,8 @@ stdenv.mkDerivation (finalAttrs: { url = "https://raw.githubusercontent.com/sagemath/sage/07d6c37d18811e2b377a9689790a7c5e24da16ba/build/pkgs/maxima/patches/undoing_true_false_printing_patch.patch"; sha256 = "0fvi3rcjv6743sqsbgdzazy9jb6r1p1yq63zyj9fx42wd1hgf7yx"; }) + + ./5.47.0-CVE-2024-34490.patch ]; # The test suite is disabled since 5.42.2 because of the following issues: diff --git a/pkgs/applications/science/math/msieve/default.nix b/pkgs/applications/science/math/msieve/default.nix index bda3e5b3a040a..a5af9e844eca4 100644 --- a/pkgs/applications/science/math/msieve/default.nix +++ b/pkgs/applications/science/math/msieve/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "msieve"; - version = "r1050"; + version = "1056"; src = fetchsvn { url = "svn://svn.code.sf.net/p/msieve/code/trunk"; - rev = "1050"; - hash = "sha256-cn6OhE4zhrpB7BFrRdOnucjATbfo5mLkK7O0Usx1quE="; + rev = version; + hash = "sha256-6ErVn4pYPMG5VFjOQURLsHNpN0pGdp55+rjY8988onU="; }; buildInputs = [ zlib gmp ecm ]; diff --git a/pkgs/applications/science/math/mxnet/default.nix b/pkgs/applications/science/math/mxnet/default.nix index 839537438962b..880caaff5afb6 100644 --- a/pkgs/applications/science/math/mxnet/default.nix +++ b/pkgs/applications/science/math/mxnet/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { src = fetchurl { name = "apache-mxnet-src-${version}-incubating.tar.gz"; - url = "https://dlcdn.apache.org/incubator/mxnet/${version}/apache-mxnet-src-${version}-incubating.tar.gz"; + url = "mirror://apache/incubator/mxnet/${version}/apache-mxnet-src-${version}-incubating.tar.gz"; hash = "sha256-EephMoF02MKblvNBl34D3rC/Sww3rOZY+T442euMkyI="; }; diff --git a/pkgs/applications/science/math/nota/default.nix b/pkgs/applications/science/math/nota/default.nix index eae11806d7254..3a98eacd47171 100644 --- a/pkgs/applications/science/math/nota/default.nix +++ b/pkgs/applications/science/math/nota/default.nix @@ -36,6 +36,6 @@ mkDerivation rec { description = "Most beautiful command line calculator"; homepage = "https://kary.us/nota"; license = lib.licenses.mpl20; - maintainers = with lib.maintainers; [ dtzWill ]; + maintainers = [ ]; mainProgram = "nota"; } diff --git a/pkgs/applications/science/math/numworks-epsilon/default.nix b/pkgs/applications/science/math/numworks-epsilon/default.nix index 98d5d0d4560ad..71da675614da9 100644 --- a/pkgs/applications/science/math/numworks-epsilon/default.nix +++ b/pkgs/applications/science/math/numworks-epsilon/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "numworks-epsilon"; - version = "22.2.0"; + version = "23.2.3"; src = fetchFromGitHub { owner = "numworks"; repo = "epsilon"; rev = version; - hash = "sha256-E2WaXTn8+Ky9kdZxvQmEt63Ggo6Ns0fZ0Za+rQGIMSg="; + hash = "sha256-w9ddcULE1MrGnYcXA0qOg1elQv/eBhcXqhMSjWT3Bkk="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/science/math/palp/default.nix b/pkgs/applications/science/math/palp/default.nix index a3b54b78f99bc..0db35ba89ae61 100644 --- a/pkgs/applications/science/math/palp/default.nix +++ b/pkgs/applications/science/math/palp/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { "format" ]; - patchPhase = lib.optionalString stdenv.isDarwin '' + patchPhase = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace GNUmakefile --replace gcc cc ''; diff --git a/pkgs/applications/science/math/qalculate-gtk/default.nix b/pkgs/applications/science/math/qalculate-gtk/default.nix index e4fc506516fdd..306d6141ac17a 100644 --- a/pkgs/applications/science/math/qalculate-gtk/default.nix +++ b/pkgs/applications/science/math/qalculate-gtk/default.nix @@ -2,19 +2,19 @@ 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" ]; nativeBuildInputs = [ intltool pkg-config autoreconfHook wrapGAppsHook3 ] - ++ lib.optionals stdenv.isDarwin [ desktopToDarwinBundle ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ desktopToDarwinBundle ]; buildInputs = [ libqalculate gtk3 curl ]; enableParallelBuilding = true; diff --git a/pkgs/applications/science/math/qalculate-qt/default.nix b/pkgs/applications/science/math/qalculate-qt/default.nix index 3c4e19d56ebd7..2cde634498889 100644 --- a/pkgs/applications/science/math/qalculate-qt/default.nix +++ b/pkgs/applications/science/math/qalculate-qt/default.nix @@ -2,25 +2,25 @@ stdenv.mkDerivation (finalAttrs: { pname = "qalculate-qt"; - version = "5.1.0"; + version = "5.2.0.1"; src = fetchFromGitHub { owner = "qalculate"; repo = "qalculate-qt"; rev = "v${finalAttrs.version}"; - hash = "sha256-gJfIC5HdA10gb/Dh/yhJbkCZfhUnN0zihqyfDjPv6ow="; + hash = "sha256-kzOxOCZmu4mYYgegRBU8SMAkTiE4p1AugVAeZa8yDDE="; }; nativeBuildInputs = [ qmake intltool pkg-config qttools wrapQtAppsHook ]; buildInputs = [ libqalculate qtbase qtsvg ] - ++ lib.optionals stdenv.isLinux [ qtwayland ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ qtwayland ]; postPatch = '' substituteInPlace qalculate-qt.pro\ --replace "LRELEASE" "${qttools.dev}/bin/lrelease" ''; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications mv $out/bin/qalculate-qt.app $out/Applications makeWrapper $out/{Applications/qalculate-qt.app/Contents/MacOS,bin}/qalculate-qt diff --git a/pkgs/applications/science/math/ratpoints/default.nix b/pkgs/applications/science/math/ratpoints/default.nix index f2aa1aac26079..4aaed4a1b0edc 100644 --- a/pkgs/applications/science/math/ratpoints/default.nix +++ b/pkgs/applications/science/math/ratpoints/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ gmp ]; makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; - buildFlags = lib.optionals stdenv.isDarwin ["CCFLAGS2=-lgmp -lc -lm" "CCFLAGS=-UUSE_SSE"]; + buildFlags = lib.optionals stdenv.hostPlatform.isDarwin ["CCFLAGS2=-lgmp -lc -lm" "CCFLAGS=-UUSE_SSE"]; installFlags = [ "INSTALL_DIR=$(out)" ]; preInstall = ''mkdir -p "$out"/{bin,share,lib,include}''; diff --git a/pkgs/applications/science/math/ripser/default.nix b/pkgs/applications/science/math/ripser/default.nix index 3f536f25aa115..38a00d504406b 100644 --- a/pkgs/applications/science/math/ripser/default.nix +++ b/pkgs/applications/science/math/ripser/default.nix @@ -5,14 +5,11 @@ , fileFormat ? "lowerTriangularCsv" }: -with lib; - -assert assertOneOf "fileFormat" fileFormat +assert lib.assertOneOf "fileFormat" fileFormat ["lowerTriangularCsv" "upperTriangularCsv" "dipha"]; assert useGoogleHashmap -> sparsehash != null; let - inherit (lib) optional; version = "1.2.1"; in stdenv.mkDerivation { @@ -26,19 +23,19 @@ stdenv.mkDerivation { sha256 = "sha256-BxmkPQ/nl5cF+xwQMTjXnLgkLgdmT/39y7Kzl2wDfpE="; }; - buildInputs = optional useGoogleHashmap sparsehash; + buildInputs = lib.optional useGoogleHashmap sparsehash; buildFlags = [ "-std=c++11" "-O3" "-D NDEBUG" ] - ++ optional useCoefficients "-D USE_COEFFICIENTS" - ++ optional indicateProgress "-D INDICATE_PROGRESS" - ++ optional useGoogleHashmap "-D USE_GOOGLE_HASHMAP" - ++ optional (fileFormat == "lowerTriangularCsv") "-D FILE_FORMAT_LOWER_TRIANGULAR_CSV" - ++ optional (fileFormat == "upperTriangularCsv") "-D FILE_FORMAT_UPPER_TRIANGULAR_CSV" - ++ optional (fileFormat == "dipha") "-D FILE_FORMAT_DIPHA" + ++ lib.optional useCoefficients "-D USE_COEFFICIENTS" + ++ lib.optional indicateProgress "-D INDICATE_PROGRESS" + ++ lib.optional useGoogleHashmap "-D USE_GOOGLE_HASHMAP" + ++ lib.optional (fileFormat == "lowerTriangularCsv") "-D FILE_FORMAT_LOWER_TRIANGULAR_CSV" + ++ lib.optional (fileFormat == "upperTriangularCsv") "-D FILE_FORMAT_UPPER_TRIANGULAR_CSV" + ++ lib.optional (fileFormat == "dipha") "-D FILE_FORMAT_DIPHA" ; buildPhase = "c++ ripser.cpp -o ripser $buildFlags"; diff --git a/pkgs/applications/science/math/sage/README.md b/pkgs/applications/science/math/sage/README.md index 35e8d0deeffba..94a9b0b6bc29b 100644 --- a/pkgs/applications/science/math/sage/README.md +++ b/pkgs/applications/science/math/sage/README.md @@ -12,7 +12,7 @@ If the build broke as a result of a package update, try those solutions in order - search the [sage GitHub repo](https://github.com/sagemath/sage) for keywords like "Upgrade <package>". Maybe somebody has already proposed a patch that fixes the issue. You can then add a `fetchpatch` to `sage-src.nix`. -- check if [gentoo](https://github.com/cschwan/sage-on-gentoo/tree/master/sci-mathematics/sage), [debian](https://salsa.debian.org/science-team/sagemath/tree/master/debian) or [arch linux](https://git.archlinux.org/svntogit/community.git/tree/trunk?h=packages/sagemath) already solved the problem. You can then again add a `fetchpatch` to `sage-src.nix`. If applicable you should also [propose the patch upstream](#proposing-a-sage-patch). +- check if [gentoo](https://github.com/cschwan/sage-on-gentoo/tree/master/sci-mathematics/sage), [debian](https://salsa.debian.org/science-team/sagemath/tree/master/debian) or [arch linux](https://git.archlinux.org/svntogit/community.git/tree/trunk?h=packages/sagemath) already solved the problem. You can then again add a `fetchpatch` to `sage-src.nix`. If applicable you should also propose the patch upstream. - fix the problem yourself. First clone the sagemath source and then check out the sage version you want to patch: diff --git a/pkgs/applications/science/math/sage/default.nix b/pkgs/applications/science/math/sage/default.nix index 6624dcc36528b..95ad7ab120134 100644 --- a/pkgs/applications/science/math/sage/default.nix +++ b/pkgs/applications/science/math/sage/default.nix @@ -18,7 +18,7 @@ let inherit flint3; inherit sage-src env-locations singular; inherit (maxima) lisp-compiler; - linbox = pkgs.linbox.override { withSage = true; }; + linbox = pkgs.linbox; pkg-config = pkgs.pkg-config; # not to confuse with pythonPackages.pkg-config }; @@ -97,6 +97,7 @@ let # Running the tests should take something in the order of 1h. sage-tests = callPackage ./sage-tests.nix { inherit sage-with-env; + pytest = python3.pkgs.pytest; }; sage-src = callPackage ./sage-src.nix {}; diff --git a/pkgs/applications/science/math/sage/dist-tests.nix b/pkgs/applications/science/math/sage/dist-tests.nix index 24a86a8f37a4b..45376b832b9f5 100644 --- a/pkgs/applications/science/math/sage/dist-tests.nix +++ b/pkgs/applications/science/math/sage/dist-tests.nix @@ -7,10 +7,10 @@ # subset of files responsible for the vast majority of packaging tests, we can # think about moving this upstream. [ - "src/sage/env.py" # [1] - "src/sage/misc/persist.pyx" # [1] - "src/sage/misc/inline_fortran.py" # [1] - "src/sage/repl/ipython_extension.py" # [1] + "src/sage/env.py" # [1] + "src/sage/misc/persist.pyx" # [1] + "src/sage/misc/inline_fortran.py" # [1] + "src/sage/repl/ipython_extension.py" # [1] ] # Numbered list of past failures to annotate files with diff --git a/pkgs/applications/science/math/sage/patches/disable-singular-doctest.patch b/pkgs/applications/science/math/sage/patches/disable-singular-doctest.patch new file mode 100644 index 0000000000000..8501d55e54882 --- /dev/null +++ b/pkgs/applications/science/math/sage/patches/disable-singular-doctest.patch @@ -0,0 +1,36 @@ +From d6362714c9acf4cab69f3e2e772ec0bb1dfd39fe Mon Sep 17 00:00:00 2001 +From: George Huebner <george@feyor.sh> +Date: Mon, 22 Jul 2024 00:37:53 -0500 +Subject: [PATCH] disable singular version doctest to avoid exceeding the stack + limit + +It works fine interactively, only an issue for Nix builds +--- + src/sage/interfaces/singular.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/sage/interfaces/singular.py b/src/sage/interfaces/singular.py +index c0ab80e0a6..c778acdb0c 100644 +--- a/src/sage/interfaces/singular.py ++++ b/src/sage/interfaces/singular.py +@@ -1262,7 +1262,7 @@ class Singular(ExtraTabCompletion, Expect): + + EXAMPLES:: + +- sage: singular.version() ++ sage: singular.version() # not tested + "Singular ... version 4... + """ + return singular_version() +@@ -2475,7 +2475,7 @@ def singular_version(): + + EXAMPLES:: + +- sage: singular.version() ++ sage: singular.version() # not tested + "Singular ... version 4... + """ + return singular.eval('system("--version");') +-- +2.44.1 + diff --git a/pkgs/applications/science/math/sage/patches/gap-element-crash.patch b/pkgs/applications/science/math/sage/patches/gap-element-crash.patch new file mode 100644 index 0000000000000..b5396e2b78543 --- /dev/null +++ b/pkgs/applications/science/math/sage/patches/gap-element-crash.patch @@ -0,0 +1,18 @@ +diff --git a/src/sage/libs/gap/element.pyx b/src/sage/libs/gap/element.pyx +index b2b0681c052..b2e5807392c 100644 +--- a/src/sage/libs/gap/element.pyx ++++ b/src/sage/libs/gap/element.pyx +@@ -35,6 +35,13 @@ from sage.structure.coerce cimport coercion_model as cm + ### helper functions to construct lists and records ######################## + ############################################################################ + ++ ++cdef extern from *: ++ """ ++ #pragma GCC optimize("O1") ++ """ ++ ++ + cdef Obj make_gap_list(sage_list) except NULL: + """ + Convert Sage lists into Gap lists diff --git a/pkgs/applications/science/math/sage/patches/silence-linker.patch b/pkgs/applications/science/math/sage/patches/silence-linker.patch new file mode 100644 index 0000000000000..f11f6cc6d0e33 --- /dev/null +++ b/pkgs/applications/science/math/sage/patches/silence-linker.patch @@ -0,0 +1,27 @@ +From 06d3bb5d8ef007bbcd71ee157fd97cd69557383b Mon Sep 17 00:00:00 2001 +From: George Huebner <george@feyor.sh> +Date: Sat, 20 Jul 2024 18:46:04 -0500 +Subject: [PATCH] sage.cython: silence linker + +(Nix+LLVM specific issue) "ld: warning: directory not found" causes +any cython doctest to fail and is annoying, so I told ld to shut up. +--- + src/sage/misc/cython.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/sage/misc/cython.py b/src/sage/misc/cython.py +index 545e1227b0..c5f4b69221 100644 +--- a/src/sage/misc/cython.py ++++ b/src/sage/misc/cython.py +@@ -339,7 +339,7 @@ def cython(filename, verbose=0, compile_message=False, + Cython.Compiler.Options.pre_import = "sage.all" if sage_namespace else None + + extra_compile_args = ['-w'] # no warnings +- extra_link_args = [] ++ extra_link_args = ['-w'] + + ext = Extension(name, + sources=[pyxfile], +-- +2.44.1 + diff --git a/pkgs/applications/science/math/sage/patches/sphinx-docbuild-subprocesses.patch b/pkgs/applications/science/math/sage/patches/sphinx-docbuild-subprocesses.patch index 2bfac780dfca3..fecf2088e5045 100644 --- a/pkgs/applications/science/math/sage/patches/sphinx-docbuild-subprocesses.patch +++ b/pkgs/applications/science/math/sage/patches/sphinx-docbuild-subprocesses.patch @@ -1,15 +1,15 @@ diff --git a/src/sage_docbuild/builders.py b/src/sage_docbuild/builders.py -index c5be38600a..e1d15f62d3 100644 +index 871cc4705a2..4b718136b91 100644 --- a/src/sage_docbuild/builders.py +++ b/src/sage_docbuild/builders.py -@@ -105,31 +105,6 @@ def builder_helper(type): +@@ -106,31 +106,6 @@ def builder_helper(type): """ Return a function which builds the documentation for output type ``type``. - - TESTS: - -- Check that :trac:`25161` has been resolved:: +- Check that :issue:`25161` has been resolved:: - - sage: from sage_docbuild.builders import DocBuilder - sage: from sage_docbuild.__main__ import setup_parser @@ -48,10 +48,10 @@ index c5be38600a..e1d15f62d3 100644 if build_options.ABORT_ON_ERROR: raise diff --git a/src/sage_docbuild/sphinxbuild.py b/src/sage_docbuild/sphinxbuild.py -index 07c584de55..b83283a9ee 100644 +index 5621fe9e456..b1b91ce7b2c 100644 --- a/src/sage_docbuild/sphinxbuild.py +++ b/src/sage_docbuild/sphinxbuild.py -@@ -331,3 +331,8 @@ def runsphinx(): +@@ -323,3 +323,8 @@ def runsphinx(): sys.stderr = saved_stderr sys.stdout.flush() sys.stderr.flush() diff --git a/pkgs/applications/science/math/sage/python-modules/sage-docbuild.nix b/pkgs/applications/science/math/sage/python-modules/sage-docbuild.nix index b45998bbcb86d..43f67b97a278e 100644 --- a/pkgs/applications/science/math/sage/python-modules/sage-docbuild.nix +++ b/pkgs/applications/science/math/sage/python-modules/sage-docbuild.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , sage-src +, furo , jupyter-sphinx , sphinx , sphinx-copybutton @@ -13,6 +14,7 @@ buildPythonPackage rec { src = sage-src; propagatedBuildInputs = [ + furo jupyter-sphinx sphinx sphinx-copybutton diff --git a/pkgs/applications/science/math/sage/sage-env.nix b/pkgs/applications/science/math/sage/sage-env.nix index f95e08c51ff4d..1503d3a89957a 100644 --- a/pkgs/applications/science/math/sage/sage-env.nix +++ b/pkgs/applications/science/math/sage/sage-env.nix @@ -5,10 +5,12 @@ , sage-docbuild , env-locations , gfortran +, ninja , bash , coreutils , gnused , gnugrep +, gawk , binutils , pythonEnv , python3 @@ -63,11 +65,13 @@ let "@sage-local@/build" pythonEnv gfortran # for inline fortran + ninja # for inline fortran via numpy.f2py stdenv.cc # for cython bash coreutils gnused gnugrep + gawk binutils.bintools pkg-config pari @@ -184,7 +188,7 @@ writeTextFile rec { export SAGE_EXTCODE='${sagelib.src}/src/sage/ext_data' # for find_library - export DYLD_LIBRARY_PATH="${lib.makeLibraryPath [stdenv.cc.libc singular giac]}''${DYLD_LIBRARY_PATH:+:}$DYLD_LIBRARY_PATH" + export DYLD_LIBRARY_PATH="${lib.makeLibraryPath [stdenv.cc.libc singular giac gap]}''${DYLD_LIBRARY_PATH:+:}$DYLD_LIBRARY_PATH" ''; } // { # equivalent of `passthru`, which `writeTextFile` doesn't support lib = sagelib; diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index de0c2e3b1e20e..b8d9e3e903a6d 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -1,4 +1,5 @@ { stdenv +, lib , fetchFromGitHub , fetchpatch , fetchurl @@ -10,14 +11,14 @@ # all get the same sources with the same patches applied. stdenv.mkDerivation rec { - version = "10.3"; + version = "10.4"; pname = "sage-src"; src = fetchFromGitHub { owner = "sagemath"; repo = "sage"; rev = version; - hash = "sha256-OHtMv8t0RrP6R8XIREU+C1vpazeQLWa75wx9Mv6BN1U="; + hash = "sha256-BDO00ZSm5lnjEuA56VsY/FZyAhoG1hkFxdIlTtBZVBA="; }; # contains essential files (e.g., setup.cfg) generated by the bootstrap script. @@ -25,8 +26,8 @@ stdenv.mkDerivation rec { configure-src = fetchurl { # the hash below is the tagged commit's _parent_. it can also be found by looking for # the "configure" asset at https://github.com/sagemath/sage/releases/tag/${version} - url = "mirror://sageupstream/configure/configure-ab1a517b64b02bf15bbcb8d7c2d4d643bd5eff9b.tar.gz"; - hash = "sha256-pe9AxTM+gFSR4/eVfUzay+4bwjoubbYeDPc+avKjlaw="; + url = "mirror://sageupstream/configure/configure-3c279ec5712e0fa35c5733e03e010970727d7189.tar.gz"; + hash = "sha256-3bRlgIUSIq9tDzvI+ZfEd5LMy1qHXdItEwu1say4cx4="; }; # Patches needed because of particularities of nix or the way this is packaged. @@ -40,6 +41,13 @@ stdenv.mkDerivation rec { # we can now set the cache dir to be within the .sage directory. This is # not strictly necessary, but keeps us from littering in the user's HOME. ./patches/sympow-cache.patch + ] ++ lib.optionals (stdenv.cc.isClang) [ + # https://github.com/NixOS/nixpkgs/pull/264126 + # Dead links in python sysconfig cause LLVM linker warnings, leading to cython doctest failures. + ./patches/silence-linker.patch + + # Stack overflows during doctests; this does not change functionality. + ./patches/disable-singular-doctest.patch ]; # Since sage unfortunately does not release bugfix releases, packagers must @@ -54,26 +62,9 @@ stdenv.mkDerivation rec { # https://github.com/sagemath/sage/issues/34575 ./patches/disable-slow-glpk-test.patch - # https://github.com/sagemath/sage/pull/37489, landed in 10.4.beta1 - (fetchpatch { - name = "quaternionalgebra-random-failure.patch"; - url = "https://github.com/sagemath/sage/commit/1c3f991b9d3c5778e409e5414c6cfcd456113f19.diff"; - hash = "sha256-uCXchYx26DdxTjR1k2748KCEHPnekKS2fAM7SpyhNvM="; - }) - - # https://github.com/sagemath/sage/pull/37763, landed in 10.4.beta2 - (fetchpatch { - name = "scipy-fault-tolerance.patch"; - url = "https://github.com/sagemath/sage/commit/551139c09f26a5da96b1187c3f0dd17b8d80ef84.diff"; - hash = "sha256-PR4przrZ3ieHaW2nSY7l7VhNfrUupu9yCIrXpeyoAgg="; - }) - - # first two commits from https://github.com/sagemath/sage/pull/38100 - (fetchpatch { - name = "sphinx-7.3-update.patch"; - url = "https://github.com/sagemath/sage/compare/10.4.beta7...d2932e142991b442a3eee5dc4f8949e3f7e6fe5c.patch"; - hash = "sha256-g6w0ImE0d2ocKnbGMQikcz9eI9r3/gESlA1NrQfGimk="; - }) + # compile libs/gap/element.pyx with -O1 + # a more conservative version of https://github.com/sagemath/sage/pull/37951 + ./patches/gap-element-crash.patch ]; # Patches needed because of package updates. We could just pin the versions of @@ -83,11 +74,11 @@ stdenv.mkDerivation rec { # should come from or be proposed to upstream. This list will probably never # be empty since dependencies update all the time. packageUpgradePatches = [ - # https://github.com/sagemath/sage/pull/37492 + # https://github.com/sagemath/sage/pull/38500, positively reviewed, to land in 10.5.beta3 (fetchpatch { - name = "singular-4.3.2p14-upgrade.patch"; - url = "https://github.com/sagemath/sage/commit/a0c56816b051e97da44ac0a4e4d4f6915cf7fa0f.diff"; - sha256 = "sha256-WGMmPeBoj2LUC+2qxWuaJL89QUuGt6axGvxWkpM9LYg="; + name = "cython-3.0.11-upgrade.patch"; + url = "https://patch-diff.githubusercontent.com/raw/sagemath/sage/pull/38500.diff"; + hash = "sha256-ePfH3Gy1T0UfpoVd3EZowCfy88CbE+yE2MV2itWthsA="; }) ]; @@ -112,7 +103,7 @@ stdenv.mkDerivation rec { installPhase = '' cp -r . "$out" - tar xkzf ${configure-src} -C "$out" + tar xzf ${configure-src} -C "$out" rm "$out/configure" ''; } diff --git a/pkgs/applications/science/math/sage/sage-tests.nix b/pkgs/applications/science/math/sage/sage-tests.nix index 1a415ae65e96a..e50754986709c 100644 --- a/pkgs/applications/science/math/sage/sage-tests.nix +++ b/pkgs/applications/science/math/sage/sage-tests.nix @@ -1,5 +1,6 @@ { stdenv , lib +, pytest , sage-with-env , makeWrapper , files ? null # "null" means run all tests @@ -30,6 +31,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ + pytest sage-with-env ]; diff --git a/pkgs/applications/science/math/sage/sage.nix b/pkgs/applications/science/math/sage/sage.nix index 81b55e841d244..cc39624b7f110 100644 --- a/pkgs/applications/science/math/sage/sage.nix +++ b/pkgs/applications/science/math/sage/sage.nix @@ -60,6 +60,6 @@ stdenv.mkDerivation rec { homepage = "https://www.sagemath.org"; license = licenses.gpl2Plus; maintainers = teams.sage.members; - platforms = platforms.linux; + platforms = platforms.linux ++ [ "aarch64-darwin" ]; }; } diff --git a/pkgs/applications/science/math/sage/sagelib.nix b/pkgs/applications/science/math/sage/sagelib.nix index 1552de773d014..1a138eea81d9e 100644 --- a/pkgs/applications/science/math/sage/sagelib.nix +++ b/pkgs/applications/science/math/sage/sagelib.nix @@ -6,7 +6,7 @@ , perl , pkg-config , sage-setup -, pythonRelaxDepsHook +, setuptools , gd , iml , libpng @@ -63,6 +63,7 @@ , lrcalc-python , matplotlib , memory-allocator +, meson-python , mpmath , networkx , numpy @@ -79,7 +80,6 @@ , sphinx , sympy , typing-extensions -, nbclassic }: assert (!blas.isILP64) && (!lapack.isILP64); @@ -103,7 +103,7 @@ buildPythonPackage rec { pip # needed to query installed packages pkg-config sage-setup - pythonRelaxDepsHook + setuptools ]; pythonRelaxDeps = [ @@ -173,6 +173,7 @@ buildPythonPackage rec { lrcalc-python matplotlib memory-allocator + meson-python mpmath networkx numpy @@ -189,8 +190,6 @@ buildPythonPackage rec { sphinx sympy typing-extensions - - nbclassic ]; preBuild = '' diff --git a/pkgs/applications/science/math/scalp/default.nix b/pkgs/applications/science/math/scalp/default.nix index fc230a11966fb..a4d3dc52e0a96 100644 --- a/pkgs/applications/science/math/scalp/default.nix +++ b/pkgs/applications/science/math/scalp/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { url = "https://digidev.digi.e-technik.uni-kassel.de/git/scalp.git"; # mirrored at https://git.sr.ht/~weijia/scalp rev = "185b84e4ff967f42cf2de5db4db4e6fa0cc18fb8"; - sha256 = "sha256-NyMZdJwdD3FR6uweYCclJjfcf3Y24Bns1ViwsmJ5izg="; + hash = "sha256-NyMZdJwdD3FR6uweYCclJjfcf3Y24Bns1ViwsmJ5izg="; }; nativeBuildInputs = [ @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { lp_solve ]; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace CMakeLists.txt \ --replace "\''$ORIGIN" "\''${CMAKE_INSTALL_PREFIX}/lib" ''; diff --git a/pkgs/applications/science/math/scilab-bin/default.nix b/pkgs/applications/science/math/scilab-bin/default.nix index f6da20531385b..e3ca7bef52a4b 100644 --- a/pkgs/applications/science/math/scilab-bin/default.nix +++ b/pkgs/applications/science/math/scilab-bin/default.nix @@ -100,4 +100,4 @@ let ''; }; in -if stdenv.isDarwin then darwin else linux +if stdenv.hostPlatform.isDarwin then darwin else linux diff --git a/pkgs/applications/science/math/singular/default.nix b/pkgs/applications/science/math/singular/default.nix index d1b17eccee23b..fff9c7dfaf903 100644 --- a/pkgs/applications/science/math/singular/default.nix +++ b/pkgs/applications/science/math/singular/default.nix @@ -7,6 +7,7 @@ , getconf , flint3 , ntl +, mpfr , cddlib , gfan , lrcalc @@ -15,8 +16,7 @@ , latex2html , texinfo , texliveSmall -, enableDocs ? !stdenv.isDarwin -, enableGfanlib ? true +, enableDocs ? true }: stdenv.mkDerivation rec { @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { # if a release is tagged (which sometimes does not happen), it will # be in the format below. rev = "Release-${lib.replaceStrings ["."] ["-"] version}"; - sha256 = "sha256-5JZgI5lnfX4JlBSEAL7Wv6uao/57GBaMqwgslJt9Bjk="; + hash = "sha256-5JZgI5lnfX4JlBSEAL7Wv6uao/57GBaMqwgslJt9Bjk="; # the repository's .gitattributes file contains the lines "/Tst/ # export-ignore" and "/doc/ export-ignore" so some directories are @@ -40,12 +40,11 @@ stdenv.mkDerivation rec { }; configureFlags = [ + "--enable-gfanlib" "--with-ntl=${ntl}" - "--disable-pyobject-module" + "--with-flint=${flint3}" ] ++ lib.optionals enableDocs [ "--enable-doc-build" - ] ++ lib.optionals enableGfanlib [ - "--enable-gfanlib" ]; prePatch = '' @@ -61,14 +60,15 @@ stdenv.mkDerivation rec { buildInputs = [ # necessary gmp + flint3 # by upstream recommended but optional ncurses readline ntl - flint3 + mpfr lrcalc + # for gfanlib gfan - ] ++ lib.optionals enableGfanlib [ cddlib ]; @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { latex2html texinfo texliveSmall - ] ++ lib.optionals stdenv.isDarwin [ getconf ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ getconf ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; preAutoreconf = '' @@ -95,11 +95,13 @@ stdenv.mkDerivation rec { -i '{}' ';' ''; - hardeningDisable = lib.optional stdenv.isi686 "stackprotector"; + hardeningDisable = lib.optional stdenv.hostPlatform.isi686 "stackprotector"; doCheck = true; # very basic checks, does not test any libraries installPhase = '' + # clean up any artefacts a previous non-sandboxed docbuild may have left behind + rm /tmp/conic.log /tmp/conic.tex /tmp/tropicalcurve*.tex || true make install '' + lib.optionalString enableDocs '' # Sage uses singular.info, which is not installed by default @@ -118,8 +120,8 @@ stdenv.mkDerivation rec { "Buch/buch.lst" "Plural/short.lst" "Old/factor.tst" - ] ++ lib.optionals enableGfanlib [ # tests that require gfanlib + # requires "DivRemIdU", a syzextra (undocumented) command "Short/ok_s.lst" ]; diff --git a/pkgs/applications/science/math/speedcrunch/default.nix b/pkgs/applications/science/math/speedcrunch/default.nix index 021c1bedc348a..ed7339ab56775 100644 --- a/pkgs/applications/science/math/speedcrunch/default.nix +++ b/pkgs/applications/science/math/speedcrunch/default.nix @@ -32,6 +32,6 @@ mkDerivation rec { ''; maintainers = with maintainers; [ gebner j0hax ]; inherit (qtbase.meta) platforms; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/applications/science/math/symmetrica/default.nix b/pkgs/applications/science/math/symmetrica/default.nix index d6ec352d32a2f..f215ec0037d49 100644 --- a/pkgs/applications/science/math/symmetrica/default.nix +++ b/pkgs/applications/science/math/symmetrica/default.nix @@ -23,6 +23,10 @@ stdenv.mkDerivation rec { autoreconfHook ]; + # clang warning: passing arguments to '...' without a prototype is deprecated + # in all versions of C and is not supported in C23. + CFLAGS = "-std=c99 -Wno-deprecated-non-prototype"; + enableParallelBuilding = true; meta = with lib; { diff --git a/pkgs/applications/science/math/wolfram-engine/default.nix b/pkgs/applications/science/math/wolfram-engine/default.nix index 685bc1bff3b18..c7a1b585379aa 100644 --- a/pkgs/applications/science/math/wolfram-engine/default.nix +++ b/pkgs/applications/science/math/wolfram-engine/default.nix @@ -2,8 +2,6 @@ , stdenv , autoPatchelfHook , requireFile -, callPackage -, makeWrapper , alsa-lib , dbus , fontconfig @@ -103,9 +101,9 @@ stdenv.mkDerivation rec { # Fix the installation script patchShebangs MathInstaller substituteInPlace MathInstaller \ - --replace '`hostname`' "" \ - --replace "chgrp" "# chgrp" \ - --replace "chown" ": # chown" + --replace-fail '`hostname`' "" \ + --replace-fail "chgrp" "# chgrp" \ + --replace-fail "chown" ": # chown" # Install the desktop items export XDG_DATA_HOME="$out/share" @@ -127,7 +125,7 @@ stdenv.mkDerivation rec { --set QT_XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb" if ! isELF "$out/libexec/${dirName}/SystemFiles/FrontEnd/Binaries/Linux-x86-64/WolframPlayer"; then substituteInPlace $out/libexec/${dirName}/SystemFiles/FrontEnd/Binaries/Linux-x86-64/WolframPlayer \ - --replace "TopDirectory=" "TopDirectory=$out/libexec/${dirName} #"; + --replace-fail "TopDirectory=" "TopDirectory=$out/libexec/${dirName} #"; fi for path in WolframPlayer wolframplayer; do diff --git a/pkgs/applications/science/math/wolfram-engine/l10ns.nix b/pkgs/applications/science/math/wolfram-engine/l10ns.nix index ae1886bae1543..de9b677ab17a4 100644 --- a/pkgs/applications/science/math/wolfram-engine/l10ns.nix +++ b/pkgs/applications/science/math/wolfram-engine/l10ns.nix @@ -4,10 +4,17 @@ , majorVersion ? null }: -let allVersions = with lib; flip map +let allVersions = lib.flip map # N.B. Versions in this list should be ordered from newest to oldest. [ { + version = "14.1.0"; + lang = "en"; + language = "English"; + sha256 = "1kxdvm3i7nn3ws784y972h2br1n0y82kkkjvz7c5llssv6d3pgj8"; + installer = "WolframEngine_14.1.0_LIN.sh"; + } + { version = "13.3.0"; lang = "en"; language = "English"; @@ -45,7 +52,7 @@ let allVersions = with lib; flip map ] ({ version, lang, language, sha256, installer }: { inherit version lang; - name = "wolfram-engine-${version}" + optionalString (lang != "en") "-${lang}"; + name = "wolfram-engine-${version}" + lib.optionalString (lang != "en") "-${lang}"; src = requireFile { name = installer; message = '' @@ -58,14 +65,12 @@ let allVersions = with lib; flip map }; }); minVersion = - with lib; if majorVersion == null - then elemAt (builtins.splitVersion (elemAt allVersions 0).version) 0 + then lib.elemAt (builtins.splitVersion (lib.elemAt allVersions 0).version) 0 else majorVersion; maxVersion = toString (1 + builtins.fromJSON minVersion); in -with lib; -findFirst (l: (l.lang == lang +lib.findFirst (l: (l.lang == lang && l.version >= minVersion && l.version < maxVersion)) (throw "Version ${minVersion} in language ${lang} not supported") diff --git a/pkgs/applications/science/math/wolfram-engine/notebook.nix b/pkgs/applications/science/math/wolfram-engine/notebook.nix index 85570eeca7fbc..07cd0afa3099d 100644 --- a/pkgs/applications/science/math/wolfram-engine/notebook.nix +++ b/pkgs/applications/science/math/wolfram-engine/notebook.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, writeScriptBin, jupyter, wolfram-for-jupyter-kernel }: +{ stdenv, writeScriptBin, jupyter, wolfram-for-jupyter-kernel }: let wolfram-jupyter = jupyter.override { definitions = { wolfram = wolfram-for-jupyter-kernel.definition; }; }; 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/math/yacas/default.nix b/pkgs/applications/science/math/yacas/default.nix index 7fa2fe1a6075e..ad4e3f37d07ff 100644 --- a/pkgs/applications/science/math/yacas/default.nix +++ b/pkgs/applications/science/math/yacas/default.nix @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { description = "Easy to use, general purpose Computer Algebra System${lib.optionalString enableGui ", built with GUI."}"; homepage = "http://www.yacas.org/"; license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ viric ]; + maintainers = [ ]; platforms = with lib.platforms; linux; }; } diff --git a/pkgs/applications/science/medicine/dcmtk/default.nix b/pkgs/applications/science/medicine/dcmtk/default.nix index 0fa41ba08760f..8dc85e2ee1077 100644 --- a/pkgs/applications/science/medicine/dcmtk/default.nix +++ b/pkgs/applications/science/medicine/dcmtk/default.nix @@ -1,7 +1,6 @@ { lib, stdenv, fetchFromGitHub, zlib, libtiff, libxml2, openssl, libiconv , libpng, cmake }: -with lib; stdenv.mkDerivation rec { pname = "dcmtk"; version = "3.6.8"; @@ -17,7 +16,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = { + meta = with lib; { description = "Collection of libraries and applications implementing large parts of the DICOM standard"; longDescription = '' diff --git a/pkgs/applications/science/medicine/xmedcon/default.nix b/pkgs/applications/science/medicine/xmedcon/default.nix index 1f0686cc0dad0..b4170dfa228a7 100644 --- a/pkgs/applications/science/medicine/xmedcon/default.nix +++ b/pkgs/applications/science/medicine/xmedcon/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config wrapGAppsHook3 ]; meta = with lib; { - description = "Open source toolkit for medical image conversion "; + description = "Open source toolkit for medical image conversion"; homepage = "https://xmedcon.sourceforge.net/"; license = licenses.lgpl2Plus; maintainers = with maintainers; [ arianvp flokli ]; diff --git a/pkgs/applications/science/misc/bada-bib/default.nix b/pkgs/applications/science/misc/bada-bib/default.nix index 83abd40030ee5..fba3726329094 100644 --- a/pkgs/applications/science/misc/bada-bib/default.nix +++ b/pkgs/applications/science/misc/bada-bib/default.nix @@ -7,7 +7,6 @@ , gdk-pixbuf , gettext , glib -, gnome , gobject-introspection , gtk4 , gtksourceview5 diff --git a/pkgs/applications/science/misc/boinc/default.nix b/pkgs/applications/science/misc/boinc/default.nix index 68134a99a2035..b8b57857c02aa 100644 --- a/pkgs/applications/science/misc/boinc/default.nix +++ b/pkgs/applications/science/misc/boinc/default.nix @@ -10,7 +10,7 @@ , libGL , libXmu , libXi -, freeglut +, libglut , libjpeg , libtool , wxGTK32 @@ -27,14 +27,14 @@ stdenv.mkDerivation rec { pname = "boinc"; - version = "8.0.3"; + version = "8.0.4"; src = fetchFromGitHub { name = "${pname}-${version}-src"; owner = "BOINC"; repo = "boinc"; rev = "client_release/${lib.versions.majorMinor version}/${version}"; - hash = "sha256-kkEEJp7NTpHwbo03BGjjJAraFQIJcoNyV+oDsCZlzPQ="; + hash = "sha256-dp0zRMIG0PGXhth+Cc8FDhzl5X/4ud3GFCdE7wqPL/c="; }; nativeBuildInputs = [ libtool automake autoconf m4 pkg-config ]; @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { libGL libXmu libXi - freeglut + libglut libjpeg wxGTK32 gtk3 diff --git a/pkgs/applications/science/misc/colmap/default.nix b/pkgs/applications/science/misc/colmap/default.nix index d071c90562cd4..59e58351c0f6b 100644 --- a/pkgs/applications/science/misc/colmap/default.nix +++ b/pkgs/applications/science/misc/colmap/default.nix @@ -1,43 +1,62 @@ -{ mkDerivation, lib, fetchFromGitHub, cmake, boost179, ceres-solver, eigen, +{ lib, fetchFromGitHub, cmake, boost179, ceres-solver, eigen, freeimage, glog, libGLU, glew, qtbase, + flann, + cgal, + gmp, + mpfr, autoAddDriverRunpath, config, - cudaSupport ? config.cudaSupport, cudaPackages + stdenv, + qt5, + xorg, + cudaSupport ? config.cudaSupport, + cudaCapabilities ? cudaPackages.cudaFlags.cudaCapabilities, + cudaPackages }: assert cudaSupport -> cudaPackages != { }; let boost_static = boost179.override { enableStatic = true; }; + stdenv' = if cudaSupport then cudaPackages.backendStdenv else stdenv; # TODO: migrate to redist packages inherit (cudaPackages) cudatoolkit; in -mkDerivation rec { - version = "3.7"; +stdenv'.mkDerivation rec { + version = "3.9.1"; pname = "colmap"; src = fetchFromGitHub { owner = "colmap"; repo = "colmap"; rev = version; - hash = "sha256-uVAw6qwhpgIpHkXgxttKupU9zU+vD0Za0maw2Iv4x+I="; + hash = "sha256-Xb4JOttCMERwPYs5DyGKHw+f9Wik1/rdJQKbgVuygH8="; }; - # TODO: rm once the gcc11 issue is closed, https://github.com/colmap/colmap/issues/1418#issuecomment-1049305256 cmakeFlags = lib.optionals cudaSupport [ - "-DCUDA_ENABLED=ON" - "-DCUDA_NVCC_FLAGS=--std=c++14" + (lib.cmakeBool "CUDA_ENABLED" true) + (lib.cmakeFeature "CMAKE_CUDA_ARCHITECTURES" + (lib.strings.concatStringsSep ";" + (map cudaPackages.cudaFlags.dropDot + cudaCapabilities))) ]; buildInputs = [ boost_static ceres-solver eigen freeimage glog libGLU glew qtbase + flann + cgal + gmp + mpfr + xorg.libSM ] ++ lib.optionals cudaSupport [ cudatoolkit + cudaPackages.cuda_cudart.static ]; nativeBuildInputs = [ cmake + qt5.wrapQtAppsHook ] ++ lib.optionals cudaSupport [ autoAddDriverRunpath ]; diff --git a/pkgs/applications/science/misc/cwltool/default.nix b/pkgs/applications/science/misc/cwltool/default.nix index ab43eac8bffb0..1c616866a173d 100644 --- a/pkgs/applications/science/misc/cwltool/default.nix +++ b/pkgs/applications/science/misc/cwltool/default.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication rec { pname = "cwltool"; - version = "3.1.20240508115724"; + version = "3.1.20240708091337"; pyproject = true; src = fetchFromGitHub { owner = "common-workflow-language"; repo = "cwltool"; rev = "refs/tags/${version}"; - hash = "sha256-hBP/8PIqvs820UsxrRuyMVIWgQGFVcMHCUToxhcupTk="; + hash = "sha256-Umxh8sRBy7fC6+GrcN1q4iO0KVpmUhGPtnqZZK/6c9M="; }; postPatch = '' @@ -24,7 +24,8 @@ python3.pkgs.buildPythonApplication rec { --replace '"schema-salad >= 8.4.20230426093816, < 9",' "" \ --replace "PYTEST_RUNNER + " "" substituteInPlace pyproject.toml \ - --replace "ruamel.yaml>=0.16.0,<0.18" "ruamel.yaml" + --replace "ruamel.yaml>=0.16.0,<0.18" "ruamel.yaml" \ + --replace "mypy==1.10.0" "mypy==1.10.*" ''; nativeBuildInputs = [ diff --git a/pkgs/applications/science/misc/fityk/default.nix b/pkgs/applications/science/misc/fityk/default.nix index 5ec7973065d2f..ed906e7d4c3df 100644 --- a/pkgs/applications/science/misc/fityk/default.nix +++ b/pkgs/applications/science/misc/fityk/default.nix @@ -10,7 +10,7 @@ , xylib , readline , gnuplot -, swig3 +, swig }: stdenv.mkDerivation rec { @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { xylib readline gnuplot - swig3 + swig ]; env.NIX_CFLAGS_COMPILE = toString [ diff --git a/pkgs/applications/science/misc/foldingathome/control.nix b/pkgs/applications/science/misc/foldingathome/control.nix deleted file mode 100644 index a64c973914c66..0000000000000 --- a/pkgs/applications/science/misc/foldingathome/control.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ lib, stdenv -, dpkg -, fahviewer -, fetchurl -, makeWrapper -, python2 -}: -let - majMin = lib.versions.majorMinor version; - version = "7.6.21"; - - python = python2.withPackages - ( - ps: [ - ps.pycairo - ps.pygobject2 - ps.pygtk - ] - ); -in -stdenv.mkDerivation rec { - inherit version; - pname = "fahcontrol"; - - src = fetchurl { - url = "https://download.foldingathome.org/releases/public/release/fahcontrol/debian-stable-64bit/v${majMin}/fahcontrol_${version}-1_all.deb"; - sha256 = "1vfrdqkrvdlyxaw3f6z92w5dllrv6810lmf8yhcmjcwmphipvf71"; - }; - - nativeBuildInputs = [ - dpkg - makeWrapper - ]; - - buildInputs = [ fahviewer python ]; - - unpackPhase = '' - dpkg-deb -x ${src} ./ - ''; - - installPhase = "cp -ar usr $out"; - - postFixup = '' - sed -e "s|/usr/bin|$out/bin|g" -i $out/share/applications/FAHControl.desktop - wrapProgram "$out/bin/FAHControl" \ - --suffix PATH : "${fahviewer.outPath}/bin" \ - --set PYTHONPATH "$out/lib/python2.7/dist-packages" - ''; - - meta = { - description = "Folding@home control"; - homepage = "https://foldingathome.org/"; - license = lib.licenses.unfree; - maintainers = [ lib.maintainers.zimbatm ]; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/pkgs/applications/science/misc/foldingathome/viewer.nix b/pkgs/applications/science/misc/foldingathome/viewer.nix deleted file mode 100644 index 7f28c8d1b1463..0000000000000 --- a/pkgs/applications/science/misc/foldingathome/viewer.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ lib, stdenv -, autoPatchelfHook -, dpkg -, fetchurl -, freeglut -, gcc-unwrapped -, libGL -, libGLU -, makeWrapper -, zlib -}: -let - majMin = lib.versions.majorMinor version; - version = "7.6.21"; -in -stdenv.mkDerivation rec { - inherit version; - pname = "fahviewer"; - - src = fetchurl { - url = "https://download.foldingathome.org/releases/public/release/fahviewer/debian-stable-64bit/v${majMin}/fahviewer_${version}_amd64.deb"; - sha256 = "00fd00pf6fcpplcaahvy9ir60mk69d9rcmwsyq3jrv9mxqm9aq7p"; - }; - - nativeBuildInputs = [ - autoPatchelfHook - dpkg - makeWrapper - ]; - - buildInputs = [ - freeglut - gcc-unwrapped.lib - libGL - libGLU - zlib - ]; - - unpackPhase = '' - dpkg-deb -x ${src} ./ - sed -e "s|/usr/bin|$out/bin|g" -i usr/share/applications/FAHViewer.desktop - ''; - - installPhase = '' - cp -ar usr $out - ''; - - meta = { - description = "Folding@home viewer"; - homepage = "https://foldingathome.org/"; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - license = lib.licenses.unfree; - maintainers = [ lib.maintainers.zimbatm ]; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/pkgs/applications/science/misc/gephi/default.nix b/pkgs/applications/science/misc/gephi/default.nix index 77b6584412a5a..fe638bde1ba46 100644 --- a/pkgs/applications/science/misc/gephi/default.nix +++ b/pkgs/applications/science/misc/gephi/default.nix @@ -1,11 +1,6 @@ { lib, fetchFromGitHub, jdk11, maven, jogl }: -let - mavenJdk11 = maven.override { - jdk = jdk11; - }; -in -mavenJdk11.buildMavenPackage rec { +maven.buildMavenPackage rec { pname = "gephi"; version = "0.10.1"; @@ -16,6 +11,7 @@ mavenJdk11.buildMavenPackage rec { hash = "sha256-ZNSEaiD32zFfF2ISKa1CmcT9Nq6r5i2rNHooQAcVbn4="; }; + mvnJdk = jdk11; mvnHash = "sha256-/2/Yb26Ry0NHQQ3j0LXnjwC0wQqJiztvTgWixyMJqvg="; nativeBuildInputs = [ jdk11 ]; diff --git a/pkgs/applications/science/misc/golly/default.nix b/pkgs/applications/science/misc/golly/default.nix index 52b05cbb7e9b2..b509387fe8838 100644 --- a/pkgs/applications/science/misc/golly/default.nix +++ b/pkgs/applications/science/misc/golly/default.nix @@ -12,6 +12,10 @@ stdenv.mkDerivation rec { wxGTK perl python3 zlib libGLU libGL libX11 SDL2 ]; + nativeBuildInputs = [ + (python3.withPackages (ps: [ps.setuptools])) + ]; + setSourceRoot = '' sourceRoot=$(echo */gui-wx) ''; diff --git a/pkgs/applications/science/misc/gplates/default.nix b/pkgs/applications/science/misc/gplates/default.nix index 5c2c4cabc9f12..72504246b6c0a 100644 --- a/pkgs/applications/science/misc/gplates/default.nix +++ b/pkgs/applications/science/misc/gplates/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , cmake , doxygen , graphviz @@ -42,6 +43,14 @@ in stdenv.mkDerivation (finalAttrs: { hash = "sha256-3fEwm5EKK9RcRbnyUejgwfjdsXaujjZjoMbq/BbVMeM="; }; + patches = [ + (fetchpatch { + name = "qwt-6.3-compile-error-fix.patch"; + url = "https://github.com/GPlates/GPlates/commit/c4680ebe54f4535909085feacecd66410a91ff98.patch"; + hash = "sha256-mw5+GLayMrmcSDd1ai+0JTuY3iedHT9u2kx5Dd2wMjg="; + }) + ]; + nativeBuildInputs = [ cmake doxygen @@ -71,6 +80,6 @@ in stdenv.mkDerivation (finalAttrs: { homepage = "https://www.gplates.org"; license = licenses.gpl2Only; platforms = platforms.all; - broken = stdenv.isDarwin; # FIX: this check: https://github.com/GPlates/GPlates/blob/gplates/cmake/modules/Config_h.cmake#L72 + broken = stdenv.hostPlatform.isDarwin; # FIX: this check: https://github.com/GPlates/GPlates/blob/gplates/cmake/modules/Config_h.cmake#L72 }; }) diff --git a/pkgs/applications/science/misc/graphia/default.nix b/pkgs/applications/science/misc/graphia/default.nix index a5055220e95fb..88fc3a8c0e570 100644 --- a/pkgs/applications/science/misc/graphia/default.nix +++ b/pkgs/applications/science/misc/graphia/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { meta = with lib; { # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/graphia.x86_64-darwin - broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) || stdenv.hostPlatform.isDarwin; description = "Visualisation tool for the creation and analysis of graphs"; homepage = "https://graphia.app"; license = licenses.gpl3Only; diff --git a/pkgs/applications/science/misc/openmvg/default.nix b/pkgs/applications/science/misc/openmvg/default.nix index f622f87d2e412..a535f436ddb19 100644 --- a/pkgs/applications/science/misc/openmvg/default.nix +++ b/pkgs/applications/science/misc/openmvg/default.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { passthru.updateScript = nix-update-script { }; meta = { - broken = stdenv.isDarwin && stdenv.isx86_64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64; description = "Library for computer-vision scientists and targeted for the Multiple View Geometry community"; homepage = "https://openmvg.readthedocs.io/en/latest/"; license = lib.licenses.mpl20; diff --git a/pkgs/applications/science/misc/openmvs/default.nix b/pkgs/applications/science/misc/openmvs/default.nix index 35f46f7a4552b..689ce1ad554ca 100644 --- a/pkgs/applications/science/misc/openmvs/default.nix +++ b/pkgs/applications/science/misc/openmvs/default.nix @@ -33,12 +33,12 @@ stdenv.mkDerivation rec { owner = "cdcseacave"; repo = "openmvs"; rev = "v${version}"; - sha256 = "sha256-j/tGkR73skZiU+bP4j6aZ5CxkbIcHtqKcaUTgNvj0C8="; + hash = "sha256-j/tGkR73skZiU+bP4j6aZ5CxkbIcHtqKcaUTgNvj0C8="; fetchSubmodules = true; }; # SSE is enabled by default - cmakeFlags = lib.optional (!stdenv.isx86_64) "-DOpenMVS_USE_SSE=OFF"; + cmakeFlags = lib.optional (!stdenv.hostPlatform.isx86_64) "-DOpenMVS_USE_SSE=OFF"; buildInputs = [ boostWithZstd diff --git a/pkgs/applications/science/misc/openrefine/default.nix b/pkgs/applications/science/misc/openrefine/default.nix index b94f23671024b..60615b6f09260 100644 --- a/pkgs/applications/science/misc/openrefine/default.nix +++ b/pkgs/applications/science/misc/openrefine/default.nix @@ -7,20 +7,15 @@ , jq , makeWrapper , maven -, writeText }: let - maven' = maven.override { - inherit jdk; - }; - - version = "3.8.1"; + version = "3.8.2"; src = fetchFromGitHub { owner = "openrefine"; repo = "openrefine"; rev = version; - hash = "sha256-MnFwFJdKIU7D8GQgnDvCO+P8r8h1Se/wmbt/Z3EX+3Q="; + hash = "sha256-3KCO9ooYN8PPVirU2wh7wu4feHqugc3JSXWR2aWIanE="; }; npmPkg = buildNpmPackage { @@ -47,7 +42,7 @@ let ''; }; -in maven'.buildMavenPackage { +in maven.buildMavenPackage { inherit src version; pname = "openrefine"; @@ -55,8 +50,10 @@ in maven'.buildMavenPackage { postPatch = '' cp -r ${npmPkg} main/webapp/modules/core/3rdparty ''; + + mvnJdk = jdk; mvnParameters = "-pl !packaging"; - mvnHash = "sha256-0qsKUMV9M0ZaddR5ust8VikSrsutdxVNNezKqR+F/6M="; + mvnHash = "sha256-AuZp+uq5bmb4gnzKvqXeTmBrsCT6qmJOrwtJq9iCkRQ="; nativeBuildInputs = [ makeWrapper ]; @@ -123,7 +120,7 @@ in maven'.buildMavenPackage { fromSource binaryBytecode # maven dependencies ]; - broken = stdenv.isDarwin; # builds, doesn't run + broken = stdenv.hostPlatform.isDarwin; # builds, doesn't run mainProgram = "refine"; }; } diff --git a/pkgs/applications/science/misc/reason-shell/default.nix b/pkgs/applications/science/misc/reason-shell/default.nix index 5491593cc7f70..015b5c97ebf31 100644 --- a/pkgs/applications/science/misc/reason-shell/default.nix +++ b/pkgs/applications/science/misc/reason-shell/default.nix @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ]; diff --git a/pkgs/applications/science/misc/rink/default.nix b/pkgs/applications/science/misc/rink/default.nix index 6b5917e163287..c0b33b3cbedb2 100644 --- a/pkgs/applications/science/misc/rink/default.nix +++ b/pkgs/applications/science/misc/rink/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, rustPlatform, openssl, pkg-config, ncurses -, curl, libiconv, Security }: +, curl, installShellFiles, asciidoctor, libiconv, Security }: rustPlatform.buildRustPackage rec { version = "0.8.0"; @@ -14,13 +14,21 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-j1pQfMjDNu57otOBTVBQEZIx80p4/beEUQdUkAJhvso="; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config installShellFiles asciidoctor ]; buildInputs = [ ncurses ] - ++ (if stdenv.isDarwin then [ curl libiconv Security ] else [ openssl ]); + ++ (if stdenv.hostPlatform.isDarwin then [ curl libiconv Security ] else [ openssl ]); # Some tests fail and/or attempt to use internet servers. doCheck = false; + postBuild = '' + make man + ''; + + postInstall = '' + installManPage build/* + ''; + meta = with lib; { description = "Unit-aware calculator"; mainProgram = "rink"; diff --git a/pkgs/applications/science/misc/root/5.nix b/pkgs/applications/science/misc/root/5.nix index 80f2df0688da3..62f80ee48096a 100644 --- a/pkgs/applications/science/misc/root/5.nix +++ b/pkgs/applications/science/misc/root/5.nix @@ -35,8 +35,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ pcre python3 zlib libxml2 lz4 xz gsl xxHash libxcrypt ] - ++ lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext libGLU libGL ] - ++ lib.optionals (stdenv.isDarwin) [ Cocoa OpenGL ] + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ libX11 libXpm libXft libXext libGLU libGL ] + ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ Cocoa OpenGL ] ; patches = [ @@ -147,7 +147,7 @@ stdenv.mkDerivation rec { "-Dxml=ON" "-Dxrootd=OFF" ] - ++ lib.optional stdenv.isDarwin "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks"; + ++ lib.optional stdenv.hostPlatform.isDarwin "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks"; setupHook = ./setup-hook.sh; @@ -155,7 +155,7 @@ stdenv.mkDerivation rec { homepage = "https://root.cern.ch/"; description = "Data analysis framework"; platforms = platforms.unix; - broken = !stdenv.isx86_64 || stdenv.cc.isClang or false; + broken = !stdenv.hostPlatform.isx86_64 || stdenv.cc.isClang or false; maintainers = with maintainers; [ veprbl ]; license = licenses.lgpl21; }; diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index ded47a661a21a..98fee17478101 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { pname = "root"; - version = "6.32.00"; + version = "6.32.04"; passthru = { tests = import ./tests { inherit callPackage; }; @@ -64,13 +64,15 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://root.cern.ch/download/root_v${version}.source.tar.gz"; - hash = "sha256-EvIDaBpZBBxHTOlSN2Hm8OiGGzvueN9feZqNtVGJ5dI="; + hash = "sha256-Ey8Saq59MO+8zX3NmRt62hiQrleYDvMAwWQh+dTQfqg="; }; clad_src = fetchgit { url = "https://github.com/vgvassilev/clad"; - rev = "refs/tags/v1.5"; # Make sure that this is the same tag as in the ROOT build files! - hash = "sha256-s0DbHfLthv51ZICnTd30O4qG/DyZPk5tADeu3bBRoOw="; + # Make sure that this is the same tag as in the ROOT build files! + # https://github.com/root-project/root/blob/master/interpreter/cling/tools/plugins/clad/CMakeLists.txt#L76 + rev = "refs/tags/v1.6"; + hash = "sha256-Fv3i84lgoifxtyWKhQjj1c4bR9wSl5SPzUh0ZhZBxFI="; }; nativeBuildInputs = [ makeWrapper cmake pkg-config git ]; @@ -107,8 +109,8 @@ stdenv.mkDerivation rec { tbb xrootd ] - ++ lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext libGLU libGL ] - ++ lib.optionals (stdenv.isDarwin) [ Cocoa CoreSymbolication OpenGL ] + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ libX11 libXpm libXft libXext libGLU libGL ] + ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ Cocoa CoreSymbolication OpenGL ] ; patches = [ @@ -147,11 +149,11 @@ stdenv.mkDerivation rec { -e '1iset(nlohmann_json_DIR "${nlohmann_json}/lib/cmake/nlohmann_json/")' patchShebangs build/unix/ - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' # Eliminate impure reference to /System/Library/PrivateFrameworks substituteInPlace core/macosx/CMakeLists.txt \ --replace "-F/System/Library/PrivateFrameworks " "" - '' + lib.optionalString (stdenv.isDarwin && lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11") '' + '' + lib.optionalString (stdenv.hostPlatform.isDarwin && lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11") '' MACOSX_DEPLOYMENT_TARGET=10.16 ''; @@ -163,14 +165,14 @@ stdenv.mkDerivation rec { "-Dfail-on-missing=ON" "-Dfitsio=OFF" "-Dgnuinstall=ON" + "-Dmathmore=ON" "-Dmysql=OFF" "-Dpgsql=OFF" "-Dsqlite=OFF" - "-Dtmva-pymva=OFF" "-Dvdt=OFF" ] ++ lib.optional (stdenv.cc.libc != null) "-DC_INCLUDE_DIRS=${lib.getDev stdenv.cc.libc}/include" - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks" # fatal error: module map file '/nix/store/<hash>-Libsystem-osx-10.12.6/include/module.modulemap' not found @@ -222,6 +224,9 @@ stdenv.mkDerivation rec { ]}" ''; + # error: aligned allocation function of type 'void *(std::size_t, std::align_val_t)' is only available on macOS 10.13 or newer + CXXFLAGS = lib.optional (stdenv.hostPlatform.system == "x86_64-darwin") "-faligned-allocation"; + # To use the debug information on the fly (without installation) # add the outPath of root.debug into NIX_DEBUG_INFO_DIRS (in PATH-like format) # and make sure that gdb from Nixpkgs can be found in PATH. diff --git a/pkgs/applications/science/misc/root/tests/test-thisroot.nix b/pkgs/applications/science/misc/root/tests/test-thisroot.nix index 3540dde8c9138..3610e23acbffb 100644 --- a/pkgs/applications/science/misc/root/tests/test-thisroot.nix +++ b/pkgs/applications/science/misc/root/tests/test-thisroot.nix @@ -3,7 +3,6 @@ , root , bash , fish -, ksh , tcsh , zsh }: runCommand "test-thisroot" diff --git a/pkgs/applications/science/misc/sasview/xhtml2pdf.nix b/pkgs/applications/science/misc/sasview/xhtml2pdf.nix deleted file mode 100644 index b7ace57d74afc..0000000000000 --- a/pkgs/applications/science/misc/sasview/xhtml2pdf.nix +++ /dev/null @@ -1,33 +0,0 @@ -{lib, fetchPypi, buildPythonPackage, html5lib, httplib2, nose, pillow, pypdf2, reportlab}: - -let - #xhtml2pdf specifically requires version "1.0b10" of html5lib - html5 = html5lib.overrideAttrs( oldAttrs: rec { - name = "${oldAttrs.pname}-${version}"; - version = "1.0b10"; - src = oldAttrs.src.override { - inherit version; - sha256 = "1yd068a5c00wd0ajq0hqimv7fd82lhrw0w3s01vbhy9bbd6xapqd"; - }; - }); -in - -buildPythonPackage rec { - pname = "xhtml2pdf"; - version = "0.2.1"; - - buildInputs = [html5]; - propagatedBuildInputs = [httplib2 nose pillow pypdf2 reportlab html5]; - - src = fetchPypi { - inherit pname version; - sha256 = "1n9r8zdk9gc2x539fq60bhszmd421ipj8g78zmsn3njvma1az9k1"; - }; - - meta = { - description = "Pdf converter for the ReportLab Toolkit"; - homepage = "https://github.com/xhtml2pdf/xhtml2pdf"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ rprospero ]; - }; -} diff --git a/pkgs/applications/science/misc/simgrid/default.nix b/pkgs/applications/science/misc/simgrid/default.nix index a2b04e1877f89..40202b8dbaccf 100644 --- a/pkgs/applications/science/misc/simgrid/default.nix +++ b/pkgs/applications/science/misc/simgrid/default.nix @@ -12,12 +12,6 @@ , withoutBin ? false }: -with lib; - -let - optionOnOff = option: if option then "on" else "off"; -in - stdenv.mkDerivation rec { pname = "simgrid"; version = "3.35"; @@ -32,44 +26,45 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ boost ]; nativeBuildInputs = [ cmake perl python3 ] - ++ optionals fortranSupport [ gfortran ] - ++ optionals buildJavaBindings [ openjdk ] - ++ optionals buildPythonBindings [ python3Packages.pybind11 ] - ++ optionals buildDocumentation [ fig2dev ghostscript doxygen ] - ++ optionals bmfSupport [ eigen ] - ++ optionals modelCheckingSupport [ libunwind libevent elfutils ]; + ++ lib.optionals fortranSupport [ gfortran ] + ++ lib.optionals buildJavaBindings [ openjdk ] + ++ lib.optionals buildPythonBindings [ python3Packages.pybind11 ] + ++ lib.optionals buildDocumentation [ fig2dev ghostscript doxygen ] + ++ lib.optionals bmfSupport [ eigen ] + ++ lib.optionals modelCheckingSupport [ libunwind libevent elfutils ]; outputs = [ "out" ] - ++ optionals buildPythonBindings [ "python" ]; + ++ lib.optionals buildPythonBindings [ "python" ]; # "Release" does not work. non-debug mode is Debug compiled with optimization cmakeBuildType = "Debug"; - cmakeFlags = [ - "-Denable_documentation=${optionOnOff buildDocumentation}" - "-Denable_java=${optionOnOff buildJavaBindings}" - "-Denable_python=${optionOnOff buildPythonBindings}" - "-DSIMGRID_PYTHON_LIBDIR=./" # prevents CMake to install in ${python3} dir - "-Denable_msg=${optionOnOff buildJavaBindings}" - "-Denable_fortran=${optionOnOff fortranSupport}" - "-Denable_model-checking=${optionOnOff modelCheckingSupport}" - "-Denable_ns3=off" - "-Denable_lua=off" - "-Denable_lib_in_jar=off" - "-Denable_maintainer_mode=off" - "-Denable_mallocators=on" - "-Denable_debug=on" - "-Denable_smpi=on" - "-Dminimal-bindings=${optionOnOff minimalBindings}" - "-Denable_smpi_ISP_testsuite=${optionOnOff moreTests}" - "-Denable_smpi_MPICH3_testsuite=${optionOnOff moreTests}" - "-Denable_compile_warnings=off" - "-Denable_compile_optimizations=${optionOnOff optimize}" - "-Denable_lto=${optionOnOff optimize}" + cmakeFlags = [ + (lib.cmakeBool "enable_documentation" buildDocumentation) + (lib.cmakeBool "enable_java" buildJavaBindings) + (lib.cmakeBool "enable_python" buildPythonBindings) + (lib.cmakeFeature "SIMGRID_PYTHON_LIBDIR" "./") # prevents CMake to install in ${python3} dir + (lib.cmakeBool "enable_msg" buildJavaBindings) + (lib.cmakeBool "enable_fortran" fortranSupport) + (lib.cmakeBool "enable_model-checking" modelCheckingSupport) + (lib.cmakeBool "enable_ns3" false) + (lib.cmakeBool "enable_lua" false) + (lib.cmakeBool "enable_lib_in_jar" false) + (lib.cmakeBool "enable_maintainer_mode" false) + (lib.cmakeBool "enable_mallocators" true) + (lib.cmakeBool "enable_debug" true) + (lib.cmakeBool "enable_smpi" true) + (lib.cmakeBool "minimal-bindings" minimalBindings) + (lib.cmakeBool "enable_smpi_ISP_testsuite" moreTests) + (lib.cmakeBool "enable_smpi_MPICH3_testsuite" moreTests) + (lib.cmakeBool "enable_compile_warnings" false) + (lib.cmakeBool "enable_compile_optimizations" optimize) + (lib.cmakeBool "enable_lto" optimize) # RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/ - "-DCMAKE_SKIP_BUILD_RPATH=ON" + (lib.cmakeBool "CMAKE_SKIP_BUILD_RPATH" optimize) ]; - makeFlags = optional debug "VERBOSE=1"; + + makeFlags = lib.optional debug "VERBOSE=1"; # needed to run tests and to ensure correct shabangs in output scripts preBuild = '' @@ -106,7 +101,7 @@ stdenv.mkDerivation rec { hardeningDisable = lib.optionals debug [ "fortify" ]; dontStrip = debug; - meta = { + meta = with lib; { description = "Framework for the simulation of distributed applications"; longDescription = '' SimGrid is a toolkit that provides core functionalities for the @@ -120,6 +115,6 @@ stdenv.mkDerivation rec { license = licenses.lgpl2Plus; maintainers = with maintainers; [ mickours mpoquet ]; platforms = platforms.all; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/applications/science/misc/snakemake/default.nix b/pkgs/applications/science/misc/snakemake/default.nix index 7f0e70c642134..07cc2ceaedcc2 100644 --- a/pkgs/applications/science/misc/snakemake/default.nix +++ b/pkgs/applications/science/misc/snakemake/default.nix @@ -1,30 +1,26 @@ { lib -, fetchFromGitHub +, fetchPypi , python3 -, runtimeShell +, stress }: python3.pkgs.buildPythonApplication rec { pname = "snakemake"; - version = "8.14.0"; + version = "8.20.1"; format = "setuptools"; - src = fetchFromGitHub { - owner = "snakemake"; - repo = pname; - rev = "refs/tags/v${version}"; - hash = "sha256-6oguN4u4OUDXpDsbueSBNwtWgLCaKmgq3w/d/MsMh7Y="; - # https://github.com/python-versioneer/python-versioneer/issues/217 - postFetch = '' - sed -i "$out"/snakemake/_version.py -e 's#git_refnames = ".*"#git_refnames = " (tag: v${version})"#' - ''; + src = fetchPypi { + inherit pname version; + hash = "sha256-adNwIA1z/TwWsa0gQb4hAsUvHInjd30sm1dYKXvvXy8="; }; postPatch = '' patchShebangs --build tests/ - patchShebangs --host snakemake/executors/jobscript.sh - substituteInPlace snakemake/shell.py \ - --replace "/bin/sh" "${runtimeShell}" + substituteInPlace tests/common.py \ + --replace-fail 'os.environ["PYTHONPATH"] = os.getcwd()' "pass" \ + --replace-fail 'del os.environ["PYTHONPATH"]' "pass" + substituteInPlace snakemake/unit_tests/__init__.py \ + --replace-fail '"unit_tests/templates"' '"'"$PWD"'/snakemake/unit_tests/templates"' ''; propagatedBuildInputs = with python3.pkgs; [ @@ -41,6 +37,7 @@ python3.pkgs.buildPythonApplication rec { nbformat psutil pulp + pygments pyyaml requests reretry @@ -66,16 +63,54 @@ python3.pkgs.buildPythonApplication rec { numpy pandas pytestCheckHook + pytest-mock requests-mock snakemake-executor-plugin-cluster-generic + snakemake-storage-plugin-fs + stress ]; - disabledTestPaths = [ - "tests/test_conda_python_3_7_script/test_script.py" + pytestFlagsArray = [ + "tests/tests.py" + "tests/test_expand.py" + "tests/test_io.py" + "tests/test_schema.py" + "tests/test_executor_test_suite.py" + "tests/test_api.py" ]; + # Some will be disabled via https://github.com/snakemake/snakemake/pull/3074 disabledTests = [ + # requires graphviz + "test_filegraph" + # requires s3 + "test_storage" + "test_default_storage" + "test_output_file_cache_storage" + # requires peppy and eido + "test_pep" + "test_modules_peppy" + # requires perl + "test_shadow" + # requires snakemake-storage-plugin-http + "test_ancient" + "test_modules_prefix" + # requires snakemake-storage-plugin-s3 "test_deploy_sources" + # requires modules + "test_env_modules" + # issue with locating template file + "test_generate_unit_tests" + # weird + "test_strict_mode" + "test_issue1256" + "test_issue2574" + "test_github_issue1384" + # future-proofing + "conda" + "singularity" + "apptainer" + "container" ]; pythonImportsCheck = [ diff --git a/pkgs/applications/science/misc/toil/default.nix b/pkgs/applications/science/misc/toil/default.nix deleted file mode 100644 index 9142676fff48d..0000000000000 --- a/pkgs/applications/science/misc/toil/default.nix +++ /dev/null @@ -1,90 +0,0 @@ -{ lib -, fetchFromGitHub -, python3 -, rsync -}: - -python3.pkgs.buildPythonApplication rec { - pname = "toil"; - version = "5.12.0"; - format = "setuptools"; - - src = fetchFromGitHub { - owner = "DataBiosphere"; - repo = pname; - rev = "refs/tags/releases/${version}"; - hash = "sha256-cTpbQo9tPZifUO59vbnIa3XUinFJ2/5Slfe4yszglFM="; - }; - - propagatedBuildInputs = with python3.pkgs; [ - addict - dill - docker - enlighten - psutil - py-tes - pypubsub - python-dateutil - pytz - pyyaml - requests - typing-extensions - ]; - - nativeCheckInputs = [ - rsync - ] ++ (with python3.pkgs; [ - boto - botocore - flask - pytestCheckHook - stubserver - ]); - - pytestFlagsArray = [ - "src/toil/test" - ]; - - pythonImportsCheck = [ - "toil" - ]; - - disabledTestPaths = [ - # Tests are reaching their timeout - "src/toil/test/docs/scriptsTest.py" - "src/toil/test/jobStores/jobStoreTest.py" - "src/toil/test/provisioners/aws/awsProvisionerTest.py" - "src/toil/test/src" - "src/toil/test/wdl" - "src/toil/test/utils/utilsTest.py" - "src/toil/test/cwl/cwlTest.py" - "src/toil/test/lib/test_ec2.py" - "src/toil/test/lib/aws/test_iam.py" - "src/toil/test/lib/aws/test_s3.py" - ]; - - disabledTests = [ - # Tests fail starting with 5.7.1 - "testServices" - "testConcurrencyWithDisk" - "testJobConcurrency" - "testNestedResourcesDoNotBlock" - "test_omp_threads" - "testFileSingle" - "testFileSingle10000" - "testFileSingleCheckpoints" - "testFileSingleNonCaching" - "testFetchJobStoreFiles" - "testFetchJobStoreFilesWSymlinks" - "testJobStoreContents" - "test_cwl_on_arm" - "test_cwl_toil_kill" - ]; - - meta = with lib; { - description = "Workflow engine written in pure Python"; - homepage = "https://toil.ucsc-cgl.org/"; - license = with licenses; [ asl20 ]; - maintainers = with maintainers; [ veprbl ]; - }; -} diff --git a/pkgs/applications/science/misc/tulip/default.nix b/pkgs/applications/science/misc/tulip/default.nix index 9808a572836d8..590b429e73f0e 100644 --- a/pkgs/applications/science/misc/tulip/default.nix +++ b/pkgs/applications/science/misc/tulip/default.nix @@ -12,15 +12,15 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake wrapQtAppsHook ] - ++ lib.optionals stdenv.isLinux [ autoPatchelfHook ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; buildInputs = [ libxml2 freetype glew libjpeg qtbase python3 ] - ++ lib.optionals stdenv.isDarwin [ llvmPackages.openmp ] - ++ lib.optionals stdenv.isLinux [ libGLU libGL ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ llvmPackages.openmp ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ libGLU libGL ]; qtWrapperArgs = [ ''--prefix PATH : ${lib.makeBinPath [ python3 ]}'' ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin (toString [ + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin (toString [ # fatal error: 'Python.h' file not found "-I${python3}/include/${python3.libPrefix}" # error: format string is not a string literal (potentially insecure) diff --git a/pkgs/applications/science/misc/vite/default.nix b/pkgs/applications/science/misc/vite/default.nix index f1c9329c94df9..8cf8ceb497a84 100644 --- a/pkgs/applications/science/misc/vite/default.nix +++ b/pkgs/applications/science/misc/vite/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { homepage = "http://vite.gforge.inria.fr/"; license = lib.licenses.cecill20; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix index 6531002ceb31b..1eed4ff7c3d60 100644 --- a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix +++ b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix @@ -40,13 +40,13 @@ let source = if enablePlumed then { - version = "2023"; - hash = "sha256-rJLG2nL7vMpBT9io2Xnlbs8XxMHNq+0tpc+05yd7e6g="; + version = "2024.2"; + hash = "sha256-gCp+M18uiVdw9XsVnk7DaOuw/yzm2sz3BsboAlw2hSs="; } else { - version = "2024.2"; - hash = "sha256-gCp+M18uiVdw9XsVnk7DaOuw/yzm2sz3BsboAlw2hSs="; + version = "2024.3"; + hash = "sha256-u9oFbuWTkL59WNhME6nsDU42NWF63y63RwNJIsuh8Ck="; }; in stdenv.mkDerivation rec { @@ -61,7 +61,7 @@ in stdenv.mkDerivation rec { patches = [ ./pkgconfig.patch ]; postPatch = lib.optionalString enablePlumed '' - plumed patch -p -e gromacs-2023 + plumed patch -p -e gromacs-${source.version} ''; outputs = [ "out" "dev" "man" ]; @@ -83,7 +83,7 @@ in stdenv.mkDerivation rec { cudaPackages.cuda_cudart cudaPackages.libcufft cudaPackages.cuda_profiler_api - ] ++ lib.optional stdenv.isDarwin llvmPackages.openmp; + ] ++ lib.optional stdenv.hostPlatform.isDarwin llvmPackages.openmp; propagatedBuildInputs = lib.optional enableMpi mpi; propagatedUserEnvPkgs = lib.optional enableMpi mpi; diff --git a/pkgs/applications/science/molecular-dynamics/lammps/default.nix b/pkgs/applications/science/molecular-dynamics/lammps/default.nix deleted file mode 100644 index b881d339300c4..0000000000000 --- a/pkgs/applications/science/molecular-dynamics/lammps/default.nix +++ /dev/null @@ -1,121 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, libpng -, gzip -, fftw -, blas -, lapack -, cmake -, autoAddDriverRunpath -, pkg-config -# Available list of packages can be found near here: -# -# - https://github.com/lammps/lammps/blob/develop/cmake/CMakeLists.txt#L222 -# - https://docs.lammps.org/Build_extras.html -, packages ? { - ASPHERE = true; - BODY = true; - CLASS2 = true; - COLLOID = true; - COMPRESS = true; - CORESHELL = true; - DIPOLE = true; - GRANULAR = true; - KSPACE = true; - MANYBODY = true; - MC = true; - MISC = true; - MOLECULE = true; - OPT = true; - PERI = true; - QEQ = true; - REPLICA = true; - RIGID = true; - SHOCK = true; - ML-SNAP = true; - SRD = true; - REAXFF = true; -} -# Extra cmakeFlags to add as "-D${attr}=${value}" -, extraCmakeFlags ? {} -# Extra `buildInputs` - meant for packages that require more inputs -, extraBuildInputs ? [] -}: - -stdenv.mkDerivation (finalAttrs: { - # LAMMPS has weird versioning convention. Updates should go smoothly with: - # nix-update --commit lammps --version-regex 'stable_(.*)' - version = "2Aug2023_update3"; - pname = "lammps"; - - src = fetchFromGitHub { - owner = "lammps"; - repo = "lammps"; - rev = "stable_${finalAttrs.version}"; - hash = "sha256-jx0hkiYxQlnE2sa4WTvluEgphF//sNbK91VGAQJMwjw="; - }; - preConfigure = '' - cd cmake - ''; - nativeBuildInputs = [ - cmake - pkg-config - # Although not always needed, it is needed if cmakeFlags include - # GPU_API=cuda, and it doesn't users that don't enable the GPU package. - autoAddDriverRunpath - ]; - - passthru = { - # Remove these at some point - perhaps after release 23.11. See discussion at: - # https://github.com/NixOS/nixpkgs/pull/238771#discussion_r1235459961 - mpi = throw "`lammps-mpi.passthru.mpi` was removed in favor of `extraBuildInputs`"; - inherit packages; - inherit extraCmakeFlags; - inherit extraBuildInputs; - }; - cmakeFlags = [ - ] - ++ (builtins.map (p: "-DPKG_${p}=ON") (builtins.attrNames (lib.filterAttrs (n: v: v) packages))) - ++ (lib.mapAttrsToList (n: v: "-D${n}=${v}") extraCmakeFlags) - ; - - buildInputs = [ - fftw - libpng - blas - lapack - gzip - ] ++ extraBuildInputs - ; - - postInstall = '' - # For backwards compatibility - ln -s $out/bin/lmp $out/bin/lmp_serial - # Install vim and neovim plugin - install -Dm644 ../../tools/vim/lammps.vim $out/share/vim-plugins/lammps/syntax/lammps.vim - install -Dm644 ../../tools/vim/filetype.vim $out/share/vim-plugins/lammps/ftdetect/lammps.vim - mkdir -p $out/share/nvim - ln -s $out/share/vim-plugins/lammps $out/share/nvim/site - ''; - - meta = with lib; { - description = "Classical Molecular Dynamics simulation code"; - longDescription = '' - LAMMPS is a classical molecular dynamics simulation code designed to - run efficiently on parallel computers. It was developed at Sandia - National Laboratories, a US Department of Energy facility, with - funding from the DOE. It is an open-source code, distributed freely - under the terms of the GNU Public License (GPL). - ''; - homepage = "https://www.lammps.org"; - license = licenses.gpl2Only; - platforms = platforms.linux; - # compiling lammps with 64 bit support blas and lapack might cause runtime - # segfaults. In anycase both blas and lapack should have the same #bits - # support. - broken = (blas.isILP64 && lapack.isILP64); - maintainers = [ maintainers.costrouc maintainers.doronbehar ]; - mainProgram = "lmp"; - }; -}) diff --git a/pkgs/applications/science/networking/sumo/default.nix b/pkgs/applications/science/networking/sumo/default.nix index 6f5be3df816eb..4906b0b80c769 100644 --- a/pkgs/applications/science/networking/sumo/default.nix +++ b/pkgs/applications/science/networking/sumo/default.nix @@ -1,4 +1,4 @@ -{ lib, bzip2, cmake, eigen, fetchFromGitHub, ffmpeg_4, fox_1_6, gdal, +{ lib, bzip2, cmake, eigen, fetchFromGitHub, ffmpeg_7, fox_1_6, gdal, git, gl2ps, gpp , gtest, jdk, libGL, libGLU, libX11, libjpeg, libpng, libtiff, libxcrypt, openscenegraph , proj, python3, python3Packages, stdenv, swig, xercesc, xorg, zlib }: @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "eclipse"; repo = "sumo"; rev = "v${lib.replaceStrings ["."] ["_"] version}"; - sha256 = "sha256-y/bkdDWrb1KB0EOVSJPfPVYHGp/zQ2+Shb6eLsFQRNQ="; + hash = "sha256-y/bkdDWrb1KB0EOVSJPfPVYHGp/zQ2+Shb6eLsFQRNQ="; fetchSubmodules = true; }; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { buildInputs = [ bzip2 eigen - ffmpeg_4 + ffmpeg_7 fox_1_6 gdal gl2ps diff --git a/pkgs/applications/science/physics/crystfel/default.nix b/pkgs/applications/science/physics/crystfel/default.nix index e7eb69fb4e1c1..b6f8a0d6f13c9 100644 --- a/pkgs/applications/science/physics/crystfel/default.nix +++ b/pkgs/applications/science/physics/crystfel/default.nix @@ -75,7 +75,7 @@ let let version = "7.4.0"; src = - if stdenv.isDarwin then + if stdenv.hostPlatform.isDarwin then fetchurl { url = "https://www.mrc-lmb.cam.ac.uk/mosflm/mosflm/ver${builtins.replaceStrings [ "." ] [ "" ] version}/pre-built/mosflm-osx-64-noX11.zip"; @@ -86,7 +86,7 @@ let url = "https://www.mrc-lmb.cam.ac.uk/mosflm/mosflm/ver${builtins.replaceStrings [ "." ] [ "" ] version}/pre-built/mosflm-linux-64-noX11.zip"; hash = "sha256:1f2qins5kaz5v6mkaclncqpirx3mlz177ywm13py9p6s9mk99g32"; }; - mosflmBinary = if stdenv.isDarwin then "bin/mosflm" else "mosflm-linux-64-noX11"; + mosflmBinary = if stdenv.hostPlatform.isDarwin then "bin/mosflm" else "mosflm-linux-64-noX11"; in stdenv.mkDerivation { pname = "mosflm"; @@ -209,9 +209,9 @@ stdenv.mkDerivation rec { xgandalf pandoc ] ++ lib.optionals withGui [ gtk3 gdk-pixbuf ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ argp-standalone - ] ++ lib.optionals (stdenv.isDarwin && !stdenv.isAarch64) [ + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isAarch64) [ memorymappingHook ] ++ lib.optionals withBitshuffle [ hdf5-external-filter-plugins ]; diff --git a/pkgs/applications/science/physics/elmerfem/default.nix b/pkgs/applications/science/physics/elmerfem/default.nix index 4b19bc4b17b48..309e81fad7463 100644 --- a/pkgs/applications/science/physics/elmerfem/default.nix +++ b/pkgs/applications/science/physics/elmerfem/default.nix @@ -2,7 +2,6 @@ , stdenv , fetchFromGitHub , cmake -, git , gfortran , mpi , blas diff --git a/pkgs/applications/science/physics/fasthenry/default.nix b/pkgs/applications/science/physics/fasthenry/default.nix index 6b9a73f6dd175..963828e18edc4 100644 --- a/pkgs/applications/science/physics/fasthenry/default.nix +++ b/pkgs/applications/science/physics/fasthenry/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { SHELL="sh" "all" ) - '' + (if stdenv.isx86_64 then '' + '' + (if stdenv.hostPlatform.isx86_64 then '' makeFlagsArray+=( CFLAGS="-fcommon -O -DFOUR -m64" ); diff --git a/pkgs/applications/science/physics/nnpdf/default.nix b/pkgs/applications/science/physics/nnpdf/default.nix index a4762323dcf95..c1de306e6bf05 100644 --- a/pkgs/applications/science/physics/nnpdf/default.nix +++ b/pkgs/applications/science/physics/nnpdf/default.nix @@ -60,7 +60,5 @@ stdenv.mkDerivation rec { license = licenses.gpl3Only; maintainers = [ maintainers.veprbl ]; platforms = platforms.unix; - # never built on aarch64-darwin since first introduction in nixpkgs - broken = (stdenv.isDarwin && stdenv.isAarch64) || (stdenv.isLinux && stdenv.isAarch64); }; } diff --git a/pkgs/applications/science/physics/professor/default.nix b/pkgs/applications/science/physics/professor/default.nix index 1c6c21c52fef8..60a030f528211 100644 --- a/pkgs/applications/science/physics/professor/default.nix +++ b/pkgs/applications/science/physics/professor/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace Makefile \ --replace-fail 'pip install ' 'pip install --prefix $(out) ' - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace Makefile \ --replace-fail '-shared -o' '-shared -install_name "$(out)/$@" -o' ''; diff --git a/pkgs/applications/science/physics/sacrifice/default.nix b/pkgs/applications/science/physics/sacrifice/default.nix index dbe2365371393..b6b53446473fc 100644 --- a/pkgs/applications/science/physics/sacrifice/default.nix +++ b/pkgs/applications/science/physics/sacrifice/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { preConfigure = '' substituteInPlace configure --replace HAVE_LCG=yes HAVE_LCG=no '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace configure --replace LIB_SUFFIX=\"so\" LIB_SUFFIX=\"dylib\" ''; @@ -29,7 +29,7 @@ stdenv.mkDerivation { "--with-pythia=${pythia}" ]; - postInstall = if stdenv.isDarwin then '' + postInstall = if stdenv.hostPlatform.isDarwin then '' install_name_tool -add_rpath ${pythia}/lib "$out"/bin/run-pythia '' else '' wrapProgram $out/bin/run-pythia \ @@ -46,6 +46,6 @@ stdenv.mkDerivation { platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ veprbl ]; # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin && stdenv.isAarch64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; }; } diff --git a/pkgs/applications/science/physics/sherpa/default.nix b/pkgs/applications/science/physics/sherpa/default.nix index 21a5ee7ec234a..2dfe3f7d7bb2c 100644 --- a/pkgs/applications/science/physics/sherpa/default.nix +++ b/pkgs/applications/science/physics/sherpa/default.nix @@ -35,6 +35,6 @@ stdenv.mkDerivation rec { platforms = platforms.unix; maintainers = with maintainers; [ veprbl ]; # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin && stdenv.isAarch64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; }; } diff --git a/pkgs/applications/science/physics/xfitter/default.nix b/pkgs/applications/science/physics/xfitter/default.nix index 8a92c85a13830..e509f3a005f7e 100644 --- a/pkgs/applications/science/physics/xfitter/default.nix +++ b/pkgs/applications/science/physics/xfitter/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; # workaround wrong library IDs - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' ln -sv "$out/lib/xfitter/"* "$out/lib/" ''; diff --git a/pkgs/applications/science/physics/xnec2c/default.nix b/pkgs/applications/science/physics/xnec2c/default.nix index ffdd4b6d0b07f..aaff1ff40d313 100644 --- a/pkgs/applications/science/physics/xnec2c/default.nix +++ b/pkgs/applications/science/physics/xnec2c/default.nix @@ -38,6 +38,6 @@ stdenv.mkDerivation rec { platforms = platforms.unix; # Darwin support likely to be fixed upstream in the next release - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/applications/science/programming/groove/default.nix b/pkgs/applications/science/programming/groove/default.nix index fb314cdff30ce..6350d0badee9f 100644 --- a/pkgs/applications/science/programming/groove/default.nix +++ b/pkgs/applications/science/programming/groove/default.nix @@ -50,6 +50,6 @@ in stdenv.mkDerivation rec { license = licenses.asl20; sourceProvenance = with sourceTypes; [ binaryBytecode ]; platforms = platforms.all; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/science/robotics/emuflight-configurator/default.nix b/pkgs/applications/science/robotics/emuflight-configurator/default.nix index 9669d48e744e0..66b9cf0efa8ea 100644 --- a/pkgs/applications/science/robotics/emuflight-configurator/default.nix +++ b/pkgs/applications/science/robotics/emuflight-configurator/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "emuflight-configurator"; - version = "0.4.1"; + version = "0.4.3"; src = fetchurl { url = "https://github.com/emuflight/EmuConfigurator/releases/download/${version}/emuflight-configurator_${version}_linux64.zip"; - sha256 = "sha256-e4HNg5yr9V5LyT0hYP6gzw0tZm4dLidJg5MQtH3L3JI="; + sha256 = "sha256-7NcN1wF3BUClJBVm13VnV80N/+a2jAEIRqB/x9+GDEg="; }; nativeBuildInputs = [ wrapGAppsHook3 unzip copyDesktopItems ]; diff --git a/pkgs/applications/science/robotics/mavproxy/default.nix b/pkgs/applications/science/robotics/mavproxy/default.nix index f86ca5f635e48..e36b3d62b696f 100644 --- a/pkgs/applications/science/robotics/mavproxy/default.nix +++ b/pkgs/applications/science/robotics/mavproxy/default.nix @@ -25,7 +25,7 @@ buildPythonApplication rec { pyserial setuptools wxpython - ] ++ lib.optionals stdenv.isDarwin [ billiard gnureadline ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ billiard gnureadline ]; # No tests doCheck = false; diff --git a/pkgs/applications/science/robotics/mujoco/default.nix b/pkgs/applications/science/robotics/mujoco/default.nix deleted file mode 100644 index d4a7a961d3984..0000000000000 --- a/pkgs/applications/science/robotics/mujoco/default.nix +++ /dev/null @@ -1,192 +0,0 @@ -{ cereal_1_3_2 -, cmake -, fetchFromGitHub -, fetchFromGitLab -, glfw -, glm -, lib -, spdlog -, stdenv -}: - -let - pin = { - # TODO: Check the following file and ensure the dependencies are up-to-date - # See https://github.com/google-deepmind/mujoco/blob/<VERSION>/cmake/MujocoDependencies.cmake#L17-L64 - abseil-cpp = fetchFromGitHub { - owner = "abseil"; - repo = "abseil-cpp"; - rev = "d7aaad83b488fd62bd51c81ecf16cd938532cc0a"; - hash = "sha256-eA2/dZpNOlex1O5PNa3XSZhpMB3AmaIoHzVDI9TD/cg="; - }; - benchmark = fetchFromGitHub { - owner = "google"; - repo = "benchmark"; - rev = "e45585a4b8e75c28479fa4107182c28172799640"; - hash = "sha256-pgHvmRpPd99ePUVRsi7WXLVSZngZ5q6r1vWW4mdGvxY="; - }; - ccd = fetchFromGitHub { - owner = "danfis"; - repo = "libccd"; - rev = "7931e764a19ef6b21b443376c699bbc9c6d4fba8"; - hash = "sha256-TIZkmqQXa0+bSWpqffIgaBela0/INNsX9LPM026x1Wk="; - }; - eigen3 = fetchFromGitLab { - owner = "libeigen"; - repo = "eigen"; - rev = "2a9055b50ed22101da7d77e999b90ed50956fe0b"; - hash = "sha256-tx/XR7xJ7IMh5RMvL8wRo/g+dfD3xcjZkLPSY4D9HaY="; - }; - googletest = fetchFromGitHub { - owner = "google"; - repo = "googletest"; - rev = "f8d7d77c06936315286eb55f8de22cd23c188571"; - hash = "sha256-t0RchAHTJbuI5YW4uyBPykTvcjy90JW9AOPNjIhwh6U="; - }; - lodepng = fetchFromGitHub { - owner = "lvandeve"; - repo = "lodepng"; - rev = "b4ed2cd7ecf61d29076169b49199371456d4f90b"; - hash = "sha256-5cCkdj/izP4e99BKfs/Mnwu9aatYXjlyxzzYiMD/y1M="; - }; - qhull = fetchFromGitHub { - owner = "qhull"; - repo = "qhull"; - rev = "0c8fc90d2037588024d9964515c1e684f6007ecc"; - hash = "sha256-Ptzxad3ewmKJbbcmrBT+os4b4SR976zlCG9F0nq0x94="; - }; - tinyobjloader = fetchFromGitHub { - owner = "tinyobjloader"; - repo = "tinyobjloader"; - rev = "1421a10d6ed9742f5b2c1766d22faa6cfbc56248"; - hash = "sha256-9z2Ne/WPCiXkQpT8Cun/pSGUwgClYH+kQ6Dx1JvW6w0="; - }; - tinyxml2 = fetchFromGitHub { - owner = "leethomason"; - repo = "tinyxml2"; - rev = "9a89766acc42ddfa9e7133c7d81a5bda108a0ade"; - hash = "sha256-YGAe4+Ttv/xeou+9FoJjmQCKgzupTYdDhd+gzvtz/88="; - }; - marchingcubecpp = fetchFromGitHub { - owner = "aparis69"; - repo = "MarchingCubeCpp"; - rev = "f03a1b3ec29b1d7d865691ca8aea4f1eb2c2873d"; - hash = "sha256-90ei0lpJA8XuVGI0rGb3md0Qtq8/bdkU7dUCHpp88Bw="; - }; - - tmd = stdenv.mkDerivation rec { - name = "TriangleMeshDistance"; - - src = fetchFromGitHub { - owner = "InteractiveComputerGraphics"; - repo = name; - rev = "e55a15c20551f36242fd6368df099a99de71d43a"; - hash = "sha256-vj6TMMT8mp7ciLa5nzVAhMWPcAHXq+ZwHlWsRA3uCmg="; - }; - - installPhase = '' - mkdir -p $out/include/tmd - cp ${name}/include/tmd/${name}.h $out/include/tmd/ - ''; - }; - - sdflib = stdenv.mkDerivation rec { - name = "SdfLib"; - - src = fetchFromGitHub { - owner = "UPC-ViRVIG"; - repo = name; - rev = "1927bee6bb8225258a39c8cbf14e18a4d50409ae"; - hash = "sha256-+SFUOdZ6pGZvnQa0mT+yfbTMHWe2CTOlroXcuVBHdOE="; - }; - - patches = [ ./sdflib-system-deps.patch ]; - - cmakeFlags = [ - "-DSDFLIB_USE_ASSIMP=OFF" - "-DSDFLIB_USE_OPENMP=OFF" - "-DSDFLIB_USE_ENOKI=OFF" - "-DSDFLIB_USE_SYSTEM_GLM=ON" - "-DSDFLIB_USE_SYSTEM_SPDLOG=ON" - "-DSDFLIB_USE_SYSTEM_CEREAL=ON" - "-DSDFLIB_USE_SYSTEM_TRIANGLEMESHDISTANCE=ON" - ]; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ - pin.tmd - - # Mainline. The otherwise pinned glm realease from 2018 does - # not build due to test failures and missing files. - glm - - spdlog - cereal_1_3_2 - ]; - }; - - }; - -in stdenv.mkDerivation rec { - pname = "mujoco"; - version = "3.1.6"; - - # Bumping version? Make sure to look though the MuJoCo's commit - # history for bumped dependency pins! - src = fetchFromGitHub { - owner = "google-deepmind"; - repo = "mujoco"; - rev = "refs/tags/${version}"; - hash = "sha256-64zUplr1E5WSb5RpTW9La1zKVT67a1VrftiUqc2SHlU="; - }; - - patches = [ ./mujoco-system-deps-dont-fetch.patch ]; - - nativeBuildInputs = [ cmake ]; - - buildInputs = [ - pin.sdflib - glm - - # non-numerical - spdlog - cereal_1_3_2 - glfw - ]; - - cmakeFlags = [ - "-DMUJOCO_USE_SYSTEM_sdflib=ON" - "-DMUJOCO_SIMULATE_USE_SYSTEM_GLFW=ON" - "-DMUJOCO_SAMPLES_USE_SYSTEM_GLFW=ON" - ]; - - # Move things into place so that cmake doesn't try downloading dependencies. - preConfigure = '' - mkdir -p build/_deps - ln -s ${pin.abseil-cpp} build/_deps/abseil-cpp-src - ln -s ${pin.benchmark} build/_deps/benchmark-src - ln -s ${pin.ccd} build/_deps/ccd-src - ln -s ${pin.eigen3} build/_deps/eigen3-src - ln -s ${pin.googletest} build/_deps/googletest-src - ln -s ${pin.lodepng} build/_deps/lodepng-src - ln -s ${pin.qhull} build/_deps/qhull-src - ln -s ${pin.tinyobjloader} build/_deps/tinyobjloader-src - ln -s ${pin.tinyxml2} build/_deps/tinyxml2-src - ln -s ${pin.marchingcubecpp} build/_deps/marchingcubecpp-src - ''; - - passthru.pin = { inherit (pin) lodepng eigen3 abseil-cpp; }; - - meta = { - description = "Multi-Joint dynamics with Contact. A general purpose physics simulator"; - homepage = "https://mujoco.org/"; - changelog = "https://github.com/google-deepmind/mujoco/releases/tag/${version}"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ - GaetanLepage - samuela - tmplt - ]; - broken = stdenv.isDarwin; - }; -} diff --git a/pkgs/applications/science/robotics/mujoco/mujoco-system-deps-dont-fetch.patch b/pkgs/applications/science/robotics/mujoco/mujoco-system-deps-dont-fetch.patch deleted file mode 100644 index c09787ff84c5e..0000000000000 --- a/pkgs/applications/science/robotics/mujoco/mujoco-system-deps-dont-fetch.patch +++ /dev/null @@ -1,519 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index eea180c0..efb39178 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -93,7 +93,7 @@ add_subdirectory(src/render) - add_subdirectory(src/thread) - add_subdirectory(src/ui) - --target_compile_definitions(mujoco PRIVATE _GNU_SOURCE CCD_STATIC_DEFINE MUJOCO_DLL_EXPORTS -DMC_IMPLEM_ENABLE) -+target_compile_definitions(mujoco PRIVATE _GNU_SOURCE MUJOCO_DLL_EXPORTS -DMC_IMPLEM_ENABLE) - if(MUJOCO_ENABLE_AVX_INTRINSICS) - target_compile_definitions(mujoco PUBLIC mjUSEPLATFORMSIMD) - endif() -@@ -118,7 +118,7 @@ target_link_libraries( - lodepng - qhullstatic_r - tinyobjloader -- tinyxml2 -+ tinyxml2::tinyxml2 - ) - - set_target_properties( -diff --git a/cmake/MujocoDependencies.cmake b/cmake/MujocoDependencies.cmake -index 44962272..656beeb8 100644 ---- a/cmake/MujocoDependencies.cmake -+++ b/cmake/MujocoDependencies.cmake -@@ -93,28 +93,36 @@ set(BUILD_SHARED_LIBS - if(NOT TARGET lodepng) - FetchContent_Declare( - lodepng -- GIT_REPOSITORY https://github.com/lvandeve/lodepng.git -- GIT_TAG ${MUJOCO_DEP_VERSION_lodepng} - ) -+endif() - -- FetchContent_GetProperties(lodepng) -- if(NOT lodepng_POPULATED) -- FetchContent_Populate(lodepng) -- # This is not a CMake project. -- set(LODEPNG_SRCS ${lodepng_SOURCE_DIR}/lodepng.cpp) -- set(LODEPNG_HEADERS ${lodepng_SOURCE_DIR}/lodepng.h) -- add_library(lodepng STATIC ${LODEPNG_HEADERS} ${LODEPNG_SRCS}) -- target_compile_options(lodepng PRIVATE ${MUJOCO_MACOS_COMPILE_OPTIONS}) -- target_link_options(lodepng PRIVATE ${MUJOCO_MACOS_LINK_OPTIONS}) -- target_include_directories(lodepng PUBLIC ${lodepng_SOURCE_DIR}) -+if(NOT TARGET lodepng) -+ if(NOT MUJOCO_USE_SYSTEM_lodepng) -+ fetchcontent_declare( -+ lodepng -+ GIT_REPOSITORY https://github.com/lvandeve/lodepng.git -+ GIT_TAG ${MUJOCO_DEP_VERSION_lodepng} -+ ) -+ -+ FetchContent_GetProperties(lodepng) -+ if(NOT lodepng_POPULATED) -+ FetchContent_Populate(lodepng) -+ # This is not a CMake project. -+ set(LODEPNG_SRCS ${lodepng_SOURCE_DIR}/lodepng.cpp) -+ set(LODEPNG_HEADERS ${lodepng_SOURCE_DIR}/lodepng.h) -+ add_library(lodepng STATIC ${LODEPNG_HEADERS} ${LODEPNG_SRCS}) -+ target_compile_options(lodepng PRIVATE ${MUJOCO_MACOS_COMPILE_OPTIONS}) -+ target_link_options(lodepng PRIVATE ${MUJOCO_MACOS_LINK_OPTIONS}) -+ target_include_directories(lodepng PUBLIC ${lodepng_SOURCE_DIR}) -+ endif() -+ else() -+ find_package(lodepng REQUIRED) - endif() - endif() - - if(NOT TARGET marchingcubecpp) - FetchContent_Declare( - marchingcubecpp -- GIT_REPOSITORY https://github.com/aparis69/MarchingCubeCpp.git -- GIT_TAG ${MUJOCO_DEP_VERSION_MarchingCubeCpp} - ) - - FetchContent_GetProperties(marchingcubecpp) -@@ -124,119 +132,158 @@ if(NOT TARGET marchingcubecpp) - endif() - endif() - -+option(MUJOCO_USE_SYSTEM_qhull "Use installed qhull version." OFF) -+mark_as_advanced(MUJOCO_USE_SYSTEM_qhull) -+ - set(QHULL_ENABLE_TESTING OFF) - - findorfetch( - USE_SYSTEM_PACKAGE -- OFF -+ ${MUJOCO_USE_SYSTEM_qhull} - PACKAGE_NAME -- qhull -+ Qhull - LIBRARY_NAME - qhull -- GIT_REPO -- https://github.com/qhull/qhull.git -- GIT_TAG -- ${MUJOCO_DEP_VERSION_qhull} - TARGETS - qhull - EXCLUDE_FROM_ALL - ) --# MuJoCo includes a file from libqhull_r which is not exported by the qhull include directories. --# Add it to the target. --target_include_directories( -- qhullstatic_r INTERFACE $<BUILD_INTERFACE:${qhull_SOURCE_DIR}/src/libqhull_r> --) --target_compile_options(qhullstatic_r PRIVATE ${MUJOCO_MACOS_COMPILE_OPTIONS}) --target_link_options(qhullstatic_r PRIVATE ${MUJOCO_MACOS_LINK_OPTIONS}) -+if(NOT MUJOCO_USE_SYSTEM_qhull) -+ # MuJoCo includes a file from libqhull_r which is not exported by the qhull include directories. -+ # Add it to the target. -+ target_include_directories( -+ qhullstatic_r INTERFACE $<BUILD_INTERFACE:${qhull_SOURCE_DIR}/src/libqhull_r> -+ ) -+ target_compile_options(qhullstatic_r PRIVATE ${MUJOCO_MACOS_COMPILE_OPTIONS}) -+ target_link_options(qhullstatic_r PRIVATE ${MUJOCO_MACOS_LINK_OPTIONS}) -+else() -+ if(NOT TARGET qhullstatic_r) -+ add_library(qhullstatic_r INTERFACE) -+ set_target_properties(qhullstatic_r PROPERTIES INTERFACE_LINK_LIBRARIES Qhull::qhull_r) -+ -+ # Workaround as headers are installed in <prefix>/include/libqhull_r/something.h -+ # but mujoco include them as #include <something.h> -+ get_property(qhull_include_dirs TARGET Qhull::qhull_r PROPERTY INTERFACE_INCLUDE_DIRECTORIES) -+ foreach(qhull_include_dir IN LISTS qhull_include_dirs) -+ target_include_directories(qhullstatic_r INTERFACE ${qhull_include_dirs}/libqhull_r) -+ endforeach() -+ target_include_directories(qhullstatic_r INTERFACE ) -+ endif() -+endif() -+ -+option(MUJOCO_USE_SYSTEM_tinyxml2 "Use installed tinyxml2 version." OFF) -+mark_as_advanced(MUJOCO_USE_SYSTEM_tinyxml2) - - set(tinyxml2_BUILD_TESTING OFF) - findorfetch( - USE_SYSTEM_PACKAGE -- OFF -+ ${MUJOCO_USE_SYSTEM_tinyxml2} - PACKAGE_NAME - tinyxml2 - LIBRARY_NAME - tinyxml2 -- GIT_REPO -- https://github.com/leethomason/tinyxml2.git -- GIT_TAG -- ${MUJOCO_DEP_VERSION_tinyxml2} - TARGETS -- tinyxml2 -+ tinyxml2::tinyxml2 - EXCLUDE_FROM_ALL - ) --target_compile_options(tinyxml2 PRIVATE ${MUJOCO_MACOS_COMPILE_OPTIONS}) --target_link_options(tinyxml2 PRIVATE ${MUJOCO_MACOS_LINK_OPTIONS}) -+if(NOT MUJOCO_USE_SYSTEM_tinyxml2) -+ target_compile_options(tinyxml2 PRIVATE ${MUJOCO_MACOS_COMPILE_OPTIONS}) -+ target_link_options(tinyxml2 PRIVATE ${MUJOCO_MACOS_LINK_OPTIONS}) -+endif() -+ -+option(MUJOCO_USE_SYSTEM_tinyobjloader "Use installed tinyobjloader version." OFF) -+mark_as_advanced(MUJOCO_USE_SYSTEM_tinyobjloader) - - findorfetch( - USE_SYSTEM_PACKAGE -- OFF -+ ${MUJOCO_USE_SYSTEM_tinyobjloader} - PACKAGE_NAME - tinyobjloader - LIBRARY_NAME - tinyobjloader -- GIT_REPO -- https://github.com/tinyobjloader/tinyobjloader.git -- GIT_TAG -- ${MUJOCO_DEP_VERSION_tinyobjloader} - TARGETS - tinyobjloader - EXCLUDE_FROM_ALL - ) - -+if(MUJOCO_USE_SYSTEM_tinyobjloader) -+ # As of tinyobjloader v2.0.0rc10, the tinyobjloader target is named tinyobjloader in the build, -+ # but tinyobjloader::tinyobjloader when it is installed. To deal with this, if tinyobjloader is -+ # found in the system, we create an ALIAS -+ # The following is equivalent to add_library(tinyobjloader ALIAS tinyobjloader::tinyobjloader), -+ # but compatible with CMake 3.16 . Once the minimum CMake is bumped to CMake 3.18, we can use -+ # the simpler version -+ add_library(tinyobjloader INTERFACE IMPORTED) -+ set_target_properties(tinyobjloader PROPERTIES INTERFACE_LINK_LIBRARIES tinyobjloader::tinyobjloader) -+endif() -+ -+option(MUJOCO_USE_SYSTEM_sdflib "Use installed sdflib version." OFF) -+mark_as_advanced(MUJOCO_USE_SYSTEM_sdflib) -+ - option(SDFLIB_USE_ASSIMP OFF) - option(SDFLIB_USE_OPENMP OFF) - option(SDFLIB_USE_ENOKI OFF) -+ - findorfetch( - USE_SYSTEM_PACKAGE -- OFF -+ ${MUJOCO_USE_SYSTEM_sdflib} - PACKAGE_NAME -- sdflib -+ SdfLib - LIBRARY_NAME - sdflib -- GIT_REPO -- https://github.com/UPC-ViRVIG/SdfLib.git -- GIT_TAG -- ${MUJOCO_DEP_VERSION_sdflib} - TARGETS -- SdfLib -+ SdfLib::SdfLib - EXCLUDE_FROM_ALL - ) --target_compile_options(SdfLib PRIVATE ${MUJOCO_MACOS_COMPILE_OPTIONS}) --target_link_options(SdfLib PRIVATE ${MUJOCO_MACOS_LINK_OPTIONS}) -+ -+if(NOT MUJOCO_USE_SYSTEM_sdflib) -+ target_compile_options(SdfLib PRIVATE ${MUJOCO_MACOS_COMPILE_OPTIONS}) -+ target_link_options(SdfLib PRIVATE ${MUJOCO_MACOS_LINK_OPTIONS}) -+endif() -+ -+option(MUJOCO_USE_SYSTEM_ccd "Use installed ccd version." OFF) -+mark_as_advanced(MUJOCO_USE_SYSTEM_ccd) - - set(ENABLE_DOUBLE_PRECISION ON) - set(CCD_HIDE_ALL_SYMBOLS ON) - findorfetch( - USE_SYSTEM_PACKAGE -- OFF -+ ${MUJOCO_USE_SYSTEM_ccd} - PACKAGE_NAME - ccd - LIBRARY_NAME - ccd -- GIT_REPO -- https://github.com/danfis/libccd.git -- GIT_TAG -- ${MUJOCO_DEP_VERSION_ccd} - TARGETS - ccd - EXCLUDE_FROM_ALL - ) --target_compile_options(ccd PRIVATE ${MUJOCO_MACOS_COMPILE_OPTIONS}) --target_link_options(ccd PRIVATE ${MUJOCO_MACOS_LINK_OPTIONS}) -- --# libCCD has an unconditional `#define _CRT_SECURE_NO_WARNINGS` on Windows. --# TODO(stunya): Remove this after https://github.com/danfis/libccd/pull/77 is merged. --if(WIN32) -- if(MSVC) -- # C4005 is the MSVC equivalent of -Wmacro-redefined. -- target_compile_options(ccd PRIVATE /wd4005) -- else() -- target_compile_options(ccd PRIVATE -Wno-macro-redefined) -+ -+if(NOT MUJOCO_USE_SYSTEM_ccd) -+ target_compile_options(ccd PRIVATE ${MUJOCO_MACOS_COMPILE_OPTIONS}) -+ target_link_options(ccd PRIVATE ${MUJOCO_MACOS_LINK_OPTIONS}) -+ # This is necessary to ensure that the any library that consumes the ccd -+ # compiled internally by MuJoCo (as static library) has CCD_EXPORT correctly -+ # defined as an empty string. For ccd itself, this is ensured by the variable -+ # CCD_HIDE_ALL_SYMBOLS set to ON before the call to findorfetch -+ # See https://github.com/danfis/libccd/pull/79 -+ target_compile_definitions(ccd INTERFACE CCD_STATIC_DEFINE) -+ -+ # libCCD has an unconditional `#define _CRT_SECURE_NO_WARNINGS` on Windows. -+ # TODO(stunya): Remove this after https://github.com/danfis/libccd/pull/77 is merged. -+ if(WIN32) -+ if(MSVC) -+ # C4005 is the MSVC equivalent of -Wmacro-redefined. -+ target_compile_options(ccd PRIVATE /wd4005) -+ else() -+ target_compile_options(ccd PRIVATE -Wno-macro-redefined) -+ endif() - endif() - endif() - - if(MUJOCO_BUILD_TESTS) -+ option(MUJOCO_USE_SYSTEM_abseil "Use installed abseil version." OFF) -+ mark_as_advanced(MUJOCO_USE_SYSTEM_abseil) -+ - set(ABSL_PROPAGATE_CXX_STD ON) - - # This specific version of Abseil does not have the following variable. We need to work with BUILD_TESTING -@@ -249,15 +296,11 @@ if(MUJOCO_BUILD_TESTS) - set(ABSL_BUILD_TESTING OFF) - findorfetch( - USE_SYSTEM_PACKAGE -- OFF -+ ${MUJOCO_USE_SYSTEM_abseil} - PACKAGE_NAME - absl - LIBRARY_NAME - abseil-cpp -- GIT_REPO -- https://github.com/abseil/abseil-cpp.git -- GIT_TAG -- ${MUJOCO_DEP_VERSION_abseil} - TARGETS - absl::core_headers - EXCLUDE_FROM_ALL -@@ -268,6 +311,9 @@ if(MUJOCO_BUILD_TESTS) - CACHE BOOL "Build tests." FORCE - ) - -+ option(MUJOCO_USE_SYSTEM_gtest "Use installed gtest version." OFF) -+ mark_as_advanced(MUJOCO_USE_SYSTEM_gtest) -+ - # Avoid linking errors on Windows by dynamically linking to the C runtime. - set(gtest_force_shared_crt - ON -@@ -276,22 +322,20 @@ if(MUJOCO_BUILD_TESTS) - - findorfetch( - USE_SYSTEM_PACKAGE -- OFF -+ ${MUJOCO_USE_SYSTEM_gtest} - PACKAGE_NAME - GTest - LIBRARY_NAME - googletest -- GIT_REPO -- https://github.com/google/googletest.git -- GIT_TAG -- ${MUJOCO_DEP_VERSION_gtest} - TARGETS -- gtest -- gmock -- gtest_main -+ GTest::gmock -+ GTest::gtest_main - EXCLUDE_FROM_ALL - ) - -+ option(MUJOCO_USE_SYSTEM_benchmark "Use installed benchmark version." OFF) -+ mark_as_advanced(MUJOCO_USE_SYSTEM_benchmark) -+ - set(BENCHMARK_EXTRA_FETCH_ARGS "") - if(WIN32 AND NOT MSVC) - set(BENCHMARK_EXTRA_FETCH_ARGS -@@ -310,15 +354,11 @@ if(MUJOCO_BUILD_TESTS) - - findorfetch( - USE_SYSTEM_PACKAGE -- OFF -+ ${MUJOCO_USE_SYSTEM_benchmark} - PACKAGE_NAME - benchmark - LIBRARY_NAME - benchmark -- GIT_REPO -- https://github.com/google/benchmark.git -- GIT_TAG -- ${MUJOCO_DEP_VERSION_benchmark} - TARGETS - benchmark::benchmark - benchmark::benchmark_main -@@ -328,15 +368,18 @@ if(MUJOCO_BUILD_TESTS) - endif() - - if(MUJOCO_TEST_PYTHON_UTIL) -+ option(MUJOCO_USE_SYSTEM_Eigen3 "Use installed Eigen3 version." OFF) -+ mark_as_advanced(MUJOCO_USE_SYSTEM_Eigen3) -+ - add_compile_definitions(EIGEN_MPL2_ONLY) -- if(NOT TARGET eigen) -- # Support new IN_LIST if() operator. -- set(CMAKE_POLICY_DEFAULT_CMP0057 NEW) -+ if(NOT TARGET Eigen3::Eigen) -+ if(NOT MUJOCO_USE_SYSTEM_Eigen3) -+ # Support new IN_LIST if() operator. -+ set(CMAKE_POLICY_DEFAULT_CMP0057 NEW) -+ endif() - - FetchContent_Declare( - Eigen3 -- GIT_REPOSITORY https://gitlab.com/libeigen/eigen.git -- GIT_TAG ${MUJOCO_DEP_VERSION_Eigen3} - ) - - FetchContent_GetProperties(Eigen3) -@@ -348,6 +391,19 @@ if(MUJOCO_TEST_PYTHON_UTIL) - set_target_properties( - Eigen3::Eigen PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${eigen3_SOURCE_DIR}" - ) -+ -+ fetchcontent_getproperties(Eigen3) -+ # if(NOT Eigen3_POPULATED) -+ # fetchcontent_populate(Eigen3) -+ -+ # # Mark the library as IMPORTED as a workaround for https://gitlab.kitware.com/cmake/cmake/-/issues/15415 -+ # add_library(Eigen3::Eigen INTERFACE IMPORTED) -+ # set_target_properties( -+ # Eigen3::Eigen PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${eigen3_SOURCE_DIR}" -+ # ) -+ # endif() -+ else() -+ find_package(Eigen3 REQUIRED) - endif() - endif() - endif() -diff --git a/plugin/sdf/CMakeLists.txt b/plugin/sdf/CMakeLists.txt -index 3e216fc4..e7e3a1eb 100644 ---- a/plugin/sdf/CMakeLists.txt -+++ b/plugin/sdf/CMakeLists.txt -@@ -37,7 +37,7 @@ set(MUJOCO_SDF_SRCS - add_library(sdf SHARED) - target_sources(sdf PRIVATE ${MUJOCO_SDF_SRCS}) - target_include_directories(sdf PRIVATE ${MUJOCO_SDF_INCLUDE}) --target_link_libraries(sdf PRIVATE mujoco SdfLib) -+target_link_libraries(sdf PRIVATE mujoco SdfLib::SdfLib) - target_compile_options( - sdf - PRIVATE ${AVX_COMPILE_OPTIONS} -diff --git a/python/mujoco/util/CMakeLists.txt b/python/mujoco/util/CMakeLists.txt -index 666a3725..d89bb499 100644 ---- a/python/mujoco/util/CMakeLists.txt -+++ b/python/mujoco/util/CMakeLists.txt -@@ -63,8 +63,8 @@ if(BUILD_TESTING) - target_link_libraries( - array_traits_test - array_traits -- gmock -- gtest_main -+ GTest::gmock -+ GTest::gtest_main - ) - gtest_add_tests(TARGET array_traits_test SOURCES array_traits_test.cc) - -@@ -72,8 +72,8 @@ if(BUILD_TESTING) - target_link_libraries( - func_traits_test - func_traits -- gmock -- gtest_main -+ GTest::gmock -+ GTest::gtest_main - ) - gtest_add_tests(TARGET func_traits_test SOURCES func_traits_test.cc) - -@@ -81,8 +81,8 @@ if(BUILD_TESTING) - target_link_libraries( - func_wrap_test - func_wrap -- gmock -- gtest_main -+ GTest::gmock -+ GTest::gtest_main - ) - gtest_add_tests(TARGET func_wrap_test SOURCES func_wrap_test.cc) - -@@ -90,8 +90,8 @@ if(BUILD_TESTING) - target_link_libraries( - tuple_tools_test - func_wrap -- gmock -- gtest_main -+ GTest::gmock -+ GTest::gtest_main - ) - gtest_add_tests(TARGET tuple_tools_test SOURCES tuple_tools_test.cc) - endif() -diff --git a/simulate/cmake/SimulateDependencies.cmake b/simulate/cmake/SimulateDependencies.cmake -index 5141406c..75ff7884 100644 ---- a/simulate/cmake/SimulateDependencies.cmake -+++ b/simulate/cmake/SimulateDependencies.cmake -@@ -81,10 +81,6 @@ findorfetch( - glfw3 - LIBRARY_NAME - glfw3 -- GIT_REPO -- https://github.com/glfw/glfw.git -- GIT_TAG -- ${MUJOCO_DEP_VERSION_glfw3} - TARGETS - glfw - EXCLUDE_FROM_ALL -diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt -index 122760a9..ddd90819 100644 ---- a/test/CMakeLists.txt -+++ b/test/CMakeLists.txt -@@ -30,7 +30,7 @@ macro(mujoco_test name) - ) - - add_executable(${name} ${name}.cc) -- target_link_libraries(${name} gtest_main mujoco) -+ target_link_libraries(${name} GTest::gtest_main mujoco) - target_include_directories(${name} PRIVATE ${MUJOCO_TEST_INCLUDE}) - set_target_properties(${name} PROPERTIES BUILD_RPATH ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}) - # gtest_discover_tests is recommended over gtest_add_tests, but has some issues in Windows. -@@ -60,20 +60,20 @@ target_link_libraries( - absl::synchronization - absl::flat_hash_map - absl::flat_hash_set -- gtest -- gmock -+ GTest::gtest -+ GTest::gmock - mujoco::mujoco - ) - target_include_directories(fixture PRIVATE ${mujoco_SOURCE_DIR}/include gmock) - - mujoco_test(fixture_test) --target_link_libraries(fixture_test fixture gmock) -+target_link_libraries(fixture_test fixture GTest::gmock) - - mujoco_test(header_test) --target_link_libraries(header_test fixture gmock) -+target_link_libraries(fixture_test fixture GTest::gmock) - - mujoco_test(pipeline_test) --target_link_libraries(pipeline_test fixture gmock) -+target_link_libraries(fixture_test fixture GTest::gmock) - - add_subdirectory(benchmark) - add_subdirectory(engine) diff --git a/pkgs/applications/science/robotics/mujoco/sdflib-system-deps.patch b/pkgs/applications/science/robotics/mujoco/sdflib-system-deps.patch deleted file mode 100644 index ca84c60a63df4..0000000000000 --- a/pkgs/applications/science/robotics/mujoco/sdflib-system-deps.patch +++ /dev/null @@ -1,192 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 251c456..3d30231 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -27,7 +27,7 @@ option(SDFLIB_USE_SYSTEM_GLM "Use glm library via find_package instead of downlo - option(SDFLIB_USE_SYSTEM_SPDLOG "Use spdlog library via find_package instead of downloading it" OFF) - option(SDFLIB_USE_SYSTEM_CEREAL "Use cereal library via find_package instead of downloading it" OFF) - option(SDFLIB_USE_SYSTEM_ASSIMP "Use assimp library via find_package instead of downloading it" OFF) -- -+option(SDFLIB_USE_SYSTEM_TRIANGLEMESHDISTANCE "Use TriangleMeshDistance library via system includes instead of downloading it" OFF) - - if(SDFLIB_DEBUG_INFO) - add_compile_definitions(SDFLIB_PRINT_STATISTICS) -@@ -55,13 +55,52 @@ file(GLOB UTILS_SOURCE_FILES src/utils/*.cpp) - file(GLOB UTILS_HEADER_FILES src/utils/*.h) - - # Add libraries --add_library(${PROJECT_NAME} STATIC ${SOURCE_FILES} ${HEADER_FILES} ${PUBLIC_HEADER_FILES} -- ${SDF_SOURCE_FILES} ${SDF_HEADER_FILES} -- ${UTILS_SOURCE_FILES} ${UTILS_HEADER_FILES}) -- --target_include_directories(${PROJECT_NAME} PUBLIC include/) -+add_library(${PROJECT_NAME} ${SOURCE_FILES} ${HEADER_FILES} ${PUBLIC_HEADER_FILES} -+ ${SDF_SOURCE_FILES} ${SDF_HEADER_FILES} -+ ${UTILS_SOURCE_FILES} ${UTILS_HEADER_FILES}) -+add_library(${PROJECT_NAME}::${PROJECT_NAME} ALIAS ${PROJECT_NAME}) -+if(BUILD_SHARED_LIBS AND WIN32) -+ set_target_properties(${PROJECT_NAME} PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON) -+endif() -+include(GNUInstallDirs) -+target_include_directories(${PROJECT_NAME} PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> -+ $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>) - target_include_directories(${PROJECT_NAME} PRIVATE src/) - -+# Install library and CMake config files -+install(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}) -+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/SdfLib -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) -+ -+install(EXPORT ${PROJECT_NAME} -+ FILE ${PROJECT_NAME}Targets.cmake -+ DESTINATION lib/cmake/${PROJECT_NAME} -+ NAMESPACE ${PROJECT_NAME}:: -+) -+ -+include(CMakePackageConfigHelpers) -+set(PACKAGE_DEPENDENCIES "") -+if(SDFLIB_USE_SYSTEM_GLM) -+ string(APPEND PACKAGE_DEPENDENCIES "find_dependency(glm)\n") -+endif() -+if(SDFLIB_USE_SYSTEM_SPDLOG) -+ string(APPEND PACKAGE_DEPENDENCIES "find_dependency(spdlog)\n") -+endif() -+if(SDFLIB_USE_SYSTEM_CEREAL) -+ string(APPEND PACKAGE_DEPENDENCIES "find_dependency(cereal)\n") -+endif() -+if(SDFLIB_USE_ASSIMP AND SDFLIB_USE_SYSTEM_ASSIMP) -+ string(APPEND PACKAGE_DEPENDENCIES "find_dependency(assimp)\n") -+endif() -+ -+configure_package_config_file(${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}Config.cmake.in -+ "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake" -+ INSTALL_DESTINATION "lib/cmake/${PROJECT_NAME}" -+ NO_SET_AND_CHECK_MACRO -+ NO_CHECK_REQUIRED_COMPONENTS_MACRO) -+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake -+ DESTINATION lib/cmake/${PROJECT_NAME}) -+ - # Add shaders - file(GLOB SHADER_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/src/render_engine/shaders - src/render_engine/shaders/*.frag -@@ -69,7 +108,7 @@ file(GLOB SHADER_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/src/render_engine/sh - src/render_engine/shaders/*.comp) - - foreach(SHADER IN LISTS SHADER_FILES) -- add_custom_command(OUTPUT ${SHADER} -+add_custom_command(OUTPUT ${SHADER} - COMMAND cmake -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/src/render_engine/shaders/${SHADER} $<TARGET_FILE_DIR:${PROJECT_NAME}>/shaders/${SHADER} - DEPENDS src/render_engine/shaders/${SHADER} - ) -@@ -112,7 +151,10 @@ endif() - target_link_libraries(${PROJECT_NAME} PUBLIC ${SDFLIB_GLM_TARGET}) - target_link_libraries(${PROJECT_NAME} PUBLIC spdlog::spdlog) - target_link_libraries(${PROJECT_NAME} PUBLIC cereal::cereal) --target_link_libraries(${PROJECT_NAME} PUBLIC icg) -+ -+if(NOT SDFLIB_USE_SYSTEM_TRIANGLEMESHDISTANCE) -+ target_link_libraries(${PROJECT_NAME} PUBLIC TriangleMeshDistance) -+endif() - - if(CMAKE_CXX_COMPILER_ID MATCHES GNU) - target_link_libraries(${PROJECT_NAME} PUBLIC -lstdc++fs) -diff --git a/SdfLibConfig.cmake.in b/SdfLibConfig.cmake.in -new file mode 100644 -index 0000000..9b8265c ---- /dev/null -+++ b/SdfLibConfig.cmake.in -@@ -0,0 +1,7 @@ -+@PACKAGE_INIT@ -+ -+include(CMakeFindDependencyMacro) -+ -+@PACKAGE_DEPENDENCIES@ -+ -+include("${CMAKE_CURRENT_LIST_DIR}/SdfLibTargets.cmake") -diff --git a/include/SdfLib/TrianglesInfluence.h b/include/SdfLib/TrianglesInfluence.h -index fc2ca52..b276f23 100644 ---- a/include/SdfLib/TrianglesInfluence.h -+++ b/include/SdfLib/TrianglesInfluence.h -@@ -11,7 +11,7 @@ - #include "InterpolationMethods.h" - #include "utils/Timer.h" - #include "utils/GJK.h" --#include <InteractiveComputerGraphics/TriangleMeshDistance.h> -+#include <tmd/TriangleMeshDistance.h> - - #include <vector> - #include <array> -diff --git a/libs/CMakeLists.txt b/libs/CMakeLists.txt -index 79f70c1..e2a4f10 100644 ---- a/libs/CMakeLists.txt -+++ b/libs/CMakeLists.txt -@@ -137,9 +137,10 @@ if(SDFLIB_BUILD_APPS OR SDFLIB_BUILD_DEBUG_APPS) - target_include_directories(stb_image INTERFACE stb) - endif() - --# icg --add_library(icg INTERFACE) --target_include_directories(icg INTERFACE InteractiveComputerGraphics) -+if (NOT SDFLIB_USE_SYSTEM_TRIANGLEMESHDISTANCE) -+ add_library(TriangleMeshDistance INTERFACE) -+ target_include_directories(TriangleMeshDistance INTERFACE InteractiveComputerGraphics) -+endif() - - if(SDFLIB_BUILD_APPS OR SDFLIB_BUILD_DEBUG_APPS) - # glfw -diff --git a/libs/InteractiveComputerGraphics/InteractiveComputerGraphics/TriangleMeshDistance.h b/libs/InteractiveComputerGraphics/tmd/TriangleMeshDistance.h -similarity index 100% -rename from libs/InteractiveComputerGraphics/InteractiveComputerGraphics/TriangleMeshDistance.h -rename to libs/InteractiveComputerGraphics/tmd/TriangleMeshDistance.h -diff --git a/src/tools/ImageQueryTime/main.cpp b/src/tools/ImageQueryTime/main.cpp -index 357a78b..f4fd9e7 100644 ---- a/src/tools/ImageQueryTime/main.cpp -+++ b/src/tools/ImageQueryTime/main.cpp -@@ -17,7 +17,7 @@ - - #define TEST_METHODS - #ifdef TEST_METHODS --#include <InteractiveComputerGraphics/TriangleMeshDistance.h> -+#include <tmd/TriangleMeshDistance.h> - // #include <CGAL/Simple_cartesian.h> - // #include <CGAL/AABB_tree.h> - // #include <CGAL/AABB_traits.h> -diff --git a/src/tools/SdfErrorCompare/main.cpp b/src/tools/SdfErrorCompare/main.cpp -index deef25f..9e402c4 100644 ---- a/src/tools/SdfErrorCompare/main.cpp -+++ b/src/tools/SdfErrorCompare/main.cpp -@@ -23,7 +23,7 @@ using namespace sdflib; - // #define TEST_OPENVDB - - #ifdef TEST_ICG --#include <InteractiveComputerGraphics/TriangleMeshDistance.h> -+#include <tmd/TriangleMeshDistance.h> - #endif - #ifdef TEST_CGAL - #include <CGAL/Simple_cartesian.h> -diff --git a/src/tools/SdfLibUnity/SdfExportFunc.cpp b/src/tools/SdfLibUnity/SdfExportFunc.cpp -index ff4e017..7e06ada 100644 ---- a/src/tools/SdfLibUnity/SdfExportFunc.cpp -+++ b/src/tools/SdfLibUnity/SdfExportFunc.cpp -@@ -1,7 +1,7 @@ - #include "SdfExportFunc.h" - #include "spdlog/sinks/rotating_file_sink.h" - --#include <InteractiveComputerGraphics/TriangleMeshDistance.h> -+#include <tmd/TriangleMeshDistance.h> - - using namespace sdflib; - -diff --git a/src/tools/SdfOffsets/main.cpp b/src/tools/SdfOffsets/main.cpp -index b6769d7..07f137b 100644 ---- a/src/tools/SdfOffsets/main.cpp -+++ b/src/tools/SdfOffsets/main.cpp -@@ -9,7 +9,7 @@ - #include <glm/gtc/type_ptr.hpp> - #include <glm/gtc/matrix_transform.hpp> - --#include <InteractiveComputerGraphics/TriangleMeshDistance.h> -+#include <tmd/TriangleMeshDistance.h> - #include <CGAL/Surface_mesh_default_triangulation_3.h> - #include <CGAL/Complex_2_in_triangulation_3.h> - #include <CGAL/make_surface_mesh.h> diff --git a/pkgs/applications/science/robotics/qgroundcontrol/default.nix b/pkgs/applications/science/robotics/qgroundcontrol/default.nix deleted file mode 100644 index 25b1f4e5d5ce6..0000000000000 --- a/pkgs/applications/science/robotics/qgroundcontrol/default.nix +++ /dev/null @@ -1,82 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, SDL2, qtbase, qtcharts, qtlocation, qtserialport -, qtsvg, qtquickcontrols2, qtgraphicaleffects, qtspeech, qtx11extras, qmake -, qttools, gst_all_1, wayland, pkg-config, wrapQtAppsHook }: - -stdenv.mkDerivation rec { - pname = "qgroundcontrol"; - version = "4.3.0"; - - propagatedBuildInputs = [ - qtbase qtcharts qtlocation qtserialport qtsvg qtquickcontrols2 - qtgraphicaleffects qtspeech qtx11extras - ]; - - gstInputs = with gst_all_1; [ - gstreamer - gst-plugins-base - (gst-plugins-good.override { qt5Support = true; }) - gst-plugins-bad - gst-libav - wayland - ]; - - buildInputs = [ SDL2 ] ++ gstInputs ++ propagatedBuildInputs; - nativeBuildInputs = [ pkg-config qmake qttools wrapQtAppsHook ]; - - preConfigure = '' - mkdir build - cd build - ''; - - qmakeFlags = [ - "CONFIG+=StableBuild" - # Default install tries to copy Qt files into package - "CONFIG+=QGC_DISABLE_BUILD_SETUP" - # Tries to download x86_64-only prebuilt binaries - "DEFINES+=DISABLE_AIRMAP" - "../qgroundcontrol.pro" - ]; - - installPhase = '' - runHook preInstall - - cd .. - - mkdir -p $out/share/applications - sed 's/Exec=.*$/Exec=QGroundControl/g' --in-place deploy/qgroundcontrol.desktop - cp -v deploy/qgroundcontrol.desktop $out/share/applications - - mkdir -p $out/bin - cp -v build/staging/QGroundControl "$out/bin/" - - mkdir -p $out/share/qgroundcontrol - cp -rv resources/ $out/share/qgroundcontrol - - mkdir -p $out/share/pixmaps - cp -v resources/icons/qgroundcontrol.png $out/share/pixmaps - - runHook postInstall - ''; - - postInstall = '' - qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0") - ''; - - # TODO: package mavlink so we can build from a normal source tarball - src = fetchFromGitHub { - owner = "mavlink"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-a0+cpT413qi88PvaWQPxKABHfK7vbPE7B42n84n/SAk="; - fetchSubmodules = true; - }; - - meta = with lib; { - description = "Provides full ground station support and configuration for the PX4 and APM Flight Stacks"; - homepage = "http://qgroundcontrol.com/"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ lopsided98 ]; - mainProgram = "QGroundControl"; - }; -} diff --git a/pkgs/applications/science/robotics/sumorobot-manager/default.nix b/pkgs/applications/science/robotics/sumorobot-manager/default.nix index eb9322f0fb222..a26bd5d5fc288 100644 --- a/pkgs/applications/science/robotics/sumorobot-manager/default.nix +++ b/pkgs/applications/science/robotics/sumorobot-manager/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ wrapPython qt5.wrapQtAppsHook dos2unix ]; - buildPhase = "true"; + dontBuild = true; installPhase = '' mkdir -p $out/opt/sumorobot-manager diff --git a/pkgs/applications/science/robotics/yarp/default.nix b/pkgs/applications/science/robotics/yarp/default.nix index 3b33096dc683f..4f2e45384b76c 100644 --- a/pkgs/applications/science/robotics/yarp/default.nix +++ b/pkgs/applications/science/robotics/yarp/default.nix @@ -18,11 +18,9 @@ stdenv.mkDerivation rec { "-DYARP_COMPILE_UNMAINTAINED:BOOL=ON" "-DCREATE_YARPC:BOOL=ON" "-DCREATE_YARPCXX:BOOL=ON" + "-DCMAKE_INSTALL_LIBDIR=${placeholder "out"}/lib" ]; - # since we cant expand $out in cmakeFlags - preConfigure = ''cmakeFlags="$cmakeFlags -DCMAKE_INSTALL_LIBDIR=$out/lib"''; - postInstall = "mv ./$out/lib/*.so $out/lib/"; meta = { diff --git a/pkgs/applications/search/doodle/default.nix b/pkgs/applications/search/doodle/default.nix index fbe5ee56b3193..ced330bd647ed 100644 --- a/pkgs/applications/search/doodle/default.nix +++ b/pkgs/applications/search/doodle/default.nix @@ -2,20 +2,20 @@ 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 = { homepage = "https://grothoff.org/christian/doodle/"; description = "Tool to quickly index and search documents on a computer"; license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ viric ]; + maintainers = [ ]; platforms = with lib.platforms; linux; mainProgram = "doodle"; }; diff --git a/pkgs/applications/search/recoll/default.nix b/pkgs/applications/search/recoll/default.nix index c3c1b6d85ed30..21618f8ed3ecc 100644 --- a/pkgs/applications/search/recoll/default.nix +++ b/pkgs/applications/search/recoll/default.nix @@ -22,6 +22,8 @@ , libxslt , lyx , makeWrapper +, meson +, ninja , perl , perlPackages , pkg-config @@ -66,35 +68,36 @@ let filters = { perl = perl.passthru.withPackages (p: [ p.ImageExifTool ]); }; filterPath = lib.makeBinPath (map lib.getBin (builtins.attrValues filters)); + useInotify = if stdenv.hostPlatform.isLinux then "true" else "false"; in mkDerivation rec { pname = "recoll"; - version = "1.37.5"; + version = "1.39.1"; src = fetchurl { - url = "https://www.lesbonscomptes.com/${pname}/${pname}-${version}.tar.gz"; - hash = "sha256-vv2AMt6ufrfxRX2yF28X3E500MYP9hnGfDb3I9RdMVU="; + url = "https://www.recoll.org/${pname}-${version}.tar.gz"; + hash = "sha256-Eeadj/AnuztCb7VIYEy4hKbduH3CzK53tADvI9+PWmQ="; }; - configureFlags = [ - "--enable-recollq" - "--disable-webkit" - "--without-systemd" + mesonFlags = [ + "-Drecollq=true" + "-Dwebkit=false" + "-Dsystemd=false" # this leaks into the final `librecoll-*.so` binary, so we need # to be sure it is taken from `pkgs.file` rather than `stdenv`, # especially when cross-compiling - "--with-file-command=${file}/bin/file" + "-Dfile-command=${file}/bin/file" ] ++ lib.optionals (!withPython) [ - "--disable-python-module" - "--disable-python-chm" + "-Dpython-module=false" + "-Dpython-chm=false" ] ++ lib.optionals (!withGui) [ - "--disable-qtgui" - "--disable-x11mon" + "-Dqtgui=false" + "-Dx11mon=false" ] ++ [ - (lib.withFeature stdenv.isLinux "inotify") + "-Dinotify=${useInotify}" ]; env.NIX_CFLAGS_COMPILE = toString [ @@ -111,6 +114,8 @@ mkDerivation rec { nativeBuildInputs = [ makeWrapper + meson + ninja pkg-config which ] ++ lib.optionals withGui [ @@ -133,7 +138,7 @@ mkDerivation rec { file ] ++ lib.optionals withGui [ qtbase - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; @@ -162,19 +167,19 @@ mkDerivation rec { --prefix PYTHONPATH : $out/${python3Packages.python.sitePackages} wrapProgram $out/share/recoll/filters/rclimg \ --prefix PERL5LIB : "${with perlPackages; makeFullPerlPath [ ImageExifTool ]}" - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace $f --replace '"lyx"' '"${lib.getBin lyx}/bin/lyx"' - '' + lib.optionalString (stdenv.isDarwin && withGui) '' + '' + lib.optionalString (stdenv.hostPlatform.isDarwin && withGui) '' mkdir $out/Applications mv $out/bin/recoll.app $out/Applications ''; # create symlink after fixup to prevent double wrapping of recoll - postFixup = lib.optionalString (stdenv.isDarwin && withGui) '' + postFixup = lib.optionalString (stdenv.hostPlatform.isDarwin && withGui) '' ln -s ../Applications/recoll.app/Contents/MacOS/recoll $out/bin/recoll ''; - enableParallelBuilding = true; + enableParallelBuilding = false; # XXX: -j44 tried linking befoire librecoll had been created meta = with lib; { description = "Full-text search tool"; @@ -182,8 +187,8 @@ mkDerivation rec { Recoll is an Xapian frontend that can search through files, archive members, email attachments. ''; - homepage = "https://www.lesbonscomptes.com/recoll/"; - changelog = "https://www.lesbonscomptes.com/recoll/pages/release-${versions.majorMinor version}.html"; + homepage = "https://www.recoll.org"; + changelog = "https://www.recoll.org/pages/release-history.html"; license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = with maintainers; [ jcumming ehmry ]; diff --git a/pkgs/applications/search/xlsxgrep/default.nix b/pkgs/applications/search/xlsxgrep/default.nix index 454e9210db6a7..5c6ea6c54d60d 100644 --- a/pkgs/applications/search/xlsxgrep/default.nix +++ b/pkgs/applications/search/xlsxgrep/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "xlsxgrep"; - version = "0.0.23"; + version = "0.0.29"; src = fetchPypi { inherit pname version; - sha256 = "014i1nifx67mxi0k9sch00j6bjykb6krzl2q3ara9s1g75inl4rm"; + sha256 = "sha256-vgHNu7MVDjULoBiTkk74W8ZLJ02eds60XshTX3iLJGI="; }; pythonPath = with python3Packages; [ xlrd ]; diff --git a/pkgs/applications/system/booster/default.nix b/pkgs/applications/system/booster/default.nix index e7c646faf0acd..c211a53bdc561 100644 --- a/pkgs/applications/system/booster/default.nix +++ b/pkgs/applications/system/booster/default.nix @@ -49,7 +49,7 @@ buildGoModule rec { ''; meta = with lib; { - description = "Fast and secure initramfs generator "; + description = "Fast and secure initramfs generator"; homepage = "https://github.com/anatol/booster"; license = licenses.mit; maintainers = with maintainers; [ urandom ]; diff --git a/pkgs/applications/system/coolercontrol/Cargo.lock b/pkgs/applications/system/coolercontrol/Cargo.lock index 3ac008f7e628e..c1a100c69ed5a 100644 --- a/pkgs/applications/system/coolercontrol/Cargo.lock +++ b/pkgs/applications/system/coolercontrol/Cargo.lock @@ -3,10 +3,274 @@ version = 3 [[package]] +name = "actix-codec" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f7b0a21988c1bf877cf4759ef5ddaac04c1c9fe808c9142ecb78ba97d97a28a" +dependencies = [ + "bitflags 2.6.0", + "bytes", + "futures-core", + "futures-sink", + "memchr", + "pin-project-lite", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "actix-cors" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9e772b3bcafe335042b5db010ab7c09013dad6eac4915c91d8d50902769f331" +dependencies = [ + "actix-utils", + "actix-web", + "derive_more", + "futures-util", + "log", + "once_cell", + "smallvec", +] + +[[package]] +name = "actix-http" +version = "3.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ae682f693a9cd7b058f2b0b5d9a6d7728a8555779bedbbc35dd88528611d020" +dependencies = [ + "actix-codec", + "actix-rt", + "actix-service", + "actix-utils", + "ahash", + "base64 0.22.1", + "bitflags 2.6.0", + "brotli", + "bytes", + "bytestring", + "derive_more", + "encoding_rs", + "flate2", + "futures-core", + "h2", + "http 0.2.12", + "httparse", + "httpdate", + "itoa", + "language-tags", + "local-channel", + "mime", + "percent-encoding", + "pin-project-lite", + "rand", + "sha1", + "smallvec", + "tokio", + "tokio-util", + "tracing", + "zstd", +] + +[[package]] +name = "actix-macros" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e01ed3140b2f8d422c68afa1ed2e85d996ea619c988ac834d255db32138655cb" +dependencies = [ + "quote", + "syn", +] + +[[package]] +name = "actix-multipart" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d974dd6c4f78d102d057c672dcf6faa618fafa9df91d44f9c466688fc1275a3a" +dependencies = [ + "actix-multipart-derive", + "actix-utils", + "actix-web", + "bytes", + "derive_more", + "futures-core", + "futures-util", + "httparse", + "local-waker", + "log", + "memchr", + "mime", + "rand", + "serde", + "serde_json", + "serde_plain", + "tempfile", + "tokio", +] + +[[package]] +name = "actix-multipart-derive" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a0a77f836d869f700e5b47ac7c3c8b9c8bc82e4aec861954c6198abee3ebd4d" +dependencies = [ + "darling", + "parse-size", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "actix-router" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13d324164c51f63867b57e73ba5936ea151b8a41a1d23d1031eeb9f70d0236f8" +dependencies = [ + "bytestring", + "cfg-if", + "http 0.2.12", + "regex", + "regex-lite", + "serde", + "tracing", +] + +[[package]] +name = "actix-rt" +version = "2.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24eda4e2a6e042aa4e55ac438a2ae052d3b5da0ecf83d7411e1a368946925208" +dependencies = [ + "futures-core", + "tokio", +] + +[[package]] +name = "actix-server" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b02303ce8d4e8be5b855af6cf3c3a08f3eff26880faad82bab679c22d3650cb5" +dependencies = [ + "actix-rt", + "actix-service", + "actix-utils", + "futures-core", + "futures-util", + "mio", + "socket2", + "tokio", + "tracing", +] + +[[package]] +name = "actix-service" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b894941f818cfdc7ccc4b9e60fa7e53b5042a2e8567270f9147d5591893373a" +dependencies = [ + "futures-core", + "paste", + "pin-project-lite", +] + +[[package]] +name = "actix-session" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b671404ec72194d8af58c2bdaf51e3c477a0595056bd5010148405870dda8df2" +dependencies = [ + "actix-service", + "actix-utils", + "actix-web", + "anyhow", + "derive_more", + "serde", + "serde_json", + "tracing", +] + +[[package]] +name = "actix-utils" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88a1dcdff1466e3c2488e1cb5c36a71822750ad43839937f85d2f4d9f8b705d8" +dependencies = [ + "local-waker", + "pin-project-lite", +] + +[[package]] +name = "actix-web" +version = "4.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1988c02af8d2b718c05bc4aeb6a66395b7cdf32858c2c71131e5637a8c05a9ff" +dependencies = [ + "actix-codec", + "actix-http", + "actix-macros", + "actix-router", + "actix-rt", + "actix-server", + "actix-service", + "actix-utils", + "actix-web-codegen", + "ahash", + "bytes", + "bytestring", + "cfg-if", + "cookie", + "derive_more", + "encoding_rs", + "futures-core", + "futures-util", + "itoa", + "language-tags", + "log", + "mime", + "once_cell", + "pin-project-lite", + "regex", + "regex-lite", + "serde", + "serde_json", + "serde_urlencoded", + "smallvec", + "socket2", + "time", + "url", +] + +[[package]] +name = "actix-web-codegen" +version = "4.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f591380e2e68490b5dfaf1dd1aa0ebe78d84ba7067078512b4ea6e4492d622b8" +dependencies = [ + "actix-router", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "actix-web-static-files" +version = "4.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adf6d1ef6d7a60e084f9e0595e2a5234abda14e76c105ecf8e2d0e8800c41a1f" +dependencies = [ + "actix-web", + "derive_more", + "futures-util", + "static-files", +] + +[[package]] name = "addr2line" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" dependencies = [ "gimli", ] @@ -18,6 +282,54 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] +name = "aead" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0" +dependencies = [ + "crypto-common", + "generic-array", +] + +[[package]] +name = "aes" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" +dependencies = [ + "cfg-if", + "cipher", + "cpufeatures", +] + +[[package]] +name = "aes-gcm" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "831010a0f742e1209b3bcea8fab6a8e149051ba6099432c8cb2cc117dec3ead1" +dependencies = [ + "aead", + "aes", + "cipher", + "ctr", + "ghash", + "subtle", +] + +[[package]] +name = "ahash" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" +dependencies = [ + "cfg-if", + "getrandom", + "once_cell", + "version_check", + "zerocopy", +] + +[[package]] name = "aho-corasick" version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -57,117 +369,110 @@ dependencies = [ ] [[package]] -name = "anyhow" -version = "1.0.86" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" - -[[package]] -name = "arboard" -version = "3.4.0" +name = "anstream" +version = "0.6.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fb4009533e8ff8f1450a5bcbc30f4242a1d34442221f72314bea1f5dc9c7f89" +checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b" dependencies = [ - "clipboard-win", - "core-graphics 0.23.2", - "image 0.25.1", - "log", - "objc2", - "objc2-app-kit", - "objc2-foundation", - "parking_lot", - "windows-sys 0.48.0", - "wl-clipboard-rs", - "x11rb", + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is_terminal_polyfill", + "utf8parse", ] [[package]] -name = "ascii" -version = "1.1.0" +name = "anstyle" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d92bec98840b8f03a5ff5413de5293bfcd8bf96467cf5452609f939ec6f5de16" +checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b" [[package]] -name = "async-broadcast" -version = "0.5.1" +name = "anstyle-parse" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c48ccdbf6ca6b121e0f586cbc0e73ae440e56c67c30fa0873b4e110d9c26d2b" +checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4" dependencies = [ - "event-listener 2.5.3", - "futures-core", + "utf8parse", ] [[package]] -name = "async-channel" -version = "2.3.1" +name = "anstyle-query" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a" +checksum = "ad186efb764318d35165f1758e7dcef3b10628e26d41a44bc5550652e6804391" dependencies = [ - "concurrent-queue", - "event-listener-strategy 0.5.2", - "futures-core", - "pin-project-lite", + "windows-sys 0.52.0", ] [[package]] -name = "async-executor" -version = "1.11.0" +name = "anstyle-wincon" +version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b10202063978b3351199d68f8b22c4e47e4b1b822f8d43fd862d5ea8c006b29a" +checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19" dependencies = [ - "async-task", - "concurrent-queue", - "fastrand 2.1.0", - "futures-lite 2.3.0", - "slab", + "anstyle", + "windows-sys 0.52.0", ] [[package]] -name = "async-fs" -version = "1.6.0" +name = "anyhow" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" + +[[package]] +name = "arrayref" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" + +[[package]] +name = "arrayvec" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" + +[[package]] +name = "async-broadcast" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20cd0e2e25ea8e5f7e9df04578dc6cf5c83577fd09b1a46aaf5c85e1c33f2a7e" dependencies = [ - "async-lock 2.8.0", - "autocfg", - "blocking", - "futures-lite 1.13.0", + "event-listener", + "event-listener-strategy", + "futures-core", + "pin-project-lite", ] [[package]] -name = "async-io" -version = "1.13.0" +name = "async-channel" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" +checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a" dependencies = [ - "async-lock 2.8.0", - "autocfg", - "cfg-if", "concurrent-queue", - "futures-lite 1.13.0", - "log", - "parking", - "polling 2.8.0", - "rustix 0.37.27", - "slab", - "socket2", - "waker-fn", + "event-listener-strategy", + "futures-core", + "pin-project-lite", ] [[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", "cfg-if", "concurrent-queue", "futures-io", - "futures-lite 2.3.0", + "futures-lite", "parking", - "polling 3.7.0", - "rustix 0.38.34", + "polling", + "rustix", "slab", "tracing", "windows-sys 0.52.0", @@ -175,39 +480,33 @@ dependencies = [ [[package]] name = "async-lock" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" -dependencies = [ - "event-listener 2.5.3", -] - -[[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", + "event-listener-strategy", "pin-project-lite", ] [[package]] name = "async-process" -version = "1.8.1" +version = "2.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88" +checksum = "f7eda79bbd84e29c2b308d1dc099d7de8dcc7035e48f4bf5dc4a531a44ff5e2a" dependencies = [ - "async-io 1.13.0", - "async-lock 2.8.0", + "async-channel", + "async-io", + "async-lock", "async-signal", + "async-task", "blocking", "cfg-if", - "event-listener 3.1.0", - "futures-lite 1.13.0", - "rustix 0.38.34", - "windows-sys 0.48.0", + "event-listener", + "futures-lite", + "rustix", + "tracing", + "windows-sys 0.52.0", ] [[package]] @@ -218,22 +517,22 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn", ] [[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", + "async-lock", "atomic-waker", "cfg-if", "futures-core", "futures-io", - "rustix 0.38.34", + "rustix", "signal-hook-registry", "slab", "windows-sys 0.52.0", @@ -253,31 +552,16 @@ checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", -] - -[[package]] -name = "atk" -version = "0.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c3d816ce6f0e2909a96830d6911c2aff044370b1ef92d7f267b43bae5addedd" -dependencies = [ - "atk-sys", - "bitflags 1.3.2", - "glib", - "libc", + "syn", ] [[package]] -name = "atk-sys" -version = "0.15.1" +name = "atomic" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58aeb089fb698e06db8089971c7ee317ab9644bade33383f63631437b03aafb6" +checksum = "8d818003e740b63afc82337e3160717f4f63078720a810b7b903e70a5d1d2994" dependencies = [ - "glib-sys", - "gobject-sys", - "libc", - "system-deps 6.2.2", + "bytemuck", ] [[package]] @@ -287,17 +571,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi 0.1.19", - "libc", - "winapi", -] - -[[package]] name = "autocfg" version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -305,9 +578,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "backtrace" -version = "0.3.71" +version = "0.3.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" +checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" dependencies = [ "addr2line", "cc", @@ -326,9 +599,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.21.7" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" +checksum = "0ea22880d78093b0cbe17c89f64a7d457941e65759157ec6cb31a31d652b05e5" [[package]] name = "base64" @@ -337,15 +610,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] -name = "bincode" -version = "1.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" -dependencies = [ - "serde", -] - -[[package]] name = "bitflags" version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -353,15 +617,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" - -[[package]] -name = "block" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" [[package]] name = "block-buffer" @@ -373,33 +631,23 @@ dependencies = [ ] [[package]] -name = "block2" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c132eebf10f5cad5289222520a4a058514204aed6d791f1cf4fe8088b82d15f" -dependencies = [ - "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", + "futures-lite", "piper", ] [[package]] name = "brotli" -version = "3.5.0" +version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d640d25bc63c50fb1f0b545ffd80207d2e10a4c965530809b40ba3386825c391" +checksum = "74f7971dbd9326d58187408ab83117d8ac1bb9c17b085fdacd1cf2f598719b6b" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -408,25 +656,15 @@ dependencies = [ [[package]] name = "brotli-decompressor" -version = "2.5.1" +version = "4.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e2e4afe60d7dd600fdd3de8d0f08c2b7ec039712e3b6137ff98b7004e82de4f" +checksum = "9a45bd2e4095a8b518033b128020dd4a55aab1c0a381ba4404a472630f4bc362" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", ] [[package]] -name = "bstr" -version = "1.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706" -dependencies = [ - "memchr", - "serde", -] - -[[package]] name = "bumpalo" version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -434,96 +672,60 @@ checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "bytemuck" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78834c15cb5d5efe3452d58b1e8ba890dd62d21907f867f383358198e56ebca5" - -[[package]] -name = "byteorder" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" - -[[package]] -name = "bytes" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" - -[[package]] -name = "cairo-rs" -version = "0.15.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c76ee391b03d35510d9fa917357c7f1855bd9a6659c95a1b392e33f49b3369bc" -dependencies = [ - "bitflags 1.3.2", - "cairo-sys-rs", - "glib", - "libc", - "thiserror", -] - -[[package]] -name = "cairo-sys-rs" -version = "0.15.1" +version = "1.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c55d429bef56ac9172d25fecb85dc8068307d17acd74b377866b7a1ef25d3c8" +checksum = "b236fc92302c97ed75b38da1f4917b5cdda4984745740f153a5d3059e48d725e" dependencies = [ - "glib-sys", - "libc", - "system-deps 6.2.2", + "bytemuck_derive", ] [[package]] -name = "cargo_toml" -version = "0.15.3" +name = "bytemuck_derive" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "599aa35200ffff8f04c1925aa1acc92fa2e08874379ef42e210a80e527e60838" +checksum = "1ee891b04274a59bd38b412188e24b849617b2e45a0fd8d057deb63e7403761b" dependencies = [ - "serde", - "toml 0.7.8", + "proc-macro2", + "quote", + "syn", ] [[package]] -name = "cc" -version = "1.0.98" +name = "byteorder" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] -name = "cesu8" -version = "1.1.0" +name = "byteorder-lite" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" +checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495" [[package]] -name = "cfb" -version = "0.7.3" +name = "bytes" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d38f2da7a0a2c4ccf0065be06397cc26a81f4e528be095826eee9d4adbb8c60f" -dependencies = [ - "byteorder", - "fnv", - "uuid", -] +checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" [[package]] -name = "cfg-expr" -version = "0.9.1" +name = "bytestring" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3431df59f28accaf4cb4eed4a9acc66bea3f3c3753aa6cdc2f024174ef232af7" +checksum = "74d80203ea6b29df88012294f62733de21cfeab47f17b41af3a38bc30a03ee72" dependencies = [ - "smallvec", + "bytes", ] [[package]] -name = "cfg-expr" -version = "0.15.8" +name = "cc" +version = "1.0.101" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02" +checksum = "ac367972e516d45567c7eafc73d24e1c193dcf200a8d94e9db7b3d38b349572d" dependencies = [ - "smallvec", - "target-lexicon", + "jobserver", + "libc", + "once_cell", ] [[package]] @@ -539,6 +741,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" [[package]] +name = "cfg_aliases" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" + +[[package]] name = "chrono" version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -546,78 +754,70 @@ checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" dependencies = [ "android-tzdata", "iana-time-zone", + "js-sys", "num-traits", "serde", + "wasm-bindgen", "windows-targets 0.52.5", ] [[package]] -name = "chunked_transfer" -version = "1.5.0" +name = "cipher" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e4de3bc4ea267985becf712dc6d9eed8b04c953b3fcfb339ebc87acd9804901" +checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" +dependencies = [ + "crypto-common", + "inout", +] [[package]] name = "clap" -version = "3.2.25" +version = "4.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123" +checksum = "84b3edb18336f4df585bc9aa31dd99c036dfa5dc5e9a2939a722a188f3a8970d" dependencies = [ - "atty", - "bitflags 1.3.2", - "clap_lex", - "indexmap 1.9.3", - "strsim 0.10.0", - "termcolor", - "textwrap", + "clap_builder", + "clap_derive", ] [[package]] -name = "clap_lex" -version = "0.2.4" +name = "clap_builder" +version = "4.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" +checksum = "c1c09dd5ada6c6c78075d6fd0da3f90d8080651e2d6cc8eb2f1aaa4034ced708" dependencies = [ - "os_str_bytes", + "anstream", + "anstyle", + "clap_lex", + "strsim", ] [[package]] -name = "clipboard-win" -version = "5.3.1" +name = "clap_derive" +version = "4.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79f4473f5144e20d9aceaf2972478f06ddf687831eafeeb434fbaf0acc4144ad" +checksum = "2bac35c6dafb060fd4d275d9a4ffae97917c13a6327903a8be2153cd964f7085" dependencies = [ - "error-code", + "heck", + "proc-macro2", + "quote", + "syn", ] [[package]] -name = "cocoa" -version = "0.24.1" +name = "clap_lex" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f425db7937052c684daec3bd6375c8abe2d146dca4b8b143d6db777c39138f3a" -dependencies = [ - "bitflags 1.3.2", - "block", - "cocoa-foundation", - "core-foundation", - "core-graphics 0.22.3", - "foreign-types 0.3.2", - "libc", - "objc", -] +checksum = "4b82cf0babdbd58558212896d1a4272303a57bdb245c2bf1147185fb45640e70" [[package]] -name = "cocoa-foundation" -version = "0.1.2" +name = "clokwerk" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c6234cbb2e4c785b456c0644748b1ac416dd045799740356f8363dfe00c93f7" +checksum = "bd108d365fcb6d7eddf17a6718eb6a33db18ba4178f8cc6b667f480710f10d76" dependencies = [ - "bitflags 1.3.2", - "block", - "core-foundation", - "core-graphics-types", - "libc", - "objc", + "chrono", ] [[package]] @@ -627,14 +827,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" [[package]] -name = "combine" -version = "4.6.7" +name = "colorchoice" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" -dependencies = [ - "bytes", - "memchr", -] +checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" [[package]] name = "concurrent-queue" @@ -646,78 +842,110 @@ dependencies = [ ] [[package]] -name = "convert_case" -version = "0.4.0" +name = "const_format" +version = "0.2.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" - -[[package]] -name = "coolercontrol" -version = "1.3.0" +checksum = "e3a214c7af3d04997541b18d432afaff4c455e79e2029079647e72fc2bd27673" dependencies = [ - "rand 0.8.5", - "serde", - "serde_json", - "tauri", - "tauri-build", - "tauri-plugin-localhost", - "tauri-plugin-single-instance", - "tauri-plugin-store", - "tauri-plugin-window-state", + "const_format_proc_macros", ] [[package]] -name = "core-foundation" -version = "0.9.4" +name = "const_format_proc_macros" +version = "0.2.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" +checksum = "c7f6ff08fd20f4f299298a28e2dfa8a8ba1036e6cd2460ac1de7b425d76f2500" dependencies = [ - "core-foundation-sys", - "libc", + "proc-macro2", + "quote", + "unicode-xid", ] [[package]] -name = "core-foundation-sys" -version = "0.8.6" +name = "convert_case" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" +checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" [[package]] -name = "core-graphics" -version = "0.22.3" +name = "cookie" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb" +checksum = "e859cd57d0710d9e06c381b550c06e76992472a8c6d527aecd2fc673dcc231fb" dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "core-graphics-types", - "foreign-types 0.3.2", - "libc", + "aes-gcm", + "base64 0.20.0", + "hkdf", + "hmac", + "percent-encoding", + "rand", + "sha2", + "subtle", + "time", + "version_check", ] [[package]] -name = "core-graphics" -version = "0.23.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081" +name = "coolercontrold" +version = "1.4.0" dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "core-graphics-types", - "foreign-types 0.5.0", - "libc", + "actix-cors", + "actix-multipart", + "actix-session", + "actix-web", + "actix-web-static-files", + "anyhow", + "async-trait", + "chrono", + "clap", + "clokwerk", + "const_format", + "derive_more", + "env_logger", + "gifski", + "heck", + "http-auth-basic", + "http-body-util", + "hyper", + "hyper-util", + "image", + "imgref", + "lazy_static", + "libdrm_amdgpu_sys", + "log", + "mime", + "nix 0.29.0", + "nu-glob", + "nvml-wrapper", + "pciid-parser", + "psutil", + "regex", + "rgb", + "ril", + "serde", + "serde_json", + "sha2", + "signal-hook", + "static-files", + "strum", + "sysinfo", + "systemd-journal-logger", + "tempfile", + "test-context", + "tiny-skia", + "tokio", + "tokio-graceful-shutdown", + "toml_edit 0.22.14", + "uuid", + "yata", + "zbus", ] [[package]] -name = "core-graphics-types" -version = "0.1.3" +name = "core-foundation-sys" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "libc", -] +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "cpufeatures" @@ -778,44 +1006,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" dependencies = [ "generic-array", + "rand_core", "typenum", ] [[package]] -name = "cssparser" -version = "0.27.2" +name = "ctr" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "754b69d351cdc2d8ee09ae203db831e005560fc6030da058f86ad60c92a9cb0a" +checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835" dependencies = [ - "cssparser-macros", - "dtoa-short", - "itoa 0.4.8", - "matches", - "phf 0.8.0", - "proc-macro2", - "quote", - "smallvec", - "syn 1.0.109", -] - -[[package]] -name = "cssparser-macros" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331" -dependencies = [ - "quote", - "syn 2.0.66", -] - -[[package]] -name = "ctor" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edb49164822f3ee45b17acd4a208cfc1251410cf0cad9a833234c9890774dd9f" -dependencies = [ - "quote", - "syn 2.0.66", + "cipher", ] [[package]] @@ -838,8 +1039,8 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "strsim 0.11.1", - "syn 2.0.66", + "strsim", + "syn", ] [[package]] @@ -850,7 +1051,7 @@ checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178" dependencies = [ "darling_core", "quote", - "syn 2.0.66", + "syn", ] [[package]] @@ -860,42 +1061,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" dependencies = [ "powerfmt", - "serde", -] - -[[package]] -name = "derivative" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[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_more" -version = "0.99.17" +version = "0.99.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" +checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce" dependencies = [ "convert_case", "proc-macro2", "quote", "rustc_version", - "syn 1.0.109", + "syn", ] [[package]] @@ -906,119 +1084,72 @@ checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ "block-buffer", "crypto-common", + "subtle", ] [[package]] -name = "dirs-next" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" -dependencies = [ - "cfg-if", - "dirs-sys-next", -] - -[[package]] -name = "dirs-sys-next" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" -dependencies = [ - "libc", - "redox_users", - "winapi", -] - -[[package]] -name = "dispatch" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" - -[[package]] -name = "dlib" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" -dependencies = [ - "libloading 0.8.3", -] - -[[package]] -name = "downcast-rs" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" - -[[package]] -name = "dtoa" -version = "1.0.9" +name = "either" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcbb2bf8e87535c23f7a8a321e364ce21462d0ff10cb6407820e8e96dfff6653" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] -name = "dtoa-short" -version = "0.3.4" +name = "encoding_rs" +version = "0.8.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbaceec3c6e4211c79e7b1800fb9680527106beb2f9c51904a3210c03a448c74" +checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" dependencies = [ - "dtoa", + "cfg-if", ] [[package]] -name = "dunce" -version = "1.0.4" +name = "endi" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" +checksum = "a3d8a32ae18130a3c84dd492d4215c3d913c3b07c6b63c2eb3eb7ff1101ab7bf" [[package]] -name = "embed-resource" -version = "2.4.2" +name = "enumflags2" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6985554d0688b687c5cb73898a34fbe3ad6c24c58c238a4d91d5e840670ee9d" +checksum = "d232db7f5956f3f14313dc2f87985c58bd2c695ce124c8cdd984e08e15ac133d" dependencies = [ - "cc", - "memchr", - "rustc_version", - "toml 0.8.13", - "vswhom", - "winreg", + "enumflags2_derive", + "serde", ] [[package]] -name = "embed_plist" -version = "1.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ef6b89e5b37196644d8796de5268852ff179b44e96276cf4290264843743bb7" - -[[package]] -name = "encoding_rs" -version = "0.8.34" +name = "enumflags2_derive" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" +checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8" dependencies = [ - "cfg-if", + "proc-macro2", + "quote", + "syn", ] [[package]] -name = "enumflags2" -version = "0.7.9" +name = "env_filter" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3278c9d5fb675e0a51dabcf4c0d355f692b064171535ba72361be1528a9d8e8d" +checksum = "a009aa4810eb158359dda09d0c87378e4bbb89b5a801f016885a4707ba24f7ea" dependencies = [ - "enumflags2_derive", - "serde", + "log", + "regex", ] [[package]] -name = "enumflags2_derive" -version = "0.7.9" +name = "env_logger" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c785274071b1b420972453b306eeca06acf4633829db4223b58a2a8c5953bc4" +checksum = "38b35839ba51819680ba087cd351788c9a3c476841207e0b8cee0b04722343b9" dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", + "anstream", + "anstyle", + "env_filter", + "humantime", + "log", ] [[package]] @@ -1038,44 +1169,10 @@ dependencies = [ ] [[package]] -name = "error-code" -version = "3.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0474425d51df81997e2f90a21591180b38eccf27292d755f3e30750225c175b" - -[[package]] -name = "event-listener" -version = "2.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" - -[[package]] -name = "event-listener" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d93877bcde0eb80ca09131a08d23f0a5c18a620b01db137dba666d18cd9b30c2" -dependencies = [ - "concurrent-queue", - "parking", - "pin-project-lite", -] - -[[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", @@ -1084,35 +1181,16 @@ 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", "pin-project-lite", ] [[package]] name = "fastrand" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" -dependencies = [ - "instant", -] - -[[package]] -name = "fastrand" version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" @@ -1127,34 +1205,6 @@ dependencies = [ ] [[package]] -name = "field-offset" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f" -dependencies = [ - "memoffset 0.9.1", - "rustc_version", -] - -[[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 = "fixedbitset" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" - -[[package]] name = "flate2" version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1171,48 +1221,16 @@ 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" +name = "fontdue" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" +checksum = "0793f5137567643cf65ea42043a538804ff0fbf288649e2141442b602d81f9bc" dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", + "hashbrown 0.13.2", + "ttf-parser", ] [[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" @@ -1222,13 +1240,18 @@ dependencies = [ ] [[package]] -name = "futf" -version = "0.1.5" +name = "futures" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df420e2e84819663797d1ec6544b13c5be84629e7bb00dc960d6917db2987843" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" dependencies = [ - "mac", - "new_debug_unreachable", + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", ] [[package]] @@ -1238,6 +1261,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" dependencies = [ "futures-core", + "futures-sink", ] [[package]] @@ -1265,26 +1289,11 @@ checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" [[package]] name = "futures-lite" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" -dependencies = [ - "fastrand 1.9.0", - "futures-core", - "futures-io", - "memchr", - "parking", - "pin-project-lite", - "waker-fn", -] - -[[package]] -name = "futures-lite" version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" dependencies = [ - "fastrand 2.1.0", + "fastrand", "futures-core", "futures-io", "parking", @@ -1299,7 +1308,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn", ] [[package]] @@ -1320,6 +1329,7 @@ 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", @@ -1332,114 +1342,6 @@ dependencies = [ ] [[package]] -name = "fxhash" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" -dependencies = [ - "byteorder", -] - -[[package]] -name = "gdk" -version = "0.15.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6e05c1f572ab0e1f15be94217f0dc29088c248b14f792a5ff0af0d84bcda9e8" -dependencies = [ - "bitflags 1.3.2", - "cairo-rs", - "gdk-pixbuf", - "gdk-sys", - "gio", - "glib", - "libc", - "pango", -] - -[[package]] -name = "gdk-pixbuf" -version = "0.15.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad38dd9cc8b099cceecdf41375bb6d481b1b5a7cd5cd603e10a69a9383f8619a" -dependencies = [ - "bitflags 1.3.2", - "gdk-pixbuf-sys", - "gio", - "glib", - "libc", -] - -[[package]] -name = "gdk-pixbuf-sys" -version = "0.15.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "140b2f5378256527150350a8346dbdb08fadc13453a7a2d73aecd5fab3c402a7" -dependencies = [ - "gio-sys", - "glib-sys", - "gobject-sys", - "libc", - "system-deps 6.2.2", -] - -[[package]] -name = "gdk-sys" -version = "0.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32e7a08c1e8f06f4177fb7e51a777b8c1689f743a7bc11ea91d44d2226073a88" -dependencies = [ - "cairo-sys-rs", - "gdk-pixbuf-sys", - "gio-sys", - "glib-sys", - "gobject-sys", - "libc", - "pango-sys", - "pkg-config", - "system-deps 6.2.2", -] - -[[package]] -name = "gdkwayland-sys" -version = "0.15.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cca49a59ad8cfdf36ef7330fe7bdfbe1d34323220cc16a0de2679ee773aee2c2" -dependencies = [ - "gdk-sys", - "glib-sys", - "gobject-sys", - "libc", - "pkg-config", - "system-deps 6.2.2", -] - -[[package]] -name = "gdkx11-sys" -version = "0.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4b7f8c7a84b407aa9b143877e267e848ff34106578b64d1e0a24bf550716178" -dependencies = [ - "gdk-sys", - "glib-sys", - "libc", - "system-deps 6.2.2", - "x11", -] - -[[package]] -name = "generator" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cc16584ff22b460a382b7feec54b23d2908d858152e5739a120b949293bd74e" -dependencies = [ - "cc", - "libc", - "log", - "rustversion", - "windows 0.48.0", -] - -[[package]] name = "generic-array" version = "0.14.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1450,27 +1352,6 @@ dependencies = [ ] [[package]] -name = "gethostname" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0176e0459c2e4a1fe232f984bca6890e681076abb9934f6cea7c326f3fc47818" -dependencies = [ - "libc", - "windows-targets 0.48.5", -] - -[[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.15" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1478,89 +1359,65 @@ checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "libc", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", ] [[package]] -name = "gimli" -version = "0.28.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" - -[[package]] -name = "gio" -version = "0.15.12" +name = "ghash" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68fdbc90312d462781a395f7a16d96a2b379bb6ef8cd6310a2df272771c4283b" +checksum = "f0d8a4362ccb29cb0b265253fb0a2728f592895ee6854fd9bc13f2ffda266ff1" dependencies = [ - "bitflags 1.3.2", - "futures-channel", - "futures-core", - "futures-io", - "gio-sys", - "glib", - "libc", - "once_cell", - "thiserror", + "opaque-debug", + "polyval", ] [[package]] -name = "gio-sys" -version = "0.15.10" +name = "gif" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32157a475271e2c4a023382e9cab31c4584ee30a97da41d3c4e9fdd605abcf8d" +checksum = "3fb2d69b19215e18bb912fa30f7ce15846e301408695e44e0ef719f1da9e19f2" dependencies = [ - "glib-sys", - "gobject-sys", - "libc", - "system-deps 6.2.2", - "winapi", + "color_quant", + "weezl", ] [[package]] -name = "glib" -version = "0.15.12" +name = "gif-dispose" +version = "5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edb0306fbad0ab5428b0ca674a23893db909a98582969c9b537be4ced78c505d" +checksum = "781005a5985b4c723fd3e6586df79d823151846ebcbcf2fcc7e3d3fba18c2d51" dependencies = [ - "bitflags 1.3.2", - "futures-channel", - "futures-core", - "futures-executor", - "futures-task", - "glib-macros", - "glib-sys", - "gobject-sys", - "libc", - "once_cell", - "smallvec", - "thiserror", + "gif", + "imgref", + "rgb", ] [[package]] -name = "glib-macros" -version = "0.15.13" +name = "gifski" +version = "1.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10c6ae9f6fa26f4fb2ac16b528d138d971ead56141de489f8111e259b9df3c4a" +checksum = "fa3aeeed337aa658d1c2d90cb21b6db6172d1b8a84dfb462ade81f48eb0fd5eb" dependencies = [ - "anyhow", - "heck 0.4.1", - "proc-macro-crate", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 1.0.109", + "crossbeam-channel", + "crossbeam-utils", + "gif", + "gif-dispose", + "imagequant", + "imgref", + "loop9", + "num-traits", + "ordered-channel", + "quick-error", + "resize", + "rgb", ] [[package]] -name = "glib-sys" -version = "0.15.10" +name = "gimli" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef4b192f8e65e9cf76cbf4ea71fa8e3be4a0e18ffe3d68b8da6836974cc5bad4" -dependencies = [ - "libc", - "system-deps 6.2.2", -] +checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" [[package]] name = "glob" @@ -1569,131 +1426,56 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] -name = "globset" -version = "0.4.14" +name = "h2" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1" +checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" dependencies = [ - "aho-corasick", - "bstr", - "log", - "regex-automata 0.4.6", - "regex-syntax 0.8.3", -] - -[[package]] -name = "gobject-sys" -version = "0.15.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d57ce44246becd17153bd035ab4d32cfee096a657fc01f2231c9278378d1e0a" -dependencies = [ - "glib-sys", - "libc", - "system-deps 6.2.2", -] - -[[package]] -name = "gtk" -version = "0.15.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92e3004a2d5d6d8b5057d2b57b3712c9529b62e82c77f25c1fecde1fd5c23bd0" -dependencies = [ - "atk", - "bitflags 1.3.2", - "cairo-rs", - "field-offset", - "futures-channel", - "gdk", - "gdk-pixbuf", - "gio", - "glib", - "gtk-sys", - "gtk3-macros", - "libc", - "once_cell", - "pango", - "pkg-config", -] - -[[package]] -name = "gtk-sys" -version = "0.15.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5bc2f0587cba247f60246a0ca11fe25fb733eabc3de12d1965fc07efab87c84" -dependencies = [ - "atk-sys", - "cairo-sys-rs", - "gdk-pixbuf-sys", - "gdk-sys", - "gio-sys", - "glib-sys", - "gobject-sys", - "libc", - "pango-sys", - "system-deps 6.2.2", + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http 0.2.12", + "indexmap", + "slab", + "tokio", + "tokio-util", + "tracing", ] [[package]] -name = "gtk3-macros" -version = "0.15.6" +name = "hashbrown" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "684c0456c086e8e7e9af73ec5b84e35938df394712054550e81558d21c44ab0d" +checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" dependencies = [ - "anyhow", - "proc-macro-crate", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 1.0.109", + "ahash", ] [[package]] name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" - -[[package]] -name = "hashbrown" version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" [[package]] name = "heck" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" -dependencies = [ - "unicode-segmentation", -] - -[[package]] -name = "heck" -version = "0.4.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.1.19" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" [[package]] name = "hermit-abi" -version = "0.3.9" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" +checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" [[package]] name = "hex" @@ -1702,26 +1484,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] -name = "home" -version = "0.5.9" +name = "hkdf" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" +checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7" dependencies = [ - "windows-sys 0.52.0", + "hmac", ] [[package]] -name = "html5ever" -version = "0.26.0" +name = "hmac" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bea68cab48b8459f17cf1c944c67ddc572d272d9f2b274140f223ecb1da4a3b7" +checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" dependencies = [ - "log", - "mac", - "markup5ever", - "proc-macro2", - "quote", - "syn 1.0.109", + "digest", ] [[package]] @@ -1732,7 +1509,7 @@ checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" dependencies = [ "bytes", "fnv", - "itoa 1.0.11", + "itoa", ] [[package]] @@ -1743,14 +1520,46 @@ checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" dependencies = [ "bytes", "fnv", - "itoa 1.0.11", + "itoa", ] [[package]] -name = "http-range" -version = "0.1.5" +name = "http-auth-basic" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21dec9db110f5f872ed9699c3ecf50cf16f423502706ba5c72462e28d3157573" +checksum = "dd2e17aacf7f4a2428def798e2ff4f4f883c0987bdaf47dd5c8bc027bc9f1ebc" +dependencies = [ + "base64 0.13.1", +] + +[[package]] +name = "http-body" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" +dependencies = [ + "bytes", + "http 1.1.0", +] + +[[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 1.1.0", + "http-body", + "pin-project-lite", +] + +[[package]] +name = "httparse" +version = "1.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" [[package]] name = "httpdate" @@ -1759,6 +1568,50 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] +name = "humantime" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" + +[[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", + "http 1.1.0", + "http-body", + "httparse", + "itoa", + "pin-project-lite", + "smallvec", + "tokio", + "want", +] + +[[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 1.1.0", + "http-body", + "hyper", + "pin-project-lite", + "tokio", + "tower", + "tower-service", + "tracing", +] + +[[package]] name = "iana-time-zone" version = "0.1.60" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1782,16 +1635,6 @@ dependencies = [ ] [[package]] -name = "ico" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3804960be0bb5e4edb1e1ad67afd321a9ecfd875c3e65c099468fd2717d7cae" -dependencies = [ - "byteorder", - "png", -] - -[[package]] name = "ident_case" version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1808,34 +1651,6 @@ dependencies = [ ] [[package]] -name = "ignore" -version = "0.4.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b46810df39e66e925525d6e38ce1e7f6e1d208f72dc39757880fcb66e2c58af1" -dependencies = [ - "crossbeam-deque", - "globset", - "log", - "memchr", - "regex-automata 0.4.6", - "same-file", - "walkdir", - "winapi-util", -] - -[[package]] -name = "image" -version = "0.24.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d" -dependencies = [ - "bytemuck", - "byteorder", - "color_quant", - "num-traits", -] - -[[package]] name = "image" version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1843,67 +1658,70 @@ checksum = "fd54d660e773627692c524beaad361aca785a4f9f5730ce91f42aabe5bce3d11" dependencies = [ "bytemuck", "byteorder", + "color_quant", + "gif", + "image-webp", "num-traits", "png", + "rayon", "tiff", + "zune-core", + "zune-jpeg", ] [[package]] -name = "indexmap" -version = "1.9.3" +name = "image-webp" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +checksum = "d730b085583c4d789dfd07fdcf185be59501666a90c97c40162b37e4fdad272d" dependencies = [ - "autocfg", - "hashbrown 0.12.3", - "serde", + "byteorder-lite", + "thiserror", ] [[package]] -name = "indexmap" -version = "2.2.6" +name = "imagequant" +version = "4.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" +checksum = "09db32417831053bf246bc74fc7c139a05458552d2d98a9f58ff5744d8dea8d3" dependencies = [ - "equivalent", - "hashbrown 0.14.5", - "serde", + "arrayvec", + "once_cell", + "rayon", + "rgb", + "thread_local", ] [[package]] -name = "infer" -version = "0.13.0" +name = "imgref" +version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f551f8c3a39f68f986517db0d1759de85881894fdc7db798bd2a9df9cb04b7fc" -dependencies = [ - "cfb", -] +checksum = "44feda355f4159a7c757171a77de25daf6411e217b4cabd03bd6650690468126" [[package]] -name = "instant" -version = "0.1.13" +name = "indexmap" +version = "2.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ - "cfg-if", + "equivalent", + "hashbrown 0.14.5", ] [[package]] -name = "io-lifetimes" -version = "1.0.11" +name = "inout" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" +checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" dependencies = [ - "hermit-abi 0.3.9", - "libc", - "windows-sys 0.48.0", + "generic-array", ] [[package]] -name = "itoa" -version = "0.4.8" +name = "is_terminal_polyfill" +version = "1.70.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" +checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" [[package]] name = "itoa" @@ -1912,49 +1730,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] -name = "javascriptcore-rs" -version = "0.16.0" +name = "jobserver" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf053e7843f2812ff03ef5afe34bb9c06ffee120385caad4f6b9967fcd37d41c" +checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" dependencies = [ - "bitflags 1.3.2", - "glib", - "javascriptcore-rs-sys", -] - -[[package]] -name = "javascriptcore-rs-sys" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "905fbb87419c5cde6e3269537e4ea7d46431f3008c5d057e915ef3f115e7793c" -dependencies = [ - "glib-sys", - "gobject-sys", "libc", - "system-deps 5.0.0", -] - -[[package]] -name = "jni" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "039022cdf4d7b1cf548d31f60ae783138e5fd42013f6271049d7df7afadef96c" -dependencies = [ - "cesu8", - "combine", - "jni-sys", - "log", - "thiserror", - "walkdir", ] [[package]] -name = "jni-sys" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" - -[[package]] name = "jpeg-decoder" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1970,58 +1754,16 @@ dependencies = [ ] [[package]] -name = "json-patch" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec9ad60d674508f3ca8f380a928cfe7b096bc729c4e2dbfe3852bc45da3ab30b" -dependencies = [ - "serde", - "serde_json", - "thiserror", -] - -[[package]] -name = "kuchikiki" -version = "0.8.2" +name = "language-tags" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e4755b7b995046f510a7520c42b2fed58b77bd94d5a87a8eb43d2fd126da8" -dependencies = [ - "cssparser", - "html5ever", - "indexmap 1.9.3", - "matches", - "selectors", -] +checksum = "d4345964bb142484797b161f473a503a434de77149dd8c7427788c6e13379388" [[package]] name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "libappindicator" -version = "0.7.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db2d3cb96d092b4824cb306c9e544c856a4cb6210c1081945187f7f1924b47e8" -dependencies = [ - "glib", - "gtk", - "gtk-sys", - "libappindicator-sys", - "log", -] - -[[package]] -name = "libappindicator-sys" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1b3b6681973cea8cc3bce7391e6d7d5502720b80a581c9a95c9cbaf592826aa" -dependencies = [ - "gtk-sys", - "libloading 0.7.4", - "once_cell", -] +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libc" @@ -2030,52 +1772,46 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] -name = "libloading" -version = "0.7.4" +name = "libdrm_amdgpu_sys" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" +checksum = "adffc519012b872bd699a856bc3faffb899c7f9d41750b21a0f573bba1ada802" dependencies = [ - "cfg-if", - "winapi", + "libc", ] [[package]] name = "libloading" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" +checksum = "e310b3a6b5907f99202fcdb4960ff45b93735d7c7d96b760fcff8db2dc0e103d" dependencies = [ "cfg-if", "windows-targets 0.52.5", ] [[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 = "line-wrap" -version = "0.2.0" +name = "linux-raw-sys" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd1bc4d24ad230d21fb898d1116b1801d7adfc449d42026475862ab48b11e70e" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] -name = "linux-raw-sys" -version = "0.3.8" +name = "local-channel" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" +checksum = "b6cbc85e69b8df4b8bb8b89ec634e7189099cea8927a276b7384ce5488e53ec8" +dependencies = [ + "futures-core", + "futures-sink", + "local-waker", +] [[package]] -name = "linux-raw-sys" -version = "0.4.14" +name = "local-waker" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" +checksum = "4d873d7c67ce09b42110d801813efbc9364414e356be9935700d368351657487" [[package]] name = "lock_api" @@ -2089,83 +1825,36 @@ dependencies = [ [[package]] name = "log" -version = "0.4.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" - -[[package]] -name = "loom" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff50ecb28bb86013e935fb6683ab1f6d3a20016f123c76fd4c27470076ac30f5" -dependencies = [ - "cfg-if", - "generator", - "scoped-tls", - "serde", - "serde_json", - "tracing", - "tracing-subscriber", -] - -[[package]] -name = "mac" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4" - -[[package]] -name = "malloc_buf" -version = "0.0.6" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" dependencies = [ - "libc", + "value-bag", ] [[package]] -name = "markup5ever" -version = "0.11.0" +name = "loop9" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a2629bb1404f3d34c2e921f21fd34ba00b206124c81f65c50b43b6aaefeb016" +checksum = "0fae87c125b03c1d2c0150c90365d7d6bcc53fb73a9acaef207d2d065860f062" dependencies = [ - "log", - "phf 0.10.1", - "phf_codegen 0.10.0", - "string_cache", - "string_cache_codegen", - "tendril", + "imgref", ] [[package]] -name = "matchers" -version = "0.1.0" +name = "mach2" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" +checksum = "19b955cdeb2a02b9117f121ce63aa52d08ade45de53e48fe6a38b39c10f6f709" dependencies = [ - "regex-automata 0.1.10", + "libc", ] [[package]] -name = "matches" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" - -[[package]] name = "memchr" -version = "2.7.2" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" - -[[package]] -name = "memoffset" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" -dependencies = [ - "autocfg", -] +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "memoffset" @@ -2177,65 +1866,75 @@ dependencies = [ ] [[package]] -name = "minimal-lexical" -version = "0.2.1" +name = "miette" +version = "7.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" +checksum = "4edc8853320c2a0dab800fbda86253c8938f6ea88510dc92c5f1ed20e794afc1" +dependencies = [ + "cfg-if", + "miette-derive", + "thiserror", + "unicode-width", +] [[package]] -name = "miniz_oxide" -version = "0.7.3" +name = "miette-derive" +version = "7.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae" +checksum = "dcf09caffaac8068c346b6df2a7fc27a177fd20b39421a39ce0a211bde679a6c" dependencies = [ - "adler", - "simd-adler32", + "proc-macro2", + "quote", + "syn", ] [[package]] -name = "ndk" -version = "0.6.0" +name = "mime" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2032c77e030ddee34a6787a64166008da93f6a352b629261d0fee232b8742dd4" -dependencies = [ - "bitflags 1.3.2", - "jni-sys", - "ndk-sys", - "num_enum", - "thiserror", -] +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] -name = "ndk-context" -version = "0.1.1" +name = "mime_guess" +version = "2.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" +checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e" +dependencies = [ + "mime", + "unicase", +] [[package]] -name = "ndk-sys" -version = "0.3.0" +name = "miniz_oxide" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e5a6ae77c8ee183dcbbba6150e2e6b9f3f4196a7666c02a715a95692ec1fa97" +checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" dependencies = [ - "jni-sys", + "adler", + "simd-adler32", ] [[package]] -name = "new_debug_unreachable" -version = "1.0.6" +name = "mio" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" +dependencies = [ + "libc", + "log", + "wasi", + "windows-sys 0.48.0", +] [[package]] name = "nix" -version = "0.26.4" +version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" +checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" dependencies = [ "bitflags 1.3.2", "cfg-if", "libc", - "memoffset 0.7.1", ] [[package]] @@ -2244,39 +1943,41 @@ version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cfg-if", - "cfg_aliases", + "cfg_aliases 0.1.1", "libc", + "memoffset", ] [[package]] -name = "nodrop" -version = "0.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" - -[[package]] -name = "nom" -version = "7.1.3" +name = "nix" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" dependencies = [ - "memchr", - "minimal-lexical", + "bitflags 2.6.0", + "cfg-if", + "cfg_aliases 0.2.1", + "libc", ] [[package]] -name = "nu-ansi-term" -version = "0.46.0" +name = "ntapi" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4" dependencies = [ - "overload", "winapi", ] [[package]] +name = "nu-glob" +version = "0.95.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acd2879444c53bbfb51a2ab060ae1257fe2c8446e6b2cd8a63c88a4d6a728a7a" + +[[package]] name = "num-conv" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2302,158 +2003,31 @@ dependencies = [ ] [[package]] -name = "num_enum" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9" -dependencies = [ - "num_enum_derive", -] - -[[package]] -name = "num_enum_derive" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" -dependencies = [ - "proc-macro-crate", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[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-sys" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310" - -[[package]] -name = "objc2" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -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-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-encode" -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", - "libc", - "objc2", -] - -[[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 = "objc_exception" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4" +name = "nvml-wrapper" +version = "0.10.0" +source = "git+https://github.com/codifryed/nvml-wrapper?branch=fan-control#6c8426b459e5e52ca39dd5101da78887d49f748d" dependencies = [ - "cc", + "bitflags 2.6.0", + "libloading", + "nvml-wrapper-sys", + "static_assertions", + "thiserror", + "wrapcenum-derive", ] [[package]] -name = "objc_id" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b" +name = "nvml-wrapper-sys" +version = "0.8.0" +source = "git+https://github.com/codifryed/nvml-wrapper?branch=fan-control#6c8426b459e5e52ca39dd5101da78887d49f748d" dependencies = [ - "objc", + "libloading", ] [[package]] name = "object" -version = "0.32.2" +version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +checksum = "081b846d1d56ddfc18fdf1a922e4f6e07a11768ea1b92dec44e42b72712ccfce" dependencies = [ "memchr", ] @@ -2465,13 +2039,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] -name = "open" -version = "3.2.0" +name = "opaque-debug" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2078c0039e6a54a0c42c28faa984e115fb4c2d5bf2208f77d1961002df8576f8" +checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" + +[[package]] +name = "ordered-channel" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f0bc569ca0974cb90125f52cf76f7b6ad3a072301beba78eb0aa4174c4964ed" dependencies = [ - "pathdiff", - "windows-sys 0.42.0", + "crossbeam-channel", ] [[package]] @@ -2485,53 +2064,6 @@ dependencies = [ ] [[package]] -name = "os_pipe" -version = "1.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57119c3b893986491ec9aa85056780d3a0f3cf4da7cc09dd3650dbd6c6738fb9" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "os_str_bytes" -version = "6.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1" - -[[package]] -name = "overload" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" - -[[package]] -name = "pango" -version = "0.15.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22e4045548659aee5313bde6c582b0d83a627b7904dd20dc2d9ef0895d414e4f" -dependencies = [ - "bitflags 1.3.2", - "glib", - "libc", - "once_cell", - "pango-sys", -] - -[[package]] -name = "pango-sys" -version = "0.15.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2a00081cde4661982ed91d80ef437c20eacaf6aa1a5962c0279ae194662c3aa" -dependencies = [ - "glib-sys", - "gobject-sys", - "libc", - "system-deps 6.2.2", -] - -[[package]] name = "parking" version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2555,165 +2087,59 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.5.1", + "redox_syscall", "smallvec", "windows-targets 0.52.5", ] [[package]] -name = "pathdiff" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" - -[[package]] -name = "percent-encoding" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" - -[[package]] -name = "petgraph" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" -dependencies = [ - "fixedbitset", - "indexmap 2.2.6", -] - -[[package]] -name = "phf" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12" -dependencies = [ - "phf_macros 0.8.0", - "phf_shared 0.8.0", - "proc-macro-hack", -] - -[[package]] -name = "phf" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259" -dependencies = [ - "phf_shared 0.10.0", -] - -[[package]] -name = "phf" -version = "0.11.2" +name = "parse-size" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" -dependencies = [ - "phf_macros 0.11.2", - "phf_shared 0.11.2", -] +checksum = "944553dd59c802559559161f9816429058b869003836120e262e8caec061b7ae" [[package]] -name = "phf_codegen" -version = "0.8.0" +name = "paste" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbffee61585b0411840d3ece935cce9cb6321f01c45477d30066498cd5e1a815" -dependencies = [ - "phf_generator 0.8.0", - "phf_shared 0.8.0", -] +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] -name = "phf_codegen" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb1c3a8bc4dd4e5cfce29b44ffc14bedd2ee294559a294e2a4d4c9e9a6a13cd" -dependencies = [ - "phf_generator 0.10.0", - "phf_shared 0.10.0", -] - -[[package]] -name = "phf_generator" -version = "0.8.0" +name = "path-slash" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526" -dependencies = [ - "phf_shared 0.8.0", - "rand 0.7.3", -] +checksum = "498a099351efa4becc6a19c72aa9270598e8fd274ca47052e37455241c88b696" [[package]] -name = "phf_generator" -version = "0.10.0" +name = "pciid-parser" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6" -dependencies = [ - "phf_shared 0.10.0", - "rand 0.8.5", -] +checksum = "e889f5dad24e8b842a0417e1df0fa250f4e300d1eb88b81d48a9db5bfff6e035" [[package]] -name = "phf_generator" -version = "0.11.2" +name = "percent-encoding" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" -dependencies = [ - "phf_shared 0.11.2", - "rand 0.8.5", -] +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] -name = "phf_macros" -version = "0.8.0" +name = "pin-project" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f6fde18ff429ffc8fe78e2bf7f8b7a5a5a6e2a8b58bc5a9ac69198bbda9189c" +checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" dependencies = [ - "phf_generator 0.8.0", - "phf_shared 0.8.0", - "proc-macro-hack", - "proc-macro2", - "quote", - "syn 1.0.109", + "pin-project-internal", ] [[package]] -name = "phf_macros" -version = "0.11.2" +name = "pin-project-internal" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" +checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ - "phf_generator 0.11.2", - "phf_shared 0.11.2", "proc-macro2", "quote", - "syn 2.0.66", -] - -[[package]] -name = "phf_shared" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7" -dependencies = [ - "siphasher", -] - -[[package]] -name = "phf_shared" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" -dependencies = [ - "siphasher", -] - -[[package]] -name = "phf_shared" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" -dependencies = [ - "siphasher", + "syn", ] [[package]] @@ -2730,12 +2156,12 @@ 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", + "fastrand", "futures-io", ] @@ -2746,20 +2172,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] -name = "plist" -version = "1.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9d34169e64b3c7a80c8621a48adaf44e0cf62c78a9b25dd9dd35f1881a17cf9" -dependencies = [ - "base64 0.21.7", - "indexmap 2.2.6", - "line-wrap", - "quick-xml", - "serde", - "time", -] - -[[package]] name = "png" version = "0.17.13" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2774,33 +2186,29 @@ dependencies = [ [[package]] name = "polling" -version = "2.8.0" +version = "3.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" +checksum = "a3ed00ed3fbf728b5816498ecd316d1716eecaced9c0c8d2c5a6740ca214985b" dependencies = [ - "autocfg", - "bitflags 1.3.2", "cfg-if", "concurrent-queue", - "libc", - "log", + "hermit-abi 0.4.0", "pin-project-lite", - "windows-sys 0.48.0", + "rustix", + "tracing", + "windows-sys 0.52.0", ] [[package]] -name = "polling" -version = "3.7.0" +name = "polyval" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "645493cf344456ef24219d02a768cf1fb92ddf8c92161679ae3d91b91a637be3" +checksum = "9d1fe60d06143b2430aa532c94cfe9e29783047f06c0d7fd359a9a51b729fa25" dependencies = [ "cfg-if", - "concurrent-queue", - "hermit-abi 0.3.9", - "pin-project-lite", - "rustix 0.38.34", - "tracing", - "windows-sys 0.52.0", + "cpufeatures", + "opaque-debug", + "universal-hash", ] [[package]] @@ -2816,68 +2224,43 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] -name = "precomputed-hash" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" - -[[package]] name = "proc-macro-crate" -version = "1.3.1" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" +checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" dependencies = [ - "once_cell", - "toml_edit 0.19.15", + "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" +name = "proc-macro2" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ - "proc-macro2", - "quote", - "version_check", + "unicode-ident", ] [[package]] -name = "proc-macro-hack" -version = "0.5.20+deprecated" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" - -[[package]] -name = "proc-macro2" -version = "1.0.84" +name = "psutil" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec96c6a92621310b51366f1e28d05ef11489516e93be030060e5fc12024a49d6" +checksum = "5e617cc9058daa5e1fe5a0d23ed745773a5ee354111dad1ec0235b0cc16b6730" dependencies = [ - "unicode-ident", + "cfg-if", + "glob", + "mach2", + "nix 0.24.3", + "num_cpus", + "once_cell", + "thiserror", ] [[package]] -name = "quick-xml" -version = "0.31.0" +name = "quick-error" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" -dependencies = [ - "memchr", -] +checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" [[package]] name = "quote" @@ -2890,37 +2273,13 @@ dependencies = [ [[package]] name = "rand" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -dependencies = [ - "getrandom 0.1.16", - "libc", - "rand_chacha 0.2.2", - "rand_core 0.5.1", - "rand_hc", - "rand_pcg", -] - -[[package]] -name = "rand" version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", - "rand_chacha 0.3.1", - "rand_core 0.6.4", -] - -[[package]] -name = "rand_chacha" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" -dependencies = [ - "ppv-lite86", - "rand_core 0.5.1", + "rand_chacha", + "rand_core", ] [[package]] @@ -2930,16 +2289,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ "ppv-lite86", - "rand_core 0.6.4", -] - -[[package]] -name = "rand_core" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -dependencies = [ - "getrandom 0.1.16", + "rand_core", ] [[package]] @@ -2948,105 +2298,102 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.15", + "getrandom", ] [[package]] -name = "rand_hc" -version = "0.2.0" +name = "rayon" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" dependencies = [ - "rand_core 0.5.1", + "either", + "rayon-core", ] [[package]] -name = "rand_pcg" -version = "0.2.1" +name = "rayon-core" +version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" dependencies = [ - "rand_core 0.5.1", + "crossbeam-deque", + "crossbeam-utils", ] [[package]] -name = "raw-window-handle" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" - -[[package]] name = "redox_syscall" -version = "0.4.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", ] [[package]] -name = "redox_syscall" -version = "0.5.1" +name = "regex" +version = "1.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" +checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" dependencies = [ - "bitflags 2.5.0", + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", ] [[package]] -name = "redox_users" -version = "0.4.5" +name = "regex-automata" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" +checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" dependencies = [ - "getrandom 0.2.15", - "libredox", - "thiserror", + "aho-corasick", + "memchr", + "regex-syntax", ] [[package]] -name = "regex" -version = "1.10.4" +name = "regex-lite" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata 0.4.6", - "regex-syntax 0.8.3", -] +checksum = "53a49587ad06b26609c52e423de037e7f57f20d53535d66e08c695f347df952a" [[package]] -name = "regex-automata" -version = "0.1.10" +name = "regex-syntax" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" -dependencies = [ - "regex-syntax 0.6.29", -] +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" [[package]] -name = "regex-automata" -version = "0.4.6" +name = "resize" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" +checksum = "c3e29f584c07a8396c5e2eee0bd8d7aec5c8d9e0a3c2333806fd2ec1d2a5b080" dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax 0.8.3", + "rayon", + "rgb", ] [[package]] -name = "regex-syntax" -version = "0.6.29" +name = "rgb" +version = "0.8.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" +checksum = "a7439be6844e40133eda024efd85bf07f59d0dd2f59b10c00dd6cfb92cc5c741" +dependencies = [ + "bytemuck", +] [[package]] -name = "regex-syntax" -version = "0.8.3" +name = "ril" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" +checksum = "cb9d89f558ed427b172d6014c4cf3145b506d379df0676b471964dbbbe923ea1" +dependencies = [ + "fontdue", + "num-traits", + "png", +] [[package]] name = "rustc-demangle" @@ -3065,28 +2412,14 @@ dependencies = [ [[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 0.48.0", -] - -[[package]] -name = "rustix" version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "errno", "libc", - "linux-raw-sys 0.4.14", + "linux-raw-sys", "windows-sys 0.52.0", ] @@ -3103,54 +2436,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[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 = "scoped-tls" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" - -[[package]] name = "scopeguard" version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] -name = "selectors" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df320f1889ac4ba6bc0cdc9c9af7af4bd64bb927bccdf32d81140dc1f9be12fe" -dependencies = [ - "bitflags 1.3.2", - "cssparser", - "derive_more", - "fxhash", - "log", - "matches", - "phf 0.8.0", - "phf_codegen 0.8.0", - "precomputed-hash", - "servo_arc", - "smallvec", - "thin-slice", -] - -[[package]] name = "semver" version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" -dependencies = [ - "serde", -] [[package]] name = "serde" @@ -3169,101 +2464,50 @@ checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn", ] [[package]] name = "serde_json" -version = "1.0.117" +version = "1.0.118" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" +checksum = "d947f6b3163d8857ea16c4fa0dd4840d52f3041039a85decd46867eb1abef2e4" dependencies = [ - "indexmap 2.2.6", - "itoa 1.0.11", + "itoa", "ryu", "serde", ] [[package]] -name = "serde_repr" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", -] - -[[package]] -name = "serde_spanned" -version = "0.6.6" +name = "serde_plain" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" +checksum = "9ce1fc6db65a611022b23a0dec6975d63fb80a302cb3388835ff02c097258d50" dependencies = [ "serde", ] [[package]] -name = "serde_with" -version = "3.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ad483d2ab0149d5a5ebcd9972a3852711e0153d863bf5a5d0391d28883c4a20" -dependencies = [ - "base64 0.22.1", - "chrono", - "hex", - "indexmap 1.9.3", - "indexmap 2.2.6", - "serde", - "serde_derive", - "serde_json", - "serde_with_macros", - "time", -] - -[[package]] -name = "serde_with_macros" -version = "3.8.1" +name = "serde_repr" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65569b702f41443e8bc8bbb1c5779bd0450bbe723b56198980e80ec45780bce2" +checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ - "darling", "proc-macro2", "quote", - "syn 2.0.66", + "syn", ] [[package]] -name = "serialize-to-javascript" -version = "0.1.1" +name = "serde_urlencoded" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9823f2d3b6a81d98228151fdeaf848206a7855a7a042bbf9bf870449a66cafb" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" dependencies = [ + "form_urlencoded", + "itoa", + "ryu", "serde", - "serde_json", - "serialize-to-javascript-impl", -] - -[[package]] -name = "serialize-to-javascript-impl" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74064874e9f6a15f04c1f3cb627902d0e6b410abbf36668afa873c61889f1763" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "servo_arc" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d98238b800e0d1576d8b6e3de32827c2d74bee68bb97748dcf5071fb53965432" -dependencies = [ - "nodrop", - "stable_deref_trait", ] [[package]] @@ -3289,12 +2533,13 @@ dependencies = [ ] [[package]] -name = "sharded-slab" -version = "0.1.7" +name = "signal-hook" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" +checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801" dependencies = [ - "lazy_static", + "libc", + "signal-hook-registry", ] [[package]] @@ -3313,12 +2558,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" [[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" @@ -3335,55 +2574,22 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "socket2" -version = "0.4.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "soup2" -version = "0.2.1" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2b4d76501d8ba387cf0fefbe055c3e0a59891d09f0f995ae4e4b16f6b60f3c0" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" dependencies = [ - "bitflags 1.3.2", - "gio", - "glib", "libc", - "once_cell", - "soup2-sys", -] - -[[package]] -name = "soup2-sys" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "009ef427103fcb17f802871647a7fa6c60cbb654b4c4e4c0ac60a31c5f6dc9cf" -dependencies = [ - "bitflags 1.3.2", - "gio-sys", - "glib-sys", - "gobject-sys", - "libc", - "system-deps 5.0.0", + "windows-sys 0.52.0", ] [[package]] -name = "stable_deref_trait" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" - -[[package]] -name = "state" -version = "0.5.3" +name = "static-files" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbe866e1e51e8260c9eed836a042a5e7f6726bb2b411dffeaa712e19c388f23b" +checksum = "64712ea1e3e140010e1d9605872ba205afa2ab5bd38191cc6ebd248ae1f6a06b" dependencies = [ - "loom", + "mime_guess", + "path-slash", ] [[package]] @@ -3393,36 +2599,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] -name = "string_cache" -version = "0.8.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b" -dependencies = [ - "new_debug_unreachable", - "once_cell", - "parking_lot", - "phf_shared 0.10.0", - "precomputed-hash", - "serde", -] - -[[package]] -name = "string_cache_codegen" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bb30289b722be4ff74a408c3cc27edeaad656e06cb1fe8fa9231fa59c728988" -dependencies = [ - "phf_generator 0.10.0", - "phf_shared 0.10.0", - "proc-macro2", - "quote", -] - -[[package]] -name = "strsim" -version = "0.10.0" +name = "strict-num" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +checksum = "6637bab7722d379c8b41ba849228d680cc12d0a45ba1fa2b48f2a30577a06731" [[package]] name = "strsim" @@ -3431,373 +2611,66 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] -name = "syn" -version = "1.0.109" +name = "strum" +version = "0.26.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", + "strum_macros", ] [[package]] -name = "syn" -version = "2.0.66" +name = "strum_macros" +version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" +checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" dependencies = [ + "heck", "proc-macro2", "quote", - "unicode-ident", -] - -[[package]] -name = "system-deps" -version = "5.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18db855554db7bd0e73e06cf7ba3df39f97812cb11d3f75e71c39bf45171797e" -dependencies = [ - "cfg-expr 0.9.1", - "heck 0.3.3", - "pkg-config", - "toml 0.5.11", - "version-compare 0.0.11", -] - -[[package]] -name = "system-deps" -version = "6.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349" -dependencies = [ - "cfg-expr 0.15.8", - "heck 0.5.0", - "pkg-config", - "toml 0.8.13", - "version-compare 0.2.0", + "rustversion", + "syn", ] [[package]] -name = "tao" -version = "0.16.9" +name = "subtle" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "575c856fc21e551074869dcfaad8f706412bd5b803dfa0fbf6881c4ff4bfafab" -dependencies = [ - "bitflags 1.3.2", - "cairo-rs", - "cc", - "cocoa", - "core-foundation", - "core-graphics 0.22.3", - "crossbeam-channel", - "dirs-next", - "dispatch", - "gdk", - "gdk-pixbuf", - "gdk-sys", - "gdkwayland-sys", - "gdkx11-sys", - "gio", - "glib", - "glib-sys", - "gtk", - "image 0.24.9", - "instant", - "jni", - "lazy_static", - "libappindicator", - "libc", - "log", - "ndk", - "ndk-context", - "ndk-sys", - "objc", - "once_cell", - "parking_lot", - "png", - "raw-window-handle", - "scopeguard", - "serde", - "tao-macros", - "unicode-segmentation", - "uuid", - "windows 0.39.0", - "windows-implement", - "x11-dl", -] +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] -name = "tao-macros" -version = "0.1.2" +name = "syn" +version = "2.0.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec114582505d158b669b136e6851f85840c109819d77c42bb7c0709f727d18c2" +checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "unicode-ident", ] [[package]] -name = "tar" -version = "0.4.40" +name = "sysinfo" +version = "0.30.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb" +checksum = "732ffa00f53e6b2af46208fba5718d9662a421049204e156328b66791ffa15ae" dependencies = [ - "filetime", + "cfg-if", + "core-foundation-sys", "libc", - "xattr", -] - -[[package]] -name = "target-lexicon" -version = "0.12.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" - -[[package]] -name = "tauri" -version = "1.6.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67c7177b6be45bbb875aa239578f5adc982a1b3d5ea5b315ccd100aeb0043374" -dependencies = [ - "anyhow", - "clap", - "cocoa", - "dirs-next", - "dunce", - "embed_plist", - "encoding_rs", - "flate2", - "futures-util", - "getrandom 0.2.15", - "glib", - "glob", - "gtk", - "heck 0.5.0", - "http 0.2.12", - "ignore", - "objc", + "ntapi", "once_cell", - "open", - "percent-encoding", - "rand 0.8.5", - "raw-window-handle", - "regex", - "semver", - "serde", - "serde_json", - "serde_repr", - "serialize-to-javascript", - "state", - "tar", - "tauri-macros", - "tauri-runtime", - "tauri-runtime-wry", - "tauri-utils", - "tempfile", - "thiserror", - "tokio", - "url", - "uuid", - "webkit2gtk", - "webview2-com", - "windows 0.39.0", + "windows", ] [[package]] -name = "tauri-build" -version = "1.5.2" +name = "systemd-journal-logger" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab30cba12974d0f9b09794f61e72cad6da2142d3ceb81e519321bab86ce53312" +checksum = "b5f3848dd723f2a54ac1d96da793b32923b52de8dfcced8722516dac312a5b2a" dependencies = [ - "anyhow", - "cargo_toml", - "dirs-next", - "heck 0.5.0", - "json-patch", - "semver", - "serde", - "serde_json", - "tauri-utils", - "tauri-winres", - "walkdir", -] - -[[package]] -name = "tauri-codegen" -version = "1.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3a1d90db526a8cdfd54444ad3f34d8d4d58fa5c536463915942393743bd06f8" -dependencies = [ - "base64 0.21.7", - "brotli", - "ico", - "json-patch", - "plist", - "png", - "proc-macro2", - "quote", - "regex", - "semver", - "serde", - "serde_json", - "sha2", - "tauri-utils", - "thiserror", - "time", - "uuid", - "walkdir", -] - -[[package]] -name = "tauri-macros" -version = "1.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a582d75414250122e4a597b9dd7d3c910a2c77906648fc2ac9353845ff0feec" -dependencies = [ - "heck 0.5.0", - "proc-macro2", - "quote", - "syn 1.0.109", - "tauri-codegen", - "tauri-utils", -] - -[[package]] -name = "tauri-plugin-localhost" -version = "0.1.0" -source = "git+https://github.com/tauri-apps/plugins-workspace?rev=5e3900e682e13f3759b439116ae2f77a6d389ca2#5e3900e682e13f3759b439116ae2f77a6d389ca2" -dependencies = [ - "http 1.1.0", - "log", - "serde", - "serde_json", - "tauri", - "thiserror", - "tiny_http", -] - -[[package]] -name = "tauri-plugin-single-instance" -version = "0.0.0" -source = "git+https://github.com/tauri-apps/plugins-workspace?rev=5e3900e682e13f3759b439116ae2f77a6d389ca2#5e3900e682e13f3759b439116ae2f77a6d389ca2" -dependencies = [ - "log", - "serde", - "serde_json", - "tauri", - "thiserror", - "windows-sys 0.52.0", - "zbus", -] - -[[package]] -name = "tauri-plugin-store" -version = "0.0.0" -source = "git+https://github.com/tauri-apps/plugins-workspace?rev=5e3900e682e13f3759b439116ae2f77a6d389ca2#5e3900e682e13f3759b439116ae2f77a6d389ca2" -dependencies = [ - "log", - "serde", - "serde_json", - "tauri", - "thiserror", -] - -[[package]] -name = "tauri-plugin-window-state" -version = "0.1.1" -source = "git+https://github.com/tauri-apps/plugins-workspace?rev=5e3900e682e13f3759b439116ae2f77a6d389ca2#5e3900e682e13f3759b439116ae2f77a6d389ca2" -dependencies = [ - "bincode", - "bitflags 2.5.0", - "log", - "serde", - "serde_json", - "tauri", - "thiserror", -] - -[[package]] -name = "tauri-runtime" -version = "0.14.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd7ffddf36d450791018e63a3ddf54979b9581d9644c584a5fb5611e6b5f20b4" -dependencies = [ - "gtk", - "http 0.2.12", - "http-range", - "rand 0.8.5", - "raw-window-handle", - "serde", - "serde_json", - "tauri-utils", - "thiserror", - "url", - "uuid", - "webview2-com", - "windows 0.39.0", -] - -[[package]] -name = "tauri-runtime-wry" -version = "0.14.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1989b3b4d611f5428b3414a4abae6fa6df30c7eb8ed33250ca90a5f7e5bb3655" -dependencies = [ - "arboard", - "cocoa", - "gtk", - "percent-encoding", - "rand 0.8.5", - "raw-window-handle", - "tauri-runtime", - "tauri-utils", - "uuid", - "webkit2gtk", - "webview2-com", - "windows 0.39.0", - "wry", -] - -[[package]] -name = "tauri-utils" -version = "1.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "450b17a7102e5d46d4bdabae0d1590fd27953e704e691fc081f06c06d2253b35" -dependencies = [ - "brotli", - "ctor", - "dunce", - "glob", - "heck 0.5.0", - "html5ever", - "infer", - "json-patch", - "kuchikiki", "log", - "memchr", - "phf 0.11.2", - "proc-macro2", - "quote", - "semver", - "serde", - "serde_json", - "serde_with", - "thiserror", - "url", - "walkdir", - "windows-version", -] - -[[package]] -name = "tauri-winres" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5993dc129e544393574288923d1ec447c857f3f644187f4fbf7d9a875fbfc4fb" -dependencies = [ - "embed-resource", - "toml 0.7.8", + "rustix", ] [[package]] @@ -3807,44 +2680,33 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" dependencies = [ "cfg-if", - "fastrand 2.1.0", - "rustix 0.38.34", + "fastrand", + "rustix", "windows-sys 0.52.0", ] [[package]] -name = "tendril" -version = "0.4.3" +name = "test-context" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d24a120c5fc464a3458240ee02c299ebcb9d67b5249c8848b09d639dca8d7bb0" +checksum = "6676ab8513edfd2601a108621103fdb45cac9098305ca25ec93f7023b06b05d9" dependencies = [ - "futf", - "mac", - "utf-8", + "futures", + "test-context-macros", ] [[package]] -name = "termcolor" -version = "1.4.1" +name = "test-context-macros" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" +checksum = "78ea17a2dc368aeca6f554343ced1b1e31f76d63683fa8016e5844bd7a5144a1" dependencies = [ - "winapi-util", + "proc-macro2", + "quote", + "syn", ] [[package]] -name = "textwrap" -version = "0.16.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9" - -[[package]] -name = "thin-slice" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eaa81235c7058867fa8c0e7314f33dcce9c215f535d1913822a2b3f5e289f3c" - -[[package]] name = "thiserror" version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3861,7 +2723,7 @@ checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn", ] [[package]] @@ -3892,7 +2754,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ "deranged", - "itoa 1.0.11", + "itoa", "num-conv", "powerfmt", "serde", @@ -3917,22 +2779,36 @@ dependencies = [ ] [[package]] -name = "tiny_http" -version = "0.12.0" +name = "tiny-skia" +version = "0.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "389915df6413a2e74fb181895f933386023c71110878cd0825588928e64cdc82" +checksum = "83d13394d44dae3207b52a326c0c85a8bf87f1541f23b0d143811088497b09ab" dependencies = [ - "ascii", - "chunked_transfer", - "httpdate", + "arrayref", + "arrayvec", + "bytemuck", + "cfg-if", "log", + "png", + "tiny-skia-path", +] + +[[package]] +name = "tiny-skia-path" +version = "0.11.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c9e7fc0c2e86a30b117d0462aa261b72b7a99b7ebd7deb3a14ceda95c5bdc93" +dependencies = [ + "arrayref", + "bytemuck", + "strict-num", ] [[package]] name = "tinyvec" -version = "1.6.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +checksum = "c55115c6fbe2d2bef26eb09ad74bde02d8255476fc0c7b515ef09fbb35742d82" dependencies = [ "tinyvec_macros", ] @@ -3945,47 +2821,63 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.37.0" +version = "1.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" +checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a" dependencies = [ "backtrace", "bytes", + "libc", + "mio", "num_cpus", + "parking_lot", "pin-project-lite", + "signal-hook-registry", + "socket2", + "tokio-macros", + "tracing", + "windows-sys 0.48.0", ] [[package]] -name = "toml" -version = "0.5.11" +name = "tokio-graceful-shutdown" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" +checksum = "0e08074a4a6fe69a4d9ca7548134dcd913f544251d496b758657cf87deb87a2d" dependencies = [ - "serde", + "async-trait", + "atomic", + "bytemuck", + "miette", + "pin-project-lite", + "thiserror", + "tokio", + "tokio-util", + "tracing", ] [[package]] -name = "toml" -version = "0.7.8" +name = "tokio-macros" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" +checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit 0.19.15", + "proc-macro2", + "quote", + "syn", ] [[package]] -name = "toml" -version = "0.8.13" +name = "tokio-util" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4e43f8cc456c9704c851ae29c67e17ef65d2c30017c17a9765b89c382dc8bba" +checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit 0.22.13", + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", ] [[package]] @@ -3993,42 +2885,63 @@ 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.19.15" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" dependencies = [ - "indexmap 2.2.6", - "serde", - "serde_spanned", + "indexmap", "toml_datetime", "winnow 0.5.40", ] [[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 2.2.6", - "serde", - "serde_spanned", + "indexmap", "toml_datetime", - "winnow 0.6.8", + "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", ] [[package]] +name = "tower-layer" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" + +[[package]] +name = "tower-service" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" + +[[package]] name = "tracing" version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ + "log", "pin-project-lite", "tracing-attributes", "tracing-core", @@ -4042,7 +2955,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn", ] [[package]] @@ -4052,51 +2965,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" dependencies = [ "once_cell", - "valuable", ] [[package]] -name = "tracing-log" -version = "0.2.0" +name = "try-lock" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" -dependencies = [ - "log", - "once_cell", - "tracing-core", -] +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] -name = "tracing-subscriber" -version = "0.3.18" +name = "ttf-parser" +version = "0.15.2" 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 = "tree_magic_mini" -version = "3.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ee137597cdb361b55a4746983e4ac1b35ab6024396a419944ad473bb915265" -dependencies = [ - "fnv", - "home", - "memchr", - "nom", - "once_cell", - "petgraph", -] +checksum = "7b3e06c9b9d80ed6b745c7159c40b311ad2916abb34a49e9be2653b90db0d8dd" [[package]] name = "typenum" @@ -4110,12 +2991,21 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9" dependencies = [ - "memoffset 0.9.1", + "memoffset", "tempfile", "winapi", ] [[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-bidi" version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4137,55 +3027,58 @@ dependencies = [ ] [[package]] -name = "unicode-segmentation" -version = "1.11.0" +name = "unicode-width" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" + +[[package]] +name = "unicode-xid" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" + +[[package]] +name = "universal-hash" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" +checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea" +dependencies = [ + "crypto-common", + "subtle", +] [[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", "percent-encoding", - "serde", ] [[package]] -name = "utf-8" -version = "0.7.6" +name = "utf8parse" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uuid" -version = "1.8.0" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" +checksum = "5de17fd2f7da591098415cff336e12965a28061ddace43b59cb3c430179c9439" dependencies = [ - "getrandom 0.2.15", + "getrandom", ] [[package]] -name = "valuable" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" - -[[package]] -name = "version-compare" -version = "0.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c18c859eead79d8b95d09e4678566e8d70105c4e7b251f707a03df32442661b" - -[[package]] -name = "version-compare" -version = "0.2.0" +name = "value-bag" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b" +checksum = "5a84c137d37ab0142f0f2ddfe332651fdbf252e7b7dbb4e67b6c1f1b2e925101" [[package]] name = "version_check" @@ -4194,49 +3087,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] -name = "vswhom" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be979b7f07507105799e854203b470ff7c78a1639e330a58f183b5fea574608b" -dependencies = [ - "libc", - "vswhom-sys", -] - -[[package]] -name = "vswhom-sys" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3b17ae1f6c8a2b28506cd96d412eebf83b4a0ff2cbefeeb952f2f9dfa44ba18" -dependencies = [ - "cc", - "libc", -] - -[[package]] -name = "waker-fn" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "317211a0dc0ceedd78fb2ca9a44aed3d7b9b26f81870d485c07122b4350673b7" - -[[package]] -name = "walkdir" -version = "2.5.0" +name = "want" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" dependencies = [ - "same-file", - "winapi-util", + "try-lock", ] [[package]] name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" - -[[package]] -name = "wasi" version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" @@ -4262,7 +3122,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.66", + "syn", "wasm-bindgen-shared", ] @@ -4284,7 +3144,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -4296,164 +3156,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] -name = "wayland-backend" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d50fa61ce90d76474c87f5fc002828d81b32677340112b4ef08079a9d459a40" -dependencies = [ - "cc", - "downcast-rs", - "rustix 0.38.34", - "scoped-tls", - "smallvec", - "wayland-sys", -] - -[[package]] -name = "wayland-client" -version = "0.31.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82fb96ee935c2cea6668ccb470fb7771f6215d1691746c2d896b447a00ad3f1f" -dependencies = [ - "bitflags 2.5.0", - "rustix 0.38.34", - "wayland-backend", - "wayland-scanner", -] - -[[package]] -name = "wayland-protocols" -version = "0.31.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f81f365b8b4a97f422ac0e8737c438024b5951734506b0e1d775c73030561f4" -dependencies = [ - "bitflags 2.5.0", - "wayland-backend", - "wayland-client", - "wayland-scanner", -] - -[[package]] -name = "wayland-protocols-wlr" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6" -dependencies = [ - "bitflags 2.5.0", - "wayland-backend", - "wayland-client", - "wayland-protocols", - "wayland-scanner", -] - -[[package]] -name = "wayland-scanner" -version = "0.31.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63b3a62929287001986fb58c789dce9b67604a397c15c611ad9f747300b6c283" -dependencies = [ - "proc-macro2", - "quick-xml", - "quote", -] - -[[package]] -name = "wayland-sys" -version = "0.31.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15a0c8eaff5216d07f226cb7a549159267f3467b289d9a2e52fd3ef5aae2b7af" -dependencies = [ - "dlib", - "log", - "pkg-config", -] - -[[package]] -name = "webkit2gtk" -version = "0.18.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8f859735e4a452aeb28c6c56a852967a8a76c8eb1cc32dbf931ad28a13d6370" -dependencies = [ - "bitflags 1.3.2", - "cairo-rs", - "gdk", - "gdk-sys", - "gio", - "gio-sys", - "glib", - "glib-sys", - "gobject-sys", - "gtk", - "gtk-sys", - "javascriptcore-rs", - "libc", - "once_cell", - "soup2", - "webkit2gtk-sys", -] - -[[package]] -name = "webkit2gtk-sys" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d76ca6ecc47aeba01ec61e480139dda143796abcae6f83bcddf50d6b5b1dcf3" -dependencies = [ - "atk-sys", - "bitflags 1.3.2", - "cairo-sys-rs", - "gdk-pixbuf-sys", - "gdk-sys", - "gio-sys", - "glib-sys", - "gobject-sys", - "gtk-sys", - "javascriptcore-rs-sys", - "libc", - "pango-sys", - "pkg-config", - "soup2-sys", - "system-deps 6.2.2", -] - -[[package]] -name = "webview2-com" -version = "0.19.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4a769c9f1a64a8734bde70caafac2b96cada12cd4aefa49196b3a386b8b4178" -dependencies = [ - "webview2-com-macros", - "webview2-com-sys", - "windows 0.39.0", - "windows-implement", -] - -[[package]] -name = "webview2-com-macros" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaebe196c01691db62e9e4ca52c5ef1e4fd837dcae27dae3ada599b5a8fd05ac" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "webview2-com-sys" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aac48ef20ddf657755fdcda8dfed2a7b4fc7e4581acce6fe9b88c3d64f29dee7" -dependencies = [ - "regex", - "serde", - "serde_json", - "thiserror", - "windows 0.39.0", - "windows-bindgen", - "windows-metadata", -] - -[[package]] name = "weezl" version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4476,15 +3178,6 @@ 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" @@ -4492,35 +3185,12 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1c4bd0a50ac6020f65184721f758dba47bb9fbc2133df715ec74a237b26794a" -dependencies = [ - "windows-implement", - "windows_aarch64_msvc 0.39.0", - "windows_i686_gnu 0.39.0", - "windows_i686_msvc 0.39.0", - "windows_x86_64_gnu 0.39.0", - "windows_x86_64_msvc 0.39.0", -] - -[[package]] -name = "windows" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" -dependencies = [ - "windows-targets 0.48.5", -] - -[[package]] -name = "windows-bindgen" -version = "0.39.0" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68003dbd0e38abc0fb85b939240f4bce37c43a5981d3df37ccbaaa981b47cb41" +checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" dependencies = [ - "windows-metadata", - "windows-tokens", + "windows-core", + "windows-targets 0.52.5", ] [[package]] @@ -4533,37 +3203,6 @@ dependencies = [ ] [[package]] -name = "windows-implement" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba01f98f509cb5dc05f4e5fc95e535f78260f15fea8fe1a8abdd08f774f1cee7" -dependencies = [ - "syn 1.0.109", - "windows-tokens", -] - -[[package]] -name = "windows-metadata" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ee5e275231f07c6e240d14f34e1b635bf1faa1c76c57cfd59a5cdb9848e4278" - -[[package]] -name = "windows-sys" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" -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-sys" version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4613,27 +3252,6 @@ dependencies = [ ] [[package]] -name = "windows-tokens" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f838de2fe15fe6bac988e74b798f26499a8b21a9d97edec321e79b28d1d7f597" - -[[package]] -name = "windows-version" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6998aa457c9ba8ff2fb9f13e9d2a930dabcea28f1d0ab94d687d8b3654844515" -dependencies = [ - "windows-targets 0.52.5", -] - -[[package]] -name = "windows_aarch64_gnullvm" -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" @@ -4647,18 +3265,6 @@ checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" [[package]] name = "windows_aarch64_msvc" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec7711666096bd4096ffa835238905bb33fb87267910e154b18b44eaabb340f2" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" - -[[package]] -name = "windows_aarch64_msvc" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" @@ -4671,18 +3277,6 @@ checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" [[package]] name = "windows_i686_gnu" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "763fc57100a5f7042e3057e7e8d9bdd7860d330070251a73d003563a3bb49e1b" - -[[package]] -name = "windows_i686_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" - -[[package]] -name = "windows_i686_gnu" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" @@ -4701,18 +3295,6 @@ checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" [[package]] name = "windows_i686_msvc" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bc7cbfe58828921e10a9f446fcaaf649204dcfe6c1ddd712c5eebae6bda1106" - -[[package]] -name = "windows_i686_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" - -[[package]] -name = "windows_i686_msvc" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" @@ -4725,18 +3307,6 @@ checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" [[package]] name = "windows_x86_64_gnu" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6868c165637d653ae1e8dc4d82c25d4f97dd6605eaa8d784b5c6e0ab2a252b65" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" - -[[package]] -name = "windows_x86_64_gnu" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" @@ -4749,12 +3319,6 @@ checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" [[package]] name = "windows_x86_64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" - -[[package]] -name = "windows_x86_64_gnullvm" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" @@ -4767,18 +3331,6 @@ checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" [[package]] name = "windows_x86_64_msvc" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e4d40883ae9cae962787ca76ba76390ffa29214667a111db9e0a1ad8377e809" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" - -[[package]] -name = "windows_x86_64_msvc" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" @@ -4800,175 +3352,71 @@ 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", ] [[package]] -name = "winreg" -version = "0.52.0" +name = "wrapcenum-derive" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" +checksum = "a76ff259533532054cfbaefb115c613203c73707017459206380f03b3b3f266e" dependencies = [ - "cfg-if", - "windows-sys 0.48.0", + "darling", + "proc-macro2", + "quote", + "syn", ] [[package]] -name = "wl-clipboard-rs" -version = "0.8.1" +name = "xdg-home" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12b41773911497b18ca8553c3daaf8ec9fe9819caf93d451d3055f69de028adb" +checksum = "ca91dcf8f93db085f3a0a29358cd0b9d670915468f4290e8b85d118a34211ab8" dependencies = [ - "derive-new", "libc", - "log", - "nix 0.28.0", - "os_pipe", - "tempfile", - "thiserror", - "tree_magic_mini", - "wayland-backend", - "wayland-client", - "wayland-protocols", - "wayland-protocols-wlr", + "windows-sys 0.52.0", ] [[package]] -name = "wry" -version = "0.24.10" +name = "yata" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00711278ed357350d44c749c286786ecac644e044e4da410d466212152383b45" +checksum = "6b4ef8ddfa3ccd93454262c0e60a43a2bbf403d404174e1815f7581d5028229f" dependencies = [ - "base64 0.13.1", - "block", - "cocoa", - "core-graphics 0.22.3", - "crossbeam-channel", - "dunce", - "gdk", - "gio", - "glib", - "gtk", - "html5ever", - "http 0.2.12", - "kuchikiki", - "libc", - "log", - "objc", - "objc_id", - "once_cell", "serde", - "serde_json", - "sha2", - "soup2", - "tao", - "thiserror", - "url", - "webkit2gtk", - "webkit2gtk-sys", - "webview2-com", - "windows 0.39.0", - "windows-implement", -] - -[[package]] -name = "x11" -version = "2.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "502da5464ccd04011667b11c435cb992822c2c0dbde1770c988480d312a0db2e" -dependencies = [ - "libc", - "pkg-config", -] - -[[package]] -name = "x11-dl" -version = "2.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38735924fedd5314a6e548792904ed8c6de6636285cb9fec04d5b1db85c1516f" -dependencies = [ - "libc", - "once_cell", - "pkg-config", -] - -[[package]] -name = "x11rb" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d91ffca73ee7f68ce055750bf9f6eca0780b8c85eff9bc046a3b0da41755e12" -dependencies = [ - "gethostname", - "rustix 0.38.34", - "x11rb-protocol", -] - -[[package]] -name = "x11rb-protocol" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec107c4503ea0b4a98ef47356329af139c0a4f7750e621cf2973cd3385ebcb3d" - -[[package]] -name = "xattr" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" -dependencies = [ - "libc", - "linux-raw-sys 0.4.14", - "rustix 0.38.34", -] - -[[package]] -name = "xdg-home" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21e5a325c3cb8398ad6cf859c1135b25dd29e186679cf2da7581d9679f63b38e" -dependencies = [ - "libc", - "winapi", ] [[package]] name = "zbus" -version = "3.15.2" +version = "4.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "675d170b632a6ad49804c8cf2105d7c31eddd3312555cffd4b740e08e97c25e6" +checksum = "23915fcb26e7a9a9dc05fd93a9870d336d6d032cd7e8cebf1c5c37666489fdd5" dependencies = [ "async-broadcast", - "async-executor", - "async-fs", - "async-io 1.13.0", - "async-lock 2.8.0", "async-process", "async-recursion", - "async-task", "async-trait", - "blocking", - "byteorder", - "derivative", "enumflags2", - "event-listener 2.5.3", + "event-listener", "futures-core", "futures-sink", "futures-util", "hex", - "nix 0.26.4", - "once_cell", + "nix 0.28.0", "ordered-stream", - "rand 0.8.5", + "rand", "serde", "serde_repr", "sha1", "static_assertions", + "tokio", "tracing", "uds_windows", - "winapi", + "windows-sys 0.52.0", "xdg-home", "zbus_macros", "zbus_names", @@ -4977,23 +3425,22 @@ dependencies = [ [[package]] name = "zbus_macros" -version = "3.15.2" +version = "4.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7131497b0f887e8061b430c530240063d33bf9455fa34438f388a245da69e0a5" +checksum = "02bcca0b586d2f8589da32347b4784ba424c4891ed86aa5b50d5e88f6b2c4f5d" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "regex", - "syn 1.0.109", + "syn", "zvariant_utils", ] [[package]] name = "zbus_names" -version = "2.6.1" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "437d738d3750bed6ca9b8d423ccc7a8eb284f6b1d6d4e225a0e4e6258d864c8d" +checksum = "4b9b1fef7d021261cc16cba64c351d291b715febe0fa10dc3a443ac5a5022e6c" dependencies = [ "serde", "static_assertions", @@ -5001,14 +3448,76 @@ dependencies = [ ] [[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", +] + +[[package]] +name = "zstd" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d789b1514203a1120ad2429eae43a7bd32b90976a7bb8a05f7ec02fa88cc23a" +dependencies = [ + "zstd-safe", +] + +[[package]] +name = "zstd-safe" +version = "7.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cd99b45c6bc03a018c8b8a86025678c87e55526064e38f9df301989dce7ec0a" +dependencies = [ + "zstd-sys", +] + +[[package]] +name = "zstd-sys" +version = "2.0.11+zstd.1.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75652c55c0b6f3e6f12eb786fe1bc960396bf05a1eb3bf1f3691c3610ac2e6d4" +dependencies = [ + "cc", + "pkg-config", +] + +[[package]] +name = "zune-core" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f423a2c17029964870cfaabb1f13dfab7d092a62a29a89264f4d36990ca414a" + +[[package]] +name = "zune-jpeg" +version = "0.4.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec866b44a2a1fd6133d363f073ca1b179f438f99e7e5bfb1e33f7181facfe448" +dependencies = [ + "zune-core", +] + +[[package]] name = "zvariant" -version = "3.15.2" +version = "4.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eef2be88ba09b358d3b58aca6e41cd853631d44787f319a1383ca83424fb2db" +checksum = "9aa6d31a02fbfb602bfde791de7fedeb9c2c18115b3d00f3a36e489f46ffbbc7" dependencies = [ - "byteorder", + "endi", "enumflags2", - "libc", "serde", "static_assertions", "zvariant_derive", @@ -5016,24 +3525,24 @@ dependencies = [ [[package]] name = "zvariant_derive" -version = "3.15.2" +version = "4.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37c24dc0bed72f5f90d1f8bb5b07228cbf63b3c6e9f82d82559d4bae666e7ed9" +checksum = "642bf1b6b6d527988b3e8193d20969d53700a36eac734d21ae6639db168701c8" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 1.0.109", + "syn", "zvariant_utils", ] [[package]] name = "zvariant_utils" -version = "1.0.1" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7234f0d811589db492d16893e3f21e8e2fd282e6d01b0cddee310322062cc200" +checksum = "fc242db087efc22bd9ade7aa7809e4ba828132edc312871584a6b4391bdf8786" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn", ] diff --git a/pkgs/applications/system/coolercontrol/coolercontrol-gui.nix b/pkgs/applications/system/coolercontrol/coolercontrol-gui.nix index fd916da9bbfe3..cb3e0c22835ee 100644 --- a/pkgs/applications/system/coolercontrol/coolercontrol-gui.nix +++ b/pkgs/applications/system/coolercontrol/coolercontrol-gui.nix @@ -1,13 +1,12 @@ { lib -, buildNpmPackage , rustPlatform , dbus , freetype , gtk3 -, libsoup +, libsoup_3 , openssl , pkg-config -, webkitgtk +, webkitgtk_4_1 , libappindicator , makeWrapper , coolercontrol @@ -23,12 +22,7 @@ rustPlatform.buildRustPackage { inherit version src; sourceRoot = "${src.name}/coolercontrol-ui/src-tauri"; - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "tauri-plugin-localhost-0.1.0" = "sha256-Mf2/cnKotd751ZcSHfiSLNe2nxBfo4dMBdoCwQhe7yI="; - }; - }; + cargoHash = "sha256-0Ud5S4T5+5eBuvD5N64NAvbK0+tTozKsPhsNziCEu3I="; buildFeatures = [ "custom-protocol" ]; @@ -41,9 +35,9 @@ rustPlatform.buildRustPackage { dbus openssl freetype - libsoup + libsoup_3 gtk3 - webkitgtk + webkitgtk_4_1 libappindicator ]; @@ -54,7 +48,7 @@ rustPlatform.buildRustPackage { postPatch = '' mkdir -p ui-build cp -R ${coolercontrol.coolercontrol-ui-data}/* ui-build/ - substituteInPlace tauri.conf.json --replace '"distDir": "../dist"' '"distDir": "ui-build"' + substituteInPlace tauri.conf.json --replace '"frontendDist": "../dist"' '"frontendDist": "ui-build"' ''; postInstall = '' diff --git a/pkgs/applications/system/coolercontrol/coolercontrol-ui-data.nix b/pkgs/applications/system/coolercontrol/coolercontrol-ui-data.nix index da3e75a906c5b..f6c6090d0c57f 100644 --- a/pkgs/applications/system/coolercontrol/coolercontrol-ui-data.nix +++ b/pkgs/applications/system/coolercontrol/coolercontrol-ui-data.nix @@ -11,7 +11,7 @@ buildNpmPackage { inherit version src; sourceRoot = "${src.name}/coolercontrol-ui"; - npmDepsHash = "sha256-gnJvNQCbqFfPfsqi008HW4kBTpxiVpN7eHyn9bU6if8="; + npmDepsHash = "sha256-PpX9lk+yEG1auvBv5JBdMh7rjWoM0oTYJx6Nme5ij8s="; postBuild = '' cp -r dist $out diff --git a/pkgs/applications/system/coolercontrol/coolercontrold.nix b/pkgs/applications/system/coolercontrol/coolercontrold.nix index d1077a6e965e5..16e55a8c21f2e 100644 --- a/pkgs/applications/system/coolercontrol/coolercontrold.nix +++ b/pkgs/applications/system/coolercontrol/coolercontrold.nix @@ -1,6 +1,6 @@ { rustPlatform -, buildNpmPackage , testers +, libdrm , coolercontrol , runtimeShell }: @@ -15,7 +15,16 @@ rustPlatform.buildRustPackage { inherit version src; sourceRoot = "${src.name}/coolercontrold"; - cargoHash = "sha256-CuA8r54O33csmSY67/AOlQQqUniAWkgWSewIBdeq7X4="; + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "nvml-wrapper-0.10.0" = "sha256-pMiULWT+nJXcDfLDeACG/DaPF5+AbzpoIUWWWz8mQ+0="; + }; + }; + + buildInputs = [ + libdrm + ]; postPatch = '' # copy the frontend static resources to a directory for embedding diff --git a/pkgs/applications/system/coolercontrol/default.nix b/pkgs/applications/system/coolercontrol/default.nix index 0922ecd5d9b34..31feaa5a40dc8 100644 --- a/pkgs/applications/system/coolercontrol/default.nix +++ b/pkgs/applications/system/coolercontrol/default.nix @@ -4,13 +4,13 @@ }: let - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitLab { owner = "coolercontrol"; repo = "coolercontrol"; rev = version; - hash = "sha256-0NYDPJNX0kWIBHv+b4GuK6efgHCBNDu3rBXaQ/iSxFk="; + hash = "sha256-jsgso9MHt5Szzp9YkuXz8qysdN0li/zD2R/vSZ2Lw5M="; }; meta = with lib; { diff --git a/pkgs/applications/system/glances/default.nix b/pkgs/applications/system/glances/default.nix index 3e387f34a7341..ff8b4c3106629 100644 --- a/pkgs/applications/system/glances/default.nix +++ b/pkgs/applications/system/glances/default.nix @@ -26,29 +26,28 @@ buildPythonApplication rec { pname = "glances"; - # use unstable to fix a build error for aarch64. - version = "4.0.8-unstable-2024-06-09"; + version = "4.1.2.1"; disabled = isPyPy; src = fetchFromGitHub { owner = "nicolargo"; repo = "glances"; - rev = "051006e12f7c90281dda4af60871b535b0dcdcb9"; - hash = "sha256-iCK5soTACQwtCVMmMsFaqXvZtTKX9WbTul0mUeSWC2M="; + rev = "refs/tags/v${version}"; + hash = "sha256-SlKt+wjzI9QRmMVvbIERuhQuCCaOh7L89WuNUXNhkuI="; }; # On Darwin this package segfaults due to mismatch of pure and impure # CoreFoundation. This issues was solved for binaries but for interpreted # scripts a workaround below is still required. # Relevant: https://github.com/NixOS/nixpkgs/issues/24693 - makeWrapperArgs = lib.optionals stdenv.isDarwin [ + makeWrapperArgs = lib.optionals stdenv.hostPlatform.isDarwin [ "--set" "DYLD_FRAMEWORK_PATH" "/System/Library/Frameworks" ]; doCheck = true; - preCheck = lib.optionalString stdenv.isDarwin '' + preCheck = lib.optionalString stdenv.hostPlatform.isDarwin '' export DYLD_FRAMEWORK_PATH=/System/Library/Frameworks ''; @@ -69,7 +68,7 @@ buildPythonApplication rec { jinja2 orjson prometheus-client - ] ++ lib.optional stdenv.isLinux hddtemp; + ] ++ lib.optional stdenv.hostPlatform.isLinux hddtemp; meta = { homepage = "https://nicolargo.github.io/glances/"; diff --git a/pkgs/applications/system/monitor/default.nix b/pkgs/applications/system/monitor/default.nix index fdf353646717e..fada61d6b6a41 100644 --- a/pkgs/applications/system/monitor/default.nix +++ b/pkgs/applications/system/monitor/default.nix @@ -28,13 +28,13 @@ stdenv.mkDerivation rec { pname = "monitor"; - version = "0.17.1"; + version = "0.17.2"; src = fetchFromGitHub { owner = "stsdc"; repo = "monitor"; rev = version; - sha256 = "sha256-Eo0nwATKrx6SmTsaXe3oFIkp0BUTmjcjIc3Vjt+Cr20="; + hash = "sha256-Kk3L4hfHon0B6Y6vU7en1UFpg221+EiVCxMX9mvu7pU="; fetchSubmodules = true; }; diff --git a/pkgs/applications/system/qjournalctl/default.nix b/pkgs/applications/system/qjournalctl/default.nix index d3bec7e306d58..fc80c3f69df81 100644 --- a/pkgs/applications/system/qjournalctl/default.nix +++ b/pkgs/applications/system/qjournalctl/default.nix @@ -40,6 +40,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/pentix/qjournalctl"; license = licenses.gpl3Only; platforms = platforms.all; - maintainers = with maintainers; [ dtzWill srgom romildo ]; + maintainers = with maintainers; [ romildo ]; }; } diff --git a/pkgs/applications/system/thumbdrives/default.nix b/pkgs/applications/system/thumbdrives/default.nix deleted file mode 100644 index 89711e996831f..0000000000000 --- a/pkgs/applications/system/thumbdrives/default.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ lib -, python3 -, fetchFromSourcehut -, gtk3 -, libhandy_0 -, gobject-introspection -, meson -, pkg-config -, ninja -, gettext -, glib -, desktop-file-utils -, wrapGAppsHook3 -}: - -python3.pkgs.buildPythonApplication rec { - pname = "thumbdrives"; - version = "0.3.1"; - - format = "other"; - - src = fetchFromSourcehut { - owner = "~martijnbraam"; - repo = pname; - rev = version; - sha256 = "sha256-CPZKswbvsG61A6J512FOCKAntoJ0sUb2s+MKb0rO+Xw="; - }; - - postPatch = '' - patchShebangs build-aux/meson - ''; - - nativeBuildInputs = [ - meson - pkg-config - ninja - gettext - glib - gtk3 - desktop-file-utils - wrapGAppsHook3 - gobject-introspection - ]; - - buildInputs = [ - gtk3 - libhandy_0 - ]; - - propagatedBuildInputs = with python3.pkgs; [ - pygobject3 - pyxdg - ]; - - meta = with lib; { - description = "USB mass storage emulator for Linux handhelds"; - homepage = "https://sr.ht/~martijnbraam/thumbdrives/"; - license = licenses.mit; - maintainers = with maintainers; [ chuangzhu ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/terminal-emulators/alacritty/default.nix b/pkgs/applications/terminal-emulators/alacritty/default.nix index 58e527cc50a98..33691aaef4911 100644 --- a/pkgs/applications/terminal-emulators/alacritty/default.nix +++ b/pkgs/applications/terminal-emulators/alacritty/default.nix @@ -35,7 +35,7 @@ let expat fontconfig freetype - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libGL xorg.libX11 xorg.libXcursor @@ -71,7 +71,7 @@ rustPlatform.buildRustPackage rec { ]; buildInputs = rpathLibs - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit CoreGraphics CoreServices @@ -83,7 +83,7 @@ rustPlatform.buildRustPackage rec { outputs = [ "out" "terminfo" ]; - postPatch = lib.optionalString stdenv.isLinux '' + postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace alacritty/src/config/ui_config.rs \ --replace xdg-open ${xdg-utils}/bin/xdg-open ''; @@ -91,7 +91,7 @@ rustPlatform.buildRustPackage rec { checkFlags = [ "--skip=term::test::mock_term" ]; # broken on aarch64 postInstall = ( - if stdenv.isDarwin then '' + if stdenv.hostPlatform.isDarwin then '' mkdir $out/Applications cp -r extra/osx/Alacritty.app $out/Applications ln -s $out/bin $out/Applications/Alacritty.app/Contents/MacOS diff --git a/pkgs/applications/terminal-emulators/contour/default.nix b/pkgs/applications/terminal-emulators/contour/default.nix index a255b2fb99db8..f01c47afdd36d 100644 --- a/pkgs/applications/terminal-emulators/contour/default.nix +++ b/pkgs/applications/terminal-emulators/contour/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation (final: { file wrapQtAppsHook installShellFiles - ] ++ lib.optionals stdenv.isDarwin [ sigtool ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ sigtool ]; buildInputs = [ boxed-cpp @@ -67,21 +67,21 @@ stdenv.mkDerivation (final: { range-v3 yaml-cpp ] - ++ lib.optionals stdenv.isLinux [ libutempter ] - ++ lib.optionals stdenv.isDarwin [ utmp ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ libutempter ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ utmp ]; cmakeFlags = [ "-DCONTOUR_QT_VERSION=6" ]; postInstall = '' mkdir -p $out/nix-support $terminfo/share - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir $out/Applications installShellCompletion --zsh $out/contour.app/Contents/Resources/shell-integration/shell-integration.zsh installShellCompletion --fish $out/contour.app/Contents/Resources/shell-integration/shell-integration.fish cp -r $out/contour.app/Contents/Resources/terminfo $terminfo/share mv $out/contour.app $out/Applications ln -s $out/bin $out/Applications/contour.app/Contents/MacOS - '' + lib.optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.hostPlatform.isLinux '' mv $out/share/terminfo $terminfo/share/ installShellCompletion --zsh $out/share/contour/shell-integration/shell-integration.zsh installShellCompletion --fish $out/share/contour/shell-integration/shell-integration.fish diff --git a/pkgs/applications/terminal-emulators/cool-retro-term/default.nix b/pkgs/applications/terminal-emulators/cool-retro-term/default.nix index 6630cbaa1258f..c2a8710858318 100644 --- a/pkgs/applications/terminal-emulators/cool-retro-term/default.nix +++ b/pkgs/applications/terminal-emulators/cool-retro-term/default.nix @@ -40,7 +40,7 @@ mkDerivation rec { mv $out/usr/share $out/share mv $out/usr/bin $out/bin rmdir $out/usr - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' ln -s $out/bin/cool-retro-term.app/Contents/MacOS/cool-retro-term $out/bin/cool-retro-term ''; @@ -56,7 +56,7 @@ mkDerivation rec { homepage = "https://github.com/Swordfish90/cool-retro-term"; license = lib.licenses.gpl3Plus; platforms = with lib.platforms; linux ++ darwin; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; mainProgram = "cool-retro-term"; }; } diff --git a/pkgs/applications/terminal-emulators/darktile/default.nix b/pkgs/applications/terminal-emulators/darktile/default.nix index 4336c565afa1b..9bd7e16d74b78 100644 --- a/pkgs/applications/terminal-emulators/darktile/default.nix +++ b/pkgs/applications/terminal-emulators/darktile/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, fetchFromGitHub +{ fetchFromGitHub , lib , pkg-config , libX11 diff --git a/pkgs/applications/terminal-emulators/foot/default.nix b/pkgs/applications/terminal-emulators/foot/default.nix index 0af07518001a3..e7eb39e8a756b 100644 --- a/pkgs/applications/terminal-emulators/foot/default.nix +++ b/pkgs/applications/terminal-emulators/foot/default.nix @@ -26,7 +26,7 @@ }: let - version = "1.17.2"; + version = "1.18.1"; # build stimuli file for PGO build and the script to generate it # independently of the foot's build, so we can cache the result @@ -98,7 +98,7 @@ stdenv.mkDerivation { owner = "dnkl"; repo = "foot"; rev = version; - hash = "sha256-p+qaWHBrUn6YpNyAmQf6XoQyO3degHP5oMN53/9gIr4="; + hash = "sha256:15s7fbkibvq53flf5yy9ad37y53pl83rcnjwlnfh96a4s5mj6v5d"; }; separateDebugInfo = true; @@ -156,6 +156,8 @@ stdenv.mkDerivation { "-Dcustom-terminfo-install-location=${terminfoDir}" # Install systemd user units for foot-server "-Dsystemd-units-dir=${placeholder "out"}/lib/systemd/user" + # Especially -Wunused-command-line-argument is a problem with clang + "-Dwerror=false" ]; # build and run binary generating PGO profiles, diff --git a/pkgs/applications/terminal-emulators/guake/default.nix b/pkgs/applications/terminal-emulators/guake/default.nix index 239d9a2fe0486..44131d3c87b5b 100644 --- a/pkgs/applications/terminal-emulators/guake/default.nix +++ b/pkgs/applications/terminal-emulators/guake/default.nix @@ -1,7 +1,8 @@ { lib , fetchFromGitHub , fetchpatch -, python3 +, python311 +, python311Packages , glibcLocales , gobject-introspection , wrapGAppsHook3 @@ -15,7 +16,7 @@ , nixosTests }: -python3.pkgs.buildPythonApplication rec { +python311Packages.buildPythonApplication rec { pname = "guake"; version = "3.10"; @@ -55,7 +56,7 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = [ gobject-introspection wrapGAppsHook3 - python3.pkgs.pip + python311Packages.pip ]; buildInputs = [ @@ -64,13 +65,13 @@ python3.pkgs.buildPythonApplication rec { keybinder3 libnotify libwnck - python3 + python311 vte ]; makeWrapperArgs = [ "--set LOCALE_ARCHIVE ${glibcLocales}/lib/locale/locale-archive" ]; - propagatedBuildInputs = with python3.pkgs; [ + propagatedBuildInputs = with python311Packages; [ dbus-python pycairo pygobject3 @@ -96,7 +97,7 @@ python3.pkgs.buildPythonApplication rec { description = "Drop-down terminal for GNOME"; homepage = "http://guake-project.org"; license = licenses.gpl2Plus; - maintainers = [ maintainers.msteen ]; + maintainers = [ maintainers.msteen maintainers.heywoodlh ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/terminal-emulators/hyper/default.nix b/pkgs/applications/terminal-emulators/hyper/default.nix index 8fcbbe0666ef4..4db56792b7337 100644 --- a/pkgs/applications/terminal-emulators/hyper/default.nix +++ b/pkgs/applications/terminal-emulators/hyper/default.nix @@ -54,5 +54,6 @@ stdenv.mkDerivation rec { license = licenses.mit; platforms = [ "x86_64-linux" ]; mainProgram = "hyper"; + broken = true; # Error: 'node-pty' failed to load }; } diff --git a/pkgs/applications/terminal-emulators/iterm2/default.nix b/pkgs/applications/terminal-emulators/iterm2/default.nix index 96e387e49123b..1ce3fbf94c3b2 100644 --- a/pkgs/applications/terminal-emulators/iterm2/default.nix +++ b/pkgs/applications/terminal-emulators/iterm2/default.nix @@ -11,11 +11,11 @@ stdenvNoCC.mkDerivation rec { pname = "iterm2"; - version = "3.5.2"; + version = "3.5.4"; src = fetchzip { url = "https://iterm2.com/downloads/stable/iTerm2-${lib.replaceStrings ["."] ["_"] version}.zip"; - hash = "sha256-WiRRxklI3A/3MtJY63jAkUVe8qa5jfRACzUESfwAmmw="; + hash = "sha256-Sxj8OnaXh+UdAAf2hoHBQ8TuczYykhV37XvalNpwq7U="; }; dontFixup = true; diff --git a/pkgs/applications/terminal-emulators/kitty/default.nix b/pkgs/applications/terminal-emulators/kitty/default.nix index a52a1362ddc91..0459fd9c01696 100644 --- a/pkgs/applications/terminal-emulators/kitty/default.nix +++ b/pkgs/applications/terminal-emulators/kitty/default.nix @@ -2,6 +2,7 @@ , harfbuzz, fontconfig, pkg-config, ncurses, imagemagick , libstartup_notification, libGL, libX11, libXrandr, libXinerama, libXcursor , libxkbcommon, libXi, libXext, wayland-protocols, wayland, xxHash +, nerdfonts , lcms2 , librsync , openssl @@ -15,6 +16,7 @@ , UserNotifications , libcanberra , libicns +, wayland-scanner , libpng , python3 , zlib @@ -23,28 +25,28 @@ , zsh , fish , nixosTests -, go_1_22 -, buildGo122Module +, go_1_23 +, buildGo123Module , nix-update-script }: with python3Packages; buildPythonApplication rec { pname = "kitty"; - version = "0.35.2"; + version = "0.36.4"; format = "other"; src = fetchFromGitHub { owner = "kovidgoyal"; repo = "kitty"; rev = "refs/tags/v${version}"; - hash = "sha256-5ZkQfGlW7MWYCJZSwK/u8x9jKrZEqupsNvW30DLipDM="; + hash = "sha256-nN0y2VKK5UNaozpHQNPN7AYkto9z6rJNpYRJhvLPtVQ="; }; - goModules = (buildGo122Module { + goModules = (buildGo123Module { pname = "kitty-go-modules"; inherit src version; - vendorHash = "sha256-NzDA9b3RAfMx+Jj7cSF8pEsKUkoBECBUXl2QFSmkmwM="; + vendorHash = "sha256-8hsQH7OdsxeVG6pomuxdmTXNmQYBROoUUxoC10LeLFo="; }).goModules; buildInputs = [ @@ -55,7 +57,7 @@ buildPythonApplication rec { librsync openssl.dev xxHash - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa Kernel UniformTypeIdentifiers @@ -63,9 +65,9 @@ buildPythonApplication rec { libpng python3 zlib - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ Libsystem - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ fontconfig libunistring libcanberra libX11 libXrandr libXinerama libXcursor libxkbcommon libXi libXext wayland-protocols wayland dbus libGL @@ -80,12 +82,17 @@ buildPythonApplication rec { sphinx-copybutton sphinxext-opengraph sphinx-inline-tabs - go_1_22 - ] ++ lib.optionals stdenv.isDarwin [ + go_1_23 + fontconfig + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ imagemagick libicns # For the png2icns tool. + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ + wayland-scanner ]; + depsBuildBuild = [ pkg-config ]; + outputs = [ "out" "terminfo" "shell_integration" "kitten" ]; patches = [ @@ -129,8 +136,13 @@ buildPythonApplication rec { ''; in '' runHook preBuild - ${ lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) "export MACOSX_DEPLOYMENT_TARGET=11" } - ${if stdenv.isDarwin then '' + + # Add the font by hand because fontconfig does not finds it in darwin + mkdir ./fonts/ + cp "${(nerdfonts.override {fonts = ["NerdFontsSymbolsOnly"];})}/share/fonts/truetype/NerdFonts/SymbolsNerdFontMono-Regular.ttf" ./fonts/ + + ${ lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) "export MACOSX_DEPLOYMENT_TARGET=11" } + ${if stdenv.hostPlatform.isDarwin then '' ${python.pythonOnBuildForHost.interpreter} setup.py build ${darwinOptions} make docs ${python.pythonOnBuildForHost.interpreter} setup.py kitty.app ${darwinOptions} @@ -153,13 +165,13 @@ buildPythonApplication rec { bashInteractive zsh fish - ] ++ lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ # integration tests need sudo sudo ]; # skip failing tests due to darwin sandbox - preCheck = lib.optionalString stdenv.isDarwin '' + preCheck = lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace kitty_tests/file_transmission.py \ --replace test_file_get dont_test_file_get \ --replace test_path_mapping_receive dont_test_path_mapping_receive \ @@ -197,7 +209,7 @@ buildPythonApplication rec { runHook preInstall mkdir -p "$out" mkdir -p "$kitten/bin" - ${if stdenv.isDarwin then '' + ${if stdenv.hostPlatform.isDarwin then '' mkdir "$out/bin" ln -s ../Applications/kitty.app/Contents/MacOS/kitty "$out/bin/kitty" ln -s ../Applications/kitty.app/Contents/MacOS/kitten "$out/bin/kitten" @@ -220,7 +232,7 @@ buildPythonApplication rec { --fish <("$out/bin/kitty" +complete setup fish2) \ --zsh <("$out/bin/kitty" +complete setup zsh) - terminfo_src=${if stdenv.isDarwin then + terminfo_src=${if stdenv.hostPlatform.isDarwin then ''"$out/Applications/kitty.app/Contents/Resources/terminfo"'' else "$out/share/terminfo"} @@ -237,7 +249,7 @@ buildPythonApplication rec { ''; passthru = { - tests = lib.optionalAttrs stdenv.isLinux { + tests = lib.optionalAttrs stdenv.hostPlatform.isLinux { default = nixosTests.terminal-emulators.kitty; }; updateScript = nix-update-script {}; diff --git a/pkgs/applications/terminal-emulators/kitty/themes.nix b/pkgs/applications/terminal-emulators/kitty/themes.nix index 47ac58652a152..c51e908aad843 100644 --- a/pkgs/applications/terminal-emulators/kitty/themes.nix +++ b/pkgs/applications/terminal-emulators/kitty/themes.nix @@ -6,13 +6,13 @@ stdenvNoCC.mkDerivation { pname = "kitty-themes"; - version = "0-unstable-2024-06-12"; + version = "0-unstable-2024-08-14"; src = fetchFromGitHub { owner = "kovidgoyal"; repo = "kitty-themes"; - rev = "9589f0dffc817d6e8b86a5b2dc56d7c3db201a9b"; - hash = "sha256-8bZkYFb/HOIg2Uk7b/Apn30AAlRF0ztLh27AUlHW6Wk="; + rev = "cdf1ed4134815f58727f8070f997552f86b58892"; + hash = "sha256-vt5y3Ai1KMgRhFrkfhA8G9Ve6BEFrgkCF3ssGlOdekw="; }; dontConfigure = true; diff --git a/pkgs/applications/terminal-emulators/mlterm/default.nix b/pkgs/applications/terminal-emulators/mlterm/default.nix index 28f027401bd74..dcf581f27a80c 100644 --- a/pkgs/applications/terminal-emulators/mlterm/default.nix +++ b/pkgs/applications/terminal-emulators/mlterm/default.nix @@ -27,8 +27,8 @@ # documentd in `./configure --help`, and it is reported here: # https://github.com/arakiken/mlterm/issues/73 fb = false; - quartz = stdenv.isDarwin; - wayland = stdenv.isLinux; + quartz = stdenv.hostPlatform.isDarwin; + wayland = stdenv.hostPlatform.isLinux; sdl2 = true; } , libxkbcommon @@ -59,16 +59,16 @@ mlfc = true; } # Whether to enable the X window system -, enableX11 ? stdenv.isLinux +, enableX11 ? stdenv.hostPlatform.isLinux # Most of the input methods and other build features are enabled by default, # the following attribute set can be used to disable some of them. It's parsed # when we set `configureFlags`. If you find other configure Flags that require # dependencies, it'd be nice to make that contribution here. , enableFeatures ? { - uim = !stdenv.isDarwin; - ibus = !stdenv.isDarwin; - fcitx = !stdenv.isDarwin; - m17n = !stdenv.isDarwin; + uim = !stdenv.hostPlatform.isDarwin; + ibus = !stdenv.hostPlatform.isDarwin; + fcitx = !stdenv.hostPlatform.isDarwin; + m17n = !stdenv.hostPlatform.isDarwin; ssh2 = true; bidi = true; # Open Type layout support, (substituting glyphs with opentype fonts) @@ -185,7 +185,7 @@ in stdenv.mkDerivation (finalAttrs: { install -D contrib/icon/mlterm-icon.svg "$out/share/icons/hicolor/scalable/apps/mlterm.svg" install -D contrib/icon/mlterm-icon-gnome2.png "$out/share/icons/hicolor/48x48/apps/mlterm.png" install -D -t $out/share/applications $desktopItem/share/applications/* - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications/ cp -a cocoa/mlterm.app $out/Applications/ install $out/bin/mlterm -Dt $out/Applications/mlterm.app/Contents/MacOS/ diff --git a/pkgs/applications/terminal-emulators/mrxvt/default.nix b/pkgs/applications/terminal-emulators/mrxvt/default.nix index b05872b11e4de..83bac2343b97f 100644 --- a/pkgs/applications/terminal-emulators/mrxvt/default.nix +++ b/pkgs/applications/terminal-emulators/mrxvt/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { homepage = "https://sourceforge.net/projects/materm"; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ ]; + maintainers = [ ]; knownVulnerabilities = [ "Usage of ANSI escape sequences causes unexpected newline-termination, leading to unexpected command execution (https://www.openwall.com/lists/oss-security/2021/05/17/1)" ]; diff --git a/pkgs/applications/terminal-emulators/rio/default.nix b/pkgs/applications/terminal-emulators/rio/default.nix index 6b68e6bdc0f5b..6e74b42fcbb4f 100644 --- a/pkgs/applications/terminal-emulators/rio/default.nix +++ b/pkgs/applications/terminal-emulators/rio/default.nix @@ -17,21 +17,25 @@ , vulkan-loader , libxkbcommon -, withX11 ? !stdenv.isDarwin +, withX11 ? !stdenv.hostPlatform.isDarwin , libX11 , libXcursor , libXi , libXrandr , libxcb -, withWayland ? !stdenv.isDarwin +, withWayland ? !stdenv.hostPlatform.isDarwin , wayland + +, testers +, rio }: let - rlinkLibs = if stdenv.isDarwin then [ + rlinkLibs = if stdenv.hostPlatform.isDarwin then [ darwin.libobjc darwin.apple_sdk_11_0.frameworks.AppKit darwin.apple_sdk_11_0.frameworks.AVFoundation + darwin.apple_sdk_11_0.frameworks.MetalKit darwin.apple_sdk_11_0.frameworks.Vision ] else [ (lib.getLib gcc-unwrapped) @@ -51,20 +55,20 @@ let in rustPlatform.buildRustPackage rec { pname = "rio"; - version = "0.0.39"; + version = "0.1.16"; src = fetchFromGitHub { owner = "raphamorim"; repo = "rio"; rev = "v${version}"; - hash = "sha256-pnU2wxgopHMWgJ7JGdO2P/MCfxqCY7MTEE39qtD0XKw="; + hash = "sha256-3OtPlaYkTPIF98CyaXWGZ/1msWHFdscqZXVviu0/O/o="; }; - cargoHash = "sha256-GwI2zHX1YcR4pC+qtkDoxx2U+zipbqqxsCI8/XNg2BU="; + cargoHash = "sha256-VpS3prTmAbWTd+gwAOA0BXso4gkcAFuhMZh8Go3Dlao="; nativeBuildInputs = [ ncurses - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ cmake pkg-config autoPatchelfHook @@ -83,7 +87,7 @@ rustPlatform.buildRustPackage rec { checkFlags = [ # Fail to run in sandbox environment. - "--skip=screen::context::test" + "--skip=sys::unix::eventedfd::EventedFd" ]; postInstall = '' @@ -95,7 +99,7 @@ rustPlatform.buildRustPackage rec { tic -xe rio,rio-direct -o "$terminfo/share/terminfo" misc/rio.terminfo mkdir -p $out/nix-support echo "$terminfo" >> $out/nix-support/propagated-user-env-packages - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir $out/Applications/ mv misc/osx/Rio.app/ $out/Applications/ mkdir $out/Applications/Rio.app/Contents/MacOS/ @@ -107,7 +111,10 @@ rustPlatform.buildRustPackage rec { extraArgs = [ "--version-regex" "v([0-9.]+)" ]; }; - tests.test = nixosTests.terminal-emulators.rio; + tests = { + test = nixosTests.terminal-emulators.rio; + version = testers.testVersion { package = rio; }; + }; }; meta = { @@ -116,7 +123,7 @@ rustPlatform.buildRustPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ tornax otavio oluceps ]; platforms = lib.platforms.unix; - changelog = "https://github.com/raphamorim/rio/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/raphamorim/rio/blob/v${version}/docs/docs/releases.md"; mainProgram = "rio"; }; } diff --git a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-font-size/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-font-size/default.nix index ac2a5f09fb0f1..fa356081a8703 100644 --- a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-font-size/default.nix +++ b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-font-size/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { description = "Change the urxvt font size on the fly"; homepage = "https://github.com/majutsushi/urxvt-font-size"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = with platforms; unix; }; } diff --git a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-perl/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-perl/default.nix index f30507483fac1..64a1ed125ac80 100644 --- a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-perl/default.nix +++ b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-perl/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { description = "Perl extensions for the rxvt-unicode terminal emulator"; homepage = "https://github.com/effigies/urxvt-perl"; license = licenses.gpl3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = with platforms; unix; }; } diff --git a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-theme-switch/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-theme-switch/default.nix index c7510568e2641..2bfc9669338ad 100644 --- a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-theme-switch/default.nix +++ b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-theme-switch/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { description = "urxvt plugin that allows to switch color themes during runtime"; homepage = "https://github.com/felixr/urxvt-theme-switch"; license = "CCBYNC"; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix index e932fcdea05f3..a39099cc4bd46 100644 --- a/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix +++ b/pkgs/applications/terminal-emulators/rxvt-unicode/default.nix @@ -33,8 +33,6 @@ let }; in -with lib; - stdenv.mkDerivation { name = "${pname}-unwrapped-${version}"; inherit pname version; @@ -49,8 +47,8 @@ stdenv.mkDerivation { [ libX11 libXt libXft ncurses # required to build the terminfo file fontconfig freetype libXrender libptytty - ] ++ optionals perlSupport [ perl libXext ] - ++ optional gdkPixbufSupport gdk-pixbuf; + ] ++ lib.optionals perlSupport [ perl libXext ] + ++ lib.optional gdkPixbufSupport gdk-pixbuf; outputs = [ "out" "terminfo" ]; @@ -73,19 +71,19 @@ stdenv.mkDerivation { ./patches/9.06-font-width.patch ]) ++ [ ./patches/256-color-resources.patch - ] ++ optional (perlSupport && versionAtLeast perl.version "5.38") (fetchpatch { + ] ++ lib.optional (perlSupport && lib.versionAtLeast perl.version "5.38") (fetchpatch { name = "perl538-locale-c.patch"; url = "https://github.com/exg/rxvt-unicode/commit/16634bc8dd5fc4af62faf899687dfa8f27768d15.patch"; excludes = [ "Changes" ]; sha256 = "sha256-JVqzYi3tcWIN2j5JByZSztImKqbbbB3lnfAwUXrumHM="; - }) ++ optional stdenv.isDarwin ./patches/makefile-phony.patch; + }) ++ lib.optional stdenv.hostPlatform.isDarwin ./patches/makefile-phony.patch; configureFlags = [ "--with-terminfo=${placeholder "terminfo"}/share/terminfo" "--enable-256-color" - (enableFeature perlSupport "perl") - (enableFeature unicode3Support "unicode3") - ] ++ optional emojiSupport "--enable-wide-glyphs"; + (lib.enableFeature perlSupport "perl") + (lib.enableFeature unicode3Support "unicode3") + ] ++ lib.optional emojiSupport "--enable-wide-glyphs"; LDFLAGS = [ "-lfontconfig" "-lXrender" "-lpthread" ]; CFLAGS = [ "-I${freetype.dev}/include/freetype2" ]; @@ -111,7 +109,7 @@ stdenv.mkDerivation { passthru.tests.test = nixosTests.terminal-emulators.urxvt; - meta = { + meta = with lib; { inherit description; homepage = "http://software.schmorp.de/pkg/rxvt-unicode.html"; downloadPage = "http://dist.schmorp.de/rxvt-unicode/Attic/"; diff --git a/pkgs/applications/terminal-emulators/rxvt-unicode/wrapper.nix b/pkgs/applications/terminal-emulators/rxvt-unicode/wrapper.nix index 639c7b5dda507..2e2cb076c6973 100644 --- a/pkgs/applications/terminal-emulators/rxvt-unicode/wrapper.nix +++ b/pkgs/applications/terminal-emulators/rxvt-unicode/wrapper.nix @@ -1,5 +1,4 @@ -{ callPackage -, symlinkJoin +{ symlinkJoin , makeWrapper , lib , rxvt-unicode-unwrapped diff --git a/pkgs/applications/terminal-emulators/rxvt/default.nix b/pkgs/applications/terminal-emulators/rxvt/default.nix deleted file mode 100644 index 9894a8cdb05a5..0000000000000 --- a/pkgs/applications/terminal-emulators/rxvt/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ lib, stdenv, fetchurl -, pkg-config, libtool -, libX11, libXt, libXpm }: - -stdenv.mkDerivation rec { - pname = "rxvt"; - version = "2.7.10"; - - src = fetchurl { - url = "mirror://sourceforge/rxvt/${pname}-${version}.tar.gz"; - sha256 = "0jfl71gz3k7zh3kxdb8lxi06kajjnx7bq1rxjgk680l209jxask1"; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libtool libX11 libXt libXpm ]; - - configurePhase = '' - LIBTOOL=${libtool}/bin/libtool ./configure --prefix=$out --enable-everything --enable-smart-resize --enable-256-color - ''; - - meta = with lib; { - homepage = "https://rxvt.sourceforge.net/"; - description = "Colour vt102 terminal emulator with less features and lower memory consumption"; - longDescription = '' - rxvt (acronym for our extended virtual terminal) is a terminal - emulator for the X Window System, originally written by Rob Nation - as an extended version of the older xvt terminal by John Bovey of - University of Kent. Mark Olesen extensively modified it later and - took over maintenance for several years. - - rxvt is intended to be a slimmed-down alternate for xterm, - omitting some of its little-used features, like Tektronix 4014 - emulation and toolkit-style configurability. - ''; - maintainers = with maintainers; [ AndersonTorres ]; - license = licenses.gpl2; - platforms = platforms.linux; - knownVulnerabilities = [ - "Usage of ANSI escape sequences causes unexpected newline-termination, leading to unexpected command execution (https://www.openwall.com/lists/oss-security/2021/05/17/1)" - ]; - }; -} diff --git a/pkgs/applications/terminal-emulators/sakura/default.nix b/pkgs/applications/terminal-emulators/sakura/default.nix deleted file mode 100644 index d58eceae1654c..0000000000000 --- a/pkgs/applications/terminal-emulators/sakura/default.nix +++ /dev/null @@ -1,73 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, glib -, gtk3 -, gettext -, pango -, makeWrapper -, pcre2 -, perl -, pkg-config -, vte -, nixosTests -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "sakura"; - version = "3.8.7"; - - src = fetchFromGitHub { - owner = "dabisu"; - repo = "sakura"; - rev = "SAKURA_${lib.replaceStrings [ "." ] [ "_" ] finalAttrs.version}"; - hash = "sha256-mDYwqRPezHEgLyZlJQ6taTQiP9HDWmN09mapfp7/TPs="; - }; - - nativeBuildInputs = [ - cmake - gettext - makeWrapper - perl - pkg-config - ]; - - buildInputs = [ - glib - gtk3 - pango - pcre2 - vte - ]; - - strictDeps = true; - - # Set path to gsettings-schemata so sakura knows where to find colorchooser, - # fontchooser etc. - postFixup = '' - wrapProgram $out/bin/sakura \ - --suffix XDG_DATA_DIRS : ${gtk3}/share/gsettings-schemas/${gtk3.name}/ - ''; - - passthru.tests.test = nixosTests.terminal-emulators.sakura; - - meta = { - homepage = "https://www.pleyades.net/david/projects/sakura"; - description = "Terminal emulator based on GTK and VTE"; - longDescription = '' - sakura is a terminal emulator based on GTK and VTE. It's a terminal - emulator with few dependencies, so you don't need a full GNOME desktop - installed to have a decent terminal emulator. Current terminal emulators - based on VTE are gnome-terminal, XFCE Terminal, TermIt and a small - sample program included in the vte sources. The differences between - sakura and the last one are that it uses a notebook to provide several - terminals in one window and adds a contextual menu with some basic - options. No more no less. - ''; - license = lib.licenses.gpl2Only; - maintainers = with lib.maintainers; [ astsmtl codyopel AndersonTorres ]; - platforms = lib.platforms.linux; - mainProgram = "sakura"; - }; -}) diff --git a/pkgs/applications/terminal-emulators/st/default.nix b/pkgs/applications/terminal-emulators/st/default.nix index 72a6835ff4aaa..676ef292def16 100644 --- a/pkgs/applications/terminal-emulators/st/default.nix +++ b/pkgs/applications/terminal-emulators/st/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { (writeText "config.def.h" conf); postPatch = lib.optionalString (conf != null) "cp ${finalAttrs.configFile} config.def.h" - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace config.mk --replace "-lrt" "" ''; diff --git a/pkgs/applications/terminal-emulators/syncterm/default.nix b/pkgs/applications/terminal-emulators/syncterm/default.nix index 36a02e08bbd50..60b172184fc99 100644 --- a/pkgs/applications/terminal-emulators/syncterm/default.nix +++ b/pkgs/applications/terminal-emulators/syncterm/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { "-Wno-unused-result" "-Wformat-overflow=0" - ] ++ (lib.optionals stdenv.isLinux [ + ] ++ (lib.optionals stdenv.hostPlatform.isLinux [ "-DUSE_ALSA_SOUND" # Don't use OSS for beeps. ]); makeFlags = [ @@ -38,12 +38,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoPatchelfHook pkg-config SDL2 perl unzip ]; # SDL2 for `sdl2-config`. buildInputs = [ ncurses SDL2 ] - ++ (lib.optional stdenv.isLinux alsa-lib); + ++ (lib.optional stdenv.hostPlatform.isLinux alsa-lib); runtimeDependencies = [ ncurses SDL2 ]; # Both of these are dlopen()'ed at runtime. meta = with lib; { # error: unsupported option '-fsanitize=safe-stack' for target 'x86_64-apple-darwin' - broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) || stdenv.hostPlatform.isDarwin; homepage = "https://syncterm.bbsdev.net/"; description = "BBS terminal emulator"; mainProgram = "syncterm"; diff --git a/pkgs/applications/terminal-emulators/terminator/default.nix b/pkgs/applications/terminal-emulators/terminator/default.nix index aedbb761a8cad..01047f26bc634 100644 --- a/pkgs/applications/terminal-emulators/terminator/default.nix +++ b/pkgs/applications/terminal-emulators/terminator/default.nix @@ -30,7 +30,6 @@ python3.pkgs.buildPythonApplication rec { gobject-introspection makeBinaryWrapper wrapGAppsHook3 - python3.pkgs.pytest-runner ]; buildInputs = [ diff --git a/pkgs/applications/terminal-emulators/termite/default.nix b/pkgs/applications/terminal-emulators/termite/default.nix index 4acc8263ce869..3dc6d484d2d3c 100644 --- a/pkgs/applications/terminal-emulators/termite/default.nix +++ b/pkgs/applications/terminal-emulators/termite/default.nix @@ -47,7 +47,7 @@ in stdenv.mkDerivation rec { url = "https://github.com/thestinger/termite/commit/7e9a93b421b9596f8980645a46ac2ad5468dac06.patch"; sha256 = "0vph2m5919f7w1xnc8i6z0j44clsm1chxkfg7l71nahxyfw5yh4j"; }) - ] ++ lib.optional stdenv.isDarwin ./remove_ldflags_macos.patch; + ] ++ lib.optional stdenv.hostPlatform.isDarwin ./remove_ldflags_macos.patch; makeFlags = [ "VERSION=v${version}" "PREFIX=" "DESTDIR=$(out)" ]; diff --git a/pkgs/applications/terminal-emulators/wezterm/Cargo.lock b/pkgs/applications/terminal-emulators/wezterm/Cargo.lock index 58f7820be40e2..4d31d10c502f1 100644 --- a/pkgs/applications/terminal-emulators/wezterm/Cargo.lock +++ b/pkgs/applications/terminal-emulators/wezterm/Cargo.lock @@ -3649,6 +3649,12 @@ dependencies = [ ] [[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + +[[package]] name = "num-derive" version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5554,12 +5560,13 @@ dependencies = [ [[package]] name = "time" -version = "0.3.31" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f657ba42c3f86e7680e53c8cd3af8abbe56b5491790b46e22e19c0d57463583e" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ "deranged", "itoa", + "num-conv", "powerfmt", "serde", "time-core", @@ -5589,10 +5596,11 @@ dependencies = [ [[package]] name = "time-macros" -version = "0.2.16" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26197e33420244aeb70c3e8c78376ca46571bc4e701e4791c2cd9f57dcb3a43f" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" dependencies = [ + "num-conv", "time-core", ] diff --git a/pkgs/applications/terminal-emulators/wezterm/default.nix b/pkgs/applications/terminal-emulators/wezterm/default.nix index ea9e45c292e1e..68391fc4dc7ff 100644 --- a/pkgs/applications/terminal-emulators/wezterm/default.nix +++ b/pkgs/applications/terminal-emulators/wezterm/default.nix @@ -43,6 +43,8 @@ rustPlatform.buildRustPackage rec { }; postPatch = '' + cp ${./Cargo.lock} Cargo.lock + echo ${version} > .tag # tests are failing with: Unable to exchange encryption keys @@ -61,12 +63,12 @@ rustPlatform.buildRustPackage rec { ncurses # tic for terminfo pkg-config python3 - ] ++ lib.optional stdenv.isDarwin perl; + ] ++ lib.optional stdenv.hostPlatform.isDarwin perl; buildInputs = [ fontconfig zlib - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libX11 libxcb libxkbcommon @@ -76,7 +78,7 @@ rustPlatform.buildRustPackage rec { xcbutilimage xcbutilkeysyms xcbutilwm # contains xcb-ewmh among others - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa CoreGraphics Foundation @@ -87,7 +89,7 @@ rustPlatform.buildRustPackage rec { buildFeatures = [ "distro-defaults" ]; - env.NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-framework System"; + env.NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-framework System"; postInstall = '' mkdir -p $out/nix-support @@ -106,12 +108,12 @@ rustPlatform.buildRustPackage rec { install -Dm644 assets/wezterm-nautilus.py -t $out/share/nautilus-python/extensions ''; - preFixup = lib.optionalString stdenv.isLinux '' + preFixup = lib.optionalString stdenv.hostPlatform.isLinux '' patchelf \ --add-needed "${libGL}/lib/libEGL.so.1" \ --add-needed "${vulkan-loader}/lib/libvulkan.so.1" \ $out/bin/wezterm-gui - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p "$out/Applications" OUT_APP="$out/Applications/WezTerm.app" cp -r assets/macos/WezTerm.app "$OUT_APP" diff --git a/pkgs/applications/terminal-emulators/x3270/default.nix b/pkgs/applications/terminal-emulators/x3270/default.nix index 2e901e5af8763..45b08bd10f664 100644 --- a/pkgs/applications/terminal-emulators/x3270/default.nix +++ b/pkgs/applications/terminal-emulators/x3270/default.nix @@ -36,9 +36,9 @@ stdenv.mkDerivation rec { sha256 = "sha256-gcC6REfZentIPEDhGznUSYu8mvVfpPeMz/Bks+N43Fk="; }; - buildFlags = lib.optional stdenv.isLinux "unix"; + buildFlags = lib.optional stdenv.hostPlatform.isLinux "unix"; - configureFlags = lib.optionals stdenv.isDarwin [ + configureFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "--enable-c3270" "--enable-pr3270" "--enable-s3270" @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { expat openssl readline - ] ++ lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ]; meta = with lib; { description = "IBM 3270 terminal emulator for the X Window System"; diff --git a/pkgs/applications/terminal-emulators/xterm/default.nix b/pkgs/applications/terminal-emulators/xterm/default.nix index 303c6d1b77da5..79c069838ba85 100644 --- a/pkgs/applications/terminal-emulators/xterm/default.nix +++ b/pkgs/applications/terminal-emulators/xterm/default.nix @@ -1,19 +1,21 @@ -{ lib, stdenv, fetchurl, fetchpatch, xorg, ncurses, freetype, fontconfig +{ lib, stdenv, fetchurl, xorg, ncurses, freetype, fontconfig , pkg-config, makeWrapper, nixosTests, gitUpdater -, nix, gnused, coreutils, enableDecLocator ? true }: +, enableDecLocator ? true }: stdenv.mkDerivation rec { pname = "xterm"; - version = "390"; + version = "393"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/xterm/${pname}-${version}.tgz" "https://invisible-mirror.net/archives/xterm/${pname}-${version}.tgz" ]; - hash = "sha256-dRF8PMUXSgnEJe8QbmlATXL17wXgOl2gCq8VeS1vnA8="; + hash = "sha256-3Dq/Uz1mrj20nmeDsOHinw5NBFtLPax5el6Tvic17Hs="; }; + patches = [ ./sixel-256.support.patch ]; + strictDeps = true; nativeBuildInputs = [ makeWrapper pkg-config fontconfig ]; @@ -32,14 +34,6 @@ stdenv.mkDerivation rec { xorg.luit ]; - patches = [ ./sixel-256.support.patch ] - ++ lib.optional stdenv.hostPlatform.isMusl (fetchpatch { - name = "posix-ptys.patch"; - url = - "https://git.alpinelinux.org/aports/plain/community/xterm/posix-ptys.patch?id=3aa532e77875fa1db18c7fcb938b16647031bcc1"; - sha256 = "0czgnsxkkmkrk1idw69qxbprh0jb4sw3c24zpnqq2v76jkl7zvlr"; - }); - configureFlags = [ "--enable-wide-chars" "--enable-256-color" @@ -98,7 +92,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://invisible-island.net/xterm"; license = with lib.licenses; [ mit ]; - maintainers = with lib.maintainers; [ nequissimus vrthra ]; + maintainers = with lib.maintainers; [ nequissimus ]; platforms = with lib.platforms; linux ++ darwin; changelog = "https://invisible-island.net/xterm/xterm.log.html"; }; diff --git a/pkgs/applications/version-management/bcompare/default.nix b/pkgs/applications/version-management/bcompare/default.nix index 33b4cb0f90b54..5a60f9a1d5467 100644 --- a/pkgs/applications/version-management/bcompare/default.nix +++ b/pkgs/applications/version-management/bcompare/default.nix @@ -93,6 +93,6 @@ let mainProgram = "bcompare"; }; in -if stdenv.isDarwin +if stdenv.hostPlatform.isDarwin then darwin else linux diff --git a/pkgs/applications/version-management/blackbox/default.nix b/pkgs/applications/version-management/blackbox/default.nix index c98ff367c6688..e5be040f6a25e 100644 --- a/pkgs/applications/version-management/blackbox/default.nix +++ b/pkgs/applications/version-management/blackbox/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { buildInputs = [ gnupg ]; # https://github.com/NixOS/nixpkgs/issues/134445 - doCheck = !stdenv.isDarwin && stdenv.isx86_64; + doCheck = !stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64; nativeCheckInputs = [ expect diff --git a/pkgs/applications/version-management/bump2version/default.nix b/pkgs/applications/version-management/bump2version/default.nix deleted file mode 100644 index 86d1618cc48d4..0000000000000 --- a/pkgs/applications/version-management/bump2version/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ lib -, buildPythonApplication -, fetchFromGitHub -, pytestCheckHook -, pythonOlder -, testfixtures -}: - -buildPythonApplication rec { - pname = "bump2version"; - version = "1.0.1"; - - disabled = pythonOlder "3.6"; - - src = fetchFromGitHub { - owner = "c4urself"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-j6HKi3jTwSgGBrA8PCJJNg+yQqRMo1aqaLgPGf4KAKU="; - }; - - nativeCheckInputs = [ - pytestCheckHook - testfixtures - ]; - - disabledTests = [ - # X's in pytest are git tests which won't run in sandbox - "usage_string_fork" - "test_usage_string" - "test_defaults_in_usage_with_config" - ]; - - pythonImportsCheck = [ "bumpversion" ]; - - meta = with lib; { - description = "Version-bump your software with a single command"; - longDescription = '' - A small command line tool to simplify releasing software by updating - all version strings in your source code by the correct increment. - ''; - homepage = "https://github.com/c4urself/bump2version"; - license = licenses.mit; - maintainers = with maintainers; [ jefflabonte ]; - }; -} diff --git a/pkgs/applications/version-management/cgit/common.nix b/pkgs/applications/version-management/cgit/common.nix index b0ed32eb02227..d5dab65bd4a92 100644 --- a/pkgs/applications/version-management/cgit/common.nix +++ b/pkgs/applications/version-management/cgit/common.nix @@ -1,5 +1,6 @@ { pname, version, src, gitSrc, buildInputs ? [] , homepage, description, maintainers +, passthru ? {} }: { lib, stdenv, openssl, zlib, asciidoc, libxml2, libxslt @@ -10,7 +11,7 @@ }: stdenv.mkDerivation { - inherit pname version src gitSrc; + inherit pname version src gitSrc passthru; separateDebugInfo = true; diff --git a/pkgs/applications/version-management/cgit/default.nix b/pkgs/applications/version-management/cgit/default.nix index f6a0af102303b..0fe86683d5fa2 100644 --- a/pkgs/applications/version-management/cgit/default.nix +++ b/pkgs/applications/version-management/cgit/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, callPackage, luajit }: +{ lib, fetchurl, callPackage, luajit, nixosTests }: callPackage (import ./common.nix rec { pname = "cgit"; @@ -19,6 +19,8 @@ callPackage (import ./common.nix rec { buildInputs = [ luajit ]; + passthru.tests = { inherit (nixosTests) cgit; }; + homepage = "https://git.zx2c4.com/cgit/about/"; description = "Web frontend for git repositories"; maintainers = with lib.maintainers; [ bjornfor ]; diff --git a/pkgs/applications/version-management/commit-formatter/default.nix b/pkgs/applications/version-management/commit-formatter/default.nix index 3a3fc7b28127e..8ed831d886570 100644 --- a/pkgs/applications/version-management/commit-formatter/default.nix +++ b/pkgs/applications/version-management/commit-formatter/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "EYzhb9jJ4MzHxIbaTb1MxeXUgoxTwcnq5JdxAv2uNcA="; }; - cargoSha256 = "AeHQCoP1HOftlOt/Yala3AXocMlwwIXIO2i1AsFSvGQ="; + cargoHash = "sha256-AeHQCoP1HOftlOt/Yala3AXocMlwwIXIO2i1AsFSvGQ="; meta = with lib; { description = "CLI tool to help you write git commit"; diff --git a/pkgs/applications/version-management/commitizen/default.nix b/pkgs/applications/version-management/commitizen/default.nix deleted file mode 100644 index f0cfc626c4fa7..0000000000000 --- a/pkgs/applications/version-management/commitizen/default.nix +++ /dev/null @@ -1,114 +0,0 @@ -{ lib -, commitizen -, fetchFromGitHub -, git -, python3 -, stdenv -, installShellFiles -, nix-update-script -, testers -}: - -python3.pkgs.buildPythonApplication rec { - pname = "commitizen"; - version = "3.27.0"; - format = "pyproject"; - - disabled = python3.pythonOlder "3.8"; - - src = fetchFromGitHub { - owner = "commitizen-tools"; - repo = pname; - rev = "refs/tags/v${version}"; - hash = "sha256-Bfz9MBpFsbAcsyQ7CYyObE14q7UE9ZyeY1GVFb9maKk="; - }; - - pythonRelaxDeps = [ - "decli" - ]; - - nativeBuildInputs = with python3.pkgs; [ - poetry-core - pythonRelaxDepsHook - installShellFiles - ]; - - propagatedBuildInputs = with python3.pkgs; [ - argcomplete - charset-normalizer - colorama - decli - importlib-metadata - jinja2 - packaging - pyyaml - questionary - termcolor - tomlkit - ]; - - nativeCheckInputs = with python3.pkgs; [ - argcomplete - deprecated - git - py - pytest-freezer - pytest-mock - pytest-regressions - pytest7CheckHook - ]; - - doCheck = true; - - # The tests require a functional git installation - # which requires a valid HOME directory. - preCheck = '' - export HOME="$(mktemp -d)" - - git config --global user.name "Nix Builder" - git config --global user.email "nix-builder@nixos.org" - git init . - ''; - - # NB: These tests require complex GnuPG setup - disabledTests = [ - "test_bump_minor_increment_signed" - "test_bump_minor_increment_signed_config_file" - "test_bump_on_git_with_hooks_no_verify_enabled" - "test_bump_on_git_with_hooks_no_verify_disabled" - "test_bump_pre_commit_changelog" - "test_bump_pre_commit_changelog_fails_always" - "test_get_commits_with_signature" - # fatal: not a git repository (or any of the parent directories): .git - "test_commitizen_debug_excepthook" - ]; - - postInstall = - let - argcomplete = lib.getExe' python3.pkgs.argcomplete "register-python-argcomplete"; - in - lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) - '' - installShellCompletion --cmd cz \ - --bash <(${argcomplete} --shell bash $out/bin/cz) \ - --zsh <(${argcomplete} --shell zsh $out/bin/cz) \ - --fish <(${argcomplete} --shell fish $out/bin/cz) - ''; - - passthru = { - updateScript = nix-update-script { }; - tests.version = testers.testVersion { - package = commitizen; - command = "cz version"; - }; - }; - - meta = with lib; { - description = "Tool to create committing rules for projects, auto bump versions, and generate changelogs"; - homepage = "https://github.com/commitizen-tools/commitizen"; - changelog = "https://github.com/commitizen-tools/commitizen/blob/v${version}/CHANGELOG.md"; - license = licenses.mit; - mainProgram = "cz"; - maintainers = with maintainers; [ lovesegfault anthonyroussel ]; - }; -} diff --git a/pkgs/applications/version-management/cvs/default.nix b/pkgs/applications/version-management/cvs/default.nix index 20a38f9f8e8cf..7ec801503f767 100644 --- a/pkgs/applications/version-management/cvs/default.nix +++ b/pkgs/applications/version-management/cvs/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { "AR=${stdenv.cc.targetPrefix}ar" ]; - env = lib.optionalAttrs (stdenv.isDarwin && stdenv.cc.isClang) { + env = lib.optionalAttrs (stdenv.hostPlatform.isDarwin && stdenv.cc.isClang) { NIX_CFLAGS_COMPILE = "-Wno-implicit-function-declaration"; }; diff --git a/pkgs/applications/version-management/datalad/default.nix b/pkgs/applications/version-management/datalad/default.nix deleted file mode 100644 index 2b7d9eb032f96..0000000000000 --- a/pkgs/applications/version-management/datalad/default.nix +++ /dev/null @@ -1,86 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, installShellFiles, python3, git, git-annex }: - -python3.pkgs.buildPythonApplication rec { - pname = "datalad"; - version = "1.0.2"; - - src = fetchFromGitHub { - owner = "datalad"; - repo = pname; - rev = "refs/tags/${version}"; - hash = "sha256-oq+DdlWcwjJSQdnqHlYCa9I7iSOKf+hI35Lcv/GM24c="; - }; - - nativeBuildInputs = [ installShellFiles git ]; - - propagatedBuildInputs = with python3.pkgs; [ - # core - platformdirs - chardet - iso8601 - humanize - fasteners - packaging - patool - tqdm - annexremote - looseversion - setuptools - git-annex - - # downloaders-extra - # requests-ftp # not in nixpkgs yet - - # downloaders - boto - keyrings-alt - keyring - msgpack - requests - - # publish - python-gitlab - - # misc - argcomplete - pyperclip - python-dateutil - - # metadata - simplejson - whoosh - - # metadata-extra - pyyaml - mutagen - exifread - python-xmp-toolkit - pillow - - # duecredit - duecredit - - # python>=3.8 - distro - ] ++ lib.optionals stdenv.hostPlatform.isWindows [ colorama ] - ++ lib.optionals (python3.pythonOlder "3.10") [ importlib-metadata ]; - - postInstall = '' - installShellCompletion --cmd datalad \ - --bash <($out/bin/datalad shell-completion) \ - --zsh <($out/bin/datalad shell-completion) - wrapProgram $out/bin/datalad --prefix PYTHONPATH : "$PYTHONPATH" - ''; - - # no tests - doCheck = false; - - pythonImportsCheck = [ "datalad" ]; - - meta = with lib; { - description = "Keep code, data, containers under control with git and git-annex"; - homepage = "https://www.datalad.org"; - license = licenses.mit; - maintainers = with maintainers; [ renesat ]; - }; -} diff --git a/pkgs/applications/version-management/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/delta/default.nix b/pkgs/applications/version-management/delta/default.nix index 40f474f2c4c1d..76ace5026e681 100644 --- a/pkgs/applications/version-management/delta/default.nix +++ b/pkgs/applications/version-management/delta/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "delta"; - version = "0.17.0"; + version = "0.18.2"; src = fetchFromGitHub { owner = "dandavison"; - repo = pname; - rev = version; - hash = "sha256-r0ED9o2UP91fe6Bng5ioJra5S1bg+UEXMLeSQPkMswI="; + repo = "delta"; + rev = "refs/tags/${version}"; + hash = "sha256-fJSKGa935kwLG8WYmT9Ncg2ozpSNMzUJx0WLo1gtVAA="; }; - cargoHash = "sha256-3CxRNhcjfDK/xUuM3w+GwqE0+X6WT92/LGj/qRp0TwA="; + cargoHash = "sha256-DIWzRVTADfAZdFckhh2lIfOD13h7GP3KIOQHf/oBHgc="; nativeBuildInputs = [ installShellFiles @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ oniguruma - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk_11_0.frameworks.Foundation ]; @@ -49,8 +49,10 @@ rustPlatform.buildRustPackage rec { # https://github.com/dandavison/delta/issues/1660 dontUseCargoParallelTests = true; - checkFlags = lib.optionals stdenv.isDarwin [ - "--skip=test_diff_same_non_empty_file" + checkFlags = lib.optionals stdenv.hostPlatform.isDarwin [ + # This test tries to read /etc/passwd, which fails with the sandbox + # enabled on Darwin + "--skip=test_diff_real_files" ]; meta = with lib; { diff --git a/pkgs/applications/version-management/fnc/default.nix b/pkgs/applications/version-management/fnc/default.nix index b523141808167..b0bae95ba9d13 100644 --- a/pkgs/applications/version-management/fnc/default.nix +++ b/pkgs/applications/version-management/fnc/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "fnc"; - version = "0.16"; + version = "0.18"; src = fetchurl { url = "https://fnc.bsdbox.org/tarball/${finalAttrs.version}/fnc-${finalAttrs.version}.tar.gz"; - hash = "sha256-6I6wtSMHaKdnlUK4pYiaybJeODGu2P+smYW8lQDIWGM="; + hash = "sha256-npS+sOxF0S/9TuFjtEFlev0HpIOsaP6zmcfopPNUehk="; }; buildInputs = [ libiconv ncurses zlib ]; @@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isGNU [ # Needed with GCC 12 "-Wno-error=maybe-uninitialized" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # error: 'strtonum' is only available on macOS 11.0 or newer "-Wno-error=unguarded-availability-new" ]); diff --git a/pkgs/applications/version-management/fornalder/default.nix b/pkgs/applications/version-management/fornalder/default.nix index 7d012c83606a6..c7774a60cf2b9 100644 --- a/pkgs/applications/version-management/fornalder/default.nix +++ b/pkgs/applications/version-management/fornalder/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-IPSxVWJs4EhyBdA1NXpD8v3fusewt1ELpn/kbZt7c5Q="; }; - cargoSha256 = "sha256-eK+oQbOQj8pKiOTXzIgRjzVB7Js8MMa9V6cF9D98Ftc="; + cargoHash = "sha256-eK+oQbOQj8pKiOTXzIgRjzVB7Js8MMa9V6cF9D98Ftc="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix index 15d6bc84caa59..9443c1e9cdea2 100644 --- a/pkgs/applications/version-management/fossil/default.nix +++ b/pkgs/applications/version-management/fossil/default.nix @@ -3,6 +3,7 @@ , tcl , libiconv , fetchurl +, fetchpatch , buildPackages , zlib , openssl @@ -17,11 +18,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "fossil"; - version = "2.23"; + version = "2.24"; src = fetchurl { url = "https://www.fossil-scm.org/home/tarball/version-${finalAttrs.version}/fossil-${finalAttrs.version}.tar.gz"; - hash = "sha256-dfgI6BNRAYqXFnRtnvGh/huxkEcz6LQYZDiB04GYhZM="; + hash = "sha256-lc08F2g1vrm4lwdvpYFx/jCwspH2OHu1R0nvvfqWL0w="; }; # required for build time tool `./tools/translate.c` @@ -30,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ installShellFiles tcl tcllib ]; buildInputs = [ zlib openssl readline which ed ] - ++ lib.optional stdenv.isDarwin libiconv + ++ lib.optional stdenv.hostPlatform.isDarwin libiconv ++ lib.optional (!withInternalSqlite) sqlite; enableParallelBuilding = true; @@ -41,6 +42,27 @@ stdenv.mkDerivation (finalAttrs: { lib.optional (!withInternalSqlite) "--disable-internal-sqlite" ++ lib.optional withJson "--json"; + patches = [ + (fetchpatch { + url = "https://fossil-scm.org/home/vpatch?from=8be0372c10510437&to=5ad708085a90365f"; + extraPrefix = ""; + hash = "sha256-KxF40wiEY3R1RFM0/YOmdNiedQHzs+vyMXslnqLtqQ4="; + name = "fossil-disable-tests.patch"; + }) + (fetchpatch { + url = "https://fossil-scm.org/home/vpatch?from=fb4e90b662803e47&to=17c01c549e73c6b8"; + extraPrefix = ""; + hash = "sha256-b0JSDWEBTlLWFr5rO+g0biPzUfVsdeAw71DR7/WQKzU="; + name = "fossil-fix-json-test.patch"; + }) + (fetchpatch { + url = "https://fossil-scm.org/home/vpatch?from=5ad708085a90365f&to=fb4e90b662803e47"; + extraPrefix = ""; + hash = "sha256-bbWUrlhPxC/DQQDeC3gG0jGfxQ6F7YkxINqg3baf+j0="; + name = "fossil-comment-utf-tests.patch"; + }) + ]; + preBuild = '' export USER=nonexistent-but-specified-user ''; @@ -64,7 +86,7 @@ stdenv.mkDerivation (finalAttrs: { ''; homepage = "https://www.fossil-scm.org/"; license = licenses.bsd2; - maintainers = with maintainers; [ maggesi viric ]; + maintainers = with maintainers; [ maggesi ]; platforms = platforms.all; mainProgram = "fossil"; }; diff --git a/pkgs/applications/version-management/gerrit/default.nix b/pkgs/applications/version-management/gerrit/default.nix deleted file mode 100644 index eed79f28b39f7..0000000000000 --- a/pkgs/applications/version-management/gerrit/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - pname = "gerrit"; - version = "3.10.0"; - - src = fetchurl { - url = "https://gerrit-releases.storage.googleapis.com/gerrit-${version}.war"; - hash = "sha256-mlaXCRQlqg2uwzm2/Vi15K5D6lmUUscfZQk/lW1YR+s="; - }; - - buildCommand = '' - mkdir -p "$out"/webapps/ - ln -s ${src} "$out"/webapps/gerrit-${version}.war - ''; - - passthru = { - # A list of plugins that are part of the gerrit.war file. - # Use `java -jar gerrit.war ls | grep plugins/` to generate that list. - plugins = [ - "codemirror-editor" - "commit-message-length-validator" - "delete-project" - "download-commands" - "gitiles" - "hooks" - "plugin-manager" - "replication" - "reviewnotes" - "singleusergroup" - "webhooks" - ]; - }; - - meta = with lib; { - homepage = "https://www.gerritcodereview.com/index.md"; - license = licenses.asl20; - description = "Web based code review and repository management for the git version control system"; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; - maintainers = with maintainers; [ flokli zimbatm ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/applications/version-management/gex/default.nix b/pkgs/applications/version-management/gex/default.nix deleted file mode 100644 index 51a8839261af9..0000000000000 --- a/pkgs/applications/version-management/gex/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ lib -, stdenv -, rustPlatform -, fetchFromGitHub -, pkg-config -, libgit2 -, Security -}: - -rustPlatform.buildRustPackage rec { - pname = "gex"; - version = "0.6.4"; - - src = fetchFromGitHub { - owner = "Piturnah"; - repo = pname; - rev = "v${version}"; - hash = "sha256-Xer7a3UtFIv3idchI7DfZ5u6qgDW/XFWi5ihtcREXqo="; - }; - - nativeBuildInputs = [ pkg-config ]; - - buildInputs = [ - libgit2 - ] ++ lib.optionals stdenv.isDarwin [ - Security - ]; - - # force the libgit2-sys crate to use the system libgit2 library - LIBGIT2_NO_VENDOR = 1; - - cargoHash = "sha256-HNz1wwn0eUhNR6ZLLPMse8LmAS4CzADx0ZR9gJgJQCg="; - - meta = with lib; { - description = "Git Explorer: cross-platform git workflow improvement tool inspired by Magit"; - homepage = "https://github.com/Piturnah/gex"; - changelog = "https://github.com/Piturnah/gex/releases/tag/${src.rev}"; - license = with licenses; [ asl20 /* or */ mit ]; - maintainers = with maintainers; [ azd325 evanrichter piturnah ]; - mainProgram = "gex"; - }; -} diff --git a/pkgs/applications/version-management/gfold/default.nix b/pkgs/applications/version-management/gfold/default.nix index fb8cccdda1bde..299ea9fb6ba40 100644 --- a/pkgs/applications/version-management/gfold/default.nix +++ b/pkgs/applications/version-management/gfold/default.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage { cargoHash = "sha256-idzw5dfCCvujvYr7DG0oOzQUIcbACtiIZLoA4MEClzY="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv Security ]; diff --git a/pkgs/applications/version-management/gh/default.nix b/pkgs/applications/version-management/gh/default.nix index 28f8c94f5700b..ef040a4df68f5 100644 --- a/pkgs/applications/version-management/gh/default.nix +++ b/pkgs/applications/version-management/gh/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gh"; - version = "2.52.0"; + version = "2.57.0"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - hash = "sha256-vaB0K9LeMcCcJw5sqxe3bFgzDvhikjAej5vHkvhWqqY="; + hash = "sha256-HNr/HBt1EqbV+/dLCztucmeAqw3jLPOgQ0WLPxGDYgY="; }; - vendorHash = "sha256-BnjWpxjkzSZKgeMR5iVdTKomsR93nSQVli4BDsPP4gw="; + vendorHash = "sha256-gPUEfdS4iEzMQGdUNKMmEGRug66NVcrV3zvmkoEsNGo="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/version-management/ghorg/default.nix b/pkgs/applications/version-management/ghorg/default.nix index a3aa4218042c2..094a6172e8cb8 100644 --- a/pkgs/applications/version-management/ghorg/default.nix +++ b/pkgs/applications/version-management/ghorg/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ghorg"; - version = "1.9.12"; + version = "1.10.0"; src = fetchFromGitHub { owner = "gabrie30"; repo = "ghorg"; rev = "v${version}"; - sha256 = "sha256-8M8ovb3T7iSHXepG1eH3ByX+g5iVRl4/pctigQ4I0Pk="; + sha256 = "sha256-MZGpH8fvSERSMUxGa1JX4mb8d/p3aDztgRH1FQA8f/Y="; }; doCheck = false; diff --git a/pkgs/applications/version-management/ghq/default.nix b/pkgs/applications/version-management/ghq/default.nix index da0fe83bf8248..546aeb19f327d 100644 --- a/pkgs/applications/version-management/ghq/default.nix +++ b/pkgs/applications/version-management/ghq/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "ghq"; - version = "1.6.1"; + version = "1.6.2"; src = fetchFromGitHub { owner = "x-motemen"; repo = "ghq"; rev = "v${version}"; - sha256 = "sha256-fp/pqLpuEqvLoB3ioDd1Kx+i1NUI+bUDJzdaT7dQGSg="; + sha256 = "sha256-vO/skiVq9wFWjTWyUb9IbKRAmtGSZEtBBEbW6R+oOQM="; }; - vendorHash = "sha256-M9B19rSEMnmT4wfOVnSAK06UPR/xrs0252lX3B9ebF8="; + vendorHash = "sha256-qUMpHFCCzfwM4wC0FIaOrnTiqq3BlG5Jr9XlkSx2HRo="; doCheck = false; diff --git a/pkgs/applications/version-management/ghr/default.nix b/pkgs/applications/version-management/ghr/default.nix index f7e6cadac0d31..bde79f07d6a15 100644 --- a/pkgs/applications/version-management/ghr/default.nix +++ b/pkgs/applications/version-management/ghr/default.nix @@ -31,7 +31,7 @@ buildGoModule rec { homepage = "https://github.com/tcnksm/ghr"; description = "Upload multiple artifacts to GitHub Release in parallel"; license = licenses.mit; - maintainers = [ maintainers.ivar ]; + maintainers = [ ]; mainProgram = "ghr"; }; } diff --git a/pkgs/applications/version-management/git-absorb/default.nix b/pkgs/applications/version-management/git-absorb/default.nix index 8446d4dec1556..8679f2842f9d0 100644 --- a/pkgs/applications/version-management/git-absorb/default.nix +++ b/pkgs/applications/version-management/git-absorb/default.nix @@ -2,23 +2,24 @@ rustPlatform.buildRustPackage rec { pname = "git-absorb"; - version = "0.6.13"; + version = "0.6.15"; src = fetchFromGitHub { owner = "tummychow"; repo = "git-absorb"; rev = "refs/tags/${version}"; - hash = "sha256-k0smjIpy/+y6M5p24Ju4CVJkThzWOgp5kBJuVnCrXiE="; + hash = "sha256-7Y/gEym+29lTwJ7FbuvOqzbiMSzrY9f5IPhtvIJUKbU="; }; nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; - cargoHash = "sha256-bRPdtiC9Dwi21g4WtjawQ2AUdizUEX2zPHAnG08D3ac="; + cargoHash = "sha256-Y/0In33y4mVTaE9yoBZ/3tRWcsSKgGjTCSHdjScNEj0="; postInstall = '' installManPage Documentation/git-absorb.1 + '' + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd git-absorb \ --bash <($out/bin/git-absorb --gen-completions bash) \ --fish <($out/bin/git-absorb --gen-completions fish) \ diff --git a/pkgs/applications/version-management/git-aggregator/default.nix b/pkgs/applications/version-management/git-aggregator/default.nix index 34365cb5d90dd..740f805d12c58 100644 --- a/pkgs/applications/version-management/git-aggregator/default.nix +++ b/pkgs/applications/version-management/git-aggregator/default.nix @@ -6,7 +6,7 @@ python3Packages.buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-79xNPzYP1j71sU5wZM5e2xTqQExqQEdxXPxbk4T/Scw="; + hash = "sha256-79xNPzYP1j71sU5wZM5e2xTqQExqQEdxXPxbk4T/Scw="; }; nativeBuildInputs = with python3Packages; [ diff --git a/pkgs/applications/version-management/git-annex-remote-googledrive/default.nix b/pkgs/applications/version-management/git-annex-remote-googledrive/default.nix index 72c0e48275ca4..03bd655adcdc8 100644 --- a/pkgs/applications/version-management/git-annex-remote-googledrive/default.nix +++ b/pkgs/applications/version-management/git-annex-remote-googledrive/default.nix @@ -6,24 +6,29 @@ , gitpython , humanfriendly , tenacity +, setuptools +, distutils }: buildPythonApplication rec { pname = "git-annex-remote-googledrive"; version = "1.3.2"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; sha256 = "0rwjcdvfgzdlfgrn1rrqwwwiqqzyh114qddrbfwd46ld5spry6r1"; }; + build-system = [ setuptools ]; + propagatedBuildInputs = [ annexremote drivelib gitpython tenacity humanfriendly + distutils ]; # while git-annex does come with a testremote command that *could* be used, @@ -36,7 +41,7 @@ buildPythonApplication rec { meta = with lib; { description = "Git-annex special remote for Google Drive"; - homepage = "https://pypi.org/project/git-annex-remote-googledrive/"; + homepage = "https://github.com/Lykos153/git-annex-remote-googledrive"; license = licenses.gpl3Only; maintainers = with maintainers; [ gravndal ]; mainProgram = "git-annex-remote-googledrive"; diff --git a/pkgs/applications/version-management/git-archive-all/default.nix b/pkgs/applications/version-management/git-archive-all/default.nix index f38e08ba8c8ee..abc8ccbbfe5f7 100644 --- a/pkgs/applications/version-management/git-archive-all/default.nix +++ b/pkgs/applications/version-management/git-archive-all/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , git , pytestCheckHook +, pytest-cov-stub , pytest-mock }: @@ -28,7 +29,6 @@ buildPythonApplication rec { --replace pytest==5.2.2 pytest \ --replace pytest-cov==2.8.1 "" \ --replace pytest-mock==1.11.2 pytest-mock \ - --replace "--cov=git_archive_all --cov-report=term --cov-branch" "" \ --replace "filterwarnings = error" "" substituteInPlace test_git_archive_all.py \ --replace "import pycodestyle" "" @@ -40,6 +40,7 @@ buildPythonApplication rec { checkInputs = [ pytestCheckHook + pytest-cov-stub pytest-mock ]; diff --git a/pkgs/applications/version-management/git-backdate/default.nix b/pkgs/applications/version-management/git-backdate/default.nix index c63b2e6f3429c..0d7d5810b9a87 100644 --- a/pkgs/applications/version-management/git-backdate/default.nix +++ b/pkgs/applications/version-management/git-backdate/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, git, python3 }: +{ lib, stdenv, fetchFromGitHub, python3 }: stdenv.mkDerivation rec { pname = "git-backdate"; diff --git a/pkgs/applications/version-management/git-backup/Cargo.lock b/pkgs/applications/version-management/git-backup/Cargo.lock deleted file mode 100644 index a9bec2b9e0b1f..0000000000000 --- a/pkgs/applications/version-management/git-backup/Cargo.lock +++ /dev/null @@ -1,1966 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "addr2line" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97" -dependencies = [ - "gimli", -] - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "aho-corasick" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04" -dependencies = [ - "memchr", -] - -[[package]] -name = "ansi_term" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" -dependencies = [ - "winapi 0.3.9", -] - -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi 0.1.19", - "libc", - "winapi 0.3.9", -] - -[[package]] -name = "autocfg" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dde43e75fd43e8a1bf86103336bc699aa8d17ad1be60c76c0bdfd4828e19b78" -dependencies = [ - "autocfg 1.1.0", -] - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "backtrace" -version = "0.3.67" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca" -dependencies = [ - "addr2line", - "cc", - "cfg-if 1.0.0", - "libc", - "miniz_oxide 0.6.2", - "object", - "rustc-demangle", -] - -[[package]] -name = "base64" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e" -dependencies = [ - "byteorder", -] - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "byteorder" -version = "1.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" - -[[package]] -name = "bytes" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c" -dependencies = [ - "byteorder", - "either", - "iovec", -] - -[[package]] -name = "cc" -version = "1.0.79" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" - -[[package]] -name = "cfg-if" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "clap" -version = "2.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" -dependencies = [ - "ansi_term", - "atty", - "bitflags", - "strsim", - "textwrap", - "unicode-width", - "vec_map", -] - -[[package]] -name = "cloudabi" -version = "0.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" -dependencies = [ - "bitflags", -] - -[[package]] -name = "colored" -version = "1.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4ffc801dacf156c5854b9df4f425a626539c3a6ef7893cc0c5084a23f0b6c59" -dependencies = [ - "atty", - "lazy_static", - "winapi 0.3.9", -] - -[[package]] -name = "cookie" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "888604f00b3db336d2af898ec3c1d5d0ddf5e6d462220f2ededc33a87ac4bbd5" -dependencies = [ - "time", - "url 1.7.2", -] - -[[package]] -name = "cookie_store" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46750b3f362965f197996c4448e4a0935e791bf7d6631bfce9ee0af3d24c919c" -dependencies = [ - "cookie", - "failure", - "idna 0.1.5", - "log", - "publicsuffix", - "serde", - "serde_json", - "time", - "try_from", - "url 1.7.2", -] - -[[package]] -name = "core-foundation" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "core-foundation-sys" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" - -[[package]] -name = "crc32fast" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" -dependencies = [ - "cfg-if 1.0.0", -] - -[[package]] -name = "crossbeam-channel" -version = "0.5.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" -dependencies = [ - "cfg-if 1.0.0", - "crossbeam-utils 0.8.15", -] - -[[package]] -name = "crossbeam-deque" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c20ff29ded3204c5106278a81a38f4b482636ed4fa1e6cfbeef193291beb29ed" -dependencies = [ - "crossbeam-epoch 0.8.2", - "crossbeam-utils 0.7.2", - "maybe-uninit", -] - -[[package]] -name = "crossbeam-deque" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" -dependencies = [ - "cfg-if 1.0.0", - "crossbeam-epoch 0.9.14", - "crossbeam-utils 0.8.15", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace" -dependencies = [ - "autocfg 1.1.0", - "cfg-if 0.1.10", - "crossbeam-utils 0.7.2", - "lazy_static", - "maybe-uninit", - "memoffset 0.5.6", - "scopeguard", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.9.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695" -dependencies = [ - "autocfg 1.1.0", - "cfg-if 1.0.0", - "crossbeam-utils 0.8.15", - "memoffset 0.8.0", - "scopeguard", -] - -[[package]] -name = "crossbeam-queue" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "774ba60a54c213d409d5353bda12d49cd68d14e45036a285234c8d6f91f92570" -dependencies = [ - "cfg-if 0.1.10", - "crossbeam-utils 0.7.2", - "maybe-uninit", -] - -[[package]] -name = "crossbeam-utils" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" -dependencies = [ - "autocfg 1.1.0", - "cfg-if 0.1.10", - "lazy_static", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b" -dependencies = [ - "cfg-if 1.0.0", -] - -[[package]] -name = "dtoa" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56899898ce76aaf4a0f24d914c97ea6ed976d42fec6ad33fcbb0a1103e07b2b0" - -[[package]] -name = "either" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" - -[[package]] -name = "encoding_rs" -version = "0.8.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" -dependencies = [ - "cfg-if 1.0.0", -] - -[[package]] -name = "errno" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" -dependencies = [ - "errno-dragonfly", - "libc", - "windows-sys 0.48.0", -] - -[[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 = "failure" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86" -dependencies = [ - "backtrace", - "failure_derive", -] - -[[package]] -name = "failure_derive" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", - "synstructure", -] - -[[package]] -name = "fastrand" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" -dependencies = [ - "instant", -] - -[[package]] -name = "flate2" -version = "1.0.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" -dependencies = [ - "crc32fast", - "miniz_oxide 0.7.1", -] - -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "foreign-types" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "foreign-types-shared", -] - -[[package]] -name = "foreign-types-shared" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - -[[package]] -name = "form_urlencoded" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" -dependencies = [ - "percent-encoding 2.2.0", -] - -[[package]] -name = "fuchsia-cprng" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" - -[[package]] -name = "fuchsia-zircon" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" -dependencies = [ - "bitflags", - "fuchsia-zircon-sys", -] - -[[package]] -name = "fuchsia-zircon-sys" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" - -[[package]] -name = "futures" -version = "0.1.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678" - -[[package]] -name = "futures-cpupool" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab90cde24b3319636588d0c35fe03b1333857621051837ed769faefb4c2162e4" -dependencies = [ - "futures", - "num_cpus", -] - -[[package]] -name = "gimli" -version = "0.27.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4" - -[[package]] -name = "git-backup" -version = "0.2.0" -dependencies = [ - "base64", - "colored", - "lazy_static", - "rayon", - "regex", - "reqwest", - "serde", - "serde_json", - "structopt", -] - -[[package]] -name = "h2" -version = "0.1.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5b34c246847f938a410a03c5458c7fee2274436675e76d8b903c08efc29c462" -dependencies = [ - "byteorder", - "bytes", - "fnv", - "futures", - "http", - "indexmap", - "log", - "slab", - "string", - "tokio-io", -] - -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" - -[[package]] -name = "heck" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" -dependencies = [ - "unicode-segmentation", -] - -[[package]] -name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - -[[package]] -name = "hermit-abi" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" -dependencies = [ - "libc", -] - -[[package]] -name = "hermit-abi" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" - -[[package]] -name = "http" -version = "0.1.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6ccf5ede3a895d8856620237b2f02972c1bbc78d2965ad7fe8838d4a0ed41f0" -dependencies = [ - "bytes", - "fnv", - "itoa 0.4.8", -] - -[[package]] -name = "http-body" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6741c859c1b2463a423a1dbce98d418e6c3c3fc720fb0d45528657320920292d" -dependencies = [ - "bytes", - "futures", - "http", - "tokio-buf", -] - -[[package]] -name = "httparse" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" - -[[package]] -name = "hyper" -version = "0.12.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c843caf6296fc1f93444735205af9ed4e109a539005abb2564ae1d6fad34c52" -dependencies = [ - "bytes", - "futures", - "futures-cpupool", - "h2", - "http", - "http-body", - "httparse", - "iovec", - "itoa 0.4.8", - "log", - "net2", - "rustc_version", - "time", - "tokio", - "tokio-buf", - "tokio-executor", - "tokio-io", - "tokio-reactor", - "tokio-tcp", - "tokio-threadpool", - "tokio-timer", - "want", -] - -[[package]] -name = "hyper-tls" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a800d6aa50af4b5850b2b0f659625ce9504df908e9733b635720483be26174f" -dependencies = [ - "bytes", - "futures", - "hyper", - "native-tls", - "tokio-io", -] - -[[package]] -name = "idna" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e" -dependencies = [ - "matches", - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "idna" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" -dependencies = [ - "matches", - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "idna" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "indexmap" -version = "1.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" -dependencies = [ - "autocfg 1.1.0", - "hashbrown", -] - -[[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if 1.0.0", -] - -[[package]] -name = "io-lifetimes" -version = "1.0.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220" -dependencies = [ - "hermit-abi 0.3.1", - "libc", - "windows-sys 0.48.0", -] - -[[package]] -name = "iovec" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e" -dependencies = [ - "libc", -] - -[[package]] -name = "itoa" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" - -[[package]] -name = "itoa" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" - -[[package]] -name = "kernel32-sys" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" -dependencies = [ - "winapi 0.2.8", - "winapi-build", -] - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "libc" -version = "0.2.144" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b00cc1c228a6782d0f076e7b232802e0c5689d41bb5df366f2a6b6621cfdfe1" - -[[package]] -name = "linux-raw-sys" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ece97ea872ece730aed82664c424eb4c8291e1ff2480247ccf7409044bc6479f" - -[[package]] -name = "lock_api" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4da24a77a3d8a6d4862d95f72e6fdb9c09a643ecdb402d754004a557f2bec75" -dependencies = [ - "scopeguard", -] - -[[package]] -name = "log" -version = "0.4.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if 1.0.0", -] - -[[package]] -name = "matches" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" - -[[package]] -name = "maybe-uninit" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" - -[[package]] -name = "memchr" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" - -[[package]] -name = "memoffset" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "043175f069eda7b85febe4a74abbaeff828d9f8b448515d3151a14a3542811aa" -dependencies = [ - "autocfg 1.1.0", -] - -[[package]] -name = "memoffset" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" -dependencies = [ - "autocfg 1.1.0", -] - -[[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 = "miniz_oxide" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" -dependencies = [ - "adler", -] - -[[package]] -name = "miniz_oxide" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" -dependencies = [ - "adler", -] - -[[package]] -name = "mio" -version = "0.6.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4afd66f5b91bf2a3bc13fad0e21caedac168ca4c707504e75585648ae80e4cc4" -dependencies = [ - "cfg-if 0.1.10", - "fuchsia-zircon", - "fuchsia-zircon-sys", - "iovec", - "kernel32-sys", - "libc", - "log", - "miow", - "net2", - "slab", - "winapi 0.2.8", -] - -[[package]] -name = "miow" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebd808424166322d4a38da87083bfddd3ac4c131334ed55856112eb06d46944d" -dependencies = [ - "kernel32-sys", - "net2", - "winapi 0.2.8", - "ws2_32-sys", -] - -[[package]] -name = "native-tls" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" -dependencies = [ - "lazy_static", - "libc", - "log", - "openssl", - "openssl-probe", - "openssl-sys", - "schannel", - "security-framework", - "security-framework-sys", - "tempfile", -] - -[[package]] -name = "net2" -version = "0.2.38" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74d0df99cfcd2530b2e694f6e17e7f37b8e26bb23983ac530c0c97408837c631" -dependencies = [ - "cfg-if 0.1.10", - "libc", - "winapi 0.3.9", -] - -[[package]] -name = "num_cpus" -version = "1.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" -dependencies = [ - "hermit-abi 0.2.6", - "libc", -] - -[[package]] -name = "object" -version = "0.30.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea86265d3d3dcb6a27fc51bd29a4bf387fae9d2986b823079d4986af253eb439" -dependencies = [ - "memchr", -] - -[[package]] -name = "once_cell" -version = "1.17.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" - -[[package]] -name = "openssl" -version = "0.10.52" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01b8574602df80f7b85fdfc5392fa884a4e3b3f4f35402c070ab34c3d3f78d56" -dependencies = [ - "bitflags", - "cfg-if 1.0.0", - "foreign-types", - "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.15", -] - -[[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.87" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e17f59264b2809d77ae94f0e1ebabc434773f370d6ca667bd223ea10e06cc7e" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "parking_lot" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f842b1982eb6c2fe34036a4fbfb06dd185a3f5c8edfaacdf7d1ea10b07de6252" -dependencies = [ - "lock_api", - "parking_lot_core", - "rustc_version", -] - -[[package]] -name = "parking_lot_core" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bda66b810a62be75176a80873726630147a5ca780cd33921e0b5709033e66b0a" -dependencies = [ - "cfg-if 0.1.10", - "cloudabi", - "libc", - "redox_syscall 0.1.57", - "rustc_version", - "smallvec", - "winapi 0.3.9", -] - -[[package]] -name = "percent-encoding" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831" - -[[package]] -name = "percent-encoding" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" - -[[package]] -name = "pkg-config" -version = "0.3.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" - -[[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.56" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "publicsuffix" -version = "1.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95b4ce31ff0a27d93c8de1849cf58162283752f065a90d508f1105fa6c9a213f" -dependencies = [ - "idna 0.2.3", - "url 2.3.1", -] - -[[package]] -name = "quote" -version = "1.0.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f4f29d145265ec1c483c7c654450edde0bfe043d3938d6972630663356d9500" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "rand" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca" -dependencies = [ - "autocfg 0.1.8", - "libc", - "rand_chacha", - "rand_core 0.4.2", - "rand_hc", - "rand_isaac", - "rand_jitter", - "rand_os", - "rand_pcg", - "rand_xorshift", - "winapi 0.3.9", -] - -[[package]] -name = "rand_chacha" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef" -dependencies = [ - "autocfg 0.1.8", - "rand_core 0.3.1", -] - -[[package]] -name = "rand_core" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" -dependencies = [ - "rand_core 0.4.2", -] - -[[package]] -name = "rand_core" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" - -[[package]] -name = "rand_hc" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4" -dependencies = [ - "rand_core 0.3.1", -] - -[[package]] -name = "rand_isaac" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08" -dependencies = [ - "rand_core 0.3.1", -] - -[[package]] -name = "rand_jitter" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b" -dependencies = [ - "libc", - "rand_core 0.4.2", - "winapi 0.3.9", -] - -[[package]] -name = "rand_os" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071" -dependencies = [ - "cloudabi", - "fuchsia-cprng", - "libc", - "rand_core 0.4.2", - "rdrand", - "winapi 0.3.9", -] - -[[package]] -name = "rand_pcg" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44" -dependencies = [ - "autocfg 0.1.8", - "rand_core 0.4.2", -] - -[[package]] -name = "rand_xorshift" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c" -dependencies = [ - "rand_core 0.3.1", -] - -[[package]] -name = "rayon" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" -dependencies = [ - "either", - "rayon-core", -] - -[[package]] -name = "rayon-core" -version = "1.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" -dependencies = [ - "crossbeam-channel", - "crossbeam-deque 0.8.3", - "crossbeam-utils 0.8.15", - "num_cpus", -] - -[[package]] -name = "rdrand" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" -dependencies = [ - "rand_core 0.3.1", -] - -[[package]] -name = "redox_syscall" -version = "0.1.57" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" - -[[package]] -name = "redox_syscall" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" -dependencies = [ - "bitflags", -] - -[[package]] -name = "regex" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af83e617f331cc6ae2da5443c602dfa5af81e517212d9d611a5b3ba1777b5370" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5996294f19bd3aae0453a862ad728f60e6600695733dd5df01da90c54363a3c" - -[[package]] -name = "reqwest" -version = "0.9.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f88643aea3c1343c804950d7bf983bd2067f5ab59db6d613a08e05572f2714ab" -dependencies = [ - "base64", - "bytes", - "cookie", - "cookie_store", - "encoding_rs", - "flate2", - "futures", - "http", - "hyper", - "hyper-tls", - "log", - "mime", - "mime_guess", - "native-tls", - "serde", - "serde_json", - "serde_urlencoded", - "time", - "tokio", - "tokio-executor", - "tokio-io", - "tokio-threadpool", - "tokio-timer", - "url 1.7.2", - "uuid", - "winreg", -] - -[[package]] -name = "rustc-demangle" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" - -[[package]] -name = "rustc_version" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" -dependencies = [ - "semver", -] - -[[package]] -name = "rustix" -version = "0.37.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acf8729d8542766f1b2cf77eb034d52f40d375bb8b615d0b147089946e16613d" -dependencies = [ - "bitflags", - "errno", - "io-lifetimes", - "libc", - "linux-raw-sys", - "windows-sys 0.48.0", -] - -[[package]] -name = "ryu" -version = "1.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" - -[[package]] -name = "schannel" -version = "0.1.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" -dependencies = [ - "windows-sys 0.42.0", -] - -[[package]] -name = "scopeguard" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" - -[[package]] -name = "security-framework" -version = "2.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2855b3715770894e67cbfa3df957790aa0c9edc3bf06efa1a84d77fa0839d1" -dependencies = [ - "bitflags", - "core-foundation", - "core-foundation-sys", - "libc", - "security-framework-sys", -] - -[[package]] -name = "security-framework-sys" -version = "2.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f51d0c0d83bec45f16480d0ce0058397a69e48fcdc52d1dc8855fb68acbd31a7" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "semver" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" -dependencies = [ - "semver-parser", -] - -[[package]] -name = "semver-parser" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" - -[[package]] -name = "serde" -version = "1.0.163" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.163" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.15", -] - -[[package]] -name = "serde_json" -version = "1.0.96" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1" -dependencies = [ - "itoa 1.0.6", - "ryu", - "serde", -] - -[[package]] -name = "serde_urlencoded" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "642dd69105886af2efd227f75a520ec9b44a820d65bc133a9131f7d229fd165a" -dependencies = [ - "dtoa", - "itoa 0.4.8", - "serde", - "url 1.7.2", -] - -[[package]] -name = "slab" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" -dependencies = [ - "autocfg 1.1.0", -] - -[[package]] -name = "smallvec" -version = "0.6.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b97fcaeba89edba30f044a10c6a3cc39df9c3f17d7cd829dd1446cab35f890e0" -dependencies = [ - "maybe-uninit", -] - -[[package]] -name = "string" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d24114bfcceb867ca7f71a0d3fe45d45619ec47a6fbfa98cb14e14250bfa5d6d" -dependencies = [ - "bytes", -] - -[[package]] -name = "strsim" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" - -[[package]] -name = "structopt" -version = "0.3.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c6b5c64445ba8094a6ab0c3cd2ad323e07171012d9c98b0b15651daf1787a10" -dependencies = [ - "clap", - "lazy_static", - "structopt-derive", -] - -[[package]] -name = "structopt-derive" -version = "0.4.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0" -dependencies = [ - "heck", - "proc-macro-error", - "proc-macro2", - "quote", - "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.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "synstructure" -version = "0.12.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", - "unicode-xid", -] - -[[package]] -name = "tempfile" -version = "3.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998" -dependencies = [ - "cfg-if 1.0.0", - "fastrand", - "redox_syscall 0.3.5", - "rustix", - "windows-sys 0.45.0", -] - -[[package]] -name = "textwrap" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -dependencies = [ - "unicode-width", -] - -[[package]] -name = "time" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" -dependencies = [ - "libc", - "wasi", - "winapi 0.3.9", -] - -[[package]] -name = "tinyvec" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" -dependencies = [ - "tinyvec_macros", -] - -[[package]] -name = "tinyvec_macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" - -[[package]] -name = "tokio" -version = "0.1.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a09c0b5bb588872ab2f09afa13ee6e9dac11e10a0ec9e8e3ba39a5a5d530af6" -dependencies = [ - "bytes", - "futures", - "mio", - "num_cpus", - "tokio-current-thread", - "tokio-executor", - "tokio-io", - "tokio-reactor", - "tokio-tcp", - "tokio-threadpool", - "tokio-timer", -] - -[[package]] -name = "tokio-buf" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fb220f46c53859a4b7ec083e41dec9778ff0b1851c0942b211edb89e0ccdc46" -dependencies = [ - "bytes", - "either", - "futures", -] - -[[package]] -name = "tokio-current-thread" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1de0e32a83f131e002238d7ccde18211c0a5397f60cbfffcb112868c2e0e20e" -dependencies = [ - "futures", - "tokio-executor", -] - -[[package]] -name = "tokio-executor" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb2d1b8f4548dbf5e1f7818512e9c406860678f29c300cdf0ebac72d1a3a1671" -dependencies = [ - "crossbeam-utils 0.7.2", - "futures", -] - -[[package]] -name = "tokio-io" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57fc868aae093479e3131e3d165c93b1c7474109d13c90ec0dda2a1bbfff0674" -dependencies = [ - "bytes", - "futures", - "log", -] - -[[package]] -name = "tokio-reactor" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09bc590ec4ba8ba87652da2068d150dcada2cfa2e07faae270a5e0409aa51351" -dependencies = [ - "crossbeam-utils 0.7.2", - "futures", - "lazy_static", - "log", - "mio", - "num_cpus", - "parking_lot", - "slab", - "tokio-executor", - "tokio-io", - "tokio-sync", -] - -[[package]] -name = "tokio-sync" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edfe50152bc8164fcc456dab7891fa9bf8beaf01c5ee7e1dd43a397c3cf87dee" -dependencies = [ - "fnv", - "futures", -] - -[[package]] -name = "tokio-tcp" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98df18ed66e3b72e742f185882a9e201892407957e45fbff8da17ae7a7c51f72" -dependencies = [ - "bytes", - "futures", - "iovec", - "mio", - "tokio-io", - "tokio-reactor", -] - -[[package]] -name = "tokio-threadpool" -version = "0.1.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df720b6581784c118f0eb4310796b12b1d242a7eb95f716a8367855325c25f89" -dependencies = [ - "crossbeam-deque 0.7.4", - "crossbeam-queue", - "crossbeam-utils 0.7.2", - "futures", - "lazy_static", - "log", - "num_cpus", - "slab", - "tokio-executor", -] - -[[package]] -name = "tokio-timer" -version = "0.2.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93044f2d313c95ff1cb7809ce9a7a05735b012288a888b62d4434fd58c94f296" -dependencies = [ - "crossbeam-utils 0.7.2", - "futures", - "slab", - "tokio-executor", -] - -[[package]] -name = "try-lock" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" - -[[package]] -name = "try_from" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "283d3b89e1368717881a9d51dad843cc435380d8109c9e47d38780a324698d8b" -dependencies = [ - "cfg-if 0.1.10", -] - -[[package]] -name = "unicase" -version = "2.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" -dependencies = [ - "version_check", -] - -[[package]] -name = "unicode-bidi" -version = "0.3.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" - -[[package]] -name = "unicode-ident" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" - -[[package]] -name = "unicode-normalization" -version = "0.1.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "unicode-segmentation" -version = "1.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" - -[[package]] -name = "unicode-width" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" - -[[package]] -name = "unicode-xid" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" - -[[package]] -name = "url" -version = "1.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a" -dependencies = [ - "idna 0.1.5", - "matches", - "percent-encoding 1.0.1", -] - -[[package]] -name = "url" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" -dependencies = [ - "form_urlencoded", - "idna 0.3.0", - "percent-encoding 2.2.0", -] - -[[package]] -name = "uuid" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90dbc611eb48397705a6b0f6e917da23ae517e4d127123d2cf7674206627d32a" -dependencies = [ - "rand", -] - -[[package]] -name = "vcpkg" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" - -[[package]] -name = "vec_map" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "want" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6395efa4784b027708f7451087e647ec73cc74f5d9bc2e418404248d679a230" -dependencies = [ - "futures", - "log", - "try-lock", -] - -[[package]] -name = "wasi" -version = "0.10.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" - -[[package]] -name = "winapi" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-build" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "windows-sys" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" -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-sys" -version = "0.45.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" -dependencies = [ - "windows-targets 0.42.2", -] - -[[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.0", -] - -[[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.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" -dependencies = [ - "windows_aarch64_gnullvm 0.48.0", - "windows_aarch64_msvc 0.48.0", - "windows_i686_gnu 0.48.0", - "windows_i686_msvc 0.48.0", - "windows_x86_64_gnu 0.48.0", - "windows_x86_64_gnullvm 0.48.0", - "windows_x86_64_msvc 0.48.0", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" - -[[package]] -name = "windows_i686_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" - -[[package]] -name = "windows_i686_gnu" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" - -[[package]] -name = "windows_i686_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" - -[[package]] -name = "windows_i686_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" - -[[package]] -name = "winreg" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2986deb581c4fe11b621998a5e53361efe6b48a151178d0cd9eeffa4dc6acc9" -dependencies = [ - "winapi 0.3.9", -] - -[[package]] -name = "ws2_32-sys" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" -dependencies = [ - "winapi 0.2.8", - "winapi-build", -] diff --git a/pkgs/applications/version-management/git-backup/default.nix b/pkgs/applications/version-management/git-backup/default.nix deleted file mode 100644 index ac755e8866626..0000000000000 --- a/pkgs/applications/version-management/git-backup/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, Security }: - -rustPlatform.buildRustPackage rec { - pname = "git-backup"; - version = "0.2.0"; - - src = fetchFromGitHub { - owner = "jsdw"; - repo = pname; - rev = "v${version}"; - sha256 = "0h31j8clvk4gkw4mgva9p0ypf26zhf7f0y564fdmzyw6rsz9wzcj"; - }; - - cargoLock = { - lockFile = ./Cargo.lock; - }; - - nativeBuildInputs = [ pkg-config ]; - - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; - - # update Cargo.lock to work with openssl 3 - postPatch = '' - ln -sf ${./Cargo.lock} Cargo.lock - ''; - - meta = with lib; { - homepage = "https://github.com/jsdw/git-backup"; - description = "Tool to help you backup your git repositories from services like GitHub"; - license = licenses.mit; - maintainers = with maintainers; [ cafkafk ]; - mainProgram = "git-backup"; - }; -} diff --git a/pkgs/applications/version-management/git-bars/default.nix b/pkgs/applications/version-management/git-bars/default.nix index 79f103468dd81..66ae9bf2987bc 100644 --- a/pkgs/applications/version-management/git-bars/default.nix +++ b/pkgs/applications/version-management/git-bars/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, python3Packages, git }: +{ lib, fetchFromGitHub, python3Packages, git }: python3Packages.buildPythonApplication { pname = "git-bars"; diff --git a/pkgs/applications/version-management/git-branchless/default.nix b/pkgs/applications/version-management/git-branchless/default.nix index 44047945728a9..0e83d17d33a7a 100644 --- a/pkgs/applications/version-management/git-branchless/default.nix +++ b/pkgs/applications/version-management/git-branchless/default.nix @@ -1,57 +1,44 @@ -{ lib -, fetchFromGitHub -, fetchpatch -, git -, libiconv -, ncurses -, openssl -, pkg-config -, rustPlatform -, sqlite -, stdenv -, Security -, SystemConfiguration +{ + lib, + fetchFromGitHub, + git, + libiconv, + ncurses, + openssl, + pkg-config, + rustPlatform, + sqlite, + stdenv, + Security, + SystemConfiguration, }: rustPlatform.buildRustPackage rec { pname = "git-branchless"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "arxanas"; repo = "git-branchless"; rev = "v${version}"; - hash = "sha256-ev56NzrEF7xm3WmR2a0pHPs69Lvmb4He7+kIBYiJjKY="; + hash = "sha256-4RRSffkAe0/8k4SNnlB1iiaW4gWFTuYXplVBj2aRIdU="; }; - patches = [ - # Fix tests with Git 2.44.0+ - (fetchpatch { - name = "1245.patch"; # https://github.com/arxanas/git-branchless/pull/1245 - url = "https://github.com/arxanas/git-branchless/commit/c8436aed3d616409b4d6fb1eedb383077f435497.patch"; - hash = "sha256-gBm0A478Uhg9IQVLQppvIeTa8s1yHUMddxiUbpHUvGw="; - }) - # Fix tests with Git 2.44.0+ - (fetchpatch { - name = "1161.patch"; # https://github.com/arxanas/git-branchless/pull/1161 - url = "https://github.com/arxanas/git-branchless/commit/6e1f26900a0dd60d10d9aa3552cab9181fa7be03.patch"; - hash = "sha256-KHobEIXhlDar8CvIVUi4I695jcJZXgGRhU86b99x86Y="; - }) - ]; - - cargoHash = "sha256-Ppw5TN/6zMNxFAx90Q9hQ7RdGxV+TT8UlOm68ldK8oc="; + cargoHash = "sha256-Jg4d7tJXr2O1sEDdB/zk+7TPBZvgHlmW8mNiXozLKV8="; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - ncurses - openssl - sqlite - ] ++ lib.optionals stdenv.isDarwin [ - Security - SystemConfiguration - libiconv - ]; + buildInputs = + [ + ncurses + openssl + sqlite + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + Security + SystemConfiguration + libiconv + ]; postInstall = '' $out/bin/git-branchless install-man-pages $out/share/man @@ -73,6 +60,9 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/arxanas/git-branchless"; license = licenses.gpl2Only; mainProgram = "git-branchless"; - maintainers = with maintainers; [ nh2 hmenke ]; + maintainers = with maintainers; [ + nh2 + hmenke + ]; }; } diff --git a/pkgs/applications/version-management/git-bug/default.nix b/pkgs/applications/version-management/git-bug/default.nix index 588ef81ced00f..7db43130ab4c6 100644 --- a/pkgs/applications/version-management/git-bug/default.nix +++ b/pkgs/applications/version-management/git-bug/default.nix @@ -5,7 +5,7 @@ buildGoModule rec { version = "0.8.0"; src = fetchFromGitHub { - owner = "MichaelMure"; + owner = "git-bug"; repo = "git-bug"; rev = "v${version}"; sha256 = "12byf6nsamwz0ssigan1z299s01cyh8bhgj86bibl90agd4zs9n8"; @@ -36,9 +36,9 @@ buildGoModule rec { meta = with lib; { description = "Distributed bug tracker embedded in Git"; - homepage = "https://github.com/MichaelMure/git-bug"; + homepage = "https://github.com/git-bug/git-bug"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ royneary DeeUnderscore ]; + maintainers = with maintainers; [ royneary DeeUnderscore sudoforge ]; mainProgram = "git-bug"; }; } diff --git a/pkgs/applications/version-management/git-cinnabar/default.nix b/pkgs/applications/version-management/git-cinnabar/default.nix index 2d97b41cdd043..84a34601d40f9 100644 --- a/pkgs/applications/version-management/git-cinnabar/default.nix +++ b/pkgs/applications/version-management/git-cinnabar/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { curl zlib zstd - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv CoreServices ]; diff --git a/pkgs/applications/version-management/git-cliff/default.nix b/pkgs/applications/version-management/git-cliff/default.nix index 7307988693b63..25bcf4f1ca7cd 100644 --- a/pkgs/applications/version-management/git-cliff/default.nix +++ b/pkgs/applications/version-management/git-cliff/default.nix @@ -8,21 +8,21 @@ rustPlatform.buildRustPackage rec { pname = "git-cliff"; - version = "2.4.0"; + version = "2.6.0"; src = fetchFromGitHub { owner = "orhun"; repo = "git-cliff"; rev = "v${version}"; - hash = "sha256-JRFd84DR0pLimAslr+LTC2N09sjOuFCXU71hRsEriOs="; + hash = "sha256-GRvZ9jdooduFylTGgUQNjdnD2Aa+jT5faV0/c3GBpqw="; }; - cargoHash = "sha256-pLbz2z+l8E/R+GffseOacKrjr6ERZf1ETh8tVQjI4TU="; + cargoHash = "sha256-vgVTHTEKfjWJzxDQ5w0dwp9qxyN5sgbBseXHN25bx9o="; # attempts to run the program on .git in src which is not deterministic doCheck = false; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security SystemConfiguration ]; diff --git a/pkgs/applications/version-management/git-codeowners/default.nix b/pkgs/applications/version-management/git-codeowners/default.nix deleted file mode 100644 index 7ca69ccc3d4b7..0000000000000 --- a/pkgs/applications/version-management/git-codeowners/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ lib, rustPlatform, fetchFromGitHub }: -rustPlatform.buildRustPackage rec { - pname = "git-codeowners"; - version = "0.1.2"; - - src = fetchFromGitHub { - owner = "softprops"; - repo = "git-codeowners"; - rev = "v${version}"; - sha256 = "0bzq4ridzb4l1zqrj1r0vlzkjpgfaqwky5jf49cwjhz4ybwrfpkq"; - }; - - cargoSha256 = "00wi64v2zn8rp8fjwbdwyvl3pva5sn9xclaawp2m222dqnlszb2d"; - - meta = with lib; { - homepage = "https://github.com/softprops/git-codeowners"; - description = "Git extension to work with CODEOWNERS files"; - license = licenses.mit; - maintainers = with maintainers; [ zimbatm ]; - mainProgram = "git-codeowners"; - }; -} diff --git a/pkgs/applications/version-management/git-codereview/default.nix b/pkgs/applications/version-management/git-codereview/default.nix index a337443e87ead..a55fe7e3e7ed9 100644 --- a/pkgs/applications/version-management/git-codereview/default.nix +++ b/pkgs/applications/version-management/git-codereview/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "git-codereview"; - version = "1.11.0"; + version = "1.12.0"; src = fetchFromGitHub { owner = "golang"; repo = "review"; rev = "v${version}"; - hash = "sha256-fIvNaMfgwnMBUNo6kr37zhKiBgKNzT2E0dLLtqaVBvI="; + hash = "sha256-s3Re+LD3B8TAjamOSu66AfhaiIdcBoTjxEWxHEWSLPA="; }; vendorHash = null; diff --git a/pkgs/applications/version-management/git-cola/default.nix b/pkgs/applications/version-management/git-cola/default.nix index 870479f11f825..fac196e9ad0cd 100644 --- a/pkgs/applications/version-management/git-cola/default.nix +++ b/pkgs/applications/version-management/git-cola/default.nix @@ -10,17 +10,17 @@ python3Packages.buildPythonApplication rec { pname = "git-cola"; - version = "4.8.0"; + version = "4.8.2"; pyproject = true; src = fetchFromGitHub { owner = "git-cola"; repo = "git-cola"; rev = "v${version}"; - hash = "sha256-sm/a790PiSqGYbftxvLiLMifKbMyi3a5Rvlhr9plyrU="; + hash = "sha256-8OErZ6uKTWE245BoBu9lQyTLA43DfWaYDv3wbPWaufg="; }; - buildInputs = lib.optionals stdenv.isLinux [ + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ qt5.qtwayland ]; @@ -47,7 +47,7 @@ python3Packages.buildPythonApplication rec { disabledTestPaths = [ "qtpy/" "contrib/win32" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "cola/inotify.py" ]; @@ -64,5 +64,6 @@ python3Packages.buildPythonApplication rec { description = "Sleek and powerful Git GUI"; license = licenses.gpl2; maintainers = [ maintainers.bobvanderlinden ]; + mainProgram = "git-cola"; }; } diff --git a/pkgs/applications/version-management/git-credential-keepassxc/default.nix b/pkgs/applications/version-management/git-credential-keepassxc/default.nix index 2d3e511fcbfdf..3a85cff455b81 100644 --- a/pkgs/applications/version-management/git-credential-keepassxc/default.nix +++ b/pkgs/applications/version-management/git-credential-keepassxc/default.nix @@ -12,18 +12,18 @@ rustPlatform.buildRustPackage rec { pname = "git-credential-keepassxc"; - version = "0.14.0"; + version = "0.14.1"; src = fetchFromGitHub { owner = "Frederick888"; repo = "git-credential-keepassxc"; rev = "v${version}"; - hash = "sha256-AvnnzLiDQEdfAHPns8ufhdiPPn9d23AnI8Aq2DQS+To="; + hash = "sha256-qxNzWuuIoK9BJLVcWtrER+MyA5cyd03xAwGljh8DZC4="; }; - cargoHash = "sha256-c2YucWs0UzyWDKWS5KebT3ps+XvWzlI0+ziJ8JX6oiQ="; + cargoHash = "sha256-jBUp0jes4wtr8cmqceEBb6noqGkJUHbIfYgWOw5KMF4="; - buildInputs = lib.optionals stdenv.isDarwin [ DiskArbitration Foundation ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ DiskArbitration Foundation ]; buildFeatures = [] ++ lib.optional withNotification "notification" diff --git a/pkgs/applications/version-management/git-credential-manager/default.nix b/pkgs/applications/version-management/git-credential-manager/default.nix index b749ce8c6e312..c9df6aff549ab 100644 --- a/pkgs/applications/version-management/git-credential-manager/default.nix +++ b/pkgs/applications/version-management/git-credential-manager/default.nix @@ -2,43 +2,36 @@ , fetchFromGitHub , buildDotnetModule , dotnetCorePackages -, libX11 -, libICE -, libSM -, fontconfig , libsecret , git , git-credential-manager , gnupg , pass , testers -, withGuiSupport ? true , withLibsecretSupport ? true , withGpgSupport ? true }: -assert withLibsecretSupport -> withGuiSupport; buildDotnetModule rec { pname = "git-credential-manager"; - version = "2.4.1"; + version = "2.5.1"; src = fetchFromGitHub { owner = "git-ecosystem"; repo = "git-credential-manager"; rev = "v${version}"; - hash = "sha256-Uf0EXaGM4k9Aanz16B9xA2EcseXTI9lLCws/ZVNb3e8="; + hash = "sha256-fD/HToyreYS8PG85CHHLPQOUKV1cDYGukxyVOr+7cKk="; }; 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 ] - ++ lib.optionals withGuiSupport [ libX11 libICE libSM ] - ++ lib.optional withLibsecretSupport libsecret; + runtimeDeps = + lib.optional withLibsecretSupport libsecret; makeWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath ([ git ] ++ lib.optionals withGpgSupport [ gnupg pass ])}" ]; diff --git a/pkgs/applications/version-management/git-credential-manager/deps.nix b/pkgs/applications/version-management/git-credential-manager/deps.nix index 053da15bd50c0..b22825173ddb0 100644 --- a/pkgs/applications/version-management/git-credential-manager/deps.nix +++ b/pkgs/applications/version-management/git-credential-manager/deps.nix @@ -2,111 +2,107 @@ # Please dont edit it manually, your changes might get overwritten! { fetchNuGet }: [ - (fetchNuGet { pname = "Avalonia"; version = "11.0.4"; sha256 = "0jid0x90dc8m609wqwbq87014yzih2iimz74wm6zi1j02k080jk0"; }) - (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 = "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"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "3.8.0"; sha256 = "1kmry65csvfn72zzc16vj1nfbfwam28wcmlrk3m5rzb8ydbzgylb"; }) - (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.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"; }) - (fetchNuGet { pname = "runtime.any.System.Reflection"; version = "4.3.0"; sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"; }) - (fetchNuGet { pname = "runtime.any.System.Reflection.Extensions"; version = "4.3.0"; sha256 = "0zyri97dfc5vyaz9ba65hjj1zbcrzaffhsdlpxc9bh09wy22fq33"; }) - (fetchNuGet { pname = "runtime.any.System.Reflection.Primitives"; version = "4.3.0"; sha256 = "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf"; }) - (fetchNuGet { pname = "runtime.any.System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl"; }) - (fetchNuGet { pname = "runtime.any.System.Runtime"; version = "4.3.0"; sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"; }) - (fetchNuGet { pname = "runtime.any.System.Runtime.Handles"; version = "4.3.0"; sha256 = "0bh5bi25nk9w9xi8z23ws45q5yia6k7dg3i4axhfqlnj145l011x"; }) - (fetchNuGet { pname = "runtime.any.System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19"; }) - (fetchNuGet { pname = "runtime.any.System.Text.Encoding"; version = "4.3.0"; sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"; }) - (fetchNuGet { pname = "runtime.any.System.Threading.Tasks"; version = "4.3.0"; sha256 = "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va"; }) - (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; }) - (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; }) - (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; }) - (fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; }) - (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; }) - (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"; }) - (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf"; }) - (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3"; }) - (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn"; }) - (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"; }) - (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"; }) - (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; }) - (fetchNuGet { pname = "runtime.unix.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 = "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.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"; }) - (fetchNuGet { pname = "System.Memory"; version = "4.5.4"; sha256 = "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y"; }) - (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.5.0"; sha256 = "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59"; }) - (fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; }) - (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; }) - (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; }) - (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.3.0"; sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; }) - (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; }) - (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.3.0"; sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; }) - (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; }) - (fetchNuGet { pname = "System.Reflection.Metadata"; version = "5.0.0"; sha256 = "17qsl5nanlqk9iz0l5wijdn6ka632fs1m1fvx18dfgswm258r3ss"; }) - (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; }) - (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.3.0"; sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; }) - (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.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"; }) - (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) - (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; sha256 = "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153"; }) - (fetchNuGet { pname = "Tmds.DBus.Protocol"; version = "0.15.0"; sha256 = "0d99kcs7r9cp6gpyc7z230czkkyx4164x86dhy0mca73f2ykc2g2"; }) + (fetchNuGet { pname = "Avalonia"; version = "11.0.11"; hash = "sha256-vyX1hwqHQBIckXl/IYctR7BtYzM/62iZ6Y3Hsrlgww8="; }) + (fetchNuGet { pname = "Avalonia.Angle.Windows.Natives"; version = "2.1.0.2023020321"; hash = "sha256-TWop9cvak6cMv2vrA/GlpuYBxS8Fuj5UmupGIV7Q5Ks="; }) + (fetchNuGet { pname = "Avalonia.BuildServices"; version = "0.0.29"; hash = "sha256-WPHRMNowRnYSCh88DWNBCltWsLPyOfzXGzBqLYE7tRY="; }) + (fetchNuGet { pname = "Avalonia.Controls.ColorPicker"; version = "11.0.11"; hash = "sha256-eP8mwZx8kBOOXqy+rBzdhkNiI3g5u5CyYFXoNHWcMFg="; }) + (fetchNuGet { pname = "Avalonia.Controls.DataGrid"; version = "11.0.11"; hash = "sha256-PPs+D+dJ0OTay8gzDcucjWjfQWiizTHAluquzsFicZ4="; }) + (fetchNuGet { pname = "Avalonia.Desktop"; version = "11.0.11"; hash = "sha256-62JpECNZV60qiS1KCTm9ojnUXOx5yEP4Mjo3/OZszMQ="; }) + (fetchNuGet { pname = "Avalonia.Diagnostics"; version = "11.0.11"; hash = "sha256-OHh3hyB7EWZE2nPK7U6z+4MEbYPAdbW4G74poWUSDcc="; }) + (fetchNuGet { pname = "Avalonia.FreeDesktop"; version = "11.0.11"; hash = "sha256-fVM+D16obEbRwRu+QF617jpQQWiHpA/Lzx2m0qK7BZ4="; }) + (fetchNuGet { pname = "Avalonia.Native"; version = "11.0.11"; hash = "sha256-8Co6wR74u5jdAeN0Fx7LJf8vOUt84auomZz3TFSdlWw="; }) + (fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "11.0.11"; hash = "sha256-A4X9fY26YtydAn4TjJ7bYdBi7R+Ncghr4F2DTl/Riaw="; }) + (fetchNuGet { pname = "Avalonia.Skia"; version = "11.0.11"; hash = "sha256-s5fmFi207DZVRejw5PlvnPsdo9voet/l2VJtgwLDJYs="; }) + (fetchNuGet { pname = "Avalonia.Themes.Fluent"; version = "11.0.11"; hash = "sha256-cvLzWHt2P2dmJ690mv0wejk2VCa0n1xX4sYCim+7Gxo="; }) + (fetchNuGet { pname = "Avalonia.Themes.Simple"; version = "11.0.11"; hash = "sha256-y1BlGzCP03Waq9bVzKGVFr2L/1/rdpBeyHuHbB0kTbk="; }) + (fetchNuGet { pname = "Avalonia.Win32"; version = "11.0.11"; hash = "sha256-NvAN79jLjoqZrp5yWkJoihjO83r49j8N57PAWDY/kwE="; }) + (fetchNuGet { pname = "Avalonia.X11"; version = "11.0.11"; hash = "sha256-1hsU8zBxQGUp/wAx3qSQfxte+fGsSmH9TN3OHW0rNOk="; }) + (fetchNuGet { pname = "HarfBuzzSharp"; version = "7.3.0"; hash = "sha256-LlPQO/NYgIMWicvLOtWsQzCp512QpIImYDP9/n2rDOc="; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Linux"; version = "7.3.0"; hash = "sha256-AEHjgqX0o+Fob0SeZ6EikGKoEe6rRxess5fVJ31UL0U="; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "7.3.0"; hash = "sha256-6oFcdKb17UX5wyAUeCCKXGvzkf0w3MNdZOVMvs54tqw="; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.WebAssembly"; version = "7.3.0"; hash = "sha256-9VI0xCavuuIIStuQ7ipBfWu5HrAt+Kk/F2j57C1llTU="; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "7.3.0"; hash = "sha256-WnB7l73hneU9Kpbm8S9zEYbZHjFre24vWz0vl8+v28M="; }) + (fetchNuGet { pname = "MicroCom.Runtime"; version = "0.11.0"; hash = "sha256-VdwpP5fsclvNqJuppaOvwEwv2ofnAI5ZSz2V+UEdLF0="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.0.0"; hash = "sha256-KDbCfsBWSJ5ohEXUKp1s1LX9xA2NPvXE/xVzj68EdC0="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "3.8.0"; hash = "sha256-3G9vSc/gHH7FWgOySLTut1+eEaf3H66qcPOvNPLOx4o="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "3.8.0"; hash = "sha256-i/r3V/No/VzqmJlWxpGoirvlbJDbBPa/ONZtzYrxuc4="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Scripting"; version = "3.8.0"; hash = "sha256-fA9Qu+vTyMZ9REzxJ4aMg/SHCDRk4q9k4ZGUdynoHnA="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Scripting.Common"; version = "3.8.0"; hash = "sha256-866jMHp8kbc1FYpKuUWnd7ViU6kGJTAxPcL/IjXrT0I="; }) + (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.3.0"; hash = "sha256-a3dAiPaVuky0wpcHmpTVtAQJNGZ2v91/oArA+dpJgj8="; }) + (fetchNuGet { pname = "Microsoft.Identity.Client"; version = "4.61.3"; hash = "sha256-1cccC8EWlIQlJ3SSOB7CNImOYSaxsJpRHvlCgv2yOtA="; }) + (fetchNuGet { pname = "Microsoft.Identity.Client.Extensions.Msal"; version = "4.61.3"; hash = "sha256-nFQ2C7S4BQ4nvQmGAc5Ar7/ynKyztvK7fPKrpJXaQFE="; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "6.35.0"; hash = "sha256-bxyYu6/QgaA4TQYBr5d+bzICL+ktlkdy/tb/1fBu00Q="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; hash = "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.1.2"; hash = "sha256-gYQQO7zsqG+OtN4ywYQyfsiggS2zmxw4+cPXlK+FB5Q="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; hash = "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ="; }) + (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; hash = "sha256-4PGZqyWhZ6/HCTF2KddDsbmTTjxs2oW79YfkberDZS8="; }) + (fetchNuGet { pname = "runtime.any.System.Globalization"; version = "4.3.0"; hash = "sha256-PaiITTFI2FfPylTEk7DwzfKeiA/g/aooSU1pDcdwWLU="; }) + (fetchNuGet { pname = "runtime.any.System.IO"; version = "4.3.0"; hash = "sha256-vej7ySRhyvM3pYh/ITMdC25ivSd0WLZAaIQbYj/6HVE="; }) + (fetchNuGet { pname = "runtime.any.System.Reflection"; version = "4.3.0"; hash = "sha256-ns6f++lSA+bi1xXgmW1JkWFb2NaMD+w+YNTfMvyAiQk="; }) + (fetchNuGet { pname = "runtime.any.System.Reflection.Extensions"; version = "4.3.0"; hash = "sha256-Y2AnhOcJwJVYv7Rp6Jz6ma0fpITFqJW+8rsw106K2X8="; }) + (fetchNuGet { pname = "runtime.any.System.Reflection.Primitives"; version = "4.3.0"; hash = "sha256-LkPXtiDQM3BcdYkAm5uSNOiz3uF4J45qpxn5aBiqNXQ="; }) + (fetchNuGet { pname = "runtime.any.System.Resources.ResourceManager"; version = "4.3.0"; hash = "sha256-9EvnmZslLgLLhJ00o5MWaPuJQlbUFcUF8itGQNVkcQ4="; }) + (fetchNuGet { pname = "runtime.any.System.Runtime"; version = "4.3.0"; hash = "sha256-qwhNXBaJ1DtDkuRacgHwnZmOZ1u9q7N8j0cWOLYOELM="; }) + (fetchNuGet { pname = "runtime.any.System.Runtime.Handles"; version = "4.3.0"; hash = "sha256-PQRACwnSUuxgVySO1840KvqCC9F8iI9iTzxNW0RcBS4="; }) + (fetchNuGet { pname = "runtime.any.System.Runtime.InteropServices"; version = "4.3.0"; hash = "sha256-Kaw5PnLYIiqWbsoF3VKJhy7pkpoGsUwn4ZDCKscbbzA="; }) + (fetchNuGet { pname = "runtime.any.System.Text.Encoding"; version = "4.3.0"; hash = "sha256-Q18B9q26MkWZx68exUfQT30+0PGmpFlDgaF0TnaIGCs="; }) + (fetchNuGet { pname = "runtime.any.System.Threading.Tasks"; version = "4.3.0"; hash = "sha256-agdOM0NXupfHbKAQzQT8XgbI9B8hVEh+a/2vqeHctg4="; }) + (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-LXUPLX3DJxsU1Pd3UwjO1PO9NM2elNEDXeu2Mu/vNps="; }) + (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-qeSqaUI80+lqw5MK4vMpmO0CZaqrmYktwp6L+vQAb0I="; }) + (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-SrHqT9wrCBsxILWtaJgGKd6Odmxm8/Mh7Kh0CUkZVzA="; }) + (fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; hash = "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y="; }) + (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-Jy01KhtcCl2wjMpZWH+X3fhHcVn+SyllWFY8zWlz/6I="; }) + (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-wyv00gdlqf8ckxEdV7E+Ql9hJIoPcmYEuyeWb5Oz3mM="; }) + (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-zi+b4sCFrA9QBiSGDD7xPV27r3iHGlV99gpyVUjRmc4="; }) + (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-gybQU6mPgaWV3rBG2dbH6tT3tBq8mgze3PROdsuWnX0="; }) + (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-VsP72GVveWnGUvS/vjOQLv1U80H2K8nZ4fDAmI61Hm4="; }) + (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-4yKGa/IrNCKuQ3zaDzILdNPD32bNdy6xr5gdJigyF5g="; }) + (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-HmdJhhRsiVoOOCcUvAwdjpMRiyuSwdcgEv2j9hxi+Zc="; }) + (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-pVFUKuPPIx0edQKjzRon3zKq8zhzHEzko/lc01V/jdw="; }) + (fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; hash = "sha256-ReoazscfbGH+R6s6jkg5sIEHWNEvjEoHtIsMbpc7+tI="; }) + (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; hash = "sha256-c5tXWhE/fYbJVl9rXs0uHh3pTsg44YD1dJvyOA0WoMs="; }) + (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; hash = "sha256-l8S9gt6dk3qYG6HYonHtdlYtBKyPb29uQ6NDjmrt3V4="; }) + (fetchNuGet { pname = "SkiaSharp"; version = "2.88.7"; hash = "sha256-Ip3afwTr4QOqtwOUKqK6g/9Ug4dMSebTci5K29Jc3Dg="; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.88.7"; hash = "sha256-QdQRN1IBjqohmI8U+6WJRPgOsh8a9soN2UvVObs1H1w="; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.7"; hash = "sha256-WgPldXSqPMm0TrdUWAyjge5rcRhd9G3/Ix/v/2NQvBc="; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.WebAssembly"; version = "2.88.7"; hash = "sha256-oIjFF+Rv+g8AKyNaaVAgnHX3eeP/l8K2sgHs9bRyUMw="; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.7"; hash = "sha256-+7RxCAr+ne9MZWdXKKpV4ZbHW0k6hLD20ZFWWOCiNYU="; }) + (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; hash = "sha256-afY7VUtD6w/5mYqrce8kQrvDIfS2GXDINDh73IjxJKc="; }) + (fetchNuGet { pname = "System.Collections.Immutable"; version = "5.0.0"; hash = "sha256-GdwSIjLMM0uVfE56VUSLVNgpW0B//oCeSFj8/hSlbM8="; }) + (fetchNuGet { pname = "System.CommandLine"; version = "2.0.0-beta4.22272.1"; hash = "sha256-zSO+CYnMH8deBHDI9DHhCPj79Ce3GOzHCyH1/TiHxcc="; }) + (fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "4.5.0"; hash = "sha256-15yE2NoT9vmL9oGCaxHClQR1jLW1j1ef5hHMg55xRso="; }) + (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; hash = "sha256-fkA79SjPbSeiEcrbbUsb70u9B7wqbsdM9s1LnoKj0gM="; }) + (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "6.0.1"; hash = "sha256-Xi8wrUjVlioz//TPQjFHqcV/QGhTqnTfUcltsNlcCJ4="; }) + (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.3.0"; hash = "sha256-k75gjOYimIQtLBD5NDzwwi3ZMUBPRW3jmc3evDMMJbU="; }) + (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; hash = "sha256-caL0pRmFSEsaoeZeWN5BTQtGrAtaQPwFi8YOZPZG5rI="; }) + (fetchNuGet { pname = "System.IO"; version = "4.3.0"; hash = "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY="; }) + (fetchNuGet { pname = "System.IO.Pipelines"; version = "6.0.0"; hash = "sha256-xfjF4UqTMJpf8KsBWUyJlJkzPTOO/H5MW023yTYNQSA="; }) + (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; hash = "sha256-R5uiSL3l6a3XrXSSL6jz+q/PcyVQzEAByiuXZNSqD/A="; }) + (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; hash = "sha256-+3pvhZY7rip8HCbfdULzjlC9FPZFpYoQxhkcuFm2wk8="; }) + (fetchNuGet { pname = "System.Memory"; version = "4.5.4"; hash = "sha256-3sCEfzO4gj5CYGctl9ZXQRRhwAraMQfse7yzKoRe65E="; }) + (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.5.0"; hash = "sha256-qdSTIFgf2htPS+YhLGjAGiLN8igCYJnCCo6r78+Q+c8="; }) + (fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; hash = "sha256-gtmRkWP2Kwr3nHtDh0yYtce38z1wrGzb6fjm4v8wN6Q="; }) + (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; hash = "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM="; }) + (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; hash = "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY="; }) + (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.3.0"; hash = "sha256-5LhkDmhy2FkSxulXR+bsTtMzdU3VyyuZzsxp7/DwyIU="; }) + (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; hash = "sha256-mKRknEHNls4gkRwrEgi39B+vSaAz/Gt3IALtS98xNnA="; }) + (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.3.0"; hash = "sha256-rKx4a9yZKcajloSZHr4CKTVJ6Vjh95ni+zszPxWjh2I="; }) + (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; hash = "sha256-mMOCYzUenjd4rWIfq7zIX9PFYk/daUyF0A8l1hbydAk="; }) + (fetchNuGet { pname = "System.Reflection.Metadata"; version = "5.0.0"; hash = "sha256-Wo+MiqhcP9dQ6NuFGrQTw6hpbJORFwp+TBNTq2yhGp8="; }) + (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; hash = "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM="; }) + (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.3.0"; hash = "sha256-4U4/XNQAnddgQIHIJq3P2T80hN0oPdU2uCeghsDTWng="; }) + (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; hash = "sha256-idiOD93xbbrbwwSnD4mORA9RYi/D/U48eRUsn/WnWGo="; }) + (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; hash = "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg="; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.7.1"; hash = "sha256-UvyoDV8O0oY3HPG1GbA56YVdvwTGEfjYR5gW1O7IK4U="; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; hash = "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I="; }) + (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; hash = "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o="; }) + (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; hash = "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms="; }) + (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; hash = "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI="; }) + (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "4.5.0"; hash = "sha256-Z+X1Z2lErLL7Ynt2jFszku6/IgrngO3V1bSfZTBiFIc="; }) + (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; hash = "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg="; }) + (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "4.5.1"; hash = "sha256-PIhkv59IXjyiuefdhKxS9hQfEwO9YWRuNudpo53HQfw="; }) + (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; hash = "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc="; }) + (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; hash = "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w="; }) + (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; hash = "sha256-owSpY8wHlsUXn5xrfYAiu847L6fAKethlvYx97Ri1ng="; }) + (fetchNuGet { pname = "Tmds.DBus.Protocol"; version = "0.15.0"; hash = "sha256-4gk2vXDjKFaBh82gTkwg3c/5GRjiH+bvM5elfDSbKTU="; }) ] diff --git a/pkgs/applications/version-management/git-credential-oauth/default.nix b/pkgs/applications/version-management/git-credential-oauth/default.nix index 62489b6ee2498..3ad36969f94df 100644 --- a/pkgs/applications/version-management/git-credential-oauth/default.nix +++ b/pkgs/applications/version-management/git-credential-oauth/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "git-credential-oauth"; - version = "0.12.1"; + version = "0.13.2"; src = fetchFromGitHub { owner = "hickford"; repo = pname; rev = "v${version}"; - hash = "sha256-iDnTjrVDH8qBYkvNjLHYmTaK8vScluDM4+W/5Rdo+Xc="; + hash = "sha256-pJ1Snq79bQvhE+D7U8pMmK4YyvoZIwv29kr5640jpns="; }; nativeBuildInputs = [ installShellFiles ]; @@ -19,7 +19,7 @@ buildGoModule rec { "-X main.version=${version}" ]; - vendorHash = "sha256-nbwrVihcH+ARLHylsjogsv3LVP+0+YtQ+7cozB7pAWo="; + vendorHash = "sha256-ujsfEmDOOGCNErtBW5EyefQ+jXhfnAiwteYm8F7RLVE="; postInstall = '' installManPage $src/git-credential-oauth.1 diff --git a/pkgs/applications/version-management/git-dive/default.nix b/pkgs/applications/version-management/git-dive/default.nix index c0209c38cfa9e..b80397e142bf4 100644 --- a/pkgs/applications/version-management/git-dive/default.nix +++ b/pkgs/applications/version-management/git-dive/default.nix @@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec { libgit2 oniguruma zlib - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/applications/version-management/git-extras/default.nix b/pkgs/applications/version-management/git-extras/default.nix index adb36257188cd..2e10c633b02a9 100644 --- a/pkgs/applications/version-management/git-extras/default.nix +++ b/pkgs/applications/version-management/git-extras/default.nix @@ -42,6 +42,6 @@ stdenv.mkDerivation rec { description = "GIT utilities -- repo summary, repl, changelog population, author commit percentages and more"; license = licenses.mit; platforms = platforms.all; - maintainers = with maintainers; [ cko SuperSandro2000 ]; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } diff --git a/pkgs/applications/version-management/git-gone/default.nix b/pkgs/applications/version-management/git-gone/default.nix index 884eeb893ac41..1cc039a09fc63 100644 --- a/pkgs/applications/version-management/git-gone/default.nix +++ b/pkgs/applications/version-management/git-gone/default.nix @@ -8,20 +8,20 @@ rustPlatform.buildRustPackage rec { pname = "git-gone"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "swsnr"; repo = "git-gone"; rev = "v${version}"; - hash = "sha256-Mc9/P4VBmLOC05xqdx/yopbhvdpQS3uejc4YA7BIgug="; + hash = "sha256-j88ZnJ0V8h/fthOWwV6B0ZbzUz7THykqrI2QpOkDT4I="; }; - cargoHash = "sha256-NyyficEDJReMLAw2VAK2fOXNIwHilnUqQRACGck+0Vo="; + cargoHash = "sha256-H41wpG5LhjJ7BtFrol0JbjTpssOPUgumgapOiZJi2lc="; nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; postInstall = '' installManPage git-gone.1 diff --git a/pkgs/applications/version-management/git-graph/default.nix b/pkgs/applications/version-management/git-graph/default.nix index 016892892247d..e801cb0e23bf0 100644 --- a/pkgs/applications/version-management/git-graph/default.nix +++ b/pkgs/applications/version-management/git-graph/default.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { description = "Command line tool to show clear git graphs arranged for your branching model"; homepage = "https://github.com/mlange-42/git-graph"; license = licenses.mit; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; maintainers = with maintainers; [ cafkafk ]; mainProgram = "git-graph"; }; diff --git a/pkgs/applications/version-management/git-ignore/default.nix b/pkgs/applications/version-management/git-ignore/default.nix index b32b1aa52161b..12f4f02fd0a20 100644 --- a/pkgs/applications/version-management/git-ignore/default.nix +++ b/pkgs/applications/version-management/git-ignore/default.nix @@ -8,22 +8,22 @@ rustPlatform.buildRustPackage rec { pname = "git-ignore"; - version = "1.3.3"; + version = "1.4.0"; src = fetchFromGitHub { owner = "sondr3"; repo = pname; rev = "v${version}"; - hash = "sha256-OVKRNj3tRi/PGY1m4rdpmH87laYzTkCiwoBc3txVJ3U="; + hash = "sha256-KIdhsbD9v2kCM2C/kSJCleyniEz4Bw7UxBsF762fnJs="; }; - cargoHash = "sha256-dAQKL+sMThpTqBoN5MZvm8tQUJhaSH7lT8DwbjzFq40="; + cargoHash = "sha256-UicChl0wD2GSCCHAqF4/FKVq15g9qusNOnNJJW2B/nw="; nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/applications/version-management/git-interactive-rebase-tool/default.nix b/pkgs/applications/version-management/git-interactive-rebase-tool/default.nix index 366f34e10d408..835b6ddf8514e 100644 --- a/pkgs/applications/version-management/git-interactive-rebase-tool/default.nix +++ b/pkgs/applications/version-management/git-interactive-rebase-tool/default.nix @@ -2,18 +2,18 @@ rustPlatform.buildRustPackage rec { pname = "git-interactive-rebase-tool"; - version = "2.4.0"; + version = "2.4.1"; src = fetchFromGitHub { owner = "MitMaro"; repo = pname; rev = version; - hash = "sha256-xwvL6QX+eMbxCouE1i86j/PRCxTJVAQnRVeK6fYQo/M="; + hash = "sha256-NlnESZua4OP7rhMoER/VgBST9THqISQ0LCG1ZakNTqs="; }; - cargoHash = "sha256-RDGbsmOBVMxInstTrRZK0G5eZR79ZoFK5UlkCj3zpoY="; + cargoHash = "sha256-9pUUKxPpyoX9f10ZiLWsol2rv66WzQqwa6VubRTrT9Y="; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv Security ]; # Compilation during tests fails if this env var is not set. preCheck = "export GIRT_BUILD_GIT_HASH=${version}"; diff --git a/pkgs/applications/version-management/git-machete/default.nix b/pkgs/applications/version-management/git-machete/default.nix index e8efa81e217b2..a8dc37f177efb 100644 --- a/pkgs/applications/version-management/git-machete/default.nix +++ b/pkgs/applications/version-management/git-machete/default.nix @@ -6,19 +6,17 @@ , installShellFiles , git , nix-update-script -, testers -, git-machete }: buildPythonApplication rec { pname = "git-machete"; - version = "3.26.0"; + version = "3.29.3"; src = fetchFromGitHub { owner = "virtuslab"; repo = pname; rev = "v${version}"; - hash = "sha256-6q0XunfzURfcvce/BLtJhDeI1fPusN+07S1SegLDkwY="; + hash = "sha256-3GXTdIXITZeDqe6gxwOCaFXwITYYfXTy57H2AHA5Zyc="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/version-management/git-mit/default.nix b/pkgs/applications/version-management/git-mit/default.nix index d8af866b64e87..2dc3ab74a05d4 100644 --- a/pkgs/applications/version-management/git-mit/default.nix +++ b/pkgs/applications/version-management/git-mit/default.nix @@ -10,7 +10,7 @@ }: let - version = "5.12.205"; + version = "5.13.29"; in rustPlatform.buildRustPackage { pname = "git-mit"; @@ -20,10 +20,10 @@ rustPlatform.buildRustPackage { owner = "PurpleBooth"; repo = "git-mit"; rev = "v${version}"; - hash = "sha256-I9tIw7ZtQ85L1Pt0+/CxugtmnClbEbn4xKjSkBqBa0o="; + hash = "sha256-8XUpUpsd2q/1N28ZAPt7rW0pJu0WzE6oVSOwdJxhSBk="; }; - cargoHash = "sha256-GWoh//sHhIVxmFuyAHRot/JG5wL3Zn2yIeRncaPENN4="; + cargoHash = "sha256-KtdbYzXHpdg0Rf4ENrWpP0+vG3+HlLVi7MLeXp9HoVw="; nativeBuildInputs = [ pkg-config ]; @@ -31,7 +31,7 @@ rustPlatform.buildRustPackage { libgit2 openssl zlib - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit ]; diff --git a/pkgs/applications/version-management/git-my/default.nix b/pkgs/applications/version-management/git-my/default.nix deleted file mode 100644 index 2683af4022877..0000000000000 --- a/pkgs/applications/version-management/git-my/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, stdenv, fetchFromGitHub }: - -stdenv.mkDerivation rec { - pname = "git-my"; - version = "1.1.2"; - - src = fetchFromGitHub { - owner = "davidosomething"; - repo = "git-my"; - rev = version; - sha256 = "0jji5zw25jygj7g4f6f3k0p0s9g37r8iad8pa0s67cxbq2v4sc0v"; - }; - - dontBuild = true; - - installPhase = '' - install -Dm755 -t "$out"/bin ./git-my - ''; - - meta = with lib; { - description = - "List remote branches if they're merged and/or available locally"; - homepage = "https://github.com/davidosomething/git-my"; - license = licenses.free; - maintainers = with maintainers; [ bb010g ]; - platforms = platforms.all; - mainProgram = "git-my"; - }; -} - diff --git a/pkgs/applications/version-management/git-nomad/default.nix b/pkgs/applications/version-management/git-nomad/default.nix index 941b84b68fcc3..566a032f9b208 100644 --- a/pkgs/applications/version-management/git-nomad/default.nix +++ b/pkgs/applications/version-management/git-nomad/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-7CZC29y9dLpyanolO+epKd0KwmRc1iGY+sPM9f/j5hk="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; diff --git a/pkgs/applications/version-management/git-octopus/default.nix b/pkgs/applications/version-management/git-octopus/default.nix index 877c795e205dd..3865c9ac83b88 100644 --- a/pkgs/applications/version-management/git-octopus/default.nix +++ b/pkgs/applications/version-management/git-octopus/default.nix @@ -1,7 +1,5 @@ { lib, stdenv, fetchFromGitHub, git, perl, makeWrapper }: -with lib; - stdenv.mkDerivation rec { pname = "git-octopus"; version = "1.4"; @@ -13,7 +11,7 @@ stdenv.mkDerivation rec { # perl provides shasum postInstall = '' for f in $out/bin/*; do - wrapProgram $f --prefix PATH : ${makeBinPath [ git perl ]} + wrapProgram $f --prefix PATH : ${lib.makeBinPath [ git perl ]} done ''; @@ -24,7 +22,7 @@ stdenv.mkDerivation rec { sha256 = "14p61xk7jankp6gc26xciag9fnvm7r9vcbhclcy23f4ghf4q4sj1"; }; - meta = { + meta = with lib; { homepage = "https://github.com/lesfurets/git-octopus"; description = "Continuous merge workflow"; license = licenses.lgpl3; diff --git a/pkgs/applications/version-management/git-open/default.nix b/pkgs/applications/version-management/git-open/default.nix index 29975c5b68d0b..1b4153f2ad1d8 100644 --- a/pkgs/applications/version-management/git-open/default.nix +++ b/pkgs/applications/version-management/git-open/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, git, xdg-utils, gnugrep, fetchFromGitHub, installShellFiles, makeWrapper, pandoc }: +{ lib, stdenv, xdg-utils, gnugrep, fetchFromGitHub, installShellFiles, makeWrapper, pandoc }: stdenv.mkDerivation rec { pname = "git-open"; diff --git a/pkgs/applications/version-management/git-quick-stats/default.nix b/pkgs/applications/version-management/git-quick-stats/default.nix index 99be76387bd88..113388c48cd30 100644 --- a/pkgs/applications/version-management/git-quick-stats/default.nix +++ b/pkgs/applications/version-management/git-quick-stats/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "git-quick-stats"; - version = "2.5.6"; + version = "2.5.7"; src = fetchFromGitHub { repo = "git-quick-stats"; owner = "arzzen"; rev = version; - sha256 = "sha256-xd/ItpngreR77QTsSHLCgZfyvUZXBfOVPJaVtBZ2iTc="; + sha256 = "sha256-TGwoW4jpXbFdxk9HAZJTDhXIHhR1QEcDRCjspBv2KdQ="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/version-management/git-quickfix/default.nix b/pkgs/applications/version-management/git-quickfix/default.nix index cfed9952f79ec..a9382ee0cb391 100644 --- a/pkgs/applications/version-management/git-quickfix/default.nix +++ b/pkgs/applications/version-management/git-quickfix/default.nix @@ -22,13 +22,13 @@ rustPlatform.buildRustPackage rec { doCheck = false; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ + buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security SystemConfiguration libiconv ]; - cargoSha256 = "sha256-eTAEf2nRrJ7i2Dw5BBZlLLu8mK2G/wUk40ivtfxk1pI="; + cargoHash = "sha256-eTAEf2nRrJ7i2Dw5BBZlLLu8mK2G/wUk40ivtfxk1pI="; meta = with lib; { description = "Quickfix allows you to commit changes in your git repository to a new branch without leaving the current branch"; diff --git a/pkgs/applications/version-management/git-radar/default.nix b/pkgs/applications/version-management/git-radar/default.nix index 4bc6a3f8c531d..59ec4b61d85c2 100644 --- a/pkgs/applications/version-management/git-radar/default.nix +++ b/pkgs/applications/version-management/git-radar/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchFromGitHub}: +{ coreutils-prefixed, lib, makeWrapper, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "git-radar"; @@ -11,12 +11,17 @@ stdenv.mkDerivation rec { sha256 = "0c3zp8s4w7m4s71qgwk1jyfc8yzw34f2hi43x1w437ypgabwg81j"; }; + nativeBuildInputs = [ makeWrapper ]; + dontBuild = true; installPhase = '' mkdir -p $out/bin cp git-radar fetch.sh prompt.bash prompt.zsh radar-base.sh $out ln -s $out/git-radar $out/bin + ${lib.optionalString stdenv.hostPlatform.isDarwin '' + wrapProgram $out/git-radar --prefix PATH : ${lib.makeBinPath [ coreutils-prefixed ]} + ''} ''; meta = with lib; { diff --git a/pkgs/applications/version-management/git-remote-hg/default.nix b/pkgs/applications/version-management/git-remote-hg/default.nix index 57741a076385c..76f40911f0763 100644 --- a/pkgs/applications/version-management/git-remote-hg/default.nix +++ b/pkgs/applications/version-management/git-remote-hg/default.nix @@ -26,7 +26,7 @@ python3Packages.buildPythonApplication rec { homepage = "https://github.com/mnauw/git-remote-hg"; description = "Semi-official Mercurial bridge from Git project"; license = licenses.gpl2; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix index a7d0f49344a04..f9c59ad18ebff 100644 --- a/pkgs/applications/version-management/git-repo/default.nix +++ b/pkgs/applications/version-management/git-repo/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "git-repo"; - version = "2.45"; + version = "2.47"; src = fetchFromGitHub { owner = "android"; repo = "tools_repo"; rev = "v${version}"; - hash = "sha256-f765TcOHL8wdPa9qSmGegofjCXx1tF/K5bRQnYQcYVc="; + hash = "sha256-LFzUvDMNGxp5HzdjlaN0VS7HpIzN8GA5MQL61teKRvo="; }; # Fix 'NameError: name 'ssl' is not defined' diff --git a/pkgs/applications/version-management/git-series/Cargo.lock b/pkgs/applications/version-management/git-series/Cargo.lock deleted file mode 100644 index 3d19f5acda9d9..0000000000000 --- a/pkgs/applications/version-management/git-series/Cargo.lock +++ /dev/null @@ -1,517 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "ansi_term" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23ac7c30002a5accbf7e8987d0632fa6de155b7c3d39d0067317a391e00a2ef6" - -[[package]] -name = "ansi_term" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" -dependencies = [ - "winapi", -] - -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi", - "libc", - "winapi", -] - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "cc" -version = "1.0.79" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" -dependencies = [ - "jobserver", -] - -[[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.2.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9213f7cd7c27e95c2b57c49f0e69b1ea65b27138da84a170133fd21b07659c00" -dependencies = [ - "num", - "time", -] - -[[package]] -name = "clap" -version = "2.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" -dependencies = [ - "ansi_term 0.12.1", - "atty", - "bitflags", - "strsim", - "textwrap", - "unicode-width", - "vec_map", -] - -[[package]] -name = "colorparse" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "179f9a3462d05f4c15041d8ba8bd59534731fe6ddd89a65ca61ec67655f37379" -dependencies = [ - "ansi_term 0.9.0", -] - -[[package]] -name = "fixedbitset" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45e780567ed7abc415d12fd464571d265eb4a5710ddc97cdb1a31a4c35bb479d" - -[[package]] -name = "form_urlencoded" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" -dependencies = [ - "percent-encoding", -] - -[[package]] -name = "fuchsia-cprng" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" - -[[package]] -name = "git-series" -version = "0.9.1" -dependencies = [ - "ansi_term 0.9.0", - "atty", - "chrono", - "clap", - "colorparse", - "git2", - "munkres", - "quick-error", - "tempdir", -] - -[[package]] -name = "git2" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c1af51ea8a906616af45a4ce78eacf25860f7a13ae7bf8a814693f0f4037a26" -dependencies = [ - "bitflags", - "libc", - "libgit2-sys", - "log", - "openssl-probe", - "openssl-sys", - "url", -] - -[[package]] -name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - -[[package]] -name = "idna" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "jobserver" -version = "0.1.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" -dependencies = [ - "libc", -] - -[[package]] -name = "libc" -version = "0.2.144" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b00cc1c228a6782d0f076e7b232802e0c5689d41bb5df366f2a6b6621cfdfe1" - -[[package]] -name = "libgit2-sys" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4870c781f6063efb83150cd22c1ddf6ecf58531419e7570cdcced46970f64a16" -dependencies = [ - "cc", - "libc", - "libssh2-sys", - "libz-sys", - "openssl-sys", - "pkg-config", -] - -[[package]] -name = "libssh2-sys" -version = "0.2.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b094a36eb4b8b8c8a7b4b8ae43b2944502be3e59cd87687595cf6b0a71b3f4ca" -dependencies = [ - "cc", - "libc", - "libz-sys", - "openssl-sys", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "libz-sys" -version = "1.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56ee889ecc9568871456d42f603d6a0ce59ff328d291063a45cbdf0036baf6db" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "log" -version = "0.4.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "matrixmultiply" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "916806ba0031cd542105d916a97c8572e1fa6dd79c9c51e7eb43a09ec2dd84c1" -dependencies = [ - "rawpointer", -] - -[[package]] -name = "munkres" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74ce2515494bc1593d54364884e807c4a97c8c3210ddcc51c541a7ab391339ce" -dependencies = [ - "fixedbitset", - "ndarray", -] - -[[package]] -name = "ndarray" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c0d5c9540a691d153064dc47a4db2504587a75eae07bf1d73f7a596ebc73c04" -dependencies = [ - "matrixmultiply", - "num-complex", - "num-integer", - "num-traits", - "rawpointer", -] - -[[package]] -name = "num" -version = "0.1.42" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4703ad64153382334aa8db57c637364c322d3372e097840c72000dabdcf6156e" -dependencies = [ - "num-integer", - "num-iter", - "num-traits", -] - -[[package]] -name = "num-complex" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "747d632c0c558b87dbabbe6a82f3b4ae03720d0646ac5b7b4dae89394be5f2c5" -dependencies = [ - "num-traits", -] - -[[package]] -name = "num-integer" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" -dependencies = [ - "autocfg", - "num-traits", -] - -[[package]] -name = "num-iter" -version = "0.1.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-traits" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" -dependencies = [ - "autocfg", -] - -[[package]] -name = "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.87" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e17f59264b2809d77ae94f0e1ebabc434773f370d6ca667bd223ea10e06cc7e" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "percent-encoding" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" - -[[package]] -name = "pkg-config" -version = "0.3.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" - -[[package]] -name = "quick-error" -version = "1.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" - -[[package]] -name = "rand" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293" -dependencies = [ - "fuchsia-cprng", - "libc", - "rand_core 0.3.1", - "rdrand", - "winapi", -] - -[[package]] -name = "rand_core" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" -dependencies = [ - "rand_core 0.4.2", -] - -[[package]] -name = "rand_core" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" - -[[package]] -name = "rawpointer" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3" - -[[package]] -name = "rdrand" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" -dependencies = [ - "rand_core 0.3.1", -] - -[[package]] -name = "remove_dir_all" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" -dependencies = [ - "winapi", -] - -[[package]] -name = "strsim" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" - -[[package]] -name = "tempdir" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8" -dependencies = [ - "rand", - "remove_dir_all", -] - -[[package]] -name = "textwrap" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -dependencies = [ - "unicode-width", -] - -[[package]] -name = "time" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" -dependencies = [ - "libc", - "wasi", - "winapi", -] - -[[package]] -name = "tinyvec" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" -dependencies = [ - "tinyvec_macros", -] - -[[package]] -name = "tinyvec_macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" - -[[package]] -name = "unicode-bidi" -version = "0.3.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" - -[[package]] -name = "unicode-normalization" -version = "0.1.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "unicode-width" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" - -[[package]] -name = "url" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" -dependencies = [ - "form_urlencoded", - "idna", - "percent-encoding", -] - -[[package]] -name = "vcpkg" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" - -[[package]] -name = "vec_map" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" - -[[package]] -name = "wasi" -version = "0.10.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" - -[[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" diff --git a/pkgs/applications/version-management/git-series/default.nix b/pkgs/applications/version-management/git-series/default.nix index b2176bb9e939e..86277614bc4c3 100644 --- a/pkgs/applications/version-management/git-series/default.nix +++ b/pkgs/applications/version-management/git-series/default.nix @@ -1,55 +1,49 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, pkg-config -, stdenv -, curl -, libgit2 -, libssh2 -, openssl -, zlib +{ + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + stdenv, + curl, + installShellFiles, + libgit2, + libssh2, + openssl, + zlib, }: rustPlatform.buildRustPackage { pname = "git-series"; - version = "unstable-2019-10-15"; + version = "0.9.1-unstable-2024-02-02"; src = fetchFromGitHub { owner = "git-series"; repo = "git-series"; - rev = "c570a015e15214be46a7fd06ba08526622738e20"; - sha256 = "1i0m2b7ma6xvkg95k57gaj1wpc1rfvka6h8jr5hglxmqqbz6cb6w"; + rev = "9c5d40edec87b79db0c5bac1458aa0e2c8fdeb8e"; + hash = "sha256-DtOR7+vX7efNzYMRJwJTj5cXlFHQwzcS0Gp2feVdea4="; }; - cargoLock = { - lockFile = ./Cargo.lock; - }; + cargoHash = "sha256-D83mfaH4iKagGjdX+YhCzva99+dCneHeWPNnkzZB/k0="; nativeBuildInputs = [ pkg-config - ] ++ lib.optionals stdenv.isDarwin [ - curl - ]; + installShellFiles + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ curl ]; buildInputs = [ libgit2 libssh2 openssl zlib - ] ++ lib.optionals stdenv.isDarwin [ - curl - ]; - - LIBGIT2_SYS_USE_PKG_CONFIG = true; - LIBSSH2_SYS_USE_PKG_CONFIG = true; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ curl ]; - # update Cargo.lock to work with openssl 3 - postPatch = '' - ln -sf ${./Cargo.lock} Cargo.lock - ''; + env = { + LIBGIT2_SYS_USE_PKG_CONFIG = true; + LIBSSH2_SYS_USE_PKG_CONFIG = true; + }; postInstall = '' - install -D "$src/git-series.1" "$out/man/man1/git-series.1" + installManPage ./git-series.1 ''; meta = with lib; { @@ -60,9 +54,12 @@ rustPlatform.buildRustPackage { formats the series for email, and prepares pull requests. ''; homepage = "https://github.com/git-series/git-series"; - license = licenses.mit; - maintainers = with maintainers; [ edef vmandela ]; + maintainers = with maintainers; [ + edef + vmandela + aleksana + ]; mainProgram = "git-series"; }; } diff --git a/pkgs/applications/version-management/git-stack/default.nix b/pkgs/applications/version-management/git-stack/default.nix index d9792654a94b0..67893b122d069 100644 --- a/pkgs/applications/version-management/git-stack/default.nix +++ b/pkgs/applications/version-management/git-stack/default.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-MEhUmy4ijR/zHm/qMt4PqNGYnCfIgjNaL9SlMmXCMmc="; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; diff --git a/pkgs/applications/version-management/git-subrepo/default.nix b/pkgs/applications/version-management/git-subrepo/default.nix index e861bc17b8caa..29da4ee6be8b4 100644 --- a/pkgs/applications/version-management/git-subrepo/default.nix +++ b/pkgs/applications/version-management/git-subrepo/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "git-subrepo"; - version = "0.4.6"; + version = "0.4.9"; src = fetchFromGitHub { owner = "ingydotnet"; repo = "git-subrepo"; rev = version; - sha256 = "sha256-83N0Ek6DawUrOc6s2Utzi8776bX4UTGS/a/OffkV44Y="; + sha256 = "sha256-Fwh4haGXVDsLexe/1kjUhY4lF6u5cTrAwivZiOkPig0="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/version-management/git-sync/default.nix b/pkgs/applications/version-management/git-sync/default.nix index 3ff96da704e07..01ac29cf8c56f 100644 --- a/pkgs/applications/version-management/git-sync/default.nix +++ b/pkgs/applications/version-management/git-sync/default.nix @@ -21,12 +21,12 @@ stdenv.mkDerivation rec { cp -a contrib/git-* $out/bin/ ''; - wrapperPath = with lib; makeBinPath ([ + wrapperPath = lib.makeBinPath ([ coreutils git gnugrep gnused - ] ++ lib.optionals stdenv.isLinux [ inotify-tools ]); + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ inotify-tools ]); postFixup = '' wrap_path="${wrapperPath}":$out/bin diff --git a/pkgs/applications/version-management/git-town/default.nix b/pkgs/applications/version-management/git-town/default.nix index 7b362cd7fb254..9f70f7594472a 100644 --- a/pkgs/applications/version-management/git-town/default.nix +++ b/pkgs/applications/version-management/git-town/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "git-town"; - version = "14.2.2"; + version = "16.2.1"; src = fetchFromGitHub { owner = "git-town"; repo = "git-town"; rev = "v${version}"; - hash = "sha256-bYCE3Ik0UbbjlZV8EY6pVRZzrTBp2uiZLJjO4UxfGE8="; + hash = "sha256-/60n/JvT7XRfEVic6Jmi05WpsAy4mRsE/GAnetTMC1I="; }; vendorHash = null; @@ -32,6 +32,9 @@ buildGoModule rec { preCheck = '' HOME=$(mktemp -d) + + # this runs tests requiring local operations + rm main_test.go ''; checkFlags = diff --git a/pkgs/applications/version-management/git-trim/default.nix b/pkgs/applications/version-management/git-trim/default.nix index a387ec706718d..60db7f8ee71e1 100644 --- a/pkgs/applications/version-management/git-trim/default.nix +++ b/pkgs/applications/version-management/git-trim/default.nix @@ -37,7 +37,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl libgit2 ] - ++ lib.optionals stdenv.isDarwin [ IOKit CoreFoundation Security ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ IOKit CoreFoundation Security ]; postInstall = '' install -Dm644 -t $out/share/man/man1/ docs/git-trim.1 diff --git a/pkgs/applications/version-management/git-workspace/default.nix b/pkgs/applications/version-management/git-workspace/default.nix index fc16e778f28c9..c7af04adcb9ff 100644 --- a/pkgs/applications/version-management/git-workspace/default.nix +++ b/pkgs/applications/version-management/git-workspace/default.nix @@ -13,21 +13,21 @@ rustPlatform.buildRustPackage rec { pname = "git-workspace"; - version = "1.4.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "orf"; repo = pname; rev = "v${version}"; - sha256 = "sha256-9/t2MDZ5bYTuzCYTodeATqk+xqST2aQMr7Z1x5fPIuw="; + sha256 = "sha256-Xf3uR+MG8vRBcad5n5k9NKyfC6v0y3BCz0CfDORsy/Q="; }; - cargoSha256 = "sha256-/drXVkYgdkFqZJsz2fNx3Ms21xYKQmwLXRJEmKSaikQ="; + cargoHash = "sha256-oywwbDwg6O4pdqRJAM+IAt65DV6IkpMec8v4PY1RoZU="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ libiconv Security ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv Security ]; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/applications/version-management/git/default.nix b/pkgs/applications/version-management/git/default.nix index d7e008d656fde..3d7f96bb5fe0c 100644 --- a/pkgs/applications/version-management/git/default.nix +++ b/pkgs/applications/version-management/git/default.nix @@ -1,13 +1,13 @@ -{ fetchurl, lib, stdenv, buildPackages +{ fetchurl, fetchpatch, lib, stdenv, buildPackages , curl, openssl, zlib, expat, perlPackages, python3, gettext, cpio , gnugrep, gnused, gawk, coreutils # needed at runtime by git-filter-branch etc , openssh, pcre2, bash , asciidoc, texinfo, xmlto, docbook2x, docbook_xsl, docbook_xml_dtd_45 -, libxslt, tcl, tk, makeWrapper, libiconv +, libxslt, tcl, tk, makeWrapper, libiconv, libiconvReal , svnSupport ? false, subversionClient, perlLibs, smtpPerlLibs , perlSupport ? stdenv.buildPlatform == stdenv.hostPlatform , nlsSupport ? true -, osxkeychainSupport ? stdenv.isDarwin +, osxkeychainSupport ? stdenv.hostPlatform.isDarwin , guiSupport ? false , withManual ? true , pythonSupport ? true @@ -20,16 +20,16 @@ , gzip # needed at runtime by gitweb.cgi , withSsh ? false , sysctl -, doInstallCheck ? !stdenv.isDarwin # extremely slow on darwin +, doInstallCheck ? !stdenv.hostPlatform.isDarwin # extremely slow on darwin , tests }: -assert osxkeychainSupport -> stdenv.isDarwin; +assert osxkeychainSupport -> stdenv.hostPlatform.isDarwin; assert sendEmailSupport -> perlSupport; assert svnSupport -> perlSupport; let - version = "2.45.1"; + version = "2.46.0"; svn = subversionClient.override { perlBindings = perlSupport; }; gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ]; in @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - hash = "sha256-5k00Co5ieuIs+4vMZRzKC0l88en99SNzVUT/SnMvEr8="; + hash = "sha256-fxI0YqKLfKPr4mB0hfcWhVTCsQ38FVx+xGMAZmrCf5U="; }; outputs = [ "out" ] ++ lib.optional withManual "doc"; @@ -59,6 +59,15 @@ stdenv.mkDerivation (finalAttrs: { ./installCheck-path.patch ] ++ lib.optionals withSsh [ ./ssh-path.patch + ] ++ lib.optionals (guiSupport && stdenv.hostPlatform.isDarwin) [ + # Needed to workaround an issue in macOS where gitk shows a empty window + # https://github.com/Homebrew/homebrew-core/issues/68798 + # https://github.com/git/git/pull/944 + (fetchpatch { + name = "gitk_check_main_window_visibility_before_waiting_for_it_to_show.patch"; + url = "https://github.com/git/git/commit/1db62e44b7ec93b6654271ef34065b31496cd02e.patch"; + hash = "sha256-ntvnrYFFsJ1Ebzc6vM9/AMFLHMS1THts73PIOG5DkQo="; + }) ]; postPatch = '' @@ -78,16 +87,16 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ gettext perlPackages.perl makeWrapper pkg-config ] ++ lib.optionals withManual [ asciidoc texinfo xmlto docbook2x docbook_xsl docbook_xml_dtd_45 libxslt ]; - buildInputs = [ curl openssl zlib expat cpio libiconv bash ] + buildInputs = [ curl openssl zlib expat cpio (if stdenv.hostPlatform.isFreeBSD then libiconvReal else libiconv) bash ] ++ lib.optionals perlSupport [ perlPackages.perl ] ++ lib.optionals guiSupport [tcl tk] ++ lib.optionals withpcre2 [ pcre2 ] - ++ lib.optionals stdenv.isDarwin [ Security CoreServices ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security CoreServices ] ++ lib.optionals withLibsecret [ glib libsecret ]; # required to support pthread_cancel() NIX_LDFLAGS = lib.optionalString (stdenv.cc.isGNU && stdenv.hostPlatform.libc == "glibc") "-lgcc_s" - + lib.optionalString (stdenv.isFreeBSD) "-lthr"; + + lib.optionalString (stdenv.hostPlatform.isFreeBSD) "-lthr"; configureFlags = [ "ac_cv_prog_CURL_CONFIG=${lib.getDev curl}/bin/curl-config" @@ -109,8 +118,8 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional (stdenv.buildPlatform == stdenv.hostPlatform) "SHELL_PATH=${stdenv.shell}" ++ (if perlSupport then ["PERL_PATH=${perlPackages.perl}/bin/perl"] else ["NO_PERL=1"]) ++ (if pythonSupport then ["PYTHON_PATH=${python3}/bin/python"] else ["NO_PYTHON=1"]) - ++ lib.optionals stdenv.isSunOS ["INSTALL=install" "NO_INET_NTOP=" "NO_INET_PTON="] - ++ (if stdenv.isDarwin then ["NO_APPLE_COMMON_CRYPTO=1"] else ["sysconfdir=/etc"]) + ++ lib.optionals stdenv.hostPlatform.isSunOS ["INSTALL=install" "NO_INET_NTOP=" "NO_INET_PTON="] + ++ (if stdenv.hostPlatform.isDarwin then ["NO_APPLE_COMMON_CRYPTO=1"] else ["sysconfdir=/etc"]) ++ lib.optionals stdenv.hostPlatform.isMusl ["NO_SYS_POLL_H=1" "NO_GETTEXT=YesPlease"] ++ lib.optional withpcre2 "USE_LIBPCRE2=1" ++ lib.optional (!nlsSupport) "NO_GETTEXT=1" @@ -121,7 +130,7 @@ stdenv.mkDerivation (finalAttrs: { # acceptable version. # # See https://github.com/Homebrew/homebrew-core/commit/dfa3ccf1e7d3901e371b5140b935839ba9d8b706 - ++ lib.optional stdenv.isDarwin "TKFRAMEWORK=/nonexistent" + ++ lib.optional stdenv.hostPlatform.isDarwin "TKFRAMEWORK=/nonexistent" ++ lib.optional (stdenv.hostPlatform.isFreeBSD && stdenv.hostPlatform != stdenv.buildPlatform) "uname_S=FreeBSD"; disallowedReferences = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ @@ -293,7 +302,7 @@ stdenv.mkDerivation (finalAttrs: { "PERL_PATH=${buildPackages.perl}/bin/perl" ]; - nativeInstallCheckInputs = lib.optional stdenv.isDarwin sysctl; + nativeInstallCheckInputs = lib.optional (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isFreeBSD) sysctl; preInstallCheck = '' installCheckFlagsArray+=( @@ -316,8 +325,11 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace t/test-lib.sh \ --replace "test_set_prereq POSIXPERM" "" # TODO: Investigate while these still fail (without POSIXPERM): + # Tested to fail: 2.46.0 disable_test t0001-init 'shared overrides system' + # Tested to fail: 2.46.0 disable_test t0001-init 'init honors global core.sharedRepository' + # Tested to fail: 2.46.0 disable_test t1301-shared-repo # /build/git-2.44.0/contrib/completion/git-completion.bash: line 452: compgen: command not found disable_test t9902-completion @@ -328,25 +340,13 @@ stdenv.mkDerivation (finalAttrs: { # Disable sendmail tests disable_test t9001-send-email '' + '' - # XXX: I failed to understand why this one fails. - # Could someone try to re-enable it on the next release ? - # Tested to fail: 2.18.0 and 2.19.0 - disable_test t1700-split-index "null sha1" - # Flaky tests: - disable_test t5319-multi-pack-index disable_test t6421-merge-partial-clone # Fails reproducibly on ZFS on Linux with formD normalization disable_test t0021-conversion disable_test t3910-mac-os-precompose - - '' + lib.optionalString (!perlSupport) '' - # request-pull is a Bash script that invokes Perl, so it is not available - # when NO_PERL=1, and the test should be skipped, but the test suite does - # not check for the Perl prerequisite. - disable_test t5150-request-pull - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' # XXX: Some tests added in 2.24.0 fail. # Please try to re-enable on the next release. disable_test t7816-grep-binary-pattern @@ -355,7 +355,7 @@ stdenv.mkDerivation (finalAttrs: { disable_test t6300-for-each-ref # not ok 1 - populate workdir (with 2.33.1 on x86_64-darwin) disable_test t5003-archive-zip - '' + lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) '' + '' + lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) '' disable_test t7527-builtin-fsmonitor '' + lib.optionalString stdenv.hostPlatform.isMusl '' # Test fails (as of 2.17.0, musl 1.1.19) diff --git a/pkgs/applications/version-management/git/update.sh b/pkgs/applications/version-management/git/update.sh index 1f70dcff42940..7aa1e90d53b3b 100755 --- a/pkgs/applications/version-management/git/update.sh +++ b/pkgs/applications/version-management/git/update.sh @@ -4,7 +4,7 @@ set -eu -o pipefail oldVersion="$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion git" | tr -d '"')" -latestTag="$(git ls-remote --tags --sort="v:refname" https://github.com/git/git.git | grep -v '\{\}' | grep -v '\-rc' | tail -1 | sed 's|^.*/v\(.*\)|\1|')" +latestTag="$(git ls-remote --tags --sort="v:refname" https://github.com/git/git.git | grep -v '{}' | grep -v '\-rc' | tail -1 | sed 's|^.*/v\(.*\)|\1|')" targetVersion="${1:-$latestTag}" if [ ! "${oldVersion}" = "${targetVersion}" ]; then diff --git a/pkgs/applications/version-management/gita/default.nix b/pkgs/applications/version-management/gita/default.nix index 41fe453647de6..9bb602d2a5cdb 100644 --- a/pkgs/applications/version-management/gita/default.nix +++ b/pkgs/applications/version-management/gita/default.nix @@ -1,8 +1,6 @@ { lib , buildPythonApplication , fetchFromGitHub -, git -, pytest , pyyaml , setuptools , installShellFiles diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index c1373346b6af0..7d35f1efbb58c 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -1,56 +1,112 @@ -{ lib, stdenv, libXcomposite, libgnome-keyring, makeWrapper, udev, curlWithGnuTls, alsa-lib -, libXfixes, atk, gtk3, libXrender, pango, gnome, cairo, freetype, fontconfig -, libX11, libXi, libxcb, libXext, libXcursor, glib, libXScrnSaver, libxkbfile, libXtst -, nss, nspr, cups, fetchzip, expat, gdk-pixbuf, libXdamage, libXrandr, dbus -, makeDesktopItem, openssl, wrapGAppsHook3, makeShellWrapper, at-spi2-atk, at-spi2-core, libuuid -, e2fsprogs, krb5, libdrm, mesa, unzip, copyDesktopItems, libxshmfence, libxkbcommon, git -, libGL, zlib, cacert +{ + lib, + stdenv, + libXcomposite, + libgnome-keyring, + makeWrapper, + udev, + curlWithGnuTls, + alsa-lib, + 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, + buildPackages, + at-spi2-atk, + at-spi2-core, + libuuid, + e2fsprogs, + krb5, + libdrm, + mesa, + unzip, + copyDesktopItems, + libxshmfence, + libxkbcommon, + git, + libGL, + zlib, + cacert, }: -with lib; - let pname = "gitkraken"; - version = "10.0.2"; + version = "10.3.0"; throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}"; srcs = { x86_64-linux = fetchzip { url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz"; - hash = "sha256-vqB+2W4c9ObmC5IfBy8oZQToURh4GYms6mzQeZeKJZU="; + hash = "sha256-5WICLLuv+NL++fgm7p/ScyEvzwVqcXNI6eXGr4e9k20="; }; x86_64-darwin = fetchzip { url = "https://release.axocdn.com/darwin/GitKraken-v${version}.zip"; - hash = "sha256-60WB5P8rwnUFOhe9BW1sPyweuvwcXswoUUBo6V1VCxQ="; + hash = "sha256-zkQQR90pdYGIZf3OmAdKc1SlotgdSRGJaYsA1n74aZk="; }; aarch64-darwin = fetchzip { url = "https://release.axocdn.com/darwin-arm64/GitKraken-v${version}.zip"; - hash = "sha256-XL5GWs+jhuUEiPlHQZ6MIfvDjhislBTCg+KssnB4s6g="; + hash = "sha256-WYBXupyunpAaoHmA4dHfd/oruP20rYsIq5mO4/dDsoM="; }; }; src = srcs.${stdenv.hostPlatform.system} or throwSystem; - meta = { + meta = with lib; { homepage = "https://www.gitkraken.com/git-client"; description = "Simplifying Git for any OS"; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = builtins.attrNames srcs; - maintainers = with maintainers; [ xnwdd evanjs arkivm nicolas-goudry ]; + maintainers = with maintainers; [ + xnwdd + evanjs + arkivm + nicolas-goudry + ]; mainProgram = "gitkraken"; }; linux = stdenv.mkDerivation rec { - inherit pname version src meta; + inherit + pname + version + src + meta + ; dontBuild = true; dontConfigure = true; - libPath = makeLibraryPath [ + libPath = lib.makeLibraryPath [ stdenv.cc.cc.lib curlWithGnuTls udev @@ -96,18 +152,28 @@ let zlib ]; - desktopItems = [ (makeDesktopItem { - name = "GitKraken Desktop"; - exec = "gitkraken"; - icon = "gitkraken"; - desktopName = "GitKraken Desktop"; - genericName = "Git Client"; - categories = [ "Development" ]; - comment = "Unleash your repo"; - }) ]; + desktopItems = [ + (makeDesktopItem { + name = "GitKraken Desktop"; + exec = "gitkraken"; + icon = "gitkraken"; + desktopName = "GitKraken Desktop"; + genericName = "Git Client"; + categories = [ "Development" ]; + comment = "Unleash your repo"; + }) + ]; - nativeBuildInputs = [ copyDesktopItems (wrapGAppsHook3.override { makeWrapper = makeShellWrapper; }) ]; - buildInputs = [ gtk3 gnome.adwaita-icon-theme ]; + nativeBuildInputs = [ + copyDesktopItems + # override doesn't preserve splicing https://github.com/NixOS/nixpkgs/issues/132651 + # Has to use `makeShellWrapper` from `buildPackages` even though `makeShellWrapper` from the inputs is spliced because `propagatedBuildInputs` would pick the wrong one because of a different offset. + (buildPackages.wrapGAppsHook3.override { makeWrapper = buildPackages.makeShellWrapper; }) + ]; + buildInputs = [ + gtk3 + adwaita-icon-theme + ]; # avoid double-wrapping dontWrapGApps = true; @@ -159,9 +225,17 @@ let }; darwin = stdenv.mkDerivation { - inherit pname version src meta; - - nativeBuildInputs = [ unzip makeWrapper ]; + inherit + pname + version + src + meta + ; + + nativeBuildInputs = [ + unzip + makeWrapper + ]; installPhase = '' runHook preInstall @@ -177,6 +251,4 @@ let dontFixup = true; }; in -if stdenv.isDarwin -then darwin -else linux +if stdenv.hostPlatform.isDarwin then darwin else linux diff --git a/pkgs/applications/version-management/gitlab-triage/default.nix b/pkgs/applications/version-management/gitlab-triage/default.nix index 5397688ebf1fa..20335e2003a73 100644 --- a/pkgs/applications/version-management/gitlab-triage/default.nix +++ b/pkgs/applications/version-management/gitlab-triage/default.nix @@ -11,7 +11,7 @@ bundlerApp { description = "GitLab's issues and merge requests triage, automated!"; homepage = "https://gitlab.com/gitlab-org/gitlab-triage"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; mainProgram = "gitlab-triage"; }; } diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index 382038ac99a5b..8b73993462c78 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,15 +1,15 @@ { - "version": "16.11.4", - "repo_hash": "sha256-VtjGV/0Xtmwqu/YZa6P6jUvlTYj9FNKALcJ3ZvMUJBw=", - "yarn_hash": "03q7h8dyssvsr91klr1jk65f5jz1ac71lx0114zq9c7awxrgp6kq", + "version": "17.2.5", + "repo_hash": "0l3s3k3v306ihn47lkj49b8vlly7v11clciwpf7ly4c5mwvwjlx6", + "yarn_hash": "10y540bxwaz355p9r4q34199aibadrd5p4d9ck2y3n6735k0hm74", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v16.11.4-ee", + "rev": "v17.2.5-ee", "passthru": { - "GITALY_SERVER_VERSION": "16.11.4", - "GITLAB_PAGES_VERSION": "16.11.4", - "GITLAB_SHELL_VERSION": "14.35.0", - "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "4.8.0", - "GITLAB_WORKHORSE_VERSION": "16.11.4" + "GITALY_SERVER_VERSION": "17.2.5", + "GITLAB_PAGES_VERSION": "17.2.5", + "GITLAB_SHELL_VERSION": "14.37.0", + "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.2.0", + "GITLAB_WORKHORSE_VERSION": "17.2.5" } } 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 fb175aad462a6..68acfdcf53430 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -1,14 +1,17 @@ { lib +, callPackage , fetchFromGitLab , buildGoModule , pkg-config }: let - version = "16.11.4"; + version = "17.2.5"; package_version = "v${lib.versions.major version}"; gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}"; + git = callPackage ./git.nix { }; + commonOpts = { inherit version; @@ -17,17 +20,15 @@ let owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - hash = "sha256-sdRKKOWoX0yyqUGpu/mqDdTq2nLZ2Gr5GNV9x99rdeU="; + hash = "sha256-R6GmIBU7rzLBsegcXPjc9Dxp9qe3tP6unqOsnyiozgw="; }; - vendorHash = "sha256-WCZF7XVW6J1zyPx8e/Mcn+HmHElAUGcEICxiF5HLzBg="; + vendorHash = "sha256-FqnGVRldhevJgBBvJcvGXzRaYWqSHzZiXIQmCNzJv+4="; ldflags = [ "-X ${gitaly_package}/internal/version.version=${version}" "-X ${gitaly_package}/internal/version.moduleVersion=${version}" ]; tags = [ "static" ]; - nativeBuildInputs = [ pkg-config ]; - doCheck = false; }; @@ -49,6 +50,10 @@ buildGoModule ({ outputs = [ "out" ]; + passthru = { + inherit git; + }; + meta = with lib; { homepage = "https://gitlab.com/gitlab-org/gitaly"; description = "Git RPC service for handling all the git calls made by GitLab"; diff --git a/pkgs/applications/version-management/gitlab/gitaly/git.nix b/pkgs/applications/version-management/gitlab/gitaly/git.nix new file mode 100644 index 0000000000000..a6d272b2fbb7a --- /dev/null +++ b/pkgs/applications/version-management/gitlab/gitaly/git.nix @@ -0,0 +1,57 @@ +{ stdenv +, lib +, gitaly +, fetchFromGitLab +, curl +, pcre2 +, zlib +}: + +stdenv.mkDerivation rec { + pname = "gitaly-git"; + version = "2.44.2.gl1"; + + # `src` attribute for nix-update + src = fetchFromGitLab { + owner = "gitlab-org"; + repo = "git"; + rev = "v${version}"; + hash = "sha256-VIffbZZEbGjVW1No8zojSQlX/ciJ2DJnaogNlQtc77o="; + }; + + # we actually use the gitaly build system + unpackPhase = '' + cp -r ${gitaly.src} source + chmod -R +w source + + mkdir -p source/_build/deps + + cp -r ${src} source/_build/deps/git-distribution + chmod -R +w source/_build/deps/git-distribution + + # FIXME? maybe just patch the makefile? + echo -n 'v${version} DEVELOPER=1 DEVOPTS=no-error USE_LIBPCRE=YesPlease NO_PERL=YesPlease NO_EXPAT=YesPlease NO_TCLTK=YesPlease NO_GETTEXT=YesPlease NO_PYTHON=YesPlease' > source/_build/deps/git-distribution.version + echo -n 'v${version}' > source/_build/deps/git-distribution/version + ''; + sourceRoot = "source"; + + buildFlags = [ "git" ]; + + buildInputs = [ + curl + pcre2 + zlib + ]; + + # The build phase already installs it all + GIT_PREFIX = placeholder "out"; + dontInstall = true; + + meta = { + homepage = "https://git-scm.com/"; + description = "Distributed version control system - with Gitaly patches"; + license = lib.licenses.gpl2Only; + platforms = lib.platforms.all; + maintainers = lib.teams.gitlab.members; + }; +} diff --git a/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix b/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix index d84947908c721..bbf6c9292206c 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "gitlab-container-registry"; - version = "4.5.0"; + version = "4.9.0"; rev = "v${version}-gitlab"; # nixpkgs-update: no auto update @@ -10,10 +10,10 @@ buildGoModule rec { owner = "gitlab-org"; repo = "container-registry"; inherit rev; - hash = "sha256-dCDybwIfzC79Mobejz/5XbEMQXkPuO8HejjannA6k/M="; + hash = "sha256-kBM5ICESRUwHlM9FeJEFQFTM2E2zIF6axOGOHNmloKo="; }; - vendorHash = "sha256-sybppXCoTrc196xLBW1+sUg9Y5uA0GAptlJ7RjhzuGc="; + vendorHash = "sha256-nePIExsIWJgBDUrkkVBzc0qsYdfxR7GL1VhdWcVJnLg="; postPatch = '' # Disable flaky inmemory storage driver test @@ -28,7 +28,7 @@ buildGoModule rec { meta = with lib; { description = "GitLab Docker toolset to pack, ship, store, and deliver content"; license = licenses.asl20; - maintainers = with maintainers; [ yayayayaka xanderio ]; + maintainers = with maintainers; [ yayayayaka ] ++ teams.cyberus.members; platforms = platforms.unix; }; } 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..e04809a59a830 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.2.0"; # nixpkgs-update: no auto update src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-elasticsearch-indexer"; rev = "v${version}"; - sha256 = "sha256-JHUDZmGlZGyvsB4wgAnNyIEtosZG4ajZ4eBGumH97ZI="; + hash = "sha256-pkZWIsPWUDkjZo48mJ9N8LbMJJAHNI2Wf6X0F5+K23s="; }; - vendorHash = "sha256-ztRKXoXncY66XJVwlPn4ShLWTD4Cr0yYHoUdquJItDM="; + vendorHash = "sha256-hFTvNh/N3z99O7dtAEiksonJcTn7Zj7Ijp68vfXEBw8="; buildInputs = [ icu ]; nativeBuildInputs = [ pkg-config ]; @@ -21,6 +21,6 @@ buildGoModule rec { description = "Indexes Git repositories into Elasticsearch for GitLab"; mainProgram = "gitlab-elasticsearch-indexer"; license = licenses.mit; - maintainers = with maintainers; [ xanderio yayayayaka ]; + maintainers = with maintainers; [ yayayayaka ] ++ teams.cyberus.members; }; } diff --git a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix index 480d9921f9c7f..30dd1ff03d375 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.4"; + version = "17.2.5"; # nixpkgs-update: no auto update src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-pages"; rev = "v${version}"; - hash = "sha256-6Fh1IKCs2Bg7Eg44kbCMM8YhLmwWvdZnXp39fphLzcE="; + hash = "sha256-5qksHuY7EzCoCMBxF4souvUz8xFstfzOZT3CF5YsV7M="; }; - vendorHash = "sha256-WrR4eZRAuYkhr7ZqP7OXqJ6uwvxzn+t+3OdBNcNaq0M="; + vendorHash = "sha256-yNHeM8MExcLwv2Ga4vtBmPFBt/Rj7Gd4QQYDlnAIo+c="; 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..eaaba0d4bd320 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix @@ -2,27 +2,28 @@ buildGoModule rec { pname = "gitlab-shell"; - version = "14.35.0"; + version = "14.37.0"; # nixpkgs-update: no auto update src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-shell"; rev = "v${version}"; - sha256 = "sha256-WyIUdDKPKQE1Ddz40WaMA5lDs37OyDuZl/6/nKDYY/8="; + hash = "sha256-to4ZIFKEiM4FCznoLrvHua9/hIqiHcviALzfay+1rb8="; }; buildInputs = [ ruby libkrb5 ]; patches = [ ./remove-hardcoded-locations.patch - ./go-mod-tidy.patch ]; - vendorHash = "sha256-7TUHD14/aCs3lkpTy5CH9WYUc1Ud6rDFCx+JgsINvxU="; + vendorHash = "sha256-TbjpCCo/ZdFP+yE2h8B8kwS08iUilXNgBT2F5Si7/dc="; postInstall = '' cp -r "$NIX_BUILD_TOP/source"/bin/* $out/bin + mv $out/bin/install $out/bin/gitlab-shell-install + mv $out/bin/check $out/bin/gitlab-shell-check cp -r "$NIX_BUILD_TOP/source"/{support,VERSION} $out/ ''; doCheck = false; 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 d01deb57b2006..5948a05158b57 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.4"; + version = "17.2.5"; # nixpkgs-update: no auto update src = fetchFromGitLab { @@ -17,7 +17,7 @@ buildGoModule rec { sourceRoot = "${src.name}/workhorse"; - vendorHash = "sha256-44EtpjYsxYqDH035/ruPfshfejiO011HybKD2inp8bU="; + vendorHash = "sha256-ZWpuJTlGCsjjURa8iYTaGMKulx99uyYJ+dr2cL9hiwo="; 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..9152b022d52e2 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 @@ -48,44 +48,45 @@ gem 'gitlab-secret_detection', path: 'gems/gitlab-secret_detection', feature_cat gem 'responders', '~> 3.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'sprockets', '~> 3.7.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'sprockets-rails', '~> 3.5.1' # 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 -gem 'faraday', '~> 1.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'faraday', '~> 1.10.3' # rubocop:todo Gemfile/MissingFeatureCategory 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 gem 'bcrypt', '~> 3.1', '>= 3.1.14' # rubocop:todo Gemfile/MissingFeatureCategory gem 'doorkeeper', '~> 5.6', '>= 5.6.6' # rubocop:todo Gemfile/MissingFeatureCategory gem 'doorkeeper-openid_connect', '~> 1.8', '>= 1.8.7' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'doorkeeper-device_authorization_grant', '~> 1.0.0', feature_category: :system_access gem 'rexml', '~> 3.2.6' # rubocop:todo Gemfile/MissingFeatureCategory 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 +135,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-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 'graphql', '~> 2.3.5', feature_category: :api +gem 'graphql-docs', '~> 5.0.0', group: [:development, :test], feature_category: :api +gem 'graphiql-rails', '~> 1.10', 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 +168,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 +208,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.199.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.154.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 @@ -226,23 +227,23 @@ gem 'wikicloth', '0.8.1' # rubocop:todo Gemfile/MissingFeatureCategory gem 'asciidoctor', '~> 2.0.18' # rubocop:todo Gemfile/MissingFeatureCategory gem 'asciidoctor-include-ext', '~> 0.4.0', require: false # rubocop:todo Gemfile/MissingFeatureCategory gem 'asciidoctor-plantuml', '~> 0.0.16' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'asciidoctor-kroki', '~> 0.8.0', require: false # rubocop:todo Gemfile/MissingFeatureCategory -gem 'rouge', '~> 4.2.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'asciidoctor-kroki', '~> 0.10.0', require: false # rubocop:todo Gemfile/MissingFeatureCategory +gem 'rouge', '~> 4.3.0', feature_category: :shared 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 +gem 'icalendar', '~> 2.10.1', feature_category: :system_access # Diffs gem 'diffy', '~> 3.4' # rubocop:todo Gemfile/MissingFeatureCategory gem 'diff_match_patch', '~> 0.1.0', path: 'vendor/gems/diff_match_patch', feature_category: :team_planning # Application server -gem 'rack', '~> 2.2.8.1' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'rack', '~> 2.2.9' # rubocop:todo Gemfile/MissingFeatureCategory # https://github.com/zombocom/rack-timeout/blob/master/README.md#rails-apps-manually -gem 'rack-timeout', '~> 0.6.3', require: 'rack/timeout/base' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'rack-timeout', '~> 0.7.0', require: 'rack/timeout/base' # rubocop:todo Gemfile/MissingFeatureCategory group :puma do gem 'puma', '= 6.4.0', require: false, feature_category: :shared @@ -256,9 +257,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', '~> 7.1.6', 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 +281,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 +292,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 @@ -304,7 +308,7 @@ gem 'jira-ruby', '~> 2.3.0', feature_category: :integrations gem 'atlassian-jwt', '~> 0.2.1', feature_category: :integrations # Slack integration -gem 'slack-messenger', '~> 2.3.4', feature_category: :integrations +gem 'slack-messenger', '~> 2.3.5', feature_category: :integrations # FogBugz integration gem 'ruby-fogbugz', '~> 0.3.0', feature_category: :importers @@ -329,7 +333,7 @@ gem 'licensee', '~> 9.16' # rubocop:todo Gemfile/MissingFeatureCategory # Detect and convert string character encoding # We forked charlock_holmes at https://gitlab.com/gitlab-org/ruby/gems/charlock_holmes # but changed it's name to 'static_holmes' in the gemspec file. -gem 'static_holmes', '~> 0.7.7', require: 'charlock_holmes' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'static_holmes', '~> 0.7.11', require: 'charlock_holmes', feature_category: :shared # Detect mime content type from content gem 'ruby-magic', '~> 0.6' # rubocop:todo Gemfile/MissingFeatureCategory @@ -353,16 +357,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 # @@ -371,20 +374,21 @@ gem 'pg_query', '~> 5.1.0', feature_category: :database gem 'gitlab-schema-validation', path: 'gems/gitlab-schema-validation' # rubocop:todo Gemfile/MissingFeatureCategory 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 'premailer-rails', '~> 1.12.0', feature_category: :notifications +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 + +gem 'tty-prompt', '~> 0.23', require: false, feature_category: :shared # Perf bar gem 'peek', '~> 1.1' # rubocop:todo Gemfile/MissingFeatureCategory @@ -399,6 +403,39 @@ 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 +# Event-driven reactor for Ruby +gem 'async', '~> 2.12.1' # rubocop:disable Gemfile/MissingFeatureCategory -- This is general utility gem + +# 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 @@ -406,8 +443,8 @@ group :development do gem 'rubocop', feature_category: :tooling 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 'letter_opener_web', '~> 3.0.0' # 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 +453,19 @@ 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.17.0", 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 + gem 'parser', '= 3.3.3.0', 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 +473,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 +482,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 +492,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 @@ -480,7 +517,7 @@ group :development, :test do end group :development, :test, :danger do - gem 'gitlab-dangerfiles', '~> 4.7.0', require: false, feature_category: :tooling + gem 'gitlab-dangerfiles', '~> 4.8.0', require: false, feature_category: :tooling end group :development, :test, :coverage do @@ -506,12 +543,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 +557,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,10 +565,10 @@ 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.31.0', require: false, feature_category: :tooling end -gem 'octokit', '~> 8.1', feature_category: :importers +gem 'octokit', '~> 9.0', feature_category: :importers gem 'gitlab-mail_room', '~> 0.0.24', require: 'mail_room', feature_category: :shared @@ -563,12 +600,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.1.0', 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 @@ -616,7 +653,7 @@ gem 'valid_email', '~> 0.1' # rubocop:todo Gemfile/MissingFeatureCategory # JSON gem 'jsonb_accessor', '~> 1.3.10' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'json', '~> 2.6.3' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'json', '~> 2.7.2', feature_category: :shared gem 'json_schemer', '~> 0.2.18' # rubocop:todo Gemfile/MissingFeatureCategory gem 'oj', '~> 3.13.21' # rubocop:todo Gemfile/MissingFeatureCategory gem 'oj-introspect', '~> 0.7' # rubocop:todo Gemfile/MissingFeatureCategory @@ -657,9 +694,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..c62ad405603ac 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock @@ -10,7 +10,7 @@ PATH click_house-client (0.1.0) activesupport (< 8) addressable (~> 2.8) - json (~> 2.6.3) + json (~> 2.7.2) PATH remote: gems/csv_builder @@ -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) @@ -181,15 +174,6 @@ PATH omniauth (~> 2.0) PATH - remote: vendor/gems/sidekiq-7.1.6 - specs: - sidekiq (7.1.6) - concurrent-ruby (< 2) - connection_pool (>= 2.3.0) - rack (>= 2.2.4) - redis-client (>= 0.14.0) - -PATH remote: vendor/gems/sidekiq-reliable-fetch specs: gitlab-sidekiq-fetcher (0.11.0) @@ -205,70 +189,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 +270,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) @@ -296,11 +280,15 @@ GEM asciidoctor (2.0.18) asciidoctor-include-ext (0.4.0) asciidoctor (>= 1.5.6, < 3.0.0) - asciidoctor-kroki (0.8.0) + asciidoctor-kroki (0.10.0) asciidoctor (~> 2.0) asciidoctor-plantuml (0.0.16) asciidoctor (>= 2.0.17, < 3.0.0) ast (2.4.2) + async (2.12.1) + console (~> 1.25, >= 1.25.2) + fiber-annotation + io-event (~> 1.6, >= 1.6.5) atlassian-jwt (0.2.1) jwt (~> 2.1) attr_required (1.0.1) @@ -311,7 +299,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.199.0) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.8) @@ -319,17 +307,17 @@ 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.154.0) + aws-sdk-core (~> 3, >= 3.199.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.8) aws-sigv4 (1.8.0) aws-eventstream (~> 1, >= 1.0.2) - axe-core-api (4.8.0) + axe-core-api (4.9.1) dumb_delegator virtus - axe-core-rspec (4.9.0) - axe-core-api + axe-core-rspec (4.9.1) + axe-core-api (= 4.9.1) dumb_delegator virtus axiom-types (0.1.1) @@ -348,7 +336,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 +349,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) @@ -418,6 +407,10 @@ GEM commonmarker (0.23.10) concurrent-ruby (1.2.3) connection_pool (2.4.1) + console (1.25.2) + fiber-annotation + fiber-local (~> 1.1) + json cork (0.3.0) colored2 (~> 3.1) cose (1.3.0) @@ -426,6 +419,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) @@ -453,7 +448,6 @@ GEM danger-gitlab (8.0.0) danger gitlab (~> 4.2, >= 4.2.0) - dartsass (1.49.8) database_cleaner-active_record (2.1.0) activerecord (>= 5.a) database_cleaner-core (~> 2.0.0) @@ -507,6 +501,8 @@ GEM unf (>= 0.0.5, < 1.0.0) doorkeeper (5.6.6) railties (>= 5) + doorkeeper-device_authorization_grant (1.0.3) + doorkeeper (~> 5.5) doorkeeper-openid_connect (1.8.7) doorkeeper (>= 5.5, < 5.7) jwt (>= 2.5) @@ -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) @@ -569,7 +565,7 @@ GEM factory_bot_rails (6.4.3) factory_bot (~> 6.4) railties (>= 5.0.0) - faraday (1.10.0) + faraday (1.10.3) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) faraday-excon (~> 1.1) @@ -608,6 +604,10 @@ GEM rake ffi-yajl (2.6.0) libyajl2 (>= 1.2) + fiber-annotation (0.2.0) + fiber-local (1.1.0) + fiber-storage + fiber-storage (0.1.2) find_a_port (1.0.1) flipper (0.26.2) concurrent-ruby (< 2) @@ -633,18 +633,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 +671,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,14 +688,14 @@ GEM git (1.18.0) addressable (~> 2.8) rchardet (~> 1.8) - gitaly (16.11.0.pre.rc1) + gitaly (17.1.2) grpc (~> 1.0) gitlab (4.19.0) httparty (~> 0.20) terminal-table (>= 1.5.1) gitlab-chronic (0.10.5) numerizer (~> 0.2) - gitlab-dangerfiles (4.7.0) + gitlab-dangerfiles (4.8.0) danger (>= 9.3.0) danger-gitlab (>= 8.0.0) rake (~> 13.0) @@ -707,35 +708,36 @@ 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.1) 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) - gitlab-sdk (0.3.0) + gitlab-sdk (0.3.1) 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 +745,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.31.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 +785,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) @@ -810,11 +813,11 @@ GEM gapic-common (>= 0.20.0, < 2.a) google-cloud-common (~> 1.0) google-cloud-errors (~> 1.0) - google-cloud-core (1.6.0) - google-cloud-env (~> 1.0) + google-cloud-core (1.7.0) + google-cloud-env (>= 1.0, < 3.a) google-cloud-errors (~> 1.0) - google-cloud-env (1.6.0) - faraday (>= 0.17.3, < 3.0) + google-cloud-env (2.1.1) + faraday (>= 1.0, < 3.a) google-cloud-errors (1.3.0) google-cloud-location (0.6.0) gapic-common (>= 0.20.0, < 2.a) @@ -852,7 +855,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,37 +863,36 @@ 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) - grape-entity (>= 0.6.0) - grape-swagger (>= 1.2.0) + grape-swagger-entity (0.5.4) + grape-entity (~> 1) + grape-swagger (~> 2) grape_logging (1.8.4) grape rack - graphiql-rails (1.8.0) + graphiql-rails (1.10.0) railties - sprockets-rails graphlient (0.6.0) faraday (>= 1.0) faraday_middleware graphql-client graphlyte (1.0.0) - graphql (2.2.5) - racc (~> 1.4) - graphql-client (0.19.0) + graphql (2.3.5) + base64 + graphql-client (0.23.0) activesupport (>= 3.0) - graphql - graphql-docs (4.0.0) + graphql (>= 1.13.0) + graphql-docs (5.0.0) commonmarker (~> 0.23, >= 0.23.6) - dartsass (~> 1.49) escape_utils (~> 1.2) extended-markdown-filter (~> 0.4) gemoji (~> 3.0) graphql (~> 2.0) html-pipeline (~> 2.14, >= 2.14.3) - grpc (1.60.0) + sass-embedded (~> 1.58) + grpc (1.63.0) google-protobuf (~> 3.25) googleapis-common-protos-types (~> 1.0) grpc-google-iam-v1 (1.5.0) @@ -916,7 +918,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 @@ -956,15 +958,16 @@ GEM i18n (1.14.4) concurrent-ruby (~> 1.0) i18n_data (0.13.1) - icalendar (2.8.0) + icalendar (2.10.1) ice_cube (~> 0.16) ice_cube (0.16.4) 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) + io-event (1.6.5) ipaddr (1.2.5) ipaddress (0.8.3) jaeger-client (1.1.0) @@ -981,7 +984,7 @@ GEM character_set (~> 1.4) regexp_parser (~> 2.5) regexp_property_values (~> 1.0) - json (2.6.3) + json (2.7.2) json-jwt (1.15.3) activesupport (>= 4.2) aes_key_wrap @@ -1011,7 +1014,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,25 +1030,25 @@ GEM language_server-protocol (3.17.0.3) launchy (2.5.0) addressable (~> 2.7) - lefthook (1.6.8) - letter_opener (1.7.0) - launchy (~> 2.2) - letter_opener_web (2.0.0) - actionmailer (>= 5.2) - letter_opener (~> 1.7) - railties (>= 5.2) + lefthook (1.6.18) + letter_opener (1.10.0) + launchy (>= 2.2, < 4) + letter_opener_web (3.0.0) + actionmailer (>= 6.1) + letter_opener (~> 1.9) + railties (>= 6.1) rexml libyajl2 (2.1.0) - license_finder (7.0.1) + license_finder (7.1.0) bundler rubyzip (>= 1, < 3) thor (~> 1.2) tomlrb (>= 1.3, < 2.1) with_env (= 1.1.0) xml-simple (~> 1.1.9) - licensee (9.16.1) - dotenv (~> 2.0) - octokit (>= 4.20, < 9.0) + licensee (9.17.1) + dotenv (>= 2, < 4) + octokit (>= 4.20, < 10.0) reverse_markdown (>= 1, < 3) rugged (>= 0.24, < 2.0) thor (>= 0.19, < 2.0) @@ -1057,6 +1060,7 @@ GEM rake (~> 13.0) locale (2.1.3) lockbox (1.3.0) + logger (1.6.0) lograge (0.11.2) actionpack (>= 4) activesupport (>= 4) @@ -1065,7 +1069,7 @@ GEM loofah (2.22.0) crass (~> 1.0.2) nokogiri (>= 1.12.0) - lookbook (2.2.2) + lookbook (2.3.2) activemodel css_parser htmlbeautifier (~> 1.3) @@ -1117,11 +1121,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) @@ -1157,8 +1160,7 @@ GEM rack (>= 1.2, < 4) snaky_hash (~> 2.0) version_gem (~> 1.1) - octokit (8.1.0) - base64 + octokit (9.1.0) faraday (>= 1, < 3) sawyer (~> 0.9) ohai (18.1.3) @@ -1191,10 +1193,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 +1201,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 +1212,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 +1229,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,8 +1360,8 @@ GEM diff-lcs (~> 1.5) expgen (~> 0.1) rainbow (~> 3.1.1) - parallel (1.22.1) - parser (3.3.0.5) + parallel (1.24.0) + parser (3.3.3.0) ast (~> 2.4.1) racc parslet (1.8.2) @@ -1278,17 +1374,18 @@ GEM google-protobuf (>= 3.22.3) plist (3.7.0) png_quantizator (0.2.1) - premailer (1.16.0) + premailer (1.23.0) addressable - css_parser (>= 1.6.0) + css_parser (>= 1.12.0) htmlentities (>= 4.0.0) - premailer-rails (1.10.3) + premailer-rails (1.12.0) actionmailer (>= 3) + net-smtp premailer (~> 1.7, >= 1.7.9) prime (0.1.2) forwardable singleton - prism (0.24.0) + prism (0.29.0) proc_to_ast (0.1.0) coderay parser @@ -1315,12 +1412,12 @@ GEM pyu-ruby-sasl (0.0.3.3) raabro (1.4.0) racc (1.6.2) - rack (2.2.8.1) + rack (2.2.9) rack-accept (0.4.5) rack (>= 0.4) rack-attack (6.7.0) rack (>= 1.0, < 4) - rack-cors (2.0.1) + rack-cors (2.0.2) rack (>= 2.0.0) rack-oauth2 (1.21.3) activesupport @@ -1336,21 +1433,21 @@ GEM rack (< 3) 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) + rack-timeout (0.7.0) + 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 +1458,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 +1473,9 @@ GEM rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) - rb_sys (0.9.86) + rb_sys (0.9.94) + rbs (3.5.1) + logger rbtrace (0.5.1) ffi (>= 1.0.6) msgpack (>= 0.4.3) @@ -1388,20 +1487,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) @@ -1430,7 +1529,7 @@ GEM rexml (3.2.6) rinku (2.0.0) rotp (6.3.0) - rouge (4.2.0) + rouge (4.3.0) rqrcode (2.2.0) chunky_png (~> 1.0) rqrcode_core (~> 1.0) @@ -1452,7 +1551,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 +1579,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.17.4) language_server-protocol (~> 3.17.0) - prism (>= 0.22.0, < 0.25) + prism (>= 0.29.0, < 0.31) + rbs (>= 3, < 4) 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) - sorbet-runtime (>= 0.5.9897) - ruby-lsp-rspec (0.1.10) - ruby-lsp (~> 0.14.0) + ruby-lsp-rails (0.3.7) + ruby-lsp (>= 0.17.0, < 0.18.0) + ruby-lsp-rspec (0.1.12) + ruby-lsp (~> 0.17.0) ruby-magic (0.6.0) mini_portile2 (~> 2.8) ruby-openai (3.7.0) @@ -1548,6 +1645,9 @@ GEM sanitize (6.0.2) crass (~> 1.0.2) nokogiri (>= 1.12.0) + sass-embedded (1.77.5) + google-protobuf (>= 3.25, < 5.0) + rake (>= 13) sawyer (0.9.2) addressable (>= 2.3.5) faraday (>= 0.17.3, < 3) @@ -1555,30 +1655,34 @@ 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.4.0) 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) shoulda-matchers (5.1.0) activesupport (>= 5.2.0) + sidekiq (7.1.6) + concurrent-ruby (< 2) + connection_pool (>= 2.3.0) + rack (>= 2.2.4) + redis-client (>= 0.14.0) sidekiq-cron (1.12.0) fugit (~> 1.8) globalid (>= 1.0.1) @@ -1602,7 +1706,8 @@ GEM simplecov_json_formatter (0.1.4) singleton (0.1.1) sixarm_ruby_unaccent (1.2.0) - slack-messenger (2.3.4) + slack-messenger (2.3.6) + re2 (~> 2.7, >= 2.7.0) snaky_hash (2.0.0) hashie version_gem (~> 1.1) @@ -1632,9 +1737,9 @@ GEM sprockets (3.7.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (3.4.2) - actionpack (>= 5.2) - activesupport (>= 5.2) + sprockets-rails (3.5.1) + actionpack (>= 6.1) + activesupport (>= 6.1) sprockets (>= 3.0.0) ssh_data (1.3.0) ssrf_filter (1.0.8) @@ -1646,7 +1751,7 @@ GEM state_machines-activerecord (0.8.0) activerecord (>= 5.1) state_machines-activemodel (>= 0.8.0) - static_holmes (0.7.7) + static_holmes (0.7.11) strings (0.2.1) strings-ansi (~> 0.2) unicode-display_width (>= 1.5, < 3.0) @@ -1673,7 +1778,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 +1863,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 +1894,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,23 +1930,24 @@ 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) asciidoctor-include-ext (~> 0.4.0) - asciidoctor-kroki (~> 0.8.0) + asciidoctor-kroki (~> 0.10.0) asciidoctor-plantuml (~> 0.0.16) + async (~> 2.12.1) atlassian-jwt (~> 0.2.1) 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.199.0) + aws-sdk-s3 (~> 1.154.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 +1967,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) @@ -1880,6 +1987,7 @@ DEPENDENCIES diffy (~> 3.4) discordrb-webhooks (~> 3.5) doorkeeper (~> 5.6, >= 5.6.6) + doorkeeper-device_authorization_grant (~> 1.0.0) doorkeeper-openid_connect (~> 1.8, >= 1.8.7) duo_api (~> 1.3) ed25519 (~> 1.3.0) @@ -1890,7 +1998,7 @@ DEPENDENCIES email_spec (~> 2.2.0) error_tracking_open_api! factory_bot_rails (~> 6.4.3) - faraday (~> 1.0) + faraday (~> 1.10.3) faraday_middleware-aws-sigv4 (~> 0.3.0) fast_blank (~> 1.0.1) ffaker (~> 2.23) @@ -1900,24 +2008,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.1.0) gitlab-backup-cli! gitlab-chronic (~> 0.10.5) - gitlab-dangerfiles (~> 4.7.0) + gitlab-dangerfiles (~> 4.8.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 +2036,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.31.0) gon (~> 6.4.0) google-apis-androidpublisher_v3 (~> 0.34.0) google-apis-cloudbilling_v1 (~> 0.21.0) @@ -1952,52 +2060,52 @@ 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) + graphiql-rails (~> 1.10) graphlient (~> 0.6.0) graphlyte (~> 1.0.0) - graphql (~> 2.2.5) - graphql-docs (~> 4.0.0) - grpc (~> 1.60.0) + graphql (~> 2.3.5) + graphql-docs (~> 5.0.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) html-pipeline (~> 2.14.3) html2text httparty (~> 0.21.0) - icalendar - influxdb-client (~> 2.9) + icalendar (~> 2.10.1) + influxdb-client (~> 3.1) invisible_captcha (~> 2.1.0) ipaddr (~> 1.2.5) ipaddress (~> 0.8.3) ipynbdiff! jira-ruby (~> 2.3.0) js_regex (~> 3.8) - json (~> 2.6.3) + json (~> 2.7.2) json_schemer (~> 0.2.18) 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) lefthook (~> 1.6.8) - letter_opener_web (~> 2.0.0) + letter_opener_web (~> 3.0.0) license_finder (~> 7.0) licensee (~> 9.16) listen (~> 3.7) 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,14 +2115,14 @@ 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) nokogiri (~> 1.16) oauth2 (~> 2.0) - octokit (~> 8.1) + octokit (~> 9.0) ohai (~> 18.1) oj (~> 3.13.21) oj-introspect (~> 0.7) @@ -2023,9 +2131,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,60 +2138,82 @@ 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.3.0) parslet (~> 1.8) peek (~> 1.1) pg (~> 1.5.6) pg_query (~> 5.1.0) png_quantizator (~> 0.2.1) - premailer-rails (~> 1.10.3) + premailer-rails (~> 1.12.0) prometheus-client-mmap (~> 1.1, >= 1.1.1) pry-byebug pry-rails (~> 0.3.9) pry-shell (~> 0.6.4) puma (= 6.4.0) - rack (~> 2.2.8.1) + rack (~> 2.2.9) rack-attack (~> 6.7.0) rack-cors (~> 2.0.1) rack-oauth2 (~> 1.21.3) rack-proxy (~> 0.7.7) - rack-timeout (~> 0.6.3) - rails (~> 7.0.8.1) + rack-timeout (~> 0.7.0) + 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) rexml (~> 3.2.6) - rouge (~> 4.2.0) + rouge (~> 4.3.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.17.0) + ruby-lsp-rails (~> 0.3.6) ruby-lsp-rspec (~> 0.1.10) ruby-magic (~> 0.6) ruby-openai (~> 3.7) @@ -2097,21 +2224,20 @@ 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 (~> 7.1.6) sidekiq-cron (~> 1.12.0) sigdump (~> 0.2.4) simple_po_parser (~> 1.1.6) simplecov (~> 0.22) simplecov-cobertura (~> 2.1.0) simplecov-lcov (~> 0.8.0) - slack-messenger (~> 2.3.4) + slack-messenger (~> 2.3.5) snowplow-tracker (~> 0.8.0) solargraph (~> 0.47.2) spamcheck (~> 1.3.0) @@ -2119,27 +2245,29 @@ DEPENDENCIES spring-commands-rspec (~> 1.0.4) sprite-factory (~> 1.7) sprockets (~> 3.7.0) + sprockets-rails (~> 3.5.1) ssh_data (~> 1.3) stackprof (~> 0.2.25) state_machines-activerecord (~> 0.8.0) - static_holmes (~> 0.7.7) + static_holmes (~> 0.7.11) sys-filesystem (~> 1.4.3) 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) toml-rb (~> 2.2.0) truncato (~> 0.7.12) + tty-prompt (~> 0.23) typhoeus (~> 1.4.0) undercover (~> 0.4.4) unleash (~> 3.2.2) 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 +2279,4 @@ DEPENDENCIES yajl-ruby (~> 1.4.3) BUNDLED WITH - 2.5.8 + 2.5.16 diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix index dff2917092d8b..f24b731790603 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"]; @@ -286,10 +286,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0dhsickf1i4cr1w3l9imbqizv67yx1iqh2dhj3lvvkk7j4s3yfz5"; + sha256 = "0qih280cjsh3nmywa5ja6kbrd576qmkxnp9zbmxjw3hjizc2ahlf"; type = "gem"; }; - version = "0.8.0"; + version = "0.10.0"; }; asciidoctor-plantuml = { dependencies = ["asciidoctor"]; @@ -312,6 +312,17 @@ src: }; version = "2.4.2"; }; + async = { + dependencies = ["console" "fiber-annotation" "io-event"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "199yvq9m9kx3svaxdrqg8ainfh2p7gfmkrlspc5d8nnhysnb6vql"; + type = "gem"; + }; + version = "2.12.1"; + }; atlassian-jwt = { dependencies = ["jwt"]; groups = ["default"]; @@ -400,10 +411,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08h9apxdn2aflkg751j4i56ks4750znfbj56w4zlxf4jk7jxkbyk"; + sha256 = "1lb21zc9fax6c97dq17h7bllm2cg39ms6hi9ya9z88lsdz8sgnj6"; type = "gem"; }; - version = "3.191.6"; + version = "3.199.0"; }; aws-sdk-kms = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -422,10 +433,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1al80phz4x9wwfnr07q1l8h5f0qxgfrrycbg8jvznhxm3zhrakrq"; + sha256 = "035d5q3csa1ac51xmxs2cqqibiifhm9sfdh71xjh0yrxnywdwqbh"; type = "gem"; }; - version = "1.146.1"; + version = "1.154.0"; }; aws-sigv4 = { dependencies = ["aws-eventstream"]; @@ -444,10 +455,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bx67lskxslfd2mpim3kqrxa4sx4qhvnpjpr57j1ll2xppyl9kw8"; + sha256 = "1n7yv7s9mdxa3zz00gj93fsczk58ia3i1lj5adab677fpwbar9wy"; type = "gem"; }; - version = "4.8.0"; + version = "4.9.1"; }; axe-core-rspec = { dependencies = ["axe-core-api" "dumb_delegator" "virtus"]; @@ -455,10 +466,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0fnzb49lmxs18lc6z6araqy1j7jiqh8naiwq9hjj3i7hbajizy75"; + sha256 = "1zbf7rd353i6y1rr9ysk18kj3ivazfi3ma2ny6ryzminxrxhdvri"; type = "gem"; }; - version = "4.9.0"; + version = "4.9.1"; }; axiom-types = { dependencies = ["descendants_tracker" "ice_nine" "thread_safe"]; @@ -538,10 +549,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 +636,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 = []; @@ -945,6 +966,17 @@ src: }; version = "2.4.1"; }; + console = { + dependencies = ["fiber-annotation" "fiber-local" "json"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0hz9j70qyqsszckmvbdywrrgpsf3j5pvfj2l4wn7nlhf3f6by3s6"; + type = "gem"; + }; + version = "1.25.2"; + }; cork = { dependencies = ["colored2"]; groups = ["default" "development"]; @@ -978,6 +1010,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"]; @@ -1083,16 +1126,6 @@ src: }; version = "8.0.0"; }; - dartsass = { - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0i8kivfa4i1m2msw2h5zigxdnar5fvln7xhym85qyp35lmi74zi6"; - type = "gem"; - }; - version = "1.49.8"; - }; database_cleaner-active_record = { dependencies = ["activerecord" "database_cleaner-core"]; groups = ["development" "test"]; @@ -1353,6 +1386,17 @@ src: }; version = "5.6.6"; }; + doorkeeper-device_authorization_grant = { + dependencies = ["doorkeeper"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0y96jc05c26ld35q121yj1g7lfcb55jfsn6d1s2l42fml09arhwl"; + type = "gem"; + }; + version = "1.0.3"; + }; doorkeeper-openid_connect = { dependencies = ["doorkeeper" "jwt"]; groups = ["default"]; @@ -1599,10 +1643,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"]; @@ -1695,10 +1739,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00palwawk897p5gypw5wjrh93d4p0xz2yl9w93yicb4kq7amh8d4"; + sha256 = "1c760q0ks4vj4wmaa7nh1dgvgqiwaw0mjr7v8cymy7i3ffgjxx90"; type = "gem"; }; - version = "1.10.0"; + version = "1.10.3"; }; faraday-em_http = { groups = ["danger" "default" "development" "test"]; @@ -1896,6 +1940,37 @@ src: }; version = "2.6.0"; }; + fiber-annotation = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "00vcmynyvhny8n4p799rrhcx0m033hivy0s1gn30ix8rs7qsvgvs"; + type = "gem"; + }; + version = "0.2.0"; + }; + fiber-local = { + dependencies = ["fiber-storage"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01lz929qf3xa90vra1ai1kh059kf2c8xarfy6xbv1f8g457zk1f8"; + type = "gem"; + }; + version = "1.1.0"; + }; + fiber-storage = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0b5fr7i4p2gfqv6k2d93124zcv2kbdzvamalbcb1hn1yzm12gxq2"; + type = "gem"; + }; + version = "0.1.2"; + }; find_a_port = { groups = ["default" "development" "test"]; platforms = []; @@ -1973,15 +2048,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 +2160,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 +2225,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bp7lsqhcmb1fi1wsij1gbl0ip9jcwmzxagfg39c7dnm7xglycr4"; + sha256 = "0prcxb5ahqpxdswg2957d24k6w74rlnm0x7qlv5p0dr4qzp51x6y"; type = "gem"; }; - version = "16.11.0.pre.rc1"; + version = "17.1.2"; }; gitlab = { dependencies = ["httparty" "terminal-table"]; @@ -2193,10 +2268,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jj5w7h457cm2q0ds63kp29ybkq1h02gibn37y2r0wnbimm8fxi5"; + sha256 = "1nr3llbg4vqs9w3027gmxgv5lhh80fd78kgk7fk79j9famwx09xk"; type = "gem"; }; - version = "4.7.0"; + version = "4.8.0"; }; gitlab-experiment = { dependencies = ["activesupport" "request_store"]; @@ -2226,10 +2301,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 +2317,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 +2332,20 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1m41by1hly50yq9vsz5pbrb51yryf46n9pm7wnrinaisccrinl79"; + sha256 = "0063h3aksh4jp5s7mrir5r2dr94643x736cgxvf1zz75nx0nkyq4"; type = "gem"; }; - version = "0.35.1"; + version = "0.36.1"; }; 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 +2353,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"]; @@ -2349,10 +2424,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00w9p1h3awari07vh33h65y1l1jh7sgym8fzgcp5q5aihha0y9i2"; + sha256 = "0457dvz8zsb4fav85ry1v5pdzpyr41q397zgqzvjvfaa9w44kfj8"; type = "gem"; }; - version = "0.3.0"; + version = "0.3.1"; }; gitlab-secret_detection = { dependencies = ["parallel" "re2" "toml-rb"]; @@ -2375,15 +2450,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 +2493,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 = "0ljg28wf9vmi6bc639fcf19abx5i4a3h04bjvdwr2ih1pbr3hgf1"; type = "gem"; }; - version = "1.21.1"; + version = "1.31.0"; }; globalid = { dependencies = ["activesupport"]; @@ -2533,10 +2608,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 +2641,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 +2652,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"]; @@ -2654,10 +2729,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0amp8vd16pzbdrfbp7k0k38rqxpwd88bkyp35l3x719hbb6l85za"; + sha256 = "0dagdfx3rnk9xplnj19gqpqn41fd09xfn8lp2p75psihhnj2i03l"; type = "gem"; }; - version = "1.6.0"; + version = "1.7.0"; }; google-cloud-env = { dependencies = ["faraday"]; @@ -2665,10 +2740,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05gshdqscg4kil6ppfzmikyavsx449bxyj47j33r4n4p8swsqyb1"; + sha256 = "16b9yjbrzal1cjkdbn29fl06ikjn1dpg1vdsjak1xvhpsp3vhjyg"; type = "gem"; }; - version = "1.6.0"; + version = "2.1.1"; }; google-cloud-errors = { groups = ["default"]; @@ -2714,7 +2789,7 @@ src: version = "1.45.0"; }; google-protobuf = { - groups = ["default"]; + groups = ["default" "development" "opentelemetry" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; @@ -2784,10 +2859,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 +2881,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"]; @@ -2817,10 +2892,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08smc3c2li1xa2nmgjkn742sp1xj9qzppy28v68cz5mc00nkf7pm"; + sha256 = "0wdmkdq907swkf5x8vgj4i166mqh7nnqp612x7768g2jwr6n9h9l"; type = "gem"; }; - version = "0.5.1"; + version = "0.5.4"; }; grape_logging = { dependencies = ["grape" "rack"]; @@ -2834,15 +2909,15 @@ src: version = "1.8.4"; }; graphiql-rails = { - dependencies = ["railties" "sprockets-rails"]; + dependencies = ["railties"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lcf0gc88i3wk8cs71qm62ac9lrc1a8v5sd0369c5ip2ic4wbqh2"; + sha256 = "0h0hi4i49hd7087ba7kh78wykc9gqnz0j9hlhplvkj1ply4zjmxm"; type = "gem"; }; - version = "1.8.0"; + version = "1.10.0"; }; graphlient = { dependencies = ["faraday" "faraday_middleware" "graphql-client"]; @@ -2866,15 +2941,15 @@ src: version = "1.0.0"; }; graphql = { - dependencies = ["racc"]; + dependencies = ["base64"]; groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zmw8gslwqaydxvmvan0m2rpbgxplm77kwp64bg051cvnasb9vhm"; + sha256 = "1w8ahq2sry3hw2p7lmq4sd9ybkky4qr1dn634h6nchb5z0sphdlw"; type = "gem"; }; - version = "2.2.5"; + version = "2.3.5"; }; graphql-client = { dependencies = ["activesupport" "graphql"]; @@ -2882,21 +2957,21 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1iv9d6l14h05vnhrzmm5fn2cnjb469an28c9z7c6p4bgjy0rssgy"; + sha256 = "1hdb5fd1vd1zs7kc84ng7lj95081dqwrapyidg8alsv7a7jbhf7j"; type = "gem"; }; - version = "0.19.0"; + version = "0.23.0"; }; graphql-docs = { - dependencies = ["commonmarker" "dartsass" "escape_utils" "extended-markdown-filter" "gemoji" "graphql" "html-pipeline"]; + dependencies = ["commonmarker" "escape_utils" "extended-markdown-filter" "gemoji" "graphql" "html-pipeline" "sass-embedded"]; groups = ["development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mq2zafz0n5yd0i251w1a37l3dk7dn2mhw5snzhjdnv3jaard0pn"; + sha256 = "011dasgfg93s39p2nnf88v2w9ds2czqxpgxvkxm4nfl0b9pcmfkn"; type = "gem"; }; - version = "4.0.0"; + version = "5.0.0"; }; grpc = { dependencies = ["google-protobuf" "googleapis-common-protos-types"]; @@ -2904,10 +2979,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 +3055,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"]; @@ -3180,10 +3255,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11zfs0l8y2a6gpf0krm91d0ap2mnf04qky89dyzxwaspqxqgj174"; + sha256 = "03ki7wm2iqr3dv7mgrxv2b8vbh42c7yv55dc33a077n8jnxhhc8z"; type = "gem"; }; - version = "2.8.0"; + version = "2.10.1"; }; ice_cube = { groups = ["default"]; @@ -3221,10 +3296,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"]; @@ -3237,6 +3312,16 @@ src: }; version = "2.1.0"; }; + io-event = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1qjcgf02p99r46s0sdr95s0dfc4dik946iqsv9iiahazmi2c192x"; + type = "gem"; + }; + version = "1.6.5"; + }; ipaddr = { groups = ["default"]; platforms = []; @@ -3265,7 +3350,7 @@ src: path = "${src}/gems/ipynbdiff"; type = "path"; }; - version = "0.4.7"; + version = "0.4.8"; }; jaeger-client = { dependencies = ["opentracing" "thrift"]; @@ -3325,10 +3410,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nalhin1gda4v8ybk6lq8f407cgfrj6qzn234yra4ipkmlbfmal6"; + sha256 = "0b4qsi8gay7ncmigr0pnbxyb17y3h8kavdyhsh7nrlqwr35vb60q"; type = "gem"; }; - version = "2.6.3"; + version = "2.7.2"; }; json-jwt = { dependencies = ["activesupport" "aes_key_wrap" "bindata" "httpclient"]; @@ -3433,10 +3518,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 +3593,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08y6f6f4nhg4dc96rbawhjjalxn0chzvvza5d8qfzsac6zl83094"; + sha256 = "0wri6j02jkq75qgd4mpdmi2444lzcvyf63nvkfz9p31rvsj44v5n"; type = "gem"; }; - version = "1.6.8"; + version = "1.6.18"; }; letter_opener = { dependencies = ["launchy"]; @@ -3519,10 +3604,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09a7kgsmr10a0hrc9bwxglgqvppjxij9w8bxx91mnvh0ivaw0nq9"; + sha256 = "1cnv3ggnzyagl50vzs1693aacv08bhwlprcvjp8jcg2w7cp3zwrg"; type = "gem"; }; - version = "1.7.0"; + version = "1.10.0"; }; letter_opener_web = { dependencies = ["actionmailer" "letter_opener" "railties" "rexml"]; @@ -3530,10 +3615,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vvvaz2ngaxv0s6sj25gdvp73vd8pfl8q3jharadg18p3va0m1ik"; + sha256 = "0q4qfi5wnn5bv93zjf10agmzap3sn7gkfmdbryz296wb1vz1wf9z"; type = "gem"; }; - version = "2.0.0"; + version = "3.0.0"; }; libyajl2 = { groups = ["default"]; @@ -3551,10 +3636,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"]; @@ -3562,10 +3647,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05g5w9c4jlfhwn0hfz117s1c7hfdm5yn7cywr4mah7xr41yvbh04"; + sha256 = "16h8yhk4z2wk2lc0l0m7z2pbbk6mfljhy6hp11dx6lw8dp325q0b"; type = "gem"; }; - version = "9.16.1"; + version = "9.17.1"; }; listen = { dependencies = ["rb-fsevent" "rb-inotify"]; @@ -3609,6 +3694,16 @@ src: }; version = "1.3.0"; }; + logger = { + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0gpg8gzi0xwymw4aaq2iafcbx31i3xzkg3fb30mdxn1d4qhc3dqa"; + type = "gem"; + }; + version = "1.6.0"; + }; lograge = { dependencies = ["actionpack" "activesupport" "railties" "request_store"]; groups = ["default"]; @@ -3637,10 +3732,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kxnshqv3xv3hprnn4rsqq0djrqpmfcr7x8qmwy6p91g7yqhkhx5"; + sha256 = "02hniq2gjckb0s70w2p90aymrf4x8lpjl0mq1arhl5fr2gmyzkdb"; type = "gem"; }; - version = "2.2.2"; + version = "2.3.2"; }; lru_redux = { groups = ["default"]; @@ -3960,10 +4055,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 +4071,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"]; @@ -4166,15 +4261,15 @@ src: version = "2.0.9"; }; octokit = { - dependencies = ["base64" "faraday" "sawyer"]; + dependencies = ["faraday" "sawyer"]; groups = ["danger" "default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1kgqga0ycrlrk586gw2s7f8p4w699gjj3zvmmqkhx4afnplrq8l2"; + sha256 = "0lw2537cdgxx9la7d5jwm3qkk5bwarz1v3glh68n4b3js9cscjbq"; type = "gem"; }; - version = "8.1.0"; + version = "9.1.0"; }; ohai = { dependencies = ["chef-config" "chef-utils" "ffi" "ffi-yajl" "ipaddress" "mixlib-cli" "mixlib-config" "mixlib-log" "mixlib-shellout" "plist" "train-core" "wmi-lite"]; @@ -4263,38 +4358,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 +4390,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 +4444,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 +4507,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 +4914,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"]; @@ -4566,10 +4925,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11r6kp8wam0nkfvnwyc1fmvky102r1vcfr84vi2p1a2wa0z32j3p"; + sha256 = "1sryynf3iws1b2ffba1gvmlpf8jzhfva5p0qdf37x6wdj683rqm2"; type = "gem"; }; - version = "3.3.0.5"; + version = "3.3.3.0"; }; parslet = { groups = ["default" "development" "test"]; @@ -4650,21 +5009,21 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11j7d6abxivj15yax47z3f751wz4pnl02qszzc9swswf8hn41r03"; + sha256 = "1yvy5lxq287izy7qsz23hry63rc57wkaaalqvxnwjncm56xgdmzh"; type = "gem"; }; - version = "1.16.0"; + version = "1.23.0"; }; premailer-rails = { - dependencies = ["actionmailer" "premailer"]; + dependencies = ["actionmailer" "net-smtp" "premailer"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bqi7d4f15vy3f1g0xb3bxmncfbzv9dd3ilhqj0plvw64xqbkp3w"; + sha256 = "0004f73kgrglida336fqkgx906m6n05nnfc17mypzg5rc78iaf61"; type = "gem"; }; - version = "1.10.3"; + version = "1.12.0"; }; prime = { dependencies = ["forwardable" "singleton"]; @@ -4682,10 +5041,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"]; @@ -4820,10 +5179,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10mpk0hl6hnv324fp1pfimi2nw9acj0z4gyhrph36qg84pk1s4m7"; + sha256 = "0hj0rkw2z9r1lcg2wlrcld2n3phwrcgqcp7qd1g9a7hwgalh2qzx"; type = "gem"; }; - version = "2.2.8.1"; + version = "2.2.9"; }; rack-accept = { dependencies = ["rack"]; @@ -4853,10 +5212,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02lvkg1nb4z3zc2nry545dap7a64bb9h2k8waxfz0jkabkgnpimw"; + sha256 = "06ysmn14pdf2wyr7agm0qvvr9pzcgyf39w4yvk2n05w9k4alwpa1"; type = "gem"; }; - version = "2.0.1"; + version = "2.0.2"; }; rack-oauth2 = { dependencies = ["activesupport" "attr_required" "httpclient" "json-jwt" "rack"]; @@ -4918,21 +5277,21 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1cqa9lh2rdqqvhfxbrdys7mj2x4vxhqmf57iww2x8961mhp8jm0p"; + sha256 = "1nc7kis61n4q7g78gxxsxygam022glmgwq9snydrkjiwg7lkfwvm"; type = "gem"; }; - version = "0.6.3"; + version = "0.7.0"; }; 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 +5332,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 +5343,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 +5394,21 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "131sa2jvc7b1yld3nzc0xq7lvwvql7b8c09i0xv2brzjybammlv5"; + sha256 = "1jjcxfwwr70l46wylv68mjnazi4zfwn7fn5yb2wnfs4hwzcbwdca"; + type = "gem"; + }; + version = "0.9.94"; + }; + rbs = { + dependencies = ["logger"]; + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1bnb361ca6gizncs8qybfrm1m9pin2siw548pizfd5l711mrzn4f"; type = "gem"; }; - version = "0.9.86"; + version = "3.5.1"; }; rbtrace = { dependencies = ["ffi" "msgpack" "optimist"]; @@ -5119,10 +5489,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 +5511,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 +5522,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 +5533,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 +5544,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"]; @@ -5321,10 +5691,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fkfa0iq3r9b0zzrxpxha17avmyzci3kidzmfbf6fd1279mndpb0"; + sha256 = "072qvvrcqj0yfr3b0j932mlhvn41i38bq37z7z07i3ikagndkqwy"; type = "gem"; }; - version = "4.2.0"; + version = "4.3.0"; }; rqrcode = { dependencies = ["chunky_png" "rqrcode_core"]; @@ -5408,10 +5778,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 +5865,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 +5876,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 +5887,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 +5898,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 +5909,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 +5920,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 +5942,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"]; @@ -5589,26 +5959,26 @@ src: version = "0.3.0"; }; ruby-lsp = { - dependencies = ["language_server-protocol" "prism" "sorbet-runtime"]; + dependencies = ["language_server-protocol" "prism" "rbs" "sorbet-runtime"]; groups = ["development"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ja3ag2q0w8xsbf25sf2x98gvdia534ld2m8hn1bfwzhwb5ysfsl"; + sha256 = "04z280c4mimfwpfgcw2j6b13g1vni0cnrfgwjs9bgkzm95m1vsj9"; type = "gem"; }; - version = "0.14.6"; + version = "0.17.4"; }; ruby-lsp-rails = { - dependencies = ["actionpack" "activerecord" "railties" "ruby-lsp" "sorbet-runtime"]; + dependencies = ["ruby-lsp"]; groups = ["development"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hrb39svnd8v6vnd3vyzsby6qr0z28cj0v9r02hcjvadm2p67g03"; + sha256 = "1w4vvhy8nyffj7bp17842kg6szhfz27w8pni0a7haam78hb86b1r"; type = "gem"; }; - version = "0.3.3"; + version = "0.3.7"; }; ruby-lsp-rspec = { dependencies = ["ruby-lsp"]; @@ -5616,10 +5986,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0npxb9146yqfwpyx3bw375q8vx60ph2zgbvpai1dmgq8dfs3idki"; + sha256 = "1r8i93fq4ijnxbh9pfh5df0d0pl8xr23s7whvwqjyk6w4xg7gzil"; type = "gem"; }; - version = "0.1.10"; + version = "0.1.12"; }; ruby-magic = { dependencies = ["mini_portile2"]; @@ -5767,6 +6137,17 @@ src: }; version = "6.0.2"; }; + sass-embedded = { + dependencies = ["google-protobuf" "rake"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1nmy052pm46781s7ca6x3l4yb5p3glh8sf201xwcwpk9rv2av9m2"; + type = "gem"; + }; + version = "1.77.5"; + }; sawyer = { dependencies = ["addressable" "faraday"]; groups = ["danger" "default" "development" "test"]; @@ -5805,10 +6186,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 +6197,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zhnq4wkcy8vv6qazfg0p3zrlswxhz9glqnq2991p4vg86grq1b0"; + sha256 = "0ndbdsac42sl6ldh6jji7k0agc85v6d28wfd3jb3awyl7hsgs9cn"; type = "gem"; }; - version = "2.0.2"; + version = "3.4.0"; }; sentry-rails = { dependencies = ["railties" "sentry-ruby"]; @@ -5827,32 +6208,21 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gby2dx2h487y8ziisy57ba8mj6scpg6az49n4p989kc2fn2zalr"; + sha256 = "0ncl8br0k6fas4n6c4xw4wr59kq5s2liqn1s4790m73k5p272xq1"; type = "gem"; }; - version = "5.10.0"; - }; - sentry-raven = { - dependencies = ["faraday"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0jin9x4f43lplglhr9smv2wxsjgmph2ygqlci4s0v0aq5493ng8h"; - 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 +6230,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"]; @@ -5901,8 +6271,9 @@ src: groups = ["default"]; platforms = []; source = { - path = "${src}/vendor/gems/sidekiq-7.1.6"; - type = "path"; + remotes = ["https://rubygems.org"]; + sha256 = "18j3g31ps6ga9nzza0z0d00qjrn810fhkhx2pqi3rvxwsmkdlnbq"; + type = "gem"; }; version = "7.1.6"; }; @@ -6021,14 +6392,15 @@ src: version = "1.2.0"; }; slack-messenger = { + dependencies = ["re2"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1h89asinyyyq88v89fdc3nw0g74vq2f7p59s18jrq3svpv913ij9"; + sha256 = "1n367s0wjym1czllgwycgya13r3axgjfpivc6dlvgjzbgmc1wn2q"; type = "gem"; }; - version = "2.3.4"; + version = "2.3.6"; }; snaky_hash = { dependencies = ["hashie" "version_gem"]; @@ -6127,14 +6499,14 @@ src: }; sprockets-rails = { dependencies = ["actionpack" "activesupport" "sprockets"]; - groups = ["default" "test"]; + groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1b9i14qb27zs56hlcc2hf139l0ghbqnjpmfi0054dxycaxvk5min"; + sha256 = "0j7gwm749b3ff6544wxa878fpd1kvf2qc9fafassi8c7735jcin4"; type = "gem"; }; - version = "3.4.2"; + version = "3.5.1"; }; ssh_data = { groups = ["default"]; @@ -6203,10 +6575,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01w2vjm0sssiw3j38jhgkqsqn1wdqnm2ld24hi8ib2bj47c2di47"; + sha256 = "1frj0w4bmqpih40sxxig3055rm2ijnw6jkdvnbh5crlq6pnv6p63"; type = "gem"; }; - version = "0.7.7"; + version = "0.7.11"; }; strings = { dependencies = ["strings-ansi" "unicode-display_width" "unicode_utils"]; @@ -6361,10 +6733,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 +7174,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 +7271,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/gitlab/update.py b/pkgs/applications/version-management/gitlab/update.py index bb46af27c690c..ee723769b7614 100755 --- a/pkgs/applications/version-management/gitlab/update.py +++ b/pkgs/applications/version-management/gitlab/update.py @@ -180,6 +180,21 @@ def update_rubyenv(): cwd=rubyenv_dir, ) + # Un-vendor sidekiq + # + # The sidekiq dependency was vendored to maintain compatibility with Redis 6.0 (as + # stated in this [comment]) but unfortunately, it seems to cause a crash in the + # application, as noted in this [upstream issue]. + # + # We can safely swap out the dependency, as our Redis release in nixpkgs is >= 7.0. + # + # [comment]: https://gitlab.com/gitlab-org/gitlab/-/issues/468435#note_1979750600 + # [upstream issue]: https://gitlab.com/gitlab-org/gitlab/-/issues/468435 + subprocess.check_output( + ["sed", "-i", "s|gem 'sidekiq', path: 'vendor/gems/sidekiq-7.1.6', require: 'sidekiq'|gem 'sidekiq', '~> 7.1.6'|g", "Gemfile"], + cwd=rubyenv_dir, + ) + # Fetch vendored dependencies temporarily in order to build the gemset.nix subprocess.check_output(["mkdir", "-p", "vendor/gems", "gems"], cwd=rubyenv_dir) subprocess.check_output( @@ -194,7 +209,7 @@ def update_rubyenv(): [ "sh", "-c", - f"curl -L https://gitlab.com/gitlab-org/gitlab/-/archive/v{version}-ee/gitlab-v{version}-ee.tar.bz2?path=gems | tar -xj --strip-components=3", + f"curl -L https://gitlab.com/gitlab-org/gitlab/-/archive/v{version}-ee/gitlab-v{version}-ee.tar.bz2?path=gems | tar -xj --strip-components=2", ], cwd=f"{rubyenv_dir}/gems", ) @@ -230,8 +245,16 @@ def update_gitaly(): logger.info("Updating gitaly") data = _get_data_json() gitaly_server_version = data['passthru']['GITALY_SERVER_VERSION'] + repo = GitLabRepo(repo="gitaly") + gitaly_dir = pathlib.Path(__file__).parent / 'gitaly' + + makefile = repo.get_file("Makefile", f"v{gitaly_server_version}") + makefile += "\nprint-%:;@echo $($*)\n" + + git_version = subprocess.run(["make", "-f", "-", "print-GIT_VERSION"], check=True, input=makefile, text=True, capture_output=True).stdout.strip() _call_nix_update("gitaly", gitaly_server_version) + _call_nix_update("gitaly.git", git_version) @cli.command("update-gitlab-pages") diff --git a/pkgs/applications/version-management/gitless/default.nix b/pkgs/applications/version-management/gitless/default.nix index 8bbb0eee971de..93014402a2ebd 100644 --- a/pkgs/applications/version-management/gitless/default.nix +++ b/pkgs/applications/version-management/gitless/default.nix @@ -15,7 +15,6 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-XDB1i2b1reMCM6i1uK3IzTnsoLXO7jldYtNlYUo1AoQ="; }; - nativeBuildInputs = [ python3.pkgs.pythonRelaxDepsHook ]; propagatedBuildInputs = with python3.pkgs; [ pygit2 diff --git a/pkgs/applications/version-management/gitnr/default.nix b/pkgs/applications/version-management/gitnr/default.nix index a6d5a5bd61e36..3e4e1c07f8523 100644 --- a/pkgs/applications/version-management/gitnr/default.nix +++ b/pkgs/applications/version-management/gitnr/default.nix @@ -28,9 +28,9 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libxkbcommon wayland ]; diff --git a/pkgs/applications/version-management/gitolite/default.nix b/pkgs/applications/version-management/gitolite/default.nix index 6e7a627f9cba6..df0c759760321 100644 --- a/pkgs/applications/version-management/gitolite/default.nix +++ b/pkgs/applications/version-management/gitolite/default.nix @@ -1,4 +1,4 @@ -{ stdenv, coreutils, fetchFromGitHub, git, lib, makeWrapper, nettools, perl, perlPackages, nixosTests }: +{ stdenv, coreutils, fetchFromGitHub, git, lib, makeWrapper, nettools, perl, nixosTests }: stdenv.mkDerivation rec { pname = "gitolite"; diff --git a/pkgs/applications/version-management/gitoxide/default.nix b/pkgs/applications/version-management/gitoxide/default.nix index c4ff74a860484..f89e80c2daa6d 100644 --- a/pkgs/applications/version-management/gitoxide/default.nix +++ b/pkgs/applications/version-management/gitoxide/default.nix @@ -19,20 +19,20 @@ let ein = "${stdenv.hostPlatform.emulator buildPackages} $out/bin/ein"; in rustPlatform.buildRustPackage rec { pname = "gitoxide"; - version = "0.36.0"; + version = "0.37.0"; src = fetchFromGitHub { owner = "Byron"; repo = "gitoxide"; rev = "v${version}"; - hash = "sha256-HXuMcLY5BAC2dODlI6sgwCyGEBDW6ojlHRCBnIQ6P6A="; + hash = "sha256-ZnfWIFphIdPHKvpzO0Cn5KCahpvKh56HZun09I1l8Vc="; }; - cargoHash = "sha256-v+HVrYMPwbD0RDyxufv11KOnWGbTljpbx6ZlSJ46Olk="; + cargoHash = "sha256-oKcCodoMUaduxXXgUV+z7zlg5mc783PSsgoECdW/Uug="; nativeBuildInputs = [ cmake pkg-config installShellFiles ]; - buildInputs = [ curl ] ++ (if stdenv.isDarwin + buildInputs = [ curl ] ++ (if stdenv.hostPlatform.isDarwin then [ libiconv Security SystemConfiguration ] else [ openssl ]); diff --git a/pkgs/applications/version-management/gitsign/default.nix b/pkgs/applications/version-management/gitsign/default.nix index d2c7b20aef87f..abc1e6a325943 100644 --- a/pkgs/applications/version-management/gitsign/default.nix +++ b/pkgs/applications/version-management/gitsign/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, stdenv, makeWrapper, gitMinimal, testers, gitsign }: +{ lib, buildGoModule, fetchFromGitHub, makeWrapper, gitMinimal, testers, gitsign }: buildGoModule rec { pname = "gitsign"; diff --git a/pkgs/applications/version-management/gittyup/default.nix b/pkgs/applications/version-management/gittyup/default.nix index 6fa79e69260a5..146f2c7e95251 100644 --- a/pkgs/applications/version-management/gittyup/default.nix +++ b/pkgs/applications/version-management/gittyup/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { openssl qtbase qttools - ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ CoreFoundation Security ]); @@ -71,8 +71,8 @@ stdenv.mkDerivation rec { description = "Graphical Git client designed to help you understand and manage your source code history"; homepage = "https://murmele.github.io/Gittyup"; license = with licenses; [ mit ]; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = platforms.unix; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/applications/version-management/gitweb/default.nix b/pkgs/applications/version-management/gitweb/default.nix index 2c8d7eedc2d90..f2cb91ac4f838 100644 --- a/pkgs/applications/version-management/gitweb/default.nix +++ b/pkgs/applications/version-management/gitweb/default.nix @@ -22,6 +22,6 @@ in buildEnv { ++ [ "${git}/share/gitweb" ]; meta = git.meta // { - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/version-management/glab/default.nix b/pkgs/applications/version-management/glab/default.nix index 9f3e08464dd30..31af001051137 100644 --- a/pkgs/applications/version-management/glab/default.nix +++ b/pkgs/applications/version-management/glab/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "glab"; - version = "1.41.0"; + version = "1.45.0"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "cli"; rev = "v${version}"; - hash = "sha256-DvIp7eMBWKWQ5VW9MW391xnUz8o1KNz1mkJtu7YVILo="; + hash = "sha256-jTpddpS+FYSQg2aRxQiVlG+bitiIqmZ4kxOJLPZkICo="; }; - vendorHash = "sha256-WM19Kx2b31e4/iA92U9FUuF8R1DMvbKotE2D9HpLQpQ="; + vendorHash = "sha256-o0sYObTeDgG+3X3YEnDbk1h4DkEiMwEgYMF7hGjCL3Q="; ldflags = [ "-s" diff --git a/pkgs/applications/version-management/gogs/default.nix b/pkgs/applications/version-management/gogs/default.nix index 534fd288d43e9..5b7a986cf2069 100644 --- a/pkgs/applications/version-management/gogs/default.nix +++ b/pkgs/applications/version-management/gogs/default.nix @@ -4,8 +4,6 @@ , pamSupport ? true }: -with lib; - buildGoModule rec { pname = "gogs"; version = "0.13.0"; @@ -27,19 +25,19 @@ buildGoModule rec { nativeBuildInputs = [ makeWrapper openssh ]; - buildInputs = optional pamSupport pam; + buildInputs = lib.optional pamSupport pam; tags = - ( optional sqliteSupport "sqlite" - ++ optional pamSupport "pam"); + ( lib.optional sqliteSupport "sqlite" + ++ lib.optional pamSupport "pam"); postInstall = '' wrapProgram $out/bin/gogs \ - --prefix PATH : ${makeBinPath [ bash git gzip openssh ]} + --prefix PATH : ${lib.makeBinPath [ bash git gzip openssh ]} ''; - meta = { + meta = with lib; { description = "Painless self-hosted Git service"; homepage = "https://gogs.io"; license = licenses.mit; diff --git a/pkgs/applications/version-management/gomp/default.nix b/pkgs/applications/version-management/gomp/default.nix index 1aa5bb9951b7b..4cac73ebe866d 100644 --- a/pkgs/applications/version-management/gomp/default.nix +++ b/pkgs/applications/version-management/gomp/default.nix @@ -5,11 +5,11 @@ python3Packages.buildPythonApplication rec { pname = "gomp"; - version = "1.1.0"; + version = "1.1.1"; src = fetchPypi { inherit pname version; - sha256 = "11nq40igqbyfiygdzb1zyxx1n6d9xkv8vlmprbbi75mq54gfihhb"; + sha256 = "sha256-Ixq9jtV56FKbh68jqmRd3lwpbMG00GcOUIpjzJhnSp0="; }; doCheck = false; # tests require interactive terminal diff --git a/pkgs/applications/version-management/gql/default.nix b/pkgs/applications/version-management/gql/default.nix index cb94d6f3bb238..d92e38f13f780 100644 --- a/pkgs/applications/version-management/gql/default.nix +++ b/pkgs/applications/version-management/gql/default.nix @@ -4,23 +4,25 @@ , pkg-config , libgit2 , zlib +, cmake }: rustPlatform.buildRustPackage rec { pname = "gql"; - version = "0.9.0"; + version = "0.27.0"; src = fetchFromGitHub { owner = "AmrDeveloper"; repo = "GQL"; rev = version; - hash = "sha256-A9gjCuWIRdNQhMjdRIH0B5cXGZAPQxK+qYSNI5WGZec="; + hash = "sha256-/cL/Ts5RbClGqs5D93RTC7A5fr6Ca1c1sNbVZE4zK+E="; }; - cargoHash = "sha256-aA7YPUKlBhfIBvT4D6zgZ8+lKNNazsVwGJC5VETAzOY="; + cargoHash = "sha256-o9eTOauQF5sf8UPyG0os2NQLsNkAIUOGhmMsZo6Kncw="; nativeBuildInputs = [ pkg-config + cmake ]; buildInputs = [ diff --git a/pkgs/applications/version-management/guilt/default.nix b/pkgs/applications/version-management/guilt/default.nix index aeb0eaf43f11a..bca572b28bcac 100644 --- a/pkgs/applications/version-management/guilt/default.nix +++ b/pkgs/applications/version-management/guilt/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { gawk git gnused - ] ++ lib.optionals stdenv.isDarwin [ openssl ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ openssl ]; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/applications/version-management/gut/default.nix b/pkgs/applications/version-management/gut/default.nix index a6604e24fb345..0192fc3df937d 100644 --- a/pkgs/applications/version-management/gut/default.nix +++ b/pkgs/applications/version-management/gut/default.nix @@ -28,7 +28,7 @@ buildGoModule rec { description = "Alternative git CLI"; homepage = "https://gut-cli.dev"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; mainProgram = "gut"; }; } diff --git a/pkgs/applications/version-management/hut/default.nix b/pkgs/applications/version-management/hut/default.nix index beb0926769b5b..f53ef737de3c1 100644 --- a/pkgs/applications/version-management/hut/default.nix +++ b/pkgs/applications/version-management/hut/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "hut"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromSourcehut { - owner = "~emersion"; + owner = "~xenrox"; repo = "hut"; rev = "v${version}"; - sha256 = "sha256-Gkxe9B48nwHOlqkgjMdFLBy7OiR7cwDDE3qLvWxJK+Y="; + sha256 = "sha256-wfnuGnO1aiK0D8P5nMCqD38DJ3RpcsK//02KaE5SkZE="; }; - vendorHash = "sha256-OYXRQEP4ACkypXmrorf2ew18819DB38SsYOM0u0steg="; + vendorHash = "sha256-6dIqcjtacxlmadnPzRlOJYoyOaO4zdjzrjO64KS2Bq0="; nativeBuildInputs = [ scdoc @@ -32,7 +32,7 @@ buildGoModule rec { ''; meta = with lib; { - homepage = "https://sr.ht/~emersion/hut/"; + homepage = "https://sr.ht/~xenrox/hut/"; description = "CLI tool for Sourcehut / sr.ht"; license = licenses.agpl3Only; maintainers = with maintainers; [ fgaz ]; diff --git a/pkgs/applications/version-management/josh/default.nix b/pkgs/applications/version-management/josh/default.nix index aed7ab9b52bfa..ee95e9726ae50 100644 --- a/pkgs/applications/version-management/josh/default.nix +++ b/pkgs/applications/version-management/josh/default.nix @@ -13,21 +13,21 @@ let # josh-ui requires javascript dependencies, haven't tried to figure it out yet cargoFlags = [ "--workspace" "--exclude" "josh-ui" ]; + version = "24.08.14"; in -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage { pname = "josh"; - version = "23.12.04"; - JOSH_VERSION = "r${version}"; + inherit version; src = fetchFromGitHub { owner = "esrlabs"; repo = "josh"; - rev = JOSH_VERSION; - sha256 = "10fspcafqnv6if5c1h8z9pf9140jvvlrch88w62wsg4w2vhaii0v"; + rev = "v${version}"; + hash = "sha256-6U1nhERpPQAVgQm6xwRlHIhslYBLd65DomuGn5yRiSs="; }; - cargoSha256 = "1j0vl3h6f65ldg80bgryh1mz423lcrcdkn8rmajya1850pfxk3w3"; + cargoHash = "sha256-s6+Bd4ucwUinrcbjNvlDsf9LhWc/U9SAvBRW7JAmxVA="; nativeBuildInputs = [ pkg-config @@ -44,6 +44,9 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = cargoFlags; cargoTestFlags = cargoFlags; + # used to teach josh itself about its version number + env.JOSH_VERSION = "r${version}"; + postInstall = '' wrapProgram "$out/bin/josh-proxy" --prefix PATH : "${git}/bin" ''; diff --git a/pkgs/applications/version-management/jujutsu/default.nix b/pkgs/applications/version-management/jujutsu/default.nix deleted file mode 100644 index 2cdf24160c518..0000000000000 --- a/pkgs/applications/version-management/jujutsu/default.nix +++ /dev/null @@ -1,88 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, rustPlatform -, Security -, SystemConfiguration -, pkg-config -, libiconv -, openssl -, gzip -, libssh2 -, libgit2 -, zstd -, installShellFiles -, nix-update-script -, testers -, jujutsu -}: - -rustPlatform.buildRustPackage rec { - pname = "jujutsu"; - version = "0.18.0"; - - src = fetchFromGitHub { - owner = "martinvonz"; - repo = "jj"; - rev = "v${version}"; - hash = "sha256-5KKF85RNCPPaXMxBb7m2XC3EaEo+UcEhBdfMEzNPsAg="; - }; - - cargoHash = "sha256-MiJuen3Lo7nPaAK30cENw3ACAdoYbHDoiGS05dk5m6U="; - - cargoBuildFlags = [ "--bin" "jj" ]; # don't install the fake editors - useNextest = false; # nextest is the upstream integration framework, but is problematic for test skipping - ZSTD_SYS_USE_PKG_CONFIG = "1"; # disable vendored zlib - LIBSSH2_SYS_USE_PKG_CONFIG = "1"; # disable vendored libssh2 - - nativeBuildInputs = [ - gzip - installShellFiles - pkg-config - ]; - - buildInputs = [ - openssl - zstd - libgit2 - libssh2 - ] ++ lib.optionals stdenv.isDarwin [ - Security - SystemConfiguration - libiconv - ]; - - postInstall = '' - $out/bin/jj util mangen > ./jj.1 - installManPage ./jj.1 - - installShellCompletion --cmd jj \ - --bash <($out/bin/jj util completion bash) \ - --fish <($out/bin/jj util completion fish) \ - --zsh <($out/bin/jj util completion zsh) - ''; - - checkFlags = [ - # signing tests spin up an ssh-agent and do git checkouts - "--skip=test_ssh_signing" - ]; - - passthru = { - updateScript = nix-update-script { }; - tests = { - version = testers.testVersion { - package = jujutsu; - command = "jj --version"; - }; - }; - }; - - meta = with lib; { - description = "Git-compatible DVCS that is both simple and powerful"; - homepage = "https://github.com/martinvonz/jj"; - changelog = "https://github.com/martinvonz/jj/blob/v${version}/CHANGELOG.md"; - license = licenses.asl20; - maintainers = with maintainers; [ _0x4A6F thoughtpolice ]; - mainProgram = "jj"; - }; -} diff --git a/pkgs/applications/version-management/lab/default.nix b/pkgs/applications/version-management/lab/default.nix index 0a4637d533fb7..f2ca2210f427b 100644 --- a/pkgs/applications/version-management/lab/default.nix +++ b/pkgs/applications/version-management/lab/default.nix @@ -36,7 +36,7 @@ buildGoModule rec { description = "Lab wraps Git or Hub, making it simple to clone, fork, and interact with repositories on GitLab"; homepage = "https://zaquestion.github.io/lab"; license = licenses.cc0; - maintainers = with maintainers; [ dtzWill ]; + maintainers = [ ]; mainProgram = "lab"; }; } diff --git a/pkgs/applications/version-management/legit-web/default.nix b/pkgs/applications/version-management/legit-web/default.nix index 3c42284702d2a..ae76752f70c3b 100644 --- a/pkgs/applications/version-management/legit-web/default.nix +++ b/pkgs/applications/version-management/legit-web/default.nix @@ -1,20 +1,21 @@ { lib , buildGoModule , fetchFromGitHub +, nixosTests }: buildGoModule rec { pname = "legit"; - version = "0.2.2"; + version = "0.2.3"; src = fetchFromGitHub { repo = "legit"; owner = "icyphox"; rev = "v${version}"; - hash = "sha256-TBq1ILBhojMIxnLj108L0zLmFsZD/ET9w5cSbqk8+XM="; + hash = "sha256-C6PzZFYGjQs1BbYuEwcTpLQ3bNVb1rXTd0zXosF1kaE="; }; - vendorHash = "sha256-IeWgmUNkBU3W6ayfRkzMO/0XHNqm5zy5lLUNePzv+ug="; + vendorHash = "sha256-G4Wij0UCiXyVtb+66yU3FY2WbpPfqo0SA7OOcywnKU0="; postInstall = '' mkdir -p $out/lib/legit/templates @@ -24,6 +25,8 @@ buildGoModule rec { cp -r $src/static/* $out/lib/legit/static ''; + passthru.tests = { inherit (nixosTests) legit; }; + meta = { description = "Web frontend for git"; homepage = "https://github.com/icyphox/legit"; diff --git a/pkgs/applications/version-management/legit/default.nix b/pkgs/applications/version-management/legit/default.nix index 93d274ecaf2fc..d03bc426243be 100644 --- a/pkgs/applications/version-management/legit/default.nix +++ b/pkgs/applications/version-management/legit/default.nix @@ -9,7 +9,7 @@ python3Packages.buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-lJOWtoApqK9AWrIMkBkCNB72vVXH/sbatxFB1j1AaxE="; + hash = "sha256-lJOWtoApqK9AWrIMkBkCNB72vVXH/sbatxFB1j1AaxE="; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/applications/version-management/lucky-commit/default.nix b/pkgs/applications/version-management/lucky-commit/default.nix index dcaca33f09522..6e3cb2c09d5f9 100644 --- a/pkgs/applications/version-management/lucky-commit/default.nix +++ b/pkgs/applications/version-management/lucky-commit/default.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-8JkodGtMdYP/IIBqRcJFD5syiZi+VakDyX7VcvR0HLo="; - buildInputs = lib.optional withOpenCL (if stdenv.isDarwin then OpenCL else ocl-icd); + buildInputs = lib.optional withOpenCL (if stdenv.hostPlatform.isDarwin then OpenCL else ocl-icd); buildNoDefaultFeatures = !withOpenCL; diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix index f5e66083553cb..1fcc3c235816a 100644 --- a/pkgs/applications/version-management/meld/default.nix +++ b/pkgs/applications/version-management/meld/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , fetchurl , gettext , itstool @@ -13,7 +14,9 @@ , gtk3 , gtksourceview4 , gnome +, adwaita-icon-theme , gsettings-desktop-schemas +, desktopToDarwinBundle }: python3.pkgs.buildPythonApplication rec { @@ -38,13 +41,13 @@ python3.pkgs.buildPythonApplication rec { gobject-introspection wrapGAppsHook3 gtk3 # for gtk-update-icon-cache - ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ desktopToDarwinBundle ]; buildInputs = [ gtk3 gtksourceview4 gsettings-desktop-schemas - gnome.adwaita-icon-theme + adwaita-icon-theme ]; pythonPath = with python3.pkgs; [ diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 25c2df1ad71be..5a790ff3f4d3f 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -1,8 +1,6 @@ { lib, stdenv, fetchurl, python3Packages, makeWrapper, gettext, installShellFiles , re2Support ? true -# depends on rust-cpython which won't support python312 -# https://github.com/dgrunwald/rust-cpython/commit/e815555629e557be084813045ca1ddebc2f76ef9 -, rustSupport ? (stdenv.hostPlatform.isLinux && python3Packages.pythonOlder "3.12"), cargo, rustPlatform, rustc +, rustSupport ? stdenv.hostPlatform.isLinux, cargo, rustPlatform, rustc , fullBuild ? false , gitSupport ? fullBuild , guiSupport ? fullBuild, tk @@ -19,15 +17,15 @@ }: let - inherit (python3Packages) docutils python fb-re2 pygit2 pygments; + inherit (python3Packages) docutils python fb-re2 pygit2 pygments setuptools; self = python3Packages.buildPythonApplication rec { pname = "mercurial${lib.optionalString fullBuild "-full"}"; - version = "6.6.3"; + version = "6.8.1"; src = fetchurl { url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz"; - hash = "sha256-911qSnWCOht9cTpJZ+yi9Zb0ZuWPxrwG1yZCky/X4wc="; + hash = "sha256-Aw6Kem1ZDk6utAPuJWdWFc2A0jbzq4oLVtzIQYEViwU="; }; format = "other"; @@ -37,7 +35,7 @@ let cargoDeps = if rustSupport then rustPlatform.fetchCargoTarball { inherit src; name = "mercurial-${version}"; - sha256 = "sha256-G5tzwoIGOgpVI35rYXDeelnBgTbAiq7BDcXCHQzqSrs="; + hash = "sha256-i5AVyi9m7qLLubhV8fBhhZ6/RYOjMdwmv9Bek9pT/xo="; sourceRoot = "mercurial-${version}/rust"; } else null; cargoRoot = if rustSupport then "rust" else null; @@ -45,14 +43,14 @@ let propagatedBuildInputs = lib.optional re2Support fb-re2 ++ lib.optional gitSupport pygit2 ++ lib.optional highlightSupport pygments; - nativeBuildInputs = [ makeWrapper gettext installShellFiles python3Packages.setuptools ] + nativeBuildInputs = [ makeWrapper gettext installShellFiles setuptools ] ++ lib.optionals rustSupport [ rustPlatform.cargoSetupHook cargo rustc ]; buildInputs = [ docutils ] - ++ lib.optionals stdenv.isDarwin [ ApplicationServices ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ ApplicationServices ]; makeFlags = [ "PREFIX=$(out)" ] ++ lib.optional rustSupport "PURE=--rust"; @@ -94,7 +92,7 @@ let downloadPage = "https://www.mercurial-scm.org/release/"; changelog = "https://wiki.mercurial-scm.org/Release${versions.majorMinor version}"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ eelco lukegb pacien techknowlogick ]; + maintainers = with maintainers; [ lukegb pacien techknowlogick ]; platforms = platforms.unix; mainProgram = "hg"; }; @@ -114,6 +112,9 @@ let gnupg ]; + # https://bz.mercurial-scm.org/show_bug.cgi?id=6887 + propagatedBuildInputs = [ setuptools ]; + postPatch = '' patchShebangs . @@ -127,6 +128,12 @@ let --replace '*/hg:' '*/*hg*:' \${/* paths emitted by our wrapped hg look like ..hg-wrapped-wrapped */""} --replace '"$PYTHON" "$BINDIR"/hg' '"$BINDIR"/hg' ${/* 'hg' is a wrapper; don't run using python directly */""} done + + # https://bz.mercurial-scm.org/show_bug.cgi?id=6887 + # Adding setuptools to the python path is not enough for the distutils + # module to be found, so we patch usage directly: + substituteInPlace tests/hghave.py \ + --replace-fail "distutils" "setuptools._distutils" ''; # This runs Mercurial _a lot_ of times. @@ -156,6 +163,21 @@ let # Python 3.10-3.12 deprecation warning: asyncore # https://bz.mercurial-scm.org/show_bug.cgi?id=6727 test-patchbomb-tls.t + + # Python 3.12 _lsprof module change, breaking profile test + # https://bz.mercurial-scm.org/show_bug.cgi?id=6846 + test-profile.t + + # Python 3.12 deprecation warning: multi-threaded fork in worker.py + # https://bz.mercurial-scm.org/show_bug.cgi?id=6892 + test-clone-stream.t + test-clonebundles.t + test-fix-topology.t + test-fix.t + test-persistent-nodemap.t + test-profile.t + test-simple-update.t + EOF export HGTEST_REAL_HG="${mercurial}/bin/hg" diff --git a/pkgs/applications/version-management/merge-fmt/default.nix b/pkgs/applications/version-management/merge-fmt/default.nix index 6a9a18aa992f2..3924650d994d8 100644 --- a/pkgs/applications/version-management/merge-fmt/default.nix +++ b/pkgs/applications/version-management/merge-fmt/default.nix @@ -15,6 +15,9 @@ buildDunePackage rec { buildInputs = [ cmdliner base stdio ]; + # core v0.17 compatibility, obtained by `git diff -r 3e37827~2..3e37827` + patches = [ ./merge-fmt.patch ]; + meta = with lib; { description = "Git mergetool leveraging code formatters"; homepage = "https://github.com/hhugo/merge-fmt"; diff --git a/pkgs/applications/version-management/merge-fmt/merge-fmt.patch b/pkgs/applications/version-management/merge-fmt/merge-fmt.patch new file mode 100644 index 0000000000000..d2438b3b3bfdf --- /dev/null +++ b/pkgs/applications/version-management/merge-fmt/merge-fmt.patch @@ -0,0 +1,248 @@ +diff --git a/.ocamlformat b/.ocamlformat +index fe6ed57..3532006 100644 +--- a/.ocamlformat ++++ b/.ocamlformat +@@ -3,4 +3,4 @@ type-decl=sparse + break-separators=before + if-then-else=keyword-first + dock-collection-brackets=false +-version=0.24.1 +\ No newline at end of file ++version=0.26.1 +\ No newline at end of file +diff --git a/dune b/dune +index 61ec19c..9446de9 100644 +--- a/dune ++++ b/dune +@@ -2,22 +2,34 @@ + (targets merge-fmt-help.txt) + (deps ./src/merge_fmt.exe) + (mode promote) +- (action (with-stdout-to %{targets} (run ./src/merge_fmt.exe --help=plain)))) ++ (action ++ (with-stdout-to ++ %{targets} ++ (run ./src/merge_fmt.exe --help=plain)))) + + (rule + (targets merge-fmt-mergetool-help.txt) + (deps ./src/merge_fmt.exe) + (mode promote) +- (action (with-stdout-to %{targets} (run ./src/merge_fmt.exe mergetool --help=plain)))) ++ (action ++ (with-stdout-to ++ %{targets} ++ (run ./src/merge_fmt.exe mergetool --help=plain)))) + + (rule + (targets merge-fmt-setup-mergetool-help.txt) + (deps ./src/merge_fmt.exe) + (mode promote) +- (action (with-stdout-to %{targets} (run ./src/merge_fmt.exe setup-mergetool --help=plain)))) ++ (action ++ (with-stdout-to ++ %{targets} ++ (run ./src/merge_fmt.exe setup-mergetool --help=plain)))) + + (rule + (targets merge-fmt-setup-merge-help.txt) + (deps ./src/merge_fmt.exe) + (mode promote) +- (action (with-stdout-to %{targets} (run ./src/merge_fmt.exe setup-merge --help=plain)))) ++ (action ++ (with-stdout-to ++ %{targets} ++ (run ./src/merge_fmt.exe setup-merge --help=plain)))) +diff --git a/dune-project b/dune-project +index 4b39e3f..2bc4ec2 100644 +--- a/dune-project ++++ b/dune-project +@@ -1,3 +1,2 @@ +-(lang dune 1.6) +-(using fmt 1.0) ++(lang dune 3.0) + (name merge-fmt) +diff --git a/merge-fmt.opam b/merge-fmt.opam +index 6827173..579f6a1 100644 +--- a/merge-fmt.opam ++++ b/merge-fmt.opam +@@ -11,7 +11,7 @@ build: [["dune" "build" "-p" name "-j" jobs]] + + depends: [ + "ocaml" {>= "4.06.1"} +- "dune" {>= "1.6"} ++ "dune" {>= "3.0"} + "cmdliner" {>= "1.1.0"} + "base" + "stdio" +diff --git a/src/common.ml b/src/common.ml +index 3ca6809..f88bbd9 100644 +--- a/src/common.ml ++++ b/src/common.ml +@@ -18,8 +18,8 @@ let open_process_in_respect_exit ~echo fmt = + let contents = In_channel.input_all ic in + match Unix.close_process_in ic with + | WEXITED 0 -> contents +- | WEXITED n -> Caml.exit n +- | WSIGNALED _ | WSTOPPED _ -> Caml.exit 1) ++ | WEXITED n -> Stdlib.exit n ++ | WSIGNALED _ | WSTOPPED _ -> Stdlib.exit 1) + fmt + + let system ~echo fmt = +@@ -35,8 +35,8 @@ let system_respect_exit ~echo fmt = + if echo then eprintf "+ %s\n%!" s; + match Unix.system s with + | WEXITED 0 -> () +- | WEXITED n -> Caml.exit n +- | WSIGNALED _ | WSTOPPED _ -> Caml.exit 1) ++ | WEXITED n -> Stdlib.exit n ++ | WSIGNALED _ | WSTOPPED _ -> Stdlib.exit 1) + fmt + + module Flags = struct +diff --git a/src/dune b/src/dune +index 1ae55ce..1cfd576 100644 +--- a/src/dune ++++ b/src/dune +@@ -1,5 +1,4 @@ + (executables +- (names merge_fmt) +- (public_names merge-fmt) +- (libraries base stdio unix cmdliner) +-) +\ No newline at end of file ++ (names merge_fmt) ++ (public_names merge-fmt) ++ (libraries base stdio unix cmdliner)) +diff --git a/src/fmters.ml b/src/fmters.ml +index e190f4b..43616ab 100644 +--- a/src/fmters.ml ++++ b/src/fmters.ml +@@ -36,7 +36,7 @@ let dune ~bin = + + let find ~config ~filename ~name = + let filename = Option.value ~default:filename name in +- match (filename, Caml.Filename.extension filename, config) with ++ match (filename, Stdlib.Filename.extension filename, config) with + | _, (".ml" | ".mli"), { ocamlformat_path; _ } -> + Some (ocamlformat ~bin:ocamlformat_path ~name) + | _, (".re" | ".rei"), { refmt_path; _ } -> Some (refmt ~bin:refmt_path) +diff --git a/src/merge_cmd.ml b/src/merge_cmd.ml +index a0fa68f..6cd5377 100644 +--- a/src/merge_cmd.ml ++++ b/src/merge_cmd.ml +@@ -2,7 +2,12 @@ open Base + open Stdio + open Common + +-let debug_oc = lazy (Out_channel.create ~append:true "/tmp/merge-fmt.log") ++let debug_oc = ++ lazy ++ (Out_channel.create ~append:true ++ (Stdlib.Filename.concat ++ (Stdlib.Filename.get_temp_dir_name ()) ++ "merge-fmt.log")) + + let debug fmt = + if true +@@ -12,7 +17,7 @@ let debug fmt = + let merge config echo current base other output name = + match (current, base, other) with + | (None | Some ""), _, _ | _, (None | Some ""), _ | _, _, (None | Some "") -> +- Caml.exit 1 ++ Stdlib.exit 1 + | Some current, Some base, Some other -> ( + match Fmters.find ~config ~filename:current ~name with + | None -> +@@ -30,7 +35,7 @@ let merge config echo current base other output name = + |> Result.map_error ~f:(Fn.const "base") + in + match Result.combine_errors [ x; y; z ] with +- | Error _ -> Caml.exit 1 ++ | Error _ -> Stdlib.exit 1 + | Ok (_ : unit list) -> + debug "process all three revision successfully\n%!"; + debug "running git merge-file\n%!"; +@@ -41,7 +46,7 @@ let merge config echo current base other output name = + (match output with + | None -> Out_channel.output_string stdout result + | Some o -> Out_channel.write_all o ~data:result); +- Caml.exit 0)) ++ Stdlib.exit 0)) + + open Cmdliner + +diff --git a/src/resolve_cmd.ml b/src/resolve_cmd.ml +index bd7f5e3..60a36a4 100644 +--- a/src/resolve_cmd.ml ++++ b/src/resolve_cmd.ml +@@ -67,9 +67,9 @@ let show ~echo version versions = + + let create_tmp ~echo fn version versions = + let content = show ~echo version versions in +- let ext = Caml.Filename.extension fn in ++ let ext = Stdlib.Filename.extension fn in + let base = +- if String.equal ext "" then fn else Caml.Filename.chop_extension fn ++ if String.equal ext "" then fn else Stdlib.Filename.chop_extension fn + in + let fn' = sprintf "%s.%s%s" base (string_of_version version) ext in + let oc = Out_channel.create fn' in +@@ -114,7 +114,7 @@ let resolve config echo () = + if Map.is_empty all + then ( + eprintf "Nothing to resolve\n%!"; +- Caml.exit 1); ++ Stdlib.exit 1); + Map.iteri all ~f:(fun ~key:filename ~data:versions -> + match versions with + | Ok versions -> ( +@@ -131,7 +131,7 @@ let resolve config echo () = + | None -> eprintf "Ignore %s (no formatter register)\n%!" filename) + | Error reason -> eprintf "Ignore %s (%s)\n%!" filename reason); + let all = ls ~echo () in +- if Map.is_empty all then Caml.exit 0 else Caml.exit 1 ++ if Map.is_empty all then Stdlib.exit 0 else Stdlib.exit 1 + + open Cmdliner + +diff --git a/test/dune b/test/dune +index c0e4f3a..2fde0ee 100644 +--- a/test/dune ++++ b/test/dune +@@ -1,17 +1,22 @@ + (library +- (name merge_fmt_test) +- (libraries base stdio unix core_unix core_unix.filename_unix) +- (inline_tests) +- (preprocessor_deps ../src/merge_fmt.exe) +- (preprocess (pps ppx_expect))) +- ++ (name merge_fmt_test) ++ (libraries base stdio unix core_unix core_unix.filename_unix) ++ (inline_tests) ++ (preprocessor_deps ../src/merge_fmt.exe) ++ (preprocess ++ (pps ppx_expect))) + + ;; [rebase_a.ml] and [rebase_b.ml] should be the same expect that + ;; [rebase_b.ml] does rebase in an intermediate revision. ++ + (rule +- (targets rebase.diff.gen) +- (action (with-stdout-to %{targets} (bash "diff %{dep:rebase_a.ml} %{dep:rebase_b.ml} || true")))) ++ (targets rebase.diff.gen) ++ (action ++ (with-stdout-to ++ %{targets} ++ (bash "diff %{dep:rebase_a.ml} %{dep:rebase_b.ml} || true")))) + +-(alias +- (name runtest) +- (action (diff rebase.diff rebase.diff.gen))) +\ No newline at end of file ++(rule ++ (alias runtest) ++ (action ++ (diff rebase.diff rebase.diff.gen))) diff --git a/pkgs/applications/version-management/nitpick/default.nix b/pkgs/applications/version-management/nitpick/default.nix index eb6956b1a3122..f1f52baf03366 100644 --- a/pkgs/applications/version-management/nitpick/default.nix +++ b/pkgs/applications/version-management/nitpick/default.nix @@ -35,6 +35,6 @@ buildPythonPackage rec { ''; homepage = "http://travisbrown.ca/projects/nitpick/docs/nitpick.html"; license = with lib.licenses; gpl2; - maintainers = []; + maintainers = [ ]; }; } diff --git a/pkgs/applications/version-management/p4/default.nix b/pkgs/applications/version-management/p4/default.nix index 695e596e8c850..ec01f86a3af07 100644 --- a/pkgs/applications/version-management/p4/default.nix +++ b/pkgs/applications/version-management/p4/default.nix @@ -6,10 +6,10 @@ , linkFarm , jam , openssl -, xcbuild , CoreServices , Foundation , Security +, testers }: let @@ -31,23 +31,23 @@ let { name = "contrib"; path = "${src}/contrib"; } ]; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: rec { pname = "p4"; - version = "2022.2.2407422"; + version = "2024.1/2596294"; src = fetchurl { # Upstream replaces minor versions, so use archived URL. - url = "https://web.archive.org/web/20230512173806id_/https://ftp.perforce.com/perforce/r22.2/bin.tools/p4source.tgz"; - sha256 = "4355375def3f3d2256d4a92ac1b9960173e7aa97404346c0c74caf23a0905e1b"; + url = "https://web.archive.org/web/20240526153453id_/https://ftp.perforce.com/perforce/r24.1/bin.tools/p4source.tgz"; + sha256 = "sha256-6+DOJPeVzP4x0UsN9MlZRAyusapBTICX0BuyvVBQBC8="; }; nativeBuildInputs = [ jam ]; - buildInputs = lib.optionals stdenv.isDarwin [ CoreServices Foundation Security ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices Foundation Security ]; outputs = [ "out" "bin" "dev" ]; - hardeningDisable = lib.optionals stdenv.isDarwin [ "strictoverflow" ]; + hardeningDisable = lib.optionals stdenv.hostPlatform.isDarwin [ "strictoverflow" ]; jamFlags = [ @@ -59,8 +59,8 @@ stdenv.mkDerivation rec { ] ++ lib.optionals stdenv.cc.isClang [ "-sOSCOMP=clang" "-sCLANGVER=${stdenv.cc.cc.version}" ] ++ lib.optionals stdenv.cc.isGNU [ "-sOSCOMP=gcc" "-sGCCVER=${stdenv.cc.cc.version}" ] - ++ lib.optionals stdenv.isLinux [ "-sOSVER=26" ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ "-sOSVER=26" ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-sOSVER=1013" "-sMACOSX_SDK=${emptyDirectory}" "-sLIBC++DIR=${lib.getLib stdenv.cc.libcxx}/lib" @@ -69,11 +69,11 @@ stdenv.mkDerivation rec { CCFLAGS = # The file contrib/optimizations/slide_hash_neon.h is missing from the # upstream distribution. It comes from the Android/Chromium sources. - lib.optionals stdenv.isAarch64 [ "-I${androidZlibContrib}" ]; + lib.optionals stdenv.hostPlatform.isAarch64 [ "-I${androidZlibContrib}" ]; "C++FLAGS" = # Avoid a compilation error that only occurs for 4-byte longs. - lib.optionals stdenv.isi686 [ "-Wno-narrowing" ] + lib.optionals stdenv.hostPlatform.isi686 [ "-Wno-narrowing" ] # See the "Header dependency changes" section of # https://www.gnu.org/software/gcc/gcc-11/porting_to.html for more # information on why we need to include these. @@ -92,11 +92,16 @@ stdenv.mkDerivation rec { runHook preInstall mkdir -p $bin/bin $dev $out cp bin.unix/p4 $bin/bin - cp -r bin.unix/p4api-${version}/include $dev - cp -r bin.unix/p4api-${version}/lib $out + cp -r bin.unix/p4api-*/include $dev + cp -r bin.unix/p4api-*/lib $out runHook postInstall ''; + passthru.tests.version = testers.testVersion { + package = finalAttrs.finalPackage; + command = "p4 -V"; + }; + meta = with lib; { description = "Perforce Helix Core command-line client and APIs"; homepage = "https://www.perforce.com"; @@ -105,4 +110,4 @@ stdenv.mkDerivation rec { platforms = platforms.unix; maintainers = with maintainers; [ corngood impl ]; }; -} +}) diff --git a/pkgs/applications/version-management/p4d/default.nix b/pkgs/applications/version-management/p4d/default.nix index d7dcd1405575b..b441fe846302b 100644 --- a/pkgs/applications/version-management/p4d/default.nix +++ b/pkgs/applications/version-management/p4d/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { sourceRoot = "."; - nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ]; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; dontBuild = true; diff --git a/pkgs/applications/version-management/p4v/default.nix b/pkgs/applications/version-management/p4v/default.nix index 1004661499be2..82aa6b57a8c51 100644 --- a/pkgs/applications/version-management/p4v/default.nix +++ b/pkgs/applications/version-management/p4v/default.nix @@ -2,28 +2,30 @@ , fetchurl , lib , callPackage -, libsForQt5 +, qt6Packages }: let # Upstream replaces minor versions, so use archived URLs. - srcs = { - "x86_64-linux" = fetchurl { - url = "https://web.archive.org/web/20220902181457id_/https://ftp.perforce.com/perforce/r22.2/bin.linux26x86_64/p4v.tgz"; - sha256 = "8fdade4aafe25f568a61cfd80823aa90599c2a404b7c6b4a0862c84b07a9f8d2"; + srcs = rec { + x86_64-linux = fetchurl { + url = "https://web.archive.org/web/20240612193642id_/https://ftp.perforce.com/perforce/r24.2/bin.linux26x86_64/p4v.tgz"; + sha256 = "sha256-HA99fHcmgli/vVnr0M8ZJEsaZ2ZLzpG3M8S77oDYJyE="; }; - "x86_64-darwin" = fetchurl { - url = "https://web.archive.org/web/20220902194716id_/https://ftp.perforce.com/perforce/r22.2/bin.macosx1015x86_64/P4V.dmg"; - sha256 = "c4a9460c0f849be193c68496c500f8a785c740f5bea5b5e7f617969c20be3cd7"; + aarch64-darwin = fetchurl { + url = "https://web.archive.org/web/20240612194532id_/https://ftp.perforce.com/perforce/r24.2/bin.macosx12u/P4V.dmg"; + sha256 = "sha256-PS7gfDdWspyL//YWLkrsGi5wh6SIeAry2yef1/V0d6o="; }; + # this is universal + x86_64-darwin = aarch64-darwin; }; mkDerivation = - if stdenv.isDarwin then callPackage ./darwin.nix { } - else libsForQt5.callPackage ./linux.nix { }; + if stdenv.hostPlatform.isDarwin then callPackage ./darwin.nix { } + else qt6Packages.callPackage ./linux.nix { }; in mkDerivation { pname = "p4v"; - version = "2022.2.2336701"; + version = "2024.2/2606884"; src = srcs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); diff --git a/pkgs/applications/version-management/p4v/linux.nix b/pkgs/applications/version-management/p4v/linux.nix index 6a9d6ba6aad4b..316ff8dbeb199 100644 --- a/pkgs/applications/version-management/p4v/linux.nix +++ b/pkgs/applications/version-management/p4v/linux.nix @@ -17,8 +17,12 @@ , libxcb , libxkbcommon , nss +, qtbase +, qtmultimedia +, qtsvg , qttools , qtwebengine +, qtwebview , xcbutilimage , xcbutilkeysyms , xcbutilrenderutil @@ -50,8 +54,12 @@ let libxcb libxkbcommon nss + qtbase + qtmultimedia + qtsvg qttools qtwebengine + qtwebview xcbutilimage xcbutilkeysyms xcbutilrenderutil @@ -63,10 +71,19 @@ let # Don't wrap the Qt apps; upstream has its own wrapper scripts. dontWrapQtApps = true; + postPatch = '' + rm -r lib/plugins lib/libQt6* lib/libssl* lib/libicu* lib/libcrypto* + ''; + installPhase = '' mkdir -p $out cp -r bin lib $out addAutoPatchelfSearchPath $out/lib + ln -s "${qtbase}/${qtbase.qtPluginPrefix}" $out/lib/plugins + ''; + + preFixup = '' + patchelf --clear-symbol-version close $out/bin/p4{v,admin}.bin ''; }; in diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix index 7503814c389d9..95d974bfa145b 100644 --- a/pkgs/applications/version-management/pijul/default.nix +++ b/pkgs/applications/version-management/pijul/default.nix @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles pkg-config ]; buildInputs = [ openssl libsodium xxHash ] ++ (lib.optionals gitImportSupport [ libgit2 ]) - ++ (lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + ++ (lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ CoreServices Security SystemConfiguration ])); diff --git a/pkgs/applications/version-management/rabbitvcs/default.nix b/pkgs/applications/version-management/rabbitvcs/default.nix deleted file mode 100644 index 7cc0a92d4c942..0000000000000 --- a/pkgs/applications/version-management/rabbitvcs/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ fetchFromGitHub, lib, python3Packages, meld, subversion, gvfs, xdg-utils, gtk3 }: - -python3Packages.buildPythonApplication rec { - pname = "rabbitvcs"; - version = "0.18"; - namePrefix = ""; - - src = fetchFromGitHub { - owner = "rabbitvcs"; - repo = "rabbitvcs"; - rev = "v${version}"; - hash = "sha256-gVrdf8vQWAGORZqlTS/axs4U7aZlS8OAgPM3iKgqAtM="; - }; - - buildInputs = [ gtk3 ]; - pythonPath = with python3Packages; [ configobj pygobject3 pysvn dulwich tkinter gvfs xdg-utils ]; - - prePatch = '' - sed -ie 's|if sys\.argv\[1\] == "install":|if False:|' ./setup.py - sed -ie "s|PREFIX = sys.prefix|PREFIX = \"$out\"|" ./setup.py - sed -ie 's|/usr/bin/meld|${meld}/bin/meld|' ./rabbitvcs/util/configspec/configspec.ini - sed -ie 's|/usr/bin/svnadmin|${subversion.out}/bin/svnadmin|' ./rabbitvcs/ui/create.py - sed -ie "s|/usr/share/doc|$out/share/doc|" ./rabbitvcs/ui/about.py - sed -ie "s|gnome-open|xdg-open|" ./rabbitvcs/util/helper.py - ''; - - outputs = [ "out" "cli" ]; - - postInstall = '' - mkdir -p $cli/bin - cp clients/cli/rabbitvcs $cli/bin - wrapPythonProgramsIn $cli "$out $pythonPath" - ''; - - doCheck = false; - - meta = { - description = "Graphical tools for working with version control systems"; - homepage = "http://rabbitvcs.org/"; - license = lib.licenses.gpl2Plus; - platforms = lib.platforms.linux; - maintainers = [ lib.maintainers.mathnerd314 ]; - # ModuleNotFoundError: No module named 'rabbitvcs' - broken = true; # Added 2024-01-28 - }; -} diff --git a/pkgs/applications/version-management/rapidsvn/default.nix b/pkgs/applications/version-management/rapidsvn/default.nix index 53df3af4a79d4..4ed034c500f99 100644 --- a/pkgs/applications/version-management/rapidsvn/default.nix +++ b/pkgs/applications/version-management/rapidsvn/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { apr aprutil python3 - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ]; @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { description = "Multi-platform GUI front-end for the Subversion revision system"; homepage = "http://rapidsvn.tigris.org/"; license = lib.licenses.gpl3Plus; - maintainers = [ lib.maintainers.viric ]; + maintainers = [ ]; platforms = lib.platforms.unix; mainProgram = "rapidsvn"; }; diff --git a/pkgs/applications/version-management/rcs/default.nix b/pkgs/applications/version-management/rcs/default.nix index 40d909c8e0282..b838eb6f74f92 100644 --- a/pkgs/applications/version-management/rcs/default.nix +++ b/pkgs/applications/version-management/rcs/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ''; license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ eelco ]; + maintainers = [ ]; platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/version-management/rs-git-fsmonitor/default.nix b/pkgs/applications/version-management/rs-git-fsmonitor/default.nix index 7c4ecaf30729b..ffde4f16f157c 100644 --- a/pkgs/applications/version-management/rs-git-fsmonitor/default.nix +++ b/pkgs/applications/version-management/rs-git-fsmonitor/default.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { sha256 = "021vdk5i7yyrnh4apn0gnsh6ycnx15wm3g2jrfsg7fycnq8167wc"; }; - cargoSha256 = "0hx5nhxci6p0gjjn1f3vpfykq0f7hdvhlv8898vrv0lh5r9hybsn"; + cargoHash = "sha256-Vi8PUy6Qgp03SghtCneDxwE8vbt7uGClfOCayDq0pUM="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/version-management/sapling/Cargo.lock b/pkgs/applications/version-management/sapling/Cargo.lock index 7b3f1c7d58c4d..ad2ee2de79d0a 100644 --- a/pkgs/applications/version-management/sapling/Cargo.lock +++ b/pkgs/applications/version-management/sapling/Cargo.lock @@ -23,9 +23,9 @@ dependencies = [ [[package]] name = "addr2line" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" dependencies = [ "gimli", ] @@ -44,9 +44,9 @@ checksum = "0453232ace82dee0dd0b4c87a59bd90f7b53b314f3e0f61fe2ee7c8a16482289" [[package]] name = "ahash" -version = "0.8.7" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ "cfg-if 1.0.0", "once_cell", @@ -56,9 +56,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ "memchr", ] @@ -80,9 +80,9 @@ dependencies = [ [[package]] name = "allocator-api2" -version = "0.2.16" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" +checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" [[package]] name = "android-tzdata" @@ -110,47 +110,48 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.11" +version = "0.6.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e2e1ebcb11de5c03c67de28a7df593d32191b44939c482e97702baaaa6ab6a5" +checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526" dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", "anstyle-wincon", "colorchoice", + "is_terminal_polyfill", "utf8parse", ] [[package]] name = "anstyle" -version = "1.0.4" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" +checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" [[package]] name = "anstyle-parse" -version = "0.2.3" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" +checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.0.2" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" +checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a" dependencies = [ "windows-sys 0.52.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.2" +version = "3.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" +checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8" dependencies = [ "anstyle", "windows-sys 0.52.0", @@ -158,9 +159,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.79" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" dependencies = [ "backtrace", ] @@ -173,15 +174,15 @@ checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" [[package]] name = "arc-swap" -version = "1.6.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6" +checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" [[package]] name = "arrayref" -version = "0.3.7" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" +checksum = "9d151e35f61089500b617991b791fc8bfd237ae50cd5950803758a179b41e67a" [[package]] name = "arrayvec" @@ -191,11 +192,10 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" [[package]] name = "assert-json-diff" -version = "1.1.0" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4259cbe96513d2f1073027a259fc2ca917feb3026a5a8d984e3628e490255cc0" +checksum = "47e4f2b81832e72834d7518d8487a0396a28cc408186a2e8854c0f98011faf12" dependencies = [ - "extend", "serde", "serde_json", ] @@ -208,9 +208,9 @@ checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9" [[package]] name = "async-compression" -version = "0.4.6" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a116f46a969224200a0a97f29cfd4c50e7534e4b4826bd23ea2c3c533039c82c" +checksum = "fec134f64e2bc57411226dfc4e52dec859ddfc7e711fc5e07b612584f000e4aa" dependencies = [ "brotli", "bzip2", @@ -265,13 +265,13 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.77" +version = "0.1.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" +checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.72", ] [[package]] @@ -284,9 +284,12 @@ dependencies = [ [[package]] name = "atomic" -version = "0.5.3" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c59bdb34bc650a32731b31bd8f0829cc15d24a708ee31559e0bb34f2bc320cba" +checksum = "8d818003e740b63afc82337e3160717f4f63078720a810b7b903e70a5d1d2994" +dependencies = [ + "bytemuck", +] [[package]] name = "atomicfile" @@ -314,7 +317,7 @@ dependencies = [ "anyhow", "chrono", "configmodel", - "indexmap 2.1.0", + "indexmap 2.2.6", "once_cell", "pem", "simple_asn1", @@ -327,21 +330,20 @@ dependencies = [ [[package]] name = "auto_impl" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fee3da8ef1276b0bee5dd1c7258010d8fffd31801447323115a25560e1327b89" +checksum = "3c87f3f15e7794432337fc718554eaa4dc8f04c9677a950ffe366f20a162ae42" dependencies = [ - "proc-macro-error", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.72", ] [[package]] name = "autocfg" -version = "1.1.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "backingstore" @@ -384,9 +386,9 @@ dependencies = [ [[package]] name = "backtrace" -version = "0.3.69" +version = "0.3.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" dependencies = [ "addr2line", "cc", @@ -410,6 +412,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" [[package]] +name = "base64" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" + +[[package]] name = "bindag" version = "0.1.0" dependencies = [ @@ -439,6 +447,7 @@ dependencies = [ "pycliparser", "pyconchparser", "pyconfigloader", + "pycontext", "pycopytrace", "pydag", "pydiffhelpers", @@ -447,17 +456,18 @@ dependencies = [ "pydrawdag", "pyeagerepo", "pyedenapi", - "pyedenclient", "pyerror", "pyexchange", "pyfail", "pyfs", + "pygitcompat", "pygitstore", "pyhgmetrics", "pyhgtime", "pyidentity", "pyindexedlog", "pyio", + "pyjournal", "pylinelog", "pylock", "pylz4", @@ -489,6 +499,7 @@ dependencies = [ "pywebview", "pyworker", "pyworkingcopy", + "pyworkingcopyclient", "pyxdiff", "pyzstd", "pyzstore", @@ -498,8 +509,8 @@ dependencies = [ name = "bindings-lib" version = "0.1.0" dependencies = [ + "commands", "cpython", - "hgcommands", ] [[package]] @@ -525,9 +536,12 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.2" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" +dependencies = [ + "serde", +] [[package]] name = "bitmaps" @@ -564,7 +578,7 @@ version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe" dependencies = [ - "digest 0.10.7", + "digest", ] [[package]] @@ -578,16 +592,7 @@ dependencies = [ "cc", "cfg-if 1.0.0", "constant_time_eq", - "digest 0.10.7", -] - -[[package]] -name = "block-buffer" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" -dependencies = [ - "generic-array", + "digest", ] [[package]] @@ -601,9 +606,9 @@ dependencies = [ [[package]] name = "brotli" -version = "3.4.0" +version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "516074a47ef4bce09577a3b379392300159ce5b1ba2e501ff1c819950066100f" +checksum = "74f7971dbd9326d58187408ab83117d8ac1bb9c17b085fdacd1cf2f598719b6b" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -612,9 +617,9 @@ dependencies = [ [[package]] name = "brotli-decompressor" -version = "2.5.1" +version = "4.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e2e4afe60d7dd600fdd3de8d0f08c2b7ec039712e3b6137ff98b7004e82de4f" +checksum = "9a45bd2e4095a8b518033b128020dd4a55aab1c0a381ba4404a472630f4bc362" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -622,9 +627,9 @@ dependencies = [ [[package]] name = "bstr" -version = "1.9.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c48f0051a4b4c5e0b6d365cd04af53aeaa209e3cc15ec2cdb69e73cc87fbd0dc" +checksum = "40723b8fb387abc38f4f4a37c09073622e41dd12327033091ef8950659e6dc0c" dependencies = [ "memchr", "serde", @@ -641,9 +646,15 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.14.0" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" + +[[package]] +name = "bytemuck" +version = "1.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b236fc92302c97ed75b38da1f4917b5cdda4984745740f153a5d3059e48d725e" [[package]] name = "byteorder" @@ -653,9 +664,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.5.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" +checksum = "a12916984aab3fa6e39d655a33e09c0071eb36d6ab3aea5c2d78551f1df6d952" dependencies = [ "serde", ] @@ -682,6 +693,16 @@ dependencies = [ ] [[package]] +name = "cas-client" +version = "0.1.0" +dependencies = [ + "anyhow", + "async-trait", + "configmodel", + "types", +] + +[[package]] name = "cassowary" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -693,7 +714,7 @@ version = "0.1.0" dependencies = [ "anyhow", "configmodel", - "indexmap 2.1.0", + "indexmap 2.2.6", "serde", "serde_json", "thiserror", @@ -703,9 +724,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.83" +version = "1.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +checksum = "2aba8f4e9906c7ce3c73463f62a7f0c65183ada1a2d47e397cc8810827f9694f" dependencies = [ "jobserver", "libc", @@ -724,18 +745,28 @@ 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 = "checkout" version = "0.1.0" dependencies = [ "anyhow", + "async-runtime", "async-trait", "atexit", "configmodel", + "context", "crossbeam", + "dag", "edenfs-client", "fail", "fs-err", "hg-metrics", + "hook", "manifest", "manifest-tree", "minibytes", @@ -744,8 +775,7 @@ dependencies = [ "progress-model", "quickcheck", "repo", - "repolock", - "serde_json", + "serde", "spawn-ext", "status", "storemodel", @@ -759,20 +789,21 @@ dependencies = [ "util", "vfs", "walkdir", + "watchman_client", "workingcopy", ] [[package]] name = "chrono" -version = "0.4.31" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" dependencies = [ "android-tzdata", "iana-time-zone", "num-traits", "serde", - "windows-targets 0.48.5", + "windows-targets 0.52.6", ] [[package]] @@ -806,30 +837,30 @@ dependencies = [ "strsim 0.10.0", "termcolor", "terminal_size 0.2.6", - "textwrap 0.16.0", + "textwrap 0.16.1", "unicase", ] [[package]] name = "clap" -version = "4.4.18" +version = "4.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e578d6ec4194633722ccf9544794b71b1385c3c027efe0c55db226fc880865c" +checksum = "35723e6a11662c2afb578bcf0b88bf6ea8e21282a953428f240574fcc3a2b5b3" dependencies = [ "clap_builder", - "clap_derive 4.4.7", + "clap_derive 4.5.11", ] [[package]] name = "clap_builder" -version = "4.4.18" +version = "4.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4df4df40ec50c46000231c914968278b1eb05098cf8f1b3a518a95030e71d1c7" +checksum = "49eb96cbfa7cfa35017b7cd548c75b14c3118c98b423041d70562665e07fb0fa" dependencies = [ "anstream", "anstyle", - "clap_lex 0.6.0", - "strsim 0.10.0", + "clap_lex 0.7.2", + "strsim 0.11.1", "terminal_size 0.3.0", "unicase", "unicode-width", @@ -850,14 +881,14 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.4.7" +version = "4.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" +checksum = "5d029b67f89d30bbb547c89fd5161293c0aec155fc691d7924b64550662db93e" dependencies = [ - "heck 0.4.1", + "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.72", ] [[package]] @@ -871,9 +902,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.6.0" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" +checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" [[package]] name = "clidispatch" @@ -884,7 +915,10 @@ dependencies = [ "cliparser", "configloader", "configmodel", + "context", + "gitcompat", "hgplain", + "hook", "hostname 0.1.0", "identity", "indexedlog", @@ -928,7 +962,7 @@ version = "0.1.0" dependencies = [ "anyhow", "cpython", - "indexmap 2.1.0", + "indexmap 2.2.6", "serde", "shlex", "thiserror", @@ -939,25 +973,465 @@ name = "clone" version = "0.1.0" dependencies = [ "anyhow", - "async-runtime", "checkout", "configmodel", - "manifest-tree", + "context", "repo", "tempfile", - "termlogger", "thiserror", "tracing", - "treestate", "types", "util", - "vfs", ] [[package]] name = "cloned" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#76d2159747b056901daa362c3404b6d7b781eec5" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#4f55da19d54ca6e235474f95902e308610724559" + +[[package]] +name = "cmdclone" +version = "0.1.0" +dependencies = [ + "anyhow", + "async-runtime", + "clidispatch", + "clone", + "cmdpy", + "cmdutil", + "configloader", + "configmodel", + "eagerepo", + "exchange", + "fail", + "hgplain", + "identity", + "metalog", + "migration", + "repo", + "repo_name", + "tracing", + "types", + "url", + "util", +] + +[[package]] +name = "cmdconfig" +version = "0.1.0" +dependencies = [ + "anyhow", + "clidispatch", + "cmdutil", + "configloader", + "configmodel", + "formatter", + "minibytes", + "serde", +] + +[[package]] +name = "cmdconfigfile" +version = "0.1.0" +dependencies = [ + "clidispatch", + "cliparser", + "cmdutil", + "identity", +] + +[[package]] +name = "cmddebugargs" +version = "0.1.0" +dependencies = [ + "clidispatch", + "cmdutil", +] + +[[package]] +name = "cmddebugcas" +version = "0.1.0" +dependencies = [ + "async-runtime", + "cas-client", + "clidispatch", + "cmdutil", + "manifest", + "repo", + "types", + "util", + "workingcopy", +] + +[[package]] +name = "cmddebugconfigtree" +version = "0.1.0" +dependencies = [ + "cmdutil", +] + +[[package]] +name = "cmddebugcurrentexe" +version = "0.1.0" +dependencies = [ + "clidispatch", + "cmdutil", +] + +[[package]] +name = "cmddebugdumpindexedlog" +version = "0.1.0" +dependencies = [ + "clidispatch", + "cmdutil", + "indexedlog", +] + +[[package]] +name = "cmddebugdumpinternalconfig" +version = "0.1.0" +dependencies = [ + "clidispatch", + "cmdutil", + "configloader", +] + +[[package]] +name = "cmddebugfsync" +version = "0.1.0" +dependencies = [ + "clidispatch", + "cmdutil", + "fsyncglob", + "repo", +] + +[[package]] +name = "cmddebughttp" +version = "0.1.0" +dependencies = [ + "async-runtime", + "clidispatch", + "cmdutil", + "edenapi", + "repo", +] + +[[package]] +name = "cmddebugmergestate" +version = "0.1.0" +dependencies = [ + "anyhow", + "clidispatch", + "cliparser", + "cmdutil", + "repo", + "repostate", + "workingcopy", +] + +[[package]] +name = "cmddebugmetrics" +version = "0.1.0" +dependencies = [ + "clidispatch", + "cmdutil", + "hg-metrics", + "repo", + "tracing", +] + +[[package]] +name = "cmddebugnetworkdoctor" +version = "0.1.0" +dependencies = [ + "clidispatch", + "cmdutil", + "configloader", + "network-doctor", +] + +[[package]] +name = "cmddebugpython" +version = "0.1.0" +dependencies = [ + "clidispatch", + "cmdutil", +] + +[[package]] +name = "cmddebugracyoutput" +version = "0.1.0" +dependencies = [ + "async-runtime", + "clidispatch", + "cliparser", + "cmdutil", + "progress-model", + "rand 0.8.5", +] + +[[package]] +name = "cmddebugrefreshconfig" +version = "0.1.0" +dependencies = [ + "clidispatch", + "cmdutil", + "configloader", + "repo-minimal-info", +] + +[[package]] +name = "cmddebugrevsets" +version = "0.1.0" +dependencies = [ + "clidispatch", + "cliparser", + "cmdutil", + "repo", + "workingcopy", +] + +[[package]] +name = "cmddebugrunlog" +version = "0.1.0" +dependencies = [ + "anyhow", + "clidispatch", + "cliparser", + "repo", + "runlog", + "serde_json", +] + +[[package]] +name = "cmddebugscmstore" +version = "0.1.0" +dependencies = [ + "async-runtime", + "clidispatch", + "cmdutil", + "manifest", + "repo", + "revisionstore", + "serde", + "types", +] + +[[package]] +name = "cmddebugscmstorereplay" +version = "0.1.0" +dependencies = [ + "clidispatch", + "cmdutil", + "repo", + "revisionstore", + "types", +] + +[[package]] +name = "cmddebugsegmentclone" +version = "0.1.0" +dependencies = [ + "anyhow", + "async-runtime", + "clidispatch", + "cliparser", + "cmdutil", + "dag", + "edenapi", + "identity", + "progress-model", +] + +[[package]] +name = "cmddebugsegmentgraph" +version = "0.1.0" +dependencies = [ + "clidispatch", + "cliparser", + "cmdutil", + "dag", + "repo", +] + +[[package]] +name = "cmddebugsegmentpull" +version = "0.1.0" +dependencies = [ + "anyhow", + "async-runtime", + "clidispatch", + "cliparser", + "cmdutil", + "dag", + "edenapi", + "repo", + "types", +] + +[[package]] +name = "cmddebugstore" +version = "0.1.0" +dependencies = [ + "clidispatch", + "cmdutil", + "configloader", + "repo", + "revisionstore", + "types", +] + +[[package]] +name = "cmddebugstructuredprogress" +version = "0.1.0" +dependencies = [ + "anyhow", + "clidispatch", + "cliparser", + "progress-model", +] + +[[package]] +name = "cmddebugtestcommand" +version = "0.1.0" +dependencies = [ + "clidispatch", + "cmdutil", +] + +[[package]] +name = "cmddebugtop" +version = "0.1.0" +dependencies = [ + "chrono", + "clidispatch", + "cliparser", + "cmdutil", + "comfy-table", + "debugtop", + "repo", + "runlog", +] + +[[package]] +name = "cmddebugwait" +version = "0.1.0" +dependencies = [ + "anyhow", + "clidispatch", + "cmdutil", + "edenfs-client", + "repo", + "tracing", + "treestate", + "workingcopy", +] + +[[package]] +name = "cmdgoto" +version = "0.1.0" +dependencies = [ + "anyhow", + "checkout", + "clidispatch", + "cliparser", + "cmdutil", + "configmodel", + "fs-err", + "repo", + "repostate", + "tracing", + "util", + "workingcopy", +] + +[[package]] +name = "cmdpy" +version = "0.1.0" +dependencies = [ + "bindings", + "clidispatch", + "commandserver", + "configmodel", + "context", + "cpython", + "cpython_ext", + "libc", + "nodeipc", + "pycontext", + "pyio", + "pymodules", + "python3-sys", + "tracing", +] + +[[package]] +name = "cmdroot" +version = "0.1.0" +dependencies = [ + "clidispatch", + "cmdutil", + "repo", + "util", +] + +[[package]] +name = "cmdstatus" +version = "0.1.0" +dependencies = [ + "anyhow", + "clidispatch", + "cmdutil", + "configloader", + "formatter", + "hgplain", + "pathmatcher", + "repo", + "serde", + "status", + "tracing", + "types", + "util", + "workingcopy", +] + +[[package]] +name = "cmdutil" +version = "0.1.0" +dependencies = [ + "anyhow", + "clidispatch", + "cliparser", + "configmodel", + "configset", + "formatter", + "hgplain", + "repo", + "termstyle", +] + +[[package]] +name = "cmdversion" +version = "0.1.0" +dependencies = [ + "clidispatch", + "cmdutil", + "identity", + "version", +] + +[[package]] +name = "cmdwhereami" +version = "0.1.0" +dependencies = [ + "anyhow", + "clidispatch", + "cmdutil", + "repo", + "treestate", + "types", +] [[package]] name = "codegen" @@ -969,7 +1443,7 @@ dependencies = [ [[package]] name = "codegen_includer_proc_macro" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#76d2159747b056901daa362c3404b6d7b781eec5" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#4f55da19d54ca6e235474f95902e308610724559" dependencies = [ "quote", ] @@ -986,26 +1460,25 @@ dependencies = [ [[package]] name = "colorchoice" -version = "1.0.0" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" +checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0" [[package]] name = "colored" -version = "1.9.4" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a5f741c91823341bebf717d4c71bda820630ce065443b58bd1b7451af008355" +checksum = "cbf2150cce219b664a8a70df7a1f933836724b503f8a413af9365b4dcc4d90b8" dependencies = [ - "is-terminal", "lazy_static", - "winapi 0.3.9", + "windows-sys 0.48.0", ] [[package]] name = "comfy-table" -version = "6.2.0" +version = "7.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e959d788268e3bf9d35ace83e81b124190378e4c91c9067524675e33394b8ba" +checksum = "b34115915337defe99b2aff5c2ce6771e5fbc4079f4b506301f5cf394c8452f7" dependencies = [ "crossterm", "strum", @@ -1014,6 +1487,86 @@ dependencies = [ ] [[package]] +name = "commands" +version = "0.1.0" +dependencies = [ + "anyhow", + "atexit", + "blackbox", + "clidispatch", + "cmdclone", + "cmdconfig", + "cmdconfigfile", + "cmddebugargs", + "cmddebugcas", + "cmddebugconfigtree", + "cmddebugcurrentexe", + "cmddebugdumpindexedlog", + "cmddebugdumpinternalconfig", + "cmddebugfsync", + "cmddebughttp", + "cmddebugmergestate", + "cmddebugmetrics", + "cmddebugnetworkdoctor", + "cmddebugpython", + "cmddebugracyoutput", + "cmddebugrefreshconfig", + "cmddebugrevsets", + "cmddebugrunlog", + "cmddebugscmstore", + "cmddebugscmstorereplay", + "cmddebugsegmentclone", + "cmddebugsegmentgraph", + "cmddebugsegmentpull", + "cmddebugstore", + "cmddebugstructuredprogress", + "cmddebugtestcommand", + "cmddebugtop", + "cmddebugwait", + "cmdgoto", + "cmdpy", + "cmdroot", + "cmdstatus", + "cmdversion", + "cmdwhereami", + "commandserver", + "configloader", + "configmodel", + "constructors", + "ctrlc", + "fail", + "flate2", + "hg-http", + "hg-metrics", + "hgplain", + "hostname 0.3.1", + "identity", + "libc", + "metrics-render", + "mincode", + "nodeipc", + "parking_lot", + "procinfo", + "progress-model", + "progress-render", + "pycheckout", + "pytracing", + "pyworkingcopy", + "pyworkingcopyclient", + "repo", + "revisionstore", + "runlog", + "sampling", + "tracing", + "tracing-collector", + "tracing-reload", + "tracing-sampler", + "tracing-subscriber", + "version", + "zstd", +] + +[[package]] name = "commandserver" version = "0.1.0" dependencies = [ @@ -1030,7 +1583,6 @@ dependencies = [ "procutil", "serde", "spawn-ext", - "system-command", "tracing", "udsipc", "version", @@ -1060,6 +1612,28 @@ dependencies = [ ] [[package]] +name = "commits" +version = "0.1.0" +dependencies = [ + "anyhow", + "async-trait", + "commits-trait", + "dag", + "edenapi", + "factory", + "fs-err", + "futures 0.3.30", + "minibytes", + "parking_lot", + "revlogindex", + "storemodel", + "streams", + "tracing", + "types", + "zstore", +] + +[[package]] name = "commits-git" version = "0.1.0" dependencies = [ @@ -1113,11 +1687,11 @@ dependencies = [ [[package]] name = "concurrent-queue" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" dependencies = [ - "crossbeam-utils 0.8.19", + "crossbeam-utils 0.8.20", ] [[package]] @@ -1125,17 +1699,15 @@ name = "config" version = "0.1.0" dependencies = [ "anyhow", - "async-trait", "codegen_includer_proc_macro", - "config_types", - "const-cstr", "fbthrift", "futures 0.3.30", + "once_cell", "ref-cast", + "serde", + "serde_derive", "thiserror", "thrift_compiler", - "tracing", - "tracing-futures", ] [[package]] @@ -1143,24 +1715,6 @@ name = "config_thrift" version = "0.1.0" dependencies = [ "anyhow", - "async-trait", - "codegen_includer_proc_macro", - "config_thrift_types", - "const-cstr", - "fbthrift", - "futures 0.3.30", - "ref-cast", - "thiserror", - "thrift_compiler", - "tracing", - "tracing-futures", -] - -[[package]] -name = "config_thrift_types" -version = "0.1.0" -dependencies = [ - "anyhow", "codegen_includer_proc_macro", "fbthrift", "futures 0.3.30", @@ -1173,19 +1727,18 @@ dependencies = [ ] [[package]] -name = "config_types" +name = "config_thrift_clients" version = "0.1.0" dependencies = [ "anyhow", + "async-trait", "codegen_includer_proc_macro", + "config_thrift", + "const-cstr", "fbthrift", "futures 0.3.30", - "once_cell", - "ref-cast", - "serde", - "serde_derive", - "thiserror", "thrift_compiler", + "tracing", ] [[package]] @@ -1198,6 +1751,7 @@ dependencies = [ "configset", "dirs 2.0.2", "filetime", + "gitcompat", "hgplain", "hgtime", "hostcaps", @@ -1208,10 +1762,12 @@ dependencies = [ "minibytes", "once_cell", "regex", + "repo-minimal-info", "serde", "serde_json", - "serde_urlencoded 0.7.1", - "sha2 0.10.8", + "serde_urlencoded", + "sha2", + "spawn-ext", "staticconfig", "tempfile", "testutil", @@ -1232,6 +1788,7 @@ dependencies = [ "auto_impl", "minibytes", "thiserror", + "twox-hash", "util", ] @@ -1241,7 +1798,7 @@ version = "0.1.0" dependencies = [ "configmodel", "hgrc-parser", - "indexmap 2.1.0", + "indexmap 2.2.6", "minibytes", "tempfile", "tracing", @@ -1276,16 +1833,25 @@ checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" name = "constructors" version = "0.1.0" dependencies = [ + "commits", "commits-git", "eagerepo", "edenapi", "gitstore", - "hgcommits", "manifest-tree", "once_cell", ] [[package]] +name = "context" +version = "0.1.0" +dependencies = [ + "configmodel", + "io", + "termlogger", +] + +[[package]] name = "control-point" version = "0.1.0" dependencies = [ @@ -1300,9 +1866,9 @@ dependencies = [ [[package]] name = "cookie" -version = "0.16.2" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e859cd57d0710d9e06c381b550c06e76992472a8c6d527aecd2fc673dcc231fb" +checksum = "7efb37c3e1ccb1ff97164ad95ac1606e8ccd35b3fa0a7d99a304c7f4a428cc24" dependencies = [ "percent-encoding", "time", @@ -1311,12 +1877,12 @@ dependencies = [ [[package]] name = "cookie_store" -version = "0.16.2" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d606d0fba62e13cf04db20536c05cb7f13673c161cb47a47a82b9b9e7d3f1daa" +checksum = "387461abbc748185c3a6e1673d826918b450b87ff22639429c694619a83b6cf6" dependencies = [ "cookie", - "idna 0.2.3", + "idna 0.3.0", "log", "publicsuffix", "serde", @@ -1335,7 +1901,6 @@ dependencies = [ "async-trait", "configmodel", "dag", - "git2", "hg-metrics", "lru-cache", "manifest", @@ -1380,9 +1945,9 @@ dependencies = [ [[package]] name = "cpython" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3052106c29da7390237bc2310c1928335733b286287754ea85e6093d2495280e" +checksum = "43b398a2c65baaf5892f10bb69b52508bf7a993380cc4ecd3785aaebb5c79389" dependencies = [ "libc", "num-traits", @@ -1423,9 +1988,9 @@ dependencies = [ [[package]] name = "crc32fast" -version = "1.3.2" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" dependencies = [ "cfg-if 1.0.0", ] @@ -1436,11 +2001,11 @@ version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1137cd7e7fc0fb5d3c5a8678be38ec56e819125d8d7907411fe24ccb943faca8" dependencies = [ - "crossbeam-channel 0.5.11", + "crossbeam-channel 0.5.13", "crossbeam-deque", "crossbeam-epoch", "crossbeam-queue", - "crossbeam-utils 0.8.19", + "crossbeam-utils 0.8.20", ] [[package]] @@ -1454,11 +2019,11 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.11" +version = "0.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "176dc175b78f56c0f321911d9c8eb2b77a78a4860b9c19db83835fea1a46649b" +checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" dependencies = [ - "crossbeam-utils 0.8.19", + "crossbeam-utils 0.8.20", ] [[package]] @@ -1468,7 +2033,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" dependencies = [ "crossbeam-epoch", - "crossbeam-utils 0.8.19", + "crossbeam-utils 0.8.20", ] [[package]] @@ -1477,7 +2042,7 @@ version = "0.9.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" dependencies = [ - "crossbeam-utils 0.8.19", + "crossbeam-utils 0.8.20", ] [[package]] @@ -1486,7 +2051,7 @@ version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35" dependencies = [ - "crossbeam-utils 0.8.19", + "crossbeam-utils 0.8.20", ] [[package]] @@ -1501,23 +2066,20 @@ dependencies = [ [[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 = "crossterm" -version = "0.26.1" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a84cda67535339806297f1b331d6dd6320470d2a0fe65381e79ee9e156dd3d13" +checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", "crossterm_winapi", "libc", - "mio", "parking_lot", - "signal-hook 0.3.17", - "signal-hook-mio", "winapi 0.3.9", ] @@ -1547,7 +2109,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eb2a7d3066da2de787b7f032c736763eb7ae5d355f81a68bab2675a96008b0bf" dependencies = [ "lab", - "phf 0.11.2", + "phf", ] [[package]] @@ -1562,34 +2124,34 @@ dependencies = [ [[package]] name = "ctrlc" -version = "3.4.2" +version = "3.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b467862cc8610ca6fc9a1532d7777cee0804e678ab45410897b9396495994a0b" +checksum = "672465ae37dc1bc6380a6547a8883d5dd397b0f1faaad4f265726cc7042a5345" dependencies = [ - "nix 0.27.1", + "nix 0.28.0", "windows-sys 0.52.0", ] [[package]] name = "curl" -version = "0.4.44" +version = "0.4.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "509bd11746c7ac09ebd19f0b17782eae80aadee26237658a6b4808afb5c11a22" +checksum = "1e2161dd6eba090ff1594084e95fd67aeccf04382ffea77999ea94ed42ec67b6" dependencies = [ "curl-sys", "libc", "openssl-probe", "openssl-sys", "schannel", - "socket2 0.4.10", - "winapi 0.3.9", + "socket2 0.5.7", + "windows-sys 0.52.0", ] [[package]] name = "curl-sys" -version = "0.4.70+curl-8.5.0" +version = "0.4.73+curl-8.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c0333d8849afe78a4c8102a429a446bfdd055832af071945520e835ae2d841e" +checksum = "450ab250ecf17227c39afb9a2dd9261dc0035cb80f2612472fc0c4aac2dcb84d" dependencies = [ "cc", "libc", @@ -1598,14 +2160,14 @@ dependencies = [ "openssl-sys", "pkg-config", "vcpkg", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "cxx" -version = "1.0.115" +version = "1.0.124" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de00f15a6fa069c99b88c5c78c4541d0e7899a33b86f7480e23df2431fce0bc" +checksum = "273dcfd3acd4e1e276af13ed2a43eea7001318823e7a726a6b3ed39b4acc0b82" dependencies = [ "cc", "cxxbridge-flags", @@ -1615,9 +2177,9 @@ dependencies = [ [[package]] name = "cxx-build" -version = "1.0.115" +version = "1.0.124" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a71e1e631fa2f2f5f92e8b0d860a00c198c6771623a6cefcc863e3554f0d8d6" +checksum = "d8b2766fbd92be34e9ed143898fce6c572dc009de39506ed6903e5a05b68914e" dependencies = [ "cc", "codespan-reporting", @@ -1625,24 +2187,24 @@ dependencies = [ "proc-macro2", "quote", "scratch", - "syn 2.0.48", + "syn 2.0.72", ] [[package]] name = "cxxbridge-flags" -version = "1.0.115" +version = "1.0.124" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f3fed61d56ba497c4efef9144dfdbaa25aa58f2f6b3a7cf441d4591c583745c" +checksum = "839fcd5e43464614ffaa989eaf1c139ef1f0c51672a1ed08023307fa1b909ccd" [[package]] name = "cxxbridge-macro" -version = "1.0.115" +version = "1.0.124" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8908e380a8efd42150c017b0cfa31509fc49b6d47f7cb6b33e93ffb8f4e3661e" +checksum = "4b2c1c1776b986979be68bb2285da855f8d8a35851a769fca8740df7c3d07877" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.72", ] [[package]] @@ -1651,7 +2213,7 @@ version = "0.1.0" dependencies = [ "anyhow", "async-trait", - "bitflags 2.4.2", + "bitflags 2.6.0", "byteorder", "dag-types", "dev-logger", @@ -1660,7 +2222,7 @@ dependencies = [ "fs2", "futures 0.3.30", "indexedlog", - "indexmap 2.1.0", + "indexmap 2.2.6", "mincode", "minibytes", "nonblocking", @@ -1708,7 +2270,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ "cfg-if 1.0.0", - "hashbrown 0.14.3", + "hashbrown 0.14.5", "lock_api", "once_cell", "parking_lot_core", @@ -1756,27 +2318,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" [[package]] -name = "difference" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198" - -[[package]] -name = "digest" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" -dependencies = [ - "generic-array", -] - -[[package]] name = "digest" version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ - "block-buffer 0.10.4", + "block-buffer", "crypto-common", "subtle", ] @@ -1825,10 +2372,10 @@ name = "drawdag" version = "0.1.0" [[package]] -name = "dtoa" -version = "0.4.8" +name = "dunce" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56899898ce76aaf4a0f24d914c97ea6ed976d42fec6ad33fcbb0a1103e07b2b0" +checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" [[package]] name = "eagerepo" @@ -1848,6 +2395,7 @@ dependencies = [ "manifest-tree", "metalog", "minibytes", + "mutationstore", "nonblocking", "parking_lot", "storemodel", @@ -1869,7 +2417,7 @@ dependencies = [ "pretty_assertions", "serde", "serde_json", - "sha2 0.10.8", + "sha2", "structopt", ] @@ -1950,7 +2498,6 @@ name = "edenapi_types" version = "0.1.0" dependencies = [ "anyhow", - "blake2", "blake3", "bytes", "dag-types", @@ -1965,7 +2512,6 @@ dependencies = [ "serde_derive", "serde_json", "sha1", - "sha2 0.10.8", "thiserror", "type_macros", "types", @@ -1980,6 +2526,7 @@ dependencies = [ "clientinfo", "fbthrift_socket", "fs-err", + "hg-metrics", "identity", "serde", "thrift-types", @@ -1997,6 +2544,7 @@ dependencies = [ "async-runtime", "cxx", "cxx-build", + "fbinit", "identity", "manifest", "once_cell", @@ -2004,14 +2552,16 @@ dependencies = [ "pathmatcher", "repo", "sparse", + "stats", + "tracing", "types", ] [[package]] name = "either" -version = "1.9.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "encode_unicode" @@ -2030,23 +2580,23 @@ dependencies = [ [[package]] name = "encoding_rs" -version = "0.8.33" +version = "0.8.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" +checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" dependencies = [ "cfg-if 1.0.0", ] [[package]] name = "enum_dispatch" -version = "0.3.12" +version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f33313078bb8d4d05a2733a94ac4c2d8a0df9a2b84424ebf4f33bfc224a890e" +checksum = "aa18ce2bc66555b3218614519ac839ddb759a7d6720732f979ef8d13be147ecd" dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.72", ] [[package]] @@ -2080,24 +2630,34 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "erased-serde" -version = "0.4.2" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55d05712b2d8d88102bc9868020c9e5c7a1f5527c452b9b97450a1d006140ba7" +checksum = "24e2389d65ab4fab27dc2a5de7b191e1f6617d1f1c8855c0dc569c94a4cbb18d" dependencies = [ "serde", + "typeid", ] [[package]] name = "errno" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" dependencies = [ "libc", "windows-sys 0.52.0", ] [[package]] +name = "euclid" +version = "0.22.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0f0eb73b934648cd7a4a61f1b15391cd95dab0b4da6e2e66c2a072c144b4a20" +dependencies = [ + "num-traits", +] + +[[package]] name = "event-listener" version = "2.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2109,9 +2669,9 @@ version = "0.1.0" dependencies = [ "anyhow", "async-runtime", + "commits", "dag", "edenapi", - "hgcommits", "metalog", "refencode", "tracing", @@ -2119,18 +2679,6 @@ dependencies = [ ] [[package]] -name = "extend" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f47da3a72ec598d9c8937a7ebca8962a5c7a1f28444e38c2b33c771ba3f55f05" -dependencies = [ - "proc-macro-error", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] name = "factory" version = "0.1.0" dependencies = [ @@ -2160,6 +2708,16 @@ dependencies = [ ] [[package]] +name = "fancy-regex" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b95f7c0680e4142284cf8b22c14a476e87d61b004a3a0861872b32ef7ead40a2" +dependencies = [ + "bit-set", + "regex", +] + +[[package]] name = "faster-hex" version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2176,50 +2734,46 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.0.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" +checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" [[package]] name = "fb303_core" version = "0.0.0" -source = "git+https://github.com/facebook/fb303.git?branch=main#1dd3544a29690edacb8da2910cd6e788a9f6c66b" +source = "git+https://github.com/facebook/fb303.git?branch=main#0fdcfa63be9071ba9ba34c59b484417f2bb7564b" dependencies = [ "anyhow", - "async-trait", "codegen_includer_proc_macro", - "const-cstr", - "fb303_core_types", "fbthrift", "futures 0.3.30", + "once_cell", "ref-cast", + "serde", + "serde_derive", "thiserror", "thrift_compiler", - "tracing", - "tracing-futures", ] [[package]] -name = "fb303_core_types" +name = "fb303_core_clients" version = "0.0.0" -source = "git+https://github.com/facebook/fb303.git?branch=main#1dd3544a29690edacb8da2910cd6e788a9f6c66b" +source = "git+https://github.com/facebook/fb303.git?branch=main#0fdcfa63be9071ba9ba34c59b484417f2bb7564b" dependencies = [ "anyhow", + "async-trait", "codegen_includer_proc_macro", + "fb303_core", "fbthrift", "futures 0.3.30", - "once_cell", - "ref-cast", - "serde", - "serde_derive", - "thiserror", "thrift_compiler", + "tracing", ] [[package]] name = "fbinit" version = "0.1.2" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#76d2159747b056901daa362c3404b6d7b781eec5" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#4f55da19d54ca6e235474f95902e308610724559" dependencies = [ "fbinit_macros", "quickcheck", @@ -2228,17 +2782,17 @@ dependencies = [ [[package]] name = "fbinit_macros" version = "0.1.2" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#76d2159747b056901daa362c3404b6d7b781eec5" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#4f55da19d54ca6e235474f95902e308610724559" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.72", ] [[package]] name = "fbthrift" version = "0.0.1+unstable" -source = "git+https://github.com/facebook/fbthrift.git?branch=main#f0eefaa2734bce13d861e0182b90a98d13250f17" +source = "git+https://github.com/facebook/fbthrift.git?branch=main#f5a5f5ab0de99eeeece67521eb816032c199cc3f" dependencies = [ "anyhow", "async-trait", @@ -2249,7 +2803,7 @@ dependencies = [ "ghost", "num-derive", "num-traits", - "ordered-float", + "ordered-float 3.9.2", "panic-message", "serde_json", "thiserror", @@ -2258,17 +2812,17 @@ dependencies = [ [[package]] name = "fbthrift_framed" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#76d2159747b056901daa362c3404b6d7b781eec5" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#4f55da19d54ca6e235474f95902e308610724559" dependencies = [ "byteorder", "bytes", - "tokio-util 0.7.10", + "tokio-util 0.7.11", ] [[package]] name = "fbthrift_socket" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#76d2159747b056901daa362c3404b6d7b781eec5" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#4f55da19d54ca6e235474f95902e308610724559" dependencies = [ "anyhow", "bytes", @@ -2278,14 +2832,14 @@ dependencies = [ "futures 0.3.30", "tokio", "tokio-tower", - "tokio-util 0.7.10", + "tokio-util 0.7.11", "tower-service", ] [[package]] name = "fbthrift_util" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#76d2159747b056901daa362c3404b6d7b781eec5" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#4f55da19d54ca6e235474f95902e308610724559" dependencies = [ "tokio", ] @@ -2320,7 +2874,7 @@ checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" dependencies = [ "cfg-if 1.0.0", "libc", - "redox_syscall", + "redox_syscall 0.4.1", "windows-sys 0.52.0", ] @@ -2338,9 +2892,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flate2" -version = "1.0.28" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" dependencies = [ "crc32fast", "miniz_oxide", @@ -2354,7 +2908,7 @@ checksum = "2cd66269887534af4b0c3e3337404591daa8dc8b9b2b3db71f9523beb4bafb41" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.72", ] [[package]] @@ -2529,7 +3083,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.72", ] [[package]] @@ -2595,9 +3149,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.12" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if 1.0.0", "libc", @@ -2612,14 +3166,14 @@ checksum = "b0e085ded9f1267c32176b40921b9754c474f7dd96f7e808d4a982e48aa1e854" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.72", ] [[package]] name = "gimli" -version = "0.28.1" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" +checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" [[package]] name = "git2" @@ -2637,6 +3191,21 @@ dependencies = [ ] [[package]] +name = "gitcompat" +version = "0.1.0" +dependencies = [ + "anyhow", + "configmodel", + "filetime", + "fs-err", + "identity", + "spawn-ext", + "tracing", + "treestate", + "types", +] + +[[package]] name = "gitdag" version = "0.1.0" dependencies = [ @@ -2645,6 +3214,7 @@ dependencies = [ "git2", "nonblocking", "parking_lot", + "phf", "tracing", ] @@ -2654,11 +3224,16 @@ version = "0.1.0" dependencies = [ "anyhow", "async-trait", + "configmodel", "factory", "fs-err", "git2", + "gitcompat", "minibytes", + "progress-model", + "spawn-ext", "storemodel", + "tracing", "types", ] @@ -2677,16 +3252,16 @@ dependencies = [ "aho-corasick", "bstr", "log", - "regex-automata 0.4.3", - "regex-syntax 0.8.2", + "regex-automata 0.4.7", + "regex-syntax 0.8.4", "serde", ] [[package]] name = "h2" -version = "0.3.24" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9" +checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" dependencies = [ "bytes", "fnv", @@ -2694,18 +3269,18 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap 2.1.0", + "indexmap 2.2.6", "slab", "tokio", - "tokio-util 0.7.10", + "tokio-util 0.7.11", "tracing", ] [[package]] name = "half" -version = "1.8.2" +version = "1.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" +checksum = "1b43ede17f21864e81be2fa654110bf1e793774238d86ef8555c37e6519c0403" [[package]] name = "hashbrown" @@ -2724,11 +3299,11 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" [[package]] name = "hashbrown" -version = "0.14.3" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" dependencies = [ - "ahash 0.8.7", + "ahash 0.8.11", "allocator-api2", ] @@ -2748,6 +3323,12 @@ 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.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2758,9 +3339,9 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.3.4" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d3d0e0f38255e7fa3cf31335b3a56f05febd18025f4db5ef7a0cfb4f8da651f" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" [[package]] name = "hex" @@ -2792,124 +3373,16 @@ dependencies = [ ] [[package]] -name = "hgcommands" -version = "0.1.0" -dependencies = [ - "anyhow", - "async-runtime", - "atexit", - "bindings", - "blackbox", - "checkout", - "chrono", - "clidispatch", - "cliparser", - "clone", - "comfy-table", - "commandserver", - "configloader", - "configmodel", - "constructors", - "cpython", - "cpython_ext", - "ctrlc", - "dag", - "debugtop", - "eagerepo", - "edenapi", - "edenfs-client", - "exchange", - "fail", - "flate2", - "formatter", - "fs-err", - "fsyncglob", - "hg-http", - "hg-metrics", - "hgplain", - "hgtime", - "hostname 0.3.1", - "identity", - "indexedlog", - "libc", - "metalog", - "metrics-render", - "migration", - "mincode", - "minibytes", - "network-doctor", - "nodeipc", - "parking_lot", - "pathmatcher", - "procinfo", - "progress-model", - "progress-render", - "pycheckout", - "pyconfigloader", - "pyedenclient", - "pyio", - "pymodules", - "python3-sys", - "pytracing", - "pyworkingcopy", - "rand 0.8.5", - "repo", - "repo_name", - "repostate", - "revisionstore", - "runlog", - "sampling", - "serde", - "serde_json", - "status", - "termstyle", - "tracing", - "tracing-collector", - "tracing-reload", - "tracing-sampler", - "tracing-subscriber", - "treestate", - "types", - "url", - "util", - "version", - "workingcopy", - "zstd", -] - -[[package]] -name = "hgcommits" -version = "0.1.0" -dependencies = [ - "anyhow", - "async-trait", - "commits-trait", - "dag", - "edenapi", - "factory", - "fs-err", - "futures 0.3.30", - "minibytes", - "parking_lot", - "revlogindex", - "storemodel", - "streams", - "tracing", - "types", - "zstore", -] - -[[package]] name = "hgmain" version = "0.1.0" dependencies = [ "anyhow", "atexit", "clidispatch", + "commands", "configloader", "dirs 2.0.2", "encoding", - "hgcommands", "identity", "libc", "pyblackbox", @@ -2956,9 +3429,23 @@ dependencies = [ ] [[package]] +name = "hook" +version = "0.1.0" +dependencies = [ + "anyhow", + "clientinfo", + "configmodel", + "identity", + "io", + "minibytes", + "spawn-ext", + "tracing", +] + +[[package]] name = "hostcaps" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#76d2159747b056901daa362c3404b6d7b781eec5" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#4f55da19d54ca6e235474f95902e308610724559" dependencies = [ "once_cell", ] @@ -2966,7 +3453,7 @@ dependencies = [ [[package]] name = "hostname" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#76d2159747b056901daa362c3404b6d7b781eec5" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#4f55da19d54ca6e235474f95902e308610724559" dependencies = [ "anyhow", "hostname 0.3.1", @@ -2985,13 +3472,13 @@ dependencies = [ [[package]] name = "http" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" +checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" dependencies = [ "bytes", "fnv", - "itoa 1.0.10", + "itoa", ] [[package]] @@ -3036,7 +3523,7 @@ dependencies = [ "structopt", "thiserror", "tokio", - "tokio-util 0.7.10", + "tokio-util 0.7.11", "tracing", "url", "zstd", @@ -3044,9 +3531,9 @@ dependencies = [ [[package]] name = "httparse" -version = "1.8.0" +version = "1.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" +checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" [[package]] name = "httpdate" @@ -3062,9 +3549,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.28" +version = "0.14.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" +checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9" dependencies = [ "bytes", "futures-channel", @@ -3075,9 +3562,9 @@ dependencies = [ "http-body", "httparse", "httpdate", - "itoa 1.0.10", + "itoa", "pin-project-lite", - "socket2 0.5.5", + "socket2 0.5.7", "tokio", "tower-service", "tracing", @@ -3113,9 +3600,9 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.59" +version = "0.1.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6a67363e2aa4443928ce15e57ebae94fd8949958fd1223c4cfc0cd473ad7539" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -3148,17 +3635,6 @@ dependencies = [ [[package]] name = "idna" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" -dependencies = [ - "matches", - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "idna" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" @@ -3187,7 +3663,7 @@ dependencies = [ "globset", "log", "memchr", - "regex-automata 0.4.3", + "regex-automata 0.4.7", "same-file", "walkdir", "winapi-util", @@ -3244,29 +3720,30 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.1.0" +version = "2.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "arbitrary", "equivalent", - "hashbrown 0.14.3", + "hashbrown 0.14.5", "rayon", "serde", ] [[package]] name = "insta" -version = "1.34.0" +version = "1.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d64600be34b2fcfc267740a243fa7744441bb4947a619ac4e5bb6507f35fbfc" +checksum = "810ae6042d48e2c9e9215043563a58a80b877bc863228a74cf10c49d4620a6f5" dependencies = [ "console", + "globset", "lazy_static", "linked-hash-map", "serde", "similar", - "yaml-rust", + "walkdir", ] [[package]] @@ -3278,9 +3755,9 @@ dependencies = [ [[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 1.0.0", ] @@ -3294,8 +3771,10 @@ dependencies = [ "once_cell", "parking_lot", "pipe", + "spawn-ext", "streampager", "terminal_size 0.3.0", + "termios", "termwiz", "time-interval", ] @@ -3306,7 +3785,7 @@ version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ - "hermit-abi 0.3.4", + "hermit-abi 0.3.9", "libc", "windows-sys 0.48.0", ] @@ -3328,12 +3807,12 @@ dependencies = [ [[package]] name = "is-terminal" -version = "0.4.10" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bad00257d07be169d870ab665980b06cdb366d792ad690bf2e76876dc503455" +checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" dependencies = [ - "hermit-abi 0.3.4", - "rustix 0.38.30", + "hermit-abi 0.3.9", + "libc", "windows-sys 0.52.0", ] @@ -3348,6 +3827,12 @@ dependencies = [ ] [[package]] +name = "is_terminal_polyfill" +version = "1.70.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" + +[[package]] name = "itertools" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3358,30 +3843,35 @@ dependencies = [ [[package]] name = "itoa" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" - -[[package]] -name = "itoa" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "jobserver" -version = "0.1.27" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" +checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" dependencies = [ "libc", ] [[package]] +name = "journal" +version = "0.1.0" +dependencies = [ + "anyhow", + "hgtime", + "repolock", + "types", + "util", +] + +[[package]] name = "js-sys" -version = "0.3.67" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a1d36f1235bc969acba30b7f5990b864423a6068a10f7c90ae8f0112e3a59d1" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" dependencies = [ "wasm-bindgen", ] @@ -3404,9 +3894,9 @@ checksum = "bf36173d4167ed999940f804952e6b08197cae5ad5d572eb4db150ce8ad5d58f" [[package]] name = "lazy_static" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "lazystr" @@ -3427,9 +3917,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.152" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libgit2-sys" @@ -3447,9 +3937,9 @@ dependencies = [ [[package]] name = "libnghttp2-sys" -version = "0.1.9+1.58.0" +version = "0.1.10+1.61.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b57e858af2798e167e709b9d969325b6d8e9d50232fcbc494d7d54f976854a64" +checksum = "959c25552127d2e1fa72f0e52548ec04fc386e827ba71a7bd01db46a447dc135" dependencies = [ "cc", "libc", @@ -3457,13 +3947,12 @@ dependencies = [ [[package]] name = "libredox" -version = "0.0.1" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.6.0", "libc", - "redox_syscall", ] [[package]] @@ -3482,9 +3971,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.14" +version = "1.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "295c17e837573c8c821dbaeb3cceb3d745ad082f7572191409e69cbc1b3fd050" +checksum = "c15da26e5af7e25c90b37a2d75cdbf940cf4a55316de9d84c679c9b8bfabf82e" dependencies = [ "cc", "libc", @@ -3493,15 +3982,6 @@ dependencies = [ ] [[package]] -name = "line-wrap" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30344350a2a51da54c1d53be93fade8a237e545dbcc4bdbe635413f2117cab9" -dependencies = [ - "safemem", -] - -[[package]] name = "linelog" version = "0.1.0" dependencies = [ @@ -3532,9 +4012,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 = "local-encoding" @@ -3549,9 +4029,9 @@ dependencies = [ [[package]] name = "lock_api" -version = "0.4.11" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" dependencies = [ "autocfg", "scopeguard", @@ -3559,20 +4039,20 @@ dependencies = [ [[package]] name = "log" -version = "0.4.20" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" dependencies = [ "value-bag", ] [[package]] name = "lru" -version = "0.11.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a83fb7698b3643a0e34f9ae6f2e8f0178c0fd42f8b59d493aa271ff3a5bf21" +checksum = "d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc" dependencies = [ - "hashbrown 0.14.3", + "hashbrown 0.14.5", ] [[package]] @@ -3597,22 +4077,31 @@ dependencies = [ [[package]] name = "lz4-sys" -version = "1.9.4" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57d27b317e207b10f69f5e75494119e391a96f48861ae870d1da6edac98ca900" +checksum = "109de74d5d2353660401699a4174a4ff23fcc649caf553df71933c7fb45ad868" dependencies = [ "cc", "libc", ] [[package]] +name = "mac_address" +version = "1.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8836fae9d0d4be2c8b4efcdd79e828a2faa058a90d005abf42f91cac5493a08e" +dependencies = [ + "nix 0.28.0", + "winapi 0.3.9", +] + +[[package]] name = "manifest" version = "0.1.0" dependencies = [ "anyhow", "pathmatcher", "quickcheck", - "quickcheck_arbitrary_derive", "types", ] @@ -3662,16 +4151,10 @@ dependencies = [ ] [[package]] -name = "matches" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" - -[[package]] name = "memchr" -version = "2.7.1" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "memmap2" @@ -3690,18 +4173,18 @@ checksum = "a64a92489e2744ce060c349162be1c5f33c6969234104dbd99ddb5feb08b8c15" [[package]] name = "memoffset" -version = "0.6.5" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" +checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" dependencies = [ "autocfg", ] [[package]] name = "memoffset" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" dependencies = [ "autocfg", ] @@ -3720,6 +4203,7 @@ dependencies = [ "quickcheck", "rand_chacha 0.3.1", "rand_core 0.6.4", + "refencode", "serde", "serde_json", "tempfile", @@ -3763,9 +4247,9 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] name = "mime_guess" -version = "2.0.4" +version = "2.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" +checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e" dependencies = [ "mime", "unicase", @@ -3806,24 +4290,30 @@ dependencies = [ ] [[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.1" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" dependencies = [ "adler", ] [[package]] name = "mio" -version = "0.8.10" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" +checksum = "4569e456d394deccd22ce1c1913e6ea0e54519f577285001215d33557431afe4" dependencies = [ + "hermit-abi 0.3.9", "libc", - "log", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -3837,26 +4327,27 @@ dependencies = [ "identity", "libc", "serde", - "sha2 0.10.8", + "sha2", "toml", ] [[package]] name = "mockito" -version = "0.25.3" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3ae325bcceb48a24302ac57e1055f9173f5fd53be535603ea0ed41dea92db5" +checksum = "d2f6e023aa5bdf392aa06c78e4a4e6d498baab5138d0c993503350ebbc37bf1e" dependencies = [ "assert-json-diff", "colored", - "difference", - "httparse", - "lazy_static", + "futures-core", + "hyper", "log", - "rand 0.7.3", + "rand 0.8.5", "regex", "serde_json", - "serde_urlencoded 0.6.1", + "serde_urlencoded", + "similar", + "tokio", ] [[package]] @@ -3879,7 +4370,7 @@ name = "mutationstore" version = "0.1.0" dependencies = [ "anyhow", - "bitflags 2.4.2", + "bitflags 2.6.0", "dag", "drawdag", "futures 0.3.30", @@ -3893,11 +4384,10 @@ dependencies = [ [[package]] name = "native-tls" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" +checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466" dependencies = [ - "lazy_static", "libc", "log", "openssl", @@ -3927,25 +4417,28 @@ dependencies = [ [[package]] name = "nix" -version = "0.24.3" +version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" +checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" dependencies = [ "bitflags 1.3.2", "cfg-if 1.0.0", "libc", - "memoffset 0.6.5", + "memoffset 0.7.1", + "pin-utils", ] [[package]] name = "nix" -version = "0.27.1" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" +checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.6.0", "cfg-if 1.0.0", + "cfg_aliases", "libc", + "memoffset 0.9.1", ] [[package]] @@ -3980,12 +4473,12 @@ dependencies = [ [[package]] name = "nom" -version = "5.1.3" +version = "7.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08959a387a676302eebf4ddbcbc611da04285579f76f88ee0506c63b1a61dd4b" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" dependencies = [ "memchr", - "version_check", + "minimal-lexical", ] [[package]] @@ -4007,16 +4500,21 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.4.4" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" dependencies = [ - "autocfg", "num-integer", "num-traits", ] [[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + +[[package]] name = "num-derive" version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4029,19 +4527,18 @@ dependencies = [ [[package]] name = "num-integer" -version = "0.1.45" +version = "0.1.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" dependencies = [ - "autocfg", "num-traits", ] [[package]] name = "num-traits" -version = "0.2.17" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", ] @@ -4052,24 +4549,24 @@ version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.3.4", + "hermit-abi 0.3.9", "libc", ] [[package]] name = "num_threads" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" +checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9" dependencies = [ "libc", ] [[package]] name = "object" -version = "0.32.2" +version = "0.36.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +checksum = "3f203fa8daa7bb185f760ae12bd8e097f63d17041dcdcaf675ac54cdf863170e" dependencies = [ "memchr", ] @@ -4081,12 +4578,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] -name = "opaque-debug" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" - -[[package]] name = "open" version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4099,11 +4590,11 @@ dependencies = [ [[package]] name = "openssl" -version = "0.10.62" +version = "0.10.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cde4d2d9200ad5909f8dac647e29482e07c3a35de8a13fce7c9c7747ad9f671" +checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.6.0", "cfg-if 1.0.0", "foreign-types", "libc", @@ -4120,7 +4611,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.72", ] [[package]] @@ -4131,9 +4622,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.98" +version = "0.9.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1665caf8ab2dc9aef43d1c0023bd904633a6a05cb30b0ad59bec2ae986e57a7" +checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" dependencies = [ "cc", "libc", @@ -4153,6 +4644,15 @@ dependencies = [ ] [[package]] +name = "ordered-float" +version = "4.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19ff2cf528c6c03d9ed653d6c4ce1dc0582dc4af309790ad92f07c1cd551b0be" +dependencies = [ + "num-traits", +] + +[[package]] name = "ordered-multimap" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4188,9 +4688,9 @@ checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" [[package]] name = "parking_lot" -version = "0.12.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ "lock_api", "parking_lot_core", @@ -4198,22 +4698,22 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.9" +version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if 1.0.0", "libc", - "redox_syscall", + "redox_syscall 0.5.3", "smallvec", - "windows-targets 0.48.5", + "windows-targets 0.52.6", ] [[package]] name = "paste" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "pathdiff" @@ -4244,8 +4744,8 @@ name = "pathmatcher" version = "0.1.0" dependencies = [ "anyhow", - "bitflags 2.4.2", - "fancy-regex", + "bitflags 2.6.0", + "fancy-regex 0.10.0", "fs-err", "glob", "globset", @@ -4261,11 +4761,11 @@ dependencies = [ [[package]] name = "pem" -version = "3.0.3" +version = "3.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b8fcc794035347fb64beda2d3b462595dd2753e3f268d89c5aae77e8cf2c310" +checksum = "8e459365e590736a54c3fa561947c84837534b8e9af6fc5bf781307e82658fae" dependencies = [ - "base64 0.21.7", + "base64 0.22.1", "serde", ] @@ -4278,13 +4778,13 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "perthread" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#76d2159747b056901daa362c3404b6d7b781eec5" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#4f55da19d54ca6e235474f95902e308610724559" [[package]] name = "pest" -version = "2.7.6" +version = "2.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f200d8d83c44a45b21764d1916299752ca035d15ecd46faca3e9a2a2bf6ad06" +checksum = "cd53dff83f26735fdc1ca837098ccf133605d794cdae66acfc2bfac3ec809d95" dependencies = [ "memchr", "thiserror", @@ -4293,9 +4793,9 @@ dependencies = [ [[package]] name = "pest_derive" -version = "2.7.6" +version = "2.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcd6ab1236bbdb3a49027e920e693192ebfe8913f6d60e294de57463a493cfde" +checksum = "2a548d2beca6773b1c244554d36fcf8548a8a58e74156968211567250e48e49a" dependencies = [ "pest", "pest_generator", @@ -4303,35 +4803,26 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.7.6" +version = "2.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a31940305ffc96863a735bef7c7994a00b325a7138fdbc5bda0f1a0476d3275" +checksum = "3c93a82e8d145725dcbaf44e5ea887c8a869efdcc28706df2d08c69e17077183" dependencies = [ "pest", "pest_meta", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.72", ] [[package]] name = "pest_meta" -version = "2.7.6" +version = "2.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7ff62f5259e53b78d1af898941cdcdccfae7385cf7d793a6e55de5d05bb4b7d" +checksum = "a941429fea7e08bedec25e4f6785b6ffaacc6b755da98df5ef3e7dcf4a124c4f" dependencies = [ "once_cell", "pest", - "sha2 0.10.8", -] - -[[package]] -name = "phf" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259" -dependencies = [ - "phf_shared 0.10.0", + "sha2", ] [[package]] @@ -4341,7 +4832,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" dependencies = [ "phf_macros", - "phf_shared 0.11.2", + "phf_shared", ] [[package]] @@ -4351,7 +4842,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8d39688d359e6b34654d328e262234662d16cc0f60ec8dcbe5e718709342a5a" dependencies = [ "phf_generator", - "phf_shared 0.11.2", + "phf_shared", ] [[package]] @@ -4360,7 +4851,7 @@ version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" dependencies = [ - "phf_shared 0.11.2", + "phf_shared", "rand 0.8.5", ] @@ -4371,19 +4862,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" dependencies = [ "phf_generator", - "phf_shared 0.11.2", + "phf_shared", "proc-macro2", "quote", - "syn 2.0.48", -] - -[[package]] -name = "phf_shared" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" -dependencies = [ - "siphasher", + "syn 2.0.72", ] [[package]] @@ -4406,11 +4888,11 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.1.3" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" +checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" dependencies = [ - "pin-project-internal 1.1.3", + "pin-project-internal 1.1.5", ] [[package]] @@ -4426,20 +4908,20 @@ dependencies = [ [[package]] name = "pin-project-internal" -version = "1.1.3" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" +checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.72", ] [[package]] name = "pin-project-lite" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" [[package]] name = "pin-utils" @@ -4458,19 +4940,18 @@ dependencies = [ [[package]] name = "pkg-config" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2900ede94e305130c13ddd391e0ab7cbaeb783945ae07a279c268cb05109c6cb" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] name = "plist" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5699cc8a63d1aa2b1ee8e12b9ad70ac790d65788cd36101fa37f87ea46c4cef" +checksum = "42cf17e9a1800f5f396bc67d193dc9411b59012a5876445ef450d449881e1016" dependencies = [ - "base64 0.21.7", - "indexmap 2.1.0", - "line-wrap", + "base64 0.22.1", + "indexmap 2.2.6", "quick-xml", "serde", "time", @@ -4548,9 +5029,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.76" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] @@ -4750,10 +5231,23 @@ dependencies = [ "configloader", "cpython", "cpython_ext", + "repo-minimal-info", "util", ] [[package]] +name = "pycontext" +version = "0.1.0" +dependencies = [ + "configset", + "context", + "cpython", + "cpython_ext", + "io", + "pyconfigloader", +] + +[[package]] name = "pycopytrace" version = "0.1.0" dependencies = [ @@ -4763,9 +5257,8 @@ dependencies = [ "cpython", "cpython_ext", "dag", - "parking_lot", + "pypathmatcher", "storemodel", - "types", ] [[package]] @@ -4774,17 +5267,19 @@ version = "0.1.0" dependencies = [ "anyhow", "async-runtime", + "commits", + "configmodel", "cpython", "cpython_ext", "dag", "futures 0.3.30", - "hgcommits", "minibytes", "parking_lot", "pyedenapi", "pyio", "pymetalog", "storemodel", + "types", ] [[package]] @@ -4855,16 +5350,7 @@ dependencies = [ "pyconfigloader", "pyrevisionstore", "revisionstore", - "types", -] - -[[package]] -name = "pyedenclient" -version = "0.1.0" -dependencies = [ - "cpython", - "cpython_ext", - "edenfs-client", + "sha1", "types", ] @@ -4873,6 +5359,7 @@ name = "pyerror" version = "0.1.0" dependencies = [ "auth", + "checkout", "configmodel", "cpython", "cpython_ext", @@ -4922,13 +5409,27 @@ dependencies = [ ] [[package]] +name = "pygitcompat" +version = "0.1.0" +dependencies = [ + "configmodel", + "cpython", + "cpython_ext", + "gitcompat", + "pyprocess", + "types", +] + +[[package]] name = "pygitstore" version = "0.1.0" dependencies = [ + "configmodel", "cpython", "cpython_ext", "gitstore", "storemodel", + "types", ] [[package]] @@ -4981,6 +5482,17 @@ dependencies = [ ] [[package]] +name = "pyjournal" +version = "0.1.0" +dependencies = [ + "cpython", + "cpython_ext", + "hgtime", + "journal", + "types", +] + +[[package]] name = "pylinelog" version = "0.1.0" dependencies = [ @@ -5039,6 +5551,7 @@ dependencies = [ "minibytes", "pybytes", "python-modules", + "tracing", ] [[package]] @@ -5165,7 +5678,9 @@ dependencies = [ name = "pyrepo" version = "0.1.0" dependencies = [ + "checkout", "configmodel", + "context", "cpython", "cpython_ext", "parking_lot", @@ -5179,6 +5694,7 @@ dependencies = [ "repo", "repolock", "revisionstore", + "types", "util", "workingcopy", ] @@ -5238,15 +5754,15 @@ version = "0.1.0" dependencies = [ "codegen", "once_cell", - "phf 0.11.2", + "phf", "zstdelta", ] [[package]] name = "python3-sys" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f8b50d72fb3015735aa403eebf19bbd72c093bfeeae24ee798be5f2f1aab52" +checksum = "0f53ef6740367a09718d2cd21ba15b0d7972342a38e554736bcee7773e45c9f5" dependencies = [ "libc", "regex", @@ -5352,20 +5868,29 @@ name = "pyworkingcopy" version = "0.1.0" dependencies = [ "anyhow", + "context", "cpython", "cpython_ext", "fs-err", - "io", "parking_lot", "pathmatcher", - "pyconfigloader", - "pyedenclient", "pypathmatcher", "pystatus", "pytreestate", + "pyworkingcopyclient", "repostate", "sparse", - "termlogger", + "types", + "workingcopy", +] + +[[package]] +name = "pyworkingcopyclient" +version = "0.1.0" +dependencies = [ + "cpython", + "cpython_ext", + "edenfs-client", "types", "workingcopy", ] @@ -5401,9 +5926,9 @@ dependencies = [ [[package]] name = "quick-xml" -version = "0.31.0" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" +checksum = "1d3a6e5838b60e0e8fa7a43f22ade549a37d61f8bdbe636d0d7816191de969c2" dependencies = [ "memchr", ] @@ -5422,12 +5947,12 @@ dependencies = [ [[package]] name = "quickcheck_arbitrary_derive" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#76d2159747b056901daa362c3404b6d7b781eec5" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#4f55da19d54ca6e235474f95902e308610724559" dependencies = [ "proc-macro2", "quickcheck", "quote", - "syn 1.0.109", + "syn 2.0.72", ] [[package]] @@ -5443,9 +5968,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.35" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] @@ -5549,7 +6074,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.12", + "getrandom 0.2.15", "serde", ] @@ -5573,9 +6098,9 @@ dependencies = [ [[package]] name = "rayon" -version = "1.8.1" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa7237101a77a10773db45d62004a272517633fbcc3df19d96455ede1122e051" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" dependencies = [ "either", "rayon-core", @@ -5588,7 +6113,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" dependencies = [ "crossbeam-deque", - "crossbeam-utils 0.8.19", + "crossbeam-utils 0.8.20", ] [[package]] @@ -5610,34 +6135,43 @@ dependencies = [ ] [[package]] +name = "redox_syscall" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" +dependencies = [ + "bitflags 2.6.0", +] + +[[package]] name = "redox_users" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" +checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" dependencies = [ - "getrandom 0.2.12", + "getrandom 0.2.15", "libredox", "thiserror", ] [[package]] name = "ref-cast" -version = "1.0.22" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4846d4c50d1721b1a3bef8af76924eef20d5e723647333798c1b519b3a9473f" +checksum = "ccf0a6f84d5f1d581da8b41b47ec8600871962f2a528115b542b362d4b744931" dependencies = [ "ref-cast-impl", ] [[package]] name = "ref-cast-impl" -version = "1.0.22" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fddb4f8d99b0a2ebafc65a87a69a7b9875e4b1ae1f00db265d300ef7f28bccc" +checksum = "bcc303e793d3734489387d205e9b186fac9c6cfacedd98cbb2e8a5943595f3e6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.72", ] [[package]] @@ -5649,14 +6183,14 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.2" +version = "1.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.3", - "regex-syntax 0.8.2", + "regex-automata 0.4.7", + "regex-syntax 0.8.4", ] [[package]] @@ -5681,13 +6215,13 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.3" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.2", + "regex-syntax 0.8.4", ] [[package]] @@ -5704,9 +6238,9 @@ checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" [[package]] name = "regex-syntax" -version = "0.8.2" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" [[package]] name = "remove_dir_all" @@ -5721,7 +6255,7 @@ dependencies = [ name = "renderdag" version = "0.1.0" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.6.0", "dag", "itertools", "nonblocking", @@ -5750,6 +6284,7 @@ dependencies = [ "once_cell", "parking_lot", "refencode", + "repo-minimal-info", "repolock", "revisionstore", "revsets", @@ -5764,6 +6299,19 @@ dependencies = [ ] [[package]] +name = "repo-minimal-info" +version = "0.1.0" +dependencies = [ + "anyhow", + "fs-err", + "gitcompat", + "identity", + "phf", + "tempfile", + "util", +] + +[[package]] name = "repo_name" version = "0.1.0" dependencies = [ @@ -5780,6 +6328,7 @@ dependencies = [ "fs-err", "fs2", "parking_lot", + "progress-model", "tempfile", "thiserror", "tracing", @@ -5803,9 +6352,9 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.11.23" +version = "0.11.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37b1ae8d9ac08420c66222fb9096fc5de435c3c48542bc5336c51892cffafb41" +checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" dependencies = [ "base64 0.21.7", "bytes", @@ -5834,12 +6383,13 @@ dependencies = [ "rustls-pemfile", "serde", "serde_json", - "serde_urlencoded 0.7.1", + "serde_urlencoded", + "sync_wrapper", "system-configuration", "tokio", "tokio-native-tls", "tokio-rustls", - "tokio-util 0.7.10", + "tokio-util 0.7.11", "tower-service", "url", "wasm-bindgen", @@ -5877,6 +6427,7 @@ dependencies = [ "http", "http-client", "indexedlog", + "itertools", "lfs_protocol", "lz4-pyframe", "manifest-tree", @@ -5900,7 +6451,7 @@ dependencies = [ "serde_derive", "serde_json", "sha1", - "sha2 0.10.8", + "sha2", "stats", "storemodel", "tempfile", @@ -5956,6 +6507,7 @@ dependencies = [ "configmodel", "dag", "edenapi", + "hgplain", "metalog", "refencode", "thiserror", @@ -5964,17 +6516,39 @@ dependencies = [ ] [[package]] +name = "rewrite-macros" +version = "0.1.0" +dependencies = [ + "proc-macro2", + "quote", + "tree-pattern-match", +] + +[[package]] +name = "rich-cas-client" +version = "0.1.0" +dependencies = [ + "anyhow", + "async-trait", + "cas-client", + "configmodel", + "fbinit", + "types", +] + +[[package]] name = "ring" -version = "0.17.7" +version = "0.17.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74" +checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" dependencies = [ "cc", - "getrandom 0.2.12", + "cfg-if 1.0.0", + "getrandom 0.2.15", "libc", "spin", "untrusted", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -6009,9 +6583,9 @@ dependencies = [ [[package]] name = "rustc-demangle" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustix" @@ -6029,22 +6603,22 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.30" +version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "322394588aaf33c24007e8bb3238ee3e4c5c09c084ab32bc73890b99ff326bca" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.6.0", "errno", "libc", - "linux-raw-sys 0.4.13", + "linux-raw-sys 0.4.14", "windows-sys 0.52.0", ] [[package]] name = "rustls" -version = "0.21.10" +version = "0.21.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" +checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" dependencies = [ "log", "ring", @@ -6085,21 +6659,15 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.14" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" +checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" [[package]] name = "ryu" -version = "1.0.16" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" - -[[package]] -name = "safemem" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "same-file" @@ -6147,6 +6715,38 @@ dependencies = [ ] [[package]] +name = "scope" +version = "0.0.1+unstable" +source = "git+https://github.com/facebook/fbthrift.git?branch=main#f5a5f5ab0de99eeeece67521eb816032c199cc3f" +dependencies = [ + "anyhow", + "codegen_includer_proc_macro", + "fbthrift", + "futures 0.3.30", + "once_cell", + "ref-cast", + "serde", + "serde_derive", + "thiserror", + "thrift_compiler", +] + +[[package]] +name = "scope_clients" +version = "0.0.1+unstable" +source = "git+https://github.com/facebook/fbthrift.git?branch=main#f5a5f5ab0de99eeeece67521eb816032c199cc3f" +dependencies = [ + "anyhow", + "async-trait", + "codegen_includer_proc_macro", + "fbthrift", + "futures 0.3.30", + "scope", + "thrift_compiler", + "tracing", +] + +[[package]] name = "scopeguard" version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6170,11 +6770,11 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.9.2" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" +checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", "core-foundation", "core-foundation-sys", "libc", @@ -6183,9 +6783,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.9.1" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" +checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf" dependencies = [ "core-foundation-sys", "libc", @@ -6211,9 +6811,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.195" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63261df402c67811e9ac6def069e4786148c4563f4b50fd4bf30aa370d626b02" +checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" dependencies = [ "serde_derive", ] @@ -6224,8 +6824,8 @@ version = "0.1.0" [[package]] name = "serde_bser" -version = "0.3.1" -source = "git+https://github.com/facebook/watchman.git?branch=main#d52738785ded4c290fb08adcb244e4c34ef1ffdd" +version = "0.4.0" +source = "git+https://github.com/facebook/watchman.git?branch=main#b53ca70cc37496cfd5924eacf2cef8a271ee6ae9" dependencies = [ "anyhow", "byteorder", @@ -6237,9 +6837,9 @@ dependencies = [ [[package]] name = "serde_bytes" -version = "0.11.14" +version = "0.11.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b8497c313fd43ab992087548117643f6fcd935cbf36f176ffda0aacf9591734" +checksum = "387cc504cb06bb40a96c8e04e951fe01854cf6bc921053c954e4a606d9675c6a" dependencies = [ "serde", ] @@ -6256,13 +6856,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.195" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46fe8f8603d81ba86327b23a2e9cdf49e1255fb94a4c5f297f6ee0547178ea2c" +checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.72", ] [[package]] @@ -6276,34 +6876,22 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.111" +version = "1.0.120" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "176e46fa42316f18edd598015a5166857fc835ec732f5215eac6b7bdbf0a84f4" +checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5" dependencies = [ - "itoa 1.0.10", + "itoa", "ryu", "serde", ] [[package]] name = "serde_spanned" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" -dependencies = [ - "serde", -] - -[[package]] -name = "serde_urlencoded" -version = "0.6.1" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ec5d77e2d4c73717816afac02670d5c4f534ea95ed430442cad02e7a6e32c97" +checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" dependencies = [ - "dtoa", - "itoa 0.4.8", "serde", - "url", ] [[package]] @@ -6313,7 +6901,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" dependencies = [ "form_urlencoded", - "itoa 1.0.10", + "itoa", "ryu", "serde", ] @@ -6326,27 +6914,14 @@ checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" dependencies = [ "cfg-if 1.0.0", "cpufeatures", - "digest 0.10.7", + "digest", ] [[package]] name = "sha1_smol" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012" - -[[package]] -name = "sha2" -version = "0.9.9" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" -dependencies = [ - "block-buffer 0.9.0", - "cfg-if 1.0.0", - "cpufeatures", - "digest 0.9.0", - "opaque-debug", -] +checksum = "bbfa15b3dddfee50a0fff136974b3e1bde555604ba463834a7eb7deb6417705d" [[package]] name = "sha2" @@ -6356,7 +6931,7 @@ checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" dependencies = [ "cfg-if 1.0.0", "cpufeatures", - "digest 0.10.7", + "digest", ] [[package]] @@ -6369,6 +6944,12 @@ dependencies = [ ] [[package]] +name = "shell-escape" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45bb67a18fa91266cc7807181f62f9178a6873bfad7dc788c42e6430db40184f" + +[[package]] name = "shellexpand" version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6379,19 +6960,9 @@ dependencies = [ [[package]] name = "shlex" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380" - -[[package]] -name = "signal-hook" -version = "0.1.17" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e31d442c16f047a671b5a71e2161d6e68814012b7f5379d269ebd915fac2729" -dependencies = [ - "libc", - "signal-hook-registry", -] +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" [[package]] name = "signal-hook" @@ -6404,30 +6975,19 @@ dependencies = [ ] [[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 0.3.17", -] - -[[package]] name = "signal-hook-registry" -version = "1.4.1" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" dependencies = [ "libc", ] [[package]] name = "similar" -version = "2.4.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32fea41aca09ee824cc9724996433064c89f7777e60762749a4170a14abbfa21" +checksum = "1de1d4f81173b03af4c0cbed3c898f6bff5b870e4a7f5d6f4057d62a7a4b686e" [[package]] name = "simple_asn1" @@ -6478,9 +7038,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.13.1" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "socket2" @@ -6494,18 +7054,18 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.5" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" dependencies = [ "libc", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "sorted_vector_map" -version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#76d2159747b056901daa362c3404b6d7b781eec5" +version = "0.2.0" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#4f55da19d54ca6e235474f95902e308610724559" dependencies = [ "itertools", "quickcheck", @@ -6521,7 +7081,7 @@ dependencies = [ "once_cell", "pathmatcher", "regex", - "syncify", + "rewrite-macros", "thiserror", "tokio", "tracing", @@ -6534,6 +7094,7 @@ version = "0.1.0" dependencies = [ "libc", "tempfile", + "tracing", "winapi 0.3.9", ] @@ -6554,7 +7115,7 @@ name = "staticconfig" version = "0.1.0" dependencies = [ "configmodel", - "phf 0.11.2", + "phf", "staticconfig_macros", ] @@ -6563,13 +7124,13 @@ name = "staticconfig_macros" version = "0.1.0" dependencies = [ "hgrc-parser", - "indexmap 2.1.0", + "indexmap 2.2.6", ] [[package]] name = "stats" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#76d2159747b056901daa362c3404b6d7b781eec5" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#4f55da19d54ca6e235474f95902e308610724559" dependencies = [ "fbinit", "futures 0.3.30", @@ -6583,7 +7144,7 @@ dependencies = [ [[package]] name = "stats_traits" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#76d2159747b056901daa362c3404b6d7b781eec5" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#4f55da19d54ca6e235474f95902e308610724559" dependencies = [ "auto_impl", "dashmap", @@ -6608,8 +7169,10 @@ dependencies = [ "edenapi_types", "factory", "futures 0.3.30", + "metalog", "minibytes", "once_cell", + "parking_lot", "serde", "types", ] @@ -6621,7 +7184,7 @@ dependencies = [ "bit-set", "dirs 2.0.2", "enum_dispatch", - "indexmap 2.1.0", + "indexmap 2.2.6", "lazy_static", "lru", "memmap2", @@ -6663,6 +7226,12 @@ 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 = "structopt" version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6688,40 +7257,40 @@ dependencies = [ [[package]] name = "strum" -version = "0.24.1" +version = "0.26.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f" +checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" [[package]] name = "strum_macros" -version = "0.24.3" +version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" +checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" dependencies = [ - "heck 0.4.1", + "heck 0.5.0", "proc-macro2", "quote", "rustversion", - "syn 1.0.109", + "syn 2.0.72", ] [[package]] name = "subtle" -version = "2.5.0" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "sval" -version = "2.11.0" +version = "2.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1604e9ab506f4805bc62d2868c6d20f23fa6ced4c7cfe695a1d20589ba5c63d0" +checksum = "53eb957fbc79a55306d5d25d87daf3627bc3800681491cda0709eef36c748bfe" [[package]] name = "sval_buffer" -version = "2.11.0" +version = "2.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2831b6451148d344f612016d4277348f7721b78a0869a145fd34ef8b06b3fa2e" +checksum = "96e860aef60e9cbf37888d4953a13445abf523c534640d1f6174d310917c410d" dependencies = [ "sval", "sval_ref", @@ -6729,40 +7298,40 @@ dependencies = [ [[package]] name = "sval_dynamic" -version = "2.11.0" +version = "2.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "238ac5832a23099a413ffd22e66f7e6248b9af4581b64c758ca591074be059fc" +checksum = "ea3f2b07929a1127d204ed7cb3905049381708245727680e9139dac317ed556f" dependencies = [ "sval", ] [[package]] name = "sval_fmt" -version = "2.11.0" +version = "2.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8474862431bac5ac7aee8a12597798e944df33f489c340e17e886767bda0c4e" +checksum = "c4e188677497de274a1367c4bda15bd2296de4070d91729aac8f0a09c1abf64d" dependencies = [ - "itoa 1.0.10", + "itoa", "ryu", "sval", ] [[package]] name = "sval_json" -version = "2.11.0" +version = "2.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8f348030cc3d2a11eb534145600601f080cf16bf9ec0783efecd2883f14c21e" +checksum = "32f456c07dae652744781f2245d5e3b78e6a9ebad70790ac11eb15dbdbce5282" dependencies = [ - "itoa 1.0.10", + "itoa", "ryu", "sval", ] [[package]] name = "sval_nested" -version = "2.11.0" +version = "2.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6659c3f6be1e5e99dc7c518877f48a8a39088ace2504b046db789bd78ce5969d" +checksum = "886feb24709f0476baaebbf9ac10671a50163caa7e439d7a7beb7f6d81d0a6fb" dependencies = [ "sval", "sval_buffer", @@ -6771,18 +7340,18 @@ dependencies = [ [[package]] name = "sval_ref" -version = "2.11.0" +version = "2.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "829ad319bd82d0da77be6f3d547623686c453502f8eebdeb466cfa987972bd28" +checksum = "be2e7fc517d778f44f8cb64140afa36010999565528d48985f55e64d45f369ce" dependencies = [ "sval", ] [[package]] name = "sval_serde" -version = "2.11.0" +version = "2.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a9da6c3efaedf8b8c0861ec5343e8e8c51d838f326478623328bd8728b79bca" +checksum = "79bf66549a997ff35cd2114a27ac4b0c2843280f2cfa84b240d169ecaa0add46" dependencies = [ "serde", "sval", @@ -6802,9 +7371,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.48" +version = "2.0.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" +checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af" dependencies = [ "proc-macro2", "quote", @@ -6812,11 +7381,10 @@ dependencies = [ ] [[package]] -name = "syncify" -version = "0.1.0" -dependencies = [ - "tree-pattern-match", -] +name = "sync_wrapper" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" [[package]] name = "synstructure" @@ -6831,10 +7399,6 @@ dependencies = [ ] [[package]] -name = "system-command" -version = "0.1.0" - -[[package]] name = "system-configuration" version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6867,14 +7431,13 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.9.0" +version = "3.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01ce4141aa927a6d1bd34a041795abd0db1cccba5d5f24b009f694bdf3a1f3fa" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" dependencies = [ "cfg-if 1.0.0", - "fastrand 2.0.1", - "redox_syscall", - "rustix 0.38.30", + "fastrand 2.1.0", + "rustix 0.38.34", "windows-sys 0.52.0", ] @@ -6903,20 +7466,20 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7" dependencies = [ - "rustix 0.38.30", + "rustix 0.38.34", "windows-sys 0.48.0", ] [[package]] name = "terminfo" -version = "0.7.5" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da31aef70da0f6352dbcb462683eb4dd2bfad01cf3fc96cf204547b9a839a585" +checksum = "666cd3a6681775d22b200409aad3b089c5b99fb11ecdd8a204d9d62f8148498f" dependencies = [ "dirs 4.0.0", "fnv", "nom", - "phf 0.11.2", + "phf", "phf_codegen", ] @@ -6952,15 +7515,15 @@ dependencies = [ [[package]] name = "termwiz" -version = "0.18.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25e302bfaa2555ca7fb55eee19051ad43e510153b19cb880d6da5acb65a72ab9" +checksum = "5a75313e21da5d4406ea31402035b3b97aa74c04356bdfafa5d1043ab4e551d1" dependencies = [ "anyhow", - "base64 0.13.1", - "bitflags 1.3.2", + "base64 0.21.7", + "bitflags 2.6.0", "cassowary", - "cfg-if 1.0.0", + "fancy-regex 0.11.0", "filedescriptor 0.8.2", "finl_unicode", "fixedbitset", @@ -6970,18 +7533,18 @@ dependencies = [ "libc", "log", "memmem", - "nix 0.24.3", + "nix 0.26.4", "num-derive", "num-traits", - "ordered-float", + "ordered-float 4.2.1", "pest", "pest_derive", - "phf 0.10.1", - "regex", + "phf", "semver", - "sha2 0.9.9", - "signal-hook 0.1.17", + "sha2", + "signal-hook", "siphasher", + "tempfile", "terminfo", "termios", "thiserror", @@ -6989,8 +7552,10 @@ dependencies = [ "unicode-segmentation", "vtparse", "wezterm-bidi", + "wezterm-blob-leases", "wezterm-color-types", "wezterm-dynamic", + "wezterm-input-types", "winapi 0.3.9", ] @@ -7013,39 +7578,51 @@ dependencies = [ [[package]] name = "textwrap" -version = "0.16.0" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" +checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9" dependencies = [ "terminal_size 0.2.6", "unicode-width", ] [[package]] +name = "thin-cas-client" +version = "0.1.0" +dependencies = [ + "anyhow", + "async-trait", + "cas-client", + "configmodel", + "fbinit", + "types", +] + +[[package]] name = "thiserror" -version = "1.0.56" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.56" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.72", ] [[package]] name = "thread_local" -version = "1.1.7" +version = "1.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" +checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" dependencies = [ "cfg-if 1.0.0", "once_cell", @@ -7053,23 +7630,40 @@ dependencies = [ [[package]] name = "thrift" +version = "0.0.1+unstable" +source = "git+https://github.com/facebook/fbthrift.git?branch=main#f5a5f5ab0de99eeeece67521eb816032c199cc3f" +dependencies = [ + "anyhow", + "codegen_includer_proc_macro", + "fbthrift", + "futures 0.3.30", + "once_cell", + "ref-cast", + "scope", + "serde", + "serde_derive", + "thiserror", + "thrift_compiler", +] + +[[package]] +name = "thrift" version = "0.1.0" dependencies = [ "anyhow", - "async-trait", "codegen_includer_proc_macro", "config_thrift", - "const-cstr", "fb303_core", "fbthrift", "futures 0.3.30", + "once_cell", "ref-cast", + "serde", + "serde_derive", "sorted_vector_map", "thiserror", + "thrift 0.0.1+unstable", "thrift_compiler", - "thrift_types", - "tracing", - "tracing-futures", ] [[package]] @@ -7083,48 +7677,70 @@ dependencies = [ "fbthrift", "futures 0.3.30", "thiserror", - "thrift", + "thrift 0.1.0", + "thrift_clients 0.1.0", ] [[package]] -name = "thrift_compiler" -version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#76d2159747b056901daa362c3404b6d7b781eec5" +name = "thrift_clients" +version = "0.0.1+unstable" +source = "git+https://github.com/facebook/fbthrift.git?branch=main#f5a5f5ab0de99eeeece67521eb816032c199cc3f" dependencies = [ "anyhow", - "clap 4.4.18", - "serde", - "which", + "async-trait", + "codegen_includer_proc_macro", + "fbthrift", + "futures 0.3.30", + "scope", + "scope_clients", + "thrift 0.0.1+unstable", + "thrift_compiler", + "tracing", ] [[package]] -name = "thrift_types" +name = "thrift_clients" version = "0.1.0" dependencies = [ "anyhow", + "async-trait", "codegen_includer_proc_macro", "config_thrift", + "config_thrift_clients", + "const-cstr", "fb303_core", + "fb303_core_clients", "fbthrift", "futures 0.3.30", - "once_cell", - "ref-cast", - "serde", - "serde_derive", - "sorted_vector_map", - "thiserror", + "thrift 0.0.1+unstable", + "thrift 0.1.0", + "thrift_clients 0.0.1+unstable", "thrift_compiler", + "tracing", +] + +[[package]] +name = "thrift_compiler" +version = "0.1.0" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#4f55da19d54ca6e235474f95902e308610724559" +dependencies = [ + "anyhow", + "clap 4.5.11", + "dunce", + "serde", + "which", ] [[package]] name = "time" -version = "0.3.31" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f657ba42c3f86e7680e53c8cd3af8abbe56b5491790b46e22e19c0d57463583e" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ "deranged", - "itoa 1.0.10", + "itoa", "libc", + "num-conv", "num_threads", "powerfmt", "serde", @@ -7144,10 +7760,11 @@ version = "0.1.0" [[package]] name = "time-macros" -version = "0.2.16" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26197e33420244aeb70c3e8c78376ca46571bc4e701e4791c2cd9f57dcb3a43f" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" dependencies = [ + "num-conv", "time-core", ] @@ -7163,9 +7780,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.6.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" dependencies = [ "tinyvec_macros", ] @@ -7178,33 +7795,32 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.35.1" +version = "1.39.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104" +checksum = "d040ac2b29ab03b09d4129c2f5bbd012a3ac2f79d38ff506a4bf8dd34b0eac8a" dependencies = [ "backtrace", "bytes", "libc", "mio", - "num_cpus", "parking_lot", "pin-project-lite", "signal-hook-registry", - "socket2 0.5.5", + "socket2 0.5.7", "tokio-macros", "tracing", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "tokio-macros" -version = "2.2.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" +checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.72", ] [[package]] @@ -7229,14 +7845,14 @@ dependencies = [ [[package]] name = "tokio-stream" -version = "0.1.14" +version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" +checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" dependencies = [ "futures-core", "pin-project-lite", "tokio", - "tokio-util 0.7.10", + "tokio-util 0.7.11", ] [[package]] @@ -7249,7 +7865,7 @@ dependencies = [ "futures-core", "futures-sink", "futures-util", - "pin-project 1.1.3", + "pin-project 1.1.5", "tokio", "tower", "tower-service", @@ -7259,7 +7875,7 @@ dependencies = [ [[package]] name = "tokio-uds-compat" version = "0.1.0" -source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#76d2159747b056901daa362c3404b6d7b781eec5" +source = "git+https://github.com/facebookexperimental/rust-shed.git?branch=main#4f55da19d54ca6e235474f95902e308610724559" dependencies = [ "async-io", "futures 0.3.30", @@ -7286,27 +7902,26 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.10" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" +checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" dependencies = [ "bytes", "futures-core", "futures-io", "futures-sink", "futures-util", - "hashbrown 0.14.3", + "hashbrown 0.14.5", "pin-project-lite", "slab", "tokio", - "tracing", ] [[package]] name = "toml" -version = "0.8.8" +version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35" +checksum = "81967dd0dd2c1ab0bc3468bd7caecc32b8a4aa47d0c8c695d8c2b2108168d62c" dependencies = [ "serde", "serde_spanned", @@ -7316,20 +7931,20 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.5" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +checksum = "f8fb9f64314842840f1d940ac544da178732128f1c78c21772e876579e0da1db" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.21.0" +version = "0.22.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03" +checksum = "8d9f8729f5aea9562aac1cc0441f5d6de3cff1ee0c5d67293eeca5eb36ee7c16" dependencies = [ - "indexmap 2.1.0", + "indexmap 2.2.6", "serde", "serde_spanned", "toml_datetime", @@ -7390,14 +8005,14 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.72", ] [[package]] name = "tracing-collector" version = "0.1.0" dependencies = [ - "indexmap 2.1.0", + "indexmap 2.2.6", "libc", "parking_lot", "serde", @@ -7418,18 +8033,6 @@ dependencies = [ ] [[package]] -name = "tracing-futures" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" -dependencies = [ - "futures 0.3.30", - "futures-task", - "pin-project 1.1.3", - "tracing", -] - -[[package]] name = "tracing-log" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -7507,11 +8110,10 @@ dependencies = [ [[package]] name = "tracing-test" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a2c0ff408fe918a94c428a3f2ad04e4afd5c95bbc08fcf868eff750c15728a4" +checksum = "557b891436fe0d5e0e363427fc7f217abf9ccd510d5136549847bdcbcd011d68" dependencies = [ - "lazy_static", "tracing-core", "tracing-subscriber", "tracing-test-macro", @@ -7519,18 +8121,20 @@ dependencies = [ [[package]] name = "tracing-test-macro" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "258bc1c4f8e2e73a977812ab339d503e6feeb92700f6d07a6de4d321522d5c08" +checksum = "04659ddb06c87d233c566112c1c9c5b9e98256d9af50ec3bc9c8327f873a7568" dependencies = [ - "lazy_static", "quote", - "syn 1.0.109", + "syn 2.0.72", ] [[package]] name = "tree-pattern-match" version = "0.1.0" +dependencies = [ + "bitflags 2.6.0", +] [[package]] name = "treestate" @@ -7538,7 +8142,7 @@ version = "0.1.0" dependencies = [ "anyhow", "atomicfile", - "bitflags 2.4.2", + "bitflags 2.6.0", "byteorder", "fs-err", "fs2", @@ -7549,7 +8153,7 @@ dependencies = [ "rand 0.8.5", "rand_chacha 0.3.1", "repolock", - "sha2 0.10.8", + "sha2", "tempfile", "thiserror", "tracing", @@ -7587,6 +8191,12 @@ dependencies = [ ] [[package]] +name = "typeid" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "059d83cc991e7a42fc37bd50941885db0888e34209f8cfd9aab07ddec03bc9cf" + +[[package]] name = "typenum" version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -7597,8 +8207,13 @@ name = "types" version = "0.1.0" dependencies = [ "anyhow", + "assert_matches", + "base64 0.13.1", + "bitflags 2.6.0", + "blake3", "byteorder", "lazy_static", + "minibytes", "quickcheck", "quickcheck_arbitrary_derive", "rand 0.8.5", @@ -7626,7 +8241,7 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9" dependencies = [ - "memoffset 0.9.0", + "memoffset 0.9.1", "tempfile", "winapi 0.3.9", ] @@ -7665,24 +8280,24 @@ checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" dependencies = [ "tinyvec", ] [[package]] name = "unicode-segmentation" -version = "1.10.1" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" +checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" [[package]] name = "unicode-width" -version = "0.1.11" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" +checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" [[package]] name = "unicode-xid" @@ -7695,7 +8310,7 @@ name = "unionconfig" version = "0.1.0" dependencies = [ "configmodel", - "indexmap 2.1.0", + "indexmap 2.2.6", "staticconfig", ] @@ -7707,9 +8322,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[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 0.5.0", @@ -7718,9 +8333,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 = "util" @@ -7731,12 +8346,12 @@ dependencies = [ "dirs 2.0.2", "fn-error-context", "fs2", - "hostname 0.3.1", "lazystr", "libc", "memmap2", "once_cell", "rand 0.8.5", + "shell-escape", "shellexpand", "tempfile", "thiserror", @@ -7746,12 +8361,12 @@ dependencies = [ [[package]] name = "uuid" -version = "1.7.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a" +checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" dependencies = [ "atomic", - "getrandom 0.2.12", + "getrandom 0.2.15", "serde", "sha1_smol", ] @@ -7764,9 +8379,9 @@ checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" [[package]] name = "value-bag" -version = "1.6.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cdbaf5e132e593e9fc1de6a15bbec912395b11fb9719e061cf64f804524c503" +checksum = "5a84c137d37ab0142f0f2ddfe332651fdbf252e7b7dbb4e67b6c1f1b2e925101" dependencies = [ "value-bag-serde1", "value-bag-sval2", @@ -7774,9 +8389,9 @@ dependencies = [ [[package]] name = "value-bag-serde1" -version = "1.6.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92cad98b1b18d06b6f38b3cd04347a9d7a3a0111441a061f71377fb6740437e4" +checksum = "ccacf50c5cb077a9abb723c5bcb5e0754c1a433f1e1de89edc328e2760b6328b" dependencies = [ "erased-serde", "serde", @@ -7785,9 +8400,9 @@ dependencies = [ [[package]] name = "value-bag-sval2" -version = "1.6.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dc7271d6b3bf58dd2e610a601c0e159f271ffdb7fbb21517c40b52138d64f8e" +checksum = "1785bae486022dfb9703915d42287dcb284c1ee37bd1080eeba78cc04721285b" dependencies = [ "sval", "sval_buffer", @@ -7816,9 +8431,9 @@ version = "0.1.0" [[package]] name = "version_check" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" [[package]] name = "vfs" @@ -7864,15 +8479,15 @@ dependencies = [ [[package]] name = "waker-fn" -version = "1.1.1" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" +checksum = "317211a0dc0ceedd78fb2ca9a44aed3d7b9b26f81870d485c07122b4350673b7" [[package]] name = "walkdir" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" dependencies = [ "same-file", "winapi-util", @@ -7900,10 +8515,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] +name = "wasite" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b" + +[[package]] name = "wasm-bindgen" -version = "0.2.90" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1223296a201415c7fad14792dbefaace9bd52b62d33453ade1c5b5f07555406" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" dependencies = [ "cfg-if 1.0.0", "wasm-bindgen-macro", @@ -7911,24 +8532,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.90" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcdc935b63408d58a32f8cc9738a0bffd8f05cc7c002086c6ef20b7312ad9dcd" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.72", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.40" +version = "0.4.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bde2032aeb86bdfaecc8b261eef3cba735cc426c1f3a3416d1e0791be95fc461" +checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -7938,9 +8559,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.90" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e4c238561b2d428924c49815533a8b9121c664599558a5d9ec51f8a1740a999" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -7948,28 +8569,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.90" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bae1abb6806dc1ad9e560ed242107c0f6c84335f1749dd4e8ddb012ebd5e25a7" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.72", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.90" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d91413b1c31d7539ba5ef2451af3f0b833a005eb27a631cec32bc0635a8602b" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "wasm-streams" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4609d447824375f43e1ffbc051b50ad8f4b3ae8219680c94452ea05eb240ac7" +checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129" dependencies = [ "futures-util", "js-sys", @@ -7980,8 +8601,8 @@ dependencies = [ [[package]] name = "watchman_client" -version = "0.8.0" -source = "git+https://github.com/facebook/watchman.git?branch=main#d52738785ded4c290fb08adcb244e4c34ef1ffdd" +version = "0.9.0" +source = "git+https://github.com/facebook/watchman.git?branch=main#b53ca70cc37496cfd5924eacf2cef8a271ee6ae9" dependencies = [ "anyhow", "bytes", @@ -7997,9 +8618,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.67" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58cd2333b6e0be7a39605f0e255892fd7418a682d8da8fe042fe25128794d2ed" +checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" dependencies = [ "js-sys", "wasm-bindgen", @@ -8007,9 +8628,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.25.3" +version = "0.25.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1778a42e8b3b90bff8d0f5032bf22250792889a5cdc752aa0020c84abe3aaf10" +checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" [[package]] name = "webview-app" @@ -8036,19 +8657,33 @@ dependencies = [ [[package]] name = "wezterm-bidi" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1560382cf39b0fa92473eae4d5b3772f88c63202cbf5a72c35db72ba99e66c36" +checksum = "0c0a6e355560527dd2d1cf7890652f4f09bb3433b6aadade4c9b5ed76de5f3ec" dependencies = [ "log", "wezterm-dynamic", ] [[package]] +name = "wezterm-blob-leases" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e5a5e0adf7eed68976410def849a4bdab6f6e9f6163f152de9cb89deea9e60b" +dependencies = [ + "getrandom 0.2.15", + "mac_address", + "once_cell", + "sha2", + "thiserror", + "uuid", +] + +[[package]] name = "wezterm-color-types" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c6e7a483dd2785ba72705c51e8b1be18300302db2a78368dac9bc8773857777" +checksum = "7de81ef35c9010270d63772bebef2f2d6d1f2d20a983d27505ac850b8c4b4296" dependencies = [ "csscolorparser", "deltae", @@ -8058,12 +8693,12 @@ dependencies = [ [[package]] name = "wezterm-dynamic" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75e78c0cc60a76de5d93f9dad05651105351e151b6446ab305514945d7588aa" +checksum = "dfb128bacfa86734e07681fb6068e34c144698e84ee022d6e009145d1abb77b5" dependencies = [ "log", - "ordered-float", + "ordered-float 4.2.1", "strsim 0.10.0", "thiserror", "wezterm-dynamic-derive", @@ -8081,6 +8716,18 @@ dependencies = [ ] [[package]] +name = "wezterm-input-types" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7012add459f951456ec9d6c7e6fc340b1ce15d6fc9629f8c42853412c029e57e" +dependencies = [ + "bitflags 1.3.2", + "euclid", + "lazy_static", + "wezterm-dynamic", +] + +[[package]] name = "which" version = "4.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -8089,14 +8736,25 @@ dependencies = [ "either", "home", "once_cell", - "rustix 0.38.30", + "rustix 0.38.34", +] + +[[package]] +name = "whoami" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a44ab49fad634e88f55bf8f9bb3abd2f27d7204172a112c7c9987e01c1c94ea9" +dependencies = [ + "redox_syscall 0.4.1", + "wasite", + "web-sys", ] [[package]] name = "widestring" -version = "1.0.2" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8" +checksum = "7219d36b6eac893fa81e84ebe06485e7dcbb616177469b142df14f1f4deb1311" [[package]] name = "winapi" @@ -8128,11 +8786,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.6" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" dependencies = [ - "winapi 0.3.9", + "windows-sys 0.52.0", ] [[package]] @@ -8147,7 +8805,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.0", + "windows-targets 0.52.6", ] [[package]] @@ -8165,7 +8823,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.0", + "windows-targets 0.52.6", ] [[package]] @@ -8185,17 +8843,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "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", + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", ] [[package]] @@ -8206,9 +8865,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" @@ -8218,9 +8877,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" @@ -8230,9 +8889,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.0" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" @@ -8242,9 +8907,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" @@ -8254,9 +8919,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" @@ -8266,9 +8931,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" @@ -8278,15 +8943,15 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" -version = "0.5.34" +version = "0.6.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7cf47b659b318dccbd69cc4797a39ae128f533dce7902a1096044d1967b9c16" +checksum = "b480ae9340fc261e6be3e95a1ba86d54ae3f9171132a73ce8d4bbaf68339507c" dependencies = [ "memchr", ] @@ -8308,19 +8973,24 @@ dependencies = [ "anyhow", "async-runtime", "async-trait", - "bitflags 2.4.2", + "bitflags 2.6.0", "configloader", "configmodel", + "context", "crossbeam", "edenfs-client", "fs-err", + "gitcompat", "hgtime", "identity", + "journal", "manifest", "manifest-tree", + "once_cell", "parking_lot", "pathmatcher", "progress-model", + "regex", "repolock", "repostate", "serde", @@ -8338,6 +9008,7 @@ dependencies = [ "util", "vfs", "watchman_client", + "whoami", ] [[package]] @@ -8356,15 +9027,6 @@ dependencies = [ ] [[package]] -name = "yaml-rust" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" -dependencies = [ - "linked-hash-map", -] - -[[package]] name = "yansi" version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -8372,47 +9034,47 @@ checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" [[package]] name = "zerocopy" -version = "0.7.32" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.32" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.72", ] [[package]] name = "zstd" -version = "0.13.0" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bffb3309596d527cfcba7dfc6ed6052f1d39dfbd7c867aa2e865e4a449c10110" +checksum = "fcf2b778a664581e31e389454a7072dab1647606d44f7feea22cd5abb9c9f3f9" dependencies = [ "zstd-safe", ] [[package]] name = "zstd-safe" -version = "7.0.0" +version = "7.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43747c7422e2924c11144d5229878b98180ef8b06cca4ab5af37afc8a8d8ea3e" +checksum = "fa556e971e7b568dc775c136fc9de8c779b1c2fc3a63defaafadffdbd3181afa" dependencies = [ "zstd-sys", ] [[package]] name = "zstd-sys" -version = "2.0.9+zstd.1.5.5" +version = "2.0.12+zstd.1.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e16efa8a874a0481a574084d34cc26fdb3b99627480f785888deb6386506656" +checksum = "0a4e40c320c3cb459d9a9ff6de98cff88f4751ee9275d140e2be94a2b74e4c13" dependencies = [ "cc", "pkg-config", diff --git a/pkgs/applications/version-management/sapling/default.nix b/pkgs/applications/version-management/sapling/default.nix index f06f72f6e9e02..e19fbeb4977f8 100644 --- a/pkgs/applications/version-management/sapling/default.nix +++ b/pkgs/applications/version-management/sapling/default.nix @@ -1,9 +1,8 @@ { lib , stdenv -, python3Packages +, python311Packages , fetchFromGitHub , fetchurl -, sd , cargo , curl , pkg-config @@ -41,14 +40,14 @@ let # # See https://github.com/NixOS/nixpkgs/pull/198311#issuecomment-1326894295 myCargoSetupHook = rustPlatform.cargoSetupHook.overrideAttrs (old: { - cargoConfig = lib.optionalString (!stdenv.isDarwin) old.cargoConfig; + cargoConfig = lib.optionalString (!stdenv.hostPlatform.isDarwin) old.cargoConfig; }); src = fetchFromGitHub { owner = "facebook"; repo = "sapling"; rev = version; - hash = "sha256-uzev4x9jY6foop35z4dvUMIfjRtRqhNFDVFpagOosAc"; + hash = "sha256-4pOpJ91esTSH90MvvMu74CnlLULLUawqxcniUeqnLwA="; }; addonsSrc = "${src}/addons"; @@ -56,7 +55,7 @@ let # Fetches the Yarn modules in Nix to to be used as an offline cache yarnOfflineCache = fetchYarnDeps { yarnLock = "${addonsSrc}/yarn.lock"; - sha256 = "sha256-3JFrVk78EiNVLLXkCFbuRnXwYHNfVv1pBPBS1yCHtPU"; + sha256 = "sha256-jCtrflwDrwql6rY1ff1eXLKdwmnXhg5bCJPlCczBCIk="; }; # Builds the NodeJS server that runs with `sl web` @@ -79,12 +78,12 @@ let yarn config --offline set yarn-offline-mirror ${yarnOfflineCache} yarn install --offline --frozen-lockfile --ignore-engines --ignore-scripts --no-progress patchShebangs node_modules + patchShebangs isl/node_modules - # TODO: build-tar.py tries to run 'yarn install'. We patched - # shebangs node_modules, so we don't want 'yarn install' - # changing files. We should disable the 'yarn install' in - # build-tar.py to be safe. - ${python3Packages.python}/bin/python3 build-tar.py \ + substituteInPlace build-tar.py \ + --replace-fail 'run(yarn + ["--cwd", src_join(), "install", "--prefer-offline"])' 'pass' + + ${python311Packages.python}/bin/python3 build-tar.py \ --output isl-dist.tar.xz \ --yarn 'yarn --offline --frozen-lockfile --ignore-engines --ignore-scripts --no-progress' @@ -102,7 +101,7 @@ let }; in # Builds the main `sl` binary and its Python extensions -python3Packages.buildPythonApplication { +python311Packages.buildPythonApplication { pname = "sapling"; inherit src version; @@ -113,10 +112,10 @@ python3Packages.buildPythonApplication { lockFile = ./Cargo.lock; outputHashes = { "abomonation-0.7.3+smallvec1" = "sha256-AxEXR6GC8gHjycIPOfoViP7KceM29p2ZISIt4iwJzvM="; - "cloned-0.1.0" = "sha256-mzAqjM8qovZAd4ZF0GDuD0Ns/UztAO1pAJhukuKc5a0="; - "fb303_core-0.0.0" = "sha256-x8I0Lty+sRclpkNMqTMc29J46z/vMsVwOUS3EX7Shes="; - "fbthrift-0.0.1+unstable" = "sha256-yTS1wkh8tETZ4K43V0G+TbkN5jgSlXT0endDPBHa1Ps="; - "serde_bser-0.3.1" = "sha256-vvMCa6mlcr+xazxZVl2bcF8/r+ufzZmiQ79KofZGWrA="; + "cloned-0.1.0" = "sha256-2BaNR/pQmR7pHtRf6VBQLcZgLHbj2JCxeX4auAB0efU="; + "fb303_core-0.0.0" = "sha256-PDGdKjR6KPv1uH1JSTeoG5Rs0ZkmNJLqqSXtvV3RWic="; + "fbthrift-0.0.1+unstable" = "sha256-J4REXGuLjHyN3SHilSWhMoqpRcn1QnEtsTsZF4Z3feU="; + "serde_bser-0.4.0" = "sha256-Su1IP3NzQu/87p/+uQaG8JcICL9hit3OV1O9oFiACsQ="; }; }; postPatch = '' @@ -142,7 +141,7 @@ python3Packages.buildPythonApplication { install ${isl}/isl-dist.tar.xz $out/lib/isl-dist.tar.xz ''; - postFixup = lib.optionalString stdenv.isLinux '' + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' wrapProgram $out/bin/sl \ --set LOCALE_ARCHIVE "${glibcLocales}/lib/locale/locale-archive" ''; @@ -157,7 +156,7 @@ python3Packages.buildPythonApplication { buildInputs = [ openssl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ curl libiconv Cocoa diff --git a/pkgs/applications/version-management/sapling/deps.json b/pkgs/applications/version-management/sapling/deps.json index adad0c94afbef..ed3c327ecfbd9 100644 --- a/pkgs/applications/version-management/sapling/deps.json +++ b/pkgs/applications/version-management/sapling/deps.json @@ -1,5 +1,5 @@ { "links": [], - "version": "0.2.20240116-133042+8acecb66", - "versionHash": "11094621090461381576" + "version": "0.2.20240718-145624+f4e9df48", + "versionHash": "7014953821350190751" } diff --git a/pkgs/applications/version-management/scriv/default.nix b/pkgs/applications/version-management/scriv/default.nix deleted file mode 100644 index 40038fa796dda..0000000000000 --- a/pkgs/applications/version-management/scriv/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ lib -, python3 -, fetchPypi -, pandoc -, git -, scriv -, testers -}: - -python3.pkgs.buildPythonApplication rec { - pname = "scriv"; - version = "1.5.1"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-MK6f+NFE+ODPOUxOHTeVQvGzgjdnZClVtU7EDcALMrY="; - }; - - propagatedBuildInputs = with python3.pkgs; [ - attrs - click - click-log - jinja2 - markdown-it-py - requests - ] ++ lib.optionals (python3.pythonOlder "3.11") [ - tomli - ]; - - nativeCheckInputs = with python3.pkgs; [ - pytestCheckHook - coverage - freezegun - pudb - pytest-mock - responses - pyyaml - - pandoc - git - ]; - disabledTests = [ - # assumes we have checked out the full repo (including remotes) - "test_real_get_github_repos" - ]; - - passthru.tests = { - version = testers.testVersion { package = scriv; }; - }; - - meta = { - description = "Command-line tool for helping developers maintain useful changelogs"; - homepage = "https://github.com/nedbat/scriv"; - changelog = "https://github.com/nedbat/scriv/releases/tag/${version}"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ amesgen ]; - mainProgram = "scriv"; - }; -} diff --git a/pkgs/applications/version-management/silver-platter/default.nix b/pkgs/applications/version-management/silver-platter/default.nix index f1653cf103890..368cf8dcf218b 100644 --- a/pkgs/applications/version-management/silver-platter/default.nix +++ b/pkgs/applications/version-management/silver-platter/default.nix @@ -37,9 +37,9 @@ buildPythonApplication rec { propagatedBuildInputs = [ setuptools breezy dulwich jinja2 pyyaml ruamel-yaml ]; nativeBuildInputs = [ setuptools-rust rustPlatform.cargoSetupHook cargo rustc ] - ++ lib.optionals stdenv.isLinux [ pkg-config ]; - buildInputs = lib.optionals stdenv.isLinux [ openssl ] - ++ lib.optionals stdenv.isDarwin [ libiconv ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ openssl ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; pythonImportsCheck = [ "silver_platter" ]; diff --git a/pkgs/applications/version-management/sourcehut/default.nix b/pkgs/applications/version-management/sourcehut/default.nix index c941cc7570daf..147257dc3d5d0 100644 --- a/pkgs/applications/version-management/sourcehut/default.nix +++ b/pkgs/applications/version-management/sourcehut/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , python3 , callPackage , recurseIntoAttrs @@ -14,6 +13,7 @@ # https://github.com/NixOS/nixpkgs/pull/54425#discussion_r250688781 let python = python3.override { + self = python; packageOverrides = self: super: { srht = self.callPackage ./core.nix { }; diff --git a/pkgs/applications/version-management/srvc/default.nix b/pkgs/applications/version-management/srvc/default.nix deleted file mode 100644 index c2dc0d8bd2be5..0000000000000 --- a/pkgs/applications/version-management/srvc/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, rustPlatform, fetchFromGitHub, stdenv, darwin, git }: - -rustPlatform.buildRustPackage rec { - pname = "srvc"; - version = "0.20.0"; - - src = fetchFromGitHub { - owner = "insilica"; - repo = "rs-srvc"; - rev = "v${version}"; - hash = "sha256-pnlbMU/uoP9ZK8kzTRYTMY9+X9VIKJHwW2qMXXD8Udg="; - }; - - cargoHash = "sha256-+m8WJMn1aq3FBDO5c/ZwbcK2G+UE5pSwHTgOl2s6pDw="; - - buildInputs = lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.CoreServices - darwin.apple_sdk.frameworks.Security - ]; - - nativeCheckInputs = [ git ]; - - # remove timeouts in tests to make them less flaky - TEST_SRVC_DISABLE_TIMEOUT = 1; - - meta = with lib; { - description = "Sysrev version control"; - homepage = "https://github.com/insilica/rs-srvc"; - changelog = "https://github.com/insilica/rs-srvc/blob/v${version}/CHANGELOG.md"; - license = licenses.asl20; - maintainers = with maintainers; [ john-shaffer ]; - mainProgram = "sr"; - }; -} diff --git a/pkgs/applications/version-management/stgit/default.nix b/pkgs/applications/version-management/stgit/default.nix index aba560a81d815..4d44724eddec8 100644 --- a/pkgs/applications/version-management/stgit/default.nix +++ b/pkgs/applications/version-management/stgit/default.nix @@ -18,15 +18,15 @@ rustPlatform.buildRustPackage rec { pname = "stgit"; - version = "2.4.7"; + version = "2.4.12"; src = fetchFromGitHub { owner = "stacked-git"; repo = "stgit"; rev = "v${version}"; - hash = "sha256-TfCmVN7oHOgMyreJo58r6qaQYAXqmekpZt2WyTMGLvQ="; + hash = "sha256-fNQLdW5KFpYUBBmaUYYOmDym7OweXsDfD+uFl688zcY="; }; - cargoHash = "sha256-kH7YrjoNkpoUdzcWtVqpWtmw+FIMrJYbo0ye30/VeVk="; + cargoHash = "sha256-s3PFNc1rn01X6tauRXp5B4cg3AIVSishqDFy0lP/8g8="; nativeBuildInputs = [ pkg-config installShellFiles makeWrapper asciidoc xmlto docbook_xsl @@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec { nativeCheckInputs = [ git perl - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.system_cmds libiconv ]; diff --git a/pkgs/applications/version-management/sublime-merge/common.nix b/pkgs/applications/version-management/sublime-merge/common.nix index df5e36228290f..84f41e6e26c60 100644 --- a/pkgs/applications/version-management/sublime-merge/common.nix +++ b/pkgs/applications/version-management/sublime-merge/common.nix @@ -60,8 +60,7 @@ let "/usr/bin/pkexec=${pkexecPath}" "/bin/true=${coreutils}/bin/true" ]; -in -let + binaryPackage = stdenv.mkDerivation rec { pname = "${pnameBase}-bin"; version = buildVersion; @@ -86,7 +85,7 @@ let for binary in ${builtins.concatStringsSep " " binaries}; do patchelf \ --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${lib.makeLibraryPath neededLibraries}:${libGL}/lib:${stdenv.cc.cc.lib}/lib${lib.optionalString stdenv.is64bit "64"} \ + --set-rpath ${lib.makeLibraryPath neededLibraries}:${libGL}/lib:${stdenv.cc.cc.lib}/lib${lib.optionalString stdenv.hostPlatform.is64bit "64"} \ $binary done @@ -116,7 +115,7 @@ let # We need to replace the ssh-askpass-sublime executable because the default one # will not function properly, in order to work it needs to pass an argv[0] to - # the sublime_merge binary, and the built-in version will will try to call the + # the sublime_merge binary, and the built-in version will try to call the # sublime_merge wrapper script which cannot pass through the original argv[0] to # the sublime_merge binary. Thankfully the ssh-askpass-sublime functionality is # very simple and can be replaced with a simple wrapper script. diff --git a/pkgs/applications/version-management/sublime-merge/default.nix b/pkgs/applications/version-management/sublime-merge/default.nix index 490a0c4644043..d272645ee5062 100644 --- a/pkgs/applications/version-management/sublime-merge/default.nix +++ b/pkgs/applications/version-management/sublime-merge/default.nix @@ -11,9 +11,9 @@ in } { }; sublime-merge-dev = common { - buildVersion = "2095"; + buildVersion = "2100"; dev = true; - aarch64sha256 = "FmXz8VAWS7e0bB9NeXbihnhdhWMyNJJs6PNt+K2G0Bk="; - x64sha256 = "83Hw27RgGPgugpf4eMuWT6/MSQ2Q2VBCbaXoSGFtTPI="; + aarch64sha256 = "BL0hk/8hf660I1HUQMQwvZxB6TpXpygQxOYtuDGfrYw="; + x64sha256 = "NePJt2WttsbqJsduGX6UsOzAce2xW4Mc8Nq9We+ZCSM="; } { }; } diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index d2301db3df2e2..11d9c7fefdffe 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -49,6 +49,14 @@ let # "-P" CPPFLAG is needed to build Python bindings and subversionClient CPPFLAGS = [ "-P" ]; + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = lib.concatStringsSep " " [ + "-Wno-error=implicit-function-declaration" + "-Wno-error=implicit-int" + "-Wno-int-conversion" + ]; + }; + preConfigure = lib.optionalString needsAutogen '' ./autogen.sh ''; @@ -115,11 +123,11 @@ let license = licenses.asl20; homepage = "https://subversion.apache.org/"; mainProgram = "svn"; - maintainers = with maintainers; [ eelco lovek323 ]; + maintainers = with maintainers; [ lovek323 ]; platforms = platforms.linux ++ platforms.darwin; }; - } // lib.optionalAttrs stdenv.isDarwin { + } // lib.optionalAttrs stdenv.hostPlatform.isDarwin { CXX = "clang++"; CC = "clang"; CPP = "clang -E"; diff --git a/pkgs/applications/version-management/tig/default.nix b/pkgs/applications/version-management/tig/default.nix index b4a8533d468ee..6c90d24e55bf6 100644 --- a/pkgs/applications/version-management/tig/default.nix +++ b/pkgs/applications/version-management/tig/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { autoreconfFlags = [ "-I" "tools" "-v" ]; buildInputs = [ ncurses readline git ] - ++ lib.optionals stdenv.isDarwin [ libiconv ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; # those files are inherently impure, we'll handle the corresponding dependencies. postPatch = '' diff --git a/pkgs/applications/version-management/transcrypt/default.nix b/pkgs/applications/version-management/transcrypt/default.nix index 5000037b0c8af..26e88f6242996 100644 --- a/pkgs/applications/version-management/transcrypt/default.nix +++ b/pkgs/applications/version-management/transcrypt/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "transcrypt"; - version = "2.2.3"; + version = "2.3.0"; src = fetchFromGitHub { owner = "elasticdog"; repo = "transcrypt"; rev = "v${version}"; - sha256 = "+B8CYHDneDd0GwiTwQK6YVScDMKao2JXFpGk9PY6/EE="; + sha256 = "sha256-hevKqs0JKsRI2qTRzWAAuMotiBX6dGF0ZmypBco2l6g="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/version-management/ungit/default.nix b/pkgs/applications/version-management/ungit/default.nix index 5d5c8336987b8..4eaf08d791ad5 100644 --- a/pkgs/applications/version-management/ungit/default.nix +++ b/pkgs/applications/version-management/ungit/default.nix @@ -5,16 +5,16 @@ buildNpmPackage rec { pname = "ungit"; - version = "1.5.26"; + version = "1.5.27"; src = fetchFromGitHub { owner = "FredrikNoren"; repo = "ungit"; rev = "v${version}"; - hash = "sha256-HTo0z/y7thUrDm6ofHiUtv1UDuqGN+kpMFLuIvxyxZQ="; + hash = "sha256-UYY8AJWeGAcb83bmr7KX8ocxz8oQqUaXEXwwoVlwvoc="; }; - npmDepsHash = "sha256-f/CtNYoy5ZOgdVTG2ZdBpXOSNUKSG5wCy0eIl4ov80U="; + npmDepsHash = "sha256-AE0V+IoO9Yz80y81ayR08us4gyjjvshRVYPq6thpMr8="; env = { ELECTRON_SKIP_BINARY_DOWNLOAD = true; @@ -27,6 +27,6 @@ buildNpmPackage rec { homepage = "https://github.com/FredrikNoren/ungit"; license = lib.licenses.mit; mainProgram = "ungit"; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/version-management/vcprompt/default.nix b/pkgs/applications/version-management/vcprompt/default.nix index ff4968d7166de..d2ef35c9b6688 100644 --- a/pkgs/applications/version-management/vcprompt/default.nix +++ b/pkgs/applications/version-management/vcprompt/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { about the current working directory for various version control systems ''; homepage = "http://hg.gerg.ca/vcprompt"; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = with platforms; linux ++ darwin; license = licenses.gpl2Plus; mainProgram = "vcprompt"; diff --git a/pkgs/applications/version-management/verco/default.nix b/pkgs/applications/version-management/verco/default.nix index ca41cdc00b7e4..079b10d2f5dd8 100644 --- a/pkgs/applications/version-management/verco/default.nix +++ b/pkgs/applications/version-management/verco/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-M3Utrt350I67kqzEH130tgBIiI7rY8ODCSxgMohWWWM="; }; - cargoSha256 = "sha256-urnTPlQTmOPq7mHZjsTqxql/FQe7NYHE8sVJJ4fno+U="; + cargoHash = "sha256-urnTPlQTmOPq7mHZjsTqxql/FQe7NYHE8sVJJ4fno+U="; meta = with lib; { description = "Simple Git/Mercurial/PlasticSCM tui client based on keyboard shortcuts"; diff --git a/pkgs/applications/version-management/yadm/default.nix b/pkgs/applications/version-management/yadm/default.nix index 0dab32e57accf..2d6c0c9089afe 100644 --- a/pkgs/applications/version-management/yadm/default.nix +++ b/pkgs/applications/version-management/yadm/default.nix @@ -75,7 +75,7 @@ resholve.mkDerivation rec { gnutar ]; fake = { - external = if stdenv.isCygwin then [ ] else [ "cygpath" ]; + external = if stdenv.hostPlatform.isCygwin then [ ] else [ "cygpath" ]; }; fix = { "$GPG_PROGRAM" = [ "gpg" ]; diff --git a/pkgs/applications/video/alass/default.nix b/pkgs/applications/video/alass/default.nix index d6b6da1fd6b5b..bbbbe91beb64a 100644 --- a/pkgs/applications/video/alass/default.nix +++ b/pkgs/applications/video/alass/default.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-q1IV9TtmznpR7RO75iN0p16nmTja5ADWqFj58EOPWvU="; }; - cargoSha256 = "sha256-6swIoVp1B4CMvaGvq868LTKkzpI6zFKJNgUVqjdyH20="; + cargoHash = "sha256-6swIoVp1B4CMvaGvq868LTKkzpI6zFKJNgUVqjdyH20="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/video/ani-cli/default.nix b/pkgs/applications/video/ani-cli/default.nix index d906b0d2b865f..b5d9fb11f5e07 100644 --- a/pkgs/applications/video/ani-cli/default.nix +++ b/pkgs/applications/video/ani-cli/default.nix @@ -21,13 +21,13 @@ assert withMpv || withVlc || withIina; stdenvNoCC.mkDerivation rec { pname = "ani-cli"; - version = "4.8"; + version = "4.9"; src = fetchFromGitHub { owner = "pystardust"; repo = "ani-cli"; rev = "v${version}"; - hash = "sha256-vntCiWaONndjU622c1BoCoASQxQf/i7yO0x+70OxzPU="; + hash = "sha256-7zuepWTtrFp9RW3zTSjPzyJ9e+09PdKgwcnV+DqPEUY="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/video/anilibria-winmaclinux/default.nix b/pkgs/applications/video/anilibria-winmaclinux/default.nix index b9679d1fd49f6..8bb21ac9d43b2 100644 --- a/pkgs/applications/video/anilibria-winmaclinux/default.nix +++ b/pkgs/applications/video/anilibria-winmaclinux/default.nix @@ -18,13 +18,13 @@ mkDerivation rec { pname = "anilibria-winmaclinux"; - version = "1.2.17"; + version = "2.2.19"; src = fetchFromGitHub { owner = "anilibria"; repo = "anilibria-winmaclinux"; rev = version; - hash = "sha256-Ij4F5UCt1YOB4MLTlUTAiTt2zN4TkJuf5v6sWb9pJ6k="; + hash = "sha256-f4AlTfLTn0GvBj3ztpkNPc6BDlLsEtz/yE5F2WfjU8U="; }; sourceRoot = "${src.name}/src"; diff --git a/pkgs/applications/video/animdl/default.nix b/pkgs/applications/video/animdl/default.nix index c8ba0264e36aa..ebe13e8b12e26 100644 --- a/pkgs/applications/video/animdl/default.nix +++ b/pkgs/applications/video/animdl/default.nix @@ -2,7 +2,6 @@ buildPythonApplication, fetchFromGitHub, poetry-core, - pythonRelaxDepsHook, anchor-kr, anitopy, click, @@ -47,7 +46,6 @@ buildPythonApplication { nativeBuildInputs = [ poetry-core - pythonRelaxDepsHook ]; propagatedBuildInputs = [ anchor-kr diff --git a/pkgs/applications/video/anime-downloader/default.nix b/pkgs/applications/video/anime-downloader/default.nix index 99323ef960516..bf8fa063bd92d 100644 --- a/pkgs/applications/video/anime-downloader/default.nix +++ b/pkgs/applications/video/anime-downloader/default.nix @@ -49,7 +49,7 @@ python3.pkgs.buildPythonApplication rec { description = "Simple but powerful anime downloader and streamer"; license = licenses.unlicense; platforms = platforms.linux; - maintainers = with maintainers; [ ]; + maintainers = [ ]; mainProgram = "anime"; }; } diff --git a/pkgs/applications/video/bino3d/default.nix b/pkgs/applications/video/bino3d/default.nix index 92096c6a34746..e0ebccac96b82 100644 --- a/pkgs/applications/video/bino3d/default.nix +++ b/pkgs/applications/video/bino3d/default.nix @@ -1,26 +1,49 @@ -{ mkDerivation, lib, fetchurl, pkg-config, ffmpeg_4, glew, libass, openal, qtbase }: +{ + lib, + stdenv, + fetchgit, + cmake, + ninja, + pkg-config, + pandoc, + wrapQtAppsHook, + qtbase, + qtmultimedia, + qttools, +}: -mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "bino"; - version = "1.6.8"; + version = "2.2"; - src = fetchurl { - url = "https://bino3d.org/releases/${pname}-${version}.tar.xz"; - sha256 = "sha256-8sIdX+qm7CGPHIziFBHHIe+KEbhbwDY6w/iRm1V+so4="; + src = fetchgit { + url = "https://git.marlam.de/git/bino.git"; + rev = "bino-${finalAttrs.version}"; + hash = "sha256-t7bkpYOswGEjUg+k2gjUkWwZJjj44KIVrEQs5P4DoSI="; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ + cmake + ninja + pkg-config + pandoc + wrapQtAppsHook + ]; - buildInputs = [ ffmpeg_4 glew libass openal qtbase ]; + buildInputs = [ + qtbase + qtmultimedia + qttools + # The optional QVR dependency is not currently packaged. + ]; - enableParallelBuilding = true; - - meta = with lib; { - description = "Stereoscopic 3D and multi-display video player"; + meta = { + description = "Video player with a focus on 3D and Virtual Reality"; homepage = "https://bino3d.org/"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ orivej ]; - platforms = platforms.linux; + sourceProvenance = [ lib.sourceTypes.fromSource ]; + license = lib.licenses.gpl3Plus; + maintainers = [ lib.maintainers.orivej ]; + platforms = lib.platforms.unix; mainProgram = "bino"; }; -} +}) diff --git a/pkgs/applications/video/bombono/default.nix b/pkgs/applications/video/bombono/default.nix index 73471a7564d2c..ebbdf9dbeb087 100644 --- a/pkgs/applications/video/bombono/default.nix +++ b/pkgs/applications/video/bombono/default.nix @@ -2,13 +2,14 @@ , fetchFromGitHub , pkg-config , fetchpatch +, fetchpatch2 , scons , boost , dvdauthor , dvdplusrwtools , enca , cdrkit -, ffmpeg_4 +, ffmpeg_6 , gettext , gtk2 , gtkmm2 @@ -18,22 +19,15 @@ , wrapGAppsHook3 }: -let - fetchPatchFromAur = {name, sha256}: - fetchpatch { - inherit name sha256; - url = "https://aur.archlinux.org/cgit/aur.git/plain/${name}?h=766dd4ba1715fc921fe26ce1bdcf22c30f4fc073"; - }; -in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "bombono"; - version = "1.2.4"; + version = "1.2.4-unstable-2022-02-06"; src = fetchFromGitHub { owner = "bombono-dvd"; repo = "bombono-dvd"; - rev = version; - sha256 = "sha256-aRW8H8+ca/61jGLxUs7u3R7yEiulwr5viMEuZWbc4dM="; + rev = "8680f5803314e4bcfbdae44f555c47ad345dae72"; + hash = "sha256-8AxXIvShH4HwlPZWAszku33rts13HiNoRsHiLYdZAHA="; }; patches = [ @@ -42,17 +36,14 @@ stdenv.mkDerivation rec { url = "https://svnweb.mageia.org/packages/cauldron/bombono-dvd/current/SOURCES/bombono-dvd-1.2.4-scons-python3.patch?revision=1447925&view=co&pathrev=1484457"; sha256 = "sha256-5OKBWrRZvHem2MTdAObfdw76ig3Z4ZdDFtq4CJoJISA="; }) - ] ++ (map fetchPatchFromAur [ - {name="fix_ffmpeg_codecid.patch"; sha256="sha256-58L+1BJy5HK/R+xALbq2z4+Se4i6yp21lo/MjylgTqs=";} - {name="fix_ptr2bool_cast.patch"; sha256="sha256-DyqMw/m2Op9+gBq1CTCjSZ1qM9igV5Y6gTOi8VbNH0c=";} - {name="fix_c++11_literal_warnings.patch"; sha256="sha256-iZ/CN5+xg7jPXl5r/KGCys+jyPu0/AsSABLcc6IIbv0=";} - {name="autoptr2uniqueptr.patch"; sha256="sha256-teGp6uICB4jAJk18pdbBMcDxC/JJJGkdihtXeh3ffCg=";} - {name="fix_deprecated_boost_api.patch"; sha256="sha256-qD5QuO/ndEU1N7vueQiNpPVz8OaX6Y6ahjCWxMdvj6A=";} - {name="fix_throw_specifications.patch"; sha256="sha256-NjCDGwXRCSLcuW2HbPOpXRgNvNQHy7i7hoOgyvGIr7g=";} - {name="fix_operator_ambiguity.patch"; sha256="sha256-xx7WyrxEdDrDuz5YoFrM/u2qJru9u6X/4+Y5rJdmmmQ=";} - {name="fix_ffmpeg30.patch"; sha256="sha256-vKEbvbjYVRzEaVYC8XOJBPmk6FDXI/WA0X/dldRRO8c=";} - {name="inc_boost_header.patch"; sha256="sha256-76vjkf62VsNJ5FmBEs+X7ZBqjvJ372mjSIreBxNQym8=";} - ]); + + # Fix compilation errors having ffmpeg 2:5.1 + # https://github.com/bombono-dvd/bombono-dvd/pull/28 + (fetchpatch2 { + url = "https://github.com/bombono-dvd/bombono-dvd/commit/9f2cde1ddc22705bf58264739685086755b2138b.patch?full_index=1"; + hash = "sha256-ks6c04HEYF4nPfSOjzG+dUt9v7ZmNBb0XH6byPYqX5I="; + }) + ]; postPatch = '' substituteInPlace src/mbase/SConscript \ @@ -66,7 +57,7 @@ stdenv.mkDerivation rec { dvdauthor dvdplusrwtools enca - ffmpeg_4 + ffmpeg_6 gtk2 gtkmm2 libdvdread @@ -82,7 +73,7 @@ stdenv.mkDerivation rec { # fix iso authoring install -Dt $out/share/bombono/resources/scons_authoring tools/scripts/SConsTwin.py - wrapProgram $out/bin/bombono-dvd --prefix PATH : ${lib.makeBinPath [ ffmpeg_4 dvdauthor cdrkit ]} + wrapProgram $out/bin/bombono-dvd --prefix PATH : ${lib.makeBinPath [ ffmpeg_6 dvdauthor cdrkit ]} ''; meta = with lib; { 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/catt/default.nix b/pkgs/applications/video/catt/default.nix index 608236d688300..f6bdde3577be6 100644 --- a/pkgs/applications/video/catt/default.nix +++ b/pkgs/applications/video/catt/default.nix @@ -6,6 +6,7 @@ let python = python3.override { + self = python; packageOverrides = self: super: { pychromecast = super.pychromecast.overridePythonAttrs (_: rec { version = "13.1.0"; @@ -63,7 +64,7 @@ python.pkgs.buildPythonApplication rec { description = "Tool to send media from online sources to Chromecast devices"; homepage = "https://github.com/skorokithakis/catt"; license = licenses.bsd2; - maintainers = with maintainers; [ dtzWill ]; + maintainers = [ ]; mainProgram = "catt"; }; } diff --git a/pkgs/applications/video/ccextractor/default.nix b/pkgs/applications/video/ccextractor/default.nix deleted file mode 100644 index 399287c93f7ff..0000000000000 --- a/pkgs/applications/video/ccextractor/default.nix +++ /dev/null @@ -1,71 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, pkg-config -, cmake -, libiconv -, zlib -, enableOcr ? true -, makeWrapper -, tesseract4 -, leptonica -, ffmpeg_4 -}: - -stdenv.mkDerivation rec { - pname = "ccextractor"; - version = "0.93"; - - src = fetchFromGitHub { - owner = "CCExtractor"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-usVAKBkdd8uz9cD5eLd0hnwGonOJLscRdc+iWDlNXVc="; - }; - - postPatch = '' - # https://github.com/CCExtractor/ccextractor/issues/1467 - sed -i '/allheaders.h/a#include <leptonica/pix_internal.h>' src/lib_ccx/ocr.c - '' + lib.optionalString stdenv.isDarwin '' - substituteInPlace src/CMakeLists.txt \ - --replace 'add_definitions(-DGPAC_CONFIG_LINUX)' 'add_definitions(-DGPAC_CONFIG_DARWIN)' - ''; - - cmakeDir = "../src"; - - nativeBuildInputs = [ pkg-config cmake makeWrapper ]; - - buildInputs = [ zlib ] - ++ lib.optional (!stdenv.isLinux) libiconv - ++ lib.optionals enableOcr [ leptonica tesseract4 ffmpeg_4 ]; - - cmakeFlags = [ - # file RPATH_CHANGE could not write new RPATH: - "-DCMAKE_SKIP_BUILD_RPATH=ON" - ] ++ lib.optionals enableOcr [ "-DWITH_OCR=on" "-DWITH_HARDSUBX=on" ]; - - postInstall = lib.optionalString enableOcr '' - wrapProgram "$out/bin/ccextractor" \ - --set TESSDATA_PREFIX "${tesseract4}/share/" - ''; - - meta = with lib; { - homepage = "https://www.ccextractor.org"; - description = "Tool that produces subtitles from closed caption data in videos"; - longDescription = '' - A tool that analyzes video files and produces independent subtitle files from - closed captions data. CCExtractor is portable, small, and very fast. - It works on Linux, Windows, and OSX. - ''; - platforms = platforms.unix; - # undefined reference to `png_do_expand_palette_rgba8_neon' - # undefined reference to `png_riffle_palette_neon' - # undefined reference to `png_do_expand_palette_rgb8_neon' - # undefined reference to `png_init_filter_functions_neon' - # during Linking C executable ccextractor - broken = stdenv.isAarch64; - license = licenses.gpl2Only; - maintainers = with maintainers; [ ]; - mainProgram = "ccextractor"; - }; -} diff --git a/pkgs/applications/video/clapper/default.nix b/pkgs/applications/video/clapper/default.nix index 78bfaa2b46373..dfdcacc3b3185 100644 --- a/pkgs/applications/video/clapper/default.nix +++ b/pkgs/applications/video/clapper/default.nix @@ -1,5 +1,4 @@ -{ config -, lib +{ lib , stdenv , fetchFromGitHub , gobject-introspection @@ -22,13 +21,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/davinci-resolve/default.nix b/pkgs/applications/video/davinci-resolve/default.nix index be18304386cbd..dccb345b4ab4a 100644 --- a/pkgs/applications/video/davinci-resolve/default.nix +++ b/pkgs/applications/video/davinci-resolve/default.nix @@ -5,7 +5,7 @@ , runCommandLocal , unzip , appimage-run -, addOpenGLRunpath +, addDriverRunpath , dbus , libGLU , xorg @@ -34,11 +34,11 @@ let davinci = ( stdenv.mkDerivation rec { pname = "davinci-resolve${lib.optionalString studioVariant "-studio"}"; - version = "18.6.6"; + version = "19.0.1"; nativeBuildInputs = [ (appimage-run.override { buildFHSEnv = buildFHSEnvChroot; } ) - addOpenGLRunpath + addDriverRunpath copyDesktopItems unzip ]; @@ -55,8 +55,8 @@ let outputHashAlgo = "sha256"; outputHash = if studioVariant - then "sha256-9iTdIjHH8uoXlVr6miyqmHuzbbpbqdJPEbPGycsccoI=" - else "sha256-WrIQ1FHm65MOGb5HfFl2WzXYJRlqktuZdrtzcjWp1gI="; + then "sha256-dtwweoxUE/DwHoqwKCTp7vQUg09h4/TrNl92hpOKd1E=" + else "sha256-MNaP0+sKBH4Ps5EMM5Gtdncai+rXZRmIQBXF5lVbDws="; impureEnvVars = lib.fetchers.proxyImpureEnvVars; @@ -94,7 +94,7 @@ let } '' DOWNLOADID=$( curl --silent --compressed "$DOWNLOADSURL" \ - | jq --raw-output '.downloads[] | select(.name | test("^'"$PRODUCT $VERSION"'( Update)?$")) | .urls.Linux[0].downloadId' + | jq --raw-output '.downloads[] | .urls.Linux?[]? | select(.downloadTitle | test("^'"$PRODUCT $VERSION"'( Update)?$")) | .downloadId' ) echo "downloadid is $DOWNLOADID" test -n "$DOWNLOADID" @@ -150,14 +150,14 @@ let postFixup = '' for program in $out/bin/*; do isELF "$program" || continue - addOpenGLRunpath "$program" + addDriverRunpath "$program" done for program in $out/libs/*; do isELF "$program" || continue if [[ "$program" != *"libcudnn_cnn_infer"* ]];then echo $program - addOpenGLRunpath "$program" + addDriverRunpath "$program" fi done ln -s $out/libs/libcrypto.so.1.1 $out/libs/libcrypt.so.1 @@ -271,13 +271,13 @@ buildFHSEnv { currentVersion=${lib.escapeShellArg davinci.version} downloadsJSON="$(curl --fail --silent https://www.blackmagicdesign.com/api/support/us/downloads.json)" - latestLinuxVersion="$(echo "$downloadsJSON" | jq '[.downloads[] | select(.urls.Linux) | .urls.Linux[] | select(.downloadTitle | test("DaVinci Resolve")) | .downloadTitle]' | grep -oP 'DaVinci Resolve \K\d+\.\d+\.\d+' | sort | tail -n 1)" + latestLinuxVersion="$(echo "$downloadsJSON" | jq '[.downloads[] | select(.urls.Linux) | .urls.Linux[] | select(.downloadTitle | test("DaVinci Resolve")) | .downloadTitle]' | grep -oP 'DaVinci Resolve \K\d+\.\d+(\.\d+)?' | sort | tail -n 1)" update-source-version davinci-resolve "$latestLinuxVersion" --source-key=davinci.src # Since the standard and studio both use the same version we need to reset it before updating studio sed -i -e "s/""$latestLinuxVersion""/""$currentVersion""/" "$drv" - latestStudioLinuxVersion="$(echo "$downloadsJSON" | jq '[.downloads[] | select(.urls.Linux) | .urls.Linux[] | select(.downloadTitle | test("DaVinci Resolve")) | .downloadTitle]' | grep -oP 'DaVinci Resolve Studio \K\d+\.\d+\.\d+' | sort | tail -n 1)" + latestStudioLinuxVersion="$(echo "$downloadsJSON" | jq '[.downloads[] | select(.urls.Linux) | .urls.Linux[] | select(.downloadTitle | test("DaVinci Resolve")) | .downloadTitle]' | grep -oP 'DaVinci Resolve Studio \K\d+\.\d+(\.\d+)?' | sort | tail -n 1)" update-source-version davinci-resolve-studio "$latestStudioLinuxVersion" --source-key=davinci.src ''; }); diff --git a/pkgs/applications/video/deface/default.nix b/pkgs/applications/video/deface/default.nix index 0b0a2d0859810..054bb04aee72a 100644 --- a/pkgs/applications/video/deface/default.nix +++ b/pkgs/applications/video/deface/default.nix @@ -2,7 +2,6 @@ , stdenv , python3 , fetchFromGitHub -, makeWrapper , pkgs }: diff --git a/pkgs/applications/video/devede/default.nix b/pkgs/applications/video/devede/default.nix index f17638d42e3b7..798e64ff83720 100644 --- a/pkgs/applications/video/devede/default.nix +++ b/pkgs/applications/video/devede/default.nix @@ -12,7 +12,7 @@ in buildPythonApplication rec { owner = "rastersoft"; repo = "devedeng"; rev = version; - sha256 = "sha256-CdntdD5DRA/eXTBRBRszkbYFeFxj+0odb8XHkAFdobU="; + hash = "sha256-CdntdD5DRA/eXTBRBRszkbYFeFxj+0odb8XHkAFdobU="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/video/dmlive/default.nix b/pkgs/applications/video/dmlive/default.nix index 03affd1e00a7a..5127dba204fc4 100644 --- a/pkgs/applications/video/dmlive/default.nix +++ b/pkgs/applications/video/dmlive/default.nix @@ -14,22 +14,22 @@ rustPlatform.buildRustPackage rec { pname = "dmlive"; - version = "5.3.2"; + version = "5.5.4"; src = fetchFromGitHub { owner = "THMonster"; repo = pname; - rev = "3736d83ac0920de78ac82fe331bc6b16dc72b5cd"; # no tag - hash = "sha256-3agUeAv6Nespn6GNw4wmy8HNPQ0VIgZAMnKiV/myKbA="; + rev = "688ddda12ed70a7ad25ede63e948e1cba143a307"; # no tag + hash = "sha256-M7IZ2UzusWovyhigyUXasmSEz4J79gnFyivHVUqfUKg="; }; - cargoHash = "sha256-MxkWaEn/gMMOuje7lu7PlqsQjnF0LWpV9JzmFBG1ukU="; + cargoHash = "sha256-d3vI2iv2Db1XZQc3uaNfkUpDyNKPvHkb/0zEwRTOWZ0="; OPENSSL_NO_VENDOR = true; nativeBuildInputs = [ pkg-config makeWrapper ]; buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ configd Security ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ configd Security ]; postInstall = '' wrapProgram "$out/bin/dmlive" --prefix PATH : "${lib.makeBinPath [ mpv ffmpeg nodejs ]}" diff --git a/pkgs/applications/video/dvdstyler/default.nix b/pkgs/applications/video/dvdstyler/default.nix deleted file mode 100644 index db3f6e7f9a54e..0000000000000 --- a/pkgs/applications/video/dvdstyler/default.nix +++ /dev/null @@ -1,133 +0,0 @@ -{ lib -, stdenv -, fetchurl -, bison -, cdrtools -, docbook_xml_dtd_412 -, docbook-xsl-nons -, dvdauthor -, dvdplusrwtools -, ffmpeg_4 -, flex -, fontconfig -, gettext -, glib -, gobject-introspection -, libexif -, libjpeg -, pkg-config -, wrapGAppsHook3 -, wxGTK32 -, wxSVG -, xine-ui -, xmlto -, zip - -, dvdisasterSupport ? true, dvdisaster ? null -, thumbnailSupport ? true, libgnomeui ? null -, udevSupport ? true, udev ? null -, dbusSupport ? true, dbus ? null -}: - -let - inherit (lib) optionals makeBinPath; -in stdenv.mkDerivation rec { - pname = "dvdstyler"; - version = "3.2.1"; - - src = fetchurl { - url = "mirror://sourceforge/project/dvdstyler/dvdstyler/${version}/DVDStyler-${version}.tar.bz2"; - sha256 = "sha256-C7M0hzn0yTCXRUuBTss6WPa6zo8DD0Fhmp/ur7R0dVg="; - }; - - patches = [ - # https://sourceforge.net/p/dvdstyler/DVDStyler/ci/679fa8dc6ac7657775eda9d7b0ed9da9d069aeec/ - ./wxgtk32.patch - ]; - - nativeBuildInputs = [ - bison - docbook_xml_dtd_412 - docbook-xsl-nons - flex - gettext - gobject-introspection - pkg-config - wrapGAppsHook3 - xmlto - zip - ]; - buildInputs = [ - cdrtools - dvdauthor - dvdplusrwtools - ffmpeg_4 - fontconfig - glib - libexif - libjpeg - wxSVG - wxGTK32 - xine-ui - ] - ++ optionals dvdisasterSupport [ dvdisaster ] - ++ optionals udevSupport [ udev ] - ++ optionals dbusSupport [ dbus ] - ++ optionals thumbnailSupport [ libgnomeui ]; - - enableParallelBuilding = true; - - preFixup = let - binPath = makeBinPath ([ - cdrtools - dvdauthor - dvdplusrwtools - ] ++ optionals dvdisasterSupport [ dvdisaster ]); - in - '' - gappsWrapperArgs+=( - --prefix PATH : "${binPath}" - ) - ''; - - - meta = with lib; { - homepage = "https://www.dvdstyler.org/"; - description = "DVD authoring software"; - longDescription = '' - DVDStyler is a cross-platform free DVD authoring application for the - creation of professional-looking DVDs. It allows not only burning of video - files on DVD that can be played practically on any standalone DVD player, - but also creation of individually designed DVD menus. It is Open Source - Software and is completely free. - - Some of its features include: - - - create and burn DVD video with interactive menus - - design your own DVD menu or select one from the list of ready to use menu - templates - - create photo slideshow - - add multiple subtitle and audio tracks - - support of AVI, MOV, MP4, MPEG, OGG, WMV and other file formats - - support of MPEG-2, MPEG-4, DivX, Xvid, MP2, MP3, AC-3 and other audio and - video formats - - support of multi-core processor - - use MPEG and VOB files without reencoding - - put files with different audio/video format on one DVD (support of - titleset) - - user-friendly interface with support of drag & drop - - flexible menu creation on the basis of scalable vector graphic - - import of image file for background - - place buttons, text, images and other graphic objects anywhere on the menu - screen - - change the font/color and other parameters of buttons and graphic objects - - scale any button or graphic object - - copy any menu object or whole menu - - customize navigation using DVD scripting - ''; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = with platforms; linux; - mainProgram = "dvdstyler"; - }; -} diff --git a/pkgs/applications/video/dvdstyler/wxgtk32.patch b/pkgs/applications/video/dvdstyler/wxgtk32.patch deleted file mode 100644 index 92b3c3fbe3ba7..0000000000000 --- a/pkgs/applications/video/dvdstyler/wxgtk32.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/wxVillaLib/PropDlg.cpp -+++ b/wxVillaLib/PropDlg.cpp -@@ -12,7 +12,9 @@ - #include "utils.h" - #include <wx/fontdlg.h> - #include <wx/colordlg.h> -+#ifdef __WXMSW__ - #include <wx/generic/colrdlgg.h> -+#endif - #include <wx/filedlg.h> - #include <wx/dirdlg.h> - #include <wx/grid.h> diff --git a/pkgs/applications/video/epgstation/default.nix b/pkgs/applications/video/epgstation/default.nix index c5d12c8403c12..63c1e050e7de1 100644 --- a/pkgs/applications/video/epgstation/default.nix +++ b/pkgs/applications/video/epgstation/default.nix @@ -6,7 +6,6 @@ , makeWrapper , bash , nodejs -, gzip , python3 }: diff --git a/pkgs/applications/video/ffmpeg-normalize/default.nix b/pkgs/applications/video/ffmpeg-normalize/default.nix deleted file mode 100644 index a3b40daacf79a..0000000000000 --- a/pkgs/applications/video/ffmpeg-normalize/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib -, buildPythonApplication -, fetchPypi -, ffmpeg -, ffmpeg-progress-yield -}: - -buildPythonApplication rec { - pname = "ffmpeg-normalize"; - version = "1.26.1"; - - src = fetchPypi { - inherit pname version; - sha256 = "sha256-OwREpfWaP0tdAjMGjGpVIAQn8rlTTjSfT+0t5g/2yjQ="; - }; - - propagatedBuildInputs = [ ffmpeg ffmpeg-progress-yield ]; - - checkPhase = '' - $out/bin/ffmpeg-normalize --help > /dev/null - ''; - - meta = with lib; { - description = "Normalize audio via ffmpeg"; - homepage = "https://github.com/slhck/ffmpeg-normalize"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ prusnak ]; - mainProgram = "ffmpeg-normalize"; - }; -} diff --git a/pkgs/applications/video/filebot/default.nix b/pkgs/applications/video/filebot/default.nix deleted file mode 100644 index acc3e9571ca0b..0000000000000 --- a/pkgs/applications/video/filebot/default.nix +++ /dev/null @@ -1,72 +0,0 @@ -{ lib, stdenv, fetchurl, coreutils, openjdk17, makeWrapper, autoPatchelfHook -, zlib, libzen, libmediainfo, curlWithGnuTls, libmms, glib -, genericUpdater, writeShellScript -}: - -let - lanterna = fetchurl { - url = "https://search.maven.org/remotecontent?filepath=com/googlecode/lanterna/lanterna/3.1.1/lanterna-3.1.1.jar"; - hash = "sha256-7zxCeXYW5v9ritnvkwRpPKdgSptCmkT3HJOaNgQHUmQ="; - }; -in stdenv.mkDerivation (finalAttrs: { - pname = "filebot"; - version = "5.1.3"; - - src = fetchurl { - url = "https://web.archive.org/web/20230917142929/https://get.filebot.net/filebot/FileBot_${finalAttrs.version}/FileBot_${finalAttrs.version}-portable.tar.xz"; - hash = "sha256-1TkCV3Cjg/5YZODceV5mQDsPYk09IU7+UHwPRwt2vAQ="; - }; - - unpackPhase = "tar xvf $src"; - - nativeBuildInputs = [ makeWrapper autoPatchelfHook ]; - - buildInputs = [ zlib libzen libmediainfo curlWithGnuTls libmms glib ]; - - postPatch = '' - # replace lanterna.jar to be able to specify `com.googlecode.lanterna.terminal.UnixTerminal.sttyCommand` - cp ${lanterna} jar/lanterna.jar - ''; - - dontBuild = true; - installPhase = '' - mkdir -p $out/opt $out/bin - # Since FileBot has dependencies on relative paths between files, all required files are copied to the same location as is. - cp -r filebot.sh lib/ jar/ $out/opt/ - # Filebot writes to $APP_DATA, which fails due to read-only filesystem. Using current user .local directory instead. - substituteInPlace $out/opt/filebot.sh \ - --replace 'APP_DATA="$FILEBOT_HOME/data/$(id -u)"' 'APP_DATA=''${XDG_DATA_HOME:-$HOME/.local/share}/filebot/data' \ - --replace '$FILEBOT_HOME/data/.license' '$APP_DATA/.license' \ - --replace '-jar "$FILEBOT_HOME/jar/filebot.jar"' '-Dcom.googlecode.lanterna.terminal.UnixTerminal.sttyCommand=${coreutils}/bin/stty -jar "$FILEBOT_HOME/jar/filebot.jar"' - wrapProgram $out/opt/filebot.sh \ - --prefix PATH : ${lib.makeBinPath [ openjdk17 ]} - # Expose the binary in bin to make runnable. - ln -s $out/opt/filebot.sh $out/bin/filebot - ''; - - passthru.updateScript = genericUpdater { - versionLister = writeShellScript "filebot-versionLister" '' - curl -s https://www.filebot.net \ - | sed -rne 's,^.*FileBot_([0-9]*\.[0-9]+\.[0-9]+)-portable.tar.xz.*,\1,p' - ''; - }; - - meta = with lib; { - description = "Ultimate TV and Movie Renamer"; - longDescription = '' - FileBot is the ultimate tool for organizing and renaming your Movies, TV - Shows and Anime as well as fetching subtitles and artwork. It's smart and - just works. - ''; - homepage = "https://filebot.net"; - changelog = "https://www.filebot.net/forums/viewforum.php?f=7"; - sourceProvenance = with sourceTypes; [ - binaryBytecode - binaryNativeCode - ]; - license = licenses.unfreeRedistributable; - maintainers = with maintainers; [ gleber felschr ]; - platforms = platforms.linux; - mainProgram = "filebot"; - }; -}) diff --git a/pkgs/applications/video/flirc/default.nix b/pkgs/applications/video/flirc/default.nix index fc73023783000..b051bae6b0dcc 100644 --- a/pkgs/applications/video/flirc/default.nix +++ b/pkgs/applications/video/flirc/default.nix @@ -1,21 +1,22 @@ -{ lib -, stdenv -, fetchurl -, autoPatchelfHook -, wrapQtAppsHook -, hidapi -, readline -, qtsvg -, qtxmlpatterns +{ + lib, + stdenv, + fetchurl, + autoPatchelfHook, + wrapQtAppsHook, + hidapi, + readline, + qtsvg, + qtxmlpatterns, }: stdenv.mkDerivation { pname = "flirc"; - version = "3.27.10"; + version = "3.27.15"; src = fetchurl { - url = "https://web.archive.org/web/20240110170238/http://apt.flirc.tv/arch/x86_64/flirc.latest.x86_64.tar.gz"; - hash = "sha256-iTr4vzFQ/+dsbsYD6sc8aTHctTkLKf5HnHBnO7cX5qc="; + url = "https://web.archive.org/web/20240626115121/http://apt.flirc.tv/arch/x86_64/flirc.latest.x86_64.tar.gz"; + hash = "sha256-8bUsOsp5obJJdZU9QHfJnZKNAXJwi0nrHkSeDTE1Xa4="; }; nativeBuildInputs = [ @@ -46,6 +47,7 @@ stdenv.mkDerivation { maintainers = with maintainers; [ aanderse ]; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; + mainProgram = "Flirc"; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/video/freetube/default.nix b/pkgs/applications/video/freetube/default.nix index 72bdd1f97916e..ffe9beea5cd8e 100644 --- a/pkgs/applications/video/freetube/default.nix +++ b/pkgs/applications/video/freetube/default.nix @@ -1,20 +1,25 @@ -{ stdenv, lib, fetchurl, appimageTools, makeWrapper, electron, nixosTests }: +{ + stdenv, + lib, + fetchurl, + appimageTools, + makeWrapper, + electron, + nixosTests, +}: stdenv.mkDerivation rec { pname = "freetube"; - version = "0.21.0"; + version = "0.21.3"; src = fetchurl { url = "https://github.com/FreeTubeApp/FreeTube/releases/download/v${version}-beta/freetube_${version}_amd64.AppImage"; - sha256 = "sha256-jTDJ0oyDrgOM6T+nwiOakm3QUqKfK2UNY6AfpoaJzd0="; + hash = "sha256-sg/ycFo4roOJ2sW4naRCE6dwGXVQFzF8uwAZQkS2EY4="; }; passthru.tests = nixosTests.freetube; - appimageContents = appimageTools.extractType2 { - name = "${pname}-${version}"; - inherit src; - }; + appimageContents = appimageTools.extractType2 { inherit pname version src; }; dontUnpack = true; dontConfigure = true; @@ -43,11 +48,14 @@ stdenv.mkDerivation rec { --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}" ''; - meta = with lib; { + meta = { description = "Open Source YouTube app for privacy"; homepage = "https://freetubeapp.io/"; - license = licenses.agpl3Only; - maintainers = with maintainers; [ ryneeverett alyaeanyx ]; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ + ryneeverett + alyaeanyx + ]; inherit (electron.meta) platforms; mainProgram = "freetube"; }; diff --git a/pkgs/applications/video/frigate/default.nix b/pkgs/applications/video/frigate/default.nix index cf381a5f42658..7ee4f6eba606f 100644 --- a/pkgs/applications/video/frigate/default.nix +++ b/pkgs/applications/video/frigate/default.nix @@ -1,36 +1,31 @@ { lib , callPackage -, python3 +, python312 , fetchFromGitHub , fetchurl -, fetchpatch2 , frigate , nixosTests }: let - version = "0.13.2"; + version = "0.14.1"; src = fetchFromGitHub { - #name = "frigate-${version}-source"; + name = "frigate-${version}-source"; owner = "blakeblackshear"; repo = "frigate"; rev = "refs/tags/v${version}"; - hash = "sha256-NVT7yaJkVA7b7GL0S0fHjNneBzhjCru56qY1Q4sTVcE="; + hash = "sha256-PfUlo9ua4SVcQJTfmSVoEXHH1MUJ8A/w3kJHFpEzll8="; }; frigate-web = callPackage ./web.nix { inherit version src; }; - python = python3.override { + python = python312.override { + self = python; packageOverrides = self: super: { - pydantic = super.pydantic_1; - - versioningit = super.versioningit.overridePythonAttrs { - # checkPhase requires pydantic>=2 - doCheck = false; - }; + paho-mqtt = super.paho-mqtt_2; }; }; @@ -59,48 +54,35 @@ python.pkgs.buildPythonApplication rec { inherit src; - patches = [ - (fetchpatch2 { - name = "frigate-flask3.0-compat.patch"; - url = "https://github.com/blakeblackshear/frigate/commit/56bdacc1c661eff8a323e033520e75e2ba0a3842.patch"; - hash = "sha256-s/goUJxIbjq/woCEOEZECdcZoJDoWc1eM63sd60cxeY="; - }) - (fetchpatch2 { - # https://github.com/blakeblackshear/frigate/pull/10967 - name = "frigate-wsdl-path.patch"; - url = "https://github.com/blakeblackshear/frigate/commit/b65656fa8733c1c2f3d944f716d2e9493ae7c99f.patch"; - hash = "sha256-taPWFV4PldBGUKAwFMKag4W/3TLMSGdKLYG8bj1Y5mU="; - }) - ]; - postPatch = '' echo 'VERSION = "${version}"' > frigate/version.py substituteInPlace frigate/app.py \ - --replace "Router(migrate_db)" 'Router(migrate_db, "${placeholder "out"}/share/frigate/migrations")' + --replace-fail "Router(migrate_db)" 'Router(migrate_db, "${placeholder "out"}/share/frigate/migrations")' substituteInPlace frigate/const.py \ - --replace "/media/frigate" "/var/lib/frigate" \ - --replace "/tmp/cache" "/var/cache/frigate" \ - --replace "/config" "/var/lib/frigate" \ - --replace "{CONFIG_DIR}/model_cache" "/var/cache/frigate/model_cache" + --replace-fail "/media/frigate" "/var/lib/frigate" \ + --replace-fail "/tmp/cache" "/var/cache/frigate" \ + --replace-fail "/config" "/var/lib/frigate" \ + --replace-fail "{CONFIG_DIR}/model_cache" "/var/cache/frigate/model_cache" - substituteInPlace frigate/http.py \ - --replace "/opt/frigate" "${placeholder "out"}/${python.sitePackages}" - - substituteInPlace frigate/output.py \ - --replace "/opt/frigate" "${placeholder "out"}/${python.sitePackages}" + substituteInPlace frigate/comms/{config,detections,events}_updater.py frigate/comms/inter_process.py \ + --replace-fail "ipc:///tmp/cache" "ipc:///run/frigate" substituteInPlace frigate/detectors/detector_config.py \ - --replace "/labelmap.txt" "${placeholder "out"}/share/frigate/labelmap.txt" + --replace-fail "/labelmap.txt" "${placeholder "out"}/share/frigate/labelmap.txt" + + # work around onvif-zeep idiosyncrasy + substituteInPlace frigate/ptz/onvif.py \ + --replace-fail dist-packages site-packages substituteInPlace frigate/config.py \ - --replace "/cpu_model.tflite" "${tflite_cpu_model}" \ - --replace "/edgetpu_model.tflite" "${tflite_edgetpu_model}" + --replace-fail "/cpu_model.tflite" "${tflite_cpu_model}" \ + --replace-fail "/edgetpu_model.tflite" "${tflite_edgetpu_model}" substituteInPlace frigate/test/test_config.py \ - --replace "(MODEL_CACHE_DIR" "('/build/model_cache'" \ - --replace "/config/model_cache" "/build/model_cache" + --replace-fail "(MODEL_CACHE_DIR" "('/build/model_cache'" \ + --replace-fail "/config/model_cache" "/build/model_cache" ''; dontBuild = true; @@ -110,8 +92,11 @@ python.pkgs.buildPythonApplication rec { scikit-build # docker/main/requirements-wheel.txt click + distutils flask + flask-limiter imutils + joserfc markupsafe matplotlib norfair @@ -119,6 +104,7 @@ python.pkgs.buildPythonApplication rec { onvif-zeep opencv4 openvino + pandas paho-mqtt peewee peewee-migrate @@ -127,11 +113,12 @@ python.pkgs.buildPythonApplication rec { pydantic pytz pyyaml + pyzmq requests ruamel-yaml scipy setproctitle - tensorflow + tensorflow-bin tzlocal unidecode ws4py diff --git a/pkgs/applications/video/frigate/web.nix b/pkgs/applications/video/frigate/web.nix index be530c5c3637d..cea410849ec8d 100644 --- a/pkgs/applications/video/frigate/web.nix +++ b/pkgs/applications/video/frigate/web.nix @@ -13,12 +13,19 @@ buildNpmPackage { substituteInPlace package.json \ --replace-fail "--base=/BASE_PATH/" "" - substituteInPlace src/routes/Storage.jsx \ + substituteInPlace \ + src/views/system/StorageMetrics.tsx \ + src/components/card/{AnimatedEvent,Export,Review}Card.tsx \ + src/components/timeline/EventSegment.tsx \ + src/pages/Exports.tsx \ + src/components/player/PreviewThumbnailPlayer.tsx \ --replace-fail "/media/frigate" "/var/lib/frigate" \ + + substituteInPlace src/views/system/StorageMetrics.tsx \ --replace-fail "/tmp/cache" "/var/cache/frigate" ''; - npmDepsHash = "sha256-+36quezGArqIM9dM+UihwcIgmE3EVmJQThuicLgDW4A="; + npmDepsHash = "sha256-PLs3oCWQjK38eHgdQt2Qkj7YqkfanC8JnLMpzMjNfxU="; installPhase = '' cp -rv dist/ $out diff --git a/pkgs/applications/video/glaxnimate/default.nix b/pkgs/applications/video/glaxnimate/default.nix index c09b2c8170d4f..7c6d8500d8776 100644 --- a/pkgs/applications/video/glaxnimate/default.nix +++ b/pkgs/applications/video/glaxnimate/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { owner = "mattbas"; repo = "${pname}"; rev = version; - sha256 = "sha256-8oHJCQdP2xxSSDM0MDkSrG89WgCtMKm1AKlddnq3gig="; + hash = "sha256-8oHJCQdP2xxSSDM0MDkSrG89WgCtMKm1AKlddnq3gig="; fetchSubmodules = true; }; @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { qtWrapperArgs = [ ''--prefix PATH : ${python3WithLibs}/bin'' ]; - passthru.tests.version = lib.optionalAttrs stdenv.isLinux (testers.testVersion { + passthru.tests.version = lib.optionalAttrs stdenv.hostPlatform.isLinux (testers.testVersion { package = glaxnimate; command = "${xvfb-run}/bin/xvfb-run glaxnimate --version"; }); diff --git a/pkgs/applications/video/gnome-mplayer/default.nix b/pkgs/applications/video/gnome-mplayer/default.nix deleted file mode 100644 index 436f31ac5a01d..0000000000000 --- a/pkgs/applications/video/gnome-mplayer/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{lib, stdenv, substituteAll, fetchFromGitHub, pkg-config, gettext, glib, gtk3, gmtk, dbus, dbus-glib -, libnotify, libpulseaudio, mplayer, wrapGAppsHook3 }: - -stdenv.mkDerivation rec { - pname = "gnome-mplayer"; - version = "1.0.9"; - - src = fetchFromGitHub { - owner = "kdekorte"; - repo = "gnome-mplayer"; - rev = "v${version}"; - sha256 = "0qvy9fllvg1mad6y1j79iaqa6khs0q2cb0z62yfg4srbr07fi8xr"; - }; - - nativeBuildInputs = [ pkg-config gettext wrapGAppsHook3 ]; - buildInputs = [ glib gtk3 gmtk dbus dbus-glib libnotify libpulseaudio ]; - - patches = [ - (substituteAll { - src = ./fix-paths.patch; - mencoder = "${mplayer}/bin/mencoder"; - mplayer = "${mplayer}/bin/mplayer"; - }) - ]; - - # Workaround build failure on -fno-common toolchains: - # ld: mpris-interface.o:src/playlist.h:32: multiple definition of - # `plclose'; gui.o:src/playlist.h:32: first defined here - env.NIX_CFLAGS_COMPILE = "-fcommon"; - - meta = with lib; { - description = "Gnome MPlayer, a simple GUI for MPlayer"; - mainProgram = "gnome-mplayer"; - homepage = "https://sites.google.com/site/kdekorte2/gnomemplayer"; - license = licenses.gpl2; - maintainers = with maintainers; []; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/video/gnome-mplayer/fix-paths.patch b/pkgs/applications/video/gnome-mplayer/fix-paths.patch deleted file mode 100644 index ede4991c4662c..0000000000000 --- a/pkgs/applications/video/gnome-mplayer/fix-paths.patch +++ /dev/null @@ -1,87 +0,0 @@ ---- a/src/gui.c -+++ b/src/gui.c -@@ -7470,7 +7470,7 @@ - filename = g_strdup_printf("%s/00000001.jpg", dirname); - g_free(basepath); - // run mplayer and try to get the first frame and convert it to a jpeg -- av[ac++] = g_strdup_printf("mplayer"); -+ av[ac++] = g_strdup_printf("@mplayer@"); - av[ac++] = g_strdup_printf("-vo"); - av[ac++] = g_strdup_printf("jpeg:outdir=%s", dirname); - av[ac++] = g_strdup_printf("-ao"); ---- a/src/property_page_common.c -+++ b/src/property_page_common.c -@@ -80,7 +80,7 @@ - MetaData *ret; - ret = g_new0(MetaData, 1); - -- av[ac++] = g_strdup_printf("mplayer"); -+ av[ac++] = g_strdup_printf("@mplayer@"); - av[ac++] = g_strdup_printf("-vo"); - av[ac++] = g_strdup_printf("null"); - av[ac++] = g_strdup_printf("-ao"); ---- a/src/support.c -+++ b/src/support.c -@@ -566,7 +566,7 @@ - } else { - playlist = FALSE; - if (mplayer_bin == NULL || !g_file_test(mplayer_bin, G_FILE_TEST_EXISTS)) { -- av[ac++] = g_strdup_printf("mplayer"); -+ av[ac++] = g_strdup_printf("@mplayer@"); - } else { - av[ac++] = g_strdup_printf("%s", mplayer_bin); - } -@@ -728,7 +728,7 @@ - playlist = FALSE; - // run mplayer and try to get the first frame and convert it to a jpeg - if (mplayer_bin == NULL || !g_file_test(mplayer_bin, G_FILE_TEST_EXISTS)) { -- av[ac++] = g_strdup_printf("mplayer"); -+ av[ac++] = g_strdup_printf("@mplayer@"); - } else { - av[ac++] = g_strdup_printf("%s", mplayer_bin); - } -@@ -825,7 +825,7 @@ - playlist = FALSE; - - if (mplayer_bin == NULL || !g_file_test(mplayer_bin, G_FILE_TEST_EXISTS)) { -- av[ac++] = g_strdup_printf("mplayer"); -+ av[ac++] = g_strdup_printf("@mplayer@"); - } else { - av[ac++] = g_strdup_printf("%s", mplayer_bin); - } -@@ -1251,7 +1251,7 @@ - gm_log(verbose, G_LOG_LEVEL_INFO, "getting file metadata for %s", name); - - if (mplayer_bin == NULL || !g_file_test(mplayer_bin, G_FILE_TEST_EXISTS)) { -- av[ac++] = g_strdup_printf("mplayer"); -+ av[ac++] = g_strdup_printf("@mplayer@"); - } else { - av[ac++] = g_strdup_printf("%s", mplayer_bin); - } -@@ -1532,7 +1532,7 @@ - return 0; - - if (mplayer_bin == NULL || !g_file_test(mplayer_bin, G_FILE_TEST_EXISTS)) { -- av[ac++] = g_strdup_printf("mplayer"); -+ av[ac++] = g_strdup_printf("@mplayer@"); - } else { - av[ac++] = g_strdup_printf("%s", mplayer_bin); - } -@@ -1597,7 +1597,7 @@ - - if (control_id == 0) { - ac = 0; -- av[ac++] = g_strdup_printf("mencoder"); -+ av[ac++] = g_strdup_printf("@mencoder@"); - av[ac++] = g_strdup_printf("-ovc"); - av[ac++] = g_strdup_printf("copy"); - av[ac++] = g_strdup_printf("-oac"); -@@ -2830,7 +2830,7 @@ - gboolean ret = TRUE; - - if (mplayer_bin == NULL || !g_file_test(mplayer_bin, G_FILE_TEST_EXISTS)) { -- av[ac++] = g_strdup_printf("mplayer"); -+ av[ac++] = g_strdup_printf("@mplayer@"); - } else { - av[ac++] = g_strdup_printf("%s", mplayer_bin); - } diff --git a/pkgs/applications/video/gnomecast/default.nix b/pkgs/applications/video/gnomecast/default.nix index 37bf7baec8706..bea389ccc5342 100644 --- a/pkgs/applications/video/gnomecast/default.nix +++ b/pkgs/applications/video/gnomecast/default.nix @@ -40,7 +40,7 @@ buildPythonApplication rec { description = "Native Linux GUI for Chromecasting local files"; homepage = "https://github.com/keredson/gnomecast"; license = with licenses; [ gpl3 ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; mainProgram = "gnomecast"; }; } diff --git a/pkgs/applications/video/go-chromecast/default.nix b/pkgs/applications/video/go-chromecast/default.nix index 44495386d4cf3..cade6f0c7484f 100644 --- a/pkgs/applications/video/go-chromecast/default.nix +++ b/pkgs/applications/video/go-chromecast/default.nix @@ -19,7 +19,7 @@ buildGoModule rec { homepage = "https://github.com/vishen/go-chromecast"; description = "CLI for Google Chromecast, Home devices and Cast Groups"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; mainProgram = "go-chromecast"; }; } diff --git a/pkgs/applications/video/go2tv/default.nix b/pkgs/applications/video/go2tv/default.nix index 6837572cd9f03..e7ecf29369354 100644 --- a/pkgs/applications/video/go2tv/default.nix +++ b/pkgs/applications/video/go2tv/default.nix @@ -14,16 +14,16 @@ buildGoModule rec { pname = "go2tv" + lib.optionalString (!withGui) "-lite"; - version = "1.16.1"; + version = "1.17.0"; src = fetchFromGitHub { owner = "alexballas"; repo = "go2tv"; rev = "refs/tags/v${version}"; - hash = "sha256-7m5GikrdcrJyl+KYuSk1JWLW2SsHOcBJNJuq2BahxHc="; + hash = "sha256-h0q2VhnU7CPCD0Co9rLPmGh4BK4eP5QUMep7AaJ3weY="; }; - vendorHash = "sha256-na79rF/9o+s6E4i08Ocs6u98IABc19sTGFvjI6yeJFo="; + vendorHash = "sha256-+sASY+HosTMMVHHPwVw8nO+/72s2A1EpuTMHJXhHtnc="; nativeBuildInputs = [ pkg-config ]; @@ -36,7 +36,7 @@ buildGoModule rec { xorg.libXext xorg.libXxf86vm libglvnd - ] ++ lib.optionals stdenv.isDarwin [ Carbon Cocoa Kernel UserNotifications ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Carbon Cocoa Kernel UserNotifications ]; ldflags = [ "-s" diff --git a/pkgs/applications/video/gpac/default.nix b/pkgs/applications/video/gpac/default.nix index 7b8113e906e49..b036e69ce8a39 100644 --- a/pkgs/applications/video/gpac/default.nix +++ b/pkgs/applications/video/gpac/default.nix @@ -1,44 +1,29 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, zlib }: +{ lib, stdenv, fetchFromGitHub, cctools, pkg-config, Carbon, zlib }: stdenv.mkDerivation rec { - version = "2.2.1"; pname = "gpac"; + version = "2.4.0"; src = fetchFromGitHub { owner = "gpac"; repo = "gpac"; rev = "v${version}"; - hash = "sha256-VjA1VFMsYUJ8uJqhYgjXYtqlGWSJHr16Ck3b5stuZWw="; + hash = "sha256-RADDqc5RxNV2EfRTzJP/yz66p0riyn81zvwU3r9xncM="; }; - patches = [ - (fetchpatch { - name = "CVE-2023-2837.patch"; - url = "https://github.com/gpac/gpac/commit/6f28c4cd607d83ce381f9b4a9f8101ca1e79c611.patch"; - hash = "sha256-HA6qMungIoh1fz1R3zUvV1Ahoa2pp861JRzYY/NNDQI="; - }) - (fetchpatch { - name = "CVE-2023-2838.patch"; - url = "https://github.com/gpac/gpac/commit/c88df2e202efad214c25b4e586f243b2038779ba.patch"; - hash = "sha256-gIISG7pz01iVoWqlho2BL27ki87i3pGkug2Z+KKn+xs="; - }) - (fetchpatch { - name = "CVE-2023-2839.patch"; - url = "https://github.com/gpac/gpac/commit/047f96fb39e6bf70cb9f344093f5886e51dce0ac.patch"; - hash = "sha256-i+/iFrWJ+Djc8xYtIOYvlZ98fYUdJooqUz9y/uhusL4="; - }) - (fetchpatch { - name = "CVE-2023-2840.patch"; - url = "https://github.com/gpac/gpac/commit/ba59206b3225f0e8e95a27eff41cb1c49ddf9a37.patch"; - hash = "sha256-mwO9Qeeufq0wa57lO+LgWGjrN3CHMYK+xr2ZBalKBQo="; - }) - ]; - # this is the bare minimum configuration, as I'm only interested in MP4Box # For most other functionality, this should probably be extended - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ + pkg-config + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + cctools + ]; - buildInputs = [ zlib ]; + buildInputs = [ + zlib + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + Carbon + ]; enableParallelBuilding = true; @@ -59,62 +44,6 @@ stdenv.mkDerivation rec { homepage = "https://gpac.wp.imt.fr"; license = licenses.lgpl21; maintainers = with maintainers; [ bluescreen303 mgdelacroix ]; - platforms = platforms.linux; - knownVulnerabilities = [ - "CVE-2023-48958" - "CVE-2023-48090" - "CVE-2023-48039" - "CVE-2023-48014" - "CVE-2023-48013" - "CVE-2023-48011" - "CVE-2023-47465" - "CVE-2023-47384" - "CVE-2023-46932" - "CVE-2023-46931" - "CVE-2023-46930" - "CVE-2023-46928" - "CVE-2023-46927" - "CVE-2023-46871" - "CVE-2023-46001" - "CVE-2023-42298" - "CVE-2023-41000" - "CVE-2023-39562" - "CVE-2023-37767" - "CVE-2023-37766" - "CVE-2023-37765" - "CVE-2023-37174" - "CVE-2023-23143" - "CVE-2023-5998" - "CVE-2023-5595" - "CVE-2023-5586" - "CVE-2023-5520" - "CVE-2023-5377" - "CVE-2023-4778" - "CVE-2023-4758" - "CVE-2023-4756" - "CVE-2023-4755" - "CVE-2023-4754" - "CVE-2023-4722" - "CVE-2023-4721" - "CVE-2023-4720" - "CVE-2023-4683" - "CVE-2023-4682" - "CVE-2023-4681" - "CVE-2023-4678" - "CVE-2023-3523" - "CVE-2023-3291" - "CVE-2023-3013" - "CVE-2023-3012" - "CVE-2023-1655" - "CVE-2023-1654" - "CVE-2023-1452" - "CVE-2023-1449" - "CVE-2023-1448" - "CVE-2023-0866" - "CVE-2023-0841" - "CVE-2023-0819" - "CVE-2023-0818" - "CVE-2023-0817" - ]; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/video/gpu-screen-recorder/0001-Don-t-install-systemd-unit-files-using-absolute-path.patch b/pkgs/applications/video/gpu-screen-recorder/0001-Don-t-install-systemd-unit-files-using-absolute-path.patch new file mode 100644 index 0000000000000..1403d59b86bac --- /dev/null +++ b/pkgs/applications/video/gpu-screen-recorder/0001-Don-t-install-systemd-unit-files-using-absolute-path.patch @@ -0,0 +1,25 @@ +From cd8c6561079ee4c53b4bed390edd75a730ac685d Mon Sep 17 00:00:00 2001 +From: Tim Schumacher <timschumi@gmx.de> +Date: Thu, 4 Jul 2024 16:26:36 +0200 +Subject: [PATCH] Don't install systemd unit files using absolute paths + +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index a188f16..7807abe 100644 +--- a/meson.build ++++ b/meson.build +@@ -54,7 +54,7 @@ executable('gsr-kms-server', 'kms/server/kms_server.c', dependencies : dependenc + executable('gpu-screen-recorder', src, dependencies : dep, install : true) + + if get_option('systemd') == true +- install_data(files('extra/gpu-screen-recorder.service'), install_dir : '/usr/lib/systemd/user') ++ install_data(files('extra/gpu-screen-recorder.service'), install_dir : 'lib/systemd/user') + endif + + if get_option('capabilities') == true +-- +2.45.1 + diff --git a/pkgs/applications/video/gpu-screen-recorder/default.nix b/pkgs/applications/video/gpu-screen-recorder/default.nix index 101cb3af49ddf..663d826402479 100644 --- a/pkgs/applications/video/gpu-screen-recorder/default.nix +++ b/pkgs/applications/video/gpu-screen-recorder/default.nix @@ -1,33 +1,42 @@ -{ stdenv -, lib -, fetchurl -, makeWrapper -, pkg-config -, libXcomposite -, libpulseaudio -, ffmpeg -, wayland -, libdrm -, libva -, libglvnd -, libXrandr -, libXfixes +{ + stdenv, + lib, + fetchurl, + makeWrapper, + meson, + ninja, + pkg-config, + libXcomposite, + libpulseaudio, + ffmpeg, + wayland, + libdrm, + libva, + libglvnd, + libXdamage, + libXi, + libXrandr, + libXfixes, + wrapperDir ? "/run/wrappers/bin", }: stdenv.mkDerivation { pname = "gpu-screen-recorder"; - version = "unstable-2024-05-21"; + version = "unstable-2024-07-05"; + # Snapshot tarballs use the following versioning format: # printf "r%s.%s\n" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" src = fetchurl { - url = "https://dec05eba.com/snapshot/gpu-screen-recorder.git.r594.e572073.tar.gz"; - hash = "sha256-MTBxhvkoyotmRUx1sRN/7ruXBYwIbOFQNdJHhZ3DdDk="; + url = "https://dec05eba.com/snapshot/gpu-screen-recorder.git.r641.48cd80f.tar.gz"; + hash = "sha256-hIEK8EYIxQTTiFePPZf4V0nsxqxkfcDeOG9GK9whn+0="; }; sourceRoot = "."; nativeBuildInputs = [ pkg-config makeWrapper + meson + ninja ]; buildInputs = [ @@ -37,25 +46,33 @@ stdenv.mkDerivation { wayland libdrm libva + libXdamage + libXi libXrandr libXfixes ]; - buildPhase = '' - ./build.sh - ''; + patches = [ ./0001-Don-t-install-systemd-unit-files-using-absolute-path.patch ]; + + mesonFlags = [ + "-Dsystemd=true" + + # Capabilities are handled by security.wrappers if possible. + "-Dcapabilities=false" + ]; postInstall = '' - install -Dt $out/bin gpu-screen-recorder gsr-kms-server mkdir $out/bin/.wrapped mv $out/bin/gpu-screen-recorder $out/bin/.wrapped/ makeWrapper "$out/bin/.wrapped/gpu-screen-recorder" "$out/bin/gpu-screen-recorder" \ --prefix LD_LIBRARY_PATH : ${libglvnd}/lib \ + --prefix PATH : ${wrapperDir} \ --suffix PATH : $out/bin ''; meta = { description = "Screen recorder that has minimal impact on system performance by recording a window using the GPU only"; + mainProgram = "gpu-screen-recorder"; homepage = "https://git.dec05eba.com/gpu-screen-recorder/about/"; license = lib.licenses.gpl3Only; maintainers = [ lib.maintainers.babbaj ]; diff --git a/pkgs/applications/video/gpu-screen-recorder/gpu-screen-recorder-gtk.nix b/pkgs/applications/video/gpu-screen-recorder/gpu-screen-recorder-gtk.nix index 0fa023a9fc940..b0c19e80a0be0 100644 --- a/pkgs/applications/video/gpu-screen-recorder/gpu-screen-recorder-gtk.nix +++ b/pkgs/applications/video/gpu-screen-recorder/gpu-screen-recorder-gtk.nix @@ -1,47 +1,62 @@ { stdenv , lib -, fetchgit +, fetchurl , pkg-config +, desktop-file-utils , makeWrapper +, meson +, ninja , gtk3 +, libayatana-appindicator , libpulseaudio , libdrm , gpu-screen-recorder , libglvnd +, libX11 +, libXrandr +, wayland , wrapGAppsHook3 +, wrapperDir ? "/run/wrappers/bin" }: stdenv.mkDerivation { pname = "gpu-screen-recorder-gtk"; - version = "3.7.6"; + version = "unstable-2024-07-05"; - src = fetchgit { - url = "https://repo.dec05eba.com/gpu-screen-recorder-gtk"; - rev = "cd777c1506e20514df4b97345e480051cbaf9693"; - hash = "sha256-ZBYYsW75tq8TaZp0F4v7YIHKHk/DFBIGy3X781ho2oE="; + # Snapshot tarballs use the following versioning format: + # printf "r%s.%s\n" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" + src = fetchurl { + url = "https://dec05eba.com/snapshot/gpu-screen-recorder-gtk.git.r311.c611c51.tar.gz"; + hash = "sha256-86EdmeZ2dlffSfJOrTVGPtYyL3j6DmCQIALX2rpeS1Y="; }; + sourceRoot = "."; nativeBuildInputs = [ + desktop-file-utils pkg-config makeWrapper + meson + ninja wrapGAppsHook3 ]; buildInputs = [ gtk3 + libayatana-appindicator libpulseaudio libdrm + libX11 + libXrandr + wayland ]; - buildPhase = '' - ./build.sh - ''; - - installPhase = '' - install -Dt $out/bin/ gpu-screen-recorder-gtk - install -Dt $out/share/applications/ gpu-screen-recorder-gtk.desktop - - gappsWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ gpu-screen-recorder ]}) + preFixup = let + gpu-screen-recorder-wrapped = gpu-screen-recorder.override { + inherit wrapperDir; + }; + in '' + gappsWrapperArgs+=(--prefix PATH : ${wrapperDir}) + gappsWrapperArgs+=(--suffix PATH : ${lib.makeBinPath [ gpu-screen-recorder-wrapped ]}) # we also append /run/opengl-driver/lib as it otherwise fails to find libcuda. gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libglvnd ]}:/run/opengl-driver/lib) ''; diff --git a/pkgs/applications/video/gyroflow/Cargo.lock b/pkgs/applications/video/gyroflow/Cargo.lock index 2a3709e1b15e4..c675874a49af1 100644 --- a/pkgs/applications/video/gyroflow/Cargo.lock +++ b/pkgs/applications/video/gyroflow/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "addr2line" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" dependencies = [ "gimli", ] @@ -18,22 +18,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] +name = "adler2" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" + +[[package]] name = "ahash" -version = "0.8.6" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ "cfg-if", "once_cell", "version_check", - "zerocopy 0.7.32", + "zerocopy", ] [[package]] name = "aho-corasick" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ "memchr", ] @@ -43,8 +49,8 @@ name = "ahrs" version = "0.6.0" source = "git+https://github.com/jmagnuson/ahrs-rs.git?rev=bf7b41d#bf7b41d09115b47ce8f6060624ed6a8a9bc445d4" dependencies = [ - "nalgebra 0.32.3", - "num-traits 0.2.17", + "nalgebra 0.32.6", + "num-traits 0.2.19", "simba 0.8.1", ] @@ -70,20 +76,20 @@ dependencies = [ [[package]] name = "allocator-api2" -version = "0.2.16" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" +checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" [[package]] name = "alsa" -version = "0.7.1" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2562ad8dcf0f789f65c6fdaad8a8a9708ed6b488e649da28c01656ad66b8b47" +checksum = "ed7572b7ba83a31e20d1b48970ee402d2e3e0537dcfe0a3ff4d6eb7508617d43" dependencies = [ "alsa-sys", - "bitflags 1.3.2", + "bitflags 2.6.0", + "cfg-if", "libc", - "nix 0.24.3", ] [[package]] @@ -113,9 +119,20 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.76" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59d2a3357dde987206219e78ecfbbb6e8dad06cbb65292758d3270e6254f7355" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" + +[[package]] +name = "app_dirs2" +version = "2.5.5" +source = "git+https://github.com/app-dirs-rs/app_dirs2.git#1137ee05d745c2d5fa3fd01aecb6e1300d6fc280" +dependencies = [ + "jni", + "ndk-context", + "windows 0.58.0", + "xdg", +] [[package]] name = "approx" @@ -123,7 +140,7 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6" dependencies = [ - "num-traits 0.2.17", + "num-traits 0.2.19", ] [[package]] @@ -145,7 +162,7 @@ dependencies = [ "argh_shared", "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.77", ] [[package]] @@ -159,14 +176,14 @@ dependencies = [ [[package]] name = "argmin" -version = "0.8.1" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "897c18cfe995220bdd94a27455e5afedc7c688cbf62ad2be88ce7552452aa1b2" +checksum = "760a49d596b18b881d2fe6e9e6da4608fa64d4a7653ef5cd43bfaa4da018d596" dependencies = [ "anyhow", "argmin-math", "instant", - "num-traits 0.2.17", + "num-traits 0.2.19", "paste", "rand", "rand_xoshiro", @@ -175,25 +192,25 @@ dependencies = [ [[package]] name = "argmin-math" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8798ca7447753fcb3dd98d9095335b1564812a68c6e7c3d1926e1d5cf094e37" +checksum = "d93a0d0269b60bd1cd674de70314e3f0da97406cf8c1936ce760d2a46e0f13fe" dependencies = [ "anyhow", "cfg-if", - "nalgebra 0.32.3", + "nalgebra 0.32.6", "num-complex", "num-integer", - "num-traits 0.2.17", + "num-traits 0.2.19", "rand", "thiserror", ] [[package]] name = "arrayvec" -version = "0.7.4" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" +checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" [[package]] name = "arrsac" @@ -207,11 +224,11 @@ dependencies = [ [[package]] name = "ash" -version = "0.37.3+1.3.251" +version = "0.38.0+1.3.281" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e9c3835d686b0a6084ab4234fcd1b07dbf6e4767dce60874b12356a25ecd4a" +checksum = "0bb44936d800fea8f016d7f2311c6a4f97aebd5dc86f09906139ec848cf3a46f" dependencies = [ - "libloading 0.7.4", + "libloading", ] [[package]] @@ -222,22 +239,23 @@ checksum = "4cea652ffbedecf29e9cd41bb4c066881057a42c0c119040f022802b26853e77" [[package]] name = "async-broadcast" -version = "0.5.1" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c48ccdbf6ca6b121e0f586cbc0e73ae440e56c67c30fa0873b4e110d9c26d2b" +checksum = "20cd0e2e25ea8e5f7e9df04578dc6cf5c83577fd09b1a46aaf5c85e1c33f2a7e" dependencies = [ - "event-listener 2.5.3", + "event-listener", + "event-listener-strategy", "futures-core", + "pin-project-lite", ] [[package]] name = "async-channel" -version = "2.1.1" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ca33f4bc4ed1babef42cad36cc1f51fa88be00420404e5b1e80ab1b18f7678c" +checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a" dependencies = [ "concurrent-queue", - "event-listener 4.0.1", "event-listener-strategy", "futures-core", "pin-project-lite", @@ -245,150 +263,122 @@ dependencies = [ [[package]] name = "async-executor" -version = "1.8.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ae5ebefcc48e7452b4987947920dac9450be1110cadf34d1b8c116bdbaf97c" +checksum = "d7ebdfa2ebdab6b1760375fa7d6f382b9f486eac35fc994625a00e89280bdbb7" dependencies = [ - "async-lock 3.2.0", "async-task", "concurrent-queue", - "fastrand 2.0.1", - "futures-lite 2.1.0", + "fastrand", + "futures-lite", "slab", ] [[package]] name = "async-fs" -version = "1.6.0" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06" +checksum = "ebcd09b382f40fcd159c2d695175b2ae620ffa5f3bd6f664131efff4e8b9e04a" dependencies = [ - "async-lock 2.8.0", - "autocfg", + "async-lock", "blocking", - "futures-lite 1.13.0", -] - -[[package]] -name = "async-io" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" -dependencies = [ - "async-lock 2.8.0", - "autocfg", - "cfg-if", - "concurrent-queue", - "futures-lite 1.13.0", - "log", - "parking", - "polling 2.8.0", - "rustix 0.37.27", - "slab", - "socket2", - "waker-fn", + "futures-lite", ] [[package]] name = "async-io" -version = "2.2.2" +version = "2.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6afaa937395a620e33dc6a742c593c01aced20aa376ffb0f628121198578ccc7" +checksum = "444b0228950ee6501b3568d3c93bf1176a1fdbc3b758dcd9475046d30f4dc7e8" dependencies = [ - "async-lock 3.2.0", + "async-lock", "cfg-if", "concurrent-queue", "futures-io", - "futures-lite 2.1.0", + "futures-lite", "parking", - "polling 3.3.1", - "rustix 0.38.28", + "polling", + "rustix", "slab", "tracing", - "windows-sys 0.52.0", -] - -[[package]] -name = "async-lock" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" -dependencies = [ - "event-listener 2.5.3", + "windows-sys 0.59.0", ] [[package]] name = "async-lock" -version = "3.2.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7125e42787d53db9dd54261812ef17e937c95a51e4d291373b670342fa44310c" +checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18" dependencies = [ - "event-listener 4.0.1", + "event-listener", "event-listener-strategy", "pin-project-lite", ] [[package]] name = "async-process" -version = "1.8.1" +version = "2.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88" +checksum = "a8a07789659a4d385b79b18b9127fc27e1a59e1e89117c78c5ea3b806f016374" dependencies = [ - "async-io 1.13.0", - "async-lock 2.8.0", + "async-channel", + "async-io", + "async-lock", "async-signal", + "async-task", "blocking", "cfg-if", - "event-listener 3.1.0", - "futures-lite 1.13.0", - "rustix 0.38.28", - "windows-sys 0.48.0", + "event-listener", + "futures-lite", + "rustix", + "tracing", + "windows-sys 0.59.0", ] [[package]] name = "async-recursion" -version = "1.0.5" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" +checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.77", ] [[package]] name = "async-signal" -version = "0.2.5" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5" +checksum = "637e00349800c0bdf8bfc21ebbc0b6524abea702b0da4168ac00d070d0c0b9f3" dependencies = [ - "async-io 2.2.2", - "async-lock 2.8.0", + "async-io", + "async-lock", "atomic-waker", "cfg-if", "futures-core", "futures-io", - "rustix 0.38.28", + "rustix", "signal-hook-registry", "slab", - "windows-sys 0.48.0", + "windows-sys 0.59.0", ] [[package]] name = "async-task" -version = "4.6.0" +version = "4.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1d90cd0b264dfdd8eb5bad0a2c217c1f88fa96a8573f40e7b12de23fb468f46" +checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" [[package]] name = "async-trait" -version = "0.1.75" +version = "0.1.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdf6721fb0140e4f897002dd086c06f6c27775df19cfe1fccb21181a48fd2c98" +checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.77", ] [[package]] @@ -399,30 +389,30 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] name = "autocfg" -version = "1.1.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "backtrace" -version = "0.3.69" +version = "0.3.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" dependencies = [ "addr2line", "cc", "cfg-if", "libc", - "miniz_oxide", + "miniz_oxide 0.7.4", "object", "rustc-demangle", ] [[package]] name = "base64" -version = "0.21.5" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "base91" @@ -441,42 +431,22 @@ dependencies = [ [[package]] name = "bindgen" -version = "0.64.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4243e6031260db77ede97ad86c27e501d646a27ab57b59a574f725d98ab1fb4" -dependencies = [ - "bitflags 1.3.2", - "cexpr", - "clang-sys", - "lazy_static", - "lazycell", - "peeking_take_while", - "proc-macro2", - "quote", - "regex", - "rustc-hash", - "shlex", - "syn 1.0.109", -] - -[[package]] -name = "bindgen" -version = "0.69.1" +version = "0.69.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ffcebc3849946a7170a05992aac39da343a90676ab392c51a4280981d6379c2" +checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.6.0", "cexpr", "clang-sys", + "itertools 0.12.1", "lazy_static", "lazycell", - "peeking_take_while", "proc-macro2", "quote", "regex", "rustc-hash", "shlex", - "syn 2.0.43", + "syn 2.0.77", ] [[package]] @@ -490,18 +460,18 @@ dependencies = [ [[package]] name = "bit-set" -version = "0.5.3" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" +checksum = "08807e080ed7f9d5433fa9b275196cfc35414f66a0c79d864dc51a0d825231a3" dependencies = [ "bit-vec", ] [[package]] name = "bit-vec" -version = "0.6.3" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" +checksum = "5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7" [[package]] name = "bit_field" @@ -527,9 +497,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" [[package]] name = "bitreader" @@ -556,19 +526,25 @@ dependencies = [ ] [[package]] +name = "block2" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c132eebf10f5cad5289222520a4a058514204aed6d791f1cf4fe8088b82d15f" +dependencies = [ + "objc2", +] + +[[package]] name = "blocking" -version = "1.5.1" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118" +checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea" dependencies = [ "async-channel", - "async-lock 3.2.0", "async-task", - "fastrand 2.0.1", "futures-io", - "futures-lite 2.1.0", + "futures-lite", "piper", - "tracing", ] [[package]] @@ -582,15 +558,29 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.14.0" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "bytemuck" -version = "1.14.0" +version = "1.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773d90827bc3feecfb67fab12e24de0749aad83c74b9504ecde46237b5cd24e2" +dependencies = [ + "bytemuck_derive", +] + +[[package]] +name = "bytemuck_derive" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" +checksum = "0cc8b54b395f2fcfbb3d90c47b01c7f444d94d05bdeb775811dec868ac3bbc26" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.77", +] [[package]] name = "byteorder" @@ -600,17 +590,19 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.5.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" +checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" [[package]] name = "cc" -version = "1.0.79" +version = "1.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +checksum = "e9d013ecb737093c0e86b151a7b837993cf9ec6c502946cfb44bedc392421e0b" dependencies = [ "jobserver", + "libc", + "shlex", ] [[package]] @@ -635,6 +627,18 @@ 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 = "cfg_aliases" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" + +[[package]] name = "cgl" version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -645,23 +649,23 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.31" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" dependencies = [ "android-tzdata", "iana-time-zone", "js-sys", - "num-traits 0.2.17", + "num-traits 0.2.19", "wasm-bindgen", - "windows-targets 0.48.5", + "windows-targets 0.52.6", ] [[package]] name = "ciborium" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "effd91f6c78e5a4ace8a5d3c0b6bfaec9e2baaef55f3efc00e45fb2e477ee926" +checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e" dependencies = [ "ciborium-io", "ciborium-ll", @@ -670,18 +674,18 @@ dependencies = [ [[package]] name = "ciborium-io" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdf919175532b369853f5d5e20b26b43112613fd6fe7aee757e35f7a44642656" +checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757" [[package]] name = "ciborium-ll" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "defaa24ecc093c77630e6c15e17c51f5e187bf35ee514f4e2d67baaa96dae22b" +checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9" dependencies = [ "ciborium-io", - "half 1.8.2", + "half", ] [[package]] @@ -705,13 +709,13 @@ dependencies = [ [[package]] name = "clang-sys" -version = "1.6.1" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f" +checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" dependencies = [ "glob", "libc", - "libloading 0.7.4", + "libloading", ] [[package]] @@ -731,41 +735,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" [[package]] -name = "com" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e17887fd17353b65b1b2ef1c526c83e26cd72e74f598a8dc1bee13a48f3d9f6" -dependencies = [ - "com_macros", -] - -[[package]] -name = "com_macros" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d375883580a668c7481ea6631fc1a8863e33cc335bf56bfad8d7e6d4b04b13a5" -dependencies = [ - "com_macros_support", - "proc-macro2", - "syn 1.0.109", -] - -[[package]] -name = "com_macros_support" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad899a1087a9296d5644792d7cb72b8e34c1bec8e7d4fbc002230169a6e8710c" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] name = "combine" -version = "4.6.6" +version = "4.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4" +checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" dependencies = [ "bytes", "memchr", @@ -773,24 +746,24 @@ dependencies = [ [[package]] name = "concurrent-queue" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" dependencies = [ "crossbeam-utils", ] [[package]] name = "console" -version = "0.15.7" +version = "0.15.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8" +checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb" dependencies = [ "encode_unicode", "lazy_static", "libc", "unicode-width", - "windows-sys 0.45.0", + "windows-sys 0.52.0", ] [[package]] @@ -811,9 +784,9 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.6" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "core-graphics-types" @@ -839,36 +812,34 @@ dependencies = [ [[package]] name = "coreaudio-sys" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3120ebb80a9de008e638ad833d4127d50ea3d3a960ea23ea69bc66d9358a028" +checksum = "7f01585027057ff5f0a5bf276174ae4c1594a2c5bde93d5f46a016d76270f5a9" dependencies = [ - "bindgen 0.69.1", + "bindgen", ] [[package]] name = "cpal" -version = "0.15.2" +version = "0.15.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d959d90e938c5493000514b446987c07aed46c668faaa7d34d6c7a67b1a578c" +checksum = "873dab07c8f743075e57f524c583985fbaf745602acbe916a01539364369a779" dependencies = [ "alsa", "core-foundation-sys", "coreaudio-rs", "dasp_sample", - "jni 0.19.0", + "jni", "js-sys", "libc", "mach2", - "ndk 0.7.0", + "ndk 0.8.0", "ndk-context", "oboe", - "once_cell", - "parking_lot", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "windows 0.46.0", + "windows 0.54.0", ] [[package]] @@ -891,7 +862,7 @@ dependencies = [ "lazy_static", "proc-macro2", "regex", - "syn 2.0.43", + "syn 2.0.77", "unicode-xid", ] @@ -903,7 +874,7 @@ checksum = "3e1a2532e4ed4ea13031c13bc7bc0dbca4aae32df48e9d77f0d1e743179f2ea1" dependencies = [ "lazy_static", "proc-macro2", - "syn 2.0.43", + "syn 2.0.77", ] [[package]] @@ -918,34 +889,33 @@ dependencies = [ "lazy_static", "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.77", ] [[package]] name = "cpufeatures" -version = "0.2.11" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" +checksum = "51e852e6dc9a5bed1fae92dd2375037bf2b768725bf3be87811edee3249d09ad" dependencies = [ "libc", ] [[package]] name = "crc32fast" -version = "1.3.2" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" dependencies = [ "cfg-if", ] [[package]] name = "crossbeam" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6eb9105919ca8e40d437fc9cbb8f1975d916f1bd28afe795a48aae32a2cc8920" +checksum = "1137cd7e7fc0fb5d3c5a8678be38ec56e819125d8d7907411fe24ccb943faca8" dependencies = [ - "cfg-if", "crossbeam-channel", "crossbeam-deque", "crossbeam-epoch", @@ -955,54 +925,46 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.10" +version = "0.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82a9b73a36529d9c47029b9fb3a6f0ea3cc916a261195352ba19e770fc1748b2" +checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" dependencies = [ - "cfg-if", "crossbeam-utils", ] [[package]] name = "crossbeam-deque" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fca89a0e215bab21874660c67903c5f143333cab1da83d041c7ded6053774751" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" dependencies = [ - "cfg-if", "crossbeam-epoch", "crossbeam-utils", ] [[package]] name = "crossbeam-epoch" -version = "0.9.17" +version = "0.9.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e3681d554572a651dda4186cd47240627c3d0114d45a95f6ad27f2f22e7548d" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" dependencies = [ - "autocfg", - "cfg-if", "crossbeam-utils", ] [[package]] name = "crossbeam-queue" -version = "0.3.10" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adc6598521bb5a83d491e8c1fe51db7296019d2ca3cb93cc6c2a20369a4d78a2" +checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35" dependencies = [ - "cfg-if", "crossbeam-utils", ] [[package]] name = "crossbeam-utils" -version = "0.8.18" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3a430a770ebd84726f584a90ee7f020d28db52c6d02138900f22341f866d39c" -dependencies = [ - "cfg-if", -] +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" [[package]] name = "crunchy" @@ -1022,9 +984,9 @@ dependencies = [ [[package]] name = "cstr" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8aa998c33a6d3271e3678950a22134cd7dd27cef86dee1b611b5b14207d1d90b" +checksum = "68523903c8ae5aacfa32a0d9ae60cadeb764e1da14ee0d26b1f3089f13a54636" dependencies = [ "proc-macro2", "quote", @@ -1058,7 +1020,7 @@ source = "git+https://github.com/rust-cv/cv.git?rev=82a25ee#82a25ee3a88c12002741 dependencies = [ "derive_more", "nalgebra 0.30.1", - "num-traits 0.2.17", + "num-traits 0.2.19", "sample-consensus", ] @@ -1071,17 +1033,7 @@ dependencies = [ "derive_more", "float-ord", "nalgebra 0.30.1", - "num-traits 0.2.17", -] - -[[package]] -name = "d3d12" -version = "0.7.0" -source = "git+https://github.com/gfx-rs/wgpu.git?rev=d7296ac#d7296ac30b7948d6d111ffe201d7c47c246d16cd" -dependencies = [ - "bitflags 2.4.1", - "libloading 0.8.1", - "winapi", + "num-traits 0.2.19", ] [[package]] @@ -1091,7 +1043,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ "cfg-if", - "hashbrown 0.14.3", + "hashbrown 0.14.5", "lock_api", "once_cell", "parking_lot_core", @@ -1105,35 +1057,24 @@ checksum = "0c87e182de0887fd5361989c677c4e8f5000cd9491d6d563161a8f3a5519fc7f" [[package]] name = "deranged" -version = "0.3.10" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eb30d70a07a3b04884d2677f06bec33509dc67ca60d92949e5535352d3191dc" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" dependencies = [ "powerfmt", ] [[package]] -name = "derivative" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] name = "derive_more" -version = "0.99.17" +version = "0.99.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" +checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce" dependencies = [ "convert_case", "proc-macro2", "quote", "rustc_version", - "syn 1.0.109", + "syn 2.0.77", ] [[package]] @@ -1147,60 +1088,37 @@ dependencies = [ ] [[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-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 = "dispatch" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" [[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.43", -] - -[[package]] name = "doc-comment" version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" [[package]] +name = "document-features" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb6969eaabd2421f8a2775cfd2471a2b634372b4a25d41e3bd647b79912850a0" +dependencies = [ + "litrs", +] + +[[package]] name = "dunce" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" +checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813" [[package]] name = "dyn-clone" -version = "1.0.16" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "545b22097d44f8a9581187cdf93de7a71e4722bf51200cfaba810865b49a495d" +checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125" [[package]] name = "eight-point" @@ -1212,14 +1130,14 @@ dependencies = [ "cv-pinhole", "derive_more", "float-ord", - "num-traits 0.2.17", + "num-traits 0.2.19", ] [[package]] name = "either" -version = "1.9.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "encode_unicode" @@ -1228,13 +1146,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" [[package]] +name = "endi" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3d8a32ae18130a3c84dd492d4215c3d913c3b07c6b63c2eb3eb7ff1101ab7bf" + +[[package]] name = "enterpolation" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1fadf5c8cbf7c6765ff05ccbd8811cd7bc3a763e4671755204552bf8740d042a" dependencies = [ "assert_float_eq", - "num-traits 0.2.17", + "num-traits 0.2.19", "serde", "topology-traits", ] @@ -1274,9 +1198,9 @@ dependencies = [ [[package]] name = "enumflags2" -version = "0.7.8" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5998b4f30320c9d93aed72f63af821bfdac50465b75428fce77b48ec482c3939" +checksum = "d232db7f5956f3f14313dc2f87985c58bd2c695ce124c8cdd984e08e15ac133d" dependencies = [ "enumflags2_derive", "serde", @@ -1284,24 +1208,13 @@ dependencies = [ [[package]] name = "enumflags2_derive" -version = "0.7.8" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f95e2801cd355d4a1a3e3953ce6ee5ae9603a5c833455343a8bfe3f44d418246" +checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.43", -] - -[[package]] -name = "enumn" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2ad8cef1d801a4686bfd8919f0b30eac4c8e48968c437a6405ded4fb5272d2b" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.43", + "syn 2.0.77", ] [[package]] @@ -1312,9 +1225,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" dependencies = [ "libc", "windows-sys 0.52.0", @@ -1322,26 +1235,9 @@ dependencies = [ [[package]] name = "event-listener" -version = "2.5.3" +version = "5.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" - -[[package]] -name = "event-listener" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d93877bcde0eb80ca09131a08d23f0a5c18a620b01db137dba666d18cd9b30c2" -dependencies = [ - "concurrent-queue", - "parking", - "pin-project-lite", -] - -[[package]] -name = "event-listener" -version = "4.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84f2cdcf274580f2d63697192d744727b3198894b1bf02923643bf59e2c26712" +checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba" dependencies = [ "concurrent-queue", "parking", @@ -1350,25 +1246,25 @@ dependencies = [ [[package]] name = "event-listener-strategy" -version = "0.4.0" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" +checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" dependencies = [ - "event-listener 4.0.1", + "event-listener", "pin-project-lite", ] [[package]] name = "exr" -version = "1.6.4" +version = "1.72.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "279d3efcc55e19917fff7ab3ddd6c14afb6a90881a0078465196fe2f99d08c56" +checksum = "887d93f60543e9a9362ef8a21beedd0a833c5d9610e18c67abe15a5963dcb1a4" dependencies = [ "bit_field", "flume", - "half 2.3.1", + "half", "lebe", - "miniz_oxide", + "miniz_oxide 0.7.4", "rayon-core", "smallvec", "zune-inflate", @@ -1385,60 +1281,40 @@ dependencies = [ [[package]] name = "fastrand" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" -dependencies = [ - "instant", -] - -[[package]] -name = "fastrand" -version = "2.0.1" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" +checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" [[package]] name = "fc-blackbox" version = "0.2.0" -source = "git+https://github.com/AdrianEddy/fc-blackbox.git?rev=4e9e4e6#4e9e4e6c95e7bb98efc5e0186bd37937755e450f" +source = "git+https://github.com/ilya-epifanov/fc-blackbox.git?rev=de08350#de08350b2bd95f7af93b1b4adf0f27dc3dfd227a" dependencies = [ "chrono", "integer-encoding", "itertools 0.10.5", "nom", "num-rational", - "num-traits 0.2.17", + "num-traits 0.2.19", "thiserror", ] [[package]] -name = "fdeflate" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64d6dafc854908ff5da46ff3f8f473c6984119a2876a383a860246dd7841a868" -dependencies = [ - "simd-adler32", -] - -[[package]] name = "ffmpeg-next" -version = "6.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f45d337871329d85f5aad1e3d7b09d033cd611d50f734fd6464c731fe7c769bf" +version = "7.0.4" +source = "git+https://github.com/AdrianEddy/rust-ffmpeg#79564c6b9e6286b690635b499f1c5b3c7908230c" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", "ffmpeg-sys-next", "libc", ] [[package]] name = "ffmpeg-sys-next" -version = "6.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2529ad916d08c3562c754c21bc9b17a26c7882c0f5706cc2cd69472175f1620" +version = "7.0.2" +source = "git+https://github.com/AdrianEddy/rust-ffmpeg-sys.git#09e510214af403c9dea599f341fe3e6d648475c8" dependencies = [ - "bindgen 0.64.0", + "bindgen", "cc", "libc", "num_cpus", @@ -1448,25 +1324,25 @@ dependencies = [ [[package]] name = "filetime" -version = "0.2.23" +version = "0.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" +checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586" dependencies = [ "cfg-if", "libc", - "redox_syscall", - "windows-sys 0.52.0", + "libredox", + "windows-sys 0.59.0", ] [[package]] name = "filetime_creation" -version = "0.1.6" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3aea213d5ab4e6cd49f50c0688a4e20e5b75ff3bc07ff63f814778bd9b1dd42d" +checksum = "c25b5d475550e559de5b0c0084761c65325444e3b6c9e298af9cefe7a9ef3a5f" dependencies = [ "cfg-if", "filetime", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -1477,12 +1353,12 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flate2" -version = "1.0.28" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253" dependencies = [ "crc32fast", - "miniz_oxide", + "miniz_oxide 0.8.0", ] [[package]] @@ -1493,14 +1369,10 @@ checksum = "8ce81f49ae8a0482e4c55ea62ebbd7e5a686af544c00b9d090bba3ff9be97b3d" [[package]] name = "flume" -version = "0.10.14" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1657b4441c3403d9f7b3409e47575237dac27b1b5726df654a6ecbf92f0f7577" +checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" dependencies = [ - "futures-core", - "futures-sink", - "nanorand", - "pin-project", "spin", ] @@ -1522,7 +1394,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.77", ] [[package]] @@ -1571,26 +1443,11 @@ checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" [[package]] name = "futures-lite" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" -dependencies = [ - "fastrand 1.9.0", - "futures-core", - "futures-io", - "memchr", - "parking", - "pin-project-lite", - "waker-fn", -] - -[[package]] -name = "futures-lite" -version = "2.1.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aeee267a1883f7ebef3700f262d2d54de95dfaf38189015a74fdc4e0c7ad8143" +checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" dependencies = [ - "fastrand 2.0.1", + "fastrand", "futures-core", "futures-io", "parking", @@ -1637,32 +1494,20 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.11" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", - "js-sys", "libc", "wasi", - "wasm-bindgen", -] - -[[package]] -name = "gif" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80792593675e051cf94a4b111980da2ba60d4a83e43e0048c5693baab3977045" -dependencies = [ - "color_quant", - "weezl", ] [[package]] name = "gimli" -version = "0.28.1" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" +checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" [[package]] name = "gl_generator" @@ -1677,9 +1522,9 @@ dependencies = [ [[package]] name = "glam" -version = "0.24.2" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5418c17512bdf42730f9032c74e1ae39afc408745ebb2acf72fbc4691c17945" +checksum = "151665d9be52f9bb40fc7966565d39666f2d1e69233571b71b87791c7e0528b3" dependencies = [ "libm 0.2.8", ] @@ -1692,8 +1537,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "glow" -version = "0.13.0" -source = "git+https://github.com/grovesNL/glow.git?rev=29ff917a2b2ff7ce0a81b2cc5681de6d4735b36e#29ff917a2b2ff7ce0a81b2cc5681de6d4735b36e" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f865cbd94bd355b89611211e49508da98a1fce0ad755c1e8448fb96711b24528" dependencies = [ "js-sys", "slotmap", @@ -1703,9 +1549,9 @@ dependencies = [ [[package]] name = "glutin_wgl_sys" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8098adac955faa2d31079b65dc48841251f69efd3ac25477903fc424362ead" +checksum = "0a4e1951bbd9434a81aa496fe59ccc2235af3820d27b85f9314e279609211e2c" dependencies = [ "gl_generator", ] @@ -1716,7 +1562,7 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fbcd2dba93594b227a1f57ee09b8b9da8892c34d55aa332e034a228d0fe6a171" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.6.0", "gpu-alloc-types", ] @@ -1726,41 +1572,39 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "98ff03b468aa837d70984d55f5d3f846f6ec31fe34bbb97c4f85219caeee1ca4" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.6.0", ] [[package]] name = "gpu-allocator" -version = "0.24.0" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53d79e648296d0cf46c494e594763b6b362c4567e447177bc82750c733398b2a" +checksum = "c151a2a5ef800297b4e79efa4f4bec035c5f51d5ae587287c9b952bdf734cacd" dependencies = [ - "backtrace", "log", "presser", "thiserror", - "winapi", - "windows 0.51.1", + "windows 0.58.0", ] [[package]] name = "gpu-descriptor" -version = "0.2.4" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc11df1ace8e7e564511f53af41f3e42ddc95b56fd07b3f4445d2a6048bc682c" +checksum = "9c08c1f623a8d0b722b8b99f821eb0ba672a1618f0d3b16ddbee1cedd2dd8557" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.6.0", "gpu-descriptor-types", - "hashbrown 0.14.3", + "hashbrown 0.14.5", ] [[package]] name = "gpu-descriptor-types" -version = "0.1.2" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bf0b36e6f090b7e1d8a4b49c0cb81c1f8376f72198c65dd3ad9ff3556b8b78c" +checksum = "fdf242682df893b86f33a73828fb09ca4b2d3bb6cc95249707fc684d27484b91" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.6.0", ] [[package]] @@ -1771,13 +1615,13 @@ dependencies = [ "breakpad-sys", "bytemuck", "cc", + "chrono", "core-foundation-sys", "cpp", "cpp_build", "crc32fast", "cstr", - "directories", - "fastrand 2.0.1", + "fastrand", "ffmpeg-next", "filetime_creation", "flate2", @@ -1785,8 +1629,8 @@ dependencies = [ "gyroflow-core", "human-sort", "indicatif", - "itertools 0.12.0", - "jni 0.21.1", + "itertools 0.13.0", + "jni", "keep-awake", "lazy_static", "log", @@ -1794,10 +1638,10 @@ dependencies = [ "lru", "metal", "mp4-merge", - "nalgebra 0.32.3", - "ndk 0.8.0", + "nalgebra 0.32.6", + "ndk 0.9.0", "ndk-context", - "ndk-sys 0.5.0+25.2.9519653", + "ndk-sys 0.6.0+11769913", "oslog", "parking_lot", "pollster", @@ -1814,11 +1658,13 @@ dependencies = [ "simplelog", "system_shutdown", "tar", + "test-case", + "trash", "ureq", "url", "walkdir", "whoami", - "windows 0.52.0", + "windows 0.58.0", "winres", ] @@ -1828,13 +1674,16 @@ version = "1.5.4" dependencies = [ "ahrs", "akaze", + "app_dirs2", + "argmin", + "argmin-math", "arrsac", "ash", "base91", "bincode", "biquad", "bitarray", - "bitflags 2.4.1", + "bitflags 2.6.0", "bytemuck", "byteorder", "ciborium", @@ -1842,33 +1691,30 @@ dependencies = [ "crc32fast", "cv-core", "cv-pinhole", - "d3d12", "dyn-clone", "eight-point", "enterpolation", "enum_delegate", - "fastrand 2.0.1", + "exr", + "fastrand", "flate2", "futures-intrusive", - "half 2.3.1", + "half", "image", - "include_dir", - "itertools 0.12.0", - "jni 0.21.1", + "itertools 0.13.0", + "jni", "lazy_static", "libc", - "libloading 0.8.1", + "libloading", "line_drawing", "log", "lru", "metal", "mimalloc", - "naga", - "nalgebra 0.32.3", - "ndk 0.8.0", + "nalgebra 0.32.6", + "ndk 0.9.0", "ndk-context", - "ndk-sys 0.5.0+25.2.9519653", - "nt-hive", + "ndk-sys 0.6.0+11769913", "num", "objc-foundation", "ocl", @@ -1888,7 +1734,6 @@ dependencies = [ "simple-easing", "space", "stabilize_spirv", - "tar", "telemetry-parser", "thiserror", "time", @@ -1897,24 +1742,14 @@ dependencies = [ "urlencoding", "walkdir", "wgpu", - "wgpu-core", - "wgpu-hal", - "wgpu-types", - "winapi", - "windows 0.52.0", + "windows 0.58.0", ] [[package]] name = "half" -version = "1.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" - -[[package]] -name = "half" -version = "2.3.1" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc52e53916c08643f1b56ec082790d1e86a32e58dc5268f897f313fbae7b4872" +checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888" dependencies = [ "cfg-if", "crunchy", @@ -1937,34 +1772,25 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.14.3" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" dependencies = [ "ahash", "allocator-api2", ] [[package]] -name = "hassle-rs" -version = "0.11.0" +name = "hermit-abi" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af2a7e73e1f34c48da31fb668a907f250794837e08faa144fd24f0b8b741e890" -dependencies = [ - "bitflags 2.4.1", - "com", - "libc", - "libloading 0.8.1", - "thiserror", - "widestring", - "winapi", -] +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" [[package]] name = "hermit-abi" -version = "0.3.3" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" +checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" [[package]] name = "hex" @@ -1986,16 +1812,16 @@ checksum = "140a09c9305e6d5e557e2ed7cbc68e05765a7d4213975b87cb04920689cc6219" [[package]] name = "iana-time-zone" -version = "0.1.58" +version = "0.1.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows-core 0.51.1", + "windows-core 0.52.0", ] [[package]] @@ -2019,58 +1845,31 @@ dependencies = [ [[package]] name = "image" -version = "0.24.7" +version = "0.24.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f3dfdbdd72063086ff443e297b61695500514b1e41095b6fb9a5ab48a70a711" +checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d" dependencies = [ "bytemuck", "byteorder", "color_quant", - "exr", - "gif", - "jpeg-decoder", - "num-rational", - "num-traits 0.2.17", - "png", - "qoi", - "tiff", -] - -[[package]] -name = "include_dir" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18762faeff7122e89e0857b02f7ce6fcc0d101d5e9ad2ad7846cc01d61b7f19e" -dependencies = [ - "glob", - "include_dir_macros", -] - -[[package]] -name = "include_dir_macros" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b139284b5cf57ecfa712bcc66950bb635b31aff41c188e8a4cfc758eca374a3f" -dependencies = [ - "proc-macro2", - "quote", + "num-traits 0.2.19", ] [[package]] name = "indexmap" -version = "2.1.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" +checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5" dependencies = [ "equivalent", - "hashbrown 0.14.3", + "hashbrown 0.14.5", ] [[package]] name = "indicatif" -version = "0.17.7" +version = "0.17.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb28741c9db9a713d93deb3bb9515c20788cef5815265bee4980e87bde7e0f25" +checksum = "763a5a8f45087d6bcea4222e7b72c291a054edf80e4ef6efd2a4979878c7bea3" dependencies = [ "console", "instant", @@ -2081,9 +1880,9 @@ dependencies = [ [[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", ] @@ -2095,17 +1894,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8bb03732005da905c88227371639bf1ad885cc712789c011c31c5fb3ab3ccf02" [[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 0.48.0", -] - -[[package]] name = "itertools" version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2116,55 +1904,27 @@ dependencies = [ [[package]] name = "itertools" -version = "0.11.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" dependencies = [ "either", ] [[package]] name = "itertools" -version = "0.12.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25db6b064527c5d482d0423354fcd07a89a2dfe07b67892e62411946db7f07b0" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" dependencies = [ "either", ] [[package]] name = "itoa" -version = "1.0.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" - -[[package]] -name = "jni" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6df18c2e3db7e453d3c6ac5b3e9d5182664d28788126d39b91f2d1e22b017ec" -dependencies = [ - "cesu8", - "combine", - "jni-sys", - "log", - "thiserror", - "walkdir", -] - -[[package]] -name = "jni" -version = "0.20.0" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "039022cdf4d7b1cf548d31f60ae783138e5fd42013f6271049d7df7afadef96c" -dependencies = [ - "cesu8", - "combine", - "jni-sys", - "log", - "thiserror", - "walkdir", -] +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "jni" @@ -2190,27 +1950,18 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" [[package]] name = "jobserver" -version = "0.1.26" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" +checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" dependencies = [ "libc", ] [[package]] -name = "jpeg-decoder" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e" -dependencies = [ - "rayon", -] - -[[package]] name = "js-sys" -version = "0.3.66" +version = "0.3.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca" +checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" dependencies = [ "wasm-bindgen", ] @@ -2218,17 +1969,17 @@ dependencies = [ [[package]] name = "keep-awake" version = "0.1.0" -source = "git+https://github.com/AdrianEddy/keep-awake-rs.git?rev=1b5eaad#1b5eaadbc1b3e1d6c48397b9d17bb7db75950e05" +source = "git+https://github.com/AdrianEddy/keep-awake-rs.git?rev=04ce779#04ce779150814c1505b75659d883f1fdb28b2abd" dependencies = [ "core-foundation", "dispatch", - "jni 0.21.1", + "jni", "libc", "log", "mach", "ndk-context", "objc", - "windows 0.52.0", + "windows 0.58.0", "zbus", ] @@ -2239,7 +1990,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6aae1df220ece3c0ada96b8153459b67eebe9ae9212258bb0134ae60416fdf76" dependencies = [ "libc", - "libloading 0.8.1", + "libloading", "pkg-config", ] @@ -2251,9 +2002,9 @@ checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc" [[package]] name = "lazy_static" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "lazycell" @@ -2280,28 +2031,18 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.151" +version = "0.2.158" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4" - -[[package]] -name = "libloading" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" -dependencies = [ - "cfg-if", - "winapi", -] +checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" [[package]] name = "libloading" -version = "0.8.1" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161" +checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" dependencies = [ "cfg-if", - "windows-sys 0.48.0", + "windows-targets 0.52.6", ] [[package]] @@ -2318,9 +2059,9 @@ checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" [[package]] name = "libmimalloc-sys" -version = "0.1.35" +version = "0.1.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3979b5c37ece694f1f5e51e7ecc871fdb0f517ed04ee45f88d15d6d553cb9664" +checksum = "23aa6811d3bd4deb8a84dde645f943476d13b248d818edcf8ce0b2f37f036b44" dependencies = [ "cc", "libc", @@ -2328,11 +2069,11 @@ dependencies = [ [[package]] name = "libredox" -version = "0.0.1" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.6.0", "libc", "redox_syscall", ] @@ -2343,26 +2084,26 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d1478a313008a3e6c8149995e90a99ee9094034b5c5c3da1eeb81183cb61d1d" dependencies = [ - "num-traits 0.2.17", + "num-traits 0.2.19", ] [[package]] name = "linux-raw-sys" -version = "0.3.8" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] -name = "linux-raw-sys" -version = "0.4.12" +name = "litrs" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" +checksum = "b4ce301924b7887e9d637144fdade93f9dfff9b60981d4ac161db09720d39aa5" [[package]] name = "lock_api" -version = "0.4.11" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" dependencies = [ "autocfg", "scopeguard", @@ -2370,9 +2111,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.20" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "log-panics" @@ -2386,11 +2127,11 @@ dependencies = [ [[package]] name = "lru" -version = "0.12.1" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2994eeba8ed550fd9b47a0b38f0242bc3344e496483c6180b69139cc2fa5d1d7" +checksum = "37ee39891760e7d94734f6f63fedc29a2e4a152f836120753a72503f09fcf904" dependencies = [ - "hashbrown 0.14.3", + "hashbrown 0.14.5", ] [[package]] @@ -2422,9 +2163,9 @@ dependencies = [ [[package]] name = "matrixmultiply" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7574c1cf36da4798ab73da5b215bbf444f50718207754cb522201d78d1cd0ff2" +checksum = "9380b911e3e96d10c1f415da0876389aaf1b56759054eeb0de7df940c456ba1a" dependencies = [ "autocfg", "rawpointer", @@ -2432,44 +2173,26 @@ dependencies = [ [[package]] name = "memchr" -version = "2.6.4" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "memoffset" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" -dependencies = [ - "autocfg", -] - -[[package]] -name = "memoffset" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" -dependencies = [ - "autocfg", -] - -[[package]] -name = "memoffset" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" dependencies = [ "autocfg", ] [[package]] name = "metal" -version = "0.27.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c43f73953f8cbe511f021b58f18c3ce1c3d1ae13fe953293e13345bf83217f25" +checksum = "7ecfd3296f8c56b7c1f6fbac3c71cefa9d78ce009850c45000015f206dc7fa21" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.6.0", "block", "core-graphics-types", "foreign-types", @@ -2480,9 +2203,9 @@ dependencies = [ [[package]] name = "mimalloc" -version = "0.1.39" +version = "0.1.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa01922b5ea280a911e323e4d2fd24b7fe5cc4042e0d2cda3c40775cdc4bdc9c" +checksum = "68914350ae34959d83f732418d51e2427a794055d0b9529f48259ac07af65633" dependencies = [ "libmimalloc-sys", ] @@ -2495,50 +2218,59 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.7.1" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" dependencies = [ "adler", - "simd-adler32", +] + +[[package]] +name = "miniz_oxide" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" +dependencies = [ + "adler2", ] [[package]] name = "mp4-merge" -version = "0.1.6" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c86d5d99a15116fce87baea15314b7d455a3c9689382f6bb36092c11c0a4db7" +checksum = "d7864f64a27881e7c07c39b17477af1f1bbed717fb99166bc626b03d22c2e8f4" dependencies = [ "byteorder", + "filetime_creation", "log", ] [[package]] name = "mp4parse" version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63a35203d3c6ce92d5251c77520acb2e57108c88728695aa883f70023624c570" +source = "git+https://github.com/AdrianEddy/mp4parse-rust.git#2f1b4a5a0c86155a7c4d1c12ca347cd33a5b2b24" dependencies = [ "bitreader", "byteorder", "fallible_collections", "log", - "num-traits 0.2.17", + "num-traits 0.2.19", "static_assertions", ] [[package]] name = "naga" -version = "0.14.2" -source = "git+https://github.com/gfx-rs/wgpu.git?rev=d7296ac#d7296ac30b7948d6d111ffe201d7c47c246d16cd" +version = "22.0.0" +source = "git+https://github.com/gfx-rs/wgpu.git?rev=ee35b0e#ee35b0e5866795d3fdd8307b1fa67018cf5cdd09" dependencies = [ + "arrayvec", "bit-set", - "bitflags 2.4.1", + "bitflags 2.6.0", + "cfg_aliases 0.1.1", "codespan-reporting", "hexf-parse", "indexmap", "log", - "num-traits 0.2.17", "petgraph", "rustc-hash", "spirv", @@ -2557,23 +2289,23 @@ dependencies = [ "matrixmultiply", "num-complex", "num-rational", - "num-traits 0.2.17", + "num-traits 0.2.19", "simba 0.7.3", "typenum", ] [[package]] name = "nalgebra" -version = "0.32.3" +version = "0.32.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "307ed9b18cc2423f29e83f84fd23a8e73628727990181f18641a8b5dc2ab1caa" +checksum = "7b5c17de023a86f59ed79891b2e5d5a94c705dbe904a5b5c9c952ea6221b03e4" dependencies = [ "approx", "matrixmultiply", "nalgebra-macros", "num-complex", "num-rational", - "num-traits 0.2.17", + "num-traits 0.2.19", "serde", "simba 0.8.1", "typenum", @@ -2581,22 +2313,13 @@ dependencies = [ [[package]] name = "nalgebra-macros" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91761aed67d03ad966ef783ae962ef9bbaca728d2dd7ceb7939ec110fffad998" +checksum = "254a5372af8fc138e36684761d3c0cdb758a4410e938babcff1c860ce14ddbfc" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", -] - -[[package]] -name = "nanorand" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3" -dependencies = [ - "getrandom", + "syn 2.0.77", ] [[package]] @@ -2608,36 +2331,36 @@ dependencies = [ "matrixmultiply", "num-complex", "num-integer", - "num-traits 0.2.17", + "num-traits 0.2.19", "rawpointer", ] [[package]] name = "ndk" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "451422b7e4718271c8b5b3aadf5adedba43dc76312454b387e98fae0fc951aa0" +checksum = "2076a31b7010b17a38c01907c45b945e8f11495ee4dd588309718901b1f7a5b7" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", "jni-sys", - "ndk-sys 0.4.1+23.1.7779620", - "num_enum 0.5.11", - "raw-window-handle 0.5.2", + "log", + "ndk-sys 0.5.0+25.2.9519653", + "num_enum", "thiserror", ] [[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.4.1", + "bitflags 2.6.0", "jni-sys", "log", - "ndk-sys 0.5.0+25.2.9519653", - "num_enum 0.7.1", - "raw-window-handle 0.6.0", + "ndk-sys 0.6.0+11769913", + "num_enum", + "raw-window-handle", "thiserror", ] @@ -2649,15 +2372,6 @@ checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" [[package]] name = "ndk-sys" -version = "0.4.1+23.1.7779620" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cf2aae958bd232cac5069850591667ad422d263686d75b52a065f9badeee5a3" -dependencies = [ - "jni-sys", -] - -[[package]] -name = "ndk-sys" version = "0.5.0+25.2.9519653" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8c196769dd60fd4f363e11d948139556a344e79d451aeb2fa2fd040738ef7691" @@ -2666,26 +2380,25 @@ dependencies = [ ] [[package]] -name = "nix" -version = "0.24.3" +name = "ndk-sys" +version = "0.6.0+11769913" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" +checksum = "ee6cda3051665f1fb8d9e08fc35c96d5a244fb1be711a03b71118828afc9a873" dependencies = [ - "bitflags 1.3.2", - "cfg-if", - "libc", + "jni-sys", ] [[package]] name = "nix" -version = "0.26.4" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" +checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", "cfg-if", + "cfg_aliases 0.2.1", "libc", - "memoffset 0.7.1", + "memoffset", ] [[package]] @@ -2714,96 +2427,85 @@ dependencies = [ ] [[package]] -name = "nt-hive" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d397d4a4328ae4ae705968cb21215adef115062e8f9513e7116355159f6dd9ca" -dependencies = [ - "bitflags 1.3.2", - "byteorder", - "displaydoc", - "enumn", - "memoffset 0.6.5", - "zerocopy 0.6.6", -] - -[[package]] name = "num" -version = "0.4.1" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b05180d69e3da0e530ba2a1dae5110317e49e3b7f3d41be227dc5f92e49ee7af" +checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23" dependencies = [ "num-bigint", "num-complex", "num-integer", "num-iter", "num-rational", - "num-traits 0.2.17", + "num-traits 0.2.19", ] [[package]] name = "num-bigint" -version = "0.4.4" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" dependencies = [ - "autocfg", "num-integer", - "num-traits 0.2.17", + "num-traits 0.2.19", ] [[package]] name = "num-complex" -version = "0.4.4" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214" +checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495" dependencies = [ - "num-traits 0.2.17", + "num-traits 0.2.19", "serde", ] [[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + +[[package]] name = "num-derive" -version = "0.3.3" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" +checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.77", ] [[package]] name = "num-integer" -version = "0.1.45" +version = "0.1.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" dependencies = [ - "autocfg", - "num-traits 0.2.17", + "num-traits 0.2.19", ] [[package]] name = "num-iter" -version = "0.1.43" +version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" +checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" dependencies = [ "autocfg", "num-integer", - "num-traits 0.2.17", + "num-traits 0.2.19", ] [[package]] name = "num-rational" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" +checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824" dependencies = [ - "autocfg", "num-bigint", "num-integer", - "num-traits 0.2.17", + "num-traits 0.2.19", ] [[package]] @@ -2812,14 +2514,14 @@ version = "0.1.43" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31" dependencies = [ - "num-traits 0.2.17", + "num-traits 0.2.19", ] [[package]] name = "num-traits" -version = "0.2.17" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", "libm 0.2.8", @@ -2831,57 +2533,36 @@ version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi", + "hermit-abi 0.3.9", "libc", ] [[package]] name = "num_enum" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9" -dependencies = [ - "num_enum_derive 0.5.11", -] - -[[package]] -name = "num_enum" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "683751d591e6d81200c39fb0d1032608b77724f34114db54f571ff1317b337c0" -dependencies = [ - "num_enum_derive 0.7.1", -] - -[[package]] -name = "num_enum_derive" -version = "0.5.11" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" +checksum = "4e613fc340b2220f734a8595782c551f1250e969d87d3be1ae0579e8d4065179" dependencies = [ - "proc-macro-crate 1.3.1", - "proc-macro2", - "quote", - "syn 1.0.109", + "num_enum_derive", ] [[package]] name = "num_enum_derive" -version = "0.7.1" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c11e44798ad209ccdd91fc192f0526a369a01234f7373e1b141c96d7cee4f0e" +checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56" dependencies = [ - "proc-macro-crate 2.0.1", + "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.77", ] [[package]] name = "num_threads" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" +checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9" dependencies = [ "libc", ] @@ -2899,7 +2580,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" dependencies = [ "malloc_buf", - "objc_exception", ] [[package]] @@ -2914,12 +2594,37 @@ dependencies = [ ] [[package]] -name = "objc_exception" -version = "0.1.2" +name = "objc-sys" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310" + +[[package]] +name = "objc2" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4" +checksum = "46a785d4eeff09c14c487497c162e92766fbb3e4059a71840cecc03d9a50b804" dependencies = [ - "cc", + "objc-sys", + "objc2-encode", +] + +[[package]] +name = "objc2-encode" +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.6.0", + "block2", + "libc", + "objc2", ] [[package]] @@ -2933,45 +2638,45 @@ dependencies = [ [[package]] name = "object" -version = "0.32.2" +version = "0.36.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a" dependencies = [ "memchr", ] [[package]] name = "oboe" -version = "0.5.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8868cc237ee02e2d9618539a23a8d228b9bb3fc2e7a5b11eed3831de77c395d0" +checksum = "e8b61bebd49e5d43f5f8cc7ee2891c16e0f41ec7954d36bcb6c14c5e0de867fb" dependencies = [ - "jni 0.20.0", - "ndk 0.7.0", + "jni", + "ndk 0.8.0", "ndk-context", "num-derive", - "num-traits 0.2.17", + "num-traits 0.2.19", "oboe-sys", ] [[package]] name = "oboe-sys" -version = "0.5.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f44155e7fb718d3cfddcf70690b2b51ac4412f347cd9e4fbe511abe9cd7b5f2" +checksum = "6c8bb09a4a2b1d668170cfe0a7d5bc103f8999fb316c98099b6a9939c9f2e79d" dependencies = [ "cc", ] [[package]] name = "ocl" -version = "0.19.6" +version = "0.19.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1c3ce118fd2f00eeb3c01f8073db1ee127cac0b2f79848192c7889b2bd7fe40" +checksum = "4297afb442d411793e4e24ee5a2977d15b6c95c743418f1c0ce0a2397d7ec8a3" dependencies = [ "futures", "nodrop", - "num-traits 0.2.17", + "num-traits 0.2.19", "ocl-core", "qutex", "thiserror", @@ -2987,7 +2692,7 @@ dependencies = [ "cl-sys", "enum_primitive", "num-complex", - "num-traits 0.2.17", + "num-traits 0.2.19", "ocl-core-vector", "rustc_version", "thiserror", @@ -2999,7 +2704,7 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f562279e046ca160aeed5eaf6f7c4eb9fa56cb8fd9d038dbdbf56225caeb8074" dependencies = [ - "num-traits 0.2.17", + "num-traits 0.2.19", ] [[package]] @@ -3030,28 +2735,29 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "opencv" -version = "0.88.5" +version = "0.92.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "980aa24534b9bcfb03c259779ffcbe422e0395cf45700d6d85657734ea1d5c57" +checksum = "c01f7646f18911737aa3d721dec4a0060d044ef1224eb54a439ae6fa716ccb86" dependencies = [ "cc", "dunce", "jobserver", "libc", - "num-traits 0.2.17", + "num-traits 0.2.19", "once_cell", "opencv-binding-generator", "pkg-config", "semver", "shlex", "vcpkg", + "windows 0.58.0", ] [[package]] name = "opencv-binding-generator" -version = "0.82.0" +version = "0.90.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4ac010a66cd1e1dc457c20d467a16286cc83381307cace05357b414c06740f6" +checksum = "c238fe1b9e78bf939dfab14184464a25acaf42d634fd502dc9ccc445f5bad1b9" dependencies = [ "clang", "clang-sys", @@ -3062,12 +2768,6 @@ dependencies = [ ] [[package]] -name = "option-ext" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" - -[[package]] name = "ordered-stream" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3096,9 +2796,9 @@ checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" [[package]] name = "parking_lot" -version = "0.12.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ "lock_api", "parking_lot_core", @@ -3106,28 +2806,22 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.9" +version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", "redox_syscall", "smallvec", - "windows-targets 0.48.5", + "windows-targets 0.52.6", ] [[package]] name = "paste" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" - -[[package]] -name = "peeking_take_while" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "percent-encoding" @@ -3137,39 +2831,19 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "petgraph" -version = "0.6.4" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" +checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" dependencies = [ "fixedbitset", "indexmap", ] [[package]] -name = "pin-project" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" -dependencies = [ - "pin-project-internal", -] - -[[package]] -name = "pin-project-internal" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.43", -] - -[[package]] name = "pin-project-lite" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" [[package]] name = "pin-utils" @@ -3179,62 +2853,34 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "piper" -version = "0.2.1" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" +checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066" dependencies = [ "atomic-waker", - "fastrand 2.0.1", + "fastrand", "futures-io", ] [[package]] name = "pkg-config" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69d3587f8a9e599cc7ec2c00e331f71c4e69a5f9a4b8a6efd5b07466b9736f9a" - -[[package]] -name = "png" -version = "0.17.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd75bf2d8dd3702b9707cdbc56a5b9ef42cec752eb8b3bafc01234558442aa64" -dependencies = [ - "bitflags 1.3.2", - "crc32fast", - "fdeflate", - "flate2", - "miniz_oxide", -] +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] name = "polling" -version = "2.8.0" +version = "3.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" +checksum = "cc2790cd301dec6cd3b7a025e4815cf825724a51c98dccfe6a3e55f05ffb6511" dependencies = [ - "autocfg", - "bitflags 1.3.2", "cfg-if", "concurrent-queue", - "libc", - "log", + "hermit-abi 0.4.0", "pin-project-lite", - "windows-sys 0.48.0", -] - -[[package]] -name = "polling" -version = "3.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf63fa624ab313c11656b4cda960bfc46c410187ad493c41f6ba2d8c1e991c9e" -dependencies = [ - "cfg-if", - "concurrent-queue", - "pin-project-lite", - "rustix 0.38.28", + "rustix", "tracing", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -3245,9 +2891,9 @@ checksum = "22686f4785f02a4fcc856d3b3bb19bf6c8160d103f7a99cc258bddd0251dc7f2" [[package]] name = "portable-atomic" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" +checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265" [[package]] name = "powerfmt" @@ -3257,9 +2903,12 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" [[package]] name = "ppv-lite86" -version = "0.2.17" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +dependencies = [ + "zerocopy", +] [[package]] name = "presser" @@ -3275,9 +2924,9 @@ checksum = "bbc83ee4a840062f368f9096d80077a9841ec117e17e7f700df81958f1451254" [[package]] name = "primal" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b53cc99c892c461727618e8a63806c94b09ae13c494dc5fc70a7557b3a2f071" +checksum = "b1e5f354948532e6017fc91f9a5ff5ba1be0dabd3a0c9e9c417969cd4c1ad6e8" dependencies = [ "primal-check", "primal-estimate", @@ -3286,33 +2935,33 @@ dependencies = [ [[package]] name = "primal-bit" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ce4fe11b2a87850ca3bd5dc9c7cb9f66e32a09edab221be406ac5ff677f2241" +checksum = "252429dbb8aeacc3233df500dc3a6a367bf28eb3a711272884d7540a7b636055" dependencies = [ "hamming", ] [[package]] name = "primal-check" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9df7f93fd637f083201473dab4fee2db4c429d32e55e3299980ab3957ab916a0" +checksum = "dc0d895b311e3af9902528fbb8f928688abbd95872819320517cc24ca6b2bd08" dependencies = [ "num-integer", ] [[package]] name = "primal-estimate" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7374f14c76f23e1271e6be806981ac5dd9e52b59132b0a2f10bcc412495f9159" +checksum = "a432100a0b3a61085e75b5f89e9f42de73c0acb7dea5038b893697918105d822" [[package]] name = "primal-sieve" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f2a14766f8c543620824b5b2cec356abf2681b76966a7ac4b4ed2c0011e696a" +checksum = "8e982796d82203351983d3602a8d6372d1d7894e86960047ba0d4b7426a5edd3" dependencies = [ "primal-bit", "primal-estimate", @@ -3321,44 +2970,33 @@ dependencies = [ [[package]] name = "proc-macro-crate" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" -dependencies = [ - "once_cell", - "toml_edit 0.19.15", -] - -[[package]] -name = "proc-macro-crate" -version = "2.0.1" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97dc5fea232fc28d2f597b37c4876b348a40e33f3b02cc975c8d006d78d94b1a" +checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b" dependencies = [ - "toml_datetime", - "toml_edit 0.20.2", + "toml_edit", ] [[package]] name = "proc-macro2" -version = "1.0.71" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75cb1540fadbd5b8fbccc4dddad2734eba435053f725621c070711a14bb5f4b8" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] [[package]] name = "profiling" -version = "1.0.13" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d135ede8821cf6376eb7a64148901e1690b788c11ae94dc297ae917dbc91dc0e" +checksum = "43d84d1d7a6ac92673717f9f6d1518374ef257669c24ebc5ac25d5033828be58" [[package]] name = "prost" -version = "0.12.3" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "146c289cda302b98a28d40c8b3b90498d6e526dd24ac2ecea73e4e491685b94a" +checksum = "3b2ecbe40f08db5c006b5764a2645f7f3f141ce756412ac9e1dd6087e6d32995" dependencies = [ "bytes", "prost-derive", @@ -3366,21 +3004,21 @@ dependencies = [ [[package]] name = "prost-derive" -version = "0.12.3" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efb6c9a1dd1def8e2124d17e83a20af56f1570d6c2d2bd9e266ccb768df3840e" +checksum = "acf0c195eebb4af52c752bec4f52f645da98b6e92077a04110c7f349477ae5ac" dependencies = [ "anyhow", - "itertools 0.11.0", + "itertools 0.13.0", "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.77", ] [[package]] name = "qmetaobject" version = "0.2.10" -source = "git+https://github.com/AdrianEddy/qmetaobject-rs.git?rev=59029b9#59029b9ac71a56db5cbb99c1d0f666e648fd9656" +source = "git+https://github.com/AdrianEddy/qmetaobject-rs.git?rev=ee6f5dc#ee6f5dccbba5454a9c48f1cf68cae9553ddc1d2a" dependencies = [ "cpp", "cpp_build", @@ -3394,7 +3032,7 @@ dependencies = [ [[package]] name = "qmetaobject_impl" version = "0.2.10" -source = "git+https://github.com/AdrianEddy/qmetaobject-rs.git?rev=59029b9#59029b9ac71a56db5cbb99c1d0f666e648fd9656" +source = "git+https://github.com/AdrianEddy/qmetaobject-rs.git?rev=ee6f5dc#ee6f5dccbba5454a9c48f1cf68cae9553ddc1d2a" dependencies = [ "proc-macro2", "quote", @@ -3404,7 +3042,7 @@ dependencies = [ [[package]] name = "qml-video-rs" version = "0.1.0" -source = "git+https://github.com/AdrianEddy/qml-video-rs.git?rev=63f35bf#63f35bfe96ba846e45c2bbf985e396bf634b29da" +source = "git+https://github.com/AdrianEddy/qml-video-rs.git?rev=2a3bd8b#2a3bd8ba9bb10dd5605492f9d9cf6cb75d059ae4" dependencies = [ "cpp", "cpp_build", @@ -3415,18 +3053,9 @@ dependencies = [ ] [[package]] -name = "qoi" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f6d64c71eb498fe9eae14ce4ec935c555749aef511cca85b5568910d6e48001" -dependencies = [ - "bytemuck", -] - -[[package]] name = "qttypes" version = "0.2.11" -source = "git+https://github.com/AdrianEddy/qmetaobject-rs.git?rev=59029b9#59029b9ac71a56db5cbb99c1d0f666e648fd9656" +source = "git+https://github.com/AdrianEddy/qmetaobject-rs.git?rev=ee6f5dc#ee6f5dccbba5454a9c48f1cf68cae9553ddc1d2a" dependencies = [ "cpp", "cpp_build", @@ -3435,18 +3064,18 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.33" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" dependencies = [ "proc-macro2", ] [[package]] name = "qutex" -version = "0.2.4" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cda4a51ba3d773c196f9450a6b239077ad8dda608b15263b4c9f29e58909883f" +checksum = "11778238e7d8b0e3ca62033fdc69e01ef5cdb08809cdc2398b2ce5ec873a1757" dependencies = [ "crossbeam", "futures", @@ -3499,15 +3128,9 @@ checksum = "9c8a99fddc9f0ba0a85884b8d14e3592853e787d581ca1816c91349b10e4eeab" [[package]] name = "raw-window-handle" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" - -[[package]] -name = "raw-window-handle" -version = "0.6.0" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42a9830a0e1b9fb145ebb365b8bc4ccd75f290f98c0247deafbbe2c75cefb544" +checksum = "20675572f6f24e9e76ef639bc5552774ed45f1c30e2951e1e99c59888861c539" [[package]] name = "rawpointer" @@ -3517,9 +3140,9 @@ checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3" [[package]] name = "rayon" -version = "1.8.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" dependencies = [ "either", "rayon-core", @@ -3527,9 +3150,9 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.12.0" +version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" dependencies = [ "crossbeam-deque", "crossbeam-utils", @@ -3537,29 +3160,18 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.4.1" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" 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", + "bitflags 2.6.0", ] [[package]] name = "regex" -version = "1.10.2" +version = "1.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" dependencies = [ "aho-corasick", "memchr", @@ -3569,9 +3181,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.3" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" dependencies = [ "aho-corasick", "memchr", @@ -3580,50 +3192,52 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.2" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" [[package]] name = "renderdoc-sys" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "216080ab382b992234dda86873c18d4c48358f5cfcb70fd693d7f6f2131b628b" +checksum = "19b30a45b0cd0bcca8037f3d0dc3421eaf95327a17cad11964fb8179b4fc4832" [[package]] name = "ring" -version = "0.17.3" +version = "0.17.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9babe80d5c16becf6594aa32ad2be8fe08498e7ae60b77de8df700e67f191d7e" +checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" dependencies = [ "cc", + "cfg-if", "getrandom", "libc", "spin", "untrusted", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "rodio" -version = "0.17.3" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b1bb7b48ee48471f55da122c0044fcc7600cfcc85db88240b89cb832935e611" +checksum = "6006a627c1a38d37f3d3a85c6575418cfe34a5392d60a686d0071e1c8d427acb" dependencies = [ "cpal", "lewton", + "thiserror", ] [[package]] name = "rs-sync" version = "0.1.0" -source = "git+https://github.com/gyroflow/rs-sync.git?rev=c73bf47#c73bf478e2f6442e5935bd6314d0cfc56239f7b5" +source = "git+https://github.com/gyroflow/rs-sync.git?rev=0d22978#0d22978140ad8783dc723a128745ae42729d2a23" dependencies = [ "argmin", "argmin-math", "libm 0.2.8", "log", - "nalgebra 0.32.3", + "nalgebra 0.32.6", "rand", "rayon", "superslice", @@ -3631,9 +3245,9 @@ dependencies = [ [[package]] name = "rustc-demangle" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustc-hash" @@ -3643,22 +3257,22 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustc_version" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" dependencies = [ "semver", ] [[package]] name = "rustfft" -version = "6.1.0" +version = "6.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e17d4f6cbdb180c9f4b2a26bbf01c4e647f1e1dea22fe8eb9db54198b32f9434" +checksum = "43806561bc506d0c5d160643ad742e3161049ac01027b5e6d7524091fd401d86" dependencies = [ "num-complex", "num-integer", - "num-traits 0.2.17", + "num-traits 0.2.19", "primal-check", "strength_reduce", "transpose", @@ -3667,64 +3281,60 @@ dependencies = [ [[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 0.48.0", -] - -[[package]] -name = "rustix" -version = "0.38.28" +version = "0.38.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316" +checksum = "3f55e80d50763938498dd5ebb18647174e0c76dc38c5505294bb224624f30f36" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.6.0", "errno", "libc", - "linux-raw-sys 0.4.12", + "linux-raw-sys", "windows-sys 0.52.0", ] [[package]] name = "rustls" -version = "0.21.10" +version = "0.23.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" +checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044" dependencies = [ "log", + "once_cell", "ring", + "rustls-pki-types", "rustls-webpki", - "sct", + "subtle", + "zeroize", ] [[package]] +name = "rustls-pki-types" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0" + +[[package]] name = "rustls-webpki" -version = "0.101.7" +version = "0.102.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" +checksum = "84678086bd54edf2b415183ed7a94d0efb049f1b646a33e22a36f3794be6ae56" dependencies = [ "ring", + "rustls-pki-types", "untrusted", ] [[package]] name = "ryu" -version = "1.0.16" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "safe_arch" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f398075ce1e6a179b46f51bd88d0598b92b00d3551f1a2d4ac49e771b56ac354" +checksum = "c3460605018fdc9612bce72735cba0d27efbcd9904780d44c7e3a9948f96148a" dependencies = [ "bytemuck", ] @@ -3751,69 +3361,60 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] -name = "sct" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] name = "semver" -version = "1.0.20" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.193" +version = "1.0.209" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" +checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.193" +version = "1.0.209" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" +checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170" dependencies = [ "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.77", ] [[package]] name = "serde_json" -version = "1.0.108" +version = "1.0.128" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" +checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" dependencies = [ "indexmap", "itoa", + "memchr", "ryu", "serde", ] [[package]] name = "serde_repr" -version = "0.1.17" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3081f5ffbb02284dda55132aa26daecedd7372a42417bbbab6f14ab7d6bb9145" +checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.77", ] [[package]] name = "serde_yaml" -version = "0.9.29" +version = "0.9.34+deprecated" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a15e0ef66bf939a7c890a0bf6d5a733c70202225f9888a89ed5c62298b019129" +checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" dependencies = [ "indexmap", "itoa", @@ -3835,15 +3436,15 @@ dependencies = [ [[package]] name = "shlex" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" [[package]] name = "signal-hook-registry" -version = "1.4.1" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" dependencies = [ "libc", ] @@ -3856,7 +3457,7 @@ checksum = "2f3fd720c48c53cace224ae62bef1bbff363a70c68c4802a78b5cc6159618176" dependencies = [ "approx", "num-complex", - "num-traits 0.2.17", + "num-traits 0.2.19", "paste", "wide", ] @@ -3870,7 +3471,7 @@ dependencies = [ "approx", "libm 0.2.8", "num-complex", - "num-traits 0.2.17", + "num-traits 0.2.19", "paste", "wide", ] @@ -3889,8 +3490,9 @@ checksum = "832ddd7df0d98d6fd93b973c330b7c8e0742d5cb8f1afc7dea89dba4d2531aa1" [[package]] name = "simplelog" -version = "0.12.0" -source = "git+https://github.com/Drakulix/simplelog.rs.git?rev=4ef071d#4ef071dfd008d7729658cd5313e6d877bde272ca" +version = "0.12.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16257adbfaef1ee58b1363bdc0664c9b8e1e30aed86049635fb5f147d065a9c0" dependencies = [ "log", "termcolor", @@ -3917,19 +3519,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" - -[[package]] -name = "socket2" -version = "0.4.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" -dependencies = [ - "libc", - "winapi", -] +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "space" @@ -3938,7 +3530,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c5ab9701ae895386d13db622abf411989deff7109b13b46b6173bb4ce5c1d123" dependencies = [ "doc-comment", - "num-traits 0.2.17", + "num-traits 0.2.19", ] [[package]] @@ -3952,32 +3544,29 @@ dependencies = [ [[package]] name = "spirv" -version = "0.2.0+1.5.4" +version = "0.3.0+sdk-1.3.268.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "246bfa38fe3db3f1dfc8ca5a2cdeb7348c78be2112740cc0ec8ef18b6d94f830" +checksum = "eda41003dc44290527a59b13432d4a0379379fa074b70174882adfbdfd917844" dependencies = [ - "bitflags 1.3.2", - "num-traits 0.2.17", + "bitflags 2.6.0", ] [[package]] name = "spirv-std" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53ad6bf0206aea3e6ac6283cb88ef397239cd2d9276b8f71854d60ac2cf94e0b" +version = "0.9.0" +source = "git+https://github.com/EmbarkStudios/rust-gpu?rev=54f6978#54f6978c25b7e168ded04e720b996625b3654ebd" dependencies = [ "bitflags 1.3.2", "glam", - "num-traits 0.2.17", + "num-traits 0.2.19", "spirv-std-macros", "spirv-std-types", ] [[package]] name = "spirv-std-macros" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2058ef7585e7ef31ee7b00bdfee2e6726649d827c71070a50087598405e8b2cf" +version = "0.9.0" +source = "git+https://github.com/EmbarkStudios/rust-gpu?rev=54f6978#54f6978c25b7e168ded04e720b996625b3654ebd" dependencies = [ "proc-macro2", "quote", @@ -3987,9 +3576,8 @@ dependencies = [ [[package]] name = "spirv-std-types" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cce2183deb9e7ada727867823fb8bbbc8b56e503801a332d155dde613130e1b" +version = "0.9.0" +source = "git+https://github.com/EmbarkStudios/rust-gpu?rev=54f6978#54f6978c25b7e168ded04e720b996625b3654ebd" [[package]] name = "stabilize_spirv" @@ -4011,6 +3599,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fe895eb47f22e2ddd4dabc02bce419d2e643c8e3b585c78158b349195bc24d82" [[package]] +name = "subtle" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" + +[[package]] name = "superslice" version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4029,9 +3623,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.43" +version = "2.0.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee659fb5f3d355364e1f3e5bc10fb82068efbf824a1e9d1c9504244a6469ad53" +checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" dependencies = [ "proc-macro2", "quote", @@ -4041,17 +3635,17 @@ dependencies = [ [[package]] name = "system_shutdown" version = "4.0.1" -source = "git+https://github.com/risoflora/system_shutdown.git?rev=4d93e5e#4d93e5e8c86ab94a1b7073b09b2b5b83096a35a8" +source = "git+https://github.com/risoflora/system_shutdown.git?rev=48ac516#48ac5169d8a5ddac14d08d020c7cf0e7994e348f" dependencies = [ - "windows 0.52.0", + "windows 0.58.0", "zbus", ] [[package]] name = "tar" -version = "0.4.40" +version = "0.4.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb" +checksum = "cb797dad5fb5b76fcf519e702f4a589483b5ef06567f160c392832c1f5e44909" dependencies = [ "filetime", "libc", @@ -4060,8 +3654,8 @@ dependencies = [ [[package]] name = "telemetry-parser" -version = "0.2.8" -source = "git+https://github.com/AdrianEddy/telemetry-parser.git?rev=8920009#89200095066ce8555a24ca90d1de3663216cc1df" +version = "0.3.0" +source = "git+https://github.com/AdrianEddy/telemetry-parser.git?rev=8ec4bc9#8ec4bc9a28c0518ad393ea3a31e98c5eaede222f" dependencies = [ "argh", "byteorder", @@ -4069,7 +3663,7 @@ dependencies = [ "csv", "fc-blackbox", "human-sort", - "jni 0.21.1", + "jni", "log", "memchr", "mp4parse", @@ -4084,66 +3678,89 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.8.1" +version = "3.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" +checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" dependencies = [ "cfg-if", - "fastrand 2.0.1", - "redox_syscall", - "rustix 0.38.28", - "windows-sys 0.48.0", + "fastrand", + "once_cell", + "rustix", + "windows-sys 0.59.0", ] [[package]] name = "termcolor" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff1bc3d3f05aff0403e8ac0d92ced918ec05b666a43f83297ccef5bea8a3d449" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" dependencies = [ "winapi-util", ] [[package]] -name = "thiserror" -version = "1.0.51" +name = "test-case" +version = "3.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f11c217e1416d6f036b870f14e0413d480dbf28edbee1f877abaf0206af43bb7" +checksum = "eb2550dd13afcd286853192af8601920d959b14c401fcece38071d53bf0768a8" dependencies = [ - "thiserror-impl", + "test-case-macros", ] [[package]] -name = "thiserror-impl" -version = "1.0.51" +name = "test-case-core" +version = "3.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01742297787513b79cf8e29d1056ede1313e2420b7b3b15d0a768b4921f549df" +checksum = "adcb7fd841cd518e279be3d5a3eb0636409487998a4aff22f3de87b81e88384f" dependencies = [ + "cfg-if", "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.77", ] [[package]] -name = "tiff" -version = "0.9.0" +name = "test-case-macros" +version = "3.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d172b0f4d3fba17ba89811858b9d3d97f928aece846475bbda076ca46736211" +checksum = "5c89e72a01ed4c579669add59014b9a524d609c0c88c6a585ce37485879f6ffb" dependencies = [ - "flate2", - "jpeg-decoder", - "weezl", + "proc-macro2", + "quote", + "syn 2.0.77", + "test-case-core", +] + +[[package]] +name = "thiserror" +version = "1.0.63" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.63" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.77", ] [[package]] name = "time" -version = "0.3.31" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f657ba42c3f86e7680e53c8cd3af8abbe56b5491790b46e22e19c0d57463583e" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ "deranged", "itoa", "libc", + "num-conv", "num_threads", "powerfmt", "serde", @@ -4159,18 +3776,19 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.16" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26197e33420244aeb70c3e8c78376ca46571bc4e701e4791c2cd9f57dcb3a43f" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" dependencies = [ + "num-conv", "time-core", ] [[package]] name = "tinyvec" -version = "1.6.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" dependencies = [ "tinyvec_macros", ] @@ -4192,26 +3810,15 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.3" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" +checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" [[package]] name = "toml_edit" -version = "0.19.15" +version = "0.22.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" -dependencies = [ - "indexmap", - "toml_datetime", - "winnow", -] - -[[package]] -name = "toml_edit" -version = "0.20.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338" +checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d" dependencies = [ "indexmap", "toml_datetime", @@ -4224,7 +3831,7 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0c8dab428531e30115d3bfd6e3092b55256a4a7b4f87cb3abe37a000b1f4032" dependencies = [ - "num-traits 0.2.17", + "num-traits 0.2.19", ] [[package]] @@ -4246,7 +3853,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.77", ] [[package]] @@ -4260,15 +3867,32 @@ dependencies = [ [[package]] name = "transpose" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6522d49d03727ffb138ae4cbc1283d3774f0d10aa7f9bf52e6784c45daf9b23" +checksum = "1ad61aed86bc3faea4300c7aee358b4c6d0c8d6ccc36524c96e4c92ccf26e77e" dependencies = [ "num-integer", "strength_reduce", ] [[package]] +name = "trash" +version = "5.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33caf2a9be1812a263a4bfce74d2de225fcde12ee7b77001361abd2b34ffdcc4" +dependencies = [ + "chrono", + "libc", + "log", + "objc2", + "objc2-foundation", + "once_cell", + "scopeguard", + "urlencoding", + "windows 0.56.0", +] + +[[package]] name = "typenum" version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4280,16 +3904,16 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9" dependencies = [ - "memoffset 0.9.0", + "memoffset", "tempfile", "winapi", ] [[package]] name = "unicode-bidi" -version = "0.3.14" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f2528f27a9eb2b21e69c95319b30bd0efd85d09c379741b0f78ea1d86be2416" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" [[package]] name = "unicode-ident" @@ -4299,30 +3923,30 @@ checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" dependencies = [ "tinyvec", ] [[package]] name = "unicode-width" -version = "0.1.11" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" +checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" [[package]] name = "unicode-xid" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" +checksum = "229730647fbc343e3a80e463c1db7f78f3855d3f3739bee0dda773c9a037c90a" [[package]] name = "unsafe-libyaml" -version = "0.2.10" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab4c90930b95a82d00dc9e9ac071b4991924390d46cbd0dfe566148667605e4b" +checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861" [[package]] name = "untrusted" @@ -4332,25 +3956,25 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "ureq" -version = "2.9.1" +version = "2.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8cdd25c339e200129fe4de81451814e5228c9b771d57378817d6117cc2b3f97" +checksum = "b74fc6b57825be3373f7054754755f03ac3a8f5d70015ccad699ba2029956f4a" dependencies = [ "base64", "flate2", "log", "once_cell", "rustls", - "rustls-webpki", + "rustls-pki-types", "url", "webpki-roots", ] [[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", @@ -4371,21 +3995,15 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" [[package]] name = "version_check" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "waker-fn" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" [[package]] name = "walkdir" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" dependencies = [ "same-file", "winapi-util", @@ -4398,35 +4016,42 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] +name = "wasite" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b" + +[[package]] name = "wasm-bindgen" -version = "0.2.89" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e" +checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" dependencies = [ "cfg-if", + "once_cell", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.89" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826" +checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.77", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.39" +version = "0.4.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac36a15a220124ac510204aec1c3e5db8a22ab06fd6706d881dc6149f8ed9a12" +checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed" dependencies = [ "cfg-if", "js-sys", @@ -4436,9 +4061,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.89" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2" +checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -4446,28 +4071,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.89" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" +checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" dependencies = [ "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.77", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.89" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f" +checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" [[package]] name = "web-sys" -version = "0.3.66" +version = "0.3.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50c24a44ec86bb68fbecd1b3efed7e85ea5621b39b35ef2766b66cd984f8010f" +checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" dependencies = [ "js-sys", "wasm-bindgen", @@ -4475,29 +4100,27 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.25.3" +version = "0.26.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1778a42e8b3b90bff8d0f5032bf22250792889a5cdc752aa0020c84abe3aaf10" - -[[package]] -name = "weezl" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" +checksum = "0bd24728e5af82c6c4ec1b66ac4844bdf8156257fccda846ec58b42cd0cdbe6a" +dependencies = [ + "rustls-pki-types", +] [[package]] name = "wgpu" -version = "0.18.0" -source = "git+https://github.com/gfx-rs/wgpu.git?rev=d7296ac#d7296ac30b7948d6d111ffe201d7c47c246d16cd" +version = "22.0.0" +source = "git+https://github.com/gfx-rs/wgpu.git?rev=ee35b0e#ee35b0e5866795d3fdd8307b1fa67018cf5cdd09" dependencies = [ "arrayvec", - "cfg-if", + "cfg_aliases 0.1.1", + "document-features", "js-sys", "log", "naga", "parking_lot", "profiling", - "raw-window-handle 0.6.0", + "raw-window-handle", "smallvec", "static_assertions", "wasm-bindgen", @@ -4510,58 +4133,61 @@ dependencies = [ [[package]] name = "wgpu-core" -version = "0.18.0" -source = "git+https://github.com/gfx-rs/wgpu.git?rev=d7296ac#d7296ac30b7948d6d111ffe201d7c47c246d16cd" +version = "22.0.0" +source = "git+https://github.com/gfx-rs/wgpu.git?rev=ee35b0e#ee35b0e5866795d3fdd8307b1fa67018cf5cdd09" dependencies = [ "arrayvec", "bit-vec", - "bitflags 2.4.1", - "codespan-reporting", + "bitflags 2.6.0", + "bytemuck", + "cfg_aliases 0.1.1", + "document-features", + "indexmap", "log", "naga", + "once_cell", "parking_lot", "profiling", - "raw-window-handle 0.6.0", + "raw-window-handle", "rustc-hash", "smallvec", "thiserror", - "web-sys", "wgpu-hal", "wgpu-types", ] [[package]] name = "wgpu-hal" -version = "0.18.0" -source = "git+https://github.com/gfx-rs/wgpu.git?rev=d7296ac#d7296ac30b7948d6d111ffe201d7c47c246d16cd" +version = "22.0.0" +source = "git+https://github.com/gfx-rs/wgpu.git?rev=ee35b0e#ee35b0e5866795d3fdd8307b1fa67018cf5cdd09" dependencies = [ "android_system_properties", "arrayvec", "ash", "bit-set", - "bitflags 2.4.1", + "bitflags 2.6.0", "block", + "cfg_aliases 0.1.1", "core-graphics-types", - "d3d12", "glow", "glutin_wgl_sys", "gpu-alloc", "gpu-allocator", "gpu-descriptor", - "hassle-rs", "js-sys", "khronos-egl", "libc", - "libloading 0.8.1", + "libloading", "log", "metal", "naga", + "ndk-sys 0.5.0+25.2.9519653", "objc", "once_cell", "parking_lot", "profiling", "range-alloc", - "raw-window-handle 0.6.0", + "raw-window-handle", "renderdoc-sys", "rustc-hash", "smallvec", @@ -4569,46 +4195,42 @@ dependencies = [ "wasm-bindgen", "web-sys", "wgpu-types", - "winapi", + "windows 0.58.0", + "windows-core 0.58.0", ] [[package]] name = "wgpu-types" -version = "0.18.0" -source = "git+https://github.com/gfx-rs/wgpu.git?rev=d7296ac#d7296ac30b7948d6d111ffe201d7c47c246d16cd" +version = "22.0.0" +source = "git+https://github.com/gfx-rs/wgpu.git?rev=ee35b0e#ee35b0e5866795d3fdd8307b1fa67018cf5cdd09" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.6.0", "js-sys", "web-sys", ] [[package]] name = "whoami" -version = "1.4.1" +version = "1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22fc3756b8a9133049b26c7f61ab35416c130e8c09b660f5b3958b446f52cc50" +checksum = "372d5b87f58ec45c384ba03563b03544dc5fadc3983e434b286913f5b4a9bb6d" dependencies = [ - "wasm-bindgen", + "redox_syscall", + "wasite", "web-sys", ] [[package]] name = "wide" -version = "0.7.13" +version = "0.7.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c68938b57b33da363195412cfc5fc37c9ed49aa9cfe2156fde64b8d2c9498242" +checksum = "b828f995bf1e9622031f8009f8481a85406ce1f4d4588ff746d872043e855690" dependencies = [ "bytemuck", "safe_arch", ] [[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" @@ -4626,11 +4248,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.6" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "winapi", + "windows-sys 0.59.0", ] [[package]] @@ -4641,49 +4263,148 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows" -version = "0.46.0" +version = "0.54.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdacb41e6a96a052c6cb63a144f24900236121c6f63f4f8219fef5977ecb0c25" +checksum = "9252e5725dbed82865af151df558e754e4a3c2c30818359eb17465f1346a1b49" dependencies = [ - "windows-targets 0.42.2", + "windows-core 0.54.0", + "windows-targets 0.52.6", ] [[package]] name = "windows" -version = "0.51.1" +version = "0.56.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9" +checksum = "1de69df01bdf1ead2f4ac895dc77c9351aefff65b2f3db429a343f9cbf05e132" dependencies = [ - "windows-core 0.51.1", - "windows-targets 0.48.5", + "windows-core 0.56.0", + "windows-targets 0.52.6", ] [[package]] name = "windows" +version = "0.58.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd04d41d93c4992d421894c18c8b43496aa748dd4c081bac0dc93eb0489272b6" +dependencies = [ + "windows-core 0.58.0", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-core" version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-core 0.52.0", - "windows-targets 0.52.0", + "windows-targets 0.52.6", ] [[package]] name = "windows-core" -version = "0.51.1" +version = "0.54.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" +checksum = "12661b9c89351d684a50a8a643ce5f608e20243b9fb84687800163429f161d65" dependencies = [ - "windows-targets 0.48.5", + "windows-result 0.1.2", + "windows-targets 0.52.6", ] [[package]] name = "windows-core" -version = "0.52.0" +version = "0.56.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +checksum = "4698e52ed2d08f8658ab0c39512a7c00ee5fe2688c65f8c0a4f06750d729f2a6" +dependencies = [ + "windows-implement 0.56.0", + "windows-interface 0.56.0", + "windows-result 0.1.2", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-core" +version = "0.58.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ba6d44ec8c2591c134257ce647b7ea6b20335bf6379a27dac5f1641fcf59f99" +dependencies = [ + "windows-implement 0.58.0", + "windows-interface 0.58.0", + "windows-result 0.2.0", + "windows-strings", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-implement" +version = "0.56.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6fc35f58ecd95a9b71c4f2329b911016e6bec66b3f2e6a4aad86bd2e99e2f9b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.77", +] + +[[package]] +name = "windows-implement" +version = "0.58.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.77", +] + +[[package]] +name = "windows-interface" +version = "0.56.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08990546bf4edef8f431fa6326e032865f27138718c587dc21bc0265bbcb57cc" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.77", +] + +[[package]] +name = "windows-interface" +version = "0.58.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.77", +] + +[[package]] +name = "windows-result" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8" dependencies = [ - "windows-targets 0.52.0", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-result" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-strings" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" +dependencies = [ + "windows-result 0.2.0", + "windows-targets 0.52.6", ] [[package]] @@ -4697,20 +4418,20 @@ dependencies = [ [[package]] name = "windows-sys" -version = "0.48.0" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.48.5", + "windows-targets 0.52.6", ] [[package]] name = "windows-sys" -version = "0.52.0" +version = "0.59.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" dependencies = [ - "windows-targets 0.52.0", + "windows-targets 0.52.6", ] [[package]] @@ -4730,32 +4451,18 @@ dependencies = [ [[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" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "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", + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", ] [[package]] @@ -4766,15 +4473,9 @@ checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.48.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" @@ -4784,15 +4485,9 @@ checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" [[package]] name = "windows_aarch64_msvc" -version = "0.48.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" @@ -4802,15 +4497,15 @@ checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" [[package]] name = "windows_i686_gnu" -version = "0.48.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" [[package]] -name = "windows_i686_gnu" -version = "0.52.0" +name = "windows_i686_gnullvm" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" @@ -4820,15 +4515,9 @@ checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" [[package]] name = "windows_i686_msvc" -version = "0.48.5" +version = "0.52.6" 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" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" @@ -4838,15 +4527,9 @@ checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" [[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.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" @@ -4856,15 +4539,9 @@ checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" [[package]] name = "windows_x86_64_gnullvm" -version = "0.48.5" +version = "0.52.6" 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" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" @@ -4874,21 +4551,15 @@ checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" [[package]] name = "windows_x86_64_msvc" -version = "0.48.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" -version = "0.5.30" +version = "0.6.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b5c3db89721d50d0e2a673f5043fc4722f76dcc352d7b1ab8b8288bed4ed2c5" +checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f" dependencies = [ "memchr", ] @@ -4904,57 +4575,60 @@ dependencies = [ [[package]] name = "xattr" -version = "1.1.3" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7dae5072fe1f8db8f8d29059189ac175196e410e40ba42d5d4684ae2f750995" +checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" dependencies = [ "libc", - "linux-raw-sys 0.4.12", - "rustix 0.38.28", + "linux-raw-sys", + "rustix", ] [[package]] +name = "xdg" +version = "2.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "213b7324336b53d2414b2db8537e56544d981803139155afa84f76eeebb7a546" + +[[package]] name = "xdg-home" -version = "1.0.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2769203cd13a0c6015d515be729c526d041e9cf2c0cc478d57faee85f40c6dcd" +checksum = "ec1cdab258fb55c0da61328dc52c8764709b249011b2cad0454c72f0bf10a1f6" dependencies = [ - "nix 0.26.4", - "winapi", + "libc", + "windows-sys 0.59.0", ] [[package]] name = "xml-rs" -version = "0.8.19" +version = "0.8.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a" +checksum = "539a77ee7c0de333dcc6da69b177380a0b81e0dacfa4f7344c465a36871ee601" [[package]] name = "zbus" -version = "3.14.1" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31de390a2d872e4cd04edd71b425e29853f786dc99317ed72d73d6fcf5ebb948" +checksum = "bb97012beadd29e654708a0fdb4c84bc046f537aecfde2c3ee0a9e4b4d48c725" dependencies = [ "async-broadcast", "async-executor", "async-fs", - "async-io 1.13.0", - "async-lock 2.8.0", + "async-io", + "async-lock", "async-process", "async-recursion", "async-task", "async-trait", "blocking", - "byteorder", - "derivative", "enumflags2", - "event-listener 2.5.3", + "event-listener", "futures-core", "futures-sink", "futures-util", "hex", - "nix 0.26.4", - "once_cell", + "nix", "ordered-stream", "rand", "serde", @@ -4963,7 +4637,7 @@ dependencies = [ "static_assertions", "tracing", "uds_windows", - "winapi", + "windows-sys 0.52.0", "xdg-home", "zbus_macros", "zbus_names", @@ -4972,23 +4646,22 @@ dependencies = [ [[package]] name = "zbus_macros" -version = "3.14.1" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41d1794a946878c0e807f55a397187c11fc7a038ba5d868e7db4f3bd7760bc9d" +checksum = "267db9407081e90bbfa46d841d3cbc60f59c0351838c4bc65199ecd79ab1983e" dependencies = [ - "proc-macro-crate 1.3.1", + "proc-macro-crate", "proc-macro2", "quote", - "regex", - "syn 1.0.109", + "syn 2.0.77", "zvariant_utils", ] [[package]] name = "zbus_names" -version = "2.6.0" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb80bb776dbda6e23d705cf0123c3b95df99c4ebeaec6c2599d4a5419902b4a9" +checksum = "4b9b1fef7d021261cc16cba64c351d291b715febe0fa10dc3a443ac5a5022e6c" dependencies = [ "serde", "static_assertions", @@ -4997,44 +4670,30 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.6.6" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "854e949ac82d619ee9a14c66a1b674ac730422372ccb759ce0c39cabcf2bf8e6" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" dependencies = [ "byteorder", - "zerocopy-derive 0.6.6", -] - -[[package]] -name = "zerocopy" -version = "0.7.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" -dependencies = [ - "zerocopy-derive 0.7.32", + "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.6.6" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "125139de3f6b9d625c39e2efdd73d41bdac468ccd556556440e322be0e1bbd91" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.43", + "syn 2.0.77", ] [[package]] -name = "zerocopy-derive" -version = "0.7.32" +name = "zeroize" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.43", -] +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" [[package]] name = "zune-inflate" @@ -5047,13 +4706,12 @@ dependencies = [ [[package]] name = "zvariant" -version = "3.15.0" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44b291bee0d960c53170780af148dca5fa260a63cdd24f1962fa82e03e53338c" +checksum = "2084290ab9a1c471c38fc524945837734fbf124487e105daec2bb57fd48c81fe" dependencies = [ - "byteorder", + "endi", "enumflags2", - "libc", "serde", "static_assertions", "zvariant_derive", @@ -5061,24 +4719,24 @@ dependencies = [ [[package]] name = "zvariant_derive" -version = "3.15.0" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "934d7a7dfc310d6ee06c87ffe88ef4eca7d3e37bb251dece2ef93da8f17d8ecd" +checksum = "73e2ba546bda683a90652bac4a279bc146adad1386f25379cf73200d2002c449" dependencies = [ - "proc-macro-crate 1.3.1", + "proc-macro-crate", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.77", "zvariant_utils", ] [[package]] name = "zvariant_utils" -version = "1.0.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7234f0d811589db492d16893e3f21e8e2fd282e6d01b0cddee310322062cc200" +checksum = "c51bcff7cc3dbb5055396bcf774748c3dab426b4b8659046963523cee4808340" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.77", ] diff --git a/pkgs/applications/video/gyroflow/default.nix b/pkgs/applications/video/gyroflow/default.nix index bb7df1dfa01de..5d3673c2b23d8 100644 --- a/pkgs/applications/video/gyroflow/default.nix +++ b/pkgs/applications/video/gyroflow/default.nix @@ -5,13 +5,13 @@ rustPlatform.buildRustPackage rec { pname = "gyroflow"; - version = "1.5.4-2023-12-25"; + version = "1.5.4-2024-09-05"; src = fetchFromGitHub { owner = "gyroflow"; repo = "gyroflow"; - rev = "e0869ffe648cb3fd88d81c807b1f7fa2e18d7430"; - hash = "sha256-KB/uoQR43im/m5uJhheAPCqUH9oIx85JaIUwW9rhAAw="; + rev = "52038dedad0bd14d6af68db36a09da0243ad5455"; + hash = "sha256-EuhUF2b8YWv2eN2pcoHA0SlnyeQ8gJ5eHbXi6G4GIzk="; }; cargoLock = { @@ -19,17 +19,20 @@ rustPlatform.buildRustPackage rec { outputHashes = { "ahrs-0.6.0" = "sha256-CxWyX8t+BjqIyNj1p1LdkCmNrtJkudmKgZPv0MVcghY="; "akaze-0.7.0" = "sha256-KkGXKoVRZZ7HUTtWYBerrN36a7RqsHjYQb+bwG1JagY="; - "d3d12-0.7.0" = "sha256-FqAVwW2jtDE1BV31OfrCJljGhj5iD0OfN2fANQ1wasc="; - "fc-blackbox-0.2.0" = "sha256-gL8m9DpHJPVD8vvrmuYv+biJT4PA5LmtohJwFVO+khU="; - "glow-0.13.0" = "sha256-vhPWzsm7NZx9JiRZcVoUslTGySQbASRh/wNlo1nK5jg="; - "keep-awake-0.1.0" = "sha256-EoXhK4/Aij70f73+5NBUoCXqZISG1+n2eVavNqe8mq4="; + "app_dirs2-2.5.5" = "sha256-nQ5Cs9r1k/3zjqXJ18Oilk8ErLKim7bGwCXDlQW4GRQ="; + "fc-blackbox-0.2.0" = "sha256-82DuI0KuHhDVhCMUsnDqk6Fk774VpvoJ1qYFLO+n1X4="; + "ffmpeg-next-7.0.4" = "sha256-F1N70tSxdC36uS9Bh7X2S9Wspd7bcCbGPmoMRs1cm8Y="; + "ffmpeg-sys-next-7.0.2" = "sha256-7C46WJseKIhqXW0cQGaF8Q/xQi7sX+e8fKVrhBMVwZE="; + "keep-awake-0.1.0" = "sha256-iZuntDkAhDZBojRgNEupAExtqOhiw4mf6XK0N6ff2Oc="; + "mp4parse-0.17.0" = "sha256-DktX6zmQsHBlo7uLgLXcXWxKq9uisnX0R16lftWRLZY="; + "naga-22.0.0" = "sha256-+ngomv0VyWKNDkSGVI/f5wtDyLs79qiXxtj3qNOsbFc="; "nshare-0.9.0" = "sha256-PAV41mMLDmhkAz4+qyf+MZnYTAdMwjk83+f+RdaJji8="; - "qmetaobject-0.2.10" = "sha256-ldmpbOYoCOaAoipfcCSwuV+fzF9gg1PTbRz2Jm4zJvA="; - "qml-video-rs-0.1.0" = "sha256-rwdci0QhGYOnCf04u61xuon06p8Zm2wKCNrW/qti9+U="; - "rs-sync-0.1.0" = "sha256-sfym7zv5SUitopqNJ6uFP6AMzAGf4Y7U0dzXAKlvuGA="; - "simplelog-0.12.0" = "sha256-NvmtLbzahSw1WMS3LY+jWiX4SxfSRwidTMvICGcmDO4="; - "system_shutdown-4.0.1" = "sha256-arJWmEjDdaig/oAfwSolVmk9s1UovrQ5LNUgTpUvoOQ="; - "telemetry-parser-0.2.8" = "sha256-Nr4SWEERKEAiZppqzjn1LIuMiZ2BTQEOKOlSnLVAXAg="; + "qmetaobject-0.2.10" = "sha256-kEwFjDe1tYTLQ8XdjrPyYEYnjVFyYeaWUPCj5D8mg7A="; + "qml-video-rs-0.1.0" = "sha256-8RYB+numVy7u29EYtSSdf/+cTsUMVjrcw4u5mqB7KbE="; + "rs-sync-0.1.0" = "sha256-6xQb0CUlBDx7S7zsqNL9zfZZtkmw0cbUUXd6pOYIrXI="; + "spirv-std-0.9.0" = "sha256-uZn1p2pM5UYQKlY9u16aafPH7dfQcSG7PaFDd1sT4Qc="; + "system_shutdown-4.0.1" = "sha256-YypNnZzTxkmUgIxaP4jOpFBje/fEzI5L1g+3pJgMd0w="; + "telemetry-parser-0.3.0" = "sha256-U26cWC7pSw4NFiu43BZf+KlLy9NU61iRpFx3Btse1aY="; }; }; diff --git a/pkgs/applications/video/gyroflow/lens-profiles.nix b/pkgs/applications/video/gyroflow/lens-profiles.nix index 850b6ca72f87a..b7d1de7fc9dc8 100644 --- a/pkgs/applications/video/gyroflow/lens-profiles.nix +++ b/pkgs/applications/video/gyroflow/lens-profiles.nix @@ -2,12 +2,12 @@ fetchFromGitHub { pname = "gyroflow-lens-profiles"; - version = "2023-12-01"; + version = "2024-09-08"; owner = "gyroflow"; repo = "lens_profiles"; - rev = "3e72169ae6b8601260497d7216d5fcbbc8b67194"; - hash = "sha256-18KtunSxTsJhBge+uOGBcNZRG3W26M/Osyxllu+N0UI="; + rev = "a100b233a1df242d5bf1be06df2888a5852febf3"; + hash = "sha256-z994k2lozakaKNKcdrJKzTiMGeL9oJ70jFnEYgbutq4="; meta = with lib; { description = "Lens profile database for Gyroflow"; diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix deleted file mode 100644 index f9761bd85bb56..0000000000000 --- a/pkgs/applications/video/handbrake/default.nix +++ /dev/null @@ -1,336 +0,0 @@ -# Upstream distributes HandBrake with bundle of according versions of libraries -# and patches to them. This derivation patches HandBrake to use Nix closure -# dependencies. -# -# NOTE: 2019-07-19: This derivation does not currently support the native macOS -# GUI--it produces the "HandbrakeCLI" CLI version only. In the future it would -# be nice to add the native GUI (and/or the GTK GUI) as an option too, but that -# requires invoking the Xcode build system, which is non-trivial for now. - -{ stdenv -, lib -, fetchFromGitHub -, fetchpatch - # For tests -, testers -, runCommand -, fetchurl - # Main build tools -, pkg-config -, autoconf -, automake -, libtool -, m4 -, xz -, python3 -, numactl -, writeText - # Processing, video codecs, containers -, ffmpeg_7-full -, nv-codec-headers -, libogg -, x264 -, x265 -, libvpx -, libtheora -, dav1d -, zimg -, svt-av1 - # Codecs, audio -, libopus -, lame -, libvorbis -, a52dec -, speex -, libsamplerate - # Text processing -, libiconv -, fribidi -, fontconfig -, freetype -, libass -, jansson -, libxml2 -, harfbuzz -, libjpeg_turbo - # Optical media -, libdvdread -, libdvdnav -, libdvdcss -, libbluray - # Darwin-specific -, AudioToolbox -, Foundation -, libobjc -, VideoToolbox - # GTK - # NOTE: 2019-07-19: The gtk3 package has a transitive dependency on dbus, - # which in turn depends on systemd. systemd is not supported on Darwin, so - # for now we disable GTK GUI support on Darwin. (It may be possible to remove - # this restriction later.) -, useGtk ? !stdenv.isDarwin -, appstream -, desktop-file-utils -, meson -, ninja -, wrapGAppsHook4 -, intltool -, glib -, gtk4 -, libappindicator-gtk3 -, libnotify -, gst_all_1 -, dbus-glib -, udev -, libgudev -, hicolor-icon-theme - # FDK -, useFdk ? false -, fdk_aac -}: - -let - version = "1.8.0"; - - src = fetchFromGitHub { - owner = "HandBrake"; - repo = "HandBrake"; - # uses version commit for logic in version.txt - rev = "5edf59c1da54fe1c9a487d09e8f52561fe49cb2a"; - hash = "sha256-gr2UhqPY5mZOP8KBvk9yydl4AkTlqE83hYAcLwSv1Is="; - }; - - # Handbrake maintains a set of ffmpeg patches. In particular, these - # patches are required for subtitle timing to work correctly. See: - # https://github.com/HandBrake/HandBrake/issues/4029 - # base ffmpeg version is specified in: - # https://github.com/HandBrake/HandBrake/blob/master/contrib/ffmpeg/module.defs - ffmpeg-version = "7.0"; - ffmpeg-hb = (ffmpeg_7-full.override { - version = ffmpeg-version; - hash = "sha256-RdDfv+0y90XpgjIRvTjsemKyGunzDbsh4j4WiE9rfyM="; - }).overrideAttrs (old: { - patches = (old.patches or [ ]) ++ [ - "${src}/contrib/ffmpeg/A01-mov-read-name-track-tag-written-by-movenc.patch" - "${src}/contrib/ffmpeg/A02-movenc-write-3gpp-track-titl-tag.patch" - "${src}/contrib/ffmpeg/A03-mov-read-3gpp-udta-tags.patch" - "${src}/contrib/ffmpeg/A04-movenc-write-3gpp-track-names-tags-for-all-available.patch" - "${src}/contrib/ffmpeg/A05-dvdsubdec-fix-processing-of-partial-packets.patch" - "${src}/contrib/ffmpeg/A06-dvdsubdec-return-number-of-bytes-used.patch" - "${src}/contrib/ffmpeg/A07-dvdsubdec-use-pts-of-initial-packet.patch" - "${src}/contrib/ffmpeg/A08-dvdsubdec-do-not-discard-zero-sized-rects.patch" - "${src}/contrib/ffmpeg/A09-ccaption_dec-fix-pts-in-real_time-mode.patch" - "${src}/contrib/ffmpeg/A10-matroskaenc-aac-extradata-updated.patch" - "${src}/contrib/ffmpeg/A11-videotoolbox-disable-H.264-10-bit-on-Intel-macOS.patch" - - # patch to fix <https://github.com/HandBrake/HandBrake/issues/5011> - # commented out because it causes ffmpeg's filter-pixdesc-p010le test to fail. - # "${src}/contrib/ffmpeg/A12-libswscale-fix-yuv420p-to-p01xle-color-conversion-bu.patch" - - "${src}/contrib/ffmpeg/A13-qsv-fix-decode-10bit-hdr.patch" - "${src}/contrib/ffmpeg/A14-amfenc-Add-support-for-pict_type-field.patch" - "${src}/contrib/ffmpeg/A15-amfenc-Fixes-the-color-information-in-the-ou.patch" - "${src}/contrib/ffmpeg/A16-amfenc-HDR-metadata.patch" - "${src}/contrib/ffmpeg/A17-av1dec-dovi-rpu.patch" - "${src}/contrib/ffmpeg/A18-avformat-mov-add-support-audio-fallback-track-ref.patch" - "${src}/contrib/ffmpeg/A19-mov-ignore-old-infe-box.patch" - "${src}/contrib/ffmpeg/A20-mov-free-infe-on-failure.patch" - ]; - }); - - x265-hb = x265.overrideAttrs (old: { - # nixpkgs' x265 sourceRoot is x265-.../source whereas handbrake's x265 patches - # are written with respect to the parent directory instead of that source directory. - # patches which don't cleanly apply are commented out. - postPatch = (old.postPatch or "") + '' - pushd .. - patch -p1 < ${src}/contrib/x265/A01-threads-priority.patch - patch -p1 < ${src}/contrib/x265/A02-threads-pool-adjustments.patch - patch -p1 < ${src}/contrib/x265/A03-sei-length-crash-fix.patch - patch -p1 < ${src}/contrib/x265/A04-ambient-viewing-enviroment-sei.patch - # patch -p1 < ${src}/contrib/x265/A05-memory-leaks.patch - # patch -p1 < ${src}/contrib/x265/A06-crosscompile-fix.patch - popd - ''; - }); - - versionFile = writeText "version.txt" '' - URL=${src.meta.homepage}.git - HASH=${src.rev} - SHORTHASH=${lib.substring 0 9 src.rev} - TAG=${version} - TAG_HASH=${src.rev} - REV=0 - BRANCH= - REMOTE=${src.meta.homepage}.git - DATE=1970-01-01 00:00:01 +0000 - ''; - - inherit (lib) optional optionals optionalString versions; - -in -let - self = stdenv.mkDerivation rec { - pname = "handbrake"; - inherit version src; - - postPatch = '' - install -Dm444 ${versionFile} ${versionFile.name} - - patchShebangs scripts - patchShebangs gtk/data/ - - substituteInPlace libhb/hb.c \ - --replace-fail 'return hb_version;' 'return "${version}";' - - # Force using nixpkgs dependencies - sed -i '/MODULES += contrib/d' make/include/main.defs - sed -e 's/^[[:space:]]*\(meson\|ninja\|nasm\)[[:space:]]*= ToolProbe.*$//g' \ - -e '/ ## Additional library and tool checks/,/ ## MinGW specific library and tool checks/d' \ - -i make/configure.py - '' + optionalString stdenv.isDarwin '' - # Prevent the configure script from failing if xcodebuild isn't available, - # which it isn't in the Nix context. (The actual build goes fine without - # xcodebuild.) - sed -e '/xcodebuild = ToolProbe/s/abort=.\+)/abort=False)/' -i make/configure.py - '' + optionalString useGtk '' - substituteInPlace gtk/module.rules \ - --replace-fail '$(MESON.exe)' 'meson' \ - --replace-fail '$(NINJA.exe)' 'ninja' \ - # Force using nixpkgs dependencies - substituteInPlace gtk/meson.build \ - --replace-fail \ - "hb_incdirs = include_directories(hb_dir / 'libhb', hb_dir / 'contrib/include')" \ - "hb_incdirs = include_directories(hb_dir / 'libhb')" - substituteInPlace gtk/ghb.spec \ - --replace-fail "gtk-update-icon-cache" "gtk4-update-icon-cache" - substituteInPlace gtk/data/post_install.py \ - --replace-fail "gtk-update-icon-cache" "gtk4-update-icon-cache" - ''; - - nativeBuildInputs = [ - autoconf - automake - libtool - m4 - pkg-config - python3 - ] - ++ optionals useGtk [ appstream desktop-file-utils intltool meson ninja wrapGAppsHook4 ]; - - buildInputs = [ - a52dec - dav1d - ffmpeg-hb - fontconfig - freetype - fribidi - harfbuzz - jansson - lame - libass - libbluray - libdvdcss - libdvdnav - libdvdread - libiconv - libjpeg_turbo - libogg - libopus - libsamplerate - libtheora - libvorbis - libvpx - libxml2 - speex - svt-av1 - x264 - x265-hb - xz - zimg - ] - ++ optional (!stdenv.isDarwin) numactl - ++ optionals useGtk [ - dbus-glib - glib - gst_all_1.gst-libav - gst_all_1.gst-plugins-bad - gst_all_1.gst-plugins-base - gst_all_1.gst-plugins-good - gst_all_1.gstreamer - gtk4 - hicolor-icon-theme - libappindicator-gtk3 - libgudev - libnotify - udev - ] - ++ optional useFdk fdk_aac - ++ optionals stdenv.isDarwin [ AudioToolbox Foundation libobjc VideoToolbox ] - # NOTE: 2018-12-27: Handbrake supports nv-codec-headers for Linux only, - # look at ./make/configure.py search "enable_nvenc" - ++ optional stdenv.isLinux nv-codec-headers; - - configureFlags = [ - "--disable-df-fetch" - "--disable-df-verify" - ] - ++ optional (!useGtk) "--disable-gtk" - ++ optional useFdk "--enable-fdk-aac" - ++ optional stdenv.isDarwin "--disable-xcode" - ++ optional stdenv.hostPlatform.isx86 "--harden"; - - # NOTE: 2018-12-27: Check NixOS HandBrake test if changing - NIX_LDFLAGS = [ "-lx265" ]; - - # meson/ninja are used only for the subprojects, not the toplevel - dontUseMesonConfigure = true; - dontUseMesonInstall = true; - dontUseNinjaBuild = true; - dontUseNinjaInstall = true; - - makeFlags = [ "--directory=build" ]; - - passthru = { - # for convenience - inherit ffmpeg-hb x265-hb; - - tests.basic-conversion = - let - # Big Buck Bunny example, licensed under CC Attribution 3.0. - testMkv = fetchurl { - url = "https://github.com/Matroska-Org/matroska-test-files/blob/cf0792be144ac470c4b8052cfe19bb691993e3a2/test_files/test1.mkv?raw=true"; - sha256 = "1hfxbbgxwfkzv85pvpvx55a72qsd0hxjbm9hkl5r3590zw4s75h9"; - }; - in - runCommand "${pname}-${version}-basic-conversion" { nativeBuildInputs = [ self ]; } '' - mkdir -p $out - cd $out - HandBrakeCLI -i ${testMkv} -o test.mp4 -e x264 -q 20 -B 160 - test -e test.mp4 - HandBrakeCLI -i ${testMkv} -o test.mkv -e x264 -q 20 -B 160 - test -e test.mkv - ''; - - tests.version = testers.testVersion { package = self; command = "HandBrakeCLI --version"; }; - }; - - meta = with lib; { - homepage = "https://handbrake.fr/"; - description = "Tool for converting video files and ripping DVDs"; - longDescription = '' - Tool for converting and remuxing video files - into selection of modern and widely supported codecs - and containers. Very versatile and customizable. - Package provides: - CLI - `HandbrakeCLI` - GTK GUI - `ghb` - ''; - license = licenses.gpl2Only; - maintainers = with maintainers; [ Anton-Latukha wmertens ]; - platforms = with platforms; unix; - broken = stdenv.isDarwin; # https://github.com/NixOS/nixpkgs/pull/297984#issuecomment-2016503434 - }; - }; -in -self diff --git a/pkgs/applications/video/hyperion-ng/default.nix b/pkgs/applications/video/hyperion-ng/default.nix index 67df0dd420b00..837e5071f440e 100644 --- a/pkgs/applications/video/hyperion-ng/default.nix +++ b/pkgs/applications/video/hyperion-ng/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub , cmake, wrapQtAppsHook, perl , flatbuffers, protobuf, mbedtls -, hidapi, libcec, libusb1 +, alsa-lib, hidapi, libcec, libusb1 , libX11, libxcb, libXrandr, python3 , qtbase, qtserialport, qtsvg, qtx11extras , withRPiDispmanx ? false, libraspberrypi @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "hyperion.ng"; - version = "2.0.14"; + version = "2.0.16"; src = fetchFromGitHub { owner = "hyperion-project"; repo = pname; rev = version; - sha256 = "sha256-Y1PZ+YyPMZEX4fBpMG6IVT1gtXR9ZHlavJMCQ4KAenc="; + hash = "sha256-nQPtJw9DOKMPGI5trxZxpP+z2PYsbRKqOQEyaGzvmmA="; # needed for `dependencies/external/`: # * rpi_ws281x` - not possible to use as a "system" lib # * qmdnsengine - not in nixpkgs yet @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ + alsa-lib hidapi libusb1 libX11 @@ -36,12 +37,12 @@ stdenv.mkDerivation rec { qtserialport qtsvg qtx11extras - ] ++ lib.optional stdenv.isLinux libcec + ] ++ lib.optional stdenv.hostPlatform.isLinux libcec ++ lib.optional withRPiDispmanx libraspberrypi; nativeBuildInputs = [ cmake wrapQtAppsHook - ] ++ lib.optional stdenv.isDarwin perl; # for macos bundle + ] ++ lib.optional stdenv.hostPlatform.isDarwin perl; # for macos bundle patchPhase = '' patchShebangs test/testrunner.sh diff --git a/pkgs/applications/video/hypnotix/default.nix b/pkgs/applications/video/hypnotix/default.nix index 00f8eb6b024ba..c38b2f5c703f9 100644 --- a/pkgs/applications/video/hypnotix/default.nix +++ b/pkgs/applications/video/hypnotix/default.nix @@ -2,7 +2,7 @@ , stdenv , fetchFromGitHub , substituteAll -, cinnamon +, xapp , circle-flags , gettext , gobject-introspection @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "hypnotix"; - version = "4.5"; + version = "4.6"; src = fetchFromGitHub { owner = "linuxmint"; repo = "hypnotix"; rev = version; - hash = "sha256-tcBBPJr9C+3FC8VWAM+KzETKAovfyehBvlmn7mIR7VQ="; + hash = "sha256-wDzHCrZTbfIb9dpRoh5qYKQNjONOv34FYdOr4svOLEw="; }; patches = [ @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { dontWrapGApps = true; buildInputs = [ - cinnamon.xapp + xapp python3 # for patchShebangs ]; @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { requests setproctitle unidecode - xapp + python-xapp ]; installPhase = '' diff --git a/pkgs/applications/video/jellyfin-media-player/default.nix b/pkgs/applications/video/jellyfin-media-player/default.nix index fef1a9ae80f08..013b6bdf36316 100644 --- a/pkgs/applications/video/jellyfin-media-player/default.nix +++ b/pkgs/applications/video/jellyfin-media-player/default.nix @@ -21,7 +21,7 @@ , qtwebchannel , qtwebengine , qtx11extras -, withDbus ? stdenv.isLinux +, withDbus ? stdenv.hostPlatform.isLinux }: mkDerivation rec { @@ -51,9 +51,9 @@ mkDerivation rec { qtwebchannel qtwebengine qtx11extras - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ qtwayland - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa CoreAudio CoreFoundation @@ -74,7 +74,7 @@ mkDerivation rec { "-DLINUX_X11POWER=ON" ]; - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/bin $out/Applications mv "$out/Jellyfin Media Player.app" $out/Applications diff --git a/pkgs/applications/video/jellyfin-mpv-shim/default.nix b/pkgs/applications/video/jellyfin-mpv-shim/default.nix index fe32c894c741a..f810b5403f1ba 100644 --- a/pkgs/applications/video/jellyfin-mpv-shim/default.nix +++ b/pkgs/applications/video/jellyfin-mpv-shim/default.nix @@ -22,7 +22,7 @@ buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-EANaNmvD8hcdGB2aoGemKvA9syS1VvIqGsP1jk0b+lE="; + hash = "sha256-EANaNmvD8hcdGB2aoGemKvA9syS1VvIqGsP1jk0b+lE="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/video/jftui/default.nix b/pkgs/applications/video/jftui/default.nix index efd8d6ed6e2a8..e30ba77dd8738 100644 --- a/pkgs/applications/video/jftui/default.nix +++ b/pkgs/applications/video/jftui/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "Jellyfin Terminal User Interface "; + description = "Jellyfin Terminal User Interface"; homepage = "https://github.com/Aanok/jftui"; license = licenses.unlicense; maintainers = [ maintainers.nyanloutre ]; diff --git a/pkgs/applications/video/kaffeine/default.nix b/pkgs/applications/video/kaffeine/default.nix index 40701d2cbf85e..c2866e280f126 100644 --- a/pkgs/applications/video/kaffeine/default.nix +++ b/pkgs/applications/video/kaffeine/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchFromGitLab -, kio , cmake , extra-cmake-modules , libvlc diff --git a/pkgs/applications/video/kodi/addons/inputstreamhelper/default.nix b/pkgs/applications/video/kodi/addons/inputstreamhelper/default.nix index 13b2738fdff99..deca0d57d7c51 100644 --- a/pkgs/applications/video/kodi/addons/inputstreamhelper/default.nix +++ b/pkgs/applications/video/kodi/addons/inputstreamhelper/default.nix @@ -1,4 +1,4 @@ -{ lib, rel, buildKodiAddon, fetchzip, addonUpdateScript }: +{ lib, rel, buildKodiAddon, fetchzip, fetchpatch, addonUpdateScript }: buildKodiAddon rec { pname = "inputstreamhelper"; namespace = "script.module.inputstreamhelper"; @@ -9,6 +9,13 @@ buildKodiAddon rec { sha256 = "sha256-v5fRikswmP+KVbxYibD0NbCK8leUnFbya5EtF1FmS0I="; }; + patches = [ + (fetchpatch { + url = "https://github.com/emilsvennesson/script.module.inputstreamhelper/commit/af6adc16a0bee4921a827946b004ee070406ae37.patch"; + hash = "sha256-901EyVeZUb0EMvxsEza95qFjTOZ7PDYyqHMRawPM5Zs="; + }) + ]; + passthru = { pythonPath = "lib"; updateScript = addonUpdateScript { diff --git a/pkgs/applications/video/kodi/addons/jellycon/default.nix b/pkgs/applications/video/kodi/addons/jellycon/default.nix index d618e58cee371..960a8603e3612 100644 --- a/pkgs/applications/video/kodi/addons/jellycon/default.nix +++ b/pkgs/applications/video/kodi/addons/jellycon/default.nix @@ -29,7 +29,7 @@ buildKodiAddon rec { ''; postInstall = '' - mv /build/source/addon.xml $out${addonDir}/${namespace}/ + cp -v addon.xml $out${addonDir}/$namespace/ ''; propagatedBuildInputs = [ diff --git a/pkgs/applications/video/kodi/addons/jellyfin/default.nix b/pkgs/applications/video/kodi/addons/jellyfin/default.nix index 93217122d53bf..27faf3d677579 100644 --- a/pkgs/applications/video/kodi/addons/jellyfin/default.nix +++ b/pkgs/applications/video/kodi/addons/jellyfin/default.nix @@ -1,35 +1,42 @@ -{ lib, addonDir, buildKodiAddon, fetchFromGitHub, kodi, requests, dateutil, six, kodi-six, signals, websocket }: +{ + lib, + addonDir, + buildKodiAddon, + fetchFromGitHub, + kodi, + requests, + dateutil, + six, + kodi-six, + signals, + websocket, +}: let python = kodi.pythonPackages.python.withPackages (p: with p; [ pyyaml ]); in buildKodiAddon rec { pname = "jellyfin"; namespace = "plugin.video.jellyfin"; - version = "1.0.3"; + version = "1.0.5"; src = fetchFromGitHub { owner = "jellyfin"; repo = "jellyfin-kodi"; rev = "v${version}"; - sha256 = "sha256-Uyo8GClJU2/gdk4PeFNnoyvxOhooaxeXN3Wc5YGuCiM="; + sha256 = "sha256-MPRyMeJuuiG62ahNKfXyb3Q4LDm0yXkNgCeYxfpT1io="; }; - nativeBuildInputs = [ - python - ]; + nativeBuildInputs = [ python ]; - prePatch = '' - # ZIP does not support timestamps before 1980 - https://bugs.python.org/issue34097 - substituteInPlace build.py \ - --replace "with zipfile.ZipFile('{}/{}'.format(target, archive_name), 'w') as z:" "with zipfile.ZipFile('{}/{}'.format(target, archive_name), 'w', strict_timestamps=False) as z:" - ''; + # ZIP does not support timestamps before 1980 - https://bugs.python.org/issue34097 + patches = [ ./no-strict-zip-timestamp.patch ]; buildPhase = '' ${python}/bin/python3 build.py --version=py3 ''; postInstall = '' - mv /build/source/addon.xml $out${addonDir}/${namespace}/ + cp -v addon.xml $out${addonDir}/$namespace/ ''; propagatedBuildInputs = [ diff --git a/pkgs/applications/video/kodi/addons/jellyfin/no-strict-zip-timestamp.patch b/pkgs/applications/video/kodi/addons/jellyfin/no-strict-zip-timestamp.patch new file mode 100644 index 0000000000000..07d54c1e13841 --- /dev/null +++ b/pkgs/applications/video/kodi/addons/jellyfin/no-strict-zip-timestamp.patch @@ -0,0 +1,15 @@ +diff --git a/build.py b/build.py +index 148441f3..2aa0f1ea 100755 +--- a/build.py ++++ b/build.py +@@ -69,7 +69,9 @@ def zip_files(py_version: str, source: str, target: str, dev: bool) -> None: + """ + archive_name = "plugin.video.jellyfin+{}.zip".format(py_version) + +- with zipfile.ZipFile("{}/{}".format(target, archive_name), "w") as z: ++ with zipfile.ZipFile( ++ "{}/{}".format(target, archive_name), "w", strict_timestamps=False ++ ) as z: + for root, dirs, files in os.walk(args.source): + for filename in filter(file_filter, files): + file_path = os.path.join(root, filename) diff --git a/pkgs/applications/video/kodi/addons/orftvthek/default.nix b/pkgs/applications/video/kodi/addons/orftvthek/default.nix index 416cb9a30a6be..64b822c355107 100644 --- a/pkgs/applications/video/kodi/addons/orftvthek/default.nix +++ b/pkgs/applications/video/kodi/addons/orftvthek/default.nix @@ -1,27 +1,27 @@ -{ lib, buildKodiAddon, fetchFromGitHub, future, kodi-six, simplejson, inputstreamhelper }: +{ lib, buildKodiAddon, fetchFromGitHub, inputstream-adaptive, inputstreamhelper, routing }: buildKodiAddon rec { pname = "orftvthek"; namespace = "plugin.video.orftvthek"; - version = "0.12.12"; + version = "1.0.2+matrix.1"; src = fetchFromGitHub { owner = "s0faking"; repo = namespace; rev = version; - sha256 = "sha256-4VLr4DFxioCrlq5JtiPyd7E4a+++cWgxCnRb3KPppWE="; + sha256 = "sha256-bCVsR7lH0REJmG3OKU8mRRvw/PhSrLfhufmVBmw05+k="; }; propagatedBuildInputs = [ - future - kodi-six - simplejson + # Needed for content decryption with Widevine. + inputstream-adaptive inputstreamhelper + routing ]; meta = with lib; { homepage = "https://github.com/s0faking/plugin.video.orftvthek"; - description = "Addon that gives you access to the ORF TVthek Video Platform"; + description = "Addon for accessing the Austrian ORF ON streaming service"; license = licenses.gpl2Only; maintainers = teams.kodi.members; }; diff --git a/pkgs/applications/video/kodi/addons/osmc-skin/default.nix b/pkgs/applications/video/kodi/addons/osmc-skin/default.nix index 2cf5f8784dc1f..7644a71d71bc9 100644 --- a/pkgs/applications/video/kodi/addons/osmc-skin/default.nix +++ b/pkgs/applications/video/kodi/addons/osmc-skin/default.nix @@ -15,7 +15,7 @@ buildKodiAddon rec { homepage = "https://github.com/osmc/skin.osmc"; description = "Default skin for OSMC"; platforms = platforms.all; - maintainers = with maintainers; [ ]; + maintainers = [ ]; license = licenses.cc-by-nc-sa-30; broken = true; # no release for kodi 21 diff --git a/pkgs/applications/video/kodi/addons/pdfreader/default.nix b/pkgs/applications/video/kodi/addons/pdfreader/default.nix index c2c11e92213f4..60a08a9cfbeae 100644 --- a/pkgs/applications/video/kodi/addons/pdfreader/default.nix +++ b/pkgs/applications/video/kodi/addons/pdfreader/default.nix @@ -2,13 +2,13 @@ buildKodiAddon rec { pname = "pdfreader"; namespace = "plugin.image.pdf"; - version = "2.0.2"; + version = "2.0.3"; src = fetchFromGitHub { owner = "i96751414"; repo = "plugin.image.pdfreader"; rev = "v${version}"; - sha256 = "0nkqhlm1gyagq6xpdgqvd5qxyr2ngpml9smdmzfabc8b972mwjml"; + sha256 = "sha256-J93poR5VO9fAgNCEGftJVYnpXOsJSxnhHI6TAJZ2LeI="; }; passthru.pythonPath = "lib/api"; diff --git a/pkgs/applications/video/kodi/addons/pvr-hts/default.nix b/pkgs/applications/video/kodi/addons/pvr-hts/default.nix index 9b20235e8ea17..50e12c09c1c8b 100644 --- a/pkgs/applications/video/kodi/addons/pvr-hts/default.nix +++ b/pkgs/applications/video/kodi/addons/pvr-hts/default.nix @@ -2,13 +2,13 @@ buildKodiBinaryAddon rec { pname = "pvr-hts"; namespace = "pvr.hts"; - version = "21.2.3"; + version = "21.2.5"; src = fetchFromGitHub { owner = "kodi-pvr"; repo = "pvr.hts"; rev = "${version}-${rel}"; - sha256 = "sha256-4jHcUjGarLHsn5CjBLWB1wQNjBBw4ftMuDY5uFAHAzY="; + sha256 = "sha256-BG5mGD674gvjUSdydu4g3F/4GH53gkJoKMDuvaFNi6k="; }; meta = with lib; { diff --git a/pkgs/applications/video/kodi/addons/pvr-iptvsimple/default.nix b/pkgs/applications/video/kodi/addons/pvr-iptvsimple/default.nix index 59f39a06fd71e..b976c15371f2f 100644 --- a/pkgs/applications/video/kodi/addons/pvr-iptvsimple/default.nix +++ b/pkgs/applications/video/kodi/addons/pvr-iptvsimple/default.nix @@ -6,13 +6,13 @@ buildKodiBinaryAddon rec { pname = "pvr-iptvsimple"; namespace = "pvr.iptvsimple"; - version = "21.8.4"; + version = "21.8.5"; src = fetchFromGitHub { owner = "kodi-pvr"; repo = "pvr.iptvsimple"; rev = "${version}-${rel}"; - sha256 = "sha256-uuqk1kJnioCaRWIkC5liPSVRQPpviuaE+wmE4rq6fJw="; + sha256 = "sha256-UFEZZr7Z6GqnN8ZSA+JkdsiAlf7p5xPwDOcwLzJc9v8="; }; extraBuildInputs = [ diff --git a/pkgs/applications/video/kodi/addons/pvr-vdr-vnsi/default.nix b/pkgs/applications/video/kodi/addons/pvr-vdr-vnsi/default.nix index 9fdbee949d8fd..85729e1290435 100644 --- a/pkgs/applications/video/kodi/addons/pvr-vdr-vnsi/default.nix +++ b/pkgs/applications/video/kodi/addons/pvr-vdr-vnsi/default.nix @@ -2,13 +2,13 @@ buildKodiBinaryAddon rec { pname = "pvr-vdr-vnsi"; namespace = "pvr.vdr.vnsi"; - version = "21.1.1"; + version = "21.1.2"; src = fetchFromGitHub { owner = "kodi-pvr"; repo = "pvr.vdr.vnsi"; rev = "${version}-${rel}"; - sha256 = "sha256-Bd/21y3oAhQMmvrZzrN5Z6jLHySBd2LXNbLt/Me4jSw="; + sha256 = "sha256-o7WVO/TvSK6bZEnUeNQhapXOVQbDlpJDObC93/9XpJo="; }; extraBuildInputs = [ libGL ]; diff --git a/pkgs/applications/video/kodi/addons/sendtokodi/default.nix b/pkgs/applications/video/kodi/addons/sendtokodi/default.nix index f6946842ded41..792f585673dd0 100644 --- a/pkgs/applications/video/kodi/addons/sendtokodi/default.nix +++ b/pkgs/applications/video/kodi/addons/sendtokodi/default.nix @@ -1,4 +1,4 @@ -{ lib, buildKodiAddon, fetchFromGitHub, addonUpdateScript, kodi, inputstreamhelper }: +{ lib, buildKodiAddon, fetchFromGitHub, kodi, inputstreamhelper }: buildKodiAddon rec { pname = "sendtokodi"; @@ -13,7 +13,10 @@ buildKodiAddon rec { }; patches = [ - ./use-packaged-deps.patch + # Unconditionally depend on packaged yt-dlp. This removes the ability to + # use youtube_dl, which is unmaintained and considered vulnerable (see + # CVE-2024-38519). + ./use-packaged-yt-dlp.patch ]; propagatedBuildInputs = [ @@ -26,14 +29,14 @@ buildKodiAddon rec { ''; passthru = { - # Instead of the vendored libraries, we propagate youtube-dl and yt-dlp via - # the Python path. - pythonPath = with kodi.pythonPackages; makePythonPath [ youtube-dl yt-dlp ]; + # Instead of the vendored libraries, we propagate yt-dlp via the Python + # path. + pythonPath = with kodi.pythonPackages; makePythonPath [ yt-dlp ]; }; meta = with lib; { homepage = "https://github.com/firsttris/plugin.video.sendtokodi"; - description = "Plays various stream sites on Kodi using youtube-dl"; + description = "Plays various stream sites on Kodi using yt-dlp"; license = licenses.mit; maintainers = teams.kodi.members ++ [ maintainers.pks ]; }; diff --git a/pkgs/applications/video/kodi/addons/sendtokodi/use-packaged-deps.patch b/pkgs/applications/video/kodi/addons/sendtokodi/use-packaged-yt-dlp.patch index abfea58a7ceb8..b53e1a434fffc 100644 --- a/pkgs/applications/video/kodi/addons/sendtokodi/use-packaged-deps.patch +++ b/pkgs/applications/video/kodi/addons/sendtokodi/use-packaged-yt-dlp.patch @@ -1,16 +1,18 @@ diff --git a/service.py b/service.py -index 1d7b6e4..9782993 100644 +index 024ad9a..6ef71dd 100644 --- a/service.py +++ b/service.py -@@ -241,9 +241,9 @@ def playlistIndex(url, playlist): +@@ -243,11 +243,8 @@ def playlistIndex(url, playlist): + # Use the chosen resolver while forcing to use youtube_dl on legacy python 2 systems (dlp is python 3.6+) - if xbmcplugin.getSetting(int(sys.argv[1]),"resolver") == "0" or sys.version_info[0] == 2: +-if xbmcplugin.getSetting(int(sys.argv[1]),"resolver") == "0" or sys.version_info[0] == 2: - from lib.youtube_dl import YoutubeDL -+ from youtube_dl import YoutubeDL - else: +-else: - from lib.yt_dlp import YoutubeDL -+ from yt_dlp import YoutubeDL - +- ++from yt_dlp import YoutubeDL ++ # patch broken strptime (see above) patch_strptime() + diff --git a/pkgs/applications/video/kodi/addons/websocket/default.nix b/pkgs/applications/video/kodi/addons/websocket/default.nix index 40667e71392bb..544f86a8bbbd9 100644 --- a/pkgs/applications/video/kodi/addons/websocket/default.nix +++ b/pkgs/applications/video/kodi/addons/websocket/default.nix @@ -1,4 +1,4 @@ -{ lib, rel, buildKodiAddon, fetchzip, addonUpdateScript, six, addonDir }: +{ lib, rel, buildKodiAddon, fetchzip, addonUpdateScript, six }: buildKodiAddon rec { pname = "websocket"; diff --git a/pkgs/applications/video/kodi/addons/youtube/default.nix b/pkgs/applications/video/kodi/addons/youtube/default.nix index 6ea0ca5c9b5d5..8c007ec4b83ef 100644 --- a/pkgs/applications/video/kodi/addons/youtube/default.nix +++ b/pkgs/applications/video/kodi/addons/youtube/default.nix @@ -3,13 +3,13 @@ buildKodiAddon rec { pname = "youtube"; namespace = "plugin.video.youtube"; - version = "7.0.8"; + version = "7.0.9.2"; src = fetchFromGitHub { owner = "anxdpanic"; repo = "plugin.video.youtube"; rev = "v${version}"; - hash = "sha256-cWqAHC3UYDWk0cL/to9kCdH+SSN3ra+Ni6HTwposNkg="; + hash = "sha256-42BBvXIrPAAhNgrGyPTK5dgg2DACPTT6/jRUoYcihFA="; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/video/kodi/no-python-lib.patch b/pkgs/applications/video/kodi/no-python-lib.patch new file mode 100644 index 0000000000000..d45e02dd18461 --- /dev/null +++ b/pkgs/applications/video/kodi/no-python-lib.patch @@ -0,0 +1,13 @@ +diff --git a/cmake/scripts/linux/Install.cmake b/cmake/scripts/linux/Install.cmake +index 9c45c91774..763d6acab4 100644 +--- a/cmake/scripts/linux/Install.cmake ++++ b/cmake/scripts/linux/Install.cmake +@@ -199,8 +199,6 @@ install(FILES ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/scripts/${APP_NAME}Config.cm + + if(ENABLE_EVENTCLIENTS) + find_package(PythonInterpreter REQUIRED) +- execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(prefix=''))" +- OUTPUT_VARIABLE PYTHON_LIB_PATH OUTPUT_STRIP_TRAILING_WHITESPACE) + # Install kodi-eventclients-common BT python files + install(PROGRAMS ${CMAKE_SOURCE_DIR}/tools/EventClients/lib/python/bt/__init__.py + ${CMAKE_SOURCE_DIR}/tools/EventClients/lib/python/bt/bt.py diff --git a/pkgs/applications/video/kodi/unwrapped.nix b/pkgs/applications/video/kodi/unwrapped.nix index e8e5b5844f1f4..374837b01b38c 100644 --- a/pkgs/applications/video/kodi/unwrapped.nix +++ b/pkgs/applications/video/kodi/unwrapped.nix @@ -4,7 +4,7 @@ , libxcrypt, libgcrypt, libgpg-error, libunistring , boost, avahi, lame , gettext, pcre-cpp, yajl, fribidi, which -, openssl, gperf, tinyxml2, tinyxml-2, taglib, libssh, swig, jre_headless +, openssl, gperf, tinyxml2, tinyxml-2, taglib, libssh, jre_headless , gtest, ncurses, spdlog , libxml2, systemd , alsa-lib, libGLU, libGL, ffmpeg, fontconfig, freetype, ftgl @@ -13,7 +13,7 @@ , libogg, libvorbis, flac, libxslt , lzo, libcdio, libmodplug, libass, libbluray, libudfread , sqlite, libmysqlclient, nasm, gnutls, libva, libdrm -, curl, bzip2, zip, unzip, glxinfo +, curl, bzip2, zip, unzip, mesa-demos , libcec, libcec_platform, dcadec, libuuid , libcrossguid, libmicrohttpd , bluez, doxygen, giflib, glib, harfbuzz, lcms2, libidn2, libpthreadstubs, libtasn1 @@ -87,16 +87,20 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "kodi"; - version = "21.0"; + version = "21.1"; kodiReleaseName = "Omega"; src = fetchFromGitHub { owner = "xbmc"; repo = "xbmc"; rev = "${finalAttrs.version}-${finalAttrs.kodiReleaseName}"; - hash = "sha256-xrFWqgwTkurEwt3/+/e4SCM6Uk9nxuW62SrCFWWqZO0="; + hash = "sha256-NjId1T1cw9dl0Fx1QDsijiN1VUpuQ/EFl1kxWSESCR4="; }; + patches = [ + ./no-python-lib.patch + ]; + # make derivations declared in the let binding available here, so # they can be overridden inherit libdvdcss libdvdnav libdvdread groovy @@ -115,7 +119,7 @@ in stdenv.mkDerivation (finalAttrs: { libogg libvorbis flac libxslt systemd lzo libcdio libmodplug libass libbluray libudfread sqlite libmysqlclient avahi lame - curl bzip2 zip unzip glxinfo + curl bzip2 zip unzip mesa-demos libcec libcec_platform dcadec libuuid libxcrypt libgcrypt libgpg-error libunistring libcrossguid libplist @@ -189,6 +193,7 @@ in stdenv.mkDerivation (finalAttrs: { "-DSWIG_EXECUTABLE=${buildPackages.swig}/bin/swig" "-DFLATBUFFERS_FLATC_EXECUTABLE=${buildPackages.flatbuffers}/bin/flatc" "-DPYTHON_EXECUTABLE=${buildPackages.python3Packages.python}/bin/python" + "-DPYTHON_LIB_PATH=${python3Packages.python.sitePackages}" # When wrapped KODI_HOME will likely contain symlinks to static assets # that Kodi's built in webserver will cautiously refuse to serve up # (because their realpaths are outside of KODI_HOME and the other @@ -224,7 +229,7 @@ in stdenv.mkDerivation (finalAttrs: { # TODO: figure out which binaries should be wrapped this way and which shouldn't for p in $(ls --ignore=kodi-send $out/bin/) ; do wrapProgram $out/bin/$p \ - --prefix PATH ":" "${lib.makeBinPath ([ python3Packages.python glxinfo ] + --prefix PATH ":" "${lib.makeBinPath ([ python3Packages.python mesa-demos ] ++ lib.optional x11Support xdpyinfo ++ lib.optional sambaSupport samba)}" \ --prefix LD_LIBRARY_PATH ":" "${lib.makeLibraryPath ([ curl systemd libmad libcec libcec_platform libass ] @@ -256,5 +261,6 @@ in stdenv.mkDerivation (finalAttrs: { license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = teams.kodi.members; + mainProgram = "kodi"; }; }) diff --git a/pkgs/applications/video/lightworks/default.nix b/pkgs/applications/video/lightworks/default.nix index ea2f0bde5e33c..c803e906e2d81 100644 --- a/pkgs/applications/video/lightworks/default.nix +++ b/pkgs/applications/video/lightworks/default.nix @@ -1,7 +1,30 @@ -{ lib, stdenv, fetchurl, dpkg, makeWrapper, buildFHSEnv -, gtk3, gdk-pixbuf, cairo, libjpeg_original, glib, pango, libGLU -, libGL, nvidia_cg_toolkit, zlib, openssl, libuuid -, alsa-lib, udev, libjack2, freetype, libva, libvdpau +{ + lib, + stdenv, + fetchurl, + dpkg, + makeWrapper, + buildFHSEnv, + gtk3, + gdk-pixbuf, + cairo, + libjpeg_original, + glib, + pango, + libGLU, + libGL, + nvidia_cg_toolkit, + zlib, + openssl, + libuuid, + alsa-lib, + udev, + libjack2, + freetype, + libva, + libvdpau, + twolame, + gmp, }: let fullPath = lib.makeLibraryPath [ @@ -24,20 +47,23 @@ let freetype libva libvdpau + twolame + gmp ]; lightworks = stdenv.mkDerivation rec { version = "2023.2"; - rev = "146240"; + rev = "146752"; pname = "lightworks"; src = if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://cdn.lwks.com/releases/${version}/lightworks_${version}_r${rev}.deb"; - sha256 = "sha256-sVEDCZZsY5OwuWebrhatzZiws89/tEKIdgY54PN0Ddo="; + sha256 = "sha256-Xjcqdhe85YdPX8AHpKmo/K77AURg0JvtqIvilQOV2ek="; } - else throw "${pname}-${version} is not supported on ${stdenv.hostPlatform.system}"; + else + throw "${pname}-${version} is not supported on ${stdenv.hostPlatform.system}"; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ dpkg ]; @@ -76,13 +102,12 @@ let dontPatchELF = true; }; +in # Lightworks expects some files in /usr/share/lightworks -in buildFHSEnv { - name = lightworks.name; +buildFHSEnv { + inherit (lightworks) pname version; - targetPkgs = pkgs: [ - lightworks - ]; + targetPkgs = pkgs: [ lightworks ]; runScript = "lightworks"; @@ -91,7 +116,12 @@ in buildFHSEnv { homepage = "https://www.lwks.com/"; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; - maintainers = with lib.maintainers; [ antonxy vojta001 kashw2 ]; + mainProgram = "lightworks"; + maintainers = with lib.maintainers; [ + antonxy + vojta001 + kashw2 + ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/video/losslesscut-bin/build-from-appimage.nix b/pkgs/applications/video/losslesscut-bin/build-from-appimage.nix index 14e4cf215e7bc..c72568d3805d4 100644 --- a/pkgs/applications/video/losslesscut-bin/build-from-appimage.nix +++ b/pkgs/applications/video/losslesscut-bin/build-from-appimage.nix @@ -1,9 +1,6 @@ -{ lib -, appimageTools +{ appimageTools , fetchurl , makeWrapper -, gtk3 -, gsettings-desktop-schemas , pname , version , hash @@ -25,6 +22,8 @@ in appimageTools.wrapType2 { inherit pname version src; + nativeBuildInputs = [ makeWrapper ]; + profile = '' export LC_ALL=C.UTF-8 ''; @@ -41,7 +40,6 @@ appimageTools.wrapType2 { cp ${extracted}/losslesscut.desktop $out/share/applications substituteInPlace $out/share/applications/losslesscut.desktop \ --replace AppRun losslesscut - source "${makeWrapper}/nix-support/setup-hook" wrapProgram "$out/bin/losslesscut" \ --add-flags "--disable-seccomp-filter-sandbox" ''; diff --git a/pkgs/applications/video/lxdvdrip/default.nix b/pkgs/applications/video/lxdvdrip/default.nix index 6b9c8ef2fd14f..32b533346dfdb 100644 --- a/pkgs/applications/video/lxdvdrip/default.nix +++ b/pkgs/applications/video/lxdvdrip/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ libdvdread ]; meta = { - broken = (stdenv.isLinux && stdenv.isAarch64); + broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); description = "Command line tool to make a copy from a video DVD for private use"; homepage = "https://sourceforge.net/projects/lxdvdrip"; license = lib.licenses.gpl2; diff --git a/pkgs/applications/video/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/minitube/default.nix b/pkgs/applications/video/minitube/default.nix index 557eba2b87b11..0f290f01459c8 100644 --- a/pkgs/applications/video/minitube/default.nix +++ b/pkgs/applications/video/minitube/default.nix @@ -9,7 +9,7 @@ mkDerivation rec { version = "3.9.3"; src = fetchFromGitHub { - sha256 = "sha256-ROqROQsV8ddrxYT5mMdkf6rCgCoGr1jpxQ1ohcoEaQs="; + hash = "sha256-ROqROQsV8ddrxYT5mMdkf6rCgCoGr1jpxQ1ohcoEaQs="; rev = version; repo = "minitube"; owner = "flaviotordini"; @@ -38,7 +38,7 @@ mkDerivation rec { homepage = "https://flavio.tordini.org/minitube"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ ]; + maintainers = [ ]; mainProgram = "minitube"; }; } diff --git a/pkgs/applications/video/mirakurun/default.nix b/pkgs/applications/video/mirakurun/default.nix index 3d8034521c89a..a1d9d58403d07 100644 --- a/pkgs/applications/video/mirakurun/default.nix +++ b/pkgs/applications/video/mirakurun/default.nix @@ -41,7 +41,7 @@ buildNpmPackage rec { bash nodejs which - ] ++ lib.optionals stdenv.isLinux [ v4l-utils ]; + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ v4l-utils ]; crc32Patch = substituteAll { src = ./fix-musl-detection.patch; isMusl = if stdenv.hostPlatform.isMusl then "true" else "false"; diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index 8aaa0cf1448a3..7d4ced909df61 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -49,13 +49,13 @@ let in stdenv.mkDerivation rec { pname = "mkvtoolnix"; - version = "85.0"; + version = "87.0"; src = fetchFromGitLab { owner = "mbunkus"; repo = "mkvtoolnix"; rev = "release-${version}"; - hash = "sha256-E8fULDUkEnh/0W/OIh+peO+JXSecgINPJclOTc5KYVo="; + hash = "sha256-UU57ZgH1sxCXspwfKXScw08aJYiv+k526U8q8N1tA+4="; }; nativeBuildInputs = [ @@ -91,8 +91,8 @@ stdenv.mkDerivation rec { zlib ] ++ optionals withGUI [ cmark ] - ++ optionals stdenv.isLinux [ qtwayland ] - ++ optionals stdenv.isDarwin [ libiconv ]; + ++ optionals stdenv.hostPlatform.isLinux [ qtwayland ] + ++ optionals stdenv.hostPlatform.isDarwin [ libiconv ]; # autoupdate is not needed but it silences a ton of pointless warnings postPatch = '' diff --git a/pkgs/applications/video/mlv-app/default.nix b/pkgs/applications/video/mlv-app/default.nix index 05c6799e4213b..da9f4d5807e10 100644 --- a/pkgs/applications/video/mlv-app/default.nix +++ b/pkgs/applications/video/mlv-app/default.nix @@ -18,7 +18,7 @@ mkDerivation rec { sha256 = "sha256-RfZXHmWSjZBxNFwQ/bzHppsLS0LauURIdnkAzxAIBcU="; }; - patches = if stdenv.isAarch64 then ./aarch64-flags.patch else null; + patches = if stdenv.hostPlatform.isAarch64 then ./aarch64-flags.patch else null; installPhase = '' runHook preInstall @@ -54,7 +54,7 @@ mkDerivation rec { description = "All in one MLV processing app that is pretty great"; homepage = "https://mlv.app"; license = licenses.gpl3; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = platforms.linux; mainProgram = "mlvapp"; }; diff --git a/pkgs/applications/video/motion/default.nix b/pkgs/applications/video/motion/default.nix index 95bc378192407..5e02d58977ceb 100644 --- a/pkgs/applications/video/motion/default.nix +++ b/pkgs/applications/video/motion/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "motion"; - version = "4.6.0"; + version = "4.7.0"; src = fetchFromGitHub { owner = "Motion-Project"; repo = "motion"; rev = "release-${version}"; - sha256 = "sha256-f23glk91HWSEW/Glq/DdEikTQeg1eELEg4XG9zTsU78="; + sha256 = "sha256-bGjiO14a7xKRgoeo5JlexXlKggE+agRMmQViBXagmt8="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ puffnfresh veprbl ]; platforms = platforms.unix; # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin && stdenv.isAarch64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; mainProgram = "motion"; }; } diff --git a/pkgs/applications/video/mpc-qt/default.nix b/pkgs/applications/video/mpc-qt/default.nix index 9bb23b548e3fb..c3f6981503c8f 100644 --- a/pkgs/applications/video/mpc-qt/default.nix +++ b/pkgs/applications/video/mpc-qt/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "mpc-qt"; - version = "23.12"; + version = "24.06"; src = fetchFromGitHub { owner = "mpc-qt"; repo = "mpc-qt"; rev = "v${version}"; - hash = "sha256-v22o5QtCY9Z8bPoIkwypG0oTBEPqPFeKZ8cWO+pKCD0="; + hash = "sha256-kEG7B99io3BGjN94nEX1pN10Bcjj21rb46Vcn2OtpN8="; }; nativeBuildInputs = [ @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { homepage = "https://mpc-qt.github.io"; license = licenses.gpl2; platforms = platforms.unix; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; maintainers = with maintainers; [ romildo ]; mainProgram = "mpc-qt"; }; diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix index 97d1baf9c3e3f..352c7b7edae7a 100644 --- a/pkgs/applications/video/mplayer/default.nix +++ b/pkgs/applications/video/mplayer/default.nix @@ -1,15 +1,15 @@ -{ config, lib, stdenv, fetchurl, fetchsvn, pkg-config, freetype, yasm, ffmpeg_4 +{ config, lib, stdenv, fetchurl, fetchsvn, pkg-config, freetype, yasm, ffmpeg_7 , aalibSupport ? true, aalib , fontconfigSupport ? true, fontconfig, freefont_ttf , fribidiSupport ? true, fribidi , x11Support ? true, libX11, libXext, libGLU, libGL , xineramaSupport ? true, libXinerama , xvSupport ? true, libXv -, alsaSupport ? stdenv.isLinux, alsa-lib +, alsaSupport ? stdenv.hostPlatform.isLinux, alsa-lib , screenSaverSupport ? true, libXScrnSaver , vdpauSupport ? false, libvdpau -, cddaSupport ? !stdenv.isDarwin, cdparanoia -, dvdnavSupport ? !stdenv.isDarwin, libdvdnav +, cddaSupport ? !stdenv.hostPlatform.isDarwin, cdparanoia +, dvdnavSupport ? !stdenv.hostPlatform.isDarwin, libdvdnav , dvdreadSupport ? true, libdvdread , bluraySupport ? true, libbluray , amrSupport ? false, amrnb, amrwb @@ -70,12 +70,12 @@ in stdenv.mkDerivation rec { pname = "mplayer"; - version = "unstable-2022-02-03"; + version = "1.5-unstable-2024-07-03"; src = fetchsvn { url = "svn://svn.mplayerhq.hu/mplayer/trunk"; - rev = "38331"; - sha256 = "1vpic8i6zvg0zsy50vhm45ysqag561bpn9jycfbvvwl9ji7l55zi"; + rev = "38637"; + hash = "sha256-9KQOB6QIs1VZhazJqW8dY4ASiMgoxV6davfpKgLPbmE="; }; prePatch = '' @@ -86,38 +86,37 @@ stdenv.mkDerivation rec { depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ pkg-config yasm ]; - buildInputs = with lib; - [ freetype ffmpeg_4 ] - ++ optional aalibSupport aalib - ++ optional fontconfigSupport fontconfig - ++ optional fribidiSupport fribidi - ++ optionals x11Support [ libX11 libXext libGLU libGL ] - ++ optional alsaSupport alsa-lib - ++ optional xvSupport libXv - ++ optional theoraSupport libtheora - ++ optional cacaSupport libcaca - ++ optional xineramaSupport libXinerama - ++ optional dvdnavSupport libdvdnav - ++ optional dvdreadSupport libdvdread - ++ optional bluraySupport libbluray - ++ optional cddaSupport cdparanoia - ++ optional jackaudioSupport libjack2 - ++ optionals amrSupport [ amrnb amrwb ] - ++ optional x264Support x264 - ++ optional pulseSupport libpulseaudio - ++ optional screenSaverSupport libXScrnSaver - ++ optional lameSupport lame - ++ optional vdpauSupport libvdpau - ++ optional speexSupport speex - ++ optional libpngSupport libpng - ++ optional libjpegSupport libjpeg - ++ optional bs2bSupport libbs2b - ++ optional v4lSupport libv4l - ++ (with darwin.apple_sdk.frameworks; optionals stdenv.isDarwin [ Cocoa OpenGL ]) + buildInputs = [ freetype ffmpeg_7 ] + ++ lib.optional aalibSupport aalib + ++ lib.optional fontconfigSupport fontconfig + ++ lib.optional fribidiSupport fribidi + ++ lib.optionals x11Support [ libX11 libXext libGLU libGL ] + ++ lib.optional alsaSupport alsa-lib + ++ lib.optional xvSupport libXv + ++ lib.optional theoraSupport libtheora + ++ lib.optional cacaSupport libcaca + ++ lib.optional xineramaSupport libXinerama + ++ lib.optional dvdnavSupport libdvdnav + ++ lib.optional dvdreadSupport libdvdread + ++ lib.optional bluraySupport libbluray + ++ lib.optional cddaSupport cdparanoia + ++ lib.optional jackaudioSupport libjack2 + ++ lib.optionals amrSupport [ amrnb amrwb ] + ++ lib.optional x264Support x264 + ++ lib.optional pulseSupport libpulseaudio + ++ lib.optional screenSaverSupport libXScrnSaver + ++ lib.optional lameSupport lame + ++ lib.optional vdpauSupport libvdpau + ++ lib.optional speexSupport speex + ++ lib.optional libpngSupport libpng + ++ lib.optional libjpegSupport libjpeg + ++ lib.optional bs2bSupport libbs2b + ++ lib.optional v4lSupport libv4l + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Cocoa darwin.apple_sdk.frameworks.OpenGL ] ; configurePlatforms = [ ]; - configureFlags = with lib; [ + configureFlags = [ "--enable-freetype" (if fontconfigSupport then "--enable-fontconfig" else "--disable-fontconfig") (if x11Support then "--enable-x11 --enable-gl" else "--disable-x11 --disable-gl") @@ -143,18 +142,14 @@ stdenv.mkDerivation rec { "--disable-ossaudio" "--disable-ffmpeg_a" "--yasm=${buildPackages.yasm}/bin/yasm" - # Note, the `target` vs `host` confusion is intensional. + # Note, the `target` vs `host` confusion is intentional. "--target=${stdenv.hostPlatform.config}" - ] ++ optional - (useUnfreeCodecs && codecs != null && !crossBuild) - "--codecsdir=${codecs}" - ++ optional - (stdenv.hostPlatform.isx86 && !crossBuild) - "--enable-runtime-cpudetection" - ++ optional fribidiSupport "--enable-fribidi" - ++ optional (stdenv.isLinux && !stdenv.isAarch64) "--enable-vidix" - ++ optional stdenv.isLinux "--enable-fbdev" - ++ optionals (crossBuild) [ + ] ++ lib.optional (useUnfreeCodecs && codecs != null && !crossBuild) "--codecsdir=${codecs}" + ++ lib.optional (stdenv.hostPlatform.isx86 && !crossBuild) "--enable-runtime-cpudetection" + ++ lib.optional fribidiSupport "--enable-fribidi" + ++ lib.optional (stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAarch64) "--enable-vidix" + ++ lib.optional stdenv.hostPlatform.isLinux "--enable-fbdev" + ++ lib.optionals (crossBuild) [ "--enable-cross-compile" "--disable-vidix-pcidb" "--with-vidix-drivers=no" @@ -179,11 +174,11 @@ stdenv.mkDerivation rec { # Fixes compilation with newer versions of clang that make these warnings errors by default. NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-int-conversion -Wno-incompatible-function-pointer-types"; - NIX_LDFLAGS = with lib; toString ( - optional fontconfigSupport "-lfontconfig" - ++ optional fribidiSupport "-lfribidi" - ++ optionals x11Support [ "-lX11" "-lXext" ] - ++ optional x264Support "-lx264" + NIX_LDFLAGS = toString ( + lib.optional fontconfigSupport "-lfontconfig" + ++ lib.optional fribidiSupport "-lfribidi" + ++ lib.optionals x11Support [ "-lX11" "-lXext" ] + ++ lib.optional x264Support "-lx264" ++ [ "-lfreetype" ] ); @@ -205,7 +200,7 @@ stdenv.mkDerivation rec { description = "Movie player that supports many video formats"; homepage = "http://mplayerhq.hu"; license = licenses.gpl2Only; - maintainers = with maintainers; [ eelco ]; + maintainers = [ ]; platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" "aarch64-darwin" "aarch64-linux" ]; }; } diff --git a/pkgs/applications/video/mpv/0001-fix-darwin-build.patch b/pkgs/applications/video/mpv/0001-fix-darwin-build.patch deleted file mode 100644 index c7e486a3c5d14..0000000000000 --- a/pkgs/applications/video/mpv/0001-fix-darwin-build.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- a/osdep/mac/input_helper.swift -+++ b/osdep/mac/input_helper.swift -@@ -18,6 +18,14 @@ - import Cocoa - import Carbon.HIToolbox - -+extension NSCondition { -+ fileprivate func withLock<T>(_ body: () throws -> T) rethrows -> T { -+ self.lock() -+ defer { self.unlock() } -+ return try body() -+ } -+} -+ - class InputHelper: NSObject { - var option: OptionHelper? - var lock = NSCondition() ---- a/audio/out/ao_avfoundation.m -+++ b/audio/out/ao_avfoundation.m -@@ -312,7 +312,8 @@ - -+ #if __MAC_OS_X_VERSION_MAX_ALLOWED >= 120000 - p->observer = [[AVObserver alloc] initWithAO:ao]; - NSNotificationCenter *center = [NSNotificationCenter defaultCenter]; - [center addObserver:p->observer selector:@selector(handleRestartNotification:) name:AVSampleBufferAudioRendererOutputConfigurationDidChangeNotification object:p->renderer]; - [center addObserver:p->observer selector:@selector(handleRestartNotification:) name:AVSampleBufferAudioRendererWasFlushedAutomaticallyNotification object:p->renderer]; -- -+ #endif - return CONTROL_OK; diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 0f9cec9c409bd..20601537d3734 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -1,7 +1,7 @@ { lib, SDL2, - addOpenGLRunpath, + addDriverRunpath, alsa-lib, bash, buildPackages, @@ -72,37 +72,37 @@ zimg, # Boolean - alsaSupport ? stdenv.isLinux, + alsaSupport ? stdenv.hostPlatform.isLinux, archiveSupport ? true, bluraySupport ? true, bs2bSupport ? true, cacaSupport ? true, cddaSupport ? false, cmsSupport ? true, - drmSupport ? stdenv.isLinux, - dvbinSupport ? stdenv.isLinux, - dvdnavSupport ? stdenv.isLinux, + drmSupport ? stdenv.hostPlatform.isLinux, + dvbinSupport ? stdenv.hostPlatform.isLinux, + dvdnavSupport ? stdenv.hostPlatform.isLinux, jackaudioSupport ? false, javascriptSupport ? true, libpngSupport ? true, openalSupport ? true, - pipewireSupport ? stdenv.isLinux, - pulseSupport ? config.pulseaudio or stdenv.isLinux, + pipewireSupport ? stdenv.hostPlatform.isLinux, + pulseSupport ? config.pulseaudio or stdenv.hostPlatform.isLinux, rubberbandSupport ? true, screenSaverSupport ? true, - sdl2Support ? !stdenv.isDarwin, + sdl2Support ? !stdenv.hostPlatform.isDarwin, sixelSupport ? false, speexSupport ? true, - swiftSupport ? stdenv.isDarwin, + swiftSupport ? stdenv.hostPlatform.isDarwin, theoraSupport ? true, vaapiSupport ? x11Support || waylandSupport, vapoursynthSupport ? false, vdpauSupport ? true, - vulkanSupport ? stdenv.isLinux, - waylandSupport ? stdenv.isLinux, - x11Support ? stdenv.isLinux, - xineramaSupport ? stdenv.isLinux, - xvSupport ? stdenv.isLinux, + vulkanSupport ? stdenv.hostPlatform.isLinux, + waylandSupport ? stdenv.hostPlatform.isLinux, + x11Support ? stdenv.hostPlatform.isLinux, + xineramaSupport ? stdenv.hostPlatform.isLinux, + xvSupport ? stdenv.hostPlatform.isLinux, zimgSupport ? true, }: @@ -124,7 +124,7 @@ let platform // lib.optionalAttrs (platform ? darwinMinVersion) { darwinMinVersion = version; }; stdenv' = - if swiftSupport && stdenv.isDarwin && stdenv.isx86_64 then + if swiftSupport && stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64 then stdenv.override (old: { buildPlatform = overrideSDK old.buildPlatform "11.0"; hostPlatform = overrideSDK old.hostPlatform "11.0"; @@ -135,7 +135,7 @@ let in stdenv'.mkDerivation (finalAttrs: { pname = "mpv"; - version = "0.38.0"; + version = "0.39.0"; outputs = [ "out" @@ -148,14 +148,9 @@ stdenv'.mkDerivation (finalAttrs: { owner = "mpv-player"; repo = "mpv"; rev = "v${finalAttrs.version}"; - hash = "sha256-dFajnCpGlNqUv33A8eFEn8kjtzIPkcBY5j0gNVlaiIY="; + hash = "sha256-BOGh+QBTO7hrHohh+RqjSF8eHQH8jVBPjG/k4eyFaaM="; }; - patches = [ - # Fix build with Darwin SDK 11 - ./0001-fix-darwin-build.patch - ]; - postPatch = lib.concatStringsSep "\n" [ # Don't reference compile time dependencies or create a build outputs cycle # between out and dev @@ -194,7 +189,7 @@ stdenv'.mkDerivation (finalAttrs: { (lib.mesonEnable "swift-build" swiftSupport) (lib.mesonEnable "macos-cocoa-cb" swiftSupport) ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Toggle explicitly because it fails on darwin (lib.mesonEnable "videotoolbox-pl" vulkanSupport) ]; @@ -203,13 +198,13 @@ stdenv'.mkDerivation (finalAttrs: { nativeBuildInputs = [ - addOpenGLRunpath + addDriverRunpath docutils # for rst2man meson ninja pkg-config ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ buildPackages.darwin.sigtool xcbuild.xcrun ] @@ -283,9 +278,9 @@ stdenv'.mkDerivation (finalAttrs: { ++ lib.optionals xineramaSupport [ libXinerama ] ++ lib.optionals xvSupport [ libXv ] ++ lib.optionals zimgSupport [ zimg ] - ++ lib.optionals stdenv.isLinux [ nv-codec-headers-11 ] - ++ lib.optionals stdenv.isDarwin [ libiconv ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ nv-codec-headers-11 ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Accelerate CoreFoundation Cocoa @@ -293,12 +288,12 @@ stdenv'.mkDerivation (finalAttrs: { MediaPlayer VideoToolbox ] - ++ lib.optionals (stdenv.isDarwin && swiftSupport) [ + ++ lib.optionals (stdenv.hostPlatform.isDarwin && swiftSupport) [ AVFoundation CoreMedia ]; - postBuild = lib.optionalString stdenv.isDarwin '' + postBuild = lib.optionalString stdenv.hostPlatform.isDarwin '' pushd .. # Must be run from the source dir because it uses relative paths python3 TOOLS/osxbundle.py -s build/mpv popd @@ -315,23 +310,20 @@ stdenv'.mkDerivation (finalAttrs: { popd pushd $out/share/applications - # patch out smb protocol reference, since our ffmpeg can't handle it - substituteInPlace mpv.desktop --replace-fail "smb," "" - sed -e '/Icon=/ ! s|mpv|umpv|g; s|^Exec=.*|Exec=umpv %U|' \ mpv.desktop > umpv.desktop printf "NoDisplay=true\n" >> umpv.desktop popd '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications cp -r mpv.app $out/Applications ''; # Set RUNPATH so that libcuda in /run/opengl-driver(-32)/lib can be found. - # See the explanation in addOpenGLRunpath. - postFixup = lib.optionalString stdenv.isLinux '' - addOpenGLRunpath $out/bin/mpv + # See the explanation in addDriverRunpath. + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' + addDriverRunpath $out/bin/mpv patchShebangs --update --host $out/bin/umpv $out/bin/mpv_identify.sh ''; @@ -377,7 +369,6 @@ stdenv'.mkDerivation (finalAttrs: { fpletz globin ma27 - tadeokondrak ]; platforms = lib.platforms.unix; }; diff --git a/pkgs/applications/video/mpv/scripts/default.nix b/pkgs/applications/video/mpv/scripts/default.nix index c9e433e6fe00d..cfe4d9d150f6a 100644 --- a/pkgs/applications/video/mpv/scripts/default.nix +++ b/pkgs/applications/video/mpv/scripts/default.nix @@ -41,40 +41,38 @@ let } # can't check whether `fullScriptPath` is a directory, in pure-evaluation mode - ( - with lib; - optionalAttrs - ( - !any (s: hasSuffix s drv.passthru.scriptName) [ - ".js" - ".lua" - ".so" - ] - ) - { - single-main-in-script-dir = - runCommand "mpvScripts.${name}.passthru.tests.single-main-in-script-dir" - { - meta.maintainers = with lib.maintainers; [ nicoo ]; - preferLocalBuild = true; + (lib.optionalAttrs + ( + !lib.any (s: lib.hasSuffix s drv.passthru.scriptName) [ + ".js" + ".lua" + ".so" + ] + ) + { + single-main-in-script-dir = + runCommand "mpvScripts.${name}.passthru.tests.single-main-in-script-dir" + { + meta.maintainers = with lib.maintainers; [ nicoo ]; + preferLocalBuild = true; + } + '' + die() { + echo "$@" >&2 + exit 1 } - '' - die() { - echo "$@" >&2 - exit 1 - } - cd "${drv}/${scriptPath}" # so the glob expands to filenames only - mains=( main.* ) - if [ "''${#mains[*]}" -eq 1 ]; then - touch $out - elif [ "''${#mains[*]}" -eq 0 ]; then - die "'${scriptPath}' contains no 'main.*' file" - else - die "'${scriptPath}' contains multiple 'main.*' files:" "''${mains[*]}" - fi - ''; - } + cd "${drv}/${scriptPath}" # so the glob expands to filenames only + mains=( main.* ) + if [ "''${#mains[*]}" -eq 1 ]; then + touch $out + elif [ "''${#mains[*]}" -eq 0 ]; then + die "'${scriptPath}' contains no 'main.*' file" + else + die "'${scriptPath}' contains multiple 'main.*' files:" "''${mains[*]}" + fi + ''; + } ) ]; }; @@ -92,7 +90,12 @@ let autodeint autoload ; - inherit (callPackage ./occivink.nix { }) blacklistExtensions seekTo; + inherit (callPackage ./occivink.nix { }) + blacklistExtensions + crop + encode + seekTo + ; buildLua = callPackage ./buildLua.nix { }; autosubsync-mpv = callPackage ./autosubsync-mpv.nix { }; @@ -108,8 +111,10 @@ let modernx-zydezu = callPackage ./modernx-zydezu.nix { }; mpris = callPackage ./mpris.nix { }; mpv-cheatsheet = callPackage ./mpv-cheatsheet.nix { }; + mpv-discord = callPackage ./mpv-discord.nix { }; mpv-notify-send = callPackage ./mpv-notify-send.nix { }; mpv-osc-modern = callPackage ./mpv-osc-modern.nix { }; + mpv-osc-tethys = callPackage ./mpv-osc-tethys.nix { }; mpv-playlistmanager = callPackage ./mpv-playlistmanager.nix { }; mpv-slicing = callPackage ./mpv-slicing.nix { }; mpv-webm = callPackage ./mpv-webm.nix { }; @@ -135,13 +140,12 @@ let }; in -with lib; -pipe scope [ - (makeScope newScope) +lib.pipe scope [ + (lib.makeScope newScope) ( self: assert builtins.intersectAttrs self aliases == { }; - self // optionalAttrs config.allowAliases aliases + self // lib.optionalAttrs config.allowAliases aliases ) - recurseIntoAttrs + lib.recurseIntoAttrs ] diff --git a/pkgs/applications/video/mpv/scripts/dynamic-crop.nix b/pkgs/applications/video/mpv/scripts/dynamic-crop.nix index 541c83d5258ff..8f33f5db90663 100644 --- a/pkgs/applications/video/mpv/scripts/dynamic-crop.nix +++ b/pkgs/applications/video/mpv/scripts/dynamic-crop.nix @@ -7,19 +7,19 @@ buildLua { pname = "dynamic-crop"; - version = "0-unstable-2024-06-22"; + version = "0-unstable-2024-09-14"; src = fetchFromGitHub { owner = "Ashyni"; repo = "mpv-scripts"; - rev = "1fadd5ea3e31818db33c9372c40161db6fc1bdd3"; - hash = "sha256-nC0Iw+9PSGxc3OdYhEmFVa49Sw+rIbuFhgZvAphP4cM="; + rev = "d3f5685f5209ae548f8398b21d4dcbbea766d076"; + hash = "sha256-9v8ZsBj9F5Odhfo/iWGA3Ak/+gFrbe0FldrTyCKF6tk="; }; passthru.scriptName = "dynamic-crop.lua"; passthru.updateScript = unstableGitUpdater { }; meta = { - description = ''Script to "cropping" dynamically, hard-coded black bars detected with lavfi-cropdetect filter for Ultra Wide Screen or any screen (Smartphone/Tablet).''; + description = ''Script to "cropping" dynamically, hard-coded black bars detected with lavfi-cropdetect filter for Ultra Wide Screen or any screen (Smartphone/Tablet)''; homepage = "https://github.com/Ashyni/mpv-scripts"; license = lib.licenses.mit; maintainers = [ lib.maintainers.iynaix ]; diff --git a/pkgs/applications/video/mpv/scripts/manga-reader.nix b/pkgs/applications/video/mpv/scripts/manga-reader.nix index 4d8007d98d8d7..149e7c5137784 100644 --- a/pkgs/applications/video/mpv/scripts/manga-reader.nix +++ b/pkgs/applications/video/mpv/scripts/manga-reader.nix @@ -8,12 +8,12 @@ buildLua rec { pname = "manga-reader"; - version = "0-unstable-2024-03-17"; + version = "0-unstable-2024-07-05"; src = fetchFromGitHub { owner = "Dudemanguy"; repo = "mpv-manga-reader"; - rev = "6b65d98be7d20c8e272a4caa6c5018ed3a8bb2b3"; - hash = "sha256-54n513lpn1KCErXJHqL+GKdDE1P52LolS6xDott/epY="; + rev = "fb06931eed4092fa74a98266cd04fa507ea63e13"; + hash = "sha256-xtzDHv+zW/9LsLWo4Km7OQ05BVJlwqu9461i9ee94lM="; }; passthru.updateScript = unstableGitUpdater { }; diff --git a/pkgs/applications/video/mpv/scripts/memo.nix b/pkgs/applications/video/mpv/scripts/memo.nix index 5d9e2b50fae27..0b6022e3de3cf 100644 --- a/pkgs/applications/video/mpv/scripts/memo.nix +++ b/pkgs/applications/video/mpv/scripts/memo.nix @@ -7,13 +7,13 @@ buildLua { pname = "memo"; - version = "0-unstable-2023-10-31"; + version = "0-unstable-2024-09-03"; src = fetchFromGitHub { owner = "po5"; repo = "memo"; - rev = "6f2b036ef860e130ea584657389e0a7ceb4d954f"; - hash = "sha256-m8ikXuw7PM4Btg8w7ufLneKA4fnYjMyfVJYueZILMw8="; + rev = "e0624611438b2e19ef4b7e24f53461c9d0304b07"; + hash = "sha256-6+fI3TdBDfKcozxLcsykavgi17ywqRRhyiMK7PgAzGs="; }; passthru.updateScript = unstableGitUpdater { }; diff --git a/pkgs/applications/video/mpv/scripts/modernx-zydezu.nix b/pkgs/applications/video/mpv/scripts/modernx-zydezu.nix index 3ef673ab518f3..426d9a3521f2a 100644 --- a/pkgs/applications/video/mpv/scripts/modernx-zydezu.nix +++ b/pkgs/applications/video/mpv/scripts/modernx-zydezu.nix @@ -7,14 +7,14 @@ }: buildLua (finalAttrs: { pname = "modernx-zydezu"; - version = "0.3.5.5"; + version = "0.3.6.6"; scriptPath = "modernx.lua"; src = fetchFromGitHub { owner = "zydezu"; repo = "ModernX"; rev = finalAttrs.version; - hash = "sha256-sPpVwI8w5JsP/jML0viOSqhyYBVKfxWuKbxHkX3GVug="; + hash = "sha256-Jt3Y/4no3dUOopjvbS/dBGU0vw9Lq4o5inb4efuyYBM="; }; postInstall = '' @@ -31,11 +31,12 @@ buildLua (finalAttrs: { passthru.updateScript = nix-update-script { }; - meta = with lib; { + meta = { description = "Modern OSC UI replacement for MPV that retains the functionality of the default OSC"; + changelog = "https://github.com/zydezu/ModernX/releases/tag/${finalAttrs.version}"; homepage = "https://github.com/zydezu/ModernX"; - license = licenses.lgpl21Plus; - maintainers = with maintainers; [ + license = lib.licenses.lgpl21Plus; + maintainers = with lib.maintainers; [ luftmensch-luftmensch Guanran928 ]; diff --git a/pkgs/applications/video/mpv/scripts/mpv-discord.nix b/pkgs/applications/video/mpv/scripts/mpv-discord.nix new file mode 100644 index 0000000000000..58d4940f548b6 --- /dev/null +++ b/pkgs/applications/video/mpv/scripts/mpv-discord.nix @@ -0,0 +1,44 @@ +{ + fetchFromGitHub, + buildGoModule, + buildLua, + lib, +}: +let + version = "1.6.1"; + + src = fetchFromGitHub { + owner = "tnychn"; + repo = "mpv-discord"; + rev = "v${version}"; + hash = "sha256-P1UaXGboOiqrXapfLzJI6IT3esNtflkQkcNXt4Umukc="; + }; + + core = buildGoModule { + name = "mpv-discord-core"; + inherit version; + + src = "${src}/mpv-discord"; + + vendorHash = "sha256-xe1jyWFQUD+Z4qBAVQ0SBY0gdxmi5XG9t29n3f/WKDs="; + }; +in +buildLua { + pname = "mpv-discord"; + inherit version src; + + scriptPath = "scripts/discord.lua"; + + postInstall = '' + substituteInPlace $out/share/mpv/scripts/discord.lua \ + --replace-fail 'binary_path = ""' 'binary_path = "${core}/bin/mpv-discord"' + ''; + + meta = { + description = "Cross-platform Discord Rich Presence integration for mpv with no external dependencies"; + homepage = "https://github.com/tnychn/mpv-discord"; + license = lib.licenses.mit; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ bddvlpr ]; + }; +} diff --git a/pkgs/applications/video/mpv/scripts/mpv-notify-send.nix b/pkgs/applications/video/mpv/scripts/mpv-notify-send.nix index b103a45d275bf..fa148c3cde2a0 100644 --- a/pkgs/applications/video/mpv/scripts/mpv-notify-send.nix +++ b/pkgs/applications/video/mpv/scripts/mpv-notify-send.nix @@ -2,44 +2,34 @@ lib, buildLua, fetchFromGitHub, - fetchpatch, unstableGitUpdater, libnotify, }: buildLua rec { pname = "mpv-notify-send"; - version = "0-unstable-2020-02-24"; + version = "0-unstable-2024-07-11"; src = fetchFromGitHub { - owner = "emilazy"; - repo = pname; - rev = "a2bab8b2fd8e8d14faa875b5cc3a73f1276cd88a"; - sha256 = "sha256-EwVkhyB87TJ3i9xJmmZMSTMUKvfbImI1S+y1vgRWbDk="; + owner = "Parranoh"; + repo = "mpv-notify-send"; + rev = "d98d9fe566b222c5b909e3905e9e201eaec34959"; + hash = "sha256-H8WIKfQnle27eiwnz2sxC8D1EwQplY4N7Qg5+c1e/uU="; }; - patches = [ - # show title of online videos instead of url - (fetchpatch { - name = "6.patch"; # https://github.com/emilazy/mpv-notify-send/pull/6 - url = "https://github.com/emilazy/mpv-notify-send/commit/948347e14890e15e89cd1e069beb1140e2d01dce.patch"; - hash = "sha256-7aXQ8qeqG4yX0Uyn09xCIESnwPZsb6Frd7C49XgbpFw="; - }) - ]; - passthru.extraWrapperArgs = [ "--prefix" "PATH" ":" - (lib.makeBinPath libnotify) + (lib.makeBinPath [ libnotify ]) ]; passthru.updateScript = unstableGitUpdater { }; - meta = with lib; { + meta = { description = "Lua script for mpv to send notifications with notify-send"; - homepage = "https://github.com/emilazy/mpv-notify-send"; - license = licenses.wtfpl; - maintainers = with maintainers; [ r3n3gad3p3arl ]; + homepage = "https://github.com/Parranoh/mpv-notify-send"; + license = lib.licenses.wtfpl; + maintainers = with lib.maintainers; [ r3n3gad3p3arl ]; }; } diff --git a/pkgs/applications/video/mpv/scripts/mpv-osc-tethys.nix b/pkgs/applications/video/mpv/scripts/mpv-osc-tethys.nix new file mode 100644 index 0000000000000..6f0d6bddb4a43 --- /dev/null +++ b/pkgs/applications/video/mpv/scripts/mpv-osc-tethys.nix @@ -0,0 +1,26 @@ +{ + lib, + buildLua, + fetchFromGitHub, +}: +buildLua (finalAttrs: { + pname = "mpv-osc-tethys"; + version = "0-unstable-2024-08-19"; + + scriptPath = "osc_tethys.lua"; + extraScripts = [ "mpv_thumbnail_script_server.lua" ]; + + src = fetchFromGitHub { + owner = "Zren"; + repo = "mpv-osc-tethys"; + rev = "c4167f88a0e9944738419e90a71f1f80fba39ccb"; + hash = "sha256-eAY+ZUuOxPJiNCuL7lqMBU4iURCMz12LQdfaYj4WFQc="; + }; + + meta = { + description = "OSC UI replacement for MPV with icons from the bomi video player"; + homepage = "https://github.com/Zren/mpv-osc-tethys"; + license = lib.licenses.unfree; # no license specified + maintainers = with lib.maintainers; [ luftmensch-luftmensch ]; + }; +}) diff --git a/pkgs/applications/video/mpv/scripts/mpv-playlistmanager.nix b/pkgs/applications/video/mpv/scripts/mpv-playlistmanager.nix index 00e44d1f94474..481b059d7727e 100644 --- a/pkgs/applications/video/mpv/scripts/mpv-playlistmanager.nix +++ b/pkgs/applications/video/mpv/scripts/mpv-playlistmanager.nix @@ -8,13 +8,13 @@ buildLua rec { pname = "mpv-playlistmanager"; - version = "0-unstable-2024-02-26"; + version = "0-unstable-2024-08-17"; src = fetchFromGitHub { owner = "jonniek"; repo = "mpv-playlistmanager"; - rev = "1911dc053951169c98cfcfd9f44ef87d9122ca80"; - hash = "sha256-pcdOMhkivLF5B86aNuHrqj77DuYLAFGlwFwY7jxkDkE="; + rev = "d733d8c00cb543a646f2ce5ab5c12bef2dfd6756"; + hash = "sha256-Pv2+dl9QIIwOYmT4sJmPOBHed5pZLMXZaw80mT4s+WQ="; }; passthru.updateScript = unstableGitUpdater { }; diff --git a/pkgs/applications/video/mpv/scripts/mpv-webm.nix b/pkgs/applications/video/mpv/scripts/mpv-webm.nix index 409d86c193f42..10f09b633c015 100644 --- a/pkgs/applications/video/mpv/scripts/mpv-webm.nix +++ b/pkgs/applications/video/mpv/scripts/mpv-webm.nix @@ -8,13 +8,13 @@ buildLua { pname = "mpv-webm"; - version = "0-unstable-2024-05-13"; + version = "0-unstable-2024-07-20"; src = fetchFromGitHub { owner = "ekisu"; repo = "mpv-webm"; - rev = "8d4902b2aec92f40e4595ec9a411ab90488dcf4e"; - hash = "sha256-aPPVAZu9reDdyovSpDklYZYLaapKBclAx3lCYUMJt+w="; + rev = "64844ec52b7a17d621ddceacf77e1e933f856b3c"; + hash = "sha256-Unz8DQtm4sc/u0ciWoOdLcAEDZL+AjD+2T4q61Gzdns="; }; passthru.updateScript = unstableGitUpdater { # only "latest" tag pointing at HEAD diff --git a/pkgs/applications/video/mpv/scripts/mpv.nix b/pkgs/applications/video/mpv/scripts/mpv.nix index ddf22e5dd03cf..a81ac77686d56 100644 --- a/pkgs/applications/video/mpv/scripts/mpv.nix +++ b/pkgs/applications/video/mpv/scripts/mpv.nix @@ -27,13 +27,13 @@ let in lib.mapAttrs (name: lib.makeOverridable (mkBuiltin name)) { acompressor.meta = { - description = "Script to toggle and control ffmpeg's dynamic range compression filter."; + description = "Script to toggle and control ffmpeg's dynamic range compression filter"; maintainers = with lib.maintainers; [ nicoo ]; }; - autocrop.meta.description = "This script uses the lavfi cropdetect filter to automatically insert a crop filter with appropriate parameters for the currently playing video."; + autocrop.meta.description = "This script uses the lavfi cropdetect filter to automatically insert a crop filter with appropriate parameters for the currently playing video"; - autodeint.meta.description = "This script uses the lavfi idet filter to automatically insert the appropriate deinterlacing filter based on a short section of the currently playing video."; + autodeint.meta.description = "This script uses the lavfi idet filter to automatically insert the appropriate deinterlacing filter based on a short section of the currently playing video"; autoload.meta = { description = "This script automatically loads playlist entries before and after the currently played file"; 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/mpv/scripts/occivink.nix b/pkgs/applications/video/mpv/scripts/occivink.nix index 948a90c0d89b3..f9fe912a612f0 100644 --- a/pkgs/applications/video/mpv/scripts/occivink.nix +++ b/pkgs/applications/video/mpv/scripts/occivink.nix @@ -3,6 +3,7 @@ fetchFromGitHub, unstableGitUpdater, buildLua, + ffmpeg, }: let @@ -44,6 +45,16 @@ in lib.mapAttrs (name: lib.makeOverridable (mkScript name)) { # Usage: `pkgs.mpv.override { scripts = [ pkgs.mpvScripts.seekTo ]; }` + crop.meta.description = "Crop the current video in a visual manner"; seekTo.meta.description = "Mpv script for seeking to a specific position"; - blacklistExtensions.meta.description = "Automatically remove playlist entries based on their extension."; + blacklistExtensions.meta.description = "Automatically remove playlist entries based on their extension"; + + encode = { + meta.description = "Make an extract of the video currently playing using ffmpeg"; + + postPatch = '' + substituteInPlace scripts/encode.lua \ + --replace-fail '"ffmpeg"' '"${lib.getExe ffmpeg}"' + ''; + }; } diff --git a/pkgs/applications/video/mpv/scripts/quality-menu.nix b/pkgs/applications/video/mpv/scripts/quality-menu.nix index 36e5024b6aa8e..ec384c9ad4ed3 100644 --- a/pkgs/applications/video/mpv/scripts/quality-menu.nix +++ b/pkgs/applications/video/mpv/scripts/quality-menu.nix @@ -8,13 +8,13 @@ buildLua rec { pname = "mpv-quality-menu"; - version = "4.1.1"; + version = "4.1.2"; src = fetchFromGitHub { owner = "christoph-heinrich"; repo = "mpv-quality-menu"; rev = "v${version}"; - hash = "sha256-yrcTxqpLnOI1Tq3khhflO3wzhyeTPuvKifyH5/P57Ns="; + hash = "sha256-W7N8H+kq/bhF917TutyilfT8FBbWmbSFUrHd8a8k5Jg="; }; passthru.updateScript = gitUpdater { rev-prefix = "v"; }; diff --git a/pkgs/applications/video/mpv/scripts/sponsorblock.nix b/pkgs/applications/video/mpv/scripts/sponsorblock.nix index 16e8841abf5b6..094aec727552b 100644 --- a/pkgs/applications/video/mpv/scripts/sponsorblock.nix +++ b/pkgs/applications/video/mpv/scripts/sponsorblock.nix @@ -10,7 +10,7 @@ # Usage: `pkgs.mpv.override { scripts = [ pkgs.mpvScripts.sponsorblock ]; }` buildLua { pname = "mpv_sponsorblock"; - version = "unstable-2023-01-30"; + version = "0-unstable-2023-01-30"; src = fetchFromGitHub { owner = "po5"; diff --git a/pkgs/applications/video/mpv/scripts/thumbfast.nix b/pkgs/applications/video/mpv/scripts/thumbfast.nix index 158e1f38b32b3..249b7b8962010 100644 --- a/pkgs/applications/video/mpv/scripts/thumbfast.nix +++ b/pkgs/applications/video/mpv/scripts/thumbfast.nix @@ -8,13 +8,13 @@ buildLua { pname = "mpv-thumbfast"; - version = "0-unstable-2023-12-08"; + version = "0-unstable-2024-08-02"; src = fetchFromGitHub { owner = "po5"; repo = "thumbfast"; - rev = "03e93feee5a85bf7c65db953ada41b4826e9f905"; - hash = "sha256-5u5WBvWOEydJrnr/vilEgW4+fxkxM6wNjb9Fyyxx/1c="; + rev = "f1fdf10b17f394f2d42520d0e9bf22feaa20a9f4"; + hash = "sha256-cygLf+0PMH7cVXBcY12PdcxBHmy38DNoXQubKAlerHM="; }; passthru.updateScript = unstableGitUpdater { }; diff --git a/pkgs/applications/video/mpv/scripts/uosc.nix b/pkgs/applications/video/mpv/scripts/uosc.nix index 45b359a42a83d..30bfdcc8cb8e6 100644 --- a/pkgs/applications/video/mpv/scripts/uosc.nix +++ b/pkgs/applications/video/mpv/scripts/uosc.nix @@ -9,14 +9,14 @@ buildLua (finalAttrs: { pname = "uosc"; - version = "5.2.0"; + version = "5.5.0"; scriptPath = "src/uosc"; src = fetchFromGitHub { owner = "tomasklaen"; repo = "uosc"; rev = finalAttrs.version; - hash = "sha256-0GPDna9uOuhFDhA9A1fbkoKkgSB76qiDzJVQ9gjGcWo="; + hash = "sha256-WFsqA5kGefQmvihLUuQBfMmKoUHiO7ofxpwISRygRm4="; }; passthru.updateScript = gitUpdater { }; diff --git a/pkgs/applications/video/mpv/scripts/videoclip.nix b/pkgs/applications/video/mpv/scripts/videoclip.nix index 82f912677f14c..3a2ac5e4e992d 100644 --- a/pkgs/applications/video/mpv/scripts/videoclip.nix +++ b/pkgs/applications/video/mpv/scripts/videoclip.nix @@ -10,13 +10,13 @@ }: buildLua { pname = "videoclip"; - version = "0-unstable-2024-05-26"; + version = "0-unstable-2024-08-20"; src = fetchFromGitHub { owner = "Ajatt-Tools"; repo = "videoclip"; - rev = "4fd40d66c95905ed828ca77b7120732014b93ac5"; - hash = "sha256-Q40a7BBY4c7I5g9HkeV6Twv/PDPBDKTlnxkILw99pxU="; + rev = "249122d245bc5ec2a0687346af730b1cc2273b21"; + hash = "sha256-VSMFddi8Lvmipo8Un79v+LXGNiKeaSxHQ44HddJgTkE="; }; patchPhase = @@ -24,7 +24,7 @@ buildLua { substituteInPlace platform.lua \ --replace \'curl\' \'${lib.getExe curl}\' \ '' - + lib.optionalString stdenv.isLinux '' + + lib.optionalString stdenv.hostPlatform.isLinux '' --replace xclip ${lib.getExe xclip} \ --replace wl-copy ${lib.getExe' wl-clipboard "wl-copy"} ''; diff --git a/pkgs/applications/video/mpv/wrapper.nix b/pkgs/applications/video/mpv/wrapper.nix index 533ede74f8744..8104921aadbdb 100644 --- a/pkgs/applications/video/mpv/wrapper.nix +++ b/pkgs/applications/video/mpv/wrapper.nix @@ -8,7 +8,6 @@ , writeTextDir , yt-dlp # the unwrapped mpv derivation -, mpv }: let @@ -96,7 +95,7 @@ let makeWrapper "${mpv}/bin/mpv" "$out/bin/mpv" ${mostMakeWrapperArgs} rm "$out/bin/umpv" makeWrapper "${mpv}/bin/umpv" "$out/bin/umpv" ${umpvWrapperArgs} - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' # wrapProgram can't operate on symlinks rm "$out/Applications/mpv.app/Contents/MacOS/mpv" makeWrapper "${mpv}/Applications/mpv.app/Contents/MacOS/mpv" "$out/Applications/mpv.app/Contents/MacOS/mpv" ${mostMakeWrapperArgs} diff --git a/pkgs/applications/video/multiviewer-for-f1/default.nix b/pkgs/applications/video/multiviewer-for-f1/default.nix index 1274009ba707e..9078a4dc7ef91 100644 --- a/pkgs/applications/video/multiviewer-for-f1/default.nix +++ b/pkgs/applications/video/multiviewer-for-f1/default.nix @@ -23,15 +23,15 @@ , xorg }: let - id = "168727396"; + id = "180492850"; in stdenvNoCC.mkDerivation rec { pname = "multiviewer-for-f1"; - version = "1.32.1"; + version = "1.35.2"; src = fetchurl { url = "https://releases.multiviewer.dev/download/${id}/multiviewer-for-f1_${version}_amd64.deb"; - sha256 = "sha256-cnfye5c3+ZYZLjlZ6F4OD90tXhxDbgbNBn98mgmZ+Hs="; + sha256 = "sha256-V1+kMgfbgDS47YNIotmzrh2Hry5pvdQvrzWwuKJY1oM="; }; nativeBuildInputs = [ @@ -100,4 +100,3 @@ stdenvNoCC.mkDerivation rec { mainProgram = "multiviewer-for-f1"; }; } - diff --git a/pkgs/applications/video/natron/default.nix b/pkgs/applications/video/natron/default.nix index 5ca88c666ee85..e02aa4af610df 100644 --- a/pkgs/applications/video/natron/default.nix +++ b/pkgs/applications/video/natron/default.nix @@ -98,6 +98,6 @@ stdenv.mkDerivation { license = lib.licenses.gpl2; maintainers = [ maintainers.puffnfresh ]; platforms = platforms.linux; - broken = stdenv.isLinux && stdenv.isAarch64; + broken = stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64; }; } diff --git a/pkgs/applications/video/obs-studio/Enable-file-access-and-universal-access-for-file-URL.patch b/pkgs/applications/video/obs-studio/Enable-file-access-and-universal-access-for-file-URL.patch index 49d01bacbd10b..b0c9650ddb90d 100644 --- a/pkgs/applications/video/obs-studio/Enable-file-access-and-universal-access-for-file-URL.patch +++ b/pkgs/applications/video/obs-studio/Enable-file-access-and-universal-access-for-file-URL.patch @@ -12,12 +12,12 @@ security model. 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/obs-browser-source.cpp b/obs-browser-source.cpp -index ab1181e..c775283 100644 +index 09b3017..1094340 100644 --- a/plugins/obs-browser/obs-browser-source.cpp +++ b/plugins/obs-browser/obs-browser-source.cpp -@@ -179,9 +179,12 @@ bool BrowserSource::CreateBrowser() +@@ -239,9 +239,12 @@ bool BrowserSource::CreateBrowser() - #if ENABLE_LOCAL_FILE_URL_SCHEME + #if ENABLE_LOCAL_FILE_URL_SCHEME && CHROME_VERSION_BUILD < 4430 if (is_local) { - /* Disable web security for file:// URLs to allow - * local content access to remote APIs */ @@ -30,7 +30,4 @@ index ab1181e..c775283 100644 + STATE_ENABLED; } #endif - --- -2.31.1 - + auto browser = CefBrowserHost::CreateBrowserSync( diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index 418d9adf8263b..c7bcdfc4f75d1 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -1,9 +1,11 @@ { config +, uthash , lib , stdenv +, nv-codec-headers-12 , fetchFromGitHub , fetchpatch -, addOpenGLRunpath +, addDriverRunpath , cmake , fdk_aac , ffmpeg @@ -27,19 +29,18 @@ , wrapGAppsHook3 , scriptingSupport ? true , luajit -, swig4 +, swig , python3 -, alsaSupport ? stdenv.isLinux +, alsaSupport ? stdenv.hostPlatform.isLinux , alsa-lib -, pulseaudioSupport ? config.pulseaudio or stdenv.isLinux +, pulseaudioSupport ? config.pulseaudio or stdenv.hostPlatform.isLinux , libpulseaudio , libcef , pciutils -, pipewireSupport ? stdenv.isLinux +, pipewireSupport ? stdenv.hostPlatform.isLinux , withFdk ? true , pipewire , libdrm -, libajantv2 , librist , libva , srt @@ -62,13 +63,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "obs-studio"; - version = "30.1.2"; + version = "30.2.3"; src = fetchFromGitHub { owner = "obsproject"; - repo = finalAttrs.pname; + repo = "obs-studio"; rev = finalAttrs.version; - sha256 = "sha256-M4IINBoYrgkM37ykb4boHyWP8AxwMX0b7IAeeNIw9Qo="; + hash = "sha256-4bAzW62xX9apKOAJyn3iys1bFdHj4re2reMZtlGsn5s="; fetchSubmodules = true; }; @@ -87,13 +88,13 @@ stdenv.mkDerivation (finalAttrs: { ]; nativeBuildInputs = [ - addOpenGLRunpath + addDriverRunpath cmake pkg-config wrapGAppsHook3 wrapQtAppsHook ] - ++ optional scriptingSupport swig4; + ++ optional scriptingSupport swig; buildInputs = [ curl @@ -113,7 +114,6 @@ stdenv.mkDerivation (finalAttrs: { libvlc mbedtls pciutils - libajantv2 librist libva srt @@ -124,6 +124,8 @@ stdenv.mkDerivation (finalAttrs: { libdatachannel libvpl qrcodegencpp + uthash + nv-codec-headers-12 ] ++ optionals scriptingSupport [ luajit python3 ] ++ optional alsaSupport alsa-lib @@ -155,6 +157,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "ENABLE_ALSA" alsaSupport) (lib.cmakeBool "ENABLE_PULSEAUDIO" pulseaudioSupport) (lib.cmakeBool "ENABLE_PIPEWIRE" pipewireSupport) + (lib.cmakeBool "ENABLE_AJA" false) # TODO: fix linking against libajantv2 ]; env.NIX_CFLAGS_COMPILE = toString [ @@ -180,9 +183,9 @@ stdenv.mkDerivation (finalAttrs: { ) ''; - postFixup = lib.optionalString stdenv.isLinux '' - addOpenGLRunpath $out/lib/lib*.so - addOpenGLRunpath $out/lib/obs-plugins/*.so + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' + addDriverRunpath $out/lib/lib*.so + addDriverRunpath $out/lib/obs-plugins/*.so # Link libcef again after patchelfing other libs ln -s ${libcef}/lib/* $out/lib/obs-plugins/ @@ -198,7 +201,7 @@ stdenv.mkDerivation (finalAttrs: { video content, efficiently ''; homepage = "https://obsproject.com"; - maintainers = with maintainers; [ eclairevoyant jb55 materus fpletz ]; + maintainers = with maintainers; [ jb55 materus fpletz ]; license = with licenses; [ gpl2Plus ] ++ optional withFdk fraunhofer-fdk; platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" ]; mainProgram = "obs"; diff --git a/pkgs/applications/video/obs-studio/fix-nix-plugin-path.patch b/pkgs/applications/video/obs-studio/fix-nix-plugin-path.patch index baf45104e6a89..13569e8499b53 100644 --- a/pkgs/applications/video/obs-studio/fix-nix-plugin-path.patch +++ b/pkgs/applications/video/obs-studio/fix-nix-plugin-path.patch @@ -1,9 +1,9 @@ diff --git a/cmake/Modules/ObsDefaults_Linux.cmake b/cmake/Modules/ObsDefaults_Linux.cmake -index d1e58a083..a03c6b98e 100644 +index fe8d72364..1c590fcdb 100644 --- a/cmake/Modules/ObsDefaults_Linux.cmake +++ b/cmake/Modules/ObsDefaults_Linux.cmake @@ -76,7 +76,7 @@ macro(setup_obs_project) - set(OBS_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/") + set(OBS_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}") set(OBS_DATA_PATH "${OBS_DATA_DESTINATION}") - set(OBS_SCRIPT_PLUGIN_PATH "${CMAKE_INSTALL_PREFIX}/${OBS_SCRIPT_PLUGIN_DESTINATION}") @@ -12,15 +12,15 @@ index d1e58a083..a03c6b98e 100644 else() set(OBS_EXECUTABLE_DESTINATION "bin/${_ARCH_SUFFIX}bit") diff --git a/libobs/obs-nix.c b/libobs/obs-nix.c -index b006a5598..531655eb3 100644 +index 77c36be5e..fe8a04813 100644 --- a/libobs/obs-nix.c +++ b/libobs/obs-nix.c -@@ -56,7 +56,7 @@ const char *get_module_extension(void) - #define FLATPAK_PLUGIN_PATH "/app/plugins" +@@ -51,7 +51,7 @@ const char *get_module_extension(void) static const char *module_bin[] = { + "../../obs-plugins/64bit", - OBS_INSTALL_PREFIX "/" OBS_PLUGIN_DESTINATION, + OBS_PLUGIN_DESTINATION, - "../../obs-plugins/" BIT_STRING, FLATPAK_PLUGIN_PATH "/" OBS_PLUGIN_DESTINATION, }; + diff --git a/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix b/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix index ec19f26e8a156..68d48e71d1c79 100644 --- a/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix @@ -1,35 +1,36 @@ -{ lib -, fetchFromGitHub +{ + lib, + fetchFromGitHub, -, cmake -, ninja + cmake, + ninja, -, alsa-lib -, asio -, curl -, nlohmann_json -, obs-studio -, opencv -, procps -, qtbase -, stdenv -, tesseract -, websocketpp -, xorg + alsa-lib, + asio, + curl, + nlohmann_json, + obs-studio, + opencv, + procps, + qtbase, + stdenv, + tesseract, + websocketpp, + xorg, -, httplib -, libremidi + httplib, + libremidi, }: stdenv.mkDerivation rec { pname = "advanced-scene-switcher"; - version = "1.26.4"; + version = "1.27.2"; src = fetchFromGitHub { owner = "WarmUpTill"; repo = "SceneSwitcher"; rev = version; - hash = "sha256-qUKywOfUiGKBmyREns2LnWECGeFhdA4ecpgGJQAIKpU="; + hash = "sha256-7IciHCe2KemKNJpD9QcYK4AtxHlYuWaPsBCcVuPVvgA="; }; nativeBuildInputs = [ @@ -68,6 +69,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/WarmUpTill/SceneSwitcher"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/video/obs-studio/plugins/input-overlay.nix b/pkgs/applications/video/obs-studio/plugins/input-overlay.nix index 9f13de2847402..aff145b1fc740 100644 --- a/pkgs/applications/video/obs-studio/plugins/input-overlay.nix +++ b/pkgs/applications/video/obs-studio/plugins/input-overlay.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { owner = "univrsal"; repo = "input-overlay"; rev = "v${version}"; - sha256 = "sha256-9HqEz+KnTt8MyhwqFWjalbl3H/DCzumckXMctCGhs3o="; + hash = "sha256-9HqEz+KnTt8MyhwqFWjalbl3H/DCzumckXMctCGhs3o="; fetchSubmodules = true; }; @@ -47,12 +47,12 @@ stdenv.mkDerivation rec { dontWrapQtApps = true; meta = with lib; { - description = "Show keyboard, gamepad and mouse input on stream "; + description = "Show keyboard, gamepad and mouse input on stream"; homepage = "https://github.com/univrsal/input-overlay"; maintainers = with maintainers; [ glittershark ]; license = licenses.gpl2; platforms = platforms.linux; # never built on aarch64-linux since first introduction in nixpkgs - broken = stdenv.isLinux && stdenv.isAarch64; + broken = stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64; }; } diff --git a/pkgs/applications/video/obs-studio/plugins/obs-freeze-filter.nix b/pkgs/applications/video/obs-studio/plugins/obs-freeze-filter.nix index 1460e77fbf86c..0bec9181e19c8 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-freeze-filter.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-freeze-filter.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "exeldro"; repo = "obs-freeze-filter"; rev = finalAttrs.version; - sha256 = "sha256-CaHBTfdk8VFjmiclG61elj35glQafgz5B4ENo+7J35o="; + hash = "sha256-CaHBTfdk8VFjmiclG61elj35glQafgz5B4ENo+7J35o="; fetchSubmodules = true; }; diff --git a/pkgs/applications/video/obs-studio/plugins/obs-gstreamer.nix b/pkgs/applications/video/obs-studio/plugins/obs-gstreamer.nix index d6341eba53425..6ac26bf599ab0 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-gstreamer.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-gstreamer.nix @@ -1,26 +1,40 @@ -{ lib -, stdenv -, fetchFromGitHub -, gst_all_1 -, pkg-config -, meson -, ninja -, obs-studio +{ + lib, + stdenv, + fetchFromGitHub, + gst_all_1, + pkg-config, + meson, + ninja, + obs-studio, }: stdenv.mkDerivation rec { pname = "obs-gstreamer"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "fzwoch"; repo = pname; rev = "v${version}"; - hash = "sha256-C4yee7hzkSOjIeaacLaTGPzZ1qYdYtHK5a3m9gz2pPI="; + hash = "sha256-23LyxN1Vgol9uA7rDdfZXcmfhG4l0RfMYGbofbhObBE="; }; - nativeBuildInputs = [ pkg-config meson ninja ]; - buildInputs = with gst_all_1; [ gstreamer gst-plugins-base obs-studio ]; + postPatch = '' + substituteInPlace meson.build \ + --replace-fail "'git', 'rev-parse', '--short', 'HEAD'" "'echo', '${version}'" + ''; + + nativeBuildInputs = [ + pkg-config + meson + ninja + ]; + buildInputs = with gst_all_1; [ + gstreamer + gst-plugins-base + obs-studio + ]; # - We need "getLib" instead of default derivation, otherwise it brings gstreamer-bin; # - without gst-plugins-base it won't even show proper errors in logs; @@ -29,9 +43,11 @@ stdenv.mkDerivation rec { # Tip: "could not link appsrc to videoconvert1" can mean a lot of things, enable GST_DEBUG=2 for help. passthru.obsWrapperArguments = let - gstreamerHook = package: "--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : ${lib.getLib package}/lib/gstreamer-1.0"; + gstreamerHook = + package: "--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : ${lib.getLib package}/lib/gstreamer-1.0"; in - with gst_all_1; builtins.map gstreamerHook [ + with gst_all_1; + builtins.map gstreamerHook [ gstreamer gst-plugins-base gst-plugins-bad @@ -47,7 +63,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "OBS Studio source, encoder and video filter plugin to use GStreamer elements/pipelines in OBS Studio"; homepage = "https://github.com/fzwoch/obs-gstreamer"; - maintainers = with maintainers; [ ahuzik pedrohlc ]; + maintainers = with maintainers; [ + ahuzik + pedrohlc + ]; license = licenses.gpl2Plus; platforms = platforms.linux; }; diff --git a/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix b/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix index e464079da93c7..c4e2dc43d2466 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "obs-move-transition"; - version = "3.0.1"; + version = "3.0.2"; src = fetchFromGitHub { owner = "exeldro"; repo = "obs-move-transition"; rev = version; - sha256 = "sha256-LZL9f/pX74rKW+wnNHGKwGuuISOTcFVr6W9h/JEK0U4="; + sha256 = "sha256-Vwm0Eyb8MevZtS3PTqnFQAbCj7JuTw9Ju0lS9CZ6rf8="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/video/obs-studio/plugins/obs-multi-rtmp/default.nix b/pkgs/applications/video/obs-studio/plugins/obs-multi-rtmp/default.nix index e7c0d144b41d4..5a29921b932b6 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-multi-rtmp/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-multi-rtmp/default.nix @@ -2,25 +2,34 @@ stdenv.mkDerivation rec { pname = "obs-multi-rtmp"; - version = "0.2.8.1-OBS28"; + version = "0.6.0.1"; src = fetchFromGitHub { owner = "sorayuki"; repo = "obs-multi-rtmp"; rev = version; - sha256 = "sha256-1W+c8Y0AmtKQmCIg8IDAaYYStQzDpZRuqw3vZEY5ncU="; + sha256 = "sha256-MRBQY9m6rj8HVdn58mK/Vh07FSm0EglRUaP20P3FFO4="; }; nativeBuildInputs = [ cmake ]; buildInputs = [ obs-studio qtbase ]; - patches = [ - # Patch cmake file to link against the obs build output, instead of its sources - ./fix-build.patch + cmakeFlags = [ + (lib.cmakeBool "ENABLE_QT" true) + (lib.cmakeBool "ENABLE_FRONTEND_API" true) + (lib.cmakeBool "CMAKE_COMPILE_WARNING_AS_ERROR" false) ]; dontWrapQtApps = true; + # install dirs changed after 0.5.0.3-OBS30 + postInstall = '' + mkdir -p $out/{lib,share/obs/obs-plugins/} + mv $out/dist/obs-multi-rtmp/data $out/share/obs/obs-plugins/obs-multi-rtmp + mv $out/dist/obs-multi-rtmp/bin/64bit $out/lib/obs-plugins + rm -rf $out/dist + ''; + meta = with lib; { homepage = "https://github.com/sorayuki/obs-multi-rtmp/"; changelog = "https://github.com/sorayuki/obs-multi-rtmp/releases/tag/${version}"; diff --git a/pkgs/applications/video/obs-studio/plugins/obs-multi-rtmp/fix-build.patch b/pkgs/applications/video/obs-studio/plugins/obs-multi-rtmp/fix-build.patch deleted file mode 100644 index dd40fc7e95951..0000000000000 --- a/pkgs/applications/video/obs-studio/plugins/obs-multi-rtmp/fix-build.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 72aeddb52c2b656bfec918097ad07a0ff092008b Mon Sep 17 00:00:00 2001 -From: Raphael Robatsch <raphael-git@tapesoftware.net> -Date: Thu, 13 Oct 2022 21:34:21 +0200 -Subject: [PATCH] Link against OBS public interface instead of sources - ---- - CMakeLists.txt | 22 ++++------------------ - 1 file changed, 4 insertions(+), 18 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 27e20f8..8725c5b 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -65,15 +65,9 @@ if (WIN32) - "/def:${CMAKE_CURRENT_BINARY_DIR}/obs-frontend-api.def" - "/out:${CMAKE_CURRENT_BINARY_DIR}/obs-frontend-api.lib" - ) --elseif (APPLE) -- # macOS -- find_library(_LIB_OBS "${LIB_OBS}.0.dylib" PATHS ${OBS_BIN_DIR} REQUIRED) -- set(LIB_OBS "${_LIB_OBS}") --elseif (UNIX) -- # Linux -- find_package(LibObs REQUIRED) - else () -- message(FATAL_ERROR "Unsupported OS!") -+ find_package(libobs REQUIRED) -+ find_package(obs-frontend-api REQUIRED) - endif () - - -@@ -96,18 +90,10 @@ if (WIN32) - "${CMAKE_CURRENT_BINARY_DIR}/version.rc" - ) - endif () --target_include_directories(obs-multi-rtmp PRIVATE -- "${OBS_SRC_DIR}/libobs" -- "${OBS_SRC_DIR}/UI/obs-frontend-api" --) --target_link_directories(obs-multi-rtmp PRIVATE -- "${CMAKE_CURRENT_BINARY_DIR}" -- ${OBS_BIN_DIR} --) - target_link_libraries(obs-multi-rtmp PRIVATE - Qt6::Widgets -- ${LIB_OBS} -- obs-frontend-api -+ OBS::libobs -+ OBS::obs-frontend-api - ) - - if (WIN32) --- -2.37.3 diff --git a/pkgs/applications/video/obs-studio/plugins/obs-ndi/default.nix b/pkgs/applications/video/obs-studio/plugins/obs-ndi/default.nix index f58d81e9b706b..a2c1300520dcf 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-ndi/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-ndi/default.nix @@ -1,17 +1,34 @@ -{ lib, stdenv, fetchFromGitHub, obs-studio, cmake, qtbase, ndi }: +{ + lib, + stdenv, + fetchFromGitHub, + obs-studio, + cmake, + qtbase, + ndi, + curl, +}: stdenv.mkDerivation rec { pname = "obs-ndi"; - version = "4.13.2"; + version = "4.14.1"; - nativeBuildInputs = [ cmake qtbase ]; - buildInputs = [ obs-studio qtbase ndi ]; + nativeBuildInputs = [ + cmake + qtbase + ]; + buildInputs = [ + obs-studio + qtbase + ndi + curl + ]; src = fetchFromGitHub { owner = "Palakis"; repo = "obs-ndi"; rev = version; - sha256 = "sha256-DVUoLV2jCdD8qXSpmGvqjrQh02dCLroKsUAb5+lYTog="; + sha256 = "sha256-ex/fZmZpFM6GTKNBQClzSf6Ns0Yts5+0PAmf5mIQCwc="; }; patches = [ diff --git a/pkgs/applications/video/obs-studio/plugins/obs-ndi/hardcode-ndi-path.patch b/pkgs/applications/video/obs-studio/plugins/obs-ndi/hardcode-ndi-path.patch index b675c10a03466..c8b400b682d84 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-ndi/hardcode-ndi-path.patch +++ b/pkgs/applications/video/obs-studio/plugins/obs-ndi/hardcode-ndi-path.patch @@ -11,6 +11,6 @@ index 0d94add..617af73 100644 - locations << "/usr/local/lib"; -#endif + locations << "@NDI@/lib"; - for (QString location : locations) { + for (auto location : locations) { path = QDir::cleanPath( QDir(location).absoluteFilePath(NDILIB_LIBRARY_NAME)); diff --git a/pkgs/applications/video/obs-studio/plugins/obs-nvfbc.nix b/pkgs/applications/video/obs-studio/plugins/obs-nvfbc.nix index ab113065629d9..41b74807e4afc 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-nvfbc.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-nvfbc.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "fzwoch"; repo = "obs-nvfbc"; rev = "v${version}"; - sha256 = "sha256-AJ3K0O1vrixskn+/Tpg7LsgRO8N4sgDo1Y6gg3CwGVo="; + hash = "sha256-AJ3K0O1vrixskn+/Tpg7LsgRO8N4sgDo1Y6gg3CwGVo="; }; nativeBuildInputs = [ meson pkg-config ninja ]; diff --git a/pkgs/applications/video/obs-studio/plugins/obs-pipewire-audio-capture.nix b/pkgs/applications/video/obs-studio/plugins/obs-pipewire-audio-capture.nix index e73b54aac18f1..dc03e00a192e1 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-pipewire-audio-capture.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-pipewire-audio-capture.nix @@ -1,30 +1,37 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, ninja -, obs-studio -, pipewire -, pkg-config +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + ninja, + obs-studio, + pipewire, + pkg-config, }: stdenv.mkDerivation rec { pname = "obs-pipewire-audio-capture"; - version = "1.1.3"; + version = "1.1.5"; src = fetchFromGitHub { owner = "dimtpap"; repo = pname; rev = version; - sha256 = "sha256-dL/+Y1uaD+7EY0UNWbxvh1TTLYfgk07qCqLLGvfzWZk="; + sha256 = "sha256-qYHU0m+jz/mQmjleITnzxNkTio5ir8dFkHKfmY4l0Es="; }; - nativeBuildInputs = [ cmake ninja pkg-config ]; - buildInputs = [ obs-studio pipewire ]; + nativeBuildInputs = [ + cmake + ninja + pkg-config + ]; + buildInputs = [ + obs-studio + pipewire + ]; cmakeFlags = [ - "-DLIBOBS_INCLUDE_DIR=${obs-studio.src}/libobs" - "-Wno-dev" + "-DCMAKE_INSTALL_LIBDIR=/lib" ]; meta = with lib; { @@ -32,6 +39,9 @@ stdenv.mkDerivation rec { homepage = "https://github.com/dimtpap/obs-pipewire-audio-capture"; maintainers = with maintainers; [ Elinvention ]; license = licenses.gpl2Plus; - platforms = [ "x86_64-linux" "i686-linux" ]; + platforms = [ + "x86_64-linux" + "i686-linux" + ]; }; } diff --git a/pkgs/applications/video/obs-studio/plugins/obs-source-record.nix b/pkgs/applications/video/obs-studio/plugins/obs-source-record.nix index 9f1a52bd8bd06..23cc300d7f708 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-source-record.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-source-record.nix @@ -1,34 +1,28 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, obs-studio }: +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + obs-studio, +}: stdenv.mkDerivation rec { pname = "obs-source-record"; - version = "0.3.2"; + version = "0.3.4"; src = fetchFromGitHub { owner = "exeldro"; repo = "obs-source-record"; rev = version; - sha256 = "sha256-H65uQ9HnKmHs52v3spG92ayeYH/TvmwcMoePMmBMqN8="; + sha256 = "sha256-VgG9Fn75aKTkth4TC9rhfj/HIOO2lIO4n3ZYmemkzx8="; }; - patches = [ - # fix obs 29.1 compatibility - (fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/exeldro/obs-source-record/pull/83.diff"; - hash = "sha256-eWOjHHfoXZeoPtqvVyexSi/UQqHm8nu4FEEjma64Ly4="; - }) - ]; - nativeBuildInputs = [ cmake ]; - buildInputs = [ - obs-studio - ]; + buildInputs = [ obs-studio ]; NIX_CFLAGS_COMPILE = [ "-Wno-error=deprecated-declarations" ]; - cmakeFlags = [ - "-DBUILD_OUT_OF_TREE=On" - ]; + cmakeFlags = [ "-DBUILD_OUT_OF_TREE=On" ]; postInstall = '' rm -rf $out/{data,obs-plugins} @@ -37,7 +31,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "OBS Studio plugin to make sources available to record via a filter"; homepage = "https://github.com/exeldro/obs-source-record"; - maintainers = with maintainers; [ robbins ]; + maintainers = with maintainers; [ + robbins + shackra + ]; license = licenses.gpl2Only; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/applications/video/obs-studio/plugins/obs-text-pthread.nix b/pkgs/applications/video/obs-studio/plugins/obs-text-pthread.nix index 8819f4f53779d..8ce601f08ea50 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-text-pthread.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-text-pthread.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "obs-text-pthread"; - version = "2.0.4"; + version = "2.0.5"; src = fetchFromGitHub { owner = "norihiro"; repo = "obs-text-pthread"; rev = version; - sha256 = "sha256-3Y++zpy5TEp8AtyRw+1fZDEFY9AuN7JpUNqUhM7h04U="; + sha256 = "sha256-zrgxKs3jmrwQJiEgKfZz1BOVToTLauQXtFYcuFlV71o="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/applications/video/obs-studio/plugins/obs-tuna/default.nix b/pkgs/applications/video/obs-studio/plugins/obs-tuna/default.nix index 798b23b2c8d7a..78087e4ed446b 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-tuna/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-tuna/default.nix @@ -1,58 +1,44 @@ -{ lib -, stdenv -, fetchFromGitHub -, fetchpatch2 -, obs-studio -, cmake -, zlib -, curl -, taglib -, dbus -, pkg-config -, qtbase -, wrapQtAppsHook +{ + lib, + stdenv, + fetchFromGitHub, + obs-studio, + cmake, + zlib, + curl, + taglib, + dbus, + pkg-config, + qtbase, + wrapQtAppsHook, }: stdenv.mkDerivation (finalAttrs: { pname = "obs-tuna"; - version = "1.9.7"; + version = "1.9.9"; - nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; - buildInputs = [ obs-studio qtbase zlib curl taglib dbus ]; + nativeBuildInputs = [ + cmake + pkg-config + wrapQtAppsHook + ]; + buildInputs = [ + obs-studio + qtbase + zlib + curl + taglib + dbus + ]; src = fetchFromGitHub { owner = "univrsal"; repo = "tuna"; rev = "v${finalAttrs.version}"; - hash = "sha256-NpfQ3zi+1kQNt2Lj4+1kX2bW9A/E2/MhUV1BA1UX4y0="; + hash = "sha256-qwOAidnCGZSwTahgbyf1K0KgoDvYpqDAQXM3l1lfZXg="; fetchSubmodules = true; }; - # obs_frontend_add_dock() deprecated in obs 30 - env.NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; - - patches = [ - # fix build with qt 6.6.0 - # treewide: replace deprecated qAsConst with std::as_const() - # https://github.com/univrsal/tuna/pull/176 - (fetchpatch2 { - url = "https://github.com/univrsal/tuna/commit/0d570e771f8d8e6ae7c85bd2b86bbf59c264789e.patch"; - hash = "sha256-A5idhMiM9funqhTm5XMIBqwy+FO1SaNPtgZjo+Vws6k="; - }) - # fix build with obs 30 - (fetchpatch2 { - url = "https://github.com/univrsal/tuna/commit/723bd3c7b4e257cf0997611426e555068de77ae7.patch"; - hash = "sha256-MF5vghGYknL6q+A8BJ1yrQcEKIu9I+PWk+RZNYg3fRU="; - }) - ]; - - postInstall = '' - mkdir $out/lib $out/share - mv $out/obs-plugins/64bit $out/lib/obs-plugins - rm -rf $out/obs-plugins - mv $out/data $out/share/obs - ''; - dontWrapQtApps = true; meta = { diff --git a/pkgs/applications/video/obs-studio/plugins/obs-vaapi/default.nix b/pkgs/applications/video/obs-studio/plugins/obs-vaapi/default.nix index 9b7ec4090dd55..59be77c454de8 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-vaapi/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-vaapi/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "obs-vaapi"; - version = "0.4.1"; + version = "0.4.2"; src = fetchFromGitHub { owner = "fzwoch"; repo = pname; rev = version; - hash = "sha256-PpGNLIOz+fCpcP/nvjcJ+1fkduxjcbZjb7yx8TUO25s="; + hash = "sha256-ykiLsHL3hoe0ibxMxp4zrqeSeQfgnJfNg7Yb5i9HDJQ="; }; nativeBuildInputs = [ pkg-config meson ninja ]; 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..86360a5ae05fc 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.9"; src = fetchFromGitHub { owner = "Aitum"; repo = "obs-vertical-canvas"; rev = version; - sha256 = "sha256-RBsdYG73SoX+dB4sUq641SL0ETUFE+PVAmr/DaqMuLI="; + sha256 = "sha256-DFSwcN7XadHa1SGEHUdtRqPJMtS23y4dU4e/F8QmUUo="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix b/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix index cf88fd3b18c3f..f7e21b796c54c 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix @@ -20,16 +20,16 @@ stdenv.mkDerivation (finalAttrs: { pname = "obs-vkcapture"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "nowrep"; - repo = finalAttrs.pname; + repo = "obs-vkcapture"; rev = "v${finalAttrs.version}"; - hash = "sha256-hYPQ1N4k4eb+bvGWZqaQJ/C8C5Lh8ooZ03raGF5ORgE="; + hash = "sha256-RIDsT6eL6bUfqPiyPlecnZHu5OorcJb3Xal8pjdOpAA="; }; - cmakeFlags = lib.optionals stdenv.isi686 [ + cmakeFlags = lib.optionals stdenv.hostPlatform.isi686 [ # We don't want to build the plugin for 32bit. The library integrates with # the 64bit plugin but it's necessary to be loaded into 32bit games. "-DBUILD_PLUGIN=OFF" @@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: { vulkan-loader wayland ] - ++ lib.optionals (!stdenv.isi686) [ + ++ lib.optionals (!stdenv.hostPlatform.isi686) [ obs-studio ]; diff --git a/pkgs/applications/video/obs-studio/plugins/waveform/default.nix b/pkgs/applications/video/obs-studio/plugins/waveform/default.nix index 00fcf4298d5d1..8f0cb4077cc5a 100644 --- a/pkgs/applications/video/obs-studio/plugins/waveform/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/waveform/default.nix @@ -9,14 +9,14 @@ stdenv.mkDerivation rec { pname = "waveform"; - version = "1.8.0"; + version = "1.8.1"; src = fetchFromGitHub { fetchSubmodules = true; owner = "phandasm"; repo = "waveform"; rev = "v${version}"; - sha256 = "sha256-NcBtj+5X9tPH853a6oXzQCBH26hx8Yt17WjP9ryvgmc="; + hash = "sha256-Bg1n1yV4JzNFEXFNayNa1exsSZhmRJ0RLHDjLWmqGZE="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/applications/video/obs-studio/wrapper.nix b/pkgs/applications/video/obs-studio/wrapper.nix index 62bc80d26df3b..0c972fc58d371 100644 --- a/pkgs/applications/video/obs-studio/wrapper.nix +++ b/pkgs/applications/video/obs-studio/wrapper.nix @@ -8,11 +8,11 @@ symlinkJoin { nativeBuildInputs = [ makeWrapper ]; paths = [ obs-studio ] ++ plugins; - postBuild = with lib; + postBuild = let # Some plugins needs extra environment, see obs-gstreamer for an example. pluginArguments = - lists.concatMap (plugin: plugin.obsWrapperArguments or []) plugins; + lib.lists.concatMap (plugin: plugin.obsWrapperArguments or []) plugins; pluginsJoined = symlinkJoin { name = "obs-studio-plugins"; @@ -24,9 +24,9 @@ symlinkJoin { "$out/bin/obs" ''--set OBS_PLUGINS_PATH "${pluginsJoined}/lib/obs-plugins"'' ''--set OBS_PLUGINS_DATA_PATH "${pluginsJoined}/share/obs/obs-plugins"'' - ] ++ lists.unique pluginArguments; + ] ++ lib.lists.unique pluginArguments; in '' - ${concatStringsSep " " wrapCommandLine} + ${lib.concatStringsSep " " wrapCommandLine} # Remove unused obs-plugins dir to not cause confusion rm -r $out/share/obs/obs-plugins diff --git a/pkgs/applications/video/olive-editor/default.nix b/pkgs/applications/video/olive-editor/default.nix index 514da9c50d750..c033c19143683 100644 --- a/pkgs/applications/video/olive-editor/default.nix +++ b/pkgs/applications/video/olive-editor/default.nix @@ -6,7 +6,7 @@ , which , frei0r , opencolorio -, ffmpeg_4 +, ffmpeg_6 , CoreFoundation , cmake , wrapQtAppsHook @@ -40,7 +40,7 @@ stdenv.mkDerivation { owner = "olive-editor"; repo = "olive"; rev = "2036fffffd0e24b7458e724b9084ae99c9507c64"; - sha256 = "sha256-qee9/WTvTy5jWLowvZJOwAjrqznRhJR+u9dYsnCN/Qs="; + hash = "sha256-qee9/WTvTy5jWLowvZJOwAjrqznRhJR+u9dYsnCN/Qs="; }; cmakeFlags = [ @@ -70,7 +70,7 @@ stdenv.mkDerivation { ]; buildInputs = [ - ffmpeg_4 + ffmpeg_6 frei0r opencolorio openimageio' @@ -80,7 +80,7 @@ stdenv.mkDerivation { qtwayland qtmultimedia qttools - ] ++ lib.optional stdenv.isDarwin CoreFoundation; + ] ++ lib.optional stdenv.hostPlatform.isDarwin CoreFoundation; meta = with lib; { description = "Professional open-source NLE video editor"; @@ -90,7 +90,7 @@ stdenv.mkDerivation { maintainers = [ maintainers.balsoft ]; platforms = platforms.unix; # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin && stdenv.isAarch64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; mainProgram = "olive-editor"; }; } diff --git a/pkgs/applications/video/open-in-mpv/default.nix b/pkgs/applications/video/open-in-mpv/default.nix index 855af79e964e8..265aa72d72961 100644 --- a/pkgs/applications/video/open-in-mpv/default.nix +++ b/pkgs/applications/video/open-in-mpv/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "open-in-mpv"; - version = "2.2.2"; + version = "2.3.0"; src = fetchFromGitHub { owner = "Baldomo"; repo = "open-in-mpv"; rev = "v${version}"; - hash = "sha256-dmsI4ea9L50djT/vwjswWDZ7uwMzc2q84i0T82LGjxs="; + hash = "sha256-XlP8bGlftyNHoJI+yiVHVvd2Qa80miJdXqt+qljYNys="; }; vendorHash = "sha256-G6GZO2+CfEAYcf7zBcqDa808A0eJjM8dq7+4VGZ+P4c="; diff --git a/pkgs/applications/video/openshot-qt/default.nix b/pkgs/applications/video/openshot-qt/default.nix index 4a8208d8bbb6e..ec6e309e9b82c 100644 --- a/pkgs/applications/video/openshot-qt/default.nix +++ b/pkgs/applications/video/openshot-qt/default.nix @@ -10,18 +10,18 @@ , qtsvg , qtwayland , wayland -, waylandSupport ? stdenv.isLinux +, waylandSupport ? stdenv.hostPlatform.isLinux , wrapGAppsHook3 }: let pname = "openshot-qt"; - version = "3.1.1"; + version = "3.2.1"; src = fetchFromGitHub { owner = "OpenShot"; repo = "openshot-qt"; - rev = "v${version}"; - hash = "sha256-kEz1APBitWLlnIbyloYMsqNrwC9RqU04kyyWzm5klYc="; + rev = "refs/tags/v${version}"; + hash = "sha256-zZZ7C/1+Qh7KS1WJ8YWkhFgw0+UHJhjk+145u9/TBcI="; }; in mkDerivationWith python3.pkgs.buildPythonApplication { @@ -47,7 +47,7 @@ mkDerivationWith python3.pkgs.buildPythonApplication { pyqtwebengine pyzmq requests - sip4 + sip ]; strictDeps = true; @@ -66,7 +66,7 @@ mkDerivationWith python3.pkgs.buildPythonApplication { wrapProgram $out/bin/openshot-qt \ '' # Fix toolbar icons on Darwin - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' --suffix QT_PLUGIN_PATH : "${lib.getBin qtsvg}/${qtbase.qtPluginPrefix}" \ '' + '' "''${gappsWrapperArgs[@]}" \ diff --git a/pkgs/applications/video/p2pvc/default.nix b/pkgs/applications/video/p2pvc/default.nix deleted file mode 100644 index 703676b4615d9..0000000000000 --- a/pkgs/applications/video/p2pvc/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, stdenv, pkg-config, fetchFromGitHub, opencv2, ncurses, portaudio }: - -stdenv.mkDerivation { - pname = "p2pvc"; - version = "unstable-2015-02-12"; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ opencv2 ncurses portaudio ]; - - enableParallelBuilding = true; - - installPhase = "mkdir -p $out/bin; cp p2pvc $out/bin/"; - - src = fetchFromGitHub { - owner = "mofarrell"; - repo = "p2pvc"; - rev = "d7b1c70288a7750fc8f9a22dbddbe51d34b5b9e5"; - sha256 = "0d4vvrsjad5gk4rrjwgydn9ffj12jfb4aksw2px6jw75hp9pzmka"; - }; - - meta = { - description = "Point to point color terminal video chat"; - homepage = "https://github.com/mofarrell/p2pvc"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ trino ]; - platforms = with lib.platforms; linux; - mainProgram = "p2pvc"; - }; -} diff --git a/pkgs/applications/video/pipe-viewer/default.nix b/pkgs/applications/video/pipe-viewer/default.nix index 854e4c6ba4bc3..a1c7de85ebc44 100644 --- a/pkgs/applications/video/pipe-viewer/default.nix +++ b/pkgs/applications/video/pipe-viewer/default.nix @@ -9,7 +9,6 @@ , mpv , wget , xdg-utils -, youtube-dl , yt-dlp , TestPod , Gtk3 @@ -38,13 +37,13 @@ let in buildPerlModule rec { pname = "pipe-viewer"; - version = "0.5.1"; + version = "0.5.3"; src = fetchFromGitHub { owner = "trizen"; repo = "pipe-viewer"; rev = version; - hash = "sha256-GTmva1pDG1g2wZoS3ABYxhWdbARdlcS0rxGjkdJL7js="; + hash = "sha256-crYdbHIDcecfq1FKoRWX3u9x9wqdlaYrBgr7mGdEHeU="; }; nativeBuildInputs = [ makeWrapper ] @@ -75,11 +74,11 @@ buildPerlModule rec { postFixup = '' wrapProgram "$out/bin/pipe-viewer" \ - --prefix PATH : "${lib.makeBinPath [ ffmpeg mpv wget youtube-dl yt-dlp ]}" + --prefix PATH : "${lib.makeBinPath [ ffmpeg mpv wget yt-dlp ]}" '' + lib.optionalString withGtk3 '' # make xdg-open overrideable at runtime wrapProgram "$out/bin/gtk-pipe-viewer" ''${gappsWrapperArgs[@]} \ - --prefix PATH : "${lib.makeBinPath [ ffmpeg mpv wget youtube-dl yt-dlp ]}" \ + --prefix PATH : "${lib.makeBinPath [ ffmpeg mpv wget yt-dlp ]}" \ --suffix PATH : "${lib.makeBinPath [ xdg-utils ]}" ''; diff --git a/pkgs/applications/video/pitivi/default.nix b/pkgs/applications/video/pitivi/default.nix index 85ee9c0e7ef8d..616cce1a38987 100644 --- a/pkgs/applications/video/pitivi/default.nix +++ b/pkgs/applications/video/pitivi/default.nix @@ -102,7 +102,7 @@ python3.pkgs.buildPythonApplication rec { that can appeal to newbies and professionals alike. ''; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ aleksana ]; platforms = platforms.linux; mainProgram = "pitivi"; }; diff --git a/pkgs/applications/video/plex-media-player/default.nix b/pkgs/applications/video/plex-media-player/default.nix index 6a686d9d2c2a9..fb10bff45e330 100644 --- a/pkgs/applications/video/plex-media-player/default.nix +++ b/pkgs/applications/video/plex-media-player/default.nix @@ -7,7 +7,7 @@ let # sandboxed builds, we manually download them and save them so these files # are fetched ahead-of-time instead of during the CMake build. To update # plex-media-player use the update.sh script, so the versions and hashes - # for these files are are also updated! + # for these files are also updated! depSrcs = import ./deps.nix { inherit fetchurl; }; in mkDerivation rec { pname = "plex-media-player"; diff --git a/pkgs/applications/video/pyca/default.nix b/pkgs/applications/video/pyca/default.nix index 5ca1e59d107bb..eab7c5a7d2331 100644 --- a/pkgs/applications/video/pyca/default.nix +++ b/pkgs/applications/video/pyca/default.nix @@ -8,6 +8,7 @@ let python = python3.override { + self = python; packageOverrides = self: super: { # pyCA is incompatible with SQLAlchemy 2.0 sqlalchemy = super.sqlalchemy_1_4; @@ -72,7 +73,7 @@ python3.pkgs.buildPythonApplication rec { }; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; description = "Fully functional Opencast capture agent written in Python"; mainProgram = "pyca"; homepage = "https://github.com/opencast/pyCA"; @@ -80,4 +81,3 @@ python3.pkgs.buildPythonApplication rec { maintainers = with maintainers; [ pmiddend ]; }; } - diff --git a/pkgs/applications/video/qmediathekview/default.nix b/pkgs/applications/video/qmediathekview/default.nix index 0e8f3bfb584bc..d08387669eb3a 100644 --- a/pkgs/applications/video/qmediathekview/default.nix +++ b/pkgs/applications/video/qmediathekview/default.nix @@ -37,7 +37,7 @@ mkDerivation rec { license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ dotlambda ]; - broken = stdenv.isAarch64; + broken = stdenv.hostPlatform.isAarch64; mainProgram = "QMediathekView"; }; } diff --git a/pkgs/applications/video/qmplay2/default.nix b/pkgs/applications/video/qmplay2/default.nix deleted file mode 100644 index 167b5e8601e25..0000000000000 --- a/pkgs/applications/video/qmplay2/default.nix +++ /dev/null @@ -1,85 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, alsa-lib -, cmake -, ffmpeg -, fribidi -, game-music-emu -, libXdmcp -, libXv -, libass -, libcddb -, libcdio -, libpulseaudio -, libsidplayfp -, libva -, libxcb -, pkg-config -, qtbase -, qttools -, taglib -, vulkan-headers -, vulkan-tools -, wrapQtAppsHook -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "qmplay2"; - version = "24.04.07"; - - src = fetchFromGitHub { - owner = "zaps166"; - repo = "QMPlay2"; - rev = finalAttrs.version; - fetchSubmodules = true; - hash = "sha256-WIDGApvl+aaB3Vdv0sHY+FHWqzreWWd3/xOLV11YfxM="; - }; - - nativeBuildInputs = [ - cmake - pkg-config - wrapQtAppsHook - ]; - - buildInputs = [ - alsa-lib - ffmpeg - fribidi - game-music-emu - libXdmcp - libXv - libass - libcddb - libcdio - libpulseaudio - libsidplayfp - libva - libxcb - qtbase - qttools - taglib - vulkan-headers - vulkan-tools - ]; - - postInstall = '' - # Because we think it is better to use only lowercase letters! - ln -s $out/bin/QMPlay2 $out/bin/qmplay2 - ''; - - meta = { - homepage = "https://github.com/zaps166/QMPlay2/"; - description = "Qt-based Multimedia player"; - longDescription = '' - QMPlay2 is a video and audio player. It can play all formats supported by - FFmpeg, libmodplug (including J2B and SFX). It also supports Audio CD, raw - files, Rayman 2 music and chiptunes. It contains YouTube and MyFreeMP3 - browser. - ''; - changelog = "https://github.com/zaps166/QMPlay2/releases/tag/${finalAttrs.version}"; - license = lib.licenses.lgpl3Plus; - maintainers = with lib.maintainers; [ AndersonTorres kashw2 ]; - platforms = lib.platforms.linux; - }; -}) diff --git a/pkgs/applications/video/qstopmotion/default.nix b/pkgs/applications/video/qstopmotion/default.nix index 3172c4bb43435..2f0c66ecd1d12 100644 --- a/pkgs/applications/video/qstopmotion/default.nix +++ b/pkgs/applications/video/qstopmotion/default.nix @@ -79,7 +79,7 @@ mkDerivation rec { license = lib.licenses.gpl2Plus; maintainers = [ maintainers.leenaars ]; - broken = stdenv.isAarch64; + broken = stdenv.hostPlatform.isAarch64; platforms = lib.platforms.gnu ++ lib.platforms.linux; mainProgram = "qstopmotion"; }; diff --git a/pkgs/applications/video/rtabmap/default.nix b/pkgs/applications/video/rtabmap/default.nix index 3b457530fbf29..6565a40975871 100644 --- a/pkgs/applications/video/rtabmap/default.nix +++ b/pkgs/applications/video/rtabmap/default.nix @@ -11,11 +11,9 @@ , qtbase , g2o , ceres-solver -, libpointmatcher , octomap , freenect , libdc1394 -, librealsense , libGL , libGLU , vtkWithQt5 @@ -68,7 +66,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 = [ ]; platforms = with platforms; linux; }; } diff --git a/pkgs/applications/video/shaka-packager/default.nix b/pkgs/applications/video/shaka-packager/default.nix index 0bb73ee50e762..039648963f752 100644 --- a/pkgs/applications/video/shaka-packager/default.nix +++ b/pkgs/applications/video/shaka-packager/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://shaka-project.github.io/shaka-packager/html/"; license = lib.licenses.bsd3; mainProgram = "packager"; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; platforms = builtins.attrNames sources; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; }; diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix deleted file mode 100644 index 5427594b1e40b..0000000000000 --- a/pkgs/applications/video/shotcut/default.nix +++ /dev/null @@ -1,91 +0,0 @@ -{ lib -, fetchFromGitHub -, stdenv -, wrapQtAppsHook -, substituteAll -, SDL2 -, frei0r -, ladspaPlugins -, gettext -, mlt -, jack1 -, pkg-config -, fftw -, qtbase -, qttools -, qtmultimedia -, qtcharts -, cmake -, Cocoa -, gitUpdater -}: -stdenv.mkDerivation (finalAttrs: { - pname = "shotcut"; - version = "24.04.28"; - - src = fetchFromGitHub { - owner = "mltframework"; - repo = "shotcut"; - rev = "v${finalAttrs.version}"; - hash = "sha256-iMg2XrTrLFZXXvnJ7lMdkxf/LTaL9bh9Nc2jsPOS0eo="; - }; - - nativeBuildInputs = [ pkg-config cmake wrapQtAppsHook ]; - buildInputs = [ - SDL2 - frei0r - ladspaPlugins - gettext - mlt - fftw - qtbase - qttools - qtmultimedia - qtcharts - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Cocoa - ]; - - env.NIX_CFLAGS_COMPILE = "-DSHOTCUT_NOUPGRADE"; - cmakeFlags = [ - "-DSHOTCUT_VERSION=${finalAttrs.version}" - ]; - - patches = [ - (substituteAll { inherit mlt; src = ./fix-mlt-ffmpeg-path.patch; }) - ]; - - qtWrapperArgs = [ - "--set FREI0R_PATH ${frei0r}/lib/frei0r-1" - "--set LADSPA_PATH ${ladspaPlugins}/lib/ladspa" - "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([SDL2] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [jack1])}" - ]; - - postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' - mkdir $out/Applications $out/bin - mv $out/Shotcut.app $out/Applications/Shotcut.app - ln -s $out/Applications/Shotcut.app/Contents/MacOS/Shotcut $out/bin/shotcut - ''; - - passthru.updateScript = gitUpdater { - rev-prefix = "v"; - }; - - meta = with lib; { - description = "Free, open source, cross-platform video editor"; - longDescription = '' - An official binary for Shotcut, which includes all the - dependencies pinned to specific versions, is provided on - http://shotcut.org. - - If you encounter problems with this version, please contact the - nixpkgs maintainer(s). If you wish to report any bugs upstream, - please use the official build from shotcut.org instead. - ''; - homepage = "https://shotcut.org"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ goibhniu woffs peti ]; - platforms = platforms.unix; - mainProgram = "shotcut"; - }; -}) diff --git a/pkgs/applications/video/shotcut/fix-mlt-ffmpeg-path.patch b/pkgs/applications/video/shotcut/fix-mlt-ffmpeg-path.patch deleted file mode 100644 index fa584162cbe83..0000000000000 --- a/pkgs/applications/video/shotcut/fix-mlt-ffmpeg-path.patch +++ /dev/null @@ -1,80 +0,0 @@ -diff --git a/src/docks/encodedock.cpp b/src/docks/encodedock.cpp -index 3359f676..24e44f98 100644 ---- a/src/docks/encodedock.cpp -+++ b/src/docks/encodedock.cpp -@@ -2177,7 +2177,7 @@ bool EncodeDock::detectHardwareEncoders() - { - MAIN.showStatusMessage(tr("Detecting hardware encoders...")); - QStringList hwlist; -- QFileInfo ffmpegPath(qApp->applicationDirPath(), "ffmpeg"); -+ QFileInfo ffmpegPath("@ffmpeg@/bin/ffmpeg"); - foreach (const QString &codec, codecs()) { - LOG_INFO() << "checking for" << codec; - QProcess proc; -@@ -2220,7 +2220,7 @@ bool EncodeDock::detectHardwareEncoders() - QString &EncodeDock::defaultFormatExtension() - { - auto format = ui->formatCombo->currentText(); -- QFileInfo ffmpegPath(qApp->applicationDirPath(), "ffmpeg"); -+ QFileInfo ffmpegPath("@ffmpeg@/bin/ffmpeg"); - QProcess proc; - QStringList args; - args << "-hide_banner" << "-h" << format.prepend("muxer="); -diff --git a/src/jobs/ffmpegjob.cpp b/src/jobs/ffmpegjob.cpp -index 1f15e647..b6ad6633 100644 ---- a/src/jobs/ffmpegjob.cpp -+++ b/src/jobs/ffmpegjob.cpp -@@ -54,7 +54,7 @@ FfmpegJob::~FfmpegJob() - void FfmpegJob::start() - { - QString shotcutPath = qApp->applicationDirPath(); -- QFileInfo ffmpegPath(shotcutPath, "ffmpeg"); -+ QFileInfo ffmpegPath("@ffmpeg@/bin/ffmpeg"); - setReadChannel(QProcess::StandardError); - LOG_DEBUG() << ffmpegPath.absoluteFilePath() + " " + m_args.join(' '); - AbstractJob::start(ffmpegPath.absoluteFilePath(), m_args); -diff --git a/src/jobs/meltjob.cpp b/src/jobs/meltjob.cpp -index fd8c00b8..9150fe7b 100644 ---- a/src/jobs/meltjob.cpp -+++ b/src/jobs/meltjob.cpp -@@ -98,9 +98,9 @@ void MeltJob::start() - } - QString shotcutPath = qApp->applicationDirPath(); - #if defined(Q_OS_UNIX) && !defined(Q_OS_MAC) -- QFileInfo meltPath(shotcutPath, "melt-7"); -+ QFileInfo meltPath("@mlt@/bin/melt"); - #else -- QFileInfo meltPath(shotcutPath, "melt"); -+ QFileInfo meltPath("@mlt@/bin/melt"); - #endif - setReadChannel(QProcess::StandardError); - QStringList args; -diff --git a/src/mltcontroller.cpp b/src/mltcontroller.cpp -index 1e2299ac..b8f39f12 100644 ---- a/src/mltcontroller.cpp -+++ b/src/mltcontroller.cpp -@@ -1555,9 +1555,9 @@ int Controller::checkFile(const QString &path) - || path.endsWith(".aep")) { - QString shotcutPath = qApp->applicationDirPath(); - #if defined(Q_OS_UNIX) && !defined(Q_OS_MAC) -- QFileInfo meltPath(shotcutPath, "melt-7"); -+ QFileInfo meltPath("@mlt@/bin/melt"); - #else -- QFileInfo meltPath(shotcutPath, "melt"); -+ QFileInfo meltPath("@mlt@/bin/melt"); - #endif - QStringList args; - args << "-quiet" << "-consumer" << "null" << "real_time=0" << "out=0" << "terminate_on_pause=1" << -diff --git a/src/widgets/directshowvideowidget.cpp b/src/widgets/directshowvideowidget.cpp -index c91ba821..73dd5a61 100644 ---- a/src/widgets/directshowvideowidget.cpp -+++ b/src/widgets/directshowvideowidget.cpp -@@ -35,7 +35,7 @@ DirectShowVideoWidget::DirectShowVideoWidget(QWidget *parent) : - ui->setupUi(this); - Util::setColorsToHighlight(ui->label); - #ifdef Q_OS_WIN -- QFileInfo ffmpegPath(qApp->applicationDirPath(), "ffmpeg"); -+ QFileInfo ffmpegPath("@ffmpeg@/bin/ffmpeg"); - QProcess proc; - QStringList args; - args << "-hide_banner" << "-list_devices" << "true" << "-f" << "dshow" << "-i" << "dummy"; diff --git a/pkgs/applications/video/simplescreenrecorder/default.nix b/pkgs/applications/video/simplescreenrecorder/default.nix index 8e30dc3e6358c..9b503abab6a1f 100644 --- a/pkgs/applications/video/simplescreenrecorder/default.nix +++ b/pkgs/applications/video/simplescreenrecorder/default.nix @@ -1,16 +1,16 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, alsa-lib, ffmpeg_4, libjack2, libX11, libXext, libXinerama, qtx11extras +{ lib, stdenv, mkDerivation, fetchFromGitHub, alsa-lib, ffmpeg_7, libjack2, libX11, libXext, libXinerama, qtx11extras , libXfixes, libGLU, libGL, pkg-config, libpulseaudio, libv4l, qtbase, qttools, cmake, ninja, nix-update-script }: mkDerivation rec { pname = "simplescreenrecorder"; - version = "0.4.4"; + version = "0.4.4-unstable-2024-08-13"; src = fetchFromGitHub { owner = "MaartenBaert"; repo = "ssr"; - rev = version; - sha256 = "sha256-cVjQmyk+rCqmDJzdnDk7bQ8kpyD3HtTw3wLVx2thHok="; + rev = "4e3ba13dd212fc4213fe0911f371bc7d34033b8d"; + hash = "sha256-jBZkyrZOrUljWgO8U4SZOTCu3sOm83unQ7vyv+KkAuE="; }; cmakeFlags = [ @@ -29,7 +29,7 @@ mkDerivation rec { nativeBuildInputs = [ pkg-config cmake ninja ]; buildInputs = [ - alsa-lib ffmpeg_4 libjack2 libX11 libXext libXfixes libXinerama libGLU libGL + alsa-lib ffmpeg_7 libjack2 libX11 libXext libXfixes libXinerama libGLU libGL libpulseaudio libv4l qtbase qttools qtx11extras ]; @@ -40,6 +40,6 @@ mkDerivation rec { homepage = "https://www.maartenbaert.be/simplescreenrecorder"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = [ maintainers.goibhniu ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/video/streamlink/default.nix b/pkgs/applications/video/streamlink/default.nix index e5f0cac20b523..fbedfe3d2223c 100644 --- a/pkgs/applications/video/streamlink/default.nix +++ b/pkgs/applications/video/streamlink/default.nix @@ -7,12 +7,12 @@ python3Packages.buildPythonApplication rec { pname = "streamlink"; - version = "6.7.4"; + version = "6.10.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-kzdTerEZ/ndSSl1mWq7Ou/sG4suN8o0SYNkodkJXUc4="; + hash = "sha256-VI1fy8Oo4dXSn6IQoFlT+F9IyucLUqwuvkn5DoWRdSE="; }; patches = [ @@ -42,7 +42,6 @@ python3Packages.buildPythonApplication rec { propagatedBuildInputs = with python3Packages; [ certifi - exceptiongroup isodate lxml pycountry diff --git a/pkgs/applications/video/stremio/default.nix b/pkgs/applications/video/stremio/default.nix index 0aa5ab26e653c..0b6495c8b1e68 100644 --- a/pkgs/applications/video/stremio/default.nix +++ b/pkgs/applications/video/stremio/default.nix @@ -6,26 +6,25 @@ , mpv , nodejs , qmake -, qtwebchannel , qtwebengine , wrapQtAppsHook }: stdenv.mkDerivation rec { pname = "stremio-shell"; - version = "4.4.165"; + version = "4.4.168"; src = fetchFromGitHub { owner = "Stremio"; repo = pname; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-Gky0/HaGm11PeV4twoQV71T99NG2o0mYzQxu/c9x5oE="; + hash = "sha256-pz1mie0kJov06GcyitvZu5Gg0Vz3YnigjDqFujGKqZM="; }; server = fetchurl { url = "https://s3-eu-west-1.amazonaws.com/stremio-artifacts/four/v${version}/server.js"; - sha256 = "sha256-52Pg0PrV15arGqhD3rXYCl1J6kcoL+/BHRvgiQBO/OA="; + hash = "sha256-aD3niQpgq1EiZLacnEFgmqUV+bc4rvGN9IA+9T4XF10="; }; buildInputs = [ qtwebengine mpv ]; diff --git a/pkgs/applications/video/sub-batch/default.nix b/pkgs/applications/video/sub-batch/default.nix index bc0d6bd3a6cb4..48b38da01fae5 100644 --- a/pkgs/applications/video/sub-batch/default.nix +++ b/pkgs/applications/video/sub-batch/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-TOcK+l65iKON1kgBE4DYV/BXACnvqPCshavnVdpnGH4="; }; - cargoSha256 = "sha256-tOY3aLpU08Tg/IT+usS2DNO0Q1aD0bvURmNJmHcJkgI="; + cargoHash = "sha256-tOY3aLpU08Tg/IT+usS2DNO0Q1aD0bvURmNJmHcJkgI="; nativeBuildInputs = [ makeWrapper ]; @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/kl/sub-batch"; license = licenses.mit; maintainers = with maintainers; [ erictapen ]; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; mainProgram = "sub-batch"; }; } diff --git a/pkgs/applications/video/subtitleedit/default.nix b/pkgs/applications/video/subtitleedit/default.nix deleted file mode 100644 index b192edbffa0e9..0000000000000 --- a/pkgs/applications/video/subtitleedit/default.nix +++ /dev/null @@ -1,97 +0,0 @@ -{ lib -, stdenv -, fetchzip -, makeDesktopItem -, nix-update-script - -, copyDesktopItems -, icoutils -, makeWrapper - -, ffmpeg -, gtk2 -, hunspell -, mono -, mpv -, tesseract4 -}: - -stdenv.mkDerivation rec { - pname = "subtitleedit"; - version = "4.0.6"; - - src = fetchzip { - url = "https://github.com/SubtitleEdit/subtitleedit/releases/download/${version}/SE${lib.replaceStrings [ "." ] [ "" ] version}.zip"; - hash = "sha256-ipAqnF7rpSXccWkyTysUBrD0/mnv5AEA5GuxMJjW9Dg="; - stripRoot = false; - }; - - nativeBuildInputs = [ - copyDesktopItems - icoutils - makeWrapper - ]; - - runtimeLibs = lib.makeLibraryPath [ - gtk2 - hunspell - mpv - tesseract4 - ]; - - runtimeBins = lib.makeBinPath [ - ffmpeg - hunspell - tesseract4 - ]; - - installPhase = '' - runHook preInstall - - mkdir -p $out/bin - mkdir -p $out/share/icons/hicolor/{16x16,32x32,48x48,256x256}/apps - - cp -r * $out/bin/ - ln -s ${hunspell.out}/lib/libhunspell*.so $out/bin/libhunspell.so - makeWrapper "${mono}/bin/mono" $out/bin/subtitleedit \ - --add-flags "$out/bin/SubtitleEdit.exe" \ - --prefix LD_LIBRARY_PATH : ${runtimeLibs} \ - --prefix PATH : ${runtimeBins} - - wrestool -x -t 14 SubtitleEdit.exe > subtitleedit.ico - icotool -x -i 3 -o $out/share/icons/hicolor/16x16/apps/subtitleedit.png subtitleedit.ico - icotool -x -i 6 -o $out/share/icons/hicolor/32x32/apps/subtitleedit.png subtitleedit.ico - icotool -x -i 9 -o $out/share/icons/hicolor/48x48/apps/subtitleedit.png subtitleedit.ico - icotool -x -i 10 -o $out/share/icons/hicolor/256x256/apps/subtitleedit.png subtitleedit.ico - - runHook postInstall - ''; - - desktopItems = [ - (makeDesktopItem { - name = pname; - desktopName = "Subtitle Edit"; - exec = "subtitleedit"; - icon = "subtitleedit"; - comment = meta.description; - categories = [ "Video" ]; - }) - ]; - - passthru.updateScript = nix-update-script { }; - - meta = with lib; { - description = "A subtitle editor"; - longDescription = '' - With Subtitle Edit you can easily adjust a subtitle if it is out of sync with - the video in several different ways. You can also use it for making - new subtitles from scratch (using the time-line /waveform/spectrogram) - or for translating subtitles. - ''; - homepage = "https://nikse.dk/subtitleedit"; - license = licenses.gpl3Plus; - platforms = platforms.all; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - maintainers = with maintainers; [ ]; - }; -} diff --git a/pkgs/applications/video/tartube/default.nix b/pkgs/applications/video/tartube/default.nix index 057484d379e84..480c36edcfbdb 100644 --- a/pkgs/applications/video/tartube/default.nix +++ b/pkgs/applications/video/tartube/default.nix @@ -15,13 +15,13 @@ python3Packages.buildPythonApplication rec { pname = "tartube"; - version = "2.5.0"; + version = "2.5.040"; src = fetchFromGitHub { owner = "axcore"; repo = "tartube"; rev = "refs/tags/v${version}"; - sha256 = "sha256-IcJDh8Q9K6SROZWVi98R1N2kSdgwJczScLdJFKy2FIU="; + sha256 = "sha256-yFsQbEXjWPxLYqFxsI6MjK1hE8Lk2Z0sPj3peLBs7r8="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/video/timelens/default.nix b/pkgs/applications/video/timelens/default.nix index b80d1c3c447b8..7b7b1e0e7211c 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 = [ ]; mainProgram = "timelens"; }; } diff --git a/pkgs/applications/video/ustreamer/default.nix b/pkgs/applications/video/ustreamer/default.nix index b612584d8b0f3..512e6e8515c81 100644 --- a/pkgs/applications/video/ustreamer/default.nix +++ b/pkgs/applications/video/ustreamer/default.nix @@ -12,6 +12,7 @@ , speex , jansson , libopus +, nixosTests , withJanus ? true }: stdenv.mkDerivation rec { @@ -53,6 +54,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.tests = { inherit (nixosTests) ustreamer; }; + meta = with lib; { homepage = "https://github.com/pikvm/ustreamer"; description = "Lightweight and fast MJPG-HTTP streamer"; diff --git a/pkgs/applications/video/uvccapture/default.nix b/pkgs/applications/video/uvccapture/default.nix index 96e42b1a7f95a..f7067c8dd71a3 100644 --- a/pkgs/applications/video/uvccapture/default.nix +++ b/pkgs/applications/video/uvccapture/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { done ''; - makeFlagsArray = [ "PREFIX=$(out)/bin/" ]; + makeFlags = [ "PREFIX=$(out)/bin/" ]; preInstall = '' mkdir -p "$out/bin" diff --git a/pkgs/applications/video/vcs/default.nix b/pkgs/applications/video/vcs/default.nix index 63a9989134735..91a966bd1f4ea 100644 --- a/pkgs/applications/video/vcs/default.nix +++ b/pkgs/applications/video/vcs/default.nix @@ -3,10 +3,9 @@ , util-linux, getopt , dejavu_fonts }: -with lib; let version = "1.13.4"; - gopt = if stdenv.isLinux then util-linux else getopt; + gopt = if stdenv.hostPlatform.isLinux then util-linux else getopt; runtimeDeps = [ coreutils ffmpeg gawk gnugrep gnused imagemagick mplayer gopt ]; @@ -29,10 +28,10 @@ stdenv.mkDerivation { mv vcs $out/bin/vcs substituteAllInPlace $out/bin/vcs chmod +x $out/bin/vcs - wrapProgram $out/bin/vcs --argv0 vcs --set PATH "${makeBinPath runtimeDeps}" + wrapProgram $out/bin/vcs --argv0 vcs --set PATH "${lib.makeBinPath runtimeDeps}" ''; - meta = { + meta = with lib; { description = "Generates contact sheets from video files"; homepage = "http://p.outlyer.net/vcs"; license = licenses.lgpl21Plus; diff --git a/pkgs/applications/video/vdr/default.nix b/pkgs/applications/video/vdr/default.nix index 5713aeb954af3..50c0d5ce4ce07 100644 --- a/pkgs/applications/video/vdr/default.nix +++ b/pkgs/applications/video/vdr/default.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { pname = "vdr"; - version = "2.6.7"; + version = "2.6.9"; src = fetchgit { url = "git://git.tvdr.de/vdr.git"; rev = version; - hash = "sha256-6i3EQgARwMLNejgB0NevmLmd9OrNBvjqW+qLrAdqUxE="; + hash = "sha256-0Metur3+fQhomf+ClY9zXijNsr5wWkaqnzjUNXjsjss="; }; enableParallelBuilding = true; diff --git a/pkgs/applications/video/vdr/markad/default.nix b/pkgs/applications/video/vdr/markad/default.nix index efc08eaf06d19..c86a8ff296435 100644 --- a/pkgs/applications/video/vdr/markad/default.nix +++ b/pkgs/applications/video/vdr/markad/default.nix @@ -2,20 +2,7 @@ , stdenv , vdr , fetchFromGitHub -, graphicsmagick -, pcre -, xorgserver , ffmpeg -, libiconv -, boost -, libgcrypt -, perl -, util-linux -, groff -, libva -, xorg -, ncurses -, callPackage }: stdenv.mkDerivation rec { pname = "vdr-markad"; diff --git a/pkgs/applications/video/vdr/plugins.nix b/pkgs/applications/video/vdr/plugins.nix index 6890df0bdca6d..a0d12156f774e 100644 --- a/pkgs/applications/video/vdr/plugins.nix +++ b/pkgs/applications/video/vdr/plugins.nix @@ -176,7 +176,7 @@ in { owner = "jowi24"; repo = "vdr-fritz"; rev = version; - sha256 = "sha256-DGD73i+ZHFgtCo+pMj5JaMovvb5vS1x20hmc5t29//o="; + hash = "sha256-DGD73i+ZHFgtCo+pMj5JaMovvb5vS1x20hmc5t29//o="; fetchSubmodules = true; }; diff --git a/pkgs/applications/video/vdr/softhddevice/default.nix b/pkgs/applications/video/vdr/softhddevice/default.nix index e04af11dfe0d9..612731acdcc10 100644 --- a/pkgs/applications/video/vdr/softhddevice/default.nix +++ b/pkgs/applications/video/vdr/softhddevice/default.nix @@ -14,12 +14,12 @@ }: stdenv.mkDerivation rec { pname = "vdr-softhddevice"; - version = "2.3.3"; + version = "2.3.8"; src = fetchFromGitHub { owner = "ua0lnj"; repo = "vdr-plugin-softhddevice"; - sha256 = "sha256-PvSo5qiDMVrL6ylts5leR/3YAqIpIZcmnAqnGopPG94="; + sha256 = "sha256-/eNPhkrLpxXeX/5EitMJUgZCPy1Ked3oKuMdD6OuEYc="; rev = "v${version}"; }; diff --git a/pkgs/applications/video/video-trimmer/default.nix b/pkgs/applications/video/video-trimmer/default.nix deleted file mode 100644 index 3ff12dbffcce4..0000000000000 --- a/pkgs/applications/video/video-trimmer/default.nix +++ /dev/null @@ -1,78 +0,0 @@ -{ stdenv -, lib -, fetchFromGitLab -, rustPlatform -, cargo -, pkg-config -, meson -, rustc -, wrapGAppsHook4 -, desktop-file-utils -, blueprint-compiler -, ninja -, gtk4 -, libadwaita -, gst_all_1 -, ffmpeg-headless -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "video-trimmer"; - version = "0.8.1"; - - src = fetchFromGitLab { - domain = "gitlab.gnome.org"; - owner = "YaLTeR"; - repo = "video-trimmer"; - rev = "v${finalAttrs.version}"; - hash = "sha256-nr0PAvp4wlswQBNN2LLyYQMpk3IIleHf3+978XhUGGQ="; - }; - - cargoDeps = rustPlatform.fetchCargoTarball { - inherit (finalAttrs) src; - name = "${finalAttrs.pname}-${finalAttrs.version}"; - hash = "sha256-YFbLMpQbHUtxRrBVarcoIeDsvc26NWc1YhMeCaLgJAc="; - }; - - nativeBuildInputs = [ - pkg-config - meson - wrapGAppsHook4 - desktop-file-utils - blueprint-compiler - ninja - # Present here in addition to buildInputs, because meson runs - # `gtk4-update-icon-cache` during installPhase, thanks to: - # https://gitlab.gnome.org/YaLTeR/video-trimmer/-/merge_requests/12 - gtk4 - rustPlatform.cargoSetupHook - cargo - rustc - ]; - - buildInputs = [ - gtk4 - libadwaita - gst_all_1.gstreamer - gst_all_1.gst-plugins-base - gst_all_1.gst-plugins-good # for scaletempo and webm - gst_all_1.gst-plugins-bad - ]; - - doCheck = true; - - preFixup = '' - gappsWrapperArgs+=( - --prefix PATH : "${lib.makeBinPath [ ffmpeg-headless ]}" - ) - ''; - - meta = with lib; { - homepage = "https://gitlab.gnome.org/YaLTeR/video-trimmer"; - description = "Trim videos quickly"; - maintainers = with maintainers; [ doronbehar ]; - license = licenses.gpl3Plus; - platforms = platforms.linux; - mainProgram = "video-trimmer"; - }; -}) diff --git a/pkgs/applications/video/webcamoid/default.nix b/pkgs/applications/video/webcamoid/default.nix index 799e68bf072e6..15f6313c42154 100644 --- a/pkgs/applications/video/webcamoid/default.nix +++ b/pkgs/applications/video/webcamoid/default.nix @@ -1,6 +1,6 @@ -{ lib, fetchFromGitHub, pkg-config, libxcb, mkDerivation, cmake +{ lib, fetchFromGitHub, fetchpatch2, pkg-config, libxcb, mkDerivation, cmake , qtbase, qtdeclarative, qtquickcontrols, qtquickcontrols2 -, ffmpeg_4, gst_all_1, libpulseaudio, alsa-lib, jack2 +, ffmpeg_7, gst_all_1, libpulseaudio, alsa-lib, jack2 , v4l-utils }: mkDerivation rec { pname = "webcamoid"; @@ -13,10 +13,18 @@ mkDerivation rec { owner = "webcamoid"; }; + patches = [ + # Update mediawriterffmpeg.cpp for ffmpeg-7.0 + (fetchpatch2 { + url = "https://github.com/webcamoid/webcamoid/commit/b4864f13ec8c2ec93ebb5c13d9293cf9c02c93fd.patch?full_index=1"; + hash = "sha256-QasfVocxAzRMME03JFRfz7QQYXQGq4TSFiBsKL1g/wU="; + }) + ]; + buildInputs = [ libxcb qtbase qtdeclarative qtquickcontrols qtquickcontrols2 - ffmpeg_4 + ffmpeg_7 gst_all_1.gstreamer gst_all_1.gst-plugins-base alsa-lib libpulseaudio jack2 v4l-utils diff --git a/pkgs/applications/video/wf-recorder/default.nix b/pkgs/applications/video/wf-recorder/default.nix index f4e2c8ee714fd..b2f848773c8a6 100644 --- a/pkgs/applications/video/wf-recorder/default.nix +++ b/pkgs/applications/video/wf-recorder/default.nix @@ -1,23 +1,47 @@ -{ lib, stdenv, fetchFromGitHub -, meson, ninja, pkg-config, scdoc, wayland-scanner -, wayland, wayland-protocols, ffmpeg, x264, libpulseaudio -, mesa # for libgbm +{ + lib, + stdenv, + fetchFromGitHub, + meson, + ninja, + pkg-config, + scdoc, + wayland-scanner, + wayland, + wayland-protocols, + ffmpeg, + x264, + libpulseaudio, + pipewire, + mesa, # for libgbm }: stdenv.mkDerivation rec { pname = "wf-recorder"; - version = "0.4.1"; + version = "0.5.0"; src = fetchFromGitHub { owner = "ammen99"; repo = pname; rev = "v${version}"; - hash = "sha256-SXPXvKXn236oO1WakkMNql3lj2flYYlmArVHGomH0/k="; + hash = "sha256-7/fQOkfAw5v3irD5blJOdq88j0VBrPVQQufdt9wsACk="; }; - nativeBuildInputs = [ meson ninja pkg-config wayland-scanner scdoc ]; + nativeBuildInputs = [ + meson + ninja + pkg-config + wayland-scanner + scdoc + ]; buildInputs = [ - wayland wayland-protocols ffmpeg x264 libpulseaudio mesa + wayland + wayland-protocols + ffmpeg + x264 + libpulseaudio + pipewire + mesa ]; meta = with lib; { @@ -25,7 +49,7 @@ stdenv.mkDerivation rec { inherit (src.meta) homepage; changelog = "https://github.com/ammen99/wf-recorder/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ dywedir ]; platforms = platforms.linux; mainProgram = "wf-recorder"; }; diff --git a/pkgs/applications/video/xine/lib.nix b/pkgs/applications/video/xine/lib.nix deleted file mode 100644 index 641243ee77c6d..0000000000000 --- a/pkgs/applications/video/xine/lib.nix +++ /dev/null @@ -1,92 +0,0 @@ -{ lib -, stdenv -, fetchurl -, aalib -, alsa-lib -, autoreconfHook -, ffmpeg -, flac -, libGL -, libGLU -, libX11 -, libXext -, libXinerama -, libXv -, libcaca -, libcdio -, libmng -, libmpcdec -, libpulseaudio -, libtheora -, libv4l -, libvorbis -, libxcb -, ncurses -, perl -, pkg-config -, speex -, vcdimager -, zlib -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "xine-lib"; - version = "1.2.13"; - - src = fetchurl { - url = "mirror://sourceforge/xine/xine-lib-${finalAttrs.version}.tar.xz"; - hash = "sha256-XxDW1xikpRwX7RsysDHU+bgLBh6CdlNbK+MeWsS3Xm8="; - }; - - outputs = [ "out" "dev" "man" ]; - - nativeBuildInputs = [ - autoreconfHook - perl - pkg-config - ]; - - buildInputs = [ - aalib - alsa-lib - ffmpeg - flac - libGL - libGLU - libX11 - libXext - libXinerama - libXv - libcaca - libcdio - libmng - libmpcdec - libpulseaudio - libtheora - libv4l - libvorbis - libxcb - ncurses - perl - speex - vcdimager - zlib - libX11 - libXext - libXinerama - libXv - libxcb - ]; - - enableParallelBuilding = true; - - env.NIX_LDFLAGS = "-lxcb-shm"; - - meta = { - homepage = "https://xine.sourceforge.net/"; - description = "High-performance, portable and reusable multimedia playback engine"; - license = with lib.licenses; [ gpl2Plus lgpl2Plus ]; - maintainers = with lib.maintainers; [ AndersonTorres ]; - platforms = lib.platforms.linux; - }; -}) diff --git a/pkgs/applications/video/xine/ui.nix b/pkgs/applications/video/xine/ui.nix deleted file mode 100644 index 84631a8c45793..0000000000000 --- a/pkgs/applications/video/xine/ui.nix +++ /dev/null @@ -1,78 +0,0 @@ -{ lib -, stdenv -, fetchurl -, autoreconfHook -, curl -, libXext -, libXft -, libXi -, libXinerama -, libXtst -, libXv -, libXxf86vm -, libjpeg -, libpng -, lirc -, ncurses -, pkg-config -, readline -, shared-mime-info -, xine-lib -, xorgproto -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "xine-ui"; - version = "0.99.14"; - - src = fetchurl { - url = "mirror://sourceforge/xine/xine-ui-${finalAttrs.version}.tar.xz"; - hash = "sha256-1NSQ1c7OcOK7mEnJ5ILyz4evAwLUUbYUR2/cw2Qs2cM="; - }; - - outputs = [ "out" "dev" "lib" "man" ]; - - nativeBuildInputs = [ - autoreconfHook - pkg-config - shared-mime-info - ]; - - buildInputs = [ - curl - libXext - libXft - libXi - libXinerama - libXtst - libXv - libXxf86vm - libjpeg - libpng - lirc - ncurses - readline - xine-lib - xorgproto - ]; - - configureFlags = [ "--with-readline=${readline.dev}" ]; - - env = { - LIRC_CFLAGS="-I${lirc}/include"; - LIRC_LIBS="-L ${lirc}/lib -llirc_client"; - }; - - postInstall = '' - substituteInPlace $out/share/applications/xine.desktop \ - --replace "MimeType=;" "MimeType=" - ''; - - meta = { - homepage = "https://xine.sourceforge.net/"; - description = "Xlib-based frontend for Xine video player"; - license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ AndersonTorres ]; - platforms = lib.platforms.linux; - }; -}) diff --git a/pkgs/applications/video/xplayer/default.nix b/pkgs/applications/video/xplayer/default.nix deleted file mode 100644 index d697ff2020043..0000000000000 --- a/pkgs/applications/video/xplayer/default.nix +++ /dev/null @@ -1,97 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, autoreconfHook -, autoconf-archive -, clutter-gst -, clutter-gtk -, gettext -, glib -, gobject-introspection -, gst-plugins-bad -, gst-plugins-base -, gst-plugins-good -, gstreamer -, gtk-doc -, gtk3 -, intltool -, itstool -, libpeas -, libxml2 -, libxplayer-plparser -, pkg-config -, python3 -, wrapGAppsHook3 -, xapp -, yelp-tools }: - -stdenv.mkDerivation rec { - pname = "xplayer"; - version = "2.4.4"; - - src = fetchFromGitHub { - owner = "linuxmint"; - repo = pname; - rev = version; - sha256 = "sha256-o2vLNIELd1EYWG26t5gOpnamJrBJeg4P6fcLirkcmfM="; - }; - - # configure wants to find gst-inspect-1.0 via pkgconfig but - # the gstreamer toolsdir points to the wrong derivation output - postPatch = '' - substituteInPlace configure.ac \ - --replace '$gst10_toolsdir/gst-inspect-1.0' '${gstreamer}/bin/gst-inspect-1.0' \ - ''; - - preBuild = '' - makeFlagsArray+=( - "INCLUDES=-I${glib.dev}/include/gio-unix-2.0" - "CFLAGS=-Wno-error" # Otherwise a lot of deprecated warnings are treated as error - ) - ''; - - nativeBuildInputs = [ - autoreconfHook - wrapGAppsHook3 - autoconf-archive - gettext - gtk-doc - intltool - itstool - pkg-config - python3.pkgs.wrapPython - yelp-tools - gobject-introspection - ]; - - buildInputs = [ - clutter-gst - clutter-gtk - glib - gst-plugins-bad - gst-plugins-base - gst-plugins-good - gstreamer - gtk3 - libpeas - libxml2 - libxplayer-plparser - python3 - xapp - # to satisfy configure script - python3.pkgs.pygobject3 - ]; - - postFixup = '' - buildPythonPath ${python3.pkgs.dbus-python} - patchPythonScript $out/lib/xplayer/plugins/dbus/dbusservice.py - ''; - - meta = with lib; { - description = "Generic media player from Linux Mint"; - license = with licenses; [ gpl2Plus lgpl21Plus ]; - homepage = "https://github.com/linuxmint/xplayer"; - maintainers = with maintainers; [ tu-maurice bobby285271 ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/video/xplayer/plparser.nix b/pkgs/applications/video/xplayer/plparser.nix deleted file mode 100644 index 67e394968da54..0000000000000 --- a/pkgs/applications/video/xplayer/plparser.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, meson -, ninja -, gobject-introspection -, gmime3 -, libxml2 -, libsoup -, pkg-config -}: - -stdenv.mkDerivation rec { - pname = "xplayer-plparser"; - version = "1.0.3"; - - src = fetchFromGitHub { - owner = "linuxmint"; - repo = pname; - rev = version; - sha256 = "6GMKsIpyQdiyHPxrjWHAHvuCouJxrAcYPIo9u6TLOA4="; - }; - - nativeBuildInputs = [ - meson - ninja - pkg-config - gobject-introspection - ]; - - buildInputs = [ - gmime3 - libxml2 - libsoup - ]; - - meta = with lib; { - description = "Playlist parsing library for xplayer"; - homepage = "https://github.com/linuxmint/xplayer-plparser"; - maintainers = with maintainers; [ tu-maurice bobby285271 ]; - license = licenses.lgpl2Plus; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/video/xscast/default.nix b/pkgs/applications/video/xscast/default.nix index 4e7252a514f88..71b22201e9dd9 100644 --- a/pkgs/applications/video/xscast/default.nix +++ b/pkgs/applications/video/xscast/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { homepage = "https://github.com/KeyboardFire/xscast"; license = licenses.mit; description = "Screencasts of windows with list of keystrokes overlayed"; - maintainers = with maintainers; [ ]; + maintainers = [ ]; mainProgram = "xscast"; }; } diff --git a/pkgs/applications/video/youtube-tui/default.nix b/pkgs/applications/video/youtube-tui/default.nix index 89d32f6f9a70f..70458c7f6235c 100644 --- a/pkgs/applications/video/youtube-tui/default.nix +++ b/pkgs/applications/video/youtube-tui/default.nix @@ -43,14 +43,14 @@ rustPlatform.buildRustPackage rec { xorg.libxcb libsixel mpv - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreFoundation Security AppKit ]; # sixel-sys is dynamically linked to libsixel - postInstall = lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' wrapProgram $out/bin/youtube-tui \ --prefix DYLD_LIBRARY_PATH : "${lib.makeLibraryPath [libsixel]}" ''; diff --git a/pkgs/applications/virtualization/OVMF/default.nix b/pkgs/applications/virtualization/OVMF/default.nix index 60eaa6428d62c..35336ad8ad3f3 100644 --- a/pkgs/applications/virtualization/OVMF/default.nix +++ b/pkgs/applications/virtualization/OVMF/default.nix @@ -1,5 +1,5 @@ { stdenv, nixosTests, lib, edk2, util-linux, nasm, acpica-tools, llvmPackages -, fetchurl, python3, pexpect, xorriso, qemu, dosfstools, mtools +, fetchFromGitLab, python3, pexpect, xorriso, qemu, dosfstools, mtools , fdSize2MB ? false , fdSize4MB ? secureBoot , secureBoot ? false @@ -12,7 +12,7 @@ # to use as the PK and first KEK for the keystore. # # By default, we use Debian's cert. This default -# should chnage to a NixOS cert once we have our +# should change to a NixOS cert once we have our # own secure boot signing infrastructure. # # Ignored if msVarsTemplate is false. @@ -29,6 +29,7 @@ x86_64 = "OvmfPkg/OvmfPkgX64.dsc"; aarch64 = "ArmVirtPkg/ArmVirtQemu.dsc"; riscv64 = "OvmfPkg/RiscVVirt/RiscVVirtQemu.dsc"; + loongarch64 = "OvmfPkg/LoongArchVirt/LoongArchVirtQemu.dsc"; }.${stdenv.hostPlatform.parsed.cpu.name} or (throw "Unsupported OVMF `projectDscPath` on ${stdenv.hostPlatform.parsed.cpu.name}") , fwPrefix ? { @@ -36,6 +37,7 @@ x86_64 = "OVMF"; aarch64 = "AAVMF"; riscv64 = "RISCV_VIRT"; + loongarch64 = "LOONGARCH_VIRT"; }.${stdenv.hostPlatform.parsed.cpu.name} or (throw "Unsupported OVMF `fwPrefix` on ${stdenv.hostPlatform.parsed.cpu.name}") , metaPlatforms ? edk2.meta.platforms @@ -66,17 +68,26 @@ let OvmfPkKek1AppPrefix = "4e32566d-8e9e-4f52-81d3-5bb9715f9727"; - debian-edk-src = fetchurl { - url = "http://deb.debian.org/debian/pool/main/e/edk2/edk2_2023.11-5.debian.tar.xz"; - sha256 = "1yxlab4md30pxvjadr6b4xn6cyfw0c292q63pyfv4vylvhsb24g4"; + debian-edk-src = fetchFromGitLab { + domain = "salsa.debian.org"; + owner = "qemu-team"; + repo = "edk2"; + nonConeMode = true; + sparseCheckout = [ + "debian/edk2-vars-generator.py" + "debian/python" + "debian/PkKek-1-*.pem" + ]; + rev = "refs/tags/debian/2024.05-1"; + hash = "sha256-uAjXJaHOVh944ZxcA2IgCsrsncxuhc0JKlsXs0E03s0="; }; buildPrefix = "Build/*/*"; in -assert platformSpecific ? ${cpuName}; assert msVarsTemplate -> fdSize4MB; +assert msVarsTemplate -> platformSpecific ? ${cpuName}; assert msVarsTemplate -> platformSpecific.${cpuName} ? msVarsArgs; edk2.mkDerivation projectDscPath (finalAttrs: { @@ -111,7 +122,7 @@ edk2.mkDerivation projectDscPath (finalAttrs: { env.PYTHON_COMMAND = "python3"; postUnpack = lib.optionalDrvAttr msVarsTemplate '' - unpackFile ${debian-edk-src} + ln -s ${debian-edk-src}/debian ''; postConfigure = lib.optionalDrvAttr msVarsTemplate '' @@ -121,24 +132,25 @@ edk2.mkDerivation projectDscPath (finalAttrs: { export PYTHONPATH=$NIX_BUILD_TOP/debian/python:$PYTHONPATH ''; - postBuild = lib.optionalString stdenv.hostPlatform.isAarch '' + postBuild = lib.optionalString (stdenv.hostPlatform.isAarch || stdenv.hostPlatform.isLoongArch64) '' ( cd ${buildPrefix}/FV cp QEMU_EFI.fd ${fwPrefix}_CODE.fd cp QEMU_VARS.fd ${fwPrefix}_VARS.fd - + ) + '' + lib.optionalString stdenv.hostPlatform.isAarch '' # QEMU expects 64MiB CODE and VARS files on ARM/AARCH64 architectures # Truncate the firmware files to the expected size - truncate -s 64M ${fwPrefix}_CODE.fd - truncate -s 64M ${fwPrefix}_VARS.fd - ) + truncate -s 64M ${buildPrefix}/FV/${fwPrefix}_CODE.fd + truncate -s 64M ${buildPrefix}/FV/${fwPrefix}_VARS.fd '' + lib.optionalString stdenv.hostPlatform.isRiscV '' truncate -s 32M ${buildPrefix}/FV/${fwPrefix}_CODE.fd truncate -s 32M ${buildPrefix}/FV/${fwPrefix}_VARS.fd '' + lib.optionalString msVarsTemplate '' ( cd ${buildPrefix} - python3 $NIX_BUILD_TOP/debian/edk2-vars-generator.py \ + # locale must be set on Darwin for invocations of mtools to work correctly + LC_ALL=C python3 $NIX_BUILD_TOP/debian/edk2-vars-generator.py \ --flavor ${msVarsArgs.flavor} \ --enrolldefaultkeys ${msVarsArgs.archDir}/EnrollDefaultKeys.efi \ --shell ${msVarsArgs.archDir}/Shell.efi \ @@ -155,7 +167,7 @@ edk2.mkDerivation projectDscPath (finalAttrs: { postInstall = '' mkdir -vp $fd/FV '' + lib.optionalString (builtins.elem fwPrefix [ - "OVMF" "AAVMF" "RISCV_VIRT" + "OVMF" "AAVMF" "RISCV_VIRT" "LOONGARCH_VIRT" ]) '' mv -v $out/FV/${fwPrefix}_{CODE,VARS}.fd $fd/FV '' + lib.optionalString stdenv.hostPlatform.isx86 '' @@ -165,7 +177,7 @@ edk2.mkDerivation projectDscPath (finalAttrs: { ln -sv $fd/FV/${fwPrefix}_CODE{,.ms}.fd '' + lib.optionalString stdenv.hostPlatform.isAarch '' mv -v $out/FV/QEMU_{EFI,VARS}.fd $fd/FV - # Add symlinks for Fedora dir layout: https://src.fedoraproject.org/cgit/rpms/edk2.git/tree/edk2.spec + # Add symlinks for Fedora dir layout: https://src.fedoraproject.org/rpms/edk2/blob/main/f/edk2.spec mkdir -vp $fd/AAVMF ln -s $fd/FV/AAVMF_CODE.fd $fd/AAVMF/QEMU_EFI-pflash.raw ln -s $fd/FV/AAVMF_VARS.fd $fd/AAVMF/vars-template-pflash.raw @@ -179,6 +191,9 @@ edk2.mkDerivation projectDscPath (finalAttrs: { in { firmware = "${prefix}_CODE.fd"; variables = "${prefix}_VARS.fd"; + variablesMs = + assert msVarsTemplate; + "${prefix}_VARS.ms.fd"; # This will test the EFI firmware for the host platform as part of the NixOS Tests setup. tests.basic-systemd-boot = nixosTests.systemd-boot.basic; tests.secureBoot-systemd-boot = nixosTests.systemd-boot.secureBoot; @@ -190,7 +205,7 @@ edk2.mkDerivation projectDscPath (finalAttrs: { homepage = "https://github.com/tianocore/tianocore.github.io/wiki/OVMF"; license = lib.licenses.bsd2; platforms = metaPlatforms; - maintainers = with lib.maintainers; [ adamcstephens raitobezarius ]; - broken = stdenv.isDarwin; + maintainers = with lib.maintainers; [ adamcstephens raitobezarius mjoerg ]; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; }; }) diff --git a/pkgs/applications/virtualization/arion/default.nix b/pkgs/applications/virtualization/arion/default.nix index 716a94a05d8e4..e5ab20cf1937a 100644 --- a/pkgs/applications/virtualization/arion/default.nix +++ b/pkgs/applications/virtualization/arion/default.nix @@ -54,7 +54,7 @@ let mv $out/bin/arion $out/libexec makeWrapper $out/libexec/arion $out/bin/arion \ --unset PYTHONPATH \ - --prefix PATH : ${lib.makeBinPath [ pkgs.docker-compose_1 ]} \ + --prefix PATH : ${lib.makeBinPath [ pkgs.docker-compose ]} \ ; ''; }; diff --git a/pkgs/applications/virtualization/cloud-hypervisor/Cargo.lock b/pkgs/applications/virtualization/cloud-hypervisor/Cargo.lock index 302b760135471..dbb3ee5a6b796 100644 --- a/pkgs/applications/virtualization/cloud-hypervisor/Cargo.lock +++ b/pkgs/applications/virtualization/cloud-hypervisor/Cargo.lock @@ -12,9 +12,9 @@ dependencies = [ [[package]] name = "addr2line" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" dependencies = [ "gimli", ] @@ -36,23 +36,24 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.13" +version = "0.6.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" +checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b" dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", "anstyle-wincon", "colorchoice", + "is_terminal_polyfill", "utf8parse", ] [[package]] name = "anstyle" -version = "1.0.6" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" +checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b" [[package]] name = "anstyle-parse" @@ -74,9 +75,9 @@ dependencies = [ [[package]] name = "anstyle-wincon" -version = "3.0.3" +version = "3.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19" +checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8" dependencies = [ "anstyle", "windows-sys 0.52.0", @@ -84,9 +85,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.81" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" [[package]] name = "api_client" @@ -136,9 +137,9 @@ dependencies = [ [[package]] name = "async-channel" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f28243a43d821d11341ab73c80bed182dc015c514b951616cf79bd4af39af0c3" +checksum = "9f2776ead772134d55b62dd45e59a79e21612d85d0af729b8b7d3967d601a62a" dependencies = [ "concurrent-queue", "event-listener 5.3.0", @@ -281,9 +282,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "backtrace" -version = "0.3.71" +version = "0.3.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" +checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" dependencies = [ "addr2line", "cc", @@ -296,9 +297,9 @@ dependencies = [ [[package]] name = "bitfield-struct" -version = "0.5.6" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26b8cea8bb6a81b75a84603b9e096f05fa86db057904ef29be1deee900532bd" +checksum = "6c2ce686adbebce0ee484a502c440b4657739adbad65eadf06d64f5816ee9765" dependencies = [ "proc-macro2", "quote", @@ -313,9 +314,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" [[package]] name = "block" @@ -362,9 +363,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.15.4" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "byteorder" @@ -420,7 +421,7 @@ checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" [[package]] name = "cloud-hypervisor" -version = "40.0.0" +version = "41.0.0" dependencies = [ "anyhow", "api_client", @@ -451,9 +452,9 @@ dependencies = [ [[package]] name = "colorchoice" -version = "1.0.0" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" +checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0" [[package]] name = "concurrent-queue" @@ -509,9 +510,9 @@ dependencies = [ [[package]] name = "darling" -version = "0.20.9" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83b2eb4d90d12bdda5ed17de686c2acb4c57914f8f921b8da7e112b5a36f3fe1" +checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" dependencies = [ "darling_core", "darling_macro", @@ -519,9 +520,9 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.9" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622687fe0bac72a04e5599029151f5796111b90f1baaa9b544d807a5e31cd120" +checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" dependencies = [ "fnv", "ident_case", @@ -533,9 +534,9 @@ dependencies = [ [[package]] name = "darling_macro" -version = "0.20.9" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178" +checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core", "quote", @@ -566,12 +567,13 @@ dependencies = [ "acpi_tables", "anyhow", "arch", - "bitflags 2.5.0", + "bitflags 2.6.0", "byteorder", "event_monitor", "hypervisor", "libc", "log", + "num_enum", "pci", "serde", "thiserror", @@ -638,9 +640,9 @@ checksum = "a3d8a32ae18130a3c84dd492d4215c3d913c3b07c6b63c2eb3eb7ff1101ab7bf" [[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", @@ -648,9 +650,9 @@ 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", @@ -686,7 +688,7 @@ version = "4.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "74351c3392ea1ff6cd2628e0042d268ac2371cb613252ff383b6dfa50d22fa79" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "libc", ] @@ -698,9 +700,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" dependencies = [ "libc", "windows-sys 0.52.0", @@ -897,7 +899,7 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6341b3480afbb34eaefc7f92713bc92f2d83e338aaa1c44192f9c2956f4a4903" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cfg-if", "log", "managed", @@ -940,9 +942,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.28.1" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" +checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" [[package]] name = "glob" @@ -1015,9 +1017,9 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] name = "igvm" -version = "0.3.1" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bc8970c7e36437c52af3b3ef1acaa5e334c2a95cd8ee9639d574830f48af17e" +checksum = "7984b10433b50e06a06bd50c69bca4888a5d7de8975f64ea4c2a7687eb99b09d" dependencies = [ "bitfield-struct", "crc32fast", @@ -1032,9 +1034,9 @@ dependencies = [ [[package]] name = "igvm_defs" -version = "0.3.1" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c4942827cef415726296f6d62411afdb13c1b1924125f3222988f04bef33ad2" +checksum = "b64ec5588c475372ae830475d3ee9a7bd255407dcb9f03faf6d493556eb6105a" dependencies = [ "bitfield-struct", "open-enum", @@ -1081,6 +1083,12 @@ dependencies = [ ] [[package]] +name = "is_terminal_polyfill" +version = "1.70.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" + +[[package]] name = "itoa" version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1112,13 +1120,24 @@ version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bedae2ca4a531bebe311abaf9691f5cc14eaa21475243caa2e39c43bb872947d" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "kvm-bindings", "libc", "vmm-sys-util", ] [[package]] +name = "landlock" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dafb8a4afee64f167eb2b52d32f0eea002e41a7a6450e68c799c8ec3a81a634c" +dependencies = [ + "enumflags2", + "libc", + "thiserror", +] + +[[package]] name = "lazy_static" version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1126,9 +1145,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.153" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libredox" @@ -1136,7 +1155,7 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "libc", ] @@ -1156,9 +1175,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.16" +version = "1.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e143b5e666b2695d28f6bca6497720813f699c9602dd7f5cac91008b8ada7f9" +checksum = "c15da26e5af7e25c90b37a2d75cdbf940cf4a55316de9d84c679c9b8bfabf82e" dependencies = [ "cc", "libc", @@ -1193,9 +1212,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.21" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "managed" @@ -1311,7 +1330,7 @@ version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cfg-if", "cfg_aliases", "libc", @@ -1335,19 +1354,20 @@ dependencies = [ [[package]] name = "num_enum" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845" +checksum = "4e613fc340b2220f734a8595782c551f1250e969d87d3be1ae0579e8d4065179" dependencies = [ "num_enum_derive", ] [[package]] name = "num_enum_derive" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" +checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56" dependencies = [ + "proc-macro-crate", "proc-macro2", "quote", "syn 2.0.66", @@ -1355,9 +1375,9 @@ dependencies = [ [[package]] name = "object" -version = "0.32.2" +version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +checksum = "081b846d1d56ddfc18fdf1a922e4f6e07a11768ea1b92dec44e42b72712ccfce" dependencies = [ "memchr", ] @@ -1370,29 +1390,29 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "open-enum" -version = "0.4.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba485b94b3e73fa752d98cfcab74647a4a537269682cc1ee5256aa020432506d" +checksum = "2eb2508143a400b3361812094d987dd5adc81f0f5294a46491be648d6c94cab5" dependencies = [ "open-enum-derive", ] [[package]] name = "open-enum-derive" -version = "0.4.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed1c261430059cab8b2b51eec42a3c15750439ec6c013cd8fe41d4a450de776" +checksum = "8d1296fab5231654a5aec8bf9e87ba4e3938c502fc4c3c0425a00084c78944be" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.66", ] [[package]] name = "openssl-src" -version = "300.2.3+3.2.1" +version = "300.3.1+3.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cff92b6f71555b61bb9315f7c64da3ca43d87531622120fea0195fc761b4843" +checksum = "7259953d42a81bf137fbbd73bd30a8e1914d6dce43c2b90ed575783a22608b91" dependencies = [ "cc", ] @@ -1486,9 +1506,9 @@ dependencies = [ [[package]] name = "paste" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "pci" @@ -1538,9 +1558,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "piper" -version = "0.2.1" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" +checksum = "ae1d5c74c9876f070d3e8fd503d748c7d974c3e48da8f41350fa5222ef9b4391" dependencies = [ "atomic-waker", "fastrand", @@ -1555,9 +1575,9 @@ checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] name = "pnet" -version = "0.34.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "130c5b738eeda2dc5796fe2671e49027e6935e817ab51b930a36ec9e6a206a64" +checksum = "682396b533413cc2e009fbb48aadf93619a149d3e57defba19ff50ce0201bd0d" dependencies = [ "ipnetwork", "pnet_base", @@ -1569,18 +1589,18 @@ dependencies = [ [[package]] name = "pnet_base" -version = "0.34.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe4cf6fb3ab38b68d01ab2aea03ed3d1132b4868fa4e06285f29f16da01c5f4c" +checksum = "ffc190d4067df16af3aba49b3b74c469e611cad6314676eaf1157f31aa0fb2f7" dependencies = [ "no-std-net", ] [[package]] name = "pnet_datalink" -version = "0.34.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad5854abf0067ebbd3967f7d45ebc8976ff577ff0c7bd101c4973ae3c70f98fe" +checksum = "e79e70ec0be163102a332e1d2d5586d362ad76b01cec86f830241f2b6452a7b7" dependencies = [ "ipnetwork", "libc", @@ -1591,9 +1611,9 @@ dependencies = [ [[package]] name = "pnet_macros" -version = "0.34.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "688b17499eee04a0408aca0aa5cba5fc86401d7216de8a63fdf7a4c227871804" +checksum = "13325ac86ee1a80a480b0bc8e3d30c25d133616112bb16e86f712dcf8a71c863" dependencies = [ "proc-macro2", "quote", @@ -1603,18 +1623,18 @@ dependencies = [ [[package]] name = "pnet_macros_support" -version = "0.34.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eea925b72f4bd37f8eab0f221bbe4c78b63498350c983ffa9dd4bcde7e030f56" +checksum = "eed67a952585d509dd0003049b1fc56b982ac665c8299b124b90ea2bdb3134ab" dependencies = [ "pnet_base", ] [[package]] name = "pnet_packet" -version = "0.34.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9a005825396b7fe7a38a8e288dbc342d5034dac80c15212436424fef8ea90ba" +checksum = "4c96ebadfab635fcc23036ba30a7d33a80c39e8461b8bd7dc7bb186acb96560f" dependencies = [ "glob", "pnet_base", @@ -1624,9 +1644,9 @@ dependencies = [ [[package]] name = "pnet_sys" -version = "0.34.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "417c0becd1b573f6d544f73671070b039051e5ad819cc64aa96377b536128d00" +checksum = "7d4643d3d4db6b08741050c2f3afa9a892c4244c085a72fcda93c9c2c9a00f4b" dependencies = [ "libc", "winapi", @@ -1634,9 +1654,9 @@ dependencies = [ [[package]] name = "pnet_transport" -version = "0.34.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2637e14d7de974ee2f74393afccbc8704f3e54e6eb31488715e72481d1662cc3" +checksum = "5f604d98bc2a6591cf719b58d3203fd882bdd6bf1db696c4ac97978e9f4776bf" dependencies = [ "libc", "pnet_base", @@ -1661,9 +1681,12 @@ dependencies = [ [[package]] name = "ppv-lite86" -version = "0.2.17" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +dependencies = [ + "zerocopy", +] [[package]] name = "proc-macro-crate" @@ -1770,9 +1793,9 @@ 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", @@ -1799,9 +1822,9 @@ checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" [[package]] name = "remain" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad9f2390298a947ee0aa6073d440e221c0726188cfbcdf9604addb6ee393eb4a" +checksum = "46aef80f842736de545ada6ec65b81ee91504efd6853f4b96de7414c42ae7443" dependencies = [ "proc-macro2", "quote", @@ -1826,7 +1849,7 @@ version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "errno", "libc", "linux-raw-sys", @@ -1876,9 +1899,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.115" +version = "1.0.120" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd" +checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5" dependencies = [ "itoa", "ryu", @@ -1898,9 +1921,9 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.7.0" +version = "3.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee80b0e361bbf88fd2f6e242ccd19cfda072cb0faa6ae694ecee08199938569a" +checksum = "69cecfa94848272156ea67b2b1a53f20fc7bc638c4a46d2f8abde08f05f4b857" dependencies = [ "serde", "serde_derive", @@ -1909,9 +1932,9 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.7.0" +version = "3.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6561dc161a9224638a31d876ccdfefbc1df91d3f3a8342eddb35f055d48c7655" +checksum = "a8fee4991ef4f274617a51ad4af30519438dacb2f56ac773b08a1922ff743350" dependencies = [ "darling", "proc-macro2", @@ -1946,9 +1969,9 @@ dependencies = [ [[package]] name = "signal-hook-registry" -version = "1.4.1" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" dependencies = [ "libc", ] @@ -2062,18 +2085,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.61" +version = "1.0.62" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" +checksum = "f2675633b1499176c2dff06b0856a27976a8f9d436737b4cf4f312d4d91d8bbb" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.61" +version = "1.0.62" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" +checksum = "d20468752b09f49e909e55a5d338caa8bedf615594e9d80bc4c565d30faf798c" dependencies = [ "proc-macro2", "quote", @@ -2257,7 +2280,7 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6be08d1166d41a78861ad50212ab3f9eca0729c349ac3a7a8f557c62406b87cc" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "libc", "vm-memory", "vmm-sys-util", @@ -2433,7 +2456,7 @@ dependencies = [ "anyhow", "arc-swap", "arch", - "bitflags 2.5.0", + "bitflags 2.6.0", "block", "blocking", "cfg-if", @@ -2450,6 +2473,7 @@ dependencies = [ "hypervisor", "igvm", "igvm_defs", + "landlock", "libc", "linux-loader", "log", @@ -2803,9 +2827,9 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.7.32" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" dependencies = [ "byteorder", "zerocopy-derive", @@ -2813,9 +2837,9 @@ dependencies = [ [[package]] name = "zerocopy-derive" -version = "0.7.32" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", @@ -2824,9 +2848,9 @@ dependencies = [ [[package]] name = "zvariant" -version = "4.1.1" +version = "4.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aa6d31a02fbfb602bfde791de7fedeb9c2c18115b3d00f3a36e489f46ffbbc7" +checksum = "1724a2b330760dc7d2a8402d841119dc869ef120b139d29862d6980e9c75bfc9" dependencies = [ "endi", "enumflags2", @@ -2837,9 +2861,9 @@ dependencies = [ [[package]] name = "zvariant_derive" -version = "4.1.1" +version = "4.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "642bf1b6b6d527988b3e8193d20969d53700a36eac734d21ae6639db168701c8" +checksum = "55025a7a518ad14518fb243559c058a2e5b848b015e31f1d90414f36e3317859" dependencies = [ "proc-macro-crate", "proc-macro2", diff --git a/pkgs/applications/virtualization/cloud-hypervisor/default.nix b/pkgs/applications/virtualization/cloud-hypervisor/default.nix index c208ec8f92d9c..9af9b964825f1 100644 --- a/pkgs/applications/virtualization/cloud-hypervisor/default.nix +++ b/pkgs/applications/virtualization/cloud-hypervisor/default.nix @@ -1,14 +1,16 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config, dtc, openssl }: +{ lib, stdenv, fetchFromGitHub, fetchpatch +, rustPlatform, pkg-config, dtc, openssl +}: rustPlatform.buildRustPackage rec { pname = "cloud-hypervisor"; - version = "40.0"; + version = "41.0"; src = fetchFromGitHub { owner = "cloud-hypervisor"; repo = pname; rev = "v${version}"; - hash = "sha256-zrMJGdbOukNbzmcTuIcHlwAbJvTzhz53dc4TO/Fplb4="; + hash = "sha256-CI7hWRZUexvmBZJ8cPXxZxwmcxLnw6h9PFMhoaj9jh4="; }; cargoLock = { @@ -26,7 +28,8 @@ rustPlatform.buildRustPackage rec { separateDebugInfo = true; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ lib.optional stdenv.isAarch64 dtc; + buildInputs = lib.optional stdenv.hostPlatform.isAarch64 dtc; + checkInputs = [ openssl ]; OPENSSL_NO_VENDOR = true; diff --git a/pkgs/applications/virtualization/colima/default.nix b/pkgs/applications/virtualization/colima/default.nix index b3b981079d843..290186a59e3eb 100644 --- a/pkgs/applications/virtualization/colima/default.nix +++ b/pkgs/applications/virtualization/colima/default.nix @@ -12,18 +12,18 @@ , colima # use lima-bin on darwin to support native macOS virtualization # https://github.com/NixOS/nixpkgs/pull/209171 -, lima-drv ? if stdenv.isDarwin then lima-bin else lima +, lima-drv ? if stdenv.hostPlatform.isDarwin then lima-bin else lima }: buildGoModule rec { pname = "colima"; - version = "0.6.9"; + version = "0.7.5"; src = fetchFromGitHub { owner = "abiosoft"; repo = pname; rev = "v${version}"; - hash = "sha256-7kaZ55Uhvx8V75IgURD03fLoAd/O/+2h/7tv9XiqnX4="; + hash = "sha256-WInmoTUaEm2kQ7esZgPj3YIHmHbBrlBTWcLPC9/2MdY="; # We need the git revision leaveDotGit = true; postFetch = '' @@ -33,9 +33,9 @@ buildGoModule rec { }; nativeBuildInputs = [ installShellFiles makeWrapper ] - ++ lib.optionals stdenv.isDarwin [ darwin.DarwinTools ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.DarwinTools ]; - vendorHash = "sha256-FPcz109zQBHaS/bIl78rVeiEluR1PhrJhgs21Ex6qEg="; + vendorHash = "sha256-niuBo2YUUYKH0eSApOByNLrcHqr9m5VKGoiGp1fKklg="; # disable flaky Test_extractZones # https://hydra.nixos.org/build/212378003/log diff --git a/pkgs/applications/virtualization/conmon-rs/default.nix b/pkgs/applications/virtualization/conmon-rs/default.nix index efb463580e0ee..a68f48ebaa404 100644 --- a/pkgs/applications/virtualization/conmon-rs/default.nix +++ b/pkgs/applications/virtualization/conmon-rs/default.nix @@ -7,19 +7,19 @@ rustPlatform.buildRustPackage rec { pname = "conmon-rs"; - version = "0.6.3"; + version = "0.6.6"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - hash = "sha256-+RKjJtI01Y56+cFDdOSAL4BodI7R/rM3B3ht3p6+xzs="; + hash = "sha256-1kGAUAmiPI9zE8LE7G2r0Gy0YM+BUy2MxY7IQOu2ZDQ="; }; nativeBuildInputs = [ capnproto protobuf ]; doCheck = false; - cargoHash = "sha256-4VOse+y0EO9IORyeAO/j1t6ssQARJp7lK21TUJVuH78="; + cargoVendorDir = ".cargo-vendor"; meta = with lib; { description = "OCI container runtime monitor written in Rust"; diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix index acb652e33cb77..3b9dcf0bfad4e 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.22"; src = fetchFromGitHub { owner = "containerd"; repo = "containerd"; rev = "v${version}"; - hash = "sha256-IlK5IwniaBhqMgxQzV8btQcbdJkNEQeUMoh6aOsBOHQ="; + hash = "sha256-8IHBKai4PvvTuHPDTgx9wFEBzz4MM7Mwo8Q/bzFRzfk="; }; vendorHash = null; diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix index 00f17d75d6e59..0524e0d699900 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.31.0"; src = fetchFromGitHub { owner = "cri-o"; repo = "cri-o"; rev = "v${version}"; - hash = "sha256-4v7Pt3WS68h+Un4QNATyQ/o/+8b8nVoNsy6VgwB9Brc="; + hash = "sha256-pY8FRxexf/WG+aGkKZc4EtqO9uxAV7D6EFWirgSEye8="; }; vendorHash = null; diff --git a/pkgs/applications/virtualization/crosvm/default.nix b/pkgs/applications/virtualization/crosvm/default.nix index d2fda361660e7..96e457b407246 100644 --- a/pkgs/applications/virtualization/crosvm/default.nix +++ b/pkgs/applications/virtualization/crosvm/default.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, fetchgit, fetchpatch +{ lib, rustPlatform, fetchgit , pkg-config, protobuf, python3, wayland-scanner , libcap, libdrm, libepoxy, minijail, virglrenderer, wayland, wayland-protocols , pkgsCross @@ -6,27 +6,18 @@ rustPlatform.buildRustPackage rec { pname = "crosvm"; - version = "125.0"; + version = "127.0"; src = fetchgit { url = "https://chromium.googlesource.com/chromiumos/platform/crosvm"; - rev = "6a7ff1ecb7fad6820d3bbfe8b11e65854059aba5"; - hash = "sha256-y/vHU8i9YNbzSHla853z/2w914mVMFOryyaHE1uxlvM="; + rev = "8fdfed12c960850e9d5e809cfd2a40ce3bdd98d6"; + hash = "sha256-W0zLYM91xoq9vURgYs2noc9F9RtvoXztIIHMx0HVK5g="; fetchSubmodules = true; }; - patches = [ - (fetchpatch { - name = "musl.patch"; - url = "https://chromium.googlesource.com/chromiumos/platform/crosvm/+/128e591037c0be0362ed814d0b5583aa65ff09e1%5E%21/?format=TEXT"; - decode = "base64 -d"; - hash = "sha256-p5VzHRb0l0vCJNe48cRl/uBYHwTQMEykMcBOMzL3yaY="; - }) - ]; - separateDebugInfo = true; - cargoHash = "sha256-1AUfd9dhIZvVVUsVbnGoLKc0lBfccwM4wqWgU4yZWOE="; + cargoHash = "sha256-nEJBRlwMqTahaIC9WdtoxGLVfc+U9sJ0ilzLhavcbD0="; nativeBuildInputs = [ pkg-config protobuf python3 rustPlatform.bindgenHook wayland-scanner diff --git a/pkgs/applications/virtualization/crun/default.nix b/pkgs/applications/virtualization/crun/default.nix index 18d5909fbcc86..5dca484e5e9ea 100644 --- a/pkgs/applications/virtualization/crun/default.nix +++ b/pkgs/applications/virtualization/crun/default.nix @@ -39,13 +39,13 @@ let in stdenv.mkDerivation rec { pname = "crun"; - version = "1.15"; + version = "1.17"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = version; - hash = "sha256-ZLkpwNxhTssp5RZ041+/mveq7Sct8fVzsdt8X319V1Q="; + hash = "sha256-d2YBpW8KivWYPRPpvXlT5tWPX8hvTCaSkMxdSuswYRA="; fetchSubmodules = true; }; diff --git a/pkgs/applications/virtualization/ddev/default.nix b/pkgs/applications/virtualization/ddev/default.nix index 549022d9908c2..95aacbeb63865 100644 --- a/pkgs/applications/virtualization/ddev/default.nix +++ b/pkgs/applications/virtualization/ddev/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ddev"; - version = "1.23.2"; + version = "1.23.4"; src = fetchFromGitHub { owner = "ddev"; repo = "ddev"; rev = "v${version}"; - hash = "sha256-pzBSyCIA2r/4zYIYEmKF6c0gryudSKZebSXSpmJUbsQ="; + hash = "sha256-+Ou9YbFwUVu6AqR041ngnVb9TpiO1UMph2w1zsbEMEM="; }; vendorHash = null; @@ -38,6 +38,6 @@ buildGoModule rec { license = licenses.asl20; platforms = platforms.unix; mainProgram = "ddev"; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/virtualization/docker/buildx.nix b/pkgs/applications/virtualization/docker/buildx.nix index 609b0e97deb05..57ce036eb4956 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.17.1"; src = fetchFromGitHub { owner = "docker"; repo = "buildx"; rev = "v${version}"; - hash = "sha256-IseiGF+tQWv7Z2jlCINuWH2Gzcdow2qazvYVFBGyQPU="; + hash = "sha256-+d0yaosNoOOuo/A7aC6pfy2xGJU718nBBNMMok2Ofv0="; }; doCheck = false; diff --git a/pkgs/applications/virtualization/docker/compose.nix b/pkgs/applications/virtualization/docker/compose.nix index e5ce653f8b137..45099329c2e62 100644 --- a/pkgs/applications/virtualization/docker/compose.nix +++ b/pkgs/applications/virtualization/docker/compose.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "docker-compose"; - version = "2.27.2"; + version = "2.29.7"; src = fetchFromGitHub { owner = "docker"; repo = "compose"; rev = "v${version}"; - hash = "sha256-QwTn/oAfB1bJkPcI0oDGC4vp0xUQxjhF8+jZ+hqpr5Q="; + hash = "sha256-6ksZAGVAFnLwPnCXlCtp4cWfxzJRp/bfVkpvp3Z6fiQ="; }; postPatch = '' @@ -16,7 +16,7 @@ buildGoModule rec { rm -rf e2e/ ''; - vendorHash = "sha256-KczMkSwYP9Ng1dYUU7+ig2VRUEOPkaWTV77c9xGqbw0="; + vendorHash = "sha256-B2ywdZjp7h7eFYNJ4wXmAdbOxc8ftGqHnLmDvzQASJE="; ldflags = [ "-X github.com/docker/compose/v2/internal.Version=${version}" "-s" "-w" ]; @@ -35,6 +35,6 @@ buildGoModule rec { mainProgram = "docker-compose"; homepage = "https://github.com/docker/compose"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/virtualization/docker/compose_1.nix b/pkgs/applications/virtualization/docker/compose_1.nix deleted file mode 100644 index ac5d726439ce1..0000000000000 --- a/pkgs/applications/virtualization/docker/compose_1.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ lib, buildPythonApplication, fetchPypi -, installShellFiles -, mock, pytest, nose -, pyyaml, colorama, docopt -, dockerpty, docker, jsonschema, requests -, six, texttable, websocket-client, cached-property -, paramiko, distro, python-dotenv -}: - -buildPythonApplication rec { - version = "1.29.2"; - pname = "docker-compose"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-TIzZ0h0jdBJ5PRi9MxEASe6a+Nqz/iwhO70HM5WbCbc="; - }; - - # lots of networking and other fails - doCheck = false; - nativeBuildInputs = [ installShellFiles ]; - nativeCheckInputs = [ mock pytest nose ]; - propagatedBuildInputs = [ - pyyaml colorama dockerpty docker - jsonschema requests six texttable websocket-client - docopt cached-property paramiko distro python-dotenv - ]; - - postPatch = '' - # Remove upper bound on requires, see also - # https://github.com/docker/compose/issues/4431 - sed -i "s/, < .*',$/',/" setup.py - ''; - - postInstall = '' - installShellCompletion --bash contrib/completion/bash/docker-compose - installShellCompletion --zsh contrib/completion/zsh/_docker-compose - ''; - - meta = with lib; { - homepage = "https://docs.docker.com/compose/"; - description = "Multi-container orchestration for Docker"; - mainProgram = "docker-compose"; - license = licenses.asl20; - maintainers = with maintainers; [ Frostman ]; - }; -} diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 3d096c3389f9d..928480e6c4f69 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -16,11 +16,12 @@ rec { , sqlite, iproute2, docker-buildx, docker-compose, docker-sbom , iptables, e2fsprogs, xz, util-linux, xfsprogs, git , procps, rootlesskit, slirp4netns, fuse-overlayfs, nixosTests - , clientOnly ? !stdenv.isLinux, symlinkJoin + , clientOnly ? !stdenv.hostPlatform.isLinux, symlinkJoin , withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd - , withBtrfs ? stdenv.isLinux, btrfs-progs - , withLvm ? stdenv.isLinux, lvm2 - , withSeccomp ? stdenv.isLinux, libseccomp + , withBtrfs ? stdenv.hostPlatform.isLinux, btrfs-progs + , withLvm ? stdenv.hostPlatform.isLinux, lvm2 + , withSeccomp ? stdenv.hostPlatform.isLinux, libseccomp + , knownVulnerabilities ? [] }: let docker-runc = runc.overrideAttrs { @@ -79,7 +80,7 @@ rec { hash = mobyHash; }; - moby = buildGoModule (lib.optionalAttrs stdenv.isLinux rec { + moby = buildGoModule (lib.optionalAttrs stdenv.hostPlatform.isLinux rec { pname = "moby"; inherit version; @@ -94,9 +95,9 @@ rec { ++ lib.optional withSystemd systemd ++ lib.optional withSeccomp libseccomp; - extraPath = lib.optionals stdenv.isLinux (lib.makeBinPath [ iproute2 iptables e2fsprogs xz xfsprogs procps util-linux git ]); + extraPath = lib.optionals stdenv.hostPlatform.isLinux (lib.makeBinPath [ iproute2 iptables e2fsprogs xz xfsprogs procps util-linux git ]); - extraUserPath = lib.optionals (stdenv.isLinux && !clientOnly) (lib.makeBinPath [ rootlesskit slirp4netns fuse-overlayfs ]); + extraUserPath = lib.optionals (stdenv.hostPlatform.isLinux && !clientOnly) (lib.makeBinPath [ rootlesskit slirp4netns fuse-overlayfs ]); patches = lib.optionals (lib.versionOlder version "23") [ # This patch incorporates code from a PR fixing using buildkit with the ZFS graph driver. @@ -187,7 +188,7 @@ rec { makeWrapper pkg-config go-md2man go libtool installShellFiles ]; - buildInputs = plugins ++ lib.optionals (lib.versionAtLeast version "23" && stdenv.isLinux) [ + buildInputs = plugins ++ lib.optionals (lib.versionAtLeast version "23" && stdenv.hostPlatform.isLinux) [ glibc glibc.static ]; @@ -267,6 +268,7 @@ rec { license = licenses.asl20; maintainers = with maintainers; [ offline vdemeester periklis teutat3s ]; mainProgram = "docker"; + inherit knownVulnerabilities; }; }); @@ -284,32 +286,52 @@ rec { containerdHash = "sha256-y3CYDZbA2QjIn1vyq/p1F1pAVxQHi/0a6hGWZCRWzyk="; tiniRev = "v0.19.0"; tiniHash = "sha256-ZDKu/8yE5G0RYFJdhgmCdN3obJNyRWv6K/Gd17zc1sI="; + knownVulnerabilities = [ + "CVE-2024-23651" + "CVE-2024-23652" + "CVE-2024-23653" + "CVE-2024-41110" + ]; }; docker_25 = callPackage dockerGen rec { - version = "25.0.5"; + version = "25.0.6"; cliRev = "v${version}"; - cliHash = "sha256-CACMi3bXUN6oGc2f/Z+lNQqMgQ4llRWPRKgijdpiPGg="; + cliHash = "sha256-7ZKjlONL5RXEJZrvssrL1PQMNANP0qTw4myGKdtd19U="; mobyRev = "v${version}"; - mobyHash = "sha256-4QGz22fXxyAD77pyUWb2lF3VKqxmPIrGqcJGoyrEHew="; + mobyHash = "sha256-+zkhUMeVD3HNq8WrWQmLskq+HykvD5kzSACmf67YbJE="; runcRev = "v1.1.12"; runcHash = "sha256-N77CU5XiGYIdwQNPFyluXjseTeaYuNJ//OsEUS0g/v0="; - containerdRev = "v1.7.13"; - containerdHash = "sha256-y3CYDZbA2QjIn1vyq/p1F1pAVxQHi/0a6hGWZCRWzyk="; + containerdRev = "v1.7.20"; + containerdHash = "sha256-Q9lTzz+G5PSoChy8MZtbOpO81AyNWXC+CgGkdOg14uY="; tiniRev = "v0.19.0"; tiniHash = "sha256-ZDKu/8yE5G0RYFJdhgmCdN3obJNyRWv6K/Gd17zc1sI="; }; docker_26 = callPackage dockerGen rec { - version = "26.1.4"; + version = "26.1.5"; cliRev = "v${version}"; - cliHash = "sha256-7yCR49Un1i1kB+66IKt/8lgwKNkUjtVh52DH9OY8Pw4="; + cliHash = "sha256-UlN+Uc0YHhLyu14h5oDBXP4K9y2tYKPOIPTGZCe4PVY="; mobyRev = "v${version}"; - mobyHash = "sha256-0WwlpUECvmNq6DBm7U7rjzYfGKF7pxsfs9+x5uVPV0k="; + mobyHash = "sha256-6Hx7GnA7P6HqDlnGoc+HpPHSl69XezwAEGbvWYUVQlE="; runcRev = "v1.1.12"; runcHash = "sha256-N77CU5XiGYIdwQNPFyluXjseTeaYuNJ//OsEUS0g/v0="; - containerdRev = "v1.7.15"; - containerdHash = "sha256-qLrPLGxsUmgEscrhyl+1rJ0k7c9ibKnpMpsJPD4xDZU="; + containerdRev = "v1.7.18"; + containerdHash = "sha256-IlK5IwniaBhqMgxQzV8btQcbdJkNEQeUMoh6aOsBOHQ="; + tiniRev = "v0.19.0"; + tiniHash = "sha256-ZDKu/8yE5G0RYFJdhgmCdN3obJNyRWv6K/Gd17zc1sI="; + }; + + docker_27 = callPackage dockerGen rec { + version = "27.3.0"; + cliRev = "v${version}"; + cliHash = "sha256-1z2MmWq+HD2fhpZqXu0G7oBL3Mc0NN/fR69aMWRelns="; + mobyRev = "v${version}"; + mobyHash = "sha256-AKl06k2ePWOFhL3oH086HcLLYs2Da+wLOcGjGnQ0SXE="; + runcRev = "v1.1.14"; + runcHash = "sha256-7PYbSZqCQLTaeFppuNz5mxDlwEyLkA5zpdMhWy1tWmc="; + containerdRev = "v1.7.22"; + containerdHash = "sha256-8IHBKai4PvvTuHPDTgx9wFEBzz4MM7Mwo8Q/bzFRzfk="; tiniRev = "v0.19.0"; tiniHash = "sha256-ZDKu/8yE5G0RYFJdhgmCdN3obJNyRWv6K/Gd17zc1sI="; }; diff --git a/pkgs/applications/virtualization/docker/gc.nix b/pkgs/applications/virtualization/docker/gc.nix index 7d45427627fa9..29df4bfea3a55 100644 --- a/pkgs/applications/virtualization/docker/gc.nix +++ b/pkgs/applications/virtualization/docker/gc.nix @@ -1,7 +1,4 @@ { stdenv, lib, fetchFromGitHub, makeWrapper, docker, coreutils, procps, gnused, findutils, gnugrep }: - -with lib; - stdenv.mkDerivation rec { pname = "docker-gc"; version = "unstable-2015-10-5"; @@ -23,7 +20,7 @@ stdenv.mkDerivation rec { --prefix PATH : "${lib.makeBinPath [ docker coreutils procps gnused findutils gnugrep ]}" ''; - meta = { + meta = with lib; { description = "Docker garbage collection of containers and images"; mainProgram = "docker-gc"; license = licenses.asl20; diff --git a/pkgs/applications/virtualization/driver/win-pvdrivers/default.nix b/pkgs/applications/virtualization/driver/win-pvdrivers/default.nix deleted file mode 100644 index c44f101ba9464..0000000000000 --- a/pkgs/applications/virtualization/driver/win-pvdrivers/default.nix +++ /dev/null @@ -1,74 +0,0 @@ -{ lib, stdenvNoCC, fetchurl }: - -let - # Upstream versioned download links are broken - # NOTE: the archive.org timestamp must be updated if the version changes. - # See https://xenproject.org/downloads/ - files = [ - { - url = "https://web.archive.org/web/20230817070451if_/https://xenbits.xenproject.org/pvdrivers/win/xenbus.tar"; - hash = "sha256-sInkbVL/xkoUeZxgknLM3e2AXBVSqItF2Vpkon53Xec="; - } - { - url = "https://web.archive.org/web/20230817070811if_/https://xenbits.xenproject.org/pvdrivers/win/xencons.tar"; - hash = "sha256-r8bxH5B4y0V9qgALi42KtpZW05UOevv29AqqXaIXMBo="; - } - { - url = "https://web.archive.org/web/20230817070811if_/https://xenbits.xenproject.org/pvdrivers/win/xenhid.tar"; - hash = "sha256-e7ztzaXi/6irMus9IH0cfbW5HiKSaybXV1C/rd5mEfA="; - } - { - url = "https://web.archive.org/web/20230817071133if_/https://xenbits.xenproject.org/pvdrivers/win/xeniface.tar"; - hash = "sha256-qPM0TjcGR2luPtOSAfXJ22k6yhwJOmOP3ot6kopEFsI="; - } - { - url = "https://web.archive.org/web/20230817071134if_/https://xenbits.xenproject.org/pvdrivers/win/xennet.tar"; - hash = "sha256-Vg1wSfXjIVRd2iXCa19W4Jdaf2LTVin0yac/D70UjPM="; - } - { - url = "https://web.archive.org/web/20230817070811if_/https://xenbits.xenproject.org/pvdrivers/win/xenvbd.tar"; - hash = "sha256-nLNM0TWqsEWiQBCYxARMldvRecRUcY5DBF5DNAG4490="; - } - { - url = "https://web.archive.org/web/20230817071225if_/https://xenbits.xenproject.org/pvdrivers/win/xenvif.tar"; - hash = "sha256-R8G5vG6Q4g0/UkA2oxcc9/jaHZQYb+u64NShCNt7s7U="; - } - { - url = "https://web.archive.org/web/20230817071153if_/https://xenbits.xenproject.org/pvdrivers/win/xenvkbd.tar"; - hash = "sha256-CaSxCKnT/KaZw8Ma60g2z+4lOOWIRisGRtzMveQqQmM="; - } - ]; - -in -stdenvNoCC.mkDerivation { - pname = "win-pvdrivers"; - version = "unstable-2023-08-17"; - - srcs = map ({hash, url}: fetchurl { - inherit hash url; - # Wait & retry up to 3 times as archive.org can closes connection - # when an HTTP client makes too many requests - curlOpts = "--retry 3 --retry-delay 5"; - }) files; - - - unpackPhase = '' - runHook preUnpack - - for _src in $srcs; do - mkdir -p $out - tar xfv $_src -C $out - done - - runHook postUnpack - ''; - - meta = with lib; { - description = "Xen Subproject: Windows PV Drivers"; - homepage = "https://xenproject.org/developers/teams/windows-pv-drivers/"; - license = licenses.bsd2; - maintainers = with maintainers; [ anthonyroussel ]; - platforms = platforms.linux; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - }; -} diff --git a/pkgs/applications/virtualization/ecs-agent/default.nix b/pkgs/applications/virtualization/ecs-agent/default.nix index e5fe625cdf9f1..39c1ba4b7e2eb 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.86.3"; src = fetchFromGitHub { rev = "v${version}"; owner = "aws"; repo = pname; - hash = "sha256-bM/K3fxkeDwsXKsgZaEkurgYdSHnOgIQ2oUKc5atvZk="; + hash = "sha256-YygvAYoqbWVmtBgHNrP0Xp1zSgCv2PsnWARWyo3K8rM="; }; vendorHash = null; diff --git a/pkgs/applications/virtualization/firecracker/default.nix b/pkgs/applications/virtualization/firecracker/default.nix deleted file mode 100644 index fca5227177d46..0000000000000 --- a/pkgs/applications/virtualization/firecracker/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ fetchurl, lib, stdenv }: - -let - version = "1.7.0"; - # nixpkgs-update: no auto update - - suffix = { - x86_64-linux = "x86_64"; - aarch64-linux = "aarch64"; - }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - - baseurl = "https://github.com/firecracker-microvm/firecracker/releases/download"; - - dlbin = sha256: fetchurl { - url = "${baseurl}/v${version}/firecracker-v${version}-${suffix}.tgz"; - sha256 = sha256."${stdenv.hostPlatform.system}"or (throw "unsupported system ${stdenv.hostPlatform.system}"); - }; - -in -stdenv.mkDerivation { - pname = "firecracker"; - inherit version; - - sourceRoot = "."; - src = dlbin { - x86_64-linux = "sha256-Vb0+bVmf3RCONuUvmu4jGfBsGKkPL6SbZOk/3wb1/1M="; - aarch64-linux = "sha256-PLoQA4a6qulxSns/ZRSgn6EtHr46/hstNhP1pAHt9VA="; - }; - - dontConfigure = true; - - buildPhase = '' - mv release-v${version}-${suffix}/firecracker-v${version}-${suffix} firecracker - mv release-v${version}-${suffix}/jailer-v${version}-${suffix} jailer - chmod +x firecracker jailer - ''; - - doCheck = true; - checkPhase = '' - ./firecracker --version - ./jailer --version - ''; - - installPhase = '' - mkdir -p $out/bin - install -D firecracker $out/bin/firecracker - install -D jailer $out/bin/jailer - ''; - - meta = with lib; { - description = "Secure, fast, minimal micro-container virtualization"; - homepage = "http://firecracker-microvm.io"; - changelog = "https://github.com/firecracker-microvm/firecracker/releases/tag/v${version}"; - mainProgram = "firecracker"; - license = licenses.asl20; - platforms = [ "x86_64-linux" "aarch64-linux" ]; - maintainers = with maintainers; [ thoughtpolice qjoly ]; - }; -} diff --git a/pkgs/applications/virtualization/kraft/default.nix b/pkgs/applications/virtualization/kraft/default.nix index 1e066477b721b..a20f44bc9d881 100644 --- a/pkgs/applications/virtualization/kraft/default.nix +++ b/pkgs/applications/virtualization/kraft/default.nix @@ -1,7 +1,6 @@ { lib , buildGoModule , fetchFromGitHub -, stdenv , nix-update-script }: diff --git a/pkgs/applications/virtualization/krunvm/default.nix b/pkgs/applications/virtualization/krunvm/default.nix index d6da5a2742f51..392ba594189ab 100644 --- a/pkgs/applications/virtualization/krunvm/default.nix +++ b/pkgs/applications/virtualization/krunvm/default.nix @@ -35,9 +35,9 @@ stdenv.mkDerivation rec { rustc asciidoctor makeWrapper - ] ++ lib.optionals stdenv.isDarwin [ sigtool ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ sigtool ]; - buildInputs = [ libkrun ] ++ lib.optionals stdenv.isDarwin [ + buildInputs = [ libkrun ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { # It attaches entitlements with codesign and strip removes those, # voiding the entitlements and making it non-operational. - dontStrip = stdenv.isDarwin; + dontStrip = stdenv.hostPlatform.isDarwin; postFixup = '' wrapProgram $out/bin/krunvm \ diff --git a/pkgs/applications/virtualization/libnvidia-container/default.nix b/pkgs/applications/virtualization/libnvidia-container/default.nix index b462b24711de5..28ea0a675b17b 100644 --- a/pkgs/applications/virtualization/libnvidia-container/default.nix +++ b/pkgs/applications/virtualization/libnvidia-container/default.nix @@ -1,6 +1,6 @@ { stdenv , lib -, addOpenGLRunpath +, addDriverRunpath , fetchFromGitHub , pkg-config , elfutils @@ -102,7 +102,7 @@ stdenv.mkDerivation rec { postInstall = let - inherit (addOpenGLRunpath) driverLink; + inherit (addDriverRunpath) driverLink; libraryPath = lib.makeLibraryPath [ "$out" driverLink "${driverLink}-32" ]; in '' diff --git a/pkgs/applications/virtualization/lima/bin.nix b/pkgs/applications/virtualization/lima/bin.nix index ba26d9e6041d5..ca45c58ff2190 100644 --- a/pkgs/applications/virtualization/lima/bin.nix +++ b/pkgs/applications/virtualization/lima/bin.nix @@ -48,7 +48,7 @@ stdenvNoCC.mkDerivation { sourceRoot = "."; nativeBuildInputs = [ makeBinaryWrapper installShellFiles ] - ++ lib.optionals stdenvNoCC.isLinux [ autoPatchelfHook ]; + ++ lib.optionals stdenvNoCC.hostPlatform.isLinux [ autoPatchelfHook ]; installPhase = '' runHook preInstall @@ -57,10 +57,17 @@ stdenvNoCC.mkDerivation { chmod +x $out/bin/limactl wrapProgram $out/bin/limactl \ --prefix PATH : ${lib.makeBinPath [ qemu ]} - installShellCompletion --cmd limactl \ - --bash <($out/bin/limactl completion bash) \ - --fish <($out/bin/limactl completion fish) \ - --zsh <($out/bin/limactl completion zsh) + + # the shell completion only works with a patched $out/bin/limactl and so + # needs to run after the autoPatchelfHook is executed in postFixup. + doShellCompletion() { + installShellCompletion --cmd limactl \ + --bash <($out/bin/limactl completion bash) \ + --fish <($out/bin/limactl completion fish) \ + --zsh <($out/bin/limactl completion zsh) + } + postFixupHooks+=(doShellCompletion) + runHook postInstall ''; @@ -72,7 +79,7 @@ stdenvNoCC.mkDerivation { # Stripping removes entitlements of the binary on Darwin making it non-operational. # Therefore, disable stripping on Darwin. - dontStrip = stdenvNoCC.isDarwin; + dontStrip = stdenvNoCC.hostPlatform.isDarwin; passthru.updateScript = let diff --git a/pkgs/applications/virtualization/lima/default.nix b/pkgs/applications/virtualization/lima/default.nix index c57b58a008b32..318d54c77c413 100644 --- a/pkgs/applications/virtualization/lima/default.nix +++ b/pkgs/applications/virtualization/lima/default.nix @@ -23,7 +23,7 @@ buildGoModule rec { vendorHash = "sha256-P0Qnfu/cqLveAwz9jf/wTXxkoh0jvazlE5C/PcUrWsA="; nativeBuildInputs = [ makeWrapper installShellFiles ] - ++ lib.optionals stdenv.isDarwin [ xcbuild.xcrun sigtool ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild.xcrun sigtool ]; # clean fails with read only vendor dir postPatch = '' @@ -34,7 +34,7 @@ buildGoModule rec { # It attaches entitlements with codesign and strip removes those, # voiding the entitlements and making it non-operational. - dontStrip = stdenv.isDarwin; + dontStrip = stdenv.hostPlatform.isDarwin; buildPhase = '' runHook preBuild diff --git a/pkgs/applications/virtualization/lkl/default.nix b/pkgs/applications/virtualization/lkl/default.nix index c889dc5ff50af..751cbd021fc21 100644 --- a/pkgs/applications/virtualization/lkl/default.nix +++ b/pkgs/applications/virtualization/lkl/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { # Fixup build with newer Linux headers: https://github.com/lkl/linux/pull/484 sed '1i#include <linux/sockios.h>' -i tools/lkl/lib/hijack/xlate.c - '' + lib.optionalString stdenv.isi686 '' + '' + lib.optionalString stdenv.hostPlatform.isi686 '' echo CONFIG_KALLSYMS=n >> arch/lkl/configs/defconfig echo CONFIG_KALLSYMS_BASE_RELATIVE=n >> arch/lkl/configs/defconfig '' + lib.optionalString firewallSupport '' diff --git a/pkgs/applications/virtualization/looking-glass-client/default.nix b/pkgs/applications/virtualization/looking-glass-client/default.nix index a3eaea0cfd787..6adb2ebcc163e 100644 --- a/pkgs/applications/virtualization/looking-glass-client/default.nix +++ b/pkgs/applications/virtualization/looking-glass-client/default.nix @@ -26,6 +26,7 @@ , wayland , wayland-protocols +, wayland-scanner , pipewire , pulseaudio @@ -47,15 +48,15 @@ let icon = "lg-logo"; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "looking-glass-client"; version = "B7-rc1"; src = fetchFromGitHub { owner = "gnif"; repo = "LookingGlass"; - rev = version; - sha256 = "sha256-ne1Q+67+P8RHcTsqdiSSwkFf0g3pSNT91WN/lsSzssU="; + rev = finalAttrs.version; + hash = "sha256-ne1Q+67+P8RHcTsqdiSSwkFf0g3pSNT91WN/lsSzssU="; fetchSubmodules = true; }; @@ -64,7 +65,7 @@ stdenv.mkDerivation rec { ./0001-client-cmake-move-X11-config-directives-to-displayse.patch ]; - nativeBuildInputs = [ cmake pkg-config ]; + nativeBuildInputs = [ cmake pkg-config wayland-scanner ]; buildInputs = [ libX11 libGL freefont_ttf spice-protocol expat libbfd nettle fontconfig libffi ] ++ lib.optionals xorgSupport [ libxkbcommon libXi libXScrnSaver libXinerama libXcursor libXpresent libXext libXrandr libXdmcp ] @@ -80,7 +81,7 @@ stdenv.mkDerivation rec { ++ lib.optionals (!pipewireSupport) [ "-DENABLE_PIPEWIRE=no" ]; postUnpack = '' - echo ${src.rev} > source/VERSION + echo ${finalAttrs.src.rev} > source/VERSION export sourceRoot="source/client" ''; @@ -105,4 +106,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ alexbakker babbaj j-brn ]; platforms = [ "x86_64-linux" ]; }; -} +}) diff --git a/pkgs/applications/virtualization/nixpacks/default.nix b/pkgs/applications/virtualization/nixpacks/default.nix index b32e607032750..772cc2189d99a 100644 --- a/pkgs/applications/virtualization/nixpacks/default.nix +++ b/pkgs/applications/virtualization/nixpacks/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "nixpacks"; - version = "1.24.1"; + version = "1.28.1"; src = fetchFromGitHub { owner = "railwayapp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-niKz+F1RJtZrE8+BaJwy5bjGS3miJf5C9LttTnC+iuk="; + sha256 = "sha256-0gy9fm18Tc1ALZEV+XZN8kwK725PpIK2OTKKMatvtVQ="; }; - cargoHash = "sha256-fzG53DqZKgW6Gen+0ZO9lxgPXkxw7S6OdZWNNI+y9hU="; + cargoHash = "sha256-r7jVcDja3BZyZoN2JxDymyv+rOv3wWaGo+yC4GwnZ50="; # skip test due FHS dependency doCheck = false; diff --git a/pkgs/applications/virtualization/open-vm-tools/default.nix b/pkgs/applications/virtualization/open-vm-tools/default.nix deleted file mode 100644 index e5dde1e021c7f..0000000000000 --- a/pkgs/applications/virtualization/open-vm-tools/default.nix +++ /dev/null @@ -1,150 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, makeWrapper -, autoreconfHook -, bash -, fuse3 -, libmspack -, openssl -, pam -, xercesc -, icu -, libdnet -, procps -, libtirpc -, rpcsvc-proto -, libX11 -, libXext -, libXinerama -, libXi -, libXrender -, libXrandr -, libXtst -, libxcrypt -, libxml2 -, pkg-config -, glib -, gdk-pixbuf-xlib -, gtk3 -, gtkmm3 -, iproute2 -, dbus -, systemd -, which -, libdrm -, udev -, util-linux -, xmlsec -, withX ? true -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "open-vm-tools"; - version = "12.4.0"; - - src = fetchFromGitHub { - owner = "vmware"; - repo = "open-vm-tools"; - rev = "stable-${finalAttrs.version}"; - hash = "sha256-RcjNY02aLOU4X6znfZ37+ICB19WYp+HxHRvvpfW3Ub8="; - }; - - sourceRoot = "${finalAttrs.src.name}/open-vm-tools"; - - outputs = [ "out" "dev" ]; - - nativeBuildInputs = [ - autoreconfHook - makeWrapper - pkg-config - ]; - - buildInputs = [ - fuse3 - glib - icu - libdnet - libdrm - libmspack - libtirpc - libxcrypt - libxml2 - openssl - pam - procps - rpcsvc-proto - udev - xercesc - xmlsec - ] ++ lib.optionals withX [ - gdk-pixbuf-xlib - gtk3 - gtkmm3 - libX11 - libXext - libXinerama - libXi - libXrender - libXrandr - libXtst - ]; - - postPatch = '' - sed -i Makefile.am \ - -e 's,etc/vmware-tools,''${prefix}/etc/vmware-tools,' - sed -i scripts/Makefile.am \ - -e 's,^confdir = ,confdir = ''${prefix},' \ - -e 's,usr/bin,''${prefix}/usr/bin,' - sed -i services/vmtoolsd/Makefile.am \ - -e 's,etc/vmware-tools,''${prefix}/etc/vmware-tools,' \ - -e 's,$(PAM_PREFIX),''${prefix}/$(PAM_PREFIX),' - sed -i vgauth/service/Makefile.am \ - -e 's,/etc/vmware-tools/vgauth/schemas,''${prefix}/etc/vmware-tools/vgauth/schemas,' \ - -e 's,$(DESTDIR)/etc/vmware-tools/vgauth.conf,''${prefix}/etc/vmware-tools/vgauth.conf,' - - # don't abort on any warning - sed -i 's,CFLAGS="$CFLAGS -Werror",,' configure.ac - - # Make reboot work, shutdown is not in /sbin on NixOS - sed -i 's,/sbin/shutdown,shutdown,' lib/system/systemLinux.c - - # Fix paths to fuse3 (we do not use fuse2 so that is not modified) - sed -i 's,/bin/fusermount3,${fuse3}/bin/fusermount3,' vmhgfs-fuse/config.c - - substituteInPlace services/plugins/vix/foundryToolsDaemon.c \ - --replace "/usr/bin/vmhgfs-fuse" "${placeholder "out"}/bin/vmhgfs-fuse" \ - --replace "/bin/mount" "${util-linux}/bin/mount" - ''; - - configureFlags = [ - "--without-kernel-modules" - "--with-udev-rules-dir=${placeholder "out"}/lib/udev/rules.d" - "--with-fuse=fuse3" - ] ++ lib.optional (!withX) "--without-x"; - - enableParallelBuilding = true; - - preConfigure = '' - mkdir -p ${placeholder "out"}/lib/udev/rules.d - ''; - - postInstall = '' - wrapProgram "$out/etc/vmware-tools/scripts/vmware/network" \ - --prefix PATH ':' "${lib.makeBinPath [ iproute2 dbus systemd which ]}" - substituteInPlace "$out/lib/udev/rules.d/99-vmware-scsi-udev.rules" --replace "/bin/sh" "${bash}/bin/sh" - ''; - - meta = with lib; { - homepage = "https://github.com/vmware/open-vm-tools"; - changelog = "https://github.com/vmware/open-vm-tools/releases/tag/stable-${finalAttrs.version}"; - description = "Set of tools for VMWare guests to improve host-guest interaction"; - longDescription = '' - A set of services and modules that enable several features in VMware products for - better management of, and seamless user interactions with, guests. - ''; - license = licenses.gpl2; - platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" ]; - maintainers = with maintainers; [ joamaki kjeremy ]; - }; -}) 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/podman-desktop/default.nix b/pkgs/applications/virtualization/podman-desktop/default.nix index fdf8294013990..ce7d993d39dea 100644 --- a/pkgs/applications/virtualization/podman-desktop/default.nix +++ b/pkgs/applications/virtualization/podman-desktop/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { makeWrapper copyDesktopItems ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ desktopToDarwinBundle ]; @@ -73,7 +73,7 @@ stdenv.mkDerivation (finalAttrs: { yarn --offline run build yarn --offline run electron-builder --dir \ --config .electron-builder.config.cjs \ - -c.electronDist=${electron}/libexec/electron \ + -c.electronDist=${electron.dist} \ -c.electronVersion=${electron.version} runHook postBuild diff --git a/pkgs/applications/virtualization/podman-tui/default.nix b/pkgs/applications/virtualization/podman-tui/default.nix deleted file mode 100644 index 0d7947a3f2511..0000000000000 --- a/pkgs/applications/virtualization/podman-tui/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, buildGoModule, testers, podman-tui }: - -buildGoModule rec { - pname = "podman-tui"; - version = "1.1.0"; - - src = fetchFromGitHub { - owner = "containers"; - repo = "podman-tui"; - rev = "v${version}"; - hash = "sha256-my/y2cgF7F0wk5VJKfmqotBrV3HPmRQGPjlSdMe7wXk="; - }; - - vendorHash = null; - - CGO_ENABLED = 0; - - tags = [ "containers_image_openpgp" "remote" ] - ++ lib.optional stdenv.isDarwin "darwin"; - - ldflags = [ "-s" "-w" ]; - - preCheck = '' - export USER=$(whoami) - export HOME="$(mktemp -d)" - ''; - - checkFlags = - let - skippedTests = [ - # Disable flaky tests - "TestDialogs" - "TestVoldialogs" - ]; - in - [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ]; - - passthru.tests.version = testers.testVersion { - package = podman-tui; - command = "HOME=$(mktemp -d) podman-tui version"; - version = "v${version}"; - }; - - meta = with lib; { - homepage = "https://github.com/containers/podman-tui"; - description = "Podman Terminal UI"; - license = licenses.asl20; - maintainers = with maintainers; [ aaronjheng ]; - mainProgram = "podman-tui"; - }; -} diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index d9c506ae59c47..57ede5b8b1613 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -22,8 +22,7 @@ , crun , runc , conmon -, extraRuntimes ? lib.optionals stdenv.isLinux [ runc ] # e.g.: runc, gvisor, youki -, slirp4netns +, extraRuntimes ? lib.optionals stdenv.hostPlatform.isLinux [ runc ] # e.g.: runc, gvisor, youki , fuse-overlayfs , util-linux , iptables @@ -33,30 +32,32 @@ , aardvark-dns , netavark , passt +, vfkit , testers , podman }: let # do not add qemu to this wrapper, store paths get written to the podman vm config and break when GCed - binPath = lib.makeBinPath (lib.optionals stdenv.isLinux [ + binPath = lib.makeBinPath (lib.optionals stdenv.hostPlatform.isLinux [ fuse-overlayfs util-linux iptables iproute2 + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + vfkit ] ++ extraPackages); helpersBin = symlinkJoin { name = "podman-helper-binary-wrapper"; - # this only works for some binaries, others may need to be be added to `binPath` or in the modules + # this only works for some binaries, others may need to be added to `binPath` or in the modules paths = [ gvproxy - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ aardvark-dns catatonit # added here for the pause image and also set in `containersConf` for `init_path` netavark - slirp4netns passt conmon crun @@ -65,13 +66,13 @@ let in buildGoModule rec { pname = "podman"; - version = "5.1.1"; + version = "5.2.3"; src = fetchFromGitHub { owner = "containers"; repo = "podman"; rev = "v${version}"; - hash = "sha256-3u4QOX7K0bMcbvwkXVoCpq7p5rKkvmOlOIRSUEbjFOY="; + hash = "sha256-2FnUijeQhre7B4utsGGEGbMuuMVZlPDoM2di3z1d4vs="; }; patches = [ @@ -92,7 +93,7 @@ buildGoModule rec { nativeBuildInputs = [ pkg-config go-md2man installShellFiles makeWrapper python3 ]; - buildInputs = lib.optionals stdenv.isLinux [ + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ btrfs-progs gpgme libapparmor @@ -109,7 +110,7 @@ buildGoModule rec { runHook preBuild patchShebangs . substituteInPlace Makefile --replace "/bin/bash" "${runtimeShell}" - ${if stdenv.isDarwin then '' + ${if stdenv.hostPlatform.isDarwin then '' make podman-remote # podman-mac-helper uses FHS paths '' else '' make bin/podman bin/rootlessport bin/quadlet @@ -120,7 +121,7 @@ buildGoModule rec { installPhase = '' runHook preInstall - ${if stdenv.isDarwin then '' + ${if stdenv.hostPlatform.isDarwin then '' install bin/darwin/podman -Dt $out/bin '' else '' make install.bin install.systemd @@ -133,7 +134,7 @@ buildGoModule rec { runHook postInstall ''; - postFixup = lib.optionalString stdenv.isLinux '' + postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' RPATH=$(patchelf --print-rpath $out/bin/.podman-wrapped) patchelf --set-rpath "${lib.makeLibraryPath [ systemd ]}":$RPATH $out/bin/.podman-wrapped ''; @@ -143,7 +144,7 @@ buildGoModule rec { package = podman; command = "HOME=$TMPDIR podman --version"; }; - } // lib.optionalAttrs stdenv.isLinux { + } // lib.optionalAttrs stdenv.hostPlatform.isLinux { inherit (nixosTests) podman; # related modules inherit (nixosTests) diff --git a/pkgs/applications/virtualization/pods/Cargo.lock b/pkgs/applications/virtualization/pods/Cargo.lock index d53094fcf9bf3..c12193cc03dfb 100644 --- a/pkgs/applications/virtualization/pods/Cargo.lock +++ b/pkgs/applications/virtualization/pods/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "addr2line" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" dependencies = [ "gimli", ] @@ -19,9 +19,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "aes" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2" +checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" dependencies = [ "cfg-if", "cipher", @@ -31,9 +31,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ "memchr", ] @@ -55,22 +55,23 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.75" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" [[package]] name = "ashpd" -version = "0.6.0" -source = "git+https://github.com/bilelmoussaoui/ashpd.git?rev=30216eccd3f4ecb50c4d34a493a33e6eef4e375c#30216eccd3f4ecb50c4d34a493a33e6eef4e375c" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfe7e0dd0ac5a401dc116ed9f9119cf9decc625600474cb41f0fc0a0050abc9a" dependencies = [ "enumflags2", "futures-channel", "futures-util", "gdk4-wayland", "gdk4-x11", + "glib", "gtk4", - "once_cell", "rand", "serde", "serde_repr", @@ -81,146 +82,122 @@ dependencies = [ [[package]] name = "async-broadcast" -version = "0.5.1" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c48ccdbf6ca6b121e0f586cbc0e73ae440e56c67c30fa0873b4e110d9c26d2b" +checksum = "20cd0e2e25ea8e5f7e9df04578dc6cf5c83577fd09b1a46aaf5c85e1c33f2a7e" dependencies = [ - "event-listener 2.5.3", + "event-listener", + "event-listener-strategy", "futures-core", + "pin-project-lite", ] [[package]] name = "async-channel" -version = "1.9.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" +checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a" dependencies = [ "concurrent-queue", - "event-listener 2.5.3", + "event-listener-strategy", "futures-core", + "pin-project-lite", ] [[package]] name = "async-io" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" -dependencies = [ - "async-lock 2.8.0", - "autocfg", - "cfg-if", - "concurrent-queue", - "futures-lite 1.13.0", - "log", - "parking", - "polling 2.8.0", - "rustix 0.37.27", - "slab", - "socket2 0.4.10", - "waker-fn", -] - -[[package]] -name = "async-io" -version = "2.2.0" +version = "2.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41ed9d5715c2d329bf1b4da8d60455b99b187f27ba726df2883799af9af60997" +checksum = "444b0228950ee6501b3568d3c93bf1176a1fdbc3b758dcd9475046d30f4dc7e8" dependencies = [ - "async-lock 3.0.0", + "async-lock", "cfg-if", "concurrent-queue", "futures-io", - "futures-lite 2.0.1", + "futures-lite", "parking", - "polling 3.3.0", - "rustix 0.38.21", + "polling", + "rustix", "slab", "tracing", - "waker-fn", - "windows-sys", -] - -[[package]] -name = "async-lock" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" -dependencies = [ - "event-listener 2.5.3", + "windows-sys 0.59.0", ] [[package]] name = "async-lock" -version = "3.0.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45e900cdcd39bb94a14487d3f7ef92ca222162e6c7c3fe7cb3550ea75fb486ed" +checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18" dependencies = [ - "event-listener 3.0.1", + "event-listener", "event-listener-strategy", "pin-project-lite", ] [[package]] name = "async-process" -version = "1.8.1" +version = "2.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88" +checksum = "a8a07789659a4d385b79b18b9127fc27e1a59e1e89117c78c5ea3b806f016374" dependencies = [ - "async-io 1.13.0", - "async-lock 2.8.0", + "async-channel", + "async-io", + "async-lock", "async-signal", + "async-task", "blocking", "cfg-if", - "event-listener 3.0.1", - "futures-lite 1.13.0", - "rustix 0.38.21", - "windows-sys", + "event-listener", + "futures-lite", + "rustix", + "tracing", + "windows-sys 0.59.0", ] [[package]] name = "async-recursion" -version = "1.0.5" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" +checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.73", ] [[package]] name = "async-signal" -version = "0.2.5" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5" +checksum = "637e00349800c0bdf8bfc21ebbc0b6524abea702b0da4168ac00d070d0c0b9f3" dependencies = [ - "async-io 2.2.0", - "async-lock 2.8.0", + "async-io", + "async-lock", "atomic-waker", "cfg-if", "futures-core", "futures-io", - "rustix 0.38.21", + "rustix", "signal-hook-registry", "slab", - "windows-sys", + "windows-sys 0.59.0", ] [[package]] name = "async-task" -version = "4.5.0" +version = "4.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4eb2cdb97421e01129ccb49169d8279ed21e829929144f4a22a6e54ac549ca1" +checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" [[package]] name = "async-trait" -version = "0.1.74" +version = "0.1.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" +checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.73", ] [[package]] @@ -231,15 +208,15 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] name = "autocfg" -version = "1.1.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "backtrace" -version = "0.3.69" +version = "0.3.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" dependencies = [ "addr2line", "cc", @@ -264,9 +241,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" [[package]] name = "block" @@ -294,25 +271,22 @@ dependencies = [ [[package]] name = "blocking" -version = "1.4.1" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c36a4d0d48574b3dd360b4b7d95cc651d2b6557b6402848a27d4b228a473e2a" +checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea" dependencies = [ "async-channel", - "async-lock 2.8.0", "async-task", - "fastrand 2.0.1", "futures-io", - "futures-lite 1.13.0", + "futures-lite", "piper", - "tracing", ] [[package]] name = "bumpalo" -version = "3.14.0" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "byteorder" @@ -328,27 +302,28 @@ checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38" [[package]] name = "bytes" -version = "1.5.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" +checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" [[package]] name = "cairo-rs" -version = "0.19.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core#24ac2075336c7a1ccd5058fd3b732f6616f2f9da" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "797fd5a634dcb0ad0d7d583df794deb0a236d88e759cd34b7da20198c6c9d145" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.6.0", "cairo-sys-rs", "glib", "libc", - "once_cell", "thiserror", ] [[package]] name = "cairo-sys-rs" -version = "0.19.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core#24ac2075336c7a1ccd5058fd3b732f6616f2f9da" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "428290f914b9b86089f60f5d8a9f6e440508e1bcff23b25afd51502b0a2da88f" dependencies = [ "glib-sys", "libc", @@ -366,18 +341,15 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.83" +version = "1.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" -dependencies = [ - "libc", -] +checksum = "e9e8aabfac534be767c909e0690571677d49f41bd8465ae876fe043d52ba5292" [[package]] name = "cfg-expr" -version = "0.15.5" +version = "0.15.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03915af431787e6ffdcc74c645077518c6b6e01f80b761e0fbbfa288536311b3" +checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02" dependencies = [ "smallvec", "target-lexicon", @@ -390,10 +362,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] +name = "cfg_aliases" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" + +[[package]] name = "chrono" -version = "0.4.31" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" dependencies = [ "android-tzdata", "iana-time-zone", @@ -417,9 +395,9 @@ dependencies = [ [[package]] name = "concurrent-queue" -version = "2.3.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f057a694a54f12365049b0958a1685bb52d567f5593b355fbf685838e873d400" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" dependencies = [ "crossbeam-utils", ] @@ -439,7 +417,7 @@ dependencies = [ "log", "mime", "paste", - "pin-project 1.1.3", + "pin-project 1.1.5", "serde", "serde_json", "tar", @@ -450,36 +428,33 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.4" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "cpufeatures" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" dependencies = [ "libc", ] [[package]] name = "crc32fast" -version = "1.3.2" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" dependencies = [ "cfg-if", ] [[package]] name = "crossbeam-utils" -version = "0.8.16" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" -dependencies = [ - "cfg-if", -] +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" [[package]] name = "crypto-common" @@ -494,25 +469,14 @@ dependencies = [ [[package]] name = "deranged" -version = "0.3.9" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" dependencies = [ "powerfmt", ] [[package]] -name = "derivative" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" -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" @@ -524,10 +488,16 @@ dependencies = [ ] [[package]] +name = "endi" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3d8a32ae18130a3c84dd492d4215c3d913c3b07c6b63c2eb3eb7ff1101ab7bf" + +[[package]] name = "enumflags2" -version = "0.7.8" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5998b4f30320c9d93aed72f63af821bfdac50465b75428fce77b48ec482c3939" +checksum = "d232db7f5956f3f14313dc2f87985c58bd2c695ce124c8cdd984e08e15ac133d" dependencies = [ "enumflags2_derive", "serde", @@ -535,13 +505,13 @@ dependencies = [ [[package]] name = "enumflags2_derive" -version = "0.7.8" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f95e2801cd355d4a1a3e3953ce6ee5ae9603a5c833455343a8bfe3f44d418246" +checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.73", ] [[package]] @@ -552,34 +522,19 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.6" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c18ee0ed65a5f1f81cac6b1d213b69c35fa47d4252ad41f1486dbd8226fe36e" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" dependencies = [ "libc", - "windows-sys", -] - -[[package]] -name = "error-chain" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d2f06b9cac1506ece98fe3231e3cc9c4410ec3d5b1f24ae1c8946f0742cdefc" -dependencies = [ - "version_check", + "windows-sys 0.52.0", ] [[package]] name = "event-listener" -version = "2.5.3" +version = "5.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" - -[[package]] -name = "event-listener" -version = "3.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cec0252c2afff729ee6f00e903d479fba81784c8e2bd77447673471fdfaea1" +checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba" dependencies = [ "concurrent-queue", "parking", @@ -588,28 +543,19 @@ dependencies = [ [[package]] name = "event-listener-strategy" -version = "0.3.0" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d96b852f1345da36d551b9473fa1e2b1eb5c5195585c6c018118bc92a8d91160" +checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" dependencies = [ - "event-listener 3.0.1", + "event-listener", "pin-project-lite", ] [[package]] name = "fastrand" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" -dependencies = [ - "instant", -] - -[[package]] -name = "fastrand" -version = "2.0.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" +checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" [[package]] name = "field-offset" @@ -617,27 +563,27 @@ version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f" dependencies = [ - "memoffset 0.9.0", + "memoffset", "rustc_version", ] [[package]] name = "filetime" -version = "0.2.22" +version = "0.2.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0" +checksum = "bf401df4a4e3872c4fe8151134cf483738e74b67fc934d6532c882b3d24a4550" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.3.5", - "windows-sys", + "libredox", + "windows-sys 0.59.0", ] [[package]] name = "flate2" -version = "1.0.28" +version = "1.0.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +checksum = "7f211bbe8e69bbd0cfdea405084f128ae8b4aaa6b0b522fc8f2b009084797920" dependencies = [ "crc32fast", "miniz_oxide", @@ -651,18 +597,18 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "form_urlencoded" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" dependencies = [ "percent-encoding", ] [[package]] name = "futures" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" dependencies = [ "futures-channel", "futures-core", @@ -675,9 +621,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" dependencies = [ "futures-core", "futures-sink", @@ -685,15 +631,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" [[package]] name = "futures-executor" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" dependencies = [ "futures-core", "futures-task", @@ -702,63 +648,51 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" [[package]] name = "futures-lite" -version = "1.13.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" +checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" dependencies = [ - "fastrand 1.9.0", + "fastrand", "futures-core", "futures-io", - "memchr", "parking", "pin-project-lite", - "waker-fn", -] - -[[package]] -name = "futures-lite" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3831c2651acb5177cbd83943f3d9c8912c5ad03c76afcc0e9511ba568ec5ebb" -dependencies = [ - "futures-core", - "pin-project-lite", ] [[package]] name = "futures-macro" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.73", ] [[package]] name = "futures-sink" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" [[package]] name = "futures-task" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" [[package]] name = "futures-util" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" dependencies = [ "futures-channel", "futures-core", @@ -786,20 +720,21 @@ dependencies = [ [[package]] name = "gdk-pixbuf" -version = "0.19.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core#24ac2075336c7a1ccd5058fd3b732f6616f2f9da" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28bb53ecb56857c683c9ec859908e076dd3969c7d67598bd8b1ce095d211304a" dependencies = [ "gdk-pixbuf-sys", "gio", "glib", "libc", - "once_cell", ] [[package]] name = "gdk-pixbuf-sys" -version = "0.19.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core#24ac2075336c7a1ccd5058fd3b732f6616f2f9da" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f6681a0c1330d1d3968bec1529f7172d62819ef0bdbb0d18022320654158b03" dependencies = [ "gio-sys", "glib-sys", @@ -810,8 +745,9 @@ dependencies = [ [[package]] name = "gdk4" -version = "0.8.0" -source = "git+https://github.com/gtk-rs/gtk4-rs.git#ecf65d90e4b9bd42d810aa44bdd0b3bd220cbd18" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b7d7237c1487ed4b300aac7744efcbf1319e12d60d7afcd6f505414bd5b5dea" dependencies = [ "cairo-rs", "gdk-pixbuf", @@ -824,8 +760,9 @@ dependencies = [ [[package]] name = "gdk4-sys" -version = "0.8.0" -source = "git+https://github.com/gtk-rs/gtk4-rs.git#ecf65d90e4b9bd42d810aa44bdd0b3bd220cbd18" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a67576c8ec012156d7f680e201a807b4432a77babb3157e0555e990ab6bcd878" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -840,8 +777,9 @@ dependencies = [ [[package]] name = "gdk4-wayland" -version = "0.8.0" -source = "git+https://github.com/gtk-rs/gtk4-rs.git#ecf65d90e4b9bd42d810aa44bdd0b3bd220cbd18" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34f422f60971cdea128457cad122c46fee48b3a53aa1e1d140919d50ff5b7491" dependencies = [ "gdk4", "gdk4-wayland-sys", @@ -852,8 +790,9 @@ dependencies = [ [[package]] name = "gdk4-wayland-sys" -version = "0.8.0" -source = "git+https://github.com/gtk-rs/gtk4-rs.git#ecf65d90e4b9bd42d810aa44bdd0b3bd220cbd18" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23295b2ecafae572224a382b876b0bdc0fed947da63b51edebc8798288002048" dependencies = [ "glib-sys", "libc", @@ -862,8 +801,9 @@ dependencies = [ [[package]] name = "gdk4-x11" -version = "0.8.0" -source = "git+https://github.com/gtk-rs/gtk4-rs.git#ecf65d90e4b9bd42d810aa44bdd0b3bd220cbd18" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4b89c2149f74668d630279559fb5e2b4f11a77124b73d04518cc344854cd626" dependencies = [ "gdk4", "gdk4-x11-sys", @@ -874,8 +814,9 @@ dependencies = [ [[package]] name = "gdk4-x11-sys" -version = "0.8.0" -source = "git+https://github.com/gtk-rs/gtk4-rs.git#ecf65d90e4b9bd42d810aa44bdd0b3bd220cbd18" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a186f565940124ebd6c1c97e9eb0909e2d19a33ccd3eebed4ff32ebda766207d" dependencies = [ "gdk4-sys", "glib-sys", @@ -895,9 +836,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.11" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "libc", @@ -926,14 +867,15 @@ dependencies = [ [[package]] name = "gimli" -version = "0.28.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" +checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" [[package]] name = "gio" -version = "0.19.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core#24ac2075336c7a1ccd5058fd3b732f6616f2f9da" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "398e3da68749fdc32783cbf7521ec3f65c9cf946db8c7774f8460af49e52c6e2" dependencies = [ "futures-channel", "futures-core", @@ -942,7 +884,6 @@ dependencies = [ "gio-sys", "glib", "libc", - "once_cell", "pin-project-lite", "smallvec", "thiserror", @@ -950,22 +891,24 @@ dependencies = [ [[package]] name = "gio-sys" -version = "0.19.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core#24ac2075336c7a1ccd5058fd3b732f6616f2f9da" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4feb96b31c32730ea3e1e89aecd2e4e37ecb1c473ad8f685e3430a159419f63" dependencies = [ "glib-sys", "gobject-sys", "libc", "system-deps", - "winapi", + "windows-sys 0.52.0", ] [[package]] name = "glib" -version = "0.19.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core#24ac2075336c7a1ccd5058fd3b732f6616f2f9da" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fee90a615ce05be7a32932cfb8adf2c4bbb4700e80d37713c981fb24c0c56238" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.6.0", "futures-channel", "futures-core", "futures-executor", @@ -977,28 +920,28 @@ dependencies = [ "gobject-sys", "libc", "memchr", - "once_cell", "smallvec", "thiserror", ] [[package]] name = "glib-macros" -version = "0.19.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core#24ac2075336c7a1ccd5058fd3b732f6616f2f9da" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4da558d8177c0c8c54368818b508a4244e1286fce2858cef4e547023f0cfa5ef" dependencies = [ "heck", - "proc-macro-crate 2.0.0", - "proc-macro-error", + "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.73", ] [[package]] name = "glib-sys" -version = "0.19.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core#24ac2075336c7a1ccd5058fd3b732f6616f2f9da" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4958c26e5a01c9af00dea669a97369eccbec29a8e6d125c24ea2d85ee7467b60" dependencies = [ "libc", "system-deps", @@ -1006,8 +949,9 @@ dependencies = [ [[package]] name = "gobject-sys" -version = "0.19.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core#24ac2075336c7a1ccd5058fd3b732f6616f2f9da" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6908864f5ffff15b56df7e90346863904f49b949337ed0456b9287af61903b8" dependencies = [ "glib-sys", "libc", @@ -1016,8 +960,9 @@ dependencies = [ [[package]] name = "graphene-rs" -version = "0.19.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core#24ac2075336c7a1ccd5058fd3b732f6616f2f9da" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "630e940ad5824f90221d6579043a9cd1f8bec86b4a17faaf7827d58eb16e8c1f" dependencies = [ "glib", "graphene-sys", @@ -1026,8 +971,9 @@ dependencies = [ [[package]] name = "graphene-sys" -version = "0.19.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core#24ac2075336c7a1ccd5058fd3b732f6616f2f9da" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fb8fade7b754982f47ebbed241fd2680816fdd4598321784da10b9e1168836a" dependencies = [ "glib-sys", "libc", @@ -1037,8 +983,9 @@ dependencies = [ [[package]] name = "gsk4" -version = "0.8.0" -source = "git+https://github.com/gtk-rs/gtk4-rs.git#ecf65d90e4b9bd42d810aa44bdd0b3bd220cbd18" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3cf2091e1af185b347b3450817d93dea6fe435df7abd4c2cd7fb5bcb4cfda8" dependencies = [ "cairo-rs", "gdk4", @@ -1051,8 +998,9 @@ dependencies = [ [[package]] name = "gsk4-sys" -version = "0.8.0" -source = "git+https://github.com/gtk-rs/gtk4-rs.git#ecf65d90e4b9bd42d810aa44bdd0b3bd220cbd18" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6aa69614a26d8760c186c3690f1b0fbb917572ca23ef83137445770ceddf8cde" dependencies = [ "cairo-sys-rs", "gdk4-sys", @@ -1066,8 +1014,9 @@ dependencies = [ [[package]] name = "gtk4" -version = "0.8.0" -source = "git+https://github.com/gtk-rs/gtk4-rs.git#ecf65d90e4b9bd42d810aa44bdd0b3bd220cbd18" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eaffc6c743c9160514cc9b67eace364e5dc5798369fa809cdb04e035c21c5c5d" dependencies = [ "cairo-rs", "field-offset", @@ -1086,21 +1035,21 @@ dependencies = [ [[package]] name = "gtk4-macros" -version = "0.8.0" -source = "git+https://github.com/gtk-rs/gtk4-rs.git#ecf65d90e4b9bd42d810aa44bdd0b3bd220cbd18" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "188211f546ce5801f6d0245c37b6249143a2cb4fa040e54829ca1e76796e9f09" dependencies = [ - "anyhow", - "proc-macro-crate 2.0.0", - "proc-macro-error", + "proc-macro-crate", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.73", ] [[package]] name = "gtk4-sys" -version = "0.8.0" -source = "git+https://github.com/gtk-rs/gtk4-rs.git#ecf65d90e4b9bd42d810aa44bdd0b3bd220cbd18" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1114a207af8ada02cf4658a76692f4190f06f093380d5be07e3ca8b43aa7c666" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -1117,21 +1066,27 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.14.2" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" [[package]] name = "heck" -version = "0.4.1" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "hermit-abi" -version = "0.3.3" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" + +[[package]] +name = "hermit-abi" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" [[package]] name = "hex" @@ -1141,9 +1096,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "hkdf" -version = "0.12.3" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "791a029f6b9fc27657f6f188ec6e5e43f6911f6f878e0dc5501396e09809d437" +checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7" dependencies = [ "hmac", ] @@ -1159,42 +1114,42 @@ dependencies = [ [[package]] name = "hostname" -version = "0.3.1" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867" +checksum = "f9c7c7c8ac16c798734b8a24560c1362120597c40d5e1459f09498f8f6c8f2ba" dependencies = [ + "cfg-if", "libc", - "match_cfg", - "winapi", + "windows", ] [[package]] name = "http" -version = "0.2.10" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f95b9abcae896730d42b78e09c155ed4ddf82c07b4de772c64aee5b2d8b7c150" +checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" dependencies = [ - "bytes 1.5.0", + "bytes 1.7.1", "fnv", "itoa", ] [[package]] name = "http-body" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" +checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" dependencies = [ - "bytes 1.5.0", + "bytes 1.7.1", "http", "pin-project-lite", ] [[package]] name = "httparse" -version = "1.8.0" +version = "1.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" +checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" [[package]] name = "httpdate" @@ -1204,11 +1159,11 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "hyper" -version = "0.14.27" +version = "0.14.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" +checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9" dependencies = [ - "bytes 1.5.0", + "bytes 1.7.1", "futures-channel", "futures-core", "futures-util", @@ -1218,7 +1173,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2 0.4.10", + "socket2", "tokio", "tower-service", "tracing", @@ -1234,15 +1189,15 @@ dependencies = [ "futures-util", "hex", "hyper", - "pin-project 1.1.3", + "pin-project 1.1.5", "tokio", ] [[package]] name = "iana-time-zone" -version = "0.1.58" +version = "0.1.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -1263,9 +1218,9 @@ dependencies = [ [[package]] name = "idna" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" dependencies = [ "unicode-bidi", "unicode-normalization", @@ -1273,9 +1228,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.1.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" +checksum = "de3fc2e30ba82dd1b3911c8de1ffc143c74a914a14e99514d7637e3099df5ea0" dependencies = [ "equivalent", "hashbrown", @@ -1293,55 +1248,41 @@ dependencies = [ ] [[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if", -] - -[[package]] name = "io-lifetimes" -version = "1.0.11" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" -dependencies = [ - "hermit-abi", - "libc", - "windows-sys", -] +checksum = "5a611371471e98973dbcab4e0ec66c31a10bc356eeb4d54a0e05eac8158fe38c" [[package]] name = "itoa" -version = "1.0.9" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "js-sys" -version = "0.3.65" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54c0c35952f67de54bb584e9fd912b3023117cbafc0a77d8f3dee1fb5f572fe8" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" dependencies = [ "wasm-bindgen", ] [[package]] name = "lazy_static" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" dependencies = [ "spin", ] [[package]] name = "libadwaita" -version = "0.6.0" -source = "git+https://gitlab.gnome.org/World/Rust/libadwaita-rs#24608c684b8fa59357d0d586fde75c04a464cbf6" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ff9c222b5c783729de45185f07b2fec2d43a7f9c63961e777d3667e20443878" dependencies = [ - "gdk-pixbuf", "gdk4", "gio", "glib", @@ -1353,8 +1294,9 @@ dependencies = [ [[package]] name = "libadwaita-sys" -version = "0.6.0" -source = "git+https://gitlab.gnome.org/World/Rust/libadwaita-rs#24608c684b8fa59357d0d586fde75c04a464cbf6" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c44d8bdbad31d6639e1f20cc9c1424f1a8e02d751fc28d44659bf743fb9eca6" dependencies = [ "gdk4-sys", "gio-sys", @@ -1368,9 +1310,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.150" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libm" @@ -1379,46 +1321,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" [[package]] -name = "libpanel" -version = "0.3.0" -source = "git+https://gitlab.gnome.org/World/Rust/libpanel-rs.git#7dd6d088f92079893f0e5d2afc2c8258b807ddcd" -dependencies = [ - "futures-core", - "gdk4", - "gio", - "glib", - "gtk4", - "libadwaita", - "libc", - "libpanel-sys", -] - -[[package]] -name = "libpanel-sys" -version = "0.3.0" -source = "git+https://gitlab.gnome.org/World/Rust/libpanel-rs.git#7dd6d088f92079893f0e5d2afc2c8258b807ddcd" +name = "libredox" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ - "gdk4-sys", - "gio-sys", - "glib-sys", - "gobject-sys", - "gtk4-sys", - "libadwaita-sys", + "bitflags 2.6.0", "libc", - "system-deps", + "redox_syscall 0.5.3", ] [[package]] name = "linux-raw-sys" -version = "0.3.8" +version = "0.4.14" 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" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "locale_config" @@ -1435,9 +1352,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.20" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "malloc_buf" @@ -1449,31 +1366,26 @@ dependencies = [ ] [[package]] -name = "match_cfg" -version = "0.1.0" +name = "md-5" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4" +checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" +dependencies = [ + "cfg-if", + "digest", +] [[package]] name = "memchr" -version = "2.6.4" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "memoffset" -version = "0.7.1" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" -dependencies = [ - "autocfg", -] - -[[package]] -name = "memoffset" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" dependencies = [ "autocfg", ] @@ -1486,22 +1398,32 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] name = "miniz_oxide" -version = "0.7.1" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" dependencies = [ "adler", ] [[package]] name = "mio" -version = "0.8.9" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0" +checksum = "4569e456d394deccd22ce1c1913e6ea0e54519f577285001215d33557431afe4" dependencies = [ + "hermit-abi 0.3.9", "libc", "wasi", - "windows-sys", + "windows-sys 0.52.0", +] + +[[package]] +name = "multi_log" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad56bb3c7c7c15b4e25de86c9123e886e5f80a0c03ace219b453b081c2bf20d7" +dependencies = [ + "log", ] [[package]] @@ -1515,21 +1437,22 @@ dependencies = [ [[package]] name = "nix" -version = "0.26.4" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" +checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", "cfg-if", + "cfg_aliases", "libc", - "memoffset 0.7.1", + "memoffset", ] [[package]] name = "num" -version = "0.4.1" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b05180d69e3da0e530ba2a1dae5110317e49e3b7f3d41be227dc5f92e49ee7af" +checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23" dependencies = [ "num-bigint", "num-complex", @@ -1541,11 +1464,10 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.4.4" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" dependencies = [ - "autocfg", "num-integer", "num-traits", ] @@ -1570,28 +1492,33 @@ dependencies = [ [[package]] name = "num-complex" -version = "0.4.4" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214" +checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495" dependencies = [ "num-traits", ] [[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + +[[package]] name = "num-integer" -version = "0.1.45" +version = "0.1.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" dependencies = [ - "autocfg", "num-traits", ] [[package]] name = "num-iter" -version = "0.1.43" +version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" +checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" dependencies = [ "autocfg", "num-integer", @@ -1600,11 +1527,10 @@ dependencies = [ [[package]] name = "num-rational" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" +checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824" dependencies = [ - "autocfg", "num-bigint", "num-integer", "num-traits", @@ -1612,28 +1538,18 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.17" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", ] [[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_threads" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" +checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9" dependencies = [ "libc", ] @@ -1669,43 +1585,45 @@ dependencies = [ [[package]] name = "object" -version = "0.32.1" +version = "0.36.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" +checksum = "27b64972346851a39438c60b341ebc01bba47464ae329e55cf343eb93964efd9" dependencies = [ "memchr", ] [[package]] name = "once_cell" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "oo7" -version = "0.2.1" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "220729ba847d98e1a9902c05e41dae79ce4a0b913dad68bc540dd3120a8c2b6b" +checksum = "8fc6ce4692fbfd044ce22ca07dcab1a30fa12432ca2aa5b1294eca50d3332a24" dependencies = [ "aes", - "byteorder", "cbc", "cipher", "digest", + "endi", "futures-util", "hkdf", "hmac", + "md-5", "num", "num-bigint-dig", - "once_cell", "pbkdf2", "rand", "serde", "sha2", + "subtle", "tokio", "zbus", "zeroize", + "zvariant", ] [[package]] @@ -1720,20 +1638,21 @@ dependencies = [ [[package]] name = "pango" -version = "0.19.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core#24ac2075336c7a1ccd5058fd3b732f6616f2f9da" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54768854025df6903061d0084fd9702a253ddfd60db7d9b751d43b76689a7f0a" dependencies = [ "gio", "glib", "libc", - "once_cell", "pango-sys", ] [[package]] name = "pango-sys" -version = "0.19.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core#24ac2075336c7a1ccd5058fd3b732f6616f2f9da" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b07cc57d10cee4ec661f718a6902cee18c2f4cfae08e87e5a390525946913390" dependencies = [ "glib-sys", "gobject-sys", @@ -1742,6 +1661,12 @@ dependencies = [ ] [[package]] +name = "paris" +version = "1.5.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fecab3723493c7851f292cb060f3ee1c42f19b8d749345d0d7eaf3fd19aa62d" + +[[package]] name = "parking" version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1749,9 +1674,9 @@ checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" [[package]] name = "paste" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "pbkdf2" @@ -1765,9 +1690,9 @@ dependencies = [ [[package]] name = "percent-encoding" -version = "2.3.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pin-project" @@ -1780,11 +1705,11 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.1.3" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" +checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" dependencies = [ - "pin-project-internal 1.1.3", + "pin-project-internal 1.1.5", ] [[package]] @@ -1800,20 +1725,20 @@ dependencies = [ [[package]] name = "pin-project-internal" -version = "1.1.3" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" +checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.73", ] [[package]] name = "pin-project-lite" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" [[package]] name = "pin-utils" @@ -1823,20 +1748,20 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "piper" -version = "0.2.1" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" +checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066" dependencies = [ "atomic-waker", - "fastrand 2.0.1", + "fastrand", "futures-io", ] [[package]] name = "pkg-config" -version = "0.3.27" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] name = "podman-api" @@ -1845,7 +1770,7 @@ source = "git+https://github.com/vv9k/podman-api-rs.git#f35e6f9f9fdb9d9023aed341 dependencies = [ "base64", "byteorder", - "bytes 1.5.0", + "bytes 1.7.1", "containers-api", "flate2", "futures-util", @@ -1874,7 +1799,7 @@ dependencies = [ [[package]] name = "pods" -version = "2.0.0" +version = "2.1.0-devel" dependencies = [ "anyhow", "ashpd", @@ -1883,14 +1808,15 @@ dependencies = [ "gtk4", "indexmap", "libadwaita", - "libpanel", "log", + "multi_log", "names", "oo7", "paste", "podman-api", "serde", "serde_json", + "simplelog", "sourceview5", "syslog", "tokio", @@ -1901,32 +1827,17 @@ dependencies = [ [[package]] name = "polling" -version = "2.8.0" +version = "3.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" +checksum = "cc2790cd301dec6cd3b7a025e4815cf825724a51c98dccfe6a3e55f05ffb6511" dependencies = [ - "autocfg", - "bitflags 1.3.2", "cfg-if", "concurrent-queue", - "libc", - "log", + "hermit-abi 0.4.0", "pin-project-lite", - "windows-sys", -] - -[[package]] -name = "polling" -version = "3.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e53b6af1f60f36f8c2ac2aad5459d75a5a9b4be1e8cdd40264f315d78193e531" -dependencies = [ - "cfg-if", - "concurrent-queue", - "pin-project-lite", - "rustix 0.38.21", + "rustix", "tracing", - "windows-sys", + "windows-sys 0.59.0", ] [[package]] @@ -1937,67 +1848,36 @@ 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-macro-crate" -version = "1.3.1" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" dependencies = [ - "once_cell", - "toml_edit 0.19.15", + "zerocopy", ] [[package]] name = "proc-macro-crate" -version = "2.0.0" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e8366a6159044a37876a2b9817124296703c586a5c92e2c53751fa06d8d43e8" +checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" dependencies = [ - "toml_edit 0.20.7", -] - -[[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", + "toml_edit 0.21.1", ] [[package]] name = "proc-macro2" -version = "1.0.69" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.33" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] @@ -2043,18 +1923,18 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.4.1" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", ] [[package]] name = "regex" -version = "1.10.2" +version = "1.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" dependencies = [ "aho-corasick", "memchr", @@ -2064,9 +1944,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.3" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" dependencies = [ "aho-corasick", "memchr", @@ -2075,15 +1955,15 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.2" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" [[package]] name = "rustc-demangle" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustc_version" @@ -2096,90 +1976,77 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.27" +version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", "errno", - "io-lifetimes", "libc", - "linux-raw-sys 0.3.8", - "windows-sys", -] - -[[package]] -name = "rustix" -version = "0.38.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b426b0506e5d50a7d8dafcf2e81471400deb602392c7dd110815afb4eaf02a3" -dependencies = [ - "bitflags 2.4.1", - "errno", - "libc", - "linux-raw-sys 0.4.11", - "windows-sys", + "linux-raw-sys", + "windows-sys 0.52.0", ] [[package]] name = "ryu" -version = "1.0.15" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "semver" -version = "1.0.20" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.192" +version = "1.0.206" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bca2a08484b285dcb282d0f67b26cadc0df8b19f8c12502c13d966bf9482f001" +checksum = "5b3e4cd94123dd520a128bcd11e34d9e9e423e7e3e50425cb1b4b1e3549d0284" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.192" +version = "1.0.206" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6c7207fbec9faa48073f3e3074cbe553af6ea512d7c21ba46e434e70ea9fbc1" +checksum = "fabfb6138d2383ea8208cf98ccf69cdfb1aff4088460681d84189aa259762f97" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.73", ] [[package]] name = "serde_json" -version = "1.0.108" +version = "1.0.122" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" +checksum = "784b6203951c57ff748476b126ccb5e8e2959a5c19e5c617ab1956be3dbc68da" dependencies = [ "itoa", + "memchr", "ryu", "serde", ] [[package]] name = "serde_repr" -version = "0.1.17" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3081f5ffbb02284dda55132aa26daecedd7372a42417bbbab6f14ab7d6bb9145" +checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.73", ] [[package]] name = "serde_spanned" -version = "0.6.4" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80" +checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" dependencies = [ "serde", ] @@ -2208,14 +2075,26 @@ dependencies = [ [[package]] name = "signal-hook-registry" -version = "1.4.1" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" dependencies = [ "libc", ] [[package]] +name = "simplelog" +version = "0.12.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16257adbfaef1ee58b1363bdc0664c9b8e1e30aed86049635fb5f147d065a9c0" +dependencies = [ + "log", + "paris", + "termcolor", + "time", +] + +[[package]] name = "slab" version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2226,34 +2105,25 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "socket2" -version = "0.4.10" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" dependencies = [ "libc", - "winapi", -] - -[[package]] -name = "socket2" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" -dependencies = [ - "libc", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] name = "sourceview5" -version = "0.8.0" -source = "git+https://gitlab.gnome.org/World/Rust/sourceview5-rs.git#5baec2e87544136de6c3e1a3614624d60986d530" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "905c83b38d4aff1800a12adba65b083deba61b4d948f62fc2ff7ad7d77656d05" dependencies = [ "futures-channel", "futures-core", @@ -2269,8 +2139,9 @@ dependencies = [ [[package]] name = "sourceview5-sys" -version = "0.8.0" -source = "git+https://gitlab.gnome.org/World/Rust/sourceview5-rs.git#5baec2e87544136de6c3e1a3614624d60986d530" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a3759467713554a8063faa380237ee2c753e89026bbe1b8e9611d991cb106ff" dependencies = [ "gdk-pixbuf-sys", "gdk4-sys", @@ -2285,9 +2156,9 @@ 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 = "static_assertions" @@ -2297,9 +2168,9 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "subtle" -version = "2.5.0" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "syn" @@ -2314,9 +2185,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.39" +version = "2.0.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" +checksum = "837a7e8026c6ce912ff01cefbe8cafc2f8010ac49682e2a3d9decc3bce1ecaaf" dependencies = [ "proc-macro2", "quote", @@ -2325,11 +2196,10 @@ dependencies = [ [[package]] name = "syslog" -version = "6.1.0" +version = "7.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7434e95bcccce1215d30f4bf84fe8c00e8de1b9be4fb736d747ca53d36e7f96f" +checksum = "019f1500a13379b7d051455df397c75770de6311a7a188a699499502704d9f10" dependencies = [ - "error-chain", "hostname", "libc", "log", @@ -2338,9 +2208,9 @@ dependencies = [ [[package]] name = "system-deps" -version = "6.2.0" +version = "7.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a2d580ff6a20c55dfb86be5f9c238f67835d0e81cbdea8bf5680e0897320331" +checksum = "6c81f13d9a334a6c242465140bd262fae382b752ff2011c4f7419919a9c97922" dependencies = [ "cfg-expr", "heck", @@ -2351,9 +2221,9 @@ dependencies = [ [[package]] name = "tar" -version = "0.4.40" +version = "0.4.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb" +checksum = "cb797dad5fb5b76fcf519e702f4a589483b5ef06567f160c392832c1f5e44909" dependencies = [ "filetime", "libc", @@ -2362,58 +2232,68 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.12" +version = "0.12.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c39fd04924ca3a864207c66fc2cd7d22d7c016007f9ce846cbb9326331930a" +checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" [[package]] name = "temp-dir" -version = "0.1.11" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af547b166dd1ea4b472165569fc456cfb6818116f854690b0ff205e636523dab" +checksum = "1f227968ec00f0e5322f9b8173c7a0cbcff6181a0a5b28e9892491c286277231" [[package]] name = "tempfile" -version = "3.8.1" +version = "3.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" +checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" dependencies = [ "cfg-if", - "fastrand 2.0.1", - "redox_syscall 0.4.1", - "rustix 0.38.21", - "windows-sys", + "fastrand", + "once_cell", + "rustix", + "windows-sys 0.59.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.50" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.50" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.73", ] [[package]] name = "time" -version = "0.3.30" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ "deranged", "itoa", "libc", + "num-conv", "num_threads", "powerfmt", "serde", @@ -2429,18 +2309,19 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.15" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" dependencies = [ + "num-conv", "time-core", ] [[package]] name = "tinyvec" -version = "1.6.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" dependencies = [ "tinyvec_macros", ] @@ -2453,27 +2334,26 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.34.0" +version = "1.39.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0c014766411e834f7af5b8f4cf46257aab4036ca95e9d2c144a10f59ad6f5b9" +checksum = "daa4fb1bc778bd6f04cbfc4bb2d06a7396a8f299dc33ea1900cedaa316f467b1" dependencies = [ "backtrace", - "bytes 1.5.0", + "bytes 1.7.1", "libc", "mio", - "num_cpus", "pin-project-lite", "signal-hook-registry", - "socket2 0.5.5", + "socket2", "tracing", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] name = "tokio-stream" -version = "0.1.14" +version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" +checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" dependencies = [ "futures-core", "pin-project-lite", @@ -2496,58 +2376,47 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.8" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35" +checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.21.0", + "toml_edit 0.22.20", ] [[package]] name = "toml_datetime" -version = "0.6.5" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.19.15" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" dependencies = [ "indexmap", "toml_datetime", - "winnow", + "winnow 0.5.40", ] [[package]] name = "toml_edit" -version = "0.20.7" +version = "0.22.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" -dependencies = [ - "indexmap", - "toml_datetime", - "winnow", -] - -[[package]] -name = "toml_edit" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03" +checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d" dependencies = [ "indexmap", "serde", "serde_spanned", "toml_datetime", - "winnow", + "winnow 0.6.18", ] [[package]] @@ -2575,7 +2444,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.73", ] [[package]] @@ -2589,9 +2458,9 @@ dependencies = [ [[package]] name = "try-lock" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "typenum" @@ -2601,19 +2470,20 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "uds_windows" -version = "1.0.2" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce65604324d3cce9b966701489fbd0cf318cb1f7bd9dd07ac9a4ee6fb791930d" +checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9" dependencies = [ + "memoffset", "tempfile", "winapi", ] [[package]] name = "unicode-bidi" -version = "0.3.13" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" [[package]] name = "unicode-ident" @@ -2623,18 +2493,18 @@ checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" dependencies = [ "tinyvec", ] [[package]] name = "url" -version = "2.4.1" +version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" dependencies = [ "form_urlencoded", "idna", @@ -2644,27 +2514,27 @@ 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 = "version-compare" -version = "0.1.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "579a42fc0b8e0c63b76519a339be31bed574929511fa53c1a3acae26eb258f29" +checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b" [[package]] name = "version_check" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" [[package]] name = "vte" -version = "0.12.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98b0a06c0f086f7abe70cf308967153479e223b6a9809f7dcc6c47b045574bc9" +checksum = "40eb22ae96f050e0c0d6f7ce43feeae26c348fc4dea56928ca81537cfaa6188b" dependencies = [ "utf8parse", "vte_generate_state_changes", @@ -2673,9 +2543,10 @@ dependencies = [ [[package]] name = "vte4" version = "0.8.0" -source = "git+https://gitlab.gnome.org/World/Rust/vte4-rs.git#aa466f43ead6190c6c4b8792f78ed766df1c289e" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7759016227e58e3239b8dca9c4a70086345844872b1f27cba0dba990fef5cb44" dependencies = [ - "bitflags 1.3.2", + "cairo-rs", "gdk4", "gio", "glib", @@ -2689,8 +2560,10 @@ dependencies = [ [[package]] name = "vte4-sys" version = "0.8.0" -source = "git+https://gitlab.gnome.org/World/Rust/vte4-rs.git#aa466f43ead6190c6c4b8792f78ed766df1c289e" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c1aa57d29283c6eeac2e34c16791436275d254ac02b8590b02698feef197234" dependencies = [ + "cairo-sys-rs", "gdk4-sys", "gio-sys", "glib-sys", @@ -2702,21 +2575,15 @@ dependencies = [ [[package]] name = "vte_generate_state_changes" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d257817081c7dffcdbab24b9e62d2def62e2ff7d00b1c20062551e6cccc145ff" +checksum = "2e369bee1b05d510a7b4ed645f5faa90619e05437111783ea5848f28d97d3c2e" dependencies = [ "proc-macro2", "quote", ] [[package]] -name = "waker-fn" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" - -[[package]] name = "want" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2733,9 +2600,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.88" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7daec296f25a1bae309c0cd5c29c4b260e510e6d813c286b19eaadf409d40fce" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -2743,24 +2610,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.88" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e397f4664c0e4e428e8313a469aaa58310d302159845980fd23b0f22a847f217" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.73", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.88" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5961017b3b08ad5f3fe39f1e79877f8ee7c23c5e5fd5eb80de95abc41f1f16b2" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -2768,22 +2635,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.88" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5353b8dab669f5e10f5bd76df26a9360c748f054f862ff5f3f8aae0c7fb3907" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.73", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.88" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d046c5d029ba91a1ed14da14dca44b68bf2f124cfbaf741c54151fdb3e0750b" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "winapi" @@ -2802,38 +2669,67 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] +name = "winapi-util" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" +dependencies = [ + "windows-sys 0.59.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" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" +dependencies = [ + "windows-core", + "windows-targets", +] + +[[package]] name = "windows-core" -version = "0.51.1" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ "windows-targets", ] [[package]] name = "windows-sys" -version = "0.48.0" +version = "0.59.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" dependencies = [ "windows-targets", ] [[package]] name = "windows-targets" -version = "0.48.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ "windows_aarch64_gnullvm", "windows_aarch64_msvc", "windows_i686_gnu", + "windows_i686_gnullvm", "windows_i686_msvc", "windows_x86_64_gnu", "windows_x86_64_gnullvm", @@ -2842,94 +2738,108 @@ dependencies = [ [[package]] name = "windows_aarch64_gnullvm" -version = "0.48.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" -version = "0.48.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" -version = "0.48.5" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" -version = "0.48.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" -version = "0.48.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" -version = "0.48.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" -version = "0.48.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" -version = "0.5.19" +version = "0.5.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "829846f3e3db426d4cee4510841b71a8e58aa2a76b1132579487ae430ccd9c7b" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" +dependencies = [ + "memchr", +] + +[[package]] +name = "winnow" +version = "0.6.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f" dependencies = [ "memchr", ] [[package]] name = "xattr" -version = "1.0.1" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4686009f71ff3e5c4dbcf1a282d0a44db3f021ba69350cd42086b3e5f1c6985" +checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" dependencies = [ "libc", + "linux-raw-sys", + "rustix", ] [[package]] name = "xdg-home" -version = "1.0.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2769203cd13a0c6015d515be729c526d041e9cf2c0cc478d57faee85f40c6dcd" +checksum = "ec1cdab258fb55c0da61328dc52c8764709b249011b2cad0454c72f0bf10a1f6" dependencies = [ - "nix", - "winapi", + "libc", + "windows-sys 0.59.0", ] [[package]] name = "zbus" -version = "3.14.1" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31de390a2d872e4cd04edd71b425e29853f786dc99317ed72d73d6fcf5ebb948" +checksum = "bb97012beadd29e654708a0fdb4c84bc046f537aecfde2c3ee0a9e4b4d48c725" dependencies = [ "async-broadcast", "async-process", "async-recursion", "async-trait", - "byteorder", - "derivative", "enumflags2", - "event-listener 2.5.3", + "event-listener", "futures-core", "futures-sink", "futures-util", "hex", "nix", - "once_cell", "ordered-stream", "rand", "serde", @@ -2939,7 +2849,7 @@ dependencies = [ "tokio", "tracing", "uds_windows", - "winapi", + "windows-sys 0.52.0", "xdg-home", "zbus_macros", "zbus_names", @@ -2948,23 +2858,22 @@ dependencies = [ [[package]] name = "zbus_macros" -version = "3.14.1" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41d1794a946878c0e807f55a397187c11fc7a038ba5d868e7db4f3bd7760bc9d" +checksum = "267db9407081e90bbfa46d841d3cbc60f59c0351838c4bc65199ecd79ab1983e" dependencies = [ - "proc-macro-crate 1.3.1", + "proc-macro-crate", "proc-macro2", "quote", - "regex", - "syn 1.0.109", + "syn 2.0.73", "zvariant_utils", ] [[package]] name = "zbus_names" -version = "2.6.0" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb80bb776dbda6e23d705cf0123c3b95df99c4ebeaec6c2599d4a5419902b4a9" +checksum = "4b9b1fef7d021261cc16cba64c351d291b715febe0fa10dc3a443ac5a5022e6c" dependencies = [ "serde", "static_assertions", @@ -2972,10 +2881,31 @@ dependencies = [ ] [[package]] +name = "zerocopy" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +dependencies = [ + "byteorder", + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.73", +] + +[[package]] name = "zeroize" -version = "1.6.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" dependencies = [ "zeroize_derive", ] @@ -2988,18 +2918,17 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.73", ] [[package]] name = "zvariant" -version = "3.15.0" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44b291bee0d960c53170780af148dca5fa260a63cdd24f1962fa82e03e53338c" +checksum = "2084290ab9a1c471c38fc524945837734fbf124487e105daec2bb57fd48c81fe" dependencies = [ - "byteorder", + "endi", "enumflags2", - "libc", "serde", "static_assertions", "url", @@ -3008,24 +2937,24 @@ dependencies = [ [[package]] name = "zvariant_derive" -version = "3.15.0" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "934d7a7dfc310d6ee06c87ffe88ef4eca7d3e37bb251dece2ef93da8f17d8ecd" +checksum = "73e2ba546bda683a90652bac4a279bc146adad1386f25379cf73200d2002c449" dependencies = [ - "proc-macro-crate 1.3.1", + "proc-macro-crate", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.73", "zvariant_utils", ] [[package]] name = "zvariant_utils" -version = "1.0.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7234f0d811589db492d16893e3f21e8e2fd282e6d01b0cddee310322062cc200" +checksum = "c51bcff7cc3dbb5055396bcf774748c3dab426b4b8659046963523cee4808340" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.73", ] diff --git a/pkgs/applications/virtualization/pods/default.nix b/pkgs/applications/virtualization/pods/default.nix index 65fb88824497f..201fcf89988bc 100644 --- a/pkgs/applications/virtualization/pods/default.nix +++ b/pkgs/applications/virtualization/pods/default.nix @@ -19,26 +19,19 @@ stdenv.mkDerivation rec { pname = "pods"; - version = "2.0.0"; + version = "2.0.1-unstable-2024-08-11"; src = fetchFromGitHub { owner = "marhkb"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-jSN4WmyzYARhDkwAtTYD4iXNTM1QQbAAwQ/ICHg7k3k="; + rev = "146a85b4860375ac0a5be8d7be57fb12753a3c42"; + sha256 = "sha256-KaS38XC+V3jRPPTnI4UqMc9KGAC7INHMu47LVo9YP44="; }; cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; outputHashes = { - "ashpd-0.6.0" = "sha256-kLacOwMZ4MQlFYCx5J4kI4J+a9fVRF5Ii/AkWOL/TNQ="; - "cairo-rs-0.19.0" = "sha256-8s+ngacR7d2wb1FKYf0pycxMQbgW63zMKpMgaUs2e+c="; - "gdk4-0.8.0" = "sha256-o9HC4VX6ntPk0JXAX5Whhu0qlUdpPky/1PNrRd9zjdk="; - "libadwaita-0.6.0" = "sha256-3Kge7SIE+vex/uOIt7hjmU68jidkBjrW96o24hu3e/U="; - "libpanel-0.3.0" = "sha256-LA8ynd+7imEdQwvLslmKw+pPNbAEle9fZ2sFuyRY/jU="; "podman-api-0.10.0" = "sha256-nbxK/U5G+PlbytpHdr63x/C69hBgedPXBFfgdzT9fdc="; - "sourceview5-0.8.0" = "sha256-+f+mm682H4eRC7Xzx5wukecDZq+hMpJQ3+3xHzG00Go="; - "vte4-0.8.0" = "sha256-KZBpfSAngbp5czAXdKA7Au5uYqs2L5MyNsnXcBH77lo="; }; }; diff --git a/pkgs/applications/virtualization/qboot/default.nix b/pkgs/applications/virtualization/qboot/default.nix index f5a1e13410b98..e0d833d0c2d50 100644 --- a/pkgs/applications/virtualization/qboot/default.nix +++ b/pkgs/applications/virtualization/qboot/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { description = "Simple x86 firmware for booting Linux"; homepage = "https://github.com/bonzini/qboot"; license = lib.licenses.gpl2; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; platforms = [ "x86_64-linux" "i686-linux" ]; }; } diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 982eee2cbb1fc..8625069da8b19 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -1,52 +1,67 @@ -{ lib, stdenv, fetchurl, fetchpatch, python3Packages, zlib, pkg-config, glib, buildPackages -, pixman, vde2, alsa-lib, texinfo, flex +{ lib, stdenv, fetchurl, fetchpatch, python3Packages, zlib, pkg-config, glib, overrideSDK, buildPackages +, pixman, vde2, alsa-lib, flex, pcre2 , bison, lzo, snappy, libaio, libtasn1, gnutls, nettle, curl, dtc, ninja, meson , sigtool , makeWrapper, removeReferencesTo , attr, libcap, libcap_ng, socat, libslirp -, CoreServices, Cocoa, Hypervisor, rez, setfile, vmnet -, guestAgentSupport ? (with stdenv.hostPlatform; isLinux || isNetBSD || isOpenBSD || isSunOS || isWindows) && !toolsOnly -, numaSupport ? stdenv.isLinux && !stdenv.isAarch32 && !toolsOnly, numactl -, seccompSupport ? stdenv.isLinux && !toolsOnly, libseccomp -, alsaSupport ? lib.hasSuffix "linux" stdenv.hostPlatform.system && !nixosTestRunner && !toolsOnly -, pulseSupport ? !stdenv.isDarwin && !nixosTestRunner && !toolsOnly, libpulseaudio -, pipewireSupport ? !stdenv.isDarwin && !nixosTestRunner && !toolsOnly, pipewire -, sdlSupport ? !stdenv.isDarwin && !nixosTestRunner && !toolsOnly, SDL2, SDL2_image -, jackSupport ? !stdenv.isDarwin && !nixosTestRunner && !toolsOnly, libjack2 -, gtkSupport ? !stdenv.isDarwin && !xenSupport && !nixosTestRunner && !toolsOnly, gtk3, gettext, vte, wrapGAppsHook3 -, vncSupport ? !nixosTestRunner && !toolsOnly, libjpeg, libpng -, smartcardSupport ? !nixosTestRunner && !toolsOnly, libcacard -, spiceSupport ? true && !nixosTestRunner && !toolsOnly, spice, spice-protocol -, ncursesSupport ? !nixosTestRunner && !toolsOnly, ncurses +, CoreServices, Cocoa, Hypervisor, Kernel, rez, setfile, vmnet +, guestAgentSupport ? (with stdenv.hostPlatform; isLinux || isNetBSD || isOpenBSD || isSunOS || isWindows) && !minimal +, numaSupport ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAarch32 && !minimal, numactl +, seccompSupport ? stdenv.hostPlatform.isLinux && !minimal, libseccomp +, alsaSupport ? lib.hasSuffix "linux" stdenv.hostPlatform.system && !nixosTestRunner && !minimal +, pulseSupport ? !stdenv.hostPlatform.isDarwin && !nixosTestRunner && !minimal, libpulseaudio +, pipewireSupport ? !stdenv.hostPlatform.isDarwin && !nixosTestRunner && !minimal, pipewire +, sdlSupport ? !stdenv.hostPlatform.isDarwin && !nixosTestRunner && !minimal, SDL2, SDL2_image +, jackSupport ? !stdenv.hostPlatform.isDarwin && !nixosTestRunner && !minimal, libjack2 +, gtkSupport ? !stdenv.hostPlatform.isDarwin && !xenSupport && !nixosTestRunner && !minimal, gtk3, gettext, vte, wrapGAppsHook3 +, vncSupport ? !nixosTestRunner && !minimal, libjpeg, libpng +, smartcardSupport ? !nixosTestRunner && !minimal, libcacard +, spiceSupport ? true && !nixosTestRunner && !minimal, spice, spice-protocol +, ncursesSupport ? !nixosTestRunner && !minimal, ncurses , usbredirSupport ? spiceSupport, usbredir , xenSupport ? false, xen , cephSupport ? false, ceph , glusterfsSupport ? false, glusterfs, libuuid , openGLSupport ? sdlSupport, mesa, libepoxy, libdrm -, rutabagaSupport ? openGLSupport && !toolsOnly && lib.meta.availableOn stdenv.hostPlatform rutabaga_gfx, rutabaga_gfx +, rutabagaSupport ? openGLSupport && !minimal && lib.meta.availableOn stdenv.hostPlatform rutabaga_gfx, rutabaga_gfx , virglSupport ? openGLSupport, virglrenderer -, libiscsiSupport ? !toolsOnly, libiscsi +, libiscsiSupport ? !minimal, libiscsi , smbdSupport ? false, samba -, tpmSupport ? !toolsOnly -, uringSupport ? stdenv.isLinux, liburing -, canokeySupport ? !toolsOnly, canokey-qemu -, capstoneSupport ? !toolsOnly, capstone -, enableDocs ? true +, tpmSupport ? !minimal +, uringSupport ? stdenv.hostPlatform.isLinux && !userOnly, liburing +, canokeySupport ? !minimal, canokey-qemu +, capstoneSupport ? !minimal, capstone +, pluginsSupport ? !stdenv.hostPlatform.isStatic +, enableDocs ? !minimal || toolsOnly +, enableTools ? !minimal || toolsOnly +, enableBlobs ? !minimal || toolsOnly , hostCpuOnly ? false , hostCpuTargets ? (if toolsOnly then [ ] else if hostCpuOnly - then (lib.optional stdenv.isx86_64 "i386-softmmu" + then (lib.optional stdenv.hostPlatform.isx86_64 "i386-softmmu" ++ ["${stdenv.hostPlatform.qemuArch}-softmmu"]) else null) , nixosTestRunner ? false , toolsOnly ? false +, userOnly ? false +, minimal ? toolsOnly || userOnly , gitUpdater , qemu-utils # for tests attribute }: let hexagonSupport = hostCpuTargets == null || lib.elem "hexagon" hostCpuTargets; + + buildPlatformStdenv = + if stdenv.buildPlatform.isDarwin then + overrideSDK buildPackages.stdenv { + # Keep these values in sync with `all-packages.nix`. + darwinSdkVersion = "12.3"; + darwinMinVersion = "12.0"; + } + else + buildPackages.stdenv; in stdenv.mkDerivation (finalAttrs: { @@ -54,34 +69,37 @@ stdenv.mkDerivation (finalAttrs: { + lib.optionalString xenSupport "-xen" + lib.optionalString hostCpuOnly "-host-cpu-only" + lib.optionalString nixosTestRunner "-for-vm-tests" - + lib.optionalString toolsOnly "-utils"; - version = "9.0.1"; + + lib.optionalString toolsOnly "-utils" + + lib.optionalString userOnly "-user"; + version = "9.1.0"; src = fetchurl { url = "https://download.qemu.org/qemu-${finalAttrs.version}.tar.xz"; - hash = "sha256-0PTbD70VHAzxb4SusqUA9ulQCXMlRvRNr6uNIEm7uAU="; + hash = "sha256-gWtwIqi6fCrDDi4M+XPoJva8yFBTOWAyEsXt6OlNeDQ="; }; - depsBuildBuild = [ buildPackages.stdenv.cc ] + depsBuildBuild = [ buildPlatformStdenv.cc ] ++ lib.optionals hexagonSupport [ pkg-config ]; nativeBuildInputs = [ makeWrapper removeReferencesTo - pkg-config flex bison dtc meson ninja + pkg-config flex bison meson ninja # Don't change this to python3 and python3.pkgs.*, breaks cross-compilation - python3Packages.python python3Packages.sphinx python3Packages.sphinx-rtd-theme + python3Packages.python ] ++ lib.optionals gtkSupport [ wrapGAppsHook3 ] + ++ lib.optionals enableDocs [ python3Packages.sphinx python3Packages.sphinx-rtd-theme ] ++ lib.optionals hexagonSupport [ glib ] - ++ lib.optionals stdenv.isDarwin [ sigtool ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ sigtool ] + ++ lib.optionals (!userOnly) [ dtc ]; - buildInputs = [ dtc zlib glib pixman - vde2 texinfo lzo snappy libtasn1 + buildInputs = [ zlib glib pixman + vde2 lzo snappy libtasn1 gnutls nettle curl libslirp ] ++ lib.optionals ncursesSupport [ ncurses ] - ++ lib.optionals stdenv.isDarwin [ CoreServices Cocoa Hypervisor rez setfile vmnet ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices Cocoa Hypervisor Kernel rez setfile vmnet ] ++ lib.optionals seccompSupport [ libseccomp ] ++ lib.optionals numaSupport [ numactl ] ++ lib.optionals alsaSupport [ alsa-lib ] @@ -94,7 +112,8 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals smartcardSupport [ libcacard ] ++ lib.optionals spiceSupport [ spice-protocol spice ] ++ lib.optionals usbredirSupport [ usbredir ] - ++ lib.optionals stdenv.isLinux [ libaio libcap_ng libcap attr ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ libcap_ng libcap attr ] + ++ lib.optionals (stdenv.hostPlatform.isLinux && !userOnly) [ libaio ] ++ lib.optionals xenSupport [ xen ] ++ lib.optionals cephSupport [ ceph ] ++ lib.optionals glusterfsSupport [ glusterfs libuuid ] @@ -105,28 +124,19 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals smbdSupport [ samba ] ++ lib.optionals uringSupport [ liburing ] ++ lib.optionals canokeySupport [ canokey-qemu ] - ++ lib.optionals capstoneSupport [ capstone ]; + ++ lib.optionals capstoneSupport [ capstone ] + ++ lib.optionals (!userOnly) [ dtc ]; dontUseMesonConfigure = true; # meson's configurePhase isn't compatible with qemu build + dontAddStaticConfigureFlags = true; outputs = [ "out" ] ++ lib.optional guestAgentSupport "ga"; # On aarch64-linux we would shoot over the Hydra's 2G output limit. - separateDebugInfo = !(stdenv.isAarch64 && stdenv.isLinux); + separateDebugInfo = !(stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux); patches = [ ./fix-qemu-ga.patch - # QEMU upstream does not demand compatibility to pre-10.13, so 9p-darwin - # support on nix requires utimensat fallback. The patch adding this fallback - # set was removed during the process of upstreaming this functionality, and - # will still be needed in nix until the macOS SDK reaches 10.13+. - ./provide-fallback-for-utimensat.patch - # Cocoa clipboard support only works on macOS 10.14+ - ./revert-ui-cocoa-add-clipboard-support.patch - # Standard about panel requires AppKit and macOS 10.13+ - ./revert-ui-cocoa-use-the-standard-about-panel.patch - # Safe area insets require macOS 11+ - ./remove-ui-cocoa-use-safe-area-insets.patch # Workaround for upstream issue with nested virtualisation: https://gitlab.com/qemu-project/qemu/-/issues/1008 (fetchpatch { url = "https://gitlab.com/qemu-project/qemu/-/commit/3e4546d5bd38a1e98d4bd2de48631abf0398a3a2.diff"; @@ -158,7 +168,7 @@ stdenv.mkDerivation (finalAttrs: { configureFlags = [ "--disable-strip" # We'll strip ourselves after separating debug info. (lib.enableFeature enableDocs "docs") - "--enable-tools" + (lib.enableFeature enableTools "tools") "--localstatedir=/var" "--sysconfdir=/etc" "--cross-prefix=${stdenv.cc.targetPrefix}" @@ -169,8 +179,8 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional spiceSupport "--enable-spice" ++ lib.optional usbredirSupport "--enable-usb-redir" ++ lib.optional (hostCpuTargets != null) "--target-list=${lib.concatStringsSep "," hostCpuTargets}" - ++ lib.optionals stdenv.isDarwin [ "--enable-cocoa" "--enable-hvf" ] - ++ lib.optional stdenv.isLinux "--enable-linux-aio" + ++ lib.optionals stdenv.hostPlatform.isDarwin [ "--enable-cocoa" "--enable-hvf" ] + ++ lib.optional (stdenv.hostPlatform.isLinux && !userOnly) "--enable-linux-aio" ++ lib.optional gtkSupport "--enable-gtk" ++ lib.optional xenSupport "--enable-xen" ++ lib.optional cephSupport "--enable-rbd" @@ -182,7 +192,11 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional smbdSupport "--smbd=${samba}/bin/smbd" ++ lib.optional uringSupport "--enable-linux-io-uring" ++ lib.optional canokeySupport "--enable-canokey" - ++ lib.optional capstoneSupport "--enable-capstone"; + ++ lib.optional capstoneSupport "--enable-capstone" + ++ lib.optional (!pluginsSupport) "--disable-plugins" + ++ lib.optional (!enableBlobs) "--disable-install-blobs" + ++ lib.optional userOnly "--disable-system" + ++ lib.optional stdenv.hostPlatform.isStatic "--static"; dontWrapGApps = true; @@ -190,7 +204,7 @@ stdenv.mkDerivation (finalAttrs: { # voiding the entitlements and making it non-operational. # The alternative is to re-sign with entitlements after stripping: # * https://github.com/qemu/qemu/blob/v6.1.0/scripts/entitlement.sh#L25 - dontStrip = stdenv.isDarwin; + dontStrip = stdenv.hostPlatform.isDarwin; postFixup = '' # the .desktop is both invalid and pointless @@ -206,6 +220,11 @@ stdenv.mkDerivation (finalAttrs: { for f in $out/bin/qemu-system-*; do wrapGApp $f done + '' + lib.optionalString stdenv.hostPlatform.isStatic '' + # HACK: Otherwise the result will have the entire buildInputs closure + # injected by the pkgsStatic stdenv + # <https://github.com/NixOS/nixpkgs/issues/83667> + rm -f $out/nix-support/propagated-build-inputs ''; preBuild = "cd build"; @@ -241,7 +260,7 @@ stdenv.mkDerivation (finalAttrs: { # xattrs are not allowed in the sandbox substituteInPlace ../tests/qtest/virtio-9p-test.c \ --replace-fail mapped-xattr mapped-file - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' # skip test that stalls on darwin, perhaps due to subtle differences # in fifo behaviour substituteInPlace ../tests/unit/meson.build \ @@ -249,7 +268,7 @@ stdenv.mkDerivation (finalAttrs: { ''; # Add a ‘qemu-kvm’ wrapper for compatibility/convenience. - postInstall = lib.optionalString (!toolsOnly) '' + postInstall = lib.optionalString (!minimal) '' ln -s $out/bin/qemu-system-${stdenv.hostPlatform.qemuArch} $out/bin/qemu-kvm ''; @@ -274,11 +293,17 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://www.qemu.org/"; description = "Generic and open source machine emulator and virtualizer"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ eelco qyliss ]; + maintainers = with maintainers; [ qyliss ] ++ lib.optionals xenSupport xen.meta.maintainers; platforms = platforms.unix; } # toolsOnly: Does not have qemu-kvm and there's no main support tool - // lib.optionalAttrs (!toolsOnly) { + # userOnly: There's one qemu-<arch> for every architecture + // lib.optionalAttrs (!toolsOnly && !userOnly) { mainProgram = "qemu-kvm"; + } + # userOnly: https://qemu.readthedocs.io/en/v9.0.2/user/main.html + // lib.optionalAttrs userOnly { + platforms = with platforms; (linux ++ freebsd ++ openbsd ++ netbsd); + description = "QEMU User space emulator - launch executables compiled for one CPU on another CPU"; }; }) diff --git a/pkgs/applications/virtualization/qemu/fix-qemu-ga.patch b/pkgs/applications/virtualization/qemu/fix-qemu-ga.patch index 94dec69168002..9a4a7f0d432ee 100644 --- a/pkgs/applications/virtualization/qemu/fix-qemu-ga.patch +++ b/pkgs/applications/virtualization/qemu/fix-qemu-ga.patch @@ -1,36 +1,45 @@ -diff --git i/qga/commands-posix.c w/qga/commands-posix.c -index 954efed01b..39c4b916ce 100644 ---- i/qga/commands-posix.c -+++ w/qga/commands-posix.c -@@ -123,6 +123,8 @@ void qmp_guest_shutdown(bool has_mode, const char *mode, Error **errp) - execl("/sbin/shutdown", "shutdown", shutdown_flag, "-g0", "-y", - "hypervisor initiated shutdown", (char *)NULL); - #else -+ execl("/run/current-system/sw/bin/shutdown", "shutdown", "-h", shutdown_flag, "+0", -+ "hypervisor initiated shutdown", (char *)NULL); - execl("/sbin/shutdown", "shutdown", "-h", shutdown_flag, "+0", - "hypervisor initiated shutdown", (char *)NULL); - #endif -@@ -158,11 +160,13 @@ void qmp_guest_set_time(bool has_time, int64_t time_ns, Error **errp) - pid_t pid; - Error *local_err = NULL; - struct timeval tv; -+ static const char hwclock_path_nix[] = "/run/current-system/sw/bin/hwclock"; - static const char hwclock_path[] = "/sbin/hwclock"; - static int hwclock_available = -1; - - if (hwclock_available < 0) { -- hwclock_available = (access(hwclock_path, X_OK) == 0); -+ hwclock_available = (access(hwclock_path_nix, X_OK) == 0) || -+ (access(hwclock_path, X_OK) == 0); +diff --git a/qga/commands-posix.c b/qga/commands-posix.c +index c2bd0b4316..47cee1c351 100644 +--- a/qga/commands-posix.c ++++ b/qga/commands-posix.c +@@ -246,7 +246,7 @@ void qmp_guest_shutdown(const char *mode, Error **errp) + return; } - if (!hwclock_available) { -@@ -208,6 +212,7 @@ void qmp_guest_set_time(bool has_time, int64_t time_ns, Error **errp) +- const char *argv[] = {"/sbin/shutdown", ++ const char *argv[] = {"/run/current-system/sw/bin/shutdown", + #ifdef CONFIG_SOLARIS + shutdown_flag, "-g0", "-y", + #elif defined(CONFIG_BSD) +@@ -257,6 +257,10 @@ void qmp_guest_shutdown(const char *mode, Error **errp) + "hypervisor initiated shutdown", (char *) NULL}; + + ga_run_command(argv, NULL, "shutdown", &local_err); ++ if (local_err) { ++ argv[0] = "/sbin/shutdown"; ++ ga_run_command(argv, NULL, "shutdown", &local_err); ++ } + if (local_err) { + error_propagate(errp, local_err); + return; +@@ -270,7 +274,7 @@ void qmp_guest_set_time(bool has_time, int64_t time_ns, Error **errp) + int ret; + Error *local_err = NULL; + struct timeval tv; +- const char *argv[] = {"/sbin/hwclock", has_time ? "-w" : "-s", NULL}; ++ const char *argv[] = {"/run/current-system/sw/bin/hwclock", has_time ? "-w" : "-s", NULL}; - /* Use '/sbin/hwclock -w' to set RTC from the system time, - * or '/sbin/hwclock -s' to set the system time from RTC. */ -+ execl(hwclock_path_nix, "hwclock", has_time ? "-w" : "-s", NULL); - execl(hwclock_path, "hwclock", has_time ? "-w" : "-s", NULL); - _exit(EXIT_FAILURE); - } else if (pid < 0) { + /* If user has passed a time, validate and set it. */ + if (has_time) { +@@ -303,6 +307,11 @@ void qmp_guest_set_time(bool has_time, int64_t time_ns, Error **errp) + * hardware clock (RTC). */ + ga_run_command(argv, NULL, "set hardware clock to system time", + &local_err); ++ if (local_err) { ++ argv[0] = "/sbin/hwclock"; ++ ga_run_command(argv, NULL, "set hardware clock to system time", ++ &local_err); ++ } + if (local_err) { + error_propagate(errp, local_err); + return; diff --git a/pkgs/applications/virtualization/qemu/provide-fallback-for-utimensat.patch b/pkgs/applications/virtualization/qemu/provide-fallback-for-utimensat.patch deleted file mode 100644 index dc4f4abb27383..0000000000000 --- a/pkgs/applications/virtualization/qemu/provide-fallback-for-utimensat.patch +++ /dev/null @@ -1,189 +0,0 @@ -From 2ec149ea3f0046fa83e3be74aca192649a60be47 Mon Sep 17 00:00:00 2001 -From: Keno Fischer <keno@juliacomputing.com> -Date: Sat, 16 Jun 2018 20:56:54 -0400 -Subject: [PATCH] 9p: darwin: Provide fallback impl for utimensat - -This function is new in Mac OS 10.13. Provide a fallback implementation -when building against older SDKs. The complication in the definition comes -having to separately handle the used SDK version and the target OS version. - -- If the SDK version is too low (__MAC_10_13 not defined), utimensat is not - defined in the header, so we must not try to use it (doing so would error). -- Otherwise, if the targetted OS version is at least 10.13, we know this - function is available, so we can unconditionally call it. -- Lastly, we check for the availability of the __builtin_available macro to - potentially insert a dynamic check for this OS version. However, __builtin_available - is only available with sufficiently recent versions of clang and while all - Apple clang versions that ship with Xcode versions that support the 10.13 - SDK support with builtin, we want to allow building with compilers other - than Apple clang that may not support this builtin. - -Signed-off-by: Keno Fischer <keno@juliacomputing.com> -Signed-off-by: Michael Roitzsch <reactorcontrol@icloud.com> -Signed-off-by: Will Cohen <wwcohen@gmail.com> ---- - hw/9pfs/9p-local.c | 2 +- - hw/9pfs/9p-util-darwin.c | 96 ++++++++++++++++++++++++++++++++++++++++ - hw/9pfs/9p-util-linux.c | 6 +++ - hw/9pfs/9p-util.h | 8 ++++ - 4 files changed, 111 insertions(+), 1 deletion(-) - -diff --git a/hw/9pfs/9p-local.c b/hw/9pfs/9p-local.c -index 9d07620235..9c77a431d5 100644 ---- a/hw/9pfs/9p-local.c -+++ b/hw/9pfs/9p-local.c -@@ -1081,7 +1081,7 @@ static int local_utimensat(FsContext *s, V9fsPath *fs_path, - goto out; - } - -- ret = qemu_utimensat(dirfd, name, buf, AT_SYMLINK_NOFOLLOW); -+ ret = utimensat_nofollow(dirfd, name, buf); - close_preserve_errno(dirfd); - out: - g_free(dirpath); -diff --git a/hw/9pfs/9p-util-darwin.c b/hw/9pfs/9p-util-darwin.c -index 95146e7354..74ab2a7f99 100644 ---- a/hw/9pfs/9p-util-darwin.c -+++ b/hw/9pfs/9p-util-darwin.c -@@ -145,3 +145,99 @@ int qemu_mknodat(int dirfd, const char *filename, mode_t mode, dev_t dev) - } - - #endif -+ -+#ifndef __has_builtin -+#define __has_builtin(x) 0 -+#endif -+ -+static int update_times_from_stat(int fd, struct timespec times[2], -+ int update0, int update1) -+{ -+ struct stat buf; -+ int ret = fstat(fd, &buf); -+ if (ret == -1) { -+ return ret; -+ } -+ if (update0) { -+ times[0] = buf.st_atimespec; -+ } -+ if (update1) { -+ times[1] = buf.st_mtimespec; -+ } -+ return 0; -+} -+ -+int utimensat_nofollow(int dirfd, const char *filename, -+ const struct timespec times_in[2]) -+{ -+ int ret, fd; -+ int special0, special1; -+ struct timeval futimes_buf[2]; -+ struct timespec times[2]; -+ memcpy(times, times_in, 2 * sizeof(struct timespec)); -+ -+/* Check whether we have an SDK version that defines utimensat */ -+#if defined(__MAC_10_13) -+# if __MAC_OS_X_VERSION_MIN_REQUIRED >= __MAC_10_13 -+# define UTIMENSAT_AVAILABLE 1 -+# elif __has_builtin(__builtin_available) -+# define UTIMENSAT_AVAILABLE __builtin_available(macos 10.13, *) -+# else -+# define UTIMENSAT_AVAILABLE 0 -+# endif -+ if (UTIMENSAT_AVAILABLE) { -+ return utimensat(dirfd, filename, times, AT_SYMLINK_NOFOLLOW); -+ } -+#endif -+ -+ /* utimensat not available. Use futimes. */ -+ fd = openat_file(dirfd, filename, O_PATH_9P_UTIL | O_NOFOLLOW, 0); -+ if (fd == -1) { -+ return -1; -+ } -+ -+ special0 = times[0].tv_nsec == UTIME_OMIT; -+ special1 = times[1].tv_nsec == UTIME_OMIT; -+ if (special0 || special1) { -+ /* If both are set, nothing to do */ -+ if (special0 && special1) { -+ ret = 0; -+ goto done; -+ } -+ -+ ret = update_times_from_stat(fd, times, special0, special1); -+ if (ret < 0) { -+ goto done; -+ } -+ } -+ -+ special0 = times[0].tv_nsec == UTIME_NOW; -+ special1 = times[1].tv_nsec == UTIME_NOW; -+ if (special0 || special1) { -+ ret = futimes(fd, NULL); -+ if (ret < 0) { -+ goto done; -+ } -+ -+ /* If both are set, we are done */ -+ if (special0 && special1) { -+ ret = 0; -+ goto done; -+ } -+ -+ ret = update_times_from_stat(fd, times, special0, special1); -+ if (ret < 0) { -+ goto done; -+ } -+ } -+ -+ futimes_buf[0].tv_sec = times[0].tv_sec; -+ futimes_buf[0].tv_usec = times[0].tv_nsec / 1000; -+ futimes_buf[1].tv_sec = times[1].tv_sec; -+ futimes_buf[1].tv_usec = times[1].tv_nsec / 1000; -+ ret = futimes(fd, futimes_buf); -+ -+done: -+ close_preserve_errno(fd); -+ return ret; -+} -diff --git a/hw/9pfs/9p-util-linux.c b/hw/9pfs/9p-util-linux.c -index db451b0784..320697f347 100644 ---- a/hw/9pfs/9p-util-linux.c -+++ b/hw/9pfs/9p-util-linux.c -@@ -68,3 +68,9 @@ int qemu_mknodat(int dirfd, const char *filename, mode_t mode, dev_t dev) - { - return mknodat(dirfd, filename, mode, dev); - } -+ -+int utimensat_nofollow(int dirfd, const char *filename, -+ const struct timespec times[2]) -+{ -+ return utimensat(dirfd, filename, times, AT_SYMLINK_NOFOLLOW); -+} -diff --git a/hw/9pfs/9p-util.h b/hw/9pfs/9p-util.h -index c314cf381d..12d57f3398 100644 ---- a/hw/9pfs/9p-util.h -+++ b/hw/9pfs/9p-util.h -@@ -101,6 +101,12 @@ static inline int errno_to_dotl(int err) { - #define qemu_utimensat utimensat - #define qemu_unlinkat unlinkat - -+/* Compatibility with old SDK Versions for Darwin */ -+#if defined(CONFIG_DARWIN) && !defined(UTIME_NOW) -+#define UTIME_NOW -1 -+#define UTIME_OMIT -2 -+#endif -+ - static inline void close_preserve_errno(int fd) - { - int serrno = errno; -@@ -163,6 +169,8 @@ ssize_t flistxattrat_nofollow(int dirfd, const char *filename, - char *list, size_t size); - ssize_t fremovexattrat_nofollow(int dirfd, const char *filename, - const char *name); -+int utimensat_nofollow(int dirfd, const char *filename, -+ const struct timespec times[2]); - - /* - * Darwin has d_seekoff, which appears to function similarly to d_off. --- -2.39.2 diff --git a/pkgs/applications/virtualization/qemu/remove-ui-cocoa-use-safe-area-insets.patch b/pkgs/applications/virtualization/qemu/remove-ui-cocoa-use-safe-area-insets.patch deleted file mode 100644 index 2a8430afaa705..0000000000000 --- a/pkgs/applications/virtualization/qemu/remove-ui-cocoa-use-safe-area-insets.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/ui/cocoa.m b/ui/cocoa.m -index 25e0db9dd0..7ce889d798 100644 ---- a/ui/cocoa.m -+++ b/ui/cocoa.m -@@ -539,9 +539,6 @@ - (NSSize)fixAspectRatio:(NSSize)max - - (NSSize) screenSafeAreaSize - { - NSSize size = [[[self window] screen] frame].size; -- NSEdgeInsets insets = [[[self window] screen] safeAreaInsets]; -- size.width -= insets.left + insets.right; -- size.height -= insets.top + insets.bottom; - return size; - } - diff --git a/pkgs/applications/virtualization/qemu/revert-ui-cocoa-add-clipboard-support.patch b/pkgs/applications/virtualization/qemu/revert-ui-cocoa-add-clipboard-support.patch deleted file mode 100644 index c429bce03dcf6..0000000000000 --- a/pkgs/applications/virtualization/qemu/revert-ui-cocoa-add-clipboard-support.patch +++ /dev/null @@ -1,200 +0,0 @@ -Based on a reversion of upstream 7e3e20d89129614f4a7b2451fe321cc6ccca3b76, -adapted for 7.2.0 - -diff --git a/include/ui/clipboard.h b/include/ui/clipboard.h -index ce76aa451f..c4e1dc4ff4 100644 ---- a/include/ui/clipboard.h -+++ b/include/ui/clipboard.h -@@ -269,7 +269,7 @@ void qemu_clipboard_set_data(QemuClipboardPeer *peer, - QemuClipboardInfo *info, - QemuClipboardType type, - uint32_t size, -- const void *data, -+ void *data, - bool update); - - G_DEFINE_AUTOPTR_CLEANUP_FUNC(QemuClipboardInfo, qemu_clipboard_info_unref) -diff --git a/ui/clipboard.c b/ui/clipboard.c -index 3d14bffaf8..2c3f4c3ba0 100644 ---- a/ui/clipboard.c -+++ b/ui/clipboard.c -@@ -154,7 +154,7 @@ void qemu_clipboard_set_data(QemuClipboardPeer *peer, - QemuClipboardInfo *info, - QemuClipboardType type, - uint32_t size, -- const void *data, -+ void *data, - bool update) - { - if (!info || -diff --git a/ui/cocoa.m b/ui/cocoa.m -index 660d3e0935..0e6760c360 100644 ---- a/ui/cocoa.m -+++ b/ui/cocoa.m -@@ -29,7 +29,6 @@ - - #include "qemu/help-texts.h" - #include "qemu-main.h" --#include "ui/clipboard.h" - #include "ui/console.h" - #include "ui/input.h" - #include "ui/kbd-state.h" -@@ -105,10 +104,6 @@ static void cocoa_switch(DisplayChangeListener *dcl, - - static bool allow_events; - --static NSInteger cbchangecount = -1; --static QemuClipboardInfo *cbinfo; --static QemuEvent cbevent; -- - // Utility functions to run specified code block with the BQL held - typedef void (^CodeBlock)(void); - typedef bool (^BoolCodeBlock)(void); -@@ -1799,107 +1794,6 @@ static void addRemovableDevicesMenuItems(void) - qapi_free_BlockInfoList(pointerToFree); - } - --@interface QemuCocoaPasteboardTypeOwner : NSObject<NSPasteboardTypeOwner> --@end -- --@implementation QemuCocoaPasteboardTypeOwner -- --- (void)pasteboard:(NSPasteboard *)sender provideDataForType:(NSPasteboardType)type --{ -- if (type != NSPasteboardTypeString) { -- return; -- } -- -- with_bql(^{ -- QemuClipboardInfo *info = qemu_clipboard_info_ref(cbinfo); -- qemu_event_reset(&cbevent); -- qemu_clipboard_request(info, QEMU_CLIPBOARD_TYPE_TEXT); -- -- while (info == cbinfo && -- info->types[QEMU_CLIPBOARD_TYPE_TEXT].available && -- info->types[QEMU_CLIPBOARD_TYPE_TEXT].data == NULL) { -- bql_unlock(); -- qemu_event_wait(&cbevent); -- bql_lock(); -- } -- -- if (info == cbinfo) { -- NSData *data = [[NSData alloc] initWithBytes:info->types[QEMU_CLIPBOARD_TYPE_TEXT].data -- length:info->types[QEMU_CLIPBOARD_TYPE_TEXT].size]; -- [sender setData:data forType:NSPasteboardTypeString]; -- [data release]; -- } -- -- qemu_clipboard_info_unref(info); -- }); --} -- --@end -- --static QemuCocoaPasteboardTypeOwner *cbowner; -- --static void cocoa_clipboard_notify(Notifier *notifier, void *data); --static void cocoa_clipboard_request(QemuClipboardInfo *info, -- QemuClipboardType type); -- --static QemuClipboardPeer cbpeer = { -- .name = "cocoa", -- .notifier = { .notify = cocoa_clipboard_notify }, -- .request = cocoa_clipboard_request --}; -- --static void cocoa_clipboard_update_info(QemuClipboardInfo *info) --{ -- if (info->owner == &cbpeer || info->selection != QEMU_CLIPBOARD_SELECTION_CLIPBOARD) { -- return; -- } -- -- if (info != cbinfo) { -- NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init]; -- qemu_clipboard_info_unref(cbinfo); -- cbinfo = qemu_clipboard_info_ref(info); -- cbchangecount = [[NSPasteboard generalPasteboard] declareTypes:@[NSPasteboardTypeString] owner:cbowner]; -- [pool release]; -- } -- -- qemu_event_set(&cbevent); --} -- --static void cocoa_clipboard_notify(Notifier *notifier, void *data) --{ -- QemuClipboardNotify *notify = data; -- -- switch (notify->type) { -- case QEMU_CLIPBOARD_UPDATE_INFO: -- cocoa_clipboard_update_info(notify->info); -- return; -- case QEMU_CLIPBOARD_RESET_SERIAL: -- /* ignore */ -- return; -- } --} -- --static void cocoa_clipboard_request(QemuClipboardInfo *info, -- QemuClipboardType type) --{ -- NSAutoreleasePool *pool; -- NSData *text; -- -- switch (type) { -- case QEMU_CLIPBOARD_TYPE_TEXT: -- pool = [[NSAutoreleasePool alloc] init]; -- text = [[NSPasteboard generalPasteboard] dataForType:NSPasteboardTypeString]; -- if (text) { -- qemu_clipboard_set_data(&cbpeer, info, type, -- [text length], [text bytes], true); -- } -- [pool release]; -- break; -- default: -- break; -- } --} -- - /* - * The startup process for the OSX/Cocoa UI is complicated, because - * OSX insists that the UI runs on the initial main thread, and so we -@@ -1922,7 +1816,6 @@ static void cocoa_clipboard_request(QemuClipboardInfo *info, - status = qemu_default_main(); - qemu_mutex_unlock_iothread(); - COCOA_DEBUG("Second thread: qemu_default_main() returned, exiting\n"); -- [cbowner release]; - exit(status); - } - -@@ -2003,18 +1896,6 @@ static void cocoa_refresh(DisplayChangeListener *dcl) - [cocoaView setAbsoluteEnabled:YES]; - }); - } -- -- if (cbchangecount != [[NSPasteboard generalPasteboard] changeCount]) { -- qemu_clipboard_info_unref(cbinfo); -- cbinfo = qemu_clipboard_info_new(&cbpeer, QEMU_CLIPBOARD_SELECTION_CLIPBOARD); -- if ([[NSPasteboard generalPasteboard] availableTypeFromArray:@[NSPasteboardTypeString]]) { -- cbinfo->types[QEMU_CLIPBOARD_TYPE_TEXT].available = true; -- } -- qemu_clipboard_update(cbinfo); -- cbchangecount = [[NSPasteboard generalPasteboard] changeCount]; -- qemu_event_set(&cbevent); -- } -- - [pool release]; - } - -@@ -2071,12 +1952,6 @@ static void cocoa_display_init(DisplayState *ds, DisplayOptions *opts) - // register vga output callbacks - register_displaychangelistener(&dcl); - [cocoaView updateUIInfo]; -- -- qemu_event_init(&cbevent, false); -- cbowner = [[QemuCocoaPasteboardTypeOwner alloc] init]; -- qemu_clipboard_peer_register(&cbpeer); -- -- [pool release]; - } - - static QemuDisplay qemu_display_cocoa = { diff --git a/pkgs/applications/virtualization/qemu/revert-ui-cocoa-use-the-standard-about-panel.patch b/pkgs/applications/virtualization/qemu/revert-ui-cocoa-use-the-standard-about-panel.patch deleted file mode 100644 index 08620da3b9632..0000000000000 --- a/pkgs/applications/virtualization/qemu/revert-ui-cocoa-use-the-standard-about-panel.patch +++ /dev/null @@ -1,145 +0,0 @@ -diff --git a/ui/cocoa.m b/ui/cocoa.m -index 25e0db9dd0..4af0712036 100644 ---- a/ui/cocoa.m -+++ b/ui/cocoa.m -@@ -93,6 +93,7 @@ static void cocoa_switch(DisplayChangeListener *dcl, - - static void cocoa_refresh(DisplayChangeListener *dcl); - -+static NSWindow *about_window; - static const DisplayChangeListenerOps dcl_ops = { - .dpy_name = "cocoa", - .dpy_gfx_update = cocoa_update, -@@ -1180,6 +1181,7 @@ - (void)changeDeviceMedia:(id)sender; - - (BOOL)verifyQuit; - - (void)openDocumentation:(NSString *)filename; - - (IBAction) do_about_menu_item: (id) sender; -+- (void)make_about_window; - - (void)adjustSpeed:(id)sender; - @end - -@@ -1227,6 +1229,8 @@ - (id) init - [pauseLabel setFont: [NSFont fontWithName: @"Helvetica" size: 90]]; - [pauseLabel setTextColor: [NSColor blackColor]]; - [pauseLabel sizeToFit]; -+ -+ [self make_about_window]; - } - return self; - } -@@ -1549,29 +1553,92 @@ - (BOOL)verifyQuit - /* The action method for the About menu item */ - - (IBAction) do_about_menu_item: (id) sender - { -- NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; -- char *icon_path_c = get_relocated_path(CONFIG_QEMU_ICONDIR "/hicolor/512x512/apps/qemu.png"); -- NSString *icon_path = [NSString stringWithUTF8String:icon_path_c]; -- g_free(icon_path_c); -- NSImage *icon = [[NSImage alloc] initWithContentsOfFile:icon_path]; -- NSString *version = @"QEMU emulator version " QEMU_FULL_VERSION; -- NSString *copyright = @QEMU_COPYRIGHT; -- NSDictionary *options; -- if (icon) { -- options = @{ -- NSAboutPanelOptionApplicationIcon : icon, -- NSAboutPanelOptionApplicationVersion : version, -- @"Copyright" : copyright, -- }; -- [icon release]; -- } else { -- options = @{ -- NSAboutPanelOptionApplicationVersion : version, -- @"Copyright" : copyright, -- }; -- } -- [NSApp orderFrontStandardAboutPanelWithOptions:options]; -- [pool release]; -+ [about_window makeKeyAndOrderFront: nil]; -+} -+ -+/* Create and display the about dialog */ -+- (void)make_about_window -+{ -+ /* Make the window */ -+ int x = 0, y = 0, about_width = 400, about_height = 200; -+ NSRect window_rect = NSMakeRect(x, y, about_width, about_height); -+ about_window = [[NSWindow alloc] initWithContentRect:window_rect -+ styleMask:NSWindowStyleMaskTitled | NSWindowStyleMaskClosable | -+ NSWindowStyleMaskMiniaturizable -+ backing:NSBackingStoreBuffered -+ defer:NO]; -+ [about_window setTitle: @"About"]; -+ [about_window setReleasedWhenClosed: NO]; -+ [about_window center]; -+ NSView *superView = [about_window contentView]; -+ -+ /* Create the dimensions of the picture */ -+ int picture_width = 80, picture_height = 80; -+ x = (about_width - picture_width)/2; -+ y = about_height - picture_height - 10; -+ NSRect picture_rect = NSMakeRect(x, y, picture_width, picture_height); -+ -+ /* Make the picture of QEMU */ -+ NSImageView *picture_view = [[NSImageView alloc] initWithFrame: -+ picture_rect]; -+ char *qemu_image_path_c = get_relocated_path(CONFIG_QEMU_ICONDIR "/hicolor/512x512/apps/qemu.png"); -+ NSString *qemu_image_path = [NSString stringWithUTF8String:qemu_image_path_c]; -+ g_free(qemu_image_path_c); -+ NSImage *qemu_image = [[NSImage alloc] initWithContentsOfFile:qemu_image_path]; -+ [picture_view setImage: qemu_image]; -+ [picture_view setImageScaling: NSImageScaleProportionallyUpOrDown]; -+ [superView addSubview: picture_view]; -+ -+ /* Make the name label */ -+ NSBundle *bundle = [NSBundle mainBundle]; -+ if (bundle) { -+ x = 0; -+ y = y - 25; -+ int name_width = about_width, name_height = 20; -+ NSRect name_rect = NSMakeRect(x, y, name_width, name_height); -+ NSTextField *name_label = [[NSTextField alloc] initWithFrame: name_rect]; -+ [name_label setEditable: NO]; -+ [name_label setBezeled: NO]; -+ [name_label setDrawsBackground: NO]; -+ [name_label setAlignment: NSTextAlignmentCenter]; -+ NSString *qemu_name = [[bundle executablePath] lastPathComponent]; -+ [name_label setStringValue: qemu_name]; -+ [superView addSubview: name_label]; -+ } -+ -+ /* Set the version label's attributes */ -+ x = 0; -+ y = 50; -+ int version_width = about_width, version_height = 20; -+ NSRect version_rect = NSMakeRect(x, y, version_width, version_height); -+ NSTextField *version_label = [[NSTextField alloc] initWithFrame: -+ version_rect]; -+ [version_label setEditable: NO]; -+ [version_label setBezeled: NO]; -+ [version_label setAlignment: NSTextAlignmentCenter]; -+ [version_label setDrawsBackground: NO]; -+ -+ /* Create the version string*/ -+ NSString *version_string; -+ version_string = [[NSString alloc] initWithFormat: -+ @"QEMU emulator version %s", QEMU_FULL_VERSION]; -+ [version_label setStringValue: version_string]; -+ [superView addSubview: version_label]; -+ -+ /* Make copyright label */ -+ x = 0; -+ y = 35; -+ int copyright_width = about_width, copyright_height = 20; -+ NSRect copyright_rect = NSMakeRect(x, y, copyright_width, copyright_height); -+ NSTextField *copyright_label = [[NSTextField alloc] initWithFrame: -+ copyright_rect]; -+ [copyright_label setEditable: NO]; -+ [copyright_label setBezeled: NO]; -+ [copyright_label setDrawsBackground: NO]; -+ [copyright_label setAlignment: NSTextAlignmentCenter]; -+ [copyright_label setStringValue: [NSString stringWithFormat: @"%s", -+ QEMU_COPYRIGHT]]; -+ [superView addSubview: copyright_label]; - } - - /* Used by the Speed menu items */ diff --git a/pkgs/applications/virtualization/quickgui/default.nix b/pkgs/applications/virtualization/quickgui/default.nix index 244e438626e0a..e60d7949ec3a6 100644 --- a/pkgs/applications/virtualization/quickgui/default.nix +++ b/pkgs/applications/virtualization/quickgui/default.nix @@ -1,67 +1,56 @@ -{ stdenvNoCC +{ fetchFromGitHub +, makeDesktopItem +, copyDesktopItems , lib -, fetchurl -, autoPatchelfHook -, dpkg -, wrapGAppsHook3 +, flutter , quickemu -, gnome +, zenity }: - -stdenvNoCC.mkDerivation rec { +flutter.buildFlutterApplication rec { pname = "quickgui"; - version = "1.2.8"; - - src = fetchurl { - url = "https://github.com/quickemu-project/quickgui/releases/download/v${version}/quickgui_${version}-1_lunar1.0_amd64.deb"; - sha256 = "sha256-crnV7OWH5UbkMM/TxTIOlXmvqBgjFmQG7RxameMOjH0="; + version = "1.2.10"; + src = fetchFromGitHub { + owner = "quickemu-project"; + repo = "quickgui"; + rev = version; + hash = "sha256-M2Qy66RqsjXg7ZpHwaXCN8qXRIsisnIyaENx3KqmUfQ="; }; - nativeBuildInputs = [ - autoPatchelfHook - dpkg - wrapGAppsHook3 - ]; - - buildInputs = [ - quickemu - gnome.zenity - ]; - - strictDeps = true; - - unpackCmd = "dpkg-deb -x $curSrc source"; + pubspecLock = lib.importJSON ./pubspec.lock.json; - installPhase = '' - runHook preInstall - - mv usr $out + gitHashes = { + window_size = "sha256-XelNtp7tpZ91QCEcvewVphNUtgQX7xrp5QP0oFo6DgM="; + }; - runHook postInstall - ''; + extraWrapProgramArgs = "--prefix PATH : ${lib.makeBinPath [ quickemu zenity ]}"; - preFixup = '' - gappsWrapperArgs+=( - --prefix PATH : ${lib.makeBinPath [ quickemu gnome.zenity ]} - ) - ''; + nativeBuildInputs = [ copyDesktopItems ]; postFixup = '' - substituteInPlace $out/share/applications/quickgui.desktop \ - --replace "/usr" $out - - # quickgui PR 88 - echo "Categories=System;" >> $out/share/applications/quickgui.desktop + for SIZE in 16 32 48 64 128 256 512; do + mkdir -p $out/share/icons/hicolor/$SIZEx$SIZE/apps/ + cp -av assets/resources/quickgui_$SIZE.png $out/share/icons/hicolor/$SIZEx$SIZE/apps/quickgui.png + done ''; + desktopItems = [ + (makeDesktopItem { + name = "quickgui"; + exec = "quickgui"; + icon = "quickgui"; + desktopName = "Quickgui"; + comment = "An elegant virtual machine manager for the desktop"; + categories = [ "Development" "System" ]; + }) + ]; + meta = with lib; { - description = "Flutter frontend for quickemu"; + description = "Elegant virtual machine manager for the desktop"; homepage = "https://github.com/quickemu-project/quickgui"; - changelog = "https://github.com/quickemu-project/quickgui/releases/tag/v${version}"; + changelog = "https://github.com/quickemu-project/quickgui/releases/"; license = licenses.mit; - maintainers = with maintainers; [ heyimnova ]; + maintainers = with maintainers; [ flexiondotorg heyimnova ]; platforms = [ "x86_64-linux" ]; - sourceProvenance = [ sourceTypes.binaryNativeCode ]; mainProgram = "quickgui"; }; } diff --git a/pkgs/applications/virtualization/quickgui/pubspec.lock.json b/pkgs/applications/virtualization/quickgui/pubspec.lock.json new file mode 100644 index 0000000000000..7e62ceff8be72 --- /dev/null +++ b/pkgs/applications/virtualization/quickgui/pubspec.lock.json @@ -0,0 +1,1189 @@ +{ + "packages": { + "_discoveryapis_commons": { + "dependency": "transitive", + "description": { + "name": "_discoveryapis_commons", + "sha256": "f8bb1fdbd77f3d5c1d62b5b0eca75fbf1e41bf4f6c62628f880582e2182ae45d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.6" + }, + "ansicolor": { + "dependency": "transitive", + "description": { + "name": "ansicolor", + "sha256": "8bf17a8ff6ea17499e40a2d2542c2f481cd7615760c6d34065cb22bfd22e6880", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.2" + }, + "archive": { + "dependency": "transitive", + "description": { + "name": "archive", + "sha256": "cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.6.1" + }, + "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" + }, + "boolean_selector": { + "dependency": "transitive", + "description": { + "name": "boolean_selector", + "sha256": "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.1" + }, + "characters": { + "dependency": "transitive", + "description": { + "name": "characters", + "sha256": "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.0" + }, + "charset": { + "dependency": "transitive", + "description": { + "name": "charset", + "sha256": "27802032a581e01ac565904ece8c8962564b1070690794f0072f6865958ce8b9", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.1" + }, + "checked_yaml": { + "dependency": "transitive", + "description": { + "name": "checked_yaml", + "sha256": "feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.3" + }, + "cli_util": { + "dependency": "transitive", + "description": { + "name": "cli_util", + "sha256": "c05b7406fdabc7a49a3929d4af76bcaccbbffcbcdcf185b082e1ae07da323d19", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.4.1" + }, + "clock": { + "dependency": "transitive", + "description": { + "name": "clock", + "sha256": "cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.1" + }, + "collection": { + "dependency": "transitive", + "description": { + "name": "collection", + "sha256": "ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.18.0" + }, + "console": { + "dependency": "transitive", + "description": { + "name": "console", + "sha256": "e04e7824384c5b39389acdd6dc7d33f3efe6b232f6f16d7626f194f6a01ad69a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.1.0" + }, + "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" + }, + "cupertino_icons": { + "dependency": "direct main", + "description": { + "name": "cupertino_icons", + "sha256": "ba631d1c7f7bef6b729a622b7b752645a2d076dba9976925b8f25725a30e1ee6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.8" + }, + "dbus": { + "dependency": "transitive", + "description": { + "name": "dbus", + "sha256": "365c771ac3b0e58845f39ec6deebc76e3276aa9922b0cc60840712094d9047ac", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.10" + }, + "desktop_notifications": { + "dependency": "direct main", + "description": { + "name": "desktop_notifications", + "sha256": "6d92694ad6e9297a862c5ff7dd6b8ff64c819972557754769f819d2209612927", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.6.3" + }, + "dio": { + "dependency": "transitive", + "description": { + "name": "dio", + "sha256": "11e40df547d418cc0c4900a9318b26304e665da6fa4755399a9ff9efd09034b5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.4.3+1" + }, + "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": "824f5b9f389bfc4dddac3dea76cd70c51092d9dff0b2ece7ef4f53db8547d258", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "8.0.6" + }, + "flutter": { + "dependency": "direct main", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "flutter_app_builder": { + "dependency": "transitive", + "description": { + "name": "flutter_app_builder", + "sha256": "74018c0e2da3ae33073e7417b5c8e900fdc7b5ebc3bdacd2dd05244d9b5e54cb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.4.5" + }, + "flutter_app_packager": { + "dependency": "transitive", + "description": { + "name": "flutter_app_packager", + "sha256": "3925c4e2ac53f4a5ce3bae1a5f54966620504d6c28725b112074cfbdf227a36b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.4.5" + }, + "flutter_app_publisher": { + "dependency": "transitive", + "description": { + "name": "flutter_app_publisher", + "sha256": "bbb1953ef723fc98a7f974ae9499194999f570194c6d856182518e6e73b51ff2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.4.5" + }, + "flutter_distributor": { + "dependency": "direct dev", + "description": { + "name": "flutter_distributor", + "sha256": "45d27526a5de93370e322da5314b0a1c07c024b79031a8ad44435046915fa0e8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.4.5" + }, + "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": "c6b0b4c05c458e1c01ad9bcc14041dd7b1f6783d487be4386f793f47a8a4d03e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.20" + }, + "flutter_svg": { + "dependency": "direct main", + "description": { + "name": "flutter_svg", + "sha256": "7b4ca6cf3304575fe9c8ec64813c8d02ee41d2afe60bcfe0678bcb5375d596a2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.10+1" + }, + "flutter_test": { + "dependency": "direct dev", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "flutter_web_plugins": { + "dependency": "transitive", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "get_it": { + "dependency": "transitive", + "description": { + "name": "get_it", + "sha256": "d85128a5dae4ea777324730dc65edd9c9f43155c109d5cc0a69cab74139fbac1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.7.0" + }, + "gettext": { + "dependency": "direct main", + "description": { + "name": "gettext", + "sha256": "007a3cbd5d8139252118bab34911d24edfc695665b38f91ae244f51b4d71f6b4", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.0" + }, + "gettext_i18n": { + "dependency": "direct main", + "description": { + "name": "gettext_i18n", + "sha256": "1acdb7f6bb7c06aaa69016a248de20123ac9af2e1a29321244012fbf6f2d4bdd", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.7" + }, + "gettext_parser": { + "dependency": "direct main", + "description": { + "name": "gettext_parser", + "sha256": "9565c9dd1033ec125e1fbc7ccba6c0d2d753dd356122ba1a17e6aa7dc868f34a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "glob": { + "dependency": "transitive", + "description": { + "name": "glob", + "sha256": "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "google_identity_services_web": { + "dependency": "transitive", + "description": { + "name": "google_identity_services_web", + "sha256": "9482364c9f8b7bd36902572ebc3a7c2b5c8ee57a9c93e6eb5099c1a9ec5265d8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.3.1+1" + }, + "googleapis": { + "dependency": "transitive", + "description": { + "name": "googleapis", + "sha256": "864f222aed3f2ff00b816c675edf00a39e2aaf373d728d8abec30b37bee1a81c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "13.2.0" + }, + "googleapis_auth": { + "dependency": "transitive", + "description": { + "name": "googleapis_auth", + "sha256": "befd71383a955535060acde8792e7efc11d2fccd03dd1d3ec434e85b68775938", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.6.0" + }, + "http": { + "dependency": "transitive", + "description": { + "name": "http", + "sha256": "761a297c042deedc1ffbb156d6e2af13886bb305c2a343a4d972504cd67dd938", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.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" + }, + "intl": { + "dependency": "transitive", + "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" + }, + "json_annotation": { + "dependency": "transitive", + "description": { + "name": "json_annotation", + "sha256": "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.9.0" + }, + "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" + }, + "liquid_engine": { + "dependency": "transitive", + "description": { + "name": "liquid_engine", + "sha256": "41ae12d5a72451c3efb8d4e7b901cdf0537917597bc7e7376e9b0a237f92df29", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.2" + }, + "logging": { + "dependency": "transitive", + "description": { + "name": "logging", + "sha256": "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.0" + }, + "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" + }, + "meta": { + "dependency": "transitive", + "description": { + "name": "meta", + "sha256": "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.12.0" + }, + "msix": { + "dependency": "transitive", + "description": { + "name": "msix", + "sha256": "519b183d15dc9f9c594f247e2d2339d855cf0eaacc30e19b128e14f3ecc62047", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.16.7" + }, + "mustache_template": { + "dependency": "transitive", + "description": { + "name": "mustache_template", + "sha256": "a46e26f91445bfb0b60519be280555b06792460b27b19e2b19ad5b9740df5d1c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.0" + }, + "nested": { + "dependency": "transitive", + "description": { + "name": "nested", + "sha256": "03bac4c528c64c95c722ec99280375a6f2fc708eec17c7b3f07253b626cd2a20", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.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" + }, + "parse_app_package": { + "dependency": "transitive", + "description": { + "name": "parse_app_package", + "sha256": "69f313fbadf457576015333a8da2e99018763dce88df248febcfb8883da8aedb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.4.5" + }, + "path": { + "dependency": "transitive", + "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_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" + }, + "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": "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.5" + }, + "plist_parser": { + "dependency": "transitive", + "description": { + "name": "plist_parser", + "sha256": "e2a6f9abfa0c45c0253656b7360abb0dfb84af9937bace74605b93d2aad2bf0c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.0.11" + }, + "plugin_platform_interface": { + "dependency": "transitive", + "description": { + "name": "plugin_platform_interface", + "sha256": "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.8" + }, + "process_run": { + "dependency": "direct main", + "description": { + "name": "process_run", + "sha256": "6052115540ad88715d6bcee60656970f70c68c85846d1948b92e435f0382899e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.0+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": "c799b721d79eb6ee6fa56f00c04b472dcd44a30d258fac2174a6ec57302678f8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.0" + }, + "qiniu_sdk_base": { + "dependency": "transitive", + "description": { + "name": "qiniu_sdk_base", + "sha256": "2506c6372512f81cfbddf162ea6da1ad7b1c6521dee1d10e9da6847c92e13349", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.5.2" + }, + "quiver": { + "dependency": "direct main", + "description": { + "name": "quiver", + "sha256": "b1c1ac5ce6688d77f65f3375a9abb9319b3cb32486bdc7a1e0fdf004d7ba4e47", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.1" + }, + "recase": { + "dependency": "transitive", + "description": { + "name": "recase", + "sha256": "e4eb4ec2dcdee52dcf99cb4ceabaffc631d7424ee55e56f280bc039737f89213", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.1.0" + }, + "shared_preferences": { + "dependency": "direct main", + "description": { + "name": "shared_preferences", + "sha256": "d3bbe5553a986e83980916ded2f0b435ef2e1893dfaa29d5a7a790d0eca12180", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.3" + }, + "shared_preferences_android": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_android", + "sha256": "93d0ec9dd902d85f326068e6a899487d1f65ffcd5798721a95330b26c8131577", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.3" + }, + "shared_preferences_foundation": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_foundation", + "sha256": "0a8a893bf4fd1152f93fec03a415d11c27c74454d96e2318a7ac38dd18683ab7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.0" + }, + "shared_preferences_linux": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_linux", + "sha256": "9f2cbcf46d4270ea8be39fa156d86379077c8a5228d9dfdb1164ae0bb93f1faa", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.2" + }, + "shared_preferences_platform_interface": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_platform_interface", + "sha256": "22e2ecac9419b4246d7c22bfbbda589e3acf5c0351137d87dd2939d984d37c3b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.2" + }, + "shared_preferences_web": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_web", + "sha256": "9aee1089b36bd2aafe06582b7d7817fd317ef05fc30e6ba14bff247d0933042a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.0" + }, + "shared_preferences_windows": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_windows", + "sha256": "841ad54f3c8381c480d0c9b508b89a34036f512482c407e6df7a9c4aa2ef8f59", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.2" + }, + "shell_executor": { + "dependency": "transitive", + "description": { + "name": "shell_executor", + "sha256": "9c024546fc96470a6b96be9902f0bc05347a017a7638ed8d93c77e8d77eb3c3c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.6" + }, + "shell_uikit": { + "dependency": "transitive", + "description": { + "name": "shell_uikit", + "sha256": "03703090807091514ace2f9c8dc5d9b2d18c42a248c767220167825fbc3d2747", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.1" + }, + "sky_engine": { + "dependency": "transitive", + "description": "flutter", + "source": "sdk", + "version": "0.0.99" + }, + "source_span": { + "dependency": "transitive", + "description": { + "name": "source_span", + "sha256": "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.10.0" + }, + "stack_trace": { + "dependency": "transitive", + "description": { + "name": "stack_trace", + "sha256": "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.11.1" + }, + "stream_channel": { + "dependency": "transitive", + "description": { + "name": "stream_channel", + "sha256": "ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "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" + }, + "tuple": { + "dependency": "direct main", + "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" + }, + "url_launcher": { + "dependency": "direct main", + "description": { + "name": "url_launcher", + "sha256": "21b704ce5fa560ea9f3b525b43601c678728ba46725bab9b01187b4831377ed3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.3.0" + }, + "url_launcher_android": { + "dependency": "transitive", + "description": { + "name": "url_launcher_android", + "sha256": "ceb2625f0c24ade6ef6778d1de0b2e44f2db71fded235eb52295247feba8c5cf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.3.3" + }, + "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": "transitive", + "description": { + "name": "uuid", + "sha256": "648e103079f7c64a36dc7d39369cabb358d377078a051d6ae2ad3aa539519313", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.7" + }, + "vector_graphics": { + "dependency": "transitive", + "description": { + "name": "vector_graphics", + "sha256": "32c3c684e02f9bc0afb0ae0aa653337a2fe022e8ab064bcd7ffda27a74e288e3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.11+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" + }, + "version": { + "dependency": "direct main", + "description": { + "name": "version", + "sha256": "3d4140128e6ea10d83da32fef2fa4003fccbf6852217bb854845802f04191f94", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.2" + }, + "vm_service": { + "dependency": "transitive", + "description": { + "name": "vm_service", + "sha256": "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "14.2.1" + }, + "web": { + "dependency": "transitive", + "description": { + "name": "web", + "sha256": "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.5.1" + }, + "win32": { + "dependency": "transitive", + "description": { + "name": "win32", + "sha256": "a79dbe579cb51ecd6d30b17e0cae4e0ea15e2c0e66f69ad4198f22a6789e94f4", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.5.1" + }, + "window_size": { + "dependency": "direct main", + "description": { + "path": "plugins/window_size", + "ref": "eb3964990cf19629c89ff8cb4a37640c7b3d5601", + "resolved-ref": "eb3964990cf19629c89ff8cb4a37640c7b3d5601", + "url": "https://github.com/google/flutter-desktop-embedding.git" + }, + "source": "git", + "version": "0.1.0" + }, + "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" + }, + "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.22.0" + } +} diff --git a/pkgs/applications/virtualization/runc/default.nix b/pkgs/applications/virtualization/runc/default.nix index 0a9a802f70f37..ff7fa9f8a3b9b 100644 --- a/pkgs/applications/virtualization/runc/default.nix +++ b/pkgs/applications/virtualization/runc/default.nix @@ -14,13 +14,13 @@ buildGoModule rec { pname = "runc"; - version = "1.1.13"; + version = "1.1.14"; src = fetchFromGitHub { owner = "opencontainers"; repo = "runc"; rev = "v${version}"; - hash = "sha256-RQsM8Q7HogDVGbNpen3wxXNGR9lfqmNhkXTRoC+LBk8="; + hash = "sha256-7PYbSZqCQLTaeFppuNz5mxDlwEyLkA5zpdMhWy1tWmc="; }; vendorHash = null; diff --git a/pkgs/applications/virtualization/rust-hypervisor-firmware/default.nix b/pkgs/applications/virtualization/rust-hypervisor-firmware/default.nix index 8b408cc96ed4b..193776fa5ec08 100644 --- a/pkgs/applications/virtualization/rust-hypervisor-firmware/default.nix +++ b/pkgs/applications/virtualization/rust-hypervisor-firmware/default.nix @@ -37,7 +37,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-hKk5pcop8rb5Q+IVchcl+XhMc3DCBBPn5P+AkAb9XxI="; }; - cargoSha256 = "sha256-edi6/Md6KebKM3wHArZe1htUCg0/BqMVZKA4xEH25GI="; + cargoHash = "sha256-edi6/Md6KebKM3wHArZe1htUCg0/BqMVZKA4xEH25GI="; # lld: error: unknown argument '-Wl,--undefined=AUDITABLE_VERSION_INFO' # https://github.com/cloud-hypervisor/rust-hypervisor-firmware/issues/249 diff --git a/pkgs/applications/virtualization/rvvm/default.nix b/pkgs/applications/virtualization/rvvm/default.nix index ce90b686bcb0f..4693999e8f111 100644 --- a/pkgs/applications/virtualization/rvvm/default.nix +++ b/pkgs/applications/virtualization/rvvm/default.nix @@ -15,7 +15,7 @@ assert lib.assertMsg (builtins.elem guiBackend ["sdl" "x11" "none"]) "Unsupported GUI backend"; assert lib.assertMsg (!(enableSDL && enableX11)) "RVVM can have only one GUI backend at a time"; -assert lib.assertMsg (stdenv.isDarwin -> !enableX11) "macOS supports only SDL GUI backend"; +assert lib.assertMsg (stdenv.hostPlatform.isDarwin -> !enableX11) "macOS supports only SDL GUI backend"; stdenv.mkDerivation rec { pname = "rvvm"; @@ -38,10 +38,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ] ++ lib.optional enableSDL "USE_SDL=2" # Use SDL2 instead of SDL1 - ++ lib.optional (!enableSDL && !enableX11) "USE_FB=0" - - # work around https://github.com/NixOS/nixpkgs/issues/19098 - ++ lib.optional (stdenv.cc.isClang && stdenv.isDarwin) "CFLAGS=-fno-lto"; + ++ lib.optional (!enableSDL && !enableX11) "USE_FB=0"; meta = with lib; { homepage = "https://github.com/LekKit/RVVM"; diff --git a/pkgs/applications/virtualization/sail-riscv/default.nix b/pkgs/applications/virtualization/sail-riscv/default.nix index cda1f5d6cb20f..ba98f6b2cd5a7 100644 --- a/pkgs/applications/virtualization/sail-riscv/default.nix +++ b/pkgs/applications/virtualization/sail-riscv/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/riscv/sail-riscv"; description = "Formal specification of the RISC-V architecture, written in Sail"; maintainers = with maintainers; [ genericnerdyusername ]; - broken = stdenv.isDarwin && stdenv.isAarch64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; license = licenses.bsd2; }; } diff --git a/pkgs/applications/virtualization/singularity/generic.nix b/pkgs/applications/virtualization/singularity/generic.nix index f27f58fda4876..24e1b3b67b26f 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" \ @@ -303,29 +326,27 @@ in ''} ''; - meta = - with lib; - { - description = "Application containers for linux" + extraDescription; - longDescription = '' - Singularity (the upstream) renamed themselves to Apptainer - to distinguish themselves from a fork made by Sylabs Inc.. See + meta = { + description = "Application containers for linux" + extraDescription; + longDescription = '' + Singularity (the upstream) renamed themselves to Apptainer + to distinguish themselves from a fork made by Sylabs Inc.. See - https://sylabs.io/2021/05/singularity-community-edition - https://apptainer.org/news/community-announcement-20211130 - ''; - license = licenses.bsd3; - platforms = platforms.linux; - maintainers = with maintainers; [ - jbedo - ShamrockLee - ]; - mainProgram = projectName; - } - // extraMeta; + https://sylabs.io/2021/05/singularity-community-edition + https://apptainer.org/news/community-announcement-20211130 + ''; + license = lib.licenses.bsd3; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ + jbedo + ShamrockLee + ]; + mainProgram = projectName; + } // extraMeta; }).overrideAttrs ( finalAttrs: prevAttrs: { + systemDefaultPath = lib.concatStringsSep ":" systemBinPaths; inputsDefaultPath = lib.makeBinPath finalAttrs.defaultPathInputs; passthru = prevAttrs.passthru or { } // { inherit sourceFilesWithDefaultPaths; diff --git a/pkgs/applications/virtualization/singularity/packages.nix b/pkgs/applications/virtualization/singularity/packages.nix index f03bdf9631c56..c6cbdc8e2c76e 100644 --- a/pkgs/applications/virtualization/singularity/packages.nix +++ b/pkgs/applications/virtualization/singularity/packages.nix @@ -9,14 +9,14 @@ let callPackage (import ./generic.nix rec { pname = "apptainer"; - version = "1.3.2"; + version = "1.3.4"; projectName = "apptainer"; src = fetchFromGitHub { owner = "apptainer"; repo = "apptainer"; rev = "refs/tags/v${version}"; - hash = "sha256-NseigaPmRKDsBk8v7RpYf+uoEGvQHVnqOMO49kP0mQ8="; + hash = "sha256-eByF0OpL1OKGq0wY7kw8Sv9sZuVE0K3TGIm4Chk9PC4="; }; # Update by running @@ -47,20 +47,20 @@ let callPackage (import ./generic.nix rec { pname = "singularity-ce"; - version = "4.1.3"; + version = "4.2.1"; projectName = "singularity"; src = fetchFromGitHub { owner = "sylabs"; repo = "singularity"; rev = "refs/tags/v${version}"; - hash = "sha256-pR8zyMr23wcbDCXAysVEgGUDHkrfhLoVF3fjMLgZFYs="; + hash = "sha256-Go4um/bIgq2lCZvjJ2GR81XpA/JvjPholi1PzNG9Hz8="; }; # Update by running # nix-prefetch -E "{ sha256 }: ((import ./. { }).singularity.override { vendorHash = sha256; }).goModules" # at the root directory of the Nixpkgs repository - vendorHash = "sha256-332GFL04aE6B6vxgtJJH4TeI6YJCDBpCClJ3sc5gN3A="; + vendorHash = "sha256-CRZ42NdmJhAkV6bkl5n7rEV4Tu/h65qF5qaQ4W5wQ3w="; # Do not build conmon and squashfuse from the Git submodule sources, # Use Nixpkgs provided version diff --git a/pkgs/applications/virtualization/spike/default.nix b/pkgs/applications/virtualization/spike/default.nix index 1712685048115..d0e79c4f9812d 100644 --- a/pkgs/applications/virtualization/spike/default.nix +++ b/pkgs/applications/virtualization/spike/default.nix @@ -1,30 +1,21 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, dtc, pkgsCross }: +{ lib, stdenv, fetchFromGitHub, dtc, pkgsCross }: stdenv.mkDerivation rec { pname = "spike"; - version = "1.1.0"; + version = "1.1.0-unstable-2024-09-21"; src = fetchFromGitHub { owner = "riscv"; repo = "riscv-isa-sim"; - rev = "v${version}"; - sha256 = "sha256-4D2Fezej0ioOOupw3kgMT5VLs+/jXQjwvek6v0AVMzI="; + rev = "de5094a1a901d77ff44f89b38e00fefa15d4018e"; + sha256 = "sha256-mAgR2VzDgeuIdmPEgrb+MaA89BnWfmNanOVidqn0cgc="; }; - patches = [ - (fetchpatch { - name = "fesvr-fix-compilation-with-gcc-13.patch"; - url = "https://github.com/riscv-software-src/riscv-isa-sim/commit/0a7bb5403d0290cea8b2356179d92e4c61ffd51d.patch"; - hash = "sha256-JUMTbGawvLkoOWKkruzLzUFQytVR3wqTlGu/eegRFEE="; - }) - ]; - nativeBuildInputs = [ dtc ]; enableParallelBuilding = true; postPatch = '' patchShebangs scripts/*.sh - patchShebangs tests/ebreak.py ''; doCheck = true; diff --git a/pkgs/applications/virtualization/stratovirt/default.nix b/pkgs/applications/virtualization/stratovirt/default.nix index d927c8430a1ec..a1f3fb53e0430 100644 --- a/pkgs/applications/virtualization/stratovirt/default.nix +++ b/pkgs/applications/virtualization/stratovirt/default.nix @@ -6,16 +6,15 @@ rustPlatform.buildRustPackage rec { pname = "stratovirt"; - version = "2.3.0"; + version = "2.4.0"; src = fetchgit { url = "https://gitee.com/openeuler/stratovirt.git"; rev = "v${version}"; - sha256 = "sha256-f5710f7Lz7ul1DYrC0CAfDR+7e1NrE9ESPdB8nlVUKw="; + hash = "sha256-1Ex6ahKBoVRikSqrgHGYaBFzWkPFDm8bGVyB7KmO8tI="; }; - patches = [ ./micro_vm-allow-SYS_clock_gettime.patch ]; - cargoSha256 = "sha256-prs7zkPAKQ99gjW7gy+4+CgEgGhaTTCLPTbLk/ZHdts="; + cargoHash = "sha256-uuZCbmt3eIlKurwMOV7LezVSjOVG/90OdT2PC8YLi3I="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/applications/virtualization/stratovirt/micro_vm-allow-SYS_clock_gettime.patch b/pkgs/applications/virtualization/stratovirt/micro_vm-allow-SYS_clock_gettime.patch deleted file mode 100644 index 11d2a0e88e194..0000000000000 --- a/pkgs/applications/virtualization/stratovirt/micro_vm-allow-SYS_clock_gettime.patch +++ /dev/null @@ -1,25 +0,0 @@ -From c5ef87eb831f7f77c0564dd1dce92a579e7c4747 Mon Sep 17 00:00:00 2001 -From: Astro <astro@spaceboyz.net> -Date: Sun, 18 Jun 2023 23:10:23 +0200 -Subject: [PATCH] micro_vm: allow SYS_clock_gettime - ---- - machine/src/micro_vm/syscall.rs | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/machine/src/micro_vm/syscall.rs b/machine/src/micro_vm/syscall.rs -index c37d3f4e..f9e7cce2 100644 ---- a/machine/src/micro_vm/syscall.rs -+++ b/machine/src/micro_vm/syscall.rs -@@ -125,6 +125,8 @@ pub fn syscall_whitelist() -> Vec<BpfRule> { - BpfRule::new(libc::SYS_readlink), - BpfRule::new(libc::SYS_getrandom), - BpfRule::new(libc::SYS_fallocate), -+ #[cfg(target_env = "gnu")] -+ BpfRule::new(libc::SYS_clock_gettime), - madvise_rule(), - ] - } --- -2.41.0 - diff --git a/pkgs/applications/virtualization/tart/default.nix b/pkgs/applications/virtualization/tart/default.nix index d0f2f3a0127e1..fb5f28325260b 100644 --- a/pkgs/applications/virtualization/tart/default.nix +++ b/pkgs/applications/virtualization/tart/default.nix @@ -10,11 +10,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "tart"; - version = "2.12.0"; + version = "2.18.2"; src = fetchurl { url = "https://github.com/cirruslabs/tart/releases/download/${finalAttrs.version}/tart-arm64.tar.gz"; - hash = "sha256-+33Z7M9Y8fWFfCBNJrXHljwoAn7p70+yvTmBwx1X68M="; + hash = "sha256-0057/lRisAw3fzh2LNqHUx72PR/67mW/cqm7hU34GAU="; }; sourceRoot = "."; @@ -39,7 +39,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { description = "macOS VMs on Apple Silicon to use in CI and other automations"; homepage = "https://tart.run"; license = licenses.fairsource09; - maintainers = with maintainers; [ emilytrau Enzime aduh95 ]; + maintainers = with maintainers; [ emilytrau aduh95 ]; mainProgram = finalAttrs.pname; platforms = [ "aarch64-darwin" ]; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; diff --git a/pkgs/applications/virtualization/umoci/default.nix b/pkgs/applications/virtualization/umoci/default.nix index 5dc9ae5028e80..acf03a96c747d 100644 --- a/pkgs/applications/virtualization/umoci/default.nix +++ b/pkgs/applications/virtualization/umoci/default.nix @@ -3,7 +3,6 @@ , buildGoModule , go-md2man , installShellFiles -, bash }: buildGoModule rec { diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index 281f451fddbd2..2b230a95b5040 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 @@ -45,12 +45,12 @@ python3.pkgs.buildPythonApplication rec { gobject-introspection # for setup hook populating GI_TYPELIB_PATH docutils wrapGAppsHook3 - ] ++ lib.optional stdenv.isDarwin desktopToDarwinBundle; + ] ++ lib.optional stdenv.hostPlatform.isDarwin desktopToDarwinBundle; 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/virt-viewer/default.nix b/pkgs/applications/virtualization/virt-viewer/default.nix index 8c621271e757a..2c368db8da945 100644 --- a/pkgs/applications/virtualization/virt-viewer/default.nix +++ b/pkgs/applications/virtualization/virt-viewer/default.nix @@ -32,9 +32,6 @@ , vte , wrapGAppsHook3 }: - -with lib; - stdenv.mkDerivation rec { pname = "virt-viewer"; version = "11.0"; @@ -76,18 +73,18 @@ stdenv.mkDerivation rec { libvirt-glib libxml2 vte - ] ++ optionals ovirtSupport [ + ] ++ lib.optionals ovirtSupport [ libgovirt - ] ++ optionals spiceSupport ([ + ] ++ lib.optionals spiceSupport ([ gdbm spice-gtk spice-protocol - ] ++ optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libcap ]); # Required for USB redirection PolicyKit rules file - propagatedUserEnvPkgs = optional spiceSupport spice-gtk; + propagatedUserEnvPkgs = lib.optional spiceSupport spice-gtk; mesonFlags = [ (lib.mesonEnable "ovirt" ovirtSupport) @@ -99,7 +96,7 @@ stdenv.mkDerivation rec { patchShebangs build-aux/post_install.py ''; - meta = { + meta = with lib; { description = "Viewer for remote virtual machines"; maintainers = with maintainers; [ raskin atemu ]; platforms = with platforms; linux ++ darwin; diff --git a/pkgs/applications/virtualization/virt-what/default.nix b/pkgs/applications/virtualization/virt-what/default.nix index e11b265a9e3c0..3d553acd48ffb 100644 --- a/pkgs/applications/virtualization/virt-what/default.nix +++ b/pkgs/applications/virtualization/virt-what/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "virt-what"; - version = "1.25"; + version = "1.26"; src = fetchurl { url = "https://people.redhat.com/~rjones/virt-what/files/${pname}-${version}.tar.gz"; - sha256 = "sha256-1Py0I2Irr75eK7zYS32SrU1YP0d4siW3LEqBrp/Dxz0="; + sha256 = "sha256-qoap0xO1yQSK+a2aA4fkr/I4uw6kLzuDARTotQzTFTU="; }; meta = with lib; { diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index dd9b99f7f9bc9..437ceba29ce07 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -13,7 +13,7 @@ , javaBindings ? true, jdk # Almost doesn't affect closure size , pythonBindings ? false, python3 , extensionPack ? null, fakeroot -, pulseSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio +, pulseSupport ? config.pulseaudio or stdenv.hostPlatform.isLinux, libpulseaudio , enableHardening ? false , headless ? false , enable32bitGuests ? true @@ -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; @@ -32,11 +29,11 @@ let buildType = "release"; # Use maintainers/scripts/update.nix to update the version and all related hashes or # change the hashes in extpack.nix and guest-additions/default.nix as well manually. - virtualboxVersion = "7.0.18"; - virtualboxSha256 = "d999513533631674a024762668de999411d8197060c51e68c5faf0a2c0eea1a5"; + virtualboxVersion = "7.0.20"; + virtualboxSha256 = "5cf5979bef66ebab3fcd495796b215a940e8a07c469d4bc56d064de44222dd02"; - kvmPatchVersion = "20240515"; - kvmPatchHash = "sha256-Kh/tlPScdf7CbEEpL54iqMpeUIdmnJL2r/mxnlEzLd0="; + kvmPatchVersion = "20240828"; + kvmPatchHash = "sha256-g0esJbB1IGyLGZMLFJIY8ZYdHWuiM5IZtLMHZvCY6bs="; # The KVM build is not compatible to VirtualBox's kernel modules. So don't export # modsrc at all. diff --git a/pkgs/applications/virtualization/virtualbox/extpack.nix b/pkgs/applications/virtualization/virtualbox/extpack.nix index 089ab4856c0d0..365c635a17aef 100644 --- a/pkgs/applications/virtualization/virtualbox/extpack.nix +++ b/pkgs/applications/virtualization/virtualbox/extpack.nix @@ -1,7 +1,4 @@ { fetchurl, lib, virtualbox }: - -with lib; - let inherit (virtualbox) version; in @@ -12,10 +9,10 @@ fetchurl rec { # Manually sha256sum the extensionPack file, must be hex! # Thus do not use `nix-prefetch-url` but instead plain old `sha256sum`. # Checksums can also be found at https://www.virtualbox.org/download/hashes/${version}/SHA256SUMS - let value = "cab1abad478679fc34a0c5cb4a6d3566edc20e3c54cbed39c8e895d8cfad3ee2"; + let value = "d750fb17688d70e0cb2d7b06f1ad3a661303793f4d1ac39cfa9a54806b89da25"; in assert (builtins.stringLength value) == 64; value; - meta = { + meta = with lib; { description = "Oracle Extension pack for VirtualBox"; license = licenses.virtualbox-puel; homepage = "https://www.virtualbox.org/"; diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions-iso/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions-iso/default.nix index 9529c980475da..f59dcc25f4c20 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions-iso/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions-iso/default.nix @@ -5,7 +5,7 @@ let in fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso"; - sha256 = "4469bab0f59c62312b0a1b67dcf9c07a8a971afad339fa2c3eb80e209e099ef9"; + sha256 = "4c7523fa6d17436e3b7788f62956674270572cfefa340d03111b85f8517d5981"; meta = { description = "Guest additions ISO for VirtualBox"; longDescription = '' diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/builder.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/builder.nix index 72c0af9626f72..00d0d555c60ad 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/builder.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/builder.nix @@ -1,7 +1,7 @@ -{ config, stdenv, kernel, fetchurl, lib, pam, libxslt -, libX11, libXext, libXcursor, libXmu +{ stdenv, kernel, fetchurl, lib, pam, libxslt +, libXext, libXcursor, libXmu , glib, libXrandr, dbus, xz -, pkg-config, which, zlib, xorg +, pkg-config, which, xorg , yasm, patchelf, makeself , linuxHeaders, openssl}: @@ -10,11 +10,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "VirtualBox-GuestAdditions-builder-${kernel.version}"; - version = "7.0.18"; + version = "7.0.20"; src = fetchurl { url = "https://download.virtualbox.org/virtualbox/${finalAttrs.version}/VirtualBox-${finalAttrs.version}.tar.bz2"; - sha256 = "d999513533631674a024762668de999411d8197060c51e68c5faf0a2c0eea1a5"; + sha256 = "5cf5979bef66ebab3fcd495796b215a940e8a07c469d4bc56d064de44222dd02"; }; env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types -Wno-error=implicit-function-declaration"; @@ -37,7 +37,6 @@ in stdenv.mkDerivation (finalAttrs: { ''; patches = [ - #../gcc-13.patch ## https://www.virtualbox.org/changeset/100258/vbox ./no-legacy-xorg.patch ]; diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index ac867ce9ce720..f3eea8a5c1713 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -1,10 +1,6 @@ -{ config, stdenv, kernel, callPackage, lib, dbus -, libX11, libXext, libXcursor, libXmu, xorg -, which, zlib, patchelf, makeWrapper +{ stdenv, kernel, callPackage, lib, dbus +, xorg, zlib, patchelf, makeWrapper }: - -with lib; - let virtualBoxNixGuestAdditionsBuilder = callPackage ./builder.nix { }; @@ -104,7 +100,7 @@ in stdenv.mkDerivation { host/guest clipboard support. ''; sourceProvenance = with lib.sourceTypes; [ fromSource ]; - license = licenses.gpl2; + license = lib.licenses.gpl2; maintainers = [ lib.maintainers.sander lib.maintainers.friedrichaltheide ]; platforms = [ "i686-linux" "x86_64-linux" ]; broken = stdenv.hostPlatform.is32bit && (kernel.kernelAtLeast "5.10"); diff --git a/pkgs/applications/virtualization/vmware-workstation/default.nix b/pkgs/applications/virtualization/vmware-workstation/default.nix index 83d2361a99900..b60875c381295 100644 --- a/pkgs/applications/virtualization/vmware-workstation/default.nix +++ b/pkgs/applications/virtualization/vmware-workstation/default.nix @@ -79,20 +79,6 @@ let sha256 = "sha256-JSEW1gqQuLGRkathlwZU/TnG6dL/xWKW4//SfE+kO0A="; }; - gdbm3 = gdbm.overrideAttrs (old: rec { - version = "1.8.3"; - - src = fetchurl { - url = "mirror://gnu/gdbm/gdbm-${version}.tar.gz"; - sha256 = "sha256-zDQDOKLii0AFirnrU1SiHVP4ihWC6iG6C7GFw3ooHck="; - }; - - installPhase = '' - mkdir -p $out/lib - cp .libs/libgdbm*.so* $out/lib/ - ''; - }); - vmware-unpack-env = buildFHSEnv rec { name = "vmware-unpack-env"; targetPkgs = pkgs: [ zlib ]; @@ -114,7 +100,7 @@ stdenv.mkDerivation rec { libxslt libxml2 libuuid - gdbm3 + gdbm readline xz cups @@ -156,7 +142,7 @@ stdenv.mkDerivation rec { ''} ''; - patchPhase = lib.optionalString enableMacOSGuests '' + postPatch = lib.optionalString enableMacOSGuests '' cp -R "${unlockerSrc}" unlocker/ substituteInPlace unlocker/unlocker.py --replace \ @@ -167,6 +153,8 @@ stdenv.mkDerivation rec { ''; installPhase = '' + runHook preInstall + mkdir -p \ $out/bin \ $out/etc/vmware \ @@ -338,7 +326,7 @@ stdenv.mkDerivation rec { sed -i -e "s,/sbin/modprobe,${kmod}/bin/modprobe," $out/bin/vmplayer sed -i -e "s,@@BINARY@@,$out/bin/vmplayer," $out/share/applications/vmware-player.desktop - ## VMware OVF Tool compoment + ## VMware OVF Tool component echo "Installing VMware OVF Tool for Linux" unpacked="unpacked/vmware-ovftool" mkdir -p $out/lib/vmware-ovftool/ @@ -404,7 +392,7 @@ stdenv.mkDerivation rec { chmod +x $out/bin/* $out/lib/vmware/bin/* $out/lib/vmware/setup/* - # Harcoded pkexec hack + # Hardcoded pkexec hack for lib in "lib/vmware/lib/libvmware-mount.so/libvmware-mount.so" "lib/vmware/lib/libvmwareui.so/libvmwareui.so" "lib/vmware/lib/libvmware-fuseUI.so/libvmware-fuseUI.so" do sed -i -e "s,/usr/local/sbin,/run/vmware/bin," "$out/$lib" @@ -419,6 +407,8 @@ stdenv.mkDerivation rec { wrapProgram $out/lib/vmware/bin/vmware-vmx rm $out/lib/vmware/bin/vmware-vmx ln -s /run/wrappers/bin/vmware-vmx $out/lib/vmware/bin/vmware-vmx + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/applications/virtualization/vpcs/default.nix b/pkgs/applications/virtualization/vpcs/default.nix deleted file mode 100644 index 15f769ef96981..0000000000000 --- a/pkgs/applications/virtualization/vpcs/default.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, testers -, vpcs -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "vpcs"; - version = "0.8.3"; - - src = fetchFromGitHub { - owner = "GNS3"; - repo = "vpcs"; - rev = "v${finalAttrs.version}"; - hash = "sha256-OKi4sC4fmKtkJkkpHZ6OfeIDaBafVrJXGXh1R6gLPFY="; - }; - - sourceRoot = "${finalAttrs.src.name}/src"; - - buildPhase = '' - runHook preBuild - - MKOPT="CC=${stdenv.cc.targetPrefix}cc" ./mk.sh ${stdenv.buildPlatform.linuxArch} - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - install -D -m555 vpcs $out/bin/vpcs - install -D -m444 ../man/vpcs.1 $out/share/man/man1/vpcs.1 - - runHook postInstall - ''; - - enableParallelBuilding = true; - - passthru = { - tests.version = testers.testVersion { - package = vpcs; - command = "vpcs -v"; - }; - }; - - meta = with lib; { - description = "Simple virtual PC simulator"; - longDescription = '' - The VPCS (Virtual PC Simulator) can simulate up to 9 PCs. You can - ping/traceroute them, or ping/traceroute the other hosts/routers from the - VPCS when you study the Cisco routers in the dynamips. - ''; - inherit (finalAttrs.src.meta) homepage; - license = licenses.bsd2; - platforms = platforms.linux ++ platforms.darwin; - mainProgram = "vpcs"; - maintainers = with maintainers; [ anthonyroussel ]; - }; -}) diff --git a/pkgs/applications/virtualization/x11docker/default.nix b/pkgs/applications/virtualization/x11docker/default.nix index 840c9d648b941..1e400088693b3 100644 --- a/pkgs/applications/virtualization/x11docker/default.nix +++ b/pkgs/applications/virtualization/x11docker/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { description = "Run graphical applications with Docker"; homepage = "https://github.com/mviereck/x11docker"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ ]; + maintainers = [ ]; platforms = lib.platforms.linux; mainProgram = "x11docker"; }; diff --git a/pkgs/applications/virtualization/xen/0000-fix-install-python.4.15.patch b/pkgs/applications/virtualization/xen/0000-fix-install-python.4.15.patch deleted file mode 100644 index 5fc5a6012ee30..0000000000000 --- a/pkgs/applications/virtualization/xen/0000-fix-install-python.4.15.patch +++ /dev/null @@ -1,16 +0,0 @@ -tools/python/install-wrap script brakes shebangs patching, disable - -diff --git a/tools/Rules.mk b/tools/Rules.mk -index 444e5bacdd..c99ea959ff 100644 ---- a/tools/Rules.mk -+++ b/tools/Rules.mk -@@ -135,8 +135,7 @@ CFLAGS += $(CFLAGS-y) - - CFLAGS += $(EXTRA_CFLAGS_XEN_TOOLS) - --INSTALL_PYTHON_PROG = \ -- $(XEN_ROOT)/tools/python/install-wrap "$(PYTHON_PATH)" $(INSTALL_PROG) -+INSTALL_PYTHON_PROG = $(INSTALL_PROG) - - %.opic: %.c - $(CC) $(CPPFLAGS) -DPIC $(CFLAGS) $(CFLAGS_$*.opic) -fPIC -c -o $@ $< $(APPEND_CFLAGS) diff --git a/pkgs/applications/virtualization/xen/0000-qemu-seabios-enable-ATA_DMA.patch b/pkgs/applications/virtualization/xen/0000-qemu-seabios-enable-ATA_DMA.patch deleted file mode 100644 index 339972a2cdeb1..0000000000000 --- a/pkgs/applications/virtualization/xen/0000-qemu-seabios-enable-ATA_DMA.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -uNr a/src/Kconfig b/src/Kconfig ---- a/src/Kconfig 2015-08-31 10:15:13.231134858 +0200 -+++ b/src/Kconfig 2015-08-31 10:14:24.039180178 +0200 -@@ -144,13 +144,13 @@ - config ATA_DMA - depends on ATA - bool "ATA DMA" -- default n -+ default y - help - Detect and try to use ATA bus mastering DMA controllers. - config ATA_PIO32 - depends on ATA - bool "ATA 32bit PIO" -- default n -+ default y - help - Use 32bit PIO accesses on ATA (minor optimization on PCI transfers). - config AHCI diff --git a/pkgs/applications/virtualization/xen/0004-makefile-use-efi-ld.4.15.patch b/pkgs/applications/virtualization/xen/0004-makefile-use-efi-ld.4.15.patch deleted file mode 100644 index c64ec52315c92..0000000000000 --- a/pkgs/applications/virtualization/xen/0004-makefile-use-efi-ld.4.15.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile -index b6567c4127..83defeee95 100644 ---- a/xen/arch/x86/Makefile -+++ b/xen/arch/x86/Makefile -@@ -124,11 +124,11 @@ ifneq ($(efi-y),) - export XEN_BUILD_EFI := $(shell $(CC) $(XEN_CFLAGS) -c efi/check.c -o efi/check.o 2>/dev/null && echo y) - # Check if the linker supports PE. - EFI_LDFLAGS = $(patsubst -m%,-mi386pep,$(XEN_LDFLAGS)) --subsystem=10 --strip-debug --XEN_BUILD_PE := $(if $(XEN_BUILD_EFI),$(shell $(LD) $(EFI_LDFLAGS) -o efi/check.efi efi/check.o 2>/dev/null && echo y)) -+XEN_BUILD_PE := $(if $(XEN_BUILD_EFI),$(shell $(EFI_LD) $(EFI_LDFLAGS) -o efi/check.efi efi/check.o 2>/dev/null && echo y)) - CFLAGS-$(XEN_BUILD_EFI) += -DXEN_BUILD_EFI - # Check if the linker produces fixups in PE by default (we need to disable it doing so for now). - XEN_NO_PE_FIXUPS := $(if $(XEN_BUILD_EFI), \ -- $(shell $(LD) $(EFI_LDFLAGS) --disable-reloc-section -o efi/check.efi efi/check.o 2>/dev/null && \ -+ $(shell $(EFI_LD) $(EFI_LDFLAGS) --disable-reloc-section -o efi/check.efi efi/check.o 2>/dev/null && \ - echo --disable-reloc-section)) - endif - -@@ -217,20 +217,20 @@ note_file_option ?= $(note_file) - ifeq ($(XEN_BUILD_PE),y) - $(TARGET).efi: prelink-efi.o $(note_file) efi.lds efi/relocs-dummy.o efi/mkreloc - $(foreach base, $(VIRT_BASE) $(ALT_BASE), \ -- $(LD) $(call EFI_LDFLAGS,$(base)) -T efi.lds -N $< efi/relocs-dummy.o \ -+ $(EFI_LD) $(call EFI_LDFLAGS,$(base)) -T efi.lds -N $< efi/relocs-dummy.o \ - $(BASEDIR)/common/symbols-dummy.o $(note_file_option) -o $(@D)/.$(@F).$(base).0 &&) : - efi/mkreloc $(foreach base,$(VIRT_BASE) $(ALT_BASE),$(@D)/.$(@F).$(base).0) >$(@D)/.$(@F).0r.S - $(NM) -pa --format=sysv $(@D)/.$(@F).$(VIRT_BASE).0 \ - | $(BASEDIR)/tools/symbols $(all_symbols) --sysv --sort >$(@D)/.$(@F).0s.S - $(MAKE) -f $(BASEDIR)/Rules.mk $(@D)/.$(@F).0r.o $(@D)/.$(@F).0s.o - $(foreach base, $(VIRT_BASE) $(ALT_BASE), \ -- $(LD) $(call EFI_LDFLAGS,$(base)) -T efi.lds -N $< \ -+ $(EFI_LD) $(call EFI_LDFLAGS,$(base)) -T efi.lds -N $< \ - $(@D)/.$(@F).0r.o $(@D)/.$(@F).0s.o $(note_file_option) -o $(@D)/.$(@F).$(base).1 &&) : - efi/mkreloc $(foreach base,$(VIRT_BASE) $(ALT_BASE),$(@D)/.$(@F).$(base).1) >$(@D)/.$(@F).1r.S - $(NM) -pa --format=sysv $(@D)/.$(@F).$(VIRT_BASE).1 \ - | $(BASEDIR)/tools/symbols $(all_symbols) --sysv --sort >$(@D)/.$(@F).1s.S - $(MAKE) -f $(BASEDIR)/Rules.mk $(@D)/.$(@F).1r.o $(@D)/.$(@F).1s.o -- $(LD) $(call EFI_LDFLAGS,$(VIRT_BASE)) -T efi.lds -N $< \ -+ $(EFI_LD) $(call EFI_LDFLAGS,$(VIRT_BASE)) -T efi.lds -N $< \ - $(@D)/.$(@F).1r.o $(@D)/.$(@F).1s.o $(note_file_option) -o $@ - $(NM) -pa --format=sysv $(@D)/$(@F) \ - | $(BASEDIR)/tools/symbols --all-symbols --xensyms --sysv --sort >$(@D)/$(@F).map diff --git a/pkgs/applications/virtualization/xen/0005-makefile-fix-efi-mountdir-use.4.15.patch b/pkgs/applications/virtualization/xen/0005-makefile-fix-efi-mountdir-use.4.15.patch deleted file mode 100644 index 8f07c1a8e29ff..0000000000000 --- a/pkgs/applications/virtualization/xen/0005-makefile-fix-efi-mountdir-use.4.15.patch +++ /dev/null @@ -1,37 +0,0 @@ -EFI_MOUNTPOINT is conventionally /boot/efi or /boot/EFI or something -like that, and (on my machine) has directories within that called -{Boot, nixos, gummiboot}. - -This patch does two things: - -1) Xen apparently wants to put files in -$(EFI_MOUNTPOINT)/efi/$(EFI_VENDOR) - we remove the duplicate 'efi' name -because I can't see why we have it - -2) Ensures the said directory exists - - -diff --git a/xen/Makefile b/xen/Makefile -index acb2d28891..d0763fbbe7 100644 ---- a/xen/Makefile -+++ b/xen/Makefile -@@ -289,7 +289,9 @@ _install: $(TARGET)$(CONFIG_XEN_INSTALL_SUFFIX) - ln -sf $(T)-$(XEN_FULLVERSION).efi $(D)$(EFI_DIR)/$(T)-$(XEN_VERSION).efi; \ - ln -sf $(T)-$(XEN_FULLVERSION).efi $(D)$(EFI_DIR)/$(T).efi; \ - if [ -n '$(EFI_MOUNTPOINT)' -a -n '$(EFI_VENDOR)' ]; then \ -- $(INSTALL_DATA) $(TARGET).efi $(D)$(EFI_MOUNTPOINT)/efi/$(EFI_VENDOR)/$(T)-$(XEN_FULLVERSION).efi; \ -+ [ -d $(D)$(EFI_MOUNTPOINT)/$(EFI_VENDOR) ] || \ -+ $(INSTALL_DIR) $(D)$(EFI_MOUNTPOINT)/$(EFI_VENDOR) ;\ -+ $(INSTALL_DATA) $(TARGET).efi $(D)$(EFI_MOUNTPOINT)/$(EFI_VENDOR)/$(T)-$(XEN_FULLVERSION).efi; \ - elif [ "$(D)" = "$(patsubst $(shell cd $(XEN_ROOT) && pwd)/%,%,$(D))" ]; then \ - echo 'EFI installation only partially done (EFI_VENDOR not set)' >&2; \ - fi; \ -@@ -319,7 +321,7 @@ _uninstall: - rm -f $(D)$(DEBUG_DIR)/$(T)-$(XEN_FULLVERSION).efi.map - rm -f $(D)$(EFI_DIR)/$(T)-$(XEN_VERSION).efi - rm -f $(D)$(EFI_DIR)/$(T).efi -- rm -f $(D)$(EFI_MOUNTPOINT)/efi/$(EFI_VENDOR)/$(T)-$(XEN_FULLVERSION).efi -+ rm -f $(D)$(EFI_MOUNTPOINT)/$(EFI_VENDOR)/$(T)-$(XEN_FULLVERSION).efi - - .PHONY: _debug - _debug: diff --git a/pkgs/applications/virtualization/xen/4.15.nix b/pkgs/applications/virtualization/xen/4.15.nix deleted file mode 100644 index d4905088ae1e3..0000000000000 --- a/pkgs/applications/virtualization/xen/4.15.nix +++ /dev/null @@ -1,183 +0,0 @@ -{ lib, callPackage, fetchurl, fetchpatch, fetchgit -, ocaml-ng -, withInternalQemu ? true -, withInternalTraditionalQemu ? true -, withInternalSeabios ? true -, withSeabios ? !withInternalSeabios, seabios -, withInternalOVMF ? false # FIXME: tricky to build -, withOVMF ? false, OVMF -, withLibHVM ? false - -# xen -, python3Packages - -# qemu -, udev, pciutils, xorg, SDL, pixman, acl, glusterfs, spice-protocol, usbredir -, alsa-lib, glib, python3 -, ... } @ args: - -assert withInternalSeabios -> !withSeabios; -assert withInternalOVMF -> !withOVMF; -assert !withLibHVM; - -with lib; - -# Patching XEN? Check the XSAs at -# https://xenbits.xen.org/xsa/ -# and try applying all the ones we don't have yet. - -let - xsa = import ./xsa-patches.nix { inherit fetchpatch; }; - - qemuMemfdBuildFix = fetchpatch { - name = "xen-4.8-memfd-build-fix.patch"; - url = "https://github.com/qemu/qemu/commit/75e5b70e6b5dcc4f2219992d7cffa462aa406af0.patch"; - sha256 = "0gaz93kb33qc0jx6iphvny0yrd17i8zhcl3a9ky5ylc2idz0wiwa"; - }; - - qemuDeps = [ - udev pciutils xorg.libX11 SDL pixman acl glusterfs spice-protocol usbredir - alsa-lib glib python3 - ]; -in - -callPackage (import ./generic.nix (rec { - version = "4.15.1"; - - src = fetchurl { - url = "https://downloads.xenproject.org/release/xen/${version}/xen-${version}.tar.gz"; - sha256 = "1rmc7gb72xwhr3h9rc3bkac41s8kjjzz45miwdq6yalyq7j7vss5"; - }; - - # Sources needed to build tools and firmwares. - xenfiles = optionalAttrs withInternalQemu { - qemu-xen = { - src = fetchgit { - url = "https://xenbits.xen.org/git-http/qemu-xen.git"; - # rev = "refs/tags/qemu-xen-${version}"; - # use revision hash - reproducible but must be updated with each new version - rev = "e2af2d050338c99e8436e251ad67aafb3ebbd501"; - sha256 = "sha256-gVykPtzAA7tmpe6iVvnulaW+b0jD3gwL1JXC5yeIA7M="; - }; - buildInputs = qemuDeps; - postPatch = '' - # needed in build but /usr/bin/env is not available in sandbox - substituteInPlace scripts/tracetool.py \ - --replace "/usr/bin/env python" "${python3}/bin/python" - ''; - meta.description = "Xen's fork of upstream Qemu"; - }; - } // optionalAttrs withInternalTraditionalQemu { - # TODO 4.15: something happened with traditional in this release? - qemu-xen-traditional = { - src = fetchgit { - url = "https://xenbits.xen.org/git-http/qemu-xen-traditional.git"; - # rev = "refs/tags/xen-${version}"; - # use revision hash - reproducible but must be updated with each new version - rev = "3d273dd05e51e5a1ffba3d98c7437ee84e8f8764"; - sha256 = "1dc6dhjp4y2irmi9yiyw1kzmm1habyy8j1s2zkf6qyak850krqj7"; - }; - buildInputs = qemuDeps; - patches = [ - ]; - postPatch = '' - substituteInPlace xen-hooks.mak \ - --replace /usr/include/pci ${pciutils}/include/pci - ''; - meta.description = "Xen's fork of upstream Qemu that uses old device model"; - }; - } // optionalAttrs withInternalSeabios { - "firmware/seabios-dir-remote" = { - src = fetchgit { - url = "https://xenbits.xen.org/git-http/seabios.git"; - rev = "155821a1990b6de78dde5f98fa5ab90e802021e0"; - sha256 = "sha256-F3lzr00CMAObJtpz0eZFT/rwjFx+bvlI37/JtHXP5Eo="; - }; - patches = [ ./0000-qemu-seabios-enable-ATA_DMA.patch ]; - meta.description = "Xen's fork of Seabios"; - }; - } // optionalAttrs withInternalOVMF { - "firmware/ovmf-dir-remote" = { - src = fetchgit { - url = "https://xenbits.xen.org/git-http/ovmf.git"; - rev = "a3741780fe3535e19e02efa869a7cac481891129"; - sha256 = "0000000000000000000000000000000000000000000000000000"; - }; - meta.description = "Xen's fork of OVMF"; - }; - } // { - # TODO: patch Xen to make this optional? - "firmware/etherboot/ipxe.git" = { - src = fetchgit { - url = "https://git.ipxe.org/ipxe.git"; - rev = "988d2c13cdf0f0b4140685af35ced70ac5b3283c"; - sha256 = "1pkf1n1c0rdlzfls8fvjvi1sd9xjd9ijqlyz3wigr70ijcv6x8i9"; - }; - meta.description = "Xen's fork of iPXE"; - }; - }; - - configureFlags = [] - ++ optional (!withInternalQemu) "--with-system-qemu" # use qemu from PATH - ++ optional (withInternalTraditionalQemu) "--enable-qemu-traditional" - ++ optional (!withInternalTraditionalQemu) "--disable-qemu-traditional" - - ++ optional (withSeabios) "--with-system-seabios=${seabios}/share/seabios" - ++ optional (!withInternalSeabios && !withSeabios) "--disable-seabios" - - ++ optional (withOVMF) "--with-system-ovmf=${OVMF.firmware}" - ++ optional (withInternalOVMF) "--enable-ovmf"; - - NIX_CFLAGS_COMPILE = toString [ - # TODO 4.15: drop unneeded ones - # Fix build on Glibc 2.24. - "-Wno-error=deprecated-declarations" - # Fix build with GCC 8 - "-Wno-error=maybe-uninitialized" - "-Wno-error=stringop-truncation" - "-Wno-error=format-truncation" - "-Wno-error=array-bounds" - # Fix build with GCC 9 - "-Wno-error=address-of-packed-member" - "-Wno-error=format-overflow" - "-Wno-error=absolute-value" - # Fix build with GCC 10 - "-Wno-error=enum-conversion" - "-Wno-error=zero-length-bounds" - # Fix build with GCC 12 - # xentoollog_stubs.c:57: error: "Some_val" redefined [-Werror] - "-Wno-error" - ]; - - patches = with xsa; flatten [ - ./0000-fix-ipxe-src.4.15.patch - ./0000-fix-install-python.4.15.patch - ./0004-makefile-use-efi-ld.4.15.patch - ./0005-makefile-fix-efi-mountdir-use.4.15.patch - - XSA_386 - ]; - - postPatch = '' - # Avoid a glibc >= 2.25 deprecation warnings that get fatal via -Werror. - sed 1i'#include <sys/sysmacros.h>' \ - -i tools/libs/light/libxl_device.c - - # Fix missing pkg-config dir - mkdir -p tools/pkg-config - ''; - - preBuild = '' - # PKG_CONFIG env var collides with variables used in tools Makefiles. - unset PKG_CONFIG - ''; - - passthru = { - qemu-system-i386 = if withInternalQemu - then "lib/xen/bin/qemu-system-i386" - else throw "this xen has no qemu builtin"; - }; - -})) ({ - ocamlPackages = ocaml-ng.ocamlPackages_4_14; -} // args) diff --git a/pkgs/applications/virtualization/xen/4.17/default.nix b/pkgs/applications/virtualization/xen/4.17/default.nix new file mode 100644 index 0000000000000..d270c37f2ce83 --- /dev/null +++ b/pkgs/applications/virtualization/xen/4.17/default.nix @@ -0,0 +1,56 @@ +{ + lib, + fetchpatch, + callPackage, + ocaml-ng, + ... +}@genericDefinition: + +let + upstreamPatches = import ../generic/patches.nix { + inherit lib; + inherit fetchpatch; + }; + + upstreamPatchList = lib.lists.flatten ( + with upstreamPatches; + [ + QUBES_REPRODUCIBLE_BUILDS + XSA_462 + ] + ); +in + +callPackage (import ../generic/default.nix { + pname = "xen"; + branch = "4.17"; + version = "4.17.5"; + latest = false; + pkg = { + xen = { + rev = "430ce6cd936546ad883ecd1c85ddea32d790604b"; + hash = "sha256-UoMdXRW0yWSaQPPV0rgoTZVO2ghdnqWruBHn7+ZjKzI="; + patches = [ ] ++ upstreamPatchList; + }; + qemu = { + rev = "ffb451126550b22b43b62fb8731a0d78e3376c03"; + hash = "sha256-G0hMPid9d3fd1jAY7CiZ33xUZf1hdy96T1VUKFGeHSk="; + patches = [ ]; + }; + seaBIOS = { + rev = "d239552ce7220e448ae81f41515138f7b9e3c4db"; + hash = "sha256-UKMceJhIprN4/4Xe4EG2EvKlanxVcEi5Qcrrk3Ogiik="; + patches = [ ]; + }; + ovmf = { + rev = "7b4a99be8a39c12d3a7fc4b8db9f0eab4ac688d5"; + hash = "sha256-Qq2RgktCkJZBsq6Ch+6tyRHhme4lfcN7d2oQfxwhQt8="; + patches = [ ]; + }; + ipxe = { + rev = "1d1cf74a5e58811822bee4b3da3cff7282fcdfca"; + hash = "sha256-8pwoPrmkpL6jIM+Y/C0xSvyrBM/Uv0D1GuBwNm+0DHU="; + patches = [ ]; + }; + }; +}) ({ ocamlPackages = ocaml-ng.ocamlPackages_4_14; } // genericDefinition) diff --git a/pkgs/applications/virtualization/xen/4.18/default.nix b/pkgs/applications/virtualization/xen/4.18/default.nix new file mode 100644 index 0000000000000..21d6de13f1b03 --- /dev/null +++ b/pkgs/applications/virtualization/xen/4.18/default.nix @@ -0,0 +1,56 @@ +{ + lib, + fetchpatch, + callPackage, + ocaml-ng, + ... +}@genericDefinition: + +let + upstreamPatches = import ../generic/patches.nix { + inherit lib; + inherit fetchpatch; + }; + + upstreamPatchList = lib.lists.flatten ( + with upstreamPatches; + [ + QUBES_REPRODUCIBLE_BUILDS + XSA_462 + ] + ); +in + +callPackage (import ../generic/default.nix { + pname = "xen"; + branch = "4.18"; + version = "4.18.3"; + latest = false; + pkg = { + xen = { + rev = "bd51e573a730efc569646379cd59ccba967cde97"; + hash = "sha256-OFiFdpPCXR+sWjzFHCORtY4DkWyggvxkcsGdgEyO1ts="; + patches = [ ] ++ upstreamPatchList; + }; + qemu = { + rev = "0df9387c8983e1b1e72d8c574356f572342c03e6"; + hash = "sha256-BX+LXfNzwdUMALwwI1ZDW12dJ357oynjnrboLHREDGQ="; + patches = [ ]; + }; + seaBIOS = { + rev = "ea1b7a0733906b8425d948ae94fba63c32b1d425"; + hash = "sha256-J2FuT+FXn9YoFLSfxDOxyKZvKrys59a6bP1eYvEXVNU="; + patches = [ ]; + }; + ovmf = { + rev = "ba91d0292e593df8528b66f99c1b0b14fadc8e16"; + hash = "sha256-htOvV43Hw5K05g0SF3po69HncLyma3BtgpqYSdzRG4s="; + patches = [ ]; + }; + ipxe = { + rev = "1d1cf74a5e58811822bee4b3da3cff7282fcdfca"; + hash = "sha256-8pwoPrmkpL6jIM+Y/C0xSvyrBM/Uv0D1GuBwNm+0DHU="; + patches = [ ]; + }; + }; +}) ({ ocamlPackages = ocaml-ng.ocamlPackages_4_14; } // genericDefinition) diff --git a/pkgs/applications/virtualization/xen/4.19/default.nix b/pkgs/applications/virtualization/xen/4.19/default.nix new file mode 100644 index 0000000000000..a1b1337042855 --- /dev/null +++ b/pkgs/applications/virtualization/xen/4.19/default.nix @@ -0,0 +1,58 @@ +{ + lib, + fetchpatch, + callPackage, + ocaml-ng, + ... +}@genericDefinition: + +let + upstreamPatches = import ../generic/patches.nix { + inherit lib; + inherit fetchpatch; + }; + + upstreamPatchList = lib.lists.flatten ( + with upstreamPatches; + [ + QUBES_REPRODUCIBLE_BUILDS + XSA_460 + XSA_461 + XSA_462 + ] + ); +in + +callPackage (import ../generic/default.nix { + pname = "xen"; + branch = "4.19"; + version = "4.19.0"; + latest = true; + pkg = { + xen = { + rev = "026c9fa29716b0ff0f8b7c687908e71ba29cf239"; + hash = "sha256-Q6x+2fZ4ITBz6sKICI0NHGx773Rc919cl+wzI89UY+Q="; + patches = [ ] ++ upstreamPatchList; + }; + qemu = { + rev = "0df9387c8983e1b1e72d8c574356f572342c03e6"; + hash = "sha256-BX+LXfNzwdUMALwwI1ZDW12dJ357oynjnrboLHREDGQ="; + patches = [ ]; + }; + seaBIOS = { + rev = "a6ed6b701f0a57db0569ab98b0661c12a6ec3ff8"; + hash = "sha256-hWemj83cxdY8p+Jhkh5GcPvI0Sy5aKYZJCsKDjHTUUk="; + patches = [ ]; + }; + ovmf = { + rev = "ba91d0292e593df8528b66f99c1b0b14fadc8e16"; + hash = "sha256-htOvV43Hw5K05g0SF3po69HncLyma3BtgpqYSdzRG4s="; + patches = [ ]; + }; + ipxe = { + rev = "1d1cf74a5e58811822bee4b3da3cff7282fcdfca"; + hash = "sha256-8pwoPrmkpL6jIM+Y/C0xSvyrBM/Uv0D1GuBwNm+0DHU="; + patches = [ ]; + }; + }; +}) ({ ocamlPackages = ocaml-ng.ocamlPackages_4_14; } // genericDefinition) diff --git a/pkgs/applications/virtualization/xen/README.md b/pkgs/applications/virtualization/xen/README.md new file mode 100644 index 0000000000000..07087e2fee230 --- /dev/null +++ b/pkgs/applications/virtualization/xen/README.md @@ -0,0 +1,209 @@ +<p align="center"> + <a href="https://xenproject.org/"> + <picture> + <source + media="(prefers-color-scheme: light)" + srcset="https://downloads.xenproject.org/Branding/Logos/Green+Black/xen_project_logo_dualcolor_2000x832.png"> + <source + media="(prefers-color-scheme: dark)" + srcset="https://xenproject.org/wp-content/uploads/sites/79/2018/09/logo_xenproject.png"> + <img + src="https://downloads.xenproject.org/Branding/Logos/Green+Black/xen_project_logo_dualcolor_2000x832.png" + width="512px" + alt="Xen Project Logo"> + </picture> + </a> +</p> + +# Xen Project Hypervisor <a href="https://xenproject.org/"><img src="https://downloads.xenproject.org/Branding/Mascots/Xen-Fu-Panda-2000px.png" width="48px" align="top" alt="Xen Fu Panda"></a> + +This directory includes the build recipes for the [Xen Project Hypervisor](https://xenproject.org/). + +Some other notable packages that compose the Xen Project Ecosystem include: + +- `ocamlPackages.xenstore`: Mirage's `oxenstore` implementation. +- `ocamlPackages.vchan`: Mirage's `xen-vchan` implementation. +- `ocamlPackages.xenstore-tool`: XAPI's `oxenstore` utilities. +- `xen-guest-agent`: Guest drivers for UNIX domUs. +- `win-pvdrivers`: Guest drivers for Windows domUs. +- `xtf`: The Xen Test Framework. + +## Updating + +### Automatically + +An automated update script is available in this directory. To produce up-to-date +files for all supported Xen branches, simply run `./update.sh`, and follow the +instructions given to you by the script. Notably, it will request that you verify +the Xen Project code signing PGP key. This README understands that the fingerprint +of that key is [`23E3 222C 145F 4475 FA80 60A7 83FE 14C9 57E8 2BD9`](https://keys.openpgp.org/search?q=pgp%40xen.org), +but you should verify this information by seeking the fingerprint from other trusted +sources, as this document may be compromised. Once the PGP key is verified, it will +use `git verify-tag` to ascertain the validity of the cloned Xen sources. + +After the script is done, follow the steps in +[**For Both Update Methods**](#for-both-update-methods) below. + +#### Downstream Patch Names + +The script expects local patch names to follow a certain specification. +Please name any required patches using the template below: + +```console +0000-project-description-branch.patch +``` + +Where: + +1. The first four numbers define the patch order. + **0001** will be applied after **0000**, and so on. +1. `project` means the name of the source the patch should be applied to. + - If you are applying patches to the main Xen sources, use `xen`. + - For the pre-fetched QEMU, use `qemu`. + - For SeaBIOS, use `seabios`. + - For OVMF, use `ovmf`. + - For iPXE, use `ipxe`. +1. `description` is a string with uppercase and lowercase letters, numbers and + dashes. It describes the patch name and what it does to the upstream code. +1. `branch` is the branch for which this patch is supposed to patch. + It should match the name of the directory it is in. + +For example, a patch fixing `xentop`'s output in the 4.15 branch should have +the following name: `0000-xen-xentop-output-4.15.patch`, and it should be added +to the `4.15/` directory. + +### Manually + +The script is not infallible, and it may break in the future. If that happens, +open a PR fixing the script, and update Xen manually: + +1. Check the support matrix to see which branches are security-supported. +1. Create one directory per branch. +1. [Update](https://xenbits.xenproject.org/gitweb/) the `default.nix` files for + the branches that already exist and copy a new one to any branches that do + not yet exist in Nixpkgs. + - Do not forget to set the `branch`, `version`, and `latest` attributes for + each of the `default.nix` files. + - The revisions are preferably commit hashes, but tag names are acceptable + as well. + +### For Both Update Methods + +1. Update `packages.nix` and `../../../top-level/all-packages.nix` with the new + versions. Don't forget the `slim` packages! +1. Make sure all branches build. (Both the `standard` and `slim` versions) +1. Use the NixOS module to test if dom0 boots successfully on all new versions. +1. Make sure the `meta` attributes evaluate to something that makes sense. The + following one-line command is useful for testing this: + + ```console + xenToEvaluate=xen; echo -e "\033[1m$(nix eval .#"$xenToEvaluate".meta.description --raw 2> /dev/null)\033[0m\n\n$(nix eval .#"$xenToEvaluate".meta.longDescription --raw 2> /dev/null)" + ``` + + Change the value of `xenToEvaluate` to evaluate all relevant Xen packages. +1. Run `xtf --all --host` as root when booted into the Xen update, and make + sure no tests fail. +1. Clean up your changes and commit them, making sure to follow the + [Nixpkgs Contribution Guidelines](../../../../CONTRIBUTING.md). +1. Open a PR and await a review from the current maintainers. + +## Features + +### Pre-fetched Sources + +On a typical Xen build, the Xen Makefiles will fetch more required sources with +`git` and `wget`. Due to the Nix Sandbox, build-time fetching will fail, so we +pre-fetch the required sources before building.[^1] To accomplish this, we have +a `prefetchedSources` attribute that contains the required derivations, if they +are requested by the main Xen build. + +### EFI + +Building `xen.efi` requires an `ld` with PE support.[^2] + +We use a `makeFlag` to override the `$LD` environment variable to point to our +patched `efiBinutils`. For more information, see the comment in `./generic/default.nix`. + +> [!TIP] +> If you are certain you will not be running Xen in an x86 EFI environment, disable +the `withEFI` flag with an [override](https://nixos.org/manual/nixpkgs/stable/#chap-overrides) +to save you the need to compile `efiBinutils`. + +### Default Overrides + +By default, Xen also builds +[QEMU](https://www.qemu.org/), +[SeaBIOS](https://www.seabios.org/SeaBIOS), +[OVMF](https://github.com/tianocore/tianocore.github.io/wiki/OVMF) and +[iPXE](https://ipxe.org/). + +- QEMU is used for stubdomains and handling devices. +- SeaBIOS is the default legacy BIOS ROM for HVM domains. +- OVMF is the default UEFI ROM for HVM domains. +- iPXE provides a PXE boot environment for HVMs. + +However, those packages are already available on Nixpkgs, and Xen does not +necessarily need to build them into the main hypervisor build. For this reason, +we also have the `withInternal<Component>` flags, which enables and disables +building those built-in components. The two most popular Xen configurations will +be the default build, with all built-in components, and a `slim` build, with none +of those components. To simplify this process, the `./packages.nix` file includes +the `xen-slim` package overrides that have all `withInternal<Component>` flags +disabled. See the `meta.longDescription` attribute for the `xen-slim` packages +for more information. + +## Security + +We aim to support all **security-supported** versions of Xen at any given time. +See the [Xen Support Matrix](https://xenbits.xen.org/docs/unstable/support-matrix.html) +for a list of versions. As soon as a version is no longer **security-supported**, +it should be removed from Nixpkgs. + +> [!CAUTION] +> Pull requests that introduce XSA patches +should have the `1.severity: security` label. + +### Maintainers + +Xen is a particularly complex piece of software, so we are always looking for new +maintainers. Help out by [making and triaging issues](https://github.com/NixOS/nixpkgs/issues/new/choose), +[sending build fixes and improvements through PRs](https://github.com/NixOS/nixpkgs/compare), +updating the branches, and [patching security flaws](https://xenbits.xenproject.org/xsa/). + +We are also looking for testers, particularly those who can test Xen on AArch64 +machines. Open issues for any build failures or runtime errors you find! + +## Tests + +So far, we only have had one simple automated test that checks for +the correct `pkg-config` output files. + +Due to Xen's nature as a type-1 hypervisor, it is not a trivial matter to design +new tests, as even basic functionality requires a machine booted in a dom0 +kernel. For this reason, most testing done with this package must be done +manually in a NixOS machine with `virtualisation.xen.enable` set to `true`. + +Another unfortunate thing is that none of the Xen commands have a `--version` +flag. This means that `testers.testVersion` cannot ascertain the Xen version. +The only way to verify that you have indeed built the correct version is to +boot into the freshly built Xen kernel and run `xl info`. + +<p align="center"> + <a href="https://xenproject.org/"> + <img + src="https://downloads.xenproject.org/Branding/Mascots/Xen%20Big%20Panda%204242x3129.png" + width="96px" + alt="Xen Fu Panda"> + </a> +</p> + +[^1]: We also produce fake `git`, `wget` and `hostname` binaries that do nothing, + to prevent the build from failing because Xen cannot fetch the sources that + were already fetched by Nix. +[^2]: From the [Xen Documentation](https://xenbits.xenproject.org/docs/unstable/misc/efi.html): + > For x86, building `xen.efi` requires `gcc` 4.5.x or above (4.6.x or newer + recommended, as 4.5.x was probably never really tested for this purpose) + and `binutils` 2.22 or newer. Additionally, the `binutils` build must be + configured to include support for the x86_64-pep emulation (i.e. + `--enable-targets=x86_64-pep` or an option of equivalent effect should be + passed to the configure script). diff --git a/pkgs/applications/virtualization/xen/generic.nix b/pkgs/applications/virtualization/xen/generic.nix deleted file mode 100644 index 826cd8a3d9d84..0000000000000 --- a/pkgs/applications/virtualization/xen/generic.nix +++ /dev/null @@ -1,265 +0,0 @@ -config: -{ lib, stdenv, cmake, pkg-config, which - -# Xen -, bison, bzip2, checkpolicy, dev86, figlet, flex, gettext, glib -, acpica-tools, libaio, libiconv, libuuid, ncurses, openssl, perl -, xz, yajl, zlib -, python3Packages - -# Xen Optional -, ocamlPackages - -# Scripts -, coreutils, gawk, gnused, gnugrep, diffutils, multipath-tools -, iproute2, inetutils, iptables, bridge-utils, openvswitch, nbd, drbd -, util-linux, procps, systemd - -# Documentation -# python3Packages.markdown -, fig2dev, ghostscript, texinfo, pandoc - -, binutils-unwrapped - -, ...} @ args: - -with lib; - -let - #TODO: fix paths instead - scriptEnvPath = concatMapStringsSep ":" (x: "${x}/bin") [ - which perl - coreutils gawk gnused gnugrep diffutils util-linux multipath-tools - iproute2 inetutils iptables bridge-utils openvswitch nbd drbd - ]; - - withXenfiles = f: concatStringsSep "\n" (mapAttrsToList f config.xenfiles); - - withTools = a: f: withXenfiles (name: x: optionalString (hasAttr a x) '' - echo "processing ${name}" - __do() { - cd "tools/${name}" - ${f name x} - } - ( __do ) - ''); - - # We don't want to use the wrapped version, because this version of ld is - # only used for linking the Xen EFI binary, and the build process really - # needs control over the LDFLAGS used - efiBinutils = binutils-unwrapped.overrideAttrs (oldAttrs: { - name = "efi-binutils"; - configureFlags = oldAttrs.configureFlags ++ [ - "--enable-targets=x86_64-pep" - ]; - doInstallCheck = false; # We get a spurious failure otherwise, due to host/target mis-match - }); -in - -stdenv.mkDerivation (rec { - inherit (config) version; - - name = "xen-${version}"; - - dontUseCmakeConfigure = true; - - hardeningDisable = [ "stackprotector" "fortify" "pic" ]; - - nativeBuildInputs = [ pkg-config cmake ]; - buildInputs = [ - which - - # Xen - bison bzip2 checkpolicy dev86 figlet flex gettext glib acpica-tools libaio - libiconv libuuid ncurses openssl perl python3Packages.python xz yajl zlib - - # oxenstored - ocamlPackages.findlib ocamlPackages.ocaml systemd - - # Python fixes - python3Packages.wrapPython - - # Documentation - python3Packages.markdown fig2dev ghostscript texinfo pandoc - - # Others - ] ++ (concatMap (x: x.buildInputs or []) (attrValues config.xenfiles)) - ++ (config.buildInputs or []); - - prePatch = '' - ### Generic fixes - - # Xen's stubdoms, tools and firmwares need various sources that - # are usually fetched at build time using wget and git. We can't - # have that, so we prefetch them in nix-expression and setup - # fake wget and git for debugging purposes. - - mkdir fake-bin - - # Fake git: just print what it wants and die - cat > fake-bin/wget << EOF - #!${stdenv.shell} -e - echo ===== FAKE WGET: Not fetching \$* - [ -e \$3 ] - EOF - - # Fake git: just print what it wants and die - cat > fake-bin/git << EOF - #!${stdenv.shell} - echo ===== FAKE GIT: Not cloning \$* - [ -e \$3 ] - EOF - - chmod +x fake-bin/* - export PATH=$PATH:$PWD/fake-bin - - # Remove in-tree qemu stuff in case we build from a tar-ball - rm -rf tools/qemu-xen tools/qemu-xen-traditional - - # Fix shebangs, mainly for build-scripts - # We want to do this before getting prefetched stuff to speed things up - # (prefetched stuff has lots of files) - find . -type f | xargs sed -i 's@/usr/bin/\(python\|perl\)@/usr/bin/env \1@g' - find . -type f -not -path "./tools/hotplug/Linux/xendomains.in" \ - | xargs sed -i 's@/bin/bash@${stdenv.shell}@g' - - # Get prefetched stuff - ${withXenfiles (name: x: '' - echo "${x.src} -> tools/${name}" - cp -r ${x.src} tools/${name} - chmod -R +w tools/${name} - '')} - ''; - - patches = [ - ] ++ (config.patches or []); - - postPatch = '' - ### Hacks - - # Work around a bug in our GCC wrapper: `gcc -MF foo -v' doesn't - # print the GCC version number properly. - substituteInPlace xen/Makefile \ - --replace '$(CC) $(CFLAGS) -v' '$(CC) -v' - - # Hack to get `gcc -m32' to work without having 32-bit Glibc headers. - mkdir -p tools/include/gnu - touch tools/include/gnu/stubs-32.h - - ### Fixing everything else - - substituteInPlace tools/libfsimage/common/fsimage_plugin.c \ - --replace /usr $out - - substituteInPlace tools/misc/xenpvnetboot \ - --replace /usr/sbin/mount ${util-linux}/bin/mount \ - --replace /usr/sbin/umount ${util-linux}/bin/umount - - substituteInPlace tools/xenmon/xenmon.py \ - --replace /usr/bin/pkill ${procps}/bin/pkill - - ${optionalString (builtins.compareVersions config.version "4.8" >= 0) '' - substituteInPlace tools/hotplug/Linux/launch-xenstore.in \ - --replace /bin/mkdir mkdir - ''} - - ${optionalString (builtins.compareVersions config.version "4.6" < 0) '' - # TODO: use this as a template and support our own if-up scripts instead? - substituteInPlace tools/hotplug/Linux/xen-backend.rules.in \ - --replace "@XEN_SCRIPT_DIR@" $out/etc/xen/scripts - - # blktap is not provided by xen, but by xapi - sed -i '/blktap/d' tools/hotplug/Linux/xen-backend.rules.in - ''} - - ${withTools "patches" (name: x: '' - ${concatMapStringsSep "\n" (p: '' - echo "# Patching with ${p}" - patch -p1 < ${p} - '') x.patches} - '')} - - ${withTools "postPatch" (name: x: x.postPatch)} - - ${config.postPatch or ""} - ''; - - postConfigure = '' - substituteInPlace tools/hotplug/Linux/xendomains \ - --replace /bin/ls ls - ''; - - EFI_LD = "${efiBinutils}/bin/ld"; - EFI_VENDOR = "nixos"; - - # TODO: Flask needs more testing before enabling it by default. - #makeFlags = [ "XSM_ENABLE=y" "FLASK_ENABLE=y" "PREFIX=$(out)" "CONFIG_DIR=/etc" "XEN_EXTFILES_URL=\\$(XEN_ROOT)/xen_ext_files" ]; - makeFlags = [ "PREFIX=$(out) CONFIG_DIR=/etc" "XEN_SCRIPT_DIR=/etc/xen/scripts" ] - ++ (config.makeFlags or []); - - preBuild = '' - ${config.preBuild or ""} - ''; - - buildFlags = [ "xen" "tools" ]; - - postBuild = '' - make -C docs man-pages - - ${withTools "buildPhase" (name: x: x.buildPhase)} - ''; - - installPhase = '' - mkdir -p $out $out/share $out/share/man - cp -prvd dist/install/nix/store/*/* $out/ - cp -prvd dist/install/boot $out/boot - cp -prvd dist/install/etc $out - cp -dR docs/man1 docs/man5 $out/share/man/ - - ${withTools "installPhase" (name: x: x.installPhase)} - - # Hack - substituteInPlace $out/etc/xen/scripts/hotplugpath.sh \ - --replace SBINDIR=\"$out/sbin\" SBINDIR=\"$out/bin\" - - wrapPythonPrograms - # We also need to wrap pygrub, which lies in lib - wrapPythonProgramsIn "$out/lib" "$out $pythonPath" - - shopt -s extglob - for i in $out/etc/xen/scripts/!(*.sh); do - sed -i "2s@^@export PATH=$out/bin:${scriptEnvPath}\n@" $i - done - ''; - - enableParallelBuilding = true; - - # TODO(@oxij): Stop referencing args here - meta = { - homepage = "http://www.xen.org/"; - description = "Xen hypervisor and related components" - + optionalString (args ? meta && args.meta ? description) - " (${args.meta.description})"; - longDescription = (args.meta.longDescription or "") - + "\nIncludes:\n" - + withXenfiles (name: x: "* ${name}: ${x.meta.description or "(No description)"}."); - platforms = [ "x86_64-linux" ]; - maintainers = [ ]; - license = lib.licenses.gpl2; - knownVulnerabilities = [ - # https://www.openwall.com/lists/oss-security/2023/03/21/1 - # Affects 3.2 (at *least*) - 4.17 - "CVE-2022-42332" - # https://www.openwall.com/lists/oss-security/2023/03/21/2 - # Affects 4.11 - 4.17 - "CVE-2022-42333" - "CVE-2022-42334" - # https://www.openwall.com/lists/oss-security/2023/03/21/3 - # Affects 4.15 - 4.17 - "CVE-2022-42331" - # https://xenbits.xen.org/docs/unstable/support-matrix.html - ] ++ lib.optionals (lib.versionOlder version "4.15") [ - "This version of Xen has reached its end of life. See https://xenbits.xen.org/docs/unstable/support-matrix.html" - ]; - } // (config.meta or {}); -} // removeAttrs config [ "xenfiles" "buildInputs" "patches" "postPatch" "meta" ]) diff --git a/pkgs/applications/virtualization/xen/0000-fix-ipxe-src.4.15.patch b/pkgs/applications/virtualization/xen/generic/0000-xen-ipxe-src-generic.patch index 08e9aa5ad2fb9..d96023d1946ae 100644 --- a/pkgs/applications/virtualization/xen/0000-fix-ipxe-src.4.15.patch +++ b/pkgs/applications/virtualization/xen/generic/0000-xen-ipxe-src-generic.patch @@ -1,21 +1,21 @@ -hack to make etherboot use prefetched ipxe +Hack to make etherboot use pre-fetched iPXE. diff --git a/tools/firmware/etherboot/Makefile b/tools/firmware/etherboot/Makefile index ed9e11305f..979a3acea8 100644 --- a/tools/firmware/etherboot/Makefile +++ b/tools/firmware/etherboot/Makefile @@ -16,6 +16,7 @@ IPXE_TARBALL_URL ?= $(XEN_EXTFILES_URL)/ipxe-git-$(IPXE_GIT_TAG).tar.gz - + D=ipxe T=ipxe.tar.gz +G=ipxe.git - + ROMS = $(addprefix $D/src/bin/, $(addsuffix .rom, $(ETHERBOOT_NICS))) ROM = $D/src/bin/ipxe.bin @@ -41,9 +42,9 @@ $T: fi mv _$T $T - + -$D/src/arch/i386/Makefile: $T Config - rm -rf $D - gzip -dc $T | tar xf - diff --git a/pkgs/applications/virtualization/xen/generic/default.nix b/pkgs/applications/virtualization/xen/generic/default.nix new file mode 100644 index 0000000000000..250e5a41bfc1f --- /dev/null +++ b/pkgs/applications/virtualization/xen/generic/default.nix @@ -0,0 +1,726 @@ +versionDefinition: +{ + lib, + stdenv, + autoPatchelfHook, + cmake, + ninja, + pkg-config, + testers, + which, + + fetchgit, + fetchFromGitHub, + + # Xen + acpica-tools, + bison, + bzip2, + dev86, + e2fsprogs, + flex, + libnl, + libuuid, + lzo, + ncurses, + ocamlPackages, + perl, + python311Packages, + systemdMinimal, + xz, + yajl, + zlib, + zstd, + + # Xen Optional + withInternalQEMU ? true, + pixman, + glib, + + withInternalSeaBIOS ? true, + withSeaBIOS ? !withInternalSeaBIOS, + seabios, + + withInternalOVMF ? true, + withOVMF ? !withInternalOVMF, + OVMF, + nasm, + + withInternalIPXE ? true, + withIPXE ? !withInternalIPXE, + ipxe, + + withFlask ? false, + checkpolicy, + + efiVendor ? "nixos", # Allow downstreams with custom branding to quickly override the EFI Vendor string. + withEFI ? true, + binutils-unwrapped, + + # Documentation + pandoc, + + # Scripts + bridge-utils, + coreutils, + diffutils, + gawk, + gnugrep, + gnused, + inetutils, + iproute2, + iptables, + multipath-tools, + nbd, + openvswitch, + util-linux, + ... +}@packageDefinition: + +let + #TODO: fix paths instead. + scriptEnvPath = lib.strings.makeSearchPathOutput "out" "bin" [ + bridge-utils + coreutils + diffutils + gawk + gnugrep + gnused + inetutils + iproute2 + iptables + multipath-tools + nbd + openvswitch + perl + util-linux.bin + which + ]; + + # Inherit attributes from a versionDefinition. + inherit (versionDefinition) + pname + branch + version + latest + pkg + ; + + # Mark versions older than minSupportedVersion as EOL. + minSupportedVersion = "4.17"; + + ## Pre-fetched Source Handling ## + + # Main attribute set for sources needed to build tools and firmwares. + # Each source takes in: + # * A `src` attribute, which contains the actual fetcher, + # * A 'patches` attribute, which is a list of patches that need to be applied in the source. + # * A `path` attribute, which is the destination of the source inside the Xen tree. + prefetchedSources = + lib.attrsets.optionalAttrs withInternalQEMU { + qemu = { + src = fetchgit { + url = "https://xenbits.xenproject.org/git-http/qemu-xen.git"; + fetchSubmodules = true; + inherit (pkg.qemu) rev hash; + }; + patches = lib.lists.optionals (lib.attrsets.hasAttrByPath [ "patches" ] pkg.qemu) pkg.qemu.patches; + path = "tools/qemu-xen"; + }; + } + // lib.attrsets.optionalAttrs withInternalSeaBIOS { + seaBIOS = { + src = fetchgit { + url = "https://xenbits.xenproject.org/git-http/seabios.git"; + inherit (pkg.seaBIOS) rev hash; + }; + patches = lib.lists.optionals (lib.attrsets.hasAttrByPath [ + "patches" + ] pkg.seaBIOS) pkg.seaBIOS.patches; + path = "tools/firmware/seabios-dir-remote"; + }; + } + // lib.attrsets.optionalAttrs withInternalOVMF { + ovmf = { + src = fetchgit { + url = "https://xenbits.xenproject.org/git-http/ovmf.git"; + fetchSubmodules = true; + inherit (pkg.ovmf) rev hash; + }; + patches = lib.lists.optionals (lib.attrsets.hasAttrByPath [ "patches" ] pkg.ovmf) pkg.ovmf.patches; + path = "tools/firmware/ovmf-dir-remote"; + }; + } + // lib.attrsets.optionalAttrs withInternalIPXE { + ipxe = { + src = fetchFromGitHub { + owner = "ipxe"; + repo = "ipxe"; + inherit (pkg.ipxe) rev hash; + }; + patches = lib.lists.optionals (lib.attrsets.hasAttrByPath [ "patches" ] pkg.ipxe) pkg.ipxe.patches; + path = "tools/firmware/etherboot/ipxe.git"; + }; + }; + + # Gets a list containing the names of the top-level attribute for each pre-fetched + # source, to be used in the map functions below. + prefetchedSourcesList = lib.attrsets.mapAttrsToList (name: value: name) prefetchedSources; + + # Produces bash commands that will copy each pre-fetched source. + copyPrefetchedSources = + # Finish the deployment by concatnating the list of commands together. + lib.strings.concatLines ( + # Iterate on each pre-fetched source. + builtins.map ( + source: + # Only produce a copy command if patches exist. + lib.strings.optionalString (lib.attrsets.hasAttrByPath [ "${source}" ] prefetchedSources) + # The actual copy command. `src` is always an absolute path to a fetcher output + # inside the /nix/store, and `path` is always a path relative to the Xen root. + # We need to `mkdir -p` the target directory first, and `chmod +w` the contents last, + # as the copied files will still be edited by the postPatchPhase. + '' + echo "Copying ${prefetchedSources.${source}.src} -> ${prefetchedSources.${source}.path}" + mkdir --parents ${prefetchedSources.${source}.path} + cp --recursive --no-target-directory ${prefetchedSources.${source}.src} ${ + prefetchedSources.${source}.path + } + chmod --recursive +w ${prefetchedSources.${source}.path} + '' + ) prefetchedSourcesList + ); + + # Produces strings with `patch` commands to be ran on postPatch. + # These deploy the .patch files for each pre-fetched source. + deployPrefetchedSourcesPatches = + # Finish the deployment by concatnating the list of commands together. + lib.strings.concatLines ( + # The double map functions create a list of lists. Flatten it so we can concatnate it. + lib.lists.flatten ( + # Iterate on each pre-fetched source. + builtins.map ( + source: + # Iterate on each available patch. + (builtins.map ( + patch: + # Only produce a patch command if patches exist. + lib.strings.optionalString + (lib.attrsets.hasAttrByPath [ + "${source}" + "patches" + ] prefetchedSources) + # The actual patch command. It changes directories to the correct source each time. + '' + echo "Applying patch ${patch} to ${source}." + patch --directory ${prefetchedSources.${source}.path} --strip 1 < ${patch} + '' + ) prefetchedSources.${source}.patches) + ) prefetchedSourcesList + ) + ); + + ## XSA Patches Description Builder ## + + # Sometimes patches are sourced through a path, like ./0000-xen.patch. + # This would break the patch attribute parser functions, so we normalise + # all patches sourced through paths by setting them to a { type = "path"; } + # attribute set. + # Patches from fetchpatch are already attribute sets. + normalisedPatchList = builtins.map ( + patch: + if !builtins.isAttrs patch then + if builtins.isPath patch then + { type = "path"; } + else + throw "xen/generic/default.nix: normalisedPatchList attempted to normalise something that is not a Path or an Attribute Set." + else + patch + ) pkg.xen.patches; + + # Simple counter for the number of attrsets (patches) in the patches list after normalisation. + numberOfPatches = lib.lists.count (patch: builtins.isAttrs patch) normalisedPatchList; + + # builtins.elemAt's index begins at 0, so we subtract 1 from the number of patches in order to + # produce the range that will be used in the following builtin.map calls. + availablePatchesToTry = lib.lists.range 0 (numberOfPatches - 1); + + # Takes in an attrByPath input, and outputs the attribute value for each patch in a list. + # If a patch does not have a given attribute, returns `null`. Use lib.lists.remove null + # to remove these junk values, if necessary. + retrievePatchAttributes = + attributeName: + builtins.map ( + x: lib.attrsets.attrByPath attributeName null (builtins.elemAt normalisedPatchList x) + ) availablePatchesToTry; + + # Produces a list of newline-separated strings that lists the vulnerabilities this + # Xen is NOT affected by, due to the applied Xen Security Advisory patches. This is + # then used in meta.longDescription, to let users know their Xen is patched against + # known vulnerabilities, as the package version isn't always the best indicator. + # + # Produces something like this: (one string for each XSA) + # * [Xen Security Advisory #1](https://xenbits.xenproject.org/xsa/advisory-1.html): **Title for XSA.** + # >Description of issue in XSA + #Extra lines + #are not indented, + #but markdown should be + #fine with it. + # Fixes: + # * [CVE-1999-00001](https://www.cve.org/CVERecord?id=CVE-1999-00001) + # * [CVE-1999-00002](https://www.cve.org/CVERecord?id=CVE-1999-00002) + # * [CVE-1999-00003](https://www.cve.org/CVERecord?id=CVE-1999-00003) + writeAdvisoryDescription = + if (lib.lists.remove null (retrievePatchAttributes [ "xsa" ]) != [ ]) then + lib.lists.zipListsWith (a: b: a + b) + (lib.lists.zipListsWith (a: b: a + "**" + b + ".**\n >") + (lib.lists.zipListsWith (a: b: "* [Xen Security Advisory #" + a + "](" + b + "): ") + (lib.lists.remove null (retrievePatchAttributes [ "xsa" ])) + ( + lib.lists.remove null (retrievePatchAttributes [ + "meta" + "homepage" + ]) + ) + ) + ( + lib.lists.remove null (retrievePatchAttributes [ + "meta" + "description" + ]) + ) + ) + ( + lib.lists.remove null (retrievePatchAttributes [ + "meta" + "longDescription" + ]) + ) + else + [ ]; + + ## Binutils Override ## + + # Originally, there were two versions of binutils being used: the standard one and + # this patched one. Unfortunately, that required patches to the Xen Makefiles, and + # quickly became too complex to maintain. The new solution is to simply build this + # efi-binutils derivation and use it for the whole build process, except if + # enableEFI is disabled; it'll then use `binutils`. + efiBinutils = binutils-unwrapped.overrideAttrs (oldAttrs: { + name = "efi-binutils"; + configureFlags = oldAttrs.configureFlags ++ [ "--enable-targets=x86_64-pep" ]; + doInstallCheck = false; # We get a spurious failure otherwise, due to a host/target mismatch. + meta.mainProgram = "ld"; # We only really care for `ld`. + }); +in + +stdenv.mkDerivation (finalAttrs: { + inherit pname version; + + outputs = [ + "out" # TODO: Split $out in $bin for binaries and $lib for libraries. + "man" # Manual pages for Xen userspace utilities. + "doc" # The full Xen documentation in HTML format. + "dev" # Development headers. + "boot" # xen.gz kernel, policy file if Flask is enabled, xen.efi if EFI is enabled. + ]; + + # Main Xen source. + src = fetchgit { + url = "https://xenbits.xenproject.org/git-http/xen.git"; + inherit (pkg.xen) rev hash; + }; + + patches = + # Generic Xen patches that apply to all Xen versions. + [ ./0000-xen-ipxe-src-generic.patch ] + # Gets the patches from the pkg.xen.patches attribute from the versioned files. + ++ lib.lists.optionals (lib.attrsets.hasAttrByPath [ "patches" ] pkg.xen) pkg.xen.patches; + + nativeBuildInputs = + [ + autoPatchelfHook + bison + cmake + flex + pandoc + pkg-config + ] + ++ lib.lists.optionals withInternalQEMU [ + ninja + python311Packages.sphinx + ]; + buildInputs = + [ + # Xen + acpica-tools + bzip2 + dev86 + e2fsprogs.dev + libnl + libuuid + lzo + ncurses + perl + python311Packages.python + xz + yajl + zlib + zstd + + # oxenstored + ocamlPackages.findlib + ocamlPackages.ocaml + + # Python Fixes + python311Packages.wrapPython + ] + ++ lib.lists.optionals withInternalQEMU [ + glib + pixman + ] + ++ lib.lists.optional withInternalOVMF nasm + ++ lib.lists.optional withFlask checkpolicy + ++ lib.lists.optional (lib.strings.versionOlder version "4.19") systemdMinimal; + + configureFlags = + [ + "--enable-systemd" + "--disable-qemu-traditional" + ] + ++ lib.lists.optional (!withInternalQEMU) "--with-system-qemu" + + ++ lib.lists.optional withSeaBIOS "--with-system-seabios=${seabios}/share/seabios" + ++ lib.lists.optional (!withInternalSeaBIOS && !withSeaBIOS) "--disable-seabios" + + ++ lib.lists.optional withOVMF "--with-system-ovmf=${OVMF.firmware}" + ++ lib.lists.optional withInternalOVMF "--enable-ovmf" + + ++ lib.lists.optional withIPXE "--with-system-ipxe=${ipxe}" + ++ lib.lists.optional withInternalIPXE "--enable-ipxe" + + ++ lib.lists.optional withFlask "--enable-xsmpolicy"; + + makeFlags = + [ + "PREFIX=$(out)" + "CONFIG_DIR=/etc" + "XEN_SCRIPT_DIR=$(CONFIG_DIR)/xen/scripts" + "BASH_COMPLETION_DIR=$(PREFIX)/share/bash-completion/completions" + ] + ++ lib.lists.optionals withEFI [ + "EFI_VENDOR=${efiVendor}" + "INSTALL_EFI_STRIP=1" + "LD=${lib.meta.getExe efiBinutils}" # See the comment in the efiBinutils definition above. + ] + # These flags set the CONFIG_* options in /boot/xen.config + # and define if the default policy file is built. However, + # the Flask binaries always get compiled by default. + ++ lib.lists.optionals withFlask [ + "XSM_ENABLE=y" + "FLASK_ENABLE=y" + ] + ++ (pkg.xen.makeFlags or [ ]); + + buildFlags = [ + "xen" # Build the Xen Hypervisor. + "tools" # Build the userspace tools, such as `xl`. + "docs" # Build the Xen Documentation + ]; + + enableParallelBuilding = true; + + env.NIX_CFLAGS_COMPILE = builtins.toString ( + [ + "-Wno-error=maybe-uninitialized" + "-Wno-error=array-bounds" + ] + ++ lib.lists.optionals withInternalOVMF [ + "-Wno-error=format-security" + "-Wno-error=use-after-free" + "-Wno-error=vla-parameter" + "-Wno-error=dangling-pointer" + "-Wno-error=stringop-overflow" + ] + ); + + dontUseCmakeConfigure = true; + dontUseNinjaBuild = withInternalQEMU; + + prePatch = + # Xen's stubdoms, tools and firmwares need various sources that + # are usually fetched at build time using wget and git. We can't + # have that, so we pre-fetch them in the versioned Nix expressions, + # and produce fake wget and git executables for debugging purposes. + # + # We also produce a fake hostname executable to prevent spurious + # command-not-found errors during compilation. + # + # The snippet below produces executables that simply print in stdout + # what they were supposed to fetch, and exit gracefully. + '' + mkdir fake-bin + + cat > fake-bin/wget << EOF + #!${stdenv.shell} -e + echo ===== FAKE WGET: Not fetching \$* + [ -e \$3 ] + EOF + + cat > fake-bin/git << EOF + #!${stdenv.shell} + echo ===== FAKE GIT: Not cloning \$* + [ -e \$3 ] + EOF + + cat > fake-bin/hostname << EOF + #!${stdenv.shell} + echo ${efiVendor} + [ -e \$3 ] + EOF + + chmod +x fake-bin/* + export PATH=$PATH:$PWD/fake-bin + '' + + # Remove in-tree QEMU sources, as we either pre-fetch them through + # the versioned Nix expressions if withInternalQEMU is true, or we + # don't build QEMU at all if withInternalQEMU is false. + + '' + rm --recursive --force tools/qemu-xen tools/qemu-xen-traditional + '' + + # Call copyPrefetchedSources, which copies all aviable sources to their correct positions. + + '' + ${copyPrefetchedSources} + ''; + + postPatch = + # The following patch forces Xen to install xen.efi on $out/boot + # instead of $out/boot/efi/efi/nixos, as the latter directory + # would otherwise need to be created manually. This also creates + # a more consistent output for downstreams who override the + # efiVendor attribute above. + '' + substituteInPlace xen/Makefile \ + --replace-fail "\$(D)\$(EFI_MOUNTPOINT)/efi/\$(EFI_VENDOR)/\$(T)-\$(XEN_FULLVERSION).efi" \ + "\$(D)\$(BOOT_DIR)/\$(T)-\$(XEN_FULLVERSION).efi" + '' + + # The following patch fixes the call to /bin/mkdir on the + # launch_xenstore.sh helper script. + + '' + substituteInPlace tools/hotplug/Linux/launch-xenstore.in \ + --replace-fail "/bin/mkdir" "${coreutils}/bin/mkdir" + '' + + # The following expression fixes the paths called by Xen's systemd + # units, so we can use them in the NixOS module. + + '' + substituteInPlace \ + tools/hotplug/Linux/systemd/{xen-init-dom0,xen-qemu-dom0-disk-backend,xenconsoled,xendomains,xenstored}.service.in \ + --replace-fail /bin/grep ${gnugrep}/bin/grep + substituteInPlace \ + tools/hotplug/Linux/systemd/{xen-qemu-dom0-disk-backend,xenconsoled}.service.in \ + --replace-fail "/bin/mkdir" "${coreutils}/bin/mkdir" + '' + + # # Call deployPrefetchedSourcesPatches, which patches all pre-fetched sources with their specified patchlists. + + '' + ${deployPrefetchedSourcesPatches} + '' + # Patch shebangs for QEMU and OVMF build scripts. + + lib.strings.optionalString withInternalQEMU '' + patchShebangs --build tools/qemu-xen/scripts/tracetool.py + '' + + lib.strings.optionalString withInternalOVMF '' + patchShebangs --build tools/firmware/ovmf-dir-remote/OvmfPkg/build.sh tools/firmware/ovmf-dir-remote/BaseTools/BinWrappers/PosixLike/{AmlToC,BrotliCompress,build,GenFfs,GenFv,GenFw,GenSec,LzmaCompress,TianoCompress,Trim,VfrCompile} + ''; + + installPhase = + let + cpFlags = builtins.toString [ + "--preserve=mode,ownership,timestamps,link" + "--recursive" + "--verbose" + "--no-dereference" + ]; + in + # Run the preInstall tasks. + '' + runHook preInstall + '' + + # Create $out directories and copy build output. + + '' + mkdir --parents $out $out/share $boot + cp ${cpFlags} dist/install/nix/store/*/* $out/ + cp ${cpFlags} dist/install/etc $out + cp ${cpFlags} dist/install/boot $boot + '' + + # Run the postInstall tasks. + + '' + runHook postInstall + ''; + + postInstall = + # Wrap xencov_split, xenmon and xentrace_format. + '' + wrapPythonPrograms + '' + + # We also need to wrap pygrub, which lies in $out/libexec/xen/bin. + + '' + wrapPythonProgramsIn "$out/libexec/xen/bin" "$out $pythonPath" + '' + + # Fix shebangs in Xen's various scripts. + #TODO: Remove any and all usage of `sed` and replace these complicated magic runes with readable code. + + '' + shopt -s extglob + for i in $out/etc/xen/scripts/!(*.sh); do + sed --in-place "2s@^@export PATH=$out/bin:${scriptEnvPath}\n@" $i + done + ''; + + postFixup = + # Fix binaries in $out/libexec/xen/bin. + '' + addAutoPatchelfSearchPath $out/lib + autoPatchelf $out/libexec/xen/bin + '' + # Flask is particularly hard to disable. Even after + # setting the make flags to `n`, it still gets compiled. + # If withFlask is disabled, delete the extra binaries. + + lib.strings.optionalString (!withFlask) '' + rm -f $out/bin/flask-* + ''; + + passthru = { + efi = + if withEFI then "boot/xen-${version}.efi" else throw "This Xen was compiled without an EFI binary."; + flaskPolicy = + if withFlask then + "boot/xenpolicy-${version}" + else + throw "This Xen was compiled without FLASK support."; + qemu-system-i386 = + if withInternalQEMU then + "libexec/xen/bin/qemu-system-i386" + else + throw "This Xen was compiled without a built-in QEMU."; + # This test suite is very simple, as Xen's userspace + # utilities require the hypervisor to be booted. + tests = { + pkg-config = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; + moduleNames = [ + "xencall" + "xencontrol" + "xendevicemodel" + "xenevtchn" + "xenforeignmemory" + "xengnttab" + "xenguest" + "xenhypfs" + "xenlight" + "xenstat" + "xenstore" + "xentoolcore" + "xentoollog" + "xenvchan" + "xlutil" + ]; + }; + }; + }; + + meta = + if + !(lib.attrsets.hasAttrByPath [ + "meta" + ] versionDefinition) + then + { + inherit branch; + + # Short description for Xen. + description = + "Xen Project Hypervisor" + # The "and related components" addition is automatically hidden if said components aren't being built. + + lib.strings.optionalString (prefetchedSources != { }) " and related components" + # To alter the description inside the paranthesis, edit ./packages.nix. + + lib.strings.optionalString (lib.attrsets.hasAttrByPath [ + "meta" + "description" + ] packageDefinition) " (${packageDefinition.meta.description})"; + + # Long description for Xen. + longDescription = + # Starts with the longDescription from ./packages.nix. + (packageDefinition.meta.longDescription or "") + + lib.strings.optionalString (!withInternalQEMU) ( + "\nUse with `qemu_xen_${lib.strings.stringAsChars (x: if x == "." then "_" else x) branch}`" + + lib.strings.optionalString latest " or `qemu_xen`" + + ".\n" + ) + # Then, if any of the optional with* components are being built, add the "Includes:" string. + + + lib.strings.optionalString + ( + withInternalQEMU + || withInternalSeaBIOS + || withInternalOVMF + || withInternalIPXE + || withEFI + || withFlask + ) + ( + "\nIncludes:" + # Originally, this was a call for the complicated withPrefetchedSources. Since there aren't + # that many optional components, we just use lib.strings.optionalString, because it's simpler. + # Optional components that aren't being built are automatically hidden. + + lib.strings.optionalString withEFI "\n* `xen.efi`: The Xen Project's [EFI binary](https://xenbits.xenproject.org/docs/${branch}-testing/misc/efi.html), available on the `boot` output of this package." + + lib.strings.optionalString withFlask "\n* `xsm-flask`: The [FLASK Xen Security Module](https://wiki.xenproject.org/wiki/Xen_Security_Modules_:_XSM-FLASK). The `xenpolicy-${version}` file is available on the `boot` output of this package." + + lib.strings.optionalString withInternalQEMU "\n* `qemu-xen`: The Xen Project's mirror of [QEMU](https://www.qemu.org/)." + + lib.strings.optionalString withInternalSeaBIOS "\n* `seabios-xen`: The Xen Project's mirror of [SeaBIOS](https://www.seabios.org/SeaBIOS)." + + lib.strings.optionalString withInternalOVMF "\n* `ovmf-xen`: The Xen Project's mirror of [OVMF](https://github.com/tianocore/tianocore.github.io/wiki/OVMF)." + + lib.strings.optionalString withInternalIPXE "\n* `ipxe-xen`: The Xen Project's pinned version of [iPXE](https://ipxe.org/)." + ) + # Finally, we write a notice explaining which vulnerabilities this Xen is NOT vulnerable to. + # This will hopefully give users the peace of mind that their Xen is secure, without needing + # to search the source code for the XSA patches. + + lib.strings.optionalString (writeAdvisoryDescription != [ ]) ( + "\n\nThis Xen Project Hypervisor (${version}) has been patched against the following known security vulnerabilities:\n" + + lib.strings.removeSuffix "\n" (lib.strings.concatLines writeAdvisoryDescription) + ); + + homepage = "https://xenproject.org/"; + downloadPage = "https://downloads.xenproject.org/release/xen/${version}/"; + changelog = "https://wiki.xenproject.org/wiki/Xen_Project_${branch}_Release_Notes"; + + license = with lib.licenses; [ + # Documentation. + cc-by-40 + # Most of Xen is licensed under the GPL v2.0. + gpl2Only + # Xen Libraries and the `xl` command-line utility. + lgpl21Only + # Development headers in $dev/include. + mit + ]; + + # This automatically removes maintainers from EOL versions of Xen, so we aren't bothered about versions we don't explictly support. + maintainers = lib.lists.optionals (lib.strings.versionAtLeast version minSupportedVersion) lib.teams.xen.members; + knownVulnerabilities = lib.lists.optional (lib.strings.versionOlder version minSupportedVersion) "The Xen Project Hypervisor version ${version} is no longer supported by the Xen Project Security Team. See https://xenbits.xenproject.org/docs/unstable/support-matrix.html"; + + mainProgram = "xl"; + + # Evaluates to x86_64-linux. + platforms = lib.lists.intersectLists lib.platforms.linux lib.platforms.x86_64; + + } + else + versionDefinition.meta; +}) diff --git a/pkgs/applications/virtualization/xen/generic/patches.nix b/pkgs/applications/virtualization/xen/generic/patches.nix new file mode 100644 index 0000000000000..4bb58d5a42160 --- /dev/null +++ b/pkgs/applications/virtualization/xen/generic/patches.nix @@ -0,0 +1,159 @@ +# Patching Xen? Check the XSAs at https://xenbits.xen.org/xsa/ +# and try applying all the ones we haven't gotten around to +# yet, if any are necessary. Patches from other downstreams +# are also welcome if they fix important issues with vanilla Xen. + +{ lib, fetchpatch }: + +let + xsaPatch = + { + id, + title, + description, + type ? "xsa", + hash ? "", + cve ? null, + }: + (fetchpatch { + name = + "XSA-" + id + lib.strings.optionalString (cve != null) ("-" + builtins.concatStringsSep "+" cve); + url = "https://xenbits.xen.org/xsa/xsa${id}.patch"; + inherit hash; + passthru = { + xsa = id; + inherit type; + }; + meta = { + description = title; + longDescription = + description + + "\n" + + ( + if (cve == null) then + # Why the two spaces preceding these CVE messages? + # This is parsed by writeAdvisoryDescription in generic.nix, + # and doing this was easier than messing with lib.strings even more. + " _No CVE was assigned to this XSA._" + else + " Fixes:${ + lib.strings.concatMapStrings ( + x: "\n * [" + x + "](https://www.cve.org/CVERecord?id=" + x + ")" + ) cve + }" + ); + homepage = "https://xenbits.xenproject.org/xsa/advisory-${id}.html"; + }; + }); + qubesPatch = + { + name, + tag, + type ? "qubes", + hash ? "", + }: + (fetchpatch { + inherit name; + url = "https://raw.githubusercontent.com/QubesOS/qubes-vmm-xen/v${tag}/${name}.patch"; + inherit hash; + passthru.type = type; + }); +in +{ + # Example patches: + # + # "XSA_100" = xsaPatch { + # id = "100"; + # title = "Verbatim Title of XSA"; + # description = '' + # Verbatim description of XSA. + # ''; + # cve = [ "CVE-1999-0001" "CVE-1999-0002" ]; # Not all XSAs have CVEs. This attribute is optional. + # hash = "sha256-0000000000000000000000000000000000000000000000000000"; + # }; + # + # "QUBES_libxl-fix-all-issues" = qubesPatch { + # name = "1000-libxl-fix-all-issues"; + # tag = "4.20.0-1"; + # hash = "sha256-0000000000000000000000000000000000000000000000000000"; + # }; + + # Build reproducibility patches for Xen. + # Qubes OS has not updated them to later versions of Xen yet, + # but they appear to work on Xen 4.17.4 - 4.19.0. + QUBES_REPRODUCIBLE_BUILDS = [ + (qubesPatch { + name = "1100-Define-build-dates-time-based-on-SOURCE_DATE_EPOCH"; + tag = "4.17.4-5"; + hash = "sha256-OwKA9oPTwhRcSmiOb+PxzifbO/IG8IHWlvddFh/nP6s="; + }) + (qubesPatch { + name = "1101-docs-rename-DATE-to-PANDOC_REL_DATE-and-allow-to-spe"; + tag = "4.17.4-5"; + hash = "sha256-BUtYt0mM3bURVaGv4oDznzxx1Wo4sfOpGV5GB8qc5Ns="; + }) + (qubesPatch { + name = "1102-docs-xen-headers-use-alphabetical-sorting-for-incont"; + tag = "4.17.4-5"; + hash = "sha256-mQUp2w9lUb7KDq5MuPQjs6y7iuMDeXoZjDjlXfa5z44="; + }) + ]; + + # Xen Security Advisory #460: (4.16.6 - 4.19.0) + "XSA_460" = xsaPatch { + id = "460"; + title = "Error handling in x86 IOMMU identity mapping"; + description = '' + Certain PCI devices in a system might be assigned Reserved Memory + Regions (specified via Reserved Memory Region Reporting, "RMRR") for + Intel VT-d or Unity Mapping ranges for AMD-Vi. These are typically used + for platform tasks such as legacy USB emulation. + Since the precise purpose of these regions is unknown, once a device + associated with such a region is active, the mappings of these regions + need to remain continuouly accessible by the device. In the logic + establishing these mappings, error handling was flawed, resulting in + such mappings to potentially remain in place when they should have been + removed again. Respective guests would then gain access to memory + regions which they aren't supposed to have access to. + ''; + cve = [ "CVE-2024-31145" ]; + hash = "sha256-3q4nAP2xGEptX6BIpSlALOt2r0kjj1up5pF3xCFp+l0="; + }; + # Xen Security Advisory #461: (4.16.6 - 4.19.0) + "XSA_461" = xsaPatch { + id = "461"; + title = "PCI device pass-through with shared resources"; + description = '' + When multiple devices share resources and one of them is to be passed + through to a guest, security of the entire system and of respective + guests individually cannot really be guaranteed without knowing + internals of any of the involved guests. Therefore such a configuration + cannot really be security-supported, yet making that explicit was so far + missing. + ''; + cve = [ "CVE-2024-31146" ]; + hash = "sha256-JQWoqf47hy9WXNkVC/LgmjUhkxN0SBF6w8PF4aFZxhM="; + }; + # Xen Security Advisory #462: (4.16.6 - 4.19.0) + "XSA_462" = xsaPatch { + id = "462"; + title = "x86: Deadlock in vlapic_error()"; + description = '' + In x86's APIC (Advanced Programmable Interrupt Controller) architecture, + error conditions are reported in a status register. Furthermore, the OS + can opt to receive an interrupt when a new error occurs. + + It is possible to configure the error interrupt with an illegal vector, + which generates an error when an error interrupt is raised. + + This case causes Xen to recurse through vlapic_error(). The recursion + itself is bounded; errors accumulate in the the status register and only + generate an interrupt when a new status bit becomes set. + + However, the lock protecting this state in Xen will try to be taken + recursively, and deadlock. + ''; + cve = [ "CVE-2024-45817" ]; + hash = "sha256-01lzjaT2f69UfEdTUCkm92DDOmd+Mo8sNPZsHJfgJEM="; + }; +} diff --git a/pkgs/applications/virtualization/xen/packages.nix b/pkgs/applications/virtualization/xen/packages.nix index c55a719995c0b..7402edc8bc70f 100644 --- a/pkgs/applications/virtualization/xen/packages.nix +++ b/pkgs/applications/virtualization/xen/packages.nix @@ -1,58 +1,56 @@ -{ callPackage - -}: - -# TODO(@oxij) on new Xen version: generalize this to generate [vanilla slim -# light] for each ./<version>.nix. - -rec { - xen_4_15-vanilla = callPackage ./4.15.nix { +{ callPackage }: +let + standard = { meta = { - description = "vanilla"; + description = "Standard"; longDescription = '' - Vanilla version of Xen. Uses forks of Qemu and Seabios bundled - with Xen. This gives vanilla experince, but wastes space and - build time: typical NixOS setup that runs lots of VMs will - build three different versions of Qemu when using this (two - forks and upstream). + Standard version of the Xen Project Hypervisor. Uses forks of QEMU, SeaBIOS, + OVMF and iPXE provided by the Xen Project. This provides the vanilla Xen + experience, but wastes space and build time. A typical NixOS setup that runs + lots of VMs will usually need to build two different versions of QEMU when using + this Xen derivation (one fork and upstream). ''; }; }; - - xen_4_15-slim = xen_4_15-vanilla.override { - withInternalQemu = false; - withInternalTraditionalQemu = true; - withInternalSeabios = false; - withSeabios = true; - + slim = { meta = { - description = "slim"; + description = "Without Internal Components"; longDescription = '' - Slimmed-down version of Xen that reuses nixpkgs packages as - much as possible. Different parts may get out of sync, but - this builds faster and uses less space than vanilla. Use with - `qemu_xen` from nixpkgs. + Slimmed-down version of the Xen Project Hypervisor that reuses nixpkgs packages + as much as possible. Instead of using the Xen Project forks for various internal + components, this version uses `seabios`, `ovmf` and `ipxe` from Nixpkgs. These + components may ocasionally get out of sync with the hypervisor itself, but this + builds faster and uses less space than the default derivation. ''; }; }; +in +# TODO: generalise this to automatically generate both Xen variants for each ./<version>/default.nix. +rec { + xen_4_19 = callPackage ./4.19/default.nix { inherit (standard) meta; }; + xen_4_19-slim = xen_4_19.override { + withInternalQEMU = false; + withInternalSeaBIOS = false; + withInternalOVMF = false; + withInternalIPXE = false; + inherit (slim) meta; + }; - xen_4_15-light = xen_4_15-vanilla.override { - withInternalQemu = false; - withInternalTraditionalQemu = false; - withInternalSeabios = false; - withSeabios = true; - - meta = { - description = "light"; - longDescription = '' - Slimmed-down version of Xen without `qemu-traditional` (you - don't need it if you don't know what it is). Use with - `qemu_xen-light` from nixpkgs. - ''; - }; + xen_4_18 = callPackage ./4.18/default.nix { inherit (standard) meta; }; + xen_4_18-slim = xen_4_18.override { + withInternalQEMU = false; + withInternalSeaBIOS = false; + withInternalOVMF = false; + withInternalIPXE = false; + inherit (slim) meta; }; - xen-vanilla = xen_4_15-vanilla; - xen-slim = xen_4_15-slim; - xen-light = xen_4_15-light; + xen_4_17 = callPackage ./4.17/default.nix { inherit (standard) meta; }; + xen_4_17-slim = xen_4_17.override { + withInternalQEMU = false; + withInternalSeaBIOS = false; + withInternalOVMF = false; + withInternalIPXE = false; + inherit (slim) meta; + }; } diff --git a/pkgs/applications/virtualization/xen/update.sh b/pkgs/applications/virtualization/xen/update.sh new file mode 100755 index 0000000000000..e5012768b4e85 --- /dev/null +++ b/pkgs/applications/virtualization/xen/update.sh @@ -0,0 +1,202 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p gitMinimal curl gnupg nix-prefetch-git nixfmt-rfc-style +# shellcheck disable=SC2206,SC2207 shell=bash +set -o errexit +set -o pipefail +set -o nounset + +#TODO: Use `jq` instead of `sed`. +#TODO: Accept the small security drawback and make this script runnable by r-ryantm. + +# This script expects to be called in an interactive terminal somewhere inside Nixpkgs. +echo "Preparing..." +nixpkgs=$(git rev-parse --show-toplevel) +xenPath="$nixpkgs/pkgs/applications/virtualization/xen" +rm -rf /tmp/xenUpdateScript +mkdir /tmp/xenUpdateScript + +# Import and verify PGP key. +curl --silent --output /tmp/xenUpdateScript/xen.asc https://keys.openpgp.org/vks/v1/by-fingerprint/23E3222C145F4475FA8060A783FE14C957E82BD9 +gpg --homedir /tmp/xenUpdateScript/.gnupg --quiet --import /tmp/xenUpdateScript/xen.asc +fingerprint="$(gpg --homedir /tmp/xenUpdateScript/.gnupg --with-colons --fingerprint "pgp@xen.org" 2>/dev/null | awk -F: '/^pub:.*/ { getline; print $10}')" +echo -e "Please ascertain through multiple external sources that the \e[1;32mXen Project PGP Key Fingerprint\e[0m is indeed \e[1;33m$fingerprint\e[0m. If that is not the case, \e[1;31mexit immediately\e[0m." +read -r -p $'Press \e[1;34menter\e[0m to continue with a pre-filled expected fingerprint, or input an arbitrary PGP fingerprint to match with the key\'s fingerprint: ' userInputFingerprint +userInputFingerprint=${userInputFingerprint:-"23E3222C145F4475FA8060A783FE14C957E82BD9"} + +# Clone xen.git. +echo -e "Cloning \e[1;34mxen.git\e[0m..." +git clone --quiet https://xenbits.xenproject.org/git-http/xen.git /tmp/xenUpdateScript/xen +cd /tmp/xenUpdateScript/xen + +# Get list of versions and branches. +versionList="$(git tag --list "RELEASE-*" | sed s/RELEASE-//g | sed s/4.1.6.1//g | sort --numeric-sort)" +latestVersion=$(echo "$versionList" | tr ' ' '\n' | tail --lines=1) +branchList=($(echo "$versionList" | tr ' ' '\n' | sed s/\.[0-9]*$//g | awk '!seen[$0]++')) + +# Figure out which versions we're actually going to install. +minSupportedBranch="$(grep " minSupportedVersion = " "$xenPath"/generic/default.nix | sed s/' minSupportedVersion = "'//g | sed s/'";'//g)" +supportedBranches=($(for version in "${branchList[@]}"; do if [ "$(printf '%s\n' "$minSupportedBranch" "$version" | sort -V | head -n1)" = "$minSupportedBranch" ]; then echo "$version"; fi; done)) +supportedVersions=($(for version in "${supportedBranches[@]}"; do echo "$versionList" | tr ' ' '\n' | grep "$version" | tail --lines=1; done)) + +echo -e "\e[1mNOTE\e[0m: As we're also pre-fetching the submodules, QEMU and OVMF may take a very long time to fetch." + +# Main loop that installs every supportedVersion. +for version in "${supportedVersions[@]}"; do + echo -e "\n------------------------------------------------" + branch=${version/%.[0-9]/} + if [[ "$version" == "$latestVersion" ]]; then + latest=true + echo -e "\nFound \e[1;34mlatest\e[0m release: \e[1;32mXen $version\e[0m in branch \e[1;36m$branch\e[0m." + else + latest=false + echo -e "\nFound \e[1;33msecurity-supported\e[0m release: \e[1;32mXen $version\e[0m in branch \e[1;36m$branch\e[0m." + fi + + # Verify PGP key automatically. If the fingerprint matches what the user specified, or the default fingerprint, then we consider it trusted. + cd /tmp/xenUpdateScript/xen + if [[ "$fingerprint" = "$userInputFingerprint" ]]; then + echo "$fingerprint:6:" | gpg --homedir /tmp/xenUpdateScript/.gnupg --quiet --import-ownertrust + (git verify-tag RELEASE-"$version" 2>/dev/null && echo -e "\n\e[1;32mSuccessfully authenticated Xen $version.\e[0m") || (echo -e "\e[1;31merror:\e[0m Unable to verify tag \e[1;32mRELEASE-$version\e[0m.\n- It is possible that \e[1;33mthis script has broken\e[0m, the Xen Project has \e[1;33mcycled their PGP keys\e[0m, or a \e[1;31msupply chain attack is in progress\e[0m.\n\n\e[1;31mPlease update manually.\e[0m" && exit 1) + else + echo -e "\e[1;31merror:\e[0m Unable to verify \e[1;34mpgp@xen.org\e[0m's fingerprint.\n- It is possible that \e[1;33mthis script has broken\e[0m, the Xen Project has \e[1;33mcycled their PGP keys\e[0m, or an \e[1;31mimpersonation attack is in progress\e[0m.\n\n\e[1;31mPlease update manually.\e[0m" && exit 1 + fi + + git switch --quiet --detach RELEASE-"$version" + + # Originally we told people to go check the Makefile themselves. + echo -e -n "\nDetermining source versions from Xen Makefiles..." + qemuVersion="$(grep "QEMU_UPSTREAM_REVISION ?=" /tmp/xenUpdateScript/xen/Config.mk | sed s/"QEMU_UPSTREAM_REVISION ?= "//g)" + seaBIOSVersion="$(grep "SEABIOS_UPSTREAM_REVISION ?= rel-" /tmp/xenUpdateScript/xen/Config.mk | sed s/"SEABIOS_UPSTREAM_REVISION ?= "//g)" + ovmfVersion="$(grep "OVMF_UPSTREAM_REVISION ?=" /tmp/xenUpdateScript/xen/Config.mk | sed s/"OVMF_UPSTREAM_REVISION ?= "//g)" + miniOSVersion="$(grep "MINIOS_UPSTREAM_REVISION ?=" /tmp/xenUpdateScript/xen/Config.mk | sed s/"MINIOS_UPSTREAM_REVISION ?= "//g)" + ipxeVersion="$(grep "IPXE_GIT_TAG :=" /tmp/xenUpdateScript/xen/tools/firmware/etherboot/Makefile | sed s/"IPXE_GIT_TAG := "//g)" + echo "done!" + + # Use `nix-prefetch-git` to fetch `rev`s and `hash`es. + echo "Pre-fetching sources and determining hashes..." + echo -e -n " \e[1;32mXen\e[0m..." + fetchXen=$(nix-prefetch-git --url https://xenbits.xenproject.org/git-http/xen.git --rev RELEASE-"$version" --quiet) + finalVersion="$(echo "$fetchXen" | tr ', ' '\n ' | grep -ie rev | sed s/' "rev": "'//g | sed s/'"'//g)" + hash="$(echo "$fetchXen" | tr ', ' '\n ' | grep -ie hash | sed s/' "hash": "'//g | sed s/'"'//g)" + echo "done!" + echo -e -n " \e[1;36mQEMU\e[0m..." + fetchQEMU=$(nix-prefetch-git --url https://xenbits.xenproject.org/git-http/qemu-xen.git --rev "$qemuVersion" --quiet --fetch-submodules) + finalQEMUVersion="$(echo "$fetchQEMU" | tr ', ' '\n ' | grep -ie rev | sed s/' "rev": "'//g | sed s/'"'//g)" + qemuHash="$(echo "$fetchQEMU" | tr ', ' '\n ' | grep -ie hash | sed s/' "hash": "'//g | sed s/'"'//g)" + echo "done!" + echo -e -n " \e[1;36mSeaBIOS\e[0m..." + fetchSeaBIOS=$(nix-prefetch-git --url https://xenbits.xenproject.org/git-http/seabios.git --rev "$seaBIOSVersion" --quiet) + finalSeaBIOSVersion="$(echo "$fetchSeaBIOS" | tr ', ' '\n ' | grep -ie rev | sed s/' "rev": "'//g | sed s/'"'//g)" + seaBIOSHash="$(echo "$fetchSeaBIOS" | tr ', ' '\n ' | grep -ie hash | sed s/' "hash": "'//g | sed s/'"'//g)" + echo "done!" + echo -e -n " \e[1;36mOVMF\e[0m..." + ovmfHash="$(nix-prefetch-git --url https://xenbits.xenproject.org/git-http/ovmf.git --rev "$ovmfVersion" --quiet --fetch-submodules | grep -ie hash | sed s/' "hash": "'//g | sed s/'",'//g)" + echo "done!" + echo -e -n " \e[1;36miPXE\e[0m..." + ipxeHash="$(nix-prefetch-git --url https://github.com/ipxe/ipxe.git --rev "$ipxeVersion" --quiet | grep -ie hash | sed s/' "hash": "'//g | sed s/'",'//g)" + echo "done!" + + cd "$xenPath" + + echo -e "\nFound the following revisions:\n \e[1;32mXen\e[0m: \e[1;33m$finalVersion\e[0m (\e[1;33m$hash\e[0m)\n \e[1;36mQEMU\e[0m: \e[1;33m$finalQEMUVersion\e[0m (\e[1;33m$qemuHash\e[0m)\n \e[1;36mSeaBIOS\e[0m: \e[1;33m$finalSeaBIOSVersion\e[0m (\e[1;33m$seaBIOSHash\e[0m)\n \e[1;36mOVMF\e[0m: \e[1;33m$ovmfVersion\e[0m (\e[1;33m$ovmfHash\e[0m)\n \e[1;36miPXE\e[0m: \e[1;33m$ipxeVersion\e[0m (\e[1;33m$ipxeHash\e[0m)" + + # Set OCaml Version + read -r -p $'\nEnter the corresponding \e[1;33mOCaml\e[0m version for \e[1;32mXen '"$version"$'\e[0m, or press \e[1;34menter\e[0m for the default value of \e[1;32m4_14\e[0m: ' ocamlVersion + ocamlVersion=${ocamlVersion:-"4_14"} + + mkdir -p "$branch"/ + rm -f "$branch"/default.nix + + # Prepare any .patch files that are called by Nix through a path value. + echo -e "\nPlease add any required patches to version \e[1;32m$branch\e[0m in \e[1;34m$branch/\e[0m, and press \e[1;34menter\e[0m when done." + read -r -p $'Remember to follow the naming specification as defined in \e[1;34m./README.md\e[0m.' + + echo -e "\nDiscovering patches..." + discoveredXenPatches="$(find "$branch"/ -type f -name "[0-9][0-9][0-9][0-9]-xen-*-$branch.patch" -printf "./%f ")" + discoveredQEMUPatches="$(find "$branch"/ -type f -name "[0-9][0-9][0-9][0-9]-qemu-*-$branch.patch" -printf "./%f ")" + discoveredSeaBIOSPatches="$(find "$branch"/ -type f -name "[0-9][0-9][0-9][0-9]-seabios-*-$branch.patch" -printf "./%f ")" + discoveredOVMFPatches="$(find "$branch"/ -type f -name "[0-9][0-9][0-9][0-9]-ovmf-*-$branch.patch" -printf "./%f ")" + discoveredIPXEPatches="$(find "$branch"/ -type f -name "[0-9][0-9][0-9][0-9]-ipxe-*-$branch.patch" -printf "./%f ")" + + discoveredXenPatchesEcho=${discoveredXenPatches:-"\e[1;31mNone found!\e[0m"} + discoveredQEMUPatchesEcho=${discoveredQEMUPatches:-"\e[1;31mNone found!\e[0m"} + discoveredSeaBIOSPatchesEcho=${discoveredSeaBIOSPatches:-"\e[1;31mNone found!\e[0m"} + discoveredOVMFPatchesEcho=${discoveredOVMFPatches:-"\e[1;31mNone found!\e[0m"} + discoveredIPXEPatchesEcho=${discoveredIPXEPatches:-"\e[1;31mNone found!\e[0m"} + + echo -e "Found the following patches:\n \e[1;32mXen\e[0m: \e[1;33m$discoveredXenPatchesEcho\e[0m\n \e[1;36mQEMU\e[0m: \e[1;33m$discoveredQEMUPatchesEcho\e[0m\n \e[1;36mSeaBIOS\e[0m: \e[1;33m$discoveredSeaBIOSPatchesEcho\e[0m\n \e[1;36mOVMF\e[0m: \e[1;33m$discoveredOVMFPatchesEcho\e[0m\n \e[1;36miPXE\e[0m: \e[1;33m$discoveredIPXEPatchesEcho\e[0m" + + # Prepare patches that are called in ./patches.nix. + defaultPatchListInit=("QUBES_REPRODUCIBLE_BUILDS" "XSA_460" "XSA_461" ) + read -r -a defaultPatchList -p $'\nWould you like to override the \e[1;34mupstreamPatches\e[0m list for \e[1;32mXen '"$version"$'\e[0m? If no, press \e[1;34menter\e[0m to use the default patch list: [ \e[1;34m'"${defaultPatchListInit[*]}"$' \e[0m]: ' + defaultPatchList=(${defaultPatchList[@]:-${defaultPatchListInit[@]}}) + upstreamPatches=${defaultPatchList[*]} + + # Write and format default.nix file. + echo -e -n "\nWriting updated \e[1;34mversionDefinition\e[0m..." + cat >"$branch"/default.nix <<EOF +{ + lib, + fetchpatch, + callPackage, + ocaml-ng, + ... +}@genericDefinition: + +let + upstreamPatches = import ../generic/patches.nix { + inherit lib; + inherit fetchpatch; + }; + + upstreamPatchList = lib.lists.flatten (with upstreamPatches; [ + $upstreamPatches + ]); +in + +callPackage (import ../generic/default.nix { + pname = "xen"; + branch = "$branch"; + version = "$version"; + latest = $latest; + pkg = { + xen = { + rev = "$finalVersion"; + hash = "$hash"; + patches = [ $discoveredXenPatches ] ++ upstreamPatchList; + }; + qemu = { + rev = "$finalQEMUVersion"; + hash = "$qemuHash"; + patches = [ $discoveredQEMUPatches ]; + }; + seaBIOS = { + rev = "$finalSeaBIOSVersion"; + hash = "$seaBIOSHash"; + patches = [ $discoveredSeaBIOSPatches ]; + }; + ovmf = { + rev = "$ovmfVersion"; + hash = "$ovmfHash"; + patches = [ $discoveredOVMFPatches ]; + }; + ipxe = { + rev = "$ipxeVersion"; + hash = "$ipxeHash"; + patches = [ $discoveredIPXEPatches ]; + }; + }; +}) ({ ocamlPackages = ocaml-ng.ocamlPackages_$ocamlVersion; } // genericDefinition) +EOF +echo done! + + echo -n "Formatting..." + nixfmt "$branch"/default.nix + echo done! + + echo -e "\n\e[1;32mSuccessfully produced $branch/default.nix.\e[0m" +done + +echo -e -n "\nCleaning up..." +rm -rf /tmp/xenUpdateScript +echo done! diff --git a/pkgs/applications/virtualization/xen/xsa-patches.nix b/pkgs/applications/virtualization/xen/xsa-patches.nix deleted file mode 100644 index d789697a55991..0000000000000 --- a/pkgs/applications/virtualization/xen/xsa-patches.nix +++ /dev/null @@ -1,493 +0,0 @@ -{ fetchpatch }: - -let - xsaPatch = { name , sha256 }: (fetchpatch { - url = "https://xenbits.xen.org/xsa/xsa${name}.patch"; - inherit sha256; - }); -in { - # 4.5 - XSA_190 = (xsaPatch { - name = "190-4.5"; - sha256 = "0f8pw38kkxky89ny3ic5h26v9zsjj9id89lygx896zc3w1klafqm"; - }); - - # 4.5 - XSA_191 = (xsaPatch { - name = "191-4.6"; - sha256 = "1wl1ndli8rflmc44pkp8cw4642gi8z7j7gipac8mmlavmn3wdqhg"; - }); - - # 4.5 - XSA_192 = (xsaPatch { - name = "192-4.5"; - sha256 = "0m8cv0xqvx5pdk7fcmaw2vv43xhl62plyx33xqj48y66x5z9lxpm"; - }); - - # 4.5 - XSA_193 = (xsaPatch { - name = "193-4.5"; - sha256 = "0k9mykhrpm4rbjkhv067f6s05lqmgnldcyb3vi8cl0ndlyh66lvr"; - }); - - # 4.5 - XSA_195 = (xsaPatch { - name = "195"; - sha256 = "0m0g953qnjy2knd9qnkdagpvkkgjbk3ydgajia6kzs499dyqpdl7"; - }); - - # 4.5 - XSA_196 = [ - (xsaPatch { - name = "196-0001-x86-emul-Correct-the-IDT-entry-calculation-in-inject"; - sha256 = "0z53nzrjvc745y26z1qc8jlg3blxp7brawvji1hx3s74n346ssl6"; - }) - (xsaPatch { - name = "196-0002-x86-svm-Fix-injection-of-software-interrupts"; - sha256 = "11cqvr5jn2s92wsshpilx9qnfczrd9hnyb5aim6qwmz3fq3hrrkz"; - }) - ]; - - # 4.5 - XSA_198 = (xsaPatch { - name = "198"; - sha256 = "0d1nndn4p520c9xa87ixnyks3mrvzcri7c702d6mm22m8ansx6d9"; - }); - - # 4.5 - XSA_200 = (xsaPatch { - name = "200-4.6"; - sha256 = "0k918ja83470iz5k4vqi15293zjvz2dipdhgc9sy9rrhg4mqncl7"; - }); - - # 4.5 - XSA_202_45 = (xsaPatch { - name = "202-4.6"; - sha256 = "0nnznkrvfbbc8z64dr9wvbdijd4qbpc0wz2j5vpmx6b32sm7932f"; - }); - - # 4.5 - XSA_204_45 = (xsaPatch { - name = "204-4.5"; - sha256 = "083z9pbdz3f532fnzg7n2d5wzv6rmqc0f4mvc3mnmkd0rzqw8vcp"; - }); - - # 4.5 - XSA_206_45 = [ - (xsaPatch { - name = "206-4.5/0001-xenstored-apply-a-write-transaction-rate-limit"; - sha256 = "07vsm8mlbxh2s01ny2xywnm1bqhhxas1az31fzwb6f1g14vkzwm4"; - }) - (xsaPatch { - name = "206-4.5/0002-xenstored-Log-when-the-write-transaction-rate-limit-"; - sha256 = "17pnvxjmhny22abwwivacfig4vfsy5bqlki07z236whc2y7yzbsx"; - }) - (xsaPatch { - name = "206-4.5/0003-oxenstored-refactor-putting-response-on-wire"; - sha256 = "0xf566yicnisliy82cydb2s9k27l3bxc43qgmv6yr2ir3ixxlw5s"; - }) - (xsaPatch { - name = "206-4.5/0004-oxenstored-remove-some-unused-parameters"; - sha256 = "16cqx9i0w4w3x06qqdk9rbw4z96yhm0kbc32j40spfgxl82d1zlk"; - }) - (xsaPatch { - name = "206-4.5/0005-oxenstored-refactor-request-processing"; - sha256 = "1g2hzlv7w03sqnifbzda85mwlz3bw37rk80l248180sv3k7k6bgv"; - }) - (xsaPatch { - name = "206-4.5/0006-oxenstored-keep-track-of-each-transaction-s-operatio"; - sha256 = "0n65yfxvpfd4cz95dpbwqj3nablyzq5g7a0klvi2y9zybhch9cmg"; - }) - (xsaPatch { - name = "206-4.5/0007-oxenstored-move-functions-that-process-simple-operat"; - sha256 = "0qllvbc9rnj7jhhlslxxs35gvphvih0ywz52jszj4irm23ka5vnz"; - }) - (xsaPatch { - name = "206-4.5/0008-oxenstored-replay-transaction-upon-conflict"; - sha256 = "0lixkxjfzciy9l0f980cmkr8mcsx14c289kg0mn5w1cscg0hb46g"; - }) - (xsaPatch { - name = "206-4.5/0009-oxenstored-log-request-and-response-during-transacti"; - sha256 = "09ph8ddcx0k7rndd6hx6kszxh3fhxnvdjsq13p97n996xrpl1x7b"; - }) - (xsaPatch { - name = "206-4.5/0010-oxenstored-allow-compilation-prior-to-OCaml-3.12.0"; - sha256 = "1y0m7sqdz89z2vs4dfr45cyvxxas323rxar0xdvvvivgkgxawvxj"; - }) - (xsaPatch { - name = "206-4.5/0011-oxenstored-comments-explaining-some-variables"; - sha256 = "1d3n0y9syya4kaavrvqn01d3wsn85gmw7qrbylkclznqgkwdsr2p"; - }) - (xsaPatch { - name = "206-4.5/0012-oxenstored-handling-of-domain-conflict-credit"; - sha256 = "12zgid5y9vrhhpk2syxp0x01lzzr6447fa76n6rjmzi1xgdzpaf8"; - }) - (xsaPatch { - name = "206-4.5/0013-oxenstored-ignore-domains-with-no-conflict-credit"; - sha256 = "0v3g9pm60w6qi360hdqjcw838s0qcyywz9qpl8gzmhrg7a35avxl"; - }) - (xsaPatch { - name = "206-4.5/0014-oxenstored-add-transaction-info-relevant-to-history-"; - sha256 = "0vv3w0h5xh554i9v2vbc8gzm8wabjf2vzya3dyv5yzvly6ygv0sb"; - }) - (xsaPatch { - name = "206-4.5/0015-oxenstored-support-commit-history-tracking"; - sha256 = "1iv2vy29g437vj73x9p33rdcr5ln2q0kx1b3pgxq202ghbc1x1zj"; - }) - (xsaPatch { - name = "206-4.5/0016-oxenstored-only-record-operations-with-side-effects-"; - sha256 = "1cjkw5ganbg6lq78qsg0igjqvbgph3j349faxgk1p5d6nr492zzy"; - }) - (xsaPatch { - name = "206-4.5/0017-oxenstored-discard-old-commit-history-on-txn-end"; - sha256 = "0lm15lq77403qqwpwcqvxlzgirp6ffh301any9g401hs98f9y4ps"; - }) - (xsaPatch { - name = "206-4.5/0018-oxenstored-track-commit-history"; - sha256 = "1jh92p6vjhkm3bn5vz260npvsjji63g2imsxflxs4f3r69sz1nkd"; - }) - (xsaPatch { - name = "206-4.5/0019-oxenstored-blame-the-connection-that-caused-a-transa"; - sha256 = "17k264pk0fvsamj85578msgpx97mw63nmj0j9v5hbj4bgfazvj4h"; - }) - (xsaPatch { - name = "206-4.5/0020-oxenstored-allow-self-conflicts"; - sha256 = "15z3rd49q0pa72si0s8wjsy2zvbm613d0hjswp4ikc6nzsnsh4qy"; - }) - (xsaPatch { - name = "206-4.5/0021-oxenstored-do-not-commit-read-only-transactions"; - sha256 = "04wpzazhv90lg3228z5i6vnh1z4lzd08z0d0fvc4br6pkd0w4va8"; - }) - (xsaPatch { - name = "206-4.5/0022-oxenstored-don-t-wake-to-issue-no-conflict-credit"; - sha256 = "1shbrn0w68rlywcc633zcgykfccck1a77igmg8ydzwjsbwxsmsjy"; - }) - (xsaPatch { - name = "206-4.5/0023-oxenstored-transaction-conflicts-improve-logging"; - sha256 = "1086y268yh8047k1vxnxs2nhp6izp7lfmq01f1gq5n7jiy1sxcq7"; - }) - (xsaPatch { - name = "206-4.5/0024-oxenstored-trim-history-in-the-frequent_ops-function"; - sha256 = "014zs6i4gzrimn814k5i7gz66vbb0adkzr2qyai7i4fxc9h9r7w8"; - }) - ]; - - # 4.5 - 4.8 - XSA_207 = (xsaPatch { - name = "207"; - sha256 = "0wdlhijmw9mdj6a82pyw1rwwiz605dwzjc392zr3fpb2jklrvibc"; - }); - - # 4.5 - 4.8 - XSA_212 = (xsaPatch { - name = "212"; - sha256 = "1ggjbbym5irq534a3zc86md9jg8imlpc9wx8xsadb9akgjrr1r8d"; - }); - - # 4.5 - XSA_213_45 = (xsaPatch { - name = "213-4.5"; - sha256 = "1vnqf89ydacr5bq3d6z2r33xb2sn5vsd934rncyc28ybc9rvj6wm"; - }); - - # 4.5 - 4.8 - XSA_214 = (xsaPatch { - name = "214"; - sha256 = "0qapzx63z0yl84phnpnglpkxp6b9sy1y7cilhwjhxyigpfnm2rrk"; - }); - - # 4.5 - XSA_215 = (xsaPatch { - name = "215"; - sha256 = "0sv8ccc5xp09f1w1gj5a9n3mlsdsh96sdb1n560vh31f4kkd61xs"; - }); - - # 4.5 - XSA_217_45 = (xsaPatch { - name = "217-4.5"; - sha256 = "067pgsfrb9py2dhm1pk9g8f6fs40vyfrcxhj8c12vzamb6svzmn4"; - }); - - # 4.5 - XSA_218_45 = [ - (xsaPatch { - name = "218-4.5/0001-IOMMU-handle-IOMMU-mapping-and-unmapping-failures"; - sha256 = "00y6j3yjxw0igpldsavikmhlxw711k2jsj1qx0s05w2k608gadkq"; - }) - (xsaPatch { - name = "218-4.5/0002-gnttab-fix-unmap-pin-accounting-race"; - sha256 = "0qbbfnnjlpdcd29mzmacfmi859k92c213l91q7w1rg2k6pzx928k"; - }) - (xsaPatch { - name = "218-4.5/0003-gnttab-Avoid-potential-double-put-of-maptrack-entry"; - sha256 = "1cndzvyhf41mk4my6vh3bk9jvh2y4gpmqdhvl9zhxhmppszslqkc"; - }) - (xsaPatch { - name = "218-4.5/0004-gnttab-correct-maptrack-table-accesses"; - sha256 = "02zpb0ffigijacqvyyjylwx3qpgibwslrka7mbxwnclf4s9c03a2"; - }) - ]; - - # 4.5 - XSA_219_45 = (xsaPatch { - name = "219-4.5"; - sha256 = "003msr5vhsc66scmdpgn0lp3p01g4zfw5vj86y5lw9ajkbaywdsm"; - }); - - # 4.5 - XSA_220_45 = (xsaPatch { - name = "220-4.5"; - sha256 = "1dj9nn6lzxlipjb3nb7b9m4337fl6yn2bd7ap1lqrjn8h9zkk1pp"; - }); - - # 4.5 - 4.8 - XSA_221 = (xsaPatch { - name = "221"; - sha256 = "1mcr1nqgxyjrkywdg7qhlfwgz7vj2if1dhic425vgd41p9cdgl26"; - }); - - # 4.5 - XSA_222_45 = [ - (xsaPatch { - name = "222-1-4.6"; - sha256 = "1g4dqm5qx4wqlv1520jpfiscph95vllcp4gqp1rdfailk8xi0mcf"; - }) - (xsaPatch { - name = "222-2-4.5"; - sha256 = "1hw8rhc7q4v309f4w11gxfsn5x1pirvxkg7s4kr711fnmvp9hkzd"; - }) - ]; - - # 4.5 - 4.8 - XSA_223 = (xsaPatch { - name = "223"; - sha256 = "0803gjgcbq9vaz2mq0v5finf1fq8iik1g4hqsjqhjxvspn8l70c5"; - }); - - # 4.5 - XSA_224_45 = [ - (xsaPatch { - name = "224-4.5/0001-gnttab-Fix-handling-of-dev_bus_addr-during-unmap"; - sha256 = "1aislj66ss4cb3v2bh12mrqsyrf288d4h54rj94jjq7h1hnycw7h"; - }) - (xsaPatch { - name = "224-4.5/0002-gnttab-never-create-host-mapping-unless-asked-to"; - sha256 = "1j6fgm1ccb07gg0mi5qmdr0vqwwc3n12z433g1jrija2gbk1x8aq"; - }) - (xsaPatch { - name = "224-4.5/0003-gnttab-correct-logic-to-get-page-references-during-m"; - sha256 = "166kmicwx280fjqjvgigbmhabjksa0hhvqx5h4v6kjlcjpmxqy08"; - }) - (xsaPatch { - name = "224-4.5/0004-gnttab-__gnttab_unmap_common_complete-is-all-or-noth"; - sha256 = "1skc0yj1zsn8xgyq1y57bdc0scvvlmd0ynrjwwf1zkias1wlilav"; - }) - ]; - - # 4.5 - XSA_226_45 = [ - (xsaPatch { - name = "226-4.5/0001-gnttab-dont-use-possibly-unbounded-tail-calls"; - sha256 = "1hx47ppv5q33cw4dwp82lgvv4fp28gx7rxijw0iaczsv8bvb8vcg"; - }) - (xsaPatch { - name = "226-4.5/0002-gnttab-fix-transitive-grant-handling"; - sha256 = "1gzp8m2zfihwlk71c3lqyd0ajh9h11pvkhzhw0mawckxy0qksvlc"; - }) - ]; - - # 4.5 - XSA_227_45 = (xsaPatch { - name = "227-4.5"; - sha256 = "1qfjfisgqm4x98qw54x2qrvgjnvvzizx9p1pjhcnsps9q6g1y3x8"; - }); - - # 4.5 - 4.9 - XSA_230 = (xsaPatch { - name = "230"; - sha256 = "10x0j7wmzkrwycs1ng89fgjzvzh8vsdd4c5nb68b3j1azdx4ld83"; - }); - - # 4.5 - XSA_231_45 = (xsaPatch { - name = "231-4.5"; - sha256 = "06gwx2f1lg51dfk2b4zxp7wv9c4pxdi87pg2asvmxqc78ir7l5s6"; - }); - - # 4.5 - 4.9 - XSA_232 = (xsaPatch { - name = "232"; - sha256 = "0n6irjpmraa3hbxxm64a1cplc6y6g07x7v2fmlpvn70ql3fs0220"; - }); - - # 4.5 - 4.9 - XSA_233 = (xsaPatch { - name = "233"; - sha256 = "1w3m8349cqav56av63w6jzvlsv4jw5rimwvskr9pq2rcbk2dx8kf"; - }); - - # 4.5 - XSA_234_45 = (xsaPatch { - name = "234-4.5"; - sha256 = "1ji6hbgybb4gbgz5l5fis9midnvjbddzam8d63377rkzdyb3yz9f"; - }); - - # 4.5 - XSA_235_45 = (xsaPatch { - name = "235-4.5"; - sha256 = "0hhgnql2gji111020z4wiyzg23wqs6ymanb67rg11p4qad1fp3ff"; - }); - - # 4.5 - XSA_236_45 = (xsaPatch { - name = "236-4.5"; - sha256 = "0hcla86x81wykssd2967gblp7fzx61290p4ls4v0hcyxdg2bs2yz"; - }); - - # 4.5 - XSA_237_45 = [ - (xsaPatch { - name = "237-4.5/0001-x86-dont-allow-MSI-pIRQ-mapping-on-unowned-device"; - sha256 = "0hjxs20jhls4i0iph45a0qpw4znkm04gv74jmwhw84gy4hrhzq3b"; - }) - (xsaPatch { - name = "237-4.5/0002-x86-enforce-proper-privilege-when-mapping-pIRQ-s"; - sha256 = "0ki8nmbc2g1l9wnqsph45a2k4c6dk5s7jvdlxg3zznyiyxjcv8yn"; - }) - (xsaPatch { - name = "237-4.5/0003-x86-MSI-disallow-redundant-enabling"; - sha256 = "1hdz83qrjaqnihz8ji186dypxiblbfpgyb01j9m5alhk4whjqvp1"; - }) - (xsaPatch { - name = "237-4.5/0004-x86-IRQ-conditionally-preserve-irq-pirq-mapping-on-error"; - sha256 = "0csdfn9kzn1k94pg3fcwsgqw14wcd4myi1jkcq5alj1fmkhw4wmk"; - }) - (xsaPatch { - name = "237-4.5/0005-x86-FLASK-fix-unmap-domain-IRQ-XSM-hook"; - sha256 = "14b73rkvbkd1a2gh9kp0zrvv2d3kfwkiv24fg9agh4hrf2w3nx7y"; - }) - ]; - - # 4.5 - XSA_238_45 = (xsaPatch { - name = "238-4.5"; - sha256 = "1x2fg5vfv5jc084h5gjm6fq0nxjpzvi96px3sqzz4pvsvy4y4i1z"; - }); - - # 4.5 - XSA_239_45 = (xsaPatch { - name = "239-4.5"; - sha256 = "06bi8q3973yajxsdj7pcqarvb56q2gisxdiy0cpbyffbmpkfv3h6"; - }); - - # 4.5 - XSA_240_45 = [ - (xsaPatch { - name = "240-4.5/0001-x86-limit-linear-page-table-use-to-a-single-level"; - sha256 = "0pmf10mbnmb88y7mly8s2l0j88cg0ayhkcnmj1zbjrkjmpccv395"; - }) - (xsaPatch { - name = "240-4.5/0002-x86-mm-Disable-PV-linear-pagetables-by-default"; - sha256 = "19f096ra3xndvzkjjasx73p2g25hfkm905px0p3yakwll0qzd029"; - }) - ]; - - # 4.5 - 4.8 - XSA_241 = (xsaPatch { - name = "241-4.8"; - sha256 = "16zb75kzs98f4mdxhbyczk5mbh9dvn6j3yhfafki34x1dfdnq4pj"; - }); - - # 4.5 - 4.9 - XSA_242 = (xsaPatch { - name = "242-4.9"; - sha256 = "0yx3x0i2wybsm7lzdffxa2mm866bjl4ipbb9vipnw77dyg705zpr"; - }); - - # 4.5 - XSA_243_45 = [ - (xsaPatch { - name = "243-4.6-1"; - sha256 = "1cqanpyysa7px0j645z4jw9yqsvv6cbh7yq1b86ap134axfifcan"; - }) - (xsaPatch { - name = "243-4.5-2"; - sha256 = "0wbcgw4m0nzm2902jnda2020l7bd5adkq8j5myi1zmsfzbq03hwn"; - }) - ]; - - # 4.5 - XSA_244_45 = (xsaPatch { - name = "244-4.5"; - sha256 = "05ci3vdl1ywfjpzcvsy1k52whxjk8pxzj7dh3r94yqasr56i5v2l"; - }); - - # 4.5 - 4.9 - XSA_245 = [ - (xsaPatch { - name = "245/0001-xen-page_alloc-Cover-memory-unreserved-after-boot-in"; - sha256 = "12brsgbn7xwakalsn10afykgqmx119mqg6vjj3v2b1pnmf4ss0w8"; - }) - (xsaPatch { - name = "245/0002-xen-arm-Correctly-report-the-memory-region-in-the-du"; - sha256 = "1k6z5r7wnrswsczn2j3a1mc4nvxqm4ydj6n6rvgqizk2pszdkqg8"; - }) - ]; - - # 4.5 - 4.7 - XSA_246_45 = [ - (xsaPatch { - name = "246-4.7"; - sha256 = "13rad4k8z3bq15d67dhgy96kdbrjiq9sy8px0jskbpx9ygjdahkn"; - }) - ]; - - # 4.5 - XSA_247_45 = [ - (xsaPatch { - name = "247-4.5/0001-p2m-Always-check-to-see-if-removing-a-p2m-entry-actu"; - sha256 = "0h1mp5s9si8aw2gipds317f27h9pi7bgnhj0bcmw11p0ch98sg1m"; - }) - (xsaPatch { - name = "247-4.5/0002-p2m-Check-return-value-of-p2m_set_entry-when-decreas"; - sha256 = "0vjjybxbcm4xl26wbqvcqfiyvvlayswm4f98i1fr5a9abmljn5sb"; - }) - ]; - - # 4.5 - XSA_248_45 = [ - (xsaPatch { - name = "248-4.5"; - sha256 = "0csxg6h492ddsa210b45av28iqf7cn2dfdqk4zx10zwf1pv2shyn"; - }) - ]; - - # 4.5 .. 4.9 - XSA_249 = [ - (xsaPatch { - name = "249"; - sha256 = "0v6ngzqhkz7yv4n83xlpxfbkr2qyg5b1cds7ikkinm86hiqy6agl"; - }) - ]; - - # 4.5 - XSA_250_45 = [ - (xsaPatch { - name = "250-4.5"; - sha256 = "0pqldl6qnl834gvfp90z247q9xcjh3835s2iffnajz7jhjb2145d"; - }) - ]; - - # 4.5 - XSA_251_45 = [ - (xsaPatch { - name = "251-4.5"; - sha256 = "0lc94cx271z09r0mhxaypyd9d4740051p28idf5calx5228dqjgm"; - }) - ]; - - XSA_386 = (xsaPatch { - name = "386"; - sha256 = "sha256-pAuLgt3sDeL73NSDqZCWxRGZk1tWaYlDbh7cUcJ4s+w="; - }); -} diff --git a/pkgs/applications/virtualization/xhyve/default.nix b/pkgs/applications/virtualization/xhyve/default.nix index 2d66f8351411f..a9119975a7ae3 100644 --- a/pkgs/applications/virtualization/xhyve/default.nix +++ b/pkgs/applications/virtualization/xhyve/default.nix @@ -34,6 +34,6 @@ stdenv.mkDerivation rec { license = licenses.bsd2; platforms = platforms.darwin; # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin && stdenv.isAarch64; + broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; }; } diff --git a/pkgs/applications/virtualization/youki/default.nix b/pkgs/applications/virtualization/youki/default.nix deleted file mode 100644 index d63fa87238e45..0000000000000 --- a/pkgs/applications/virtualization/youki/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, pkg-config -, installShellFiles -, dbus -, libseccomp -, systemd -}: - -rustPlatform.buildRustPackage rec { - pname = "youki"; - version = "0.3.2"; - - src = fetchFromGitHub { - owner = "containers"; - repo = pname; - rev = "v${version}"; - hash = "sha256-/cc+gHnakxC446MxErvgCDvc1gMWNi45h6fZ1Cd1Pj0="; - }; - - cargoPatches = [ - ./fix-cargo-lock.patch - ]; - - nativeBuildInputs = [ pkg-config installShellFiles ]; - - buildInputs = [ dbus libseccomp systemd ]; - - postInstall = '' - installShellCompletion --cmd youki \ - --bash <($out/bin/youki completion -s bash) \ - --fish <($out/bin/youki completion -s fish) \ - --zsh <($out/bin/youki completion -s zsh) - ''; - - cargoBuildFlags = [ "-p" "youki" ]; - cargoTestFlags = [ "-p" "youki" ]; - - cargoHash = "sha256-PKn448fOCnyMC42NtQnLt8kvZIBautsq4Fw/bRvwmpw="; - - meta = with lib; { - description = "Container runtime written in Rust"; - homepage = "https://containers.github.io/youki/"; - changelog = "https://github.com/containers/youki/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = []; - platforms = platforms.linux; - mainProgram = "youki"; - }; -} diff --git a/pkgs/applications/virtualization/youki/fix-cargo-lock.patch b/pkgs/applications/virtualization/youki/fix-cargo-lock.patch deleted file mode 100644 index 07f44a9e91a4c..0000000000000 --- a/pkgs/applications/virtualization/youki/fix-cargo-lock.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -index cfef78c0..7cad3faa 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -1879,7 +1879,7 @@ checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7" - - [[package]] - name = "libcgroups" --version = "0.3.1" -+version = "0.3.2" - dependencies = [ - "anyhow", - "clap", -@@ -1904,7 +1904,7 @@ dependencies = [ - - [[package]] - name = "libcontainer" --version = "0.3.1" -+version = "0.3.2" - dependencies = [ - "anyhow", - "bitflags 2.4.2", -@@ -1947,7 +1947,7 @@ dependencies = [ - - [[package]] - name = "liboci-cli" --version = "0.3.1" -+version = "0.3.2" - dependencies = [ - "clap", - ] -@@ -5712,7 +5712,7 @@ dependencies = [ - - [[package]] - name = "youki" --version = "0.3.1" -+version = "0.3.2" - dependencies = [ - "anyhow", - "caps", diff --git a/pkgs/applications/window-managers/cage/default.nix b/pkgs/applications/window-managers/cage/default.nix index 73c9f7c4c5115..9d22cefc461b0 100644 --- a/pkgs/applications/window-managers/cage/default.nix +++ b/pkgs/applications/window-managers/cage/default.nix @@ -1,4 +1,5 @@ { lib, stdenv, fetchFromGitHub +, substituteAll , meson, ninja, pkg-config, wayland-scanner, scdoc, makeWrapper , wlroots, wayland, wayland-protocols, pixman, libxkbcommon, xcbutilwm , systemd, libGL, libX11, mesa @@ -8,15 +9,24 @@ stdenv.mkDerivation rec { pname = "cage"; - version = "0.1.5"; + version = "0.1.5-unstable-2024-07-29"; src = fetchFromGitHub { - owner = "Hjdskes"; + owner = "cage-kiosk"; repo = "cage"; - rev = "v${version}"; - hash = "sha256-Suq14YRw/MReDRvO/TQqjpZvpzAEDnHUyVbQj0BPT4c="; + rev = "d3fb99d6654325ec46277cfdb589f89316bed701"; + hash = "sha256-WP0rWO9Wbs/09wTY8IlIUybnVUnwiNdXD9JgsoVG4rM="; }; + patches = [ + # TODO: Remove on next stable release. + (substituteAll { + src = ./inject-git-commit.patch; + gitCommit = lib.substring 0 7 src.rev; + gitBranch = "master"; + }) + ]; + depsBuildBuild = [ pkg-config ]; @@ -29,9 +39,7 @@ stdenv.mkDerivation rec { systemd libGL libX11 ]; - mesonFlags = [ "-Dxwayland=${lib.boolToString (xwayland != null)}" ]; - - postFixup = lib.optionalString (xwayland != null) '' + postFixup = lib.optionalString wlroots.enableXWayland '' wrapProgram $out/bin/cage --prefix PATH : "${xwayland}/bin" ''; diff --git a/pkgs/applications/window-managers/cage/inject-git-commit.patch b/pkgs/applications/window-managers/cage/inject-git-commit.patch new file mode 100644 index 0000000000000..b1c73f4a0761e --- /dev/null +++ b/pkgs/applications/window-managers/cage/inject-git-commit.patch @@ -0,0 +1,23 @@ +diff --git a/meson.build b/meson.build +index 4c0cbe280f..d4479741c8 100644 +--- a/meson.build ++++ b/meson.build +@@ -68,14 +68,12 @@ + + version = '@0@'.format(meson.project_version()) + git = find_program('git', native: true, required: false) +-if git.found() +- git_commit = run_command([git, 'rev-parse', '--short', 'HEAD'], check: false) +- git_branch = run_command([git, 'rev-parse', '--abbrev-ref', 'HEAD'], check: false) +- if git_commit.returncode() == 0 and git_branch.returncode() == 0 ++if true ++ if true + version = '@0@-@1@ (branch \'@2@\')'.format( + meson.project_version(), +- git_commit.stdout().strip(), +- git_branch.stdout().strip(), ++ '@gitCommit@'.strip(), ++ '@gitBranch@'.strip(), + ) + endif + endif diff --git a/pkgs/applications/window-managers/cagebreak/default.nix b/pkgs/applications/window-managers/cagebreak/default.nix index c897e3f66d8f2..13618f6afb336 100644 --- a/pkgs/applications/window-managers/cagebreak/default.nix +++ b/pkgs/applications/window-managers/cagebreak/default.nix @@ -19,6 +19,7 @@ , systemd , wayland , wayland-protocols +, wayland-scanner , withXwayland ? true , xwayland , wlroots }: @@ -40,7 +41,7 @@ stdenv.mkDerivation rec { ninja pkg-config scdoc - wayland + wayland-scanner ]; buildInputs = [ diff --git a/pkgs/applications/window-managers/dk/default.nix b/pkgs/applications/window-managers/dk/default.nix index a0efe1ad768f6..27d0e15492a70 100644 --- a/pkgs/applications/window-managers/dk/default.nix +++ b/pkgs/applications/window-managers/dk/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "dk"; - version = "2.2"; + version = "2.3"; src = fetchFromBitbucket { owner = "natemaia"; repo = "dk"; rev = "v${finalAttrs.version}"; - hash = "sha256-u1fZTcfGLwKFeRADU55MFYDvtSOaOg5qtWB90xYpVuY="; + hash = "sha256-VkNF3F/NRQadBkbnbVmMZliIXRxFU0qqxOeQDX4UrJg="; }; buildInputs = [ diff --git a/pkgs/applications/window-managers/dwl/default.nix b/pkgs/applications/window-managers/dwl/default.nix deleted file mode 100644 index 68815952b17f1..0000000000000 --- a/pkgs/applications/window-managers/dwl/default.nix +++ /dev/null @@ -1,99 +0,0 @@ -{ lib -, stdenv -, fetchFromGitea -, installShellFiles -, libX11 -, libinput -, libxcb -, libxkbcommon -, pixman -, pkg-config -, substituteAll -, wayland-scanner -, wayland -, wayland-protocols -, wlroots -, writeText -, xcbutilwm -, xwayland -, enableXWayland ? true -, conf ? null -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "dwl"; - version = "0.5"; - - src = fetchFromGitea { - domain = "codeberg.org"; - owner = "dwl"; - repo = "dwl"; - rev = "v${finalAttrs.version}"; - hash = "sha256-U/vqGE1dJKgEGTfPMw02z5KJbZLWY1vwDJWnJxT8urM="; - }; - - nativeBuildInputs = [ - installShellFiles - pkg-config - wayland-scanner - ]; - - buildInputs = [ - libinput - libxcb - libxkbcommon - pixman - wayland - wayland-protocols - wlroots - ] ++ lib.optionals enableXWayland [ - libX11 - xcbutilwm - xwayland - ]; - - outputs = [ "out" "man" ]; - - # Allow users to set an alternative config.def.h - postPatch = let - configFile = if lib.isDerivation conf || builtins.isPath conf - then conf - else writeText "config.def.h" conf; - in lib.optionalString (conf != null) "cp ${configFile} config.def.h"; - - makeFlags = [ - "PKG_CONFIG=${stdenv.cc.targetPrefix}pkg-config" - "WAYLAND_SCANNER=wayland-scanner" - "PREFIX=$(out)" - "MANDIR=$(man)/share/man" - ]; - - preBuild = '' - makeFlagsArray+=( - XWAYLAND=${lib.optionalString enableXWayland "-DXWAYLAND"} - XLIBS=${lib.optionalString enableXWayland "xcb\\ xcb-icccm"} - ) - ''; - - meta = { - homepage = "https://github.com/djpohly/dwl/"; - description = "Dynamic window manager for Wayland"; - longDescription = '' - dwl is a compact, hackable compositor for Wayland based on wlroots. It is - intended to fill the same space in the Wayland world that dwm does in X11, - primarily in terms of philosophy, and secondarily in terms of - functionality. Like dwm, dwl is: - - - Easy to understand, hack on, and extend with patches - - One C source file (or a very small number) configurable via config.h - - Limited to 2000 SLOC to promote hackability - - Tied to as few external dependencies as possible - ''; - changelog = "https://github.com/djpohly/dwl/releases/tag/v${finalAttrs.version}"; - license = lib.licenses.gpl3Only; - maintainers = [ lib.maintainers.AndersonTorres ]; - inherit (wayland.meta) platforms; - mainProgram = "dwl"; - }; -}) -# TODO: custom patches from upstream website diff --git a/pkgs/applications/window-managers/dwm/default.nix b/pkgs/applications/window-managers/dwm/default.nix index 10fef61b49a1a..74d5022219a05 100644 --- a/pkgs/applications/window-managers/dwm/default.nix +++ b/pkgs/applications/window-managers/dwm/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { tags. ''; license = licenses.mit; - maintainers = with maintainers; [ viric neonfuz ]; + maintainers = with maintainers; [ neonfuz ]; platforms = platforms.all; mainProgram = "dwm"; }; diff --git a/pkgs/applications/window-managers/dwm/dwm-status.nix b/pkgs/applications/window-managers/dwm/dwm-status.nix index 1d5f84abe288b..cb303ff268aea 100644 --- a/pkgs/applications/window-managers/dwm/dwm-status.nix +++ b/pkgs/applications/window-managers/dwm/dwm-status.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ makeWrapper pkg-config ]; buildInputs = [ dbus gdk-pixbuf libnotify xorg.libX11 ]; - cargoSha256 = "sha256-eRfXUnyzOfVSEiwjLCaNbETUPXVU2Ed2VUNM9FjS5YE="; + cargoHash = "sha256-eRfXUnyzOfVSEiwjLCaNbETUPXVU2Ed2VUNM9FjS5YE="; postInstall = lib.optionalString (bins != []) '' wrapProgram $out/bin/dwm-status --prefix "PATH" : "${lib.makeBinPath bins}" diff --git a/pkgs/applications/window-managers/e16/default.nix b/pkgs/applications/window-managers/e16/default.nix index 7a2aa724d3534..b143a4bec27db 100644 --- a/pkgs/applications/window-managers/e16/default.nix +++ b/pkgs/applications/window-managers/e16/default.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation rec { pname = "e16"; - version = "1.0.29"; + version = "1.0.30"; src = fetchurl { url = "mirror://sourceforge/enlightenment/e16-${version}.tar.xz"; - hash = "sha256-LvLiw6+hduAl8dNBTtBwqvgKBRwojBUd5tNm1hZl5Hs="; + hash = "sha256-JKBmBgC5cN4XO03r0NR78Ly9tpI733/sUEPL0GLU5B0="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/window-managers/fluxbox/default.nix b/pkgs/applications/window-managers/fluxbox/default.nix deleted file mode 100644 index 934f8c9b3fc2e..0000000000000 --- a/pkgs/applications/window-managers/fluxbox/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config -, freetype, fribidi -, libXext, libXft, libXpm, libXrandr, libXrender, xorgproto -, libXinerama -, imlib2 }: - -with lib; -stdenv.mkDerivation rec { - - pname = "fluxbox"; - version = "1.3.7"; - - src = fetchurl { - url = "mirror://sourceforge/fluxbox/${pname}-${version}.tar.xz"; - sha256 = "1h1f70y40qd225dqx937vzb4k2cz219agm1zvnjxakn5jkz7b37w"; - }; - - patches = [ - # Upstream fix to build against gcc-11. - (fetchurl { - name = "gcc-11.patch"; - url = "http://git.fluxbox.org/fluxbox.git/patch/?id=22866c4d30f5b289c429c5ca88d800200db4fc4f"; - sha256 = "1x7126rlmzky51lk370fczssgnjs7i6wgfaikfib9pvn4vv945ai"; - }) - ]; - - nativeBuildInputs = [ pkg-config ]; - - buildInputs = [ freetype fribidi libXext libXft libXpm libXrandr libXrender xorgproto libXinerama imlib2 ]; - - enableParallelBuilding = true; - - preConfigure = '' - substituteInPlace util/fluxbox-generate_menu.in \ - --subst-var-by PREFIX "$out" - ''; - - meta = { - description = "Full-featured, light-resource X window manager"; - longDescription = '' - Fluxbox is a X window manager based on Blackbox 0.61.1 window - manager sources. It is very light on resources and easy to - handle but yet full of features to make an easy, and extremely - fast, desktop experience. It is written in C++ and licensed - under MIT license. - ''; - homepage = "http://fluxbox.org/"; - license = licenses.mit; - maintainers = [ maintainers.AndersonTorres ]; - platforms = platforms.linux; - }; -} -# Many thanks Jack Ryan from Nix-dev mailing list! diff --git a/pkgs/applications/window-managers/hackedbox/default.nix b/pkgs/applications/window-managers/hackedbox/default.nix deleted file mode 100644 index e5812c4c63fa4..0000000000000 --- a/pkgs/applications/window-managers/hackedbox/default.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, autoreconfHook -, freetype -, fribidi -, imlib2 -, libX11 -, libXext -, libXft -, libXinerama -, libXpm -, libXrandr -, libXrender -, pkg-config -, xorgproto -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "hackedbox"; - version = "0.8.5.1"; - - src = fetchFromGitHub { - owner = "museoa"; - repo = "hackedbox"; - rev = finalAttrs.version; - hash = "sha256-hxfbEj7UxQ19xhetmdi0iyK6ceLUfUvAAyyTbNivlLQ="; - }; - - nativeBuildInputs = [ - autoreconfHook - pkg-config - ]; - - CXXFLAGS = "-std=c++98"; - - buildInputs = [ - freetype - fribidi - imlib2 - libX11 - libXext - libXft - libXinerama - libXpm - libXrandr - libXrender - xorgproto - ]; - - configureFlags = [ - "--x-includes=${libX11.dev}/include" - "--x-libraries=${libX11.out}/lib" - ]; - - meta = with lib; { - description = "Bastard hacked offspring of Blackbox"; - homepage = "https://github.com/museoa/hackedbox/"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ AndersonTorres ]; - inherit (libX11.meta) platforms; - }; -}) diff --git a/pkgs/applications/window-managers/hyprwm/hypr/default.nix b/pkgs/applications/window-managers/hyprwm/hypr/default.nix index 3952256b8d410..b24c905478e46 100644 --- a/pkgs/applications/window-managers/hyprwm/hypr/default.nix +++ b/pkgs/applications/window-managers/hyprwm/hypr/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: { ]; # src/ewmh/ewmh.cpp:67:28: error: non-constant-expression cannot be narrowed from type 'int' to 'uint32_t' (aka 'unsigned int') in initializer list - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-c++11-narrowing"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-Wno-c++11-narrowing"; installPhase = '' runHook preInstall diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/default.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/default.nix index f994b19175209..91f57ad526d92 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/default.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/default.nix @@ -26,6 +26,13 @@ let plugins = lib.mergeAttrsList [ { hy3 = import ./hy3.nix; } + { hycov = import ./hycov.nix; } + { hypr-dynamic-cursors = import ./hypr-dynamic-cursors.nix; } + { hyprfocus = import ./hyprfocus.nix; } + { hyprgrass = import ./hyprgrass.nix; } + { hyprscroller = import ./hyprscroller.nix; } + { hyprspace = import ./hyprspace.nix; } + { hyprsplit = import ./hyprsplit.nix; } (import ./hyprland-plugins.nix) ]; in diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hy3.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hy3.nix index bd4422cb33fba..574d2806b330a 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hy3.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hy3.nix @@ -7,13 +7,13 @@ }: mkHyprlandPlugin hyprland rec { pluginName = "hy3"; - version = "0.41.2"; + version = "0.43.0"; src = fetchFromGitHub { owner = "outfoxxed"; repo = "hy3"; rev = "refs/tags/hl${version}"; - hash = "sha256-aZuNKBwTwj8EXkDBMWNdRKbHPx647wJLWm55h6jOKbo="; + hash = "sha256-hBvwaMlgBuR2cB1Kx6cA1z7x38HXUujNcHtBsKhaEZs="; }; nativeBuildInputs = [ cmake ]; @@ -24,7 +24,7 @@ mkHyprlandPlugin hyprland rec { homepage = "https://github.com/outfoxxed/hy3"; description = "Hyprland plugin for an i3 / sway like manual tiling layout"; license = lib.licenses.gpl3; - platforms = lib.platforms.linux; + inherit (hyprland.meta) platforms; maintainers = with lib.maintainers; [ aacebedo johnrtitor diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hycov.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hycov.nix new file mode 100644 index 0000000000000..38bcd12a7ffa4 --- /dev/null +++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hycov.nix @@ -0,0 +1,33 @@ +{ + lib, + mkHyprlandPlugin, + hyprland, + cmake, + fetchFromGitHub, + nix-update-script, +}: + +mkHyprlandPlugin hyprland rec { + pluginName = "hycov"; + version = "0.41.2.1"; + + src = fetchFromGitHub { + owner = "DreamMaoMao"; + repo = "hycov"; + rev = version; + hash = "sha256-NRnxbkuiq1rQ+uauo7D+CEe73iGqxsWxTQa+1SEPnXQ="; + }; + + nativeBuildInputs = [ cmake ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Clients overview for Hyprland plugin"; + homepage = "https://github.com/DreamMaoMao/hycov"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ donovanglover ]; + platforms = lib.platforms.linux; + broken = true; # Doesn't work after Hyprland v0.41.2 https://gitee.com/DreamMaoMao/hycov/issues/IANYC8#note_31512295_link + }; +} diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hypr-dynamic-cursors.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hypr-dynamic-cursors.nix new file mode 100644 index 0000000000000..6b16f3c5c7e59 --- /dev/null +++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hypr-dynamic-cursors.nix @@ -0,0 +1,40 @@ +{ + lib, + mkHyprlandPlugin, + fetchFromGitHub, + hyprland, + unstableGitUpdater, +}: + +mkHyprlandPlugin hyprland { + pluginName = "hypr-dynamic-cursors"; + version = "0-unstable-2024-08-01"; + + src = fetchFromGitHub { + owner = "VirtCode"; + repo = "hypr-dynamic-cursors"; + rev = "ed2ff68862ae02e04dd06488eb7228e4412f5c33"; + hash = "sha256-02G/SPd/X7zSIFF3V6dkh8mGGWoO0/m6/Yld7HyPmJs="; + }; + + dontUseCmakeConfigure = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/lib + mv out/dynamic-cursors.so $out/lib/libhypr-dynamic-cursors.so + + runHook postInstall + ''; + + passthru.updateScript = unstableGitUpdater { }; + + meta = { + description = "Plugin to make your Hyprland cursor more realistic"; + homepage = "https://github.com/VirtCode/hypr-dynamic-cursors"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ donovanglover ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprfocus.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprfocus.nix new file mode 100644 index 0000000000000..f58cc54a8eb56 --- /dev/null +++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprfocus.nix @@ -0,0 +1,35 @@ +{ + lib, + mkHyprlandPlugin, + hyprland, + fetchFromGitHub, +}: + +mkHyprlandPlugin hyprland { + pluginName = "hyprfocus"; + version = "0-unstable-2024-05-30"; + + src = fetchFromGitHub { + owner = "pyt0xic"; + repo = "hyprfocus"; + rev = "aa7262d3a4564062f97b9cfdad47fd914cfb80f2"; + hash = "sha256-R1ZgNhQkoS6ZHRRKB+j5vYgRANfYO//sHbrD7moUTx0="; + }; + + installPhase = '' + runHook preInstall + + mkdir -p $out/lib + mv hyprfocus.so $out/lib/libhyprfocus.so + + runHook postInstall + ''; + + meta = { + homepage = "https://github.com/pyt0xic/hyprfocus"; + description = "Focus animation plugin for Hyprland inspired by Flashfocus"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ donovanglover ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprgrass.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprgrass.nix new file mode 100644 index 0000000000000..67b39551990e5 --- /dev/null +++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprgrass.nix @@ -0,0 +1,47 @@ +{ + lib, + mkHyprlandPlugin, + hyprland, + fetchFromGitHub, + cmake, + doctest, + meson, + ninja, + wf-touch, + nix-update-script, +}: + +mkHyprlandPlugin hyprland rec { + pluginName = "hyprgrass"; + version = "0.8.1"; + + src = fetchFromGitHub { + owner = "horriblename"; + repo = "hyprgrass"; + rev = "v${version}"; + hash = "sha256-3CN9ZioI5XBtp6WF61hH2EyASHUIPJQCTXiW1rt9n5w="; + }; + + nativeBuildInputs = [ + cmake + doctest + meson + ninja + ]; + + buildInputs = [ wf-touch ]; + + dontUseCmakeConfigure = true; + + doCheck = true; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Hyprland plugin for touch gestures"; + homepage = "https://github.com/horriblename/hyprgrass"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ donovanglover ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprland-plugins.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprland-plugins.nix index b3bd59f7b5255..bb5a4dc9f6f60 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprland-plugins.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprland-plugins.nix @@ -14,13 +14,13 @@ let mkHyprlandPlugin, }: let - version = "0.41.2"; + version = "0.43.0"; hyprland-plugins-src = fetchFromGitHub { owner = "hyprwm"; repo = "hyprland-plugins"; rev = "refs/tags/v${version}"; - hash = "sha256-TnlAcO5K2gkab0mpKurP5Co6eWRycP/KbFqWNS2rsMA="; + hash = "sha256-dPcWAeRJoG5CyWC32X3XX+Og0v/k1/S1N0T5dQWT32k="; }; in mkHyprlandPlugin hyprland { @@ -37,7 +37,7 @@ let fufexan johnrtitor ]; - platforms = lib.platforms.linux; + inherit (hyprland.meta) platforms; }; } ) diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprscroller.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprscroller.nix new file mode 100644 index 0000000000000..3d39c7d216dd9 --- /dev/null +++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprscroller.nix @@ -0,0 +1,41 @@ +{ + lib, + mkHyprlandPlugin, + hyprland, + cmake, + fetchFromGitHub, + unstableGitUpdater, +}: + +mkHyprlandPlugin hyprland { + pluginName = "hyprscroller"; + version = "0-unstable-2024-09-06"; + + src = fetchFromGitHub { + owner = "dawsers"; + repo = "hyprscroller"; + rev = "07671d7d42b92a85fc7e62cd8f02b0d9c52a8dea"; + hash = "sha256-RLI202fBXz+mDXX5Em70FU+16ChbA/YtpORYiOSX8uc="; + }; + + nativeBuildInputs = [ cmake ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/lib + mv hyprscroller.so $out/lib/libhyprscroller.so + + runHook postInstall + ''; + + passthru.updateScript = unstableGitUpdater { }; + + meta = { + homepage = "https://github.com/dawsers/hyprscroller"; + description = "Hyprland layout plugin providing a scrolling layout like PaperWM"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ donovanglover ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprspace.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprspace.nix new file mode 100644 index 0000000000000..ff658d30ce156 --- /dev/null +++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprspace.nix @@ -0,0 +1,40 @@ +{ + lib, + fetchFromGitHub, + hyprland, + mkHyprlandPlugin, + unstableGitUpdater, +}: + +mkHyprlandPlugin hyprland { + pluginName = "hyprspace"; + version = "0-unstable-2024-08-21"; + + src = fetchFromGitHub { + owner = "KZDKM"; + repo = "hyprspace"; + rev = "743ec37d02bb2b7261f28de16bf404cebfd96105"; + hash = "sha256-w0j/3OeSrpx+S8if1M2ONBsZvJQ1hBQkdTQEiMCHy7o="; + }; + + dontUseCmakeConfigure = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/lib + mv Hyprspace.so $out/lib/libhyprspace.so + + runHook postInstall + ''; + + passthru.updateScript = unstableGitUpdater { }; + + meta = { + homepage = "https://github.com/KZDKM/Hyprspace"; + description = "Workspace overview plugin for Hyprland"; + license = lib.licenses.gpl2Only; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ donovanglover ]; + }; +} diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprsplit.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprsplit.nix new file mode 100644 index 0000000000000..13e51037fc9ca --- /dev/null +++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprsplit.nix @@ -0,0 +1,34 @@ +{ + lib, + meson, + fetchFromGitHub, + hyprland, + ninja, + mkHyprlandPlugin, +}: +mkHyprlandPlugin hyprland rec { + pluginName = "hyprsplit"; + version = "0.43.0"; + + src = fetchFromGitHub { + owner = "shezdy"; + repo = "hyprsplit"; + rev = "refs/tags/v${version}"; + hash = "sha256-r533kNIyfgPi/q8ddIYyDK1Pmupt/F3ncHuFo3zjDkU="; + }; + + nativeBuildInputs = [ + meson + ninja + ]; + + meta = { + homepage = "https://github.com/shezdy/hyprsplit"; + description = "Hyprland plugin for awesome / dwm like workspaces"; + license = lib.licenses.bsd3; + inherit (hyprland.meta) platforms; + maintainers = with lib.maintainers; [ + aacebedo + ]; + }; +} diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-protocols/default.nix b/pkgs/applications/window-managers/hyprwm/hyprland-protocols/default.nix index 8815205b0e9d1..a1269307c9581 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland-protocols/default.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland-protocols/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "hyprwm"; - repo = finalAttrs.pname; + repo = "hyprland-protocols"; rev = "v${finalAttrs.version}"; hash = "sha256-HUklK5u86w2Yh9dOkk4FdsL8eehcOZ95jPhLixGDRQY="; }; diff --git a/pkgs/applications/window-managers/hyprwm/hyprpaper/default.nix b/pkgs/applications/window-managers/hyprwm/hyprpaper/default.nix index 9da143be08bf1..771b3b1841a58 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprpaper/default.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprpaper/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , cmake , cairo , expat @@ -23,22 +24,33 @@ , wayland , wayland-protocols , wayland-scanner +, hyprwayland-scanner +, hyprutils }: stdenv.mkDerivation (finalAttrs: { pname = "hyprpaper"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "hyprwm"; - repo = finalAttrs.pname; + repo = "hyprpaper"; rev = "v${finalAttrs.version}"; - hash = "sha256-l13c8ALA7ZKDgluYA1C1OfkDGYD6e1/GR6LJnxCLRhA="; + hash = "sha256-HIK7XJWQCM0BAnwW5uC7P0e7DAkVTy5jlxQ0NwoSy4M="; }; + patches = [ + # CMakeLists: look for wayland.xml protocol in wayland-scanner pkgdata + (fetchpatch { + url = "https://github.com/hyprwm/hyprpaper/commit/6c6e54faa84d2de94d2321eda43a8a669ebf3312.patch"; + hash = "sha256-Ns7HlUPVgBDIocZRGR6kIW58Mt92kJPQRMSKTvp6Vik="; + }) + ]; + nativeBuildInputs = [ cmake pkg-config + hyprwayland-scanner wayland-scanner ]; @@ -62,6 +74,7 @@ stdenv.mkDerivation (finalAttrs: { util-linux wayland wayland-protocols + hyprutils ]; prePatch = '' @@ -75,7 +88,7 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.bsd3; maintainers = with maintainers; [ wozeparrot fufexan ]; inherit (wayland.meta) platforms; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; mainProgram = "hyprpaper"; }; }) diff --git a/pkgs/applications/window-managers/hyprwm/hyprpicker/default.nix b/pkgs/applications/window-managers/hyprwm/hyprpicker/default.nix index 4089d82a3b977..0ee4884f5b6f1 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprpicker/default.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprpicker/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "hyprwm"; - repo = finalAttrs.pname; + repo = "hyprpicker"; rev = "v${finalAttrs.version}"; hash = "sha256-BYQF1zM6bJ44ag9FJ0aTSkhOTY9U7uRdp3SmRCs5fJM="; }; diff --git a/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix b/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix index 609da88715661..ef479589d59b6 100644 --- a/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix +++ b/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix @@ -1,49 +1,57 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, pkg-config -, wayland-scanner -, makeWrapper -, wrapQtAppsHook -, hyprland-protocols -, hyprlang -, libdrm -, mesa -, pipewire -, qtbase -, qttools -, qtwayland -, sdbus-cpp -, systemd -, wayland -, wayland-protocols -, hyprland -, hyprpicker -, slurp +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + makeWrapper, + pkg-config, + wrapQtAppsHook, + nix-update-script, + hyprland, + hyprland-protocols, + hyprlang, + hyprutils, + hyprwayland-scanner, + libdrm, + mesa, + pipewire, + qtbase, + qttools, + qtwayland, + sdbus-cpp, + slurp, + systemd, + wayland, + wayland-protocols, + wayland-scanner, }: -stdenv.mkDerivation (self: { +stdenv.mkDerivation (finalAttrs: { pname = "xdg-desktop-portal-hyprland"; - version = "1.3.2"; + version = "1.3.6"; src = fetchFromGitHub { owner = "hyprwm"; repo = "xdg-desktop-portal-hyprland"; - rev = "v${self.version}"; - hash = "sha256-KsX7sAwkEFpXiwyjt0HGTnnrUU58wW1jlzj5IA/LRz8="; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-1DGktDtSWIJpnDbVoj/qpvJSH5zg6JbOfuh6xqZMap0="; }; + depsBuildBuild = [ + pkg-config + ]; + nativeBuildInputs = [ cmake - pkg-config - wayland-scanner makeWrapper + pkg-config wrapQtAppsHook + hyprwayland-scanner ]; buildInputs = [ hyprland-protocols hyprlang + hyprutils libdrm mesa pipewire @@ -54,6 +62,7 @@ stdenv.mkDerivation (self: { systemd wayland wayland-protocols + wayland-scanner ]; dontWrapQtApps = true; @@ -61,18 +70,28 @@ stdenv.mkDerivation (self: { postInstall = '' wrapProgramShell $out/bin/hyprland-share-picker \ "''${qtWrapperArgs[@]}" \ - --prefix PATH ":" ${lib.makeBinPath [slurp hyprland]} + --prefix PATH ":" ${ + lib.makeBinPath [ + slurp + hyprland + ] + } wrapProgramShell $out/libexec/xdg-desktop-portal-hyprland \ - --prefix PATH ":" ${lib.makeBinPath [(placeholder "out") hyprpicker]} + --prefix PATH ":" ${lib.makeBinPath [ (placeholder "out") ]} ''; - meta = with lib; { - homepage = "https://github.com/hyprwm/xdg-desktop-portal-hyprland"; + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { description = "xdg-desktop-portal backend for Hyprland"; + homepage = "https://github.com/hyprwm/xdg-desktop-portal-hyprland"; + changelog = "https://github.com/hyprwm/xdg-desktop-portal-hyprland/releases/tag/v${finalAttrs.version}"; mainProgram = "hyprland-share-picker"; - license = licenses.bsd3; - maintainers = with maintainers; [ fufexan ]; - platforms = platforms.linux; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ fufexan ]; + platforms = lib.platforms.linux; }; }) diff --git a/pkgs/applications/window-managers/i3/auto-layout.nix b/pkgs/applications/window-managers/i3/auto-layout.nix index bfcb35a870c94..ef6c27de438ef 100644 --- a/pkgs/applications/window-managers/i3/auto-layout.nix +++ b/pkgs/applications/window-managers/i3/auto-layout.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-gpVYVyh+2y4Tttvw1SuCf7mx/nxR330Ob2R4UmHZSJs="; }; - cargoSha256 = "sha256-OxQ7S+Sqc3aRH53Bs53Y+EKOYFgboGOBsQ7KJgICcGo="; + cargoHash = "sha256-OxQ7S+Sqc3aRH53Bs53Y+EKOYFgboGOBsQ7KJgICcGo="; # Currently no tests are implemented, so we avoid building the package twice doCheck = false; diff --git a/pkgs/applications/window-managers/i3/balance-workspace.nix b/pkgs/applications/window-managers/i3/balance-workspace.nix index bb0ea94e77c34..de68a06d896e2 100644 --- a/pkgs/applications/window-managers/i3/balance-workspace.nix +++ b/pkgs/applications/window-managers/i3/balance-workspace.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-zJdn/Q6r60FQgfehtQfeDkmN0Rz3ZaqgNhiWvjyQFy0="; + hash = "sha256-zJdn/Q6r60FQgfehtQfeDkmN0Rz3ZaqgNhiWvjyQFy0="; }; propagatedBuildInputs = [ i3ipc ]; diff --git a/pkgs/applications/window-managers/i3/blocks-gaps.nix b/pkgs/applications/window-managers/i3/blocks-gaps.nix index 1d9043686bb2d..6c32583aa0631 100644 --- a/pkgs/applications/window-managers/i3/blocks-gaps.nix +++ b/pkgs/applications/window-managers/i3/blocks-gaps.nix @@ -4,11 +4,9 @@ "load_average" "memory" "volume" "wifi" ] }: -with lib; - let perlscripts = [ "battery" "cpu_usage" "openvpn" "temperature" ]; - contains_any = l1: l2: 0 < length( intersectLists l1 l2 ); + contains_any = l1: l2: 0 < lib.length( lib.intersectLists l1 l2 ); in stdenv.mkDerivation rec { @@ -25,24 +23,24 @@ stdenv.mkDerivation rec { makeFlags = [ "all" ]; installFlags = [ "PREFIX=\${out}" "VERSION=${version}" ]; - buildInputs = optional (contains_any scripts perlscripts) perl; + buildInputs = lib.optional (contains_any scripts perlscripts) perl; nativeBuildInputs = [ makeWrapper ]; - postFixup = optionalString (elem "bandwidth" scripts) '' + postFixup = lib.optionalString (lib.elem "bandwidth" scripts) '' wrapProgram $out/libexec/i3blocks/bandwidth \ - --prefix PATH : ${makeBinPath [ iproute2 ]} - '' + optionalString (elem "battery" scripts) '' + --prefix PATH : ${lib.makeBinPath [ iproute2 ]} + '' + lib.optionalString (lib.elem "battery" scripts) '' wrapProgram $out/libexec/i3blocks/battery \ - --prefix PATH : ${makeBinPath [ acpi ]} - '' + optionalString (elem "cpu_usage" scripts) '' + --prefix PATH : ${lib.makeBinPath [ acpi ]} + '' + lib.optionalString (lib.elem "cpu_usage" scripts) '' wrapProgram $out/libexec/i3blocks/cpu_usage \ - --prefix PATH : ${makeBinPath [ sysstat ]} - '' + optionalString (elem "iface" scripts) '' + --prefix PATH : ${lib.makeBinPath [ sysstat ]} + '' + lib.optionalString (lib.elem "iface" scripts) '' wrapProgram $out/libexec/i3blocks/iface \ - --prefix PATH : ${makeBinPath [ iproute2 ]} - '' + optionalString (elem "volume" scripts) '' + --prefix PATH : ${lib.makeBinPath [ iproute2 ]} + '' + lib.optionalString (lib.elem "volume" scripts) '' wrapProgram $out/libexec/i3blocks/volume \ - --prefix PATH : ${makeBinPath [ alsa-utils ]} + --prefix PATH : ${lib.makeBinPath [ alsa-utils ]} ''; meta = with lib; { diff --git a/pkgs/applications/window-managers/i3/blocks.nix b/pkgs/applications/window-managers/i3/blocks.nix index d9ed823400d65..ad495723b6db8 100644 --- a/pkgs/applications/window-managers/i3/blocks.nix +++ b/pkgs/applications/window-managers/i3/blocks.nix @@ -1,7 +1,5 @@ { fetchFromGitHub, fetchpatch, lib, stdenv, autoreconfHook, pkg-config }: -with lib; - stdenv.mkDerivation { pname = "i3blocks"; version = "1.5"; @@ -24,7 +22,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoreconfHook pkg-config ]; - meta = { + meta = with lib; { description = "Flexible scheduler for your i3bar blocks"; mainProgram = "i3blocks"; homepage = "https://github.com/vivien/i3blocks"; diff --git a/pkgs/applications/window-managers/i3/bumblebee-status/default.nix b/pkgs/applications/window-managers/i3/bumblebee-status/default.nix index 6346672181487..99b5b203ee2f3 100644 --- a/pkgs/applications/window-managers/i3/bumblebee-status/default.nix +++ b/pkgs/applications/window-managers/i3/bumblebee-status/default.nix @@ -2,6 +2,7 @@ , lib , glibcLocales , python +, fetchpatch , fetchFromGitHub # Usage: bumblebee-status.override { plugins = p: [p.arandr p.bluetooth2]; }; , plugins ? p: [ ] @@ -29,6 +30,15 @@ python.pkgs.buildPythonPackage { hash = "sha256-+RCg2XZv0AJnexi7vnQhEXB1qSoKBN1yKWm3etdys1s="; }; + patches = [ + # fix build with Python 3.12 + # https://github.com/tobi-wan-kenobi/bumblebee-status/pull/1019 + (fetchpatch { + url = "https://github.com/tobi-wan-kenobi/bumblebee-status/commit/2fe8f1ff1444daf155b18318005f33a76a5d64b4.patch"; + hash = "sha256-BC1cgQDMJkhuEgq8NJ28521CHbEfqIMueHkFXXlZz2w="; + }) + ]; + buildInputs = lib.concatMap (p: p.buildInputs or [ ]) selectedPlugins; propagatedBuildInputs = lib.concatMap (p: p.propagatedBuildInputs or [ ]) selectedPlugins; 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/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix index 16dd2e6485e77..acb05f4ac7713 100644 --- a/pkgs/applications/window-managers/i3/default.nix +++ b/pkgs/applications/window-managers/i3/default.nix @@ -1,8 +1,9 @@ { fetchurl, lib, stdenv, pkg-config, makeWrapper, meson, ninja, installShellFiles, libxcb, xcbutilkeysyms , xcbutil, xcbutilwm, xcbutilxrm, libstartup_notification, libX11, pcre2, libev , yajl, xcb-util-cursor, perl, pango, perlPackages, libxkbcommon -, xorgserver, xvfb-run +, xorgserver, xvfb-run, xdotool, xorg, which , asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, findXMLCatalogs +, nixosTests }: stdenv.mkDerivation rec { @@ -29,27 +30,42 @@ stdenv.mkDerivation rec { libstartup_notification libX11 pcre2 libev yajl xcb-util-cursor perl pango perlPackages.AnyEventI3 perlPackages.X11XCB perlPackages.IPCRun perlPackages.ExtUtilsPkgConfig perlPackages.InlineC - xorgserver xvfb-run + ] ++ lib.optionals doCheck [ + xorgserver xvfb-run xdotool xorg.setxkbmap xorg.xrandr which ]; configureFlags = [ "--disable-builddir" ]; postPatch = '' patchShebangs . + + # This testcase generates a Perl executable file with a shebang, and + # patchShebangs can't replace a shebang in the middle of a file. + if [ -f testcases/t/318-i3-dmenu-desktop.t ]; then + substituteInPlace testcases/t/318-i3-dmenu-desktop.t \ + --replace-fail "#!/usr/bin/env perl" "#!${perl}/bin/perl" + fi ''; - # Tests have been failing (at least for some people in some cases) - # and have been disabled until someone wants to fix them. Some - # initial digging uncovers that the tests call out to `git`, which - # they shouldn't, and then even once that's fixed have some - # perl-related errors later on. For more, see - # https://github.com/NixOS/nixpkgs/issues/7957 - doCheck = false; # stdenv.hostPlatform.system == "x86_64-linux"; - - checkPhase = lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") - '' - (cd testcases && xvfb-run ./complete-run.pl -p 1 --keep-xserver-output) - ! grep -q '^not ok' testcases/latest/complete-run.log + # xvfb-run is available only on Linux + doCheck = stdenv.hostPlatform.isLinux; + + checkPhase = '' + test_failed= + # "| cat" disables fancy progress reporting which makes the log unreadable. + ./complete-run.pl -p 1 --keep-xserver-output | cat || test_failed="complete-run.pl returned $?" + if [ -z "$test_failed" ]; then + # Apparently some old versions of `complete-run.pl` did not return a + # proper exit code, so check the log for signs of errors too. + grep -q '^not ok' latest/complete-run.log && test_failed="test log contains errors" ||: + fi + if [ -n "$test_failed" ]; then + echo "***** Error: $test_failed" + echo "===== Test log =====" + cat latest/complete-run.log + echo "===== End of test log =====" + false + fi ''; postInstall = '' @@ -63,6 +79,9 @@ stdenv.mkDerivation rec { separateDebugInfo = true; + passthru.tests = { inherit (nixosTests) i3wm; }; + + meta = with lib; { description = "Tiling window manager"; homepage = "https://i3wm.org"; diff --git a/pkgs/applications/window-managers/i3/i3-ratiosplit.nix b/pkgs/applications/window-managers/i3/i3-ratiosplit.nix index 0903ceb3185af..ad585ef08885d 100644 --- a/pkgs/applications/window-managers/i3/i3-ratiosplit.nix +++ b/pkgs/applications/window-managers/i3/i3-ratiosplit.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0yfmr5zk2c2il9d31yjjbr48sqgcq6hp4a99hl5mjm2ajyhy5bz3"; }; - cargoSha256 = "134sgc9d0j57swknl9sgil6212rws2hhp92s3cg1yzz5ygx21c76"; + cargoHash = "sha256-5rAg+vPlfx8eG1qkC6HQPIsgDI1PJ2on16dI0BJ7mow="; # Currently no tests are implemented, so we avoid building the package twice doCheck = false; diff --git a/pkgs/applications/window-managers/i3/i3-resurrect.nix b/pkgs/applications/window-managers/i3/i3-resurrect.nix index 015bbee6013f2..2040cdba806a1 100644 --- a/pkgs/applications/window-managers/i3/i3-resurrect.nix +++ b/pkgs/applications/window-managers/i3/i3-resurrect.nix @@ -6,7 +6,7 @@ buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-13FKRvEE4vHq5G51G1UyBnfNiWeS9Q/SYCG16E1Sn4c="; + hash = "sha256-13FKRvEE4vHq5G51G1UyBnfNiWeS9Q/SYCG16E1Sn4c="; }; propagatedBuildInputs = [ click psutil xprop natsort i3ipc xdotool importlib-metadata ]; diff --git a/pkgs/applications/window-managers/i3/kitti3.nix b/pkgs/applications/window-managers/i3/kitti3.nix index 3068baee5d996..4a88518d508bb 100644 --- a/pkgs/applications/window-managers/i3/kitti3.nix +++ b/pkgs/applications/window-managers/i3/kitti3.nix @@ -36,6 +36,6 @@ buildPythonApplication rec { description = "Kitty drop-down service for sway & i3wm"; mainProgram = "kitti3"; license = licenses.bsd3; - maintainers = with maintainers; [ Enzime ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/window-managers/i3/layout-manager.nix b/pkgs/applications/window-managers/i3/layout-manager.nix index b2a3adb98f907..df5bb41d85ecc 100644 --- a/pkgs/applications/window-managers/i3/layout-manager.nix +++ b/pkgs/applications/window-managers/i3/layout-manager.nix @@ -35,6 +35,6 @@ stdenv.mkDerivation rec { mainProgram = "layout_manager"; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/window-managers/i3/lock-blur.nix b/pkgs/applications/window-managers/i3/lock-blur.nix index e3eabc547b5f9..dc8e8250135b6 100644 --- a/pkgs/applications/window-managers/i3/lock-blur.nix +++ b/pkgs/applications/window-managers/i3/lock-blur.nix @@ -29,6 +29,6 @@ i3lock-color.overrideAttrs (oldAttrs : rec { license = licenses.bsd3; maintainers = with maintainers; [ dan4ik605743 ]; platforms = platforms.all; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/i3lock-blur.x86_64-darwin + broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/i3lock-blur.x86_64-darwin }; }) diff --git a/pkgs/applications/window-managers/i3/lock-color.nix b/pkgs/applications/window-managers/i3/lock-color.nix index 584e13f553697..5a4c12a4474a7 100644 --- a/pkgs/applications/window-managers/i3/lock-color.nix +++ b/pkgs/applications/window-managers/i3/lock-color.nix @@ -57,6 +57,6 @@ stdenv.mkDerivation rec { license = licenses.bsd3; platforms = platforms.all; - broken = stdenv.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/applications/window-managers/i3/pystatus.nix b/pkgs/applications/window-managers/i3/pystatus.nix deleted file mode 100644 index 66450eec6c321..0000000000000 --- a/pkgs/applications/window-managers/i3/pystatus.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ lib -, fetchFromGitHub -, libpulseaudio -, libnotify -, gobject-introspection -, python3Packages -, extraLibs ? [] }: - -python3Packages.buildPythonApplication rec { - # i3pystatus moved to rolling release: - # https://github.com/enkore/i3pystatus/issues/584 - version = "unstable-2020-06-12"; - pname = "i3pystatus"; - - src = fetchFromGitHub { - owner = "enkore"; - repo = "i3pystatus"; - rev = "dad5eb0c5c8a2ecd20c37ade4732586c6e53f44b"; - sha256 = "18ygvkl92yr69kxsym57k1mc90asdxpz4b943i61qr0s4fc5n4mq"; - }; - - nativeBuildInputs = [ - gobject-introspection - ]; - - buildInputs = [ libpulseaudio libnotify ]; - - propagatedBuildInputs = with python3Packages; [ - keyring colour netifaces psutil basiciw pygobject3 - ] ++ extraLibs; - - makeWrapperArgs = [ - # LC_TIME != C results in locale.Error: unsupported locale setting - "--set" "LC_TIME" "C" - "--suffix" "LD_LIBRARY_PATH" ":" "${lib.makeLibraryPath [ libpulseaudio ]}" - ]; - - postPatch = '' - makeWrapperArgs+=(--set GI_TYPELIB_PATH "$GI_TYPELIB_PATH") - ''; - - postInstall = '' - makeWrapper ${python3Packages.python.interpreter} $out/bin/${pname}-python-interpreter \ - --prefix PYTHONPATH : "$PYTHONPATH" \ - ''${makeWrapperArgs[@]} - ''; - - # no tests in tarball - doCheck = false; - - meta = with lib; { - homepage = "https://github.com/enkore/i3pystatus"; - description = "Complete replacement for i3status"; - longDescription = '' - i3pystatus is a growing collection of python scripts for status output compatible - to i3status / i3bar of the i3 window manager. - ''; - license = licenses.mit; - platforms = platforms.linux; - maintainers = [ maintainers.igsha ]; - }; -} diff --git a/pkgs/applications/window-managers/i3/rounded.nix b/pkgs/applications/window-managers/i3/rounded.nix index ee04f4246fefa..45e80f7fb1a7a 100644 --- a/pkgs/applications/window-managers/i3/rounded.nix +++ b/pkgs/applications/window-managers/i3/rounded.nix @@ -13,6 +13,9 @@ i3.overrideAttrs (oldAttrs: rec { buildInputs = oldAttrs.buildInputs ++ [ pcre ]; + # Some tests are failing. + doCheck = false; + meta = with lib; { description = "Fork of i3-gaps that adds rounding to window corners"; homepage = "https://github.com/LinoBigatti/i3-rounded"; diff --git a/pkgs/applications/window-managers/i3/status.nix b/pkgs/applications/window-managers/i3/status.nix index 6c376fab2d4be..9b2bdc31743f2 100644 --- a/pkgs/applications/window-managers/i3/status.nix +++ b/pkgs/applications/window-managers/i3/status.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "i3status"; - version = "2.14"; + version = "2.15"; src = fetchurl { url = "https://i3wm.org/i3status/i3status-${version}.tar.xz"; - sha256 = "0929chhvyq9hg4scpcz8r9zn3s9jvbg6a86k3wqa77qg85rh4kaw"; + sha256 = "sha256-bGf1LK5PE533ZK0cxzZWK+D5d1B5G8IStT80wG6vIgU="; }; nativeBuildInputs = [ meson ninja perl pkg-config asciidoc xmlto docbook_xml_dtd_45 docbook_xsl ]; diff --git a/pkgs/applications/window-managers/i3/swallow.nix b/pkgs/applications/window-managers/i3/swallow.nix index 31101721e4c45..7b6644d0a9983 100644 --- a/pkgs/applications/window-managers/i3/swallow.nix +++ b/pkgs/applications/window-managers/i3/swallow.nix @@ -39,6 +39,6 @@ buildPythonApplication rec { license = licenses.mit; platforms = platforms.linux; mainProgram = "swallow"; - maintainers = [ maintainers.ivar ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/window-managers/i3/wsr.nix b/pkgs/applications/window-managers/i3/wsr.nix index e64194ac38170..f282e38b6dcab 100644 --- a/pkgs/applications/window-managers/i3/wsr.nix +++ b/pkgs/applications/window-managers/i3/wsr.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-Mq4TpQDiIYePUS3EwBfOe2+QmvF6+WEDK12WahbuhSU="; }; - cargoSha256 = "sha256-hybvzHwHM0rQwgZfQpww/w9wQDW5h9P2KSjpAScVTBo="; + cargoHash = "sha256-hybvzHwHM0rQwgZfQpww/w9wQDW5h9P2KSjpAScVTBo="; nativeBuildInputs = [ python3 ]; buildInputs = [ libxcb ]; diff --git a/pkgs/applications/window-managers/ion-3/default.nix b/pkgs/applications/window-managers/ion-3/default.nix index 6fb504144b6cf..8b0d3beb1c486 100644 --- a/pkgs/applications/window-managers/ion-3/default.nix +++ b/pkgs/applications/window-managers/ion-3/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { homepage = "https://modeemi.fi/~tuomov/ion"; platforms = with platforms; linux; license = licenses.lgpl21; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/window-managers/jay/default.nix b/pkgs/applications/window-managers/jay/default.nix index 68644b7535424..9eff972a0c609 100644 --- a/pkgs/applications/window-managers/jay/default.nix +++ b/pkgs/applications/window-managers/jay/default.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "jay"; - version = "1.3.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "mahkoh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-D+dG0/MSC6LzGZBMNofU8WKVYvn52kNWunXExQPoOu8="; + sha256 = "sha256-cuXFkG2YwS0w4xzr7jpjr0QmVA5UJfk5SpjIQKxN/LY="; }; - cargoHash = "sha256-WEEAFr5lemyOfeIKC9Pvr9sYMz8rLO6k1BFgbxXJ0Pk="; + cargoHash = "sha256-w3ARwQlehJq9uNSQmbUjiWik4a2W3Ax/6/BIsdDUfKM="; SHADERC_LIB_DIR = "${lib.getLib shaderc}/lib"; diff --git a/pkgs/applications/window-managers/leftwm/default.nix b/pkgs/applications/window-managers/leftwm/default.nix index ac9a17a489b75..2518d1fe42958 100644 --- a/pkgs/applications/window-managers/leftwm/default.nix +++ b/pkgs/applications/window-managers/leftwm/default.nix @@ -20,7 +20,16 @@ rustPlatform.buildRustPackage rec { hash = "sha256-wn5DurPWFwSUtc5naEL4lBSQpKWTJkugpN9mKx+Ed2Y="; }; - cargoHash = "sha256-TylRxdpAVuGtZ3Lm8je6FZ0JUwetBi6mOGRoT2M3Jyk="; + cargoPatches = [ + # This pacth can be removed with the next version bump, it just updates the `time` crate + ./update-time-crate.patch + ]; + + # To show the "correct" git-hash in `leftwm-check` we manually set the GIT_HASH env variable + # can be remove together with the above patch + GIT_HASH = "36609e0 patched"; + + cargoHash = "sha256-SNq76pTAPSUGVRp/+fwCjSMP/lKVzh6wU+WZW5n/yjg="; buildInputs = rpathLibs; @@ -39,7 +48,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/leftwm/leftwm"; license = lib.licenses.mit; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ yanganto ]; + maintainers = with lib.maintainers; [ vuimuich yanganto ]; changelog = "https://github.com/leftwm/leftwm/blob/${version}/CHANGELOG.md"; mainProgram = "leftwm"; }; diff --git a/pkgs/applications/window-managers/leftwm/update-time-crate.patch b/pkgs/applications/window-managers/leftwm/update-time-crate.patch new file mode 100644 index 0000000000000..f0c09b20d2868 --- /dev/null +++ b/pkgs/applications/window-managers/leftwm/update-time-crate.patch @@ -0,0 +1,57 @@ +From 9358bebb11df19f46d0813723959518498d812b2 Mon Sep 17 00:00:00 2001 +From: VuiMuich <vuimuich@quantentunnel.de> +Date: Mon, 2 Sep 2024 11:15:27 +0200 +Subject: [PATCH] fix rust 1.80.x for nixpkgs + +--- + Cargo.lock | 16 ++++++++++++---- + 1 file changed, 12 insertions(+), 4 deletions(-) + +diff --git a/Cargo.lock b/Cargo.lock +index f8a82eecf..5728b55bf 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -777,6 +777,12 @@ dependencies = [ + "winapi", + ] + ++[[package]] ++name = "num-conv" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" ++ + [[package]] + name = "num-traits" + version = "0.2.17" +@@ -1218,13 +1224,14 @@ dependencies = [ + + [[package]] + name = "time" +-version = "0.3.30" ++version = "0.3.35" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" ++checksum = "ef89ece63debf11bc32d1ed8d078ac870cbeb44da02afb02a9ff135ae7ca0582" + dependencies = [ + "deranged", + "itoa", + "libc", ++ "num-conv", + "num_threads", + "powerfmt", + "serde", +@@ -1240,10 +1247,11 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + + [[package]] + name = "time-macros" +-version = "0.2.15" ++version = "0.2.18" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" ++checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" + dependencies = [ ++ "num-conv", + "time-core", + ] + diff --git a/pkgs/applications/window-managers/lwm/default.nix b/pkgs/applications/window-managers/lwm/default.nix deleted file mode 100644 index 1a2e388bdc349..0000000000000 --- a/pkgs/applications/window-managers/lwm/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ lib, stdenv, fetchurl -, imake, libX11, libSM, libXext, libICE }: - -stdenv.mkDerivation rec { - pname = "lwm"; - version = "1.2.4"; - - src = fetchurl { - url = "http://www.jfc.org.uk/files/lwm/${pname}-${version}.tar.gz"; - sha256 = "1bcdr173f0gl61fyl43p3gr145angci7lvjqb8rl00y9f9amvh3y"; - }; - - nativeBuildInputs = [ imake ]; - - buildInputs = [ libX11 libSM libXext libICE ]; - - dontConfigure = true; - - preBuild = '' - sed -i 's|^LOCAL_LIBRARIES.*|& $(ICELIB)|' Imakefile - xmkmf - ''; - - installPhase = '' - install -dm755 $out/bin $out/share/man/man1 - install -m755 lwm $out/bin/lwm - install -m644 lwm.man $out/share/man/man1/lwm.1 - ''; - - meta = with lib; { - description = "Lightweight Window Manager"; - longDescription = '' - lwm is a window manager for X that tries to keep out of your face. There - are no icons, no button bars, no icon docks, no root menus, no nothing: if - you want all that, then other programs can provide it. There's no - configurability either: if you want that, you want a different window - manager; one that helps your operating system in its evil conquest of your - disc space and its annexation of your physical memory. - ''; - homepage = "http://www.jfc.org.uk/software/lwm.html"; - license = licenses.gpl2; - maintainers = [ maintainers.AndersonTorres ]; - platforms = platforms.linux; - mainProgram = "lwm"; - }; -} diff --git a/pkgs/applications/window-managers/maui-shell/default.nix b/pkgs/applications/window-managers/maui-shell/default.nix deleted file mode 100644 index 0ac02b0957fa9..0000000000000 --- a/pkgs/applications/window-managers/maui-shell/default.nix +++ /dev/null @@ -1,90 +0,0 @@ -{ lib -, pkgs -, mkDerivation -, fetchFromGitHub -, qtquickcontrols2 -, cmake -, extra-cmake-modules -, kio -, krunner -, prison -, knotifyconfig -, kidletime -, kpeople -, kdesu -, kactivities-stats -, ktexteditor -, kinit -, kunitconversion -, kitemmodels -, phonon -, polkit-qt -, polkit -, mauikit -, mauikit-filebrowsing -, bluedevil -, plasma-nm -, plasma-pa -, bluez-qt -, maui-core -, cask-server -, mauiman -, mauikit-calendar -, qtmultimedia -}: - -mkDerivation rec { - pname = "maui-shell"; - version = "0.6.6"; - - src = fetchFromGitHub { - owner = "Nitrux"; - repo = pname; - rev = "refs/tags/v${version}"; - sha256 = "sha256-8D3rlYrqLfyDZQFRSaVlxLaEblbv8w787v8Np2aW3yc="; - }; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - ]; - - buildInputs = [ - bluedevil - bluez-qt - cask-server - kactivities-stats - kdesu - kidletime - kinit - kitemmodels - knotifyconfig - krunner - kunitconversion - kpeople - ktexteditor - mauikit - mauikit-calendar - mauikit-filebrowsing - mauiman - maui-core - phonon - plasma-nm - plasma-pa - polkit - polkit-qt - prison - qtmultimedia - qtquickcontrols2 - ]; - - meta = with lib; { - description = "Convergent shell for desktops, tablets, and phones"; - homepage = "https://github.com/Nitrux/maui-shell"; - license = licenses.lgpl3; - maintainers = with maintainers; [ onny ]; - platforms = platforms.linux; - # https://github.com/Nitrux/maui-shell/issues/56 - broken = true; - }; -} diff --git a/pkgs/applications/window-managers/miriway/default.nix b/pkgs/applications/window-managers/miriway/default.nix index a51f3838aa3aa..c23f1e799c35b 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-08-31"; src = fetchFromGitHub { owner = "Miriway"; repo = "Miriway"; - rev = "5be8f60326181b22e111f02918ae5778cf1a89b0"; - hash = "sha256-dHY0bfVfRpiBY5rPnhmu3aHXx1l9jQhXBtcBbej2JFk="; + rev = "2d754931f038865bd91938578b862262f0ce7c00"; + hash = "sha256-wmtAbajZ859tvLjKuwqFUq05VGLxHNJX1XyIXM6vvgU="; }; strictDeps = true; diff --git a/pkgs/applications/window-managers/owl/default.nix b/pkgs/applications/window-managers/owl/default.nix index 2bef1b024b3eb..15ba9de7d7537 100644 --- a/pkgs/applications/window-managers/owl/default.nix +++ b/pkgs/applications/window-managers/owl/default.nix @@ -9,8 +9,6 @@ , darwin }: -assert wayland.withLibraries; - let stdenv = clangStdenv; in @@ -27,7 +25,7 @@ stdenv.mkDerivation { }; # use pregenerated nib files because generating them requires Xcode - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' sed -i "/ibtool/d" configure mkdir -p build/Owl.app/Contents/Resources/English.lproj cp ${./mac/MainMenu.nib} build/Owl.app/Contents/Resources/English.lproj/MainMenu.nib @@ -39,10 +37,10 @@ stdenv.mkDerivation { nativeBuildInputs = [ makeWrapper wayland-scanner - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.DarwinTools darwin.bootstrap_cmds - ] ++ lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ gnustep.make gnustep.wrapGNUstepAppsHook ]; @@ -50,9 +48,9 @@ stdenv.mkDerivation { buildInputs = [ libxkbcommon wayland - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Cocoa - ] ++ lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ gnustep.back gnustep.base gnustep.gui @@ -66,14 +64,14 @@ stdenv.mkDerivation { configureScript = "../configure"; # error: "Your gnustep-base was configured for the objc-nonfragile-abi but you are not using it now." - env.NIX_CFLAGS_COMPILE = lib.optionalString (!stdenv.isDarwin) "-fobjc-runtime=gnustep-2.0"; + env.NIX_CFLAGS_COMPILE = lib.optionalString (!stdenv.hostPlatform.isDarwin) "-fobjc-runtime=gnustep-2.0"; installPhase = '' runHook preInstall mkdir -p $out/{Applications,bin} mv Owl.app $out/Applications - makeWrapper $out/{Applications/Owl.app${lib.optionalString stdenv.isDarwin "/Contents/MacOS"},bin}/Owl + makeWrapper $out/{Applications/Owl.app${lib.optionalString stdenv.hostPlatform.isDarwin "/Contents/MacOS"},bin}/Owl runHook postInstall ''; diff --git a/pkgs/applications/window-managers/phosh/default.nix b/pkgs/applications/window-managers/phosh/default.nix index 32ece77e4fb04..bba1f204da6ae 100644 --- a/pkgs/applications/window-managers/phosh/default.nix +++ b/pkgs/applications/window-managers/phosh/default.nix @@ -6,6 +6,7 @@ , ninja , pkg-config , python3 +, wayland-scanner , wrapGAppsHook4 , libadwaita , libhandy @@ -16,8 +17,11 @@ , evince , glib , gtk4 -, gnome +, gnome-bluetooth +, gnome-control-center , gnome-desktop +, gnome-session +, gnome-shell , gcr , pam , systemd @@ -32,16 +36,17 @@ , libsecret , evolution-data-server , nixosTests +, gmobile }: stdenv.mkDerivation (finalAttrs: { pname = "phosh"; - version = "0.39.0"; + version = "0.41.1"; src = fetchurl { # Release tarball which includes subprojects gvc and libcall-ui url = with finalAttrs; "https://sources.phosh.mobi/releases/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-n1ZegSJAUr1Lbn0+Mx64vHhl4bwSJEdnO1xN/QdEKlw="; + hash = "sha256-Oc6Dltjj+2D3LWZz1eYArqEKEJYYqJPSrScEkxyNhX0="; }; nativeBuildInputs = [ @@ -50,6 +55,7 @@ stdenv.mkDerivation (finalAttrs: { ninja pkg-config python3 + wayland-scanner wrapGAppsHook4 ]; @@ -67,9 +73,11 @@ stdenv.mkDerivation (finalAttrs: { gcr networkmanager polkit - gnome.gnome-control-center + gmobile + gnome-bluetooth + gnome-control-center gnome-desktop - gnome.gnome-session + gnome-session gtk4 pam systemd @@ -87,11 +95,7 @@ stdenv.mkDerivation (finalAttrs: { doCheck = false; mesonFlags = [ - "-Dsystemd=true" "-Dcompositor=${phoc}/bin/phoc" - # https://github.com/NixOS/nixpkgs/issues/36468 - # https://gitlab.gnome.org/World/Phosh/phosh/-/merge_requests/1363 - "-Dc_args=-I${glib.dev}/include/gio-unix-2.0" # Save some time building if tests are disabled "-Dtests=${lib.boolToString finalAttrs.finalPackage.doCheck}" ]; @@ -108,8 +112,8 @@ stdenv.mkDerivation (finalAttrs: { # Depends on GSettings schemas in gnome-shell preFixup = '' gappsWrapperArgs+=( - --prefix XDG_DATA_DIRS : "${gnome.gnome-shell}/share/gsettings-schemas/${gnome.gnome-shell.name}" - --set GNOME_SESSION "${gnome.gnome-session}/bin/gnome-session" + --prefix XDG_DATA_DIRS : "${glib.getSchemaDataDirPath gnome-shell}" + --set GNOME_SESSION "${gnome-session}/bin/gnome-session" ) ''; diff --git a/pkgs/applications/window-managers/phosh/phosh-mobile-settings.nix b/pkgs/applications/window-managers/phosh/phosh-mobile-settings.nix index 26211ca2f89c6..00a71e457e1df 100644 --- a/pkgs/applications/window-managers/phosh/phosh-mobile-settings.nix +++ b/pkgs/applications/window-managers/phosh/phosh-mobile-settings.nix @@ -1,11 +1,12 @@ { lib , stdenv -, fetchurl +, fetchFromGitLab , nixosTests , directoryListingUpdater , meson , ninja , pkg-config +, wayland-scanner , wrapGAppsHook4 , desktop-file-utils , feedbackd @@ -17,16 +18,20 @@ , wayland-protocols , json-glib , gsound +, gmobile }: stdenv.mkDerivation rec { pname = "phosh-mobile-settings"; - version = "0.38.0"; + version = "0.41.0"; - src = fetchurl { - # This tarball includes the meson wrapped subproject 'gmobile'. - url = "https://sources.phosh.mobi/releases/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-WDqgVsJx5y6IlWII9fRBsAeWn/tB8BaXRtlPvA0wmMk="; + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + group = "World"; + owner = "Phosh"; + repo = "phosh-mobile-settings"; + rev = "v${version}"; + hash = "sha256-t5qngjQcjPltUGbcZ+CF5FbZtZkV/cD3xUhuApQbKHo="; }; nativeBuildInputs = [ @@ -34,6 +39,7 @@ stdenv.mkDerivation rec { ninja phosh pkg-config + wayland-scanner wrapGAppsHook4 ]; @@ -47,6 +53,7 @@ stdenv.mkDerivation rec { wayland-protocols json-glib gsound + gmobile ]; postPatch = '' diff --git a/pkgs/applications/window-managers/ragnarwm/default.nix b/pkgs/applications/window-managers/ragnarwm/default.nix index 2cb9f31e7334f..6ffdc8a0a39e2 100644 --- a/pkgs/applications/window-managers/ragnarwm/default.nix +++ b/pkgs/applications/window-managers/ragnarwm/default.nix @@ -61,13 +61,13 @@ stdenv.mkDerivation (finalAttrs: { providedSessions = [ "ragnar" ]; }; - meta = with lib; { + meta = { description = "Minimal, flexible & user-friendly X tiling window manager"; homepage = "https://ragnar-website.vercel.app"; changelog = "https://github.com/cococry/Ragnar/releases/tag/${finalAttrs.version}"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ sigmanificient ]; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ sigmanificient ]; mainProgram = "ragnar"; - platforms = platforms.linux; + platforms = lib.platforms.linux; }; }) diff --git a/pkgs/applications/window-managers/sawfish/default.nix b/pkgs/applications/window-managers/sawfish/default.nix deleted file mode 100644 index c5bd29d2589fe..0000000000000 --- a/pkgs/applications/window-managers/sawfish/default.nix +++ /dev/null @@ -1,89 +0,0 @@ -{ lib -, stdenv -, fetchurl -, autoreconfHook -, gdk-pixbuf-xlib -, gettext -, gtk2-x11 -, libICE -, libSM -, libxcrypt -, libXinerama -, libXrandr -, libXtst -, librep -, makeWrapper -, pango -, pkg-config -, rep-gtk -, texinfo -, which -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "sawfish"; - version = "1.13.0"; - - src = fetchurl { - url = "https://download.tuxfamily.org/sawfish/sawfish_${finalAttrs.version}.tar.xz"; - hash = "sha256-gWs8W/pMtQjbH8FEifzNAj3siZzxPd6xm8PmXXhyr10="; - }; - - nativeBuildInputs = [ - autoreconfHook - gettext - librep - makeWrapper - pkg-config - texinfo - which - ]; - - buildInputs = [ - gdk-pixbuf-xlib - gtk2-x11 - libICE - libSM - libxcrypt - libXinerama - libXrandr - libXtst - librep - pango - rep-gtk - ]; - - postPatch = '' - sed -e 's|REP_DL_LOAD_PATH=|REP_DL_LOAD_PATH=$(REP_DL_LOAD_PATH):|g' -i Makedefs.in - sed -e 's|$(repexecdir)|$(libdir)/rep|g' -i src/Makefile.in - ''; - - strictDeps = true; - - postInstall = '' - for file in $out/lib/sawfish/sawfish-menu \ - $out/bin/sawfish-about \ - $out/bin/sawfish-client \ - $out/bin/sawfish-config \ - $out/bin/sawfish; do - wrapProgram $file \ - --prefix REP_DL_LOAD_PATH : "$out/lib/rep" \ - --set REP_LOAD_PATH "$out/share/sawfish/lisp" - done - ''; - - meta = { - homepage = "http://sawfish.tuxfamily.org/"; - description = "Extensible, Lisp-based window manager"; - longDescription = '' - Sawfish is an extensible window manager using a Lisp-based scripting - language. Its policy is very minimal compared to most window managers. Its - aim is simply to manage windows in the most flexible and attractive manner - possible. All high-level WM functions are implemented in Lisp for future - extensibility or redefinition. - ''; - license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ AndersonTorres ]; - platforms = lib.platforms.unix; - }; -}) 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/applications/window-managers/spectrwm/default.nix b/pkgs/applications/window-managers/spectrwm/default.nix index ef1a90fd2b92e..52b413452e827 100644 --- a/pkgs/applications/window-managers/spectrwm/default.nix +++ b/pkgs/applications/window-managers/spectrwm/default.nix @@ -1,18 +1,18 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, xorg }: +{ lib, stdenv, fetchFromGitHub, libbsd, pkg-config, xorg }: stdenv.mkDerivation (finalAttrs: { pname = "spectrwm"; - version = "3.5.1"; + version = "3.6.0"; src = fetchFromGitHub { owner = "conformal"; repo = "spectrwm"; rev = "SPECTRWM_${lib.replaceStrings ["."] ["_"] finalAttrs.version}"; - hash = "sha256-Nlzo35OsNqFbR6nl3nnGXDWmwc8JlP4tyDuIGtKTnIY="; + hash = "sha256-Dnn/iIrceiAVuMR8iMGcc7LqNhWC496eT5gNrYOInRU="; }; nativeBuildInputs = [ pkg-config ]; - buildInputs = with xorg; [ + buildInputs = (with xorg; [ libXrandr libXcursor libXft @@ -20,10 +20,10 @@ stdenv.mkDerivation (finalAttrs: { xcbutil xcbutilkeysyms xcbutilwm - ]; + ] ++ [ libbsd ]); prePatch = let - subdir = if stdenv.isDarwin then "osx" else "linux"; + subdir = if stdenv.hostPlatform.isDarwin then "osx" else "linux"; in "cd ${subdir}"; makeFlags = [ "PREFIX=${placeholder "out"}" ]; diff --git a/pkgs/applications/window-managers/tabbed/default.nix b/pkgs/applications/window-managers/tabbed/default.nix index 068d5c2f82edb..9108eec14c34d 100644 --- a/pkgs/applications/window-managers/tabbed/default.nix +++ b/pkgs/applications/window-managers/tabbed/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://tools.suckless.org/tabbed"; description = "Simple generic tabbed fronted to xembed aware applications"; license = licenses.mit; - maintainers = with maintainers; [ vrthra ]; + maintainers = [ ]; platforms = platforms.linux; }; }) diff --git a/pkgs/applications/window-managers/taffybar/default.nix b/pkgs/applications/window-managers/taffybar/default.nix index 062fc2a3771da..16f6d38b222c9 100644 --- a/pkgs/applications/window-managers/taffybar/default.nix +++ b/pkgs/applications/window-managers/taffybar/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, ghcWithPackages, taffybar, makeWrapper, packages ? (x: []) }: +{ stdenv, ghcWithPackages, taffybar, makeWrapper, packages ? (x: []) }: let taffybarEnv = ghcWithPackages (self: [ diff --git a/pkgs/applications/window-managers/tinywl/default.nix b/pkgs/applications/window-managers/tinywl/default.nix index d39373e781929..06d2d8d72f8a3 100644 --- a/pkgs/applications/window-managers/tinywl/default.nix +++ b/pkgs/applications/window-managers/tinywl/default.nix @@ -1,5 +1,6 @@ { lib, stdenv, wlroots, pkg-config, wayland-scanner , libxkbcommon, pixman, udev, wayland, wayland-protocols +, nixosTests }: stdenv.mkDerivation { @@ -18,6 +19,8 @@ stdenv.mkDerivation { runHook postInstall ''; + passthru.tests = { inherit (nixosTests) tinywl; }; + meta = { homepage = "https://gitlab.freedesktop.org/wlroots/wlroots/tree/master/tinywl"; description = ''A "minimum viable product" Wayland compositor based on wlroots''; diff --git a/pkgs/applications/window-managers/vwm/default.nix b/pkgs/applications/window-managers/vwm/default.nix index 7cba387369c7a..0560bb214ba2f 100644 --- a/pkgs/applications/window-managers/vwm/default.nix +++ b/pkgs/applications/window-managers/vwm/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { homepage = "https://vwm.sourceforge.net/"; description = "Dynamic window manager for the console"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ ]; + maintainers = [ ]; platforms = platforms.linux; mainProgram = "vwm"; }; diff --git a/pkgs/applications/window-managers/wayfire/default.nix b/pkgs/applications/window-managers/wayfire/default.nix index ca7eaa587a852..39dbac8b5289b 100644 --- a/pkgs/applications/window-managers/wayfire/default.nix +++ b/pkgs/applications/window-managers/wayfire/default.nix @@ -27,14 +27,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "wayfire"; - version = "0.8.1"; + version = "0.9.0"; src = fetchFromGitHub { owner = "WayfireWM"; repo = "wayfire"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-OPGzPy0I6i3TvmA5KSWDb4Lsf66zM5X+Akckgs3wk2o="; + hash = "sha256-xQZ4/UE66IISZQLl702OQXAAr8XmEsA4hJwB7aXua+E="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/window-managers/wayfire/wayfire-plugins-extra.nix b/pkgs/applications/window-managers/wayfire/wayfire-plugins-extra.nix index 62496c9f86004..5b4161cc45438 100644 --- a/pkgs/applications/window-managers/wayfire/wayfire-plugins-extra.nix +++ b/pkgs/applications/window-managers/wayfire/wayfire-plugins-extra.nix @@ -5,6 +5,7 @@ , ninja , pkg-config , wayfire +, wayland-scanner , wf-config , libevdev , libinput @@ -12,24 +13,24 @@ , nlohmann_json , xcbutilwm , gtkmm3 -, gtk-layer-shell }: stdenv.mkDerivation (finalAttrs: { pname = "wayfire-plugins-extra"; - version = "0.8.1"; + version = "0.9.0"; src = fetchFromGitHub { owner = "WayfireWM"; repo = "wayfire-plugins-extra"; rev = "v${finalAttrs.version}"; - hash = "sha256-MF4tDzIZnnTXH2ZUxltIw1RP3pfRQFGrc/n9H47yW0g"; + hash = "sha256-TukDomxqfrM45+C7azfO8jVaqk3E5irdphH8U5IYItg="; }; nativeBuildInputs = [ meson ninja pkg-config + wayland-scanner ]; buildInputs = [ @@ -41,7 +42,6 @@ stdenv.mkDerivation (finalAttrs: { nlohmann_json xcbutilwm gtkmm3 - gtk-layer-shell ]; mesonFlags = [ diff --git a/pkgs/applications/window-managers/wayfire/wayfire-shadows.nix b/pkgs/applications/window-managers/wayfire/wayfire-shadows.nix index fd91d78285dfe..e36f691382ce2 100644 --- a/pkgs/applications/window-managers/wayfire/wayfire-shadows.nix +++ b/pkgs/applications/window-managers/wayfire/wayfire-shadows.nix @@ -8,17 +8,19 @@ , wayfire , libxkbcommon , libGL +, libinput +, xcbutilwm }: stdenv.mkDerivation (finalAttrs: { pname = "wayfire-shadows"; - version = "unstable-2024-03-28"; + version = "0-unstable-2024-08-30"; src = fetchFromGitHub { owner = "timgott"; repo = "wayfire-shadows"; - rev = "81699f6e4be65dcf3f7ad5155dfb4247b37b7997"; - hash = "sha256-H9pqpHoeDfNBrtVLax57CUXVhU2XT+syAUZTYSJizxw="; + rev = "11c8ab63c1cde663a38502c6ecaeec980920c4d1"; + hash = "sha256-/utqJevG7fn/kX81eDIN/SDvVa3rzNBe1crkHfMx8qo="; }; nativeBuildInputs = [ @@ -31,6 +33,8 @@ stdenv.mkDerivation (finalAttrs: { wayfire libxkbcommon libGL + libinput + xcbutilwm ]; env = { diff --git a/pkgs/applications/window-managers/wayfire/wcm.nix b/pkgs/applications/window-managers/wayfire/wcm.nix index 4f1a6769ffbd3..f82dac2e51622 100644 --- a/pkgs/applications/window-managers/wayfire/wcm.nix +++ b/pkgs/applications/window-managers/wayfire/wcm.nix @@ -18,14 +18,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "wcm"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "WayfireWM"; repo = "wcm"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-UwHJ4Wi83ATnA1CQKNSt8Qga7ooLnAY7QARz2FXvUIo="; + hash = "sha256-oaaEtyu/9XVhFTkmD7WjScMycpKf+M7oPyQatbY23Vo="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/window-managers/wayfire/wf-config.nix b/pkgs/applications/window-managers/wayfire/wf-config.nix index b16934e38a59e..a61230dec2f92 100644 --- a/pkgs/applications/window-managers/wayfire/wf-config.nix +++ b/pkgs/applications/window-managers/wayfire/wf-config.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "wf-config"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "WayfireWM"; repo = "wf-config"; rev = "v${finalAttrs.version}"; - hash = "sha256-4QszCGlJqehnavTOdR2vZ95XuHKiNUIsA893sa9qph8="; + hash = "sha256-5HejuluCTsRsnHuaMCTnCPkbFvT/IcLkfNGjnXnZjJ0="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/window-managers/wayfire/wf-shell.nix b/pkgs/applications/window-managers/wayfire/wf-shell.nix index ce803ba2e880b..e6d64bd902bc7 100644 --- a/pkgs/applications/window-managers/wayfire/wf-shell.nix +++ b/pkgs/applications/window-managers/wayfire/wf-shell.nix @@ -15,14 +15,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "wf-shell"; - version = "0.8.1"; + version = "0.9.0"; src = fetchFromGitHub { owner = "WayfireWM"; repo = "wf-shell"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-/ajFPIk8VJnlu2DzvSyGD3bC4r/pxALTkZeLNvs9dTw="; + hash = "sha256-J5KmUxM/mU5I1YfkfwZgbK7VxMTKKKGGvxYS5Rnbqnc="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/window-managers/wayfire/wrapper.nix b/pkgs/applications/window-managers/wayfire/wrapper.nix index 35bb3ad15837d..a3ec857227176 100644 --- a/pkgs/applications/window-managers/wayfire/wrapper.nix +++ b/pkgs/applications/window-managers/wayfire/wrapper.nix @@ -27,6 +27,6 @@ symlinkJoin { # To prevent builds on hydra hydraPlatforms = []; # prefer wrapper over the package - priority = (wayfire.meta.priority or 0) - 1; + priority = (wayfire.meta.priority or lib.meta.defaultPriority) - 1; }; } diff --git a/pkgs/applications/window-managers/wayfire/wwp-switcher.nix b/pkgs/applications/window-managers/wayfire/wwp-switcher.nix index 34252d98dd838..4eb42af6995b7 100644 --- a/pkgs/applications/window-managers/wayfire/wwp-switcher.nix +++ b/pkgs/applications/window-managers/wayfire/wwp-switcher.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "wwp-switcher"; - version = "unstable-2023-09-09"; + version = "0-unstable-2024-07-23"; src = fetchFromGitHub { owner = "wb9688"; repo = "wwp-switcher"; - rev = "04711a0db133a899f507a86e81897296b793b4f3"; - hash = "sha256-qMyEhSZJNxAoaELKI2h1v59QJnKJzFa76Q4/WtZqpIU"; + rev = "d0cd97534a2a6355697efecb7bcf8f85f5dc4b5b"; + hash = "sha256-cU8INUb+JXlSCM7cAOUBU7z7W0IM6pAGN0izGdFYntc="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix index c67b760e4df39..e0a76e2195352 100644 --- a/pkgs/applications/window-managers/weston/default.nix +++ b/pkgs/applications/window-managers/weston/default.nix @@ -1,10 +1,9 @@ { lib, stdenv, fetchurl , meson, ninja, pkg-config, python3, wayland-scanner -, cairo, libGL, libdrm, libevdev, libinput, libxkbcommon, mesa, seatd, wayland -, wayland-protocols, xcbutilcursor +, cairo, libGL, libdisplay-info, libdrm, libevdev, libinput, libxkbcommon, mesa +, seatd, wayland, wayland-protocols, xcbutilcursor , demoSupport ? true -, hdrSupport ? true, libdisplay-info , jpegSupport ? true, libjpeg , lcmsSupport ? true, lcms2 , pangoSupport ? true, pango @@ -19,27 +18,19 @@ stdenv.mkDerivation rec { pname = "weston"; - version = "13.0.3"; + version = "14.0.0"; src = fetchurl { url = "https://gitlab.freedesktop.org/wayland/weston/-/releases/${version}/downloads/weston-${version}.tar.xz"; - hash = "sha256-J/aNluO5fZjare8TogI1ZSSST6OBQY+mcWuRNu8JkJM="; + hash = "sha256-R/0DJbC5SOmwA6OP306zqFgfP9x0C4kys1roeTv05KU="; }; - postPatch = '' - # raise neatvnc version bound to 0.8.0 - # https://gitlab.freedesktop.org/wayland/weston/-/issues/890 - substituteInPlace libweston/backend-vnc/meson.build \ - --replace-fail "'neatvnc', version: ['>= 0.7.0', '< 0.8.0']" "'neatvnc', version: ['>= 0.7.0', '<= 0.8.0']" - ''; - depsBuildBuild = [ pkg-config ]; nativeBuildInputs = [ meson ninja pkg-config python3 wayland-scanner ]; buildInputs = [ - cairo libGL libdrm libevdev libinput libxkbcommon mesa seatd wayland - wayland-protocols - ] ++ lib.optional hdrSupport libdisplay-info - ++ lib.optional jpegSupport libjpeg + cairo libGL libdisplay-info libdrm libevdev libinput libxkbcommon mesa seatd + wayland wayland-protocols + ] ++ lib.optional jpegSupport libjpeg ++ lib.optional lcmsSupport lcms2 ++ lib.optional pangoSupport pango ++ lib.optional pipewireSupport pipewire diff --git a/pkgs/applications/window-managers/xmonad/log-applet/default.nix b/pkgs/applications/window-managers/xmonad/log-applet/default.nix index c31b3c80b8d4c..2e6d72b91071b 100644 --- a/pkgs/applications/window-managers/xmonad/log-applet/default.nix +++ b/pkgs/applications/window-managers/xmonad/log-applet/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, glib, dbus-glib , desktopSupport ? "gnomeflashback", xorg , gtk2 -, gtk3, gnome, mate +, gtk3, gnome-panel, mate , libxfce4util, xfce4-panel }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ glib dbus-glib xorg.xcbutilwm ] - ++ lib.optionals (desktopSupport == "gnomeflashback") [ gtk3 gnome.gnome-panel ] + ++ lib.optionals (desktopSupport == "gnomeflashback") [ gtk3 gnome-panel ] ++ lib.optionals (desktopSupport == "mate") [ gtk3 mate.mate-panel ] ++ lib.optionals (desktopSupport == "xfce4") [ gtk2 libxfce4util xfce4-panel ] ; diff --git a/pkgs/applications/window-managers/yabar/build.nix b/pkgs/applications/window-managers/yabar/build.nix index e68dcdcd0e812..25ab000594aa7 100644 --- a/pkgs/applications/window-managers/yabar/build.nix +++ b/pkgs/applications/window-managers/yabar/build.nix @@ -62,12 +62,14 @@ stdenv.mkDerivation { } ''; + #passthru.tests = { inherit (nixosTests) yabar; }; # nixos currently uses yabar-unstable + meta = with lib; { description = "Modern and lightweight status bar for X window managers"; homepage = "https://github.com/geommer/yabar"; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ ]; + maintainers = [ ]; mainProgram = "yabar"; }; } diff --git a/pkgs/applications/window-managers/yabar/unstable.nix b/pkgs/applications/window-managers/yabar/unstable.nix index 47c8f6c5e5685..cb43c4e0b95ee 100644 --- a/pkgs/applications/window-managers/yabar/unstable.nix +++ b/pkgs/applications/window-managers/yabar/unstable.nix @@ -1,4 +1,4 @@ -{ fetchpatch, playerctl, libxkbcommon, callPackage, attrs ? {} }: +{ fetchpatch, playerctl, libxkbcommon, callPackage, nixosTests, attrs ? {} }: let pkg = callPackage ./build.nix ({ @@ -22,4 +22,11 @@ in pkg.overrideAttrs (o: { sha256 = "1q7nd66ai6nr2m6iqxn55gvbr4r5gjc00c8wyjc3riv31qcbqbhv"; }) ]; + + passthru = (o.passthru or {}) // { + tests = (o.passthru.tests or {}) // { + inherit (nixosTests) yabar; + }; + }; + }) |